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

3 files changed, 25 insertions, 43 deletions

diff --git a/target/Config.in b/target/Config.in
index 629846a51..61d602e4b 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -304,6 +304,7 @@ config ADK_LINUX_XSCALE_ZAURUS
 	select ADK_zaurus
 	select ADK_TARGET_NO_FPU
 	select ADK_TARGET_WITH_INPUT
+	depends on ADK_BROKEN
 	help
 	 Support for Sharp Zaurus SL-C3200 (aka Terrier)
 	 Status: development
@@ -378,12 +379,14 @@ config ADK_LINUX_X86_RESCUE
 config ADK_LINUX_MIPSEL_RESCUE
 	bool "mips (little endian)"
 	select ADK_mipsel_rescue
+	depends on ADK_BROKEN
 	help
 	 MIPS LE architecture.
 
 config ADK_LINUX_MIPS_RESCUE
 	bool "mips (big endian)"
 	select ADK_mips_rescue
+	depends on ADK_BROKEN
 	help
 	 MIPS BE architecture.
 
@@ -645,7 +648,7 @@ endchoice
 
 choice
 prompt "Routerboard model"
-default ADK_LINUX_MIPS_RB433
+default ADK_LINUX_MIPS_RB532
 depends on ADK_LINUX_MIKROTIK
 
 config ADK_LINUX_MIPS_RB411
@@ -656,6 +659,7 @@ config ADK_LINUX_MIPS_RB411
 	select ADK_KERNEL_NETDEV_1000
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_TARGET_WITH_MINIPCI
+	depends on ADK_BROKEN
 	help
 	 Support for Mikrotik RB411.
 	 Status: development
@@ -668,6 +672,7 @@ config ADK_LINUX_MIPS_RB433
 	select ADK_KERNEL_NETDEV_1000
 	select ADK_KERNEL_NET_ETHERNET
 	select ADK_TARGET_WITH_MINIPCI
+	depends on ADK_BROKEN
 	help
 	 Support for Mikrotik RB433.
 	 Status: development
@@ -718,7 +723,7 @@ depends on ! ADK_NATIVE
 config ADK_TARGET_LIB_UCLIBC
 	bool "uClibc embedded C library"
 	# broken, because of 16kB pagesize
-	#depends on !ADK_LINUX_MIPS64_LEMOTE
+	depends on !ADK_LINUX_MIPS64_LEMOTE
 	select ADK_uclibc
 	help
  	 http://uclibc.org
diff --git a/target/linux/patches/2.6.32/scsi-header.patch b/target/linux/patches/2.6.32/scsi-header.patch
deleted file mode 100644
index 9173b242d..000000000
--- a/target/linux/patches/2.6.32/scsi-header.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Nur linux-2.6.32.orig/include/scsi/Kbuild linux-2.6.32/include/scsi/Kbuild
---- linux-2.6.32.orig/include/scsi/Kbuild	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/include/scsi/Kbuild	2009-12-03 19:46:03.000000000 +0100
-@@ -1,3 +1,5 @@
-+header-y += sg.h
-+header-y += scsi_ioctl.h
- header-y += scsi.h
- header-y += scsi_netlink.h
- header-y += scsi_netlink_fc.h
-diff -Nur linux-2.6.32.orig/include/scsi/scsi.h linux-2.6.32/include/scsi/scsi.h
---- linux-2.6.32.orig/include/scsi/scsi.h	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/include/scsi/scsi.h	2009-12-03 19:47:49.000000000 +0100
-@@ -143,6 +143,8 @@
- 
- #define SCSI_MAX_VARLEN_CDB_SIZE 260
- 
-+#ifdef __KERNEL__
-+
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
- 	u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
-@@ -169,6 +171,8 @@
- 		scsi_varlen_cdb_length(cmnd) : COMMAND_SIZE(cmnd[0]);
- }
- 
-+#endif
-+
- /*
-  *  SCSI Architecture Model (SAM) Status codes. Taken from SAM-3 draft
-  *  T10/1561-D Revision 4 Draft dated 7th November 2002.
-@@ -284,8 +288,10 @@
- 	SCSI_PROTOCOL_UNSPEC = 0xf, /* No specific protocol */
- };
- 
-+#ifdef __KERNEL__
- /* Returns a human-readable name for the device */
- extern const char * scsi_device_type(unsigned type);
-+#endif
- 
- /*
-  * standard mode-select header prepended to all mode-select commands
diff --git a/target/rescue-x86/Makefile b/target/rescue-x86/Makefile
index 81a529d14..0d7d19d48 100644
--- a/target/rescue-x86/Makefile
+++ b/target/rescue-x86/Makefile
@@ -11,9 +11,27 @@ kernel-install:
 	@cp $(LINUX_DIR)/arch/x86/boot/bzImage \
 		$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
 
+createinit:
+	@-rm $(LINUX_DIR)/usr/initramfs_data.cpio.*
+	$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' \
+		$(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
+	echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
+	echo N |$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
+		CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) 
+	$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
+		CC="$(TARGET_CC)" $(MAKE_TRACE)
+	@cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+
 ifeq ($(FS),initramfs)
 imageinstall: $(BIN_DIR)/$(INITRAMFS)
 	@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
 	@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
 	@echo 'Login as user root with password linux123 via ssh or console'
 endif
+
+ifeq ($(FS),initramfs-piggyback)
+imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
+	@echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
+	@echo 'Login as user root with password linux123 via ssh or console'
+endif