4
0

2 Commits 046eb4bac0 ... f119f15615

Autor SHA1 Nachricht Datum
  Reinhard Russinger f119f15615 rotate angepasst vor 1 Jahr
  Reinhard Russinger 44c6f0963f wrk vor 1 Jahr

+ 5 - 0
board/GfA/Display001/rootfs/root/bootbase.sh

@@ -0,0 +1,5 @@
+fw_setenv bootcmd "mw.l 0x80020000 0x0040033c; if cmp 0x80020000 0x44e10040 1; then echo ---emmc--; mmc rescan; if fatload mmc 0:1 0x80200000 MLO; then run sdboot; else run emmcboot; fi; else echo --sd--; mmc rescan; if fatload mmc 0:1 0x80200000 MLO; then run sdboot; else run emmcboot; fi; fi;"
+fw_setenv bootdelay "1"
+fw_setenv emmcboot "fatload mmc 1 0x80200000 uImage; fatload mmc 1 0x80F00000 Display001.dtb; fdt addr 0x80F00000; setenv bootargs console=ttyO0,115200 root=/dev/mmcblk1p2 rw rootwait vram=50M cma=50M; bootm 0x80200000 - 0x80F00000"
+fw_setenv ramboot "fatload mmc 0 0x80200000 uImage; fatload mmc 0 0x80F00000 Display001.dtb; fdt addr 0x80F00000; fatload mmc 0 0x81000000 initrd.gz; setenv initrdsize 0x${filesize}; setenv bootargs console=ttyO0,115200 initrd=0x81000000,${initrdsize} root=/dev/ram0 rw init=/sbin/init debug initcall_debug earlyprintk; bootm 0x80200000 - 0x80F00000"
+fw_setenv sdboot "fatload mmc 0 0x80200000 uImage; fatload mmc 0 0x80F00000 Display001.dtb; fdt addr 0x80F00000; setenv bootargs console=ttyO0,115200 root=/dev/mmcblk0p2 rw rootwait vram=50M cma=50M; bootm 0x80200000 - 0x80F00000"

+ 2 - 0
board/GfA/Display001/rootfs/root/rot0.sh

@@ -1,6 +1,8 @@
 echo 0 > /sys/block/mmcblk1boot0/force_ro
 echo 0 > /sys/block/mmcblk1boot1/force_ro
 
+. /root/bootbase.sh
+
 fw_setenv emmcboot "fatload mmc 1 0x80200000 uImage; fatload mmc 1 0x80F00000 Display001.dtb; fdt addr 0x80F00000; setenv bootargs console=ttyO0,115200 root=/dev/mmcblk1p2 rw rootwait vram=50M cma=50M fbcon=rotate:0; bootm 0x80200000 - 0x80F00000"
 
 echo 1 > /sys/block/mmcblk1boot0/force_ro

+ 2 - 0
board/GfA/Display001/rootfs/root/rot180.sh

@@ -1,6 +1,8 @@
 echo 0 > /sys/block/mmcblk1boot0/force_ro
 echo 0 > /sys/block/mmcblk1boot1/force_ro
 
+. /root/bootbase.sh
+
 fw_setenv emmcboot "fatload mmc 1 0x80200000 uImage; fatload mmc 1 0x80F00000 Display001.dtb; fdt addr 0x80F00000; setenv bootargs console=ttyO0,115200 root=/dev/mmcblk1p2 rw rootwait vram=50M cma=50M consoleblank=0 fbcon=rotate:2; bootm 0x80200000 - 0x80F00000"
 
 echo 1 > /sys/block/mmcblk1boot0/force_ro

+ 2 - 0
board/GfA/Display001/rootfs/root/rot270.sh

@@ -1,6 +1,8 @@
 echo 0 > /sys/block/mmcblk1boot0/force_ro
 echo 0 > /sys/block/mmcblk1boot1/force_ro
 
+. /root/bootbase.sh
+
 fw_setenv emmcboot "fatload mmc 1 0x80200000 uImage; fatload mmc 1 0x80F00000 Display001.dtb; fdt addr 0x80F00000; setenv bootargs console=ttyO0,115200 root=/dev/mmcblk1p2 rw rootwait vram=50M cma=50M fbcon=rotate:3; bootm 0x80200000 - 0x80F00000"
 
 echo 1 > /sys/block/mmcblk1boot0/force_ro

+ 2 - 0
board/GfA/Display001/rootfs/root/rot90.sh

@@ -1,6 +1,8 @@
 echo 0 > /sys/block/mmcblk1boot0/force_ro
 echo 0 > /sys/block/mmcblk1boot1/force_ro
 
+. /root/bootbase.sh
+
 fw_setenv emmcboot "fatload mmc 1 0x80200000 uImage; fatload mmc 1 0x80F00000 Display001.dtb; fdt addr 0x80F00000; setenv bootargs console=ttyO0,115200 root=/dev/mmcblk1p2 rw rootwait vram=50M cma=50M fbcon=rotate:1; bootm 0x80200000 - 0x80F00000"
 
 echo 1 > /sys/block/mmcblk1boot0/force_ro

+ 22 - 0
patches/0120-add-update-display-784-adc.patch

@@ -0,0 +1,22 @@
+diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
+index 19bece2..00abca8 100644
+--- a/UpdateRootfs.sh.in
++++ b/UpdateRootfs.sh.in
+@@ -406,7 +406,7 @@ fi
+ fi
+ 
+ if [ "$XRES" == "416" -a "$YRES" == "1280" ]; then
+-if [ "$BASEBOARD" == "DISPLAY002_784" ]; then
++if [ "$BASEBOARD" == "DISPLAY002_784"  -o "$BASEBOARD" == "DISPLAY002_784_ADC"]; then
+   echo "4.7 x 7.5 Inch long Display 2"
+   sh /root/Display2To_784inch_rs485.sh
+   DONE=1
+@@ -985,7 +985,7 @@ fi
+ fi
+   
+ if [ "\$XRES" == "416" -a "\$YRES" == "1280" ]; then
+-if [ "\$BASEBOARD" == "DISPLAY002_784" ]; then
++if [ "\$BASEBOARD" == "DISPLAY002_784" -o  "\$BASEBOARD" == "DISPLAY002_784_ADC" ]; then
+   echo "15 Inch Display 2"
+   cp \$EMMC_BOOTPATH/Display002_784_rs485.dtb \$EMMC_BOOTPATH/Display001.dtb
+   DONE=1