September 2025 - Concept

[PATCH 1/3] virtio: Add input-device driver
by Simon Glass 15 Sep '25

15 Sep '25

From: Simon Glass <sjg(a)chromium.org> Add a virtio input device driver that supports tablets and mice using the existing mouse uclass. The driver handles absolute and relative coordinates. Mouse buttons are supported (left, right, middle). EV_SYN events are skipped. Co-developed-by: Claude <noreply(a)anthropic.com> Signed-off-by: Simon Glass <sjg(a)chromium.org> --- drivers/virtio/Kconfig | 13 ++ drivers/virtio/Makefile | 1 + drivers/virtio/virtio_input.c | 369 ++++++++++++++++++++++++++++++++++ 3 files changed, 383 insertions(+) create mode 100644 drivers/virtio/virtio_input.c diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig index eb4ff368f12..471f40b85aa 100644 --- a/drivers/virtio/Kconfig +++ b/drivers/virtio/Kconfig @@ -110,4 +110,17 @@ config VIRTIO_SCSI A specification for the protocol is available at https://docs.oasis-open.org/virtio/virtio/v1.3/virtio-v1.3.html +config VIRTIO_INPUT + bool "Input device driver for virtio devices" + depends on VIRTIO + select MOUSE + default y + help + This driver provides support for virtio-based input devices such as + tablets, mice and keyboards. It implements the mouse uclass for + tablet and pointer devices. + + A specification for the protocol is available at + https://docs.oasis-open.org/virtio/virtio/v1.3/virtio-v1.3.html + endmenu diff --git a/drivers/virtio/Makefile b/drivers/virtio/Makefile index f101536a863..9183dd56a79 100644 --- a/drivers/virtio/Makefile +++ b/drivers/virtio/Makefile @@ -14,3 +14,4 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o obj-$(CONFIG_VIRTIO_RNG) += virtio_rng.o obj-$(CONFIG_VIRTIO_FS) += fs.o fs_dir.o fs_file.o fs_compat.o obj-$(CONFIG_VIRTIO_SCSI) += virtio_scsi.o +obj-$(CONFIG_VIRTIO_INPUT) += virtio_input.o diff --git a/drivers/virtio/virtio_input.c b/drivers/virtio/virtio_input.c new file mode 100644 index 00000000000..5edc59b6037 --- /dev/null +++ b/drivers/virtio/virtio_input.c @@ -0,0 +1,369 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * VirtIO Input (tablet) driver for U-Boot + * + * Copyright 2025 Simon Glass <sjg(a)chromium.org> + */ + +#define LOG_CATEGORY UCLASS_VIRTIO + +#include <dm.h> +#include <errno.h> +#include <mouse.h> +#include <virtio_types.h> +#include <virtio.h> +#include <virtio_ring.h> +#include <linux/byteorder/little_endian.h> +#include <dt-bindings/input/linux-event-codes.h> + +#define VIRTIO_INPUT_CFG_UNSET 0x00 +#define VIRTIO_INPUT_CFG_ID_NAME 0x01 +#define VIRTIO_INPUT_CFG_ID_SERIAL 0x02 +#define VIRTIO_INPUT_CFG_ID_DEVIDS 0x03 +#define VIRTIO_INPUT_CFG_PROP_BITS 0x10 +#define VIRTIO_INPUT_CFG_EV_BITS 0x11 +#define VIRTIO_INPUT_CFG_ABS_INFO 0x12 + +/* absolute axis information for input devices */ +struct virtio_input_absinfo { + __le32 min; /* minimum value */ + __le32 max; /* maximum value */ + __le32 fuzz; /* fuzz value for noise filtering */ + __le32 flat; /* flat area around center */ + __le32 res; /* resolution in units per mm */ +}; + +/* device identification information */ +struct virtio_input_devids { + __le16 bustype; /* bus type identifier */ + __le16 vendor; /* vendor identifier */ + __le16 product; /* product identifier */ + __le16 version; /* version number */ +}; + +/* configuration space for querying device capabilities */ +struct vinp_config { + __u8 select; /* configuration item to select */ + __u8 subsel; /* sub-selection within item */ + __u8 size; /* size of returned data */ + __u8 reserved[5]; /* padding */ + union { + char string[128]; /* for name/serial strings */ + __u8 bitmap[128]; /* for capability bitmaps */ + struct virtio_input_absinfo abs; /* for absolute axis info */ + struct virtio_input_devids ids; /* for device IDs */ + } u; +}; + +/* input event structure (follows Linux input_event format) */ +struct virtio_input_event { + __le16 type; /* event type (EV_KEY, EV_ABS, EV_SYN, etc.) */ + __le16 code; /* event code (button/axis identifier) */ + __le32 value; /* event value */ +}; + +#define BUF_COUNT 8 +#define BUF_SIZE (16 * sizeof(struct virtio_input_event)) +#define COORD_MAX 0xffff + +/* private data for virtio input device */ +struct virtio_input_priv { + struct virtqueue *event_vq; /* event virtqueue */ + struct virtqueue *status_vq; /* status virtqueue */ + char event_bufs[BUF_COUNT][BUF_SIZE]; /* event buffers */ + bool rx_running; /* true if buffers are set up */ + int abs_x_max; /* maximum X coordinate */ + int abs_y_max; /* maximum Y coordinate */ + int button_state; /* current button state */ + int last_x; /* last X coordinate */ + int last_y; /* last Y coordinate */ +}; + +static int virtio_input_free_buffer(struct udevice *dev, void *buf) +{ + struct virtio_input_priv *priv = dev_get_priv(dev); + struct virtio_sg sg = { buf, BUF_SIZE }; + struct virtio_sg *sgs[] = { &sg }; + + /* put the buffer back to the event ring */ + virtqueue_add(priv->event_vq, sgs, 0, 1); + + return 0; +} + +static int process_event(struct virtio_input_priv *priv, + struct virtio_input_event *vio_event, + struct mouse_event *evt) +{ + u16 type = le16_to_cpu(vio_event->type); + u16 code = le16_to_cpu(vio_event->code); + u32 value = le32_to_cpu(vio_event->value); + + /* skip EV_SYN events immediately */ + if (type == EV_SYN) + return -EAGAIN; + + log_debug("processing event: type=%d code=%d value=%d\n", type, code, + value); + + switch (type) { + case EV_ABS: + if (code == ABS_X) + priv->last_x = value; + else if (code == ABS_Y) + priv->last_y = value; + + /* report motion event */ + evt->type = MOUSE_EV_MOTION; + evt->motion.state = priv->button_state; + evt->motion.x = (priv->last_x * COORD_MAX) / priv->abs_x_max; + evt->motion.y = (priv->last_y * COORD_MAX) / priv->abs_y_max; + evt->motion.xrel = 0; /* Absolute mode */ + evt->motion.yrel = 0; + return 0; + + case EV_KEY: + switch (code) { + case BTN_LEFT: + evt->type = MOUSE_EV_BUTTON; + evt->button.button = BUTTON_LEFT; + evt->button.press_state = value ? BUTTON_PRESSED : + BUTTON_RELEASED; + evt->button.clicks = 1; + evt->button.x = (priv->last_x * COORD_MAX) / + priv->abs_x_max; + evt->button.y = (priv->last_y * COORD_MAX) / + priv->abs_y_max; + + if (evt->button.press_state == BUTTON_PRESSED) + priv->button_state |= BUTTON_LEFT; + else + priv->button_state &= ~BUTTON_LEFT; + return 0; + case BTN_RIGHT: + evt->type = MOUSE_EV_BUTTON; + evt->button.button = BUTTON_RIGHT; + evt->button.press_state = value ? BUTTON_PRESSED : + BUTTON_RELEASED; + evt->button.clicks = 1; + evt->button.x = (priv->last_x * COORD_MAX) / + priv->abs_x_max; + evt->button.y = (priv->last_y * COORD_MAX) / + priv->abs_y_max; + + if (evt->button.press_state == BUTTON_PRESSED) + priv->button_state |= BUTTON_RIGHT; + else + priv->button_state &= ~BUTTON_RIGHT; + return 0; + case BTN_MIDDLE: + evt->type = MOUSE_EV_BUTTON; + evt->button.button = BUTTON_MIDDLE; + evt->button.press_state = value ? BUTTON_PRESSED : + BUTTON_RELEASED; + evt->button.clicks = 1; + evt->button.x = (priv->last_x * COORD_MAX) / + priv->abs_x_max; + evt->button.y = (priv->last_y * COORD_MAX) / + priv->abs_y_max; + + if (evt->button.press_state == BUTTON_PRESSED) + priv->button_state |= BUTTON_MIDDLE; + else + priv->button_state &= ~BUTTON_MIDDLE; + return 0; + } + break; + } + + return -EAGAIN; +} + +static int virtio_input_start(struct udevice *dev) +{ + struct virtio_input_priv *priv = dev_get_priv(dev); + + if (!priv->rx_running) { + struct virtio_sg sg; + struct virtio_sg *sgs[] = { &sg }; + int i; + + /* setup event buffers */ + sg.length = BUF_SIZE; + + /* add all buffers to the event queue */ + for (i = 0; i < BUF_COUNT; i++) { + sg.addr = priv->event_bufs[i]; + virtqueue_add(priv->event_vq, sgs, 0, 1); + } + + virtqueue_kick(priv->event_vq); + + /* setup the event queue only once */ + priv->rx_running = true; + log_debug("VirtIO input buffers initialized\n"); + } + + return 0; +} + +static int virtio_input_get_event(struct udevice *dev, struct mouse_event *evt) +{ + struct virtio_input_priv *priv = dev_get_priv(dev); + struct virtio_input_event *vio_event; + int i, num_events, ret; + void *buf; + uint len; + + /* ensure buffers are setup */ + ret = virtio_input_start(dev); + if (ret) + return ret; + + log_debug("starting\n"); + + /* check for ready buffer */ + buf = virtqueue_get_buf(priv->event_vq, &len); + if (!buf) { + log_debug("No events available\n"); + return -EAGAIN; + } + + log_debug("got buffer back: addr=%p len=%d\n", buf, len); + if (len < sizeof(struct virtio_input_event)) { + log_debug("Invalid event length: %d\n", len); + /* put buffer back */ + virtio_input_free_buffer(dev, buf); + return -EAGAIN; + } + + /* process all events in the buffer */ + num_events = len / sizeof(struct virtio_input_event); + vio_event = (struct virtio_input_event *)buf; + + for (i = 0; i < num_events; i++) { + ret = process_event(priv, &vio_event[i], evt); + if (!ret) { + /* + * found a valid event to return, put buffer back + * Note: this loses any remaining events in the buffer, + * but for input devices this is acceptable + */ + virtio_input_free_buffer(dev, buf); + return 0; + } + /* -EAGAIN means continue to next event */ + } + + /* no useful events found, put buffer back */ + virtio_input_free_buffer(dev, buf); + evt->type = MOUSE_EV_NULL; + + return -EAGAIN; +} + +static int virtio_input_probe(struct udevice *dev) +{ + struct virtio_input_priv *priv = dev_get_priv(dev); + struct virtqueue *vqs[2]; + struct vinp_config cfg; + int ret; + + ret = virtio_find_vqs(dev, 2, vqs); + if (ret) { + log_debug("Failed to find virtqueues: %d\n", ret); + return ret; + } + + priv->event_vq = vqs[0]; + priv->status_vq = vqs[1]; + + /* check what event types this device supports */ + cfg.select = VIRTIO_INPUT_CFG_EV_BITS; + cfg.subsel = EV_KEY; + virtio_cwrite8(dev, offsetof(struct vinp_config, select), cfg.select); + virtio_cwrite8(dev, offsetof(struct vinp_config, subsel), cfg.subsel); + virtio_cread_bytes(dev, offsetof(struct vinp_config, u.bitmap), + cfg.u.bitmap, 16); + log_debug("EV_KEY bitmap: %02x %02x %02x %02x\n", cfg.u.bitmap[0], + cfg.u.bitmap[1], cfg.u.bitmap[2], cfg.u.bitmap[3]); + + cfg.select = VIRTIO_INPUT_CFG_EV_BITS; + cfg.subsel = EV_REL; + virtio_cwrite8(dev, offsetof(struct vinp_config, select), cfg.select); + virtio_cwrite8(dev, offsetof(struct vinp_config, subsel), cfg.subsel); + virtio_cread_bytes(dev, offsetof(struct vinp_config, u.bitmap), + cfg.u.bitmap, 16); + log_debug("EV_REL bitmap: %02x %02x %02x %02x\n", cfg.u.bitmap[0], + cfg.u.bitmap[1], cfg.u.bitmap[2], cfg.u.bitmap[3]); + + /* check if this device supports absolute coordinates (tablet) */ + cfg.select = VIRTIO_INPUT_CFG_EV_BITS; + cfg.subsel = EV_ABS; + virtio_cwrite8(dev, offsetof(struct vinp_config, select), cfg.select); + virtio_cwrite8(dev, offsetof(struct vinp_config, subsel), cfg.subsel); + + /* read the bitmap to see if ABS_X and ABS_Y are supported */ + virtio_cread_bytes(dev, offsetof(struct vinp_config, u.bitmap), + cfg.u.bitmap, 16); + + log_debug("EV_ABS bitmap: %02x %02x %02x %02x\n", cfg.u.bitmap[0], + cfg.u.bitmap[1], cfg.u.bitmap[2], cfg.u.bitmap[3]); + + /* check if ABS_X (0) and ABS_Y (1) bits are set */ + if ((cfg.u.bitmap[0] & (1 << 0)) && + (cfg.u.bitmap[0] & (1 << 1))) { + /* get ABS_X range */ + cfg.select = VIRTIO_INPUT_CFG_ABS_INFO; + cfg.subsel = ABS_X; + virtio_cwrite8(dev, offsetof(struct vinp_config, select), + cfg.select); + virtio_cwrite8(dev, offsetof(struct vinp_config, subsel), + cfg.subsel); + virtio_cread_bytes(dev, offsetof(struct vinp_config, u.abs), + &cfg.u.abs, sizeof(cfg.u.abs)); + priv->abs_x_max = le32_to_cpu(cfg.u.abs.max); + + /* get ABS_Y range */ + cfg.subsel = ABS_Y; + virtio_cwrite8(dev, offsetof(struct vinp_config, subsel), + cfg.subsel); + virtio_cread_bytes(dev, offsetof(struct vinp_config, u.abs), + &cfg.u.abs, sizeof(cfg.u.abs)); + priv->abs_y_max = le32_to_cpu(cfg.u.abs.max); + + log_debug("tablet: X range 0-%d, Y range 0-%d\n", + priv->abs_x_max, priv->abs_y_max); + } else { + /* no absolute coordinates, use default range */ + priv->abs_x_max = 32767; + priv->abs_y_max = 32767; + log_debug("table: No absolute coords, using relative mode\n"); + } + + return 0; +} + +static int virtio_input_bind(struct udevice *dev) +{ + struct virtio_dev_priv *uc_priv = dev_get_uclass_priv(dev->parent); + + /* indicate what driver features we support */ + virtio_driver_features_init(uc_priv, NULL, 0, NULL, 0); + + return 0; +} + +static const struct mouse_ops virtio_input_ops = { + .get_event = virtio_input_get_event, +}; + +U_BOOT_DRIVER(virtio_input) = { + .name = VIRTIO_INPUT_DRV_NAME, + .id = UCLASS_MOUSE, + .bind = virtio_input_bind, + .probe = virtio_input_probe, + .ops = &virtio_input_ops, + .priv_auto = sizeof(struct virtio_input_priv), + .flags = DM_FLAG_ACTIVE_DMA, +}; -- 2.43.0 base-commit: 203f498cf558fb86f9e66cafdb7cfee8f0724139 branch: tab

2 3

[PATCH 00/17] mouse: Provide some support for using a mouse
by Simon Glass 15 Sep '25

15 Sep '25

From: Simon Glass <sjg(a)chromium.org> This series resurects some old code that was never submitted, related to using Nuklear with U-Boot. It includes: - a very simple mouse uclass - sandbox mouse driver - USB mouse driver, useful on x86 - EFI mouse driver, useful when running as an EFI app - script updates to use the above with build-qemu and build-efi It also includes a few small patches for sandbox, tests and membuf Not everything is fully working at present: - Mouse works on x86 QEMU (after 'usb start') but not ARM - Mouse works on real hardware with EFI, but not with build-efi script - Mouse times out with 'usb start', even though it does actually work More work will be needed to tidy up these remaining issues. Simon Glass (17): membuf: Add a function to set up a static membuf sandbox: Add a way to set the window title test: Add newlines at the end of the img functions input: Add mouse support sandbox: sdl: Add support for mouse input input: sandbox: Provide a mouse driver input: Add a command to show mouse input sandbox: Enable the mouse sandbox: Provide a test for the mouse uclass usb: Add a USB mouse driver mouse: Provide a way to read clicks efi: Add the simple-pointer protocol efi: Provide a mouse driver for EFI efi: arm: x86: Enable the mouse script: Support mouse with build-efi/qemu scripts x86: emulation: Enable USB support qemu: Enable the mouse MAINTAINERS | 7 + arch/arm/dts/efi-arm_app.dts | 5 + arch/sandbox/cpu/sdl.c | 46 +++- arch/sandbox/cpu/start.c | 9 + arch/sandbox/dts/sandbox.dtsi | 4 + arch/sandbox/dts/test.dts | 4 + arch/sandbox/include/asm/sdl.h | 9 + arch/sandbox/include/asm/state.h | 2 + arch/sandbox/include/asm/test.h | 17 ++ arch/x86/dts/efi-x86_app.dts | 4 + cmd/Kconfig | 9 + cmd/Makefile | 1 + cmd/mouse.c | 69 ++++++ configs/qemu-x86_64_defconfig | 3 + configs/qemu-x86_defconfig | 3 + configs/tools-only_defconfig | 2 +- drivers/input/Kconfig | 29 +++ drivers/input/Makefile | 7 + drivers/input/efi_mouse.c | 221 +++++++++++++++++++ drivers/input/mouse-uclass.c | 72 +++++++ drivers/input/sandbox_mouse.c | 84 ++++++++ drivers/input/usb_mouse.c | 353 +++++++++++++++++++++++++++++++ include/dm/uclass-id.h | 1 + include/efi.h | 1 + include/efi_api.h | 29 +++ include/membuf.h | 17 +- include/mouse.h | 105 +++++++++ include/usb.h | 1 + lib/efi/device_path.c | 1 + lib/membuf.c | 8 + scripts/build-efi | 3 + scripts/build-qemu | 6 +- test/dm/Makefile | 1 + test/dm/mouse.c | 217 +++++++++++++++++++ test/lib/membuf.c | 19 ++ test/py/img/android.py | 2 +- test/py/img/armbian.py | 2 +- test/py/img/cedit.py | 2 +- test/py/img/chromeos.py | 2 +- test/py/img/common.py | 2 +- test/py/img/efi.py | 2 +- test/py/img/fedora.py | 2 +- test/py/img/localboot.py | 2 +- test/py/img/ubuntu.py | 2 +- 44 files changed, 1374 insertions(+), 13 deletions(-) create mode 100644 cmd/mouse.c create mode 100644 drivers/input/efi_mouse.c create mode 100644 drivers/input/mouse-uclass.c create mode 100644 drivers/input/sandbox_mouse.c create mode 100644 drivers/input/usb_mouse.c create mode 100644 include/mouse.h create mode 100644 test/dm/mouse.c -- 2.43.0 base-commit: f3005834f6822612feb627cf52338e123c723e2b branch: ape

2 21

[PATCH 00/23] expo: Support interactions with a mouse or touchpad
by Simon Glass 15 Sep '25

15 Sep '25

From: Simon Glass <sjg(a)chromium.org> So far expo only supports user interaction with a keyboard. This is the common case, but for PC devices it is typical to have a mouse or touchpad available as well. Particularly for the configuration editor, these devices are often more convenient for selecting options than moving up and down with with the keyboard. This series adds mouse support to expo, providing a function to process a click similar to processing of a keypress. The core of this is a new expo_send_click() function. Within scenes, the logic to search for objects by and x and y position is provided. As with keypresses, expo provides clear separation between the processing of a click (which may or may not produce an action) and the handling of that action. This allows expo to be used within an existing event loop. Expo uses a mouse by default if available. This series also includes a few other minor improvements, including some code tidy-ups and support for filled boxes. Simon Glass (23): video: Provide a few Ubuntu fonts video: Support drawing filled boxes expo: Guard against a crash in scene_textline_calc_dims() expo: Support boxes fully test: video: Provide an easy way to watch video tests expo: Tidy up a few key-related comments expo: Add comments for enum bootmenu_id_t expo: Provide a way to enable the mouse expo: Tidy up image position with the menu expo: test: Move expo creation into a separate function expo: Provide a way to check if a position is within a menu expo: Allow checking if a position is within a textline expo: Tidy up comments for enum expoact_type expo: Add three new actions for mouse events expo: Support sending a click to a menu expo: Support sending a click to a scene expo: Support sending a click to an expo expo: Refactor expo_poll() to separate out key handling expo: Check the mouse when polling expo: Enable the mouse when available expo: Add a test helper for clicking on objects expo: Provide a test of cedit mouse behaviour expo: Provide a test of expo mouse behaviour arch/sandbox/dts/cedit.dtsi | 13 ++ boot/bootflow_internal.h | 14 +- boot/bootflow_menu.c | 4 +- boot/cedit.c | 23 +++ boot/expo.c | 85 ++++++++- boot/expo_build.c | 30 ++++ boot/scene.c | 248 ++++++++++++++++++++++++++- boot/scene_internal.h | 80 ++++++++- boot/scene_menu.c | 77 ++++++++- boot/scene_textline.c | 13 +- doc/develop/expo.rst | 16 ++ drivers/video/console_truetype.c | 8 + drivers/video/fonts/Kconfig | 32 +++- drivers/video/fonts/Makefile | 2 + drivers/video/fonts/ubuntu_bold.ttf | Bin 0 -> 270164 bytes drivers/video/fonts/ubuntu_light.ttf | Bin 0 -> 362552 bytes drivers/video/video-uclass.c | 27 +-- include/expo.h | 60 ++++++- include/test/cedit-test.h | 5 +- include/video.h | 3 +- test/boot/Makefile | 4 +- test/boot/cedit.c | 108 +++++++++++- test/boot/expo.c | 240 ++++++++++++++++++++++++-- test/boot/expo_common.c | 24 +++ test/boot/expo_common.h | 33 ++++ test/dm/video.c | 22 ++- 26 files changed, 1109 insertions(+), 62 deletions(-) create mode 100644 drivers/video/fonts/ubuntu_bold.ttf create mode 100644 drivers/video/fonts/ubuntu_light.ttf create mode 100644 test/boot/expo_common.c create mode 100644 test/boot/expo_common.h -- 2.43.0 base-commit: adb7fe6f5bb8f837020ac8de96646f19fbc65eaf branch: apf

1 23

[PATCH 00/14] ulib: Add support for Rust main programs
by Simon Glass 11 Sep '25

11 Sep '25

From: GitLab CI Runner <trini(a)konsulko.com> So far ulib only supports linking against C programs. While this is the common case, there is no particular reason why other languages could not be used to write the main program, so long as they can interoperate with the libu-boot.so/.a library. Rust provides a Foreign Function Interface feature, which makes it possible to declare and call C functions from Rust code. It provides memory safety without the uncertainty of garbage collection and with less overhead. It would be nice if ulib could be used with Rust. This series provides the necessary pieces to make this work. It adds an example program which works just like the C one, but written in Rust. As with the existing example, the program can be built against the static ulib or can use dynamic linking. Note that only sandbox is supported at present, i.e. native execution on (for example) a Linux machine. Future work will add support for running on other architectures. In order to make more use of ulib features, U-Boot's headers will need to be made available in Rust format. For now, only a very few are provided, as a starting point. Simon Glass (13): docker: Provide a rust toolchain CI: Switch to new docker image examples: Correct dependencies for ulib ulib: Return the full version with ulib_get_version() ulib: Add a way to obtain the version ulib: Add a very basic rust library ulib: Add a Rust example doc: Fix a few nits in the ulib docs doc: ulib: Clarify calling functions in any header doc: ulib: Add Rust examples documentation test: ulib: Add a test for the rust example doc: Provide a motivation for ulib CI: Build the Rust examples Tom Rini (1): CI: Update to coreboot 25.03 .gitlab-ci.yml | 15 ++- Makefile | 18 +++- doc/develop/ulib.rst | 114 ++++++++++++++++++-- examples/rust/.gitignore | 5 + examples/rust/Cargo.lock | 14 +++ examples/rust/Cargo.toml | 17 +++ examples/rust/Makefile | 95 +++++++++++++++++ examples/rust/README.md | 120 +++++++++++++++++++++ examples/rust/build.rs | 105 +++++++++++++++++++ examples/rust/src/demo.rs | 112 ++++++++++++++++++++ examples/rust/src/rust_helper.rs | 59 +++++++++++ examples/ulib/demo.c | 2 +- examples/ulib/rules.mk | 13 +-- include/u-boot-lib.h | 9 +- lib/rust/.gitignore | 1 + lib/rust/Cargo.lock | 7 ++ lib/rust/Cargo.toml | 17 +++ lib/rust/src/lib.rs | 173 +++++++++++++++++++++++++++++++ lib/ulib/ulib.c | 3 +- test/py/tests/test_ulib.py | 65 ++++++++++++ tools/docker/Dockerfile | 10 +- 21 files changed, 947 insertions(+), 27 deletions(-) create mode 100644 examples/rust/.gitignore create mode 100644 examples/rust/Cargo.lock create mode 100644 examples/rust/Cargo.toml create mode 100644 examples/rust/Makefile create mode 100644 examples/rust/README.md create mode 100644 examples/rust/build.rs create mode 100644 examples/rust/src/demo.rs create mode 100644 examples/rust/src/rust_helper.rs create mode 100644 lib/rust/.gitignore create mode 100644 lib/rust/Cargo.lock create mode 100644 lib/rust/Cargo.toml create mode 100644 lib/rust/src/lib.rs -- 2.43.0 base-commit: 10d080a43d5a980a44cc64547fb2a41683cba272 branch: rus

1 14

[PATCH 1/2] Revert "sandbox: Avoid mon_len being larger than available RAM"
by Simon Glass 10 Sep '25

10 Sep '25

From: Simon Glass <sjg(a)chromium.org> This fix turns out to be insufficient in the corner case where mon_len is smaller than available, emulated RAM but large enough that there isn't enough left. This reverts commit 88b810e241e7d1ccdf1d7329339cf5d5d9cef474. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- common/board_f.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index ef8b0ff7ef1..e23134a8403 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -464,11 +464,7 @@ static int reserve_uboot(void) * reserve memory for U-Boot code, data & bss * round down to next 4 kB limit */ - if (IS_ENABLED(CONFIG_SANDBOX) && gd->mon_len > gd->relocaddr) - log_debug("Cannot reserve space for U-Boot\n"); - else - gd->relocaddr -= gd->mon_len; - + gd->relocaddr -= gd->mon_len; gd->relocaddr &= ~(4096 - 1); #if defined(CONFIG_E500) || defined(CONFIG_MIPS) /* round down to next 64 kB limit so that IVPR stays aligned */ -- 2.43.0 base-commit: ec32a6ef1554369aa114c2c032fb9e72460fd192 branch: ulig

1 1

[PATCH 1/2] efi: Add a missing dependency for capsule_esl_dtsi
by Simon Glass 10 Sep '25

10 Sep '25

From: Simon Glass <sjg(a)chromium.org> The input file is used to process the dtsi, so add a dependency. This bug was previously masked by a FORCE which was removed in 7738c4c2d79 Makefile: Avoid FORCE with ESL Signed-off-by: Simon Glass <sjg(a)chromium.org> --- scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 4863e360d73..8300c8104ce 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -421,7 +421,7 @@ quiet_cmd_capsule_dtsi_gen = CAPSULE $@ cmd_capsule_dtsi_gen = \ $(shell sed "s:ESL_BIN_FILE:$(abspath $<):" $(capsule_esl_input_file) > $@) -$(obj)/$(capsule_esl_dtsi): $(obj)/capsule_esl_file +$(obj)/$(capsule_esl_dtsi): $(obj)/capsule_esl_file $(capsule_esl_input_file) $(call cmd,capsule_dtsi_gen) dtsi_include_list_deps := $(addprefix $(u_boot_dtsi_loc),$(subst $(quote),,$(dtsi_include_list))) -- 2.43.0 base-commit: b3f9ef0d8d1a20ae6f67ff71cdfe6bfa3c0ae493 branch: ulii

1 1

[PATCH] u_boot_pylib: Rename missing_list to missing_set
by Simon Glass 10 Sep '25

10 Sep '25

From: Simon Glass <sjg(a)chromium.org> The 'required' argument is a set so it is confusing to assign it to a variable called 'missing_list'. Rename it to 'missing'. Also document what happens if the parameter is None. Signed-off-by: Simon Glass <sjg(a)chromium.org> Suggested-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- tools/u_boot_pylib/test_util.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/u_boot_pylib/test_util.py b/tools/u_boot_pylib/test_util.py index 7bd12705557..f0cf8ba2f93 100644 --- a/tools/u_boot_pylib/test_util.py +++ b/tools/u_boot_pylib/test_util.py @@ -36,7 +36,8 @@ def run_test_coverage(prog, filter_fname, exclude_list, build_dir, exclude_list: List of file patterns to exclude from the coverage calculation build_dir: Build directory, used to locate libfdt.py - required: Set of modules which must be in the coverage report + required (set of str): Set of modules which must be in the coverage + report. If None, then missing tests are not reported extra_args (str): Extra arguments to pass to the tool before the -t/test arg single_thread (str): Argument string to make the tests run @@ -78,11 +79,11 @@ def run_test_coverage(prog, filter_fname, exclude_list, build_dir, # Convert '/path/to/name.py' just the module name 'name' test_set = set([os.path.splitext(os.path.basename(line.split()[0]))[0] for line in lines if '/etype/' in line]) - missing_list = required - missing_list.discard('__init__') - missing_list.difference_update(test_set) - if missing_list: - print('Missing tests for %s' % (', '.join(missing_list))) + missing = required + missing.discard('__init__') + missing.difference_update(test_set) + if missing: + print('Missing tests for %s' % (', '.join(missing))) print(stdout) ok = False -- 2.43.0 base-commit: 7811a8ae524ff3a1029a4ffa63ca142ca7a44881 branch: ulih

1 0

[PATCH 00/18] ulib: Complete initial U-Boot library
by Simon Glass 10 Sep '25

10 Sep '25

From: Simon Glass <sjg(a)chromium.org> This series completes support for building U-Boot as a shared or static library, enabling reuse of U-Boot functionality in external programs and test suites. The U-Boot library (ulib) allows developers to: - Link against U-Boot functionality without a full U-Boot image - Use U-Boot's OS abstraction layer, drivers, and utility functions - Build test programs that can exercise U-Boot code in isolation - Create applications that benefit from U-Boot's hardware support Key features: - Builds both shared (libu-boot.so) and static (libu-boot.a) libraries - Preserves U-Boot linker lists for proper driver/subsystem init - Configurable symbol renaming to avoid conflicts with system libraries - Generated API headers with renamed function declarations - Documentation and working examples - Currently only supports sandbox architecture The series includes: - More build-infrastructure and Makefile integration - Python-based mechanism for symbol renaming and API generation - Test programs demonstrating basic library usage - A simple example program showing real-world usage patterns Symbol renaming ensures that U-Boot functions don't conflict with system libraries. For example, printf() remains the standard library function while ub_printf() provides access to U-Boot's printf implementation. This is handled automatically during the build process. The library excludes main() to allow external programs to provide their own entry points while still accessing U-Boot functionality through ulib_init() and ulib_uninit(). For example: #include <u-boot-lib.h> #include <u-boot-api.h> int main(int argc, char *argv[]) { if (ulib_init(argv[0]) < 0) return 1; ub_printf("Hello from U-Boot library!\n"); ulib_uninit(); return 0; } License implications are documented - the GPL-2.0+ license applies to any programs linked with the library, requiring source code distribution for compliant usage. Future work will look at expanding support to other architectures. Simon Glass (18): lib: Tidy up comments for vsprintf functions u_boot_pylib: Correct docs for run_test_coverage() required os.h: Add standard includes for types used in os.h sandbox: Enable ULIB just for the sandbox build test: Move the non-LTO test to sandbox_flattree test/py: Allow setting the cwd with run_and_log() ulib: Move ulib into its own directory ulib: scripts: Add a script to support symbol-renaming ulib: Use the correct copyright message ulib: Disable LTO when building the library ulib: Provide a symbol-rename file ulib: Makefile: Create a library with renamed symbols ulib: Makefile: Plumb in renaming symbols for ulib ulib: Makefile: Plumb in creation of the API header ulib: Expand the ulib example to have two files ulib: Adjust the test to check symbol renaming ulib: doc: Expand the documentation to cover new features test/py: Add a test for ulib functionality Kconfig | 3 +- Makefile | 54 ++- arch/sandbox/cpu/u-boot-lib.lds | 2 +- configs/sandbox_defconfig | 1 + doc/develop/ulib.rst | 179 +++++++- examples/ulib/.gitignore | 2 + examples/ulib/Makefile | 60 ++- examples/ulib/demo.c | 14 +- examples/ulib/demo_helper.c | 28 ++ examples/ulib/demo_helper.h | 31 ++ include/os.h | 2 + include/u-boot-lib.h | 2 +- include/vsprintf.h | 25 +- lib/Makefile | 2 +- lib/ulib/Makefile | 6 + lib/ulib/rename.syms | 30 ++ lib/{ => ulib}/ulib.c | 2 +- scripts/build_api.py | 714 +++++++++++++++++++++++++++++ test/py/tests/test_sandbox_opts.py | 8 +- test/py/tests/test_ulib.py | 141 ++++++ test/py/utils.py | 13 +- test/run | 8 + test/scripts/test_build_api.py | 704 ++++++++++++++++++++++++++++ test/ulib/ulib_test.c | 12 +- tools/u_boot_pylib/test_util.py | 2 +- 25 files changed, 1970 insertions(+), 75 deletions(-) create mode 100644 examples/ulib/.gitignore create mode 100644 examples/ulib/demo_helper.c create mode 100644 examples/ulib/demo_helper.h create mode 100644 lib/ulib/Makefile create mode 100644 lib/ulib/rename.syms rename lib/{ => ulib}/ulib.c (95%) create mode 100755 scripts/build_api.py create mode 100644 test/py/tests/test_ulib.py create mode 100644 test/scripts/test_build_api.py -- 2.43.0 base-commit: 75c3ab4cd8407e7ede9b61be050d4b88f75f7360 branch: ulif

3 21

[PATCH 1/2] ulib: Refactor the Makefile to support multiple programs
by Simon Glass 10 Sep '25

10 Sep '25

From: Simon Glass <sjg(a)chromium.org> The current Makefile for the ulib examples is not very easy to modify. Split it into three parts: - config.mk containing the variables used by the build tools - a list of programs and the objects in each one - rules.mk with some rules to make it all work Use sys-objs to indicate objects which should be built with system headers. Use U-Boot headers by default. With this it is fairly simply to add a new program. Of course we could make use of U-Boot's kbuild implementation to tidy this up, but the purpose of the examples is to show how to do things outside the U-Boot build system. Co-developed-by: Claude <noreply(a)anthropic.com> Co-developed-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Simon Glass <sjg(a)chromium.org> --- examples/ulib/Makefile | 72 +++++++---------------------------------- examples/ulib/config.mk | 47 +++++++++++++++++++++++++++ examples/ulib/rules.mk | 39 ++++++++++++++++++++++ 3 files changed, 97 insertions(+), 61 deletions(-) create mode 100644 examples/ulib/config.mk create mode 100644 examples/ulib/rules.mk diff --git a/examples/ulib/Makefile b/examples/ulib/Makefile index 81885cf8726..a11c5dad9be 100644 --- a/examples/ulib/Makefile +++ b/examples/ulib/Makefile @@ -25,72 +25,22 @@ # PLATFORM_LIBS - Platform-specific libraries # LIB_STATIC_LDS - Linker script for static library -# For standalone builds, provide default values -EXAMPLE_DIR ?= . -OUTDIR ?= . -CC ?= gcc -SDL_CONFIG ?= sdl2-config -PLATFORM_LIBS ?= $(shell $(SDL_CONFIG) --libs) -LIB_STATIC_LDS ?= static.lds -# The main Makefile passes in Q=@ for quiet output -Q ?= +# Include configuration and helper functions +include config.mk -# Common compiler flags for programs using system headers first -SYSTEM_CFLAGS := -I$(UBOOT_BUILD)/include -idirafter$(srctree)/include \ - -include $(srctree)/include/linux/compiler_attributes.h +# Programs to build +progs := demo -# Common compiler flags for programs using U-Boot headers first (like U-Boot -# internal build) -UBOOT_CFLAGS := -nostdinc -isystem $(shell $(CC) -print-file-name=include) \ - -I$(UBOOT_BUILD)/include \ - -I$(srctree)/include \ - -I$(srctree)/arch/sandbox/include \ - -include $(UBOOT_BUILD)/include/config.h \ - -include $(srctree)/include/linux/kconfig.h \ - -I$(srctree)/dts/upstream/include \ - -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0 +# Program definitions - list of object files for each program +demo_objs := demo.o demo_helper.o -SHARED_LDFLAGS := -L$(UBOOT_BUILD) -lu-boot -Wl,-rpath,$(UBOOT_BUILD) +# Objects that need system headers (default is U-Boot headers) +sys-objs := demo_helper.o -STATIC_LDFLAGS := -Wl,-T,$(LIB_STATIC_LDS) \ - -Wl,--whole-archive $(UBOOT_BUILD)/libu-boot.a -Wl,--no-whole-archive \ - -lpthread -ldl $(PLATFORM_LIBS) -Wl,-z,noexecstack - -# Program definitions - can be single file or multi-object -DEMO_SRC := $(EXAMPLE_DIR)/demo.c -demo-objs := demo.o demo_helper.o -DEMO_BINS := $(OUTDIR)/demo $(OUTDIR)/demo_static - -ALL_BINS := $(DEMO_BINS) - -# Default target builds both programs -all: $(ALL_BINS) - -# Create the output directory if it doesn't exist -$(OUTDIR): - @mkdir -p $@ - -# Pattern rule for building object files with system headers first (default) -$(OUTDIR)/%.o: $(EXAMPLE_DIR)/%.c | $(OUTDIR) - $(CC) $(CFLAGS) $(SYSTEM_CFLAGS) -c -o $@ $< - -# Pattern rule for building object files with U-Boot headers first -$(OUTDIR)/%_uboot.o: $(EXAMPLE_DIR)/%.c | $(OUTDIR) - $(CC) $(CFLAGS) $(UBOOT_CFLAGS) -c -o $@ $< - -# The U-Boot library must be built before we can link against it -# Order-only prerequisites ensure libraries exist before linking -$(ALL_BINS): | $(UBOOT_BUILD)/libu-boot.a $(UBOOT_BUILD)/libu-boot.so $(OUTDIR) - -# Build demo (dynamically linked with libu-boot.so) -$(OUTDIR)/demo: $(if $(demo-objs),$(addprefix $(OUTDIR)/,$(demo-objs)),$(DEMO_SRC)) - $(if $(demo-objs),$(CC) $(CFLAGS) -o $@ $^ $(SHARED_LDFLAGS),$(CC) $(CFLAGS) $(SYSTEM_CFLAGS) -o $@ $< $(SHARED_LDFLAGS)) - -# Build demo_static (statically linked with libu-boot.a) -$(OUTDIR)/demo_static: $(if $(demo-objs),$(addprefix $(OUTDIR)/,$(demo-objs)),$(DEMO_SRC)) - $(if $(demo-objs),$(CC) $(CFLAGS) -o $@ $^ $(STATIC_LDFLAGS),$(CC) $(CFLAGS) $(SYSTEM_CFLAGS) -o $@ $< $(STATIC_LDFLAGS)) +# Include build rules (must come after variable definitions) +include rules.mk clean: - $(Q)rm -f $(DEMO_BINS) + $(Q)rm -f $(all_bins) $(OUTDIR)/*.o .PHONY: all clean diff --git a/examples/ulib/config.mk b/examples/ulib/config.mk new file mode 100644 index 00000000000..993f0923b4f --- /dev/null +++ b/examples/ulib/config.mk @@ -0,0 +1,47 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Configuration and helpers for U-Boot library examples +# +# Copyright 2025 Canonical Ltd. +# Written by Simon Glass <simon.glass(a)canonical.com> + +# For standalone builds, provide default values +EXAMPLE_DIR ?= . +OUTDIR ?= . +CC ?= gcc +SDL_CONFIG ?= sdl2-config +PLATFORM_LIBS ?= $(shell $(SDL_CONFIG) --libs) +LIB_STATIC_LDS ?= static.lds +# The main Makefile passes in Q=@ for quiet output +Q ?= + +# Common compiler flags for programs using system headers +SYSTEM_CFLAGS := -I$(UBOOT_BUILD)/include \ + -idirafter$(srctree)/include \ + -include $(srctree)/include/linux/compiler_attributes.h + +# Common compiler flags for programs using U-Boot headers (these match the +# U-Boot internal build) +UBOOT_CFLAGS := -nostdinc \ + -isystem $(shell $(CC) -print-file-name=include) \ + -I$(UBOOT_BUILD)/include \ + -I$(srctree)/include \ + -I$(srctree)/arch/sandbox/include \ + -include $(UBOOT_BUILD)/include/config.h \ + -include $(srctree)/include/linux/kconfig.h \ + -I$(srctree)/dts/upstream/include \ + "-DMBEDTLS_CONFIG_FILE=\"mbedtls_def_config.h\"" \ + -I$(srctree)/lib/mbedtls \ + -I$(srctree)/lib/mbedtls/port \ + -I$(srctree)/lib/mbedtls/external/mbedtls \ + -I$(srctree)/lib/mbedtls/external/mbedtls/include \ + -Wno-builtin-declaration-mismatch \ + -D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0 + +# Linking flags +SHARED_LDFLAGS := -L$(UBOOT_BUILD) -lu-boot -Wl,-rpath,$(UBOOT_BUILD) + +STATIC_LDFLAGS := -Wl,-T,$(LIB_STATIC_LDS) \ + -Wl,--whole-archive $(UBOOT_BUILD)/libu-boot.a \ + -Wl,--no-whole-archive \ + -lpthread -ldl $(PLATFORM_LIBS) -Wl,-z,noexecstack diff --git a/examples/ulib/rules.mk b/examples/ulib/rules.mk new file mode 100644 index 00000000000..aba6c63d8b6 --- /dev/null +++ b/examples/ulib/rules.mk @@ -0,0 +1,39 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Build rules for U-Boot library examples +# +# Copyright 2025 Canonical Ltd. +# Written by Simon Glass <simon.glass(a)canonical.com> + +# Generate normal and statically linked binary names from progs variable +all_bins := $(foreach prog,$(progs),$(OUTDIR)/$(prog) \ + $(OUTDIR)/$(prog)_static) + +# Default target builds both programs +all: $(all_bins) + +# System headers rule for objects that need system APIs +$(foreach obj,$(sys-objs),$(eval $(OUTDIR)/$(obj): \ + $(EXAMPLE_DIR)/$(obj:.o=.c) | $(OUTDIR) ; \ + $$(CC) $$(CFLAGS) $$(SYSTEM_CFLAGS) -c -o $$@ $$<)) + +# Automatic build rules for all programs +$(foreach prog,$(progs),$(eval $(OUTDIR)/$(prog): \ + $$(addprefix $(OUTDIR)/,$$($(prog)_objs)) ; \ + $$(CC) $$(CFLAGS) -o $$@ $$^ $$(SHARED_LDFLAGS))) +$(foreach prog,$(progs),$(eval $(OUTDIR)/$(prog)_static: \ + $$(addprefix $(OUTDIR)/,$$($(prog)_objs)) ; \ + $$(CC) $$(CFLAGS) -o $$@ $$^ $$(STATIC_LDFLAGS))) + +# Create the output directory if it doesn't exist +$(OUTDIR): + @mkdir -p $@ + +# Default rule: compile with U-Boot headers +$(OUTDIR)/%.o: $(EXAMPLE_DIR)/%.c | $(OUTDIR) + $(CC) $(CFLAGS) $(UBOOT_CFLAGS) -c -o $@ $< + +# The U-Boot library must be built before we can link against it +# Order-only prerequisites ensure libraries exist before linking +$(all_bins): | $(UBOOT_BUILD)/libu-boot.a $(UBOOT_BUILD)/libu-boot.so \ + $(OUTDIR) \ No newline at end of file -- 2.43.0 base-commit: cd204772930a099842949968fb7dece04ed1026f branch: ulig

1 1

[PATCH 00/10] ulib: Provide examples for building outside the tree
by Simon Glass 05 Sep '25

05 Sep '25

From: Simon Glass <sjg(a)chromium.org> The ulib tests are built within the U-Boot build system, so make use of various settings which are provided. When using ulib outside the U-Boot tree (and outside its build environment), things are a little more tricky. This series provides a few simple examples to illustrate how to make it work. An example Makefile is provided as well. The same Makefile is used from CI just to ensure that it continues to work as expected. Simon Glass (10): CI: Tidy up the template for the 'make check' items sandbox: Make use of PLATFORM_LIBS for ulib_test Kconfig: Split the EXAMPLES option into its own file Kconfig: Provide an option for the standalone directory sandbox: Avoid use of ulong in os.h examples: Allow compilation of examples on sandbox sandbox: Enable building examples ulib: Provide an example of how to build with ulib CI: ulib: Test building examples separately doc: ulib: Provide some documentation on the ulib examples .gitlab-ci.yml | 26 +++++++++++++- Kconfig | 2 ++ Makefile | 19 +++++++++- configs/sandbox_defconfig | 1 + doc/develop/ulib.rst | 3 ++ examples/Kconfig | 19 ++++++++++ examples/Makefile | 2 +- examples/ulib/Makefile | 73 ++++++++++++++++++++++++++++++++++++++ examples/ulib/README | 74 +++++++++++++++++++++++++++++++++++++++ examples/ulib/demo.c | 61 ++++++++++++++++++++++++++++++++ examples/ulib/static.lds | 19 ++++++++++ include/os.h | 2 +- legacy_api/Kconfig | 8 ----- 13 files changed, 297 insertions(+), 12 deletions(-) create mode 100644 examples/Kconfig create mode 100644 examples/ulib/Makefile create mode 100644 examples/ulib/README create mode 100644 examples/ulib/demo.c create mode 100644 examples/ulib/static.lds -- 2.43.0 base-commit: 8f58832f29b90702d7f56c3f34823616ac81b2d3 branch: ulie

1 10