summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-19 10:49:49 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-19 10:49:49 +0200
commit7907e3ee7302ac3fd428989a07b0df74f0c52853 (patch)
treee6de18488a687707667927065724372b40510d65 /target
parentb70fdbfbf1139605c22083b647337f2b16f62fc3 (diff)
parent61355d1f054c15673adeb62d32dfd4563f89c165 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r--target/Config.in18
-rw-r--r--target/Makefile3
-rw-r--r--target/ag241/Makefile8
-rw-r--r--target/ag241/tools/rules.mk2
-rw-r--r--target/alix1c/Makefile18
-rw-r--r--target/alix2d/Makefile30
-rw-r--r--target/alix2d/kernel.config85
-rw-r--r--target/alix2d13/Makefile18
-rw-r--r--target/alix2d13/kernel.config233
-rw-r--r--target/brcm/Makefile4
-rw-r--r--target/foxboard/Makefile7
-rw-r--r--target/foxg20/Makefile22
-rw-r--r--target/ibmx40/Makefile18
-rw-r--r--target/lemote/Makefile43
-rw-r--r--target/lemote/files/etc/inittab1
-rw-r--r--target/lemote/files/etc/network/interfaces13
-rw-r--r--target/lemote/files/etc/tmpfs1
-rw-r--r--target/lemote/xorg.conf10
-rw-r--r--target/linux/config/Config.in.crypto37
-rw-r--r--target/linux/config/Config.in.debug12
-rw-r--r--target/linux/config/Config.in.fs3
-rw-r--r--target/linux/config/Config.in.ipsec22
-rw-r--r--target/linux/config/Config.in.misc38
-rw-r--r--target/linux/config/Config.in.multimedia3
-rw-r--r--target/linux/config/Config.in.netdevice8
-rw-r--r--target/linux/config/Config.in.netfilter5
-rw-r--r--target/linux/config/Config.in.usb14
-rw-r--r--target/native/Makefile9
-rw-r--r--target/qemu-arm/Makefile15
-rw-r--r--target/qemu-cris/Makefile14
-rw-r--r--target/qemu-mips/Makefile14
-rw-r--r--target/qemu-mips64/Makefile9
-rw-r--r--target/qemu-mips64el/Makefile10
-rw-r--r--target/qemu-mipsel/Makefile12
-rw-r--r--target/qemu-x86/Makefile12
-rw-r--r--target/qemu-x86_64/Makefile11
-rw-r--r--target/rb4xx/Makefile10
-rw-r--r--target/rb532/Makefile19
-rw-r--r--target/rescue-x86/Makefile9
-rw-r--r--target/rescue-x86_64/Makefile8
-rw-r--r--target/shuttle/Makefile8
-rw-r--r--target/toolchain-mipsel/Makefile5
-rw-r--r--target/wag54g/Makefile13
-rw-r--r--target/wrap/Makefile21
-rw-r--r--target/zaurus/Makefile6
45 files changed, 501 insertions, 380 deletions
diff --git a/target/Config.in b/target/Config.in
index 1dbcd5cb1..fc3e07b97 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -161,6 +161,9 @@ config ADK_wag54g
config ADK_shuttle
tristate
+config ADK_x86
+ tristate
+
config ADK_TARGET
string
default "alix1c" if ADK_alix1c
@@ -287,12 +290,12 @@ config ADK_LINUX_MIPS64_LEMOTE
select ADK_TARGET_WITH_USB
select ADK_TARGET_WITH_VGA
select ADK_TARGET_WITH_INPUT
- select ADK_TARGET_WITH_PCI
select ADK_TARGET_WITH_RTC
select ADK_PACKAGE_KMOD_USB_CONTROLLER
select ADK_KPACKAGE_KMOD_MAC80211
select ADK_KPACKAGE_KMOD_SND
select ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
+ select ADK_KPACKAGE_KMOD_SND_OSSEMUL
help
Lemote Subnotebook.
http://www.lemote.com/english/index.html
@@ -635,8 +638,8 @@ depends on ADK_LINUX_ALIX
config ADK_LINUX_X86_ALIX1C
bool "PC Engines Alix1C"
+ select ADK_x86
select ADK_alix1c
- select ADK_KERNEL_USB
select ADK_KERNEL_NLS
select ADK_KERNEL_SCSI
select ADK_KERNEL_ATA
@@ -651,6 +654,7 @@ config ADK_LINUX_X86_ALIX1C
select ADK_TARGET_WITH_VGA
select ADK_TARGET_WITH_MINIPCI
select ADK_TARGET_WITH_INPUT
+ select ADK_PACKAGE_KMOD_USB_CONTROLLER
help
Support for ALIX1C boards.
http://www.pcengines.ch/
@@ -658,8 +662,8 @@ config ADK_LINUX_X86_ALIX1C
config ADK_LINUX_X86_ALIX2D
bool "PC Engines Alix2D"
+ select ADK_x86
select ADK_alix2d
- select ADK_KERNEL_USB
select ADK_KERNEL_NLS
select ADK_KERNEL_SCSI
select ADK_KERNEL_ATA
@@ -674,6 +678,7 @@ config ADK_LINUX_X86_ALIX2D
select ADK_TARGET_WITH_MINIPCI
select ADK_TARGET_WITH_LEDS
select ADK_TARGET_WITH_WATCHDOG
+ select ADK_PACKAGE_KMOD_USB_CONTROLLER
help
Support for ALIX2D boards.
http://www.pcengines.ch/
@@ -681,8 +686,8 @@ config ADK_LINUX_X86_ALIX2D
config ADK_LINUX_X86_ALIX2D13
bool "PC Engines Alix2D13"
+ select ADK_x86
select ADK_alix2d13
- select ADK_KERNEL_USB
select ADK_KERNEL_NLS
select ADK_KERNEL_SCSI
select ADK_KERNEL_ATA
@@ -697,6 +702,8 @@ config ADK_LINUX_X86_ALIX2D13
select ADK_TARGET_WITH_USB
select ADK_TARGET_WITH_MINIPCI
select ADK_TARGET_WITH_LEDS
+ select ADK_TARGET_WITH_WATCHDOG
+ select ADK_PACKAGE_KMOD_USB_CONTROLLER
help
Support for ALIX2D13 boards.
http://www.pcengines.ch/
@@ -853,6 +860,7 @@ prompt "Target Firmware type"
config ADK_TARGET_ROOTFS_INITRAMFS
bool "initramfs filesystem"
depends on \
+ ADK_LINUX_ALIX || \
ADK_LINUX_QEMU || \
ADK_LINUX_X86_64_SHUTTLE || \
ADK_LINUX_NATIVE || \
@@ -866,6 +874,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
bool "initramfs filesystem included into kernel image"
select ADK_LINUX_INITRAMFS_BUILTIN
depends on \
+ ADK_LINUX_ALIX || \
ADK_LINUX_QEMU || \
ADK_LINUX_X86_IBMX40 || \
ADK_LINUX_X86_64_SHUTTLE || \
@@ -953,6 +962,7 @@ config ADK_TARGET_ROOTFS_EXT2_BLOCK
config ADK_TARGET_ROOTFS_ARCHIVE
bool "Archive usable for different filesystems"
depends on \
+ ADK_LINUX_NATIVE || \
ADK_LINUX_QEMU || \
ADK_LINUX_XSCALE_ZAURUS || \
ADK_LINUX_X86_IBMX40 || \
diff --git a/target/Makefile b/target/Makefile
index b3f266ee0..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,3 +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 ${ADK_RUNTIME_PASSWORD} via ssh or console'
diff --git a/target/ag241/Makefile b/target/ag241/Makefile
index 05ce25271..ac95593fb 100644
--- a/target/ag241/Makefile
+++ b/target/ag241/Makefile
@@ -27,7 +27,7 @@ kernel-install: tools-compile
-o $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel 2>/dev/null
ifeq ($(FS),squashfs)
-imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS)
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS)
@if [ $$(stat --format=%s ${BUILD_DIR}/${ROOTFSSQUASHFS}) -gt 3801088 ];then \
echo 'Image is too big!'; \
else \
@@ -37,18 +37,14 @@ imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS)
echo 'tftp 192.168.1.1'; \
echo 'tftp> binary'; \
echo "tftp> put $(ROOTFSSQUASHFS) upgrade_code.bin"; \
- echo 'Login as user root with password linux123 via ssh or console'; \
fi
endif
-
ifeq ($(FS),nfsroot)
-imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
- @echo
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL)
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}'
@echo 'You can flash the kernel via tftp:'
@echo 'tftp 192.168.1.1'
@echo 'tftp> binary'
@echo 'tftp> put ${ADK_TARGET}-${FS}-kernel upgrade_code.bin'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/ag241/tools/rules.mk b/target/ag241/tools/rules.mk
index 8d03c031a..a6a3684ac 100644
--- a/target/ag241/tools/rules.mk
+++ b/target/ag241/tools/rules.mk
@@ -1,5 +1,3 @@
-# $Id$
-#-
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile
index 5a737fd8a..d38eb727b 100644
--- a/target/alix1c/Makefile
+++ b/target/alix1c/Makefile
@@ -9,21 +9,25 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
-kernel-install:
- @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk
-
ifeq ($(FS),ext2-block)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "To install everything to CompactFlash use scripts/install.sh"
- @echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
- @echo
@echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}'
- @echo 'Login as user root with password linux123 via ssh or console'
+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}'
+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'
endif
diff --git a/target/alix2d/Makefile b/target/alix2d/Makefile
index cd4964c24..bdd90a52c 100644
--- a/target/alix2d/Makefile
+++ b/target/alix2d/Makefile
@@ -9,21 +9,31 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
-kernel-install:
- @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk
-
ifeq ($(FS),ext2-block)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
- @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"
- @echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
- @echo
- @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
- @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSUSERTARBALL}'
- @echo 'Login as user root with password linux123 via ssh or console'
+ @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:'
+ @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:'
+ @echo '${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
endif
diff --git a/target/alix2d/kernel.config b/target/alix2d/kernel.config
index 39382c7b4..cfe4a4653 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.33
-# Fri Feb 26 22:49:33 2010
+# Linux kernel version: 2.6.34
+# Fri Jul 16 05:47:44 2010
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -18,6 +18,7 @@ CONFIG_STACKTRACE_SUPPORT=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
+# CONFIG_NEED_DMA_MAP_STATE is not set
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_HWEIGHT=y
@@ -42,6 +43,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
# CONFIG_AUDIT_ARCH is not set
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_EARLY_RES=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
CONFIG_GENERIC_IRQ_PROBE=y
@@ -88,7 +90,6 @@ CONFIG_RCU_FANOUT=32
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=14
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-# CONFIG_GROUP_SCHED is not set
# CONFIG_CGROUPS is not set
# CONFIG_SYSFS_DEPRECATED_V2 is not set
# CONFIG_RELAY is not set
@@ -133,8 +134,10 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_HAVE_IOREMAP_PROT=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_HW_BREAKPOINT=y
CONFIG_HAVE_USER_RETURN_NOTIFIER=y
@@ -204,12 +207,13 @@ CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
#
CONFIG_TICK_ONESHOT=y
CONFIG_NO_HZ=y
-# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_HIGH_RES_TIMERS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
# CONFIG_SMP is not set
# CONFIG_X86_EXTENDED_PLATFORM is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_PARAVIRT_GUEST is not set
+CONFIG_NO_BOOTMEM=y
# CONFIG_MEMTEST is not set
# CONFIG_M386 is not set
# CONFIG_M486 is not set
@@ -312,9 +316,7 @@ CONFIG_X86_CHECK_BIOS_CORRUPTION=y
# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
CONFIG_X86_RESERVE_LOW_64K=y
# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-# CONFIG_MTRR_SANITIZER is not set
-# CONFIG_X86_PAT is not set
+# CONFIG_MTRR is not set
# CONFIG_SECCOMP is not set
# CONFIG_CC_STACKPROTECTOR is not set
# CONFIG_HZ_100 is not set
@@ -322,7 +324,7 @@ CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_1000 is not set
CONFIG_HZ=250
-# CONFIG_SCHED_HRTICK is not set
+CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
CONFIG_PHYSICAL_START=0x100000
# CONFIG_RELOCATABLE is not set
@@ -358,7 +360,6 @@ CONFIG_PCI_DIRECT=y
CONFIG_PCI_DOMAINS=y
# CONFIG_PCIEPORTBUS is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_PCI_LEGACY is not set
# CONFIG_PCI_STUB is not set
# CONFIG_PCI_IOV is not set
CONFIG_ISA_DMA_API=y
@@ -366,6 +367,7 @@ CONFIG_ISA_DMA_API=y
# CONFIG_MCA is not set
# CONFIG_SCx200 is not set
# CONFIG_OLPC is not set
+CONFIG_K8_NB=y
# CONFIG_PCCARD is not set
# CONFIG_HOTPLUG_PCI is not set
@@ -383,7 +385,6 @@ CONFIG_NET=y
# Networking options
#
CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
CONFIG_UNIX=y
# CONFIG_NET_KEY is not set
CONFIG_INET=y
@@ -488,13 +489,30 @@ CONFIG_BLK_DEV=y
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_BLK_DEV_HD is not set
-# CONFIG_MISC_DEVICES is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+CONFIG_CS5535_MFGPT=y
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=y
+# CONFIG_HP_ILO is not set
+# CONFIG_VMWARE_BALLOON is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_CB710_CORE is not set
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
#
# SCSI device support
#
+CONFIG_SCSI_MOD=y
# CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
@@ -570,6 +588,7 @@ CONFIG_PATA_AMD=y
# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_IT8213 is not set
# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_LEGACY is not set
# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_MARVELL is not set
# CONFIG_PATA_MPIIX is not set
@@ -621,7 +640,6 @@ CONFIG_NETDEVICES=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not set
CONFIG_PHYLIB=y
-# CONFIG_SWCONFIG is not set
#
# MII PHY device drivers
@@ -639,6 +657,7 @@ CONFIG_PHYLIB=y
# CONFIG_NATIONAL_PHY is not set
# CONFIG_STE10XP is not set
# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_NET_ETHERNET=y
@@ -662,6 +681,7 @@ CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set
# CONFIG_AMD8111_ETH is not set
# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_KSZ884X_PCI is not set
# CONFIG_B44 is not set
# CONFIG_FORCEDETH is not set
# CONFIG_E100 is not set
@@ -743,11 +763,17 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_UNIX98_PTYS=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_IPMI_HANDLER is not set
-# CONFIG_HW_RANDOM is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_AMD is not set
+CONFIG_HW_RANDOM_GEODE=y
+# CONFIG_HW_RANDOM_VIA is not set
# CONFIG_NVRAM is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
@@ -769,11 +795,13 @@ CONFIG_DEVPORT=y
# CONFIG_PPS is not set
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
#
# Memory mapped GPIO expanders:
#
+# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_SCH is not set
#
# I2C GPIO expanders:
@@ -808,6 +836,7 @@ CONFIG_WATCHDOG=y
# CONFIG_ADVANTECH_WDT is not set
# CONFIG_ALIM1535_WDT is not set
# CONFIG_ALIM7101_WDT is not set
+CONFIG_GEODE_WDT=y
# CONFIG_SC520_WDT is not set
# CONFIG_SBC_FITPC2_WATCHDOG is not set
# CONFIG_EUROTECH_WDT is not set
@@ -854,6 +883,8 @@ CONFIG_SSB_POSSIBLE=y
# CONFIG_MFD_SM501 is not set
# CONFIG_HTC_PASIC3 is not set
# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_LPC_SCH is not set
# CONFIG_REGULATOR is not set
# CONFIG_MEDIA_SUPPORT is not set
@@ -905,10 +936,6 @@ CONFIG_LEDS_CLASS=y
CONFIG_LEDS_ALIX2=y
# CONFIG_LEDS_GPIO is not set
# CONFIG_LEDS_LT3593 is not set
-
-#
-# LED Triggers
-#
# CONFIG_LEDS_TRIGGERS is not set
# CONFIG_ACCESSIBILITY is not set
# CONFIG_INFINIBAND is not set
@@ -1036,6 +1063,7 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
+# CONFIG_LOGFS is not set
# CONFIG_CRAMFS is not set
# CONFIG_SQUASHFS is not set
# CONFIG_VXFS_FS is not set
@@ -1050,6 +1078,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
# CONFIG_NFS_FS is not set
# CONFIG_NFSD is not set
# CONFIG_SMB_FS is not set
+# CONFIG_CEPH_FS is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
@@ -1148,10 +1177,19 @@ CONFIG_CRYPTO=y
#
# Crypto core or helper
#
-# CONFIG_CRYPTO_MANAGER is not set
-# CONFIG_CRYPTO_MANAGER2 is not set
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ALGAPI2=m
+CONFIG_CRYPTO_AEAD2=m
+CONFIG_CRYPTO_BLKCIPHER2=m
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH2=m
+CONFIG_CRYPTO_RNG2=m
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_MANAGER2=m
# CONFIG_CRYPTO_GF128MUL is not set
# CONFIG_CRYPTO_NULL is not set
+CONFIG_CRYPTO_WORKQUEUE=m
# CONFIG_CRYPTO_CRYPTD is not set
# CONFIG_CRYPTO_AUTHENC is not set
# CONFIG_CRYPTO_TEST is not set
@@ -1178,7 +1216,7 @@ CONFIG_CRYPTO=y
# Hash modes
#
# CONFIG_CRYPTO_HMAC is not set
-# CONFIG_CRYPTO_XCBC is not set
+CONFIG_CRYPTO_XCBC=m
# CONFIG_CRYPTO_VMAC is not set
#
@@ -1233,10 +1271,7 @@ CONFIG_CRYPTO=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 is not set
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_HW is not set
#
# OCF Configuration
diff --git a/target/alix2d13/Makefile b/target/alix2d13/Makefile
index 5a737fd8a..ef05ed7da 100644
--- a/target/alix2d13/Makefile
+++ b/target/alix2d13/Makefile
@@ -9,21 +9,25 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
-kernel-install:
- @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk
-
ifeq ($(FS),ext2-block)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "To install everything to CompactFlash use scripts/install.sh"
- @echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
- @echo
@echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}'
- @echo 'Login as user root with password linux123 via ssh or console'
+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}'
+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'
endif
diff --git a/target/alix2d13/kernel.config b/target/alix2d13/kernel.config
index 76e1ef7e3..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.32
-# Mon Feb 1 19:22:34 2010
+# Linux kernel version: 2.6.34
+# Mon Jul 5 20:11:20 2010
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -18,9 +18,9 @@ CONFIG_STACKTRACE_SUPPORT=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
+# CONFIG_NEED_DMA_MAP_STATE is not set
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_BUG=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_GPIO=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
@@ -43,6 +43,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
# CONFIG_AUDIT_ARCH is not set
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_EARLY_RES=y
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
CONFIG_GENERIC_IRQ_PROBE=y
@@ -62,9 +63,11 @@ CONFIG_LOCALVERSION=""
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_LZO=y
# CONFIG_KERNEL_GZIP is not set
# CONFIG_KERNEL_BZIP2 is not set
CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZO is not set
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
@@ -78,6 +81,7 @@ CONFIG_SYSVIPC_SYSCTL=y
#
CONFIG_TREE_RCU=y
# CONFIG_TREE_PREEMPT_RCU is not set
+# CONFIG_TINY_RCU is not set
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
# CONFIG_RCU_FANOUT_EXACT is not set
@@ -85,7 +89,6 @@ CONFIG_RCU_FANOUT=32
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=14
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-# CONFIG_GROUP_SCHED is not set
# CONFIG_CGROUPS is not set
# CONFIG_SYSFS_DEPRECATED_V2 is not set
# CONFIG_RELAY is not set
@@ -100,10 +103,10 @@ CONFIG_SYSCTL_SYSCALL=y
# CONFIG_KALLSYMS is not set
CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
-CONFIG_BUG=y
+# CONFIG_BUG is not set
# CONFIG_ELF_CORE is not set
# CONFIG_PCSPKR_PLATFORM is not set
-CONFIG_BASE_FULL=y
+# CONFIG_BASE_FULL is not set
CONFIG_FUTEX=y
CONFIG_EPOLL=y
CONFIG_SIGNALFD=y
@@ -116,7 +119,7 @@ CONFIG_HAVE_PERF_EVENTS=y
#
# Kernel Performance Events And Counters
#
-# CONFIG_PERF_EVENTS is not set
+CONFIG_PERF_EVENTS=y
# CONFIG_PERF_COUNTERS is not set
# CONFIG_VM_EVENT_COUNTERS is not set
# CONFIG_PCI_QUIRKS is not set
@@ -130,9 +133,13 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_HAVE_IOREMAP_PROT=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
#
# GCOV-based kernel profiling
@@ -141,7 +148,7 @@ CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
+CONFIG_BASE_SMALL=1
CONFIG_MODULES=y
# CONFIG_MODULE_FORCE_LOAD is not set
CONFIG_MODULE_UNLOAD=y
@@ -149,7 +156,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_BLOCK=y
-CONFIG_LBDAF=y
+# CONFIG_LBDAF is not set
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -157,14 +164,41 @@ CONFIG_LBDAF=y
# IO Schedulers
#
CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
# CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_AS is not set
# CONFIG_DEFAULT_DEADLINE is not set
# CONFIG_DEFAULT_CFQ is not set
CONFIG_DEFAULT_NOOP=y
CONFIG_DEFAULT_IOSCHED="noop"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+# CONFIG_MUTEX_SPIN_ON_OWNER is not set
# CONFIG_FREEZER is not set
#
@@ -172,12 +206,13 @@ CONFIG_DEFAULT_IOSCHED="noop"
#
CONFIG_TICK_ONESHOT=y
CONFIG_NO_HZ=y
-# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_HIGH_RES_TIMERS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
# CONFIG_SMP is not set
# CONFIG_X86_EXTENDED_PLATFORM is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_PARAVIRT_GUEST is not set
+CONFIG_NO_BOOTMEM=y
# CONFIG_MEMTEST is not set
# CONFIG_M386 is not set
# CONFIG_M486 is not set
@@ -207,8 +242,7 @@ CONFIG_MGEODE_LX=y
# CONFIG_GENERIC_CPU is not set
# CONFIG_X86_GENERIC is not set
CONFIG_X86_CPU=y
-CONFIG_X86_L1_CACHE_BYTES=64
-CONFIG_X86_INTERNODE_CACHE_BYTES=64
+CONFIG_X86_INTERNODE_CACHE_SHIFT=5
CONFIG_X86_CMPXCHG=y
CONFIG_X86_L1_CACHE_SHIFT=5
CONFIG_X86_XADD=y
@@ -219,8 +253,8 @@ CONFIG_X86_POPAD_OK=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_X86_USE_3DNOW=y
CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=4
CONFIG_X86_DEBUGCTLMSR=y
CONFIG_PROCESSOR_SELECT=y
# CONFIG_CPU_SUP_INTEL is not set
@@ -247,7 +281,6 @@ CONFIG_PREEMPT_NONE=y
# CONFIG_MICROCODE is not set
CONFIG_X86_MSR=y
CONFIG_X86_CPUID=y
-# CONFIG_X86_CPU_DEBUG is not set
CONFIG_NOHIGHMEM=y
# CONFIG_HIGHMEM4G is not set
# CONFIG_HIGHMEM64G is not set
@@ -262,6 +295,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -275,17 +309,13 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
CONFIG_X86_RESERVE_LOW_64K=y
# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-# CONFIG_MTRR_SANITIZER is not set
-# CONFIG_X86_PAT is not set
+# CONFIG_MTRR is not set
# CONFIG_SECCOMP is not set
# CONFIG_CC_STACKPROTECTOR is not set
# CONFIG_HZ_100 is not set
@@ -293,7 +323,7 @@ CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_1000 is not set
CONFIG_HZ=250
-# CONFIG_SCHED_HRTICK is not set
+CONFIG_SCHED_HRTICK=y
# CONFIG_KEXEC is not set
CONFIG_PHYSICAL_START=0x100000
# CONFIG_RELOCATABLE is not set
@@ -329,15 +359,14 @@ CONFIG_PCI_DIRECT=y
CONFIG_PCI_DOMAINS=y
# CONFIG_PCIEPORTBUS is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_PCI_LEGACY is not set
# CONFIG_PCI_STUB is not set
# CONFIG_PCI_IOV is not set
CONFIG_ISA_DMA_API=y
# CONFIG_ISA is not set
# CONFIG_MCA is not set
# CONFIG_SCx200 is not set
-# CONFIG_GEODE_MFGPT_TIMER is not set
# CONFIG_OLPC is not set
+CONFIG_K8_NB=y
# CONFIG_PCCARD is not set
# CONFIG_HOTPLUG_PCI is not set
@@ -355,7 +384,6 @@ CONFIG_NET=y
# Networking options
#
CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
CONFIG_UNIX=y
# CONFIG_NET_KEY is not set
CONFIG_INET=y
@@ -414,7 +442,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_IRDA is not set
# CONFIG_BT is not set
# CONFIG_AF_RXRPC is not set
-# CONFIG_WIRELESS is not set
+CONFIG_WIRELESS=y
+# CONFIG_CFG80211 is not set
+# CONFIG_LIB80211 is not set
+
+#
+# CFG80211 needs to be enabled for MAC80211
+#
# CONFIG_WIMAX is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
@@ -444,19 +478,40 @@ CONFIG_BLK_DEV=y
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
# CONFIG_BLK_DEV_LOOP is not set
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
# CONFIG_BLK_DEV_NBD is not set
# CONFIG_BLK_DEV_SX8 is not set
# CONFIG_BLK_DEV_RAM is not set
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_BLK_DEV_HD is not set
-# CONFIG_MISC_DEVICES is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+CONFIG_CS5535_MFGPT=y
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=y
+# CONFIG_HP_ILO is not set
+# CONFIG_VMWARE_BALLOON is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_CB710_CORE is not set
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
#
# SCSI device support
#
+CONFIG_SCSI_MOD=y
# CONFIG_RAID_ATTRS is not set
CONFIG_SCSI=y
CONFIG_SCSI_DMA=y
@@ -532,6 +587,7 @@ CONFIG_PATA_AMD=y
# CONFIG_PATA_IT821X is not set
# CONFIG_PATA_IT8213 is not set
# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_LEGACY is not set
# CONFIG_PATA_TRIFLEX is not set
# CONFIG_PATA_MARVELL is not set
# CONFIG_PATA_MPIIX is not set
@@ -542,15 +598,16 @@ CONFIG_PATA_AMD=y
# CONFIG_PATA_NS87415 is not set
# CONFIG_PATA_OPTI is not set
# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_PDC_OLD is not set
# CONFIG_PATA_RADISYS is not set
# CONFIG_PATA_RDC is not set
# CONFIG_PATA_RZ1000 is not set
# CONFIG_PATA_SC1200 is not set
# CONFIG_PATA_SERVERWORKS is not set
-# CONFIG_PATA_PDC2027X is not set
# CONFIG_PATA_SIL680 is not set
# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
# CONFIG_PATA_VIA is not set
# CONFIG_PATA_WINBOND is not set
# CONFIG_PATA_PLATFORM is not set
@@ -567,7 +624,7 @@ CONFIG_PATA_AMD=y
#
#
-# See the help texts for more information.
+# The newer stack is recommended.
#
# CONFIG_FIREWIRE is not set
# CONFIG_IEEE1394 is not set
@@ -582,7 +639,6 @@ CONFIG_NETDEVICES=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not set
CONFIG_PHYLIB=y
-# CONFIG_SWCONFIG is not set
#
# MII PHY device drivers
@@ -600,6 +656,7 @@ CONFIG_PHYLIB=y
# CONFIG_NATIONAL_PHY is not set
# CONFIG_STE10XP is not set
# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
CONFIG_NET_ETHERNET=y
@@ -623,6 +680,7 @@ CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set
# CONFIG_AMD8111_ETH is not set
# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_KSZ884X_PCI is not set
# CONFIG_B44 is not set
# CONFIG_FORCEDETH is not set
# CONFIG_E100 is not set
@@ -647,8 +705,10 @@ CONFIG_VIA_RHINE_MMIO=y
# CONFIG_NETDEV_10000 is not set
# CONFIG_TR is not set
CONFIG_WLAN=y
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
+# CONFIG_AIRO is not set
+# CONFIG_ATMEL is not set
+# CONFIG_PRISM54 is not set
+# CONFIG_HOSTAP is not set
#
# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -669,27 +729,7 @@ CONFIG_WLAN=y
#
# Input device support
#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
+# CONFIG_INPUT is not set
#
# Hardware I/O ports
@@ -722,6 +762,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
CONFIG_UNIX98_PTYS=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
# CONFIG_LEGACY_PTYS is not set
@@ -730,7 +771,6 @@ CONFIG_UNIX98_PTYS=y
# CONFIG_NVRAM is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
-# CONFIG_SONYPI is not set
# CONFIG_MWAVE is not set
# CONFIG_PC8736x_GPIO is not set
# CONFIG_NSC_GPIO is not set
@@ -749,11 +789,13 @@ CONFIG_DEVPORT=y
# CONFIG_PPS is not set
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
#
# Memory mapped GPIO expanders:
#
+# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_SCH is not set
#
# I2C GPIO expanders:
@@ -762,6 +804,7 @@ CONFIG_GPIO_SYSFS=y
#
# PCI GPIO expanders:
#
+# CONFIG_GPIO_CS5535 is not set
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_LANGWELL is not set
@@ -776,7 +819,50 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_POWER_SUPPLY is not set
# CONFIG_HWMON is not set
# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_ACQUIRE_WDT is not set
+# CONFIG_ADVANTECH_WDT is not set
+# CONFIG_ALIM1535_WDT is not set
+# CONFIG_ALIM7101_WDT is not set
+CONFIG_GEODE_WDT=y
+# CONFIG_SC520_WDT is not set
+# CONFIG_SBC_FITPC2_WATCHDOG is not set
+# CONFIG_EUROTECH_WDT is not set
+# CONFIG_IB700_WDT is not set
+# CONFIG_IBMASR is not set
+# CONFIG_WAFER_WDT is not set
+# CONFIG_I6300ESB_WDT is not set
+# CONFIG_ITCO_WDT is not set
+# CONFIG_IT8712F_WDT is not set
+# CONFIG_IT87_WDT is not set
+# CONFIG_HP_WATCHDOG is not set
+# CONFIG_SC1200_WDT is not set
+# CONFIG_PC87413_WDT is not set
+# CONFIG_60XX_WDT is not set
+# CONFIG_SBC8360_WDT is not set
+# CONFIG_SBC7240_WDT is not set
+# CONFIG_CPU5_WDT is not set
+# CONFIG_SMSC_SCH311X_WDT is not set
+# CONFIG_SMSC37B787_WDT is not set
+# CONFIG_W83627HF_WDT is not set
+# CONFIG_W83697HF_WDT is not set
+# CONFIG_W83697UG_WDT is not set
+# CONFIG_W83877F_WDT is not set
+# CONFIG_W83977F_WDT is not set
+# CONFIG_MACHZ_WDT is not set
+# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
CONFIG_SSB_POSSIBLE=y
#
@@ -791,6 +877,8 @@ CONFIG_SSB_POSSIBLE=y
# CONFIG_MFD_SM501 is not set
# CONFIG_HTC_PASIC3 is not set
# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_LPC_SCH is not set
# CONFIG_REGULATOR is not set
# CONFIG_MEDIA_SUPPORT is not set
@@ -798,7 +886,7 @@ CONFIG_SSB_POSSIBLE=y
# Graphics support
#
# CONFIG_AGP is not set
-CONFIG_VGA_ARB=y
+# CONFIG_VGA_ARB is not set
# CONFIG_DRM is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -810,7 +898,6 @@ CONFIG_VGA_ARB=y
#
# CONFIG_DISPLAY_SUPPORT is not set
# CONFIG_SOUND is not set
-# CONFIG_HID_SUPPORT is not set
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
@@ -842,10 +929,7 @@ CONFIG_LEDS_CLASS=y
#
CONFIG_LEDS_ALIX2=y
# CONFIG_LEDS_GPIO is not set
-
-#
-# LED Triggers
-#
+# CONFIG_LEDS_LT3593 is not set
# CONFIG_LEDS_TRIGGERS is not set
# CONFIG_ACCESSIBILITY is not set
# CONFIG_INFINIBAND is not set
@@ -881,7 +965,9 @@ CONFIG_RTC_DRV_CMOS=y
# CONFIG_RTC_DRV_M48T86 is not set
# CONFIG_RTC_DRV_M48T35 is not set
# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
# CONFIG_RTC_DRV_V3020 is not set
#
@@ -895,7 +981,7 @@ CONFIG_RTC_DRV_CMOS=y
# TI VLYNQ
#
# CONFIG_STAGING is not set
-CONFIG_X86_PLATFORM_DEVICES=y
+# CONFIG_X86_PLATFORM_DEVICES is not set
#
# Firmware Drivers
@@ -918,16 +1004,15 @@ CONFIG_EXT2_FS=y
# CONFIG_JFS_FS is not set
# CONFIG_FS_POSIX_ACL is not set
# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
# CONFIG_OCFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
# CONFIG_AUFS_FS is not set
CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
+# CONFIG_FSNOTIFY is not set
# CONFIG_DNOTIFY is not set
# CONFIG_INOTIFY is not set
-CONFIG_INOTIFY_USER=y
+# CONFIG_INOTIFY_USER is not set
# CONFIG_QUOTA is not set
# CONFIG_AUTOFS_FS is not set
# CONFIG_AUTOFS4_FS is not set
@@ -972,6 +1057,7 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
+# CONFIG_LOGFS is not set
# CONFIG_CRAMFS is not set
# CONFIG_SQUASHFS is not set
# CONFIG_VXFS_FS is not set
@@ -986,6 +1072,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
# CONFIG_NFS_FS is not set
# CONFIG_NFSD is not set
# CONFIG_SMB_FS is not set
+# CONFIG_CEPH_FS is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
@@ -1029,7 +1116,6 @@ CONFIG_STRIP_ASM_SYMS=y
# CONFIG_DEBUG_FS is not set
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_DEBUG_MEMORY_INIT is not set
CONFIG_ARCH_WANT_FRAME_POINTERS=y
# CONFIG_FRAME_POINTER is not set
@@ -1075,7 +1161,11 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
# CONFIG_KEYS is not set
# CONFIG_SECURITY is not set
# CONFIG_SECURITYFS is not set
-# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
CONFIG_CRYPTO=y
#
@@ -1166,10 +1256,7 @@ CONFIG_CRYPTO=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 is not set
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_HW is not set
#
# OCF Configuration
diff --git a/target/brcm/Makefile b/target/brcm/Makefile
index 633912f9f..d89eaa795 100644
--- a/target/brcm/Makefile
+++ b/target/brcm/Makefile
@@ -22,11 +22,9 @@ kernel-install: tools-compile
$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),nfsroot)
-imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
- @echo
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL)
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}'
@echo 'Type following on the CFE prompt to boot the kernel:'
@echo 'CFE> boot -z -elf -tftp 192.168.1.254:${ADK_TARGET}-${FS}-kernel'
- @echo 'Login as user root with password linux123 via ssh or console.'
endif
diff --git a/target/foxboard/Makefile b/target/foxboard/Makefile
index f085a8f64..999ac8ab8 100644
--- a/target/foxboard/Makefile
+++ b/target/foxboard/Makefile
@@ -21,7 +21,7 @@ kernel-install: tools-compile
$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE)
ifeq ($(FS),squashfs)
-imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS)
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS)
dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \
bs=4063232 conv=sync $(MAKE_TRACE)
@if [ $$(stat --format=%s ${BIN_DIR}/${ROOTFSSQUASHFS}) -gt 4063232 ];then \
@@ -29,14 +29,11 @@ imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS)
else \
echo 'Use sudo ./boot_linux -F -i $(ROOTFSSQUASHFS) to flash'; \
echo 'Do not forget to set the network boot jumper, before you start the foxboard'; \
- echo 'Login as user root with password linux123 via ssh or console'; \
fi
endif
ifeq ($(FS),nfsroot)
-imageinstall: ${BIN_DIR}/${ROOTFSUSERTARBALL}
- @echo
+imageinstall: kernel-install ${BIN_DIR}/${ROOTFSUSERTARBALL}
@echo Use sudo ./boot_linux -F -i ${ADK_TARGET}-${FS}-kernel to flash the kernel
@echo Do not forget to set network boot jumper, before you start the foxboard
@echo ${ROOTFSUSERTARBALL} is your nfs root and can be extracted on your nfs server
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/foxg20/Makefile b/target/foxg20/Makefile
index 5762b4939..0a022baf3 100644
--- a/target/foxg20/Makefile
+++ b/target/foxg20/Makefile
@@ -7,35 +7,31 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
+KERNEL:=$(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel
LOADADDR:= 0x20008000
-kernel-install:
- gzip -9 < $(LINUX_DIR)/arch/arm/boot/Image > ${BUILD_DIR}/Image.gz
- mkimage -A arm -O linux -T kernel -C gzip \
+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 \
- -n foxg20 $(TARGET_DIR)/boot/uImage $(MAKE_TRACE)
- @cp $(TARGET_DIR)/boot/uImage \
+ -n foxg20 $(TARGET_DIR)/boot/vmlinuz-adk $(MAKE_TRACE)
+ @cp $(TARGET_DIR)/boot/vmlinuz-adk \
$(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),nfsroot)
-imageinstall: ${BIN_DIR}/${ROOTFSUSERTARBALL}
+imageinstall: kernel-install ${BIN_DIR}/${ROOTFSUSERTARBALL}
@cp $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel \
$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
- @echo
@echo 'Type dhcp via u-boot prompt to load kernel'
@echo 'After that type bootm to load the kernel'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
-
ifeq ($(FS),ext2-block)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
@echo "The RootFS tarball is:"
@echo "$(BIN_DIR)/$(ROOTFSTARBALL)"
@echo 'Before booting from MicroSD card you need to set following u-boot environment variables:'
- @echo "setenv bootcmd 'mmc init; sleep 1; fatload mmc 0 0x22000000 uimage; bootm 0x22000000'"
+ @echo "setenv bootcmd 'mmc init; sleep 1; fatload mmc 0 0x22000000 vmlinuz-adk; bootm 0x22000000'"
@echo
@echo "Boot the board via network and use adkinstall."
@echo "If you just want to update, use adkupdate."
- @echo 'Login as user root with password linux123 via ssh or console.'
endif
diff --git a/target/ibmx40/Makefile b/target/ibmx40/Makefile
index 65ef6bf14..3c95fc2d1 100644
--- a/target/ibmx40/Makefile
+++ b/target/ibmx40/Makefile
@@ -9,40 +9,32 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
-kernel-install:
- @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk
-
createinitcrypt:
$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config
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 $(LINUX_DIR)/arch/x86/boot/compressed/vmlinux \
- $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+ @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
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)"
- @echo 'Login as user root with password linux123 via ssh or console'
endif
-
ifeq ($(FS),usb)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "To install everything to USB use scripts/install.sh"
- @echo 'Login as user root with password linux123 via ssh or console'
endif
-
ifeq ($(FS),initramfs-piggyback)
imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
@cp $(KERNEL) ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
-
ifeq ($(FS),encrypted)
imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt
@echo 'The kernel+cryptinit file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@@ -63,9 +55,7 @@ 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'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/lemote/Makefile b/target/lemote/Makefile
index d79f1e270..aa6006f24 100644
--- a/target/lemote/Makefile
+++ b/target/lemote/Makefile
@@ -9,28 +9,40 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/vmlinuz
-kernel-install:
- @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk
-
createinitcrypt:
$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config
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 $(LINUX_DIR)/vmlinuz $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+ @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
+ @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}'
@echo 'Boot your lemote and type following commands in PMON:'
@echo 'PMON> ifaddr rtl0 <ip-address-client>'
@echo 'PMON> load tftp://<ip-address-server>/${ADK_TARGET}-${FS}-kernel'
@echo 'PMON> g'
- @echo 'Login as user root with password linux123 via ssh or console'
+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}'
+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'
+endif
+ifeq ($(FS),archive)
+imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+ @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
endif
ifeq ($(FS),encrypted)
imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt
@@ -52,29 +64,10 @@ 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'
@echo 'Move boot.cfg to /mnt/boot/boot'
@echo 'mv /mnt/root/boot/boot.cfg /mnt/boot/boot'
@echo 'cd /mnt/root ; mknod -m 644 console c 5 1'
- @echo 'Login as user root with password linux123 via ssh or console'
-endif
-ifeq ($(FS),initramfs)
-imageinstall: $(BIN_DIR)/$(INITRAMFS)
- @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
- @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
- @echo 'Login as user root with password linux123 via ssh or console'
-endif
-ifeq ($(FS),initramfs-piggyback)
-imageinstall: $(BUILD_DIR)/$(INITRAMFS_PIGGYBACK) createinitramfs
- @echo 'The kernel+initramfs file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
- @echo 'Login as user root with password linux123 via ssh or console'
-endif
-ifeq ($(FS),archive)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
- @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/lemote/files/etc/inittab b/target/lemote/files/etc/inittab
index 6e32240bd..cedbc93ff 100644
--- a/target/lemote/files/etc/inittab
+++ b/target/lemote/files/etc/inittab
@@ -6,5 +6,4 @@ tty3::respawn:/sbin/getty -i -L tty3 115200 vt100
tty4::respawn:/sbin/getty -i -L tty4 115200 vt100
tty5::respawn:/sbin/getty -i -L tty5 115200 vt100
tty6::respawn:/sbin/getty -i -L tty6 115200 vt100
-tty7::respawn:/sbin/getty -i -L tty7 115200 vt100
tty11::respawn:/sbin/logread -f
diff --git a/target/lemote/files/etc/network/interfaces b/target/lemote/files/etc/network/interfaces
new file mode 100644
index 000000000..3abd272d8
--- /dev/null
+++ b/target/lemote/files/etc/network/interfaces
@@ -0,0 +1,13 @@
+auto lo
+iface lo inet loopback
+
+# wlan example
+#auto wlan0
+#iface wlan0 inet dhcp
+# wireless-extension 1
+# wireless-mode sta
+# wireless-channel 1
+# wireless-ssid openadk
+# wireless-security wpa2
+# wireless-passphrase openadk123
+
diff --git a/target/lemote/files/etc/tmpfs b/target/lemote/files/etc/tmpfs
new file mode 100644
index 000000000..08558e471
--- /dev/null
+++ b/target/lemote/files/etc/tmpfs
@@ -0,0 +1 @@
+16384
diff --git a/target/lemote/xorg.conf b/target/lemote/xorg.conf
index 95b9dffe1..c9c9388f2 100644
--- a/target/lemote/xorg.conf
+++ b/target/lemote/xorg.conf
@@ -33,18 +33,11 @@ Section "Device"
Option "SWCursor" "true"
Option "UseBIOS" "false"
Option "PanelSize" "1024x600"
-# Option "DualHead" "true"
-EndSection
-
-Section "Device"
- Identifier "card1"
- Driver "fbdev"
- Option "UseFBDev" "true"
EndSection
Section "Monitor"
Identifier "Generic Monitor"
- Option "DPMS" "false"
+ Option "DPMS" "true"
HorizSync 30-70
VertRefresh 50-80
EndSection
@@ -56,6 +49,5 @@ Section "Screen"
DefaultDepth 16
SubSection "Display"
Modes "1024x600"
- # Virtual 1824 600
EndSubSection
EndSection
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 826e47570..b9d73aac2 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.
@@ -150,6 +150,22 @@ config ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER
select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
help
+config ADK_KPACKAGE_KMOD_CRYPTO_AUTHENC
+ prompt "kmod-crypto-authenc.................. AuthENC (IPsec)"
+ tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
+ default n
+ help
+
+config ADK_KPACKAGE_KMOD_CRYPTO_SEQIV
+ prompt "kmod-crypto-seqiv.................... Sequence Number IV Generator"
+ select ADK_KPACKAGE_KMOD_CRYPTO_RNG2
+ select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
+ tristate
+ help
+ This IV generator generates an IV based on a sequence number by
+ xoring it with a salt. This algorithm is mainly useful for CTR
+
config ADK_KPACKAGE_KMOD_CRYPTO_CBC
prompt "kmod-crypto-cbc...................... CBC support"
tristate
@@ -161,6 +177,25 @@ config ADK_KPACKAGE_KMOD_CRYPTO_CBC
CBC: Cipher Block Chaining mode
This block cipher algorithm is required for IPSec.
+config ADK_KPACKAGE_KMOD_CRYPTO_CCM
+ prompt "kmod-crypto-ccm...................... CCM support"
+ tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
+ select ADK_KPACKAGE_KMOD_CRYPTO_CTR
+ default n
+ help
+ Support for Counter with CBC MAC. Required for IPsec.
+
+config ADK_KPACKAGE_KMOD_CRYPTO_CTR
+ prompt "kmod-crypto-ctr...................... CTR support"
+ tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
+ select ADK_KPACKAGE_KMOD_CRYPTO_SEQIV
+ default n
+ help
+ CTR: Counter mode
+ This block cipher algorithm is required for IPSec.
+
config ADK_KPACKAGE_KMOD_CRYPTO_ECB
prompt "kmod-crypto-ecb...................... ECB support"
tristate
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.ipsec b/target/linux/config/Config.in.ipsec
index 60497bc32..05c5da5ba 100644
--- a/target/linux/config/Config.in.ipsec
+++ b/target/linux/config/Config.in.ipsec
@@ -1,21 +1,28 @@
menu "IPSec support"
config ADK_KPACKAGE_KMOD_NET_KEY
- prompt "kmod-net-ipsec-netkey............. PF_KEYv2 socket family"
+ prompt "kmod-net-key..................... PF_KEYv2 socket family"
tristate
default n
help
PF_KEYv2 socket family, compatible to KAME ones.
+config ADK_KPACKAGE_KMOD_XFRM_USER
+ prompt "kmod-xfrm-user.................... IPsec usertools support"
+ tristate
+ default n
+ help
+
config ADK_KPACKAGE_KMOD_INET_AH
- prompt "kmod-net-ipsec-ah................. IPsec AH support"
+ prompt "kmod-inet-ah...................... IPsec AH support"
tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_HASH
default n
help
Support for IPsec AH.
config ADK_KPACKAGE_KMOD_INET_ESP
- prompt "kmod-net-ipsec-esp................ IPsec ESP support"
+ prompt "kmod-inet-esp..................... IPsec ESP support"
tristate
select ADK_KPACKAGE_KMOD_CRYPTO_AEAD
default n
@@ -23,29 +30,30 @@ config ADK_KPACKAGE_KMOD_INET_ESP
Support for IPsec ESP.
config ADK_KPACKAGE_KMOD_INET_IPCOMP
- prompt "kmod-net-ipsec-comp................ IP Payload Compression"
+ prompt "kmod-inet-ipcomp.................. IP Payload Compression"
tristate
+ select ADK_KPACKAGE_KMOD_CRYPTO_DEFLATE
default n
help
Support for IP Payload Compression Protocol (IPComp) (RFC3173),
typically needed for IPsec.
config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TRANSPORT
- prompt "kmod-net-ipsec-transport........... IPsec transport mode"
+ prompt "kmod-inet-xfrm-mode-transport..... IPsec transport mode"
tristate
default n
help
Support for IPsec transport mode.
config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_TUNNEL
- prompt "kmod-net-ipsec-tunnel.............. IPsec tunnel mode"
+ prompt "kmod-inet-xfrm-mode-tunnel........ IPsec tunnel mode"
tristate
default n
help
Support for IPsec tunnel mode.
config ADK_KPACKAGE_KMOD_INET_XFRM_MODE_BEET
- prompt "kmod-net-ipsec-beet................ IPsec BEET mode"
+ prompt "kmod-inet-xfrm-mode-beet.......... IPsec BEET mode"
tristate
default n
help
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..76d35c39f 100644
--- a/target/linux/config/Config.in.multimedia
+++ b/target/linux/config/Config.in.multimedia
@@ -91,7 +91,7 @@ config ADK_KPACKAGE_KMOD_SND_ENS1370
ALSA Ensonique 1370 driver
config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO
- prompt "kmod-sound-alsa-cs5535......... ALSA AMD CS5535 driver (ALIX1C)"
+ prompt "kmod-sound-alsa-cs5535......... ALSA AMD CS5535 driver"
depends on ADK_KPACKAGE_KMOD_SND
select ADK_KPACKAGE_KMOD_SND_AC97_CODEC
depends on ADK_LINUX_X86_ALIX1C || ADK_LINUX_MIPS64_LEMOTE
@@ -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/native/Makefile b/target/native/Makefile
index 21fde248a..63eeb1842 100644
--- a/target/native/Makefile
+++ b/target/native/Makefile
@@ -8,19 +8,20 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
-KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
-
-kernel-install:
+KERNEL:=$(LINUX_DIR)/vmlinuz
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 'Login as user root with password linux123 via ssh or console'
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'
endif
+ifeq ($(FS),archive)
+imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+ @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
+endif
diff --git a/target/qemu-arm/Makefile b/target/qemu-arm/Makefile
index 150d25f9c..cdac0a870 100644
--- a/target/qemu-arm/Makefile
+++ b/target/qemu-arm/Makefile
@@ -7,33 +7,30 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
-kernel-install:
- @cp $(LINUX_DIR)/arch/arm/boot/zImage \
- $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
- @echo "The RootFS tarball is: $(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)"
@echo "Use following command to create a QEMU Image:"
@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "Start qemu with following options:"
@echo 'qemu-system-arm -M spitz -portrait -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
- @echo 'Login as user root with password linux123 via ssh or console'
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 "Start qemu with following options:"
@echo 'qemu-system-arm -M spitz -portrait -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
-
ifeq ($(FS),initramfs-piggyback)
imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
+ @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo "Start qemu with following options:"
@echo 'qemu-system-arm -M spitz -portrait -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-cris/Makefile b/target/qemu-cris/Makefile
index b83ff2ac4..f5bbb84c3 100644
--- a/target/qemu-cris/Makefile
+++ b/target/qemu-cris/Makefile
@@ -7,34 +7,30 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
-kernel-install:
- @cp $(LINUX_DIR)/arch/cris/boot/zImage \
- $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE)
+KERNEL:=$(LINUX_DIR)/arch/cris/boot/zImage
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
- @echo
+ @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)/$(ROOTFSUSERTARBALL),"
@echo "Use following command to create a QEMU Image:"
@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSUSERTARBALL)"
@echo "Start qemu with following command line:"
@echo 'qemu-system-cris -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img'
- @echo 'Login as user root with password linux123 via ssh or console'
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 "Start qemu with following command line:"
@echo 'qemu-system-cris -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
-
ifeq ($(FS),initramfs-piggyback)
imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
+ @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo "Start qemu with following command line:"
@echo 'qemu-system-cris -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-mips/Makefile b/target/qemu-mips/Makefile
index 878d8562b..79c12b50e 100644
--- a/target/qemu-mips/Makefile
+++ b/target/qemu-mips/Makefile
@@ -7,32 +7,30 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
-kernel-install:
- @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+KERNEL:=$(LINUX_DIR)/vmlinux
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
- @echo "The RootFS tarball is: $(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)"
@echo "Use following command to create a QEMU Image:"
@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "Start qemu with following options:"
@echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
- @echo 'Login as user root with password linux123 via ssh or console'
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 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
- @echo 'Login as user root with password linux123 via ssh or console'
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 "Start qemu with following command line:"
@echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-mips64/Makefile b/target/qemu-mips64/Makefile
index 18f283d4a..302df24e0 100644
--- a/target/qemu-mips64/Makefile
+++ b/target/qemu-mips64/Makefile
@@ -7,24 +7,19 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
-kernel-install:
- @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+KERNEL:=$(LINUX_DIR)/vmlinux
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
- @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
+ @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "Use following command to create a QEMU Image:"
@echo "sudo ./scripts/create-image.sh qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "Start qemu with following options:"
@echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
-
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
@echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-mips64el/Makefile b/target/qemu-mips64el/Makefile
index 7445814be..b4bcd24f5 100644
--- a/target/qemu-mips64el/Makefile
+++ b/target/qemu-mips64el/Makefile
@@ -7,25 +7,21 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
-kernel-install:
- @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+KERNEL:=$(LINUX_DIR)/vmlinux
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
- @echo
+ @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
@echo "Use following command to create a QEMU Image:"
@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "Start qemu with following options:"
@echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
- @echo 'Login as user root with password linux123 via ssh or console'
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 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-mipsel/Makefile b/target/qemu-mipsel/Makefile
index ed99bcac9..f55aa9cb4 100644
--- a/target/qemu-mipsel/Makefile
+++ b/target/qemu-mipsel/Makefile
@@ -7,32 +7,30 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
-kernel-install:
- @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+KERNEL:=$(LINUX_DIR)/vmlinux
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)"
@echo "Use following command to create a QEMU Image:"
@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "Be sure to change permissions after image creation."
@echo "Start qemu with following options:"
@echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
- @echo 'Login as user root with password linux123 via ssh or console'
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 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
- @echo 'Login as user root with password linux123 via ssh or console'
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 "Start qemu with following command line:"
@echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-x86/Makefile b/target/qemu-x86/Makefile
index 68e7cb728..ab7106016 100644
--- a/target/qemu-x86/Makefile
+++ b/target/qemu-x86/Makefile
@@ -9,33 +9,27 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
-kernel-install:
- @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
-
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
+ @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+ @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "Use following command to create a QEMU Image:"
@echo "sudo ./scripts/create-image.sh -f ${ADK_TARGET_ROOTFS} qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "Start qemu with following command line:"
@echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img'
- @echo 'Login as user root with password linux123 via ssh or console'
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 "Start qemu with following command line:"
@echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
- @echo 'Login as user root with password linux123 via ssh or console'
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 "Start qemu with following command line:"
@echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/qemu-x86_64/Makefile b/target/qemu-x86_64/Makefile
index 9d6a8f5b4..6f9eeac4d 100644
--- a/target/qemu-x86_64/Makefile
+++ b/target/qemu-x86_64/Makefile
@@ -9,34 +9,27 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
-kernel-install:
- @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
-
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
+ @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
@echo "Use following command to create a QEMU Image:"
@echo "sudo ./scripts/create-image.sh -f $(ADK_TARGET_ROOTFS) qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "Start qemu with following command line:"
@echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel qemu-${CPU_ARCH}.img'
- @echo 'Login as user root with password linux123 via ssh or console'
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 "Start qemu with following command line:"
@echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
- @echo 'Login as user root with password linux123 via ssh or console'
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 "Start qemu with following command line:"
@echo 'qemu-system-x86_64 -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/rb4xx/Makefile b/target/rb4xx/Makefile
index bf4e31b99..b4e98a5a8 100644
--- a/target/rb4xx/Makefile
+++ b/target/rb4xx/Makefile
@@ -11,23 +11,21 @@ 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
ifeq ($(FS),nfsroot)
-imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL)
@cp $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel \
$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),yaffs)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
@echo 'The root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'Format your NAND with Routerboot, boot via NFS and'
- @echo 'then install kernel and filesystem:'
+ @echo 'then install kernel and filesystem via:'
@echo 'adkinstall ${ROOTFSTARBALL}'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/rb532/Makefile b/target/rb532/Makefile
index 8568bb135..5cefd22d3 100644
--- a/target/rb532/Makefile
+++ b/target/rb532/Makefile
@@ -8,41 +8,32 @@ include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
+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
ifeq ($(FS),ext2-block)
-imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
- @cp $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel \
- $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
- @echo
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL)
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSUSERTARBALL)"
@echo "Boot the board via network (tftp/nfsroot) and use adkinstall."
@echo "If you just want to update, use adkupdate."
- @echo 'Login as user root with password linux123 via ssh or console.'
endif
-
ifeq ($(FS),nfsroot)
-imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL)
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSUSERTARBALL)
@cp $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel \
$(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
- @echo
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSUSERTARBALL}'
- @echo 'Login as user root with password linux123 via ssh or console.'
endif
-
ifeq ($(FS),yaffs)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
@echo "The RootFS tarball is:"
@echo "$(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "Boot the board via network (tftp/nfsroot) and use adkinstall."
@echo "If you just want to update, use adkupdate."
- @echo 'Login as user root with password linux123 via ssh or console.'
endif
diff --git a/target/rescue-x86/Makefile b/target/rescue-x86/Makefile
index 94f5a6742..60891ff0c 100644
--- a/target/rescue-x86/Makefile
+++ b/target/rescue-x86/Makefile
@@ -7,19 +7,16 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
-kernel-install:
- @cp $(LINUX_DIR)/arch/x86/boot/bzImage \
- $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
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 'Login as user root with password linux123 via ssh or console'
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 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/rescue-x86_64/Makefile b/target/rescue-x86_64/Makefile
index 3636045dd..6548ca003 100644
--- a/target/rescue-x86_64/Makefile
+++ b/target/rescue-x86_64/Makefile
@@ -7,18 +7,16 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
-kernel-install:
+KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
- @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+ @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 'Login as user root with password linux123 via ssh or console'
endif
-
ifeq ($(FS),initramfs-piggyback)
imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
+ @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/shuttle/Makefile b/target/shuttle/Makefile
index b60ebe9d3..24658b45c 100644
--- a/target/shuttle/Makefile
+++ b/target/shuttle/Makefile
@@ -9,18 +9,14 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
-kernel-install:
- @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
-
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 initramfs image is: ${BIN_DIR}/${ROOTFSTARBALL}'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
-
ifeq ($(FS),initramfs-piggyback)
imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs
+ @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/toolchain-mipsel/Makefile b/target/toolchain-mipsel/Makefile
index 03513b8f2..6b56a365f 100644
--- a/target/toolchain-mipsel/Makefile
+++ b/target/toolchain-mipsel/Makefile
@@ -7,9 +7,6 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
-kernel-install:
- @cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
-
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
@@ -18,7 +15,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
@echo "Be sure to change permissions after image creation."
@echo "Start qemu with following options:"
@echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -hda qemu-${CPU_ARCH}.img -append "root=/dev/hda1"'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),initramfs)
@@ -26,5 +22,4 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS)
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
@echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel -initrd ${BIN_DIR}/${INITRAMFS}'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/wag54g/Makefile b/target/wag54g/Makefile
index 44ce7734f..0a864ad4c 100644
--- a/target/wag54g/Makefile
+++ b/target/wag54g/Makefile
@@ -13,7 +13,7 @@ $(TOOLS_BUILD_DIR):
tools-compile: $(TOOLS_BUILD_DIR)
$(MAKE) -C tools/addpattern
$(MAKE) -C tools/srec2bin
- $(MAKE) -C tools/squashfs prepare compile install
+ $(MAKE) -C ../tools/squashfs prepare compile install
kernel-install: tools-compile
PATH='${TARGET_PATH}' \
@@ -25,28 +25,23 @@ 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: $(BIN_DIR)/$(ROOTFSSQUASHFS)
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS)
${CP} ${BUILD_DIR}/${ROOTFSSQUASHFS} $(BIN_DIR)/$(ROOTFSSQUASHFS)
- @echo
@echo The image file is $(ROOTFSSQUASHFS)
@echo 'You can flash the image via tftp:'
@echo 'tftp 192.168.1.1'
@echo 'tftp> binary'
@echo "tftp> put $(ROOTFSSQUASHFS) upgrade_code.bin"
- @echo 'Login as user root with password linux123 via ssh or console'
endif
-
ifeq ($(FS),nfsroot)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
+imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
@echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel'
@echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}'
@echo 'You can flash the kernel via tftp:'
@echo 'tftp 192.168.1.1'
@echo 'tftp> binary'
@echo 'tftp> put ${ADK_TARGET}-${FS}-kernel upgrade_code.bin'
- @echo 'Login as user root with password linux123 via ssh or console'
endif
diff --git a/target/wrap/Makefile b/target/wrap/Makefile
index e0cb894da..0d885f8af 100644
--- a/target/wrap/Makefile
+++ b/target/wrap/Makefile
@@ -7,22 +7,27 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
-kernel-install:
- @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(TARGET_DIR)/boot/vmlinuz-adk
+KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
ifeq ($(FS),ext2-block)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
@echo "To install everything to CompactFlash use scripts/install.sh"
- @echo 'Login as user root with password linux123 via ssh or console'
endif
ifeq ($(FS),nfsroot)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @cp $(LINUX_DIR)/arch/x86/boot/bzImage \
- $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel $(MAKE_TRACE)
- @echo
+ @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: ${BIN_DIR}/${ROOTFSTARBALL}'
- @echo 'Login as user root with password linux123 via ssh or console'
+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}'
+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'
endif
diff --git a/target/zaurus/Makefile b/target/zaurus/Makefile
index dea4d3b9c..624aaceaa 100644
--- a/target/zaurus/Makefile
+++ b/target/zaurus/Makefile
@@ -7,13 +7,9 @@ include $(TOPDIR)/mk/modules.mk
include $(TOPDIR)/mk/kernel-build.mk
include $(TOPDIR)/mk/image.mk
-kernel-install:
- @cp $(LINUX_DIR)/arch/arm/boot/zImage \
- $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
+KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage
ifeq ($(FS),archive)
imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
- @echo
@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL),"
- @echo 'Login as user root with password linux123 via ssh or console'
endif