diff options
author | Shawn Nematbakhsh <shawnn@chromium.org> | 2015-09-25 15:37:13 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2015-09-29 11:28:28 -0700 |
commit | 42062110b702b4a011a3fe0aaaef09d15e6c5006 (patch) | |
tree | e826f7b7bb72c9d5f20ae121a995844ecafb843d | |
parent | cc814fb452b10b222f3fc78184d1ca18968f8327 (diff) | |
download | chrome-ec-42062110b702b4a011a3fe0aaaef09d15e6c5006.tar.gz |
cleanup: Remove redundant CONFIG_RAM_* configs
RAM need not be preserved between jumps from the loader to RO/RW images,
so there is no need for a separate region of loader RAM. Remove
redundant CONFIGs which define this unneeded region.
BUG=None
TEST=Verify glados boots and sysjumps successfully.
BRANCH=None
Change-Id: I2567f17a973c6f9f00bcfd97a4581d6c4b6fd6f0
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/302586
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
-rw-r--r-- | chip/mec1322/config_chip.h | 15 | ||||
-rw-r--r-- | include/config.h | 12 |
2 files changed, 4 insertions, 23 deletions
diff --git a/chip/mec1322/config_chip.h b/chip/mec1322/config_chip.h index db30d8ddb9..3b8f0c6ef7 100644 --- a/chip/mec1322/config_chip.h +++ b/chip/mec1322/config_chip.h @@ -54,17 +54,10 @@ #define CONFIG_MEC_SRAM_SIZE (CONFIG_MEC_SRAM_BASE_END - \ CONFIG_MEC_SRAM_BASE_START) -/* 0k RAM for Loader */ -#define CONFIG_RAM_SIZE_LOADER 0x00000000 -/* 24k RAM for RO /RW */ -#define CONFIG_RAM_SIZE_RORW 0x00006000 - -#define CONFIG_RAM_SIZE_TOTAL (CONFIG_RAM_SIZE_LOADER + \ - CONFIG_RAM_SIZE_RORW) -#define CONFIG_RAM_BASE_RORW (CONFIG_MEC_SRAM_BASE_END - \ - CONFIG_RAM_SIZE_TOTAL) -#define CONFIG_RAM_BASE CONFIG_RAM_BASE_RORW -#define CONFIG_RAM_SIZE CONFIG_RAM_SIZE_TOTAL +/* 24k RAM for RO / RW / loader */ +#define CONFIG_RAM_SIZE 0x00006000 +#define CONFIG_RAM_BASE (CONFIG_MEC_SRAM_BASE_END - \ + CONFIG_RAM_SIZE) /* System stack size */ #define CONFIG_STACK_SIZE 4096 diff --git a/include/config.h b/include/config.h index bdffee4cfa..619dd2c04d 100644 --- a/include/config.h +++ b/include/config.h @@ -1383,21 +1383,9 @@ /* Base address of RAM for the chip */ #undef CONFIG_RAM_BASE -/* Base address of RAM for RO/RW. */ -#undef CONFIG_RAM_BASE_RORW - /* Size of RAM available on the chip, in bytes */ #undef CONFIG_RAM_SIZE -/* Size of RAM for loader */ -#undef CONFIG_RAM_SIZE_LOADER - -/* Size of RAM for RO/RW */ -#undef CONFIG_RAM_SIZE_RORW - -/* Size of RAM for RO/RW & loader */ -#undef CONFIG_RAM_SIZE_TOTAL - /* Support IR357x Link voltage regulator debugging / reprogramming */ #undef CONFIG_REGULATOR_IR357X |