configs/raspberrypi: change deprecated pi3-miniuart-bt option to miniuart-bt
The pi3-minuart-bt Device Tree overlay has been renamed to miniuart-bt, as it is useful/usable for other platforms than the RPi3. So we use this DT overlay and rename the --add-pi3-miniuart-bt-overlay option to --add-miniuart-bt-overlay accordingly. Signed-off-by: Arthur Courtel <arthur.courtel@smile.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
35f1195979
commit
ada40afb32
@ -10,13 +10,13 @@ GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
|
|||||||
for arg in "$@"
|
for arg in "$@"
|
||||||
do
|
do
|
||||||
case "${arg}" in
|
case "${arg}" in
|
||||||
--add-pi3-miniuart-bt-overlay)
|
--add-miniuart-bt-overlay)
|
||||||
if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
|
if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
|
||||||
echo "Adding 'dtoverlay=pi3-miniuart-bt' to config.txt (fixes ttyAMA0 serial console)."
|
echo "Adding 'dtoverlay=miniuart-bt' to config.txt (fixes ttyAMA0 serial console)."
|
||||||
cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
|
cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
|
||||||
|
|
||||||
# fixes rpi3 ttyAMA0 serial console
|
# fixes rpi (3B, 3B+, 3A+, 4B and Zero W) ttyAMA0 serial console
|
||||||
dtoverlay=pi3-miniuart-bt
|
dtoverlay=miniuart-bt
|
||||||
__EOF__
|
__EOF__
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
@ -78,7 +78,7 @@ After building, you should obtain this tree:
|
|||||||
[1] Not all of them will be present, depending on the RaspberryPi
|
[1] Not all of them will be present, depending on the RaspberryPi
|
||||||
model you are using.
|
model you are using.
|
||||||
|
|
||||||
[2] Only for the Raspberry Pi 3/4 Models (overlay pi3-miniuart-bt is needed
|
[2] Only for the Raspberry Pi 3/4 Models (overlay miniuart-bt is needed
|
||||||
to enable the RPi3 serial console otherwise occupied by the bluetooth
|
to enable the RPi3 serial console otherwise occupied by the bluetooth
|
||||||
chip). Alternative would be to disable the serial console in cmdline.txt
|
chip). Alternative would be to disable the serial console in cmdline.txt
|
||||||
and /etc/inittab.
|
and /etc/inittab.
|
||||||
|
@ -35,4 +35,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
|
|||||||
# BR2_TARGET_ROOTFS_TAR is not set
|
# BR2_TARGET_ROOTFS_TAR is not set
|
||||||
BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh"
|
BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh"
|
||||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh"
|
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh"
|
||||||
BR2_ROOTFS_POST_SCRIPT_ARGS="--aarch64 --add-pi3-miniuart-bt-overlay"
|
BR2_ROOTFS_POST_SCRIPT_ARGS="--aarch64 --add-miniuart-bt-overlay"
|
||||||
|
@ -34,4 +34,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
|
|||||||
# BR2_TARGET_ROOTFS_TAR is not set
|
# BR2_TARGET_ROOTFS_TAR is not set
|
||||||
BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
|
BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
|
||||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.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="--add-miniuart-bt-overlay"
|
||||||
|
@ -48,4 +48,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="360M"
|
|||||||
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
|
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
|
||||||
BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
|
BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
|
||||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.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="--add-miniuart-bt-overlay --gpu_mem_1024=200"
|
||||||
|
@ -35,4 +35,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
|
|||||||
# BR2_TARGET_ROOTFS_TAR is not set
|
# BR2_TARGET_ROOTFS_TAR is not set
|
||||||
BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh"
|
BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi4/post-build.sh"
|
||||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh"
|
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi4/post-image.sh"
|
||||||
BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay"
|
BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay"
|
||||||
|
Loading…
Reference in New Issue
Block a user