blackfin: Move cpu/blackfin/* to arch/blackfin/cpu/*

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>

diff --git a/Makefile b/Makefile
index e922ec3..0381c81 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3745,7 +3745,7 @@ clean:
               $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds  \
               $(obj)arch/blackfin/lib/u-boot.lds                                 \
               $(obj)u-boot.lds                                           \
               $(obj)board/armltd/{integratorap,integratorcp}/u-boot.lds  \
               $(obj)arch/blackfin/lib/u-boot.lds                                 \
               $(obj)u-boot.lds                                           \

-              $(obj)cpu/blackfin/bootrom-asm-offsets.[chs]
+              $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]

        @rm -f $(obj)include/bmp_logo.h
        @rm -f $(obj)nand_spl/{u-boot.lds,u-boot-spl,u-boot-spl.map,System.map}
        @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl.map}
        @rm -f $(obj)include/bmp_logo.h
        @rm -f $(obj)nand_spl/{u-boot.lds,u-boot-spl,u-boot-spl.map,System.map}
        @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl.map}

diff --git a/cpu/blackfin/.gitignore b/arch/blackfin/cpu/.gitignore
similarity index 100%
rename from cpu/blackfin/.gitignore
rename to arch/blackfin/cpu/.gitignore

diff --git a/cpu/blackfin/Makefile b/arch/blackfin/cpu/Makefile
similarity index 100%
rename from cpu/blackfin/Makefile
rename to arch/blackfin/cpu/Makefile

diff --git a/cpu/blackfin/bootrom-asm-offsets.awk b/arch/blackfin/cpu/bootrom-asm-offsets.awk
similarity index 100%
rename from cpu/blackfin/bootrom-asm-offsets.awk
rename to arch/blackfin/cpu/bootrom-asm-offsets.awk

diff --git a/cpu/blackfin/bootrom-asm-offsets.c.in b/arch/blackfin/cpu/bootrom-asm-offsets.c.in
similarity index 100%
rename from cpu/blackfin/bootrom-asm-offsets.c.in
rename to arch/blackfin/cpu/bootrom-asm-offsets.c.in

diff --git a/cpu/blackfin/cache.S b/arch/blackfin/cpu/cache.S
similarity index 100%
rename from cpu/blackfin/cache.S
rename to arch/blackfin/cpu/cache.S

diff --git a/cpu/blackfin/cpu.c b/arch/blackfin/cpu/cpu.c
similarity index 100%
rename from cpu/blackfin/cpu.c
rename to arch/blackfin/cpu/cpu.c

diff --git a/cpu/blackfin/cpu.h b/arch/blackfin/cpu/cpu.h
similarity index 100%
rename from cpu/blackfin/cpu.h
rename to arch/blackfin/cpu/cpu.h

diff --git a/cpu/blackfin/initcode.c b/arch/blackfin/cpu/initcode.c
similarity index 100%
rename from cpu/blackfin/initcode.c
rename to arch/blackfin/cpu/initcode.c

diff --git a/cpu/blackfin/interrupt.S b/arch/blackfin/cpu/interrupt.S
similarity index 100%
rename from cpu/blackfin/interrupt.S
rename to arch/blackfin/cpu/interrupt.S

diff --git a/cpu/blackfin/interrupts.c b/arch/blackfin/cpu/interrupts.c
similarity index 100%
rename from cpu/blackfin/interrupts.c
rename to arch/blackfin/cpu/interrupts.c

diff --git a/cpu/blackfin/jtag-console.c b/arch/blackfin/cpu/jtag-console.c
similarity index 100%
rename from cpu/blackfin/jtag-console.c
rename to arch/blackfin/cpu/jtag-console.c

diff --git a/cpu/blackfin/os_log.c b/arch/blackfin/cpu/os_log.c
similarity index 100%
rename from cpu/blackfin/os_log.c
rename to arch/blackfin/cpu/os_log.c

diff --git a/cpu/blackfin/reset.c b/arch/blackfin/cpu/reset.c
similarity index 100%
rename from cpu/blackfin/reset.c
rename to arch/blackfin/cpu/reset.c

diff --git a/cpu/blackfin/serial.c b/arch/blackfin/cpu/serial.c
similarity index 100%
rename from cpu/blackfin/serial.c
rename to arch/blackfin/cpu/serial.c

diff --git a/cpu/blackfin/serial.h b/arch/blackfin/cpu/serial.h
similarity index 100%
rename from cpu/blackfin/serial.h
rename to arch/blackfin/cpu/serial.h

diff --git a/cpu/blackfin/start.S b/arch/blackfin/cpu/start.S
similarity index 100%
rename from cpu/blackfin/start.S
rename to arch/blackfin/cpu/start.S

diff --git a/cpu/blackfin/traps.c b/arch/blackfin/cpu/traps.c
similarity index 100%
rename from cpu/blackfin/traps.c
rename to arch/blackfin/cpu/traps.c

diff --git a/cpu/blackfin/watchdog.c b/arch/blackfin/cpu/watchdog.c
similarity index 100%
rename from cpu/blackfin/watchdog.c
rename to arch/blackfin/cpu/watchdog.c

diff --git a/arch/blackfin/lib/u-boot.lds.S b/arch/blackfin/lib/u-boot.lds.S
index 2b23d8b..9163d20 100644 (file)
--- a/arch/blackfin/lib/u-boot.lds.S
+++ b/arch/blackfin/lib/u-boot.lds.S
@@ -73,14 +73,14 @@ SECTIONS
 {
        .text.pre :
        {
 {
        .text.pre :
        {

-               cpu/blackfin/start.o (.text .text.*)
+               arch/blackfin/cpu/start.o (.text .text.*)

 
                LDS_BOARD_TEXT
        } >ram_code
 
        .text.init :
        {
 
                LDS_BOARD_TEXT
        } >ram_code
 
        .text.init :
        {

-               cpu/blackfin/initcode.o (.text .text.*)
+               arch/blackfin/cpu/initcode.o (.text .text.*)

        } >ram_code
        __initcode_lma = LOADADDR(.text.init);
        __initcode_len = SIZEOF(.text.init);
        } >ram_code
        __initcode_lma = LOADADDR(.text.init);
        __initcode_len = SIZEOF(.text.init);

diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index 0b94f55..80c4884 100644 (file)
--- a/include/configs/bf533-stamp.h
+++ b/include/configs/bf533-stamp.h
@@ -126,9 +126,9 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \

-       cpu/blackfin/traps.o            (.text .text.*); \
-       cpu/blackfin/interrupt.o        (.text .text.*); \
-       cpu/blackfin/serial.o           (.text .text.*); \
+       arch/blackfin/cpu/traps.o               (.text .text.*); \
+       arch/blackfin/cpu/interrupt.o   (.text .text.*); \
+       arch/blackfin/cpu/serial.o              (.text .text.*); \

        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \

diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index 8038c40..cf40d06 100644 (file)
--- a/include/configs/bf537-pnav.h
+++ b/include/configs/bf537-pnav.h
@@ -112,9 +112,9 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \

-       cpu/blackfin/traps.o            (.text .text.*); \
-       cpu/blackfin/interrupt.o        (.text .text.*); \
-       cpu/blackfin/serial.o           (.text .text.*); \
+       arch/blackfin/cpu/traps.o               (.text .text.*); \
+       arch/blackfin/cpu/interrupt.o   (.text .text.*); \
+       arch/blackfin/cpu/serial.o              (.text .text.*); \

        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \

diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 0f8679b..92ceb38 100644 (file)
--- a/include/configs/bf537-stamp.h
+++ b/include/configs/bf537-stamp.h
@@ -122,9 +122,9 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \

-       cpu/blackfin/traps.o            (.text .text.*); \
-       cpu/blackfin/interrupt.o        (.text .text.*); \
-       cpu/blackfin/serial.o           (.text .text.*); \
+       arch/blackfin/cpu/traps.o               (.text .text.*); \
+       arch/blackfin/cpu/interrupt.o   (.text .text.*); \
+       arch/blackfin/cpu/serial.o              (.text .text.*); \

        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \

diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index 696fe29..59e0565 100644 (file)
--- a/include/configs/bf538f-ezkit.h
+++ b/include/configs/bf538f-ezkit.h
@@ -119,9 +119,9 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \

-       cpu/blackfin/traps.o            (.text .text.*); \
-       cpu/blackfin/interrupt.o        (.text .text.*); \
-       cpu/blackfin/serial.o           (.text .text.*); \
+       arch/blackfin/cpu/traps.o               (.text .text.*); \
+       arch/blackfin/cpu/interrupt.o   (.text .text.*); \
+       arch/blackfin/cpu/serial.o              (.text .text.*); \

        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \

diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index fca6e43..1e3fdef 100644 (file)
--- a/include/configs/bf561-ezkit.h
+++ b/include/configs/bf561-ezkit.h
@@ -96,9 +96,9 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \

-       cpu/blackfin/traps.o            (.text .text.*); \
-       cpu/blackfin/interrupt.o        (.text .text.*); \
-       cpu/blackfin/serial.o           (.text .text.*); \
+       arch/blackfin/cpu/traps.o               (.text .text.*); \
+       arch/blackfin/cpu/interrupt.o   (.text .text.*); \
+       arch/blackfin/cpu/serial.o              (.text .text.*); \

        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        lib/zlib.o              (.text .text.*); \
        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        lib/zlib.o              (.text .text.*); \

diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index d86409f..8d0bc12 100644 (file)
--- a/include/configs/cm-bf537e.h
+++ b/include/configs/cm-bf537e.h
@@ -104,9 +104,9 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \

-       cpu/blackfin/traps.o            (.text .text.*); \
-       cpu/blackfin/interrupt.o        (.text .text.*); \
-       cpu/blackfin/serial.o           (.text .text.*); \
+       arch/blackfin/cpu/traps.o               (.text .text.*); \
+       arch/blackfin/cpu/interrupt.o   (.text .text.*); \
+       arch/blackfin/cpu/serial.o              (.text .text.*); \

        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \

diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index 6be9dba..bbea3ab 100644 (file)
--- a/include/configs/cm-bf537u.h
+++ b/include/configs/cm-bf537u.h
@@ -105,9 +105,9 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \

-       cpu/blackfin/traps.o            (.text .text.*); \
-       cpu/blackfin/interrupt.o        (.text .text.*); \
-       cpu/blackfin/serial.o           (.text .text.*); \
+       arch/blackfin/cpu/traps.o               (.text .text.*); \
+       arch/blackfin/cpu/interrupt.o   (.text .text.*); \
+       arch/blackfin/cpu/serial.o              (.text .text.*); \

        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \

diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h
index 6fa8cf7..2eef5ef 100644 (file)
--- a/include/configs/ibf-dsp561.h
+++ b/include/configs/ibf-dsp561.h
@@ -84,9 +84,9 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \

-       cpu/blackfin/traps.o            (.text .text.*); \
-       cpu/blackfin/interrupt.o        (.text .text.*); \
-       cpu/blackfin/serial.o           (.text .text.*); \
+       arch/blackfin/cpu/traps.o               (.text .text.*); \
+       arch/blackfin/cpu/interrupt.o   (.text .text.*); \
+       arch/blackfin/cpu/serial.o              (.text .text.*); \

        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        lib/zlib.o              (.text .text.*); \
        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        lib/zlib.o              (.text .text.*); \

diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index e9dfcc9..409a042 100644 (file)
--- a/include/configs/tcm-bf537.h
+++ b/include/configs/tcm-bf537.h
@@ -105,9 +105,9 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \

-       cpu/blackfin/traps.o            (.text .text.*); \
-       cpu/blackfin/interrupt.o        (.text .text.*); \
-       cpu/blackfin/serial.o           (.text .text.*); \
+       arch/blackfin/cpu/traps.o               (.text .text.*); \
+       arch/blackfin/cpu/interrupt.o   (.text .text.*); \
+       arch/blackfin/cpu/serial.o              (.text .text.*); \

        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \
        common/dlmalloc.o               (.text .text.*); \
        lib/crc32.o             (.text .text.*); \
        . = DEFINED(env_offset) ? env_offset : .; \