diff mbox series

[v2,1/1] board/zynq: merge post scripts

Message ID 20230607052616.533411-1-neal.frager@amd.com
State Rejected, archived
Headers show
Series [v2,1/1] board/zynq: merge post scripts | expand

Commit Message

Neal Frager June 7, 2023, 5:26 a.m. UTC 
This patch merges the zynq post scripts as only one script is needed.

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
V1->V2:
  - Corrected comment in post-image.sh with system.dtb file name.
---
 board/zynq/post-build.sh        | 8 --------
 board/zynq/post-image.sh        | 4 ++--
 configs/zynq_microzed_defconfig | 1 -
 configs/zynq_qmtech_defconfig   | 1 -
 configs/zynq_zc706_defconfig    | 1 -
 configs/zynq_zed_defconfig      | 1 -
 6 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100755 board/zynq/post-build.sh

Comments

Luca Ceresoli June 7, 2023, 7:03 a.m. UTC | #1 
On Wed, 7 Jun 2023 06:26:16 +0100
Neal Frager <neal.frager@amd.com> wrote:

> This patch merges the zynq post scripts as only one script is needed.
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>

Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Nayab Sayed via buildroot July 24, 2023, 8:54 a.m. UTC | #2 
Hello everyone,

> This patch merges the zynq post scripts as only one script is needed.
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>

> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

This is just a friendly reminder regarding this patch.

Best regards,
Neal Frager
AMD
diff mbox series

Patch

diff --git a/board/zynq/post-build.sh b/board/zynq/post-build.sh
deleted file mode 100755
index 810fe99879..0000000000
--- a/board/zynq/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/board/zynq/post-image.sh b/board/zynq/post-image.sh
index 627c8ac41a..463f3ccd68 100755
--- a/board/zynq/post-image.sh
+++ b/board/zynq/post-image.sh
@@ -1,6 +1,6 @@ 
 #!/bin/sh
 
-# By default U-Boot loads DTB from a file named "devicetree.dtb", so
+# By default U-Boot loads DTB from a file named "system.dtb", so
 # let's use a symlink with that name that points to the *first*
 # devicetree listed in the config.
 
@@ -11,5 +11,5 @@  FIRST_DT=$(sed -n \
 [ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb"
 
 BOARD_DIR="$(dirname "$0")"
-
+install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${BINARIES_DIR}/extlinux.conf"
 support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg"
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 459a3a40bc..586dad8c30 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -3,7 +3,6 @@  BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
diff --git a/configs/zynq_qmtech_defconfig b/configs/zynq_qmtech_defconfig
index f536b80f57..793a7967f8 100644
--- a/configs/zynq_qmtech_defconfig
+++ b/configs/zynq_qmtech_defconfig
@@ -5,7 +5,6 @@  BR2_ARM_ENABLE_VFP=y
 BR2_GLOBAL_PATCH_DIR="board/qmtech/zynq/patches"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index 3ad8cbafe3..2d1716d400 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -3,7 +3,6 @@  BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index a39911b757..aa73380c53 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -3,7 +3,6 @@  BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y