Merge from bittboy/buildroot@26c91a9

board/friendlyarm/nanopi-m4/extlinux.conf

@@ -1,4 +1,4 @@
-label NanoPi M4 5.1-rc1
-  kernel /boot/Image
-  devicetree /boot/rk3399-nanopi-m4.dtb
-  append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p1 rootwait
+label RK3399_NANOPI_M4 linux
+  kernel /Image
+  devicetree /rk3399-nanopi-m4.dtb
+  append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait

board/friendlyarm/nanopi-m4/genimage.cfg

@@ -1,18 +1,35 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"Image",
+			"rk3399-nanopi-m4.dtb",
+			"extlinux"
+		}
+	}
+	size = 64M
+}
+
 image sdcard.img {
+
 	hdimage {
+		gpt = true
 	}
 
-	partition u-boot-spl-dtb {
-		in-partition-table = "no"
-		image = "u-boot-spl-dtb.img"
+	partition loader1 {
+		image = "idbloader.img"
 		offset = 32K
 	}
 
-	partition u-boot-dtb {
-		in-partition-table = "no"
+	partition loader2 {
 		image = "u-boot.itb"
 		offset = 8M
-		size = 30M
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+		offset = 16M
 	}
 
 	partition rootfs {

board/friendlyarm/nanopi-m4/post-build.sh

@@ -1,8 +1,5 @@
 #!/bin/sh
 
-MKIMAGE=$HOST_DIR/bin/mkimage
 BOARD_DIR="$(dirname $0)"
 
-$MKIMAGE -n rk3399 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img
-
-install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf
+install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux/extlinux.conf

board/friendlyarm/nanopi-m4/readme.txt

@@ -1,25 +1,20 @@
-Intro
-=====
+FriendlyARM NANOPI-M4
+=====================
 
-NanoPi M4 is a RK3399 SoC based ARM board.
-
-Wiki: https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/nanopi_m4.html
-
-Build
-=====
-
-Run NanoPi M4 configuration
+Build:
 
   $ make nanopi_m4_defconfig
-
-To build, run make command.
-
   $ make
 
 Files created in output directory
 =================================
-output/images/
-├── bl31.bin
+
+output/images
+
+├── bl31.elf
+├── boot.vfat
+├── extlinux
+├── idbloader.img
 ├── Image
 ├── rk3399-nanopi-m4.dtb
 ├── rootfs.ext2
@@ -27,19 +22,24 @@ output/images/
 ├── rootfs.tar
 ├── sdcard.img
 ├── u-boot.bin
-├── u-boot.itb
-├── u-boot-spl-dtb.bin
-└── u-boot-spl-dtb.img
+└── u-boot.itb
 
 Creating bootable SD card:
-=========================
+==========================
 
 Simply invoke (as root)
 
-  # dd if=output/images/sdcard.img of=/dev/sdX && sync
+sudo dd if=output/images/sdcard.img of=/dev/sdX && sync
 
 Where X is your SD card device
 
 Serial console
 --------------
+
 Baudrate for this board is 1500000
+
+Login:
+------
+Enter 'root' as login user, and the prompt is ready.
+
+https://wiki.amarulasolutions.com/bsp/rockchip/rk3399/nanopi_m4.html