From 89f930d759b100559083d7fd7dd9a4ac06caab06 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 1 Mar 2014 17:41:44 +0100 Subject: depend on mips --- target/config/Config.in | 1 + 1 file changed, 1 insertion(+) (limited to 'target') diff --git a/target/config/Config.in b/target/config/Config.in index a3f0edf54..bb6ffc6d8 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -129,6 +129,7 @@ config ADK_TARGET_ABI default "eabihf" if ADK_EABIHF config ADK_TARGET_MIPS_ABI + depends ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS string default "32" if ADK_o32 default "n32" if ADK_n32 -- cgit v1.2.3 From deef78aaad882cb7c30bdf60bab94c5aca48bd07 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 2 Mar 2014 08:44:59 +0100 Subject: use correct suffix for MIPS64 ABI so that glibc recognize it. xz kernel compression is usable for mips, too --- Config.in | 1 - target/config/Config.in | 15 +++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'target') diff --git a/Config.in b/Config.in index 257d46583..7cee82338 100644 --- a/Config.in +++ b/Config.in @@ -152,7 +152,6 @@ config ADK_KERNEL_COMP_XZ select ADK_KERNEL_RD_XZ select ADK_KERNEL_KERNEL_XZ select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ - depends on !ADK_LINUX_MIPS config ADK_KERNEL_COMP_LZMA prompt "use LZMA compression" diff --git a/target/config/Config.in b/target/config/Config.in index 3ebd98ccb..13789802d 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -127,7 +127,7 @@ config ADK_TARGET_ABI default "eabihf" if ADK_EABIHF config ADK_TARGET_MIPS_ABI - depends ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS + depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS string default "32" if ADK_o32 default "n32" if ADK_n32 @@ -727,15 +727,22 @@ config ADK_TARGET_SUFFIX string default "gnueabihf" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_EABIHF default "gnueabi" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_EABI + default "gnuabi64" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_n64 + default "gnuabin32" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_n32 + default "gnuabi32" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_o32 default "gnu" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && !ADK_EABI default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_EABIHF default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_EABI + default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64 + default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32 + default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32 default "uclibc" if ADK_TARGET_LIB_UCLIBC && !ADK_EABI default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_EABIHF default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_EABI - default "musl" if ADK_TARGET_LIB_MUSL && !ADK_EABI - default "n64" if ADK_n64 - default "n32" if ADK_n32 + default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 + default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 + default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 + default "musl" if ADK_TARGET_LIB_MUSL default "32" if ADK_32 default "x32" if ADK_x32 default "gnu" -- cgit v1.2.3 From 32e00c4479ec1ccc5914c4949c42ee54e4f6a728 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 2 Mar 2014 08:49:31 +0100 Subject: unbreak uclibc sparc toolchain building --- target/config/Config.in | 1 - target/sparc/kernel/qemu-sparc | 2 +- toolchain/uClibc/patches/xxx-sparc-wait4.patch | 12 ++++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 toolchain/uClibc/patches/xxx-sparc-wait4.patch (limited to 'target') diff --git a/target/config/Config.in b/target/config/Config.in index 5868a4363..09dbef1e3 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -651,7 +651,6 @@ config ADK_TARGET_LIB_UCLIBC select ADK_uclibc depends on \ !ADK_LINUX_MICROBLAZE && \ - !ADK_LINUX_SPARC && \ !ADK_LINUX_SPARC64 && \ !ADK_LINUX_PPC64 && \ !ADK_LINUX_NATIVE diff --git a/target/sparc/kernel/qemu-sparc b/target/sparc/kernel/qemu-sparc index e88151194..26bd9a29e 100644 --- a/target/sparc/kernel/qemu-sparc +++ b/target/sparc/kernel/qemu-sparc @@ -1,6 +1,5 @@ CONFIG_SPARC=y CONFIG_SPARC32=y -CONFIG_SERIAL_CONSOLE=y CONFIG_SBUS=y CONFIG_SBUSCHAR=y CONFIG_PCI=y @@ -17,6 +16,7 @@ CONFIG_NET_CORE=y CONFIG_ETHERNET=y CONFIG_NET_VENDOR_AMD=y CONFIG_SUNLANCE=y +CONFIG_SERIAL_CONSOLE=y CONFIG_SERIAL_SUNCORE=y CONFIG_SERIAL_SUNZILOG=y CONFIG_SERIAL_SUNZILOG_CONSOLE=y diff --git a/toolchain/uClibc/patches/xxx-sparc-wait4.patch b/toolchain/uClibc/patches/xxx-sparc-wait4.patch new file mode 100644 index 000000000..e219ed773 --- /dev/null +++ b/toolchain/uClibc/patches/xxx-sparc-wait4.patch @@ -0,0 +1,12 @@ +diff -Nur uClibc-0.9.33.2.orig/include/sys/wait.h uClibc-0.9.33.2/include/sys/wait.h +--- uClibc-0.9.33.2.orig/include/sys/wait.h 2014-03-01 19:15:53.000000000 +0100 ++++ uClibc-0.9.33.2/include/sys/wait.h 2014-03-01 19:16:42.000000000 +0100 +@@ -176,7 +176,7 @@ + #endif /* Use BSD. */ + + #ifdef _LIBC +-extern __pid_t __wait4_nocancel(__pid_t, __WAIT_STATUS, int, struct rusage *) attribute_hidden; ++extern __pid_t __wait4_nocancel(__pid_t, __WAIT_STATUS, int, struct rusage *); + #endif + + -- cgit v1.2.3