diff options
Diffstat (limited to 'target')
-rw-r--r-- | target/Config.in | 3 | ||||
-rw-r--r-- | target/Makefile | 4 | ||||
-rw-r--r-- | target/alix2d/Makefile | 18 | ||||
-rw-r--r-- | target/alix2d/kernel.config | 13 | ||||
-rw-r--r-- | target/alix2d13/kernel.config | 13 | ||||
-rw-r--r-- | target/foxg20/Makefile | 2 | ||||
-rw-r--r-- | target/ibmx40/Makefile | 3 | ||||
-rw-r--r-- | target/lemote/Makefile | 5 | ||||
-rw-r--r-- | target/linux/config/Config.in.crypto | 2 | ||||
-rw-r--r-- | target/linux/config/Config.in.debug | 12 | ||||
-rw-r--r-- | target/linux/config/Config.in.fs | 3 | ||||
-rw-r--r-- | target/linux/config/Config.in.misc | 38 | ||||
-rw-r--r-- | target/linux/config/Config.in.multimedia | 1 | ||||
-rw-r--r-- | target/linux/config/Config.in.netdevice | 8 | ||||
-rw-r--r-- | target/linux/config/Config.in.netfilter | 5 | ||||
-rw-r--r-- | target/linux/config/Config.in.usb | 14 | ||||
-rw-r--r-- | target/rb4xx/Makefile | 2 | ||||
-rw-r--r-- | target/rb532/Makefile | 2 | ||||
-rw-r--r-- | target/wag54g/Makefile | 2 |
19 files changed, 73 insertions, 77 deletions
diff --git a/target/Config.in b/target/Config.in index 861e2d6b7..98e9f179a 100644 --- a/target/Config.in +++ b/target/Config.in @@ -636,7 +636,6 @@ depends on ADK_LINUX_ALIX config ADK_LINUX_X86_ALIX1C bool "PC Engines Alix1C" select ADK_alix1c - select ADK_KERNEL_USB select ADK_KERNEL_NLS select ADK_KERNEL_SCSI select ADK_KERNEL_ATA @@ -660,7 +659,6 @@ config ADK_LINUX_X86_ALIX1C config ADK_LINUX_X86_ALIX2D bool "PC Engines Alix2D" select ADK_alix2d - select ADK_KERNEL_USB select ADK_KERNEL_NLS select ADK_KERNEL_SCSI select ADK_KERNEL_ATA @@ -684,7 +682,6 @@ config ADK_LINUX_X86_ALIX2D config ADK_LINUX_X86_ALIX2D13 bool "PC Engines Alix2D13" select ADK_alix2d13 - select ADK_KERNEL_USB select ADK_KERNEL_NLS select ADK_KERNEL_SCSI select ADK_KERNEL_ATA diff --git a/target/Makefile b/target/Makefile index 1070ce960..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) @@ -89,4 +89,4 @@ clean: $(ADK_TARGET)-clean $(ADK_TARGET)-imageclean %-imageinstall: %-imageprepare $(TRACE) target/$(patsubst %-imageinstall,%,$@)-imageinstall $(MAKE) -C $(patsubst %-imageinstall,%,$@) imageinstall - @echo 'Login as user root with password linux123 via ssh or console' + @echo 'Login as user root with password ${ADK_RUNTIME_PASSWORD} via ssh or console' 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 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..aa6006f24 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 @@ -42,8 +42,6 @@ imageinstall: $(BUILD_DIR)/$(INITRAMFS_PIGGYBACK) createinitramfs endif ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel - @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel' @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" endif ifeq ($(FS),encrypted) @@ -66,7 +64,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.debug b/target/linux/config/Config.in.debug index 87fc57052..eedb9a97c 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -1,5 +1,9 @@ menu "Kernel debugging" +config ADK_KERNEL_PROFILING + boolean + default n + config ADK_KERNEL_DEBUG_KERNEL boolean default n @@ -51,4 +55,12 @@ config ADK_KERNEL_DEBUG_WITH_KGDB select ADK_KERNEL_KGDB_SERIAL_CONSOLE select ADK_KERNEL_FRAME_POINTER +config ADK_KPACKAGE_KMOD_OPROFILE + tristate + prompt "kernel support for oprofile" + select ADK_KERNEL_PROFILING + default n + help + use oprofile package to make use of the kernel support. + endmenu diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index b981c530f..e6f7c8043 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -128,9 +128,6 @@ config ADK_KPACKAGE_KMOD_HFSPLUS_FS data forks and creator codes, but it also has several UNIX style features such as file ownership and permissions. - -source "package/ntfs-3g/Config.in" - config ADK_KPACKAGE_KMOD_NTFS_FS prompt "kmod-fs-ntfs...................... NTFS file system support" tristate diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index eb2737eed..987fe40cc 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -4,13 +4,37 @@ config ADK_LINUX_INITRAMFS_BUILTIN boolean default n -menu "Miscellaneous devices support" +config ADK_KERNEL_RFKILL + boolean + default n config ADK_KERNEL_WATCHDOG boolean default y if ADK_TARGET_WITH_WATCHDOG default n +config ADK_KERNEL_I2C_CHARDEV + boolean + default n + +menu "Miscellaneous devices support" + +config ADK_KPACKAGE_KMOD_I2C + prompt "kmod-i2c.......................... I2C support" + tristate + select ADK_KERNEL_I2C_CHARDEV + default n + help + I2C support + +config ADK_KPACKAGE_KMOD_SCx200_ACB + prompt "kmod-i2c-geode.................... I2C driver for Geode" + tristate + depends on ADK_KPACKAGE_KMOD_I2C + default n + help + I2C driver for Geode boards. + config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG prompt "kmod-softdog...................... Software watchdog" tristate @@ -21,15 +45,6 @@ config ADK_KPACKAGE_KMOD_SOFT_WATCHDOG from some situations that the hardware watchdog will recover from. Equally it's a lot cheaper to install. -#config ADK_KPACKAGE_KMOD_WD1100 -# prompt "kmod-wd1100....................... Soekris net4801 watchdog" -# tristate -# select ADK_KERNEL_WATCHDOG -# default n -# help -# Driver for the NatSemi SC1x00 series Watchdog -# found on Soekris net4801 boards - config ADK_KPACKAGE_KMOD_PARPORT prompt "kmod-parport...................... generic parallel port support" tristate @@ -83,7 +98,4 @@ config ADK_KPACKAGE_KMOD_EEPROM_93CX6 default n help - -source package/exmap/Config.in.kmod - endmenu 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/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 5b5a6e009..368b66d49 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -307,12 +307,4 @@ config ADK_KERNEL_RT2X00_DEBUG endmenu -menu "ATM driver support" -depends on ADK_TARGET_WITH_DSL - -source package/sangam-atm/Config.in -source package/sangam-atm/Config.in.kmod -source package/sangam-atm/Config.in.fw - -endmenu endmenu diff --git a/target/linux/config/Config.in.netfilter b/target/linux/config/Config.in.netfilter index dbc686b0a..ce6e80f15 100644 --- a/target/linux/config/Config.in.netfilter +++ b/target/linux/config/Config.in.netfilter @@ -154,9 +154,4 @@ menu "Ethernet bridge firewalling" source target/linux/config/Config.in.netfilter.ebt endmenu -menu "Netfilter Addons" -source package/ipset/Config.in.kmod -source package/rtsp/Config.in.kmod -endmenu - endmenu diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index b3c48c9ea..8f2f5cf1b 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -28,7 +28,7 @@ config ADK_KERNEL_USB_UHCI_HCD config ADK_KPACKAGE_KMOD_USB prompt "kmod-usb-core..................... USB support" tristate - default y if ADK_LINUX_X86_ALIX1C + default y if ADK_LINUX_ALIX default y if ADK_LINUX_MIPS64_LEMOTE default n depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_LINUX_ARM_FOXG20 || ADK_KERNEL_USB) @@ -81,7 +81,7 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD config ADK_KPACKAGE_KMOD_USB_OHCI_HCD prompt "kmod-usb-ohci................... Support for OHCI controllers" tristate - default y if ADK_LINUX_X86_ALIX1C + default y if ADK_LINUX_ALIX default y if ADK_LINUX_MIPS64_LEMOTE default n depends on !ADK_LINUX_CRIS_FOXBOARD @@ -128,7 +128,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD prompt "kmod-usb-ehci................... Support for USB 2.0 controllers" tristate depends on !(ADK_LINUX_CRIS_FOXBOARD || ADK_KERNEL_USB_EHCI_HCD) - default y if ADK_LINUX_X86_ALIX1C + default y if ADK_LINUX_ALIX default y if ADK_LINUX_MIPS64_LEMOTE default n depends on ADK_KPACKAGE_KMOD_USB @@ -169,6 +169,14 @@ config ADK_KPACKAGE_KMOD_USB_PEGASUS default n depends on ADK_PACKAGE_KMOD_USB_CONTROLLER +config ADK_KPACKAGE_KMOD_USB_HSO + prompt "kmod-usb-hso...................... Support for USB HSO devices" + tristate + select ADK_KERNEL_RFKILL + select ADK_KPACKAGE_KMOD_USB_STORAGE + default n + depends on ADK_PACKAGE_KMOD_USB_CONTROLLER + config ADK_KPACKAGE_KMOD_USB_PRINTER prompt "kmod-usb-printer.................. Support for USB printers" tristate 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) |