Skip to content

Commit 6591138

Browse files
dpgeorgedpgeorge
committed
qemu: Rename qemu-arm port to qemu.
Because this port now supports multiple architectures. Signed-off-by: Damien George <damien@micropython.org>
1 parent 3ea1ce6 commit 6591138

39 files changed

Lines changed: 23 additions & 27 deletions

.github/workflows/ports_qemu-arm.yml renamed to .github/workflows/ports_qemu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: qemu-arm port
1+
name: qemu port
22

33
on:
44
push:
@@ -11,7 +11,7 @@ on:
1111
- 'shared/**'
1212
- 'lib/**'
1313
- 'drivers/**'
14-
- 'ports/qemu-arm/**'
14+
- 'ports/qemu/**'
1515
- 'tests/**'
1616

1717
concurrency:

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ In addition, the following ports are provided in this repository:
114114
- [nrf](ports/nrf) -- Nordic Semiconductor nRF51 and nRF52.
115115
- [pic16bit](ports/pic16bit) -- Microchip PIC 16-bit.
116116
- [powerpc](ports/powerpc) -- IBM PowerPC (including Microwatt)
117-
- [qemu-arm](ports/qemu-arm) -- QEMU-based Arm emulated target (for testing)
117+
- [qemu](ports/qemu) -- QEMU-based emulated target (for testing)
118118
- [renesas-ra](ports/renesas-ra) -- Renesas RA family.
119119
- [rp2](ports/rp2) -- Raspberry Pi RP2040 (including Pico and Pico W).
120120
- [samd](ports/samd) -- Microchip (formerly Atmel) SAMD21 and SAMD51.

ports/qemu-arm/Makefile renamed to ports/qemu/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ run: $(BUILD)/firmware.elf
166166
.PHONY: test
167167
test: $(BUILD)/firmware.elf
168168
$(eval DIRNAME=ports/$(notdir $(CURDIR)))
169-
cd $(TOP)/tests && ./run-tests.py --target qemu-arm --device execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_TESTS_ARGS) $(RUN_TESTS_EXTRA)
169+
cd $(TOP)/tests && ./run-tests.py --target qemu --device execpty:"$(QEMU_SYSTEM) $(QEMU_ARGS) -serial pty -kernel ../$(DIRNAME)/$<" $(RUN_TESTS_ARGS) $(RUN_TESTS_EXTRA)
170170

171171
$(BUILD)/firmware.elf: $(LDSCRIPT) $(OBJ)
172172
$(Q)$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)

ports/qemu-arm/README.md renamed to ports/qemu/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
MicroPython port to qemu-arm
2-
============================
1+
MicroPython port to qemu
2+
========================
33

44
This is experimental, community-supported port for Cortex-M and RISC-V RV32IMC
55
emulation as provided by QEMU (http://qemu.org).
@@ -95,7 +95,7 @@ Or manually by first starting the emulation with `make run` and then running the
9595
tests against the serial device, for example:
9696

9797
$ cd ../../tests
98-
$ ./run-tests.py --target qemu-arm --device /dev/pts/1
98+
$ ./run-tests.py --target qemu --device /dev/pts/1
9999

100100
Extra make options
101101
------------------

ports/qemu-arm/boards/MICROBIT.mk renamed to ports/qemu/boards/MICROBIT.mk

File renamed without changes.

ports/qemu-arm/boards/MPS2_AN385.mk renamed to ports/qemu/boards/MPS2_AN385.mk

File renamed without changes.

ports/qemu-arm/boards/NETDUINO2.mk renamed to ports/qemu/boards/NETDUINO2.mk

File renamed without changes.

ports/qemu-arm/boards/SABRELITE.mk renamed to ports/qemu/boards/SABRELITE.mk

File renamed without changes.

ports/qemu-arm/boards/VIRT_RV32.mk renamed to ports/qemu/boards/VIRT_RV32.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ SRC_BOARD_O += shared/runtime/gchelper_native.o shared/runtime/gchelper_rv32i.o
1111
MPY_CROSS_FLAGS += -march=rv32imc
1212

1313
# These Thumb tests don't run on RV32, so exclude them.
14-
RUN_TESTS_ARGS = --exclude 'inlineasm|qemu-arm/asm_test'
14+
RUN_TESTS_ARGS = --exclude 'inlineasm|qemu/asm_test'

ports/qemu-arm/main.c renamed to ports/qemu/main.c

File renamed without changes.

0 commit comments

Comments
 (0)