Merge git://git.denx.de/u-boot-mmc

[people/ms/u-boot.git] / include / configs / kzm9g.h

diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h
index 93c2976b217c09ea3e5ff2017c209e1c8196fdd8..0d8de370dd969e7b65eb20882561946c9ff5f116 100644 (file)
--- a/include/configs/kzm9g.h
+++ b/include/configs/kzm9g.h
@@ -12,30 +12,17 @@
 
 #define CONFIG_SH73A0
 #define CONFIG_KZM_A9_GT
-#define CONFIG_RMOBILE_BOARD_STRING    "KMC KZM-A9-GT"
+#define CONFIG_ARCH_RMOBILE_BOARD_STRING       "KMC KZM-A9-GT"
 #define CONFIG_MACH_TYPE MACH_TYPE_KZM9G
-#define CONFIG_SYS_GENERIC_BOARD
 
 #include <asm/arch/rmobile.h>
 
 #define CONFIG_ARCH_CPU_INIT
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_OF_LIBFDT
 
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG
-#define CONFIG_DOS_PARTITION
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_BOOTZ
 
-#define CONFIG_BAUDRATE                115200
-#define CONFIG_BOOTARGS                "root=/dev/null console=ttySC4,115200"
-#define CONFIG_BOOTDELAY 3
-
-#define CONFIG_VERSION_VARIABLE
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
 /* MEMORY */
@@ -52,20 +39,11 @@
 #define CONFIG_SYS_MAX_FLASH_SECT      (512)
 
 /* prompt */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT              "KZM-A9-GT# "
-#define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_PBSIZE              256
-#define CONFIG_SYS_MAXARGS             16
-#define CONFIG_SYS_BARGSIZE            512
 #define CONFIG_SYS_BAUDRATE_TABLE      { 115200 }
 
 /* SCIF */
-#define CONFIG_SCIF_CONSOLE
 #define CONFIG_CONS_SCIF4
-#undef  CONFIG_SYS_CONSOLE_INFO_QUIET
-#undef  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#undef  CONFIG_SYS_CONSOLE_ENV_OVERWRITE
 
 #define CONFIG_SYS_MEMTEST_START       (KZM_SDRAM_BASE)
 #define CONFIG_SYS_MEMTEST_END \
@@ -89,7 +67,6 @@
 #define CONFIG_SYS_MALLOC_LEN  (CONFIG_ENV_SIZE + 128 * 1024)
 #define CONFIG_SYS_BOOTMAPSZ   (8 * 1024 * 1024)
 
-#define CONFIG_SYS_TEXT_BASE           0x00000000
 #define CONFIG_STANDALONE_LOAD_ADDR    0x41000000
 
 /* FLASH */
@@ -113,7 +90,6 @@
 
 #undef  CONFIG_SYS_FLASH_PROTECTION
 #undef  CONFIG_SYS_DIRECT_FLASH_TFTP
-#define CONFIG_ENV_IS_IN_FLASH
 
 /* GPIO / PFC */
 #define CONFIG_SH_GPIO_PFC
@@ -125,16 +101,9 @@
 #define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ
 #define TMU_CLK_DIVIDER                (4)     /* 4 (default), 16, 64, 256 or 1024 */
 
-/* Ether */
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-#define CONFIG_SMC911X
-#define CONFIG_SMC911X_BASE    (0x10000000)
-#define CONFIG_SMC911X_32_BIT
 #define CONFIG_NFS_TIMEOUT 10000UL
 
 /* I2C */
-#define CONFIG_CMD_I2C
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_SH
 #define CONFIG_SYS_I2C_SH_NUM_CONTROLLERS 5