Switched NanoPi R2S to mainline u-boot (#1940)

config/boards/nanopi-r2s.wip

@@ -1,7 +1,7 @@
 # RK3328 quad core 1GB 2 x GBE USB2
 BOARD_NAME="Nanopi R2S"
 BOARDFAMILY="rockchip64"
-BOOTCONFIG="rock64-rk3328_defconfig"
+BOOTCONFIG="nanopi-r2s-rk3328_defconfig"
 KERNEL_TARGET="current,dev"
 DEFAULT_CONSOLE="serial"
 MODULES="g_serial"

config/sources/families/include/rockchip64_common.inc

@@ -13,7 +13,15 @@ CPUMIN="600000"
 
 RKBIN_DIR="$SRC/cache/sources/rkbin-tools"
 
-if [[ $BOOTCONFIG == *3328* ]]; then
+if [[ $BOARD == nanopi-r2s ]]; then
+
+	BOOT_USE_BLOBS=yes
+	BOOT_SOC=rk3328
+	DDR_BLOB='rk33/rk3328_ddr_333MHz_v1.16.bin'
+	MINILOADER_BLOB='rk33/rk322xh_miniloader_v2.50.bin'
+	BL31_BLOB='rk33/rk322xh_bl31_v1.42.elf'
+
+elif [[ $BOOTCONFIG == *3328* ]]; then
 
 	BOOT_RK3328_USE_AYUFAN_ATF=yes
 	CPUMAX="1390000"

packages/bsp/common/usr/lib/armbian/armbian-firstrun

@@ -131,13 +131,6 @@ case "$1" in
 	esac
 
 	# varios temporary hardware workarounds
-	if [[ $BOARD_NAME == "Nanopi R2S" ]]; then
-		get_random_mac
-		sed -i "s/^auto eth0/auto eth0\n\thwaddress $MACADDR/" /etc/network/interfaces
-		get_random_mac
-		sed -i "s/^auto lan0/auto lan0\n\thwaddress $MACADDR/" /etc/network/interfaces
-	fi
-
 	[[ $LINUXFAMILY == rk3399 || $LINUXFAMILY == rockchip64 ]] && set_fixed_mac
 	[[ $BRANCH == dev && $LINUXFAMILY == rockchip ]] && set_fixed_mac
 	[[ $BRANCH == current && $LINUXFAMILY == odroidc1 ]] && set_fixed_mac