From 01c99b53048b4d436eb55e9bf22414610f17d057 Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Thu, 16 Jun 2011 22:11:27 +0200
Subject: Move the tip22 image to 0x89702000 on IP22

as described in #452798.

Thanks to Edwin Kwan for analyzing this.
---
 Makefile       | 10 +++++++++-
 tip22/Makefile |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 4bfb897..b818247 100644
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,14 @@ ifeq ($(SUBARCH),IP22)
 KERNELADDR=0x88002000
 MAXLOADSIZE=0x1700000
 LOADADDR=0x88802000
+TIP_LOADADDR=0x89702000
 OUTPUTFORMAT=ecoff-bigmips
 endif
 ifeq ($(SUBARCH),IP32)
 KERNELADDR=0x80004000
 MAXLOADSIZE=0x1400000
 LOADADDR=0x81404000
+TIP_LOADADDR=$(LOADADDR)
 OUTPUTFORMAT=elf32-tradbigmips
 endif
 
@@ -63,7 +65,13 @@ $(call dep-tgt,clean)
 endef
 
 define submake
-@$(MAKE) -C $(1) SUBARCH=$(SUBARCH) LOADADDR=$(LOADADDR) MAXLOADSIZE=$(MAXLOADSIZE) KERNELADDR=$(KERNELADDR) OUTPUTFORMAT=$(OUTPUTFORMAT) $(2)
+@$(MAKE) -C $(1) SUBARCH=$(SUBARCH)           \
+                 LOADADDR=$(LOADADDR)         \
+                 TIP_LOADADDR=$(TIP_LOADADDR) \
+                 MAXLOADSIZE=$(MAXLOADSIZE)   \
+                 KERNELADDR=$(KERNELADDR)     \
+                 OUTPUTFORMAT=$(OUTPUTFORMAT) \
+                 $(2)
 endef
 
 
diff --git a/tip22/Makefile b/tip22/Makefile
index 548371b..1df2fb2 100644
--- a/tip22/Makefile
+++ b/tip22/Makefile
@@ -43,7 +43,7 @@ $(PRINT_LOADADDR):
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 %.script.$(SUBARCH): %.script.in
-	LOADADDR=$(LOADADDR);					\
+	LOADADDR=$(TIP_LOADADDR);				\
 	OUTPUTFORMAT=$(OUTPUTFORMAT);				\
 	sed -e "s/@@LOADADDR@@/$$LOADADDR/"			\
 	-e "s/@@OUTPUTFORMAT@@/$$OUTPUTFORMAT/" <$< >$@
-- 
cgit v1.2.3