From: Koen Vandeputte Date: Wed, 17 Oct 2018 15:16:51 +0000 (+0200) Subject: ar71xx: Move some targets to tiny X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5f249333090741ecba190855b13c87fd93ca2520;p=openwrt%2Fstaging%2Frmilecki.git ar71xx: Move some targets to tiny Recent changes on ar71xx (switch to 4.14, memory compaction, ...) cause an increase in kernel size, making it too big for some devices. Move these devices to the tiny target, where kernel symbols and optimization for speed are disabled, reducing the kernel size. Devices: - EnGenius ENS202EXT - OCEDO Koala Compile-tested targets: - ar71xx->generic->default - ar71xx->smallFlash->Default Signed-off-by: Koen Vandeputte --- diff --git a/target/linux/ar71xx/generic/config-default b/target/linux/ar71xx/generic/config-default index d3c8000f6d1..5f3adecc22d 100644 --- a/target/linux/ar71xx/generic/config-default +++ b/target/linux/ar71xx/generic/config-default @@ -82,7 +82,6 @@ CONFIG_ATH79_MACH_EAP300V2=y CONFIG_ATH79_MACH_EAP7660D=y CONFIG_ATH79_MACH_EL_M150=y CONFIG_ATH79_MACH_EL_MINI=y -CONFIG_ATH79_MACH_ENS202EXT=y CONFIG_ATH79_MACH_EPG5000=y CONFIG_ATH79_MACH_ESR1750=y CONFIG_ATH79_MACH_ESR900=y @@ -107,7 +106,6 @@ CONFIG_ATH79_MACH_HORNET_UB=y CONFIG_ATH79_MACH_JA76PF=y CONFIG_ATH79_MACH_JWAP003=y CONFIG_ATH79_MACH_JWAP230=y -CONFIG_ATH79_MACH_KOALA=y CONFIG_ATH79_MACH_LAN_TURTLE=y CONFIG_ATH79_MACH_LIMA=y CONFIG_ATH79_MACH_MC_MAC1200R=y diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index c429eb39d9c..804532b55cb 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -15,7 +15,6 @@ DEVICE_VARS += BOARDNAME CMDLINE CONSOLE IMAGE_SIZE LOADER_TYPE ifeq ($(SUBTARGET),generic) include ./generic.mk include ./generic-legacy-devices.mk -include ./generic-senao.mk include ./generic-tp-link.mk include ./generic-ubnt.mk endif @@ -23,6 +22,7 @@ ifeq ($(SUBTARGET),tiny) include ./tiny.mk include ./tiny-tp-link.mk include ./tiny-legacy-devices.mk +include ./tiny-senao.mk endif ifeq ($(SUBTARGET),nand) include ./nand.mk diff --git a/target/linux/ar71xx/image/generic-senao.mk b/target/linux/ar71xx/image/generic-senao.mk deleted file mode 100644 index a241e4a6f56..00000000000 --- a/target/linux/ar71xx/image/generic-senao.mk +++ /dev/null @@ -1,41 +0,0 @@ -define Build/senao-factory-image - mkdir -p $@.senao - - touch $@.senao/FWINFO-OpenWrt-$(REVISION)-$(1) - $(CP) $(IMAGE_KERNEL) $@.senao/openwrt-senao-$(1)-uImage-lzma.bin - $(CP) $@ $@.senao/openwrt-senao-$(1)-root.squashfs - - $(TAR) -c \ - --numeric-owner --owner=0 --group=0 --sort=name \ - $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \ - -C $@.senao . | gzip -9nc > $@ - - rm -rf $@.senao -endef - - -define Device/ens202ext - DEVICE_TITLE := EnGenius ENS202EXT - BOARDNAME := ENS202EXT - DEVICE_PACKAGES := rssileds - KERNEL_SIZE := 1536k - IMAGE_SIZE := 13632k - IMAGES += factory.bin - MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),320k(custom)ro,1536k(kernel),12096k(rootfs),2048k(failsafe)ro,64k(art)ro,13632k@0xa0000(firmware) - IMAGE/factory.bin := append-rootfs | pad-rootfs | senao-factory-image ens202ext - IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) -endef -TARGET_DEVICES += ens202ext - -define Device/koala - DEVICE_TITLE := OCEDO Koala - BOARDNAME := KOALA - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct - KERNEL_SIZE := 1536k - IMAGE_SIZE := 7424k - MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),1536k(kernel),5888k(rootfs),1536k(kernel2),5888k(rootfs2),1088k(data)ro,64k(id)ro,64k(art)ro,7424k@0x50000(firmware) - KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma - KERNEL_INITRAMFS := $$(KERNEL) - IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) -endef -TARGET_DEVICES += koala diff --git a/target/linux/ar71xx/image/tiny-senao.mk b/target/linux/ar71xx/image/tiny-senao.mk new file mode 100644 index 00000000000..a241e4a6f56 --- /dev/null +++ b/target/linux/ar71xx/image/tiny-senao.mk @@ -0,0 +1,41 @@ +define Build/senao-factory-image + mkdir -p $@.senao + + touch $@.senao/FWINFO-OpenWrt-$(REVISION)-$(1) + $(CP) $(IMAGE_KERNEL) $@.senao/openwrt-senao-$(1)-uImage-lzma.bin + $(CP) $@ $@.senao/openwrt-senao-$(1)-root.squashfs + + $(TAR) -c \ + --numeric-owner --owner=0 --group=0 --sort=name \ + $(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \ + -C $@.senao . | gzip -9nc > $@ + + rm -rf $@.senao +endef + + +define Device/ens202ext + DEVICE_TITLE := EnGenius ENS202EXT + BOARDNAME := ENS202EXT + DEVICE_PACKAGES := rssileds + KERNEL_SIZE := 1536k + IMAGE_SIZE := 13632k + IMAGES += factory.bin + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),320k(custom)ro,1536k(kernel),12096k(rootfs),2048k(failsafe)ro,64k(art)ro,13632k@0xa0000(firmware) + IMAGE/factory.bin := append-rootfs | pad-rootfs | senao-factory-image ens202ext + IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE) +endef +TARGET_DEVICES += ens202ext + +define Device/koala + DEVICE_TITLE := OCEDO Koala + BOARDNAME := KOALA + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct + KERNEL_SIZE := 1536k + IMAGE_SIZE := 7424k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),1536k(kernel),5888k(rootfs),1536k(kernel2),5888k(rootfs2),1088k(data)ro,64k(id)ro,64k(art)ro,7424k@0x50000(firmware) + KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma + KERNEL_INITRAMFS := $$(KERNEL) + IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | append-metadata | check-size $$$$(IMAGE_SIZE) +endef +TARGET_DEVICES += koala diff --git a/target/linux/ar71xx/tiny/config-default b/target/linux/ar71xx/tiny/config-default index 78672940b2a..2c7b4b71aad 100644 --- a/target/linux/ar71xx/tiny/config-default +++ b/target/linux/ar71xx/tiny/config-default @@ -12,7 +12,9 @@ CONFIG_ATH79_MACH_BHR_4GRV2=y CONFIG_ATH79_MACH_DIR_600_A1=y CONFIG_ATH79_MACH_DIR_615_C1=y CONFIG_ATH79_MACH_DIR_615_I1=y +CONFIG_ATH79_MACH_ENS202EXT=y CONFIG_ATH79_MACH_F9K1115V2=y +CONFIG_ATH79_MACH_KOALA=y CONFIG_ATH79_MACH_NBG460N=y CONFIG_ATH79_MACH_TEW_632BRP=y CONFIG_ATH79_MACH_TEW_712BR=y