michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "Kbuild: Tools build at TIMO_BASE directory."

Browse source 
This reverts commit 23da104f0dc8c6c4a768a727b564272c084aa79b.

Conflicts:
	Makefile
	Makefile.inc

Change-Id: Ia8f2efe3cd37e82c04c304f04c46d787d2265dde

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2015-06-18 10:46:52 -04:00
commit 27603f4801
5 changed files with 16 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Makefile
View file

@ -275,17 +275,8 @@ endif
# Where to locate arch specific headers # Where to locate arch specific headers
hdr-arch := $(SRCARCH) hdr-arch := $(SRCARCH)
ifdef O KCONFIG_CONFIG ?= .config
KCONFIG_CONFIG := $(O)/.config export KCONFIG_CONFIG
KCONFIG_AUTOCONFIG := $(O)/include/config/auto.conf
KCONFIG_AUTOHEADER := $(O)/include/generated/autoconf.h
KCONFIG_TRISTATE := $(O)/include/config/tristate.conf
KCONFIG_AUTOCMD := $(O)/include/config/auto.conf.cmd
else
KCONFIG_CONFIG := .config
endif
export KCONFIG_CONFIG KCONFIG_AUTOCONFIG KCONFIG_AUTOHEADER KCONFIG_TRISTATE KCONFIG_AUTOCMD
# SHELL used by kbuild # SHELL used by kbuild
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@ -339,9 +330,8 @@ STRIP = $(CROSS_COMPILE)strip
OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump OBJDUMP = $(CROSS_COMPILE)objdump
AWK = awk AWK = awk
GENKSYMS = $(ZEPHYR_BASE)/scripts/genksyms/genksyms GENKSYMS = scripts/genksyms/genksyms
GENIDT = $(ZEPHYR_BASE)/scripts/gen_idt/gen_idt GENIDT = scripts/gen_idt/gen_idt
FIXDEP = $(ZEPHYR_BASE)/scripts/basic/fixdep
PERL = perl PERL = perl
PYTHON = python PYTHON = python
CHECK = sparse CHECK = sparse
@ -401,7 +391,7 @@ export VERSION_GENERATION VERSION_MAJOR VERSION_MINOR VERSION_REVISION VERSION_R
export PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION export PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
export CPP AR NM STRIP OBJCOPY OBJDUMP export CPP AR NM STRIP OBJCOPY OBJDUMP
export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE GENIDT FIXDEP export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE GENIDT
export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
export KBUILD_CPPFLAGS NOSTDINC_FLAGS ZEPHYRINCLUDE OBJCOPYFLAGS LDFLAGS export KBUILD_CPPFLAGS NOSTDINC_FLAGS ZEPHYRINCLUDE OBJCOPYFLAGS LDFLAGS
@ -426,8 +416,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
# Basic helpers built in scripts/ # Basic helpers built in scripts/
PHONY += scripts_basic PHONY += scripts_basic
scripts_basic: scripts_basic:
$(Q)$(MAKE) -C $(ZEPHYR_BASE) $(build)=scripts/basic $(Q)$(MAKE) $(build)=scripts/basic
$(Q)$(MAKE) -C $(ZEPHYR_BASE) $(build)=scripts/gen_idt $(Q)$(MAKE) $(build)=scripts/gen_idt
$(Q)rm -f .tmp_quiet_recordmcount $(Q)rm -f .tmp_quiet_recordmcount
# To avoid any implicit rule to kick in, define an empty command. # To avoid any implicit rule to kick in, define an empty command.
@ -513,10 +503,10 @@ include $(srctree)/arch/$(SRCARCH)/Makefile
export KBUILD_DEFCONFIG KBUILD_KCONFIG export KBUILD_DEFCONFIG KBUILD_KCONFIG
config: scripts_basic outputmakefile FORCE config: scripts_basic outputmakefile FORCE
$(Q)$(MAKE) -C $(ZEPHYR_BASE) $(build)=scripts/kconfig $@ $(Q)$(MAKE) $(build)=scripts/kconfig $@
%config: scripts_basic outputmakefile FORCE %config: scripts_basic outputmakefile FORCE
$(Q)$(MAKE) -C $(ZEPHYR_BASE) $(build)=scripts/kconfig $@ $(Q)$(MAKE) $(build)=scripts/kconfig $@
else else
# =========================================================================== # ===========================================================================

8
Makefile.inc
View file

@ -47,7 +47,7 @@ else
S = -s S = -s
endif endif
all: $(CONFIG_DEPS) $(O)/include/config/.dir all: $(CONFIG_DEPS) $(O)/.dir
$(Q)$(MAKE) -C $(ZEPHYR_BASE) O=$(O) \ $(Q)$(MAKE) -C $(ZEPHYR_BASE) O=$(O) \
PROJECT=$(PROJECT_BASE) SOURCE_DIR=$(SOURCE_DIR) CFLAGS=$(CFLAGS) PROJECT=$(PROJECT_BASE) SOURCE_DIR=$(SOURCE_DIR) CFLAGS=$(CFLAGS)
@ -76,16 +76,16 @@ mrproper: FORCE
$(Q)$(MAKE) -C $(ZEPHYR_BASE) \ $(Q)$(MAKE) -C $(ZEPHYR_BASE) \
PROJECT=$(PROJECT_BASE) mrproper PROJECT=$(PROJECT_BASE) mrproper
%config: $(O)/include/config/.dir FORCE %config: $(O)/.dir FORCE
$(Q)$(MAKE) $(S) -C $(ZEPHYR_BASE) O=$(O) \ $(Q)$(MAKE) $(S) -C $(ZEPHYR_BASE) O=$(O) \
PROJECT=$(PROJECT_BASE) $@ PROJECT=$(PROJECT_BASE) $@
qemu: $(CONFIG_DEPS) $(O)/include/config/.dir qemu: $(CONFIG_DEPS) $(O)/.dir
$(Q)$(MAKE) -C $(ZEPHYR_BASE) O=$(O) \ $(Q)$(MAKE) -C $(ZEPHYR_BASE) O=$(O) \
PROJECT=$(PROJECT_BASE) SOURCE_DIR=$(SOURCE_DIR) CFLAGS=$(CFLAGS) qemu PROJECT=$(PROJECT_BASE) SOURCE_DIR=$(SOURCE_DIR) CFLAGS=$(CFLAGS) qemu
$(O)/.config: $(O)/include/config/.dir $(O)/include/generated/.dir $(O)/.config: $(O)/.dir
$(Q)cp $(ZEPHYR_BASE)/arch/$(ARCH)/configs/$(KBUILD_DEFCONFIG) $(O)/.config $(Q)cp $(ZEPHYR_BASE)/arch/$(ARCH)/configs/$(KBUILD_DEFCONFIG) $(O)/.config
$(O)/.initconfig: mergeconfig $(O)/.initconfig: mergeconfig

2
scripts/Kbuild.include
View file

@ -259,7 +259,7 @@ if_changed = $(if $(strip $(any-prereq) $(arg-check)), \
if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ), \ if_changed_dep = $(if $(strip $(any-prereq) $(arg-check) ), \
@set -e; \ @set -e; \
$(echo-cmd) $(cmd_$(1)); \ $(echo-cmd) $(cmd_$(1)); \
$(FIXDEP) $(depfile) $@ '$(make-cmd)' > $(dot-target).tmp;\ scripts/basic/fixdep $(depfile) $@ '$(make-cmd)' > $(dot-target).tmp;\
rm -f $(depfile); \ rm -f $(depfile); \
mv -f $(dot-target).tmp $(dot-target).cmd) mv -f $(dot-target).tmp $(dot-target).cmd)

2
scripts/Makefile.build
View file

@ -249,7 +249,7 @@ define rule_cc_o_c
$(cmd_modversions) \ $(cmd_modversions) \
$(call echo-cmd,record_mcount) \ $(call echo-cmd,record_mcount) \
$(cmd_record_mcount) \ $(cmd_record_mcount) \
$(FIXDEP) $(depfile) $@ '$(call make-cmd,cc_o_c)' > \ scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' > \
$(dot-target).tmp; \ $(dot-target).tmp; \
rm -f $(depfile); \ rm -f $(depfile); \
mv -f $(dot-target).tmp $(dot-target).cmd mv -f $(dot-target).tmp $(dot-target).cmd

6
scripts/kconfig/confdata.c
View file

@ -953,11 +953,7 @@ int conf_write_autoconf(void)
sym_clear_all_valid(); sym_clear_all_valid();
name = getenv("KCONFIG_AUTOCMD"); file_write_dep("include/config/auto.conf.cmd");
if (!name)
name = "include/config/auto.conf.cmd";
file_write_dep(name);
if (conf_split_config()) if (conf_split_config())
return 1; return 1;