From f89fc43a50998a69bd401268020ab78b90ff7a34 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 18 Oct 2018 20:43:42 +0200 Subject: [PATCH] ar71xx: move OCEDO Koala to generic and use dynamic partitioning This changes the OCEDO Koala flash-layout to a unified firmware partition, thus making the ar71xx-generic kernel fit in flash. Compile and runtested on OCEDO Koala. Signed-off-by: David Bauer [small title reword] Signed-off-by: Koen Vandeputte --- target/linux/ar71xx/generic/config-default | 1 + target/linux/ar71xx/image/generic.mk | 9 +++++++++ target/linux/ar71xx/image/tiny-senao.mk | 13 ------------- target/linux/ar71xx/tiny/config-default | 1 - 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/target/linux/ar71xx/generic/config-default b/target/linux/ar71xx/generic/config-default index 5f3adecc22..26717b107c 100644 --- a/target/linux/ar71xx/generic/config-default +++ b/target/linux/ar71xx/generic/config-default @@ -106,6 +106,7 @@ 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/generic.mk b/target/linux/ar71xx/image/generic.mk index 9834e199ae..fedd37e219 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -822,6 +822,15 @@ define Device/jwap230 endef TARGET_DEVICES += jwap230 +define Device/koala + DEVICE_TITLE := OCEDO Koala + BOARDNAME := KOALA + DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct + IMAGE_SIZE := 7424k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env),7424k(firmware),1536k(kernel2),5888k(rootfs2),1088k(data)ro,64k(id)ro,64k(art)ro +endef +TARGET_DEVICES += koala + define Device/r36a DEVICE_TITLE := ALFA Network R36A DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport -swconfig diff --git a/target/linux/ar71xx/image/tiny-senao.mk b/target/linux/ar71xx/image/tiny-senao.mk index a241e4a6f5..3a7f6776b3 100644 --- a/target/linux/ar71xx/image/tiny-senao.mk +++ b/target/linux/ar71xx/image/tiny-senao.mk @@ -26,16 +26,3 @@ define Device/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 2c7b4b71aa..1148d8c451 100644 --- a/target/linux/ar71xx/tiny/config-default +++ b/target/linux/ar71xx/tiny/config-default @@ -14,7 +14,6 @@ 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