summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-01-26 19:51:01 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-01-26 19:51:01 +0100
commitb43f782ca8d684fa003ecc6f21ad8adffb76bd42 (patch)
tree1dbc4cbcf7f306eb168bd17ba35f213e91547df0 /target
parenta57b22c8e3087efb7eb0f93afba35066d49ccf55 (diff)
fix some kernel dependencies and qemu examples.
Diffstat (limited to 'target')
-rw-r--r--target/Config.in3
-rw-r--r--target/bulk.lst1
-rw-r--r--target/linux/config/Config.in.block3
-rw-r--r--target/linux/config/Config.in.fs1
-rw-r--r--target/linux/config/Config.in.fsnet2
-rw-r--r--target/qemu-mipsel/Makefile2
-rw-r--r--target/qemu-x86/Makefile6
-rw-r--r--target/qemu-x86_64/Makefile6
8 files changed, 15 insertions, 9 deletions
diff --git a/target/Config.in b/target/Config.in
index 92fcc4882..01dfd5ac3 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -375,6 +375,7 @@ config ADK_LINUX_QEMU
bool "Qemu Emulator"
select ADK_KERNEL_NET_PCI
select ADK_KERNEL_NETDEVICES
+ select ADK_KERNEL_MII
select ADK_KERNEL_NET_ETHERNET
select ADK_TARGET_WITH_INPUT
help
@@ -389,10 +390,12 @@ config ADK_LINUX_X86_64_SHUTTLE
select ADK_TARGET_WITH_INPUT
select ADK_TARGET_WITH_PP
select ADK_KERNEL_INPUT_KEYBOARD
+ select ADK_KERNEL_SCSI
select ADK_KERNEL_NETDEVICES
select ADK_KERNEL_NET_PCI
select ADK_KERNEL_NET_ETHERNET
select ADK_KERNEL_SATA_AHCI if ADK_TARGET_ROOTFS_ARCHIVE
+ select ADK_KERNEL_BLK_DEV_SD if ADK_TARGET_ROOTFS_ARCHIVE
select ADK_KERNEL_BLK_DEV_MD if ADK_TARGET_ROOTFS_ARCHIVE
select ADK_KERNEL_MD_RAID0 if ADK_TARGET_ROOTFS_ARCHIVE
select ADK_KERNEL_MD_RAID1 if ADK_TARGET_ROOTFS_ARCHIVE
diff --git a/target/bulk.lst b/target/bulk.lst
index fbd1f9463..0dacdd64c 100644
--- a/target/bulk.lst
+++ b/target/bulk.lst
@@ -1 +1,2 @@
ag241 uclibc nfsroot y
+foxboard uclibc nfsroot y
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index cf5e7a270..614938f1d 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -175,6 +175,7 @@ config ADK_KPACKAGE_KMOD_SCSI
select ADK_KERNEL_LSF
select ADK_KERNEL_IOSCHED_AS
depends on !ADK_KERNEL_SCSI
+ depends on !ADK_KERNEL_SATA_AHCI
tristate
help
If you want to use a SCSI hard disk, SCSI tape drive, SCSI CD-ROM or
@@ -190,8 +191,8 @@ config ADK_KPACKAGE_KMOD_SCSI
config ADK_KPACKAGE_KMOD_BLK_DEV_SD
prompt "kmod-scsi-disk.................... SCSI disk support"
+ select ADK_KPACKAGE_KMOD_SCSI
depends on !ADK_KERNEL_BLK_DEV_SD
- depends on ADK_KPACKAGE_KMOD_SCSI
tristate
help
If you want to use SCSI hard disks, Fibre Channel disks,
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 8541065f0..d533a3213 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -14,6 +14,7 @@ config ADK_KERNEL_FAT_DEFAULT_IOCHARSET
config ADK_KPACKAGE_KMOD_EXPORTFS
tristate
+ depends on !ADK_KERNEL_EXPORTFS
default n
help
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index 71236c47f..f87aeb9db 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -92,7 +92,7 @@ config ADK_KPACKAGE_KMOD_NFSD
prompt "kmod-fs-nfsd...................... NFS server support (includes V3 support)"
tristate
default n
- select ADK_KPACKAGE_KMOD_EXPORTFS
+ select ADK_KPACKAGE_KMOD_EXPORTFS if !ADK_KERNEL_EXPORTFS
select ADK_KERNEL_NFSD_V3
depends on ADK_KPACKAGE_KMOD_NFS_FS
help
diff --git a/target/qemu-mipsel/Makefile b/target/qemu-mipsel/Makefile
index dcbb46b31..03513b8f2 100644
--- a/target/qemu-mipsel/Makefile
+++ b/target/qemu-mipsel/Makefile
@@ -12,7 +12,7 @@ kernel-install:
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
+ @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
@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 "Be sure to change permissions after image creation."
diff --git a/target/qemu-x86/Makefile b/target/qemu-x86/Makefile
index d9828d77f..44e4b2319 100644
--- a/target/qemu-x86/Makefile
+++ b/target/qemu-x86/Makefile
@@ -28,7 +28,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@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 "Start qemu with following command line:"
- @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img'
+ @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img'
@echo 'Login as user root with password linux123 via ssh or console'
endif
@@ -39,7 +39,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS)
@echo 'You need a dummy qemu.img, create it with:'
@echo 'qemu-img create -f raw qemu.img 1M'
@echo "Start qemu with following command line:"
- @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img'
+ @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img'
@echo 'Login as user root with password linux123 via ssh or console'
endif
@@ -49,6 +49,6 @@ imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
@echo 'You need a dummy qemu.img, create it with:'
@echo 'qemu-img create -f raw qemu.img 1M'
@echo "Start qemu with following command line:"
- @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img'
+ @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img'
@echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-x86_64/Makefile b/target/qemu-x86_64/Makefile
index fe980bdac..b7847eeaa 100644
--- a/target/qemu-x86_64/Makefile
+++ b/target/qemu-x86_64/Makefile
@@ -29,7 +29,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@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 "Start qemu with following command line:"
- @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img'
+ @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img'
@echo 'Login as user root with password linux123 via ssh or console'
endif
@@ -40,7 +40,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS)
@echo 'You need a dummy qemu.img, create it with:'
@echo 'qemu-img create -f raw qemu.img 1M'
@echo "Start qemu with following command line:"
- @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img'
+ @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} qemu.img'
@echo 'Login as user root with password linux123 via ssh or console'
endif
@@ -50,6 +50,6 @@ imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
@echo 'You need a dummy qemu.img, create it with:'
@echo 'qemu-img create -f raw qemu.img 1M'
@echo "Start qemu with following command line:"
- @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img'
+ @echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=rtl8139 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu.img'
@echo 'Login as user root with password linux123 via ssh or console'
endif