* [Buildroot] [PATCH v2 2/4] configs/zynqmp_zcu10x_defconfig: add parameters to generate extlinux.conf
2022-06-09 14:04 [Buildroot] [PATCH v2 1/4] board/zynqmp/post-build.sh: auto-generate extlinux.conf Neal Frager
@ 2022-06-09 14:04 ` Neal Frager
2022-06-15 21:01 ` Luca Ceresoli
2022-06-09 14:04 ` [Buildroot] [PATCH v2 3/4] configs/zynqmp_kria_kv260_defconfig: " Neal Frager
` (4 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Neal Frager @ 2022-06-09 14:04 UTC (permalink / raw)
To: buildroot
Cc: Neal Frager, wesley, luca, giulio.benetti, michal.simek, yann.morin.1998
From: Neal Frager <neal.frager@amd.com>
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 <neal.frager@amd.com>
---
V1->V2:
- squashed zynqmp_zcu102_defconfig and zynqmp_zcu106_defconfig patches together
---
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"
--
2.17.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH v2 3/4] configs/zynqmp_kria_kv260_defconfig: add parameters to generate extlinux.conf
2022-06-09 14:04 [Buildroot] [PATCH v2 1/4] board/zynqmp/post-build.sh: auto-generate extlinux.conf Neal Frager
2022-06-09 14:04 ` [Buildroot] [PATCH v2 2/4] configs/zynqmp_zcu10x_defconfig: add parameters to generate extlinux.conf Neal Frager
@ 2022-06-09 14:04 ` Neal Frager
2022-06-15 21:01 ` Luca Ceresoli
2022-06-09 14:04 ` [Buildroot] [PATCH v2 4/4] board/zynqmp/post-build.sh: remove unnecessary if Neal Frager
` (3 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Neal Frager @ 2022-06-09 14:04 UTC (permalink / raw)
To: buildroot
Cc: Neal Frager, wesley, luca, giulio.benetti, michal.simek, yann.morin.1998
From: Neal Frager <neal.frager@amd.com>
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 <neal.frager@amd.com>
---
V1->V2:
- no changes
---
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"
--
2.17.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Buildroot] [PATCH v2 4/4] board/zynqmp/post-build.sh: remove unnecessary if
2022-06-09 14:04 [Buildroot] [PATCH v2 1/4] board/zynqmp/post-build.sh: auto-generate extlinux.conf Neal Frager
2022-06-09 14:04 ` [Buildroot] [PATCH v2 2/4] configs/zynqmp_zcu10x_defconfig: add parameters to generate extlinux.conf Neal Frager
2022-06-09 14:04 ` [Buildroot] [PATCH v2 3/4] configs/zynqmp_kria_kv260_defconfig: " Neal Frager
@ 2022-06-09 14:04 ` Neal Frager
2022-06-15 21:01 ` Luca Ceresoli
2022-06-15 5:20 ` [Buildroot] [PATCH v2 1/4] board/zynqmp/post-build.sh: auto-generate extlinux.conf Frager, Neal via buildroot
` (2 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Neal Frager @ 2022-06-09 14:04 UTC (permalink / raw)
To: buildroot
Cc: Neal Frager, wesley, luca, giulio.benetti, michal.simek, yann.morin.1998
From: Neal Frager <neal.frager@amd.com>
Now that all of the extlinux.conf files have been removed,
it is no longer necessary to check if the file exists.
Signed-off-by: Neal Frager <neal.frager@amd.com>
---
board/zynqmp/post-build.sh | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh
index 7387576414..0713bd1b05 100755
--- a/board/zynqmp/post-build.sh
+++ b/board/zynqmp/post-build.sh
@@ -7,15 +7,10 @@ BOARD_DIR="$(dirname $0)"
CONSOLE=$2
ROOT=$3
-FILE=${BOARD_DIR}/extlinux.conf
-if test -f "${FILE}"; then
- install -m 0644 -D "${FILE}" "${BINARIES_DIR}/extlinux.conf"
-else
- mkdir -p "${BINARIES_DIR}"
- cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
+mkdir -p "${BINARIES_DIR}"
+cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
label linux
kernel /Image
devicetree /system.dtb
append console=${CONSOLE} root=/dev/${ROOT} rw rootwait
__HEADER_EOF
-fi
--
2.17.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [Buildroot] [PATCH v2 1/4] board/zynqmp/post-build.sh: auto-generate extlinux.conf
2022-06-09 14:04 [Buildroot] [PATCH v2 1/4] board/zynqmp/post-build.sh: auto-generate extlinux.conf Neal Frager
` (2 preceding siblings ...)
2022-06-09 14:04 ` [Buildroot] [PATCH v2 4/4] board/zynqmp/post-build.sh: remove unnecessary if Neal Frager
@ 2022-06-15 5:20 ` Frager, Neal via buildroot
2022-06-15 21:00 ` Luca Ceresoli
2022-06-19 16:47 ` Arnout Vandecappelle
5 siblings, 0 replies; 10+ messages in thread
From: Frager, Neal via buildroot @ 2022-06-15 5:20 UTC (permalink / raw)
To: buildroot
Cc: Frager, Neal, wesley, luca, giulio.benetti, Simek, Michal,
yann.morin.1998
Hi,
> This patch uses the BR2_ROOTFS_POST_SCRIPT_ARGS to auto-generate the extlinux.conf file, so developers will only need to modify the board_defconfig file to change the console and boot file system locations.
> Signed-off-by: Neal Frager <neal.frager@amd.com>
> ---
> V1->V2:
> - generates extlinux.conf directly in output/images directory
> - uses "cat <<-" option to remove leading tabs
> ---
> board/zynqmp/post-build.sh | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
> diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh index 9fd8bbf2c8..7387576414 100755
> --- a/board/zynqmp/post-build.sh
> +++ b/board/zynqmp/post-build.sh
> @@ -4,5 +4,18 @@
> # in the binaries directory
> BOARD_DIR="$(dirname $0)"
> +CONSOLE=$2
> +ROOT=$3
> -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf
> +FILE=${BOARD_DIR}/extlinux.conf
> +if test -f "${FILE}"; then
> + install -m 0644 -D "${FILE}" "${BINARIES_DIR}/extlinux.conf"
> +else
> + mkdir -p "${BINARIES_DIR}"
> + cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
> + label linux
> + kernel /Image
> + devicetree /system.dtb
> + append console=${CONSOLE} root=/dev/${ROOT} rw rootwait
> + __HEADER_EOF
> +fi
> --
> 2.17.1
Any feedback on v2 of this patch set? Thank you!
Best regards,
Neal Frager
AMD
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Buildroot] [PATCH v2 1/4] board/zynqmp/post-build.sh: auto-generate extlinux.conf
2022-06-09 14:04 [Buildroot] [PATCH v2 1/4] board/zynqmp/post-build.sh: auto-generate extlinux.conf Neal Frager
` (3 preceding siblings ...)
2022-06-15 5:20 ` [Buildroot] [PATCH v2 1/4] board/zynqmp/post-build.sh: auto-generate extlinux.conf Frager, Neal via buildroot
@ 2022-06-15 21:00 ` Luca Ceresoli
2022-06-19 16:47 ` Arnout Vandecappelle
5 siblings, 0 replies; 10+ messages in thread
From: Luca Ceresoli @ 2022-06-15 21:00 UTC (permalink / raw)
To: Neal Frager, buildroot
Cc: wesley, Neal Frager, giulio.benetti, michal.simek, yann.morin.1998
Hi Neal,
apologies for the late review...
On 09/06/22 16:04, Neal Frager wrote:
> From: Neal Frager <neal.frager@amd.com>
>
> This patch uses the BR2_ROOTFS_POST_SCRIPT_ARGS to auto-generate the
> extlinux.conf file, so developers will only need to modify the
> board_defconfig file to change the console and boot file system locations.
>
> Signed-off-by: Neal Frager <neal.frager@amd.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Note that the above is the new e-mail address I'm using for Buildroot,
recently changed in DEVELOPERS.
--
Luca
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Buildroot] [PATCH v2 1/4] board/zynqmp/post-build.sh: auto-generate extlinux.conf
2022-06-09 14:04 [Buildroot] [PATCH v2 1/4] board/zynqmp/post-build.sh: auto-generate extlinux.conf Neal Frager
` (4 preceding siblings ...)
2022-06-15 21:00 ` Luca Ceresoli
@ 2022-06-19 16:47 ` Arnout Vandecappelle
5 siblings, 0 replies; 10+ messages in thread
From: Arnout Vandecappelle @ 2022-06-19 16:47 UTC (permalink / raw)
To: Neal Frager, buildroot
Cc: Neal Frager, wesley, luca, giulio.benetti, michal.simek, yann.morin.1998
On 09/06/2022 16:04, Neal Frager wrote:
> From: Neal Frager <neal.frager@amd.com>
>
> This patch uses the BR2_ROOTFS_POST_SCRIPT_ARGS to auto-generate the
> extlinux.conf file, so developers will only need to modify the
> board_defconfig file to change the console and boot file system locations.
>
> Signed-off-by: Neal Frager <neal.frager@amd.com>
Series applied to master, thanks. Very nicely structured series!
Regards,
Arnout
> ---
> V1->V2:
> - generates extlinux.conf directly in output/images directory
> - uses "cat <<-" option to remove leading tabs
> ---
> board/zynqmp/post-build.sh | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh
> index 9fd8bbf2c8..7387576414 100755
> --- a/board/zynqmp/post-build.sh
> +++ b/board/zynqmp/post-build.sh
> @@ -4,5 +4,18 @@
> # in the binaries directory
>
> BOARD_DIR="$(dirname $0)"
> +CONSOLE=$2
> +ROOT=$3
>
> -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf
> +FILE=${BOARD_DIR}/extlinux.conf
> +if test -f "${FILE}"; then
> + install -m 0644 -D "${FILE}" "${BINARIES_DIR}/extlinux.conf"
> +else
> + mkdir -p "${BINARIES_DIR}"
> + cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
> + label linux
> + kernel /Image
> + devicetree /system.dtb
> + append console=${CONSOLE} root=/dev/${ROOT} rw rootwait
> + __HEADER_EOF
> +fi
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 10+ messages in thread