kbuild: use Linux Kernel build scripts

Now we are ready to switch over to real Kbuild. This commit disables temporary scripts: scripts/{Makefile.build.tmp, Makefile.host.tmp} and enables real Kbuild scripts: scripts/{Makefile.build,Makefile.host,Makefile.lib}. This switch is triggered by the line in scripts/Kbuild.include -build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build.tmp obj +build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj We need to adjust some build scripts for U-Boot. But smaller amount of modification is preferable. Additionally, we need to fix compiler flags which are locally added or removed. In Kbuild, it is not allowed to change CFLAGS locally. Instead, ccflags-y, asflags-y, cppflags-y, CFLAGS_$(basetarget).o, CFLAGS_REMOVE_$(basetarget).o are prepared for that purpose. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Tested-by: Gerhard Sittig <gsi@denx.de>

kbuild: use Linux Kernel build scripts
Now we are ready to switch over to real Kbuild. This commit disables temporary scripts: scripts/{Makefile.build.tmp, Makefile.host.tmp} and enables real Kbuild scripts: scripts/{Makefile.build,Makefile.host,Makefile.lib}. This switch is triggered by the line in scripts/Kbuild.include -build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build.tmp obj +build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj We need to adjust some build scripts for U-Boot. But smaller amount of modification is preferable. Additionally, we need to fix compiler flags which are locally added or removed. In Kbuild, it is not allowed to change CFLAGS locally. Instead, ccflags-y, asflags-y, cppflags-y, CFLAGS_$(basetarget).o, CFLAGS_REMOVE_$(basetarget).o are prepared for that purpose. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Tested-by: Gerhard Sittig <gsi@denx.de>
Masahiro Yamada · Tom Rini
1 parent 22433fc54b
Showing 77 changed files with 526 additions and 325 deletions Side-by-side Diff
Makefile
arch/arm/imx-common/Makefile
arch/blackfin/cpu/Makefile
arch/blackfin/lib/Makefile
arch/m68k/cpu/mcf5227x/Makefile
arch/m68k/cpu/mcf523x/Makefile
arch/m68k/cpu/mcf52x2/Makefile
arch/m68k/cpu/mcf532x/Makefile
arch/m68k/cpu/mcf5445x/Makefile
arch/m68k/cpu/mcf547x_8x/Makefile
arch/powerpc/cpu/mpc8xx/Makefile
arch/powerpc/lib/Makefile
arch/sandbox/cpu/Makefile
board/bct-brettl2/config.mk
board/bf518f-ezbrd/config.mk
board/bf526-ezbrd/config.mk
board/bf527-ad7160-eval/config.mk
board/bf527-ezkit/config.mk
board/bf527-sdp/config.mk
board/bf533-ezkit/config.mk
@@ -43,6 +43,78 @@
 XECHO = :
 endif
  
+# *DOCUMENTATION*
+# To see a list of typical targets execute "make help"
+# More info can be located in ./README
+# Comments in this file are targeted only to the developer, do not
+# expect to learn how to build the kernel reading this file.
+
+# Do not:
+# o  use make's built-in rules and variables
+#    (this increases performance and avoids hard-to-debug behaviour);
+# o  print "Entering directory ...";
+MAKEFLAGS += -rR --no-print-directory
+
+# Avoid funny character set dependencies
+unexport LC_ALL
+LC_COLLATE=C
+LC_NUMERIC=C
+export LC_COLLATE LC_NUMERIC
+
+# We are using a recursive build, so we need to do a little thinking
+# to get the ordering right.
+#
+# Most importantly: sub-Makefiles should only ever modify files in
+# their own directory. If in some directory we have a dependency on
+# a file in another dir (which doesn't happen often, but it's often
+# unavoidable when linking the built-in.o targets which finally
+# turn into vmlinux), we will call a sub make in that other dir, and
+# after that we are sure that everything which is in that other dir
+# is now up to date.
+#
+# The only cases where we need to modify files which have global
+# effects are thus separated out and done before the recursive
+# descending is started. They are now explicitly listed as the
+# prepare rule.
+
+# To put more focus on warnings, be less verbose as default
+# Use 'make V=1' to see the full commands
+
+ifeq ("$(origin V)", "command line")
+  KBUILD_VERBOSE = $(V)
+endif
+ifndef KBUILD_VERBOSE
+  KBUILD_VERBOSE = 0
+endif
+
+# Call a source code checker (by default, "sparse") as part of the
+# C compilation.
+#
+# Use 'make C=1' to enable checking of only re-compiled files.
+# Use 'make C=2' to enable checking of *all* source files, regardless
+# of whether they are re-compiled or not.
+#
+# See the file "Documentation/sparse.txt" for more details, including
+# where to get the "sparse" utility.
+
+ifeq ("$(origin C)", "command line")
+  KBUILD_CHECKSRC = $(C)
+endif
+ifndef KBUILD_CHECKSRC
+  KBUILD_CHECKSRC = 0
+endif
+
+# Use make M=dir to specify directory of external module to build
+# Old syntax make ... SUBDIRS=$PWD is still supported
+# Setting the environment variable KBUILD_EXTMOD take precedence
+ifdef SUBDIRS
+  KBUILD_EXTMOD ?= $(SUBDIRS)
+endif
+
+ifeq ("$(origin M)", "command line")
+  KBUILD_EXTMOD := $(M)
+endif
+
 # kbuild supports saving output files in a separate directory.
 # To locate output files in a separate directory two syntaxes are supported.
 # In both cases the working directory must be the root of the kernel src.
  
  
@@ -107,8 +179,14 @@
 # We process the rest of the Makefile if this is the final invocation of make
 ifeq ($(skip-makefile),)
  
+# If building an external module we do not care about the all: rule
+# but instead _all depend on modules
 PHONY += all
+ifeq ($(KBUILD_EXTMOD),)
 _all: all
+else
+_all: modules
+endif
  
 srctree		:= $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))
 objtree		:= $(CURDIR)
@@ -119,24 +197,6 @@
  
 export srctree objtree VPATH
  
-# Call a source code checker (by default, "sparse") as part of the
-# C compilation.
-#
-# Use 'make C=1' to enable checking of re-compiled files.
-#
-# See the linux kernel file "Documentation/sparse.txt" for more details,
-# including where to get the "sparse" utility.
-
-ifdef C
-ifeq ("$(origin C)", "command line")
-CHECKSRC := $(C)
-endif
-endif
-ifndef CHECKSRC
-  CHECKSRC = 0
-endif
-export CHECKSRC
-
 OBJTREE		:= $(objtree)
 SPLTREE		:= $(OBJTREE)/spl
 TPLTREE		:= $(OBJTREE)/tpl
@@ -222,6 +282,78 @@
 HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress")
 endif
  
+# Decide whether to build built-in, modular, or both.
+# Normally, just do built-in.
+
+KBUILD_MODULES :=
+KBUILD_BUILTIN := 1
+
+#	If we have only "make modules", don't compile built-in objects.
+#	When we're building modules with modversions, we need to consider
+#	the built-in objects during the descend as well, in order to
+#	make sure the checksums are up to date before we record them.
+
+ifeq ($(MAKECMDGOALS),modules)
+  KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)
+endif
+
+#	If we have "make <whatever> modules", compile modules
+#	in addition to whatever we do anyway.
+#	Just "make" or "make all" shall build modules as well
+
+# U-Boot does not need modules
+#ifneq ($(filter all _all modules,$(MAKECMDGOALS)),)
+#  KBUILD_MODULES := 1
+#endif
+
+#ifeq ($(MAKECMDGOALS),)
+#  KBUILD_MODULES := 1
+#endif
+
+export KBUILD_MODULES KBUILD_BUILTIN
+export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD
+
+# Beautify output
+# ---------------------------------------------------------------------------
+#
+# Normally, we echo the whole command before executing it. By making
+# that echo $($(quiet)$(cmd)), we now have the possibility to set
+# $(quiet) to choose other forms of output instead, e.g.
+#
+#         quiet_cmd_cc_o_c = Compiling $(RELDIR)/$@
+#         cmd_cc_o_c       = $(CC) $(c_flags) -c -o $@ $<
+#
+# If $(quiet) is empty, the whole command will be printed.
+# If it is set to "quiet_", only the short version will be printed. 
+# If it is set to "silent_", nothing will be printed at all, since
+# the variable $(silent_cmd_cc_o_c) doesn't exist.
+#
+# A simple variant is to prefix commands with $(Q) - that's useful
+# for commands that shall be hidden in non-verbose mode.
+#
+#	$(Q)ln $@ :<
+#
+# If KBUILD_VERBOSE equals 0 then the above command will be hidden.
+# If KBUILD_VERBOSE equals 1 then the above command is displayed.
+
+ifeq ($(KBUILD_VERBOSE),1)
+  quiet =
+  Q =
+else
+  quiet=quiet_
+  Q = @
+endif
+
+# If the user is running make -s (silent mode), suppress echoing of
+# commands
+
+ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
+  quiet=silent_
+endif
+
+export quiet Q KBUILD_VERBOSE
+
+
 # Look for make include files relative to root of kernel src
 MAKEFLAGS += --include-dir=$(srctree)
  
@@ -278,6 +410,31 @@
 export KBUILD_CPPFLAGS NOSTDINC_FLAGS UBOOTINCLUDE
 export KBUILD_CFLAGS KBUILD_AFLAGS
  
+# When compiling out-of-tree modules, put MODVERDIR in the module
+# tree rather than in the kernel tree. The kernel tree might
+# even be read-only.
+export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_versions
+
+# Files to ignore in find ... statements
+
+RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \
+		   -o -name .pc -o -name .hg -o -name .git \) -prune -o
+export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
+			 --exclude CVS --exclude .pc --exclude .hg --exclude .git
+
+# ===========================================================================
+# Rules shared between *config targets and build targets
+
+# Basic helpers built in scripts/
+PHONY += scripts_basic
+scripts_basic:
+	$(Q)$(MAKE) $(build)=scripts/basic
+	$(Q)rm -f .tmp_quiet_recordmcount
+
+# To avoid any implicit rule to kick in, define an empty command.
+scripts/basic/%: scripts_basic ;
+
+
 KBUILD_CFLAGS += -Os #-fomit-frame-pointer
  
 ifdef BUILD_TAG
@@ -333,6 +490,10 @@
 endif
 endif
  
+# FIX ME
+cpp_flags := $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(UBOOTINCLUDE) $(NOSTDINC_FLAGS)
+c_flags := $(KBUILD_CFLAGS) $(cpp_flags)
+
 # If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use
 # that (or fail if absent).  Otherwise, search for a linker script in a
 # standard location.
  
@@ -446,12 +607,12 @@
 # Add GCC lib
 ifdef USE_PRIVATE_LIBGCC
 ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
-PLATFORM_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/libgcc.o
+PLATFORM_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/lib.a
 else
 PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc
 endif
 else
-PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
+PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(c_flags) -print-libgcc-file-name`) -lgcc
 endif
 PLATFORM_LIBS += $(PLATFORM_LIBGCC)
 export PLATFORM_LIBS
@@ -701,7 +862,7 @@
 ifeq ($(CONFIG_KALLSYMS),y)
 		smap=`$(call SYSTEM_MAP,u-boot) | \
 			awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \
-		$(CC) $(CFLAGS) -DSYSTEM_MAP="\"$${smap}\"" \
+		$(CC) $(c_flags) -DSYSTEM_MAP="\"$${smap}\"" \
 			-c $(srctree)/common/system_map.c -o common/system_map.o
 		$(GEN_UBOOT) common/system_map.o
 endif
  
  
  
  
  
@@ -709,27 +870,27 @@
 $(OBJS):
 	@:
  
-$(LIBS):	depend $(SUBDIR_TOOLS)
-		$(MAKE) $(build)=$(patsubst %/,%,$(dir $@))
+$(LIBS):	depend $(SUBDIR_TOOLS) scripts_basic
+		$(Q)$(MAKE) $(build)=$(patsubst %/,%,$(dir $@))
  
-$(SUBDIRS):	depend
-		$(MAKE) $(build)=$@ all
+$(SUBDIRS):	depend scripts_basic
+		$(Q)$(MAKE) $(build)=$@
  
 $(SUBDIR_EXAMPLES-y): u-boot
  
 u-boot.lds: $(LDSCRIPT) depend
-		$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@
+		$(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@
  
-nand_spl:	$(TIMESTAMP_FILE) $(VERSION_FILE) depend
+nand_spl:	$(TIMESTAMP_FILE) $(VERSION_FILE) depend scripts_basic
 		$(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all
  
 u-boot-nand.bin:	nand_spl u-boot.bin
 		cat nand_spl/u-boot-spl-16k.bin u-boot.bin > u-boot-nand.bin
  
-spl/u-boot-spl.bin:	$(SUBDIR_TOOLS) depend
+spl/u-boot-spl.bin:	$(SUBDIR_TOOLS) depend scripts_basic
 		$(MAKE) obj=spl -f $(srctree)/spl/Makefile all
  
-tpl/u-boot-tpl.bin:	$(SUBDIR_TOOLS) depend
+tpl/u-boot-tpl.bin:	$(SUBDIR_TOOLS) depend scripts_basic
 		$(MAKE) obj=tpl -f $(srctree)/spl/Makefile all CONFIG_TPL_BUILD=y
  
 # Explicitly make _depend in subdirs containing multiple targets to prevent
  
@@ -804,14 +965,14 @@
 include/autoconf.mk.dep: include/config.h include/common.h
 	@$(XECHO) Generating $@ ; \
 	: Generate the dependancies ; \
-	$(CC) -x c -DDO_DEPS_ONLY -M $(CFLAGS) $(CPPFLAGS) \
+	$(CC) -x c -DDO_DEPS_ONLY -M $(c_flags) \
 		-MQ include/autoconf.mk $(srctree)/include/common.h > $@ || \
 		rm $@
  
 include/autoconf.mk: include/config.h
 	@$(XECHO) Generating $@ ; \
 	: Extract the config macros ; \
-	$(CPP) $(CFLAGS) -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && \
+	$(CPP) $(c_flags) -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && \
 		sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp > $@; \
 	rm $@.tmp
  
@@ -819,7 +980,7 @@
 include/tpl-autoconf.mk: include/config.h
 	@$(XECHO) Generating $@ ; \
 	: Extract the config macros ; \
-	$(CPP) $(CFLAGS) -DCONFIG_TPL_BUILD  -DCONFIG_SPL_BUILD\
+	$(CPP) $(c_flags) -DCONFIG_TPL_BUILD  -DCONFIG_SPL_BUILD\
 			-DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && \
 		sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp > $@; \
 	rm $@.tmp
@@ -827,7 +988,7 @@
 include/spl-autoconf.mk: include/config.h
 	@$(XECHO) Generating $@ ; \
 	: Extract the config macros ; \
-	$(CPP) $(CFLAGS) -DCONFIG_SPL_BUILD -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && \
+	$(CPP) $(c_flags) -DCONFIG_SPL_BUILD -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && \
 		sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp > $@; \
 	rm $@.tmp
  
@@ -838,7 +999,7 @@
 lib/asm-offsets.s: include/config.h $(srctree)/lib/asm-offsets.c
 	@mkdir -p lib
 	$(CC) -DDO_DEPS_ONLY \
-		$(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
+		$(c_flags) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
 		-o $@ $(srctree)/lib/asm-offsets.c -c -S
  
 include/generated/asm-offsets.h: $(CPUDIR)/$(SOC)/asm-offsets.s
@@ -849,7 +1010,7 @@
 	@mkdir -p $(CPUDIR)/$(SOC)
 	if [ -f $(srctree)/$(CPUDIR)/$(SOC)/asm-offsets.c ];then \
 		$(CC) -DDO_DEPS_ONLY \
-		$(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
+		$(c_flags) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
 			-o $@ $(srctree)/$(CPUDIR)/$(SOC)/asm-offsets.c -c -S; \
 	else \
 		touch $@; \
  
  
@@ -900,15 +1061,15 @@
 		@cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
  
 easylogo env gdb:
-	$(MAKE) $(build)=tools/$@ MTD_VERSION=${MTD_VERSION}
+	$(Q)$(MAKE) $(build)=tools/$@ MTD_VERSION=${MTD_VERSION}
  
 gdbtools: gdb
  
 xmldocs pdfdocs psdocs htmldocs mandocs: tools/kernel-doc/docproc
-	$(MAKE) U_BOOT_VERSION=$(U_BOOT_VERSION) $(build)=doc/DocBook $@
+	$(Q)$(MAKE) U_BOOT_VERSION=$(U_BOOT_VERSION) $(build)=doc/DocBook $@
  
 tools-all: easylogo env gdb $(VERSION_FILE) $(TIMESTAMP_FILE)
-	$(MAKE) $(build)=tools HOST_TOOLS_ALL=y
+	$(Q)$(MAKE) $(build)=tools HOST_TOOLS_ALL=y
  
 .PHONY : CHANGELOG
 CHANGELOG:
@@ -968,7 +1129,7 @@
 	@$(MAKE) -f $(srctree)/doc/DocBook/Makefile cleandocs
 	@find $(OBJTREE) -type f \
 		\( -name 'core' -o -name '*.bak' -o -name '*~' -o -name '*.su' \
-		-o -name '*.o'	-o -name '*.a' -o -name '*.exe' \
+		-o -name '*.o'	-o -name '*.a' -o -name '*.exe' -o -name '*.cmd' \
 		-o -name '*.cfgtmp' \) -print \
 		| xargs rm -f
  
@@ -25,7 +25,7 @@
  
 $(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp: $(OBJTREE)/%.cfgtmp : $(SRCTREE)/%
 	mkdir -p $(dir $@)
-	$(CC) -E -x c $< $(CPPFLAGS) -o $@
+	$(CPP) $(cpp_flags) -x c -o $@ $<
  
 $(OBJTREE)/u-boot.imx: $(OBJTREE)/u-boot.bin $(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp
 	$(OBJTREE)/tools/mkimage -n $(filter-out %.bin,$^) -T imximage \
@@ -25,7 +25,7 @@
  
 # make sure our initcode (which goes into LDR) does not
 # have relocs or external references
-$(obj)/initcode.o: CFLAGS += -fno-function-sections -fno-data-sections
+CFLAGS_REMOVE_initcode.o := -ffunction-sections -fdata-sections
 READINIT = env LC_ALL=C $(CROSS_COMPILE)readelf -s $<
 $(obj)/check_initcode: $(obj)/initcode.o
 ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
@@ -35,8 +35,7 @@
 	fi
 endif
  
-$(obj)/init.lds: $(src)/init.lds.S
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P $^ -o $@
+CPPFLAGS_init.lds := -ansi
 $(obj)/init.elf: $(obj)/init.lds $(obj)/init.o $(obj)/initcode.o
 	$(LD) $(LDFLAGS) -T $^ -o $@
@@ -9,7 +9,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS += -DBFIN_BOARD_NAME='"$(BOARD)"'
+# Unnecessary.
+# Use CONFIG_SYS_BOARD instead of BFIN_BOARD_NAME
+# and delete this.
+ccflags-y += -DBFIN_BOARD_NAME='"$(BOARD)"'
  
 obj-y	+= ins.o
 obj-y	+= memcmp.o
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-# CFLAGS += -DET_DEBUG
+# ccflags-y += -DET_DEBUG
  
 extra-y	= start.o
 obj-y	= cpu.o speed.o cpu_init.o interrupts.o
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-# CFLAGS += -DET_DEBUG
+# ccflags-y += -DET_DEBUG
  
 extra-y	= start.o
 obj-y	= cpu.o speed.o cpu_init.o interrupts.o
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-# CFLAGS += -DET_DEBUG
+# ccflags-y += -DET_DEBUG
  
 extra-y	= start.o
 obj-y	= interrupts.o cpu.o speed.o cpu_init.o
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-# CFLAGS += -DET_DEBUG
+# ccflags-y += -DET_DEBUG
  
 extra-y := start.o
 obj-y	= cpu.o speed.o cpu_init.o interrupts.o
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-# CFLAGS += -DET_DEBUG
+# ccflags-y += -DET_DEBUG
  
 extra-y	= start.o
 obj-y	= cpu.o speed.o cpu_init.o interrupts.o pci.o
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-# CFLAGS += -DET_DEBUG
+# ccflags-y += -DET_DEBUG
  
 extra-y = start.o
 obj-y	= cpu.o speed.o cpu_init.o pci.o interrupts.o slicetimer.o
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-# CFLAGS += -DET_DEBUG
+# ccflags-y += -DET_DEBUG
  
 extra-y += start.o
 extra-y += traps.o
@@ -54,11 +54,11 @@
 # Workaround for local bus unaligned access problems
 # on MPC512x and MPC5200
 ifdef CONFIG_MPC512X
-$(obj)/ppcstring.o: AFLAGS += -Dmemcpy=__memcpy
+AFLAGS_ppcstring.o += -Dmemcpy=__memcpy
 obj-y += memcpy_mpc5200.o
 endif
 ifdef CONFIG_MPC5200
-$(obj)/ppcstring.o: AFLAGS += -Dmemcpy=__memcpy
+AFLAGS_ppcstring.o += -Dmemcpy=__memcpy
 obj-y += memcpy_mpc5200.o
 endif
 endif
@@ -10,8 +10,11 @@
 obj-y	:= cpu.o os.o start.o state.o
  
 # os.c is build in the system environment, so needs standard includes
-$(obj)/os.o: CFLAGS := $(filter-out -nostdinc,\
-	$(patsubst -I%,-idirafter%,$(CFLAGS)))
-$(obj)/.depend.os: CPPFLAGS := $(filter-out -nostdinc,\
-	$(patsubst -I%,-idirafter%,$(CPPFLAGS)))
+# CFLAGS_REMOVE_os.o cannot be used to drop header include path
+quiet_cmd_cc_os.o = CC $(quiet_modtag)  $@
+cmd_cc_os.o = $(CC) $(filter-out -nostdinc, \
+	$(patsubst -I%,-idirafter%,$(c_flags))) -c -o $@ $<
+
+$(obj)/os.o: $(src)/os.c FORCE
+	$(call if_changed_dep,cc_os.o)
@@ -7,7 +7,8 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
@@ -7,7 +7,8 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
@@ -7,7 +7,8 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
@@ -7,7 +7,8 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
@@ -7,7 +7,8 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 6
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA       := --dma 6
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
@@ -9,7 +9,8 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
@@ -7,7 +7,8 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA       := --dma 6
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
@@ -8,5 +8,5 @@
 obj-y += mvblx.o fpga.o
 obj-$(CONFIG_ID_EEPROM) += sys_eeprom.o
  
-CFLAGS += -Werror
+ccflags-y += -Werror
@@ -9,7 +9,8 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
@@ -13,7 +13,7 @@
 BUILDUSER := $(shell whoami)
 FORCEBUILD := $(shell rm -f karef.o)
  
-CFLAGS += -DBUILDUSER='"$(BUILDUSER)"'
+ccflags-y += -DBUILDUSER='"$(BUILDUSER)"'
 # TBS: end debugging
  
 obj-y	= karef.o ../common/flash.o ../common/sb_common.o
@@ -12,7 +12,7 @@
 BUILDUSER := $(shell whoami)
 FORCEBUILD := $(shell rm -f metrobox.o)
  
-CFLAGS += -DBUILDUSER='"$(BUILDUSER)"'
+ccflags-y += -DBUILDUSER='"$(BUILDUSER)"'
 # TBS: end debugging
  
 obj-y	= metrobox.o ../common/flash.o ../common/sb_common.o
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS += -D__RELEASE -D__STN_8500
+ccflags-y += -D__RELEASE -D__STN_8500
  
 obj-y	:= snowball.o
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS += -D__RELEASE -D__STN_8500
+ccflags-y += -D__RELEASE -D__STN_8500
  
 obj-y	:= u8500_href.o gpio.o
@@ -7,7 +7,8 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
@@ -7,9 +7,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS_lib += -O2
-CFLAGS_lib/lzma += -O2
-CFLAGS_lib/zlib += -O2
+# FIX ME
+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
+ccflags-y := -O2
+endif
  
 # Set some default LDR flags based on boot mode.
 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8
@@ -238,11 +238,7 @@
 obj-y += memsize.o
 obj-y += stdio.o
  
-$(obj)/env_embedded.o: $(src)/env_embedded.c
-	$(CC) $(AFLAGS) -Wa,--no-warn \
-		-DENV_CRC=$(shell tools/envcrc) -c -o $@ $<
-
-# SEE README.arm-unaligned-accesses
-$(obj)/hush.o: CFLAGS += $(PLATFORM_NO_UNALIGNED)
-$(obj)/fdt_support.o: CFLAGS += $(PLATFORM_NO_UNALIGNED)
+CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null)
+CFLAGS_hush.o := $(PLATFORM_NO_UNALIGNED)
+CFLAGS_fdt_support.o := $(PLATFORM_NO_UNALIGNED)
@@ -58,20 +58,11 @@
  
 OBJCFLAGS += --gap-fill=0xff
  
-CPPFLAGS = $(KBUILD_CPPFLAGS) $(RELFLAGS)
-CPPFLAGS += $(UBOOTINCLUDE)
-CPPFLAGS += $(NOSTDINC_FLAGS) -pipe $(PLATFORM_CPPFLAGS)
+CPPFLAGS = $(RELFLAGS)
+CPPFLAGS += -pipe $(PLATFORM_CPPFLAGS)
  
-CFLAGS := $(KBUILD_CFLAGS) $(CPPFLAGS)
-
 BCURDIR = $(subst $(SRCTREE)/,,$(CURDIR:$(obj)%=%))
  
-AFLAGS := $(KBUILD_AFLAGS) $(CPPFLAGS)
-
 LDFLAGS += $(PLATFORM_LDFLAGS)
 LDFLAGS_FINAL += -Bstatic
-
-#########################################################################
-
-export PLATFORM_CPPFLAGS PLATFORM_RELFLAGS CPPFLAGS CFLAGS AFLAGS
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-#CFLAGS += -DET_DEBUG -DDEBUG
+#ccflags-y += -DET_DEBUG -DDEBUG
  
 obj-$(CONFIG_PARTITIONS) 	+= part.o
 obj-$(CONFIG_MAC_PARTITION)   += part_mac.o
@@ -24,9 +24,9 @@
  
 ###
 # The targets that may be used.
-PHONY += $(obj).depend xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs
+PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs
  
-BOOKS := $(addprefix $(OBJTREE)/doc/DocBook/,$(DOCBOOKS))
+BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
 xmldocs: $(BOOKS)
 sgmldocs: xmldocs
  
  
@@ -51,10 +51,10 @@
  
 ###
 #External programs used
-KERNELDOC = $(SRCTREE)/tools/kernel-doc/kernel-doc
-DOCPROC   = $(OBJTREE)/tools/kernel-doc/docproc
+KERNELDOC = $(srctree)/tools/kernel-doc/kernel-doc
+DOCPROC   = $(objtree)/tools/kernel-doc/docproc
  
-XMLTOFLAGS = -m $(SRCTREE)/doc/DocBook/stylesheet.xsl
+XMLTOFLAGS = -m $(srctree)/doc/DocBook/stylesheet.xsl
 XMLTOFLAGS += --skip-validation
  
 ###
  
  
@@ -64,28 +64,36 @@
 #     appropriate parameters.
 # The following rules are used to generate the .xml documentation
 # required to generate the final targets. (ps, pdf, html).
-%.xml: %.tmpl
-	$(DOCPROC) doc $< >$@
+quiet_cmd_docproc = DOCPROC $@
+      cmd_docproc = SRCTREE=$(srctree)/ $(DOCPROC) doc $< >$@
+define rule_docproc
+	set -e;								\
+        $(if $($(quiet)cmd_$(1)),echo '  $($(quiet)cmd_$(1))';) 	\
+        $(cmd_$(1)); 							\
+        ( 								\
+          echo 'cmd_$@ := $(cmd_$(1))'; 				\
+          echo $@: `SRCTREE=$(srctree) $(DOCPROC) depend $<`; 		\
+        ) > $(dir $@).$(notdir $@).cmd
+endef
  
-ifeq ($@, "cleandocs")
-sinclude $(obj).depend
-$(obj).depend: $(patsubst %.xml, %.tmpl, $(DOCBOOKS))
-	rm -f $(obj).depend ;					\
-	touch $(obj).depend ;					\
-	for file in $^ ; do					\
-		xmlfile=`echo "$${file}" |			\
-			sed "s/tmpl$$/xml/"` ;			\
-		echo -n "$${xmlfile}: ">> $(obj).depend ;	\
-		$(DOCPROC) depend $$file >> $(obj).depend ;	\
-		echo -e "\n\t$(DOCPROC) doc $< >$${xmlfile} " >>	\
-			$(obj).depend ;				\
-	done
+%.xml: %.tmpl FORCE
+	$(call if_changed_rule,docproc)
+
+###
+#Read in all saved dependency files
+cmd_files := $(wildcard $(foreach f,$(BOOKS),$(dir $(f)).$(notdir $(f)).cmd))
+
+ifneq ($(cmd_files),)
+  include $(cmd_files)
 endif
  
 ###
 # Changes in kernel-doc force a rebuild of all documentation
 $(BOOKS): $(KERNELDOC)
  
+# Tell kbuild to always build the programs
+always := $(hostprogs-y)
+
 notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \
 		   exit 1
 db2xtemplate = db2TYPE -o $(dir $@) $<
  
@@ -111,12 +119,12 @@
 quiet_cmd_db2ps = PS      $@
       cmd_db2ps = $(subst TYPE,ps, $($(PS_METHOD)template))
 %.ps : %.xml
-	$(call cmd_db2ps)
+	$(call cmd,db2ps)
  
 quiet_cmd_db2pdf = PDF     $@
       cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template))
 %.pdf : %.xml
-	$(call cmd_db2pdf)
+	$(call cmd,db2pdf)
  
  
 index = index.html
  
  
@@ -132,16 +140,16 @@
 quiet_cmd_db2html = HTML    $@
       cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \
 		echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \
-	$(patsubst %.html,%,$(notdir $@))</a><p>' > $@
+        $(patsubst %.html,%,$(notdir $@))</a><p>' > $@
  
 %.html:	%.xml
 	@(which xmlto > /dev/null 2>&1) || \
 	 (echo "*** You need to install xmlto ***"; \
 	  exit 1)
 	@rm -rf $@ $(patsubst %.html,%,$@)
-	$(call cmd_db2html)
+	$(call cmd,db2html)
 	@if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \
-	    cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
+            cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
  
 quiet_cmd_db2man = MAN     $@
       cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; gzip -f $(obj)/man/*.9; fi
@@ -150,7 +158,7 @@
 	 (echo "*** You need to install xmlto ***"; \
 	  exit 1)
 	$(Q)mkdir -p $(obj)/man
-	$(call cmd_db2man)
+	$(call cmd,db2man)
 	@touch $@
  
 ###
@@ -162,7 +170,7 @@
 	@(which fig2dev > /dev/null 2>&1) || \
 	 (echo "*** You need to install transfig ***"; \
 	  exit 1)
-	$(call cmd_fig2eps)
+	$(call cmd,fig2eps)
  
 quiet_cmd_fig2png = FIG2PNG $@
       cmd_fig2png = fig2dev -Lpng $< $@
@@ -171,7 +179,7 @@
 	@(which fig2dev > /dev/null 2>&1) || \
 	 (echo "*** You need to install transfig ***"; \
 	  exit 1)
-	$(call cmd_fig2png)
+	$(call cmd,fig2png)
  
 ###
 # Rule to convert a .c file to inline XML documentation
@@ -217,7 +225,6 @@
 clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
  
 cleandocs:
-	@rm -f $(obj).depend
 	@$(Q)rm -f $(call objectify, $(clean-files))
 	@$(Q)rm -rf $(call objectify, $(clean-dirs))
  
@@ -8,9 +8,6 @@
 	$(X86DIR)/sys.o \
 	$(X86DIR)/debug.o
  
-EXTRA_CFLAGS += -I$(srctree)/$(src) -I$(srctree)/$(src)/include \
+ccflags-y := -I$(srctree)/$(src) -I$(srctree)/$(src)/include \
 	-D__PPC__  -D__BIG_ENDIAN__
-
-CFLAGS += $(EXTRA_CFLAGS)
-CPPFLAGS += $(EXTRA_CFLAGS)
@@ -8,7 +8,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-#CFLAGS += -DDEBUG
+#ccflags-y += -DDEBUG
  
 obj-$(CONFIG_DTT_ADM1021) += adm1021.o
 obj-$(CONFIG_DTT_ADT7460) += adt7460.o
@@ -5,9 +5,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-LOCAL_CFLAGS  += -I$(TOPDIR)/drivers/net/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux
-CFLAGS  += $(LOCAL_CFLAGS)
-CPPFLAGS  += $(LOCAL_CFLAGS) # needed for depend
+ccflags-y += -I$(src)/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux
  
 obj-y := npe.o \
 	miiphy.o \
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-#CFLAGS += -DDEBUG
+#ccflags-y += -DDEBUG
  
 obj-$(CONFIG_RTC_AT91SAM9_RTT) += at91sam9_rtt.o
 obj-$(CONFIG_RTC_BFIN) += bfin_rtc.o
@@ -9,8 +9,7 @@
 obj-$(CONFIG_USB_MUSB_AM35X) += am35x.o
 obj-$(CONFIG_USB_MUSB_OMAP2PLUS) += omap2430.o
  
-CFLAGS_NO_WARN := $(call cc-option,-Wno-unused-variable) \
-			$(call cc-option,-Wno-unused-but-set-variable) \
-			$(call cc-option,-Wno-unused-label)
-CFLAGS += $(CFLAGS_NO_WARN)
+ccflags-y := $(call cc-option,-Wno-unused-variable) \
+		$(call cc-option,-Wno-unused-but-set-variable) \
+		$(call cc-option,-Wno-unused-label)
@@ -36,7 +36,7 @@
 	$(1) | sed -r -n 's/^OUTPUT_$(2)[ ("]*([^")]*).*/\1/p'
  
 # Run the compiler and get the link script from the linker
-GET_LDS = $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--verbose 2>&1
+GET_LDS = $(CC) $(c_flags) $(ld_flags) -Wl,--verbose 2>&1
  
 $(obj)/dt.o: $(DT_BIN)
 	# We want the output format and arch.
@@ -5,7 +5,7 @@
 #
  
 ifdef FTRACE
-CFLAGS += -finstrument-functions -DFTRACE
+ccflags-y += -finstrument-functions -DFTRACE
 endif
  
 ifeq ($(ARCH),powerpc)
@@ -33,12 +33,6 @@
 EXT_COBJ_FILES-y += lib/vsprintf.o
 EXT_SOBJ_FILES-$(CONFIG_PPC) += arch/powerpc/lib/ppcstring.o
  
-# Create a list of source files so their dependencies can be auto-generated
-SRCS	+= $(addprefix $(SRCTREE)/,$(EXT_COBJ_FILES-y:.o=.c))
-SRCS	+= $(addprefix $(SRCTREE)/,$(EXT_SOBJ_FILES-y:.o=.S))
-SRCS	+= $(addprefix $(SRCTREE)/examples/api/,$(COBJ_FILES-y:.o=.c))
-SRCS	+= $(addprefix $(SRCTREE)/examples/api/,$(SOBJ_FILES-y:.o=.S))
-
 # Create a list of object files to be compiled
 OBJS	+= $(addprefix $(obj)/,$(SOBJ_FILES-y))
 OBJS	+= $(addprefix $(obj)/,$(COBJ_FILES-y))
  
@@ -54,10 +48,11 @@
 		$(OBJCOPY) -O binary $< $@ 2>/dev/null
  
 # Rule to build generic library C files
-$(addprefix $(obj)/,$(notdir $(EXT_COBJ_FILES-y))): $(obj)/%.o: $(SRCTREE)/lib/%.c
-	$(CC) -g $(CFLAGS) -c -o $@ $<
+$(addprefix $(obj)/,$(notdir $(EXT_COBJ_FILES-y))): $(obj)/%.o: $(SRCTREE)/lib/%.c FORCE
+	$(call cmd,force_checksrc)
+	$(call if_changed_rule,cc_o_c)
  
 # Rule to build architecture-specific library assembly files
 $(addprefix $(obj)/,$(notdir $(EXT_SOBJ_FILES-y))): $(obj)/%.o: $(SRCTREE)/arch/$(ARCH)/lib/%.S
-	$(CC) -g $(CFLAGS) -c -o $@ $<
+	$(call if_changed_dep,as_o_S)
@@ -6,7 +6,7 @@
 #
  
 ifdef FTRACE
-CFLAGS += -finstrument-functions -DFTRACE
+ccflags-y += -finstrument-functions -DFTRACE
 endif
  
 extra-y        := hello_world
  
@@ -39,10 +39,11 @@
  
 LIBCOBJS = stubs.o
  
+.SECONDARY: $(call objectify,$(COBJS))
+targets += $(patsubst $(obj)/%,%,$(LIB)) $(COBJS) $(LIBAOBJS) $(LIBCOBJS)
+
 LIBOBJS	= $(addprefix $(obj)/,$(LIBAOBJS) $(LIBCOBJS))
  
-SRCS	:= $(COBJS:.o=.c) $(LIBCOBJS:.o=.c) $(LIBAOBJS:.o=.S)
-OBJS	:= $(addprefix $(obj)/,$(COBJS))
 ELF	:= $(addprefix $(obj)/,$(ELF))
  
 gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
  
  
@@ -52,19 +53,22 @@
 # also causes the entry point of the standalone application to be
 # inconsistent.
 ifeq ($(ARCH),powerpc)
-AFLAGS := $(filter-out $(RELFLAGS),$(AFLAGS))
-CFLAGS := $(filter-out $(RELFLAGS),$(CFLAGS))
-CPPFLAGS := $(filter-out $(RELFLAGS),$(CPPFLAGS))
+# FIX ME
+CPPFLAGS := $(filter-out $(RELFLAGS), $(CPPFLAGS))
 endif
  
 # We don't want gcc reordering functions if possible.  This ensures that an
 # application's entry point will be the first function in the application's
 # source file.
-CFLAGS += $(call cc-option,-fno-toplevel-reorder)
+ccflags-y += $(call cc-option,-fno-toplevel-reorder)
  
 #########################################################################
-$(LIB):	$(LIBOBJS)
-	$(call cmd_link_o_target, $(LIBOBJS))
+
+quiet_cmd_link_lib = LD      $@
+      cmd_link_lib = $(LD) $(ld_flags) -r -o $@ $(filter $(LIBOBJS), $^)
+
+$(LIB):	$(LIBOBJS) FORCE
+	$(call if_changed,link_lib)
  
 $(ELF):
 $(obj)/%:	$(obj)/%.o $(LIB)
@@ -15,5 +15,5 @@
 obj-y += log.o orphan.o recovery.o replay.o
  
 # SEE README.arm-unaligned-accesses
-$(obj)/super.o: CFLAGS += $(PLATFORM_NO_UNALIGNED)
+CFLAGS_super.o := $(PLATFORM_NO_UNALIGNED)
@@ -24,10 +24,7 @@
 	yaffs_summary.o yaffs_tagscompat.o yaffs_verify.o yaffs_yaffs1.o \
 	yaffs_yaffs2.o yaffs_mtdif.o yaffs_mtdif2.o
  
-YCFLAGS =  -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM
-YCFLAGS += -DCONFIG_YAFFS_YAFFS2 -DNO_Y_INLINE
-YCFLAGS += -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
-
-CFLAGS += $(YCFLAGS)
-CPPFLAGS +=  $(YCFLAGS)
+ccflags-y = -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM \
+		-DCONFIG_YAFFS_YAFFS2 -DNO_Y_INLINE \
+		-DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
@@ -67,5 +67,5 @@
 obj-$(CONFIG_CMD_LINK_LOCAL) += rand.o
  
 # SEE README.arm-unaligned-accesses
-$(obj)/bzlib.o: CFLAGS += $(PLATFORM_NO_UNALIGNED)
+CFLAGS_bzlib.o := $(PLATFORM_NO_UNALIGNED)
@@ -8,7 +8,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-CFLAGS += -D_LZMA_PROB32
+ccflags-y += -D_LZMA_PROB32
  
 obj-y += LzmaDec.o LzmaTools.o
@@ -12,17 +12,18 @@
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
 	   $(LDFLAGS_FINAL)
-AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+asflags-y += -DCONFIG_NAND_SPL
+ccflags-y += -DCONFIG_NAND_SPL
  
 SOBJS	= start.o resetvec.o cache.o
 COBJS	= gpio.o nand_boot.o nand_ecc.o memory.o ndfc.o pll.o
  
-SRCS	:= $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj)/,$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
 LNDIR	:= $(nandobj)board/$(BOARDDIR)
  
+targets += $(__OBJS)
+
 all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin \
 	$(nandobj)System.map
  
@@ -42,7 +43,7 @@
 		sort > $@
  
 $(nandobj)u-boot.lds: $(LDSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
+	$(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
  
 # create symbolic links for common files
  
@@ -12,17 +12,18 @@
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
 	   $(LDFLAGS_FINAL)
-AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+asflags-y += -DCONFIG_NAND_SPL
+ccflags-y += -DCONFIG_NAND_SPL
  
 SOBJS	= start.o init.o resetvec.o
 COBJS	= nand_boot.o nand_ecc.o ndfc.o sdram.o
  
-SRCS	:= $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj)/,$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
 LNDIR	:= $(nandobj)board/$(BOARDDIR)
  
+targets += $(__OBJS)
+
 all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
  
 $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@@ -36,7 +37,7 @@
 		-Map $(nandobj)u-boot-spl.map -o $@
  
 $(nandobj)u-boot.lds: $(LDSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
+	$(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
  
 # create symbolic links for common files
  
@@ -12,8 +12,8 @@
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
 	   $(LDFLAGS_FINAL)
-AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+asflags-y += -DCONFIG_NAND_SPL
+ccflags-y += -DCONFIG_NAND_SPL
  
 SOBJS	:= start.o
 SOBJS	+= init.o
  
@@ -23,11 +23,12 @@
 COBJS	+= nand_ecc.o
 COBJS	+= ndfc.o
  
-SRCS	:= $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj)/,$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
 LNDIR	:= $(nandobj)board/$(BOARDDIR)
  
+targets += $(__OBJS)
+
 all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
  
 $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@@ -41,7 +42,7 @@
 		-Map $(nandobj)u-boot-spl.map -o $@
  
 $(nandobj)u-boot.lds: $(LDSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
+	$(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
  
 # create symbolic links for common files
  
@@ -12,17 +12,18 @@
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
 	   $(LDFLAGS_FINAL)
-AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+asflags-y += -DCONFIG_NAND_SPL
+ccflags-y += -DCONFIG_NAND_SPL
  
 SOBJS	= start.o resetvec.o cache.o
 COBJS	= 44x_spd_ddr2.o nand_boot.o nand_ecc.o ndfc.o
  
-SRCS	:= $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj)/,$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
 LNDIR	:= $(nandobj)board/$(BOARDDIR)
  
+targets += $(__OBJS)
+
 all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
  
 $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@@ -36,7 +37,7 @@
 		-Map $(nandobj)u-boot-spl.map -o $@
  
 $(nandobj)u-boot.lds: $(LDSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
+	$(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
  
 # create symbolic links for common files
  
@@ -12,17 +12,18 @@
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
 	   $(LDFLAGS_FINAL)
-AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+asflags-y += -DCONFIG_NAND_SPL
+ccflags-y += -DCONFIG_NAND_SPL
  
 SOBJS	= start.o init.o resetvec.o
 COBJS	= denali_data_eye.o nand_boot.o nand_ecc.o ndfc.o sdram.o
  
-SRCS	:= $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj)/,$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
 LNDIR	:= $(nandobj)board/$(BOARDDIR)
  
+targets += $(__OBJS)
+
 all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
  
 $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@@ -36,7 +37,7 @@
 		-Map $(nandobj)u-boot-spl.map -o $@
  
 $(nandobj)u-boot.lds: $(LDSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
+	$(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
  
 # create symbolic links for common files
  
@@ -13,18 +13,19 @@
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
 	   $(LDFLAGS) $(LDFLAGS_FINAL)
-AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+asflags-y += -DCONFIG_NAND_SPL
+ccflags-y += -DCONFIG_NAND_SPL
  
 SOBJS	= start.o ticks.o
 COBJS	= nand_boot_fsl_elbc.o $(BOARD).o sdram.o ns16550.o spl_minimal.o \
 	  time.o cache.o
  
-SRCS	:= $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj)/,$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
 LNDIR	:= $(nandobj)board/$(BOARDDIR)
  
+targets += $(__OBJS)
+
 all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
  
 $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@@ -38,7 +39,7 @@
 		-Map $(nandobj)u-boot-spl.map -o $@
  
 $(nandobj)u-boot.lds: $(LDSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
+	$(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
  
 # create symbolic links for common files
  
@@ -15,18 +15,19 @@
 LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
 LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
 		$(LDFLAGS) $(LDFLAGS_FINAL)
-AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+asflags-y += -DCONFIG_NAND_SPL
+ccflags-y += -DCONFIG_NAND_SPL
  
 SOBJS	= start.o resetvec.o
 COBJS	= cache.o cpu_init_early.o spl_minimal.o fsl_law.o law.o \
 	  nand_boot.o nand_boot_fsl_elbc.o ns16550.o tlb.o tlb_table.o
  
-SRCS	:= $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj)/,$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
 LNDIR	:= $(nandobj)board/$(BOARDDIR)
  
+targets += $(__OBJS)
+
 all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
  
 $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@@ -40,7 +41,7 @@
 		-Map $(nandobj)u-boot-spl.map -o $@
  
 $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
+	$(CPP) $(cpp_flags) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
 		-ansi -D__ASSEMBLY__ -P - <$< >$@
  
 # create symbolic links for common files
@@ -15,18 +15,19 @@
 LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
 LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
 		$(LDFLAGS) $(LDFLAGS_FINAL)
-AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+asflags-y += -DCONFIG_NAND_SPL
+ccflags-y += -DCONFIG_NAND_SPL
  
 SOBJS	= start.o resetvec.o
 COBJS	= cache.o cpu_init_early.o spl_minimal.o fsl_law.o law.o \
 	  nand_boot.o nand_boot_fsl_elbc.o ns16550.o tlb.o tlb_table.o
  
-SRCS	:= $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj)/,$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
 LNDIR	:= $(nandobj)board/$(BOARDDIR)
  
+targets += $(__OBJS)
+
 all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
  
 $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@@ -40,7 +41,7 @@
 		-Map $(nandobj)u-boot-spl.map -o $@
  
 $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
+	$(CPP) $(cpp_flags) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
 		-ansi -D__ASSEMBLY__ -P - <$< >$@
  
 # create symbolic links for common files
@@ -15,18 +15,19 @@
 LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
 LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
 		$(LDFLAGS) $(LDFLAGS_FINAL)
-AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+asflags-y += -DCONFIG_NAND_SPL
+ccflags-y += -DCONFIG_NAND_SPL
  
 SOBJS	= start.o resetvec.o
 COBJS	= cache.o cpu_init_early.o spl_minimal.o fsl_law.o law.o \
 	  nand_boot.o nand_boot_fsl_elbc.o ns16550.o tlb.o tlb_table.o
  
-SRCS	:= $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj)/,$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
 LNDIR	:= $(nandobj)board/$(BOARDDIR)
  
+targets += $(__OBJS)
+
 all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
  
 $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@@ -40,7 +41,7 @@
 		-Map $(nandobj)u-boot-spl.map -o $@
  
 $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
+	$(CPP) $(cpp_flags) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
 		-ansi -D__ASSEMBLY__ -P - <$< >$@
  
 # create symbolic links for common files
@@ -11,18 +11,19 @@
 LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
 LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
 		$(LDFLAGS) $(LDFLAGS_FINAL)
-AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+asflags-y += -DCONFIG_NAND_SPL
+ccflags-y += -DCONFIG_NAND_SPL
  
 SOBJS	= start.o resetvec.o
 COBJS	= cache.o cpu_init_early.o spl_minimal.o fsl_law.o law.o \
 	  nand_boot.o nand_boot_fsl_elbc.o ns16550.o tlb.o tlb_table.o
  
-SRCS	:= $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj)/,$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
 LNDIR	:= $(nandobj)board/$(BOARDDIR)
  
+targets += $(__OBJS)
+
 all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
  
 $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@@ -36,7 +37,7 @@
 		-Map $(nandobj)u-boot-spl.map -o $@
  
 $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
+	$(CPP) $(cpp_flags) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
 		-ansi -D__ASSEMBLY__ -P - <$< >$@
  
 # create symbolic links for common files
@@ -15,18 +15,19 @@
 LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
 LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
 		$(LDFLAGS) $(LDFLAGS_FINAL)
-AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+asflags-y += -DCONFIG_NAND_SPL
+ccflags-y += -DCONFIG_NAND_SPL
  
 SOBJS	= start.o resetvec.o
 COBJS	= cache.o cpu_init_early.o spl_minimal.o fsl_law.o law.o \
 	  nand_boot.o nand_boot_fsl_elbc.o ns16550.o tlb.o tlb_table.o
  
-SRCS	:= $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj)/,$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
 LNDIR	:= $(nandobj)board/$(BOARDDIR)
  
+targets += $(__OBJS)
+
 all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
  
 $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@@ -40,7 +41,7 @@
 		-Map $(nandobj)u-boot-spl.map -o $@
  
 $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
+	$(CPP) $(cpp_flags) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
 		-ansi -D__ASSEMBLY__ -P - <$< >$@
  
 # create symbolic links for common files
@@ -12,18 +12,19 @@
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
 	   $(LDFLAGS) $(LDFLAGS_FINAL)
-AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+asflags-y += -DCONFIG_NAND_SPL
+ccflags-y += -DCONFIG_NAND_SPL
  
 SOBJS	= start.o ticks.o
 COBJS	= nand_boot_fsl_elbc.o $(BOARD).o sdram.o ns16550.o spl_minimal.o \
 	  time.o cache.o
  
-SRCS	:= $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj)/,$(SOBJS) $(COBJS))
 __OBJS	:= $(SOBJS) $(COBJS)
 LNDIR	:= $(nandobj)board/$(BOARDDIR)
  
+targets += $(__OBJS)
+
 all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
  
 $(nandobj)u-boot-spl-16k.bin:	$(nandobj)u-boot-spl
@@ -37,7 +38,7 @@
 		-Map $(nandobj)u-boot-spl.map -o $@
  
 $(nandobj)u-boot.lds: $(LDSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
+	$(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
  
 # create symbolic links for common files
  
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-# CFLAGS += -DDEBUG
+#ccflags-y += -DDEBUG
  
 obj-$(CONFIG_CMD_NET)  += arp.o
 obj-$(CONFIG_CMD_NET)  += bootp.o
@@ -5,21 +5,20 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
  
-obj-y	+= 20001122-1.o
-obj-y	+= 20010114-2.o
-obj-y	+= 20010226-1.o
-obj-y	+= 980619-1.o
-obj-y	+= acc1.o
-obj-y	+= compare-fp-1.o
-obj-y	+= fpu.o
-obj-y	+= mul-subnormal-single-1.o
-obj-y	+= darwin-ldouble.o
+objs-before-objcopy := 20001122-1.o 20010114-2.o 20010226-1.o 980619-1.o \
+	acc1.o compare-fp-1.o fpu.o mul-subnormal-single-1.o darwin-ldouble.o
+targets += $(objs-before-objcopy)
  
-CFLAGS := $(shell echo $(CFLAGS) | sed s/-msoft-float//)
-CFLAGS += -mhard-float -fkeep-inline-functions
+# remove -msoft-float flag
+$(foreach m, $(objs-before-objcopy), $(eval CFLAGS_REMOVE_$m := -msoft-float))
+ccflags-y := -mhard-float -fkeep-inline-functions
  
-$(addprefix $(obj)/,$(obj-y)): $(obj)/%.o: $(src)/%.c
-	$(CC)  $(ALL_CFLAGS) -o $@.fp $< -c
-	$(OBJCOPY) -R .gnu.attributes $@.fp $@
-	rm -f $@.fp
+# Do not delete intermidiate files (*.o)
+.SECONDARY: $(call objectify, $(objs-before-objcopy))
+
+obj-y := $(objs-before-objcopy:.o=_.o)
+
+OBJCOPYFLAGS := -R .gnu.attributes
+$(obj)/%_.o: $(obj)/%.o
+	$(call if_changed,objcopy)
@@ -165,7 +165,7 @@
 # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=
 # Usage:
 # $(Q)$(MAKE) $(build)=dir
-build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build.tmp obj
+build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
  
 ###
 # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.modbuiltin obj=
@@ -2,7 +2,16 @@
 # Building
 # ==========================================================================
  
-src := $(obj)
+# Modified for U-Boot
+ifeq ($(CONFIG_TPL_BUILD),y)
+  src := $(patsubst tpl/%,%,$(obj))
+else
+  ifeq ($(CONFIG_SPL_BUILD),y)
+    src := $(patsubst spl/%,%,$(obj))
+  else
+    src := $(obj)
+  endif
+endif
  
 PHONY := __build
 __build:
@@ -35,6 +44,11 @@
  
 include scripts/Kbuild.include
  
+# Added for U-Boot
+# We must include config.mk after Kbuild.include
+# so that some config.mk can use cc-option.
+include config.mk
+
 # For backward compatibility check that these variables do not change
 save-cflags := $(CFLAGS)
  
  
@@ -115,14 +129,16 @@
 include scripts/Makefile.host
 endif
  
-ifneq ($(KBUILD_SRC),)
+# Uncommented for U-Boot
+#  We need to create output dicrectory for SPL and TPL even for in-tree build
+#ifneq ($(KBUILD_SRC),)
 # Create output directory if not already present
 _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
  
 # Create directories for object files if directory does not exist
 # Needed when obj-y := dir/file.o syntax is used
 _dummy := $(foreach d,$(obj-dirs), $(shell [ -d $(d) ] || mkdir -p $(d)))
-endif
+#endif
  
 ifndef obj
 $(warning kbuild: Makefile.build is included improperly)
@@ -101,12 +101,13 @@
 modname_flags  = $(if $(filter 1,$(words $(modname))),\
                  -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))")
  
-orig_c_flags   = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \
+# U-Boot also uses $(CPPFLAGS)
+orig_c_flags   = $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \
                  $(ccflags-y) $(CFLAGS_$(basetarget).o)
 _c_flags       = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags))
-_a_flags       = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \
+_a_flags       = $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \
                  $(asflags-y) $(AFLAGS_$(basetarget).o)
-_cpp_flags     = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F))
+_cpp_flags     = $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F))
  
 #
 # Enable gcov profiling flags for a file, directory or for all files depending
  
  
@@ -137,14 +138,15 @@
 __cpp_flags     =                          $(call flags,_cpp_flags)
 endif
  
-c_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
+# Modified for U-Boot: LINUXINCLUDE -> UBOOTINCLUDE
+c_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE)     \
 		 $(__c_flags) $(modkern_cflags)                           \
 		 -D"KBUILD_STR(s)=\#s" $(basename_flags) $(modname_flags)
  
-a_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
+a_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE)     \
 		 $(__a_flags) $(modkern_aflags)
  
-cpp_flags      = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
+cpp_flags      = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE)     \
 		 $(__cpp_flags)
  
 ld_flags       = $(LDFLAGS) $(ldflags-y)
@@ -106,8 +106,7 @@
  
 # Add GCC lib
 ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
-PLATFORM_LIBGCC = $(SPLTREE)/arch/$(ARCH)/lib/libgcc.o
-PLATFORM_LIBS := $(filter-out %/libgcc.o, $(filter-out -lgcc, $(PLATFORM_LIBS))) $(PLATFORM_LIBGCC)
+PLATFORM_LIBS := $(SPLTREE)/arch/$(ARCH)/lib/lib.a
 endif
  
 LIBS-y := $(sort $(LIBS-y))
@@ -155,7 +154,7 @@
 	$(OBJTREE)/tools/mkimage -T omapimage -n byteswap \
 		-a $(CONFIG_SPL_TEXT_BASE) -d $< $@
  
-$(objtree)/SPL : $(obj)/u-boot-spl.bin depend
+$(objtree)/SPL : $(obj)/u-boot-spl.bin
 		$(MAKE) $(build)=spl/arch/arm/imx-common $@
  
 ALL-y	+= $(obj)/$(SPL_BIN).bin
  
  
  
  
@@ -191,21 +190,25 @@
 		--start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
 		-Map $(SPL_BIN).map -o $(SPL_BIN)
  
-$(obj)/$(SPL_BIN):	depend $(START) $(LIBS) $(obj)/u-boot-spl.lds
+$(obj)/$(SPL_BIN): $(START) $(LIBS) $(obj)/u-boot-spl.lds
 	$(GEN_UBOOT)
  
 $(START):
 	@:
  
-$(LIBS):	depend
-	$(MAKE) $(build)=$(patsubst %/,%,$(dir $@))
+$(LIBS):
+	$(Q)$(MAKE) $(build)=$(patsubst %/,%,$(dir $@))
  
-$(obj)/u-boot-spl.lds: $(LDSCRIPT) depend
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@
+# FIX ME
+cpp_flags := $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(UBOOTINCLUDE) $(NOSTDINC_FLAGS)
  
-depend:	$(obj)/.depend
-.PHONY: depend
+$(obj)/u-boot-spl.lds: $(LDSCRIPT) FORCE
+	$(CPP) $(cpp_flags) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@
  
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
+PHONY += FORCE
+FORCE:
+
+# Declare the contents of the .PHONY variable as phony.  We keep that
+# information in a variable so we can use it in if_changed and friends.
+.PHONY: $(PHONY)
@@ -40,19 +40,19 @@
  
 hostprogs-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX)
 hostprogs-$(CONFIG_VIDEO_LOGO) += bmp_logo$(SFX)
-HOSTCFLAGS_bmp_logo$(SFX) := -pedantic
+HOSTCFLAGS_bmp_logo$(SFX).o := -pedantic
  
 hostprogs-$(CONFIG_BUILD_ENVCRC) += envcrc$(SFX)
 envcrc$(SFX)-objs := crc32.o env_embedded.o envcrc.o sha1.o
  
 hostprogs-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX)
-HOSTCFLAGS_gen_eth_addr$(SFX) := -pedantic
+HOSTCFLAGS_gen_eth_addr$(SFX).o := -pedantic
  
 hostprogs-$(CONFIG_CMD_LOADS) += img2srec$(SFX)
-HOSTCFLAGS_img2srec$(SFX) := -pedantic
+HOSTCFLAGS_img2srec$(SFX).o := -pedantic
  
 hostprogs-$(CONFIG_XWAY_SWAP_BYTES) += xway-swap-bytes$(SFX)
-HOSTCFLAGS_xway-swap-bytes$(SFX) := -pedantic
+HOSTCFLAGS_xway-swap-bytes$(SFX).o := -pedantic
  
 hostprogs-y += mkenvimage$(SFX)
 mkenvimage$(SFX)-objs := crc32.o mkenvimage.o os_support.o
@@ -97,7 +97,7 @@
 HOSTLOADLIBES_mkimage$(SFX) := -lssl -lcrypto
 # Add CONFIG_MXS into host CFLAGS, so we can check whether or not register
 # the mxsimage support within tools/mxsimage.c .
-HOSTCFLAGS	+= -DCONFIG_MXS
+HOSTCFLAGS_mxsimage.o += -DCONFIG_MXS
 endif
  
 ifdef CONFIG_FIT_SIGNATURE
  
@@ -111,11 +111,11 @@
  
 hostprogs-$(CONFIG_EXYNOS5250) += mkexynosspl$(SFX)
 hostprogs-$(CONFIG_EXYNOS5420) += mkexynosspl$(SFX)
-HOSTCFLAGS_mkexynosspl$(SFX) := -pedantic
+HOSTCFLAGS_mkexynosspl$(SFX).o := -pedantic
  
 hostprogs-$(CONFIG_MX23) += mxsboot$(SFX)
 hostprogs-$(CONFIG_MX28) += mxsboot$(SFX)
-HOSTCFLAGS_mxsboot$(SFX) := -pedantic
+HOSTCFLAGS_mxsboot$(SFX).o := -pedantic
  
 hostprogs-$(CONFIG_NETCONSOLE) += ncb$(SFX)
 hostprogs-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
@@ -137,7 +137,7 @@
  
 # Don't build by default
 #hostprogs-$(CONFIG_PPC) += mpc86x_clk$(SFX)
-#HOSTCFLAGS_mpc86x_clk$(SFX) := -pedantic
+#HOSTCFLAGS_mpc86x_clk$(SFX).o := -pedantic
  
 always := $(hostprogs-y)
  
@@ -164,11 +164,6 @@
  
 endif # !LOGO_BMP
  
-# now $(obj) is defined
-HOSTSRCS += $(addprefix $(SRCTREE)/,$(EXT_OBJ_FILES-y:.o=.c))
-HOSTSRCS += $(addprefix $(SRCTREE)/tools/,$(OBJ_FILES-y:.o=.c))
-HOSTSRCS += $(addprefix $(SRCTREE)/lib/libfdt/,$(LIBFDT_OBJ_FILES-y:.o=.c))
-
 #
 # Use native tools and options
 # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
@@ -183,7 +178,7 @@
 		-D__KERNEL_STRICT_NAMES \
 		-D_GNU_SOURCE
  
-all:	$(LOGO-y)
+__build:	$(LOGO-y)
  
 subdir-y := kernel-doc
...	...	@@ -43,6 +43,78 @@
43	43	XECHO = :
44	44	endif
45	45
	46	+# DOCUMENTATION
	47	+# To see a list of typical targets execute "make help"
	48	+# More info can be located in ./README
	49	+# Comments in this file are targeted only to the developer, do not
	50	+# expect to learn how to build the kernel reading this file.
	51	+
	52	+# Do not:
	53	+# o use make's built-in rules and variables
	54	+# (this increases performance and avoids hard-to-debug behaviour);
	55	+# o print "Entering directory ...";
	56	+MAKEFLAGS += -rR --no-print-directory
	57	+
	58	+# Avoid funny character set dependencies
	59	+unexport LC_ALL
	60	+LC_COLLATE=C
	61	+LC_NUMERIC=C
	62	+export LC_COLLATE LC_NUMERIC
	63	+
	64	+# We are using a recursive build, so we need to do a little thinking
	65	+# to get the ordering right.
	66	+#
	67	+# Most importantly: sub-Makefiles should only ever modify files in
	68	+# their own directory. If in some directory we have a dependency on
	69	+# a file in another dir (which doesn't happen often, but it's often
	70	+# unavoidable when linking the built-in.o targets which finally
	71	+# turn into vmlinux), we will call a sub make in that other dir, and
	72	+# after that we are sure that everything which is in that other dir
	73	+# is now up to date.
	74	+#
	75	+# The only cases where we need to modify files which have global
	76	+# effects are thus separated out and done before the recursive
	77	+# descending is started. They are now explicitly listed as the
	78	+# prepare rule.
	79	+
	80	+# To put more focus on warnings, be less verbose as default
	81	+# Use 'make V=1' to see the full commands
	82	+
	83	+ifeq ("$(origin V)", "command line")
	84	+ KBUILD_VERBOSE = $(V)
	85	+endif
	86	+ifndef KBUILD_VERBOSE
	87	+ KBUILD_VERBOSE = 0
	88	+endif
	89	+
	90	+# Call a source code checker (by default, "sparse") as part of the
	91	+# C compilation.
	92	+#
	93	+# Use 'make C=1' to enable checking of only re-compiled files.
	94	+# Use 'make C=2' to enable checking of all source files, regardless
	95	+# of whether they are re-compiled or not.
	96	+#
	97	+# See the file "Documentation/sparse.txt" for more details, including
	98	+# where to get the "sparse" utility.
	99	+
	100	+ifeq ("$(origin C)", "command line")
	101	+ KBUILD_CHECKSRC = $(C)
	102	+endif
	103	+ifndef KBUILD_CHECKSRC
	104	+ KBUILD_CHECKSRC = 0
	105	+endif
	106	+
	107	+# Use make M=dir to specify directory of external module to build
	108	+# Old syntax make ... SUBDIRS=$PWD is still supported
	109	+# Setting the environment variable KBUILD_EXTMOD take precedence
	110	+ifdef SUBDIRS
	111	+ KBUILD_EXTMOD ?= $(SUBDIRS)
	112	+endif
	113	+
	114	+ifeq ("$(origin M)", "command line")
	115	+ KBUILD_EXTMOD := $(M)
	116	+endif
	117	+
46	118	# kbuild supports saving output files in a separate directory.
47	119	# To locate output files in a separate directory two syntaxes are supported.
48	120	# In both cases the working directory must be the root of the kernel src.
49	121
50	122
...	...	@@ -107,8 +179,14 @@
107	179	# We process the rest of the Makefile if this is the final invocation of make
108	180	ifeq ($(skip-makefile),)
109	181
	182	+# If building an external module we do not care about the all: rule
	183	+# but instead _all depend on modules
110	184	PHONY += all
	185	+ifeq ($(KBUILD_EXTMOD),)
111	186	_all: all
	187	+else
	188	+_all: modules
	189	+endif
112	190
113	191	srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))
114	192	objtree := $(CURDIR)
...	...	@@ -119,24 +197,6 @@
119	197
120	198	export srctree objtree VPATH
121	199
122		-# Call a source code checker (by default, "sparse") as part of the
123		-# C compilation.
124		-#
125		-# Use 'make C=1' to enable checking of re-compiled files.
126		-#
127		-# See the linux kernel file "Documentation/sparse.txt" for more details,
128		-# including where to get the "sparse" utility.
129		-
130		-ifdef C
131		-ifeq ("$(origin C)", "command line")
132		-CHECKSRC := $(C)
133		-endif
134		-endif
135		-ifndef CHECKSRC
136		- CHECKSRC = 0
137		-endif
138		-export CHECKSRC
139		-
140	200	OBJTREE := $(objtree)
141	201	SPLTREE := $(OBJTREE)/spl
142	202	TPLTREE := $(OBJTREE)/tpl
...	...	@@ -222,6 +282,78 @@
222	282	HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress")
223	283	endif
224	284
	285	+# Decide whether to build built-in, modular, or both.
	286	+# Normally, just do built-in.
	287	+
	288	+KBUILD_MODULES :=
	289	+KBUILD_BUILTIN := 1
	290	+
	291	+# If we have only "make modules", don't compile built-in objects.
	292	+# When we're building modules with modversions, we need to consider
	293	+# the built-in objects during the descend as well, in order to
	294	+# make sure the checksums are up to date before we record them.
	295	+
	296	+ifeq ($(MAKECMDGOALS),modules)
	297	+ KBUILD_BUILTIN := $(if $(CONFIG_MODVERSIONS),1)
	298	+endif
	299	+
	300	+# If we have "make <whatever> modules", compile modules
	301	+# in addition to whatever we do anyway.
	302	+# Just "make" or "make all" shall build modules as well
	303	+
	304	+# U-Boot does not need modules
	305	+#ifneq ($(filter all _all modules,$(MAKECMDGOALS)),)
	306	+# KBUILD_MODULES := 1
	307	+#endif
	308	+
	309	+#ifeq ($(MAKECMDGOALS),)
	310	+# KBUILD_MODULES := 1
	311	+#endif
	312	+
	313	+export KBUILD_MODULES KBUILD_BUILTIN
	314	+export KBUILD_CHECKSRC KBUILD_SRC KBUILD_EXTMOD
	315	+
	316	+# Beautify output
	317	+# ---------------------------------------------------------------------------
	318	+#
	319	+# Normally, we echo the whole command before executing it. By making
	320	+# that echo $($(quiet)$(cmd)), we now have the possibility to set
	321	+# $(quiet) to choose other forms of output instead, e.g.
	322	+#
	323	+# quiet_cmd_cc_o_c = Compiling $(RELDIR)/$@
	324	+# cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
	325	+#
	326	+# If $(quiet) is empty, the whole command will be printed.
	327	+# If it is set to "quiet_", only the short version will be printed.
	328	+# If it is set to "silent_", nothing will be printed at all, since
	329	+# the variable $(silent_cmd_cc_o_c) doesn't exist.
	330	+#
	331	+# A simple variant is to prefix commands with $(Q) - that's useful
	332	+# for commands that shall be hidden in non-verbose mode.
	333	+#
	334	+# $(Q)ln $@ :<
	335	+#
	336	+# If KBUILD_VERBOSE equals 0 then the above command will be hidden.
	337	+# If KBUILD_VERBOSE equals 1 then the above command is displayed.
	338	+
	339	+ifeq ($(KBUILD_VERBOSE),1)
	340	+ quiet =
	341	+ Q =
	342	+else
	343	+ quiet=quiet_
	344	+ Q = @
	345	+endif
	346	+
	347	+# If the user is running make -s (silent mode), suppress echoing of
	348	+# commands
	349	+
	350	+ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
	351	+ quiet=silent_
	352	+endif
	353	+
	354	+export quiet Q KBUILD_VERBOSE
	355	+
	356	+
225	357	# Look for make include files relative to root of kernel src
226	358	MAKEFLAGS += --include-dir=$(srctree)
227	359
...	...	@@ -278,6 +410,31 @@
278	410	export KBUILD_CPPFLAGS NOSTDINC_FLAGS UBOOTINCLUDE
279	411	export KBUILD_CFLAGS KBUILD_AFLAGS
280	412
	413	+# When compiling out-of-tree modules, put MODVERDIR in the module
	414	+# tree rather than in the kernel tree. The kernel tree might
	415	+# even be read-only.
	416	+export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_versions
	417	+
	418	+# Files to ignore in find ... statements
	419	+
	420	+RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS \
	421	+ -o -name .pc -o -name .hg -o -name .git \) -prune -o
	422	+export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
	423	+ --exclude CVS --exclude .pc --exclude .hg --exclude .git
	424	+
	425	+# ===========================================================================
	426	+# Rules shared between *config targets and build targets
	427	+
	428	+# Basic helpers built in scripts/
	429	+PHONY += scripts_basic
	430	+scripts_basic:
	431	+ $(Q)$(MAKE) $(build)=scripts/basic
	432	+ $(Q)rm -f .tmp_quiet_recordmcount
	433	+
	434	+# To avoid any implicit rule to kick in, define an empty command.
	435	+scripts/basic/%: scripts_basic ;
	436	+
	437	+
281	438	KBUILD_CFLAGS += -Os #-fomit-frame-pointer
282	439
283	440	ifdef BUILD_TAG
...	...	@@ -333,6 +490,10 @@
333	490	endif
334	491	endif
335	492
	493	+# FIX ME
	494	+cpp_flags := $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(UBOOTINCLUDE) $(NOSTDINC_FLAGS)
	495	+c_flags := $(KBUILD_CFLAGS) $(cpp_flags)
	496	+
336	497	# If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use
337	498	# that (or fail if absent). Otherwise, search for a linker script in a
338	499	# standard location.
339	500
...	...	@@ -446,12 +607,12 @@
446	607	# Add GCC lib
447	608	ifdef USE_PRIVATE_LIBGCC
448	609	ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
449		-PLATFORM_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/libgcc.o
	610	+PLATFORM_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/lib.a
450	611	else
451	612	PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc
452	613	endif
453	614	else
454		-PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
	615	+PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(c_flags) -print-libgcc-file-name`) -lgcc
455	616	endif
456	617	PLATFORM_LIBS += $(PLATFORM_LIBGCC)
457	618	export PLATFORM_LIBS
...	...	@@ -701,7 +862,7 @@
701	862	ifeq ($(CONFIG_KALLSYMS),y)
702	863	smap=`$(call SYSTEM_MAP,u-boot) \| \
703	864	awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \
704		- $(CC) $(CFLAGS) -DSYSTEM_MAP="\"$${smap}\"" \
	865	+ $(CC) $(c_flags) -DSYSTEM_MAP="\"$${smap}\"" \
705	866	-c $(srctree)/common/system_map.c -o common/system_map.o
706	867	$(GEN_UBOOT) common/system_map.o
707	868	endif
708	869
709	870
710	871
711	872
712	873
...	...	@@ -709,27 +870,27 @@
709	870	$(OBJS):
710	871	@:
711	872
712		-$(LIBS): depend $(SUBDIR_TOOLS)
713		- $(MAKE) $(build)=$(patsubst %/,%,$(dir $@))
	873	+$(LIBS): depend $(SUBDIR_TOOLS) scripts_basic
	874	+ $(Q)$(MAKE) $(build)=$(patsubst %/,%,$(dir $@))
714	875
715		-$(SUBDIRS): depend
716		- $(MAKE) $(build)=$@ all
	876	+$(SUBDIRS): depend scripts_basic
	877	+ $(Q)$(MAKE) $(build)=$@
717	878
718	879	$(SUBDIR_EXAMPLES-y): u-boot
719	880
720	881	u-boot.lds: $(LDSCRIPT) depend
721		- $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@
	882	+ $(CPP) $(cpp_flags) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$< >$@
722	883
723		-nand_spl: $(TIMESTAMP_FILE) $(VERSION_FILE) depend
	884	+nand_spl: $(TIMESTAMP_FILE) $(VERSION_FILE) depend scripts_basic
724	885	$(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all
725	886
726	887	u-boot-nand.bin: nand_spl u-boot.bin
727	888	cat nand_spl/u-boot-spl-16k.bin u-boot.bin > u-boot-nand.bin
728	889
729		-spl/u-boot-spl.bin: $(SUBDIR_TOOLS) depend
	890	+spl/u-boot-spl.bin: $(SUBDIR_TOOLS) depend scripts_basic
730	891	$(MAKE) obj=spl -f $(srctree)/spl/Makefile all
731	892
732		-tpl/u-boot-tpl.bin: $(SUBDIR_TOOLS) depend
	893	+tpl/u-boot-tpl.bin: $(SUBDIR_TOOLS) depend scripts_basic
733	894	$(MAKE) obj=tpl -f $(srctree)/spl/Makefile all CONFIG_TPL_BUILD=y
734	895
735	896	# Explicitly make _depend in subdirs containing multiple targets to prevent
736	897
...	...	@@ -804,14 +965,14 @@
804	965	include/autoconf.mk.dep: include/config.h include/common.h
805	966	@$(XECHO) Generating $@ ; \
806	967	: Generate the dependancies ; \
807		- $(CC) -x c -DDO_DEPS_ONLY -M $(CFLAGS) $(CPPFLAGS) \
	968	+ $(CC) -x c -DDO_DEPS_ONLY -M $(c_flags) \
808	969	-MQ include/autoconf.mk $(srctree)/include/common.h > $@ \|\| \
809	970	rm $@
810	971
811	972	include/autoconf.mk: include/config.h
812	973	@$(XECHO) Generating $@ ; \
813	974	: Extract the config macros ; \
814		- $(CPP) $(CFLAGS) -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && \
	975	+ $(CPP) $(c_flags) -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && \
815	976	sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp > $@; \
816	977	rm $@.tmp
817	978
...	...	@@ -819,7 +980,7 @@
819	980	include/tpl-autoconf.mk: include/config.h
820	981	@$(XECHO) Generating $@ ; \
821	982	: Extract the config macros ; \
822		- $(CPP) $(CFLAGS) -DCONFIG_TPL_BUILD -DCONFIG_SPL_BUILD\
	983	+ $(CPP) $(c_flags) -DCONFIG_TPL_BUILD -DCONFIG_SPL_BUILD\
823	984	-DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && \
824	985	sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp > $@; \
825	986	rm $@.tmp
...	...	@@ -827,7 +988,7 @@
827	988	include/spl-autoconf.mk: include/config.h
828	989	@$(XECHO) Generating $@ ; \
829	990	: Extract the config macros ; \
830		- $(CPP) $(CFLAGS) -DCONFIG_SPL_BUILD -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && \
	991	+ $(CPP) $(c_flags) -DCONFIG_SPL_BUILD -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && \
831	992	sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp > $@; \
832	993	rm $@.tmp
833	994
...	...	@@ -838,7 +999,7 @@
838	999	lib/asm-offsets.s: include/config.h $(srctree)/lib/asm-offsets.c
839	1000	@mkdir -p lib
840	1001	$(CC) -DDO_DEPS_ONLY \
841		- $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
	1002	+ $(c_flags) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
842	1003	-o $@ $(srctree)/lib/asm-offsets.c -c -S
843	1004
844	1005	include/generated/asm-offsets.h: $(CPUDIR)/$(SOC)/asm-offsets.s
...	...	@@ -849,7 +1010,7 @@
849	1010	@mkdir -p $(CPUDIR)/$(SOC)
850	1011	if [ -f $(srctree)/$(CPUDIR)/$(SOC)/asm-offsets.c ];then \
851	1012	$(CC) -DDO_DEPS_ONLY \
852		- $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
	1013	+ $(c_flags) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
853	1014	-o $@ $(srctree)/$(CPUDIR)/$(SOC)/asm-offsets.c -c -S; \
854	1015	else \
855	1016	touch $@; \
856	1017
857	1018
...	...	@@ -900,15 +1061,15 @@
900	1061	@cmp -s $@ $@.tmp && rm -f $@.tmp \|\| mv -f $@.tmp $@
901	1062
902	1063	easylogo env gdb:
903		- $(MAKE) $(build)=tools/$@ MTD_VERSION=${MTD_VERSION}
	1064	+ $(Q)$(MAKE) $(build)=tools/$@ MTD_VERSION=${MTD_VERSION}
904	1065
905	1066	gdbtools: gdb
906	1067
907	1068	xmldocs pdfdocs psdocs htmldocs mandocs: tools/kernel-doc/docproc
908		- $(MAKE) U_BOOT_VERSION=$(U_BOOT_VERSION) $(build)=doc/DocBook $@
	1069	+ $(Q)$(MAKE) U_BOOT_VERSION=$(U_BOOT_VERSION) $(build)=doc/DocBook $@
909	1070
910	1071	tools-all: easylogo env gdb $(VERSION_FILE) $(TIMESTAMP_FILE)
911		- $(MAKE) $(build)=tools HOST_TOOLS_ALL=y
	1072	+ $(Q)$(MAKE) $(build)=tools HOST_TOOLS_ALL=y
912	1073
913	1074	.PHONY : CHANGELOG
914	1075	CHANGELOG:
...	...	@@ -968,7 +1129,7 @@
968	1129	@$(MAKE) -f $(srctree)/doc/DocBook/Makefile cleandocs
969	1130	@find $(OBJTREE) -type f \
970	1131	\( -name 'core' -o -name '.bak' -o -name '~' -o -name '*.su' \
971		- -o -name '.o' -o -name '.a' -o -name '*.exe' \
	1132	+ -o -name '.o' -o -name '.a' -o -name '.exe' -o -name '.cmd' \
972	1133	-o -name '*.cfgtmp' \) -print \
973	1134	\| xargs rm -f
974	1135
...	...	@@ -25,7 +25,7 @@
25	25
26	26	$(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp: $(OBJTREE)/%.cfgtmp : $(SRCTREE)/%
27	27	mkdir -p $(dir $@)
28		- $(CC) -E -x c $< $(CPPFLAGS) -o $@
	28	+ $(CPP) $(cpp_flags) -x c -o $@ $<
29	29
30	30	$(OBJTREE)/u-boot.imx: $(OBJTREE)/u-boot.bin $(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp
31	31	$(OBJTREE)/tools/mkimage -n $(filter-out %.bin,$^) -T imximage \
...	...	@@ -25,7 +25,7 @@
25	25
26	26	# make sure our initcode (which goes into LDR) does not
27	27	# have relocs or external references
28		-$(obj)/initcode.o: CFLAGS += -fno-function-sections -fno-data-sections
	28	+CFLAGS_REMOVE_initcode.o := -ffunction-sections -fdata-sections
29	29	READINIT = env LC_ALL=C $(CROSS_COMPILE)readelf -s $<
30	30	$(obj)/check_initcode: $(obj)/initcode.o
31	31	ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
...	...	@@ -35,8 +35,7 @@
35	35	fi
36	36	endif
37	37
38		-$(obj)/init.lds: $(src)/init.lds.S
39		- $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P $^ -o $@
	38	+CPPFLAGS_init.lds := -ansi
40	39	$(obj)/init.elf: $(obj)/init.lds $(obj)/init.o $(obj)/initcode.o
41	40	$(LD) $(LDFLAGS) -T $^ -o $@
...	...	@@ -9,7 +9,10 @@
9	9	# SPDX-License-Identifier: GPL-2.0+
10	10	#
11	11
12		-CFLAGS += -DBFIN_BOARD_NAME='"$(BOARD)"'
	12	+# Unnecessary.
	13	+# Use CONFIG_SYS_BOARD instead of BFIN_BOARD_NAME
	14	+# and delete this.
	15	+ccflags-y += -DBFIN_BOARD_NAME='"$(BOARD)"'
13	16
14	17	obj-y += ins.o
15	18	obj-y += memcmp.o
...	...	@@ -5,7 +5,7 @@
5	5	# SPDX-License-Identifier: GPL-2.0+
6	6	#
7	7
8		-# CFLAGS += -DET_DEBUG
	8	+# ccflags-y += -DET_DEBUG
9	9
10	10	extra-y = start.o
11	11	obj-y = cpu.o speed.o cpu_init.o interrupts.o
...	...	@@ -54,11 +54,11 @@
54	54	# Workaround for local bus unaligned access problems
55	55	# on MPC512x and MPC5200
56	56	ifdef CONFIG_MPC512X
57		-$(obj)/ppcstring.o: AFLAGS += -Dmemcpy=__memcpy
	57	+AFLAGS_ppcstring.o += -Dmemcpy=__memcpy
58	58	obj-y += memcpy_mpc5200.o
59	59	endif
60	60	ifdef CONFIG_MPC5200
61		-$(obj)/ppcstring.o: AFLAGS += -Dmemcpy=__memcpy
	61	+AFLAGS_ppcstring.o += -Dmemcpy=__memcpy
62	62	obj-y += memcpy_mpc5200.o
63	63	endif
64	64	endif
...	...	@@ -10,8 +10,11 @@
10	10	obj-y := cpu.o os.o start.o state.o
11	11
12	12	# os.c is build in the system environment, so needs standard includes
13		-$(obj)/os.o: CFLAGS := $(filter-out -nostdinc,\
14		- $(patsubst -I%,-idirafter%,$(CFLAGS)))
15		-$(obj)/.depend.os: CPPFLAGS := $(filter-out -nostdinc,\
16		- $(patsubst -I%,-idirafter%,$(CPPFLAGS)))
	13	+# CFLAGS_REMOVE_os.o cannot be used to drop header include path
	14	+quiet_cmd_cc_os.o = CC $(quiet_modtag) $@
	15	+cmd_cc_os.o = $(CC) $(filter-out -nostdinc, \
	16	+ $(patsubst -I%,-idirafter%,$(c_flags))) -c -o $@ $<
	17	+
	18	+$(obj)/os.o: $(src)/os.c FORCE
	19	+ $(call if_changed_dep,cc_os.o)
...	...	@@ -7,7 +7,8 @@
7	7	# SPDX-License-Identifier: GPL-2.0+
8	8	#
9	9
10		-CFLAGS_lib += -O2
11		-CFLAGS_lib/lzma += -O2
12		-CFLAGS_lib/zlib += -O2
	10	+# FIX ME
	11	+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
	12	+ccflags-y := -O2
	13	+endif
...	...	@@ -7,9 +7,10 @@
7	7	# SPDX-License-Identifier: GPL-2.0+
8	8	#
9	9
10		-CFLAGS_lib += -O2
11		-CFLAGS_lib/lzma += -O2
12		-CFLAGS_lib/zlib += -O2
	10	+# FIX ME
	11	+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
	12	+ccflags-y := -O2
	13	+endif
13	14
14	15	# Set some default LDR flags based on boot mode.
15	16	LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 6
...	...	@@ -9,7 +9,8 @@
9	9	# SPDX-License-Identifier: GPL-2.0+
10	10	#
11	11
12		-CFLAGS_lib += -O2
13		-CFLAGS_lib/lzma += -O2
14		-CFLAGS_lib/zlib += -O2
	12	+# FIX ME
	13	+ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
	14	+ccflags-y := -O2
	15	+endif