From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 31 May 2007 12:31:55 +0000 (+0000)
Subject: Make rdc boot a little further, still broken though, resync kernel config
X-Git-Tag: reboot~29099
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=de06b3b0d086a12a55bf358d25d6def17d215fff;p=oweals%2Fopenwrt.git

Make rdc boot a little further, still broken though, resync kernel config

SVN-Revision: 7419
---

diff --git a/target/linux/rdc-2.6/config/default b/target/linux/rdc-2.6/config/default
index 66606a2073..00652accb5 100644
--- a/target/linux/rdc-2.6/config/default
+++ b/target/linux/rdc-2.6/config/default
@@ -9,7 +9,6 @@
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_B44 is not set
 CONFIG_BASE_SMALL=0
 CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_MISC=m
@@ -72,7 +71,6 @@ CONFIG_HW_RANDOM=y
 CONFIG_HZ=250
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
-# CONFIG_HZ_300 is not set
 # CONFIG_I2C is not set
 # CONFIG_I6300ESB_WDT is not set
 # CONFIG_I8K is not set
@@ -114,7 +112,6 @@ CONFIG_M486=y
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set
 # CONFIG_MACHZ_WDT is not set
-# CONFIG_MAC_EMUMOUSEBTN is not set
 CONFIG_MATH_EMULATION=y
 # CONFIG_MCA is not set
 # CONFIG_MCORE2 is not set
@@ -202,17 +199,6 @@ CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NFS_V4 is not set
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CT_ACCT=y
-# CONFIG_NF_NAT_AMANDA is not set
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_NEEDED=y
-# CONFIG_NF_NAT_PPTP is not set
-CONFIG_NF_NAT_SIP=m
-# CONFIG_NF_NAT_TFTP is not set
 CONFIG_NOHIGHMEM=y
 CONFIG_NO_HZ=y
 # CONFIG_NSC_GPIO is not set
@@ -313,5 +299,3 @@ CONFIG_X86_RDC=y
 # CONFIG_X86_VISWS is not set
 # CONFIG_X86_VOYAGER is not set
 CONFIG_X86_WP_WORKS_OK=y
-CONFIG_ZONE_DMA=y
-CONFIG_ZONE_DMA_FLAG=1
diff --git a/target/linux/rdc-2.6/patches/000-rdc_fixes.patch b/target/linux/rdc-2.6/patches/000-rdc_fixes.patch
index 148fc482b4..482088c2ef 100644
--- a/target/linux/rdc-2.6/patches/000-rdc_fixes.patch
+++ b/target/linux/rdc-2.6/patches/000-rdc_fixes.patch
@@ -822,3 +822,42 @@ 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
+ }