diff options
author | Jaewon Lee <jaewon.lee@xilinx.com> | 2018-05-25 14:52:58 -0700 |
---|---|---|
committer | Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> | 2019-01-01 20:03:46 -0800 |
commit | 9f3aa5b9db5d075fc70ef271670b905e650143cb (patch) | |
tree | 46e4e6b119ea255f9687113a511488c50d558423 | |
parent | f24275598687bcec0252186cb1d9c54b426fef9f (diff) | |
download | meta-xilinx-9f3aa5b9db5d075fc70ef271670b905e650143cb.tar.gz |
machine/*.conf: Set SPL_BINARY with weak assignment ?= in machine configs
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 <jaewon.lee@xilinx.com>
Signed-off-by: Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@xilinx.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-rw-r--r-- | meta-xilinx-bsp/conf/machine/microzed-zynq7.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/picozed-zynq7.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf | 2 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf | 2 | ||||
-rw-r--r-- | 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 bfd505b1..8869424d 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" | |||
13 | # u-boot configuration | 13 | # u-boot configuration |
14 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" | 14 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" |
15 | UBOOT_MACHINE = "zynq_microzed_config" | 15 | UBOOT_MACHINE = "zynq_microzed_config" |
16 | SPL_BINARY = "spl/boot.bin" | 16 | SPL_BINARY ?= "spl/boot.bin" |
17 | 17 | ||
18 | EXTRA_IMAGEDEPENDS += " \ | 18 | EXTRA_IMAGEDEPENDS += " \ |
19 | u-boot-zynq-uenv \ | 19 | 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 072d32a5..911bf90e 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" | |||
17 | # u-boot configuration | 17 | # u-boot configuration |
18 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" | 18 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" |
19 | UBOOT_MACHINE = "zynq_picozed_config" | 19 | UBOOT_MACHINE = "zynq_picozed_config" |
20 | SPL_BINARY = "spl/boot.bin" | 20 | SPL_BINARY ?= "spl/boot.bin" |
21 | 21 | ||
22 | EXTRA_IMAGEDEPENDS += " \ | 22 | EXTRA_IMAGEDEPENDS += " \ |
23 | u-boot-zynq-uenv \ | 23 | 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 19c80248..fbd58a6e 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" | |||
19 | 19 | ||
20 | # u-boot configuration | 20 | # u-boot configuration |
21 | UBOOT_MACHINE = "zynq_zc702_config" | 21 | UBOOT_MACHINE = "zynq_zc702_config" |
22 | SPL_BINARY = "spl/boot.bin" | 22 | SPL_BINARY ?= "spl/boot.bin" |
23 | 23 | ||
24 | EXTRA_IMAGEDEPENDS += " \ | 24 | EXTRA_IMAGEDEPENDS += " \ |
25 | u-boot-zynq-uenv \ | 25 | 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 3fa34c34..741ef5de 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" | |||
20 | 20 | ||
21 | # u-boot configuration | 21 | # u-boot configuration |
22 | UBOOT_MACHINE = "zynq_zc706_config" | 22 | UBOOT_MACHINE = "zynq_zc706_config" |
23 | SPL_BINARY = "spl/boot.bin" | 23 | SPL_BINARY ?= "spl/boot.bin" |
24 | 24 | ||
25 | EXTRA_IMAGEDEPENDS += " \ | 25 | EXTRA_IMAGEDEPENDS += " \ |
26 | u-boot-zynq-uenv \ | 26 | 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 75e134f3..834d9d3d 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 | |||
12 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 12 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
13 | 13 | ||
14 | UBOOT_MACHINE = "xilinx_zynqmp_zcu102_rev1_0_defconfig" | 14 | UBOOT_MACHINE = "xilinx_zynqmp_zcu102_rev1_0_defconfig" |
15 | SPL_BINARY = "spl/boot.bin" | 15 | SPL_BINARY ?= "spl/boot.bin" |
16 | 16 | ||
17 | # Default SD image build onfiguration, use qemu-sd to pad | 17 | # Default SD image build onfiguration, use qemu-sd to pad |
18 | IMAGE_CLASSES += "image-types-xilinx-qemu" | 18 | 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 43810d47..c4b4a032 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 | |||
12 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 12 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
13 | 13 | ||
14 | UBOOT_MACHINE = "xilinx_zynqmp_zcu104_revC_defconfig" | 14 | UBOOT_MACHINE = "xilinx_zynqmp_zcu104_revC_defconfig" |
15 | SPL_BINARY = "spl/boot.bin" | 15 | SPL_BINARY ?= "spl/boot.bin" |
16 | 16 | ||
17 | SERIAL_CONSOLE ?= "115200 ttyPS0" | 17 | SERIAL_CONSOLE ?= "115200 ttyPS0" |
18 | 18 | ||
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf index 0d3b9f62..136efb90 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 | |||
11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
12 | 12 | ||
13 | UBOOT_MACHINE = "xilinx_zynqmp_zcu106_revA_defconfig" | 13 | UBOOT_MACHINE = "xilinx_zynqmp_zcu106_revA_defconfig" |
14 | SPL_BINARY = "spl/boot.bin" | 14 | SPL_BINARY ?= "spl/boot.bin" |
15 | 15 | ||
16 | SERIAL_CONSOLE = "115200 ttyPS0" | 16 | SERIAL_CONSOLE = "115200 ttyPS0" |
17 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 17 | 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 8f11ea34..36c51b70 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 | |||
16 | 16 | ||
17 | # u-boot configuration | 17 | # u-boot configuration |
18 | UBOOT_MACHINE = "zynq_zed_config" | 18 | UBOOT_MACHINE = "zynq_zed_config" |
19 | SPL_BINARY = "spl/boot.bin" | 19 | SPL_BINARY ?= "spl/boot.bin" |
20 | 20 | ||
21 | EXTRA_IMAGEDEPENDS += " \ | 21 | EXTRA_IMAGEDEPENDS += " \ |
22 | u-boot-zynq-uenv \ | 22 | 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 66cf0280..ba355d56 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" | |||
20 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" | 20 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" |
21 | 21 | ||
22 | UBOOT_MACHINE = "zynq_zybo_config" | 22 | UBOOT_MACHINE = "zynq_zybo_config" |
23 | SPL_BINARY = "spl/boot.bin" | 23 | SPL_BINARY ?= "spl/boot.bin" |
24 | FORCE_PLATFORM_INIT = "1" | 24 | FORCE_PLATFORM_INIT = "1" |
25 | 25 | ||
26 | EXTRA_IMAGEDEPENDS += " \ | 26 | EXTRA_IMAGEDEPENDS += " \ |
diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf index ea0cccbf..049add9c 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" | |||
17 | # u-boot configuration | 17 | # u-boot configuration |
18 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" | 18 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" |
19 | UBOOT_MACHINE = "zynq_zybo_config" | 19 | UBOOT_MACHINE = "zynq_zybo_config" |
20 | SPL_BINARY = "spl/boot.bin" | 20 | SPL_BINARY ?= "spl/boot.bin" |
21 | 21 | ||
22 | EXTRA_IMAGEDEPENDS += " \ | 22 | EXTRA_IMAGEDEPENDS += " \ |
23 | u-boot-zynq-uenv \ | 23 | u-boot-zynq-uenv \ |