[U-Boot] [PATCH 06/17] ppc: Move appropriate cpu/ dirs to arch/ppc/cpu/

Scott Wood scottwood at freescale.com
Mon Dec 14 23:32:27 CET 2009


Peter Tyser wrote:
> On Mon, 2009-12-14 at 14:44 -0600, Scott Wood wrote:
>> Peter Tyser wrote:
>>>  {cpu/mpc8260 => arch/ppc/cpu/mpc824x}/u-boot.lds   |    2 +-
>> [snip]
>>>  {cpu/mpc824x => arch/ppc/cpu/mpc8260}/u-boot.lds   |    2 +-
>> These seem to have gotten mixed up.
> 
> Impressive attention to detail!

Well, they stood out due to not starting with "{cpu =>"...

> It looks like git got fancy detecting
> the renames.  It swapped the file locations and also modified their
> contents accordingly:
> 
> diff --git a/cpu/mpc824x/u-boot.lds b/arch/ppc/cpu/mpc8260/u-boot.lds
> similarity index 98%
> rename from cpu/mpc824x/u-boot.lds
> rename to arch/ppc/cpu/mpc8260/u-boot.lds
> index 0eac48f..9887844 100644
> --- a/cpu/mpc824x/u-boot.lds
> +++ b/arch/ppc/cpu/mpc8260/u-boot.lds
> @@ -52,7 +52,7 @@ SECTIONS
>    .plt : { *(.plt) }
>    .text      :
>    {
> -    cpu/mpc824x/start.o                (.text)
> +    arch/ppc/cpu/mpc8260/start.o               (.text)
>      *(.text)
>      *(.got1)
>      . = ALIGN(16);
> 
> diff --git a/cpu/mpc8260/u-boot.lds b/arch/ppc/cpu/mpc824x/u-boot.lds
> similarity index 98%
> rename from cpu/mpc8260/u-boot.lds
> rename to arch/ppc/cpu/mpc824x/u-boot.lds
> index c777cf9..8a6d508 100644
> --- a/cpu/mpc8260/u-boot.lds
> +++ b/arch/ppc/cpu/mpc824x/u-boot.lds
> @@ -52,7 +52,7 @@ SECTIONS
>    .plt : { *(.plt) }
>    .text      :
>    {
> -    cpu/mpc8260/start.o                (.text)
> +    arch/ppc/cpu/mpc824x/start.o               (.text)
>      *(.text)
>      *(.got1)
>      . = ALIGN(16);

Ah, OK.  Heuristics are fun. :-)

-Scott


More information about the U-Boot mailing list