From f01995a2cdaa1a7e3bc4d40db70407f6a16f9b49 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Fri, 15 May 2020 17:50:32 +0800 Subject: [PATCH] sync litex version and patch system.h to fix compatibility The latest version of litex changes the way files are included, which breaks the build. This updates the litex repositories, and fixes the build. Signed-off-by: Sean Cross --- hw/deps/litedram | 2 +- hw/deps/litex | 2 +- hw/deps/litex-boards | 2 +- hw/deps/migen | 2 +- hw/deps/pythondata-software-compiler_rt | 2 +- sw/include/system.h | 4 ++++ 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/deps/litedram b/hw/deps/litedram index a35a1f7..1f7d9eb 160000 --- a/hw/deps/litedram +++ b/hw/deps/litedram @@ -1 +1 @@ -Subproject commit a35a1f7790cba537d52ccc8ae73c4e230a6cba8d +Subproject commit 1f7d9eb0b99162c0a671aaebf17d963eb49f6cbc diff --git a/hw/deps/litex b/hw/deps/litex index 43d328b..3391398 160000 --- a/hw/deps/litex +++ b/hw/deps/litex @@ -1 +1 @@ -Subproject commit 43d328b9249e3c583d41bcbc15119a5f563b0c7b +Subproject commit 3391398a5fccd5fc6cae36231a11d34f032dc3c5 diff --git a/hw/deps/litex-boards b/hw/deps/litex-boards index 2213d73..482d7a6 160000 --- a/hw/deps/litex-boards +++ b/hw/deps/litex-boards @@ -1 +1 @@ -Subproject commit 2213d73b899e64707c71c87b2d79eef892018bdd +Subproject commit 482d7a6b95982bb78eec051858b7d66568af3c7b diff --git a/hw/deps/migen b/hw/deps/migen index 5b5e4fd..b1b2b29 160000 --- a/hw/deps/migen +++ b/hw/deps/migen @@ -1 +1 @@ -Subproject commit 5b5e4fdee19c4059b61371c6b70ae927980c24ad +Subproject commit b1b2b298b85a795239daad84c75be073ddc4f8bd diff --git a/hw/deps/pythondata-software-compiler_rt b/hw/deps/pythondata-software-compiler_rt index 335007c..020625a 160000 --- a/hw/deps/pythondata-software-compiler_rt +++ b/hw/deps/pythondata-software-compiler_rt @@ -1 +1 @@ -Subproject commit 335007c87f7fc900147b7323c9702698caa35d11 +Subproject commit 020625a0d0359ccb6b0fdab3942aaa159a4a5b86 diff --git a/sw/include/system.h b/sw/include/system.h index ea3da85..89e5610 100644 --- a/sw/include/system.h +++ b/sw/include/system.h @@ -60,6 +60,10 @@ static inline void mtspr(unsigned long add, unsigned long val) __attribute__((noreturn)) void reboot(void); +// Forward-define this function, because it's defined inside `csr.h`, +// which includes this file near the top. +static inline void reboot_ctrl_write(uint32_t v); + __attribute__((noreturn)) static inline void warmboot_to_image(uint8_t image_index) { reboot_ctrl_write(0xac | (image_index & 3) << 0); while (1);