From: Daniel Golle Date: Sun, 19 Jul 2026 01:52:11 +0000 (+0100) Subject: rockchip: only build GPT capsule update helpers with PARTITION_TYPE_GUID X-Git-Tag: v2026.10-rc1~2^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bc0f812735350831c6b63fa163c02ecdf61694c;p=thirdparty%2Fu-boot.git rockchip: only build GPT capsule update helpers with PARTITION_TYPE_GUID The GPT-based capsule update helpers match updatable images by partition type GUID and fail to build if PARTITION_TYPE_GUID is not enabled: arch/arm/mach-rockchip/board.c:50:29: error: 'struct disk_partition' has no member named 'type_guid' Boards which keep their firmware on SPI-NOR use a static dfu_string instead of scanning GPT partitions and have no use for this code, so guard it accordingly. Signed-off-by: Daniel Golle Reviewed-by: Quentin Schulz Fixes: bea9267d7e6d ("rockchip: capsule: Add functions for supporting capsule updates") Link: https://patch.msgid.link/af0ac32e2bf603c39f490f15fe62319fd73c5282.1784423864.git.daniel@makrotopia.org Signed-off-by: Quentin Schulz --- diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 2e6bb38b923..98c890d3bdc 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -35,7 +35,8 @@ #include #include -#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && IS_ENABLED(CONFIG_EFI_PARTITION) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && IS_ENABLED(CONFIG_EFI_PARTITION) && \ + IS_ENABLED(CONFIG_PARTITION_TYPE_GUID) #define DFU_ALT_BUF_LEN SZ_1K @@ -193,7 +194,8 @@ int board_late_init(void) { setup_boot_mode(); -#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && IS_ENABLED(CONFIG_EFI_PARTITION) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && IS_ENABLED(CONFIG_EFI_PARTITION) && \ + IS_ENABLED(CONFIG_PARTITION_TYPE_GUID) gpt_capsule_update_setup(); #endif