diff options
| author | Peter Marheine <pmarheine@chromium.org> | 2021-12-08 15:02:40 +1100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-12-10 01:18:29 +0000 |
| commit | 4da48bfb0355e52b98e37c1f91b6f707aa480993 (patch) | |
| tree | 1033fb5e55d83fbe571df83d312a534d2dda6d7f | |
| parent | 00c28881ef9284deea7847070ba1690bc36a9d58 (diff) | |
| download | chrome-ec-4da48bfb0355e52b98e37c1f91b6f707aa480993.tar.gz | |
zephyr: use chosen flash and sram nodes for configs
Rather than assuming a 'flash0' device always exists for defining RAM
and program memory base addresses, use the chosen flash and SRAM
devices (which are typically the same as those conventionally called
flash0 and sram0).
BUG=b:205615358
TEST=zmake testall
BRANCH=none
Change-Id: I4aa3bb559f1860cfe710c372b3e96e61affed604
Signed-off-by: Peter Marheine <pmarheine@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3322217
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | zephyr/shim/include/config_chip.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 1fedd1d888..79a48b3e32 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -356,18 +356,20 @@ #endif /* CONFIG_PLATFORM_EC_ESPI */ -#if DT_NODE_EXISTS(DT_NODELABEL(flash0)) -#define CONFIG_PROGRAM_MEMORY_BASE DT_REG_ADDR(DT_NODELABEL(flash0)) +#if DT_HAS_CHOSEN(zephyr_flash) +#define CONFIG_PROGRAM_MEMORY_BASE DT_REG_ADDR(DT_CHOSEN(zephyr_flash)) #else -#define CONFIG_PROGRAM_MEMORY_BASE 0X0 +#error "A zephyr,flash device must be chosen in the device tree" #endif -#if DT_NODE_EXISTS(DT_NODELABEL(sram0)) -#define CONFIG_RAM_BASE DT_REG_ADDR(DT_NODELABEL(sram0)) -#define CONFIG_DATA_RAM_SIZE DT_REG_SIZE(DT_NODELABEL(sram0)) -#else +#if DT_HAS_CHOSEN(zephyr_sram) +#define CONFIG_RAM_BASE DT_REG_ADDR(DT_CHOSEN(zephyr_sram)) +#define CONFIG_DATA_RAM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_sram)) +#elif defined(CONFIG_ARCH_POSIX) #define CONFIG_RAM_BASE 0x0 #define CONFIG_DATA_RAM_SIZE 0x0 +#else +#error "A zephyr,sram device must be chosen in the device tree" #endif #define CONFIG_RO_MEM_OFF CONFIG_CROS_EC_RO_MEM_OFF |