--- zzzz-none-000/linux-4.19.183/Makefile 2021-03-24 10:07:39.000000000 +0000 +++ bcm63-7530ax-756/linux-4.19.183/Makefile 2023-06-28 08:54:18.000000000 +0000 @@ -417,12 +417,31 @@ AFLAGS_KERNEL = LDFLAGS_vmlinux = +bcm-header-dirs = $(srctree)/$(REL_INC_BRCMSHARED_PUB_PATH)/$(BRCM_BOARD) \ + $(srctree)/$(REL_INC_BRCMSHARED_PUB_PATH)/pmc \ + $(srctree)/$(REL_INC_BRCMSHARED_PUB_PATH)/drv/phys \ + $(srctree)/$(REL_INC_BRCMSHARED_PRIV_PATH)/$(BRCM_BOARD) \ + $(srctree)/$(REL_INC_BRCMDRIVER_PRIV_PATH)/$(BRCM_BOARD) \ + $(srctree)/$(REL_INC_BRCMDRIVER_PUB_PATH)/$(BRCM_BOARD) \ + $(srctree)/$(REL_INC_BRCMDRIVER_PUB_PATH)/$(BRCM_BOARD)/pmc \ + $(srctree)/$(REL_BRCMDRIVERS_DIR)/opensource/phy \ + $(srctree)/$(REL_BRCMDRIVERS_DIR)/broadcom/char/wlcsm_ext/impl1/include \ + $(srctree)/$(REL_BRCMDRIVERS_DIR)/opensource/misc/pmc/impl1 \ + $(srctree)/$(REL_BRCMDRIVERS_DIR)/opensource/misc/pmc/impl1/63178 \ + $(srctree)/$(REL_BRCMDRIVERS_DIR)/opensource/net/enet/shared \ + $(srctree)/bcmkernel/include \ + $(srctree)/bcmkernel/include/uapi \ + +USERINCLUDE_BRCM_SDK = $(addprefix -I,$(bcm-header-dirs)) + # Use USERINCLUDE when you must reference the UAPI directories only. USERINCLUDE := \ -I$(srctree)/arch/$(SRCARCH)/include/uapi \ -I$(objtree)/arch/$(SRCARCH)/include/generated/uapi \ -I$(srctree)/include/uapi \ -I$(objtree)/include/generated/uapi \ + $(USERINCLUDE_AVM_SUBPROJECTS) \ + $(USERINCLUDE_BRCM_SDK) \ -include $(srctree)/include/linux/kconfig.h # Use LINUXINCLUDE when you must reference the include/ directory. @@ -432,6 +451,7 @@ -I$(objtree)/arch/$(SRCARCH)/include/generated \ $(if $(KBUILD_SRC), -I$(srctree)/include) \ -I$(objtree)/include \ + $(LINUXINCLUDE_AVM_SUBPROJECTS) \ $(USERINCLUDE) KBUILD_AFLAGS := -D__ASSEMBLY__ @@ -439,6 +459,7 @@ -fno-strict-aliasing -fno-common -fshort-wchar \ -Werror-implicit-function-declaration \ -Werror=return-type -Wno-format-security \ + -Wno-unused-parameter \ -std=gnu89 KBUILD_CPPFLAGS := -D__KERNEL__ KBUILD_AFLAGS_KERNEL := @@ -1006,6 +1027,9 @@ export KBUILD_VMLINUX_INIT := $(head-y) $(init-y) export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y2) $(drivers-y) $(net-y) $(virt-y) export KBUILD_VMLINUX_LIBS := $(libs-y1) +ifdef BCM_KF # defined(CONFIG_BCM_KF_MISC_MAKEFILE) +include $(srctree)/bcmkernel/Makefile.brcm_pre +endif export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds export LDFLAGS_vmlinux # used by scripts/package/Makefile @@ -1205,6 +1229,11 @@ $(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include $(Q)$(MAKE) $(hdr-inst)=arch/$(SRCARCH)/include/uapi $(hdr-dst) + $(Q)$(foreach dir,\ + $(bcm-header-dirs), \ + $(MAKE) $(hdr-inst)=$(dir:$(srctree)/%=%) dst=include no-skip=y; \ + ) + PHONY += headers_check_all headers_check_all: headers_install_all $(Q)$(CONFIG_SHELL) $(srctree)/scripts/headers.sh check @@ -1257,7 +1286,11 @@ PHONY += modules modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin +ifdef BCM_KF # defined(CONFIG_BCM_KF_MISC_MAKEFILE) + $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=%/modules.order) > $(objtree)/modules.order +else $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order +endif @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost @@ -1513,6 +1546,10 @@ else # KBUILD_EXTMOD +ifdef BCM_KF # defined(CONFIG_BCM_KF_MISC_MAKEFILE) +include $(srctree)/bcmkernel/Makefile.brcm_pre +endif + ### # External module support. # When building external modules the kernel used as basis is considered @@ -1752,6 +1789,8 @@ include $(cmd_files) endif +-include $(srctree)/avm/make/generated/linux.make + endif # skip-makefile PHONY += FORCE