build: rename sysupgrade-nand to sysupgrade-tar

[oweals/openwrt.git] / target / linux / apm821xx / image / Makefile

diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile
index 649c50101463dc5b09ba9f297769edbe4411c232..c49e57abc4dde136b5f7c7d95674cae882db43cf 100644 (file)
--- a/target/linux/apm821xx/image/Makefile
+++ b/target/linux/apm821xx/image/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 include $(INCLUDE_DIR)/host.mk
 
-DEVICE_VARS += DEVICE_DTS DEVICE_PROFILE IMAGE_SIZE DTB_SIZE
+DEVICE_VARS += DEVICE_PROFILE IMAGE_SIZE DTB_SIZE
 
 define Device/Default
   PROFILES := Default
@@ -15,6 +15,7 @@ define Device/Default
   DEVICE_DTS :=
   KERNEL_ENTRY := 0x00000000
   KERNEL_LOADADDR := 0x00000000
+  DEVICE_DTS_DIR := ../dts
 endef
 
 define Build/dtb
@@ -74,8 +75,8 @@ define Device/mr24
   KERNEL_SIZE := 2048k
   IMAGE_SIZE := 8191k
   KERNEL := kernel-bin | lzma | uImage lzma | MerakiAdd-dtb | MerakiNAND
-  KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux | lzma | uImage lzma | MerakiAdd-dtb | pad-to 2047k | MerakiAdd-initramfs | MerakiNAND
-  IMAGE/sysupgrade.tar := sysupgrade-nand
+  KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux | gzip | uImage gzip | MerakiAdd-dtb | pad-to 2047k | MerakiAdd-initramfs | MerakiNAND
+  IMAGE/sysupgrade.tar := sysupgrade-tar
 endef
 TARGET_DEVICES += mr24
 
@@ -155,7 +156,7 @@ define Device/WNDR4700
   KERNEL_INITRAMFS := kernel-bin | gzip | dtb | wndr4700-specialImage gzip
   IMAGE/factory.img := dtb | create-uImage-dtb | append-kernel | pad-to 2M | append-ubi | \
                       netgear-dni | check-size $$$$(IMAGE_SIZE)
-  IMAGE/sysupgrade.tar := sysupgrade-nand
+  IMAGE/sysupgrade.tar := sysupgrade-tar
   NETGEAR_BOARD_ID := WNDR4700
   NETGEAR_HW_ID := 29763875+128+256
 endef
@@ -193,20 +194,20 @@ define Build/hdd-img
 endef
 
 define Build/uRamdisk
-       $(call Image/mkfs/ext4)
-       gzip -9n -c $(KDIR)/root.ext4 > $(KDIR)/root.ext4.gz
-       $(STAGING_DIR_HOST)/bin/mkimage -A powerpc -T ramdisk -C gzip -n "$(PROFILE) rootfs" \
-               -d $(KDIR)/root.ext4.gz \
-               $@.uRamdisk
+       $(STAGING_DIR_HOST)/bin/mkimage \
+               -A powerpc -T ramdisk -C gzip \
+               -n "$(DEVICE_NAME) rootfs" \
+               -d $@ $@.new
+       mv $@.new $@
 endef
 
 define Build/recovery-tar
        sh ./mbl_gen_recovery_tar.sh \
                --profile $(DEVICE_PROFILE) \
-               --dtb $@.dtb \
+               --dtb $(word 1,$^).dtb \
                --dtbname $(DEVICE_DTB) \
-               --kernel $@      \
-               --rootfs $@.uRamdisk \
+               --kernel $(word 1,$^) \
+               --rootfs $@ \
                $@
 endef
 
@@ -214,12 +215,14 @@ define Device/MyBookLiveDefault
   IMAGE_SIZE := 48m
   BLOCKSIZE := 1024
   DTB_SIZE := 16384
-  KERNEL := kernel-bin | gzip | uImage gzip
+  KERNEL := kernel-bin | dtb | gzip | uImage gzip
   BOOT_SIZE := 8
-  IMAGES := rootfs.img recovery.tar
+  IMAGES := rootfs.img recovery.tar kernel.dtb
   DEVICE_DTB := apollo3g.dtb
+  FILESYSTEMS := ext4
+  IMAGE/kernel.dtb := append-dtb
   IMAGE/rootfs.img := boot-script | dtb | boot-img | hdd-img
-  IMAGE/recovery.tar := kernel-bin | dtb | uRamdisk | recovery-tar
+  IMAGE/recovery.tar := append-rootfs | gzip | uRamdisk | recovery-tar
 endef
 
 define Device/MyBookLiveSingle