diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 09:57:21 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 09:57:21 +0200 |
| commit | 6e5edc83271beb9ac4017bdf74b540da2ebe4594 (patch) | |
| tree | 0a4a7ded2460ebedd40f88ff2414f90c44b275da /mk | |
| parent | fec1fd5598765d02691cb4c2b3ea3f1938be7824 (diff) | |
| parent | 851a4486f663ddb8acffd4dd870d4121290b35d5 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rw-r--r-- | mk/rootfs.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk index 635d8bc63..4774106ee 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -186,7 +186,7 @@ switch: kernelconfig: cp $(TOPDIR)/target/$(ADK_TARGET_ARCH)/kernel.config $(BUILD_DIR)/linux/.config - ${KERNEL_MAKE_ENV} ${MAKE} ${KERNEL_MAKE_OPTS} -C $(BUILD_DIR)/linux menuconfig + ${KERNEL_MAKE_ENV} ${MAKE} ARCH=$(ARCH) ${KERNEL_MAKE_OPTS} -C $(BUILD_DIR)/linux menuconfig cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET_ARCH)/kernel.config # create a new package from package/.template diff --git a/mk/rootfs.mk b/mk/rootfs.mk index ee63d8c2d..2da69d017 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -27,7 +27,7 @@ endif $(eval $(call rootfs_template,cf,CF,$(ROOTFS))) $(eval $(call rootfs_template,mmc,MMC,$(ROOTFS))) -$(eval $(call rootfs_template,usb,USB,rootdelay=3)) +$(eval $(call rootfs_template,usb,USB,rootwait)) $(eval $(call rootfs_template,archive,ARCHIVE,$(ROOTFS))) $(eval $(call rootfs_template,initramfs,INITRAMFS)) $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK)) |