From 75a1bff3380adea0637960416f33a2c432b6c6bc Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 9 Mar 2025 17:37:06 +0800 Subject: [PATCH] uboot-mediatek: refresh uboot config for cmcc rax3000me Fixes: fd0e1230709b ("mediatek: add CMCC RAX3000Me support") Signed-off-by: Tianling Shen --- .../patches/471-add-cmcc_rax3000me.patch | 57 +++++++++++-------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/package/boot/uboot-mediatek/patches/471-add-cmcc_rax3000me.patch b/package/boot/uboot-mediatek/patches/471-add-cmcc_rax3000me.patch index 4b6985af82..ced05ab7f0 100644 --- a/package/boot/uboot-mediatek/patches/471-add-cmcc_rax3000me.patch +++ b/package/boot/uboot-mediatek/patches/471-add-cmcc_rax3000me.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7981_cmcc_rax3000me-emmc_defconfig -@@ -0,0 +1,122 @@ +@@ -0,0 +1,125 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -13,11 +13,11 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7981-cmcc-rax3000me-emmc" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_ENV_OFFSET_REDUND=0x440000 ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -48,14 +48,14 @@ +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y +CONFIG_CMD_USB=y ++CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y ++CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_LINK_LOCAL=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_DNS=y -+CONFIG_CMD_PING=y ++CONFIG_CMD_LINK_LOCAL=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -73,15 +73,17 @@ +CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/cmcc_rax3000me-emmc_env" ++CONFIG_DEFAULT_ENV_FILE="cmcc_rax3000me-emmc_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_NET_RANDOM_ETHADDR=y ++CONFIG_REGMAP=y ++CONFIG_SYSCON=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -123,9 +125,10 @@ +CONFIG_LZO=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y ++CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7981_cmcc_rax3000me-nand-ddr3_defconfig -@@ -0,0 +1,122 @@ +@@ -0,0 +1,125 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -136,10 +139,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7981-cmcc-rax3000me-nand" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -169,14 +172,14 @@ +CONFIG_CMD_MTD=y +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y ++CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y ++CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_LINK_LOCAL=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_DNS=y -+CONFIG_CMD_PING=y ++CONFIG_CMD_LINK_LOCAL=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -199,15 +202,17 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/cmcc_rax3000me-nand-ddr3_env" ++CONFIG_DEFAULT_ENV_FILE="cmcc_rax3000me-nand-ddr3_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_NET_RANDOM_ETHADDR=y ++CONFIG_REGMAP=y ++CONFIG_SYSCON=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -248,9 +253,10 @@ +CONFIG_MTK_SPIM=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y ++CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/configs/mt7981_cmcc_rax3000me-nand-ddr4_defconfig -@@ -0,0 +1,122 @@ +@@ -0,0 +1,125 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -261,10 +267,10 @@ +CONFIG_DEFAULT_DEVICE_TREE="mt7981-cmcc-rax3000me-nand" +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PRE_CON_BUF_ADDR=0x4007EF00 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_PCI=y +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y @@ -294,14 +300,14 @@ +CONFIG_CMD_MTD=y +CONFIG_CMD_PART=y +CONFIG_CMD_PCI=y ++CONFIG_CMD_DHCP=y +CONFIG_CMD_TFTPSRV=y +CONFIG_CMD_RARP=y ++CONFIG_CMD_PING=y +CONFIG_CMD_CDP=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_LINK_LOCAL=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_DNS=y -+CONFIG_CMD_PING=y ++CONFIG_CMD_LINK_LOCAL=y +CONFIG_CMD_PXE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PSTORE=y @@ -324,15 +330,17 @@ +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_USE_DEFAULT_ENV_FILE=y -+CONFIG_DEFAULT_ENV_FILE="defenvs/cmcc_rax3000me-nand-ddr4_env" ++CONFIG_DEFAULT_ENV_FILE="cmcc_rax3000me-nand-ddr4_env" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_VERSION_VARIABLE=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_NET_RANDOM_ETHADDR=y ++CONFIG_REGMAP=y ++CONFIG_SYSCON=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y +CONFIG_MTK_AHCI=y @@ -373,6 +381,7 @@ +CONFIG_MTK_SPIM=y +CONFIG_ZSTD=y +CONFIG_HEXDUMP=y ++CONFIG_LMB_MAX_REGIONS=64 --- /dev/null +++ b/arch/arm/dts/mt7981-cmcc-rax3000me-emmc.dts @@ -0,0 +1,9 @@ @@ -398,7 +407,7 @@ + compatible = "cmcc,rax3000me", "mediatek,mt7981"; +}; --- /dev/null -+++ b/defenvs/cmcc_rax3000me-emmc_env ++++ b/cmcc_rax3000me-emmc_env @@ -0,0 +1,55 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 @@ -456,7 +465,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/defenvs/cmcc_rax3000me-nand-ddr3_env ++++ b/cmcc_rax3000me-nand-ddr3_env @@ -0,0 +1,56 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254 @@ -515,7 +524,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/defenvs/cmcc_rax3000me-nand-ddr4_env ++++ b/cmcc_rax3000me-nand-ddr4_env @@ -0,0 +1,56 @@ +ipaddr=192.168.1.1 +serverip=192.168.1.254