summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.mk15
-rw-r--r--scripts/Makefile.build11
-rw-r--r--spl/Makefile8
3 files changed, 19 insertions, 15 deletions
diff --git a/config.mk b/config.mk
index 1336ef871c0..5b886aa7006 100644
--- a/config.mk
+++ b/config.mk
@@ -13,21 +13,6 @@ PLATFORM_LDFLAGS =
#########################################################################
-# Load generated board configuration
-ifeq ($(CONFIG_TPL_BUILD),y)
-# Include TPL autoconf
-sinclude include/tpl-autoconf.mk
-else
-ifeq ($(CONFIG_SPL_BUILD),y)
-# Include SPL autoconf
-sinclude include/spl-autoconf.mk
-else
-# Include normal autoconf
-sinclude include/autoconf.mk
-endif
-endif
-sinclude $(OBJTREE)/include/config.mk
-
# Some architecture config.mk files need to know what CPUDIR is set to,
# so calculate CPUDIR before including ARCH/SOC/CPU config.mk files.
# Check if arch/$ARCH/cpu/$CPU exists, otherwise assume arch/$ARCH/cpu contains
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 2a87984a317..59361f4d7ab 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -42,6 +42,17 @@ subdir-ccflags-y :=
# Read auto.conf if it exists, otherwise ignore
-include include/config/auto.conf
+# Added for U-Boot: Load U-Boot configuration
+ifeq ($(CONFIG_TPL_BUILD),y)
+ -include include/tpl-autoconf.mk
+else
+ ifeq ($(CONFIG_SPL_BUILD),y)
+ -include include/spl-autoconf.mk
+ else
+ -include include/autoconf.mk
+ endif
+endif
+
include scripts/Kbuild.include
# Added for U-Boot
diff --git a/spl/Makefile b/spl/Makefile
index 6b985d1e4ac..13612d3f8a8 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -40,6 +40,14 @@ else
SPL_BIN := u-boot-spl
endif
+include include/config.mk
+
+ifeq ($(CONFIG_TPL_BUILD),y)
+ -include include/tpl-autoconf.mk
+else
+ -include include/spl-autoconf.mk
+endif
+
include $(TOPDIR)/config.mk
HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(SRCTREE)/board/$(VENDOR)/common/Makefile),y,n)