mmc: move CONFIG_DWMMC to Kconfig, renaming to CONFIG_MMC_DW

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

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index ce4a00668647f59dd8902df85d8e3cb1ce93ed0c..242ed53548e9c1cb2c92234e31ca1bc1efb0ec3d 100644 (file)
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -21,11 +21,6 @@
 
 #define CONFIG_SUPPORT_RAW_INITRD
 
-/* MMU Definitions */
-#define CONFIG_SYS_CACHELINE_SIZE      64
-
-#define CONFIG_IDENT_STRING            "hikey"
-
 #define CONFIG_BOARD_EARLY_INIT_F
 
 /* Physical Memory Map */
@@ -33,7 +28,7 @@
 /* CONFIG_SYS_TEXT_BASE needs to align with where ATF loads bl33.bin */
 #define CONFIG_SYS_TEXT_BASE           0x35000000
 
-#define CONFIG_NR_DRAM_BANKS           1
+#define CONFIG_NR_DRAM_BANKS           6
 #define PHYS_SDRAM_1                   0x00000000
 
 /* 1008 MB (the last 16Mb are secured for TrustZone by ATF*/
@@ -61,14 +56,12 @@
 #define CONFIG_PL01X_SERIAL
 #define CONFIG_BAUDRATE                        115200
 
-#define CONFIG_CMD_USB
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_DWC2
 #define CONFIG_USB_DWC2_REG_ADDR 0xF72C0000
 /*#define CONFIG_DWC2_DFLT_SPEED_FULL*/
 #define CONFIG_DWC2_ENABLE_DYNAMIC_FIFO
 
-#define CONFIG_USB_STORAGE
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_SMSC95XX
 #define CONFIG_USB_ETHER_ASIX
@@ -79,17 +72,12 @@
 
 /* SD/MMC configuration */
 #define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_DWMMC
 #define CONFIG_HIKEY_DWMMC
 #define CONFIG_BOUNCE_BUFFER
-#define CONFIG_CMD_MMC
 
 #define CONFIG_FS_EXT4
 
 /* Command line configuration */
-#define CONFIG_MENU
-#define CONFIG_CMD_CACHE
 #define CONFIG_CMD_UNZIP
 #define CONFIG_CMD_ENV
 
@@ -124,8 +112,7 @@
                                "initrd_high=0xffffffffffffffff\0" \
                                BOOTENV
 
-
-/* Preserve enviroment on sd card */
+/* Preserve environment on sd card */
 #define CONFIG_COMMAND_HISTORY
 
 #define CONFIG_ENV_SIZE                        0x1000