X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fkirkwood%2Fimage%2FMakefile;h=0672ba03741cd87f58be0f2f470745be1e2e48ec;hb=80c61c161ac5943137ade233d62cf89d746de5a2;hp=d16615249c76397f47c084e4aa90783bcb0a3b43;hpb=b2943192155ee094ecd42df11181c5fb55fc19e6;p=openwrt%2Fstaging%2Fmkresin.git

diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index d16615249c..0672ba0374 100644
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -4,138 +4,152 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
+
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-NAND_BLOCKSIZE := 2048:128k
-
-define sanitize_profile_name
-$(shell echo $(PROFILE) | tr '[:upper:]' '[:lower:]')
+KERNEL_LOADADDR:=0x8000
+
+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_IN_UBI := 1
+
+  PAGESIZE := 2048
+  SUBPAGESIZE := 512
+  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 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) $(LINUX_DIR)/arch/arm/boot/dts/kirkwood-$(1).dtb $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb
-
-	$(CP) $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-zImage
-	cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb >> $(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-zImage
-	$(call Image/BuildKernel/MkuImage, \
-		none, 0x8000, 0x8000, \
-		$(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-zImage, \
-		$(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-uImage \
-	)
-
-  ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
-	$(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-zImage-initramfs
-	cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb >> $(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-zImage-initramfs
-	$(call Image/BuildKernel/MkuImage, \
-		none, 0x8000, 0x8000, \
-		$(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-zImage-initramfs, \
-		$(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-uImage-initramfs \
-	)
-  endif
- endif
+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/Template
-
- ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),)
-	$(INSTALL_DIR) $(TARGET_DIR)/boot
-   ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_UIMAGE),)
-	$(CP) $(BIN_DIR)/$(IMG_PREFIX)-uImage $(TARGET_DIR)/boot/
-	ln -sf $(IMG_PREFIX)-uImage $(TARGET_DIR)/boot/uImage
-   endif
-   ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_ZIMAGE),)
-	$(CP) $(BIN_DIR)/$(IMG_PREFIX)-zImage $(TARGET_DIR)/boot/
-	ln -sf $(IMG_PREFIX)-zImage $(TARGET_DIR)/boot/zImage
-   endif
- endif
-
- ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),)
-	$(INSTALL_DIR) $(TARGET_DIR)/boot
-  ifneq ($(1),)
-	$(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb $(TARGET_DIR)/boot/
-	ln -sf $(IMG_PREFIX)-$(1).dtb $(TARGET_DIR)/boot/$(1).dtb
-  endif
- endif
+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/jffs2-nand-2048-128k
-	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-$(1).img \
-		bs=2048 conv=sync
+define Device/cloudengines_pogoplugv4
+  DEVICE_TITLE := Cloud Engines Pogoplug V4
+  DEVICE_DTS := kirkwood-pogoplug-series-4
+  DEVICE_PACKAGES := kmod-usb3
 endef
+TARGET_DEVICES += cloudengines_pogoplugv4
 
-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)-$(call sanitize_profile_name)-$(1).img
+define Device/iom_iconnect-1.1
+  DEVICE_TITLE := Iomega Iconnect
+  DEVICE_DTS := kirkwood-iconnect
+  BOARD_NAME := iconnect
+  SUPPORTED_DEVICES += iconnect
 endef
-
-define Image/mkfs/targz
-
-	$(TAR) -czpf $(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-rootfs.tar.gz --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
+TARGET_DEVICES += iom_iconnect-1.1
+
+define Device/iom_ix2_200
+  DEVICE_TITLE := Iomega StorCenter ix2-200
+  DEVICE_DTS := kirkwood-iomega_ix2_200
+  DEVICE_PACKAGES += kmod-gpio-button-hotplug kmod-i2c-mv64xxx kmod-hwmon-lm63
+  DEVICE_TYPE:=nas
+  PAGESIZE := 512
+  SUBPAGESIZE := 256
+  BLOCKSIZE := 16KiB
+  KERNEL_SIZE := 3072k
+  KERNEL_IN_UBI := 0
+  UBINIZE_OPTS := -E 5  
+  IMAGE_SIZE := 32505856
+  IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE)
 endef
-
-define Image/Build/ubifs
-
- ifneq ($($(PROFILE)_UBIFS_OPTS),)
-	$(CP) $(KDIR)/root.ubifs $(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-rootfs.ubifs
- endif
+TARGET_DEVICES += iom_ix2_200
+
+define Device/linksys_audi
+  DEVICE_TITLE := Linksys EA3500 (Audi)
+  DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic kmod-gpio-button-hotplug
+  DEVICE_DTS := kirkwood-linksys-audi
+  KERNEL_SIZE := 2624k
+  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
-
-define Image/Build/ubi
-
- ifneq ($($(PROFILE)_UBI_OPTS),)
-	$(CP) $(KDIR)/root.ubi $(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-rootfs.ubi
- endif
+TARGET_DEVICES += linksys_audi
+
+define Device/linksys_viper
+  DEVICE_TITLE := Linksys E4200v2 / EA4500 (Viper)
+  DEVICE_PACKAGES := kmod-mwl8k swconfig wpad-basic kmod-gpio-button-hotplug
+  DEVICE_DTS := kirkwood-linksys-viper
+  KERNEL_SIZE := 2688k
+  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
 
-Image/BuildKernel/Template/Generic=$(call Image/BuildKernel/Template)
-Image/InstallKernel/Template/Generic=$(call Image/InstallKernel/Template)
-
-Image/BuildKernel/Template/DOCKSTAR=$(call Image/BuildKernel/Template,dockstar)
-Image/InstallKernel/Template/DOCKSTAR=$(call Image/InstallKernel/Template,dockstar)
+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
 
-Image/BuildKernel/Template/IB62X0=$(call Image/BuildKernel/Template,ib62x0)
-Image/InstallKernel/Template/IB62X0=$(call Image/InstallKernel/Template,ib62x0)
+define Device/seagate_dockstar
+  DEVICE_DTS := kirkwood-dockstar
+  DEVICE_TITLE := Seagate FreeAgent Dockstar
+  BOARD_NAME := dockstar
+  SUPPORTED_DEVICES += dockstar
+endef
+TARGET_DEVICES += seagate_dockstar
 
-Image/BuildKernel/Template/POGOE02=$(call Image/BuildKernel/Template,pogo_e02)
-Image/InstallKernel/Template/POGOE02=$(call Image/InstallKernel/Template,pogo_e02)
+define Device/seagate_goflexnet
+  DEVICE_TITLE := Seagate GoFlexNet
+  DEVICE_DTS := kirkwood-goflexnet
+  BOARD_NAME := goflexnet
+  SUPPORTED_DEVICES += goflexnet
+endef
+TARGET_DEVICES += seagate_goflexnet
 
-define Image/BuildKernel
-	$(call Image/BuildKernel/Template/$(PROFILE))
+define Device/seagate_goflexhome
+  DEVICE_TITLE := Seagate GoFlexHome
+  DEVICE_DTS := kirkwood-goflexhome
+  BOARD_NAME := goflexhome
+  SUPPORTED_DEVICES += goflexhome
 endef
+TARGET_DEVICES += seagate_goflexhome
 
-define Image/InstallKernel
-	$(call Image/InstallKernel/Template/$(PROFILE))
+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
-	$(if $(Image/Build/$(1)), \
-		$(call Image/Build/$(1),$(1)), \
-		$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-$(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
+TARGET_DEVICES += zyxel_nsa325
 
 $(eval $(call BuildImage))