diff --git a/package/kernel/rtl8188eu/Makefile b/package/kernel/rtl8188eu/Makefile index 06ba809318..35089caa54 100644 --- a/package/kernel/rtl8188eu/Makefile +++ b/package/kernel/rtl8188eu/Makefile @@ -29,6 +29,7 @@ define KernelPackage/rtl8188eu endef NOSTDINC_FLAGS:= \ + $(KERNEL_NOSTDINC_FLAGS) \ -I$(PKG_BUILD_DIR) \ -I$(PKG_BUILD_DIR)/include \ -I$(PKG_BUILD_DIR)/platform \ diff --git a/package/kernel/rtl8189es/Makefile b/package/kernel/rtl8189es/Makefile index 6fd3e1884a..80192c05fe 100644 --- a/package/kernel/rtl8189es/Makefile +++ b/package/kernel/rtl8189es/Makefile @@ -30,6 +30,7 @@ define KernelPackage/rtl8189es endef NOSTDINC_FLAGS:= \ + $(KERNEL_NOSTDINC_FLAGS) \ -I$(PKG_BUILD_DIR) \ -I$(PKG_BUILD_DIR)/include \ -I$(STAGING_DIR)/usr/include/mac80211-backport \ diff --git a/package/kernel/rtl8192eu/Makefile b/package/kernel/rtl8192eu/Makefile index e386ba1018..b9475d2c40 100644 --- a/package/kernel/rtl8192eu/Makefile +++ b/package/kernel/rtl8192eu/Makefile @@ -29,6 +29,7 @@ define KernelPackage/rtl8192eu endef NOSTDINC_FLAGS:= \ + $(KERNEL_NOSTDINC_FLAGS) \ -I$(PKG_BUILD_DIR) \ -I$(PKG_BUILD_DIR)/include \ -I$(STAGING_DIR)/usr/include/mac80211-backport \ diff --git a/package/kernel/rtl8812au-ac/Makefile b/package/kernel/rtl8812au-ac/Makefile index 07a15ec006..7a15e1a479 100644 --- a/package/kernel/rtl8812au-ac/Makefile +++ b/package/kernel/rtl8812au-ac/Makefile @@ -37,6 +37,7 @@ define KernelPackage/rtl8812au-ac endef NOSTDINC_FLAGS:= \ + $(KERNEL_NOSTDINC_FLAGS) \ -I$(PKG_BUILD_DIR) \ -I$(PKG_BUILD_DIR)/include \ -I$(STAGING_DIR)/usr/include/mac80211-backport \ diff --git a/package/kernel/rtl8821cu/Makefile b/package/kernel/rtl8821cu/Makefile index 68d5de36c5..ba986129e0 100644 --- a/package/kernel/rtl8821cu/Makefile +++ b/package/kernel/rtl8821cu/Makefile @@ -1,10 +1,6 @@ +# SDPX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2021 ImmortalWrt -# -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2021-2022 ImmortalWrt.org include $(TOPDIR)/rules.mk @@ -17,9 +13,8 @@ PKG_SOURCE_DATE:=2022-04-09 PKG_SOURCE_VERSION:=8c2226a74ae718439d56248bd2e44ccf717086d5 PKG_MIRROR_HASH:=3353a3bc4c73652eceaab95809aab27c3ae8bbf7e915b73488361a061ba91b84 -PKG_LICENSE:=GPL-2.0 +PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINTER:=CN_SZTL PKG_BUILD_PARALLEL:=1 @@ -37,7 +32,8 @@ define KernelPackage/rtl8821cu PROVIDES:=kmod-rtl8821cu endef -NOSTDINC_FLAGS = \ +NOSTDINC_FLAGS:= \ + $(KERNEL_NOSTDINC_FLAGS) \ -I$(PKG_BUILD_DIR) \ -I$(PKG_BUILD_DIR)/include \ -I$(STAGING_DIR)/usr/include/mac80211-backport \ @@ -47,15 +43,7 @@ NOSTDINC_FLAGS = \ -include backport/autoconf.h \ -include backport/backport.h -EXTRA_KCONFIG:= \ - CONFIG_RTL8821CU=m \ - USER_MODULE_NAME=rtl8821cu - -ifeq ($(ARCH),aarch64) - EXTRA_KCONFIG += CONFIG_MP_VHT_HW_TX_MODE=n -endif - -EXTRA_CFLAGS:= \ +NOSTDINC_FLAGS+= \ -DRTW_SINGLE_WIPHY \ -DRTW_USE_CFG80211_STA_EVENT \ -DCONFIG_IOCTL_CFG80211 \ @@ -63,19 +51,16 @@ EXTRA_CFLAGS:= \ -DBUILD_OPENWRT ifeq ($(BOARD),x86) - EXTRA_CFLAGS += -mhard-float + NOSTDINC_FLAGS+= -mhard-float endif -MAKE_OPTS:= \ - $(KERNEL_MAKE_FLAGS) \ - M="$(PKG_BUILD_DIR)" \ - NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ - USER_EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \ - $(EXTRA_KCONFIG) - define Build/Compile - +$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \ - $(MAKE_OPTS) \ + +$(KERNEL_MAKE) $(PKG_JOBS) \ + M="$(PKG_BUILD_DIR)" \ + NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ + CONFIG_RTL8821CU=m \ + $(if $(CONFIG_aarch64),CONFIG_MP_VHT_HW_TX_MODE=n) \ + USER_MODULE_NAME=rtl8821cu \ modules endef