[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 015/136] arm/imx25_pdk: drop RAM size fixup
From: |
Paolo Bonzini |
Subject: |
[PULL 015/136] arm/imx25_pdk: drop RAM size fixup |
Date: |
Tue, 25 Feb 2020 12:49:05 +0100 |
From: Igor Mammedov <address@hidden>
If user provided non-sense RAM size, board will complain and
continue running with max RAM size supported.
Also RAM is going to be allocated by generic code, so it won't be
possible for board to fix things up for user.
Make it error message and exit to force user fix CLI,
instead of accepting non-sense CLI values.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
---
hw/arm/imx25_pdk.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c
index c76fc2b..c7c51d6 100644
--- a/hw/arm/imx25_pdk.c
+++ b/hw/arm/imx25_pdk.c
@@ -32,6 +32,7 @@
#include "exec/address-spaces.h"
#include "sysemu/qtest.h"
#include "hw/i2c/i2c.h"
+#include "qemu/cutils.h"
/* Memory map for PDK Emulation Baseboard:
* 0x00000000-0x7fffffff See i.MX25 SOC fr support
@@ -66,6 +67,7 @@ static struct arm_boot_info imx25_pdk_binfo;
static void imx25_pdk_init(MachineState *machine)
{
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
IMX25PDK *s = g_new0(IMX25PDK, 1);
unsigned int ram_size;
unsigned int alias_offset;
@@ -78,10 +80,10 @@ static void imx25_pdk_init(MachineState *machine)
/* We need to initialize our memory */
if (machine->ram_size > (FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE)) {
- warn_report("RAM size " RAM_ADDR_FMT " above max supported, "
- "reduced to %x", machine->ram_size,
- FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE);
- machine->ram_size = FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE;
+ char *sz = size_to_str(mc->default_ram_size);
+ error_report("Invalid RAM size, should be %s", sz);
+ g_free(sz);
+ exit(EXIT_FAILURE);
}
memory_region_allocate_system_memory(&s->ram, NULL, "imx25.ram",
--
1.8.3.1
- [PULL 006/136] vl.c: move -m parsing after memory backends has been processed, (continued)
- [PULL 006/136] vl.c: move -m parsing after memory backends has been processed, Paolo Bonzini, 2020/02/25
- [PULL 012/136] arm/cubieboard: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 009/136] arm/aspeed: actually check RAM size, Paolo Bonzini, 2020/02/25
- [PULL 008/136] alpha/dp264: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 014/136] arm/highbank: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 016/136] arm/imx25_pdk: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 018/136] arm/kzm: drop RAM size fixup, Paolo Bonzini, 2020/02/25
- [PULL 005/136] initialize MachineState::ram in NUMA case, Paolo Bonzini, 2020/02/25
- [PULL 013/136] arm/digic_boards: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 010/136] arm/aspeed: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 015/136] arm/imx25_pdk: drop RAM size fixup,
Paolo Bonzini <=
- [PULL 022/136] arm/mps2-tz: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 023/136] arm/mps2: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 025/136] arm/nseries: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 017/136] arm/integratorcp: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 027/136] arm/palm: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 024/136] arm/musicpal: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 019/136] arm/kzm: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 020/136] arm/mcimx6ul-evk: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 021/136] arm/mcimx7d-sabre: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 028/136] arm/sabrelite: use memdev for RAM, Paolo Bonzini, 2020/02/25