[Buildroot] [RFC] raspberrypi: post-image.sh arguments as config.txt properties
Gaël PORTAY
gael.portay at collabora.com
Tue Dec 4 16:02:54 UTC 2018
This patch improves the post-images script using the arguments given to
the script as config.txt properties.
As example, the arguments below:
--dtoverlay=pi3-miniuart-bt --dtparam=audio=on
appends to:
dtoverlay=pi3-miniuart-bt
dtparam=audio=on
Signed-off-by: Gaël PORTAY <gael.portay at collabora.com>
---
Hi all,
The goal of this patch is to simplify the customisation of the
config.txt.
It takes arguments given to the post-image.sh (thanks to the config
option BR2_ROOTFS_POST_SCRIPT_ARGS) and it appends them to the
config.txt file.
That way, it is easy to add device-tree overlays without making
modification to the existing post-image.sh script.
As examples:
BR2_ROOTFS_POST_SCRIPT_ARGS="--dtoverlay=pi3-miniuart-bt --dtparam=audio=on"
Or [*]:
BR2_ROOTFS_PSOT_SCRIPT_ARGS="--kernel=Image --enable_uart=1" # to replace --aarch64
Or [*]:
BR2_ROOTFS_POST_SCRIPT_ARGS="--kernel=u-boot.bin" # to boot u-boot instead of a linux kernel
I also suggest also to start from a empty file config.txt (to avoid to
run sed scripts) and to rewrite it at every invocations.
What's your opinion?
[*]: Sould not work as is as it script should starts with an empty
config.txt file.
Regards,
Gael
board/raspberrypi/genimage-raspberrypi.cfg | 2 +-
board/raspberrypi/genimage-raspberrypi0.cfg | 2 +-
board/raspberrypi/genimage-raspberrypi0w.cfg | 2 +-
board/raspberrypi/genimage-raspberrypi2.cfg | 2 +-
.../raspberrypi/genimage-raspberrypi3-64.cfg | 2 +-
board/raspberrypi/genimage-raspberrypi3.cfg | 2 +-
board/raspberrypi/post-image.sh | 27 +++++++++++--------
configs/raspberrypi3_defconfig | 2 +-
configs/raspberrypi3_qt5we_defconfig | 2 +-
9 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/board/raspberrypi/genimage-raspberrypi.cfg b/board/raspberrypi/genimage-raspberrypi.cfg
index bd5166a0f3..b659f717bf 100644
--- a/board/raspberrypi/genimage-raspberrypi.cfg
+++ b/board/raspberrypi/genimage-raspberrypi.cfg
@@ -6,7 +6,7 @@ image boot.vfat {
"bcm2708-rpi-cm.dtb",
"rpi-firmware/bootcode.bin",
"rpi-firmware/cmdline.txt",
- "rpi-firmware/config.txt",
+ "config.txt",
"rpi-firmware/fixup.dat",
"rpi-firmware/start.elf",
"zImage"
diff --git a/board/raspberrypi/genimage-raspberrypi0.cfg b/board/raspberrypi/genimage-raspberrypi0.cfg
index a9d4c4501f..cb0691839d 100644
--- a/board/raspberrypi/genimage-raspberrypi0.cfg
+++ b/board/raspberrypi/genimage-raspberrypi0.cfg
@@ -4,7 +4,7 @@ image boot.vfat {
"bcm2708-rpi-b-plus.dtb",
"rpi-firmware/bootcode.bin",
"rpi-firmware/cmdline.txt",
- "rpi-firmware/config.txt",
+ "config.txt",
"rpi-firmware/fixup.dat",
"rpi-firmware/start.elf",
"zImage"
diff --git a/board/raspberrypi/genimage-raspberrypi0w.cfg b/board/raspberrypi/genimage-raspberrypi0w.cfg
index 3aafd9b6fc..004307a997 100644
--- a/board/raspberrypi/genimage-raspberrypi0w.cfg
+++ b/board/raspberrypi/genimage-raspberrypi0w.cfg
@@ -4,7 +4,7 @@ image boot.vfat {
"bcm2708-rpi-0-w.dtb",
"rpi-firmware/bootcode.bin",
"rpi-firmware/cmdline.txt",
- "rpi-firmware/config.txt",
+ "config.txt",
"rpi-firmware/fixup.dat",
"rpi-firmware/start.elf",
"rpi-firmware/overlays",
diff --git a/board/raspberrypi/genimage-raspberrypi2.cfg b/board/raspberrypi/genimage-raspberrypi2.cfg
index a3be2a3442..65a6494066 100644
--- a/board/raspberrypi/genimage-raspberrypi2.cfg
+++ b/board/raspberrypi/genimage-raspberrypi2.cfg
@@ -4,7 +4,7 @@ image boot.vfat {
"bcm2709-rpi-2-b.dtb",
"rpi-firmware/bootcode.bin",
"rpi-firmware/cmdline.txt",
- "rpi-firmware/config.txt",
+ "config.txt",
"rpi-firmware/fixup.dat",
"rpi-firmware/start.elf",
"zImage"
diff --git a/board/raspberrypi/genimage-raspberrypi3-64.cfg b/board/raspberrypi/genimage-raspberrypi3-64.cfg
index 0d0ca750a7..5427df9816 100644
--- a/board/raspberrypi/genimage-raspberrypi3-64.cfg
+++ b/board/raspberrypi/genimage-raspberrypi3-64.cfg
@@ -6,7 +6,7 @@ image boot.vfat {
"bcm2837-rpi-3-b.dtb",
"rpi-firmware/bootcode.bin",
"rpi-firmware/cmdline.txt",
- "rpi-firmware/config.txt",
+ "config.txt",
"rpi-firmware/fixup.dat",
"rpi-firmware/start.elf",
"Image"
diff --git a/board/raspberrypi/genimage-raspberrypi3.cfg b/board/raspberrypi/genimage-raspberrypi3.cfg
index 0a547241f4..c9950631ae 100644
--- a/board/raspberrypi/genimage-raspberrypi3.cfg
+++ b/board/raspberrypi/genimage-raspberrypi3.cfg
@@ -6,7 +6,7 @@ image boot.vfat {
"bcm2710-rpi-cm3.dtb",
"rpi-firmware/bootcode.bin",
"rpi-firmware/cmdline.txt",
- "rpi-firmware/config.txt",
+ "config.txt",
"rpi-firmware/fixup.dat",
"rpi-firmware/start.elf",
"rpi-firmware/overlays",
diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh
index 70447cd48b..fee19d1949 100755
--- a/board/raspberrypi/post-image.sh
+++ b/board/raspberrypi/post-image.sh
@@ -7,13 +7,16 @@ BOARD_NAME="$(basename ${BOARD_DIR})"
GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg"
GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+cp "${BINARIES_DIR}/rpi-firmware/config.txt" "${BINARIES_DIR}/config.txt"
+
for arg in "$@"
do
case "${arg}" in
+ # Leave as is for backward compatibility (same as --dtoverlay=pi3-miniuart-bt)
--add-pi3-miniuart-bt-overlay)
- if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+ if ! grep -qE '^dtoverlay=pi3-miniuart-bt' "${BINARIES_DIR}/config.txt"; then
echo "Adding 'dtoverlay=pi3-miniuart-bt' to config.txt (fixes ttyAMA0 serial console)."
- cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+ cat << __EOF__ >> "${BINARIES_DIR}/config.txt"
# fixes rpi3 ttyAMA0 serial console
dtoverlay=pi3-miniuart-bt
@@ -22,9 +25,9 @@ __EOF__
;;
--aarch64)
# Run a 64bits kernel (armv8)
- sed -e '/^kernel=/s,=.*,=Image,' -i "${BINARIES_DIR}/rpi-firmware/config.txt"
- if ! grep -qE '^arm_64bit=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
- cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+ sed -e '/^kernel=/s,=.*,=Image,' -i "${BINARIES_DIR}/config.txt"
+ if ! grep -qE '^arm_64bit=1' "${BINARIES_DIR}/config.txt"; then
+ cat << __EOF__ >> "${BINARIES_DIR}/config.txt"
# enable 64bits support
arm_64bit=1
@@ -32,18 +35,20 @@ __EOF__
fi
# Enable uart console
- if ! grep -qE '^enable_uart=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
- cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+ if ! grep -qE '^enable_uart=1' "${BINARIES_DIR}/config.txt"; then
+ cat << __EOF__ >> "${BINARIES_DIR}/config.txt"
# enable rpi3 ttyS0 serial console
enable_uart=1
__EOF__
fi
;;
- --gpu_mem_256=*|--gpu_mem_512=*|--gpu_mem_1024=*)
- # Set GPU memory
- gpu_mem="${arg:2}"
- sed -e "/^${gpu_mem%=*}=/s,=.*,=${gpu_mem##*=}," -i "${BINARIES_DIR}/rpi-firmware/config.txt"
+ --*=*)
+ # Set option=value
+ optval="${arg:2}"
+ cat << __EOF__ >> "${BINARIES_DIR}/config.txt"
+$optval
+__EOF__
;;
esac
diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
index 75f2dec9da..8356d0d794 100644
--- a/configs/raspberrypi3_defconfig
+++ b/configs/raspberrypi3_defconfig
@@ -32,4 +32,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
# BR2_TARGET_ROOTFS_TAR is not set
BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--dtoverlay=pi3-miniuart-bt"
diff --git a/configs/raspberrypi3_qt5we_defconfig b/configs/raspberrypi3_qt5we_defconfig
index c8d0be8cba..74318a3dd8 100644
--- a/configs/raspberrypi3_qt5we_defconfig
+++ b/configs/raspberrypi3_qt5we_defconfig
@@ -46,4 +46,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="360M"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay --gpu_mem_1024=200"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--dtoverlay=pi3-miniuart-bt --gpu_mem_1024=200"
--
2.19.2
More information about the buildroot
mailing list