* [PATCH net-next 1/3] nfp: add Makefiles to all directories
2018-02-22 3:50 [PATCH net-next 0/3] nfp: build and FW initramfs updates Jakub Kicinski
@ 2018-02-22 3:50 ` Jakub Kicinski
2018-02-22 3:50 ` [PATCH net-next 2/3] aquantia: " Jakub Kicinski
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2018-02-22 3:50 UTC (permalink / raw)
To: davem; +Cc: netdev, oss-drivers, Jakub Kicinski
To be able to build separate objects we need to provide
Kbuild with a Makefile in each directory.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---
drivers/net/ethernet/netronome/nfp/bpf/Makefile | 2 ++
drivers/net/ethernet/netronome/nfp/flower/Makefile | 2 ++
drivers/net/ethernet/netronome/nfp/nfpcore/Makefile | 2 ++
drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile | 2 ++
drivers/net/ethernet/netronome/nfp/nic/Makefile | 2 ++
5 files changed, 10 insertions(+)
create mode 100644 drivers/net/ethernet/netronome/nfp/bpf/Makefile
create mode 100644 drivers/net/ethernet/netronome/nfp/flower/Makefile
create mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/Makefile
create mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile
create mode 100644 drivers/net/ethernet/netronome/nfp/nic/Makefile
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/Makefile b/drivers/net/ethernet/netronome/nfp/bpf/Makefile
new file mode 100644
index 000000000000..805fa28f391a
--- /dev/null
+++ b/drivers/net/ethernet/netronome/nfp/bpf/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+# kbuild requires Makefile in a directory to build individual objects
diff --git a/drivers/net/ethernet/netronome/nfp/flower/Makefile b/drivers/net/ethernet/netronome/nfp/flower/Makefile
new file mode 100644
index 000000000000..805fa28f391a
--- /dev/null
+++ b/drivers/net/ethernet/netronome/nfp/flower/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+# kbuild requires Makefile in a directory to build individual objects
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/Makefile b/drivers/net/ethernet/netronome/nfp/nfpcore/Makefile
new file mode 100644
index 000000000000..805fa28f391a
--- /dev/null
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+# kbuild requires Makefile in a directory to build individual objects
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile
new file mode 100644
index 000000000000..805fa28f391a
--- /dev/null
+++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+# kbuild requires Makefile in a directory to build individual objects
diff --git a/drivers/net/ethernet/netronome/nfp/nic/Makefile b/drivers/net/ethernet/netronome/nfp/nic/Makefile
new file mode 100644
index 000000000000..805fa28f391a
--- /dev/null
+++ b/drivers/net/ethernet/netronome/nfp/nic/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+# kbuild requires Makefile in a directory to build individual objects
--
2.15.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH net-next 2/3] aquantia: add Makefiles to all directories
2018-02-22 3:50 [PATCH net-next 0/3] nfp: build and FW initramfs updates Jakub Kicinski
2018-02-22 3:50 ` [PATCH net-next 1/3] nfp: add Makefiles to all directories Jakub Kicinski
@ 2018-02-22 3:50 ` Jakub Kicinski
2018-02-22 3:50 ` [PATCH net-next 3/3] nfp: advertise firmware for mixed 10G/25G mode Jakub Kicinski
2018-02-22 20:28 ` [PATCH net-next 0/3] nfp: build and FW initramfs updates David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2018-02-22 3:50 UTC (permalink / raw)
To: davem; +Cc: netdev, oss-drivers, Jakub Kicinski, Igor Russkikh
To be able to build separate objects we need to provide
Kbuild with a Makefile in each directory.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---
CC: Igor Russkikh <igor.russkikh@aquantia.com>
drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile b/drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile
new file mode 100644
index 000000000000..805fa28f391a
--- /dev/null
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+# kbuild requires Makefile in a directory to build individual objects
--
2.15.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next 3/3] nfp: advertise firmware for mixed 10G/25G mode
2018-02-22 3:50 [PATCH net-next 0/3] nfp: build and FW initramfs updates Jakub Kicinski
2018-02-22 3:50 ` [PATCH net-next 1/3] nfp: add Makefiles to all directories Jakub Kicinski
2018-02-22 3:50 ` [PATCH net-next 2/3] aquantia: " Jakub Kicinski
@ 2018-02-22 3:50 ` Jakub Kicinski
2018-02-22 20:28 ` [PATCH net-next 0/3] nfp: build and FW initramfs updates David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2018-02-22 3:50 UTC (permalink / raw)
To: davem; +Cc: netdev, oss-drivers, Dirk van der Merwe
From: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
The AMDA0099-0001 platform can support the 1x10G + 1x25G mixed mode
operation. Recently, firmware has been added for this configuration
mode.
Signed-off-by: Dirk van der Merwe <dirk.vandermerwe@netronome.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
---
drivers/net/ethernet/netronome/nfp/nfp_main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_main.c b/drivers/net/ethernet/netronome/nfp/nfp_main.c
index ab301d56430b..c4b1f344b4da 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_main.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_main.c
@@ -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");
--
2.15.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH net-next 0/3] nfp: build and FW initramfs updates
2018-02-22 3:50 [PATCH net-next 0/3] nfp: build and FW initramfs updates Jakub Kicinski
` (2 preceding siblings ...)
2018-02-22 3:50 ` [PATCH net-next 3/3] nfp: advertise firmware for mixed 10G/25G mode Jakub Kicinski
@ 2018-02-22 20:28 ` David Miller
3 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2018-02-22 20:28 UTC (permalink / raw)
To: jakub.kicinski; +Cc: netdev, oss-drivers
From: Jakub Kicinski <jakub.kicinski@netronome.com>
Date: Wed, 21 Feb 2018 19:50:04 -0800
> 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.
Series applied, thanks for following up on this Jakub.
^ permalink raw reply [flat|nested] 5+ messages in thread