Use one offset to record the BIOS setup menu

Signed-off-by: Josh Tsai <josh_tsai@compal.corp-partner.google.com>

Author: Josh Tsai

board/hx30/board.c

@@ -433,9 +433,9 @@ bool ac_poweron_check(void)
 {
 	uint8_t memcap;
 
-	board_spi_read_byte(SPI_AC_BOOT_OFFSET, &memcap);
+	board_spi_read_byte(SPI_BIOS_SETUP, &memcap);
 
-	return memcap ? true : false;
+	return (memcap & BIOS_SETUP_AC_BOOT) ? true : false;
 }
 
 int poweron_reason_acin(void)
@@ -670,16 +670,16 @@ void charger_psys_enable(uint8_t enable)
 static void board_init(void)
 {
 	uint8_t memcap;
-	uint8_t standalone;
 
-	board_spi_read_byte(SPI_AC_BOOT_OFFSET, &memcap);
-	board_spi_read_byte(SPI_STANDALONE_OFFSET, &standalone);
+	board_spi_read_byte(SPI_BIOS_SETUP, &memcap);
 
-	if (memcap && !ac_boot_status())
-		*host_get_customer_memmap(0x48) = (memcap & BIT(0));
+	if ((memcap & BIOS_SETUP_AC_BOOT) && !ac_boot_status())
+		*host_get_customer_memmap(0x48) = (memcap & BIOS_SETUP_AC_BOOT);
+
+	if (memcap & BIOS_SETUP_STANDALONE)
+		set_standalone_mode(1);
 
 	check_chassis_open(1);
-	set_standalone_mode((int)standalone);
 
 	gpio_enable_interrupt(GPIO_SOC_ENBKL);
 	gpio_enable_interrupt(GPIO_ON_OFF_BTN_L);

board/hx30/board.h

@@ -336,8 +336,10 @@
  */
 #define CONFIG_FLASH_SIZE 0x100000
 #define CONFIG_SPI_FLASH_W25Q80
-#define SPI_AC_BOOT_OFFSET 0x00
-#define SPI_STANDALONE_OFFSET 0x01
+#define SPI_BIOS_SETUP 0x00
+
+#define BIOS_SETUP_AC_BOOT	BIT(0)
+#define BIOS_SETUP_STANDALONE	BIT(1)
 
 /*
  * Enable extra SPI flash and generic SPI

board/hx30/diagnostics.c

@@ -37,6 +37,7 @@ int standalone_mode;
 
 void set_standalone_mode(int enable)
 {
+	CPRINTS("set standalone = %d", enable);
 	standalone_mode = enable;
 }
 

board/hx30/host_command_customization.c

@@ -57,18 +57,25 @@ void set_non_acpi_mode(int enable)
 static void sci_enable(void)
 {
 	uint8_t dataInSPI;
-	int dataInEMI;
+	int biosSetup = 0;
+	
 
 	if (*host_get_customer_memmap(0x00) & BIT(0)) {
 	/* when host set EC driver ready flag, EC need to enable SCI */
 		lpc_set_host_event_mask(LPC_HOST_EVENT_SCI, SCI_HOST_EVENT_MASK);
 		update_soc_power_limit(true, false);
 
 	/* check the Flag in EEPROM and EMI, if values are different, write the value in EEPROM */
-		board_spi_read_byte(SPI_AC_BOOT_OFFSET, &dataInSPI);
-		dataInEMI = ac_boot_status();
-		if ((int)dataInSPI != dataInEMI)
-			board_spi_write_byte(SPI_AC_BOOT_OFFSET, (uint8_t)dataInEMI);
+		board_spi_read_byte(SPI_BIOS_SETUP, &dataInSPI);
+
+		if (ac_boot_status())
+			biosSetup |= BIT(0);
+		
+		if (get_standalone_mode())
+			biosSetup |= BIT(1);
+
+		if ((int)dataInSPI != biosSetup)
+			board_spi_write_byte(SPI_BIOS_SETUP, (uint8_t)biosSetup);
 
 		set_non_acpi_mode(0);
 	} else
@@ -158,7 +165,7 @@ static enum ec_status factory_mode(struct host_cmd_handler_args *args)
 		system_set_bbram(STSTEM_BBRAM_IDX_CHASSIS_MAGIC, EC_PARAM_CHASSIS_BBRAM_MAGIC);
 		system_set_bbram(STSTEM_BBRAM_IDX_CHASSIS_VTR_OPEN, 0);
 		system_set_bbram(STSTEM_BBRAM_IDX_CHASSIS_WAS_OPEN, 0);
-		board_spi_write_byte(SPI_AC_BOOT_OFFSET, 0);
+		board_spi_write_byte(SPI_BIOS_SETUP, 0);
 		system_set_bbram(STSTEM_BBRAM_IDX_FP_LED_LEVEL, 0);
 	}
 
@@ -344,21 +351,9 @@ DECLARE_HOST_COMMAND(EC_CMD_THERMAL_QEVENT, thermal_qevent, EC_VER_MASK(0));
 static enum ec_status standalone_mode(struct host_cmd_handler_args *args)
 {
 	const struct ec_params_standalone_mode *p = args->params;
-	static int curr;
 
-	curr = get_standalone_mode();
-
-	if ((int)p->enable != curr) {
-		/*
-		 * BIOS writes the host command after board initial,
-		 * if curr mode is different with parameters from host command,
-		 * updates the SPI ROM value, also updates the current standalone mode.
-		 */
+	set_standalone_mode((int)p->enable);
+	return EC_RES_SUCCESS;
 
-		board_spi_write_byte(SPI_STANDALONE_OFFSET, p->enable);
-		set_standalone_mode((int)p->enable);
-		return EC_RES_SUCCESS;
-	}
-	return EC_ERROR_INVAL;
 }
 DECLARE_HOST_COMMAND(EC_CMD_STANDALONE_MODE, standalone_mode, EC_VER_MASK(0));