| Message ID | 20250201091528.1177-5-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | hw/arm/raspi4b: Add models with 4GB and 8GB of DRAM | expand |
On 1/2/25 10:15, Philippe Mathieu-Daudé wrote: > On 32-bit hosts, rename 'raspi4b' -> 'raspi4b-1g' to clarify the > machine has 1GB of RAM. > On 64-bit hosts, rename 'raspi4b' -> 'raspi4b-2g'. > Keep the 'raspi4b' alias but deprecate it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > docs/about/deprecated.rst | 6 ++++++ > hw/arm/raspi4b.c | 6 ++++-- > 2 files changed, 10 insertions(+), 2 deletions(-) > static const TypeInfo raspi4_machine_types[] = { > #if HOST_LONG_BITS == 32 > { > - .name = MACHINE_TYPE_NAME("raspi4b"), > + .name = MACHINE_TYPE_NAME("raspi4b-1g"), > .parent = TYPE_RASPI4_MACHINE, > .class_init = raspi4b_1g_machine_class_init, > }, > #else > { > - .name = MACHINE_TYPE_NAME("raspi4b"), > + .name = MACHINE_TYPE_NAME("raspi4b-2g"), > .parent = TYPE_RASPI4_MACHINE, > .class_init = raspi4b_2g_machine_class_init, > }, Forgot to squash here: -- >8 -- diff --git a/tests/functional/test_aarch64_raspi4.py b/tests/functional/test_aarch64_raspi4.py index 7a4302b0c5a..891a8135b6b 100755 --- a/tests/functional/test_aarch64_raspi4.py +++ b/tests/functional/test_aarch64_raspi4.py @@ -37 +37 @@ def test_arm_raspi4(self): - self.set_machine('raspi4b') + self.set_machine('raspi4b-1g') @@ -67 +67 @@ def test_arm_raspi4_initrd(self): - self.set_machine('raspi4b') + self.set_machine('raspi4b-1g') ---
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 4a3c302962a..d635bd60d74 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -257,6 +257,12 @@ Big-Endian variants of MicroBlaze ``petalogix-ml605`` and ``xlnx-zynqmp-pmu`` ma Both ``petalogix-ml605`` and ``xlnx-zynqmp-pmu`` were added for little endian CPUs. Big endian support is not tested. +ARM ``raspi4b`` machine (since 10.0) +'''''''''''''''''''''''''''''''''''' + +This machine has been renamed ``raspi4b-1g`` on 32-bit hosts and ``raspi4b-2g`` +on 64-bit ones. + Backend options --------------- diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 4ea79ec7092..713b4693a49 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -117,6 +117,7 @@ static void raspi4b_1g_machine_class_init(ObjectClass *oc, void *data) raspi_machine_class_common_init(mc, rmc->board_rev); mc->init = raspi4b_machine_init; + mc->alias = "raspi4b"; } #else static void raspi4b_2g_machine_class_init(ObjectClass *oc, void *data) @@ -128,19 +129,20 @@ static void raspi4b_2g_machine_class_init(ObjectClass *oc, void *data) rmc->board_rev = 0xb03115; /* Revision 1.5, 2 Gb RAM */ raspi_machine_class_common_init(mc, rmc->board_rev); mc->init = raspi4b_machine_init; + mc->alias = "raspi4b"; } #endif static const TypeInfo raspi4_machine_types[] = { #if HOST_LONG_BITS == 32 { - .name = MACHINE_TYPE_NAME("raspi4b"), + .name = MACHINE_TYPE_NAME("raspi4b-1g"), .parent = TYPE_RASPI4_MACHINE, .class_init = raspi4b_1g_machine_class_init, }, #else { - .name = MACHINE_TYPE_NAME("raspi4b"), + .name = MACHINE_TYPE_NAME("raspi4b-2g"), .parent = TYPE_RASPI4_MACHINE, .class_init = raspi4b_2g_machine_class_init, },
On 32-bit hosts, rename 'raspi4b' -> 'raspi4b-1g' to clarify the machine has 1GB of RAM. On 64-bit hosts, rename 'raspi4b' -> 'raspi4b-2g'. Keep the 'raspi4b' alias but deprecate it. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- docs/about/deprecated.rst | 6 ++++++ hw/arm/raspi4b.c | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-)