summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
Diffstat (limited to 'target')
-rw-r--r--target/Makefile2
-rw-r--r--target/alix2d/kernel.config11
-rw-r--r--target/alix2d13/kernel.config13
-rw-r--r--target/foxg20/Makefile2
-rw-r--r--target/ibmx40/Makefile3
-rw-r--r--target/lemote/Makefile3
-rw-r--r--target/linux/config/Config.in.crypto2
-rw-r--r--target/linux/config/Config.in.multimedia1
-rw-r--r--target/rb4xx/Makefile2
-rw-r--r--target/rb532/Makefile2
-rw-r--r--target/wag54g/Makefile2
11 files changed, 11 insertions, 32 deletions
diff --git a/target/Makefile b/target/Makefile
index dc77bf75f..5e7259d8a 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -10,7 +10,7 @@ all: install
# The following target combines all kernel-related variables and
# config files into a single one to be used as the final kernel
# configuration when building. This is how it's done:
-# 1) fetch all ADK_KPACKAGE_KMOD_* vars into
+# 1) fetch all ADK_KPACKAGE_KMOD_* vars into
# .kernelconfig.modules and set them to "m"
# 2) fetch all enabled ADK_KERNEL_* vars into
# .kernelconfig.kernel (no conversion, as they are booleans)
diff --git a/target/alix2d/kernel.config b/target/alix2d/kernel.config
index 13b187f2a..9169d8037 100644
--- a/target/alix2d/kernel.config
+++ b/target/alix2d/kernel.config
@@ -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
diff --git a/target/alix2d13/kernel.config b/target/alix2d13/kernel.config
index fa700691b..f46102881 100644
--- a/target/alix2d13/kernel.config
+++ b/target/alix2d13/kernel.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.34
-# Sat Jun 26 22:13:41 2010
+# Mon Jul 5 20:11:20 2010
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1171,16 +1171,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
@@ -1262,10 +1256,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
diff --git a/target/foxg20/Makefile b/target/foxg20/Makefile
index 8c97fc4ad..0a022baf3 100644
--- a/target/foxg20/Makefile
+++ b/target/foxg20/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel
LOADADDR:= 0x20008000
-kernel-install:
+kernel-install:
@gzip -9 < $(LINUX_DIR)/arch/arm/boot/Image > ${BUILD_DIR}/Image.gz
@mkimage -A arm -O linux -T kernel -C gzip \
-a ${LOADADDR} -e ${LOADADDR} -d ${BUILD_DIR}/Image.gz \
diff --git a/target/ibmx40/Makefile b/target/ibmx40/Makefile
index f3ef6575a..3c95fc2d1 100644
--- a/target/ibmx40/Makefile
+++ b/target/ibmx40/Makefile
@@ -14,7 +14,7 @@ createinitcrypt:
echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
echo N |$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
- CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE)
+ CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE)
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
CC="$(TARGET_CC)" $(MAKE_TRACE)
@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
@@ -55,7 +55,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt
@echo 'mount /dev/sda1 /mnt/boot'
@echo 'mount /dev/mapper/crypt /mnt/root'
@echo 'mkdir /mnt/boot/boot'
- @echo
@echo 'Copy $(ROOTFSUSERTARBALL) via scp to /mnt/root and extract it'
@echo 'cd /mnt/root ; gunzip $(ROOTFSUSERTARBALL); tar xpvf $(ROOTFSUSERTARBALL)'
@echo 'cd /mnt/root ; mknod -m 644 console c 5 1'
diff --git a/target/lemote/Makefile b/target/lemote/Makefile
index 40b19b19c..09cfb8b5c 100644
--- a/target/lemote/Makefile
+++ b/target/lemote/Makefile
@@ -14,7 +14,7 @@ createinitcrypt:
echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
echo N |$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
- CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE)
+ CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE)
$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \
CC="$(TARGET_CC)" $(MAKE_TRACE)
@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
@@ -66,7 +66,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt
@echo 'mount /dev/sda1 /mnt/boot'
@echo 'mount /dev/mapper/crypt /mnt/root'
@echo 'mkdir /mnt/boot/boot'
- @echo
@echo 'Copy $(ROOTFSUSERTARBALL) via scp to /mnt/root and extract it'
@echo 'cd /mnt/root ; gunzip $(ROOTFSUSERTARBALL); tar xpvf $(ROOTFSUSERTARBALL)'
@echo 'Copy ${ADK_TARGET}-${FS}-kernel via scp to /mnt/boot/boot'
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 826e47570..cb6675468 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -47,7 +47,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_GEODE
tristate
select ADK_KERNEL_CRYPTO_HW
select ADK_KERNEL_CRYPTO
- depends on ADK_LINUX_X86_ALIX1C
+ depends on ADK_LINUX_ALIX
help
Say 'Y' here to use the AMD Geode LX processor on-board AES
engine for the CryptoAPI AES algorithm.
diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia
index 87dc93aa0..a67af9a89 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -135,5 +135,4 @@ config ADK_KPACKAGE_KMOD_USB_PWC
default n
help
-#source package/em28xx/Config.in
endmenu
diff --git a/target/rb4xx/Makefile b/target/rb4xx/Makefile
index 5bc9aba7e..b4e98a5a8 100644
--- a/target/rb4xx/Makefile
+++ b/target/rb4xx/Makefile
@@ -11,7 +11,7 @@ OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build
kernel-install:
$(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \
- $(TARGET_DIR)/boot/kernel
+ $(TARGET_DIR)/boot/kernel
@cp $(TARGET_DIR)/boot/kernel \
$(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel
diff --git a/target/rb532/Makefile b/target/rb532/Makefile
index 223099c9c..5cefd22d3 100644
--- a/target/rb532/Makefile
+++ b/target/rb532/Makefile
@@ -12,7 +12,7 @@ KERNEL:=$(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel
kernel-install:
$(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \
- $(TARGET_DIR)/boot/kernel
+ $(TARGET_DIR)/boot/kernel
@cp $(TARGET_DIR)/boot/kernel \
$(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel
diff --git a/target/wag54g/Makefile b/target/wag54g/Makefile
index 78f88111c..0a864ad4c 100644
--- a/target/wag54g/Makefile
+++ b/target/wag54g/Makefile
@@ -25,7 +25,7 @@ kernel-install: tools-compile
$(LINUX_DIR)/vmlinux.tmp
PATH='${TARGET_PATH}' \
addpattern -p WA21 -i $(LINUX_DIR)/vmlinux.tmp \
- -o $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+ -o $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),squashfs)
imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS)