Skip to contentSkip to conversation

A collection of trivial Makefile refactoring

PATCH New Masahiro Yamada 3 participants 25 messages Nov 11, 2013 – Nov 17, 2013

Subsystems (12)
lore
Share & tools
lore
#0 lore raw

cover A collection of trivial Makefile refactoring

This series does not add any new features but
refactor makefiles.

Masahiro Yamada (22):
Makefile: abolish COBJS, SOBJS, etc.
Makefile: specifiy an explicite object name rather than $(BOARD).o
drivers: descend into sub directories only when it is necessary
lib: descend into sub directories only when it is necessary
drivers: tpm: clean up unused code
Makefile: make directories by Makefile.build
Makefile: merge $(LIBBOARD) into $(LIBS)
powerpc: move mpc8xxx entry under arch/powerpc/cpu/ drivers/qe: move the entry to drivers/Makefile drivers/net/fm: descend only when CONFIG_FMAN_ENET=y drivers/net/npe: descend only when CONFIG_IXP4XX_NPE=y
Makefile: rename all libraries to built-in.o
Makefile: refactor a little
config.mk: delete unnecessary lines
tools: Makefile: delete redundant lines
Makefile: delete unused lines
powerpc: mpc83xx: delete unused rules
powerpc: mpc83xx: Do not create a symbolic link to ddr-gen2.c
powerpc: mpc824x: Do not create a symbolic link to bedbug_603e.c
arm: rmobile: Do not create a symbolic link to sh timer
Makefile: move fs/fat/ entry to drivers/Makefile
fs: descend into sub directories when it is necessary

 Makefile                                   | 149 +++++++++--------------
 arch/arm/cpu/armv7/rmobile/Makefile        |   8 +-
 arch/microblaze/cpu/u-boot.lds             |   2 +-
 arch/powerpc/cpu/Makefile                  |   3 +
 arch/powerpc/cpu/mpc512x/Makefile          |   2 -
 arch/powerpc/cpu/mpc824x/.gitignore        |   1 -
 arch/powerpc/cpu/mpc824x/Makefile          |  10 +-
 arch/powerpc/cpu/mpc83xx/Makefile          |  12 +-
 arch/powerpc/cpu/mpc8xxx/Makefile          |   6 +
 board/LEOX/elpt860/u-boot.lds              |   8 +-
 board/LaCie/edminiv2/Makefile              |   4 -
 board/LaCie/net2big_v2/Makefile            |   4 -
 board/LaCie/netspace_v2/Makefile           |   4 -
 board/LaCie/wireless_space/Makefile        |   4 -
 board/Marvell/db64360/Makefile             |   4 -
 board/Marvell/db64460/Makefile             |   4 -
 board/actux1/u-boot.lds                    |   8 +-
 board/actux2/u-boot.lds                    |   8 +-
 board/actux3/u-boot.lds                    |   8 +-
 board/altera/nios2-generic/Makefile        |   4 -
 board/avionic-design/medcom-wide/Makefile  |   2 -
 board/avionic-design/plutux/Makefile       |   2 -
 board/avionic-design/tec/Makefile          |   2 -
 board/compal/paz00/Makefile                |   2 -
 board/compulab/trimslice/Makefile          |   2 -
 board/davinci/da8xxevm/u-boot-spl-hawk.lds |   4 +-
 board/dvlhost/u-boot.lds                   |   8 +-
 board/emk/top5200/Makefile                 |   4 -
 board/emk/top860/Makefile                  |   3 -
 board/esd/adciop/Makefile                  |   4 -
 board/esd/apc405/Makefile                  |   4 -
 board/esd/ar405/Makefile                   |   4 -
 board/esd/ash405/Makefile                  |   4 -
 board/esd/cms700/Makefile                  |   4 -
 board/esd/cpci2dp/Makefile                 |   4 -
 board/esd/cpci405/Makefile                 |   4 -
 board/esd/cpci5200/Makefile                |   4 -
 board/esd/cpci750/Makefile                 |   4 -
 board/esd/cpciiser4/Makefile               |   4 -
 board/esd/dasa_sim/Makefile                |   4 -
 board/esd/dp405/Makefile                   |   4 -
 board/esd/du405/Makefile                   |   4 -
 board/esd/hh405/Makefile                   |   4 -
 board/esd/hub405/Makefile                  |   4 -
 board/esd/ocrtc/Makefile                   |   4 -
 board/esd/pci405/Makefile                  |   4 -
 board/esd/pf5200/Makefile                  |   4 -
 board/esd/plu405/Makefile                  |   4 -
 board/esd/pmc405/Makefile                  |   4 -
 board/esd/pmc405de/Makefile                |   4 -
 board/esd/pmc440/Makefile                  |   4 -
 board/esd/voh405/Makefile                  |   4 -
 board/esd/vom405/Makefile                  |   4 -
 board/esd/wuh405/Makefile                  |   4 -
 board/esteem192e/u-boot.lds                |   4 +-
 board/freescale/m52277evb/u-boot.lds       |   4 +-
 board/freescale/m53017evb/u-boot.lds       |   6 +-
 board/freescale/mx31ads/u-boot.lds         |  10 +-
 board/freescale/t1040qds/Makefile          |   2 +-
 board/genietv/u-boot.lds                   |  10 +-
 board/hermes/u-boot.lds                    |   2 +-
 board/keymile/km82xx/Makefile              |   3 -
 board/keymile/km83xx/Makefile              |   4 -
 board/keymile/km_arm/Makefile              |   4 -
 board/keymile/kmp204x/Makefile             |   6 +-
 board/kup/kup4k/Makefile                   |   4 -
 board/kup/kup4x/Makefile                   |   4 -
 board/matrix_vision/mvsmr/u-boot.lds       |   2 +-
 board/mpl/mip405/Makefile                  |   4 -
 board/mpl/pati/Makefile                    |   4 -
 board/mpl/pip405/Makefile                  |   4 -
 board/mpl/vcma9/Makefile                   |   4 -
 board/mvblue/u-boot.lds                    |  12 +-
 board/nvidia/beaver/Makefile               |   2 -
 board/nvidia/ventana/Makefile              |   2 -
 board/prodrive/p3mx/Makefile               |   4 -
 board/psyent/pci5441/Makefile              |   4 -
 board/psyent/pk1c20/Makefile               |   4 -
 board/rbc823/u-boot.lds                    |   8 +-
 board/sandburst/karef/Makefile             |   4 -
 board/sandburst/metrobox/Makefile          |   4 -
 board/siemens/dxr2/Makefile                |   4 -
 board/siemens/pxm2/Makefile                |   4 -
 board/siemens/rut/Makefile                 |   4 -
 board/spd8xx/u-boot.lds                    |   4 +-
 board/svm_sc8xx/u-boot.lds                 |  10 +-
 board/ti/am335x/u-boot.lds                 |   2 +-
 board/ti/beagle/Makefile                   |   2 +-
 board/toradex/colibri_t20_iris/Makefile    |   3 -
 board/tqc/tqm8260/Makefile                 |   4 -
 board/tqc/tqm8272/Makefile                 |   4 -
 board/tqc/tqm8xx/u-boot.lds                |  14 +--
 board/vpac270/u-boot-spl.lds               |   4 +-
 board/xilinx/ppc405-generic/Makefile       |   4 -
 board/xilinx/ppc440-generic/Makefile       |   4 -
 config.mk                                  |   6 -
 drivers/Makefile                           |   5 +-
 drivers/bios_emulator/Makefile             |   4 +-
 drivers/fpga/Makefile                      |   2 -
 drivers/net/fm/Makefile                    |   2 -
 drivers/net/npe/Makefile                   |   2 +-
 drivers/qe/Makefile                        |   4 +-
 drivers/tpm/Makefile                       |   2 -
 drivers/tpm/tis_i2c.c                      | 185 -----------------------------
 fs/Makefile                                |  25 ++--
 fs/cbfs/Makefile                           |   2 +-
 fs/cramfs/Makefile                         |   4 +-
 fs/ext4/Makefile                           |   2 +-
 fs/fdos/Makefile                           |   2 +-
 fs/jffs2/Makefile                          |   2 -
 fs/reiserfs/Makefile                       |   2 +-
 fs/sandbox/Makefile                        |   2 +-
 fs/ubifs/Makefile                          |   8 +-
 fs/yaffs2/Makefile                         |   2 +-
 fs/zfs/Makefile                            |   2 +-
 include/configs/bct-brettl2.h              |   4 +-
 include/configs/bf533-stamp.h              |   4 +-
 include/configs/bf537-pnav.h               |   4 +-
 include/configs/bf537-stamp.h              |   4 +-
 include/configs/bf538f-ezkit.h             |   4 +-
 include/configs/cm-bf537e.h                |   4 +-
 include/configs/cm-bf537u.h                |   4 +-
 include/configs/dnp5370.h                  |   4 +-
 include/configs/ibf-dsp561.h               |   4 +-
 include/configs/tcm-bf537.h                |   4 +-
 lib/lzma/Makefile                          |   2 +-
 lib/lzo/Makefile                           |   2 +-
 lib/rsa/Makefile                           |   4 +-
 lib/zlib/Makefile                          |   2 +-
 scripts/Makefile.build                     |  19 +--
 spl/Makefile                               |  87 ++++++--------
 tools/gdb/Makefile                         |   2 -
 132 files changed, 251 insertions(+), 746 deletions(-)
 create mode 100644 arch/powerpc/cpu/Makefile
 delete mode 100644 arch/powerpc/cpu/mpc824x/.gitignore
 delete mode 100644 drivers/tpm/tis_i2c.c
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/22 Makefile: abolish COBJS, SOBJS, etc.

The support for COBJS, COBJS-y, SOBJS, SOBJS-y, GLCOBJS, GLSOBJS from scripts/Makefile.build.
Going forward we need to use Kbuild style consistently.

---
 scripts/Makefile.build | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
scripts/Makefile.build +4 -8
index 2ef7341..805c3c3 100644
@@ -10,10 +10,6 @@ SRCS :=
 
 include Makefile
 
-# Backward compatible: obj-y is preferable
-COBJS := $(sort $(COBJS) $(COBJS-y))
-SOBJS := $(sort $(SOBJS) $(SOBJS-y))
-
 # Going forward use the following
 obj-y := $(sort $(obj-y))
 extra-y := $(sort $(extra-y))
@@ -24,11 +20,11 @@ obj-y		:= $(patsubst %/, %/built-in.o, $(obj-y))
 subdir-obj-y	:= $(filter %/built-in.o, $(obj-y))
 subdir-obj-y	:= $(addprefix $(obj),$(subdir-obj-y))
 
-SRCS	+= $(COBJS:.o=.c) $(SOBJS:.o=.S) \
- $(wildcard $(obj-y:.o=.c) $(obj-y:.o=.S) $(lib-y:.o=.c) $(lib-y:.o=.S) $(extra-y:.o=.c) $(extra-y:.o=.S))
-OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS) $(obj-y))
+SRCS	+= $(wildcard $(obj-y:.o=.c) $(obj-y:.o=.S) $(lib-y:.o=.c) \
+	$(lib-y:.o=.S) $(extra-y:.o=.c) $(extra-y:.o=.S))
+OBJS	:= $(addprefix $(obj),$(obj-y))
 
-LGOBJS := $(addprefix $(obj),$(sort $(GLSOBJS) $(GLCOBJS)) $(lib-y))
+LGOBJS := $(addprefix $(obj),$(sort $(lib-y)))
 
 all: $(LIB) $(addprefix $(obj),$(extra-y))
 
Signature · 1 line
1.8.3.2
#2 lore raw

PATCH 2/22 Makefile: specifiy an explicite object name rather than $(BOARD).o

In reply to Masahiro Yamada
---
 board/freescale/t1040qds/Makefile | 2 +-
 board/keymile/kmp204x/Makefile    | 2 +-
 board/ti/beagle/Makefile          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
board/freescale/t1040qds/Makefile +1 -1
index a2dba6f..93af9eb 100644
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y	+= $(BOARD).o
+obj-y	+= t1040qds.o
 obj-y	+= ddr.o
 obj-$(CONFIG_PCI)     += pci.o
 obj-y	+= law.o
board/keymile/kmp204x/Makefile +1 -1
index 64eb37c..c318e08 100644
@@ -12,5 +12,5 @@ ifneq ($(OBJTREE),$(SRCTREE))
 $(shell mkdir -p $(obj)../common)
 endif
 
-obj-y	:= $(BOARD).o ddr.o eth.o tlb.o pci.o law.o \
+obj-y	:= kmp204x.o ddr.o eth.o tlb.o pci.o law.o \
 	../common/common.o ../common/ivm.o
board/ti/beagle/Makefile +1 -1
index 9f55e8f..7a858be 100644
@@ -5,5 +5,5 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y	:= $(BOARD).o
+obj-y	:= beagle.o
 obj-$(CONFIG_STATUS_LED) += led.o
Signature · 1 line
1.8.3.2
#3 lore raw

PATCH 3/22 drivers: descend into sub directories only when it is necessary

In reply to Masahiro Yamada

- Descend into drivers/fpga/ only when CONFIG_FPGA=y
- Descend into drivers/bios_emulator only when CONFIG_BIOSEMU=y

---
 drivers/Makefile               | 4 ++--
 drivers/bios_emulator/Makefile | 2 +-
 drivers/fpga/Makefile          | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)
drivers/Makefile +2 -2
index 9cec2ba..95a4b80 100644
@@ -1,8 +1,8 @@
-obj-y += bios_emulator/
+obj-$(CONFIG_BIOSEMU) += bios_emulator/
 obj-y += block/
 obj-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount/
 obj-y += crypto/
-obj-y += fpga/
+obj-$(CONFIG_FPGA) += fpga/
 obj-y += hwmon/
 obj-y += misc/
 obj-y += pcmcia/
drivers/bios_emulator/Makefile +1 -1
index dd42e0f..9aa8ea9 100644
@@ -2,7 +2,7 @@ X86DIR  = x86emu
 
 $(shell mkdir -p $(obj)$(X86DIR))
 
-obj-$(CONFIG_BIOSEMU)	= atibios.o biosemu.o besys.o bios.o \
+obj-y = atibios.o biosemu.o besys.o bios.o \
 	$(X86DIR)/decode.o \
 	$(X86DIR)/ops2.o \
 	$(X86DIR)/ops.o \
drivers/fpga/Makefile +0 -2
index 4fcdf40..dfb2e7f 100644
@@ -5,7 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifdef CONFIG_FPGA
 obj-y += fpga.o
 obj-$(CONFIG_FPGA_SPARTAN2) += spartan2.o
 obj-$(CONFIG_FPGA_SPARTAN3) += spartan3.o
@@ -19,4 +18,3 @@ obj-$(CONFIG_FPGA_ACEX1K) += ACEX1K.o
 obj-$(CONFIG_FPGA_CYCLON2) += cyclon2.o
 obj-$(CONFIG_FPGA_STRATIX_II) += stratixII.o
 endif
-endif
Signature · 1 line
1.8.3.2
#4 lore raw

PATCH 4/22 lib: descend into sub directories only when it is necessary

In reply to Masahiro Yamada
---
 Makefile          | 8 ++++----
 lib/lzma/Makefile | 2 +-
 lib/lzo/Makefile  | 2 +-
 lib/rsa/Makefile  | 4 +---
 lib/zlib/Makefile | 2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)
Makefile +4 -4
index 1f499c5..e12f180 100644
@@ -232,10 +232,10 @@ OBJS := $(addprefix $(obj),$(OBJS))
 HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n)
 
 LIBS-y += lib/libgeneric.o
-LIBS-y += lib/rsa/librsa.o
-LIBS-y += lib/lzma/liblzma.o
-LIBS-y += lib/lzo/liblzo.o
-LIBS-y += lib/zlib/libz.o
+LIBS-$(CONFIG_RSA) += lib/rsa/librsa.o
+LIBS-$(CONFIG_LZMA) += lib/lzma/liblzma.o
+LIBS-$(CONFIG_LZO) += lib/lzo/liblzo.o
+LIBS-$(CONFIG_ZLIB) += lib/zlib/libz.o
 LIBS-$(CONFIG_TIZEN) += lib/tizen/libtizen.o
 LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/lib$(VENDOR).o
 LIBS-y += $(CPUDIR)/lib$(CPU).o
lib/lzma/Makefile +1 -1
index 25c6797..f8eda06 100644
@@ -10,4 +10,4 @@
 
 CFLAGS += -D_LZMA_PROB32
 
-obj-$(CONFIG_LZMA) += LzmaDec.o LzmaTools.o
+obj-y += LzmaDec.o LzmaTools.o
lib/lzo/Makefile +1 -1
index dd853ea..2936544 100644
@@ -5,4 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_LZO) += lzo1x_decompress.o
+obj-y += lzo1x_decompress.o
lib/rsa/Makefile +1 -3
index 693c745..164ab39 100644
@@ -7,6 +7,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifdef CONFIG_FIT_SIGNATURE
-obj-$(CONFIG_RSA) += rsa-verify.o
-endif
+obj-$(CONFIG_FIT_SIGNATURE) += rsa-verify.o
lib/zlib/Makefile +1 -1
index 1e9e04d..2fba95f 100644
@@ -5,4 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_ZLIB) += zlib.o
+obj-y += zlib.o
Signature · 1 line
1.8.3.2
#5 lore raw

PATCH 5/22 drivers: tpm: clean up unused code

In reply to Masahiro Yamada
---
 drivers/tpm/Makefile  |   2 -
 drivers/tpm/tis_i2c.c | 185 --------------------------------------------------
 2 files changed, 187 deletions(-)
 delete mode 100644 drivers/tpm/tis_i2c.c
drivers/tpm/Makefile +0 -2
index 4b8cbec..2f2353f 100644
@@ -3,8 +3,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-$(shell mkdir -p $(obj)slb9635_i2c)
-
 # TODO: Merge tpm_tis_lpc.c with tpm.c
 obj-$(CONFIG_TPM_ATMEL_TWI) += tpm_atmel_twi.o
 obj-$(CONFIG_TPM_TIS_I2C) += tpm.o
drivers/tpm/tis_i2c.c deleted +0 -185

185 lines not on this page · raw message

Signature · 1 line
1.8.3.2
#6 lore raw

PATCH 6/22 Makefile: make directories by Makefile.build

In reply to Masahiro Yamada
---
 arch/powerpc/cpu/mpc512x/Makefile         | 2 --
 arch/powerpc/cpu/mpc824x/Makefile         | 4 ----
 board/LaCie/edminiv2/Makefile             | 4 ----
 board/LaCie/net2big_v2/Makefile           | 4 ----
 board/LaCie/netspace_v2/Makefile          | 4 ----
 board/LaCie/wireless_space/Makefile       | 4 ----
 board/Marvell/db64360/Makefile            | 4 ----
 board/Marvell/db64460/Makefile            | 4 ----
 board/altera/nios2-generic/Makefile       | 4 ----
 board/avionic-design/medcom-wide/Makefile | 2 --
 board/avionic-design/plutux/Makefile      | 2 --
 board/avionic-design/tec/Makefile         | 2 --
 board/compal/paz00/Makefile               | 2 --
 board/compulab/trimslice/Makefile         | 2 --
 board/emk/top5200/Makefile                | 4 ----
 board/emk/top860/Makefile                 | 3 ---
 board/esd/adciop/Makefile                 | 4 ----
 board/esd/apc405/Makefile                 | 4 ----
 board/esd/ar405/Makefile                  | 4 ----
 board/esd/ash405/Makefile                 | 4 ----
 board/esd/cms700/Makefile                 | 4 ----
 board/esd/cpci2dp/Makefile                | 4 ----
 board/esd/cpci405/Makefile                | 4 ----
 board/esd/cpci5200/Makefile               | 4 ----
 board/esd/cpci750/Makefile                | 4 ----
 board/esd/cpciiser4/Makefile              | 4 ----
 board/esd/dasa_sim/Makefile               | 4 ----
 board/esd/dp405/Makefile                  | 4 ----
 board/esd/du405/Makefile                  | 4 ----
 board/esd/hh405/Makefile                  | 4 ----
 board/esd/hub405/Makefile                 | 4 ----
 board/esd/ocrtc/Makefile                  | 4 ----
 board/esd/pci405/Makefile                 | 4 ----
 board/esd/pf5200/Makefile                 | 4 ----
 board/esd/plu405/Makefile                 | 4 ----
 board/esd/pmc405/Makefile                 | 4 ----
 board/esd/pmc405de/Makefile               | 4 ----
 board/esd/pmc440/Makefile                 | 4 ----
 board/esd/voh405/Makefile                 | 4 ----
 board/esd/vom405/Makefile                 | 4 ----
 board/esd/wuh405/Makefile                 | 4 ----
 board/keymile/km82xx/Makefile             | 3 ---
 board/keymile/km83xx/Makefile             | 4 ----
 board/keymile/km_arm/Makefile             | 4 ----
 board/keymile/kmp204x/Makefile            | 4 ----
 board/kup/kup4k/Makefile                  | 4 ----
 board/kup/kup4x/Makefile                  | 4 ----
 board/mpl/mip405/Makefile                 | 4 ----
 board/mpl/pati/Makefile                   | 4 ----
 board/mpl/pip405/Makefile                 | 4 ----
 board/mpl/vcma9/Makefile                  | 4 ----
 board/nvidia/beaver/Makefile              | 2 --
 board/nvidia/ventana/Makefile             | 2 --
 board/prodrive/p3mx/Makefile              | 4 ----
 board/psyent/pci5441/Makefile             | 4 ----
 board/psyent/pk1c20/Makefile              | 4 ----
 board/sandburst/karef/Makefile            | 4 ----
 board/sandburst/metrobox/Makefile         | 4 ----
 board/siemens/dxr2/Makefile               | 4 ----
 board/siemens/pxm2/Makefile               | 4 ----
 board/siemens/rut/Makefile                | 4 ----
 board/toradex/colibri_t20_iris/Makefile   | 3 ---
 board/tqc/tqm8260/Makefile                | 4 ----
 board/tqc/tqm8272/Makefile                | 4 ----
 board/xilinx/ppc405-generic/Makefile      | 4 ----
 board/xilinx/ppc440-generic/Makefile      | 4 ----
 drivers/bios_emulator/Makefile            | 2 --
 scripts/Makefile.build                    | 7 +++++++
 68 files changed, 7 insertions(+), 247 deletions(-)
arch/powerpc/cpu/mpc512x/Makefile +0 -2
index f770350..a4934ef 100644
@@ -4,8 +4,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-$(shell mkdir -p $(OBJTREE)/board/freescale/common)
-
 extra-y	= start.o
 obj-y	:= cpu.o
 obj-y	+= traps.o
arch/powerpc/cpu/mpc824x/Makefile +0 -4
index 67b0d17..194fadd 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)drivers/epic $(obj)drivers/i2c)
-endif
-
 extra-y	= start.o
 obj-y	= traps.o cpu.o cpu_init.o interrupts.o speed.o \
 	  drivers/epic/epic1.o drivers/i2c/i2c.o pci.o
board/LaCie/edminiv2/Makefile +0 -4
index 7ca06f5..035f686 100644
@@ -9,8 +9,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	:= edminiv2.o ../common/common.o
board/LaCie/net2big_v2/Makefile +0 -4
index 4fa08c5..f3074af 100644
@@ -9,10 +9,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	:= net2big_v2.o ../common/common.o
 ifneq ($(and $(CONFIG_KIRKWOOD_GPIO),$(CONFIG_NET2BIG_V2)),)
 obj-y	+= ../common/cpld-gpio-bus.o
board/LaCie/netspace_v2/Makefile +0 -4
index e5357e4..47778d8 100644
@@ -9,8 +9,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	:= netspace_v2.o ../common/common.o
board/LaCie/wireless_space/Makefile +0 -4
index 11c535e..90a84f4 100644
@@ -9,8 +9,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	:= wireless_space.o ../common/common.o
board/Marvell/db64360/Makefile +0 -4
index aad4776..aefe0a7 100644
@@ -8,10 +8,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= db64360.o ../common/flash.o ../common/serial.o ../common/memory.o pci.o \
 	  mv_eth.o ../common/ns16550.o mpsc.o ../common/i2c.o \
 	  sdram_init.o ../common/intel_flash.o ../common/misc.o
board/Marvell/db64460/Makefile +0 -4
index ea9e570..a970f9a 100644
@@ -8,10 +8,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	+= db64460.o ../common/flash.o ../common/serial.o ../common/memory.o pci.o \
 	  mv_eth.o ../common/ns16550.o mpsc.o ../common/i2c.o \
 	  sdram_init.o ../common/intel_flash.o ../common/misc.o
board/altera/nios2-generic/Makefile +0 -4
index 84c7bff..84690fe 100644
@@ -6,10 +6,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	:= nios2-generic.o
 obj-$(CONFIG_CMD_IDE) += ../common/cfide.o
 obj-$(CONFIG_EPLED) += ../common/epled.o
board/avionic-design/medcom-wide/Makefile +0 -2
index 6c4ab64..87e1912 100644
@@ -7,8 +7,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-$(shell mkdir -p $(obj)../common $(obj)../../nvidia/common)
-
 obj-y	:= ../common/tamonten.o
 
 include ../../nvidia/common/common.mk
board/avionic-design/plutux/Makefile +0 -2
index 6c4ab64..87e1912 100644
@@ -7,8 +7,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-$(shell mkdir -p $(obj)../common $(obj)../../nvidia/common)
-
 obj-y	:= ../common/tamonten.o
 
 include ../../nvidia/common/common.mk
board/avionic-design/tec/Makefile +0 -2
index 6c4ab64..87e1912 100644
@@ -7,8 +7,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-$(shell mkdir -p $(obj)../common $(obj)../../nvidia/common)
-
 obj-y	:= ../common/tamonten.o
 
 include ../../nvidia/common/common.mk
board/compal/paz00/Makefile +0 -2
index 824cd2e..b2d3b6b 100644
@@ -14,8 +14,6 @@
 # more details.
 #
 
-$(shell mkdir -p $(obj)../../nvidia/common)
-
 obj-y	:= paz00.o
 
 include ../../nvidia/common/common.mk
board/compulab/trimslice/Makefile +0 -2
index 0818673..f3bd00d 100644
@@ -5,8 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-$(shell mkdir -p $(obj)../../nvidia/common)
-
 obj-y	:= trimslice.o
 
 include ../../nvidia/common/common.mk
board/emk/top5200/Makefile +0 -4
index 0930d48..b455c26 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	:= top5200.o ../common/flash.o ../common/vpd.o ../common/am79c874.o
board/emk/top860/Makefile +0 -3
index b2645f6..0401639 100644
@@ -5,7 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
 obj-y	= top860.o ../common/flash.o ../common/vpd.o ../common/am79c874.o
board/esd/adciop/Makefile +0 -4
index a096e44..d0e264d 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= adciop.o flash.o ../common/misc.o ../common/pci.o
board/esd/apc405/Makefile +0 -4
index c6ab1a5..ada8bfd 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= apc405.o \
 	../common/misc.o \
 	../common/auto_update.o
board/esd/ar405/Makefile +0 -4
index 2d16313..dd54f54 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= ar405.o flash.o ../common/misc.o
board/esd/ash405/Makefile +0 -4
index 4c866ee..aab8de4 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= ash405.o flash.o \
 	../common/misc.o \
 	../common/esd405ep_nand.o \
board/esd/cms700/Makefile +0 -4
index 8cfe3ba..2bf5006 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common/xilinx_jtag)
-endif
-
 # Objects for Xilinx JTAG programming (CPLD)
 CPLD    = ../common/xilinx_jtag/lenval.o \
 	  ../common/xilinx_jtag/micro.o \
board/esd/cpci2dp/Makefile +0 -4
index 1d15020..ce2c6dd 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= cpci2dp.o flash.o ../common/misc.o ../common/cmd_loadpci.o
board/esd/cpci405/Makefile +0 -4
index 1af7e94..b140571 100644
@@ -5,9 +5,5 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= cpci405.o flash.o ../common/misc.o ../common/auto_update.o
 obj-y	+= ../common/cmd_loadpci.o
board/esd/cpci5200/Makefile +0 -4
index fb6c0e2..8421f54 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-# ifneq ($(OBJTREE),$(SRCTREE))
-# $(shell mkdir -p $(obj)../common/xilinx_jtag)
-# endif
-
 # Objects for Xilinx JTAG programming (CPLD)
 # CPLD  = ../common/xilinx_jtag/lenval.o \
 #	  ../common/xilinx_jtag/micro.o \
board/esd/cpci750/Makefile +0 -4
index 8b3dc33..a3300c9 100644
@@ -8,10 +8,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../../Marvell/common)
-endif
-
 obj-y	= misc.o
 obj-y	+= cpci750.o serial.o ../../Marvell/common/memory.o pci.o \
 	  mv_eth.o  mpsc.o i2c.o \
board/esd/cpciiser4/Makefile +0 -4
index 4d3c34a..b8d6bea 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= cpciiser4.o flash.o ../common/misc.o
board/esd/dasa_sim/Makefile +0 -4
index f0a5a8f..eb9f5f8 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= dasa_sim.o flash.o cmd_dasa_sim.o eeprom.o ../common/pci.o
board/esd/dp405/Makefile +0 -4
index 6809c67..cfcfb66 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common/xilinx_jtag)
-endif
-
 # Objects for Xilinx JTAG programming (CPLD)
 CPLD    = ../common/xilinx_jtag/lenval.o \
 	  ../common/xilinx_jtag/micro.o \
board/esd/du405/Makefile +0 -4
index 12ce41a..7914eab 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= du405.o flash.o ../common/misc.o
board/esd/hh405/Makefile +0 -4
index 0507f1b..fba21a3 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= hh405.o flash.o \
 	../common/misc.o \
 	../common/esd405ep_nand.o \
board/esd/hub405/Makefile +0 -4
index 5447a95..99e18b5 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= hub405.o flash.o \
 	../common/misc.o \
 	../common/esd405ep_nand.o \
board/esd/ocrtc/Makefile +0 -4
index 0d9a6fd..44b7d5d 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= ocrtc.o flash.o ../common/misc.o cmd_ocrtc.o
board/esd/pci405/Makefile +0 -4
index 2f8706b..9e659c7 100644
@@ -5,9 +5,5 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= pci405.o flash.o ../common/misc.o cmd_pci405.o
 obj-y	+= writeibm.o
board/esd/pf5200/Makefile +0 -4
index a9d20c9..a54289c 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-# ifneq ($(OBJTREE),$(SRCTREE))
-# $(shell mkdir -p $(obj)../common/xilinx_jtag)
-# endif
-
 # Objects for Xilinx JTAG programming (CPLD)
 # CPLD  = ../common/xilinx_jtag/lenval.o \
 #	  ../common/xilinx_jtag/micro.o \
board/esd/plu405/Makefile +0 -4
index 45b962f..6ffae67 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= plu405.o flash.o \
 	../common/misc.o \
 	../common/esd405ep_nand.o \
board/esd/pmc405/Makefile +0 -4
index f4aa1c9..ad98207 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common/xilinx_jtag)
-endif
-
 # Objects for Xilinx JTAG programming (CPLD)
 CPLD    = ../common/xilinx_jtag/lenval.o \
 	  ../common/xilinx_jtag/micro.o \
board/esd/pmc405de/Makefile +0 -4
index 7d5b273..b3f6dcd 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= pmc405de.o
 obj-$(CONFIG_CMD_CHIP_CONFIG) += chip_config.o
 obj-y += ../common/cmd_loadpci.o
board/esd/pmc440/Makefile +0 -4
index b1318c7..708e9d1 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= pmc440.o cmd_pmc440.o sdram.o fpga.o \
 	../common/cmd_loadpci.o
 extra-y	+= init.o
board/esd/voh405/Makefile +0 -4
index 8fcfa37..3d82399 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= voh405.o flash.o \
 	../common/misc.o \
 	../common/esd405ep_nand.o \
board/esd/vom405/Makefile +0 -4
index c8a4a4e..7cf5c02 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common/xilinx_jtag)
-endif
-
 # Objects for Xilinx JTAG programming (CPLD)
 CPLD    = ../common/xilinx_jtag/lenval.o \
 	  ../common/xilinx_jtag/micro.o \
board/esd/wuh405/Makefile +0 -4
index 046ebad..b9beeff 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= wuh405.o flash.o \
 	../common/misc.o \
 	../common/esd405ep_nand.o \
board/keymile/km82xx/Makefile +0 -3
index b44582f..20f193a 100644
@@ -5,7 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
 obj-y	:= km82xx.o ../common/common.o ../common/ivm.o
board/keymile/km83xx/Makefile +0 -4
index 7bdddf3..6c32688 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	+= km83xx.o ../common/common.o ../common/ivm.o km83xx_i2c.o
board/keymile/km_arm/Makefile +0 -4
index 32eaa93..a17d8d9 100644
@@ -6,10 +6,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	:= km_arm.o ../common/common.o ../common/ivm.o
 
 ifdef CONFIG_KM_FPGA_CONFIG
board/keymile/kmp204x/Makefile +0 -4
index c318e08..3e69ee2 100644
@@ -8,9 +8,5 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	:= kmp204x.o ddr.o eth.o tlb.o pci.o law.o \
 	../common/common.o ../common/ivm.o
board/kup/kup4k/Makefile +0 -4
index b3ad86c..c896fcd 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= kup4k.o ../common/flash.o ../common/kup.o ../common/load_sernum_ethaddr.o ../common/pcmcia.o
board/kup/kup4x/Makefile +0 -4
index 05a1afc..6945943 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= kup4x.o ../common/flash.o ../common/kup.o ../common/load_sernum_ethaddr.o ../common/pcmcia.o
board/mpl/mip405/Makefile +0 -4
index 509eb59..5bcf130 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= mip405.o cmd_mip405.o \
 		../common/pci.o \
 		../common/usb_uhci.o \
board/mpl/pati/Makefile +0 -4
index 67381c1..9822082 100644
@@ -5,9 +5,5 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	:=  pati.o cmd_pati.o \
 		../common/common_util.o
board/mpl/pip405/Makefile +0 -4
index 3d73cc3..0a3d059 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	= pip405.o cmd_pip405.o \
 		../common/pci.o \
 		../common/isa.o \
board/mpl/vcma9/Makefile +0 -4
index e0e9669..175a19f 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	:= ../common/common_util.o
 obj-y	+= vcma9.o cmd_vcma9.o
 
board/nvidia/beaver/Makefile +0 -2
index f828f52..1f7c31d 100644
@@ -14,6 +14,4 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-$(shell mkdir -p $(obj)../cardhu)
-
 obj-y	= ../cardhu/cardhu.o
board/nvidia/ventana/Makefile +0 -2
index 7265cfc..f67044f 100644
@@ -5,6 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-$(shell mkdir -p $(obj)../seaboard)
-
 obj-y	= ../seaboard/seaboard.o
board/prodrive/p3mx/Makefile +0 -4
index 43caffb..6ddda22 100644
@@ -5,10 +5,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../../Marvell/common)
-endif
-
 obj-y	= misc.o
 obj-y	+= p3mx.o mpsc.o mv_eth.o pci.o sdram_init.o serial.o \
 		../../Marvell/common/i2c.o ../../Marvell/common/memory.o
board/psyent/pci5441/Makefile +0 -4
index 9a66cfd..364f163 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	:= pci5441.o ../common/AMDLV065D.o
board/psyent/pk1c20/Makefile +0 -4
index 286db94..5450f93 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 obj-y	:= pk1c20.o led.o ../common/AMDLV065D.o
board/sandburst/karef/Makefile +0 -4
index 05c8187..f890008 100644
@@ -9,10 +9,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 # TBS: add for debugging purposes
 BUILDUSER := $(shell whoami)
 FORCEBUILD := $(shell rm -f karef.o)
board/sandburst/metrobox/Makefile +0 -4
index 76dfffc..37d91a5 100644
@@ -8,10 +8,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 # TBS: add for debugging purposes
 BUILDUSER := $(shell whoami)
 FORCEBUILD := $(shell rm -f metrobox.o)
board/siemens/dxr2/Makefile +0 -4
index 5129c6e..f159932 100644
@@ -11,10 +11,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 ifdef CONFIG_SPL_BUILD
 obj-y	:= mux.o
 endif
board/siemens/pxm2/Makefile +0 -4
index 5129c6e..f159932 100644
@@ -11,10 +11,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 ifdef CONFIG_SPL_BUILD
 obj-y	:= mux.o
 endif
board/siemens/rut/Makefile +0 -4
index 5129c6e..f159932 100644
@@ -11,10 +11,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../common)
-endif
-
 ifdef CONFIG_SPL_BUILD
 obj-y	:= mux.o
 endif
board/toradex/colibri_t20_iris/Makefile +0 -3
index 7ca3fe5..ebeac70 100644
@@ -4,9 +4,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-$(shell mkdir -p $(obj)../../nvidia/common)
-$(shell mkdir -p $(obj)../colibri_t20-common)
-
 obj-y	:= ../../nvidia/common/board.o
 obj-y	+= ../colibri_t20-common/colibri_t20-common.o
 obj-y	+= colibri_t20_iris.o
board/tqc/tqm8260/Makefile +0 -4
index dc4a528..6b8573d 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../tqm8xx/)
-endif
-
 obj-y	= tqm8260.o ../tqm8xx/load_sernum_ethaddr.o
board/tqc/tqm8272/Makefile +0 -4
index 09af765..8bf0241 100644
@@ -5,8 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../tqm8xx/)
-endif
-
 obj-y	= tqm8272.o ../tqm8xx/load_sernum_ethaddr.o nand.o
board/xilinx/ppc405-generic/Makefile +0 -4
index 1562f17..c9da870 100644
@@ -9,8 +9,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../../xilinx/ppc405-generic)
-endif
-
 obj-y	+= ../../xilinx/ppc405-generic/xilinx_ppc405_generic.o
board/xilinx/ppc440-generic/Makefile +0 -4
index b2227c5..0acd95d 100644
@@ -9,9 +9,5 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)../../xilinx/ppc440-generic)
-endif
-
 obj-y	+= ../../xilinx/ppc440-generic/xilinx_ppc440_generic.o
 extra-y 	+= ../../xilinx/ppc440-generic/init.o
drivers/bios_emulator/Makefile +0 -2
index 9aa8ea9..6f74fdc 100644
@@ -1,7 +1,5 @@
 X86DIR  = x86emu
 
-$(shell mkdir -p $(obj)$(X86DIR))
-
 obj-y = atibios.o biosemu.o besys.o bios.o \
 	$(X86DIR)/decode.o \
 	$(X86DIR)/ops2.o \
scripts/Makefile.build +7 -0
index 805c3c3..e3354aa 100644
@@ -24,6 +24,13 @@ SRCS	+= $(wildcard $(obj-y:.o=.c) $(obj-y:.o=.S) $(lib-y:.o=.c) \
 	$(lib-y:.o=.S) $(extra-y:.o=.c) $(extra-y:.o=.S))
 OBJS	:= $(addprefix $(obj),$(obj-y))
 
+# $(obj-dirs) is a list of directories that contain object files
+obj-dirs := $(dir $(OBJS))
+
+# 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)))
+
 LGOBJS := $(addprefix $(obj),$(sort $(lib-y)))
 
 all: $(LIB) $(addprefix $(obj),$(extra-y))
Signature · 1 line
1.8.3.2
#7 lore raw

PATCH 7/22 Makefile: merge $(LIBBOARD) into $(LIBS)

In reply to Masahiro Yamada

We do not need to handle $(LIBBOARD) and $(LIBS) separately.

---
 Makefile | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
Makefile +4 -9
index e12f180..419278a 100644
@@ -306,12 +306,11 @@ endif
 
 LIBS-$(CONFIG_ARM) += arch/arm/cpu/libcpu.o
 
+LIBS-y += board/$(BOARDDIR)/lib$(BOARD).o
+
 LIBS := $(addprefix $(obj),$(sort $(LIBS-y)))
 .PHONY : $(LIBS)
 
-LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o
-LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
-
 # Add GCC lib
 ifdef USE_PRIVATE_LIBGCC
 ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
@@ -335,7 +334,7 @@ LDPPFLAGS += \
 	  sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')
 
 __OBJS := $(subst $(obj),,$(OBJS))
-__LIBS := $(subst $(obj),,$(LIBS)) $(subst $(obj),,$(LIBBOARD))
+__LIBS := $(subst $(obj),,$(LIBS))
 
 #########################################################################
 #########################################################################
@@ -549,7 +548,7 @@ GEN_UBOOT = \
 endif
 
 $(obj)u-boot:	depend \
-		$(SUBDIR_TOOLS) $(OBJS) $(LIBBOARD) $(LIBS) $(LDSCRIPT) $(obj)u-boot.lds
+		$(SUBDIR_TOOLS) $(OBJS) $(LIBS) $(LDSCRIPT) $(obj)u-boot.lds
 		$(GEN_UBOOT)
 ifeq ($(CONFIG_KALLSYMS),y)
 		smap=`$(call SYSTEM_MAP,$(obj)u-boot) | \
@@ -566,10 +565,6 @@ $(LIBS):	depend $(SUBDIR_TOOLS)
 		$(MAKE) $(build) $(dir $(subst $(obj),,$@))
 		mv $(dir $@)built-in.o $@
 
-$(LIBBOARD):	depend $(LIBS)
-		$(MAKE) $(build) $(dir $(subst $(obj),,$@))
-		mv $(dir $@)built-in.o $@
-
 $(SUBDIRS):	depend
 		$(MAKE) -C $@ all
 
Signature · 1 line
1.8.3.2
#8 lore raw

PATCH 8/22 powerpc: move mpc8xxx entry under arch/powerpc/cpu/

In reply to Masahiro Yamada
---
 Makefile                          |  9 +--------
 arch/powerpc/cpu/Makefile         |  3 +++
 arch/powerpc/cpu/mpc8xxx/Makefile |  6 ++++++
 spl/Makefile                      | 13 +------------
 4 files changed, 11 insertions(+), 20 deletions(-)
 create mode 100644 arch/powerpc/cpu/Makefile
Makefile +1 -8
index 419278a..3a8ea67 100644
@@ -273,18 +273,10 @@ LIBS-y += drivers/power/libpower.o \
 LIBS-y += drivers/spi/libspi.o
 ifeq ($(CPU),mpc83xx)
 LIBS-y += drivers/qe/libqe.o
-LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
-LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
 endif
 ifeq ($(CPU),mpc85xx)
 LIBS-y += drivers/qe/libqe.o
 LIBS-y += drivers/net/fm/libfm.o
-LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
-LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
-endif
-ifeq ($(CPU),mpc86xx)
-LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
-LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
 endif
 LIBS-y += drivers/serial/libserial.o
 LIBS-y += drivers/usb/eth/libusb_eth.o
@@ -305,6 +297,7 @@ LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
 endif
 
 LIBS-$(CONFIG_ARM) += arch/arm/cpu/libcpu.o
+LIBS-$(CONFIG_PPC) += arch/powerpc/cpu/libcpu.o
 
 LIBS-y += board/$(BOARDDIR)/lib$(BOARD).o
 
arch/powerpc/cpu/Makefile new file +3 -0
new file mode 100644
index 0000000..d630abe
@@ -0,0 +1,3 @@
+ifneq ($(filter mpc83xx mpc85xx mpc86xx,$(CPU)),)
+obj-y += mpc8xxx/
+endif
arch/powerpc/cpu/mpc8xxx/Makefile +6 -0
index 395fed1..1d083bf 100644
@@ -31,3 +31,9 @@ obj-$(CONFIG_SYS_SRIO) += srio.o
 obj-$(CONFIG_FSL_LAW) += law.o
 
 endif
+
+ifdef CONFIG_SPL_BUILD
+obj-$(CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT) += ddr/
+else
+obj-y += ddr/
+endif
spl/Makefile +1 -12
index cbd3d27..0ac0c3c 100644
@@ -57,18 +57,6 @@ endif
 LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o
 
 LIBS-y += $(CPUDIR)/lib$(CPU).o
-ifeq ($(CPU),mpc83xx)
-LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
-endif
-ifeq ($(CPU),mpc85xx)
-LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
-ifdef CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT
-LIBS-y += arch/powerpc/cpu/mpc8xxx/ddr/libddr.o
-endif
-endif
-ifeq ($(CPU),mpc86xx)
-LIBS-y += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
-endif
 
 ifdef SOC
 LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o
@@ -106,6 +94,7 @@ LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
 endif
 
 LIBS-$(CONFIG_ARM) += arch/arm/cpu/libcpu.o
+LIBS-$(CONFIG_PPC) += arch/powerpc/cpu/libcpu.o
 
 ifneq ($(CONFIG_MX23)$(CONFIG_MX35),)
 LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
Signature · 1 line
1.8.3.2
#9 lore raw

PATCH 9/22 drivers/qe: move the entry to drivers/Makefile

In reply to Masahiro Yamada
---
 Makefile            | 4 ----
 drivers/Makefile    | 1 +
 drivers/qe/Makefile | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)
Makefile +0 -4
index 3a8ea67..0e9609f 100644
@@ -271,11 +271,7 @@ LIBS-y += drivers/power/libpower.o \
 	drivers/power/pmic/libpmic.o \
 	drivers/power/battery/libbattery.o
 LIBS-y += drivers/spi/libspi.o
-ifeq ($(CPU),mpc83xx)
-LIBS-y += drivers/qe/libqe.o
-endif
 ifeq ($(CPU),mpc85xx)
-LIBS-y += drivers/qe/libqe.o
 LIBS-y += drivers/net/fm/libfm.o
 endif
 LIBS-y += drivers/serial/libserial.o
drivers/Makefile +1 -0
index 95a4b80..5d03f37 100644
@@ -13,3 +13,4 @@ obj-y += tpm/
 obj-y += twserial/
 obj-y += video/
 obj-y += watchdog/
+obj-$(CONFIG_QE) += qe/
drivers/qe/Makefile +2 -2
index b8c15f8..7f1bd06 100644
@@ -4,5 +4,5 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(and $(CONFIG_QE),$(CONFIG_OF_LIBFDT)) += fdt.o
-obj-$(CONFIG_QE) += qe.o uccf.o uec.o uec_phy.o
+obj-y := qe.o uccf.o uec.o uec_phy.o
+obj-$(CONFIG_OF_LIBFDT) += fdt.o
Signature · 1 line
1.8.3.2
#10 lore raw

PATCH 10/22 drivers/net/fm: descend only when CONFIG_FMAN_ENET=y

In reply to Masahiro Yamada

CONFIG_FMAN_ENET is defined only for CPU mpc85xx.
We do not need to filter by CPU mpc85xx.

---
 Makefile                | 4 +---
 drivers/net/fm/Makefile | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)
Makefile +1 -3
index 0e9609f..5cdfc6d 100644
@@ -271,9 +271,7 @@ LIBS-y += drivers/power/libpower.o \
 	drivers/power/pmic/libpmic.o \
 	drivers/power/battery/libbattery.o
 LIBS-y += drivers/spi/libspi.o
-ifeq ($(CPU),mpc85xx)
-LIBS-y += drivers/net/fm/libfm.o
-endif
+LIBS-$(CONFIG_FMAN_ENET) += drivers/net/fm/libfm.o
 LIBS-y += drivers/serial/libserial.o
 LIBS-y += drivers/usb/eth/libusb_eth.o
 LIBS-y += drivers/usb/gadget/libusb_gadget.o
drivers/net/fm/Makefile +0 -2
index bec86c1..eec75fd 100644
@@ -4,7 +4,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifdef CONFIG_FMAN_ENET
 obj-y += dtsec.o
 obj-y += eth.o
 obj-y += fm.o
@@ -30,4 +29,3 @@ obj-$(CONFIG_PPC_T4240) += t4240.o
 obj-$(CONFIG_PPC_T4160) += t4240.o
 obj-$(CONFIG_PPC_B4420) += b4860.o
 obj-$(CONFIG_PPC_B4860) += b4860.o
-endif
Signature · 1 line
1.8.3.2
#11 lore raw

PATCH 11/22 drivers/net/npe: descend only when CONFIG_IXP4XX_NPE=y

In reply to Masahiro Yamada

CONFIG_IXP4XX_NPE is defined only for CPU ixp.
It is not necessary to filter by CPU ixp.

---
 Makefile                 | 4 +---
 drivers/net/npe/Makefile | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
Makefile +1 -3
index 5cdfc6d..4724f41 100644
@@ -242,9 +242,7 @@ LIBS-y += $(CPUDIR)/lib$(CPU).o
 ifdef SOC
 LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o
 endif
-ifeq ($(CPU),ixp)
-LIBS-y += drivers/net/npe/libnpe.o
-endif
+LIBS-$(CONFIG_IXP4XX_NPE) += drivers/net/npe/libnpe.o
 LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o
 LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o
 LIBS-y += fs/libfs.o \
drivers/net/npe/Makefile +1 -1
index 7fa5ea6..e36c0bb 100644
@@ -10,7 +10,7 @@ CFLAGS  += $(LOCAL_CFLAGS)
 CPPFLAGS  += $(LOCAL_CFLAGS) # needed for depend
 HOSTCFLAGS  += $(LOCAL_CFLAGS)
 
-obj-$(CONFIG_IXP4XX_NPE) := npe.o \
+obj-y := npe.o \
 	miiphy.o \
 	IxOsalBufferMgt.o \
 	IxOsalIoMem.o \
Signature · 1 line
1.8.3.2
#12 lore raw

PATCH 12/22 Makefile: rename all libraries to built-in.o

In reply to Masahiro Yamada
---
 Makefile                                   | 112 ++++++++++++++---------------
 arch/microblaze/cpu/u-boot.lds             |   2 +-
 board/LEOX/elpt860/u-boot.lds              |   8 +--
 board/actux1/u-boot.lds                    |   8 +--
 board/actux2/u-boot.lds                    |   8 +--
 board/actux3/u-boot.lds                    |   8 +--
 board/davinci/da8xxevm/u-boot-spl-hawk.lds |   4 +-
 board/dvlhost/u-boot.lds                   |   8 +--
 board/esteem192e/u-boot.lds                |   4 +-
 board/freescale/m52277evb/u-boot.lds       |   4 +-
 board/freescale/m53017evb/u-boot.lds       |   6 +-
 board/freescale/mx31ads/u-boot.lds         |  10 +--
 board/genietv/u-boot.lds                   |  10 +--
 board/hermes/u-boot.lds                    |   2 +-
 board/matrix_vision/mvsmr/u-boot.lds       |   2 +-
 board/mvblue/u-boot.lds                    |  12 ++--
 board/rbc823/u-boot.lds                    |   8 +--
 board/spd8xx/u-boot.lds                    |   4 +-
 board/svm_sc8xx/u-boot.lds                 |  10 +--
 board/ti/am335x/u-boot.lds                 |   2 +-
 board/tqc/tqm8xx/u-boot.lds                |  14 ++--
 board/vpac270/u-boot-spl.lds               |   4 +-
 include/configs/bct-brettl2.h              |   4 +-
 include/configs/bf533-stamp.h              |   4 +-
 include/configs/bf537-pnav.h               |   4 +-
 include/configs/bf537-stamp.h              |   4 +-
 include/configs/bf538f-ezkit.h             |   4 +-
 include/configs/cm-bf537e.h                |   4 +-
 include/configs/cm-bf537u.h                |   4 +-
 include/configs/dnp5370.h                  |   4 +-
 include/configs/ibf-dsp561.h               |   4 +-
 include/configs/tcm-bf537.h                |   4 +-
 spl/Makefile                               |  73 +++++++++----------
 33 files changed, 182 insertions(+), 181 deletions(-)
Makefile +56 -56
index 4724f41..1389ee7 100644
@@ -231,68 +231,69 @@ OBJS := $(addprefix $(obj),$(OBJS))
 
 HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n)
 
-LIBS-y += lib/libgeneric.o
-LIBS-$(CONFIG_RSA) += lib/rsa/librsa.o
-LIBS-$(CONFIG_LZMA) += lib/lzma/liblzma.o
-LIBS-$(CONFIG_LZO) += lib/lzo/liblzo.o
-LIBS-$(CONFIG_ZLIB) += lib/zlib/libz.o
-LIBS-$(CONFIG_TIZEN) += lib/tizen/libtizen.o
-LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/lib$(VENDOR).o
-LIBS-y += $(CPUDIR)/lib$(CPU).o
+LIBS-y += lib/
+LIBS-$(CONFIG_RSA) += lib/rsa/
+LIBS-$(CONFIG_LZMA) += lib/lzma/
+LIBS-$(CONFIG_LZO) += lib/lzo/
+LIBS-$(CONFIG_ZLIB) += lib/zlib/
+LIBS-$(CONFIG_TIZEN) += lib/tizen/
+LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
+LIBS-y += $(CPUDIR)/
 ifdef SOC
-LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o
-endif
-LIBS-$(CONFIG_IXP4XX_NPE) += drivers/net/npe/libnpe.o
-LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o
-LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o
-LIBS-y += fs/libfs.o \
-	fs/fat/libfat.o
-LIBS-y += net/libnet.o
-LIBS-y += disk/libdisk.o
-LIBS-y += drivers/libdrivers.o
-LIBS-y += drivers/dma/libdma.o
-LIBS-y += drivers/gpio/libgpio.o
-LIBS-y += drivers/i2c/libi2c.o
-LIBS-y += drivers/input/libinput.o
-LIBS-y += drivers/mmc/libmmc.o
-LIBS-y += drivers/mtd/libmtd.o
-LIBS-y += drivers/mtd/nand/libnand.o
-LIBS-y += drivers/mtd/onenand/libonenand.o
-LIBS-y += drivers/mtd/ubi/libubi.o
-LIBS-y += drivers/mtd/spi/libspi_flash.o
-LIBS-y += drivers/net/libnet.o
-LIBS-y += drivers/net/phy/libphy.o
-LIBS-y += drivers/pci/libpci.o
-LIBS-y += drivers/power/libpower.o \
-	drivers/power/fuel_gauge/libfuel_gauge.o \
-	drivers/power/mfd/libmfd.o \
-	drivers/power/pmic/libpmic.o \
-	drivers/power/battery/libbattery.o
-LIBS-y += drivers/spi/libspi.o
-LIBS-$(CONFIG_FMAN_ENET) += drivers/net/fm/libfm.o
-LIBS-y += drivers/serial/libserial.o
-LIBS-y += drivers/usb/eth/libusb_eth.o
-LIBS-y += drivers/usb/gadget/libusb_gadget.o
-LIBS-y += drivers/usb/host/libusb_host.o
-LIBS-y += drivers/usb/musb/libusb_musb.o
-LIBS-y += drivers/usb/musb-new/libusb_musb-new.o
-LIBS-y += drivers/usb/phy/libusb_phy.o
-LIBS-y += drivers/usb/ulpi/libusb_ulpi.o
-LIBS-y += common/libcommon.o
-LIBS-y += lib/libfdt/libfdt.o
-LIBS-y += api/libapi.o
-LIBS-y += post/libpost.o
-LIBS-y += test/libtest.o
+LIBS-y += $(CPUDIR)/$(SOC)/
+endif
+LIBS-$(CONFIG_IXP4XX_NPE) += drivers/net/npe/
+LIBS-$(CONFIG_OF_EMBED) += dts/
+LIBS-y += arch/$(ARCH)/lib/
+LIBS-y += fs/ \
+	fs/fat/
+LIBS-y += net/
+LIBS-y += disk/
+LIBS-y += drivers/
+LIBS-y += drivers/dma/
+LIBS-y += drivers/gpio/
+LIBS-y += drivers/i2c/
+LIBS-y += drivers/input/
+LIBS-y += drivers/mmc/
+LIBS-y += drivers/mtd/
+LIBS-y += drivers/mtd/nand/
+LIBS-y += drivers/mtd/onenand/
+LIBS-y += drivers/mtd/ubi/
+LIBS-y += drivers/mtd/spi/
+LIBS-y += drivers/net/
+LIBS-y += drivers/net/phy/
+LIBS-y += drivers/pci/
+LIBS-y += drivers/power/ \
+	drivers/power/fuel_gauge/ \
+	drivers/power/mfd/ \
+	drivers/power/pmic/ \
+	drivers/power/battery/
+LIBS-y += drivers/spi/
+LIBS-$(CONFIG_FMAN_ENET) += drivers/net/fm/
+LIBS-y += drivers/serial/
+LIBS-y += drivers/usb/eth/
+LIBS-y += drivers/usb/gadget/
+LIBS-y += drivers/usb/host/
+LIBS-y += drivers/usb/musb/
+LIBS-y += drivers/usb/musb-new/
+LIBS-y += drivers/usb/phy/
+LIBS-y += drivers/usb/ulpi/
+LIBS-y += common/
+LIBS-y += lib/libfdt/
+LIBS-y += api/
+LIBS-y += post/
+LIBS-y += test/
 
 ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx31 mx35 mxs vf610))
-LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
+LIBS-y += arch/$(ARCH)/imx-common/
 endif
 
-LIBS-$(CONFIG_ARM) += arch/arm/cpu/libcpu.o
-LIBS-$(CONFIG_PPC) += arch/powerpc/cpu/libcpu.o
+LIBS-$(CONFIG_ARM) += arch/arm/cpu/
+LIBS-$(CONFIG_PPC) += arch/powerpc/cpu/
 
-LIBS-y += board/$(BOARDDIR)/lib$(BOARD).o
+LIBS-y += board/$(BOARDDIR)/
 
+LIBS-y := $(patsubst %/, %/built-in.o, $(LIBS-y))
 LIBS := $(addprefix $(obj),$(sort $(LIBS-y)))
 .PHONY : $(LIBS)
 
@@ -548,7 +549,6 @@ $(OBJS):
 
 $(LIBS):	depend $(SUBDIR_TOOLS)
 		$(MAKE) $(build) $(dir $(subst $(obj),,$@))
-		mv $(dir $@)built-in.o $@
 
 $(SUBDIRS):	depend
 		$(MAKE) -C $@ all
arch/microblaze/cpu/u-boot.lds +1 -1
index 3e6204d..fdad207 100644
@@ -30,7 +30,7 @@ SECTIONS
 	{
 		__data_start = .;
 #ifdef CONFIG_OF_EMBED
-		dts/libdts.o (.data)
+		dts/built-in.o (.data)
 #endif
 		*(.data)
 		__data_end = .;
board/LEOX/elpt860/u-boot.lds +4 -4
index b30b667..c5e57ec 100644
@@ -30,10 +30,10 @@ SECTIONS
 
     arch/powerpc/cpu/mpc8xx/start.o	(.text*)
     arch/powerpc/cpu/mpc8xx/traps.o	(.text*)
-    common/libcommon.o			(.text*)
-    arch/powerpc/cpu/mpc8xx/libmpc8xx.o	(.text*)
-    board/LEOX/elpt860/libelpt860.o	(.text*)
-    arch/powerpc/lib/libpowerpc.o	(.text*)
+    common/built-in.o			(.text*)
+    arch/powerpc/cpu/mpc8xx/built-in.o	(.text*)
+    board/LEOX/elpt860/built-in.o	(.text*)
+    arch/powerpc/lib/built-in.o		(.text*)
 
     . = env_offset;
     common/env_embedded.o		(.text*)
board/actux1/u-boot.lds +4 -4
index a656fa9..b0f09f5 100644
@@ -16,10 +16,10 @@ SECTIONS
 	.text : {
 		*(.__image_copy_start)
 		arch/arm/cpu/ixp/start.o(.text*)
-		net/libnet.o(.text*)
-		board/actux1/libactux1.o(.text*)
-		arch/arm/cpu/ixp/libixp.o(.text*)
-		drivers/input/libinput.o(.text*)
+		net/built-in.o(.text*)
+		board/actux1/built-in.o(.text*)
+		arch/arm/cpu/ixp/built-in.o(.text*)
+		drivers/input/built-in.o(.text*)
 
 		. = env_offset;
 		common/env_embedded.o(.ppcenv)
board/actux2/u-boot.lds +4 -4
index 7a17176..d84934e 100644
@@ -16,10 +16,10 @@ SECTIONS
 	.text : {
 		*(.__image_copy_start)
 		arch/arm/cpu/ixp/start.o(.text*)
-		net/libnet.o(.text*)
-		board/actux2/libactux2.o(.text*)
-		arch/arm/cpu/ixp/libixp.o(.text*)
-		drivers/input/libinput.o(.text*)
+		net/built-in.o(.text*)
+		board/actux2/built-in.o(.text*)
+		arch/arm/cpu/ixp/built-in.o(.text*)
+		drivers/input/built-in.o(.text*)
 
 		. = env_offset;
 		common/env_embedded.o(.ppcenv)
board/actux3/u-boot.lds +4 -4
index aadfdd2..30c204b 100644
@@ -16,10 +16,10 @@ SECTIONS
 	.text : {
 		*(.__image_copy_start)
 		arch/arm/cpu/ixp/start.o(.text*)
-		net/libnet.o(.text*)
-		board/actux3/libactux3.o(.text*)
-		arch/arm/cpu/ixp/libixp.o(.text*)
-		drivers/input/libinput.o(.text*)
+		net/built-in.o(.text*)
+		board/actux3/built-in.o(.text*)
+		arch/arm/cpu/ixp/built-in.o(.text*)
+		drivers/input/built-in.o(.text*)
 
 		. = env_offset;
 		common/env_embedded.o(.ppcenv)
board/davinci/da8xxevm/u-boot-spl-hawk.lds +2 -2
index e43130a..d49c314 100644
@@ -19,8 +19,8 @@ SECTIONS
 	.text      :
 	{
 	  arch/arm/cpu/arm926ejs/start.o		(.text*)
-	  arch/arm/cpu/arm926ejs/davinci/libdavinci.o	(.text*)
-	  drivers/mtd/nand/libnand.o			(.text*)
+	  arch/arm/cpu/arm926ejs/davinci/built-in.o	(.text*)
+	  drivers/mtd/nand/built-in.o			(.text*)
 
 	  *(.text*)
 	}
board/dvlhost/u-boot.lds +4 -4
index 40c9c80..0035a0b 100644
@@ -16,10 +16,10 @@ SECTIONS
 	.text : {
 		*(.__image_copy_start)
 		arch/arm/cpu/ixp/start.o(.text*)
-		net/libnet.o(.text*)
-		board/dvlhost/libdvlhost.o(.text*)
-		arch/arm/cpu/ixp/libixp.o(.text*)
-		drivers/serial/libserial.o(.text*)
+		net/built-in.o(.text*)
+		board/dvlhost/built-in.o(.text*)
+		arch/arm/cpu/ixp/built-in.o(.text*)
+		drivers/serial/built-in.o(.text*)
 
 		. = env_offset;
 		common/env_embedded.o(.ppcenv)
board/esteem192e/u-boot.lds +2 -2
index 87642d6..59a86bf 100644
@@ -18,8 +18,8 @@ SECTIONS
 
     arch/powerpc/cpu/mpc8xx/start.o	(.text*)
     arch/powerpc/cpu/mpc8xx/traps.o	(.text*)
-    net/libnet.o			(.text*)
-    board/esteem192e/libesteem192e.o	(.text*)
+    net/built-in.o			(.text*)
+    board/esteem192e/built-in.o		(.text*)
 
     . = env_offset;
     common/env_embedded.o		(.text*)
board/freescale/m52277evb/u-boot.lds +2 -2
index f3337a3..70121d9 100644
@@ -13,8 +13,8 @@ SECTIONS
   .text      :
   {
     arch/m68k/cpu/mcf5227x/start.o	(.text*)
-    arch/m68k/cpu/mcf5227x/libmcf5227x.o	(.text*)
-    arch/m68k/lib/libm68k.o		(.text*)
+    arch/m68k/cpu/mcf5227x/built-in.o	(.text*)
+    arch/m68k/lib/built-in.o		(.text*)
 
     *(.text*)
   }
board/freescale/m53017evb/u-boot.lds +3 -3
index ef21299..de8d09b 100644
@@ -12,9 +12,9 @@ SECTIONS
   /* Read-only sections, merged into text segment: */
   .text      :
   {
-    arch/m68k/cpu/mcf532x/start.o		(.text*)
-    arch/m68k/cpu/mcf532x/libmcf532x.o	(.text*)
-    arch/m68k/lib/libm68k.o		(.text*)
+    arch/m68k/cpu/mcf532x/start.o	(.text*)
+    arch/m68k/cpu/mcf532x/built-in.o	(.text*)
+    arch/m68k/lib/built-in.o		(.text*)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.text*)
board/freescale/mx31ads/u-boot.lds +5 -5
index 3acc4ca..8d5cc91 100644
@@ -22,11 +22,11 @@ SECTIONS
 	  /* WARNING - the following is hand-optimized to fit within	*/
 	  /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
-	  arch/arm/cpu/arm1136/start.o			(.text*)
-	  board/freescale/mx31ads/libmx31ads.o	(.text*)
-	  arch/arm/lib/libarm.o			(.text*)
-	  net/libnet.o				(.text*)
-	  drivers/mtd/libmtd.o			(.text*)
+	  arch/arm/cpu/arm1136/start.o		(.text*)
+	  board/freescale/mx31ads/built-in.o	(.text*)
+	  arch/arm/lib/built-in.o		(.text*)
+	  net/built-in.o			(.text*)
+	  drivers/mtd/built-in.o		(.text*)
 
 	  . = DEFINED(env_offset) ? env_offset : .;
 	  common/env_embedded.o(.text*)
board/genietv/u-boot.lds +5 -5
index e217f06..70ab702 100644
@@ -18,11 +18,11 @@ SECTIONS
 
     arch/powerpc/cpu/mpc8xx/start.o	(.text*)
     arch/powerpc/cpu/mpc8xx/traps.o	(.text*)
-    lib/libgeneric.o			(.text*)
-    net/libnet.o			(.text*)
-    arch/powerpc/cpu/mpc8xx/libmpc8xx.o	(.text*)
-    board/genietv/libgenietv.o		(.text*)
-    arch/powerpc/lib/libpowerpc.o	(.text*)
+    lib/built-in.o			(.text*)
+    net/built-in.o			(.text*)
+    arch/powerpc/cpu/mpc8xx/built-in.o	(.text*)
+    board/genietv/built-in.o		(.text*)
+    arch/powerpc/lib/built-in.o		(.text*)
     *(.text.do_load_serial*)
     *(.text.do_mem_*)
     *(.text.do_bootm*)
board/hermes/u-boot.lds +1 -1
index 9419f83..0309860 100644
@@ -17,7 +17,7 @@ SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
     arch/powerpc/cpu/mpc8xx/start.o	(.text*)
     arch/powerpc/cpu/mpc8xx/traps.o	(.text*)
-    board/hermes/libhermes.o		(.text*)
+    board/hermes/built-in.o		(.text*)
 
     . = env_offset;
     common/env_embedded.o		(.text*)
board/matrix_vision/mvsmr/u-boot.lds +1 -1
index 08ce014..e885b7c 100644
@@ -18,7 +18,7 @@ SECTIONS
     /* the first two sectors (=8KB) of our S29GL flash chip */
     arch/powerpc/cpu/mpc5xxx/start.o	(.text*)
     arch/powerpc/cpu/mpc5xxx/traps.o	(.text*)
-    board/matrix_vision/common/libmatrix_vision.o (.text*)
+    board/matrix_vision/common/built-in.o	(.text*)
 
     /* This is only needed to force failure if size of above code will ever */
     /* increase and grow into reserved space. */
board/mvblue/u-boot.lds +6 -6
index 121354b..5034a96 100644
@@ -14,12 +14,12 @@ SECTIONS
   .text      :
   {
     arch/powerpc/cpu/mpc824x/start.o		(.text*)
-    lib/libgeneric.o				(.text*)
-    net/libnet.o				(.text*)
-    drivers/pci/libpci.o			(.text*)
-    arch/powerpc/cpu/mpc824x/libmpc824x.o	(.text*)
-    board/mvblue/libmvblue.o			(.text*)
-    arch/powerpc/lib/libpowerpc.o		(.text*)
+    lib/built-in.o				(.text*)
+    net/built-in.o				(.text*)
+    drivers/pci/built-in.o			(.text*)
+    arch/powerpc/cpu/mpc824x/built-in.o		(.text*)
+    board/mvblue/built-in.o			(.text*)
+    arch/powerpc/lib/built-in.o			(.text*)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.ppcenv*)
board/rbc823/u-boot.lds +4 -4
index 191f9eb..7676cf4 100644
@@ -19,10 +19,10 @@ SECTIONS
     arch/powerpc/cpu/mpc8xx/start.o	(.text*)
     arch/powerpc/cpu/mpc8xx/traps.o	(.text*)
 
-    lib/libgeneric.o			(.text*)
-    net/libnet.o			(.text*)
-    arch/powerpc/cpu/mpc8xx/libmpc8xx.o	(.text*)
-    arch/powerpc/lib/libpowerpc.o	(.text*)
+    lib/built-in.o			(.text*)
+    net/built-in.o			(.text*)
+    arch/powerpc/cpu/mpc8xx/built-in.o	(.text*)
+    arch/powerpc/lib/built-in.o		(.text*)
 
     . = env_offset;
     common/env_embedded.o		(.text*)
board/spd8xx/u-boot.lds +2 -2
index 2a68934..463af7e 100644
@@ -18,8 +18,8 @@ SECTIONS
 
     arch/powerpc/cpu/mpc8xx/start.o	(.text*)
     arch/powerpc/cpu/mpc8xx/traps.o	(.text*)
-    net/libnet.o			(.text*)
-    arch/powerpc/cpu/mpc8xx/libmpc8xx.o	(.text*)
+    net/built-in.o			(.text*)
+    arch/powerpc/cpu/mpc8xx/built-in.o	(.text*)
     *(.text.v*printf)
 
     . = DEFINED(env_offset) ? env_offset : .;
board/svm_sc8xx/u-boot.lds +5 -5
index 4922625..df564e9 100644
@@ -17,11 +17,11 @@ SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
     arch/powerpc/cpu/mpc8xx/start.o	(.text*)
     arch/powerpc/cpu/mpc8xx/traps.o	(.text*)
-    lib/libgeneric.o			(.text*)
-    net/libnet.o			(.text*)
-    arch/powerpc/cpu/mpc8xx/libmpc8xx.o	(.text*)
-    arch/powerpc/lib/libpowerpc.o	(.text*)
-    board/svm_sc8xx/libsvm_sc8xx.o	(.text*)
+    lib/built-in.o			(.text*)
+    net/built-in.o			(.text*)
+    arch/powerpc/cpu/mpc8xx/built-in.o	(.text*)
+    arch/powerpc/lib/built-in.o		(.text*)
+    board/svm_sc8xx/built-in.o		(.text*)
     *(.text.*printf)
     *(.text.do_mem_*)
     *(.text.flash*)
board/ti/am335x/u-boot.lds +1 -1
index a173f62..e77a501 100644
@@ -35,7 +35,7 @@ SECTIONS
 	{
 		*(.__image_copy_start)
 		CPUDIR/start.o (.text*)
-		board/ti/am335x/libam335x.o (.text*)
+		board/ti/am335x/built-in.o (.text*)
 		*(.text*)
 	}
 
board/tqc/tqm8xx/u-boot.lds +7 -7
index cbfc94f..b77ae56 100644
@@ -18,13 +18,13 @@ SECTIONS
 
     arch/powerpc/cpu/mpc8xx/start.o	(.text*)
     arch/powerpc/cpu/mpc8xx/traps.o	(.text*)
-    arch/powerpc/cpu/mpc8xx/libmpc8xx.o (.text*)
-    arch/powerpc/lib/libpowerpc.o	(.text*)
-    board/tqc/tqm8xx/libtqm8xx.o	(.text*)
-    disk/libdisk.o			(.text*)
-    drivers/net/libnet.o		(.text*)
-    drivers/libdrivers.o		(.text.pcmcia_on)
-    drivers/libdrivers.o		(.text.pcmcia_hardware_enable)
+    arch/powerpc/cpu/mpc8xx/built-in.o	(.text*)
+    arch/powerpc/lib/built-in.o		(.text*)
+    board/tqc/tqm8xx/built-in.o		(.text*)
+    disk/built-in.o			(.text*)
+    drivers/net/built-in.o		(.text*)
+    drivers/built-in.o			(.text.pcmcia_on)
+    drivers/built-in.o			(.text.pcmcia_hardware_enable)
 
     . = DEFINED(env_offset) ? env_offset : .;
     common/env_embedded.o	(.ppcenv*)
board/vpac270/u-boot-spl.lds +2 -2
index 7eac497..c9b50e9 100644
@@ -20,8 +20,8 @@ SECTIONS
 	.text.0	:
 	{
 		arch/arm/cpu/pxa/start.o		(.text*)
-		board/vpac270/libvpac270.o		(.text*)
-		drivers/mtd/onenand/libonenand.o	(.text*)
+		board/vpac270/built-in.o		(.text*)
+		drivers/mtd/onenand/built-in.o		(.text*)
 	}
 
 
include/configs/bct-brettl2.h +2 -2
index ce09c2e..5b09b45 100644
@@ -111,8 +111,8 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
-	arch/blackfin/lib/libblackfin.o (.text*); \
-	arch/blackfin/cpu/libblackfin.o (.text*); \
+	arch/blackfin/lib/built-in.o (.text*); \
+	arch/blackfin/cpu/built-in.o (.text*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o (.text*);
 #endif
include/configs/bf533-stamp.h +2 -2
index 7144c63..a22c868 100644
@@ -155,8 +155,8 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
-	arch/blackfin/lib/libblackfin.o (.text*); \
-	arch/blackfin/cpu/libblackfin.o (.text*); \
+	arch/blackfin/lib/built-in.o (.text*); \
+	arch/blackfin/cpu/built-in.o (.text*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o (.text*);
 #endif
include/configs/bf537-pnav.h +2 -2
index 62bd3bf..3aa3d50 100644
@@ -111,8 +111,8 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
-	arch/blackfin/lib/libblackfin.o (.text*); \
-	arch/blackfin/cpu/libblackfin.o (.text*); \
+	arch/blackfin/lib/built-in.o (.text*); \
+	arch/blackfin/cpu/built-in.o (.text*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o (.text*);
 #endif
include/configs/bf537-stamp.h +2 -2
index 25cebf8..02945be 100644
@@ -118,8 +118,8 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
-	arch/blackfin/lib/libblackfin.o (.text*); \
-	arch/blackfin/cpu/libblackfin.o (.text*); \
+	arch/blackfin/lib/built-in.o (.text*); \
+	arch/blackfin/cpu/built-in.o (.text*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o (.text*);
 #endif
include/configs/bf538f-ezkit.h +2 -2
index 77822e7..ffb0caf 100644
@@ -115,8 +115,8 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
-	arch/blackfin/lib/libblackfin.o (.text*); \
-	arch/blackfin/cpu/libblackfin.o (.text*); \
+	arch/blackfin/lib/built-in.o (.text*); \
+	arch/blackfin/cpu/built-in.o (.text*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o (.text*);
 #endif
include/configs/cm-bf537e.h +2 -2
index 77f47d9..8f10eba 100644
@@ -112,8 +112,8 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
-	arch/blackfin/lib/libblackfin.o (.text*); \
-	arch/blackfin/cpu/libblackfin.o (.text*); \
+	arch/blackfin/lib/built-in.o (.text*); \
+	arch/blackfin/cpu/built-in.o (.text*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o (.text*);
 #endif
include/configs/cm-bf537u.h +2 -2
index 55e61d6..a1c8e8a 100644
@@ -110,8 +110,8 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
-	arch/blackfin/lib/libblackfin.o (.text*); \
-	arch/blackfin/cpu/libblackfin.o (.text*); \
+	arch/blackfin/lib/built-in.o (.text*); \
+	arch/blackfin/cpu/built-in.o (.text*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o (.text*);
 #endif
include/configs/dnp5370.h +2 -2
index f2f4102..d0e72e3 100644
@@ -85,8 +85,8 @@
 
 #define ENV_IS_EMBEDDED
 #define LDS_BOARD_TEXT \
-	arch/blackfin/lib/libblackfin.o (.text*); \
-	arch/blackfin/cpu/libblackfin.o (.text*); \
+	arch/blackfin/lib/built-in.o (.text*); \
+	arch/blackfin/cpu/built-in.o (.text*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o (.text*);
 
include/configs/ibf-dsp561.h +2 -2
index 5291755..ac5ca9a 100644
@@ -95,8 +95,8 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
-	arch/blackfin/lib/libblackfin.o (.text*); \
-	arch/blackfin/cpu/libblackfin.o (.text*); \
+	arch/blackfin/lib/built-in.o (.text*); \
+	arch/blackfin/cpu/built-in.o (.text*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o (.text*);
 #endif
include/configs/tcm-bf537.h +2 -2
index 2adb071..627836a 100644
@@ -112,8 +112,8 @@
  * it linked after the configuration sector.
  */
 # define LDS_BOARD_TEXT \
-	arch/blackfin/lib/libblackfin.o (.text*); \
-	arch/blackfin/cpu/libblackfin.o (.text*); \
+	arch/blackfin/lib/built-in.o (.text*); \
+	arch/blackfin/cpu/built-in.o (.text*); \
 	. = DEFINED(env_offset) ? env_offset : .; \
 	common/env_embedded.o (.text*);
 #endif
spl/Makefile +37 -36

96 lines not on this page · raw message

Signature · 1 line
1.8.3.2
#13 lore raw

PATCH 13/22 Makefile: refactor a little

In reply to Masahiro Yamada
---
 Makefile     | 4 +---
 spl/Makefile | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)
Makefile +1 -3
index 1389ee7..e28878b 100644
@@ -65,11 +65,9 @@ endif
 # the object files are placed in the source directory.
 #
 
-ifdef O
 ifeq ("$(origin O)", "command line")
 BUILD_DIR := $(O)
 endif
-endif
 
 # Call a source code checker (by default, "sparse") as part of the
 # C compilation.
@@ -614,7 +612,7 @@ SYSTEM_MAP = \
 		grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
 		LC_ALL=C sort
 $(obj)System.map:	$(obj)u-boot
-		@$(call SYSTEM_MAP,$<) > $(obj)System.map
+		@$(call SYSTEM_MAP,$<) > $@
 
 checkthumb:
 	@if test $(call cc-version) -lt 0404; then \
spl/Makefile +1 -2
index 29354f9..5bc75b4 100644
@@ -166,8 +166,7 @@ all:	$(ALL-y)
 
 ifdef CONFIG_SAMSUNG
 $(obj)$(BOARD)-spl.bin: $(obj)u-boot-spl.bin
-	$(OBJTREE)/tools/mk$(BOARD)spl \
-		$(obj)u-boot-spl.bin $(obj)$(BOARD)-spl.bin
+	$(OBJTREE)/tools/mk$(BOARD)spl $< $@
 endif
 
 $(obj)$(SPL_BIN).bin:	$(obj)$(SPL_BIN)
Signature · 1 line
1.8.3.2
#14 lore raw

PATCH 14/22 config.mk: delete unnecessary lines

In reply to Masahiro Yamada

SPL_BIN is already defined in spl/Makefile
and it is used only in spl/Makefile.

---
 config.mk | 6 ------
 1 file changed, 6 deletions(-)
config.mk +0 -6
index 8a82ab4..7c5c82d 100644
@@ -13,12 +13,6 @@ SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
 
 export	SHELL
 
-ifeq ($(CONFIG_TPL_BUILD),y)
-SPL_BIN := u-boot-tpl
-else
-SPL_BIN := u-boot-spl
-endif
-
 ifeq ($(CURDIR),$(SRCTREE))
 dir :=
 else
Signature · 1 line
1.8.3.2
#15 lore raw

PATCH 15/22 tools: Makefile: delete redundant lines

In reply to Masahiro Yamada

HOSTOS is defined and exported at the top Makefile.

---
 tools/gdb/Makefile | 2 --
 1 file changed, 2 deletions(-)
tools/gdb/Makefile +0 -2
index dee91fc..dd98fb6 100644
@@ -23,8 +23,6 @@ BINS	:= $(addprefix $(obj),$(BINS))
 #
 HOSTCPPFLAGS = -I$(BFD_ROOT_DIR)/include
 
-HOSTOS := $(shell uname -s | sed -e 's/\([Cc][Yy][Gg][Ww][Ii][Nn]\).*/cygwin/')
-
 ifeq ($(HOSTOS),cygwin)
 
 all:
Signature · 1 line
1.8.3.2
#16 lore raw

PATCH 16/22 Makefile: delete unused lines

In reply to Masahiro Yamada
---
 Makefile | 6 ------
 1 file changed, 6 deletions(-)
Makefile +0 -6
index e28878b..5ad2bd7 100644
@@ -784,12 +784,6 @@ sinclude $(obj).boards.depend
 $(obj).boards.depend:	boards.cfg
 	@awk '(NF && $$1 !~ /^#/) { print $$7 ": " $$7 "_config; $$(MAKE)" }' $< > $@
 
-#
-# Functions to generate common board directory names
-#
-lcname	= $(shell echo $(1) | sed -e 's/\(.*\)_config/\L\1/')
-ucname	= $(shell echo $(1) | sed -e 's/\(.*\)_config/\U\1/')
-
 #########################################################################
 #########################################################################
 
Signature · 1 line
1.8.3.2
#17 lore raw

PATCH 17/22 powerpc: mpc83xx: delete unused rules

In reply to Masahiro Yamada
---
 arch/powerpc/cpu/mpc83xx/Makefile | 6 ------
 1 file changed, 6 deletions(-)
arch/powerpc/cpu/mpc83xx/Makefile +0 -6
index b7142f0..a501a3b 100644
@@ -48,11 +48,5 @@ obj-$(CONFIG_FSL_DDR2) += law.o
 
 endif # not minimal
 
-$(obj)ddr-gen1.c:
-	ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/ddr-gen1.c $(obj)ddr-gen1.c
-
 $(obj)ddr-gen2.c:
 	ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/ddr-gen2.c $(obj)ddr-gen2.c
-
-$(obj)ddr-gen3.c:
-	ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/ddr-gen3.c $(obj)ddr-gen3.c
Signature · 1 line
1.8.3.2
#18 lore raw

PATCH 18/22 powerpc: mpc83xx: Do not create a symbolic link to ddr-gen2.c

In reply to Masahiro Yamada
---
 Makefile                          | 1 -
 arch/powerpc/cpu/mpc83xx/Makefile | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)
Makefile +0 -1
index 5ad2bd7..4f5a1ac 100644
@@ -861,7 +861,6 @@ clobber:	tidy
 	@rm -f $(obj)SPL
 	@rm -f $(obj)tools/xway-swap-bytes
 	@rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c
-	@rm -f $(obj)arch/powerpc/cpu/mpc83xx/ddr-gen?.c
 	@rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
 	@rm -fr $(obj)include/generated
 	@[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f
arch/powerpc/cpu/mpc83xx/Makefile +1 -5
index a501a3b..d3f7001 100644
@@ -39,14 +39,10 @@ obj-$(CONFIG_OF_LIBFDT) += fdt.o
 obj-y += cache.o
 
 ifdef CONFIG_FSL_DDR2
-obj-$(CONFIG_MPC8349) += ddr-gen2.o
-SRCS += $(obj)ddr-gen2.c
+obj-$(CONFIG_MPC8349) += ../mpc85xx/ddr-gen2.o
 else
 obj-y += spd_sdram.o
 endif
 obj-$(CONFIG_FSL_DDR2) += law.o
 
 endif # not minimal
-
-$(obj)ddr-gen2.c:
-	ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/ddr-gen2.c $(obj)ddr-gen2.c
Signature · 1 line
1.8.3.2
#19 lore raw

PATCH 19/22 powerpc: mpc824x: Do not create a symbolic link to bedbug_603e.c

In reply to Masahiro Yamada
---
 Makefile                            | 1 -
 arch/powerpc/cpu/mpc824x/.gitignore | 1 -
 arch/powerpc/cpu/mpc824x/Makefile   | 6 +-----
 3 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 arch/powerpc/cpu/mpc824x/.gitignore
Makefile +0 -1
index 4f5a1ac..c04917f 100644
@@ -860,7 +860,6 @@ clobber:	tidy
 	@rm -f $(obj)MLO MLO.byteswap
 	@rm -f $(obj)SPL
 	@rm -f $(obj)tools/xway-swap-bytes
-	@rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c
 	@rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
 	@rm -fr $(obj)include/generated
 	@[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f
arch/powerpc/cpu/mpc824x/.gitignore deleted +0 -1
deleted file mode 100644
index 2d79931..0000000
@@ -1 +0,0 @@
-/bedbug_603e.c
arch/powerpc/cpu/mpc824x/Makefile +1 -5
index 194fadd..2c8be92 100644
@@ -8,8 +8,4 @@
 extra-y	= start.o
 obj-y	= traps.o cpu.o cpu_init.o interrupts.o speed.o \
 	  drivers/epic/epic1.o drivers/i2c/i2c.o pci.o
-obj-y += bedbug_603e.o
-
-SRCS += $(obj)bedbug_603e.c
-$(obj)bedbug_603e.c:
-	ln -sf $(src)../mpc8260/bedbug_603e.c $(obj)bedbug_603e.c
+obj-y += ../mpc8260/bedbug_603e.o
Signature · 1 line
1.8.3.2
#20 lore raw

PATCH 20/22 arm: rmobile: Do not create a symbolic link to sh timer

In reply to Masahiro Yamada
Cc Nobuhiro Iwamatsu <[email protected]>
---
 arch/arm/cpu/armv7/rmobile/Makefile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
arch/arm/cpu/armv7/rmobile/Makefile +1 -7
index 8f4cf3a..5e296c4 100644
@@ -15,10 +15,4 @@ obj-$(CONFIG_R8A7740) += cpu_info-r8a7740.o
 obj-$(CONFIG_R8A7740) += pfc-r8a7740.o
 obj-$(CONFIG_SH73A0) += cpu_info-sh73a0.o
 obj-$(CONFIG_SH73A0) += pfc-sh73a0.o
-obj-$(CONFIG_TMU_TIMER) += sh_timer.o
-
-SRCS += $(obj)sh_timer.c
-# from arch/sh/lib/ directory
-$(obj)sh_timer.c:
-	@rm -f $(obj)sh_timer.c
-	ln -s $(SRCTREE)/arch/sh/lib/time.c $(obj)sh_timer.c
+obj-$(CONFIG_TMU_TIMER) += ../../../../sh/lib/time.o
Signature · 1 line
1.8.3.2
#21 lore raw

PATCH 21/22 Makefile: move fs/fat/ entry to drivers/Makefile

In reply to Masahiro Yamada
---
 Makefile     | 3 +--
 fs/Makefile  | 5 +++++
 spl/Makefile | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
Makefile +1 -2
index c04917f..b8713a4 100644
@@ -243,8 +243,7 @@ endif
 LIBS-$(CONFIG_IXP4XX_NPE) += drivers/net/npe/
 LIBS-$(CONFIG_OF_EMBED) += dts/
 LIBS-y += arch/$(ARCH)/lib/
-LIBS-y += fs/ \
-	fs/fat/
+LIBS-y += fs/
 LIBS-y += net/
 LIBS-y += disk/
 LIBS-y += drivers/
fs/Makefile +5 -0
index bdcd746..ee01a7d 100644
@@ -6,11 +6,15 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
+ifdef CONFIG_SPL_BUILD
+obj-$(CONFIG_SPL_FAT_SUPPORT) += fat/
+else
 obj-y				+= fs.o
 
 obj-y += cbfs/
 obj-y += cramfs/
 obj-y += ext4/
+obj-y += fat/
 obj-y += fdos/
 obj-y += jffs2/
 obj-y += reiserfs/
@@ -18,3 +22,4 @@ obj-y += sandbox/
 obj-y += ubifs/
 obj-y += yaffs2/
 obj-y += zfs/
+endif
spl/Makefile +1 -1
index 5bc75b4..29d7818 100644
@@ -73,7 +73,7 @@ LIBS-$(CONFIG_SPL_MMC_SUPPORT) += drivers/mmc/
 LIBS-$(CONFIG_SPL_SERIAL_SUPPORT) += drivers/serial/
 LIBS-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += drivers/mtd/spi/
 LIBS-$(CONFIG_SPL_SPI_SUPPORT) += drivers/spi/
-LIBS-$(CONFIG_SPL_FAT_SUPPORT) += fs/fat/
+LIBS-y += fs/
 LIBS-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/
 LIBS-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/ \
 	drivers/power/pmic/
Signature · 1 line
1.8.3.2
#22 lore raw

PATCH 21/22 Makefile: move fs/fat/ entry to drivers/Makefile

Quoted 2 lines · Masahiro Yamada
Quoted 61 lines
---
 Makefile     | 3 +--
 fs/Makefile  | 5 +++++
 spl/Makefile | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
Makefile +1 -2
index c04917f..b8713a4 100644
@@ -243,8 +243,7 @@ endif
 LIBS-$(CONFIG_IXP4XX_NPE) += drivers/net/npe/
 LIBS-$(CONFIG_OF_EMBED) += dts/
 LIBS-y += arch/$(ARCH)/lib/
-LIBS-y += fs/ \
-       fs/fat/
+LIBS-y += fs/
 LIBS-y += net/
 LIBS-y += disk/
 LIBS-y += drivers/
fs/Makefile +5 -0
index bdcd746..ee01a7d 100644
@@ -6,11 +6,15 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
+ifdef CONFIG_SPL_BUILD
+obj-$(CONFIG_SPL_FAT_SUPPORT) += fat/
+else
 obj-y                          += fs.o
 
 obj-y += cbfs/
 obj-y += cramfs/
 obj-y += ext4/
+obj-y += fat/
 obj-y += fdos/
 obj-y += jffs2/
 obj-y += reiserfs/
@@ -18,3 +22,4 @@ obj-y += sandbox/
 obj-y += ubifs/
 obj-y += yaffs2/
 obj-y += zfs/
+endif
spl/Makefile +1 -2
index 5bc75b4..29d7818 100644
@@ -73,7 +73,7 @@ LIBS-$(CONFIG_SPL_MMC_SUPPORT) += drivers/mmc/
 LIBS-$(CONFIG_SPL_SERIAL_SUPPORT) += drivers/serial/
 LIBS-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += drivers/mtd/spi/
 LIBS-$(CONFIG_SPL_SPI_SUPPORT) += drivers/spi/
-LIBS-$(CONFIG_SPL_FAT_SUPPORT) += fs/fat/
+LIBS-y += fs/
 LIBS-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/
 LIBS-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/ \
        drivers/power/pmic/
--

1.8.3.2

#23 lore raw

PATCH 22/22 fs: descend into sub directories when it is necessary

In reply to Masahiro Yamada
---
 fs/Makefile          | 20 ++++++++++----------
 fs/cbfs/Makefile     |  2 +-
 fs/cramfs/Makefile   |  4 ++--
 fs/ext4/Makefile     |  2 +-
 fs/fdos/Makefile     |  2 +-
 fs/jffs2/Makefile    |  2 --
 fs/reiserfs/Makefile |  2 +-
 fs/sandbox/Makefile  |  2 +-
 fs/ubifs/Makefile    |  8 ++++----
 fs/yaffs2/Makefile   |  2 +-
 fs/zfs/Makefile      |  2 +-
 11 files changed, 23 insertions(+), 25 deletions(-)
fs/Makefile +10 -10
index ee01a7d..34dc035 100644
@@ -11,15 +11,15 @@ obj-$(CONFIG_SPL_FAT_SUPPORT) += fat/
 else
 obj-y				+= fs.o
 
-obj-y += cbfs/
-obj-y += cramfs/
-obj-y += ext4/
+obj-$(CONFIG_CMD_CBFS) += cbfs/
+obj-$(CONFIG_CMD_CRAMFS) += cramfs/
+obj-$(CONFIG_FS_EXT4) += ext4/
 obj-y += fat/
-obj-y += fdos/
-obj-y += jffs2/
-obj-y += reiserfs/
-obj-y += sandbox/
-obj-y += ubifs/
-obj-y += yaffs2/
-obj-y += zfs/
+obj-$(CONFIG_CMD_FDOS) += fdos/
+obj-$(CONFIG_CMD_JFFS2) += jffs2/
+obj-$(CONFIG_CMD_REISER) += reiserfs/
+obj-$(CONFIG_SANDBOX) += sandbox/
+obj-$(CONFIG_CMD_UBIFS) += ubifs/
+obj-$(CONFIG_YAFFS2) += yaffs2/
+obj-$(CONFIG_CMD_ZFS) += zfs/
 endif
fs/cbfs/Makefile +1 -1
index 6f33d28..a106e05 100644
@@ -3,4 +3,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_CMD_CBFS)	:= cbfs.o
+obj-y	:= cbfs.o
fs/cramfs/Makefile +2 -2
index e2b2c73..12d73a3 100644
@@ -5,5 +5,5 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_CMD_CRAMFS) := cramfs.o
-obj-$(CONFIG_CMD_CRAMFS) += uncompress.o
+obj-y := cramfs.o
+obj-y += uncompress.o
fs/ext4/Makefile +1 -1
index 0f5d399..8d15bda 100644
@@ -9,5 +9,5 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_FS_EXT4) := ext4fs.o ext4_common.o dev.o
+obj-y := ext4fs.o ext4_common.o dev.o
 obj-$(CONFIG_EXT4_WRITE) += ext4_write.o ext4_journal.o crc16.o
fs/fdos/Makefile +1 -1
index 95480af..2f8b5ad 100644
@@ -10,4 +10,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_CMD_FDOS) := fat.o vfat.o dev.o fdos.o fs.o subdir.o
+obj-y := fat.o vfat.o dev.o fdos.o fs.o subdir.o
fs/jffs2/Makefile +0 -2
index 02e481f..4cb0600 100644
@@ -5,11 +5,9 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-ifdef CONFIG_CMD_JFFS2
 obj-$(CONFIG_JFFS2_LZO) += compr_lzo.o
 obj-y += compr_rtime.o
 obj-y += compr_rubin.o
 obj-y += compr_zlib.o
 obj-y += jffs2_1pass.o
 obj-y += mini_inflate.o
-endif
fs/reiserfs/Makefile +1 -1
index 55f70b1..5a692f0 100644
@@ -9,4 +9,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_CMD_REISER) := reiserfs.o dev.o mode_string.o
+obj-y := reiserfs.o dev.o mode_string.o
fs/sandbox/Makefile +1 -1
index faa7c16..ca238f6 100644
@@ -10,4 +10,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_SANDBOX) := sandboxfs.o
+obj-y := sandboxfs.o
fs/ubifs/Makefile +4 -4
index 47d5a8f..389b0e3 100644
@@ -9,10 +9,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_CMD_UBIFS) := ubifs.o io.o super.o sb.o master.o lpt.o
-obj-$(CONFIG_CMD_UBIFS) += lpt_commit.o scan.o lprops.o
-obj-$(CONFIG_CMD_UBIFS) += tnc.o tnc_misc.o debug.o crc16.o budget.o
-obj-$(CONFIG_CMD_UBIFS) += log.o orphan.o recovery.o replay.o
+obj-y := ubifs.o io.o super.o sb.o master.o lpt.o
+obj-y += lpt_commit.o scan.o lprops.o
+obj-y += tnc.o tnc_misc.o debug.o crc16.o budget.o
+obj-y += log.o orphan.o recovery.o replay.o
 
 # SEE README.arm-unaligned-accesses
 $(obj)super.o: CFLAGS += $(PLATFORM_NO_UNALIGNED)
fs/yaffs2/Makefile +1 -1
index 077af78..d811287 100644
@@ -16,7 +16,7 @@
 #
 # $Id: Makefile,v 1.15 2007/07/18 19:40:38 charles Exp $
 
-obj-$(CONFIG_YAFFS2) := \
+obj-y := \
 	yaffs_allocator.o yaffs_attribs.o yaffs_bitmap.o yaffs_uboot_glue.o\
 	yaffs_checkptrw.o yaffs_ecc.o yaffs_error.o \
 	yaffsfs.o yaffs_guts.o yaffs_nameval.o yaffs_nand.o\
fs/zfs/Makefile +1 -1
index 7090416..fa58b7f 100644
@@ -5,4 +5,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_CMD_ZFS) := dev.o zfs.o zfs_fletcher.o zfs_sha256.o zfs_lzjb.o
+obj-y := dev.o zfs.o zfs_fletcher.o zfs_sha256.o zfs_lzjb.o
Signature · 1 line
1.8.3.2
#24 lore raw

cover A collection of trivial Makefile refactoring

In reply to Masahiro Yamada
Quoted 155 lines · Masahiro Yamada

This series does not add any new features but
refactor makefiles.

Masahiro Yamada (22):
Makefile: abolish COBJS, SOBJS, etc.
Makefile: specifiy an explicite object name rather than $(BOARD).o
drivers: descend into sub directories only when it is necessary
lib: descend into sub directories only when it is necessary
drivers: tpm: clean up unused code
Makefile: make directories by Makefile.build
Makefile: merge $(LIBBOARD) into $(LIBS)
powerpc: move mpc8xxx entry under arch/powerpc/cpu/ drivers/qe: move the entry to drivers/Makefile drivers/net/fm: descend only when CONFIG_FMAN_ENET=y drivers/net/npe: descend only when CONFIG_IXP4XX_NPE=y
Makefile: rename all libraries to built-in.o
Makefile: refactor a little
config.mk: delete unnecessary lines
tools: Makefile: delete redundant lines
Makefile: delete unused lines
powerpc: mpc83xx: delete unused rules
powerpc: mpc83xx: Do not create a symbolic link to ddr-gen2.c
powerpc: mpc824x: Do not create a symbolic link to bedbug_603e.c
arm: rmobile: Do not create a symbolic link to sh timer
Makefile: move fs/fat/ entry to drivers/Makefile
fs: descend into sub directories when it is necessary

 Makefile                                   | 149 +++++++++--------------
 arch/arm/cpu/armv7/rmobile/Makefile        |   8 +-
 arch/microblaze/cpu/u-boot.lds             |   2 +-
 arch/powerpc/cpu/Makefile                  |   3 +
 arch/powerpc/cpu/mpc512x/Makefile          |   2 -
 arch/powerpc/cpu/mpc824x/.gitignore        |   1 -
 arch/powerpc/cpu/mpc824x/Makefile          |  10 +-
 arch/powerpc/cpu/mpc83xx/Makefile          |  12 +-
 arch/powerpc/cpu/mpc8xxx/Makefile          |   6 +
 board/LEOX/elpt860/u-boot.lds              |   8 +-
 board/LaCie/edminiv2/Makefile              |   4 -
 board/LaCie/net2big_v2/Makefile            |   4 -
 board/LaCie/netspace_v2/Makefile           |   4 -
 board/LaCie/wireless_space/Makefile        |   4 -
 board/Marvell/db64360/Makefile             |   4 -
 board/Marvell/db64460/Makefile             |   4 -
 board/actux1/u-boot.lds                    |   8 +-
 board/actux2/u-boot.lds                    |   8 +-
 board/actux3/u-boot.lds                    |   8 +-
 board/altera/nios2-generic/Makefile        |   4 -
 board/avionic-design/medcom-wide/Makefile  |   2 -
 board/avionic-design/plutux/Makefile       |   2 -
 board/avionic-design/tec/Makefile          |   2 -
 board/compal/paz00/Makefile                |   2 -
 board/compulab/trimslice/Makefile          |   2 -
 board/davinci/da8xxevm/u-boot-spl-hawk.lds |   4 +-
 board/dvlhost/u-boot.lds                   |   8 +-
 board/emk/top5200/Makefile                 |   4 -
 board/emk/top860/Makefile                  |   3 -
 board/esd/adciop/Makefile                  |   4 -
 board/esd/apc405/Makefile                  |   4 -
 board/esd/ar405/Makefile                   |   4 -
 board/esd/ash405/Makefile                  |   4 -
 board/esd/cms700/Makefile                  |   4 -
 board/esd/cpci2dp/Makefile                 |   4 -
 board/esd/cpci405/Makefile                 |   4 -
 board/esd/cpci5200/Makefile                |   4 -
 board/esd/cpci750/Makefile                 |   4 -
 board/esd/cpciiser4/Makefile               |   4 -
 board/esd/dasa_sim/Makefile                |   4 -
 board/esd/dp405/Makefile                   |   4 -
 board/esd/du405/Makefile                   |   4 -
 board/esd/hh405/Makefile                   |   4 -
 board/esd/hub405/Makefile                  |   4 -
 board/esd/ocrtc/Makefile                   |   4 -
 board/esd/pci405/Makefile                  |   4 -
 board/esd/pf5200/Makefile                  |   4 -
 board/esd/plu405/Makefile                  |   4 -
 board/esd/pmc405/Makefile                  |   4 -
 board/esd/pmc405de/Makefile                |   4 -
 board/esd/pmc440/Makefile                  |   4 -
 board/esd/voh405/Makefile                  |   4 -
 board/esd/vom405/Makefile                  |   4 -
 board/esd/wuh405/Makefile                  |   4 -
 board/esteem192e/u-boot.lds                |   4 +-
 board/freescale/m52277evb/u-boot.lds       |   4 +-
 board/freescale/m53017evb/u-boot.lds       |   6 +-
 board/freescale/mx31ads/u-boot.lds         |  10 +-
 board/freescale/t1040qds/Makefile          |   2 +-
 board/genietv/u-boot.lds                   |  10 +-
 board/hermes/u-boot.lds                    |   2 +-
 board/keymile/km82xx/Makefile              |   3 -
 board/keymile/km83xx/Makefile              |   4 -
 board/keymile/km_arm/Makefile              |   4 -
 board/keymile/kmp204x/Makefile             |   6 +-
 board/kup/kup4k/Makefile                   |   4 -
 board/kup/kup4x/Makefile                   |   4 -
 board/matrix_vision/mvsmr/u-boot.lds       |   2 +-
 board/mpl/mip405/Makefile                  |   4 -
 board/mpl/pati/Makefile                    |   4 -
 board/mpl/pip405/Makefile                  |   4 -
 board/mpl/vcma9/Makefile                   |   4 -
 board/mvblue/u-boot.lds                    |  12 +-
 board/nvidia/beaver/Makefile               |   2 -
 board/nvidia/ventana/Makefile              |   2 -
 board/prodrive/p3mx/Makefile               |   4 -
 board/psyent/pci5441/Makefile              |   4 -
 board/psyent/pk1c20/Makefile               |   4 -
 board/rbc823/u-boot.lds                    |   8 +-
 board/sandburst/karef/Makefile             |   4 -
 board/sandburst/metrobox/Makefile          |   4 -
 board/siemens/dxr2/Makefile                |   4 -
 board/siemens/pxm2/Makefile                |   4 -
 board/siemens/rut/Makefile                 |   4 -
 board/spd8xx/u-boot.lds                    |   4 +-
 board/svm_sc8xx/u-boot.lds                 |  10 +-
 board/ti/am335x/u-boot.lds                 |   2 +-
 board/ti/beagle/Makefile                   |   2 +-
 board/toradex/colibri_t20_iris/Makefile    |   3 -
 board/tqc/tqm8260/Makefile                 |   4 -
 board/tqc/tqm8272/Makefile                 |   4 -
 board/tqc/tqm8xx/u-boot.lds                |  14 +--
 board/vpac270/u-boot-spl.lds               |   4 +-
 board/xilinx/ppc405-generic/Makefile       |   4 -
 board/xilinx/ppc440-generic/Makefile       |   4 -
 config.mk                                  |   6 -
 drivers/Makefile                           |   5 +-
 drivers/bios_emulator/Makefile             |   4 +-
 drivers/fpga/Makefile                      |   2 -
 drivers/net/fm/Makefile                    |   2 -
 drivers/net/npe/Makefile                   |   2 +-
 drivers/qe/Makefile                        |   4 +-
 drivers/tpm/Makefile                       |   2 -
 drivers/tpm/tis_i2c.c                      | 185 -----------------------------
 fs/Makefile                                |  25 ++--
 fs/cbfs/Makefile                           |   2 +-
 fs/cramfs/Makefile                         |   4 +-
 fs/ext4/Makefile                           |   2 +-
 fs/fdos/Makefile                           |   2 +-
 fs/jffs2/Makefile                          |   2 -
 fs/reiserfs/Makefile                       |   2 +-
 fs/sandbox/Makefile                        |   2 +-
 fs/ubifs/Makefile                          |   8 +-
 fs/yaffs2/Makefile                         |   2 +-
 fs/zfs/Makefile                            |   2 +-
 include/configs/bct-brettl2.h              |   4 +-
 include/configs/bf533-stamp.h              |   4 +-
 include/configs/bf537-pnav.h               |   4 +-
 include/configs/bf537-stamp.h              |   4 +-
 include/configs/bf538f-ezkit.h             |   4 +-
 include/configs/cm-bf537e.h                |   4 +-
 include/configs/cm-bf537u.h                |   4 +-
 include/configs/dnp5370.h                  |   4 +-
 include/configs/ibf-dsp561.h               |   4 +-
 include/configs/tcm-bf537.h                |   4 +-
 lib/lzma/Makefile                          |   2 +-
 lib/lzo/Makefile                           |   2 +-
 lib/rsa/Makefile                           |   4 +-
Quoted 8 lines
 lib/zlib/Makefile                          |   2 +-
 scripts/Makefile.build                     |  19 +--
 spl/Makefile                               |  87 ++++++--------
 tools/gdb/Makefile                         |   2 -
 132 files changed, 251 insertions(+), 746 deletions(-)
 create mode 100644 arch/powerpc/cpu/Makefile
 delete mode 100644 arch/powerpc/cpu/mpc824x/.gitignore
 delete mode 100644 drivers/tpm/tis_i2c.c

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131117/b65db1ef/attachment.pgp>