summaryrefslogtreecommitdiff
path: root/chip/host
diff options
context:
space:
mode:
authorShawn Nematbakhsh <shawnn@chromium.org>2015-09-07 14:12:57 -0700
committerchrome-bot <chrome-bot@chromium.org>2015-09-16 14:49:33 -0700
commitfe77303bec6c78786a9df1dbdb33af64787e20c8 (patch)
tree772d2fbb53178121ddca0dfbafbd304ee075ce1b /chip/host
parent1167cad6a88e45bbf6a5599f19d018cd6a8b5233 (diff)
downloadchrome-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 'chip/host')
-rw-r--r--chip/host/config_chip.h4
-rw-r--r--chip/host/flash.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/chip/host/config_chip.h b/chip/host/config_chip.h
index eaaf46287f..4c8dc7fb75 100644
--- a/chip/host/config_chip.h
+++ b/chip/host/config_chip.h
@@ -9,8 +9,8 @@
#define __CROS_EC_CONFIG_CHIP_H
/* Memory mapping */
-#define CONFIG_FLASH_PHYSICAL_SIZE 0x00020000
-extern char __host_flash[CONFIG_FLASH_PHYSICAL_SIZE];
+#define CONFIG_FLASH_SIZE 0x00020000
+extern char __host_flash[CONFIG_FLASH_SIZE];
#define CONFIG_PROGRAM_MEMORY_BASE ((uintptr_t)__host_flash)
#define CONFIG_FLASH_BANK_SIZE 0x1000
diff --git a/chip/host/flash.c b/chip/host/flash.c
index 77639218aa..b83d72ff5f 100644
--- a/chip/host/flash.c
+++ b/chip/host/flash.c
@@ -12,7 +12,7 @@
#include "persistence.h"
#include "util.h"
-char __host_flash[CONFIG_FLASH_PHYSICAL_SIZE];
+char __host_flash[CONFIG_FLASH_SIZE];
uint8_t __host_flash_protect[PHYSICAL_BANKS];
/* Override this function to make flash erase/write operation fail */