BUILD 388

GfA-buildroot-rootfs-from-image.patch

@@ -0,0 +1,76 @@
+diff --git a/MakeIMAGE.sh b/MakeIMAGE.sh
+index c64a09d36c..3ce1e6ca1b 100755
+--- a/MakeIMAGE.sh
++++ b/MakeIMAGE.sh
+@@ -6,6 +6,8 @@ export LC_ALL=C
+ BUILD=`cat ../GfA/board/GfA/Display001/BUILD`
+ IMAGEFILE=../Display001_Build_$BUILD-img
+ 
++ROOTFSMNT=/tmp/XXXRootFs
++
+ echo "Image: $IMAGEFILE"
+ #-- build imagefile
+ dd if=/dev/zero ibs=1M count=1 > $IMAGEFILE
+@@ -72,8 +74,22 @@ mkfs.ext3 -L "rootfs" ${DRIVE2}
+ mount ${DRIVE2} /tmp/rootfs
+ 
+ du -h ${DRIVE2}
+-sleep 10
+-tar -C /tmp/rootfs  --checkpoint --checkpoint-action=dot -xzf ./output/images/rootfs.tar.gz
++sleep 5
++
++umount ${ROOTFSMNT}
++rm -rf ${ROOTFSMNT}
++mkdir -p ${ROOTFSMNT}
++echo "Mount ====>> " ${ROOTFSMNT}
++mount -o loop ./output/images/rootfs.ext2 ${ROOTFSMNT}
++
++WRKDIR=`pwd`
++cd  ${ROOTFSMNT}
++tar cf - . | (cd /tmp/rootfs && tar xBf -)
++
++cd ${WRKDIR}
++umount ${ROOTFSMNT}
++#tar -C /tmp/rootfs  --checkpoint --checkpoint-action=dot -xzf ./output/images/rootfs.tar.gz
++
+ echo ""
+ 
+ sync
+@@ -88,4 +104,5 @@ rm $IMAGEFILE.zip
+ zip -j $IMAGEFILE.zip $IMAGEFILE
+ 
+ export LC_ALL=$SAVE_LC
++
+                                                                                                                 
+\ No newline at end of file
+diff --git a/MakeRootfsUpdate.sh b/MakeRootfsUpdate.sh
+index df6e2000d6..fc37f36e5a 100755
+--- a/MakeRootfsUpdate.sh
++++ b/MakeRootfsUpdate.sh
+@@ -5,6 +5,14 @@ UPDATE_BINARY=$WRKDIR/dest/UpdateRootfs.tar.Z
+ UPDATE_FILENAME="../UpdateDisplay001_$BUILD.sh"
+ UPDATE_IN_SCRIPT="UpdateRootfs.sh.in"
+ 
++ROOTFSMNT=/tmp/XXXRootFs
++
++sudo umount $ROOTFSMNT  
++sudo rm -rf $ROOTFSMNT  
++sudo mkdir -p $ROOTFSMNT
++
++sudo mount -o loop ./output/images/rootfs.ext2 $ROOTFSMNT
++
+ rm -rf $WRKDIR
+ mkdir -p $WRKDIR/dest
+ 
+@@ -12,7 +20,10 @@ cp ./output/images/*.dtb $WRKDIR
+ cp ./output/images/uImage $WRKDIR
+ cp ./output/images/MLO $WRKDIR
+ cp ./output/images/u-boot.img $WRKDIR
+-cp ./output/images/rootfs.tar.gz $WRKDIR
++
++sudo tar -C $ROOTFSMNT -czvf $WRKDIR/rootfs.tar.gz ./
++sudo umount $ROOTFSMNT
++#cp ./output/images/rootfs.tar.gz $WRKDIR
+ 
+ tar -C $WRKDIR --exclude=./dest -czvf $WRKDIR/dest/UpdateRootfs.tar.Z ./
+ 

Make-bb-kernel.sh

@@ -1,47 +0,0 @@
-#!/bin/bash
-#-- build kernelsources from RCN Repos
-#--
-GFAWRKDIR=`pwd`
-cd ..
-rm -rf bb-kernel
-git clone https://github.com/RobertCNelson/bb-kernel
-cd bb-kernel
-git checkout -b GfA 4.4.65-bone-rt-r17
-# -- patch kernelbuild
-patch -p1 < ../GfA/build_kernel.sh.patch
-#---------------------------------
-./build_kernel.sh
-cd $GFAWRKDIR
-tar -C ../bb-kernel/KERNEL --exclude=./.config --exclude=./.git  -czvf GfAkernel.tar.gz ./
-#--
-#--
-#!/bin/bash
-GFAWRKDIR=`pwd`
-cd ..
-rm -rf buildroot
-git clone git://git.buildroot.net/buildroot
-cd buildroot
-git checkout 63a20d5dfebe83e2b2bd683dc78ebdf787dff100 -b gfawrk
-patch -p1 < ../GfA/GfA-buildroot-changes.patch
-patch -p1 < ../GfA/GfA-buildroot_revert_S80ti-gfx_frambuffersettings.patch
-patch -p1 < ../GfA/GfA-buildroot_MapImage_build_path.patch
-patch -p1 < ../GfA/GfA-buildroot-LegalInfo_zip_in_separate_script.patch
-patch -p1 < ../GfA/GfA-buildroot_mysql_posgres_update_fixes.patch
-patch -p1 < ../GfA/GfA-buildroot_remove_crontab_root_entry_from_update.patch
-patch -p1 < ../GfA/GfA-buildroot_bump_tinc_to_v_1_0_31.patch
-patch -p1 < ../GfA/GfA-buildroot_linux_headers_for_rs485.patch
-patch -p1 < ../GfA/GfA-buildroot_force_mutt_to_bind_openssl.patch
-patch -p1 < ../GfA/GfA-buildroot_remove_hostapd_and_wpa_supplicant_from_update.patch
-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
-#
-chmod a+x *.sh
-cp ../GfA/configs/* ./configs
-git add .
-git commit -m "GfA wrk changes and setup"
-make BR2_EXTERNAL=../GfA Display001_4.4.65_rt17_defconfig
-##make BR2_EXTERNAL=../GfA Display001_4.4.65_rt17_Qt5.6.2_defconfig
-cd $GFAWRKDIR
-#------
-

Make-bb-kernel_Qt5.6.2.sh

@@ -1,47 +0,0 @@
-#!/bin/bash
-#-- build kernelsources from RCN Repos
-#--
-GFAWRKDIR=`pwd`
-cd ..
-rm -rf bb-kernel
-git clone https://github.com/RobertCNelson/bb-kernel
-cd bb-kernel
-git checkout -b GfA 4.4.65-bone-rt-r17
-# -- patch kernelbuild
-patch -p1 < ../GfA/build_kernel.sh.patch
-#---------------------------------
-./build_kernel.sh
-cd $GFAWRKDIR
-tar -C ../bb-kernel/KERNEL --exclude=./.config --exclude=./.git  -czvf GfAkernel.tar.gz ./
-#--
-#--
-#!/bin/bash
-GFAWRKDIR=`pwd`
-cd ..
-rm -rf buildroot562
-git clone git://git.buildroot.net/buildroot ./buildroot562
-cd buildroot562
-git checkout 63a20d5dfebe83e2b2bd683dc78ebdf787dff100 -b gfawrk
-patch -p1 < ../GfA/GfA-buildroot-changes.patch
-patch -p1 < ../GfA/GfA-buildroot_revert_S80ti-gfx_frambuffersettings.patch
-patch -p1 < ../GfA/GfA-buildroot_MapImage_build_path.patch
-patch -p1 < ../GfA/GfA-buildroot-LegalInfo_zip_in_separate_script.patch
-patch -p1 < ../GfA/GfA-buildroot_mysql_posgres_update_fixes.patch
-patch -p1 < ../GfA/GfA-buildroot_remove_crontab_root_entry_from_update.patch
-patch -p1 < ../GfA/GfA-buildroot_bump_tinc_to_v_1_0_31.patch
-patch -p1 < ../GfA/GfA-buildroot_linux_headers_for_rs485.patch
-patch -p1 < ../GfA/GfA-buildroot_force_mutt_to_bind_openssl.patch
-patch -p1 < ../GfA/GfA-buildroot_remove_hostapd_and_wpa_supplicant_from_update.patch
-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
-git add .
-git commit -m "GfA wrk changes and setup"
-##make BR2_EXTERNAL=../GfA Display001_4.4.65_rt17_defconfig
-make BR2_EXTERNAL=../GfA Display001_4.4.65_rt17_Qt5.6.2_defconfig
-cd $GFAWRKDIR
-#------

MakeBuildrootEnv.sh

@@ -23,6 +23,7 @@ patch -p1 < ../GfA/GfA-buildroot-add-plugins-libraries-change-crosscompile-comma
 patch -p1 < ../GfA/GfA-buildroot-CrossCompile_export_CC_and_CXX.patch
 patch -p1 < ../GfA/GfA-buildroot_remove_CJK_Fonts_in_Update.patch
 patch -p1 < ../GfA/GfA-buildroot-libmodbus-GfA.patch
+patch -p1 < ../GfA/GfA-buildroot-rootfs-from-image.patch
 #
 chmod a+x *.sh
 cp ../GfA/configs/* ./configs

board/GfA/Display001/BUILD

@@ -1 +1 @@
-387
+388

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

@@ -7,6 +7,7 @@
 # --- set ddr3ram controller queue
 devmem2 0x4c000054 w 0x00FFFF10
 # --- get spi tiva rtc
+/root/fw_update.sh
 /root/gfa_spi -b 100
 /root/gfa_spi -s
 

board/GfA/Display001/rootfs/root/fw_update.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+ACTFW=`/root/gfa_spi -v | awk '{split($0,a," "); print a[8]}'`
+MINFW="0x00000113"
+FWFILE="/root/btm43_0113.bin"
+
+echo "actual Firmware : $ACTFW"
+
+if [ "$ACTFW" \< "$MINFW" ]; then
+echo "Do Update"
+/root/spi_tivia $FWFILE
+else
+echo "FW ok"
+fi

configs/Display001_3.12.30_defconfig

@@ -102,6 +102,7 @@ BR2_PACKAGE_DIRECTFB_SAWMAN=y
 BR2_PACKAGE_DIRECTFB_DITHER_RGB16=y
 BR2_PACKAGE_EFL=y
 BR2_PACKAGE_EFL_FB=y
+BR2_PACKAGE_FBSET=y
 BR2_PACKAGE_FB_TEST_APP=y
 BR2_PACKAGE_FBTERM=y
 BR2_PACKAGE_FBV=y
@@ -414,7 +415,7 @@ BR2_PACKAGE_UTIL_LINUX_SETTERM=y
 BR2_PACKAGE_JOE=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_TAR_GZIP=y
+# BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="am335x_boneblack"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y