Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / B2.h

diff --git a/include/configs/B2.h b/include/configs/B2.h
index c77ea1f..e5439f3 100644 (file)
--- a/include/configs/B2.h
+++ b/include/configs/B2.h
@@ -38,6 +38,8 @@
 #define CONFIG_B2                      1       /* on an B2 Board      */
 #define CONFIG_ARM_THUMB       1       /* this is an ARM7TDMI */
 #undef  CONFIG_ARM7_REVD               /* disable ARM720 REV.D Workarounds */
+#define CONFIG_SYS_NO_CP15_CACHE
+#define CONFIG_ARCH_CPU_INIT
 
 #define CONFIG_S3C44B0_CLOCK_SPEED     75 /* we have a 75Mhz S3C44B0*/
 
@@ -65,8 +67,12 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_S3C44B0_SERIAL
 #define CONFIG_SERIAL1         1       /* we use Serial line 1 */
 
+#define CONFIG_S3C44B0_I2C
+#define CONFIG_RTC_S3C44B0
+
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
@@ -116,8 +122,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x0C400000      /* memtest works on     */
 #define CONFIG_SYS_MEMTEST_END         0x0C800000      /* 4 ... 8 MB in DRAM   */
 
-#undef  CONFIG_SYS_CLKS_IN_HZ          /* everything, incl board info, in Hz */
-
 #define        CONFIG_SYS_LOAD_ADDR            0x0c700000      /* default load address */
 
 #define        CONFIG_SYS_HZ                           1000            /* 1 kHz */