merge: targets: update image generation and targets

[openwrt/openwrt.git] / target / linux / lantiq / image / Makefile

diff --git a/target/linux/lantiq/image/Makefile b/target/linux/lantiq/image/Makefile
index 1b194b3e7b39e63adc71eeb75e3c8d7f89026bbf..f6795ee61a24d4dc602419a34b2d5b1437e745ce 100644 (file)
--- a/target/linux/lantiq/image/Makefile
+++ b/target/linux/lantiq/image/Makefile
@@ -20,9 +20,8 @@ else
   UBIFS_OPTS := -m 2048 -e 126KiB -c 4096
 endif
 
-define Build/eva-image
-       lzma2eva $(KERNEL_LOADADDR) $(KERNEL_LOADADDR) $@ $@.new
-       ( dd if=$@.new bs=64k conv=sync; cat ./eva.dummy.squashfs; ) > $@
+define Build/append-avm-fakeroot
+       cat ./eva.dummy.squashfs >> $@
 endef
 
 define Build/dgn3500-sercom-footer
@@ -40,7 +39,7 @@ endef
 
 define Build/fullimage
        mkimage -A mips -O linux -C lzma -T filesystem -a 0x00  \
-               -e 0x00 -n 'LEDE RootFS' \
+               -e 0x00 -n 'OpenWrt RootFS' \
                -d $(IMAGE_ROOTFS) $(IMAGE_ROOTFS).new
 
        cat $(IMAGE_KERNEL) $(IMAGE_ROOTFS).new > $@.tmp
@@ -104,6 +103,8 @@ endef
 
 define Device/AVM
   KERNEL := kernel-bin | append-dtb | lzma | eva-image
+  IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-avm-fakeroot | \
+       append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
 endef
 
 ifeq ($(SUBTARGET),ase)
@@ -213,10 +214,13 @@ TARGET_DEVICES += EASY50712
 define Device/ACMP252
   IMAGE_SIZE := 14848k
   DEVICE_TITLE := AudioCodes MediaPack MP-252
-  DEVICE_PACKAGES := kmod-rt2x00-pci wpad-mini \
-       kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
-       kmod-ltq-adsl-danube-fw-a kmod-ltq-ptm-danube \
-       ltq-adsl-app -swconfig
+  DEVICE_PACKAGES :=  kmod-ltq-adsl-danube-mei kmod-ltq-adsl-danube \
+       kmod-ltq-adsl-danube-fw-a kmod-ltq-atm-danube \
+       kmod-ltq-tapi kmod-ltq-vmmc \
+       kmod-usb-ledtrig-usbport kmod-usb-dwc2 \
+       kmod-rt2800-pci \
+       ltq-adsl-app ppp-mod-pppoa \
+       wpad-mini
 endef
 TARGET_DEVICES += ACMP252
 
@@ -365,18 +369,18 @@ define Device/DGN3500
   IMAGE_SIZE := 16000k
   IMAGES := \
        sysupgrade-NA.bin sysupgrade-WW.bin \
-       factory-NA.bin factory-WW.bin
+       factory-NA.img factory-WW.img
   IMAGE/sysupgrade-NA.bin := \
        append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "NA" | \
        pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
   IMAGE/sysupgrade-WW.bin := \
        append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "WW" | \
        pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
-  IMAGE/factory-NA.bin := \
+  IMAGE/factory-NA.img := \
        pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \
        dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "NA" | pad-rootfs | \
        check-size 16320k | pad-to 16384k
-  IMAGE/factory-WW.bin := \
+  IMAGE/factory-WW.img := \
        pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \
        dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "WW" | pad-rootfs | \
        check-size 16320k | pad-to 16384k
@@ -392,11 +396,11 @@ TARGET_DEVICES += DGN3500
 
 define Device/DGN3500B
   IMAGE_SIZE := 16000k
-  IMAGES += factory.bin
+  IMAGES += factory.img
   IMAGE/sysupgrade.bin := \
        append-kernel | append-rootfs | dgn3500-sercom-footer 0x0 "DE" | \
        pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE)
-  IMAGE/factory.bin := \
+  IMAGE/factory.img := \
        pad-extra $(DGN3500_KERNEL_OFFSET_DEC) | append-kernel | append-rootfs | \
        dgn3500-sercom-footer $(DGN3500_KERNEL_OFFSET_HEX) "DE" | pad-rootfs | \
        check-size 16320k | pad-to 16384k
@@ -512,6 +516,17 @@ define Device/BTHOMEHUBV5A
 endef
 TARGET_DEVICES += BTHOMEHUBV5A
 
+define Device/DM200
+  IMAGES := sysupgrade.bin factory.img
+  IMAGE/factory.img := $$(IMAGE/sysupgrade.bin) | netgear-dni
+  IMAGE_SIZE := 7872k
+  DEVICE_TITLE := Netgear DM200
+  NETGEAR_BOARD_ID := DM200
+  NETGEAR_HW_ID := 29765233+8+0+64+0+0
+endef
+DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
+TARGET_DEVICES += DM200
+
 define Device/EASY80920NAND
   $(Device/lantiqFullImage)
   IMAGE_SIZE := 64512k