diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-13 17:17:14 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-13 17:17:14 +0200 |
commit | b448bbcdab09b70b4d03ea0bc9167878e7f054da (patch) | |
tree | 40ea72e4979ce176f6280b25368713122bee1b9c /mk | |
parent | d804be5baee6590ff6e91d267c8cb9933ed7ac60 (diff) | |
parent | d2e5a673aa7637c990ca7307e831327eb67e3fe7 (diff) |
Merge branch 'master' of ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
-rw-r--r-- | mk/image.mk | 6 | ||||
-rw-r--r-- | mk/kernel-build.mk | 1 | ||||
-rw-r--r-- | mk/modules.mk | 6 | ||||
-rw-r--r-- | mk/rootfs.mk | 6 |
4 files changed, 13 insertions, 6 deletions
diff --git a/mk/image.mk b/mk/image.mk index 5b0408aa3..e80ac5d1e 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -43,7 +43,7 @@ image-prepare-post: chmod 1777 ${TARGET_DIR}/tmp INITRAMFS= ${DEVICE}-${ARCH}-${FS} -ROOTFSSQUASHFS= ${DEVICE}-${ARCH}-${FS}.fimage +ROOTFSSQUASHFS= ${DEVICE}-${ARCH}-${FS}.img ROOTFSTARBALL= ${DEVICE}-${ARCH}-${FS}.tar.gz ${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} @@ -56,12 +56,10 @@ ${BIN_DIR}/${INITRAMFS}: ${TARGET_DIR} ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} PATH='${TARGET_PATH}' \ mksquashfs ${TARGET_DIR} ${BUILD_DIR}/root.squashfs \ - -nopad -noappend -root-owned -le $(MAKE_TRACE) + -nopad -noappend -root-owned $(MAKE_TRACE) # padding of images is required cat ${BIN_DIR}/${DEVICE}-${ARCH}-kernel ${BUILD_DIR}/root.squashfs > \ ${BUILD_DIR}/${ROOTFSSQUASHFS} - dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ - bs=4063232 conv=sync $(MAKE_TRACE) imageclean: rm -f $(BIN_DIR)/$(DEVICE)-* diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 69e271d55..04657d906 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -9,7 +9,6 @@ KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION)/.patched: $(TRACE) target/$(DEVICE)-kernel-patch - $(PATCH) $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ../linux/patches *.patch $(MAKE_TRACE) $(PATCH) $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ../linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) $(PATCH) $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ../$(DEVICE)/patches *.patch $(MAKE_TRACE) touch $@ diff --git a/mk/modules.mk b/mk/modules.mk index 2c6e12eab..e1350ac50 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -30,6 +30,7 @@ $(eval $(call KMOD_template,ATH5K,mac80211-ath5k,\ ,20, kmod-led-class)) $(eval $(call KMOD_template,RT2X00,mac80211-rt2x00,\ + $(MODULES_DIR)/kernel/drivers/input/input-polldev \ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00lib \ $(MODULES_DIR)/kernel/drivers/net/wireless/rt2x00/rt2x00pci \ ,17)) @@ -507,6 +508,8 @@ $(eval $(call KMOD_template,MD_RAID1,md-raid1,\ ,35)) $(eval $(call KMOD_template,MD_RAID456,md-raid456,\ + $(MODULES_DIR)/kernel/crypto/async_tx/async_xor \ + $(MODULES_DIR)/kernel/crypto/async_tx/async_tx \ $(MODULES_DIR)/kernel/crypto/async_tx/async_memcpy \ $(MODULES_DIR)/kernel/drivers/md/raid456 \ ,35)) @@ -523,6 +526,7 @@ $(eval $(call KMOD_template,DM_CRYPT,dm-crypt,\ ,40)) $(eval $(call KMOD_template,DM_MIRROR,dm-mirror,\ + $(MODULES_DIR)/kernel/drivers/md/dm-log \ $(MODULES_DIR)/kernel/drivers/md/dm-region-hash \ $(MODULES_DIR)/kernel/drivers/md/dm-mirror \ ,40)) @@ -549,6 +553,7 @@ $(eval $(call KMOD_template,CRYPTO_AEAD,crypto-aead,\ ,04)) $(eval $(call KMOD_template,CRYPTO_BLKCIPHER,crypto-blkcipher,\ + $(MODULES_DIR)/kernel/crypto/crypto_wq \ $(MODULES_DIR)/kernel/crypto/crypto_blkcipher \ $(MODULES_DIR)/kernel/crypto/rng \ $(MODULES_DIR)/kernel/crypto/krng \ @@ -561,6 +566,7 @@ $(eval $(call KMOD_template,CRYPTO_HASH,crypto-hash,\ ,05)) $(eval $(call KMOD_template,CRYPTO_MANAGER,crypto-manager,\ + $(MODULES_DIR)/kernel/crypto/pcompress \ $(MODULES_DIR)/kernel/crypto/cryptomgr \ ,06)) diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 455b6a979..67f2ec80c 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -8,7 +8,11 @@ FS_CMDLINE:=$(3) endif endef -$(eval $(call rootfs_template,ext2-cf,EXT2_CF)) +ifeq ($(ADK_LINUX_MIPS_RB532),y) +ROOTFS:= root=/dev/sda2 +endif + +$(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)) |