diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-06-24 22:10:52 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-07-07 19:42:34 -0400 |
| commit | a8b0f9b685072e1d3acd01741e7db6833b445b2a (patch) | |
| tree | ef92f75a73693017a4bc42e690eec2b0618d48cc /config.mk | |
| parent | d1db76f1494492fc1c13e3bfe036c6dfb942e8be (diff) | |
| download | u-boot-a8b0f9b685072e1d3acd01741e7db6833b445b2a.tar.gz u-boot-a8b0f9b685072e1d3acd01741e7db6833b445b2a.tar.bz2 u-boot-a8b0f9b685072e1d3acd01741e7db6833b445b2a.zip | |
build: define CPU only when arch/${ARCH}/cpu/${CPU} exists
The directory arch/${ARCH}/cpu/${CPU} does not exist
in avr32, blackfin, microblaze, nios2, openrisc, sandbox, x86.
These architectures have only one CPU type.
Defining CPU should not be required for such architectures.
This commit allows cpu field (= the 3rd field of boards.cfg)
to be kept blank.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Andreas Bießmann <andreas.devel@googlemail.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Sonic Zhang <sonic.zhang@analog.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Thomas Chou <thomas@wytron.com.tw>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Diffstat (limited to 'config.mk')
| -rw-r--r-- | config.mk | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -24,10 +24,7 @@ OBJCOPYFLAGS := # so calculate CPUDIR before including ARCH/SOC/CPU config.mk files. # Check if arch/$ARCH/cpu/$CPU exists, otherwise assume arch/$ARCH/cpu contains # CPU-specific code. -CPUDIR=arch/$(ARCH)/cpu/$(CPU) -ifneq ($(srctree)/$(CPUDIR),$(wildcard $(srctree)/$(CPUDIR))) -CPUDIR=arch/$(ARCH)/cpu -endif +CPUDIR=arch/$(ARCH)/cpu$(if $(CPU),/$(CPU),) sinclude $(srctree)/arch/$(ARCH)/config.mk # include architecture dependend rules sinclude $(srctree)/$(CPUDIR)/config.mk # include CPU specific rules |