From d58e54730c03290296df5bb65cb84264e4b2facc Mon Sep 17 00:00:00 2001 From: Shawn Nematbakhsh Date: Fri, 4 Sep 2015 19:09:33 -0700 Subject: cleanup: Rename geometry constants Rename and add geometry constants to match spec doc - https://goo.gl/fnzTvr. CONFIG_FLASH_BASE becomes CONFIG_PROGRAM_MEMORY_BASE CONFIG_FLASH_MAPPED becomes CONFIG_MAPPED_STORAGE Add CONFIG_INTERNAL_STORAGE, CONFIG_EXTERNAL_STORAGE and CONFIG_MAPPED_STORAGE_BASE where appropriate. This CL leaves chip/npcx in a broken state -- it's fixed in a follow-up CL. 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 Change-Id: Idb3c4ed9f7f6edd0a6d49ad11753eba713e67a80 Signed-off-by: Shawn Nematbakhsh Reviewed-on: https://chromium-review.googlesource.com/297484 Commit-Ready: Shawn N Tested-by: Shawn N Reviewed-by: Randall Spangler --- chip/npcx/config_flash_layout.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'chip/npcx/config_flash_layout.h') diff --git a/chip/npcx/config_flash_layout.h b/chip/npcx/config_flash_layout.h index 0988c3ca35..986c0bbfea 100644 --- a/chip/npcx/config_flash_layout.h +++ b/chip/npcx/config_flash_layout.h @@ -14,7 +14,10 @@ */ /* Memmapped, external SPI */ -#define CONFIG_FLASH_MAPPED +#define CONFIG_EXTERNAL_STORAGE +#define CONFIG_MAPPED_STORAGE +/* Storage is memory-mapped, but program runs from SRAM */ +#define CONFIG_MAPPED_STORAGE_BASE 0x64000000 #undef CONFIG_FLASH_PSTATE /* Size of one firmware image in flash */ -- cgit v1.2.1