diff mbox

[U-Boot,RFC] MAKEALL: Fix case substitution for old bash

Message ID 1363895895-31596-1-git-send-email-yorksun@freescale.com
State RFC
Delegated to: Tom Rini
Headers show

Commit Message

York Sun March 21, 2013, 7:58 p.m. UTC
Bash ver 3.x doesn't support the parameter expansion with case
substitution. Use tr instead.

Signed-off-by: York Sun <yorksun@freescale.com>
---
I am not sure if using 'tr' is a good idea. Any suggestion is welcomed.

 MAKEALL |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Allen Martin March 21, 2013, 8:28 p.m. UTC | #1
On Thu, Mar 21, 2013 at 12:58:15PM -0700, York Sun wrote:
> Bash ver 3.x doesn't support the parameter expansion with case
> substitution. Use tr instead.
> 
> Signed-off-by: York Sun <yorksun@freescale.com>
> ---
> I am not sure if using 'tr' is a good idea. Any suggestion is welcomed.
> 
>  MAKEALL |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/MAKEALL b/MAKEALL
> index c1d8957..ac92ef6 100755
> --- a/MAKEALL
> +++ b/MAKEALL
> @@ -664,7 +664,7 @@ build_target() {
>  	export BUILD_DIR="${output_dir}"
>  
>  	target_arch=$(get_target_arch ${target})
> -	eval cross_toolchain=\$CROSS_COMPILE_${target_arch^^}
> +	eval cross_toolchain=\$CROSS_COMPILE_`echo $target_arch | tr '[:lower:]' '[:upper:]'`

Looks fine to me.  I'm not sure if there's a preference between using
backtick or $() for shell commands, it looks like both are used in the
script. 

>  	if [ "${cross_toolchain}" ] ; then
>  	    MAKE="make CROSS_COMPILE=${cross_toolchain}"
>  	elif [ "${CROSS_COMPILE}" ] ; then
> -- 
> 1.7.9.5
> 
> 

PS: What happened with your bool fixup patch?  I'm a big fan of that
patch :^)

-Allen
York Sun March 21, 2013, 8:38 p.m. UTC | #2
On 03/21/2013 01:28 PM, Allen Martin wrote:
> On Thu, Mar 21, 2013 at 12:58:15PM -0700, York Sun wrote:
>> Bash ver 3.x doesn't support the parameter expansion with case
>> substitution. Use tr instead.
>>
>> Signed-off-by: York Sun <yorksun@freescale.com>
>> ---
>> I am not sure if using 'tr' is a good idea. Any suggestion is welcomed.
>>
>>  MAKEALL |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/MAKEALL b/MAKEALL
>> index c1d8957..ac92ef6 100755
>> --- a/MAKEALL
>> +++ b/MAKEALL
>> @@ -664,7 +664,7 @@ build_target() {
>>  	export BUILD_DIR="${output_dir}"
>>  
>>  	target_arch=$(get_target_arch ${target})
>> -	eval cross_toolchain=\$CROSS_COMPILE_${target_arch^^}
>> +	eval cross_toolchain=\$CROSS_COMPILE_`echo $target_arch | tr '[:lower:]' '[:upper:]'`
> 
> Looks fine to me.  I'm not sure if there's a preference between using
> backtick or $() for shell commands, it looks like both are used in the
> script. 

Let's wait for others to chime in.

> 
>>  	if [ "${cross_toolchain}" ] ; then
>>  	    MAKE="make CROSS_COMPILE=${cross_toolchain}"
>>  	elif [ "${CROSS_COMPILE}" ] ; then
>> -- 
>> 1.7.9.5
>>
>>
> 
> PS: What happened with your bool fixup patch?  I'm a big fan of that
> patch :^)
> 

Tom asked on March 4th. I think he will accept it.

York
Tom Rini March 27, 2013, 7:55 p.m. UTC | #3
On Thu, Mar 21, 2013 at 01:38:37PM -0700, York Sun wrote:
> On 03/21/2013 01:28 PM, Allen Martin wrote:
[snip]
> > PS: What happened with your bool fixup patch?  I'm a big fan of that
> > patch :^)
> > 
> 
> Tom asked on March 4th. I think he will accept it.

I never got the expected acks on v7 that I thought would be forthcoming.
Simon Glass March 30, 2013, 10:30 p.m. UTC | #4
+U-Boot

Hi Allen, York,

On Fri, Mar 29, 2013 at 11:05 AM, Allen Martin <amartin@nvidia.com> wrote:

> On Fri, Mar 29, 2013 at 10:56:33AM -0700, York Sun wrote:
> > On 03/29/2013 10:52 AM, Allen Martin wrote:
> > > On Fri, Mar 29, 2013 at 10:49:06AM -0700, York Sun wrote:
> > >> On 03/29/2013 10:29 AM, Allen Martin wrote:
> > >>> On Fri, Mar 29, 2013 at 09:56:41AM -0700, York Sun wrote:
> > >>>> On 03/27/2013 12:55 PM, Tom Rini wrote:
> > >>>>> On Thu, Mar 21, 2013 at 01:38:37PM -0700, York Sun wrote:
> > >>>>>> On 03/21/2013 01:28 PM, Allen Martin wrote:
> > >>>>> [snip]
> > >>>>>>> PS: What happened with your bool fixup patch?  I'm a big fan of
> that
> > >>>>>>> patch :^)
> > >>>>>>>
> > >>>>>>
> > >>>>>> Tom asked on March 4th. I think he will accept it.
> > >>>>>
> > >>>>> I never got the expected acks on v7 that I thought would be
> forthcoming.
> > >>>>>
> > >>>>
> > >>>> Allen,
> > >>>>
> > >>>> Can you ack the v7 of the bool fixup patch? Tom seems waiting for
> you.
> > >>>
> > >>> Oh sorry, I didn't realize there was a newer version of the patch I
> > >>> hadn't ack'ed yet.  I'll take a look today.  Do you know if it still
> > >>> applies cleanly to TOT u-boot/master, or will it need to be rebased?
> > >>>
> > >>
> > >> It almost applies cleanly.
> > >>
> > >> Checking patch board/xilinx/common/xbasic_types.h...
> > >> error: board/xilinx/common/xbasic_types.h: does not exist in index
> > >>
> > >> due to commit
> > >>
> > >> commit 151eeeb2754da4b2d26bb878206d45ce58276fe0
> > >> Author: Michal Simek <michal.simek@xilinx.com>
> > >> Date:   Wed Jan 23 14:11:50 2013 +0100
> > >>
> > >>     board: xilinx: Remove common folder
> > >>
> > >>     All these files was used for ancient xilinx drivers
> > >>     which are finally gone.
> > >>
> > >>     Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> > >>     Tested-by: Rommel Custodio <sessyargc@gmail.com>
> > >>
> > >>  board/xilinx/common/xbasic_types.c         |  165 ----
> > >>  board/xilinx/common/xbasic_types.h         |  283 ------
> > >>  board/xilinx/common/xbuf_descriptor.h      |  252 ------
> > >>  board/xilinx/common/xdma_channel.c         |  738 ----------------
> > >>  board/xilinx/common/xdma_channel.h         |  291 ------
> > >>  board/xilinx/common/xdma_channel_i.h       |  110 ---
> > >>  board/xilinx/common/xdma_channel_sg.c      | 1317
> > >> ----------------------------
> > >>  board/xilinx/common/xio.h                  |   81 --
> > >>  board/xilinx/common/xipif_v1_23_b.c        |  331 -------
> > >>  board/xilinx/common/xipif_v1_23_b.h        |  746 ----------------
> > >>  board/xilinx/common/xpacket_fifo_v1_00_b.c |  448 ----------
> > >>  board/xilinx/common/xpacket_fifo_v1_00_b.h |  306 -------
> > >>  board/xilinx/common/xstatus.h              |  347 --------
> > >>  board/xilinx/common/xversion.c             |  350 --------
> > >>  board/xilinx/common/xversion.h             |   97 --
> > >>  board/xilinx/zynq/Makefile                 |    3 -
> > >>  16 files changed, 5865 deletions(-)
> > >>
> > >>
> > >> Do I need to send a newer version?
> > >>
> > >
> > > Tom will probably make you send a newer one anyway.  I'll fix it up
> > > locally and start testing in the mean time.
> > >
> >
> > Allen,
> >
> > I didn't change anything for the version, only removed "RFC" from the
> > subject. I have been there for quite a while. I thought Tom was going to
> > pick it up.
>
> Yeah sorry, I would have re-acked it if I saw there was a new
> version.  Since it no longer applies cleanly I'm pretty sure he'll ask
> you to send a new version that does even if there are no other
> differences.
>
> Maybe we can talk Simon Glass into testing it out with his super fast
> multi-arch u-boot builder.  It's way fancier than the perl script I
> use.  Adding Simon.
>
> The patch in question is:
> http://patchwork.ozlabs.org/patch/217088/


Yes, it needs a rebase, but the change is minor - I hope we can get this
in. York can you do a rebase?

Here are the boards that seem to fail: EVB64260 ZUMA EVB64260_750CX P3G4

Full output:

02: Consolidate bool type
   powerpc: +   EVB64260 ZUMA EVB64260_750CX P3G4
+In file included from memory.c:9:0:
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/12/include/galileo/memory.h:62:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/12/include/galileo/memory.h:63:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/12/include/galileo/memory.h:66:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/12/include/galileo/memory.h:70:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/12/include/galileo/memory.h:77:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/12/include/galileo/memory.h:82:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/12/include/galileo/memory.h:83:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/12/include/galileo/memory.h:84:1:
error: unknown type name 'bool'
+memory.c:175:1: error: unknown type name 'bool'
+memory.c: In function 'memoryMapBank':
+memory.c:199:12: error: 'true' undeclared (first use in this function)
+memory.c:199:12: note: each undeclared identifier is reported only once
for each function it appears in
+memory.c: At top level:
+memory.c:201:1: error: unknown type name 'bool'
+memory.c: In function 'memoryMapDeviceSpace':
+memory.c:219:12: error: 'true' undeclared (first use in this function)
+memory.c:230:1: error: unknown type name 'bool'
+memory.c: In function 'memoryMapInternalRegistersSpace':
+memory.c:240:12: error: 'true' undeclared (first use in this function)
+memory.c:267:1: error: unknown type name 'bool'
+memory.c: In function 'memorySetProtectRegion':
+memory.c:280:9: error: 'true' undeclared (first use in this function)
+memory.c:306:1: error: unknown type name 'bool'
+memory.c: In function 'memorySetRegionSnoopMode':
+memory.c:317:9: error: 'false' undeclared (first use in this function)
+memory.c:324:9: error: 'true' undeclared (first use in this function)
+memory.c:342:1: error: unknown type name 'bool'
+memory.c: In function 'memoryRemapAddress':
+memory.c:347:12: error: 'true' undeclared (first use in this function)
+memory.c:360:1: error: unknown type name 'bool'
+memory.c: In function 'memoryGetDeviceParam':
+memory.c:403:12: error: 'true' undeclared (first use in this function)
+memory.c:416:1: error: unknown type name 'bool'
+memory.c: In function 'memorySetDeviceParam':
+memory.c:423:9: error: 'false' undeclared (first use in this function)
+memory.c:456:12: error: 'true' undeclared (first use in this function)
+memory.c:457:1: warning: control reaches end of non-void function
[-Wreturn-type]
+memory.c:404:1: warning: control reaches end of non-void function
[-Wreturn-type]
+memory.c:348:1: warning: control reaches end of non-void function
[-Wreturn-type]
+memory.c:332:1: warning: control reaches end of non-void function
[-Wreturn-type]
+memory.c:289:1: warning: control reaches end of non-void function
[-Wreturn-type]
+memory.c:241:1: warning: control reaches end of non-void function
[-Wreturn-type]
+memory.c:220:1: warning: control reaches end of non-void function
[-Wreturn-type]
+memory.c:200:1: warning: control reaches end of non-void function
[-Wreturn-type]
+make[1]: ***
[/c/cosarm/src/third_party/u-boot/try-york/.bm-work/12/build/board/evb64260/memory.o]
Error 1
+make: ***
[/c/cosarm/src/third_party/u-boot/try-york/.bm-work/12/build/board/evb64260/libevb64260.o]
Error 2
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/08/include/galileo/memory.h:62:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/08/include/galileo/memory.h:63:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/08/include/galileo/memory.h:66:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/08/include/galileo/memory.h:70:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/08/include/galileo/memory.h:77:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/08/include/galileo/memory.h:82:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/08/include/galileo/memory.h:83:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/08/include/galileo/memory.h:84:1:
error: unknown type name 'bool'
+make[1]: ***
[/c/cosarm/src/third_party/u-boot/try-york/.bm-work/08/build/board/evb64260/memory.o]
Error 1
+make: ***
[/c/cosarm/src/third_party/u-boot/try-york/.bm-work/08/build/board/evb64260/libevb64260.o]
Error 2
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/16/include/galileo/memory.h:62:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/16/include/galileo/memory.h:63:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/16/include/galileo/memory.h:66:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/16/include/galileo/memory.h:70:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/16/include/galileo/memory.h:77:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/16/include/galileo/memory.h:82:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/16/include/galileo/memory.h:83:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/16/include/galileo/memory.h:84:1:
error: unknown type name 'bool'
+make[1]: ***
[/c/cosarm/src/third_party/u-boot/try-york/.bm-work/16/build/board/evb64260/memory.o]
Error 1
+make: ***
[/c/cosarm/src/third_party/u-boot/try-york/.bm-work/16/build/board/evb64260/libevb64260.o]
Error 2
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/07/include/galileo/memory.h:62:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/07/include/galileo/memory.h:63:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/07/include/galileo/memory.h:66:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/07/include/galileo/memory.h:70:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/07/include/galileo/memory.h:77:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/07/include/galileo/memory.h:82:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/07/include/galileo/memory.h:83:1:
error: unknown type name 'bool'
+/c/cosarm/src/third_party/u-boot/try-york/.bm-work/07/include/galileo/memory.h:84:1:
error: unknown type name 'bool'
+make[1]: ***
[/c/cosarm/src/third_party/u-boot/try-york/.bm-work/07/build/board/evb64260/memory.o]
Error 1
+make: ***
[/c/cosarm/src/third_party/u-boot/try-york/.bm-work/07/build/board/evb64260/libevb64260.o]
Error 2


Regards
Simon
York Sun April 1, 2013, 6:19 p.m. UTC | #5
On 03/30/2013 03:30 PM, Simon Glass wrote:
> +U-Boot
> 
> Hi Allen, York,
> 
> On Fri, Mar 29, 2013 at 11:05 AM, Allen Martin <amartin@nvidia.com
> <mailto:amartin@nvidia.com>> wrote:
> 
>     On Fri, Mar 29, 2013 at 10:56:33AM -0700, York Sun wrote:
>     > On 03/29/2013 10:52 AM, Allen Martin wrote:
>     > > On Fri, Mar 29, 2013 at 10:49:06AM -0700, York Sun wrote:
>     > >> On 03/29/2013 10:29 AM, Allen Martin wrote:
>     > >>> On Fri, Mar 29, 2013 at 09:56:41AM -0700, York Sun wrote:
>     > >>>> On 03/27/2013 12:55 PM, Tom Rini wrote:
>     > >>>>> On Thu, Mar 21, 2013 at 01:38:37PM -0700, York Sun wrote:
>     > >>>>>> On 03/21/2013 01:28 PM, Allen Martin wrote:
>     > >>>>> [snip]
>     > >>>>>>> PS: What happened with your bool fixup patch?  I'm a big
>     fan of that
>     > >>>>>>> patch :^)
>     > >>>>>>>
>     > >>>>>>
>     > >>>>>> Tom asked on March 4th. I think he will accept it.
>     > >>>>>
>     > >>>>> I never got the expected acks on v7 that I thought would be
>     forthcoming.
>     > >>>>>
>     > >>>>
>     > >>>> Allen,
>     > >>>>
>     > >>>> Can you ack the v7 of the bool fixup patch? Tom seems waiting
>     for you.
>     > >>>
>     > >>> Oh sorry, I didn't realize there was a newer version of the
>     patch I
>     > >>> hadn't ack'ed yet.  I'll take a look today.  Do you know if it
>     still
>     > >>> applies cleanly to TOT u-boot/master, or will it need to be
>     rebased?
>     > >>>
>     > >>
>     > >> It almost applies cleanly.
>     > >>
>     > >> Checking patch board/xilinx/common/xbasic_types.h...
>     > >> error: board/xilinx/common/xbasic_types.h: does not exist in index
>     > >>
>     > >> due to commit
>     > >>
>     > >> commit 151eeeb2754da4b2d26bb878206d45ce58276fe0
>     > >> Author: Michal Simek <michal.simek@xilinx.com
>     <mailto:michal.simek@xilinx.com>>
>     > >> Date:   Wed Jan 23 14:11:50 2013 +0100
>     > >>
>     > >>     board: xilinx: Remove common folder
>     > >>
>     > >>     All these files was used for ancient xilinx drivers
>     > >>     which are finally gone.
>     > >>
>     > >>     Signed-off-by: Michal Simek <michal.simek@xilinx.com
>     <mailto:michal.simek@xilinx.com>>
>     > >>     Tested-by: Rommel Custodio <sessyargc@gmail.com
>     <mailto:sessyargc@gmail.com>>
>     > >>
>     > >>  board/xilinx/common/xbasic_types.c         |  165 ----
>     > >>  board/xilinx/common/xbasic_types.h         |  283 ------
>     > >>  board/xilinx/common/xbuf_descriptor.h      |  252 ------
>     > >>  board/xilinx/common/xdma_channel.c         |  738 ----------------
>     > >>  board/xilinx/common/xdma_channel.h         |  291 ------
>     > >>  board/xilinx/common/xdma_channel_i.h       |  110 ---
>     > >>  board/xilinx/common/xdma_channel_sg.c      | 1317
>     > >> ----------------------------
>     > >>  board/xilinx/common/xio.h                  |   81 --
>     > >>  board/xilinx/common/xipif_v1_23_b.c        |  331 -------
>     > >>  board/xilinx/common/xipif_v1_23_b.h        |  746 ----------------
>     > >>  board/xilinx/common/xpacket_fifo_v1_00_b.c |  448 ----------
>     > >>  board/xilinx/common/xpacket_fifo_v1_00_b.h |  306 -------
>     > >>  board/xilinx/common/xstatus.h              |  347 --------
>     > >>  board/xilinx/common/xversion.c             |  350 --------
>     > >>  board/xilinx/common/xversion.h             |   97 --
>     > >>  board/xilinx/zynq/Makefile                 |    3 -
>     > >>  16 files changed, 5865 deletions(-)
>     > >>
>     > >>
>     > >> Do I need to send a newer version?
>     > >>
>     > >
>     > > Tom will probably make you send a newer one anyway.  I'll fix it up
>     > > locally and start testing in the mean time.
>     > >
>     >
>     > Allen,
>     >
>     > I didn't change anything for the version, only removed "RFC" from the
>     > subject. I have been there for quite a while. I thought Tom was
>     going to
>     > pick it up.
> 
>     Yeah sorry, I would have re-acked it if I saw there was a new
>     version.  Since it no longer applies cleanly I'm pretty sure he'll ask
>     you to send a new version that does even if there are no other
>     differences.
> 
>     Maybe we can talk Simon Glass into testing it out with his super fast
>     multi-arch u-boot builder.  It's way fancier than the perl script I
>     use.  Adding Simon.
> 
>     The patch in question is:
>     http://patchwork.ozlabs.org/patch/217088/
> 
> 
> Yes, it needs a rebase, but the change is minor - I hope we can get this
> in. York can you do a rebase?
> 
> Here are the boards that seem to fail: EVB64260 ZUMA EVB64260_750CX P3G4
> 

Thanks, Simon. I will rebase the patch and address those failure.

York
diff mbox

Patch

diff --git a/MAKEALL b/MAKEALL
index c1d8957..ac92ef6 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -664,7 +664,7 @@  build_target() {
 	export BUILD_DIR="${output_dir}"
 
 	target_arch=$(get_target_arch ${target})
-	eval cross_toolchain=\$CROSS_COMPILE_${target_arch^^}
+	eval cross_toolchain=\$CROSS_COMPILE_`echo $target_arch | tr '[:lower:]' '[:upper:]'`
 	if [ "${cross_toolchain}" ] ; then
 	    MAKE="make CROSS_COMPILE=${cross_toolchain}"
 	elif [ "${CROSS_COMPILE}" ] ; then