From patchwork Sat Aug 4 14:34:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3,3/8] bsp: Update device definitions for openwrt-18.06 From: Adrian Schmutzler X-Patchwork-Id: 911 Message-Id: <20180804143427.18488-4-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Sat, 4 Aug 2018 16:34:22 +0200 This patch: - Introduces ar71xx-tiny subtarget - Renames devices as necessary - Performs a LEDE -> OpenWRT rename of images - Make USB support device-dependent for tiny devices - Disable uboot-envtools for MR3020 to gain space - Reorder devices alphabetically MR3020 won't build since there is not enough space. Signed-off-by: Adrian Schmutzler --- bsp/ar71xx/.config | 42 ++++++----------------------- bsp/ar71xxtiny/.config | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ bsp/board_ar71xx.bsp | 53 ++++++++++++++----------------------- bsp/board_ar71xxtiny.bsp | 18 +++++++++++++ bsp/board_wdr4900.bsp | 2 +- buildscript | 2 +- 6 files changed, 117 insertions(+), 69 deletions(-) create mode 100644 bsp/ar71xxtiny/.config create mode 100644 bsp/board_ar71xxtiny.bsp diff --git a/bsp/ar71xx/.config b/bsp/ar71xx/.config index 278d424b..9643c57a 100644 --- a/bsp/ar71xx/.config +++ b/bsp/ar71xx/.config @@ -4,24 +4,16 @@ CONFIG_TARGET_ar71xx=y CONFIG_TARGET_ar71xx_generic=y CONFIG_TARGET_MULTI_PROFILE=y -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_gl-ar150=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_gl-ar150="" CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_archer-c25-v1=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_archer-c25-v1="-kmod-ath10k kmod-ath10k-ct" CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_archer-c7-v2=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_archer-c7-v2="-kmod-ath10k kmod-ath10k-ct" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe210-220=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_cpe210-220="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe510-520=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_cpe510-520="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-mr3020-v1=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-mr3020-v1="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wa850re-v1=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wa850re-v1="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wa860re-v1=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wa860re-v1="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wa901nd-v2=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wa901nd-v2="" +CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe210-220-v1=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_cpe210-220-v1="" +CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_cpe510-520-v1=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_cpe510-520-v1="" +CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_gl-ar150=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_gl-ar150="" CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wdr3500-v1=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wdr3500-v1="" CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wdr3600-v1=y @@ -30,6 +22,8 @@ CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wdr4300-v1=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wdr4300-v1="" CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wdr4310-v1=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wdr4310-v1="" +CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr842n-v2=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr842n-v2="" CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v1=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043nd-v1="" CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v2=y @@ -40,26 +34,6 @@ CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v4=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043nd-v4="" CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043n-v5=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043n-v5="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr740n-v4=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr740n-v4="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr741nd-v2=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr741nd-v2="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr741nd-v4=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr741nd-v4="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr841-v10=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr841-v10="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr841-v11=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr841-v11="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr841-v12=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr841-v12="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr841-v7=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr841-v7="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr841-v8=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr841-v8="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr841-v9=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr841-v9="" -CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr842n-v2=y -CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr842n-v2="" CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_ubnt-bullet-m=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_ubnt-bullet-m="" CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_ubnt-loco-m-xw=y diff --git a/bsp/ar71xxtiny/.config b/bsp/ar71xxtiny/.config new file mode 100644 index 00000000..2b33dfe4 --- /dev/null +++ b/bsp/ar71xxtiny/.config @@ -0,0 +1,69 @@ +# Generated using "./buildscript config openwrt". +# Do no edit manually +# +CONFIG_TARGET_ar71xx=y +CONFIG_TARGET_ar71xx_tiny=y +CONFIG_TARGET_MULTI_PROFILE=y +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-mr3020-v1=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-mr3020-v1="-uboot-envtools" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wa850re-v1=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wa850re-v1="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wa860re-v1=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wa860re-v1="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wa901nd-v2=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wa901nd-v2="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr740n-v4=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr740n-v4="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr741nd-v2=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr741nd-v2="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr741nd-v4=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr741nd-v4="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v7=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v7="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v8=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v8="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v9=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v9="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v10=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v10="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v11=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v11="" +CONFIG_TARGET_DEVICE_ar71xx_tiny_DEVICE_tl-wr841-v12=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_tiny_DEVICE_tl-wr841-v12="" +CONFIG_BUSYBOX_CUSTOM=y +CONFIG_TARGET_PER_DEVICE_ROOTFS=y +# CONFIG_BUSYBOX_CONFIG_BRCTL is not set +# CONFIG_BUSYBOX_CONFIG_CROND is not set +# CONFIG_BUSYBOX_CONFIG_CRONTAB is not set +# CONFIG_BUSYBOX_CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set +CONFIG_CLEAN_IPKG=y +# CONFIG_DROPBEAR_CURVE25519 is not set +# CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 is not set +# CONFIG_FASTD_ENABLE_MAC_GHASH is not set +# CONFIG_FASTD_ENABLE_MAC_UHASH is not set +# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_GMAC is not set +# CONFIG_FASTD_ENABLE_METHOD_COMPOSED_UMAC is not set +# CONFIG_FASTD_ENABLE_METHOD_GENERIC_GMAC is not set +# CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC is not set +# CONFIG_KERNEL_DEBUG_INFO is not set +# CONFIG_KERNEL_DEBUG_KERNEL is not set +# CONFIG_PACKAGE_ALFRED_VIS is not set +CONFIG_PACKAGE_ath10k-firmware-qca9887-ct=m +CONFIG_PACKAGE_ath10k-firmware-qca988x-ct=m +CONFIG_PACKAGE_kmod-ath10k-ct=m +CONFIG_PACKAGE_kmod-hwmon-core=m +CONFIG_PACKAGE_kmod-ifb=y +CONFIG_PACKAGE_kmod-ledtrig-heartbeat=y +CONFIG_PACKAGE_kmod-ledtrig-netdev=y +CONFIG_PACKAGE_kmod-nls-base=y +CONFIG_PACKAGE_kmod-sched-connmark=y +CONFIG_PACKAGE_kmod-usb-core=m +CONFIG_PACKAGE_kmod-usb-ledtrig-usbport=m +CONFIG_PACKAGE_kmod-usb-ohci=m +CONFIG_PACKAGE_kmod-usb2=m +CONFIG_PACKAGE_opkg=m +CONFIG_PACKAGE_qos-scripts=y +CONFIG_PACKAGE_tc=y +CONFIG_STRIP_KERNEL_EXPORTS=y +CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512 diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp index 56d7c9f6..4081c5b6 100644 --- a/bsp/board_ar71xx.bsp +++ b/bsp/board_ar71xx.bsp @@ -2,37 +2,24 @@ machine=ar71xx chipset=ar71xx subtarget=generic target=$builddir/$machine -images=("lede-ar71xx-generic-cpe210-220-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-cpe510-520-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-ubnt-nano-m-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-ubnt-loco-m-xw-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr740n-v4-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr741nd-v2-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr741nd-v4-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr841-v7-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr841-v8-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr841-v9-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr841-v10-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr841-v11-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr841-v12-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr842n-v2-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr1043nd-v1-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr1043nd-v2-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr1043nd-v3-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr1043nd-v4-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wr1043n-v5-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wa860re-v1-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wa850re-v1-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wa901nd-v2-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-gl-ar150-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-mr3020-v1-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-ubnt-bullet-m-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-ubnt-unifi-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-ubnt-unifiac-lite-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wdr3500-v1-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wdr3600-v1-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wdr4300-v1-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-tl-wdr4310-v1-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-archer-c7-v2-squashfs-sysupgrade.bin" - "lede-ar71xx-generic-archer-c25-v1-squashfs-sysupgrade.bin" +images=("openwrt-ar71xx-generic-archer-c25-v1-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-archer-c7-v2-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-cpe210-220-v1-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-cpe510-520-v1-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-gl-ar150-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-tl-wdr3500-v1-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-tl-wdr3600-v1-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-tl-wdr4300-v1-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-tl-wdr4310-v1-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-tl-wr842n-v2-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-tl-wr1043nd-v1-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-tl-wr1043nd-v2-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-tl-wr1043nd-v3-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-tl-wr1043nd-v4-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-tl-wr1043n-v5-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-ubnt-bullet-m-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-ubnt-loco-m-xw-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-ubnt-nano-m-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-ubnt-unifi-squashfs-sysupgrade.bin" + "openwrt-ar71xx-generic-ubnt-unifiac-lite-squashfs-sysupgrade.bin" ) diff --git a/bsp/board_ar71xxtiny.bsp b/bsp/board_ar71xxtiny.bsp new file mode 100644 index 00000000..5c784083 --- /dev/null +++ b/bsp/board_ar71xxtiny.bsp @@ -0,0 +1,18 @@ +machine=ar71xxtiny +chipset=ar71xx +subtarget=tiny +target=$builddir/$machine +images=("openwrt-ar71xx-tiny-tl-mr3020-v1-squashfs-sysupgrade.bin" + "openwrt-ar71xx-tiny-tl-wa850re-v1-squashfs-sysupgrade.bin" + "openwrt-ar71xx-tiny-tl-wa860re-v1-squashfs-sysupgrade.bin" + "openwrt-ar71xx-tiny-tl-wa901nd-v2-squashfs-sysupgrade.bin" + "openwrt-ar71xx-tiny-tl-wr740n-v4-squashfs-sysupgrade.bin" + "openwrt-ar71xx-tiny-tl-wr741nd-v2-squashfs-sysupgrade.bin" + "openwrt-ar71xx-tiny-tl-wr741nd-v4-squashfs-sysupgrade.bin" + "openwrt-ar71xx-tiny-tl-wr841-v7-squashfs-sysupgrade.bin" + "openwrt-ar71xx-tiny-tl-wr841-v8-squashfs-sysupgrade.bin" + "openwrt-ar71xx-tiny-tl-wr841-v9-squashfs-sysupgrade.bin" + "openwrt-ar71xx-tiny-tl-wr841-v10-squashfs-sysupgrade.bin" + "openwrt-ar71xx-tiny-tl-wr841-v11-squashfs-sysupgrade.bin" + "openwrt-ar71xx-tiny-tl-wr841-v12-squashfs-sysupgrade.bin" + ) diff --git a/bsp/board_wdr4900.bsp b/bsp/board_wdr4900.bsp index 30791e48..f29d8270 100644 --- a/bsp/board_wdr4900.bsp +++ b/bsp/board_wdr4900.bsp @@ -4,5 +4,5 @@ subtarget=generic target=$builddir/$machine images=( - "lede-mpc85xx-generic-tl-wdr4900-v1-squashfs-sysupgrade.bin" + "openwrt-mpc85xx-generic-tl-wdr4900-v1-squashfs-sysupgrade.bin" ) diff --git a/buildscript b/buildscript index 9395b2e8..18f68109 100755 --- a/buildscript +++ b/buildscript @@ -282,7 +282,7 @@ cp_firmware() { [ -n "$subtarget" ] || subtarget="generic" for image in ${images[@]}; do - filename_build=${image//lede/${community}-${version}} + filename_build=${image//openwrt/fff-${version}} filename_build=${filename_build//generic/g} cp "$target/bin/targets/${chipset}/${subtarget}/$image" "./bin/$filename_build"