diff options
| -rw-r--r-- | target/config/Config.in | 11 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mips | 2 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mips64 | 2 | ||||
| -rw-r--r-- | target/mips/kernel/qemu-mipsel | 2 | ||||
| -rw-r--r-- | target/packages/pkg-available/test | 2 | ||||
| -rw-r--r-- | target/x86/kernel/qemu-i686 | 3 | ||||
| -rw-r--r-- | target/x86_64/kernel/qemu-x86_64 | 3 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile.inc | 5 |
8 files changed, 13 insertions, 17 deletions
diff --git a/target/config/Config.in b/target/config/Config.in index ee6aaa695..1baa25317 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -251,7 +251,6 @@ config ADK_TARGET_QEMU_ARM_MODEL_SPITZ select ADK_soft_float select ADK_eabi select ADK_CPU_XSCALE - select ADK_TARGET_WITH_VGA depends on ADK_TARGET_SYSTEM_QEMU_ARM endchoice @@ -304,7 +303,12 @@ endchoice choice prompt "Qemu Emulation using VirtIO drivers" -depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 +depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 || \ + ADK_TARGET_SYSTEM_QEMU_I686 || \ + ADK_TARGET_SYSTEM_QEMU_X86_64 + +config ADK_TARGET_QEMU_WITHOUT_VIRTIO + boolean "disabled" config ADK_TARGET_QEMU_WITH_VIRTIO boolean "enabled" @@ -314,9 +318,6 @@ config ADK_TARGET_QEMU_WITH_VIRTIO select ADK_KERNEL_VIRTIO_NET select ADK_KERNEL_VIRTIO_BLK -config ADK_TARGET_QEMU_WITHOUT_VIRTIO - boolean "disabled" - endchoice diff --git a/target/mips/kernel/qemu-mips b/target/mips/kernel/qemu-mips index 4f5c34fd6..3f06298bf 100644 --- a/target/mips/kernel/qemu-mips +++ b/target/mips/kernel/qemu-mips @@ -12,5 +12,3 @@ CONFIG_E1000=y CONFIG_PHYLIB=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=1 -CONFIG_SERIAL_8250_RUNTIME_UARTS=1 diff --git a/target/mips/kernel/qemu-mips64 b/target/mips/kernel/qemu-mips64 index a3accc1a6..d4ef42c15 100644 --- a/target/mips/kernel/qemu-mips64 +++ b/target/mips/kernel/qemu-mips64 @@ -14,5 +14,3 @@ CONFIG_NET_VENDOR_INTEL=y CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=1 -CONFIG_SERIAL_8250_RUNTIME_UARTS=1 diff --git a/target/mips/kernel/qemu-mipsel b/target/mips/kernel/qemu-mipsel index f1f7adcec..e16f008b7 100644 --- a/target/mips/kernel/qemu-mipsel +++ b/target/mips/kernel/qemu-mipsel @@ -12,5 +12,3 @@ CONFIG_E1000=y CONFIG_PHYLIB=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=1 -CONFIG_SERIAL_8250_RUNTIME_UARTS=1 diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test index ab8e0a75c..7bbbe5310 100644 --- a/target/packages/pkg-available/test +++ b/target/packages/pkg-available/test @@ -4,10 +4,12 @@ config ADK_PKG_TEST select ADK_PACKAGE_STRACE select ADK_PACKAGE_SOCAT select ADK_PACKAGE_MAKE + select ADK_PACKAGE_FILE select ADK_KERNEL_BLK_DEV_INITRD select ADK_KERNEL_COMP_XZ select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ select ADK_SIMPLE_NETWORK_CONFIG + select ADK_KPACKAGE_KMOD_IPV6 default n help Package collection used to build adk-test-framework root diff --git a/target/x86/kernel/qemu-i686 b/target/x86/kernel/qemu-i686 index 275b49592..7eb708745 100644 --- a/target/x86/kernel/qemu-i686 +++ b/target/x86/kernel/qemu-i686 @@ -9,6 +9,3 @@ CONFIG_NET_VENDOR_INTEL=y CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_NR_UARTS=1 -CONFIG_SERIAL_8250_RUNTIME_UARTS=1 diff --git a/target/x86_64/kernel/qemu-x86_64 b/target/x86_64/kernel/qemu-x86_64 index 9c1a14724..e0183cc39 100644 --- a/target/x86_64/kernel/qemu-x86_64 +++ b/target/x86_64/kernel/qemu-x86_64 @@ -24,6 +24,3 @@ CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_PNP=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_NR_UARTS=1 -CONFIG_SERIAL_8250_RUNTIME_UARTS=1 diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index 86a0a5992..25e51178a 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -2,8 +2,13 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= gcc +ifeq ($(ADK_LINUX_SPARC),y) +PKG_VERSION:= 4.7.3 +PKG_MD5SUM:= 86f428a30379bdee0224e353ee2f999e +else PKG_VERSION:= 4.8.2 PKG_MD5SUM:= a3d7d63b9cb6b6ea049469a0c4a43c9d +endif PKG_RELEASE:= 1 PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 |