Rockchip: next update

packages/tools/u-boot/patches/rockchip/u-boot-0005-rockchip-rk3288-get-serial-and-ethaddr-from-efuse.patch

@@ -1,13 +1,13 @@
-From 050dd4323a9fe8515259fe855c31da6d1ad459e2 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jonas Karlman <jonas@kwiboo.se>
 Date: Sun, 5 Aug 2018 20:58:54 +0200
 Subject: [PATCH] rockchip: rk3288: get serial and ethaddr from efuse
 
 ---
  arch/arm/dts/rk3288.dtsi        | 5 ++---
- configs/miqi-rk3288_defconfig   | 2 ++
- configs/tinker-rk3288_defconfig | 1 +
- 3 files changed, 5 insertions(+), 3 deletions(-)
+ configs/miqi-rk3288_defconfig   | 3 +++
+ configs/tinker-rk3288_defconfig | 2 ++
+ 3 files changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
 index 20adb0dece..8b085ee6dc 100644
@@ -26,27 +26,29 @@ index 20adb0dece..8b085ee6dc 100644
 
  	gic: interrupt-controller@ffc01000 {
 diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
-index 09d5979dff..ffbe701cfd 100644
+index 09d5979dff..77d8f7dffc 100644
 --- a/configs/miqi-rk3288_defconfig
 +++ b/configs/miqi-rk3288_defconfig
-@@ -48,6 +48,8 @@ CONFIG_ROCKCHIP_GPIO=y
+@@ -48,6 +48,9 @@ CONFIG_ROCKCHIP_GPIO=y
  CONFIG_SYS_I2C_ROCKCHIP=y
  CONFIG_DM_KEY=y
  CONFIG_ADC_KEY=y
 +CONFIG_MISC=y
 +CONFIG_ROCKCHIP_EFUSE=y
++CONFIG_SHA256=y
  CONFIG_MMC_DW=y
  CONFIG_MMC_DW_ROCKCHIP=y
  CONFIG_DM_ETH=y
 diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
-index 3abf7c1088..0afc0a35e1 100644
+index 3abf7c1088..52196194c9 100644
 --- a/configs/tinker-rk3288_defconfig
 +++ b/configs/tinker-rk3288_defconfig
-@@ -46,6 +46,7 @@ CONFIG_SPL_CLK=y
+@@ -46,6 +46,8 @@ CONFIG_SPL_CLK=y
  CONFIG_ROCKCHIP_GPIO=y
  CONFIG_SYS_I2C_ROCKCHIP=y
  CONFIG_MISC=y
 +CONFIG_ROCKCHIP_EFUSE=y
++CONFIG_SHA256=y
  CONFIG_I2C_EEPROM=y
  CONFIG_MMC_DW=y
  CONFIG_MMC_DW_ROCKCHIP=y

projects/Rockchip/devices/RK3288/linux/default/linux.arm.conf

@@ -2929,6 +2929,7 @@ CONFIG_SMS_SIANO_RC=y
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
+CONFIG_VIDEO_ROCKCHIP_IEP=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
 # CONFIG_DVB_PLATFORM_DRIVERS is not set
 

projects/Rockchip/devices/RK3328/linux/default/linux.aarch64.conf

@@ -3019,6 +3019,7 @@ CONFIG_SMS_SIANO_RC=y
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
+CONFIG_VIDEO_ROCKCHIP_IEP=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
 # CONFIG_DVB_PLATFORM_DRIVERS is not set
 

projects/Rockchip/devices/RK3399/config/kernel-firmware-any.dat

@@ -0,0 +1,12 @@
+rockchip/*
+ath10k/QCA6174
+ath10k/QCA9377
+ath10k/QCA9887
+ath10k/QCA9888
+ath10k/QCA988X
+ath10k/QCA9984
+ath10k/QCA99X0
+iwlwifi-4965-2.ucode
+iwlwifi-5*
+iwlwifi-6*
+mwlwifi/

projects/Rockchip/devices/RK3399/linux/default/linux.aarch64.conf

@@ -2091,7 +2091,8 @@ CONFIG_AR5523=m
 # CONFIG_WIL6210 is not set
 CONFIG_ATH10K=m
 CONFIG_ATH10K_CE=y
-# CONFIG_ATH10K_PCI is not set
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_AHB is not set
 # CONFIG_ATH10K_SDIO is not set
 CONFIG_ATH10K_USB=m
 # CONFIG_ATH10K_DEBUG is not set
@@ -2125,18 +2126,39 @@ CONFIG_BRCMUTIL=m
 # CONFIG_BRCMSMAC is not set
 CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
 CONFIG_BRCMFMAC_SDIO=y
 CONFIG_BRCMFMAC_USB=y
-# CONFIG_BRCMFMAC_PCIE is not set
+CONFIG_BRCMFMAC_PCIE=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
 CONFIG_WLAN_VENDOR_CISCO=y
 CONFIG_WLAN_VENDOR_INTEL=y
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
-# CONFIG_IWL4965 is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
 # CONFIG_IWL3945 is not set
-# CONFIG_IWLWIFI is not set
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# end of Debugging Options
+
 CONFIG_WLAN_VENDOR_INTERSIL=y
 # CONFIG_HOSTAP is not set
 # CONFIG_HERMES is not set
@@ -2158,7 +2180,7 @@ CONFIG_LIBERTAS_THINFIRM=m
 CONFIG_LIBERTAS_THINFIRM_USB=m
 CONFIG_MWIFIEX=m
 # CONFIG_MWIFIEX_SDIO is not set
-# CONFIG_MWIFIEX_PCIE is not set
+CONFIG_MWIFIEX_PCIE=m
 CONFIG_MWIFIEX_USB=m
 # CONFIG_MWL8K is not set
 CONFIG_WLAN_VENDOR_MEDIATEK=y
@@ -2171,17 +2193,17 @@ CONFIG_MT76x02_LIB=m
 CONFIG_MT76x02_USB=m
 CONFIG_MT76x0_COMMON=m
 CONFIG_MT76x0U=m
-# CONFIG_MT76x0E is not set
+CONFIG_MT76x0E=m
 CONFIG_MT76x2_COMMON=m
-# CONFIG_MT76x2E is not set
+CONFIG_MT76x2E=m
 CONFIG_MT76x2U=m
-# CONFIG_MT7603E is not set
+CONFIG_MT7603E=m
 CONFIG_MT7615_COMMON=m
-# CONFIG_MT7615E is not set
+CONFIG_MT7615E=m
 CONFIG_MT7663_USB_SDIO_COMMON=m
 CONFIG_MT7663U=m
 CONFIG_MT7663S=m
-# CONFIG_MT7915E is not set
+CONFIG_MT7915E=m
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
@@ -3499,6 +3521,7 @@ CONFIG_SMS_SIANO_RC=y
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
+CONFIG_VIDEO_ROCKCHIP_IEP=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
 # CONFIG_DVB_PLATFORM_DRIVERS is not set