diff options
Diffstat (limited to 'board')
40 files changed, 45 insertions, 44 deletions
diff --git a/board/ambassador/board.h b/board/ambassador/board.h index fdc4ff3405..fedcce9d06 100644 --- a/board/ambassador/board.h +++ b/board/ambassador/board.h @@ -16,7 +16,7 @@ #define NPCX_UART_MODULE2 1 /* GPIO64/65 are used as UART pins. */ /* Internal SPI flash on NPCX796FC is 512 kB */ -#define CONFIG_FLASH_SIZE (512 * 1024) +#define CONFIG_FLASH_SIZE_BYTES (512 * 1024) #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q80 /* Internal SPI flash type. */ diff --git a/board/arcada_ish/board.h b/board/arcada_ish/board.h index 3d4d9a044f..13c62c6195 100644 --- a/board/arcada_ish/board.h +++ b/board/arcada_ish/board.h @@ -19,7 +19,7 @@ #undef CONFIG_DEBUG_ASSERT #define CONFIG_CLOCK_CRYSTAL /* EC */ -#define CONFIG_FLASH_SIZE 0x80000 +#define CONFIG_FLASH_SIZE_BYTES 0x80000 #define CONFIG_FPU #define CONFIG_I2C #define CONFIG_I2C_CONTROLLER diff --git a/board/asurada_scp/board.h b/board/asurada_scp/board.h index debaedfac5..82e0602a53 100644 --- a/board/asurada_scp/board.h +++ b/board/asurada_scp/board.h @@ -10,7 +10,7 @@ #define CC_DEFAULT (CC_ALL & ~(CC_MASK(CC_HOSTCMD) | CC_MASK(CC_IPI))) -#define CONFIG_FLASH_SIZE CONFIG_RAM_BASE +#define CONFIG_FLASH_SIZE_BYTES CONFIG_RAM_BASE #define CONFIG_LTO #define CONFIG_UART_CONSOLE 0 diff --git a/board/atlas/board.h b/board/atlas/board.h index 8107f16b6b..0442225d30 100644 --- a/board/atlas/board.h +++ b/board/atlas/board.h @@ -34,7 +34,7 @@ #define CONFIG_SHA256_UNROLLED /* Internal SPI flash on NPCX7 */ -#define CONFIG_FLASH_SIZE (512 * 1024) /* It's really 1MB. */ +#define CONFIG_FLASH_SIZE_BYTES (512 * 1024) /* It's really 1MB. */ #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q80 /* Internal SPI flash type. */ diff --git a/board/atlas_ish/board.h b/board/atlas_ish/board.h index fe5cdedc9d..5e75cbe7c0 100644 --- a/board/atlas_ish/board.h +++ b/board/atlas_ish/board.h @@ -25,7 +25,7 @@ #undef CONFIG_DEBUG_ASSERT #define CONFIG_CLOCK_CRYSTAL /* EC */ -#define CONFIG_FLASH_SIZE 0x80000 +#define CONFIG_FLASH_SIZE_BYTES 0x80000 #define CONFIG_FPU #define CONFIG_I2C #define CONFIG_I2C_CONTROLLER diff --git a/board/cheza/board.h b/board/cheza/board.h index e0aa3cd061..f9fd3bff62 100644 --- a/board/cheza/board.h +++ b/board/cheza/board.h @@ -28,7 +28,7 @@ #define NPCX7_PWM1_SEL 0 /* GPIO C2 is not used as PWM1. */ /* Internal SPI flash on NPCX7 */ -#define CONFIG_FLASH_SIZE (1024 * 1024) /* 1MB internal spi flash */ +#define CONFIG_FLASH_SIZE_BYTES (1024 * 1024) /* 1MB internal spi flash */ #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q80 /* Internal SPI flash type. */ #define CONFIG_HOSTCMD_FLASH_SPI_INFO diff --git a/board/chocodile_vpdmcu/board.h b/board/chocodile_vpdmcu/board.h index 09adee47b5..3564a50753 100644 --- a/board/chocodile_vpdmcu/board.h +++ b/board/chocodile_vpdmcu/board.h @@ -27,7 +27,7 @@ #define CONFIG_RO_SIZE 0 /* Fake full size if we had a RO partition */ #undef CONFIG_RW_SIZE -#define CONFIG_RW_SIZE CONFIG_FLASH_SIZE +#define CONFIG_RW_SIZE CONFIG_FLASH_SIZE_BYTES #endif /* HAS_TASK_CONSOLE */ /* 48 MHz SYSCLK clock frequency */ diff --git a/board/coachz/board.h b/board/coachz/board.h index 5734948de1..388f773e37 100644 --- a/board/coachz/board.h +++ b/board/coachz/board.h @@ -30,7 +30,7 @@ #define CONFIG_BUTTON_TRIGGERED_RECOVERY /* Internal SPI flash on NPCX7 */ -#define CONFIG_FLASH_SIZE (512 * 1024) /* 512KB internal spi flash */ +#define CONFIG_FLASH_SIZE_BYTES (512 * 1024) /* 512KB internal spi flash */ /* Battery */ #define CONFIG_BATTERY_DEVICE_CHEMISTRY "LION" diff --git a/board/coral/board.h b/board/coral/board.h index 3f09b7ebdd..c88ee4e701 100644 --- a/board/coral/board.h +++ b/board/coral/board.h @@ -165,7 +165,7 @@ #undef CONFIG_MOTION_SENSE_SUSPEND_DELAY_US #define CONFIG_MOTION_SENSE_SUSPEND_DELAY_US (MSEC * 60) -#define CONFIG_FLASH_SIZE 524288 +#define CONFIG_FLASH_SIZE_BYTES 524288 #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q40 /* FIXME: Should be GD25LQ40? */ diff --git a/board/dooly/board.h b/board/dooly/board.h index 140013b6cd..2c6859b9bd 100644 --- a/board/dooly/board.h +++ b/board/dooly/board.h @@ -16,7 +16,7 @@ #define NPCX_UART_MODULE2 1 /* GPIO64/65 are used as UART pins. */ /* Internal SPI flash on NPCX796FC is 512 kB */ -#define CONFIG_FLASH_SIZE (512 * 1024) +#define CONFIG_FLASH_SIZE_BYTES (512 * 1024) #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q80 /* Internal SPI flash type. */ diff --git a/board/drallion_ish/board.h b/board/drallion_ish/board.h index 7bfd6b395a..483af9be22 100644 --- a/board/drallion_ish/board.h +++ b/board/drallion_ish/board.h @@ -19,7 +19,7 @@ #undef CONFIG_DEBUG_ASSERT #define CONFIG_CLOCK_CRYSTAL /* EC */ -#define CONFIG_FLASH_SIZE 0x80000 +#define CONFIG_FLASH_SIZE_BYTES 0x80000 #define CONFIG_FPU #define CONFIG_I2C #define CONFIG_I2C_CONTROLLER diff --git a/board/endeavour/board.h b/board/endeavour/board.h index 7bf8415cb9..a3d871604f 100644 --- a/board/endeavour/board.h +++ b/board/endeavour/board.h @@ -27,7 +27,7 @@ #define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_MKBP_USE_HOST_EVENT #define CONFIG_DPTF -#define CONFIG_FLASH_SIZE 0x80000 +#define CONFIG_FLASH_SIZE_BYTES 0x80000 #define CONFIG_FPU #define CONFIG_I2C #define CONFIG_I2C_CONTROLLER diff --git a/board/eve/board.h b/board/eve/board.h index d83fa3135a..bfb1159cb8 100644 --- a/board/eve/board.h +++ b/board/eve/board.h @@ -24,7 +24,7 @@ #define CONFIG_DEVICE_EVENT #define CONFIG_DPTF #define CONFIG_DPTF_MULTI_PROFILE -#define CONFIG_FLASH_SIZE 0x80000 +#define CONFIG_FLASH_SIZE_BYTES 0x80000 #define CONFIG_FPU /* 7 day delay before hibernate */ #undef CONFIG_HIBERNATE_DELAY_SEC diff --git a/board/fizz/board.h b/board/fizz/board.h index 4aaf9090af..e3d0120fe5 100644 --- a/board/fizz/board.h +++ b/board/fizz/board.h @@ -28,7 +28,7 @@ #define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_MKBP_USE_HOST_EVENT #define CONFIG_DPTF -#define CONFIG_FLASH_SIZE 0x80000 +#define CONFIG_FLASH_SIZE_BYTES 0x80000 #define CONFIG_FPU #define CONFIG_I2C #define CONFIG_I2C_CONTROLLER @@ -158,7 +158,7 @@ #define CONFIG_RW_B #define CONFIG_RW_B_MEM_OFF CONFIG_RO_MEM_OFF #undef CONFIG_RO_SIZE -#define CONFIG_RO_SIZE (CONFIG_FLASH_SIZE / 4) +#define CONFIG_RO_SIZE (CONFIG_FLASH_SIZE_BYTES / 4) #undef CONFIG_RW_SIZE #define CONFIG_RW_SIZE CONFIG_RO_SIZE #define CONFIG_RW_A_STORAGE_OFF CONFIG_RW_STORAGE_OFF diff --git a/board/genesis/board.h b/board/genesis/board.h index c7400d4420..de82b84540 100644 --- a/board/genesis/board.h +++ b/board/genesis/board.h @@ -16,7 +16,7 @@ #define NPCX_UART_MODULE2 1 /* GPIO64/65 are used as UART pins. */ /* Internal SPI flash on NPCX796FC is 512 kB */ -#define CONFIG_FLASH_SIZE (512 * 1024) +#define CONFIG_FLASH_SIZE_BYTES (512 * 1024) #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q80 /* Internal SPI flash type. */ diff --git a/board/glkrvp/board.h b/board/glkrvp/board.h index 97253f26cf..0ee352bfab 100644 --- a/board/glkrvp/board.h +++ b/board/glkrvp/board.h @@ -99,7 +99,7 @@ #define CONFIG_LOW_POWER_IDLE -#define CONFIG_FLASH_SIZE 524288 +#define CONFIG_FLASH_SIZE_BYTES 524288 #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q40 diff --git a/board/hammer/board.h b/board/hammer/board.h index f26aa447ae..15928b7ca4 100644 --- a/board/hammer/board.h +++ b/board/hammer/board.h @@ -58,7 +58,7 @@ #define CONFIG_RW_MEM_OFF (CONFIG_ROLLBACK_OFF + CONFIG_ROLLBACK_SIZE) #define CONFIG_RW_STORAGE_OFF 0 -#define CONFIG_RW_SIZE (CONFIG_FLASH_SIZE - \ +#define CONFIG_RW_SIZE (CONFIG_FLASH_SIZE_BYTES - \ (CONFIG_RW_MEM_OFF - CONFIG_RO_MEM_OFF)) #define CONFIG_EC_PROTECTED_STORAGE_OFF CONFIG_RO_MEM_OFF diff --git a/board/hatch_fp/board.h b/board/hatch_fp/board.h index 8a0bb2d38c..09ee861e93 100644 --- a/board/hatch_fp/board.h +++ b/board/hatch_fp/board.h @@ -71,7 +71,7 @@ #define CONFIG_RW_MEM_OFF (CONFIG_ROLLBACK_OFF + CONFIG_ROLLBACK_SIZE) #define CONFIG_RW_STORAGE_OFF 0 -#define CONFIG_RW_SIZE (CONFIG_FLASH_SIZE - \ +#define CONFIG_RW_SIZE (CONFIG_FLASH_SIZE_BYTES - \ (CONFIG_RW_MEM_OFF - CONFIG_RO_MEM_OFF)) #define CONFIG_EC_PROTECTED_STORAGE_OFF CONFIG_RO_MEM_OFF diff --git a/board/kukui_scp/board.h b/board/kukui_scp/board.h index fcd9fb6399..040a7a0b9f 100644 --- a/board/kukui_scp/board.h +++ b/board/kukui_scp/board.h @@ -10,7 +10,7 @@ #define CC_DEFAULT (CC_ALL & ~(CC_MASK(CC_HOSTCMD) | CC_MASK(CC_IPI))) -#define CONFIG_FLASH_SIZE 0x58000 /* Image file size: 256KB */ +#define CONFIG_FLASH_SIZE_BYTES 0x58000 /* Image file size: 256KB */ #undef CONFIG_LID_SWITCH #undef CONFIG_FW_INCLUDE_RO #define CONFIG_MKBP_EVENT diff --git a/board/lazor/board.h b/board/lazor/board.h index 0d0d3b2733..47e5574ded 100644 --- a/board/lazor/board.h +++ b/board/lazor/board.h @@ -11,7 +11,7 @@ #include "baseboard.h" /* Internal SPI flash on NPCX7 */ -#define CONFIG_FLASH_SIZE (512 * 1024) /* 512KB internal spi flash */ +#define CONFIG_FLASH_SIZE_BYTES (512 * 1024) /* 512KB internal spi flash */ /* Switchcap */ #define CONFIG_LN9310 diff --git a/board/mchpevb1/board.h b/board/mchpevb1/board.h index af5553be92..f4789e5b81 100644 --- a/board/mchpevb1/board.h +++ b/board/mchpevb1/board.h @@ -270,10 +270,10 @@ * Configure for smaller flash is OK for testing except * for SPI flash lock bit. */ - #define CONFIG_FLASH_SIZE 524288 + #define CONFIG_FLASH_SIZE_BYTES 524288 #define CONFIG_SPI_FLASH_W25X40 /* - * #define CONFIG_FLASH_SIZE 0x1000000 + * #define CONFIG_FLASH_SIZE_BYTES 0x1000000 * #define CONFIG_SPI_FLASH_W25Q128 */ diff --git a/board/nami/board.h b/board/nami/board.h index 5343abf660..fe1877dfb6 100644 --- a/board/nami/board.h +++ b/board/nami/board.h @@ -24,7 +24,7 @@ #define CONFIG_CROS_BOARD_INFO #define CONFIG_CASE_CLOSED_DEBUG_EXTERNAL #define CONFIG_DPTF -#define CONFIG_FLASH_SIZE 0x80000 +#define CONFIG_FLASH_SIZE_BYTES 0x80000 #define CONFIG_FPU #define CONFIG_I2C #define CONFIG_I2C_CONTROLLER diff --git a/board/nautilus/board.h b/board/nautilus/board.h index f8b64cb4b3..e226556dea 100644 --- a/board/nautilus/board.h +++ b/board/nautilus/board.h @@ -23,7 +23,7 @@ #define CONFIG_DPTF #define CONFIG_DPTF_MOTION_LID_NO_GMR_SENSOR #define CONFIG_DPTF_MULTI_PROFILE -#define CONFIG_FLASH_SIZE 0x80000 +#define CONFIG_FLASH_SIZE_BYTES 0x80000 #define CONFIG_FPU #define CONFIG_I2C #define CONFIG_I2C_CONTROLLER diff --git a/board/nocturne/board.h b/board/nocturne/board.h index 84b91af516..9dda2b6bcb 100644 --- a/board/nocturne/board.h +++ b/board/nocturne/board.h @@ -26,7 +26,7 @@ #define CONFIG_HIBERNATE_PSL /* Internal SPI flash on NPCX7 */ -#define CONFIG_FLASH_SIZE (512 * 1024) /* It's really 1MB. */ +#define CONFIG_FLASH_SIZE_BYTES (512 * 1024) /* It's really 1MB. */ #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q80 /* Internal SPI flash type. */ diff --git a/board/nocturne_fp/board.h b/board/nocturne_fp/board.h index 3f4bda0b41..ea19ab3325 100644 --- a/board/nocturne_fp/board.h +++ b/board/nocturne_fp/board.h @@ -63,7 +63,7 @@ #define CONFIG_RW_MEM_OFF (CONFIG_ROLLBACK_OFF + CONFIG_ROLLBACK_SIZE) #define CONFIG_RW_STORAGE_OFF 0 -#define CONFIG_RW_SIZE (CONFIG_FLASH_SIZE - \ +#define CONFIG_RW_SIZE (CONFIG_FLASH_SIZE_BYTES - \ (CONFIG_RW_MEM_OFF - CONFIG_RO_MEM_OFF)) #define CONFIG_EC_PROTECTED_STORAGE_OFF CONFIG_RO_MEM_OFF diff --git a/board/npcx7_evb/board.h b/board/npcx7_evb/board.h index b93a11fcc5..2ce959cbbb 100644 --- a/board/npcx7_evb/board.h +++ b/board/npcx7_evb/board.h @@ -69,10 +69,10 @@ #if defined(CHIP_VARIANT_NPCX7M6FC) || defined(CHIP_VARIANT_NPCX7M7FC) || \ defined(CHIP_VARIANT_NPCX7M7WC) #define CONFIG_SPI_FLASH_W25Q40 /* Internal spi flash type */ -#define CONFIG_FLASH_SIZE 0x00080000 /* 512 KB internal spi flash */ +#define CONFIG_FLASH_SIZE_BYTES 0x00080000 /* 512 KB internal spi flash */ #else #define CONFIG_SPI_FLASH_W25Q80 /* Internal spi flash type */ -#define CONFIG_FLASH_SIZE 0x00100000 /* 1 MB internal spi flash */ +#define CONFIG_FLASH_SIZE_BYTES 0x00100000 /* 1 MB internal spi flash */ #endif /* New features on npcx7 ec */ diff --git a/board/npcx_evb/board.h b/board/npcx_evb/board.h index db7d2cc39e..b97bf43047 100644 --- a/board/npcx_evb/board.h +++ b/board/npcx_evb/board.h @@ -19,7 +19,7 @@ #define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands for testing */ #define CONFIG_SPI_FLASH_PORT 0 #define CONFIG_SPI_FLASH -#define CONFIG_FLASH_SIZE 0x00800000 /* 8MB spi flash */ +#define CONFIG_FLASH_SIZE_BYTES 0x00800000 /* 8MB spi flash */ #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q64 #define CONFIG_I2C diff --git a/board/npcx_evb_arm/board.h b/board/npcx_evb_arm/board.h index 40f001f0a3..582807a1b2 100644 --- a/board/npcx_evb_arm/board.h +++ b/board/npcx_evb_arm/board.h @@ -15,7 +15,7 @@ /* Optional features */ #define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands for testing */ -#define CONFIG_FLASH_SIZE 0x00800000 /* 8MB spi flash */ +#define CONFIG_FLASH_SIZE_BYTES 0x00800000 /* 8MB spi flash */ #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q64 #define CONFIG_I2C diff --git a/board/pompom/board.h b/board/pompom/board.h index 2bf0177bce..15801ab6c5 100644 --- a/board/pompom/board.h +++ b/board/pompom/board.h @@ -20,7 +20,7 @@ #define CONFIG_I2C_DEBUG /* Internal SPI flash on NPCX7 */ -#define CONFIG_FLASH_SIZE (512 * 1024) /* 512KB internal spi flash */ +#define CONFIG_FLASH_SIZE_BYTES (512 * 1024) /* 512KB internal spi flash */ /* Keyboard */ #define CONFIG_KEYBOARD_BOARD_CONFIG diff --git a/board/poppy/board.h b/board/poppy/board.h index 8e5f35b21b..efd4fdd720 100644 --- a/board/poppy/board.h +++ b/board/poppy/board.h @@ -26,7 +26,7 @@ #define CONFIG_DPTF_MULTI_PROFILE #endif #define CONFIG_EMULATED_SYSRQ -#define CONFIG_FLASH_SIZE 0x80000 +#define CONFIG_FLASH_SIZE_BYTES 0x80000 #define CONFIG_FPU #define CONFIG_I2C #define CONFIG_I2C_CONTROLLER diff --git a/board/puff/board.h b/board/puff/board.h index bcb7bb64ed..1efd7a40f9 100644 --- a/board/puff/board.h +++ b/board/puff/board.h @@ -16,7 +16,7 @@ #define NPCX_UART_MODULE2 1 /* GPIO64/65 are used as UART pins. */ /* Internal SPI flash on NPCX796FC is 512 kB */ -#define CONFIG_FLASH_SIZE (512 * 1024) +#define CONFIG_FLASH_SIZE_BYTES (512 * 1024) #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q80 /* Internal SPI flash type. */ diff --git a/board/rammus/board.h b/board/rammus/board.h index 81f76b842d..89ec43c255 100644 --- a/board/rammus/board.h +++ b/board/rammus/board.h @@ -16,7 +16,7 @@ #define CONFIG_CRC8 #define CONFIG_CROS_BOARD_INFO #define CONFIG_DPTF -#define CONFIG_FLASH_SIZE 0x80000 +#define CONFIG_FLASH_SIZE_BYTES 0x80000 #define CONFIG_FPU #define CONFIG_I2C #define CONFIG_I2C_CONTROLLER diff --git a/board/reef/board.h b/board/reef/board.h index 39015541fe..a22bce3d70 100644 --- a/board/reef/board.h +++ b/board/reef/board.h @@ -162,7 +162,7 @@ #undef CONFIG_MOTION_SENSE_SUSPEND_DELAY_US #define CONFIG_MOTION_SENSE_SUSPEND_DELAY_US (MSEC * 60) -#define CONFIG_FLASH_SIZE 524288 +#define CONFIG_FLASH_SIZE_BYTES 524288 #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q40 /* FIXME: Should be GD25LQ40? */ diff --git a/board/reef_mchp/board.h b/board/reef_mchp/board.h index cef9912be3..ef3356bb9d 100644 --- a/board/reef_mchp/board.h +++ b/board/reef_mchp/board.h @@ -166,7 +166,7 @@ #define CONFIG_SPI_FLASH_PORT 0 #define CONFIG_SPI_FLASH -#define CONFIG_FLASH_SIZE 524288 +#define CONFIG_FLASH_SIZE_BYTES 524288 #define CONFIG_SPI_FLASH_REGS #define CONFIG_SPI_FLASH_W25Q40 /* FIXME: Should be GD25LQ40? */ diff --git a/board/servo_v4p1/board.h b/board/servo_v4p1/board.h index eb40aef6f1..7f475e9138 100644 --- a/board/servo_v4p1/board.h +++ b/board/servo_v4p1/board.h @@ -67,7 +67,7 @@ #define CONFIG_RW_MEM_OFF (CONFIG_FW_PSTATE_OFF + CONFIG_FW_PSTATE_SIZE) #define CONFIG_RW_STORAGE_OFF 0 -#define CONFIG_RW_SIZE (CONFIG_FLASH_SIZE - \ +#define CONFIG_RW_SIZE (CONFIG_FLASH_SIZE_BYTES - \ (CONFIG_RW_MEM_OFF - CONFIG_RO_MEM_OFF)) #define CONFIG_EC_PROTECTED_STORAGE_OFF CONFIG_RO_MEM_OFF diff --git a/board/stm32l476g-eval/board.h b/board/stm32l476g-eval/board.h index 7d7616822b..3124779fd7 100644 --- a/board/stm32l476g-eval/board.h +++ b/board/stm32l476g-eval/board.h @@ -10,8 +10,8 @@ #ifdef CTS_MODULE /* CTS tests are small. We can use smaller size to expedite flash time. */ -#undef CONFIG_FLASH_SIZE -#define CONFIG_FLASH_SIZE 0x00040000 /* 256k */ +#undef CONFIG_FLASH_SIZE_BYTES +#define CONFIG_FLASH_SIZE_BYTES 0x00040000 /* 256k */ #endif /* Optional features */ diff --git a/board/tglrvp_ish/board.h b/board/tglrvp_ish/board.h index 2b7d86a140..7ab88641ea 100644 --- a/board/tglrvp_ish/board.h +++ b/board/tglrvp_ish/board.h @@ -26,7 +26,7 @@ #define CONFIG_CLOCK_CRYSTAL #define CONFIG_ISH_UART_0 /* EC */ -#define CONFIG_FLASH_SIZE 0x80000 +#define CONFIG_FLASH_SIZE_BYTES 0x80000 #define CONFIG_FPU #define CONFIG_I2C #define CONFIG_I2C_CONTROLLER diff --git a/board/trogdor/board.h b/board/trogdor/board.h index fe2e5688d0..96f0e5ceb2 100644 --- a/board/trogdor/board.h +++ b/board/trogdor/board.h @@ -22,7 +22,7 @@ #define CONFIG_I2C_DEBUG /* Internal SPI flash on NPCX7 */ -#define CONFIG_FLASH_SIZE (1024 * 1024) /* 1MB internal spi flash */ +#define CONFIG_FLASH_SIZE_BYTES (1024 * 1024) /* 1MB internal spi flash */ /* Keyboard */ #define CONFIG_KEYBOARD_BOARD_CONFIG diff --git a/board/volteer_ish/board.h b/board/volteer_ish/board.h index 752ea283d5..6cc4057702 100644 --- a/board/volteer_ish/board.h +++ b/board/volteer_ish/board.h @@ -26,7 +26,7 @@ #define CONFIG_CLOCK_CRYSTAL #define CONFIG_ISH_UART_0 /* EC */ -#define CONFIG_FLASH_SIZE 0x80000 +#define CONFIG_FLASH_SIZE_BYTES 0x80000 #define CONFIG_FPU #define CONFIG_I2C #define CONFIG_I2C_CONTROLLER diff --git a/board/zinger/hardware.c b/board/zinger/hardware.c index ceeac38d38..7e1f29da38 100644 --- a/board/zinger/hardware.c +++ b/board/zinger/hardware.c @@ -308,7 +308,8 @@ int flash_physical_write(int offset, int size, const char *data) int res = EC_SUCCESS; int i; - if ((uint32_t)address > CONFIG_PROGRAM_MEMORY_BASE + CONFIG_FLASH_SIZE) + if ((uint32_t)address > + CONFIG_PROGRAM_MEMORY_BASE + CONFIG_FLASH_SIZE_BYTES) return EC_ERROR_INVAL; /* unlock CR if needed */ |