diff --git a/release/src-rt-6.x.4708/Makefile b/release/src-rt-6.x.4708/Makefile index 5975f46aa2..19e4ca09f0 100644 --- a/release/src-rt-6.x.4708/Makefile +++ b/release/src-rt-6.x.4708/Makefile @@ -99,6 +99,14 @@ ifeq ($(ASUS_TRX),NETGEAR2) endif endif +SDK7WL_DESC = +ifeq ($(BCM7WL2020),y) + SDK7WL_DESC = "-WL20" +endif +ifeq ($(BCM7WL2021),y) + SDK7WL_DESC = "-WL21" +endif + -include tomato_profile.mak # This could be simpler by just using $(TOMATO_PROFILE_NAME) like it used to be, @@ -707,6 +715,18 @@ define extrawlConfig cp -f $(SRCBASE)/router/dpsta/arm/dpsta.h $(SRCBASE)/router/dpsta/dpsta.h ; \ cp -f $(SRCBASE)/router/dpsta/arm/dpsta_linux.h $(SRCBASE)/router/dpsta/dpsta_linux.h ; \ cp -f $(SRCBASE)/router/dpsta/arm/dpsta.o $(SRCBASE)/router/dpsta/linux/dpsta.o ; \ + if [ "$(CONFIG_BCM7)" = "y" ]; then \ + if [ "$(BCM7WL2020)" = "y" ]; then \ + echo "Using SDK7 WL Driver - Year 2020"; \ + cp -f $(SRCBASE)/router/dhd/linux/2020/dhd.o $(SRCBASE)/router/dhd/linux/dhd.o ; \ + elif [ "$(BCM7WL2021)" = "y" ]; then \ + echo "Using SDK7 WL Driver - Year 2021"; \ + cp -f $(SRCBASE)/router/dhd/linux/2021/dhd.o $(SRCBASE)/router/dhd/linux/dhd.o ; \ + else \ + echo "Using SDK7 WL Driver - Year 2023 (default)"; \ + cp -f $(SRCBASE)/router/dhd/linux/2023/dhd.o $(SRCBASE)/router/dhd/linux/dhd.o ; \ + fi; \ + fi; \ fi; \ ) endef @@ -1151,7 +1171,7 @@ setprofile: echo '#define TOMATO_PROFILE PROFILE_$(N)' >> router/shared/tomato_profile.h echo '#define TOMATO_PROFILE_NAME "$(N)"' >> router/shared/tomato_profile.h echo '#define TOMATO_BUILD_NAME "$(B)"' >> router/shared/tomato_profile.h - echo '#define TOMATO_BUILD_DESC "$(DESC)$(EXTRA_64KDESC)$(NOSMP_DESC)"' >> router/shared/tomato_profile.h + echo '#define TOMATO_BUILD_DESC "$(DESC)$(EXTRA_64KDESC)$(NOSMP_DESC)$(SDK7WL_DESC)"' >> router/shared/tomato_profile.h echo '#ifndef CONFIG_NVRAM_SIZE' >> router/shared/tomato_profile.h echo '#define CONFIG_NVRAM_SIZE $(NVRAM_SIZE)' >> router/shared/tomato_profile.h echo '#endif' >> router/shared/tomato_profile.h @@ -1164,7 +1184,7 @@ setprofile: echo 'TOMATO_PROFILE_NAME = "$(N)"' >> tomato_profile.mak echo 'TOMATO_BUILD = "$(B)"' >> tomato_profile.mak echo 'TOMATO_BUILD_NAME = "$(B)"' >> tomato_profile.mak - echo 'TOMATO_BUILD_DESC = "$(DESC)$(EXTRA_64KDESC)$(NOSMP_DESC)"' >> tomato_profile.mak + echo 'TOMATO_BUILD_DESC = "$(DESC)$(EXTRA_64KDESC)$(NOSMP_DESC)$(SDK7WL_DESC)"' >> tomato_profile.mak echo 'TOMATO_PROFILE_L = $(lowercase_N)' >> tomato_profile.mak echo 'TOMATO_PROFILE_U = $(uppercase_N)' >> tomato_profile.mak echo 'TOMATO_BUILD_USB = "$(USB)"' >> tomato_profile.mak diff --git a/release/src-rt-6.x.4708/router/dhd/linux/2020/dhd.o b/release/src-rt-6.x.4708/router/dhd/linux/2020/dhd.o new file mode 100755 index 0000000000..c635be80c5 Binary files /dev/null and b/release/src-rt-6.x.4708/router/dhd/linux/2020/dhd.o differ diff --git a/release/src-rt-6.x.4708/router/dhd/linux/2021/dhd.o b/release/src-rt-6.x.4708/router/dhd/linux/2021/dhd.o new file mode 100755 index 0000000000..8a17249b54 Binary files /dev/null and b/release/src-rt-6.x.4708/router/dhd/linux/2021/dhd.o differ diff --git a/release/src-rt-6.x.4708/router/dhd/linux/dhd.o b/release/src-rt-6.x.4708/router/dhd/linux/2023/dhd.o similarity index 100% rename from release/src-rt-6.x.4708/router/dhd/linux/dhd.o rename to release/src-rt-6.x.4708/router/dhd/linux/2023/dhd.o diff --git a/release/src-rt-7.x.main/src/help.mak b/release/src-rt-7.x.main/src/help.mak index 6fa8b6396b..444df59775 100644 --- a/release/src-rt-7.x.main/src/help.mak +++ b/release/src-rt-7.x.main/src/help.mak @@ -1,10 +1,18 @@ help_main: @echo "ASUS ARM7 Builds" - @echo " ac3200e RT-AC3200 build VPN" - @echo " ac3200z RT-AC3200 build AIO" - @echo " ac3200-128e RT-AC3200 build VPN - 128K NVRAM" - @echo " ac3200-128z RT-AC3200 build AIO - 128K NVRAM" - @echo " r8000e R7900/R8000 build VPN" - @echo " r8000z R7900/R8000 build AIO" - @echo " r7900init R7900 init build" - @echo " r8000init R8000 init build" + @echo " ac3200e RT-AC3200 build VPN" + @echo " ac3200z RT-AC3200 build AIO" + @echo " ac3200-128e RT-AC3200 build VPN - 128K NVRAM" + @echo " ac3200-128z RT-AC3200 build AIO - 128K NVRAM" + @echo " ac3200-128-wl20e RT-AC3200 build VPN - 128K NVRAM (WL Driver Year 2020)" + @echo " ac3200-128-wl20z RT-AC3200 build AIO - 128K NVRAM (WL Driver Year 2020)" + @echo " ac3200-128-wl21e RT-AC3200 build VPN - 128K NVRAM (WL Driver Year 2021)" + @echo " ac3200-128-wl21z RT-AC3200 build AIO - 128K NVRAM (WL Driver Year 2021)" + @echo " r8000e R7900/R8000 build VPN" + @echo " r8000z R7900/R8000 build AIO" + @echo " r8000-wl20e R7900/R8000 build VPN (WL Driver Year 2020)" + @echo " r8000-wl20z R7900/R8000 build AIO (WL Driver Year 2020)" + @echo " r8000-wl21e R7900/R8000 build VPN (WL Driver Year 2021)" + @echo " r8000-wl21z R7900/R8000 build AIO (WL Driver Year 2021)" + @echo " r7900init R7900 init build" + @echo " r8000init R8000 init build" diff --git a/release/src-rt-7.x.main/src/targets.mak b/release/src-rt-7.x.main/src/targets.mak index 09d665dd6c..049f998141 100644 --- a/release/src-rt-7.x.main/src/targets.mak +++ b/release/src-rt-7.x.main/src/targets.mak @@ -10,6 +10,18 @@ r8000e: r8000z: @$(MAKE) z ARM=y BCM7=y NVRAM_64K=y NAND=y BCMSMP=y ASUS_TRX="NETGEAR" AC3200=y BSD=y DHDAP=y GMAC3=y NOWL=y DEBUGFS=y BCM_RECVFILE=y LINUX_MTD=32 BRCM_NAND_JFFS2=y IRQBALANCE=y NO_TRXKEY=y +r8000-wl20e: + @$(MAKE) e ARM=y BCM7=y BCM7WL2020=y NVRAM_64K=y NAND=y BCMSMP=y ASUS_TRX="NETGEAR" AC3200=y BSD=y DHDAP=y GMAC3=y NOWL=y DEBUGFS=y BCM_RECVFILE=y LINUX_MTD=32 BRCM_NAND_JFFS2=y IRQBALANCE=y NO_TRXKEY=y + +r8000-wl20z: + @$(MAKE) z ARM=y BCM7=y BCM7WL2020=y NVRAM_64K=y NAND=y BCMSMP=y ASUS_TRX="NETGEAR" AC3200=y BSD=y DHDAP=y GMAC3=y NOWL=y DEBUGFS=y BCM_RECVFILE=y LINUX_MTD=32 BRCM_NAND_JFFS2=y IRQBALANCE=y NO_TRXKEY=y + +r8000-wl21e: + @$(MAKE) e ARM=y BCM7=y BCM7WL2021=y NVRAM_64K=y NAND=y BCMSMP=y ASUS_TRX="NETGEAR" AC3200=y BSD=y DHDAP=y GMAC3=y NOWL=y DEBUGFS=y BCM_RECVFILE=y LINUX_MTD=32 BRCM_NAND_JFFS2=y IRQBALANCE=y NO_TRXKEY=y + +r8000-wl21z: + @$(MAKE) z ARM=y BCM7=y BCM7WL2021=y NVRAM_64K=y NAND=y BCMSMP=y ASUS_TRX="NETGEAR" AC3200=y BSD=y DHDAP=y GMAC3=y NOWL=y DEBUGFS=y BCM_RECVFILE=y LINUX_MTD=32 BRCM_NAND_JFFS2=y IRQBALANCE=y NO_TRXKEY=y + ac3200e: @$(MAKE) e ARM=y BCM7=y NVRAM_64K=y NAND=y BCMSMP=y ASUS_TRX="ASUS" TUXERA=y TUXERA_HFS=y AC3200=y BSD=y DHDAP=y GMAC3=y NOWL=y DEBUGFS=y BCM_RECVFILE=y LINUX_MTD=64 BRCM_NAND_JFFS2=y IRQBALANCE=y @@ -21,3 +33,15 @@ ac3200-128e: ac3200-128z: @$(MAKE) z ARM=y BCM7=y NVRAM_128K=y NVSIZE="128" NAND=y BCMSMP=y ASUS_TRX="ASUS" TUXERA=y TUXERA_HFS=y AC3200=y BSD=y DHDAP=y GMAC3=y NOWL=y DEBUGFS=y BCM_RECVFILE=y LINUX_MTD=64 BRCM_NAND_JFFS2=y IRQBALANCE=y + +ac3200-128-wl20e: + @$(MAKE) e ARM=y BCM7=y BCM7WL2020=y NVRAM_128K=y NVSIZE="128" NAND=y BCMSMP=y ASUS_TRX="ASUS" TUXERA=y TUXERA_HFS=y AC3200=y BSD=y DHDAP=y GMAC3=y NOWL=y DEBUGFS=y BCM_RECVFILE=y LINUX_MTD=64 BRCM_NAND_JFFS2=y IRQBALANCE=y + +ac3200-128-wl20z: + @$(MAKE) z ARM=y BCM7=y BCM7WL2020=y NVRAM_128K=y NVSIZE="128" NAND=y BCMSMP=y ASUS_TRX="ASUS" TUXERA=y TUXERA_HFS=y AC3200=y BSD=y DHDAP=y GMAC3=y NOWL=y DEBUGFS=y BCM_RECVFILE=y LINUX_MTD=64 BRCM_NAND_JFFS2=y IRQBALANCE=y + +ac3200-128-wl21e: + @$(MAKE) e ARM=y BCM7=y BCM7WL2021=y NVRAM_128K=y NVSIZE="128" NAND=y BCMSMP=y ASUS_TRX="ASUS" TUXERA=y TUXERA_HFS=y AC3200=y BSD=y DHDAP=y GMAC3=y NOWL=y DEBUGFS=y BCM_RECVFILE=y LINUX_MTD=64 BRCM_NAND_JFFS2=y IRQBALANCE=y + +ac3200-128-wl21z: + @$(MAKE) z ARM=y BCM7=y BCM7WL2021=y NVRAM_128K=y NVSIZE="128" NAND=y BCMSMP=y ASUS_TRX="ASUS" TUXERA=y TUXERA_HFS=y AC3200=y BSD=y DHDAP=y GMAC3=y NOWL=y DEBUGFS=y BCM_RECVFILE=y LINUX_MTD=64 BRCM_NAND_JFFS2=y IRQBALANCE=y