Skip to content

Commit 8e88262

Browse files
committed
Merge branch 'nfp-build-and-FW-initramfs-updates'
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 <[email protected]>
2 parents 60772e4 + 70271da commit 8e88262

File tree

7 files changed

+13
-0
lines changed

7 files changed

+13
-0
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
# kbuild requires Makefile in a directory to build individual objects
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
# kbuild requires Makefile in a directory to build individual objects
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
# kbuild requires Makefile in a directory to build individual objects

drivers/net/ethernet/netronome/nfp/nfp_main.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,7 @@ MODULE_FIRMWARE("netronome/nic_AMDA0097-0001_4x10_1x40.nffw");
645645
MODULE_FIRMWARE("netronome/nic_AMDA0097-0001_8x10.nffw");
646646
MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_2x10.nffw");
647647
MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_2x25.nffw");
648+
MODULE_FIRMWARE("netronome/nic_AMDA0099-0001_1x10_1x25.nffw");
648649

649650
MODULE_AUTHOR("Netronome Systems <[email protected]>");
650651
MODULE_LICENSE("GPL");
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
# kbuild requires Makefile in a directory to build individual objects
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
# kbuild requires Makefile in a directory to build individual objects
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
# kbuild requires Makefile in a directory to build individual objects

0 commit comments

Comments
 (0)