Adjust RK3328 sources and patches, tested for builing, adjust Nanopi K2 board config

config/boards/nanopik2-s905.conf

@@ -1,4 +1,4 @@
-# S905 K2 quad core
+# S905 K2 quad core 2GB SoC WiFi eMMC
 BOARD_NAME="Nanopi K2"
 BOARDFAMILY="meson64"
 BOOTCONFIG="nanopi-k2_defconfig"
@@ -7,7 +7,8 @@ MODULES=""
 MODULES_NEXT=""
 #
 KERNEL_TARGET="default,next,dev"
-CLI_TARGET=""
+CLI_TARGET="stretch:default,next"
 CLI_BETA_TARGET=""
-DESKTOP_TARGET=""
-DESKTOP_BETA_TARGET=""
+DESKTOP_TARGET="stretch:default,next"
+DESKTOP_BETA_TARGET=""
+

config/kernel/linux-rk3328-default.config

@@ -12,8 +12,8 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_ARM64_PAGE_SHIFT=12
 CONFIG_ARM64_CONT_SHIFT=4
-CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -568,6 +568,7 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=y
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
+CONFIG_CPU_FREQ_TIMES=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
@@ -1151,6 +1152,7 @@ CONFIG_BT_DEBUGFS=y
 CONFIG_BT_INTEL=y
 CONFIG_BT_BCM=y
 CONFIG_BT_RTL=y
+CONFIG_BT_QCA=y
 CONFIG_BT_RTKBTUSB=m
 CONFIG_BT_HCIBTUSB=y
 CONFIG_BT_HCIBTUSB_BCM=y
@@ -1995,12 +1997,11 @@ CONFIG_WL_ROCKCHIP=y
 # CONFIG_WIFI_BUILD_MODULE is not set
 # CONFIG_WIFI_LOAD_DRIVER_WHEN_KERNEL_BOOTUP is not set
 CONFIG_AP6XXX=m
+CONFIG_CYW_BCMDHD=m
 # CONFIG_RTL_WIRELESS_SOLUTION is not set
 CONFIG_RTL8188FU=m
 # CONFIG_RTL8189ES is not set
 # CONFIG_RTL8189FS is not set
-CONFIG_RTL8192DU=m
-CONFIG_RTL8723AU=m
 # CONFIG_RTL8723BS is not set
 CONFIG_RTL8723BU=m
 # CONFIG_RTL8723CS is not set
@@ -2780,7 +2781,7 @@ CONFIG_ROCKCHIP_THERMAL=y
 # CONFIG_RK_VIRTUAL_THERMAL is not set
 # CONFIG_RK3368_THERMAL is not set
 CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_CORE is not set
+CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
 #
@@ -3655,9 +3656,7 @@ CONFIG_MALI_SHARED_INTERRUPTS=y
 CONFIG_MALI_DT=y
 CONFIG_MALI_DEVFREQ=y
 # CONFIG_MALI_QUIET is not set
-# CONFIG_MALI_MIDGARD_FOR_ANDROID is not set
-CONFIG_MALI_MIDGARD_FOR_LINUX=y
-CONFIG_MALI_MIDGARD=y
+# CONFIG_MALI_MIDGARD is not set
 # CONFIG_MALI_GATOR_SUPPORT is not set
 # CONFIG_MALI_MIDGARD_ENABLE_TRACE is not set
 # CONFIG_MALI_DMA_FENCE is not set
@@ -3894,6 +3893,7 @@ CONFIG_SND_SOC_ROCKCHIP=y
 # CONFIG_SND_SOC_ROCKCHIP_FORCE_SRAM is not set
 CONFIG_SND_SOC_ROCKCHIP_I2S=y
 CONFIG_SND_SOC_ROCKCHIP_I2S_TDM=m
+# CONFIG_SND_SOC_ROCKCHIP_MULTI_DAIS is not set
 # CONFIG_SND_SOC_ROCKCHIP_PDM is not set
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=y
 # CONFIG_SND_SOC_ROCKCHIP_VAD is not set
@@ -4532,6 +4532,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_DS1374 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
 # CONFIG_RTC_DRV_DS3232 is not set
+# CONFIG_RTC_DRV_FAKE is not set
 CONFIG_RTC_DRV_HYM8563=y
 # CONFIG_RTC_DRV_MAX6900 is not set
 CONFIG_RTC_DRV_RK808=y
@@ -4755,6 +4756,7 @@ CONFIG_ASHMEM=y
 # CONFIG_ANDROID_TIMED_OUTPUT is not set
 # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
 # CONFIG_SYNC is not set
+# CONFIG_ANDROID_VSOC is not set
 # CONFIG_ION is not set
 CONFIG_FIQ_DEBUGGER=y
 CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
@@ -5060,6 +5062,7 @@ CONFIG_SENSORS_TSL2563=y
 # CONFIG_TSL4531 is not set
 # CONFIG_US5182D is not set
 # CONFIG_VCNL4000 is not set
+CONFIG_VL6180=m
 
 #
 # Magnetometer sensors
@@ -5121,8 +5124,10 @@ CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_CROS_EC is not set
 # CONFIG_PWM_FSL_FTM is not set
+CONFIG_PWM_GPIO=m
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_ROCKCHIP=y
+CONFIG_PWM_ROCKCHIP_I2S=m
 CONFIG_IRQCHIP=y
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_V2M=y
@@ -5179,6 +5184,14 @@ CONFIG_ROCKCHIP_EFUSE=y
 #
 # CONFIG_FPGA is not set
 # CONFIG_TEE is not set
+CONFIG_RK_FLASH=m
+
+#
+# Rockchip Flash Devices
+#
+# CONFIG_RK_NANDC_NAND is not set
+# CONFIG_RK_SFC_NAND is not set
+# CONFIG_RK_SFC_NOR is not set
 # CONFIG_RK_NAND is not set
 
 #
@@ -5294,6 +5307,7 @@ CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_UID=y
 CONFIG_KERNFS=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
@@ -5847,6 +5861,7 @@ CONFIG_CRYPTO_USER_API_RNG=y
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_CCP is not set
+CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_PUBLIC_KEY_ALGO_RSA=y
@@ -5869,6 +5884,7 @@ CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
 # CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
 # CONFIG_CRYPTO_CRC32_ARM64 is not set
+CONFIG_CRYPTO_SPECK_NEON=m
 CONFIG_BINARY_PRINTF=y
 
 #

config/sources/rk3328.conf

@@ -27,7 +27,7 @@ case $BRANCH in
 	default)
 
 		KERNELSOURCE='https://github.com/ayufan-rock64/linux-kernel'
-		KERNELBRANCH='tag:ayufan-rock64/linux-build/0.6.45'
+		KERNELBRANCH='tag:4.4.132-1072-rockchip-ayufan'
 		KERNELDIR='linux-rk3328'
 		KERNEL_USE_GCC='< 6.3'