From 382aefe3ccdffbbf746f686f7518e2de9e8f3bed Mon Sep 17 00:00:00 2001 From: M_ars Date: Sun, 23 Jun 2024 14:56:04 +0200 Subject: [PATCH] SDK7: allow to build images with older wl drivers (Year 2020 & 2021) - deault is current Year 2023 wl driver (no change) --- release/src-rt-6.x.4708/Makefile | 24 ++++++++++++++++-- .../router/dhd/linux/2020/dhd.o | Bin 0 -> 893508 bytes .../router/dhd/linux/2021/dhd.o | Bin 0 -> 893508 bytes .../router/dhd/linux/{ => 2023}/dhd.o | Bin release/src-rt-7.x.main/src/help.mak | 24 ++++++++++++------ release/src-rt-7.x.main/src/targets.mak | 24 ++++++++++++++++++ 6 files changed, 62 insertions(+), 10 deletions(-) create mode 100755 release/src-rt-6.x.4708/router/dhd/linux/2020/dhd.o create mode 100755 release/src-rt-6.x.4708/router/dhd/linux/2021/dhd.o rename release/src-rt-6.x.4708/router/dhd/linux/{ => 2023}/dhd.o (100%) 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 0000000000000000000000000000000000000000..c635be80c5ba71dc45c94b58d5dfcccc6cbf908b GIT binary patch literal 893508 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