From: Tom Rini <trini@konsulko.com>
Date: Mon, 2 Feb 2026 20:24:56 +0000 (-0600)
Subject: Merge patch series "m68k: Add support for QEMU virt machine"
X-Git-Tag: v2026.04-rc2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1de103fc29761fa729dffaa15d0cfb2766be05e4;p=thirdparty%2Fu-boot.git

Merge patch series "m68k: Add support for QEMU virt machine"

Kuan-Wei Chiu <visitorckw@gmail.com> says:

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.

Link: https://lore.kernel.org/r/20260107201838.3448806-1-visitorckw@gmail.com
[trini: Re-sort MAINTAINERS entries]
Signed-off-by: Tom Rini <trini@konsulko.com>
---

1de103fc29761fa729dffaa15d0cfb2766be05e4
diff --cc MAINTAINERS
index a0f87da67e1,d6e03c21f20..0734c07da1e
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1048,15 -1045,15 +1048,6 @@@ T:	git https://source.denx.de/u-boot/cu
  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/
--F:	doc/arch/m68k.rst
--F:	drivers/watchdog/mcf_wdt.c
--
  CPU
  M:	Simon Glass <sjg@chromium.org>
  M:	Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
@@@ -1315,6 -1324,12 +1318,21 @@@ F:	lib/getopt.
  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
+ 
++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/
++F:	doc/arch/m68k.rst
++F:	drivers/watchdog/mcf_wdt.c
++
  MALI DISPLAY PROCESSORS
  M:	Liviu Dudau <liviu.dudau@foss.arm.com>
  S:	Supported
diff --cc arch/m68k/Kconfig
index f5d495f9935,774b119cb4b..6ce8f577e3a
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -176,22 -194,43 +194,43 @@@ config TARGET_STMARK
          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
+ 	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"
 -source "board/freescale/m5235evb/Kconfig"
 -source "board/freescale/m5249evb/Kconfig"
 -source "board/freescale/m5253demo/Kconfig"
 -source "board/freescale/m5272c3/Kconfig"
 -source "board/freescale/m5275evb/Kconfig"
 -source "board/freescale/m5282evb/Kconfig"
 -source "board/freescale/m53017evb/Kconfig"
 -source "board/freescale/m5329evb/Kconfig"
 -source "board/freescale/m5373evb/Kconfig"
 +source "board/nxp/m5208evbe/Kconfig"
 +source "board/nxp/m5235evb/Kconfig"
 +source "board/nxp/m5249evb/Kconfig"
 +source "board/nxp/m5253demo/Kconfig"
 +source "board/nxp/m5272c3/Kconfig"
 +source "board/nxp/m5275evb/Kconfig"
 +source "board/nxp/m5282evb/Kconfig"
 +source "board/nxp/m53017evb/Kconfig"
 +source "board/nxp/m5329evb/Kconfig"
 +source "board/nxp/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"