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

[u-boot] / include / configs / ap325rxa.h

diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h
index 9a4d2c9923c5bb5b32f1b4003cd7a2ccfd063693..9c234fbc085b07ec02a90084069c6eb4fedefc64 100644 (file)
--- a/include/configs/ap325rxa.h
+++ b/include/configs/ap325rxa.h
@@ -10,17 +10,10 @@
 #ifndef __AP325RXA_H
 #define __AP325RXA_H
 
-#undef DEBUG
 #define CONFIG_CPU_SH7723      1
 #define CONFIG_AP325RXA        1
 
-#define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_IDE
-#define CONFIG_DOS_PARTITION
-
-#define CONFIG_BAUDRATE                38400
-#define CONFIG_BOOTARGS                "console=ttySC2,38400"
-
+#define CONFIG_DISPLAY_BOARDINFO
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
 /* SMC9118 */
@@ -50,7 +43,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      { 38400 }
 
 /* SCIF */
-#define CONFIG_SCIF_CONSOLE 1
 #define CONFIG_SCIF_A          1 /* SH7723 has SCIF and SCIFA */
 #define CONFIG_CONS_SCIF5      1
 
@@ -127,7 +119,6 @@
 #undef  CONFIG_SYS_DIRECT_FLASH_TFTP
 
 /* ENV setting */
-#define CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_ENV_OVERWRITE   1
 #define CONFIG_ENV_SECT_SIZE   (128 * 1024)
 #define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)