summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2013-12-15 14:09:00 +0100
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2013-12-15 14:09:00 +0100
commit0e14700702f06f09f25bc861e2642a6d42da982b (patch)
tree836903db80f85bfca84ad3fbdc1af642abafb1fd /target
parent1d41dfd46f6f45ed351a677fb22eea072c6530df (diff)
need to merge third patch from Phil manually. disable on non Linux hosts
Diffstat (limited to 'target')
-rw-r--r--target/config/Config.in10
-rw-r--r--target/linux/config/Config.in.block4
-rw-r--r--target/linux/config/Config.in.fs6
-rw-r--r--target/x86/Makefile4
4 files changed, 23 insertions, 1 deletions
diff --git a/target/config/Config.in b/target/config/Config.in
index f551e21a0..7ddc7b83c 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -748,6 +748,16 @@ config ADK_TARGET_ROOTFS_MMC
Use this option if you have a MMC/SDCARD based system.
(ext2 filesystem is used.)
+config ADK_TARGET_ROOTFS_ISO
+ bool "ISO image"
+ select ADK_KERNEL_ISO9660_FS
+ select ADK_KERNEL_JOLIET
+ select ADK_KERNEL_SCSI
+ select ADK_KERNEL_BLK_DEV_SR
+ depends on ADK_HOST_LINUX
+ help
+ Use this option to create a bootable ISO image.
+
config ADK_TARGET_ROOTFS_ARCHIVE
bool "Archive usable for different filesystems"
select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index bbd9ce745..fb5bf080f 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -28,6 +28,9 @@ config ADK_KERNEL_SCSI
config ADK_KERNEL_BLK_DEV_SD
boolean
+config ADK_KERNEL_BLK_DEV_SR
+ boolean
+
config ADK_KERNEL_ISCSI_TCP
boolean
@@ -324,6 +327,7 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SD
config ADK_KPACKAGE_KMOD_BLK_DEV_SR
prompt "kmod-scsi-cdrom................... SCSI CDROM support"
depends on !ADK_KERNEL_SCSI
+ depends on !ADK_KERNEL_BLK_DEV_SR
depends on ADK_KPACKAGE_KMOD_SCSI
tristate
help
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index ab048805e..9bdc6b9e5 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -227,7 +227,11 @@ config ADK_KPACKAGE_KMOD_FUSE_FS
fuse-utils.
config ADK_KERNEL_JOLIET
- bool
+ boolean
+ default n
+
+config ADK_KERNEL_ISO9660_FS
+ boolean
default n
config ADK_KPACKAGE_KMOD_ISO9660_FS
diff --git a/target/x86/Makefile b/target/x86/Makefile
index a3dc8ae70..87d3b5806 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -65,4 +65,8 @@ ifeq ($(ADK_HARDWARE_QEMU),y)
@echo "Start qemu with following command line:"
@echo 'qemu-system-i386 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL)'
endif
+ifeq (${ADK_TARGET_FS},iso)
+imageinstall: ${BIN_DIR}/${ROOTFSISO}
+ @echo 'ISO image is at $<'
+endif
endif