configs: Re-sync with cmd/Kconfig

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

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index 796861e485fb05e17047dc4f7dc023f8ad84f7a5..114a6d1512ef911255fc52d1222ccf3728c5245a 100644 (file)
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -21,14 +21,11 @@
 
 #define CONFIG_SUPPORT_RAW_INITRD
 
-/* Cache Definitions */
-#define CONFIG_SYS_DCACHE_OFF
+/* MMU Definitions */
+#define CONFIG_SYS_CACHELINE_SIZE      64
 
 #define CONFIG_IDENT_STRING            "hikey"
 
-/* Flat Device Tree Definitions */
-#define CONFIG_OF_LIBFDT
-
 #define CONFIG_BOARD_EARLY_INIT_F
 
 /* Physical Memory Map */
@@ -64,7 +61,6 @@
 #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
@@ -86,13 +82,11 @@
 #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
 
@@ -121,13 +115,12 @@
 #define CONFIG_EXTRA_ENV_SETTINGS      \
                                "kernel_name=Image\0"   \
                                "kernel_addr_r=0x00080000\0" \
-                               "fdt_name=hi6220-hikey.dtb\0" \
+                               "fdtfile=hi6220-hikey.dtb\0" \
                                "fdt_addr_r=0x02000000\0" \
                                "fdt_high=0xffffffffffffffff\0" \
                                "initrd_high=0xffffffffffffffff\0" \
                                BOOTENV
 
-
 /* Preserve enviroment on sd card */
 #define CONFIG_COMMAND_HISTORY
 
@@ -143,7 +136,6 @@
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
                                        sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_HUSH_PARSER
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CMDLINE_EDITING