Move all au1x00 code out of arch/mips/cpu/mips32 to allow unification of CPU code in a later patch. The reorganization of the SoC specific header files will be done in a later patch series.

Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com Cc: Paul Burton paul.burton@imgtec.com --- arch/mips/Makefile | 2 ++ arch/mips/cpu/mips32/Makefile | 2 -- arch/mips/cpu/mips32/cpu.c | 8 -------- arch/mips/{cpu/mips32/au1x00 => mach-au1x00}/Makefile | 0 arch/mips/{cpu/mips32/au1x00 => mach-au1x00}/au1x00_eth.c | 6 ++++++ arch/mips/{cpu/mips32/au1x00 => mach-au1x00}/au1x00_ide.c | 0 arch/mips/{cpu/mips32/au1x00 => mach-au1x00}/au1x00_serial.c | 0 arch/mips/{cpu/mips32/au1x00 => mach-au1x00}/au1x00_usb_ohci.c | 0 arch/mips/{cpu/mips32/au1x00 => mach-au1x00}/au1x00_usb_ohci.h | 0 arch/mips/{cpu/mips32/au1x00 => mach-au1x00}/config.mk | 0 10 files changed, 8 insertions(+), 10 deletions(-) rename arch/mips/{cpu/mips32/au1x00 => mach-au1x00}/Makefile (100%) rename arch/mips/{cpu/mips32/au1x00 => mach-au1x00}/au1x00_eth.c (98%) rename arch/mips/{cpu/mips32/au1x00 => mach-au1x00}/au1x00_ide.c (100%) rename arch/mips/{cpu/mips32/au1x00 => mach-au1x00}/au1x00_serial.c (100%) rename arch/mips/{cpu/mips32/au1x00 => mach-au1x00}/au1x00_usb_ohci.c (100%) rename arch/mips/{cpu/mips32/au1x00 => mach-au1x00}/au1x00_usb_ohci.h (100%) rename arch/mips/{cpu/mips32/au1x00 => mach-au1x00}/config.mk (100%)

diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 0a9e7e6..ff01bfe 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -8,3 +8,5 @@ head-$(CONFIG_CPU_MIPS64) := arch/mips/cpu/mips64/start.o libs-$(CONFIG_CPU_MIPS32) += arch/mips/cpu/mips32/ libs-$(CONFIG_CPU_MIPS64) += arch/mips/cpu/mips64/ libs-y += arch/mips/lib/ + +libs-$(CONFIG_SOC_AU1X00) += arch/mips/mach-au1x00/ diff --git a/arch/mips/cpu/mips32/Makefile b/arch/mips/cpu/mips32/Makefile index 19d316a..cb4db9c 100644 --- a/arch/mips/cpu/mips32/Makefile +++ b/arch/mips/cpu/mips32/Makefile @@ -7,5 +7,3 @@

extra-y = start.o obj-y = cpu.o interrupts.o time.o - -obj-$(CONFIG_SOC_AU1X00) += au1x00/ diff --git a/arch/mips/cpu/mips32/cpu.c b/arch/mips/cpu/mips32/cpu.c index 8e1cc4e..07deca8 100644 --- a/arch/mips/cpu/mips32/cpu.c +++ b/arch/mips/cpu/mips32/cpu.c @@ -32,11 +32,3 @@ void write_one_tlb(int index, u32 pagemask, u32 hi, u32 low0, u32 low1) write_c0_index(index); tlb_write_indexed(); } - -int cpu_eth_init(bd_t *bis) -{ -#ifdef CONFIG_SOC_AU1X00 - au1x00_enet_initialize(bis); -#endif - return 0; -} diff --git a/arch/mips/cpu/mips32/au1x00/Makefile b/arch/mips/mach-au1x00/Makefile similarity index 100% rename from arch/mips/cpu/mips32/au1x00/Makefile rename to arch/mips/mach-au1x00/Makefile diff --git a/arch/mips/cpu/mips32/au1x00/au1x00_eth.c b/arch/mips/mach-au1x00/au1x00_eth.c similarity index 98% rename from arch/mips/cpu/mips32/au1x00/au1x00_eth.c rename to arch/mips/mach-au1x00/au1x00_eth.c index 4770f56..39c5b6b 100644 --- a/arch/mips/cpu/mips32/au1x00/au1x00_eth.c +++ b/arch/mips/mach-au1x00/au1x00_eth.c @@ -294,3 +294,9 @@ int au1x00_enet_initialize(bd_t *bis){

return 1; } + +int cpu_eth_init(bd_t *bis) +{ + au1x00_enet_initialize(bis); + return 0; +} diff --git a/arch/mips/cpu/mips32/au1x00/au1x00_ide.c b/arch/mips/mach-au1x00/au1x00_ide.c similarity index 100% rename from arch/mips/cpu/mips32/au1x00/au1x00_ide.c rename to arch/mips/mach-au1x00/au1x00_ide.c diff --git a/arch/mips/cpu/mips32/au1x00/au1x00_serial.c b/arch/mips/mach-au1x00/au1x00_serial.c similarity index 100% rename from arch/mips/cpu/mips32/au1x00/au1x00_serial.c rename to arch/mips/mach-au1x00/au1x00_serial.c diff --git a/arch/mips/cpu/mips32/au1x00/au1x00_usb_ohci.c b/arch/mips/mach-au1x00/au1x00_usb_ohci.c similarity index 100% rename from arch/mips/cpu/mips32/au1x00/au1x00_usb_ohci.c rename to arch/mips/mach-au1x00/au1x00_usb_ohci.c diff --git a/arch/mips/cpu/mips32/au1x00/au1x00_usb_ohci.h b/arch/mips/mach-au1x00/au1x00_usb_ohci.h similarity index 100% rename from arch/mips/cpu/mips32/au1x00/au1x00_usb_ohci.h rename to arch/mips/mach-au1x00/au1x00_usb_ohci.h diff --git a/arch/mips/cpu/mips32/au1x00/config.mk b/arch/mips/mach-au1x00/config.mk similarity index 100% rename from arch/mips/cpu/mips32/au1x00/config.mk rename to arch/mips/mach-au1x00/config.mk