X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fkirkwood%2Fimage%2FMakefile;h=2c4ad208f2740c3c54a406c27a88a896e1506495;hb=49e81f9fe4bc6f060a74f5505eca2a1767058b0b;hp=217ec234b41cdc213c7f110283f2fec6ce3d0a96;hpb=33c8d35375706457768d32155f10e7df196e9a65;p=openwrt%2Fopenwrt.git diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile index 217ec234b4..2c4ad208f2 100644 --- a/target/linux/kirkwood/image/Makefile +++ b/target/linux/kirkwood/image/Makefile @@ -10,14 +10,14 @@ 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 +TARGET_DEVICES = linksys-audi linksys-viper dockstar goflexnet goflexhome iconnect pogo_e02 ib62x0 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 @@ -26,148 +26,69 @@ define Device/Default PAGESIZE := 2048 SUBPAGESIZE := 512 - BLOCKSIZE := 128KiB + BLOCKSIZE := 128k IMAGES := sysupgrade.tar - IMAGE/sysupgrade.tar := sysupgrade-nand + UBINIZE_OPTS := -E 5 + IMAGE/sysupgrade.tar := sysupgrade-tar endef define Device/dockstar DEVICE_DTS := kirkwood-dockstar FILESYSTEMS := squashfs - PROFILES := Generic DOCKSTAR + DEVICE_TITLE := Seagate FreeAgent Dockstar IMAGES += factory.bin IMAGE/factory.bin := append-ubi KERNEL_IN_UBI := 1 - KERNEL := kernel-bin | append-dtb endef define Device/goflexnet $(Device/dockstar) - PROFILES := Generic GOFLEXNET + DEVICE_TITLE := Seagate GoFlexNet DEVICE_DTS := kirkwood-goflexnet endef define Device/goflexhome $(Device/dockstar) - PROFILES := Generic GOFLEXHOME + DEVICE_TITLE := Seagate GoFlexHome DEVICE_DTS := kirkwood-goflexhome endef 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 + IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi endef 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 + IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi 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) $(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 -endef - -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 -endef - -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 -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)) +define Device/iconnect +$(Device/dockstar) + DEVICE_TITLE := Iomega Iconnect + DEVICE_DTS := kirkwood-iconnect endef -define Image/InstallKernel - $(call Image/InstallKernel/Template/$(PROFILE)) +define Device/pogo_e02 +$(Device/dockstar) + DEVICE_TITLE := Cloud Engines Pogoplug E02 + DEVICE_DTS := kirkwood-pogo_e02 endef -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/ib62x0 +$(Device/dockstar) + DEVICE_TITLE := RaidSonic ICY BOX IB-NAS62x0 + DEVICE_DTS := kirkwood-ib62x0 endef $(eval $(call BuildImage))