From 48ded694703281a29bdb169391559deb3e3d9e8a Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Fri, 12 Apr 2013 12:28:18 +0200 Subject: [PATCH] tegra: switch to DT only We will follow the Linux kernel and go devicetree only for Tegra. This doesn't prevent specific code for certain boards, but always requires a valid DTB for all boards. Also regenerate the AC100 defconfig to reflect this change. Signed-off-by: Lucas Stach Tested-by: Antony Pavlov Signed-off-by: Sascha Hauer --- arch/arm/Kconfig | 3 +++ arch/arm/configs/toshiba_ac100_defconfig | 6 ++++-- arch/arm/dts/tegra20-paz00.dts | 12 ++++++++++++ arch/arm/dts/tegra20.dtsi | 5 +++++ 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/tegra20-paz00.dts create mode 100644 arch/arm/dts/tegra20.dtsi diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index befed5dc6..fdd803e2f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -139,6 +139,9 @@ config ARCH_TEGRA bool "NVIDIA Tegra" select CPU_V7 select HAS_DEBUG_LL + select BUILTIN_DTB + select OFDEVICE + select OFTREE config ARCH_ZYNQ bool "Xilinx Zynq-based boards" diff --git a/arch/arm/configs/toshiba_ac100_defconfig b/arch/arm/configs/toshiba_ac100_defconfig index 065189d49..6f7011bc6 100644 --- a/arch/arm/configs/toshiba_ac100_defconfig +++ b/arch/arm/configs/toshiba_ac100_defconfig @@ -1,3 +1,4 @@ +CONFIG_BUILTIN_DTB_NAME="tegra20-paz00" CONFIG_ARCH_TEGRA=y CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_TEXT_BASE=0x01000000 @@ -14,6 +15,7 @@ CONFIG_ENABLE_DEVICE_NOISE=y CONFIG_CMD_SLEEP=y # CONFIG_CMD_TRUE is not set # CONFIG_CMD_FALSE is not set +CONFIG_CMD_TFTP=y CONFIG_CMD_LOADB=y CONFIG_CMD_LOADY=y CONFIG_CMD_LOADS=y @@ -23,11 +25,10 @@ CONFIG_CMD_SHA1SUM=y CONFIG_CMD_BOOTM_SHOW_TYPE=y CONFIG_CMD_RESET=y CONFIG_CMD_GO=y +CONFIG_CMD_OFTREE=y CONFIG_NET=y CONFIG_NET_DHCP=y CONFIG_NET_PING=y -CONFIG_CMD_TFTP=y -CONFIG_FS_TFTP=y CONFIG_NET_NETCONSOLE=y CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_NET_USB=y @@ -36,4 +37,5 @@ CONFIG_NET_USB_ASIX=y CONFIG_USB=y CONFIG_USB_EHCI=y CONFIG_USB_STORAGE=y +CONFIG_FS_TFTP=y CONFIG_FS_FAT=y diff --git a/arch/arm/dts/tegra20-paz00.dts b/arch/arm/dts/tegra20-paz00.dts new file mode 100644 index 000000000..09ccb8ba3 --- /dev/null +++ b/arch/arm/dts/tegra20-paz00.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +/include/ "tegra20.dtsi" + +/ { + model = "Toshiba AC100 / Dynabook AZ"; + compatible = "compal,paz00", "nvidia,tegra20"; + + memory { + reg = <0x00000000 0x20000000>; + }; +}; diff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi new file mode 100644 index 000000000..9f8860bd5 --- /dev/null +++ b/arch/arm/dts/tegra20.dtsi @@ -0,0 +1,5 @@ +/include/ "skeleton.dtsi" + +/ { + compatible = "nvidia,tegra20"; +};