From 9bba9f1062b25f0117b5eefa5d415f75609d251a Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 9 Jun 2022 08:04:48 -0600 Subject: [PATCH] configs/zynqmp_kria_kv260_defconfig: add parameters to generate extlinux.conf This patch enables the zynqmp_kria_kv260_defconfig to auto-generate the extlinux.conf file. The board/zynqmp/kria/extlinux.conf and board/zynqmp/kria/post-build.sh have been removed as they are no longer necessary. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/zynqmp/kria/extlinux.conf | 4 ---- board/zynqmp/kria/post-build.sh | 8 -------- configs/zynqmp_kria_kv260_defconfig | 3 ++- 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 board/zynqmp/kria/extlinux.conf delete mode 100755 board/zynqmp/kria/post-build.sh diff --git a/board/zynqmp/kria/extlinux.conf b/board/zynqmp/kria/extlinux.conf deleted file mode 100644 index 663aabb7c3..0000000000 --- a/board/zynqmp/kria/extlinux.conf +++ /dev/null @@ -1,4 +0,0 @@ -label linux - kernel /Image - devicetree /system.dtb - append console=ttyPS1,115200 root=/dev/mmcblk1p2 rw rootwait diff --git a/board/zynqmp/kria/post-build.sh b/board/zynqmp/kria/post-build.sh deleted file mode 100755 index 9fd8bbf2c8..0000000000 --- a/board/zynqmp/kria/post-build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# genimage will need to find the extlinux.conf -# in the binaries directory - -BOARD_DIR="$(dirname $0)" - -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf diff --git a/configs/zynqmp_kria_kv260_defconfig b/configs/zynqmp_kria_kv260_defconfig index d4a72a0d19..c1366b705c 100644 --- a/configs/zynqmp_kria_kv260_defconfig +++ b/configs/zynqmp_kria_kv260_defconfig @@ -1,7 +1,8 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/kria/post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynqmp/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynqmp/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="ttyPS1,115200 mmcblk1p2" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v5.15_LTS_2022.1)/xlnx_rebase_v5.15_LTS_2022.1.tar.gz"