configs: Migrate CONFIG_SYS_MAX_FLASH_BANKS to Kconfig

[platform/kernel/u-boot.git] / include / configs / vexpress_aemv8.h

diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
index 3447f02..9bf5774 100644 (file)
--- a/include/configs/vexpress_aemv8.h
+++ b/include/configs/vexpress_aemv8.h
@@ -4,8 +4,10 @@
  *   configurations.
  */
 
-#ifndef __VEXPRESS_AEMV8A_H
-#define __VEXPRESS_AEMV8A_H
+#ifndef __VEXPRESS_AEMV8_H
+#define __VEXPRESS_AEMV8_H
+
+#include <linux/stringify.h>
 
 #define CONFIG_REMAKE_ELF
 
@@ -20,13 +22,8 @@
 #define CONFIG_SYS_BOOTM_LEN (64 << 20)      /* Increase max gunzip size */
 
 /* CS register bases for the original memory map. */
-#ifdef CONFIG_TARGET_VEXPRESS64_BASER_FVP
-#define V2M_BASE                       0x00000000
-#define V2M_PA_BASE                    0x80000000
-#else
 #define V2M_BASE                       0x80000000
 #define V2M_PA_BASE                    0x00000000
-#endif
 
 #define V2M_PA_CS0                     (V2M_PA_BASE + 0x00000000)
 #define V2M_PA_CS1                     (V2M_PA_BASE + 0x14000000)
@@ -74,7 +71,7 @@
 #define V2M_SYS_CFGSTAT                        (V2M_SYSREGS + 0x0a8)
 
 /* Generic Timer Definitions */
-#define COUNTER_FREQUENCY              100000000       /* 100MHz */
+#define COUNTER_FREQUENCY              24000000        /* 24MHz */
 
 /* Generic Interrupt Controller Definitions */
 #ifdef CONFIG_GICV3
@@ -91,8 +88,8 @@
 #endif
 #endif /* !CONFIG_GICV3 */
 
-#ifndef CONFIG_TARGET_VEXPRESS64_JUNO
-/* The Vexpress64 simulators use SMSC91C111 */
+#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) && !defined(CONFIG_DM_ETH)
+/* The Vexpress64 BASE_FVP simulator uses SMSC91C111 */
 #define CONFIG_SMC91111                        1
 #define CONFIG_SMC91111_BASE           (V2M_PA_BASE + 0x01A000000)
 #endif
@@ -177,41 +174,22 @@
                                BOOTENV
 
 #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
+
+#define VEXPRESS_KERNEL_ADDR   0x80080000
+#define VEXPRESS_FDT_ADDR      0x8fc00000
+#define VEXPRESS_BOOT_ADDR     0x8fd00000
+#define VEXPRESS_RAMDISK_ADDR  0x8fe00000
+
 #define CONFIG_EXTRA_ENV_SETTINGS      \
                                "kernel_name=Image\0"           \
-                               "kernel_addr=0x80080000\0"      \
-                               "initrd_name=ramdisk.img\0"     \
-                               "initrd_addr=0x88000000\0"      \
-                               "fdtfile=devtree.dtb\0"         \
-                               "fdt_addr=0x83000000\0"         \
-                               "boot_name=boot.img\0"          \
-                               "boot_addr=0x8007f800\0"
-
-#ifndef CONFIG_BOOTCOMMAND
-#define CONFIG_BOOTCOMMAND     "if smhload ${boot_name} ${boot_addr}; then " \
-                               "  set bootargs; " \
-                               "  abootimg addr ${boot_addr}; " \
-                               "  abootimg get dtb --index=0 fdt_addr; " \
-                               "  bootm ${boot_addr} ${boot_addr} " \
-                               "  ${fdt_addr}; " \
-                               "else; " \
-                               "  set fdt_high 0xffffffffffffffff; " \
-                               "  set initrd_high 0xffffffffffffffff; " \
-                               "  smhload ${kernel_name} ${kernel_addr}; " \
-                               "  smhload ${fdtfile} ${fdt_addr}; " \
-                               "  smhload ${initrd_name} ${initrd_addr} "\
-                               "  initrd_end; " \
-                               "  fdt addr ${fdt_addr}; fdt resize; " \
-                               "  fdt chosen ${initrd_addr} ${initrd_end}; " \
-                               "  booti $kernel_addr - $fdt_addr; " \
-                               "fi"
-#endif
+                               "kernel_addr_r=" __stringify(VEXPRESS_KERNEL_ADDR) "\0" \
+                               "ramdisk_name=ramdisk.img\0"    \
+                               "ramdisk_addr_r=" __stringify(VEXPRESS_RAMDISK_ADDR) "\0" \
+                               "fdtfile=devtree.dtb\0" \
+                               "fdt_addr_r=" __stringify(VEXPRESS_FDT_ADDR) "\0"       \
+                               "boot_name=boot.img\0" \
+                               "boot_addr_r=" __stringify(VEXPRESS_BOOT_ADDR) "\0"
 
-#elif CONFIG_TARGET_VEXPRESS64_BASER_FVP
-#define CONFIG_EXTRA_ENV_SETTINGS      \
-                               "kernel_addr=0x00800000\0"      \
-                               "fdt_addr=0x03000000\0"         \
-                               "boot_addr=0x0007f800\0"
 #endif
 
 /* Monitor Command Prompt */
@@ -232,7 +210,6 @@
 #endif
 
 #define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_32BIT
-#define CONFIG_SYS_MAX_FLASH_BANKS     1
 
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_OHCI_NEW
@@ -242,8 +219,4 @@
 #define CONFIG_SYS_FLASH_EMPTY_INFO    /* flinfo indicates empty blocks */
 #define FLASH_MAX_SECTOR_SIZE          0x00040000
 
-#ifdef CONFIG_TARGET_VEXPRESS64_BASER_FVP
-#define CONFIG_ARMV8_SWITCH_TO_EL1
-#endif
-
-#endif /* __VEXPRESS_AEMV8A_H */
+#endif /* __VEXPRESS_AEMV8_H */