Update HNVRAM code.
- Clean up unused variables.
- Add "PLATFORM_NAME" support.
Change-Id: I9e46e5d72e3cd0ee6d5bc64e24135e8473c411f1
diff --git a/libupgrade/hmx_upgrade_nvram.c b/libupgrade/hmx_upgrade_nvram.c
index ff9cb5e..499158b 100644
--- a/libupgrade/hmx_upgrade_nvram.c
+++ b/libupgrade/hmx_upgrade_nvram.c
@@ -180,14 +180,10 @@
{NVRAM_FIELD_LOADER_VERSION , "LOADER_VERSION" , HMX_NVRAM_PARTITION_RW, 0},
{NVRAM_FIELD_OSD_DISPLAY , "OSD_DISPLAY" , HMX_NVRAM_PARTITION_RW, 0},
{NVRAM_FIELD_ACTIVATED_KERNEL_NUM, "ACTIVATED_KERNEL_NUM" , HMX_NVRAM_PARTITION_RW, 0},
- {NVRAM_FIELD_ACTIVATED_ROOTFS_NUM , "ACTIVATED_ROOTFS_NUM" , HMX_NVRAM_PARTITION_RW, 0},
{NVRAM_FIELD_MTD_TYPE_FOR_KERNEL , "MTD_TYPE_FOR_KERNEL" , HMX_NVRAM_PARTITION_RW, 0},
- {NVRAM_FIELD_TYPE_OF_FILESYSTEM , "TYPE_OF_FILESYSTEM" , HMX_NVRAM_PARTITION_RW, 0},
- {NVRAM_FIELD_NAME_OF_BOARD , "NAME_OF_BOARD" , HMX_NVRAM_PARTITION_RW, 0},
- {NVRAM_FIELD_L_TYPE_OF_FILESYSTEM , "L_TYPE_OF_FILESYSTEM" , HMX_NVRAM_PARTITION_RW, 0},
- {NVRAM_FIELD_L_NAME_OF_BOARD , "L_NAME_OF_BOARD" , HMX_NVRAM_PARTITION_RW, 0},
{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_BIN8K , "BIN8K" , HMX_NVRAM_PARTITION_RW, 0x2000},
{NVRAM_FIELD_RAWFS , "RAWFS" , HMX_NVRAM_PARTITION_W_RAWFS, RAW_FS_SIZE},
diff --git a/libupgrade/hmx_upgrade_nvram.h b/libupgrade/hmx_upgrade_nvram.h
index 3fe0d75..631e512 100644
--- a/libupgrade/hmx_upgrade_nvram.h
+++ b/libupgrade/hmx_upgrade_nvram.h
@@ -234,13 +234,9 @@
NVRAM_FIELD_IRDETO_CPCB_ENCRYPTED, // for IRDETO CPCB (encrypted)
NVRAM_FIELD_ACTIVATED_KERNEL_NUM, // ACTIVATED_KERNEL_NUM
- NVRAM_FIELD_ACTIVATED_ROOTFS_NUM, // ACTIVATED_ROOTFS_NUM
NVRAM_FIELD_MTD_TYPE_FOR_KERNEL, // MTD_TYPE_FOR_KERNEL
- NVRAM_FIELD_TYPE_OF_FILESYSTEM, // TYPE_OF_FILESYSTEM
- NVRAM_FIELD_L_TYPE_OF_FILESYSTEM, // Length TYPE_OF_FILESYSTEM
- NVRAM_FIELD_NAME_OF_BOARD, // NAME_OF_BOARD
- NVRAM_FIELD_L_NAME_OF_BOARD, // Length NAME_OF_BOARD
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_RAWFS = 0x1000,
