From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Sarah Harris" <S.E.Harris@kent.ac.uk>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Michael Rolnik" <mrolnik@gmail.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Aleksandar Markovic" <aleksandar.m.mail@gmail.com>,
"Richard Henderson" <rth@twiddle.net>
Subject: [PATCH v4 14/18] hw/avr: Add some Arduino boards
Date: Mon, 20 Jan 2020 23:01:03 +0100 [thread overview]
Message-ID: <20200120220107.17825-15-f4bug@amsat.org> (raw)
In-Reply-To: <20200120220107.17825-1-f4bug@amsat.org>
Arduino boards are build with AVR chipsets.
Add some of the popular boards:
- Arduino Duemilanove
- Arduino Uno
- Arduino Mega
For more information:
https://www.arduino.cc/en/Main/Products
https://store.arduino.cc/arduino-genuino/most-popular
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
v4:
- Remove unused 'extram*' fields (Igor)
v2:
- Reword description adding more information (Aleksandar)
- Use DEFINE_TYPES (Igor)
---
default-configs/avr-softmmu.mak | 1 +
hw/avr/arduino.c | 175 ++++++++++++++++++++++++++++++++
hw/avr/Kconfig | 4 +
hw/avr/Makefile.objs | 1 +
4 files changed, 181 insertions(+)
create mode 100644 hw/avr/arduino.c
diff --git a/default-configs/avr-softmmu.mak b/default-configs/avr-softmmu.mak
index d1e1c28118..d8d1d8e6fe 100644
--- a/default-configs/avr-softmmu.mak
+++ b/default-configs/avr-softmmu.mak
@@ -2,4 +2,5 @@
# Boards:
#
+CONFIG_ARDUINO=y
CONFIG_AVR_SAMPLE=y
diff --git a/hw/avr/arduino.c b/hw/avr/arduino.c
new file mode 100644
index 0000000000..784246baba
--- /dev/null
+++ b/hw/avr/arduino.c
@@ -0,0 +1,175 @@
+/*
+ * QEMU Arduino boards
+ *
+ * Copyright (c) 2019 Philippe Mathieu-Daudé
+ *
+ * This work is licensed under the terms of the GNU GPLv2 or later.
+ * See the COPYING file in the top-level directory.
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+/* TODO: Implement the use of EXTRAM */
+
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "qapi/error.h"
+#include "hw/boards.h"
+#include "hw/loader.h"
+#include "elf.h"
+#include "atmel_atmega.h"
+
+typedef struct ArduinoMachineState {
+ /*< private >*/
+ MachineState parent_obj;
+ /*< public >*/
+ AtmegaMcuState mcu;
+} ArduinoMachineState;
+
+typedef struct ArduinoMachineClass {
+ /*< private >*/
+ MachineClass parent_class;
+ /*< public >*/
+ const char *mcu_type;
+ uint64_t xtal_hz;
+} ArduinoMachineClass;
+
+#define TYPE_ARDUINO_MACHINE \
+ MACHINE_TYPE_NAME("arduino")
+#define ARDUINO_MACHINE(obj) \
+ OBJECT_CHECK(ArduinoMachineState, (obj), TYPE_ARDUINO_MACHINE)
+#define ARDUINO_MACHINE_CLASS(klass) \
+ OBJECT_CLASS_CHECK(ArduinoMachineClass, (klass), TYPE_ARDUINO_MACHINE)
+#define ARDUINO_MACHINE_GET_CLASS(obj) \
+ OBJECT_GET_CLASS(ArduinoMachineClass, (obj), TYPE_ARDUINO_MACHINE)
+
+static void load_firmware(const char *firmware, uint64_t flash_size)
+{
+ const char *filename;
+ int bytes_loaded;
+
+ /* Load firmware (contents of flash) trying to auto-detect format */
+ filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, firmware);
+ if (filename == NULL) {
+ error_report("Unable to find %s", firmware);
+ exit(1);
+ }
+
+ bytes_loaded = load_elf(filename, NULL, NULL, NULL, NULL, NULL, NULL,
+ 0, EM_NONE, 0, 0);
+ if (bytes_loaded < 0) {
+ bytes_loaded = load_image_targphys(filename, OFFSET_CODE, flash_size);
+ }
+ if (bytes_loaded < 0) {
+ error_report("Unable to load firmware image %s as ELF or raw binary",
+ firmware);
+ exit(1);
+ }
+}
+
+static void arduino_machine_init(MachineState *machine)
+{
+ ArduinoMachineClass *amc = ARDUINO_MACHINE_GET_CLASS(machine);
+ ArduinoMachineState *ams = ARDUINO_MACHINE(machine);
+
+ sysbus_init_child_obj(OBJECT(machine), "mcu", &ams->mcu, sizeof(ams->mcu),
+ amc->mcu_type);
+ object_property_set_uint(OBJECT(&ams->mcu), amc->xtal_hz,
+ "xtal-frequency-hz", &error_abort);
+ object_property_set_bool(OBJECT(&ams->mcu), true, "realized",
+ &error_abort);
+
+ if (machine->firmware) {
+ load_firmware(machine->firmware, memory_region_size(&ams->mcu.flash));
+ }
+}
+
+static void arduino_machine_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+
+ mc->init = arduino_machine_init;
+ mc->default_cpus = 1;
+ mc->min_cpus = mc->default_cpus;
+ mc->max_cpus = mc->default_cpus;
+ mc->no_floppy = 1;
+ mc->no_cdrom = 1;
+ mc->no_parallel = 1;
+}
+
+static void arduino_duemilanove_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+ ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc);
+
+ /* https://www.arduino.cc/en/Main/ArduinoBoardDuemilanove */
+ mc->desc = "Arduino Duemilanove (ATmega168)",
+ mc->alias = "2009";
+ amc->mcu_type = TYPE_ATMEGA168_MCU;
+ amc->xtal_hz = 16 * 1000 * 1000;
+};
+
+static void arduino_uno_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+ ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc);
+
+ /* https://store.arduino.cc/arduino-uno-rev3 */
+ mc->desc = "Arduino UNO (ATmega328P)";
+ mc->alias = "uno";
+ amc->mcu_type = TYPE_ATMEGA328_MCU;
+ amc->xtal_hz = 16 * 1000 * 1000;
+};
+
+static void arduino_mega_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+ ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc);
+
+ /* https://www.arduino.cc/en/Main/ArduinoBoardMega */
+ mc->desc = "Arduino Mega (ATmega1280)";
+ mc->alias = "mega";
+ amc->mcu_type = TYPE_ATMEGA1280_MCU;
+ amc->xtal_hz = 16 * 1000 * 1000;
+};
+
+static void arduino_mega2560_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+ ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc);
+
+ /* https://store.arduino.cc/arduino-mega-2560-rev3 */
+ mc->desc = "Arduino Mega 2560 (ATmega2560)";
+ mc->alias = "mega2560";
+ mc->is_default = true;
+ amc->mcu_type = TYPE_ATMEGA2560_MCU;
+ amc->xtal_hz = 16 * 1000 * 1000; /* CSTCE16M0V53-R0 */
+};
+
+static const TypeInfo arduino_machine_types[] = {
+ {
+ .name = MACHINE_TYPE_NAME("arduino-duemilanove"),
+ .parent = TYPE_ARDUINO_MACHINE,
+ .class_init = arduino_duemilanove_class_init,
+ }, {
+ .name = MACHINE_TYPE_NAME("arduino-uno"),
+ .parent = TYPE_ARDUINO_MACHINE,
+ .class_init = arduino_uno_class_init,
+ }, {
+ .name = MACHINE_TYPE_NAME("arduino-mega"),
+ .parent = TYPE_ARDUINO_MACHINE,
+ .class_init = arduino_mega_class_init,
+ }, {
+ .name = MACHINE_TYPE_NAME("arduino-mega-2560-v3"),
+ .parent = TYPE_ARDUINO_MACHINE,
+ .class_init = arduino_mega2560_class_init,
+ }, {
+ .name = TYPE_ARDUINO_MACHINE,
+ .parent = TYPE_MACHINE,
+ .instance_size = sizeof(ArduinoMachineState),
+ .class_size = sizeof(ArduinoMachineClass),
+ .class_init = arduino_machine_class_init,
+ .abstract = true,
+ }
+};
+
+DEFINE_TYPES(arduino_machine_types)
diff --git a/hw/avr/Kconfig b/hw/avr/Kconfig
index 228eae7582..7907584ac7 100644
--- a/hw/avr/Kconfig
+++ b/hw/avr/Kconfig
@@ -4,6 +4,10 @@ config ATMEL_ATMEGA_MCU
select ATMEL_USART
select ATMEL_POWER
+config ARDUINO
+ select ATMEL_ATMEGA_MCU
+ select UNIMP
+
config AVR_SAMPLE
select ATMEL_ATMEGA_MCU
select UNIMP
diff --git a/hw/avr/Makefile.objs b/hw/avr/Makefile.objs
index 696f855c74..b36ca77cf0 100644
--- a/hw/avr/Makefile.objs
+++ b/hw/avr/Makefile.objs
@@ -1,2 +1,3 @@
obj-$(CONFIG_ATMEL_ATMEGA_MCU) += atmel_atmega.o
+obj-$(CONFIG_ARDUINO) += arduino.o
obj-$(CONFIG_AVR_SAMPLE) += sample.o
--
2.21.1
next prev parent reply other threads:[~2020-01-20 22:12 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 22:00 [PATCH v4 00/18] hw/avr: Introduce few Arduino boards Philippe Mathieu-Daudé
2020-01-20 22:00 ` [PATCH v4 01/18] MAINTAINERS: Move machine test to the machine section (not ARCH one) Philippe Mathieu-Daudé
2020-01-20 22:00 ` [PATCH v4 02/18] MAINTAINERS: Move the AVR machines in new section (not within ARM) Philippe Mathieu-Daudé
2020-01-20 22:00 ` [PATCH v4 03/18] tests/acceptance: Do not set the machine type manually Philippe Mathieu-Daudé
2020-01-20 22:00 ` [PATCH v4 04/18] tests/acceptance: Keep multilines comment consistent with other tests Philippe Mathieu-Daudé
2020-01-20 22:00 ` [PATCH v4 05/18] hw/char/avr: Reduce USART I/O size Philippe Mathieu-Daudé
2020-01-20 22:00 ` [PATCH v4 06/18] hw/timer/avr_timer16: Rename memory region debugging name Philippe Mathieu-Daudé
2020-01-20 22:00 ` [PATCH v4 07/18] hw/misc/avr_mask: Remove unused include Philippe Mathieu-Daudé
2020-01-20 22:00 ` [PATCH v4 08/18] hw/avr/Makefile: Use CONFIG_AVR_SAMPLE variable Philippe Mathieu-Daudé
2020-01-20 22:00 ` [PATCH v4 09/18] hw/char: Rename avr_usart -> atmel_usart Philippe Mathieu-Daudé
2020-01-20 22:00 ` [PATCH v4 10/18] hw/timer: Rename avr_timer16 -> atmel_timer16 Philippe Mathieu-Daudé
2020-01-20 22:01 ` [PATCH v4 11/18] hw/misc: Rename avr_mask -> atmel_power Philippe Mathieu-Daudé
2020-01-20 22:01 ` [PATCH v4 12/18] hw/avr: Introduce ATMEL_ATMEGA_MCU config Philippe Mathieu-Daudé
2020-01-20 22:01 ` [PATCH v4 13/18] hw/avr: Add some ATmega microcontrollers Philippe Mathieu-Daudé
2020-01-20 22:01 ` Philippe Mathieu-Daudé [this message]
2020-01-20 22:01 ` [PATCH v4 15/18] tests/boot-serial-test: Test some Arduino boards (AVR based) Philippe Mathieu-Daudé
2020-01-21 6:11 ` Thomas Huth
2020-01-20 22:01 ` [PATCH v4 16/18] tests/acceptance: Test the Arduino MEGA2560 board Philippe Mathieu-Daudé
2020-01-20 22:01 ` [PATCH v4 17/18] hw/avr: Remove the unrealistic AVR 'sample' board Philippe Mathieu-Daudé
2020-01-20 22:01 ` [PATCH v4 18/18] .travis.yml: Run the AVR acceptance tests Philippe Mathieu-Daudé
2020-01-20 23:30 ` [PATCH v4 00/18] hw/avr: Introduce few Arduino boards Philippe Mathieu-Daudé
2020-01-21 19:25 ` Michael Rolnik
2020-01-21 21:23 ` Philippe Mathieu-Daudé
2020-01-22 20:46 ` Richard Henderson
2020-01-22 21:56 ` Philippe Mathieu-Daudé
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=20200120220107.17825-15-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=S.E.Harris@kent.ac.uk \
--cc=aleksandar.m.mail@gmail.com \
--cc=imammedo@redhat.com \
--cc=mrolnik@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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).