diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2015-05-07 17:32:31 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2015-05-19 21:34:24 +0100 |
| commit | e7304a10325ea3e05b609f2a3b3896b9c666f1bf (patch) | |
| tree | 752faf79ce1fdf5fa09b2cd609b0b204744d7199 | |
| parent | bab479638664629e5d20ba2b775819f1975c2bfa (diff) | |
vexpress64: fvp: add DRAM configurationjuno
SOmetimes it's preferential to boot the model by loading the files
directly into DRAM via model parameters, rather than using SemiHosting.
An example of model parmaters that are used to pre-load the files into
DRAM:
--data cluster0.cpu0=Image@0x80080000 \
--data cluster0.cpu0=fvp-base-gicv2-psci.dtb@0x83000000 \
--data cluster0.cpu0=uInitrd@0x84000000
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
| -rw-r--r-- | arch/arm/Kconfig | 4 | ||||
| -rw-r--r-- | board/armltd/vexpress64/Kconfig | 13 | ||||
| -rw-r--r-- | configs/vexpress_aemv8a_dram_defconfig | 4 | ||||
| -rw-r--r-- | include/configs/vexpress_aemv8a.h | 22 |
4 files changed, 41 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 00be305c39..8247ae7b1c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -681,6 +681,10 @@ config TARGET_VEXPRESS64_BASE_FVP select ARM64 select SEMIHOSTING +config TARGET_VEXPRESS64_BASE_FVP_DRAM + bool "Support Versatile Express ARMv8a FVP BASE model booting from DRAM" + select ARM64 + config TARGET_VEXPRESS64_JUNO bool "Support Versatile Express Juno Development Platform" select ARM64 diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig index f5693aebac..bf6094c03f 100644 --- a/board/armltd/vexpress64/Kconfig +++ b/board/armltd/vexpress64/Kconfig @@ -11,6 +11,19 @@ config SYS_CONFIG_NAME endif +if TARGET_VEXPRESS64_BASE_FVP_DRAM + +config SYS_BOARD + default "vexpress64" + +config SYS_VENDOR + default "armltd" + +config SYS_CONFIG_NAME + default "vexpress_aemv8a" + +endif + if TARGET_VEXPRESS64_JUNO config SYS_BOARD diff --git a/configs/vexpress_aemv8a_dram_defconfig b/configs/vexpress_aemv8a_dram_defconfig new file mode 100644 index 0000000000..7aace2c907 --- /dev/null +++ b/configs/vexpress_aemv8a_dram_defconfig @@ -0,0 +1,4 @@ +# Semihosted FVP fast model +CONFIG_ARM=y +CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM=y +CONFIG_DEFAULT_DEVICE_TREE="vexpress64" diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 52b8cd40ea..5e57227453 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -31,7 +31,7 @@ #define CONFIG_BOOTP_VCI_STRING "U-boot.armv8.vexpress_aemv8a" /* Link Definitions */ -#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP +#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM) /* ATF loads u-boot here for BASE_FVP model */ #define CONFIG_SYS_TEXT_BASE 0x88000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000) @@ -104,7 +104,7 @@ #define GICR_BASE (0x2f100000) #else -#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP +#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM) #define GICD_BASE (0x2f000000) #define GICC_BASE (0x2c000000) #elif CONFIG_TARGET_VEXPRESS64_JUNO @@ -252,6 +252,24 @@ #define CONFIG_BOOTDELAY 1 +#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM +#define CONFIG_EXTRA_ENV_SETTINGS \ + "kernel_addr=0x80080000\0" \ + "initrd_addr=0x84000000\0" \ + "fdt_addr=0x83000000\0" \ + "fdt_high=0xffffffffffffffff\0" \ + "initrd_high=0xffffffffffffffff\0" + +#define CONFIG_BOOTARGS "console=ttyAMA0 earlyprintk=pl011,"\ + "0x1c090000 debug user_debug=31 "\ + "androidboot.hardware=fvpbase "\ + "loglevel=9 "\ + "root=/dev/vda2" + +#define CONFIG_BOOTCOMMAND "booti $kernel_addr $initrd_addr $fdt_addr" + +#define CONFIG_BOOTDELAY 1 + #else #error "Unknown board variant" #endif |