public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Scott Wood <scottwood@freescale.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 06/17] ppc: Move appropriate cpu/ dirs to arch/ppc/cpu/
Date: Mon, 14 Dec 2009 16:32:27 -0600	[thread overview]
Message-ID: <4B26BCFB.7040501@freescale.com> (raw)
In-Reply-To: <1260829587.11634.502.camel@localhost.localdomain>

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

  reply	other threads:[~2009-12-14 22:32 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-13 23:04 [U-Boot] [PATCH 00/17] Reorganize directory structure Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 01/17] Move lib_<ARCH> directories to arch/<ARCH>/lib Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 02/17] Rename lib_generic/ to lib/ Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 03/17] Move libfdt/ into lib/ Peter Tyser
2009-12-13 23:16   ` Luigi Mantellini
2009-12-13 23:33     ` Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 04/17] Replace "#include <asm-$ARCH/$FILE>" with "#include <asm/$FILE>" Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 05/17] Move architecture-specific includes to arch/$ARCH/include/asm Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 06/17] ppc: Move appropriate cpu/ dirs to arch/ppc/cpu/ Peter Tyser
2009-12-14 20:44   ` Scott Wood
2009-12-14 22:26     ` Peter Tyser
2009-12-14 22:32       ` Scott Wood [this message]
2009-12-13 23:04 ` [U-Boot] [PATCH 07/17] sh: Move appropriate cpu/ dirs to arch/sh/cpu/ Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 08/17] arm: Move appropriate cpu/ dirs to arch/arm/cpu/ Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 09/17] m68k: Move appropriate cpu/ dirs to arch/m68k/cpu/ Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 10/17] blackfin: Move appropriate cpu/ dirs to arch/blackfin/cpu/ Peter Tyser
2009-12-14  2:37   ` Mike Frysinger
2009-12-14  3:27     ` Peter Tyser
2009-12-14  6:19       ` Mike Frysinger
2009-12-14  6:39         ` Peter Tyser
2009-12-14 13:58           ` Mike Frysinger
2009-12-13 23:04 ` [U-Boot] [PATCH 11/17] mips: Move appropriate cpu/ dirs to arch/mips/cpu/ Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 12/17] avr32: Move appropriate cpu/ dirs to arch/avr32/cpu/ Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 13/17] microblaze: Move appropriate cpu/ dirs to arch/microblaze/cpu/ Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 14/17] sparc: Move appropriate cpu/ dirs to arch/sparc/cpu/ Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 15/17] nios: Move appropriate cpu/ dirs to arch/nios/cpu/ Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 16/17] nios2: Move appropriate cpu/ dirs to arch/nios2/cpu/ Peter Tyser
2009-12-13 23:04 ` [U-Boot] [PATCH 17/17] i386: Move appropriate cpu/ dirs to arch/i386/cpu/ Peter Tyser
2010-03-20 22:51 ` [U-Boot] [PATCH 00/17] Reorganize directory structure Wolfgang Denk
2010-03-26 15:57   ` Peter Tyser

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4B26BCFB.7040501@freescale.com \
    --to=scottwood@freescale.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox