From ca6c1f49560f3a87660af221faaaece5caab650a Mon Sep 17 00:00:00 2001 From: Jaewon Lee Date: Mon, 9 Sep 2019 15:44:59 -0700 Subject: 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 Signed-off-by: Manjukumar Matha --- meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf | 1 + meta-xilinx-bsp/conf/machine/zc1275-zynqmp.conf | 1 + meta-xilinx-bsp/conf/machine/zc702-zynq7.conf | 1 + meta-xilinx-bsp/conf/machine/zc706-zynq7.conf | 1 + meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf | 1 + meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf | 1 + meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf | 1 + meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf | 1 + meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf | 1 + meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf | 1 + 10 files changed, 10 insertions(+) (limited to 'meta-xilinx-bsp') 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 += " \ IMAGE_BOOT_FILES += " \ uEnv.txt \ atf-uboot.ub \ + boot.scr \ " 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 += " \ IMAGE_BOOT_FILES += " \ uEnv.txt \ atf-uboot.ub \ + boot.scr \ " 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" IMAGE_BOOT_FILES += " \ boot.bin \ uEnv.txt \ + boot.scr \ " # 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" IMAGE_BOOT_FILES += " \ boot.bin \ uEnv.txt \ + boot.scr \ " # 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 += " \ uEnv.txt \ atf-uboot.ub \ ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \ + boot.scr \ " # 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 += " \ IMAGE_BOOT_FILES += " \ uEnv.txt \ atf-uboot.ub \ + boot.scr \ " MACHINE_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 += " \ IMAGE_BOOT_FILES += " \ uEnv.txt \ atf-uboot.ub \ + boot.scr \ " MACHINE_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 += " \ IMAGE_BOOT_FILES += " \ uEnv.txt \ atf-uboot.ub \ + boot.scr \ " 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 += " \ IMAGE_BOOT_FILES += " \ uEnv.txt \ atf-uboot.ub \ + boot.scr \ " 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" IMAGE_BOOT_FILES += " \ boot.bin \ uEnv.txt \ + boot.scr \ " -- cgit v1.2.3-54-g00ecf