From d72fa7e585d81ce217254485c8b4b3ff78b8addb Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Thu, 26 Nov 2015 19:04:00 +1000 Subject: conf/machine/*-zynq7.conf: Update the configuration of SPL Machines now only need to set SPL_BINARY to 'boot.bin' to enable the generation of boot.bin and/or u-boot-spl binaries. If a machine sets SPL_BINARY and does not provide any way to attain the platform init code bitbake will fail with a dependency error. Signed-off-by: Nathan Rossi --- conf/machine/microzed-zynq7.conf | 3 +-- conf/machine/picozed-zynq7.conf | 2 +- conf/machine/zc702-zynq7.conf | 3 +-- conf/machine/zc706-zynq7.conf | 3 +-- conf/machine/zedboard-zynq7.conf | 3 +-- conf/machine/zybo-zynq7.conf | 3 +-- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/conf/machine/microzed-zynq7.conf b/conf/machine/microzed-zynq7.conf index 374e7107..5182051c 100644 --- a/conf/machine/microzed-zynq7.conf +++ b/conf/machine/microzed-zynq7.conf @@ -10,6 +10,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost" # microZed machine definition known by Xilinx UBOOT UBOOT_MACHINE = "zynq_microzed_config" +SPL_BINARY = "boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" @@ -20,5 +21,3 @@ MACHINE_DEVICETREE := " \ IMAGE_BOOT_FILES += "boot.bin ${MACHINE}.dtb" -EXTRA_IMAGEDEPENDS += "virtual/boot-bin" - diff --git a/conf/machine/picozed-zynq7.conf b/conf/machine/picozed-zynq7.conf index 63466aee..1f45dad7 100644 --- a/conf/machine/picozed-zynq7.conf +++ b/conf/machine/picozed-zynq7.conf @@ -14,6 +14,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" # microZed machine definition known by Xilinx UBOOT UBOOT_MACHINE = "zynq_picozed_config" +SPL_BINARY = "boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" @@ -24,4 +25,3 @@ MACHINE_DEVICETREE := " \ IMAGE_BOOT_FILES += "boot.bin ${MACHINE}.dtb" -EXTRA_IMAGEDEPENDS += "virtual/boot-bin" diff --git a/conf/machine/zc702-zynq7.conf b/conf/machine/zc702-zynq7.conf index eb5cbffe..1417c514 100644 --- a/conf/machine/zc702-zynq7.conf +++ b/conf/machine/zc702-zynq7.conf @@ -17,6 +17,7 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" # ZC702 machine definition known by Xilinx UBOOT UBOOT_MACHINE = "zynq_zc702_config" +SPL_BINARY = "boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" @@ -29,5 +30,3 @@ KERNEL_FEATURES += "features/rtc/rtc.scc" IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${MACHINE}.dtb" -EXTRA_IMAGEDEPENDS += "virtual/boot-bin" - diff --git a/conf/machine/zc706-zynq7.conf b/conf/machine/zc706-zynq7.conf index 0e227d38..07001424 100644 --- a/conf/machine/zc706-zynq7.conf +++ b/conf/machine/zc706-zynq7.conf @@ -17,6 +17,7 @@ MACHINE_FEATURES = "rtc ext2 vfat usbhost usbgadget" # ZC706 machine definition known by Xilinx UBOOT UBOOT_MACHINE = "zynq_zc706_config" +SPL_BINARY = "boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" @@ -27,5 +28,3 @@ MACHINE_DEVICETREE := " \ KERNEL_FEATURES += "features/rtc/rtc.scc" -EXTRA_IMAGEDEPENDS += "virtual/boot-bin" - diff --git a/conf/machine/zedboard-zynq7.conf b/conf/machine/zedboard-zynq7.conf index 00a93cad..cbf0f012 100644 --- a/conf/machine/zedboard-zynq7.conf +++ b/conf/machine/zedboard-zynq7.conf @@ -14,6 +14,7 @@ require conf/machine/include/machine-xilinx-board.inc # Zedboard machine definition known by Xilinx UBOOT UBOOT_MACHINE = "zynq_zed_config" +SPL_BINARY = "boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" @@ -24,5 +25,3 @@ MACHINE_DEVICETREE := " \ IMAGE_BOOT_FILES += "boot.bin uEnv.txt ${MACHINE}.dtb" -EXTRA_IMAGEDEPENDS += "virtual/boot-bin" - diff --git a/conf/machine/zybo-zynq7.conf b/conf/machine/zybo-zynq7.conf index b1be2a03..4ec12aab 100644 --- a/conf/machine/zybo-zynq7.conf +++ b/conf/machine/zybo-zynq7.conf @@ -13,6 +13,7 @@ require conf/machine/include/machine-xilinx-board.inc MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" UBOOT_MACHINE = "zynq_zybo_config" +SPL_BINARY = "boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" @@ -23,5 +24,3 @@ MACHINE_DEVICETREE := " \ IMAGE_BOOT_FILES += "boot.bin ${MACHINE}.dtb" -EXTRA_IMAGEDEPENDS += "virtual/boot-bin" - -- cgit v1.2.3-54-g00ecf