diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-10 12:40:32 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-10 12:40:32 +0100 |
| commit | 3dad371fb2f559d65dcf007cc83904a9aafebba9 (patch) | |
| tree | 55175577cf52aad03d19b0a0e17d060c5a02c875 /mk | |
| parent | 85367e533d2edc8cac7925e2acef76695140a310 (diff) | |
| parent | 84b655b833b38f83d5908560914efc6b9d29cbac (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/image.mk | 3 | ||||
| -rw-r--r-- | mk/modules.mk | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/mk/image.mk b/mk/image.mk index c6f5ce266..a2a6bb176 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -71,9 +71,6 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} cat ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel \ ${BUILD_DIR}/root.squashfs > \ ${BUILD_DIR}/${ROOTFSSQUASHFS} - # padding of images is required, foxboard only? - #dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ - bs=4063232 conv=sync $(MAKE_TRACE) imageclean: rm -f $(BIN_DIR)/$(ADK_TARGET)-* ${BUILD_DIR}/$(ADK_TARGET)-* diff --git a/mk/modules.mk b/mk/modules.mk index f1760baa8..734fd4435 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -568,6 +568,7 @@ $(eval $(call KMOD_template,BLK_DEV_NBD,blk-dev-nbd,\ $(eval $(call KMOD_template,SCSI,scsi,\ $(MODULES_DIR)/kernel/drivers/scsi/scsi_wait_scan \ + $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \ ,20)) $(eval $(call KMOD_template,BLK_DEV_SD,blk-dev-sd,\ |