Skip to contentSkip to conversation

board/raspberrypi/post-image.sh: support older defconfigs

PATCH New Christopher McCrory 3 participants 7 messages Jan 3, 2020 – Jan 6, 2020 Broadcom BCM2711/BCM2835 Arm architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 board/raspberrypi/post-image.sh: support older defconfigs

Commit ada40afb324 fixed pi3-minuart-bt being changed to miniuart-bt. Older defconfig files based on raspberrypi*_defconfigs might have to old call, BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" Allow either argument to add the correct miniuart-bt overlay.

---
 board/raspberrypi/post-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/raspberrypi/post-image.sh +1 -1
index 9dbd98ef9b..e9246fa113 100755
@@ -10,7 +10,7 @@ GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
 for arg in "$@"
 do
 	case "${arg}" in
-		--add-miniuart-bt-overlay)
+		--add-miniuart-bt-overlay|--add-pi3-miniuart-bt-overlay)
 		if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
 			echo "Adding 'dtoverlay=miniuart-bt' to config.txt (fixes ttyAMA0 serial console)."
 			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
Signature · 1 line
2.18.1
#1 lore raw

PATCH 2/2 configs/raspberrypi0w_defconfig: fix post script args

Commit ada40afb324 updated the raspberrypi*defconfigs to use
-add-miniuart-bt-overlay instead of -add-pi3-miniuart-bt-overlay.
Update raspberrypi0w_defconfig also.

---
 configs/raspberrypi0w_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/raspberrypi0w_defconfig +1 -1
index ea5856e8c0..e3c747ff6f 100644
@@ -29,4 +29,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay"
Signature · 1 line
2.18.1
#2 lore raw

PATCH 2/2 configs/raspberrypi0w_defconfig: fix post script args

Hello Christopher,

Quoted 14 lines · Christopher McCrory

Commit ada40afb324 updated the raspberrypi*defconfigs to use
-add-miniuart-bt-overlay instead of -add-pi3-miniuart-bt-overlay.
Update raspberrypi0w_defconfig also.

---
 configs/raspberrypi0w_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/raspberrypi0w_defconfig +0 -0
index ea5856e8c0..e3c747ff6f 100644

configs/raspberrypi0w_defconfig BR2_TARGET_ROOTFS_EXT2_SIZE="120M" · line 32

Quoted 5 lines
configs/raspberrypi0w_defconfig +1 -1
@@ -29,4 +29,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay"

Regards,
Peter

#3 lore raw

PATCH 2/2 configs/raspberrypi0w_defconfig: fix post script args

In reply to Christopher McCrory

Christopher, All,

On 2020-01-03 00:37 +0000, Christopher McCrory spake thusly:

Quoted 5 lines

Commit ada40afb324 updated the raspberrypi*defconfigs to use
-add-miniuart-bt-overlay instead of -add-pi3-miniuart-bt-overlay.
Update raspberrypi0w_defconfig also.

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 21 lines
---
 configs/raspberrypi0w_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/raspberrypi0w_defconfig +1 -1
index ea5856e8c0..e3c747ff6f 100644
@@ -29,4 +29,4 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi0w/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi0w/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--add-miniuart-bt-overlay"
Signature · 6 lines
2.18.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH 1/2 board/raspberrypi/post-image.sh: support older defconfigs

In reply to Christopher McCrory

Hello Christopher,

Quoted 15 lines · Christopher McCrory

Commit ada40afb324 fixed pi3-minuart-bt being changed to miniuart-bt. Older defconfig files based on raspberrypi*_defconfigs might have to old call, BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" Allow either argument to add the correct miniuart-bt overlay.

---
 board/raspberrypi/post-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/raspberrypi/post-image.sh +0 -0
index 9dbd98ef9b..e9246fa113 100755

board/raspberrypi/post-image.sh GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" · line 13

Quoted 5 lines
board/raspberrypi/post-image.sh +1 -1
@@ -10,7 +10,7 @@ GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
 for arg in "$@"
 do
 	case "${arg}" in
-		--add-miniuart-bt-overlay)
+		--add-miniuart-bt-overlay|--add-pi3-miniuart-bt-overlay)

In favour for this one ;-), suggested for the pi3-miniuart/miniuart change commit [1], but rejected by the maintainers [2]...

Regards
Peter

[1] http://lists.busybox.net/pipermail/buildroot/2019-December/268042.html
[2] http://lists.busybox.net/pipermail/buildroot/2019-December/268046.html

Quoted 3 lines
board/raspberrypi/post-image.sh +0 -0
 		if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
 			echo "Adding 'dtoverlay=miniuart-bt' to config.txt (fixes ttyAMA0 serial console)."
 			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
#5 lore raw

PATCH 1/2 board/raspberrypi/post-image.sh: support older defconfigs

In reply to Christopher McCrory

Christopher, All,

On 2020-01-03 00:37 +0000, Christopher McCrory spake thusly:

Quoted 6 lines

Commit ada40afb324 fixed pi3-minuart-bt being changed to miniuart-bt. Older defconfig files based on raspberrypi*_defconfigs might have to old call, BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" Allow either argument to add the correct miniuart-bt overlay.

As Peter noticed, we already refused such a change in the past, and I am 100% aligned with the reasoning Arnout gave back then.

Regards,
Yann E. MORIN.

Quoted 24 lines
---
 board/raspberrypi/post-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/raspberrypi/post-image.sh +1 -1
index 9dbd98ef9b..e9246fa113 100755
@@ -10,7 +10,7 @@ GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
 for arg in "$@"
 do
 	case "${arg}" in
-		--add-miniuart-bt-overlay)
+		--add-miniuart-bt-overlay|--add-pi3-miniuart-bt-overlay)
 		if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
 			echo "Adding 'dtoverlay=miniuart-bt' to config.txt (fixes ttyAMA0 serial console)."
 			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
Signature · 6 lines
2.18.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#6 lore raw

PATCH 1/2 board/raspberrypi/post-image.sh: support older defconfigs

Quoted 5 lines · Yann E. MORIN

Christopher, All,

On 2020-01-03 00:37 +0000, Christopher McCrory spake thusly:

Quoted 1 line

Commit ada40afb324 fixed pi3-minuart-bt being changed to miniuart-bt.

Older

Quoted 10 lines
Quoted 5 lines

defconfig files based on raspberrypi*_defconfigs might have to old call, BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay" Allow either argument to add the correct miniuart-bt overlay.

As Peter noticed, we already refused such a change in the past, and I am 100% aligned with the reasoning Arnout gave back then.

I would disagree a little bit, but I'm all good with the maintainers choices overall. I didn't see that thread originally. And I'm all good with not adding this patch.

Quoted 46 lines

Regards,
Yann E. MORIN.

Review

Quoted 5 lines
---
 board/raspberrypi/post-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/board/raspberrypi/post-image.sh

board/raspberrypi/post-image.sh GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" · line 14

Quoted 10 lines

index 9dbd98ef9b..e9246fa113 100755

board/raspberrypi/post-image.sh +1 -1
@@ -10,7 +10,7 @@ GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
 for arg in "$@"
 do
      case "${arg}" in
-             --add-miniuart-bt-overlay)
+             --add-miniuart-bt-overlay|--add-pi3-miniuart-bt-overlay)
              if ! grep -qE '^dtoverlay='

"${BINARIES_DIR}/rpi-firmware/config.txt"; then

board/raspberrypi/post-image.sh GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" · line 15

Quoted 1 line
board/raspberrypi/post-image.sh +0 -0
                      echo "Adding 'dtoverlay=miniuart-bt' to config.txt

(fixes ttyAMA0 serial console)."

board/raspberrypi/post-image.sh GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" · line 16

Quoted 1 line
board/raspberrypi/post-image.sh +0 -0
                      cat << __EOF__ >>

"${BINARIES_DIR}/rpi-firmware/config.txt"

Quoted 7 lines

--
2.18.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

--

.-----------------.--------------------.------------------.--------------------.

|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics'
conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___
     |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is
no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v
 conspiracy.  |

'------------------------------^-------^------------------^--------------------'

Signature · 7 lines
Christopher McCrory
To the optimist, the glass is half full.
To the pessimist, the glass is half empty.
To the engineer, the glass is twice as big as it needs to be.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200106/f79c001e/attachment.html>