From a57a973d364a323ef93d29ea139650c03e4e30b4 Mon Sep 17 00:00:00 2001
From: Arif Ali <mail@arif-ali.co.uk>
Date: Fri, 12 Aug 2011 11:21:00 +0100
Subject: [PATCH] reverted: merged from dan1j3l, 1.6.5 DE

will add to lk, rather than build-htcleo later
---
 build-stuff/readme.txt    | 4 ++--
 compile-all               | 3 ++-
 lk/app/aboot/aboot.c      | 2 ++
 lk/target/htcleo/rules.mk | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/build-stuff/readme.txt b/build-stuff/readme.txt
index 516882f..516ad97 100644
--- a/build-stuff/readme.txt
+++ b/build-stuff/readme.txt
@@ -7,8 +7,8 @@ using 2009q3 of Codesourcery Toolchain
 misc 1M
 recovery 5M
 boot 8M
-system 400M
-cache 44M
+system 90M
+cache 5M
 userdata remaining
 
 Thanks and credits
diff --git a/compile-all b/compile-all
index 9d7de3c..bf6395e 100755
--- a/compile-all
+++ b/compile-all
@@ -3,7 +3,8 @@
 export ARM=$PWD/../../../toolchain/arm-2009q3/bin
 export PATH=$ARM:$PATH
 export VERSION=1.4.0.1
-export SIZES="`echo {80..150..10} {160..400..20}`"
+#export SIZES="`echo {80..150..10} {160..460..20} 250 350 450`"
+export SIZES="`echo {80..450..10}`"
 export CACHE="5 44"
 export OUTPUT=$PWD/../cLK-out
 export O_ALL=$OUTPUT/allInOne
diff --git a/lk/app/aboot/aboot.c b/lk/app/aboot/aboot.c
index abd464e..22f9cbc 100644
--- a/lk/app/aboot/aboot.c
+++ b/lk/app/aboot/aboot.c
@@ -653,6 +653,8 @@ void aboot_init(const struct app_descriptor *app)
 	/* Check if we should do something other than booting up */
 	if (keys_get_state(KEY_HOME) != 0)
 		boot_into_recovery = 1;
+	if (keys_get_state(KEY_SOFT1) != 0)
+		try_flash_recovery = 1;
 	if (keys_get_state(KEY_BACK) != 0)
 		goto fastboot;
 	if (keys_get_state(KEY_CLEAR) != 0)
diff --git a/lk/target/htcleo/rules.mk b/lk/target/htcleo/rules.mk
index 330c5a9..5002b69 100644
--- a/lk/target/htcleo/rules.mk
+++ b/lk/target/htcleo/rules.mk
@@ -5,8 +5,8 @@ INCLUDES += -I$(LOCAL_DIR)/include -I$(LK_TOP_DIR)/platform/msm_shared
 PLATFORM := qsd8k
 
 #define system partition size (in MB), if not defined my custom (from magldr) layout is used. see init.c
-DEFINES += SYSTEM_PARTITION_SIZE=250
-#DEFINES += SYSTEM_PARTITION_SIZE=400
+DEFINES += SYSTEM_PARTITION_SIZE=90
+#DEFINES += SYSTEM_PARTITION_SIZE=90
 DEFINES += CACHE_PARTITION_SIZE=5
 
 #cedesmith note: MEMBASE requires edit in platform/qsd8k/rules.mk