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>
master
Masahiro Yamada 10 years ago committed by Tom Rini
parent 22433fc54b
commit 6825a95b0b
  1. 239
      Makefile
  2. 2
      arch/arm/imx-common/Makefile
  3. 5
      arch/blackfin/cpu/Makefile
  4. 5
      arch/blackfin/lib/Makefile
  5. 2
      arch/m68k/cpu/mcf5227x/Makefile
  6. 2
      arch/m68k/cpu/mcf523x/Makefile
  7. 2
      arch/m68k/cpu/mcf52x2/Makefile
  8. 2
      arch/m68k/cpu/mcf532x/Makefile
  9. 2
      arch/m68k/cpu/mcf5445x/Makefile
  10. 2
      arch/m68k/cpu/mcf547x_8x/Makefile
  11. 2
      arch/powerpc/cpu/mpc8xx/Makefile
  12. 4
      arch/powerpc/lib/Makefile
  13. 11
      arch/sandbox/cpu/Makefile
  14. 7
      board/bct-brettl2/config.mk
  15. 7
      board/bf518f-ezbrd/config.mk
  16. 7
      board/bf526-ezbrd/config.mk
  17. 7
      board/bf527-ad7160-eval/config.mk
  18. 7
      board/bf527-ezkit/config.mk
  19. 7
      board/bf527-sdp/config.mk
  20. 7
      board/bf533-ezkit/config.mk
  21. 7
      board/bf533-stamp/config.mk
  22. 7
      board/bf537-stamp/config.mk
  23. 7
      board/bf538f-ezkit/config.mk
  24. 7
      board/bf548-ezkit/config.mk
  25. 7
      board/bf561-acvilon/config.mk
  26. 7
      board/bf561-ezkit/config.mk
  27. 7
      board/br4/config.mk
  28. 7
      board/cm-bf527/config.mk
  29. 7
      board/cm-bf533/config.mk
  30. 7
      board/cm-bf537e/config.mk
  31. 7
      board/cm-bf537u/config.mk
  32. 7
      board/cm-bf548/config.mk
  33. 7
      board/cm-bf561/config.mk
  34. 7
      board/ip04/config.mk
  35. 2
      board/matrix_vision/mvblx/Makefile
  36. 7
      board/pr1/config.mk
  37. 2
      board/sandburst/karef/Makefile
  38. 2
      board/sandburst/metrobox/Makefile
  39. 2
      board/st-ericsson/snowball/Makefile
  40. 2
      board/st-ericsson/u8500/Makefile
  41. 7
      board/tcm-bf518/config.mk
  42. 7
      board/tcm-bf537/config.mk
  43. 10
      common/Makefile
  44. 13
      config.mk
  45. 2
      disk/Makefile
  46. 67
      doc/DocBook/Makefile
  47. 5
      drivers/bios_emulator/Makefile
  48. 2
      drivers/hwmon/Makefile
  49. 4
      drivers/net/npe/Makefile
  50. 2
      drivers/rtc/Makefile
  51. 7
      drivers/usb/musb-new/Makefile
  52. 2
      dts/Makefile
  53. 15
      examples/api/Makefile
  54. 22
      examples/standalone/Makefile
  55. 2
      fs/ubifs/Makefile
  56. 9
      fs/yaffs2/Makefile
  57. 2
      lib/Makefile
  58. 2
      lib/lzma/Makefile
  59. 9
      nand_spl/board/amcc/acadia/Makefile
  60. 9
      nand_spl/board/amcc/bamboo/Makefile
  61. 9
      nand_spl/board/amcc/canyonlands/Makefile
  62. 9
      nand_spl/board/amcc/kilauea/Makefile
  63. 9
      nand_spl/board/amcc/sequoia/Makefile
  64. 9
      nand_spl/board/freescale/mpc8315erdb/Makefile
  65. 9
      nand_spl/board/freescale/mpc8536ds/Makefile
  66. 9
      nand_spl/board/freescale/mpc8569mds/Makefile
  67. 9
      nand_spl/board/freescale/mpc8572ds/Makefile
  68. 9
      nand_spl/board/freescale/p1023rds/Makefile
  69. 9
      nand_spl/board/freescale/p1_p2_rdb/Makefile
  70. 9
      nand_spl/board/sheldon/simpc8313/Makefile
  71. 2
      net/Makefile
  72. 29
      post/lib_powerpc/fpu/Makefile
  73. 2
      scripts/Kbuild.include
  74. 22
      scripts/Makefile.build
  75. 14
      scripts/Makefile.lib
  76. 27
      spl/Makefile
  77. 23
      tools/Makefile

@ -43,6 +43,78 @@ else
XECHO = : XECHO = :
endif 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. # kbuild supports saving output files in a separate directory.
# To locate output files in a separate directory two syntaxes are supported. # 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. # In both cases the working directory must be the root of the kernel src.
@ -107,8 +179,14 @@ endif # ifeq ($(KBUILD_SRC),)
# We process the rest of the Makefile if this is the final invocation of make # We process the rest of the Makefile if this is the final invocation of make
ifeq ($(skip-makefile),) ifeq ($(skip-makefile),)
# If building an external module we do not care about the all: rule
# but instead _all depend on modules
PHONY += all PHONY += all
ifeq ($(KBUILD_EXTMOD),)
_all: all _all: all
else
_all: modules
endif
srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR)) srctree := $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))
objtree := $(CURDIR) objtree := $(CURDIR)
@ -119,24 +197,6 @@ VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
export srctree objtree VPATH 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) OBJTREE := $(objtree)
SPLTREE := $(OBJTREE)/spl SPLTREE := $(OBJTREE)/spl
TPLTREE := $(OBJTREE)/tpl TPLTREE := $(OBJTREE)/tpl
@ -222,6 +282,78 @@ HOSTCFLAGS += $(call os_x_before, 10, 4, "-traditional-cpp")
HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress") HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress")
endif 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 # Look for make include files relative to root of kernel src
MAKEFLAGS += --include-dir=$(srctree) MAKEFLAGS += --include-dir=$(srctree)
@ -278,6 +410,31 @@ export DTC CHECK CHECKFLAGS
export KBUILD_CPPFLAGS NOSTDINC_FLAGS UBOOTINCLUDE export KBUILD_CPPFLAGS NOSTDINC_FLAGS UBOOTINCLUDE
export KBUILD_CFLAGS KBUILD_AFLAGS 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 KBUILD_CFLAGS += -Os #-fomit-frame-pointer
ifdef BUILD_TAG ifdef BUILD_TAG
@ -333,6 +490,10 @@ endif
endif endif
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 # If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use
# that (or fail if absent). Otherwise, search for a linker script in a # that (or fail if absent). Otherwise, search for a linker script in a
# standard location. # standard location.
@ -446,12 +607,12 @@ LIBS := $(sort $(LIBS-y))
# Add GCC lib # Add GCC lib
ifdef USE_PRIVATE_LIBGCC ifdef USE_PRIVATE_LIBGCC
ifeq ("$(USE_PRIVATE_LIBGCC)", "yes") ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
PLATFORM_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/libgcc.o PLATFORM_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/lib.a
else else
PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc PLATFORM_LIBGCC = -L $(USE_PRIVATE_LIBGCC) -lgcc
endif endif
else 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 endif
PLATFORM_LIBS += $(PLATFORM_LIBGCC) PLATFORM_LIBS += $(PLATFORM_LIBGCC)
export PLATFORM_LIBS export PLATFORM_LIBS
@ -701,7 +862,7 @@ u-boot: depend $(SUBDIR_TOOLS) $(OBJS) $(LIBS) u-boot.lds
ifeq ($(CONFIG_KALLSYMS),y) ifeq ($(CONFIG_KALLSYMS),y)
smap=`$(call SYSTEM_MAP,u-boot) | \ smap=`$(call SYSTEM_MAP,u-boot) | \
awk '$$2 ~ /[tTwW]/ {printf $$1 $$3 "\\\\000"}'` ; \ 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 -c $(srctree)/common/system_map.c -o common/system_map.o
$(GEN_UBOOT) common/system_map.o $(GEN_UBOOT) common/system_map.o
endif endif
@ -709,27 +870,27 @@ endif
$(OBJS): $(OBJS):
@: @:
$(LIBS): depend $(SUBDIR_TOOLS) $(LIBS): depend $(SUBDIR_TOOLS) scripts_basic
$(MAKE) $(build)=$(patsubst %/,%,$(dir $@)) $(Q)$(MAKE) $(build)=$(patsubst %/,%,$(dir $@))
$(SUBDIRS): depend $(SUBDIRS): depend scripts_basic
$(MAKE) $(build)=$@ all $(Q)$(MAKE) $(build)=$@
$(SUBDIR_EXAMPLES-y): u-boot $(SUBDIR_EXAMPLES-y): u-boot
u-boot.lds: $(LDSCRIPT) depend 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 $(MAKE) $(build)=nand_spl/board/$(BOARDDIR) all
u-boot-nand.bin: nand_spl u-boot.bin u-boot-nand.bin: nand_spl u-boot.bin
cat nand_spl/u-boot-spl-16k.bin u-boot.bin > u-boot-nand.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 $(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 $(MAKE) obj=tpl -f $(srctree)/spl/Makefile all CONFIG_TPL_BUILD=y
# Explicitly make _depend in subdirs containing multiple targets to prevent # Explicitly make _depend in subdirs containing multiple targets to prevent
@ -804,14 +965,14 @@ checkdtc:
include/autoconf.mk.dep: include/config.h include/common.h include/autoconf.mk.dep: include/config.h include/common.h
@$(XECHO) Generating $@ ; \ @$(XECHO) Generating $@ ; \
: Generate the dependancies ; \ : 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 > $@ || \ -MQ include/autoconf.mk $(srctree)/include/common.h > $@ || \
rm $@ rm $@
include/autoconf.mk: include/config.h include/autoconf.mk: include/config.h
@$(XECHO) Generating $@ ; \ @$(XECHO) Generating $@ ; \
: Extract the config macros ; \ : 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 > $@; \ sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp > $@; \
rm $@.tmp rm $@.tmp
@ -819,7 +980,7 @@ include/autoconf.mk: include/config.h
include/tpl-autoconf.mk: include/config.h include/tpl-autoconf.mk: include/config.h
@$(XECHO) Generating $@ ; \ @$(XECHO) Generating $@ ; \
: Extract the config macros ; \ : 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 && \ -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && \
sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp > $@; \ sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp > $@; \
rm $@.tmp rm $@.tmp
@ -827,7 +988,7 @@ include/tpl-autoconf.mk: include/config.h
include/spl-autoconf.mk: include/config.h include/spl-autoconf.mk: include/config.h
@$(XECHO) Generating $@ ; \ @$(XECHO) Generating $@ ; \
: Extract the config macros ; \ : 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 > $@; \ sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp > $@; \
rm $@.tmp rm $@.tmp
@ -838,7 +999,7 @@ include/generated/generic-asm-offsets.h: lib/asm-offsets.s
lib/asm-offsets.s: include/config.h $(srctree)/lib/asm-offsets.c lib/asm-offsets.s: include/config.h $(srctree)/lib/asm-offsets.c
@mkdir -p lib @mkdir -p lib
$(CC) -DDO_DEPS_ONLY \ $(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 -o $@ $(srctree)/lib/asm-offsets.c -c -S
include/generated/asm-offsets.h: $(CPUDIR)/$(SOC)/asm-offsets.s include/generated/asm-offsets.h: $(CPUDIR)/$(SOC)/asm-offsets.s
@ -849,7 +1010,7 @@ $(CPUDIR)/$(SOC)/asm-offsets.s: include/config.h
@mkdir -p $(CPUDIR)/$(SOC) @mkdir -p $(CPUDIR)/$(SOC)
if [ -f $(srctree)/$(CPUDIR)/$(SOC)/asm-offsets.c ];then \ if [ -f $(srctree)/$(CPUDIR)/$(SOC)/asm-offsets.c ];then \
$(CC) -DDO_DEPS_ONLY \ $(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; \ -o $@ $(srctree)/$(CPUDIR)/$(SOC)/asm-offsets.c -c -S; \
else \ else \
touch $@; \ touch $@; \
@ -900,15 +1061,15 @@ $(TIMESTAMP_FILE):
@cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@ @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
easylogo env gdb: easylogo env gdb:
$(MAKE) $(build)=tools/$@ MTD_VERSION=${MTD_VERSION} $(Q)$(MAKE) $(build)=tools/$@ MTD_VERSION=${MTD_VERSION}
gdbtools: gdb gdbtools: gdb
xmldocs pdfdocs psdocs htmldocs mandocs: tools/kernel-doc/docproc 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) 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 .PHONY : CHANGELOG
CHANGELOG: CHANGELOG:
@ -968,7 +1129,7 @@ clean:
@$(MAKE) -f $(srctree)/doc/DocBook/Makefile cleandocs @$(MAKE) -f $(srctree)/doc/DocBook/Makefile cleandocs
@find $(OBJTREE) -type f \ @find $(OBJTREE) -type f \
\( -name 'core' -o -name '*.bak' -o -name '*~' -o -name '*.su' \ \( -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 \ -o -name '*.cfgtmp' \) -print \
| xargs rm -f | xargs rm -f

@ -25,7 +25,7 @@ obj-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o
$(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp: $(OBJTREE)/%.cfgtmp : $(SRCTREE)/% $(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp: $(OBJTREE)/%.cfgtmp : $(SRCTREE)/%
mkdir -p $(dir $@) 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)/u-boot.imx: $(OBJTREE)/u-boot.bin $(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp
$(OBJTREE)/tools/mkimage -n $(filter-out %.bin,$^) -T imximage \ $(OBJTREE)/tools/mkimage -n $(filter-out %.bin,$^) -T imximage \

@ -25,7 +25,7 @@ extra-y += check_initcode
# make sure our initcode (which goes into LDR) does not # make sure our initcode (which goes into LDR) does not
# have relocs or external references # 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 $< READINIT = env LC_ALL=C $(CROSS_COMPILE)readelf -s $<
$(obj)/check_initcode: $(obj)/initcode.o $(obj)/check_initcode: $(obj)/initcode.o
ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS) ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
@ -35,7 +35,6 @@ ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
fi fi
endif endif
$(obj)/init.lds: $(src)/init.lds.S CPPFLAGS_init.lds := -ansi
$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P $^ -o $@
$(obj)/init.elf: $(obj)/init.lds $(obj)/init.o $(obj)/initcode.o $(obj)/init.elf: $(obj)/init.lds $(obj)/init.o $(obj)/initcode.o
$(LD) $(LDFLAGS) -T $^ -o $@ $(LD) $(LDFLAGS) -T $^ -o $@

@ -9,7 +9,10 @@
# SPDX-License-Identifier: GPL-2.0+ # 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 += ins.o
obj-y += memcmp.o obj-y += memcmp.o

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DET_DEBUG # ccflags-y += -DET_DEBUG
extra-y = start.o extra-y = start.o
obj-y = cpu.o speed.o cpu_init.o interrupts.o obj-y = cpu.o speed.o cpu_init.o interrupts.o

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DET_DEBUG # ccflags-y += -DET_DEBUG
extra-y = start.o extra-y = start.o
obj-y = cpu.o speed.o cpu_init.o interrupts.o obj-y = cpu.o speed.o cpu_init.o interrupts.o

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DET_DEBUG # ccflags-y += -DET_DEBUG
extra-y = start.o extra-y = start.o
obj-y = interrupts.o cpu.o speed.o cpu_init.o obj-y = interrupts.o cpu.o speed.o cpu_init.o

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DET_DEBUG # ccflags-y += -DET_DEBUG
extra-y := start.o extra-y := start.o
obj-y = cpu.o speed.o cpu_init.o interrupts.o obj-y = cpu.o speed.o cpu_init.o interrupts.o

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DET_DEBUG # ccflags-y += -DET_DEBUG
extra-y = start.o extra-y = start.o
obj-y = cpu.o speed.o cpu_init.o interrupts.o pci.o obj-y = cpu.o speed.o cpu_init.o interrupts.o pci.o

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DET_DEBUG # ccflags-y += -DET_DEBUG
extra-y = start.o extra-y = start.o
obj-y = cpu.o speed.o cpu_init.o pci.o interrupts.o slicetimer.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+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DET_DEBUG # ccflags-y += -DET_DEBUG
extra-y += start.o extra-y += start.o
extra-y += traps.o extra-y += traps.o

@ -54,11 +54,11 @@ ifndef CONFIG_SPL_BUILD
# Workaround for local bus unaligned access problems # Workaround for local bus unaligned access problems
# on MPC512x and MPC5200 # on MPC512x and MPC5200
ifdef CONFIG_MPC512X ifdef CONFIG_MPC512X
$(obj)/ppcstring.o: AFLAGS += -Dmemcpy=__memcpy AFLAGS_ppcstring.o += -Dmemcpy=__memcpy
obj-y += memcpy_mpc5200.o obj-y += memcpy_mpc5200.o
endif endif
ifdef CONFIG_MPC5200 ifdef CONFIG_MPC5200
$(obj)/ppcstring.o: AFLAGS += -Dmemcpy=__memcpy AFLAGS_ppcstring.o += -Dmemcpy=__memcpy
obj-y += memcpy_mpc5200.o obj-y += memcpy_mpc5200.o
endif endif
endif endif

@ -10,7 +10,10 @@
obj-y := cpu.o os.o start.o state.o obj-y := cpu.o os.o start.o state.o
# os.c is build in the system environment, so needs standard includes # os.c is build in the system environment, so needs standard includes
$(obj)/os.o: CFLAGS := $(filter-out -nostdinc,\ # CFLAGS_REMOVE_os.o cannot be used to drop header include path
$(patsubst -I%,-idirafter%,$(CFLAGS))) quiet_cmd_cc_os.o = CC $(quiet_modtag) $@
$(obj)/.depend.os: CPPFLAGS := $(filter-out -nostdinc,\ cmd_cc_os.o = $(CC) $(filter-out -nostdinc, \
$(patsubst -I%,-idirafter%,$(CPPFLAGS))) $(patsubst -I%,-idirafter%,$(c_flags))) -c -o $@ $<
$(obj)/os.o: $(src)/os.c FORCE
$(call if_changed_dep,cc_os.o)

@ -7,6 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif

@ -7,6 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif

@ -7,6 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif

@ -7,6 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif

@ -7,6 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 6 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 6

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --dma 6 LDR_FLAGS-BFIN_BOOT_PARA := --dma 6

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16

@ -9,6 +9,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif

@ -7,6 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --dma 6 LDR_FLAGS-BFIN_BOOT_PARA := --dma 6

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

@ -8,4 +8,4 @@
obj-y += mvblx.o fpga.o obj-y += mvblx.o fpga.o
obj-$(CONFIG_ID_EEPROM) += sys_eeprom.o obj-$(CONFIG_ID_EEPROM) += sys_eeprom.o
CFLAGS += -Werror ccflags-y += -Werror

@ -9,6 +9,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif

@ -13,7 +13,7 @@
BUILDUSER := $(shell whoami) BUILDUSER := $(shell whoami)
FORCEBUILD := $(shell rm -f karef.o) FORCEBUILD := $(shell rm -f karef.o)
CFLAGS += -DBUILDUSER='"$(BUILDUSER)"' ccflags-y += -DBUILDUSER='"$(BUILDUSER)"'
# TBS: end debugging # TBS: end debugging
obj-y = karef.o ../common/flash.o ../common/sb_common.o obj-y = karef.o ../common/flash.o ../common/sb_common.o

@ -12,7 +12,7 @@
BUILDUSER := $(shell whoami) BUILDUSER := $(shell whoami)
FORCEBUILD := $(shell rm -f metrobox.o) FORCEBUILD := $(shell rm -f metrobox.o)
CFLAGS += -DBUILDUSER='"$(BUILDUSER)"' ccflags-y += -DBUILDUSER='"$(BUILDUSER)"'
# TBS: end debugging # TBS: end debugging
obj-y = metrobox.o ../common/flash.o ../common/sb_common.o obj-y = metrobox.o ../common/flash.o ../common/sb_common.o

@ -4,6 +4,6 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS += -D__RELEASE -D__STN_8500 ccflags-y += -D__RELEASE -D__STN_8500
obj-y := snowball.o obj-y := snowball.o

@ -4,6 +4,6 @@
# SPDX-License-Identifier: GPL-2.0+ # 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 obj-y := u8500_href.o gpio.o

@ -7,6 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

@ -238,10 +238,6 @@ obj-$(CONFIG_FIT_SIGNATURE) += image-sig.o
obj-y += memsize.o obj-y += memsize.o
obj-y += stdio.o obj-y += stdio.o
$(obj)/env_embedded.o: $(src)/env_embedded.c CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null)
$(CC) $(AFLAGS) -Wa,--no-warn \ CFLAGS_hush.o := $(PLATFORM_NO_UNALIGNED)
-DENV_CRC=$(shell tools/envcrc) -c -o $@ $< CFLAGS_fdt_support.o := $(PLATFORM_NO_UNALIGNED)
# SEE README.arm-unaligned-accesses
$(obj)/hush.o: CFLAGS += $(PLATFORM_NO_UNALIGNED)
$(obj)/fdt_support.o: CFLAGS += $(PLATFORM_NO_UNALIGNED)

@ -58,19 +58,10 @@ RELFLAGS= $(PLATFORM_RELFLAGS)
OBJCFLAGS += --gap-fill=0xff OBJCFLAGS += --gap-fill=0xff
CPPFLAGS = $(KBUILD_CPPFLAGS) $(RELFLAGS) CPPFLAGS = $(RELFLAGS)
CPPFLAGS += $(UBOOTINCLUDE) CPPFLAGS += -pipe $(PLATFORM_CPPFLAGS)
CPPFLAGS += $(NOSTDINC_FLAGS) -pipe $(PLATFORM_CPPFLAGS)
CFLAGS := $(KBUILD_CFLAGS) $(CPPFLAGS)
BCURDIR = $(subst $(SRCTREE)/,,$(CURDIR:$(obj)%=%)) BCURDIR = $(subst $(SRCTREE)/,,$(CURDIR:$(obj)%=%))
AFLAGS := $(KBUILD_AFLAGS) $(CPPFLAGS)
LDFLAGS += $(PLATFORM_LDFLAGS) LDFLAGS += $(PLATFORM_LDFLAGS)
LDFLAGS_FINAL += -Bstatic LDFLAGS_FINAL += -Bstatic
#########################################################################
export PLATFORM_CPPFLAGS PLATFORM_RELFLAGS CPPFLAGS CFLAGS AFLAGS

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
#CFLAGS += -DET_DEBUG -DDEBUG #ccflags-y += -DET_DEBUG -DDEBUG
obj-$(CONFIG_PARTITIONS) += part.o obj-$(CONFIG_PARTITIONS) += part.o
obj-$(CONFIG_MAC_PARTITION) += part_mac.o obj-$(CONFIG_MAC_PARTITION) += part_mac.o

@ -24,9 +24,9 @@ PS_METHOD = $(prefer-db2x)
### ###
# The targets that may be used. # 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) xmldocs: $(BOOKS)
sgmldocs: xmldocs sgmldocs: xmldocs
@ -51,10 +51,10 @@ installmandocs: mandocs
### ###
#External programs used #External programs used
KERNELDOC = $(SRCTREE)/tools/kernel-doc/kernel-doc KERNELDOC = $(srctree)/tools/kernel-doc/kernel-doc
DOCPROC = $(OBJTREE)/tools/kernel-doc/docproc DOCPROC = $(objtree)/tools/kernel-doc/docproc
XMLTOFLAGS = -m $(SRCTREE)/doc/DocBook/stylesheet.xsl XMLTOFLAGS = -m $(srctree)/doc/DocBook/stylesheet.xsl
XMLTOFLAGS += --skip-validation XMLTOFLAGS += --skip-validation
### ###
@ -64,28 +64,36 @@ XMLTOFLAGS += --skip-validation
# appropriate parameters. # appropriate parameters.
# The following rules are used to generate the .xml documentation # The following rules are used to generate the .xml documentation
# required to generate the final targets. (ps, pdf, html). # required to generate the final targets. (ps, pdf, html).
%.xml: %.tmpl quiet_cmd_docproc = DOCPROC $@
$(DOCPROC) doc $< >$@ cmd_docproc = SRCTREE=$(srctree)/ $(DOCPROC) doc $< >$@
define rule_docproc
ifeq ($@, "cleandocs") set -e; \
sinclude $(obj).depend $(if $($(quiet)cmd_$(1)),echo ' $($(quiet)cmd_$(1))';) \
$(obj).depend: $(patsubst %.xml, %.tmpl, $(DOCBOOKS)) $(cmd_$(1)); \
rm -f $(obj).depend ; \ ( \
touch $(obj).depend ; \ echo 'cmd_$@ := $(cmd_$(1))'; \
for file in $^ ; do \ echo $@: `SRCTREE=$(srctree) $(DOCPROC) depend $<`; \
xmlfile=`echo "$${file}" | \ ) > $(dir $@).$(notdir $@).cmd
sed "s/tmpl$$/xml/"` ; \ endef
echo -n "$${xmlfile}: ">> $(obj).depend ; \
$(DOCPROC) depend $$file >> $(obj).depend ; \ %.xml: %.tmpl FORCE
echo -e "\n\t$(DOCPROC) doc $< >$${xmlfile} " >> \ $(call if_changed_rule,docproc)
$(obj).depend ; \
done ###
#Read in all saved dependency files
cmd_files := $(wildcard $(foreach f,$(BOOKS),$(dir $(f)).$(notdir $(f)).cmd))
ifneq ($(cmd_files),)
include $(cmd_files)
endif endif
### ###
# Changes in kernel-doc force a rebuild of all documentation # Changes in kernel-doc force a rebuild of all documentation
$(BOOKS): $(KERNELDOC) $(BOOKS): $(KERNELDOC)
# Tell kbuild to always build the programs
always := $(hostprogs-y)
notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \ notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \
exit 1 exit 1
db2xtemplate = db2TYPE -o $(dir $@) $< db2xtemplate = db2TYPE -o $(dir $@) $<
@ -111,12 +119,12 @@ endif
quiet_cmd_db2ps = PS $@ quiet_cmd_db2ps = PS $@
cmd_db2ps = $(subst TYPE,ps, $($(PS_METHOD)template)) cmd_db2ps = $(subst TYPE,ps, $($(PS_METHOD)template))
%.ps : %.xml %.ps : %.xml
$(call cmd_db2ps) $(call cmd,db2ps)
quiet_cmd_db2pdf = PDF $@ quiet_cmd_db2pdf = PDF $@
cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template)) cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template))
%.pdf : %.xml %.pdf : %.xml
$(call cmd_db2pdf) $(call cmd,db2pdf)
index = index.html index = index.html
@ -132,16 +140,16 @@ build_main_index = rm -rf $(main_idx); \
quiet_cmd_db2html = HTML $@ quiet_cmd_db2html = HTML $@
cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \ cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \
echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \ echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \
$(patsubst %.html,%,$(notdir $@))</a><p>' > $@ $(patsubst %.html,%,$(notdir $@))</a><p>' > $@
%.html: %.xml %.html: %.xml
@(which xmlto > /dev/null 2>&1) || \ @(which xmlto > /dev/null 2>&1) || \
(echo "*** You need to install xmlto ***"; \ (echo "*** You need to install xmlto ***"; \
exit 1) exit 1)
@rm -rf $@ $(patsubst %.html,%,$@) @rm -rf $@ $(patsubst %.html,%,$@)
$(call cmd_db2html) $(call cmd,db2html)
@if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \ @if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \
cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
quiet_cmd_db2man = MAN $@ quiet_cmd_db2man = MAN $@
cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; gzip -f $(obj)/man/*.9; fi cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; gzip -f $(obj)/man/*.9; fi
@ -150,7 +158,7 @@ quiet_cmd_db2man = MAN $@
(echo "*** You need to install xmlto ***"; \ (echo "*** You need to install xmlto ***"; \
exit 1) exit 1)
$(Q)mkdir -p $(obj)/man $(Q)mkdir -p $(obj)/man
$(call cmd_db2man) $(call cmd,db2man)
@touch $@ @touch $@
### ###
@ -162,7 +170,7 @@ quiet_cmd_fig2eps = FIG2EPS $@
@(which fig2dev > /dev/null 2>&1) || \ @(which fig2dev > /dev/null 2>&1) || \
(echo "*** You need to install transfig ***"; \ (echo "*** You need to install transfig ***"; \
exit 1) exit 1)
$(call cmd_fig2eps) $(call cmd,fig2eps)
quiet_cmd_fig2png = FIG2PNG $@ quiet_cmd_fig2png = FIG2PNG $@
cmd_fig2png = fig2dev -Lpng $< $@ cmd_fig2png = fig2dev -Lpng $< $@
@ -171,7 +179,7 @@ quiet_cmd_fig2png = FIG2PNG $@
@(which fig2dev > /dev/null 2>&1) || \ @(which fig2dev > /dev/null 2>&1) || \
(echo "*** You need to install transfig ***"; \ (echo "*** You need to install transfig ***"; \
exit 1) exit 1)
$(call cmd_fig2png) $(call cmd,fig2png)
### ###
# Rule to convert a .c file to inline XML documentation # Rule to convert a .c file to inline XML documentation
@ -217,7 +225,6 @@ clean-files := $(DOCBOOKS) \
clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
cleandocs: cleandocs:
@rm -f $(obj).depend
@$(Q)rm -f $(call objectify, $(clean-files)) @$(Q)rm -f $(call objectify, $(clean-files))
@$(Q)rm -rf $(call objectify, $(clean-dirs)) @$(Q)rm -rf $(call objectify, $(clean-dirs))

@ -8,8 +8,5 @@ obj-y = atibios.o biosemu.o besys.o bios.o \
$(X86DIR)/sys.o \ $(X86DIR)/sys.o \
$(X86DIR)/debug.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__ -D__PPC__ -D__BIG_ENDIAN__
CFLAGS += $(EXTRA_CFLAGS)
CPPFLAGS += $(EXTRA_CFLAGS)

@ -8,7 +8,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
#CFLAGS += -DDEBUG #ccflags-y += -DDEBUG
obj-$(CONFIG_DTT_ADM1021) += adm1021.o obj-$(CONFIG_DTT_ADM1021) += adm1021.o
obj-$(CONFIG_DTT_ADT7460) += adt7460.o obj-$(CONFIG_DTT_ADT7460) += adt7460.o

@ -5,9 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
LOCAL_CFLAGS += -I$(TOPDIR)/drivers/net/npe/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux ccflags-y += -I$(src)/include -DCONFIG_IXP425_COMPONENT_ETHDB -D__linux
CFLAGS += $(LOCAL_CFLAGS)
CPPFLAGS += $(LOCAL_CFLAGS) # needed for depend
obj-y := npe.o \ obj-y := npe.o \
miiphy.o \ miiphy.o \

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
#CFLAGS += -DDEBUG #ccflags-y += -DDEBUG
obj-$(CONFIG_RTC_AT91SAM9_RTT) += at91sam9_rtt.o obj-$(CONFIG_RTC_AT91SAM9_RTT) += at91sam9_rtt.o
obj-$(CONFIG_RTC_BFIN) += bfin_rtc.o obj-$(CONFIG_RTC_BFIN) += bfin_rtc.o

@ -9,7 +9,6 @@ obj-$(CONFIG_USB_MUSB_DSPS) += musb_dsps.o
obj-$(CONFIG_USB_MUSB_AM35X) += am35x.o obj-$(CONFIG_USB_MUSB_AM35X) += am35x.o
obj-$(CONFIG_USB_MUSB_OMAP2PLUS) += omap2430.o obj-$(CONFIG_USB_MUSB_OMAP2PLUS) += omap2430.o
CFLAGS_NO_WARN := $(call cc-option,-Wno-unused-variable) \ ccflags-y := $(call cc-option,-Wno-unused-variable) \
$(call cc-option,-Wno-unused-but-set-variable) \ $(call cc-option,-Wno-unused-but-set-variable) \
$(call cc-option,-Wno-unused-label) $(call cc-option,-Wno-unused-label)
CFLAGS += $(CFLAGS_NO_WARN)

@ -36,7 +36,7 @@ process_lds = \
$(1) | sed -r -n 's/^OUTPUT_$(2)[ ("]*([^")]*).*/\1/p' $(1) | sed -r -n 's/^OUTPUT_$(2)[ ("]*([^")]*).*/\1/p'
# Run the compiler and get the link script from the linker # 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) $(obj)/dt.o: $(DT_BIN)
# We want the output format and arch. # We want the output format and arch.

@ -5,7 +5,7 @@
# #
ifdef FTRACE ifdef FTRACE
CFLAGS += -finstrument-functions -DFTRACE ccflags-y += -finstrument-functions -DFTRACE
endif endif
ifeq ($(ARCH),powerpc) ifeq ($(ARCH),powerpc)
@ -33,12 +33,6 @@ EXT_COBJ_FILES-y += lib/time.o
EXT_COBJ_FILES-y += lib/vsprintf.o EXT_COBJ_FILES-y += lib/vsprintf.o
EXT_SOBJ_FILES-$(CONFIG_PPC) += arch/powerpc/lib/ppcstring.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 # Create a list of object files to be compiled
OBJS += $(addprefix $(obj)/,$(SOBJ_FILES-y)) OBJS += $(addprefix $(obj)/,$(SOBJ_FILES-y))
OBJS += $(addprefix $(obj)/,$(COBJ_FILES-y)) OBJS += $(addprefix $(obj)/,$(COBJ_FILES-y))
@ -54,9 +48,10 @@ $(obj)/demo.bin: $(obj)/demo
$(OBJCOPY) -O binary $< $@ 2>/dev/null $(OBJCOPY) -O binary $< $@ 2>/dev/null
# Rule to build generic library C files # Rule to build generic library C files
$(addprefix $(obj)/,$(notdir $(EXT_COBJ_FILES-y))): $(obj)/%.o: $(SRCTREE)/lib/%.c $(addprefix $(obj)/,$(notdir $(EXT_COBJ_FILES-y))): $(obj)/%.o: $(SRCTREE)/lib/%.c FORCE
$(CC) -g $(CFLAGS) -c -o $@ $< $(call cmd,force_checksrc)
$(call if_changed_rule,cc_o_c)
# Rule to build architecture-specific library assembly files # Rule to build architecture-specific library assembly files
$(addprefix $(obj)/,$(notdir $(EXT_SOBJ_FILES-y))): $(obj)/%.o: $(SRCTREE)/arch/$(ARCH)/lib/%.S $(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 ifdef FTRACE
CFLAGS += -finstrument-functions -DFTRACE ccflags-y += -finstrument-functions -DFTRACE
endif endif
extra-y := hello_world extra-y := hello_world
@ -39,10 +39,11 @@ LIBAOBJS := $(LIBAOBJS-y)
LIBCOBJS = stubs.o LIBCOBJS = stubs.o
.SECONDARY: $(call objectify,$(COBJS))
targets += $(patsubst $(obj)/%,%,$(LIB)) $(COBJS) $(LIBAOBJS) $(LIBCOBJS)
LIBOBJS = $(addprefix $(obj)/,$(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)) ELF := $(addprefix $(obj)/,$(ELF))
gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`) gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
@ -52,19 +53,22 @@ gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
# also causes the entry point of the standalone application to be # also causes the entry point of the standalone application to be
# inconsistent. # inconsistent.
ifeq ($(ARCH),powerpc) ifeq ($(ARCH),powerpc)
AFLAGS := $(filter-out $(RELFLAGS),$(AFLAGS)) # FIX ME
CFLAGS := $(filter-out $(RELFLAGS),$(CFLAGS)) CPPFLAGS := $(filter-out $(RELFLAGS), $(CPPFLAGS))
CPPFLAGS := $(filter-out $(RELFLAGS),$(CPPFLAGS))
endif endif
# We don't want gcc reordering functions if possible. This ensures that an # 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 # application's entry point will be the first function in the application's
# source file. # 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): $(ELF):
$(obj)/%: $(obj)/%.o $(LIB) $(obj)/%: $(obj)/%.o $(LIB)

@ -15,4 +15,4 @@ obj-y += tnc.o tnc_misc.o debug.o crc16.o budget.o
obj-y += log.o orphan.o recovery.o replay.o obj-y += log.o orphan.o recovery.o replay.o
# SEE README.arm-unaligned-accesses # SEE README.arm-unaligned-accesses
$(obj)/super.o: CFLAGS += $(PLATFORM_NO_UNALIGNED) CFLAGS_super.o := $(PLATFORM_NO_UNALIGNED)

@ -24,9 +24,6 @@ obj-y := \
yaffs_summary.o yaffs_tagscompat.o yaffs_verify.o yaffs_yaffs1.o \ yaffs_summary.o yaffs_tagscompat.o yaffs_verify.o yaffs_yaffs1.o \
yaffs_yaffs2.o yaffs_mtdif.o yaffs_mtdif2.o yaffs_yaffs2.o yaffs_mtdif.o yaffs_mtdif2.o
YCFLAGS = -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM ccflags-y = -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM \
YCFLAGS += -DCONFIG_YAFFS_YAFFS2 -DNO_Y_INLINE -DCONFIG_YAFFS_YAFFS2 -DNO_Y_INLINE \
YCFLAGS += -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
CFLAGS += $(YCFLAGS)
CPPFLAGS += $(YCFLAGS)

@ -67,4 +67,4 @@ obj-$(CONFIG_BOOTP_RANDOM_DELAY) += rand.o
obj-$(CONFIG_CMD_LINK_LOCAL) += rand.o obj-$(CONFIG_CMD_LINK_LOCAL) += rand.o
# SEE README.arm-unaligned-accesses # SEE README.arm-unaligned-accesses
$(obj)/bzlib.o: CFLAGS += $(PLATFORM_NO_UNALIGNED) CFLAGS_bzlib.o := $(PLATFORM_NO_UNALIGNED)

@ -8,6 +8,6 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS += -D_LZMA_PROB32 ccflags-y += -D_LZMA_PROB32
obj-y += LzmaDec.o LzmaTools.o obj-y += LzmaDec.o LzmaTools.o

@ -12,17 +12,18 @@ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
$(LDFLAGS_FINAL) $(LDFLAGS_FINAL)
AFLAGS += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL
CFLAGS += -DCONFIG_NAND_SPL ccflags-y += -DCONFIG_NAND_SPL
SOBJS = start.o resetvec.o cache.o SOBJS = start.o resetvec.o cache.o
COBJS = gpio.o nand_boot.o nand_ecc.o memory.o ndfc.o pll.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 := $(addprefix $(obj)/,$(SOBJS) $(COBJS))
__OBJS := $(SOBJS) $(COBJS) __OBJS := $(SOBJS) $(COBJS)
LNDIR := $(nandobj)board/$(BOARDDIR) LNDIR := $(nandobj)board/$(BOARDDIR)
targets += $(__OBJS)
all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin \ all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin \
$(nandobj)System.map $(nandobj)System.map
@ -42,7 +43,7 @@ $(nandobj)System.map: $(nandobj)u-boot-spl
sort > $@ sort > $@
$(nandobj)u-boot.lds: $(LDSCRIPT) $(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 # create symbolic links for common files

@ -12,17 +12,18 @@ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
$(LDFLAGS_FINAL) $(LDFLAGS_FINAL)
AFLAGS += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL
CFLAGS += -DCONFIG_NAND_SPL ccflags-y += -DCONFIG_NAND_SPL
SOBJS = start.o init.o resetvec.o SOBJS = start.o init.o resetvec.o
COBJS = nand_boot.o nand_ecc.o ndfc.o sdram.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 := $(addprefix $(obj)/,$(SOBJS) $(COBJS))
__OBJS := $(SOBJS) $(COBJS) __OBJS := $(SOBJS) $(COBJS)
LNDIR := $(nandobj)board/$(BOARDDIR) LNDIR := $(nandobj)board/$(BOARDDIR)
targets += $(__OBJS)
all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
$(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@ -36,7 +37,7 @@ $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot.lds
-Map $(nandobj)u-boot-spl.map -o $@ -Map $(nandobj)u-boot-spl.map -o $@
$(nandobj)u-boot.lds: $(LDSCRIPT) $(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 # create symbolic links for common files

@ -12,8 +12,8 @@ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
$(LDFLAGS_FINAL) $(LDFLAGS_FINAL)
AFLAGS += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL
CFLAGS += -DCONFIG_NAND_SPL ccflags-y += -DCONFIG_NAND_SPL
SOBJS := start.o SOBJS := start.o
SOBJS += init.o SOBJS += init.o
@ -23,11 +23,12 @@ COBJS += nand_boot.o
COBJS += nand_ecc.o COBJS += nand_ecc.o
COBJS += ndfc.o COBJS += ndfc.o
SRCS := $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
OBJS := $(addprefix $(obj)/,$(SOBJS) $(COBJS)) OBJS := $(addprefix $(obj)/,$(SOBJS) $(COBJS))
__OBJS := $(SOBJS) $(COBJS) __OBJS := $(SOBJS) $(COBJS)
LNDIR := $(nandobj)board/$(BOARDDIR) LNDIR := $(nandobj)board/$(BOARDDIR)
targets += $(__OBJS)
all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
$(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@ -41,7 +42,7 @@ $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot.lds
-Map $(nandobj)u-boot-spl.map -o $@ -Map $(nandobj)u-boot-spl.map -o $@
$(nandobj)u-boot.lds: $(LDSCRIPT) $(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 # create symbolic links for common files

@ -12,17 +12,18 @@ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
$(LDFLAGS_FINAL) $(LDFLAGS_FINAL)
AFLAGS += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL
CFLAGS += -DCONFIG_NAND_SPL ccflags-y += -DCONFIG_NAND_SPL
SOBJS = start.o resetvec.o cache.o SOBJS = start.o resetvec.o cache.o
COBJS = 44x_spd_ddr2.o nand_boot.o nand_ecc.o ndfc.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 := $(addprefix $(obj)/,$(SOBJS) $(COBJS))
__OBJS := $(SOBJS) $(COBJS) __OBJS := $(SOBJS) $(COBJS)
LNDIR := $(nandobj)board/$(BOARDDIR) LNDIR := $(nandobj)board/$(BOARDDIR)
targets += $(__OBJS)
all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
$(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@ -36,7 +37,7 @@ $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot.lds
-Map $(nandobj)u-boot-spl.map -o $@ -Map $(nandobj)u-boot-spl.map -o $@
$(nandobj)u-boot.lds: $(LDSCRIPT) $(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 # create symbolic links for common files

@ -12,17 +12,18 @@ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
$(LDFLAGS_FINAL) $(LDFLAGS_FINAL)
AFLAGS += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL
CFLAGS += -DCONFIG_NAND_SPL ccflags-y += -DCONFIG_NAND_SPL
SOBJS = start.o init.o resetvec.o SOBJS = start.o init.o resetvec.o
COBJS = denali_data_eye.o nand_boot.o nand_ecc.o ndfc.o sdram.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 := $(addprefix $(obj)/,$(SOBJS) $(COBJS))
__OBJS := $(SOBJS) $(COBJS) __OBJS := $(SOBJS) $(COBJS)
LNDIR := $(nandobj)board/$(BOARDDIR) LNDIR := $(nandobj)board/$(BOARDDIR)
targets += $(__OBJS)
all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
$(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@ -36,7 +37,7 @@ $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot.lds
-Map $(nandobj)u-boot-spl.map -o $@ -Map $(nandobj)u-boot-spl.map -o $@
$(nandobj)u-boot.lds: $(LDSCRIPT) $(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 # create symbolic links for common files

@ -13,18 +13,19 @@ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
$(LDFLAGS) $(LDFLAGS_FINAL) $(LDFLAGS) $(LDFLAGS_FINAL)
AFLAGS += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL
CFLAGS += -DCONFIG_NAND_SPL ccflags-y += -DCONFIG_NAND_SPL
SOBJS = start.o ticks.o SOBJS = start.o ticks.o
COBJS = nand_boot_fsl_elbc.o $(BOARD).o sdram.o ns16550.o spl_minimal.o \ COBJS = nand_boot_fsl_elbc.o $(BOARD).o sdram.o ns16550.o spl_minimal.o \
time.o cache.o time.o cache.o
SRCS := $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
OBJS := $(addprefix $(obj)/,$(SOBJS) $(COBJS)) OBJS := $(addprefix $(obj)/,$(SOBJS) $(COBJS))
__OBJS := $(SOBJS) $(COBJS) __OBJS := $(SOBJS) $(COBJS)
LNDIR := $(nandobj)board/$(BOARDDIR) LNDIR := $(nandobj)board/$(BOARDDIR)
targets += $(__OBJS)
all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
$(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@ -38,7 +39,7 @@ $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot.lds
-Map $(nandobj)u-boot-spl.map -o $@ -Map $(nandobj)u-boot-spl.map -o $@
$(nandobj)u-boot.lds: $(LDSCRIPT) $(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 # create symbolic links for common files

@ -15,18 +15,19 @@ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
$(LDFLAGS) $(LDFLAGS_FINAL) $(LDFLAGS) $(LDFLAGS_FINAL)
AFLAGS += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL
CFLAGS += -DCONFIG_NAND_SPL ccflags-y += -DCONFIG_NAND_SPL
SOBJS = start.o resetvec.o SOBJS = start.o resetvec.o
COBJS = cache.o cpu_init_early.o spl_minimal.o fsl_law.o law.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 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 := $(addprefix $(obj)/,$(SOBJS) $(COBJS))
__OBJS := $(SOBJS) $(COBJS) __OBJS := $(SOBJS) $(COBJS)
LNDIR := $(nandobj)board/$(BOARDDIR) LNDIR := $(nandobj)board/$(BOARDDIR)
targets += $(__OBJS)
all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
$(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@ -40,7 +41,7 @@ $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot-nand_spl.lds
-Map $(nandobj)u-boot-spl.map -o $@ -Map $(nandobj)u-boot-spl.map -o $@
$(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(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 - <$< >$@ -ansi -D__ASSEMBLY__ -P - <$< >$@
# create symbolic links for common files # create symbolic links for common files

@ -15,18 +15,19 @@ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
$(LDFLAGS) $(LDFLAGS_FINAL) $(LDFLAGS) $(LDFLAGS_FINAL)
AFLAGS += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL
CFLAGS += -DCONFIG_NAND_SPL ccflags-y += -DCONFIG_NAND_SPL
SOBJS = start.o resetvec.o SOBJS = start.o resetvec.o
COBJS = cache.o cpu_init_early.o spl_minimal.o fsl_law.o law.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 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 := $(addprefix $(obj)/,$(SOBJS) $(COBJS))
__OBJS := $(SOBJS) $(COBJS) __OBJS := $(SOBJS) $(COBJS)
LNDIR := $(nandobj)board/$(BOARDDIR) LNDIR := $(nandobj)board/$(BOARDDIR)
targets += $(__OBJS)
all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
$(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@ -40,7 +41,7 @@ $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot-nand_spl.lds
-Map $(nandobj)u-boot-spl.map -o $@ -Map $(nandobj)u-boot-spl.map -o $@
$(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(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 - <$< >$@ -ansi -D__ASSEMBLY__ -P - <$< >$@
# create symbolic links for common files # create symbolic links for common files

@ -15,18 +15,19 @@ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
$(LDFLAGS) $(LDFLAGS_FINAL) $(LDFLAGS) $(LDFLAGS_FINAL)
AFLAGS += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL
CFLAGS += -DCONFIG_NAND_SPL ccflags-y += -DCONFIG_NAND_SPL
SOBJS = start.o resetvec.o SOBJS = start.o resetvec.o
COBJS = cache.o cpu_init_early.o spl_minimal.o fsl_law.o law.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 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 := $(addprefix $(obj)/,$(SOBJS) $(COBJS))
__OBJS := $(SOBJS) $(COBJS) __OBJS := $(SOBJS) $(COBJS)
LNDIR := $(nandobj)board/$(BOARDDIR) LNDIR := $(nandobj)board/$(BOARDDIR)
targets += $(__OBJS)
all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
$(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@ -40,7 +41,7 @@ $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot-nand_spl.lds
-Map $(nandobj)u-boot-spl.map -o $@ -Map $(nandobj)u-boot-spl.map -o $@
$(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(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 - <$< >$@ -ansi -D__ASSEMBLY__ -P - <$< >$@
# create symbolic links for common files # create symbolic links for common files

@ -11,18 +11,19 @@ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
$(LDFLAGS) $(LDFLAGS_FINAL) $(LDFLAGS) $(LDFLAGS_FINAL)
AFLAGS += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL
CFLAGS += -DCONFIG_NAND_SPL ccflags-y += -DCONFIG_NAND_SPL
SOBJS = start.o resetvec.o SOBJS = start.o resetvec.o
COBJS = cache.o cpu_init_early.o spl_minimal.o fsl_law.o law.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 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 := $(addprefix $(obj)/,$(SOBJS) $(COBJS))
__OBJS := $(SOBJS) $(COBJS) __OBJS := $(SOBJS) $(COBJS)
LNDIR := $(nandobj)board/$(BOARDDIR) LNDIR := $(nandobj)board/$(BOARDDIR)
targets += $(__OBJS)
all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
$(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@ -36,7 +37,7 @@ $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot-nand_spl.lds
-Map $(nandobj)u-boot-spl.map -o $@ -Map $(nandobj)u-boot-spl.map -o $@
$(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(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 - <$< >$@ -ansi -D__ASSEMBLY__ -P - <$< >$@
# create symbolic links for common files # create symbolic links for common files

@ -15,18 +15,19 @@ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
$(LDFLAGS) $(LDFLAGS_FINAL) $(LDFLAGS) $(LDFLAGS_FINAL)
AFLAGS += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL
CFLAGS += -DCONFIG_NAND_SPL ccflags-y += -DCONFIG_NAND_SPL
SOBJS = start.o resetvec.o SOBJS = start.o resetvec.o
COBJS = cache.o cpu_init_early.o spl_minimal.o fsl_law.o law.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 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 := $(addprefix $(obj)/,$(SOBJS) $(COBJS))
__OBJS := $(SOBJS) $(COBJS) __OBJS := $(SOBJS) $(COBJS)
LNDIR := $(nandobj)board/$(BOARDDIR) LNDIR := $(nandobj)board/$(BOARDDIR)
targets += $(__OBJS)
all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
$(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@ -40,7 +41,7 @@ $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot-nand_spl.lds
-Map $(nandobj)u-boot-spl.map -o $@ -Map $(nandobj)u-boot-spl.map -o $@
$(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(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 - <$< >$@ -ansi -D__ASSEMBLY__ -P - <$< >$@
# create symbolic links for common files # create symbolic links for common files

@ -12,18 +12,19 @@ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
$(LDFLAGS) $(LDFLAGS_FINAL) $(LDFLAGS) $(LDFLAGS_FINAL)
AFLAGS += -DCONFIG_NAND_SPL asflags-y += -DCONFIG_NAND_SPL
CFLAGS += -DCONFIG_NAND_SPL ccflags-y += -DCONFIG_NAND_SPL
SOBJS = start.o ticks.o SOBJS = start.o ticks.o
COBJS = nand_boot_fsl_elbc.o $(BOARD).o sdram.o ns16550.o spl_minimal.o \ COBJS = nand_boot_fsl_elbc.o $(BOARD).o sdram.o ns16550.o spl_minimal.o \
time.o cache.o time.o cache.o
SRCS := $(addprefix $(obj)/,$(SOBJS:.o=.S) $(COBJS:.o=.c))
OBJS := $(addprefix $(obj)/,$(SOBJS) $(COBJS)) OBJS := $(addprefix $(obj)/,$(SOBJS) $(COBJS))
__OBJS := $(SOBJS) $(COBJS) __OBJS := $(SOBJS) $(COBJS)
LNDIR := $(nandobj)board/$(BOARDDIR) LNDIR := $(nandobj)board/$(BOARDDIR)
targets += $(__OBJS)
all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
$(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
@ -37,7 +38,7 @@ $(nandobj)u-boot-spl: $(OBJS) $(nandobj)u-boot.lds
-Map $(nandobj)u-boot-spl.map -o $@ -Map $(nandobj)u-boot-spl.map -o $@
$(nandobj)u-boot.lds: $(LDSCRIPT) $(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 # create symbolic links for common files

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DDEBUG #ccflags-y += -DDEBUG
obj-$(CONFIG_CMD_NET) += arp.o obj-$(CONFIG_CMD_NET) += arp.o
obj-$(CONFIG_CMD_NET) += bootp.o obj-$(CONFIG_CMD_NET) += bootp.o

@ -5,20 +5,19 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
obj-y += 20001122-1.o objs-before-objcopy := 20001122-1.o 20010114-2.o 20010226-1.o 980619-1.o \
obj-y += 20010114-2.o acc1.o compare-fp-1.o fpu.o mul-subnormal-single-1.o darwin-ldouble.o
obj-y += 20010226-1.o targets += $(objs-before-objcopy)
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
CFLAGS := $(shell echo $(CFLAGS) | sed s/-msoft-float//) # remove -msoft-float flag
CFLAGS += -mhard-float -fkeep-inline-functions $(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 # Do not delete intermidiate files (*.o)
$(CC) $(ALL_CFLAGS) -o $@.fp $< -c .SECONDARY: $(call objectify, $(objs-before-objcopy))
$(OBJCOPY) -R .gnu.attributes $@.fp $@
rm -f $@.fp obj-y := $(objs-before-objcopy:.o=_.o)
OBJCOPYFLAGS := -R .gnu.attributes
$(obj)/%_.o: $(obj)/%.o
$(call if_changed,objcopy)

@ -165,7 +165,7 @@ ar-option = $(call try-run, $(AR) rc$(1) "$$TMP",$(1),$(2))
# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj= # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.build obj=
# Usage: # Usage:
# $(Q)$(MAKE) $(build)=dir # $(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= # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.modbuiltin obj=

@ -2,7 +2,16 @@
# Building # 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 PHONY := __build
__build: __build:
@ -35,6 +44,11 @@ subdir-ccflags-y :=
include scripts/Kbuild.include 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 # For backward compatibility check that these variables do not change
save-cflags := $(CFLAGS) save-cflags := $(CFLAGS)
@ -115,14 +129,16 @@ ifneq ($(hostprogs-y)$(hostprogs-m),)
include scripts/Makefile.host include scripts/Makefile.host
endif 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 # Create output directory if not already present
_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj)) _dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
# Create directories for object files if directory does not exist # Create directories for object files if directory does not exist
# Needed when obj-y := dir/file.o syntax is used # Needed when obj-y := dir/file.o syntax is used
_dummy := $(foreach d,$(obj-dirs), $(shell [ -d $(d) ] || mkdir -p $(d))) _dummy := $(foreach d,$(obj-dirs), $(shell [ -d $(d) ] || mkdir -p $(d)))
endif #endif
ifndef obj ifndef obj
$(warning kbuild: Makefile.build is included improperly) $(warning kbuild: Makefile.build is included improperly)

@ -101,12 +101,13 @@ basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))"
modname_flags = $(if $(filter 1,$(words $(modname))),\ modname_flags = $(if $(filter 1,$(words $(modname))),\
-D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(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) $(ccflags-y) $(CFLAGS_$(basetarget).o)
_c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags)) _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) $(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 # Enable gcov profiling flags for a file, directory or for all files depending
@ -137,14 +138,15 @@ __a_flags = $(call flags,_a_flags)
__cpp_flags = $(call flags,_cpp_flags) __cpp_flags = $(call flags,_cpp_flags)
endif 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) \ $(__c_flags) $(modkern_cflags) \
-D"KBUILD_STR(s)=\#s" $(basename_flags) $(modname_flags) -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) $(__a_flags) $(modkern_aflags)
cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) \ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE) \
$(__cpp_flags) $(__cpp_flags)
ld_flags = $(LDFLAGS) $(ldflags-y) ld_flags = $(LDFLAGS) $(ldflags-y)

@ -106,8 +106,7 @@ LIBS-y := $(patsubst %/, %/built-in.o, $(LIBS-y))
# Add GCC lib # Add GCC lib
ifeq ("$(USE_PRIVATE_LIBGCC)", "yes") ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
PLATFORM_LIBGCC = $(SPLTREE)/arch/$(ARCH)/lib/libgcc.o PLATFORM_LIBS := $(SPLTREE)/arch/$(ARCH)/lib/lib.a
PLATFORM_LIBS := $(filter-out %/libgcc.o, $(filter-out -lgcc, $(PLATFORM_LIBS))) $(PLATFORM_LIBGCC)
endif endif
LIBS-y := $(sort $(LIBS-y)) LIBS-y := $(sort $(LIBS-y))
@ -155,7 +154,7 @@ $(OBJTREE)/MLO.byteswap: $(obj)/u-boot-spl.bin
$(OBJTREE)/tools/mkimage -T omapimage -n byteswap \ $(OBJTREE)/tools/mkimage -T omapimage -n byteswap \
-a $(CONFIG_SPL_TEXT_BASE) -d $< $@ -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 $@ $(MAKE) $(build)=spl/arch/arm/imx-common $@
ALL-y += $(obj)/$(SPL_BIN).bin ALL-y += $(obj)/$(SPL_BIN).bin
@ -191,20 +190,24 @@ GEN_UBOOT = \
--start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \ --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
-Map $(SPL_BIN).map -o $(SPL_BIN) -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) $(GEN_UBOOT)
$(START): $(START):
@: @:
$(LIBS): depend $(LIBS):
$(MAKE) $(build)=$(patsubst %/,%,$(dir $@)) $(Q)$(MAKE) $(build)=$(patsubst %/,%,$(dir $@))
$(obj)/u-boot-spl.lds: $(LDSCRIPT) depend # FIX ME
$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@ cpp_flags := $(KBUILD_CPPFLAGS) $(CPPFLAGS) $(UBOOTINCLUDE) $(NOSTDINC_FLAGS)
depend: $(obj)/.depend $(obj)/u-boot-spl.lds: $(LDSCRIPT) FORCE
.PHONY: depend $(CPP) $(cpp_flags) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@
# defines $(obj).depend target PHONY += FORCE
include $(SRCTREE)/rules.mk 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_CMD_LICENSE) += bin2header$(SFX)
hostprogs-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX) hostprogs-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX)
hostprogs-$(CONFIG_VIDEO_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) hostprogs-$(CONFIG_BUILD_ENVCRC) += envcrc$(SFX)
envcrc$(SFX)-objs := crc32.o env_embedded.o envcrc.o sha1.o envcrc$(SFX)-objs := crc32.o env_embedded.o envcrc.o sha1.o
hostprogs-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX) 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) hostprogs-$(CONFIG_CMD_LOADS) += img2srec$(SFX)
HOSTCFLAGS_img2srec$(SFX) := -pedantic HOSTCFLAGS_img2srec$(SFX).o := -pedantic
hostprogs-$(CONFIG_XWAY_SWAP_BYTES) += xway-swap-bytes$(SFX) 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) hostprogs-y += mkenvimage$(SFX)
mkenvimage$(SFX)-objs := crc32.o mkenvimage.o os_support.o mkenvimage$(SFX)-objs := crc32.o mkenvimage.o os_support.o
@ -97,7 +97,7 @@ HOSTLOADLIBES_dumpimage$(SFX) := -lssl -lcrypto
HOSTLOADLIBES_mkimage$(SFX) := -lssl -lcrypto HOSTLOADLIBES_mkimage$(SFX) := -lssl -lcrypto
# Add CONFIG_MXS into host CFLAGS, so we can check whether or not register # Add CONFIG_MXS into host CFLAGS, so we can check whether or not register
# the mxsimage support within tools/mxsimage.c . # the mxsimage support within tools/mxsimage.c .
HOSTCFLAGS += -DCONFIG_MXS HOSTCFLAGS_mxsimage.o += -DCONFIG_MXS
endif endif
ifdef CONFIG_FIT_SIGNATURE ifdef CONFIG_FIT_SIGNATURE
@ -111,11 +111,11 @@ endif
hostprogs-$(CONFIG_EXYNOS5250) += mkexynosspl$(SFX) hostprogs-$(CONFIG_EXYNOS5250) += mkexynosspl$(SFX)
hostprogs-$(CONFIG_EXYNOS5420) += mkexynosspl$(SFX) hostprogs-$(CONFIG_EXYNOS5420) += mkexynosspl$(SFX)
HOSTCFLAGS_mkexynosspl$(SFX) := -pedantic HOSTCFLAGS_mkexynosspl$(SFX).o := -pedantic
hostprogs-$(CONFIG_MX23) += mxsboot$(SFX) hostprogs-$(CONFIG_MX23) += mxsboot$(SFX)
hostprogs-$(CONFIG_MX28) += mxsboot$(SFX) hostprogs-$(CONFIG_MX28) += mxsboot$(SFX)
HOSTCFLAGS_mxsboot$(SFX) := -pedantic HOSTCFLAGS_mxsboot$(SFX).o := -pedantic
hostprogs-$(CONFIG_NETCONSOLE) += ncb$(SFX) hostprogs-$(CONFIG_NETCONSOLE) += ncb$(SFX)
hostprogs-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX) hostprogs-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX)
@ -137,7 +137,7 @@ HOSTCFLAGS_sha1.o := -pedantic
# Don't build by default # Don't build by default
#hostprogs-$(CONFIG_PPC) += mpc86x_clk$(SFX) #hostprogs-$(CONFIG_PPC) += mpc86x_clk$(SFX)
#HOSTCFLAGS_mpc86x_clk$(SFX) := -pedantic #HOSTCFLAGS_mpc86x_clk$(SFX).o := -pedantic
always := $(hostprogs-y) always := $(hostprogs-y)
@ -164,11 +164,6 @@ endif
endif # !LOGO_BMP 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 # Use native tools and options
# Define __KERNEL_STRICT_NAMES to prevent typedef overlaps # Define __KERNEL_STRICT_NAMES to prevent typedef overlaps
@ -183,7 +178,7 @@ HOST_EXTRACFLAGS += -include $(SRCTREE)/include/libfdt_env.h \
-D__KERNEL_STRICT_NAMES \ -D__KERNEL_STRICT_NAMES \
-D_GNU_SOURCE -D_GNU_SOURCE
all: $(LOGO-y) __build: $(LOGO-y)
subdir-y := kernel-doc subdir-y := kernel-doc

Loading…
Cancel
Save