diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2019-05-13 14:20:42 -0600 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-05-16 09:04:09 -0700 |
| commit | ebf10d6bd404a7ffe30580b223160926ed1ff036 (patch) | |
| tree | 42dec4d96698b9f8e18660890082773b70d0cf4c | |
| parent | aaba1d5efd51082d143ce2ac64e6caf9cb14d5e5 (diff) | |
| download | chrome-ec-ebf10d6bd404a7ffe30580b223160926ed1ff036.tar.gz | |
ish: increase AON ROM size by 256 bytes
We need to reserve some space in AON persistent memory not to be used
by the shim loader. This memory will be used for panic data, reset
flags, and watchdog reset counter. We can reduce the size of the panic
data for further soft-registers, as needed.
Each of these things will be moved into the reserved section in a
child CL.
BUG=b:132457636
BRANCH=none
TEST=entered d0i0, d0i1, d0i2, d0i3, and rebooted to test aontaskfw is
working
Change-Id: I41f39d28a6b5a3424f1c89b0e0884e72df04225f
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1610997
Reviewed-by: Jett Rink <jettrink@chromium.org>
| -rw-r--r-- | chip/ish/aontaskfw/ish_aontask.ld.in | 10 | ||||
| -rw-r--r-- | chip/ish/config_chip.h | 2 | ||||
| -rw-r--r-- | chip/ish/registers.h | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/chip/ish/aontaskfw/ish_aontask.ld.in b/chip/ish/aontaskfw/ish_aontask.ld.in index 55ae99a88c..a839146a92 100644 --- a/chip/ish/aontaskfw/ish_aontask.ld.in +++ b/chip/ish/aontaskfw/ish_aontask.ld.in @@ -23,9 +23,13 @@ ENTRY(ish_aon_main); /** * AON memory layout - * --------------+--------------+-------------------+-------------------+ - * | RAM_LEN | STACK_SIZE | 8 Bytes for GDB | ROM(128 Bytes) | - * --------------+--------------+-------------------+-------------------+ + * +---------+------------+-----------------+-----------------+ + * | RAM_LEN | STACK_SIZE | 8 Bytes for GDB | ROM (384 Bytes) | + * +---------+------------+-----------------+-----------------+ + * + * The first 256 bytes of the AON ROM is reserved for ECOS use. + * The remaining 128 bytes of the AON ROM may be used by the shim + * loader. */ MEMORY diff --git a/chip/ish/config_chip.h b/chip/ish/config_chip.h index e82aad8ed3..9d42f7a0a8 100644 --- a/chip/ish/config_chip.h +++ b/chip/ish/config_chip.h @@ -49,7 +49,7 @@ #endif /* The end of the AON memory is reserved for read-only use */ -#define CONFIG_AON_ROM_SIZE 0x80 +#define CONFIG_AON_ROM_SIZE 0x180 #define CONFIG_AON_ROM_BASE (CONFIG_AON_RAM_BASE \ + CONFIG_AON_RAM_SIZE \ - CONFIG_AON_ROM_SIZE) diff --git a/chip/ish/registers.h b/chip/ish/registers.h index 15321c6d83..b00cce72e5 100644 --- a/chip/ish/registers.h +++ b/chip/ish/registers.h @@ -343,7 +343,7 @@ enum ish_i2c_port { #define SNOWBALL_BASE IPC_ISH2PMC_MSG_BASE #else /* from ISH4, used reserved rom part of AON memory */ -#define SNOWBALL_BASE CONFIG_AON_ROM_BASE +#define SNOWBALL_BASE (CONFIG_AON_ROM_BASE + 256) #endif /** |