[Buildroot] [PATCH v1 1/1] board/versal: clean shellcheck issues
Neal Frager
neal.frager at amd.com
Tue Aug 1 10:02:04 UTC 2023
This patch cleans up the shellcheck issues in the versal post scripts.
Signed-off-by: Neal Frager <neal.frager at amd.com>
---
.checkpackageignore | 2 --
board/versal/post-build.sh | 5 ++---
board/versal/post-image.sh | 26 +++++++++++++-------------
3 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/.checkpackageignore b/.checkpackageignore
index 27c66d0bbe..2ba4d5ea78 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -99,8 +99,6 @@ board/technologic/ts4900/post-image.sh Shellcheck
board/toradex/apalis-imx6/post-image.sh Shellcheck
board/udoo/common/post-build.sh Shellcheck
board/udoo/mx6qdl/patches/linux/0000-udoo-disable-usbh1.patch Upstream
-board/versal/post-build.sh Shellcheck
-board/versal/post-image.sh Shellcheck TrailingSpace
board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch ApplyOrder Upstream
boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch Upstream
boot/at91bootstrap/0001-eabi-fix.patch Upstream
diff --git a/board/versal/post-build.sh b/board/versal/post-build.sh
index ff8f8a6071..ed08ea2d49 100755
--- a/board/versal/post-build.sh
+++ b/board/versal/post-build.sh
@@ -3,9 +3,8 @@
# genimage will need to find the extlinux.conf
# in the binaries directory
-BOARD_DIR="$(dirname $0)"
-CONSOLE=$2
-ROOT=$3
+CONSOLE="$2"
+ROOT="$3"
mkdir -p "${BINARIES_DIR}"
cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh
index 92e65ed3b7..729610d201 100755
--- a/board/versal/post-image.sh
+++ b/board/versal/post-image.sh
@@ -6,30 +6,30 @@
FIRST_DT=$(sed -nr \
-e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \
- ${BR2_CONFIG})
+ "${BR2_CONFIG}")
-[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb
+[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb"
-BOARD_DIR="$(dirname $0)"
-BOARD_NAME=$4
+BOARD_DIR="$(dirname "$0")"
+BOARD_NAME="$4"
mkdir -p "${BINARIES_DIR}"
cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif"
the_ROM_image:
{
image {
- { type=bootimage, file=${BINARIES_DIR}/${BOARD_NAME}_vpl_gen_fixed.pdi }
- { type=bootloader, file=${BINARIES_DIR}/${BOARD_NAME}_plm.elf }
- { core=psm, file=${BINARIES_DIR}/${BOARD_NAME}_psmfw.elf }
+ { type=bootimage, file="${BINARIES_DIR}/${BOARD_NAME}_vpl_gen_fixed.pdi" }
+ { type=bootloader, file="${BINARIES_DIR}/${BOARD_NAME}_plm.elf" }
+ { core=psm, file="${BINARIES_DIR}/${BOARD_NAME}_psmfw.elf" }
}
image {
- id = 0x1c000000, name=apu_subsystem
- { type=raw, load=0x00001000, file=${BINARIES_DIR}/u-boot.dtb }
- { core=a72-0, exception_level=el-3, trustzone, file=${BINARIES_DIR}/bl31.elf }
- { core=a72-0, exception_level=el-2, file=${BINARIES_DIR}/u-boot.elf }
+ id = 0x1c000000, name=apu_subsystem
+ { type=raw, load=0x00001000, file="${BINARIES_DIR}/u-boot.dtb" }
+ { core=a72-0, exception_level=el-3, trustzone, file="${BINARIES_DIR}/bl31.elf" }
+ { core=a72-0, exception_level=el-2, file="${BINARIES_DIR}/u-boot.elf" }
}
}
__HEADER_EOF
-${HOST_DIR}/bin/bootgen -arch versal -image ${BINARIES_DIR}/bootgen.bif -o ${BINARIES_DIR}/boot.bin -w on
-support/scripts/genimage.sh -c ${BOARD_DIR}/genimage.cfg
+"${HOST_DIR}/bin/bootgen" -arch versal -image "${BINARIES_DIR}/bootgen.bif" -o "${BINARIES_DIR}/boot.bin" -w on
+support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg"
--
2.25.1
More information about the buildroot
mailing list