Browse Source

use gcc 4.7.3 for sparc, 4.8.2 breaks kernel bootup, minor cleanup

Waldemar Brodkorb 10 years ago
parent
commit
6c26b8016d

+ 6 - 5
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
 
 

+ 0 - 2
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

+ 0 - 2
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

+ 0 - 2
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

+ 2 - 0
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

+ 0 - 3
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

+ 0 - 3
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

+ 5 - 0
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