diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-14 19:58:43 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-14 19:58:43 +0200 |
| commit | 4cfceb141c0770aa37123fde6fc26c28283314ad (patch) | |
| tree | 8973da1d99561d6ede8c4c69253d528a70e197f8 /target/alix2d | |
| parent | 3b76e79f14e279a6526809e630e45e4f760d77de (diff) | |
| parent | ba4b6056da30ddb19809b72309a009a1c84a7656 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/alix2d')
| -rw-r--r-- | target/alix2d/Makefile | 18 | ||||
| -rw-r--r-- | target/alix2d/kernel.config | 13 |
2 files changed, 14 insertions, 17 deletions
diff --git a/target/alix2d/Makefile b/target/alix2d/Makefile index bed5b3c69..bdd90a52c 100644 --- a/target/alix2d/Makefile +++ b/target/alix2d/Makefile @@ -11,23 +11,29 @@ KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage ifeq ($(FS),ext2-block) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" + @echo "The RootFS tarball is:" + @echo "$(BIN_DIR)/$(ROOTFSTARBALL)" @echo "To install everything to CompactFlash use scripts/install.sh" endif ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' - @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSUSERTARBALL}' + @echo 'The linux kernel is here:' + @echo '$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel' + @echo 'The nfs root tarball is here:' + @echo '${BIN_DIR}/${ROOTFSUSERTARBALL}' endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' - @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' + @echo 'The kernel file is:' + @echo '${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' + @echo 'The initramfs image is:' + @echo '${BIN_DIR}/${INITRAMFS}' endif ifeq ($(FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs @cp $(KERNEL) ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel - @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' + @echo 'The kernel+initramfs file is:' + @echo '${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' endif diff --git a/target/alix2d/kernel.config b/target/alix2d/kernel.config index 607e1fb2e..9169d8037 100644 --- a/target/alix2d/kernel.config +++ b/target/alix2d/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.34 -# Sat Jun 26 16:09:47 2010 +# Mon Jul 5 23:07:16 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1177,16 +1177,10 @@ CONFIG_CRYPTO=y # # Crypto core or helper # -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_RNG2=y # CONFIG_CRYPTO_MANAGER is not set # CONFIG_CRYPTO_MANAGER2 is not set # CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_NULL is not set -CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_CRYPTD is not set # CONFIG_CRYPTO_AUTHENC is not set # CONFIG_CRYPTO_TEST is not set @@ -1268,10 +1262,7 @@ CONFIG_CRYPTO_WORKQUEUE=y # Random Number Generation # # CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_HW=y -# CONFIG_CRYPTO_DEV_PADLOCK is not set -CONFIG_CRYPTO_DEV_GEODE=y -# CONFIG_CRYPTO_DEV_HIFN_795X is not set +# CONFIG_CRYPTO_HW is not set # # OCF Configuration |