diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-22 12:37:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-22 12:37:02 -0500 |
| commit | 8f7a16aac36c2a38956bd04b53cb7b94b7a70180 (patch) | |
| tree | 850e11d2c25da6a0b622a8e6fb9982e3e46bcb9f /configs | |
| parent | bced796e2dadc708ce213170d36be7f0428618a1 (diff) | |
| parent | 2d339efb1ff941705a770e93494427912689ce18 (diff) | |
| download | u-boot-8f7a16aac36c2a38956bd04b53cb7b94b7a70180.tar.gz u-boot-8f7a16aac36c2a38956bd04b53cb7b94b7a70180.tar.bz2 u-boot-8f7a16aac36c2a38956bd04b53cb7b94b7a70180.zip | |
Merge tag 'u-boot-amlogic-20210222' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- adds adc-keys button driver
- fix meson-saradc driver to get reference voltage
- add adc-keys test for sandbox
- enable adc-keys for VIM3 & VIM3L boards
- fix button.h build
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/khadas-vim3_defconfig | 2 | ||||
| -rw-r--r-- | configs/khadas-vim3l_defconfig | 2 | ||||
| -rw-r--r-- | configs/sandbox_defconfig | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/configs/khadas-vim3_defconfig b/configs/khadas-vim3_defconfig index 5d16652fd6..bc17430569 100644 --- a/configs/khadas-vim3_defconfig +++ b/configs/khadas-vim3_defconfig @@ -31,6 +31,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_ADC=y CONFIG_SARADC_MESON=y +CONFIG_BUTTON=y +CONFIG_BUTTON_ADC=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_MESON=y CONFIG_DM_MMC=y diff --git a/configs/khadas-vim3l_defconfig b/configs/khadas-vim3l_defconfig index 6b13ce045c..c1877922c7 100644 --- a/configs/khadas-vim3l_defconfig +++ b/configs/khadas-vim3l_defconfig @@ -31,6 +31,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_ADC=y CONFIG_SARADC_MESON=y +CONFIG_BUTTON=y +CONFIG_BUTTON_ADC=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_MESON=y CONFIG_DM_MMC=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index fc1df3114c..a485b38f41 100644 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@ -123,6 +123,7 @@ CONFIG_DM_BOOTCOUNT=y CONFIG_DM_BOOTCOUNT_RTC=y CONFIG_DM_BOOTCOUNT_I2C_EEPROM=y CONFIG_BUTTON=y +CONFIG_BUTTON_ADC=y CONFIG_BUTTON_GPIO=y CONFIG_CLK=y CONFIG_CLK_COMPOSITE_CCF=y |