[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH rc2 15/25] target/avr: Register AVR support with the rest of QEMU
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH rc2 15/25] target/avr: Register AVR support with the rest of QEMU |
Date: |
Fri, 24 Jan 2020 01:51:21 +0100 |
From: Michael Rolnik <address@hidden>
Add AVR related definitions into QEMU
Signed-off-by: Michael Rolnik <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
---
qapi/machine.json | 3 ++-
include/disas/dis-asm.h | 19 +++++++++++++++++++
include/sysemu/arch_init.h | 1 +
arch_init.c | 2 ++
4 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/qapi/machine.json b/qapi/machine.json
index b3d30bc816..f2dc385167 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -21,11 +21,12 @@
# is true even for "qemu-system-x86_64".
#
# ppcemb: dropped in 3.1
+# avr: since 5.0
#
# Since: 3.0
##
{ 'enum' : 'SysEmuTarget',
- 'data' : [ 'aarch64', 'alpha', 'arm', 'cris', 'hppa', 'i386', 'lm32',
+ 'data' : [ 'aarch64', 'alpha', 'arm', 'avr', 'cris', 'hppa', 'i386', 'lm32',
'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64',
'mips64el', 'mipsel', 'moxie', 'nios2', 'or1k', 'ppc',
'ppc64', 'riscv32', 'riscv64', 's390x', 'sh4',
diff --git a/include/disas/dis-asm.h b/include/disas/dis-asm.h
index e9c7dd8eb4..79bbc8b498 100644
--- a/include/disas/dis-asm.h
+++ b/include/disas/dis-asm.h
@@ -211,6 +211,25 @@ enum bfd_architecture
#define bfd_mach_m32r 0 /* backwards compatibility */
bfd_arch_mn10200, /* Matsushita MN10200 */
bfd_arch_mn10300, /* Matsushita MN10300 */
+ bfd_arch_avr, /* Atmel AVR microcontrollers. */
+#define bfd_mach_avr1 1
+#define bfd_mach_avr2 2
+#define bfd_mach_avr25 25
+#define bfd_mach_avr3 3
+#define bfd_mach_avr31 31
+#define bfd_mach_avr35 35
+#define bfd_mach_avr4 4
+#define bfd_mach_avr5 5
+#define bfd_mach_avr51 51
+#define bfd_mach_avr6 6
+#define bfd_mach_avrtiny 100
+#define bfd_mach_avrxmega1 101
+#define bfd_mach_avrxmega2 102
+#define bfd_mach_avrxmega3 103
+#define bfd_mach_avrxmega4 104
+#define bfd_mach_avrxmega5 105
+#define bfd_mach_avrxmega6 106
+#define bfd_mach_avrxmega7 107
bfd_arch_cris, /* Axis CRIS */
#define bfd_mach_cris_v0_v10 255
#define bfd_mach_cris_v32 32
diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h
index 62c6fe4cf1..893df26ce2 100644
--- a/include/sysemu/arch_init.h
+++ b/include/sysemu/arch_init.h
@@ -24,6 +24,7 @@ enum {
QEMU_ARCH_NIOS2 = (1 << 17),
QEMU_ARCH_HPPA = (1 << 18),
QEMU_ARCH_RISCV = (1 << 19),
+ QEMU_ARCH_AVR = (1 << 20),
};
extern const uint32_t arch_type;
diff --git a/arch_init.c b/arch_init.c
index 705d0b94ad..6a741165b2 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -89,6 +89,8 @@ int graphic_depth = 32;
#define QEMU_ARCH QEMU_ARCH_UNICORE32
#elif defined(TARGET_XTENSA)
#define QEMU_ARCH QEMU_ARCH_XTENSA
+#elif defined(TARGET_AVR)
+#define QEMU_ARCH QEMU_ARCH_AVR
#endif
const uint32_t arch_type = QEMU_ARCH;
--
2.21.1
- [PATCH rc2 14/25] target/avr: Add section about AVR into QEMU documentation, (continued)
- [PATCH rc2 15/25] target/avr: Register AVR support with the rest of QEMU,
Philippe Mathieu-Daudé <=
- [PATCH rc2 16/25] target/avr: Add machine none test, Philippe Mathieu-Daudé, 2020/01/23
- [PATCH rc2 17/25] target/avr: Update MAINTAINERS file, Philippe Mathieu-Daudé, 2020/01/23
- [PATCH rc2 18/25] hw/core/loader: Let load_elf populate the processor-specific flags, Philippe Mathieu-Daudé, 2020/01/23
- [PATCH rc2 19/25] hw/avr: Add helper to load raw/ELF firmware binaries, Philippe Mathieu-Daudé, 2020/01/23
- [PATCH rc2 21/25] hw/avr: Add some Arduino boards, Philippe Mathieu-Daudé, 2020/01/23
- [PATCH rc2 20/25] hw/avr: Add some ATmega microcontrollers, Philippe Mathieu-Daudé, 2020/01/23