This patch fixes 2 issues with the original directory reorganization
patchset:
1. It fixes the symlinking of the 'proc' directory in include/asm when
building out-of-tree.
<side question>Anyone know what the deal is with the 'include2'
directory that's created when building out of tree? Or why its
needed?</side question>
2. It determines CPUDIR earlier in the build process. Previously some
architecture config.mk files would not properly set the LDSCRIPT
variable since CPUDIR was not available when the LDSCRIPT path was
determined.
This patch is only meant to fix building of ARM boards and to clearly
show what changes were needed. I'll fold #1 above into the "07/20 Move
architecture-specific includes to arch/$ARCH/include/asm" change and #2
into "01/20] Create CPUDIR variable" after waiting for other feedback on
the patchset.
Signed-off-by: Peter Tyser <pty...@xes-inc.com>
---
config.mk | 10 +++++-----
mkconfig | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/config.mk b/config.mk
index 5c8d7fb..b7eb117 100644
--- a/config.mk
+++ b/config.mk
@@ -110,18 +110,18 @@ RANLIB = $(CROSS_COMPILE)RANLIB
# Load generated board configuration
sinclude $(OBJTREE)/include/autoconf.mk
-ifdef ARCH
-sinclude $(TOPDIR)/arch/$(ARCH)/config.mk # include architecture
dependend rules
-endif
-ifdef CPU
+# 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 is 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
+
+sinclude $(TOPDIR)/arch/$(ARCH)/config.mk # include architecture
dependend rules
sinclude $(TOPDIR)/$(CPUDIR)/config.mk # include CPU specific rules
-endif
+
ifdef SOC
sinclude $(TOPDIR)/$(CPUDIR)/$(SOC)/config.mk # include SoC specific rules
endif
diff --git a/mkconfig b/mkconfig
index d2d995d..d3109e4 100755
--- a/mkconfig
+++ b/mkconfig
@@ -43,7 +43,7 @@ if [ "$SRCTREE" != "$OBJTREE" ] ; then
cd ${OBJTREE}/include2
rm -f asm
ln -s ${SRCTREE}/arch/$2/include/asm asm
- LNPREFIX="../../include2/asm/"
+ LNPREFIX=${SRCTREE}/arch/$2/include/asm/
cd ../include
rm -f asm
ln -s ${SRCTREE}/arch/$2/include/asm asm
--
1.6.2.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
