KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kirkwood: sync image filename with boardname

Browse source 
Use <manufacturer>_<modelname> as image name.

Use the BOARD_NAME variable to ensure that the former used boardname is
still used as the subdirectory name for the sysupgrade-tar image, to
not break sysupgrade from earlier versions.

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2017-12-28 10:39:19 +01:00
parent c9e2c35f46
commit f5df635ccf
2 changed files with 53 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
package/boot/uboot-kirkwood/Makefile
View file

@ -17,53 +17,61 @@ include $(INCLUDE_DIR)/package.mk
define U-Boot/Default define U-Boot/Default
BUILD_TARGET:=kirkwood BUILD_TARGET:=kirkwood
BUILD_DEVICES:=$(patsubst %_second_stage,%,$(1))
endef endef
define U-Boot/dockstar define U-Boot/dockstar
NAME:=Seagate DockStar NAME:=Seagate DockStar
BUILD_DEVICES:=seagate_dockstar
endef endef
define U-Boot/dockstar_second_stage define U-Boot/dockstar_second_stage
NAME:=Seagate DockStar (second stage) NAME:=Seagate DockStar (second stage)
BUILD_DEVICES:=seagate_dockstar
endef endef
define U-Boot/goflexhome define U-Boot/goflexhome
NAME:=the Seagate GoFlexHome/GoFlexNet NAME:=the Seagate GoFlexHome/GoFlexNet
BUILD_DEVICES+=goflexnet BUILD_DEVICES:=seagate_goflexhome seagate_goflexnet
endef endef
define U-Boot/ib62x0 define U-Boot/ib62x0
NAME:=RaidSonic ICY BOX NAS6210 and NAS6220 NAME:=RaidSonic ICY BOX NAS6210 and NAS6220
BUILD_DEVICES:=raidsonic_ib-nas62x0
endef endef
define U-Boot/ib62x0_second_stage define U-Boot/ib62x0_second_stage
NAME:=RaidSonic ICY BOX NAS6210 and NAS6220 (second stage) NAME:=RaidSonic ICY BOX NAS6210 and NAS6220 (second stage)
BUILD_DEVICES:=raidsonic_ib-nas62x0
endef endef
define U-Boot/iconnect define U-Boot/iconnect
NAME:=Iomega iConnect Wireless NAME:=Iomega iConnect Wireless
BUILD_DEVICES:=iom_iconnect-1.1
endef endef
define U-Boot/iconnect_second_stage define U-Boot/iconnect_second_stage
NAME:=Iomega iConnect Wireless (second stage) NAME:=Iomega iConnect Wireless (second stage)
BUILD_DEVICES:=iom_iconnect-1.1
endef endef
define U-Boot/nsa310 define U-Boot/nsa310
NAME:=Zyxel NSA310 NAME:=Zyxel NSA310
BUILD_DEVICES:=nsa310b BUILD_DEVICES:=zyxel_nsa310b
endef endef
define U-Boot/nsa325 define U-Boot/nsa325
NAME:=Zyxel NSA325v1 and v2 NAME:=Zyxel NSA325v1 and v2
BUILD_DEVICES:=zyxel_nsa325
endef endef
define U-Boot/pogo_e02 define U-Boot/pogo_e02
NAME:=Cloud Engines Pogoplug E02 NAME:=Cloud Engines Pogoplug E02
BUILD_DEVICES:=cloudengines_pogoe02
endef endef
define U-Boot/pogo_e02_second_stage define U-Boot/pogo_e02_second_stage
NAME:=Cloud Engines Pogoplug E02 (second stage) NAME:=Cloud Engines Pogoplug E02 (second stage)
BUILD_DEVICES:=cloudengines_pogoe02
endef endef
UBOOT_TARGETS := \ UBOOT_TARGETS := \

76
target/linux/kirkwood/image/Makefile
View file

@ -24,31 +24,34 @@ define Device/Default
IMAGES := sysupgrade.bin factory.bin IMAGES := sysupgrade.bin factory.bin
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
IMAGE/factory.bin := append-ubi IMAGE/factory.bin := append-ubi
SUPPORTED_DEVICES := $(1) SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
endef endef
define Device/dockstar define Device/seagate_dockstar
DEVICE_DTS := kirkwood-dockstar DEVICE_DTS := kirkwood-dockstar
DEVICE_TITLE := Seagate FreeAgent Dockstar DEVICE_TITLE := Seagate FreeAgent Dockstar
SUPPORTED_DEVICES += seagate,dockstar BOARD_NAME := dockstar
SUPPORTED_DEVICES += dockstar
endef endef
TARGET_DEVICES += dockstar TARGET_DEVICES += seagate_dockstar
define Device/goflexnet define Device/seagate_goflexnet
DEVICE_TITLE := Seagate GoFlexNet DEVICE_TITLE := Seagate GoFlexNet
DEVICE_DTS := kirkwood-goflexnet DEVICE_DTS := kirkwood-goflexnet
SUPPORTED_DEVICES += seagate,goflexnet BOARD_NAME := goflexnet
SUPPORTED_DEVICES += goflexnet
endef endef
TARGET_DEVICES += goflexnet TARGET_DEVICES += seagate_goflexnet
define Device/goflexhome define Device/seagate_goflexhome
DEVICE_TITLE := Seagate GoFlexHome DEVICE_TITLE := Seagate GoFlexHome
DEVICE_DTS := kirkwood-goflexhome DEVICE_DTS := kirkwood-goflexhome
SUPPORTED_DEVICES += seagate,goflexhome BOARD_NAME := goflexhome
SUPPORTED_DEVICES += goflexhome
endef endef
TARGET_DEVICES += goflexhome TARGET_DEVICES += seagate_goflexhome
define Device/linksys-audi define Device/linksys_audi
DEVICE_TITLE := Linksys EA3500 (Audi) DEVICE_TITLE := Linksys EA3500 (Audi)
DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-mini DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-mini
DEVICE_DTS := kirkwood-linksys-audi DEVICE_DTS := kirkwood-linksys-audi
@ -56,11 +59,12 @@ define Device/linksys-audi
KERNEL_IN_UBI := 0 KERNEL_IN_UBI := 0
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
SUPPORTED_DEVICES += linksys,audi BOARD_NAME := linksys-audi
SUPPORTED_DEVICES += linksys-audi
endef endef
TARGET_DEVICES += linksys-audi TARGET_DEVICES += linksys_audi
define Device/linksys-viper define Device/linksys_viper
DEVICE_TITLE := Linksys E4200v2 / EA4500 (Viper) DEVICE_TITLE := Linksys E4200v2 / EA4500 (Viper)
DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-mini DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-mini
DEVICE_DTS := kirkwood-linksys-viper DEVICE_DTS := kirkwood-linksys-viper
@ -68,34 +72,36 @@ define Device/linksys-viper
KERNEL_IN_UBI := 0 KERNEL_IN_UBI := 0
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
SUPPORTED_DEVICES += linksys,viper BOARD_NAME := linksys-viper
SUPPORTED_DEVICES += linksys-viper
endef endef
TARGET_DEVICES += linksys-viper TARGET_DEVICES += linksys_viper
define Device/iconnect define Device/iom_iconnect-1.1
DEVICE_TITLE := Iomega Iconnect DEVICE_TITLE := Iomega Iconnect
DEVICE_DTS := kirkwood-iconnect DEVICE_DTS := kirkwood-iconnect
SUPPORTED_DEVICES += iom,iconnect-1.1 BOARD_NAME := iconnect
SUPPORTED_DEVICES += iconnect
endef endef
TARGET_DEVICES += iconnect TARGET_DEVICES += iom_iconnect-1.1
define Device/nsa310b define Device/zyxel_nsa310b
DEVICE_TITLE := ZyXEL NSA310b DEVICE_TITLE := ZyXEL NSA310b
DEVICE_DTS := kirkwood-nsa310b DEVICE_DTS := kirkwood-nsa310b
DEVICE_PACKAGES := kmod-r8169 kmod-gpio-button-hotplug kmod-hwmon-lm85 DEVICE_PACKAGES := kmod-r8169 kmod-gpio-button-hotplug kmod-hwmon-lm85
SUPPORTED_DEVICES += zyxel,nsa310b BOARD_NAME := nsa310b
endef endef
TARGET_DEVICES += nsa310b TARGET_DEVICES += zyxel_nsa310b
define Device/nsa325 define Device/zyxel_nsa325
DEVICE_TITLE := ZyXEL NSA325 (v1 and v2) DEVICE_TITLE := ZyXEL NSA325 (v1 and v2)
DEVICE_DTS := kirkwood-nsa325 DEVICE_DTS := kirkwood-nsa325
DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-rtc-pcf8563 kmod-usb3 DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-rtc-pcf8563 kmod-usb3
SUPPORTED_DEVICES += zyxel,nsa325 BOARD_NAME := nsa325
endef endef
TARGET_DEVICES += nsa325 TARGET_DEVICES += zyxel_nsa325
define Device/on100 define Device/cisco_on100
DEVICE_TITLE := Cisco Systems ON100 DEVICE_TITLE := Cisco Systems ON100
DEVICE_DTS := kirkwood-on100 DEVICE_DTS := kirkwood-on100
DEVICE_PACKAGES := kmod-i2c-mv64xxx DEVICE_PACKAGES := kmod-i2c-mv64xxx
@ -103,22 +109,24 @@ define Device/on100
KERNEL_IN_UBI := 0 KERNEL_IN_UBI := 0
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
SUPPORTED_DEVICES := cisco,on100 BOARD_NAME := on100
endef endef
TARGET_DEVICES += on100 TARGET_DEVICES += cisco_on100
define Device/pogo_e02 define Device/cloudengines_pogoe02
DEVICE_TITLE := Cloud Engines Pogoplug E02 DEVICE_TITLE := Cloud Engines Pogoplug E02
DEVICE_DTS := kirkwood-pogo_e02 DEVICE_DTS := kirkwood-pogo_e02
SUPPORTED_DEVICES += cloudengines,pogoe02 BOARD_NAME := pogo_e02
SUPPORTED_DEVICES += pogo_e02
endef endef
TARGET_DEVICES += pogo_e02 TARGET_DEVICES += cloudengines_pogoe02
define Device/ib62x0 define Device/raidsonic_ib-nas62x0
DEVICE_TITLE := RaidSonic ICY BOX IB-NAS62x0 DEVICE_TITLE := RaidSonic ICY BOX IB-NAS62x0
DEVICE_DTS := kirkwood-ib62x0 DEVICE_DTS := kirkwood-ib62x0
SUPPORTED_DEVICES += raidsonic,ib-nas62x0 BOARD_NAME := ib62x0
SUPPORTED_DEVICES += ib62x0
endef endef
TARGET_DEVICES += ib62x0 TARGET_DEVICES += raidsonic_ib-nas62x0
$(eval $(call BuildImage)) $(eval $(call BuildImage))