diff options
| author | Marian Balakowicz <m8@semihalf.com> | 2008-02-29 13:56:44 +0100 |
|---|---|---|
| committer | Marian Balakowicz <m8@semihalf.com> | 2008-02-29 13:56:44 +0100 |
| commit | e18489e8c27e843e337258fb00f2652ff0f43b92 (patch) | |
| tree | 2a3b2afa224e61cb7f1206a1641007e526d25160 /config.mk | |
| parent | 75fa002c47171b73fb4c1f2c2fe4d6391c136276 (diff) | |
| parent | b29661fc1151077776454288051bc9a488351ce8 (diff) | |
| download | u-boot-imx-e18489e8c27e843e337258fb00f2652ff0f43b92.zip u-boot-imx-e18489e8c27e843e337258fb00f2652ff0f43b92.tar.gz u-boot-imx-e18489e8c27e843e337258fb00f2652ff0f43b92.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot into new-image
Diffstat (limited to 'config.mk')
| -rw-r--r-- | config.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -69,6 +69,9 @@ PLATFORM_CPPFLAGS+= -D__ARM__ endif endif +# Load generated board configuration +sinclude $(OBJTREE)/include/autoconf.mk + ifdef ARCH sinclude $(TOPDIR)/$(ARCH)_config.mk # include architecture dependend rules endif @@ -87,9 +90,6 @@ ifdef BOARD sinclude $(TOPDIR)/board/$(BOARDDIR)/config.mk # include board specific rules endif -# Load generated board configuration -sinclude $(OBJTREE)/include/autoconf.mk - ######################################################################### CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ |