X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fmpc85xx%2Fimage%2FMakefile;h=349d2961dee22e8550f9a6ea0899b4248e8c6ab8;hp=ae8b8374b2fda321775fd0c14e431970ee0f1858;hb=80c61c161ac5943137ade233d62cf89d746de5a2;hpb=2d9d3e7163deb2e6eac036587f63201eaa23c9d9

diff --git a/target/linux/mpc85xx/image/Makefile b/target/linux/mpc85xx/image/Makefile
index ae8b8374b2..349d2961de 100644
--- a/target/linux/mpc85xx/image/Makefile
+++ b/target/linux/mpc85xx/image/Makefile
@@ -1,75 +1,69 @@
 #
-# Copyright (C) 2010 OpenWrt.org
-#
 # 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
 
-define imgname
-$(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
-endef
+DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT
 
-define sysupname
-$(call imgname,$(1),$(2))-sysupgrade.bin
+define Device/Default
+  PROFILES := Default
+  DEVICE_DTS := $(1)
+  KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
+  KERNEL_ENTRY := 0x00000000
+  KERNEL_LOADADDR := 0x00000000
+  KERNEL := kernel-bin
 endef
 
-define factoryname
-$(call imgname,$(1),$(2))-factory.bin
+define Build/tplink-v1-image
+	$(STAGING_DIR_HOST)/bin/mktplinkfw \
+		-H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) \
+		-N "$(VERSION_DIST)" -V $(REVISION) \
+		-k $(IMAGE_KERNEL) \
+		-r $(IMAGE_ROOTFS) \
+		-j \
+		$(1) \
+		-o $@
 endef
 
-zImage:=$(BIN_DIR)/$(IMG_PREFIX)-zImage
+ifeq ($(SUBTARGET),generic)
 
-DTS_TARGETS = mpc8548cds_32b p1010rdb-pa tl-wdr4900-v1 p1020rdb
-
-define Image/BuildKernel
-	cp $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage
-	$(foreach dts,$(DTS_TARGETS),
-		$(LINUX_DIR)/scripts/dtc/dtc -I dts -O dtb $(DTS_DIR)/$(dts).dts > $(BIN_DIR)/$(IMG_PREFIX)-$(dts).fdt
-	)
+define Device/tl-wdr4900-v1
+  DEVICE_TITLE := TP-Link TL-WDR4900
+  DEVICE_PACKAGES := kmod-ath9k wpad-basic
+  TPLINK_HWID := 0x49000001
+  TPLINK_HWREV := 1
+  TPLINK_FLASHLAYOUT := 16Mppc
+  KERNEL_NAME := cuImage.tl-wdr4900-v1
+  SUPPORTED_DEVICES:=tl-wdr4900-v1 tplink,tl-wdr4900-v1
+  IMAGES := fdt.bin factory.bin sysupgrade.bin
+  IMAGE/fdt.bin := append-dtb
+  IMAGE/factory.bin := tplink-v1-image
+  IMAGE/sysupgrade.bin := tplink-v1-image -s | append-metadata
 endef
+TARGET_DEVICES += tl-wdr4900-v1
 
-define Image/BuildKernel
-	cp $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-initramfs-zImage
-	cp $(KDIR)/cuImage.tl-wdr4900-v1-initramfs $(BIN_DIR)/$(IMG_PREFIX)-tl-wdr4900-initramfs.uImage
-endef
+endif
 
-define Image/Build/TPLINK
-	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
-		-H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) $(7) \
-		-k $(KDIR)/$(3) \
-		-r $(KDIR)/root.$(1) \
-		-o $(call factoryname,$(1),$(2))
-	-$(STAGING_DIR_HOST)/bin/mktplinkfw \
-		-H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) $(7) -s \
-		-k $(KDIR)/$(3) \
-		-r $(KDIR)/root.$(1) \
-		-o $(call sysupname,$(1),$(2))
-endef
-
-define Image/Build/Profile/TLWDR4900
-	$(call Image/Build/TPLINK,$(1),tl-wdr4900-v1,cuImage.tl-wdr4900-v1,0x49000001,1,16Mppc)
-endef
+ifeq ($(SUBTARGET),p1020)
 
-define Image/Build/Profile/Default
-	$(call Image/Build/Profile/TLWDR4900,$(1))
+define Device/hiveap-330
+  DEVICE_TITLE := Aerohive HiveAP-330
+  DEVICE_PACKAGES := kmod-ath9k wpad-basic kmod-tpm-i2c-atmel
+  BLOCKSIZE := 128k
+  KERNEL_NAME := zImage
+  KERNEL_SIZE := 8m
+  SUPPORTED_DEVICES := aerohive,hiveap-330
+  IMAGES := fdt.bin sysupgrade.bin
+  IMAGE/fdt.bin := append-dtb
+  IMAGE/sysupgrade.bin := append-dtb | pad-to 256k | check-size 256k | \
+	append-uImage-fakehdr ramdisk | pad-to 256k | check-size 512k | \
+	append-rootfs | pad-rootfs $$(BLOCKSIZE) | pad-to 41216k | check-size 41216k | \
+	append-kernel | append-metadata
 endef
+TARGET_DEVICES += hiveap-330
 
-define Image/Build/ext2
-	cp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-ext2.img
-endef
-
-define Image/Build/squashfs
-	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-	cp $(KDIR)/root.squashfs $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs
-endef
-
-PROFILE ?= Default
-
-define Image/Build
-	$(call Image/Build/$(1),$(1))
-	$(call Image/Build/Profile/$(PROFILE),$(1))
-endef
+endif
 
 $(eval $(call BuildImage))