diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-05-09 17:20:57 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-05-09 17:20:57 +0200 |
commit | 15a4b2f89998fc69f608ed2cb4cd107c7df7d51c (patch) | |
tree | 1fb9a1d7dee23ac0d706adfc0fff8770b0371e26 | |
parent | 786331bc2437cb9d45fcf10f6fc00de29a7d4833 (diff) |
make bulk fixes
-rw-r--r-- | mk/build.mk | 2 | ||||
-rw-r--r-- | mk/modules.mk | 4 | ||||
-rw-r--r-- | target/mips/Makefile | 16 | ||||
-rw-r--r-- | target/mips/sys-available/qemu-mips | 2 | ||||
-rw-r--r-- | target/mips/sys-available/qemu-mipsel | 3 |
5 files changed, 24 insertions, 3 deletions
diff --git a/mk/build.mk b/mk/build.mk index da78089e2..66a081e97 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -517,7 +517,7 @@ bulk: ( \ echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ - $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=nfsroot defconfig; \ + $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/bin/$${system}_$${arch}_$$libc/build.log; \ diff --git a/mk/modules.mk b/mk/modules.mk index b1456dcb7..f82a4382f 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -808,6 +808,10 @@ $(eval $(call KMOD_template,CRYPTO_HMAC,crypto-hmac,\ $(MODULES_DIR)/kernel/crypto/hmac \ ,11)) +$(eval $(call KMOD_template,CRYPTO_CTS,crypto-cts,\ + $(MODULES_DIR)/kernel/crypto/cts \ +,11)) + $(eval $(call KMOD_template,CRYPTO_XCBC,crypto-xcbc,\ $(MODULES_DIR)/kernel/crypto/xcbc \ ,11)) diff --git a/target/mips/Makefile b/target/mips/Makefile index 36909b6b7..ba6284611 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -7,6 +7,10 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk +ifeq (${ADK_TARGET_SYSTEM_BROADCOM_BCM47XX},y) +CUSTOM_ROOTFSSQUASHFS_BUILD=1 +endif + ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) KERNEL:=$(LINUX_DIR)/vmlinuz else @@ -61,6 +65,18 @@ ifeq ($(ADK_TARGET_SYSTEM_FON_FON2100),y) kernel-install: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel endif +ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) +kernel-install: + $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel +endif +ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS),y) +kernel-install: + $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel +endif +ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPSEL),y) +kernel-install: + $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(TARGET_DIR)/boot/kernel +endif ifeq ($(ADK_TARGET_FS),nfsroot) imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL) diff --git a/target/mips/sys-available/qemu-mips b/target/mips/sys-available/qemu-mips index 503d21395..9d2ecc7ef 100644 --- a/target/mips/sys-available/qemu-mips +++ b/target/mips/sys-available/qemu-mips @@ -1,5 +1,5 @@ config ADK_TARGET_SYSTEM_QEMU_MIPS - bool "Qemu Emulator" + bool "Qemu Emulator (big endian)" select ADK_mips select ADK_big select ADK_qemu_mips diff --git a/target/mips/sys-available/qemu-mipsel b/target/mips/sys-available/qemu-mipsel index 6193adaa1..6d3054cfd 100644 --- a/target/mips/sys-available/qemu-mipsel +++ b/target/mips/sys-available/qemu-mipsel @@ -1,7 +1,8 @@ config ADK_TARGET_SYSTEM_QEMU_MIPSEL - bool "Qemu Emulator" + bool "Qemu Emulator (little endian)" select ADK_mipsel select ADK_qemu_mipsel + select ADK_little select ADK_KERNEL_MIPS_MALTA select ADK_HARDWARE_QEMU select ADK_TARGET_WITH_VGA |