]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
rockchip: boot_mode: fix rockchip_dnl_key_pressed requiring ADC support
authorQuentin Schulz <quentin.schulz@theobroma-systems.com>
Thu, 14 Mar 2024 09:36:29 +0000 (10:36 +0100)
committerKever Yang <kever.yang@rock-chips.com>
Thu, 14 Mar 2024 10:20:04 +0000 (18:20 +0800)
ADC support is implied by the Rockchip arch Kconfig but that means it
should be possible to disable ADC support and still be able to build.

However the weak implementation of rockchip_dnl_key_pressed() currently
blindly use functions from the ADC subsystem which do not exist when ADC
is not enabled, failing the build.

Therefore, let's encapsulate this logic with a check on the ADC symbol
being selected.

Cc: Quentin Schulz <foss+uboot@0leil.net>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
arch/arm/mach-rockchip/boot_mode.c

index eb8f65ae4e9d76a1b221fcdf32a83d91d3f2939a..f9be396aa558f8fb560e8d9b766d9396fe087028 100644 (file)
@@ -40,6 +40,7 @@ void set_back_to_bootrom_dnl_flag(void)
 
 __weak int rockchip_dnl_key_pressed(void)
 {
+#if CONFIG_IS_ENABLED(ADC)
        unsigned int val;
        struct udevice *dev;
        struct uclass *uc;
@@ -69,6 +70,9 @@ __weak int rockchip_dnl_key_pressed(void)
                return true;
        else
                return false;
+#else
+       return false;
+#endif
 }
 
 void rockchip_dnl_mode_check(void)