Merge branch 'thingos' into dev

jasaw · Jan 2, 2018 · 9163519 · 9163519
2 parents a420131 + 565e523
commit 9163519
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/board/nanopineo2/boot-fwupdater.cmd b/board/nanopineo2/boot-fwupdater.cmd
@@ -1,4 +1,4 @@
-bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1
 
 fatload mmc 0 0x46000000 Image
 fatload mmc 0 0x47000000 rootfs.cpio.uboot

diff --git a/board/nanopineo2/boot.cmd b/board/nanopineo2/boot.cmd
@@ -1,4 +1,4 @@
-bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait ro no_console_suspend panic=10 quiet loglevel=1 ipv6.disable=1
 
 fatload mmc 0 0x46000000 Image
 fatload mmc 0 0x48000000 sun50i-h5-nanopi-neo2.dtb