From 056c57785870d812715ccc616b59f3fce69c171f Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sun, 31 Mar 2013 22:13:31 +0200 Subject: Build system: add make olddefconfig as upstream kernel system and some ARM defaults Signed-off-by: Abdoulaye Walsimou Gaye --- defconfigs/arm/arm920t-clangllvm-eglibc-sf.config | 14 ++++++++++++++ defconfigs/arm/arm920t-clangllvm-uclibc-sf.config | 14 ++++++++++++++ defconfigs/arm/arm920t-gcc-eglibc-sf.config | 14 ++++++++++++++ defconfigs/arm/arm920t-gcc-uclibc-sf.config | 14 ++++++++++++++ mk/buildsystem.mk | 7 ++++--- mk/help.mk | 4 ++++ 6 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 defconfigs/arm/arm920t-clangllvm-eglibc-sf.config create mode 100644 defconfigs/arm/arm920t-clangllvm-uclibc-sf.config create mode 100644 defconfigs/arm/arm920t-gcc-eglibc-sf.config create mode 100644 defconfigs/arm/arm920t-gcc-uclibc-sf.config diff --git a/defconfigs/arm/arm920t-clangllvm-eglibc-sf.config b/defconfigs/arm/arm920t-clangllvm-eglibc-sf.config new file mode 100644 index 0000000..895cf6c --- /dev/null +++ b/defconfigs/arm/arm920t-clangllvm-eglibc-sf.config @@ -0,0 +1,14 @@ +CONFIG_EMBTK_OS_LINUX=y +CONFIG_EMBTK_ARCH_ARM=y +CONFIG_EMBTK_ARCH_ARM_FAMILY_ARM9TDMI=y +CONFIG_EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM920T=y +CONFIG_EMBTK_SOFTFLOAT=y +CONFIG_EMBTK_LLVM_ONLY_TOOLCHAIN=y +CONFIG_EMBTK_GCC_LANGUAGE_CPP=y +CONFIG_EMBTK_CLIB_EGLIBC=y +CONFIG_EMBTK_HAVE_GDB_SYSTEM=y +CONFIG_EMBTK_HAVE_STRACE=y +CONFIG_EMBTK_NUMBER_BUILD_JOBS=3 +CONFIG_EMBTK_HAVE_ROOTFS=y +CONFIG_EMBTK_HAVE_BB=y +CONFIG_EMBTK_HAVE_GTEST=y diff --git a/defconfigs/arm/arm920t-clangllvm-uclibc-sf.config b/defconfigs/arm/arm920t-clangllvm-uclibc-sf.config new file mode 100644 index 0000000..027cbcf --- /dev/null +++ b/defconfigs/arm/arm920t-clangllvm-uclibc-sf.config @@ -0,0 +1,14 @@ +CONFIG_EMBTK_OS_LINUX=y +CONFIG_EMBTK_ARCH_ARM=y +CONFIG_EMBTK_ARCH_ARM_FAMILY_ARM9TDMI=y +CONFIG_EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM920T=y +CONFIG_EMBTK_SOFTFLOAT=y +CONFIG_EMBTK_LLVM_ONLY_TOOLCHAIN=y +CONFIG_EMBTK_GCC_LANGUAGE_CPP=y +CONFIG_EMBTK_CLIB_UCLIBC=y +CONFIG_EMBTK_HAVE_GDB_SYSTEM=y +CONFIG_EMBTK_HAVE_STRACE=y +CONFIG_EMBTK_NUMBER_BUILD_JOBS=3 +CONFIG_EMBTK_HAVE_ROOTFS=y +CONFIG_EMBTK_HAVE_BB=y +CONFIG_EMBTK_HAVE_GTEST=y diff --git a/defconfigs/arm/arm920t-gcc-eglibc-sf.config b/defconfigs/arm/arm920t-gcc-eglibc-sf.config new file mode 100644 index 0000000..61c6c60 --- /dev/null +++ b/defconfigs/arm/arm920t-gcc-eglibc-sf.config @@ -0,0 +1,14 @@ +CONFIG_EMBTK_OS_LINUX=y +CONFIG_EMBTK_ARCH_ARM=y +CONFIG_EMBTK_ARCH_ARM_FAMILY_ARM9TDMI=y +CONFIG_EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM920T=y +CONFIG_EMBTK_SOFTFLOAT=y +CONFIG_EMBTK_GCC_ONLY_TOOLCHAIN=y +CONFIG_EMBTK_GCC_LANGUAGE_CPP=y +CONFIG_EMBTK_CLIB_EGLIBC=y +CONFIG_EMBTK_HAVE_GDB_SYSTEM=y +CONFIG_EMBTK_HAVE_STRACE=y +CONFIG_EMBTK_NUMBER_BUILD_JOBS=3 +CONFIG_EMBTK_HAVE_ROOTFS=y +CONFIG_EMBTK_HAVE_BB=y +CONFIG_EMBTK_HAVE_GTEST=y diff --git a/defconfigs/arm/arm920t-gcc-uclibc-sf.config b/defconfigs/arm/arm920t-gcc-uclibc-sf.config new file mode 100644 index 0000000..4056560 --- /dev/null +++ b/defconfigs/arm/arm920t-gcc-uclibc-sf.config @@ -0,0 +1,14 @@ +CONFIG_EMBTK_OS_LINUX=y +CONFIG_EMBTK_ARCH_ARM=y +CONFIG_EMBTK_ARCH_ARM_FAMILY_ARM9TDMI=y +CONFIG_EMBTK_ARCH_ARM_FAMILY_ARM9TDMI_ARM920T=y +CONFIG_EMBTK_SOFTFLOAT=y +CONFIG_EMBTK_GCC_ONLY_TOOLCHAIN=y +CONFIG_EMBTK_GCC_LANGUAGE_CPP=y +CONFIG_EMBTK_CLIB_UCLIBC=y +CONFIG_EMBTK_HAVE_GDB_SYSTEM=y +CONFIG_EMBTK_HAVE_STRACE=y +CONFIG_EMBTK_NUMBER_BUILD_JOBS=3 +CONFIG_EMBTK_HAVE_ROOTFS=y +CONFIG_EMBTK_HAVE_BB=y +CONFIG_EMBTK_HAVE_GTEST=y diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk index 5ceeac5..79e22e7 100644 --- a/mk/buildsystem.mk +++ b/mk/buildsystem.mk @@ -64,14 +64,14 @@ define __embtk_mk_xconfig $(call __embtk_kconfig_buildrun,$(1)) endef -xconfig menuconfig: embtk_kconfig_basic +xconfig menuconfig olddefconfig: embtk_kconfig_basic $(Q)$(call __embtk_mk_xconfig,$@) embtk_kconfig_basic: $(Q)$(MAKE) -f scripts/Makefile.build \ obj=$(EMBTK_ROOT)/scripts/basic quiet=quiet_ KBUILD_VERBOSE=0 -__bsystem_xtoolchain_decompressed = $(wildcard $(embtk_generated)/toolchain-*/.*.embtk.decompressed) +__bsystem_xtoolchain_decompressed := $(wildcard $(embtk_generated)/toolchain-*/.*.embtk.decompressed) clean: toolchain_clean rmallpath $(Q)$(__embtk_kconfig_clean) [ -e .config ] && cp .config .config.old || true @@ -129,8 +129,9 @@ define __embtk_mk_startbuild $(MAKE) toolchain_install rootfs_build successful_build endef +__bsystem_toolchain_decompressed := $(wildcard $(call __embtk_pkg_dotdecompressed_f,toolchain)) startbuild: - $(if $(wildcard $(call __embtk_pkg_dotdecompressed_f,toolchain)), \ + $(if $(__bsystem_toolchain_decompressed), \ $(__embtk_mk_pwarning_restartbuild),$(__embtk_mk_startbuild)) define __embtk_mk_initsysrootdirs diff --git a/mk/help.mk b/mk/help.mk index 89b9069..22e21b2 100644 --- a/mk/help.mk +++ b/mk/help.mk @@ -35,6 +35,10 @@ help: @echo @echo "make menuconfig: Same as xconfig but using this time ncurse GUI." @echo + @echo "make olddefconfig: Update silently current config utilising a" + @echo " provided .config as base, and sets new" + @echo " symbols to their default value." + @echo @echo "make: Start building your toolchain and your root" @echo " filesystem (if selected) or start xconfig if" @echo " you did not configure before." -- cgit v1.2.3