From: Shiji Yang Date: Sun, 26 Jan 2025 03:11:53 +0000 (+0800) Subject: uboot-mediatek: move default env files to a dedicated directory X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4be1bab9ed76af2c053e483e2dcea906d7f02474;p=openwrt%2Fstaging%2Fstintel.git uboot-mediatek: move default env files to a dedicated directory Putting all files in the root folder is too messy. Signed-off-by: Shiji Yang --- diff --git a/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch b/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch index d425361809..05ccdb8c75 100644 --- a/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch +++ b/package/boot/uboot-mediatek/patches/400-update-bpir2-defconfig.patch @@ -65,7 +65,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r2_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r2_env" +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y +CONFIG_NETCONSOLE=y @@ -111,7 +111,7 @@ +CONFIG_RANDOM_UUID=y CONFIG_LZMA=y --- /dev/null -+++ b/bananapi_bpi-r2_env ++++ b/defenvs/bananapi_bpi-r2_env @@ -0,0 +1,69 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch b/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch index 0523b0e521..243ba9d7c2 100644 --- a/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch +++ b/package/boot/uboot-mediatek/patches/401-update-u7623-defconfig.patch @@ -63,7 +63,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="unielec_u7623-02_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/unielec_u7623-02_env" +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y +CONFIG_NETCONSOLE=y @@ -109,7 +109,7 @@ +CONFIG_RANDOM_UUID=y CONFIG_LZMA=y --- /dev/null -+++ b/unielec_u7623-02_env ++++ b/defenvs/unielec_u7623-02_env @@ -0,0 +1,47 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch b/package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch index eff8a0d2b0..3a2faf5aec 100644 --- a/package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch +++ b/package/boot/uboot-mediatek/patches/404-add-bananapi_bpi-r64_defconfigs.patch @@ -74,7 +74,7 @@ +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_DEV=1 +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r64-sdmmc_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r64-sdmmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y @@ -130,7 +130,7 @@ +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y --- /dev/null -+++ b/bananapi_bpi-r64-sdmmc_env ++++ b/defenvs/bananapi_bpi-r64-sdmmc_env @@ -0,0 +1,81 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 @@ -284,7 +284,7 @@ +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r64-emmc_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r64-emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y @@ -334,7 +334,7 @@ +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y --- /dev/null -+++ b/bananapi_bpi-r64-emmc_env ++++ b/defenvs/bananapi_bpi-r64-emmc_env @@ -0,0 +1,56 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 @@ -457,7 +457,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r64-snand_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r64-snand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y @@ -504,7 +504,7 @@ +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y --- /dev/null -+++ b/bananapi_bpi-r64-snand_env ++++ b/defenvs/bananapi_bpi-r64-snand_env @@ -0,0 +1,56 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch b/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch index 5b1c352e16..3a76d8fd32 100644 --- a/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch +++ b/package/boot/uboot-mediatek/patches/410-add-linksys-e8450.patch @@ -66,7 +66,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="linksys_e8450_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/linksys_e8450_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y @@ -339,7 +339,7 @@ mt7629-rfb.dtb \ mt7981-rfb.dtb \ --- /dev/null -+++ b/linksys_e8450_env ++++ b/defenvs/linksys_e8450_env @@ -0,0 +1,55 @@ +ethaddr_factory=ubi read 0x40080000 factory && env readmem -b ethaddr 0x400ffff4 0x6 ; setenv ethaddr_factory +ipaddr=192.168.1.1 diff --git a/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch b/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch index 4aff24c933..a80fd3576f 100644 --- a/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch +++ b/package/boot/uboot-mediatek/patches/412-add-ubnt-unifi-6-lr.patch @@ -60,7 +60,7 @@ +CONFIG_ENV_SIZE_REDUND=0x4000 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="ubnt_unifi-6-lr_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/ubnt_unifi-6-lr_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y @@ -176,7 +176,7 @@ +CONFIG_ENV_SIZE_REDUND=0x4000 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="ubnt_unifi-6-lr-v2_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/ubnt_unifi-6-lr-v2_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y @@ -292,7 +292,7 @@ +CONFIG_ENV_SIZE_REDUND=0x4000 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="ubnt_unifi-6-lr_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/ubnt_unifi-6-lr_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y @@ -749,7 +749,7 @@ mt7629-rfb.dtb \ mt7981-rfb.dtb \ --- /dev/null -+++ b/ubnt_unifi-6-lr_env ++++ b/defenvs/ubnt_unifi-6-lr_env @@ -0,0 +1,50 @@ +ethaddr_factory=mtd read nor0 $loadaddr 0x110000 0x10000 && env readmem -b ethaddr $loadaddr 0x6 ; setenv ethaddr_factory +ipaddr=192.168.1.1 @@ -802,7 +802,7 @@ +_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 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null -+++ b/ubnt_unifi-6-lr-v2_env ++++ b/defenvs/ubnt_unifi-6-lr-v2_env @@ -0,0 +1,50 @@ +ethaddr_factory=mtd read nor0 $loadaddr 0x110000 0x10000 && env readmem -b ethaddr $loadaddr 0x6 ; setenv ethaddr_factory +ipaddr=192.168.1.1 @@ -855,7 +855,7 @@ +_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 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver"--- /dev/null --- /dev/null -+++ b/ubnt_unifi-6-lr-v3_env ++++ b/defenvs/ubnt_unifi-6-lr-v3_env @@ -0,0 +1,50 @@ +ethaddr_factory=mtd read nor0 $loadaddr 0x110000 0x10000 && env readmem -b ethaddr $loadaddr 0x6 ; setenv ethaddr_factory +ipaddr=192.168.1.1 diff --git a/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch b/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch index 3aed1e1864..b53c48337f 100644 --- a/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch +++ b/package/boot/uboot-mediatek/patches/421-zbtlink_zbt-wg3526-16m.patch @@ -68,7 +68,7 @@ +CONFIG_ENV_SIZE_REDUND=0x10000 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="zbtlink_zbt-wg3526-16m_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/zbtlink_zbt-wg3526-16m_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_BOOTP_SEND_HOSTNAME=y @@ -99,7 +99,7 @@ +# CONFIG_GZIP is not set +CONFIG_SPL_LZMA=y --- /dev/null -+++ b/zbtlink_zbt-wg3526-16m_env ++++ b/defenvs/zbtlink_zbt-wg3526-16m_env @@ -0,0 +1,36 @@ +ethaddr_factory=mtd read factory $loadaddr 0x0 0x10000 ; setexpr macoffs $loadaddr + 0xe000 ; env readmem -b ethaddr $macoffs 0x6 ; setenv ethaddr_factory +ipaddr=192.168.1.1 diff --git a/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch b/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch index da1fef32d2..7526043760 100644 --- a/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch +++ b/package/boot/uboot-mediatek/patches/429-add-netcore-n60.patch @@ -75,7 +75,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="netcore_n60_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/netcore_n60_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -317,7 +317,7 @@ + status = "disabled"; +}; --- /dev/null -+++ b/netcore_n60_env ++++ b/defenvs/netcore_n60_env @@ -0,0 +1,57 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch b/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch index 514570184a..8a089f8e56 100644 --- a/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch +++ b/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch @@ -78,7 +78,7 @@ +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r3_emmc_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r3_emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -216,7 +216,7 @@ +CONFIG_ENV_SIZE_REDUND=0x20000 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r3_nor_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r3_nor_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -356,7 +356,7 @@ +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r3_sdmmc_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r3_sdmmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -494,7 +494,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r3_snand_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r3_snand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -550,7 +550,7 @@ +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y --- /dev/null -+++ b/bananapi_bpi-r3_sdmmc_env ++++ b/defenvs/bananapi_bpi-r3_sdmmc_env @@ -0,0 +1,81 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 @@ -634,7 +634,7 @@ +_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 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null -+++ b/bananapi_bpi-r3_nor_env ++++ b/defenvs/bananapi_bpi-r3_nor_env @@ -0,0 +1,60 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 @@ -697,7 +697,7 @@ +_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 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null -+++ b/bananapi_bpi-r3_snand_env ++++ b/defenvs/bananapi_bpi-r3_snand_env @@ -0,0 +1,73 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 @@ -773,7 +773,7 @@ +_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 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null -+++ b/bananapi_bpi-r3_emmc_env ++++ b/defenvs/bananapi_bpi-r3_emmc_env @@ -0,0 +1,61 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch b/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch index d152737fb5..81a1ac8f59 100644 --- a/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch +++ b/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch @@ -63,7 +63,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="xiaomi_redmi-ax6000_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/xiaomi_redmi-ax6000_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -269,7 +269,7 @@ + status = "disabled"; +}; --- /dev/null -+++ b/xiaomi_redmi-ax6000_env ++++ b/defenvs/xiaomi_redmi-ax6000_env @@ -0,0 +1,55 @@ +ethaddr_factory=mtd read factory 0x40080000 0x0 0x20000 && env readmem -b ethaddr 0x40080004 0x6 ; setenv ethaddr_factory +ipaddr=192.168.1.1 diff --git a/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch b/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch index 453de17475..414334124a 100644 --- a/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch +++ b/package/boot/uboot-mediatek/patches/432-add-tplink-xdr608x.patch @@ -75,7 +75,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="tplink_tl-xdr4288_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/tplink_tl-xdr4288_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -205,7 +205,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="tplink_tl-xdr6086_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/tplink_tl-xdr6086_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -335,7 +335,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="tplink_tl-xdr6088_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/tplink_tl-xdr6088_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -588,7 +588,7 @@ + status = "disabled"; +}; --- /dev/null -+++ b/tplink_tl-xdr4288_env ++++ b/defenvs/tplink_tl-xdr4288_env @@ -0,0 +1,57 @@ +ethaddr_factory=mtd read config 0x40080000 0x0 0x20000 && env readmem -b ethaddr 0x4008001c 0x6 ; setenv ethaddr_factory +ipaddr=192.168.1.1 @@ -648,7 +648,7 @@ +_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 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null -+++ b/tplink_tl-xdr6086_env ++++ b/defenvs/tplink_tl-xdr6086_env @@ -0,0 +1,57 @@ +ethaddr_factory=mtd read config 0x40080000 0x0 0x20000 && env readmem -b ethaddr 0x4008001c 0x6 ; setenv ethaddr_factory +ipaddr=192.168.1.1 @@ -708,7 +708,7 @@ +_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 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null -+++ b/tplink_tl-xdr6088_env ++++ b/defenvs/tplink_tl-xdr6088_env @@ -0,0 +1,57 @@ +ethaddr_factory=mtd read config 0x40080000 0x0 0x20000 && env readmem -b ethaddr 0x4008001c 0x6 ; setenv ethaddr_factory +ipaddr=192.168.1.1 diff --git a/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch b/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch index 73e492e5df..4758ad13c0 100644 --- a/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch +++ b/package/boot/uboot-mediatek/patches/433-add-qihoo_360t7.patch @@ -74,7 +74,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="qihoo-360t7_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/qihoo-360t7_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -312,7 +312,7 @@ + status = "disabled"; +}; --- /dev/null -+++ b/qihoo-360t7_env ++++ b/defenvs/qihoo-360t7_env @@ -0,0 +1,56 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch b/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch index 83ba6e78bf..5fb150dc2c 100644 --- a/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch +++ b/package/boot/uboot-mediatek/patches/434-add-xiaomi_mi-router-wr30u.patch @@ -74,7 +74,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="xiaomi_mi-router-wr30u_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/xiaomi_mi-router-wr30u_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -348,7 +348,7 @@ + status = "disabled"; +}; --- /dev/null -+++ b/xiaomi_mi-router-wr30u_env ++++ b/defenvs/xiaomi_mi-router-wr30u_env @@ -0,0 +1,56 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch b/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch index 234602efd3..bbf100f8a7 100644 --- a/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch +++ b/package/boot/uboot-mediatek/patches/435-add-h3c_magic-nx30-pro.patch @@ -74,7 +74,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="h3c_magic-nx30-pro_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/h3c_magic-nx30-pro_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -332,7 +332,7 @@ + status = "disabled"; +}; --- /dev/null -+++ b/h3c_magic-nx30-pro_env ++++ b/defenvs/h3c_magic-nx30-pro_env @@ -0,0 +1,56 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch b/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch index 474200b792..aedf9fe4ba 100644 --- a/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch +++ b/package/boot/uboot-mediatek/patches/436-add-glinet-mt6000.patch @@ -201,7 +201,7 @@ +CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="glinet_gl-mt6000_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/glinet_gl-mt6000_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -243,7 +243,7 @@ +CONFIG_USB_STORAGE=y +CONFIG_HEXDUMP=y --- /dev/null -+++ b/glinet_gl-mt6000_env ++++ b/defenvs/glinet_gl-mt6000_env @@ -0,0 +1,25 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch b/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch index d95a381236..70abc45ff3 100644 --- a/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch +++ b/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch @@ -73,7 +73,7 @@ +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="cmcc_rax3000m-emmc_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/cmcc_rax3000m-emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -199,7 +199,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="cmcc_rax3000m-nand_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/cmcc_rax3000m-nand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -473,7 +473,7 @@ + }; +}; --- /dev/null -+++ b/cmcc_rax3000m-emmc_env ++++ b/defenvs/cmcc_rax3000m-emmc_env @@ -0,0 +1,55 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 @@ -531,7 +531,7 @@ +_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 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null -+++ b/cmcc_rax3000m-nand_env ++++ b/defenvs/cmcc_rax3000m-nand_env @@ -0,0 +1,56 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch b/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch index 1f4a4cb547..3a23171dff 100644 --- a/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch +++ b/package/boot/uboot-mediatek/patches/438-add-jcg_q30-pro.patch @@ -74,7 +74,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="jcg_q30-pro_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/jcg_q30-pro_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -306,7 +306,7 @@ + status = "disabled"; +}; --- /dev/null -+++ b/jcg_q30-pro_env ++++ b/defenvs/jcg_q30-pro_env @@ -0,0 +1,57 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch b/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch index 419ab09239..c9094f377c 100644 --- a/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch +++ b/package/boot/uboot-mediatek/patches/439-add-zyxel_ex5601-t0.patch @@ -75,7 +75,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="zyxel_ex5601-t0_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/zyxel_ex5601-t0_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -313,7 +313,7 @@ +}; + --- /dev/null -+++ b/zyxel_ex5601-t0_env ++++ b/defenvs/zyxel_ex5601-t0_env @@ -0,0 +1,55 @@ +ethaddr_factory=mtd read Factory 0x40080000 0x0 0x20000 && env readmem -b ethaddr 0x4008002A 0x6 ; setenv ethaddr_factory +ipaddr=192.168.1.1 diff --git a/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch b/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch index 4ee1c2d837..c7bf7dd95c 100644 --- a/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch +++ b/package/boot/uboot-mediatek/patches/440-add-xiaomi_mi-router-ax3000t.patch @@ -65,7 +65,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="xiaomi_mi-router-ax3000t_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/xiaomi_mi-router-ax3000t_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -298,7 +298,7 @@ + status = "disabled"; +}; --- /dev/null -+++ b/xiaomi_mi-router-ax3000t_env ++++ b/defenvs/xiaomi_mi-router-ax3000t_env @@ -0,0 +1,55 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch b/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch index 03120ef051..651188c958 100644 --- a/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch +++ b/package/boot/uboot-mediatek/patches/441-add-jdcloud_re-cp-03.patch @@ -69,7 +69,7 @@ +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="jdcloud_re-cp-03_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/jdcloud_re-cp-03_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -262,7 +262,7 @@ + status = "disabled"; +}; --- /dev/null -+++ b/jdcloud_re-cp-03_env ++++ b/defenvs/jdcloud_re-cp-03_env @@ -0,0 +1,55 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch b/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch index 3f1629b358..e24b520c7b 100644 --- a/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch +++ b/package/boot/uboot-mediatek/patches/442-add-bpi-r3-mini.patch @@ -79,7 +79,7 @@ +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r3-mini_emmc_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r3-mini_emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -224,7 +224,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r3-mini_snand_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r3-mini_snand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -284,7 +284,7 @@ +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y --- /dev/null -+++ b/bananapi_bpi-r3-mini_snand_env ++++ b/defenvs/bananapi_bpi-r3-mini_snand_env @@ -0,0 +1,61 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 @@ -348,7 +348,7 @@ +_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 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null -+++ b/bananapi_bpi-r3-mini_emmc_env ++++ b/defenvs/bananapi_bpi-r3-mini_emmc_env @@ -0,0 +1,59 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch b/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch index 892e4d4521..086307cca6 100644 --- a/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch +++ b/package/boot/uboot-mediatek/patches/443-add-nokia_ea0326gmp.patch @@ -65,7 +65,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="nokia_ea0326gmp_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/nokia_ea0326gmp_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -297,7 +297,7 @@ + status = "disabled"; +}; --- /dev/null -+++ b/nokia_ea0326gmp_env ++++ b/defenvs/nokia_ea0326gmp_env @@ -0,0 +1,55 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch b/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch index b6af71939e..0d8601368f 100644 --- a/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch +++ b/package/boot/uboot-mediatek/patches/444-add-abt_asr3000.patch @@ -65,7 +65,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="abt_asr3000_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/abt_asr3000_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -287,7 +287,7 @@ + status = "disabled"; +}; --- /dev/null -+++ b/abt_asr3000_env ++++ b/defenvs/abt_asr3000_env @@ -0,0 +1,55 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch b/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch index 377b90c8e4..fe28a46c92 100644 --- a/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch +++ b/package/boot/uboot-mediatek/patches/450-add-bpi-r4.patch @@ -80,7 +80,7 @@ +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r4_emmc_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r4_emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -220,7 +220,7 @@ +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r4_sdmmc_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r4_sdmmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -360,7 +360,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r4_snand_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r4_snand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -419,7 +419,7 @@ +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y --- /dev/null -+++ b/bananapi_bpi-r4_sdmmc_env ++++ b/defenvs/bananapi_bpi-r4_sdmmc_env @@ -0,0 +1,66 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 @@ -488,7 +488,7 @@ +_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 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null -+++ b/bananapi_bpi-r4_snand_env ++++ b/defenvs/bananapi_bpi-r4_snand_env @@ -0,0 +1,67 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 @@ -558,7 +558,7 @@ +_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 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null -+++ b/bananapi_bpi-r4_emmc_env ++++ b/defenvs/bananapi_bpi-r4_emmc_env @@ -0,0 +1,57 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 @@ -947,7 +947,7 @@ +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r4-poe_emmc_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r4-poe_emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -1087,7 +1087,7 @@ +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r4-poe_sdmmc_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r4-poe_sdmmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -1227,7 +1227,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="bananapi_bpi-r4-poe_snand_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/bananapi_bpi-r4-poe_snand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -1286,7 +1286,7 @@ +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y --- /dev/null -+++ b/bananapi_bpi-r4-poe_emmc_env ++++ b/defenvs/bananapi_bpi-r4-poe_emmc_env @@ -0,0 +1,57 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 @@ -1346,7 +1346,7 @@ +_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 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null -+++ b/bananapi_bpi-r4-poe_sdmmc_env ++++ b/defenvs/bananapi_bpi-r4-poe_sdmmc_env @@ -0,0 +1,66 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 @@ -1415,7 +1415,7 @@ +_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 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null -+++ b/bananapi_bpi-r4-poe_snand_env ++++ b/defenvs/bananapi_bpi-r4-poe_snand_env @@ -0,0 +1,67 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch b/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch index 9c26bbdad1..da6e31b203 100644 --- a/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch +++ b/package/boot/uboot-mediatek/patches/451-add-tplink-xtr8488.patch @@ -75,7 +75,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="tplink_tl-xtr8488_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/tplink_tl-xtr8488_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -328,7 +328,7 @@ + status = "disabled"; +}; --- /dev/null -+++ b/tplink_tl-xtr8488_env ++++ b/defenvs/tplink_tl-xtr8488_env @@ -0,0 +1,57 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch b/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch index 5819181e2f..6fd39756d4 100644 --- a/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch +++ b/package/boot/uboot-mediatek/patches/452-add-xiaomi-redmi-ax6s.patch @@ -244,7 +244,7 @@ Subject: [PATCH] add xiaomi redmi ax6s +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="xiaomi-redmi-router-ax6s-ubi-loader_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/xiaomi-redmi-router-ax6s-ubi-loader_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_PROT_UDP=y @@ -293,7 +293,7 @@ Subject: [PATCH] add xiaomi redmi ax6s +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y --- /dev/null -+++ b/xiaomi-redmi-router-ax6s-ubi-loader_env ++++ b/defenvs/xiaomi-redmi-router-ax6s-ubi-loader_env @@ -0,0 +1,22 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 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 a4a1b5ffe5..d49b07f66e 100644 --- a/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch +++ b/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch @@ -281,7 +281,7 @@ +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="openwrt-one-nor_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/openwrt-one-nor_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NET_RANDOM_ETHADDR=y @@ -411,7 +411,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="openwrt-one-spi-nand_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/openwrt-one-spi-nand_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NET_RANDOM_ETHADDR=y @@ -460,7 +460,7 @@ +CONFIG_USB_STORAGE=y +CONFIG_HEXDUMP=y --- /dev/null -+++ b/openwrt-one-nor_env ++++ b/defenvs/openwrt-one-nor_env @@ -0,0 +1,48 @@ +ethaddr_factory=mtd read factory 0x46000000 0x0 0x20000 && env readmem -b ethaddr 0x4600002a 0x6 ; setenv ethaddr_factory +bl2_mtd_write=mtd erase bl2-nor && mtd write bl2-nor $loadaddr 0x0 0x40000 @@ -511,7 +511,7 @@ +_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 +_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title $ver" --- /dev/null -+++ b/openwrt-one-spi-nand_env ++++ b/defenvs/openwrt-one-spi-nand_env @@ -0,0 +1,62 @@ +ethaddr_factory=mtd read factory 0x46000000 0x0 0x20000 && env readmem -b ethaddr 0x4600002a 0x6 ; setenv ethaddr_factory +ipaddr=192.168.11.11 diff --git a/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch b/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch index 139af33c8a..00d58cd59b 100644 --- a/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch +++ b/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch @@ -220,7 +220,7 @@ +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_MMC=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="glinet_gl-x3000_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/glinet_gl-x3000_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_REGMAP=y @@ -247,7 +247,7 @@ +CONFIG_MTK_SERIAL=y +CONFIG_HEXDUMP=y --- /dev/null -+++ b/glinet_gl-x3000_env ++++ b/defenvs/glinet_gl-x3000_env @@ -0,0 +1,26 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch b/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch index e2ebf8994e..539f5bf4d3 100644 --- a/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch +++ b/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch @@ -75,7 +75,7 @@ +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="arcadyan_mozart_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/arcadyan_mozart_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -115,7 +115,7 @@ +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y --- /dev/null -+++ b/arcadyan_mozart_env ++++ b/defenvs/arcadyan_mozart_env @@ -0,0 +1,55 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch b/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch index 0e1647e94a..b7c70bb185 100644 --- a/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch +++ b/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch @@ -307,7 +307,7 @@ Signed-off-by: Enrico Mioso +CONFIG_ENV_SIZE_REDUND=0x0 +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="gatonetworks_gdsp_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/gatonetworks_gdsp_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -361,7 +361,7 @@ Signed-off-by: Enrico Mioso +CONFIG_UBIFS_SILENCE_MSG=y +CONFIG_HEXDUMP=y --- /dev/null -+++ b/gatonetworks_gdsp_env ++++ b/defenvs/gatonetworks_gdsp_env @@ -0,0 +1,38 @@ +load_factory_data=if env exists factory_data_present ; then else mtd read Factory $loadaddr 0x0 0x1000 ; setenv factory_data_present 1 ; fi +lan_mac_factory=run load_factory_data ; setexpr macoffs $loadaddr + 0x2a ; env readmem -b lan_mac $macoffs 0x6 ; setenv lan_mac_factory ; setenv macoffs diff --git a/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch b/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch index 72d65ba907..5b0968aff6 100644 --- a/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch +++ b/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch @@ -63,7 +63,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="mercusys_mr90x-v1_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/mercusys_mr90x-v1_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -285,7 +285,7 @@ + status = "disabled"; +}; --- /dev/null -+++ b/mercusys_mr90x-v1_env ++++ b/defenvs/mercusys_mr90x-v1_env @@ -0,0 +1,53 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 diff --git a/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch b/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch index 516460e391..23d9917b79 100644 --- a/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch +++ b/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch @@ -65,7 +65,7 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="routerich_ax3000_env" ++CONFIG_DEFAULT_ENV_FILE="defenvs/routerich_ax3000_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y +CONFIG_NETCONSOLE=y @@ -297,7 +297,7 @@ + status = "disabled"; +}; --- /dev/null -+++ b/routerich_ax3000_env ++++ b/defenvs/routerich_ax3000_env @@ -0,0 +1,58 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254