From 6eb5cb583e9b6cbc43398ff6702f7d1835b3e8ef Mon Sep 17 00:00:00 2001
From: Ivan Belokobylskiy <belokobylskij@gmail.com>
Date: Wed, 24 Jul 2024 15:22:16 +0300
Subject: [PATCH] gtw360: fix board name

---
 .../linux/imx/cortexa7/base-files/etc/board.d/02_network  | 2 +-
 .../linux/imx/cortexa7/base-files/lib/upgrade/platform.sh | 8 ++++----
 .../imx/patches-5.15/142-add-imx6ull-gtw360-dts.patch     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/target/linux/imx/cortexa7/base-files/etc/board.d/02_network b/target/linux/imx/cortexa7/base-files/etc/board.d/02_network
index 2c9d38dd780007..45db6234d81c15 100644
--- a/target/linux/imx/cortexa7/base-files/etc/board.d/02_network
+++ b/target/linux/imx/cortexa7/base-files/etc/board.d/02_network
@@ -5,7 +5,7 @@ board=$(board_name)
 board_config_update
 
 case "$board" in
-geniatech,imx6ull-gtw360|\
+geniatech,gtw360|\
 technexion,imx7d-pico-pi)
 	ucidef_set_interface_lan "eth0"
 	;;
diff --git a/target/linux/imx/cortexa7/base-files/lib/upgrade/platform.sh b/target/linux/imx/cortexa7/base-files/lib/upgrade/platform.sh
index fc86d6c43fead8..d78f09ed9c2561 100644
--- a/target/linux/imx/cortexa7/base-files/lib/upgrade/platform.sh
+++ b/target/linux/imx/cortexa7/base-files/lib/upgrade/platform.sh
@@ -21,8 +21,8 @@ platform_check_image() {
 		nand_do_platform_check $platform_dir_name $1
 		return $?;
 		;;
-	geniatech,imx6ull-gtw360 )
-		local platform_dir_name=$(echo $board | sed 's/,imx6ull-/_/g')
+	geniatech,gtw360 )
+		local platform_dir_name=$(echo $board | sed 's/,/_/g')
 		nand_do_platform_check $platform_dir_name $1
 		return $?;
 		;;
@@ -43,7 +43,7 @@ platform_do_upgrade() {
 	xiaomi,dgnwg05lm )
 		nand_do_upgrade "$1"
 		;;
-	geniatech,imx6ull-gtw360 )
+	geniatech,gtw360 )
 	  platform_do_flash_fit "$1" "$board" "fitImageA" "$(platform_get_rootfs)"
 		;;
 	technexion,imx7d-pico-pi)
@@ -79,7 +79,7 @@ platform_do_flash_fit() {
 
 	mkdir -p /boot
 
-	if [ $board = "geniatech,imx6ull-gtw360" ]; then
+	if [ $board = "geniatech,gtw360" ]; then
 		# mmcblk1p1 (fat) contains all FIT images for the Gateway
 		mount -t vfat /dev/mmcblk1p1 /boot
 
diff --git a/target/linux/imx/patches-5.15/142-add-imx6ull-gtw360-dts.patch b/target/linux/imx/patches-5.15/142-add-imx6ull-gtw360-dts.patch
index aaef37d4dbb329..b1d71832ac5ce3 100644
--- a/target/linux/imx/patches-5.15/142-add-imx6ull-gtw360-dts.patch
+++ b/target/linux/imx/patches-5.15/142-add-imx6ull-gtw360-dts.patch
@@ -18,7 +18,7 @@
 +
 +/ {
 +	model = "Geniatech GTW360";
-+	compatible = "geniatech,imx6ull-gtw360", "fsl,imx6ull";
++	compatible = "geniatech,gtw360", "fsl,imx6ull";
 +
 +	chosen {
 +		bootargs = "console=ttymxc0,115200 root=/dev/mmcblk1p2 rootwait rw";