From 1f552886758daf1ddf6a2b3d435aed69097d2a6e Mon Sep 17 00:00:00 2001
From: Tianling Shen <cnsztl@immortalwrt.org>
Date: Tue, 16 Jul 2024 12:27:45 +0800
Subject: [PATCH] uboot-mediatek: fix mistake when replace fw name

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
---
 .../patches/453-add-openwrt-one.patch         | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch b/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch
index 5cfd55faf4..5900215edb 100644
--- a/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch
+++ b/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch
@@ -1,5 +1,5 @@
 --- /dev/null
-+++ b/arch/arm/dts/immortalwrt-one.dts
++++ b/arch/arm/dts/openwrt-one.dts
 @@ -0,0 +1,203 @@
 +// SPDX-License-Identifier: GPL-2.0
 +/*
@@ -205,7 +205,7 @@
 +	status = "disabled";
 +};
 --- /dev/null
-+++ b/configs/mt7981_immortalwrt-one-nor_defconfig
++++ b/configs/mt7981_openwrt-one-nor_defconfig
 @@ -0,0 +1,129 @@
 +CONFIG_ARM=y
 +CONFIG_SYS_HAS_NONCACHED_MEMORY=y
@@ -215,7 +215,7 @@
 +CONFIG_SYS_MALLOC_F_LEN=0x4000
 +CONFIG_NR_DRAM_BANKS=1
 +CONFIG_ENV_SIZE=0x8000
-+CONFIG_DEFAULT_DEVICE_TREE="immortalwrt-one"
++CONFIG_DEFAULT_DEVICE_TREE="openwrt-one"
 +CONFIG_OF_LIBFDT_OVERLAY=y
 +CONFIG_TARGET_MT7981=y
 +CONFIG_RESET_BUTTON_LABEL="back"
@@ -228,7 +228,7 @@
 +CONFIG_SPI_BOOT=y
 +CONFIG_AUTOBOOT_MENU_SHOW=y
 +CONFIG_USE_PREBOOT=y
-+CONFIG_DEFAULT_FDT_FILE="immortalwrt-one"
++CONFIG_DEFAULT_FDT_FILE="openwrt-one"
 +CONFIG_SYS_CBSIZE=512
 +CONFIG_SYS_PBSIZE=1049
 +CONFIG_LOGLEVEL=7
@@ -282,7 +282,7 @@
 +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 +CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_DEFAULT_ENV_FILE="immortalwrt-one-nor_env"
++CONFIG_DEFAULT_ENV_FILE="openwrt-one-nor_env"
 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 +CONFIG_VERSION_VARIABLE=y
 +CONFIG_NET_RANDOM_ETHADDR=y
@@ -337,7 +337,7 @@
 +CONFIG_HEXDUMP=y
 +CONFIG_LMB_MAX_REGIONS=64
 --- /dev/null
-+++ b/configs/mt7981_immortalwrt-one-spi-nand_defconfig
++++ b/configs/mt7981_openwrt-one-spi-nand_defconfig
 @@ -0,0 +1,130 @@
 +CONFIG_ARM=y
 +CONFIG_SYS_HAS_NONCACHED_MEMORY=y
@@ -346,7 +346,7 @@
 +CONFIG_TEXT_BASE=0x41e00000
 +CONFIG_SYS_MALLOC_F_LEN=0x4000
 +CONFIG_NR_DRAM_BANKS=1
-+CONFIG_DEFAULT_DEVICE_TREE="immortalwrt-one"
++CONFIG_DEFAULT_DEVICE_TREE="openwrt-one"
 +CONFIG_OF_LIBFDT_OVERLAY=y
 +CONFIG_TARGET_MT7981=y
 +CONFIG_RESET_BUTTON_LABEL="back"
@@ -359,7 +359,7 @@
 +CONFIG_SPI_BOOT=y
 +CONFIG_AUTOBOOT_MENU_SHOW=y
 +CONFIG_USE_PREBOOT=y
-+CONFIG_DEFAULT_FDT_FILE="immortalwrt-one"
++CONFIG_DEFAULT_FDT_FILE="openwrt-one"
 +CONFIG_SYS_CBSIZE=512
 +CONFIG_SYS_PBSIZE=1049
 +CONFIG_LOGLEVEL=7
@@ -417,7 +417,7 @@
 +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 +CONFIG_USE_DEFAULT_ENV_FILE=y
-+CONFIG_DEFAULT_ENV_FILE="immortalwrt-one-spi-nand_env"
++CONFIG_DEFAULT_ENV_FILE="openwrt-one-spi-nand_env"
 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 +CONFIG_VERSION_VARIABLE=y
 +CONFIG_NET_RANDOM_ETHADDR=y
@@ -470,7 +470,7 @@
 +CONFIG_HEXDUMP=y
 +CONFIG_LMB_MAX_REGIONS=64
 --- /dev/null
-+++ b/immortalwrt-one-nor_env
++++ b/openwrt-one-nor_env
 @@ -0,0 +1,46 @@
 +bl2_mtd_write=mtd erase bl2-nor &&  mtd write bl2-nor $loadaddr 0x0 0x40000
 +bl2_tftp_write=tftpboot $loadaddr $bootfile_bl2_nor && run bl2_mtd_write
@@ -519,7 +519,7 @@
 +_init_env=setenv _init_env ; echo Initialize Env ; run ubi_create_env ; saveenv
 +_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
 --- /dev/null
-+++ b/immortalwrt-one-spi-nand_env
++++ b/openwrt-one-spi-nand_env
 @@ -0,0 +1,59 @@
 +ipaddr=192.168.11.11
 +serverip=192.168.11.23