Unverified Commit ee470722 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2900 Add initial openeuler_defconfig for arm64 and x86 

Merge Pull Request from: @zhengzengkai 
 
If new options are introduced, but openeuler_defconfig is not explicitly
configured, the actual compiled version may be configured according to
the default settings, which may be different from the author's expectation.
Therefore, some commands/scripts are added to help developers to check and update
the defconfig. It is also convenient for continuous integration tools to
check the consistency of defconfig.

Based on OLK-5.10 openeuler_defconfig, use the commands mentioned above to
generate the initial openeuler_defconfig for OLK-6.6 kernel build.

Build and boot testing passed. 
 
Link:https://gitee.com/openeuler/kernel/pulls/2900

 

Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents ffc25326 4d88af81

arch/arm64/configs/openeuler_defconfig

0 → 100644
+7942 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/x86/configs/openeuler_defconfig

0 → 100644
+9158 −0

File added.

Preview size limit exceeded, changes collapsed.

scripts/kconfig/Makefile

+22 −0
Original line number Diff line number Diff line
@@ -81,6 +81,25 @@ PHONY += savedefconfig defconfig 
savedefconfig: $(obj)/conf

	$(Q)$< $(silent) --$@=defconfig $(Kconfig)



update_oedefconfig: $(obj)/conf

	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/openeuler_defconfig $(Kconfig)

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/makeconfig.sh $(SRCARCH)



save_oedefconfig: $(obj)/conf

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/makeconfig.sh $(SRCARCH)



check_oedefconfig: $(obj)/conf

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m arch/$(SRCARCH)/configs/openeuler_defconfig > /dev/null

	@$(kecho) "#"

	@$(kecho) "# New options might needs to be updated to the default configuration file."

	@$(kecho) "# Use the following command:"

	@$(kecho) "# 'make openeuler_defconfig/menuconfig/update_oedefconfig/save_oedefconfig'"

	@$(kecho) "# !!! DO NOT EDIT !!!"

	@$(kecho) "#"

	@$(kecho) "# defconfig: arch/$(SRCARCH)/configs/openeuler_defconfig"

	@$(kecho) "#"

	$(Q)$(MAKE) -f $(srctree)/Makefile listnewconfig



defconfig: $(obj)/conf

ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)

	@$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
@@ -144,6 +163,9 @@ help: 
	@echo  '                    default value without prompting'

	@echo  '  tinyconfig	  - Configure the tiniest possible kernel'

	@echo  '  testconfig	  - Run Kconfig unit tests (requires python3 and pytest)'

	@echo  '  update_oedefconfig  - Update arch/<ARCH>/configs/openeuler_defconfig base on current source code'

	@echo  '  save_oedefconfig    - Save current .config to arch/<ARCH>/configs/openeuler_defconfig'

	@echo  '  check_oedefconfig   - Check whether new options need to be added to the defdefault file'

	@echo  ''

	@echo  'Configuration topic targets:'

	@$(foreach f, $(all-config-fragments), \

scripts/kconfig/makeconfig.sh

0 → 100644
+24 −0
Original line number Diff line number Diff line 
#!/bin/sh

# SPDX-License-Identifier: GPL-2.0



if [ ! -f .config ]; then

	echo ".config does not exist"

	exit 1

fi



sed -e '/CONFIG_CC_VERSION_TEXT/d' \

    -e '/CONFIG_CC_IS_GCC/d' \

    -e '/CONFIG_GCC_VERSION/d' \

    -e '/CONFIG_LD_VERSION/d' \

    -e '/CONFIG_LD_IS/d' \

    -e '/CONFIG_CLANG_VERSION/d' \

    -e '/CONFIG_LLD_VERSION/d' \

    -e '/CONFIG_CC_CAN/d' \

    -e '/CONFIG_CC_HAS/d' \

    -e '/CONFIG_AS_VERSION/d' \

    -e '/CONFIG_AS_HAS/d' \

    -e '/CONFIG_AS_IS/d' \

    -e '/CONFIG_PAHOLE_VERSION/d' \

    -i .config



cp .config arch/$1/configs/openeuler_defconfig