From: Igor Mammedov <imammedo@redhat.com>
To: Niek Linnenbank <nieklinnenbank@gmail.com>
Cc: peter.maydell@linaro.org, philmd@redhat.com, jasowang@redhat.com,
qemu-devel@nongnu.org, b.galvani@gmail.com, qemu-arm@nongnu.org,
alex.bennee@linaro.org
Subject: Re: [PATCH v4 02/20] hw/arm: add Xunlong Orange Pi PC machine
Date: Tue, 21 Jan 2020 17:39:06 +0100 [thread overview]
Message-ID: <20200121173906.626c700b@Igors-MacBook-Pro> (raw)
In-Reply-To: <20200119005102.3847-3-nieklinnenbank@gmail.com>
On Sun, 19 Jan 2020 01:50:44 +0100
Niek Linnenbank <nieklinnenbank@gmail.com> wrote:
> The Xunlong Orange Pi PC is an Allwinner H3 System on Chip
> based embedded computer with mainline support in both U-Boot
> and Linux. The board comes with a Quad Core Cortex A7 @ 1.3GHz,
> 1GiB RAM, 100Mbit ethernet, USB, SD/MMC, USB, HDMI and
> various other I/O. This commit add support for the Xunlong
> Orange Pi PC machine.
>
> Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com>
> Tested-by: KONRAD Frederic <frederic.konrad@adacore.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
> ---
> hw/arm/orangepi.c | 93 ++++++++++++++++++++++++++++++++++++++++++++
> MAINTAINERS | 1 +
> hw/arm/Makefile.objs | 2 +-
> 3 files changed, 95 insertions(+), 1 deletion(-)
> create mode 100644 hw/arm/orangepi.c
>
> diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
> new file mode 100644
> index 0000000000..866f5f7cd6
> --- /dev/null
> +++ b/hw/arm/orangepi.c
> @@ -0,0 +1,93 @@
> +/*
> + * Orange Pi emulation
> + *
> + * Copyright (C) 2019 Niek Linnenbank <nieklinnenbank@gmail.com>
> + *
> + * This program is free software: you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation, either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program. If not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qemu/units.h"
> +#include "exec/address-spaces.h"
> +#include "qapi/error.h"
> +#include "cpu.h"
> +#include "hw/sysbus.h"
> +#include "hw/boards.h"
> +#include "hw/qdev-properties.h"
> +#include "hw/arm/allwinner-h3.h"
> +#include "sysemu/sysemu.h"
> +
> +static struct arm_boot_info orangepi_binfo = {
> + .nb_cpus = AW_H3_NUM_CPUS,
> +};
> +
> +typedef struct OrangePiState {
> + AwH3State *h3;
> + MemoryRegion sdram;
> +} OrangePiState;
> +
> +static void orangepi_init(MachineState *machine)
> +{
> + OrangePiState *s = g_new(OrangePiState, 1);
> +
> + /* BIOS is not supported by this board */
> + if (bios_name) {
> + error_report("BIOS not supported for this machine");
> + exit(1);
> + }
> +
> + /* Only allow Cortex-A7 for this board */
> + if (strcmp(machine->cpu_type, ARM_CPU_TYPE_NAME("cortex-a7")) != 0) {
> + error_report("This board can only be used with cortex-a7 CPU");
> + exit(1);
> + }
> +
> + s->h3 = AW_H3(object_new(TYPE_AW_H3));
> +
> + /* Setup timer properties */
> + object_property_set_int(OBJECT(s->h3), 32768, "clk0-freq",
> + &error_abort);
> + object_property_set_int(OBJECT(s->h3), 24 * 1000 * 1000, "clk1-freq",
> + &error_abort);
> +
> + /* Mark H3 object realized */
> + object_property_set_bool(OBJECT(s->h3), true, "realized", &error_abort);
> +
> + /* SDRAM */
> + if (machine->ram_size != 1 * GiB) {
> + error_report("This machine can only be used with 1GiB of RAM");
> + exit(1);
> + }
> + memory_region_allocate_system_memory(&s->sdram, NULL, "sdram",
> + machine->ram_size);
> + memory_region_add_subregion(get_system_memory(), s->h3->memmap[AW_H3_SDRAM],
> + &s->sdram);
> +
> + orangepi_binfo.loader_start = s->h3->memmap[AW_H3_SDRAM];
> + orangepi_binfo.ram_size = machine->ram_size;
> + arm_load_kernel(ARM_CPU(first_cpu), machine, &orangepi_binfo);
> +}
> +
> +static void orangepi_machine_init(MachineClass *mc)
> +{
> + mc->desc = "Orange Pi PC";
> + mc->init = orangepi_init;
> + mc->min_cpus = AW_H3_NUM_CPUS;
> + mc->max_cpus = AW_H3_NUM_CPUS;
> + mc->default_cpus = AW_H3_NUM_CPUS;
> + mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a7");
> + mc->default_ram_size = 1 * GiB;
> +}
> +
> +DEFINE_MACHINE("orangepi-pc", orangepi_machine_init)
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 225582704d..e99797eec9 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -487,6 +487,7 @@ L: qemu-arm@nongnu.org
> S: Maintained
> F: hw/*/allwinner-h3*
> F: include/hw/*/allwinner-h3*
> +F: hw/arm/orangepi.c
>
> ARM PrimeCell and CMSDK devices
> M: Peter Maydell <peter.maydell@linaro.org>
> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
> index ae577e875f..534a6a119e 100644
> --- a/hw/arm/Makefile.objs
> +++ b/hw/arm/Makefile.objs
> @@ -35,7 +35,7 @@ obj-$(CONFIG_DIGIC) += digic.o
> obj-$(CONFIG_OMAP) += omap1.o omap2.o
> obj-$(CONFIG_STRONGARM) += strongarm.o
> obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o
> -obj-$(CONFIG_ALLWINNER_H3) += allwinner-h3.o
> +obj-$(CONFIG_ALLWINNER_H3) += allwinner-h3.o orangepi.o
> obj-$(CONFIG_RASPI) += bcm2835_peripherals.o bcm2836.o raspi.o
> obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o
> obj-$(CONFIG_STM32F405_SOC) += stm32f405_soc.o
next prev parent reply other threads:[~2020-01-21 16:40 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-19 0:50 [PATCH v4 00/20] Add Allwinner H3 SoC and Orange Pi PC Machine Niek Linnenbank
2020-01-19 0:50 ` [PATCH v4 01/20] hw/arm: add Allwinner H3 System-on-Chip Niek Linnenbank
2020-01-19 18:01 ` Philippe Mathieu-Daudé
2020-02-01 19:21 ` Niek Linnenbank
2020-02-01 20:52 ` Philippe Mathieu-Daudé
2020-01-19 0:50 ` [PATCH v4 02/20] hw/arm: add Xunlong Orange Pi PC machine Niek Linnenbank
2020-01-19 18:04 ` Philippe Mathieu-Daudé
2020-02-02 22:47 ` Niek Linnenbank
2020-01-21 16:39 ` Igor Mammedov [this message]
2020-02-02 22:37 ` Niek Linnenbank
2020-01-19 0:50 ` [PATCH v4 03/20] hw/arm/allwinner-h3: add Clock Control Unit Niek Linnenbank
2020-01-19 18:34 ` Philippe Mathieu-Daudé
2020-02-01 21:15 ` Niek Linnenbank
2020-01-19 0:50 ` [PATCH v4 04/20] hw/arm/allwinner-h3: add USB host controller Niek Linnenbank
2020-01-19 18:37 ` Philippe Mathieu-Daudé
2020-01-19 18:44 ` Philippe Mathieu-Daudé
2020-02-02 19:33 ` Niek Linnenbank
2020-02-12 22:23 ` Philippe Mathieu-Daudé
2020-02-02 19:12 ` Niek Linnenbank
2020-01-19 0:50 ` [PATCH v4 05/20] hw/arm/allwinner-h3: add System Control module Niek Linnenbank
2020-01-19 18:46 ` Philippe Mathieu-Daudé
2020-01-19 0:50 ` [PATCH v4 06/20] hw/arm/allwinner: add CPU Configuration module Niek Linnenbank
2020-01-19 18:52 ` Philippe Mathieu-Daudé
2020-02-02 20:25 ` Niek Linnenbank
2020-01-19 0:50 ` [PATCH v4 07/20] hw/arm/allwinner: add Security Identifier device Niek Linnenbank
2020-01-19 18:57 ` Philippe Mathieu-Daudé
2020-02-02 20:47 ` Niek Linnenbank
2020-01-19 0:50 ` [PATCH v4 08/20] hw/arm/allwinner: add SD/MMC host controller Niek Linnenbank
2020-01-19 19:01 ` Philippe Mathieu-Daudé
2020-02-02 21:43 ` Niek Linnenbank
2020-02-07 21:09 ` Niek Linnenbank
2020-01-19 0:50 ` [PATCH v4 09/20] hw/arm/allwinner-h3: add EMAC ethernet device Niek Linnenbank
2020-01-19 0:50 ` [PATCH v4 10/20] hw/arm/allwinner-h3: add Boot ROM support Niek Linnenbank
2020-01-19 19:14 ` Philippe Mathieu-Daudé
2020-02-02 22:11 ` Niek Linnenbank
2020-01-19 0:50 ` [PATCH v4 11/20] hw/arm/allwinner-h3: add SDRAM controller device Niek Linnenbank
2020-01-19 0:50 ` [PATCH v4 12/20] hw/arm/allwinner: add RTC device support Niek Linnenbank
2020-01-19 0:50 ` [PATCH v4 13/20] tests/boot_linux_console: Add a quick test for the OrangePi PC board Niek Linnenbank
2020-01-19 0:50 ` [PATCH v4 14/20] tests/boot_linux_console: Add initrd test for the Orange Pi " Niek Linnenbank
2020-01-19 0:50 ` [PATCH v4 15/20] tests/boot_linux_console: Add a SD card test for the OrangePi " Niek Linnenbank
2020-01-19 0:50 ` [PATCH v4 16/20] tests/boot_linux_console: Add a SLOW test booting Ubuntu on OrangePi PC Niek Linnenbank
2020-01-19 22:30 ` Philippe Mathieu-Daudé
2020-02-06 21:21 ` Niek Linnenbank
2020-02-12 22:02 ` Philippe Mathieu-Daudé
2020-01-19 0:50 ` [PATCH v4 17/20] Acceptance tests: Extract _console_interaction() Niek Linnenbank
2020-01-19 0:51 ` [PATCH v4 18/20] Acceptance tests: Add interrupt_interactive_console_until_pattern() Niek Linnenbank
2020-01-19 0:51 ` [PATCH v4 19/20] tests/boot_linux_console: Test booting NetBSD via U-Boot on OrangePi PC Niek Linnenbank
2020-01-19 0:51 ` [PATCH v4 20/20] docs: add Orange Pi PC document Niek Linnenbank
2020-01-19 11:51 ` [PATCH v4 00/20] Add Allwinner H3 SoC and Orange Pi PC Machine Niek Linnenbank
2020-02-12 21:47 ` Niek Linnenbank
2020-02-12 22:12 ` Philippe Mathieu-Daudé
2020-02-17 20:27 ` Niek Linnenbank
2020-02-18 6:46 ` Philippe Mathieu-Daudé
2020-02-18 10:05 ` Peter Maydell
2020-02-18 21:50 ` Niek Linnenbank
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200121173906.626c700b@Igors-MacBook-Pro \
--to=imammedo@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=b.galvani@gmail.com \
--cc=jasowang@redhat.com \
--cc=nieklinnenbank@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).