Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 67 insertions, 75 deletions

diff --git a/target/config/Config.in b/target/config/Config.in
index be008f97e..3de5e3a23 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
@@ -87,8 +91,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 +135,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 +156,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"
@@ -219,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
@@ -247,6 +242,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
 
@@ -336,10 +332,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 +424,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
@@ -565,8 +554,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
@@ -577,26 +566,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
@@ -624,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
@@ -632,6 +621,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
@@ -682,7 +672,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
 
@@ -692,7 +682,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 || \
@@ -710,6 +699,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 || \
@@ -718,6 +708,7 @@ config ADK_TARGET_LIB_MUSL
 		ADK_LINUX_SH || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64
+		
 	help
  	 http://musl-libc.org
 
@@ -733,25 +724,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
@@ -902,7 +893,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.
 
diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index c8f820321..7544723bf 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -12,6 +12,13 @@ config ADK_HOST
 	help
 	  Configure host for IPKG package management.
 
+config ADK_DL_DIR
+	string "download directory for packages"
+	default ""
+	help
+	  Configure the download directory for all source packages.
+	  Use an absolute path.
+
 config ADK_DEBUG
 	bool "Compile applications with debug support by default"
 	default n
@@ -46,6 +53,7 @@ config ADK_WGET_TIMEOUT
 
 config ADK_USE_CCACHE
 	bool "Use ccache to speedup recompilation"
+	select ADK_HOST_NEED_CCACHE
 	default n
 	help
 	  Useful if you have enough space for the cache and need speedup compilation.
diff --git a/target/config/Config.in.arch.choice b/target/config/Config.in.arch.choice
index a147a0251..c2fc7f2f3 100644
--- a/target/config/Config.in.arch.choice
+++ b/target/config/Config.in.arch.choice
@@ -4,16 +4,6 @@ prompt "Target architecture"
 config ADK_CHOOSE_TARGET_ARCH
 	bool "Choose target architecture"
 
-config ADK_LINUX_NATIVE
-	bool "native build"
-	select ADK_native
-	select ADK_NATIVE
-	select ADK_TARGET_LIB_LIBC
-	depends on ADK_HOST_LINUX
-	help
-	  Make a native build. Use host tools.
-	  No toolchain will be created.
-
 config ADK_LINUX_ARM
 	bool "arm system"
 	select ADK_arm
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index c28fd55a3..7848a25ce 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -38,8 +38,8 @@ config ADK_RUNTIME_TIMEZONE
 
 choice
 prompt "Console output on embedded system"
-default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_QEMU_SH4 && !ADK_TARGET_SYSTEM_QEMU_SH4EB && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 default ADK_RUNTIME_CONSOLE_SERIAL
 
 config ADK_RUNTIME_CONSOLE_VGA
@@ -50,7 +50,7 @@ config ADK_RUNTIME_CONSOLE_VGA
 config ADK_RUNTIME_CONSOLE_SERIAL
 	bool "console output on serial"
 	help
-	  Start getty on serial console. (ttyS0)
+	  Start getty on serial console.
 
 config ADK_RUNTIME_CONSOLE_BOTH
 	bool "console output on VGA and serial"
@@ -74,7 +74,14 @@ config ADK_RUNTIME_KBD_LAYOUT
 
 choice
 prompt "Initial login shell for the root user"
-default ADK_ROOTSH_ASH
+default ADK_ROOTSH_MKSH
+
+config ADK_ROOTSH_MKSH
+	select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY
+	bool "mksh (MirBSD Korn Shell)"
+	help
+	  Use mksh (a Korn Shell variant) as standard login shell
+	  for the superuser.
 
 config ADK_ROOTSH_ASH
 	select BUSYBOX_ASH
@@ -90,13 +97,6 @@ config ADK_ROOTSH_BASH
 	help
 	  Use GNU bash as standard login shell for the superuser.
 
-config ADK_ROOTSH_MKSH
-	select ADK_PACKAGE_MKSH
-	bool "mksh (MirBSD Korn Shell)"
-	help
-	  Use mksh (a Korn Shell variant) as standard login shell
-	  for the superuser.
-
 config ADK_ROOTSH_TCSH
 	select ADK_PACKAGE_TCSH
 	bool "tcsh (Tenex C Shell)"
@@ -114,7 +114,14 @@ endchoice
 
 choice
 prompt "System /bin/sh (POSIX script shell)"
-default ADK_BINSH_ASH
+default ADK_BINSH_MKSH
+
+config ADK_BINSH_MKSH
+	select ADK_PACKAGE_MKSH if !ADK_TOOLCHAIN_ONLY
+	bool "mksh (MirBSD Korn Shell)"
+	help
+	  Use mksh (a Korn Shell variant) as system shell, which is
+	  both small and powerful, so quite suited for this task.
 
 config ADK_BINSH_ASH
 	select BUSYBOX_ASH
@@ -131,13 +138,6 @@ config ADK_BINSH_BASH
 	  Use GNU bash as system shell. This is discouraged due to
 	  its size and slowness.
 
-config ADK_BINSH_MKSH
-	select ADK_PACKAGE_MKSH
-	bool "mksh (MirBSD Korn Shell)"
-	help
-	  Use mksh (a Korn Shell variant) as system shell, which is
-	  both small and powerful, so quite suited for this task.
-
 config ADK_BINSH_ZSH
 	select ADK_PACKAGE_ZSH
 	bool "zsh (The Z Shell)"
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index d863179b8..c4dcdace4 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -34,6 +34,10 @@ config ADK_HOST_NEED_XZ
 	boolean
 	default n
 
+config ADK_HOST_NEED_CCACHE
+	boolean
+	default n
+
 config ADK_TOOLS_ADDPATTERN_ARGS
 	string
 	default "-p W54G -v v4.20.6" if ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G