Reinhard Russinger 5 жил өмнө
parent
commit
ce567f941d

+ 1 - 1
board/GfA/Display001/BUILD

@@ -1 +1 @@
-717
+725

+ 4 - 3
board/GfA/Display001/DTS_5.0/SOPINEA64.dts

@@ -55,6 +55,7 @@
 	aliases {
 		ethernet0 = &emac;
 		serial0 = &uart0;
+		serial1 = &uart1;
 	};
 
 	chosen {
@@ -228,9 +229,9 @@
  status = "okay";
 
  bluetooth {
- compatible = "realtek,rtl8723bs-bt";
- device-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
- host-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
+ 	compatible = "realtek,rtl8723bs-bt";
+ 	device-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
+ 	host-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
  };
 };
 

+ 3 - 71
board/GfA/Display001/rootfs/etc/init.d/rcS

@@ -11,50 +11,8 @@ echo 0 > /proc/sys/net/ipv4/tcp_retrans_collapse
 # Start all init scripts in /etc/init.d
 # executing them in numerical order.
 #
-modprobe i2c_gpio
-BASEBOARD=$(if [ -c "/dev/spidev1.0" ]; then echo "SPIDEV1.0";else echo "NOSPIDEV1.0";fi)
-BASEBOARD=$(if [ -c "/dev/spidev1.1" ]; then echo "SPIDEV1.1";else echo "NOSPIDEV1.1";fi)
-BASEBOARD=$(if [ -c "/dev/rtc1" ]; then echo "DISPLAY002";else echo "DISPLAY001";fi)
-
-modprobe uio
-modprobe pwm_omap_dmtimer
-modprobe pwm_beeper
-modprobe leds_pwm
-modprobe leds_gpio
-modprobe gpio-74x164
-
-modprobe ti_am335x_adc
 modprobe industrialio
-#=== get baseboard version
-if [ "$BASEBOARD" == "DISPLAY002" ]; then
-	ANIN6=`cat /sys/bus/iio/devices/iio\\:device0/in_voltage6_raw`
-
-	if [ "$ANIN6" -gt "2000" -a "$ANIN6" -lt "2100" ]; then
-		echo "DISPLAY002_DI4" > /tmp/BASEBOARD
-	else
-        if [ "$ANIN6" -gt "2680" -a "$ANIN6" -lt "2780" ]; then
-                echo "DISPLAY002_RS485" > /tmp/BASEBOARD
-        else
-		echo "--unknown--" > /tmp/BASEBOARD	
-	fi
-	fi
-else
-	echo "$BASEBOARD" > /tmp/BASEBOARD 		
-fi
-BASEBOARD=`cat /tmp/BASEBOARD`
-#================================
-
-if [ "$BASEBOARD" == "DISPLAY002_DI4" -o "$BASEBOARD" == "DISPLAY002_RS485" ]; then
-	rm /dev/rtc
-	ln -s /dev/rtc1 /dev/rtc
-	hwclock -us
-	echo 255 > /sys/class/leds/led_brightness/brightness
-fi
-
-# --- set ddr3ram controller queue
-devmem2 0x4c000054 w 0x00FFFF10
-# --- get spi tiva rtc
-#/root/gfa_spi -s
+#===ToDo: get baseboard version
 
 if [ -c "/dev/net/tun" ]
 	then echo "."
@@ -89,41 +47,15 @@ for i in /etc/init.d/S??* ;do
     esac
 done
 
-/usr/bin/beep -f 4500 -l 100 -r 2 -d 50 -n -f 6000 -l 200
-
 # clear screen and cursor off for customer logo
 ##echo -e "\033[3J\033[?25l\033[9;0]\033[14;0]" > /dev/tty0
-#==== set rtcdev again
-if [ "$BASEBOARD" == "DISPLAY002_DI4" -o "$BASEBOARD" == "DISPLAY002_RS485" ]; then
-	rm /dev/rtc
-	ln -s /dev/rtc1 /dev/rtc
-fi
-
-#=== turn on backlight, depends on baseboard
-if [ "$BASEBOARD" == "DISPLAY002_DI4" -o "$BASEBOARD" == "DISPLAY002_RS485" ]; then
-	echo 255 > /sys/class/leds/backlight/brightness
-fi
-
-if [ "$BASEBOARD" == "DISPLAY001" ]; then
-# - check tiva firmware and update if neccessary
-	/root/fw_update.sh
-	/root/gfa_spi -b 100
-	/root/gfa_spi -s
-fi
 
-#rdate time.memod.de
+rdate time.memod.de
 
 BOOTCNT=`cat /etc/BOOTCNT`
 BOOTCNT=$((BOOTCNT+1))
 echo $BOOTCNT > /etc/BOOTCNT
-
-if [ "$BASEBOARD" == "DISPLAY001" ]; then
-	echo "$BOOTCNT ::"`date`" -- "`/root/gfa_spi -u` >> /etc/BOOTTIME 
-fi
-
-if [ "$BASEBOARD" == "DISPLAY002_DI4" -o "$BASEBOARD" == "DISPLAY002_RS485" ]; then
-	echo "$BOOTCNT ::"`date`" -- "`hwclock -ur` >> /etc/BOOTTIME 
-fi
+echo "$BOOTCNT ::"`date`" -- "`hwclock -ur` >> /etc/BOOTTIME 
 #===========================
 # disable all ipv6
 #===========================

+ 6 - 6
board/GfA/Display001/rootfs/etc/network/interfaces

@@ -2,12 +2,12 @@
 auto lo
 iface lo inet loopback
 #---
-#iface eth0 inet dhcp
-iface eth0 inet static
-	address 192.168.0.125
-	netmask 255.255.255.0
-	gateway 192.168.0.10
-	post-up echo "nameserver 192.168.0.10" > /etc/resolv.conf
+iface eth0 inet dhcp
+#iface eth0 inet static
+#	address 192.168.0.125
+#	netmask 255.255.255.0
+#	gateway 192.168.0.10
+#	post-up echo "nameserver 192.168.0.10" > /etc/resolv.conf
 
 iface eth1 inet dhcp
 #---

+ 11 - 4
board/GfA/Display001/rootfs/etc/profile

@@ -55,8 +55,15 @@ for i in /etc/profile.d/*.sh ; do
 done
 #=======
 ### Qt EGLFS Settings
-export QT_QPA_EGLFS_INTEGRATION=none
-export QT_QPA_EGLFS_HIDECURSOR=1
+export QT_QPA_EGLFS_HIDECURSOR=0
+export QT_QPA_EGLFS_KMS_CONFIG=/etc/sunxiA64.json
 
-export QT_QPA_EGLFS_PHYSICAL_WIDTH=`cat /sys/firmware/devicetree/base/vendorinfo/display_physical_width`
-export QT_QPA_EGLFS_PHYSICAL_HEIGHT=`cat /sys/firmware/devicetree/base/vendorinfo/display_physical_height`
+##export QT_QPA_EGLFS_PHYSICAL_WIDTH=`cat /sys/firmware/devicetree/base/vendorinfo/display_physical_width`
+##export QT_QPA_EGLFS_PHYSICAL_HEIGHT=`cat /sys/firmware/devicetree/base/vendorinfo/display_physical_height`
+if test -z "${XDG_RUNTIME_DIR}"; then
+    export XDG_RUNTIME_DIR=/tmp/${USER}-runtime-dir
+    if ! test -d "${XDG_RUNTIME_DIR}"; then
+        mkdir "${XDG_RUNTIME_DIR}"
+        chmod 0700 "${XDG_RUNTIME_DIR}"
+    fi
+fi

+ 11 - 0
board/GfA/Display001/rootfs/etc/sunxiA64.json

@@ -0,0 +1,11 @@
+{
+  "device": "/dev/dri/card1",
+  "hwcursor": false,
+  "pbuffers": true,
+  "outputs": [
+    {
+      "name": "HDMI1",
+      "mode": "1920x1080"
+    }
+  ]
+}

+ 13 - 0
board/GfA/Display001/rootfs/root/.config/weston.ini

@@ -0,0 +1,13 @@
+[core]
+backend=fbdev-backend.so
+
+[keyboard]
+keymap_layout=de
+
+[output]
+name=HDMI
+mode=1920x1080
+
+[launcher]
+icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png
+path=/usr/bin/weston-terminal

+ 40 - 23
configs/SOPINEA64_L50_Qt5.15_defconfig

@@ -2,7 +2,7 @@ BR2_aarch64=y
 BR2_ARM_FPU_VFPV4=y
 BR2_DL_DIR="~/buildroot_dl_A64"
 BR2_HOST_DIR="/opt/GfA/TC_A64_L50_C930_QT515"
-BR2_JLEVEL=5
+BR2_JLEVEL=6
 # BR2_COMPILER_PARANOID_UNSAFE_PATH is not set
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -10,7 +10,6 @@ BR2_PACKAGE_HOST_GDB=y
 BR2_PACKAGE_HOST_GDB_TUI=y
 BR2_PACKAGE_HOST_GDB_PYTHON3=y
 BR2_GDB_VERSION_8_3=y
-BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
 BR2_TARGET_GENERIC_HOSTNAME="GfA"
 BR2_TARGET_GENERIC_ISSUE="Welcome to GfA Display001"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
@@ -61,6 +60,10 @@ BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
 BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
 BR2_PACKAGE_GST1_PLUGINS_BAD=y
 BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264=y
+BR2_PACKAGE_KODI=y
+BR2_PACKAGE_KODI_ALSA_LIB=y
+BR2_PACKAGE_KODI_BLUEZ=y
+BR2_PACKAGE_KODI_LIBCEC=y
 BR2_PACKAGE_MPV=y
 BR2_PACKAGE_PULSEAUDIO=y
 BR2_PACKAGE_WAVPACK=y
@@ -101,31 +104,50 @@ BR2_PACKAGE_FLASHBENCH=y
 BR2_PACKAGE_MMC_UTILS=y
 BR2_PACKAGE_DEJAVU=y
 BR2_PACKAGE_FONT_AWESOME=y
+BR2_PACKAGE_KMSCUBE=y
+BR2_PACKAGE_MESA3D_DEMOS=y
 BR2_PACKAGE_FB_TEST_APP=y
 BR2_PACKAGE_FBTERM=y
 BR2_PACKAGE_FBV=y
+BR2_PACKAGE_MESA3D=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA=y
+BR2_PACKAGE_MESA3D_OPENGL_EGL=y
+BR2_PACKAGE_MESA3D_OPENGL_ES=y
 BR2_PACKAGE_PSPLASH=y
+BR2_PACKAGE_SDL=y
+# BR2_PACKAGE_SDL_FBCON is not set
+BR2_PACKAGE_SDL_GFX=y
+BR2_PACKAGE_SDL_IMAGE=y
+BR2_PACKAGE_SDL_MIXER=y
+BR2_PACKAGE_SDL_MIXER_MIDI_TIMIDITY=y
+BR2_PACKAGE_SDL_NET=y
+BR2_PACKAGE_SDL_SOUND=y
+BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
+BR2_PACKAGE_SDL_TTF=y
+BR2_PACKAGE_SDL2_KMSDRM=y
+BR2_PACKAGE_SDL2_OPENGLES=y
 BR2_PACKAGE_SDL2_GFX=y
 BR2_PACKAGE_SDL2_IMAGE=y
+BR2_PACKAGE_SDL2_MIXER=y
+BR2_PACKAGE_SDL2_NET=y
 BR2_PACKAGE_SDL2_TTF=y
 BR2_PACKAGE_QT5=y
+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_DBUS=y
-BR2_PACKAGE_QT5BASE_ICU=y
 BR2_PACKAGE_QT5CHARTS=y
+BR2_PACKAGE_QT5CONNECTIVITY=y
 BR2_PACKAGE_QT5ENGINIO=y
+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
@@ -133,8 +155,14 @@ BR2_PACKAGE_QT5TOOLS_QTPATHS=y
 BR2_PACKAGE_QT5TOOLS_QTPLUGININFO=y
 BR2_PACKAGE_QT5VIRTUALKEYBOARD=y
 BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS="de_DE en_GB"
-BR2_PACKAGE_QT5WEBCHANNEL=y
+BR2_PACKAGE_QT5WAYLAND=y
+BR2_PACKAGE_QT5WAYLAND_COMPOSITOR=y
+BR2_PACKAGE_QT5WEBENGINE=y
+BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS=y
+BR2_PACKAGE_QT5WEBENGINE_ALSA=y
 BR2_PACKAGE_WESTON=y
+BR2_PACKAGE_WESTON_DEFAULT_DRM=y
+BR2_PACKAGE_WESTON_FBDEV=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
 BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6002=y
@@ -190,7 +218,6 @@ BR2_PACKAGE_PARTED=y
 BR2_PACKAGE_RS485CONF=y
 BR2_PACKAGE_SISPMCTL=y
 BR2_PACKAGE_SPI_TOOLS=y
-BR2_PACKAGE_SUNXI_MALI_MAINLINE=y
 BR2_PACKAGE_UBOOT_TOOLS=y
 BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT=y
 BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT=y
@@ -204,14 +231,10 @@ BR2_PACKAGE_LUAFILESYSTEM=y
 BR2_PACKAGE_LUAPOSIX=y
 BR2_PACKAGE_LUASOCKET=y
 BR2_PACKAGE_PYTHON=y
+BR2_PACKAGE_PYTHON_PY_PYC=y
 BR2_PACKAGE_PYTHON_BZIP2=y
-BR2_PACKAGE_PYTHON_BSDDB=y
 BR2_PACKAGE_PYTHON_CODECSCJK=y
-BR2_PACKAGE_PYTHON_CURSES=y
 BR2_PACKAGE_PYTHON_READLINE=y
-BR2_PACKAGE_PYTHON_SSL=y
-BR2_PACKAGE_PYTHON_SQLITE=y
-BR2_PACKAGE_PYTHON_PYEXPAT=y
 BR2_PACKAGE_PYTHON_HASHLIB=y
 BR2_PACKAGE_PYTHON_PAHO_MQTT=y
 BR2_PACKAGE_PYTHON_PYUDEV=y
@@ -220,13 +243,10 @@ BR2_PACKAGE_EXPECT=y
 BR2_PACKAGE_TCLLIB=y
 BR2_PACKAGE_LIBMAD=y
 BR2_PACKAGE_LIBMPD=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
@@ -236,8 +256,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_LIBHID=y
 BR2_PACKAGE_LIBIIO=y
 BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON=y
@@ -247,7 +265,6 @@ BR2_PACKAGE_TSLIB=y
 BR2_PACKAGE_JANSSON=y
 BR2_PACKAGE_LIBXSLT=y
 BR2_PACKAGE_LIBMPEG2=y
-BR2_PACKAGE_LIBVPX=y
 BR2_PACKAGE_LIBYUV=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBGSASL=y
@@ -298,7 +315,6 @@ BR2_PACKAGE_POCO_DATA_SQLITE=y
 BR2_PACKAGE_POCO_DATA_MYSQL=y
 BR2_PACKAGE_PROTOBUF=y
 BR2_PACKAGE_PROTOBUF_C=y
-BR2_PACKAGE_LIBFRIBIDI=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_NCURSES_TARGET_PROGS=y
 BR2_PACKAGE_FETCHMAIL=y
@@ -312,7 +328,6 @@ BR2_PACKAGE_BLUEZ_TOOLS=y
 BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
-BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH=y
 BR2_PACKAGE_BRIDGE_UTILS=y
 BR2_PACKAGE_CAN_UTILS=y
 BR2_PACKAGE_CIVETWEB=y
@@ -407,3 +422,5 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+# BR2_PACKAGE_LIBGFAIPC is not set
+# BR2_PACKAGE_LIBGFATIMER is not set