summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2015-11-26 18:55:16 +1000
committerNathan Rossi <nathan@nathanrossi.com>2015-11-26 18:55:16 +1000
commite500385e6b8a66bd66c2df380ac3f20119133944 (patch)
tree4a1c522b134099f8b0aacfaecbcab2499dfc2fc7
parentea4deb40320dde75030e9334f49a6001b5a12b4f (diff)
downloadmeta-xilinx-e500385e6b8a66bd66c2df380ac3f20119133944.tar.gz
zc70*-zynq7: Update U-Boot config
Newer versions of U-Boot provide seperate configs for the ZC702 and ZC706, setup the machines to use the correct config corresponding to the machine. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-rw-r--r--conf/machine/zc702-zynq7.conf4
-rw-r--r--conf/machine/zc706-zynq7.conf4
2 files changed, 4 insertions, 4 deletions
diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf
index 096d9d11..eb5cbffe 100644
--- a/conf/machine/zc702-zynq7.conf
+++ b/conf/machine/zc702-zynq7.conf
@@ -15,8 +15,8 @@ require conf/machine/include/machine-xilinx-board.inc
15 15
16MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" 16MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
17 17
18# ZC70x machine definition known by Xilinx UBOOT 18# ZC702 machine definition known by Xilinx UBOOT
19UBOOT_MACHINE = "zynq_zc70x_config" 19UBOOT_MACHINE = "zynq_zc702_config"
20 20
21SERIAL_CONSOLE = "115200 ttyPS0" 21SERIAL_CONSOLE = "115200 ttyPS0"
22 22
diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf
index 8bc04836..0e227d38 100644
--- a/conf/machine/zc706-zynq7.conf
+++ b/conf/machine/zc706-zynq7.conf
@@ -15,8 +15,8 @@ require conf/machine/include/machine-xilinx-board.inc
15 15
16MACHINE_FEATURES = "rtc ext2 vfat usbhost usbgadget" 16MACHINE_FEATURES = "rtc ext2 vfat usbhost usbgadget"
17 17
18# ZC70x machine definition known by Xilinx UBOOT 18# ZC706 machine definition known by Xilinx UBOOT
19UBOOT_MACHINE = "zynq_zc70x_config" 19UBOOT_MACHINE = "zynq_zc706_config"
20 20
21SERIAL_CONSOLE = "115200 ttyPS0" 21SERIAL_CONSOLE = "115200 ttyPS0"
22 22