apm821xx: image: add support for k unit suffix to boot-img

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

diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile
index 649c50101463dc5b09ba9f297769edbe4411c232..38877f9bcaf148a3df9cf0a2a43e2487c3b8cdf7 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
@@ -71,11 +72,14 @@ define Device/mr24
   BLOCKSIZE := 64512
   IMAGES := sysupgrade.tar
   DTB_SIZE := 64512
-  KERNEL_SIZE := 2048k
+  KERNEL_SIZE := 1984k
   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 | lzma | uImage lzma | \
+                     check-size $$(KERNEL_SIZE) | \
+                     MerakiAdd-dtb | pad-to 2047k | MerakiAdd-initramfs | \
+                     MerakiNAND
+  IMAGE/sysupgrade.tar := sysupgrade-tar
 endef
 TARGET_DEVICES += mr24
 
@@ -84,7 +88,7 @@ define Build/create-uImage-dtb
        -$(STAGING_DIR_HOST)/bin/mkimage -A $(LINUX_KARCH) \
                -O linux -T kernel -C none \
                -n '$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION)' \
-               -d $@.dtb $@.new
+               -d $(IMAGE_KERNEL).dtb $@.new
        @mv $@.new $@
 endef
 
@@ -151,11 +155,11 @@ define Device/WNDR4700
   IMAGE_SIZE:=25559040
   IMAGES := factory.img sysupgrade.tar
   KERNEL_SIZE := 1920k
-  KERNEL := kernel-bin | lzma | uImage lzma | pad-offset $$(BLOCKSIZE) 64 | append-fakerootfs
+  KERNEL := dtb | kernel-bin | lzma | uImage lzma | pad-offset $$(BLOCKSIZE) 64 | append-fakerootfs
   KERNEL_INITRAMFS := kernel-bin | gzip | dtb | wndr4700-specialImage gzip
-  IMAGE/factory.img := dtb | create-uImage-dtb | append-kernel | pad-to 2M | append-ubi | \
+  IMAGE/factory.img := 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
@@ -177,10 +181,10 @@ define Build/boot-img
        mkdir -p $@.bootdir/boot
 
        $(CP) $@.scr $@.bootdir/boot/boot.scr
-       $(CP) $@.dtb $@.bootdir/boot/$(DEVICE_DTB)
-       $(CP) $(word 1,$^) $@.bootdir/boot/uImage
+       $(CP) $(IMAGE_KERNEL).dtb $@.bootdir/boot/$(DEVICE_DTB)
+       $(CP) $(IMAGE_KERNEL) $@.bootdir/boot/uImage
 
-       genext2fs --block-size $(BLOCKSIZE) --size-in-blocks $$((1024 * $(BOOT_SIZE))) --root $@.bootdir $@.boot
+       genext2fs --block-size $(BLOCKSIZE:%k=%Ki) --size-in-blocks $$((1024 * $(BOOT_SIZE))) --root $@.bootdir $@.boot
 
        # convert it to revision 1 - needed for u-boot ext2load
        $(STAGING_DIR_HOST)/bin/tune2fs -O filetype $@.boot
@@ -188,38 +192,44 @@ define Build/boot-img
 endef
 
 define Build/hdd-img
-       ./mbl_gen_hdd_img.sh $@ $@.boot $(word 2,$^)
+       ./mbl_gen_hdd_img.sh $@ $@.boot $(IMAGE_ROOTFS)
        $(if $(CONFIG_TARGET_IMAGES_GZIP),gzip -9n -c $@ > $(BIN_DIR)/$(notdir $@).gz)
 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 $(IMAGE_KERNEL).dtb \
                --dtbname $(DEVICE_DTB) \
-               --kernel $@      \
-               --rootfs $@.uRamdisk \
+               --kernel $(IMAGE_KERNEL) \
+               --rootfs $@ \
                $@
 endef
 
+define Build/export-dtb
+       cp $(IMAGE_KERNEL).dtb $@
+endef
+
 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
-  IMAGE/rootfs.img := boot-script | dtb | boot-img | hdd-img
-  IMAGE/recovery.tar := kernel-bin | dtb | uRamdisk | recovery-tar
+  FILESYSTEMS := ext4
+  IMAGE/kernel.dtb := export-dtb
+  IMAGE/rootfs.img := boot-script | boot-img | hdd-img
+  IMAGE/recovery.tar := append-rootfs | gzip | uRamdisk | recovery-tar
 endef
 
 define Device/MyBookLiveSingle