vexpress64: Refactor header file to make it easier to add new FVPs

Rename from vexpress_aemv8a.h -> vepxress_aemv8.h as new FVPs may not be
v8-A. No change in behavior.

This is towards future work to enable support for the FVP_BaseR.

Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig
index 1d13f542e677ac9b59ec311d706a70a9c4cb0ffb..4aab3f092ecb24c446184f2a5b3239f0e887d9e8 100644 (file)
--- a/board/armltd/vexpress64/Kconfig
+++ b/board/armltd/vexpress64/Kconfig
@@ -7,7 +7,7 @@ config SYS_VENDOR
        default "armltd"
 
 config SYS_CONFIG_NAME
-       default "vexpress_aemv8a"
+       default "vexpress_aemv8"
 
 config JUNO_DTB_PART
        string "NOR flash partition holding DTB"

diff --git a/doc/README.semihosting b/doc/README.semihosting
index c019999bedd8f0f394b98710d8fa35d7465abb0f..f382d0131eb341a40d6af341ce78cb470eb25c43 100644 (file)
--- a/doc/README.semihosting
+++ b/doc/README.semihosting
@@ -25,7 +25,7 @@ or turning on CONFIG_BASE_FVP for the more full featured model.
 Rather than create a new armv8 board similar to armltd/vexpress64, add
 semihosting calls to the existing one, enabled with CONFIG_SEMIHOSTING
 and CONFIG_BASE_FVP both set. Also reuse the existing board config file
-vexpress_aemv8a.h but differentiate the two models by the presence or
+vexpress_aemv8.h but differentiate the two models by the presence or
 absence of CONFIG_BASE_FVP. This change is tested and works on both the
 Foundation and Base fastmodel simulators.
 

diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8.h
similarity index 87%
rename from include/configs/vexpress_aemv8a.h
rename to include/configs/vexpress_aemv8.h
index 44c746f6f2b461a45e509c0995346405a7ede8e9..52fc15d5fc85147cdc5fdd6c6589372bd8f60406 100644 (file)
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8.h
@@ -4,36 +4,37 @@
  *   configurations.
  */
 
-#ifndef __VEXPRESS_AEMV8A_H
-#define __VEXPRESS_AEMV8A_H
+#ifndef __VEXPRESS_AEMV8_H
+#define __VEXPRESS_AEMV8_H
 
 #define CONFIG_REMAKE_ELF
 
 /* Link Definitions */
-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
+#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
+#define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
+#else
 /* ATF loads u-boot here for BASE_FVP model */
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_SDRAM_BASE + 0x03f00000)
-#elif CONFIG_TARGET_VEXPRESS64_JUNO
-#define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
 #endif
 
 #define CONFIG_SYS_BOOTM_LEN (64 << 20)      /* Increase max gunzip size */
 
 /* CS register bases for the original memory map. */
-#define V2M_PA_CS0                     0x00000000
-#define V2M_PA_CS1                     0x14000000
-#define V2M_PA_CS2                     0x18000000
-#define V2M_PA_CS3                     0x1c000000
-#define V2M_PA_CS4                     0x0c000000
-#define V2M_PA_CS5                     0x10000000
+#define V2M_BASE                       0x80000000
+#define V2M_PA_BASE                    0x00000000
+
+#define V2M_PA_CS0                     (V2M_PA_BASE + 0x00000000)
+#define V2M_PA_CS1                     (V2M_PA_BASE + 0x14000000)
+#define V2M_PA_CS2                     (V2M_PA_BASE + 0x18000000)
+#define V2M_PA_CS3                     (V2M_PA_BASE + 0x1c000000)
+#define V2M_PA_CS4                     (V2M_PA_BASE + 0x0c000000)
+#define V2M_PA_CS5                     (V2M_PA_BASE + 0x10000000)
 
 #define V2M_PERIPH_OFFSET(x)           (x << 16)
 #define V2M_SYSREGS                    (V2M_PA_CS3 + V2M_PERIPH_OFFSET(1))
 #define V2M_SYSCTL                     (V2M_PA_CS3 + V2M_PERIPH_OFFSET(2))
 #define V2M_SERIAL_BUS_PCI             (V2M_PA_CS3 + V2M_PERIPH_OFFSET(3))
 
-#define V2M_BASE                       0x80000000
-
 /* Common peripherals relative to CS7. */
 #define V2M_AACI                       (V2M_PA_CS3 + V2M_PERIPH_OFFSET(4))
 #define V2M_MMCI                       (V2M_PA_CS3 + V2M_PERIPH_OFFSET(5))
@@ -72,23 +73,23 @@
 
 /* Generic Interrupt Controller Definitions */
 #ifdef CONFIG_GICV3
-#define GICD_BASE                      (0x2f000000)
-#define GICR_BASE                      (0x2f100000)
+#define GICD_BASE                      (V2M_PA_BASE + 0x2f000000)
+#define GICR_BASE                      (V2M_PA_BASE + 0x2f100000)
 #else
 
-#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP
-#define GICD_BASE                      (0x2f000000)
-#define GICC_BASE                      (0x2c000000)
-#elif CONFIG_TARGET_VEXPRESS64_JUNO
+#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
 #define GICD_BASE                      (0x2C010000)
 #define GICC_BASE                      (0x2C02f000)
+#else
+#define GICD_BASE                      (V2M_PA_BASE + 0x2f000000)
+#define GICC_BASE                      (V2M_PA_BASE + 0x2c000000)
 #endif
 #endif /* !CONFIG_GICV3 */
 
 #ifndef CONFIG_TARGET_VEXPRESS64_JUNO
 /* The Vexpress64 simulators use SMSC91C111 */
 #define CONFIG_SMC91111                        1
-#define CONFIG_SMC91111_BASE           (0x01A000000)
+#define CONFIG_SMC91111_BASE           (V2M_PA_BASE + 0x01A000000)
 #endif
 
 /* PL011 Serial Configuration */
@@ -113,7 +114,7 @@
 #ifdef CONFIG_TARGET_VEXPRESS64_JUNO
 #define PHYS_SDRAM_2                   (0x880000000)
 #define PHYS_SDRAM_2_SIZE              0x180000000
-#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP && CONFIG_NR_DRAM_BANKS == 2
+#elif CONFIG_NR_DRAM_BANKS == 2
 #define PHYS_SDRAM_2                   (0x880000000)
 #define PHYS_SDRAM_2_SIZE              0x80000000
 #endif
@@ -193,7 +194,7 @@
 /* Store environment at top of flash in the same location as blank.img */
 /* in the Juno firmware. */
 #else
-#define CONFIG_SYS_FLASH_BASE          0x0C000000
+#define CONFIG_SYS_FLASH_BASE          (V2M_PA_BASE + 0x0C000000)
 /* 256 x 256KiB sectors */
 #define CONFIG_SYS_MAX_FLASH_SECT      256
 /* Store environment at top of flash */
@@ -210,4 +211,4 @@
 #define CONFIG_SYS_FLASH_EMPTY_INFO    /* flinfo indicates empty blocks */
 #define FLASH_MAX_SECTOR_SIZE          0x00040000
 
-#endif /* __VEXPRESS_AEMV8A_H */
+#endif /* __VEXPRESS_AEMV8_H */