From 1cd0a441066d3003c63fc90d936f6c4e1b47c896 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Thu, 18 Dec 2025 13:19:07 +0100 Subject: [PATCH] boot: fix missing dependency for BOOTMETH_ANDROID The code depends on set_avendor_bootimg_addr and set_abootimg_addr functions which are only defined in cmd/abootimg.c, only built when CMD_ABOOTIMG=y so let's add a dependency. It should be "depends on" to be properly implemented, but we get a circular dependency otherwise: boot/Kconfig:566:error: recursive dependency detected! boot/Kconfig:566: symbol BOOTMETH_ANDROID depends on CMD_ABOOTIMG cmd/Kconfig:504: symbol CMD_ABOOTIMG depends on ANDROID_BOOT_IMAGE boot/Kconfig:7: symbol ANDROID_BOOT_IMAGE is selected by BOOTMETH_ANDROID so instead we do a select. It is safe because CMD_ABOOTIMG depends on ANDROID_BOOT_IMAGE which we select here as well. Fixes: 125d9f3306ea ("bootstd: Add a bootmeth for Android") Signed-off-by: Quentin Schulz Reviewed-by: Kory Maincent Reviewed-by: Mattijs Korpershoek Link: https://lore.kernel.org/r/20251218-bootmeth_android-deps-v1-1-0113c804f951@cherry.de Signed-off-by: Mattijs Korpershoek --- boot/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/Kconfig b/boot/Kconfig index 676a42a6ed4..b090f3c4c11 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -550,6 +550,7 @@ config BOOTMETH_ANDROID depends on X86 || ARM || SANDBOX depends on CMDLINE select ANDROID_BOOT_IMAGE + select CMD_ABOOTIMG select CMD_BCB imply CMD_FASTBOOT imply FASTBOOT if !NET_LWIP