From 5ae82701b258ec954c2c4d5234123ac39af8cebe Mon Sep 17 00:00:00 2001 From: Daniel Thompson Date: Fri, 25 Nov 2016 14:23:35 +0000 Subject: x20: Fix build when -I$(src) is not forcibly added to ccflags Currently the x20 build relies on the original source directory being added to the CLFAGS, however regular (non-android) kernel builds never do this. Rather than requiring a wrapper around the build system to force this it is better to fix the Makefiles for drivers where this is required (and to replace #include <> with #include "" for other drivers). Signed-off-by: Daniel Thompson --- drivers/cpufreq/Makefile | 1 + drivers/misc/mediatek/base/power/mt6797/Makefile | 1 + drivers/misc/mediatek/base/power/mt6797/mt_clkbuf_ctl.c | 2 +- .../misc/mediatek/base/power/ppm_v1/src/mach/mt6797/Makefile | 1 + drivers/misc/mediatek/cmdq/v2/mt6797/Makefile | 5 +++-- drivers/misc/mediatek/ext_disp/mt6797/Makefile | 3 ++- drivers/misc/mediatek/gpio/mt6797/6797_gpio.h | 2 +- drivers/misc/mediatek/gpio/mt6797/mt_gpio_affix.c | 2 +- drivers/misc/mediatek/gpio/mt6797/mt_gpio_base.c | 6 +++--- drivers/misc/mediatek/gpio/mt6797/mt_gpio_base_linux.c | 2 +- drivers/misc/mediatek/gpio/mt6797/mt_gpio_debug.c | 2 +- drivers/misc/mediatek/gpio/mt6797/mt_gpio_ext.c | 2 +- drivers/misc/mediatek/hdmi/mt8193/Makefile | 2 ++ drivers/misc/mediatek/m4u/mt6797/Makefile | 1 + drivers/misc/mediatek/mu3phy/Makefile | 5 +++-- drivers/misc/mediatek/power/mt6797/pmic.c | 10 +++++----- drivers/misc/mediatek/power/mt6797/pmic_irq.c | 4 ++-- drivers/misc/mediatek/uart/mt6797/Makefile | 1 + drivers/misc/mediatek/video/mt6797/dispsys/Makefile | 3 ++- drivers/misc/mediatek/video/mt6797/dispsys/ddp_pwm_mux.c | 4 ++-- drivers/misc/mediatek/video/mt6797/videox/Makefile | 3 ++- drivers/mmc/host/mediatek/mt6797/Makefile | 2 ++ drivers/pinctrl/mediatek/pinctrl-mtk-mt6797.h | 2 +- drivers/spi/mediatek/mt6797/mt_spi_hal.h | 2 +- drivers/spi/mediatek/mt6797/spi-dev.c | 2 +- drivers/spi/mediatek/mt6797/spi.c | 2 +- drivers/usb/gadget/Makefile | 1 + drivers/usb/host/xhci-mtk.c | 2 +- drivers/usb/host/xhci-plat.c | 2 +- drivers/watchdog/mediatek/wdt/mt6797/mtk_wdt.c | 2 +- 30 files changed, 47 insertions(+), 32 deletions(-) diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index e4c007d45c55..2d0e2d12d870 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -1,4 +1,5 @@ +ccflags-y += -I$(src) subdir-ccflags-y += -Werror # CPUfreq core diff --git a/drivers/misc/mediatek/base/power/mt6797/Makefile b/drivers/misc/mediatek/base/power/mt6797/Makefile index 0201e22d04b7..706347de643d 100644 --- a/drivers/misc/mediatek/base/power/mt6797/Makefile +++ b/drivers/misc/mediatek/base/power/mt6797/Makefile @@ -11,6 +11,7 @@ # GNU General Public License for more details. # +ccflags-y += -I$(src) ccflags-y += -I$(srctree)/drivers/misc/mediatek/irq/$(MTK_PLATFORM)/ ccflags-y += -I$(srctree)/drivers/misc/mediatek/dramc/$(MTK_PLATFORM)/ ccflags-y += -I$(srctree)/drivers/misc/mediatek/base/power/include/ diff --git a/drivers/misc/mediatek/base/power/mt6797/mt_clkbuf_ctl.c b/drivers/misc/mediatek/base/power/mt6797/mt_clkbuf_ctl.c index 48d1413ed33b..e68763a30b76 100644 --- a/drivers/misc/mediatek/base/power/mt6797/mt_clkbuf_ctl.c +++ b/drivers/misc/mediatek/base/power/mt6797/mt_clkbuf_ctl.c @@ -42,7 +42,7 @@ #include #include /* #include */ -#include +#include "mt_clkbuf_ctl.h" #include #define RF_BPI_GPIO_NUM 20 diff --git a/drivers/misc/mediatek/base/power/ppm_v1/src/mach/mt6797/Makefile b/drivers/misc/mediatek/base/power/ppm_v1/src/mach/mt6797/Makefile index 7d73f8c082e8..e344471e5e69 100644 --- a/drivers/misc/mediatek/base/power/ppm_v1/src/mach/mt6797/Makefile +++ b/drivers/misc/mediatek/base/power/ppm_v1/src/mach/mt6797/Makefile @@ -12,6 +12,7 @@ # ccflags-y += \ + -I$(src) \ -I$(PPM_ROOT_DIR)/inc \ -I$(srctree)/drivers/misc/mediatek/base/power/$(CONFIG_MTK_PLATFORM)/ diff --git a/drivers/misc/mediatek/cmdq/v2/mt6797/Makefile b/drivers/misc/mediatek/cmdq/v2/mt6797/Makefile index 3a1a48044d75..1d199a73a624 100644 --- a/drivers/misc/mediatek/cmdq/v2/mt6797/Makefile +++ b/drivers/misc/mediatek/cmdq/v2/mt6797/Makefile @@ -13,7 +13,8 @@ # drivers/cmdq -ccflags-y += -I$(srctree)/drivers/misc/mediatek/cmdq/v2 \ +ccflags-y += -I$(src) \ + -I$(srctree)/drivers/misc/mediatek/cmdq/v2 \ -I$(srctree)/drivers/misc/mediatek/m4u/$(MTK_PLATFORM) # Enable MET @@ -24,4 +25,4 @@ ifneq ($(CONFIG_MTK_CLKMGR),y) ccflags-y += -DCMDQ_USE_CCF endif -obj-y += cmdq_mdp.o \ No newline at end of file +obj-y += cmdq_mdp.o diff --git a/drivers/misc/mediatek/ext_disp/mt6797/Makefile b/drivers/misc/mediatek/ext_disp/mt6797/Makefile index f429710353a1..3225715827b4 100644 --- a/drivers/misc/mediatek/ext_disp/mt6797/Makefile +++ b/drivers/misc/mediatek/ext_disp/mt6797/Makefile @@ -15,7 +15,8 @@ # Makefile for external display driver. # -ccflags-y += -I$(srctree)/drivers/misc/mediatek/include/ \ +ccflags-y += -I$(src) \ + -I$(srctree)/drivers/misc/mediatek/include/ \ -I$(srctree)/drivers/misc/mediatek/ext_disp/ \ -I$(srctree)/drivers/misc/mediatek/ext_disp/common/test/ \ -I$(srctree)/drivers/misc/mediatek/gpu/ged/include \ diff --git a/drivers/misc/mediatek/gpio/mt6797/6797_gpio.h b/drivers/misc/mediatek/gpio/mt6797/6797_gpio.h index 2756e1dc8b01..fb8939b921da 100644 --- a/drivers/misc/mediatek/gpio/mt6797/6797_gpio.h +++ b/drivers/misc/mediatek/gpio/mt6797/6797_gpio.h @@ -13,7 +13,7 @@ #ifndef _6797_GPIO_H #define _6797_GPIO_H -#include +#include "mt_gpio_base.h" #include #include diff --git a/drivers/misc/mediatek/gpio/mt6797/mt_gpio_affix.c b/drivers/misc/mediatek/gpio/mt6797/mt_gpio_affix.c index 385ebf34b52f..d6d5f15d077b 100644 --- a/drivers/misc/mediatek/gpio/mt6797/mt_gpio_affix.c +++ b/drivers/misc/mediatek/gpio/mt6797/mt_gpio_affix.c @@ -16,7 +16,7 @@ #include #include #include -#include <6797_gpio.h> +#include "6797_gpio.h" void mt_gpio_pin_decrypt(unsigned long *cipher) diff --git a/drivers/misc/mediatek/gpio/mt6797/mt_gpio_base.c b/drivers/misc/mediatek/gpio/mt6797/mt_gpio_base.c index 05d3caed1665..a4e519508b6d 100644 --- a/drivers/misc/mediatek/gpio/mt6797/mt_gpio_base.c +++ b/drivers/misc/mediatek/gpio/mt6797/mt_gpio_base.c @@ -9,13 +9,13 @@ ******************************************************************************/ -#include <6797_gpio.h> +#include "6797_gpio.h" #include #include "mt-plat/sync_write.h" #include #include -#include -#include +#include "mt_gpio_base.h" +#include "gpio_cfg.h" #ifdef CONFIG_OF #include #endif diff --git a/drivers/misc/mediatek/gpio/mt6797/mt_gpio_base_linux.c b/drivers/misc/mediatek/gpio/mt6797/mt_gpio_base_linux.c index 87795726bcd2..bbc587ef19f3 100644 --- a/drivers/misc/mediatek/gpio/mt6797/mt_gpio_base_linux.c +++ b/drivers/misc/mediatek/gpio/mt6797/mt_gpio_base_linux.c @@ -18,7 +18,7 @@ #include #include -#include +#include "mt_gpio_base.h" #include #include #include diff --git a/drivers/misc/mediatek/gpio/mt6797/mt_gpio_debug.c b/drivers/misc/mediatek/gpio/mt6797/mt_gpio_debug.c index 293e91e16738..05a735029c4f 100644 --- a/drivers/misc/mediatek/gpio/mt6797/mt_gpio_debug.c +++ b/drivers/misc/mediatek/gpio/mt6797/mt_gpio_debug.c @@ -9,7 +9,7 @@ ******************************************************************************/ #include -#include <6797_gpio.h> +#include "6797_gpio.h" #include #include diff --git a/drivers/misc/mediatek/gpio/mt6797/mt_gpio_ext.c b/drivers/misc/mediatek/gpio/mt6797/mt_gpio_ext.c index a35c91ab091e..99245e110a8f 100644 --- a/drivers/misc/mediatek/gpio/mt6797/mt_gpio_ext.c +++ b/drivers/misc/mediatek/gpio/mt6797/mt_gpio_ext.c @@ -10,7 +10,7 @@ #include #include -#include +#include "mt_gpio_ext.h" /* #define MAX_GPIO_REG_BITS 16 */ /* #define MAX_GPIO_MODE_PER_REG 5 */ diff --git a/drivers/misc/mediatek/hdmi/mt8193/Makefile b/drivers/misc/mediatek/hdmi/mt8193/Makefile index 75c875df24f8..2918a7900c60 100644 --- a/drivers/misc/mediatek/hdmi/mt8193/Makefile +++ b/drivers/misc/mediatek/hdmi/mt8193/Makefile @@ -13,6 +13,8 @@ #include $(srctree)/drivers/misc/mediatek/Makefile.custom +ccflags-y += -I$(src) + ifeq ($(CONFIG_ARCH_MT6735M), y) ccflags-y += -I$(srctree)/drivers/misc/mediatek/ext_disp/mt6735m endif diff --git a/drivers/misc/mediatek/m4u/mt6797/Makefile b/drivers/misc/mediatek/m4u/mt6797/Makefile index 22a57ca264b1..13f0df29dbe1 100644 --- a/drivers/misc/mediatek/m4u/mt6797/Makefile +++ b/drivers/misc/mediatek/m4u/mt6797/Makefile @@ -11,6 +11,7 @@ # GNU General Public License for more details. # +ccflags-y += -I$(src) ccflags-y += -I$(srctree)/drivers/staging/android/ion ccflags-y += -I$(srctree)/drivers/misc/mediatek/gud/$(MTK_PLATFORM)/gud/MobiCoreKernelApi/public ccflags-y += -I$(srctree)/drivers/misc/mediatek/gud/$(MTK_PLATFORM)/gud/MobiCoreKernelApi/include diff --git a/drivers/misc/mediatek/mu3phy/Makefile b/drivers/misc/mediatek/mu3phy/Makefile index 28db8963fd3a..9ba9b85303c2 100644 --- a/drivers/misc/mediatek/mu3phy/Makefile +++ b/drivers/misc/mediatek/mu3phy/Makefile @@ -11,7 +11,8 @@ # GNU General Public License for more details. # -ccflags-y += -I$(srctree)/drivers/misc/mediatek/mu3d/drv \ +ccflags-y += -I$(src) \ + -I$(srctree)/drivers/misc/mediatek/mu3d/drv \ -I$(srctree)/drivers/misc/mediatek/mu3d/hal \ -I$(srctree)/drivers/misc/mediatek/mu3phy/$(CONFIG_MTK_PLATFORM) @@ -28,4 +29,4 @@ mu3phy-$(CONFIG_D60802_SUPPORT) += mtk-phy-d60802.o mu3phy-$(CONFIG_E60802_SUPPORT) += mtk-phy-e60802.o mu3phy-$(CONFIG_A60810_SUPPORT) += mtk-phy-a60810.o mu3phy-$(CONFIG_DEBUG_FS) += usb20_phy_debugfs.o -obj-$(CONFIG_MU3_PHY) += $(subst ",,$(CONFIG_MTK_PLATFORM))/ \ No newline at end of file +obj-$(CONFIG_MU3_PHY) += $(subst ",,$(CONFIG_MTK_PLATFORM))/ diff --git a/drivers/misc/mediatek/power/mt6797/pmic.c b/drivers/misc/mediatek/power/mt6797/pmic.c index 31d7ecbad97d..bbef28e2ac4c 100755 --- a/drivers/misc/mediatek/power/mt6797/pmic.c +++ b/drivers/misc/mediatek/power/mt6797/pmic.c @@ -75,8 +75,8 @@ #include #endif #include -#include -#include +#include "pmic.h" +#include "pmic_irq.h" /*#include TBD*/ #include #if defined CONFIG_MTK_LEGACY @@ -107,13 +107,13 @@ #include #if defined(EXTERNAL_BUCK_FAN49101) -#include +#include "fan49101.h" #endif #if defined(EXTERNAL_BUCK_FAN53555) -#include +#include "fan53555.h" #endif #if defined(EXTERNAL_BUCK_DA9214) -#include +#include "da9214.h" #endif /***************************************************************************** diff --git a/drivers/misc/mediatek/power/mt6797/pmic_irq.c b/drivers/misc/mediatek/power/mt6797/pmic_irq.c index d242b20bddf0..103d6df3f2b8 100644 --- a/drivers/misc/mediatek/power/mt6797/pmic_irq.c +++ b/drivers/misc/mediatek/power/mt6797/pmic_irq.c @@ -56,7 +56,7 @@ #include #include -#include +#include "pmic.h" /*#include TBD*/ #include #include @@ -74,7 +74,7 @@ #include #include #endif -#include +#include "mt6311.h" #include #include diff --git a/drivers/misc/mediatek/uart/mt6797/Makefile b/drivers/misc/mediatek/uart/mt6797/Makefile index b27456b25763..d09ad2a086ac 100644 --- a/drivers/misc/mediatek/uart/mt6797/Makefile +++ b/drivers/misc/mediatek/uart/mt6797/Makefile @@ -14,6 +14,7 @@ #ccflags-y += -DCONFIG_MTK_FPGA #ccflags-y += -DFIX_TO_26M +ccflags-y += -I$(src) ccflags-y += -I$(srctree)/drivers/misc/mediatek/uart ccflags-y += -I$(srctree)/drivers/misc/mediatek/base/power/$(CONFIG_MTK_PLATFORM) diff --git a/drivers/misc/mediatek/video/mt6797/dispsys/Makefile b/drivers/misc/mediatek/video/mt6797/dispsys/Makefile index 2fd9c63c755b..d9b69fa5fcc8 100644 --- a/drivers/misc/mediatek/video/mt6797/dispsys/Makefile +++ b/drivers/misc/mediatek/video/mt6797/dispsys/Makefile @@ -13,7 +13,8 @@ # drivers/dispsys -ccflags-y += -I$(srctree)/drivers/misc/mediatek/video/include/ \ +ccflags-y += -I$(src) \ + -I$(srctree)/drivers/misc/mediatek/video/include/ \ -I$(srctree)/drivers/misc/mediatek/video/common/ \ -I$(srctree)/drivers/misc/mediatek/video/common/rdma10/ \ -I$(srctree)/drivers/misc/mediatek/video/common/wdma10/ \ diff --git a/drivers/misc/mediatek/video/mt6797/dispsys/ddp_pwm_mux.c b/drivers/misc/mediatek/video/mt6797/dispsys/ddp_pwm_mux.c index e8bf08e17bf8..878da01946e2 100644 --- a/drivers/misc/mediatek/video/mt6797/dispsys/ddp_pwm_mux.c +++ b/drivers/misc/mediatek/video/mt6797/dispsys/ddp_pwm_mux.c @@ -2,11 +2,11 @@ #include #include #include -#include +#include "ddp_clkmgr.h" #include #include #include -#include +#include "ddp_reg.h" #define PWM_MSG(fmt, arg...) pr_debug("[PWM] " fmt "\n", ##arg) #define PWM_ERR(fmt, arg...) pr_err("[PWM] " fmt "\n", ##arg) diff --git a/drivers/misc/mediatek/video/mt6797/videox/Makefile b/drivers/misc/mediatek/video/mt6797/videox/Makefile index 5260b429ef5f..5f73ae016d5f 100644 --- a/drivers/misc/mediatek/video/mt6797/videox/Makefile +++ b/drivers/misc/mediatek/video/mt6797/videox/Makefile @@ -38,7 +38,8 @@ obj-$(CONFIG_MTK_FB) += mtkfb_console.o \ #obj-y += mtkfb_dummy.o #endif -ccflags-y += -I$(srctree)/drivers/misc/mediatek/video/include/ \ +ccflags-y += -I$(src) \ + -I$(srctree)/drivers/misc/mediatek/video/include/ \ -I$(srctree)/drivers/misc/mediatek/video/common/ \ -I$(srctree)/drivers/misc/mediatek/video/common/rdma10/ \ -I$(srctree)/drivers/misc/mediatek/video/common/wdma10/ \ diff --git a/drivers/mmc/host/mediatek/mt6797/Makefile b/drivers/mmc/host/mediatek/mt6797/Makefile index 9a18e18b46be..f01a8c39fda3 100644 --- a/drivers/mmc/host/mediatek/mt6797/Makefile +++ b/drivers/mmc/host/mediatek/mt6797/Makefile @@ -11,6 +11,8 @@ # GNU General Public License for more details. # +ccflags-y += -I$(src) + #add kernel source code path as head file search path MTK_PLATFORM := $(subst ",,$(CONFIG_MTK_PLATFORM)) ccflags-y += -I$(srctree)/drivers/misc/mediatek/include diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-mt6797.h b/drivers/pinctrl/mediatek/pinctrl-mtk-mt6797.h index e7fdf129c322..1afb4a40e070 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-mt6797.h +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-mt6797.h @@ -8,7 +8,7 @@ #define __PINCTRL_MTK_MT6797_H #include -#include +#include "pinctrl-mtk-common.h" static const struct mtk_desc_pin mtk_pins_mt6797[] = { MTK_PIN( diff --git a/drivers/spi/mediatek/mt6797/mt_spi_hal.h b/drivers/spi/mediatek/mt6797/mt_spi_hal.h index cf2bbac31f57..739821dfaf88 100644 --- a/drivers/spi/mediatek/mt6797/mt_spi_hal.h +++ b/drivers/spi/mediatek/mt6797/mt_spi_hal.h @@ -17,7 +17,7 @@ #include #endif /* !defined(CONFIG_MTK_CLKMGR) */ #include -#include +#include "mt_spi.h" /******************************************************************************* * define macro for spi register ********************************************************************************/ diff --git a/drivers/spi/mediatek/mt6797/spi-dev.c b/drivers/spi/mediatek/mt6797/spi-dev.c index f70cf786afe6..b482adfacbdd 100644 --- a/drivers/spi/mediatek/mt6797/spi-dev.c +++ b/drivers/spi/mediatek/mt6797/spi-dev.c @@ -33,7 +33,7 @@ #include #include #include "mt_spi_hal.h" -#include +#include "mt_spi.h" #ifdef CONFIG_TRUSTONIC_TEE_SUPPORT #define SPI_TRUSTONIC_TEE_SUPPORT #endif diff --git a/drivers/spi/mediatek/mt6797/spi.c b/drivers/spi/mediatek/mt6797/spi.c index 11ee8fd3421a..03886dd001f1 100644 --- a/drivers/spi/mediatek/mt6797/spi.c +++ b/drivers/spi/mediatek/mt6797/spi.c @@ -39,7 +39,7 @@ #include #endif /*#include */ -#include +#include "mt_spi.h" #include "mt_spi_hal.h" /*#include */ #include /* DMA */ diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 48139df165a6..9a47b745607f 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -8,6 +8,7 @@ subdir-ccflags-y += -I$(srctree)/drivers/misc/mediatek/include subdir-ccflags-y += -I$(srctree)/drivers/misc/mediatek/include/mt-plat/$(MTK_PLATFORM)/include subdir-ccflags-y += -I$(srctree)/drivers/misc/mediatek/include/mt-plat +ccflags-y += -I$(src) ccflags-y += -I$(srctree)/drivers/usb/gadget/udc -I$(srctree)/drivers/usb/gadget/function ccflags-y += -I$(srctree)/drivers/misc/mediatek/c2k_ccci/ diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c index 2902fed32e1c..f1f60ee0a5f1 100644 --- a/drivers/usb/host/xhci-mtk.c +++ b/drivers/usb/host/xhci-mtk.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include "xhci-mtk.h" static struct sch_ep **ss_out_eps[MAX_EP_NUM]; static struct sch_ep **ss_in_eps[MAX_EP_NUM]; diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 15197fb2c085..3b14f510c2a7 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -22,7 +22,7 @@ #include "xhci.h" #ifdef CONFIG_USB_XHCI_MTK -#include +#include "xhci-mtk.h" #endif #include "xhci-mvebu.h" diff --git a/drivers/watchdog/mediatek/wdt/mt6797/mtk_wdt.c b/drivers/watchdog/mediatek/wdt/mt6797/mtk_wdt.c index 70c47e199f4f..d6a7cd562cc9 100644 --- a/drivers/watchdog/mediatek/wdt/mt6797/mtk_wdt.c +++ b/drivers/watchdog/mediatek/wdt/mt6797/mtk_wdt.c @@ -24,7 +24,7 @@ #include #include -#include +#include "mt_wdt.h" #include #include -- cgit v1.2.3