summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--arch/blackfin/cpu/.gitignore (renamed from cpu/blackfin/.gitignore)0
-rw-r--r--arch/blackfin/cpu/Makefile (renamed from cpu/blackfin/Makefile)0
-rwxr-xr-xarch/blackfin/cpu/bootrom-asm-offsets.awk (renamed from cpu/blackfin/bootrom-asm-offsets.awk)0
-rw-r--r--arch/blackfin/cpu/bootrom-asm-offsets.c.in (renamed from cpu/blackfin/bootrom-asm-offsets.c.in)0
-rw-r--r--arch/blackfin/cpu/cache.S (renamed from cpu/blackfin/cache.S)0
-rw-r--r--arch/blackfin/cpu/cpu.c (renamed from cpu/blackfin/cpu.c)0
-rw-r--r--arch/blackfin/cpu/cpu.h (renamed from cpu/blackfin/cpu.h)0
-rw-r--r--arch/blackfin/cpu/initcode.c (renamed from cpu/blackfin/initcode.c)0
-rw-r--r--arch/blackfin/cpu/interrupt.S (renamed from cpu/blackfin/interrupt.S)0
-rw-r--r--arch/blackfin/cpu/interrupts.c (renamed from cpu/blackfin/interrupts.c)0
-rw-r--r--arch/blackfin/cpu/jtag-console.c (renamed from cpu/blackfin/jtag-console.c)0
-rw-r--r--arch/blackfin/cpu/os_log.c (renamed from cpu/blackfin/os_log.c)0
-rw-r--r--arch/blackfin/cpu/reset.c (renamed from cpu/blackfin/reset.c)0
-rw-r--r--arch/blackfin/cpu/serial.c (renamed from cpu/blackfin/serial.c)0
-rw-r--r--arch/blackfin/cpu/serial.h (renamed from cpu/blackfin/serial.h)0
-rw-r--r--arch/blackfin/cpu/start.S (renamed from cpu/blackfin/start.S)0
-rw-r--r--arch/blackfin/cpu/traps.c (renamed from cpu/blackfin/traps.c)0
-rw-r--r--arch/blackfin/cpu/watchdog.c (renamed from cpu/blackfin/watchdog.c)0
-rw-r--r--arch/blackfin/lib/u-boot.lds.S4
-rw-r--r--include/configs/bf533-stamp.h6
-rw-r--r--include/configs/bf537-pnav.h6
-rw-r--r--include/configs/bf537-stamp.h6
-rw-r--r--include/configs/bf538f-ezkit.h6
-rw-r--r--include/configs/bf561-ezkit.h6
-rw-r--r--include/configs/cm-bf537e.h6
-rw-r--r--include/configs/cm-bf537u.h6
-rw-r--r--include/configs/ibf-dsp561.h6
-rw-r--r--include/configs/tcm-bf537.h6
29 files changed, 30 insertions, 30 deletions
diff --git a/Makefile b/Makefile
index e922ec3a7b..0381c8110f 100644
--- 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)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}
diff --git a/cpu/blackfin/.gitignore b/arch/blackfin/cpu/.gitignore
index 0ec9d5672e..0ec9d5672e 100644
--- a/cpu/blackfin/.gitignore
+++ b/arch/blackfin/cpu/.gitignore
diff --git a/cpu/blackfin/Makefile b/arch/blackfin/cpu/Makefile
index 211b8d5450..211b8d5450 100644
--- a/cpu/blackfin/Makefile
+++ b/arch/blackfin/cpu/Makefile
diff --git a/cpu/blackfin/bootrom-asm-offsets.awk b/arch/blackfin/cpu/bootrom-asm-offsets.awk
index 1d61824254..1d61824254 100755
--- a/cpu/blackfin/bootrom-asm-offsets.awk
+++ b/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
index 3146e46674..3146e46674 100644
--- a/cpu/blackfin/bootrom-asm-offsets.c.in
+++ b/arch/blackfin/cpu/bootrom-asm-offsets.c.in
diff --git a/cpu/blackfin/cache.S b/arch/blackfin/cpu/cache.S
index 6ed655a674..6ed655a674 100644
--- a/cpu/blackfin/cache.S
+++ b/arch/blackfin/cpu/cache.S
diff --git a/cpu/blackfin/cpu.c b/arch/blackfin/cpu/cpu.c
index 2c8fd86b86..2c8fd86b86 100644
--- a/cpu/blackfin/cpu.c
+++ b/arch/blackfin/cpu/cpu.c
diff --git a/cpu/blackfin/cpu.h b/arch/blackfin/cpu/cpu.h
index 0a13c285e0..0a13c285e0 100644
--- a/cpu/blackfin/cpu.h
+++ b/arch/blackfin/cpu/cpu.h
diff --git a/cpu/blackfin/initcode.c b/arch/blackfin/cpu/initcode.c
index 5f80ad615e..5f80ad615e 100644
--- a/cpu/blackfin/initcode.c
+++ b/arch/blackfin/cpu/initcode.c
diff --git a/cpu/blackfin/interrupt.S b/arch/blackfin/cpu/interrupt.S
index 69bba3f5ee..69bba3f5ee 100644
--- a/cpu/blackfin/interrupt.S
+++ b/arch/blackfin/cpu/interrupt.S
diff --git a/cpu/blackfin/interrupts.c b/arch/blackfin/cpu/interrupts.c
index 54a67b4971..54a67b4971 100644
--- a/cpu/blackfin/interrupts.c
+++ b/arch/blackfin/cpu/interrupts.c
diff --git a/cpu/blackfin/jtag-console.c b/arch/blackfin/cpu/jtag-console.c
index 1cd619f10b..1cd619f10b 100644
--- a/cpu/blackfin/jtag-console.c
+++ b/arch/blackfin/cpu/jtag-console.c
diff --git a/cpu/blackfin/os_log.c b/arch/blackfin/cpu/os_log.c
index e1c8e2948d..e1c8e2948d 100644
--- a/cpu/blackfin/os_log.c
+++ b/arch/blackfin/cpu/os_log.c
diff --git a/cpu/blackfin/reset.c b/arch/blackfin/cpu/reset.c
index e3be740711..e3be740711 100644
--- a/cpu/blackfin/reset.c
+++ b/arch/blackfin/cpu/reset.c
diff --git a/cpu/blackfin/serial.c b/arch/blackfin/cpu/serial.c
index 901cb97a1c..901cb97a1c 100644
--- a/cpu/blackfin/serial.c
+++ b/arch/blackfin/cpu/serial.c
diff --git a/cpu/blackfin/serial.h b/arch/blackfin/cpu/serial.h
index 5f9be8622d..5f9be8622d 100644
--- a/cpu/blackfin/serial.h
+++ b/arch/blackfin/cpu/serial.h
diff --git a/cpu/blackfin/start.S b/arch/blackfin/cpu/start.S
index 7a3abba21c..7a3abba21c 100644
--- a/cpu/blackfin/start.S
+++ b/arch/blackfin/cpu/start.S
diff --git a/cpu/blackfin/traps.c b/arch/blackfin/cpu/traps.c
index caaea94106..caaea94106 100644
--- a/cpu/blackfin/traps.c
+++ b/arch/blackfin/cpu/traps.c
diff --git a/cpu/blackfin/watchdog.c b/arch/blackfin/cpu/watchdog.c
index 1886bda0ae..1886bda0ae 100644
--- a/cpu/blackfin/watchdog.c
+++ b/arch/blackfin/cpu/watchdog.c
diff --git a/arch/blackfin/lib/u-boot.lds.S b/arch/blackfin/lib/u-boot.lds.S
index 2b23d8ba63..9163d20c29 100644
--- a/arch/blackfin/lib/u-boot.lds.S
+++ b/arch/blackfin/lib/u-boot.lds.S
@@ -73,14 +73,14 @@ SECTIONS
{
.text.pre :
{
- cpu/blackfin/start.o (.text .text.*)
+ arch/blackfin/cpu/start.o (.text .text.*)
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);
diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h
index 0b94f559fd..80c48847e4 100644
--- 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 \
- 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 : .; \
diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h
index 8038c40de1..cf40d06b88 100644
--- 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 \
- 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 : .; \
diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h
index 0f8679b57e..92ceb3815b 100644
--- 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 \
- 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 : .; \
diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h
index 696fe29d20..59e05650ec 100644
--- 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 \
- 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 : .; \
diff --git a/include/configs/bf561-ezkit.h b/include/configs/bf561-ezkit.h
index fca6e43b47..1e3fdef64a 100644
--- 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 \
- 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.*); \
diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h
index d86409fcd3..8d0bc1232f 100644
--- 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 \
- 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 : .; \
diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h
index 6be9dbad81..bbea3ab009 100644
--- 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 \
- 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 : .; \
diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h
index 6fa8cf7a91..2eef5efa78 100644
--- 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 \
- 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.*); \
diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h
index e9dfcc95fe..409a042d05 100644
--- 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 \
- 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 : .; \
View Lorry Controller Status