summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaveh Jalali <caveh@chromium.org>2018-10-23 22:53:32 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2018-10-25 00:47:58 +0000
commit668c169e8ea99e7f33f27937d02f6dbe2cec2c21 (patch)
tree2e799f826f24e92a073a871bb935eaeb2d6808c4
parentf269dfc0d35da9a5dee41f1b2303b6ebc0240be3 (diff)
downloadchrome-ec-668c169e8ea99e7f33f27937d02f6dbe2cec2c21.tar.gz
core/minute-ia: fix code for coreboot toolchain
this fixes some compilation issues when using the coreboot toolchain. BUG=b:118355015 BRANCH=none TEST=tested in combination of a bunch of other patches to get atlas_ish to build with the coreboot toolchain Change-Id: Id93822fa0a8112da45529b0ba4ab327b773a31d7 Signed-off-by: Caveh Jalali <caveh@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/1298693 Reviewed-by: Caveh Jalali <caveh@google.com> Commit-Queue: Caveh Jalali <caveh@google.com> Tested-by: Caveh Jalali <caveh@google.com>
-rw-r--r--core/minute-ia/panic.c7
-rw-r--r--core/minute-ia/task.c4
2 files changed, 2 insertions, 9 deletions
diff --git a/core/minute-ia/panic.c b/core/minute-ia/panic.c
index 23cd3d3bdb..c8cbe9d14c 100644
--- a/core/minute-ia/panic.c
+++ b/core/minute-ia/panic.c
@@ -18,13 +18,6 @@
/* Whether bus fault is ignored */
static int bus_fault_ignored;
-/* Panic data goes at the end of RAM. */
-static struct panic_data * const pdata_ptr = PANIC_DATA_PTR;
-
-/* Preceded by stack, rounded down to nearest 64-bit-aligned boundary */
-static const uint32_t pstack_addr = (CONFIG_RAM_BASE + CONFIG_RAM_SIZE
- - sizeof(struct panic_data)) & ~7;
-
/*
* Print panic data
*/
diff --git a/core/minute-ia/task.c b/core/minute-ia/task.c
index 12f43b8b67..c96bde706f 100644
--- a/core/minute-ia/task.c
+++ b/core/minute-ia/task.c
@@ -96,7 +96,7 @@ static const struct {
uint32_t r0;
uint32_t pc;
uint16_t stack_size;
-} const tasks_init[] = {
+} tasks_init[] = {
TASK(IDLE, __idle, 0, IDLE_TASK_STACK_SIZE)
CONFIG_TASK_LIST
CONFIG_TEST_TASK_LIST
@@ -174,7 +174,7 @@ inline int in_interrupt_context(void)
return !!__in_isr;
}
-inline int get_interrupt_context(void)
+static inline int get_interrupt_context(void)
{
return 0;
}