linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Re: [PATCH] net: wireless: prefix header search paths with $(srctree)/
       [not found] <883460220.650537.1548861942189.ref@mail.yahoo.com>
@ 2019-01-30 15:25 ` Hin-Tak Leung
  0 siblings, 0 replies; 4+ messages in thread
From: Hin-Tak Leung @ 2019-01-30 15:25 UTC (permalink / raw)
  To: Kalle Valo, linux-wireless, Masahiro Yamada
  Cc: netdev, Larry Finger, linux-kernel

--------------------------------------------
On Fri, 25/1/19, Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
 
> Currently, the Kbuild core manipulates header
> search paths in a crazy
> way [1].
 
> To fix this mess, I want all Makefiles
> to add explicit $(srctree)/ to
> the search paths in the srctree. Some
> Makefiles are already written in
> that way, but not all. The goal of this
> work is to make the notation
> consistent, and finally get rid of the
> gross hacks.
 
> Having whitespaces after -I does not
> matter since commit 48f6e3cf5bc6
> ("kbuild: do not drop -I without
> parameter").
 
> I also removed one header search path
> in:
 
  
> drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile
 
> I was able to compile without it.
 
> [1]: https://patchwork.kernel.org/patch/9632347/
 
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Acked-by: Hin-Tak Leung <htl10@users.sourceforge.net>

Looks okay for the rtl818x parts.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] net: wireless: prefix header search paths with $(srctree)/
  2019-01-28  8:21 ` Kalle Valo
@ 2019-01-28  8:26   ` Luca Coelho
  0 siblings, 0 replies; 4+ messages in thread
From: Luca Coelho @ 2019-01-28  8:26 UTC (permalink / raw)
  To: Kalle Valo, Masahiro Yamada
  Cc: linux-wireless, brcm80211-dev-list.pdl, Franky Lin,
	Intel Linux Wireless, Johannes Berg, netdev, Emmanuel Grumbach,
	Chi-Hsien Lin, Hin-Tak Leung, Larry Finger,
	Herton Ronaldo Krzesinski, Hante Meuleman, Wright Feng,
	Arend van Spriel, brcm80211-dev-list, linux-kernel,
	David S. Miller

On Mon, 2019-01-28 at 10:21 +0200, Kalle Valo wrote:
> Masahiro Yamada <yamada.masahiro@socionext.com> writes:
> 
> > Currently, the Kbuild core manipulates header search paths in a
> > crazy
> > way [1].
> > 
> > To fix this mess, I want all Makefiles to add explicit $(srctree)/
> > to
> > the search paths in the srctree. Some Makefiles are already written
> > in
> > that way, but not all. The goal of this work is to make the
> > notation
> > consistent, and finally get rid of the gross hacks.
> > 
> > Having whitespaces after -I does not matter since commit
> > 48f6e3cf5bc6
> > ("kbuild: do not drop -I without parameter").
> > 
> > I also removed one header search path in:
> > 
> >   drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile
> > 
> > I was able to compile without it.
> > 
> > [1]: https://patchwork.kernel.org/patch/9632347/
> > 
> > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> > ---
> > 
> >  drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile | 4 ++--
> >  drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile | 6 +++-
> > --
> >  drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile | 4 +---
> >  drivers/net/wireless/intel/iwlwifi/dvm/Makefile           | 2 +-
> >  drivers/net/wireless/intel/iwlwifi/mvm/Makefile           | 2 +-
> >  drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile     | 2 +-
> >  drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile     | 2 +-
> >  7 files changed, 10 insertions(+), 12 deletions(-)
> 
> Luca, is it ok if I take this to wireless-drivers-next even though it
> touches iwlwifi makefiles?

Sure, it's much easier like that.

Acked-by: Luca Coelho <luciano.coelho@intel.com>

--
Cheers,
Luca.


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] net: wireless: prefix header search paths with $(srctree)/
  2019-01-25 15:18 Masahiro Yamada
@ 2019-01-28  8:21 ` Kalle Valo
  2019-01-28  8:26   ` Luca Coelho
  0 siblings, 1 reply; 4+ messages in thread
From: Kalle Valo @ 2019-01-28  8:21 UTC (permalink / raw)
  To: Masahiro Yamada
  Cc: linux-wireless, brcm80211-dev-list.pdl, Franky Lin,
	Intel Linux Wireless, Luca Coelho, Johannes Berg, netdev,
	Emmanuel Grumbach, Chi-Hsien Lin, Hin-Tak Leung, Larry Finger,
	Herton Ronaldo Krzesinski, Hante Meuleman, Wright Feng,
	Arend van Spriel, brcm80211-dev-list, linux-kernel,
	David S. Miller

Masahiro Yamada <yamada.masahiro@socionext.com> writes:

> Currently, the Kbuild core manipulates header search paths in a crazy
> way [1].
>
> To fix this mess, I want all Makefiles to add explicit $(srctree)/ to
> the search paths in the srctree. Some Makefiles are already written in
> that way, but not all. The goal of this work is to make the notation
> consistent, and finally get rid of the gross hacks.
>
> Having whitespaces after -I does not matter since commit 48f6e3cf5bc6
> ("kbuild: do not drop -I without parameter").
>
> I also removed one header search path in:
>
>   drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile
>
> I was able to compile without it.
>
> [1]: https://patchwork.kernel.org/patch/9632347/
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
>  drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile | 4 ++--
>  drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile | 6 +++---
>  drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile | 4 +---
>  drivers/net/wireless/intel/iwlwifi/dvm/Makefile           | 2 +-
>  drivers/net/wireless/intel/iwlwifi/mvm/Makefile           | 2 +-
>  drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile     | 2 +-
>  drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile     | 2 +-
>  7 files changed, 10 insertions(+), 12 deletions(-)

Luca, is it ok if I take this to wireless-drivers-next even though it
touches iwlwifi makefiles?

-- 
Kalle Valo

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] net: wireless: prefix header search paths with $(srctree)/
@ 2019-01-25 15:18 Masahiro Yamada
  2019-01-28  8:21 ` Kalle Valo
  0 siblings, 1 reply; 4+ messages in thread
From: Masahiro Yamada @ 2019-01-25 15:18 UTC (permalink / raw)
  To: Kalle Valo, linux-wireless
  Cc: Masahiro Yamada, brcm80211-dev-list.pdl, Franky Lin,
	Intel Linux Wireless, Luca Coelho, Johannes Berg, netdev,
	Emmanuel Grumbach, Chi-Hsien Lin, Hin-Tak Leung, Larry Finger,
	Herton Ronaldo Krzesinski, Hante Meuleman, Wright Feng,
	Arend van Spriel, brcm80211-dev-list, linux-kernel,
	David S. Miller

Currently, the Kbuild core manipulates header search paths in a crazy
way [1].

To fix this mess, I want all Makefiles to add explicit $(srctree)/ to
the search paths in the srctree. Some Makefiles are already written in
that way, but not all. The goal of this work is to make the notation
consistent, and finally get rid of the gross hacks.

Having whitespaces after -I does not matter since commit 48f6e3cf5bc6
("kbuild: do not drop -I without parameter").

I also removed one header search path in:

  drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile

I was able to compile without it.

[1]: https://patchwork.kernel.org/patch/9632347/

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile | 4 ++--
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile | 6 +++---
 drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile | 4 +---
 drivers/net/wireless/intel/iwlwifi/dvm/Makefile           | 2 +-
 drivers/net/wireless/intel/iwlwifi/mvm/Makefile           | 2 +-
 drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile     | 2 +-
 drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile     | 2 +-
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile
index 22fd95a..f7cf3e5 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile
@@ -16,8 +16,8 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ccflags-y += \
-	-Idrivers/net/wireless/broadcom/brcm80211/brcmfmac	\
-	-Idrivers/net/wireless/broadcom/brcm80211/include
+	-I $(srctree)/$(src) \
+	-I $(srctree)/$(src)/../include
 
 obj-$(CONFIG_BRCMFMAC) += brcmfmac.o
 brcmfmac-objs += \
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
index ed83f33..482d773 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile
@@ -16,9 +16,9 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ccflags-y := \
-	-Idrivers/net/wireless/broadcom/brcm80211/brcmsmac \
-	-Idrivers/net/wireless/broadcom/brcm80211/brcmsmac/phy \
-	-Idrivers/net/wireless/broadcom/brcm80211/include
+	-I $(srctree)/$(src) \
+	-I $(srctree)/$(src)/phy \
+	-I $(srctree)/$(src)/../include
 
 brcmsmac-y := \
 	mac80211_if.o \
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile b/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile
index 256c91f..bb02c62 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile
@@ -15,9 +15,7 @@
 # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-ccflags-y :=				\
-	-Idrivers/net/wireless/broadcom/brcm80211/brcmutil \
-	-Idrivers/net/wireless/broadcom/brcm80211/include
+ccflags-y := -I $(srctree)/$(src)/../include
 
 obj-$(CONFIG_BRCMUTIL)	+= brcmutil.o
 brcmutil-objs	= utils.o d11.o
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/Makefile b/drivers/net/wireless/intel/iwlwifi/dvm/Makefile
index 702d42b..0486b17 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/Makefile
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/Makefile
@@ -11,4 +11,4 @@ iwldvm-objs		+= rxon.o devices.o
 iwldvm-$(CONFIG_IWLWIFI_LEDS) += led.o
 iwldvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o
 
-ccflags-y += -I$(src)/../
+ccflags-y += -I $(srctree)/$(src)/../
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
index 9ffd219..7d1b318 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
@@ -10,4 +10,4 @@ iwlmvm-$(CONFIG_IWLWIFI_LEDS) += led.o
 iwlmvm-y += tof.o
 iwlmvm-$(CONFIG_PM) += d3.o
 
-ccflags-y += -I$(src)/../
+ccflags-y += -I $(srctree)/$(src)/../
diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile b/drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile
index 2966681..5d6b06d 100644
--- a/drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile
+++ b/drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile
@@ -2,4 +2,4 @@ rtl818x_pci-objs	:= dev.o rtl8225.o sa2400.o max2820.o grf5101.o rtl8225se.o
 
 obj-$(CONFIG_RTL8180)	+= rtl818x_pci.o
 
-ccflags-y += -Idrivers/net/wireless/realtek/rtl818x
+ccflags-y += -I $(srctree)/$(src)/..
diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile b/drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile
index ff07491..95bac73 100644
--- a/drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile
+++ b/drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile
@@ -2,4 +2,4 @@ rtl8187-objs		:= dev.o rtl8225.o leds.o rfkill.o
 
 obj-$(CONFIG_RTL8187)	+= rtl8187.o
 
-ccflags-y += -Idrivers/net/wireless/realtek/rtl818x
+ccflags-y += -I $(srctree)/$(src)/..
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-01-30 15:25 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <883460220.650537.1548861942189.ref@mail.yahoo.com>
2019-01-30 15:25 ` [PATCH] net: wireless: prefix header search paths with $(srctree)/ Hin-Tak Leung
2019-01-25 15:18 Masahiro Yamada
2019-01-28  8:21 ` Kalle Valo
2019-01-28  8:26   ` Luca Coelho

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).