From ea282194292fa23b18b2526c7fda422e84dc8eac Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@4ee2a332-4b2b-5046-8439-1ba90f034370>
Date: Tue, 29 May 2007 07:15:36 +0000
Subject: [PATCH] add LDEPENDS_LCF and LDEPENDS_RES for reference of twl
 commondefs. add defines of autoload WRAM_ABC and EXT_WRAM. rename allDma-1 to
 dmaMix-1.

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@94 4ee2a332-4b2b-5046-8439-1ba90f034370
---
 build/buildtools/commondefs                           |  3 +++
 build/buildtools/modulerules.cctype.CW                |  4 ++--
 build/tests/mi/Makefile                               |  2 +-
 build/tests/mi/{allDma-1 => dmaMix-1}/ARM7/Makefile   |  2 +-
 build/tests/mi/{allDma-1 => dmaMix-1}/ARM7/src/main.c |  0
 build/tests/mi/{allDma-1 => dmaMix-1}/ARM9/Makefile   |  2 +-
 build/tests/mi/{allDma-1 => dmaMix-1}/ARM9/src/main.c |  0
 build/tests/mi/{allDma-1 => dmaMix-1}/Makefile        |  0
 include/twl/specfiles/ARM7-BB.lsf                     | 10 ++++++++++
 9 files changed, 18 insertions(+), 5 deletions(-)
 rename build/tests/mi/{allDma-1 => dmaMix-1}/ARM7/Makefile (94%)
 rename build/tests/mi/{allDma-1 => dmaMix-1}/ARM7/src/main.c (100%)
 rename build/tests/mi/{allDma-1 => dmaMix-1}/ARM9/Makefile (93%)
 rename build/tests/mi/{allDma-1 => dmaMix-1}/ARM9/src/main.c (100%)
 rename build/tests/mi/{allDma-1 => dmaMix-1}/Makefile (100%)

diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs
index 6f9d94e..b01d374 100644
--- a/build/buildtools/commondefs
+++ b/build/buildtools/commondefs
@@ -145,6 +145,9 @@ NITRO_BUILDARCH		?= $(TWL_BUILDARCH)
 LCFILE_TEMPLATE		?= $(DEFAULT_TWL_LCFILE_TEMPLATE)
 LCFILE_SPEC		?= $(DEFAULT_TWL_LCFILE_SPEC)
 
+LDEPENDS_LCF	+= $(TWL_BUILDTOOLSDIR)/commondefs
+LDEPENDS_RES	+= $(TWL_BUILDTOOLSDIR)/commondefs
+
 
 ### SDK Library settings
 
diff --git a/build/buildtools/modulerules.cctype.CW b/build/buildtools/modulerules.cctype.CW
index aa1a486..dec9c2f 100644
--- a/build/buildtools/modulerules.cctype.CW
+++ b/build/buildtools/modulerules.cctype.CW
@@ -387,10 +387,10 @@ MAKELCF_FORMAT	= -V$(CW_MAJOR_VER)
 
 MAKELCF_OPTS	= $(MAKELCF_FLAGS) $(MAKELCF_DEFS) $(MAKELCF_FORMAT)
 
-$(LCFILE_AUTOGEN): $(LCFILE_SPEC) $(LCFILE_TEMPLATE) $(MAKEFILE) $(NITRO_BUILDTOOLSDIR)/commondefs
+$(LCFILE_AUTOGEN): $(LCFILE_SPEC) $(LCFILE_TEMPLATE) $(MAKEFILE) $(NITRO_BUILDTOOLSDIR)/commondefs $(LDEPENDS_LCF)
 	$(MAKELCF) $(MAKELCF_OPTS)  $< $(LCFILE_TEMPLATE) $@
 
-$(LDRES_AUTOGEN):  $(LCFILE_SPEC) $(LDRES_TEMPLATE)  $(MAKEFILE) $(NITRO_BUILDTOOLSDIR)/commondefs
+$(LDRES_AUTOGEN):  $(LCFILE_SPEC) $(LDRES_TEMPLATE)  $(MAKEFILE) $(NITRO_BUILDTOOLSDIR)/commondefs $(LDEPENDS_RES)
 	@$(MAKELCF) $(MAKELCF_OPTS)  $< $(LDRES_TEMPLATE)  $@
 
 endif
diff --git a/build/tests/mi/Makefile b/build/tests/mi/Makefile
index 6a50d39..acfc55d 100644
--- a/build/tests/mi/Makefile
+++ b/build/tests/mi/Makefile
@@ -25,7 +25,7 @@ SUBDIRS =	\
 ifneq	($(TWL_PLATFORM),DSTEG)
 SUBDIRS +=	\
 			exDma-1 \
-			allDma-1 \
+			dmaMix-1 \
 
 endif
 
diff --git a/build/tests/mi/allDma-1/ARM7/Makefile b/build/tests/mi/dmaMix-1/ARM7/Makefile
similarity index 94%
rename from build/tests/mi/allDma-1/ARM7/Makefile
rename to build/tests/mi/dmaMix-1/ARM7/Makefile
index 89b2faf..6a7d54e 100644
--- a/build/tests/mi/allDma-1/ARM7/Makefile
+++ b/build/tests/mi/dmaMix-1/ARM7/Makefile
@@ -23,7 +23,7 @@ SUBDIRS		=
 #TWL_CODEGEN   =       THUMB
 TWL_PROC      =       ARM7
 
-TARGET_BIN	=	allDma7_1.axf
+TARGET_BIN	=	dmaMix7_1.axf
 
 SRCS		=	main.c
 
diff --git a/build/tests/mi/allDma-1/ARM7/src/main.c b/build/tests/mi/dmaMix-1/ARM7/src/main.c
similarity index 100%
rename from build/tests/mi/allDma-1/ARM7/src/main.c
rename to build/tests/mi/dmaMix-1/ARM7/src/main.c
diff --git a/build/tests/mi/allDma-1/ARM9/Makefile b/build/tests/mi/dmaMix-1/ARM9/Makefile
similarity index 93%
rename from build/tests/mi/allDma-1/ARM9/Makefile
rename to build/tests/mi/dmaMix-1/ARM9/Makefile
index 747c2c6..5752707 100644
--- a/build/tests/mi/allDma-1/ARM9/Makefile
+++ b/build/tests/mi/dmaMix-1/ARM9/Makefile
@@ -21,7 +21,7 @@ SUBDIRS		=
 
 #----------------------------------------------------------------------------
 
-TARGET_BIN	=	allDma9_1.axf
+TARGET_BIN	=	dmaMix9_1.axf
 
 SRCS		=	main.c
 
diff --git a/build/tests/mi/allDma-1/ARM9/src/main.c b/build/tests/mi/dmaMix-1/ARM9/src/main.c
similarity index 100%
rename from build/tests/mi/allDma-1/ARM9/src/main.c
rename to build/tests/mi/dmaMix-1/ARM9/src/main.c
diff --git a/build/tests/mi/allDma-1/Makefile b/build/tests/mi/dmaMix-1/Makefile
similarity index 100%
rename from build/tests/mi/allDma-1/Makefile
rename to build/tests/mi/dmaMix-1/Makefile
diff --git a/include/twl/specfiles/ARM7-BB.lsf b/include/twl/specfiles/ARM7-BB.lsf
index 61c738e..986b08f 100644
--- a/include/twl/specfiles/ARM7-BB.lsf
+++ b/include/twl/specfiles/ARM7-BB.lsf
@@ -38,3 +38,13 @@ Autoload WRAM
 	Library		$(LLIBS) $(GLIBS) $(CW_LIBS)
 	Object		* (.wram)
 }
+
+Autoload WRAM_ABC
+{
+	Address		0x03810000
+}
+
+Autoload EXT_WRAM
+{
+	Address		0x06000000
+}