[OpenWrt-Devel] [PATCH 6/8] mvebu: add vendor to device names

Hauke Mehrtens hauke at hauke-m.de
Fri May 3 15:00:25 PDT 2019


On 5/1/19 7:42 PM, Tomasz Maciej Nowak wrote:
> Replace SoC names with vendors in device names, in few cases, and add
> vendor to developemnt boards for easier identyfying potential firmware to
> flash.

Will sysupgrade still work after this rename? Isn't there some script
which checks if the image is compatible with the currently installed image?

> Signed-off-by: Tomasz Maciej Nowak <tomek_n at o2.pl>
> ---
>  package/boot/uboot-mvebu/Makefile      |  2 +-
>  target/linux/mvebu/image/Makefile      |  1 -
>  target/linux/mvebu/image/cortex-a53.mk |  4 +--
>  target/linux/mvebu/image/cortex-a72.mk | 12 +++----
>  target/linux/mvebu/image/cortex-a9.mk  | 44 +++++++++++++++-----------
>  5 files changed, 34 insertions(+), 29 deletions(-)
> 
> diff --git a/package/boot/uboot-mvebu/Makefile b/package/boot/uboot-mvebu/Makefile
> index 61547acb27..06c574594b 100644
> --- a/package/boot/uboot-mvebu/Makefile
> +++ b/package/boot/uboot-mvebu/Makefile
> @@ -24,7 +24,7 @@ endef
>  
>  define U-Boot/clearfog
>    NAME:=SolidRun ClearFog A1
> -  BUILD_DEVICES:=armada-388-clearfog-base armada-388-clearfog-pro
> +  BUILD_DEVICES:=solidrun-clearfog-base solidrun-clearfog-pro
>    BUILD_SUBTARGET:=cortexa9
>    UBOOT_IMAGE:=u-boot-spl.kwb
>  endef
> diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile
> index 240cc88642..fe74a12c65 100644
> --- a/target/linux/mvebu/image/Makefile
> +++ b/target/linux/mvebu/image/Makefile
> @@ -70,7 +70,6 @@ endef
>  
>  define Device/Default
>    PROFILES := Default
> -  DEVICE_DTS := $(1)
>    BOARD_NAME = $$(DEVICE_DTS)
>    KERNEL_NAME := zImage
>    KERNEL := kernel-bin | append-dtb | uImage none
> diff --git a/target/linux/mvebu/image/cortex-a53.mk b/target/linux/mvebu/image/cortex-a53.mk
> index a102f52481..4dd1e44665 100644
> --- a/target/linux/mvebu/image/cortex-a53.mk
> +++ b/target/linux/mvebu/image/cortex-a53.mk
> @@ -8,12 +8,12 @@ define Device/globalscale-espressobin
>  endef
>  TARGET_DEVICES += globalscale-espressobin
>  
> -define Device/armada-3720-db
> +define Device/marvell-armada-3720-db
>    $(call Device/Default-arm64)
>    DEVICE_TITLE := Marvell Armada 3720 Development Board DB-88F3720-DDR3
>    DEVICE_DTS := armada-3720-db
>    SUPPORTED_DEVICES := marvell,armada-3720-db
>  endef
> -TARGET_DEVICES += armada-3720-db
> +TARGET_DEVICES += marvell-armada-3720-db
>  
>  endif
> diff --git a/target/linux/mvebu/image/cortex-a72.mk b/target/linux/mvebu/image/cortex-a72.mk
> index 824f6b5d0f..3043f087cc 100644
> --- a/target/linux/mvebu/image/cortex-a72.mk
> +++ b/target/linux/mvebu/image/cortex-a72.mk
> @@ -1,30 +1,30 @@
>  ifeq ($(SUBTARGET),cortexa72)
>  
> -define Device/armada-macchiatobin
> +define Device/marvell-macchiatobin
>    $(call Device/Default-arm64)
>    DEVICE_TITLE := MACCHIATObin (SolidRun Armada 8040 Community Board)
>    DEVICE_PACKAGES += kmod-i2c-core kmod-i2c-mux kmod-i2c-mux-pca954x
>    DEVICE_DTS := armada-8040-mcbin
>    SUPPORTED_DEVICES := marvell,armada8040-mcbin
>  endef
> -TARGET_DEVICES += armada-macchiatobin
> +TARGET_DEVICES += marvell-macchiatobin
>  
> -define Device/armada-8040-db
> +define Device/marvell-armada-8040-db
>    $(call Device/Default-arm64)
>    DEVICE_TITLE := Marvell Armada 8040 DB board
>    DEVICE_DTS := armada-8040-db
>    IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
>    SUPPORTED_DEVICES := marvell,armada8040-db
>  endef
> -TARGET_DEVICES += armada-8040-db
> +TARGET_DEVICES += marvell-armada-8040-db
>  
> -define Device/armada-7040-db
> +define Device/marvell-armada-7040-db
>    $(call Device/Default-arm64)
>    DEVICE_TITLE := Marvell Armada 7040 DB board
>    DEVICE_DTS := armada-7040-db
>    IMAGE/sdcard.img.gz := boot-img-ext4 | sdcard-img-ext4 | gzip | append-metadata
>    SUPPORTED_DEVICES := marvell,armada7040-db
>  endef
> -TARGET_DEVICES += armada-7040-db
> +TARGET_DEVICES += marvell-armada-7040-db
>  
>  endif
> diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk
> index 252300b942..e5459dad1a 100644
> --- a/target/linux/mvebu/image/cortex-a9.mk
> +++ b/target/linux/mvebu/image/cortex-a9.mk
> @@ -61,57 +61,63 @@ define Device/linksys-wrt1900ac
>  endef
>  TARGET_DEVICES += linksys-wrt1900ac
>  
> -define Device/openblocks-ax3-4
> +define Device/plathome-openblocks-ax3-4
>    DEVICE_DTS := armada-xp-openblocks-ax3-4
> -  SUPPORTED_DEVICES := $(1)
> +  SUPPORTED_DEVICES := openblocks-ax3-4
>    BLOCKSIZE := 128k
>    PAGESIZE := 1
>    IMAGES += factory.img
>    IMAGE/factory.img := append-kernel | pad-to $$(BLOCKSIZE) | append-ubi
>    DEVICE_TITLE := Plat'Home OpenBlocks AX3
>  endef
> -TARGET_DEVICES += openblocks-ax3-4
> +TARGET_DEVICES += plathome-openblocks-ax3-4
>  
> -define Device/armada-385-db-ap
> +define Device/marvell-armada-385-db-ap
>    $(Device/NAND-256K)
> +  DEVICE_DTS := armada-385-db-ap
>    IMAGES += factory.img
>    KERNEL_SIZE := 8192k
>    DEVICE_TITLE := Marvell Armada 385 DB AP (DB-88F6820-AP)
>  endef
> -TARGET_DEVICES += armada-385-db-ap
> +TARGET_DEVICES += marvell-armada-385-db-ap
>  
> -define Device/armada-370-db
> +define Device/marvell-armada-370-db
>    $(Device/NAND-512K)
>    DEVICE_TITLE := Marvell Armada 370 DB (DB-88F6710-BP-DDR3)
> +  DEVICE_DTS := armada-370-db
>  endef
> -TARGET_DEVICES += armada-370-db
> +TARGET_DEVICES += marvell-armada-370-db
>  
> -define Device/armada-370-rd
> +define Device/marvell-armada-370-rd
>    $(Device/NAND-512K)
>    DEVICE_TITLE := Marvell Armada 370 RD (RD-88F6710-A1)
> +  DEVICE_DTS := armada-370-rd
>  endef
> -TARGET_DEVICES += armada-370-rd
> +TARGET_DEVICES += marvell-armada-370-rd
>  
> -define Device/armada-xp-db
> +define Device/marvell-armada-xp-db
>    $(Device/NAND-512K)
>    DEVICE_TITLE := Marvell Armada XP DB (DB-78460-BP)
> +  DEVICE_DTS := armada-xp-db
>  endef
> -TARGET_DEVICES += armada-xp-db
> +TARGET_DEVICES += marvell-armada-xp-db
>  
> -define Device/armada-xp-gp
> +define Device/marvell-armada-xp-gp
>    $(Device/NAND-512K)
>    DEVICE_TITLE := Marvell Armada XP GP (DB-MV784MP-GP)
> +  DEVICE_DTS := armada-xp-gp
>  endef
> -TARGET_DEVICES += armada-xp-gp
> +TARGET_DEVICES += marvell-armada-xp-gp
>  
> -define Device/armada-388-rd
> +define Device/marvell-armada-388-rd
>    DEVICE_TITLE := Marvell Armada 388 RD (RD-88F6820-AP)
> +  DEVICE_DTS := armada-388-rd
>    IMAGES := firmware.bin
>    IMAGE/firmware.bin := append-kernel | pad-to 256k | append-rootfs | pad-rootfs
>  endef
> -TARGET_DEVICES += armada-388-rd
> +TARGET_DEVICES += marvell-armada-388-rd
>  
> -define Device/armada-388-clearfog-pro
> +define Device/solidrun-clearfog-pro
>    KERNEL_INSTALL := 1
>    KERNEL := kernel-bin
>    DEVICE_TITLE := SolidRun ClearFog Pro
> @@ -123,9 +129,9 @@ define Device/armada-388-clearfog-pro
>    UBOOT := clearfog-u-boot-spl.kwb
>    BOOT_SCRIPT := clearfog
>  endef
> -TARGET_DEVICES += armada-388-clearfog-pro
> +TARGET_DEVICES += solidrun-clearfog-pro
>  
> -define Device/armada-388-clearfog-base
> +define Device/solidrun-clearfog-base
>    KERNEL_INSTALL := 1
>    KERNEL := kernel-bin
>    DEVICE_TITLE := SolidRun ClearFog Base
> @@ -136,7 +142,7 @@ define Device/armada-388-clearfog-base
>    UBOOT := clearfog-u-boot-spl.kwb
>    BOOT_SCRIPT := clearfog
>  endef
> -TARGET_DEVICES += armada-388-clearfog-base
> +TARGET_DEVICES += solidrun-clearfog-base
>  
>  define Device/globalscale-mirabox
>    $(Device/NAND-512K)
> 




More information about the openwrt-devel mailing list