diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-11-15 14:21:13 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-11-15 14:21:13 +0100 |
| commit | 42cdd1452a51ca970a6cda76e3bdbe4f04d6e13f (patch) | |
| tree | e977baadd93fd72759c1c0b96aee77090950b39b /arch/arm/configs | |
| parent | 71f347dadfd9d19b57c4bda1ff446add38081e92 (diff) | |
| parent | f1d33492703334c6a8c813c4af546a1d6d87c385 (diff) | |
| download | barebox-42cdd1452a51ca970a6cda76e3bdbe4f04d6e13f.tar.gz barebox-42cdd1452a51ca970a6cda76e3bdbe4f04d6e13f.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/stm32mp_defconfig | 7 | ||||
| -rw-r--r-- | arch/arm/configs/zynq_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/zynqmp_defconfig | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/configs/stm32mp_defconfig b/arch/arm/configs/stm32mp_defconfig index 49041b1f48..eb3c95b12c 100644 --- a/arch/arm/configs/stm32mp_defconfig +++ b/arch/arm/configs/stm32mp_defconfig @@ -82,6 +82,7 @@ CONFIG_CMD_FLASH=y CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y CONFIG_CMD_POWEROFF=y +CONFIG_CMD_SPI=y CONFIG_CMD_WD=y CONFIG_CMD_BAREBOX_UPDATE=y CONFIG_CMD_OF_DIFF=y @@ -102,9 +103,12 @@ CONFIG_DRIVER_NET_DESIGNWARE_STM32=y CONFIG_AT803X_PHY=y CONFIG_MICREL_PHY=y CONFIG_REALTEK_PHY=y -# CONFIG_SPI is not set +CONFIG_DRIVER_SPI_STM32=y CONFIG_I2C=y CONFIG_I2C_STM32=y +CONFIG_MTD=y +CONFIG_MTD_M25P80=y +CONFIG_MTD_SST25L=y CONFIG_USB_HOST=y CONFIG_USB_DWC2_HOST=y CONFIG_USB_DWC2_GADGET=y @@ -126,6 +130,7 @@ CONFIG_LED_GPIO=y CONFIG_LED_PWM=y CONFIG_LED_GPIO_OF=y CONFIG_LED_TRIGGERS=y +CONFIG_EEPROM_AT25=y CONFIG_EEPROM_AT24=y CONFIG_KEYBOARD_GPIO=y CONFIG_INPUT_SPECIALKEYS=y diff --git a/arch/arm/configs/zynq_defconfig b/arch/arm/configs/zynq_defconfig index a16c57d5ce..38662eeb5d 100644 --- a/arch/arm/configs/zynq_defconfig +++ b/arch/arm/configs/zynq_defconfig @@ -45,3 +45,4 @@ CONFIG_DRIVER_NET_MACB=y # CONFIG_PINCTRL is not set CONFIG_FS_TFTP=y CONFIG_DIGEST=y +CONFIG_GPIO_ZYNQ=y diff --git a/arch/arm/configs/zynqmp_defconfig b/arch/arm/configs/zynqmp_defconfig index 2cd8781332..8dd0f40b3d 100644 --- a/arch/arm/configs/zynqmp_defconfig +++ b/arch/arm/configs/zynqmp_defconfig @@ -64,3 +64,4 @@ CONFIG_FS_NFS=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y CONFIG_DIGEST=y +CONFIG_GPIO_ZYNQ=y |