diff options
| author | Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com> | 2021-04-28 18:01:41 +0530 |
|---|---|---|
| committer | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2021-07-14 14:57:15 -0700 |
| commit | a895ed95aba747bef685cfae691a44c564b50981 (patch) | |
| tree | 906b7eab1a6b016da062a139ad1cc82e93086294 /meta-xilinx-bsp | |
| parent | d6fd1dfc6ab958c9904ab620e31d5071a2f79939 (diff) | |
| download | meta-xilinx-a895ed95aba747bef685cfae691a44c564b50981.tar.gz | |
*.conf: use weaker assignment for UBOOT_MACHINE
Using weaker assingnment for UBOOT_MACHINE to update this value in
petalinux without _forcevariable.
Signed-off-by: Raju Kumar Pothuraju <raju.kumar-pothuraju@xilinx.com>
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp')
21 files changed, 21 insertions, 21 deletions
diff --git a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf index 411c13db..a34651b7 100644 --- a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf +++ b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf | |||
| @@ -19,5 +19,5 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" | |||
| 19 | 19 | ||
| 20 | EXTRA_IMAGEDEPENDS += "virtual/bitstream virtual/bootloader" | 20 | EXTRA_IMAGEDEPENDS += "virtual/bitstream virtual/bootloader" |
| 21 | 21 | ||
| 22 | UBOOT_MACHINE = "microblaze-generic_defconfig" | 22 | UBOOT_MACHINE ?= "microblaze-generic_defconfig" |
| 23 | UBOOT_INITIAL_ENV = "" | 23 | UBOOT_INITIAL_ENV = "" |
diff --git a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf index 8cfb4762..2ef9bde5 100644 --- a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf +++ b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf | |||
| @@ -17,5 +17,5 @@ SERIAL_CONSOLES ?= "115200;ttyS0" | |||
| 17 | 17 | ||
| 18 | EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" | 18 | EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" |
| 19 | 19 | ||
| 20 | UBOOT_MACHINE = "microblaze-generic_defconfig" | 20 | UBOOT_MACHINE ?= "microblaze-generic_defconfig" |
| 21 | UBOOT_INITIAL_ENV = "" | 21 | UBOOT_INITIAL_ENV = "" |
diff --git a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf index 9d8990c6..d97df6a3 100644 --- a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf +++ b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf | |||
| @@ -16,5 +16,5 @@ SERIAL_CONSOLES ?= "115200;ttyS0" | |||
| 16 | 16 | ||
| 17 | EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" | 17 | EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" |
| 18 | 18 | ||
| 19 | UBOOT_MACHINE = "microblaze-generic_defconfig" | 19 | UBOOT_MACHINE ?= "microblaze-generic_defconfig" |
| 20 | UBOOT_INITIAL_ENV = "" | 20 | UBOOT_INITIAL_ENV = "" |
diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf index c531dbb2..eac1b3dc 100644 --- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf | |||
| @@ -9,7 +9,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost" | |||
| 9 | 9 | ||
| 10 | # u-boot configuration | 10 | # u-boot configuration |
| 11 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" | 11 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" |
| 12 | UBOOT_MACHINE = "xilinx_zynq_virt_defconfig" | 12 | UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" |
| 13 | SPL_BINARY ?= "spl/boot.bin" | 13 | SPL_BINARY ?= "spl/boot.bin" |
| 14 | UBOOT_ELF = "u-boot" | 14 | UBOOT_ELF = "u-boot" |
| 15 | 15 | ||
diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf index 17e83334..db9c20bd 100644 --- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf | |||
| @@ -13,7 +13,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" | |||
| 13 | 13 | ||
| 14 | # u-boot configuration | 14 | # u-boot configuration |
| 15 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" | 15 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" |
| 16 | UBOOT_MACHINE = "xilinx_zynq_virt_defconfig" | 16 | UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" |
| 17 | SPL_BINARY ?= "spl/boot.bin" | 17 | SPL_BINARY ?= "spl/boot.bin" |
| 18 | UBOOT_ELF = "u-boot" | 18 | UBOOT_ELF = "u-boot" |
| 19 | 19 | ||
diff --git a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf index ad65087c..c79e1fb3 100644 --- a/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/ultra96-zynqmp.conf | |||
| @@ -11,7 +11,7 @@ BOARD = "ultra96" | |||
| 11 | 11 | ||
| 12 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth mipi" | 12 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth mipi" |
| 13 | 13 | ||
| 14 | UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig" | 14 | UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" |
| 15 | SPL_BINARY ?= "spl/boot.bin" | 15 | SPL_BINARY ?= "spl/boot.bin" |
| 16 | 16 | ||
| 17 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 17 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf index 0d45a7b3..d91d2ba3 100644 --- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf | |||
| @@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc | |||
| 10 | 10 | ||
| 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 12 | 12 | ||
| 13 | UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig" | 13 | UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" |
| 14 | SPL_BINARY ?= "spl/boot.bin" | 14 | SPL_BINARY ?= "spl/boot.bin" |
| 15 | 15 | ||
| 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf index edd3cb2d..82d47cb4 100644 --- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | |||
| @@ -16,7 +16,7 @@ require conf/machine/include/machine-xilinx-qemu.inc | |||
| 16 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 16 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 17 | 17 | ||
| 18 | # u-boot configuration | 18 | # u-boot configuration |
| 19 | UBOOT_MACHINE = "xilinx_zynq_virt_defconfig" | 19 | UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" |
| 20 | SPL_BINARY ?= "spl/boot.bin" | 20 | SPL_BINARY ?= "spl/boot.bin" |
| 21 | 21 | ||
| 22 | EXTRA_IMAGEDEPENDS += " \ | 22 | EXTRA_IMAGEDEPENDS += " \ |
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf index 10b5e29c..b5268689 100644 --- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | |||
| @@ -16,7 +16,7 @@ require conf/machine/include/machine-xilinx-qemu.inc | |||
| 16 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget" | 16 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget" |
| 17 | 17 | ||
| 18 | # u-boot configuration | 18 | # u-boot configuration |
| 19 | UBOOT_MACHINE = "xilinx_zynq_virt_defconfig" | 19 | UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" |
| 20 | SPL_BINARY ?= "spl/boot.bin" | 20 | SPL_BINARY ?= "spl/boot.bin" |
| 21 | 21 | ||
| 22 | EXTRA_IMAGEDEPENDS += " \ | 22 | EXTRA_IMAGEDEPENDS += " \ |
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf index 0add656f..46dc420c 100644 --- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | |||
| @@ -8,7 +8,7 @@ require conf/machine/include/machine-xilinx-qemu.inc | |||
| 8 | 8 | ||
| 9 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 9 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 10 | 10 | ||
| 11 | UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig" | 11 | UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" |
| 12 | SPL_BINARY ?= "spl/boot.bin" | 12 | SPL_BINARY ?= "spl/boot.bin" |
| 13 | 13 | ||
| 14 | # Default SD image build onfiguration, use qemu-sd to pad | 14 | # Default SD image build onfiguration, use qemu-sd to pad |
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf index f97ffa37..e6fa0b3f 100644 --- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | |||
| @@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc | |||
| 10 | 10 | ||
| 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 12 | 12 | ||
| 13 | UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig" | 13 | UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" |
| 14 | SPL_BINARY ?= "spl/boot.bin" | 14 | SPL_BINARY ?= "spl/boot.bin" |
| 15 | 15 | ||
| 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf index 045d6f6c..25bfd3a8 100644 --- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | |||
| @@ -9,7 +9,7 @@ require conf/machine/include/machine-xilinx-default.inc | |||
| 9 | 9 | ||
| 10 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 10 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 11 | 11 | ||
| 12 | UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig" | 12 | UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" |
| 13 | SPL_BINARY ?= "spl/boot.bin" | 13 | SPL_BINARY ?= "spl/boot.bin" |
| 14 | 14 | ||
| 15 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 15 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf index 813f7453..cbe0a627 100644 --- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf | |||
| @@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc | |||
| 10 | 10 | ||
| 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 12 | 12 | ||
| 13 | UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig" | 13 | UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" |
| 14 | SPL_BINARY ?= "spl/boot.bin" | 14 | SPL_BINARY ?= "spl/boot.bin" |
| 15 | 15 | ||
| 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf index 91d2761c..672411ea 100644 --- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf | |||
| @@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc | |||
| 10 | 10 | ||
| 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 12 | 12 | ||
| 13 | UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig" | 13 | UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" |
| 14 | SPL_BINARY ?= "spl/boot.bin" | 14 | SPL_BINARY ?= "spl/boot.bin" |
| 15 | 15 | ||
| 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf index 254974e8..c23c8ca5 100644 --- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf | |||
| @@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc | |||
| 10 | 10 | ||
| 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 12 | 12 | ||
| 13 | UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig" | 13 | UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" |
| 14 | SPL_BINARY ?= "spl/boot.bin" | 14 | SPL_BINARY ?= "spl/boot.bin" |
| 15 | 15 | ||
| 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf index 673ab9e4..92096220 100644 --- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf | |||
| @@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc | |||
| 10 | 10 | ||
| 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 12 | 12 | ||
| 13 | UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig" | 13 | UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" |
| 14 | SPL_BINARY ?= "spl/boot.bin" | 14 | SPL_BINARY ?= "spl/boot.bin" |
| 15 | 15 | ||
| 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf index 53cb31ae..3ebb9897 100644 --- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf | |||
| @@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc | |||
| 10 | 10 | ||
| 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 12 | 12 | ||
| 13 | UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig" | 13 | UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" |
| 14 | SPL_BINARY ?= "spl/boot.bin" | 14 | SPL_BINARY ?= "spl/boot.bin" |
| 15 | 15 | ||
| 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf index d731b6bb..a824de2c 100644 --- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf | |||
| @@ -12,7 +12,7 @@ require conf/machine/include/soc-zynq.inc | |||
| 12 | require conf/machine/include/machine-xilinx-default.inc | 12 | require conf/machine/include/machine-xilinx-default.inc |
| 13 | 13 | ||
| 14 | # u-boot configuration | 14 | # u-boot configuration |
| 15 | UBOOT_MACHINE = "xilinx_zynq_virt_defconfig" | 15 | UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" |
| 16 | SPL_BINARY ?= "spl/boot.bin" | 16 | SPL_BINARY ?= "spl/boot.bin" |
| 17 | 17 | ||
| 18 | EXTRA_IMAGEDEPENDS += " \ | 18 | EXTRA_IMAGEDEPENDS += " \ |
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 898954e9..137796c6 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf | |||
| @@ -15,7 +15,7 @@ SERIAL_CONSOLES ?= "115200;ttyPS0" | |||
| 15 | 15 | ||
| 16 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" | 16 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree" |
| 17 | 17 | ||
| 18 | UBOOT_MACHINE = "xilinx_zynq_virt_defconfig" | 18 | UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" |
| 19 | SPL_BINARY ?= "spl/boot.bin" | 19 | SPL_BINARY ?= "spl/boot.bin" |
| 20 | FORCE_PLATFORM_INIT = "1" | 20 | FORCE_PLATFORM_INIT = "1" |
| 21 | UBOOT_ELF = "u-boot" | 21 | UBOOT_ELF = "u-boot" |
diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf index d7af056a..c09cf519 100644 --- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf +++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf | |||
| @@ -13,7 +13,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget" | |||
| 13 | 13 | ||
| 14 | # u-boot configuration | 14 | # u-boot configuration |
| 15 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" | 15 | PREFERRED_PROVIDER_virtual/bootloader = "u-boot" |
| 16 | UBOOT_MACHINE = "xilinx_zynq_virt_defconfig" | 16 | UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" |
| 17 | SPL_BINARY ?= "spl/boot.bin" | 17 | SPL_BINARY ?= "spl/boot.bin" |
| 18 | UBOOT_ELF = "u-boot" | 18 | UBOOT_ELF = "u-boot" |
| 19 | 19 | ||
diff --git a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf index b2860b0c..a68ce048 100644 --- a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf | |||
| @@ -14,7 +14,7 @@ MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | |||
| 14 | 14 | ||
| 15 | EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" | 15 | EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" |
| 16 | 16 | ||
| 17 | UBOOT_MACHINE = "xilinx_zynqmp_virt_defconfig" | 17 | UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" |
| 18 | SPL_BINARY ?= "spl/boot.bin" | 18 | SPL_BINARY ?= "spl/boot.bin" |
| 19 | 19 | ||
| 20 | # Default SD image build onfiguration, use qemu-sd to pad | 20 | # Default SD image build onfiguration, use qemu-sd to pad |
