diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-05 12:54:21 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-05 12:54:21 +0100 |
commit | 47700fbf1cafdcb6b697ecb02f11363173e6b008 (patch) | |
tree | 5d4c104d81f7fe43d380c97fec2bdd53f84cc9fa /target | |
parent | f48a3ede4e7b99a0a58262a88b632ee01d7d3a0a (diff) | |
parent | 7e783125e4ba1ad319febf468e2e6e90e4c0ff42 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r-- | target/arm/sys-available/acmesystems-foxg20 | 3 | ||||
-rw-r--r-- | target/arm/sys-available/cubox-i | 2 | ||||
-rw-r--r-- | target/arm/sys-available/keyasic-ka2000 | 2 | ||||
-rw-r--r-- | target/arm/sys-available/raspberry-pi | 2 | ||||
-rw-r--r-- | target/arm/sys-available/sharp-zaurus | 2 | ||||
-rw-r--r-- | target/arm/sys-available/toolchain-arm | 2 | ||||
-rw-r--r-- | target/arm/sys-available/toolchain-armhf | 4 | ||||
-rw-r--r-- | target/config/Config.in | 69 | ||||
-rw-r--r-- | target/linux/config/Config.in.graphics | 24 | ||||
-rw-r--r-- | target/linux/config/Config.in.input | 49 | ||||
-rw-r--r-- | target/linux/patches/3.13.5/ppc64-missing_arch_random.patch | 11 | ||||
-rw-r--r-- | target/sh/Makefile | 6 | ||||
-rw-r--r-- | target/sh/kernel/qemu-sh | 23 | ||||
-rw-r--r-- | target/sh/sys-available/qemu-sh4 | 3 | ||||
-rw-r--r-- | target/sh/sys-available/qemu-sh4eb | 2 | ||||
-rw-r--r-- | target/x86/sys-available/qemu-i686 | 2 |
16 files changed, 95 insertions, 111 deletions
diff --git a/target/arm/sys-available/acmesystems-foxg20 b/target/arm/sys-available/acmesystems-foxg20 index 576468bbe..b907d39c8 100644 --- a/target/arm/sys-available/acmesystems-foxg20 +++ b/target/arm/sys-available/acmesystems-foxg20 @@ -2,13 +2,14 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 bool "Foxboard FOXG20" select ADK_arm select ADK_little + select ADK_soft_float + select ADK_eabi select ADK_acmesystems_foxg20 select ADK_KERNEL_ARCH_AT91 select ADK_KERNEL_ARCH_AT91SAM9260 select ADK_KERNEL_ARCH_AT91SAM9G20 select ADK_KERNEL_MACH_ACMENETUSFOXG20 select ADK_KERNEL_AEABI - select ADK_EABI select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_WITH_MMC select ADK_TARGET_WITH_RTC diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i index f7a4f59bc..3ee6bb8cd 100644 --- a/target/arm/sys-available/cubox-i +++ b/target/arm/sys-available/cubox-i @@ -3,9 +3,9 @@ config ADK_TARGET_SYSTEM_CUBOX_I select ADK_arm select ADK_little select ADK_hard_float + select ADK_eabihf select ADK_cubox_i select ADK_CPU_CORTEX_A9 - select ADK_EABIHF select ADK_TARGET_WITH_MMC select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_USB diff --git a/target/arm/sys-available/keyasic-ka2000 b/target/arm/sys-available/keyasic-ka2000 index 36434269c..1610d4b42 100644 --- a/target/arm/sys-available/keyasic-ka2000 +++ b/target/arm/sys-available/keyasic-ka2000 @@ -3,8 +3,8 @@ config ADK_TARGET_SYSTEM_KEYASIC_KA2000 select ADK_arm select ADK_little select ADK_soft_float + select ADK_eabi select ADK_keyasic_ka2000 - select ADK_EABI select ADK_CPU_ARM926EJ_S select ADK_TOOLCHAIN select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index ecf224a1a..3c0f2ad30 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -3,9 +3,9 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_arm select ADK_little select ADK_hard_float + select ADK_eabihf select ADK_raspberry_pi select ADK_CPU_ARM1176JZF_S - select ADK_EABIHF select ADK_TARGET_WITH_MMC select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_USB diff --git a/target/arm/sys-available/sharp-zaurus b/target/arm/sys-available/sharp-zaurus index 0f124719d..a58401cf3 100644 --- a/target/arm/sys-available/sharp-zaurus +++ b/target/arm/sys-available/sharp-zaurus @@ -3,7 +3,7 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS select ADK_arm select ADK_sharp_zaurus select ADK_little - select ADK_EABI + select ADK_eabi select ADK_CPU_XSCALE select ADK_TARGET_CPU_WITH_IWMMXT select ADK_TARGET_WITH_VGA diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm index 2cbe76a2e..c6bb00b43 100644 --- a/target/arm/sys-available/toolchain-arm +++ b/target/arm/sys-available/toolchain-arm @@ -4,8 +4,8 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM select ADK_toolchain_arm select ADK_little select ADK_soft_float + select ADK_eabi select ADK_TOOLCHAIN - select ADK_EABI select ADK_TARGET_PACKAGE_TGZ help ARM toolchain (soft float). diff --git a/target/arm/sys-available/toolchain-armhf b/target/arm/sys-available/toolchain-armhf index 0517118c3..89383f44f 100644 --- a/target/arm/sys-available/toolchain-armhf +++ b/target/arm/sys-available/toolchain-armhf @@ -1,11 +1,11 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMHF bool "Toolchain only (hard float)" select ADK_arm - select ADK_toolchain_armhf select ADK_little select ADK_hard_float + select ADK_eabihf + select ADK_toolchain_armhf select ADK_TOOLCHAIN - select ADK_EABIHF select ADK_TARGET_PACKAGE_TGZ help ARM toolchain (hard float). diff --git a/target/config/Config.in b/target/config/Config.in index 44ee685fe..be008f97e 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -117,14 +117,20 @@ config ADK_n32 config ADK_n64 boolean +config ADK_eabi + boolean + +config ADK_eabihf + boolean + config ADK_TARGET_ABI string default "n32" if ADK_n32 default "n64" if ADK_n64 default "32" if ADK_32 default "x32" if ADK_x32 - default "eabi" if ADK_EABI - default "eabihf" if ADK_EABIHF + default "eabi" if ADK_eabi + default "eabihf" if ADK_eabihf config ADK_TARGET_MIPS_ABI depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS @@ -214,6 +220,36 @@ config ADK_TARGET_KERNEL_MINICONFIG default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS +config ADK_QEMU_ARGS + string + default "-nographic" if ADK_TARGET_QEMU_WITHOUT_GRAPHIC + +choice +prompt "Qemu Emulation with graphical output" +depends on ADK_HARDWARE_QEMU + +config ADK_TARGET_QEMU_WITHOUT_GRAPHIC + boolean "disabled" + +config ADK_TARGET_QEMU_WITH_GRAPHIC + boolean "enabled" + select ADK_KERNEL_VT + select ADK_KERNEL_VT_CONSOLE + select ADK_KERNEL_FONTS + select ADK_KERNEL_FONT_8x16 + select ADK_KERNEL_FB + select ADK_KERNEL_FRAMEBUFFER_CONSOLE + select ADK_KERNEL_FB_SM501 if ADK_TARGET_SYSTEM_QEMU_SH4 || ADK_TARGET_SYSTEM_QEMU_SH4EB + select ADK_KERNEL_FB_CIRRUS if ADK_TARGET_SYSTEM_QEMU_I686 || ADK_TARGET_SYSTEM_QEMU_X86_64 + select ADK_KERNEL_FB_PXA if ADK_TARGET_QEMU_ARM_MODEL_SPITZ + select ADK_KERNEL_INPUT + select ADK_KERNEL_INPUT_KEYBOARD + 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 + +endchoice + choice prompt "Qemu Emulation using VirtIO drivers" depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 @@ -251,19 +287,19 @@ depends on ADK_TARGET_SYSTEM_QEMU_ARM config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB boolean "ARM Ltd. Versatile/PB" select ADK_soft_float - select ADK_EABI + select ADK_eabi select ADK_CPU_ARM926EJ_S config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 boolean "ARM Ltd. Versatile Express for Cortex-A9" select ADK_hard_float - select ADK_EABIHF + select ADK_eabihf select ADK_CPU_CORTEX_A9 config ADK_TARGET_QEMU_ARM_MODEL_SPITZ boolean "Xscale PXA270 Spitz PDA" select ADK_soft_float - select ADK_EABI + select ADK_eabi select ADK_CPU_XSCALE select ADK_TARGET_WITH_VGA @@ -387,12 +423,6 @@ config ADK_TARGET_KERNEL_MAY_64BIT config ADK_TOOLCHAIN_ONLY boolean -config ADK_EABI - boolean - -config ADK_EABIHF - boolean - config ADK_LINUX_64 boolean @@ -579,7 +609,7 @@ config ADK_TARGET_CFLAGS default "-march=atom" if ADK_CPU_ATOM default "-march=amdfam10" if ADK_CPU_AMDFAM10 default "-mcpu=v8" if ADK_CPU_SPARC_V8 - default "-m64 -mcpu=v9" if ADK_CPU_SPARC_V9 + default "-m64 -mcpu=ultrasparc" if ADK_CPU_SPARC_V9 default "-march=loongson2f -Wa,-mfix-loongson2f-nop" if ADK_CPU_LOONGSON2F default "-march=mips32" if ADK_CPU_MIPS32 default "-march=mips64" if ADK_CPU_MIPS64 @@ -612,7 +642,8 @@ config ADK_TARGET_CMDLINE default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default "console=ttySC1 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH + default "console=ttySC1 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH4 + default "console=ttySC1 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH4EB default "console=ttyS0" if ADK_TARGET_SYSTEM_ARANYM_M68K default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 @@ -700,24 +731,24 @@ endchoice config ADK_TARGET_SUFFIX string - default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_EABIHF - default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_EABI + 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 "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 "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 "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 "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 diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index f6f3962cf..477541478 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -33,9 +33,19 @@ config ADK_KERNEL_FB config ADK_KERNEL_FRAMEBUFFER_CONSOLE boolean +config ADK_KERNEL_MFD_SM501 + boolean + +config ADK_KERNEL_FB_CIRRUS + boolean + config ADK_KERNEL_FB_GEODE boolean +config ADK_KERNEL_FB_SM501 + select ADK_KERNEL_MFD_SM501 + boolean + config ADK_KERNEL_DRM boolean @@ -74,26 +84,14 @@ config ADK_KERNEL_FB_VESA help Framebuffer support for VirtualBox Emulator. -config ADK_KERNEL_FB_CIRRUS - prompt "................................ Framebuffer support for QEMU Emulator (Cirrus)" - boolean - select ADK_KERNEL_FB - select ADK_KERNEL_FRAMEBUFFER_CONSOLE - default y if ADK_TARGET_SYSTEM_QEMU_I686 - default n - depends on ADK_TARGET_SYSTEM_QEMU_I686 - help - Framebuffer support for Qemu Emulator. - config ADK_KERNEL_FB_PXA prompt "................................ Framebuffer support for Sharp Zaurus" tristate select ADK_KERNEL_FB select ADK_KERNEL_FRAMEBUFFER_CONSOLE default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ default n - depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS || ADK_TARGET_QEMU_ARM_MODEL_SPITZ + depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS help Framebuffer support for Sharp Zaurus CL Series. diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 37ad2172b..939354881 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -1,22 +1,12 @@ -menu "Input devices" -depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCHSCREEN - config ADK_KERNEL_INPUT boolean - default y if ADK_TARGET_SYSTEM_QEMU_I686 - default y if ADK_TARGET_SYSTEM_QEMU_X86_64 - default y if ADK_TARGET_SYSTEM_QEMU_SH4 default y if ADK_TARGET_SYSTEM_ARANYM_M68K default y if ADK_TARGET_SYSTEM_VBOX_I686 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_TAROX_PC - default y if ADK_NATIVE_SYSTEM_TAROX_PC - default y if ADK_TARGET_SYSTEM_INTEL_ATOM - default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76 + default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n @@ -67,72 +57,48 @@ config ADK_KERNEL_INPUT_EVDEV config ADK_KERNEL_INPUT_KEYBOARD boolean - default y if ADK_TARGET_SYSTEM_QEMU_I686 - default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_ARANYM_M68K default y if ADK_TARGET_SYSTEM_VBOX_I686 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_TAROX_PC - default y if ADK_NATIVE_SYSTEM_TAROX_PC - default y if ADK_TARGET_SYSTEM_INTEL_ATOM - default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76 + default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n config ADK_KERNEL_KEYBOARD_ATKBD boolean - default y if ADK_TARGET_SYSTEM_QEMU_I686 - default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_VBOX_I686 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_TAROX_PC - default y if ADK_NATIVE_SYSTEM_TAROX_PC - default y if ADK_TARGET_SYSTEM_INTEL_ATOM - default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76 + default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG default n config ADK_KERNEL_INPUT_MOUSE boolean - default y if ADK_TARGET_SYSTEM_QEMU_I686 - default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_ARANYM_M68K default y if ADK_TARGET_SYSTEM_VBOX_I686 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_TAROX_PC - default y if ADK_NATIVE_SYSTEM_TAROX_PC - default y if ADK_TARGET_SYSTEM_INTEL_ATOM - default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76 + default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n config ADK_KERNEL_INPUT_MOUSEDEV boolean - default y if ADK_TARGET_SYSTEM_QEMU_I686 - default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_VBOX_I686 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_TAROX_PC - default y if ADK_NATIVE_SYSTEM_TAROX_PC - default y if ADK_TARGET_SYSTEM_INTEL_ATOM - default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76 + default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n @@ -151,6 +117,8 @@ config ADK_KERNEL_HID_GENERIC select ADK_KERNEL_HID_SUPPORT default n +menu "Input devices" +depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT || ADK_TARGET_WITH_TOUCHSCREEN config ADK_KPACKAGE_KMOD_USB_HID prompt "kmod-usb-hid..................... USB keyboard/mouse support" @@ -164,7 +132,8 @@ 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 + 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/patches/3.13.5/ppc64-missing_arch_random.patch b/target/linux/patches/3.13.5/ppc64-missing_arch_random.patch new file mode 100644 index 000000000..b341a7be5 --- /dev/null +++ b/target/linux/patches/3.13.5/ppc64-missing_arch_random.patch @@ -0,0 +1,11 @@ +diff -Nur linux-3.13.5.orig/arch/powerpc/platforms/pseries/Kconfig linux-3.13.5/arch/powerpc/platforms/pseries/Kconfig +--- linux-3.13.5.orig/arch/powerpc/platforms/pseries/Kconfig 2014-02-22 22:35:30.000000000 +0100 ++++ linux-3.13.5/arch/powerpc/platforms/pseries/Kconfig 2014-03-04 13:55:06.000000000 +0100 +@@ -20,6 +20,7 @@ + select PPC_DOORBELL + select HAVE_CONTEXT_TRACKING + select HOTPLUG_CPU if SMP ++ select ARCH_RANDOM + default y + + config PPC_SPLPAR diff --git a/target/sh/Makefile b/target/sh/Makefile index 98c5fb3ce..da733acac 100644 --- a/target/sh/Makefile +++ b/target/sh/Makefile @@ -18,7 +18,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} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' + @echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif endif ifeq ($(ADK_TARGET_FS),initramfs) @@ -28,7 +28,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} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' + @echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL) -initrd ${FW_DIR}/${INITRAMFS}' endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) @@ -37,6 +37,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} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)' + @echo 'qemu-system-${CPU_ARCH} ${ADK_QEMU_ARGS} -M r2d -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif diff --git a/target/sh/kernel/qemu-sh b/target/sh/kernel/qemu-sh index 9ea0e8595..5c38a01fb 100644 --- a/target/sh/kernel/qemu-sh +++ b/target/sh/kernel/qemu-sh @@ -13,6 +13,7 @@ CONFIG_SH_RTS7751R2D=y CONFIG_RTS7751R2D_PLUS=y CONFIG_SH_TIMER_TMU=y CONFIG_SH_INTC=y +CONFIG_CMDLINE_OVERWRITE=y CONFIG_PCI=y CONFIG_PCI_DOMAINS=y CONFIG_SCSI=y @@ -34,25 +35,3 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=2 CONFIG_SERIAL_SH_SCI_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_MFD_SM501=y -CONFIG_VGA_ARB=y -CONFIG_VGA_ARB_MAX_GPUS=16 -CONFIG_VIDEO_OUTPUT_CONTROL=m -CONFIG_FB=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m -CONFIG_FB_SYS_FOPS=m -CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_BACKLIGHT=y -CONFIG_FB_SH_MOBILE_LCDC=m -CONFIG_FB_SM501=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FONT_8x16=y diff --git a/target/sh/sys-available/qemu-sh4 b/target/sh/sys-available/qemu-sh4 index c0382755a..83a645d65 100644 --- a/target/sh/sys-available/qemu-sh4 +++ b/target/sh/sys-available/qemu-sh4 @@ -4,9 +4,8 @@ config ADK_TARGET_SYSTEM_QEMU_SH4 select ADK_little select ADK_qemu_sh4 select ADK_CPU_SH4 + select ADK_KERNEL_CPU_LITTLE_ENDIAN select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_USB select ADK_USE_KERNEL_MINICONFIG select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/sh/sys-available/qemu-sh4eb b/target/sh/sys-available/qemu-sh4eb index 5f7a15c84..80389775e 100644 --- a/target/sh/sys-available/qemu-sh4eb +++ b/target/sh/sys-available/qemu-sh4eb @@ -6,8 +6,6 @@ config ADK_TARGET_SYSTEM_QEMU_SH4EB select ADK_CPU_SH4 select ADK_KERNEL_CPU_BIG_ENDIAN select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_USB select ADK_USE_KERNEL_MINICONFIG select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/x86/sys-available/qemu-i686 b/target/x86/sys-available/qemu-i686 index 45ecd4b04..42f818a14 100644 --- a/target/x86/sys-available/qemu-i686 +++ b/target/x86/sys-available/qemu-i686 @@ -4,8 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_I686 select ADK_qemu_i686 select ADK_CPU_I686 select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_INPUT select ADK_TARGET_KERNEL_BZIMAGE select ADK_USE_KERNEL_MINICONFIG help |