[OpenWrt-Devel] [PATCH] treewide: add Generic subtarget if missing

Paul Spooren mail at aparcar.org
Thu Sep 12 03:18:36 EDT 2019


I posted this a while ago could somebody please apply this?

On 22.08.19 23:02, Paul Spooren wrote:
> As in 853e4dd OpenWrt should follow a unified structure, where every
> device has a target/subtarget combination, if there is only one
> subtarget, call it "Generic". This introduces predictable filenames.
>
> CC: Alexander Couzens <lynxis at fe80.eu>
> CC: Felix Fietkau <nbd at nbd.name>
> CC: Jason Wu <jason.wu.misc at gmail.com>
> CC: John Crispin <john at phrozen.org>
> CC: Luka Perkov <luka at openwrt.org>
> CC: Roman Yeryomin <roman at advem.lv>
> CC: Sergey Ryazanov <ryazanov.s.a at gmail.com>
> CC: Tim Harvey <tharvey at gateworks.com>
> CC: Tomasz Maciej Nowak <tomek_n at o2.pl>
>
> Signed-off-by: Paul Spooren <mail at aparcar.org>
> ---
>   target/linux/ath25/Makefile              | 1 +
>   target/linux/ath25/generic/target.mk     | 1 +
>   target/linux/cns3xxx/Makefile            | 1 +
>   target/linux/cns3xxx/generic/target.mk   | 1 +
>   target/linux/gemini/Makefile             | 1 +
>   target/linux/gemini/generic/target.mk    | 1 +
>   target/linux/imx6/Makefile               | 1 +
>   target/linux/imx6/generic/target.mk      | 1 +
>   target/linux/kirkwood/Makefile           | 1 +
>   target/linux/kirkwood/generic/target.mk  | 1 +
>   target/linux/octeon/Makefile             | 1 +
>   target/linux/octeon/generic/target.mk    | 1 +
>   target/linux/octeontx/Makefile           | 1 +
>   target/linux/octeontx/generic/target.mk  | 1 +
>   target/linux/omap/Makefile               | 1 +
>   target/linux/omap/generic/target.mk      | 1 +
>   target/linux/pistachio/Makefile          | 1 +
>   target/linux/pistachio/generic/target.mk | 1 +
>   target/linux/rb532/Makefile              | 1 +
>   target/linux/rb532/generic/target.mk     | 1 +
>   target/linux/tegra/Makefile              | 1 +
>   target/linux/tegra/generic/target.mk     | 1 +
>   target/linux/zynq/Makefile               | 1 +
>   target/linux/zynq/generic/target.mk      | 1 +
>   24 files changed, 24 insertions(+)
>   create mode 100644 target/linux/ath25/generic/target.mk
>   create mode 100644 target/linux/cns3xxx/generic/target.mk
>   create mode 100644 target/linux/gemini/generic/target.mk
>   create mode 100644 target/linux/imx6/generic/target.mk
>   create mode 100644 target/linux/kirkwood/generic/target.mk
>   create mode 100644 target/linux/octeon/generic/target.mk
>   create mode 100644 target/linux/octeontx/generic/target.mk
>   create mode 100644 target/linux/omap/generic/target.mk
>   create mode 100644 target/linux/pistachio/generic/target.mk
>   create mode 100644 target/linux/rb532/generic/target.mk
>   create mode 100644 target/linux/tegra/generic/target.mk
>   create mode 100644 target/linux/zynq/generic/target.mk
>
> diff --git a/target/linux/ath25/Makefile b/target/linux/ath25/Makefile
> index cb8b7ec1be..a253b4ceb3 100644
> --- a/target/linux/ath25/Makefile
> +++ b/target/linux/ath25/Makefile
> @@ -10,6 +10,7 @@ ARCH:=mips
>   BOARD:=ath25
>   BOARDNAME:=Atheros AR231x/AR5312
>   FEATURES:=squashfs low_mem small_flash
> +SUBTARGETS:=generic
>   MAINTAINER:=Sergey Ryazanov <ryazanov.s.a at gmail.com>
>   
>   KERNEL_PATCHVER:=4.14
> diff --git a/target/linux/ath25/generic/target.mk b/target/linux/ath25/generic/target.mk
> new file mode 100644
> index 0000000000..f5cb1fb19b
> --- /dev/null
> +++ b/target/linux/ath25/generic/target.mk
> @@ -0,0 +1 @@
> +BOARDNAME:=Generic
> diff --git a/target/linux/cns3xxx/Makefile b/target/linux/cns3xxx/Makefile
> index f21ad06248..7930b959b6 100644
> --- a/target/linux/cns3xxx/Makefile
> +++ b/target/linux/cns3xxx/Makefile
> @@ -12,6 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS3xxx
>   FEATURES:=squashfs fpu gpio pcie usb usbgadget
>   CPU_TYPE:=mpcore
>   CPU_SUBTYPE:=vfp
> +SUBTARGETS:=generic
>   MAINTAINER:=Felix Fietkau <nbd at nbd.name>, \
>   	    Koen Vandeputte <koen.vandeputte at ncentric.com>
>   KERNEL_PATCHVER:=4.19
> diff --git a/target/linux/cns3xxx/generic/target.mk b/target/linux/cns3xxx/generic/target.mk
> new file mode 100644
> index 0000000000..f5cb1fb19b
> --- /dev/null
> +++ b/target/linux/cns3xxx/generic/target.mk
> @@ -0,0 +1 @@
> +BOARDNAME:=Generic
> diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile
> index 3afc643023..1f1486f0c5 100644
> --- a/target/linux/gemini/Makefile
> +++ b/target/linux/gemini/Makefile
> @@ -11,6 +11,7 @@ BOARD:=gemini
>   BOARDNAME:=Cortina Systems CS351x
>   FEATURES:=squashfs pci rtc usb dt gpio display ext4 rootfs-part boot-part
>   CPU_TYPE:=fa526
> +SUBTARGETS:=generic
>   MAINTAINER:=Roman Yeryomin <roman at advem.lv>
>   
>   KERNEL_PATCHVER:=4.19
> diff --git a/target/linux/gemini/generic/target.mk b/target/linux/gemini/generic/target.mk
> new file mode 100644
> index 0000000000..f5cb1fb19b
> --- /dev/null
> +++ b/target/linux/gemini/generic/target.mk
> @@ -0,0 +1 @@
> +BOARDNAME:=Generic
> diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile
> index ac4300f7eb..570898cb9c 100644
> --- a/target/linux/imx6/Makefile
> +++ b/target/linux/imx6/Makefile
> @@ -12,6 +12,7 @@ BOARDNAME:=Freescale i.MX 6
>   FEATURES:=audio display fpu gpio pcie rtc usb usbgadget squashfs targz nand ubifs boot-part rootfs-part
>   CPU_TYPE:=cortex-a9
>   CPU_SUBTYPE:=neon
> +SUBTARGETS:=generic
>   MAINTAINER:=Luka Perkov <luka at openwrt.org>
>   
>   KERNEL_PATCHVER:=4.19
> diff --git a/target/linux/imx6/generic/target.mk b/target/linux/imx6/generic/target.mk
> new file mode 100644
> index 0000000000..f5cb1fb19b
> --- /dev/null
> +++ b/target/linux/imx6/generic/target.mk
> @@ -0,0 +1 @@
> +BOARDNAME:=Generic
> diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile
> index adc7a496e1..e185eca093 100644
> --- a/target/linux/kirkwood/Makefile
> +++ b/target/linux/kirkwood/Makefile
> @@ -11,6 +11,7 @@ BOARD:=kirkwood
>   BOARDNAME:=Marvell Kirkwood
>   FEATURES:=usb nand squashfs ramdisk
>   CPU_TYPE:=xscale
> +SUBTARGETS:=generic
>   MAINTAINER:=Luka Perkov <luka at openwrt.org>
>   
>   KERNEL_PATCHVER:=4.14
> diff --git a/target/linux/kirkwood/generic/target.mk b/target/linux/kirkwood/generic/target.mk
> new file mode 100644
> index 0000000000..f5cb1fb19b
> --- /dev/null
> +++ b/target/linux/kirkwood/generic/target.mk
> @@ -0,0 +1 @@
> +BOARDNAME:=Generic
> diff --git a/target/linux/octeon/Makefile b/target/linux/octeon/Makefile
> index aa73b0e5c0..e965cb83fd 100644
> --- a/target/linux/octeon/Makefile
> +++ b/target/linux/octeon/Makefile
> @@ -11,6 +11,7 @@ BOARD:=octeon
>   BOARDNAME:=Cavium Networks Octeon
>   FEATURES:=squashfs ramdisk pci usb
>   CPU_TYPE:=octeonplus
> +SUBTARGETS:=generic
>   MAINTAINER:=John Crispin <john at phrozen.org>
>   
>   KERNEL_PATCHVER:=4.19
> diff --git a/target/linux/octeon/generic/target.mk b/target/linux/octeon/generic/target.mk
> new file mode 100644
> index 0000000000..f5cb1fb19b
> --- /dev/null
> +++ b/target/linux/octeon/generic/target.mk
> @@ -0,0 +1 @@
> +BOARDNAME:=Generic
> diff --git a/target/linux/octeontx/Makefile b/target/linux/octeontx/Makefile
> index e7f6b2d3c4..dee0f9ec54 100644
> --- a/target/linux/octeontx/Makefile
> +++ b/target/linux/octeontx/Makefile
> @@ -10,6 +10,7 @@ ARCH:=aarch64
>   BOARD:=octeontx
>   BOARDNAME:=Octeon-TX
>   FEATURES:=targz pcie gpio rtc usb fpu
> +SUBTARGETS:=generic
>   
>   MAINTAINER:=Tim Harvey <tharvey at gateworks.com>
>   
> diff --git a/target/linux/octeontx/generic/target.mk b/target/linux/octeontx/generic/target.mk
> new file mode 100644
> index 0000000000..f5cb1fb19b
> --- /dev/null
> +++ b/target/linux/octeontx/generic/target.mk
> @@ -0,0 +1 @@
> +BOARDNAME:=Generic
> diff --git a/target/linux/omap/Makefile b/target/linux/omap/Makefile
> index 3e5c921d61..fadc312892 100644
> --- a/target/linux/omap/Makefile
> +++ b/target/linux/omap/Makefile
> @@ -13,6 +13,7 @@ BOARDNAME:=TI OMAP3/4/AM33xx
>   FEATURES:=usb usbgadget ext4 targz fpu audio display nand squashfs
>   CPU_TYPE:=cortex-a8
>   CPU_SUBTYPE:=vfpv3
> +SUBTARGETS:=generic
>   
>   KERNEL_PATCHVER:=4.14
>   
> diff --git a/target/linux/omap/generic/target.mk b/target/linux/omap/generic/target.mk
> new file mode 100644
> index 0000000000..f5cb1fb19b
> --- /dev/null
> +++ b/target/linux/omap/generic/target.mk
> @@ -0,0 +1 @@
> +BOARDNAME:=Generic
> diff --git a/target/linux/pistachio/Makefile b/target/linux/pistachio/Makefile
> index dab7f0d62b..0920036982 100644
> --- a/target/linux/pistachio/Makefile
> +++ b/target/linux/pistachio/Makefile
> @@ -12,6 +12,7 @@ BOARDNAME:=MIPS pistachio
>   FEATURES:=fpu usb usbgadget squashfs targz nand
>   CPU_TYPE:=24kc
>   CPU_SUBTYPE:=24kf
> +SUBTARGETS:=generic
>   MAINTAINER:=
>   
>   KERNEL_PATCHVER:=4.14
> diff --git a/target/linux/pistachio/generic/target.mk b/target/linux/pistachio/generic/target.mk
> new file mode 100644
> index 0000000000..f5cb1fb19b
> --- /dev/null
> +++ b/target/linux/pistachio/generic/target.mk
> @@ -0,0 +1 @@
> +BOARDNAME:=Generic
> diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile
> index 5aa8a6dc55..2b65b9bcd3 100644
> --- a/target/linux/rb532/Makefile
> +++ b/target/linux/rb532/Makefile
> @@ -10,6 +10,7 @@ ARCH:=mipsel
>   BOARD:=rb532
>   BOARDNAME:=Mikrotik RouterBoard 532
>   FEATURES:=pci targz squashfs minor nand
> +SUBTARGETS:=generic
>   MAINTAINER:=Roman Yeryomin <roman at advem.lv>
>   
>   KERNEL_PATCHVER:=4.14
> diff --git a/target/linux/rb532/generic/target.mk b/target/linux/rb532/generic/target.mk
> new file mode 100644
> index 0000000000..f5cb1fb19b
> --- /dev/null
> +++ b/target/linux/rb532/generic/target.mk
> @@ -0,0 +1 @@
> +BOARDNAME:=Generic
> diff --git a/target/linux/tegra/Makefile b/target/linux/tegra/Makefile
> index db58bf53d1..a5b533af25 100644
> --- a/target/linux/tegra/Makefile
> +++ b/target/linux/tegra/Makefile
> @@ -12,6 +12,7 @@ BOARDNAME := NVIDIA Tegra
>   FEATURES := audio boot-part display ext4 fpu gpio pci pcie rootfs-part rtc squashfs usb
>   CPU_TYPE := cortex-a9
>   CPU_SUBTYPE := vfpv3
> +SUBTARGETS:=generic
>   MAINTAINER := Tomasz Maciej Nowak <tomek_n at o2.pl>
>   
>   KERNEL_PATCHVER := 4.19
> diff --git a/target/linux/tegra/generic/target.mk b/target/linux/tegra/generic/target.mk
> new file mode 100644
> index 0000000000..f5cb1fb19b
> --- /dev/null
> +++ b/target/linux/tegra/generic/target.mk
> @@ -0,0 +1 @@
> +BOARDNAME:=Generic
> diff --git a/target/linux/zynq/Makefile b/target/linux/zynq/Makefile
> index bcd36ffe2c..3566464450 100644
> --- a/target/linux/zynq/Makefile
> +++ b/target/linux/zynq/Makefile
> @@ -12,6 +12,7 @@ BOARDNAME:=Xilinx Zynq 7000 SoCs
>   FEATURES:=fpu gpio rtc usb usbgadget boot-part rootfs-part squashfs
>   CPU_TYPE:=cortex-a9
>   CPU_SUBTYPE:=neon
> +SUBTARGETS:=generic
>   MAINTAINER:=Jason Wu <jason.wu.misc at gmail.com>
>   
>   # future support SUBTARGETS: for both zynq and zynqmp
> diff --git a/target/linux/zynq/generic/target.mk b/target/linux/zynq/generic/target.mk
> new file mode 100644
> index 0000000000..f5cb1fb19b
> --- /dev/null
> +++ b/target/linux/zynq/generic/target.mk
> @@ -0,0 +1 @@
> +BOARDNAME:=Generic

_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list