kconfig: move CONFIG_DEFAULT_DEVICE_TREE to kconfig

This option specifies the default Device Tree used for the run-time
configuration of U-Boot.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Michal Simek <michal.simek@xilinx.com>

diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig
index af7cecaad17cc12fae1526e99487e431926711bc..e25714366be5a5b2a7186a97ef640a05e047c0f8 100644 (file)
--- 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 7ea5c0da2cc01ac1959550ed258aeb7912207a02..fc305081700cd8ad0d1b7b9739cc7a904db04bd7 100644 (file)
--- a/configs/arndale_defconfig
+++ b/configs/arndale_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_ARNDALE=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos5250-arndale"

diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig
index 7c9d94bbccf1768bd707757f4eed7eab9fe82b8a..ab615a83d76f51b4e2644f615fc133e7a6ea1457 100644 (file)
--- a/configs/beaver_defconfig
+++ b/configs/beaver_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA30=y
 +S:CONFIG_TARGET_BEAVER=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra30-beaver"

diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig
index bb042b4648602a778f12930112eec95d4a4e298c..4466e98ac83c590b15fc5d273d831e880f7d9315 100644 (file)
--- a/configs/cardhu_defconfig
+++ b/configs/cardhu_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA30=y
 +S:CONFIG_TARGET_CARDHU=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra30-cardhu"

diff --git a/configs/colibri_t20_iris_defconfig b/configs/colibri_t20_iris_defconfig
index b2a21e186ad57cba4813f15f5cec3838398cd038..b76f78bba5843c591a0d5b604c9740af97b38215 100644 (file)
--- a/configs/colibri_t20_iris_defconfig
+++ b/configs/colibri_t20_iris_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_COLIBRI_T20_IRIS=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri_t20_iris"

diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index abb41f3f2286478c77aafbdff1d5afbd7b529c22..b955303070c74b9710925b629cd34caa1ea08e39 100644 (file)
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA30=y
 +S:CONFIG_TARGET_COLIBRI_T30=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"

diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 3cc034a98bbb7508cb95d722036ccb57782321f9..6249db7cb0cb0909cfd3129b8592719d8f392473 100644 (file)
--- 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 70677aac4129c001def988cbbadebc134b38b239..f704c75afae3c7070c3a2325b90eed7e89c1beff 100644 (file)
--- a/configs/dalmore_defconfig
+++ b/configs/dalmore_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA114=y
 +S:CONFIG_TARGET_DALMORE=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra114-dalmore"

diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index a52231b6557554dd8076e1ce5e977b5db293515b..d99b42955ade4b267dc3d383cf27f77cd0e364ad 100644 (file)
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_HARMONY=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-harmony"

diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig
index 00eac92319e0c20ac6df65f1dbd1b2e3ce77517e..ef1d41c20ba73f4f6807fedd0682d208a7425e0c 100644 (file)
--- a/configs/jetson-tk1_defconfig
+++ b/configs/jetson-tk1_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA124=y
 +S:CONFIG_TARGET_JETSON_TK1=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra124-jetson-tk1"

diff --git a/configs/medcom-wide_defconfig b/configs/medcom-wide_defconfig
index e9a39309104d5533bee6f70ee1550ace4fcb9c33..35963e9302fd545c5d44de7ec5a0179e20d64a7c 100644 (file)
--- a/configs/medcom-wide_defconfig
+++ b/configs/medcom-wide_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_MEDCOM_WIDE=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-medcom-wide"

diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 1dc7441df0751f00eb5d478ed59c17765f38f10f..5cfd596761b556289ba31850c38cb2b8d3f8f85d 100644 (file)
--- 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/odroid_defconfig b/configs/odroid_defconfig
index 98ca447c3ff9e9fd7b0052d7923ae89135940a85..a8428373acfe8b000d528f982ccb252836b22ed2 100644 (file)
--- a/configs/odroid_defconfig
+++ b/configs/odroid_defconfig
@@ -2,3 +2,4 @@ CONFIG_ARM=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_TARGET_ODROID=y
 CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos4412-odroid"

diff --git a/configs/origen_defconfig b/configs/origen_defconfig
index 1d712e86f89899e89b86eaeb870a513d48458f86..2a7f83bf89d916c5a08540020757b8a1ded6d658 100644 (file)
--- 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 05974eb10c8805601b4f1cfc84423dfc3b429a55..d2d36a5848cda5f7ba361ac804487eb1c05267ff 100644 (file)
--- a/configs/paz00_defconfig
+++ b/configs/paz00_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_PAZ00=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-paz00"

diff --git a/configs/peach-pit_defconfig b/configs/peach-pit_defconfig
index 797d5e079005ece17c11cc54ddcee28a87655cf7..b944b3bb502701066c412639ec163c47d8f677f1 100644 (file)
--- a/configs/peach-pit_defconfig
+++ b/configs/peach-pit_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_PEACH_PIT=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos5420-peach-pit"

diff --git a/configs/plutux_defconfig b/configs/plutux_defconfig
index 60e80ffa610b455f4259717145ec78906bbb7d86..d2743b8ef6771d385b1213b853feb82f56340ebb 100644 (file)
--- a/configs/plutux_defconfig
+++ b/configs/plutux_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_PLUTUX=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-plutux"

diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig
index 0a3ad0d4d792d1dfcfaa09342c20296a58544ac4..cdce39f89250610bb932b67abe23e956c805114c 100644 (file)
--- 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 84681db956d544c4b0cb86668b3d720a5347f0f7..47d8400acece08586f535fad3b51e3872b3ed161 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -1,2 +1,3 @@
 CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
+CONFIG_DEFAULT_DEVICE_TREE="sandbox"

diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig
index 516e760dfaae1ab0b7853a08824645bcca8af48b..ddf2cd699538c3f825ccd9dc0dc8666c84ad8484 100644 (file)
--- a/configs/seaboard_defconfig
+++ b/configs/seaboard_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_SEABOARD=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard"

diff --git a/configs/smdk5250_defconfig b/configs/smdk5250_defconfig
index 465a75a6e33f91cd964b8fbdf7302924bc63ae73..9b76d0d124fcf2df2627601db0716320939bcd5a 100644 (file)
--- a/configs/smdk5250_defconfig
+++ b/configs/smdk5250_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_SMDK5250=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos5250-smdk5250"

diff --git a/configs/smdk5420_defconfig b/configs/smdk5420_defconfig
index 9dc43f27a63e1c2b2d05afc117946a43e838e792..8cf673d0934946a91f6d28356ae4b817d3e63518 100644 (file)
--- a/configs/smdk5420_defconfig
+++ b/configs/smdk5420_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_SMDK5420=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos5420-smdk5420"

diff --git a/configs/snow_defconfig b/configs/snow_defconfig
index 2d59046f34906d939a33c9108776a5bf52e84ab5..14ed793f6d75f36e55fb882b10f4ea1b2d8782cc 100644 (file)
--- a/configs/snow_defconfig
+++ b/configs/snow_defconfig
@@ -2,3 +2,4 @@ CONFIG_SPL=y
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_EXYNOS=y
 +S:CONFIG_TARGET_SNOW=y
+CONFIG_DEFAULT_DEVICE_TREE="exynos5250-snow"

diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index e4a31cc05423a69570814a9442bb1e2d344962a1..fabd34a3f3ca34168ad675140b4350dfab133d19 100644 (file)
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA30=y
 +S:CONFIG_TARGET_TEC_NG=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng"

diff --git a/configs/tec_defconfig b/configs/tec_defconfig
index 62a9542d94c584d5e1711d918a781b1fef1dce93..d3cafa7e4b0ce1450f166bea2b5fc0eb1795f150 100644 (file)
--- a/configs/tec_defconfig
+++ b/configs/tec_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_TEC=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-tec"

diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig
index 666011ca4c7bd009edecf4e27f12f6df3287dec1..1b98b739daf08dc71ee2184da2b22dc4c3ce9320 100644 (file)
--- 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 6ef4b3340e9374eaa3f98bb716f292d757edb201..901a01473480c97dfb0b3bfaec83d0d57cb213df 100644 (file)
--- 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 94f23e3ea4d98ad0142f6610b716744c7baeb3c8..0b2a6d029203e5a523803a1652e58ee5405b3779 100644 (file)
--- a/configs/trimslice_defconfig
+++ b/configs/trimslice_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_TRIMSLICE=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-trimslice"

diff --git a/configs/venice2_defconfig b/configs/venice2_defconfig
index dfc54078ed29af0ffee62786d19dcb3d54df3531..c12dae933fd97422f939dc48e21f42cda3fee715 100644 (file)
--- a/configs/venice2_defconfig
+++ b/configs/venice2_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA124=y
 +S:CONFIG_TARGET_VENICE2=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra124-venice2"

diff --git a/configs/ventana_defconfig b/configs/ventana_defconfig
index 845e24173c0c53e1f82641d375cd33c4df326d79..f62ab6b17ac116be9ca19dc1631486919a974dda 100644 (file)
--- a/configs/ventana_defconfig
+++ b/configs/ventana_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_VENTANA=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-ventana"

diff --git a/configs/vexpress_aemv8a_defconfig b/configs/vexpress_aemv8a_defconfig
index 9e0a1755a0cb9bc30c106ee483313990a3f1b495..b463a333bc6bb10cd84c040fad6ae38c98732a0f 100644 (file)
--- a/configs/vexpress_aemv8a_defconfig
+++ b/configs/vexpress_aemv8a_defconfig
@@ -1,2 +1,3 @@
 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 8fdf4e0fabcb3ecdeb3da1509530cd22ca2c7082..0035ccdaecd4596e557c1d38b9deaf254053577f 100644 (file)
--- a/configs/vexpress_aemv8a_semi_defconfig
+++ b/configs/vexpress_aemv8a_semi_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="SEMIHOSTING,BASE_FVP"
 CONFIG_ARM=y
 CONFIG_TARGET_VEXPRESS_AEMV8A=y
+CONFIG_DEFAULT_DEVICE_TREE="vexpress64"

diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig
index 8c07c184a9cd84bd2f48d311ff8d58b14e8c381c..9553eb8664dd1c5249f2f990e91b97b42e0cd941 100644 (file)
--- a/configs/whistler_defconfig
+++ b/configs/whistler_defconfig
@@ -2,3 +2,4 @@
 +S:CONFIG_TEGRA=y
 +S:CONFIG_TEGRA20=y
 +S:CONFIG_TARGET_WHISTLER=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-whistler"

diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 976786392abef4ef6dc3d0f7d993c4b177ace06c..9588849bb5c0f7c78694fc90a52fb46daed1286f 100644 (file)
--- 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 d303f974b00bae69e26da8bb058628a5811afbdf..cf507308e95d209540ad5442df87abdb01632549 100644 (file)
--- 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 4e6660f03379490831ff3edd5c5c1295bf2874df..8bb405d1808907756610f7ebd8ade97227615ec9 100644 (file)
--- 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 16d62e6ef2aa8c1430bfbd4783e22514d8498402..0ba5da589e95db553b682393db5348fdcdf00ceb 100644 (file)
--- 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 7343a64ef96ece67beba39cabcc387afe41955b9..13f8112a1b627139c8fc980370759c8cd0d0f36a 100644 (file)
--- 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 38d5fa65715bada7ee0cbf1808272496043430f6..eb057fae35c738332163e8693997c8667376124a 100644 (file)
--- 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 20be5567774898bc652d427c698210f968fc0d92..83ba7a6e9815a50990083565934442d81123a7e0 100644 (file)
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -45,4 +45,11 @@ config OF_HOSTFILE
 
 endchoice
 
+config DEFAULT_DEVICE_TREE
+       string "Default Device Tree for DT control"
+       help
+         This option specifies the default Device Tree used for DT control.
+         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 6a9fb34fa5866a35d668c7155a8b13c9c2b7c263..e2f7ead9bc32e3040f73547b173317f5ca3ea504 100644 (file)
--- 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 7f06907c0e4e19600f42b84cc22ab5fe6b2c8a9f..43077cf851fd2d59ca77d971d497de257b31d3c8 100644 (file)
--- 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 4c7cf5fdd2ed4012cee8e0fa805d3872b33ce6eb..164b2dd9518ecd3b8f8aaad30be083ac3740bc18 100644 (file)
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -24,9 +24,6 @@
 /* VDD core PMIC */
 #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) # "
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Beaver"

diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h
index 1616a54d2dd2e2f957e02d81c4e42308c1dfb8d3..09129c77673a9b98dfe47d63fde1307279fd8afa 100644 (file)
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -24,9 +24,6 @@
 /* VDD core PMIC */
 #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) # "
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Cardhu"

diff --git a/include/configs/colibri_t20_iris.h b/include/configs/colibri_t20_iris.h
index 3ce1f9b9ce6c932328cc206b6f793c3d318ed66a..2b876fede111ecac108939edb02b557e94991a45 100644 (file)
--- a/include/configs/colibri_t20_iris.h
+++ b/include/configs/colibri_t20_iris.h
@@ -9,9 +9,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) # "
 #define CONFIG_TEGRA_BOARD_STRING  "Toradex Colibri T20 on Iris"

diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index d9e2d8691449f98168bee74e78ef2aec5528c1fe..782b9d16b7a4f7c8ab1fcf1fa6e9a9647505170e 100644 (file)
--- 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 915245ebf86731c2858a6b9b4573d131a4727249..936be145119d1e55a810ccc95bb922cb8a9b0f72 100644 (file)
--- 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 e3bb27f2162e49a07e362a3c95f519dede499c4c..ff7ec4a93bb79b0b9de7229b6f864dc314828c23 100644 (file)
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -21,9 +21,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) # "
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Dalmore"

diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index 97db202be7de92b8e20fbb882beab14e3f6004cc..ff9fbc9965a25e0856c3849d8628eb98b2f0144a 100644 (file)
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -11,9 +11,6 @@
 #include <linux/sizes.h>
 #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) # "
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Harmony"

diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h
index dc7e3244f9302ecb0526c6d15ec6668df3a8edaa..d67c025b9c61cd75c254ab6fd7cba867da7ae3e6 100644 (file)
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -12,9 +12,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) # "
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Jetson TK1"

diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h
index 5e5257443a5201145188e197d458482f4c4f9fda..ac5208fa0d342573059c24e075adb5e39c2c87bf 100644 (file)
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -12,9 +12,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) # "
 #define CONFIG_TEGRA_BOARD_STRING      "Avionic Design Medcom-Wide"

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index f5e83ff7d87e5b18fff72e7300b2aa8caa6f4769..bb070600021b4a7da9728aaaafd3c9ba132ddf5c 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -14,9 +14,6 @@
 /* MicroBlaze CPU */
 #define        MICROBLAZE_V5           1
 
-/* Open Firmware DTS */
-#define CONFIG_DEFAULT_DEVICE_TREE microblaze-generic
-
 /* linear and spi flash memory */
 #ifdef XILINX_FLASH_START
 #define        FLASH

diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index 29dcc4a298e641750c1dcc5099a686af84953600..b616ac2fbd24bb52faf6186ca3c246a1000f5a94 100644 (file)
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -16,8 +16,6 @@
 
 #define CONFIG_SYS_PROMPT      "Odroid # "     /* Monitor Command Prompt */
 
-#undef CONFIG_DEFAULT_DEVICE_TREE
-#define CONFIG_DEFAULT_DEVICE_TREE     exynos4412-odroid
 
 #define CONFIG_SYS_L2CACHE_OFF
 #ifndef CONFIG_SYS_L2CACHE_OFF

diff --git a/include/configs/origen.h b/include/configs/origen.h
index 5d24916389c557f986655548e743b93d176afed7..fb1536c62ca887b84e79cf8da9f2010cbc3d13ef 100644 (file)
--- 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 01cb649a9d8729134eb71887db2c15924c973e67..45bb47088bc5e67cd886ef32d23543e30e8cb58a 100644 (file)
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -20,9 +20,6 @@
 #include <linux/sizes.h>
 #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 # "
 #define CONFIG_TEGRA_BOARD_STRING      "Compal Paz00"

diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h
index 88c093fb9b4f3c1935b6034c4a9ac3bface3a93b..987cef504c9bd0d31ed23a7d207c6ce59cf8054d 100644 (file)
--- 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 719d81a827f168b76d50e1eb9c3f0540ffc74a6b..b663b89d2c709761946c18a2bd5470878f04fbdc 100644 (file)
--- a/include/configs/plutux.h
+++ b/include/configs/plutux.h
@@ -12,9 +12,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) # "
 #define CONFIG_TEGRA_BOARD_STRING      "Avionic Design Plutux"

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index 20985da9a0e4df6c2625369be434b0887d97f0a6..082d51c52b5aa287cc4ad9597555303dff2753ae 100644 (file)
--- 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 31a0ff97d67d8b94eb695d0d8e8c625a947f3eb7..5d364164c04fa6bea55373e1f76d9645fc18e9d5 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -44,7 +44,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 e61811d9d7ec1c58cce5530ff2878aed5211f60d..04e4f82759fb780150958033fc3eadd2bc19026c 100644 (file)
--- a/include/configs/seaboard.h
+++ b/include/configs/seaboard.h
@@ -19,9 +19,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) # "
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Seaboard"

diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 66fa1799e7b53edc8ea7dad78a82710bdcf04c43..61170941c128e463d877cf98bea4b7a2b45879cf 100644 (file)
--- 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 606739b02e55ce46b68e66c8a11b8553b1a62765..36a156f7a74ccad0f9d42004b65bbafd46f5f95b 100644 (file)
--- 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 673fa1469b88e2fc468072a5b29bcedb3f74ba55..fbaaa593cc8f112ce495cd2daa3406d8e286976d 100644 (file)
--- 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 5b4c25548cb3d6fb0572bf3132a9bf6ff794df86..51f87dacdbedf826119c24d8a8435223a7938021 100644 (file)
--- a/include/configs/tec-ng.h
+++ b/include/configs/tec-ng.h
@@ -10,9 +10,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) # "
 #define CONFIG_TEGRA_BOARD_STRING      "Avionic Design Tamonten™ NG Evaluation Carrier"

diff --git a/include/configs/tec.h b/include/configs/tec.h
index 0598d5daaf65633bc7fb8b76925c2322d39b3ff4..9ea4ff497115b200bbfebd591f7fa35f414ef460 100644 (file)
--- a/include/configs/tec.h
+++ b/include/configs/tec.h
@@ -12,9 +12,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) # "
 #define CONFIG_TEGRA_BOARD_STRING      "Avionic Design Tamonten Evaluation Carrier"

diff --git a/include/configs/trats.h b/include/configs/trats.h
index 6fa646bb8cfecd0f19ef46ac26624b315a3d193d..43751e7938eaaabf96a853659d37852feb11eded 100644 (file)
--- 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 14508650e46acd3455150e831f227c6a82167e6e..e9a04f7af3b2f6a72e1d6f8d7db4aa661ff1b290 100644 (file)
--- 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 2ef010cffaf0900f7f9ab6236ebb8df516bfdf2f..7c0064267dabec1f53beaa14c12fd0d4998b5d32 100644 (file)
--- a/include/configs/trimslice.h
+++ b/include/configs/trimslice.h
@@ -11,9 +11,6 @@
 #include <linux/sizes.h>
 #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) # "
 #define CONFIG_TEGRA_BOARD_STRING      "Compulab Trimslice"

diff --git a/include/configs/venice2.h b/include/configs/venice2.h
index b516d920c5ee2b6a2e61e468c7b0ee10d37e2068..6897aa8aa3d81bfe780ffdbf1999ccad2b1c1e97 100644 (file)
--- a/include/configs/venice2.h
+++ b/include/configs/venice2.h
@@ -12,9 +12,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) # "
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Venice2"

diff --git a/include/configs/ventana.h b/include/configs/ventana.h
index 3b9d1429690ff32425870044cb56668b7c80b75f..f195f8a6eac36c0e3462fe4b5808d5151aba5f02 100644 (file)
--- a/include/configs/ventana.h
+++ b/include/configs/ventana.h
@@ -11,9 +11,6 @@
 #include <linux/sizes.h>
 #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) # "
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Ventana"

diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 089793209591ef83f638c855a006890710609aef..f3af971214a53813be6f3c84bada20d81595faed 100644 (file)
--- 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 f3bf806886e6f4c24db94bc869f018b0db677aac..10e70d28b1ae3823330e8e7d2a3ff87984b33ba2 100644 (file)
--- a/include/configs/whistler.h
+++ b/include/configs/whistler.h
@@ -11,9 +11,6 @@
 #include <linux/sizes.h>
 #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) # "
 #define CONFIG_TEGRA_BOARD_STRING      "NVIDIA Whistler"

diff --git a/include/configs/zynq_microzed.h b/include/configs/zynq_microzed.h
index b0328a2cc17683a81cbfbc53fa744a47bf0815bb..549a664ef58e018c7bcc210766dfe41a072b7ac0 100644 (file)
--- 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 291a5fef51dd154b0b324458ec61bd5407642fcd..b6590547a9447efe5317523634a839cb5654d872 100644 (file)
--- 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 8aa96e7121b3b60672c0379bd50eb5c71f5af58a..16b904743f1e97f5487f850f81f6c0383a40c724 100644 (file)
--- 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 ce17d4060cca190b29c1776b153d503c101404a3..946de953e4a755a0dd65f1d225142ff8f3310ab0 100644 (file)
--- 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>