summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/Makefile1
-rw-r--r--mk/image.mk7
-rw-r--r--mk/modules.mk12
-rw-r--r--mk/rootfs.mk1
-rw-r--r--package/lvm/Config.in2
-rw-r--r--package/lvm/Makefile4
-rw-r--r--target/Config.in16
-rw-r--r--target/linux/config/Config.in.block14
-rw-r--r--target/linux/config/Config.in.kernel4
-rw-r--r--target/linux/config/Config.in.misc2
-rw-r--r--target/linux/config/Config.in.netdevice9
-rw-r--r--target/rescue-x86_64/Makefile18
-rw-r--r--target/rescue-x86_64/kernel.config121
-rw-r--r--target/rescue-x86_64/uclibc.config21
14 files changed, 183 insertions, 49 deletions
diff --git a/config/Makefile b/config/Makefile
index d7bfd630f..091f4adcd 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -4,6 +4,7 @@
include ${TOPDIR}/rules.mk
CP=cp -fpR
+HOSTCFLAGS+=-DKBUILD_NO_NLS
all: ncurses conf mconf
diff --git a/mk/image.mk b/mk/image.mk
index 9c0053727..e60957fc6 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -45,6 +45,7 @@ image-prepare-post:
INITRAMFS= ${DEVICE}-${ARCH}-${FS}
ROOTFSSQUASHFS= ${DEVICE}-${ARCH}-${FS}.img
ROOTFSTARBALL= ${DEVICE}-${ARCH}-${FS}.tar.gz
+INITRAMFS_PIGGYBACK= ${DEVICE}-${ARCH}-${FS}.cpio
${BIN_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR}
cd ${TARGET_DIR}; tar -cf - --owner=0 --group=0 . | gzip -n9 >$@
@@ -53,6 +54,10 @@ ${BIN_DIR}/${INITRAMFS}: ${TARGET_DIR}
cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | sort | \
cpio -R 0:0 --quiet -oC512 -Mdist -Hnewc | gzip -n9 >$@
+${BUILD_DIR}/${INITRAMFS_PIGGYBACK}: ${TARGET_DIR}
+ cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | sort | \
+ cpio -R 0:0 --quiet -oC512 -Mdist -Hnewc >$@
+
${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR}
PATH='${TARGET_PATH}' \
mksquashfs ${TARGET_DIR} ${BUILD_DIR}/root.squashfs \
@@ -64,4 +69,4 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR}
bs=4063232 conv=sync $(MAKE_TRACE)
imageclean:
- rm -f $(BIN_DIR)/$(DEVICE)-*
+ rm -f $(BIN_DIR)/$(DEVICE)-* ${BUILD_DIR}/$(DEVICE)-*
diff --git a/mk/modules.mk b/mk/modules.mk
index 875b93c62..837b8473c 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -2,6 +2,13 @@
# material, please see the LICENCE file in the top-level directory.
#
+# Serial ATA devices
+#
+$(eval $(call KMOD_template,SATA_AHCI,sata-ahci,\
+ $(MODULES_DIR)/kernel/drivers/ata/ahci \
+,10))
+
+#
# Ethernet network devices
#
$(eval $(call KMOD_template,NE2K_PCI,ne2k-pci,\
@@ -17,6 +24,11 @@ $(eval $(call KMOD_template,E1000,e1000,\
$(MODULES_DIR)/kernel/drivers/net/e1000/e1000 \
,20))
+$(eval $(call KMOD_template,SKY2,sky2,\
+ $(MODULES_DIR)/kernel/drivers/net/sky2 \
+,20))
+
+
#
# Wireless network devices
#
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 4ab2f71e2..ef73b4522 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -16,6 +16,7 @@ $(eval $(call rootfs_template,ext2-cf,EXT2_CF,$(ROOTFS)))
$(eval $(call rootfs_template,ext2-mmc,EXT2_MMC))
$(eval $(call rootfs_template,ext2,EXT2))
$(eval $(call rootfs_template,initramfs,INITRAMFS))
+$(eval $(call rootfs_template,initramfs-piggyback,INITRAMFS_PIGGYBACK))
$(eval $(call rootfs_template,squashfs,SQUASHFS))
$(eval $(call rootfs_template,yaffs,YAFFS))
$(eval $(call rootfs_template,nfsroot,NFSROOT,root=/dev/nfs ip=dhcp))
diff --git a/package/lvm/Config.in b/package/lvm/Config.in
index b835fd0d1..b1e4c0175 100644
--- a/package/lvm/Config.in
+++ b/package/lvm/Config.in
@@ -7,6 +7,8 @@ config ADK_PACKAGE_LVM
prompt "lvm............................... logical volume management"
tristate
select ADK_COMPILE_LVM
+ select ADK_PACKAGE_DEVICE_MAPPER
+ select ADK_PACKAGE_LIBNCURSES
default n
help
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index e4123aa82..90c7f6405 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 725d07794007e021bfc592b1636100c7
PKG_DESCR:= logical volume management
PKG_SECTION:= misc
-PKG_DEPENDS:= device-mapper
+PKG_DEPENDS:= device-mapper libncurses
PKG_URL:= http://sourceware.org/lvm2/
PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/
@@ -19,7 +19,7 @@ WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION}
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},${PKG_SECTION},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --with-user="" --with-group="" \
diff --git a/target/Config.in b/target/Config.in
index 99fc2d19e..4baa56ede 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -164,6 +164,7 @@ config ADK_LINUX_XSCALE_ZAURUS
config ADK_LINUX_RESCUE
bool "Minimal Linux Rescuesystem"
+ select ADK_KERNEL_INPUT_KEYBOARD
help
Rescuesystem with can be used to Boot from Disk or USB stick.
@@ -184,7 +185,6 @@ depends on ADK_LINUX_RESCUE
config ADK_LINUX_X86_64_RESCUE
bool "x86_64"
select ADK_rescue_x86_64
- select ADK_LINUX_64
help
X86 architecture.
@@ -371,6 +371,20 @@ config ADK_TARGET_ROOTFS_INITRAMFS
help
create an read-only initramfs system.
+config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
+ bool "initramfs filesystem included into kernel image"
+ select ADK_LINUX_INITRAMFS_BUILTIN
+ depends on ADK_LINUX_X86_QEMU || \
+ ADK_LINUX_CRIS_QEMU || \
+ ADK_LINUX_MIPS_QEMU || \
+ ADK_LINUX_MIPSEL_QEMU || \
+ ADK_LINUX_MIPS64_QEMU || \
+ ADK_LINUX_MIPS64EL_QEMU || \
+ ADK_LINUX_NATIVE || \
+ ADK_LINUX_RESCUE
+ help
+ create an read-only initramfs system.
+
config ADK_TARGET_ROOTFS_SQUASHFS
bool "squashfs read-only root filesystem"
depends on ADK_LINUX_CRIS_FOXBOARD || \
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 15c3f27d6..15b8f7d49 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -49,6 +49,20 @@ config ADK_KERNEL_BLK_DEV_DM
boolean
default n
+config ADK_KERNEL_ATA
+ boolean
+ default n
+
+config ADK_KPACKAGE_KMOD_SATA_AHCI
+ prompt "kmod-sata-ahci.................... AHCI SATA driver"
+ tristate
+ select ADK_KERNEL_BLOCK
+ select ADK_KERNEL_ATA
+ select ADK_KPACKAGE_KMOD_BLK_DEV_SD
+ default n
+ help
+ Enables support for AHCI Serial ATA.
+
#config ADK_KERNEL_IDE
# boolean
# default n
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 659e7e052..9b739f840 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -6,6 +6,10 @@ config ADK_KERNEL_RD_LZMA
bool
default n
+config ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA
+ bool
+ default n
+
config ADK_KERNEL_INITRAMFS_SOURCE
string
default ""
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index d0716cf57..bed0ac451 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -1,5 +1,7 @@
config ADK_LINUX_INITRAMFS_BUILTIN
select ADK_KERNEL_BLK_DEV_INITRD
+ select ADK_KERNEL_RD_LZMA
+ select ADK_KERNEL_INITRAMFS_COMPRESSION_LZMA
boolean
default n
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 4cb091e78..fe9d10953 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -69,6 +69,15 @@ config ADK_KPACKAGE_KMOD_E1000
<http://support.intel.com/support/network/adapter/pro100/21397.htm>
+config ADK_KPACKAGE_KMOD_SKY2
+ prompt "kmod-net-sky2................. Marvell Yukon driver"
+ select ADK_KERNEL_NETDEVICES
+ select ADK_KERNEL_NET_ETHERNET
+ select ADK_KERNEL_NETDEV_1000
+ tristate
+ default n
+ help
+
endmenu
config ADK_KERNEL_WIRELESS
diff --git a/target/rescue-x86_64/Makefile b/target/rescue-x86_64/Makefile
index 5ea9d04c0..f1933ef32 100644
--- a/target/rescue-x86_64/Makefile
+++ b/target/rescue-x86_64/Makefile
@@ -9,9 +9,27 @@ include $(TOPDIR)/mk/image.mk
kernel-install:
+createinit:
+ @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.lzma
+ $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="${BUILD_DIR}/${INITRAMFS_PIGGYBACK}"#' $(LINUX_DIR)/.config
+ echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
+ echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config
+ echo 'CONFIG_INITRAMFS_COMPRESSION_LZMA=y' >> $(LINUX_DIR)/.config
+ echo N |$(MAKE) -C $(LINUX_DIR) V=0 CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(ARCH) \
+ CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE)
+ $(MAKE) -C $(LINUX_DIR) V=0 CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(ARCH) \
+ CC="$(TARGET_CC)" $(MAKE_TRACE)
+ $(CP) $(LINUX_DIR)/arch/x86/boot/bzImage \
+ $(BIN_DIR)/${DEVICE}-${ARCH}-kernel
+
ifeq ($(FS),initramfs)
imageinstall: $(BIN_DIR)/$(INITRAMFS)
cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${DEVICE}-${ARCH}-kernel
@echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel'
@echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}'
endif
+
+ifeq ($(FS),initramfs-piggyback)
+imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit
+ @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel'
+endif
diff --git a/target/rescue-x86_64/kernel.config b/target/rescue-x86_64/kernel.config
index ada69a344..fa7bc84d5 100644
--- a/target/rescue-x86_64/kernel.config
+++ b/target/rescue-x86_64/kernel.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.29.1
-# Thu Jun 4 21:10:07 2009
+# Linux kernel version: 2.6.30.5
+# Tue Sep 1 19:09:13 2009
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -34,6 +34,7 @@ CONFIG_ARCH_HAS_CPU_RELAX=y
CONFIG_ARCH_HAS_DEFAULT_IDLE=y
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y
CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
@@ -41,14 +42,14 @@ CONFIG_ZONE_DMA32=y
CONFIG_ARCH_POPULATES_NODE_MAP=y
CONFIG_AUDIT_ARCH=y
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_X86_SMP=y
CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_X86_64_SMP=y
CONFIG_X86_HT=y
-CONFIG_X86_BIOS_REBOOT=y
CONFIG_X86_TRAMPOLINE=y
# CONFIG_KTIME_SCALAR is not set
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -61,10 +62,17 @@ CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+CONFIG_KERNEL_LZMA=y
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
# CONFIG_AUDIT is not set
@@ -88,13 +96,17 @@ CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
# CONFIG_NAMESPACES is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_RD_GZIP is not set
+# CONFIG_RD_BZIP2 is not set
+CONFIG_RD_LZMA=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
CONFIG_EMBEDDED=y
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
# CONFIG_KALLSYMS is not set
+# CONFIG_STRIP_ASM_SYMS is not set
CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_BUG=y
@@ -115,12 +127,15 @@ CONFIG_SLAB=y
# CONFIG_SLUB is not set
# CONFIG_SLOB is not set
# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_HAVE_IOREMAP_PROT=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+# CONFIG_SLOW_WORK is not set
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
@@ -131,7 +146,6 @@ CONFIG_MODULES=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_BLOCK=y
-# CONFIG_BLK_DEV_IO_TRACE is not set
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_BLK_DEV_INTEGRITY is not set
CONFIG_BLOCK_COMPAT=y
@@ -159,12 +173,8 @@ CONFIG_NO_HZ=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_SMP=y
# CONFIG_SPARSE_IRQ is not set
-CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y
-CONFIG_X86_PC=y
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_VOYAGER is not set
-# CONFIG_X86_GENERICARCH is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
# CONFIG_X86_VSMP is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_PARAVIRT_GUEST is not set
@@ -195,10 +205,10 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_MCORE2 is not set
CONFIG_GENERIC_CPU=y
CONFIG_X86_CPU=y
-CONFIG_X86_L1_CACHE_BYTES=128
-CONFIG_X86_INTERNODE_CACHE_BYTES=128
+CONFIG_X86_L1_CACHE_BYTES=64
+CONFIG_X86_INTERNODE_CACHE_BYTES=64
CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=7
+CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_WP_WORKS_OK=y
CONFIG_X86_TSC=y
CONFIG_X86_CMPXCHG64=y
@@ -208,9 +218,8 @@ CONFIG_X86_DEBUGCTLMSR=y
# CONFIG_PROCESSOR_SELECT is not set
CONFIG_CPU_SUP_INTEL=y
CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR_64=y
+CONFIG_CPU_SUP_CENTAUR=y
# CONFIG_X86_DS is not set
-# CONFIG_X86_PTRACE_BTS is not set
CONFIG_HPET_TIMER=y
CONFIG_HPET_EMULATE_RTC=y
CONFIG_DMI=y
@@ -231,10 +240,12 @@ CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
CONFIG_X86_MCE=y
CONFIG_X86_MCE_INTEL=y
CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
# CONFIG_I8K is not set
# CONFIG_MICROCODE is not set
# CONFIG_X86_MSR is not set
# CONFIG_X86_CPUID is not set
+# CONFIG_X86_CPU_DEBUG is not set
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
CONFIG_DIRECT_GBPAGES=y
# CONFIG_NUMA is not set
@@ -258,10 +269,14 @@ CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
CONFIG_UNEVICTABLE_LRU=y
+CONFIG_HAVE_MLOCK=y
+CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
CONFIG_X86_RESERVE_LOW_64K=y
# CONFIG_MTRR is not set
# CONFIG_SECCOMP is not set
+# CONFIG_CC_STACKPROTECTOR is not set
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
@@ -306,6 +321,7 @@ CONFIG_PCI_MSI=y
# CONFIG_PCI_LEGACY is not set
# CONFIG_PCI_STUB is not set
# CONFIG_HT_IRQ is not set
+# CONFIG_PCI_IOV is not set
CONFIG_ISA_DMA_API=y
CONFIG_K8_NB=y
# CONFIG_PCCARD is not set
@@ -328,7 +344,6 @@ CONFIG_NET=y
#
# Networking options
#
-CONFIG_COMPAT_NET_DEV_OPS=y
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
@@ -374,6 +389,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_LAPB is not set
# CONFIG_ECONET is not set
# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
# CONFIG_NET_SCHED is not set
# CONFIG_DCB is not set
@@ -386,7 +402,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_IRDA is not set
# CONFIG_BT is not set
# CONFIG_AF_RXRPC is not set
-# CONFIG_PHONET is not set
# CONFIG_WIRELESS is not set
# CONFIG_WIMAX is not set
# CONFIG_RFKILL is not set
@@ -466,6 +481,7 @@ CONFIG_SCSI_WAIT_SCAN=m
# CONFIG_SCSI_SRP_ATTRS is not set
# CONFIG_SCSI_LOWLEVEL is not set
# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
# CONFIG_SATA_PMP is not set
@@ -489,6 +505,7 @@ CONFIG_MD=y
# CONFIG_I2O is not set
# CONFIG_MACINTOSH_DRIVERS is not set
CONFIG_NETDEVICES=y
+CONFIG_COMPAT_NET_DEV_OPS=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
# CONFIG_MACVLAN is not set
@@ -497,7 +514,29 @@ CONFIG_NETDEVICES=y
# CONFIG_VETH is not set
# CONFIG_ARCNET is not set
# CONFIG_NET_ETHERNET is not set
-# CONFIG_NETDEV_1000 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+CONFIG_SKGE=y
+CONFIG_SKY2=y
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL1C is not set
+# CONFIG_JME is not set
# CONFIG_NETDEV_10000 is not set
# CONFIG_TR is not set
@@ -506,7 +545,6 @@ CONFIG_NETDEVICES=y
#
# CONFIG_WLAN_PRE80211 is not set
# CONFIG_WLAN_80211 is not set
-# CONFIG_IWLWIFI_LEDS is not set
#
# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -700,7 +738,6 @@ CONFIG_HID=y
#
# Special HID drivers
#
-CONFIG_HID_COMPAT=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
CONFIG_USB_ARCH_HAS_OHCI=y
@@ -714,7 +751,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
#
#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
#
# CONFIG_USB_GADGET is not set
@@ -766,6 +803,7 @@ CONFIG_RTC_DRV_CMOS=y
# on-CPU RTC drivers
#
# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set
# CONFIG_STAGING is not set
CONFIG_X86_PLATFORM_DEVICES=y
@@ -789,11 +827,11 @@ CONFIG_X86_PLATFORM_DEVICES=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
# CONFIG_FS_POSIX_ACL is not set
-CONFIG_FILE_LOCKING=y
# 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_FILE_LOCKING=y
# CONFIG_DNOTIFY is not set
# CONFIG_INOTIFY is not set
# CONFIG_QUOTA is not set
@@ -802,6 +840,11 @@ CONFIG_FILE_LOCKING=y
# CONFIG_FUSE_FS is not set
#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
# CD-ROM/DVD Filesystems
#
# CONFIG_ISO9660_FS is not set
@@ -845,6 +888,8 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ROMFS_FS is not set
# CONFIG_SYSV_FS is not set
# CONFIG_UFS_FS is not set
+# CONFIG_AUFS_FS is not set
+# CONFIG_NILFS2_FS is not set
CONFIG_NETWORK_FILESYSTEMS=y
# CONFIG_NFS_FS is not set
# CONFIG_NFSD is not set
@@ -888,13 +933,29 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_FTRACE_SYSCALLS=y
+CONFIG_TRACING_SUPPORT=y
#
# Tracers
#
+# CONFIG_FUNCTION_TRACER is not set
+# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_SYSPROF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_EVENT_TRACER is not set
+# CONFIG_FTRACE_SYSCALLS is not set
+# CONFIG_BOOT_TRACER is not set
+# CONFIG_TRACE_BRANCH_PROFILING is not set
+# CONFIG_POWER_TRACER is not set
+# CONFIG_STACK_TRACER is not set
+# CONFIG_KMEMTRACE is not set
+# CONFIG_WORKQUEUE_TRACER is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_MMIOTRACE is not set
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_STRICT_DEVMEM is not set
@@ -933,10 +994,12 @@ 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
@@ -988,6 +1051,7 @@ CONFIG_CRYPTO_SHA256=m
#
CONFIG_CRYPTO_AES=m
# CONFIG_CRYPTO_AES_X86_64 is not set
+# CONFIG_CRYPTO_AES_NI_INTEL is not set
# CONFIG_CRYPTO_ANUBIS is not set
# CONFIG_CRYPTO_ARC4 is not set
# CONFIG_CRYPTO_BLOWFISH is not set
@@ -1009,6 +1073,7 @@ CONFIG_CRYPTO_AES=m
# Compression
#
# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_ZLIB is not set
# CONFIG_CRYPTO_LZO is not set
#
@@ -1022,11 +1087,14 @@ CONFIG_CRYPTO_AES=m
#
# CONFIG_OCF_OCF is not set
CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
# CONFIG_VIRTUALIZATION is not set
+# CONFIG_BINARY_PRINTF is not set
#
# Library routines
#
+CONFIG_BITREVERSE=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_FIND_NEXT_BIT=y
CONFIG_GENERIC_FIND_LAST_BIT=y
@@ -1034,10 +1102,11 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
# CONFIG_CRC16 is not set
# CONFIG_CRC_T10DIF is not set
# CONFIG_CRC_ITU_T is not set
-# CONFIG_CRC32 is not set
+CONFIG_CRC32=y
# CONFIG_CRC7 is not set
# CONFIG_LIBCRC32C is not set
-CONFIG_PLIST=y
+CONFIG_DECOMPRESS_LZMA=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
+CONFIG_NLATTR=y
diff --git a/target/rescue-x86_64/uclibc.config b/target/rescue-x86_64/uclibc.config
index c2b5c62df..df52f1782 100644
--- a/target/rescue-x86_64/uclibc.config
+++ b/target/rescue-x86_64/uclibc.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Version: 0.9.30.1
-# Sat May 16 23:57:03 2009
+# Wed Sep 2 19:14:04 2009
#
# TARGET_alpha is not set
# TARGET_arm is not set
@@ -34,23 +34,6 @@ TARGET_x86_64=y
#
TARGET_ARCH="x86_64"
FORCE_OPTIONS_FOR_ARCH=y
-# CONFIG_GENERIC_386 is not set
-# CONFIG_386 is not set
-# CONFIG_486 is not set
-# CONFIG_586 is not set
-# CONFIG_586MMX is not set
-# CONFIG_686 is not set
-# CONFIG_PENTIUMII is not set
-# CONFIG_PENTIUMIII is not set
-# CONFIG_PENTIUM4 is not set
-# CONFIG_K6 is not set
-# CONFIG_K7 is not set
-# CONFIG_ELAN is not set
-# CONFIG_CRUSOE is not set
-# CONFIG_WINCHIPC6 is not set
-# CONFIG_WINCHIP2 is not set
-# CONFIG_CYRIXIII is not set
-# CONFIG_NEHEMIAH is not set
TARGET_SUBARCH=""
#
@@ -135,7 +118,7 @@ UCLIBC_HAS_BSD_ERR=y
# UCLIBC_NTP_LEGACY is not set
# UCLIBC_SV4_DEPRECATED is not set
UCLIBC_HAS_REALTIME=y
-# UCLIBC_HAS_ADVANCED_REALTIME is not set
+UCLIBC_HAS_ADVANCED_REALTIME=y
UCLIBC_HAS_EPOLL=y
UCLIBC_HAS_XATTR=y
# UCLIBC_HAS_PROFILING is not set