summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-15 12:35:48 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-15 12:35:48 +0200
commit7c38c7a7843d881837f000b9465bd59a0e918f7f (patch)
tree738c19bacd1c0dd4f939298ceaf59013a76dc6f6 /mk
parentcad729cef7e4226eb09ca510546776ac4e8b551d (diff)
parent7838fca0479a0d4affcb245ec042ead7ae1d7b3b (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
-rw-r--r--mk/cpu.mk20
-rw-r--r--mk/image.mk7
2 files changed, 4 insertions, 23 deletions
diff --git a/mk/cpu.mk b/mk/cpu.mk
deleted file mode 100644
index 1678e9311..000000000
--- a/mk/cpu.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-#
-# optimization configure options for CPU features
-
-ifeq ($(ADK_TARGET),alix1c)
-CONFIGURE_CPU_OPTS:= --disable-ssse3 \
- --disable-sse \
- --enable-amd3dnow \
- --enable-amd3dnowext \
- --enable-mmx \
- --enable-mmx2
-else
-CONFIGURE_CPU_OPTS:= --disable-ssse3 \
- --disable-sse \
- --disable-amd3dnow \
- --disable-amd3dnowext \
- --disable-mmx \
- --disable-mmx2
-endif
diff --git a/mk/image.mk b/mk/image.mk
index 668de8c26..b548aac29 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -29,10 +29,11 @@ kernel-package: $(LINUX_DIR)/vmlinux
rm -rf $(KERNEL_PKGDIR)
@mkdir -p $(KERNEL_PKGDIR)/boot
cp $(KERNEL) $(KERNEL_PKGDIR)/boot/vmlinuz-adk
- ${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \
+ @${BASH} ${SCRIPT_DIR}/make-ipkg-dir.sh ${KERNEL_PKGDIR} \
../linux/kernel.control ${ADK_TARGET}-${KERNEL_VERSION} ${CPU_ARCH}
- $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR)
- $(PKG_INSTALL) $(KERNEL_PKG)
+ $(PKG_BUILD) $(KERNEL_PKGDIR) $(PACKAGE_DIR) $(MAKE_TRACE)
+ $(TRACE) target/$(ADK_TARGET)-install-kernel-package
+ $(PKG_INSTALL) $(KERNEL_PKG) $(MAKE_TRACE)
INITRAMFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}
ROOTFSSQUASHFS= ${ADK_TARGET}-${ADK_LIBC}-${FS}.img