diff options
| author | Yuval Peress <peress@chromium.org> | 2021-03-03 11:36:24 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-03-03 20:08:08 +0000 |
| commit | ec2a21e143e1f31b9a607b88a725fca62aa01bd4 (patch) | |
| tree | 4cc8c97279954905f1af7941cdc4f5b53c417fa4 | |
| parent | 801ac5a0df178a58d20d78cddb69042b7feae016 (diff) | |
| download | chrome-ec-ec2a21e143e1f31b9a607b88a725fca62aa01bd4.tar.gz | |
zephyr: fix AP power cycling on sysjump
When running the sysjump, the AP was power cycling. This was caused
by the jdata address no longer being correct since the swap to Zephyr
2.5. Previously, the sram0 device tree entry defined a register size
of 0x10000, which needed to have 0x800 bytes removed as part of the
boot ram size. This can be seen in
https://github.com/zephyrproject-rtos/zephyr/blob/v2.4-branch/dts/arm/nuvoton/npcx7m6fb.dtsi#L35
In Zephyr 2.5, the sram0 size was corrected to 62k to account for the
boot ram size. As can be seen in
https://github.com/zephyrproject-rtos/zephyr/blob/master/dts/arm/nuvoton/npcx7m6fb.dtsi#L21
This is also true for npcx7m6fc and npcx7m7fc.
BRANCH=none
BUG=b:181599787
TEST=build and falsh volteer, see correct value returned for
system_jumped_to_this_image()
Signed-off-by: Yuval Peress <peress@chromium.org>
Change-Id: Icf063ec220d17ebe6a012506e4626702bdf9e149
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2732935
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
| -rw-r--r-- | zephyr/Kconfig | 9 | ||||
| -rw-r--r-- | zephyr/projects/volteer/prj.conf | 3 | ||||
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 3 |
3 files changed, 1 insertions, 14 deletions
diff --git a/zephyr/Kconfig b/zephyr/Kconfig index 366e15c04b..5378ef0ee4 100644 --- a/zephyr/Kconfig +++ b/zephyr/Kconfig @@ -49,15 +49,6 @@ rsource "Kconfig.usbc" # # Please keep these in alphabetical order -config PLATFORM_EC_BOOT_RAM_SIZE - hex "The total size required for the boot loader" - default 0x0 - help - This is the size (in bytes) required by the boot loader. It will count - against the data section of the RAM. Not all chips require this value. - See the datasheet for the npcx chip family for example. If not needed, - this can simple be left at 0x0. - config PLATFORM_EC_ACPI bool "Enable the ACPI module" default y if AP_X86 && PLATFORM_EC_ESPI diff --git a/zephyr/projects/volteer/prj.conf b/zephyr/projects/volteer/prj.conf index 09e853d95c..49203bfdbe 100644 --- a/zephyr/projects/volteer/prj.conf +++ b/zephyr/projects/volteer/prj.conf @@ -129,6 +129,3 @@ CONFIG_PLATFORM_EC_PROTECTED_STORAGE_OFF=0x0 CONFIG_PLATFORM_EC_PROTECTED_STORAGE_SIZE=0x40000 CONFIG_PLATFORM_EC_WRITABLE_STORAGE_OFF=0x40000 CONFIG_PLATFORM_EC_WRITABLE_STORAGE_SIZE=0x40000 - -# RAM -CONFIG_PLATFORM_EC_BOOT_RAM_SIZE=0x800 diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 97e4ddf607..859450571d 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -266,8 +266,7 @@ enum battery_type { #define CONFIG_RO_STORAGE_OFF CONFIG_RO_HDR_SIZE #define CONFIG_RW_STORAGE_OFF 0 -#define CONFIG_RAM_SIZE \ - (CONFIG_DATA_RAM_SIZE - CONFIG_PLATFORM_EC_BOOT_RAM_SIZE) +#define CONFIG_RAM_SIZE CONFIG_DATA_RAM_SIZE #ifdef CONFIG_PLATFORM_EC_EXTERNAL_STORAGE #define CONFIG_EXTERNAL_STORAGE |