From 212737ce7e55115f66e64ee509db45a46f377355 Mon Sep 17 00:00:00 2001
From: yutaka <yutaka@4ee2a332-4b2b-5046-8439-1ba90f034370>
Date: Mon, 7 May 2007 02:31:06 +0000
Subject: [PATCH] merge ARM9 and ARM7 tests.

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@64 4ee2a332-4b2b-5046-8439-1ba90f034370
---
 build/tests/aes/Makefile                      |  2 +-
 .../aes/{_ARM7-aes-1 => aes-1/ARM7}/Makefile  |  0
 .../{_ARM7-aes-1 => aes-1/ARM7}/src/main.c    |  0
 build/tests/aes/aes-1/ARM9/Makefile           | 43 +++++++++++++++++++
 build/tests/aes/aes-1/{ => ARM9}/src/main.c   |  0
 build/tests/aes/aes-1/Makefile                | 21 +++------
 6 files changed, 49 insertions(+), 17 deletions(-)
 rename build/tests/aes/{_ARM7-aes-1 => aes-1/ARM7}/Makefile (100%)
 rename build/tests/aes/{_ARM7-aes-1 => aes-1/ARM7}/src/main.c (100%)
 create mode 100644 build/tests/aes/aes-1/ARM9/Makefile
 rename build/tests/aes/aes-1/{ => ARM9}/src/main.c (100%)

diff --git a/build/tests/aes/Makefile b/build/tests/aes/Makefile
index 417bbda..cfe7655 100644
--- a/build/tests/aes/Makefile
+++ b/build/tests/aes/Makefile
@@ -20,7 +20,7 @@ include	$(TWLSDK_ROOT)/build/buildtools/commondefs
 
 #----------------------------------------------------------------------------
 
-SUBDIRS =	aes-1 _ARM7-aes-1
+SUBDIRS =	aes-1
 
 
 #----------------------------------------------------------------------------
diff --git a/build/tests/aes/_ARM7-aes-1/Makefile b/build/tests/aes/aes-1/ARM7/Makefile
similarity index 100%
rename from build/tests/aes/_ARM7-aes-1/Makefile
rename to build/tests/aes/aes-1/ARM7/Makefile
diff --git a/build/tests/aes/_ARM7-aes-1/src/main.c b/build/tests/aes/aes-1/ARM7/src/main.c
similarity index 100%
rename from build/tests/aes/_ARM7-aes-1/src/main.c
rename to build/tests/aes/aes-1/ARM7/src/main.c
diff --git a/build/tests/aes/aes-1/ARM9/Makefile b/build/tests/aes/aes-1/ARM9/Makefile
new file mode 100644
index 0000000..a01a83f
--- /dev/null
+++ b/build/tests/aes/aes-1/ARM9/Makefile
@@ -0,0 +1,43 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlSDK - OS - demos - _ARM7-aes-1
+# File:     Makefile
+#
+# Copyright 2007 Nintendo.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Log: $
+# $NoKeywords: $
+#----------------------------------------------------------------------------
+
+SUBDIRS		=
+
+
+#----------------------------------------------------------------------------
+
+#TWL_CODEGEN   =       THUMB
+
+TARGET_BIN	=	main.axf
+
+SRCS		=	main.c
+
+#SRCDIR		=	# using default
+#LCFILE		=	# using default
+
+include	$(TWLSDK_ROOT)/build/buildtools/commondefs
+
+
+#----------------------------------------------------------------------------
+
+do-build:		$(TARGETS)
+
+
+include	$(TWLSDK_ROOT)/build/buildtools/modulerules
+
+
+#===== End of Makefile =====
diff --git a/build/tests/aes/aes-1/src/main.c b/build/tests/aes/aes-1/ARM9/src/main.c
similarity index 100%
rename from build/tests/aes/aes-1/src/main.c
rename to build/tests/aes/aes-1/ARM9/src/main.c
diff --git a/build/tests/aes/aes-1/Makefile b/build/tests/aes/aes-1/Makefile
index a01a83f..078ec37 100644
--- a/build/tests/aes/aes-1/Makefile
+++ b/build/tests/aes/aes-1/Makefile
@@ -1,6 +1,6 @@
 #! make -f
 #----------------------------------------------------------------------------
-# Project:  TwlSDK - OS - demos - _ARM7-aes-1
+# Project:  TwlSDK - build
 # File:     Makefile
 #
 # Copyright 2007 Nintendo.  All rights reserved.
@@ -15,27 +15,16 @@
 # $NoKeywords: $
 #----------------------------------------------------------------------------
 
-SUBDIRS		=
-
-
-#----------------------------------------------------------------------------
-
-#TWL_CODEGEN   =       THUMB
-
-TARGET_BIN	=	main.axf
-
-SRCS		=	main.c
-
-#SRCDIR		=	# using default
-#LCFILE		=	# using default
-
 include	$(TWLSDK_ROOT)/build/buildtools/commondefs
 
 
 #----------------------------------------------------------------------------
 
-do-build:		$(TARGETS)
+SUBDIRS =	\
+            ARM7 \
+            ARM9 \
 
+#----------------------------------------------------------------------------
 
 include	$(TWLSDK_ROOT)/build/buildtools/modulerules