diff options
| author | Tom Rini <trini@konsulko.com> | 2024-03-15 09:15:31 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-03-15 09:15:31 -0400 |
| commit | 099c94b7613bb10d97936447f5136f3a36694325 (patch) | |
| tree | 69bb43d1270009932f22fa220137b1ca025cea6b /arch/arm/mach-rockchip/boot_mode.c | |
| parent | cacc0b2678c03d694e8be70f8e7b7601825f1c0f (diff) | |
| parent | 12bc1a5462a22f6dc5b91ecbf092cbaf94e66820 (diff) | |
Merge tag 'u-boot-rockchip-20240315' of https://source.denx.de/u-boot/custodians/u-boot-rockchip into next
Please pull the updates for rockchip platform:
- Add board: rk3588 Generic, Cool Pi CM5, Theobroma-Systems RK3588 Jaguar SBC,
Toybrick TB-RK3588X;
rk3588s Cool Pi 4B;
rk3566 Pine64 PineTab2;
- Add saradc v2 support;
- Add PMIC RK806 support;
- rk3588 disable force_jtag by default;
- Migrate to use IO-domain driver for all boards;
- Use common bss and stack addresses for rk33xx and rk35xx boards;
- Other updates for driver, config and dts;
Diffstat (limited to 'arch/arm/mach-rockchip/boot_mode.c')
| -rw-r--r-- | arch/arm/mach-rockchip/boot_mode.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/boot_mode.c b/arch/arm/mach-rockchip/boot_mode.c index eb8f65ae4e9..f9be396aa55 100644 --- a/arch/arm/mach-rockchip/boot_mode.c +++ b/arch/arm/mach-rockchip/boot_mode.c @@ -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) |