Bladeren bron

fix qemu-i686 network/block config

Waldemar Brodkorb 14 jaren geleden
bovenliggende
commit
b17c7212a4
7 gewijzigde bestanden met toevoegingen van 9 en 16 verwijderingen
  1. 1 0
      .gitignore
  2. 3 3
      target/linux/config/Config.in.block
  3. 1 1
      target/linux/config/Config.in.netdevice
  4. 3 3
      target/x86/Makefile
  5. 0 5
      tests/adk.exp
  6. 0 4
      tests/master.exp
  7. 1 0
      tests/master.exp.in

+ 1 - 0
.gitignore

@@ -14,6 +14,7 @@
 /config/zconf.tab.h
 /config/zconf.tab.h
 /tests/master.exp
 /tests/master.exp
 /tests/adk.exp
 /tests/adk.exp
+/tests/adk.exp.in.tmp
 /prereq.mk
 /prereq.mk
 /toolchain_build_*/
 /toolchain_build_*/
 /.ADK_HAVE_DOT_CONFIG
 /.ADK_HAVE_DOT_CONFIG

+ 3 - 3
target/linux/config/Config.in.block

@@ -121,11 +121,11 @@ config ADK_KERNEL_ATA_PIIX
 	select ADK_KERNEL_ATA_BMDMA
 	select ADK_KERNEL_ATA_BMDMA
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
 	select ADK_KERNEL_BLK_DEV_SD
-	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64
+	default y if ADK_TARGET_SYSTEM_QEMU_I686
-	default y if ADK_TARGET_SYSTEM_QEMU_MIPS64EL
 	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
 	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
 	default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL
 	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_QEMU_X86_64
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_SYSTEM_IBM_X40

+ 1 - 1
target/linux/config/Config.in.netdevice

@@ -135,7 +135,7 @@ config ADK_KERNEL_E1000
 	select ADK_KERNEL_NETDEV_1000
 	select ADK_KERNEL_NETDEV_1000
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default y if ADK_NATIVE_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 y if ADK_TARGET_SYSTEM_QEMU_X86_64
 	default n
 	default n
 	help
 	help

+ 3 - 3
target/x86/Makefile

@@ -23,7 +23,7 @@ endif
 ifeq ($(ADK_TARGET_FS),archive)
 ifeq ($(ADK_TARGET_FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo "The RootFS tarball is: $(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)
 	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
 	@echo "Use following command to create a QEMU Image:"
 	@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)"
 	@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)
 	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
 	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
 	@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 "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}'
 	@echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}'
 endif
 endif
@@ -50,7 +50,7 @@ ifeq ($(ADK_TARGET_FS),initramfs-piggyback)
 imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
 imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
 	@cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL}
 	@cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL}
 	@echo 'The kernel+initramfs file is: $(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 "Start qemu with following command line:"
 	@echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
 	@echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
 endif
 endif

+ 0 - 5
tests/adk.exp

@@ -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

+ 0 - 4
tests/master.exp

@@ -1,4 +0,0 @@
-lappend boards_dir /home/wbx/openadk/tests
-lappend boards_dir /usr/share/dejagnu
-set myboard adk
-set target_list adk

+ 1 - 0
tests/master.exp.in

@@ -2,3 +2,4 @@ lappend boards_dir @TOPDIR@/tests
 lappend boards_dir /usr/share/dejagnu
 lappend boards_dir /usr/share/dejagnu
 set myboard adk
 set myboard adk
 set target_list adk
 set target_list adk
+set verbose 1