From c6fb83d21729321426308c3acff2a3dfb20d250b Mon Sep 17 00:00:00 2001 From: Peter Tyser Date: Mon, 12 Apr 2010 22:28:13 -0500 Subject: [PATCH] blackfin: Move cpu/blackfin/* to arch/blackfin/cpu/* Signed-off-by: Peter Tyser --- Makefile | 2 +- {cpu/blackfin => arch/blackfin/cpu}/.gitignore | 0 {cpu/blackfin => arch/blackfin/cpu}/Makefile | 0 {cpu/blackfin => arch/blackfin/cpu}/bootrom-asm-offsets.awk | 0 .../blackfin => arch/blackfin/cpu}/bootrom-asm-offsets.c.in | 0 {cpu/blackfin => arch/blackfin/cpu}/cache.S | 0 {cpu/blackfin => arch/blackfin/cpu}/cpu.c | 0 {cpu/blackfin => arch/blackfin/cpu}/cpu.h | 0 {cpu/blackfin => arch/blackfin/cpu}/initcode.c | 0 {cpu/blackfin => arch/blackfin/cpu}/interrupt.S | 0 {cpu/blackfin => arch/blackfin/cpu}/interrupts.c | 0 {cpu/blackfin => arch/blackfin/cpu}/jtag-console.c | 0 {cpu/blackfin => arch/blackfin/cpu}/os_log.c | 0 {cpu/blackfin => arch/blackfin/cpu}/reset.c | 0 {cpu/blackfin => arch/blackfin/cpu}/serial.c | 0 {cpu/blackfin => arch/blackfin/cpu}/serial.h | 0 {cpu/blackfin => arch/blackfin/cpu}/start.S | 0 {cpu/blackfin => arch/blackfin/cpu}/traps.c | 0 {cpu/blackfin => arch/blackfin/cpu}/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/blackfin => arch/blackfin/cpu}/.gitignore (100%) rename {cpu/blackfin => arch/blackfin/cpu}/Makefile (100%) rename {cpu/blackfin => arch/blackfin/cpu}/bootrom-asm-offsets.awk (100%) rename {cpu/blackfin => arch/blackfin/cpu}/bootrom-asm-offsets.c.in (100%) rename {cpu/blackfin => arch/blackfin/cpu}/cache.S (100%) rename {cpu/blackfin => arch/blackfin/cpu}/cpu.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/cpu.h (100%) rename {cpu/blackfin => arch/blackfin/cpu}/initcode.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/interrupt.S (100%) rename {cpu/blackfin => arch/blackfin/cpu}/interrupts.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/jtag-console.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/os_log.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/reset.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/serial.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/serial.h (100%) rename {cpu/blackfin => arch/blackfin/cpu}/start.S (100%) rename {cpu/blackfin => arch/blackfin/cpu}/traps.c (100%) rename {cpu/blackfin => arch/blackfin/cpu}/watchdog.c (100%) 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 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 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 : .; \