From mboxrd@z Thu Jan  1 00:00:00 1970
From: Scott Wood <scottwood@freescale.com>
Date: Mon, 14 Dec 2009 16:32:27 -0600
Subject: [U-Boot] [PATCH 06/17] ppc: Move appropriate cpu/ dirs to
	arch/ppc/cpu/
In-Reply-To: <1260829587.11634.502.camel@localhost.localdomain>
References: <1260745480-22442-1-git-send-email-ptyser@xes-inc.com>	<1260745480-22442-7-git-send-email-ptyser@xes-inc.com>	<4B26A3A0.4060705@freescale.com>
	<1260829587.11634.502.camel@localhost.localdomain>
Message-ID: <4B26BCFB.7040501@freescale.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

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