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

[oweals/u-boot.git] / include / configs / hikey.h

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 39faf805806ee8be59eac2ce4e88340a1f734eb8..2b4fec4bd4239a4d12e7497d06fa93c8b50bfb30 100644 (file)
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -21,8 +21,6 @@
 
 #define CONFIG_SUPPORT_RAW_INITRD
 
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* Physical Memory Map */
 
 /* CONFIG_SYS_TEXT_BASE needs to align with where ATF loads bl33.bin */
@@ -54,7 +52,6 @@
 
 /* Serial port PL010/PL011 through the device model */
 #define CONFIG_PL01X_SERIAL
-#define CONFIG_BAUDRATE                        115200
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_DWC2
@@ -71,18 +68,11 @@
 #define CONFIG_HIKEY_GPIO
 
 /* SD/MMC configuration */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_DWMMC
-#define CONFIG_HIKEY_DWMMC
 #define CONFIG_BOUNCE_BUFFER
 
 #define CONFIG_FS_EXT4
 
 /* Command line configuration */
-#define CONFIG_MENU
-#define CONFIG_CMD_UNZIP
-#define CONFIG_CMD_ENV
 
 #define CONFIG_MTD_PARTITIONS
 
@@ -116,14 +106,11 @@
                                BOOTENV
 
 /* Preserve environment on sd card */
-#define CONFIG_COMMAND_HISTORY
-
 #define CONFIG_ENV_SIZE                        0x1000
 #define CONFIG_ENV_IS_IN_FAT
 #define FAT_ENV_INTERFACE               "mmc"
 #define FAT_ENV_DEVICE_AND_PART         "1:1"
 #define FAT_ENV_FILE                    "uboot.env"
-#define CONFIG_FAT_WRITE
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 
 /* Monitor Command Prompt */
@@ -135,6 +122,4 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_MAXARGS             64      /* max command args */
 
-#define CONFIG_SYS_NO_FLASH
-
 #endif /* __HIKEY_H */