* [PATCH net-next v2 1/1] net: intel: Use *-y instead of *-objs in Makefile
@ 2024-05-08 18:00 Andy Shevchenko
2024-05-08 18:23 ` Jacob Keller
2024-05-14 15:00 ` [Intel-wired-lan] " Pucha, HimasekharX Reddy
0 siblings, 2 replies; 4+ messages in thread
From: Andy Shevchenko @ 2024-05-08 18:00 UTC (permalink / raw)
To: Andy Shevchenko, intel-wired-lan, netdev, linux-kernel, bpf
Cc: Jesse Brandeburg, Tony Nguyen, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Alexander Lobakin, Richard Cochran,
Alexei Starovoitov, Daniel Borkmann, Jesper Dangaard Brouer,
John Fastabend, Aleksandr Loktionov
*-objs suffix is reserved rather for (user-space) host programs while
usually *-y suffix is used for kernel drivers (although *-objs works
for that purpose for now).
Let's correct the old usages of *-objs in Makefiles.
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: added tags (Olek, Aleksandr), fixed misplaced line in one case (LKP)
drivers/net/ethernet/intel/e1000/Makefile | 2 +-
drivers/net/ethernet/intel/e1000e/Makefile | 7 +++----
drivers/net/ethernet/intel/i40e/Makefile | 2 +-
drivers/net/ethernet/intel/iavf/Makefile | 5 ++---
drivers/net/ethernet/intel/igb/Makefile | 6 +++---
drivers/net/ethernet/intel/igbvf/Makefile | 6 +-----
drivers/net/ethernet/intel/igc/Makefile | 6 +++---
drivers/net/ethernet/intel/ixgbe/Makefile | 8 ++++----
drivers/net/ethernet/intel/ixgbevf/Makefile | 6 +-----
drivers/net/ethernet/intel/libeth/Makefile | 2 +-
drivers/net/ethernet/intel/libie/Makefile | 2 +-
11 files changed, 21 insertions(+), 31 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000/Makefile b/drivers/net/ethernet/intel/e1000/Makefile
index 314c52d44b7c..79491dec47e1 100644
--- a/drivers/net/ethernet/intel/e1000/Makefile
+++ b/drivers/net/ethernet/intel/e1000/Makefile
@@ -7,4 +7,4 @@
obj-$(CONFIG_E1000) += e1000.o
-e1000-objs := e1000_main.o e1000_hw.o e1000_ethtool.o e1000_param.o
+e1000-y := e1000_main.o e1000_hw.o e1000_ethtool.o e1000_param.o
diff --git a/drivers/net/ethernet/intel/e1000e/Makefile b/drivers/net/ethernet/intel/e1000e/Makefile
index 0baa15503c38..18f22b6374d5 100644
--- a/drivers/net/ethernet/intel/e1000e/Makefile
+++ b/drivers/net/ethernet/intel/e1000e/Makefile
@@ -10,7 +10,6 @@ subdir-ccflags-y += -I$(src)
obj-$(CONFIG_E1000E) += e1000e.o
-e1000e-objs := 82571.o ich8lan.o 80003es2lan.o \
- mac.o manage.o nvm.o phy.o \
- param.o ethtool.o netdev.o ptp.o
-
+e1000e-y := 82571.o ich8lan.o 80003es2lan.o \
+ mac.o manage.o nvm.o phy.o \
+ param.o ethtool.o netdev.o ptp.o
diff --git a/drivers/net/ethernet/intel/i40e/Makefile b/drivers/net/ethernet/intel/i40e/Makefile
index cad93f323bd5..9faa4339a76c 100644
--- a/drivers/net/ethernet/intel/i40e/Makefile
+++ b/drivers/net/ethernet/intel/i40e/Makefile
@@ -10,7 +10,7 @@ subdir-ccflags-y += -I$(src)
obj-$(CONFIG_I40E) += i40e.o
-i40e-objs := i40e_main.o \
+i40e-y := i40e_main.o \
i40e_ethtool.o \
i40e_adminq.o \
i40e_common.o \
diff --git a/drivers/net/ethernet/intel/iavf/Makefile b/drivers/net/ethernet/intel/iavf/Makefile
index 2d154a4e2fd7..356ac9faa5bf 100644
--- a/drivers/net/ethernet/intel/iavf/Makefile
+++ b/drivers/net/ethernet/intel/iavf/Makefile
@@ -11,6 +11,5 @@ subdir-ccflags-y += -I$(src)
obj-$(CONFIG_IAVF) += iavf.o
-iavf-objs := iavf_main.o iavf_ethtool.o iavf_virtchnl.o iavf_fdir.o \
- iavf_adv_rss.o \
- iavf_txrx.o iavf_common.o iavf_adminq.o
+iavf-y := iavf_main.o iavf_ethtool.o iavf_virtchnl.o iavf_fdir.o \
+ iavf_adv_rss.o iavf_txrx.o iavf_common.o iavf_adminq.o
diff --git a/drivers/net/ethernet/intel/igb/Makefile b/drivers/net/ethernet/intel/igb/Makefile
index 394c1e0656b9..463c0d26b9d4 100644
--- a/drivers/net/ethernet/intel/igb/Makefile
+++ b/drivers/net/ethernet/intel/igb/Makefile
@@ -6,6 +6,6 @@
obj-$(CONFIG_IGB) += igb.o
-igb-objs := igb_main.o igb_ethtool.o e1000_82575.o \
- e1000_mac.o e1000_nvm.o e1000_phy.o e1000_mbx.o \
- e1000_i210.o igb_ptp.o igb_hwmon.o
+igb-y := igb_main.o igb_ethtool.o e1000_82575.o \
+ e1000_mac.o e1000_nvm.o e1000_phy.o e1000_mbx.o \
+ e1000_i210.o igb_ptp.o igb_hwmon.o
diff --git a/drivers/net/ethernet/intel/igbvf/Makefile b/drivers/net/ethernet/intel/igbvf/Makefile
index afd3e36eae75..902711d5e691 100644
--- a/drivers/net/ethernet/intel/igbvf/Makefile
+++ b/drivers/net/ethernet/intel/igbvf/Makefile
@@ -6,8 +6,4 @@
obj-$(CONFIG_IGBVF) += igbvf.o
-igbvf-objs := vf.o \
- mbx.o \
- ethtool.o \
- netdev.o
-
+igbvf-y := vf.o mbx.o ethtool.o netdev.o
diff --git a/drivers/net/ethernet/intel/igc/Makefile b/drivers/net/ethernet/intel/igc/Makefile
index ebffd3054285..efc5e7983dad 100644
--- a/drivers/net/ethernet/intel/igc/Makefile
+++ b/drivers/net/ethernet/intel/igc/Makefile
@@ -6,7 +6,7 @@
#
obj-$(CONFIG_IGC) += igc.o
-igc-$(CONFIG_IGC_LEDS) += igc_leds.o
-igc-objs := igc_main.o igc_mac.o igc_i225.o igc_base.o igc_nvm.o igc_phy.o \
-igc_diag.o igc_ethtool.o igc_ptp.o igc_dump.o igc_tsn.o igc_xdp.o
+igc-y := igc_main.o igc_mac.o igc_i225.o igc_base.o igc_nvm.o igc_phy.o \
+ igc_diag.o igc_ethtool.o igc_ptp.o igc_dump.o igc_tsn.o igc_xdp.o
+igc-$(CONFIG_IGC_LEDS) += igc_leds.o
diff --git a/drivers/net/ethernet/intel/ixgbe/Makefile b/drivers/net/ethernet/intel/ixgbe/Makefile
index 4fb0d9e3f2da..965e5ce1b326 100644
--- a/drivers/net/ethernet/intel/ixgbe/Makefile
+++ b/drivers/net/ethernet/intel/ixgbe/Makefile
@@ -6,10 +6,10 @@
obj-$(CONFIG_IXGBE) += ixgbe.o
-ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
- ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \
- ixgbe_mbx.o ixgbe_x540.o ixgbe_x550.o ixgbe_lib.o ixgbe_ptp.o \
- ixgbe_xsk.o
+ixgbe-y := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \
+ ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \
+ ixgbe_mbx.o ixgbe_x540.o ixgbe_x550.o ixgbe_lib.o ixgbe_ptp.o \
+ ixgbe_xsk.o
ixgbe-$(CONFIG_IXGBE_DCB) += ixgbe_dcb.o ixgbe_dcb_82598.o \
ixgbe_dcb_82599.o ixgbe_dcb_nl.o
diff --git a/drivers/net/ethernet/intel/ixgbevf/Makefile b/drivers/net/ethernet/intel/ixgbevf/Makefile
index 186a4bb24fde..01d3e892f3fa 100644
--- a/drivers/net/ethernet/intel/ixgbevf/Makefile
+++ b/drivers/net/ethernet/intel/ixgbevf/Makefile
@@ -6,9 +6,5 @@
obj-$(CONFIG_IXGBEVF) += ixgbevf.o
-ixgbevf-objs := vf.o \
- mbx.o \
- ethtool.o \
- ixgbevf_main.o
+ixgbevf-y := vf.o mbx.o ethtool.o ixgbevf_main.o
ixgbevf-$(CONFIG_IXGBEVF_IPSEC) += ipsec.o
-
diff --git a/drivers/net/ethernet/intel/libeth/Makefile b/drivers/net/ethernet/intel/libeth/Makefile
index cb99203d1dd2..52492b081132 100644
--- a/drivers/net/ethernet/intel/libeth/Makefile
+++ b/drivers/net/ethernet/intel/libeth/Makefile
@@ -3,4 +3,4 @@
obj-$(CONFIG_LIBETH) += libeth.o
-libeth-objs += rx.o
+libeth-y := rx.o
diff --git a/drivers/net/ethernet/intel/libie/Makefile b/drivers/net/ethernet/intel/libie/Makefile
index bf42c5aeeedd..ffd27fab916a 100644
--- a/drivers/net/ethernet/intel/libie/Makefile
+++ b/drivers/net/ethernet/intel/libie/Makefile
@@ -3,4 +3,4 @@
obj-$(CONFIG_LIBIE) += libie.o
-libie-objs += rx.o
+libie-y := rx.o
--
2.43.0.rc1.1336.g36b5255a03ac
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net-next v2 1/1] net: intel: Use *-y instead of *-objs in Makefile
2024-05-08 18:00 [PATCH net-next v2 1/1] net: intel: Use *-y instead of *-objs in Makefile Andy Shevchenko
@ 2024-05-08 18:23 ` Jacob Keller
2024-05-08 18:27 ` Andy Shevchenko
2024-05-14 15:00 ` [Intel-wired-lan] " Pucha, HimasekharX Reddy
1 sibling, 1 reply; 4+ messages in thread
From: Jacob Keller @ 2024-05-08 18:23 UTC (permalink / raw)
To: Andy Shevchenko, intel-wired-lan, netdev, linux-kernel, bpf
Cc: Jesse Brandeburg, Tony Nguyen, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Alexander Lobakin, Richard Cochran,
Alexei Starovoitov, Daniel Borkmann, Jesper Dangaard Brouer,
John Fastabend, Aleksandr Loktionov
On 5/8/2024 11:00 AM, Andy Shevchenko wrote:
> *-objs suffix is reserved rather for (user-space) host programs while
> usually *-y suffix is used for kernel drivers (although *-objs works
> for that purpose for now).
>
> Let's correct the old usages of *-objs in Makefiles.
>
> Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
> Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
FWIW I applied v1 and v2, and got only the following range-diff:
> $ git range-diff net-next/main use-module-y-v1 use-module-y-v2
> 1: 0e5c43eb8e36 ! 1: 2cf60c46b7a8 net: intel: Use *-y instead of *-objs in Makefile
> @@ Commit message
>
> Let's correct the old usages of *-objs in Makefiles.
>
> - Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> - Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>
> Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
> - Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
> + Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>
> + Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> ## drivers/net/ethernet/intel/e1000/Makefile ##
> @@
> @@ drivers/net/ethernet/intel/igbvf/Makefile
>
> ## drivers/net/ethernet/intel/igc/Makefile ##
> @@
> + #
> +
> obj-$(CONFIG_IGC) += igc.o
> - igc-$(CONFIG_IGC_LEDS) += igc_leds.o
> +-igc-$(CONFIG_IGC_LEDS) += igc_leds.o
>
> -igc-objs := igc_main.o igc_mac.o igc_i225.o igc_base.o igc_nvm.o igc_phy.o \
> -igc_diag.o igc_ethtool.o igc_ptp.o igc_dump.o igc_tsn.o igc_xdp.o
> +igc-y := igc_main.o igc_mac.o igc_i225.o igc_base.o igc_nvm.o igc_phy.o \
> + igc_diag.o igc_ethtool.o igc_ptp.o igc_dump.o igc_tsn.o igc_xdp.o
> ++igc-$(CONFIG_IGC_LEDS) += igc_leds.o
>
> ## drivers/net/ethernet/intel/ixgbe/Makefile ##
> @@
>
This matches the changes described w.r.t ordering, and everything built
properly when I tested it on my test kernel tree.
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next v2 1/1] net: intel: Use *-y instead of *-objs in Makefile
2024-05-08 18:23 ` Jacob Keller
@ 2024-05-08 18:27 ` Andy Shevchenko
0 siblings, 0 replies; 4+ messages in thread
From: Andy Shevchenko @ 2024-05-08 18:27 UTC (permalink / raw)
To: Jacob Keller
Cc: intel-wired-lan, netdev, linux-kernel, bpf, Jesse Brandeburg,
Tony Nguyen, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Alexander Lobakin, Richard Cochran,
Alexei Starovoitov, Daniel Borkmann, Jesper Dangaard Brouer,
John Fastabend, Aleksandr Loktionov
On Wed, May 08, 2024 at 11:23:39AM -0700, Jacob Keller wrote:
> On 5/8/2024 11:00 AM, Andy Shevchenko wrote:
...
> FWIW I applied v1 and v2, and got only the following range-diff:
> This matches the changes described w.r.t ordering, and everything built
> properly when I tested it on my test kernel tree.
>
> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Thank you!
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [Intel-wired-lan] [PATCH net-next v2 1/1] net: intel: Use *-y instead of *-objs in Makefile
2024-05-08 18:00 [PATCH net-next v2 1/1] net: intel: Use *-y instead of *-objs in Makefile Andy Shevchenko
2024-05-08 18:23 ` Jacob Keller
@ 2024-05-14 15:00 ` Pucha, HimasekharX Reddy
1 sibling, 0 replies; 4+ messages in thread
From: Pucha, HimasekharX Reddy @ 2024-05-14 15:00 UTC (permalink / raw)
To: Andy Shevchenko, intel-wired-lan@lists.osuosl.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
bpf@vger.kernel.org
Cc: Jesper Dangaard Brouer, Daniel Borkmann, Richard Cochran,
John Fastabend, Alexei Starovoitov, Loktionov, Aleksandr,
Lobakin, Aleksander, Eric Dumazet, Nguyen, Anthony L,
Jakub Kicinski, Paolo Abeni, David S. Miller
> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Andy Shevchenko
> Sent: Wednesday, May 8, 2024 11:30 PM
> To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>; intel-wired-lan@lists.osuosl.org; netdev@vger.kernel.org; linux-kernel@vger.kernel.org; bpf@vger.kernel.org
> Cc: Jesper Dangaard Brouer <hawk@kernel.org>; Daniel Borkmann <daniel@iogearbox.net>; Richard Cochran <richardcochran@gmail.com>; John Fastabend <john.fastabend@gmail.com>; Alexei Starovoitov <ast@kernel.org>; Loktionov, Aleksandr <aleksandr.loktionov@intel.com>; Lobakin, Aleksander <aleksander.lobakin@intel.com>; Eric Dumazet <edumazet@google.com>; Nguyen, Anthony L <anthony.l.nguyen@intel.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; David S. Miller <davem@davemloft.net>
> Subject: [Intel-wired-lan] [PATCH net-next v2 1/1] net: intel: Use *-y instead of *-objs in Makefile
>
> *-objs suffix is reserved rather for (user-space) host programs while usually *-y suffix is used for kernel drivers (although *-objs works for that purpose for now).
>
> Let's correct the old usages of *-objs in Makefiles.
>
> Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
> Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> v2: added tags (Olek, Aleksandr), fixed misplaced line in one case (LKP)
> drivers/net/ethernet/intel/e1000/Makefile | 2 +-
> drivers/net/ethernet/intel/e1000e/Makefile | 7 +++----
> drivers/net/ethernet/intel/i40e/Makefile | 2 +-
> drivers/net/ethernet/intel/iavf/Makefile | 5 ++---
> drivers/net/ethernet/intel/igb/Makefile | 6 +++---
> drivers/net/ethernet/intel/igbvf/Makefile | 6 +-----
> drivers/net/ethernet/intel/igc/Makefile | 6 +++---
> drivers/net/ethernet/intel/ixgbe/Makefile | 8 ++++----
> drivers/net/ethernet/intel/ixgbevf/Makefile | 6 +----- drivers/net/ethernet/intel/libeth/Makefile | 2 +-
> drivers/net/ethernet/intel/libie/Makefile | 2 +-
> 11 files changed, 21 insertions(+), 31 deletions(-)
>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-05-14 15:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-08 18:00 [PATCH net-next v2 1/1] net: intel: Use *-y instead of *-objs in Makefile Andy Shevchenko
2024-05-08 18:23 ` Jacob Keller
2024-05-08 18:27 ` Andy Shevchenko
2024-05-14 15:00 ` [Intel-wired-lan] " Pucha, HimasekharX Reddy
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).