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

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

diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h
index a49e839463b8c9e2751d3cd3a9f83202fde831fb..b175a6f69d967d3037ae08325c7297e32a62637d 100644 (file)
--- a/include/configs/sh7785lcr.h
+++ b/include/configs/sh7785lcr.h
@@ -9,29 +9,17 @@
 #ifndef __SH7785LCR_H
 #define __SH7785LCR_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7785      1
-#define CONFIG_SH7785LCR       1
-
-#define CONFIG_CMD_PCI
-#define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_SH_ZIMAGEBOOT
-
-#define CONFIG_DOS_PARTITION
-#define CONFIG_MAC_PARTITION
-
-#define CONFIG_BAUDRATE                115200
-#define CONFIG_BOOTARGS                "console=ttySC1,115200 root=/dev/nfs ip=dhcp"
 
 #define CONFIG_EXTRA_ENV_SETTINGS                                      \
        "bootdevice=0:1\0"                                              \
        "usbload=usb reset;usbboot;usb stop;bootm\0"
 
+#define CONFIG_DISPLAY_BOARDINFO
 #undef CONFIG_SHOW_BOOT_PROGRESS
 
 /* MEMORY */
 #if defined(CONFIG_SH_32BIT)
-#define CONFIG_SYS_TEXT_BASE           0x8FF80000
 /* 0x40000000 - 0x47FFFFFF does not use */
 #define CONFIG_SH_SDRAM_OFFSET         (0x8000000)
 #define SH7785LCR_SDRAM_PHYS_BASE      (0x40000000 + CONFIG_SH_SDRAM_OFFSET)
@@ -41,7 +29,6 @@
 #define SH7785LCR_FLASH_BANK_SIZE      (64 * 1024 * 1024)
 #define SH7785LCR_USB_BASE             (0xa6000000)
 #else
-#define CONFIG_SYS_TEXT_BASE           0x0FF80000
 #define SH7785LCR_SDRAM_BASE           (0x08000000)
 #define SH7785LCR_SDRAM_SIZE           (128 * 1024 * 1024)
 #define SH7785LCR_FLASH_BASE_1         (0xa0000000)
@@ -49,15 +36,10 @@
 #define SH7785LCR_USB_BASE             (0xb4000000)
 #endif
 
-#define CONFIG_SYS_LONGHELP
-#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    1
 #define CONFIG_CONS_SCIF1      1
 #define CONFIG_SCIF_EXT_CLOCK  1
 
@@ -136,7 +118,6 @@
 #define CONFIG_PCI_SYS_SIZE    CONFIG_SYS_SDRAM_SIZE
 
 /* ENV setting */
-#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OVERWRITE   1
 #define CONFIG_ENV_SECT_SIZE   (256 * 1024)
 #define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)