net: intel: Use *-y instead of *-objs in Makefile
Subsystems (6)
PATCH 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.
---
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(-)
drivers/net/ethernet/intel/e1000/Makefile +1 -1
@@ -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
drivers/net/ethernet/intel/e1000e/Makefile +3 -4
@@ -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
drivers/net/ethernet/intel/i40e/Makefile +1 -1
@@ -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 \
drivers/net/ethernet/intel/iavf/Makefile +2 -3
@@ -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
drivers/net/ethernet/intel/igb/Makefile +3 -3
@@ -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
drivers/net/ethernet/intel/igbvf/Makefile +1 -5
@@ -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
drivers/net/ethernet/intel/igc/Makefile +3 -3
@@ -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
drivers/net/ethernet/intel/ixgbe/Makefile +4 -4
@@ -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
drivers/net/ethernet/intel/ixgbevf/Makefile +1 -5
@@ -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 -
drivers/net/ethernet/intel/libeth/Makefile +1 -1
@@ -3,4 +3,4 @@ obj-$(CONFIG_LIBETH) += libeth.o -libeth-objs += rx.o +libeth-y := rx.o
drivers/net/ethernet/intel/libie/Makefile +1 -1
@@ -3,4 +3,4 @@ obj-$(CONFIG_LIBIE) += libie.o -libie-objs += rx.o +libie-y := rx.o
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
Quoted 10 lines · Andy Shevchenko
*-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 <[email protected]>Reviewed-by Alexander Lobakin <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>---
FWIW I applied v1 and v2, and got only the following range-diff:
Quoted 25 lines
$ 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 messageLet's correct the old usages of *-objs in Makefiles.
- Signed-off-by: Andy Shevchenko <[email protected]>
- Reviewed-by: Alexander Lobakin <[email protected]>Reviewed-by Aleksandr Loktionov <[email protected]>- Reviewed-by: Jacob Keller <[email protected]>
+ Reviewed-by: Alexander Lobakin <[email protected]>
+ Signed-off-by: Andy Shevchenko <[email protected]>##
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
Quoted 9 lines
-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.
Quoted 1 line · Jacob Keller
On 5/8/2024 11:00 AM, Andy Shevchenko wrote:
...
Quoted 6 lines
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 <[email protected]>
Thank you!
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 16 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Andy Shevchenko
Sent: Wednesday, May 8, 2024 11:30 PM
To: Andy Shevchenko <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]
Cc: Jesper Dangaard Brouer <[email protected]>; Daniel Borkmann <[email protected]>; Richard Cochran <[email protected]>; John Fastabend <[email protected]>; Alexei Starovoitov <[email protected]>; Loktionov, Aleksandr <[email protected]>; Lobakin, Aleksander <[email protected]>; Eric Dumazet <[email protected]>; Nguyen, Anthony L <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>; David S. Miller <[email protected]>
Subject: [Intel-wired-lan] [PATCH net-next v2 1/1] net: intel: Use *-y instead of *-objs inMakefile*-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 <[email protected]>Reviewed-by Alexander Lobakin <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>---
v2: added tags (Olek, Aleksandr), fixed misplaced line in one case (LKP)
Quoted 12 lines
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(-)