Pārlūkot izejas kodu

vorbereitung di-soric branch

Reinhard Russinger 7 gadi atpakaļ
vecāks
revīzija
0f2c7ebfb5

+ 1 - 0
.gitignore

@@ -1 +1,2 @@
 GfAkernel.tar.gz
+*~

+ 45 - 0
GfA-buildroot_SetRightDisplayResolution_OnUpdate.patch

@@ -0,0 +1,45 @@
+diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
+index d80c399..8832933 100644
+--- a/UpdateRootfs.sh.in
++++ b/UpdateRootfs.sh.in
+@@ -123,6 +123,40 @@ fi
+ chown -Rv mysql:nogroup /var/mysql
+ chown -Rv postgres:postgres /var/lib/pgsql
+ #==============================================================================
++# Get Graphics resolution and set dtb to the right resolution
++
++DONE=0
++YRES="$(fbset | awk '/geom/ {print $3}')"
++XRES="$(fbset | awk '/geom/ {print $2}')"
++
++echo "XRES $XRES, YRES $YRES"
++
++if [ "$XRES" == "480" -a "$YRES" == "272" ]; then
++  echo "4.3 Inch"
++  sh /root/DisplayTo_4_3inch.sh
++  DONE=1
++fi
++
++if [ "$XRES" == "800" -a "$YRES" == "480" ]; then
++  echo "7 Inch"
++  sh /root/DisplayTo_7inch.sh
++  DONE=1
++fi
++
++if [ "$XRES" == "1280" -a "$YRES" == "800" ]; then
++  echo "10 Inch"
++  sh /root/DisplayTo_10inch.sh
++  DONE=1
++fi
++
++if [ "$DONE" == "0" ]; then
++  echo "Unknown Display Resolution"
++fi
++
++
++
++
++#=================
+ echo "Update Done, pls. reboot System"
+ umount /mnt
+ echo "."

+ 1 - 0
Make-bb-kernel_Qt5.6.2.sh

@@ -35,6 +35,7 @@ patch -p1 < ../GfA/GfA-buildroot_remove_hostapd_and_wpa_supplicant_from_update.p
 patch -p1 < ../GfA/GfA-buildroot_qt57-qt5quickcontrols_mk.patch
 patch -p1 < ../GfA/GfA-buildroot_qt57-qt5quickcontrols2_mk.patch
 patch -p1 < ../GfA/GfA-buildroot_qt-latest_qt-LTS-5.6.2.patch
+patch -p1 < ../GfA/GfA-buildroot_SetRightDisplayResolution_OnUpdate.patch
 #
 chmod a+x *.sh
 cp ../GfA/configs/* ./configs

+ 1 - 1
board/GfA/Display001/BUILD

@@ -1 +1 @@
-424
+439

+ 8 - 0
board/GfA/Display001/DTS_4.4/Display001_7.dts

@@ -331,3 +331,11 @@ i2c@3 {
                 pwms = <&pwm7>;
         };
 };
+
+
+/ {
+	vendorinfo {
+		vendor_name = "GfA Display001";
+		display_dtb = "Display001_7.dtb";
+	};
+};

+ 4 - 4
board/GfA/Display001/Display001_4.4.65_rt_defconfig

@@ -2621,13 +2621,13 @@ CONFIG_SPI_MASTER=y
 # SPI Master Controller Drivers
 #
 # CONFIG_SPI_ALTERA is not set
-CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_CADENCE is not set
 CONFIG_SPI_DLN2=m
-CONFIG_SPI_GPIO=m
+CONFIG_SPI_GPIO=y
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_OC_TINY is not set
-CONFIG_SPI_OMAP24XX=m
+CONFIG_SPI_OMAP24XX=y
 CONFIG_SPI_TI_QSPI=m
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SPI_ROCKCHIP=m
@@ -2640,7 +2640,7 @@ CONFIG_SPI_ROCKCHIP=m
 #
 # SPI Protocol Masters
 #
-CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_SPIDEV=y
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPMI is not set
 CONFIG_HSI=m

+ 4 - 3
board/GfA/Display001/rootfs/etc/network/interfaces

@@ -3,19 +3,20 @@ auto lo
 auto eth0
 auto usb0
 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 usb0 inet static
 	address 192.168.7.2
 	netmask 255.255.255.252
-
+#
 iface wlan0 inet static
 	address 192.168.8.2
 	broadcast 192.168.8.255
 	netmask 255.255.255.0
+#

BIN
board/GfA/Display001/rootfs/usr/sbin/fbvncserver


BIN
board/GfA/Display001/rootfs/usr/share/fonts/opentype/noto/NotoSansCJK-Black.ttc


BIN
board/GfA/Display001/rootfs/usr/share/fonts/opentype/noto/NotoSansCJK-Bold.ttc


BIN
board/GfA/Display001/rootfs/usr/share/fonts/opentype/noto/NotoSansCJK-DemiLight.ttc


BIN
board/GfA/Display001/rootfs/usr/share/fonts/opentype/noto/NotoSansCJK-Light.ttc


BIN
board/GfA/Display001/rootfs/usr/share/fonts/opentype/noto/NotoSansCJK-Medium.ttc


BIN
board/GfA/Display001/rootfs/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc


BIN
board/GfA/Display001/rootfs/usr/share/fonts/opentype/noto/NotoSansCJK-Thin.ttc


+ 3 - 5
configs/Display001_4.4.65_rt17_Qt5.6.2_defconfig

@@ -23,7 +23,7 @@ BR2_TARGET_GENERIC_ROOT_PASSWD="root"
 BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
 BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
 # BR2_ENABLE_LOCALE_PURGE is not set
-BR2_GENERATE_LOCALE="en_US en_GB de_DE de_AT de_CH fr_FR it_IT es_ES sv_FI sv_SE nb_NO nn_NO se_NO da_DK"
+BR2_GENERATE_LOCALE="en_US en_GB de_DE de_AT de_CH fr_FR it_IT es_ES sv_FI sv_SE nb_NO nn_NO se_NO da_DK zh_CN"
 BR2_TARGET_TZ_INFO=y
 BR2_TARGET_LOCALTIME="Europe/Vienna"
 BR2_ROOTFS_POST_BUILD_SCRIPT="../GfA/board/GfA/Display001/post-build_4.4.sh"
@@ -73,13 +73,13 @@ BR2_PACKAGE_LZOP=y
 BR2_PACKAGE_P7ZIP=y
 BR2_PACKAGE_UNRAR=y
 BR2_PACKAGE_UNZIP=y
-BR2_PACKAGE_XZ=y
 BR2_PACKAGE_ZIP=y
 BR2_PACKAGE_GDB=y
 BR2_PACKAGE_GDB_DEBUGGER=y
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_BINUTILS=y
 BR2_PACKAGE_BINUTILS_TARGET=y
+BR2_PACKAGE_CMAKE_CTEST=y
 BR2_PACKAGE_GETTEXT=y
 BR2_PACKAGE_SED=y
 BR2_PACKAGE_CIFS_UTILS=y
@@ -149,6 +149,7 @@ 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
@@ -158,8 +159,6 @@ BR2_PACKAGE_QT5SVG=y
 BR2_PACKAGE_QT5WEBENGINE=y
 BR2_PACKAGE_TEKUI=y
 BR2_PACKAGE_WESTON=y
-BR2_PACKAGE_QT_WEBKIT_KIOSK=y
-BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS=y
 BR2_PACKAGE_AM33X_CM3=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_IBT=y
@@ -282,7 +281,6 @@ BR2_PACKAGE_LIBHID=y
 BR2_PACKAGE_LIBIIO=y
 BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON=y
 BR2_PACKAGE_LIBV4L=y
-BR2_PACKAGE_JSONCPP=y
 BR2_PACKAGE_LIBXSLT=y
 BR2_PACKAGE_LIBMPEG2=y
 BR2_PACKAGE_LIBVPX=y