Convert CONFIG_CMD_SH_ZIMAGEBOOT to Kconfig

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

diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h
index 21bfe72..4feaa05 100644 (file)
--- a/include/configs/r2dplus.h
+++ b/include/configs/r2dplus.h
@@ -1,26 +1,15 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#undef DEBUG
-
 #define CONFIG_CPU_SH7751      1
 #define CONFIG_CPU_SH_TYPE_R   1
 #define CONFIG_R2DPLUS         1
 #define __LITTLE_ENDIAN__      1
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_PCI
-#define CONFIG_CMD_IDE
-#define CONFIG_DOS_PARTITION
-#define CONFIG_CMD_SH_ZIMAGEBOOT
+#define CONFIG_DISPLAY_BOARDINFO
 
 /* SCIF */
-#define CONFIG_SCIF_CONSOLE    1
-#define CONFIG_BAUDRATE                115200
 #define CONFIG_CONS_SCIF1      1
-#define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_BOOTARGS                "console=ttySC0,115200"
 #define CONFIG_ENV_OVERWRITE   1
@@ -29,7 +18,7 @@
 #define CONFIG_SYS_SDRAM_BASE          0x8C000000
 #define CONFIG_SYS_SDRAM_SIZE          0x04000000
 
-#define CONFIG_SYS_TEXT_BASE           0x8FFC0000
+#define CONFIG_SYS_TEXT_BASE           0x8FE00000
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_PBSIZE              256
@@ -57,7 +46,6 @@
 #define CONFIG_SYS_MAX_FLASH_SECT  256
 #define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE }
 
-#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_SECT_SIZE   0x40000
 #define CONFIG_ENV_SIZE        (CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_ADDR        (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)