Merge branch 'master' of git://git.denx.de/u-boot

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

diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index e84cfb5d4363e963a63787e06ae370bcd1473816..b903ba53d1dc74390384a12c0b251a9832a796d7 100644 (file)
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -11,7 +11,6 @@
 #define __CONFIG_H
 
 #define CONFIG_ENV_VERSION     10
-#define CONFIG_IDENT_STRING    " apf27 patch 3.10"
 #define CONFIG_BOARD_NAME apf27
 
 /*
@@ -25,12 +24,6 @@
  */
 #define CONFIG_SYS_NO_FLASH
 
-/*
- * Board display option
- */
-#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_DISPLAY_CPUINFO
-
 /*
  * SPL
  */
@@ -38,10 +31,8 @@
 #define CONFIG_SPL_LDSCRIPT    "arch/$(ARCH)/cpu/u-boot-spl.lds"
 #define CONFIG_SPL_MAX_SIZE    2048
 #define CONFIG_SPL_TEXT_BASE    0xA0000000
-#define CONFIG_SPL_SERIAL_SUPPORT
 
 /* NAND boot config */
-#define CONFIG_SPL_NAND_SUPPORT
 #define CONFIG_SYS_NAND_U_BOOT_START    CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_NAND_U_BOOT_OFFS    0x800
 #define CONFIG_SYS_NAND_U_BOOT_DST     CONFIG_SYS_TEXT_BASE
@@ -72,7 +63,6 @@
 #define CONFIG_CMD_NAND                /* NAND support                 */
 #define CONFIG_CMD_NAND_LOCK_UNLOCK
 #define CONFIG_CMD_NAND_TRIMFFS
-#define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS
 
 /*