From 96dcd54773fa810e7b0b27dbdae5f3d10014aba8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 14 Jun 2009 20:30:19 +0200 Subject: finetune kernel config for lemote - boot via tftp works now - fix libgcrypt compile issue - disable-sjlj-exceptions, does not compile for mips64 --- package/libgcrypt/Makefile | 4 +- package/libgcrypt/patches/patch-mpi_longlong_h | 67 + target/lemote/kernel.config | 1893 +++---------------- target/lemote/patches/yeelong.patch | 2393 ++++++++++++------------ toolchain/gcc/Makefile | 2 +- 5 files changed, 1467 insertions(+), 2892 deletions(-) create mode 100644 package/libgcrypt/patches/patch-mpi_longlong_h diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index f8ea5e1b7..4ee013601 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libgcrypt -PKG_VERSION:= 1.4.1 +PKG_VERSION:= 1.4.4 PKG_RELEASE:= 1 -PKG_MD5SUM:= 555488ddfc81a6e0df1fb5112e7eee13 +PKG_MD5SUM:= 9e6dcf7fef1ae96b57207a1de91fdaa4 PKG_DESCR:= GNU crypto library PKG_SECTION:= libs PKG_DEPENDS:= libgpg-error diff --git a/package/libgcrypt/patches/patch-mpi_longlong_h b/package/libgcrypt/patches/patch-mpi_longlong_h new file mode 100644 index 000000000..0afce135e --- /dev/null +++ b/package/libgcrypt/patches/patch-mpi_longlong_h @@ -0,0 +1,67 @@ +--- libgcrypt-1.4.4.orig/mpi/longlong.h 2008-08-19 17:20:03.000000000 +0200 ++++ libgcrypt-1.4.4/mpi/longlong.h 2009-06-14 19:45:28.000000000 +0200 +@@ -710,18 +710,35 @@ extern USItype __udiv_qrnnd (); + #endif /* __m88110__ */ + #endif /* __m88000__ */ + ++/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */ ++#if defined (__GNUC__) && defined (__GNUC_MINOR__) ++#define __GNUC_PREREQ(maj, min) \ ++ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) ++#else ++#define __GNUC_PREREQ(maj, min) 0 ++#endif ++ + /*************************************** + ************** MIPS ***************** + ***************************************/ + #if defined (__mips__) && W_TYPE_SIZE == 32 +-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 ++#if __GNUC_PREREQ (4,4) ++#define umul_ppmm(w1, w0, u, v) \ ++ do { \ ++ UDItype __ll = (UDItype)(u) * (v); \ ++ w1 = __ll >> 32; \ ++ w0 = __ll; \ ++ } while (0) ++#endif ++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7) + #define umul_ppmm(w1, w0, u, v) \ + __asm__ ("multu %2,%3" \ + : "=l" ((USItype)(w0)), \ + "=h" ((USItype)(w1)) \ + : "d" ((USItype)(u)), \ + "d" ((USItype)(v))) +-#else ++#endif ++#if !defined (umul_ppmm) + #define umul_ppmm(w1, w0, u, v) \ + __asm__ ("multu %2,%3 \n" \ + "mflo %0 \n" \ +@@ -739,14 +756,24 @@ extern USItype __udiv_qrnnd (); + ************** MIPS/64 ************** + ***************************************/ + #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 +-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 ++#if __GNUC_PREREQ (4,4) ++#define umul_ppmm(w1, w0, u, v) \ ++ do { \ ++ typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \ ++ __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \ ++ w1 = __ll >> 64; \ ++ w0 = __ll; \ ++ } while (0) ++#endif ++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7) + #define umul_ppmm(w1, w0, u, v) \ + __asm__ ("dmultu %2,%3" \ + : "=l" ((UDItype)(w0)), \ + "=h" ((UDItype)(w1)) \ + : "d" ((UDItype)(u)), \ + "d" ((UDItype)(v))) +-#else ++#endif ++#if !defined (umul_ppmm) + #define umul_ppmm(w1, w0, u, v) \ + __asm__ ("dmultu %2,%3 \n" \ + "mflo %0 \n" \ diff --git a/target/lemote/kernel.config b/target/lemote/kernel.config index f7dee9841..67bb92a95 100644 --- a/target/lemote/kernel.config +++ b/target/lemote/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.30 -# Thu Jun 11 17:37:11 2009 +# Sun Jun 14 18:50:00 2009 # CONFIG_MIPS=y @@ -171,7 +171,7 @@ CONFIG_HZ=250 # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PREEMPT is not set -CONFIG_KEXEC=y +# CONFIG_KEXEC is not set # CONFIG_SECCOMP is not set CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y @@ -190,10 +190,9 @@ CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y +# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set -CONFIG_AUDIT=y +# CONFIG_AUDIT is not set # # RCU Subsystem @@ -203,8 +202,7 @@ CONFIG_CLASSIC_RCU=y # CONFIG_PREEMPT_RCU is not set # CONFIG_TREE_RCU_TRACE is not set # CONFIG_PREEMPT_RCU_TRACE is not set -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y +# CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=15 # CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set @@ -228,8 +226,8 @@ CONFIG_KALLSYMS=y CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_PCSPKR_PLATFORM=y +# CONFIG_ELF_CORE is not set +# CONFIG_PCSPKR_PLATFORM is not set CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -240,14 +238,12 @@ CONFIG_SHMEM=y CONFIG_AIO=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y -CONFIG_COMPAT_BRK=y +# CONFIG_COMPAT_BRK is not set CONFIG_SLAB=y # CONFIG_SLUB is not set # CONFIG_SLOB is not set -CONFIG_PROFILING=y -CONFIG_TRACEPOINTS=y +# CONFIG_PROFILING is not set # CONFIG_MARKERS is not set -CONFIG_OPROFILE=m CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_SYSCALL_WRAPPERS=y # CONFIG_SLOW_WORK is not set @@ -258,8 +254,8 @@ CONFIG_BASE_SMALL=0 CONFIG_MODULES=y # CONFIG_MODULE_FORCE_LOAD is not set CONFIG_MODULE_UNLOAD=y -CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_BLOCK=y # CONFIG_BLK_DEV_BSG is not set @@ -271,13 +267,13 @@ CONFIG_BLOCK_COMPAT=y # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -# CONFIG_DEFAULT_AS is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_CFQ is not set # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_DEFAULT_IOSCHED="anticipatory" # CONFIG_PROBE_INITRD_HEADER is not set CONFIG_FREEZER=y @@ -294,18 +290,14 @@ CONFIG_PCI_LEGACY=y CONFIG_ISA=y CONFIG_MMU=y # CONFIG_PCCARD is not set -CONFIG_HOTPLUG_PCI=m -CONFIG_HOTPLUG_PCI_FAKE=m -CONFIG_HOTPLUG_PCI_CPCI=y -CONFIG_HOTPLUG_PCI_SHPC=m +# CONFIG_HOTPLUG_PCI is not set # # Executable file formats # CONFIG_BINFMT_ELF=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_HAVE_AOUT is not set -CONFIG_BINFMT_MISC=m +# CONFIG_BINFMT_MISC is not set CONFIG_MIPS32_COMPAT=y CONFIG_COMPAT=y CONFIG_SYSVIPC_COMPAT=y @@ -353,478 +345,68 @@ CONFIG_NET=y CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=m -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_MIGRATE is not set -# CONFIG_XFRM_STATISTICS is not set -CONFIG_XFRM_IPCOMP=m -CONFIG_NET_KEY=m -# CONFIG_NET_KEY_MIGRATE is not set +# CONFIG_NET_KEY is not set CONFIG_INET=y CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_ASK_IP_FIB_HASH=y -# CONFIG_IP_FIB_TRIE is not set +# CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y # CONFIG_IP_PNP is not set -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE=y -CONFIG_IP_PIMSM_V1=y -CONFIG_IP_PIMSM_V2=y +# CONFIG_NET_IPIP is not set +# CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set # CONFIG_ARPD is not set CONFIG_SYN_COOKIES=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +# CONFIG_INET_XFRM_TUNNEL is not set +# CONFIG_INET_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_INET_LRO=y -CONFIG_INET_DIAG=m -CONFIG_INET_TCP_DIAG=m -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=y -CONFIG_TCP_CONG_CUBIC=m -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_SCALABLE=m -CONFIG_TCP_CONG_LP=m -CONFIG_TCP_CONG_VENO=m -# CONFIG_TCP_CONG_YEAH is not set -# CONFIG_TCP_CONG_ILLINOIS is not set -CONFIG_DEFAULT_BIC=y -# CONFIG_DEFAULT_CUBIC is not set -# CONFIG_DEFAULT_HTCP is not set -# CONFIG_DEFAULT_VEGAS is not set -# CONFIG_DEFAULT_WESTWOOD is not set -# CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="bic" +# CONFIG_INET_DIAG is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=m -CONFIG_IPV6_PRIVACY=y -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -# CONFIG_IPV6_MIP6 is not set -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -CONFIG_IPV6_SIT=m -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=m -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set -# CONFIG_NETLABEL is not set -CONFIG_NETWORK_SECMARK=y -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=y - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_NETLINK=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -# CONFIG_NF_CONNTRACK is not set -# CONFIG_NETFILTER_TPROXY is not set -CONFIG_NETFILTER_XTABLES=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -# CONFIG_NETFILTER_XT_TARGET_DSCP is not set -CONFIG_NETFILTER_XT_TARGET_HL=m -# CONFIG_NETFILTER_XT_TARGET_LED is not set -CONFIG_NETFILTER_XT_TARGET_MARK=m -# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set -# CONFIG_NETFILTER_XT_TARGET_TRACE is not set -CONFIG_NETFILTER_XT_TARGET_SECMARK=m -# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set -# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -# CONFIG_NETFILTER_XT_MATCH_DSCP is not set -CONFIG_NETFILTER_XT_MATCH_ESP=m -# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set -CONFIG_NETFILTER_XT_MATCH_HL=m -# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -# CONFIG_NETFILTER_XT_MATCH_OWNER is not set -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set -CONFIG_NETFILTER_XT_MATCH_REALM=m -# CONFIG_NETFILTER_XT_MATCH_RECENT is not set -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -# CONFIG_NETFILTER_XT_MATCH_TIME is not set -# CONFIG_NETFILTER_XT_MATCH_U32 is not set -CONFIG_IP_VS=m -# CONFIG_IP_VS_IPV6 is not set -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_AH_ESP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m - -# -# IP: Netfilter Configuration -# -# CONFIG_NF_DEFRAG_IPV4 is not set -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -# CONFIG_IP_NF_SECURITY is not set -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration -# -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -# CONFIG_IP6_NF_MATCH_MH is not set -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_TARGET_LOG=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -# CONFIG_IP6_NF_SECURITY is not set - -# -# DECnet: Netfilter Configuration -# -CONFIG_DECNET_NF_GRABULATOR=m -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -# CONFIG_BRIDGE_EBT_IP6 is not set -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_ULOG=m -# CONFIG_BRIDGE_EBT_NFLOG is not set -CONFIG_IP_DCCP=m -CONFIG_INET_DCCP_DIAG=m - -# -# DCCP CCIDs Configuration (EXPERIMENTAL) -# -# CONFIG_IP_DCCP_CCID2_DEBUG is not set -CONFIG_IP_DCCP_CCID3=y -# CONFIG_IP_DCCP_CCID3_DEBUG is not set -CONFIG_IP_DCCP_CCID3_RTO=100 -CONFIG_IP_DCCP_TFRC_LIB=y -CONFIG_IP_SCTP=m -# CONFIG_SCTP_DBG_MSG is not set -# CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_HMAC_NONE is not set -# CONFIG_SCTP_HMAC_SHA1 is not set -CONFIG_SCTP_HMAC_MD5=y -CONFIG_TIPC=m -CONFIG_TIPC_ADVANCED=y -CONFIG_TIPC_ZONES=3 -CONFIG_TIPC_CLUSTERS=1 -CONFIG_TIPC_NODES=255 -CONFIG_TIPC_SLAVE_NODES=0 -CONFIG_TIPC_PORTS=8191 -CONFIG_TIPC_LOG=0 -# CONFIG_TIPC_DEBUG is not set -CONFIG_ATM=y -CONFIG_ATM_CLIP=y -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set -CONFIG_STP=m -CONFIG_BRIDGE=m +# CONFIG_IPV6 is not set +# CONFIG_NETWORK_SECMARK is not set +# CONFIG_NETFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_BRIDGE is not set # CONFIG_NET_DSA is not set -CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set -CONFIG_DECNET=m -# CONFIG_DECNET_ROUTER is not set -CONFIG_LLC=m -CONFIG_LLC2=m -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -# CONFIG_COPS is not set -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y -CONFIG_X25=m -CONFIG_LAPB=m -CONFIG_ECONET=m -CONFIG_ECONET_AUNUDP=y -CONFIG_ECONET_NATIVE=y -CONFIG_WAN_ROUTER=m +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_ECONET is not set +# CONFIG_WAN_ROUTER is not set # CONFIG_PHONET is not set -CONFIG_NET_SCHED=y - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -# CONFIG_NET_SCH_MULTIQ is not set -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -# CONFIG_NET_SCH_DRR is not set -CONFIG_NET_SCH_INGRESS=m - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -CONFIG_CLS_U32_PERF=y -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -# CONFIG_NET_CLS_FLOW is not set -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_STACK=32 -CONFIG_NET_EMATCH_CMP=m -CONFIG_NET_EMATCH_NBYTE=m -CONFIG_NET_EMATCH_U32=m -CONFIG_NET_EMATCH_META=m -CONFIG_NET_EMATCH_TEXT=m -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=m -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_IPT=m -# CONFIG_NET_ACT_NAT is not set -CONFIG_NET_ACT_PEDIT=m -CONFIG_NET_ACT_SIMP=m -# CONFIG_NET_ACT_SKBEDIT is not set -CONFIG_NET_CLS_IND=y -CONFIG_NET_SCH_FIFO=y +# CONFIG_NET_SCHED is not set # CONFIG_DCB is not set # # Network testing # -CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set -CONFIG_HAMRADIO=y - -# -# Packet Radio protocols -# -CONFIG_AX25=m -# CONFIG_AX25_DAMA_SLAVE is not set -CONFIG_NETROM=m -CONFIG_ROSE=m - -# -# AX.25 network device drivers -# -CONFIG_MKISS=m -CONFIG_6PACK=m -CONFIG_BPQETHER=m -CONFIG_BAYCOM_SER_FDX=m -CONFIG_BAYCOM_SER_HDX=m -CONFIG_YAM=m +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set # CONFIG_CAN is not set -CONFIG_IRDA=m - -# -# IrDA protocols -# -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -# CONFIG_IRDA_ULTRA is not set - -# -# IrDA options -# -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -CONFIG_IRDA_DEBUG=y - -# -# Infrared-port device drivers -# - -# -# SIR device drivers -# -CONFIG_IRTTY_SIR=m - -# -# Dongle support -# -CONFIG_DONGLE=y -CONFIG_ESI_DONGLE=m -CONFIG_ACTISYS_DONGLE=m -CONFIG_TEKRAM_DONGLE=m -CONFIG_TOIM3232_DONGLE=m -CONFIG_LITELINK_DONGLE=m -CONFIG_MA600_DONGLE=m -CONFIG_GIRBIL_DONGLE=m -CONFIG_MCP2120_DONGLE=m -CONFIG_OLD_BELKIN_DONGLE=m -CONFIG_ACT200L_DONGLE=m -# CONFIG_KINGSUN_DONGLE is not set -# CONFIG_KSDAZZLE_DONGLE is not set -# CONFIG_KS959_DONGLE is not set - -# -# FIR device drivers -# -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_VLSI_FIR=m -CONFIG_MCS_FIR=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -# CONFIG_BT_HCIBTUSB is not set -# CONFIG_BT_HCIBTSDIO is not set -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -# CONFIG_BT_HCIUART_LL is not set -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIVHCI=m -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -# CONFIG_RXKAD is not set -CONFIG_FIB_RULES=y +# CONFIG_IRDA is not set +# CONFIG_BT is not set +# CONFIG_AF_RXRPC is not set CONFIG_WIRELESS=y -CONFIG_CFG80211=y -# CONFIG_CFG80211_REG_DEBUG is not set -CONFIG_WIRELESS_OLD_REGULATORY=y -CONFIG_WIRELESS_EXT=y -CONFIG_WIRELESS_EXT_SYSFS=y +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_OLD_REGULATORY is not set +# CONFIG_WIRELESS_EXT is not set # CONFIG_LIB80211 is not set -CONFIG_MAC80211=y - -# -# Rate control algorithm selection -# -CONFIG_MAC80211_RC_PID=y -CONFIG_MAC80211_RC_MINSTREL=y -# CONFIG_MAC80211_RC_DEFAULT_PID is not set -CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT="minstrel" -# CONFIG_MAC80211_MESH is not set -# CONFIG_MAC80211_LEDS is not set -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_MENU is not set +# CONFIG_MAC80211 is not set # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set @@ -837,117 +419,15 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel" # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=m -CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_EXTRA_FIRMWARE="" +# CONFIG_STANDALONE is not set +# CONFIG_PREVENT_FIRMWARE_BUILD is not set +# CONFIG_FW_LOADER is not set # CONFIG_SYS_HYPERVISOR is not set -CONFIG_CONNECTOR=m -CONFIG_MTD=m -# CONFIG_MTD_DEBUG is not set -CONFIG_MTD_CONCAT=m -CONFIG_MTD_PARTITIONS=y -# CONFIG_MTD_TESTS is not set -# CONFIG_MTD_REDBOOT_PARTS is not set -# CONFIG_MTD_AR7_PARTS is not set - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=m -CONFIG_MTD_BLKDEVS=m -CONFIG_MTD_BLOCK=m -# CONFIG_MTD_BLOCK_RO is not set -# CONFIG_FTL is not set -# CONFIG_NFTL is not set -# CONFIG_INFTL is not set -# CONFIG_RFD_FTL is not set -# CONFIG_SSFDC is not set -# CONFIG_MTD_OOPS is not set - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=m -CONFIG_MTD_JEDECPROBE=m -CONFIG_MTD_GEN_PROBE=m -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_CFI_INTELEXT=m -CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m -CONFIG_MTD_RAM=m -CONFIG_MTD_ROM=m -CONFIG_MTD_ABSENT=m - -# -# Mapping drivers for chip access -# -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=m -CONFIG_MTD_PHYSMAP_COMPAT=y -CONFIG_MTD_PHYSMAP_START=0x8000000 -CONFIG_MTD_PHYSMAP_LEN=0 -CONFIG_MTD_PHYSMAP_BANKWIDTH=2 -CONFIG_MTD_PCI=m -# CONFIG_MTD_INTEL_VR_NOR is not set -CONFIG_MTD_PLATRAM=m - -# -# Self-contained MTD device drivers -# -CONFIG_MTD_PMC551=m -# CONFIG_MTD_PMC551_BUGFIX is not set -# CONFIG_MTD_PMC551_DEBUG is not set -CONFIG_MTD_DATAFLASH=m -# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set -# CONFIG_MTD_DATAFLASH_OTP is not set -CONFIG_MTD_M25P80=m -CONFIG_M25PXX_USE_FAST_READ=y -CONFIG_MTD_SLRAM=m -CONFIG_MTD_PHRAM=m -CONFIG_MTD_MTDRAM=m -CONFIG_MTDRAM_TOTAL_SIZE=4096 -CONFIG_MTDRAM_ERASE_SIZE=128 -CONFIG_MTD_BLOCK2MTD=m - -# -# Disk-On-Chip Device Drivers -# -CONFIG_MTD_DOC2000=m -CONFIG_MTD_DOC2001=m -CONFIG_MTD_DOC2001PLUS=m -CONFIG_MTD_DOCPROBE=m -CONFIG_MTD_DOCECC=m -# CONFIG_MTD_DOCPROBE_ADVANCED is not set -CONFIG_MTD_DOCPROBE_ADDRESS=0 -# CONFIG_MTD_NAND is not set -CONFIG_MTD_NAND_IDS=m -# CONFIG_MTD_ONENAND is not set - -# -# LPDDR flash memory drivers -# -# CONFIG_MTD_LPDDR is not set - -# -# UBI - Unsorted block images -# -# CONFIG_MTD_UBI is not set +# CONFIG_CONNECTOR is not set +# CONFIG_MTD is not set # CONFIG_PARPORT is not set CONFIG_PNP=y -CONFIG_PNP_DEBUG_MESSAGES=y +# CONFIG_PNP_DEBUG_MESSAGES is not set # # Protocols @@ -960,37 +440,15 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=8192 -# CONFIG_BLK_DEV_XIP is not set -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set -CONFIG_ATA_OVER_ETH=m +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set # CONFIG_BLK_DEV_HD 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_ICS932S401 is not set -# CONFIG_ENCLOSURE_SERVICES is not set -# CONFIG_HP_ILO is not set -# CONFIG_ISL29003 is not set -# CONFIG_C2PORT is not set - -# -# EEPROM support -# -# CONFIG_EEPROM_AT24 is not set -# CONFIG_EEPROM_AT25 is not set -# CONFIG_EEPROM_LEGACY is not set -CONFIG_EEPROM_93CX6=y +# CONFIG_MISC_DEVICES is not set CONFIG_HAVE_IDE=y CONFIG_IDE=y @@ -1108,25 +566,7 @@ CONFIG_SCSI_SRP_ATTRS=m # CONFIG_SCSI_DH is not set # CONFIG_SCSI_OSD_INITIATOR is not set # CONFIG_ATA is not set -CONFIG_MD=y -CONFIG_BLK_DEV_MD=m -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID10=m -CONFIG_MD_RAID456=m -CONFIG_MD_RAID6_PQ=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_DEBUG is not set -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_MIRROR=m -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -# CONFIG_DM_DELAY is not set -# CONFIG_DM_UEVENT is not set +# CONFIG_MD is not set # CONFIG_FUSION is not set # @@ -1141,35 +581,15 @@ CONFIG_DM_MULTIPATH=m # CONFIG_I2O is not set CONFIG_NETDEVICES=y CONFIG_COMPAT_NET_DEV_OPS=y -CONFIG_IFB=m -CONFIG_DUMMY=m +# CONFIG_DUMMY is not set # CONFIG_BONDING is not set -CONFIG_MACVLAN=m +# CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set -CONFIG_TUN=m -CONFIG_VETH=m +# CONFIG_TUN is not set +# CONFIG_VETH is not set # CONFIG_NET_SB1000 is not set # CONFIG_ARCNET is not set -CONFIG_PHYLIB=m -# CONFIG_SWCONFIG is not set - -# -# MII PHY device drivers -# -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m -CONFIG_VITESSE_PHY=m -CONFIG_SMSC_PHY=m -# CONFIG_BROADCOM_PHY is not set -# CONFIG_ICPLUS_PHY is not set -CONFIG_REALTEK_PHY=m -# CONFIG_NATIONAL_PHY is not set -# CONFIG_STE10XP is not set -# CONFIG_LSI_ET1011C_PHY is not set -# CONFIG_MDIO_BITBANG is not set +# CONFIG_PHYLIB is not set CONFIG_NET_ETHERNET=y CONFIG_MII=y # CONFIG_AX88796 is not set @@ -1180,7 +600,6 @@ CONFIG_MII=y # CONFIG_NET_VENDOR_SMC is not set # CONFIG_SMC91X is not set # CONFIG_DM9000 is not set -# CONFIG_ENC28J60 is not set # CONFIG_ETHOC is not set # CONFIG_NET_VENDOR_RACAL is not set # CONFIG_DNET is not set @@ -1210,7 +629,7 @@ CONFIG_NET_PCI=y # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set -CONFIG_8139CP=m +# CONFIG_8139CP is not set CONFIG_8139TOO=y # CONFIG_8139TOO_PIO is not set CONFIG_8139TOO_TUNE_TWISTER=y @@ -1233,32 +652,7 @@ CONFIG_8139TOO_TUNE_TWISTER=y # Wireless LAN # # CONFIG_WLAN_PRE80211 is not set -CONFIG_WLAN_80211=y -# CONFIG_LIBERTAS is not set -# CONFIG_LIBERTAS_THINFIRM is not set -# CONFIG_ATMEL is not set -# CONFIG_AT76C50X_USB is not set -# CONFIG_PRISM54 is not set -# CONFIG_USB_ZD1201 is not set -# CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_RTL8180 is not set -CONFIG_RTL8187=y -# CONFIG_ADM8211 is not set -# CONFIG_MAC80211_HWSIM is not set -# CONFIG_MWL8K is not set -# CONFIG_P54_COMMON is not set -# CONFIG_ATH5K is not set -# CONFIG_ATH9K is not set -# CONFIG_AR9170_USB is not set -# CONFIG_IPW2100 is not set -# CONFIG_IPW2200 is not set -# CONFIG_IWLWIFI is not set -# CONFIG_HOSTAP is not set -# CONFIG_B43 is not set -# CONFIG_B43LEGACY is not set -# CONFIG_ZD1211RW is not set -# CONFIG_RT2X00 is not set -# CONFIG_HERMES is not set +# CONFIG_WLAN_80211 is not set # # Enable WiMAX (Networking options) to see the WiMAX drivers @@ -1267,52 +661,20 @@ CONFIG_RTL8187=y # # USB Network Adapters # -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_CDC_EEM is not set -# CONFIG_USB_NET_DM9601 is not set -# CONFIG_USB_NET_SMSC95XX is not set -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -# CONFIG_USB_NET_MCS7830 is not set -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -# CONFIG_USB_KC2190 is not set -CONFIG_USB_NET_ZAURUS=m +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +# CONFIG_USB_USBNET is not set # CONFIG_WAN is not set -# CONFIG_ATM_DRIVERS is not set # CONFIG_FDDI is not set # CONFIG_HIPPI is not set -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -CONFIG_PPPOATM=m -# CONFIG_PPPOL2TP is not set +# CONFIG_PPP is not set # CONFIG_SLIP is not set -CONFIG_SLHC=m # CONFIG_NET_FC is not set -CONFIG_NETCONSOLE=y -# CONFIG_NETCONSOLE_DYNAMIC is not set -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_ISDN is not set # CONFIG_PHONE is not set @@ -1330,8 +692,8 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=m +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_EVDEV is not set # CONFIG_INPUT_EVBUG is not set # @@ -1363,30 +725,18 @@ CONFIG_MOUSE_VSXXXAA=m # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set -CONFIG_INPUT_MISC=y -CONFIG_INPUT_PCSPKR=m -# CONFIG_INPUT_ATI_REMOTE is not set -# CONFIG_INPUT_ATI_REMOTE2 is not set -# CONFIG_INPUT_KEYSPAN_REMOTE is not set -# CONFIG_INPUT_POWERMATE is not set -# CONFIG_INPUT_YEALINK is not set -# CONFIG_INPUT_CM109 is not set -CONFIG_INPUT_UINPUT=m +# CONFIG_INPUT_MISC is not set # # Hardware I/O ports # CONFIG_SERIO=y CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=m -CONFIG_SERIO_PCIPS2=m +# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_PCIPS2 is not set CONFIG_SERIO_LIBPS2=y -CONFIG_SERIO_RAW=m -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set # # Character devices @@ -1397,184 +747,46 @@ CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_DEVKMEM=y -CONFIG_SERIAL_NONSTANDARD=y -# CONFIG_COMPUTONE is not set -# CONFIG_ROCKETPORT is not set -# CONFIG_CYCLADES is not set -# CONFIG_DIGIEPCA is not set -# CONFIG_MOXA_INTELLIO is not set -# CONFIG_MOXA_SMARTIO is not set -# CONFIG_ISI is not set -# CONFIG_SYNCLINKMP is not set -# CONFIG_SYNCLINK_GT is not set -# CONFIG_N_HDLC is not set -# CONFIG_RISCOM8 is not set -# CONFIG_SPECIALIX is not set -# CONFIG_SX is not set -# CONFIG_RIO is not set -CONFIG_STALDRV=y -# CONFIG_STALLION is not set -# CONFIG_ISTALLION is not set +# CONFIG_SERIAL_NONSTANDARD is not set # CONFIG_NOZOMI is not set # # Serial drivers # CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_CONSOLE is not set # CONFIG_SERIAL_8250_PCI is not set # CONFIG_SERIAL_8250_PNP is not set CONFIG_SERIAL_8250_NR_UARTS=16 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_FOURPORT=y -# CONFIG_SERIAL_8250_ACCENT is not set -# CONFIG_SERIAL_8250_BOCA is not set -# CONFIG_SERIAL_8250_EXAR_ST16C554 is not set -CONFIG_SERIAL_8250_HUB6=m -CONFIG_SERIAL_8250_SHARE_IRQ=y -# CONFIG_SERIAL_8250_DETECT_IRQ is not set -CONFIG_SERIAL_8250_RSA=y +# CONFIG_SERIAL_8250_EXTENDED is not set # # Non-8250 serial port support # -# CONFIG_SERIAL_MAX3100 is not set CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_IPMI_HANDLER=m -# CONFIG_IPMI_PANIC_EVENT is not set -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPMI_POWEROFF=m +# CONFIG_LEGACY_PTYS is not set +# CONFIG_IPMI_HANDLER is not set CONFIG_HW_RANDOM=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_RTC is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set -CONFIG_RAW_DRIVER=m -CONFIG_MAX_RAW_DEVS=256 +# CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set CONFIG_DEVPORT=y -CONFIG_I2C=m -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCA=m - -# -# I2C Hardware Bus support -# - -# -# PC SMBus host controller drivers -# -CONFIG_I2C_ALI1535=m -CONFIG_I2C_ALI1563=m -CONFIG_I2C_ALI15X3=m -CONFIG_I2C_AMD756=m -CONFIG_I2C_AMD8111=m -CONFIG_I2C_I801=m -# CONFIG_I2C_ISCH is not set -CONFIG_I2C_PIIX4=m -CONFIG_I2C_NFORCE2=m -CONFIG_I2C_SIS5595=m -CONFIG_I2C_SIS630=m -CONFIG_I2C_SIS96X=m -CONFIG_I2C_VIA=m -CONFIG_I2C_VIAPRO=m - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -CONFIG_I2C_OCORES=m -# CONFIG_I2C_SIMTEC is not set - -# -# External I2C/SMBus adapter drivers -# -CONFIG_I2C_PARPORT_LIGHT=m -# CONFIG_I2C_TAOS_EVM is not set -# CONFIG_I2C_TINY_USB is not set - -# -# Graphics adapter I2C/DDC channel drivers -# -CONFIG_I2C_VOODOO3=m - -# -# Other I2C/SMBus bus drivers -# -# CONFIG_I2C_ELEKTOR is not set -CONFIG_I2C_PCA_ISA=m -# CONFIG_I2C_PCA_PLATFORM is not set -CONFIG_I2C_STUB=m - -# -# Miscellaneous I2C Chip support -# -# CONFIG_DS1682 is not set -CONFIG_SENSORS_PCF8574=m -# CONFIG_PCF8575 is not set -# CONFIG_SENSORS_PCA9539 is not set -CONFIG_SENSORS_MAX6875=m -# CONFIG_SENSORS_TSL2550 is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set -CONFIG_SPI=y -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -CONFIG_SPI_BITBANG=m - -# -# SPI Protocol Masters -# -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_TLE62X0 is not set +# CONFIG_I2C is not set +# CONFIG_SPI is not set # CONFIG_W1 is not set # CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set # CONFIG_THERMAL is not set # CONFIG_THERMAL_HWMON is not set -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -# CONFIG_ALIM7101_WDT is not set - -# -# ISA-based Watchdog Cards -# -# CONFIG_PCWATCHDOG is not set -# CONFIG_MIXCOMWD is not set -# CONFIG_WDT is not set - -# -# PCI-based Watchdog Cards -# -# CONFIG_PCIPCWATCHDOG is not set -# CONFIG_WDTPCI is not set - -# -# USB-based Watchdog Cards -# -# CONFIG_USBPCWATCHDOG is not set +# CONFIG_WATCHDOG is not set CONFIG_SSB_POSSIBLE=y # @@ -1589,9 +801,6 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_PASIC3 is not set # CONFIG_MFD_TMIO is not set -# CONFIG_MFD_WM8400 is not set -# CONFIG_MFD_WM8350_I2C is not set -# CONFIG_MFD_PCF50633 is not set # CONFIG_REGULATOR is not set # @@ -1601,176 +810,19 @@ CONFIG_SSB_POSSIBLE=y # # Multimedia core support # -CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m -CONFIG_VIDEO_ALLOW_V4L1=y -CONFIG_VIDEO_V4L1_COMPAT=y +# CONFIG_VIDEO_DEV is not set # CONFIG_DVB_CORE is not set -CONFIG_VIDEO_MEDIA=m +# CONFIG_VIDEO_MEDIA is not set # # Multimedia drivers # -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEO_V4L1=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set - -# -# Encoders/decoders and other helper chips -# - -# -# Audio decoders -# -# CONFIG_VIDEO_TVAUDIO is not set -# CONFIG_VIDEO_TDA7432 is not set -# CONFIG_VIDEO_TDA9840 is not set -# CONFIG_VIDEO_TDA9875 is not set -# CONFIG_VIDEO_TEA6415C is not set -# CONFIG_VIDEO_TEA6420 is not set -# CONFIG_VIDEO_MSP3400 is not set -# CONFIG_VIDEO_CS5345 is not set -# CONFIG_VIDEO_CS53L32A is not set -# CONFIG_VIDEO_M52790 is not set -# CONFIG_VIDEO_TLV320AIC23B is not set -# CONFIG_VIDEO_WM8775 is not set -# CONFIG_VIDEO_WM8739 is not set -# CONFIG_VIDEO_VP27SMPX is not set - -# -# RDS decoders -# -# CONFIG_VIDEO_SAA6588 is not set - -# -# Video decoders -# -# CONFIG_VIDEO_BT819 is not set -# CONFIG_VIDEO_BT856 is not set -# CONFIG_VIDEO_BT866 is not set -# CONFIG_VIDEO_KS0127 is not set -# CONFIG_VIDEO_OV7670 is not set -# CONFIG_VIDEO_TCM825X is not set -# CONFIG_VIDEO_SAA7110 is not set -# CONFIG_VIDEO_SAA711X is not set -# CONFIG_VIDEO_SAA717X is not set -# CONFIG_VIDEO_SAA7191 is not set -# CONFIG_VIDEO_TVP514X is not set -# CONFIG_VIDEO_TVP5150 is not set -# CONFIG_VIDEO_VPX3220 is not set - -# -# Video and audio decoders -# -# CONFIG_VIDEO_CX25840 is not set - -# -# MPEG video encoders -# -# CONFIG_VIDEO_CX2341X is not set - -# -# Video encoders -# -# CONFIG_VIDEO_SAA7127 is not set -# CONFIG_VIDEO_SAA7185 is not set -# CONFIG_VIDEO_ADV7170 is not set -# CONFIG_VIDEO_ADV7175 is not set - -# -# Video improvement chips -# -# CONFIG_VIDEO_UPD64031A is not set -# CONFIG_VIDEO_UPD64083 is not set -# CONFIG_VIDEO_VIVI is not set -# CONFIG_VIDEO_BT848 is not set -# CONFIG_VIDEO_PMS is not set -# CONFIG_VIDEO_CPIA is not set -# CONFIG_VIDEO_CPIA2 is not set -# CONFIG_VIDEO_SAA5246A is not set -# CONFIG_VIDEO_SAA5249 is not set -# CONFIG_VIDEO_STRADIS is not set -# CONFIG_VIDEO_ZORAN is not set -# CONFIG_VIDEO_SAA7134 is not set -# CONFIG_VIDEO_MXB is not set -# CONFIG_VIDEO_HEXIUM_ORION is not set -# CONFIG_VIDEO_HEXIUM_GEMINI is not set -# CONFIG_VIDEO_CX88 is not set -# CONFIG_VIDEO_IVTV is not set -# CONFIG_VIDEO_CAFE_CCIC is not set -# CONFIG_SOC_CAMERA is not set -CONFIG_V4L_USB_DRIVERS=y -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -# CONFIG_USB_GSPCA is not set -# CONFIG_VIDEO_PVRUSB2 is not set -# CONFIG_VIDEO_HDPVR is not set -# CONFIG_VIDEO_EM28XX is not set -# CONFIG_VIDEO_CX231XX is not set -# CONFIG_VIDEO_USBVISION is not set -# CONFIG_USB_VICAM is not set -# CONFIG_USB_IBMCAM is not set -# CONFIG_USB_KONICAWC is not set -# CONFIG_USB_QUICKCAM_MESSENGER is not set -# CONFIG_USB_ET61X251 is not set -# CONFIG_VIDEO_OVCAMCHIP is not set -# CONFIG_USB_OV511 is not set -# CONFIG_USB_SE401 is not set -# CONFIG_USB_SN9C102 is not set -# CONFIG_USB_STV680 is not set -# CONFIG_USB_ZC0301 is not set -# CONFIG_USB_PWC is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -# CONFIG_USB_ZR364XX is not set -# CONFIG_USB_STKWEBCAM is not set -# CONFIG_USB_S2255 is not set -CONFIG_RADIO_ADAPTERS=y -CONFIG_RADIO_CADET=m -CONFIG_RADIO_RTRACK=m -CONFIG_RADIO_RTRACK2=m -CONFIG_RADIO_AZTECH=m -CONFIG_RADIO_GEMTEK=m -CONFIG_RADIO_GEMTEK_PCI=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_MAESTRO=m -CONFIG_RADIO_SF16FMI=m -CONFIG_RADIO_SF16FMR2=m -CONFIG_RADIO_TERRATEC=m -CONFIG_RADIO_TRUST=m -CONFIG_RADIO_TYPHOON=m -CONFIG_RADIO_TYPHOON_PROC_FS=y -CONFIG_RADIO_ZOLTRIX=m -CONFIG_USB_DSBR=m -# CONFIG_USB_SI470X is not set -# CONFIG_USB_MR800 is not set -# CONFIG_RADIO_TEA5764 is not set # CONFIG_DAB is not set # # Graphics support # -CONFIG_DRM=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -CONFIG_DRM_MGA=m -CONFIG_DRM_VIA=m -CONFIG_DRM_SAVAGE=m +# CONFIG_DRM is not set # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set CONFIG_FB=y @@ -1781,11 +833,11 @@ CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set # CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=m +# CONFIG_FB_SYS_FOPS is not set # CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set # CONFIG_FB_BACKLIGHT is not set @@ -1800,7 +852,6 @@ CONFIG_FB_TILEBLITTING=y # CONFIG_FB_CYBER2000 is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set -# CONFIG_FB_UVESA is not set # CONFIG_FB_S1D13XXX is not set # CONFIG_FB_NVIDIA is not set # CONFIG_FB_RIVA is not set @@ -1824,7 +875,7 @@ CONFIG_FB_TILEBLITTING=y CONFIG_FB_SM7XX=y CONFIG_FB_SM7XX_ACCEL=y # CONFIG_FB_SM7XX_DUALHEAD is not set -CONFIG_FB_VIRTUAL=m +# CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set @@ -1850,143 +901,12 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -# CONFIG_LOGO is not set -CONFIG_SOUND=y -CONFIG_SOUND_OSS_CORE=y -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y -CONFIG_SND_RAWMIDI=m -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_SEQUENCER_OSS=y -# CONFIG_SND_HRTIMER is not set -# CONFIG_SND_DYNAMIC_MINORS is not set -CONFIG_SND_SUPPORT_OLD_API=y -CONFIG_SND_VERBOSE_PROCFS=y -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set -CONFIG_SND_VMASTER=y -CONFIG_SND_AC97_CODEC=y -CONFIG_SND_DRIVERS=y -CONFIG_SND_DUMMY=m -# CONFIG_SND_VIRMIDI is not set -CONFIG_SND_MTPAV=m -# CONFIG_SND_SERIAL_U16550 is not set -# CONFIG_SND_MPU401 is not set -# CONFIG_SND_AC97_POWER_SAVE is not set -CONFIG_SND_PCI=y -# CONFIG_SND_AD1889 is not set -# CONFIG_SND_ALS300 is not set -# CONFIG_SND_ALI5451 is not set -# CONFIG_SND_ATIIXP is not set -# CONFIG_SND_ATIIXP_MODEM is not set -# CONFIG_SND_AU8810 is not set -# CONFIG_SND_AU8820 is not set -# CONFIG_SND_AU8830 is not set -# CONFIG_SND_AW2 is not set -# CONFIG_SND_AZT3328 is not set -# CONFIG_SND_BT87X is not set -# CONFIG_SND_CA0106 is not set -# CONFIG_SND_CMIPCI is not set -# CONFIG_SND_OXYGEN is not set -# CONFIG_SND_CS4281 is not set -# CONFIG_SND_CS46XX is not set -CONFIG_SND_CS5535AUDIO=y -# CONFIG_SND_DARLA20 is not set -# CONFIG_SND_GINA20 is not set -# CONFIG_SND_LAYLA20 is not set -# CONFIG_SND_DARLA24 is not set -# CONFIG_SND_GINA24 is not set -# CONFIG_SND_LAYLA24 is not set -# CONFIG_SND_MONA is not set -# CONFIG_SND_MIA is not set -# CONFIG_SND_ECHO3G is not set -# CONFIG_SND_INDIGO is not set -# CONFIG_SND_INDIGOIO is not set -# CONFIG_SND_INDIGODJ is not set -# CONFIG_SND_INDIGOIOX is not set -# CONFIG_SND_INDIGODJX is not set -# CONFIG_SND_EMU10K1 is not set -# CONFIG_SND_EMU10K1X is not set -# CONFIG_SND_ENS1370 is not set -# CONFIG_SND_ENS1371 is not set -# CONFIG_SND_ES1938 is not set -# CONFIG_SND_ES1968 is not set -# CONFIG_SND_FM801 is not set -# CONFIG_SND_HDA_INTEL is not set -# CONFIG_SND_HDSP is not set -# CONFIG_SND_HDSPM is not set -# CONFIG_SND_HIFIER is not set -# CONFIG_SND_ICE1712 is not set -# CONFIG_SND_ICE1724 is not set -# CONFIG_SND_INTEL8X0 is not set -# CONFIG_SND_INTEL8X0M is not set -# CONFIG_SND_KORG1212 is not set -# CONFIG_SND_MAESTRO3 is not set -# CONFIG_SND_MIXART is not set -# CONFIG_SND_NM256 is not set -# CONFIG_SND_PCXHR is not set -# CONFIG_SND_RIPTIDE is not set -# CONFIG_SND_RME32 is not set -# CONFIG_SND_RME96 is not set -# CONFIG_SND_RME9652 is not set -# CONFIG_SND_SONICVIBES is not set -# CONFIG_SND_TRIDENT is not set -# CONFIG_SND_VIA82XX is not set -# CONFIG_SND_VIA82XX_MODEM is not set -# CONFIG_SND_VIRTUOSO is not set -# CONFIG_SND_VX222 is not set -# CONFIG_SND_YMFPCI is not set -# CONFIG_SND_SPI is not set -# CONFIG_SND_MIPS is not set -# CONFIG_SND_USB is not set -# CONFIG_SND_SOC is not set -# CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=y -CONFIG_HID_SUPPORT=y -CONFIG_HID=y -# CONFIG_HID_DEBUG is not set -CONFIG_HIDRAW=y - -# -# USB Input Devices -# -CONFIG_USB_HID=y -# CONFIG_HID_PID is not set -CONFIG_USB_HIDDEV=y - -# -# Special HID drivers -# -# CONFIG_HID_A4TECH is not set -# CONFIG_HID_APPLE is not set -# CONFIG_HID_BELKIN is not set -# CONFIG_HID_CHERRY is not set -# CONFIG_HID_CHICONY is not set -# CONFIG_HID_CYPRESS is not set -# CONFIG_DRAGONRISE_FF is not set -# CONFIG_HID_EZKEY is not set -# CONFIG_HID_KYE is not set -# CONFIG_HID_GYRATION is not set -# CONFIG_HID_KENSINGTON is not set -# CONFIG_HID_LOGITECH is not set -# CONFIG_HID_MICROSOFT is not set -# CONFIG_HID_MONTEREY is not set -# CONFIG_HID_NTRIG is not set -# CONFIG_HID_PANTHERLORD is not set -# CONFIG_HID_PETALYNX is not set -# CONFIG_HID_SAMSUNG is not set -# CONFIG_HID_SONY is not set -# CONFIG_HID_SUNPLUS is not set -# CONFIG_GREENASIA_FF is not set -# CONFIG_HID_TOPSEED is not set -# CONFIG_THRUSTMASTER_FF is not set -# CONFIG_ZEROPLUS_FF is not set +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_SOUND is not set +# CONFIG_HID_SUPPORT is not set CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y @@ -2001,11 +921,11 @@ CONFIG_USB=y CONFIG_USB_DEVICEFS=y CONFIG_USB_DEVICE_CLASS=y CONFIG_USB_DYNAMIC_MINORS=y -# CONFIG_USB_SUSPEND is not set +CONFIG_USB_SUSPEND=y # CONFIG_USB_OTG is not set # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set -CONFIG_USB_MON=m +# CONFIG_USB_MON is not set # CONFIG_USB_WUSB is not set # CONFIG_USB_WUSB_CBAF is not set @@ -2019,21 +939,21 @@ CONFIG_USB_EHCI_ROOT_HUB_TT=y # CONFIG_USB_OXU210HP_HCD is not set # CONFIG_USB_ISP116X_HCD is not set # CONFIG_USB_ISP1760_HCD is not set -CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=m +# CONFIG_USB_UHCI_HCD is not set # CONFIG_USB_SL811_HCD is not set -CONFIG_USB_R8A66597_HCD=y +# CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_WHCI_HCD is not set # CONFIG_USB_HWA_HCD is not set # # USB Device Class drivers # -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set # CONFIG_USB_WDM is not set # CONFIG_USB_TMC is not set @@ -2044,78 +964,19 @@ CONFIG_USB_PRINTER=m # # also be needed; see USB_STORAGE Help for more info # -CONFIG_USB_STORAGE=y -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y +# CONFIG_USB_STORAGE is not set # CONFIG_USB_LIBUSUAL is not set # # USB Imaging devices # -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set # # USB port drivers # -CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=y -CONFIG_USB_SERIAL_GENERIC=y -# CONFIG_USB_SERIAL_AIRCABLE is not set -CONFIG_USB_SERIAL_ARK3116=m -CONFIG_USB_SERIAL_BELKIN=m -# CONFIG_USB_SERIAL_CH341 is not set -# CONFIG_USB_SERIAL_WHITEHEAT is not set -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -# CONFIG_USB_SERIAL_CP210X is not set -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_FUNSOFT=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -# CONFIG_USB_SERIAL_IUU is not set -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -# CONFIG_USB_SERIAL_KEYSPAN is not set -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -# CONFIG_USB_SERIAL_MOS7720 is not set -# CONFIG_USB_SERIAL_MOS7840 is not set -# CONFIG_USB_SERIAL_MOTOROLA is not set -CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=m -# CONFIG_USB_SERIAL_OTI6858 is not set -# CONFIG_USB_SERIAL_QUALCOMM is not set -# CONFIG_USB_SERIAL_SPCP8X5 is not set -CONFIG_USB_SERIAL_HP4X=m -CONFIG_USB_SERIAL_SAFE=m -# CONFIG_USB_SERIAL_SAFE_PADDED is not set -# CONFIG_USB_SERIAL_SIEMENS_MPI is not set -CONFIG_USB_SERIAL_SIERRAWIRELESS=m -# CONFIG_USB_SERIAL_SYMBOL is not set -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -# CONFIG_USB_SERIAL_OPTICON is not set -# CONFIG_USB_SERIAL_DEBUG is not set +# CONFIG_USB_SERIAL is not set # # USB Miscellaneous drivers @@ -2124,29 +985,23 @@ CONFIG_USB_SERIAL_OMNINET=m # CONFIG_USB_EMI26 is not set # CONFIG_USB_ADUTUX is not set # CONFIG_USB_SEVSEG is not set -CONFIG_USB_RIO500=m +# CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_BERRY_CHARGE is not set # CONFIG_USB_LED is not set # CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set -CONFIG_USB_IDMOUSE=m +# CONFIG_USB_IDMOUSE is not set # CONFIG_USB_FTDI_ELAN is not set -CONFIG_USB_APPLEDISPLAY=m -CONFIG_USB_SISUSBVGA=m -CONFIG_USB_SISUSBVGA_CON=y -CONFIG_USB_LD=m +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set -CONFIG_USB_TEST=m +# CONFIG_USB_TEST is not set # CONFIG_USB_ISIGHTFW is not set # CONFIG_USB_VST is not set -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_CXACRU=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_XUSBATM=m # CONFIG_USB_GADGET is not set # @@ -2154,112 +1009,12 @@ CONFIG_USB_XUSBATM=m # # CONFIG_NOP_USB_XCEIV is not set # CONFIG_UWB is not set -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set - -# -# MMC/SD/SDIO Card Drivers -# -# CONFIG_MMC_BLOCK is not set -# CONFIG_SDIO_UART is not set -# CONFIG_MMC_TEST is not set - -# -# MMC/SD/SDIO Host Controller Drivers -# -# CONFIG_MMC_SDHCI is not set -# CONFIG_MMC_TIFM_SD is not set -# CONFIG_MMC_SPI is not set +# CONFIG_MMC is not set # CONFIG_MEMSTICK is not set -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m - -# -# LED drivers -# -# CONFIG_LEDS_PCA9532 is not set -# CONFIG_LEDS_LP5521 is not set -# CONFIG_LEDS_PCA955X is not set -# CONFIG_LEDS_DAC124S085 is not set -# CONFIG_LEDS_BD2802 is not set - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -# CONFIG_LEDS_TRIGGER_IDE_DISK is not set -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set -# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set - -# -# iptables trigger is under Netfilter config (LED target) -# +# CONFIG_NEW_LEDS is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set -CONFIG_RTC_LIB=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=y -CONFIG_RTC_HCTOSYS_DEVICE="rtc0" -# CONFIG_RTC_DEBUG is not set - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set -# CONFIG_RTC_DRV_TEST is not set - -# -# I2C RTC drivers -# -# CONFIG_RTC_DRV_DS1307 is not set -# CONFIG_RTC_DRV_DS1374 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_MAX6900 is not set -# CONFIG_RTC_DRV_RS5C372 is not set -# CONFIG_RTC_DRV_ISL1208 is not set -# CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_PCF8583 is not set -# CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_S35390A is not set -# CONFIG_RTC_DRV_FM3130 is not set -# CONFIG_RTC_DRV_RX8581 is not set - -# -# SPI RTC drivers -# -# CONFIG_RTC_DRV_M41T94 is not set -# CONFIG_RTC_DRV_DS1305 is not set -# CONFIG_RTC_DRV_DS1390 is not set -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_R9701 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -# CONFIG_RTC_DRV_DS3234 is not set - -# -# Platform RTC drivers -# -CONFIG_RTC_DRV_CMOS=y -# CONFIG_RTC_DRV_DS1286 is not set -# CONFIG_RTC_DRV_DS1511 is not set -# CONFIG_RTC_DRV_DS1553 is not set -# CONFIG_RTC_DRV_DS1742 is not set -# CONFIG_RTC_DRV_STK17TA8 is not set -# CONFIG_RTC_DRV_M48T86 is not set -# CONFIG_RTC_DRV_M48T35 is not set -# CONFIG_RTC_DRV_M48T59 is not set -# CONFIG_RTC_DRV_BQ4802 is not set -# CONFIG_RTC_DRV_V3020 is not set - -# -# on-CPU RTC drivers -# +# CONFIG_RTC_CLASS is not set # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set @@ -2269,64 +1024,25 @@ CONFIG_RTC_DRV_CMOS=y # File systems # CONFIG_EXT2_FS=y -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y +# CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=y -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4_FS=m -CONFIG_EXT4DEV_COMPAT=y -CONFIG_EXT4_FS_XATTR=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_JBD=y -# CONFIG_JBD_DEBUG is not set -CONFIG_JBD2=m -# CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -# CONFIG_JFS_DEBUG is not set -# CONFIG_JFS_STATISTICS is not set -CONFIG_FS_POSIX_ACL=y +# CONFIG_EXT3_FS is not set +# CONFIG_EXT4_FS is not set +# 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=m -CONFIG_XFS_QUOTA=y -CONFIG_XFS_POSIX_ACL=y -CONFIG_XFS_RT=y -# CONFIG_XFS_DEBUG is not set +# CONFIG_XFS_FS is not set # CONFIG_GFS2_FS is not set -CONFIG_OCFS2_FS=m -CONFIG_OCFS2_FS_O2CB=m -CONFIG_OCFS2_FS_STATS=y -CONFIG_OCFS2_DEBUG_MASKLOG=y -# CONFIG_OCFS2_DEBUG_FS is not set -# CONFIG_OCFS2_FS_POSIX_ACL is not set +# CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set CONFIG_DNOTIFY=y CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y -CONFIG_QUOTA=y -# CONFIG_QUOTA_NETLINK_INTERFACE is not set -CONFIG_PRINT_QUOTA_WARNING=y -CONFIG_QUOTA_TREE=m -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -CONFIG_AUTOFS_FS=m -CONFIG_AUTOFS4_FS=m -CONFIG_FUSE_FS=m +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set # # Caches @@ -2336,210 +1052,62 @@ CONFIG_FUSE_FS=m # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y +# CONFIG_MSDOS_FS is not set +# CONFIG_VFAT_FS is not set +# CONFIG_NTFS_FS is not set # # Pseudo filesystems # CONFIG_PROC_FS=y -CONFIG_PROC_KCORE=y +# CONFIG_PROC_KCORE is not set CONFIG_PROC_SYSCTL=y -CONFIG_PROC_PAGE_MONITOR=y +# CONFIG_PROC_PAGE_MONITOR is not set CONFIG_SYSFS=y CONFIG_TMPFS=y # CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set -CONFIG_CONFIGFS_FS=m -CONFIG_MISC_FILESYSTEMS=y -CONFIG_ADFS_FS=m -# CONFIG_ADFS_FS_RW is not set -CONFIG_AFFS_FS=m -# CONFIG_ECRYPT_FS is not set -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -CONFIG_BEFS_FS=m -# CONFIG_BEFS_DEBUG is not set -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m -# CONFIG_YAFFS_FS is not set -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -# CONFIG_JFFS2_SUMMARY is not set -CONFIG_JFFS2_FS_XATTR=y -CONFIG_JFFS2_FS_POSIX_ACL=y -CONFIG_JFFS2_FS_SECURITY=y -# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -CONFIG_JFFS2_ZLIB=y -# CONFIG_JFFS2_LZO is not set -CONFIG_JFFS2_RTIME=y -# CONFIG_JFFS2_RUBIN is not set -CONFIG_CRAMFS=y -# CONFIG_SQUASHFS is not set -CONFIG_VXFS_FS=m -CONFIG_MINIX_FS=m -# CONFIG_OMFS_FS is not set -CONFIG_HPFS_FS=m -CONFIG_QNX4FS_FS=m -CONFIG_ROMFS_FS=m -CONFIG_ROMFS_BACKED_BY_BLOCK=y -# CONFIG_ROMFS_BACKED_BY_MTD is not set -# CONFIG_ROMFS_BACKED_BY_BOTH is not set -CONFIG_ROMFS_ON_BLOCK=y -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_UFS_DEBUG is not set -# CONFIG_NILFS2_FS is not set +# CONFIG_CONFIGFS_FS is not set +# CONFIG_MISC_FILESYSTEMS is not set CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -CONFIG_NFS_V3_ACL=y -CONFIG_NFS_V4=y -CONFIG_NFSD=m -CONFIG_NFSD_V2_ACL=y -CONFIG_NFSD_V3=y -CONFIG_NFSD_V3_ACL=y -CONFIG_NFSD_V4=y -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m -CONFIG_NFS_ACL_SUPPORT=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set -CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set -# CONFIG_CIFS_WEAK_PW_HASH is not set -# CONFIG_CIFS_UPCALL is not set -# CONFIG_CIFS_XATTR is not set -# CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_DFS_UPCALL is not set -# CONFIG_CIFS_EXPERIMENTAL is not set -CONFIG_NCP_FS=m -CONFIG_NCPFS_PACKET_SIGNING=y -CONFIG_NCPFS_IOCTL_LOCKING=y -CONFIG_NCPFS_STRONG=y -CONFIG_NCPFS_NFS_NS=y -CONFIG_NCPFS_OS2_NS=y -# CONFIG_NCPFS_SMALLDOS is not set -CONFIG_NCPFS_NLS=y -CONFIG_NCPFS_EXTRAS=y -CONFIG_CODA_FS=m -CONFIG_AFS_FS=m -# CONFIG_AFS_DEBUG is not set +# CONFIG_NFS_FS is not set +# CONFIG_NFSD is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set # # Partition Types # -CONFIG_PARTITION_ADVANCED=y -CONFIG_ACORN_PARTITION=y -# CONFIG_ACORN_PARTITION_CUMANA is not set -# CONFIG_ACORN_PARTITION_EESOX is not set -CONFIG_ACORN_PARTITION_ICS=y -# CONFIG_ACORN_PARTITION_ADFS is not set -# CONFIG_ACORN_PARTITION_POWERTEC is not set -CONFIG_ACORN_PARTITION_RISCIX=y -CONFIG_OSF_PARTITION=y -CONFIG_AMIGA_PARTITION=y -CONFIG_ATARI_PARTITION=y -CONFIG_MAC_PARTITION=y +# CONFIG_PARTITION_ADVANCED is not set CONFIG_MSDOS_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_LDM_PARTITION=y -# CONFIG_LDM_DEBUG is not set -CONFIG_SGI_PARTITION=y -CONFIG_ULTRIX_PARTITION=y -CONFIG_SUN_PARTITION=y -CONFIG_KARMA_PARTITION=y -CONFIG_EFI_PARTITION=y -# CONFIG_SYSV68_PARTITION is not set -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="utf-8" -CONFIG_NLS_CODEPAGE_437=m -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -CONFIG_NLS_CODEPAGE_850=m -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -# CONFIG_NLS_ISO8859_1 is not set -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m +# CONFIG_NLS is not set # CONFIG_DLM is not set # # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set +CONFIG_PRINTK_TIME=y CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_DEBUG_FS=y +# CONFIG_DEBUG_FS is not set # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set -CONFIG_STACKTRACE=y # CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_NOP_TRACER=y -CONFIG_RING_BUFFER=y -CONFIG_TRACING=y +# CONFIG_SYSCTL_SYSCALL_CHECK is not set CONFIG_TRACING_SUPPORT=y # @@ -2554,8 +1122,6 @@ CONFIG_TRACING_SUPPORT=y # CONFIG_KMEMTRACE is not set # CONFIG_WORKQUEUE_TRACER is not set # CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_FTRACE_STARTUP_TEST is not set -# CONFIG_DYNAMIC_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y CONFIG_CMDLINE="" @@ -2565,51 +1131,22 @@ CONFIG_CMDLINE="" # CONFIG_KEYS=y # CONFIG_KEYS_DEBUG_PROC_KEYS is not set -CONFIG_SECURITY=y +# CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set -CONFIG_SECURITY_NETWORK=y -CONFIG_SECURITY_NETWORK_XFRM=y -# CONFIG_SECURITY_PATH is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set -# CONFIG_SECURITY_ROOTPLUG is not set -CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 -CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0 -CONFIG_SECURITY_SELINUX_DISABLE=y -CONFIG_SECURITY_SELINUX_DEVELOP=y -CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 -# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set -# CONFIG_SECURITY_TOMOYO is not set -CONFIG_XOR_BLOCKS=m -CONFIG_ASYNC_CORE=m -CONFIG_ASYNC_MEMCPY=m -CONFIG_ASYNC_XOR=m CONFIG_CRYPTO=y # # Crypto core or helper # # CONFIG_CRYPTO_FIPS is not set -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_PCOMP=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_MANAGER is not set +# CONFIG_CRYPTO_MANAGER2 is not set # CONFIG_CRYPTO_GF128MUL is not set -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_WORKQUEUE=y +# CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_CRYPTD is not set -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set # # Authenticated Encryption with Associated Data @@ -2621,10 +1158,10 @@ CONFIG_CRYPTO_TEST=m # # Block modes # -CONFIG_CRYPTO_CBC=m +# CONFIG_CRYPTO_CBC is not set # CONFIG_CRYPTO_CTR is not set # CONFIG_CRYPTO_CTS is not set -CONFIG_CRYPTO_ECB=y +# CONFIG_CRYPTO_ECB is not set # CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_PCBC is not set # CONFIG_CRYPTO_XTS is not set @@ -2632,50 +1169,49 @@ CONFIG_CRYPTO_ECB=y # # Hash modes # -CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_XCBC is not set # # Digest # -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_MICHAEL_MIC=m +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_RMD128 is not set # CONFIG_CRYPTO_RMD160 is not set # CONFIG_CRYPTO_RMD256 is not set # CONFIG_CRYPTO_RMD320 is not set -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_WP512=m +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set # # Ciphers # -CONFIG_CRYPTO_AES=y -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=y -CONFIG_CRYPTO_BLOWFISH=m +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_CAMELLIA is not set -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_DES=m +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_DES is not set # CONFIG_CRYPTO_FCRYPT is not set -CONFIG_CRYPTO_KHAZAD=m +# CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_SALSA20 is not set # CONFIG_CRYPTO_SEED is not set -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set # # Compression # -CONFIG_CRYPTO_DEFLATE=m +# CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_ZLIB is not set # CONFIG_CRYPTO_LZO is not set @@ -2683,35 +1219,28 @@ CONFIG_CRYPTO_DEFLATE=m # Random Number Generation # # CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_HW=y -# CONFIG_CRYPTO_DEV_HIFN_795X is not set +# CONFIG_CRYPTO_HW is not set # # OCF Configuration # # CONFIG_OCF_OCF is not set -CONFIG_BINARY_PRINTF=y +# CONFIG_BINARY_PRINTF is not set # # Library routines # CONFIG_BITREVERSE=y CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_CRC_CCITT=m -CONFIG_CRC16=m +# CONFIG_CRC_CCITT is not set +# CONFIG_CRC16 is not set # CONFIG_CRC_T10DIF is not set -CONFIG_CRC_ITU_T=m +# CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y # CONFIG_CRC7 is not set -CONFIG_LIBCRC32C=m -CONFIG_AUDIT_GENERIC=y +# CONFIG_LIBCRC32C is not set CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m CONFIG_DECOMPRESS_GZIP=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y diff --git a/target/lemote/patches/yeelong.patch b/target/lemote/patches/yeelong.patch index 66aa62573..7a88585b9 100644 --- a/target/lemote/patches/yeelong.patch +++ b/target/lemote/patches/yeelong.patch @@ -1,223 +1,6 @@ -diff -Nur linux-2.6.30/.gitignore rt4ls/.gitignore ---- linux-2.6.30/.gitignore 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/.gitignore 2009-06-12 16:27:01.954006636 +0200 -@@ -32,6 +32,7 @@ - tags - TAGS - vmlinux -+vmlinux.32 - System.map - Module.markers - Module.symvers -diff -Nur linux-2.6.30/Documentation/kernel-parameters.txt rt4ls/Documentation/kernel-parameters.txt ---- linux-2.6.30/Documentation/kernel-parameters.txt 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/Documentation/kernel-parameters.txt 2009-06-12 16:27:02.534042890 +0200 -@@ -1220,6 +1220,10 @@ - (machvec) in a generic kernel. - Example: machvec=hpzx1_swiotlb - -+ machtype= [Loongson] Share the same kernel image file between different -+ yeeloong laptop. -+ Example: machtype=lemote-yeeloong-2f-7inch -+ - max_addr=nn[KMG] [KNL,BOOT,ia64] All physical memory greater - than or equal to this physical address is ignored. - -diff -Nur linux-2.6.30/arch/mips/Kconfig rt4ls/arch/mips/Kconfig ---- linux-2.6.30/arch/mips/Kconfig 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/Kconfig 2009-06-12 16:27:08.186400556 +0200 -@@ -6,7 +6,7 @@ - select HAVE_ARCH_KGDB - # Horrible source of confusion. Die, die, die ... - select EMBEDDED -- select RTC_LIB -+ select RTC_LIB if !MACH_LOONGSON - - mainmenu "Linux/MIPS Kernel Configuration" - -@@ -154,30 +154,15 @@ - select SYS_SUPPORTS_64BIT_KERNEL if BROKEN - select SYS_SUPPORTS_LITTLE_ENDIAN - --config LEMOTE_FULONG -- bool "Lemote Fulong mini-PC" -- select ARCH_SPARSEMEM_ENABLE -- select CEVT_R4K -- select CSRC_R4K -- select SYS_HAS_CPU_LOONGSON2 -- select DMA_NONCOHERENT -- select BOOT_ELF32 -- select BOARD_SCACHE -- select HAVE_STD_PC_SERIAL_PORT -- select HW_HAS_PCI -- select I8259 -- select ISA -- select IRQ_CPU -- select SYS_SUPPORTS_32BIT_KERNEL -- select SYS_SUPPORTS_64BIT_KERNEL -- select SYS_SUPPORTS_LITTLE_ENDIAN -- select SYS_SUPPORTS_HIGHMEM -- select SYS_HAS_EARLY_PRINTK -- select GENERIC_ISA_DMA_SUPPORT_BROKEN -- select CPU_HAS_WB -+config MACH_LOONGSON -+ bool "Loongson family of machines" - help -- Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and -- an FPGA northbridge -+ This enables the support of Loongson family of machines. -+ -+ Loongson is a family of general-purpose MIPS-compatible CPUs. -+ developed at Institute of Computing Technology (ICT), -+ Chinese Academy of Sciences (CAS) in the People's Republic -+ of China. The chief architect is Professor Weiwu Hu. - - config MIPS_MALTA - bool "MIPS Malta board" -@@ -643,6 +628,7 @@ - source "arch/mips/txx9/Kconfig" - source "arch/mips/vr41xx/Kconfig" - source "arch/mips/cavium-octeon/Kconfig" -+source "arch/mips/loongson/Kconfig" - - endmenu - -@@ -1005,16 +991,29 @@ - prompt "CPU type" - default CPU_R4X00 - --config CPU_LOONGSON2 -- bool "Loongson 2" -- depends on SYS_HAS_CPU_LOONGSON2 -- select CPU_SUPPORTS_32BIT_KERNEL -- select CPU_SUPPORTS_64BIT_KERNEL -- select CPU_SUPPORTS_HIGHMEM -+config CPU_LOONGSON2E -+ bool "Loongson 2E" -+ depends on SYS_HAS_CPU_LOONGSON2E -+ select CPU_LOONGSON2 - help - The Loongson 2E processor implements the MIPS III instruction set - with many extensions. - -+ It has an internal FPGA northbridge, which is compatiable to -+ bonito64. -+ -+config CPU_LOONGSON2F -+ bool "Loongson 2F" -+ depends on SYS_HAS_CPU_LOONGSON2F -+ select CPU_LOONGSON2 -+ help -+ The Loongson 2F processor implements the MIPS III instruction set -+ with many extensions. -+ -+ Loongson2F have built-in DDR2 and PCIX controller. The PCIX controller -+ have a similar programming interface with FPGA northbridge used in -+ Loongson2E. -+ - config CPU_MIPS32_R1 - bool "MIPS32 Release 1" - depends on SYS_HAS_CPU_MIPS32_R1 -@@ -1253,7 +1252,16 @@ - - endchoice - --config SYS_HAS_CPU_LOONGSON2 -+config CPU_LOONGSON2 -+ bool -+ select CPU_SUPPORTS_32BIT_KERNEL -+ select CPU_SUPPORTS_64BIT_KERNEL -+ select CPU_SUPPORTS_HIGHMEM -+ -+config SYS_HAS_CPU_LOONGSON2E -+ bool -+ -+config SYS_HAS_CPU_LOONGSON2F - bool - - config SYS_HAS_CPU_MIPS32_R1 -@@ -2121,6 +2129,9 @@ - - menu "Power management options" - -+config ARCH_HIBERNATION_POSSIBLE -+ def_bool y -+ - config ARCH_SUSPEND_POSSIBLE - def_bool y - depends on !SMP -@@ -2129,6 +2140,23 @@ - - endmenu - -+menu "CPU Frequency scaling" -+ -+source "drivers/cpufreq/Kconfig" -+ -+config LOONGSON2F_CPU_FREQ -+ bool "Loongson-2F CPU Frequency driver" -+ depends on CPU_LOONGSON2F && CPU_FREQ && (CS5536_MFGPT || I8253) -+ select CPU_FREQ_TABLE -+ help -+ This adds the cpufreq driver for Loongson-2F. -+ -+ For details, take a look at . -+ -+ If unsure, say N. -+ -+endmenu -+ - source "net/Kconfig" - - source "drivers/Kconfig" -diff -Nur linux-2.6.30/arch/mips/Makefile rt4ls/arch/mips/Makefile ---- linux-2.6.30/arch/mips/Makefile 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/Makefile 2009-06-12 16:27:08.186400556 +0200 -@@ -120,7 +120,14 @@ - cflags-$(CONFIG_CPU_VR41XX) += -march=r4100 -Wa,--trap - cflags-$(CONFIG_CPU_R4X00) += -march=r4600 -Wa,--trap - cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap --cflags-$(CONFIG_CPU_LOONGSON2) += -march=r4600 -Wa,--trap -+ -+# only gcc >= 4.4 have the loongson-specific support -+cflags-$(CONFIG_CPU_LOONGSON2) += -Wa,--trap -+cflags-$(CONFIG_CPU_LOONGSON2E) += \ -+ $(call cc-option,-march=loongson2e,-march=r4600) $(call cc-option,-mtune=loongson2e) -+cflags-$(CONFIG_CPU_LOONGSON2F) += \ -+ $(call cc-option,-march=loongson2f,-march=r4600) $(call cc-optoin,-mtune=loongson2f) -+ - cflags-$(CONFIG_CPU_MIPS32_R1) += $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ - -Wa,-mips32 -Wa,--trap - cflags-$(CONFIG_CPU_MIPS32_R2) += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ -@@ -307,9 +314,12 @@ - # - # lemote fulong mini-PC board - # --core-$(CONFIG_LEMOTE_FULONG) +=arch/mips/lemote/lm2e/ --load-$(CONFIG_LEMOTE_FULONG) +=0xffffffff80100000 --cflags-$(CONFIG_LEMOTE_FULONG) += -I$(srctree)/arch/mips/include/asm/mach-lemote -+core-$(CONFIG_MACH_LOONGSON) +=arch/mips/loongson/ -+cflags-$(CONFIG_MACH_LOONGSON) += -I$(srctree)/arch/mips/include/asm/mach-loongson \ -+ -mno-branch-likely -+load-$(CONFIG_LEMOTE_FULOONG2E) +=0xffffffff80100000 -+load-$(CONFIG_LEMOTE_FULOONG2F) +=0xffffffff80200000 -+load-$(CONFIG_LEMOTE_YEELOONG2F) +=0xffffffff80200000 - - # - # MIPS Malta board -@@ -675,6 +685,9 @@ - - drivers-$(CONFIG_OPROFILE) += arch/mips/oprofile/ - -+# suspend and hibernation support -+drivers-$(CONFIG_PM) += arch/mips/power/ -+ - ifdef CONFIG_LASAT - rom.bin rom.sw: vmlinux - $(Q)$(MAKE) $(build)=arch/mips/lasat/image $@ -diff -Nur linux-2.6.30/arch/mips/configs/fulong_defconfig rt4ls/arch/mips/configs/fulong_defconfig ---- linux-2.6.30/arch/mips/configs/fulong_defconfig 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/configs/fulong_defconfig 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/configs/fulong_defconfig linux-2.6.30/arch/mips/configs/fulong_defconfig +--- linux-2.6.30.orig/arch/mips/configs/fulong_defconfig 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/configs/fulong_defconfig 1970-01-01 01:00:00.000000000 +0100 @@ -1,1912 +0,0 @@ -# -# Automatically generated make config: don't edit @@ -2131,9 +1914,9 @@ diff -Nur linux-2.6.30/arch/mips/configs/fulong_defconfig rt4ls/arch/mips/config -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y -diff -Nur linux-2.6.30/arch/mips/configs/fuloong2e_defconfig rt4ls/arch/mips/configs/fuloong2e_defconfig ---- linux-2.6.30/arch/mips/configs/fuloong2e_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/configs/fuloong2e_defconfig 2009-06-12 16:27:08.246405134 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/configs/fuloong2e_defconfig linux-2.6.30/arch/mips/configs/fuloong2e_defconfig +--- linux-2.6.30.orig/arch/mips/configs/fuloong2e_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/configs/fuloong2e_defconfig 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,2018 @@ +# +# Automatically generated make config: don't edit @@ -4153,9 +3936,9 @@ diff -Nur linux-2.6.30/arch/mips/configs/fuloong2e_defconfig rt4ls/arch/mips/con +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y -diff -Nur linux-2.6.30/arch/mips/configs/fuloong2f_defconfig rt4ls/arch/mips/configs/fuloong2f_defconfig ---- linux-2.6.30/arch/mips/configs/fuloong2f_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/configs/fuloong2f_defconfig 2009-06-12 16:27:08.246405134 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/configs/fuloong2f_defconfig linux-2.6.30/arch/mips/configs/fuloong2f_defconfig +--- linux-2.6.30.orig/arch/mips/configs/fuloong2f_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/configs/fuloong2f_defconfig 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,2637 @@ +# +# Automatically generated make config: don't edit @@ -6794,9 +6577,9 @@ diff -Nur linux-2.6.30/arch/mips/configs/fuloong2f_defconfig rt4ls/arch/mips/con +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y -diff -Nur linux-2.6.30/arch/mips/configs/yeeloong2f_defconfig rt4ls/arch/mips/configs/yeeloong2f_defconfig ---- linux-2.6.30/arch/mips/configs/yeeloong2f_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/configs/yeeloong2f_defconfig 2009-06-12 16:27:08.290407950 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/configs/yeeloong2f_defconfig linux-2.6.30/arch/mips/configs/yeeloong2f_defconfig +--- linux-2.6.30.orig/arch/mips/configs/yeeloong2f_defconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/configs/yeeloong2f_defconfig 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,2711 @@ +# +# Automatically generated make config: don't edit @@ -9509,9 +9292,9 @@ diff -Nur linux-2.6.30/arch/mips/configs/yeeloong2f_defconfig rt4ls/arch/mips/co +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +CONFIG_NLATTR=y -diff -Nur linux-2.6.30/arch/mips/include/asm/bootinfo.h rt4ls/arch/mips/include/asm/bootinfo.h ---- linux-2.6.30/arch/mips/include/asm/bootinfo.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/bootinfo.h 2009-06-12 16:27:08.306407755 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/bootinfo.h linux-2.6.30/arch/mips/include/asm/bootinfo.h +--- linux-2.6.30.orig/arch/mips/include/asm/bootinfo.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/bootinfo.h 2009-06-14 20:25:19.000000000 +0200 @@ -7,6 +7,7 @@ * Copyright (C) 1995, 1996 Andreas Busse * Copyright (C) 1995, 1996 Stoned Elipot @@ -9537,9 +9320,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/bootinfo.h rt4ls/arch/mips/include/ #define CL_SIZE COMMAND_LINE_SIZE extern char *system_type; -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h rt4ls/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h ---- linux-2.6.30/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h linux-2.6.30/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public @@ -9600,9 +9383,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/cpu-feature-overrides.h -#define cpu_icache_snoops_remote_store 1 - -#endif /* __ASM_MACH_LEMOTE_CPU_FEATURE_OVERRIDES_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/dma-coherence.h rt4ls/arch/mips/include/asm/mach-lemote/dma-coherence.h ---- linux-2.6.30/arch/mips/include/asm/mach-lemote/dma-coherence.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/mach-lemote/dma-coherence.h 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/dma-coherence.h linux-2.6.30/arch/mips/include/asm/mach-lemote/dma-coherence.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/dma-coherence.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/mach-lemote/dma-coherence.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public @@ -9670,9 +9453,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/dma-coherence.h rt4ls/a -} - -#endif /* __ASM_MACH_LEMOTE_DMA_COHERENCE_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/mc146818rtc.h rt4ls/arch/mips/include/asm/mach-lemote/mc146818rtc.h ---- linux-2.6.30/arch/mips/include/asm/mach-lemote/mc146818rtc.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/mach-lemote/mc146818rtc.h 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/mc146818rtc.h linux-2.6.30/arch/mips/include/asm/mach-lemote/mc146818rtc.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/mc146818rtc.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/mach-lemote/mc146818rtc.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public @@ -9710,9 +9493,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/mc146818rtc.h rt4ls/arc -#endif - -#endif /* __ASM_MACH_LEMOTE_MC146818RTC_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/pci.h rt4ls/arch/mips/include/asm/mach-lemote/pci.h ---- linux-2.6.30/arch/mips/include/asm/mach-lemote/pci.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/mach-lemote/pci.h 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/pci.h linux-2.6.30/arch/mips/include/asm/mach-lemote/pci.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/pci.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/mach-lemote/pci.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2008 Zhang Le @@ -9744,9 +9527,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/pci.h rt4ls/arch/mips/i -#define LOONGSON2E_IO_PORT_BASE 0x1fd00000UL - -#endif /* !_LEMOTE_PCI_H_ */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/war.h rt4ls/arch/mips/include/asm/mach-lemote/war.h ---- linux-2.6.30/arch/mips/include/asm/mach-lemote/war.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/mach-lemote/war.h 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/war.h linux-2.6.30/arch/mips/include/asm/mach-lemote/war.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-lemote/war.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/mach-lemote/war.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -/* - * This file is subject to the terms and conditions of the GNU General Public @@ -9773,9 +9556,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-lemote/war.h rt4ls/arch/mips/i -#define MIPS34K_MISSED_ITLB_WAR 0 - -#endif /* __ASM_MIPS_MACH_LEMOTE_WAR_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/clock.h rt4ls/arch/mips/include/asm/mach-loongson/clock.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/clock.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/clock.h 2009-06-12 16:27:08.506427365 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/clock.h linux-2.6.30/arch/mips/include/asm/mach-loongson/clock.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/clock.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/clock.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,64 @@ +#ifndef __ASM_MIPS_CLOCK_H +#define __ASM_MIPS_CLOCK_H @@ -9841,9 +9624,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/clock.h rt4ls/arch/mi +int clk_set_rate_ex(struct clk *clk, unsigned long rate, int algo_id); + +#endif /* __ASM_MIPS_CLOCK_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cmdline.h rt4ls/arch/mips/include/asm/mach-loongson/cmdline.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/cmdline.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/cmdline.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cmdline.h linux-2.6.30/arch/mips/include/asm/mach-loongson/cmdline.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cmdline.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/cmdline.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,9 @@ +/* machine-specific command line initialization */ +#ifdef CONFIG_SYS_HAS_MACH_PROM_INIT_CMDLINE @@ -9854,9 +9637,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cmdline.h rt4ls/arch/ +} +#endif + -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h rt4ls/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h linux-2.6.30/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,59 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -9917,9 +9700,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cpu-feature-overrides +#define cpu_icache_snoops_remote_store 1 + +#endif /* __ASM_MACH_LEMOTE_CPU_FEATURE_OVERRIDES_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,382 @@ +/* + * The header file of cs5536 sourth bridge. @@ -10303,9 +10086,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536.h rt4ls +#define GPIOL_OUT_EN 0x04 + +#endif /* _CS5536_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,26 @@ +/* + * cs5536 mfgpt header file @@ -10333,9 +10116,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_mfgpt.h +#define MFGPT0_SETUP (MFGPT_BASE + 6) + +#endif /*!_CS5536_MFGPT_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,174 @@ +/* + * the definition file of cs5536 Virtual Support Module(VSM). @@ -10511,9 +10294,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h r +#define PCI_EHCI_FLADJ_REG 0x60 + +#endif /* _CS5536_PCI_H_ */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,59 @@ +/* + * the Virtual Support Module(VSM) read/write interfaces @@ -10574,9 +10357,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h r + DEFINE_CS5536_MODULE(udc) +#endif +#endif /* _CS5536_VSM_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/dma-coherence.h rt4ls/arch/mips/include/asm/mach-loongson/dma-coherence.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/dma-coherence.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/dma-coherence.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/dma-coherence.h linux-2.6.30/arch/mips/include/asm/mach-loongson/dma-coherence.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/dma-coherence.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/dma-coherence.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,70 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -10648,9 +10431,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/dma-coherence.h rt4ls +} + +#endif /* __ASM_MACH_LOONGSON_DMA_COHERENCE_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/loongson.h rt4ls/arch/mips/include/asm/mach-loongson/loongson.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/loongson.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/loongson.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/loongson.h linux-2.6.30/arch/mips/include/asm/mach-loongson/loongson.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/loongson.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/loongson.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,319 @@ +/* + * Copyright (c) 2009 Philippe Vachon @@ -10971,9 +10754,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/loongson.h rt4ls/arch + +#endif /* __LOONGSON_H */ + -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/machine.h rt4ls/arch/mips/include/asm/mach-loongson/machine.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/machine.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/machine.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/machine.h linux-2.6.30/arch/mips/include/asm/mach-loongson/machine.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/machine.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/machine.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,76 @@ +/* + * board-specific header file @@ -11051,9 +10834,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/machine.h rt4ls/arch/ +#endif + +#endif /* ! __MACHINE_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/mc146818rtc.h rt4ls/arch/mips/include/asm/mach-loongson/mc146818rtc.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/mc146818rtc.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/mc146818rtc.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/mc146818rtc.h linux-2.6.30/arch/mips/include/asm/mach-loongson/mc146818rtc.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/mc146818rtc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/mc146818rtc.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,36 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -11091,9 +10874,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/mc146818rtc.h rt4ls/a +#endif + +#endif /* __ASM_MACH_LOONGSON_MC146818RTC_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/mem.h rt4ls/arch/mips/include/asm/mach-loongson/mem.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/mem.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/mem.h 2009-06-12 16:27:08.510427596 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/mem.h linux-2.6.30/arch/mips/include/asm/mach-loongson/mem.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/mem.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/mem.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,31 @@ +#ifndef __MEM_H +#define __MEM_H @@ -11126,9 +10909,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/mem.h rt4ls/arch/mips +#endif + +#endif /* !__MEM_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/pci.h rt4ls/arch/mips/include/asm/mach-loongson/pci.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/pci.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/pci.h 2009-06-12 16:27:08.514429781 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/pci.h linux-2.6.30/arch/mips/include/asm/mach-loongson/pci.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/pci.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/pci.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2008 Zhang Le @@ -11189,9 +10972,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/pci.h rt4ls/arch/mips + + +#endif /* !_LOONGSON_PCI_H_ */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/war.h rt4ls/arch/mips/include/asm/mach-loongson/war.h ---- linux-2.6.30/arch/mips/include/asm/mach-loongson/war.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/include/asm/mach-loongson/war.h 2009-06-12 16:27:08.514429781 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/war.h linux-2.6.30/arch/mips/include/asm/mach-loongson/war.h +--- linux-2.6.30.orig/arch/mips/include/asm/mach-loongson/war.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/include/asm/mach-loongson/war.h 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,25 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -11218,9 +11001,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mach-loongson/war.h rt4ls/arch/mips +#define MIPS34K_MISSED_ITLB_WAR 0 + +#endif /* __ASM_MIPS_MACH_LOONGSON_WAR_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/mips-boards/bonito64.h rt4ls/arch/mips/include/asm/mips-boards/bonito64.h ---- linux-2.6.30/arch/mips/include/asm/mips-boards/bonito64.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/mips-boards/bonito64.h 2009-06-12 16:27:08.574431556 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/mips-boards/bonito64.h linux-2.6.30/arch/mips/include/asm/mips-boards/bonito64.h +--- linux-2.6.30.orig/arch/mips/include/asm/mips-boards/bonito64.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/mips-boards/bonito64.h 2009-06-14 20:25:19.000000000 +0200 @@ -26,11 +26,6 @@ /* offsets from base register */ #define BONITO(x) (x) @@ -11233,9 +11016,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/mips-boards/bonito64.h rt4ls/arch/m #else /* -diff -Nur linux-2.6.30/arch/mips/include/asm/page.h rt4ls/arch/mips/include/asm/page.h ---- linux-2.6.30/arch/mips/include/asm/page.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/page.h 2009-06-12 16:27:08.602426182 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/page.h linux-2.6.30/arch/mips/include/asm/page.h +--- linux-2.6.30.orig/arch/mips/include/asm/page.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/page.h 2009-06-14 20:25:19.000000000 +0200 @@ -179,8 +179,9 @@ #endif @@ -11248,9 +11031,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/page.h rt4ls/arch/mips/include/asm/ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -diff -Nur linux-2.6.30/arch/mips/include/asm/pci.h rt4ls/arch/mips/include/asm/pci.h ---- linux-2.6.30/arch/mips/include/asm/pci.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/pci.h 2009-06-12 16:27:08.606433396 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/pci.h linux-2.6.30/arch/mips/include/asm/pci.h +--- linux-2.6.30.orig/arch/mips/include/asm/pci.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/pci.h 2009-06-14 20:25:19.000000000 +0200 @@ -56,7 +56,7 @@ /* * board supplied pci irq fixup routine @@ -11260,9 +11043,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/pci.h rt4ls/arch/mips/include/asm/p /* Can be used to override the logic in pci_scan_bus for skipping -diff -Nur linux-2.6.30/arch/mips/include/asm/pgtable.h rt4ls/arch/mips/include/asm/pgtable.h ---- linux-2.6.30/arch/mips/include/asm/pgtable.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/pgtable.h 2009-06-12 16:27:08.610435582 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/pgtable.h linux-2.6.30/arch/mips/include/asm/pgtable.h +--- linux-2.6.30.orig/arch/mips/include/asm/pgtable.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/pgtable.h 2009-06-14 20:25:19.000000000 +0200 @@ -370,6 +370,19 @@ #include @@ -11283,9 +11066,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/pgtable.h rt4ls/arch/mips/include/a * We provide our own get_unmapped area to cope with the virtual aliasing * constraints placed on us by the cache architecture. */ -diff -Nur linux-2.6.30/arch/mips/include/asm/stackframe.h rt4ls/arch/mips/include/asm/stackframe.h ---- linux-2.6.30/arch/mips/include/asm/stackframe.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/stackframe.h 2009-06-12 16:27:08.674441225 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/stackframe.h linux-2.6.30/arch/mips/include/asm/stackframe.h +--- linux-2.6.30.orig/arch/mips/include/asm/stackframe.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/stackframe.h 2009-06-14 20:25:19.000000000 +0200 @@ -117,6 +117,20 @@ .endm #else @@ -11307,9 +11090,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/stackframe.h rt4ls/arch/mips/includ #if defined(CONFIG_32BIT) || defined(KBUILD_64BIT_SYM32) lui k1, %hi(kernelsp) #else -diff -Nur linux-2.6.30/arch/mips/include/asm/suspend.h rt4ls/arch/mips/include/asm/suspend.h ---- linux-2.6.30/arch/mips/include/asm/suspend.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/suspend.h 2009-06-12 16:27:08.678439779 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/suspend.h linux-2.6.30/arch/mips/include/asm/suspend.h +--- linux-2.6.30.orig/arch/mips/include/asm/suspend.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/suspend.h 2009-06-14 20:25:19.000000000 +0200 @@ -1,6 +1,9 @@ #ifndef __ASM_SUSPEND_H #define __ASM_SUSPEND_H @@ -11321,9 +11104,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/suspend.h rt4ls/arch/mips/include/a +extern const void __nosave_begin, __nosave_end; #endif /* __ASM_SUSPEND_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/generic.h rt4ls/arch/mips/include/asm/txx9/generic.h ---- linux-2.6.30/arch/mips/include/asm/txx9/generic.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/txx9/generic.h 2009-06-12 16:27:08.686439682 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/txx9/generic.h linux-2.6.30/arch/mips/include/asm/txx9/generic.h +--- linux-2.6.30.orig/arch/mips/include/asm/txx9/generic.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/txx9/generic.h 2009-06-14 20:25:19.000000000 +0200 @@ -37,7 +37,7 @@ void (*arch_init)(void); void (*device_init)(void); @@ -11333,9 +11116,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/generic.h rt4ls/arch/mips/incl #endif }; extern struct txx9_board_vec *txx9_board_vec; -diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/jmr3927.h rt4ls/arch/mips/include/asm/txx9/jmr3927.h ---- linux-2.6.30/arch/mips/include/asm/txx9/jmr3927.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/txx9/jmr3927.h 2009-06-12 16:27:08.686439682 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/txx9/jmr3927.h linux-2.6.30/arch/mips/include/asm/txx9/jmr3927.h +--- linux-2.6.30.orig/arch/mips/include/asm/txx9/jmr3927.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/txx9/jmr3927.h 2009-06-14 20:25:19.000000000 +0200 @@ -175,6 +175,6 @@ void jmr3927_prom_init(void); void jmr3927_irq_setup(void); @@ -11344,9 +11127,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/jmr3927.h rt4ls/arch/mips/incl +int jmr3927_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin); #endif /* __ASM_TXX9_JMR3927_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/rbtx4927.h rt4ls/arch/mips/include/asm/txx9/rbtx4927.h ---- linux-2.6.30/arch/mips/include/asm/txx9/rbtx4927.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/txx9/rbtx4927.h 2009-06-12 16:27:08.690440751 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/txx9/rbtx4927.h linux-2.6.30/arch/mips/include/asm/txx9/rbtx4927.h +--- linux-2.6.30.orig/arch/mips/include/asm/txx9/rbtx4927.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/txx9/rbtx4927.h 2009-06-14 20:25:19.000000000 +0200 @@ -87,6 +87,6 @@ void rbtx4927_prom_init(void); void rbtx4927_irq_setup(void); @@ -11355,9 +11138,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/rbtx4927.h rt4ls/arch/mips/inc +int rbtx4927_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin); #endif /* __ASM_TXX9_RBTX4927_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/rbtx4938.h rt4ls/arch/mips/include/asm/txx9/rbtx4938.h ---- linux-2.6.30/arch/mips/include/asm/txx9/rbtx4938.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/txx9/rbtx4938.h 2009-06-12 16:27:08.690440751 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/txx9/rbtx4938.h linux-2.6.30/arch/mips/include/asm/txx9/rbtx4938.h +--- linux-2.6.30.orig/arch/mips/include/asm/txx9/rbtx4938.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/txx9/rbtx4938.h 2009-06-14 20:25:19.000000000 +0200 @@ -140,6 +140,6 @@ void rbtx4938_prom_init(void); void rbtx4938_irq_setup(void); @@ -11366,9 +11149,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/rbtx4938.h rt4ls/arch/mips/inc +int rbtx4938_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin); #endif /* __ASM_TXX9_RBTX4938_H */ -diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/tx4938.h rt4ls/arch/mips/include/asm/txx9/tx4938.h ---- linux-2.6.30/arch/mips/include/asm/txx9/tx4938.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/txx9/tx4938.h 2009-06-12 16:27:08.690440751 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/txx9/tx4938.h linux-2.6.30/arch/mips/include/asm/txx9/tx4938.h +--- linux-2.6.30.orig/arch/mips/include/asm/txx9/tx4938.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/txx9/tx4938.h 2009-06-14 20:25:19.000000000 +0200 @@ -287,7 +287,7 @@ void tx4938_report_pci1clk(void); int tx4938_pciclk66_setup(void); @@ -11378,9 +11161,9 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/tx4938.h rt4ls/arch/mips/inclu void tx4938_setup_pcierr_irq(void); void tx4938_irq_init(void); void tx4938_mtd_init(int ch); -diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/tx4939.h rt4ls/arch/mips/include/asm/txx9/tx4939.h ---- linux-2.6.30/arch/mips/include/asm/txx9/tx4939.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/include/asm/txx9/tx4939.h 2009-06-12 16:27:08.694430645 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/include/asm/txx9/tx4939.h linux-2.6.30/arch/mips/include/asm/txx9/tx4939.h +--- linux-2.6.30.orig/arch/mips/include/asm/txx9/tx4939.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/include/asm/txx9/tx4939.h 2009-06-14 20:25:19.000000000 +0200 @@ -534,8 +534,8 @@ int tx4939_report_pciclk(void); void tx4939_report_pci1clk(void); @@ -11392,64 +11175,200 @@ diff -Nur linux-2.6.30/arch/mips/include/asm/txx9/tx4939.h rt4ls/arch/mips/inclu void tx4939_setup_pcierr_irq(void); void tx4939_irq_init(void); int tx4939_irq(void); -diff -Nur linux-2.6.30/arch/mips/kernel/Makefile rt4ls/arch/mips/kernel/Makefile ---- linux-2.6.30/arch/mips/kernel/Makefile 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/kernel/Makefile 2009-06-12 16:27:08.710440787 +0200 -@@ -73,6 +73,7 @@ - obj-$(CONFIG_MIPS32_COMPAT) += linux32.o ptrace32.o signal32.o - obj-$(CONFIG_MIPS32_N32) += binfmt_elfn32.o scall64-n32.o signal_n32.o - obj-$(CONFIG_MIPS32_O32) += binfmt_elfo32.o scall64-o32.o -+obj-$(CONFIG_LOONGSON2F_CPU_FREQ) += loongson2f_freq.o +diff -Nur linux-2.6.30.orig/arch/mips/Kconfig linux-2.6.30/arch/mips/Kconfig +--- linux-2.6.30.orig/arch/mips/Kconfig 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/Kconfig 2009-06-14 20:25:19.000000000 +0200 +@@ -6,7 +6,7 @@ + select HAVE_ARCH_KGDB + # Horrible source of confusion. Die, die, die ... + select EMBEDDED +- select RTC_LIB ++ select RTC_LIB if !MACH_LOONGSON - obj-$(CONFIG_KGDB) += kgdb.o - obj-$(CONFIG_PROC_FS) += proc.o -diff -Nur linux-2.6.30/arch/mips/kernel/asm-offsets.c rt4ls/arch/mips/kernel/asm-offsets.c ---- linux-2.6.30/arch/mips/kernel/asm-offsets.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/kernel/asm-offsets.c 2009-06-12 16:27:08.710440787 +0200 -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include + mainmenu "Linux/MIPS Kernel Configuration" -@@ -326,3 +327,15 @@ - BLANK(); - } - #endif -+ -+#ifdef CONFIG_HIBERNATION -+void output_pbe_defines(void) -+{ -+ COMMENT(" Linux struct pbe offsets. "); -+ OFFSET(PBE_ADDRESS, pbe, address); -+ OFFSET(PBE_ORIG_ADDRESS, pbe, orig_address); -+ OFFSET(PBE_NEXT, pbe, next); -+ DEFINE(PBE_SIZE, sizeof(struct pbe)); -+ BLANK(); -+} -+#endif -diff -Nur linux-2.6.30/arch/mips/kernel/i8259.c rt4ls/arch/mips/kernel/i8259.c ---- linux-2.6.30/arch/mips/kernel/i8259.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/kernel/i8259.c 2009-06-12 16:27:08.722442317 +0200 -@@ -177,10 +177,12 @@ - outb(cached_slave_mask, PIC_SLAVE_IMR); - outb(0x60+(irq&7), PIC_SLAVE_CMD);/* 'Specific EOI' to slave */ - outb(0x60+PIC_CASCADE_IR, PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */ -+ inb(PIC_MASTER_CMD); /* flush posted write */ - } else { - inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ - outb(cached_master_mask, PIC_MASTER_IMR); - outb(0x60+irq, PIC_MASTER_CMD); /* 'Specific EOI to master */ -+ inb(PIC_MASTER_CMD); /* flush posted write */ - } - smtc_im_ack_irq(irq); - spin_unlock_irqrestore(&i8259A_lock, flags); -diff -Nur linux-2.6.30/arch/mips/kernel/loongson2f_freq.c rt4ls/arch/mips/kernel/loongson2f_freq.c ---- linux-2.6.30/arch/mips/kernel/loongson2f_freq.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/kernel/loongson2f_freq.c 2009-06-12 16:27:08.726441989 +0200 -@@ -0,0 +1,216 @@ +@@ -154,30 +154,15 @@ + select SYS_SUPPORTS_64BIT_KERNEL if BROKEN + select SYS_SUPPORTS_LITTLE_ENDIAN + +-config LEMOTE_FULONG +- bool "Lemote Fulong mini-PC" +- select ARCH_SPARSEMEM_ENABLE +- select CEVT_R4K +- select CSRC_R4K +- select SYS_HAS_CPU_LOONGSON2 +- select DMA_NONCOHERENT +- select BOOT_ELF32 +- select BOARD_SCACHE +- select HAVE_STD_PC_SERIAL_PORT +- select HW_HAS_PCI +- select I8259 +- select ISA +- select IRQ_CPU +- select SYS_SUPPORTS_32BIT_KERNEL +- select SYS_SUPPORTS_64BIT_KERNEL +- select SYS_SUPPORTS_LITTLE_ENDIAN +- select SYS_SUPPORTS_HIGHMEM +- select SYS_HAS_EARLY_PRINTK +- select GENERIC_ISA_DMA_SUPPORT_BROKEN +- select CPU_HAS_WB ++config MACH_LOONGSON ++ bool "Loongson family of machines" + help +- Lemote Fulong mini-PC board based on the Chinese Loongson-2E CPU and +- an FPGA northbridge ++ This enables the support of Loongson family of machines. ++ ++ Loongson is a family of general-purpose MIPS-compatible CPUs. ++ developed at Institute of Computing Technology (ICT), ++ Chinese Academy of Sciences (CAS) in the People's Republic ++ of China. The chief architect is Professor Weiwu Hu. + + config MIPS_MALTA + bool "MIPS Malta board" +@@ -643,6 +628,7 @@ + source "arch/mips/txx9/Kconfig" + source "arch/mips/vr41xx/Kconfig" + source "arch/mips/cavium-octeon/Kconfig" ++source "arch/mips/loongson/Kconfig" + + endmenu + +@@ -1005,16 +991,29 @@ + prompt "CPU type" + default CPU_R4X00 + +-config CPU_LOONGSON2 +- bool "Loongson 2" +- depends on SYS_HAS_CPU_LOONGSON2 +- select CPU_SUPPORTS_32BIT_KERNEL +- select CPU_SUPPORTS_64BIT_KERNEL +- select CPU_SUPPORTS_HIGHMEM ++config CPU_LOONGSON2E ++ bool "Loongson 2E" ++ depends on SYS_HAS_CPU_LOONGSON2E ++ select CPU_LOONGSON2 + help + The Loongson 2E processor implements the MIPS III instruction set + with many extensions. + ++ It has an internal FPGA northbridge, which is compatiable to ++ bonito64. ++ ++config CPU_LOONGSON2F ++ bool "Loongson 2F" ++ depends on SYS_HAS_CPU_LOONGSON2F ++ select CPU_LOONGSON2 ++ help ++ The Loongson 2F processor implements the MIPS III instruction set ++ with many extensions. ++ ++ Loongson2F have built-in DDR2 and PCIX controller. The PCIX controller ++ have a similar programming interface with FPGA northbridge used in ++ Loongson2E. ++ + config CPU_MIPS32_R1 + bool "MIPS32 Release 1" + depends on SYS_HAS_CPU_MIPS32_R1 +@@ -1253,7 +1252,16 @@ + + endchoice + +-config SYS_HAS_CPU_LOONGSON2 ++config CPU_LOONGSON2 ++ bool ++ select CPU_SUPPORTS_32BIT_KERNEL ++ select CPU_SUPPORTS_64BIT_KERNEL ++ select CPU_SUPPORTS_HIGHMEM ++ ++config SYS_HAS_CPU_LOONGSON2E ++ bool ++ ++config SYS_HAS_CPU_LOONGSON2F + bool + + config SYS_HAS_CPU_MIPS32_R1 +@@ -2121,6 +2129,9 @@ + + menu "Power management options" + ++config ARCH_HIBERNATION_POSSIBLE ++ def_bool y ++ + config ARCH_SUSPEND_POSSIBLE + def_bool y + depends on !SMP +@@ -2129,6 +2140,23 @@ + + endmenu + ++menu "CPU Frequency scaling" ++ ++source "drivers/cpufreq/Kconfig" ++ ++config LOONGSON2F_CPU_FREQ ++ bool "Loongson-2F CPU Frequency driver" ++ depends on CPU_LOONGSON2F && CPU_FREQ && (CS5536_MFGPT || I8253) ++ select CPU_FREQ_TABLE ++ help ++ This adds the cpufreq driver for Loongson-2F. ++ ++ For details, take a look at . ++ ++ If unsure, say N. ++ ++endmenu ++ + source "net/Kconfig" + + source "drivers/Kconfig" +diff -Nur linux-2.6.30.orig/arch/mips/kernel/asm-offsets.c linux-2.6.30/arch/mips/kernel/asm-offsets.c +--- linux-2.6.30.orig/arch/mips/kernel/asm-offsets.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/kernel/asm-offsets.c 2009-06-14 20:25:19.000000000 +0200 +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -326,3 +327,15 @@ + BLANK(); + } + #endif ++ ++#ifdef CONFIG_HIBERNATION ++void output_pbe_defines(void) ++{ ++ COMMENT(" Linux struct pbe offsets. "); ++ OFFSET(PBE_ADDRESS, pbe, address); ++ OFFSET(PBE_ORIG_ADDRESS, pbe, orig_address); ++ OFFSET(PBE_NEXT, pbe, next); ++ DEFINE(PBE_SIZE, sizeof(struct pbe)); ++ BLANK(); ++} ++#endif +diff -Nur linux-2.6.30.orig/arch/mips/kernel/i8259.c linux-2.6.30/arch/mips/kernel/i8259.c +--- linux-2.6.30.orig/arch/mips/kernel/i8259.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/kernel/i8259.c 2009-06-14 20:25:19.000000000 +0200 +@@ -177,10 +177,12 @@ + outb(cached_slave_mask, PIC_SLAVE_IMR); + outb(0x60+(irq&7), PIC_SLAVE_CMD);/* 'Specific EOI' to slave */ + outb(0x60+PIC_CASCADE_IR, PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */ ++ inb(PIC_MASTER_CMD); /* flush posted write */ + } else { + inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ + outb(cached_master_mask, PIC_MASTER_IMR); + outb(0x60+irq, PIC_MASTER_CMD); /* 'Specific EOI to master */ ++ inb(PIC_MASTER_CMD); /* flush posted write */ + } + smtc_im_ack_irq(irq); + spin_unlock_irqrestore(&i8259A_lock, flags); +diff -Nur linux-2.6.30.orig/arch/mips/kernel/loongson2f_freq.c linux-2.6.30/arch/mips/kernel/loongson2f_freq.c +--- linux-2.6.30.orig/arch/mips/kernel/loongson2f_freq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/kernel/loongson2f_freq.c 2009-06-14 20:25:19.000000000 +0200 +@@ -0,0 +1,216 @@ +/* + * arch/mips/kernel/cpufreq.c + * @@ -11666,9 +11585,20 @@ diff -Nur linux-2.6.30/arch/mips/kernel/loongson2f_freq.c rt4ls/arch/mips/kernel +MODULE_AUTHOR("Yanhua "); +MODULE_DESCRIPTION("cpufreq driver for Loongson2F"); +MODULE_LICENSE("GPL"); -diff -Nur linux-2.6.30/arch/mips/kernel/smtc.c rt4ls/arch/mips/kernel/smtc.c ---- linux-2.6.30/arch/mips/kernel/smtc.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/kernel/smtc.c 2009-06-12 16:27:08.746436158 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/kernel/Makefile linux-2.6.30/arch/mips/kernel/Makefile +--- linux-2.6.30.orig/arch/mips/kernel/Makefile 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/kernel/Makefile 2009-06-14 20:25:19.000000000 +0200 +@@ -73,6 +73,7 @@ + obj-$(CONFIG_MIPS32_COMPAT) += linux32.o ptrace32.o signal32.o + obj-$(CONFIG_MIPS32_N32) += binfmt_elfn32.o scall64-n32.o signal_n32.o + obj-$(CONFIG_MIPS32_O32) += binfmt_elfo32.o scall64-o32.o ++obj-$(CONFIG_LOONGSON2F_CPU_FREQ) += loongson2f_freq.o + + obj-$(CONFIG_KGDB) += kgdb.o + obj-$(CONFIG_PROC_FS) += proc.o +diff -Nur linux-2.6.30.orig/arch/mips/kernel/smtc.c linux-2.6.30/arch/mips/kernel/smtc.c +--- linux-2.6.30.orig/arch/mips/kernel/smtc.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/kernel/smtc.c 2009-06-14 20:25:19.000000000 +0200 @@ -924,6 +924,7 @@ int irq = MIPS_CPU_IRQ_BASE + 1; @@ -11677,20 +11607,9 @@ diff -Nur linux-2.6.30/arch/mips/kernel/smtc.c rt4ls/arch/mips/kernel/smtc.c switch (type_copy) { case SMTC_CLOCK_TICK: irq_enter(); -diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/Makefile rt4ls/arch/mips/lemote/lm2e/Makefile ---- linux-2.6.30/arch/mips/lemote/lm2e/Makefile 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/lemote/lm2e/Makefile 1970-01-01 01:00:00.000000000 +0100 -@@ -1,7 +0,0 @@ --# --# Makefile for Lemote Fulong mini-PC board. --# -- --obj-y += setup.o prom.o reset.o irq.o pci.o bonito-irq.o dbg_io.o mem.o -- --EXTRA_CFLAGS += -Werror -diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/bonito-irq.c rt4ls/arch/mips/lemote/lm2e/bonito-irq.c ---- linux-2.6.30/arch/mips/lemote/lm2e/bonito-irq.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/lemote/lm2e/bonito-irq.c 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/lemote/lm2e/bonito-irq.c linux-2.6.30/arch/mips/lemote/lm2e/bonito-irq.c +--- linux-2.6.30.orig/arch/mips/lemote/lm2e/bonito-irq.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/lemote/lm2e/bonito-irq.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,74 +0,0 @@ -/* - * Copyright 2001 MontaVista Software Inc. @@ -11766,9 +11685,9 @@ diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/bonito-irq.c rt4ls/arch/mips/lemote - - setup_irq(BONITO_IRQ_BASE + 10, &dma_timeout_irqaction); -} -diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/dbg_io.c rt4ls/arch/mips/lemote/lm2e/dbg_io.c ---- linux-2.6.30/arch/mips/lemote/lm2e/dbg_io.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/lemote/lm2e/dbg_io.c 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/lemote/lm2e/dbg_io.c linux-2.6.30/arch/mips/lemote/lm2e/dbg_io.c +--- linux-2.6.30.orig/arch/mips/lemote/lm2e/dbg_io.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/lemote/lm2e/dbg_io.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,146 +0,0 @@ -/* - * Copyright 2001 MontaVista Software Inc. @@ -11916,9 +11835,9 @@ diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/dbg_io.c rt4ls/arch/mips/lemote/lm2 - UART16550_WRITE(OFS_SEND_BUFFER, byte); - return 1; -} -diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/irq.c rt4ls/arch/mips/lemote/lm2e/irq.c ---- linux-2.6.30/arch/mips/lemote/lm2e/irq.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/lemote/lm2e/irq.c 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/lemote/lm2e/irq.c linux-2.6.30/arch/mips/lemote/lm2e/irq.c +--- linux-2.6.30.orig/arch/mips/lemote/lm2e/irq.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/lemote/lm2e/irq.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,143 +0,0 @@ -/* - * Copyright (C) 2007 Lemote Inc. & Insititute of Computing Technology @@ -12063,9 +11982,20 @@ diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/irq.c rt4ls/arch/mips/lemote/lm2e/i - setup_irq(MIPS_CPU_IRQ_BASE + 5, &cascade_irqaction); - -} -diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/mem.c rt4ls/arch/mips/lemote/lm2e/mem.c ---- linux-2.6.30/arch/mips/lemote/lm2e/mem.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/lemote/lm2e/mem.c 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/lemote/lm2e/Makefile linux-2.6.30/arch/mips/lemote/lm2e/Makefile +--- linux-2.6.30.orig/arch/mips/lemote/lm2e/Makefile 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/lemote/lm2e/Makefile 1970-01-01 01:00:00.000000000 +0100 +@@ -1,7 +0,0 @@ +-# +-# Makefile for Lemote Fulong mini-PC board. +-# +- +-obj-y += setup.o prom.o reset.o irq.o pci.o bonito-irq.o dbg_io.o mem.o +- +-EXTRA_CFLAGS += -Werror +diff -Nur linux-2.6.30.orig/arch/mips/lemote/lm2e/mem.c linux-2.6.30/arch/mips/lemote/lm2e/mem.c +--- linux-2.6.30.orig/arch/mips/lemote/lm2e/mem.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/lemote/lm2e/mem.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify it @@ -12090,9 +12020,9 @@ diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/mem.c rt4ls/arch/mips/lemote/lm2e/m - return addr >= __pa(high_memory) || - ((addr >= 0x10000000) && (addr < 0x20000000)); -} -diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/pci.c rt4ls/arch/mips/lemote/lm2e/pci.c ---- linux-2.6.30/arch/mips/lemote/lm2e/pci.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/lemote/lm2e/pci.c 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/lemote/lm2e/pci.c linux-2.6.30/arch/mips/lemote/lm2e/pci.c +--- linux-2.6.30.orig/arch/mips/lemote/lm2e/pci.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/lemote/lm2e/pci.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -/* - * pci.c @@ -12191,9 +12121,9 @@ diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/pci.c rt4ls/arch/mips/lemote/lm2e/p -} - -arch_initcall(pcibios_init); -diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/prom.c rt4ls/arch/mips/lemote/lm2e/prom.c ---- linux-2.6.30/arch/mips/lemote/lm2e/prom.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/lemote/lm2e/prom.c 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/lemote/lm2e/prom.c linux-2.6.30/arch/mips/lemote/lm2e/prom.c +--- linux-2.6.30.orig/arch/mips/lemote/lm2e/prom.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/lemote/lm2e/prom.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -/* - * Based on Ocelot Linux port, which is @@ -12292,9 +12222,9 @@ diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/prom.c rt4ls/arch/mips/lemote/lm2e/ -{ - putDebugChar(c); -} -diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/reset.c rt4ls/arch/mips/lemote/lm2e/reset.c ---- linux-2.6.30/arch/mips/lemote/lm2e/reset.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/lemote/lm2e/reset.c 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/lemote/lm2e/reset.c linux-2.6.30/arch/mips/lemote/lm2e/reset.c +--- linux-2.6.30.orig/arch/mips/lemote/lm2e/reset.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/lemote/lm2e/reset.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify it @@ -12337,9 +12267,9 @@ diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/reset.c rt4ls/arch/mips/lemote/lm2e - _machine_halt = loongson2e_halt; - pm_power_off = loongson2e_power_off; -} -diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/setup.c rt4ls/arch/mips/lemote/lm2e/setup.c ---- linux-2.6.30/arch/mips/lemote/lm2e/setup.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/lemote/lm2e/setup.c 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/lemote/lm2e/setup.c linux-2.6.30/arch/mips/lemote/lm2e/setup.c +--- linux-2.6.30.orig/arch/mips/lemote/lm2e/setup.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/lemote/lm2e/setup.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,111 +0,0 @@ -/* - * BRIEF MODULE DESCRIPTION @@ -12452,266 +12382,39 @@ diff -Nur linux-2.6.30/arch/mips/lemote/lm2e/setup.c rt4ls/arch/mips/lemote/lm2e -#endif - -} -diff -Nur linux-2.6.30/arch/mips/lib/delay.c rt4ls/arch/mips/lib/delay.c ---- linux-2.6.30/arch/mips/lib/delay.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/lib/delay.c 2009-06-12 16:27:08.762444064 +0200 -@@ -43,7 +43,7 @@ - { - unsigned int lpj = current_cpu_data.udelay_val; - -- __delay((us * 0x000010c7 * HZ * lpj) >> 32); -+ __delay((us * 0x000010c7ull * HZ * lpj) >> 32); - } - EXPORT_SYMBOL(__udelay); - -@@ -51,6 +51,6 @@ - { - unsigned int lpj = current_cpu_data.udelay_val; - -- __delay((us * 0x00000005 * HZ * lpj) >> 32); -+ __delay((ns * 0x00000005ull * HZ * lpj) >> 32); - } - EXPORT_SYMBOL(__ndelay); -diff -Nur linux-2.6.30/arch/mips/loongson/Kconfig rt4ls/arch/mips/loongson/Kconfig ---- linux-2.6.30/arch/mips/loongson/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/Kconfig 2009-06-12 16:27:08.770446201 +0200 -@@ -0,0 +1,135 @@ -+choice -+ prompt "Machine Type" -+ depends on MACH_LOONGSON -+ -+config LEMOTE_FULOONG2E -+ bool "Lemote Fuloong(2e) mini-PC" -+ select ARCH_SPARSEMEM_ENABLE -+ select CEVT_R4K -+ select CSRC_R4K -+ select SYS_HAS_CPU_LOONGSON2E -+ select DMA_NONCOHERENT -+ select BOOT_ELF32 -+ select BOARD_SCACHE -+ select HW_HAS_PCI -+ select I8259 -+ select ISA -+ select IRQ_CPU -+ select SYS_SUPPORTS_32BIT_KERNEL -+ select SYS_SUPPORTS_64BIT_KERNEL -+ select SYS_SUPPORTS_LITTLE_ENDIAN -+ select SYS_SUPPORTS_HIGHMEM -+ select SYS_HAS_EARLY_PRINTK -+ select GENERIC_HARDIRQS_NO__DO_IRQ -+ select GENERIC_ISA_DMA_SUPPORT_BROKEN -+ select CPU_HAS_WB -+ help -+ Lemote Fuloong(2e) mini-PC board based on the Chinese Loongson-2E CPU and -+ an FPGA northbridge -+ -+ Lemote Fuloong(2e) mini PC have a VIA686B south bridge. -+ -+config LEMOTE_FULOONG2F -+ bool "Lemote Fuloong(2f) mini-PC" -+ select ARCH_SPARSEMEM_ENABLE -+ select CEVT_R4K if !CS5536_MFGPT -+ select CSRC_R4K if !CS5536_MFGPT -+ select SYS_HAS_CPU_LOONGSON2F -+ select DMA_NONCOHERENT -+ select BOOT_ELF32 -+ select BOARD_SCACHE -+ select HW_HAS_PCI -+ select I8259 -+ select ISA -+ select IRQ_CPU -+ select SYS_SUPPORTS_32BIT_KERNEL -+ select SYS_SUPPORTS_64BIT_KERNEL -+ select SYS_SUPPORTS_LITTLE_ENDIAN -+ select SYS_SUPPORTS_HIGHMEM -+ select SYS_HAS_EARLY_PRINTK -+ select GENERIC_HARDIRQS_NO__DO_IRQ -+ select GENERIC_ISA_DMA_SUPPORT_BROKEN -+ select CPU_HAS_WB -+ select CS5536 -+ help -+ Lemote Fuloong(2f) mini-PC board based on the Chinese Loongson-2F -+ CPU, which has an internal DDR and PCIX controller. the PCIX -+ controller have the similiar programming interface of the FPGA north -+ bridge of LOONGSON2E. -+ -+ Lemote Fuloong(2f) mini PC have an AMD CS5536 south bridge. -+ -+config LEMOTE_YEELOONG2F -+ bool "Lemote Yeeloong(2f) mini Notebook" -+ select ARCH_SPARSEMEM_ENABLE -+ select CEVT_R4K if !CS5536_MFGPT -+ select CSRC_R4K if !CS5536_MFGPT -+ select SYS_HAS_CPU_LOONGSON2F -+ select DMA_NONCOHERENT -+ select BOOT_ELF32 -+ select BOARD_SCACHE -+ select HW_HAS_PCI -+ select I8259 -+ select ISA -+ select IRQ_CPU -+ select SYS_SUPPORTS_32BIT_KERNEL -+ select SYS_SUPPORTS_64BIT_KERNEL -+ select SYS_SUPPORTS_LITTLE_ENDIAN -+ select SYS_SUPPORTS_HIGHMEM -+ select SYS_HAS_EARLY_PRINTK -+ select SYS_HAS_MACH_PROM_INIT_CMDLINE -+ select GENERIC_HARDIRQS_NO__DO_IRQ -+ select GENERIC_ISA_DMA_SUPPORT_BROKEN -+ select CPU_HAS_WB -+ select CS5536 -+ help -+ Lemote Laptop based on the Chinese Loongson-2F CPU, which has an -+ internal DDR and PCIX controller. the PCIX controller have the -+ similiar programming interface of the FPGA north bridge of -+ LOONGSON2E. -+ -+ Lemote Yeeloong(2f) laptop have an AMD CS5536 south bridge and an EC -+ controller. -+ -+endchoice -+ -+config CS5536 -+ bool -+ -+config CS5536_FLASH -+ bool -+ depends on CS5536 -+ -+config CS5536_NOR_FLASH -+ bool -+ depends on CS5536_FLASH -+ -+config CS5536_OTG -+ bool -+ depends on CS5536 -+ -+config CS5536_UDC -+ bool -+ depends on CS5536 -+ -+config SYS_HAS_MACH_PROM_INIT_CMDLINE -+ bool -+ -+config CS5536_MFGPT -+ bool "Using cs5536's MFGPT as system clock" -+ depends on CS5536 -+ help -+ This is needed if cpufreq and oprofile is enabled in Loongson2(F) -+ machines -+ -+config UCA_SIZE -+ hex "Uncache Accelerated Region size" -+ depends on CPU_LOONGSON2F -+ default 0x400000 if LEMOTE_YEELOONG2F -+ default 0x2000000 if LEMOTE_FULOONG2F -+ help -+ Uncached Acceleration(UCA) can greatly improve video performance. -+ Normally the Video memory can be accessed in Uncached Accelerated mode, -+ other peripheral spaces not. -+ -+ Specify a zeroed size to disable this feature. -diff -Nur linux-2.6.30/arch/mips/loongson/Makefile rt4ls/arch/mips/loongson/Makefile ---- linux-2.6.30/arch/mips/loongson/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/Makefile 2009-06-12 16:27:08.770446201 +0200 -@@ -0,0 +1,23 @@ -+# -+# Common code for all Loongson based systems -+# -+ -+obj-$(CONFIG_MACH_LOONGSON) += common/ -+ -+# -+# Lemote Fuloong mini-PC (Loongson 2E-based) -+# -+ -+obj-$(CONFIG_LEMOTE_FULOONG2E) += fuloong-2e/ -+ -+# -+# Lemote Fuloong mini-PC (Loongson 2F-based) -+# -+ -+obj-$(CONFIG_LEMOTE_FULOONG2F) += fuloong-2f/ -+ -+# -+# Lemote Yeeloong mini-PC (Loongson 2F-based) -+# -+ -+obj-$(CONFIG_LEMOTE_YEELOONG2F) += yeeloong-2f/ -diff -Nur linux-2.6.30/arch/mips/loongson/common/Makefile rt4ls/arch/mips/loongson/common/Makefile ---- linux-2.6.30/arch/mips/loongson/common/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/Makefile 2009-06-12 16:27:08.774444476 +0200 -@@ -0,0 +1,37 @@ -+# -+# Makefile for loongson based machines. -+# -+ -+obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \ -+ pci.o bonito-irq.o mem.o machtype.o -+ -+# -+# Early printk support -+# -+obj-$(CONFIG_EARLY_PRINTK) += early_printk.o -+ -+# -+# Enable RTC Class support -+# -+# please enable CONFIG_RTC_DRV_CMOS -+# -+obj-$(CONFIG_RTC_DRV_CMOS) += rtc.o -+ -+# -+# Enable CS5536 Virtual Support Module(VSM) for virtulize the PCI configure -+# space -+# -+obj-$(CONFIG_CS5536) += cs5536/ -+ -+# -+# Enable fuloong(2f) and yeeloong(2f) cpu frequency scaling support -+# This is based on CS5536 mfgpt timer -+# -+obj-$(CONFIG_LOONGSON2F_CPU_FREQ) += clock.o -+ -+# -+# Enable serial port -+# -+obj-$(CONFIG_SERIAL_8250) += serial.o -+ -+EXTRA_CFLAGS += -Werror -diff -Nur linux-2.6.30/arch/mips/loongson/common/bonito-irq.c rt4ls/arch/mips/loongson/common/bonito-irq.c ---- linux-2.6.30/arch/mips/loongson/common/bonito-irq.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/bonito-irq.c 2009-06-12 16:27:08.774444476 +0200 -@@ -0,0 +1,78 @@ -+/* -+ * Copyright 2001 MontaVista Software Inc. -+ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net -+ * Copyright (C) 2000, 2001 Ralf Baechle (ralf@gnu.org) -+ * -+ * Copyright (C) 2007 Lemote Inc. & Insititute of Computing Technology -+ * Author: Fuxin Zhang, zhangfx@lemote.com -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License as published by the -+ * Free Software Foundation; either version 2 of the License, or (at your -+ * option) any later version. -+ * -+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN -+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ */ +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/bonito-irq.c linux-2.6.30/arch/mips/loongson/common/bonito-irq.c +--- linux-2.6.30.orig/arch/mips/loongson/common/bonito-irq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/bonito-irq.c 2009-06-14 20:25:19.000000000 +0200 +@@ -0,0 +1,78 @@ ++/* ++ * Copyright 2001 MontaVista Software Inc. ++ * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net ++ * Copyright (C) 2000, 2001 Ralf Baechle (ralf@gnu.org) ++ * ++ * Copyright (C) 2007 Lemote Inc. & Insititute of Computing Technology ++ * Author: Fuxin Zhang, zhangfx@lemote.com ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ++ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN ++ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF ++ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ++ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ */ + +#include + @@ -12761,9 +12464,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/bonito-irq.c rt4ls/arch/mips/lo + setup_irq(LOONGSON_DMATIMEOUT_IRQ, &dma_timeout_irqaction); +#endif +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/clock.c rt4ls/arch/mips/loongson/common/clock.c ---- linux-2.6.30/arch/mips/loongson/common/clock.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/clock.c 2009-06-12 16:27:08.774444476 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/clock.c linux-2.6.30/arch/mips/loongson/common/clock.c +--- linux-2.6.30.orig/arch/mips/loongson/common/clock.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/clock.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,166 @@ +/* + * arch/mips/loongson/common/clock.c @@ -12931,9 +12634,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/clock.c rt4ls/arch/mips/loongso + spin_unlock_irqrestore(&loongson2f_wait_lock, flags); +} +EXPORT_SYMBOL_GPL(loongson2f_cpu_wait); -diff -Nur linux-2.6.30/arch/mips/loongson/common/cmdline.c rt4ls/arch/mips/loongson/common/cmdline.c ---- linux-2.6.30/arch/mips/loongson/common/cmdline.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/cmdline.c 2009-06-12 16:27:08.774444476 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/cmdline.c linux-2.6.30/arch/mips/loongson/common/cmdline.c +--- linux-2.6.30.orig/arch/mips/loongson/common/cmdline.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/cmdline.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,57 @@ +/* + * Based on Ocelot Linux port, which is @@ -12992,38 +12695,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/cmdline.c rt4ls/arch/mips/loong + if ((strstr(arcs_cmdline, "root=")) == NULL) + strcat(arcs_cmdline, " root=/dev/hda1"); +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/Makefile rt4ls/arch/mips/loongson/common/cs5536/Makefile ---- linux-2.6.30/arch/mips/loongson/common/cs5536/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/cs5536/Makefile 2009-06-12 16:27:08.774444476 +0200 -@@ -0,0 +1,25 @@ -+# -+# Makefile for CS5536 support. -+# -+ -+# -+# core modules -+# -+obj-$(CONFIG_CS5536) += cs5536_pci.o cs5536_ide.o cs5536_acc.o cs5536_ohci.o \ -+ cs5536_isa.o cs5536_ehci.o -+# -+# selective modules -+# -+# add a CS5536_[MODULE] to your board in arch/mips/loongson/Kconfig -+# -+obj-$(CONFIG_CS5536_FLASH) += cs5536_flash.o -+obj-$(CONFIG_CS5536_NOR_FLASH) += cs5536_flash.o -+obj-$(CONFIG_CS5536_OTG) += cs5536_otg.o -+obj-$(CONFIG_CS5536_UDC) += cs5536_udc.o -+ -+# -+# Enable cs5536 mfgpt Timer -+# -+obj-$(CONFIG_CS5536_MFGPT) += cs5536_mfgpt.o -+ -+EXTRA_CFLAGS += -Werror -diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_acc.c rt4ls/arch/mips/loongson/common/cs5536/cs5536_acc.c ---- linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_acc.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/cs5536/cs5536_acc.c 2009-06-12 16:27:08.774444476 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_acc.c linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_acc.c +--- linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_acc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_acc.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,156 @@ +/* + * the ACC Virtual Support Module of AMD CS5536 @@ -13181,9 +12855,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_acc.c rt4ls/arch/ + + return conf_data; +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ehci.c rt4ls/arch/mips/loongson/common/cs5536/cs5536_ehci.c ---- linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ehci.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/cs5536/cs5536_ehci.c 2009-06-12 16:27:08.774444476 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_ehci.c linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ehci.c +--- linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_ehci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ehci.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,166 @@ +/* + * the EHCI Virtual Support Module of AMD CS5536 @@ -13351,9 +13025,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ehci.c rt4ls/arch + + return conf_data; +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_flash.c rt4ls/arch/mips/loongson/common/cs5536/cs5536_flash.c ---- linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_flash.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/cs5536/cs5536_flash.c 2009-06-12 16:27:08.774444476 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_flash.c linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_flash.c +--- linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_flash.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_flash.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,452 @@ +/* + * the FLASH Virtual Support Module of AMD CS5536 @@ -13807,9 +13481,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_flash.c rt4ls/arc + return conf_data; +} +#endif /* CONFIG_CS5536_NOR_FLASH */ -diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ide.c rt4ls/arch/mips/loongson/common/cs5536/cs5536_ide.c ---- linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ide.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/cs5536/cs5536_ide.c 2009-06-12 16:27:08.774444476 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_ide.c linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ide.c +--- linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_ide.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ide.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,194 @@ +/* + * the IDE Virtual Support Module of AMD CS5536 @@ -14005,9 +13679,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ide.c rt4ls/arch/ + + return conf_data; +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_isa.c rt4ls/arch/mips/loongson/common/cs5536/cs5536_isa.c ---- linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_isa.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/cs5536/cs5536_isa.c 2009-06-12 16:27:08.774444476 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_isa.c linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_isa.c +--- linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_isa.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_isa.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,376 @@ +/* + * the ISA Virtual Support Module of AMD CS5536 @@ -14385,9 +14059,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_isa.c rt4ls/arch/ + + return conf_data; +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c rt4ls/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c ---- linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c 2009-06-12 16:27:08.774444476 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c +--- linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,257 @@ +/* + * CS5536 General timer functions @@ -14646,9 +14320,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c rt4ls/arc +} + +arch_initcall(init_mfgpt_clocksource); -diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ohci.c rt4ls/arch/mips/loongson/common/cs5536/cs5536_ohci.c ---- linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ohci.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/cs5536/cs5536_ohci.c 2009-06-12 16:27:08.778446663 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_ohci.c linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ohci.c +--- linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_ohci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ohci.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,168 @@ +/* + * the OHCI Virtual Support Module of AMD CS5536 @@ -14818,9 +14492,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_ohci.c rt4ls/arch + + return conf_data; +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_otg.c rt4ls/arch/mips/loongson/common/cs5536/cs5536_otg.c ---- linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_otg.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/cs5536/cs5536_otg.c 2009-06-12 16:27:08.778446663 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_otg.c linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_otg.c +--- linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_otg.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_otg.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,138 @@ +/* + * the OTG Virtual Support Module of AMD CS5536 @@ -14960,9 +14634,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_otg.c rt4ls/arch/ + + return conf_data; +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_pci.c rt4ls/arch/mips/loongson/common/cs5536/cs5536_pci.c ---- linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/cs5536/cs5536_pci.c 2009-06-12 16:27:08.778446663 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_pci.c linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_pci.c +--- linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_pci.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,126 @@ +/* + * read/write operation to the PCI config space of CS5536 @@ -15090,9 +14764,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_pci.c rt4ls/arch/ + } + return data; +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_udc.c rt4ls/arch/mips/loongson/common/cs5536/cs5536_udc.c ---- linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_udc.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/cs5536/cs5536_udc.c 2009-06-12 16:27:08.778446663 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_udc.c linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_udc.c +--- linux-2.6.30.orig/arch/mips/loongson/common/cs5536/cs5536_udc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_udc.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,143 @@ +/* + * the UDC Virtual Support Module of AMD CS5536 @@ -15237,30 +14911,59 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/cs5536/cs5536_udc.c rt4ls/arch/ + + return conf_data; +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/early_printk.c rt4ls/arch/mips/loongson/common/early_printk.c ---- linux-2.6.30/arch/mips/loongson/common/early_printk.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/early_printk.c 2009-06-12 16:27:08.778446663 +0200 -@@ -0,0 +1,28 @@ -+/* early printk support -+ * -+ * Copyright (c) 2009 Philippe Vachon -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License as published by the -+ * Free Software Foundation; either version 2 of the License, or (at your -+ * option) any later version. -+ */ -+ -+#include -+#include -+ -+#include -+#include +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/cs5536/Makefile linux-2.6.30/arch/mips/loongson/common/cs5536/Makefile +--- linux-2.6.30.orig/arch/mips/loongson/common/cs5536/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/cs5536/Makefile 2009-06-14 20:25:19.000000000 +0200 +@@ -0,0 +1,25 @@ ++# ++# Makefile for CS5536 support. ++# + -+void prom_putchar(char c) -+{ -+ int timeout; -+ phys_addr_t uart_base = ++# ++# core modules ++# ++obj-$(CONFIG_CS5536) += cs5536_pci.o cs5536_ide.o cs5536_acc.o cs5536_ohci.o \ ++ cs5536_isa.o cs5536_ehci.o ++# ++# selective modules ++# ++# add a CS5536_[MODULE] to your board in arch/mips/loongson/Kconfig ++# ++obj-$(CONFIG_CS5536_FLASH) += cs5536_flash.o ++obj-$(CONFIG_CS5536_NOR_FLASH) += cs5536_flash.o ++obj-$(CONFIG_CS5536_OTG) += cs5536_otg.o ++obj-$(CONFIG_CS5536_UDC) += cs5536_udc.o ++ ++# ++# Enable cs5536 mfgpt Timer ++# ++obj-$(CONFIG_CS5536_MFGPT) += cs5536_mfgpt.o ++ ++EXTRA_CFLAGS += -Werror +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/early_printk.c linux-2.6.30/arch/mips/loongson/common/early_printk.c +--- linux-2.6.30.orig/arch/mips/loongson/common/early_printk.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/early_printk.c 2009-06-14 20:25:19.000000000 +0200 +@@ -0,0 +1,28 @@ ++/* early printk support ++ * ++ * Copyright (c) 2009 Philippe Vachon ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ */ ++ ++#include ++#include ++ ++#include ++#include ++ ++void prom_putchar(char c) ++{ ++ int timeout; ++ phys_addr_t uart_base = + (phys_addr_t) ioremap_nocache(LOONGSON_UART_BASE, 8); + char reg = readb((u8 *) (uart_base + UART_LSR)) & UART_LSR_THRE; + @@ -15269,9 +14972,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/early_printk.c rt4ls/arch/mips/ + + writeb(c, (u8 *) (uart_base + UART_TX)); +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/env.c rt4ls/arch/mips/loongson/common/env.c ---- linux-2.6.30/arch/mips/loongson/common/env.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/env.c 2009-06-12 16:27:08.778446663 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/env.c linux-2.6.30/arch/mips/loongson/common/env.c +--- linux-2.6.30.orig/arch/mips/loongson/common/env.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/env.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,59 @@ +/* + * Based on Ocelot Linux port, which is @@ -15332,9 +15035,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/env.c rt4ls/arch/mips/loongson/ + pr_info("busclock=%ld, cpuclock=%ld, memsize=%ld, highmemsize=%ld\n", + bus_clock, cpu_clock_freq, memsize, highmemsize); +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/init.c rt4ls/arch/mips/loongson/common/init.c ---- linux-2.6.30/arch/mips/loongson/common/init.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/init.c 2009-06-12 16:27:08.778446663 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/init.c linux-2.6.30/arch/mips/loongson/common/init.c +--- linux-2.6.30.orig/arch/mips/loongson/common/init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/init.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,54 @@ +/* + * Based on Ocelot Linux port, which is @@ -15390,9 +15093,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/init.c rt4ls/arch/mips/loongson +void __init prom_free_prom_memory(void) +{ +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/irq.c rt4ls/arch/mips/loongson/common/irq.c ---- linux-2.6.30/arch/mips/loongson/common/irq.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/irq.c 2009-06-12 16:27:08.778446663 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/irq.c linux-2.6.30/arch/mips/loongson/common/irq.c +--- linux-2.6.30.orig/arch/mips/loongson/common/irq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/irq.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,132 @@ +/* + * Copyright 2001 MontaVista Software Inc. @@ -15526,9 +15229,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/irq.c rt4ls/arch/mips/loongson/ + /* setup source bridge irq (i8259) */ + setup_irq(LOONGSON_SOUTH_BRIDGE_IRQ, &cascade_irqaction); +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/machtype.c rt4ls/arch/mips/loongson/common/machtype.c ---- linux-2.6.30/arch/mips/loongson/common/machtype.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/machtype.c 2009-06-12 16:27:08.782445496 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/machtype.c linux-2.6.30/arch/mips/loongson/common/machtype.c +--- linux-2.6.30.orig/arch/mips/loongson/common/machtype.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/machtype.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2009 Lemote Inc. & Insititute of Computing Technology @@ -15580,9 +15283,50 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/machtype.c rt4ls/arch/mips/loon + return 0; +} +__setup("machtype=", machtype_setup); -diff -Nur linux-2.6.30/arch/mips/loongson/common/mem.c rt4ls/arch/mips/loongson/common/mem.c ---- linux-2.6.30/arch/mips/loongson/common/mem.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/mem.c 2009-06-12 16:27:08.782445496 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/Makefile linux-2.6.30/arch/mips/loongson/common/Makefile +--- linux-2.6.30.orig/arch/mips/loongson/common/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/Makefile 2009-06-14 20:25:19.000000000 +0200 +@@ -0,0 +1,37 @@ ++# ++# Makefile for loongson based machines. ++# ++ ++obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \ ++ pci.o bonito-irq.o mem.o machtype.o ++ ++# ++# Early printk support ++# ++obj-$(CONFIG_EARLY_PRINTK) += early_printk.o ++ ++# ++# Enable RTC Class support ++# ++# please enable CONFIG_RTC_DRV_CMOS ++# ++obj-$(CONFIG_RTC_DRV_CMOS) += rtc.o ++ ++# ++# Enable CS5536 Virtual Support Module(VSM) for virtulize the PCI configure ++# space ++# ++obj-$(CONFIG_CS5536) += cs5536/ ++ ++# ++# Enable fuloong(2f) and yeeloong(2f) cpu frequency scaling support ++# This is based on CS5536 mfgpt timer ++# ++obj-$(CONFIG_LOONGSON2F_CPU_FREQ) += clock.o ++ ++# ++# Enable serial port ++# ++obj-$(CONFIG_SERIAL_8250) += serial.o ++ ++EXTRA_CFLAGS += -Werror +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/mem.c linux-2.6.30/arch/mips/loongson/common/mem.c +--- linux-2.6.30.orig/arch/mips/loongson/common/mem.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/mem.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,116 @@ +/* + * This program is free software; you can redistribute it and/or modify it @@ -15700,9 +15444,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/mem.c rt4ls/arch/mips/loongson/ + +late_initcall(find_vga_mem_init); +#endif /* !CONFIG_CPU_LOONGSON2F */ -diff -Nur linux-2.6.30/arch/mips/loongson/common/pci.c rt4ls/arch/mips/loongson/common/pci.c ---- linux-2.6.30/arch/mips/loongson/common/pci.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/pci.c 2009-06-12 16:27:08.782445496 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/pci.c linux-2.6.30/arch/mips/loongson/common/pci.c +--- linux-2.6.30.orig/arch/mips/loongson/common/pci.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/pci.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology @@ -15813,9 +15557,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/pci.c rt4ls/arch/mips/loongson/ +} + +arch_initcall(pcibios_init); -diff -Nur linux-2.6.30/arch/mips/loongson/common/reset.c rt4ls/arch/mips/loongson/common/reset.c ---- linux-2.6.30/arch/mips/loongson/common/reset.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/reset.c 2009-06-12 16:27:08.782445496 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/reset.c linux-2.6.30/arch/mips/loongson/common/reset.c +--- linux-2.6.30.orig/arch/mips/loongson/common/reset.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/reset.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,38 @@ +/* + * This program is free software; you can redistribute it and/or modify it @@ -15855,9 +15599,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/reset.c rt4ls/arch/mips/loongso + _machine_halt = loongson_halt; + pm_power_off = loongson_halt; +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/rtc.c rt4ls/arch/mips/loongson/common/rtc.c ---- linux-2.6.30/arch/mips/loongson/common/rtc.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/rtc.c 2009-06-12 16:27:08.782445496 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/rtc.c linux-2.6.30/arch/mips/loongson/common/rtc.c +--- linux-2.6.30.orig/arch/mips/loongson/common/rtc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/rtc.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,54 @@ +/* + * Registration of Cobalt RTC platform device. @@ -15913,9 +15657,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/rtc.c rt4ls/arch/mips/loongson/ +} + +device_initcall(rtc_cmos_init); -diff -Nur linux-2.6.30/arch/mips/loongson/common/serial.c rt4ls/arch/mips/loongson/common/serial.c ---- linux-2.6.30/arch/mips/loongson/common/serial.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/serial.c 2009-06-12 16:27:08.782445496 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/serial.c linux-2.6.30/arch/mips/loongson/common/serial.c +--- linux-2.6.30.orig/arch/mips/loongson/common/serial.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/serial.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,66 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -15983,9 +15727,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/serial.c rt4ls/arch/mips/loongs +} + +device_initcall(serial_init); -diff -Nur linux-2.6.30/arch/mips/loongson/common/setup.c rt4ls/arch/mips/loongson/common/setup.c ---- linux-2.6.30/arch/mips/loongson/common/setup.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/setup.c 2009-06-12 16:27:08.782445496 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/setup.c linux-2.6.30/arch/mips/loongson/common/setup.c +--- linux-2.6.30.orig/arch/mips/loongson/common/setup.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/setup.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,74 @@ +/* + * board dependent setup routines @@ -16061,9 +15805,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/setup.c rt4ls/arch/mips/loongso + + loongson_screeninfo_setup(); +} -diff -Nur linux-2.6.30/arch/mips/loongson/common/time.c rt4ls/arch/mips/loongson/common/time.c ---- linux-2.6.30/arch/mips/loongson/common/time.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/common/time.c 2009-06-12 16:27:08.782445496 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/common/time.c linux-2.6.30/arch/mips/loongson/common/time.c +--- linux-2.6.30.orig/arch/mips/loongson/common/time.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/common/time.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,34 @@ +/* + * board dependent boot routines @@ -16099,20 +15843,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/common/time.c rt4ls/arch/mips/loongson + setup_mfgpt_timer(); +#endif +} -diff -Nur linux-2.6.30/arch/mips/loongson/fuloong-2e/Makefile rt4ls/arch/mips/loongson/fuloong-2e/Makefile ---- linux-2.6.30/arch/mips/loongson/fuloong-2e/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/fuloong-2e/Makefile 2009-06-12 16:27:08.782445496 +0200 -@@ -0,0 +1,7 @@ -+# -+# Makefile for fuloong-2e -+# -+ -+obj-y += irq.o reset.o -+ -+EXTRA_CFLAGS += -Werror -diff -Nur linux-2.6.30/arch/mips/loongson/fuloong-2e/irq.c rt4ls/arch/mips/loongson/fuloong-2e/irq.c ---- linux-2.6.30/arch/mips/loongson/fuloong-2e/irq.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/fuloong-2e/irq.c 2009-06-12 16:27:08.782445496 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/fuloong-2e/irq.c linux-2.6.30/arch/mips/loongson/fuloong-2e/irq.c +--- linux-2.6.30.orig/arch/mips/loongson/fuloong-2e/irq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/fuloong-2e/irq.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2007 Lemote Inc. & Insititute of Computing Technology @@ -16172,9 +15905,20 @@ diff -Nur linux-2.6.30/arch/mips/loongson/fuloong-2e/irq.c rt4ls/arch/mips/loong + LOONGSON_INTEDGE = LOONGSON_ICU_SYSTEMERR | LOONGSON_ICU_MASTERERR | + LOONGSON_ICU_RETRYERR | LOONGSON_ICU_MBOXES; +} -diff -Nur linux-2.6.30/arch/mips/loongson/fuloong-2e/reset.c rt4ls/arch/mips/loongson/fuloong-2e/reset.c ---- linux-2.6.30/arch/mips/loongson/fuloong-2e/reset.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/fuloong-2e/reset.c 2009-06-12 16:27:08.786446844 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/fuloong-2e/Makefile linux-2.6.30/arch/mips/loongson/fuloong-2e/Makefile +--- linux-2.6.30.orig/arch/mips/loongson/fuloong-2e/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/fuloong-2e/Makefile 2009-06-14 20:25:19.000000000 +0200 +@@ -0,0 +1,7 @@ ++# ++# Makefile for fuloong-2e ++# ++ ++obj-y += irq.o reset.o ++ ++EXTRA_CFLAGS += -Werror +diff -Nur linux-2.6.30.orig/arch/mips/loongson/fuloong-2e/reset.c linux-2.6.30/arch/mips/loongson/fuloong-2e/reset.c +--- linux-2.6.30.orig/arch/mips/loongson/fuloong-2e/reset.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/fuloong-2e/reset.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,26 @@ +/* Board-specific reboot/shutdown routines + * Copyright (c) 2009 Philippe Vachon @@ -16202,18 +15946,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/fuloong-2e/reset.c rt4ls/arch/mips/loo +void mach_prepare_shutdown(void) +{ +} -diff -Nur linux-2.6.30/arch/mips/loongson/fuloong-2f/Makefile rt4ls/arch/mips/loongson/fuloong-2f/Makefile ---- linux-2.6.30/arch/mips/loongson/fuloong-2f/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/fuloong-2f/Makefile 2009-06-12 16:27:08.786446844 +0200 -@@ -0,0 +1,5 @@ -+# -+# Makefile for fuloong-2f -+# -+ -+obj-y += irq.o reset.o -diff -Nur linux-2.6.30/arch/mips/loongson/fuloong-2f/irq.c rt4ls/arch/mips/loongson/fuloong-2f/irq.c ---- linux-2.6.30/arch/mips/loongson/fuloong-2f/irq.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/fuloong-2f/irq.c 2009-06-12 16:27:08.786446844 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/fuloong-2f/irq.c linux-2.6.30/arch/mips/loongson/fuloong-2f/irq.c +--- linux-2.6.30.orig/arch/mips/loongson/fuloong-2f/irq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/fuloong-2f/irq.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2007 Lemote Inc. & Insititute of Computing Technology @@ -16225,131 +15960,297 @@ diff -Nur linux-2.6.30/arch/mips/loongson/fuloong-2f/irq.c rt4ls/arch/mips/loong + * option) any later version. + */ + -+#include ++#include ++ ++#include ++#include ++ ++int mach_i8259_irq(void) ++{ ++ int irq, isr, imr; ++ ++ irq = -1; ++ ++ if ((LOONGSON_INTISR & LOONGSON_INTEN) & LOONGSON_INT_BIT_INT0) { ++ imr = inb(0x21) | (inb(0xa1) << 8); ++ isr = inb(0x20) | (inb(0xa0) << 8); ++ isr &= ~0x4; /* irq2 for cascade */ ++ isr &= ~imr; ++ irq = ffs(isr) - 1; ++ } ++ ++ return irq; ++} ++ ++void mach_irq_dispatch(unsigned int pending) ++{ ++ if (pending & CAUSEF_IP7) ++ do_IRQ(LOONGSON_TIMER_IRQ); ++ else if (pending & CAUSEF_IP6) { ++ do_IRQ(LOONGSON_PERFCNT_IRQ); /* Perf counter overflow */ ++ bonito_irqdispatch(); /* North Bridge */ ++ } else if (pending & CAUSEF_IP3) /* CPU UART */ ++ do_IRQ(LOONGSON_UART_IRQ); ++ else if (pending & CAUSEF_IP2) /* South Bridge */ ++ i8259_irqdispatch(); ++ else ++ spurious_interrupt(); ++} ++ ++void __init set_irq_trigger_mode(void) ++{ ++ /* setup cs5536 as high level trigger */ ++ LOONGSON_INTPOL = LOONGSON_INT_BIT_INT0 | LOONGSON_INT_BIT_INT1; ++ LOONGSON_INTEDGE &= ~(LOONGSON_INT_BIT_INT0 | LOONGSON_INT_BIT_INT1); ++} +diff -Nur linux-2.6.30.orig/arch/mips/loongson/fuloong-2f/Makefile linux-2.6.30/arch/mips/loongson/fuloong-2f/Makefile +--- linux-2.6.30.orig/arch/mips/loongson/fuloong-2f/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/fuloong-2f/Makefile 2009-06-14 20:25:19.000000000 +0200 +@@ -0,0 +1,5 @@ ++# ++# Makefile for fuloong-2f ++# ++ ++obj-y += irq.o reset.o +diff -Nur linux-2.6.30.orig/arch/mips/loongson/fuloong-2f/reset.c linux-2.6.30/arch/mips/loongson/fuloong-2f/reset.c +--- linux-2.6.30.orig/arch/mips/loongson/fuloong-2f/reset.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/fuloong-2f/reset.c 2009-06-14 20:25:19.000000000 +0200 +@@ -0,0 +1,65 @@ ++/* Board-specific reboot/shutdown routines ++ * ++ * Copyright (c) 2009 Philippe Vachon ++ * ++ * Copyright (C) 2009 Lemote Inc. & Insititute of Computing Technology ++ * Author: Wu Zhangjin, wuzj@lemote.com ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ */ ++ ++#include ++#include ++#include ++ ++#include ++ ++/* cs5536 is the south bridge used by fuloong2f mini PC */ ++#include ++ ++void mach_prepare_reboot(void) ++{ ++ /* ++ * reset cpu to full speed, this is needed when enabling cpu frequency ++ * scalling ++ */ ++ LOONGSON_CHIPCFG0 |= 0x7; ++ ++ /* send a reset signal to south bridge. ++ * ++ * NOTE: if enable "Power Management" in kernel, rtl8169 will not reset ++ * normally with this reset operation and it will not work in PMON, but ++ * you can type halt command and then reboot, seems the hardware reset ++ * logic not work normally. ++ */ ++ { ++ u32 hi, lo; ++ _rdmsr(DIVIL_MSR_REG(DIVIL_SOFT_RESET), &hi, &lo); ++ lo |= 0x00000001; ++ _wrmsr(DIVIL_MSR_REG(DIVIL_SOFT_RESET), hi, lo); ++ } ++} ++ ++void mach_prepare_shutdown(void) ++{ ++ u32 hi, lo, val; ++ phys_addr_t gpio_base; ++ ++ _rdmsr(DIVIL_MSR_REG(DIVIL_LBAR_GPIO), &hi, &lo); ++ ++ gpio_base = mips_io_port_base | (lo & 0xff00); ++ ++ /* make cs5536 gpio13 output enable */ ++ val = (readl((u32 *) (gpio_base + GPIOL_OUT_EN)) & ~(1 << (16 + 13))) ++ | (1 << 13); ++ writel(val, (u32 *) (gpio_base + GPIOL_OUT_EN)); ++ mmiowb(); ++ /* make cs5536 gpio13 output low level voltage. */ ++ val = (readl((u32 *) (gpio_base + GPIOL_OUT_VAL)) & ~(1 << (13))) ++ | (1 << (16 + 13)); ++ writel(val, (u32 *) (gpio_base + GPIOL_OUT_VAL)); ++ mmiowb(); ++} +diff -Nur linux-2.6.30.orig/arch/mips/loongson/Kconfig linux-2.6.30/arch/mips/loongson/Kconfig +--- linux-2.6.30.orig/arch/mips/loongson/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/Kconfig 2009-06-14 20:25:19.000000000 +0200 +@@ -0,0 +1,135 @@ ++choice ++ prompt "Machine Type" ++ depends on MACH_LOONGSON ++ ++config LEMOTE_FULOONG2E ++ bool "Lemote Fuloong(2e) mini-PC" ++ select ARCH_SPARSEMEM_ENABLE ++ select CEVT_R4K ++ select CSRC_R4K ++ select SYS_HAS_CPU_LOONGSON2E ++ select DMA_NONCOHERENT ++ select BOOT_ELF32 ++ select BOARD_SCACHE ++ select HW_HAS_PCI ++ select I8259 ++ select ISA ++ select IRQ_CPU ++ select SYS_SUPPORTS_32BIT_KERNEL ++ select SYS_SUPPORTS_64BIT_KERNEL ++ select SYS_SUPPORTS_LITTLE_ENDIAN ++ select SYS_SUPPORTS_HIGHMEM ++ select SYS_HAS_EARLY_PRINTK ++ select GENERIC_HARDIRQS_NO__DO_IRQ ++ select GENERIC_ISA_DMA_SUPPORT_BROKEN ++ select CPU_HAS_WB ++ help ++ Lemote Fuloong(2e) mini-PC board based on the Chinese Loongson-2E CPU and ++ an FPGA northbridge ++ ++ Lemote Fuloong(2e) mini PC have a VIA686B south bridge. ++ ++config LEMOTE_FULOONG2F ++ bool "Lemote Fuloong(2f) mini-PC" ++ select ARCH_SPARSEMEM_ENABLE ++ select CEVT_R4K if !CS5536_MFGPT ++ select CSRC_R4K if !CS5536_MFGPT ++ select SYS_HAS_CPU_LOONGSON2F ++ select DMA_NONCOHERENT ++ select BOOT_ELF32 ++ select BOARD_SCACHE ++ select HW_HAS_PCI ++ select I8259 ++ select ISA ++ select IRQ_CPU ++ select SYS_SUPPORTS_32BIT_KERNEL ++ select SYS_SUPPORTS_64BIT_KERNEL ++ select SYS_SUPPORTS_LITTLE_ENDIAN ++ select SYS_SUPPORTS_HIGHMEM ++ select SYS_HAS_EARLY_PRINTK ++ select GENERIC_HARDIRQS_NO__DO_IRQ ++ select GENERIC_ISA_DMA_SUPPORT_BROKEN ++ select CPU_HAS_WB ++ select CS5536 ++ help ++ Lemote Fuloong(2f) mini-PC board based on the Chinese Loongson-2F ++ CPU, which has an internal DDR and PCIX controller. the PCIX ++ controller have the similiar programming interface of the FPGA north ++ bridge of LOONGSON2E. ++ ++ Lemote Fuloong(2f) mini PC have an AMD CS5536 south bridge. ++ ++config LEMOTE_YEELOONG2F ++ bool "Lemote Yeeloong(2f) mini Notebook" ++ select ARCH_SPARSEMEM_ENABLE ++ select CEVT_R4K if !CS5536_MFGPT ++ select CSRC_R4K if !CS5536_MFGPT ++ select SYS_HAS_CPU_LOONGSON2F ++ select DMA_NONCOHERENT ++ select BOOT_ELF32 ++ select BOARD_SCACHE ++ select HW_HAS_PCI ++ select I8259 ++ select ISA ++ select IRQ_CPU ++ select SYS_SUPPORTS_32BIT_KERNEL ++ select SYS_SUPPORTS_64BIT_KERNEL ++ select SYS_SUPPORTS_LITTLE_ENDIAN ++ select SYS_SUPPORTS_HIGHMEM ++ select SYS_HAS_EARLY_PRINTK ++ select SYS_HAS_MACH_PROM_INIT_CMDLINE ++ select GENERIC_HARDIRQS_NO__DO_IRQ ++ select GENERIC_ISA_DMA_SUPPORT_BROKEN ++ select CPU_HAS_WB ++ select CS5536 ++ help ++ Lemote Laptop based on the Chinese Loongson-2F CPU, which has an ++ internal DDR and PCIX controller. the PCIX controller have the ++ similiar programming interface of the FPGA north bridge of ++ LOONGSON2E. ++ ++ Lemote Yeeloong(2f) laptop have an AMD CS5536 south bridge and an EC ++ controller. + -+#include -+#include ++endchoice + -+int mach_i8259_irq(void) -+{ -+ int irq, isr, imr; ++config CS5536 ++ bool + -+ irq = -1; ++config CS5536_FLASH ++ bool ++ depends on CS5536 + -+ if ((LOONGSON_INTISR & LOONGSON_INTEN) & LOONGSON_INT_BIT_INT0) { -+ imr = inb(0x21) | (inb(0xa1) << 8); -+ isr = inb(0x20) | (inb(0xa0) << 8); -+ isr &= ~0x4; /* irq2 for cascade */ -+ isr &= ~imr; -+ irq = ffs(isr) - 1; -+ } ++config CS5536_NOR_FLASH ++ bool ++ depends on CS5536_FLASH + -+ return irq; -+} ++config CS5536_OTG ++ bool ++ depends on CS5536 + -+void mach_irq_dispatch(unsigned int pending) -+{ -+ if (pending & CAUSEF_IP7) -+ do_IRQ(LOONGSON_TIMER_IRQ); -+ else if (pending & CAUSEF_IP6) { -+ do_IRQ(LOONGSON_PERFCNT_IRQ); /* Perf counter overflow */ -+ bonito_irqdispatch(); /* North Bridge */ -+ } else if (pending & CAUSEF_IP3) /* CPU UART */ -+ do_IRQ(LOONGSON_UART_IRQ); -+ else if (pending & CAUSEF_IP2) /* South Bridge */ -+ i8259_irqdispatch(); -+ else -+ spurious_interrupt(); -+} ++config CS5536_UDC ++ bool ++ depends on CS5536 + -+void __init set_irq_trigger_mode(void) -+{ -+ /* setup cs5536 as high level trigger */ -+ LOONGSON_INTPOL = LOONGSON_INT_BIT_INT0 | LOONGSON_INT_BIT_INT1; -+ LOONGSON_INTEDGE &= ~(LOONGSON_INT_BIT_INT0 | LOONGSON_INT_BIT_INT1); -+} -diff -Nur linux-2.6.30/arch/mips/loongson/fuloong-2f/reset.c rt4ls/arch/mips/loongson/fuloong-2f/reset.c ---- linux-2.6.30/arch/mips/loongson/fuloong-2f/reset.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/fuloong-2f/reset.c 2009-06-12 16:27:08.786446844 +0200 -@@ -0,0 +1,65 @@ -+/* Board-specific reboot/shutdown routines -+ * -+ * Copyright (c) 2009 Philippe Vachon -+ * -+ * Copyright (C) 2009 Lemote Inc. & Insititute of Computing Technology -+ * Author: Wu Zhangjin, wuzj@lemote.com -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License as published by the -+ * Free Software Foundation; either version 2 of the License, or (at your -+ * option) any later version. -+ */ ++config SYS_HAS_MACH_PROM_INIT_CMDLINE ++ bool + -+#include -+#include -+#include ++config CS5536_MFGPT ++ bool "Using cs5536's MFGPT as system clock" ++ depends on CS5536 ++ help ++ This is needed if cpufreq and oprofile is enabled in Loongson2(F) ++ machines + -+#include ++config UCA_SIZE ++ hex "Uncache Accelerated Region size" ++ depends on CPU_LOONGSON2F ++ default 0x400000 if LEMOTE_YEELOONG2F ++ default 0x2000000 if LEMOTE_FULOONG2F ++ help ++ Uncached Acceleration(UCA) can greatly improve video performance. ++ Normally the Video memory can be accessed in Uncached Accelerated mode, ++ other peripheral spaces not. + -+/* cs5536 is the south bridge used by fuloong2f mini PC */ -+#include ++ Specify a zeroed size to disable this feature. +diff -Nur linux-2.6.30.orig/arch/mips/loongson/Makefile linux-2.6.30/arch/mips/loongson/Makefile +--- linux-2.6.30.orig/arch/mips/loongson/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/Makefile 2009-06-14 20:25:19.000000000 +0200 +@@ -0,0 +1,23 @@ ++# ++# Common code for all Loongson based systems ++# + -+void mach_prepare_reboot(void) -+{ -+ /* -+ * reset cpu to full speed, this is needed when enabling cpu frequency -+ * scalling -+ */ -+ LOONGSON_CHIPCFG0 |= 0x7; ++obj-$(CONFIG_MACH_LOONGSON) += common/ + -+ /* send a reset signal to south bridge. -+ * -+ * NOTE: if enable "Power Management" in kernel, rtl8169 will not reset -+ * normally with this reset operation and it will not work in PMON, but -+ * you can type halt command and then reboot, seems the hardware reset -+ * logic not work normally. -+ */ -+ { -+ u32 hi, lo; -+ _rdmsr(DIVIL_MSR_REG(DIVIL_SOFT_RESET), &hi, &lo); -+ lo |= 0x00000001; -+ _wrmsr(DIVIL_MSR_REG(DIVIL_SOFT_RESET), hi, lo); -+ } -+} ++# ++# Lemote Fuloong mini-PC (Loongson 2E-based) ++# + -+void mach_prepare_shutdown(void) -+{ -+ u32 hi, lo, val; -+ phys_addr_t gpio_base; ++obj-$(CONFIG_LEMOTE_FULOONG2E) += fuloong-2e/ + -+ _rdmsr(DIVIL_MSR_REG(DIVIL_LBAR_GPIO), &hi, &lo); ++# ++# Lemote Fuloong mini-PC (Loongson 2F-based) ++# + -+ gpio_base = mips_io_port_base | (lo & 0xff00); ++obj-$(CONFIG_LEMOTE_FULOONG2F) += fuloong-2f/ + -+ /* make cs5536 gpio13 output enable */ -+ val = (readl((u32 *) (gpio_base + GPIOL_OUT_EN)) & ~(1 << (16 + 13))) -+ | (1 << 13); -+ writel(val, (u32 *) (gpio_base + GPIOL_OUT_EN)); -+ mmiowb(); -+ /* make cs5536 gpio13 output low level voltage. */ -+ val = (readl((u32 *) (gpio_base + GPIOL_OUT_VAL)) & ~(1 << (13))) -+ | (1 << (16 + 13)); -+ writel(val, (u32 *) (gpio_base + GPIOL_OUT_VAL)); -+ mmiowb(); -+} -diff -Nur linux-2.6.30/arch/mips/loongson/yeeloong-2f/Makefile rt4ls/arch/mips/loongson/yeeloong-2f/Makefile ---- linux-2.6.30/arch/mips/loongson/yeeloong-2f/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/yeeloong-2f/Makefile 2009-06-12 16:27:08.786446844 +0200 -@@ -0,0 +1,5 @@ +# -+# Makefile for fuloong-2f ++# Lemote Yeeloong mini-PC (Loongson 2F-based) +# + -+obj-y += init.o irq.o reset.o -diff -Nur linux-2.6.30/arch/mips/loongson/yeeloong-2f/init.c rt4ls/arch/mips/loongson/yeeloong-2f/init.c ---- linux-2.6.30/arch/mips/loongson/yeeloong-2f/init.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/yeeloong-2f/init.c 2009-06-12 16:27:08.786446844 +0200 -@@ -0,0 +1,81 @@ ++obj-$(CONFIG_LEMOTE_YEELOONG2F) += yeeloong-2f/ +diff -Nur linux-2.6.30.orig/arch/mips/loongson/yeeloong-2f/init.c linux-2.6.30/arch/mips/loongson/yeeloong-2f/init.c +--- linux-2.6.30.orig/arch/mips/loongson/yeeloong-2f/init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/yeeloong-2f/init.c 2009-06-14 20:26:27.000000000 +0200 +@@ -0,0 +1,80 @@ +/* + * board specific init routines + * @@ -16417,8 +16318,7 @@ diff -Nur linux-2.6.30/arch/mips/loongson/yeeloong-2f/init.c rt4ls/arch/mips/loo + strcat(arcs_cmdline, ec_version); + strcat(arcs_cmdline, " "); + strcat(arcs_cmdline, default_root); -+ strcat(arcs_cmdline, " console=tty2"); -+ strcat(arcs_cmdline, " quiet"); ++ strcat(arcs_cmdline, " console=tty"); + } + + /* @@ -16431,9 +16331,9 @@ diff -Nur linux-2.6.30/arch/mips/loongson/yeeloong-2f/init.c rt4ls/arch/mips/loo + && (strstr(arcs_cmdline, "7inch") != NULL)) + strcat(arcs_cmdline, " vga=800x480x16"); +} -diff -Nur linux-2.6.30/arch/mips/loongson/yeeloong-2f/irq.c rt4ls/arch/mips/loongson/yeeloong-2f/irq.c ---- linux-2.6.30/arch/mips/loongson/yeeloong-2f/irq.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/yeeloong-2f/irq.c 2009-06-12 16:27:08.786446844 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/yeeloong-2f/irq.c linux-2.6.30/arch/mips/loongson/yeeloong-2f/irq.c +--- linux-2.6.30.orig/arch/mips/loongson/yeeloong-2f/irq.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/yeeloong-2f/irq.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2007 Lemote Inc. & Insititute of Computing Technology @@ -16488,9 +16388,18 @@ diff -Nur linux-2.6.30/arch/mips/loongson/yeeloong-2f/irq.c rt4ls/arch/mips/loon + LOONGSON_INTPOL = LOONGSON_INT_BIT_INT0 | LOONGSON_INT_BIT_INT1; + LOONGSON_INTEDGE &= ~(LOONGSON_INT_BIT_INT0 | LOONGSON_INT_BIT_INT1); +} -diff -Nur linux-2.6.30/arch/mips/loongson/yeeloong-2f/reset.c rt4ls/arch/mips/loongson/yeeloong-2f/reset.c ---- linux-2.6.30/arch/mips/loongson/yeeloong-2f/reset.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/loongson/yeeloong-2f/reset.c 2009-06-12 16:27:08.786446844 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/loongson/yeeloong-2f/Makefile linux-2.6.30/arch/mips/loongson/yeeloong-2f/Makefile +--- linux-2.6.30.orig/arch/mips/loongson/yeeloong-2f/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/yeeloong-2f/Makefile 2009-06-14 20:25:19.000000000 +0200 +@@ -0,0 +1,5 @@ ++# ++# Makefile for fuloong-2f ++# ++ ++obj-y += init.o irq.o reset.o +diff -Nur linux-2.6.30.orig/arch/mips/loongson/yeeloong-2f/reset.c linux-2.6.30/arch/mips/loongson/yeeloong-2f/reset.c +--- linux-2.6.30.orig/arch/mips/loongson/yeeloong-2f/reset.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/loongson/yeeloong-2f/reset.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,91 @@ +/* Board-specific reboot/shutdown routines + * Copyright (c) 2009 Philippe Vachon @@ -16583,17 +16492,54 @@ diff -Nur linux-2.6.30/arch/mips/loongson/yeeloong-2f/reset.c rt4ls/arch/mips/lo + } else + printk(KERN_INFO "you can shutdown the power safely now!\n"); +} -diff -Nur linux-2.6.30/arch/mips/oprofile/Makefile rt4ls/arch/mips/oprofile/Makefile ---- linux-2.6.30/arch/mips/oprofile/Makefile 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/oprofile/Makefile 2009-06-12 16:27:08.846439406 +0200 -@@ -15,3 +15,4 @@ - oprofile-$(CONFIG_CPU_R10000) += op_model_mipsxx.o - oprofile-$(CONFIG_CPU_SB1) += op_model_mipsxx.o - oprofile-$(CONFIG_CPU_RM9000) += op_model_rm9000.o -+oprofile-$(CONFIG_CPU_LOONGSON2) += op_model_loongson2.o -diff -Nur linux-2.6.30/arch/mips/oprofile/common.c rt4ls/arch/mips/oprofile/common.c ---- linux-2.6.30/arch/mips/oprofile/common.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/oprofile/common.c 2009-06-12 16:27:08.846439406 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/Makefile linux-2.6.30/arch/mips/Makefile +--- linux-2.6.30.orig/arch/mips/Makefile 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/Makefile 2009-06-14 20:25:19.000000000 +0200 +@@ -120,7 +120,14 @@ + cflags-$(CONFIG_CPU_VR41XX) += -march=r4100 -Wa,--trap + cflags-$(CONFIG_CPU_R4X00) += -march=r4600 -Wa,--trap + cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap +-cflags-$(CONFIG_CPU_LOONGSON2) += -march=r4600 -Wa,--trap ++ ++# only gcc >= 4.4 have the loongson-specific support ++cflags-$(CONFIG_CPU_LOONGSON2) += -Wa,--trap ++cflags-$(CONFIG_CPU_LOONGSON2E) += \ ++ $(call cc-option,-march=loongson2e,-march=r4600) $(call cc-option,-mtune=loongson2e) ++cflags-$(CONFIG_CPU_LOONGSON2F) += \ ++ $(call cc-option,-march=loongson2f,-march=r4600) $(call cc-optoin,-mtune=loongson2f) ++ + cflags-$(CONFIG_CPU_MIPS32_R1) += $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ + -Wa,-mips32 -Wa,--trap + cflags-$(CONFIG_CPU_MIPS32_R2) += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ +@@ -307,9 +314,12 @@ + # + # lemote fulong mini-PC board + # +-core-$(CONFIG_LEMOTE_FULONG) +=arch/mips/lemote/lm2e/ +-load-$(CONFIG_LEMOTE_FULONG) +=0xffffffff80100000 +-cflags-$(CONFIG_LEMOTE_FULONG) += -I$(srctree)/arch/mips/include/asm/mach-lemote ++core-$(CONFIG_MACH_LOONGSON) +=arch/mips/loongson/ ++cflags-$(CONFIG_MACH_LOONGSON) += -I$(srctree)/arch/mips/include/asm/mach-loongson \ ++ -mno-branch-likely ++load-$(CONFIG_LEMOTE_FULOONG2E) +=0xffffffff80100000 ++load-$(CONFIG_LEMOTE_FULOONG2F) +=0xffffffff80200000 ++load-$(CONFIG_LEMOTE_YEELOONG2F) +=0xffffffff80200000 + + # + # MIPS Malta board +@@ -675,6 +685,9 @@ + + drivers-$(CONFIG_OPROFILE) += arch/mips/oprofile/ + ++# suspend and hibernation support ++drivers-$(CONFIG_PM) += arch/mips/power/ ++ + ifdef CONFIG_LASAT + rom.bin rom.sw: vmlinux + $(Q)$(MAKE) $(build)=arch/mips/lasat/image $@ +diff -Nur linux-2.6.30.orig/arch/mips/oprofile/common.c linux-2.6.30/arch/mips/oprofile/common.c +--- linux-2.6.30.orig/arch/mips/oprofile/common.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/oprofile/common.c 2009-06-14 20:25:19.000000000 +0200 @@ -16,6 +16,7 @@ extern struct op_mips_model op_model_mipsxx_ops __attribute__((weak)); @@ -16613,9 +16559,17 @@ diff -Nur linux-2.6.30/arch/mips/oprofile/common.c rt4ls/arch/mips/oprofile/comm }; if (!lmodel) -diff -Nur linux-2.6.30/arch/mips/oprofile/op_model_loongson2.c rt4ls/arch/mips/oprofile/op_model_loongson2.c ---- linux-2.6.30/arch/mips/oprofile/op_model_loongson2.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/oprofile/op_model_loongson2.c 2009-06-12 16:27:08.846439406 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/oprofile/Makefile linux-2.6.30/arch/mips/oprofile/Makefile +--- linux-2.6.30.orig/arch/mips/oprofile/Makefile 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/oprofile/Makefile 2009-06-14 20:25:19.000000000 +0200 +@@ -15,3 +15,4 @@ + oprofile-$(CONFIG_CPU_R10000) += op_model_mipsxx.o + oprofile-$(CONFIG_CPU_SB1) += op_model_mipsxx.o + oprofile-$(CONFIG_CPU_RM9000) += op_model_rm9000.o ++oprofile-$(CONFIG_CPU_LOONGSON2) += op_model_loongson2.o +diff -Nur linux-2.6.30.orig/arch/mips/oprofile/op_model_loongson2.c linux-2.6.30/arch/mips/oprofile/op_model_loongson2.c +--- linux-2.6.30.orig/arch/mips/oprofile/op_model_loongson2.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/oprofile/op_model_loongson2.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,186 @@ +/* + * Loongson2 performance counter driver for oprofile @@ -16803,23 +16757,9 @@ diff -Nur linux-2.6.30/arch/mips/oprofile/op_model_loongson2.c rt4ls/arch/mips/o + .cpu_type = LOONGSON_CPU_TYPE, + .num_counters = 2 +}; -diff -Nur linux-2.6.30/arch/mips/pci/Makefile rt4ls/arch/mips/pci/Makefile ---- linux-2.6.30/arch/mips/pci/Makefile 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/Makefile 2009-06-12 16:27:08.846439406 +0200 -@@ -26,7 +26,9 @@ - obj-$(CONFIG_SOC_AU1500) += fixup-au1000.o ops-au1000.o - obj-$(CONFIG_SOC_AU1550) += fixup-au1000.o ops-au1000.o - obj-$(CONFIG_SOC_PNX8550) += fixup-pnx8550.o ops-pnx8550.o --obj-$(CONFIG_LEMOTE_FULONG) += fixup-lm2e.o ops-bonito64.o -+obj-$(CONFIG_LEMOTE_FULOONG2E) += fixup-fuloong2e.o ops-loongson2.o -+obj-$(CONFIG_LEMOTE_FULOONG2F) += fixup-lemote2f.o ops-loongson2.o -+obj-$(CONFIG_LEMOTE_YEELOONG2F) += fixup-lemote2f.o ops-loongson2.o - obj-$(CONFIG_MIPS_MALTA) += fixup-malta.o - obj-$(CONFIG_PMC_MSP7120_GW) += fixup-pmcmsp.o ops-pmcmsp.o - obj-$(CONFIG_PMC_MSP7120_EVAL) += fixup-pmcmsp.o ops-pmcmsp.o -diff -Nur linux-2.6.30/arch/mips/pci/fixup-au1000.c rt4ls/arch/mips/pci/fixup-au1000.c ---- linux-2.6.30/arch/mips/pci/fixup-au1000.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-au1000.c 2009-06-12 16:27:08.846439406 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-au1000.c linux-2.6.30/arch/mips/pci/fixup-au1000.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-au1000.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-au1000.c 2009-06-14 20:25:19.000000000 +0200 @@ -31,7 +31,7 @@ extern char irq_tab_alchemy[][5]; @@ -16829,9 +16769,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-au1000.c rt4ls/arch/mips/pci/fixup-au { return irq_tab_alchemy[slot][pin]; } -diff -Nur linux-2.6.30/arch/mips/pci/fixup-capcella.c rt4ls/arch/mips/pci/fixup-capcella.c ---- linux-2.6.30/arch/mips/pci/fixup-capcella.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-capcella.c 2009-06-12 16:27:08.846439406 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-capcella.c linux-2.6.30/arch/mips/pci/fixup-capcella.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-capcella.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-capcella.c 2009-06-14 20:25:19.000000000 +0200 @@ -38,7 +38,7 @@ [14] = { -1, INTA, INTB, INTC, INTD } }; @@ -16841,9 +16781,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-capcella.c rt4ls/arch/mips/pci/fixup- { return irq_tab_capcella[slot][pin]; } -diff -Nur linux-2.6.30/arch/mips/pci/fixup-cobalt.c rt4ls/arch/mips/pci/fixup-cobalt.c ---- linux-2.6.30/arch/mips/pci/fixup-cobalt.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-cobalt.c 2009-06-12 16:27:08.846439406 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-cobalt.c linux-2.6.30/arch/mips/pci/fixup-cobalt.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-cobalt.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-cobalt.c 2009-06-14 20:25:19.000000000 +0200 @@ -175,7 +175,7 @@ [COBALT_PCICONF_ETH1] = ETH1_IRQ }; @@ -16853,9 +16793,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-cobalt.c rt4ls/arch/mips/pci/fixup-co { if (cobalt_board_id <= COBALT_BRD_ID_QUBE1) return irq_tab_qube1[slot]; -diff -Nur linux-2.6.30/arch/mips/pci/fixup-emma2rh.c rt4ls/arch/mips/pci/fixup-emma2rh.c ---- linux-2.6.30/arch/mips/pci/fixup-emma2rh.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-emma2rh.c 2009-06-12 16:27:08.846439406 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-emma2rh.c linux-2.6.30/arch/mips/pci/fixup-emma2rh.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-emma2rh.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-emma2rh.c 2009-06-14 20:25:19.000000000 +0200 @@ -88,7 +88,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_EMMA2RH, emma2rh_pci_host_fixup); @@ -16865,9 +16805,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-emma2rh.c rt4ls/arch/mips/pci/fixup-e { return irq_map[slot][pin]; } -diff -Nur linux-2.6.30/arch/mips/pci/fixup-excite.c rt4ls/arch/mips/pci/fixup-excite.c ---- linux-2.6.30/arch/mips/pci/fixup-excite.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-excite.c 2009-06-12 16:27:08.846439406 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-excite.c linux-2.6.30/arch/mips/pci/fixup-excite.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-excite.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-excite.c 2009-06-14 20:25:19.000000000 +0200 @@ -21,7 +21,7 @@ #include #include @@ -16877,9 +16817,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-excite.c rt4ls/arch/mips/pci/fixup-ex { if (pin == 0) return -1; -diff -Nur linux-2.6.30/arch/mips/pci/fixup-fuloong2e.c rt4ls/arch/mips/pci/fixup-fuloong2e.c ---- linux-2.6.30/arch/mips/pci/fixup-fuloong2e.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/pci/fixup-fuloong2e.c 2009-06-12 16:27:08.846439406 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-fuloong2e.c linux-2.6.30/arch/mips/pci/fixup-fuloong2e.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-fuloong2e.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/pci/fixup-fuloong2e.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,243 @@ +/* + * fixup-fuloong2e.c @@ -17124,9 +17064,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-fuloong2e.c rt4ls/arch/mips/pci/fixup + fuloong2e_686b_func5_fixup); +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB, + fuloong2e_nec_fixup); -diff -Nur linux-2.6.30/arch/mips/pci/fixup-ip32.c rt4ls/arch/mips/pci/fixup-ip32.c ---- linux-2.6.30/arch/mips/pci/fixup-ip32.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-ip32.c 2009-06-12 16:27:08.850451649 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-ip32.c linux-2.6.30/arch/mips/pci/fixup-ip32.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-ip32.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-ip32.c 2009-06-14 20:25:19.000000000 +0200 @@ -39,7 +39,7 @@ * irqs. I suppose a device without a pin A will thank us for doing it * right if there exists such a broken piece of crap. @@ -17136,9 +17076,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-ip32.c rt4ls/arch/mips/pci/fixup-ip32 { return irq_tab_mace[slot][pin]; } -diff -Nur linux-2.6.30/arch/mips/pci/fixup-jmr3927.c rt4ls/arch/mips/pci/fixup-jmr3927.c ---- linux-2.6.30/arch/mips/pci/fixup-jmr3927.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-jmr3927.c 2009-06-12 16:27:08.850451649 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-jmr3927.c linux-2.6.30/arch/mips/pci/fixup-jmr3927.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-jmr3927.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-jmr3927.c 2009-06-14 20:25:19.000000000 +0200 @@ -31,7 +31,7 @@ #include #include @@ -17148,9 +17088,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-jmr3927.c rt4ls/arch/mips/pci/fixup-j { unsigned char irq = pin; -diff -Nur linux-2.6.30/arch/mips/pci/fixup-lemote2f.c rt4ls/arch/mips/pci/fixup-lemote2f.c ---- linux-2.6.30/arch/mips/pci/fixup-lemote2f.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/pci/fixup-lemote2f.c 2009-06-12 16:27:08.850451649 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-lemote2f.c linux-2.6.30/arch/mips/pci/fixup-lemote2f.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-lemote2f.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/pci/fixup-lemote2f.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,171 @@ +/* + * Copyright (C) 2008 Lemote Technology @@ -17323,9 +17263,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-lemote2f.c rt4ls/arch/mips/pci/fixup- + loongson_cs5536_ide_fixup); +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB, + loongson_nec_fixup); -diff -Nur linux-2.6.30/arch/mips/pci/fixup-lm2e.c rt4ls/arch/mips/pci/fixup-lm2e.c ---- linux-2.6.30/arch/mips/pci/fixup-lm2e.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-lm2e.c 1970-01-01 01:00:00.000000000 +0100 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-lm2e.c linux-2.6.30/arch/mips/pci/fixup-lm2e.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-lm2e.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-lm2e.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,242 +0,0 @@ -/* - * fixup-lm2e.c @@ -17569,9 +17509,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-lm2e.c rt4ls/arch/mips/pci/fixup-lm2e - loongson2e_686b_func5_fixup); -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB, - loongson2e_nec_fixup); -diff -Nur linux-2.6.30/arch/mips/pci/fixup-malta.c rt4ls/arch/mips/pci/fixup-malta.c ---- linux-2.6.30/arch/mips/pci/fixup-malta.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-malta.c 2009-06-12 16:27:08.850451649 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-malta.c linux-2.6.30/arch/mips/pci/fixup-malta.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-malta.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-malta.c 2009-06-14 20:25:19.000000000 +0200 @@ -36,7 +36,7 @@ {0, PCID, PCIA, PCIB, PCIC } /* 21: PCI Slot 4 */ }; @@ -17581,9 +17521,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-malta.c rt4ls/arch/mips/pci/fixup-mal { int virq; virq = irq_tab[slot][pin]; -diff -Nur linux-2.6.30/arch/mips/pci/fixup-mpc30x.c rt4ls/arch/mips/pci/fixup-mpc30x.c ---- linux-2.6.30/arch/mips/pci/fixup-mpc30x.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-mpc30x.c 2009-06-12 16:27:08.850451649 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-mpc30x.c linux-2.6.30/arch/mips/pci/fixup-mpc30x.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-mpc30x.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-mpc30x.c 2009-06-14 20:25:19.000000000 +0200 @@ -34,7 +34,7 @@ [29] = MQ200_IRQ, }; @@ -17593,9 +17533,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-mpc30x.c rt4ls/arch/mips/pci/fixup-mp { if (slot == 30) return internal_func_irqs[PCI_FUNC(dev->devfn)]; -diff -Nur linux-2.6.30/arch/mips/pci/fixup-pmcmsp.c rt4ls/arch/mips/pci/fixup-pmcmsp.c ---- linux-2.6.30/arch/mips/pci/fixup-pmcmsp.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-pmcmsp.c 2009-06-12 16:27:08.850451649 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-pmcmsp.c linux-2.6.30/arch/mips/pci/fixup-pmcmsp.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-pmcmsp.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-pmcmsp.c 2009-06-14 20:25:19.000000000 +0200 @@ -202,7 +202,7 @@ * RETURNS: IRQ number * @@ -17605,9 +17545,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-pmcmsp.c rt4ls/arch/mips/pci/fixup-pm { #if !defined(CONFIG_PMC_MSP7120_GW) && !defined(CONFIG_PMC_MSP7120_EVAL) printk(KERN_WARNING "PCI: unknown board, no PCI IRQs assigned.\n"); -diff -Nur linux-2.6.30/arch/mips/pci/fixup-pnx8550.c rt4ls/arch/mips/pci/fixup-pnx8550.c ---- linux-2.6.30/arch/mips/pci/fixup-pnx8550.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-pnx8550.c 2009-06-12 16:27:08.850451649 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-pnx8550.c linux-2.6.30/arch/mips/pci/fixup-pnx8550.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-pnx8550.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-pnx8550.c 2009-06-14 20:25:19.000000000 +0200 @@ -45,7 +45,7 @@ /* nothing to do here */ } @@ -17617,9 +17557,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-pnx8550.c rt4ls/arch/mips/pci/fixup-p { return pnx8550_irq_tab[slot][pin]; } -diff -Nur linux-2.6.30/arch/mips/pci/fixup-rbtx4927.c rt4ls/arch/mips/pci/fixup-rbtx4927.c ---- linux-2.6.30/arch/mips/pci/fixup-rbtx4927.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-rbtx4927.c 2009-06-12 16:27:08.850451649 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-rbtx4927.c linux-2.6.30/arch/mips/pci/fixup-rbtx4927.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-rbtx4927.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-rbtx4927.c 2009-06-14 20:25:19.000000000 +0200 @@ -36,7 +36,7 @@ #include #include @@ -17629,9 +17569,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-rbtx4927.c rt4ls/arch/mips/pci/fixup- { unsigned char irq = pin; -diff -Nur linux-2.6.30/arch/mips/pci/fixup-rbtx4938.c rt4ls/arch/mips/pci/fixup-rbtx4938.c ---- linux-2.6.30/arch/mips/pci/fixup-rbtx4938.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-rbtx4938.c 2009-06-12 16:27:08.854451321 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-rbtx4938.c linux-2.6.30/arch/mips/pci/fixup-rbtx4938.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-rbtx4938.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-rbtx4938.c 2009-06-14 20:25:19.000000000 +0200 @@ -13,7 +13,7 @@ #include #include @@ -17641,9 +17581,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-rbtx4938.c rt4ls/arch/mips/pci/fixup- { int irq = tx4938_pcic1_map_irq(dev, slot); -diff -Nur linux-2.6.30/arch/mips/pci/fixup-rc32434.c rt4ls/arch/mips/pci/fixup-rc32434.c ---- linux-2.6.30/arch/mips/pci/fixup-rc32434.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-rc32434.c 2009-06-12 16:27:08.854451321 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-rc32434.c linux-2.6.30/arch/mips/pci/fixup-rc32434.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-rc32434.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-rc32434.c 2009-06-14 20:25:19.000000000 +0200 @@ -37,7 +37,7 @@ {0, 0, 1, 3, 0, 2, 1, 3, 0, 2, 1, 3} }; @@ -17653,9 +17593,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-rc32434.c rt4ls/arch/mips/pci/fixup-r { int irq = 0; -diff -Nur linux-2.6.30/arch/mips/pci/fixup-sni.c rt4ls/arch/mips/pci/fixup-sni.c ---- linux-2.6.30/arch/mips/pci/fixup-sni.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-sni.c 2009-06-12 16:27:08.854451321 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-sni.c linux-2.6.30/arch/mips/pci/fixup-sni.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-sni.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-sni.c 2009-06-14 20:25:19.000000000 +0200 @@ -130,7 +130,7 @@ return (csmsr & 0xa0) == 0x20; } @@ -17665,9 +17605,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-sni.c rt4ls/arch/mips/pci/fixup-sni.c { switch (sni_brd_type) { case SNI_BRD_PCI_TOWER_CPLUS: -diff -Nur linux-2.6.30/arch/mips/pci/fixup-tb0219.c rt4ls/arch/mips/pci/fixup-tb0219.c ---- linux-2.6.30/arch/mips/pci/fixup-tb0219.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-tb0219.c 2009-06-12 16:27:08.854451321 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-tb0219.c linux-2.6.30/arch/mips/pci/fixup-tb0219.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-tb0219.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-tb0219.c 2009-06-14 20:25:19.000000000 +0200 @@ -23,7 +23,7 @@ #include @@ -17677,9 +17617,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-tb0219.c rt4ls/arch/mips/pci/fixup-tb { int irq = -1; -diff -Nur linux-2.6.30/arch/mips/pci/fixup-tb0226.c rt4ls/arch/mips/pci/fixup-tb0226.c ---- linux-2.6.30/arch/mips/pci/fixup-tb0226.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-tb0226.c 2009-06-12 16:27:08.854451321 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-tb0226.c linux-2.6.30/arch/mips/pci/fixup-tb0226.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-tb0226.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-tb0226.c 2009-06-14 20:25:19.000000000 +0200 @@ -23,7 +23,7 @@ #include #include @@ -17689,9 +17629,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-tb0226.c rt4ls/arch/mips/pci/fixup-tb { int irq = -1; -diff -Nur linux-2.6.30/arch/mips/pci/fixup-tb0287.c rt4ls/arch/mips/pci/fixup-tb0287.c ---- linux-2.6.30/arch/mips/pci/fixup-tb0287.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-tb0287.c 2009-06-12 16:27:08.854451321 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-tb0287.c linux-2.6.30/arch/mips/pci/fixup-tb0287.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-tb0287.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-tb0287.c 2009-06-14 20:25:19.000000000 +0200 @@ -22,7 +22,7 @@ #include @@ -17701,9 +17641,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-tb0287.c rt4ls/arch/mips/pci/fixup-tb { unsigned char bus; int irq = -1; -diff -Nur linux-2.6.30/arch/mips/pci/fixup-wrppmc.c rt4ls/arch/mips/pci/fixup-wrppmc.c ---- linux-2.6.30/arch/mips/pci/fixup-wrppmc.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-wrppmc.c 2009-06-12 16:27:08.854451321 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-wrppmc.c linux-2.6.30/arch/mips/pci/fixup-wrppmc.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-wrppmc.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-wrppmc.c 2009-06-14 20:25:19.000000000 +0200 @@ -25,7 +25,7 @@ [6] = {0, WRPPMC_PCI_INTA_IRQ, 0, 0, 0}, }; @@ -17713,9 +17653,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-wrppmc.c rt4ls/arch/mips/pci/fixup-wr { return pci_irq_tab[slot][pin]; } -diff -Nur linux-2.6.30/arch/mips/pci/fixup-yosemite.c rt4ls/arch/mips/pci/fixup-yosemite.c ---- linux-2.6.30/arch/mips/pci/fixup-yosemite.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/fixup-yosemite.c 2009-06-12 16:27:08.886440592 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/fixup-yosemite.c linux-2.6.30/arch/mips/pci/fixup-yosemite.c +--- linux-2.6.30.orig/arch/mips/pci/fixup-yosemite.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/fixup-yosemite.c 2009-06-14 20:25:19.000000000 +0200 @@ -26,7 +26,7 @@ #include #include @@ -17725,9 +17665,23 @@ diff -Nur linux-2.6.30/arch/mips/pci/fixup-yosemite.c rt4ls/arch/mips/pci/fixup- { if (pin == 0) return -1; -diff -Nur linux-2.6.30/arch/mips/pci/ops-bonito64.c rt4ls/arch/mips/pci/ops-bonito64.c ---- linux-2.6.30/arch/mips/pci/ops-bonito64.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/ops-bonito64.c 2009-06-12 16:27:08.890441660 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/Makefile linux-2.6.30/arch/mips/pci/Makefile +--- linux-2.6.30.orig/arch/mips/pci/Makefile 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/Makefile 2009-06-14 20:25:19.000000000 +0200 +@@ -26,7 +26,9 @@ + obj-$(CONFIG_SOC_AU1500) += fixup-au1000.o ops-au1000.o + obj-$(CONFIG_SOC_AU1550) += fixup-au1000.o ops-au1000.o + obj-$(CONFIG_SOC_PNX8550) += fixup-pnx8550.o ops-pnx8550.o +-obj-$(CONFIG_LEMOTE_FULONG) += fixup-lm2e.o ops-bonito64.o ++obj-$(CONFIG_LEMOTE_FULOONG2E) += fixup-fuloong2e.o ops-loongson2.o ++obj-$(CONFIG_LEMOTE_FULOONG2F) += fixup-lemote2f.o ops-loongson2.o ++obj-$(CONFIG_LEMOTE_YEELOONG2F) += fixup-lemote2f.o ops-loongson2.o + obj-$(CONFIG_MIPS_MALTA) += fixup-malta.o + obj-$(CONFIG_PMC_MSP7120_GW) += fixup-pmcmsp.o ops-pmcmsp.o + obj-$(CONFIG_PMC_MSP7120_EVAL) += fixup-pmcmsp.o ops-pmcmsp.o +diff -Nur linux-2.6.30.orig/arch/mips/pci/ops-bonito64.c linux-2.6.30/arch/mips/pci/ops-bonito64.c +--- linux-2.6.30.orig/arch/mips/pci/ops-bonito64.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/ops-bonito64.c 2009-06-14 20:25:19.000000000 +0200 @@ -29,20 +29,16 @@ #define PCI_ACCESS_READ 0 #define PCI_ACCESS_WRITE 1 @@ -17783,9 +17737,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/ops-bonito64.c rt4ls/arch/mips/pci/ops-boni return -1; if (size == 1) -diff -Nur linux-2.6.30/arch/mips/pci/ops-loongson2.c rt4ls/arch/mips/pci/ops-loongson2.c ---- linux-2.6.30/arch/mips/pci/ops-loongson2.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/pci/ops-loongson2.c 2009-06-12 16:27:08.890441660 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/ops-loongson2.c linux-2.6.30/arch/mips/pci/ops-loongson2.c +--- linux-2.6.30.orig/arch/mips/pci/ops-loongson2.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/pci/ops-loongson2.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,213 @@ +/* + * Copyright (C) 1999, 2000, 2004 MIPS Technologies, Inc. @@ -18000,9 +17954,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/ops-loongson2.c rt4ls/arch/mips/pci/ops-loo +} +EXPORT_SYMBOL(_wrmsr); +#endif -diff -Nur linux-2.6.30/arch/mips/pci/pci-bcm1480.c rt4ls/arch/mips/pci/pci-bcm1480.c ---- linux-2.6.30/arch/mips/pci/pci-bcm1480.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/pci-bcm1480.c 2009-06-12 16:27:09.146457490 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/pci-bcm1480.c linux-2.6.30/arch/mips/pci/pci-bcm1480.c +--- linux-2.6.30.orig/arch/mips/pci/pci-bcm1480.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/pci-bcm1480.c 2009-06-14 20:25:19.000000000 +0200 @@ -74,7 +74,7 @@ *(u32 *)(cfg_space + (addr & ~3)) = data; } @@ -18012,9 +17966,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/pci-bcm1480.c rt4ls/arch/mips/pci/pci-bcm14 { if (pin == 0) return -1; -diff -Nur linux-2.6.30/arch/mips/pci/pci-bcm47xx.c rt4ls/arch/mips/pci/pci-bcm47xx.c ---- linux-2.6.30/arch/mips/pci/pci-bcm47xx.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/pci-bcm47xx.c 2009-06-12 16:27:09.146457490 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/pci-bcm47xx.c linux-2.6.30/arch/mips/pci/pci-bcm47xx.c +--- linux-2.6.30.orig/arch/mips/pci/pci-bcm47xx.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/pci-bcm47xx.c 2009-06-14 20:25:19.000000000 +0200 @@ -26,7 +26,7 @@ #include #include @@ -18024,9 +17978,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/pci-bcm47xx.c rt4ls/arch/mips/pci/pci-bcm47 { return 0; } -diff -Nur linux-2.6.30/arch/mips/pci/pci-ip27.c rt4ls/arch/mips/pci/pci-ip27.c ---- linux-2.6.30/arch/mips/pci/pci-ip27.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/pci-ip27.c 2009-06-12 16:27:09.150468058 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/pci-ip27.c linux-2.6.30/arch/mips/pci/pci-ip27.c +--- linux-2.6.30.orig/arch/mips/pci/pci-ip27.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/pci-ip27.c 2009-06-14 20:25:19.000000000 +0200 @@ -141,7 +141,7 @@ * A given PCI device, in general, should be able to intr any of the cpus * on any one of the hubs connected to its xbow. @@ -18036,9 +17990,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/pci-ip27.c rt4ls/arch/mips/pci/pci-ip27.c { return 0; } -diff -Nur linux-2.6.30/arch/mips/pci/pci-lasat.c rt4ls/arch/mips/pci/pci-lasat.c ---- linux-2.6.30/arch/mips/pci/pci-lasat.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/pci-lasat.c 2009-06-12 16:27:09.150468058 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/pci-lasat.c linux-2.6.30/arch/mips/pci/pci-lasat.c +--- linux-2.6.30.orig/arch/mips/pci/pci-lasat.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/pci-lasat.c 2009-06-14 20:25:19.000000000 +0200 @@ -61,7 +61,7 @@ #define LASAT_IRQ_PCIC (LASAT_IRQ_BASE + 7) #define LASAT_IRQ_PCID (LASAT_IRQ_BASE + 8) @@ -18048,9 +18002,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/pci-lasat.c rt4ls/arch/mips/pci/pci-lasat.c { switch (slot) { case 1: -diff -Nur linux-2.6.30/arch/mips/pci/pci-sb1250.c rt4ls/arch/mips/pci/pci-sb1250.c ---- linux-2.6.30/arch/mips/pci/pci-sb1250.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/pci-sb1250.c 2009-06-12 16:27:09.150468058 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/pci-sb1250.c linux-2.6.30/arch/mips/pci/pci-sb1250.c +--- linux-2.6.30.orig/arch/mips/pci/pci-sb1250.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/pci-sb1250.c 2009-06-14 20:25:19.000000000 +0200 @@ -84,7 +84,7 @@ *(u32 *) (cfg_space + (addr & ~3)) = data; } @@ -18060,9 +18014,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/pci-sb1250.c rt4ls/arch/mips/pci/pci-sb1250 { return dev->irq; } -diff -Nur linux-2.6.30/arch/mips/pci/pci-tx4938.c rt4ls/arch/mips/pci/pci-tx4938.c ---- linux-2.6.30/arch/mips/pci/pci-tx4938.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/pci-tx4938.c 2009-06-12 16:27:09.154469127 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/pci-tx4938.c linux-2.6.30/arch/mips/pci/pci-tx4938.c +--- linux-2.6.30.orig/arch/mips/pci/pci-tx4938.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/pci-tx4938.c 2009-06-14 20:25:19.000000000 +0200 @@ -114,7 +114,7 @@ return pciclk; } @@ -18072,9 +18026,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/pci-tx4938.c rt4ls/arch/mips/pci/pci-tx4938 { if (get_tx4927_pcicptr(dev->bus->sysdata) == tx4938_pcic1ptr) { switch (slot) { -diff -Nur linux-2.6.30/arch/mips/pci/pci-tx4939.c rt4ls/arch/mips/pci/pci-tx4939.c ---- linux-2.6.30/arch/mips/pci/pci-tx4939.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/pci/pci-tx4939.c 2009-06-12 16:27:09.154469127 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/pci/pci-tx4939.c linux-2.6.30/arch/mips/pci/pci-tx4939.c +--- linux-2.6.30.orig/arch/mips/pci/pci-tx4939.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/pci/pci-tx4939.c 2009-06-14 20:25:19.000000000 +0200 @@ -50,7 +50,7 @@ ((pciclk + 50000) / 100000) % 10); } @@ -18093,14 +18047,9 @@ diff -Nur linux-2.6.30/arch/mips/pci/pci-tx4939.c rt4ls/arch/mips/pci/pci-tx4939 { int irq = tx4939_pcic1_map_irq(dev, slot); -diff -Nur linux-2.6.30/arch/mips/power/Makefile rt4ls/arch/mips/power/Makefile ---- linux-2.6.30/arch/mips/power/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/power/Makefile 2009-06-12 16:27:09.166460321 +0200 -@@ -0,0 +1 @@ -+obj-$(CONFIG_HIBERNATION) += cpu.o hibernate.o -diff -Nur linux-2.6.30/arch/mips/power/cpu.c rt4ls/arch/mips/power/cpu.c ---- linux-2.6.30/arch/mips/power/cpu.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/power/cpu.c 2009-06-12 16:27:09.170469770 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/power/cpu.c linux-2.6.30/arch/mips/power/cpu.c +--- linux-2.6.30.orig/arch/mips/power/cpu.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/power/cpu.c 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,43 @@ +/* + * Suspend support for mips. @@ -18145,9 +18094,9 @@ diff -Nur linux-2.6.30/arch/mips/power/cpu.c rt4ls/arch/mips/power/cpu.c + + return (pfn >= nosave_begin_pfn) && (pfn < nosave_end_pfn); +} -diff -Nur linux-2.6.30/arch/mips/power/hibernate.S rt4ls/arch/mips/power/hibernate.S ---- linux-2.6.30/arch/mips/power/hibernate.S 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/arch/mips/power/hibernate.S 2009-06-12 16:27:09.170469770 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/power/hibernate.S linux-2.6.30/arch/mips/power/hibernate.S +--- linux-2.6.30.orig/arch/mips/power/hibernate.S 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/power/hibernate.S 2009-06-14 20:25:19.000000000 +0200 @@ -0,0 +1,70 @@ +/* + * Hibernation support for mips - temporary page tables @@ -18219,9 +18168,14 @@ diff -Nur linux-2.6.30/arch/mips/power/hibernate.S rt4ls/arch/mips/power/hiberna + PTR_LI v0, 0x0 + jr ra +END(swsusp_arch_resume) -diff -Nur linux-2.6.30/arch/mips/sibyte/bcm1480/irq.c rt4ls/arch/mips/sibyte/bcm1480/irq.c ---- linux-2.6.30/arch/mips/sibyte/bcm1480/irq.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/sibyte/bcm1480/irq.c 2009-06-12 16:27:09.190461705 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/power/Makefile linux-2.6.30/arch/mips/power/Makefile +--- linux-2.6.30.orig/arch/mips/power/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/arch/mips/power/Makefile 2009-06-14 20:25:19.000000000 +0200 +@@ -0,0 +1 @@ ++obj-$(CONFIG_HIBERNATION) += cpu.o hibernate.o +diff -Nur linux-2.6.30.orig/arch/mips/sibyte/bcm1480/irq.c linux-2.6.30/arch/mips/sibyte/bcm1480/irq.c +--- linux-2.6.30.orig/arch/mips/sibyte/bcm1480/irq.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/sibyte/bcm1480/irq.c 2009-06-14 20:25:19.000000000 +0200 @@ -116,10 +116,6 @@ unsigned long flags; unsigned int irq_dirty; @@ -18233,9 +18187,9 @@ diff -Nur linux-2.6.30/arch/mips/sibyte/bcm1480/irq.c rt4ls/arch/mips/sibyte/bcm i = cpumask_first(mask); /* Convert logical CPU to physical CPU */ -diff -Nur linux-2.6.30/arch/mips/sibyte/sb1250/irq.c rt4ls/arch/mips/sibyte/sb1250/irq.c ---- linux-2.6.30/arch/mips/sibyte/sb1250/irq.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/sibyte/sb1250/irq.c 2009-06-12 16:27:09.194461656 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/sibyte/sb1250/irq.c linux-2.6.30/arch/mips/sibyte/sb1250/irq.c +--- linux-2.6.30.orig/arch/mips/sibyte/sb1250/irq.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/sibyte/sb1250/irq.c 2009-06-14 20:25:19.000000000 +0200 @@ -111,11 +111,6 @@ i = cpumask_first(mask); @@ -18248,9 +18202,9 @@ diff -Nur linux-2.6.30/arch/mips/sibyte/sb1250/irq.c rt4ls/arch/mips/sibyte/sb12 /* Convert logical CPU to physical CPU */ cpu = cpu_logical_map(i); -diff -Nur linux-2.6.30/arch/mips/txx9/generic/pci.c rt4ls/arch/mips/txx9/generic/pci.c ---- linux-2.6.30/arch/mips/txx9/generic/pci.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/mips/txx9/generic/pci.c 2009-06-12 16:27:09.214461413 +0200 +diff -Nur linux-2.6.30.orig/arch/mips/txx9/generic/pci.c linux-2.6.30/arch/mips/txx9/generic/pci.c +--- linux-2.6.30.orig/arch/mips/txx9/generic/pci.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/mips/txx9/generic/pci.c 2009-06-14 20:25:19.000000000 +0200 @@ -382,7 +382,7 @@ return 0; } @@ -18260,9 +18214,9 @@ diff -Nur linux-2.6.30/arch/mips/txx9/generic/pci.c rt4ls/arch/mips/txx9/generic { return txx9_board_vec->pci_map_irq(dev, slot, pin); } -diff -Nur linux-2.6.30/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c rt4ls/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c ---- linux-2.6.30/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-06-12 16:27:12.750683917 +0200 +diff -Nur linux-2.6.30.orig/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.30/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +--- linux-2.6.30.orig/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-06-14 20:25:19.000000000 +0200 @@ -550,7 +550,7 @@ return -ENOMEM; } @@ -18272,9 +18226,9 @@ diff -Nur linux-2.6.30/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c rt4ls/arch/x86 &per_cpu_ptr(acpi_perf_data, i)->shared_cpu_map, GFP_KERNEL, cpu_to_node(i))) { -diff -Nur linux-2.6.30/arch/x86/kernel/cpu/cpufreq/powernow-k7.c rt4ls/arch/x86/kernel/cpu/cpufreq/powernow-k7.c ---- linux-2.6.30/arch/x86/kernel/cpu/cpufreq/powernow-k7.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/x86/kernel/cpu/cpufreq/powernow-k7.c 2009-06-12 16:27:12.758683819 +0200 +diff -Nur linux-2.6.30.orig/arch/x86/kernel/cpu/cpufreq/powernow-k7.c linux-2.6.30/arch/x86/kernel/cpu/cpufreq/powernow-k7.c +--- linux-2.6.30.orig/arch/x86/kernel/cpu/cpufreq/powernow-k7.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/x86/kernel/cpu/cpufreq/powernow-k7.c 2009-06-14 20:25:19.000000000 +0200 @@ -322,7 +322,7 @@ goto err0; } @@ -18284,9 +18238,9 @@ diff -Nur linux-2.6.30/arch/x86/kernel/cpu/cpufreq/powernow-k7.c rt4ls/arch/x86/ GFP_KERNEL)) { retval = -ENOMEM; goto err05; -diff -Nur linux-2.6.30/arch/x86/kernel/cpu/cpufreq/powernow-k8.c rt4ls/arch/x86/kernel/cpu/cpufreq/powernow-k8.c ---- linux-2.6.30/arch/x86/kernel/cpu/cpufreq/powernow-k8.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/x86/kernel/cpu/cpufreq/powernow-k8.c 2009-06-12 16:27:12.758683819 +0200 +diff -Nur linux-2.6.30.orig/arch/x86/kernel/cpu/cpufreq/powernow-k8.c linux-2.6.30/arch/x86/kernel/cpu/cpufreq/powernow-k8.c +--- linux-2.6.30.orig/arch/x86/kernel/cpu/cpufreq/powernow-k8.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/x86/kernel/cpu/cpufreq/powernow-k8.c 2009-06-14 20:25:19.000000000 +0200 @@ -887,7 +887,7 @@ /* notify BIOS that we exist */ acpi_processor_notify_smm(THIS_MODULE); @@ -18296,9 +18250,9 @@ diff -Nur linux-2.6.30/arch/x86/kernel/cpu/cpufreq/powernow-k8.c rt4ls/arch/x86/ printk(KERN_ERR PFX "unable to alloc powernow_k8_data cpumask\n"); ret_val = -ENOMEM; -diff -Nur linux-2.6.30/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c rt4ls/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c ---- linux-2.6.30/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-06-12 16:27:12.758683819 +0200 +diff -Nur linux-2.6.30.orig/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.30/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c +--- linux-2.6.30.orig/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-06-14 20:25:19.000000000 +0200 @@ -471,7 +471,7 @@ if (unlikely(!alloc_cpumask_var(&saved_mask, GFP_KERNEL))) @@ -18308,9 +18262,9 @@ diff -Nur linux-2.6.30/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c rt4ls/ar free_cpumask_var(saved_mask); return -ENOMEM; } -diff -Nur linux-2.6.30/arch/x86/kernel/cpu/mcheck/mce_64.c rt4ls/arch/x86/kernel/cpu/mcheck/mce_64.c ---- linux-2.6.30/arch/x86/kernel/cpu/mcheck/mce_64.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/x86/kernel/cpu/mcheck/mce_64.c 2009-06-12 16:27:12.766685398 +0200 +diff -Nur linux-2.6.30.orig/arch/x86/kernel/cpu/mcheck/mce_64.c linux-2.6.30/arch/x86/kernel/cpu/mcheck/mce_64.c +--- linux-2.6.30.orig/arch/x86/kernel/cpu/mcheck/mce_64.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/x86/kernel/cpu/mcheck/mce_64.c 2009-06-14 20:25:19.000000000 +0200 @@ -1163,7 +1163,7 @@ if (!mce_available(&boot_cpu_data)) return -EIO; @@ -18320,9 +18274,9 @@ diff -Nur linux-2.6.30/arch/x86/kernel/cpu/mcheck/mce_64.c rt4ls/arch/x86/kernel err = mce_init_banks(); if (err) -diff -Nur linux-2.6.30/arch/x86/kernel/tlb_uv.c rt4ls/arch/x86/kernel/tlb_uv.c ---- linux-2.6.30/arch/x86/kernel/tlb_uv.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/arch/x86/kernel/tlb_uv.c 2009-06-12 16:27:13.002711263 +0200 +diff -Nur linux-2.6.30.orig/arch/x86/kernel/tlb_uv.c linux-2.6.30/arch/x86/kernel/tlb_uv.c +--- linux-2.6.30.orig/arch/x86/kernel/tlb_uv.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/arch/x86/kernel/tlb_uv.c 2009-06-14 20:25:19.000000000 +0200 @@ -832,7 +832,7 @@ return 0; @@ -18332,9 +18286,9 @@ diff -Nur linux-2.6.30/arch/x86/kernel/tlb_uv.c rt4ls/arch/x86/kernel/tlb_uv.c GFP_KERNEL, cpu_to_node(cur_cpu)); uv_bau_retry_limit = 1; -diff -Nur linux-2.6.30/block/bsg.c rt4ls/block/bsg.c ---- linux-2.6.30/block/bsg.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/block/bsg.c 2009-06-12 16:27:13.226714938 +0200 +diff -Nur linux-2.6.30.orig/block/bsg.c linux-2.6.30/block/bsg.c +--- linux-2.6.30.orig/block/bsg.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/block/bsg.c 2009-06-14 20:25:19.000000000 +0200 @@ -315,7 +315,6 @@ blk_put_request(rq); if (next_rq) { @@ -18359,9 +18313,23 @@ diff -Nur linux-2.6.30/block/bsg.c rt4ls/block/bsg.c blk_put_request(rq); return ret; -diff -Nur linux-2.6.30/drivers/acpi/processor_core.c rt4ls/drivers/acpi/processor_core.c ---- linux-2.6.30/drivers/acpi/processor_core.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/drivers/acpi/processor_core.c 2009-06-12 16:27:13.558736838 +0200 +diff -Nur linux-2.6.30.orig/Documentation/kernel-parameters.txt linux-2.6.30/Documentation/kernel-parameters.txt +--- linux-2.6.30.orig/Documentation/kernel-parameters.txt 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/Documentation/kernel-parameters.txt 2009-06-14 20:25:19.000000000 +0200 +@@ -1220,6 +1220,10 @@ + (machvec) in a generic kernel. + Example: machvec=hpzx1_swiotlb + ++ machtype= [Loongson] Share the same kernel image file between different ++ yeeloong laptop. ++ Example: machtype=lemote-yeeloong-2f-7inch ++ + max_addr=nn[KMG] [KNL,BOOT,ia64] All physical memory greater + than or equal to this physical address is ignored. + +diff -Nur linux-2.6.30.orig/drivers/acpi/processor_core.c linux-2.6.30/drivers/acpi/processor_core.c +--- linux-2.6.30.orig/drivers/acpi/processor_core.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/drivers/acpi/processor_core.c 2009-06-14 20:25:19.000000000 +0200 @@ -844,7 +844,7 @@ if (!pr) return -ENOMEM; @@ -18371,9 +18339,9 @@ diff -Nur linux-2.6.30/drivers/acpi/processor_core.c rt4ls/drivers/acpi/processo kfree(pr); return -ENOMEM; } -diff -Nur linux-2.6.30/drivers/char/mxser.c rt4ls/drivers/char/mxser.c ---- linux-2.6.30/drivers/char/mxser.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/drivers/char/mxser.c 2009-06-12 16:27:13.878756104 +0200 +diff -Nur linux-2.6.30.orig/drivers/char/mxser.c linux-2.6.30/drivers/char/mxser.c +--- linux-2.6.30.orig/drivers/char/mxser.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/drivers/char/mxser.c 2009-06-14 20:25:19.000000000 +0200 @@ -2711,7 +2711,7 @@ continue; @@ -18383,9 +18351,9 @@ diff -Nur linux-2.6.30/drivers/char/mxser.c rt4ls/drivers/char/mxser.c if (retval <= 0) { brd->info = NULL; continue; -diff -Nur linux-2.6.30/drivers/cpufreq/cpufreq.c rt4ls/drivers/cpufreq/cpufreq.c ---- linux-2.6.30/drivers/cpufreq/cpufreq.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/drivers/cpufreq/cpufreq.c 2009-06-12 16:27:23.183344589 +0200 +diff -Nur linux-2.6.30.orig/drivers/cpufreq/cpufreq.c linux-2.6.30/drivers/cpufreq/cpufreq.c +--- linux-2.6.30.orig/drivers/cpufreq/cpufreq.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/drivers/cpufreq/cpufreq.c 2009-06-14 20:25:19.000000000 +0200 @@ -808,7 +808,7 @@ ret = -ENOMEM; goto nomem_out; @@ -18395,9 +18363,9 @@ diff -Nur linux-2.6.30/drivers/cpufreq/cpufreq.c rt4ls/drivers/cpufreq/cpufreq.c free_cpumask_var(policy->cpus); kfree(policy); ret = -ENOMEM; -diff -Nur linux-2.6.30/drivers/ide/amd74xx.c rt4ls/drivers/ide/amd74xx.c ---- linux-2.6.30/drivers/ide/amd74xx.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/drivers/ide/amd74xx.c 2009-06-12 16:27:31.515864613 +0200 +diff -Nur linux-2.6.30.orig/drivers/ide/amd74xx.c linux-2.6.30/drivers/ide/amd74xx.c +--- linux-2.6.30.orig/drivers/ide/amd74xx.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/drivers/ide/amd74xx.c 2009-06-14 20:25:19.000000000 +0200 @@ -23,6 +23,11 @@ #define DRV_NAME "amd74xx" @@ -18438,9 +18406,9 @@ diff -Nur linux-2.6.30/drivers/ide/amd74xx.c rt4ls/drivers/ide/amd74xx.c .cable_detect = amd_cable_detect, }; -diff -Nur linux-2.6.30/drivers/md/raid5.c rt4ls/drivers/md/raid5.c ---- linux-2.6.30/drivers/md/raid5.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/drivers/md/raid5.c 2009-06-12 16:27:48.380919207 +0200 +diff -Nur linux-2.6.30.orig/drivers/md/raid5.c linux-2.6.30/drivers/md/raid5.c +--- linux-2.6.30.orig/drivers/md/raid5.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/drivers/md/raid5.c 2009-06-14 20:25:20.000000000 +0200 @@ -362,7 +362,7 @@ static struct stripe_head * @@ -18559,9 +18527,9 @@ diff -Nur linux-2.6.30/drivers/md/raid5.c rt4ls/drivers/md/raid5.c if (!sh) { /* failed to get a stripe - must wait */ -diff -Nur linux-2.6.30/drivers/net/Kconfig rt4ls/drivers/net/Kconfig ---- linux-2.6.30/drivers/net/Kconfig 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/drivers/net/Kconfig 2009-06-12 16:28:08.898195438 +0200 +diff -Nur linux-2.6.30.orig/drivers/net/Kconfig linux-2.6.30/drivers/net/Kconfig +--- linux-2.6.30.orig/drivers/net/Kconfig 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/drivers/net/Kconfig 2009-06-14 20:25:20.000000000 +0200 @@ -2362,6 +2362,13 @@ Some boards that use the Discovery chipset are the Momenco Ocelot C and Jaguar ATX and Pegasos II. @@ -18576,9 +18544,9 @@ diff -Nur linux-2.6.30/drivers/net/Kconfig rt4ls/drivers/net/Kconfig config QLA3XXX tristate "QLogic QLA3XXX Network Driver Support" depends on PCI -diff -Nur linux-2.6.30/drivers/net/Makefile rt4ls/drivers/net/Makefile ---- linux-2.6.30/drivers/net/Makefile 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/drivers/net/Makefile 2009-06-12 16:28:08.910193335 +0200 +diff -Nur linux-2.6.30.orig/drivers/net/Makefile linux-2.6.30/drivers/net/Makefile +--- linux-2.6.30.orig/drivers/net/Makefile 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/drivers/net/Makefile 2009-06-14 20:25:20.000000000 +0200 @@ -137,6 +137,8 @@ obj-$(CONFIG_QLA3XXX) += qla3xxx.o obj-$(CONFIG_QLGE) += qlge/ @@ -18588,9 +18556,9 @@ diff -Nur linux-2.6.30/drivers/net/Makefile rt4ls/drivers/net/Makefile obj-$(CONFIG_PPP) += ppp_generic.o obj-$(CONFIG_PPP_ASYNC) += ppp_async.o obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o -diff -Nur linux-2.6.30/drivers/net/r8169.c rt4ls/drivers/net/r8169.c ---- linux-2.6.30/drivers/net/r8169.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/drivers/net/r8169.c 2009-06-12 16:28:14.650663877 +0200 +diff -Nur linux-2.6.30.orig/drivers/net/r8169.c linux-2.6.30/drivers/net/r8169.c +--- linux-2.6.30.orig/drivers/net/r8169.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/drivers/net/r8169.c 2009-06-14 20:25:20.000000000 +0200 @@ -66,6 +66,7 @@ #define RX_DMA_BURST 6 /* Maximum PCI burst, '6' is 1024 */ #define TX_DMA_BURST 6 /* Maximum PCI burst, '6' is 1024 */ @@ -18639,9 +18607,9 @@ diff -Nur linux-2.6.30/drivers/net/r8169.c rt4ls/drivers/net/r8169.c tp->cp_cmd |= rtl_rw_cpluscmd(ioaddr) | PCIMulRW; -diff -Nur linux-2.6.30/drivers/net/titan_ge.c rt4ls/drivers/net/titan_ge.c ---- linux-2.6.30/drivers/net/titan_ge.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/drivers/net/titan_ge.c 2009-06-12 16:28:16.835950077 +0200 +diff -Nur linux-2.6.30.orig/drivers/net/titan_ge.c linux-2.6.30/drivers/net/titan_ge.c +--- linux-2.6.30.orig/drivers/net/titan_ge.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/drivers/net/titan_ge.c 2009-06-14 20:25:20.000000000 +0200 @@ -0,0 +1,2069 @@ +/* + * drivers/net/titan_ge.c - Driver for Titan ethernet ports @@ -20712,9 +20680,9 @@ diff -Nur linux-2.6.30/drivers/net/titan_ge.c rt4ls/drivers/net/titan_ge.c + +module_init(titan_ge_init_module); +module_exit(titan_ge_cleanup_module); -diff -Nur linux-2.6.30/drivers/net/titan_ge.h rt4ls/drivers/net/titan_ge.h ---- linux-2.6.30/drivers/net/titan_ge.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/drivers/net/titan_ge.h 2009-06-12 16:28:16.835950077 +0200 +diff -Nur linux-2.6.30.orig/drivers/net/titan_ge.h linux-2.6.30/drivers/net/titan_ge.h +--- linux-2.6.30.orig/drivers/net/titan_ge.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/drivers/net/titan_ge.h 2009-06-14 20:25:20.000000000 +0200 @@ -0,0 +1,415 @@ +#ifndef _TITAN_GE_H_ +#define _TITAN_GE_H_ @@ -21131,9 +21099,9 @@ diff -Nur linux-2.6.30/drivers/net/titan_ge.h rt4ls/drivers/net/titan_ge.h + +#endif /* _TITAN_GE_H_ */ + -diff -Nur linux-2.6.30/drivers/net/titan_mdio.c rt4ls/drivers/net/titan_mdio.c ---- linux-2.6.30/drivers/net/titan_mdio.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/drivers/net/titan_mdio.c 2009-06-12 16:28:16.835950077 +0200 +diff -Nur linux-2.6.30.orig/drivers/net/titan_mdio.c linux-2.6.30/drivers/net/titan_mdio.c +--- linux-2.6.30.orig/drivers/net/titan_mdio.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/drivers/net/titan_mdio.c 2009-06-14 20:25:20.000000000 +0200 @@ -0,0 +1,217 @@ +/* + * drivers/net/titan_mdio.c - Driver for Titan ethernet ports @@ -21352,9 +21320,9 @@ diff -Nur linux-2.6.30/drivers/net/titan_mdio.c rt4ls/drivers/net/titan_mdio.c + return TITAN_GE_MDIO_GOOD; +} + -diff -Nur linux-2.6.30/drivers/net/titan_mdio.h rt4ls/drivers/net/titan_mdio.h ---- linux-2.6.30/drivers/net/titan_mdio.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/drivers/net/titan_mdio.h 2009-06-12 16:28:16.835950077 +0200 +diff -Nur linux-2.6.30.orig/drivers/net/titan_mdio.h linux-2.6.30/drivers/net/titan_mdio.h +--- linux-2.6.30.orig/drivers/net/titan_mdio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/drivers/net/titan_mdio.h 2009-06-14 20:25:20.000000000 +0200 @@ -0,0 +1,56 @@ +/* + * MDIO used to interact with the PHY when using GMII/MII @@ -21412,9 +21380,9 @@ diff -Nur linux-2.6.30/drivers/net/titan_mdio.h rt4ls/drivers/net/titan_mdio.h +int titan_ge_mdio_write(int, int, unsigned int); + +#endif /* _TITAN_MDIO_H */ -diff -Nur linux-2.6.30/drivers/rtc/rtc-cmos.c rt4ls/drivers/rtc/rtc-cmos.c ---- linux-2.6.30/drivers/rtc/rtc-cmos.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/drivers/rtc/rtc-cmos.c 2009-06-12 16:28:34.779818333 +0200 +diff -Nur linux-2.6.30.orig/drivers/rtc/rtc-cmos.c linux-2.6.30/drivers/rtc/rtc-cmos.c +--- linux-2.6.30.orig/drivers/rtc/rtc-cmos.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/drivers/rtc/rtc-cmos.c 2009-06-14 20:25:20.000000000 +0200 @@ -691,7 +691,8 @@ */ #if defined(CONFIG_ATARI) @@ -21437,9 +21405,9 @@ diff -Nur linux-2.6.30/drivers/rtc/rtc-cmos.c rt4ls/drivers/rtc/rtc-cmos.c retval = -ENXIO; goto cleanup1; } -diff -Nur linux-2.6.30/drivers/video/Kconfig rt4ls/drivers/video/Kconfig ---- linux-2.6.30/drivers/video/Kconfig 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/drivers/video/Kconfig 2009-06-12 16:28:47.484606170 +0200 +diff -Nur linux-2.6.30.orig/drivers/video/Kconfig linux-2.6.30/drivers/video/Kconfig +--- linux-2.6.30.orig/drivers/video/Kconfig 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/drivers/video/Kconfig 2009-06-14 20:25:20.000000000 +0200 @@ -1930,6 +1930,28 @@ Turn on debugging messages. Note that you can set/unset at run time through sysfs @@ -21469,9 +21437,9 @@ diff -Nur linux-2.6.30/drivers/video/Kconfig rt4ls/drivers/video/Kconfig config FB_SM501 tristate "Silicon Motion SM501 framebuffer support" depends on FB && MFD_SM501 -diff -Nur linux-2.6.30/drivers/video/Makefile rt4ls/drivers/video/Makefile ---- linux-2.6.30/drivers/video/Makefile 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/drivers/video/Makefile 2009-06-12 16:28:47.484606170 +0200 +diff -Nur linux-2.6.30.orig/drivers/video/Makefile linux-2.6.30/drivers/video/Makefile +--- linux-2.6.30.orig/drivers/video/Makefile 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/drivers/video/Makefile 2009-06-14 20:25:20.000000000 +0200 @@ -70,6 +70,7 @@ obj-$(CONFIG_FB_TCX) += tcx.o sbuslib.o obj-$(CONFIG_FB_LEO) += leo.o sbuslib.o @@ -21480,16 +21448,16 @@ diff -Nur linux-2.6.30/drivers/video/Makefile rt4ls/drivers/video/Makefile obj-$(CONFIG_FB_ACORN) += acornfb.o obj-$(CONFIG_FB_ATARI) += atafb.o c2p_iplan2.o atafb_mfb.o \ atafb_iplan2p2.o atafb_iplan2p4.o atafb_iplan2p8.o -diff -Nur linux-2.6.30/drivers/video/sm7xx/Makefile rt4ls/drivers/video/sm7xx/Makefile ---- linux-2.6.30/drivers/video/sm7xx/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/drivers/video/sm7xx/Makefile 2009-06-12 16:28:47.728622169 +0200 +diff -Nur linux-2.6.30.orig/drivers/video/sm7xx/Makefile linux-2.6.30/drivers/video/sm7xx/Makefile +--- linux-2.6.30.orig/drivers/video/sm7xx/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/drivers/video/sm7xx/Makefile 2009-06-14 20:25:20.000000000 +0200 @@ -0,0 +1,3 @@ +obj-$(CONFIG_FB_SM7XX) += sm7xx.o + +sm7xx-y := smtcfb.o -diff -Nur linux-2.6.30/drivers/video/sm7xx/smtc2d.c rt4ls/drivers/video/sm7xx/smtc2d.c ---- linux-2.6.30/drivers/video/sm7xx/smtc2d.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/drivers/video/sm7xx/smtc2d.c 2009-06-12 16:28:47.728622169 +0200 +diff -Nur linux-2.6.30.orig/drivers/video/sm7xx/smtc2d.c linux-2.6.30/drivers/video/sm7xx/smtc2d.c +--- linux-2.6.30.orig/drivers/video/sm7xx/smtc2d.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/drivers/video/sm7xx/smtc2d.c 2009-06-14 20:25:20.000000000 +0200 @@ -0,0 +1,979 @@ +/* + * smtc2d.c -- Silicon Motion SM7xx 2D drawing engine functions. @@ -22470,9 +22438,9 @@ diff -Nur linux-2.6.30/drivers/video/sm7xx/smtc2d.c rt4ls/drivers/video/sm7xx/sm + + return de_ctrl; +} -diff -Nur linux-2.6.30/drivers/video/sm7xx/smtc2d.h rt4ls/drivers/video/sm7xx/smtc2d.h ---- linux-2.6.30/drivers/video/sm7xx/smtc2d.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/drivers/video/sm7xx/smtc2d.h 2009-06-12 16:28:47.728622169 +0200 +diff -Nur linux-2.6.30.orig/drivers/video/sm7xx/smtc2d.h linux-2.6.30/drivers/video/sm7xx/smtc2d.h +--- linux-2.6.30.orig/drivers/video/sm7xx/smtc2d.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/drivers/video/sm7xx/smtc2d.h 2009-06-14 20:25:20.000000000 +0200 @@ -0,0 +1,530 @@ +/* + * smtc2d.h -- Silicon Motion SM7xx 2D drawing engine functions. @@ -23004,9 +22972,9 @@ diff -Nur linux-2.6.30/drivers/video/sm7xx/smtc2d.h rt4ls/drivers/video/sm7xx/sm + +extern unsigned long deGetTransparency(void); +extern void deSetPixelFormat(unsigned long bpp); -diff -Nur linux-2.6.30/drivers/video/sm7xx/smtcfb.c rt4ls/drivers/video/sm7xx/smtcfb.c ---- linux-2.6.30/drivers/video/sm7xx/smtcfb.c 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/drivers/video/sm7xx/smtcfb.c 2009-06-12 16:28:47.728622169 +0200 +diff -Nur linux-2.6.30.orig/drivers/video/sm7xx/smtcfb.c linux-2.6.30/drivers/video/sm7xx/smtcfb.c +--- linux-2.6.30.orig/drivers/video/sm7xx/smtcfb.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/drivers/video/sm7xx/smtcfb.c 2009-06-14 20:25:20.000000000 +0200 @@ -0,0 +1,1135 @@ +/* + * smtcfb.c -- Silicon Motion SM7xx frame buffer device @@ -24143,9 +24111,9 @@ diff -Nur linux-2.6.30/drivers/video/sm7xx/smtcfb.c rt4ls/drivers/video/sm7xx/sm +MODULE_AUTHOR("Siliconmotion "); +MODULE_DESCRIPTION("Framebuffer driver for SMI Graphic Cards"); +MODULE_LICENSE("GPL"); -diff -Nur linux-2.6.30/drivers/video/sm7xx/smtcfb.h rt4ls/drivers/video/sm7xx/smtcfb.h ---- linux-2.6.30/drivers/video/sm7xx/smtcfb.h 1970-01-01 01:00:00.000000000 +0100 -+++ rt4ls/drivers/video/sm7xx/smtcfb.h 2009-06-12 16:28:47.728622169 +0200 +diff -Nur linux-2.6.30.orig/drivers/video/sm7xx/smtcfb.h linux-2.6.30/drivers/video/sm7xx/smtcfb.h +--- linux-2.6.30.orig/drivers/video/sm7xx/smtcfb.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.30/drivers/video/sm7xx/smtcfb.h 2009-06-14 20:25:20.000000000 +0200 @@ -0,0 +1,793 @@ +/* + * smtcfb.h -- Silicon Motion SM7xx frame buffer device @@ -24940,9 +24908,9 @@ diff -Nur linux-2.6.30/drivers/video/sm7xx/smtcfb.h rt4ls/drivers/video/sm7xx/sm +}; + +#define numVGAModes (sizeof(VGAMode) / sizeof(struct ModeInit)) -diff -Nur linux-2.6.30/fs/autofs4/waitq.c rt4ls/fs/autofs4/waitq.c ---- linux-2.6.30/fs/autofs4/waitq.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/fs/autofs4/waitq.c 2009-06-12 16:28:48.180649291 +0200 +diff -Nur linux-2.6.30.orig/fs/autofs4/waitq.c linux-2.6.30/fs/autofs4/waitq.c +--- linux-2.6.30.orig/fs/autofs4/waitq.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/fs/autofs4/waitq.c 2009-06-14 20:25:20.000000000 +0200 @@ -297,14 +297,20 @@ */ if (notify == NFY_MOUNT) { @@ -24972,9 +24940,9 @@ diff -Nur linux-2.6.30/fs/autofs4/waitq.c rt4ls/fs/autofs4/waitq.c } return 1; -diff -Nur linux-2.6.30/fs/jbd/commit.c rt4ls/fs/jbd/commit.c ---- linux-2.6.30/fs/jbd/commit.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/fs/jbd/commit.c 2009-06-12 16:28:48.464665929 +0200 +diff -Nur linux-2.6.30.orig/fs/jbd/commit.c linux-2.6.30/fs/jbd/commit.c +--- linux-2.6.30.orig/fs/jbd/commit.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/fs/jbd/commit.c 2009-06-14 20:25:20.000000000 +0200 @@ -241,7 +241,7 @@ spin_lock(&journal->j_list_lock); } @@ -24995,9 +24963,20 @@ diff -Nur linux-2.6.30/fs/jbd/commit.c rt4ls/fs/jbd/commit.c __journal_unfile_buffer(jh); jbd_unlock_bh_state(bh); journal_remove_journal_head(bh); -diff -Nur linux-2.6.30/include/linux/cpumask.h rt4ls/include/linux/cpumask.h ---- linux-2.6.30/include/linux/cpumask.h 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/include/linux/cpumask.h 2009-06-12 16:29:16.018395927 +0200 +diff -Nur linux-2.6.30.orig/.gitignore linux-2.6.30/.gitignore +--- linux-2.6.30.orig/.gitignore 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/.gitignore 2009-06-14 20:25:19.000000000 +0200 +@@ -32,6 +32,7 @@ + tags + TAGS + vmlinux ++vmlinux.32 + System.map + Module.markers + Module.symvers +diff -Nur linux-2.6.30.orig/include/linux/cpumask.h linux-2.6.30/include/linux/cpumask.h +--- linux-2.6.30.orig/include/linux/cpumask.h 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/include/linux/cpumask.h 2009-06-14 20:25:20.000000000 +0200 @@ -1022,8 +1022,6 @@ bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node); @@ -25027,9 +25006,9 @@ diff -Nur linux-2.6.30/include/linux/cpumask.h rt4ls/include/linux/cpumask.h static inline void alloc_bootmem_cpumask_var(cpumask_var_t *mask) { } -diff -Nur linux-2.6.30/ipc/shm.c rt4ls/ipc/shm.c ---- linux-2.6.30/ipc/shm.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/ipc/shm.c 2009-06-12 16:29:47.289072291 +0200 +diff -Nur linux-2.6.30.orig/ipc/shm.c linux-2.6.30/ipc/shm.c +--- linux-2.6.30.orig/ipc/shm.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/ipc/shm.c 2009-06-14 20:25:20.000000000 +0200 @@ -969,13 +969,10 @@ SYSCALL_DEFINE1(shmdt, char __user *, shmaddr) { @@ -25046,9 +25025,9 @@ diff -Nur linux-2.6.30/ipc/shm.c rt4ls/ipc/shm.c if (addr & ~PAGE_MASK) return retval; -diff -Nur linux-2.6.30/kernel/sched_cpupri.c rt4ls/kernel/sched_cpupri.c ---- linux-2.6.30/kernel/sched_cpupri.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/kernel/sched_cpupri.c 2009-06-12 16:29:48.957102637 +0200 +diff -Nur linux-2.6.30.orig/kernel/sched_cpupri.c linux-2.6.30/kernel/sched_cpupri.c +--- linux-2.6.30.orig/kernel/sched_cpupri.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/kernel/sched_cpupri.c 2009-06-14 20:25:20.000000000 +0200 @@ -165,7 +165,7 @@ vec->count = 0; if (bootmem) @@ -25058,9 +25037,9 @@ diff -Nur linux-2.6.30/kernel/sched_cpupri.c rt4ls/kernel/sched_cpupri.c goto cleanup; } -diff -Nur linux-2.6.30/kernel/sched_rt.c rt4ls/kernel/sched_rt.c ---- linux-2.6.30/kernel/sched_rt.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/kernel/sched_rt.c 2009-06-12 16:29:48.969124560 +0200 +diff -Nur linux-2.6.30.orig/kernel/sched_rt.c linux-2.6.30/kernel/sched_rt.c +--- linux-2.6.30.orig/kernel/sched_rt.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/kernel/sched_rt.c 2009-06-14 20:25:20.000000000 +0200 @@ -1591,7 +1591,7 @@ unsigned int i; @@ -25070,9 +25049,9 @@ diff -Nur linux-2.6.30/kernel/sched_rt.c rt4ls/kernel/sched_rt.c GFP_KERNEL, cpu_to_node(i)); } #endif /* CONFIG_SMP */ -diff -Nur linux-2.6.30/kernel/smp.c rt4ls/kernel/smp.c ---- linux-2.6.30/kernel/smp.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/kernel/smp.c 2009-06-12 16:29:48.969124560 +0200 +diff -Nur linux-2.6.30.orig/kernel/smp.c linux-2.6.30/kernel/smp.c +--- linux-2.6.30.orig/kernel/smp.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/kernel/smp.c 2009-06-14 20:25:20.000000000 +0200 @@ -52,7 +52,7 @@ switch (action) { case CPU_UP_PREPARE: @@ -25082,9 +25061,9 @@ diff -Nur linux-2.6.30/kernel/smp.c rt4ls/kernel/smp.c cpu_to_node(cpu))) return NOTIFY_BAD; break; -diff -Nur linux-2.6.30/lib/cpumask.c rt4ls/lib/cpumask.c ---- linux-2.6.30/lib/cpumask.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/lib/cpumask.c 2009-06-12 16:29:49.032452180 +0200 +diff -Nur linux-2.6.30.orig/lib/cpumask.c linux-2.6.30/lib/cpumask.c +--- linux-2.6.30.orig/lib/cpumask.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/lib/cpumask.c 2009-06-14 20:25:20.000000000 +0200 @@ -119,12 +119,6 @@ } EXPORT_SYMBOL(alloc_cpumask_var_node); @@ -25111,9 +25090,9 @@ diff -Nur linux-2.6.30/lib/cpumask.c rt4ls/lib/cpumask.c /** * alloc_bootmem_cpumask_var - allocate a struct cpumask from the bootmem arena. * @mask: pointer to cpumask_var_t where the cpumask is returned -diff -Nur linux-2.6.30/net/sched/cls_cgroup.c rt4ls/net/sched/cls_cgroup.c ---- linux-2.6.30/net/sched/cls_cgroup.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/net/sched/cls_cgroup.c 2009-06-12 16:29:50.516543166 +0200 +diff -Nur linux-2.6.30.orig/net/sched/cls_cgroup.c linux-2.6.30/net/sched/cls_cgroup.c +--- linux-2.6.30.orig/net/sched/cls_cgroup.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/net/sched/cls_cgroup.c 2009-06-14 20:25:20.000000000 +0200 @@ -167,9 +167,6 @@ struct tcf_exts e; int err; @@ -25124,9 +25103,9 @@ diff -Nur linux-2.6.30/net/sched/cls_cgroup.c rt4ls/net/sched/cls_cgroup.c if (head == NULL) { if (!handle) return -EINVAL; -diff -Nur linux-2.6.30/sound/core/pcm_native.c rt4ls/sound/core/pcm_native.c ---- linux-2.6.30/sound/core/pcm_native.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/sound/core/pcm_native.c 2009-06-12 16:29:54.880818910 +0200 +diff -Nur linux-2.6.30.orig/sound/core/pcm_native.c linux-2.6.30/sound/core/pcm_native.c +--- linux-2.6.30.orig/sound/core/pcm_native.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/sound/core/pcm_native.c 2009-06-14 20:25:20.000000000 +0200 @@ -3091,7 +3091,11 @@ return VM_FAULT_SIGBUS; } else { @@ -25151,9 +25130,9 @@ diff -Nur linux-2.6.30/sound/core/pcm_native.c rt4ls/sound/core/pcm_native.c offset = area->vm_pgoff << PAGE_SHIFT; switch (offset) { case SNDRV_PCM_MMAP_OFFSET_STATUS: -diff -Nur linux-2.6.30/sound/core/sgbuf.c rt4ls/sound/core/sgbuf.c ---- linux-2.6.30/sound/core/sgbuf.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/sound/core/sgbuf.c 2009-06-12 16:29:54.904819175 +0200 +diff -Nur linux-2.6.30.orig/sound/core/sgbuf.c linux-2.6.30/sound/core/sgbuf.c +--- linux-2.6.30.orig/sound/core/sgbuf.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/sound/core/sgbuf.c 2009-06-14 20:25:20.000000000 +0200 @@ -114,7 +114,11 @@ if (!i) table->addr |= chunk; /* mark head */ @@ -25179,9 +25158,9 @@ diff -Nur linux-2.6.30/sound/core/sgbuf.c rt4ls/sound/core/sgbuf.c if (! dmab->area) goto _failed; if (res_size) -diff -Nur linux-2.6.30/sound/pci/Kconfig rt4ls/sound/pci/Kconfig ---- linux-2.6.30/sound/pci/Kconfig 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/sound/pci/Kconfig 2009-06-12 16:29:55.036828170 +0200 +diff -Nur linux-2.6.30.orig/sound/pci/Kconfig linux-2.6.30/sound/pci/Kconfig +--- linux-2.6.30.orig/sound/pci/Kconfig 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/sound/pci/Kconfig 2009-06-14 20:25:20.000000000 +0200 @@ -259,7 +259,6 @@ config SND_CS5535AUDIO @@ -25190,9 +25169,9 @@ diff -Nur linux-2.6.30/sound/pci/Kconfig rt4ls/sound/pci/Kconfig select SND_PCM select SND_AC97_CODEC help -diff -Nur linux-2.6.30/virt/kvm/kvm_main.c rt4ls/virt/kvm/kvm_main.c ---- linux-2.6.30/virt/kvm/kvm_main.c 2009-06-10 05:05:27.000000000 +0200 -+++ rt4ls/virt/kvm/kvm_main.c 2009-06-12 16:29:55.860876705 +0200 +diff -Nur linux-2.6.30.orig/virt/kvm/kvm_main.c linux-2.6.30/virt/kvm/kvm_main.c +--- linux-2.6.30.orig/virt/kvm/kvm_main.c 2009-06-10 05:05:27.000000000 +0200 ++++ linux-2.6.30/virt/kvm/kvm_main.c 2009-06-14 20:25:20.000000000 +0200 @@ -2301,7 +2301,7 @@ bad_pfn = page_to_pfn(bad_page); diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index ea3cd1f4d..41ea5b9d8 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -22,7 +22,7 @@ GCC_CONFOPTS= --prefix=$(STAGING_TOOLS) \ --enable-target-optspace \ --with-gnu-ld \ --disable-libmudflap \ - --enable-sjlj-exceptions \ + --disable-sjlj-exceptions \ --disable-libgomp \ --disable-biarch \ --disable-multilib \ -- cgit v1.2.3