From ec45f2f246363a4c2a84e51d0014848bf8c52e9f Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Sun, 4 Feb 2024 21:46:14 +0900 Subject: [PATCH] ramips: rename mtd partition of ipTIME NAND devices Contrary to common ipTIME NOR devices, the "Config" partition of T5004 and AX2004M contain normal U-Boot environment variables. Renaming the partition into "u-boot-env" serves for better description, and it also conforms to common naming practice in OpenWrt. This patch might also be extended to A3004T, but its u-boot-env partition layout has not been confirmed yet. Signed-off-by: Sungbo Eo --- package/boot/uboot-envtools/files/ramips | 2 ++ target/linux/ramips/dts/mt7621_iptime_ax2004m.dts | 3 +-- target/linux/ramips/dts/mt7621_iptime_t5004.dts | 3 +-- target/linux/ramips/image/mt7621.mk | 4 ++-- target/linux/ramips/mt7621/base-files/etc/board.d/02_network | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips index 30bf635b6d..317121f2be 100644 --- a/package/boot/uboot-envtools/files/ramips +++ b/package/boot/uboot-envtools/files/ramips @@ -73,6 +73,7 @@ belkin,rt1800|\ h3c,tx1800-plus|\ h3c,tx1801-plus|\ h3c,tx1806|\ +iptime,ax2004m|\ jcg,q20|\ linksys,e7350|\ netgear,eax12|\ @@ -92,6 +93,7 @@ ravpower,rp-wd03) ubootenv_add_uci_config "/dev/mtd$idx" "0x4000" "0x1000" "0x1000" ;; beeline,smartbox-flash|\ +iptime,t5004|\ linksys,ea6350-v4|\ linksys,ea7300-v1|\ linksys,ea7300-v2|\ diff --git a/target/linux/ramips/dts/mt7621_iptime_ax2004m.dts b/target/linux/ramips/dts/mt7621_iptime_ax2004m.dts index 7237bf822f..88067a4fa5 100644 --- a/target/linux/ramips/dts/mt7621_iptime_ax2004m.dts +++ b/target/linux/ramips/dts/mt7621_iptime_ax2004m.dts @@ -74,9 +74,8 @@ }; partition@80000 { - label = "config"; + label = "u-boot-env"; reg = <0x80000 0x80000>; - read-only; }; partition@100000 { diff --git a/target/linux/ramips/dts/mt7621_iptime_t5004.dts b/target/linux/ramips/dts/mt7621_iptime_t5004.dts index bba039a63c..f7a5e8ca17 100644 --- a/target/linux/ramips/dts/mt7621_iptime_t5004.dts +++ b/target/linux/ramips/dts/mt7621_iptime_t5004.dts @@ -53,9 +53,8 @@ }; partition@80000 { - label = "config"; + label = "u-boot-env"; reg = <0x80000 0xc0000>; - read-only; }; partition@140000 { diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 7b7266b73e..23e328a090 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -1460,7 +1460,7 @@ define Device/iptime_ax2004m check-size | iptime-crc32 ax2004m DEVICE_VENDOR := ipTIME DEVICE_MODEL := AX2004M - DEVICE_PACKAGES := kmod-mt7915-firmware kmod-usb3 -uboot-envtools + DEVICE_PACKAGES := kmod-mt7915-firmware kmod-usb3 DEVICE_COMPAT_VERSION := 2.0 DEVICE_COMPAT_MESSAGE := NMBM has been newly enabled, and its flash block \ mapping might be incompatible with existing installation. \ @@ -1474,7 +1474,7 @@ define Device/iptime_t5004 UIMAGE_NAME := t5004 DEVICE_VENDOR := ipTIME DEVICE_MODEL := T5004 - DEVICE_PACKAGES := -wpad-basic-mbedtls -uboot-envtools + DEVICE_PACKAGES := -wpad-basic-mbedtls endef TARGET_DEVICES += iptime_t5004 diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index ae29da4adc..d0481b78e9 100644 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -260,7 +260,7 @@ ramips_setup_macs() label_mac=$wan_mac ;; iptime,t5004) - lan_mac=$(mtd_get_mac_ascii config ethaddr) + lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr) wan_mac=$(macaddr_add "$lan_mac" 1) ;; linksys,e5600|\