bcm27xx: select I2C/SPI packages by default

The I2C and SPI packages required for each RPi generation is different.
Therefore, in order to avoid confusion let's select them by default.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
(cherry picked from commit 9117ff7b3969e57e9074e889d35f487f441e4569)

diff --git a/target/linux/bcm27xx/bcm2712/config-6.6 b/target/linux/bcm27xx/bcm2712/config-6.6
index daca22db8d52880d2ed681c3ab5376e5fc5e9011..24f59326ae733d6c3f5f57a5f1547cdedce2e947 100644 (file)
--- a/target/linux/bcm27xx/bcm2712/config-6.6
+++ b/target/linux/bcm27xx/bcm2712/config-6.6
@@ -320,13 +320,8 @@ CONFIG_HW_CONSOLE=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_IPROC_RNG200=y
 CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_BCM2708 is not set
-CONFIG_I2C_BCM2835=y
 CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_BRCMSTB=y
-CONFIG_I2C_DESIGNWARE_CORE=y
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_INPUT=y
 CONFIG_INPUT_MOUSEDEV=y

diff --git a/target/linux/bcm27xx/image/Makefile b/target/linux/bcm27xx/image/Makefile
index 0ded372a3f27290d771b3e2d6a23dd102aa70b1a..8320855573a4554f54e6b6d98d4a9638c85136e8 100644 (file)
--- a/target/linux/bcm27xx/image/Makefile
+++ b/target/linux/bcm27xx/image/Makefile
@@ -88,7 +88,9 @@ define Device/rpi
   DEVICE_PACKAGES := \
        cypress-firmware-43430-sdio \
        brcmfmac-nvram-43430-sdio \
-       kmod-brcmfmac wpad-basic-mbedtls
+       kmod-brcmfmac wpad-basic-mbedtls \
+       kmod-i2c-bcm2835 kmod-spi-bcm2835 \
+       kmod-spi-bcm2835-aux
 endef
 ifeq ($(SUBTARGET),bcm2708)
   TARGET_DEVICES += rpi
@@ -127,7 +129,9 @@ define Device/rpi-2
        brcmfmac-nvram-43430-sdio \
        cypress-firmware-43455-sdio \
        brcmfmac-nvram-43455-sdio \
-       kmod-brcmfmac wpad-basic-mbedtls
+       kmod-brcmfmac wpad-basic-mbedtls \
+       kmod-i2c-bcm2835 kmod-spi-bcm2835 \
+       kmod-spi-bcm2835-aux
   IMAGE/sysupgrade.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip | append-metadata
   IMAGE/factory.img.gz := boot-common | boot-2708 | boot-2711 | sdcard-img | gzip
 endef
@@ -161,7 +165,9 @@ define Device/rpi-3
        brcmfmac-nvram-43430-sdio \
        cypress-firmware-43455-sdio \
        brcmfmac-nvram-43455-sdio \
-       kmod-brcmfmac wpad-basic-mbedtls
+       kmod-brcmfmac wpad-basic-mbedtls \
+       kmod-i2c-bcm2835 kmod-spi-bcm2835 \
+       kmod-spi-bcm2835-aux
 endef
 ifeq ($(SUBTARGET),bcm2710)
   TARGET_DEVICES += rpi-3
@@ -183,6 +189,9 @@ define Device/rpi-4
        cypress-firmware-43455-sdio \
        brcmfmac-nvram-43455-sdio \
        kmod-brcmfmac wpad-basic-mbedtls \
+       kmod-i2c-bcm2835 kmod-spi-bcm2835 \
+       kmod-spi-bcm2835-aux \
+       kmod-i2c-brcmstb \
        kmod-usb-net-lan78xx \
        kmod-r8169
   IMAGE/sysupgrade.img.gz := boot-common | boot-2711 | sdcard-img | gzip | append-metadata
@@ -210,6 +219,9 @@ define Device/rpi-5
        cypress-firmware-43455-sdio \
        brcmfmac-nvram-43455-sdio \
        kmod-brcmfmac wpad-basic-mbedtls \
+       kmod-i2c-bcm2835 kmod-spi-bcm2835 \
+       kmod-i2c-brcmstb \
+       kmod-i2c-designware-platform kmod-spi-dw-mmio \
        kmod-hwmon-pwmfan kmod-thermal
   IMAGE/sysupgrade.img.gz := boot-common | sdcard-img | gzip | append-metadata
   IMAGE/factory.img.gz := boot-common | sdcard-img | gzip