fix conflict

4 files changed, 32 insertions, 1 deletions

diff --git a/mk/image.mk b/mk/image.mk
index 78b18e716..e6dd06a82 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -103,9 +103,10 @@ ${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR}
 	echo "CONFIG_BLK_DEV_INITRD=y" >> ${LINUX_DIR}/.config
 	echo 'CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"' >> \
 		${LINUX_DIR}/.config
+	cp $(TOPDIR)/scripts/dev.cpio $@
 	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \
 		sed "s#\(.*\)#:0:0::::::\1#" | sort | \
-	    ${TOOLS_DIR}/cpio -o -C512 -Hnewc -P >$@ 2>/dev/null
+	    ${TOOLS_DIR}/cpio -o -C512 -Hnewc -A -P -O $@ 2>/dev/null
 
 ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
 	${STAGING_HOST_DIR}/bin/mksquashfs ${TARGET_DIR} \
diff --git a/mk/mirrors.mk b/mk/mirrors.mk
index d820a56b3..30e246334 100644
--- a/mk/mirrors.mk
+++ b/mk/mirrors.mk
@@ -21,6 +21,7 @@ MASTER_SITE_XORG?=	\
 	http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.6/src/everything/ \
 	http://xorg.freedesktop.org/releases/X11R7.6/src/everything/ \
 	http://xorg.freedesktop.org/releases/individual/lib/ \
+	http://xorg.freedesktop.org/releases/individual/driver/ \
 	
 MASTER_SITE_GNU?=	\
 	http://ftp.gnu.org/gnu/ \
diff --git a/mk/modules.mk b/mk/modules.mk
index e51732a4c..0cc7603ad 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -67,6 +67,9 @@ $(eval $(call KMOD_template,RFKILL,rfkill,\
 ,10))
 
 $(eval $(call KMOD_template,MAC80211,mac80211,\
+	$(MODULES_DIR)/kernel/net/wireless/lib80211 \
+	$(MODULES_DIR)/kernel/net/wireless/lib80211_crypt_ccmp \
+	$(MODULES_DIR)/kernel/net/wireless/lib80211_crypt_tkip \
 	$(MODULES_DIR)/kernel/net/wireless/cfg80211 \
 	$(MODULES_DIR)/kernel/net/mac80211/mac80211 \
 ,15, kmod-crypto-aes kmod-crypto-arc4 kmod-crypto-ecb))
@@ -88,6 +91,14 @@ $(eval $(call KMOD_template,B43,b43,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/b43/b43 \
 ,70))
 
+$(eval $(call KMOD_template,HOSTAP,hostap,\
+	$(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap \
+,70))
+
+$(eval $(call KMOD_template,HOSTAP_CS,hostap-cs,\
+	$(MODULES_DIR)/kernel/drivers/net/wireless/hostap/hostap_cs \
+,75))
+
 $(eval $(call KMOD_template,P54_USB,p54-usb,\
 	$(MODULES_DIR)/kernel/drivers/net/wireless/p54/p54usb \
 ,70))
@@ -1082,6 +1093,7 @@ $(eval $(call KMOD_template,SOUND,sound,\
 	$(MODULES_DIR)/kernel/sound/soundcore \
 ,30))
 
+
 $(eval $(call KMOD_template,SND,snd,\
 	$(MODULES_DIR)/kernel/sound/core/snd-page-alloc \
 	$(MODULES_DIR)/kernel/sound/core/snd \
@@ -1121,6 +1133,17 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,snd-cs5535audio,\
 	$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
 ,55))
 
+$(eval $(call KMOD_template,SND_PXA2XX_SOC_SPITZ,snd-pxa2xx-soc-spitz,\
+	$(MODULES_DIR)/kernel/sound/soc/snd-soc-core \
+	$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-lib \
+	$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-pcm \
+	$(MODULES_DIR)/kernel/sound/arm/snd-pxa2xx-ac97 \
+	$(MODULES_DIR)/kernel/sound/soc/codecs/snd-soc-wm8750 \
+	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx-i2s \
+	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-pxa2xx \
+	$(MODULES_DIR)/kernel/sound/soc/pxa/snd-soc-spitz \
+,55))
+
 #V4L_COMPAT:=drivers/media/video/v4l1-compat
 #ifeq ($(ADK_LINUX_64),y)
 #V4L_COMPAT+=drivers/media/video/v4l2-compat-ioctl32
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 5080944e6..f5e2b74c5 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -9,8 +9,10 @@ endif
 endef
 
 ifeq ($(ADK_HARDWARE_QEMU),y)
+ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y)
 ROOTFS:=	root=/dev/sda1
 endif
+endif
 
 ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y)
 ROOTFS:=	root=/dev/sda2
@@ -25,6 +27,10 @@ ifeq ($(ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20),y)
 ROOTFS:=	root=/dev/mmcblk0p2 rootwait
 endif
 
+ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
+ROOTFS:=	root=/dev/sda1 rootwait
+endif
+
 ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y)
 USB:=		rootwait
 else