summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-04-20 08:42:36 +0000
committerTom Rini <trini@ti.com>2013-05-01 11:17:21 -0400
commitfada9e2048446878c95fb331bbc21e1e40eddc72 (patch)
tree97992f69235cc3b54bf8c52cfaf6f8eeaf423d7b
parentce5346a80599a714962d3fc4bf90ddf0d2e62299 (diff)
downloadtalos-obmc-uboot-fada9e2048446878c95fb331bbc21e1e40eddc72.tar.gz
talos-obmc-uboot-fada9e2048446878c95fb331bbc21e1e40eddc72.zip
Trigger generic board error only when building
At present the generic board error can occur when configuring U-Boot, or during distclean, but this is incorrect. The existing autoconf.mk may come from an earlier U-Boot configuration which is about to be overwritten. Make the error conditional so that it will only be triggered when we are actually building U-Boot. This avoids a problem where the system is being reconfigured to remove CONFIG_SYS_GENERIC_BOARD on an architecture that does not support it. Currently this will print an error and require the manual removal of include/autoconf.mk. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--Makefile10
-rw-r--r--config.mk4
2 files changed, 12 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f8ecfd7130..dbc4b709b6 100644
--- a/Makefile
+++ b/Makefile
@@ -183,6 +183,16 @@ endif
# load other configuration
include $(TOPDIR)/config.mk
+# Targets which don't build the source code
+NON_BUILD_TARGETS = backup clean clobber distclean mkproper tidy unconfig
+
+# Only do the generic board check when actually building, not configuring
+ifeq ($(filter $(NON_BUILD_TARGETS),$(MAKECMDGOALS)),)
+ifeq ($(findstring _config,$(MAKECMDGOALS)),)
+$(CHECK_GENERIC_BOARD)
+endif
+endif
+
# If board code explicitly specified LDSCRIPT or CONFIG_SYS_LDSCRIPT, use
# that (or fail if absent). Otherwise, search for a linker script in a
# standard location.
diff --git a/config.mk b/config.mk
index 89a89f2081..b427a4eed0 100644
--- a/config.mk
+++ b/config.mk
@@ -233,8 +233,8 @@ endif
# Does this architecture support generic board init?
ifeq ($(__HAVE_ARCH_GENERIC_BOARD),)
ifneq ($(CONFIG_SYS_GENERIC_BOARD),)
-$(error Your architecture does not support generic board. Please undefined \
-CONFIG_SYS_GENERIC_BOARD in your board config file)
+CHECK_GENERIC_BOARD = $(error Your architecture does not support generic board. \
+Please undefined CONFIG_SYS_GENERIC_BOARD in your board config file)
endif
endif
OpenPOWER on IntegriCloud