From b67066b8fa1202074b3a2dd2cfd94a9aa5947e4a Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Mon, 20 Jun 2016 22:25:50 +0800 Subject: [PATCH] ar71xx: hiwifi-hc6361: lift size limit on kernel and rootfs parts The patch has been run-tested and the relevant dmsg logs are as the following [ 0.762447] Creating 5 MTD partitions on "spi0.0": [ 0.767217] 0x000000000000-0x000000010000 : "u-boot" [ 0.775139] 0x000000010000-0x000000020000 : "bdinfo" [ 0.781014] 0x000000020000-0x000000fe0000 : "firmware" [ 0.810558] 2 uimage-fw partitions found on MTD device firmware [ 0.815043] 0x000000020000-0x000000170000 : "kernel" [ 0.821925] 0x000000170000-0x000000fe0000 : "rootfs" [ 0.827587] mtd: device 4 (rootfs) set to be root filesystem [ 0.831937] 1 squashfs-split partitions found on MTD device rootfs [ 0.837983] 0x0000005c0000-0x000000fe0000 : "rootfs_data" [ 0.845621] 0x000000fe0000-0x000000ff0000 : "backup" [ 0.851445] 0x000000ff0000-0x000001000000 : "art" While at it, convert to new build method Signed-off-by: Yousong Zhou --- target/linux/ar71xx/image/generic.mk | 20 ++++++++++++++++++++ target/linux/ar71xx/image/legacy.mk | 19 ------------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index ca79f98c97..996bc5b1ac 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -342,3 +342,23 @@ define Device/c-55 endef TARGET_DEVICES += c-55 + + +define Build/uImageHiWiFi + # Field ih_name needs to start with "tw150v1" + mkimage -A $(LINUX_KARCH) \ + -O linux -T kernel \ + -C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ + -n 'tw150v1 $(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION)' -d $@ $@.new + @mv $@.new $@ +endef + +define Device/hiwifi-hc6361 + BOARDNAME := HiWiFi-HC6361 + DEVICE_PROFILE := HIWIFI_HC6361 + IMAGE_SIZE := 16128k + KERNEL := kernel-bin | patch-cmdline | lzma | uImageHiWiFi lzma + CONSOLE := ttyATH0,115200 + MTDPARTS := spi0.0:64k(u-boot)ro,64k(bdinfo)ro,16128k(firmware),64k(backup)ro,64k(art)ro +endef +TARGET_DEVICES += hiwifi-hc6361 diff --git a/target/linux/ar71xx/image/legacy.mk b/target/linux/ar71xx/image/legacy.mk index cf3183e67a..1556573b5f 100644 --- a/target/linux/ar71xx/image/legacy.mk +++ b/target/linux/ar71xx/image/legacy.mk @@ -285,7 +285,6 @@ f9k1115v2_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env),14464k(rootfs dlrtdev_mtdlayout=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,6208k(firmware),64k(caldata)ro,640k(certs),960k(unknown)ro,64k@0x7f0000(caldata_copy) dlrtdev_mtdlayout_fat=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,7168k(firmware),640k(certs),64k(caldata)ro,64k@0x660000(caldata_orig),6208k@0x50000(firmware_orig) dragino2_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,16000k(firmware),64k(config)ro,64k(art)ro -hiwifi_hc6361_mtdlayout=mtdparts=spi0.0:64k(u-boot)ro,64k(bdinfo)ro,1280k(kernel),14848k(rootfs),64k(backup)ro,64k(art)ro,16128k@0x20000(firmware) mr12_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13440k(rootfs),2304k(kernel),128k(art)ro,15744k@0x80000(firmware) mr16_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13440k(rootfs),2304k(kernel),128k(art)ro,15744k@0x80000(firmware) pb92_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,2752k(rootfs),896k(kernel),64k(nvram),64k(art)ro,3648k@0x50000(firmware) @@ -577,22 +576,6 @@ Image/Build/EnGenius/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4)) Image/Build/EnGenius/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4)) -define MkuImageHiWiFi - # Field ih_name needs to start with "tw150v1" - mkimage -A mips -O linux -T kernel -a 0x80060000 -C $(1) $(2) \ - -e 0x80060000 -n 'tw150v1 MIPS OpenWrt Linux-$(LINUX_VERSION)' \ - -d $(3) $(4) -endef - -define MkuImageLzmaHiWiFi - $(call PatchKernelLzma,$(1),$(2),$(3),$(4)) - $(call MkuImageHiWiFi,lzma,$(5),$(KDIR_TMP)/vmlinux$(4)-$(1).bin.lzma,$(KDIR_TMP)/vmlinux$(4)-$(1).uImage) -endef - -Image/Build/HiWiFi/buildkernel=$(call MkuImageLzmaHiWiFi,$(2),$(3) $(4)) -Image/Build/HiWiFi=$(call Image/Build/Ath,$(1),$(2),$(3),$(4),$(5),$(6),$(7)) -Image/Build/HiWiFi/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4)) - Image/Build/PB4X/buildkernel=$(call PatchKernelLzma,$(2),$(3)) define Image/Build/PB4X @@ -1078,8 +1061,6 @@ $(eval $(call SingleProfile,EnGenius,64k,ESR900,esr900,ESR900,ttyS0,115200,$$(es $(eval $(call SingleProfile,EnGenius,64k,ESR1750,esr1750,ESR1750,ttyS0,115200,$$(esr1750_mtdlayout),KRuImage,,0x61)) $(eval $(call SingleProfile,EnGenius,64k,EPG5000,epg5000,EPG5000,ttyS0,115200,$$(epg5000_mtdlayout),KRuImage,,0x71)) -$(eval $(call SingleProfile,HiWiFi,64k,HIWIFI_HC6361,hiwifi-hc6361,HiWiFi-HC6361,ttyATH0,115200,$$(hiwifi_hc6361_mtdlayout),KRuImage)) - $(eval $(call SingleProfile,MyLoader,64k,WP543_2M,wp543,,ttyS0,115200,0x200000,2M)) $(eval $(call SingleProfile,MyLoader,64k,WP543_4M,wp543,,ttyS0,115200,0x400000,4M)) $(eval $(call SingleProfile,MyLoader,64k,WP543_8M,wp543,,ttyS0,115200,0x800000,8M)) -- 2.30.2