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

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

diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 09bce6d..bfd09a0 100644 (file)
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -32,9 +32,9 @@
  * High Level Configuration Options
  * (easy to change)
  */
-#define CONFIG_ARMCORTEXA8     1       /* This is an ARM V7 CPU core */
+#define CONFIG_ARMV7           1       /* This is an ARM V7 CPU core */
 #define CONFIG_SAMSUNG         1       /* in a SAMSUNG core */
-#define CONFIG_S5PC1XX         1       /* which is in a S5PC1XX Family */
+#define CONFIG_S5P             1       /* which is in a S5P Family */
 #define CONFIG_S5PC100         1       /* which is in a S5PC100 */
 #define CONFIG_SMDKC100                1       /* working with SMDKC100 */
 
@@ -210,7 +210,7 @@
 #define CONFIG_SYS_MONITOR_LEN         (256 << 10)     /* 256 KiB */
 #define CONFIG_IDENT_STRING            " for SMDKC100"
 
-#if !defined(CONFIG_NAND_SPL) && (TEXT_BASE >= 0xc0000000)
+#if !defined(CONFIG_NAND_SPL) && (CONFIG_SYS_TEXT_BASE >= 0xc0000000)
 #define CONFIG_ENABLE_MMU
 #endif