diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-31 12:31:55 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-31 12:31:55 +0000 |
| commit | 2fead2cc042060958269e817e1d27104101fa645 (patch) | |
| tree | 56a5db5b6b4efc39f4a1aae84e1065f886a24f70 /target/linux | |
| parent | 3fef5a6916d329dad1314e4aafef466010734829 (diff) | |
Make rdc boot a little further, still broken though, resync kernel config
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7419 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/rdc-2.6/config/default | 16 | ||||
| -rw-r--r-- | target/linux/rdc-2.6/patches/000-rdc_fixes.patch | 39 |
2 files changed, 39 insertions, 16 deletions
diff --git a/target/linux/rdc-2.6/config/default b/target/linux/rdc-2.6/config/default index 66606a207..00652accb 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 148fc482b..482088c2e 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 + } |