diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-16 09:28:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-16 09:28:58 +0100 |
| commit | ca2a76f692c0c7021a1bceaf38a40a5920b91edd (patch) | |
| tree | 3bd4c043643c2d6a16f27d7dfdbc2f4e6faa6c92 /mk | |
| parent | 2a2b076cc5af5a86e5527a12efefa8c6d7ef0c42 (diff) | |
| parent | 69d9bac9dad423e4cabf7bfa97a7765e4c442104 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 6 | ||||
| -rw-r--r-- | mk/modules.mk | 2 | ||||
| -rw-r--r-- | mk/rootfs.mk | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/mk/build.mk b/mk/build.mk index 986d66cd7..9242cc27a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -579,7 +579,7 @@ release: bulk: for libc in uclibc eglibc glibc musl;do \ while read arch; do \ - systems=$$(./scripts/getsystems $$arch|grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \ + systems=$$(./scripts/getsystems $$arch|grep -v toolchain); \ for system in $$systems;do \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ ( \ @@ -599,7 +599,7 @@ bulk: bulkall: for libc in uclibc eglibc glibc musl;do \ while read arch; do \ - systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \ + systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \ for system in $$systems;do \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ ( \ @@ -619,7 +619,7 @@ bulkall: bulkallmod: for libc in uclibc eglibc glibc musl;do \ while read arch; do \ - systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu-cris|grep -v foxboard-lx); \ + systems=$$(./scripts/getsystems $$arch| grep -v toolchain); \ for system in $$systems;do \ mkdir -p $(TOPDIR)/bin/$${system}_$${arch}_$$libc; \ ( \ diff --git a/mk/modules.mk b/mk/modules.mk index 22afead3b..bb84317de 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1287,11 +1287,9 @@ USBMODULES:= USBMODULES+=drivers/usb/usb-common USBMODULES+=drivers/usb/core/usbcore -ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX),) $(eval $(call KMOD_template,USB,usb,\ $(foreach mod, $(USBMODULES),$(MODULES_DIR)/kernel/$(mod)) \ ,50)) -endif $(eval $(call KMOD_template,USB_EHCI_HCD,usb-ehci-hcd,\ $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd \ diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 3bbe31f25..f1d0bdf3a 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -32,10 +32,6 @@ ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) ROOTFS:= root=/dev/sda1 rootwait endif -ifeq ($(ADK_TARGET_SYSTEM_FOXBOARD_LX),y) -ROOTFS:= root=/dev/mtdblock1 -endif - ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) USB:= rootwait else |