diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 4 | ||||
| -rw-r--r-- | mk/modules.mk | 14 | ||||
| -rw-r--r-- | mk/rootfs.mk | 9 |
3 files changed, 17 insertions, 10 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/modules.mk b/mk/modules.mk index fce15c190..a7fc49d8c 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1047,18 +1047,18 @@ $(eval $(call KMOD_template,PCCARD,pccard,\ $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core \ ,40)) -$(eval $(call KMOD_template,PCMCIA,pcmcia,\ - $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia \ -,50)) - -$(eval $(call KMOD_template,CARDBUS,cardbus,\ +$(eval $(call KMOD_template,YENTA,yenta,\ $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic \ $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket \ ,50)) -$(eval $(call KMOD_template,PCMCIA_SERIAL_CS,pcmcia-serial-cs,\ +$(eval $(call KMOD_template,PCMCIA,pcmcia,\ + $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia \ +,60)) + +$(eval $(call KMOD_template,SERIAL_8250_CS,serial-8250-cs,\ $(MODULES_DIR)/kernel/drivers/serial/serial_cs \ -,55)) +,70)) # # Input diff --git a/mk/rootfs.mk b/mk/rootfs.mk index b91a58629..cb21798a8 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) @@ -17,12 +22,12 @@ ROOTFS:= root=/dev/mmcblk0p2 rootwait endif $(eval $(call rootfs_template,ext2-block,EXT2_BLOCK,$(ROOTFS))) -$(eval $(call rootfs_template,usb,USB,root=/dev/sdb1 rootdelay=10)) +$(eval $(call rootfs_template,usb,USB,root=/dev/sdb1 rootdelay=5)) $(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)) |