diff options
| author | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2021-09-28 22:26:24 -0700 |
|---|---|---|
| committer | Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> | 2021-09-28 23:06:42 -0700 |
| commit | 9685904085ad2c96a222d50737a53a0e88d3e23b (patch) | |
| tree | 267b9dd18f76c94e0dc3dc5efc4f9753e5a48361 /meta-xilinx-bsp/conf | |
| parent | 1b8ea589da186b52d98926a59b1a743f32d210e6 (diff) | |
| download | meta-xilinx-9685904085ad2c96a222d50737a53a0e88d3e23b.tar.gz | |
manual changes for overrides syntax fixes
Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp/conf')
26 files changed, 26 insertions, 26 deletions
diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc index d6cfd376..c2093ca6 100644 --- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc +++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc | |||
| @@ -41,7 +41,7 @@ def qemu_target_binary(d): | |||
| 41 | ta = "aarch64" | 41 | ta = "aarch64" |
| 42 | return "qemu-system-%s" % ta | 42 | return "qemu-system-%s" % ta |
| 43 | 43 | ||
| 44 | def qemu:zynqmp_unhalt(d, multiarch): | 44 | def qemu_zynqmp_unhalt(d, multiarch): |
| 45 | if multiarch: | 45 | if multiarch: |
| 46 | return "-global xlnx,zynqmp-boot.cpu-num=0 -global xlnx,zynqmp-boot.use-pmufw=true" | 46 | return "-global xlnx,zynqmp-boot.cpu-num=0 -global xlnx,zynqmp-boot.use-pmufw=true" |
| 47 | return "-device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4 -device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4" | 47 | return "-device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4 -device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4" |
diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf index 3f9d598a..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 ec7a0fe3..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/v350-versal.conf b/meta-xilinx-bsp/conf/machine/v350-versal.conf index f637f1ed..6741e2f3 100644 --- a/meta-xilinx-bsp/conf/machine/v350-versal.conf +++ b/meta-xilinx-bsp/conf/machine/v350-versal.conf | |||
| @@ -7,7 +7,7 @@ require conf/machine/include/machine-xilinx-default.inc | |||
| 7 | 7 | ||
| 8 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 8 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 9 | 9 | ||
| 10 | UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig" | 10 | UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" |
| 11 | 11 | ||
| 12 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 12 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
| 13 | 13 | ||
diff --git a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf index a7817c10..558cc85e 100644 --- a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf | |||
| @@ -10,7 +10,7 @@ SOC_VARIANT = "ai-core" | |||
| 10 | 10 | ||
| 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 12 | 12 | ||
| 13 | UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig" | 13 | UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" |
| 14 | 14 | ||
| 15 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 15 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
| 16 | 16 | ||
diff --git a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf index 5c02d023..1bda4cd1 100644 --- a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf +++ b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf | |||
| @@ -8,7 +8,7 @@ require conf/machine/include/machine-xilinx-default.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 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 14 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf index abf73a61..62c9bc04 100644 --- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf | |||
| @@ -10,7 +10,7 @@ SOC_VARIANT = "ai-core" | |||
| 10 | 10 | ||
| 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 11 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 12 | 12 | ||
| 13 | UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig" | 13 | UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" |
| 14 | 14 | ||
| 15 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 15 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
| 16 | 16 | ||
diff --git a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf index a2407d8b..97fb9cc7 100644 --- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf | |||
| @@ -7,7 +7,7 @@ require conf/machine/include/machine-xilinx-default.inc | |||
| 7 | 7 | ||
| 8 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" | 8 | MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost" |
| 9 | 9 | ||
| 10 | UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig" | 10 | UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" |
| 11 | 11 | ||
| 12 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 12 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
| 13 | 13 | ||
diff --git a/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx-bsp/conf/machine/versal-generic.conf index af7a042e..f6c158df 100644 --- a/meta-xilinx-bsp/conf/machine/versal-generic.conf +++ b/meta-xilinx-bsp/conf/machine/versal-generic.conf | |||
| @@ -11,7 +11,7 @@ MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost" | |||
| 11 | 11 | ||
| 12 | EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" | 12 | EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" |
| 13 | 13 | ||
| 14 | UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig" | 14 | UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" |
| 15 | 15 | ||
| 16 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 16 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
| 17 | 17 | ||
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf index 794506e7..39801e22 100644 --- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf +++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.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:versal_virt_defconfig" | 11 | UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig" |
| 12 | 12 | ||
| 13 | SERIAL_CONSOLES ?= "115200;ttyAMA0" | 13 | SERIAL_CONSOLES ?= "115200;ttyAMA0" |
| 14 | 14 | ||
diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf index e10008a7..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 fb709b78..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 369d5d75..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 2b0ba1a9..57570531 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 6f72250f..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 180562f0..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 6ea024f8..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 4c730d3f..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 98a580ed..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 54a27a9d..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 2e8e5071..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 09309045..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 7d6482bd..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 39ae6050..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/zynq-generic.conf b/meta-xilinx-bsp/conf/machine/zynq-generic.conf index d6bb5a9c..8a8d8f24 100644 --- a/meta-xilinx-bsp/conf/machine/zynq-generic.conf +++ b/meta-xilinx-bsp/conf/machine/zynq-generic.conf | |||
| @@ -11,7 +11,7 @@ MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget" | |||
| 11 | 11 | ||
| 12 | EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" | 12 | EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" |
| 13 | 13 | ||
| 14 | UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig" | 14 | UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig" |
| 15 | 15 | ||
| 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 16 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
| 17 | 17 | ||
diff --git a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf index 3a1f1638..6f33c199 100644 --- a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf | |||
| @@ -18,7 +18,7 @@ MACHINE_FEATURES += " usbgadget wifi bluetooth" | |||
| 18 | 18 | ||
| 19 | EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" | 19 | EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native" |
| 20 | 20 | ||
| 21 | UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig" | 21 | UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig" |
| 22 | SPL_BINARY ?= "spl/boot.bin" | 22 | SPL_BINARY ?= "spl/boot.bin" |
| 23 | 23 | ||
| 24 | # Default SD image build onfiguration, use qemu-sd to pad | 24 | # Default SD image build onfiguration, use qemu-sd to pad |
