Re: [DistroKit] [PATCH 1/2] mipsel: sync kernelconfig

[Alexander Dahl <ada@thorsis.com>]

Hello Roland,

Am Wed, Jul 31, 2024 at 11:14:34AM +0200 schrieb Roland Hieber:
> Part of the changes stem from the toolchain update (commit
> 282b31d940f79ed01352, 2024-04-22, Ladislav Michl: "mipsel: update to
> OSELAS.Toolchain 2023.07.1"), other parts in the kernel-malta config
> were just out of sync with the main kernelconfig. Use default values for
> all prompted options.
> 
> Cc: Oleksij Rempel <o.rempel@pengutronix.de>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  configs/platform-mipsel/kernelconfig          |  2 +-
>  configs/platform-mipsel/kernelconfig-malta    | 15 +++++++++----
>  .../platform-mipsel/kernelconfig-malta.diff   | 21 +++++++++++--------
>  3 files changed, 24 insertions(+), 14 deletions(-)
> 
> diff --git a/configs/platform-mipsel/kernelconfig b/configs/platform-mipsel/kernelconfig
> index 499b7b6c1d17..176969bb7c9b 100644
> --- a/configs/platform-mipsel/kernelconfig
> +++ b/configs/platform-mipsel/kernelconfig
> @@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
>  CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
>  CONFIG_CC_HAS_ASM_INLINE=y
>  CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
> -CONFIG_PAHOLE_VERSION=0
> +CONFIG_PAHOLE_VERSION=124
>  CONFIG_IRQ_WORK=y
>  CONFIG_BUILDTIME_TABLE_SORT=y

This should not have changed since ptxdist-2021.11.0-38-g0c0cec228.
Maybe configs/platform-mipsel/rules/kernel*.make are outdated?

Greets
Alex

>  
> diff --git a/configs/platform-mipsel/kernelconfig-malta b/configs/platform-mipsel/kernelconfig-malta
> index 35d3219ab371..6f73c6047892 100644
> --- a/configs/platform-mipsel/kernelconfig-malta
> +++ b/configs/platform-mipsel/kernelconfig-malta
> @@ -2,9 +2,9 @@
>  # Automatically generated file; DO NOT EDIT.
>  # Linux/mips 6.4.10 Kernel Configuration
>  #
> -CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.0 13-20230624) 13.1.1 20230624"
> +CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.1 13-20231118) 13.2.1 20231118"
>  CONFIG_CC_IS_GCC=y
> -CONFIG_GCC_VERSION=130101
> +CONFIG_GCC_VERSION=130201
>  CONFIG_CLANG_VERSION=0
>  CONFIG_AS_IS_GNU=y
>  CONFIG_AS_VERSION=24000
> @@ -1450,6 +1450,7 @@ CONFIG_BLK_DEV=y
>  # CONFIG_BLK_DEV_NULL_BLK is not set
>  # CONFIG_BLK_DEV_FD is not set
>  # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
> +# CONFIG_ZRAM is not set
>  CONFIG_BLK_DEV_LOOP=m
>  CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
>  # CONFIG_BLK_DEV_DRBD is not set
> @@ -3500,11 +3501,11 @@ CONFIG_CRYPTO_CRC32C=y
>  # Compression
>  #
>  CONFIG_CRYPTO_DEFLATE=m
> -# CONFIG_CRYPTO_LZO is not set
> +CONFIG_CRYPTO_LZO=y
>  # CONFIG_CRYPTO_842 is not set
>  # CONFIG_CRYPTO_LZ4 is not set
>  # CONFIG_CRYPTO_LZ4HC is not set
> -# CONFIG_CRYPTO_ZSTD is not set
> +CONFIG_CRYPTO_ZSTD=y
>  # end of Compression
>  
>  #
> @@ -3621,9 +3622,15 @@ CONFIG_CRC32_SLICEBY8=y
>  # CONFIG_CRC7 is not set
>  CONFIG_LIBCRC32C=m
>  # CONFIG_CRC8 is not set
> +CONFIG_XXHASH=y
>  # CONFIG_RANDOM32_SELFTEST is not set
>  CONFIG_ZLIB_INFLATE=m
>  CONFIG_ZLIB_DEFLATE=m
> +CONFIG_LZO_COMPRESS=y
> +CONFIG_LZO_DECOMPRESS=y
> +CONFIG_ZSTD_COMMON=y
> +CONFIG_ZSTD_COMPRESS=y
> +CONFIG_ZSTD_DECOMPRESS=y
>  # CONFIG_XZ_DEC is not set
>  CONFIG_GENERIC_ALLOCATOR=y
>  CONFIG_TEXTSEARCH=y
> diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff
> index 941646631905..032020ae876a 100644
> --- a/configs/platform-mipsel/kernelconfig-malta.diff
> +++ b/configs/platform-mipsel/kernelconfig-malta.diff
> @@ -1,4 +1,4 @@
> -bb72d3559ad286bbed584fb7dce43ed7
> +2b532330125b9ad63586ebb2fff9745a
>  # CONFIG_8139CP is not set
>  # CONFIG_8139TOO is not set
>  # CONFIG_ACENIC is not set
> @@ -84,10 +84,10 @@ CONFIG_BLK_DEV_BSG=y
>  CONFIG_BLK_DEV_BSGLIB=y
>  CONFIG_BLK_DEV_BSG_COMMON=y
>  CONFIG_BLK_DEV_DM=m
> -# CONFIG_BLK_DEV_FD is not set
>  CONFIG_BLK_DEV_LOOP=m
>  CONFIG_BLK_DEV_MD=m
>  # CONFIG_BLK_DEV_NVME is not set
> +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
>  CONFIG_BLK_DEV_SD=y
>  # CONFIG_BLK_DEV_SR is not set
>  CONFIG_BLK_MQ_PCI=y
> @@ -160,7 +160,6 @@ CONFIG_CRC32_SLICEBY8=y
>  # CONFIG_CRC_CCITT is not set
>  CONFIG_CRC_ITU_T=m
>  CONFIG_CROSS_MEMORY_ATTACH=y
> -CONFIG_CRYPTO_ACOMP2=y
>  CONFIG_CRYPTO_AEAD2=y
>  CONFIG_CRYPTO_AEAD=m
>  CONFIG_CRYPTO_AES=m
> @@ -207,7 +206,6 @@ CONFIG_CRYPTO_ESSIV=m
>  CONFIG_CRYPTO_FCRYPT=m
>  CONFIG_CRYPTO_GCM=m
>  CONFIG_CRYPTO_GHASH=m
> -CONFIG_CRYPTO_HASH_INFO=y
>  CONFIG_CRYPTO_HMAC=y
>  CONFIG_CRYPTO_HW=y
>  CONFIG_CRYPTO_JITTERENTROPY=m
> @@ -830,11 +828,7 @@ CONFIG_MTD_OOPS=m
>  # CONFIG_MTD_PHYSMAP_VERSATILE is undefined
>  # CONFIG_MTD_PMC551 is not set
>  CONFIG_MTD_UBI=m
> -CONFIG_MTD_UBI_BEB_LIMIT=20
> -# CONFIG_MTD_UBI_BLOCK is not set
> -# CONFIG_MTD_UBI_FASTMAP is not set
>  CONFIG_MTD_UBI_GLUEBI=m
> -CONFIG_MTD_UBI_WL_THRESHOLD=4096
>  CONFIG_MULTIPLEXER=y
>  # CONFIG_MUX_ADG792A is not set
>  # CONFIG_MUX_MMIO is not set
> @@ -1116,6 +1110,7 @@ CONFIG_OF_MDIO=m
>  CONFIG_PAGE_POOL_STATS=y
>  CONFIG_PAGE_SIZE_16KB=y
>  # CONFIG_PAGE_SIZE_4KB is not set
> +CONFIG_PAHOLE_VERSION=124
>  # CONFIG_PANIC_ON_OOPS is not set
>  CONFIG_PANIC_ON_OOPS_VALUE=0
>  CONFIG_PANIC_TIMEOUT=0
> @@ -1523,7 +1518,6 @@ CONFIG_SERIO_SERPORT=y
>  # CONFIG_SFP is undefined
>  CONFIG_SGETMASK_SYSCALL=y
>  # CONFIG_SGI_PARTITION is undefined
> -CONFIG_SGL_ALLOC=y
>  CONFIG_SG_POOL=y
>  # CONFIG_SIS190 is not set
>  # CONFIG_SIS900 is not set
> @@ -1602,6 +1596,15 @@ CONFIG_TEXTSEARCH_KMP=m
>  # CONFIG_TPS65010 is undefined
>  CONFIG_TUN=m
>  # CONFIG_TXGBE is not set
> +# CONFIG_UBIFS_ATIME_SUPPORT is undefined
> +# CONFIG_UBIFS_FS is undefined
> +# CONFIG_UBIFS_FS_ADVANCED_COMPR is undefined
> +# CONFIG_UBIFS_FS_AUTHENTICATION is undefined
> +# CONFIG_UBIFS_FS_LZO is undefined
> +# CONFIG_UBIFS_FS_SECURITY is undefined
> +# CONFIG_UBIFS_FS_XATTR is undefined
> +# CONFIG_UBIFS_FS_ZLIB is undefined
> +# CONFIG_UBIFS_FS_ZSTD is undefined
>  # CONFIG_UEVENT_HELPER is not set
>  # CONFIG_UEVENT_HELPER_PATH is undefined
>  # CONFIG_UFS_FS is undefined
> -- 
> 2.39.2
> 
>