diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-12 14:26:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-12 14:26:13 +0100 |
| commit | abf607b563f8ab66536120681cc43230a3c053ce (patch) | |
| tree | 7cf17ef1306ec224b501d6aa0809013d191dd564 /mk | |
| parent | 7c41bd04b223bb739bc87542d9414e5de783f177 (diff) | |
| parent | edc22d3a25c5c963a5c03277d141599cd19a046f (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 3 | ||||
| -rw-r--r-- | mk/modules.mk | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk index e5ecaa4cf..ef551741a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -15,7 +15,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_MAKE_PARALLEL=y \ ADK_MAKE_JOBS=4 \ ADK_PACKAGE_GRUB=n \ - ADK_PACKAGE_AUFS2_UTIL=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_MGETTY=n \ ADK_COMPILE_HEIMDAL=n \ @@ -552,7 +551,7 @@ bulkallmod: done <${TOPDIR}/target/arch.lst ;\ done -${TOPDIR}/bin/tools/pkgmaker: +${TOPDIR}/bin/tools/pkgmaker: tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c @mkdir -p $(TOPDIR)/bin/tools @$(HOSTCC) -Wall -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c diff --git a/mk/modules.mk b/mk/modules.mk index 94a1d235a..27b02bbf7 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -926,11 +926,13 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\ ,11)) ZLIB:=lib/zlib_deflate/zlib_deflate -ifeq ($(ADK_LINUX_CRIS_FOXBOARD),) -ifeq ($(ADK_LINUX_MIPS_AG241),) +ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX832),y) +ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX416),y) +ifeq ($(ADK_TARGET_SYSTEM_LINKSYS_AG241),y) ZLIB+=lib/zlib_inflate/zlib_inflate endif endif +endif $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\ $(foreach mod, $(ZLIB),$(MODULES_DIR)/kernel/$(mod)) \ @@ -1177,11 +1179,13 @@ $(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\ # USB # -ifeq ($(ADK_LINUX_CRIS_FOXBOARD),) +ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX832),) +ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX416),) $(eval $(call KMOD_template,USB,usb,\ $(MODULES_DIR)/kernel/drivers/usb/core/usbcore \ ,50)) endif +endif $(eval $(call KMOD_template,USB_EHCI_HCD,usb-ehci-hcd,\ $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd \ |