mirror of https://github.com/hak5/openwrt-owl.git
Florian Fainelli
parent
c43c4da559
commit
8f31903a95
|
|
@ -9,44 +9,43 @@
|
|||
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
|
||||
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
|
||||
CONFIG_ARCH_POPULATES_NODE_MAP=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
CONFIG_ATA=m
|
||||
# CONFIG_ATA_GENERIC is not set
|
||||
# CONFIG_ATA_NONSTANDARD is not set
|
||||
CONFIG_ATA_PIIX=m
|
||||
# CONFIG_ATM_DRIVERS is not set
|
||||
CONFIG_BASE_SMALL=0
|
||||
CONFIG_BINFMT_AOUT=m
|
||||
CONFIG_BINFMT_MISC=m
|
||||
CONFIG_BITREVERSE=y
|
||||
# CONFIG_BLK_DEV_NBD is not set
|
||||
# CONFIG_BONDING is not set
|
||||
# CONFIG_BSD_PROCESS_ACCT is not set
|
||||
CONFIG_BT_CMTP=m
|
||||
CONFIG_CIFS_XATTR=y
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
# CONFIG_BLK_DEV_HD_IDE is not set
|
||||
CONFIG_BLK_DEV_IDE=m
|
||||
# CONFIG_BLK_DEV_IDECD is not set
|
||||
CONFIG_BLK_DEV_IDEDISK=m
|
||||
# CONFIG_BLK_DEV_IDEDMA is not set
|
||||
# CONFIG_BLK_DEV_IDEFLOPPY is not set
|
||||
# CONFIG_BLK_DEV_IDEPCI is not set
|
||||
CONFIG_CLOCKSOURCE_WATCHDOG=y
|
||||
# CONFIG_COMPAT_VDSO is not set
|
||||
# CONFIG_CPU5_WDT is not set
|
||||
# CONFIG_CPU_FREQ is not set
|
||||
CONFIG_CRYPTO_AES_586=m
|
||||
CONFIG_CRYPTO_ALGAPI=m
|
||||
CONFIG_CRYPTO_BLKCIPHER=m
|
||||
CONFIG_CRYPTO_CBC=m
|
||||
CONFIG_CRYPTO_DES=m
|
||||
CONFIG_CRYPTO_DEV_GEODE=m
|
||||
# CONFIG_CRYPTO_DEV_PADLOCK is not set
|
||||
CONFIG_CRYPTO_MANAGER=m
|
||||
CONFIG_CRYPTO_MD5=m
|
||||
CONFIG_CRYPTO_TWOFISH_586=m
|
||||
# CONFIG_CS5535_GPIO is not set
|
||||
# CONFIG_DCDBAS is not set
|
||||
# CONFIG_DEBUG_BUGVERBOSE is not set
|
||||
CONFIG_DEFAULT_CFQ=y
|
||||
# CONFIG_DEFAULT_DEADLINE is not set
|
||||
CONFIG_DEFAULT_IOSCHED="cfq"
|
||||
# CONFIG_DELL_RBU is not set
|
||||
CONFIG_DEVPORT=y
|
||||
CONFIG_DMI=y
|
||||
# CONFIG_DOUBLEFAULT is not set
|
||||
CONFIG_DOUBLEFAULT=y
|
||||
# CONFIG_E100 is not set
|
||||
CONFIG_EARLY_PRINTK=y
|
||||
# CONFIG_EDAC is not set
|
||||
# CONFIG_EDD is not set
|
||||
# CONFIG_ENABLE_MUST_CHECK is not set
|
||||
# CONFIG_EUROTECH_WDT is not set
|
||||
CONFIG_FS_POSIX_ACL=y
|
||||
CONFIG_FW_LOADER=m
|
||||
|
|
@ -56,8 +55,10 @@ CONFIG_GENERIC_IOMAP=y
|
|||
CONFIG_GENERIC_ISA_DMA=y
|
||||
# CONFIG_GEN_RTC is not set
|
||||
# CONFIG_HANGCHECK_TIMER is not set
|
||||
CONFIG_HAS_DMA=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT=y
|
||||
CONFIG_HID=m
|
||||
# CONFIG_HIGHMEM4G is not set
|
||||
# CONFIG_HIGHMEM64G is not set
|
||||
# CONFIG_HIGH_RES_TIMERS is not set
|
||||
|
|
@ -69,43 +70,39 @@ CONFIG_HW_RANDOM=y
|
|||
# CONFIG_HW_RANDOM_GEODE is not set
|
||||
# CONFIG_HW_RANDOM_INTEL is not set
|
||||
# CONFIG_HW_RANDOM_VIA is not set
|
||||
CONFIG_HZ=250
|
||||
# CONFIG_HZ_100 is not set
|
||||
CONFIG_HZ_250=y
|
||||
# CONFIG_I2C is not set
|
||||
CONFIG_I2C=m
|
||||
# CONFIG_I2C_ALGOBIT is not set
|
||||
CONFIG_I2C_BOARDINFO=y
|
||||
# CONFIG_I2C_CHARDEV is not set
|
||||
# CONFIG_I6300ESB_WDT is not set
|
||||
# CONFIG_I8K is not set
|
||||
# CONFIG_I8XX_TCO is not set
|
||||
# CONFIG_IB700_WDT is not set
|
||||
# CONFIG_IBMASR is not set
|
||||
# CONFIG_IBM_ASM is not set
|
||||
# CONFIG_IDE is not set
|
||||
# CONFIG_IEEE80211_CRYPT_TKIP is not set
|
||||
CONFIG_IDE=m
|
||||
# CONFIG_IDEDISK_MULTI_MODE is not set
|
||||
# CONFIG_IDEPCI_PCIBUS_ORDER is not set
|
||||
# CONFIG_IDE_ARM is not set
|
||||
# CONFIG_IDE_GENERIC is not set
|
||||
CONFIG_IDE_MAX_HWIFS=4
|
||||
# CONFIG_IDE_PROC_FS is not set
|
||||
# CONFIG_IDE_TASK_IOCTL is not set
|
||||
# CONFIG_IKCONFIG is not set
|
||||
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
|
||||
CONFIG_INET_XFRM_MODE_BEET=m
|
||||
CONFIG_INET_XFRM_MODE_TRANSPORT=m
|
||||
CONFIG_INET_XFRM_MODE_TUNNEL=m
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_INOTIFY=y
|
||||
CONFIG_INOTIFY_USER=y
|
||||
CONFIG_IOSCHED_CFQ=y
|
||||
# CONFIG_IOSCHED_DEADLINE is not set
|
||||
CONFIG_IPV6_MIP6=y
|
||||
CONFIG_IPV6_PRIVACY=y
|
||||
CONFIG_IPV6_ROUTE_INFO=y
|
||||
CONFIG_IPV6_TUNNEL=m
|
||||
CONFIG_INPUT=m
|
||||
CONFIG_INPUT_MISC=y
|
||||
CONFIG_INPUT_YEALINK=m
|
||||
# CONFIG_ISA is not set
|
||||
CONFIG_ISA_DMA_API=y
|
||||
# CONFIG_ITCO_WDT is not set
|
||||
# CONFIG_JFFS2_CMODE_PRIORITY is not set
|
||||
CONFIG_JFFS2_CMODE_SIZE=y
|
||||
CONFIG_JFFS2_FS_DEBUG=0
|
||||
CONFIG_JFFS2_RUBIN=y
|
||||
CONFIG_JFS_FS=m
|
||||
CONFIG_KTIME_SCALAR=y
|
||||
# CONFIG_KVM is not set
|
||||
CONFIG_LBD=y
|
||||
CONFIG_LEDS_RDC3211=m
|
||||
CONFIG_LIBCRC32C=y
|
||||
# CONFIG_LEDS_TRIGGER_IDE_DISK is not set
|
||||
CONFIG_LSF=y
|
||||
# CONFIG_M386 is not set
|
||||
CONFIG_M486=y
|
||||
# CONFIG_M586 is not set
|
||||
|
|
@ -126,7 +123,6 @@ CONFIG_MATH_EMULATION=y
|
|||
# CONFIG_MK6 is not set
|
||||
# CONFIG_MK7 is not set
|
||||
# CONFIG_MK8 is not set
|
||||
CONFIG_MODULE_FORCE_UNLOAD=y
|
||||
# CONFIG_MPENTIUM4 is not set
|
||||
# CONFIG_MPENTIUMII is not set
|
||||
# CONFIG_MPENTIUMIII is not set
|
||||
|
|
@ -164,7 +160,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
|
|||
# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
|
||||
# CONFIG_MTD_MTDRAM is not set
|
||||
# CONFIG_MTD_NETSC520 is not set
|
||||
# CONFIG_MTD_OBSOLETE_CHIPS is not set
|
||||
# CONFIG_MTD_ONENAND is not set
|
||||
CONFIG_MTD_PARTITIONS=y
|
||||
# CONFIG_MTD_PHRAM is not set
|
||||
|
|
@ -183,8 +178,6 @@ CONFIG_MTD_RDC3210_SIZE=0x400000
|
|||
# CONFIG_MTD_ROM is not set
|
||||
# CONFIG_MTD_SC520CDP is not set
|
||||
# CONFIG_MTD_SLRAM is not set
|
||||
# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
|
||||
# CONFIG_MTD_ROOTFS_SPLIT is not set
|
||||
# CONFIG_MTD_TS5500 is not set
|
||||
# CONFIG_MTRR is not set
|
||||
# CONFIG_MVIAC3_2 is not set
|
||||
|
|
@ -195,19 +188,22 @@ CONFIG_MTD_RDC3210_SIZE=0x400000
|
|||
# CONFIG_MWINCHIPC6 is not set
|
||||
# CONFIG_NATSEMI is not set
|
||||
# CONFIG_NE2K_PCI is not set
|
||||
# CONFIG_NET_PKTGEN is not set
|
||||
# CONFIG_NETDEV_1000 is not set
|
||||
CONFIG_NET_SCH_FIFO=y
|
||||
# CONFIG_NET_VENDOR_3COM is not set
|
||||
# CONFIG_NETDEV_1000 is not set
|
||||
# CONFIG_NFS_V4 is not set
|
||||
CONFIG_NLS_ISO8859_2=m
|
||||
CONFIG_NOHIGHMEM=y
|
||||
CONFIG_NO_HZ=y
|
||||
# CONFIG_NO_HZ is not set
|
||||
CONFIG_NR_QUICK=1
|
||||
# CONFIG_NSC_GPIO is not set
|
||||
CONFIG_NVRAM=y
|
||||
CONFIG_PAGE_OFFSET=0xC0000000
|
||||
# CONFIG_PARAVIRT is not set
|
||||
CONFIG_PATA_ARTOP=m
|
||||
# CONFIG_PC8736x_GPIO is not set
|
||||
# CONFIG_PC87413_WDT is not set
|
||||
CONFIG_PCCARD=m
|
||||
CONFIG_PCCARD_NONSTATIC=m
|
||||
# CONFIG_PCIEPORTBUS is not set
|
||||
# CONFIG_PCIPCWATCHDOG is not set
|
||||
CONFIG_PCI_BIOS=y
|
||||
|
|
@ -216,57 +212,64 @@ CONFIG_PCI_GOANY=y
|
|||
# CONFIG_PCI_GOBIOS is not set
|
||||
# CONFIG_PCI_GODIRECT is not set
|
||||
# CONFIG_PCI_GOMMCONFIG is not set
|
||||
CONFIG_PCMCIA=m
|
||||
# CONFIG_PDC_ADMA is not set
|
||||
CONFIG_PHYSICAL_ALIGN=0x100000
|
||||
CONFIG_PHYSICAL_START=0x100000
|
||||
# CONFIG_PNPACPI is not set
|
||||
CONFIG_QUICKLIST=y
|
||||
CONFIG_R6040=m
|
||||
CONFIG_R6040_NAPI=y
|
||||
# CONFIG_RELOCATABLE is not set
|
||||
# CONFIG_RPCSEC_GSS_KRB5 is not set
|
||||
# CONFIG_RTC is not set
|
||||
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
|
||||
# CONFIG_SATA_AHCI is not set
|
||||
# CONFIG_SBC8360_WDT is not set
|
||||
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
|
||||
# CONFIG_SC1200_WDT is not set
|
||||
# CONFIG_SC520_WDT is not set
|
||||
CONFIG_SCSI_WAIT_SCAN=m
|
||||
# CONFIG_SCx200 is not set
|
||||
# CONFIG_SCx200_ACB is not set
|
||||
# CONFIG_SECCOMP is not set
|
||||
CONFIG_SEMAPHORE_SLEEPERS=y
|
||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||
CONFIG_SERIAL_8250_NR_UARTS=4
|
||||
# CONFIG_SMP is not set
|
||||
# CONFIG_SMSC37B787_WDT is not set
|
||||
CONFIG_SOFT_WATCHDOG=m
|
||||
# CONFIG_SOUND is not set
|
||||
# CONFIG_SONYPI is not set
|
||||
# CONFIG_SPARSEMEM_STATIC is not set
|
||||
# CONFIG_SYSVIPC is not set
|
||||
CONFIG_SYSVIPC_SYSCTL=y
|
||||
# CONFIG_TELCLOCK is not set
|
||||
CONFIG_TICK_ONESHOT=y
|
||||
# CONFIG_TICK_ONESHOT is not set
|
||||
# CONFIG_TOSHIBA is not set
|
||||
CONFIG_UID16=y
|
||||
# CONFIG_UNUSED_SYMBOLS is not set
|
||||
# CONFIG_USBPCWATCHDOG is not set
|
||||
CONFIG_USB_CXACRU=m
|
||||
# CONFIG_USB_DEVICEFS is not set
|
||||
# CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set
|
||||
CONFIG_USB_EHCI_HCD=m
|
||||
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
|
||||
# CONFIG_USB_EHCI_SPLIT_ISO is not set
|
||||
# CONFIG_USB_EHCI_TT_NEWSCHED is not set
|
||||
CONFIG_USB_MON=y
|
||||
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
|
||||
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
|
||||
CONFIG_USB_OHCI_HCD=m
|
||||
CONFIG_USB_PWC=m
|
||||
# CONFIG_USB_PWC_DEBUG is not set
|
||||
# CONFIG_USB_STORAGE_ISD200 is not set
|
||||
# CONFIG_USB_UHCI_HCD is not set
|
||||
CONFIG_USB_XUSBATM=m
|
||||
CONFIG_V4L_USB_DRIVERS=y
|
||||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_VIA_RHINE is not set
|
||||
CONFIG_VIDEO_CAPTURE_DRIVERS=y
|
||||
CONFIG_VIDEO_CPIA2=m
|
||||
CONFIG_VIDEO_V4L1=y
|
||||
# CONFIG_VM86 is not set
|
||||
# CONFIG_VMSPLIT_1G is not set
|
||||
# CONFIG_VMSPLIT_2G is not set
|
||||
# CONFIG_VMSPLIT_2G_OPT is not set
|
||||
CONFIG_VMSPLIT_3G=y
|
||||
# CONFIG_VMSPLIT_3G_OPT is not set
|
||||
CONFIG_VM_EVENT_COUNTERS=y
|
||||
# CONFIG_W83627HF_WDT is not set
|
||||
# CONFIG_W83697HF_WDT is not set
|
||||
# CONFIG_W83877F_WDT is not set
|
||||
|
|
@ -283,13 +286,13 @@ CONFIG_X86_CPUID=y
|
|||
# CONFIG_X86_ELAN is not set
|
||||
# CONFIG_X86_ES7000 is not set
|
||||
CONFIG_X86_F00F_BUG=y
|
||||
CONFIG_X86_GENERIC=y
|
||||
# CONFIG_X86_GENERIC is not set
|
||||
# CONFIG_X86_GENERICARCH is not set
|
||||
CONFIG_X86_INTEL_USERCOPY=y
|
||||
CONFIG_X86_INVLPG=y
|
||||
CONFIG_X86_L1_CACHE_SHIFT=7
|
||||
CONFIG_X86_L1_CACHE_SHIFT=4
|
||||
CONFIG_X86_MCE=y
|
||||
# CONFIG_X86_MCE_NONFATAL is not set
|
||||
CONFIG_X86_MINIMUM_CPU_MODEL=4
|
||||
CONFIG_X86_MSR=y
|
||||
# CONFIG_X86_NUMAQ is not set
|
||||
# CONFIG_X86_PC is not set
|
||||
|
|
@ -302,3 +305,4 @@ CONFIG_X86_RDC=y
|
|||
# CONFIG_X86_VISWS is not set
|
||||
# CONFIG_X86_VOYAGER is not set
|
||||
CONFIG_X86_WP_WORKS_OK=y
|
||||
CONFIG_X86_XADD=y
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -822,42 +822,3 @@ diff -urN linux-2.6.19/arch/i386/mach-rdc/led.h linux-2.6.19.new/arch/i386/mach-
|
|||
+#define LED_BLINK_RANDOM (LED_BLINK_CMD|0xffff)
|
||||
+
|
||||
+#endif
|
||||
diff -urN linux-2.6.21.1/arch/i386/kernel/time.c linux-2.6.21.1.new/arch/i386/kernel/time.c
|
||||
--- linux-2.6.21.1/arch/i386/kernel/time.c 2007-04-27 23:49:26.000000000 +0200
|
||||
+++ linux-2.6.21.1.new/arch/i386/kernel/time.c 2007-05-31 13:43:31.000000000 +0200
|
||||
@@ -264,8 +264,16 @@
|
||||
/* Duplicate of time_init() below, with hpet_enable part added */
|
||||
void __init hpet_time_init(void)
|
||||
{
|
||||
+#ifndef CONFIG_X86_RDC
|
||||
if (!hpet_enable())
|
||||
setup_pit_timer();
|
||||
+#else
|
||||
+ struct timespec ts;
|
||||
+
|
||||
+ /* RDC devices do not have CMOS */
|
||||
+ ts.tv_sec = 0;
|
||||
+ ts.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);
|
||||
+#endif
|
||||
time_init_hook();
|
||||
}
|
||||
|
||||
@@ -279,6 +287,18 @@
|
||||
*/
|
||||
void __init time_init(void)
|
||||
{
|
||||
+#ifndef CONFIG_X86_RDC
|
||||
tsc_init();
|
||||
late_time_init = choose_time_init();
|
||||
+#else
|
||||
+ struct timespec ts;
|
||||
+
|
||||
+ /* RDC devices do not have CMOS */
|
||||
+ ts.tv_sec = 0;
|
||||
+ ts.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);
|
||||
+
|
||||
+ do_settimeofday(&ts);
|
||||
+
|
||||
+ time_init_hook();
|
||||
+#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
From: Andrew Morton <akpm@linux-foundation.org>
|
||||
|
||||
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
||||
---
|
||||
|
||||
arch/i386/kernel/cpu/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff -puN arch/i386/kernel/cpu/Makefile~git-newsetup-fixup arch/i386/kernel/cpu/Makefile
|
||||
--- a/arch/i386/kernel/cpu/Makefile~git-newsetup-fixup
|
||||
+++ a/arch/i386/kernel/cpu/Makefile
|
||||
@@ -8,7 +8,7 @@ obj-y += amd.o
|
||||
obj-y += cyrix.o
|
||||
obj-y += centaur.o
|
||||
obj-y += transmeta.o
|
||||
-obj-y += intel.o intel_cacheinfo.o
|
||||
+obj-y += intel.o intel_cacheinfo.o addon_cpuid_features.o
|
||||
obj-y += rise.o
|
||||
obj-y += nexgen.o
|
||||
obj-y += umc.o
|
||||
|
||||
_
|
||||
|
|
@ -980,7 +980,7 @@ diff -Naur linux-old/arch/i386/boot/compressed/lzma_misc.c linux-lzma/arch/i386/
|
|||
diff -Naur linux-old/arch/i386/boot/compressed/Makefile linux-lzma/arch/i386/boot/compressed/Makefile
|
||||
--- linux-old/arch/i386/boot/compressed/Makefile 2005-06-04 21:53:40.000000000 -0400
|
||||
+++ linux-lzma/arch/i386/boot/compressed/Makefile 2005-06-05 00:25:23.000000000 -0400
|
||||
@@ -4,15 +4,15 @@
|
||||
@@ -4,7 +4,7 @@
|
||||
# create a compressed vmlinux image from the original vmlinux
|
||||
#
|
||||
|
||||
|
|
@ -989,17 +989,16 @@ diff -Naur linux-old/arch/i386/boot/compressed/Makefile linux-lzma/arch/i386/boo
|
|||
vmlinux.bin.all vmlinux.relocs
|
||||
EXTRA_AFLAGS := -traditional
|
||||
|
||||
LDFLAGS_vmlinux := -T
|
||||
-CFLAGS_misc.o += -fPIC
|
||||
+CFLAGS_lzma_misc.o += -fPIC
|
||||
hostprogs-y := relocs
|
||||
@@ -17,7 +17,7 @@
|
||||
$(call cc-option,-fno-stack-protector)
|
||||
LDFLAGS := -m elf_i386
|
||||
|
||||
-$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
|
||||
+$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/lzma_misc.o $(obj)/piggy.o FORCE
|
||||
$(call if_changed,ld)
|
||||
@:
|
||||
|
||||
@@ -32,14 +32,14 @@
|
||||
@@ -37,14 +37,14 @@
|
||||
$(call if_changed,relocbin)
|
||||
|
||||
ifdef CONFIG_RELOCATABLE
|
||||
|
|
|
|||
Loading…
Reference in New Issue