From: Jaewon Lee <[email protected]> Set SPL_BINARY with ?= instead of = to allow overwrite for this variable without using forcevariable. When not using xilinx-bootbin to generate the boot.bin, this variable should be set to '', to deploy spl boot.bin.
Signed-off-by: Jaewon Lee <[email protected]> Signed-off-by: Bhargava Sreekantappa Gayathri <[email protected]> Signed-off-by: Manjukumar Matha <[email protected]> --- meta-xilinx-bsp/conf/machine/microzed-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/picozed-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 2 +- meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf | 2 +- meta-xilinx-bsp/conf/machine/zybo-zynq7.conf | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf index bfd505b..8869424 100644 --- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf @@ -13,7 +13,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost" # u-boot configuration PREFERRED_PROVIDER_virtual/bootloader = "u-boot" UBOOT_MACHINE = "zynq_microzed_config" -SPL_BINARY = "spl/boot.bin" +SPL_BINARY ?= "spl/boot.bin" EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-uenv \ diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf index 072d32a..911bf90 100644 --- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf @@ -17,7 +17,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" # u-boot configuration PREFERRED_PROVIDER_virtual/bootloader = "u-boot" UBOOT_MACHINE = "zynq_picozed_config" -SPL_BINARY = "spl/boot.bin" +SPL_BINARY ?= "spl/boot.bin" EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-uenv \ diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf index 19c8024..fbd58a6 100644 --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf @@ -19,7 +19,7 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" # u-boot configuration UBOOT_MACHINE = "zynq_zc702_config" -SPL_BINARY = "spl/boot.bin" +SPL_BINARY ?= "spl/boot.bin" EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-uenv \ diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf index 3fa34c3..741ef5d 100644 --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf @@ -20,7 +20,7 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget" # u-boot configuration UBOOT_MACHINE = "zynq_zc706_config" -SPL_BINARY = "spl/boot.bin" +SPL_BINARY ?= "spl/boot.bin" EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-uenv \ diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index 75e134f..834d9d3 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf @@ -12,7 +12,7 @@ require conf/machine/include/machine-xilinx-qemu.inc MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" UBOOT_MACHINE = "xilinx_zynqmp_zcu102_rev1_0_defconfig" -SPL_BINARY = "spl/boot.bin" +SPL_BINARY ?= "spl/boot.bin" # Default SD image build onfiguration, use qemu-sd to pad IMAGE_CLASSES += "image-types-xilinx-qemu" diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf index 43810d4..c4b4a03 100644 --- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf @@ -12,7 +12,7 @@ require conf/machine/include/machine-xilinx-default.inc MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" UBOOT_MACHINE = "xilinx_zynqmp_zcu104_revC_defconfig" -SPL_BINARY = "spl/boot.bin" +SPL_BINARY ?= "spl/boot.bin" SERIAL_CONSOLE ?= "115200 ttyPS0" diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf index 0d3b9f6..136efb9 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf @@ -11,7 +11,7 @@ require conf/machine/include/machine-xilinx-default.inc MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" UBOOT_MACHINE = "xilinx_zynqmp_zcu106_revA_defconfig" -SPL_BINARY = "spl/boot.bin" +SPL_BINARY ?= "spl/boot.bin" SERIAL_CONSOLE = "115200 ttyPS0" SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf index 8f11ea3..36c51b7 100644 --- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf @@ -16,7 +16,7 @@ require conf/machine/include/machine-xilinx-default.inc # u-boot configuration UBOOT_MACHINE = "zynq_zed_config" -SPL_BINARY = "spl/boot.bin" +SPL_BINARY ?= "spl/boot.bin" EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-uenv \ diff --git a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf index 66cf028..ba355d5 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf @@ -20,7 +20,7 @@ SERIAL_CONSOLE = "115200 ttyPS0" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" UBOOT_MACHINE = "zynq_zybo_config" -SPL_BINARY = "spl/boot.bin" +SPL_BINARY ?= "spl/boot.bin" FORCE_PLATFORM_INIT = "1" EXTRA_IMAGEDEPENDS += " \ diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf index ea0cccb..049add9 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf @@ -17,7 +17,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" # u-boot configuration PREFERRED_PROVIDER_virtual/bootloader = "u-boot" UBOOT_MACHINE = "zynq_zybo_config" -SPL_BINARY = "spl/boot.bin" +SPL_BINARY ?= "spl/boot.bin" EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-uenv \ -- 2.7.4 -- _______________________________________________ meta-xilinx mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-xilinx
