Nanopi M3 uboot now builds from sources, small bugfix at update-motd scripts

config/kernel/linux-s5p6818-dev.config

@@ -2980,10 +2980,7 @@ CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
 CONFIG_SND=y

config/sources/s5p6818.conf

@@ -5,7 +5,7 @@ BOOTSCRIPT='boot-s5p6818.cmd:boot.cmd'
 BOOTENV_FILE='s5p6818-default.txt'
 
 
-UBOOT_TARGET_MAP=";;$SRC/packages/blobs/nanopim3/bl1-drone.bin $SRC/packages/blobs/nanopim3/u-boot-nsih.bin"
+UBOOT_TARGET_MAP=";;$SRC/packages/blobs/nanopim3/bl1-drone.bin u-boot.bin"
 
 UBOOT_USE_GCC='> 6.0'
 UBOOT_COMPILER='aarch64-linux-gnu-'
@@ -27,8 +27,26 @@ GOVERNOR=interactive
 
 write_uboot_platform()
 {
-	dd if=$1/bl1-drone.bin of=$2 seek=1 status=noxfer > /dev/null 2>&1
-	dd if=$1/u-boot-nsih.bin of=$2 seek=64 status=noxfer > /dev/null 2>&1
+	cp $1/bl1-drone.bin $1/boot.img
+	i=0
+	merge=""
+	while [ $i -lt 512 ]; do
+		val="00000000"; \
+		[ $i -eq 68  ]  && val="00060000"  # 0x44  load size
+		[ $i -eq 72  ]  && val="43bffe00"  # 0x48  load address
+		[ $i -eq 76  ]  && val="43c00000"  # 0x4c  launch address
+		[ $i -eq 504 ]  && val="68180300"  # 0x1f8 version
+		[ $i -eq 508 ]  && val="4849534E"  # 0x1fc "NSIH"
+		# put in little endian
+		vallo=${val#????}
+		valhi=${val%????}
+		merge=$merge"${vallo#??}${vallo%??}${valhi#??}${valhi%??}"
+		i=$((i+4))
+	done
+	echo $merge | xxd -r -p | dd of=$1/boot.img seek=63 status=none
+	cat $1/u-boot.bin >> $1/boot.img
+	dd if=$1/boot.img of=$2 seek=1 status=noxfer > /dev/null 2>&1
+	rm $1/boot.img
 }
 
 family_tweaks()

packages/bsp/common/etc/update-motd.d/41-armbian-config

@@ -13,3 +13,5 @@ for f in $MOTD_DISABLE; do
 done
 
 [[ $(( $RANDOM % 2 )) == 0 ]] && echo -e "[\e[31m General system configuration\e[0m: \e[1marmbian-config\e[0m ]\n"
+
+exit 0