From: Mao Han han_mao@c-sky.com
--- target/config/Config.in.libc | 9 +++++++-- toolchain/glibc/Makefile.inc | 7 +++++++ 2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index 91ce9f0..ebf477b 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -67,6 +67,7 @@ config ADK_TARGET_LIB_GLIBC ADK_TARGET_ARCH_AARCH64 || \ ADK_TARGET_ARCH_ALPHA || \ ADK_TARGET_ARCH_ARM || \ + ADK_TARGET_ARCH_CSKY || \ ADK_TARGET_ARCH_HPPA || \ ADK_TARGET_ARCH_IA64 || \ ADK_TARGET_ARCH_M68K || \ @@ -148,15 +149,19 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT
config ADK_TARGET_LIB_GLIBC_2_26 bool "2.26" - depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_RISCV32 && !ADK_TARGET_ARCH_RISCV64 + depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_RISCV32 && !ADK_TARGET_ARCH_RISCV64 && !ADK_TARGET_ARCH_CSKY
config ADK_TARGET_LIB_GLIBC_RISCV bool "riscv" depends on ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64
+config ADK_TARGET_LIB_GLIBC_CSKY + bool "csky" + depends on ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_CSKY + config ADK_TARGET_LIB_GLIBC_GIT bool "git" - depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_RISCV32 && !ADK_TARGET_ARCH_RISCV64 + depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_RISCV32 && !ADK_TARGET_ARCH_RISCV64 && !ADK_TARGET_ARCH_CSKY
config ADK_TARGET_LIB_MUSL_1_1_18 bool "1.1.18" diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 728fe62..adcff83 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -15,6 +15,13 @@ PKG_RELEASE:= 1 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} PKG_HASH:= e54e0a934cd2bc94429be79da5e9385898d2306b9eaf3c92d5a77af96190f6bd endif +ifeq ($(ADK_TARGET_LIB_GLIBC_CSKY),y) +PKG_VERSION:= master +PKG_GIT:= branch +PKG_SITES:= https://github.com/c-sky/glibc.git +PKG_RELEASE:= 1 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +endif ifeq ($(ADK_TARGET_LIB_GLIBC_RISCV),y) PKG_VERSION:= riscv-glibc-2.26 PKG_GLIBCVER:= 2.26
Hi Guo, Mao,
Thanks for the patch, I aplied afer adding PKG_GLIBCVER for a complete system build.
I am still unsure how to start qemu for the three different CPU emulations. Could you work on a patch adding the help information to target/csky/Makefile?
best regards Waldemar
Guo Ren wrote,
From: Mao Han han_mao@c-sky.com
target/config/Config.in.libc | 9 +++++++-- toolchain/glibc/Makefile.inc | 7 +++++++ 2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index 91ce9f0..ebf477b 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -67,6 +67,7 @@ config ADK_TARGET_LIB_GLIBC ADK_TARGET_ARCH_AARCH64 || \ ADK_TARGET_ARCH_ALPHA || \ ADK_TARGET_ARCH_ARM || \
ADK_TARGET_ARCH_HPPA || \ ADK_TARGET_ARCH_IA64 || \ ADK_TARGET_ARCH_M68K || \ADK_TARGET_ARCH_CSKY || \
@@ -148,15 +149,19 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT
config ADK_TARGET_LIB_GLIBC_2_26 bool "2.26"
- depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_RISCV32 && !ADK_TARGET_ARCH_RISCV64
- depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_RISCV32 && !ADK_TARGET_ARCH_RISCV64 && !ADK_TARGET_ARCH_CSKY
config ADK_TARGET_LIB_GLIBC_RISCV bool "riscv" depends on ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64
+config ADK_TARGET_LIB_GLIBC_CSKY
bool "csky"
depends on ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_CSKY
config ADK_TARGET_LIB_GLIBC_GIT bool "git"
- depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_RISCV32 && !ADK_TARGET_ARCH_RISCV64
- depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_RISCV32 && !ADK_TARGET_ARCH_RISCV64 && !ADK_TARGET_ARCH_CSKY
config ADK_TARGET_LIB_MUSL_1_1_18 bool "1.1.18" diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 728fe62..adcff83 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -15,6 +15,13 @@ PKG_RELEASE:= 1 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} PKG_HASH:= e54e0a934cd2bc94429be79da5e9385898d2306b9eaf3c92d5a77af96190f6bd endif +ifeq ($(ADK_TARGET_LIB_GLIBC_CSKY),y) +PKG_VERSION:= master +PKG_GIT:= branch +PKG_SITES:= https://github.com/c-sky/glibc.git +PKG_RELEASE:= 1 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +endif ifeq ($(ADK_TARGET_LIB_GLIBC_RISCV),y) PKG_VERSION:= riscv-glibc-2.26 PKG_GLIBCVER:= 2.26 -- 2.7.4
Hi Waldemar,
I am still unsure how to start qemu for the three different CPU emulations. Could you work on a patch adding the help information to target/csky/Makefile?
We build qemu from source on gitlab with buildroot, you can ref: https://gitlab.com/c-sky/buildroot/-/jobs/46761267
Doc: https://gitlab.com/c-sky/buildroot/blob/master/board/qemu/csky/readme.txt
qemu build script in pkg: https://gitlab.com/c-sky/buildroot/blob/master/package/csky-qemu/csky-qemu.m...
We haven't built a basic system from openadk, and we will learn it lately.
best regards Guo Ren
best regards Waldemar
Guo Ren wrote,
From: Mao Han han_mao@c-sky.com
target/config/Config.in.libc | 9 +++++++-- toolchain/glibc/Makefile.inc | 7 +++++++ 2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index 91ce9f0..ebf477b 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -67,6 +67,7 @@ config ADK_TARGET_LIB_GLIBC ADK_TARGET_ARCH_AARCH64 || \ ADK_TARGET_ARCH_ALPHA || \ ADK_TARGET_ARCH_ARM || \
ADK_TARGET_ARCH_HPPA || \ ADK_TARGET_ARCH_IA64 || \ ADK_TARGET_ARCH_M68K || \ADK_TARGET_ARCH_CSKY || \
@@ -148,15 +149,19 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT
config ADK_TARGET_LIB_GLIBC_2_26 bool "2.26"
- depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_RISCV32 && !ADK_TARGET_ARCH_RISCV64
- depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_RISCV32 && !ADK_TARGET_ARCH_RISCV64 && !ADK_TARGET_ARCH_CSKY
config ADK_TARGET_LIB_GLIBC_RISCV bool "riscv" depends on ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64
+config ADK_TARGET_LIB_GLIBC_CSKY
bool "csky"
depends on ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_CSKY
config ADK_TARGET_LIB_GLIBC_GIT bool "git"
- depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_RISCV32 && !ADK_TARGET_ARCH_RISCV64
- depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_RISCV32 && !ADK_TARGET_ARCH_RISCV64 && !ADK_TARGET_ARCH_CSKY
config ADK_TARGET_LIB_MUSL_1_1_18 bool "1.1.18" diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 728fe62..adcff83 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -15,6 +15,13 @@ PKG_RELEASE:= 1 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} PKG_HASH:= e54e0a934cd2bc94429be79da5e9385898d2306b9eaf3c92d5a77af96190f6bd endif +ifeq ($(ADK_TARGET_LIB_GLIBC_CSKY),y) +PKG_VERSION:= master +PKG_GIT:= branch +PKG_SITES:= https://github.com/c-sky/glibc.git +PKG_RELEASE:= 1 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +endif ifeq ($(ADK_TARGET_LIB_GLIBC_RISCV),y) PKG_VERSION:= riscv-glibc-2.26 PKG_GLIBCVER:= 2.26 -- 2.7.4
Hi Guo, Guo Ren wrote,
Hi Waldemar,
I am still unsure how to start qemu for the three different CPU emulations. Could you work on a patch adding the help information to target/csky/Makefile?
We build qemu from source on gitlab with buildroot, you can ref: https://gitlab.com/c-sky/buildroot/-/jobs/46761267
Doc: https://gitlab.com/c-sky/buildroot/blob/master/board/qemu/csky/readme.txt
qemu build script in pkg: https://gitlab.com/c-sky/buildroot/blob/master/package/csky-qemu/csky-qemu.m...
We haven't built a basic system from openadk, and we will learn it lately.
Thanks for the links. I was at least able to bootup the kernel now. Userland still fails. I used the wrong Qemu branch. With master I can successfully boot the kernel.
best regards Waldemar