This option specifies the default Device Tree used for the run-time configuration of U-Boot.
Signed-off-by: Masahiro Yamada <yamad...@jp.panasonic.com> Cc: Simon Glass <s...@chromium.org> Cc: Stephen Warren <swar...@nvidia.com> Cc: Minkyu Kang <mk7.k...@samsung.com> Cc: Michal Simek <michal.si...@xilinx.com> --- configs/am335x_boneblack_vboot_defconfig | 1 + configs/arndale_defconfig | 1 + configs/beaver_defconfig | 1 + configs/cardhu_defconfig | 1 + configs/colibri_t20_iris_defconfig | 1 + configs/colibri_t30_defconfig | 1 + configs/coreboot-x86_defconfig | 1 + configs/dalmore_defconfig | 1 + configs/harmony_defconfig | 1 + configs/jetson-tk1_defconfig | 1 + configs/medcom-wide_defconfig | 1 + configs/microblaze-generic_defconfig | 1 + configs/mx6dlsabreauto_defconfig | 1 + configs/mx6qsabreauto_defconfig | 1 + configs/origen_defconfig | 1 + configs/paz00_defconfig | 1 + configs/peach-pit_defconfig | 1 + configs/plutux_defconfig | 1 + configs/s5pc210_universal_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/seaboard_defconfig | 1 + configs/smdk5250_defconfig | 1 + configs/smdk5420_defconfig | 1 + configs/snow_defconfig | 1 + configs/tec-ng_defconfig | 1 + configs/tec_defconfig | 1 + configs/trats2_defconfig | 1 + configs/trats_defconfig | 1 + configs/trimslice_defconfig | 1 + configs/venice2_defconfig | 1 + configs/ventana_defconfig | 1 + configs/vexpress_aemv8a_defconfig | 1 + configs/vexpress_aemv8a_semi_defconfig | 1 + configs/whistler_defconfig | 1 + configs/zynq_microzed_defconfig | 1 + configs/zynq_zc70x_defconfig | 1 + configs/zynq_zc770_xm010_defconfig | 1 + configs/zynq_zc770_xm012_defconfig | 1 + configs/zynq_zc770_xm013_defconfig | 1 + configs/zynq_zed_defconfig | 1 + dts/Kconfig | 8 ++++++++ include/configs/am335x_evm.h | 1 - include/configs/arndale.h | 1 - include/configs/beaver.h | 1 - include/configs/cardhu.h | 1 - include/configs/colibri_t20_iris.h | 1 - include/configs/colibri_t30.h | 1 - include/configs/coreboot.h | 1 - include/configs/dalmore.h | 1 - include/configs/harmony.h | 1 - include/configs/jetson-tk1.h | 1 - include/configs/medcom-wide.h | 1 - include/configs/microblaze-generic.h | 1 - include/configs/mx6qsabreauto.h | 1 - include/configs/origen.h | 2 -- include/configs/paz00.h | 1 - include/configs/peach-pit.h | 2 -- include/configs/plutux.h | 1 - include/configs/s5pc210_universal.h | 2 -- include/configs/sandbox.h | 1 - include/configs/seaboard.h | 1 - include/configs/smdk5250.h | 2 -- include/configs/smdk5420.h | 2 -- include/configs/snow.h | 2 -- include/configs/tec-ng.h | 1 - include/configs/tec.h | 1 - include/configs/trats.h | 2 -- include/configs/trats2.h | 2 -- include/configs/trimslice.h | 1 - include/configs/venice2.h | 1 - include/configs/ventana.h | 1 - include/configs/vexpress_aemv8a.h | 1 - include/configs/whistler.h | 1 - include/configs/zynq_microzed.h | 1 - include/configs/zynq_zc70x.h | 1 - include/configs/zynq_zc770.h | 3 --- include/configs/zynq_zed.h | 1 - 77 files changed, 48 insertions(+), 46 deletions(-) diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index af7ceca..e257143 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -3,3 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,EMMC_BOOT,ENABLE_VBOOT" +S:CONFIG_ARM=y +S:CONFIG_TARGET_AM335X_EVM=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="am335x-boneblack" diff --git a/configs/arndale_defconfig b/configs/arndale_defconfig index 737bb3e..d83bf53 100644 --- a/configs/arndale_defconfig +++ b/configs/arndale_defconfig @@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_ARCH_EXYNOS=y +S:CONFIG_TARGET_ARNDALE=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale" diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 9427faf..ba510d2 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA30=y +S:CONFIG_TARGET_BEAVER=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver" diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig index 232a778..5731036 100644 --- a/configs/cardhu_defconfig +++ b/configs/cardhu_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA30=y +S:CONFIG_TARGET_CARDHU=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu" diff --git a/configs/colibri_t20_iris_defconfig b/configs/colibri_t20_iris_defconfig index 094fb9f..c505497 100644 --- a/configs/colibri_t20_iris_defconfig +++ b/configs/colibri_t20_iris_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_COLIBRI_T20_IRIS=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri_t20_iris" diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig index 5f35fa1..453d783 100644 --- a/configs/colibri_t30_defconfig +++ b/configs/colibri_t30_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA30=y +S:CONFIG_TARGET_COLIBRI_T30=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri" diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig index 3cc034a..6249db7 100644 --- a/configs/coreboot-x86_defconfig +++ b/configs/coreboot-x86_defconfig @@ -2,3 +2,4 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x01110000" CONFIG_X86=y CONFIG_TARGET_COREBOOT=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="link" diff --git a/configs/dalmore_defconfig b/configs/dalmore_defconfig index ca6b664..9eaea53 100644 --- a/configs/dalmore_defconfig +++ b/configs/dalmore_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA114=y +S:CONFIG_TARGET_DALMORE=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore" diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig index d29e8d2..866ec6d 100644 --- a/configs/harmony_defconfig +++ b/configs/harmony_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_HARMONY=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-harmony" diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index 1c385a6..04578dc 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA124=y +S:CONFIG_TARGET_JETSON_TK1=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1" diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig index 5674e9b..6c595ac 100644 --- a/configs/medcom-wide_defconfig +++ b/configs/medcom-wide_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_MEDCOM_WIDE=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-medcom-wide" diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index 1dc7441..5cfd596 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_TARGET_MICROBLAZE_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y +CONFIG_DEFAULT_DEVICE_TREE="microblaze-generic" diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index b649935..c49dbf5 100644 --- a/configs/mx6dlsabreauto_defconfig +++ b/configs/mx6dlsabreauto_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL" CONFIG_ARM=y CONFIG_TARGET_MX6QSABREAUTO=y +CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto" diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig index 7d86700..eb635fb 100644 --- a/configs/mx6qsabreauto_defconfig +++ b/configs/mx6qsabreauto_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q" CONFIG_ARM=y CONFIG_TARGET_MX6QSABREAUTO=y +CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabreauto" diff --git a/configs/origen_defconfig b/configs/origen_defconfig index 1d712e8..2a7f83b 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_ARCH_EXYNOS=y +S:CONFIG_TARGET_ORIGEN=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="exynos4210-origen" diff --git a/configs/paz00_defconfig b/configs/paz00_defconfig index a682f4c..3c3b20c 100644 --- a/configs/paz00_defconfig +++ b/configs/paz00_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_PAZ00=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-paz00" diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig index 9f3530a..c51ac76 100644 --- a/configs/peach-pit_defconfig +++ b/configs/peach-pit_defconfig @@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_ARCH_EXYNOS=y +S:CONFIG_TARGET_PEACH_PIT=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit" diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig index 03374fe..9e8303f 100644 --- a/configs/plutux_defconfig +++ b/configs/plutux_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_PLUTUX=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-plutux" diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index 0a3ad0d..cdce39f 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -2,3 +2,4 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_S5PC210_UNIVERSAL=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="exynos4210-universal_c210" diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index dd84281..79c9893 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -1 +1,2 @@ CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="sandbox" diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig index 9e2028b..56fc55c 100644 --- a/configs/seaboard_defconfig +++ b/configs/seaboard_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_SEABOARD=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard" diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig index 5cdfa63..5d6000e 100644 --- a/configs/smdk5250_defconfig +++ b/configs/smdk5250_defconfig @@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_ARCH_EXYNOS=y +S:CONFIG_TARGET_SMDK5250=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250" diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig index 4619c62..370a59b 100644 --- a/configs/smdk5420_defconfig +++ b/configs/smdk5420_defconfig @@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_ARCH_EXYNOS=y +S:CONFIG_TARGET_SMDK5420=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420" diff --git a/configs/snow_defconfig b/configs/snow_defconfig index c201c84..35c9596 100644 --- a/configs/snow_defconfig +++ b/configs/snow_defconfig @@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_ARCH_EXYNOS=y +S:CONFIG_TARGET_SNOW=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow" diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig index 501d449..d3ec3b8 100644 --- a/configs/tec-ng_defconfig +++ b/configs/tec-ng_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA30=y +S:CONFIG_TARGET_TEC_NG=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng" diff --git a/configs/tec_defconfig b/configs/tec_defconfig index fe743f9..3e6c37e 100644 --- a/configs/tec_defconfig +++ b/configs/tec_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_TEC=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-tec" diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index 666011c..1b98b73 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -2,3 +2,4 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_TRATS2=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="exynos4412-trats2" diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 6ef4b33..901a014 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -2,3 +2,4 @@ CONFIG_ARM=y CONFIG_ARCH_EXYNOS=y CONFIG_TARGET_TRATS=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="exynos4210-trats" diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig index 8b1a13e..7d849d82 100644 --- a/configs/trimslice_defconfig +++ b/configs/trimslice_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_TRIMSLICE=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice" diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig index 3897862..6c08d5a 100644 --- a/configs/venice2_defconfig +++ b/configs/venice2_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA124=y +S:CONFIG_TARGET_VENICE2=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2" diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig index 7398d11..b3f30ae 100644 --- a/configs/ventana_defconfig +++ b/configs/ventana_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_VENTANA=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-ventana" diff --git a/configs/vexpress_aemv8a_defconfig b/configs/vexpress_aemv8a_defconfig index a335abc..fa9da00 100644 --- a/configs/vexpress_aemv8a_defconfig +++ b/configs/vexpress_aemv8a_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ARM64" CONFIG_ARM=y CONFIG_TARGET_VEXPRESS_AEMV8A=y +CONFIG_DEFAULT_DEVICE_TREE="vexpress64" diff --git a/configs/vexpress_aemv8a_semi_defconfig b/configs/vexpress_aemv8a_semi_defconfig index e6dd8e7..c088278 100644 --- a/configs/vexpress_aemv8a_semi_defconfig +++ b/configs/vexpress_aemv8a_semi_defconfig @@ -1,3 +1,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ARM64,SEMIHOSTING,BASE_FVP" CONFIG_ARM=y CONFIG_TARGET_VEXPRESS_AEMV8A_SEMI=y +CONFIG_DEFAULT_DEVICE_TREE="vexpress64" diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig index a275005..2027abd 100644 --- a/configs/whistler_defconfig +++ b/configs/whistler_defconfig @@ -3,3 +3,4 @@ +S:CONFIG_TEGRA20=y +S:CONFIG_TARGET_WHISTLER=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="tegra20-whistler" diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index 9767863..9588849 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_MICROZED=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed" diff --git a/configs/zynq_zc70x_defconfig b/configs/zynq_zc70x_defconfig index d303f97..cf50730 100644 --- a/configs/zynq_zc70x_defconfig +++ b/configs/zynq_zc70x_defconfig @@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZC70X=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702" diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig index 4e6660f..8bb405d 100644 --- a/configs/zynq_zc770_xm010_defconfig +++ b/configs/zynq_zc770_xm010_defconfig @@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010" +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010" diff --git a/configs/zynq_zc770_xm012_defconfig b/configs/zynq_zc770_xm012_defconfig index 16d62e6..0ba5da5 100644 --- a/configs/zynq_zc770_xm012_defconfig +++ b/configs/zynq_zc770_xm012_defconfig @@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012" +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012" diff --git a/configs/zynq_zc770_xm013_defconfig b/configs/zynq_zc770_xm013_defconfig index 7343a64..13f8112 100644 --- a/configs/zynq_zc770_xm013_defconfig +++ b/configs/zynq_zc770_xm013_defconfig @@ -4,3 +4,4 @@ CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM013" +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZC770=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013" diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 38d5fa6..eb057fa 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -3,3 +3,4 @@ CONFIG_SPL=y +S:CONFIG_ZYNQ=y +S:CONFIG_TARGET_ZYNQ_ZED=y CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="zynq-zed" diff --git a/dts/Kconfig b/dts/Kconfig index 98b2357..cca9f48 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -43,4 +43,12 @@ config OF_HOSTFILE endchoice +config DEFAULT_DEVICE_TREE + string "Default Device Tree for the run-time configuration" + help + This option specifies the default Device Tree used for the run-time + configuration of U-Boot. + It can be overrided from the command line: + $ make DEVICE_TREE=<device-tree-name> + endmenu diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 47a173f..4d4423f 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -23,7 +23,6 @@ # define CONFIG_TIMESTAMP # define CONFIG_LZO # ifdef CONFIG_ENABLE_VBOOT -# define CONFIG_DEFAULT_DEVICE_TREE am335x-boneblack # define CONFIG_FIT_SIGNATURE # define CONFIG_RSA # endif diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 7f06907..43077cf 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -224,7 +224,6 @@ #define CONFIG_POWER_I2C #define CONFIG_POWER_MAX77686 -#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-arndale #define CONFIG_PREBOOT diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 4c7cf5f..b089f13 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -25,7 +25,6 @@ #define CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 /* Enable fdt support for Beaver. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra30-beaver /* High-level configuration options */ #define V_PROMPT "Tegra30 (Beaver) # " diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 1616a54..3a7ccc3 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -25,7 +25,6 @@ #define CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 /* Enable fdt support for Cardhu. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra30-cardhu /* High-level configuration options */ #define V_PROMPT "Tegra30 (Cardhu) # " diff --git a/include/configs/colibri_t20_iris.h b/include/configs/colibri_t20_iris.h index 3ce1f9b..5addd34 100644 --- a/include/configs/colibri_t20_iris.h +++ b/include/configs/colibri_t20_iris.h @@ -10,7 +10,6 @@ #include "tegra20-common.h" /* Enable FDT support */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-colibri_t20_iris /* High-level configuration options */ #define V_PROMPT "Tegra20 (Colibri) # " diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index d9e2d86..782b9d1 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -11,7 +11,6 @@ #include "tegra30-common.h" -#define CONFIG_DEFAULT_DEVICE_TREE tegra30-colibri #define V_PROMPT "Colibri T30 # " #define CONFIG_TEGRA_BOARD_STRING "Toradex Colibri T30" diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index 915245e..936be14 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -28,7 +28,6 @@ #define CONFIG_LMB #define CONFIG_OF_LIBFDT -#define CONFIG_DEFAULT_DEVICE_TREE link #define CONFIG_BOOTSTAGE #define CONFIG_BOOTSTAGE_REPORT diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index e3bb27f..3e6daf8 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -22,7 +22,6 @@ #include "tegra114-common.h" /* Enable fdt support for Dalmore. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra114-dalmore /* High-level configuration options */ #define V_PROMPT "Tegra114 (Dalmore) # " diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 97db202..6f9fde8 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -12,7 +12,6 @@ #include "tegra20-common.h" /* Enable fdt support for Harmony. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-harmony /* High-level configuration options */ #define V_PROMPT "Tegra20 (Harmony) # " diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index dc7e324..655d5a3 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -13,7 +13,6 @@ #include "tegra124-common.h" /* Enable fdt support for Jetson TK1. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra124-jetson-tk1 /* High-level configuration options */ #define V_PROMPT "Tegra124 (Jetson TK1) # " diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index 5e52574..8f7e97b 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -13,7 +13,6 @@ #include "tegra20-common.h" /* Enable fdt support for Medcom-Wide. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-medcom-wide /* High-level configuration options */ #define V_PROMPT "Tegra20 (Medcom-Wide) # " diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index f5e83ff..0b48e02 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -15,7 +15,6 @@ #define MICROBLAZE_V5 1 /* Open Firmware DTS */ -#define CONFIG_DEFAULT_DEVICE_TREE microblaze-generic /* linear and spi flash memory */ #ifdef XILINX_FLASH_START diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 95f4600..93daddc 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -45,6 +45,5 @@ #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_SPEED 100000 -#define CONFIG_DEFAULT_DEVICE_TREE imx6q-sabreauto #endif /* __MX6QSABREAUTO_CONFIG_H */ diff --git a/include/configs/origen.h b/include/configs/origen.h index 5d24916..fb1536c 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -13,8 +13,6 @@ #define CONFIG_SYS_PROMPT "ORIGEN # " -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos4210-origen /* High Level Configuration Options */ #define CONFIG_EXYNOS4210 1 /* which is a EXYNOS4210 SoC */ diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 01cb649..5edbc4a 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -21,7 +21,6 @@ #include "tegra20-common.h" /* Enable fdt support for Paz00. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-paz00 /* High-level configuration options */ #define V_PROMPT "Tegra20 (Paz00) MOD # " diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h index 76b8d7a..437b706 100644 --- a/include/configs/peach-pit.h +++ b/include/configs/peach-pit.h @@ -13,8 +13,6 @@ #include <configs/exynos5420.h> -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos5420-peach-pit /* select serial console configuration */ #define CONFIG_SERIAL3 /* use SERIAL 3 */ diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 719d81a..30b841a 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -13,7 +13,6 @@ #include "tegra20-common.h" /* Enable fdt support for Plutux. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-plutux /* High-level configuration options */ #define V_PROMPT "Tegra20 (Plutux) # " diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index eb046cd..3c95810 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -14,8 +14,6 @@ #define CONFIG_SYS_PROMPT "Universal # " /* Monitor Command Prompt */ -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos4210-universal_c210 #define CONFIG_TIZEN /* TIZEN lib */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 4998152..64452e2 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -41,7 +41,6 @@ #define CONFIG_FIT_SIGNATURE #define CONFIG_RSA #define CONFIG_CMD_FDT -#define CONFIG_DEFAULT_DEVICE_TREE sandbox #define CONFIG_ANDROID_BOOT_IMAGE #define CONFIG_FS_FAT diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index e61811d..7f84b35 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -20,7 +20,6 @@ #include "tegra20-common.h" /* Enable fdt support for Seaboard. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-seaboard /* High-level configuration options */ #define V_PROMPT "Tegra20 (SeaBoard) # " diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index 66fa179..6117094 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -11,8 +11,6 @@ #include <configs/exynos5250-dt.h> -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-smdk5250 /* Enable FIT support and comparison */ #define CONFIG_FIT diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h index 606739b..36a156f 100644 --- a/include/configs/smdk5420.h +++ b/include/configs/smdk5420.h @@ -15,8 +15,6 @@ #define CONFIG_SMDK5420 /* which is in a SMDK5420 */ -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos5420-smdk5420 /* select serial console configuration */ #define CONFIG_SERIAL3 /* use SERIAL 3 */ diff --git a/include/configs/snow.h b/include/configs/snow.h index 673fa14..fbaaa59 100644 --- a/include/configs/snow.h +++ b/include/configs/snow.h @@ -11,8 +11,6 @@ #include <configs/exynos5250-dt.h> -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos5250-snow /* Enable FIT support and comparison */ #define CONFIG_FIT diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 5b4c255..dbcd87b 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -11,7 +11,6 @@ #include "tegra30-common.h" /* Enable fdt support for tec-ng. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra30-tec-ng /* High-level configuration options */ #define V_PROMPT "Tegra30 (TEC-NG) # " diff --git a/include/configs/tec.h b/include/configs/tec.h index 0598d5d..1cfcd04 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -13,7 +13,6 @@ #include "tegra20-common.h" /* Enable fdt support for TEC. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-tec /* High-level configuration options */ #define V_PROMPT "Tegra20 (TEC) # " diff --git a/include/configs/trats.h b/include/configs/trats.h index 7db1db6..da61087 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -16,8 +16,6 @@ #define CONFIG_TRATS -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos4210-trats #define CONFIG_TIZEN /* TIZEN lib */ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index f537e4f..b469f4a 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -15,8 +15,6 @@ #define CONFIG_SYS_PROMPT "Trats2 # " /* Monitor Command Prompt */ -#undef CONFIG_DEFAULT_DEVICE_TREE -#define CONFIG_DEFAULT_DEVICE_TREE exynos4412-trats2 #define CONFIG_TIZEN /* TIZEN lib */ diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 2ef010c..f212705 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -12,7 +12,6 @@ #include "tegra20-common.h" /* Enable fdt support for TrimSlice. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-trimslice /* High-level configuration options */ #define V_PROMPT "Tegra20 (TrimSlice) # " diff --git a/include/configs/venice2.h b/include/configs/venice2.h index b516d92..06c672c 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -13,7 +13,6 @@ #include "tegra124-common.h" /* Enable fdt support for Venice2. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra124-venice2 /* High-level configuration options */ #define V_PROMPT "Tegra124 (Venice2) # " diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 3b9d142..b96aa8d 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -12,7 +12,6 @@ #include "tegra20-common.h" /* Enable fdt support for Ventana. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-ventana /* High-level configuration options */ #define V_PROMPT "Tegra20 (Ventana) # " diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 0897932..f3af971 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -51,7 +51,6 @@ /* Flat Device Tree Definitions */ #define CONFIG_OF_LIBFDT -#define CONFIG_DEFAULT_DEVICE_TREE vexpress64 /* SMP Spin Table Definitions */ #ifdef CONFIG_BASE_FVP diff --git a/include/configs/whistler.h b/include/configs/whistler.h index f3bf806..a3e0584 100644 --- a/include/configs/whistler.h +++ b/include/configs/whistler.h @@ -12,7 +12,6 @@ #include "tegra20-common.h" /* Enable fdt support for Whistler. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-whistler /* High-level configuration options */ #define V_PROMPT "Tegra20 (Whistler) # " diff --git a/include/configs/zynq_microzed.h b/include/configs/zynq_microzed.h index b0328a2..549a664 100644 --- a/include/configs/zynq_microzed.h +++ b/include/configs/zynq_microzed.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_ZYNQ_SDHCI0 -#define CONFIG_DEFAULT_DEVICE_TREE zynq-microzed #include <configs/zynq-common.h> diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h index 291a5fe..b659054 100644 --- a/include/configs/zynq_zc70x.h +++ b/include/configs/zynq_zc70x.h @@ -23,7 +23,6 @@ #define CONFIG_ZYNQ_I2C0 #define CONFIG_ZYNQ_EEPROM #define CONFIG_ZYNQ_BOOT_FREEBSD -#define CONFIG_DEFAULT_DEVICE_TREE zynq-zc702 #include <configs/zynq-common.h> diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h index 8aa96e7..16b9047 100644 --- a/include/configs/zynq_zc770.h +++ b/include/configs/zynq_zc770.h @@ -20,18 +20,15 @@ # define CONFIG_ZYNQ_GEM_PHY_ADDR0 7 # define CONFIG_ZYNQ_SDHCI0 # define CONFIG_ZYNQ_SPI -# define CONFIG_DEFAULT_DEVICE_TREE zynq-zc770-xm010 #elif defined(CONFIG_ZC770_XM012) # define CONFIG_ZYNQ_SERIAL_UART1 # undef CONFIG_SYS_NO_FLASH -# define CONFIG_DEFAULT_DEVICE_TREE zynq-zc770-xm012 #elif defined(CONFIG_ZC770_XM013) # define CONFIG_ZYNQ_SERIAL_UART0 # define CONFIG_ZYNQ_GEM1 # define CONFIG_ZYNQ_GEM_PHY_ADDR1 7 -# define CONFIG_DEFAULT_DEVICE_TREE zynq-zc770-xm013 #else # define CONFIG_ZYNQ_SERIAL_UART0 diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h index ce17d40..946de95 100644 --- a/include/configs/zynq_zed.h +++ b/include/configs/zynq_zed.h @@ -21,7 +21,6 @@ #define CONFIG_ZYNQ_USB #define CONFIG_ZYNQ_SDHCI0 #define CONFIG_ZYNQ_BOOT_FREEBSD -#define CONFIG_DEFAULT_DEVICE_TREE zynq-zed #include <configs/zynq-common.h> -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
