1 files changed, 3 insertions, 113 deletions

diff --git a/src/vendorcode/google/chromeos/vbnv_cmos.c b/src/vendorcode/google/chromeos/vbnv_cmos.c
index 27f7f0a211..ddcb765fc7 100644
--- a/src/vendorcode/google/chromeos/vbnv_cmos.c
+++ b/src/vendorcode/google/chromeos/vbnv_cmos.c
@@ -14,132 +14,22 @@
  */
 
 #include <types.h>
-#include <string.h>
-#include <cbmem.h>
-#include <console/console.h>
 #include <pc80/mc146818rtc.h>
-#include <arch/early_variables.h>
-#include "chromeos.h"
-#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)
-#include "vboot_handoff.h"
-#endif
+#include "vbnv.h"
 #include "vbnv_layout.h"
 
-static int vbnv_initialized CAR_GLOBAL;
-static uint8_t vbnv[CONFIG_VBNV_SIZE] CAR_GLOBAL;
-
-/* Wrappers for accessing the variables marked as CAR_GLOBAL. */
-static inline int is_vbnv_initialized(void)
-{
-	return car_get_var(vbnv_initialized);
-}
-
-static inline uint8_t *vbnv_data_addr(int index)
-{
-	uint8_t *vbnv_arr = car_get_var_ptr(vbnv);
-
-	return &vbnv_arr[index];
-}
-
-static inline uint8_t vbnv_data(int index)
-{
-	return *vbnv_data_addr(index);
-}
-
-/* Return CRC-8 of the data, using x^8 + x^2 + x + 1 polynomial.  A
- * table-based algorithm would be faster, but for only 15 bytes isn't
- * worth the code size.
- */
-
-static uint8_t crc8(const uint8_t * data, int len)
-{
-	unsigned crc = 0;
-	int i, j;
-
-	for (j = len; j; j--, data++) {
-		crc ^= (*data << 8);
-		for (i = 8; i; i--) {
-			if (crc & 0x8000)
-				crc ^= (0x1070 << 3);
-			crc <<= 1;
-		}
-	}
-
-	return (uint8_t) (crc >> 8);
-}
-
-void read_vbnv(uint8_t *vbnv_copy)
+void read_vbnv_cmos(uint8_t *vbnv_copy)
 {
 	int i;
 
 	for (i = 0; i < CONFIG_VBNV_SIZE; i++)
 		vbnv_copy[i] = cmos_read(CONFIG_VBNV_OFFSET + 14 + i);
-
-	/* Check data for consistency */
-	if ((HEADER_SIGNATURE != (vbnv_copy[HEADER_OFFSET] & HEADER_MASK))
-	    || (crc8(vbnv_copy, CRC_OFFSET) != vbnv_copy[CRC_OFFSET])) {
-
-		/* Data is inconsistent (bad CRC or header),
-		 * so reset to defaults
-		 */
-		memset(vbnv_copy, 0, VBNV_BLOCK_SIZE);
-		vbnv_copy[HEADER_OFFSET] =
-		    (HEADER_SIGNATURE | HEADER_FIRMWARE_SETTINGS_RESET |
-		     HEADER_KERNEL_SETTINGS_RESET);
-	}
 }
 
-void save_vbnv(const uint8_t *vbnv_copy)
+void save_vbnv_cmos(const uint8_t *vbnv_copy)
 {
 	int i;
 
 	for (i = 0; i < CONFIG_VBNV_SIZE; i++)
 		cmos_write(vbnv_copy[i], CONFIG_VBNV_OFFSET + 14 + i);
 }
-
-
-static void vbnv_setup(void)
-{
-	read_vbnv(vbnv_data_addr(0));
-	car_set_var(vbnv_initialized, 1);
-}
-
-void set_recovery_mode_into_vbnv(int recovery_reason)
-{
-	uint8_t vbnv_copy[CONFIG_VBNV_SIZE];
-	uint8_t crc_val;
-
-	read_vbnv(vbnv_copy);
-
-	vbnv_copy[RECOVERY_OFFSET] = recovery_reason;
-
-	crc_val = crc8(vbnv_copy, CRC_OFFSET);
-
-	vbnv_copy[CRC_OFFSET] = crc_val;
-
-	save_vbnv(vbnv_copy);
-}
-
-int get_recovery_mode_from_vbnv(void)
-{
-	if (!is_vbnv_initialized())
-		vbnv_setup();
-	return vbnv_data(RECOVERY_OFFSET);
-}
-
-int vboot_wants_oprom(void)
-{
-#if IS_ENABLED(CONFIG_VBOOT_VERIFY_FIRMWARE)
-	struct vboot_handoff *vbho;
-
-	/* First check if handoff structure flag exists and is set. */
-	vbho = cbmem_find(CBMEM_ID_VBOOT_HANDOFF);
-	if (vbho && vbho->init_params.flags & VB_INIT_FLAG_OPROM_LOADED)
-		return 1;
-#endif
-
-	if (!is_vbnv_initialized())
-		vbnv_setup();
-
-	return (vbnv_data(BOOT_OFFSET) & BOOT_OPROM_NEEDED) ? 1 : 0;
-}