diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/Config.in | 3 | ||||
| -rw-r--r-- | target/alix1c/Makefile | 12 | ||||
| -rw-r--r-- | target/alix2d/Makefile | 16 | ||||
| -rw-r--r-- | target/alix2d/kernel.config | 73 | ||||
| -rw-r--r-- | target/alix2d13/Makefile | 12 |
5 files changed, 95 insertions, 21 deletions
diff --git a/target/Config.in b/target/Config.in index 1dbcd5cb1..f24d211c1 100644 --- a/target/Config.in +++ b/target/Config.in @@ -697,6 +697,7 @@ 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 help Support for ALIX2D13 boards. http://www.pcengines.ch/ @@ -853,6 +854,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 +868,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 || \ diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile index 5a737fd8a..542f64164 100644 --- a/target/alix1c/Makefile +++ b/target/alix1c/Makefile @@ -27,3 +27,15 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @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) + @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/alix2d/Makefile b/target/alix2d/Makefile index cd4964c24..9b051dfac 100644 --- a/target/alix2d/Makefile +++ b/target/alix2d/Makefile @@ -10,10 +10,11 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage kernel-install: - @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk + @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),ext2-block) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) + @cp $(KERNEL) $(TARGET_DIR)/boot/vmlinuz-adk @echo @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "To install everything to CompactFlash use scripts/install.sh" @@ -21,9 +22,20 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) 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' 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 + @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/alix2d/kernel.config b/target/alix2d/kernel.config index 39382c7b4..607e1fb2e 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 +# Sat Jun 26 16:09:47 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,16 @@ 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 @@ -1235,7 +1270,7 @@ CONFIG_CRYPTO=y # 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_GEODE=y # CONFIG_CRYPTO_DEV_HIFN_795X is not set # diff --git a/target/alix2d13/Makefile b/target/alix2d13/Makefile index 5a737fd8a..542f64164 100644 --- a/target/alix2d13/Makefile +++ b/target/alix2d13/Makefile @@ -27,3 +27,15 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @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) + @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 |