target/amlogic: Phicomm N1 new eMMC installer

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>

package/base-files/files/bin/ipcalc.sh

@@ -133,8 +133,7 @@ _ip2str START "$start"
 _ip2str END "$end"
 
 if [ "$start" -le "$ipaddr" ] && [ "$ipaddr" -le "$end" ]; then
-    echo "error: address $IP inside range $START..$END" >&2
-    exit 1
+    echo "warning: address $IP inside range $START..$END" >&2
 fi
 
 echo "START=$START"

package/network/services/dnsmasq/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=dnsmasq
 PKG_UPSTREAM_VERSION:=2.90
 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION)))
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz
 PKG_SOURCE_URL:=https://thekelleys.org.uk/dnsmasq/

package/network/services/dnsmasq/files/dnsmasq.init

@@ -597,10 +597,20 @@ dhcp_add() {
 	nettag="${networkid:+set:${networkid},}"
 
 	# make sure the DHCP range is not empty
-	if [ "$dhcpv4" != "disabled" ] && ipcalc "$ipaddr/$prefix_or_netmask" "$start" "$limit" ; then
-		[ "$dynamicdhcpv4" = "0" ] && END="static"
+	if [ "$dhcpv4" != "disabled" ]; then
+		unset START
+		unset END
+		unset NETMASK
+		ipcalc "$ipaddr/$prefix_or_netmask" "$start" "$limit"
 
-		xappend "--dhcp-range=$tags$nettag$START,$END,$NETMASK,$leasetime${options:+ $options}"
+		if [ -z "$START" ] || [ -z "$END" ] || [ -z "$NETMASK" ]; then
+			logger -t dnsmasq \
+				"unable to set dhcp-range for dhcp uci config section '$cfg'" \
+				"on interface '$ifname', please check your config"
+		else
+			[ "$dynamicdhcpv4" = "0" ] && END="static"
+			xappend "--dhcp-range=$tags$nettag$START,$END,$NETMASK,$leasetime${options:+ $options}"
+		fi
 	fi
 
 	if [ "$dynamicdhcpv6" = "0" ] ; then

target/linux/amlogic/meson/base-files/usr/sbin/install-to-emmc.sh

@@ -24,11 +24,11 @@
 # danger zones
 # 0-117
 
-# part		start			size			end
-# boot		0x7500000/117M 	0x4000000/64M	0xB500000/181M
-# rootfs	0xB500000/181M	0x18F00000/399M	0x24400000/580M
+# part		start							size			end
+# boot		0x7500000/117M (239616s) 		0x4000000/64M	0xB500000/181M (370687s)
+# rootfs	0xB500000/181M (370688s)		0x18F00000/399M	0x24400000/580M (1187839s)
 # (gap for amlogic bootloader 0x24400000 - 0x32000000)
-# overlay	0x32000000/800M	0x80000000/2G	0xB2000000/2848M
+# overlay	0x32000000/800M	(1638400s)		0x80000000/2G	0xB2000000/2848M (4194304s)
 
 . /lib/functions.sh
 . /lib/functions/system.sh
@@ -51,6 +51,19 @@ function umount_disk() {
 
 function part_disk() {
 	local to="${1#/dev/}"
+	#dd if="/dev/$to" of=/tmp/mmc-diskid.bin bs=1 skip=440 count=4
+	dd if=/dev/zero of="/dev/$to" bs=1 seek=446 count=64 conv=notrunc
+	{
+#		echo o;
+		echo n; echo p; echo 1; echo 239616; echo 370687;
+		echo n; echo p; echo 2; echo 370688; echo 1187839;
+		echo n; echo p; echo 3; echo 1638400; echo 4194304;
+		echo t; echo 1; echo c;
+		echo w;
+	} | fdisk "/dev/$to"
+	#dd if=/tmp/mmc-diskid.bin of="/dev/$to" bs=1 seek=440 count=4 conv=notrunc
+	return 0
+
 	dd if=/dev/zero of="/dev/$to" bs=512 count=1 conv=notrunc 2>/dev/null
 	parted --script "/dev/$to" \
 		mktable msdos \

target/linux/rockchip/armv8/base-files/lib/upgrade/ota.sh

@@ -20,6 +20,9 @@ export_ota_url() {
 	lyt,t68m)
 		export -n OTA_URL_BASE="https://fw0.koolcenter.com/iStoreOS/${board##*,}"
 		;;
+	easepi,a2)
+		export -n OTA_URL_BASE="https://fw0.koolcenter.com/iStoreOS/easepi-a2"
+		;;
 	easepi,r1)
 		export -n OTA_URL_BASE="https://fw0.koolcenter.com/iStoreOS/easepi-r1"
 		;;

target/linux/rockchip/dts/rk3568/rk3568-easepi-a2.dts

@@ -15,6 +15,7 @@
 	aliases {
 		ethernet0 = &pcie_eth0;
 		/delete-property/ ethernet1;
+		mmc2 = &sdmmc2;
 	};
 
 	chosen {

target/linux/rockchip/dts/rk3568/rk3568-roc-k40pro.dts

@@ -22,6 +22,7 @@
 	aliases {
 		ethernet2 = &pcie_eth2;
 		ethernet3 = &pcie_eth3;
+		mmc2 = &sdmmc2;
 	};
 
 	pwr-net-25g {

target/linux/rockchip/dts/rk3588/rk3588-orangepi-5-plus.dts

@@ -8,6 +8,7 @@
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/leds/common.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/pwm/pwm.h>
 #include <dt-bindings/pinctrl/rockchip.h>
 #include <dt-bindings/soc/rockchip,vop2.h>
 #include <dt-bindings/usb/pd.h>
@@ -21,6 +22,7 @@
 / {
 	model = "Xunlong Orange Pi 5 Plus";
 	compatible = "xunlong,orangepi-5-plus", "rockchip,rk3588";
+	eth_order = "0004:41:00.0,0003:31:00.0";
 
 	aliases {
 		mmc0 = &sdhci;
@@ -416,7 +418,7 @@
 			op-sink-microwatt = <1000000>;
 			source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
 			sink-pdos = <PDO_FIXED(5000, 1000, PDO_FIXED_USB_COMM)>;
-			try-power-role = "source";
+			try-power-role = "sink";
 
 			ports {
 				#address-cells = <1>;