Meson64 boot adjustments and nanopi K2 fixes

config/boards/nanopik2.wip

@@ -6,7 +6,7 @@ BOOTCONFIG="odroid-c2_defconfig"
 MODULES=""
 MODULES_NEXT=""
 #
-KERNEL_TARGET="default"
+KERNEL_TARGET="default,next,dev"
 CLI_TARGET="jessie,xenial:default"
 CLI_BETA_TARGET="xenial:default"
 DESKTOP_TARGET="xenial:default"

config/bootscripts/boot-meson64-nanopik2.cmd

@@ -1,6 +1,27 @@
-ext4load mmc 0:1 ${loadaddr} /boot/zImage
-ext4load mmc 0:1 ${dtb_mem_addr} /boot/dtb/${dtb_name}
-ext4load mmc 0:1 ${dtb_mem_addr} /boot/dtb/gxbb_p200_2G.dtb
-ext4load mmc 0:1 ${initrd_start} /boot/uInitrd
-setenv bootargs "root=/dev/mmcblk0p1 ${consoleargs} hdmimode=${hdmimode} hdmitx=cecf logo=osd1,loaded,${fb_addr},${hdmimode} initrd=${initrd_start},${initrd_size}"
-booti ${loadaddr} ${initrd_start} ${dtb_mem_addr};
+if test -e mmc 0:1 boot/.next; 
+	then setenv condev "console=ttyAML0,115200n8"; 
+	else setenv condev "console=ttyS0,115200n8 earlyprintk=aml-uart,0xc81004c0"; fi
+
+if test -e mmc 0:1 boot/.next; 
+	then setenv rootdev "/dev/mmcblk1p1"; 
+	else setenv rootdev "/dev/mmcblk0p1"; fi
+
+if test -e mmc 0:1 boot/.next; 
+	then setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=ext4 ${condev} no_console_suspend consoleblank=0 fsck.repair=yes loglevel=5 net.ifnames=0";
+	else setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=ext4 ${condev} no_console_suspend consoleblank=0 cvbsmode=576cvbs hdmimode=1080p60hz cvbsdrv=0 m_bpp=24 loglevel=5 net.ifnames=0"; fi
+
+${bloader} ${initrd_start} /boot/uInitrd
+
+if test -e mmc 0:1 boot/.next; 
+	then ${bloader} ${dtb_mem_addr} boot/dtb/amlogic/meson-gxbb-nanopi-k2.dtb; 
+	else ${bloader} ${dtb_mem_addr} boot/dtb/gxbb_p201.dtb; fi
+
+fdt addr ${dtb_mem_addr}
+
+if test -e mmc 0:1 boot/.next; 
+	then ${bloader} 0x01080000 boot/uImage; 
+	else ${bloader} ${loadaddr} /boot/zImage; fi
+
+if test -e mmc 0:1 boot/.next; 
+	then bootm 0x01080000 ${initrd_start} ${dtb_mem_addr}; 
+	else booti ${loadaddr} ${initrd_start} ${dtb_mem_addr}; fi

config/sources/meson64.conf

@@ -24,10 +24,10 @@ case $BRANCH in
 	KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
 	KERNELBRANCH=$MAINLINE_KERNEL_BRANCH
 	KERNELDIR=$MAINLINE_KERNEL_DIR
-    ;;
+    	;;
 
 	dev)
-	KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
+	KERNELSOURCE='https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
 	KERNELBRANCH='branch:master'
 	KERNELDIR=$MAINLINE_KERNEL_DIR
 
@@ -41,7 +41,8 @@ GOVERNOR=ondemand
 
 write_uboot_platform()
 {
-	dd if=$1/u-boot.bin of=$2 bs=512 seek=1 conv=fsync > /dev/null 2>&1
+	dd if=$1/u-boot.bin of=$2 bs=1 count=442 conv=fsync > /dev/null 2>&1
+	dd if=$1/u-boot.bin of=$2 bs=512 skip=1 seek=1 conv=fsync > /dev/null 2>&1
 }
 
 family_tweaks()