diff options
| author | Chandan Uddaraju <chandanu@quicinc.com> | 2009-12-14 18:04:26 -0800 |
|---|---|---|
| committer | Chandan Uddaraju <chandanu@quicinc.com> | 2009-12-17 00:49:59 -0800 |
| commit | aeb979e0595bd622f33ba18441091589ad35f0b2 (patch) | |
| tree | 0a1146aaeb694977757913050ae46ffe300ec1ed | |
| parent | 19012bc0a8cca035c18c9937d6e6469d8cd2c665 (diff) | |
| download | lk-aeb979e0595bd622f33ba18441091589ad35f0b2.tar.gz | |
[qsd8250]: Enable daisy chain flashing and fix nandwrite compiling issue.
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.
| -rw-r--r-- | platform/qsd8k/platform.c | 2 | ||||
| -rw-r--r-- | project/qsd8250_ffa_nandwrite.mk | 1 | ||||
| -rw-r--r-- | project/qsd8250_surf_nandwrite.mk | 1 | ||||
| -rw-r--r-- | target/qsd8250_ffa/init.c | 13 | ||||
| -rw-r--r-- | target/qsd8250_ffa/tools/makefile | 6 | ||||
| -rw-r--r-- | target/qsd8250_surf/init.c | 14 | ||||
| -rw-r--r-- | target/qsd8250_surf/tools/makefile | 8 |
7 files changed, 37 insertions, 8 deletions
diff --git a/platform/qsd8k/platform.c b/platform/qsd8k/platform.c index 93fcb6f8..9fb28ef9 100644 --- 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 index ef1bf0ee..cf8b2dc5 100644 --- 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 index 6b362bb6..28671746 100644 --- 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 index d6b1319a..a86ddc76 100644 --- 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 index de55adfd..c85db18c 100644 --- 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 index 9769a4c7..cbfeeaf1 100644 --- 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 index de55adfd..9d3897d1 100644 --- 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) |