From 2c3382d4d6c0eddbd3844ecd16e3eca997e9f5c3 Mon Sep 17 00:00:00 2001 From: Peter Hoyes Date: Thu, 24 Feb 2022 11:22:41 +0000 Subject: [PATCH] arm-bsp/kernel: Use 4 Gb of RAM in fvp-baser-aemv8r64 The FVP default configuration has bp.dram_size=4, which is sufficient for development and testing purposes, so remove the FVP_CONFIG override and set to 4 Gb in the device tree. Issue-Id: SCM-3871 Signed-off-by: Peter Hoyes Change-Id: I4a96062c9e94d36f5459f33c86aab4d4885bab43 Signed-off-by: Jon Mason --- meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf | 1 - .../linux/files/fvp-baser-aemv8r64/fvp-baser-aemv8r64.dts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf index c190e4c3..cfbc73db 100644 --- a/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf +++ b/meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf @@ -39,7 +39,6 @@ FVP_CONSOLE ?= "terminal_0" FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.wic" FVP_CONFIG[bp.dram_metadata.init_value] ?= "0" FVP_CONFIG[bp.dram_metadata.is_enabled] ?= "true" -FVP_CONFIG[bp.dram_size] ?= "8" FVP_CONFIG[bp.exclusive_monitor.monitor_access_level] ?= "1" FVP_CONFIG[bp.pl011_uart0.unbuffered_output] ?= "1" FVP_CONFIG[bp.pl011_uart0.untimed_fifos] ?= "true" diff --git a/meta-arm-bsp/recipes-kernel/linux/files/fvp-baser-aemv8r64/fvp-baser-aemv8r64.dts b/meta-arm-bsp/recipes-kernel/linux/files/fvp-baser-aemv8r64/fvp-baser-aemv8r64.dts index 4d6640af..a5078f27 100644 --- a/meta-arm-bsp/recipes-kernel/linux/files/fvp-baser-aemv8r64/fvp-baser-aemv8r64.dts +++ b/meta-arm-bsp/recipes-kernel/linux/files/fvp-baser-aemv8r64/fvp-baser-aemv8r64.dts @@ -13,7 +13,7 @@ #size-cells = <0x2>; device_type = "memory"; reg = <0x0 0x0 0x0 0x80000000>, - <0x00000008 0x80000000 0x1 0x80000000>; + <0x00000008 0x80000000 0x0 0x80000000>; }; cpus {