diff mbox series

[v6,41/41] Add RPi4B to raspi.rst

Message ID 20240226000259.2752893-42-sergey.kambalin@auriga.com
State New
Headers show
Series Raspberry Pi 4B machine | expand

Commit Message

Sergey Kambalin Feb. 26, 2024, 12:02 a.m. UTC 
Signed-off-by: Sergey Kambalin <sergey.kambalin@auriga.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
 docs/system/arm/raspi.rst | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Comments

Peter Maydell Feb. 26, 2024, 4:42 p.m. UTC | #1 
On Mon, 26 Feb 2024 at 00:03, Sergey Kambalin <serg.oker@gmail.com> wrote:
>
> Signed-off-by: Sergey Kambalin <sergey.kambalin@auriga.com>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  docs/system/arm/raspi.rst | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/docs/system/arm/raspi.rst b/docs/system/arm/raspi.rst
> index d0a6f08b2b..c21b27744e 100644
> --- a/docs/system/arm/raspi.rst
> +++ b/docs/system/arm/raspi.rst
> @@ -1,5 +1,5 @@
> -Raspberry Pi boards (``raspi0``, ``raspi1ap``, ``raspi2b``, ``raspi3ap``, ``raspi3b``)
> -======================================================================================
> +Raspberry Pi boards (``raspi0``, ``raspi1ap``, ``raspi2b``, ``raspi3ap``, ``raspi3b``, ``raspi4b-2g``)
> +======================================================================================================
>
>
>  QEMU provides models of the following Raspberry Pi boards:
> @@ -12,12 +12,13 @@ QEMU provides models of the following Raspberry Pi boards:
>    Cortex-A53 (4 cores), 512 MiB of RAM
>  ``raspi3b``
>    Cortex-A53 (4 cores), 1 GiB of RAM
> -
> +``raspi4b-2g``
> +  Cortex-A72 (4 cores), 2 GiB of RAM
>
>  Implemented devices
>  -------------------
>
> - * ARM1176JZF-S, Cortex-A7 or Cortex-A53 CPU
> + * ARM1176JZF-S, Cortex-A7, Cortex-A53 or Cortex-A72 CPU
>   * Interrupt controller
>   * DMA controller
>   * Clock and reset controller (CPRMAN)
> @@ -34,6 +35,8 @@ Implemented devices
>   * MailBox controller (MBOX)
>   * VideoCore firmware (property)
>   * Peripheral SPI controller (SPI)
> + * PCIE Root Port (raspi4b-2g)
> + * GENET Ethernet Controller (raspi4b-2g)

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

For the "no PCI/no ethernet" initial version, I'll drop these last
two lines; we can add them in when we land the pci and ethernet
patches.

thanks
-- PMM
Peter Maydell Feb. 26, 2024, 4:43 p.m. UTC | #2 
On Mon, 26 Feb 2024 at 16:42, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> On Mon, 26 Feb 2024 at 00:03, Sergey Kambalin <serg.oker@gmail.com> wrote:
> >
> > Signed-off-by: Sergey Kambalin <sergey.kambalin@auriga.com>
> > Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> > ---
> >  docs/system/arm/raspi.rst | 11 +++++++----
> >  1 file changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/docs/system/arm/raspi.rst b/docs/system/arm/raspi.rst
> > index d0a6f08b2b..c21b27744e 100644
> > --- a/docs/system/arm/raspi.rst
> > +++ b/docs/system/arm/raspi.rst
> > @@ -1,5 +1,5 @@
> > -Raspberry Pi boards (``raspi0``, ``raspi1ap``, ``raspi2b``, ``raspi3ap``, ``raspi3b``)
> > -======================================================================================
> > +Raspberry Pi boards (``raspi0``, ``raspi1ap``, ``raspi2b``, ``raspi3ap``, ``raspi3b``, ``raspi4b-2g``)
> > +======================================================================================================
> >
> >
> >  QEMU provides models of the following Raspberry Pi boards:
> > @@ -12,12 +12,13 @@ QEMU provides models of the following Raspberry Pi boards:
> >    Cortex-A53 (4 cores), 512 MiB of RAM
> >  ``raspi3b``
> >    Cortex-A53 (4 cores), 1 GiB of RAM
> > -
> > +``raspi4b-2g``
> > +  Cortex-A72 (4 cores), 2 GiB of RAM
> >
> >  Implemented devices
> >  -------------------
> >
> > - * ARM1176JZF-S, Cortex-A7 or Cortex-A53 CPU
> > + * ARM1176JZF-S, Cortex-A7, Cortex-A53 or Cortex-A72 CPU
> >   * Interrupt controller
> >   * DMA controller
> >   * Clock and reset controller (CPRMAN)
> > @@ -34,6 +35,8 @@ Implemented devices
> >   * MailBox controller (MBOX)
> >   * VideoCore firmware (property)
> >   * Peripheral SPI controller (SPI)
> > + * PCIE Root Port (raspi4b-2g)
> > + * GENET Ethernet Controller (raspi4b-2g)
>
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>
> For the "no PCI/no ethernet" initial version, I'll drop these last
> two lines; we can add them in when we land the pci and ethernet
> patches.

...better, I'll move them to "missing devices":

--- a/docs/system/arm/raspi.rst
+++ b/docs/system/arm/raspi.rst
@@ -35,12 +35,11 @@ Implemented devices
  * MailBox controller (MBOX)
  * VideoCore firmware (property)
  * Peripheral SPI controller (SPI)
- * PCIE Root Port (raspi4b-2g)
- * GENET Ethernet Controller (raspi4b-2g)
-

 Missing devices
 ---------------

  * Analog to Digital Converter (ADC)
  * Pulse Width Modulation (PWM)
+ * PCIE Root Port (raspi4b-2g)
+ * GENET Ethernet Controller (raspi4b-2g)

-- PMM
Philippe Mathieu-Daudé Feb. 26, 2024, 4:52 p.m. UTC | #3 
On 26/2/24 17:43, Peter Maydell wrote:
> On Mon, 26 Feb 2024 at 16:42, Peter Maydell <peter.maydell@linaro.org> wrote:
>>
>> On Mon, 26 Feb 2024 at 00:03, Sergey Kambalin <serg.oker@gmail.com> wrote:
>>>
>>> Signed-off-by: Sergey Kambalin <sergey.kambalin@auriga.com>
>>> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>>> ---
>>>   docs/system/arm/raspi.rst | 11 +++++++----
>>>   1 file changed, 7 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/docs/system/arm/raspi.rst b/docs/system/arm/raspi.rst
>>> index d0a6f08b2b..c21b27744e 100644
>>> --- a/docs/system/arm/raspi.rst
>>> +++ b/docs/system/arm/raspi.rst
>>> @@ -1,5 +1,5 @@
>>> -Raspberry Pi boards (``raspi0``, ``raspi1ap``, ``raspi2b``, ``raspi3ap``, ``raspi3b``)
>>> -======================================================================================
>>> +Raspberry Pi boards (``raspi0``, ``raspi1ap``, ``raspi2b``, ``raspi3ap``, ``raspi3b``, ``raspi4b-2g``)
>>> +======================================================================================================
>>>
>>>
>>>   QEMU provides models of the following Raspberry Pi boards:
>>> @@ -12,12 +12,13 @@ QEMU provides models of the following Raspberry Pi boards:
>>>     Cortex-A53 (4 cores), 512 MiB of RAM
>>>   ``raspi3b``
>>>     Cortex-A53 (4 cores), 1 GiB of RAM
>>> -
>>> +``raspi4b-2g``
>>> +  Cortex-A72 (4 cores), 2 GiB of RAM
>>>
>>>   Implemented devices
>>>   -------------------
>>>
>>> - * ARM1176JZF-S, Cortex-A7 or Cortex-A53 CPU
>>> + * ARM1176JZF-S, Cortex-A7, Cortex-A53 or Cortex-A72 CPU
>>>    * Interrupt controller
>>>    * DMA controller
>>>    * Clock and reset controller (CPRMAN)
>>> @@ -34,6 +35,8 @@ Implemented devices
>>>    * MailBox controller (MBOX)
>>>    * VideoCore firmware (property)
>>>    * Peripheral SPI controller (SPI)
>>> + * PCIE Root Port (raspi4b-2g)
>>> + * GENET Ethernet Controller (raspi4b-2g)
>>
>> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
>>
>> For the "no PCI/no ethernet" initial version, I'll drop these last
>> two lines; we can add them in when we land the pci and ethernet
>> patches.
> 
> ...better, I'll move them to "missing devices":
> 
> --- a/docs/system/arm/raspi.rst
> +++ b/docs/system/arm/raspi.rst
> @@ -35,12 +35,11 @@ Implemented devices
>    * MailBox controller (MBOX)
>    * VideoCore firmware (property)
>    * Peripheral SPI controller (SPI)
> - * PCIE Root Port (raspi4b-2g)
> - * GENET Ethernet Controller (raspi4b-2g)

When we add them back, no need to precise "raspi4b-2g" IMO.

>   Missing devices
>   ---------------
> 
>    * Analog to Digital Converter (ADC)
>    * Pulse Width Modulation (PWM)
> + * PCIE Root Port (raspi4b-2g)
> + * GENET Ethernet Controller (raspi4b-2g)
> 
> -- PMM
>
Peter Maydell Feb. 26, 2024, 4:54 p.m. UTC | #4 
On Mon, 26 Feb 2024 at 16:52, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> On 26/2/24 17:43, Peter Maydell wrote:
> > On Mon, 26 Feb 2024 at 16:42, Peter Maydell <peter.maydell@linaro.org> wrote:
> >>
> >> On Mon, 26 Feb 2024 at 00:03, Sergey Kambalin <serg.oker@gmail.com> wrote:
> >>>
> >>> Signed-off-by: Sergey Kambalin <sergey.kambalin@auriga.com>
> >>> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> >>> ---
> >>>   docs/system/arm/raspi.rst | 11 +++++++----
> >>>   1 file changed, 7 insertions(+), 4 deletions(-)
> >>>
> >>> diff --git a/docs/system/arm/raspi.rst b/docs/system/arm/raspi.rst
> >>> index d0a6f08b2b..c21b27744e 100644
> >>> --- a/docs/system/arm/raspi.rst
> >>> +++ b/docs/system/arm/raspi.rst
> >>> @@ -1,5 +1,5 @@
> >>> -Raspberry Pi boards (``raspi0``, ``raspi1ap``, ``raspi2b``, ``raspi3ap``, ``raspi3b``)
> >>> -======================================================================================
> >>> +Raspberry Pi boards (``raspi0``, ``raspi1ap``, ``raspi2b``, ``raspi3ap``, ``raspi3b``, ``raspi4b-2g``)
> >>> +======================================================================================================
> >>>
> >>>
> >>>   QEMU provides models of the following Raspberry Pi boards:
> >>> @@ -12,12 +12,13 @@ QEMU provides models of the following Raspberry Pi boards:
> >>>     Cortex-A53 (4 cores), 512 MiB of RAM
> >>>   ``raspi3b``
> >>>     Cortex-A53 (4 cores), 1 GiB of RAM
> >>> -
> >>> +``raspi4b-2g``
> >>> +  Cortex-A72 (4 cores), 2 GiB of RAM
> >>>
> >>>   Implemented devices
> >>>   -------------------
> >>>
> >>> - * ARM1176JZF-S, Cortex-A7 or Cortex-A53 CPU
> >>> + * ARM1176JZF-S, Cortex-A7, Cortex-A53 or Cortex-A72 CPU
> >>>    * Interrupt controller
> >>>    * DMA controller
> >>>    * Clock and reset controller (CPRMAN)
> >>> @@ -34,6 +35,8 @@ Implemented devices
> >>>    * MailBox controller (MBOX)
> >>>    * VideoCore firmware (property)
> >>>    * Peripheral SPI controller (SPI)
> >>> + * PCIE Root Port (raspi4b-2g)
> >>> + * GENET Ethernet Controller (raspi4b-2g)
> >>
> >> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> >>
> >> For the "no PCI/no ethernet" initial version, I'll drop these last
> >> two lines; we can add them in when we land the pci and ethernet
> >> patches.
> >
> > ...better, I'll move them to "missing devices":
> >
> > --- a/docs/system/arm/raspi.rst
> > +++ b/docs/system/arm/raspi.rst
> > @@ -35,12 +35,11 @@ Implemented devices
> >    * MailBox controller (MBOX)
> >    * VideoCore firmware (property)
> >    * Peripheral SPI controller (SPI)
> > - * PCIE Root Port (raspi4b-2g)
> > - * GENET Ethernet Controller (raspi4b-2g)
>
> When we add them back, no need to precise "raspi4b-2g" IMO.

It is the name of the machine; unless you think we should call
the machine just 'raspi4b', it seems better to me to match it.

-- PMM
diff mbox series

Patch

diff --git a/docs/system/arm/raspi.rst b/docs/system/arm/raspi.rst
index d0a6f08b2b..c21b27744e 100644
--- a/docs/system/arm/raspi.rst
+++ b/docs/system/arm/raspi.rst
@@ -1,5 +1,5 @@ 
-Raspberry Pi boards (``raspi0``, ``raspi1ap``, ``raspi2b``, ``raspi3ap``, ``raspi3b``)
-======================================================================================
+Raspberry Pi boards (``raspi0``, ``raspi1ap``, ``raspi2b``, ``raspi3ap``, ``raspi3b``, ``raspi4b-2g``)
+======================================================================================================
 
 
 QEMU provides models of the following Raspberry Pi boards:
@@ -12,12 +12,13 @@  QEMU provides models of the following Raspberry Pi boards:
   Cortex-A53 (4 cores), 512 MiB of RAM
 ``raspi3b``
   Cortex-A53 (4 cores), 1 GiB of RAM
-
+``raspi4b-2g``
+  Cortex-A72 (4 cores), 2 GiB of RAM
 
 Implemented devices
 -------------------
 
- * ARM1176JZF-S, Cortex-A7 or Cortex-A53 CPU
+ * ARM1176JZF-S, Cortex-A7, Cortex-A53 or Cortex-A72 CPU
  * Interrupt controller
  * DMA controller
  * Clock and reset controller (CPRMAN)
@@ -34,6 +35,8 @@  Implemented devices
  * MailBox controller (MBOX)
  * VideoCore firmware (property)
  * Peripheral SPI controller (SPI)
+ * PCIE Root Port (raspi4b-2g)
+ * GENET Ethernet Controller (raspi4b-2g)
 
 
 Missing devices