diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-12 20:24:12 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-12 20:24:12 +0200 |
commit | 9bb9e3d7d1d79551953a4dea287ffe34032049dc (patch) | |
tree | 17b434ec874a2f4e6fcd562c2c2f9413924f0cfe /mk | |
parent | 80cf876adbd1a04a182e78c1741384e8bb644649 (diff) | |
parent | 18b38b0eb68cbcb8793efe989dcd8796a60288af (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
-rw-r--r-- | mk/kernel-build.mk | 1 | ||||
-rw-r--r-- | mk/rootfs.mk | 6 |
2 files changed, 5 insertions, 2 deletions
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/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)) |