[OpenWrt-Devel] [PATCH] mvebu/cortexa9: use Linksys codename as PROFILE

[Daniel Golle]

On Tue, Mar 31, 2020 at 01:20:09PM -1000, Paul Spooren wrote:
> The PROFILE names of mvebu/cortexa9/Linksys devices are based on the
> consumer names (like linksys_wrt1200ac) instead of the vendor codenames
> (like linksys_caiman) which are however used in the rest of the build
> system (plathform.sh, bootcount, 01_leds).
> 
> A running device is not able to know the profile used for its firmware
> creation as `/tmp/sysinfo/board_name` points to the device tree
> identifier (equal to Linksys codename) and `/tmp/sysinfo/model` is not
> deterministically *convertible* to the PROFILE name.
> 
> The introduction of ALT titles (4ee3cf2b5a) allows to store consumer
> names and make them available in the `menuconfig` so the profile name is
> transparent to regular users.
> 
> This patch changes the mvebu/cortexa9/Linksys PROFILES to use the device
> tree identifier aka Linksys codename as PROFILE name and uses the
> consumer name as ALT title.
> 
> Device tree identifier and PROFILE are now identical except for a `,`
> replacement with `_`, which is due to Makefile naming limitations.
> 
> Signed-off-by: Paul Spooren <mail at aparcar.org>

Reviewed-by: Daniel Golle <daniel at makrotopia.org>

> ---
> This is just a first step, we should follow the device tree identifier
> for all other PROFILE as well.
> 
>  target/linux/mvebu/image/cortexa9.mk | 56 ++++++++++++++--------------
>  1 file changed, 28 insertions(+), 28 deletions(-)
> 
> diff --git a/target/linux/mvebu/image/cortexa9.mk b/target/linux/mvebu/image/cortexa9.mk
> index 85bfa94dbd..53fc7c84b3 100644
> --- a/target/linux/mvebu/image/cortexa9.mk
> +++ b/target/linux/mvebu/image/cortexa9.mk
> @@ -42,80 +42,80 @@ define Device/linksys
>    KERNEL_SIZE := 6144k
>  endef
>  
> -define Device/linksys_wrt1200ac
> +define Device/linksys_caiman
>    $(call Device/linksys)
> -  DEVICE_MODEL := WRT1200AC
> +  DEVICE_MODEL := Caiman
>    DEVICE_ALT0_VENDOR := Linksys
> -  DEVICE_ALT0_MODEL := Caiman
> +  DEVICE_ALT0_MODEL := WRT1200AC
>    DEVICE_DTS := armada-385-linksys-caiman
>    DEVICE_PACKAGES += mwlwifi-firmware-88w8864
>    SUPPORTED_DEVICES := armada-385-linksys-caiman linksys,caiman
>  endef
> -TARGET_DEVICES += linksys_wrt1200ac
> +TARGET_DEVICES += linksys_caiman
>  
> -define Device/linksys_wrt1900acs
> +define Device/linksys_shelby
>    $(call Device/linksys)
> -  DEVICE_MODEL := WRT1900ACS
> -  DEVICE_VARIANT := v1
> +  DEVICE_MODEL := Shelby
> +  DEVICE_ALT0_VENDOR := Linksys
> +  DEVICE_ALT0_MODEL := WRT1900ACS
> +  DEVICE_ALT0_VARIANT := v1
>    DEVICE_ALT0_VENDOR := Linksys
>    DEVICE_ALT0_MODEL := WRT1900ACS
>    DEVICE_ALT0_VARIANT := v2
> -  DEVICE_ALT1_VENDOR := Linksys
> -  DEVICE_ALT1_MODEL := Shelby
>    DEVICE_DTS := armada-385-linksys-shelby
>    DEVICE_PACKAGES += mwlwifi-firmware-88w8864
>    SUPPORTED_DEVICES := armada-385-linksys-shelby linksys,shelby
>  endef
> -TARGET_DEVICES += linksys_wrt1900acs
> +TARGET_DEVICES += linksys_shelby
>  
> -define Device/linksys_wrt1900ac
> +define Device/linksys_mamba
>    $(call Device/linksys)
> -  DEVICE_MODEL := WRT1900AC
> -  DEVICE_VARIANT := v1
> +  DEVICE_MODEL := Mamba
>    DEVICE_ALT0_VENDOR := Linksys
> -  DEVICE_ALT0_MODEL := Mamba
> +  DEVICE_ALT0_MODEL :=  WRT1900AC
> +  DEVICE_ALT0_VARIANT := v1
>    DEVICE_DTS := armada-xp-linksys-mamba
>    DEVICE_PACKAGES += mwlwifi-firmware-88w8864
>    KERNEL_SIZE := 3072k
>    SUPPORTED_DEVICES := armada-xp-linksys-mamba linksys,mamba
>  endef
> -TARGET_DEVICES += linksys_wrt1900ac
> +TARGET_DEVICES += linksys_mamba
>  
> -define Device/linksys_wrt1900acv2
> +define Device/linksys_cobra
>    $(call Device/linksys)
> -  DEVICE_MODEL := WRT1900AC
> -  DEVICE_VARIANT := v2
> +  DEVICE_MODEL := Cobra
>    DEVICE_ALT0_VENDOR := Linksys
> -  DEVICE_ALT0_MODEL := Cobra
> +  DEVICE_ALT0_MODEL := WRT1900AC
> +  DEVICE_ALT0VARIANT := v2
>    DEVICE_DTS := armada-385-linksys-cobra
>    DEVICE_PACKAGES += mwlwifi-firmware-88w8864
>    SUPPORTED_DEVICES := armada-385-linksys-cobra linksys,cobra
>  endef
> -TARGET_DEVICES += linksys_wrt1900acv2
> +TARGET_DEVICES += linksys_cobra
>  
> -define Device/linksys_wrt3200acm
> +define Device/linksys_rango
>    $(call Device/linksys)
> -  DEVICE_MODEL := WRT3200ACM
> +  DEVICE_MODEL := Rango
>    DEVICE_ALT0_VENDOR := Linksys
> -  DEVICE_ALT0_MODEL := Rango
> +  DEVICE_ALT0_MODEL := WRT3200ACM
>    DEVICE_DTS := armada-385-linksys-rango
>    DEVICE_PACKAGES += kmod-btmrvl kmod-mwifiex-sdio mwlwifi-firmware-88w8964
>    SUPPORTED_DEVICES := armada-385-linksys-rango linksys,rango
>  endef
> -TARGET_DEVICES += linksys_wrt3200acm
> +TARGET_DEVICES += linksys_rango
>  
> -define Device/linksys_wrt32x
> +define Device/linksys_venom
>    $(call Device/linksys)
> -  DEVICE_MODEL := WRT32X
> +  DEVICE_MODEL := Venom
>    DEVICE_ALT0_VENDOR := Linksys
> -  DEVICE_ALT0_MODEL := Venom
> +  DEVICE_ALT0_MODEL := WRT32X
>    DEVICE_DTS := armada-385-linksys-venom
>    DEVICE_PACKAGES += kmod-btmrvl kmod-mwifiex-sdio mwlwifi-firmware-88w8964
>    KERNEL_SIZE := 3072k
>    KERNEL := kernel-bin | append-dtb
>    SUPPORTED_DEVICES := armada-385-linksys-venom linksys,venom
>  endef
> -TARGET_DEVICES += linksys_wrt32x
> +TARGET_DEVICES += linksys_venom
>  
>  define Device/marvell_a370-db
>    $(Device/NAND-512K)
> -- 
> 2.25.1
> 
> 
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel

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