* [PATCH v6 0/8] m68k: Add support for QEMU virt machine
@ 2026-01-07 20:18 Kuan-Wei Chiu
2026-01-07 20:18 ` [PATCH v6 1/8] serial: Add Goldfish TTY driver Kuan-Wei Chiu
` (8 more replies)
0 siblings, 9 replies; 16+ messages in thread
From: Kuan-Wei Chiu @ 2026-01-07 20:18 UTC (permalink / raw)
To: alison.wang, angelo, trini
Cc: me, daniel, heinrich.schuchardt, sjg, jserv, eleanor15x, u-boot,
Kuan-Wei Chiu
Add support for the QEMU 'virt' machine on the m68k architecture. The
QEMU virt machine models a generic system utilizing Goldfish virtual
peripherals and is capable of emulating various classic 68k CPUs.
Currently, U-Boot's m68k architecture support focuses on ColdFire
variants. This series expands support to include the classic M680x0
architecture, implementing the necessary exception vectors, startup
code, and a bootinfo parser compatible with the QEMU interface.
Drivers for Goldfish peripherals (TTY, Timer, RTC) and the QEMU
Virtual System Controller (sysreset) are also added to enable serial
console, timekeeping, and system reset functionality.
The implementation has been verified on QEMU targeting the M68040 CPU,
confirming successful hardware initialization and boot to the U-Boot
command shell. Additionally, the CI configuration was verified locally
using gitlab-ci-local "qemu_m68k_virt test.py", resulting in
PASS qemu_m68k_virt test.py.
---
Changes in v6:
- Refactor Goldfish drivers (TTY, Timer, RTC) to strictly separate
of_to_plat (parsing) and probe (mapping), supporting both device tree
and explicit platform data.
- Introduce a new sysreset driver for the QEMU virtual system controller,
replacing the previous board-file implementation.
- Refactor m68k Kconfig/Makefile to use a hidden CONFIG_ARCH_COLDFIRE
symbol for cleaner file grouping.
- Improve board initialization: move bootinfo parsing to board_early_init_f
and remove all hardcoded MMIO addresses.
- Update MAINTAINERS to reflect the removal of inactive maintainers.
Changes in v5:
- Rebase on u-boot/next branch.
- Add 'imply CMD_DM' to TARGET_QEMU_M68K in Kconfig.
- Add a new patch to update the M68K entry in MAINTAINERS and add myself
as a co-maintainer.
Changes in v4:
- Support DT probing with platform data as a fallback. (serial & timer)
- Fix sandbox build warnings by removing incorrect type casting.
- Add comment explaining read latching behavior in the timer driver.
- Sort headers alphabetically in the timer driver.
Changes in v3:
- Add Goldfish timer driver.
- Update Goldfish RTC driver to support non-DT probing.
- Enable Goldfish RTC and Timer support in board configuration.
- Add safety loop limit to bootinfo parsing in dram_init.
- Remove dummy timer functions from architecture code.
- Remove unnecessary type casts in Goldfish TTY driver.
- Remove TEST_PY_ID from CI job definitions.
- Update documentation to include new RTC support.
Changes in v2:
- Refactor Goldfish TTY driver to use priv data for the RX buffer and
ensure single-byte reads.
- Rename arch/m68k/cpu/m68040 to arch/m68k/cpu/m680x0 to separate the
architecture family from the specific CPU model.
- Introduce M680x0 Kconfig symbol and separate MAINTAINERS entries for
the architecture and the board.
- Regenerate qemu-m68k_defconfig using make savedefconfig and add the
board to the documentation index.
- Add a new patch to enable CI testing on GitLab and Azure Pipelines.
- Update SPDX identifiers to GPL-2.0-or-later.
- Sort headers alphabetically.
- Fix tabs vs spaces.
v5: https://lore.kernel.org/u-boot/20260105165221.1816070-1-visitorckw@gmail.com/
v4: https://lore.kernel.org/u-boot/20260101175420.4118024-1-visitorckw@gmail.com/
v3: https://lore.kernel.org/u-boot/20251230160112.3045527-1-visitorckw@gmail.com/
v2: https://lore.kernel.org/u-boot/20251226175400.1154417-1-visitorckw@gmail.com/
v1: https://lore.kernel.org/u-boot/20251218185252.957388-1-visitorckw@gmail.com/
Kuan-Wei Chiu (8):
serial: Add Goldfish TTY driver
timer: Add Goldfish timer driver
rtc: goldfish: Support platform data for non-DT probing
sysreset: Add QEMU virtual system controller driver
m68k: Add support for M68040 CPU
board: Add QEMU m68k virt board support
CI: Add test jobs for QEMU m68k virt machine
MAINTAINERS: Update m68k entry
.azure-pipelines.yml | 3 +
.gitlab-ci.yml | 6 ++
MAINTAINERS | 28 ++++-
arch/m68k/Kconfig | 39 +++++++
arch/m68k/Makefile | 1 +
arch/m68k/config.mk | 10 +-
arch/m68k/cpu/m680x0/Makefile | 6 ++
arch/m68k/cpu/m680x0/cpu.c | 73 +++++++++++++
arch/m68k/cpu/m680x0/start.S | 73 +++++++++++++
arch/m68k/cpu/m680x0/u-boot.lds | 47 +++++++++
arch/m68k/include/asm/bootinfo.h | 39 +++++++
arch/m68k/lib/Makefile | 7 +-
board/emulation/qemu-m68k/Kconfig | 12 +++
board/emulation/qemu-m68k/MAINTAINERS | 8 ++
board/emulation/qemu-m68k/Makefile | 5 +
board/emulation/qemu-m68k/qemu-m68k.c | 117 +++++++++++++++++++++
configs/qemu-m68k_defconfig | 20 ++++
doc/board/emulation/index.rst | 1 +
doc/board/emulation/qemu-m68k.rst | 39 +++++++
drivers/rtc/goldfish_rtc.c | 23 +++-
drivers/serial/Kconfig | 8 ++
drivers/serial/Makefile | 1 +
drivers/serial/serial_goldfish.c | 117 +++++++++++++++++++++
drivers/sysreset/Kconfig | 8 ++
drivers/sysreset/Makefile | 1 +
drivers/sysreset/sysreset_qemu_virt_ctrl.c | 55 ++++++++++
drivers/timer/Kconfig | 8 ++
drivers/timer/Makefile | 1 +
drivers/timer/goldfish_timer.c | 89 ++++++++++++++++
include/configs/qemu-m68k.h | 18 ++++
include/goldfish_rtc.h | 15 +++
include/goldfish_timer.h | 13 +++
include/goldfish_tty.h | 18 ++++
include/qemu_virt_ctrl.h | 13 +++
34 files changed, 908 insertions(+), 14 deletions(-)
create mode 100644 arch/m68k/cpu/m680x0/Makefile
create mode 100644 arch/m68k/cpu/m680x0/cpu.c
create mode 100644 arch/m68k/cpu/m680x0/start.S
create mode 100644 arch/m68k/cpu/m680x0/u-boot.lds
create mode 100644 arch/m68k/include/asm/bootinfo.h
create mode 100644 board/emulation/qemu-m68k/Kconfig
create mode 100644 board/emulation/qemu-m68k/MAINTAINERS
create mode 100644 board/emulation/qemu-m68k/Makefile
create mode 100644 board/emulation/qemu-m68k/qemu-m68k.c
create mode 100644 configs/qemu-m68k_defconfig
create mode 100644 doc/board/emulation/qemu-m68k.rst
create mode 100644 drivers/serial/serial_goldfish.c
create mode 100644 drivers/sysreset/sysreset_qemu_virt_ctrl.c
create mode 100644 drivers/timer/goldfish_timer.c
create mode 100644 include/configs/qemu-m68k.h
create mode 100644 include/goldfish_rtc.h
create mode 100644 include/goldfish_timer.h
create mode 100644 include/goldfish_tty.h
create mode 100644 include/qemu_virt_ctrl.h
--
2.52.0.457.g6b5491de43-goog
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v6 1/8] serial: Add Goldfish TTY driver
2026-01-07 20:18 [PATCH v6 0/8] m68k: Add support for QEMU virt machine Kuan-Wei Chiu
@ 2026-01-07 20:18 ` Kuan-Wei Chiu
2026-01-07 20:18 ` [PATCH v6 2/8] timer: Add Goldfish timer driver Kuan-Wei Chiu
` (7 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Kuan-Wei Chiu @ 2026-01-07 20:18 UTC (permalink / raw)
To: alison.wang, angelo, trini
Cc: me, daniel, heinrich.schuchardt, sjg, jserv, eleanor15x, u-boot,
Kuan-Wei Chiu, Simon Glass
Add support for the Google Goldfish TTY serial device. This virtual
device is commonly used in QEMU virtual machines (such as the m68k
virt machine) and Android emulators.
The driver implements basic console output and input polling using the
Goldfish MMIO interface.
Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
Reviewed-by: Yao Zi <me@ziyao.cc>
Tested-by: Daniel Palmer <daniel@0x0f.com>
Acked-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Simon Glass <simon.glass@canonical.com>
Acked-by: Angelo Dureghello <angelo@kernel-space.org>
---
Changes in v6:
- Refactor driver to separate device tree reading into .of_to_plat.
- Rename platform data member from 'base' to 'reg' (phys_addr_t).
- Update header includes to follow U-Boot coding style.
MAINTAINERS | 6 ++
drivers/serial/Kconfig | 8 +++
drivers/serial/Makefile | 1 +
drivers/serial/serial_goldfish.c | 117 +++++++++++++++++++++++++++++++
include/goldfish_tty.h | 18 +++++
5 files changed, 150 insertions(+)
create mode 100644 drivers/serial/serial_goldfish.c
create mode 100644 include/goldfish_tty.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 27ce73d83f4..8f884ff495a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1260,6 +1260,12 @@ S: Maintained
F: drivers/misc/gsc.c
F: include/gsc.h
+GOLDFISH SERIAL DRIVER
+M: Kuan-Wei Chiu <visitorckw@gmail.com>
+S: Maintained
+F: drivers/serial/serial_goldfish.c
+F: include/goldfish_tty.h
+
INTERCONNECT:
M: Neil Armstrong <neil.armstrong@linaro.org>
S: Maintained
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 371d7aa5bba..b84cb9ec781 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1193,4 +1193,12 @@ config SYS_SDMR
depends on MPC8XX_CONS
default 0x0
+config SERIAL_GOLDFISH
+ bool "Goldfish TTY support"
+ depends on DM_SERIAL
+ help
+ Select this to enable support for the Goldfish TTY serial port.
+ This virtual device is commonly used by QEMU virtual machines
+ (e.g. m68k virt) for console output.
+
endif
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 8eaae62b0fc..fe8d23be512 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -63,3 +63,4 @@ obj-$(CONFIG_XTENSA_SEMIHOSTING_SERIAL) += serial_xtensa_semihosting.o
obj-$(CONFIG_S5P4418_PL011_SERIAL) += serial_s5p4418_pl011.o
obj-$(CONFIG_UART4_SERIAL) += serial_adi_uart4.o
+obj-$(CONFIG_SERIAL_GOLDFISH) += serial_goldfish.o
diff --git a/drivers/serial/serial_goldfish.c b/drivers/serial/serial_goldfish.c
new file mode 100644
index 00000000000..4ac2cfb6231
--- /dev/null
+++ b/drivers/serial/serial_goldfish.c
@@ -0,0 +1,117 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+ * Goldfish TTY driver for U-Boot
+ */
+
+#include <dm.h>
+#include <goldfish_tty.h>
+#include <mapmem.h>
+#include <serial.h>
+#include <asm/io.h>
+#include <linux/types.h>
+
+/* Goldfish TTY Register Offsets */
+#define GOLDFISH_TTY_PUT_CHAR 0x00
+#define GOLDFISH_TTY_BYTES_READY 0x04
+#define GOLDFISH_TTY_CMD 0x08
+#define GOLDFISH_TTY_DATA_PTR 0x10
+#define GOLDFISH_TTY_DATA_LEN 0x14
+#define GOLDFISH_TTY_DATA_PTR_HIGH 0x18
+#define GOLDFISH_TTY_VERSION 0x20
+
+/* Commands */
+#define CMD_WRITE_BUFFER 2
+#define CMD_READ_BUFFER 3
+
+struct goldfish_tty_priv {
+ void __iomem *base;
+ u8 rx_buf;
+};
+
+static int goldfish_serial_getc(struct udevice *dev)
+{
+ struct goldfish_tty_priv *priv = dev_get_priv(dev);
+ unsigned long paddr;
+ u32 count;
+
+ count = __raw_readl(priv->base + GOLDFISH_TTY_BYTES_READY);
+ if (count == 0)
+ return -EAGAIN;
+
+ paddr = virt_to_phys((void *)&priv->rx_buf);
+
+ __raw_writel(0, priv->base + GOLDFISH_TTY_DATA_PTR_HIGH);
+ __raw_writel(paddr, priv->base + GOLDFISH_TTY_DATA_PTR);
+ __raw_writel(1, priv->base + GOLDFISH_TTY_DATA_LEN);
+ __raw_writel(CMD_READ_BUFFER, priv->base + GOLDFISH_TTY_CMD);
+
+ return priv->rx_buf;
+}
+
+static int goldfish_serial_putc(struct udevice *dev, const char ch)
+{
+ struct goldfish_tty_priv *priv = dev_get_priv(dev);
+
+ __raw_writel(ch, priv->base + GOLDFISH_TTY_PUT_CHAR);
+
+ return 0;
+}
+
+static int goldfish_serial_pending(struct udevice *dev, bool input)
+{
+ struct goldfish_tty_priv *priv = dev_get_priv(dev);
+
+ if (input)
+ return __raw_readl(priv->base + GOLDFISH_TTY_BYTES_READY);
+
+ return 0;
+}
+
+static int goldfish_serial_of_to_plat(struct udevice *dev)
+{
+ struct goldfish_tty_plat *plat = dev_get_plat(dev);
+ fdt_addr_t addr;
+
+ addr = dev_read_addr(dev);
+ if (addr != FDT_ADDR_T_NONE)
+ plat->reg = addr;
+
+ return 0;
+}
+
+static int goldfish_serial_probe(struct udevice *dev)
+{
+ struct goldfish_tty_plat *plat = dev_get_plat(dev);
+ struct goldfish_tty_priv *priv = dev_get_priv(dev);
+
+ if (!plat->reg)
+ return -EINVAL;
+
+ priv->base = map_sysmem(plat->reg, 0x1000);
+
+ return 0;
+}
+
+static const struct dm_serial_ops goldfish_serial_ops = {
+ .putc = goldfish_serial_putc,
+ .pending = goldfish_serial_pending,
+ .getc = goldfish_serial_getc,
+};
+
+static const struct udevice_id goldfish_serial_ids[] = {
+ { .compatible = "google,goldfish-tty" },
+ { }
+};
+
+U_BOOT_DRIVER(serial_goldfish) = {
+ .name = "serial_goldfish",
+ .id = UCLASS_SERIAL,
+ .of_match = goldfish_serial_ids,
+ .of_to_plat = goldfish_serial_of_to_plat,
+ .plat_auto = sizeof(struct goldfish_tty_plat),
+ .probe = goldfish_serial_probe,
+ .ops = &goldfish_serial_ops,
+ .priv_auto = sizeof(struct goldfish_tty_priv),
+ .flags = DM_FLAG_PRE_RELOC,
+};
diff --git a/include/goldfish_tty.h b/include/goldfish_tty.h
new file mode 100644
index 00000000000..db49c8d6344
--- /dev/null
+++ b/include/goldfish_tty.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+ */
+
+#ifndef _GOLDFISH_TTY_H_
+#define _GOLDFISH_TTY_H_
+
+#include <linux/types.h>
+
+/* Platform data for the Goldfish TTY driver
+ * Used to pass hardware base address from Board to Driver
+ */
+struct goldfish_tty_plat {
+ phys_addr_t reg;
+};
+
+#endif /* _GOLDFISH_TTY_H_ */
--
2.52.0.457.g6b5491de43-goog
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v6 2/8] timer: Add Goldfish timer driver
2026-01-07 20:18 [PATCH v6 0/8] m68k: Add support for QEMU virt machine Kuan-Wei Chiu
2026-01-07 20:18 ` [PATCH v6 1/8] serial: Add Goldfish TTY driver Kuan-Wei Chiu
@ 2026-01-07 20:18 ` Kuan-Wei Chiu
2026-01-07 20:18 ` [PATCH v6 3/8] rtc: goldfish: Support platform data for non-DT probing Kuan-Wei Chiu
` (6 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Kuan-Wei Chiu @ 2026-01-07 20:18 UTC (permalink / raw)
To: alison.wang, angelo, trini
Cc: me, daniel, heinrich.schuchardt, sjg, jserv, eleanor15x, u-boot,
Kuan-Wei Chiu, Simon Glass
Add support for the Goldfish timer driver. This driver utilizes the
Goldfish RTC hardware to provide a nanosecond-resolution timer. This
virtual device is commonly found in QEMU virtual machines (such as the
m68k virt machine) and Android emulators.
The driver implements the standard U-Boot timer UCLASS interface,
exposing a 64-bit monotonically increasing counter with a 1GHz clock
rate derived from the RTC registers.
Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
Tested-by: Daniel Palmer <daniel@0x0f.com>
Reviewed-by: Yao Zi <me@ziyao.cc>
Reviewed-by: Simon Glass <simon.glass@canonical.com>
Reviewed-by: Angelo Dureghello <angelo@kernel-space.org>
---
Changes in v6:
- Refactor driver to separate device tree reading into .of_to_plat.
- Rename platform data member from 'base' to 'reg' (phys_addr_t).
- Update header includes to follow U-Boot coding style.
MAINTAINERS | 6 +++
drivers/timer/Kconfig | 8 +++
drivers/timer/Makefile | 1 +
drivers/timer/goldfish_timer.c | 89 ++++++++++++++++++++++++++++++++++
include/goldfish_timer.h | 13 +++++
5 files changed, 117 insertions(+)
create mode 100644 drivers/timer/goldfish_timer.c
create mode 100644 include/goldfish_timer.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 8f884ff495a..efecb213be7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1266,6 +1266,12 @@ S: Maintained
F: drivers/serial/serial_goldfish.c
F: include/goldfish_tty.h
+GOLDFISH TIMER DRIVER
+M: Kuan-Wei Chiu <visitorckw@gmail.com>
+S: Maintained
+F: drivers/timer/goldfish_timer.c
+F: include/goldfish_timer.h
+
INTERCONNECT:
M: Neil Armstrong <neil.armstrong@linaro.org>
S: Maintained
diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
index f9511503b02..a84a0dc0539 100644
--- a/drivers/timer/Kconfig
+++ b/drivers/timer/Kconfig
@@ -340,4 +340,12 @@ config STARFIVE_TIMER
Select this to enable support for the timer found on
Starfive SoC.
+config GOLDFISH_TIMER
+ bool "Goldfish Timer support"
+ depends on TIMER
+ help
+ Select this to enable support for the Goldfish Timer.
+ It uses the Goldfish RTC hardware to provide a nanosecond-resolution
+ timer, commonly found in QEMU virt machines.
+
endmenu
diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile
index a72e411fb2f..d8b3f2b65d4 100644
--- a/drivers/timer/Makefile
+++ b/drivers/timer/Makefile
@@ -36,3 +36,4 @@ obj-$(CONFIG_MCHP_PIT64B_TIMER) += mchp-pit64b-timer.o
obj-$(CONFIG_IMX_GPT_TIMER) += imx-gpt-timer.o
obj-$(CONFIG_XILINX_TIMER) += xilinx-timer.o
obj-$(CONFIG_STARFIVE_TIMER) += starfive-timer.o
+obj-$(CONFIG_GOLDFISH_TIMER) += goldfish_timer.o
diff --git a/drivers/timer/goldfish_timer.c b/drivers/timer/goldfish_timer.c
new file mode 100644
index 00000000000..70673bbd93c
--- /dev/null
+++ b/drivers/timer/goldfish_timer.c
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+ *
+ * Goldfish Timer driver
+ */
+
+#include <dm.h>
+#include <goldfish_timer.h>
+#include <mapmem.h>
+#include <timer.h>
+#include <asm/io.h>
+#include <linux/errno.h>
+
+struct goldfish_timer_priv {
+ void __iomem *base;
+};
+
+/* Goldfish RTC registers used as Timer */
+#define TIMER_TIME_LOW 0x00
+#define TIMER_TIME_HIGH 0x04
+
+static u64 goldfish_timer_get_count(struct udevice *dev)
+{
+ struct goldfish_timer_priv *priv = dev_get_priv(dev);
+ u32 low, high;
+ u64 time;
+
+ /*
+ * TIMER_TIME_HIGH is only updated when TIMER_TIME_LOW is read.
+ * We must read LOW before HIGH to latch the high 32-bit value
+ * and ensure a consistent 64-bit timestamp.
+ */
+ low = readl(priv->base + TIMER_TIME_LOW);
+ high = readl(priv->base + TIMER_TIME_HIGH);
+
+ time = ((u64)high << 32) | low;
+
+ return time;
+}
+
+static int goldfish_timer_of_to_plat(struct udevice *dev)
+{
+ struct goldfish_timer_plat *plat = dev_get_plat(dev);
+ fdt_addr_t addr;
+
+ addr = dev_read_addr(dev);
+ if (addr != FDT_ADDR_T_NONE)
+ plat->reg = addr;
+
+ return 0;
+}
+
+static int goldfish_timer_probe(struct udevice *dev)
+{
+ struct goldfish_timer_plat *plat = dev_get_plat(dev);
+ struct goldfish_timer_priv *priv = dev_get_priv(dev);
+ struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
+
+ if (!plat->reg)
+ return -EINVAL;
+
+ priv->base = map_sysmem(plat->reg, 0x20);
+
+ /* Goldfish RTC counts in nanoseconds, so the rate is 1GHz */
+ uc_priv->clock_rate = 1000000000;
+
+ return 0;
+}
+
+static const struct timer_ops goldfish_timer_ops = {
+ .get_count = goldfish_timer_get_count,
+};
+
+static const struct udevice_id goldfish_timer_ids[] = {
+ { .compatible = "google,goldfish-rtc" },
+ { }
+};
+
+U_BOOT_DRIVER(goldfish_timer) = {
+ .name = "goldfish_timer",
+ .id = UCLASS_TIMER,
+ .of_match = goldfish_timer_ids,
+ .of_to_plat = goldfish_timer_of_to_plat,
+ .plat_auto = sizeof(struct goldfish_timer_plat),
+ .ops = &goldfish_timer_ops,
+ .probe = goldfish_timer_probe,
+ .priv_auto = sizeof(struct goldfish_timer_priv),
+};
diff --git a/include/goldfish_timer.h b/include/goldfish_timer.h
new file mode 100644
index 00000000000..acd3e460c5a
--- /dev/null
+++ b/include/goldfish_timer.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+ */
+
+#ifndef _GOLDFISH_TIMER_H_
+#define _GOLDFISH_TIMER_H_
+
+struct goldfish_timer_plat {
+ phys_addr_t reg;
+};
+
+#endif /* _GOLDFISH_TIMER_H_ */
--
2.52.0.457.g6b5491de43-goog
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v6 3/8] rtc: goldfish: Support platform data for non-DT probing
2026-01-07 20:18 [PATCH v6 0/8] m68k: Add support for QEMU virt machine Kuan-Wei Chiu
2026-01-07 20:18 ` [PATCH v6 1/8] serial: Add Goldfish TTY driver Kuan-Wei Chiu
2026-01-07 20:18 ` [PATCH v6 2/8] timer: Add Goldfish timer driver Kuan-Wei Chiu
@ 2026-01-07 20:18 ` Kuan-Wei Chiu
2026-01-07 20:18 ` [PATCH v6 4/8] sysreset: Add QEMU virtual system controller driver Kuan-Wei Chiu
` (5 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Kuan-Wei Chiu @ 2026-01-07 20:18 UTC (permalink / raw)
To: alison.wang, angelo, trini
Cc: me, daniel, heinrich.schuchardt, sjg, jserv, eleanor15x, u-boot,
Kuan-Wei Chiu
Currently, the Goldfish RTC driver exclusively relies on device tree
to retrieve the base address, failing immediately if dev_read_addr()
returns FDT_ADDR_T_NONE. This restriction prevents the driver from
being used on platforms that instantiate devices via U_BOOT_DRVINFO()
instead of device tree, such as the QEMU m68k virt machine.
Add support for platform data to address this limitation. Introduce a
new .of_to_plat hook to handle device tree parsing and populate the
platform data. Update the probe function to rely exclusively on this
platform data, enabling support for both Device Tree and manual
instantiation.
Introduce a new header file include/goldfish_rtc.h to define the
platform data structure.
Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---
Changes in v6:
- Refactor driver to use .of_to_plat for DT parsing instead of fallback
logic in probe.
- Ensure platform data member is named 'reg' with phys_addr_t type.
- Update header includes to follow U-Boot coding style.
drivers/rtc/goldfish_rtc.c | 23 +++++++++++++++++++----
include/goldfish_rtc.h | 15 +++++++++++++++
2 files changed, 34 insertions(+), 4 deletions(-)
create mode 100644 include/goldfish_rtc.h
diff --git a/drivers/rtc/goldfish_rtc.c b/drivers/rtc/goldfish_rtc.c
index e63a2766c76..d2991ca6719 100644
--- a/drivers/rtc/goldfish_rtc.c
+++ b/drivers/rtc/goldfish_rtc.c
@@ -9,6 +9,7 @@
#include <div64.h>
#include <dm.h>
+#include <goldfish_rtc.h>
#include <mapmem.h>
#include <rtc.h>
#include <linux/io.h>
@@ -74,15 +75,27 @@ static int goldfish_rtc_set(struct udevice *dev, const struct rtc_time *time)
return 0;
}
-static int goldfish_rtc_probe(struct udevice *dev)
+static int goldfish_rtc_of_to_plat(struct udevice *dev)
{
- struct goldfish_rtc *priv = dev_get_priv(dev);
+ struct goldfish_rtc_plat *plat = dev_get_plat(dev);
fdt_addr_t addr;
addr = dev_read_addr(dev);
- if (addr == FDT_ADDR_T_NONE)
+ if (addr != FDT_ADDR_T_NONE)
+ plat->reg = addr;
+
+ return 0;
+}
+
+static int goldfish_rtc_probe(struct udevice *dev)
+{
+ struct goldfish_rtc_plat *plat = dev_get_plat(dev);
+ struct goldfish_rtc *priv = dev_get_priv(dev);
+
+ if (!plat->reg)
return -EINVAL;
- priv->base = map_sysmem(addr, 0x20);
+
+ priv->base = map_sysmem(plat->reg, 0x20);
return 0;
}
@@ -103,5 +116,7 @@ U_BOOT_DRIVER(rtc_goldfish) = {
.ops = &goldfish_rtc_ops,
.probe = goldfish_rtc_probe,
.of_match = goldfish_rtc_of_match,
+ .of_to_plat = goldfish_rtc_of_to_plat,
+ .plat_auto = sizeof(struct goldfish_rtc_plat),
.priv_auto = sizeof(struct goldfish_rtc),
};
diff --git a/include/goldfish_rtc.h b/include/goldfish_rtc.h
new file mode 100644
index 00000000000..f0e6ba3d543
--- /dev/null
+++ b/include/goldfish_rtc.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+ */
+
+#ifndef _GOLDFISH_RTC_H_
+#define _GOLDFISH_RTC_H_
+
+#include <linux/types.h>
+
+struct goldfish_rtc_plat {
+ phys_addr_t reg;
+};
+
+#endif /* _GOLDFISH_RTC_H_ */
--
2.52.0.457.g6b5491de43-goog
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v6 4/8] sysreset: Add QEMU virtual system controller driver
2026-01-07 20:18 [PATCH v6 0/8] m68k: Add support for QEMU virt machine Kuan-Wei Chiu
` (2 preceding siblings ...)
2026-01-07 20:18 ` [PATCH v6 3/8] rtc: goldfish: Support platform data for non-DT probing Kuan-Wei Chiu
@ 2026-01-07 20:18 ` Kuan-Wei Chiu
2026-01-09 11:31 ` Simon Glass
2026-01-30 11:23 ` Heinrich Schuchardt
2026-01-07 20:18 ` [PATCH v6 5/8] m68k: Add support for M68040 CPU Kuan-Wei Chiu
` (4 subsequent siblings)
8 siblings, 2 replies; 16+ messages in thread
From: Kuan-Wei Chiu @ 2026-01-07 20:18 UTC (permalink / raw)
To: alison.wang, angelo, trini
Cc: me, daniel, heinrich.schuchardt, sjg, jserv, eleanor15x, u-boot,
Kuan-Wei Chiu
Introduce a new sysreset driver for the QEMU Virtual System Controller.
This device is found on QEMU "virt" machines (such as the m68k virt
target) and provides a mechanism to trigger system reset and power-off
events.
The driver maps U-Boot sysreset types to the corresponding controller
commands:
- SYSRESET_WARM / SYSRESET_COLD -> VIRT_CTRL_CMD_RESET
- SYSRESET_POWER_OFF -> VIRT_CTRL_CMD_HALT
Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
---
Changes in v6:
- Introduce new driver to replace board-file reset implementation.
MAINTAINERS | 6 +++
drivers/sysreset/Kconfig | 8 ++++
drivers/sysreset/Makefile | 1 +
drivers/sysreset/sysreset_qemu_virt_ctrl.c | 55 ++++++++++++++++++++++
include/qemu_virt_ctrl.h | 13 +++++
5 files changed, 83 insertions(+)
create mode 100644 drivers/sysreset/sysreset_qemu_virt_ctrl.c
create mode 100644 include/qemu_virt_ctrl.h
diff --git a/MAINTAINERS b/MAINTAINERS
index efecb213be7..34081769ecd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1598,6 +1598,12 @@ S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-mpc85xx.git
F: arch/powerpc/cpu/mpc85xx/
+QEMU VIRTUAL SYSTEM CONTROLLER
+M: Kuan-Wei Chiu <visitorckw@gmail.com>
+S: Maintained
+F: drivers/sysreset/sysreset_qemu_virt_ctrl.c
+F: include/qemu_virt_ctrl.h
+
RAW NAND
M: Dario Binacchi <dario.binacchi@amarulasolutions.com>
M: Michael Trimarchi <michael@amarulasolutions.com>
diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig
index 0181f6cd581..120e7510f15 100644
--- a/drivers/sysreset/Kconfig
+++ b/drivers/sysreset/Kconfig
@@ -298,6 +298,14 @@ config SYSRESET_QCOM_PSHOLD
help
Add support for the system reboot on Qualcomm SoCs via PSHOLD.
+config SYSRESET_QEMU_VIRT_CTRL
+ bool "QEMU Virtual System Controller support"
+ depends on SYSRESET
+ help
+ Enable support for the QEMU Virtual System Controller.
+ This device is used in QEMU machines (e.g. m68k virt) to trigger
+ system reset and poweroff events.
+
endif
endmenu
diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile
index f5c78b25896..d18a5d52360 100644
--- a/drivers/sysreset/Makefile
+++ b/drivers/sysreset/Makefile
@@ -32,3 +32,4 @@ obj-$(CONFIG_$(PHASE_)SYSRESET_X86) += sysreset_x86.o
obj-$(CONFIG_SYSRESET_RAA215300) += sysreset_raa215300.o
obj-$(CONFIG_SYSRESET_QCOM_PSHOLD) += sysreset_qcom-pshold.o
obj-$(CONFIG_TARGET_XTFPGA) += sysreset_xtfpga.o
+obj-$(CONFIG_SYSRESET_QEMU_VIRT_CTRL) += sysreset_qemu_virt_ctrl.o
diff --git a/drivers/sysreset/sysreset_qemu_virt_ctrl.c b/drivers/sysreset/sysreset_qemu_virt_ctrl.c
new file mode 100644
index 00000000000..e7cacc9b6e9
--- /dev/null
+++ b/drivers/sysreset/sysreset_qemu_virt_ctrl.c
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+ *
+ * QEMU Virtual System Controller Driver
+ */
+
+#include <dm.h>
+#include <qemu_virt_ctrl.h>
+#include <sysreset.h>
+#include <asm/io.h>
+#include <linux/err.h>
+
+/* Register offsets */
+#define VIRT_CTRL_REG_FEATURES 0x00
+#define VIRT_CTRL_REG_CMD 0x04
+
+/* Commands */
+#define VIRT_CTRL_CMD_NOOP 0x00
+#define VIRT_CTRL_CMD_RESET 0x01
+#define VIRT_CTRL_CMD_HALT 0x02
+#define VIRT_CTRL_CMD_PANIC 0x03
+
+static int qemu_virt_ctrl_request(struct udevice *dev, enum sysreset_t type)
+{
+ struct qemu_virt_ctrl_plat *plat = dev_get_plat(dev);
+ u32 val;
+
+ switch (type) {
+ case SYSRESET_WARM:
+ case SYSRESET_COLD:
+ val = VIRT_CTRL_CMD_RESET;
+ break;
+ case SYSRESET_POWER_OFF:
+ val = VIRT_CTRL_CMD_HALT;
+ break;
+ default:
+ return -EPROTONOSUPPORT;
+ }
+
+ writel(val, plat->reg + VIRT_CTRL_REG_CMD);
+
+ return -EINPROGRESS;
+}
+
+static struct sysreset_ops qemu_virt_ctrl_ops = {
+ .request = qemu_virt_ctrl_request,
+};
+
+U_BOOT_DRIVER(sysreset_qemu_virt_ctrl) = {
+ .name = "sysreset_qemu_virt_ctrl",
+ .id = UCLASS_SYSRESET,
+ .ops = &qemu_virt_ctrl_ops,
+ .plat_auto = sizeof(struct qemu_virt_ctrl_plat),
+};
diff --git a/include/qemu_virt_ctrl.h b/include/qemu_virt_ctrl.h
new file mode 100644
index 00000000000..05aad82b767
--- /dev/null
+++ b/include/qemu_virt_ctrl.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+ */
+
+#ifndef _QEMU_VIRT_CTRL_H_
+#define _QEMU_VIRT_CTRL_H_
+
+struct qemu_virt_ctrl_plat {
+ phys_addr_t reg;
+};
+
+#endif /* _QEMU_VIRT_CTRL_H_ */
--
2.52.0.457.g6b5491de43-goog
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v6 5/8] m68k: Add support for M68040 CPU
2026-01-07 20:18 [PATCH v6 0/8] m68k: Add support for QEMU virt machine Kuan-Wei Chiu
` (3 preceding siblings ...)
2026-01-07 20:18 ` [PATCH v6 4/8] sysreset: Add QEMU virtual system controller driver Kuan-Wei Chiu
@ 2026-01-07 20:18 ` Kuan-Wei Chiu
2026-01-09 11:31 ` Simon Glass
2026-01-24 8:29 ` Angelo Dureghello
2026-01-07 20:18 ` [PATCH v6 6/8] board: Add QEMU m68k virt board support Kuan-Wei Chiu
` (3 subsequent siblings)
8 siblings, 2 replies; 16+ messages in thread
From: Kuan-Wei Chiu @ 2026-01-07 20:18 UTC (permalink / raw)
To: alison.wang, angelo, trini
Cc: me, daniel, heinrich.schuchardt, sjg, jserv, eleanor15x, u-boot,
Kuan-Wei Chiu
Add support for the Motorola 68040 architecture. Currently, m68k
support in U-Boot is primarily focused on ColdFire variants. Introduce
the necessary infrastructure to support the classic M680x0 series,
specifically targeting the M68040 as emulated by QEMU.
The implementation includes exception vectors, early startup code, and
minimal CPU initialization and relocation stubs. It also defines the
standard m68k boot information structure used for passing hardware
information to the operating system. To ensure compatibility, ColdFire-
specific library objects such as cache and interrupt handling are
excluded from the build when M68040 is selected.
Additionally, apply a specific workaround during the early memory
reservation stage. Use a manual loop to clear global data instead of
the standard memset() function, as utilizing memset() at this point was
observed to cause a hang on the QEMU platform.
Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
---
Changes in v6:
- Introduce hidden Kconfig symbol CONFIG_ARCH_COLDFIRE to group
ColdFire-specific files in Makefile, removing the need for
'ifndef CONFIG_M680x0'.
- Add help text for CONFIG_M680x0.
MAINTAINERS | 6 +++
arch/m68k/Kconfig | 30 +++++++++++++
arch/m68k/Makefile | 1 +
arch/m68k/config.mk | 10 ++++-
arch/m68k/cpu/m680x0/Makefile | 6 +++
arch/m68k/cpu/m680x0/cpu.c | 73 ++++++++++++++++++++++++++++++++
arch/m68k/cpu/m680x0/start.S | 73 ++++++++++++++++++++++++++++++++
arch/m68k/cpu/m680x0/u-boot.lds | 47 ++++++++++++++++++++
arch/m68k/include/asm/bootinfo.h | 39 +++++++++++++++++
arch/m68k/lib/Makefile | 7 +--
10 files changed, 284 insertions(+), 8 deletions(-)
create mode 100644 arch/m68k/cpu/m680x0/Makefile
create mode 100644 arch/m68k/cpu/m680x0/cpu.c
create mode 100644 arch/m68k/cpu/m680x0/start.S
create mode 100644 arch/m68k/cpu/m680x0/u-boot.lds
create mode 100644 arch/m68k/include/asm/bootinfo.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 34081769ecd..9fff8989684 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1324,6 +1324,12 @@ F: lib/getopt.c
F: test/log/
F: test/py/tests/test_log.py
+M680X0 ARCHITECTURE
+M: Kuan-Wei Chiu <visitorckw@gmail.com>
+S: Maintained
+F: arch/m68k/cpu/m680x0/
+F: arch/m68k/include/asm/bootinfo.h
+
MALI DISPLAY PROCESSORS
M: Liviu Dudau <liviu.dudau@foss.arm.com>
S: Supported
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 8ade6f7b9d1..f5c0dc037b4 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -12,50 +12,64 @@ config MCF520x
select OF_CONTROL
select DM
select DM_SERIAL
+ select ARCH_COLDFIRE
bool
config MCF52x2
select OF_CONTROL
select DM
select DM_SERIAL
+ select ARCH_COLDFIRE
bool
config MCF523x
select OF_CONTROL
select DM
select DM_SERIAL
+ select ARCH_COLDFIRE
bool
config MCF530x
select OF_CONTROL
select DM
select DM_SERIAL
+ select ARCH_COLDFIRE
bool
config MCF5301x
select OF_CONTROL
select DM
select DM_SERIAL
+ select ARCH_COLDFIRE
bool
config MCF532x
select OF_CONTROL
select DM
select DM_SERIAL
+ select ARCH_COLDFIRE
bool
config MCF537x
select OF_CONTROL
select DM
select DM_SERIAL
+ select ARCH_COLDFIRE
bool
config MCF5441x
select OF_CONTROL
select DM
select DM_SERIAL
+ select ARCH_COLDFIRE
bool
+config M680x0
+ bool
+ help
+ This enables support for the classic Motorola 68000 family of
+ processors.
+
# processor type
config M5208
bool
@@ -110,6 +124,10 @@ config M54418
bool
select MCF5441x
+config M68040
+ bool
+ select M680x0
+
# peripherals
config CF_DSPI
bool
@@ -178,6 +196,18 @@ config TARGET_STMARK2
endchoice
+config SYS_CPU
+ string
+ default "mcf52x2" if MCF52x2
+ default "mcf523x" if MCF523x
+ default "mcf530x" if MCF530x
+ default "mcf532x" if MCF532x
+ default "mcf5445x" if MCF5445x
+ default "m680x0" if M680x0
+
+config ARCH_COLDFIRE
+ bool
+
source "board/BuS/eb_cpu5282/Kconfig"
source "board/cobra5272/Kconfig"
source "board/freescale/m5208evbe/Kconfig"
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 4a7960bbeb4..bb57cf9ac63 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -17,6 +17,7 @@ cpuflags-$(CONFIG_M5307) := -mcpu=5307
cpuflags-$(CONFIG_MCF5301x) := -mcpu=53015 -fPIC
cpuflags-$(CONFIG_MCF532x) := -mcpu=5329 -fPIC
cpuflags-$(CONFIG_MCF5441x) := -mcpu=54418 -fPIC
+cpuflags-$(CONFIG_M68040) := -mcpu=68040 -fno-pic
PLATFORM_CPPFLAGS += $(cpuflags-y)
diff --git a/arch/m68k/config.mk b/arch/m68k/config.mk
index 643b7d1d35d..458953f9712 100644
--- a/arch/m68k/config.mk
+++ b/arch/m68k/config.mk
@@ -3,8 +3,14 @@
# (C) Copyright 2000-2002
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-PLATFORM_CPPFLAGS += -D__M68K__ -fPIC
+PLATFORM_CPPFLAGS += -D__M68K__
+ifneq ($(CONFIG_M680x0),y)
+PLATFORM_CPPFLAGS += -fPIC
+endif
KBUILD_LDFLAGS += -n -pie
PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
-PLATFORM_RELFLAGS += -ffixed-d7 -msep-data
+PLATFORM_RELFLAGS += -ffixed-d7
+ifneq ($(CONFIG_M680x0),y)
+PLATFORM_RELFLAGS += -msep-data
+endif
LDFLAGS_FINAL += --gc-sections -pie
diff --git a/arch/m68k/cpu/m680x0/Makefile b/arch/m68k/cpu/m680x0/Makefile
new file mode 100644
index 00000000000..f6e0c9a46c0
--- /dev/null
+++ b/arch/m68k/cpu/m680x0/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+
+extra-y += start.o
+obj-y += cpu.o
diff --git a/arch/m68k/cpu/m680x0/cpu.c b/arch/m68k/cpu/m680x0/cpu.c
new file mode 100644
index 00000000000..f60b932c7dd
--- /dev/null
+++ b/arch/m68k/cpu/m680x0/cpu.c
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * CPU specific code for m68040
+ *
+ * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+ */
+
+#include <config.h>
+#include <cpu_func.h>
+#include <init.h>
+#include <stdio.h>
+#include <asm/global_data.h>
+#include <linux/types.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+void m68k_virt_init_reserve(ulong base)
+{
+ struct global_data *gd_ptr = (struct global_data *)base;
+ char *p = (char *)gd_ptr;
+ unsigned int i;
+
+ /* FIXME: usage of memset() here caused a hang on QEMU m68k virt. */
+ for (i = 0; i < sizeof(*gd_ptr); i++)
+ p[i] = 0;
+
+ gd = gd_ptr;
+
+ gd->malloc_base = base + sizeof(*gd_ptr);
+}
+
+int print_cpuinfo(void)
+{
+ puts("CPU: M68040 (QEMU Virt)\n");
+
+ return 0;
+}
+
+int get_clocks(void)
+{
+ return 0;
+}
+
+int cpu_init_r(void)
+{
+ return 0;
+}
+
+/*
+ * Relocation Stub
+ * We skip actual relocation for this QEMU bring-up and jump directly
+ * to board_init_r.
+ */
+
+void relocate_code(ulong sp, struct global_data *new_gd, ulong relocaddr)
+{
+ board_init_r(new_gd, relocaddr);
+}
+
+/* Stubs for Standard Facilities (Cache, Interrupts) */
+
+int disable_interrupts(void) { return 0; }
+void enable_interrupts(void) { return; }
+int interrupt_init(void) { return 0; }
+
+void icache_enable(void) {}
+void icache_disable(void) {}
+int icache_status(void) { return 0; }
+void dcache_enable(void) {}
+void dcache_disable(void) {}
+int dcache_status(void) { return 0; }
+void flush_cache(unsigned long start, unsigned long size) {}
+void flush_dcache_range(unsigned long start, unsigned long stop) {}
diff --git a/arch/m68k/cpu/m680x0/start.S b/arch/m68k/cpu/m680x0/start.S
new file mode 100644
index 00000000000..0802ca1fca2
--- /dev/null
+++ b/arch/m68k/cpu/m680x0/start.S
@@ -0,0 +1,73 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Startup code for m68040
+ *
+ * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+ */
+
+#include <asm-offsets.h>
+#include <config.h>
+#include <linux/linkage.h>
+
+.section .text
+
+/*
+ * Vector Table
+ * m68k uses the first 1KB for the exception vector table.
+ */
+.balign 4
+.global _vectors
+_vectors:
+ .long CFG_SYS_INIT_SP_ADDR /* 0x00: Initial SP */
+ .long _start /* 0x04: Initial PC (Reset) */
+ .long _fault /* 0x08: Bus Error */
+ .long _fault /* 0x0C: Address Error */
+ .long _fault /* 0x10: Illegal Instruction */
+ .long _fault /* 0x14: Zero Divide */
+ .long _fault /* 0x18: CHK */
+ .long _fault /* 0x1C: TRAPV */
+ .long _fault /* 0x20: Privilege */
+ .long _fault /* 0x24: Trace */
+ .long _fault /* 0x28: Line 1010 */
+ .long _fault /* 0x2C: Line 1111 */
+ .fill 0x400 - (.-_vectors), 1, 0
+
+/*
+ * Entry Point
+ */
+ENTRY(_start)
+ /* Disable Interrupts */
+ move.w #0x2700, %sr
+
+ /* Setup initial stack pointer */
+ move.l #CFG_SYS_INIT_SP_ADDR, %sp
+
+ /*
+ * Allocate Global Data (GD)
+ * board_init_f_alloc_reserve(top) returns the new top of stack in %d0
+ */
+ move.l %sp, -(%sp)
+ bsr.l board_init_f_alloc_reserve
+ addq.l #4, %sp
+
+ /* Update Stack Pointer and set GD register */
+ move.l %d0, %sp
+ move.l %d0, %d7 /* %d7 is the gd register */
+
+ /* Initialize Reserved Memory. */
+ move.l %d0, -(%sp)
+ bsr.l m68k_virt_init_reserve
+ addq.l #4, %sp
+
+ /* Enter board_init_f(0) */
+ clr.l -(%sp)
+ bsr.l board_init_f
+ addq.l #4, %sp
+
+ /* Should not return */
+hang:
+ bra.s hang
+ENDPROC(_start)
+
+_fault:
+ bra.s _fault
diff --git a/arch/m68k/cpu/m680x0/u-boot.lds b/arch/m68k/cpu/m680x0/u-boot.lds
new file mode 100644
index 00000000000..ae102c32833
--- /dev/null
+++ b/arch/m68k/cpu/m680x0/u-boot.lds
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Linker Script for m68040
+ *
+ * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+ */
+
+OUTPUT_ARCH(m68k)
+ENTRY(_start)
+
+SECTIONS
+{
+ . = 0x00000000;
+ __text_start = .;
+
+ .text :
+ {
+ arch/m68k/cpu/m680x0/start.o (.text*)
+ *(.text*)
+ }
+
+ . = ALIGN(16);
+ .rodata : { *(.rodata*) }
+
+ . = ALIGN(16);
+ .data : { *(.data*) }
+
+ . = ALIGN(4);
+ .u_boot_list : {
+ KEEP(*(SORT(*u_boot_list*)));
+ }
+
+ . = ALIGN(4);
+ __image_copy_end = .;
+ __init_end = .;
+
+ . = ALIGN(16);
+ __bss_start = .;
+ .bss :
+ {
+ *(.bss*)
+ . = ALIGN(16);
+ }
+ __bss_end = .;
+
+ _end = .;
+}
diff --git a/arch/m68k/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo.h
new file mode 100644
index 00000000000..6d7bde3b833
--- /dev/null
+++ b/arch/m68k/include/asm/bootinfo.h
@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+ *
+ * Definitions for the m68k bootinfo interface.
+ */
+
+#ifndef _ASM_M68K_BOOTINFO_H
+#define _ASM_M68K_BOOTINFO_H
+
+#ifndef __ASSEMBLY__
+
+struct bi_record {
+ unsigned short tag; /* tag ID */
+ unsigned short size; /* size of record (in bytes) */
+ unsigned long data[0]; /* data */
+};
+
+#endif /* __ASSEMBLY__ */
+
+/* Bootinfo Tag IDs */
+#define BI_LAST 0x0000
+#define BI_MACHTYPE 0x0001
+#define BI_CPUTYPE 0x0002
+#define BI_FPUTYPE 0x0003
+#define BI_MMUTYPE 0x0004
+#define BI_MEMCHUNK 0x0005
+#define BI_RAMDISK 0x0006
+#define BI_COMMAND_LINE 0x0007
+
+/* QEMU virt specific tags */
+#define BI_VIRT_QEMU_VERSION 0x8000
+#define BI_VIRT_GF_PIC_BASE 0x8001
+#define BI_VIRT_GF_RTC_BASE 0x8002
+#define BI_VIRT_GF_TTY_BASE 0x8003
+#define BI_VIRT_VIRTIO_BASE 0x8004
+#define BI_VIRT_CTRL_BASE 0x8005
+
+#endif /* _ASM_M68K_BOOTINFO_H */
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile
index 6e1fd938f52..cf93715637a 100644
--- a/arch/m68k/lib/Makefile
+++ b/arch/m68k/lib/Makefile
@@ -7,10 +7,5 @@
## if the user asked for it
lib-$(CONFIG_USE_PRIVATE_LIBGCC) += lshrdi3.o muldi3.o ashldi3.o ashrdi3.o
-obj-y += bdinfo.o
obj-$(CONFIG_CMD_BOOTM) += bootm.o
-obj-y += cache.o
-obj-y += interrupts.o
-obj-y += time.o
-obj-y += traps.o
-obj-y += fec.o
+obj-$(CONFIG_ARCH_COLDFIRE) += cache.o interrupts.o time.o traps.o bdinfo.o fec.o
--
2.52.0.457.g6b5491de43-goog
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v6 6/8] board: Add QEMU m68k virt board support
2026-01-07 20:18 [PATCH v6 0/8] m68k: Add support for QEMU virt machine Kuan-Wei Chiu
` (4 preceding siblings ...)
2026-01-07 20:18 ` [PATCH v6 5/8] m68k: Add support for M68040 CPU Kuan-Wei Chiu
@ 2026-01-07 20:18 ` Kuan-Wei Chiu
2026-01-09 11:31 ` Simon Glass
2026-01-07 20:18 ` [PATCH v6 7/8] CI: Add test jobs for QEMU m68k virt machine Kuan-Wei Chiu
` (2 subsequent siblings)
8 siblings, 1 reply; 16+ messages in thread
From: Kuan-Wei Chiu @ 2026-01-07 20:18 UTC (permalink / raw)
To: alison.wang, angelo, trini
Cc: me, daniel, heinrich.schuchardt, sjg, jserv, eleanor15x, u-boot,
Kuan-Wei Chiu
Add support for the QEMU 'virt' machine on the m68k architecture. This
board emulates a generic machine based on the Motorola 68040 CPU
equipped with Goldfish virtual peripherals.
Introduce the necessary board configuration and initialization
infrastructure. The implementation includes logic to parse the QEMU
bootinfo interface, enabling dynamic detection of system RAM size to
adapt to the virtual machine's configuration.
Enable the Goldfish TTY driver for serial console output. Additionally,
enable Goldfish RTC and timer drivers to support real-time clock
functionality and nanosecond-resolution delays. Include comprehensive
documentation covering build instructions and usage examples.
Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
Tested-by: Daniel Palmer <daniel@0x0f.com>
---
Changes in v6:
- Move bootinfo parsing logic to a helper function called in
board_early_init_f.
- Remove hardcoded MMIO address macros; use values parsed from
bootinfo.
- Use the new sysreset driver via U_BOOT_DRVINFO.
- Use SZ_16M macro for default RAM size.
- Update header include order to match coding style.
- Fix blank line formatting in checkboard().
arch/m68k/Kconfig | 9 ++
board/emulation/qemu-m68k/Kconfig | 12 +++
board/emulation/qemu-m68k/MAINTAINERS | 8 ++
board/emulation/qemu-m68k/Makefile | 5 ++
board/emulation/qemu-m68k/qemu-m68k.c | 117 ++++++++++++++++++++++++++
configs/qemu-m68k_defconfig | 20 +++++
doc/board/emulation/index.rst | 1 +
doc/board/emulation/qemu-m68k.rst | 39 +++++++++
include/configs/qemu-m68k.h | 18 ++++
9 files changed, 229 insertions(+)
create mode 100644 board/emulation/qemu-m68k/Kconfig
create mode 100644 board/emulation/qemu-m68k/MAINTAINERS
create mode 100644 board/emulation/qemu-m68k/Makefile
create mode 100644 board/emulation/qemu-m68k/qemu-m68k.c
create mode 100644 configs/qemu-m68k_defconfig
create mode 100644 doc/board/emulation/qemu-m68k.rst
create mode 100644 include/configs/qemu-m68k.h
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index f5c0dc037b4..774b119cb4b 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -194,6 +194,14 @@ config TARGET_STMARK2
select CF_DSPI
select M54418
+config TARGET_QEMU_M68K
+ bool "Support QEMU m68k virt"
+ select M68040
+ imply CMD_DM
+ help
+ This target supports the QEMU m68k virtual machine (-M virt).
+ It simulates a Motorola 68040 CPU with Goldfish peripherals.
+
endchoice
config SYS_CPU
@@ -222,6 +230,7 @@ source "board/freescale/m5329evb/Kconfig"
source "board/freescale/m5373evb/Kconfig"
source "board/sysam/amcore/Kconfig"
source "board/sysam/stmark2/Kconfig"
+source "board/emulation/qemu-m68k/Kconfig"
config M68K_QEMU
bool "Build with workarounds for incomplete QEMU emulation"
diff --git a/board/emulation/qemu-m68k/Kconfig b/board/emulation/qemu-m68k/Kconfig
new file mode 100644
index 00000000000..aae6dfe400f
--- /dev/null
+++ b/board/emulation/qemu-m68k/Kconfig
@@ -0,0 +1,12 @@
+if TARGET_QEMU_M68K
+
+config SYS_BOARD
+ default "qemu-m68k"
+
+config SYS_VENDOR
+ default "emulation"
+
+config SYS_CONFIG_NAME
+ default "qemu-m68k"
+
+endif
diff --git a/board/emulation/qemu-m68k/MAINTAINERS b/board/emulation/qemu-m68k/MAINTAINERS
new file mode 100644
index 00000000000..90414c58465
--- /dev/null
+++ b/board/emulation/qemu-m68k/MAINTAINERS
@@ -0,0 +1,8 @@
+QEMU M68K VIRT BOARD
+M: Kuan-Wei Chiu <visitorckw@gmail.com>
+S: Maintained
+F: board/emulation/qemu-m68k/
+F: board/emulation/common/
+F: include/configs/qemu-m68k.h
+F: configs/qemu-m68k_defconfig
+F: doc/board/emulation/qemu-m68k.rst
diff --git a/board/emulation/qemu-m68k/Makefile b/board/emulation/qemu-m68k/Makefile
new file mode 100644
index 00000000000..5cb2886ff5a
--- /dev/null
+++ b/board/emulation/qemu-m68k/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+
+obj-y += qemu-m68k.o
diff --git a/board/emulation/qemu-m68k/qemu-m68k.c b/board/emulation/qemu-m68k/qemu-m68k.c
new file mode 100644
index 00000000000..d3527aee112
--- /dev/null
+++ b/board/emulation/qemu-m68k/qemu-m68k.c
@@ -0,0 +1,117 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+ */
+
+#include <config.h>
+#include <goldfish_rtc.h>
+#include <goldfish_timer.h>
+#include <goldfish_tty.h>
+#include <init.h>
+#include <qemu_virt_ctrl.h>
+#include <serial.h>
+#include <asm-generic/sections.h>
+#include <asm/bootinfo.h>
+#include <asm/global_data.h>
+#include <asm/io.h>
+#include <dm/platdata.h>
+#include <linux/errno.h>
+#include <linux/sizes.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static struct goldfish_tty_plat serial_plat;
+static struct goldfish_rtc_plat rtc_plat;
+static struct goldfish_timer_plat timer_plat;
+static struct qemu_virt_ctrl_plat reset_plat;
+
+/*
+ * Theoretical limit derivation:
+ * Max Bootinfo Size (Standard Page) = 4096 bytes
+ * Min Record Size (Tag + Size) = 4 bytes
+ * Max Records = 4096 / 4 = 1024
+ */
+#define MAX_BOOTINFO_RECORDS 1024
+
+static void parse_bootinfo(void)
+{
+ struct bi_record *record;
+ ulong addr;
+ int loops = 0;
+
+ /* QEMU places bootinfo after _end, aligned to 2 bytes */
+ addr = (ulong)&_end;
+ addr = ALIGN(addr, 2);
+
+ record = (struct bi_record *)addr;
+
+ if (record->tag != BI_MACHTYPE)
+ return;
+
+ while (record->tag != BI_LAST) {
+ phys_addr_t base = record->data[0];
+
+ if (++loops > MAX_BOOTINFO_RECORDS)
+ panic("Bootinfo loop exceeded");
+
+ switch (record->tag) {
+ case BI_VIRT_GF_TTY_BASE:
+ serial_plat.reg = base;
+ break;
+ case BI_VIRT_GF_RTC_BASE:
+ rtc_plat.reg = base;
+ timer_plat.reg = base;
+ break;
+ case BI_VIRT_CTRL_BASE:
+ reset_plat.reg = base;
+ break;
+ case BI_MEMCHUNK:
+ gd->ram_size = record->data[1];
+ break;
+ }
+ record = (struct bi_record *)((ulong)record + record->size);
+ }
+}
+
+int board_early_init_f(void)
+{
+ parse_bootinfo();
+
+ return 0;
+}
+
+int checkboard(void)
+{
+ puts("Board: QEMU m68k virt\n");
+
+ return 0;
+}
+
+int dram_init(void)
+{
+ /* Default: 16MB */
+ if (!gd->ram_size)
+ gd->ram_size = SZ_16M;
+
+ return 0;
+}
+
+U_BOOT_DRVINFO(goldfish_rtc) = {
+ .name = "rtc_goldfish",
+ .plat = &rtc_plat,
+};
+
+U_BOOT_DRVINFO(goldfish_timer) = {
+ .name = "goldfish_timer",
+ .plat = &timer_plat,
+};
+
+U_BOOT_DRVINFO(goldfish_serial) = {
+ .name = "serial_goldfish",
+ .plat = &serial_plat,
+};
+
+U_BOOT_DRVINFO(sysreset_qemu_virt_ctrl) = {
+ .name = "sysreset_qemu_virt_ctrl",
+ .plat = &reset_plat,
+};
diff --git a/configs/qemu-m68k_defconfig b/configs/qemu-m68k_defconfig
new file mode 100644
index 00000000000..d667791d93b
--- /dev/null
+++ b/configs/qemu-m68k_defconfig
@@ -0,0 +1,20 @@
+CONFIG_M68K=y
+CONFIG_TEXT_BASE=0x00000000
+CONFIG_SYS_MALLOC_LEN=0x20000
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SYS_MONITOR_LEN=262144
+CONFIG_SYS_BOOTM_LEN=0x1000000
+CONFIG_SYS_LOAD_ADDR=0x00000000
+CONFIG_TARGET_QEMU_M68K=y
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_CMD_POWEROFF=y
+CONFIG_DM_RTC=y
+CONFIG_RTC_GOLDFISH=y
+CONFIG_DM_SERIAL=y
+CONFIG_SERIAL_GOLDFISH=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_CMD_POWEROFF=y
+CONFIG_SYSRESET_QEMU_VIRT_CTRL=y
+CONFIG_TIMER=y
+CONFIG_GOLDFISH_TIMER=y
diff --git a/doc/board/emulation/index.rst b/doc/board/emulation/index.rst
index f8908166276..4f7c812d493 100644
--- a/doc/board/emulation/index.rst
+++ b/doc/board/emulation/index.rst
@@ -15,6 +15,7 @@ Emulation
qemu-sbsa
qemu-x86
qemu-xtensa
+ qemu-m68k
Also see
diff --git a/doc/board/emulation/qemu-m68k.rst b/doc/board/emulation/qemu-m68k.rst
new file mode 100644
index 00000000000..6c4de54cf6a
--- /dev/null
+++ b/doc/board/emulation/qemu-m68k.rst
@@ -0,0 +1,39 @@
+.. SPDX-License-Identifier: GPL-2.0-or-later
+.. Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+
+QEMU m68k
+=========
+
+QEMU for m68k supports a special 'virt' machine designed for emulation and
+virtualization purposes. This document describes how to run U-Boot under it.
+
+The QEMU virt machine models a generic m68k virtual machine with Goldfish
+interfaces. It supports the Motorola 68040 CPU architecture.
+
+Building U-Boot
+---------------
+Set the CROSS_COMPILE environment variable to your m68k toolchain, and run:
+
+.. code-block:: bash
+
+ export CROSS_COMPILE=m68k-linux-gnu-
+ make qemu-m68k_defconfig
+ make
+
+Running U-Boot
+--------------
+The minimal QEMU command line to get U-Boot up and running is:
+
+.. code-block:: bash
+
+ qemu-system-m68k -M virt -cpu m68040 -nographic -kernel u-boot
+
+Note that the `-nographic` option is used to redirect the console to stdio,
+which connects to the emulated Goldfish TTY device.
+
+Hardware Support
+----------------
+The following QEMU virt peripherals are supported in U-Boot:
+
+* Goldfish TTY (Serial Console)
+* Goldfish RTC (Real Time Clock)
diff --git a/include/configs/qemu-m68k.h b/include/configs/qemu-m68k.h
new file mode 100644
index 00000000000..1d8aa92fe80
--- /dev/null
+++ b/include/configs/qemu-m68k.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
+ */
+
+#ifndef __QEMU_M68K_H
+#define __QEMU_M68K_H
+
+/* Memory Configuration */
+#define CFG_SYS_SDRAM_BASE 0x00000000
+
+/*
+ * Initial Stack Pointer:
+ * Place the stack at 4MB offset to avoid overwriting U-Boot code/data.
+ */
+#define CFG_SYS_INIT_SP_ADDR (CFG_SYS_SDRAM_BASE + 0x400000)
+
+#endif /* __QEMU_M68K_H */
--
2.52.0.457.g6b5491de43-goog
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v6 7/8] CI: Add test jobs for QEMU m68k virt machine
2026-01-07 20:18 [PATCH v6 0/8] m68k: Add support for QEMU virt machine Kuan-Wei Chiu
` (5 preceding siblings ...)
2026-01-07 20:18 ` [PATCH v6 6/8] board: Add QEMU m68k virt board support Kuan-Wei Chiu
@ 2026-01-07 20:18 ` Kuan-Wei Chiu
2026-01-07 20:18 ` [PATCH v6 8/8] MAINTAINERS: Update m68k entry Kuan-Wei Chiu
2026-02-02 23:58 ` [PATCH v6 0/8] m68k: Add support for QEMU virt machine Tom Rini
8 siblings, 0 replies; 16+ messages in thread
From: Kuan-Wei Chiu @ 2026-01-07 20:18 UTC (permalink / raw)
To: alison.wang, angelo, trini
Cc: me, daniel, heinrich.schuchardt, sjg, jserv, eleanor15x, u-boot,
Kuan-Wei Chiu, Simon Glass
Enable CI testing for the newly introduced QEMU m68k 'virt' board on
both GitLab CI and Azure Pipelines. This ensures the new M68040
architecture support is built and booted correctly in the emulated
environment.
Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <simon.glass@canonical.com>
---
Changes in v6:
- None.
.azure-pipelines.yml | 3 +++
.gitlab-ci.yml | 6 ++++++
2 files changed, 9 insertions(+)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 81a36da7114..e9fee478117 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -520,6 +520,9 @@ stages:
TEST_PY_ID: "--id qemu"
TEST_PY_TEST_SPEC: "not sleep and not efi"
OVERRIDE: "-a CONFIG_M68K_QEMU=y -a ~CONFIG_MCFTMR"
+ qemu_m68k_virt:
+ TEST_PY_BD: "qemu-m68k"
+ TEST_PY_TEST_SPEC: "not sleep"
qemu_malta:
TEST_PY_BD: "malta"
TEST_PY_ID: "--id qemu"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28a32f9f4d3..ff805fae054 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -417,6 +417,12 @@ qemu_m68k test.py:
OVERRIDE: "-a CONFIG_M68K_QEMU=y -a ~CONFIG_MCFTMR"
<<: *buildman_and_testpy_dfn
+qemu_m68k_virt test.py:
+ variables:
+ TEST_PY_BD: "qemu-m68k"
+ TEST_PY_TEST_SPEC: "not sleep"
+ <<: *buildman_and_testpy_dfn
+
qemu_malta test.py:
variables:
TEST_PY_BD: "malta"
--
2.52.0.457.g6b5491de43-goog
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH v6 8/8] MAINTAINERS: Update m68k entry
2026-01-07 20:18 [PATCH v6 0/8] m68k: Add support for QEMU virt machine Kuan-Wei Chiu
` (6 preceding siblings ...)
2026-01-07 20:18 ` [PATCH v6 7/8] CI: Add test jobs for QEMU m68k virt machine Kuan-Wei Chiu
@ 2026-01-07 20:18 ` Kuan-Wei Chiu
2026-02-02 23:58 ` [PATCH v6 0/8] m68k: Add support for QEMU virt machine Tom Rini
8 siblings, 0 replies; 16+ messages in thread
From: Kuan-Wei Chiu @ 2026-01-07 20:18 UTC (permalink / raw)
To: alison.wang, angelo, trini
Cc: me, daniel, heinrich.schuchardt, sjg, jserv, eleanor15x, u-boot,
Kuan-Wei Chiu
Rename the "COLDFIRE" entry to "M68K" to reflect that the architecture
support now encompasses traditional m680x0 CPUs (e.g., M68040) in
addition to ColdFire platforms.
Remove Huan Wang from the maintainers list as she is no longer active,
as suggested by Angelo Dureghello.
Add myself as a co-maintainer to assist with reviewing and testing
m68k-related patches.
Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
Acked-by: Angelo Dureghello <angelo@kernel-space.org>
---
Changes in v6:
- Remove Huan Wang from MAINTAINERS as suggested by Angelo Dureghello.
MAINTAINERS | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 9fff8989684..d6e03c21f20 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1045,9 +1045,9 @@ T: git https://source.denx.de/u-boot/custodians/u-boot-clk.git
F: drivers/clk/
F: drivers/clk/imx/
-COLDFIRE
-M: Huan Wang <alison.wang@nxp.com>
+M68K
M: Angelo Dureghello <angelo@kernel-space.org>
+M: Kuan-Wei Chiu <visitorckw@gmail.com>
S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-coldfire.git
F: arch/m68k/
--
2.52.0.457.g6b5491de43-goog
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH v6 4/8] sysreset: Add QEMU virtual system controller driver
2026-01-07 20:18 ` [PATCH v6 4/8] sysreset: Add QEMU virtual system controller driver Kuan-Wei Chiu
@ 2026-01-09 11:31 ` Simon Glass
2026-01-30 11:23 ` Heinrich Schuchardt
1 sibling, 0 replies; 16+ messages in thread
From: Simon Glass @ 2026-01-09 11:31 UTC (permalink / raw)
To: Kuan-Wei Chiu
Cc: alison.wang, angelo, trini, me, daniel, heinrich.schuchardt,
jserv, eleanor15x, u-boot
On Wed, 7 Jan 2026 at 13:19, Kuan-Wei Chiu <visitorckw@gmail.com> wrote:
>
> Introduce a new sysreset driver for the QEMU Virtual System Controller.
> This device is found on QEMU "virt" machines (such as the m68k virt
> target) and provides a mechanism to trigger system reset and power-off
> events.
>
> The driver maps U-Boot sysreset types to the corresponding controller
> commands:
> - SYSRESET_WARM / SYSRESET_COLD -> VIRT_CTRL_CMD_RESET
> - SYSRESET_POWER_OFF -> VIRT_CTRL_CMD_HALT
>
> Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
> ---
> Changes in v6:
> - Introduce new driver to replace board-file reset implementation.
>
> MAINTAINERS | 6 +++
> drivers/sysreset/Kconfig | 8 ++++
> drivers/sysreset/Makefile | 1 +
> drivers/sysreset/sysreset_qemu_virt_ctrl.c | 55 ++++++++++++++++++++++
> include/qemu_virt_ctrl.h | 13 +++++
> 5 files changed, 83 insertions(+)
> create mode 100644 drivers/sysreset/sysreset_qemu_virt_ctrl.c
> create mode 100644 include/qemu_virt_ctrl.h
>
Reviewed-by: Simon Glass <simon.glass@canonical.com>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v6 5/8] m68k: Add support for M68040 CPU
2026-01-07 20:18 ` [PATCH v6 5/8] m68k: Add support for M68040 CPU Kuan-Wei Chiu
@ 2026-01-09 11:31 ` Simon Glass
2026-01-24 8:29 ` Angelo Dureghello
1 sibling, 0 replies; 16+ messages in thread
From: Simon Glass @ 2026-01-09 11:31 UTC (permalink / raw)
To: Kuan-Wei Chiu
Cc: alison.wang, angelo, trini, me, daniel, heinrich.schuchardt,
jserv, eleanor15x, u-boot
On Wed, 7 Jan 2026 at 13:19, Kuan-Wei Chiu <visitorckw@gmail.com> wrote:
>
> Add support for the Motorola 68040 architecture. Currently, m68k
> support in U-Boot is primarily focused on ColdFire variants. Introduce
> the necessary infrastructure to support the classic M680x0 series,
> specifically targeting the M68040 as emulated by QEMU.
>
> The implementation includes exception vectors, early startup code, and
> minimal CPU initialization and relocation stubs. It also defines the
> standard m68k boot information structure used for passing hardware
> information to the operating system. To ensure compatibility, ColdFire-
> specific library objects such as cache and interrupt handling are
> excluded from the build when M68040 is selected.
>
> Additionally, apply a specific workaround during the early memory
> reservation stage. Use a manual loop to clear global data instead of
> the standard memset() function, as utilizing memset() at this point was
> observed to cause a hang on the QEMU platform.
>
> Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
> ---
> Changes in v6:
> - Introduce hidden Kconfig symbol CONFIG_ARCH_COLDFIRE to group
> ColdFire-specific files in Makefile, removing the need for
> 'ifndef CONFIG_M680x0'.
> - Add help text for CONFIG_M680x0.
>
> MAINTAINERS | 6 +++
> arch/m68k/Kconfig | 30 +++++++++++++
> arch/m68k/Makefile | 1 +
> arch/m68k/config.mk | 10 ++++-
> arch/m68k/cpu/m680x0/Makefile | 6 +++
> arch/m68k/cpu/m680x0/cpu.c | 73 ++++++++++++++++++++++++++++++++
> arch/m68k/cpu/m680x0/start.S | 73 ++++++++++++++++++++++++++++++++
> arch/m68k/cpu/m680x0/u-boot.lds | 47 ++++++++++++++++++++
> arch/m68k/include/asm/bootinfo.h | 39 +++++++++++++++++
> arch/m68k/lib/Makefile | 7 +--
> 10 files changed, 284 insertions(+), 8 deletions(-)
> create mode 100644 arch/m68k/cpu/m680x0/Makefile
> create mode 100644 arch/m68k/cpu/m680x0/cpu.c
> create mode 100644 arch/m68k/cpu/m680x0/start.S
> create mode 100644 arch/m68k/cpu/m680x0/u-boot.lds
> create mode 100644 arch/m68k/include/asm/bootinfo.h
>
Reviewed-by: Simon Glass <simon.glass@canonical.com>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v6 6/8] board: Add QEMU m68k virt board support
2026-01-07 20:18 ` [PATCH v6 6/8] board: Add QEMU m68k virt board support Kuan-Wei Chiu
@ 2026-01-09 11:31 ` Simon Glass
0 siblings, 0 replies; 16+ messages in thread
From: Simon Glass @ 2026-01-09 11:31 UTC (permalink / raw)
To: Kuan-Wei Chiu
Cc: alison.wang, angelo, trini, me, daniel, heinrich.schuchardt,
jserv, eleanor15x, u-boot
On Wed, 7 Jan 2026 at 13:19, Kuan-Wei Chiu <visitorckw@gmail.com> wrote:
>
> Add support for the QEMU 'virt' machine on the m68k architecture. This
> board emulates a generic machine based on the Motorola 68040 CPU
> equipped with Goldfish virtual peripherals.
>
> Introduce the necessary board configuration and initialization
> infrastructure. The implementation includes logic to parse the QEMU
> bootinfo interface, enabling dynamic detection of system RAM size to
> adapt to the virtual machine's configuration.
>
> Enable the Goldfish TTY driver for serial console output. Additionally,
> enable Goldfish RTC and timer drivers to support real-time clock
> functionality and nanosecond-resolution delays. Include comprehensive
> documentation covering build instructions and usage examples.
>
> Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
> Tested-by: Daniel Palmer <daniel@0x0f.com>
> ---
> Changes in v6:
> - Move bootinfo parsing logic to a helper function called in
> board_early_init_f.
> - Remove hardcoded MMIO address macros; use values parsed from
> bootinfo.
> - Use the new sysreset driver via U_BOOT_DRVINFO.
> - Use SZ_16M macro for default RAM size.
> - Update header include order to match coding style.
> - Fix blank line formatting in checkboard().
>
> arch/m68k/Kconfig | 9 ++
> board/emulation/qemu-m68k/Kconfig | 12 +++
> board/emulation/qemu-m68k/MAINTAINERS | 8 ++
> board/emulation/qemu-m68k/Makefile | 5 ++
> board/emulation/qemu-m68k/qemu-m68k.c | 117 ++++++++++++++++++++++++++
> configs/qemu-m68k_defconfig | 20 +++++
> doc/board/emulation/index.rst | 1 +
> doc/board/emulation/qemu-m68k.rst | 39 +++++++++
> include/configs/qemu-m68k.h | 18 ++++
> 9 files changed, 229 insertions(+)
> create mode 100644 board/emulation/qemu-m68k/Kconfig
> create mode 100644 board/emulation/qemu-m68k/MAINTAINERS
> create mode 100644 board/emulation/qemu-m68k/Makefile
> create mode 100644 board/emulation/qemu-m68k/qemu-m68k.c
> create mode 100644 configs/qemu-m68k_defconfig
> create mode 100644 doc/board/emulation/qemu-m68k.rst
> create mode 100644 include/configs/qemu-m68k.h
>
Reviewed-by: Simon Glass <simon.glass@canonical.com>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v6 5/8] m68k: Add support for M68040 CPU
2026-01-07 20:18 ` [PATCH v6 5/8] m68k: Add support for M68040 CPU Kuan-Wei Chiu
2026-01-09 11:31 ` Simon Glass
@ 2026-01-24 8:29 ` Angelo Dureghello
1 sibling, 0 replies; 16+ messages in thread
From: Angelo Dureghello @ 2026-01-24 8:29 UTC (permalink / raw)
To: Kuan-Wei Chiu, alison.wang, trini
Cc: me, daniel, heinrich.schuchardt, sjg, jserv, eleanor15x, u-boot
Hi Kuan-Wei,
i rebuilt all ColdFire boards and this patch is not causing any build
issue, and with some quick tests on stmark2 board there are no issues
either, nothing is broken.
Thanks a lot.
Acked-by: Angelo Dureghello <angelo@kernel-space.org>
On 1/7/26 21:18, Kuan-Wei Chiu wrote:
> Add support for the Motorola 68040 architecture. Currently, m68k
> support in U-Boot is primarily focused on ColdFire variants. Introduce
> the necessary infrastructure to support the classic M680x0 series,
> specifically targeting the M68040 as emulated by QEMU.
>
> The implementation includes exception vectors, early startup code, and
> minimal CPU initialization and relocation stubs. It also defines the
> standard m68k boot information structure used for passing hardware
> information to the operating system. To ensure compatibility, ColdFire-
> specific library objects such as cache and interrupt handling are
> excluded from the build when M68040 is selected.
>
> Additionally, apply a specific workaround during the early memory
> reservation stage. Use a manual loop to clear global data instead of
> the standard memset() function, as utilizing memset() at this point was
> observed to cause a hang on the QEMU platform.
>
> Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
> ---
> Changes in v6:
> - Introduce hidden Kconfig symbol CONFIG_ARCH_COLDFIRE to group
> ColdFire-specific files in Makefile, removing the need for
> 'ifndef CONFIG_M680x0'.
> - Add help text for CONFIG_M680x0.
>
> MAINTAINERS | 6 +++
> arch/m68k/Kconfig | 30 +++++++++++++
> arch/m68k/Makefile | 1 +
> arch/m68k/config.mk | 10 ++++-
> arch/m68k/cpu/m680x0/Makefile | 6 +++
> arch/m68k/cpu/m680x0/cpu.c | 73 ++++++++++++++++++++++++++++++++
> arch/m68k/cpu/m680x0/start.S | 73 ++++++++++++++++++++++++++++++++
> arch/m68k/cpu/m680x0/u-boot.lds | 47 ++++++++++++++++++++
> arch/m68k/include/asm/bootinfo.h | 39 +++++++++++++++++
> arch/m68k/lib/Makefile | 7 +--
> 10 files changed, 284 insertions(+), 8 deletions(-)
> create mode 100644 arch/m68k/cpu/m680x0/Makefile
> create mode 100644 arch/m68k/cpu/m680x0/cpu.c
> create mode 100644 arch/m68k/cpu/m680x0/start.S
> create mode 100644 arch/m68k/cpu/m680x0/u-boot.lds
> create mode 100644 arch/m68k/include/asm/bootinfo.h
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 34081769ecd..9fff8989684 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1324,6 +1324,12 @@ F: lib/getopt.c
> F: test/log/
> F: test/py/tests/test_log.py
>
> +M680X0 ARCHITECTURE
> +M: Kuan-Wei Chiu <visitorckw@gmail.com>
> +S: Maintained
> +F: arch/m68k/cpu/m680x0/
> +F: arch/m68k/include/asm/bootinfo.h
> +
> MALI DISPLAY PROCESSORS
> M: Liviu Dudau <liviu.dudau@foss.arm.com>
> S: Supported
> diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
> index 8ade6f7b9d1..f5c0dc037b4 100644
> --- a/arch/m68k/Kconfig
> +++ b/arch/m68k/Kconfig
> @@ -12,50 +12,64 @@ config MCF520x
> select OF_CONTROL
> select DM
> select DM_SERIAL
> + select ARCH_COLDFIRE
> bool
>
> config MCF52x2
> select OF_CONTROL
> select DM
> select DM_SERIAL
> + select ARCH_COLDFIRE
> bool
>
> config MCF523x
> select OF_CONTROL
> select DM
> select DM_SERIAL
> + select ARCH_COLDFIRE
> bool
>
> config MCF530x
> select OF_CONTROL
> select DM
> select DM_SERIAL
> + select ARCH_COLDFIRE
> bool
>
> config MCF5301x
> select OF_CONTROL
> select DM
> select DM_SERIAL
> + select ARCH_COLDFIRE
> bool
>
> config MCF532x
> select OF_CONTROL
> select DM
> select DM_SERIAL
> + select ARCH_COLDFIRE
> bool
>
> config MCF537x
> select OF_CONTROL
> select DM
> select DM_SERIAL
> + select ARCH_COLDFIRE
> bool
>
> config MCF5441x
> select OF_CONTROL
> select DM
> select DM_SERIAL
> + select ARCH_COLDFIRE
> bool
>
> +config M680x0
> + bool
> + help
> + This enables support for the classic Motorola 68000 family of
> + processors.
> +
> # processor type
> config M5208
> bool
> @@ -110,6 +124,10 @@ config M54418
> bool
> select MCF5441x
>
> +config M68040
> + bool
> + select M680x0
> +
> # peripherals
> config CF_DSPI
> bool
> @@ -178,6 +196,18 @@ config TARGET_STMARK2
>
> endchoice
>
> +config SYS_CPU
> + string
> + default "mcf52x2" if MCF52x2
> + default "mcf523x" if MCF523x
> + default "mcf530x" if MCF530x
> + default "mcf532x" if MCF532x
> + default "mcf5445x" if MCF5445x
> + default "m680x0" if M680x0
> +
> +config ARCH_COLDFIRE
> + bool
> +
> source "board/BuS/eb_cpu5282/Kconfig"
> source "board/cobra5272/Kconfig"
> source "board/freescale/m5208evbe/Kconfig"
> diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
> index 4a7960bbeb4..bb57cf9ac63 100644
> --- a/arch/m68k/Makefile
> +++ b/arch/m68k/Makefile
> @@ -17,6 +17,7 @@ cpuflags-$(CONFIG_M5307) := -mcpu=5307
> cpuflags-$(CONFIG_MCF5301x) := -mcpu=53015 -fPIC
> cpuflags-$(CONFIG_MCF532x) := -mcpu=5329 -fPIC
> cpuflags-$(CONFIG_MCF5441x) := -mcpu=54418 -fPIC
> +cpuflags-$(CONFIG_M68040) := -mcpu=68040 -fno-pic
>
> PLATFORM_CPPFLAGS += $(cpuflags-y)
>
> diff --git a/arch/m68k/config.mk b/arch/m68k/config.mk
> index 643b7d1d35d..458953f9712 100644
> --- a/arch/m68k/config.mk
> +++ b/arch/m68k/config.mk
> @@ -3,8 +3,14 @@
> # (C) Copyright 2000-2002
> # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
>
> -PLATFORM_CPPFLAGS += -D__M68K__ -fPIC
> +PLATFORM_CPPFLAGS += -D__M68K__
> +ifneq ($(CONFIG_M680x0),y)
> +PLATFORM_CPPFLAGS += -fPIC
> +endif
> KBUILD_LDFLAGS += -n -pie
> PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
> -PLATFORM_RELFLAGS += -ffixed-d7 -msep-data
> +PLATFORM_RELFLAGS += -ffixed-d7
> +ifneq ($(CONFIG_M680x0),y)
> +PLATFORM_RELFLAGS += -msep-data
> +endif
> LDFLAGS_FINAL += --gc-sections -pie
> diff --git a/arch/m68k/cpu/m680x0/Makefile b/arch/m68k/cpu/m680x0/Makefile
> new file mode 100644
> index 00000000000..f6e0c9a46c0
> --- /dev/null
> +++ b/arch/m68k/cpu/m680x0/Makefile
> @@ -0,0 +1,6 @@
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +#
> +# Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
> +
> +extra-y += start.o
> +obj-y += cpu.o
> diff --git a/arch/m68k/cpu/m680x0/cpu.c b/arch/m68k/cpu/m680x0/cpu.c
> new file mode 100644
> index 00000000000..f60b932c7dd
> --- /dev/null
> +++ b/arch/m68k/cpu/m680x0/cpu.c
> @@ -0,0 +1,73 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * CPU specific code for m68040
> + *
> + * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
> + */
> +
> +#include <config.h>
> +#include <cpu_func.h>
> +#include <init.h>
> +#include <stdio.h>
> +#include <asm/global_data.h>
> +#include <linux/types.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +void m68k_virt_init_reserve(ulong base)
> +{
> + struct global_data *gd_ptr = (struct global_data *)base;
> + char *p = (char *)gd_ptr;
> + unsigned int i;
> +
> + /* FIXME: usage of memset() here caused a hang on QEMU m68k virt. */
> + for (i = 0; i < sizeof(*gd_ptr); i++)
> + p[i] = 0;
> +
> + gd = gd_ptr;
> +
> + gd->malloc_base = base + sizeof(*gd_ptr);
> +}
> +
> +int print_cpuinfo(void)
> +{
> + puts("CPU: M68040 (QEMU Virt)\n");
> +
> + return 0;
> +}
> +
> +int get_clocks(void)
> +{
> + return 0;
> +}
> +
> +int cpu_init_r(void)
> +{
> + return 0;
> +}
> +
> +/*
> + * Relocation Stub
> + * We skip actual relocation for this QEMU bring-up and jump directly
> + * to board_init_r.
> + */
> +
> +void relocate_code(ulong sp, struct global_data *new_gd, ulong relocaddr)
> +{
> + board_init_r(new_gd, relocaddr);
> +}
> +
> +/* Stubs for Standard Facilities (Cache, Interrupts) */
> +
> +int disable_interrupts(void) { return 0; }
> +void enable_interrupts(void) { return; }
> +int interrupt_init(void) { return 0; }
> +
> +void icache_enable(void) {}
> +void icache_disable(void) {}
> +int icache_status(void) { return 0; }
> +void dcache_enable(void) {}
> +void dcache_disable(void) {}
> +int dcache_status(void) { return 0; }
> +void flush_cache(unsigned long start, unsigned long size) {}
> +void flush_dcache_range(unsigned long start, unsigned long stop) {}
> diff --git a/arch/m68k/cpu/m680x0/start.S b/arch/m68k/cpu/m680x0/start.S
> new file mode 100644
> index 00000000000..0802ca1fca2
> --- /dev/null
> +++ b/arch/m68k/cpu/m680x0/start.S
> @@ -0,0 +1,73 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/*
> + * Startup code for m68040
> + *
> + * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
> + */
> +
> +#include <asm-offsets.h>
> +#include <config.h>
> +#include <linux/linkage.h>
> +
> +.section .text
> +
> +/*
> + * Vector Table
> + * m68k uses the first 1KB for the exception vector table.
> + */
> +.balign 4
> +.global _vectors
> +_vectors:
> + .long CFG_SYS_INIT_SP_ADDR /* 0x00: Initial SP */
> + .long _start /* 0x04: Initial PC (Reset) */
> + .long _fault /* 0x08: Bus Error */
> + .long _fault /* 0x0C: Address Error */
> + .long _fault /* 0x10: Illegal Instruction */
> + .long _fault /* 0x14: Zero Divide */
> + .long _fault /* 0x18: CHK */
> + .long _fault /* 0x1C: TRAPV */
> + .long _fault /* 0x20: Privilege */
> + .long _fault /* 0x24: Trace */
> + .long _fault /* 0x28: Line 1010 */
> + .long _fault /* 0x2C: Line 1111 */
> + .fill 0x400 - (.-_vectors), 1, 0
> +
> +/*
> + * Entry Point
> + */
> +ENTRY(_start)
> + /* Disable Interrupts */
> + move.w #0x2700, %sr
> +
> + /* Setup initial stack pointer */
> + move.l #CFG_SYS_INIT_SP_ADDR, %sp
> +
> + /*
> + * Allocate Global Data (GD)
> + * board_init_f_alloc_reserve(top) returns the new top of stack in %d0
> + */
> + move.l %sp, -(%sp)
> + bsr.l board_init_f_alloc_reserve
> + addq.l #4, %sp
> +
> + /* Update Stack Pointer and set GD register */
> + move.l %d0, %sp
> + move.l %d0, %d7 /* %d7 is the gd register */
> +
> + /* Initialize Reserved Memory. */
> + move.l %d0, -(%sp)
> + bsr.l m68k_virt_init_reserve
> + addq.l #4, %sp
> +
> + /* Enter board_init_f(0) */
> + clr.l -(%sp)
> + bsr.l board_init_f
> + addq.l #4, %sp
> +
> + /* Should not return */
> +hang:
> + bra.s hang
> +ENDPROC(_start)
> +
> +_fault:
> + bra.s _fault
> diff --git a/arch/m68k/cpu/m680x0/u-boot.lds b/arch/m68k/cpu/m680x0/u-boot.lds
> new file mode 100644
> index 00000000000..ae102c32833
> --- /dev/null
> +++ b/arch/m68k/cpu/m680x0/u-boot.lds
> @@ -0,0 +1,47 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Linker Script for m68040
> + *
> + * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
> + */
> +
> +OUTPUT_ARCH(m68k)
> +ENTRY(_start)
> +
> +SECTIONS
> +{
> + . = 0x00000000;
> + __text_start = .;
> +
> + .text :
> + {
> + arch/m68k/cpu/m680x0/start.o (.text*)
> + *(.text*)
> + }
> +
> + . = ALIGN(16);
> + .rodata : { *(.rodata*) }
> +
> + . = ALIGN(16);
> + .data : { *(.data*) }
> +
> + . = ALIGN(4);
> + .u_boot_list : {
> + KEEP(*(SORT(*u_boot_list*)));
> + }
> +
> + . = ALIGN(4);
> + __image_copy_end = .;
> + __init_end = .;
> +
> + . = ALIGN(16);
> + __bss_start = .;
> + .bss :
> + {
> + *(.bss*)
> + . = ALIGN(16);
> + }
> + __bss_end = .;
> +
> + _end = .;
> +}
> diff --git a/arch/m68k/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo.h
> new file mode 100644
> index 00000000000..6d7bde3b833
> --- /dev/null
> +++ b/arch/m68k/include/asm/bootinfo.h
> @@ -0,0 +1,39 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/*
> + * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
> + *
> + * Definitions for the m68k bootinfo interface.
> + */
> +
> +#ifndef _ASM_M68K_BOOTINFO_H
> +#define _ASM_M68K_BOOTINFO_H
> +
> +#ifndef __ASSEMBLY__
> +
> +struct bi_record {
> + unsigned short tag; /* tag ID */
> + unsigned short size; /* size of record (in bytes) */
> + unsigned long data[0]; /* data */
> +};
> +
> +#endif /* __ASSEMBLY__ */
> +
> +/* Bootinfo Tag IDs */
> +#define BI_LAST 0x0000
> +#define BI_MACHTYPE 0x0001
> +#define BI_CPUTYPE 0x0002
> +#define BI_FPUTYPE 0x0003
> +#define BI_MMUTYPE 0x0004
> +#define BI_MEMCHUNK 0x0005
> +#define BI_RAMDISK 0x0006
> +#define BI_COMMAND_LINE 0x0007
> +
> +/* QEMU virt specific tags */
> +#define BI_VIRT_QEMU_VERSION 0x8000
> +#define BI_VIRT_GF_PIC_BASE 0x8001
> +#define BI_VIRT_GF_RTC_BASE 0x8002
> +#define BI_VIRT_GF_TTY_BASE 0x8003
> +#define BI_VIRT_VIRTIO_BASE 0x8004
> +#define BI_VIRT_CTRL_BASE 0x8005
> +
> +#endif /* _ASM_M68K_BOOTINFO_H */
> diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile
> index 6e1fd938f52..cf93715637a 100644
> --- a/arch/m68k/lib/Makefile
> +++ b/arch/m68k/lib/Makefile
> @@ -7,10 +7,5 @@
> ## if the user asked for it
> lib-$(CONFIG_USE_PRIVATE_LIBGCC) += lshrdi3.o muldi3.o ashldi3.o ashrdi3.o
>
> -obj-y += bdinfo.o
> obj-$(CONFIG_CMD_BOOTM) += bootm.o
> -obj-y += cache.o
> -obj-y += interrupts.o
> -obj-y += time.o
> -obj-y += traps.o
> -obj-y += fec.o
> +obj-$(CONFIG_ARCH_COLDFIRE) += cache.o interrupts.o time.o traps.o bdinfo.o fec.o
-- Angelo
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v6 4/8] sysreset: Add QEMU virtual system controller driver
2026-01-07 20:18 ` [PATCH v6 4/8] sysreset: Add QEMU virtual system controller driver Kuan-Wei Chiu
2026-01-09 11:31 ` Simon Glass
@ 2026-01-30 11:23 ` Heinrich Schuchardt
2026-02-02 8:11 ` Kuan-Wei Chiu
1 sibling, 1 reply; 16+ messages in thread
From: Heinrich Schuchardt @ 2026-01-30 11:23 UTC (permalink / raw)
To: Kuan-Wei Chiu
Cc: Alison Wang, Angelo Dureghello, Tom Rini, Yao Zi, daniel,
Simon Glass, jserv, eleanor15x, U-Boot Mailing List
Kuan-Wei Chiu <visitorckw@gmail.com> schrieb am Mi., 7. Jan. 2026, 21:19:
> Introduce a new sysreset driver for the QEMU Virtual System Controller.
> This device is found on QEMU "virt" machines (such as the m68k virt
> target) and provides a mechanism to trigger system reset and power-off
> events.
>
> The driver maps U-Boot sysreset types to the corresponding controller
> commands:
> - SYSRESET_WARM / SYSRESET_COLD -> VIRT_CTRL_CMD_RESET
> - SYSRESET_POWER_OFF -> VIRT_CTRL_CMD_HALT
>
> Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
> ---
> Changes in v6:
> - Introduce new driver to replace board-file reset implementation.
>
> MAINTAINERS | 6 +++
> drivers/sysreset/Kconfig | 8 ++++
> drivers/sysreset/Makefile | 1 +
> drivers/sysreset/sysreset_qemu_virt_ctrl.c | 55 ++++++++++++++++++++++
> include/qemu_virt_ctrl.h | 13 +++++
> 5 files changed, 83 insertions(+)
> create mode 100644 drivers/sysreset/sysreset_qemu_virt_ctrl.c
> create mode 100644 include/qemu_virt_ctrl.h
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index efecb213be7..34081769ecd 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1598,6 +1598,12 @@ S: Maintained
> T: git https://source.denx.de/u-boot/custodians/u-boot-mpc85xx.git
> F: arch/powerpc/cpu/mpc85xx/
>
> +QEMU VIRTUAL SYSTEM CONTROLLER
> +M: Kuan-Wei Chiu <visitorckw@gmail.com>
> +S: Maintained
> +F: drivers/sysreset/sysreset_qemu_virt_ctrl.c
> +F: include/qemu_virt_ctrl.h
> +
> RAW NAND
> M: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> M: Michael Trimarchi <michael@amarulasolutions.com>
> diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig
> index 0181f6cd581..120e7510f15 100644
> --- a/drivers/sysreset/Kconfig
> +++ b/drivers/sysreset/Kconfig
> @@ -298,6 +298,14 @@ config SYSRESET_QCOM_PSHOLD
> help
> Add support for the system reboot on Qualcomm SoCs via PSHOLD.
>
> +config SYSRESET_QEMU_VIRT_CTRL
> + bool "QEMU Virtual System Controller support"
> + depends on SYSRESET
> + help
> + Enable support for the QEMU Virtual System Controller.
> + This device is used in QEMU machines (e.g. m68k virt) to trigger
>
Is this specific to m68k or does it work on all QEMU architectures? If it
works everywhere, I would not mention m68k here.
On x86 QEMU we currently lack poweroff support. So this would come in handy.
Best regards
Heinrich
+ system reset and poweroff events.
> +
> endif
>
> endmenu
> diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile
> index f5c78b25896..d18a5d52360 100644
> --- a/drivers/sysreset/Makefile
> +++ b/drivers/sysreset/Makefile
> @@ -32,3 +32,4 @@ obj-$(CONFIG_$(PHASE_)SYSRESET_X86) += sysreset_x86.o
> obj-$(CONFIG_SYSRESET_RAA215300) += sysreset_raa215300.o
> obj-$(CONFIG_SYSRESET_QCOM_PSHOLD) += sysreset_qcom-pshold.o
> obj-$(CONFIG_TARGET_XTFPGA) += sysreset_xtfpga.o
> +obj-$(CONFIG_SYSRESET_QEMU_VIRT_CTRL) += sysreset_qemu_virt_ctrl.o
> diff --git a/drivers/sysreset/sysreset_qemu_virt_ctrl.c
> b/drivers/sysreset/sysreset_qemu_virt_ctrl.c
> new file mode 100644
> index 00000000000..e7cacc9b6e9
> --- /dev/null
> +++ b/drivers/sysreset/sysreset_qemu_virt_ctrl.c
> @@ -0,0 +1,55 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
> + *
> + * QEMU Virtual System Controller Driver
> + */
> +
> +#include <dm.h>
> +#include <qemu_virt_ctrl.h>
> +#include <sysreset.h>
> +#include <asm/io.h>
> +#include <linux/err.h>
> +
> +/* Register offsets */
> +#define VIRT_CTRL_REG_FEATURES 0x00
> +#define VIRT_CTRL_REG_CMD 0x04
> +
> +/* Commands */
> +#define VIRT_CTRL_CMD_NOOP 0x00
> +#define VIRT_CTRL_CMD_RESET 0x01
> +#define VIRT_CTRL_CMD_HALT 0x02
> +#define VIRT_CTRL_CMD_PANIC 0x03
> +
> +static int qemu_virt_ctrl_request(struct udevice *dev, enum sysreset_t
> type)
> +{
> + struct qemu_virt_ctrl_plat *plat = dev_get_plat(dev);
> + u32 val;
> +
> + switch (type) {
> + case SYSRESET_WARM:
> + case SYSRESET_COLD:
> + val = VIRT_CTRL_CMD_RESET;
> + break;
> + case SYSRESET_POWER_OFF:
> + val = VIRT_CTRL_CMD_HALT;
> + break;
> + default:
> + return -EPROTONOSUPPORT;
> + }
> +
> + writel(val, plat->reg + VIRT_CTRL_REG_CMD);
> +
> + return -EINPROGRESS;
> +}
> +
> +static struct sysreset_ops qemu_virt_ctrl_ops = {
> + .request = qemu_virt_ctrl_request,
> +};
> +
> +U_BOOT_DRIVER(sysreset_qemu_virt_ctrl) = {
> + .name = "sysreset_qemu_virt_ctrl",
> + .id = UCLASS_SYSRESET,
> + .ops = &qemu_virt_ctrl_ops,
> + .plat_auto = sizeof(struct qemu_virt_ctrl_plat),
> +};
> diff --git a/include/qemu_virt_ctrl.h b/include/qemu_virt_ctrl.h
> new file mode 100644
> index 00000000000..05aad82b767
> --- /dev/null
> +++ b/include/qemu_virt_ctrl.h
> @@ -0,0 +1,13 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +/*
> + * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
> + */
> +
> +#ifndef _QEMU_VIRT_CTRL_H_
> +#define _QEMU_VIRT_CTRL_H_
> +
> +struct qemu_virt_ctrl_plat {
> + phys_addr_t reg;
> +};
> +
> +#endif /* _QEMU_VIRT_CTRL_H_ */
> --
> 2.52.0.457.g6b5491de43-goog
>
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v6 4/8] sysreset: Add QEMU virtual system controller driver
2026-01-30 11:23 ` Heinrich Schuchardt
@ 2026-02-02 8:11 ` Kuan-Wei Chiu
0 siblings, 0 replies; 16+ messages in thread
From: Kuan-Wei Chiu @ 2026-02-02 8:11 UTC (permalink / raw)
To: Heinrich Schuchardt
Cc: Alison Wang, Angelo Dureghello, Tom Rini, Yao Zi, daniel,
Simon Glass, jserv, eleanor15x, U-Boot Mailing List
Hi Heinrich,
On Fri, Jan 30, 2026 at 12:23:31PM +0100, Heinrich Schuchardt wrote:
> Kuan-Wei Chiu <visitorckw@gmail.com> schrieb am Mi., 7. Jan. 2026, 21:19:
>
> > Introduce a new sysreset driver for the QEMU Virtual System Controller.
> > This device is found on QEMU "virt" machines (such as the m68k virt
> > target) and provides a mechanism to trigger system reset and power-off
> > events.
> >
> > The driver maps U-Boot sysreset types to the corresponding controller
> > commands:
> > - SYSRESET_WARM / SYSRESET_COLD -> VIRT_CTRL_CMD_RESET
> > - SYSRESET_POWER_OFF -> VIRT_CTRL_CMD_HALT
> >
> > Signed-off-by: Kuan-Wei Chiu <visitorckw@gmail.com>
> > ---
> > Changes in v6:
> > - Introduce new driver to replace board-file reset implementation.
> >
> > MAINTAINERS | 6 +++
> > drivers/sysreset/Kconfig | 8 ++++
> > drivers/sysreset/Makefile | 1 +
> > drivers/sysreset/sysreset_qemu_virt_ctrl.c | 55 ++++++++++++++++++++++
> > include/qemu_virt_ctrl.h | 13 +++++
> > 5 files changed, 83 insertions(+)
> > create mode 100644 drivers/sysreset/sysreset_qemu_virt_ctrl.c
> > create mode 100644 include/qemu_virt_ctrl.h
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index efecb213be7..34081769ecd 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -1598,6 +1598,12 @@ S: Maintained
> > T: git https://source.denx.de/u-boot/custodians/u-boot-mpc85xx.git
> > F: arch/powerpc/cpu/mpc85xx/
> >
> > +QEMU VIRTUAL SYSTEM CONTROLLER
> > +M: Kuan-Wei Chiu <visitorckw@gmail.com>
> > +S: Maintained
> > +F: drivers/sysreset/sysreset_qemu_virt_ctrl.c
> > +F: include/qemu_virt_ctrl.h
> > +
> > RAW NAND
> > M: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> > M: Michael Trimarchi <michael@amarulasolutions.com>
> > diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig
> > index 0181f6cd581..120e7510f15 100644
> > --- a/drivers/sysreset/Kconfig
> > +++ b/drivers/sysreset/Kconfig
> > @@ -298,6 +298,14 @@ config SYSRESET_QCOM_PSHOLD
> > help
> > Add support for the system reboot on Qualcomm SoCs via PSHOLD.
> >
> > +config SYSRESET_QEMU_VIRT_CTRL
> > + bool "QEMU Virtual System Controller support"
> > + depends on SYSRESET
> > + help
> > + Enable support for the QEMU Virtual System Controller.
> > + This device is used in QEMU machines (e.g. m68k virt) to trigger
> >
>
> Is this specific to m68k or does it work on all QEMU architectures? If it
> works everywhere, I would not mention m68k here.
The virt-ctrl device was originally introduced in qemu for the m68k
virt machine, which remains its sole user to date. However, as the
implementation resides in hw/misc/virt_ctrl.c, I believe it was
designed to be generic and architecture-agnostic from the start.
Regards,
Kuan-Wei
>
> On x86 QEMU we currently lack poweroff support. So this would come in handy.
>
> Best regards
>
> Heinrich
>
> + system reset and poweroff events.
> > +
> > endif
> >
> > endmenu
> > diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile
> > index f5c78b25896..d18a5d52360 100644
> > --- a/drivers/sysreset/Makefile
> > +++ b/drivers/sysreset/Makefile
> > @@ -32,3 +32,4 @@ obj-$(CONFIG_$(PHASE_)SYSRESET_X86) += sysreset_x86.o
> > obj-$(CONFIG_SYSRESET_RAA215300) += sysreset_raa215300.o
> > obj-$(CONFIG_SYSRESET_QCOM_PSHOLD) += sysreset_qcom-pshold.o
> > obj-$(CONFIG_TARGET_XTFPGA) += sysreset_xtfpga.o
> > +obj-$(CONFIG_SYSRESET_QEMU_VIRT_CTRL) += sysreset_qemu_virt_ctrl.o
> > diff --git a/drivers/sysreset/sysreset_qemu_virt_ctrl.c
> > b/drivers/sysreset/sysreset_qemu_virt_ctrl.c
> > new file mode 100644
> > index 00000000000..e7cacc9b6e9
> > --- /dev/null
> > +++ b/drivers/sysreset/sysreset_qemu_virt_ctrl.c
> > @@ -0,0 +1,55 @@
> > +// SPDX-License-Identifier: GPL-2.0-or-later
> > +/*
> > + * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
> > + *
> > + * QEMU Virtual System Controller Driver
> > + */
> > +
> > +#include <dm.h>
> > +#include <qemu_virt_ctrl.h>
> > +#include <sysreset.h>
> > +#include <asm/io.h>
> > +#include <linux/err.h>
> > +
> > +/* Register offsets */
> > +#define VIRT_CTRL_REG_FEATURES 0x00
> > +#define VIRT_CTRL_REG_CMD 0x04
> > +
> > +/* Commands */
> > +#define VIRT_CTRL_CMD_NOOP 0x00
> > +#define VIRT_CTRL_CMD_RESET 0x01
> > +#define VIRT_CTRL_CMD_HALT 0x02
> > +#define VIRT_CTRL_CMD_PANIC 0x03
> > +
> > +static int qemu_virt_ctrl_request(struct udevice *dev, enum sysreset_t
> > type)
> > +{
> > + struct qemu_virt_ctrl_plat *plat = dev_get_plat(dev);
> > + u32 val;
> > +
> > + switch (type) {
> > + case SYSRESET_WARM:
> > + case SYSRESET_COLD:
> > + val = VIRT_CTRL_CMD_RESET;
> > + break;
> > + case SYSRESET_POWER_OFF:
> > + val = VIRT_CTRL_CMD_HALT;
> > + break;
> > + default:
> > + return -EPROTONOSUPPORT;
> > + }
> > +
> > + writel(val, plat->reg + VIRT_CTRL_REG_CMD);
> > +
> > + return -EINPROGRESS;
> > +}
> > +
> > +static struct sysreset_ops qemu_virt_ctrl_ops = {
> > + .request = qemu_virt_ctrl_request,
> > +};
> > +
> > +U_BOOT_DRIVER(sysreset_qemu_virt_ctrl) = {
> > + .name = "sysreset_qemu_virt_ctrl",
> > + .id = UCLASS_SYSRESET,
> > + .ops = &qemu_virt_ctrl_ops,
> > + .plat_auto = sizeof(struct qemu_virt_ctrl_plat),
> > +};
> > diff --git a/include/qemu_virt_ctrl.h b/include/qemu_virt_ctrl.h
> > new file mode 100644
> > index 00000000000..05aad82b767
> > --- /dev/null
> > +++ b/include/qemu_virt_ctrl.h
> > @@ -0,0 +1,13 @@
> > +/* SPDX-License-Identifier: GPL-2.0-or-later */
> > +/*
> > + * Copyright (C) 2025, Kuan-Wei Chiu <visitorckw@gmail.com>
> > + */
> > +
> > +#ifndef _QEMU_VIRT_CTRL_H_
> > +#define _QEMU_VIRT_CTRL_H_
> > +
> > +struct qemu_virt_ctrl_plat {
> > + phys_addr_t reg;
> > +};
> > +
> > +#endif /* _QEMU_VIRT_CTRL_H_ */
> > --
> > 2.52.0.457.g6b5491de43-goog
> >
> >
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v6 0/8] m68k: Add support for QEMU virt machine
2026-01-07 20:18 [PATCH v6 0/8] m68k: Add support for QEMU virt machine Kuan-Wei Chiu
` (7 preceding siblings ...)
2026-01-07 20:18 ` [PATCH v6 8/8] MAINTAINERS: Update m68k entry Kuan-Wei Chiu
@ 2026-02-02 23:58 ` Tom Rini
8 siblings, 0 replies; 16+ messages in thread
From: Tom Rini @ 2026-02-02 23:58 UTC (permalink / raw)
To: alison.wang, angelo, Kuan-Wei Chiu
Cc: me, daniel, sjg, jserv, eleanor15x, u-boot, Heinrich Schuchardt
On Wed, 07 Jan 2026 20:18:29 +0000, Kuan-Wei Chiu wrote:
> Add support for the QEMU 'virt' machine on the m68k architecture. The
> QEMU virt machine models a generic system utilizing Goldfish virtual
> peripherals and is capable of emulating various classic 68k CPUs.
>
> Currently, U-Boot's m68k architecture support focuses on ColdFire
> variants. This series expands support to include the classic M680x0
> architecture, implementing the necessary exception vectors, startup
> code, and a bootinfo parser compatible with the QEMU interface.
>
> [...]
Applied to u-boot/master, thanks!
[1/8] serial: Add Goldfish TTY driver
commit: bf55b84736d6b220dae11e3b1e7a670918d9daee
[2/8] timer: Add Goldfish timer driver
commit: 909f717eaf299a97fb87307e8606f3fdc6cb0c14
[3/8] rtc: goldfish: Support platform data for non-DT probing
commit: b41c54488f6f8263c8b38a6cf97d106c3f9a65bb
[4/8] sysreset: Add QEMU virtual system controller driver
commit: 0429298a1a76b971c0b0156918f927d6329e53bc
[5/8] m68k: Add support for M68040 CPU
commit: c69b6aeaa35550d386c142302b852d6b72aea76f
[6/8] board: Add QEMU m68k virt board support
commit: 516afc8f76268fceb98f6b891a653484e931b26a
[7/8] CI: Add test jobs for QEMU m68k virt machine
commit: b21d9acdff871d9113ec8b70d9b12e6dbc4bd0c5
[8/8] MAINTAINERS: Update m68k entry
commit: 838e3be9e1d39e38661a788ae3bcfb9f989450a8
--
Tom
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2026-02-02 23:58 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-07 20:18 [PATCH v6 0/8] m68k: Add support for QEMU virt machine Kuan-Wei Chiu
2026-01-07 20:18 ` [PATCH v6 1/8] serial: Add Goldfish TTY driver Kuan-Wei Chiu
2026-01-07 20:18 ` [PATCH v6 2/8] timer: Add Goldfish timer driver Kuan-Wei Chiu
2026-01-07 20:18 ` [PATCH v6 3/8] rtc: goldfish: Support platform data for non-DT probing Kuan-Wei Chiu
2026-01-07 20:18 ` [PATCH v6 4/8] sysreset: Add QEMU virtual system controller driver Kuan-Wei Chiu
2026-01-09 11:31 ` Simon Glass
2026-01-30 11:23 ` Heinrich Schuchardt
2026-02-02 8:11 ` Kuan-Wei Chiu
2026-01-07 20:18 ` [PATCH v6 5/8] m68k: Add support for M68040 CPU Kuan-Wei Chiu
2026-01-09 11:31 ` Simon Glass
2026-01-24 8:29 ` Angelo Dureghello
2026-01-07 20:18 ` [PATCH v6 6/8] board: Add QEMU m68k virt board support Kuan-Wei Chiu
2026-01-09 11:31 ` Simon Glass
2026-01-07 20:18 ` [PATCH v6 7/8] CI: Add test jobs for QEMU m68k virt machine Kuan-Wei Chiu
2026-01-07 20:18 ` [PATCH v6 8/8] MAINTAINERS: Update m68k entry Kuan-Wei Chiu
2026-02-02 23:58 ` [PATCH v6 0/8] m68k: Add support for QEMU virt machine Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox