From e665a4ff0bab3d55588c6805d8d66e4adae78346 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Tue, 15 Jan 2019 11:57:01 +0800
Subject: [PATCH] ARRIS SBR-AC1750: generate kernel1.bin and rootfs1.bin for
 factory flash

---
 target/linux/ar71xx/image/nand.mk  | 15 +++++++--------
 target/linux/ar71xx/nand/target.mk |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/target/linux/ar71xx/image/nand.mk b/target/linux/ar71xx/image/nand.mk
index b54603a59..34878ab6e 100644
--- a/target/linux/ar71xx/image/nand.mk
+++ b/target/linux/ar71xx/image/nand.mk
@@ -43,19 +43,18 @@ define Device/sbr-ac1750
   DEVICE_TITLE := Arris sbr-ac1750
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-storage kmod-usb-ledtrig-usbport kmod-ath10k ath10k-firmware-qca988x
   BOARDNAME := SBR-AC1750
-  IMAGE_SIZE := 105m
-  KERNEL_SIZE := 2048k
-#  MTDPARTS := ar934x-nfc:1m(u-boot)ro,1m(u-boot-env)ro,2m(kernel),16m(rootfs),1m@0x6d00000(art)ro,18m@0x200000(firmware)
-#  IMAGE/sysupgrade.bin := append-kernel | pad-to 2048k | append-rootfs | check-size $$$$(IMAGE_SIZE)
+  IMAGE_SIZE := 95m
+  KERNEL_SIZE := 4096k
   BLOCKSIZE := 128k
   PAGESIZE := 2048
   UBINIZE_OPTS := -E 5
   CONSOLE := ttyS0,115200
-  MTDPARTS := ar934x-nfc:1m(u-boot)ro,1m(u-boot-env)ro,2m(kernel),105m(ubi),1m@0x6d00000(art)ro
-  IMAGES := sysupgrade.tar factory.bin
+  MTDPARTS := ar934x-nfc:1m(u-boot)ro,1m(u-boot-env)ro,4m(kernel),95m(ubi),1m(scfgmgr),4m(openwrt),1m(ft),2m(PKI),1m@0x6d00000(art)ro
+  IMAGES := sysupgrade.tar kernel1.bin rootfs1.bin
   KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma
-  IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE)
-  IMAGE/sysupgrade.tar := sysupgrade-tar
+  IMAGE/kernel1.bin := append-kernel | check-size $$$$(KERNEL_SIZE)
+  IMAGE/rootfs1.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
+  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
 endef
 TARGET_DEVICES += sbr-ac1750
 
diff --git a/target/linux/ar71xx/nand/target.mk b/target/linux/ar71xx/nand/target.mk
index df8b7f651..688eb97b2 100644
--- a/target/linux/ar71xx/nand/target.mk
+++ b/target/linux/ar71xx/nand/target.mk
@@ -1,5 +1,5 @@
 BOARDNAME := Generic devices with NAND flash
-FEATURES += squashfs nand rtc small_flash ubifs
+FEATURES += squashfs nand rtc small_flash
 
 define Target/Description
 	Build firmware images for Atheros AR71xx/AR913x based boards with