Merge branch 'master' of https://github.com/armbian/build

config/boards/pinebook-pro.wip

@@ -0,0 +1,6 @@
+# RK3399 hexa core 2G/4GB SoC Laptop eMMC USB3 WiFi
+BOARD_NAME="Pinebook Pro"
+BOARDFAMILY="rockchip64"
+BOOTCONFIG="pinebook_pro-rk3399_defconfig"
+KERNEL_TARGET="legacy,current,dev"
+FULL_DESKTOP="yes"

config/kernel/linux-meson64-legacy.config

@@ -2529,7 +2529,8 @@ CONFIG_WLAN_VENDOR_TI=y
 # CONFIG_WL18XX is not set
 # CONFIG_WLCORE is not set
 CONFIG_RTL8822BU=m
-CONFIG_RTL8188EUS=m
+CONFIG_RTL8188EU=m
+CONFIG_RTL8821CU=m
 CONFIG_RTL8812AU=m
 CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_USB_ZD1201=m

config/kernel/linux-mvebu64-current.config

@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.19.53 Kernel Configuration
+# Linux/arm64 4.19.91 Kernel Configuration
 #
 
 #
-# Compiler: aarch64-linux-gnu-gcc (Linaro GCC 7.4-2019.02) 7.4.1 20181213 [linaro-7.4-2019.02 revision 56ec6f6b99cc167ff0c2f8e1a2eed33b1edc85d4]
+# Compiler: aarch64-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 8.3-2019.03 (arm-rel-8.36)) 8.3.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=70401
+CONFIG_GCC_VERSION=80300
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -541,6 +541,7 @@ CONFIG_ARM_SCPI_POWER_DOMAIN=m
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
+CONFIG_ISCSI_IBFT=m
 # CONFIG_FW_CFG_SYSFS is not set
 CONFIG_HAVE_ARM_SMCCC=y
 # CONFIG_GOOGLE_FIRMWARE is not set
@@ -1766,6 +1767,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_SYS_HYPERVISOR=y
 CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
@@ -1926,6 +1928,7 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
 CONFIG_BLK_DEV_CRYPTOLOOP=y
 CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_SKD is not set
 # CONFIG_BLK_DEV_SX8 is not set
@@ -2346,6 +2349,7 @@ CONFIG_NET_VENDOR_ALTEON=y
 # CONFIG_ACENIC is not set
 # CONFIG_ALTERA_TSE is not set
 CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
 CONFIG_NET_VENDOR_AMD=y
 # CONFIG_AMD8111_ETH is not set
 # CONFIG_PCNET32 is not set
@@ -2560,7 +2564,7 @@ CONFIG_SWPHY=y
 # CONFIG_SFP is not set
 # CONFIG_AMD_PHY is not set
 # CONFIG_AQUANTIA_PHY is not set
-CONFIG_ASIX_PHY=m
+CONFIG_AX88796B_PHY=m
 # CONFIG_AT803X_PHY is not set
 CONFIG_BCM7XXX_PHY=m
 # CONFIG_BCM87XX_PHY is not set
@@ -2889,7 +2893,7 @@ CONFIG_WLCORE_SDIO=m
 CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_RTL8822BU=m
 CONFIG_RTL8188EU=m
-CONFIG_RTL8821AU=m
+CONFIG_RTL8821CU=m
 CONFIG_RTL8812AU=m
 CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_USB_ZD1201=m
@@ -3672,7 +3676,6 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TPS65086 is not set
 # CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_TPS65217 is not set
-# CONFIG_MFD_TPS68470 is not set
 # CONFIG_MFD_TI_LP873X is not set
 CONFIG_MFD_TI_LP87565=m
 # CONFIG_MFD_TPS65218 is not set
@@ -3907,10 +3910,10 @@ CONFIG_VGA_ARB_MAX_GPUS=16
 #
 # Frame buffer Devices
 #
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
@@ -4224,9 +4227,58 @@ CONFIG_USB_ISP1760_DUAL_ROLE=y
 CONFIG_USB_SERIAL=m
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_UPD78F0730=m
+CONFIG_USB_SERIAL_DEBUG=m
 
 #
 # USB Miscellaneous drivers
@@ -4235,7 +4287,6 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
 # CONFIG_USB_EMI26 is not set
 # CONFIG_USB_ADUTUX is not set
 # CONFIG_USB_SEVSEG is not set
-# CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 # CONFIG_USB_LCD is not set
 # CONFIG_USB_CYPRESS_CY7C63 is not set
@@ -4251,7 +4302,7 @@ CONFIG_USB_SERIAL_FTDI_SIO=m
 # CONFIG_USB_EHSET_TEST_FIXTURE is not set
 # CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_YUREX is not set
-# CONFIG_USB_EZUSB_FX2 is not set
+CONFIG_USB_EZUSB_FX2=m
 # CONFIG_USB_HUB_USB251XB is not set
 # CONFIG_USB_HSIC_USB3503 is not set
 # CONFIG_USB_HSIC_USB4604 is not set
@@ -5470,6 +5521,7 @@ CONFIG_DQL=y
 CONFIG_GLOB=y
 # CONFIG_GLOB_SELFTEST is not set
 CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
 CONFIG_CLZ_TAB=y
 CONFIG_CORDIC=m
 # CONFIG_DDR is not set

config/kernel/linux-mvebu64-legacy.config

@@ -2620,6 +2620,7 @@ CONFIG_WLCORE_SDIO=m
 CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_RTL8822BU=m
 CONFIG_RTL8188EU=m
+CONFIG_RTL8821CU=m
 CONFIG_RTL8812AU=m
 CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_USB_ZD1201=m

config/kernel/linux-rk3399-legacy.config

@@ -2388,6 +2388,7 @@ CONFIG_AP6XXX=y
 # CONFIG_WL_TI is not set
 CONFIG_RTL8822BU=m
 CONFIG_RTL8188EU=m
+CONFIG_RTL8821CU=m
 CONFIG_RTL8812AU=m
 # CONFIG_ZD1211RW is not set
 CONFIG_MWIFIEX=y
@@ -4971,7 +4972,6 @@ CONFIG_USB_CONFIGFS_F_UAC2=y
 CONFIG_USB_CONFIGFS_F_MIDI=y
 CONFIG_USB_CONFIGFS_F_HID=y
 CONFIG_USB_CONFIGFS_F_UVC=y
-# CONFIG_USB_CONFIGFS_F_UVC_ROCKCHIP is not set
 CONFIG_USB_CONFIGFS_F_PRINTER=y
 # CONFIG_USB_ZERO is not set
 CONFIG_USB_AUDIO=m

config/kernel/linux-rockchip64-legacy.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.192 Kernel Configuration
+# Linux/arm64 4.4.198 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -2257,6 +2257,7 @@ CONFIG_MVL88W8977=m
 # CONFIG_SSV6051 is not set
 # CONFIG_WL_TI is not set
 CONFIG_RTL8822BU=m
+CONFIG_RTL8821CU=m
 CONFIG_RTL8812AU=m
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -4646,7 +4647,6 @@ CONFIG_USB_EMI62=m
 CONFIG_USB_EMI26=m
 CONFIG_USB_ADUTUX=m
 CONFIG_USB_SEVSEG=m
-# CONFIG_USB_RIO500 is not set
 # CONFIG_USB_LEGOTOWER is not set
 CONFIG_USB_LCD=m
 CONFIG_USB_LED=m
@@ -5306,6 +5306,7 @@ CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
 # CONFIG_IIO_BUFFER_CB is not set
 CONFIG_IIO_KFIFO_BUF=y
+CONFIG_IIO_TRIGGERED_BUFFER=m
 CONFIG_IIO_TRIGGER=y
 CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 

config/kernel/linux-rockpis-legacy.config

@@ -1666,7 +1666,7 @@ CONFIG_RTL8723DS=m
 # CONFIG_SSV6051 is not set
 # CONFIG_WL_TI is not set
 CONFIG_RTL8822BU=m
-CONFIG_RTL8188EUS=m
+CONFIG_RTL8821CU=m
 CONFIG_RTL8812AU=m
 # CONFIG_ZD1211RW is not set
 # CONFIG_MWIFIEX is not set

config/kernel/linux-sunxi-legacy.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.19.88 Kernel Configuration
+# Linux/arm 4.19.91 Kernel Configuration
 #
 
 #
@@ -2429,13 +2429,14 @@ CONFIG_WLAN_VENDOR_TI=y
 # CONFIG_WL18XX is not set
 # CONFIG_WLCORE is not set
 CONFIG_RTL8822BU=m
-CONFIG_RTL8188EUS=m
-CONFIG_RTL8812AU=m
+CONFIG_RTL8188EU=m
+CONFIG_RTL8821CU=m
 CONFIG_WLAN_VENDOR_XRADIO=m
 CONFIG_XRADIO_NON_POWER_OF_TWO_BLOCKSIZES=y
 # CONFIG_XRADIO_5GHZ_SUPPORT is not set
 # CONFIG_XRADIO_WAPI_SUPPORT is not set
 CONFIG_XRADIO_USE_EXTENSIONS=y
+CONFIG_RTL8812AU=m
 CONFIG_WLAN_VENDOR_ZYDAS=y
 # CONFIG_USB_ZD1201 is not set
 # CONFIG_ZD1211RW is not set

config/sources/families/include/rockchip64_common.inc

@@ -22,7 +22,7 @@ if [[ $BOOTCONFIG == *3328* ]]; then
 	ATF_TARGET_MAP='PLAT=rk322xh DEBUG=1 bl31;;trust.bin'
 	CPUMAX="1390000"
 
-elif [[ $BOARD == rockpro64 ]] || [[ $BOARD == rockpi-4* ]]; then
+elif [[ $BOARD == rockpro64 ]] || [[ $BOARD == rockpi-4* ]] || [[ $BOARD == pinebook-pro ]]; then
 
 	UBOOT_TARGET_MAP="BL31=$SRC/cache/sources/rkbin-tools/rk33/rk3399_bl31_v1.17.elf u-boot-dtb.bin spl/u-boot-spl.bin u-boot.itb;;spl/u-boot-spl.bin u-boot.itb"
 
@@ -113,6 +113,7 @@ family_tweaks()
 	[[ $BOARD == nanopim4v2 ]] && echo "fdtfile=rockchip/rk3399-nanopi-m4v2.dtb" >> $SDCARD/boot/armbianEnv.txt
 	[[ $BOARD == nanopineo4 ]] && echo "fdtfile=rockchip/rk3399-nanopi-neo4.dtb" >> $SDCARD/boot/armbianEnv.txt
 	[[ $BOARD == orangepi-rk3399 ]] && echo "fdtfile=rockchip/rk3399-orangepi.dtb" >> $SDCARD/boot/armbianEnv.txt
+	[[ $BOARD == pinebook-pro ]] && echo "fdtfile=rockchip/rk3399-pinebook-pro.dtb" >> $SDCARD/boot/armbianEnv.txt
 	[[ $BOARD == roc-rk3399-pc ]] && echo "fdtfile=rockchip/rk3399-roc-pc.dtb" >> $SDCARD/boot/armbianEnv.txt
 	[[ $BOARD == rockpi-4* ]] && echo "fdtfile=rockchip/rk3399-rock-pi-4.dtb" >> $SDCARD/boot/armbianEnv.txt
 

config/sources/families/rockchip64.conf

@@ -21,7 +21,7 @@ esac
 uboot_custom_postprocess()
 {
 	# bootloader image
-	if [[ $BOARD == rockpro64 ]] || [[ $BOARD == rockpi-4* ]]; then
+	if [[ $BOARD == rockpro64 ]] || [[ $BOARD == rockpi-4* ]] || [[ $BOARD == pinebook-pro ]]; then
 		# 3399
 		tools/mkimage -n rk3399 -T rksd -d $SRC/cache/sources/rkbin-tools/rk33/rk3399_ddr_933MHz_v1.13.bin rksd_loader.img
 		cat spl/u-boot-spl.bin >> rksd_loader.img

lib/compilation.sh

@@ -273,15 +273,6 @@ compile_kernel()
 	fi
 	cd "$kerneldir"
 
-	# this is a patch that Ubuntu Trusty compiler works
-	# TODO: Check if still required
-	if [[ $(patch --dry-run -t -p1 < $SRC/patch/misc/compiler.patch | grep Reversed) != "" ]]; then
-		display_alert "Patching kernel for compiler support"
-		patch --batch --silent -t -p1 < $SRC/patch/misc/compiler.patch >> $DEST/debug/output.log 2>&1
-	fi
-
-	advanced_patch "kernel" "$KERNELPATCHDIR" "$BOARD" "" "$BRANCH" "$LINUXFAMILY-$BRANCH"
-
 	if ! grep -qoE '^-rc[[:digit:]]+' <(grep "^EXTRAVERSION" Makefile | head -1 | awk '{print $(NF)}'); then
 		sed -i 's/EXTRAVERSION = .*/EXTRAVERSION = /' Makefile
 	fi
@@ -293,6 +284,8 @@ compile_kernel()
 	# build 3rd party drivers
 	compilation_prepare
 
+	advanced_patch "kernel" "$KERNELPATCHDIR" "$BOARD" "" "$BRANCH" "$LINUXFAMILY-$BRANCH"
+
 	# create linux-source package - with already patched sources
 	local sources_pkg_dir=$SRC/.tmp/${CHOSEN_KSRC}_${REVISION}_all
 	rm -rf ${sources_pkg_dir}
@@ -306,6 +299,9 @@ compile_kernel()
 		cp COPYING $sources_pkg_dir/usr/share/doc/linux-source-${version}-${LINUXFAMILY}/LICENSE
 	fi
 
+	# re-read kernel version after patching
+	local version=$(grab_version "$kerneldir")
+
 	# create patch for manual source changes in debug mode
 	[[ $CREATE_PATCHES == yes ]] && userpatch_create "kernel"
 

patch/atf/atf-rockchip64/board_pinebook-pro/add-trust-ini.patch

@@ -0,0 +1,21 @@
+diff --git a/trust.ini b/trust.ini
+new file mode 100644
+index 0000000..4af021a
+--- /dev/null
++++ b/trust.ini
+@@ -0,0 +1,15 @@
++[VERSION]
++MAJOR=1
++MINOR=0
++[BL30_OPTION]
++SEC=0
++[BL31_OPTION]
++SEC=1
++PATH=./build/rk3399/debug/bl31/bl31.elf
++ADDR=0x10000
++[BL32_OPTION]
++SEC=0
++[BL33_OPTION]
++SEC=0
++[OUTPUT]
++PATH=trust.bin