Merge branch 'u-boot-marvell/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / arndale.h

diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 9584d82af731b15ac0f6f0ed7539519964f318bc..43077cf851fd2d59ca77d971d497de257b31d3c8 100644 (file)
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -22,10 +22,6 @@
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
-/* Enable fdt support for Exynos5250 */
-#define CONFIG_ARCH_DEVICE_TREE                exynos5250
-#define CONFIG_OF_CONTROL
-#define CONFIG_OF_SEPARATE
 
 /* Allow tracing to be enabled */
 #define CONFIG_TRACE
@@ -123,7 +119,6 @@
 
 /* MMC SPL */
 #define CONFIG_EXYNOS_SPL
-#define CONFIG_SPL
 #define COPY_BL2_FNPTR_ADDR    0x02020030
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT
@@ -226,10 +221,11 @@
 
 /* PMIC */
 #define CONFIG_PMIC
-#define CONFIG_PMIC_I2C
-#define CONFIG_PMIC_MAX77686
+#define CONFIG_POWER_I2C
+#define CONFIG_POWER_MAX77686
 
-#define CONFIG_DEFAULT_DEVICE_TREE     exynos5250-arndale
+
+#define CONFIG_PREBOOT
 
 /* Ethernet Controllor Driver */
 #ifdef CONFIG_CMD_NET
@@ -251,4 +247,12 @@
 /* Enable Time Command */
 #define CONFIG_CMD_TIME
 
+#define CONFIG_S5P_PA_SYSRAM   0x02020000
+#define CONFIG_SMP_PEN_ADDR    CONFIG_S5P_PA_SYSRAM
+
+/* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
+#define CONFIG_ARM_GIC_BASE_ADDRESS    0x10480000
+
+#define CONFIG_ARMV7_VIRT
+
 #endif /* __CONFIG_H */