boards: opentitan: Update the OpenTitan SRAM address Update the OpenTitan SRAM address to make current master Tock, also update the submodule to use the latest Tock SHA. Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
diff --git a/.travis.yml b/.travis.yml index 52e5d38..2333df3 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -14,7 +14,8 @@ cache: cargo install: - - make -j8 setup + - CI=y make -j8 setup + - rm -rf ~/opentitan* # Make sure this isn't left over, see https://github.com/tock/tock/pull/1978 script: - make test
diff --git a/Makefile b/Makefile index 87b6a10..2f48887 100644 --- a/Makefile +++ b/Makefile
@@ -48,7 +48,7 @@ # patches to better support boards that Tock supports. .PHONY: setup-qemu setup-qemu: - $(MAKE) -C tock emulation-setup + $(MAKE) -C tock ci-job-qemu # Builds a Tock kernel for the HiFive board for use by QEMU tests. .PHONY: kernel-hifive
diff --git a/boards/layout_opentitan.ld b/boards/layout_opentitan.ld index 0ae4b60..95b801d 100644 --- a/boards/layout_opentitan.ld +++ b/boards/layout_opentitan.ld
@@ -10,7 +10,7 @@ * the kernel binary, check for the actual address of APP_MEMORY! */ FLASH (rx) : ORIGIN = 0x20030040, LENGTH = 32M - SRAM (rwx) : ORIGIN = 0x10002D00, LENGTH = 512K + SRAM (rwx) : ORIGIN = 0x10003000, LENGTH = 512K } /*
diff --git a/tock b/tock index 152189f..957a890 160000 --- a/tock +++ b/tock
@@ -1 +1 @@ -Subproject commit 152189fe077aea955332ee3c28ccbee519d8b072 +Subproject commit 957a890e97550db00ca38407d93d2896d2724ec5