summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-08-31 07:50:20 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2011-08-31 07:50:20 (GMT)
commitb17c7212a430d6abf4ded89493604e3292a2d141 (patch)
tree07a77221be039ee61075d67de89f672fac71fa2a
parent6c4dbdaddecb4397c2bda2f74569a968714815ee (diff)
fix qemu-i686 network/block config
-rw-r--r--.gitignore1
-rw-r--r--target/linux/config/Config.in.block6
-rw-r--r--target/linux/config/Config.in.netdevice2
-rw-r--r--target/x86/Makefile6
-rw-r--r--tests/adk.exp5
-rw-r--r--tests/master.exp4
-rw-r--r--tests/master.exp.in1
7 files changed, 9 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore
index 51956e8..fba1c55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
/config/zconf.tab.h
/tests/master.exp
/tests/adk.exp
+/tests/adk.exp.in.tmp
/prereq.mk
/toolchain_build_*/
/.ADK_HAVE_DOT_CONFIG
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 8f67343..fdafb06 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -121,11 +121,11 @@ config ADK_KERNEL_ATA_PIIX
select ADK_KERNEL_ATA_BMDMA
select ADK_KERNEL_BLK_DEV
select ADK_KERNEL_BLK_DEV_SD
- default y if ADK_TARGET_SYSTEM_QEMU_MIPS64
- default y if ADK_TARGET_SYSTEM_QEMU_MIPS64EL
+ default y if ADK_TARGET_SYSTEM_QEMU_I686
default y if ADK_TARGET_SYSTEM_QEMU_MIPS
default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL
- default y if ADK_TARGET_SYSTEM_QEMU_X86
+ default y if ADK_TARGET_SYSTEM_QEMU_PPC
+ default y if ADK_TARGET_SYSTEM_QEMU_SPARC
default y if ADK_TARGET_SYSTEM_QEMU_X86_64
default y if ADK_TARGET_SYSTEM_IBM_X40
default y if ADK_NATIVE_SYSTEM_IBM_X40
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index c4df54f..713c990 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -135,7 +135,7 @@ config ADK_KERNEL_E1000
select ADK_KERNEL_NETDEV_1000
default y if ADK_TARGET_SYSTEM_IBM_X40
default y if ADK_NATIVE_SYSTEM_IBM_X40
- default y if ADK_TARGET_SYSTEM_QEMU_X86
+ default y if ADK_TARGET_SYSTEM_QEMU_I686
default y if ADK_TARGET_SYSTEM_QEMU_X86_64
default n
help
diff --git a/target/x86/Makefile b/target/x86/Makefile
index 436ca25..dc17f07 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -23,7 +23,7 @@ endif
ifeq ($(ADK_TARGET_FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86),y)
+ifeq ($(ADK_HARDWARE_QEMU),y)
@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
@echo "Use following command to create a QEMU Image:"
@echo "sudo ./scripts/create-image.sh -f ${ADK_TARGET_ROOTFS} qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
@@ -41,7 +41,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS)
@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86),y)
+ifeq ($(ADK_HARDWARE_QEMU),y)
@echo "Start qemu with following command line:"
@echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
endif
@@ -50,7 +50,7 @@ ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
@cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL}
@echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}'
-ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86),y)
+ifeq ($(ADK_HARDWARE_QEMU),y)
@echo "Start qemu with following command line:"
@echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
endif
diff --git a/tests/adk.exp b/tests/adk.exp
deleted file mode 100644
index 5371732..0000000
--- a/tests/adk.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_generic_config "unix";
-set_board_info hostname 192.168.1.24
-set_board_info username root
-set_board_info rsh_prog /usr/bin/ssh
-set_board_info rcp_prog /usr/bin/scp
diff --git a/tests/master.exp b/tests/master.exp
deleted file mode 100644
index 0617230..0000000
--- a/tests/master.exp
+++ /dev/null
@@ -1,4 +0,0 @@
-lappend boards_dir /home/wbx/openadk/tests
-lappend boards_dir /usr/share/dejagnu
-set myboard adk
-set target_list adk
diff --git a/tests/master.exp.in b/tests/master.exp.in
index 297c0ce..72d8ab9 100644
--- a/tests/master.exp.in
+++ b/tests/master.exp.in
@@ -2,3 +2,4 @@ lappend boards_dir @TOPDIR@/tests
lappend boards_dir /usr/share/dejagnu
set myboard adk
set target_list adk
+set verbose 1