version: bump to 2.7.0

.forgejo/workflows/dmsbg-100.yml

@@ -51,9 +51,9 @@ jobs:
           ./scripts/feeds install -a
           cp -rf configs/dmsbg100.config .config
           make defconfig
-          FORCE_UNSAFE_CONFIGURE=1 CONFIG_TARGET_ROOTFS_INITRAMFS=n make clean -j$(nproc)
-          FORCE_UNSAFE_CONFIGURE=1 CONFIG_TARGET_ROOTFS_INITRAMFS=n make download -j$(nproc)
-          FORCE_UNSAFE_CONFIGURE=1 CONFIG_TARGET_ROOTFS_INITRAMFS=n make world -j$(nproc)
+          FORCE_UNSAFE_CONFIGURE=1 CONFIG_TARGET_ROOTFS_INITRAMFS=n make clean -j16
+          FORCE_UNSAFE_CONFIGURE=1 CONFIG_TARGET_ROOTFS_INITRAMFS=n make download -j16
+          FORCE_UNSAFE_CONFIGURE=1 CONFIG_TARGET_ROOTFS_INITRAMFS=n make world -j16
 
       - name: Publish Packages to Portal
         run: |
@@ -63,7 +63,7 @@ jobs:
           mkdir -p $folder_name
           cp -rf ./bin/packages/aarch64_cortex-a53/* $folder_name/
           tar -czvf $folder_name.tar.gz $folder_name
-          curl -X POST -H 'Content-Type: multipart/form-data' -F "file=@$folder_name.tar.gz" http://$PORTAL_ENDPOINT/software/upload/opkg/${{ env.PORTAL_API_KEY }}
+          curl -L -X POST -H 'Content-Type: multipart/form-data' -F "file=@$folder_name.tar.gz" https://$PORTAL_ENDPOINT/software/upload/opkg/${{ env.PORTAL_API_KEY }}
 
       - name: Publish Release
         run: |
@@ -71,5 +71,5 @@ jobs:
           cd $difosDir
           sdFile=$(find ./bin/ -name "*difos*" | grep sdcard | head -n1)
           sqFile=$(find ./bin/ -name "*difos*" | grep squash | head -n1)
-          curl -X POST -H 'Content-Type: multipart/form-data' -F "file=@$sdFile" http://$PORTAL_ENDPOINT/software/upload/sd/$ENVIRONMENT/${{ env.PORTAL_API_KEY }}
-          curl -X POST -H 'Content-Type: multipart/form-data' -F "file=@$sqFile" http://$PORTAL_ENDPOINT/software/upload/sysupgrade/$ENVIRONMENT/${{ env.PORTAL_API_KEY }}
+          curl -L -X POST -H 'Content-Type: multipart/form-data' -F "file=@$sdFile" https://$PORTAL_ENDPOINT/software/upload/sd/$ENVIRONMENT/${{ env.PORTAL_API_KEY }}
+          curl -L -X POST -H 'Content-Type: multipart/form-data' -F "file=@$sqFile" https://$PORTAL_ENDPOINT/software/upload/sysupgrade/$ENVIRONMENT/${{ env.PORTAL_API_KEY }}

configs/dmsbg100.config

@@ -63,6 +63,7 @@ CONFIG_LIBQMI_COLLECTION_BASIC=y
 CONFIG_LIBQMI_WITH_MBIM_QMUX=y
 CONFIG_LIBQMI_WITH_QRTR_GLIB=y
 CONFIG_LIBSODIUM_MINIMAL=y
+CONFIG_LIBSSH2_OPENSSL=y
 CONFIG_LUCI_SRCDIET=y
 CONFIG_LXC_SECCOMP=y
 # CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED is not set
@@ -129,6 +130,7 @@ CONFIG_PACKAGE_TAR_ZSTD=y
 CONFIG_PACKAGE_acme=y
 CONFIG_PACKAGE_acme-acmesh=y
 CONFIG_PACKAGE_acme-common=y
+CONFIG_PACKAGE_adb=m
 CONFIG_PACKAGE_adguardhome=y
 CONFIG_PACKAGE_alsa-lib=y
 CONFIG_PACKAGE_alsa-ucm-conf=m
@@ -206,7 +208,6 @@ CONFIG_PACKAGE_asterisk-cdr-sqlite3=y
 CONFIG_PACKAGE_asterisk-cel-custom=y
 CONFIG_PACKAGE_asterisk-cel-manager=y
 CONFIG_PACKAGE_asterisk-cel-sqlite3-custom=y
-CONFIG_PACKAGE_asterisk-chan-quectel=y
 CONFIG_PACKAGE_asterisk-chan-rtp=y
 CONFIG_PACKAGE_asterisk-chan-sccp=m
 CONFIG_PACKAGE_asterisk-chan-skinny=y
@@ -356,12 +357,17 @@ CONFIG_PACKAGE_bind-server=y
 CONFIG_PACKAGE_bind-server-filter-aaaa=y
 CONFIG_PACKAGE_bird2=m
 CONFIG_PACKAGE_bird2c=m
+CONFIG_PACKAGE_blkid=m
 CONFIG_PACKAGE_block-mount=y
+CONFIG_PACKAGE_bmon=m
+CONFIG_PACKAGE_btop=m
 CONFIG_PACKAGE_btrfs-progs=m
 CONFIG_PACKAGE_bzip2=m
 CONFIG_PACKAGE_ca-certificates=m
+CONFIG_PACKAGE_cfdisk=m
 CONFIG_PACKAGE_cgi-io=y
 CONFIG_PACKAGE_cgroupfs-mount=m
+CONFIG_PACKAGE_chat=m
 CONFIG_PACKAGE_collectd=y
 CONFIG_PACKAGE_collectd-mod-cpu=y
 CONFIG_PACKAGE_collectd-mod-interface=y
@@ -373,6 +379,9 @@ CONFIG_PACKAGE_collectd-mod-rrdtool=y
 CONFIG_PACKAGE_collectd-mod-thermal=y
 CONFIG_PACKAGE_collectd-mod-threshold=y
 CONFIG_PACKAGE_collectd-mod-wireless=y
+CONFIG_PACKAGE_comgt=m
+CONFIG_PACKAGE_comgt-ncm=m
+CONFIG_PACKAGE_confuse=m
 CONFIG_PACKAGE_containerd=m
 CONFIG_PACKAGE_coturn=y
 CONFIG_PACKAGE_curl=y
@@ -393,6 +402,7 @@ CONFIG_PACKAGE_ddns-scripts-one=y
 CONFIG_PACKAGE_ddns-scripts-pdns=y
 CONFIG_PACKAGE_ddns-scripts-route53=y
 CONFIG_PACKAGE_ddns-scripts-services=y
+CONFIG_PACKAGE_dmesg=m
 # CONFIG_PACKAGE_dnsmasq is not set
 CONFIG_PACKAGE_dnsmasq-full=y
 CONFIG_PACKAGE_dnsmasq_full_auth=y
@@ -409,6 +419,8 @@ CONFIG_PACKAGE_docker=m
 CONFIG_PACKAGE_docker-compose=m
 CONFIG_PACKAGE_dockerd=m
 CONFIG_PACKAGE_ethtool-full=y
+CONFIG_PACKAGE_exfat-mkfs=m
+CONFIG_PACKAGE_fdisk=m
 CONFIG_PACKAGE_flock=m
 CONFIG_PACKAGE_frr=m
 CONFIG_PACKAGE_frr-babeld=m
@@ -433,11 +445,14 @@ CONFIG_PACKAGE_frr-vrrpd=m
 CONFIG_PACKAGE_frr-vtysh=m
 CONFIG_PACKAGE_frr-watchfrr=m
 CONFIG_PACKAGE_frr-zebra=m
+CONFIG_PACKAGE_gdisk=m
 CONFIG_PACKAGE_getopt=m
 CONFIG_PACKAGE_giflib-utils=y
 CONFIG_PACKAGE_git=m
 CONFIG_PACKAGE_git-http=m
 CONFIG_PACKAGE_glib2=m
+CONFIG_PACKAGE_gnupg=m
+CONFIG_PACKAGE_gnutls-utils=m
 CONFIG_PACKAGE_golang=m
 CONFIG_PACKAGE_golang-src=m
 CONFIG_PACKAGE_hostapd-utils=y
@@ -448,6 +463,7 @@ CONFIG_PACKAGE_ip-tiny=y
 CONFIG_PACKAGE_ip6tables-nft=y
 CONFIG_PACKAGE_iperf3=m
 CONFIG_PACKAGE_ipset=y
+CONFIG_PACKAGE_ipset-dns=m
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-extra=m
 CONFIG_PACKAGE_iptables-mod-ipopt=y
@@ -564,6 +580,7 @@ CONFIG_PACKAGE_kmod-usb-net=y
 CONFIG_PACKAGE_kmod-usb-net-cdc-ether=y
 CONFIG_PACKAGE_kmod-usb-net-cdc-mbim=y
 CONFIG_PACKAGE_kmod-usb-net-cdc-ncm=y
+CONFIG_PACKAGE_kmod-usb-net-huawei-cdc-ncm=m
 CONFIG_PACKAGE_kmod-usb-net-qmi-wwan=y
 CONFIG_PACKAGE_kmod-usb-serial=y
 CONFIG_PACKAGE_kmod-usb-serial-option=y
@@ -605,6 +622,7 @@ CONFIG_PACKAGE_libevent2-extra=y
 CONFIG_PACKAGE_libevent2-openssl=y
 CONFIG_PACKAGE_libevent2-pthreads=y
 CONFIG_PACKAGE_libexpat=y
+CONFIG_PACKAGE_libfdisk=m
 CONFIG_PACKAGE_libffi=m
 CONFIG_PACKAGE_libfido2=y
 CONFIG_PACKAGE_libflac=y
@@ -622,9 +640,11 @@ CONFIG_PACKAGE_libipset=y
 CONFIG_PACKAGE_libiptext=y
 CONFIG_PACKAGE_libiptext-nft=y
 CONFIG_PACKAGE_libiptext6=y
+CONFIG_PACKAGE_libjwt=y
 CONFIG_PACKAGE_libldns=y
 CONFIG_PACKAGE_libltdl=y
 CONFIG_PACKAGE_liblua=y
+CONFIG_PACKAGE_liblua5.3=m
 CONFIG_PACKAGE_liblucihttp=y
 CONFIG_PACKAGE_liblucihttp-lua=y
 CONFIG_PACKAGE_liblucihttp-ucode=y
@@ -654,6 +674,7 @@ CONFIG_PACKAGE_libnl-genl=y
 CONFIG_PACKAGE_libnl-nf=y
 CONFIG_PACKAGE_libnl-route=y
 CONFIG_PACKAGE_libnss=y
+CONFIG_PACKAGE_libnvme=m
 CONFIG_PACKAGE_libodbc=y
 CONFIG_PACKAGE_libodbccr=y
 CONFIG_PACKAGE_libodbcinst=y
@@ -666,6 +687,7 @@ CONFIG_PACKAGE_libopus=y
 CONFIG_PACKAGE_libopusenc=y
 CONFIG_PACKAGE_libopusfile=y
 CONFIG_PACKAGE_libout123=y
+CONFIG_PACKAGE_libparted=m
 CONFIG_PACKAGE_libpcap=y
 CONFIG_PACKAGE_libpciaccess=m
 CONFIG_PACKAGE_libpcre=y
@@ -696,6 +718,7 @@ CONFIG_PACKAGE_libspeex=y
 CONFIG_PACKAGE_libspeexdsp=y
 CONFIG_PACKAGE_libsqlite3=y
 CONFIG_PACKAGE_libsrtp2=y
+CONFIG_PACKAGE_libssh2=m
 CONFIG_PACKAGE_libstdcpp=y
 CONFIG_PACKAGE_libsyn123=y
 CONFIG_PACKAGE_libtasn1=y
@@ -718,6 +741,7 @@ CONFIG_PACKAGE_libxml2=y
 CONFIG_PACKAGE_libxtables=y
 CONFIG_PACKAGE_libyang=m
 CONFIG_PACKAGE_libzstd=m
+CONFIG_PACKAGE_lsblk=m
 CONFIG_PACKAGE_lua=y
 CONFIG_PACKAGE_luajit=m
 CONFIG_PACKAGE_luci-app-ddns=y
@@ -772,6 +796,7 @@ CONFIG_PACKAGE_lxc-hooks=m
 CONFIG_PACKAGE_lxc-templates=m
 CONFIG_PACKAGE_minicom=m
 CONFIG_PACKAGE_miniupnpd-nftables=y
+CONFIG_PACKAGE_mmc-utils=m
 CONFIG_PACKAGE_modemmanager=m
 CONFIG_PACKAGE_more=m
 CONFIG_PACKAGE_mount-utils=m
@@ -779,6 +804,11 @@ CONFIG_PACKAGE_mpg123=y
 CONFIG_PACKAGE_mwan3=m
 CONFIG_PACKAGE_nano-full=m
 CONFIG_PACKAGE_nano-plus=m
+CONFIG_PACKAGE_ncat=m
+CONFIG_PACKAGE_ncat-full=m
+CONFIG_PACKAGE_ncat-ssl=m
+CONFIG_PACKAGE_ndiff=m
+CONFIG_PACKAGE_ndiff-src=m
 CONFIG_PACKAGE_netcat=m
 CONFIG_PACKAGE_netdata=y
 CONFIG_PACKAGE_netifyd=y
@@ -793,21 +823,36 @@ CONFIG_PACKAGE_nginx-ssl-util=y
 CONFIG_PACKAGE_nginx-util=y
 CONFIG_PACKAGE_nlbwmon=y
 CONFIG_PACKAGE_nload=m
+CONFIG_PACKAGE_nmap=m
+CONFIG_PACKAGE_nmap-full=m
+CONFIG_PACKAGE_nmap-ssl=m
 CONFIG_PACKAGE_node=m
 CONFIG_PACKAGE_node-npm=m
+CONFIG_PACKAGE_node-serialport=m
+CONFIG_PACKAGE_node-serialport-bindings=m
+CONFIG_PACKAGE_nping=m
+CONFIG_PACKAGE_nping-ssl=m
 CONFIG_PACKAGE_nspr=y
 CONFIG_PACKAGE_nss-utils=y
+CONFIG_PACKAGE_nvme-cli=m
 CONFIG_PACKAGE_openfortivpn=y
+CONFIG_PACKAGE_openldap-server=y
+CONFIG_PACKAGE_openldap-utils=y
 CONFIG_PACKAGE_opennds=m
 CONFIG_PACKAGE_openssh-keygen=y
 CONFIG_PACKAGE_openssh-server=y
 CONFIG_PACKAGE_openssh-sftp-server=y
 CONFIG_PACKAGE_openssl-util=y
 CONFIG_PACKAGE_openvpn-openssl=y
+CONFIG_PACKAGE_parted=m
 CONFIG_PACKAGE_pbr=m
+CONFIG_PACKAGE_picocom=m
 CONFIG_PACKAGE_python3-base=m
+CONFIG_PACKAGE_python3-email=m
 CONFIG_PACKAGE_python3-light=m
 CONFIG_PACKAGE_python3-logging=m
+CONFIG_PACKAGE_python3-urllib=m
+CONFIG_PACKAGE_python3-xml=m
 CONFIG_PACKAGE_resolveip=m
 CONFIG_PACKAGE_rpcd=y
 CONFIG_PACKAGE_rpcd-mod-file=y
@@ -820,17 +865,19 @@ CONFIG_PACKAGE_rrdtool1=y
 CONFIG_PACKAGE_runc=m
 CONFIG_PACKAGE_samba4-libs=y
 CONFIG_PACKAGE_samba4-server=y
+CONFIG_PACKAGE_sgdisk=m
 CONFIG_PACKAGE_sipgrep=m
 CONFIG_PACKAGE_sngrep=m
 CONFIG_PACKAGE_snort3=m
 CONFIG_PACKAGE_socat=y
-CONFIG_PACKAGE_softethervpn5-client=y
-CONFIG_PACKAGE_softethervpn5-libs=y
+CONFIG_PACKAGE_softethervpn5-client=m
+CONFIG_PACKAGE_softethervpn5-libs=m
 CONFIG_PACKAGE_sox=y
 CONFIG_PACKAGE_speedtest-netperf=m
 CONFIG_PACKAGE_speedtestcpp=y
 CONFIG_PACKAGE_sqm-scripts=y
 CONFIG_PACKAGE_sqm-scripts-extra=y
+CONFIG_PACKAGE_sshtunnel=m
 CONFIG_PACKAGE_strongswan=y
 CONFIG_PACKAGE_strongswan-charon=y
 CONFIG_PACKAGE_strongswan-charon-cmd=y
@@ -929,6 +976,7 @@ CONFIG_PACKAGE_ttyd=y
 CONFIG_PACKAGE_ucode-mod-html=y
 CONFIG_PACKAGE_ucode-mod-lua=y
 CONFIG_PACKAGE_ucode-mod-math=y
+CONFIG_PACKAGE_umbim=m
 CONFIG_PACKAGE_unixodbc=y
 CONFIG_PACKAGE_uqmi=y
 CONFIG_PACKAGE_usb-modeswitch=y
@@ -942,6 +990,7 @@ CONFIG_PACKAGE_uwsgi-syslog-plugin=y
 CONFIG_PACKAGE_vti=y
 CONFIG_PACKAGE_vxlan=y
 CONFIG_PACKAGE_wget-ssl=y
+CONFIG_PACKAGE_wipefs=m
 CONFIG_PACKAGE_wireguard-tools=y
 # CONFIG_PACKAGE_wpad-basic-mbedtls is not set
 CONFIG_PACKAGE_wpad-mesh-openssl=y
@@ -964,6 +1013,9 @@ CONFIG_PACKAGE_zoneinfo-europe=y
 CONFIG_PACKAGE_zoneinfo-indian=y
 CONFIG_PACKAGE_zoneinfo-pacific=y
 CONFIG_PACKAGE_zoneinfo-poles=y
+CONFIG_PACKAGE_zsh=m
+CONFIG_PARTED_LVM2=y
+CONFIG_PARTED_READLINE=y
 CONFIG_PREINITOPT=y
 CONFIG_SAMBA4_SERVER_AVAHI=y
 CONFIG_SAMBA4_SERVER_NETBIOS=y
@@ -1000,7 +1052,7 @@ CONFIG_VERSION_HOME_URL="https://difuse.io"
 CONFIG_VERSION_HWREV="v1"
 CONFIG_VERSION_MANUFACTURER="Difuse"
 CONFIG_VERSION_MANUFACTURER_URL="https://difuse.io"
-CONFIG_VERSION_NUMBER="2.5.8"
+CONFIG_VERSION_NUMBER="2.7.0"
 CONFIG_VERSION_PRODUCT="DMSBG-100"
 CONFIG_VERSION_REPO="https://difuse.io/releases"
 CONFIG_VERSION_SUPPORT_URL="https://docs.difuse.io"

feeds.conf.default

@@ -1,4 +1,4 @@
-src-git-full packages https://github.com/DifuseHQ/packages.git
-src-git-full luci https://github.com/DifuseHQ/luci.git
-src-git-full routing https://github.com/DifuseHQ/routing.git
-src-git-full telephony https://github.com/DifuseHQ/telephony.git
+src-git-full packages https://git.difuse.io/Difuse/packages.git
+src-git-full luci https://git.difuse.io/Difuse/luci.git
+src-git-full routing https://git.difuse.io/Difuse/routing.git
+src-git-full telephony https://git.difuse.io/Difuse/telephony.git

include/u-boot.mk

@@ -5,9 +5,7 @@ PKG_NAME ?= u-boot
 ifndef PKG_SOURCE_PROTO
 PKG_SOURCE = $(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL = \
-	https://mirror.cyberbits.eu/u-boot \
-	https://ftp.denx.de/pub/u-boot \
-	ftp://ftp.denx.de/pub/u-boot
+	https://downloads-bucket.difuse.io
 endif
 
 PKG_BUILD_DIR = $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

package/boot/uboot-envtools/Makefile

@@ -9,15 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uboot-envtools
 PKG_DISTNAME:=u-boot
-PKG_VERSION:=2023.07.02
+PKG_VERSION:=2023.08.01
 PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \
-    https://ftp.denx.de/pub/u-boot \
-    https://mirror.cyberbits.eu/u-boot \
-    ftp://ftp.denx.de/pub/u-boot
-PKG_HASH:=6b6a48581c14abb0f95bd87c1af4d740922406d7b801002a9f94727fdde021d5
+    https://downloads-bucket.difuse.io
+PKG_HASH:=184583556dc99b40e464f4ba37ebebbe5443d87d96a14424db3801346c3ce5d8
 PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-$(PKG_VERSION)
 

package/boot/uboot-mediatek/Makefile

@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-PKG_VERSION:=2023.07.02
-PKG_HASH:=6b6a48581c14abb0f95bd87c1af4d740922406d7b801002a9f94727fdde021d5
+PKG_VERSION:=2023.08.01
+PKG_HASH:=184583556dc99b40e464f4ba37ebebbe5443d87d96a14424db3801346c3ce5d8
 PKG_BUILD_DEPENDS:=!(TARGET_ramips||TARGET_mediatek_mt7623):arm-trusted-firmware-tools/host
 
 UBOOT_USE_INTREE_DTC:=1

package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch

@@ -61,6 +61,8 @@
 +CONFIG_CMD_LINK_LOCAL=y
 +# CONFIG_CMD_MBR is not set
 +CONFIG_CMD_MMC=y
++CONFIG_CMD_MMC_REG=y
++CONFIG_CMD_MMC_MAC=y
 +CONFIG_CMD_MTD=y
 +CONFIG_CMD_PCI=y
 +CONFIG_CMD_PSTORE=y
@@ -161,7 +163,7 @@
 +CONFIG_ENV_SIZE=0x40000
 +CONFIG_ENV_SIZE_REDUND=0x40000
 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
++CONFIG_NET_RANDOM_ETHADDR=n
 +CONFIG_REGMAP=y
 +CONFIG_SYSCON=y
 +CONFIG_CLK=y
@@ -260,6 +262,8 @@
 +CONFIG_CMD_LINK_LOCAL=y
 +# CONFIG_CMD_MBR is not set
 +CONFIG_CMD_MMC=y
++CONFIG_CMD_MMC_REG=y
++CONFIG_CMD_MMC_MAC=y
 +CONFIG_CMD_MTD=y
 +CONFIG_CMD_PCI=y
 +CONFIG_CMD_PSTORE=y
@@ -361,7 +365,7 @@
 +CONFIG_ENV_SIZE=0x20000
 +CONFIG_ENV_SIZE_REDUND=0x20000
 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
++CONFIG_NET_RANDOM_ETHADDR=n
 +CONFIG_REGMAP=y
 +CONFIG_SYSCON=y
 +CONFIG_CLK=y
@@ -458,6 +462,8 @@
 +CONFIG_CMD_LINK_LOCAL=y
 +# CONFIG_CMD_MBR is not set
 +CONFIG_CMD_MMC=y
++CONFIG_CMD_MMC_REG=y
++CONFIG_CMD_MMC_MAC=y
 +CONFIG_CMD_MTD=y
 +CONFIG_CMD_PCI=y
 +CONFIG_CMD_PSTORE=y
@@ -558,7 +564,7 @@
 +CONFIG_ENV_SIZE=0x40000
 +CONFIG_ENV_SIZE_REDUND=0x40000
 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
++CONFIG_NET_RANDOM_ETHADDR=n
 +CONFIG_REGMAP=y
 +CONFIG_SYSCON=y
 +CONFIG_CLK=y
@@ -657,6 +663,8 @@
 +CONFIG_CMD_LINK_LOCAL=y
 +# CONFIG_CMD_MBR is not set
 +CONFIG_CMD_MMC=y
++CONFIG_CMD_MMC_REG=y
++CONFIG_CMD_MMC_MAC=y
 +CONFIG_CMD_MTD=y
 +CONFIG_CMD_PCI=y
 +CONFIG_CMD_PSTORE=y
@@ -758,7 +766,7 @@
 +CONFIG_ENV_UBI_VOLUME="ubootenv"
 +CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-+CONFIG_NET_RANDOM_ETHADDR=y
++CONFIG_NET_RANDOM_ETHADDR=n
 +CONFIG_REGMAP=y
 +CONFIG_SYSCON=y
 +CONFIG_CLK=y
@@ -1025,7 +1033,7 @@
 +loadaddr=0x46000000
 +console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
 +bootargs=root=/dev/mmcblk0p65
-+bootcmd=if pstore check ; then run boot_recovery ; else run boot_emmc ; fi
++bootcmd=mmc mac; saveenv; if pstore check ; then run boot_recovery ; else run boot_emmc ; fi
 +bootconf=config-mt7986a-bananapi-bpi-r3
 +bootconf_base=config-mt7986a-bananapi-bpi-r3
 +bootconf_nor=mt7986a-bananapi-bpi-r3-nor