From 379dd95f108991004964db4da03e89ee72ce4d4b Mon Sep 17 00:00:00 2001 From: "Bjoern A. Zeeb" Date: Mon, 16 Nov 2020 12:44:33 +0000 Subject: [PATCH 1/2] athp: cleanup modules build Makefiles The Makefiles had a lot of copy and paste and especially CLEANFILES was wrong in most of them. Rather than keeping the duplicate logic everywhere, put it into a common Makefile.inc and only have the per-firmware kmod specifics in the individual Makefiles. This will also allow us to change the way we are building the firmware(9) kernel modules in a single place. Sponsored by: Rubicon Communications, LLC (d/b/a "Netgate") --- otus/freebsd/src/sys/modules/athpfw/Makefile | 2 +- otus/freebsd/src/sys/modules/athpfw/Makefile.inc | 11 +++++++++++ .../modules/athpfw/athp_QCA6174_hw2.1_board/Makefile | 9 ++------- .../athpfw/athp_QCA6174_hw2.1_firmware-5/Makefile | 9 ++------- .../modules/athpfw/athp_QCA6174_hw3.0_board/Makefile | 9 ++------- .../athpfw/athp_QCA6174_hw3.0_firmware-4/Makefile | 9 ++------- .../modules/athpfw/athp_QCA988X_hw2.0_board/Makefile | 9 ++------- .../athpfw/athp_QCA988X_hw2.0_firmware-2/Makefile | 9 ++------- .../athpfw/athp_QCA988X_hw2.0_firmware-4/Makefile | 9 ++------- .../athpfw/athp_QCA988X_hw2.0_firmware-5/Makefile | 9 ++------- .../modules/athpfw/athp_QCA99X0_hw2.0_board/Makefile | 9 ++------- .../athpfw/athp_QCA99X0_hw2.0_firmware-5/Makefile | 9 ++------- 12 files changed, 32 insertions(+), 71 deletions(-) create mode 100644 otus/freebsd/src/sys/modules/athpfw/Makefile.inc diff --git a/otus/freebsd/src/sys/modules/athpfw/Makefile b/otus/freebsd/src/sys/modules/athpfw/Makefile index 07915fb8..cf2c24e5 100644 --- a/otus/freebsd/src/sys/modules/athpfw/Makefile +++ b/otus/freebsd/src/sys/modules/athpfw/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SUBDIR=athp_QCA988X_hw2.0_board +SUBDIR= athp_QCA988X_hw2.0_board SUBDIR+= athp_QCA988X_hw2.0_firmware-2 SUBDIR+= athp_QCA988X_hw2.0_firmware-4 SUBDIR+= athp_QCA988X_hw2.0_firmware-5 diff --git a/otus/freebsd/src/sys/modules/athpfw/Makefile.inc b/otus/freebsd/src/sys/modules/athpfw/Makefile.inc new file mode 100644 index 00000000..a7602dd3 --- /dev/null +++ b/otus/freebsd/src/sys/modules/athpfw/Makefile.inc @@ -0,0 +1,11 @@ +# $FreeBSD$ + +KMOD= athp_${FWSUBDIR}_${FWNAME} +FIRMWS= ${KMOD}:${KMOD}:1 + +CLEANFILES= ${FWNAME} + +FWDIR= ${.CURDIR}/../../../contrib/dev/ath10k +${KMOD}: ${FWDIR}/${FWSUBDIR}/${FWNAME} + cp ${FWDIR}/${FWSUBDIR}/${FWNAME} ${.TARGET} + diff --git a/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw2.1_board/Makefile b/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw2.1_board/Makefile index defae260..2606ec6b 100644 --- a/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw2.1_board/Makefile +++ b/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw2.1_board/Makefile @@ -1,11 +1,6 @@ # $FreeBSD$ -KMOD= athp_QCA6174_hw2.1_board.bin -FIRMWS= athp_QCA6174_hw2.1_board.bin:athp_QCA6174_hw2.1_board.bin:1 - -CLEANFILES= board.bin - -athp_QCA6174_hw2.1_board.bin: ${.CURDIR}/../../../contrib/dev/athp/QCA6174_hw2.1/board.bin - cp ${.CURDIR}/../../../contrib/dev/athp/QCA6174_hw2.1/board.bin ${.TARGET} +FWNAME= board.bin +FWSUBDIR= QCA6174_hw2.1 .include diff --git a/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw2.1_firmware-5/Makefile b/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw2.1_firmware-5/Makefile index 1c77dbc5..aa89435b 100644 --- a/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw2.1_firmware-5/Makefile +++ b/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw2.1_firmware-5/Makefile @@ -1,11 +1,6 @@ # $FreeBSD$ -KMOD= athp_QCA6174_hw2.1_firmware-5.bin -FIRMWS= athp_QCA6174_hw2.1_firmware-5.bin:athp_QCA6174_hw2.1_firmware-5.bin:1 - -CLEANFILES= board.bin - -athp_QCA6174_hw2.1_firmware-5.bin: ${.CURDIR}/../../../contrib/dev/athp/QCA6174_hw2.1/firmware-5.bin - cp ${.CURDIR}/../../../contrib/dev/athp/QCA6174_hw2.1/firmware-5.bin ${.TARGET} +FWNAME= firmware-5.bin +FWSUBDIR= QCA6174_hw2.1 .include diff --git a/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw3.0_board/Makefile b/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw3.0_board/Makefile index e0664b46..c3a18f89 100644 --- a/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw3.0_board/Makefile +++ b/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw3.0_board/Makefile @@ -1,11 +1,6 @@ # $FreeBSD$ -KMOD= athp_QCA6174_hw3.0_board.bin -FIRMWS= athp_QCA6174_hw3.0_board.bin:athp_QCA6174_hw3.0_board.bin:1 - -CLEANFILES= board.bin - -athp_QCA6174_hw3.0_board.bin: ${.CURDIR}/../../../contrib/dev/athp/QCA6174_hw3.0/board.bin - cp ${.CURDIR}/../../../contrib/dev/athp/QCA6174_hw3.0/board.bin ${.TARGET} +FWNAME= board.bin +FWSUBDIR= QCA6174_hw3.0 .include diff --git a/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw3.0_firmware-4/Makefile b/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw3.0_firmware-4/Makefile index 2b31a7ee..f5a7aac7 100644 --- a/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw3.0_firmware-4/Makefile +++ b/otus/freebsd/src/sys/modules/athpfw/athp_QCA6174_hw3.0_firmware-4/Makefile @@ -1,11 +1,6 @@ # $FreeBSD$ -KMOD= athp_QCA6174_hw3.0_firmware-4.bin -FIRMWS= athp_QCA6174_hw3.0_firmware-4.bin:athp_QCA6174_hw3.0_firmware-4.bin:1 - -CLEANFILES= board.bin - -athp_QCA6174_hw3.0_firmware-4.bin: ${.CURDIR}/../../../contrib/dev/athp/QCA6174_hw3.0/firmware-4.bin - cp ${.CURDIR}/../../../contrib/dev/athp/QCA6174_hw3.0/firmware-4.bin ${.TARGET} +FWNAME= firmware-4.bin +FWSUBDIR= QCA6174_hw3.0 .include diff --git a/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_board/Makefile b/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_board/Makefile index 974f8d3f..15a1b1b5 100644 --- a/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_board/Makefile +++ b/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_board/Makefile @@ -1,11 +1,6 @@ # $FreeBSD$ -KMOD= athp_QCA988X_hw2.0_board.bin -FIRMWS= athp_QCA988X_hw2.0_board.bin:athp_QCA988X_hw2.0_board.bin:1 - -CLEANFILES= board.bin - -athp_QCA988X_hw2.0_board.bin: ${.CURDIR}/../../../contrib/dev/athp/QCA988X_hw2.0/board.bin - cp ${.CURDIR}/../../../contrib/dev/athp/QCA988X_hw2.0/board.bin ${.TARGET} +FWNAME= board.bin +FWSUBDIR= QCA988X_hw2.0 .include diff --git a/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_firmware-2/Makefile b/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_firmware-2/Makefile index 48741952..aa07240a 100644 --- a/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_firmware-2/Makefile +++ b/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_firmware-2/Makefile @@ -1,11 +1,6 @@ # $FreeBSD$ -KMOD= athp_QCA988X_hw2.0_firmware-2.bin -FIRMWS= athp_QCA988X_hw2.0_firmware-2.bin:athp_QCA988X_hw2.0_firmware-2.bin:1 - -CLEANFILES= board.bin - -athp_QCA988X_hw2.0_firmware-2.bin: ${.CURDIR}/../../../contrib/dev/athp/QCA988X_hw2.0/firmware-2.bin - cp ${.CURDIR}/../../../contrib/dev/athp/QCA988X_hw2.0/firmware-2.bin ${.TARGET} +FWNAME= firmware-2.bin +FWSUBDIR= QCA988X_hw2.0 .include diff --git a/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_firmware-4/Makefile b/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_firmware-4/Makefile index 52c2df86..934a6f09 100644 --- a/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_firmware-4/Makefile +++ b/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_firmware-4/Makefile @@ -1,11 +1,6 @@ # $FreeBSD$ -KMOD= athp_QCA988X_hw2.0_firmware-4.bin -FIRMWS= athp_QCA988X_hw2.0_firmware-4.bin:athp_QCA988X_hw2.0_firmware-4.bin:1 - -CLEANFILES= board.bin - -athp_QCA988X_hw2.0_firmware-4.bin: ${.CURDIR}/../../../contrib/dev/athp/QCA988X_hw2.0/firmware-4.bin - cp ${.CURDIR}/../../../contrib/dev/athp/QCA988X_hw2.0/firmware-4.bin ${.TARGET} +FWNAME= firmware-4.bin +FWSUBDIR= QCA988X_hw2.0 .include diff --git a/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_firmware-5/Makefile b/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_firmware-5/Makefile index b8ef1193..985615c5 100644 --- a/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_firmware-5/Makefile +++ b/otus/freebsd/src/sys/modules/athpfw/athp_QCA988X_hw2.0_firmware-5/Makefile @@ -1,11 +1,6 @@ # $FreeBSD$ -KMOD= athp_QCA988X_hw2.0_firmware-5.bin -FIRMWS= athp_QCA988X_hw2.0_firmware-5.bin:athp_QCA988X_hw2.0_firmware-5.bin:1 - -CLEANFILES= board.bin - -athp_QCA988X_hw2.0_firmware-5.bin: ${.CURDIR}/../../../contrib/dev/athp/QCA988X_hw2.0/firmware-5.bin - cp ${.CURDIR}/../../../contrib/dev/athp/QCA988X_hw2.0/firmware-5.bin ${.TARGET} +FWNAME= firmware-5.bin +FWSUBDIR= QCA988X_hw2.0 .include diff --git a/otus/freebsd/src/sys/modules/athpfw/athp_QCA99X0_hw2.0_board/Makefile b/otus/freebsd/src/sys/modules/athpfw/athp_QCA99X0_hw2.0_board/Makefile index ec2d87b9..d5c70b05 100644 --- a/otus/freebsd/src/sys/modules/athpfw/athp_QCA99X0_hw2.0_board/Makefile +++ b/otus/freebsd/src/sys/modules/athpfw/athp_QCA99X0_hw2.0_board/Makefile @@ -1,11 +1,6 @@ # $FreeBSD$ -KMOD= athp_QCA99X0_hw2.0_board.bin -FIRMWS= athp_QCA99X0_hw2.0_board.bin:athp_QCA99X0_hw2.0_board.bin:1 - -CLEANFILES= board.bin - -athp_QCA99X0_hw2.0_board.bin: ${.CURDIR}/../../../contrib/dev/athp/QCA99X0_hw2.0/board.bin - cp ${.CURDIR}/../../../contrib/dev/athp/QCA99X0_hw2.0/board.bin ${.TARGET} +FWNAME= board.bin +FWSUBDIR= QCA99X0_hw2.0 .include diff --git a/otus/freebsd/src/sys/modules/athpfw/athp_QCA99X0_hw2.0_firmware-5/Makefile b/otus/freebsd/src/sys/modules/athpfw/athp_QCA99X0_hw2.0_firmware-5/Makefile index 3f39f626..c18d9480 100644 --- a/otus/freebsd/src/sys/modules/athpfw/athp_QCA99X0_hw2.0_firmware-5/Makefile +++ b/otus/freebsd/src/sys/modules/athpfw/athp_QCA99X0_hw2.0_firmware-5/Makefile @@ -1,11 +1,6 @@ # $FreeBSD$ -KMOD= athp_QCA99X0_hw2.0_firmware-5.bin -FIRMWS= athp_QCA99X0_hw2.0_firmware-5.bin:athp_QCA99X0_hw2.0_firmware-5.bin:1 - -CLEANFILES= board.bin - -athp_QCA99X0_hw2.0_firmware-5.bin: ${.CURDIR}/../../../contrib/dev/athp/QCA99X0_hw2.0/firmware-5.bin - cp ${.CURDIR}/../../../contrib/dev/athp/QCA99X0_hw2.0/firmware-5.bin ${.TARGET} +FWNAME= firmware-5.bin +FWSUBDIR= QCA99X0_hw2.0 .include From c66a9fa39706f7053f909e58b0adf1206e535b8a Mon Sep 17 00:00:00 2001 From: "Bjoern A. Zeeb" Date: Mon, 16 Nov 2020 12:50:40 +0000 Subject: [PATCH 2/2] athp: firmware still resides in the athp subdirectory For the moment the firmware is still in sys/contrib/dev/athp and not ath10k. For clarity and to avoid confusion we should consider to put it into an ath10k directory when it goes into HEAD. Sponsored by: Rubicon Communications, LLC (d/b/a "Netgate") --- otus/freebsd/src/sys/modules/athpfw/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/otus/freebsd/src/sys/modules/athpfw/Makefile.inc b/otus/freebsd/src/sys/modules/athpfw/Makefile.inc index a7602dd3..8418c393 100644 --- a/otus/freebsd/src/sys/modules/athpfw/Makefile.inc +++ b/otus/freebsd/src/sys/modules/athpfw/Makefile.inc @@ -5,7 +5,7 @@ FIRMWS= ${KMOD}:${KMOD}:1 CLEANFILES= ${FWNAME} -FWDIR= ${.CURDIR}/../../../contrib/dev/ath10k +FWDIR= ${.CURDIR}/../../../contrib/dev/athp ${KMOD}: ${FWDIR}/${FWSUBDIR}/${FWNAME} cp ${FWDIR}/${FWSUBDIR}/${FWNAME} ${.TARGET}