[PATCH 1/2] bsp: harmonize settings across targets

[Fabian Bläse]

Moin,

sieht gut aus. Aber können wir die "is not set" Zeilen nicht weglassen?

On 01.04.20 12:47, Adrian Schmutzler wrote:
> This patch harmonizes the options in the OpenWrt .config files
> across targets. Many of them have evolved somewhat independently,
> and unifying them should make maintenance easier in the future.
> 
> The most important change is the consistent per-device build applied:
> When building devices with OpenWrt, you have the option to either
> build a default image for the (sub)target, an image for a single
> device, or images for multiple devices. This is controlled by
> CONFIG_TARGET_MULTI_PROFILE. In addition, the option
> CONFIG_TARGET_PER_DEVICE_ROOTFS will toggle whether packages
> are selected per-device or per-target.
> 
> When we build only a single device per target, setting these options
> will only have minor effect. As soon as a second device is added
> though, impact will be heavy, and devices may end up with no/wrong
> packages.
> 
> Thus, this patch sets both options to "y" on all targets, which
> essentially eliminates this problem for the future (and corresponds
> to what the OpenWrt build bots do).
> 
> The only option not harmonized is the CONFIG_TARGET_SQUASHFS_BLOCK_SIZE.
> 
> All ath10k settings are target dependent as well.
> 
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> ---
>  bsp/ipq806x/.config | 17 +++++++++++++++--
>  bsp/mt7621/.config  | 24 ++++++++++++++++++------
>  bsp/wdr4900/.config |  9 +++++----
>  3 files changed, 38 insertions(+), 12 deletions(-)
> 
> diff --git a/bsp/ipq806x/.config b/bsp/ipq806x/.config
> index a02f76fa..d4997bfe 100644
> --- a/bsp/ipq806x/.config
> +++ b/bsp/ipq806x/.config
> @@ -6,10 +6,23 @@ CONFIG_TARGET_ipq806x_generic=y
>  CONFIG_TARGET_MULTI_PROFILE=y
>  CONFIG_TARGET_DEVICE_ipq806x_generic_DEVICE_tplink_c2600=y
>  CONFIG_TARGET_DEVICE_PACKAGES_ipq806x_generic_DEVICE_tplink_c2600="-ath10k-firmware-qca99x0-ct ath10k-firmware-qca99x0"
> -CONFIG_TARGET_PER_DEVICE_ROOTFS=y
>  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_PACKAGE_kmod-hwmon-core=m
> +# 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_PACKAGE_ALFRED_VIS is not set
>  CONFIG_PACKAGE_opkg=m
>  CONFIG_PACKAGE_ath10k-firmware-qca99x0=m
>  CONFIG_PACKAGE_kmod-ath10k=y
> diff --git a/bsp/mt7621/.config b/bsp/mt7621/.config
> index 45925362..ee581085 100644
> --- a/bsp/mt7621/.config
> +++ b/bsp/mt7621/.config
> @@ -5,14 +5,26 @@ CONFIG_TARGET_ramips=y
>  CONFIG_TARGET_ramips_mt7621=y
>  CONFIG_TARGET_MULTI_PROFILE=y
>  CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt-erx=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt-erx=""
>  CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_ubnt-erx-sfp=y
> +CONFIG_TARGET_DEVICE_PACKAGES_ramips_mt7621_DEVICE_ubnt-erx-sfp=""
>  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_PACKAGE_kmod-ifb=y
> -CONFIG_PACKAGE_kmod-ledtrig-heartbeat=y
> -CONFIG_PACKAGE_kmod-ledtrig-netdev=y
> -CONFIG_PACKAGE_kmod-sched-connmark=y
> -CONFIG_PACKAGE_qos-scripts=y
> -CONFIG_PACKAGE_tc=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_PACKAGE_ALFRED_VIS is not set
> +CONFIG_PACKAGE_opkg=m
>  CONFIG_STRIP_KERNEL_EXPORTS=y
>  CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512
> diff --git a/bsp/wdr4900/.config b/bsp/wdr4900/.config
> index 29774c60..abdc06e5 100644
> --- a/bsp/wdr4900/.config
> +++ b/bsp/wdr4900/.config
> @@ -3,8 +3,11 @@
>  #
>  CONFIG_TARGET_mpc85xx=y
>  CONFIG_TARGET_mpc85xx_generic=y
> -CONFIG_TARGET_mpc85xx_generic_Default=y
> +CONFIG_TARGET_MULTI_PROFILE=y
> +CONFIG_TARGET_DEVICE_mpc85xx_generic_DEVICE_tl-wdr4900-v1=y
> +CONFIG_TARGET_DEVICE_PACKAGES_mpc85xx_generic_DEVICE_tl-wdr4900-v1=""
>  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
> @@ -19,9 +22,7 @@ CONFIG_CLEAN_IPKG=y
>  # 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_opkg is not set
> +CONFIG_PACKAGE_opkg=m
>  CONFIG_STRIP_KERNEL_EXPORTS=y
>  CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=512
> 

-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 833 bytes
Beschreibung: OpenPGP digital signature
URL         : <https://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20200401/db07cc98/attachment.sig>