summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaewon Lee <jaewon.lee@xilinx.com>2019-09-09 15:44:59 -0700
committerSai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>2019-12-13 13:27:17 -0800
commit3414a60f200b2d3cdc3fd3511d217b350b3e6654 (patch)
treef8833180d2ca0968de25d603112302508539967e
parent5075454cc5adac306821d803d228ba6c0af8b2e0 (diff)
downloadmeta-xilinx-3414a60f200b2d3cdc3fd3511d217b350b3e6654.tar.gz
zynq/zynqmp confs: Adding boot.scr to IMAGE_BOOT_FILES
Adding boot.scr to IMAGE_BOOT_FILES so boot.scr is included in the wic sd card generation, if wic image generation is enabled Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-rw-r--r--meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zc702-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zc706-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf1
10 files changed, 10 insertions, 0 deletions
diff --git a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
index b866316b..6bd868a1 100644
--- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
@@ -36,4 +36,5 @@ EXTRA_IMAGEDEPENDS += " \
36IMAGE_BOOT_FILES += " \ 36IMAGE_BOOT_FILES += " \
37 uEnv.txt \ 37 uEnv.txt \
38 atf-uboot.ub \ 38 atf-uboot.ub \
39 boot.scr \
39 " 40 "
diff --git a/meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf
index 467e9009..ed9235b3 100644
--- a/meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf
@@ -36,4 +36,5 @@ EXTRA_IMAGEDEPENDS += " \
36IMAGE_BOOT_FILES += " \ 36IMAGE_BOOT_FILES += " \
37 uEnv.txt \ 37 uEnv.txt \
38 atf-uboot.ub \ 38 atf-uboot.ub \
39 boot.scr \
39 " 40 "
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index b3bc1de3..3929d6ac 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -35,6 +35,7 @@ KERNEL_DEVICETREE = "zynq-zc702.dtb"
35IMAGE_BOOT_FILES += " \ 35IMAGE_BOOT_FILES += " \
36 boot.bin \ 36 boot.bin \
37 uEnv.txt \ 37 uEnv.txt \
38 boot.scr \
38 " 39 "
39 40
40# Although not fully supported you can run this machine on the mainline QEMU 'xilinx-zynq-a9' machine 41# Although not fully supported you can run this machine on the mainline QEMU 'xilinx-zynq-a9' machine
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index 9219d57b..3c2c847c 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -36,6 +36,7 @@ KERNEL_DEVICETREE = "zynq-zc706.dtb"
36IMAGE_BOOT_FILES += " \ 36IMAGE_BOOT_FILES += " \
37 boot.bin \ 37 boot.bin \
38 uEnv.txt \ 38 uEnv.txt \
39 boot.scr \
39 " 40 "
40 41
41# Although not fully supported you can run this machine on the mainline QEMU 'xilinx-zynq-a9' machine 42# Although not fully supported you can run this machine on the mainline QEMU 'xilinx-zynq-a9' machine
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 7812520f..59a33d49 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -40,6 +40,7 @@ IMAGE_BOOT_FILES += " \
40 uEnv.txt \ 40 uEnv.txt \
41 atf-uboot.ub \ 41 atf-uboot.ub \
42 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \ 42 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
43 boot.scr \
43 " 44 "
44 45
45# This machine has a QEMU model, runqemu setup: 46# This machine has a QEMU model, runqemu setup:
diff --git a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
index 50767514..1d419250 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -36,6 +36,7 @@ EXTRA_IMAGEDEPENDS += " \
36IMAGE_BOOT_FILES += " \ 36IMAGE_BOOT_FILES += " \
37 uEnv.txt \ 37 uEnv.txt \
38 atf-uboot.ub \ 38 atf-uboot.ub \
39 boot.scr \
39 " 40 "
40 41
41MACHINE_HWCODECS = "libomxil-xlnx" 42MACHINE_HWCODECS = "libomxil-xlnx"
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index 6919891f..718cb331 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -35,6 +35,7 @@ EXTRA_IMAGEDEPENDS += " \
35IMAGE_BOOT_FILES += " \ 35IMAGE_BOOT_FILES += " \
36 uEnv.txt \ 36 uEnv.txt \
37 atf-uboot.ub \ 37 atf-uboot.ub \
38 boot.scr \
38 " 39 "
39 40
40MACHINE_HWCODECS = "libomxil-xlnx" 41MACHINE_HWCODECS = "libomxil-xlnx"
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index a7970975..77b25847 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -36,4 +36,5 @@ EXTRA_IMAGEDEPENDS += " \
36IMAGE_BOOT_FILES += " \ 36IMAGE_BOOT_FILES += " \
37 uEnv.txt \ 37 uEnv.txt \
38 atf-uboot.ub \ 38 atf-uboot.ub \
39 boot.scr \
39 " 40 "
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
index 5137c8a6..b84eb966 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
@@ -36,4 +36,5 @@ EXTRA_IMAGEDEPENDS += " \
36IMAGE_BOOT_FILES += " \ 36IMAGE_BOOT_FILES += " \
37 uEnv.txt \ 37 uEnv.txt \
38 atf-uboot.ub \ 38 atf-uboot.ub \
39 boot.scr \
39 " 40 "
diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
index 89b8f478..a96303b0 100644
--- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
@@ -33,5 +33,6 @@ KERNEL_DEVICETREE = "zynq-zed.dtb"
33IMAGE_BOOT_FILES += " \ 33IMAGE_BOOT_FILES += " \
34 boot.bin \ 34 boot.bin \
35 uEnv.txt \ 35 uEnv.txt \
36 boot.scr \
36 " 37 "
37 38