[qsd8250]: Enable daisy chain flashing and fix nandwrite compiling is…

…sue. Update makefile to fix nandwrite compiling issues. Add ENABLE_NANDWRITE in list of defines for nandwrite makefiles. Reduce the size of cache partition to 5MB from 76MB. Disable keypad initialization for nandwrite. Add recovery partition for surf and ffa.
multirom-nexus6p · Dec 17, 2009 · aeb979e · aeb979e
1 parent 19012bc
commit aeb979e
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 8 deletions.
diff --git a/platform/qsd8k/platform.c b/platform/qsd8k/platform.c
@@ -55,7 +55,9 @@ void platform_early_init(void)
 void platform_init(void)
 {
         dprintf(INFO, "platform_init()\n");
+#if (!ENABLE_NANDWRITE)
         acpu_clock_init();
+#endif
 }
 
 void display_init(void)

diff --git a/project/qsd8250_ffa_nandwrite.mk b/project/qsd8250_ffa_nandwrite.mk
@@ -7,6 +7,7 @@ TARGET := qsd8250_ffa
 MODULES += app/nandwrite
 
 DEFINES += WITH_DEBUG_JTAG=1
+DEFINES += ENABLE_NANDWRITE=1
 #DEFINES += WITH_DEBUG_DCC=1
 #DEFINES += WITH_DEBUG_UART=1
 #DEFINES += WITH_DEBUG_FBCON=1

diff --git a/project/qsd8250_surf_nandwrite.mk b/project/qsd8250_surf_nandwrite.mk
@@ -7,6 +7,7 @@ TARGET := qsd8250_surf
 MODULES += app/nandwrite
 
 DEFINES += WITH_DEBUG_JTAG=1
+DEFINES += ENABLE_NANDWRITE=1
 #DEFINES += WITH_DEBUG_DCC=1
 #DEFINES += WITH_DEBUG_UART=1
 #DEFINES += WITH_DEBUG_FBCON=1

diff --git a/target/qsd8250_ffa/init.c b/target/qsd8250_ffa/init.c
@@ -61,12 +61,17 @@ static struct ptentry board_part_list[] = {
 	},
 	{
 		.start = 664,
-		.length = 608 /* 76MB */,
+		.length = 40  /* 5MB */,
 		.name = "cache",
 	},
 	{
-		.start = 1272,
-		.length = 304 /* 38MB */,
+		.start = 704,
+		.length = 40 /* 5MB */,
+		.name = "recovery",
+	},
+	{
+		.start = 744,
+		.length = 720 /* 90MB */,
 		.name = "userdata",
 	},
 };
@@ -85,8 +90,10 @@ void target_init(void)
 
 	dprintf(INFO, "target_init()\n");
 
+#if (!ENABLE_NANDWRITE)
 	keys_init();
 	keypad_init();
+#endif
 
 	ptable_init(&flash_ptable);
 	smem_ptable_init();

diff --git a/target/qsd8250_ffa/tools/makefile b/target/qsd8250_ffa/tools/makefile
@@ -9,6 +9,12 @@ endif
 SRC_DIR  := target/$(TARGET)/tools
 COMPILER := gcc
 
+ifeq ($(BUILD_NANDWRITE), 1)
+  APPSBOOTHDR_FILES :=
+else
+  APPSBOOTHDR_FILES := appsboot.mbn
+endif
+
 APPSBOOTHEADER: appsboot.mbn
 
 

diff --git a/target/qsd8250_surf/init.c b/target/qsd8250_surf/init.c
@@ -61,12 +61,17 @@ static struct ptentry board_part_list[] = {
 	},
 	{
 		.start = 664,
-		.length = 608 /* 76MB */,
+		.length = 40 /* 5MB */,
 		.name = "cache",
 	},
 	{
-		.start = 1272,
-		.length = 608 /* 76MB */,
+		.start = 704,
+		.length = 40 /* 5MB */,
+		.name = "recovery",
+	},
+	{
+		.start = 744,
+		.length = 720 /* 90MB */,
 		.name = "userdata",
 	},
 };
@@ -85,9 +90,10 @@ void target_init(void)
 
 	dprintf(INFO, "target_init()\n");
 
+#if (!ENABLE_NANDWRITE)
 	keys_init();
 	keypad_init();
-
+#endif
 	ptable_init(&flash_ptable);
 	smem_ptable_init();
 

diff --git a/target/qsd8250_surf/tools/makefile b/target/qsd8250_surf/tools/makefile
@@ -9,7 +9,13 @@ endif
 SRC_DIR  := target/$(TARGET)/tools
 COMPILER := gcc
 
-APPSBOOTHEADER: appsboot.mbn
+ifeq ($(BUILD_NANDWRITE), 1)
+  APPSBOOTHDR_FILES :=
+else
+  APPSBOOTHDR_FILES := appsboot.mbn
+endif
+
+APPSBOOTHEADER: $(APPSBOOTHDR_FILES)
 
 
 appsboot.mbn: appsboothd.mbn $(OUTBIN)