configs: Re-sync with cmd/Kconfig

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

diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index c767f90e885e70f4faf710541ef6c03ab4237dd7..1b5fc2ee82199e0ab40140f177c03bc1efdb6778 100644 (file)
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -19,12 +19,11 @@
 
 #define CONFIG_SUPPORT_RAW_INITRD
 
-/* Cache Definitions */
-#define CONFIG_SYS_DCACHE_OFF
-#define CONFIG_SYS_ICACHE_OFF
+/* MMU Definitions */
+#define CONFIG_SYS_CACHELINE_SIZE      64
 
 #define CONFIG_IDENT_STRING            " vexpress_aemv8a"
-#define CONFIG_BOOTP_VCI_STRING                "U-boot.armv8.vexpress_aemv8a"
+#define CONFIG_BOOTP_VCI_STRING                "U-Boot.armv8.vexpress_aemv8a"
 
 /* Link Definitions */
 #if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \
@@ -39,9 +38,6 @@
 
 #define CONFIG_SYS_BOOTM_LEN (64 << 20)      /* Increase max gunzip size */
 
-/* Flat Device Tree Definitions */
-#define CONFIG_OF_LIBFDT
-
 /* CS register bases for the original memory map. */
 #define V2M_PA_CS0                     0x00000000
 #define V2M_PA_CS1                     0x14000000
@@ -138,15 +134,10 @@
 /* Command line configuration */
 #define CONFIG_MENU
 /*#define CONFIG_MENU_SHOW*/
-#define CONFIG_CMD_CACHE
 #define CONFIG_CMD_BOOTI
 #define CONFIG_CMD_UNZIP
-#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PXE
 #define CONFIG_CMD_ENV
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_FAT
 #define CONFIG_DOS_PARTITION
 
 /* BOOTP options */
@@ -176,7 +167,6 @@
 #endif
 
 /* Enable memtest */
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_START       PHYS_SDRAM_1
 #define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE)
 
@@ -189,10 +179,10 @@
 #define CONFIG_EXTRA_ENV_SETTINGS      \
                                "kernel_name=norkern\0" \
                                "kernel_alt_name=Image\0"       \
-                               "kernel_addr=0x80000000\0" \
+                               "kernel_addr=0x80080000\0" \
                                "initrd_name=ramdisk.img\0"     \
                                "initrd_addr=0x84000000\0"      \
-                               "fdt_name=board.dtb\0" \
+                               "fdtfile=board.dtb\0" \
                                "fdt_alt_name=juno\0" \
                                "fdt_addr=0x83000000\0" \
                                "fdt_high=0xffffffffffffffff\0" \
@@ -214,10 +204,10 @@
                                "${kernel_name}; "\
                                "  afs load ${kernel_alt_name} ${kernel_addr};"\
                                "fi ; "\
-                               "afs load  ${fdt_name} ${fdt_addr} ; " \
+                               "afs load  ${fdtfile} ${fdt_addr} ; " \
                                "if test $? -eq 1; then "\
                                "  echo Loading ${fdt_alt_name} instead of "\
-                               "${fdt_name}; "\
+                               "${fdtfile}; "\
                                "  afs load ${fdt_alt_name} ${fdt_addr}; "\
                                "fi ; "\
                                "fdt addr ${fdt_addr}; fdt resize; " \
@@ -233,10 +223,10 @@
 #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
 #define CONFIG_EXTRA_ENV_SETTINGS      \
                                "kernel_name=Image\0"           \
-                               "kernel_addr=0x80000000\0"      \
+                               "kernel_addr=0x80080000\0"      \
                                "initrd_name=ramdisk.img\0"     \
                                "initrd_addr=0x88000000\0"      \
-                               "fdt_name=devtree.dtb\0"        \
+                               "fdtfile=devtree.dtb\0"         \
                                "fdt_addr=0x83000000\0"         \
                                "fdt_high=0xffffffffffffffff\0" \
                                "initrd_high=0xffffffffffffffff\0"
@@ -246,7 +236,7 @@
                                "loglevel=9"
 
 #define CONFIG_BOOTCOMMAND     "smhload ${kernel_name} ${kernel_addr}; " \
-                               "smhload ${fdt_name} ${fdt_addr}; " \
+                               "smhload ${fdtfile} ${fdt_addr}; " \
                                "smhload ${initrd_name} ${initrd_addr} "\
                                "initrd_end; " \
                                "fdt addr ${fdt_addr}; fdt resize; " \
@@ -280,7 +270,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
@@ -303,7 +292,6 @@
 #define CONFIG_ENV_SECT_SIZE           0x00040000
 #endif
 
-#define CONFIG_CMD_ARMFLASH
 #define CONFIG_SYS_FLASH_CFI           1
 #define CONFIG_FLASH_CFI_DRIVER                1
 #define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_32BIT
@@ -316,5 +304,4 @@
 #define CONFIG_ENV_SIZE                        CONFIG_ENV_SECT_SIZE
 #define CONFIG_ENV_IS_IN_FLASH         1
 
-
 #endif /* __VEXPRESS_AEMV8A_H */