Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

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

diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h
index 7f8edd4..8db1ac4 100644 (file)
--- a/include/configs/sh7752evb.h
+++ b/include/configs/sh7752evb.h
@@ -14,14 +14,6 @@
 
 #define CONFIG_SYS_TEXT_BASE   0x5ff80000
 
-#define CONFIG_CMD_DFL
-#define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_MD5SUM
-#define CONFIG_MD5
-
-#define CONFIG_BAUDRATE                115200
-#define CONFIG_BOOTARGS                "console=ttySC2,115200 root=/dev/nfs ip=dhcp"
-
 #define CONFIG_DISPLAY_BOARDINFO
 #undef CONFIG_SHOW_BOOT_PROGRESS
 #define CONFIG_CMDLINE_EDITING
@@ -39,7 +31,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      { 115200 }
 
 /* SCIF */
-#define CONFIG_SCIF_CONSOLE    1
 #define CONFIG_CONS_SCIF2      1
 
 #define CONFIG_SYS_MEMTEST_START       (SH7752EVB_SDRAM_BASE)
@@ -59,16 +50,12 @@
 #define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)
 #define CONFIG_SYS_BOOTMAPSZ           (8 * 1024 * 1024)
 
-/* FLASH */
-#define CONFIG_SYS_NO_FLASH
-
 /* Ether */
 #define CONFIG_SH_ETHER                        1
 #define CONFIG_SH_ETHER_USE_PORT       0
 #define CONFIG_SH_ETHER_PHY_ADDR       18
 #define CONFIG_SH_ETHER_CACHE_WRITEBACK        1
 #define CONFIG_SH_ETHER_USE_GETHER     1
-#define CONFIG_PHYLIB
 #define CONFIG_BITBANGMII
 #define CONFIG_BITBANGMII_MULTI
 #define CONFIG_SH_ETHER_PHY_MODE PHY_INTERFACE_MODE_RGMII
@@ -85,14 +72,12 @@
 #define CONFIG_SH_SPI_BASE             0xfe002000
 
 /* MMCIF */
-#define CONFIG_GENERIC_MMC             1
 #define CONFIG_SH_MMCIF                        1
 #define CONFIG_SH_MMCIF_ADDR           0xffcb0000
 #define CONFIG_SH_MMCIF_CLK            48000000
 
 /* ENV setting */
 #define CONFIG_ENV_IS_EMBEDDED
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SECT_SIZE   (64 * 1024)
 #define CONFIG_ENV_ADDR                (0x00080000)
 #define CONFIG_ENV_OFFSET      (CONFIG_ENV_ADDR)