wrk

board/GfA/Display001/BUILD

@@ -1 +1 @@
-743
+746

board/GfA/Display001/DTS_5.0/SOPINEA64.dts

@@ -234,6 +234,20 @@
 	regulator-name = "vcc-wifi";
 };
 
+&spi0 {
+	status = "okay";
+};
+
+&spi1 {
+	status = "okay";
+	spi1@0 {
+		compatible = "spidev";
+		spi-max-frequency = <1200000>;
+		reg = <0>;
+		status = "okay";
+	};
+};
+
 &simplefb_hdmi {
 	vcc-hdmi-supply = <&reg_dldo1>;
 };

board/GfA/Display001/Linux-5.8/0001-Edid_480.272.patch

@@ -0,0 +1,40 @@
+diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
+index 37d8ba3..e2e00c1 100644
+--- a/drivers/gpu/drm/drm_edid_load.c
++++ b/drivers/gpu/drm/drm_edid_load.c
+@@ -38,8 +38,9 @@ int __drm_get_edid_firmware_path(char *buf, size_t bufsize)
+ }
+ EXPORT_SYMBOL(__drm_get_edid_firmware_path);
+ 
+-#define GENERIC_EDIDS 6
++#define GENERIC_EDIDS 7
+ static const char * const generic_edid_name[GENERIC_EDIDS] = {
++	"edid/480x272.bin",
+ 	"edid/800x600.bin",
+ 	"edid/1024x768.bin",
+ 	"edid/1280x1024.bin",
+@@ -50,6 +51,24 @@ static const char * const generic_edid_name[GENERIC_EDIDS] = {
+ 
+ static const u8 generic_edid[GENERIC_EDIDS][128] = {
+ 	{
++	0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00,
++	0x04, 0x81, 0x43, 0x00, 0x01, 0x00, 0x00, 0x00,
++	0x0C, 0x17, 0x01, 0x03, 0x81, 0x0A, 0x06, 0x78,
++	0x8A, 0xA5, 0x8E, 0xA6, 0x54, 0x4A, 0x9C, 0x26,
++	0x12, 0x45, 0x46, 0x00, 0x00, 0x00, 0x01, 0x01,
++	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
++	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xC4, 0x09,
++	0xE0, 0x33, 0x10, 0x10, 0x14, 0x10, 0x08, 0x05,
++	0x4A, 0x00, 0x5F, 0x36, 0x00, 0x00, 0x00, 0x18,
++	0x00, 0x00, 0x00, 0xFC, 0x00, 0x41, 0x44, 0x41,
++	0x46, 0x52, 0x55, 0x49, 0x54, 0x20, 0x34, 0x33,
++	0x20, 0x20, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42
++	},
++	{
+ 	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+ 	0x31, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 	0x05, 0x16, 0x01, 0x03, 0x6d, 0x1b, 0x14, 0x78,

board/GfA/Display001/SOPINEA64_defconfig

@@ -2,7 +2,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 5.8.7 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2020.08-672-g850594c) 8.4.0"
+CONFIG_CC_VERSION_TEXT="aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2020.08-672-gb8d750b) 8.4.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=80400
 CONFIG_LD_VERSION=233010000
@@ -3103,7 +3103,7 @@ CONFIG_SPI_S3C64XX=y
 # CONFIG_SPI_SPRD is not set
 # CONFIG_SPI_SPRD_ADI is not set
 # CONFIG_SPI_SUN4I is not set
-# CONFIG_SPI_SUN6I is not set
+CONFIG_SPI_SUN6I=m
 # CONFIG_SPI_SYNQUACER is not set
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_TEGRA114 is not set
@@ -4316,7 +4316,7 @@ CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=300
-# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 # CONFIG_DRM_DP_CEC is not set
 CONFIG_DRM_TTM=m
 CONFIG_DRM_TTM_DMA_PAGE_POOL=y
@@ -4562,7 +4562,7 @@ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 CONFIG_FB_CMDLINE=y
 CONFIG_FB_NOTIFY=y
 CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
+CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y

board/GfA/Display001/rootfs/etc/init.d/rcS

@@ -52,10 +52,15 @@ done
 
 rdate time.memod.de
 
+/root/gfa_spi -b 1
+/root/gfa_spi -s
+hwclock -wu
+fb-test
+
 BOOTCNT=`cat /etc/BOOTCNT`
 BOOTCNT=$((BOOTCNT+1))
 echo $BOOTCNT > /etc/BOOTCNT
-echo "$BOOTCNT ::"`date`" -- "`hwclock -ur` >> /etc/BOOTTIME 
+echo "$BOOTCNT ::"`date`" -- "`hwclock -ru` >> /etc/BOOTTIME 
 #===========================
 # disable all ipv6
 #===========================

board/GfA/Display001/sopine/boot.cmd

@@ -1,4 +1,4 @@
-setenv bootargs console=ttyS0,115200 cma=256M earlyprintk root=/dev/mmcblk0p2 rootwait
+setenv bootargs console=ttyS0,115200 cma=256M drm_kms_helper.edid_firmware=edid/480x272.bin earlyprintk root=/dev/mmcblk0p2 rootwait
 
 fatload mmc 0 $kernel_addr_r Image
 fatload mmc 0 $fdt_addr_r SOPINEA64.dtb

configs/SOPINEA64_L50_Qt5.15_defconfig

@@ -24,6 +24,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="../GfA/board/GfA/Display001/post-build_4.4.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c ../GfA/board/GfA/Display001/sopine/genimage.cfg"
 BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_PATCH="../GfA/board/GfA/Display001/Linux-5.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="../GfA/board/GfA/Display001/SOPINEA64_defconfig"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -133,13 +134,10 @@ BR2_PACKAGE_QT53D=y
 BR2_PACKAGE_QT5BASE_MYSQL=y
 BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM=y
 BR2_PACKAGE_QT5BASE_LINUXFB=y
-BR2_PACKAGE_QT5BASE_EGLFS=y
-BR2_PACKAGE_QT5BASE_FONTCONFIG=y
 BR2_PACKAGE_QT5BASE_HARFBUZZ=y
 BR2_PACKAGE_QT5BASE_GIF=y
 BR2_PACKAGE_QT5BASE_JPEG=y
 BR2_PACKAGE_QT5BASE_PNG=y
-BR2_PACKAGE_QT5BASE_ICU=y
 BR2_PACKAGE_QT5CHARTS=y
 BR2_PACKAGE_QT5CONNECTIVITY=y
 BR2_PACKAGE_QT5ENGINIO=y
@@ -147,8 +145,6 @@ BR2_PACKAGE_QT5GRAPHICALEFFECTS=y
 BR2_PACKAGE_QT5IMAGEFORMATS=y
 BR2_PACKAGE_QT5LOCATION=y
 BR2_PACKAGE_QT5MULTIMEDIA=y
-BR2_PACKAGE_QT5QUICKCONTROLS=y
-BR2_PACKAGE_QT5QUICKCONTROLS2=y
 BR2_PACKAGE_QT5SENSORS=y
 BR2_PACKAGE_QT5SERIALBUS=y
 BR2_PACKAGE_QT5TOOLS=y
@@ -157,7 +153,9 @@ BR2_PACKAGE_QT5TOOLS_QTPLUGININFO=y
 BR2_PACKAGE_QT5VIRTUALKEYBOARD=y
 BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS="de_DE en_GB"
 BR2_PACKAGE_QT5WAYLAND=y
-BR2_PACKAGE_QT5WEBCHANNEL=y
+BR2_PACKAGE_QT5WAYLAND_COMPOSITOR=y
+BR2_PACKAGE_QT5WEBENGINE=y
+BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS=y
 BR2_PACKAGE_WESTON=y
 BR2_PACKAGE_WESTON_DEFAULT_DRM=y
 BR2_PACKAGE_WESTON_FBDEV=y
@@ -252,13 +250,11 @@ BR2_PACKAGE_LIBCDIO=y
 BR2_PACKAGE_LIBMAD=y
 BR2_PACKAGE_LIBMPD=y
 BR2_PACKAGE_LIBSAMPLERATE=y
-BR2_PACKAGE_OPUS=y
 BR2_PACKAGE_TAGLIB=y
 BR2_PACKAGE_LIBZIP=y
 BR2_PACKAGE_SNAPPY=y
 BR2_PACKAGE_SZIP=y
 BR2_PACKAGE_GNUTLS_TOOLS=y
-BR2_PACKAGE_LIBNSS=y
 BR2_PACKAGE_LIBSHA1=y
 BR2_PACKAGE_LIBSSH2=y
 BR2_PACKAGE_ORACLE_MYSQL_SERVER=y
@@ -268,8 +264,6 @@ BR2_PACKAGE_KMSXX=y
 BR2_PACKAGE_KMSXX_INSTALL_TESTS=y
 BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
 BR2_PACKAGE_LIBSVG=y
-BR2_PACKAGE_WEBP=y
-BR2_PACKAGE_WEBP_DEMUX=y
 BR2_PACKAGE_LIBCEC=y
 BR2_PACKAGE_LIBHID=y
 BR2_PACKAGE_LIBIIO=y
@@ -283,7 +277,6 @@ BR2_PACKAGE_RAPIDJSON=y
 BR2_PACKAGE_TINYXML=y
 BR2_PACKAGE_LIBASS=y
 BR2_PACKAGE_LIBMPEG2=y
-BR2_PACKAGE_LIBVPX=y
 BR2_PACKAGE_LIBYUV=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBGSASL=y
@@ -448,5 +441,6 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_GFABROWSER=y
 # BR2_PACKAGE_LIBGFAIPC is not set
 # BR2_PACKAGE_LIBGFATIMER is not set

patches/0002-qtwebengine-no-jumbo-build-ninja-j4.patch

@@ -1,32 +0,0 @@
-diff --git a/package/qt5/qt5webengine/0002-avoid-jumbo-build.patch b/package/qt5/qt5webengine/0002-avoid-jumbo-build.patch
-new file mode 100644
-index 0000000..44f548d
---- /dev/null
-+++ b/package/qt5/qt5webengine/0002-avoid-jumbo-build.patch
-@@ -0,0 +1,13 @@
-+diff --git a/configure.pri b/configure.pri
-+index 37a8551..406d5e2 100644
-+--- a/configure.pri
-++++ b/configure.pri
-+@@ -28,7 +28,7 @@ defineTest(qtConfTest_detectJumboBuild) {
-+     mergeLimit = $$find(mergeLimit, "\\d")
-+     isEmpty(mergeLimit) {
-+        win32: mergeLimit = 0
-+-       else: mergeLimit = 8
-++       else: mergeLimit = 0
-+     }
-+     qtLog("Setting jumbo build merge batch limit to $${mergeLimit}.")
-+     $${1}.merge_limit = $$mergeLimit
-diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
-index 4abcf45..ef39dc5 100644
---- a/package/qt5/qt5webengine/qt5webengine.mk
-+++ b/package/qt5/qt5webengine/qt5webengine.mk
-@@ -47,7 +47,7 @@ define QT5WEBENGINE_PYTHON2_SYMLINK
- endef
- QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK
- 
--QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
-+QT5WEBENGINE_ENV += NINJAFLAGS="-j4"
- 
- define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG
- 	sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config