From 284db32c87442681c8086d41fca7cf5fd16b5369 Mon Sep 17 00:00:00 2001 From: Ian Lepore Date: Sat, 7 Jul 2018 21:49:30 +0000 Subject: [PATCH] Move arm- and aarch64-specific manpages into arch-specific directories. This removes a bit of the .if/.endif clutter from man4/Makefile by using the existing machinery that supports per-arch manpages. --- share/man/man4/Makefile | 33 ------------------- share/man/man4/man4.aarch64/Makefile | 23 +++++++++++++ share/man/man4/{ => man4.aarch64}/rk_gpio.4 | 0 share/man/man4/{ => man4.aarch64}/rk_grf.4 | 0 share/man/man4/{ => man4.aarch64}/rk_i2c.4 | 0 .../man/man4/{ => man4.aarch64}/rk_pinctrl.4 | 0 share/man/man4/man4.arm/Makefile | 10 +++++- share/man/man4/{ => man4.arm}/aw_gpio.4 | 0 share/man/man4/{ => man4.arm}/aw_mmc.4 | 0 share/man/man4/{ => man4.arm}/aw_rtc.4 | 0 share/man/man4/{ => man4.arm}/aw_sid.4 | 0 share/man/man4/{ => man4.arm}/aw_spi.4 | 0 share/man/man4/{ => man4.arm}/aw_syscon.4 | 0 share/man/man4/{ => man4.arm}/bcm283x_pwm.4 | 0 14 files changed, 32 insertions(+), 34 deletions(-) create mode 100644 share/man/man4/man4.aarch64/Makefile rename share/man/man4/{ => man4.aarch64}/rk_gpio.4 (100%) rename share/man/man4/{ => man4.aarch64}/rk_grf.4 (100%) rename share/man/man4/{ => man4.aarch64}/rk_i2c.4 (100%) rename share/man/man4/{ => man4.aarch64}/rk_pinctrl.4 (100%) rename share/man/man4/{ => man4.arm}/aw_gpio.4 (100%) rename share/man/man4/{ => man4.arm}/aw_mmc.4 (100%) rename share/man/man4/{ => man4.arm}/aw_rtc.4 (100%) rename share/man/man4/{ => man4.arm}/aw_sid.4 (100%) rename share/man/man4/{ => man4.arm}/aw_spi.4 (100%) rename share/man/man4/{ => man4.arm}/aw_syscon.4 (100%) rename share/man/man4/{ => man4.arm}/bcm283x_pwm.4 (100%) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index df0864837a06..12fcce24fd8e 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -54,7 +54,6 @@ MAN= aac.4 \ ${_aout.4} \ ${_apic.4} \ arcmsr.4 \ - ${_armv8crypto.4} \ ${_asmc.4} \ ata.4 \ ath.4 \ @@ -70,16 +69,9 @@ MAN= aac.4 \ audit.4 \ auditpipe.4 \ aue.4 \ - ${_aw_gpio.4} \ - ${_aw_mmc.4} \ - ${_aw_rtc.4} \ - ${_aw_sid.4} \ - ${_aw_spi.4} \ - ${_aw_syscon.4} \ axe.4 \ axge.4 \ bce.4 \ - ${_bcm283x_pwm.4} \ bcma.4 \ bfe.4 \ bge.4 \ @@ -444,10 +436,6 @@ MAN= aac.4 \ re.4 \ rgephy.4 \ rights.4 \ - ${_rk_gpio.4} \ - ${_rk_grf.4} \ - ${_rk_i2c.4} \ - ${_rk_pinctrl.4} \ rl.4 \ rndtest.4 \ route.4 \ @@ -762,23 +750,6 @@ MLINKS+=${_wpi.4} ${_if_wpi.4} MLINKS+=xe.4 if_xe.4 MLINKS+=xl.4 if_xl.4 -.if ${MACHINE_CPUARCH} == "aarch64" -_armv8crypto.4= armv8crypto.4 -_rk_gpio.4= rk_gpio.4 -_rk_grf.4= rk_grf.4 -_rk_i2c.4= rk_i2c.4 -_rk_pinctrl.4= rk_pinctrl.4 -.endif - -.if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" -_aw_gpio.4= aw_gpio.4 -_aw_mmc.4= aw_mmc.4 -_aw_rtc.4= aw_rtc.4 -_aw_sid.4= aw_sid.4 -_aw_spi.4= aw_spi.4 -_aw_syscon.4= aw_syscon.4 -.endif - .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" _acpi_asus.4= acpi_asus.4 _acpi_asus_wmi.4= acpi_asus_wmi.4 @@ -896,10 +867,6 @@ _nvd.4= nvd.4 _nvme.4= nvme.4 .endif -.if ${MACHINE_ARCH:Marmv[67]*} != "" || ${MACHINE_CPUARCH} == "aarch64" -_bcm283x_pwm.4= bcm283x_pwm.4 -.endif - .if exists(${.CURDIR}/man4.${MACHINE_CPUARCH}) SUBDIR= man4.${MACHINE_CPUARCH} .endif diff --git a/share/man/man4/man4.aarch64/Makefile b/share/man/man4/man4.aarch64/Makefile new file mode 100644 index 000000000000..14c32d63096c --- /dev/null +++ b/share/man/man4/man4.aarch64/Makefile @@ -0,0 +1,23 @@ +# $FreeBSD$ + +PACKAGE=runtime-manuals + +.PATH: ${.CURDIR}/../man4.arm # Some manpages are common to arm and aarch64 + +MAN= \ + armv8crypto.4 \ + aw_gpio.4 \ + aw_mmc.4 \ + aw_rtc.4 \ + aw_sid.4 \ + aw_spi.4 \ + aw_syscon.4 \ + bcm283x_pwm.4 \ + rk_gpio.4 \ + rk_grf.4 \ + rk_i2c.4 \ + rk_pinctrl.4 \ + +MANSUBDIR=/aarch64 + +.include diff --git a/share/man/man4/rk_gpio.4 b/share/man/man4/man4.aarch64/rk_gpio.4 similarity index 100% rename from share/man/man4/rk_gpio.4 rename to share/man/man4/man4.aarch64/rk_gpio.4 diff --git a/share/man/man4/rk_grf.4 b/share/man/man4/man4.aarch64/rk_grf.4 similarity index 100% rename from share/man/man4/rk_grf.4 rename to share/man/man4/man4.aarch64/rk_grf.4 diff --git a/share/man/man4/rk_i2c.4 b/share/man/man4/man4.aarch64/rk_i2c.4 similarity index 100% rename from share/man/man4/rk_i2c.4 rename to share/man/man4/man4.aarch64/rk_i2c.4 diff --git a/share/man/man4/rk_pinctrl.4 b/share/man/man4/man4.aarch64/rk_pinctrl.4 similarity index 100% rename from share/man/man4/rk_pinctrl.4 rename to share/man/man4/man4.aarch64/rk_pinctrl.4 diff --git a/share/man/man4/man4.arm/Makefile b/share/man/man4/man4.arm/Makefile index d9c358345256..39e2d6897343 100644 --- a/share/man/man4/man4.arm/Makefile +++ b/share/man/man4/man4.arm/Makefile @@ -2,7 +2,15 @@ PACKAGE=runtime-manuals -MAN= cgem.4 \ +MAN= \ + aw_gpio.4 \ + aw_mmc.4 \ + aw_rtc.4 \ + aw_sid.4 \ + aw_spi.4 \ + aw_syscon.4 \ + bcm283x_pwm.4 \ + cgem.4 \ devcfg.4 \ imx_wdog.4 \ mge.4 \ diff --git a/share/man/man4/aw_gpio.4 b/share/man/man4/man4.arm/aw_gpio.4 similarity index 100% rename from share/man/man4/aw_gpio.4 rename to share/man/man4/man4.arm/aw_gpio.4 diff --git a/share/man/man4/aw_mmc.4 b/share/man/man4/man4.arm/aw_mmc.4 similarity index 100% rename from share/man/man4/aw_mmc.4 rename to share/man/man4/man4.arm/aw_mmc.4 diff --git a/share/man/man4/aw_rtc.4 b/share/man/man4/man4.arm/aw_rtc.4 similarity index 100% rename from share/man/man4/aw_rtc.4 rename to share/man/man4/man4.arm/aw_rtc.4 diff --git a/share/man/man4/aw_sid.4 b/share/man/man4/man4.arm/aw_sid.4 similarity index 100% rename from share/man/man4/aw_sid.4 rename to share/man/man4/man4.arm/aw_sid.4 diff --git a/share/man/man4/aw_spi.4 b/share/man/man4/man4.arm/aw_spi.4 similarity index 100% rename from share/man/man4/aw_spi.4 rename to share/man/man4/man4.arm/aw_spi.4 diff --git a/share/man/man4/aw_syscon.4 b/share/man/man4/man4.arm/aw_syscon.4 similarity index 100% rename from share/man/man4/aw_syscon.4 rename to share/man/man4/man4.arm/aw_syscon.4 diff --git a/share/man/man4/bcm283x_pwm.4 b/share/man/man4/man4.arm/bcm283x_pwm.4 similarity index 100% rename from share/man/man4/bcm283x_pwm.4 rename to share/man/man4/man4.arm/bcm283x_pwm.4