From 99b9481c52a8a570c3b18e42b017b23dfbb91ebe Mon Sep 17 00:00:00 2001 From: bbgod118 Date: Mon, 14 Jul 2025 09:54:15 +0800 Subject: [PATCH 1/2] hi3093: Modify default kernel configuration * Modify default kernel configuration for Hi3093/Hi3095. Signed-off-by: bbgod118 --- .../linux/files/config/hi3093/defconfig | 55 ++++++------------- 1 file changed, 17 insertions(+), 38 deletions(-) diff --git a/bsp/meta-hisilicon/recipes-kernel/linux/files/config/hi3093/defconfig b/bsp/meta-hisilicon/recipes-kernel/linux/files/config/hi3093/defconfig index 959e9f89f7d..c06538b3d77 100644 --- a/bsp/meta-hisilicon/recipes-kernel/linux/files/config/hi3093/defconfig +++ b/bsp/meta-hisilicon/recipes-kernel/linux/files/config/hi3093/defconfig @@ -2,19 +2,16 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm64 5.10.0 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-openeuler-linux-gnu-gcc (crosstool-NG 1.26.0) 12.3.1 20230508" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=120301 -CONFIG_LD_VERSION=241000000 +CONFIG_GCC_VERSION=100301 +CONFIG_LD_VERSION=237000000 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24100 +CONFIG_AS_VERSION=23700 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y -CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y -CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -25,7 +22,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-openeuler" +CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y @@ -443,7 +440,6 @@ CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_LLC_128_LINE_SIZE=y CONFIG_ARCH_HAS_FILTER_PGPROT=y CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y -CONFIG_CC_HAVE_SHADOW_CALL_STACK=y # CONFIG_PARAVIRT is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set CONFIG_KEXEC=y @@ -642,18 +638,6 @@ CONFIG_ARCH_SUPPORTS_ACPI=y # CONFIG_ACPI is not set # CONFIG_VIRTUALIZATION is not set # CONFIG_ARM64_CRYPTO is not set -CONFIG_SELFDECOMPRESS_ZIMAGE=y - -# -# zImage support selfdecompre features -# -# CONFIG_SELFDECOMPRESS_ZIMAGE_GZIP is not set -CONFIG_SELFDECOMPRESS_ZIMAGE_XZ=y -# CONFIG_SELFDECOMPRESS_ZIMAGE_LZ4 is not set -# CONFIG_SELFDECOMPRESS_ZIMAGE_LZMA is not set -# CONFIG_SELFDECOMPRESS_ZIMAGE_LZO is not set -# CONFIG_ZIMAGE_2M_TEXT_OFFSET is not set -# end of zImage support selfdecompre features # # General architecture-dependent options @@ -707,7 +691,6 @@ CONFIG_HAVE_ARCH_STACKLEAK=y CONFIG_HAVE_STACKPROTECTOR=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y -CONFIG_ARCH_SUPPORTS_SHADOW_CALL_STACK=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y @@ -2001,7 +1984,10 @@ CONFIG_NET_VENDOR_NETSWIFT=y # CONFIG_NET_VENDOR_QLOGIC is not set # CONFIG_NET_VENDOR_QUALCOMM is not set # CONFIG_NET_VENDOR_RDC is not set -# CONFIG_NET_VENDOR_REALTEK is not set +CONFIG_NET_VENDOR_REALTEK=y +# CONFIG_8139CP is not set +# CONFIG_8139TOO is not set +CONFIG_R8169=y # CONFIG_NET_VENDOR_RENESAS is not set # CONFIG_NET_VENDOR_ROCKER is not set # CONFIG_NET_VENDOR_SAMSUNG is not set @@ -2025,9 +2011,9 @@ CONFIG_NET_VENDOR_YUNSILICON=y # CONFIG_FDDI is not set # CONFIG_HIPPI is not set # CONFIG_UBL is not set -CONFIG_PHYLIB=m +CONFIG_PHYLIB=y CONFIG_SWPHY=y -CONFIG_FIXED_PHY=m +CONFIG_FIXED_PHY=y # # MII PHY device drivers @@ -2056,7 +2042,7 @@ CONFIG_FIXED_PHY=m # CONFIG_MICROSEMI_PHY is not set # CONFIG_NATIONAL_PHY is not set # CONFIG_QSEMI_PHY is not set -# CONFIG_REALTEK_PHY is not set +CONFIG_REALTEK_PHY=y # CONFIG_RENESAS_PHY is not set # CONFIG_ROCKCHIP_PHY is not set # CONFIG_SMSC_PHY is not set @@ -2070,10 +2056,10 @@ CONFIG_FIXED_PHY=m # CONFIG_VITESSE_PHY is not set # CONFIG_XILINX_GMII2RGMII is not set # CONFIG_MICREL_KS8995MA is not set -CONFIG_MDIO_DEVICE=m -CONFIG_MDIO_BUS=m -CONFIG_OF_MDIO=m -CONFIG_MDIO_DEVRES=m +CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_BUS=y +CONFIG_OF_MDIO=y +CONFIG_MDIO_DEVRES=y # CONFIG_MDIO_BITBANG is not set # CONFIG_MDIO_BCM_UNIMAC is not set # CONFIG_MDIO_HISI_FEMAC is not set @@ -2539,7 +2525,7 @@ CONFIG_SPI_MASTER=y # # SPI Protocol Masters # -# CONFIG_SPI_SPIDEV is not set +CONFIG_SPI_SPIDEV=y # CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_TLE62X0 is not set # CONFIG_SPI_SLAVE is not set @@ -4003,15 +3989,10 @@ CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,bpf" # # Memory initialization # -CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y -CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y -# CONFIG_INIT_STACK_NONE is not set +CONFIG_INIT_STACK_NONE=y # CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set # CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set -# CONFIG_INIT_STACK_ALL_PATTERN is not set -CONFIG_INIT_STACK_ALL_ZERO=y # CONFIG_GCC_PLUGIN_STACKLEAK is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set @@ -4357,7 +4338,6 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y # CONFIG_UBSAN is not set -CONFIG_HAVE_KCSAN_COMPILER=y # end of Generic Kernel Debugging Instruments CONFIG_DEBUG_KERNEL=y @@ -4398,7 +4378,6 @@ CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y -CONFIG_CC_HAS_KASAN_SW_TAGS=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y # CONFIG_KASAN is not set CONFIG_HAVE_ARCH_KFENCE=y -- Gitee From 409e7d280ed370b4ea7508fca436b40e3c9740ff Mon Sep 17 00:00:00 2001 From: bbgod118 Date: Wed, 16 Jul 2025 15:40:24 +0800 Subject: [PATCH 2/2] hi3093: Increase busybox priority * Increase busybox priority to 150 Signed-off-by: bbgod118 --- bsp/meta-hisilicon/recipes-core/busybox/busybox_%.bbappend | 1 + .../recipes-kernel/linux/files/config/hi3093/defconfig | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/bsp/meta-hisilicon/recipes-core/busybox/busybox_%.bbappend b/bsp/meta-hisilicon/recipes-core/busybox/busybox_%.bbappend index c8801f6441a..b2e3541efe7 100644 --- a/bsp/meta-hisilicon/recipes-core/busybox/busybox_%.bbappend +++ b/bsp/meta-hisilicon/recipes-core/busybox/busybox_%.bbappend @@ -3,3 +3,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files/:" SRC_URI:append = " \ file://devmem.cfg \ " +ALTERNATIVE_PRIORITY = "150" \ No newline at end of file diff --git a/bsp/meta-hisilicon/recipes-kernel/linux/files/config/hi3093/defconfig b/bsp/meta-hisilicon/recipes-kernel/linux/files/config/hi3093/defconfig index c06538b3d77..7906645cf52 100644 --- a/bsp/meta-hisilicon/recipes-kernel/linux/files/config/hi3093/defconfig +++ b/bsp/meta-hisilicon/recipes-kernel/linux/files/config/hi3093/defconfig @@ -3,12 +3,7 @@ # Linux/arm64 5.10.0 Kernel Configuration # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100301 -CONFIG_LD_VERSION=237000000 -CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23700 -CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO=y -- Gitee