apm821xx: sata: boot-part feature integration

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

diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile
index 75e85d18fb43af5e37dc2a4a854c24214d547b36..60b1f78a3b117d50c0867f44e00d68b88c146d4a 100644 (file)
--- a/target/linux/apm821xx/image/Makefile
+++ b/target/linux/apm821xx/image/Makefile
@@ -15,7 +15,9 @@ define Build/boot-img
        $(CP) $(IMAGE_KERNEL).dtb $@.bootdir/boot/$(DEVICE_DTB)
        $(CP) $(IMAGE_KERNEL) $@.bootdir/boot/uImage
 
-       genext2fs --block-size $(BLOCKSIZE:%k=%Ki) --size-in-blocks $$((1024 * $(BOOT_SIZE))) --root $@.bootdir $@.boot
+       genext2fs --block-size $(BLOCKSIZE:%k=%Ki) \
+               --size-in-blocks $$((1024 * $(CONFIG_TARGET_KERNEL_PARTSIZE))) \
+               --root $@.bootdir $@.boot
 
        # convert it to revision 1 - needed for u-boot ext2load
        $(STAGING_DIR_HOST)/bin/tune2fs -O filetype $@.boot
@@ -49,7 +51,7 @@ define Build/export-dtb
 endef
 
 define Build/hdd-img
-       ./mbl_gen_hdd_img.sh $@ $@.boot $(IMAGE_ROOTFS) $(BOOT_SIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE)
+       ./mbl_gen_hdd_img.sh $@ $@.boot $(IMAGE_ROOTFS) $(CONFIG_TARGET_KERNEL_PARTSIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE)
 endef
 
 define Build/MerakiAdd-dtb
@@ -125,12 +127,12 @@ define Device/meraki_mr24
   BOARD_NAME := mr24
   DEVICE_DTS := meraki-mr24
   BLOCKSIZE := 63k
-  IMAGES := sysupgrade.tar
+  IMAGES := sysupgrade.bin
   DTB_SIZE := 64512
   IMAGE_SIZE := 8191k
   KERNEL := kernel-bin | lzma | uImage lzma | MerakiAdd-dtb | MerakiNAND
   KERNEL_INITRAMFS := kernel-bin | lzma | dtb | MuImage-initramfs lzma
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   UBINIZE_OPTS := -E 5
   SUPPORTED_DEVICES += mr24
 endef
@@ -143,13 +145,13 @@ define Device/meraki_mx60
   BOARD_NAME := mx60
   DEVICE_DTS := meraki-mx60
   BLOCKSIZE := 63k
-  IMAGES := sysupgrade.tar
+  IMAGES := sysupgrade.bin
   DTB_SIZE := 64512
   IMAGE_SIZE := 1021m
   KERNEL_SIZE := 4031k
   KERNEL := kernel-bin | gzip | uImage gzip | MerakiAdd-dtb | MerakiNAND
   KERNEL_INITRAMFS := kernel-bin | gzip | dtb | MuImage-initramfs gzip
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   UBINIZE_OPTS := -E 5
   SUPPORTED_DEVICES += mx60
 endef
@@ -162,10 +164,10 @@ define Device/netgear_wndap6x0
   BLOCKSIZE := 16k
   DTB_SIZE := 32768
   IMAGE_SIZE := 27392k
-  IMAGES := sysupgrade.tar factory.img
+  IMAGES := sysupgrade.bin factory.img
   KERNEL_SIZE := 4032k
   KERNEL := dtb | kernel-bin | gzip | MuImage-initramfs gzip
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi
   UBINIZE_OPTS := -E 5
 endef
@@ -198,7 +200,8 @@ define Device/netgear_wndr4700
   BLOCKSIZE := 128k
   DTB_SIZE := 131008
   IMAGE_SIZE := 24960k
-  IMAGES := factory.img sysupgrade.tar kernel.dtb
+  IMAGES := factory.img sysupgrade.bin
+  ARTIFACTS := device-tree.dtb
   KERNEL_SIZE := 3584k
   # append a fake/empty rootfs to fool netgear's uboot
   # CHECK_DNI_FIRMWARE_ROOTFS_INTEGRITY in do_chk_dniimg()
@@ -207,8 +210,8 @@ define Device/netgear_wndr4700
   KERNEL_INITRAMFS := kernel-bin | gzip | dtb | MuImage-initramfs gzip
   IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \
                       netgear-dni | check-size $$$$(IMAGE_SIZE)
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
-  IMAGE/kernel.dtb := export-dtb | uImage none
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+  ARTIFACT/device-tree.dtb := export-dtb | uImage none
   NETGEAR_BOARD_ID := WNDR4700
   NETGEAR_HW_ID := 29763875+128+256
   UBINIZE_OPTS := -E 5
@@ -229,13 +232,13 @@ define Device/wd_mybooklive
   DTB_SIZE := 16384
   KERNEL := kernel-bin | dtb | gzip | uImage gzip
   KERNEL_INITRAMFS := kernel-bin | gzip | dtb | MuImage-initramfs gzip
-  BOOT_SIZE := 8
   IMAGES := factory.img.gz kernel.dtb sysupgrade.img.gz
+  ARTIFACTS := kernel.dtb
   DEVICE_DTB := apollo3g.dtb
   FILESYSTEMS := ext4 squashfs
   IMAGE/factory.img.gz := boot-script | boot-img | hdd-img | gzip
-  IMAGE/kernel.dtb := export-dtb
   IMAGE/sysupgrade.img.gz := boot-script | boot-img | hdd-img | gzip | append-metadata
+  ARTIFACT/apollo3g.dtb := export-dtb
 endef
 
 TARGET_DEVICES += wd_mybooklive