chore: merge branch master

config/boards/aml-g12.conf

@@ -1,5 +1,5 @@
-# Amlogic S905X2 S922X
-BOARD_NAME="AMLG12"
+# Amlogic S9xxx
+BOARD_NAME="AML"
 BOARDFAMILY="aml-g12"
 BOOTCONFIG="odroid-n2_defconfig"
 BOARD_DIR=packages/bsp/aml-g12

config/boards/rk3328-tv.conf

@@ -1,7 +1,8 @@
 # Rockchip RK3328
 BOARD_NAME="RK3328-TV"
 BOARDFAMILY="rk3328-tv"
-BOOTCONFIG="roc-rk3328-cc_defconfig"
+#BOOTCONFIG="evb-rk3328_defconfig"
+BOOTCONFIG="rock64-rk3328_defconfig"
 BOARD_DIR=packages/bsp/rk3328-tv
 ADD_UBOOT="yes"
 #

config/boards/rk3399-tv.conf

@@ -1,7 +1,7 @@
 # Rockchip RK3399
 BOARD_NAME="RK3399-TV"
-#BOOTCONFIG="khadas-edge-rk3399_defconfig"
-BOOTCONFIG="evb-rk3399_defconfig"
+BOOTCONFIG="khadas-edge-v-rk3399_defconfig"
+#BOOTCONFIG="evb-rk3399_defconfig"
 BOARDFAMILY="rk3399-tv"
 BOARD_DIR=packages/bsp/rk3399-tv
 ADD_UBOOT="yes"

config/kernel/linux-aml-g12-dev.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.0-rc2 Kernel Configuration
+# Linux/arm64 5.4.0-rc3 Kernel Configuration
 #
 
 #
@@ -5174,7 +5174,6 @@ CONFIG_USB_SERIAL_DEBUG=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
@@ -7116,8 +7115,6 @@ CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
 CONFIG_HAVE_GENERIC_VDSO=y
 CONFIG_GENERIC_GETTIMEOFDAY=y
-CONFIG_GENERIC_COMPAT_VDSO=y
-CONFIG_CROSS_COMPILE_COMPAT_VDSO=""
 CONFIG_FONT_SUPPORT=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y