diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/config/Config.in | 70 | ||||
| -rw-r--r-- | target/config/Config.in.adk | 7 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.input | 7 | ||||
| -rw-r--r-- | target/linux/config/Config.in.usb | 16 | ||||
| -rw-r--r-- | target/linux/patches/3.11.10/startup.patch | 10 | ||||
| -rw-r--r-- | target/linux/patches/3.12.13/startup.patch | 10 | ||||
| -rw-r--r-- | target/linux/patches/3.13.5/startup.patch | 10 | ||||
| -rw-r--r-- | target/linux/patches/3.4.82/startup.patch | 8 | ||||
| -rw-r--r-- | target/mips/sys-available/qemu-mips64 | 3 | ||||
| -rw-r--r-- | target/mips/sys-available/qemu-mips64el | 5 | ||||
| -rw-r--r-- | target/mips/sys-available/toolchain-mips64 | 8 | ||||
| -rw-r--r-- | target/mips/sys-available/toolchain-mips64el | 8 | ||||
| -rw-r--r-- | target/mips/sys-available/toolchain-mips64eln32 | 12 | ||||
| -rw-r--r-- | target/mips/sys-available/toolchain-mips64eln64 | 12 | ||||
| -rw-r--r-- | target/mips/sys-available/toolchain-mips64n32 | 12 | ||||
| -rw-r--r-- | target/mips/sys-available/toolchain-mips64n64 | 12 | ||||
| -rw-r--r-- | target/sh/Makefile | 7 |
18 files changed, 124 insertions, 95 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index 6c6f83249..9d8a36b49 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" @@ -247,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 @@ -558,8 +553,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 +565,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 @@ -675,7 +670,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 @@ -685,7 +680,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 || \ @@ -703,6 +697,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 || \ @@ -711,6 +706,7 @@ config ADK_TARGET_LIB_MUSL ADK_LINUX_SH || \ ADK_LINUX_X86 || \ ADK_LINUX_X86_64 + help http://musl-libc.org @@ -726,25 +722,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 diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index 46de14044..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 diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index b6716cbdd..03cecfca1 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -38,7 +38,7 @@ 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_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 && ADK_TARGET_QEMU_WITH_GRAPHIC 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_SERIAL diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 17c23b65c..5a01ee1e1 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -9,6 +9,10 @@ config ADK_KERNEL_INPUT default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n +config ADK_KERNEL_USB_HID + boolean + default n + config ADK_KERNEL_HID_LOGITECH boolean default n @@ -113,6 +117,7 @@ depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCH config ADK_KPACKAGE_KMOD_USB_HID prompt "kmod-usb-hid..................... USB keyboard/mouse support" tristate + depends on !ADK_KERNEL_USB_HID select ADK_KERNEL_INPUT select ADK_KERNEL_HID select ADK_KERNEL_HID_GENERIC @@ -122,8 +127,6 @@ config ADK_KPACKAGE_KMOD_USB_HID depends on ADK_PACKAGE_KMOD_USB_CONTROLLER depends on ADK_TARGET_WITH_USB default y if ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_TARGET_SYSTEM_QEMU_SH4 && ADK_TARGET_QEMU_WITH_GRAPHIC - default y if ADK_TARGET_SYSTEM_QEMU_SH4EB && ADK_TARGET_QEMU_WITH_GRAPHIC default n config ADK_KERNEL_LOGITECH_DINOVO diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index b2c750673..f6fd22339 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -1,11 +1,23 @@ menu "USB support" -depends on ADK_TARGET_WITH_USB +depends on ADK_TARGET_WITH_USB || ADK_HARDWARE_QEMU config ADK_KERNEL_USB_SUPPORT boolean config ADK_KERNEL_USB select ADK_KERNEL_USB_SUPPORT + default y if ADK_TARGET_SYSTEM_QEMU_SH4 + default y if ADK_TARGET_SYSTEM_QEMU_SH4EB + boolean + +config ADK_KERNEL_USB_OHCI_HCD + default y if ADK_TARGET_SYSTEM_QEMU_SH4 + default y if ADK_TARGET_SYSTEM_QEMU_SH4EB + boolean + +config ADK_KERNEL_USB_OHCI_HCD_PLATFORM + default y if ADK_TARGET_SYSTEM_QEMU_SH4 + default y if ADK_TARGET_SYSTEM_QEMU_SH4EB boolean config ADK_KERNEL_USB_LIBUSUAL @@ -36,7 +48,6 @@ config ADK_KPACKAGE_KMOD_USB select ADK_KERNEL_USB_SUPPORT depends on !ADK_KERNEL_USB default y if ADK_TARGET_SYSTEM_QEMU_I686 - default y if ADK_TARGET_SYSTEM_QEMU_SH4 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 @@ -108,6 +119,7 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_QEMU_SH4 + default y if ADK_TARGET_SYSTEM_QEMU_SH4EB default n help The Open Host Controller Interface (OHCI) is a standard for accessing diff --git a/target/linux/patches/3.11.10/startup.patch b/target/linux/patches/3.11.10/startup.patch index d23d6d212..4dccae8c1 100644 --- a/target/linux/patches/3.11.10/startup.patch +++ b/target/linux/patches/3.11.10/startup.patch @@ -1,16 +1,6 @@ diff -Nur linux-3.7.3.orig/init/main.c linux-3.7.3/init/main.c --- linux-3.7.3.orig/init/main.c 2013-01-17 17:47:40.000000000 +0100 +++ linux-3.7.3/init/main.c 2013-01-19 15:08:13.000000000 +0100 -@@ -834,7 +834,8 @@ - printk(KERN_WARNING "Failed to execute %s. Attempting " - "defaults...\n", execute_command); - } -- if (!run_init_process("/sbin/init") || -+ if (!run_init_process("/init") || -+ !run_init_process("/sbin/init") || - !run_init_process("/etc/init") || - !run_init_process("/bin/init") || - !run_init_process("/bin/sh")) @@ -879,6 +880,8 @@ if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) printk(KERN_WARNING "Warning: unable to open an initial console.\n"); diff --git a/target/linux/patches/3.12.13/startup.patch b/target/linux/patches/3.12.13/startup.patch index d23d6d212..4dccae8c1 100644 --- a/target/linux/patches/3.12.13/startup.patch +++ b/target/linux/patches/3.12.13/startup.patch @@ -1,16 +1,6 @@ diff -Nur linux-3.7.3.orig/init/main.c linux-3.7.3/init/main.c --- linux-3.7.3.orig/init/main.c 2013-01-17 17:47:40.000000000 +0100 +++ linux-3.7.3/init/main.c 2013-01-19 15:08:13.000000000 +0100 -@@ -834,7 +834,8 @@ - printk(KERN_WARNING "Failed to execute %s. Attempting " - "defaults...\n", execute_command); - } -- if (!run_init_process("/sbin/init") || -+ if (!run_init_process("/init") || -+ !run_init_process("/sbin/init") || - !run_init_process("/etc/init") || - !run_init_process("/bin/init") || - !run_init_process("/bin/sh")) @@ -879,6 +880,8 @@ if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) printk(KERN_WARNING "Warning: unable to open an initial console.\n"); diff --git a/target/linux/patches/3.13.5/startup.patch b/target/linux/patches/3.13.5/startup.patch index bfe3ae6ec..be4ea469d 100644 --- a/target/linux/patches/3.13.5/startup.patch +++ b/target/linux/patches/3.13.5/startup.patch @@ -1,16 +1,6 @@ diff -Nur linux-3.13.3.orig/init/main.c linux-3.13.3/init/main.c --- linux-3.13.3.orig/init/main.c 2014-02-13 23:00:14.000000000 +0100 +++ linux-3.13.3/init/main.c 2014-02-17 11:35:14.000000000 +0100 -@@ -871,7 +871,8 @@ - pr_err("Failed to execute %s (error %d). Attempting defaults...\n", - execute_command, ret); - } -- if (!try_to_run_init_process("/sbin/init") || -+ if (!try_to_run_init_process("/init") || -+ !try_to_run_init_process("/sbin/init") || - !try_to_run_init_process("/etc/init") || - !try_to_run_init_process("/bin/init") || - !try_to_run_init_process("/bin/sh")) @@ -916,6 +917,8 @@ if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) pr_err("Warning: unable to open an initial console.\n"); diff --git a/target/linux/patches/3.4.82/startup.patch b/target/linux/patches/3.4.82/startup.patch index 68e8987b0..4f47eddcb 100644 --- a/target/linux/patches/3.4.82/startup.patch +++ b/target/linux/patches/3.4.82/startup.patch @@ -1,14 +1,6 @@ diff -Nur linux-2.6.34.orig/init/main.c linux-2.6.34/init/main.c --- linux-2.6.34.orig/init/main.c 2010-05-16 23:17:36.000000000 +0200 +++ linux-2.6.34/init/main.c 2010-05-20 20:13:26.321613615 +0200 -@@ -842,6 +842,7 @@ - printk(KERN_WARNING "Failed to execute %s. Attempting " - "defaults...\n", execute_command); - } -+ run_init_process("/init"); - run_init_process("/sbin/init"); - run_init_process("/etc/init"); - run_init_process("/bin/init"); @@ -889,6 +890,8 @@ if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) printk(KERN_WARNING "Warning: unable to open an initial console.\n"); diff --git a/target/mips/sys-available/qemu-mips64 b/target/mips/sys-available/qemu-mips64 index 7a7562edc..924c70bc4 100644 --- a/target/mips/sys-available/qemu-mips64 +++ b/target/mips/sys-available/qemu-mips64 @@ -4,9 +4,8 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64 select ADK_big select ADK_qemu_mips64 select ADK_CPU_MIPS64 + select ADK_LINUX_64 select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_INPUT select ADK_TARGET_KERNEL_VMLINUZ select ADK_USE_KERNEL_MINICONFIG help diff --git a/target/mips/sys-available/qemu-mips64el b/target/mips/sys-available/qemu-mips64el index 34d44c054..14b548632 100644 --- a/target/mips/sys-available/qemu-mips64el +++ b/target/mips/sys-available/qemu-mips64el @@ -4,12 +4,9 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS64EL select ADK_little select ADK_qemu_mips64el select ADK_CPU_MIPS64 - select ADK_TARGET_KERNEL64 + select ADK_LINUX_64 select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_INPUT select ADK_TARGET_KERNEL_VMLINUZ select ADK_USE_KERNEL_MINICONFIG help Qemu support for mips64 little endian architecture. - diff --git a/target/mips/sys-available/toolchain-mips64 b/target/mips/sys-available/toolchain-mips64 index 9cc19e299..e9ea69170 100644 --- a/target/mips/sys-available/toolchain-mips64 +++ b/target/mips/sys-available/toolchain-mips64 @@ -1,10 +1,12 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64 - bool "Toolchain only (mips64 big endian)" + bool "Toolchain only (mips64 big endian o32 ABI)" select ADK_mips select ADK_big - select ADK_CPU_MIPS64 + select ADK_o32 select ADK_toolchain_mips64 + select ADK_CPU_MIPS64 + select ADK_LINUX_64 select ADK_TOOLCHAIN select ADK_TARGET_PACKAGE_TGZ help - MIPS64 big endian toolchain. + MIPS64 big endian o32 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64el b/target/mips/sys-available/toolchain-mips64el index 2cb27d99c..0d54692ee 100644 --- a/target/mips/sys-available/toolchain-mips64el +++ b/target/mips/sys-available/toolchain-mips64el @@ -1,10 +1,12 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64EL - bool "Toolchain only (mips64 little endian)" + bool "Toolchain only (mips64 little endian o32 ABI)" select ADK_mips select ADK_little - select ADK_CPU_MIPS64 + select ADK_o32 select ADK_toolchain_mips64el + select ADK_CPU_MIPS64 + select ADK_LINUX_64 select ADK_TOOLCHAIN select ADK_TARGET_PACKAGE_TGZ help - MIPS64 little endian toolchain. + MIPS64 little endian o32 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64eln32 b/target/mips/sys-available/toolchain-mips64eln32 new file mode 100644 index 000000000..9c0f44381 --- /dev/null +++ b/target/mips/sys-available/toolchain-mips64eln32 @@ -0,0 +1,12 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64ELN32 + bool "Toolchain only (mips64 little endian n32 ABI)" + select ADK_mips + select ADK_little + select ADK_n32 + select ADK_toolchain_mips64el + select ADK_CPU_MIPS64 + select ADK_LINUX_64 + select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ + help + MIPS64 little endian n32 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64eln64 b/target/mips/sys-available/toolchain-mips64eln64 new file mode 100644 index 000000000..2795598d8 --- /dev/null +++ b/target/mips/sys-available/toolchain-mips64eln64 @@ -0,0 +1,12 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64ELN64 + bool "Toolchain only (mips64 little endian n64 ABI)" + select ADK_mips + select ADK_little + select ADK_n64 + select ADK_toolchain_mips64el + select ADK_CPU_MIPS64 + select ADK_LINUX_64 + select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ + help + MIPS64 little endian n64 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64n32 b/target/mips/sys-available/toolchain-mips64n32 new file mode 100644 index 000000000..e2acd59b3 --- /dev/null +++ b/target/mips/sys-available/toolchain-mips64n32 @@ -0,0 +1,12 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64N32 + bool "Toolchain only (mips64 big endian n32 ABI)" + select ADK_mips + select ADK_big + select ADK_n32 + select ADK_toolchain_mips64 + select ADK_CPU_MIPS64 + select ADK_LINUX_64 + select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ + help + MIPS64 big endian n64 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64n64 b/target/mips/sys-available/toolchain-mips64n64 new file mode 100644 index 000000000..e544008f4 --- /dev/null +++ b/target/mips/sys-available/toolchain-mips64n64 @@ -0,0 +1,12 @@ +config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64N64 + bool "Toolchain only (mips64 big endian n64 ABI)" + select ADK_mips + select ADK_big + select ADK_n64 + select ADK_toolchain_mips64 + select ADK_CPU_MIPS64 + select ADK_LINUX_64 + select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ + help + MIPS64 big endian n64 ABI toolchain. diff --git a/target/sh/Makefile b/target/sh/Makefile index da733acac..3cf65f614 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -8,6 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/sh/boot/zImage +QEMU_ARGS:=${ADK_QEMU_ARGS} -monitor null -serial null -serial stdio ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @@ -18,7 +19,7 @@ ifneq ($(ADK_HARDWARE_QEMU),) @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -28,7 +29,7 @@ imageinstall: $(FW_DIR)/$(INITRAMFS) @echo 'The initramfs image is: ${FW_DIR}/${INITRAMFS}' ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -37,6 +38,6 @@ imageinstall: createinitramfs @echo 'The kernel+initramfs file is: $(FW_DIR)/${TARGET_KERNEL}' ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Start qemu with following command line:" - @echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${CPU_ARCH} ${QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif |