Hi Tom, This is for -next
https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/26422 https://dev.azure.com/simon0972/u-boot/_build/results?buildId=80&view=results The following changes since commit a619c4410956f446510749b6dc3989849616b7a0: Merge patch series "Enable env in SCSI" (2025-05-29 18:36:51 -0600) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-30may25 for you to fetch changes up to 44fc287387c06946d3c8f1a62e641ab35ba65eea: expo: Drop the special theme code for bootflow_menu (2025-05-30 09:49:33 +0100) ---------------------------------------------------------------- Bring in recent expo enhancements: - multi-line text - highlighting of menu items - rationalisation of menu and expo code - support for object alignment - editable strings - various bug fixes and tweaks This also includes some required abuf improvements. ---------------------------------------------------------------- Simon Glass (46): abuf: Add a helper for initing and allocating a buffer abuf: Add a function to copy a buffer abuf: Add a way to printf() into a buffer expo: Add CLI context to the expo expo: Add a function to poll for input expo: Destroy the cedit expo when done expo: Create a rendering test for cedit expo: Move cedit-state fields into expo expo: Test some cedit actions expo: Pass in the video device for cedit_prepare() expo: Test rendering a lineedit expo: Provide access to the current menu item expo: Adjust how menu items are highlighted expo: Test editing a lineedit expo: Split bootflow_menu_run() into two pieces expo: Split bootflow_menu_new() into two pieces expo: Allow adding a single bootflow to a menu expo: Rename scene_dim to scene_obj_bbox expo: Rename x and y in struct scene_obj_bbox expo: Use an abuf to hold strings expo: Separate dimensions from the bounding box expo: Make bounding-box calculation more flexible expo: Support setting the size and bounds of an object expo: Line up all menu objects expo: Create a struct for generic text attributes expo: Move text-rendering into its own function expo: Tidy up scene_txt_render() expo: Allow strings to be editable expo: Check the screen contents after rendering expo: Support rendering multiple lines of text expo: Support white-on-black in the theme expo: Implement a box expo: Support object alignment expo: Begin implementation of a text editor expo: Use a simpler name for USB media expo: Drop the gap between groups of menu items expo: Add forward declarations to scene_internal.h expo: Support highlighting menu items expo: Adjust expo_poll() to avoid looping forever expo: Drop the render from expo_poll() expo: Provide a way to position things relative to display expo: Improve the visual appearance of the menu expo: Update bootflow_menu_poll() to return a sequence ID expo: Split setting up the menu from adding items expo: Set up menu fully in bootflow_menu_start() expo: Drop the special theme code for bootflow_menu boot/Makefile | 2 +- boot/bootflow_internal.h | 11 ++- boot/bootflow_menu.c | 382 ++++++++++++++++++++++++++++++++++++++++++++------------------------------------ boot/cedit.c | 163 +++++++++++++++++----------------- boot/expo.c | 72 ++++++++++++++- boot/scene.c | 477 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------- boot/scene_internal.h | 71 +++++++++++++-- boot/scene_menu.c | 166 +++++++++++++++++++++++++---------- boot/scene_textedit.c | 61 +++++++++++++ boot/scene_textline.c | 47 +++++----- cmd/bootflow.c | 43 ++++++--- cmd/cedit.c | 2 + doc/develop/expo.rst | 34 ++++++++ include/abuf.h | 43 +++++++++ include/bootflow.h | 77 +++++++++++++--- include/cedit.h | 17 +++- include/expo.h | 293 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- lib/abuf.c | 58 +++++++++++++ lib/of_live.c | 3 +- test/boot/bootflow.c | 9 +- test/boot/cedit.c | 217 +++++++++++++++++++++++++++++++++++++++++++++- test/boot/expo.c | 214 ++++++++++++++++++++++++++++++++++++--------- test/lib/abuf.c | 105 ++++++++++++++++++++++ 23 files changed, 2035 insertions(+), 532 deletions(-) create mode 100644 boot/scene_textedit.c Regards, Simon
