diff options
42 files changed, 19402 insertions, 7994 deletions
@@ -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/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/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/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 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: 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 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 = <EXPORT>; 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 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/ 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 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/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 <wuzj@lemote.com> -+ * Author: Wu Zhangjin <wuzhangjin@gmail.com> - */ - - 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_KE |