ath79: reorganize common image definitions for Netgear

[openwrt/staging/wigyori.git] / target / linux / ath79 / image / tiny-netgear.mk

diff --git a/target/linux/ath79/image/tiny-netgear.mk b/target/linux/ath79/image/tiny-netgear.mk
index 5c83a10e01733458d0838e5af6a03fd555ed53cc..0127e5bd97c411349cdbfa5b1027da960659b815 100644 (file)
--- a/target/linux/ath79/image/tiny-netgear.mk
+++ b/target/linux/ath79/image/tiny-netgear.mk
@@ -1,35 +1,32 @@
 include ./common-netgear.mk
 
-define Device/netgear_ar7240
-  SOC := ar7240
-  NETGEAR_KERNEL_MAGIC := 0x32303631
-  KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma -d20 | netgear-uImage lzma
-  IMAGE_SIZE := 3712k
-  IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \
-       append-rootfs | pad-rootfs
-  $(Device/netgear_ath79)
-endef
-
 define Device/netgear_wnr612-v2
-  $(Device/netgear_ar7240)
+  $(Device/netgear_generic)
+  SOC := ar7240
   DEVICE_MODEL := WNR612
   DEVICE_VARIANT := v2
   DEVICE_DTS := ar7240_netgear_wnr612-v2
+  NETGEAR_KERNEL_MAGIC := 0x32303631
   NETGEAR_BOARD_ID := REALWNR612V2
+  IMAGE_SIZE := 3712k
   SUPPORTED_DEVICES += wnr612-v2
 endef
 TARGET_DEVICES += netgear_wnr612-v2
 
 define Device/on_n150r
-  $(Device/netgear_ar7240)
+  $(Device/netgear_generic)
+  SOC := ar7240
   DEVICE_VENDOR := On Networks
   DEVICE_MODEL := N150R
+  NETGEAR_KERNEL_MAGIC := 0x32303631
   NETGEAR_BOARD_ID := N150R
+  IMAGE_SIZE := 3712k
   SUPPORTED_DEVICES += n150r
 endef
 TARGET_DEVICES += on_n150r
 
 define Device/netgear_wnr1000-v2
+  $(Device/netgear_generic)
   SOC := ar7240
   DEVICE_MODEL := WNR1000
   DEVICE_VARIANT := v2
@@ -37,14 +34,12 @@ define Device/netgear_wnr1000-v2
   NETGEAR_BOARD_ID := WNR1000V2
   NETGEAR_HW_ID := 29763331+4+32
   IMAGE_SIZE := 3712k
-  IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \
-       append-rootfs | pad-rootfs
   SUPPORTED_DEVICES += wnr1000-v2
-  $(Device/netgear_ath79)
 endef
 TARGET_DEVICES += netgear_wnr1000-v2
 
 define Device/netgear_wnr2000-v3
+  $(Device/netgear_generic)
   SOC := ar7241
   DEVICE_MODEL := WNR2000
   DEVICE_VARIANT := v3
@@ -52,12 +47,9 @@ define Device/netgear_wnr2000-v3
   NETGEAR_BOARD_ID := WNR2000V3
   NETGEAR_HW_ID := 29763551+04+32
   IMAGE_SIZE := 3712k
-  IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | netgear-squashfs | \
-       append-rootfs | pad-rootfs
   IMAGES += factory-NA.img
   IMAGE/factory-NA.img := $$(IMAGE/default) | netgear-dni NA | \
        check-size
   SUPPORTED_DEVICES += wnr2000-v3
-  $(Device/netgear_ath79)
 endef
 TARGET_DEVICES += netgear_wnr2000-v3