Merge branch 'master' of git://git.denx.de/u-boot-samsung

56 files changed, 5 insertions, 7 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ee9a1b3..735d971 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -838,7 +838,7 @@ source "arch/arm/mach-bcm283x/Kconfig"
 
 source "arch/arm/mach-davinci/Kconfig"
 
-source "arch/arm/cpu/armv7/exynos/Kconfig"
+source "arch/arm/mach-exynos/Kconfig"
 
 source "arch/arm/mach-highbank/Kconfig"
 
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index ab0e9ce..e84d6d3 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -44,6 +44,7 @@ PLATFORM_CPPFLAGS += $(arch-y) $(tune-y)
 machine-$(CONFIG_ARCH_AT91)		+= at91
 machine-$(CONFIG_ARCH_BCM283X)		+= bcm283x
 machine-$(CONFIG_ARCH_DAVINCI)		+= davinci
+machine-$(CONFIG_ARCH_EXYNOS)		+= exynos
 machine-$(CONFIG_ARCH_HIGHBANK)		+= highbank
 machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone
 # TODO: rename CONFIG_KIRKWOOD -> CONFIG_ARCH_KIRKWOOD
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
index 5a76100..6769d8f 100644
--- a/arch/arm/cpu/armv7/Makefile
+++ b/arch/arm/cpu/armv7/Makefile
@@ -41,7 +41,6 @@ obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/
 obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/
 obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/
 obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/
-obj-$(CONFIG_ARCH_EXYNOS) += exynos/
 obj-$(if $(filter ls102xa,$(SOC)),y) += ls102xa/
 obj-$(if $(filter mx5,$(SOC)),y) += mx5/
 obj-$(CONFIG_MX6) += mx6/
diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 37b89b0..37b89b0 100644
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
diff --git a/arch/arm/cpu/armv7/exynos/Makefile b/arch/arm/mach-exynos/Makefile
index 8542f89..8542f89 100644
--- a/arch/arm/cpu/armv7/exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
diff --git a/arch/arm/cpu/armv7/exynos/clock.c b/arch/arm/mach-exynos/clock.c
index 1c6baa1..1c6baa1 100644
--- a/arch/arm/cpu/armv7/exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
diff --git a/arch/arm/cpu/armv7/exynos/clock_init.h b/arch/arm/mach-exynos/clock_init.h
index fce502f..fce502f 100644
--- a/arch/arm/cpu/armv7/exynos/clock_init.h
+++ b/arch/arm/mach-exynos/clock_init.h
diff --git a/arch/arm/cpu/armv7/exynos/clock_init_exynos4.c b/arch/arm/mach-exynos/clock_init_exynos4.c
index 584e4ba..584e4ba 100644
--- a/arch/arm/cpu/armv7/exynos/clock_init_exynos4.c
+++ b/arch/arm/mach-exynos/clock_init_exynos4.c
diff --git a/arch/arm/cpu/armv7/exynos/clock_init_exynos5.c b/arch/arm/mach-exynos/clock_init_exynos5.c
index 0200fd1..0200fd1 100644
--- a/arch/arm/cpu/armv7/exynos/clock_init_exynos5.c
+++ b/arch/arm/mach-exynos/clock_init_exynos5.c
diff --git a/arch/arm/cpu/armv7/exynos/common_setup.h b/arch/arm/mach-exynos/common_setup.h
index 5235abb..67aac2d 100644
--- a/arch/arm/cpu/armv7/exynos/common_setup.h
+++ b/arch/arm/mach-exynos/common_setup.h
@@ -60,7 +60,7 @@ enum l2_cache_params {
 };
 
 
-#ifndef CONFIG_SYS_L2CACHE_OFF
+#if !defined(CONFIG_SYS_L2CACHE_OFF) && defined(CONFIG_EXYNOS5420)
 /*
  * Configure L2CTLR to get timings that keep us from hanging/crashing.
  *
diff --git a/arch/arm/cpu/armv7/exynos/config.mk b/arch/arm/mach-exynos/config.mk
index ee0d2da..ee0d2da 100644
--- a/arch/arm/cpu/armv7/exynos/config.mk
+++ b/arch/arm/mach-exynos/config.mk
diff --git a/arch/arm/cpu/armv7/exynos/dmc_common.c b/arch/arm/mach-exynos/dmc_common.c
index 9b6ee69..9b6ee69 100644
--- a/arch/arm/cpu/armv7/exynos/dmc_common.c
+++ b/arch/arm/mach-exynos/dmc_common.c
diff --git a/arch/arm/cpu/armv7/exynos/dmc_init_ddr3.c b/arch/arm/mach-exynos/dmc_init_ddr3.c
index 7c0b12a..7c0b12a 100644
--- a/arch/arm/cpu/armv7/exynos/dmc_init_ddr3.c
+++ b/arch/arm/mach-exynos/dmc_init_ddr3.c
diff --git a/arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c b/arch/arm/mach-exynos/dmc_init_exynos4.c
index ecddc72..ecddc72 100644
--- a/arch/arm/cpu/armv7/exynos/dmc_init_exynos4.c
+++ b/arch/arm/mach-exynos/dmc_init_exynos4.c
diff --git a/arch/arm/cpu/armv7/exynos/exynos4_setup.h b/arch/arm/mach-exynos/exynos4_setup.h
index 9f29d94..9f29d94 100644
--- a/arch/arm/cpu/armv7/exynos/exynos4_setup.h
+++ b/arch/arm/mach-exynos/exynos4_setup.h
diff --git a/arch/arm/cpu/armv7/exynos/exynos5_setup.h b/arch/arm/mach-exynos/exynos5_setup.h
index 9073f50..9073f50 100644
--- a/arch/arm/cpu/armv7/exynos/exynos5_setup.h
+++ b/arch/arm/mach-exynos/exynos5_setup.h
diff --git a/arch/arm/include/asm/arch-exynos/adc.h b/arch/arm/mach-exynos/include/mach/adc.h
index a0e26d7..a0e26d7 100644
--- a/arch/arm/include/asm/arch-exynos/adc.h
+++ b/arch/arm/mach-exynos/include/mach/adc.h
diff --git a/arch/arm/include/asm/arch-exynos/board.h b/arch/arm/mach-exynos/include/mach/board.h
index 1b1cd0d..1b1cd0d 100644
--- a/arch/arm/include/asm/arch-exynos/board.h
+++ b/arch/arm/mach-exynos/include/mach/board.h
diff --git a/arch/arm/include/asm/arch-exynos/clk.h b/arch/arm/mach-exynos/include/mach/clk.h
index d20b7d2..d20b7d2 100644
--- a/arch/arm/include/asm/arch-exynos/clk.h
+++ b/arch/arm/mach-exynos/include/mach/clk.h
diff --git a/arch/arm/include/asm/arch-exynos/clock.h b/arch/arm/mach-exynos/include/mach/clock.h
index 8259b92..8259b92 100644
--- a/arch/arm/include/asm/arch-exynos/clock.h
+++ b/arch/arm/mach-exynos/include/mach/clock.h
diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/mach-exynos/include/mach/cpu.h
index cb3d2cc..cb3d2cc 100644
--- a/arch/arm/include/asm/arch-exynos/cpu.h
+++ b/arch/arm/mach-exynos/include/mach/cpu.h
diff --git a/arch/arm/include/asm/arch-exynos/dmc.h b/arch/arm/mach-exynos/include/mach/dmc.h
index 4990a1a..4990a1a 100644
--- a/arch/arm/include/asm/arch-exynos/dmc.h
+++ b/arch/arm/mach-exynos/include/mach/dmc.h
diff --git a/arch/arm/include/asm/arch-exynos/dp.h b/arch/arm/mach-exynos/include/mach/dp.h
index 0ec58e9..0ec58e9 100644
--- a/arch/arm/include/asm/arch-exynos/dp.h
+++ b/arch/arm/mach-exynos/include/mach/dp.h
diff --git a/arch/arm/include/asm/arch-exynos/dp_info.h b/arch/arm/mach-exynos/include/mach/dp_info.h
index 17e8f56..17e8f56 100644
--- a/arch/arm/include/asm/arch-exynos/dp_info.h
+++ b/arch/arm/mach-exynos/include/mach/dp_info.h
diff --git a/arch/arm/include/asm/arch-exynos/dsim.h b/arch/arm/mach-exynos/include/mach/dsim.h
index 86ff4da..86ff4da 100644
--- a/arch/arm/include/asm/arch-exynos/dsim.h
+++ b/arch/arm/mach-exynos/include/mach/dsim.h
diff --git a/arch/arm/include/asm/arch-exynos/dwmmc.h b/arch/arm/mach-exynos/include/mach/dwmmc.h
index a7ca12c..a7ca12c 100644
--- a/arch/arm/include/asm/arch-exynos/dwmmc.h
+++ b/arch/arm/mach-exynos/include/mach/dwmmc.h
diff --git a/arch/arm/include/asm/arch-exynos/ehci.h b/arch/arm/mach-exynos/include/mach/ehci.h
index 3800fa9..3800fa9 100644
--- a/arch/arm/include/asm/arch-exynos/ehci.h
+++ b/arch/arm/mach-exynos/include/mach/ehci.h
diff --git a/arch/arm/include/asm/arch-exynos/fb.h b/arch/arm/mach-exynos/include/mach/fb.h
index f0d69b7..f0d69b7 100644
--- a/arch/arm/include/asm/arch-exynos/fb.h
+++ b/arch/arm/mach-exynos/include/mach/fb.h
diff --git a/arch/arm/include/asm/arch-exynos/gpio.h b/arch/arm/mach-exynos/include/mach/gpio.h
index 9699954..9699954 100644
--- a/arch/arm/include/asm/arch-exynos/gpio.h
+++ b/arch/arm/mach-exynos/include/mach/gpio.h
diff --git a/arch/arm/include/asm/arch-exynos/i2s-regs.h b/arch/arm/mach-exynos/include/mach/i2s-regs.h
index 4a4a7a0..4a4a7a0 100644
--- a/arch/arm/include/asm/arch-exynos/i2s-regs.h
+++ b/arch/arm/mach-exynos/include/mach/i2s-regs.h
diff --git a/arch/arm/include/asm/arch-exynos/mipi_dsim.h b/arch/arm/mach-exynos/include/mach/mipi_dsim.h
index 50e5c25..50e5c25 100644
--- a/arch/arm/include/asm/arch-exynos/mipi_dsim.h
+++ b/arch/arm/mach-exynos/include/mach/mipi_dsim.h
diff --git a/arch/arm/include/asm/arch-exynos/mmc.h b/arch/arm/mach-exynos/include/mach/mmc.h
index 0fb6461..0fb6461 100644
--- a/arch/arm/include/asm/arch-exynos/mmc.h
+++ b/arch/arm/mach-exynos/include/mach/mmc.h
diff --git a/arch/arm/include/asm/arch-exynos/periph.h b/arch/arm/mach-exynos/include/mach/periph.h
index fdc9e87..fdc9e87 100644
--- a/arch/arm/include/asm/arch-exynos/periph.h
+++ b/arch/arm/mach-exynos/include/mach/periph.h
diff --git a/arch/arm/include/asm/arch-exynos/pinmux.h b/arch/arm/mach-exynos/include/mach/pinmux.h
index d0ae757..d0ae757 100644
--- a/arch/arm/include/asm/arch-exynos/pinmux.h
+++ b/arch/arm/mach-exynos/include/mach/pinmux.h
diff --git a/arch/arm/include/asm/arch-exynos/power.h b/arch/arm/mach-exynos/include/mach/power.h
index 3f97b31..3f97b31 100644
--- a/arch/arm/include/asm/arch-exynos/power.h
+++ b/arch/arm/mach-exynos/include/mach/power.h
diff --git a/arch/arm/include/asm/arch-exynos/pwm.h b/arch/arm/mach-exynos/include/mach/pwm.h
index 43474c3..43474c3 100644
--- a/arch/arm/include/asm/arch-exynos/pwm.h
+++ b/arch/arm/mach-exynos/include/mach/pwm.h
diff --git a/arch/arm/include/asm/arch-exynos/pwm_backlight.h b/arch/arm/mach-exynos/include/mach/pwm_backlight.h
index 4f54fa7..4f54fa7 100644
--- a/arch/arm/include/asm/arch-exynos/pwm_backlight.h
+++ b/arch/arm/mach-exynos/include/mach/pwm_backlight.h
diff --git a/arch/arm/include/asm/arch-exynos/sound.h b/arch/arm/mach-exynos/include/mach/sound.h
index bff57c6..bff57c6 100644
--- a/arch/arm/include/asm/arch-exynos/sound.h
+++ b/arch/arm/mach-exynos/include/mach/sound.h
diff --git a/arch/arm/include/asm/arch-exynos/spi.h b/arch/arm/mach-exynos/include/mach/spi.h
index 0ba931b..0ba931b 100644
--- a/arch/arm/include/asm/arch-exynos/spi.h
+++ b/arch/arm/mach-exynos/include/mach/spi.h
diff --git a/arch/arm/include/asm/arch-exynos/spl.h b/arch/arm/mach-exynos/include/mach/spl.h
index cdcb2bc..0c480ac 100644
--- a/arch/arm/include/asm/arch-exynos/spl.h
+++ b/arch/arm/mach-exynos/include/mach/spl.h
@@ -7,7 +7,7 @@
 #ifndef __ASM_ARCH_EXYNOS_SPL_H__
 #define __ASM_ARCH_EXYNOS_SPL_H__
 
-#include <asm/arch-exynos/dmc.h>
+#include <asm/arch/dmc.h>
 #include <asm/arch/power.h>
 
 #ifndef __ASSEMBLY__
diff --git a/arch/arm/include/asm/arch-exynos/sromc.h b/arch/arm/mach-exynos/include/mach/sromc.h
index 7f58403..7f58403 100644
--- a/arch/arm/include/asm/arch-exynos/sromc.h
+++ b/arch/arm/mach-exynos/include/mach/sromc.h
diff --git a/arch/arm/include/asm/arch-exynos/sys_proto.h b/arch/arm/mach-exynos/include/mach/sys_proto.h
index 83ae42a..83ae42a 100644
--- a/arch/arm/include/asm/arch-exynos/sys_proto.h
+++ b/arch/arm/mach-exynos/include/mach/sys_proto.h
diff --git a/arch/arm/include/asm/arch-exynos/system.h b/arch/arm/mach-exynos/include/mach/system.h
index 3ffb296..3ffb296 100644
--- a/arch/arm/include/asm/arch-exynos/system.h
+++ b/arch/arm/mach-exynos/include/mach/system.h
diff --git a/arch/arm/include/asm/arch-exynos/tmu.h b/arch/arm/mach-exynos/include/mach/tmu.h
index cad3569..cad3569 100644
--- a/arch/arm/include/asm/arch-exynos/tmu.h
+++ b/arch/arm/mach-exynos/include/mach/tmu.h
diff --git a/arch/arm/include/asm/arch-exynos/tzpc.h b/arch/arm/mach-exynos/include/mach/tzpc.h
index 0a4be23..0a4be23 100644
--- a/arch/arm/include/asm/arch-exynos/tzpc.h
+++ b/arch/arm/mach-exynos/include/mach/tzpc.h
diff --git a/arch/arm/include/asm/arch-exynos/uart.h b/arch/arm/mach-exynos/include/mach/uart.h
index 33d6ba3..33d6ba3 100644
--- a/arch/arm/include/asm/arch-exynos/uart.h
+++ b/arch/arm/mach-exynos/include/mach/uart.h
diff --git a/arch/arm/include/asm/arch-exynos/watchdog.h b/arch/arm/mach-exynos/include/mach/watchdog.h
index eb64109..eb64109 100644
--- a/arch/arm/include/asm/arch-exynos/watchdog.h
+++ b/arch/arm/mach-exynos/include/mach/watchdog.h
diff --git a/arch/arm/include/asm/arch-exynos/xhci-exynos.h b/arch/arm/mach-exynos/include/mach/xhci-exynos.h
index 92b90a4..92b90a4 100644
--- a/arch/arm/include/asm/arch-exynos/xhci-exynos.h
+++ b/arch/arm/mach-exynos/include/mach/xhci-exynos.h
diff --git a/arch/arm/cpu/armv7/exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c
index 3774607..6c39cb2 100644
--- a/arch/arm/cpu/armv7/exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -175,7 +175,7 @@ int do_lowlevel_init(void)
 
 	arch_cpu_init();
 
-#ifndef CONFIG_SYS_L2CACHE_OFF
+#if !defined(CONFIG_SYS_L2CACHE_OFF) && defined(CONFIG_EXYNOS5420)
 	/*
 	 * Init L2 cache parameters here for use by boot and resume
 	 *
@@ -188,9 +188,7 @@ int do_lowlevel_init(void)
 	configure_l2_actlr();
 	dsb();
 	isb();
-#endif
 
-#ifdef CONFIG_EXYNOS5420
 	relocate_wait_code();
 
 	/* Reconfigure secondary cores */
diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/mach-exynos/pinmux.c
index e97cb37..e97cb37 100644
--- a/arch/arm/cpu/armv7/exynos/pinmux.c
+++ b/arch/arm/mach-exynos/pinmux.c
diff --git a/arch/arm/cpu/armv7/exynos/power.c b/arch/arm/mach-exynos/power.c
index 1b12051..1b12051 100644
--- a/arch/arm/cpu/armv7/exynos/power.c
+++ b/arch/arm/mach-exynos/power.c
diff --git a/arch/arm/cpu/armv7/exynos/sec_boot.S b/arch/arm/mach-exynos/sec_boot.S
index dfc3455..dfc3455 100644
--- a/arch/arm/cpu/armv7/exynos/sec_boot.S
+++ b/arch/arm/mach-exynos/sec_boot.S
diff --git a/arch/arm/cpu/armv7/exynos/soc.c b/arch/arm/mach-exynos/soc.c
index 0f116b1..0f116b1 100644
--- a/arch/arm/cpu/armv7/exynos/soc.c
+++ b/arch/arm/mach-exynos/soc.c
diff --git a/arch/arm/cpu/armv7/exynos/spl_boot.c b/arch/arm/mach-exynos/spl_boot.c
index c7f943e..c7f943e 100644
--- a/arch/arm/cpu/armv7/exynos/spl_boot.c
+++ b/arch/arm/mach-exynos/spl_boot.c
diff --git a/arch/arm/cpu/armv7/exynos/system.c b/arch/arm/mach-exynos/system.c
index ad12445..ad12445 100644
--- a/arch/arm/cpu/armv7/exynos/system.c
+++ b/arch/arm/mach-exynos/system.c
diff --git a/arch/arm/cpu/armv7/exynos/tzpc.c b/arch/arm/mach-exynos/tzpc.c
index 395077c..395077c 100644
--- a/arch/arm/cpu/armv7/exynos/tzpc.c
+++ b/arch/arm/mach-exynos/tzpc.c