diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-09-07 14:12:57 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-09-16 14:49:33 -0700 |
| commit | fe77303bec6c78786a9df1dbdb33af64787e20c8 (patch) | |
| tree | 772d2fbb53178121ddca0dfbafbd304ee075ce1b /board | |
| parent | 1167cad6a88e45bbf6a5599f19d018cd6a8b5233 (diff) | |
| download | chrome-ec-fe77303bec6c78786a9df1dbdb33af64787e20c8.tar.gz | |
cleanup: Remove redundant FLASH_SIZE CONFIGs
Since there is no more concept of a flash region belonging only to the
EC, we only need one FLASH_SIZE config, which represents the actual
physical size of flash.
BRANCH=None
BUG=chrome-os-partner:23796
TEST=With entire patch series, on both Samus and Glados:
- Verify 'version' EC console command is correct
- Verify 'flashrom -p ec -r read.bin' reads back EC image
- Verify software sync correctly flashes both EC and PD RW images
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: I18a34a943e02c8a029f330f213a8634a2ca418b6
Reviewed-on: https://chromium-review.googlesource.com/297824
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Mulin Chao <mlchao@nuvoton.com>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/cyan/board.h | 2 | ||||
| -rw-r--r-- | board/glados/board.h | 2 | ||||
| -rw-r--r-- | board/glower/board.h | 2 | ||||
| -rw-r--r-- | board/hoho/board.h | 1 | ||||
| -rw-r--r-- | board/kunimitsu/board.h | 2 | ||||
| -rw-r--r-- | board/mec1322_evb/board.h | 2 | ||||
| -rw-r--r-- | board/npcx_evb/board.h | 2 | ||||
| -rw-r--r-- | board/npcx_evb_arm/board.h | 2 | ||||
| -rw-r--r-- | board/strago/board.h | 2 |
9 files changed, 8 insertions, 9 deletions
diff --git a/board/cyan/board.h b/board/cyan/board.h index 4425d01c8c..da54191bf4 100644 --- a/board/cyan/board.h +++ b/board/cyan/board.h @@ -46,7 +46,7 @@ #define CONFIG_SPI_FLASH_PORT 1 #define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_SIZE 524288 +#define CONFIG_FLASH_SIZE 524288 /* TODO: Add flash protect support for the SPI part cyan actually has */ #define CONFIG_SPI_FLASH_W25X40 diff --git a/board/glados/board.h b/board/glados/board.h index f2b1dc0434..bbbf7c111e 100644 --- a/board/glados/board.h +++ b/board/glados/board.h @@ -66,7 +66,7 @@ #define CONFIG_SPI_FLASH_PORT 1 #define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_SIZE 524288 +#define CONFIG_FLASH_SIZE 524288 #define CONFIG_SPI_FLASH_W25Q64 #define CONFIG_TEMP_SENSOR diff --git a/board/glower/board.h b/board/glower/board.h index 5a1179bd31..4895da7032 100644 --- a/board/glower/board.h +++ b/board/glower/board.h @@ -52,7 +52,7 @@ #define CONFIG_CLOCK_CRYSTAL /* 512kb SPI flash */ -#define CONFIG_SPI_FLASH_SIZE 0x00080000 +#define CONFIG_FLASH_SIZE 0x00080000 #define CONFIG_SPI_FLASH_W25X40 #define CONFIG_SPI_FLASH_PORT 1 diff --git a/board/hoho/board.h b/board/hoho/board.h index 90256ea7a7..eaa1803f61 100644 --- a/board/hoho/board.h +++ b/board/hoho/board.h @@ -26,7 +26,6 @@ /* TODO(tbroch) Re-enable once STM spi master can be inhibited at boot so it doesn't interfere with HDMI loading its f/w */ #undef CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_SIZE 1048576 #define CONFIG_SPI_MASTER_PORT 2 #define CONFIG_SPI_CS_GPIO GPIO_PD_MCDP_SPI_CS_L #define CONFIG_USB diff --git a/board/kunimitsu/board.h b/board/kunimitsu/board.h index 21770782ab..e2421e1b24 100644 --- a/board/kunimitsu/board.h +++ b/board/kunimitsu/board.h @@ -75,7 +75,7 @@ #define CONFIG_SPI_FLASH_PORT 1 #define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_SIZE 524288 +#define CONFIG_FLASH_SIZE 524288 #define CONFIG_SPI_FLASH_W25Q64 #define CONFIG_TEMP_SENSOR diff --git a/board/mec1322_evb/board.h b/board/mec1322_evb/board.h index 4c566e7e9e..58858de785 100644 --- a/board/mec1322_evb/board.h +++ b/board/mec1322_evb/board.h @@ -13,7 +13,7 @@ #define CONFIG_WATCHDOG_HELP #define CONFIG_FANS 1 #define CONFIG_ADC -#define CONFIG_SPI_FLASH_SIZE 0x00800000 +#define CONFIG_FLASH_SIZE 0x00800000 #define CONFIG_SPI_FLASH_W25Q64 #define CONFIG_SPI_FLASH_PORT 0 diff --git a/board/npcx_evb/board.h b/board/npcx_evb/board.h index bebdbb6a11..fd0ff65e75 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_SPI_FLASH_SIZE 0x00800000 /* 8MB spi flash */ +#define CONFIG_FLASH_SIZE 0x00800000 /* 8MB spi flash */ #define CONFIG_SPI_FLASH_W25Q64 #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_8042 diff --git a/board/npcx_evb_arm/board.h b/board/npcx_evb_arm/board.h index e9ccaea25b..1a8c85ea93 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_SPI_FLASH_SIZE 0x00800000 /* 8MB spi flash */ +#define CONFIG_FLASH_SIZE 0x00800000 /* 8MB spi flash */ #define CONFIG_SPI_FLASH_W25Q64 #define CONFIG_KEYBOARD_BOARD_CONFIG #define CONFIG_KEYBOARD_PROTOCOL_MKBP /* Instead of 8042 protocol of keyboard */ diff --git a/board/strago/board.h b/board/strago/board.h index 5939013fe7..71f1b8fb2a 100644 --- a/board/strago/board.h +++ b/board/strago/board.h @@ -49,7 +49,7 @@ #define CONFIG_SPI_FLASH_PORT 1 #define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_SIZE 524288 +#define CONFIG_FLASH_SIZE 524288 #define CONFIG_SPI_FLASH_W25Q64 #define CONFIG_USB_PORT_POWER_SMART |