Skip to contentSkip to conversation

zynq: zybo: Move CONFIG_DEFAULT_DEVICE_TREE to defconfig

PATCH New Michal Simek 2 participants 2 messages Nov 13, 2014 Arm/Zynq architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 zynq: zybo: Move CONFIG_DEFAULT_DEVICE_TREE to defconfig

Move CONFIG_DEFAULT_DEVICE_TREE from board config
directly to defconfig.

This patch removes compilation warning:
include/configs/zynq_zybo.h:24:0: warning: "CONFIG_DEFAULT_DEVICE_TREE" redefined [enabled by default]
#define CONFIG_DEFAULT_DEVICE_TREE zynq-zybo

---

 configs/zynq_zybo_defconfig | 2 ++
 include/configs/zynq_zybo.h | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
configs/zynq_zybo_defconfig +2 -0
index a00f4fcea5b7..12311cd83b50 100644
@@ -2,3 +2,5 @@ CONFIG_SPL=y
 +S:CONFIG_ARM=y
 +S:CONFIG_ZYNQ=y
 +S:CONFIG_TARGET_ZYNQ_ZYBO=y
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"
include/configs/zynq_zybo.h +0 -1
index ce1527fafc51..191f2a5f301e 100644
@@ -21,7 +21,6 @@
 
 #define CONFIG_ZYNQ_SDHCI0
 #define CONFIG_ZYNQ_BOOT_FREEBSD
-#define CONFIG_DEFAULT_DEVICE_TREE	zynq-zybo
 
 /* Define ZYBO PS Clock Frequency to 50MHz */
 #define CONFIG_ZYNQ_PS_CLK_FREQ	50000000UL

--
1.8.2.3

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141113/4d06f3b5/attachment.pgp>

#1 lore raw

PATCH 1/1 zynq: zybo: Move CONFIG_DEFAULT_DEVICE_TREE to defconfig

Quoted 9 lines · Michal Simek

Move CONFIG_DEFAULT_DEVICE_TREE from board config
directly to defconfig.

This patch removes compilation warning:
include/configs/zynq_zybo.h:24:0: warning: "CONFIG_DEFAULT_DEVICE_TREE" redefined [enabled by default]
#define CONFIG_DEFAULT_DEVICE_TREE zynq-zybo

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141113/ac7786de/attachment.pgp>