Revert "vexpress64: fvp dram: add DRAM configuration"
Subsystems (2)
PATCH 1/1 Revert "vexpress64: fvp dram: add DRAM configuration"
This reverts commit fc04b923541d984b1544056fd3bfa8129d4e5aac where the FVP DRAM configuration was added.
--- arch/arm/Kconfig | 10 ------- board/armltd/vexpress64/Kconfig | 2 +- board/armltd/vexpress64/MAINTAINERS | 5 ---- configs/vexpress_aemv8a_dram_defconfig | 39 -------------------------- include/configs/vexpress_aemv8a.h | 17 ++--------- 5 files changed, 3 insertions(+), 70 deletions(-)
arch/arm/Kconfig +0 -10
@@ -1066,16 +1066,6 @@ config TARGET_VEXPRESS64_BASE_FVP select PL01X_SERIAL select SEMIHOSTING -config TARGET_VEXPRESS64_BASE_FVP_DRAM - bool "Support Versatile Express ARMv8a FVP BASE model booting from DRAM" - select ARM64 - select PL01X_SERIAL - help - This target is derived from TARGET_VEXPRESS64_BASE_FVP and over-rides - the default config to allow the user to load the images directly into - DRAM using model parameters rather than by using semi-hosting to load - the files from the host filesystem. - config TARGET_VEXPRESS64_JUNO bool "Support Versatile Express Juno Development Platform" select ARM64
board/armltd/vexpress64/Kconfig +1 -1
@@ -1,4 +1,4 @@ -if TARGET_VEXPRESS64_BASE_FVP || TARGET_VEXPRESS64_JUNO || TARGET_VEXPRESS64_BASE_FVP_DRAM +if TARGET_VEXPRESS64_BASE_FVP || TARGET_VEXPRESS64_JUNO config SYS_BOARD default "vexpress64"
board/armltd/vexpress64/MAINTAINERS +0 -5
@@ -10,11 +10,6 @@ M: Linus Walleij <[email protected]> S: Maintained F: configs/vexpress_aemv8a_semi_defconfig -VEXPRESS_AEMV8A_DRAM BOARD -M: Ryan Harkin <[email protected]> -S: Maintained -F: configs/vexpress_aemv8a_dram_defconfig - JUNO DEVELOPMENT PLATFORM BOARD M: Linus Walleij <[email protected]> S: Maintained
configs/vexpress_aemv8a_dram_defconfig deleted +0 -39
@@ -1,39 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM=y -CONFIG_SYS_TEXT_BASE=0x88000000 -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_IDENT_STRING=" vexpress_aemv8a" -CONFIG_DISTRO_DEFAULTS=y -CONFIG_BOOTDELAY=1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 androidboot.hardware=fvpbase root=/dev/vda2 rw rootwait loglevel=9" -# CONFIG_USE_BOOTCOMMAND is not set -# CONFIG_DISPLAY_CPUINFO is not set -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SYS_PROMPT="VExpress64# " -# CONFIG_CMD_CONSOLE is not set -# CONFIG_CMD_XIMG is not set -# CONFIG_CMD_EDITENV is not set -CONFIG_CMD_MEMTEST=y -CONFIG_CMD_ARMFLASH=y -# CONFIG_CMD_LOADS is not set -# CONFIG_CMD_ITEST is not set -# CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set -CONFIG_CMD_CACHE=y -# CONFIG_CMD_MISC is not set -CONFIG_CMD_UBI=y -# CONFIG_ISO_PARTITION is not set -# CONFIG_EFI_PARTITION is not set -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_DM=y -# CONFIG_MMC is not set -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_DEVICE=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y -CONFIG_SYS_FLASH_PROTECTION=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_DM_SERIAL=y -CONFIG_OF_LIBFDT=y
include/configs/vexpress_aemv8a.h +2 -15
@@ -16,8 +16,7 @@#define CONFIG_REMAKE_ELF /* Link Definitions */ -#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP ) || \ - defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM ) +#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP /* 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
@@ -83,8 +82,7 @@#define GICR_BASE (0x2f100000)#else -#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP ) || \ - defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM ) +#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP #define GICD_BASE (0x2f000000)#define GICC_BASE (0x2c000000)#elif CONFIG_TARGET_VEXPRESS64_JUNO
@@ -191,17 +189,6 @@ "booti $kernel_addr - $fdt_addr" -#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_BOOTCOMMAND "booti $kernel_addr $initrd_addr $fdt_addr" - -#endif /* Monitor Command Prompt */
Signature · 1 line
2.17.1
PATCH 1/1 Revert "vexpress64: fvp dram: add DRAM configuration"
Quoted 3 lines · Ryan Harkin
This reverts commit
fc04b923541d984b1544056fd3bfa8129d4e5aacwhere the FVP DRAM configuration was added.
Semi-hosting just works fine, so
--
Regards,
Sudeep
PATCH 1/1 Revert "vexpress64: fvp dram: add DRAM configuration"
In reply to Ryan HarkinQuoted 4 lines · Ryan Harkin
This reverts commit
fc04b923541d984b1544056fd3bfa8129d4e5aacwhere the FVP DRAM configuration was added.Signed-off-by Ryan Harkin <[email protected]>
OK if we don't need it let it go:
Yours,
Linus Walleij
PATCH 1/1 Revert "vexpress64: fvp dram: add DRAM configuration"
In reply to Ryan HarkinQuoted 5 lines · Ryan Harkin
This reverts commit
fc04b923541d984b1544056fd3bfa8129d4e5aacwhere the FVP DRAM configuration was added.Signed-off-by Ryan Harkin <[email protected]>Acked-by Sudeep Holla <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190902/63cb0f9e/attachment.sig>