From 86c68fa6bae5ef99afedfe6630835d3fb092f2dd Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 9 Jun 2022 08:04:47 -0600 Subject: [PATCH] configs/zynqmp_zcu10x_defconfig: add parameters to generate extlinux.conf This patch enables the zynqmp_zcu102_defconfig and zynqmp_zcu106_defconfig to auto-generate the extlinux.conf file. The board/zynqmp/extlinux.conf has been removed as it is no longer necessary. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- board/zynqmp/extlinux.conf | 5 ----- configs/zynqmp_zcu102_defconfig | 1 + configs/zynqmp_zcu106_defconfig | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 board/zynqmp/extlinux.conf diff --git a/board/zynqmp/extlinux.conf b/board/zynqmp/extlinux.conf deleted file mode 100644 index ae3ec8614a..0000000000 --- a/board/zynqmp/extlinux.conf +++ /dev/null @@ -1,5 +0,0 @@ -label linux - kernel /Image - devicetree /system.dtb - append console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait - diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 5361981f5b..217fa0814b 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -2,6 +2,7 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y 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="ttyPS0,115200 mmcblk0p2" 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" diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index e1ea27a496..3d98dffe01 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -2,6 +2,7 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y 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="ttyPS0,115200 mmcblk0p2" 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"