Signed-off-by: Peter Tyser ptyser@xes-inc.com --- Makefile | 2 +- {cpu => arch/blackfin/cpu}/blackfin/.gitignore | 0 {cpu => arch/blackfin/cpu}/blackfin/Makefile | 0 .../blackfin/cpu}/blackfin/bootrom-asm-offsets.awk | 0 .../cpu}/blackfin/bootrom-asm-offsets.c.in | 0 {cpu => arch/blackfin/cpu}/blackfin/cache.S | 0 {cpu => arch/blackfin/cpu}/blackfin/cpu.c | 0 {cpu => arch/blackfin/cpu}/blackfin/cpu.h | 0 {cpu => arch/blackfin/cpu}/blackfin/initcode.c | 0 {cpu => arch/blackfin/cpu}/blackfin/interrupt.S | 0 {cpu => arch/blackfin/cpu}/blackfin/interrupts.c | 0 {cpu => arch/blackfin/cpu}/blackfin/jtag-console.c | 0 {cpu => arch/blackfin/cpu}/blackfin/os_log.c | 0 {cpu => arch/blackfin/cpu}/blackfin/reset.c | 0 {cpu => arch/blackfin/cpu}/blackfin/serial.c | 0 {cpu => arch/blackfin/cpu}/blackfin/serial.h | 0 {cpu => arch/blackfin/cpu}/blackfin/start.S | 0 {cpu => arch/blackfin/cpu}/blackfin/traps.c | 0 {cpu => arch/blackfin/cpu}/blackfin/watchdog.c | 0 arch/blackfin/lib/u-boot.lds.S | 4 ++-- include/configs/bf533-stamp.h | 6 +++--- include/configs/bf537-pnav.h | 6 +++--- include/configs/bf537-stamp.h | 6 +++--- include/configs/bf538f-ezkit.h | 6 +++--- include/configs/bf561-ezkit.h | 6 +++--- include/configs/cm-bf537e.h | 6 +++--- include/configs/cm-bf537u.h | 6 +++--- include/configs/ibf-dsp561.h | 6 +++--- include/configs/tcm-bf537.h | 6 +++--- 29 files changed, 30 insertions(+), 30 deletions(-) rename {cpu => arch/blackfin/cpu}/blackfin/.gitignore (100%) rename {cpu => arch/blackfin/cpu}/blackfin/Makefile (100%) rename {cpu => arch/blackfin/cpu}/blackfin/bootrom-asm-offsets.awk (100%) rename {cpu => arch/blackfin/cpu}/blackfin/bootrom-asm-offsets.c.in (100%) rename {cpu => arch/blackfin/cpu}/blackfin/cache.S (100%) rename {cpu => arch/blackfin/cpu}/blackfin/cpu.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/cpu.h (100%) rename {cpu => arch/blackfin/cpu}/blackfin/initcode.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/interrupt.S (100%) rename {cpu => arch/blackfin/cpu}/blackfin/interrupts.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/jtag-console.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/os_log.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/reset.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/serial.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/serial.h (100%) rename {cpu => arch/blackfin/cpu}/blackfin/start.S (100%) rename {cpu => arch/blackfin/cpu}/blackfin/traps.c (100%) rename {cpu => arch/blackfin/cpu}/blackfin/watchdog.c (100%)
diff --git a/Makefile b/Makefile index c97ab1d..1390c28 100644 --- a/Makefile +++ b/Makefile @@ -3741,7 +3741,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/blackfin/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/blackfin/.gitignore similarity index 100% rename from cpu/blackfin/.gitignore rename to arch/blackfin/cpu/blackfin/.gitignore diff --git a/cpu/blackfin/Makefile b/arch/blackfin/cpu/blackfin/Makefile similarity index 100% rename from cpu/blackfin/Makefile rename to arch/blackfin/cpu/blackfin/Makefile diff --git a/cpu/blackfin/bootrom-asm-offsets.awk b/arch/blackfin/cpu/blackfin/bootrom-asm-offsets.awk similarity index 100% rename from cpu/blackfin/bootrom-asm-offsets.awk rename to arch/blackfin/cpu/blackfin/bootrom-asm-offsets.awk diff --git a/cpu/blackfin/bootrom-asm-offsets.c.in b/arch/blackfin/cpu/blackfin/bootrom-asm-offsets.c.in similarity index 100% rename from cpu/blackfin/bootrom-asm-offsets.c.in rename to arch/blackfin/cpu/blackfin/bootrom-asm-offsets.c.in diff --git a/cpu/blackfin/cache.S b/arch/blackfin/cpu/blackfin/cache.S similarity index 100% rename from cpu/blackfin/cache.S rename to arch/blackfin/cpu/blackfin/cache.S diff --git a/cpu/blackfin/cpu.c b/arch/blackfin/cpu/blackfin/cpu.c similarity index 100% rename from cpu/blackfin/cpu.c rename to arch/blackfin/cpu/blackfin/cpu.c diff --git a/cpu/blackfin/cpu.h b/arch/blackfin/cpu/blackfin/cpu.h similarity index 100% rename from cpu/blackfin/cpu.h rename to arch/blackfin/cpu/blackfin/cpu.h diff --git a/cpu/blackfin/initcode.c b/arch/blackfin/cpu/blackfin/initcode.c similarity index 100% rename from cpu/blackfin/initcode.c rename to arch/blackfin/cpu/blackfin/initcode.c diff --git a/cpu/blackfin/interrupt.S b/arch/blackfin/cpu/blackfin/interrupt.S similarity index 100% rename from cpu/blackfin/interrupt.S rename to arch/blackfin/cpu/blackfin/interrupt.S diff --git a/cpu/blackfin/interrupts.c b/arch/blackfin/cpu/blackfin/interrupts.c similarity index 100% rename from cpu/blackfin/interrupts.c rename to arch/blackfin/cpu/blackfin/interrupts.c diff --git a/cpu/blackfin/jtag-console.c b/arch/blackfin/cpu/blackfin/jtag-console.c similarity index 100% rename from cpu/blackfin/jtag-console.c rename to arch/blackfin/cpu/blackfin/jtag-console.c diff --git a/cpu/blackfin/os_log.c b/arch/blackfin/cpu/blackfin/os_log.c similarity index 100% rename from cpu/blackfin/os_log.c rename to arch/blackfin/cpu/blackfin/os_log.c diff --git a/cpu/blackfin/reset.c b/arch/blackfin/cpu/blackfin/reset.c similarity index 100% rename from cpu/blackfin/reset.c rename to arch/blackfin/cpu/blackfin/reset.c diff --git a/cpu/blackfin/serial.c b/arch/blackfin/cpu/blackfin/serial.c similarity index 100% rename from cpu/blackfin/serial.c rename to arch/blackfin/cpu/blackfin/serial.c diff --git a/cpu/blackfin/serial.h b/arch/blackfin/cpu/blackfin/serial.h similarity index 100% rename from cpu/blackfin/serial.h rename to arch/blackfin/cpu/blackfin/serial.h diff --git a/cpu/blackfin/start.S b/arch/blackfin/cpu/blackfin/start.S similarity index 100% rename from cpu/blackfin/start.S rename to arch/blackfin/cpu/blackfin/start.S diff --git a/cpu/blackfin/traps.c b/arch/blackfin/cpu/blackfin/traps.c similarity index 100% rename from cpu/blackfin/traps.c rename to arch/blackfin/cpu/blackfin/traps.c diff --git a/cpu/blackfin/watchdog.c b/arch/blackfin/cpu/blackfin/watchdog.c similarity index 100% rename from cpu/blackfin/watchdog.c rename to arch/blackfin/cpu/blackfin/watchdog.c diff --git a/arch/blackfin/lib/u-boot.lds.S b/arch/blackfin/lib/u-boot.lds.S index 3604b78..ec1a1d7 100644 --- a/arch/blackfin/lib/u-boot.lds.S +++ b/arch/blackfin/lib/u-boot.lds.S @@ -67,12 +67,12 @@ SECTIONS { .text : { - cpu/blackfin/start.o (.text .text.*) + arch/blackfin/cpu/blackfin/start.o (.text .text.*)
LDS_BOARD_TEXT
__initcode_start = .; - cpu/blackfin/initcode.o (.text .text.*) + arch/blackfin/cpu/blackfin/initcode.o (.text .text.*) __initcode_end = .;
*(.text .text.*) diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index 06b4dee..a31cd31 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/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/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 f1872ec..0fee207 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/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/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 fa46551..1f811f1 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/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/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 0464943..efb26bb 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/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/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 1cc6a6e..96b3f4e 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/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/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 b2a08e3..9260e5a 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -101,9 +101,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/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/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 cd729a8..a35c465 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/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/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 0108120..bd36304 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/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/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 7c68bcf..fb4f8c4 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -102,9 +102,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/blackfin/traps.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/interrupt.o (.text .text.*); \ + arch/blackfin/cpu/blackfin/serial.o (.text .text.*); \ common/dlmalloc.o (.text .text.*); \ lib/crc32.o (.text .text.*); \ . = DEFINED(env_offset) ? env_offset : .; \