The following changes since commit ab92da9f47d51d363c7de42e2a7bd807e2c1bd54:
Merge branch 'master' of git://git.denx.de/u-boot-x86 (2015-01-26 17:44:49 -0500)
are available in the git repository at:
git://git.denx.de/u-boot-mips.git master
for you to fetch changes up to eef88dfb3e16e4631e078f42714dbcef3216e3e1:
MIPS: unify CPU code in arch/mips/cpu/ (2015-01-30 14:19:58 +0100)
---------------------------------------------------------------- Daniel Schwierzeck (2): MIPS: move au1x00 SoC code to arch/mips/mach-au1x00 MIPS: unify CPU code in arch/mips/cpu/
Paul Burton (15): MIPS: avoid .set ISA for cache operations MIPS: unify cache maintenance functions MIPS: unify cache initialization code MIPS: refactor L1 cache config reads to a macro MIPS: refactor cache loops to a macro MIPS: inline mips_init_[id]cache functions MIPS: allow systems to skip loads during cache init MIPS: clear TagLo select 2 during cache init malta: IDE support malta: delay after reset malta: enable HUSH parser malta: enable ELF loading MIPS: use asm.h macros in mips32 start.S MIPS: handle mips64 relocs in mips32 start.S MIPS: handle mips64 ST0_KX bit in mips32 start.S
arch/mips/Kconfig | 6 +++ arch/mips/Makefile | 8 +-- arch/mips/cpu/Makefile | 9 ++++ arch/mips/cpu/cpu.c | 38 +++++++++++++++ arch/mips/cpu/{mips64 => }/interrupts.c | 0 arch/mips/cpu/mips32/Makefile | 12 ----- arch/mips/cpu/mips32/interrupts.c | 22 --------- arch/mips/cpu/mips32/time.c | 19 -------- arch/mips/cpu/mips64/Makefile | 9 ---- arch/mips/cpu/mips64/cache.S | 213 -------------------------------------------------------------------------------- arch/mips/cpu/mips64/cpu.c | 95 ------------------------------------ arch/mips/cpu/mips64/start.S | 291 -------------------------------------------------------------------------------------------------------------- arch/mips/cpu/{mips32 => }/start.S | 137 ++++++++++++++++++++++++++++++---------------------- arch/mips/cpu/{mips64 => }/time.c | 0 arch/mips/include/asm/cacheops.h | 13 +++++ arch/mips/include/asm/malta.h | 5 ++ arch/mips/lib/Makefile | 2 + arch/mips/{cpu/mips32/cpu.c => lib/cache.c} | 75 ++++++----------------------- arch/mips/{cpu/mips32/cache.S => lib/cache_init.S} | 222 +++++++++++++++++++++++++++++++++++------------------------------------------------- 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 board/imgtec/malta/malta.c | 20 ++++++++ include/configs/malta.h | 13 +++++ 28 files changed, 303 insertions(+), 912 deletions(-) create mode 100644 arch/mips/cpu/Makefile create mode 100644 arch/mips/cpu/cpu.c rename arch/mips/cpu/{mips64 => }/interrupts.c (100%) delete mode 100644 arch/mips/cpu/mips32/Makefile delete mode 100644 arch/mips/cpu/mips32/interrupts.c delete mode 100644 arch/mips/cpu/mips32/time.c delete mode 100644 arch/mips/cpu/mips64/Makefile delete mode 100644 arch/mips/cpu/mips64/cache.S delete mode 100644 arch/mips/cpu/mips64/cpu.c delete mode 100644 arch/mips/cpu/mips64/start.S rename arch/mips/cpu/{mips32 => }/start.S (61%) rename arch/mips/cpu/{mips64 => }/time.c (100%) rename arch/mips/{cpu/mips32/cpu.c => lib/cache.c} (55%) rename arch/mips/{cpu/mips32/cache.S => lib/cache_init.S} (59%) 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%)