diff mbox series

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

Message ID 20200103003752.140-1-chrismcc@gmail.com
State Rejected
Headers show
Series [1/2] board/raspberrypi/post-image.sh: support older defconfigs | expand

Commit Message

Christopher McCrory Jan. 3, 2020, 12:37 a.m. UTC
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.

Signed-off-by: Christopher McCrory <chrismcc@gmail.com>
---
 board/raspberrypi/post-image.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Peter Seiderer Jan. 6, 2020, 9:54 a.m. UTC | #1
Hello Christopher,

On Fri,  3 Jan 2020 00:37:51 +0000, Christopher McCrory <chrismcc@gmail.com> wrote:

> 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.
>
> Signed-off-by: Christopher McCrory <chrismcc@gmail.com>
> ---
>  board/raspberrypi/post-image.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh
> index 9dbd98ef9b..e9246fa113 100755
> --- a/board/raspberrypi/post-image.sh
> +++ b/board/raspberrypi/post-image.sh
> @@ -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

>  		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"
Yann E. MORIN Jan. 6, 2020, 6 p.m. UTC | #2
Christopher, All,

On 2020-01-03 00:37 +0000, Christopher McCrory spake thusly:
> 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.
> 
> Signed-off-by: Christopher McCrory <chrismcc@gmail.com>

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.

> ---
>  board/raspberrypi/post-image.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh
> index 9dbd98ef9b..e9246fa113 100755
> --- a/board/raspberrypi/post-image.sh
> +++ b/board/raspberrypi/post-image.sh
> @@ -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"
> -- 
> 2.18.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Christopher McCrory Jan. 6, 2020, 10:12 p.m. UTC | #3
On Mon, Jan 6, 2020 at 10:00 AM Yann E. MORIN <yann.morin.1998@free.fr>
wrote:

> Christopher, All,
>
> On 2020-01-03 00:37 +0000, Christopher McCrory spake thusly:
> > 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.
> >
> > Signed-off-by: Christopher McCrory <chrismcc@gmail.com>
>
> 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.





> Regards,
> Yann E. MORIN.
>
> > ---
> >  board/raspberrypi/post-image.sh | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/board/raspberrypi/post-image.sh
> b/board/raspberrypi/post-image.sh
> > index 9dbd98ef9b..e9246fa113 100755
> > --- a/board/raspberrypi/post-image.sh
> > +++ b/board/raspberrypi/post-image.sh
> > @@ -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"
> > --
> > 2.18.1
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@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.  |
>
> '------------------------------^-------^------------------^--------------------'
>
diff mbox series

Patch

diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh
index 9dbd98ef9b..e9246fa113 100755
--- a/board/raspberrypi/post-image.sh
+++ b/board/raspberrypi/post-image.sh
@@ -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"