[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[NOTFORMERGE PATCH v2 30/30] hw/arm/raspi: Add the Raspberry Pi 4
From: |
Philippe Mathieu-Daudé |
Subject: |
[NOTFORMERGE PATCH v2 30/30] hw/arm/raspi: Add the Raspberry Pi 4 |
Date: |
Thu, 6 Feb 2020 02:17:56 +0100 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/arm/raspi.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 47cc250883..8a0309933b 100644
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -88,7 +88,7 @@ static int board_version(uint32_t board_rev)
static const char *board_soc_type(uint32_t board_rev)
{
static const char *soc_types[] = {
- TYPE_BCM2835, TYPE_BCM2836, TYPE_BCM2837,
+ TYPE_BCM2835, TYPE_BCM2836, TYPE_BCM2837, TYPE_BCM2838,
};
int proc_id = board_processor_id(board_rev);
@@ -103,7 +103,7 @@ static const char *board_soc_type(uint32_t board_rev)
static int cores_count(uint32_t board_rev)
{
static const int soc_cores_count[] = {
- 1, BCM283X_NCPUS, BCM283X_NCPUS,
+ 1, BCM283X_NCPUS, BCM283X_NCPUS, BCM283X_NCPUS,
};
int proc_id = board_processor_id(board_rev);
@@ -350,6 +350,11 @@ static const TypeInfo raspi_machine_types[] = {
.parent = TYPE_RASPI_MACHINE,
.class_init = raspi_machine_class_init,
.class_data = (void *)0xa02082,
+ }, {
+ .name = MACHINE_TYPE_NAME("raspi4"),
+ .parent = TYPE_RASPI_MACHINE,
+ .class_init = raspi_machine_class_init,
+ .class_data = (void *)0xa03111,
#endif
}, {
.name = TYPE_RASPI_MACHINE,
--
2.21.1
- [PATCH v2 18/30] hw/arm/bcm2836: Split out common realize() code, (continued)
- [PATCH v2 18/30] hw/arm/bcm2836: Split out common realize() code, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 19/30] hw/arm/bcm2836: Introduce the BCM2835 SoC, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 20/30] hw/arm/raspi: Add the Raspberry Pi Zero machine, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 21/30] hw/arm/raspi: Add the Raspberry Pi B+ machine, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 24/30] tests/acceptance/boot_linux_console: Test the raspi1 console, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 23/30] tests/acceptance/boot_linux_console: Add raspi version=2 parameter, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 22/30] tests/acceptance/boot_linux_console: Use raspi console model as key, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 25/30] tests/acceptance/boot_linux_console: Test the raspi0 console, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 26/30] python/qemu/machine: Allow to use other serial consoles than default, Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 27/30] tests/acceptance/boot_linux_console: Test the raspi1 AUX console, Philippe Mathieu-Daudé, 2020/02/05
- [NOTFORMERGE PATCH v2 30/30] hw/arm/raspi: Add the Raspberry Pi 4,
Philippe Mathieu-Daudé <=
- [NOTFORMERGE PATCH v2 29/30] hw/arm/bcm2836: Add the BCM2838 (ARMv8), Philippe Mathieu-Daudé, 2020/02/05
- [PATCH v2 28/30] tests/acceptance: Count Raspberry Pi logos displayed on framebuffer, Philippe Mathieu-Daudé, 2020/02/05