Relocate extension board support from cmd/ to boot/ directory in preparation for converting the extension framework to use UCLASS. Also improve code style by applying reverse Christmas tree ordering.
Signed-off-by: Kory Maincent (TI.com) <[email protected]> --- MAINTAINERS | 1 + boot/Kconfig | 3 ++ boot/Makefile | 1 + boot/extension.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++ cmd/Kconfig | 3 -- cmd/extension_board.c | 99 ++--------------------------------------------- include/extension_board.h | 16 ++++++++ 7 files changed, 122 insertions(+), 98 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e411e266c94..c67d5ae9d6b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1187,6 +1187,7 @@ M: Kory Maincent <[email protected]> S: Maintained F: board/sunxi/chip.c F: board/ti/common/cape_detect.c +F: boot/extension.c F: cmd/extension_board.c F: include/extension_board.h diff --git a/boot/Kconfig b/boot/Kconfig index dd047365754..62aa301f18f 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1906,6 +1906,9 @@ endmenu endif # OF_LIBFDT +config SUPPORT_EXTENSION_SCAN + bool + config USE_BOOTARGS bool "Enable boot arguments" help diff --git a/boot/Makefile b/boot/Makefile index 3da6f7a0914..f60d13130b1 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_BOOT_RETRY) += bootretry.o obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o obj-$(CONFIG_CMD_BOOTZ) += bootm.o bootm_os.o obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o +obj-$(CONFIG_SUPPORT_EXTENSION_SCAN) += extension.o obj-$(CONFIG_PXE_UTILS) += pxe_utils.o diff --git a/boot/extension.c b/boot/extension.c new file mode 100644 index 00000000000..fc9e1d398f4 --- /dev/null +++ b/boot/extension.c @@ -0,0 +1,97 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2025 Köry Maincent <[email protected]> + */ + +#include <bootdev.h> +#include <command.h> +#include <env.h> +#include <extension_board.h> +#include <fdt_support.h> +#include <malloc.h> +#include <mapmem.h> + +int extension_apply(struct extension *extension) +{ + ulong extrasize, overlay_addr; + struct fdt_header *blob; + char *overlay_cmd; + + if (!working_fdt) { + printf("No FDT memory address configured. Please configure\n" + "the FDT address via \"fdt addr <address>\" command.\n"); + return CMD_RET_FAILURE; + } + + overlay_cmd = env_get("extension_overlay_cmd"); + if (!overlay_cmd) { + printf("Environment extension_overlay_cmd is missing\n"); + return CMD_RET_FAILURE; + } + + overlay_addr = env_get_hex("extension_overlay_addr", 0); + if (!overlay_addr) { + printf("Environment extension_overlay_addr is missing\n"); + return CMD_RET_FAILURE; + } + + env_set("extension_overlay_name", extension->overlay); + if (run_command(overlay_cmd, 0) != 0) + return CMD_RET_FAILURE; + + extrasize = env_get_hex("filesize", 0); + if (!extrasize) + return CMD_RET_FAILURE; + + fdt_shrink_to_minimum(working_fdt, extrasize); + + blob = map_sysmem(overlay_addr, 0); + if (!fdt_valid(&blob)) + return CMD_RET_FAILURE; + + /* apply method prints messages on error */ + if (fdt_overlay_apply_verbose(working_fdt, blob)) + return CMD_RET_FAILURE; + + return CMD_RET_SUCCESS; +} + +int extension_scan(bool show) +{ + struct extension *extension, *next; + int extension_num; + + list_for_each_entry_safe(extension, next, &extension_list, list) { + list_del(&extension->list); + free(extension); + } + extension_num = extension_board_scan(&extension_list); + if (show && extension_num >= 0) + printf("Found %d extension board(s).\n", extension_num); + + /* either the number of extensions, or -ve for error */ + return extension_num; +} + +static int extension_bootdev_hunt(struct bootdev_hunter *info, bool show) +{ + int ret; + + ret = env_set_hex("extension_overlay_addr", + env_get_hex("fdtoverlay_addr_r", 0)); + if (ret) + return log_msg_ret("env", ret); + + ret = extension_scan(show); + if (ret < 0) + return log_msg_ret("ext", ret); + + return 0; +} + +/* extensions should have a uclass - for now we use UCLASS_SIMPLE_BUS uclass */ +BOOTDEV_HUNTER(extension_bootdev_hunter) = { + .prio = BOOTDEVP_1_PRE_SCAN, + .uclass = UCLASS_SIMPLE_BUS, + .hunt = extension_bootdev_hunt, +}; diff --git a/cmd/Kconfig b/cmd/Kconfig index 29de857ba7c..986eeeba807 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -545,9 +545,6 @@ config CMD_FDT help Do FDT related setup before booting into the Operating System. -config SUPPORT_EXTENSION_SCAN - bool - config CMD_EXTENSION bool "Extension board management command" select CMD_FDT diff --git a/cmd/extension_board.c b/cmd/extension_board.c index 317b260bf36..78d937ee6b6 100644 --- a/cmd/extension_board.c +++ b/cmd/extension_board.c @@ -4,68 +4,17 @@ * Köry Maincent, Bootlin, <[email protected]> */ -#include <bootdev.h> +#include <exports.h> #include <command.h> -#include <dm.h> -#include <env.h> -#include <malloc.h> #include <extension_board.h> -#include <mapmem.h> -#include <linux/libfdt.h> -#include <fdt_support.h> -static LIST_HEAD(extension_list); - -static int extension_apply(struct extension *extension) -{ - char *overlay_cmd; - ulong extrasize, overlay_addr; - struct fdt_header *blob; - - if (!working_fdt) { - printf("No FDT memory address configured. Please configure\n" - "the FDT address via \"fdt addr <address>\" command.\n"); - return CMD_RET_FAILURE; - } - - overlay_cmd = env_get("extension_overlay_cmd"); - if (!overlay_cmd) { - printf("Environment extension_overlay_cmd is missing\n"); - return CMD_RET_FAILURE; - } - - overlay_addr = env_get_hex("extension_overlay_addr", 0); - if (!overlay_addr) { - printf("Environment extension_overlay_addr is missing\n"); - return CMD_RET_FAILURE; - } - - env_set("extension_overlay_name", extension->overlay); - if (run_command(overlay_cmd, 0) != 0) - return CMD_RET_FAILURE; - - extrasize = env_get_hex("filesize", 0); - if (!extrasize) - return CMD_RET_FAILURE; - - fdt_shrink_to_minimum(working_fdt, extrasize); - - blob = map_sysmem(overlay_addr, 0); - if (!fdt_valid(&blob)) - return CMD_RET_FAILURE; - - /* apply method prints messages on error */ - if (fdt_overlay_apply_verbose(working_fdt, blob)) - return CMD_RET_FAILURE; - - return CMD_RET_SUCCESS; -} +LIST_HEAD(extension_list); static int do_extension_list(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - int i = 0; struct extension *extension; + int i = 0; if (list_empty(&extension_list)) { printf("No extension registered - Please run \"extension scan\"\n"); @@ -82,23 +31,6 @@ static int do_extension_list(struct cmd_tbl *cmdtp, int flag, return CMD_RET_SUCCESS; } -static int extension_scan(bool show) -{ - struct extension *extension, *next; - int extension_num; - - list_for_each_entry_safe(extension, next, &extension_list, list) { - list_del(&extension->list); - free(extension); - } - extension_num = extension_board_scan(&extension_list); - if (show && extension_num >= 0) - printf("Found %d extension board(s).\n", extension_num); - - /* either the number of extensions, or -ve for error */ - return extension_num; -} - static int do_extension_scan(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { @@ -115,8 +47,8 @@ static int do_extension_apply(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct extension *extension = NULL; - struct list_head *entry; int i = 0, extension_id, ret; + struct list_head *entry; if (argc < 2) return CMD_RET_USAGE; @@ -177,26 +109,3 @@ U_BOOT_CMD(extension, 3, 1, do_extensionops, "extension list - lists available extension(s) board(s)\n" "extension apply <extension number|all> - applies DT overlays corresponding to extension boards\n" ); - -static int extension_bootdev_hunt(struct bootdev_hunter *info, bool show) -{ - int ret; - - ret = env_set_hex("extension_overlay_addr", - env_get_hex("fdtoverlay_addr_r", 0)); - if (ret) - return log_msg_ret("env", ret); - - ret = extension_scan(show); - if (ret < 0) - return log_msg_ret("ext", ret); - - return 0; -} - -/* extensions should have a uclass - for now we use UCLASS_SIMPLE_BUS uclass */ -BOOTDEV_HUNTER(extension_bootdev_hunter) = { - .prio = BOOTDEVP_1_PRE_SCAN, - .uclass = UCLASS_SIMPLE_BUS, - .hunt = extension_bootdev_hunt, -}; diff --git a/include/extension_board.h b/include/extension_board.h index 22e4104bc54..3f70416f005 100644 --- a/include/extension_board.h +++ b/include/extension_board.h @@ -9,6 +9,8 @@ #include <linux/list.h> +extern struct list_head extension_list; + struct extension { struct list_head list; char name[32]; @@ -30,4 +32,18 @@ struct extension { */ int extension_board_scan(struct list_head *extension_list); +/** + * extension_apply - Apply extension board overlay to the devicetree + * @extension: Extension to be applied + * Return: Zero on success, negative on failure. + */ +int extension_apply(struct extension *extension); + +/** + * extension_scan - Scan extension boards available. + * @show: Flag to enable verbose log + * Return: Zero on success, negative on failure. + */ +int extension_scan(bool show); + #endif /* __EXTENSION_SUPPORT_H */ -- 2.43.0
