summaryrefslogtreecommitdiff
path: root/cgpt/cgpt_prioritize.c
diff options
context:
space:
mode:
authorAlbert Chaulk <achaulk@chromium.org>2013-04-02 14:31:17 -0700
committerChromeBot <chrome-bot@google.com>2013-07-03 14:22:20 -0700
commit7d401c5cd58ec422e239b28c334fc2e94778f565 (patch)
tree903aaf5102134605fac6a26ac54d74b3c65989ac /cgpt/cgpt_prioritize.c
parent952c2d32452fc582900cc542edd75c7da6b3f830 (diff)
downloadvboot-7d401c5cd58ec422e239b28c334fc2e94778f565.tar.gz
MTD modification commands: add & prioritize
Additionally renames the new functions in add to be CamelCase style BUG=chromium:221745 TEST=MTD version of run_cgpt_tests.sh passes BRANCH=none Original-Change-Id: Ic173f99d7ca4af025403ab11f37061c33c9d59ea Reviewed-on: https://gerrit.chromium.org/gerrit/47173 Tested-by: Albert Chaulk <achaulk@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Commit-Queue: Albert Chaulk <achaulk@chromium.org> (cherry picked from commit c3aad2fd06a21097cffd10ec5b168e728616b868) Change-Id: Ib3bb947ffcd5c0f40398a27a721e392b895c9da0 Reviewed-on: https://gerrit.chromium.org/gerrit/49795 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Commit-Queue: Albert Chaulk <achaulk@chromium.org> Tested-by: Albert Chaulk <achaulk@chromium.org>
Diffstat (limited to 'cgpt/cgpt_prioritize.c')
-rw-r--r--cgpt/cgpt_prioritize.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/cgpt/cgpt_prioritize.c b/cgpt/cgpt_prioritize.c
index 45023062..8fc1843e 100644
--- a/cgpt/cgpt_prioritize.c
+++ b/cgpt/cgpt_prioritize.c
@@ -109,10 +109,17 @@ int CgptPrioritize(CgptPrioritizeParams *params) {
if (CGPT_OK != DriveOpen(params->drive_name, &drive, O_RDWR))
return CGPT_FAILED;
- if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive.gpt))) {
- Error("GptSanityCheck() returned %d: %s\n",
- gpt_retval, GptError(gpt_retval));
- return CGPT_FAILED;
+ if (drive.is_mtd) {
+ if (drive.mtd.primary.crc32 != MtdHeaderCrc(&drive.mtd.primary)) {
+ Error("MTD header crc failure\n");
+ return CGPT_FAILED;
+ }
+ } else {
+ if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive.gpt))) {
+ Error("GptSanityCheck() returned %d: %s\n",
+ gpt_retval, GptError(gpt_retval));
+ return CGPT_FAILED;
+ }
}
max_part = GetNumberOfEntries(&drive);