From 0e14700702f06f09f25bc861e2642a6d42da982b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Sun, 15 Dec 2013 14:09:00 +0100
Subject: need to merge third patch from Phil manually. disable on non Linux
 hosts

---
 target/x86/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'target/x86')

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
-- 
cgit v1.2.3


From 422fe42ea4a4f5c5f868736e17a0462e1e5c1c6b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 16 Dec 2013 13:11:33 +0100
Subject: small fixes for iso target

---
 target/x86/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'target/x86')

diff --git a/target/x86/Makefile b/target/x86/Makefile
index 87d3b5806..b228810c7 100644
--- a/target/x86/Makefile
+++ b/target/x86/Makefile
@@ -65,8 +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
+endif
 ifeq (${ADK_TARGET_FS},iso)
 imageinstall: ${BIN_DIR}/${ROOTFSISO}
 	@echo 'ISO image is at $<'
 endif
-endif
-- 
cgit v1.2.3


From bb9efd268326393ca769c38e6385216569e70e52 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 4 Jan 2014 22:21:30 +0100
Subject: update firefox and dependencies

---
 target/x86/sys-available/ibm-x40 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'target/x86')

diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40
index 1327fb922..7dc75ebf4 100644
--- a/target/x86/sys-available/ibm-x40
+++ b/target/x86/sys-available/ibm-x40
@@ -1,6 +1,5 @@
 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
@@ -22,6 +21,7 @@ config ADK_TARGET_SYSTEM_IBM_X40
 	select ADK_TARGET_WITH_ACPI
 	# with docking station 
 	select ADK_TARGET_WITH_PP
+	select ADK_TARGET_KERNEL_BZIMAGE
 	help
          System profile for IBM X40 laptop.
 
-- 
cgit v1.2.3