X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fkirkwood%2Fimage%2FMakefile;h=aceeb9b5764f00b087adf7c5bc2ee741adbeb9ce;hp=1b979b78dc93412fb1ff9f01a9094e93647ce8df;hb=f5df635ccf5162872044b2ade03f0879735e76fb;hpb=650afe412b3713ded698b1a4028acb1ad0c9d1da

diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index 1b979b78dc..aceeb9b576 100644
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -5,169 +5,128 @@
 # See /LICENSE for more information.
 #
 
-NAND_BLOCKSIZE := 2048-128k
-
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-DEVICE_VARS += KERNEL_SIZE
 KERNEL_LOADADDR:=0x8000
-TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome
-
-UBI_OPTS:="-m 2048 -p 128KiB -s 512"
-UBIFS_OPTS:="-m 2048 -e 126KiB -c 4096"
 
 define Device/Default
+  PROFILES := Default
   KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
   KERNEL := kernel-bin | append-dtb | uImage none
   KERNEL_NAME := zImage
   KERNEL_SUFFIX  := -uImage
-  KERNEL_INSTALL := 1
+  KERNEL_IN_UBI := 1
 
   PAGESIZE := 2048
   SUBPAGESIZE := 512
-  BLOCKSIZE := 128KiB
-  IMAGES := sysupgrade.tar
-  IMAGE/sysupgrade.tar := sysupgrade-nand
+  BLOCKSIZE := 128k
+  IMAGES := sysupgrade.bin factory.bin
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  IMAGE/factory.bin := append-ubi
+  SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
 endef
 
-define Device/dockstar
+define Device/seagate_dockstar
   DEVICE_DTS := kirkwood-dockstar
-  FILESYSTEMS := squashfs
-  PROFILES := Generic DOCKSTAR
-  IMAGES += factory.bin
-  IMAGE/factory.bin := append-ubi
-  KERNEL_IN_UBI := 1
-  KERNEL := kernel-bin | append-dtb
+  DEVICE_TITLE := Seagate FreeAgent Dockstar
+  BOARD_NAME := dockstar
+  SUPPORTED_DEVICES += dockstar
 endef
+TARGET_DEVICES += seagate_dockstar
 
-define Device/goflexnet
-$(Device/dockstar)
-  PROFILES := Generic GOFLEXNET
+define Device/seagate_goflexnet
+  DEVICE_TITLE := Seagate GoFlexNet
   DEVICE_DTS := kirkwood-goflexnet
+  BOARD_NAME := goflexnet
+  SUPPORTED_DEVICES += goflexnet
 endef
+TARGET_DEVICES += seagate_goflexnet
 
-define Device/goflexhome
-$(Device/dockstar)
-  PROFILES := Generic GOFLEXHOME
+define Device/seagate_goflexhome
+  DEVICE_TITLE := Seagate GoFlexHome
   DEVICE_DTS := kirkwood-goflexhome
+  BOARD_NAME := goflexhome
+  SUPPORTED_DEVICES += goflexhome
 endef
+TARGET_DEVICES += seagate_goflexhome
 
-define Device/linksys-audi
+define Device/linksys_audi
+  DEVICE_TITLE := Linksys EA3500 (Audi)
+  DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-mini
   DEVICE_DTS := kirkwood-linksys-audi
   KERNEL_SIZE := 2624k
-  FILESYSTEMS := squashfs
-  PROFILES := Generic AUDI
-  IMAGES += factory.bin
-  IMAGE/factory.bin := append-kernel $$$$(KERNEL_SIZE) | append-ubi
+  KERNEL_IN_UBI := 0
+  UBINIZE_OPTS := -E 5
+  IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
+  BOARD_NAME := linksys-audi
+  SUPPORTED_DEVICES += linksys-audi
 endef
+TARGET_DEVICES += linksys_audi
 
-define Device/linksys-viper
+define Device/linksys_viper
+  DEVICE_TITLE := Linksys E4200v2 / EA4500 (Viper)
+  DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-mini
   DEVICE_DTS := kirkwood-linksys-viper
   KERNEL_SIZE := 2688k
-  FILESYSTEMS := squashfs
-  PROFILES := Generic VIPER
-  IMAGES += factory.bin
-  IMAGE/factory.bin := append-kernel $$$$(KERNEL_SIZE) | append-ubi
+  KERNEL_IN_UBI := 0
+  UBINIZE_OPTS := -E 5
+  IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
+  BOARD_NAME := linksys-viper
+  SUPPORTED_DEVICES += linksys-viper
 endef
+TARGET_DEVICES += linksys_viper
 
-define Image/BuildKernel/Template
-
-	$(CP) $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage
-	echo -ne '\x00\x00\x00\x00' >> $(BIN_DIR)/$(IMG_PREFIX)-zImage
-	$(call Image/BuildKernel/MkuImage, \
-		none, 0x8000, 0x8000, \
-		$(BIN_DIR)/$(IMG_PREFIX)-zImage, \
-		$(BIN_DIR)/$(IMG_PREFIX)-uImage \
-	)
-
- ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
-	$(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
-	echo -ne '\x00\x00\x00\x00' >> $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
-	$(call Image/BuildKernel/MkuImage, \
-		none, 0x8000, 0x8000, \
-		$(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs, \
-		$(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs \
-	)
- endif
-
- ifneq ($(1),)
-	$(CP) $(DTS_DIR)/kirkwood-$(1).dtb $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb
-
-	$(CP) $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-zImage
-	cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb >> $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-zImage
-	$(call Image/BuildKernel/MkuImage, \
-		none, 0x8000, 0x8000, \
-		$(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-zImage, \
-		$(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-uImage \
-	)
-
-  ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
-	$(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-zImage-initramfs
-	cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb >> $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-zImage-initramfs
-	$(call Image/BuildKernel/MkuImage, \
-		none, 0x8000, 0x8000, \
-		$(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-zImage-initramfs, \
-		$(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-uImage-initramfs \
-	)
-  endif
- endif
+define Device/iom_iconnect-1.1
+  DEVICE_TITLE := Iomega Iconnect
+  DEVICE_DTS := kirkwood-iconnect
+  BOARD_NAME := iconnect
+  SUPPORTED_DEVICES += iconnect
 endef
+TARGET_DEVICES += iom_iconnect-1.1
 
-define Image/Build/jffs2-nand-2048-128k
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-$(1).img \
-		bs=2048 conv=sync
+define Device/zyxel_nsa310b
+  DEVICE_TITLE := ZyXEL NSA310b
+  DEVICE_DTS := kirkwood-nsa310b
+  DEVICE_PACKAGES := kmod-r8169 kmod-gpio-button-hotplug kmod-hwmon-lm85
+  BOARD_NAME := nsa310b
 endef
+TARGET_DEVICES += zyxel_nsa310b
 
-define Image/Build/squashfs
-	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-	( \
-		dd if=$(KDIR)/zImage bs=4096k conv=sync; \
-		dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
-	) > $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-$(1).img
+define Device/zyxel_nsa325
+  DEVICE_TITLE := ZyXEL NSA325 (v1 and v2)
+  DEVICE_DTS := kirkwood-nsa325
+  DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-rtc-pcf8563 kmod-usb3
+  BOARD_NAME := nsa325
 endef
-
-define Image/Build/ubifs
-
- ifneq ($($(PROFILE)_UBIFS_OPTS),)
-	$(CP) $(KDIR)/root.ubifs $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-rootfs.ubifs
- endif
-endef
-
-define Image/Build/ubi
-
- ifneq ($($(PROFILE)_UBI_OPTS),)
-	$(CP) $(KDIR)/root.ubi $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-rootfs.ubi
- endif
-endef
-
-IOMEGA_IX2_200_UBIFS_OPTS:="-m 512 -e 15872 -c 2048"
-IOMEGA_IX2_200_UBI_OPTS:="-m 512 -p 16384 -s 256"
-
-Image/BuildKernel/Template/Generic=$(call Image/BuildKernel/Template)
-Image/BuildKernel/Template/IB62X0=$(call Image/BuildKernel/Template,ib62x0)
-Image/BuildKernel/Template/ICONNECT=$(call Image/BuildKernel/Template,iconnect)
-Image/BuildKernel/Template/IOMEGA_IX2_200=$(call Image/BuildKernel/Template,iomega_ix2_200)
-Image/BuildKernel/Template/NSA310S=$(call Image/BuildKernel/Template,nsa310s)
-Image/BuildKernel/Template/POGOE02=$(call Image/BuildKernel/Template,pogo_e02)
-Image/BuildKernel/Template/SHEEVAPLUG=$(call Image/BuildKernel/Template,sheevaplug)
-Image/BuildKernel/Template/SHEEVAPLUGSATA=$(call Image/BuildKernel/Template,sheevaplug-esata)
-Image/BuildKernel/Template/GuruplugServerPlus=$(call Image/BuildKernel/Template,guruplug-server-plus)
-Image/BuildKernel/Template/Topkick1281P2=$(call Image/BuildKernel/Template,topkick)
-
-define Image/BuildKernel
-	$(call Image/BuildKernel/Template/$(PROFILE))
+TARGET_DEVICES += zyxel_nsa325
+
+define Device/cisco_on100
+  DEVICE_TITLE := Cisco Systems ON100
+  DEVICE_DTS := kirkwood-on100
+  DEVICE_PACKAGES := kmod-i2c-mv64xxx
+  KERNEL_SIZE := 5376k
+  KERNEL_IN_UBI := 0
+  UBINIZE_OPTS := -E 5
+  IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
+  BOARD_NAME := on100
 endef
+TARGET_DEVICES += cisco_on100
 
-define Image/InstallKernel
-	$(call Image/InstallKernel/Template/$(PROFILE))
+define Device/cloudengines_pogoe02
+  DEVICE_TITLE := Cloud Engines Pogoplug E02
+  DEVICE_DTS := kirkwood-pogo_e02
+  BOARD_NAME := pogo_e02
+  SUPPORTED_DEVICES += pogo_e02
 endef
+TARGET_DEVICES += cloudengines_pogoe02
 
-define Image/Build
-	$(if $(Image/Build/$(1)), \
-		$(call Image/Build/$(1),$(1)), \
-		$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-$(1).img \
-	)
+define Device/raidsonic_ib-nas62x0
+  DEVICE_TITLE := RaidSonic ICY BOX IB-NAS62x0
+  DEVICE_DTS := kirkwood-ib62x0
+  BOARD_NAME := ib62x0
+  SUPPORTED_DEVICES += ib62x0
 endef
+TARGET_DEVICES += raidsonic_ib-nas62x0
 
 $(eval $(call BuildImage))