From fef55b99457e0d7030ebfcd834f110f6acb093d6 Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 14 Mar 2008 11:32:48 +0000
Subject: [PATCH] =?UTF-8?q?MachineSettings=E6=9B=B4=E6=96=B0=E3=80=82=20?=
 =?UTF-8?q?=E3=80=80=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=8D=E3=83=B3?=
 =?UTF-8?q?=E3=83=88=E3=82=92armadillo=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82?=
 =?UTF-8?q?=20=E3=80=80=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9=E3=82=B3?=
 =?UTF-8?q?=E3=83=B3=E3=83=88=E3=83=AD=E3=83=BC=E3=83=AB=E6=83=85=E5=A0=B1?=
 =?UTF-8?q?=E3=82=92=E6=AD=A3=E3=81=97=E3=81=84=E5=80=A4=E3=81=AB=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@886 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../MachineSettings/ARM9/Makefile               |  4 +++-
 .../MachineSettings/ARM9/main.rsf               | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile
index 0d7139f9..970b8f58 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile
+++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile
@@ -53,7 +53,9 @@ MAKETAD_FLAGS			+= -s
 
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
-MAKEROM			 = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
+MAKEROM_ARM7_BASE		=	$(TWL_COMPONENTSDIR)/armadillo/$(TWL_BUILDTYPE_ARM7)/armadillo
+MAKEROM_ARM7			=	$(MAKEROM_ARM7_BASE).$(TWL_ELF_EXT)
+MAKEROM					=	$(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
 
 LDIRT_CLEAN				=	$(TARGET_TAD)
 INSTALL_TARGETS			=	$(TARGET_TAD)
diff --git a/build/systemMenu_RED/MachineSettings/ARM9/main.rsf b/build/systemMenu_RED/MachineSettings/ARM9/main.rsf
index 0ac0499d..63d17d33 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/main.rsf
+++ b/build/systemMenu_RED/MachineSettings/ARM9/main.rsf
@@ -119,7 +119,22 @@ Property
 	#
 	# CardRegion: card region [Japan/America/Europe/Australia/China/Korea]
 	#
-	CardRegion	Japan
+	CardRegion		Japan
+
+	#
+	# CommonClientKey: launcher deliver common client Key [TRUE/FALSE]
+	#
+	CommonClientKey	TRUE
+
+	#
+	# HwAESSlotB: launcher deliver HW AES slot B setting [TRUE/FALSE]
+	#
+	HwAESSlotB		TRUE
+
+	#
+	# SDCardAccess: sd card access control [TRUE/FALSE]
+	#
+	SDCardAccess	TRUE
 
 	#
 	# Codec mode: