mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2026-02-11 11:02:51 +01:00
a8afcd8fc2
Building against recent kernel versions (noticed with 6.12) and -Werror
can fail because a macro MAX(a,b) is already defined in minmax.h or
kernel.h before 5.10.
Initially noticed on 6.12, but it now happens after the kernel bump to
6.6.109 as well (upstream commit 6183c65)
In file included from ../mwlwifi-2025.02.06~db97edf2/hif/fwcmd.h:23,
from ../mwlwifi-2025.02.06~db97edf2/core.c:25:
../mwlwifi-2025.02.06~db97edf2/hif/hostcmd.h:1124: error: "MAX" redefined [-Werror]
1124 | #define MAX(a, b) (((a) > (b)) ? (a) : (b))
| ^~~
In file included from usr/include/mac80211-backport/linux/minmax.h:4,
from ./include/linux/kernel.h:27,
from usr/include/mac80211-backport/linux/kernel.h:3,
from ./include/linux/skbuff.h:13,
from usr/include/mac80211-backport/linux/skbuff.h:3,
from ./include/linux/if_ether.h:19,
from usr/include/mac80211-backport/linux/if_ether.h:3,
from ./include/linux/etherdevice.h:20,
from usr/include/mac80211-backport/linux/etherdevice.h:3,
from ../mwlwifi-2025.02.06~db97edf2/core.c:18:
./include/linux/minmax.h:315: note: this is the location of the previous definition
315 | #define MAX(a, b) __cmp(max, a, b)
| ^~~
Add a pending upstream patch which replaces the MAX(a,b) macro to avoid
conflicts and allow compilation with 6.12 backports
(cherry picked from commit 822bceb1d1)
Signed-off-by: Stefan Kalscheuer <stefan@stklcode.de>
Link: https://github.com/openwrt/openwrt/pull/20420
Signed-off-by: Robert Marko <robimarko@gmail.com>
104 lines
2.9 KiB
Makefile
104 lines
2.9 KiB
Makefile
#
|
|
# Copyright (C) 2014-2016 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=mwlwifi
|
|
PKG_RELEASE=2
|
|
|
|
PKG_LICENSE:=ISC
|
|
PKG_LICENSE_FILES:=
|
|
|
|
PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi
|
|
PKG_SOURCE_PROTO:=git
|
|
PKG_SOURCE_DATE:=2025-02-06
|
|
PKG_SOURCE_VERSION:=db97edf20fadea2617805006f5230665fadc6a8c
|
|
PKG_MIRROR_HASH:=b5464cf6d57d87f6ce5f13bd2320c7e7e671a3152a74f4ef004382f898b89ecf
|
|
|
|
PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
|
|
PKG_BUILD_PARALLEL:=1
|
|
PKG_FLAGS:=nonshared
|
|
|
|
include $(INCLUDE_DIR)/kernel.mk
|
|
include $(INCLUDE_DIR)/package.mk
|
|
|
|
define KernelPackage/mwlwifi
|
|
SUBMENU:=Wireless Drivers
|
|
TITLE:=Marvell 88W8864/88W8897/88W8964/88W8997 wireless driver
|
|
DEPENDS:=+kmod-mac80211 +@DRIVER_11AC_SUPPORT @PCI_SUPPORT @TARGET_mvebu
|
|
FILES:=$(PKG_BUILD_DIR)/mwlwifi.ko
|
|
AUTOLOAD:=$(call AutoLoad,50,mwlwifi)
|
|
endef
|
|
|
|
NOSTDINC_FLAGS := \
|
|
$(KERNEL_NOSTDINC_FLAGS) \
|
|
-I$(PKG_BUILD_DIR) \
|
|
-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
|
|
-I$(STAGING_DIR)/usr/include/mac80211-backport \
|
|
-I$(STAGING_DIR)/usr/include/mac80211/uapi \
|
|
-I$(STAGING_DIR)/usr/include/mac80211 \
|
|
-include backport/backport.h \
|
|
-Wno-unused-result
|
|
|
|
define Build/Compile
|
|
+$(KERNEL_MAKE) $(PKG_JOBS) \
|
|
M="$(PKG_BUILD_DIR)" \
|
|
NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
|
|
modules
|
|
endef
|
|
|
|
define Package/mwlwifi-firmware-default
|
|
SECTION:=firmware
|
|
CATEGORY:=Firmware
|
|
TITLE:=Marvell $(1) firmware
|
|
DEPENDS:=+kmod-mwlwifi @TARGET_mvebu
|
|
endef
|
|
|
|
define Package/mwlwifi-firmware/install
|
|
$(INSTALL_DIR) $(1)/lib/firmware
|
|
$(INSTALL_DIR) $(1)/lib/firmware/mwlwifi
|
|
$(CP) $(PKG_BUILD_DIR)/bin/firmware/$(2) $(1)/lib/firmware/mwlwifi/
|
|
$(CP) $(PKG_BUILD_DIR)/bin/firmware/Marvell_license.txt $(1)/lib/firmware/mwlwifi/$(2).Marvell_license.txt
|
|
endef
|
|
|
|
define Package/mwlwifi-firmware-88w8864
|
|
$(call Package/mwlwifi-firmware-default,88W8864)
|
|
endef
|
|
|
|
define Package/mwlwifi-firmware-88w8864/install
|
|
$(call Package/mwlwifi-firmware/install,$(1),88W8864.bin)
|
|
endef
|
|
|
|
define Package/mwlwifi-firmware-88w8897
|
|
$(call Package/mwlwifi-firmware-default,88W8897)
|
|
endef
|
|
|
|
define Package/mwlwifi-firmware-88w8897/install
|
|
$(call Package/mwlwifi-firmware/install,$(1),88W8897.bin)
|
|
endef
|
|
|
|
define Package/mwlwifi-firmware-88w8964
|
|
$(call Package/mwlwifi-firmware-default,88W8964)
|
|
endef
|
|
|
|
define Package/mwlwifi-firmware-88w8964/install
|
|
$(call Package/mwlwifi-firmware/install,$(1),88W8964.bin)
|
|
endef
|
|
|
|
define Package/mwlwifi-firmware-88w8997
|
|
$(call Package/mwlwifi-firmware-default,88W8997)
|
|
endef
|
|
|
|
define Package/mwlwifi-firmware-88w8997/install
|
|
$(call Package/mwlwifi-firmware/install,$(1),88W8997.bin)
|
|
endef
|
|
|
|
$(eval $(call KernelPackage,mwlwifi))
|
|
$(eval $(call BuildPackage,mwlwifi-firmware-88w8864))
|
|
$(eval $(call BuildPackage,mwlwifi-firmware-88w8897))
|
|
$(eval $(call BuildPackage,mwlwifi-firmware-88w8964))
|
|
$(eval $(call BuildPackage,mwlwifi-firmware-88w8997))
|