From b563b8fd141c741932c110c2901fab555f5b22ef Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 6 Mar 2014 12:25:47 +0100 Subject: get rid of ADK_NATIVE mode, it is not regulary tested and the results where not satisfying. --- target/config/Config.in | 7 ------- 1 file changed, 7 deletions(-) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index be008f97e..0eab0aecf 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -336,10 +336,6 @@ config ADK_TARGET_BROADCOM_MODEL_ASUS_WL500GP endchoice -if ADK_LINUX_NATIVE -source "target/config/Config.in.native" -endif - # hardware features config ADK_TARGET_WITH_USB boolean @@ -432,9 +428,6 @@ config ADK_HARDWARE_QEMU config ADK_HARDWARE_VBOX boolean -config ADK_NATIVE - boolean - # the inverse of ADK_TARGET_KERNEL_CUSTOMISING, # allows for selecting it off (i.e., to disable it) config ADK_TARGET_FIXED_KERNEL -- cgit v1.2.3 From 07f56ae74b26588e501c7e895f3355d4177e81d8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 6 Mar 2014 12:33:51 +0100 Subject: fix parallel using of different mips abi --- target/config/Config.in | 61 ++++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 36 deletions(-) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index 0eab0aecf..d8b73d2fa 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -87,8 +87,6 @@ prompt "Target Kernel" depends on ADK_TARGET_SYSTEM_LEMOTE_YEELONG \ || ADK_TARGET_SYSTEM_QEMU_MIPS64 \ || ADK_TARGET_SYSTEM_QEMU_MIPS64EL \ - || ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64 \ - || ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64EL \ || ADK_LINUX_X86_64 config ADK_TARGET_KERNEL64 @@ -133,26 +131,19 @@ config ADK_TARGET_ABI default "eabihf" if ADK_eabihf config ADK_TARGET_MIPS_ABI - depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS + depends on ADK_LINUX_MIPS string default "32" if ADK_o32 default "n32" if ADK_n32 default "64" if ADK_n64 -config ADK_TARGET_ABI_MIPS_O32 - boolean - select ADK_o32 - depends on !ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS - default y - choice prompt "Target ABI" -depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS +depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS && !ADK_TOOLCHAIN config ADK_TARGET_ABI_N32 boolean "N32 ABI (new)" select ADK_n32 - depends on !ADK_TARGET_LIB_MUSL config ADK_TARGET_ABI_O32 boolean "O32 ABI (old)" @@ -161,13 +152,12 @@ config ADK_TARGET_ABI_O32 config ADK_TARGET_ABI_N64 boolean "N64 ABI" select ADK_n64 - depends on !ADK_TARGET_LIB_MUSL endchoice choice prompt "Target ABI" -depends on ADK_TARGET_KERNEL64 && ADK_LINUX_X86_64 +depends on ADK_TARGET_KERNEL64 && ADK_LINUX_X86_64 && !ADK_TOOLCHAIN config ADK_TARGET_ABI_64 boolean "64 Bit ABI" @@ -558,8 +548,8 @@ config ADK_TARGET_CPU_ARCH default "m68k" if ADK_LINUX_M68K default "microblaze" if ADK_LINUX_MICROBLAZE && ADK_big default "microblazeel" if ADK_LINUX_MICROBLAZE && ADK_little - default "mips64" if ADK_LINUX_MIPS && ADK_big && ADK_TARGET_KERNEL64 - default "mips64el" if ADK_LINUX_MIPS && ADK_little && ADK_TARGET_KERNEL64 + default "mips64" if ADK_LINUX_MIPS && ADK_big && ADK_LINUX_64 + default "mips64el" if ADK_LINUX_MIPS && ADK_little && ADK_LINUX_64 default "mips" if ADK_LINUX_MIPS && ADK_big default "mipsel" if ADK_LINUX_MIPS && ADK_little default "arm" if ADK_LINUX_ARM && ADK_little @@ -570,26 +560,26 @@ config ADK_TARGET_CPU_ARCH default "sh4eb" if ADK_LINUX_SH && ADK_big default "ppc" if ADK_CPU_PPC default "ppc64" if ADK_CPU_PPC64 - default "mips64el" if ADK_native && ADK_lemote_yeelong + default "mips64el" if ADK_native && ADK_lemote_yeelong config ADK_TARGET_ABI_CFLAGS string - default "-mabi=32" if ADK_TARGET_ABI_O32 || ADK_TARGET_ABI_MIPS_O32 - default "-mabi=n32" if ADK_TARGET_ABI_N32 - default "-mabi=64" if ADK_TARGET_ABI_N64 - default "-m32" if ADK_TARGET_ABI_32 - default "-mx32" if ADK_TARGET_ABI_X32 - default "-m64" if ADK_TARGET_ABI_64 + default "-mabi=32" if ADK_o32 + default "-mabi=n32" if ADK_n32 + default "-mabi=64" if ADK_n64 + default "-m32" if ADK_32 + default "-mx32" if ADK_x32 + default "-m64" if ADK_64 config ADK_TARGET_ABI_LDFLAGS string - default "-Wl,-m -Wl,elf_i386" if ADK_TARGET_ABI_32 + default "-Wl,-m -Wl,elf_i386" if ADK_32 config ADK_TARGET_KERNEL_LDFLAGS string - default "-mabi=64" if ADK_TARGET_ABI_N32 && ADK_TARGET_KERNEL64 - default "-mabi=64" if ADK_TARGET_ABI_O32 && ADK_TARGET_KERNEL64 - default "-mabi=64" if ADK_TARGET_ABI_N64 && ADK_TARGET_KERNEL64 + default "-mabi=64" if ADK_n32 && ADK_TARGET_KERNEL64 + default "-mabi=64" if ADK_o32 && ADK_TARGET_KERNEL64 + default "-mabi=64" if ADK_n64 && ADK_TARGET_KERNEL64 default "" config ADK_TARGET_CFLAGS @@ -685,7 +675,6 @@ config ADK_TARGET_LIB_GLIBC select ADK_glibc depends on \ ADK_LINUX_ARM || \ - ADK_LINUX_ARMEB || \ ADK_LINUX_M68K || \ ADK_LINUX_MICROBLAZE || \ ADK_LINUX_MIPS || \ @@ -726,25 +715,25 @@ config ADK_TARGET_SUFFIX string default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_eabihf default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_eabi - default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64 && ADK_TARGET_KERNEL64 - default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32 && ADK_TARGET_KERNEL64 - default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32 && ADK_TARGET_KERNEL64 + default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64 + default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32 + default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32 default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_32 && ADK_TARGET_KERNEL64 default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_TARGET_KERNEL64 default "gnu" if ADK_TARGET_LIB_GLIBC 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 && ADK_TARGET_KERNEL64 - default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32 && ADK_TARGET_KERNEL64 - default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32 && ADK_TARGET_KERNEL64 + 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 "uclibc32" if ADK_TARGET_LIB_UCLIBC && ADK_32 && ADK_TARGET_KERNEL64 default "uclibcx32" if ADK_TARGET_LIB_UCLIBC && ADK_x32 && ADK_TARGET_KERNEL64 default "uclibc" if ADK_TARGET_LIB_UCLIBC default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_eabihf default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_eabi - default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 && ADK_TARGET_KERNEL64 - default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 && ADK_TARGET_KERNEL64 - default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 && ADK_TARGET_KERNEL64 + 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 "musl32" if ADK_TARGET_LIB_MUSL && ADK_32 && ADK_TARGET_KERNEL64 default "muslx32" if ADK_TARGET_LIB_MUSL && ADK_x32 && ADK_TARGET_KERNEL64 default "musl" if ADK_TARGET_LIB_MUSL -- cgit v1.2.3 From b42d26ca729134d31887445856c65a85da69fb65 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 6 Mar 2014 17:03:38 +0100 Subject: enable archive mode for microblaze --- target/config/Config.in | 1 - 1 file changed, 1 deletion(-) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index c1d6230dc..913d426c9 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -871,7 +871,6 @@ config ADK_TARGET_ROOTFS_ARCHIVE bool "Archive usable for different filesystems" select ADK_HOST_NEED_GENEXT2FS if ADK_HARDWARE_QEMU select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU - depends on !ADK_LINUX_MICROBLAZE help Use this option if your root filesystem is ext2/ext3/ext4/xfs. -- cgit v1.2.3 From 9451c2a375b4882d56e940096e551fa59022ed55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 7 Mar 2014 08:49:37 +0100 Subject: disable musl for mips64 --- target/config/Config.in | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index d8b73d2fa..669f949a1 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -71,6 +71,10 @@ config ADK_TOOLCHAIN source "target/config/Config.in.arch" source "target/config/Config.in.system" +config ADK_LINUX_MIPS64 + boolean + default y if ADK_LINUX_MIPS && ADK_TARGET_KERNEL64 + choice prompt "Toolchain options" depends on ADK_TOOLCHAIN @@ -692,6 +696,7 @@ config ADK_TARGET_LIB_MUSL prompt "musl C library" boolean select ADK_musl + depends on !ADK_LINUX_MIPS64 depends on \ ADK_LINUX_ARM || \ ADK_LINUX_MICROBLAZE || \ @@ -700,6 +705,7 @@ config ADK_TARGET_LIB_MUSL ADK_LINUX_SH || \ ADK_LINUX_X86 || \ ADK_LINUX_X86_64 + help http://musl-libc.org -- cgit v1.2.3 From 9afcdcff6e924cdd3871dadb554105d412502b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 7 Mar 2014 14:22:28 +0100 Subject: disable x32 for uClibc --- target/config/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index 669f949a1..f805e91ee 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -669,7 +669,7 @@ config ADK_TARGET_LIB_UCLIBC !ADK_LINUX_MICROBLAZE && \ !ADK_LINUX_SPARC64 && \ !ADK_LINUX_PPC64 && \ - !ADK_LINUX_NATIVE + !ADK_TARGET_ABI_X32 help http://uclibc.org -- cgit v1.2.3 From 2d8a3559113a0a2514bbb9ae27b0fce44477f323 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 8 Mar 2014 18:30:46 +0100 Subject: add some usb hid stuff for qemu-sh, you _must_ start qemu-sh with -serial null -serial stdio. otherwise no output. thx to aboriginal linux --- target/config/Config.in | 1 + 1 file changed, 1 insertion(+) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index 5c5f1b6fd..9d8a36b49 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -241,6 +241,7 @@ config ADK_TARGET_QEMU_WITH_GRAPHIC select ADK_KERNEL_KEYBOARD_ATKBD if ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64 select ADK_KERNEL_INPUT_MOUSE select ADK_KERNEL_INPUT_MOUSEDEV + select ADK_KERNEL_USB_HID if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB endchoice -- cgit v1.2.3 From 43f399db72ca82f186ce7040fc39794b102c263f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 8 Mar 2014 19:06:59 +0100 Subject: some work on qemu with graphic --- target/config/Config.in | 1 + 1 file changed, 1 insertion(+) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index 5c5f1b6fd..d6e795712 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -619,6 +619,7 @@ config ADK_TARGET_CMDLINE default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_INTEL_ATOM default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_I686 + default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_X86_64 default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SPARC64 default "console=ttyS0,9600 console=tty0" if ADK_TARGET_SYSTEM_QEMU_PPC default "console=hvc0 console=tty0" if ADK_TARGET_SYSTEM_QEMU_PPC64 -- cgit v1.2.3 From 2708ff4af251bd016aa45971aa6c03a2eeaeeff1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Mar 2014 19:34:28 +0100 Subject: convert lemote yeelong to miniconfig --- target/config/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'target/config/Config.in') diff --git a/target/config/Config.in b/target/config/Config.in index c50fbd289..3de5e3a23 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -213,6 +213,7 @@ config ADK_TARGET_KERNEL_MINICONFIG default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS + default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG config ADK_QEMU_ARGS string @@ -612,7 +613,7 @@ config ADK_TARGET_CFLAGS config ADK_TARGET_CMDLINE string default "dwc_otg.fiq_split_enable=1" if ADK_TARGET_SYSTEM_RASPBERRY_PI - default "console=tty no_auto_cmd" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default "console=ttymxc0,115200" if ADK_TARGET_SYSTEM_CUBOX_I default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100 default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP -- cgit v1.2.3