From bc924b61431ffa6c76db5fefa7a5a09951fe6ccb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 28 Apr 2010 20:30:39 +0200 Subject: fix some pkg dependencies --- mk/build.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index cc6c447ff..9bbe15510 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -16,6 +16,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ ADK_MAKE_PARALLEL=n \ 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 \ -- cgit v1.2.3 From 4ef1a744af6d9fe1ab993c19a9e58cd83c37c2f1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 May 2010 18:04:12 +0200 Subject: fix make bulkallmod for some packages and target combinations --- mk/build.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index 9bbe15510..f6f764c87 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -13,7 +13,8 @@ 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 \ -- cgit v1.2.3 From 8a325b2af866300353e500e9693fc08991df52b7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 16 May 2010 13:15:00 +0200 Subject: add preliminary support for my pcmcia smartcard reader --- mk/modules.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'mk') 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 -- cgit v1.2.3 From 896b6bb853f900eaebd56447df16958bf15916db Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 May 2010 18:55:17 +0200 Subject: activate and refresh support for rb411/rb433 after n0-1 helped to find a way to fix my broken rb433 by using the primary bootloader via shortening a jumper I got the motivation to get this target working again. Summarize both targets to newly created rb4xx target. --- mk/rootfs.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mk') 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)) -- cgit v1.2.3 From b30764b9adeaae6f090efe0408a9573adbf9fcae Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 20 May 2010 21:32:46 +0200 Subject: reduce bootup time, update kernel config --- mk/rootfs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 2e3bd52b0..cb21798a8 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -22,7 +22,7 @@ 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)) -- cgit v1.2.3