Skip to content

Fix header includes #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RossComputerGuy wants to merge 7 commits into
base: fml13v03-6.6.18
Choose a base branch
from
Open

Fix header includes #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
389ebb6
drivers/memory/eswin: fix copying path
RossComputerGuy Nov 10, 2025
9ddd1d6
drivers/memory/eswin/es_proc: fix copying path
RossComputerGuy Nov 10, 2025
528a7f8
drivers/net/wireless/ap12275: fix bcmdhd root
RossComputerGuy Nov 10, 2025
58609a0
drivers/staging/media/eswin/es-media-ext: fix header paths
RossComputerGuy Nov 10, 2025
efd05f5
drivers/memory/eswin/es_dev_buf: fix copy
RossComputerGuy Nov 10, 2025
4a55035
sound/soc/codecs: fix es8328 and eswin es8388 conflicting
RossComputerGuy Nov 10, 2025
9d16308
drivers/media/platform/eswin/mipi-csi2: fix missing function
RossComputerGuy Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions drivers/media/platform/eswin/mipi-csi2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
#
# Makefile for Synopsys DWC Platform drivers
#
# ifeq ($(CONFIG_DWC_MIPI_TC_DPHY_GEN3),y)#
# dw-csi-objs += dw-csi-sysfs.o
# endif
ifeq ($(CONFIG_DWC_MIPI_TC_DPHY_GEN3),y)#
dw-csi-objs += dw-csi-sysfs.o
endif
obj-$(CONFIG_DWC_MIPI_CSI2_HOST) += dw-csi.o
dw-csi-objs := dw-csi-plat.o dw-mipi-csi.o

Expand Down
4 changes: 2 additions & 2 deletions drivers/memory/eswin/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ obj-$(CONFIG_ESWIN_IOMMU_RSV) += es_iommu_rsv/
obj-$(CONFIG_ESWIN_DMA_MEMCP) += es_dma_memcp/
obj-$(CONFIG_ESWIN_MALLOC_DMABUF) += es_malloc_dmabuf/

ES_MEM_HEADER := drivers/memory/eswin/
ES_MEM_HEADER := $(srctree)/drivers/memory/eswin/

COPY_HEADERS := $(shell cp $(ES_MEM_HEADER)/*.h include/linux)
COPY_HEADERS := $(shell cp $(ES_MEM_HEADER)/*.h $(srctree)/include/linux)
4 changes: 2 additions & 2 deletions drivers/memory/eswin/es_dev_buf/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
obj-$(CONFIG_ESWIN_DEV_DMA_BUF) += es_dev_buf.o

ES_DEV_DMA_BUF_HEADER := drivers/memory/eswin/es_dev_buf/include/linux
COPY_HEADERS:=$(shell cp $(ES_DEV_DMA_BUF_HEADER)/*.h include/linux)
ES_DEV_DMA_BUF_HEADER := $(srctree)/drivers/memory/eswin/es_dev_buf/include/linux
COPY_HEADERS:=$(shell cp $(ES_DEV_DMA_BUF_HEADER)/*.h $(srctree)/include/linux)

4 changes: 2 additions & 2 deletions drivers/memory/eswin/es_proc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
obj-$(CONFIG_ESWIN_PROC) += es_proc.o
ccflags-y := -DDEBUG

ES_PROC_HEADER := drivers/memory/eswin/es_proc/include/linux
ES_PROC_HEADER := $(srctree)/drivers/memory/eswin/es_proc/include/linux

COPY_HEADERS := $(shell cp $(ES_PROC_HEADER)/*.h include/linux)
COPY_HEADERS := $(shell cp $(ES_PROC_HEADER)/*.h $(srctree)/include/linux)
2 changes: 1 addition & 1 deletion drivers/net/wireless/ap12275/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ endif
endif

ARCH ?= riscv
BCMDHD_ROOT = $(src)
BCMDHD_ROOT = $(srctree)/drivers/net/wireless/ap12275
#$(warning "BCMDHD_ROOT=$(BCMDHD_ROOT)")
EXTRA_CFLAGS = $(DHDCFLAGS)
EXTRA_CFLAGS += -DDHD_COMPILED=\"$(BCMDHD_ROOT)\"
Expand Down
12 changes: 6 additions & 6 deletions drivers/staging/media/eswin/es-media-ext/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# SPDX-License-Identifier: GPL-2.0-only
ccflags-y := -I$(src)
ccflags-y += -I$(src)/common/
ccflags-y += -I$(src)/module/
ccflags-y += -I$(src)/chn/
ccflags-y += -I$(src)/proc/
ccflags-y += -I$(src)/include/
ccflags-y := -I$(srctree)/drivers/staging/media/eswin/es-media-ext
ccflags-y += -I$(srctree)/drivers/staging/media/eswin/es-media-ext/common/
ccflags-y += -I$(srctree)/drivers/staging/media/eswin/es-media-ext/module/
ccflags-y += -I$(srctree)/drivers/staging/media/eswin/es-media-ext/chn/
ccflags-y += -I$(srctree)/drivers/staging/media/eswin/es-media-ext/proc/
ccflags-y += -I$(srctree)/drivers/staging/media/eswin/es-media-ext/include/

es_media_ext_drv-objs := es_media_ext_drv_main.o \
./chn/dev_channel.o \
Expand Down
3 changes: 3 additions & 0 deletions sound/soc/codecs/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,15 +1060,18 @@ config SND_SOC_ES8326

config SND_SOC_ES8328
tristate
depends on !ESWIN_SND_ES8388_CODEC

config SND_SOC_ES8328_I2C
tristate "Everest Semi ES8328 CODEC (I2C)"
depends on I2C
depends on !ESWIN_SND_ES8388_CODEC
select SND_SOC_ES8328

config SND_SOC_ES8328_SPI
tristate "Everest Semi ES8328 CODEC (SPI)"
depends on SPI_MASTER
depends on !ESWIN_SND_ES8388_CODEC
select SND_SOC_ES8328

config SND_SOC_GTM601
Expand Down