rpi: update firmware, kernel and fixup more stuff

6 files changed, 35 insertions, 13 deletions

diff --git a/target/config/Config.in.addons b/target/config/Config.in.addons
index 241ff1b20..f26804e4a 100644
--- a/target/config/Config.in.addons
+++ b/target/config/Config.in.addons
@@ -46,20 +46,33 @@ depends on ( ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX ) \
 	|| ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64 )
 
 config ADK_TARGET_HARDWARE_RPI3_SERIAL
-	bool "enable serial"
+	bool "serial"
+	select ADK_TARGET_HARDWARE_RPI3_NO_BT
 	select ADK_LINUX_KERNEL_SERIAL_AMBA_PL011 if ADK_TARGET_OS_LINUX
 	select ADK_WALDUX_KERNEL_SERIAL_AMBA_PL011 if ADK_TARGET_OS_WALDUX
 
 config ADK_TARGET_HARDWARE_RPI3_BT
-	bool "enable bluetooth"
+	bool "bluetooth"
 	select ADK_LINUX_KERNEL_BT_HCIUART_BCM m if ADK_TARGET_OS_LINUX
 	select ADK_WALDUX_KERNEL_BT_HCIUART_BCM m if ADK_TARGET_OS_WALDUX
 
 config ADK_TARGET_HARDWARE_RPI3_NONE
-	bool "disable serial and bluetooth"
+	bool "none"
 
 endchoice
 
+config ADK_TARGET_HARDWARE_RPI3_NO_BT
+	bool
+
+config ADK_TARGET_HARDWARE_RPI3_NO_WIFI
+	bool "Disable wifi"
+	depends on ( ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX ) \
+		&& ( ADK_TARGET_SYSTEM_RASPBERRY_PI3 \
+		|| ADK_TARGET_SYSTEM_RASPBERRY_PI3P \
+		|| ADK_TARGET_SYSTEM_RASPBERRY_PI3_64 \
+		|| ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64 )
+
+
 choice
 prompt "Audio Board Addon"
 depends on (ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX) && ADK_TARGET_BOARD_BCM28XX
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 5403df361..974a2e3f2 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -723,13 +723,11 @@ depends on ADK_TARGET_BOARD_BCM28XX
 
 config ADK_RUNTIME_MPEG2_KEY
 	string "MPEG2"
-	default "0x12345678"
 	help
 	  Hardware-specific license key for MPEG2 decoding.
 
 config ADK_RUNTIME_VC1_KEY
 	string "VC-1"
-	default "0x12345678"
 	help
 	  Hardware-specific license key for VC-1 decoding.
 
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index 103485cc0..3a4b09f6d 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -205,7 +205,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT
 	depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	default "6064a9bdf48cefbccc4f6472dd04251f0dec1931" if ADK_TARGET_ARCH_CSKY
 	default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32
-	default "865ddc1393f558198e7e7ce70928ff2e49c4f7f6" if ADK_TARGET_BOARD_BCM28XX
+	default "a2092141807514666a273971cc8fa9e80f14439f" if ADK_TARGET_BOARD_BCM28XX
 	default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537
 	default "e7c8afc1dda7b7c18596d90ad6a17ae886650b72" if ADK_TARGET_SYSTEM_KINETIS_K70
 	default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
@@ -221,7 +221,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT_VER
 	default "4.9.56" if ADK_TARGET_ARCH_CSKY
 	default "4.15.0" if ADK_TARGET_ARCH_RISCV32
 	default "4.15.0" if ADK_TARGET_ARCH_RISCV64
-	default "4.14.39" if ADK_TARGET_BOARD_BCM28XX
+	default "4.14.43" if ADK_TARGET_BOARD_BCM28XX
 	default "4.4.37" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	default "4.4.52" if ADK_TARGET_SYSTEM_PHYTEC_WEGA
 	default "2.6.33" if ADK_TARGET_SYSTEM_KINETIS_K70
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 23b601f49..4cdc2ba22 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -126,6 +126,9 @@ config ADK_LINUX_KERNEL_CONNECTOR
 config ADK_LINUX_KERNEL_MMC
 	bool
 
+config ADK_LINUX_KERNEL_MMC_SPI
+	bool
+
 config ADK_LINUX_KERNEL_MMC_BLOCK
 	bool
 
@@ -144,6 +147,9 @@ config ADK_LINUX_KERNEL_MMC_SDHCI_IO_ACCESSORS
 config ADK_LINUX_KERNEL_MMC_SDHCI_PLTFM
 	bool
 
+config ADK_LINUX_KERNEL_MMC_BCM2835_MMC
+	bool
+
 config ADK_LINUX_KERNEL_MMC_BCM2835_DMA
 	bool
 
@@ -453,6 +459,7 @@ config ADK_LINUX_KERNEL_MMC_BCM2835
 	select ADK_LINUX_KERNEL_LBDAF
 	select ADK_LINUX_KERNEL_SCSI
 	select ADK_LINUX_KERNEL_MMC
+	select ADK_LINUX_KERNEL_MMC_SPI
 	select ADK_LINUX_KERNEL_MMC_BLOCK
 	select ADK_LINUX_KERNEL_MMC_BLOCK_BOUNCE
 	select ADK_LINUX_KERNEL_BLK_DEV
@@ -463,6 +470,7 @@ config ADK_LINUX_KERNEL_MMC_BCM2835
 	select ADK_LINUX_KERNEL_MMC_SDHCI
 	select ADK_LINUX_KERNEL_MMC_SDHCI_PLTFM
 	select ADK_LINUX_KERNEL_MMC_BCM2835_DMA
+	select ADK_LINUX_KERNEL_MMC_BCM2835_MMC
 	select ADK_LINUX_KERNEL_MMC_BCM2835_SDHOST
 	depends on ADK_TARGET_BOARD_BCM28XX
 	default y if ADK_TARGET_BOARD_BCM28XX
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index dff5c09f1..49f0a1202 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -137,8 +137,7 @@ config ADK_LINUX_KERNEL_BT_HCIUART_BCM
 	select ADK_LINUX_KERNEL_BT_HCIUART
 	select ADK_LINUX_KERNEL_BT_HCIUART_3WIRE
 	select ADK_LINUX_KERNEL_BT_BCM
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI3
-	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI3P
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI3 || ADK_TARGET_SYSTEM_RASPBERRY_PI3P
 	default n
 	help
 	  The Broadcom protocol support enables Bluetooth HCI over serial
diff --git a/target/linux/config/Config.in.wireless b/target/linux/config/Config.in.wireless
index 4623f6ef2..ecc855b50 100644
--- a/target/linux/config/Config.in.wireless
+++ b/target/linux/config/Config.in.wireless
@@ -133,6 +133,9 @@ depends on ADK_TARGET_WITH_CARDBUS \
 	|| ADK_TARGET_WITH_SDIO \
 	|| ADK_TARGET_GENERIC
 
+config ADK_LINUX_KERNEL_BRCMDBG
+	bool
+
 config ADK_LINUX_KERNEL_BRCMFMAC
 	tristate "Broadcom brcmfmac wireless driver"
 	select ADK_LINUX_KERNEL_WIRELESS
@@ -141,24 +144,25 @@ config ADK_LINUX_KERNEL_BRCMFMAC
 	select ADK_LINUX_KERNEL_BCMA_POSSIBLE
 	select ADK_LINUX_KERNEL_RFKILL
 	select ADK_LINUX_KERNEL_WLAN_VENDOR_BROADCOM
+	select ADK_LINUX_KERNEL_BRCMDBG
 	select ADK_PACKAGE_BRCMFMAC_FIRMWARE
 
 config ADK_LINUX_KERNEL_BRCMFMAC_SDIO
 	bool "Broadcom brcmfmac wireless driver (SDIO)"
-	select ADK_LINUX_KERNEL_BRCMFMAC m
+	select ADK_LINUX_KERNEL_BRCMFMAC
 	depends on ADK_TARGET_WITH_SDIO
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI0
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3P
 	default n
 	help
 	  Driver for Broadcom FullMac wireless cards (SDIO).
 
 config ADK_LINUX_KERNEL_BRCMFMAC_USB
 	bool "Broadcom brcmfmac wireless driver (USB)"
-	select ADK_LINUX_KERNEL_BRCMFMAC m
+	select ADK_LINUX_KERNEL_BRCMFMAC
 	depends on ADK_TARGET_WITH_USB
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3
-	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3P
 	default n
 	help
 	  Driver for Broadcom FullMac wireless cards (USB).