fix uclibc compile for qemu-arm (experimental fix), use DODEBUG as default

11 files changed, 18 insertions, 21 deletions

diff --git a/target/arm/Makefile b/target/arm/Makefile
index 9ac81e8f1..329a46ea1 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -23,7 +23,7 @@ ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB),y)
 QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111
 endif
 ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y)
-QEMU_ARGS+=vexpress-a9 -cpu cortex-a9 -net user -net nic,model=lan9118
+QEMU_ARGS+=-M vexpress-a9 -cpu cortex-a9 -net user -net nic,model=lan9118
 endif
 ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
 QEMU_ARGS+=-drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user
diff --git a/target/arm/uclibc.config b/target/arm/uclibc.config
index 54e503e12..29954dde8 100644
--- a/target/arm/uclibc.config
+++ b/target/arm/uclibc.config
@@ -244,8 +244,7 @@ UCLIBC_BUILD_NOEXECSTACK=y
 #
 CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-DOSTRIP=y
+DODEBUG=y
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index 5e153aae1..36600fe87 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -200,13 +200,10 @@ config ADK_KERNEL_E1000
 	select ADK_KERNEL_NETDEV_1000
 	depends on ADK_TARGET_WITH_PCI || ADK_TARGET_QEMU
 	default y if ADK_TARGET_SYSTEM_IBM_X40
-	default y if ADK_TARGET_SYSTEM_QEMU_I486
-	default y if ADK_TARGET_SYSTEM_QEMU_I686
+	default y if ADK_TARGET_SYSTEM_QEMU_X86
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
-	default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL
 	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64
-	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64EL
 	default n
 	help
 	  Intel(R) PRO/1000 gigabit ethernet driver
diff --git a/target/mips/systems/qemu-mips b/target/mips/systems/qemu-mips
index 2dfc09ca6..abe82aa9c 100644
--- a/target/mips/systems/qemu-mips
+++ b/target/mips/systems/qemu-mips
@@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS
 	bool "Qemu Emulator"
 	select ADK_mips
 	select ADK_qemu_mips
+	select ADK_CPU_MIPS32
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_VMLINUZ
 	help
diff --git a/target/mips/uclibc.config b/target/mips/uclibc.config
index c66fb4157..e849ad406 100644
--- a/target/mips/uclibc.config
+++ b/target/mips/uclibc.config
@@ -250,8 +250,8 @@ UCLIBC_BUILD_NOEXECSTACK=y
 #
 CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-DOSTRIP=y
+DODEBUG=y
+# DOSTRIP is not set
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
diff --git a/target/mips64/uclibc.config b/target/mips64/uclibc.config
index c66fb4157..e849ad406 100644
--- a/target/mips64/uclibc.config
+++ b/target/mips64/uclibc.config
@@ -250,8 +250,8 @@ UCLIBC_BUILD_NOEXECSTACK=y
 #
 CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-DOSTRIP=y
+DODEBUG=y
+# DOSTRIP is not set
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
diff --git a/target/ppc/uclibc.config b/target/ppc/uclibc.config
index 4f4dbdef9..51e4cb913 100644
--- a/target/ppc/uclibc.config
+++ b/target/ppc/uclibc.config
@@ -242,8 +242,8 @@ UCLIBC_BUILD_NOEXECSTACK=y
 #
 CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-DOSTRIP=y
+DODEBUG=y
+# DOSTRIP is not set
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
diff --git a/target/sh/uclibc.config b/target/sh/uclibc.config
index c85cd8f5d..3385b3fc8 100644
--- a/target/sh/uclibc.config
+++ b/target/sh/uclibc.config
@@ -243,8 +243,8 @@ UCLIBC_BUILD_NOEXECSTACK=y
 #
 CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-DOSTRIP=y
+DODEBUG=y
+# DOSTRIP is not set
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
diff --git a/target/sparc/uclibc.config b/target/sparc/uclibc.config
index 2bd71a141..12d22f5e2 100644
--- a/target/sparc/uclibc.config
+++ b/target/sparc/uclibc.config
@@ -243,8 +243,8 @@ UCLIBC_BUILD_NOEXECSTACK=y
 #
 CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-DOSTRIP=y
+DODEBUG=y
+# DOSTRIP is not set
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
diff --git a/target/x86/uclibc.config b/target/x86/uclibc.config
index 8ea5bcf4b..a18ebd82f 100644
--- a/target/x86/uclibc.config
+++ b/target/x86/uclibc.config
@@ -246,8 +246,8 @@ UCLIBC_BUILD_NOEXECSTACK=y
 #
 CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-DOSTRIP=y
+# DOSTRIP is not set
+DODEBUG=y
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
diff --git a/target/x86_64/uclibc.config b/target/x86_64/uclibc.config
index fe12cf831..cecc2fb3f 100644
--- a/target/x86_64/uclibc.config
+++ b/target/x86_64/uclibc.config
@@ -241,8 +241,8 @@ UCLIBC_BUILD_NOEXECSTACK=y
 #
 CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
-# DODEBUG is not set
-DOSTRIP=y
+DODEBUG=y
+# DOSTRIP is not set
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set