From 9d75f0d407be54a14bbb6bcae4d96cb433b69c86 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 1 Aug 2010 23:45:44 +0200 Subject: remove unzip dependency, use delivered cpio. some code cleanup --- README | 1 - mk/vars.mk | 4 ++-- package/asterisk/Makefile | 4 ++-- package/cpufrequtils/patches/patch-utils_aperf_c | 18 ++++++++++++++++++ package/e2fsprogs/Makefile | 3 +-- scripts/scan-tools.sh | 6 ------ target/linux/config/Config.in.misc | 2 +- target/linux/config/Config.in.sched | 17 ----------------- 8 files changed, 24 insertions(+), 31 deletions(-) create mode 100644 package/cpufrequtils/patches/patch-utils_aperf_c diff --git a/README b/README index 156d726e2..04b6b441e 100644 --- a/README +++ b/README @@ -18,7 +18,6 @@ Before you can start you need to install some tools: - bzip2 - wget - file -- unzip - libc headers - ncurses5 headers - zlib headers diff --git a/mk/vars.mk b/mk/vars.mk index fdd9f432c..6f38db944 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -102,7 +102,7 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ cd ${WRKDIR} && \ for file in ${FULLDISTFILES}; do case $$file in \ *.cpio) \ - cat $$file | cpio -i -d ;; \ + cat $$file | $(STAGING_TOOLS)/bin/cpio -i -d ;; \ *.tar) \ tar -xf $$file ;; \ *.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \ @@ -114,7 +114,7 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ *.tar.bz2 | *.tbz | *.tbz2) \ bzip2 -dc $$file | tar -xf - ;; \ *.zip) \ - unzip -qd ${WRKDIR} $$file ;; \ + cat $$file | $(STAGING_TOOLS)/bin/cpio -ivd -H zip ;; \ *.arm) \ cp $$file ${WRKDIR} ;; \ *) \ diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 8e5f96d27..a6025ce43 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -101,9 +101,9 @@ CONFIGURE_ARGS+= --with-ogg=${STAGING_DIR}/usr \ TLDFLAGS+= -logg endif ifneq (${ADK_PACKAGE_ASTERISK_CURL},) -CONFIGURE_ARGS+= --with-curl=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-libcurl=${STAGING_DIR}/usr else -CONFIGURE_ARGS+= --without-curl +CONFIGURE_ARGS+= --without-libcurl endif ifneq (${ADK_PACKAGE_ASTERISK_PGSQL},) CONFIGURE_ARGS+= --with-postgres=${STAGING_DIR}/usr diff --git a/package/cpufrequtils/patches/patch-utils_aperf_c b/package/cpufrequtils/patches/patch-utils_aperf_c new file mode 100644 index 000000000..3e39dd625 --- /dev/null +++ b/package/cpufrequtils/patches/patch-utils_aperf_c @@ -0,0 +1,18 @@ +--- cpufrequtils-008.orig/utils/aperf.c 2010-07-05 17:43:17.000000000 +0200 ++++ cpufrequtils-008/utils/aperf.c 2010-08-01 22:41:37.905732041 +0200 +@@ -68,11 +68,15 @@ struct avg_perf_cpu_info + + static int cpu_has_effective_freq() + { ++#if defined(__i386__) || defined(__x86_64__) + /* largest base level */ + if (cpuid_eax(0) < 6) + return 0; + + return cpuid_ecx(6) & 0x1; ++#else ++ return 0; ++#endif + } + + /* diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 7f09627a1..34c2cdab8 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -31,8 +31,7 @@ $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESC $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_BLKID},${PKG_SECTION_BLKID})) CONFIGURE_ARGS+= --enable-elf-shlibs \ - --disable-tls \ - --enable-dynamic-e2fsck + --disable-tls INSTALL_TARGET+= install-libs pre-build: diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 0837c9613..5dd19a645 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -137,12 +137,6 @@ if ! which bzip2 >/dev/null 2>&1; then out=1 fi -if ! which unzip >/dev/null 2>&1; then - echo You must install unzip to continue. - echo - out=1 -fi - if ! which patch >/dev/null 2>&1; then echo You must install patch to continue. echo diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index bb5097351..627a691bc 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -95,7 +95,7 @@ config ADK_KPACKAGE_KMOD_EEPROM_93CX6 prompt "kmod-eeprom-93cx6................. 93cx6 eeprom support" tristate depends on ADK_KPACKAGE_KMOD_MAC80211 - depends on !ADK_LINUX_CRIS_FOXBOARD + depends on !ADK_LINUX_CRIS_FOXBOARD && !ADK_LINUX_MIPS64_LEMOTE default n help diff --git a/target/linux/config/Config.in.sched b/target/linux/config/Config.in.sched index 808b00e41..7cea06102 100644 --- a/target/linux/config/Config.in.sched +++ b/target/linux/config/Config.in.sched @@ -201,7 +201,6 @@ config ADK_KPACKAGE_KMOD_NET_CLS_BASIC prompt "kmod-cls-basic.................... Elementary classification (BASIC)" tristate select ADK_KERNEL_NET_CLS - depends on ADK_LINUX_2_6 default n help Say Y here if you want to be able to classify packets using @@ -272,22 +271,10 @@ config ADK_KERNEL_NET_CLS_ACT select ADK_KERNEL_NET_ESTIMATOR default n -config ADK_KPACKAGE_KMOD_NET_CLS_POLICE - prompt "kmod-act-police................... Traffic Policing" - tristate - select ADK_KERNEL_NET_CLS_ACT - depends on ADK_LINUX_2_4 - default n - help - Say Y here if you want to do traffic policing, i.e. strict - bandwidth limiting. This action replaces the existing policing - module. - config ADK_KPACKAGE_KMOD_NET_ACT_POLICE prompt "kmod-act-police................... Traffic Policing" tristate select ADK_KERNEL_NET_CLS_ACT - depends on ADK_LINUX_2_6 default n help Say Y here if you want to do traffic policing, i.e. strict @@ -298,7 +285,6 @@ config ADK_KPACKAGE_KMOD_NET_ACT_GACT prompt "kmod-act-gact..................... Generic actions" tristate select ADK_KERNEL_NET_CLS_ACT - depends on ADK_LINUX_2_6 default n help Say Y here to take generic actions such as dropping and @@ -308,7 +294,6 @@ config ADK_KPACKAGE_KMOD_NET_ACT_MIRRED prompt "kmod-act-mirred................... Redirecting and Mirroring" tristate select ADK_KERNEL_NET_CLS_ACT - depends on ADK_LINUX_2_6 default n help Say Y here to allow packets to be mirrored or redirected to @@ -319,7 +304,6 @@ config ADK_KPACKAGE_KMOD_NET_ACT_IPT tristate select ADK_KERNEL_NET_CLS_ACT select ADK_KPACKAGE_KMOD_IP_NF_IPTABLES - depends on ADK_LINUX_2_6 default n help Say Y here to be able to invoke iptables targets after successful @@ -329,7 +313,6 @@ config ADK_KPACKAGE_KMOD_NET_ACT_PEDIT prompt "kmod-act-pedit.................... Packet Editing" tristate select ADK_KERNEL_NET_CLS_ACT - depends on ADK_LINUX_2_6 default n help Say Y here if you want to mangle the content of packets. -- cgit v1.2.3 From 644b7f27696de6fbbba53019f08ac534fd5ad37b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 2 Aug 2010 00:59:38 +0200 Subject: fix compile of gcc package, host cppflags should be not target cppflags --- package/eglibc/Makefile | 1 + package/gcc/Makefile | 4 ++-- package/gcc/patches/gcc-cppflags.patch | 12 ++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 package/gcc/patches/gcc-cppflags.patch diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 4b737e303..e70d9a790 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -89,6 +89,7 @@ eglibc-dev-install: $(MAKE) -C $(WRKBUILD) \ install-headers install-bootstrap-headers=yes @find $(IDIR_EGLIBC_DEV) -name .install -exec rm {} \; + @find $(IDIR_EGLIBC_DEV) -name ..install.cmd -exec rm {} \; # conflicts with libiconv find $(IDIR_EGLIBC_DEV) -name iconv.h -exec rm {} \; diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 77e346308..b12f2a3ec 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -23,9 +23,10 @@ PKG_DEPENDS+= glibc-dev PKG_BUILDDEP+= glibc endif -PKG_HOST_DEPENDS:= !freebsd PKG_TARGET_DEPENDS:= !ag241 +WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GCC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) @@ -43,7 +44,6 @@ CONFIGURE_ARGS+= --enable-languages=c,c++ \ --disable-__cxa_atexit \ --without-headers \ --libexecdir=/usr/lib \ - --with-gnu-ld \ --disable-libssp \ --disable-nls \ --disable-sjlj-exceptions \ diff --git a/package/gcc/patches/gcc-cppflags.patch b/package/gcc/patches/gcc-cppflags.patch new file mode 100644 index 000000000..0971bbec9 --- /dev/null +++ b/package/gcc/patches/gcc-cppflags.patch @@ -0,0 +1,12 @@ +diff -Nur gcc-4.4.4.orig/gcc/configure gcc-4.4.4/gcc/configure +--- gcc-4.4.4.orig/gcc/configure 2009-10-19 14:15:27.000000000 +0200 ++++ gcc-4.4.4/gcc/configure 2010-08-02 00:47:36.823620346 +0200 +@@ -13530,7 +13530,7 @@ + esac + saved_CFLAGS="${CFLAGS}" + CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ +- LDFLAGS="${LDFLAGS_FOR_BUILD}" \ ++ LDFLAGS="${LDFLAGS_FOR_BUILD}" CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \ + ${realsrcdir}/configure \ + --enable-languages=${enable_languages-all} \ + --target=$target_alias --host=$build_alias --build=$build_alias -- cgit v1.2.3 From 7c570780d9839559683b70707d320c62719f3e7e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 2 Aug 2010 01:54:48 +0200 Subject: use GNU nm from toolchain --- package/krb5/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 7d3834990..bb4e809c1 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -46,6 +46,10 @@ CONFIGURE_ENV+= krb5_cv_attr_constructor_destructor=yes,yes \ post-extract: (cd ${WRKDIR}; tar xzf ${PKG_NAME}-${PKG_VERSION}.tar.gz) +pre-build: + # fix nm call in script, we need the GNU version of nm + $(SED) "s#@@NM@@#${NM}#" ${WRKSRC}/util/export-check.pl + post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc ${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc/krb5kdc -- cgit v1.2.3 From 1f36c4fe1cdfefbabea69604f456c02fd43f0b40 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 2 Aug 2010 01:55:10 +0200 Subject: cleanup unused code --- package/gpsd/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 174690c7b..167af550a 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -27,9 +27,7 @@ CONFIGURE_ENV+= EGREP="grep -E" \ ac_cv_func_strlcpy=no \ ac_cv_func_strlcat=no \ ac_cv_lib_nsl_gethostbyname=no -CONFIGURE_ARGS+= --without-x \ - --disable-dbus - +CONFIGURE_ARGS+= --disable-dbus TCFLAGS+= -fPIC ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y) @@ -40,9 +38,6 @@ else TLDFLAGS+= -shared -pthread endif -post-extract: - #@find ${WRKBUILD} -name *.rej -exec rm {} \; - ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y) # add workaround because libtool tries to link libstdc++ post-configure: -- cgit v1.2.3 From 2ef5e2d8c0aeac49b2888d6bbefadf30d3964907 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 2 Aug 2010 01:55:34 +0200 Subject: ugly OpenBSD specific workaround --- package/libtool/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libtool/Makefile b/package/libtool/Makefile index dbf2e3c05..1adc4881b 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -17,6 +17,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTOOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBLTDL,libltdl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq (${ADK_HOST_OPENBSD},y) +XAKE_FLAGS+= AUTOCONF_VERSION=2.62 +endif + post-install: ${INSTALL_DIR} ${IDIR_LIBLTDL}/usr/lib ${CP} ${WRKINST}/usr/lib/libltdl.so* ${IDIR_LIBLTDL}/usr/lib/ -- cgit v1.2.3 From d628ef61770142a2a2f9271c17803b47bc13d524 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 2 Aug 2010 01:55:57 +0200 Subject: use GNU nm from toolchain (second part) --- package/krb5/patches/patch-src_util_export-check_pl | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 package/krb5/patches/patch-src_util_export-check_pl diff --git a/package/krb5/patches/patch-src_util_export-check_pl b/package/krb5/patches/patch-src_util_export-check_pl new file mode 100644 index 000000000..04d21a299 --- /dev/null +++ b/package/krb5/patches/patch-src_util_export-check_pl @@ -0,0 +1,11 @@ +--- krb5-1.8.1.orig/src/util/export-check.pl Sun Aug 1 18:36:11 2010 ++++ krb5-1.8.1/src/util/export-check.pl Sun Aug 1 18:27:23 2010 +@@ -38,7 +38,7 @@ if ($#ARGV != 1) { + my($exfile, $libfile) = @ARGV; + + @missing = (); +-open NM, "nm -Dg --defined-only $libfile |" || die "can't run nm on $libfile: $!"; ++open NM, "@@NM@@ -Dg --defined-only $libfile |" || die "can't run nm on $libfile: $!"; + open EXPORT, "< $exfile" || die "can't read $exfile: $!"; + + @export = ; -- cgit v1.2.3 From 780b42f229c9a4fc4f8a30844f5bc6a17ec2dcd9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 2 Aug 2010 01:56:27 +0200 Subject: python is required for gpsd build --- scripts/adkprepare.sh | 1 + scripts/scan-pkgs.sh | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/adkprepare.sh b/scripts/adkprepare.sh index 08503bafd..d90b9ef95 100755 --- a/scripts/adkprepare.sh +++ b/scripts/adkprepare.sh @@ -47,6 +47,7 @@ openbsd_full() { pkg_add -v m4 pkg_add -v autoconf-2.62p0 pkg_add -v gperf + pkg_add -v python-2.6.3p1 } netbsd() { diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 303935a9b..aff3f61f8 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -32,6 +32,10 @@ if [[ -n $ADK_NATIVE ]];then fi fi +if [[ -n $ADK_PACKAGE_GPSD ]]; then + NEED_PYTHON="$NEED_PYTHON gpsd" +fi + if [[ -n $ADK_PACKAGE_FIREFOX ]]; then NEED_ZIP="$NEED_ZIP firefox" NEED_LIBIDL="$NEED_LIBIDL firefox" @@ -265,5 +269,3 @@ if [[ -n $NEED_PYTHON ]]; then fi exit $out - -exit $out -- cgit v1.2.3 From 75dfa74232ee8a8ee1c2ff51d27d3d48def3cee7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 4 Aug 2010 17:13:58 +0200 Subject: add X11 header subpackage --- package/libX11/Makefile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/package/libX11/Makefile b/package/libX11/Makefile index e878ab1f5..aba32b12a 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libX11 PKG_VERSION:= 1.3.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b68aebbfcac1174c4c95d260e9369766 PKG_DESCR:= X11 client-side library PKG_SECTION:= x11/libs @@ -19,6 +19,11 @@ endif include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,LIBX11_DEV,libx11-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_LIBX11_DEV}+=libx11-dev-install XAKE_FLAGS+= HOSTCPPFLAGS=-I${STAGING_DIR}/usr/include/xproto CONFIGURE_ARGS+= --enable-xlocale \ @@ -27,9 +32,15 @@ CONFIGURE_ARGS+= --enable-xlocale \ --disable-malloc0returnsnull \ --without-xcb -post-install: +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11 ${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/ ${CP} ${WRKINST}/usr/share/X11/XKeysymDB ${IDIR_LIBX11}/usr/share/X11 +libx11-dev-install: + ${INSTALL_DIR} ${IDIR_LIBX11_DEV}/usr/include/X11 + ${CP} ${WRKINST}/usr/include/X11/*.h ${IDIR_LIBX11_DEV}/usr/include/X11 + ${CP} ${STAGING_DIR}/usr/include/xproto/X11/*.h \ + ${IDIR_LIBX11_DEV}/usr/include/X11 + include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 57177df84b91ca2cfb1e205f83353a8b7d7e2024 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 5 Aug 2010 22:39:01 +0200 Subject: update lemote to 2.6.35, enable version specific patches for kernel-header patches --- mk/buildhlp.mk | 4 +- target/lemote/kernel.config | 120 +- target/lemote/patches/lemote.patch | 9354 ++---------- target/lemote/target.mk | 4 +- .../linux/patches/2.6.35/bsd-compatibility.patch | 2513 ++++ target/linux/patches/2.6.35/cc-abstract.patch | 14 + target/linux/patches/2.6.35/cris-initrd.patch | 14 + target/linux/patches/2.6.35/cris-sound.patch | 12 + target/linux/patches/2.6.35/cygwin-compat.patch | 14 + target/linux/patches/2.6.35/exmap.patch | 11 + target/linux/patches/2.6.35/freebsd-compat.patch | 11 + target/linux/patches/2.6.35/mtd-root.patch | 62 + .../2.6.35/ocf-20100325.patch.REMOVED.git-id | 1 + target/linux/patches/2.6.35/startup.patch | 20 + target/linux/patches/2.6.35/yaffs2.patch | 15068 +++++++++++++++++++ .../patches/2.6.34/cleankernel.patch | 11 + .../patches/2.6.34/etrax-header.patch | 73 + .../patches/2.6.34/linux-gcc-check.patch | 18 + .../kernel-headers/patches/2.6.34/microperl.patch | 24 + .../patches/2.6.34/scsi-header.patch | 41 + .../patches/2.6.35/cleankernel.patch | 11 + .../patches/2.6.35/etrax-header.patch | 73 + .../patches/2.6.35/linux-gcc-check.patch | 18 + .../kernel-headers/patches/2.6.35/microperl.patch | 24 + toolchain/kernel-headers/patches/cleankernel.patch | 11 - .../kernel-headers/patches/etrax-header.patch | 73 - .../kernel-headers/patches/linux-gcc-check.patch | 18 - toolchain/kernel-headers/patches/microperl.patch | 24 - toolchain/kernel-headers/patches/scsi-header.patch | 41 - 29 files changed, 19528 insertions(+), 8154 deletions(-) create mode 100644 target/linux/patches/2.6.35/bsd-compatibility.patch create mode 100644 target/linux/patches/2.6.35/cc-abstract.patch create mode 100644 target/linux/patches/2.6.35/cris-initrd.patch create mode 100644 target/linux/patches/2.6.35/cris-sound.patch create mode 100644 target/linux/patches/2.6.35/cygwin-compat.patch create mode 100644 target/linux/patches/2.6.35/exmap.patch create mode 100644 target/linux/patches/2.6.35/freebsd-compat.patch create mode 100644 target/linux/patches/2.6.35/mtd-root.patch create mode 100644 target/linux/patches/2.6.35/ocf-20100325.patch.REMOVED.git-id create mode 100644 target/linux/patches/2.6.35/startup.patch create mode 100644 target/linux/patches/2.6.35/yaffs2.patch create mode 100644 toolchain/kernel-headers/patches/2.6.34/cleankernel.patch create mode 100644 toolchain/kernel-headers/patches/2.6.34/etrax-header.patch create mode 100644 toolchain/kernel-headers/patches/2.6.34/linux-gcc-check.patch create mode 100644 toolchain/kernel-headers/patches/2.6.34/microperl.patch create mode 100644 toolchain/kernel-headers/patches/2.6.34/scsi-header.patch create mode 100644 toolchain/kernel-headers/patches/2.6.35/cleankernel.patch create mode 100644 toolchain/kernel-headers/patches/2.6.35/etrax-header.patch create mode 100644 toolchain/kernel-headers/patches/2.6.35/linux-gcc-check.patch create mode 100644 toolchain/kernel-headers/patches/2.6.35/microperl.patch delete mode 100644 toolchain/kernel-headers/patches/cleankernel.patch delete mode 100644 toolchain/kernel-headers/patches/etrax-header.patch delete mode 100644 toolchain/kernel-headers/patches/linux-gcc-check.patch delete mode 100644 toolchain/kernel-headers/patches/microperl.patch delete mode 100644 toolchain/kernel-headers/patches/scsi-header.patch diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index d4c8eeb50..4df712fcb 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -56,8 +56,10 @@ endif ifeq ($(strip ${__use_generic_patch_target}),42) post-patch: ${WRKDIST}/.prepared: ${WRKDIST}/.extract_done + [ ! -d ./patches/${PKG_VERSION} ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \ + '{patch-!(*.orig),*.patch}' [ ! -d ./patches ] || ${PREVENT_PATCH} ${PATCH} ${WRKDIST} ./patches \ - '{patch-!(*.orig),*.patch}' $(MAKE_TRACE) + '{patch-!(*.orig),*.patch}' [ ! -d ./src ] || (cd src; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \ $(MAKE_TRACE) @${MAKE} post-patch $(MAKE_TRACE) diff --git a/target/lemote/kernel.config b/target/lemote/kernel.config index 21df7a57a..6b536c015 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.34 -# Thu Jun 3 15:37:40 2010 +# Linux kernel version: 2.6.35 +# Thu Aug 5 22:28:58 2010 # CONFIG_MIPS=y @@ -55,6 +55,7 @@ CONFIG_CS5536=y CONFIG_CS5536_MFGPT=y CONFIG_LOONGSON_SUSPEND=y CONFIG_LOONGSON_UART_BASE=y +CONFIG_LOONGSON_MC146818=y CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set @@ -188,6 +189,7 @@ CONFIG_CONSTRUCTORS=y CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_HAVE_KERNEL_GZIP=y @@ -354,9 +356,9 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_PM=y # CONFIG_PM_DEBUG is not set CONFIG_PM_SLEEP=y +CONFIG_SUSPEND_NVS=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y -CONFIG_HIBERNATION_NVS=y CONFIG_HIBERNATION=y CONFIG_PM_STD_PARTITION="/dev/mapper/swap" # CONFIG_PM_RUNTIME is not set @@ -426,6 +428,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set +# CONFIG_L2TP is not set # CONFIG_BRIDGE is not set # CONFIG_NET_DSA is not set # CONFIG_VLAN_8021Q is not set @@ -458,9 +461,14 @@ CONFIG_WIRELESS=y # # CFG80211 needs to be enabled for MAC80211 # + +# +# Some wireless drivers require a rate control algorithm +# # CONFIG_WIMAX is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set +# CONFIG_CAIF is not set # # Device Drivers @@ -550,70 +558,96 @@ CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set # CONFIG_ATA_VERBOSE_ERROR is not set # CONFIG_SATA_PMP is not set + +# +# Controllers with non-SFF native interface +# # CONFIG_SATA_AHCI is not set +# CONFIG_SATA_AHCI_PLATFORM is not set +# CONFIG_SATA_INIC162X is not set # CONFIG_SATA_SIL24 is not set CONFIG_ATA_SFF=y -# CONFIG_SATA_SVW is not set + +# +# SFF controllers with custom DMA interface +# +# CONFIG_PDC_ADMA is not set +# CONFIG_SATA_QSTOR is not set +# CONFIG_SATA_SX4 is not set +CONFIG_ATA_BMDMA=y + +# +# SATA SFF controllers with BMDMA +# # CONFIG_ATA_PIIX is not set # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set -# CONFIG_PDC_ADMA is not set -# CONFIG_SATA_QSTOR is not set # CONFIG_SATA_PROMISE is not set -# CONFIG_SATA_SX4 is not set # CONFIG_SATA_SIL is not set # CONFIG_SATA_SIS is not set +# CONFIG_SATA_SVW is not set # CONFIG_SATA_ULI is not set # CONFIG_SATA_VIA is not set # CONFIG_SATA_VITESSE is not set -# CONFIG_SATA_INIC162X is not set + +# +# PATA SFF controllers with BMDMA +# # CONFIG_PATA_ALI is not set CONFIG_PATA_AMD=y # CONFIG_PATA_ARTOP is not set -# CONFIG_PATA_ATP867X is not set # CONFIG_PATA_ATIIXP is not set -# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_ATP867X is not set # CONFIG_PATA_CMD64X is not set # CONFIG_PATA_CS5520 is not set # CONFIG_PATA_CS5530 is not set # CONFIG_PATA_CYPRESS is not set # CONFIG_PATA_EFAR is not set -# CONFIG_ATA_GENERIC is not set # CONFIG_PATA_HPT366 is not set # CONFIG_PATA_HPT37X is not set # CONFIG_PATA_HPT3X2N is not set # CONFIG_PATA_HPT3X3 is not set -# CONFIG_PATA_ISAPNP is not set -# CONFIG_PATA_IT821X is not set # CONFIG_PATA_IT8213 is not set +# CONFIG_PATA_IT821X is not set # CONFIG_PATA_JMICRON is not set -# CONFIG_PATA_LEGACY is not set -# CONFIG_PATA_TRIFLEX is not set # CONFIG_PATA_MARVELL is not set -# CONFIG_PATA_MPIIX is not set -# CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_NETCELL is not set # CONFIG_PATA_NINJA32 is not set -# CONFIG_PATA_NS87410 is not set # CONFIG_PATA_NS87415 is not set -# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OPTIDMA is not set # CONFIG_PATA_PDC2027X is not set # CONFIG_PATA_PDC_OLD is not set -# CONFIG_PATA_QDI is not set # CONFIG_PATA_RADISYS is not set # CONFIG_PATA_RDC is not set -# CONFIG_PATA_RZ1000 is not set # CONFIG_PATA_SC1200 is not set +# CONFIG_PATA_SCH is not set # CONFIG_PATA_SERVERWORKS is not set # CONFIG_PATA_SIL680 is not set # CONFIG_PATA_SIS is not set # CONFIG_PATA_TOSHIBA is not set +# CONFIG_PATA_TRIFLEX is not set # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set -# CONFIG_PATA_WINBOND_VLB is not set + +# +# PIO-only SFF controllers +# +# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_ISAPNP is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_OPTI is not set # CONFIG_PATA_PLATFORM is not set -# CONFIG_PATA_SCH is not set +# CONFIG_PATA_QDI is not set +# CONFIG_PATA_RZ1000 is not set +# CONFIG_PATA_WINBOND_VLB is not set + +# +# Generic fallback / legacy drivers +# +# CONFIG_ATA_GENERIC is not set +# CONFIG_PATA_LEGACY is not set # CONFIG_MD is not set # CONFIG_FUSION is not set @@ -810,6 +844,7 @@ CONFIG_HW_CONSOLE=y # CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_DEVKMEM is not set # CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_N_GSM is not set # CONFIG_NOZOMI is not set # @@ -829,6 +864,8 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=2 CONFIG_SERIAL_CORE=y # CONFIG_SERIAL_JSM is not set # CONFIG_SERIAL_TIMBERDALE is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set # CONFIG_LEGACY_PTYS is not set @@ -840,6 +877,7 @@ CONFIG_UNIX98_PTYS=y # CONFIG_RAW_DRIVER is not set # CONFIG_TCG_TPM is not set CONFIG_DEVPORT=y +# CONFIG_RAMOOPS is not set # CONFIG_I2C is not set # CONFIG_SPI is not set @@ -867,6 +905,7 @@ CONFIG_GPIOLIB=y # CONFIG_GPIO_CS5535 is not set # CONFIG_GPIO_BT8XX is not set # CONFIG_GPIO_LANGWELL is not set +# CONFIG_GPIO_RDC321X is not set # # SPI GPIO expanders: @@ -875,10 +914,15 @@ CONFIG_GPIOLIB=y # # AC97 GPIO expanders: # + +# +# MODULbus GPIO expanders: +# # CONFIG_W1 is not set CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set # CONFIG_PDA_POWER is not set +# CONFIG_TEST_POWER is not set # CONFIG_BATTERY_DS2760 is not set CONFIG_HWMON=y # CONFIG_HWMON_VID is not set @@ -910,16 +954,16 @@ CONFIG_SSB_POSSIBLE=y # Sonics Silicon Backplane # # CONFIG_SSB is not set - -# -# Multifunction device drivers -# +CONFIG_MFD_SUPPORT=y # CONFIG_MFD_CORE is not set # CONFIG_MFD_SM501 is not set # CONFIG_HTC_PASIC3 is not set # CONFIG_MFD_TMIO is not set +# CONFIG_ABX500_CORE is not set # CONFIG_MFD_TIMBERDALE is not set # CONFIG_LPC_SCH is not set +# CONFIG_MFD_RDC321X is not set +# CONFIG_MFD_JANZ_CMODIO is not set # CONFIG_REGULATOR is not set # CONFIG_MEDIA_SUPPORT is not set @@ -1198,10 +1242,6 @@ CONFIG_RTC_DRV_CMOS=y # CONFIG_DMADEVICES is not set # CONFIG_AUXDISPLAY is not set # CONFIG_UIO is not set - -# -# TI VLYNQ -# CONFIG_STAGING=y # CONFIG_STAGING_EXCLUDE_BUILD is not set # CONFIG_USB_IP_COMMON is not set @@ -1214,15 +1254,6 @@ CONFIG_STAGING=y # CONFIG_RTL8192U is not set # CONFIG_RTL8192E is not set # CONFIG_TRANZPORT is not set - -# -# Qualcomm MSM Camera And Video -# - -# -# Camera Sensor Selection -# -# CONFIG_INPUT_GPIO is not set # CONFIG_POHMELFS is not set # CONFIG_IDE_PHISON is not set # CONFIG_VT6655 is not set @@ -1237,11 +1268,14 @@ CONFIG_STAGING=y # CONFIG_IIO is not set # CONFIG_RAMZSWAP is not set # CONFIG_BATMAN_ADV is not set -# CONFIG_STRIP is not set -# CONFIG_WAVELAN is not set CONFIG_FB_SM7XX=y # CONFIG_DT3155 is not set # CONFIG_CRYSTALHD is not set + +# +# Texas Instruments shared transport line discipline +# +# CONFIG_FB_XGI is not set CONFIG_MIPS_PLATFORM_DEVICES=y CONFIG_LEMOTE_YEELOONG2F=y # CONFIG_LEMOTE_LYNLOONG2F is not set @@ -1260,7 +1294,6 @@ CONFIG_LEMOTE_YEELOONG2F=y # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set -# CONFIG_AUFS_FS is not set CONFIG_FILE_LOCKING=y # CONFIG_FSNOTIFY is not set # CONFIG_DNOTIFY is not set @@ -1383,6 +1416,7 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set +# CONFIG_ATOMIC64_SELFTEST is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y CONFIG_EARLY_PRINTK=y diff --git a/target/lemote/patches/lemote.patch b/target/lemote/patches/lemote.patch index 31af80bb6..7785becb0 100644 --- a/target/lemote/patches/lemote.patch +++ b/target/lemote/patches/lemote.patch @@ -1,2630 +1,6 @@ -diff -Nur linux-2.6.34.orig/arch/mips/boot/compressed/ld.script linux-loongson/arch/mips/boot/compressed/ld.script ---- linux-2.6.34.orig/arch/mips/boot/compressed/ld.script 2010-05-16 23:17:36.000000000 +0200 -+++ linux-loongson/arch/mips/boot/compressed/ld.script 2010-05-27 18:12:28.592215840 +0200 -@@ -2,7 +2,7 @@ - * ld.script for compressed kernel support of MIPS - * - * Copyright (C) 2009 Lemote Inc. -- * Author: Wu Zhangjin -+ * Author: Wu Zhangjin - */ - - OUTPUT_ARCH(mips) -diff -Nur linux-2.6.34.orig/arch/mips/configs/fuloong2e_defconfig linux-loongson/arch/mips/configs/fuloong2e_defconfig ---- linux-2.6.34.orig/arch/mips/configs/fuloong2e_defconfig 2010-05-16 23:17:36.000000000 +0200 -+++ linux-loongson/arch/mips/configs/fuloong2e_defconfig 2010-05-27 18:12:28.602215969 +0200 -@@ -1,7 +1,7 @@ - # - # Automatically generated make config: don't edit --# Linux kernel version: 2.6.32-rc4 --# Fri Oct 16 13:18:01 2009 -+# Linux kernel version: 2.6.34-rc5 -+# Wed Apr 28 01:14:53 2010 - # - CONFIG_MIPS=y - -@@ -27,6 +27,7 @@ - # CONFIG_PNX8550_STB810 is not set - # CONFIG_PMC_MSP is not set - # CONFIG_PMC_YOSEMITE is not set -+# CONFIG_POWERTV is not set - # CONFIG_SGI_IP22 is not set - # CONFIG_SGI_IP27 is not set - # CONFIG_SGI_IP28 is not set -@@ -49,6 +50,8 @@ - # CONFIG_ALCHEMY_GPIO_INDIRECT is not set - CONFIG_ARCH_SPARSEMEM_ENABLE=y - CONFIG_LEMOTE_FULOONG2E=y -+# CONFIG_LEMOTE_MACH2F is not set -+CONFIG_LOONGSON_UART_BASE=y - CONFIG_RWSEM_GENERIC_SPINLOCK=y - # CONFIG_ARCH_HAS_ILOG2_U32 is not set - # CONFIG_ARCH_HAS_ILOG2_U64 is not set -@@ -66,8 +69,7 @@ - CONFIG_CSRC_R4K_LIB=y - CONFIG_CSRC_R4K=y - CONFIG_DMA_NONCOHERENT=y --CONFIG_DMA_NEED_PCI_MAP_STATE=y --CONFIG_EARLY_PRINTK=y -+CONFIG_NEED_DMA_MAP_STATE=y - CONFIG_SYS_HAS_EARLY_PRINTK=y - CONFIG_I8259=y - # CONFIG_NO_IOPORT is not set -@@ -84,6 +86,7 @@ - # CPU selection - # - CONFIG_CPU_LOONGSON2E=y -+# CONFIG_CPU_LOONGSON2F is not set - # CONFIG_CPU_MIPS32_R1 is not set - # CONFIG_CPU_MIPS32_R2 is not set - # CONFIG_CPU_MIPS64_R1 is not set -@@ -106,7 +109,6 @@ - # CONFIG_CPU_SB1 is not set - # CONFIG_CPU_CAVIUM_OCTEON is not set - CONFIG_SYS_SUPPORTS_ZBOOT=y --CONFIG_SYS_SUPPORTS_ZBOOT_UART16550=y - CONFIG_CPU_LOONGSON2=y - CONFIG_SYS_HAS_CPU_LOONGSON2E=y - CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y -@@ -128,13 +130,13 @@ - CONFIG_MIPS_MT_DISABLED=y - # CONFIG_MIPS_MT_SMP is not set - # CONFIG_MIPS_MT_SMTC is not set -+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set - CONFIG_CPU_HAS_WB=y - CONFIG_CPU_HAS_SYNC=y - CONFIG_GENERIC_HARDIRQS=y - CONFIG_GENERIC_IRQ_PROBE=y - CONFIG_CPU_SUPPORTS_HIGHMEM=y - CONFIG_SYS_SUPPORTS_HIGHMEM=y --CONFIG_ARCH_FLATMEM_ENABLE=y - CONFIG_ARCH_POPULATES_NODE_MAP=y - CONFIG_SELECT_MEMORY_MODEL=y - # CONFIG_FLATMEM_MANUAL is not set -@@ -143,23 +145,18 @@ - CONFIG_SPARSEMEM=y - CONFIG_HAVE_MEMORY_PRESENT=y - CONFIG_SPARSEMEM_STATIC=y -- --# --# Memory hotplug is currently incompatible with Software Suspend --# - CONFIG_PAGEFLAGS_EXTENDED=y - CONFIG_SPLIT_PTLOCK_CPUS=4 - CONFIG_PHYS_ADDR_T_64BIT=y - CONFIG_ZONE_DMA_FLAG=0 - CONFIG_VIRT_TO_BUS=y --CONFIG_HAVE_MLOCK=y --CONFIG_HAVE_MLOCKED_PAGE_BIT=y - # CONFIG_KSM is not set - CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 - CONFIG_TICK_ONESHOT=y - CONFIG_NO_HZ=y - CONFIG_HIGH_RES_TIMERS=y - CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -+CONFIG_CPU_SUPPORTS_HR_SCHED_CLOCK=y - # CONFIG_HZ_48 is not set - # CONFIG_HZ_100 is not set - # CONFIG_HZ_128 is not set -@@ -190,9 +187,11 @@ - CONFIG_HAVE_KERNEL_GZIP=y - CONFIG_HAVE_KERNEL_BZIP2=y - CONFIG_HAVE_KERNEL_LZMA=y -+CONFIG_HAVE_KERNEL_LZO=y - CONFIG_KERNEL_GZIP=y - # CONFIG_KERNEL_BZIP2 is not set - # CONFIG_KERNEL_LZMA is not set -+# CONFIG_KERNEL_LZO is not set - CONFIG_SWAP=y - CONFIG_SYSVIPC=y - CONFIG_SYSVIPC_SYSCTL=y -@@ -208,6 +207,7 @@ - # - CONFIG_TREE_RCU=y - # CONFIG_TREE_PREEMPT_RCU is not set -+# CONFIG_TINY_RCU is not set - # CONFIG_RCU_TRACE is not set - CONFIG_RCU_FANOUT=64 - # CONFIG_RCU_FANOUT_EXACT is not set -@@ -215,10 +215,8 @@ - CONFIG_IKCONFIG=y - CONFIG_IKCONFIG_PROC=y - CONFIG_LOG_BUF_SHIFT=14 --# CONFIG_GROUP_SCHED is not set - # CONFIG_CGROUPS is not set --CONFIG_SYSFS_DEPRECATED=y --CONFIG_SYSFS_DEPRECATED_V2=y -+# CONFIG_SYSFS_DEPRECATED_V2 is not set - # CONFIG_RELAY is not set - CONFIG_NAMESPACES=y - # CONFIG_UTS_NS is not set -@@ -258,7 +256,6 @@ - # CONFIG_SLUB is not set - # CONFIG_SLOB is not set - CONFIG_PROFILING=y --CONFIG_TRACEPOINTS=y - CONFIG_OPROFILE=m - CONFIG_HAVE_OPROFILE=y - CONFIG_HAVE_SYSCALL_WRAPPERS=y -@@ -266,7 +263,6 @@ - # - # GCOV-based kernel profiling - # --# CONFIG_GCOV_KERNEL is not set - CONFIG_SLOW_WORK=y - CONFIG_HAVE_GENERIC_DMA_COHERENT=y - CONFIG_SLABINFO=y -@@ -287,14 +283,41 @@ - # IO Schedulers - # - CONFIG_IOSCHED_NOOP=y --CONFIG_IOSCHED_AS=y - CONFIG_IOSCHED_DEADLINE=y - CONFIG_IOSCHED_CFQ=y --# CONFIG_DEFAULT_AS is not set - # CONFIG_DEFAULT_DEADLINE is not set - CONFIG_DEFAULT_CFQ=y - # CONFIG_DEFAULT_NOOP is not set - CONFIG_DEFAULT_IOSCHED="cfq" -+# CONFIG_INLINE_SPIN_TRYLOCK is not set -+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set -+# CONFIG_INLINE_SPIN_LOCK is not set -+# CONFIG_INLINE_SPIN_LOCK_BH is not set -+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set -+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set -+CONFIG_INLINE_SPIN_UNLOCK=y -+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set -+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y -+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set -+# CONFIG_INLINE_READ_TRYLOCK is not set -+# CONFIG_INLINE_READ_LOCK is not set -+# CONFIG_INLINE_READ_LOCK_BH is not set -+# CONFIG_INLINE_READ_LOCK_IRQ is not set -+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set -+CONFIG_INLINE_READ_UNLOCK=y -+# CONFIG_INLINE_READ_UNLOCK_BH is not set -+CONFIG_INLINE_READ_UNLOCK_IRQ=y -+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set -+# CONFIG_INLINE_WRITE_TRYLOCK is not set -+# CONFIG_INLINE_WRITE_LOCK is not set -+# CONFIG_INLINE_WRITE_LOCK_BH is not set -+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set -+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set -+CONFIG_INLINE_WRITE_UNLOCK=y -+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set -+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y -+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set -+# CONFIG_MUTEX_SPIN_ON_OWNER is not set - CONFIG_FREEZER=y - - # -@@ -304,7 +327,6 @@ - CONFIG_PCI=y - CONFIG_PCI_DOMAINS=y - # CONFIG_ARCH_SUPPORTS_MSI is not set --CONFIG_PCI_LEGACY=y - # CONFIG_PCI_STUB is not set - # CONFIG_PCI_IOV is not set - CONFIG_ISA=y -@@ -339,14 +361,13 @@ - CONFIG_HIBERNATION=y - CONFIG_PM_STD_PARTITION="/dev/hda3" - # CONFIG_PM_RUNTIME is not set -+CONFIG_PM_OPS=y - CONFIG_NET=y --CONFIG_COMPAT_NETLINK_MESSAGES=y - - # - # Networking options - # - CONFIG_PACKET=y --CONFIG_PACKET_MMAP=y - CONFIG_UNIX=y - CONFIG_XFRM=y - # CONFIG_XFRM_USER is not set -@@ -483,7 +504,6 @@ - # Network testing - # - # CONFIG_NET_PKTGEN is not set --# CONFIG_NET_DROP_MONITOR is not set - # CONFIG_HAMRADIO is not set - # CONFIG_CAN is not set - # CONFIG_IRDA is not set -@@ -491,10 +511,6 @@ - # CONFIG_AF_RXRPC is not set - CONFIG_WIRELESS=y - # CONFIG_CFG80211 is not set --CONFIG_CFG80211_DEFAULT_PS_VALUE=0 --CONFIG_WIRELESS_OLD_REGULATORY=y --CONFIG_WIRELESS_EXT=y --CONFIG_WIRELESS_EXT_SYSFS=y - # CONFIG_LIB80211 is not set - - # -@@ -617,6 +633,10 @@ - # CONFIG_BLK_DEV_COW_COMMON is not set - CONFIG_BLK_DEV_LOOP=y - CONFIG_BLK_DEV_CRYPTOLOOP=m -+ -+# -+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected -+# - # CONFIG_BLK_DEV_NBD is not set - # CONFIG_BLK_DEV_SX8 is not set - # CONFIG_BLK_DEV_UB is not set -@@ -707,6 +727,7 @@ - # - # SCSI device support - # -+CONFIG_SCSI_MOD=y - # CONFIG_RAID_ATTRS is not set - CONFIG_SCSI=y - CONFIG_SCSI_DMA=y -@@ -755,7 +776,7 @@ - # - - # --# See the help texts for more information. -+# The newer stack is recommended. - # - # CONFIG_FIREWIRE is not set - # CONFIG_IEEE1394 is not set -@@ -764,6 +785,7 @@ - # CONFIG_DUMMY is not set - # CONFIG_BONDING is not set - CONFIG_MACVLAN=m -+# CONFIG_MACVTAP is not set - # CONFIG_EQUALIZER is not set - # CONFIG_TUN is not set - CONFIG_VETH=m -@@ -798,6 +820,7 @@ - # CONFIG_SMC91X is not set - # CONFIG_DM9000 is not set - # CONFIG_ETHOC is not set -+# CONFIG_SMSC911X is not set - # CONFIG_NET_VENDOR_RACAL is not set - # CONFIG_DNET is not set - # CONFIG_NET_TULIP is not set -@@ -817,6 +840,7 @@ - # CONFIG_AMD8111_ETH is not set - # CONFIG_ADAPTEC_STARFIRE is not set - # CONFIG_AC3200 is not set -+# CONFIG_KSZ884X_PCI is not set - # CONFIG_APRICOT is not set - # CONFIG_B44 is not set - # CONFIG_FORCEDETH is not set -@@ -871,6 +895,8 @@ - # CONFIG_CHELSIO_T1 is not set - CONFIG_CHELSIO_T3_DEPENDS=y - # CONFIG_CHELSIO_T3 is not set -+CONFIG_CHELSIO_T4_DEPENDS=y -+# CONFIG_CHELSIO_T4 is not set - # CONFIG_ENIC is not set - # CONFIG_IXGBE is not set - # CONFIG_IXGB is not set -@@ -883,13 +909,16 @@ - # CONFIG_MLX4_CORE is not set - # CONFIG_TEHUTI is not set - # CONFIG_BNX2X is not set -+# CONFIG_QLCNIC is not set - # CONFIG_QLGE is not set - # CONFIG_SFC is not set - # CONFIG_BE2NET is not set - # CONFIG_TR is not set - CONFIG_WLAN=y --# CONFIG_WLAN_PRE80211 is not set --# CONFIG_WLAN_80211 is not set -+# CONFIG_ATMEL is not set -+# CONFIG_PRISM54 is not set -+# CONFIG_USB_ZD1201 is not set -+# CONFIG_HOSTAP is not set - - # - # Enable WiMAX (Networking options) to see the WiMAX drivers -@@ -904,6 +933,7 @@ - # CONFIG_USB_RTL8150 is not set - # CONFIG_USB_USBNET is not set - # CONFIG_USB_CDC_PHONET is not set -+# CONFIG_USB_IPHETH is not set - # CONFIG_WAN is not set - # CONFIG_FDDI is not set - # CONFIG_HIPPI is not set -@@ -926,6 +956,7 @@ - # CONFIG_NETCONSOLE is not set - # CONFIG_NETPOLL is not set - # CONFIG_NET_POLL_CONTROLLER is not set -+# CONFIG_VMXNET3 is not set - # CONFIG_ISDN is not set - # CONFIG_PHONE is not set - -@@ -935,6 +966,7 @@ - CONFIG_INPUT=y - CONFIG_INPUT_FF_MEMLESS=y - # CONFIG_INPUT_POLLDEV is not set -+# CONFIG_INPUT_SPARSEKMAP is not set - - # - # Userland interfaces -@@ -992,6 +1024,7 @@ - # CONFIG_SERIO_PCIPS2 is not set - CONFIG_SERIO_LIBPS2=y - # CONFIG_SERIO_RAW is not set -+# CONFIG_SERIO_ALTERA_PS2 is not set - # CONFIG_GAMEPORT is not set - - # -@@ -1022,6 +1055,7 @@ - CONFIG_SERIAL_CORE=y - CONFIG_SERIAL_CORE_CONSOLE=y - # CONFIG_SERIAL_JSM is not set -+# CONFIG_SERIAL_TIMBERDALE is not set - CONFIG_UNIX98_PTYS=y - # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set - CONFIG_LEGACY_PTYS=y -@@ -1069,6 +1103,7 @@ - # - # CONFIG_I2C_OCORES is not set - # CONFIG_I2C_SIMTEC is not set -+# CONFIG_I2C_XILINX is not set - - # - # External I2C/SMBus adapter drivers -@@ -1078,27 +1113,15 @@ - # CONFIG_I2C_TINY_USB is not set - - # --# Graphics adapter I2C/DDC channel drivers --# --# CONFIG_I2C_VOODOO3 is not set -- --# - # Other I2C/SMBus bus drivers - # - # CONFIG_I2C_ELEKTOR is not set - # CONFIG_I2C_PCA_ISA is not set - # CONFIG_I2C_PCA_PLATFORM is not set - # CONFIG_I2C_STUB is not set -- --# --# Miscellaneous I2C Chip support --# --# CONFIG_DS1682 is not set --# 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 is not set - - # -@@ -1125,10 +1148,9 @@ - # CONFIG_HTC_PASIC3 is not set - # CONFIG_MFD_TMIO is not set - # CONFIG_MFD_WM8400 is not set --# CONFIG_MFD_WM831X is not set --# CONFIG_MFD_WM8350_I2C is not set -+# CONFIG_MFD_WM8994 is not set - # CONFIG_MFD_PCF50633 is not set --# CONFIG_AB3100_CORE is not set -+# CONFIG_LPC_SCH is not set - # CONFIG_REGULATOR is not set - # CONFIG_MEDIA_SUPPORT is not set - -@@ -1136,6 +1158,7 @@ - # Graphics support - # - CONFIG_VGA_ARB=y -+CONFIG_VGA_ARB_MAX_GPUS=16 - # CONFIG_DRM is not set - # CONFIG_VGASTATE is not set - CONFIG_VIDEO_OUTPUT_CONTROL=m -@@ -1271,6 +1294,7 @@ - # CONFIG_SND_OXYGEN is not set - # CONFIG_SND_CS4281 is not set - # CONFIG_SND_CS46XX is not set -+# CONFIG_SND_CS5535AUDIO is not set - # CONFIG_SND_CTXFI is not set - # CONFIG_SND_DARLA20 is not set - # CONFIG_SND_GINA20 is not set -@@ -1321,6 +1345,7 @@ - CONFIG_SND_MIPS=y - CONFIG_SND_USB=y - # CONFIG_SND_USB_AUDIO is not set -+# CONFIG_SND_USB_UA101 is not set - # CONFIG_SND_USB_CAIAQ is not set - # CONFIG_SND_SOC is not set - # CONFIG_SOUND_PRIME is not set -@@ -1358,7 +1383,6 @@ - CONFIG_USB_DEVICEFS=y - # CONFIG_USB_DEVICE_CLASS is not set - # CONFIG_USB_DYNAMIC_MINORS is not set --# CONFIG_USB_SUSPEND is not set - # CONFIG_USB_OTG is not set - CONFIG_USB_OTG_WHITELIST=y - # CONFIG_USB_OTG_BLACKLIST_HUB is not set -@@ -1440,7 +1464,6 @@ - # 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 -@@ -1453,7 +1476,6 @@ - # CONFIG_USB_IOWARRIOR is not set - # CONFIG_USB_TEST is not set - CONFIG_USB_ISIGHTFW=m --CONFIG_USB_VST=m - # CONFIG_USB_GADGET is not set - - # -@@ -1473,15 +1495,16 @@ - CONFIG_UIO_CIF=m - # CONFIG_UIO_PDRV is not set - # CONFIG_UIO_PDRV_GENIRQ is not set --# CONFIG_UIO_SMX is not set - # CONFIG_UIO_AEC is not set - # CONFIG_UIO_SERCOS3 is not set - # CONFIG_UIO_PCI_GENERIC is not set -+# CONFIG_UIO_NETX is not set - - # - # TI VLYNQ - # - # CONFIG_STAGING is not set -+CONFIG_MIPS_PLATFORM_DEVICES=y - - # - # File systems -@@ -1499,9 +1522,7 @@ - # CONFIG_EXT4_DEBUG is not set - CONFIG_FS_XIP=y - CONFIG_JBD=y --# CONFIG_JBD_DEBUG is not set - CONFIG_JBD2=m --# CONFIG_JBD2_DEBUG is not set - CONFIG_FS_MBCACHE=m - CONFIG_REISERFS_FS=m - # CONFIG_REISERFS_CHECK is not set -@@ -1522,8 +1543,8 @@ - # CONFIG_QUOTA is not set - CONFIG_AUTOFS_FS=y - CONFIG_AUTOFS4_FS=y --CONFIG_FUSE_FS=y --# CONFIG_CUSE is not set -+CONFIG_FUSE_FS=m -+CONFIG_CUSE=m - - # - # Caches -@@ -1572,6 +1593,7 @@ - # CONFIG_BFS_FS is not set - # CONFIG_EFS_FS is not set - # CONFIG_JFFS2_FS is not set -+# CONFIG_LOGFS is not set - # CONFIG_CRAMFS is not set - # CONFIG_SQUASHFS is not set - # CONFIG_VXFS_FS is not set -@@ -1605,6 +1627,7 @@ - CONFIG_SMB_FS=m - CONFIG_SMB_NLS_DEFAULT=y - CONFIG_SMB_NLS_REMOTE="cp936" -+# CONFIG_CEPH_FS is not set - CONFIG_CIFS=m - CONFIG_CIFS_STATS=y - CONFIG_CIFS_STATS2=y -@@ -1692,24 +1715,24 @@ - # CONFIG_MAGIC_SYSRQ is not set - # CONFIG_STRIP_ASM_SYMS is not set - # CONFIG_UNUSED_SYMBOLS is not set --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_HAVE_FUNCTION_TRACER=y -+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y -+CONFIG_HAVE_DYNAMIC_FTRACE=y -+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y - CONFIG_RING_BUFFER=y --CONFIG_EVENT_TRACING=y --CONFIG_CONTEXT_SWITCH_TRACER=y - CONFIG_RING_BUFFER_ALLOW_SWAP=y --CONFIG_TRACING=y - CONFIG_TRACING_SUPPORT=y - # CONFIG_FTRACE is not set --# CONFIG_DYNAMIC_DEBUG is not set - # CONFIG_SAMPLES is not set - CONFIG_HAVE_ARCH_KGDB=y -+# CONFIG_EARLY_PRINTK is not set - # CONFIG_CMDLINE_BOOL is not set - - # -@@ -1718,7 +1741,11 @@ - # CONFIG_KEYS is not set - # CONFIG_SECURITY is not set - # CONFIG_SECURITYFS is not set --CONFIG_SECURITY_FILE_CAPABILITIES=y -+# CONFIG_DEFAULT_SECURITY_SELINUX is not set -+# CONFIG_DEFAULT_SECURITY_SMACK is not set -+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set -+CONFIG_DEFAULT_SECURITY_DAC=y -+CONFIG_DEFAULT_SECURITY="" - CONFIG_CRYPTO=y - - # -@@ -1819,7 +1846,7 @@ - # - CONFIG_CRYPTO_ANSI_CPRNG=m - # CONFIG_CRYPTO_HW is not set --CONFIG_BINARY_PRINTF=y -+# CONFIG_BINARY_PRINTF is not set - - # - # Library routines -diff -Nur linux-2.6.34.orig/arch/mips/configs/lemote2f_defconfig linux-loongson/arch/mips/configs/lemote2f_defconfig ---- linux-2.6.34.orig/arch/mips/configs/lemote2f_defconfig 2010-05-16 23:17:36.000000000 +0200 -+++ linux-loongson/arch/mips/configs/lemote2f_defconfig 2010-05-27 18:12:28.612213391 +0200 -@@ -1,7 +1,7 @@ - # - # Automatically generated make config: don't edit --# Linux kernel version: 2.6.33-rc2 --# Mon Jan 4 13:41:09 2010 -+# Linux kernel version: 2.6.34-rc3 -+# Sun Apr 11 04:31:19 2010 - # - CONFIG_MIPS=y - -@@ -68,7 +68,7 @@ - CONFIG_SCHED_OMIT_FRAME_POINTER=y - CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y - CONFIG_DMA_NONCOHERENT=y --CONFIG_DMA_NEED_PCI_MAP_STATE=y -+CONFIG_NEED_DMA_MAP_STATE=y - CONFIG_SYS_HAS_EARLY_PRINTK=y - CONFIG_I8259=y - # CONFIG_NO_IOPORT is not set -@@ -132,6 +132,7 @@ - CONFIG_MIPS_MT_DISABLED=y - # CONFIG_MIPS_MT_SMP is not set - # CONFIG_MIPS_MT_SMTC is not set -+# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set - CONFIG_CPU_HAS_WB=y - CONFIG_CPU_HAS_SYNC=y - CONFIG_GENERIC_HARDIRQS=y -@@ -188,9 +189,11 @@ - CONFIG_HAVE_KERNEL_GZIP=y - CONFIG_HAVE_KERNEL_BZIP2=y - CONFIG_HAVE_KERNEL_LZMA=y -+CONFIG_HAVE_KERNEL_LZO=y - CONFIG_KERNEL_GZIP=y - # CONFIG_KERNEL_BZIP2 is not set - # CONFIG_KERNEL_LZMA is not set -+# CONFIG_KERNEL_LZO is not set - CONFIG_SWAP=y - CONFIG_SYSVIPC=y - CONFIG_SYSVIPC_SYSCTL=y -@@ -213,10 +216,8 @@ - CONFIG_IKCONFIG=y - CONFIG_IKCONFIG_PROC=y - CONFIG_LOG_BUF_SHIFT=15 --# CONFIG_GROUP_SCHED is not set - # CONFIG_CGROUPS is not set --CONFIG_SYSFS_DEPRECATED=y --CONFIG_SYSFS_DEPRECATED_V2=y -+# CONFIG_SYSFS_DEPRECATED_V2 is not set - # CONFIG_RELAY is not set - # CONFIG_NAMESPACES is not set - CONFIG_BLK_DEV_INITRD=y -@@ -224,6 +225,7 @@ - CONFIG_RD_GZIP=y - CONFIG_RD_BZIP2=y - CONFIG_RD_LZMA=y -+# CONFIG_RD_LZO is not set - # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set - CONFIG_SYSCTL=y - CONFIG_ANON_INODES=y -@@ -250,13 +252,12 @@ - # - CONFIG_VM_EVENT_COUNTERS=y - CONFIG_PCI_QUIRKS=y --CONFIG_SLUB_DEBUG=y -+# CONFIG_SLUB_DEBUG is not set - CONFIG_COMPAT_BRK=y - # CONFIG_SLAB is not set - CONFIG_SLUB=y - # CONFIG_SLOB is not set - CONFIG_PROFILING=y --CONFIG_TRACEPOINTS=y - CONFIG_OPROFILE=m - CONFIG_HAVE_OPROFILE=y - CONFIG_HAVE_SYSCALL_WRAPPERS=y -@@ -264,11 +265,8 @@ - # - # GCOV-based kernel profiling - # --# CONFIG_GCOV_KERNEL is not set - CONFIG_SLOW_WORK=y --# CONFIG_SLOW_WORK_DEBUG is not set - CONFIG_HAVE_GENERIC_DMA_COHERENT=y --CONFIG_SLABINFO=y - CONFIG_RT_MUTEXES=y - CONFIG_BASE_SMALL=0 - CONFIG_MODULES=y -@@ -330,7 +328,6 @@ - CONFIG_PCI=y - CONFIG_PCI_DOMAINS=y - # CONFIG_ARCH_SUPPORTS_MSI is not set --CONFIG_PCI_LEGACY=y - # CONFIG_PCI_STUB is not set - # CONFIG_PCI_IOV is not set - CONFIG_ISA=y -@@ -366,6 +363,7 @@ - CONFIG_HIBERNATION=y - CONFIG_PM_STD_PARTITION="/dev/hda3" - CONFIG_PM_RUNTIME=y -+CONFIG_PM_OPS=y - CONFIG_MIPS_EXTERNAL_TIMER=y - CONFIG_MIPS_CPUFREQ=y - -@@ -393,12 +391,12 @@ - # - CONFIG_LOONGSON2_CPUFREQ=m - CONFIG_NET=y -+CONFIG_COMPAT_NETLINK_MESSAGES=y - - # - # Networking options - # - CONFIG_PACKET=y --CONFIG_PACKET_MMAP=y - CONFIG_UNIX=y - CONFIG_XFRM=y - CONFIG_XFRM_USER=m -@@ -515,6 +513,7 @@ - # CONFIG_ATM is not set - CONFIG_STP=m - CONFIG_BRIDGE=m -+CONFIG_BRIDGE_IGMP_SNOOPING=y - # CONFIG_NET_DSA is not set - CONFIG_VLAN_8021Q=m - # CONFIG_VLAN_8021Q_GVRP is not set -@@ -584,7 +583,6 @@ - # Network testing - # - # CONFIG_NET_PKTGEN is not set --# CONFIG_NET_DROP_MONITOR is not set - # CONFIG_HAMRADIO is not set - # CONFIG_CAN is not set - # CONFIG_IRDA is not set -@@ -609,18 +607,20 @@ - CONFIG_BT_HCIBFUSB=m - CONFIG_BT_HCIVHCI=m - # CONFIG_BT_MRVL is not set -+# CONFIG_BT_ATH3K is not set - # CONFIG_AF_RXRPC is not set - CONFIG_FIB_RULES=y - CONFIG_WIRELESS=y -+CONFIG_WIRELESS_EXT=y - CONFIG_WEXT_CORE=y - CONFIG_WEXT_PROC=y -+CONFIG_WEXT_PRIV=y - CONFIG_CFG80211=m - # CONFIG_NL80211_TESTMODE is not set - # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set - # CONFIG_CFG80211_REG_DEBUG is not set - CONFIG_CFG80211_DEFAULT_PS=y --# CONFIG_CFG80211_DEBUGFS is not set --# CONFIG_WIRELESS_OLD_REGULATORY is not set -+# CONFIG_CFG80211_INTERNAL_REGDB is not set - CONFIG_CFG80211_WEXT=y - CONFIG_WIRELESS_EXT_SYSFS=y - CONFIG_LIB80211=m -@@ -633,7 +633,6 @@ - CONFIG_MAC80211_RC_DEFAULT="minstrel" - # CONFIG_MAC80211_MESH is not set - CONFIG_MAC80211_LEDS=y --# CONFIG_MAC80211_DEBUGFS is not set - # CONFIG_MAC80211_DEBUG_MENU is not set - # CONFIG_WIMAX is not set - CONFIG_RFKILL=m -@@ -668,10 +667,6 @@ - # CONFIG_BLK_DEV_COW_COMMON is not set - CONFIG_BLK_DEV_LOOP=y - CONFIG_BLK_DEV_CRYPTOLOOP=m -- --# --# DRBD disabled because PROC_FS, INET or CONNECTOR not selected --# - # CONFIG_BLK_DEV_DRBD is not set - # CONFIG_BLK_DEV_NBD is not set - # CONFIG_BLK_DEV_SX8 is not set -@@ -758,6 +753,7 @@ - # - # SCSI device support - # -+CONFIG_SCSI_MOD=m - # CONFIG_RAID_ATTRS is not set - CONFIG_SCSI=m - CONFIG_SCSI_DMA=y -@@ -873,6 +869,7 @@ - # CONFIG_AMD8111_ETH is not set - # CONFIG_ADAPTEC_STARFIRE is not set - # CONFIG_AC3200 is not set -+# CONFIG_KSZ884X_PCI is not set - # CONFIG_APRICOT is not set - # CONFIG_B44 is not set - # CONFIG_FORCEDETH is not set -@@ -883,7 +880,7 @@ - # CONFIG_NATSEMI is not set - # CONFIG_NE2K_PCI is not set - # CONFIG_8139CP is not set --CONFIG_8139TOO=y -+CONFIG_8139TOO=m - # CONFIG_8139TOO_PIO is not set - # CONFIG_8139TOO_TUNE_TWISTER is not set - # CONFIG_8139TOO_8129 is not set -@@ -910,7 +907,7 @@ - # CONFIG_NS83820 is not set - # CONFIG_HAMACHI is not set - # CONFIG_YELLOWFIN is not set --CONFIG_R8169=y -+CONFIG_R8169=m - CONFIG_R8169_VLAN=y - # CONFIG_SIS190 is not set - # CONFIG_SKGE is not set -@@ -934,7 +931,7 @@ - # CONFIG_USB_ZD1201 is not set - # CONFIG_USB_NET_RNDIS_WLAN is not set - # CONFIG_RTL8180 is not set --# CONFIG_RTL8187 is not set -+CONFIG_RTL8187B=m - # CONFIG_ADM8211 is not set - # CONFIG_MAC80211_HWSIM is not set - # CONFIG_MWL8K is not set -@@ -969,6 +966,7 @@ - CONFIG_USB_NET_CDCETHER=m - CONFIG_USB_NET_CDC_EEM=m - # CONFIG_USB_NET_DM9601 is not set -+# CONFIG_USB_NET_SMSC75XX is not set - # CONFIG_USB_NET_SMSC95XX is not set - # CONFIG_USB_NET_GL620A is not set - CONFIG_USB_NET_NET1080=m -@@ -1006,24 +1004,24 @@ - CONFIG_INPUT=y - CONFIG_INPUT_FF_MEMLESS=m - CONFIG_INPUT_POLLDEV=m --# CONFIG_INPUT_SPARSEKMAP is not set -+CONFIG_INPUT_SPARSEKMAP=m - - # - # Userland interfaces - # --CONFIG_INPUT_MOUSEDEV=y -+CONFIG_INPUT_MOUSEDEV=m - CONFIG_INPUT_MOUSEDEV_PSAUX=y - CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 - CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 - # CONFIG_INPUT_JOYDEV is not set --CONFIG_INPUT_EVDEV=y -+CONFIG_INPUT_EVDEV=m - # CONFIG_INPUT_EVBUG is not set - - # - # Input Device Drivers - # - CONFIG_INPUT_KEYBOARD=y --CONFIG_KEYBOARD_ATKBD=y -+CONFIG_KEYBOARD_ATKBD=m - # CONFIG_KEYBOARD_LKKBD is not set - # CONFIG_KEYBOARD_NEWTON is not set - # CONFIG_KEYBOARD_OPENCORES is not set -@@ -1031,7 +1029,7 @@ - # CONFIG_KEYBOARD_SUNKBD is not set - # CONFIG_KEYBOARD_XTKBD is not set - CONFIG_INPUT_MOUSE=y --CONFIG_MOUSE_PS2=y -+CONFIG_MOUSE_PS2=m - # CONFIG_MOUSE_PS2_ALPS is not set - # CONFIG_MOUSE_PS2_LOGIPS2PP is not set - CONFIG_MOUSE_PS2_SYNAPTICS=y -@@ -1072,20 +1070,7 @@ - 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_STALDRV is not set -+# CONFIG_SERIAL_NONSTANDARD is not set - # CONFIG_NOZOMI is not set - - # -@@ -1111,6 +1096,7 @@ - # - CONFIG_SERIAL_CORE=m - # CONFIG_SERIAL_JSM is not set -+# CONFIG_SERIAL_TIMBERDALE is not set - CONFIG_UNIX98_PTYS=y - # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set - CONFIG_LEGACY_PTYS=y -@@ -1118,7 +1104,6 @@ - # CONFIG_IPMI_HANDLER is not set - CONFIG_HW_RANDOM=y - # CONFIG_HW_RANDOM_TIMERIOMEM is not set --CONFIG_RTC=y - # CONFIG_DTLK is not set - # CONFIG_R3964 is not set - # CONFIG_APPLICOM is not set -@@ -1133,7 +1118,10 @@ - # - # CONFIG_PPS is not set - # CONFIG_W1 is not set --# CONFIG_POWER_SUPPLY is not set -+CONFIG_POWER_SUPPLY=m -+# CONFIG_POWER_SUPPLY_DEBUG is not set -+# CONFIG_PDA_POWER is not set -+# CONFIG_BATTERY_DS2760 is not set - CONFIG_HWMON=y - # CONFIG_HWMON_VID is not set - # CONFIG_HWMON_DEBUG_CHIP is not set -@@ -1172,6 +1160,7 @@ - # CONFIG_MFD_SM501 is not set - # CONFIG_HTC_PASIC3 is not set - # CONFIG_MFD_TMIO is not set -+# CONFIG_LPC_SCH is not set - # CONFIG_REGULATOR is not set - CONFIG_MEDIA_SUPPORT=m - -@@ -1211,7 +1200,9 @@ - CONFIG_USB_M5602=m - CONFIG_USB_STV06XX=m - # CONFIG_USB_GL860 is not set -+# CONFIG_USB_GSPCA_BENQ is not set - CONFIG_USB_GSPCA_CONEX=m -+# CONFIG_USB_GSPCA_CPIA1 is not set - CONFIG_USB_GSPCA_ETOMS=m - CONFIG_USB_GSPCA_FINEPIX=m - # CONFIG_USB_GSPCA_JEILINJ is not set -@@ -1219,9 +1210,11 @@ - CONFIG_USB_GSPCA_MR97310A=m - CONFIG_USB_GSPCA_OV519=m - CONFIG_USB_GSPCA_OV534=m -+# CONFIG_USB_GSPCA_OV534_9 is not set - CONFIG_USB_GSPCA_PAC207=m - # CONFIG_USB_GSPCA_PAC7302 is not set - CONFIG_USB_GSPCA_PAC7311=m -+# CONFIG_USB_GSPCA_SN9C2028 is not set - CONFIG_USB_GSPCA_SN9C20X=m - CONFIG_USB_GSPCA_SN9C20X_EVDEV=y - CONFIG_USB_GSPCA_SONIXB=m -@@ -1264,6 +1257,7 @@ - # Graphics support - # - CONFIG_VGA_ARB=y -+CONFIG_VGA_ARB_MAX_GPUS=16 - # CONFIG_DRM is not set - # CONFIG_VGASTATE is not set - CONFIG_VIDEO_OUTPUT_CONTROL=y -@@ -1351,10 +1345,7 @@ - CONFIG_FONT_SUN8x16=y - CONFIG_FONT_SUN12x22=y - CONFIG_FONT_10x18=y --CONFIG_LOGO=y --# CONFIG_LOGO_LINUX_MONO is not set --# CONFIG_LOGO_LINUX_VGA16 is not set --CONFIG_LOGO_LINUX_CLUT224=y -+# CONFIG_LOGO is not set - CONFIG_SOUND=m - CONFIG_SOUND_OSS_CORE=y - CONFIG_SOUND_OSS_CORE_PRECLAIM=y -@@ -1372,7 +1363,6 @@ - CONFIG_SND_SEQUENCER_OSS=y - CONFIG_SND_HRTIMER=m - CONFIG_SND_SEQ_HRTIMER_DEFAULT=y --# CONFIG_SND_RTCTIMER is not set - # CONFIG_SND_DYNAMIC_MINORS is not set - CONFIG_SND_SUPPORT_OLD_API=y - CONFIG_SND_VERBOSE_PROCFS=y -@@ -1462,6 +1452,7 @@ - # CONFIG_SND_MIPS is not set - CONFIG_SND_USB=y - CONFIG_SND_USB_AUDIO=m -+# CONFIG_SND_USB_UA101 is not set - CONFIG_SND_USB_CAIAQ=m - CONFIG_SND_USB_CAIAQ_INPUT=y - # CONFIG_SND_SOC is not set -@@ -1481,6 +1472,7 @@ - # - # Special HID drivers - # -+# CONFIG_HID_3M_PCT is not set - CONFIG_HID_A4TECH=m - CONFIG_HID_APPLE=m - CONFIG_HID_BELKIN=m -@@ -1497,14 +1489,20 @@ - CONFIG_HID_LOGITECH=m - CONFIG_LOGITECH_FF=y - CONFIG_LOGIRUMBLEPAD2_FF=y -+# CONFIG_LOGIG940_FF is not set -+# CONFIG_HID_MAGICMOUSE is not set - CONFIG_HID_MICROSOFT=m -+# CONFIG_HID_MOSART is not set - CONFIG_HID_MONTEREY=m - CONFIG_HID_NTRIG=m -+# CONFIG_HID_ORTEK is not set - CONFIG_HID_PANTHERLORD=m - CONFIG_PANTHERLORD_FF=y - CONFIG_HID_PETALYNX=m -+# CONFIG_HID_QUANTA is not set - CONFIG_HID_SAMSUNG=m - CONFIG_HID_SONY=m -+# CONFIG_HID_STANTUM is not set - CONFIG_HID_SUNPLUS=m - CONFIG_HID_GREENASIA=m - CONFIG_GREENASIA_FF=y -@@ -1527,14 +1525,14 @@ - # - # Miscellaneous USB options - # --CONFIG_USB_DEVICEFS=y -+# CONFIG_USB_DEVICEFS is not set - # CONFIG_USB_DEVICE_CLASS is not set - CONFIG_USB_DYNAMIC_MINORS=y - CONFIG_USB_SUSPEND=y - # CONFIG_USB_OTG is not set - CONFIG_USB_OTG_WHITELIST=y - # CONFIG_USB_OTG_BLACKLIST_HUB is not set --CONFIG_USB_MON=y -+CONFIG_USB_MON=m - CONFIG_USB_WUSB=m - # CONFIG_USB_WUSB_CBAF is not set - -@@ -1633,6 +1631,7 @@ - # CONFIG_USB_SERIAL_NAVMAN is not set - # CONFIG_USB_SERIAL_PL2303 is not set - # CONFIG_USB_SERIAL_OTI6858 is not set -+# CONFIG_USB_SERIAL_QCAUX is not set - # CONFIG_USB_SERIAL_QUALCOMM is not set - # CONFIG_USB_SERIAL_SPCP8X5 is not set - # CONFIG_USB_SERIAL_HP4X is not set -@@ -1646,6 +1645,7 @@ - # CONFIG_USB_SERIAL_OPTION is not set - # CONFIG_USB_SERIAL_OMNINET is not set - # CONFIG_USB_SERIAL_OPTICON is not set -+# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set - # CONFIG_USB_SERIAL_DEBUG is not set - - # -@@ -1658,7 +1658,6 @@ - # 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=m - # CONFIG_USB_CYPRESS_CY7C63 is not set - # CONFIG_USB_CYTHERM is not set -@@ -1671,10 +1670,8 @@ - # CONFIG_USB_IOWARRIOR is not set - # CONFIG_USB_TEST is not set - # CONFIG_USB_ISIGHTFW is not set --# CONFIG_USB_VST is not set - CONFIG_USB_GADGET=m - # CONFIG_USB_GADGET_DEBUG_FILES is not set --# CONFIG_USB_GADGET_DEBUG_FS is not set - CONFIG_USB_GADGET_VBUS_DRAW=2 - CONFIG_USB_GADGET_SELECTED=y - # CONFIG_USB_GADGET_AT91 is not set -@@ -1708,6 +1705,7 @@ - # CONFIG_USB_MIDI_GADGET is not set - # CONFIG_USB_G_PRINTER is not set - # CONFIG_USB_CDC_COMPOSITE is not set -+# CONFIG_USB_G_NOKIA is not set - # CONFIG_USB_G_MULTI is not set - - # -@@ -1735,8 +1733,6 @@ - # MMC/SD/SDIO Host Controller Drivers - # - # CONFIG_MMC_SDHCI is not set --# CONFIG_MMC_AT91 is not set --# CONFIG_MMC_ATMELMCI is not set - # CONFIG_MMC_TIFM_SD is not set - # CONFIG_MMC_CB710 is not set - # CONFIG_MMC_VIA_SDMMC is not set -@@ -1747,11 +1743,11 @@ - # - # LED drivers - # -+CONFIG_LEDS_TRIGGERS=y - - # - # LED Triggers - # --CONFIG_LEDS_TRIGGERS=y - # CONFIG_LEDS_TRIGGER_TIMER is not set - # CONFIG_LEDS_TRIGGER_IDE_DISK is not set - # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set -@@ -1763,7 +1759,45 @@ - # - # CONFIG_ACCESSIBILITY is not set - # CONFIG_INFINIBAND is not set --# CONFIG_RTC_CLASS 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 -+ -+# -+# SPI RTC drivers -+# -+ -+# -+# 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_MSM6242 is not set -+# CONFIG_RTC_DRV_BQ4802 is not set -+# CONFIG_RTC_DRV_RP5C01 is not set -+# CONFIG_RTC_DRV_V3020 is not set -+ -+# -+# on-CPU RTC drivers -+# - # CONFIG_DMADEVICES is not set - # CONFIG_AUXDISPLAY is not set - # CONFIG_UIO is not set -@@ -1776,14 +1810,15 @@ - # CONFIG_ET131X is not set - # CONFIG_USB_IP_COMMON is not set - # CONFIG_W35UND is not set -+# CONFIG_PRISM2_USB is not set - # CONFIG_ECHO is not set - # CONFIG_OTUS is not set - # CONFIG_COMEDI is not set - # CONFIG_ASUS_OLED is not set --# CONFIG_ALTERA_PCIE_CHDMA is not set - # CONFIG_R8187SE is not set -+# CONFIG_RTL8192SU is not set -+# CONFIG_RTL8192U is not set - # CONFIG_RTL8192E is not set --# CONFIG_INPUT_MIMIO is not set - # CONFIG_TRANZPORT is not set - - # -@@ -1795,8 +1830,6 @@ - # - # CONFIG_INPUT_GPIO is not set - # CONFIG_POHMELFS is not set --# CONFIG_B3DFG is not set --# CONFIG_PLAN9AUTH is not set - # CONFIG_LINE6_USB is not set - # CONFIG_USB_SERIAL_QUATECH2 is not set - # CONFIG_USB_SERIAL_QUATECH_USB2 is not set -@@ -1815,7 +1848,11 @@ - # CONFIG_STRIP is not set - # CONFIG_WAVELAN is not set - CONFIG_FB_SM7XX=y --# CONFIG_FB_SM7XX_ACCEL is not set -+# CONFIG_DT3155 is not set -+# CONFIG_CRYSTALHD is not set -+CONFIG_MIPS_PLATFORM_DEVICES=y -+CONFIG_LEMOTE_YEELOONG2F=m -+CONFIG_LEMOTE_LYNLOONG2F=m - - # - # File systems -@@ -1834,9 +1871,7 @@ - # CONFIG_EXT4_FS_SECURITY is not set - # CONFIG_EXT4_DEBUG is not set - CONFIG_JBD=y --# CONFIG_JBD_DEBUG is not set - CONFIG_JBD2=y --# CONFIG_JBD2_DEBUG is not set - CONFIG_FS_MBCACHE=y - CONFIG_REISERFS_FS=m - # CONFIG_REISERFS_CHECK is not set -@@ -1874,7 +1909,8 @@ - CONFIG_QUOTACTL=y - CONFIG_AUTOFS_FS=m - CONFIG_AUTOFS4_FS=m --# CONFIG_FUSE_FS is not set -+CONFIG_FUSE_FS=m -+CONFIG_CUSE=m - - # - # Caches -@@ -1929,6 +1965,7 @@ - # CONFIG_BEFS_FS is not set - # CONFIG_BFS_FS is not set - # CONFIG_EFS_FS is not set -+# CONFIG_LOGFS is not set - CONFIG_CRAMFS=m - CONFIG_SQUASHFS=m - CONFIG_SQUASHFS_EMBEDDED=y -@@ -1965,6 +2002,7 @@ - CONFIG_RPCSEC_GSS_KRB5=m - # CONFIG_RPCSEC_GSS_SPKM3 is not set - # CONFIG_SMB_FS is not set -+# CONFIG_CEPH_FS is not set - CONFIG_CIFS=m - # CONFIG_CIFS_STATS is not set - # CONFIG_CIFS_WEAK_PW_HASH is not set -@@ -2028,39 +2066,31 @@ - # Kernel hacking - # - CONFIG_TRACE_IRQFLAGS_SUPPORT=y --CONFIG_PRINTK_TIME=y -+# CONFIG_PRINTK_TIME is not set - CONFIG_ENABLE_WARN_DEPRECATED=y - CONFIG_ENABLE_MUST_CHECK=y - CONFIG_FRAME_WARN=1024 - # CONFIG_MAGIC_SYSRQ is not set - CONFIG_STRIP_ASM_SYMS=y - # CONFIG_UNUSED_SYMBOLS is not set --CONFIG_DEBUG_FS=y -+# CONFIG_DEBUG_FS is not set - # CONFIG_HEADERS_CHECK is not set - # CONFIG_DEBUG_KERNEL is not set --# CONFIG_SLUB_DEBUG_ON is not set --# CONFIG_SLUB_STATS 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_HAVE_FUNCTION_TRACER=y - CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y - CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y - CONFIG_HAVE_DYNAMIC_FTRACE=y - CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y - CONFIG_RING_BUFFER=y --CONFIG_EVENT_TRACING=y --CONFIG_CONTEXT_SWITCH_TRACER=y - CONFIG_RING_BUFFER_ALLOW_SWAP=y --CONFIG_TRACING=y - CONFIG_TRACING_SUPPORT=y - # CONFIG_FTRACE is not set --# CONFIG_DYNAMIC_DEBUG is not set - # CONFIG_SAMPLES is not set - CONFIG_HAVE_ARCH_KGDB=y --CONFIG_EARLY_PRINTK=y -+# CONFIG_EARLY_PRINTK is not set - # CONFIG_CMDLINE_BOOL is not set - - # -@@ -2183,7 +2213,7 @@ - CONFIG_CRYPTO_ANSI_CPRNG=m - CONFIG_CRYPTO_HW=y - # CONFIG_CRYPTO_DEV_HIFN_795X is not set --CONFIG_BINARY_PRINTF=y -+# CONFIG_BINARY_PRINTF is not set - - # - # Library routines -diff -Nur linux-2.6.34.orig/arch/mips/configs/lemote2f_minimal_defconfig linux-loongson/arch/mips/configs/lemote2f_minimal_defconfig ---- linux-2.6.34.orig/arch/mips/configs/lemote2f_minimal_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ linux-loongson/arch/mips/configs/lemote2f_minimal_defconfig 2010-05-27 18:12:28.612213391 +0200 -@@ -0,0 +1,1383 @@ -+# -+# Automatically generated make config: don't edit -+# Linux kernel version: 2.6.34-rc5 -+# Wed Apr 28 01:06:41 2010 -+# -+CONFIG_MIPS=y -+ -+# -+# Machine selection -+# -+# CONFIG_MACH_ALCHEMY is not set -+# CONFIG_AR7 is not set -+# CONFIG_BCM47XX is not set -+# CONFIG_BCM63XX is not set -+# CONFIG_MIPS_COBALT is not set -+# CONFIG_MACH_DECSTATION is not set -+# CONFIG_MACH_JAZZ is not set -+# CONFIG_LASAT is not set -+CONFIG_MACH_LOONGSON=y -+# CONFIG_MIPS_MALTA is not set -+# CONFIG_MIPS_SIM is not set -+# CONFIG_NEC_MARKEINS is not set -+# CONFIG_MACH_VR41XX is not set -+# CONFIG_NXP_STB220 is not set -+# CONFIG_NXP_STB225 is not set -+# CONFIG_PNX8550_JBS is not set -+# CONFIG_PNX8550_STB810 is not set -+# CONFIG_PMC_MSP is not set -+# CONFIG_PMC_YOSEMITE is not set -+# CONFIG_POWERTV is not set -+# CONFIG_SGI_IP22 is not set -+# CONFIG_SGI_IP27 is not set -+# CONFIG_SGI_IP28 is not set -+# CONFIG_SGI_IP32 is not set -+# CONFIG_SIBYTE_CRHINE is not set -+# CONFIG_SIBYTE_CARMEL is not set -+# CONFIG_SIBYTE_CRHONE is not set -+# CONFIG_SIBYTE_RHONE is not set -+# CONFIG_SIBYTE_SWARM is not set -+# CONFIG_SIBYTE_LITTLESUR is not set -+# CONFIG_SIBYTE_SENTOSA is not set -+# CONFIG_SIBYTE_BIGSUR is not set -+# CONFIG_SNI_RM is not set -+# CONFIG_MACH_TX39XX is not set -+# CONFIG_MACH_TX49XX is not set -+# CONFIG_MIKROTIK_RB532 is not set -+# CONFIG_WR_PPMC is not set -+# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set -+# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set -+# CONFIG_ALCHEMY_GPIO_INDIRECT is not set -+CONFIG_ARCH_SPARSEMEM_ENABLE=y -+# CONFIG_LEMOTE_FULOONG2E is not set -+CONFIG_LEMOTE_MACH2F=y -+CONFIG_CS5536=y -+# CONFIG_CS5536_MFGPT is not set -+CONFIG_LOONGSON_UART_BASE=y -+CONFIG_RWSEM_GENERIC_SPINLOCK=y -+# CONFIG_ARCH_HAS_ILOG2_U32 is not set -+# CONFIG_ARCH_HAS_ILOG2_U64 is not set -+CONFIG_ARCH_SUPPORTS_OPROFILE=y -+CONFIG