On Sun, 2018-09-16 at 18:23 +0100, Peter Robinson wrote: > Migrate TEGRA_KEYBOARD from headers to Kconfig, only the seaboard > uses it but we > drop CONFIG_KEYBOARD as the driver doesn't use the legacy > drv_keyboard_init. > > Signed-off-by: Peter Robinson <pbrobin...@gmail.com> > Cc: Tom Warren <twar...@nvidia.com> > Cc: Stephen Warren <swar...@nvidia.com>
Reviewed-by: Marcel Ziswiler <marcel.ziswi...@toradex.com> > --- > configs/seaboard_defconfig | 1 + > drivers/input/Kconfig | 6 ++++++ > include/configs/seaboard.h | 4 ---- > scripts/config_whitelist.txt | 1 - > 4 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/configs/seaboard_defconfig b/configs/seaboard_defconfig > index 917ddcce3f3..f9638e6016d 100644 > --- a/configs/seaboard_defconfig > +++ b/configs/seaboard_defconfig > @@ -23,6 +23,7 @@ CONFIG_CMD_EXT4_WRITE=y > CONFIG_DEFAULT_DEVICE_TREE="tegra20-seaboard" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_SYS_I2C_TEGRA=y > +CONFIG_TEGRA_KEYBOARD=y > CONFIG_SPL_DM=y > CONFIG_DM_PMIC=y > CONFIG_DM_REGULATOR=y > diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig > index 7ffb949f12d..a1353848c22 100644 > --- a/drivers/input/Kconfig > +++ b/drivers/input/Kconfig > @@ -25,6 +25,12 @@ config I8042_KEYB > variable 'keymap' to "de" to select German. Keyboard > repeat is > handled by the keyboard itself. > > +config TEGRA_KEYBOARD > + bool "NVIDIA Tegra internal matrix keyboard controller > support" > + help > + A matrix keyboard connected directly to the internal > keyboard > + controller on Tegra SoCs. > + > config TWL4030_INPUT > bool "Enable TWL4030 Input controller" > help > diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h > index c5fa9cc4208..5df013b0b32 100644 > --- a/include/configs/seaboard.h > +++ b/include/configs/seaboard.h > @@ -31,10 +31,6 @@ > #define CONFIG_SYS_MMC_ENV_DEV 0 > #define CONFIG_SYS_MMC_ENV_PART 2 > > -/* Enable keyboard */ > -#define CONFIG_TEGRA_KEYBOARD > -#define CONFIG_KEYBOARD > - > /* NAND support */ > #define CONFIG_TEGRA_NAND > > diff --git a/scripts/config_whitelist.txt > b/scripts/config_whitelist.txt > index 5813e884e2f..3dc14a2dd92 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -4436,7 +4436,6 @@ CONFIG_TEGRA_ENABLE_UARTC > CONFIG_TEGRA_ENABLE_UARTD > CONFIG_TEGRA_ENABLE_UARTE > CONFIG_TEGRA_GPU > -CONFIG_TEGRA_KEYBOARD > CONFIG_TEGRA_LP0 > CONFIG_TEGRA_NAND > CONFIG_TEGRA_PMU _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
