Merge branch 'master' of git+ssh://openadk.org/git/openadk

12 files changed, 16 insertions, 0 deletions

diff --git a/target/config/Config.in b/target/config/Config.in
index 0d5e057a7..a2495cdd9 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -4,9 +4,13 @@
 config ADK_TARGET_KERNEL_VMLINUZ
 	boolean
 
+config ADK_TARGET_KERNEL_BZIMAGE
+	boolean
+
 config ADK_TARGET_KERNEL
 	string
 	default "vmlinuz" if ADK_TARGET_KERNEL_VMLINUZ
+	default "bzImage" if ADK_TARGET_KERNEL_BZIMAGE
 	default "vmlinux"
 
 config ADK_big
@@ -729,6 +733,7 @@ config ADK_TARGET_ROOTFS_MMC
 
 config ADK_TARGET_ROOTFS_ARCHIVE
 	bool "Archive usable for different filesystems"
+	select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU
 	help
 	  Use this option if your root filesystem is ext2/ext3/ext4/xfs.
 
diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40
index a517b5698..1327fb922 100644
--- a/target/x86/sys-available/ibm-x40
+++ b/target/x86/sys-available/ibm-x40
@@ -1,5 +1,6 @@
 config ADK_TARGET_SYSTEM_IBM_X40
 	bool "IBM X40 laptop"
+	depends on ADK_BROKEN
 	select ADK_x86
 	select ADK_ibm_x40
 	select ADK_CPU_PENTIUM_M
diff --git a/target/x86/sys-available/intel-atom b/target/x86/sys-available/intel-atom
index 392a74d64..86bc85cd1 100644
--- a/target/x86/sys-available/intel-atom
+++ b/target/x86/sys-available/intel-atom
@@ -1,5 +1,6 @@
 config ADK_TARGET_SYSTEM_INTEL_ATOM
 	bool "Intel Atom (NM10)"
+	depends on ADK_BROKEN
 	select ADK_x86
 	select ADK_intel_atom
 	select ADK_CPU_ATOM
diff --git a/target/x86/sys-available/pcengines-alix1c b/target/x86/sys-available/pcengines-alix1c
index 4024ecb90..b14dd98a4 100644
--- a/target/x86/sys-available/pcengines-alix1c
+++ b/target/x86/sys-available/pcengines-alix1c
@@ -20,6 +20,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_USB_BOOT
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
          System profile for PCEngines ALIX1C. 
 
diff --git a/target/x86/sys-available/pcengines-alix2d13 b/target/x86/sys-available/pcengines-alix2d13
index b17184405..ee74dd18c 100644
--- a/target/x86/sys-available/pcengines-alix2d13
+++ b/target/x86/sys-available/pcengines-alix2d13
@@ -14,6 +14,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	select ADK_TARGET_WITH_LEDS
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_CF
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
          System profile for PCEngines ALIX2D13.
 
diff --git a/target/x86/sys-available/pcengines-alix2d2 b/target/x86/sys-available/pcengines-alix2d2
index c7611d898..84a63f9f6 100644
--- a/target/x86/sys-available/pcengines-alix2d2
+++ b/target/x86/sys-available/pcengines-alix2d2
@@ -13,6 +13,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	select ADK_TARGET_WITH_LEDS
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_CF
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
          System profile for PCEngines ALIX2D2.
 
diff --git a/target/x86/sys-available/pcengines-wrap b/target/x86/sys-available/pcengines-wrap
index d670b402a..5de5e3214 100644
--- a/target/x86/sys-available/pcengines-wrap
+++ b/target/x86/sys-available/pcengines-wrap
@@ -7,6 +7,7 @@ config ADK_TARGET_SYSTEM_PCENGINES_WRAP
 	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_WATCHDOG
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
          System profile for PCEngines WRAP board.
 
diff --git a/target/x86/sys-available/qemu-i686 b/target/x86/sys-available/qemu-i686
index e78d6579b..5de8554fa 100644
--- a/target/x86/sys-available/qemu-i686
+++ b/target/x86/sys-available/qemu-i686
@@ -9,6 +9,7 @@ config ADK_TARGET_SYSTEM_QEMU_I686
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_HDD
 	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
 	 Support for Qemu Emulator (i686).
 
diff --git a/target/x86/sys-available/vbox-i686 b/target/x86/sys-available/vbox-i686
index 88b5ec63c..97be46ec5 100644
--- a/target/x86/sys-available/vbox-i686
+++ b/target/x86/sys-available/vbox-i686
@@ -9,6 +9,7 @@ config ADK_TARGET_SYSTEM_VBOX_I686
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_HDD
 	select ADK_TARGET_WITH_SATA
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
 	 Support for VirtualBox Emulator (i686).
 
diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/sys-available/qemu-x86_64
index abffcaae9..14e835daf 100644
--- a/target/x86_64/sys-available/qemu-x86_64
+++ b/target/x86_64/sys-available/qemu-x86_64
@@ -11,6 +11,7 @@ config ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_TARGET_WITH_HDD
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_KERNEL_MAY_64BIT
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
 	 Support for Qemu Emulator.
 
diff --git a/target/x86_64/sys-available/shuttle-sa76 b/target/x86_64/sys-available/shuttle-sa76
index 59e0054bb..557cc77cd 100644
--- a/target/x86_64/sys-available/shuttle-sa76
+++ b/target/x86_64/sys-available/shuttle-sa76
@@ -1,5 +1,6 @@
 config ADK_TARGET_SYSTEM_SHUTTLE_SA76
 	bool "Shuttle SA76"
+	depends on ADK_BROKEN
 	select ADK_x86_64
 	select ADK_shuttle_sa76
 	select ADK_CPU_AMDFAM10
diff --git a/target/x86_64/sys-available/tarox-pc b/target/x86_64/sys-available/tarox-pc
index 9c0c13c08..d6b068e06 100644
--- a/target/x86_64/sys-available/tarox-pc
+++ b/target/x86_64/sys-available/tarox-pc
@@ -1,5 +1,6 @@
 config ADK_TARGET_SYSTEM_TAROX_PC
 	bool "Tarox PC"
+	depends on ADK_BROKEN
 	select ADK_x86_64
 	select ADK_tarox_pc
 	select ADK_LINUX_64