diff options
author | Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> | 2022-12-01 11:45:38 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2022-12-02 08:44:13 -0600 |
commit | 21bef08cd45e207aec8c7c684d9ef323d3649bd3 (patch) | |
tree | d897fe5dbbde406af4a2283fb6c7f3944902add2 /meta-xilinx-vendor/conf | |
parent | 7843588040db6654f5fa5f7c4c33c33b26e2bac0 (diff) | |
download | meta-xilinx-21bef08cd45e207aec8c7c684d9ef323d3649bd3.tar.gz |
meta-xilinx-vendor: Rename u-boot scripts and uenv packages
In meta-xilinx-core u-boot-zynq-scr and u-boot-zynq-uenv recipes are
renamed to u-boot-xlnx-scr and u-boot-xlnx-uenv. Hence change these
in all the configuration files.
Also move common EXTRA_IMAGEDEPENDS to zynq-generic.conf files.
Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-vendor/conf')
4 files changed, 4 insertions, 14 deletions
diff --git a/meta-xilinx-vendor/conf/machine/microzed-zynq7.conf b/meta-xilinx-vendor/conf/machine/microzed-zynq7.conf index ce8058e4..750657dc 100644 --- a/meta-xilinx-vendor/conf/machine/microzed-zynq7.conf +++ b/meta-xilinx-vendor/conf/machine/microzed-zynq7.conf | |||
@@ -8,10 +8,7 @@ SPL_BINARY ?= "spl/boot.bin" | |||
8 | UBOOT_ELF = "u-boot" | 8 | UBOOT_ELF = "u-boot" |
9 | 9 | ||
10 | EXTRA_IMAGEDEPENDS += " \ | 10 | EXTRA_IMAGEDEPENDS += " \ |
11 | u-boot-zynq-uenv \ | 11 | u-boot-xlnx-uenv \ |
12 | virtual/boot-bin \ | ||
13 | virtual/bootloader \ | ||
14 | u-boot-zynq-scr \ | ||
15 | " | 12 | " |
16 | 13 | ||
17 | KERNEL_DEVICETREE = "zynq-microzed.dtb" | 14 | KERNEL_DEVICETREE = "zynq-microzed.dtb" |
diff --git a/meta-xilinx-vendor/conf/machine/minized-zynq7.conf b/meta-xilinx-vendor/conf/machine/minized-zynq7.conf index af9d982d..415ebc61 100644 --- a/meta-xilinx-vendor/conf/machine/minized-zynq7.conf +++ b/meta-xilinx-vendor/conf/machine/minized-zynq7.conf | |||
@@ -9,8 +9,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost wifi bluetooth" | |||
9 | UBOOT_MACHINE ?= "zynq_minized_config" | 9 | UBOOT_MACHINE ?= "zynq_minized_config" |
10 | 10 | ||
11 | EXTRA_IMAGEDEPENDS += " \ | 11 | EXTRA_IMAGEDEPENDS += " \ |
12 | u-boot-zynq-uenv \ | 12 | u-boot-xlnx-uenv \ |
13 | virtual/bootloader \ | ||
14 | " | 13 | " |
15 | 14 | ||
16 | SERIAL_CONSOLES ?= "115200;ttyPS0" | 15 | SERIAL_CONSOLES ?= "115200;ttyPS0" |
diff --git a/meta-xilinx-vendor/conf/machine/picozed-zynq7.conf b/meta-xilinx-vendor/conf/machine/picozed-zynq7.conf index 31f5e220..3ce023a6 100644 --- a/meta-xilinx-vendor/conf/machine/picozed-zynq7.conf +++ b/meta-xilinx-vendor/conf/machine/picozed-zynq7.conf | |||
@@ -12,10 +12,7 @@ SPL_BINARY ?= "spl/boot.bin" | |||
12 | UBOOT_ELF = "u-boot" | 12 | UBOOT_ELF = "u-boot" |
13 | 13 | ||
14 | EXTRA_IMAGEDEPENDS += " \ | 14 | EXTRA_IMAGEDEPENDS += " \ |
15 | u-boot-zynq-uenv \ | 15 | u-boot-xlnx-uenv \ |
16 | virtual/boot-bin \ | ||
17 | virtual/bootloader \ | ||
18 | u-boot-zynq-scr \ | ||
19 | " | 16 | " |
20 | 17 | ||
21 | IMAGE_BOOT_FILES += " \ | 18 | IMAGE_BOOT_FILES += " \ |
diff --git a/meta-xilinx-vendor/conf/machine/zybo-zynq7.conf b/meta-xilinx-vendor/conf/machine/zybo-zynq7.conf index 74d117c0..37c4b6cc 100644 --- a/meta-xilinx-vendor/conf/machine/zybo-zynq7.conf +++ b/meta-xilinx-vendor/conf/machine/zybo-zynq7.conf | |||
@@ -12,10 +12,7 @@ SPL_BINARY ?= "spl/boot.bin" | |||
12 | UBOOT_ELF = "u-boot" | 12 | UBOOT_ELF = "u-boot" |
13 | 13 | ||
14 | EXTRA_IMAGEDEPENDS += " \ | 14 | EXTRA_IMAGEDEPENDS += " \ |
15 | u-boot-zynq-uenv \ | 15 | u-boot-xlnx-uenv \ |
16 | virtual/boot-bin \ | ||
17 | virtual/bootloader \ | ||
18 | u-boot-zynq-scr \ | ||
19 | " | 16 | " |
20 | 17 | ||
21 | KERNEL_DEVICETREE = "zynq-zybo.dtb" | 18 | KERNEL_DEVICETREE = "zynq-zybo.dtb" |