summaryrefslogtreecommitdiff
path: root/include/chromeos
diff options
context:
space:
mode:
authorChe-Liang Chiou <clchiou@chromium.org>2011-07-15 16:25:11 +0800
committerSimon Glass <sjg@chromium.org>2011-08-29 10:58:58 -0700
commit403f58897e2fa0225868d702d102fd26c199188c (patch)
tree92eb61ec7e7e078c4d3044d540533d9445411bde /include/chromeos
parent875cd5bf3769fe129deb3c9170dce875ce53cd75 (diff)
CHROMIUM: twostop: update twostop logic
vboot_reference has just added support of twostop boot, and so u-boot does not have to make tricks to vboot_reference. BUG=chromium-os:17424 TEST=boot in developer mode on Seaboard Change-Id: I79aa3d546a142de8fed07b975a7f37e07585c629 Reviewed-on: http://gerrit.chromium.org/gerrit/4164 Tested-by: Che-Liang Chiou <clchiou@chromium.org> Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
Diffstat (limited to 'include/chromeos')
-rw-r--r--include/chromeos/crossystem_data.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/include/chromeos/crossystem_data.h b/include/chromeos/crossystem_data.h
index 08805fc953..4d71453556 100644
--- a/include/chromeos/crossystem_data.h
+++ b/include/chromeos/crossystem_data.h
@@ -28,7 +28,7 @@
/* the data blob format */
typedef struct {
uint32_t total_size;
- char signature[10];
+ uint8_t signature[10];
uint16_t version;
uint64_t nvcxt_lba;
uint16_t vbnv[2];
@@ -36,20 +36,22 @@ typedef struct {
uint8_t write_protect_sw;
uint8_t recovery_sw;
uint8_t developer_sw;
- int gpio_port_write_protect_sw;
- int gpio_port_recovery_sw;
- int gpio_port_developer_sw;
+ uint32_t gpio_port_write_protect_sw;
+ uint32_t gpio_port_recovery_sw;
+ uint32_t gpio_port_developer_sw;
uint8_t polarity_write_protect_sw;
uint8_t polarity_recovery_sw;
uint8_t polarity_developer_sw;
uint8_t binf[5];
uint32_t chsw;
- char hwid[ID_LEN];
- char fwid[ID_LEN];
- char frid[ID_LEN];
+ uint8_t hwid[ID_LEN];
+ uint8_t fwid[ID_LEN];
+ uint8_t frid[ID_LEN];
uint32_t fmap_base;
uint8_t vbshared_data[VB_SHARED_DATA_REC_SIZE];
-} crossystem_data_t;
+} __attribute__((packed)) crossystem_data_t;
+
+int crossystem_data_check_integrity(crossystem_data_t *cdata);
/**
* This initializes the data blob that we will pass to kernel, and later be