diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-05-20 19:06:51 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-05-20 19:06:51 +0200 |
| commit | 7259636f477c3f1e6330ee57cf064b3afd0a778c (patch) | |
| tree | 28a8a33a0079980c2115be307dc60b1b5183f5fa /mk | |
| parent | 5f5e6da9afeb1684fe484ead00894866ebfbde7b (diff) | |
| parent | 10668d53167c49eefbbac043db5f1c183ac8f21c (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 4 | ||||
| -rw-r--r-- | mk/rootfs.mk | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk index cc6c447ff..f6f764c87 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -13,9 +13,11 @@ CONFIG = config DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_DEBUG=n \ ADK_STATIC=n \ - ADK_MAKE_PARALLEL=n \ + ADK_MAKE_PARALLEL=y \ + ADK_MAKE_JOBS=4 \ ADK_FORCE_PARALLEL=n \ ADK_PACKAGE_GRUB=n \ + ADK_PACKAGE_XORG_SERVER_WITH_DRI=n \ ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_GCC=n \ diff --git a/mk/rootfs.mk b/mk/rootfs.mk index b91a58629..2e3bd52b0 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -10,6 +10,11 @@ endef ifeq ($(ADK_LINUX_MIPS_RB532),y) ROOTFS:= root=/dev/sda2 +MTDDEV:= root=/dev/mtdblock1 +endif + +ifeq ($(ADK_LINUX_MIPS_RB433),y) +MTDDEV:= root=/dev/mtdblock2 endif ifeq ($(ADK_LINUX_ARM_FOXBOARD),y) @@ -22,7 +27,7 @@ $(eval $(call rootfs_template,archive,ARCHIVE)) $(eval $(call rootfs_template,initramfs,INITRAMFS)) $(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK)) $(eval $(call rootfs_template,squashfs,SQUASHFS)) -$(eval $(call rootfs_template,yaffs,YAFFS,root=/dev/mtdblock1 panic=3)) +$(eval $(call rootfs_template,yaffs,YAFFS,$(MTDDEV) panic=3)) $(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp init=/init)) $(eval $(call rootfs_template,encrypted,ENCRYPTED)) |