Skip to content

Commit

Permalink
Merge branch 'nfp-build-and-FW-initramfs-updates'
Browse files Browse the repository at this point in the history
Jakub Kicinski says:

====================
nfp: build and FW initramfs updates

This set brings empty makefiles to allow building single object files
(useful for build-testing), Kbuild does not cater to this use case
too well.  There are two ethernet drivers right now which suffer
from this (nfp, aquantia), both are fixed.

Dirk adds an uncommon FW image name to the list of firmware files
module may request.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Feb 22, 2018
2 parents 60772e4 + 70271da commit 8e88262
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 0 deletions.
2 changes: 2 additions & 0 deletions drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SPDX-License-Identifier: GPL-2.0
# kbuild requires Makefile in a directory to build individual objects
2 changes: 2 additions & 0 deletions drivers/net/ethernet/netronome/nfp/bpf/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SPDX-License-Identifier: GPL-2.0
# kbuild requires Makefile in a directory to build individual objects
2 changes: 2 additions & 0 deletions drivers/net/ethernet/netronome/nfp/flower/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SPDX-License-Identifier: GPL-2.0
# kbuild requires Makefile in a directory to build individual objects
1 change: 1 addition & 0 deletions drivers/net/ethernet/netronome/nfp/nfp_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,7 @@ MODULE_FIRMWARE("netronome/nic_AMDA0097-0001_4x10_1x40.nffw");
MODULE_FIRMWARE("netronome/nic_AMDA0097-0001_8x10.nffw");
MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_2x10.nffw");
MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_2x25.nffw");
MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_1x10_1x25.nffw");

MODULE_AUTHOR("Netronome Systems <oss-drivers@netronome.com>");
MODULE_LICENSE("GPL");
Expand Down
2 changes: 2 additions & 0 deletions drivers/net/ethernet/netronome/nfp/nfpcore/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SPDX-License-Identifier: GPL-2.0
# kbuild requires Makefile in a directory to build individual objects
2 changes: 2 additions & 0 deletions drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SPDX-License-Identifier: GPL-2.0
# kbuild requires Makefile in a directory to build individual objects
2 changes: 2 additions & 0 deletions drivers/net/ethernet/netronome/nfp/nic/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# SPDX-License-Identifier: GPL-2.0
# kbuild requires Makefile in a directory to build individual objects

0 comments on commit 8e88262

Please sign in to comment.