On 4/2/25 10:22, Peter Maydell wrote:
On Tue, 4 Feb 2025 at 00:23, Philippe Mathieu-Daudé <philmd@xxxxxxxxxx> wrote:
All previous raspi machines can be created using the
generic machine. Deprecate the old names to maintain
a single one. Update the tests.
Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 4a3c302962a..c9a11a52f78 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -257,6 +257,19 @@ 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 ``raspi0``, ``raspi1ap``, ``raspi2b``, ``raspi3ap``, ``raspi3b`` and ``raspi4b`` machines (since 10.0)
+''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+The Raspberry Pi machines have been unified under the generic ``raspi`` machine,
+which takes the model as argument.
+
+ - `raspi0`` is now an alias for ``raspi,model=Zero``
+ - `raspi1ap`` is now an alias for ``raspi,model=1A+``
+ - `raspi2b`` is now an alias for ``raspi,model=2B``
+ - `raspi3ap`` is now an alias for ``raspi,model=3A+``
+ - `raspi3b`` is now an alias for ``raspi,model=3B``
+ - `raspi4b`` is now an alias for ``raspi,model=4B``
This is not how we typically handle "we have a bunch
of different devboards in one family". What's wrong with the
existing set of machine names?
Zoltan and you don't want to add more machine names, then you
don't want a generic machine. This is very confusing.
See previous patch:
$ qemu-system-aarch64 -M raspi,model=help
Available models (processor):
- A (BCM2835)
- B (BCM2835)
- A+ (BCM2835)
- B+ (BCM2835)
- CM1 (BCM2835)
- Zero (BCM2835)
- ZeroW (BCM2835)
- 2B (BCM2836)
- 3B (BCM2837)
- CM3 (BCM2837)
- 3B+ (BCM2837)
- 3A+ (BCM2837)
- CM3+ (BCM2837)
- 4B (BCM2838)
Can we or not add the other raspi models?
Can we implement "support more than just the fixed amount
of RAM" by making '-m 2G' work, without changing the
machine names at all, please?
We surely can if we find developers motivated to do the work.
Regards,
Phil.
