From 3f604ff9868892c7837e8ecc1419e8ea39107c24 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 30 Mar 2016 23:29:45 +1000 Subject: conf/machine/*-zynq7.conf: Use 'spl/boot.bin' for Zynq SPL images The boot.bin built by u-boot is located in spl/boot.bin, this is now the default location of the build product and is consistent between mainline and the Xilinx vendor tree. This was upstream as of v2016.01 of u-boot. Signed-off-by: Nathan Rossi --- conf/machine/microzed-zynq7.conf | 2 +- conf/machine/picozed-zynq7.conf | 2 +- conf/machine/zc702-zynq7.conf | 2 +- conf/machine/zc706-zynq7.conf | 2 +- conf/machine/zedboard-zynq7.conf | 2 +- conf/machine/zybo-zynq7.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf index 94283a81..9a00e61d 100644 --- a/conf/machine/microzed-zynq7.conf +++ b/conf/machine/microzed-zynq7.conf @@ -10,7 +10,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost" # u-boot configuration UBOOT_MACHINE = "zynq_microzed_config" -SPL_BINARY = "boot.bin" +SPL_BINARY = "spl/boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" diff --git a/conf/machine/picozed-zynq7.conf b/conf/machine/picozed-zynq7.conf index 7e851f6c..12b0fde2 100644 --- a/conf/machine/picozed-zynq7.conf +++ b/conf/machine/picozed-zynq7.conf @@ -14,7 +14,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" # u-boot configuration UBOOT_MACHINE = "zynq_picozed_config" -SPL_BINARY = "boot.bin" +SPL_BINARY = "spl/boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf index 9a505b3a..503caa31 100644 --- a/conf/machine/zc702-zynq7.conf +++ b/conf/machine/zc702-zynq7.conf @@ -17,7 +17,7 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" # u-boot configuration UBOOT_MACHINE = "zynq_zc702_config" -SPL_BINARY = "boot.bin" +SPL_BINARY = "spl/boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf index 7f97addf..7c9c1aaa 100644 --- a/conf/machine/zc706-zynq7.conf +++ b/conf/machine/zc706-zynq7.conf @@ -17,7 +17,7 @@ MACHINE_FEATURES = "rtc ext2 vfat usbhost usbgadget" # u-boot configuration UBOOT_MACHINE = "zynq_zc706_config" -SPL_BINARY = "boot.bin" +SPL_BINARY = "spl/boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf index 0eb85e5b..90dc993b 100644 --- a/conf/machine/zedboard-zynq7.conf +++ b/conf/machine/zedboard-zynq7.conf @@ -14,7 +14,7 @@ require conf/machine/include/machine-xilinx-board.inc # u-boot configuration UBOOT_MACHINE = "zynq_zed_config" -SPL_BINARY = "boot.bin" +SPL_BINARY = "spl/boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" diff --git a/conf/machine/zybo-zynq7.conf b/conf/machine/zybo-zynq7.conf index 7fdcb183..361d7ccd 100644 --- a/conf/machine/zybo-zynq7.conf +++ b/conf/machine/zybo-zynq7.conf @@ -14,7 +14,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" # u-boot configuration UBOOT_MACHINE = "zynq_zybo_config" -SPL_BINARY = "boot.bin" +SPL_BINARY = "spl/boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" -- cgit v1.2.3-54-g00ecf