3 files changed, 19 insertions, 1 deletions
diff --git a/mk/image.mk b/mk/image.mk
index 9c0053727..e60957fc6 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -45,6 +45,7 @@ image-prepare-post:
 INITRAMFS=	${DEVICE}-${ARCH}-${FS}
 ROOTFSSQUASHFS=	${DEVICE}-${ARCH}-${FS}.img
 ROOTFSTARBALL=	${DEVICE}-${ARCH}-${FS}.tar.gz
+INITRAMFS_PIGGYBACK=	${DEVICE}-${ARCH}-${FS}.cpio
 
 ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}
 	cd ${TARGET_DIR}; tar -cf - --owner=0 --group=0 . | gzip -n9 >$@
@@ -53,6 +54,10 @@ ${BIN_DIR}/${INITRAMFS}: ${TARGET_DIR}
 	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | sort | \
 	    cpio -R 0:0 --quiet -oC512 -Mdist -Hnewc | gzip -n9 >$@
 
+${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR}
+	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | sort | \
+	    cpio -R 0:0 --quiet -oC512 -Mdist -Hnewc >$@
+
 ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR}
 	PATH='${TARGET_PATH}' \
 	mksquashfs ${TARGET_DIR} ${BUILD_DIR}/root.squashfs \
@@ -64,4 +69,4 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR}
 		bs=4063232 conv=sync $(MAKE_TRACE)
 
 imageclean:
-	rm -f $(BIN_DIR)/$(DEVICE)-*
+	rm -f $(BIN_DIR)/$(DEVICE)-* ${BUILD_DIR}/$(DEVICE)-*
diff --git a/mk/modules.mk b/mk/modules.mk
index 875b93c62..837b8473c 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -2,6 +2,13 @@
 # material, please see the LICENCE file in the top-level directory.
 
 #
+# Serial ATA devices
+#
+$(eval $(call KMOD_template,SATA_AHCI,sata-ahci,\
+	$(MODULES_DIR)/kernel/drivers/ata/ahci \
+,10))
+
+#
 # Ethernet network devices
 # 
 $(eval $(call KMOD_template,NE2K_PCI,ne2k-pci,\
@@ -17,6 +24,11 @@ $(eval $(call KMOD_template,E1000,e1000,\
 	$(MODULES_DIR)/kernel/drivers/net/e1000/e1000 \
 ,20))
 
+$(eval $(call KMOD_template,SKY2,sky2,\
+	$(MODULES_DIR)/kernel/drivers/net/sky2 \
+,20))
+
+
 # 
 # Wireless network devices
 #
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 4ab2f71e2..ef73b4522 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -16,6 +16,7 @@ $(eval $(call rootfs_template,ext2-cf,EXT2_CF,$(ROOTFS)))
 $(eval $(call rootfs_template,ext2-mmc,EXT2_MMC))
 $(eval $(call rootfs_template,ext2,EXT2))
 $(eval $(call rootfs_template,initramfs,INITRAMFS))
+$(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK))
 $(eval $(call rootfs_template,squashfs,SQUASHFS))
 $(eval $(call rootfs_template,yaffs,YAFFS))
 $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp))