diff options
-rw-r--r-- | Makefile | 2 | ||||
-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-x | arch/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.S | 4 | ||||
-rw-r--r-- | include/configs/bf533-stamp.h | 6 | ||||
-rw-r--r-- | include/configs/bf537-pnav.h | 6 | ||||
-rw-r--r-- | include/configs/bf537-stamp.h | 6 | ||||
-rw-r--r-- | include/configs/bf538f-ezkit.h | 6 | ||||
-rw-r--r-- | include/configs/bf561-ezkit.h | 6 | ||||
-rw-r--r-- | include/configs/cm-bf537e.h | 6 | ||||
-rw-r--r-- | include/configs/cm-bf537u.h | 6 | ||||
-rw-r--r-- | include/configs/ibf-dsp561.h | 6 | ||||
-rw-r--r-- | include/configs/tcm-bf537.h | 6 |
29 files changed, 30 insertions, 30 deletions
@@ -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 0ec9d5672..0ec9d5672 100644 --- a/cpu/blackfin/.gitignore +++ b/arch/blackfin/cpu/.gitignore diff --git a/cpu/blackfin/Makefile b/arch/blackfin/cpu/Makefile index 211b8d545..211b8d545 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 1d6182425..1d6182425 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 3146e4667..3146e4667 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 6ed655a67..6ed655a67 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 2c8fd86b8..2c8fd86b8 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 0a13c285e..0a13c285e 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 5f80ad615..5f80ad615 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 69bba3f5e..69bba3f5e 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 54a67b497..54a67b497 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 1cd619f10..1cd619f10 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 e1c8e2948..e1c8e2948 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 e3be74071..e3be74071 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 901cb97a1..901cb97a1 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 5f9be8622..5f9be8622 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 7a3abba21..7a3abba21 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 caaea9410..caaea9410 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 1886bda0a..1886bda0a 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 2b23d8ba6..9163d20c2 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 0b94f559f..80c48847e 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 8038c40de..cf40d06b8 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 0f8679b57..92ceb3815 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 696fe29d2..59e05650e 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 fca6e43b4..1e3fdef64 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 d86409fcd..8d0bc1232 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 6be9dbad8..bbea3ab00 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 6fa8cf7a9..2eef5efa7 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 e9dfcc95f..409a042d0 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 : .; \ |