commit 258bb4211af81258560c829c771a90b554fcd7de
author Denton Gentry <dgentry@google.com> Mon Jul 30 20:32:30 2012 -0700
committer Denton Gentry <dgentry@google.com> Mon Jul 30 21:31:01 2012 -0700
tree 9aa1d593f5a843b0e90b0d56b3543debdc439adf
parent c48968ea4d4d85881e7eba50df6aa79e1bebbcd9

Add PAIRED_DISK support.

Change-Id: I0b01259cb60568b6e45152d4bbf40bd5f78e6371

libupgrade/hmx_upgrade_nvram.c

diff --git a/libupgrade/hmx_upgrade_nvram.c b/libupgrade/hmx_upgrade_nvram.c
index 91cf33f..ff627c0 100644
--- a/libupgrade/hmx_upgrade_nvram.c
+++ b/libupgrade/hmx_upgrade_nvram.c
@@ -191,6 +191,7 @@
 	{NVRAM_FIELD_ACTIVATED_KERNEL_NAME		, "ACTIVATED_KERNEL_NAME"	, HMX_NVRAM_PARTITION_RW, 0},

 	{NVRAM_FIELD_EXTRA_KERNEL_OPT			, "EXTRA_KERNEL_OPT"		, HMX_NVRAM_PARTITION_RW, 0},

 	{NVRAM_FIELD_PLATFORM_NAME			, "PLATFORM_NAME"		, HMX_NVRAM_PARTITION_RW, 0},

+	{NVRAM_FIELD_PAIRED_DISK			, "PAIRED_DISK"		, HMX_NVRAM_PARTITION_RW, 0},

 

 	{NVRAM_FIELD_BIN8K				 , "BIN8K"				   , HMX_NVRAM_PARTITION_RW, 0x2000},

 	{NVRAM_FIELD_RAWFS				 , "RAWFS" 			       , HMX_NVRAM_PARTITION_W_RAWFS, RAW_FS_SIZE},

libupgrade/hmx_upgrade_nvram.h

diff --git a/libupgrade/hmx_upgrade_nvram.h b/libupgrade/hmx_upgrade_nvram.h
index b0f8588..3c331f9 100644
--- a/libupgrade/hmx_upgrade_nvram.h
+++ b/libupgrade/hmx_upgrade_nvram.h
@@ -245,8 +245,9 @@
 	NVRAM_FIELD_ACTIVATED_KERNEL_NUM, 			// ACTIVATED_KERNEL_NUM

 	NVRAM_FIELD_MTD_TYPE_FOR_KERNEL, 			// MTD_TYPE_FOR_KERNEL

 	NVRAM_FIELD_ACTIVATED_KERNEL_NAME,			// "kernel0", lookup mtd partition

-	NVRAM_FIELD_PLATFORM_NAME,			        // Platform name, e.g. "gfhd100"

-	NVRAM_FIELD_EXTRA_KERNEL_OPT,		        	// string to append to cmdline

+	NVRAM_FIELD_PLATFORM_NAME,				// Platform name, e.g. "gfhd100"

+	NVRAM_FIELD_EXTRA_KERNEL_OPT,				// string to append to cmdline

+	NVRAM_FIELD_PAIRED_DISK,				// serial number of the disk

 

 	NVRAM_FIELD_RAWFS = 0x1000,

 	NVRAM_FIELD_DUMMY = 0xFFFF