Migrate sandbox extension board detection from legacy implementation to the new UCLASS-based extension board framework.
Signed-off-by: Kory Maincent <[email protected]> --- arch/Kconfig | 2 +- board/sandbox/sandbox.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index 7e05e0c2263..5bb65a29f8d 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -215,7 +215,7 @@ config SANDBOX select SYSRESET_CMD_POWEROFF if CMD_POWEROFF select SYS_CACHE_SHIFT_4 select IRQ - select SUPPORT_EXTENSION_SCAN if CMDLINE + select SUPPORT_DM_EXTENSION_SCAN if CMDLINE select SUPPORT_ACPI imply BITREVERSE select BLOBLIST diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index c5d7b9651a9..21e1e2583fd 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -111,27 +111,27 @@ int ft_board_setup(void *fdt, struct bd_info *bd) } #ifdef CONFIG_CMD_EXTENSION -int extension_board_scan(struct list_head *extension_list) +static int sandbox_extension_board_scan(struct alist *extension_list) { int i; for (i = 0; i < 2; i++) { - struct extension *extension; - - extension = calloc(1, sizeof(struct extension)); - if (!extension) + struct extension extension = {0}, *_extension; + + snprintf(extension.overlay, sizeof(extension.overlay), "overlay%d.dtbo", i); + snprintf(extension.name, sizeof(extension.name), "extension board %d", i); + snprintf(extension.owner, sizeof(extension.owner), "sandbox"); + snprintf(extension.version, sizeof(extension.version), "1.1"); + snprintf(extension.other, sizeof(extension.other), "Fictional extension board"); + _extension = alist_add(extension_list, extension); + if (!_extension) return -ENOMEM; - - snprintf(extension->overlay, sizeof(extension->overlay), "overlay%d.dtbo", i); - snprintf(extension->name, sizeof(extension->name), "extension board %d", i); - snprintf(extension->owner, sizeof(extension->owner), "sandbox"); - snprintf(extension->version, sizeof(extension->version), "1.1"); - snprintf(extension->other, sizeof(extension->other), "Fictional extension board"); - list_add_tail(&extension->list, extension_list); } return i; } + +U_BOOT_EXTENSION(sandbox_extension, extension_board_scan); #endif #ifdef CONFIG_BOARD_LATE_INIT -- 2.43.0
