diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2019-11-23 10:15:28 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-27 13:23:27 +0000 |
| commit | 7356ae622bd71ba1a022a9ed18c4cf085e948b38 (patch) | |
| tree | 91d7d31d78321e5e5f1bff87ac109460cda09bed | |
| parent | 930c1f69c928e21bda6bef7aad926d335195e107 (diff) | |
| download | openembedded-core-contrib-7356ae622bd71ba1a022a9ed18c4cf085e948b38.tar.gz | |
systemd-bootchart: Backport RISC-V support
This is a combined backport from upstream patches for added risc-v
support
Upstream code has been re-organised before risc-v support was added to
its mix of two commits
primarily
https://github.com/systemd/systemd/commit/171b53380085b1288b03b19a2b978f36a5c003d0
https://github.com/systemd/systemd/commit/680a752c834aba1b66449d34f17dbe37e040f6b0
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch | 45 | ||||
| -rw-r--r-- | meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb | 1 |
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch new file mode 100644 index 0000000000..fc03812bb9 --- /dev/null +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart/0001-architecture-Recognise-RISCV-32-RISCV-64.patch @@ -0,0 +1,45 @@ +From 4a6ace0a965965ea15e88c3418c7158ca5cc9f8f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 21 Nov 2019 10:12:05 -0800 +Subject: [PATCH] architecture: Recognise RISCV-32/RISCV-64 + +Upstream-Status: Backport [https://github.com/systemd/systemd/commit/171b53380085b1288b03b19a2b978f36a5c003d0] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/architecture.h | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/src/architecture.h b/src/architecture.h +index 26679e2..89c7d32 100644 +--- a/src/architecture.h ++++ b/src/architecture.h +@@ -57,6 +57,8 @@ enum { + ARCHITECTURE_M68K, + ARCHITECTURE_TILEGX, + ARCHITECTURE_CRIS, ++ ARCHITECTURE_RISCV32, ++ ARCHITECTURE_RISCV64, + _ARCHITECTURE_MAX, + _ARCHITECTURE_INVALID = -1 + }; +@@ -194,6 +196,17 @@ int uname_architecture(void); + #elif defined(__cris__) + # define native_architecture() ARCHITECTURE_CRIS + # error "Missing LIB_ARCH_TUPLE for CRIS" ++#elif defined(__riscv) ++# if __SIZEOF_POINTER__ == 4 ++# define native_architecture() ARCHITECTURE_RISCV32 ++# define LIB_ARCH_TUPLE "riscv32-linux-gnu" ++# elif __SIZEOF_POINTER__ == 8 ++# define native_architecture() ARCHITECTURE_RISCV64 ++# define LIB_ARCH_TUPLE "riscv64-linux-gnu" ++# else ++# error "Unrecognized riscv architecture variant" ++# endif ++# define PROC_CPUINFO_MODEL "cpu model" + #else + # error "Please register your architecture here!" + #endif +-- +2.24.0 + diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb index aef8839864..960edc75e6 100644 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb @@ -3,6 +3,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https \ + file://0001-architecture-Recognise-RISCV-32-RISCV-64.patch \ " SRC_URI_append_libc-musl = " \ |