diff options
399 files changed, 12379 insertions, 2249 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index dc59ea204c..23ddce0fde 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -74,7 +74,7 @@ Person: Holger Hans Peter Freyther Mail: zecke@selfish.org Website: http://www.openembedded.org/~zecke Interests: icecream, insanity, QA -Recipes: qtopia*, sqlite3, xine +Recipes: qtopia*, qt*, qmake*, sqlite3, xine Person: Jamie Lenehan Mail: lenehan@twibble.org diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 8e4fba9400..991e472b14 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -174,6 +174,8 @@ autotools_stage_all() { fi if [ -d ${STAGE_TEMP}/${libdir} ] then + find ${STAGE_TEMP}/${libdir} -name '*.la' -exec sed -i s,installed=yes,installed=no, {} \; + for i in ${STAGE_TEMP}/${libdir}/*.la do if [ ! -f "$i" ]; then diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index 4e425a76d6..5ce9ff6f0d 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -20,6 +20,8 @@ def get_binconfig_mangle(d): s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'" s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'" s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'" + if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d): + s += bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d) return s BINCONFIG_GLOB ?= "*-config" diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 473fe6ebbf..840ebf6eff 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -8,28 +8,25 @@ # -Check the RUNTIME path for the $TMPDIR # -Check if .la files wrongly point to workdir # -Check if .pc files wrongly point to workdir -# -Check if packages contains .debug directories or .so files where they should be in -dev or -dbg +# -Check if packages contains .debug directories or .so files +# where they should be in -dev or -dbg # -Check if config.log contains traces to broken autoconf tests -# # # We need to have the scanelf utility as soon as -# possible and this is contained within the pax-utils-native +# possible and this is contained within the pax-utils-native. +# The package.bbclass can help us here. # - - -# We play a special package function inherit package PACKAGE_DEPENDS += "pax-utils-native desktop-file-utils-native" -#PACKAGE_DEPENDS += chrpath-native" PACKAGEFUNCS += " do_package_qa " # # dictionary for elf headers # -# feel free to add and correct. +# feel free to add and correct. # # TARGET_OS TARGET_ARCH MACHINE, OSABI, ABIVERSION, Little Endian, 32bit? def package_qa_get_machine_dict(): @@ -75,7 +72,7 @@ def package_qa_get_machine_dict(): "arm" : (40, 0, 0, True, True), "armeb" : (40, 0, 0, False, True), }, - + } # factory for a class, embedded in a method @@ -102,11 +99,10 @@ def package_qa_get_elf(path, bits32): ELFDATA2LSB = 1 ELFDATA2MSB = 2 - def my_assert(expectation, result): + def my_assert(self, expectation, result): if not expectation == result: - #print "'%x','%x'" % (ord(expectation), ord(result)) + #print "'%x','%x' %s" % (ord(expectation), ord(result), self.name) raise Exception("This does not work as expected") - my_assert = staticmethod(my_assert) def __init__(self, name): self.name = name @@ -115,16 +111,16 @@ def package_qa_get_elf(path, bits32): self.file = file(self.name, "r") self.data = self.file.read(ELFFile.EI_NIDENT+4) - ELFFile.my_assert(len(self.data), ELFFile.EI_NIDENT+4) - ELFFile.my_assert(self.data[0], chr(0x7f) ) - ELFFile.my_assert(self.data[1], 'E') - ELFFile.my_assert(self.data[2], 'L') - ELFFile.my_assert(self.data[3], 'F') + self.my_assert(len(self.data), ELFFile.EI_NIDENT+4) + self.my_assert(self.data[0], chr(0x7f) ) + self.my_assert(self.data[1], 'E') + self.my_assert(self.data[2], 'L') + self.my_assert(self.data[3], 'F') if bits32 : - ELFFile.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32)) # only 32 bits + self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS32)) else: - ELFFile.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64)) # only 64 bits - ELFFile.my_assert(self.data[ELFFile.EI_VERSION], chr(ELFFile.EV_CURRENT) ) + self.my_assert(self.data[ELFFile.EI_CLASS], chr(ELFFile.ELFCLASS64)) + self.my_assert(self.data[ELFFile.EI_VERSION], chr(ELFFile.EV_CURRENT) ) self.sex = self.data[ELFFile.EI_DATA] if self.sex == chr(ELFFile.ELFDATANONE): @@ -160,20 +156,19 @@ def package_qa_get_elf(path, bits32): return ELFFile(path) -# -# # Known Error classes # 0 - non dev contains .so # 1 - package contains a dangerous RPATH # 2 - package depends on debug package # 3 - non dbg contains .so # 4 - wrong architecture -# 5 - .la contains installed=yes or reference to the workdir +# 5 - .la contains installed=yes # 6 - .pc contains reference to /usr/include or workdir -# -# +# 7 - the desktop file is not valid +# 8 - .la contains reference to the workdir def package_qa_clean_path(path,d): + """ Remove the common prefix from the path. In this case it is the TMPDIR""" import bb return path.replace(bb.data.getVar('TMPDIR',d,True),"") @@ -183,14 +178,15 @@ def package_qa_make_fatal_error(error_class, name, path,d): TODO: Load a whitelist of known errors """ - if error_class == 0: - return False - else: - return True + return not error_class in [0, 5, 7, 8] def package_qa_write_error(error_class, name, path, d): + """ + Log the error + """ import bb, os if not bb.data.getVar('QA_LOG', d): + bb.note("a QA error occured but will not be logged because QA_LOG is not set") return ERROR_NAMES =[ @@ -201,44 +197,45 @@ def package_qa_write_error(error_class, name, path, d): "wrong architecture", "evil hides inside the .la", "evil hides inside the .pc", + "the desktop file is not valid", + ".la contains reference to the workdir", ] - log_path = os.path.join( bb.data.getVar('T', d, True), "log.qa_package" ) f = file( log_path, "a+") - print >> f, "%s, %s, %s" % (ERROR_NAMES[error_class], name, package_qa_clean_path(path,d)) + print >> f, "%s, %s, %s" % \ + (ERROR_NAMES[error_class], name, package_qa_clean_path(path,d)) f.close() +def package_qa_handle_error(error_class, error_msg, name, path, d): + import bb + bb.error("QA Issue: %s" % error_msg) + package_qa_write_error(error_class, name, path, d) + return not package_qa_make_fatal_error(error_class, name, path, d) def package_qa_check_rpath(file,name,d): """ Check for dangerous RPATHs """ import bb, os + sane = True scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'scanelf') - #chrpath = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'chrpath') bad_dir = bb.data.getVar('TMPDIR', d, True) + "/work" bad_dir_test = bb.data.getVar('TMPDIR', d, True) if not os.path.exists(scanelf): bb.fatal("Can not check RPATH, scanelf (part of pax-utils-native) not found") - #if not os.path.exists(chrpath): - # bb.fatal("Can not fix RPATH, chrpath (part of chrpath-native) not found") + if not bad_dir in bb.data.getVar('WORKDIR', d, True): bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check") - #bb.note("%s -B -F%%r#F %s" % (scanelf,file)) output = os.popen("%s -B -F%%r#F '%s'" % (scanelf,file)) txt = output.readline().split() - #bb.note("???%s???" % bad_dir_test) for line in txt: - #bb.note("===%s===" % line) if bad_dir in line: - package_qa_write_error( 1, name, file, d) - bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, line, file)) - #bb.note("Fixing RPATH for you in %s" % file) - #os.popen("%s -r /lib %s" % (chrpath,file)) - #return False - return True + error_msg = "package %s contains bad RPATH %s in file %s" % (name, line, file) + sane = package_qa_handle_error(1, error_msg, name, file, d) + + return sane def package_qa_check_devdbg(path, name,d): """ @@ -251,17 +248,15 @@ def package_qa_check_devdbg(path, name,d): if not "-dev" in name: if path[-3:] == ".so" and os.path.islink(path): - package_qa_write_error( 0, name, path, d ) - bb.error("QA Issue: non -dev package contains symlink .so: %s path '%s'" % (name, package_qa_clean_path(path,d))) - if package_qa_make_fatal_error( 0, name, path, d ): - sane = False + error_msg = "non -dev package contains symlink .so: %s path '%s'" % \ + (name, package_qa_clean_path(path,d)) + sane = package_qa_handle_error(0, error_msg, name, path, d) if not "-dbg" in name: if '.debug' in path: - package_qa_write_error( 3, name, path, d ) - bb.error("QA Issue: non debug package contains .debug directory: %s path %s" % (name, package_qa_clean_path(path,d))) - if package_qa_make_fatal_error( 3, name, path, d ): - sane = False + error_msg = "non debug package contains .debug directory: %s path %s" % \ + (name, package_qa_clean_path(path,d)) + sane = package_qa_handle_error(3, error_msg, name, path, d) return sane @@ -277,9 +272,10 @@ def package_qa_check_arch(path,name,d): Check if archs are compatible """ import bb, os + sane = True target_os = bb.data.getVar('TARGET_OS', d, True) target_arch = bb.data.getVar('TARGET_ARCH', d, True) - + # FIXME: Cross package confuse this check, so just skip them if bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d): return True @@ -290,29 +286,24 @@ def package_qa_check_arch(path,name,d): return True #if this will throw an exception, then fix the dict above - (machine, osabi, abiversion, littleendian, bits32) = package_qa_get_machine_dict()[target_os][target_arch] + (machine, osabi, abiversion, littleendian, bits32) \ + = package_qa_get_machine_dict()[target_os][target_arch] elf = package_qa_get_elf(path, bits32) try: elf.open() except: - # just for debbugging to check the parser, remove once convinced... return True + # Check the architecture and endiannes of the binary if not machine == elf.machine(): - bb.error("Architecture did not match (%d to %d) on %s" %(machine, elf.machine(), package_qa_clean_path(path,d))) - return not package_qa_make_fatal_error( 4, name, path, d ) + error_msg = "Architecture did not match (%d to %d) on %s" % \ + (machine, elf.machine(), package_qa_clean_path(path,d)) + sane = package_qa_handle_error(4, error_msg, name, path, d) elif not littleendian == elf.isLittleEndian(): - bb.error("Endiannes did not match (%d to %d) on %s" % (littleendian, elf.isLittleEndian(), package_qa_clean_path(path,d))) - return not package_qa_make_fatal_error( 4, name, path, d ) - - return True + error_msg = "Endiannes did not match (%d to %d) on %s" % \ + (littleendian, elf.isLittleEndian(), package_qa_clean_path(path,d)) + sane = package_qa_handle_error(4, error_msg, name, path, d) -def package_qa_check_pcla(path,name,d): - """ - .pc and .la files should not point to the WORKDIR - """ - sane = True - # TODO return sane def package_qa_check_desktop(path, name, d): @@ -320,13 +311,15 @@ def package_qa_check_desktop(path, name, d): Run all desktop files through desktop-file-validate. """ import bb, os + sane = True if path.endswith(".desktop"): - validate = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True), 'desktop-file-validate') + validate = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True), \ + 'desktop-file-validate') output = os.popen("%s %s" % (validate, path)) - # This only produces output on errors for l in output: - bb.error(l.strip()) - return True + sane = package_qa_handle_error(7, l.strip(), name, path, d) + + return sane def package_qa_check_staged(path,d): """ @@ -355,16 +348,17 @@ def package_qa_check_staged(path,d): path = os.path.join(root,file) if file[-2:] == "la": file_content = open(path).read() - if installed in file_content or workdir in file_content: - bb.error("QA issue: %s failed sanity test (reference to workdir or installed)" % file ) - if package_qa_make_fatal_error( 5, "staging", path, d): - sane = True + if installed in file_content: + error_msg = "%s failed sanity test (installed) in path %s" % (file,root) + sane = package_qa_handle_error(5, error_msg, "staging", path, d) + if workdir in file_content: + error_msg = "%s failed sanity test (workdir) in path %s" % (file,root) + sane = package_qa_handle_error(8, error_msg, "staging", path, d) elif file[-2:] == "pc": file_content = open(path).read() if workdir in file_content: - bb.error("QA issue: %s failed sanity test (reference to workdir)" % file ) - if package_qa_make_fatal_error( 6, "staging", path, d): - sane = False + error_msg = "%s failed sanity test (workdir) in path %s" % (file,root) + sane = package_qa_handle_error(6, error_msg, "staging", path, d) return sane @@ -382,7 +376,6 @@ def package_qa_walk(path, funcs, package,d): return sane - def package_qa_check_rdepends(pkg, workdir, d): import bb sane = True @@ -414,10 +407,8 @@ def package_qa_check_rdepends(pkg, workdir, d): # Now do the sanity check!!! for rdepend in rdepends: if "-dbg" in rdepend: - package_qa_write_error( 2, pkgname, rdepend, d ) - bb.error("QA issue: %s rdepends on %s" % (pkgname,rdepend)) - if package_qa_make_fatal_error( 2, pkgname, rdepend, d ): - sane = False + error_msg = "%s rdepends on %s" % (pkgname,rdepend) + sane = package_qa_handle_error(2, error_msg, pkgname, rdepend, d) return sane @@ -431,6 +422,9 @@ python do_package_qa () { if not packages: return + checks = [package_qa_check_rpath, package_qa_check_devdbg, + package_qa_check_perm, package_qa_check_arch, + package_qa_check_desktop] walk_sane = True rdepends_sane = True for package in packages.split(): @@ -440,7 +434,7 @@ python do_package_qa () { bb.note("Checking Package: %s" % package) path = "%s/install/%s" % (workdir, package) - if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch, package_qa_check_desktop], package, d): + if not package_qa_walk(path, checks, package, d): walk_sane = False if not package_qa_check_rdepends(package, workdir, d): rdepends_sane = False @@ -466,7 +460,11 @@ python do_qa_configure() { bb.note("Checking sanity of the config.log file") import os for root, dirs, files in os.walk(bb.data.getVar('WORKDIR', d, True)): + statement = "grep 'CROSS COMPILE Badness:' %s > /dev/null" % \ + os.path.join(root,"config.log") if "config.log" in files: - if os.system("grep 'CROSS COMPILE Badness:' %s > /dev/null" % (os.path.join(root,"config.log"))) == 0: - bb.fatal("This autoconf log indicates errors, it looked at host includes. Rerun configure task after fixing this. Path was '%s'" % root) + if os.system(statement) == 0: + bb.fatal("This autoconf log indicates errors, it looked at \ + host includes. Rerun configure task after fixing this. \ + Path was '%s'" % root) } diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index d0f59d2cd4..cf3419f824 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -5,8 +5,7 @@ inherit qmake_base DEPENDS_prepend = "qmake2-native uicmoc4-native " -export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" -export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" +export QMAKESPEC = "${CROSS_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4" @@ -14,7 +13,7 @@ export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4" export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2" export OE_QMAKE_LINK = "${CXX}" export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" -export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qt4" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass index 86bc7afc2f..fd8939a23f 100644 --- a/classes/qtopia4core.bbclass +++ b/classes/qtopia4core.bbclass @@ -4,8 +4,9 @@ inherit qmake2 # # override variables set by qmake-base to compile QtopiaCore apps # -export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore4" -export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore4/" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopia" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopia" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "" -EXTRA_QMAKEVARS_POST += "LIBS+=-lQtNetwork " +export OE_QMAKE_EXTRA_MODULES = "network" +EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=E " diff --git a/classes/xilinx-bsp.bbclass b/classes/xilinx-bsp.bbclass index fd09946061..f657e5be94 100644 --- a/classes/xilinx-bsp.bbclass +++ b/classes/xilinx-bsp.bbclass @@ -34,7 +34,7 @@ fi case "${XILINX_BOARD}" in ML403) oenote "ML403 board setup" - cp -a ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \ + cp -pPR ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \ ${S}/arch/ppc/platforms/4xx/xparameters/xparameters_ml403.h ;; diff --git a/conf/checksums.ini b/conf/checksums.ini index 76eacce219..5c6109ba17 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9446,13 +9446,17 @@ sha256=c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b md5=8012acea71b35c18247bd92c4721589d sha256=abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +[ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.3.tar.gz] +md5=19678fe35170559cd6a6fa531c57799c +sha256=89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570 + [ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.0.tar.gz] md5=9519eccf0638c9962f73a7b20da77e0e sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883 -[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz] -md5=70b729dd5dd8b2b432d685918e1971f1 -sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963 +[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.3.tar.gz] +md5=f7022c57ec4cf4f1d5f5c8b8a70a9e5f +sha256=2ed9f5006ac9f63db08bce409a3626141d5f6e8d562e25df5bd97cebc65ec10d [http://keepcool.kf.tu-berlin.de/public/mitarbeiter/sadowski/qtopia-squeak-3.4-2_patched.tar.gz] md5=0e2bab65b62784d8714057624373f70d diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index f36ae8c6fe..380c882c2c 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -6,8 +6,12 @@ #@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille.de> #@-------------------------------------------------------------------- -# The release will the 2007.12 -DISTRO_VERSION = "2007.11RC2.1" +# If you want to use the angstrom 2007.12 release or if +# you want to base you distro on angstrom 2007, switch to +# the org.openembedded.angstrom-2007.12-stable branch +# THIS FILE WILL GO AWAY IN JANUARY 2008!! + +DISTRO_VERSION = "2007.11RC3" DISTRO_REVISION = "51" require conf/distro/include/sane-srcdates.inc diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 85b2916a44..3794a66edb 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -53,7 +53,7 @@ MACHINE_KERNEL_VERSION = "2.6" PCMCIA_MANAGER = "pcmciautils" #Preferred version for the kernel on various machines -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh19" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against PREFERRED_VERSION_linux-libc-headers = "2.6.23" diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index 1b6ed46ac7..97fed90f21 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -174,7 +174,7 @@ PREFERRED_VERSION_classpath-minimal ?= "0.95" PREFERRED_VERSION_classpath-minimal-native ?= "0.95" PREFERRED_VERSION_clearsilver ?= "0.10.3" PREFERRED_VERSION_clish ?= "0.7.1" -PREFERRED_VERSION_cmake-native ?= "2.2.3" +PREFERRED_VERSION_cmake-native ?= "2.4.7" PREFERRED_VERSION_cms92init ?= "0.1" PREFERRED_VERSION_compositeproto ?= "0.4" PREFERRED_VERSION_comprec ?= "0.02" @@ -422,7 +422,7 @@ PREFERRED_VERSION_galago-daemon ?= "0.3.4" PREFERRED_VERSION_galculator ?= "1.2.3" PREFERRED_VERSION_gallery ?= "1.5.5" PREFERRED_VERSION_gamin ?= "0.1.8" -PREFERRED_VERSION_gammu ?= "1.13.0" +PREFERRED_VERSION_gammu ?= "1.17.0" PREFERRED_VERSION_gawk ?= "3.1.4" PREFERRED_VERSION_gawk-native ?= "3.1.4" PREFERRED_VERSION_gcalctool ?= "5.7.32" @@ -709,11 +709,6 @@ PREFERRED_VERSION_imlib ?= "1.9.15" PREFERRED_VERSION_imlib2 ?= "1.4.0.002" PREFERRED_VERSION_imposter ?= "0.3" PREFERRED_VERSION_inetutils ?= "1.4.2" -PREFERRED_VERSION_initramfs-jffs2 ?= "0.1" -PREFERRED_VERSION_initramfs-module-block ?= "0.1" -PREFERRED_VERSION_initramfs-module-loop ?= "0.1" -PREFERRED_VERSION_initramfs-module-nfs ?= "0.1" -PREFERRED_VERSION_initramfs-uniboot ?= "0.2" PREFERRED_VERSION_initscripts ?= "1.0" PREFERRED_VERSION_initscripts-openprotium ?= "1.0" PREFERRED_VERSION_initscripts-slugos ?= "1.0" @@ -1169,7 +1164,6 @@ PREFERRED_VERSION_m4-native ?= "1.4.8" PREFERRED_VERSION_macchanger ?= "1.5.0" PREFERRED_VERSION_madfu ?= "1.2" PREFERRED_VERSION_madplay ?= "0.15.2b" -PREFERRED_VERSION_madwifi-ng ?= "r2518-20070626" PREFERRED_VERSION_mahjongg ?= "1.0.0" PREFERRED_VERSION_mailutils ?= "0.3.1" PREFERRED_VERSION_mailx ?= "8.1.2-0.20050715cvs" @@ -1502,7 +1496,7 @@ PREFERRED_VERSION_python-dbus ?= "0.81.1" PREFERRED_VERSION_python-fam ?= "1.1.1" PREFERRED_VERSION_python-fnorb ?= "1.3" PREFERRED_VERSION_python-fpconst ?= "0.6.0" -PREFERRED_VERSION_python-gammu ?= "0.21" +PREFERRED_VERSION_python-gammu ?= "0.24" PREFERRED_VERSION_python-gmpy ?= "1.0.1" PREFERRED_VERSION_python-gnosis ?= "1.2.2" PREFERRED_VERSION_python-gst ?= "0.10.8" @@ -1622,7 +1616,7 @@ PREFERRED_VERSION_qscintilla ?= "1.65-gpl-1.6" PREFERRED_VERSION_qsvn ?= "0.3.0" PREFERRED_VERSION_qt-x11-free ?= "3.3.7" PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5" -PREFERRED_VERSION_qt4-x11-free ?= "4.3.2" +PREFERRED_VERSION_qt4-x11-free ?= "4.3.3" PREFERRED_VERSION_qtplot ?= "0.2" PREFERRED_VERSION_quagga ?= "0.99.8" PREFERRED_VERSION_quake1 ?= "0.0.1" @@ -1660,6 +1654,7 @@ PREFERRED_VERSION_rfakeap ?= "0.2" PREFERRED_VERSION_rglueap ?= "0.1" PREFERRED_VERSION_rhythmbox ?= "0.8.7" PREFERRED_VERSION_rlpr ?= "2.05" +PREFERRED_VERSION_roadmap-gtk2 ?= "1.1.0" PREFERRED_VERSION_rott ?= "1.0" PREFERRED_VERSION_rox-filer ?= "2.5" PREFERRED_VERSION_rp-pppoe ?= "3.8" @@ -1898,7 +1893,7 @@ PREFERRED_VERSION_udhcp ?= "0.9.8" PREFERRED_VERSION_ufraw ?= "0.12" PREFERRED_VERSION_uicmoc-native ?= "2.3.10" PREFERRED_VERSION_uicmoc3-native ?= "3.3.5" -PREFERRED_VERSION_uicmoc4-native ?= "4.3.2" +PREFERRED_VERSION_uicmoc4-native ?= "4.3.3" PREFERRED_VERSION_uim ?= "1.3.1" PREFERRED_VERSION_uim-native ?= "1.3.1" PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0" @@ -2127,7 +2122,7 @@ PREFERRED_VERSION_zmerlin ?= "0.9.1" PREFERRED_VERSION_zope ?= "3.3.1" PREFERRED_VERSION_zrally ?= "0.90" PREFERRED_VERSION_zrev7 ?= "1.0.1" -PREFERRED_VERSION_zroadmap ?= "1.0.12" +PREFERRED_VERSION_zroadmap ?= "1.1.0" PREFERRED_VERSION_zsafe ?= "2.1.3" PREFERRED_VERSION_zsh ?= "4.1.1" PREFERRED_VERSION_zshopi ?= "0.2" diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 74b930781b..9f8ae61fc3 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -44,7 +44,7 @@ SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" SRCREV_pn-openocd ?= "${AUTOREV}" SRCREV_pn-openocd-native ?= "${AUTOREV}" -SRCREV_pn-uboot-openmoko ?= "${AUTOREV}" +SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}" SRCREV_pn-dfu-util ?= "${AUTOREV}" SRCREV_pn-dfu-util-native ?= "${AUTOREV}" SRCREV_pn-usbpath ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index b3b47093b7..8f82eb4611 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -148,7 +148,6 @@ SRCDATE_xcompmgr ?= "20060814" SRCDATE_xirssi ?= "20060814" SRCDATE_xsvg ?= "20060814" SRCDATE_yamonenv ?= "20060814" -SRCDATE_zroadmap ?= "20060814" # Freedesktop.org SRCDATE_poppler0.6 = "20070708" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index ab80719646..177a0edfe8 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.7" +SLUGOS_VERSION = "4.8" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 0cf5e8e81e..a946734831 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Unslung Linux Distribution for the NSLU2 DISTRO_NAME = "Unslung" -DISTRO_VERSION = "6.9-alpha" +DISTRO_VERSION = "6.10-beta" DISTRO_TYPE = "beta" FEED_URIS = "cross##http://ipkg.nslu2-linux.org/feeds/optware/nslu2/cross/stable" diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf index a8a2d60c17..6eeb08825b 100644 --- a/conf/machine/dht-walnut.conf +++ b/conf/machine/dht-walnut.conf @@ -20,6 +20,7 @@ USE_VT = "0" SERIAL_CONSOLE = "115200 ttyS0" PREFERRED_VERSION_u-boot = "1.1.4" +KERNEL_IMAGETYPE = "uImage" #tune for the 405 cpu require conf/machine/include/tune-ppc405.inc diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 68bf1b9025..baa2e55dc1 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" @@ -25,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-gta01-pm-gsm \ kernel-module-gta01kbd \ kernel-module-s3cmci \ - kernel-module-ext2 \ - kernel-module-vfat \ kernel-module-snd-soc-neo1973-wm8753 \ kernel-module-snd-soc-smdk2440 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-cp437 \ " # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index 25c3878ee3..2b2d016089 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat" +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_DISPLAY_ORIENTATION = "0" @@ -25,12 +25,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-gta01-pm-gsm \ kernel-module-gta01kbd \ kernel-module-s3cmci \ - kernel-module-ext2 \ - kernel-module-vfat \ kernel-module-snd-soc-neo1973-gta02-wm8753 \ kernel-module-snd-soc-smdk2440 \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-cp437 \ " SERIAL_CONSOLE = "115200 ttySAC2" diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index fcd6cfa0b9..c4c1237bae 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -26,13 +26,15 @@ EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootf MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \ - kernel-module-h5400-battery" + kernel-module-h5400-battery \ + kernel-module-snd-soc-h5000" # # Modules autoload and other boot properties # module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_snd-soc-h5000 = "snd-soc-h5000" module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 1c1d08afb1..ac565559aa 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -53,16 +53,16 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf # # Modules autoload and other boot properties # -module_autoload_magician_ts = "magician_ts" -module_autoload_leds-magician = "leds-magician" module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_hci_usb = "hci_usb" module_autoload_pxa27x_udc = "pxa27x_udc" +module_autoload_magician_ts = "magician_ts" +module_autoload_leds-magician = "leds-magician" module_autoload_magician_phone = "magician_phone" module_autoload_magician_pm = "magician_pm" module_autoload_n_tihtc = "n_tihtc" module_autoload_snd-soc-magician = "snd-soc-magician" -module_autoload_hci_usb = "hci_usb" #FIXME: this should be controlled by a userspace utility later. module_autoload_g_ether = "g_ether" diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index fb117d6c11..a0a21ed202 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -32,27 +32,29 @@ do_report_success() { echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log } -for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 +for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 do BUILD_MACHINE=$machine BUILD_CLEAN="libtool-cross qmake-native qmake2-native" - BUILD_TARGETS="texinfo flex bison gcc binutils automake autoconf m4 pkgconfig \ - task-proper-tools mc screen emacs \ + BUILD_TARGETS="texinfo flex bison gperf gcc binutils automake autoconf m4 pkgconfig \ + task-proper-tools mc screen \ mono perl python ruby \ gtk+ qt-x11-free qt4-x11-free \ gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \ - samba \ + samba meta-nas-server \ apache2 boa cherokee lighttpd thttpd \ gpe-gallery gpe-scap notecase \ pidgin irssi \ roadmap-gtk2 gpsdrive navit \ xmms mplayer quasar \ wpa-gui wifi-radar kismet aircrack-ng dsniff \ + iptables iperf \ gpe-bluetooth bluez-gnome python-pybluez \ abiword gnumeric evince epdfview gimp \ flite \ ctorrent \ - gnuplot octave fftw fftwf fftwl \ + asterisk \ + gnuplot mpfr gmp fftw fftwf fftwl \ gphoto2 gqview imagemagick ufraw \ tzdata \ " diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh index 54c9fb4fa4..3c0bda25fe 100755 --- a/contrib/angstrom/build-release.sh +++ b/contrib/angstrom/build-release.sh @@ -55,7 +55,7 @@ for machine in ixp4xxle ixp4xxbe do BUILD_CLEAN="base-files" BUILD_MACHINE=$machine - BUILD_TARGETS="base-image nslu2-base-image" + BUILD_TARGETS="base-image nslu2-base-image nas-server-image" do_build done @@ -69,7 +69,7 @@ do done # graphics, flash storage -for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 poodle tosa hx4700 c7x0 spitz akita collie simpad +for machine in fic-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 h5000 poodle tosa hx4700 c7x0 spitz akita collie simpad do BUILD_CLEAN="base-files" BUILD_MACHINE=$machine diff --git a/packages/qmake/qmake2-native-2.10a/.mtn2git_empty b/contrib/deploy/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qmake/qmake2-native-2.10a/.mtn2git_empty +++ b/contrib/deploy/.mtn2git_empty diff --git a/contrib/deploy/README b/contrib/deploy/README new file mode 100644 index 0000000000..a285a7f75a --- /dev/null +++ b/contrib/deploy/README @@ -0,0 +1,2 @@ +This directory contains script for deploying OE-generated images for various +devices and boot methods. diff --git a/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty b/contrib/deploy/nfs/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty +++ b/contrib/deploy/nfs/.mtn2git_empty diff --git a/contrib/deploy/nfs/exports.sample b/contrib/deploy/nfs/exports.sample new file mode 100644 index 0000000000..6d82f49202 --- /dev/null +++ b/contrib/deploy/nfs/exports.sample @@ -0,0 +1,2 @@ +# /etc/exports: NFS file systems being exported. See exports(5). +/srv/nfs/oe 192.168.0.0/16(rw,insecure,no_root_squash) diff --git a/contrib/deploy/nfs/oe-nfs-deploy-image b/contrib/deploy/nfs/oe-nfs-deploy-image new file mode 100755 index 0000000000..ee540696d7 --- /dev/null +++ b/contrib/deploy/nfs/oe-nfs-deploy-image @@ -0,0 +1,51 @@ +#!/bin/sh + +# Wonder what the heck is /srv ? Read Filesystem Hierarchy Standard, +# http://www.pathname.com/fhs/pub/fhs-2.3.html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM +# So, /srv/nfs is root of all NFS exports your system offers, and /srv/nfs/oe is +# OpenEmbedded's subset (think security). +NFS_ROOT=/srv/nfs/oe + +if [ -z "$1" ]; then + echo "$0 - Deploy OpenEmbedded-generated image for device NFS boot" + echo "Usage: $0 <image> | -l" + exit +fi + +if [ "$1" == "-l" ]; then + if [ -n "$2" ]; then + extra="-name *$2*" + fi + find tmp/deploy/ -regextype posix-extended -wholename '*/images/*' -regex '.+\.(tar\.bz2|tar\.gz|cpio\.gz)$' $extra | xargs ls -l + exit +fi + +if [ ! -f $1 ]; then + echo "Cannot find image $1" + exit +fi + +ext=`echo $1 | sed -r -e 's/.+\.([^.]+\.[^.]+)/\1/'` +basename=`basename $1 .$ext` + +if [ -z "$basename" ]; then + echo "Assertion failed" + exit 100 +fi + +echo "Deploying to: $NFS_ROOT/$basename" + +rm -rf $NFS_ROOT/$basename + +mkdir -p $NFS_ROOT/$basename + +if [ "$ext" == "tar.bz2" ]; then + tar -xj -f $1 -C $NFS_ROOT/$basename +elif [ "$ext" == "tar.gz" ]; then + tar -xz -f $1 -C $NFS_ROOT/$basename +else + FPATH=`pwd` + cd $NFS_ROOT/$basename + bash -c "gzip -d -c $FPATH/$1 | cpio -i --no-absolute-filenames" + cd $FPATH +fi diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR70.bb b/packages/altboot/altboot_1.1.1+wip-SVNR73.bb index e22e992cc9..58d5721dbf 100644 --- a/packages/altboot/altboot_1.1.1+wip-SVNR70.bb +++ b/packages/altboot/altboot_1.1.1+wip-SVNR73.bb @@ -2,7 +2,7 @@ require altboot.inc PR = "r0" -SVN_REV = "70" +SVN_REV = "73" SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \ " diff --git a/packages/angstrom/angstrom-gpe-task-base.bb b/packages/angstrom/angstrom-gpe-task-base.bb index cc3d08972f..036f1af75a 100644 --- a/packages/angstrom/angstrom-gpe-task-base.bb +++ b/packages/angstrom/angstrom-gpe-task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r33" +PR = "r34" inherit task @@ -8,6 +8,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" RDEPENDS_${PN} = "\ matchbox \ matchbox-panel-hacks \ + matchbox-applet-startup-monitor \ xcursor-transparent-theme \ rxvt-unicode \ gpe-terminal \ diff --git a/packages/apex/apex-env_1.5.13.bb b/packages/apex/apex-env_1.5.13.bb new file mode 100644 index 0000000000..aad0b12af9 --- /dev/null +++ b/packages/apex/apex-env_1.5.13.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "APEX Boot Loader Environment User Modification Tool" +SECTION = "util" +PRIORITY = "optional" +HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ + file://find-apex-partition.patch;patch=1 \ + " +S = ${WORKDIR}/apex-${PV}/usr + +EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" + +oe_runmake() { + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" + make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed" +} + +do_install() { + ${STRIP} ${S}/apex-env + install -d ${D}/${sbindir} + install -m 755 ${S}/apex-env ${D}/${sbindir} +} diff --git a/packages/apex/apex-env_1.5.8.bb b/packages/apex/apex-env_1.5.8.bb index 0f310f107e..a0e44346bb 100644 --- a/packages/apex/apex-env_1.5.8.bb +++ b/packages/apex/apex-env_1.5.8.bb @@ -3,9 +3,11 @@ SECTION = "util" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -# PR = "r1" +PR = "r1" -SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz" +SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ + file://find-apex-partition.patch;patch=1 \ + " S = ${WORKDIR}/apex-${PV}/usr EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" diff --git a/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty b/packages/apex/apex-nslu2-1.5.13/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty +++ b/packages/apex/apex-nslu2-1.5.13/.mtn2git_empty diff --git a/packages/apex/apex-nslu2-1.5.13/defconfig b/packages/apex/apex-nslu2-1.5.13/defconfig new file mode 100644 index 0000000000..91517025bf --- /dev/null +++ b/packages/apex/apex-nslu2-1.5.13/defconfig @@ -0,0 +1,164 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: +# Mon Dec 24 14:54:47 2007 +# +CONFIG_ARM=y +CONFIG_CPU_ARMV5=y +CONFIG_CPU_XSCALE=y +# CONFIG_ARCH_LH7952X is not set +# CONFIG_ARCH_LH7A40X is not set +CONFIG_ARCH_IXP42X=y +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_MX3 is not set +CONFIG_EXPERIMENTAL=y +# CONFIG_SMALL is not set + +# +# General Setup +# +CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2 (bigendian)" +CONFIG_CROSS_COMPILE="" +CONFIG_AEABI=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set +# CONFIG_CC_NO_OPTIMIZATION is not set +CONFIG_STARTUP_UART=y +# CONFIG_DEBUG_LL is not set +CONFIG_SPINNER=y +CONFIG_ATAG=y +CONFIG_MMU=y +# CONFIG_FORCE_WRITETHROUGH_DCACHE is not set +CONFIG_DISABLE_MMU_AT_BOOT=y +# CONFIG_INTERRUPTS is not set +CONFIG_SDRAMBOOT_REPORT=y +CONFIG_STACK_SIZE=0x1000 +CONFIG_STACKLIMIT=y +# CONFIG_BOOTSTRAP_MEMTEST is not set +CONFIG_ATAG_PHYS=0x00000100 +CONFIG_ARCH_NUMBER=597 +CONFIG_APEX_VMA=0x00200000 +CONFIG_KERNEL_LMA=0x00008000 +# CONFIG_USE_RAMDISK is not set +CONFIG_SDRAM_BANK0=y +# CONFIG_SDRAM_BANK1 is not set +CONFIG_NOR_BUSWIDTH=16 +CONFIG_NOR_BANK0=y +CONFIG_NOR_BANK0_START=0x50000000 +CONFIG_NOR_BANK0_LENGTH=0x00800000 +CONFIG_MACH="ixp42x" +CONFIG_MACH_NSLU2=y +# CONFIG_MACH_NAS100D is not set +# CONFIG_MACH_DSMG600 is not set +# CONFIG_MACH_FSG3 is not set +# CONFIG_MACH_AVILA2347 is not set +# CONFIG_USER_DEFAULTENDIAN is not set +# CONFIG_USER_BIGENDIAN is not set +# CONFIG_USER_LITTLEENDIAN is not set + +# +# Platform Setup +# +CONFIG_SDRAM_BANK_LENGTH=0x02000000 +# CONFIG_DISABLE_SECOND_UART_INIT is not set +CONFIG_ARCH_IXP420=y + +# +# Commands +# +CONFIG_ALLHELP=y +CONFIG_ALPHABETIZE_COMMANDS=y +CONFIG_DEL_IS_BS=y +CONFIG_ANSI_KEYS=y +CONFIG_COMMAND_HISTORY=y +CONFIG_COMMAND_EDITING=y +# CONFIG_TIME_COMMANDS is not set +CONFIG_CMD_ALIAS=y +CONFIG_CMD_CHECKSUM=y +CONFIG_CMD_COPY=y +CONFIG_CMD_COMPARE=y +CONFIG_CMD_DRVINFO=y +CONFIG_CMD_DUMP=y +CONFIG_CMD_ENV=y +CONFIG_CMD_SETENV=y +CONFIG_CMD_ERASE=y +CONFIG_CMD_FILL=y +CONFIG_CMD_GO=y +CONFIG_CMD_INFO=y +# CONFIG_CMD_PAUSE is not set +CONFIG_CMD_WAIT=y +CONFIG_CMD_XRECEIVE=y +CONFIG_CMD_MEMLIMIT=y +CONFIG_CMD_MEMSCAN=y +CONFIG_CMD_MEMTEST=y + +# +# Generic Drivers +# +# CONFIG_DRIVER_FAT is not set +# CONFIG_DRIVER_EXT2 is not set +# CONFIG_DRIVER_JFFS2 is not set +CONFIG_DRIVER_FIS=y +CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0x7e0000+4k" +CONFIG_DRIVER_NOR_CFI=y +# CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set +# CONFIG_DRIVER_NOR_CFI_USE_CACHE is not set +CONFIG_DRIVER_NOR_CFI_TYPE_INTEL=y +# CONFIG_DRIVER_NOR_CFI_TYPE_SPANSION is not set +# CONFIG_DRIVER_ONENAND is not set +# CONFIG_DRIVER_IXP4XX_NPE_ETH is not set +CONFIG_USES_NOR_CFI=y +CONFIG_USES_PATHNAME_PARSER=y +CONFIG_USES_IXP4XX_NPE_ETH=y + +# +# Environment +# +CONFIG_ENV=y +CONFIG_ENV_LINK=y +CONFIG_ENV_MUTABLE=y +CONFIG_ENV_REGION="nor:0x7c000+15k" +# CONFIG_ENV_SAVEATONCE is not set +CONFIG_ENV_CHECK_LEN=1024 +CONFIG_VARIATIONS=y +CONFIG_VARIATION_SUFFIX="-alt" +# CONFIG_NO_BOOTSTRAP is not set +CONFIG_NOR_BOOT=y +# CONFIG_NAND_BOOT is not set +# CONFIG_ONENAND_BOOT is not set +# CONFIG_COMPANION_EVT1_BOOT is not set +# CONFIG_COMPANION_EVT2_BOOT is not set + +# +# Default Startup +# +CONFIG_AUTOBOOT=y +CONFIG_AUTOBOOT_DELAY=10 +CONFIG_ENV_STARTUP_KERNEL_COPY=y +# CONFIG_ENV_REGION_KERNEL_SWAP is not set +# CONFIG_ENV_STARTUP_PREFIX_P is not set + +# +# Regions +# +CONFIG_ENV_REGION_KERNEL="fis://kernel" +CONFIG_ENV_REGION_KERNEL_ALT_P=y +CONFIG_ENV_REGION_KERNEL_ALT="fis://kernel" + +# +# Overrides +# +CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y +CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200" +CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y +CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200" +# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set +# CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set +CONFIG_USES_NOR_BOOTFLASH=y +CONFIG_RELOCATE_SIMPLE=y +CONFIG_INLINE_PLATFORM_INITIALIZATION=y +CONFIG_INLINE_PLATFORM_INITIALIZATION_SDRAM_PRE_OVERRIDE=y +# CONFIG_BIGENDIAN is not set +# CONFIG_LITTLEENDIAN is not set +CONFIG_CLEAR_STACKS=y +CONFIG_ALIASES=y diff --git a/packages/qte/qtopia-core/.mtn2git_empty b/packages/apex/apex-nslu2-1.5.8/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qte/qtopia-core/.mtn2git_empty +++ b/packages/apex/apex-nslu2-1.5.8/.mtn2git_empty diff --git a/packages/apex/files/defconfig b/packages/apex/apex-nslu2-1.5.8/defconfig index 3c8522e2e8..3c8522e2e8 100644 --- a/packages/apex/files/defconfig +++ b/packages/apex/apex-nslu2-1.5.8/defconfig diff --git a/packages/uboot/.mtn2git_empty b/packages/apex/apex-nslu2-16mb-1.5.13/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uboot/.mtn2git_empty +++ b/packages/apex/apex-nslu2-16mb-1.5.13/.mtn2git_empty diff --git a/packages/apex/apex-nslu2-16mb-1.5.13/defconfig b/packages/apex/apex-nslu2-16mb-1.5.13/defconfig new file mode 100644 index 0000000000..420e0a61fd --- /dev/null +++ b/packages/apex/apex-nslu2-16mb-1.5.13/defconfig @@ -0,0 +1,164 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: +# Mon Dec 24 15:00:01 2007 +# +CONFIG_ARM=y +CONFIG_CPU_ARMV5=y +CONFIG_CPU_XSCALE=y +# CONFIG_ARCH_LH7952X is not set +# CONFIG_ARCH_LH7A40X is not set +CONFIG_ARCH_IXP42X=y +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_MX3 is not set +CONFIG_EXPERIMENTAL=y +# CONFIG_SMALL is not set + +# +# General Setup +# +CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2/BE (16MiB Flash)" +CONFIG_CROSS_COMPILE="" +CONFIG_AEABI=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set +# CONFIG_CC_NO_OPTIMIZATION is not set +CONFIG_STARTUP_UART=y +# CONFIG_DEBUG_LL is not set +CONFIG_SPINNER=y +CONFIG_ATAG=y +CONFIG_MMU=y +# CONFIG_FORCE_WRITETHROUGH_DCACHE is not set +CONFIG_DISABLE_MMU_AT_BOOT=y +# CONFIG_INTERRUPTS is not set +CONFIG_SDRAMBOOT_REPORT=y +CONFIG_STACK_SIZE=0x1000 +CONFIG_STACKLIMIT=y +# CONFIG_BOOTSTRAP_MEMTEST is not set +CONFIG_ATAG_PHYS=0x00000100 +CONFIG_ARCH_NUMBER=597 +CONFIG_APEX_VMA=0x00200000 +CONFIG_KERNEL_LMA=0x00008000 +# CONFIG_USE_RAMDISK is not set +CONFIG_SDRAM_BANK0=y +# CONFIG_SDRAM_BANK1 is not set +CONFIG_NOR_BUSWIDTH=16 +CONFIG_NOR_BANK0=y +CONFIG_NOR_BANK0_START=0x50000000 +CONFIG_NOR_BANK0_LENGTH=0x01000000 +CONFIG_MACH="ixp42x" +CONFIG_MACH_NSLU2=y +# CONFIG_MACH_NAS100D is not set +# CONFIG_MACH_DSMG600 is not set +# CONFIG_MACH_FSG3 is not set +# CONFIG_MACH_AVILA2347 is not set +# CONFIG_USER_DEFAULTENDIAN is not set +# CONFIG_USER_BIGENDIAN is not set +# CONFIG_USER_LITTLEENDIAN is not set + +# +# Platform Setup +# +CONFIG_SDRAM_BANK_LENGTH=0x02000000 +# CONFIG_DISABLE_SECOND_UART_INIT is not set +CONFIG_ARCH_IXP420=y + +# +# Commands +# +CONFIG_ALLHELP=y +CONFIG_ALPHABETIZE_COMMANDS=y +CONFIG_DEL_IS_BS=y +CONFIG_ANSI_KEYS=y +CONFIG_COMMAND_HISTORY=y +CONFIG_COMMAND_EDITING=y +# CONFIG_TIME_COMMANDS is not set +CONFIG_CMD_ALIAS=y +CONFIG_CMD_CHECKSUM=y +CONFIG_CMD_COPY=y +CONFIG_CMD_COMPARE=y +CONFIG_CMD_DRVINFO=y +CONFIG_CMD_DUMP=y +CONFIG_CMD_ENV=y +CONFIG_CMD_SETENV=y +CONFIG_CMD_ERASE=y +CONFIG_CMD_FILL=y +CONFIG_CMD_GO=y +CONFIG_CMD_INFO=y +# CONFIG_CMD_PAUSE is not set +CONFIG_CMD_WAIT=y +CONFIG_CMD_XRECEIVE=y +CONFIG_CMD_MEMLIMIT=y +CONFIG_CMD_MEMSCAN=y +CONFIG_CMD_MEMTEST=y + +# +# Generic Drivers +# +# CONFIG_DRIVER_FAT is not set +# CONFIG_DRIVER_EXT2 is not set +# CONFIG_DRIVER_JFFS2 is not set +CONFIG_DRIVER_FIS=y +CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0xfe0000+4k" +CONFIG_DRIVER_NOR_CFI=y +# CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set +# CONFIG_DRIVER_NOR_CFI_USE_CACHE is not set +CONFIG_DRIVER_NOR_CFI_TYPE_INTEL=y +# CONFIG_DRIVER_NOR_CFI_TYPE_SPANSION is not set +# CONFIG_DRIVER_ONENAND is not set +# CONFIG_DRIVER_IXP4XX_NPE_ETH is not set +CONFIG_USES_NOR_CFI=y +CONFIG_USES_PATHNAME_PARSER=y +CONFIG_USES_IXP4XX_NPE_ETH=y + +# +# Environment +# +CONFIG_ENV=y +CONFIG_ENV_LINK=y +CONFIG_ENV_MUTABLE=y +CONFIG_ENV_REGION="nor:0x7c000+15k" +# CONFIG_ENV_SAVEATONCE is not set +CONFIG_ENV_CHECK_LEN=1024 +CONFIG_VARIATIONS=y +CONFIG_VARIATION_SUFFIX="-alt" +# CONFIG_NO_BOOTSTRAP is not set +CONFIG_NOR_BOOT=y +# CONFIG_NAND_BOOT is not set +# CONFIG_ONENAND_BOOT is not set +# CONFIG_COMPANION_EVT1_BOOT is not set +# CONFIG_COMPANION_EVT2_BOOT is not set + +# +# Default Startup +# +CONFIG_AUTOBOOT=y +CONFIG_AUTOBOOT_DELAY=10 +CONFIG_ENV_STARTUP_KERNEL_COPY=y +# CONFIG_ENV_REGION_KERNEL_SWAP is not set +# CONFIG_ENV_STARTUP_PREFIX_P is not set + +# +# Regions +# +CONFIG_ENV_REGION_KERNEL="fis://kernel" +CONFIG_ENV_REGION_KERNEL_ALT_P=y +CONFIG_ENV_REGION_KERNEL_ALT="fis://kernel" + +# +# Overrides +# +CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y +CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200" +CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y +CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200" +# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set +# CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set +CONFIG_USES_NOR_BOOTFLASH=y +CONFIG_RELOCATE_SIMPLE=y +CONFIG_INLINE_PLATFORM_INITIALIZATION=y +CONFIG_INLINE_PLATFORM_INITIALIZATION_SDRAM_PRE_OVERRIDE=y +# CONFIG_BIGENDIAN is not set +# CONFIG_LITTLEENDIAN is not set +CONFIG_CLEAR_STACKS=y +CONFIG_ALIASES=y diff --git a/packages/uboot/files/.mtn2git_empty b/packages/apex/apex-nslu2-16mb-1.5.8/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uboot/files/.mtn2git_empty +++ b/packages/apex/apex-nslu2-16mb-1.5.8/.mtn2git_empty diff --git a/packages/apex/files/defconfig-16mb b/packages/apex/apex-nslu2-16mb-1.5.8/defconfig index c9688e3d75..c9688e3d75 100644 --- a/packages/apex/files/defconfig-16mb +++ b/packages/apex/apex-nslu2-16mb-1.5.8/defconfig diff --git a/packages/apex/apex-nslu2-16mb_1.5.13.bb b/packages/apex/apex-nslu2-16mb_1.5.13.bb new file mode 100644 index 0000000000..5fc835fc00 --- /dev/null +++ b/packages/apex/apex-nslu2-16mb_1.5.13.bb @@ -0,0 +1,63 @@ +DESCRIPTION = "APEX Boot Loader" +SECTION = "" +PRIORITY = "optional" +HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ + file://defconfig" +S = ${WORKDIR}/apex-${PV} + +CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" + +CMDLINE_ROOT ?= "root=/dev/mtdblock4 rootfstype=jffs2 rw" + +CMDLINE_DEBUG ?= "" + +EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" + +oe_runmake() { + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" + make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed" +} + +# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head +# of the .config file and remove any settings in defconfig then append +# defconfig to .config +do_configure() { + rm -f ${S}/.config + . ${CONFIG_SITE} + if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then + sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \ + -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \ + -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (16MiB Flash)\"/' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE_ALT=|CONFIG_ENV_DEFAULT_CMDLINE_ALT=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ + ${WORKDIR}/defconfig > ${S}/.config + elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then + sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \ + -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \ + -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (16MiB Flash)\"/' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE_ALT=|CONFIG_ENV_DEFAULT_CMDLINE_ALT=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ + ${WORKDIR}/defconfig > ${S}/.config + else + oefatal do_configure cannot determine endianess + fi + oe_runmake oldconfig +} + +DEPENDS += "devio-native" + +do_populate_staging() { + install -d ${STAGING_LOADER_DIR} + . ${CONFIG_SITE} + if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then + cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin + elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then + devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin 'xp $,4' + else + oefatal do_populate_staging cannot determine endianess + fi +} diff --git a/packages/apex/apex-nslu2-16mb_1.5.8.bb b/packages/apex/apex-nslu2-16mb_1.5.8.bb index 48b8412088..6289d7c104 100644 --- a/packages/apex/apex-nslu2-16mb_1.5.8.bb +++ b/packages/apex/apex-nslu2-16mb_1.5.8.bb @@ -3,10 +3,10 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ - file://defconfig-16mb" + file://defconfig" S = ${WORKDIR}/apex-${PV} CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" @@ -33,13 +33,13 @@ do_configure() { -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \ -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (16MiB Flash)\"/' \ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ - ${WORKDIR}/defconfig-16mb > ${S}/.config + ${WORKDIR}/defconfig > ${S}/.config elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \ -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \ -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (16MiB Flash)\"/' \ -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ - ${WORKDIR}/defconfig-16mb > ${S}/.config + ${WORKDIR}/defconfig > ${S}/.config else oefatal do_configure cannot determine endianess fi diff --git a/packages/apex/apex-nslu2_1.5.13.bb b/packages/apex/apex-nslu2_1.5.13.bb new file mode 100644 index 0000000000..ac3858f3a5 --- /dev/null +++ b/packages/apex/apex-nslu2_1.5.13.bb @@ -0,0 +1,63 @@ +DESCRIPTION = "APEX Boot Loader" +SECTION = "" +PRIORITY = "optional" +HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ + file://defconfig" +S = ${WORKDIR}/apex-${PV} + +CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" + +CMDLINE_ROOT ?= "root=/dev/mtdblock4 rootfstype=jffs2 rw" + +CMDLINE_DEBUG ?= "" + +EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" + +oe_runmake() { + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" + make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed" +} + +# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head +# of the .config file and remove any settings in defconfig then append +# defconfig to .config +do_configure() { + rm -f ${S}/.config + . ${CONFIG_SITE} + if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then + sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \ + -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \ + -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (8MiB Flash)\"/' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE_ALT=|CONFIG_ENV_DEFAULT_CMDLINE_ALT=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ + ${WORKDIR}/defconfig > ${S}/.config + elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then + sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \ + -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \ + -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (8MiB Flash)\"/' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE_ALT=|CONFIG_ENV_DEFAULT_CMDLINE_ALT=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \ + ${WORKDIR}/defconfig > ${S}/.config + else + oefatal do_configure cannot determine endianess + fi + oe_runmake oldconfig +} + +DEPENDS += "devio-native" + +do_populate_staging() { + install -d ${STAGING_LOADER_DIR} + . ${CONFIG_SITE} + if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then + cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2.bin + elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then + devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2.bin 'xp $,4' + else + oefatal do_populate_staging cannot determine endianess + fi +} diff --git a/packages/apex/files/find-apex-partition.patch b/packages/apex/files/find-apex-partition.patch new file mode 100644 index 0000000000..3aa62a186a --- /dev/null +++ b/packages/apex/files/find-apex-partition.patch @@ -0,0 +1,34 @@ +*** usr/link.cc.orig Sun Dec 23 20:31:49 2007 +--- usr/link.cc Sun Dec 23 20:32:46 2007 +*************** +*** 278,285 **** + fixed-up env_link structure, scanning for the environment variables + and their defaults, and opening the flash instance of the + environment. It first looks for the "Loader" partition. If there +! is none, it uses the first partition with the assumption that APEX +! may be the primary boot loader. + + */ + +--- 278,286 ---- + fixed-up env_link structure, scanning for the environment variables + and their defaults, and opening the flash instance of the + environment. It first looks for the "Loader" partition. If there +! is none, it then looks for the "apex" partition. If there is none, +! it uses the first partition with the assumption that APEX may be +! the primary boot loader. + + */ + +*************** +*** 289,294 **** +--- 290,298 ---- + MTDPartition mtd = MTDPartition::find ("Loader"); + + if (!mtd.is ()) ++ mtd = MTDPartition::find ("apex"); ++ ++ if (!mtd.is ()) + mtd = MTDPartition::first (); + + bool fFound = mtd.is () && open_apex (mtd); diff --git a/packages/apr/apr-util_1.2.7.bb b/packages/apr/apr-util_1.2.7.bb index ea81607953..904e41f8a3 100644 --- a/packages/apr/apr-util_1.2.7.bb +++ b/packages/apr/apr-util_1.2.7.bb @@ -14,12 +14,19 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \ --without-sqlite3 \ --with-expat=${STAGING_DIR_HOST}${layout_prefix}" + inherit autotools lib_package binconfig +OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" + do_configure() { + cp ${STAGING_DATADIR}/apr_rules.mk ${S}/build/rules.mk oe_runconf } do_stage() { - autotools_stage_all + autotools_stage_all + sed -i s,/usr/lib/libgdbm.la,-lgdbm,g ${STAGING_LIBDIR}/libaprutil-1.la + sed -i s,/usr/lib/libexpat.la,-lexpat,g ${STAGING_LIBDIR}/libaprutil-1.la + sed -i s,/usr/lib/libapr-1.la,-lapr-1,g ${STAGING_LIBDIR}/libaprutil-1.la } diff --git a/packages/apr/apr_1.2.7.bb b/packages/apr/apr_1.2.7.bb index 2016ca0126..d0f2916bfa 100644 --- a/packages/apr/apr_1.2.7.bb +++ b/packages/apr/apr_1.2.7.bb @@ -9,10 +9,13 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2" inherit autotools lib_package binconfig +OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" + do_configure() { oe_runconf } do_stage() { autotools_stage_all + cp ${S}/build/apr_rules.mk ${STAGING_DATADIR} } diff --git a/packages/atftp/atftp_0.7.bb b/packages/atftp/atftp_0.7.bb index 23bdfaf64b..07040562dd 100644 --- a/packages/atftp/atftp_0.7.bb +++ b/packages/atftp/atftp_0.7.bb @@ -3,10 +3,10 @@ SECTION = "network" PRIORITY = "optional" HOMEPAGE = "http://packages.debian.org/atftp" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.orig.tar.gz \ - ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}-7.diff.gz;patch=1 \ + ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg-3.diff.gz;patch=1 \ file://atftpd.init" S = "${WORKDIR}/atftp-${PV}" diff --git a/packages/bluez/bluez-utils/hciattach-ti-bts.patch b/packages/bluez/bluez-utils/hciattach-ti-bts.patch index 217c32619d..1b208f7979 100644 --- a/packages/bluez/bluez-utils/hciattach-ti-bts.patch +++ b/packages/bluez/bluez-utils/hciattach-ti-bts.patch @@ -1,6 +1,6 @@ --- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200 +++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200 -@@ -58,6 +58,8 @@ +@@ -60,6 +60,8 @@ #define HCI_UART_3WIRE 2 #define HCI_UART_H4DS 3 @@ -9,15 +9,15 @@ struct uart_t { char *type; int m_id; -@@ -67,6 +69,7 @@ - int speed; +@@ -70,6 +72,7 @@ int flags; + char *bdaddr; int (*init) (int fd, struct uart_t *u, struct termios *ti); + char *bts; /* bluetooth script */ }; #define FLOW_CTL 0x0001 -@@ -256,6 +259,114 @@ +@@ -279,6 +282,114 @@ return 0; } @@ -132,29 +132,17 @@ static int texas(int fd, struct uart_t *u, struct termios *ti) { struct timespec tm = {0, 50000}; -@@ -296,15 +407,26 @@ - } while (resp[4] != cmd[1] && resp[5] != cmd[2]); - - /* Verify manufacturer */ -- if ((resp[11] & 0xFF) != 0x0d) -+ if (resp[11] != 0x0d) - fprintf(stderr,"WARNING : module's manufacturer is not Texas Instrument\n"); - - /* Print LMP version */ -- fprintf(stderr, "Texas module LMP version : 0x%02x\n", resp[10] & 0xFF); -+ fprintf(stderr, "TI module LMP version : 0x%02x\n", resp[10]); - +@@ -328,6 +439,17 @@ /* Print LMP subversion */ -- fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF); -+ fprintf(stderr, "TI module LMP sub-version : 0x%02x%02x\n", resp[14], resp[13]); + fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF); + + if ((resp[14] >> 2) == 3) { ++ /* BRF6150 */ + int err; ++ + nanosleep(&tm, NULL); - -+ /* BRF6150 */ -+ if ((err=brf6150( fd, u, ti )) != 0) { -+ fprintf( stderr, "TI script failed (err=%d)\n", -+ err ); ++ if ((err = brf6150(fd, u, ti)) != 0) { ++ fprintf(stderr, "Texas module script failed (err=%d)\n", err); + return -1; + } + } @@ -162,16 +150,16 @@ nanosleep(&tm, NULL); return 0; } -@@ -1103,7 +1225,7 @@ +@@ -1204,7 +1326,7 @@ { printf("hciattach - HCI UART driver initialization utility\n"); printf("Usage:\n"); -- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow]\n"); -+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow]\n"); +- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n"); ++ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n"); printf("\thciattach -l\n"); } -@@ -1118,11 +1240,12 @@ +@@ -1219,11 +1341,12 @@ struct sigaction sa; struct pollfd p; char dev[PATH_MAX]; @@ -185,7 +173,7 @@ switch(opt) { case 'b': send_break = 1; -@@ -1144,6 +1267,10 @@ +@@ -1245,6 +1368,10 @@ init_speed = atoi(optarg); break; @@ -196,7 +184,7 @@ case 'l': for (i = 0; uart[i].type; i++) { printf("%-10s0x%04x,0x%04x\n", uart[i].type, -@@ -1215,6 +1342,8 @@ +@@ -1320,6 +1447,8 @@ if (init_speed) u->init_speed = init_speed; @@ -205,17 +193,6 @@ memset(&sa, 0, sizeof(sa)); sa.sa_flags = SA_NOCLDSTOP; sa.sa_handler = sig_alarm; ---- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200 -+++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200 -@@ -37,7 +37,7 @@ - - noinst_PROGRAMS = hcisecfilter ppporc - --hciattach_SOURCES = hciattach.c hciattach_st.c -+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c - - hciconfig_SOURCES = hciconfig.c csr.h csr.c - hciconfig_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a --- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200 +++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200 @@ -0,0 +1,116 @@ @@ -487,3 +464,14 @@ + } +} + +--- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200 ++++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200 +@@ -45,7 +45,7 @@ + + noinst_PROGRAMS = hcisecfilter ppporc + +-hciattach_SOURCES = hciattach.c hciattach_st.c ++hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c + hciattach_LDADD = @BLUEZ_LIBS@ + + hciconfig_SOURCES = hciconfig.c csr.h csr.c diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc index 8f787292ba..97a604aaea 100644 --- a/packages/bluez/bluez-utils3.inc +++ b/packages/bluez/bluez-utils3.inc @@ -8,10 +8,10 @@ RREPLACES = "bluez-utils-dbus" RCONFLICTS_${PN} = "bluez-utils-nodbus" LICENSE = "GPL" -# ti patch doesn't apply, people using it should rediff it and send it upstream +# ti patch should be sent it upstream! SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf " -# file://hciattach-ti-bts.patch;patch=1 \ + file://hcid.conf \ + file://hciattach-ti-bts.patch;patch=1" S = "${WORKDIR}/bluez-utils-${PV}" diff --git a/packages/bluez/bluez-utils_3.23.bb b/packages/bluez/bluez-utils_3.23.bb index 48f147aa69..f96d1f2ba4 100644 --- a/packages/bluez/bluez-utils_3.23.bb +++ b/packages/bluez/bluez-utils_3.23.bb @@ -1,4 +1,5 @@ require bluez-utils3.inc +PR = "r1" # see bluez-utils3.inc for the explanation of these option EXTRA_OECONF = " \ diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index ca2db7e760..262d6afff1 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -94,7 +94,7 @@ pkg_prerm_${PN} () { # providing its files, this will make update-alternatives work, but the update-rc.d part # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX` - cp -a /bin/busybox $tmpdir/ + cp -pPR /bin/busybox $tmpdir/ ln -s /bin/busybox $tmpdir/[ ln -s /bin/busybox $tmpdir/test ln -s /bin/busybox $tmpdir/head diff --git a/packages/efl1/epdf/fix-plugin-path-check.patch b/packages/efl1/epdf/fix-plugin-path-check.patch index dd5469c286..b218fffb7a 100644 --- a/packages/efl1/epdf/fix-plugin-path-check.patch +++ b/packages/efl1/epdf/fix-plugin-path-check.patch @@ -2,18 +2,18 @@ Index: epdf/configure.in =================================================================== --- epdf.orig/configure.in +++ epdf/configure.in -@@ -27,8 +27,8 @@ PKG_CHECK_MODULES(EWL, - [ - have_ewl="yes" - requirements="$requirements ewl" -- EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`" -- EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`" -+ EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/" -+ EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/" - AC_SUBST(EWL_TEST_LIBS_DIR) - AC_SUBST(EWL_TEST_SOURCE_DIR) - ], -@@ -55,7 +55,7 @@ PKG_CHECK_MODULES(EPSILON, +@@ -95,8 +95,8 @@ + [ + have_ewl="yes" + requirements="$requirements ewl" +- EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`" +- EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`" ++ EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/" ++ EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/" + AC_SUBST(EWL_TEST_LIBS_DIR) + AC_SUBST(EWL_TEST_SOURCE_DIR) + ], +@@ -144,7 +144,7 @@ [ have_epsilon="yes" requirements="$requirements epsilon imlib2" diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb index 8426b75a17..7ca33bf9d8 100644 --- a/packages/efl1/epdf_cvs.bb +++ b/packages/efl1/epdf_cvs.bb @@ -1,8 +1,7 @@ DESCRIPTION = "Epdf is the glue between EFL and libpoppler" LICENSE = "BSD" -DEPENDS = "poppler0.6 evas ecore etk ewl" +DEPENDS = "poppler evas ecore etk ewl" PV = "0.1.0+cvs${SRCDATE}" - PR = "r1" inherit efl_library diff --git a/packages/efl1/etk_cvs.bb b/packages/efl1/etk_cvs.bb index ad959edef6..238d640a68 100644 --- a/packages/efl1/etk_cvs.bb +++ b/packages/efl1/etk_cvs.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foun DEPENDS = "evas ecore edje" LICENSE = "MIT" PV = "0.1.0+cvs${SRCDATE}" -PR = "r0" +PR = "r1" inherit efl_library @@ -15,3 +15,4 @@ FILES_${PN}-engines = "${libdir}/etk/engines/*.so ${datadir}" FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la" FILES_${PN}-dbg += "${libdir}/etk/engines/.debug/" +RRECOMMENDS_${PN} = "${PN}-engines" diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index 179f03b0d8..608c897295 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -35,3 +35,17 @@ FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/" FILES_${PN} = "${libdir}/libevas*.so*" PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*" + +RRECOMMENDS_${PN} = "\ + libevas-engine-buffer \ + libevas-engine-fb \ + libevas-engine-software-generic \ + libevas-engine-software-x11 \ + libevas-engine-software-16 \ + libevas-engine-xrender-x11 \ + \ + libevas-loader-png \ + libevas-loader-jpeg \ + libevas-loader-eet \ + libevas-loader-svg \ +" diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb index 1bacbe3d1c..e386d307ad 100644 --- a/packages/efl1/evas_cvs.bb +++ b/packages/efl1/evas_cvs.bb @@ -1,5 +1,5 @@ require evas.inc -PR = "r3" +PR = "r4" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb index 8fb8521d62..193efcbe18 100644 --- a/packages/efl1/ewl_cvs.bb +++ b/packages/efl1/ewl_cvs.bb @@ -2,10 +2,9 @@ DESCRIPTION = "The Enlightened Widget Library, \ a simple-to-use general purpose widget library \ based on the enlightenment foundation libraries." DEPENDS = "evas ecore edje emotion efreet epsilon" -RSUGGESTS_${PN} += "ewl-themes" LICENSE = "MIT" PV = "0.5.1+cvs${SRCDATE}" -PR = "r1" +PR = "r2" inherit efl_library @@ -31,3 +30,5 @@ FILES_${PN}-dbg += "${libdir}/ewl/*/.debug" FILES_${PN}-engines = "${libdir}/ewl/engines/*.so*" FILES_${PN}-plugins = "${libdir}/ewl/plugins/*.so*" + +RRECOMMENDS_${PN} = "${PN}-engines ${PN}-plugins ewl-themes" diff --git a/packages/uboot/u-boot-1.1.2/.mtn2git_empty b/packages/fmtools/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uboot/u-boot-1.1.2/.mtn2git_empty +++ b/packages/fmtools/.mtn2git_empty diff --git a/packages/uboot/u-boot-1.1.4/.mtn2git_empty b/packages/fmtools/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uboot/u-boot-1.1.4/.mtn2git_empty +++ b/packages/fmtools/files/.mtn2git_empty diff --git a/packages/fmtools/files/makefile.patch b/packages/fmtools/files/makefile.patch new file mode 100644 index 0000000000..41c0086b82 --- /dev/null +++ b/packages/fmtools/files/makefile.patch @@ -0,0 +1,11 @@ +--- fmtools-1.0.2/Makefile 2002-08-17 06:05:09.000000000 +0200 ++++ fmtools-1.0.2p/Makefile 2007-12-22 21:45:28.000000000 +0100 +@@ -1,8 +1,5 @@ + # fmtools Makefile - just the basics for now + +-CC = gcc +-CFLAGS = -Wall -O2 +- + INSTALL = /usr/bin/install + + # Since fmtools doesn't use configure, these paths are provided here diff --git a/packages/fmtools/fmtools_1.0.2.bb b/packages/fmtools/fmtools_1.0.2.bb new file mode 100644 index 0000000000..a1f9fb0f39 --- /dev/null +++ b/packages/fmtools/fmtools_1.0.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "fmtools - programs for Video for Linux radio cards" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.stanford.edu/~blp/fmtools/fmtools-1.0.2.tar.gz \ + file://makefile.patch;patch=1" + +inherit autotools + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/fm ${D}${bindir}/fm + install -m 0755 ${S}/fmscan ${D}${bindir}/fmscan +} + diff --git a/packages/gallery/gallery_1.5.5.bb b/packages/gallery/gallery_1.5.5.bb index 9aba2a2f0a..5756e98567 100644 --- a/packages/gallery/gallery_1.5.5.bb +++ b/packages/gallery/gallery_1.5.5.bb @@ -32,7 +32,7 @@ do_compile() { # do_install() { mkdir -p ${D}/${DEST_DIR} ${D}/etc/apache2/modules.d - cp -a ${S} ${D}/${DEST_DIR} + cp -pPR ${S} ${D}/${DEST_DIR} cp ${FILESDIR}/gallery.conf ${D}/etc/apache2/modules.d/95_gallery.conf } diff --git a/packages/gammu/gammu_1.13.0.bb b/packages/gammu/gammu_1.17.0.bb index fc7adb1b79..fc7adb1b79 100644 --- a/packages/gammu/gammu_1.13.0.bb +++ b/packages/gammu/gammu_1.17.0.bb diff --git a/packages/git/files/git-gui-install-mode-arg-spaces.patch b/packages/git/files/git-gui-install-mode-arg-spaces.patch new file mode 100644 index 0000000000..10e4eb2e1c --- /dev/null +++ b/packages/git/files/git-gui-install-mode-arg-spaces.patch @@ -0,0 +1,32 @@ +--- git/git-gui/Makefile.orig 2007-12-26 17:16:42.000000000 +1030 ++++ git/git-gui/Makefile 2007-12-26 17:17:16.000000000 +1030 +@@ -31,11 +31,11 @@ + INSTALL = install + endif + +-INSTALL_D0 = $(INSTALL) -d -m755 # space is required here ++INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here + INSTALL_D1 = +-INSTALL_R0 = $(INSTALL) -m644 # space is required here ++INSTALL_R0 = $(INSTALL) -m 644 # space is required here + INSTALL_R1 = +-INSTALL_X0 = $(INSTALL) -m755 # space is required here ++INSTALL_X0 = $(INSTALL) -m 755 # space is required here + INSTALL_X1 = + INSTALL_L0 = rm -f # space is required here + INSTALL_L1 = && ln # space is required here +@@ -50,11 +50,11 @@ + QUIET_2DEVNULL = 2>/dev/null + + INSTALL_D0 = dir= +- INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m755 "$$dir" ++ INSTALL_D1 = && echo ' ' DEST $$dir && $(INSTALL) -d -m 755 "$$dir" + INSTALL_R0 = src= +- INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m644 $$src ++ INSTALL_R1 = && echo ' ' INSTALL 644 `basename $$src` && $(INSTALL) -m 644 $$src + INSTALL_X0 = src= +- INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m755 $$src ++ INSTALL_X1 = && echo ' ' INSTALL 755 `basename $$src` && $(INSTALL) -m 755 $$src + + INSTALL_L0 = dst= + INSTALL_L1 = && src= diff --git a/packages/git/git.inc b/packages/git/git.inc index 7115d44b35..3a80c5d950 100644 --- a/packages/git/git.inc +++ b/packages/git/git.inc @@ -3,7 +3,9 @@ SECTION = "console/utils" LICENSE = "GPL" SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \ - file://autotools.patch;patch=1" + file://autotools.patch;patch=1 \ + file://git-gui-install-mode-arg-spaces.patch;patch=1 \ + " S = "${WORKDIR}/git-${PV}" EXTRA_OEMAKE = "NO_TCLTL=1" diff --git a/packages/glibc/eglibc-package.bbclass b/packages/glibc/eglibc-package.bbclass index a859ac2ca9..702d354591 100644 --- a/packages/glibc/eglibc-package.bbclass +++ b/packages/glibc/eglibc-package.bbclass @@ -150,14 +150,14 @@ do_prep_locale_tree() { treedir=${WORKDIR}/locale-tree rm -rf $treedir mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale - cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n + cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n # unzip to avoid parsing errors for i in $treedir/${datadir}/i18n/charmaps/*gz; do gunzip $i done - ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib + ls ${D}/lib/* | xargs -iBLAH cp -pPR BLAH $treedir/lib if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then - cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib + cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib fi install -m 0755 ${D}${bindir}/localedef $treedir/bin } @@ -166,7 +166,7 @@ do_collect_bins_from_locale_tree() { treedir=${WORKDIR}/locale-tree mkdir -p ${D}${libdir} - cp -a $treedir/${libdir}/locale ${D}${libdir} + cp -pPR $treedir/${libdir}/locale ${D}${libdir} } python package_do_split_gconvs () { diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index b96aae37b9..50fae44bf3 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -141,17 +141,17 @@ do_prep_locale_tree() { treedir=${WORKDIR}/locale-tree rm -rf $treedir mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale - cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n + cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n # unzip to avoid parsing errors for i in $treedir/${datadir}/i18n/charmaps/*gz; do gunzip $i done - ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib + ls ${D}/lib/* | xargs -iBLAH cp -pPR BLAH $treedir/lib if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then - cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib + cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib fi if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then - cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib + cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib fi install -m 0755 ${D}${bindir}/localedef $treedir/bin } @@ -160,7 +160,7 @@ do_collect_bins_from_locale_tree() { treedir=${WORKDIR}/locale-tree mkdir -p ${D}${libdir} - cp -a $treedir/${libdir}/locale ${D}${libdir} + cp -pPR $treedir/${libdir}/locale ${D}${libdir} } python package_do_split_gconvs () { diff --git a/packages/gsm/files/default b/packages/gsm/files/default index 761100f702..f113d8bab0 100644 --- a/packages/gsm/files/default +++ b/packages/gsm/files/default @@ -2,30 +2,30 @@ . /etc/init.d/functions -case `cpuinfo_id` in - "GTA01"|"GTA02") +case `machine_id` in + "gta01"|"gta02") GSMD_OPTS="-s 115200 -F" GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset" GSM_DEV="/dev/ttySAC0" ;; - "HTC Apache"|"HTC Blueangel"|"HTC Universal") + "htc_apache"|"htc_blueangel"|"htc_universal") GSMD_OPTS="-s 115200 -F" GSM_DEV="/dev/ttyS0" ;; - "HTC Himalaya") + "htc_himalaya") GSMD_OPTS="-s 115200 -F" GSM_DEV="/dev/ttyS2" ;; - "HTC Magician") + "htc_magician") GSMD_OPTS="-s 115200 -F" GSM_DEV="/dev/ttyS1" ;; - "Palm Treo 650") + "palm_treo_650") GSMD_OPTS="-s 460800 -F -w 1" GSM_DEV="/dev/ttyS0" ;; - "Motorola Ezx Platform") + "motorola_ezx_platform") GSMD_OPTS="-s 115200 -F -v ti" GSM_DEV="/dev/mux0" ;; diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc index c8167d648e..f7d609e2c9 100644 --- a/packages/gsm/gsmd.inc +++ b/packages/gsm/gsmd.inc @@ -5,7 +5,7 @@ SECTION = "libs/gsm" PROVIDES += "gsmd" RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" PV = "0.1+svnr${SRCREV}" -PR = "r39" +PR = "r40" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ diff --git a/packages/images/base-image.bb b/packages/images/base-image.bb index 36760ec499..9afa682d2c 100644 --- a/packages/images/base-image.bb +++ b/packages/images/base-image.bb @@ -17,22 +17,28 @@ # image is intended to be distro-agnostic. DISTRO_SSH_DAEMON ?= "dropbear" + DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral" +# FIXME: We need a distro-indendent way of specifying feed configs. +# Once the RFC for the DISTRO_FEED_CONFIGS variable name is approved, +# we can remove this default definition and set it in the distro config. +DISTRO_FEED_CONFIGS ?= "${ANGSTROM_FEED_CONFIGS}" + DEPENDS = "\ task-boot \ - task-distro-base task-machine-base \ ${DISTRO_SSH_DAEMON} \ ${DISTRO_PACKAGE_MANAGER} \ + ${DISTRO_FEED_CONFIGS} \ ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \ ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \ " IMAGE_INSTALL = "\ task-boot \ - task-distro-base task-machine-base \ ${DISTRO_SSH_DAEMON} \ ${DISTRO_PACKAGE_MANAGER} \ + ${DISTRO_FEED_CONFIGS} \ ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \ ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \ " diff --git a/packages/images/minimal-gpe-image.bb b/packages/images/minimal-gpe-image.bb index 3f475567d2..64583741cd 100644 --- a/packages/images/minimal-gpe-image.bb +++ b/packages/images/minimal-gpe-image.bb @@ -6,7 +6,7 @@ XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "minimalist-gpe-image" -PR = "r1" +PR = "r2" DEPENDS = "task-boot" IMAGE_INSTALL = "\ @@ -14,6 +14,7 @@ IMAGE_INSTALL = "\ task-boot \ gpe-dm gpe-session-scripts gpe-login \ matchbox-wm \ + gpe-terminal \ angstrom-feed-configs \ ipkg \ " diff --git a/packages/images/nas-server-image.bb b/packages/images/nas-server-image.bb new file mode 100644 index 0000000000..ca8f94e749 --- /dev/null +++ b/packages/images/nas-server-image.bb @@ -0,0 +1,53 @@ +# This image is intended to provide a configuration +# for a network attached storage server device. + +# Key features are: +# +# 1) Must be able to mount attached storage devices like +# internal disks, external USB disks, etc. Should support +# various filesystem choices, but ext2 at a minimum. +# +# 2) Must be able to boot from internal flash, or directly +# from a filesystem stored on the attached storage. +# +# 3) Must be able to share that storage across the network +# using various protocols like Samba, NFS, etc. +# +# 4) Bonus points for being able to support other central +# network services like a central gateway machine might. + +# Although it is tested with the Angstrom distro, it is +# intended to be distro-agnostic. + +DISTRO_SSH_DAEMON ?= "dropbear" +DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral" + +DEPENDS = "\ + task-boot \ + ${@base_contains('MACHINE_FEATURES', 'apex', 'task-base-apex', '', d)} \ + task-distro-base task-machine-base \ + ${DISTRO_SSH_DAEMON} \ + ${DISTRO_PACKAGE_MANAGER} \ + ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \ + task-nas-server-everything \ + " + +IMAGE_INSTALL_TASKS = "\ + task-nas-server-everything \ + " + +IMAGE_INSTALL = "\ + task-boot \ + ${@base_contains('MACHINE_FEATURES', 'apex', 'task-base-apex', '', d)} \ + ${DISTRO_SSH_DAEMON} \ + ${DISTRO_PACKAGE_MANAGER} \ + ${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \ + ${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \ + ${IMAGE_INSTALL_TASKS} \ + " + +export IMAGE_BASENAME = "nas-server-image" +IMAGE_LINGUAS = "" + +inherit image diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index c6d4e73718..c258f4250a 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -87,3 +87,17 @@ unslung_clean_image () { # #### End of Hack! } + + +# Override this function for unslung, since we don't need Apex. + +nslu2_pack_image () { + slugimage -p \ + -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ + -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ + -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \ + -r Ramdisk:1,Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -m ${STAGING_FIRMWARE_DIR}/NPE-B \ + -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin +} diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh index 1bb53d20a3..319f85aa6e 100644 --- a/packages/initrdscripts/files/30-bootmenu.sh +++ b/packages/initrdscripts/files/30-bootmenu.sh @@ -94,7 +94,7 @@ while read maj min nblk dev; do add_menu_item "$dev ($fstype)" done < /proc/partitions -add_menu_item "NFS (nfsroot=192.168.2.200:/nfs/image)" +add_menu_item "NFS (nfsroot=192.168.2.200:/srv/nfs/oe/image)" total=`echo -e $list | wc -l` num=0 @@ -145,7 +145,7 @@ path=`expr "$sel" : '[^/]*\([^ ]*\).*'` if [ "$dev" == "NFS" ]; then ROOT_DEVICE="/dev/nfs" - CMDLINE="$CMDLINE nfsroot=192.168.2.200:/nfs/image" + CMDLINE="$CMDLINE nfsroot=192.168.2.200:/srv/nfs/oe/image" elif [ -n "$path" ]; then ROOT_DEVICE="/dev/loop" CMDLINE="looproot=/dev/$dev:$path" diff --git a/packages/initrdscripts/files/80-nfsboot.sh b/packages/initrdscripts/files/80-nfsboot.sh index 5129a53ebb..e1588c16a8 100644 --- a/packages/initrdscripts/files/80-nfsboot.sh +++ b/packages/initrdscripts/files/80-nfsboot.sh @@ -31,10 +31,12 @@ if [ "$ROOT_DEVICE" = "/dev/nfs" ]; then usb*) echo "USB" modprobe g_ether + sleep 5 ;; esac ifconfig $device $client_ip + ping -c 2 $server_ip ) echo "booting from NFS: $nfsroot" diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb index e90247c522..19e7403b83 100644 --- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb +++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb @@ -1,7 +1,7 @@ SRC_URI = "file://30-bootmenu.sh" -PR = "r4" +PR = "r7" DESCRIPTION = "An initramfs module with UI for selection of boot device." -RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop" +RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs" # For VFAT mounting. RRECOMMENDS = "kernel-module-nls-cp437 kernel-module-nls-iso8859-1" diff --git a/packages/initrdscripts/initramfs-module-nfs_1.0.bb b/packages/initrdscripts/initramfs-module-nfs_1.0.bb index acf71adb92..77c38799f3 100644 --- a/packages/initrdscripts/initramfs-module-nfs_1.0.bb +++ b/packages/initrdscripts/initramfs-module-nfs_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://80-nfsboot.sh" -PR = "r1" +PR = "r2" DESCRIPTION = "An initramfs module for booting via NFS." RDEPENDS = "initramfs-uniboot" RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs" @@ -10,4 +10,4 @@ do_install() { } PACKAGE_ARCH = "all" -FILES_${PN} += " /initrd.d/nfs " +FILES_${PN} += " /initrd.d/* " diff --git a/packages/initscripts/initscripts-1.0/functions b/packages/initscripts/initscripts-1.0/functions index 358fc6edb3..fb9a914e4d 100644 --- a/packages/initscripts/initscripts-1.0/functions +++ b/packages/initscripts/initscripts-1.0/functions @@ -4,8 +4,8 @@ # shell scripts in the /etc/init.d directory. # -cpuinfo_id() { # return the Hardware module ID - awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo +machine_id() { # return the machine ID + awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo } killproc() { # kill the named process(es) diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb index 7fab41858b..4433d12318 100644 --- a/packages/initscripts/initscripts_1.0.bb +++ b/packages/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS = "makedevs" LICENSE = "GPL" -PR = "r103" +PR = "r104" SRC_URI = "file://functions \ file://halt \ diff --git a/packages/ipaq-sleep/files/unbreak.patch b/packages/ipaq-sleep/files/unbreak.patch new file mode 100644 index 0000000000..5884bf69e1 --- /dev/null +++ b/packages/ipaq-sleep/files/unbreak.patch @@ -0,0 +1,184 @@ +--- a/ipaq-sleep.c.org 2006-01-20 19:43:14.000000000 +0200 ++++ a/ipaq-sleep.c 2007-12-26 06:26:32.000000000 +0200 +@@ -27,14 +27,14 @@ + #include <X11/Xlib.h> + #include <X11/extensions/scrnsaver.h> + +-#undef DEBUG ++#define DEBUG + + int irqs[MAX_IRQS]; /* irqs to examine have a value of 1 */ + long v, irq_count[MAX_IRQS]; /* holds previous counters of the irq's */ + int sleep_idle=3 * 60; /* in seconds */ + int dim_idle=1 * 60; /* in seconds */ + int daemonize=1; +-int sleep_time = DEFAULT_SLEEP_TIME; ++int sleep_time = 1; //DEFAULT_SLEEP_TIME; + int cpu=1; + int apm=1; + int dimming=1; +@@ -57,6 +57,7 @@ + Window root; /* The root window (which holds MIT_SCREEN_SAVER + info). */ + XScreenSaverInfo *info; /* The MIT_SCREEN_SAVER info object. */ ++int xfd = -1; + + int init() { + int first_event, first_error; +@@ -69,6 +70,8 @@ + else { + XScreenSaverQueryExtension(dpy, &first_event, &first_error); + root = DefaultRootWindow(dpy); ++ XSelectInput(dpy, root, KeyPressMask | KeyReleaseMask | PointerMotionMask); ++ xfd = ConnectionNumber(dpy); + info = XScreenSaverAllocInfo(); + #ifdef DEBUG + if (debug) +@@ -108,7 +111,7 @@ + if (fgets (buf, 32, input)) + { + if (!strncmp (buf, "on ", 3)) +- r = atoi (buf + 4); ++ r = atoi (buf + 3); + else + r = -1; + } +@@ -189,7 +192,7 @@ + if (strcmp(func, Lflag)==0) { + dim_level=atoi(value); + #ifdef DEBUG +- if (debug) fprintf(dgfp, "dim_idle=%d\n", dim_idle); ++ if (debug) fprintf(dgfp, "dim_level=%d\n", dim_idle); + #endif + } + if (strcmp(func, aflag)==0) { +@@ -282,6 +285,12 @@ + dimming=0; + } + } ++ if (strcmp(func, Lflag)==0) { ++ dim_level=atoi(value); ++#ifdef DEBUG ++ if (debug) fprintf(dgfp, "dim_level=%d\n", dim_idle); ++#endif ++ } + if (strcmp(func, aflag)==0) { + apm=atoi(value); + #ifdef DEBUG +@@ -487,8 +496,11 @@ + return(1); + } + ++ if (info.ac_line_status == AC_LINE_STATUS_UNKNOWN || info.battery_status == BATTERY_STATUS_UNKNOWN) ++ return(0); ++ + #ifdef DEBUG +- if (debug) fprintf(dgfp,"You are NOT on external power. Its all good.....\n"); ++ if (debug) fprintf(dgfp,"You are NOT on external power. Line status: %d, battery status: %d.\n", info.ac_line_status, info.battery_status); + #endif + runtime = info.battery_time; + if (apm && runtime >= 0 && runtime < battery_level) +@@ -587,12 +599,17 @@ + + } + ++/* X idle status checked every sleep_time, ++ other boring and expensive stuff - sleep_time * CYCLE_INTERLEAVE */ ++#define CYCLE_INTERLEAVE 10 ++ + /* Keep checking the interrupts. As long as there is activity, do nothing. */ + void main_loop (void) { +- int activity, i, total_unused=0, apm_active=0, old_apm=0; ++ int activity, i, apm_active=0, old_apm=0, last_active = time(NULL); + int dimmed=0, current_bl=32; + int newIdle, oldIdle, lastIdle, oldTime, newTime; + char iline[64]; ++ int cycle = 0; + + Time idleTime; /* milliseconds */ + FILE *f; +@@ -656,6 +673,9 @@ + if (dimming && !dimmed && !apm_active) { + if ((newIdle-oldIdle)>=dim_idle) { + current_bl = read_backlight (); ++#ifdef DEBUG ++ if (debug) fprintf(dgfp, "Dim timeout. Current bl value=%d, setting to=%d\n", current_bl, dim_level); ++#endif + set_backlight (dim_level); + dimmed=1; + } +@@ -664,6 +684,11 @@ + lastIdle=newIdle; + + } ++ ++ cycle++; ++ cycle %= CYCLE_INTERLEAVE; ++ if (cycle) ++ goto sleep; + + apm_active=check_apm(); + if (apm_active) { +@@ -698,17 +723,15 @@ + } + + if (activity) { +- total_unused = 0; ++ last_active = time(NULL); + } + else { +- total_unused += sleep_time; +- if (total_unused >= sleep_idle && sleeping) { ++ if (time(NULL) - last_active >= sleep_idle && sleeping) { + + if (check_cpu() || check_PID() || probe_IRQs()) { + #ifdef DEBUG + if (debug) fprintf(dgfp,"You cannot sleep at this time! Not going to sleep....\n"); + #endif +- total_unused=0; + oldIdle=newIdle; + } + else { +@@ -718,24 +741,37 @@ + do_sleep (); + set_backlight (current_bl); + dimmed=0; +- total_unused=0; ++ last_active = time(NULL); + } + } + + } + ++sleep: + #ifdef DEBUG + if (debug) fflush(dgfp); + #endif +- sleep(sleep_time); ++ { ++ struct timeval tv; ++ fd_set readset; ++ FD_ZERO(&readset); ++ if (xfd != -1) ++ FD_SET(xfd, &readset); ++ tv.tv_sec = 1; ++ tv.tv_usec = 0; ++#ifdef DEBUG ++ if (debug) fprintf(dgfp, "select=%d, tv_sec=%d, tv_usec=%d\n", select(xfd+1, &readset, NULL, NULL, &tv), tv.tv_sec, tv.tv_usec); ++#endif ++ } ++ + + newTime=time(NULL); +- if (oldTime && newTime-sleep_time > oldTime +1) { ++ if (oldTime && newTime-sleep_time > oldTime +2) { + #ifdef DEBUG + if (debug) +- fprintf(stderr, "%i sec sleep; resetting timer and resetting dimmer...", (int)(newTime - oldTime)); ++ fprintf(dgfp, "%i sec sleep, apparently, was suspended; resetting timer and resetting dimmer...", (int)(newTime - oldTime)); + #endif +- total_unused=0; ++ last_active = time(NULL); + + query_idle(&idleTime); + lastIdle=oldIdle=(int)idleTime; diff --git a/packages/ipaq-sleep/ipaq-sleep_0.9.bb b/packages/ipaq-sleep/ipaq-sleep_0.9.bb index d41cacdf58..005c606c29 100644 --- a/packages/ipaq-sleep/ipaq-sleep_0.9.bb +++ b/packages/ipaq-sleep/ipaq-sleep_0.9.bb @@ -8,8 +8,10 @@ RDEPENDS = "apm" SRC_URI_append = " file://init-script-busybox.patch;patch=1" SRC_URI_append = " file://install-fix.patch;patch=1" +SRC_URI_append = " file://unbreak.patch;patch=1" -PR = "r1" +PR = "r5" DESCRIPTION = "Automatic sleep/suspend control daemon" +CONFFILES_${PN} += "${sysconfdir}/ipaq-sleep.conf" diff --git a/packages/kexec/kexec-tools-1.101/kexec-arm-atags.patch b/packages/kexec/kexec-tools-1.101/kexec-arm-atags.patch new file mode 100644 index 0000000000..bf6f640035 --- /dev/null +++ b/packages/kexec/kexec-tools-1.101/kexec-arm-atags.patch @@ -0,0 +1,294 @@ +--- + kexec/arch/arm/kexec-zImage-arm.c | 259 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 252 insertions(+), 7 deletions(-) + +Index: kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c +=================================================================== +--- kexec-tools-1.101.orig/kexec/arch/arm/kexec-zImage-arm.c 2007-12-26 21:17:07.000000000 +0000 ++++ kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c 2007-12-27 01:24:25.000000000 +0000 +@@ -1,11 +1,83 @@ ++/* ++ * - 08/21/2007 ATAG support added by Uli Luckas <u.luckas@road.de> ++ * ++ */ + #define _GNU_SOURCE + #include <stdio.h> + #include <string.h> + #include <stdlib.h> + #include <errno.h> + #include <limits.h> ++#include <stdint.h> ++#include <getopt.h> ++#include <arch/options.h> ++#include <asm/page.h> + #include "../../kexec.h" + ++#define COMMAND_LINE_SIZE 1024 ++#define BOOT_PARAMS_SIZE 1536 ++ ++struct tag_header { ++ uint32_t size; ++ uint32_t tag; ++}; ++ ++/* The list must start with an ATAG_CORE node */ ++#define ATAG_CORE 0x54410001 ++ ++struct tag_core { ++ uint32_t flags; /* bit 0 = read-only */ ++ uint32_t pagesize; ++ uint32_t rootdev; ++}; ++ ++/* it is allowed to have multiple ATAG_MEM nodes */ ++#define ATAG_MEM 0x54410002 ++ ++struct tag_mem32 { ++ uint32_t size; ++ uint32_t start; /* physical start address */ ++}; ++ ++/* describes where the compressed ramdisk image lives (virtual address) */ ++/* ++ * this one accidentally used virtual addresses - as such, ++ * it's deprecated. ++ */ ++#define ATAG_INITRD 0x54410005 ++ ++/* describes where the compressed ramdisk image lives (physical address) */ ++#define ATAG_INITRD2 0x54420005 ++ ++struct tag_initrd { ++ uint32_t start; /* physical start address */ ++ uint32_t size; /* size of compressed ramdisk image in bytes */ ++}; ++ ++/* command line: \0 terminated string */ ++#define ATAG_CMDLINE 0x54410009 ++ ++struct tag_cmdline { ++ char cmdline[1]; /* this is the minimum size */ ++}; ++ ++/* The list ends with an ATAG_NONE node. */ ++#define ATAG_NONE 0x00000000 ++ ++struct tag { ++ struct tag_header hdr; ++ union { ++ struct tag_core core; ++ struct tag_mem32 mem; ++ struct tag_initrd initrd; ++ struct tag_cmdline cmdline; ++ } u; ++}; ++ ++#define tag_next(t) ((struct tag *)((uint32_t *)(t) + (t)->hdr.size)) ++#define byte_size(t) ((t)->hdr.size << 2) ++#define tag_size(type) ((sizeof(struct tag_header) + sizeof(struct type) + 3) >> 2) ++ + int zImage_arm_probe(const char *buf, off_t len) + { + /* +@@ -14,21 +86,194 @@ int zImage_arm_probe(const char *buf, of + */ + return 0; + } ++ + void zImage_arm_usage(void) + { ++ printf( " --command-line=STRING Set the kernel command line to STRING.\n" ++ " --append=STRING Set the kernel command line to STRING.\n" ++ " --initrd=FILE Use FILE as the kernel's initial ramdisk.\n" ++ " --ramdisk=FILE Use FILE as the kernel's initial ramdisk.\n" ++ ); + } +-int zImage_arm_load(int argc, char **argv, const char *buf, off_t len, ++ ++static ++struct tag * atag_read_tags(void) ++{ ++ static unsigned long buf[BOOT_PARAMS_SIZE]; ++ const char fn[]= "/proc/atags"; ++ FILE *fp; ++ fp = fopen(fn, "r"); ++ if (!fp) { ++ fprintf(stderr, "Cannot open %s: %s\n", ++ fn, strerror(errno)); ++ return NULL; ++ } ++ ++ fread(buf, sizeof(buf[1]), BOOT_PARAMS_SIZE, fp); ++ if (ferror(fp)) { ++ fprintf(stderr, "Cannot read %s: %s\n", ++ fn, strerror(errno)); ++ fclose(fp); ++ return NULL; ++ } ++ ++ fclose(fp); ++ return (struct tag *) buf; ++} ++ ++ ++static ++int atag_arm_load(struct kexec_info *info, unsigned long base, ++ const char *command_line, off_t command_line_len, ++ const char *initrd, off_t initrd_len) ++{ ++ struct tag *saved_tags = atag_read_tags(); ++ char *buf; ++ off_t len; ++ struct tag *params; ++ uint32_t *initrd_start; ++ ++ buf = xmalloc(getpagesize()); ++ if (!buf) { ++ fprintf(stderr, "Compiling ATAGs: out of memory\n"); ++ return -1; ++ } ++ ++ memset(buf, 0xff, getpagesize()); ++ params = (struct tag *)buf; ++ ++ if (saved_tags) { ++ // Copy tags ++ saved_tags = (struct tag *) saved_tags; ++ while(byte_size(saved_tags)) { ++ switch (saved_tags->hdr.tag) { ++ case ATAG_INITRD: ++ case ATAG_INITRD2: ++ case ATAG_CMDLINE: ++ case ATAG_NONE: ++ // skip these tags ++ break; ++ default: ++ // copy all other tags ++ memcpy(params, saved_tags, byte_size(saved_tags)); ++ params = tag_next(params); ++ } ++ saved_tags = tag_next(saved_tags); ++ } ++ } else { ++ params->hdr.size = 2; ++ params->hdr.tag = ATAG_CORE; ++ params = tag_next(params); ++ } ++ ++ if (initrd) { ++ params->hdr.size = tag_size(tag_initrd); ++ params->hdr.tag = ATAG_INITRD2; ++ initrd_start = ¶ms->u.initrd.start; ++ params->u.initrd.size = initrd_len; ++ params = tag_next(params); ++ } ++ ++ if (command_line) { ++ params->hdr.size = (sizeof(struct tag_header) + command_line_len + 3) >> 2; ++ params->hdr.tag = ATAG_CMDLINE; ++ memcpy(params->u.cmdline.cmdline, command_line, ++ command_line_len); ++ params->u.cmdline.cmdline[command_line_len - 1] = '\0'; ++ params = tag_next(params); ++ } ++ ++ params->hdr.size = 0; ++ params->hdr.tag = ATAG_NONE; ++ ++ len = ((char *)params - buf) + sizeof(struct tag_header); ++ ++ add_segment(info, buf, len, base, len); ++ ++ if (initrd) { ++ struct memory_range *range; ++ int ranges; ++ get_memory_ranges(&range, &ranges); ++ *initrd_start = locate_hole(info, initrd_len, getpagesize(), range[0].start + 0x800000, ULONG_MAX, INT_MAX); ++ if (*initrd_start == ULONG_MAX) ++ return -1; ++ add_segment(info, initrd, initrd_len, *initrd_start, initrd_len); ++ } ++ ++ return 0; ++} ++ ++int zImage_arm_load(int argc, char **argv, const char *buf, off_t len, + struct kexec_info *info) + { + unsigned long base; +- unsigned int offset = 0x8000; /* 32k offset from memory start */ ++ unsigned int atag_offset = 0x1000; /* 4k offset from memory start */ ++ unsigned int offset = 0x8000; /* 32k offset from memory start */ ++ const char *command_line; ++ off_t command_line_len; ++ const char *ramdisk; ++ char *ramdisk_buf; ++ off_t ramdisk_length; ++ int opt; ++#define OPT_APPEND 'a' ++#define OPT_RAMDISK 'r' ++ static const struct option options[] = { ++ KEXEC_ARCH_OPTIONS ++ { "command-line", 1, 0, OPT_APPEND }, ++ { "append", 1, 0, OPT_APPEND }, ++ { "initrd", 1, 0, OPT_RAMDISK }, ++ { "ramdisk", 1, 0, OPT_RAMDISK }, ++ { 0, 0, 0, 0 }, ++ }; ++ static const char short_options[] = KEXEC_ARCH_OPT_STR "a:r:"; ++ ++ /* ++ * Parse the command line arguments ++ */ ++ command_line = 0; ++ command_line_len = 0; ++ ramdisk = 0; ++ ramdisk_buf = 0; ++ ramdisk_length = 0; ++ while((opt = getopt_long(argc, argv, short_options, options, 0)) != -1) { ++ switch(opt) { ++ default: ++ /* Ignore core options */ ++ if (opt < OPT_ARCH_MAX) { ++ break; ++ } ++ case '?': ++ usage(); ++ return -1; ++ case OPT_APPEND: ++ command_line = optarg; ++ break; ++ case OPT_RAMDISK: ++ ramdisk = optarg; ++ break; ++ } ++ } ++ if (command_line) { ++ command_line_len = strlen(command_line) + 1; ++ if (command_line_len > COMMAND_LINE_SIZE) ++ command_line_len = COMMAND_LINE_SIZE; ++ } ++ if (ramdisk) { ++ ramdisk_buf = slurp_file(ramdisk, &ramdisk_length); ++ } ++ + base = locate_hole(info,len+offset,0,0,ULONG_MAX,INT_MAX); + if (base == ULONG_MAX) +- { + return -1; +- } +- base += offset; +- add_segment(info,buf,len,base,len); +- info->entry = (void*)base; ++ ++ if (atag_arm_load(info, base + atag_offset, ++ command_line, command_line_len, ++ ramdisk_buf, ramdisk_length) == -1) ++ return -1; ++ ++ add_segment(info, buf, len, base + offset, len); ++ ++ info->entry = (void*)base + offset; ++ + return 0; + } diff --git a/packages/kexec/kexec-tools_1.101.bb b/packages/kexec/kexec-tools_1.101.bb index 4dfab1e06f..d152a678ed 100644 --- a/packages/kexec/kexec-tools_1.101.bb +++ b/packages/kexec/kexec-tools_1.101.bb @@ -4,12 +4,13 @@ HOMEPAGE = "http://www.xmission.com/~ebiederm/files/kexec/" SECTION = "kernel/userland" DEPENDS = "virtual/kernel zlib" LICENSE = "GPL" -PR = "r1" +PR = "r3" inherit autotools -EXTRA_OEMAKE = "LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} " -EXTRA_OECONF = " --with-zlib=${STAGING_LIBDIR}/.." +export LDFLAGS = "-L${STAGING_LIBDIR}" +EXTRA_OECONF = " --with-zlib=yes" SRC_URI = "http://www.xmission.com/~ebiederm/files/kexec/kexec-tools-${PV}.tar.gz \ - file://kexec-tools-arm.patch;patch=1 " + file://kexec-tools-arm.patch;patch=1 \ + file://kexec-arm-atags.patch;patch=1" diff --git a/packages/kismet/kismet_2007-10-R1.bb b/packages/kismet/kismet_2007-10-R1.bb index 1c78d468d7..1a53c6f78f 100644 --- a/packages/kismet/kismet_2007-10-R1.bb +++ b/packages/kismet/kismet_2007-10-R1.bb @@ -2,8 +2,8 @@ DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, an HOMEPAGE = "http://www.kismetwireless.net/" SECTION = "console/network" LICENSE = "GPLv2" -DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2" -PR = "r1" +DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2 libpcap" +PR = "r2" SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz" diff --git a/packages/libqanava/libqanava_0.0.7.bb b/packages/libqanava/libqanava_0.0.7.bb index dbec5c7001..5edf1417c1 100644 --- a/packages/libqanava/libqanava_0.0.7.bb +++ b/packages/libqanava/libqanava_0.0.7.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Qanava is a gtaph library based on the Qt4 Arthur framework." +DESCRIPTION = "Qanava is a graph library based on the Qt4 Arthur framework." SECTION = "x11/libs" HOMEPAGE = "http://www.libqanava.org/" # LGPL after 0.0.7 @@ -8,7 +8,7 @@ PR = "r0" SRC_URI = "http://www.libqanava.org/dl/qanava-${PV}.tar.gz" S = "${WORKDIR}/qanava-${PV}" -inherit qmake qt4x11 +inherit qt4x11 PARALLEL_MAKE = "" diff --git a/packages/uboot/u-boot-1.1.6/.mtn2git_empty b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uboot/u-boot-1.1.6/.mtn2git_empty +++ b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/.mtn2git_empty diff --git a/packages/linux/linux-dht-walnut-2.6.20/dht-walnut_defconfig b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/defconfig index b6b752f623..b6b752f623 100644 --- a/packages/linux/linux-dht-walnut-2.6.20/dht-walnut_defconfig +++ b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/defconfig diff --git a/packages/uboot/u-boot-1.2.0/.mtn2git_empty b/packages/linux/linux-dht-walnut/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uboot/u-boot-1.2.0/.mtn2git_empty +++ b/packages/linux/linux-dht-walnut/.mtn2git_empty diff --git a/packages/uboot/u-boot-1.2.0/fic-gta01/.mtn2git_empty b/packages/linux/linux-dht-walnut/dht-walnut/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uboot/u-boot-1.2.0/fic-gta01/.mtn2git_empty +++ b/packages/linux/linux-dht-walnut/dht-walnut/.mtn2git_empty diff --git a/packages/linux/linux-dht-walnut/dht-walnut/defconfig b/packages/linux/linux-dht-walnut/dht-walnut/defconfig new file mode 100644 index 0000000000..ddd6d9fc8f --- /dev/null +++ b/packages/linux/linux-dht-walnut/dht-walnut/defconfig @@ -0,0 +1,2353 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.23 +# Wed Dec 26 13:45:00 2007 +# +CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_ILOG2_U32=y +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_PPC=y +CONFIG_PPC32=y +CONFIG_GENERIC_NVRAM=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_GENERIC_BUG=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_USER_NS is not set +# CONFIG_AUDIT is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SYSFS_DEPRECATED=y +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +# CONFIG_EPOLL is not set +CONFIG_SIGNALFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y +CONFIG_BLOCK=y +CONFIG_LBD=y +CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_LSF=y +# CONFIG_BLK_DEV_BSG is not set + +# +# 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" + +# +# Processor +# +# CONFIG_6xx is not set +CONFIG_40x=y +# CONFIG_44x is not set +# CONFIG_8xx is not set +# CONFIG_E200 is not set +# CONFIG_E500 is not set +CONFIG_PPC_DCR_NATIVE=y +CONFIG_PPC_DCR=y +CONFIG_MATH_EMULATION=y +# CONFIG_KEXEC is not set +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=m +# CONFIG_CPU_FREQ_DEBUG is not set +CONFIG_CPU_FREQ_STAT=m +# CONFIG_CPU_FREQ_STAT_DETAILS is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_4xx=y +# CONFIG_WANT_EARLY_SERIAL is not set + +# +# IBM 4xx options +# +# CONFIG_BUBINGA is not set +# CONFIG_CPCI405 is not set +# CONFIG_EP405 is not set +# CONFIG_REDWOOD_5 is not set +# CONFIG_REDWOOD_6 is not set +# CONFIG_SYCAMORE is not set +CONFIG_WALNUT=y +# CONFIG_XILINX_ML300 is not set +# CONFIG_XILINX_ML403 is not set +CONFIG_IBM405_ERR77=y +CONFIG_IBM405_ERR51=y +CONFIG_IBM_OCP=y +CONFIG_BIOS_FIXUP=y +CONFIG_405GP=y +CONFIG_PPC4xx_DMA=y +CONFIG_PPC4xx_EDMA=y +CONFIG_PPC_GEN550=y +CONFIG_UART0_TTYS0=y +# CONFIG_UART0_TTYS1 is not set +CONFIG_NOT_COHERENT_CACHE=y + +# +# Platform options +# +# CONFIG_PC_KEYBOARD is not set +# CONFIG_HIGHMEM is not set +CONFIG_ARCH_POPULATES_NODE_MAP=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_300=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=300 +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +# CONFIG_PREEMPT_BKL is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +CONFIG_SPLIT_PTLOCK_CPUS=4 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_BINFMT_ELF=y +CONFIG_BINFMT_MISC=m +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE=" debug " +# CONFIG_PM is not set +CONFIG_SUSPEND_UP_POSSIBLE=y +CONFIG_HIBERNATION_UP_POSSIBLE=y +CONFIG_SECCOMP=y +CONFIG_ISA_DMA_API=y + +# +# Bus options +# +CONFIG_ZONE_DMA=y +# CONFIG_PPC_I8259 is not set +CONFIG_PPC_INDIRECT_PCI=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_SYSCALL=y +# CONFIG_ARCH_SUPPORTS_MSI is not set + +# +# PCCARD (PCMCIA/CardBus) support +# +CONFIG_PCCARD=y +# CONFIG_PCMCIA_DEBUG is not set +CONFIG_PCMCIA=y +CONFIG_PCMCIA_LOAD_CIS=y +CONFIG_PCMCIA_IOCTL=y +CONFIG_CARDBUS=y + +# +# PC-card bridges +# +CONFIG_YENTA=m +CONFIG_YENTA_O2=y +CONFIG_YENTA_RICOH=y +CONFIG_YENTA_TI=y +CONFIG_YENTA_ENE_TUNE=y +CONFIG_YENTA_TOSHIBA=y +CONFIG_PD6729=m +CONFIG_I82092=m +CONFIG_PCCARD_NONSTATIC=m + +# +# Advanced setup +# +CONFIG_ADVANCED_OPTIONS=y +CONFIG_HIGHMEM_START=0xfe000000 +# CONFIG_LOWMEM_SIZE_BOOL is not set +CONFIG_LOWMEM_SIZE=0x30000000 +# CONFIG_KERNEL_START_BOOL is not set +CONFIG_KERNEL_START=0xc0000000 +# CONFIG_TASK_SIZE_BOOL is not set +CONFIG_TASK_SIZE=0x80000000 +# CONFIG_CONSISTENT_START_BOOL is not set +CONFIG_CONSISTENT_START=0xff100000 +# CONFIG_CONSISTENT_SIZE_BOOL is not set +CONFIG_CONSISTENT_SIZE=0x00200000 +# CONFIG_BOOT_LOAD_BOOL is not set +CONFIG_BOOT_LOAD=0x00400000 + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +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_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_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +# CONFIG_IP_PIMSM_V1 is not set +# CONFIG_IP_PIMSM_V2 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=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +# CONFIG_IP_VS is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# 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_TUNNEL=m +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_NETLABEL is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NF_CONNTRACK is not set +# CONFIG_NETFILTER_XTABLES is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_QUEUE=m +# CONFIG_IP_NF_IPTABLES is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +CONFIG_IP6_NF_QUEUE=m +# CONFIG_IP6_NF_IPTABLES is not set + +# +# DECnet: Netfilter Configuration +# +# CONFIG_DECNET_NF_GRABULATOR is not set + +# +# Bridge: Netfilter Configuration +# +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_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_IP_DCCP is not set +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 is not set +CONFIG_ATM=m +CONFIG_ATM_CLIP=m +# 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_BRIDGE=m +CONFIG_VLAN_8021Q=m +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 is not set +CONFIG_X25=m +CONFIG_LAPB=m +CONFIG_ECONET=m +# CONFIG_ECONET_AUNUDP is not set +# CONFIG_ECONET_NATIVE is not set +CONFIG_WAN_ROUTER=m + +# +# QoS and/or fair queueing +# +CONFIG_NET_SCHED=y +CONFIG_NET_SCH_FIFO=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_RR 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_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 is not set +# CONFIG_CLS_U32_MARK is not set +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=y +# CONFIG_NET_ACT_GACT is not set +# CONFIG_NET_ACT_MIRRED is not set +# CONFIG_NET_ACT_PEDIT is not set +# CONFIG_NET_ACT_SIMP is not set +CONFIG_NET_CLS_POLICE=y +# CONFIG_NET_CLS_IND is not set + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +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_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +# CONFIG_BT_HCIDTL1 is not set +# CONFIG_BT_HCIBT3C is not set +# CONFIG_BT_HCIBLUECARD is not set +# CONFIG_BT_HCIBTUART is not set +# CONFIG_BT_HCIVHCI is not set +CONFIG_AF_RXRPC=m +# CONFIG_AF_RXRPC_DEBUG is not set +# CONFIG_RXKAD is not set +CONFIG_FIB_RULES=y + +# +# Wireless +# +CONFIG_CFG80211=m +CONFIG_WIRELESS_EXT=y +CONFIG_MAC80211=m +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +# CONFIG_STANDALONE is not set +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +CONFIG_MTD_CONCAT=m +CONFIG_MTD_PARTITIONS=y +CONFIG_MTD_REDBOOT_PARTS=m +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set +# CONFIG_MTD_CMDLINE_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=m +CONFIG_MTD_BLOCK_RO=m +CONFIG_FTL=m +CONFIG_NFTL=m +# CONFIG_NFTL_RW is not set +CONFIG_INFTL=m +CONFIG_RFD_FTL=m +CONFIG_SSFDC=m + +# +# 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_START=0x8000000 +CONFIG_MTD_PHYSMAP_LEN=0x4000000 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +CONFIG_MTD_WALNUT=m +CONFIG_MTD_PCI=m +CONFIG_MTD_PLATRAM=m + +# +# Self-contained MTD device drivers +# +CONFIG_MTD_PMC551=m +CONFIG_MTD_PMC551_BUGFIX=y +# CONFIG_MTD_PMC551_DEBUG is not set +CONFIG_MTD_DATAFLASH=m +CONFIG_MTD_M25P80=m +CONFIG_MTD_SLRAM=y +CONFIG_MTD_PHRAM=y +# CONFIG_MTD_MTDRAM is not set +CONFIG_MTD_BLOCK2MTD=y + +# +# 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=m +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=m +CONFIG_MTD_NAND_DISKONCHIP=m +# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set +CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 +# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_NANDSIM=m +# CONFIG_MTD_NAND_PLATFORM is not set +CONFIG_MTD_ONENAND=m +# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set +# CONFIG_MTD_ONENAND_OTP is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +# CONFIG_PARPORT_SERIAL is not set +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set +# CONFIG_PARPORT_PC_PCMCIA is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_AX88796 is not set +# CONFIG_PARPORT_1284 is not set +CONFIG_PARPORT_NOT_PC=y +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_FD is not set +# CONFIG_PARIDE is not set +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# 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=y +CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_SX8 is not set +CONFIG_BLK_DEV_UB=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +CONFIG_CDROM_PKTCDVD=m +CONFIG_CDROM_PKTCDVD_BUFFERS=8 +# CONFIG_CDROM_PKTCDVD_WCACHE is not set +CONFIG_ATA_OVER_ETH=m +# CONFIG_XILINX_SYSACE is not set +CONFIG_MISC_DEVICES=y +# CONFIG_PHANTOM is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set +CONFIG_IDE=y +CONFIG_IDE_MAX_HWIFS=4 +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +# CONFIG_BLK_DEV_IDECS is not set +# CONFIG_BLK_DEV_DELKIN is not set +CONFIG_BLK_DEV_IDECD=y +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +CONFIG_BLK_DEV_IDESCSI=m +# CONFIG_IDE_TASK_IOCTL is not set +CONFIG_IDE_PROC_FS=y + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +CONFIG_BLK_DEV_IDEPCI=y +# CONFIG_IDEPCI_SHARE_IRQ is not set +CONFIG_IDEPCI_PCIBUS_ORDER=y +CONFIG_BLK_DEV_OFFBOARD=y +CONFIG_BLK_DEV_GENERIC=y +# CONFIG_BLK_DEV_OPTI621 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +# CONFIG_IDEDMA_ONLYDISK is not set +# CONFIG_BLK_DEV_AEC62XX is not set +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +# CONFIG_BLK_DEV_CMD64X is not set +# CONFIG_BLK_DEV_TRIFLEX is not set +# CONFIG_BLK_DEV_CY82C693 is not set +# CONFIG_BLK_DEV_CS5520 is not set +# CONFIG_BLK_DEV_CS5530 is not set +# CONFIG_BLK_DEV_HPT34X is not set +# CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_BLK_DEV_JMICRON is not set +# CONFIG_BLK_DEV_SC1200 is not set +# CONFIG_BLK_DEV_PIIX is not set +# CONFIG_BLK_DEV_IT8213 is not set +# CONFIG_BLK_DEV_IT821X is not set +# CONFIG_BLK_DEV_NS87415 is not set +CONFIG_BLK_DEV_PDC202XX_OLD=y +CONFIG_PDC202XX_BURST=y +# CONFIG_BLK_DEV_PDC202XX_NEW is not set +# CONFIG_BLK_DEV_SVWKS is not set +# CONFIG_BLK_DEV_SIIMAGE is not set +# CONFIG_BLK_DEV_SL82C105 is not set +# CONFIG_BLK_DEV_SLC90E66 is not set +# CONFIG_BLK_DEV_TRM290 is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_BLK_DEV_TC86C001 is not set +# CONFIG_IDE_ARM is not set +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_IVB is not set +# CONFIG_BLK_DEV_HD is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +CONFIG_SCSI_NETLINK=y +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=y +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=y +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +CONFIG_SCSI_SPI_ATTRS=m +CONFIG_SCSI_FC_ATTRS=m +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC7XXX_OLD is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_DPT_I2O is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA is not set +# CONFIG_SCSI_FUTURE_DOMAIN is not set +# CONFIG_SCSI_GDTH is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_PPA is not set +# CONFIG_SCSI_IMM is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set +# CONFIG_SCSI_NSP32 is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_LOWLEVEL_PCMCIA 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_RAID5_RESHAPE=y +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_MULTIPATH_EMC=m +CONFIG_DM_MULTIPATH_RDAC=m +CONFIG_DM_DELAY=m + +# +# Fusion MPT device support +# +# CONFIG_FUSION is not set +# CONFIG_FUSION_SPI is not set +# CONFIG_FUSION_FC is not set +# CONFIG_FUSION_SAS is not set + +# +# IEEE 1394 (FireWire) support +# +# CONFIG_FIREWIRE is not set +CONFIG_IEEE1394=m + +# +# Subsystem Options +# +# CONFIG_IEEE1394_VERBOSEDEBUG is not set + +# +# Controllers +# +CONFIG_IEEE1394_PCILYNX=m +CONFIG_IEEE1394_OHCI1394=m + +# +# Protocols +# +CONFIG_IEEE1394_VIDEO1394=m +CONFIG_IEEE1394_SBP2=m +# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set +CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y +CONFIG_IEEE1394_ETH1394=m +CONFIG_IEEE1394_DV1394=m +CONFIG_IEEE1394_RAWIO=m +# CONFIG_I2O is not set +# CONFIG_MACINTOSH_DRIVERS is not set +CONFIG_NETDEVICES=y +# CONFIG_NETDEVICES_MULTIQUEUE is not set +# CONFIG_IFB is not set +# CONFIG_DUMMY is not set +CONFIG_BONDING=m +# CONFIG_MACVLAN is not set +CONFIG_EQUALIZER=m +CONFIG_TUN=m +# CONFIG_ARCNET is not set +# CONFIG_PHYLIB is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set +# CONFIG_CASSINI is not set +CONFIG_NET_VENDOR_3COM=y +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_TULIP=y +CONFIG_DE2104X=m +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set +CONFIG_DE4X5=m +CONFIG_WINBOND_840=m +CONFIG_DM9102=m +# CONFIG_ULI526X is not set +CONFIG_PCMCIA_XIRCOM=m +CONFIG_PCMCIA_XIRTULIP=m +CONFIG_HP100=m +CONFIG_IBM_EMAC=y +CONFIG_IBM_EMAC_RXB=128 +CONFIG_IBM_EMAC_TXB=64 +CONFIG_IBM_EMAC_POLL_WEIGHT=32 +CONFIG_IBM_EMAC_RX_COPY_THRESHOLD=256 +CONFIG_IBM_EMAC_RX_SKB_HEADROOM=0 +# CONFIG_IBM_EMAC_DEBUG is not set +CONFIG_NET_PCI=y +CONFIG_PCNET32=m +# CONFIG_PCNET32_NAPI is not set +CONFIG_AMD8111_ETH=m +# CONFIG_AMD8111E_NAPI is not set +CONFIG_ADAPTEC_STARFIRE=m +# CONFIG_ADAPTEC_STARFIRE_NAPI is not set +CONFIG_B44=m +CONFIG_FORCEDETH=m +# CONFIG_FORCEDETH_NAPI is not set +CONFIG_DGRS=m +CONFIG_EEPRO100=m +CONFIG_E100=m +CONFIG_FEALNX=m +CONFIG_NATSEMI=m +CONFIG_NE2K_PCI=m +CONFIG_8139CP=m +CONFIG_8139TOO=m +# CONFIG_8139TOO_PIO is not set +# CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_8139TOO_8129 is not set +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_SIS900=m +CONFIG_EPIC100=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_TLAN=m +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +# CONFIG_VIA_RHINE_NAPI is not set +# CONFIG_SC92031 is not set +# CONFIG_NET_POCKET is not set +CONFIG_NETDEV_1000=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_DL2K=m +CONFIG_E1000=m +# CONFIG_E1000_NAPI is not set +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set +CONFIG_NS83820=m +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_R8169=m +# CONFIG_R8169_NAPI is not set +# CONFIG_R8169_VLAN is not set +# CONFIG_SIS190 is not set +# CONFIG_SKGE is not set +# CONFIG_SKY2 is not set +CONFIG_SK98LIN=m +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m +# CONFIG_QLA3XXX is not set +# CONFIG_ATL1 is not set +CONFIG_NETDEV_10000=y +# CONFIG_CHELSIO_T1 is not set +# CONFIG_CHELSIO_T3 is not set +# CONFIG_IXGB is not set +# CONFIG_S2IO is not set +# CONFIG_MYRI10GE is not set +# CONFIG_NETXEN_NIC is not set +# CONFIG_MLX4_CORE is not set +# CONFIG_TR is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +CONFIG_USB_PEGASUS=y +# CONFIG_USB_RTL8150 is not set +CONFIG_USB_USBNET_MII=y +CONFIG_USB_USBNET=y +CONFIG_USB_NET_AX8817X=y +CONFIG_USB_NET_CDCETHER=y +# CONFIG_USB_NET_DM9601 is not set +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=y +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +CONFIG_USB_NET_ZAURUS=y +CONFIG_NET_PCMCIA=y +CONFIG_PCMCIA_3C589=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_PCMCIA_PCNET=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_PCMCIA_XIRC2PS=m +CONFIG_PCMCIA_AXNET=m +CONFIG_WAN=y +CONFIG_LANMEDIA=m +CONFIG_HDLC=m +# CONFIG_HDLC_RAW is not set +# CONFIG_HDLC_RAW_ETH is not set +# CONFIG_HDLC_CISCO is not set +# CONFIG_HDLC_FR is not set +# CONFIG_HDLC_PPP is not set +# CONFIG_HDLC_X25 is not set +CONFIG_PCI200SYN=m +CONFIG_WANXL=m +CONFIG_PC300=m + +# +# Cyclades-PC300 MLPPP support is disabled. +# + +# +# Refer to the file README.mlppp, provided by PC300 package. +# +# CONFIG_PC300TOO is not set +CONFIG_FARSYNC=m +CONFIG_DSCC4=m +# CONFIG_DSCC4_PCISYNC is not set +# CONFIG_DSCC4_PCI_RST is not set +CONFIG_DLCI=m +CONFIG_DLCI_MAX=8 +# CONFIG_WAN_ROUTER_DRIVERS is not set +CONFIG_LAPBETHER=m +CONFIG_X25_ASY=m +CONFIG_ATM_DRIVERS=y +# CONFIG_ATM_DUMMY is not set +# CONFIG_ATM_TCP is not set +# CONFIG_ATM_LANAI is not set +# CONFIG_ATM_ENI is not set +# CONFIG_ATM_FIRESTREAM is not set +# CONFIG_ATM_ZATM is not set +# CONFIG_ATM_NICSTAR is not set +# CONFIG_ATM_IDT77252 is not set +# CONFIG_ATM_AMBASSADOR is not set +# CONFIG_ATM_HORIZON is not set +# CONFIG_ATM_IA is not set +# CONFIG_ATM_FORE200E_MAYBE is not set +# CONFIG_ATM_HE is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +# CONFIG_PLIP 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 is not set +CONFIG_PPPOE=m +CONFIG_PPPOATM=m +# CONFIG_PPPOL2TP is not set +CONFIG_SLIP=m +CONFIG_SLIP_COMPRESSED=y +CONFIG_SLHC=m +CONFIG_SLIP_SMART=y +# CONFIG_SLIP_MODE_SLIP6 is not set +# CONFIG_NET_FC is not set +CONFIG_SHAPER=m +CONFIG_NETCONSOLE=m +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y +# CONFIG_ISDN is not set +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +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_TSDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +CONFIG_INPUT_MOUSE=y +# CONFIG_MOUSE_PS2 is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +# CONFIG_SERIO_I8042 is not set +# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_PARKBD is not set +# CONFIG_SERIO_PCIPS2 is not set +# CONFIG_SERIO_LIBPS2 is not set +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +# CONFIG_SERIAL_8250_CS is not set +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +# CONFIG_SERIAL_8250_EXTENDED is not set + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_UARTLITE is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +# CONFIG_TIPAR is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +# CONFIG_BOOKE_WDT is not set + +# +# PCI-based Watchdog Cards +# +CONFIG_PCIPCWATCHDOG=m +CONFIG_WDTPCI=m +# CONFIG_WDT_501_PCI is not set + +# +# USB-based Watchdog Cards +# +CONFIG_USBPCWATCHDOG=m +CONFIG_HW_RANDOM=m +CONFIG_NVRAM=m +# CONFIG_GEN_RTC is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +# CONFIG_CARDMAN_4000 is not set +# CONFIG_CARDMAN_4040 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_DEVPORT=y +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=y +CONFIG_I2C_ALGOPCF=y +CONFIG_I2C_ALGOPCA=y + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_I810 is not set +# CONFIG_I2C_PIIX4 is not set +CONFIG_I2C_IBM_IIC=y +# CONFIG_I2C_MPC is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_PROSAVAGE is not set +# CONFIG_I2C_SAVAGE4 is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_TINY_USB is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set +# CONFIG_I2C_VOODOO3 is not set + +# +# Miscellaneous I2C Chip support +# +CONFIG_SENSORS_DS1337=m +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_DS1682 is not set +CONFIG_SENSORS_EEPROM=m +CONFIG_SENSORS_PCF8574=m +# CONFIG_SENSORS_PCA9539 is not set +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_M41T00=m +# CONFIG_SENSORS_MAX6875 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 + +# +# SPI support +# +CONFIG_SPI=y +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=m +# CONFIG_SPI_BUTTERFLY is not set +# CONFIG_SPI_LM70_LLP is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_AT25 is not set +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set +CONFIG_W1=m + +# +# 1-wire Bus Masters +# +CONFIG_W1_MASTER_MATROX=m +CONFIG_W1_MASTER_DS2490=m +CONFIG_W1_MASTER_DS2482=m + +# +# 1-wire Slaves +# +CONFIG_W1_SLAVE_THERM=m +CONFIG_W1_SLAVE_SMEM=m +CONFIG_W1_SLAVE_DS2433=m +# CONFIG_W1_SLAVE_DS2433_CRC is not set +# CONFIG_W1_SLAVE_DS2760 is not set +# CONFIG_POWER_SUPPLY is not set +CONFIG_HWMON=m +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ABITUGURU is not set +# CONFIG_SENSORS_ABITUGURU3 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_VIA686A is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_VT8231 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set + +# +# Multimedia devices +# +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TDA9875=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA7111=m +CONFIG_VIDEO_SAA7114=m +CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +# CONFIG_VIDEO_VIVI is not set +CONFIG_VIDEO_BT848=m +# CONFIG_VIDEO_BT848_DVB is not set +# CONFIG_VIDEO_SAA6588 is not set +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_CPIA=m +CONFIG_VIDEO_CPIA_USB=m +# CONFIG_VIDEO_CPIA2 is not set +CONFIG_VIDEO_SAA5246A=m +CONFIG_VIDEO_SAA5249=m +CONFIG_TUNER_3036=m +# CONFIG_TUNER_TEA5761 is not set +CONFIG_VIDEO_STRADIS=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +# CONFIG_VIDEO_ZORAN_AVS6EYES is not set +CONFIG_VIDEO_SAA7134=m +# CONFIG_VIDEO_SAA7134_ALSA is not set +# CONFIG_VIDEO_SAA7134_DVB is not set +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DPC=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_CX88=m +# CONFIG_VIDEO_CX88_ALSA is not set +# CONFIG_VIDEO_CX88_BLACKBIRD is not set +# CONFIG_VIDEO_CX88_DVB is not set +# CONFIG_VIDEO_IVTV is not set +# CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_V4L_USB_DRIVERS=y +# CONFIG_VIDEO_PVRUSB2 is not set +# CONFIG_VIDEO_EM28XX is not set +# CONFIG_VIDEO_USBVISION is not set +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +# CONFIG_USB_QUICKCAM_MESSENGER is not set +# CONFIG_USB_ET61X251 is not set +CONFIG_VIDEO_OVCAMCHIP=m +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +# CONFIG_USB_ZC0301 is not set +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +# CONFIG_USB_ZR364XX is not set +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_GEMTEK_PCI=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_MAESTRO=m +CONFIG_USB_DSBR=m +CONFIG_DVB_CORE=m +# CONFIG_DVB_CORE_ATTACH is not set +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +CONFIG_DVB_AV7110=m +# CONFIG_DVB_AV7110_FIRMWARE is not set +CONFIG_DVB_AV7110_OSD=y +CONFIG_DVB_BUDGET=m +CONFIG_DVB_BUDGET_CI=m +CONFIG_DVB_BUDGET_AV=m +CONFIG_DVB_BUDGET_PATCH=m + +# +# Supported USB Adapters +# +# CONFIG_DVB_USB is not set +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_DVB_CINERGYT2=m +# CONFIG_DVB_CINERGYT2_TUNING is not set + +# +# Supported FlexCopII (B2C2) Adapters +# +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set + +# +# Supported BT878 Adapters +# +CONFIG_DVB_BT8XX=m + +# +# Supported Pluto2 Adapters +# +# CONFIG_DVB_PLUTO2 is not set + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_STV0299=m +CONFIG_DVB_CX24110=m +# CONFIG_DVB_CX24123 is not set +CONFIG_DVB_TDA8083=m +CONFIG_DVB_MT312=m +CONFIG_DVB_VES1X93=m +CONFIG_DVB_S5H1420=m +CONFIG_DVB_TDA10086=m + +# +# DVB-T (terrestrial) frontends +# +CONFIG_DVB_SP8870=m +CONFIG_DVB_SP887X=m +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +CONFIG_DVB_L64781=m +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +# CONFIG_DVB_DIB7000M is not set +# CONFIG_DVB_DIB7000P is not set + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +CONFIG_DVB_TDA10021=m +CONFIG_DVB_TDA10023=m +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +CONFIG_DVB_OR51211=m +CONFIG_DVB_OR51132=m +CONFIG_DVB_BCM3510=m +CONFIG_DVB_LGDT330X=m + +# +# Tuners/PLL support +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TDA826X=m +# CONFIG_DVB_TDA827X is not set +# CONFIG_DVB_TUNER_QT1010 is not set +# CONFIG_DVB_TUNER_MT2060 is not set + +# +# Miscellaneous devices +# +CONFIG_DVB_LNBP21=m +# CONFIG_DVB_ISL6421 is not set +CONFIG_DVB_TUA6100=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_VIDEO_TUNER=m +CONFIG_VIDEO_BUF=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_IR_I2C=m +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_DAB=y +CONFIG_USB_DABUSB=m + +# +# Graphics support +# +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_BACKLIGHT_CLASS_DEVICE=m + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_VGASTATE is not set +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +CONFIG_FB_DDC=m +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_CT65550 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_VGA16 is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +CONFIG_FB_MATROX=y +CONFIG_FB_MATROX_MILLENIUM=y +CONFIG_FB_MATROX_MYSTIQUE=y +CONFIG_FB_MATROX_G=y +CONFIG_FB_MATROX_I2C=m +CONFIG_FB_MATROX_MAVEN=m +CONFIG_FB_MATROX_MULTIHEAD=y +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_IBM_GXT4500 is not set +# CONFIG_FB_VIRTUAL is not set + +# +# Console display driver support +# +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_LOGO is not set + +# +# Sound +# +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +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_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 + +# +# Generic devices +# +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_VX_LIB=m +CONFIG_SND_AC97_CODEC=m +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_MTS64 is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +# CONFIG_SND_PORTMAN2X4 is not set +CONFIG_SND_SB_COMMON=m +CONFIG_SND_SB16_DSP=m + +# +# PCI devices +# +CONFIG_SND_AD1889=m +CONFIG_SND_ALS300=m +CONFIG_SND_ALS4000=m +CONFIG_SND_ALI5451=m +CONFIG_SND_ATIIXP=m +CONFIG_SND_ATIIXP_MODEM=m +CONFIG_SND_AU8810=m +CONFIG_SND_AU8820=m +CONFIG_SND_AU8830=m +CONFIG_SND_AZT3328=m +CONFIG_SND_BT87X=m +CONFIG_SND_BT87X_OVERCLOCK=y +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_CS4281=m +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS5530=m +CONFIG_SND_DARLA20=m +CONFIG_SND_GINA20=m +CONFIG_SND_LAYLA20=m +CONFIG_SND_DARLA24=m +CONFIG_SND_GINA24=m +CONFIG_SND_LAYLA24=m +CONFIG_SND_MONA=m +CONFIG_SND_MIA=m +CONFIG_SND_ECHO3G=m +CONFIG_SND_INDIGO=m +CONFIG_SND_INDIGOIO=m +CONFIG_SND_INDIGODJ=m +CONFIG_SND_EMU10K1=m +CONFIG_SND_EMU10K1X=m +CONFIG_SND_ENS1370=m +CONFIG_SND_ENS1371=m +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_FM801=m +CONFIG_SND_FM801_TEA575X_BOOL=y +CONFIG_SND_FM801_TEA575X=m +CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=m +CONFIG_SND_ICE1724=m +CONFIG_SND_INTEL8X0=m +CONFIG_SND_INTEL8X0M=m +CONFIG_SND_KORG1212=m +CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL=y +CONFIG_SND_MAESTRO3=m +CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL=y +CONFIG_SND_MIXART=m +CONFIG_SND_NM256=m +CONFIG_SND_PCXHR=m +CONFIG_SND_RIPTIDE=m +CONFIG_SND_RME32=m +CONFIG_SND_RME96=m +CONFIG_SND_RME9652=m +CONFIG_SND_SONICVIBES=m +CONFIG_SND_TRIDENT=m +CONFIG_SND_VIA82XX=m +CONFIG_SND_VIA82XX_MODEM=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y +CONFIG_SND_AC97_POWER_SAVE=y + +# +# ALSA PowerMac devices +# + +# +# ALSA PowerPC devices +# + +# +# USB devices +# +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +# CONFIG_SND_USB_CAIAQ_INPUT is not set + +# +# PCMCIA devices +# +# CONFIG_SND_VXPOCKET is not set +# CONFIG_SND_PDAUDIOCF is not set + +# +# System on Chip audio support +# +# CONFIG_SND_SOC is not set + +# +# SoC Audio support for SuperH +# + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=y +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +CONFIG_USB_HIDDEV=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_SPLIT_ISO is not set +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +# CONFIG_USB_EHCI_TT_NEWSCHED is not set +# CONFIG_USB_ISP116X_HCD is not set +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=y +# CONFIG_USB_U132_HCD is not set +CONFIG_USB_SL811_HCD=m +# CONFIG_USB_SL811_CS is not set +# CONFIG_USB_R8A66597_HCD is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +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_DPCM=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_KARMA=y +# CONFIG_USB_LIBUSUAL is not set + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m +CONFIG_USB_MON=y + +# +# USB port drivers +# +CONFIG_USB_USS720=m + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRCABLE is not set +CONFIG_USB_SERIAL_AIRPRIME=m +# CONFIG_USB_SERIAL_ARK3116 is not set +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP2101=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +# CONFIG_USB_SERIAL_FUNSOFT is not set +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_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +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_NAVMAN is not set +CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_OTI6858 is not set +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +# CONFIG_USB_SERIAL_SIERRAWIRELESS 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_DEBUG is not set +CONFIG_USB_EZUSB=y + +# +# USB Miscellaneous drivers +# +CONFIG_USB_EMI62=m +CONFIG_USB_EMI26=m +CONFIG_USB_ADUTUX=m +CONFIG_USB_AUERSWALD=m +CONFIG_USB_RIO500=m +CONFIG_USB_LEGOTOWER=m +CONFIG_USB_LCD=m +# CONFIG_USB_BERRY_CHARGE is not set +CONFIG_USB_LED=m +CONFIG_USB_CYPRESS_CY7C63=m +CONFIG_USB_CYTHERM=m +CONFIG_USB_PHIDGET=m +CONFIG_USB_PHIDGETKIT=m +CONFIG_USB_PHIDGETMOTORCONTROL=m +CONFIG_USB_PHIDGETSERVO=m +CONFIG_USB_IDMOUSE=m +CONFIG_USB_FTDI_ELAN=m +CONFIG_USB_APPLEDISPLAY=m +CONFIG_USB_SISUSBVGA=m +# CONFIG_USB_SISUSBVGA_CON is not set +CONFIG_USB_LD=m +CONFIG_USB_TRANCEVIBRATOR=m +# CONFIG_USB_IOWARRIOR is not set +CONFIG_USB_TEST=m + +# +# USB DSL modem support +# +CONFIG_USB_ATM=m +# CONFIG_USB_SPEEDTOUCH is not set +# CONFIG_USB_CXACRU is not set +# CONFIG_USB_UEAGLEATM is not set +# CONFIG_USB_XUSBATM is not set + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_NET2280=m +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_S3C2410 is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_MMC is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_INFINIBAND is not set +# CONFIG_EDAC is not set +CONFIG_RTC_LIB=m +CONFIG_RTC_CLASS=m + +# +# 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_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 + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_MAX6902 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# + +# +# DMA Engine support +# +CONFIG_DMA_ENGINE=y + +# +# DMA Clients +# +CONFIG_NET_DMA=y + +# +# DMA Devices +# +CONFIG_INTEL_IOATDMA=m +# CONFIG_AUXDISPLAY is not set + +# +# Userspace I/O +# +# CONFIG_UIO is not set + +# +# File systems +# +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set +CONFIG_JFS_FS=m +# CONFIG_JFS_POSIX_ACL is not set +# CONFIG_JFS_SECURITY is not set +# CONFIG_JFS_DEBUG is not set +# CONFIG_JFS_STATISTICS is not set +# CONFIG_FS_POSIX_ACL is not set +CONFIG_XFS_FS=m +CONFIG_XFS_QUOTA=y +CONFIG_XFS_SECURITY=y +CONFIG_XFS_POSIX_ACL=y +CONFIG_XFS_RT=y +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +CONFIG_MINIX_FS=m +CONFIG_ROMFS_FS=m +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_QUOTA=y +CONFIG_QFMT_V1=m +CONFIG_QFMT_V2=m +CONFIG_QUOTACTL=y +CONFIG_DNOTIFY=y +CONFIG_AUTOFS_FS=m +CONFIG_AUTOFS4_FS=m +# CONFIG_FUSE_FS is not set + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=y +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=y +CONFIG_UDF_NLS=y + +# +# 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 + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y +# CONFIG_CONFIGFS_FS is not set + +# +# Miscellaneous filesystems +# +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_JFFS2_FS=m +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set +CONFIG_CRAMFS=y +CONFIG_VXFS_FS=m +CONFIG_HPFS_FS=m +CONFIG_QNX4FS_FS=m +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set + +# +# Network File Systems +# +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFSD=m +# CONFIG_NFSD_V3 is not set +CONFIG_NFSD_TCP=y +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=m +# CONFIG_SUNRPC_BIND34 is not set +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_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set +CONFIG_NCP_FS=m +# CONFIG_NCPFS_PACKET_SIGNING is not set +# CONFIG_NCPFS_IOCTL_LOCKING is not set +# CONFIG_NCPFS_STRONG is not set +# CONFIG_NCPFS_NFS_NS is not set +# CONFIG_NCPFS_OS2_NS is not set +# CONFIG_NCPFS_SMALLDOS is not set +# CONFIG_NCPFS_NLS is not set +# CONFIG_NCPFS_EXTRAS is not set +CONFIG_CODA_FS=m +# CONFIG_CODA_FS_OLD_API is not set +CONFIG_AFS_FS=m +# CONFIG_AFS_DEBUG is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +CONFIG_MAC_PARTITION=y +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set + +# +# Native Language Support +# +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m + +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# +# IBM 40x options +# + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=m +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y +# CONFIG_PROFILING is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y +# CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +CONFIG_DEBUG_FS=y +# CONFIG_HEADERS_CHECK is not set +# CONFIG_DEBUG_KERNEL is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +# CONFIG_SERIAL_TEXT_DEBUG is not set +CONFIG_PPC_OCP=y + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_KEYS_DEBUG_PROC_KEYS is not set +CONFIG_SECURITY=y +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_CAPABILITIES=m +CONFIG_SECURITY_ROOTPLUG=m +CONFIG_XOR_BLOCKS=m +CONFIG_ASYNC_CORE=m +CONFIG_ASYNC_MEMCPY=m +CONFIG_ASYNC_XOR=m +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_LRW=m +# CONFIG_CRYPTO_CRYPTD is not set +CONFIG_CRYPTO_DES=m +# CONFIG_CRYPTO_FCRYPT is not set +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +# CONFIG_CRYPTO_CAMELLIA is not set +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_HW=y diff --git a/packages/linux/linux-dht-walnut/remove-todc.patch b/packages/linux/linux-dht-walnut/remove-todc.patch new file mode 100644 index 0000000000..afdc904a08 --- /dev/null +++ b/packages/linux/linux-dht-walnut/remove-todc.patch @@ -0,0 +1,920 @@ +Index: working-2.6/arch/powerpc/sysdev/todc.c +=================================================================== +--- working-2.6.orig/arch/powerpc/sysdev/todc.c 2006-08-25 14:27:11.000000000 +1000 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,392 +0,0 @@ +-/* +- * Time of Day Clock support for the M48T35, M48T37, M48T59, and MC146818 +- * Real Time Clocks/Timekeepers. +- * +- * Author: Mark A. Greer <mgreer@mvista.com> +- * +- * 2001-2004 (c) MontaVista, Software, Inc. This file is licensed under +- * the terms of the GNU General Public License version 2. This program +- * is licensed "as is" without any warranty of any kind, whether express +- * or implied. +- */ +-#include <linux/errno.h> +-#include <linux/init.h> +-#include <linux/kernel.h> +-#include <linux/time.h> +-#include <linux/timex.h> +-#include <linux/bcd.h> +-#include <linux/mc146818rtc.h> +- +-#include <asm/machdep.h> +-#include <asm/io.h> +-#include <asm/time.h> +-#include <asm/todc.h> +- +-/* +- * Depending on the hardware on your board and your board design, the +- * RTC/NVRAM may be accessed either directly (like normal memory) or via +- * address/data registers. If your board uses the direct method, set +- * 'nvram_data' to the base address of your nvram and leave 'nvram_as0' and +- * 'nvram_as1' NULL. If your board uses address/data regs to access nvram, +- * set 'nvram_as0' to the address of the lower byte, set 'nvram_as1' to the +- * address of the upper byte (leave NULL if using mc146818), and set +- * 'nvram_data' to the address of the 8-bit data register. +- * +- * Note: Even though the documentation for the various RTC chips say that it +- * take up to a second before it starts updating once the 'R' bit is +- * cleared, they always seem to update even though we bang on it many +- * times a second. This is true, except for the Dallas Semi 1746/1747 +- * (possibly others). Those chips seem to have a real problem whenever +- * we set the 'R' bit before reading them, they basically stop counting. +- * --MAG +- */ +- +-/* +- * 'todc_info' should be initialized in your *_setup.c file to +- * point to a fully initialized 'todc_info_t' structure. +- * This structure holds all the register offsets for your particular +- * TODC/RTC chip. +- * TODC_ALLOC()/TODC_INIT() will allocate and initialize this table for you. +- */ +- +-#ifdef RTC_FREQ_SELECT +-#undef RTC_FREQ_SELECT +-#define RTC_FREQ_SELECT control_b /* Register A */ +-#endif +- +-#ifdef RTC_CONTROL +-#undef RTC_CONTROL +-#define RTC_CONTROL control_a /* Register B */ +-#endif +- +-#ifdef RTC_INTR_FLAGS +-#undef RTC_INTR_FLAGS +-#define RTC_INTR_FLAGS watchdog /* Register C */ +-#endif +- +-#ifdef RTC_VALID +-#undef RTC_VALID +-#define RTC_VALID interrupts /* Register D */ +-#endif +- +-/* Access routines when RTC accessed directly (like normal memory) */ +-u_char +-todc_direct_read_val(int addr) +-{ +- return readb((void __iomem *)(todc_info->nvram_data + addr)); +-} +- +-void +-todc_direct_write_val(int addr, unsigned char val) +-{ +- writeb(val, (void __iomem *)(todc_info->nvram_data + addr)); +- return; +-} +- +-/* Access routines for accessing m48txx type chips via addr/data regs */ +-u_char +-todc_m48txx_read_val(int addr) +-{ +- outb(addr, todc_info->nvram_as0); +- outb(addr>>todc_info->as0_bits, todc_info->nvram_as1); +- return inb(todc_info->nvram_data); +-} +- +-void +-todc_m48txx_write_val(int addr, unsigned char val) +-{ +- outb(addr, todc_info->nvram_as0); +- outb(addr>>todc_info->as0_bits, todc_info->nvram_as1); +- outb(val, todc_info->nvram_data); +- return; +-} +- +-/* Access routines for accessing mc146818 type chips via addr/data regs */ +-u_char +-todc_mc146818_read_val(int addr) +-{ +- outb_p(addr, todc_info->nvram_as0); +- return inb_p(todc_info->nvram_data); +-} +- +-void +-todc_mc146818_write_val(int addr, unsigned char val) +-{ +- outb_p(addr, todc_info->nvram_as0); +- outb_p(val, todc_info->nvram_data); +-} +- +- +-/* +- * Routines to make RTC chips with NVRAM buried behind an addr/data pair +- * have the NVRAM and clock regs appear at the same level. +- * The NVRAM will appear to start at addr 0 and the clock regs will appear +- * to start immediately after the NVRAM (actually, start at offset +- * todc_info->nvram_size). +- */ +-static inline u_char +-todc_read_val(int addr) +-{ +- u_char val; +- +- if (todc_info->sw_flags & TODC_FLAG_2_LEVEL_NVRAM) { +- if (addr < todc_info->nvram_size) { /* NVRAM */ +- ppc_md.rtc_write_val(todc_info->nvram_addr_reg, addr); +- val = ppc_md.rtc_read_val(todc_info->nvram_data_reg); +- } else { /* Clock Reg */ +- addr -= todc_info->nvram_size; +- val = ppc_md.rtc_read_val(addr); +- } +- } else +- val = ppc_md.rtc_read_val(addr); +- +- return val; +-} +- +-static inline void +-todc_write_val(int addr, u_char val) +-{ +- if (todc_info->sw_flags & TODC_FLAG_2_LEVEL_NVRAM) { +- if (addr < todc_info->nvram_size) { /* NVRAM */ +- ppc_md.rtc_write_val(todc_info->nvram_addr_reg, addr); +- ppc_md.rtc_write_val(todc_info->nvram_data_reg, val); +- } else { /* Clock Reg */ +- addr -= todc_info->nvram_size; +- ppc_md.rtc_write_val(addr, val); +- } +- } else +- ppc_md.rtc_write_val(addr, val); +-} +- +-/* +- * TODC routines +- * +- * There is some ugly stuff in that there are assumptions for the mc146818. +- * +- * Assumptions: +- * - todc_info->control_a has the offset as mc146818 Register B reg +- * - todc_info->control_b has the offset as mc146818 Register A reg +- * - m48txx control reg's write enable or 'W' bit is same as +- * mc146818 Register B 'SET' bit (i.e., 0x80) +- * +- * These assumptions were made to make the code simpler. +- */ +-long __init +-todc_time_init(void) +-{ +- u_char cntl_b; +- +- if (!ppc_md.rtc_read_val) +- ppc_md.rtc_read_val = ppc_md.nvram_read_val; +- if (!ppc_md.rtc_write_val) +- ppc_md.rtc_write_val = ppc_md.nvram_write_val; +- +- cntl_b = todc_read_val(todc_info->control_b); +- +- if (todc_info->rtc_type == TODC_TYPE_MC146818) { +- if ((cntl_b & 0x70) != 0x20) { +- printk(KERN_INFO "TODC real-time-clock was stopped." +- " Now starting..."); +- cntl_b &= ~0x70; +- cntl_b |= 0x20; +- } +- +- todc_write_val(todc_info->control_b, cntl_b); +- } else if (todc_info->rtc_type == TODC_TYPE_DS17285) { +- u_char mode; +- +- mode = todc_read_val(TODC_TYPE_DS17285_CNTL_A); +- /* Make sure countdown clear is not set */ +- mode &= ~0x40; +- /* Enable oscillator, extended register set */ +- mode |= 0x30; +- todc_write_val(TODC_TYPE_DS17285_CNTL_A, mode); +- +- } else if (todc_info->rtc_type == TODC_TYPE_DS1501) { +- u_char month; +- +- todc_info->enable_read = TODC_DS1501_CNTL_B_TE; +- todc_info->enable_write = TODC_DS1501_CNTL_B_TE; +- +- month = todc_read_val(todc_info->month); +- +- if ((month & 0x80) == 0x80) { +- printk(KERN_INFO "TODC %s %s\n", +- "real-time-clock was stopped.", +- "Now starting..."); +- month &= ~0x80; +- todc_write_val(todc_info->month, month); +- } +- +- cntl_b &= ~TODC_DS1501_CNTL_B_TE; +- todc_write_val(todc_info->control_b, cntl_b); +- } else { /* must be a m48txx type */ +- u_char cntl_a; +- +- todc_info->enable_read = TODC_MK48TXX_CNTL_A_R; +- todc_info->enable_write = TODC_MK48TXX_CNTL_A_W; +- +- cntl_a = todc_read_val(todc_info->control_a); +- +- /* Check & clear STOP bit in control B register */ +- if (cntl_b & TODC_MK48TXX_DAY_CB) { +- printk(KERN_INFO "TODC %s %s\n", +- "real-time-clock was stopped.", +- "Now starting..."); +- +- cntl_a |= todc_info->enable_write; +- cntl_b &= ~TODC_MK48TXX_DAY_CB;/* Start Oscil */ +- +- todc_write_val(todc_info->control_a, cntl_a); +- todc_write_val(todc_info->control_b, cntl_b); +- } +- +- /* Make sure READ & WRITE bits are cleared. */ +- cntl_a &= ~(todc_info->enable_write | todc_info->enable_read); +- todc_write_val(todc_info->control_a, cntl_a); +- } +- +- return 0; +-} +- +-/* +- * There is some ugly stuff in that there are assumptions that for a mc146818, +- * the todc_info->control_a has the offset of the mc146818 Register B reg and +- * that the register'ss 'SET' bit is the same as the m48txx's write enable +- * bit in the control register of the m48txx (i.e., 0x80). +- * +- * It was done to make the code look simpler. +- */ +-void +-todc_get_rtc_time(struct rtc_time *tm) +-{ +- uint year = 0, mon = 0, mday = 0, hour = 0, min = 0, sec = 0; +- uint limit, i; +- u_char save_control, uip = 0; +- extern void GregorianDay(struct rtc_time *); +- +- spin_lock(&rtc_lock); +- save_control = todc_read_val(todc_info->control_a); +- +- if (todc_info->rtc_type != TODC_TYPE_MC146818) { +- limit = 1; +- +- switch (todc_info->rtc_type) { +- case TODC_TYPE_DS1553: +- case TODC_TYPE_DS1557: +- case TODC_TYPE_DS1743: +- case TODC_TYPE_DS1746: /* XXXX BAD HACK -> FIX */ +- case TODC_TYPE_DS1747: +- case TODC_TYPE_DS17285: +- break; +- default: +- todc_write_val(todc_info->control_a, +- (save_control | todc_info->enable_read)); +- } +- } else +- limit = 100000000; +- +- for (i=0; i<limit; i++) { +- if (todc_info->rtc_type == TODC_TYPE_MC146818) +- uip = todc_read_val(todc_info->RTC_FREQ_SELECT); +- +- sec = todc_read_val(todc_info->seconds) & 0x7f; +- min = todc_read_val(todc_info->minutes) & 0x7f; +- hour = todc_read_val(todc_info->hours) & 0x3f; +- mday = todc_read_val(todc_info->day_of_month) & 0x3f; +- mon = todc_read_val(todc_info->month) & 0x1f; +- year = todc_read_val(todc_info->year) & 0xff; +- +- if (todc_info->rtc_type == TODC_TYPE_MC146818) { +- uip |= todc_read_val(todc_info->RTC_FREQ_SELECT); +- if ((uip & RTC_UIP) == 0) +- break; +- } +- } +- +- if (todc_info->rtc_type != TODC_TYPE_MC146818) { +- switch (todc_info->rtc_type) { +- case TODC_TYPE_DS1553: +- case TODC_TYPE_DS1557: +- case TODC_TYPE_DS1743: +- case TODC_TYPE_DS1746: /* XXXX BAD HACK -> FIX */ +- case TODC_TYPE_DS1747: +- case TODC_TYPE_DS17285: +- break; +- default: +- save_control &= ~(todc_info->enable_read); +- todc_write_val(todc_info->control_a, save_control); +- } +- } +- spin_unlock(&rtc_lock); +- +- if ((todc_info->rtc_type != TODC_TYPE_MC146818) +- || ((save_control & RTC_DM_BINARY) == 0) +- || RTC_ALWAYS_BCD) { +- BCD_TO_BIN(sec); +- BCD_TO_BIN(min); +- BCD_TO_BIN(hour); +- BCD_TO_BIN(mday); +- BCD_TO_BIN(mon); +- BCD_TO_BIN(year); +- } +- +- if ((year + 1900) < 1970) { +- year += 100; +- } +- +- tm->tm_sec = sec; +- tm->tm_min = min; +- tm->tm_hour = hour; +- tm->tm_mday = mday; +- tm->tm_mon = mon; +- tm->tm_year = year; +- +- GregorianDay(tm); +-} +- +-int +-todc_set_rtc_time(struct rtc_time *tm) +-{ +- u_char save_control, save_freq_select = 0; +- +- spin_lock(&rtc_lock); +- save_control = todc_read_val(todc_info->control_a); +- +- /* Assuming MK48T59_RTC_CA_WRITE & RTC_SET are equal */ +- todc_write_val(todc_info->control_a, +- (save_control | todc_info->enable_write)); +- save_control &= ~(todc_info->enable_write); /* in case it was set */ +- +- if (todc_info->rtc_type == TODC_TYPE_MC146818) { +- save_freq_select = todc_read_val(todc_info->RTC_FREQ_SELECT); +- todc_write_val(todc_info->RTC_FREQ_SELECT, +- save_freq_select | RTC_DIV_RESET2); +- } +- +- if ((todc_info->rtc_type != TODC_TYPE_MC146818) +- || ((save_control & RTC_DM_BINARY) == 0) +- || RTC_ALWAYS_BCD) { +- BIN_TO_BCD(tm->tm_sec); +- BIN_TO_BCD(tm->tm_min); +- BIN_TO_BCD(tm->tm_hour); +- BIN_TO_BCD(tm->tm_mon); +- BIN_TO_BCD(tm->tm_mday); +- BIN_TO_BCD(tm->tm_year); +- } +- +- todc_write_val(todc_info->seconds, tm->tm_sec); +- todc_write_val(todc_info->minutes, tm->tm_min); +- todc_write_val(todc_info->hours, tm->tm_hour); +- todc_write_val(todc_info->month, tm->tm_mon); +- todc_write_val(todc_info->day_of_month, tm->tm_mday); +- todc_write_val(todc_info->year, tm->tm_year); +- +- todc_write_val(todc_info->control_a, save_control); +- +- if (todc_info->rtc_type == TODC_TYPE_MC146818) +- todc_write_val(todc_info->RTC_FREQ_SELECT, save_freq_select); +- +- spin_unlock(&rtc_lock); +- return 0; +-} +Index: working-2.6/include/asm-powerpc/todc.h +=================================================================== +--- working-2.6.orig/include/asm-powerpc/todc.h 2006-08-25 14:27:15.000000000 +1000 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,487 +0,0 @@ +-/* +- * Definitions for the M48Txx and mc146818 series of Time of day/Real Time +- * Clock chips. +- * +- * Author: Mark A. Greer <mgreer@mvista.com> +- * +- * 2001 (c) MontaVista, Software, Inc. This file is licensed under +- * the terms of the GNU General Public License version 2. This program +- * is licensed "as is" without any warranty of any kind, whether express +- * or implied. +- */ +- +-/* +- * Support for the M48T37/M48T59/.../mc146818 Real Time Clock chips. +- * Purpose is to make one generic file that handles all of these chips instead +- * of every platform implementing the same code over & over again. +- */ +- +-#ifndef __PPC_KERNEL_TODC_H +-#define __PPC_KERNEL_TODC_H +- +-typedef struct { +- uint rtc_type; /* your particular chip */ +- +- /* +- * Following are the addresses of the AS0, AS1, and DATA registers +- * of these chips. Note that these are board-specific. +- */ +- unsigned int nvram_as0; +- unsigned int nvram_as1; +- unsigned int nvram_data; +- +- /* +- * Define bits to stop external set of regs from changing so +- * the chip can be read/written reliably. +- */ +- unsigned char enable_read; +- unsigned char enable_write; +- +- /* +- * Following is the number of AS0 address bits. This is normally +- * 8 but some bad hardware routes address lines incorrectly. +- */ +- int as0_bits; +- +- int nvram_size; /* Size of NVRAM on chip */ +- int sw_flags; /* Software control flags */ +- +- /* Following are the register offsets for the particular chip */ +- int year; +- int month; +- int day_of_month; +- int day_of_week; +- int hours; +- int minutes; +- int seconds; +- int control_b; +- int control_a; +- int watchdog; +- int interrupts; +- int alarm_date; +- int alarm_hour; +- int alarm_minutes; +- int alarm_seconds; +- int century; +- int flags; +- +- /* +- * Some RTC chips have their NVRAM buried behind a addr/data pair of +- * regs on the first level/clock registers. The following fields +- * are the addresses for those addr/data regs. +- */ +- int nvram_addr_reg; +- int nvram_data_reg; +-} todc_info_t; +- +-/* +- * Define the types of TODC/RTC variants that are supported in +- * arch/ppc/kernel/todc_time.c +- * Make a new one of these for any chip somehow differs from what's already +- * defined. That way, if you ever need to put in code to touch those +- * bits/registers in todc_time.c, you can put it inside an +- * 'if (todc_info->rtc_type == TODC_TYPE_XXX)' so you won't break +- * anyone else. +- */ +-#define TODC_TYPE_MK48T35 1 +-#define TODC_TYPE_MK48T37 2 +-#define TODC_TYPE_MK48T59 3 +-#define TODC_TYPE_DS1693 4 /* Dallas DS1693 RTC */ +-#define TODC_TYPE_DS1743 5 /* Dallas DS1743 RTC */ +-#define TODC_TYPE_DS1746 6 /* Dallas DS1746 RTC */ +-#define TODC_TYPE_DS1747 7 /* Dallas DS1747 RTC */ +-#define TODC_TYPE_DS1501 8 /* Dallas DS1501 RTC */ +-#define TODC_TYPE_DS1643 9 /* Dallas DS1643 RTC */ +-#define TODC_TYPE_PC97307 10 /* PC97307 internal RTC */ +-#define TODC_TYPE_DS1557 11 /* Dallas DS1557 RTC */ +-#define TODC_TYPE_DS17285 12 /* Dallas DS17285 RTC */ +-#define TODC_TYPE_DS1553 13 /* Dallas DS1553 RTC */ +-#define TODC_TYPE_MC146818 100 /* Leave room for m48txx's */ +- +-/* +- * Bit to clear/set to enable reads/writes to the chip +- */ +-#define TODC_MK48TXX_CNTL_A_R 0x40 +-#define TODC_MK48TXX_CNTL_A_W 0x80 +-#define TODC_MK48TXX_DAY_CB 0x80 +- +-#define TODC_DS1501_CNTL_B_TE 0x80 +- +-/* +- * Define flag bits used by todc routines. +- */ +-#define TODC_FLAG_2_LEVEL_NVRAM 0x00000001 +- +-/* +- * Define the values for the various RTC's that should to into the todc_info +- * table. +- * Note: The XXX_NVRAM_SIZE, XXX_NVRAM_ADDR_REG, and XXX_NVRAM_DATA_REG only +- * matter if XXX_SW_FLAGS has TODC_FLAG_2_LEVEL_NVRAM set. +- */ +-#define TODC_TYPE_MK48T35_NVRAM_SIZE 0x7ff8 +-#define TODC_TYPE_MK48T35_SW_FLAGS 0 +-#define TODC_TYPE_MK48T35_YEAR 0x7fff +-#define TODC_TYPE_MK48T35_MONTH 0x7ffe +-#define TODC_TYPE_MK48T35_DOM 0x7ffd /* Day of Month */ +-#define TODC_TYPE_MK48T35_DOW 0x7ffc /* Day of Week */ +-#define TODC_TYPE_MK48T35_HOURS 0x7ffb +-#define TODC_TYPE_MK48T35_MINUTES 0x7ffa +-#define TODC_TYPE_MK48T35_SECONDS 0x7ff9 +-#define TODC_TYPE_MK48T35_CNTL_B 0x7ff9 +-#define TODC_TYPE_MK48T35_CNTL_A 0x7ff8 +-#define TODC_TYPE_MK48T35_WATCHDOG 0x0000 +-#define TODC_TYPE_MK48T35_INTERRUPTS 0x0000 +-#define TODC_TYPE_MK48T35_ALARM_DATE 0x0000 +-#define TODC_TYPE_MK48T35_ALARM_HOUR 0x0000 +-#define TODC_TYPE_MK48T35_ALARM_MINUTES 0x0000 +-#define TODC_TYPE_MK48T35_ALARM_SECONDS 0x0000 +-#define TODC_TYPE_MK48T35_CENTURY 0x0000 +-#define TODC_TYPE_MK48T35_FLAGS 0x0000 +-#define TODC_TYPE_MK48T35_NVRAM_ADDR_REG 0 +-#define TODC_TYPE_MK48T35_NVRAM_DATA_REG 0 +- +-#define TODC_TYPE_MK48T37_NVRAM_SIZE 0x7ff0 +-#define TODC_TYPE_MK48T37_SW_FLAGS 0 +-#define TODC_TYPE_MK48T37_YEAR 0x7fff +-#define TODC_TYPE_MK48T37_MONTH 0x7ffe +-#define TODC_TYPE_MK48T37_DOM 0x7ffd /* Day of Month */ +-#define TODC_TYPE_MK48T37_DOW 0x7ffc /* Day of Week */ +-#define TODC_TYPE_MK48T37_HOURS 0x7ffb +-#define TODC_TYPE_MK48T37_MINUTES 0x7ffa +-#define TODC_TYPE_MK48T37_SECONDS 0x7ff9 +-#define TODC_TYPE_MK48T37_CNTL_B 0x7ff9 +-#define TODC_TYPE_MK48T37_CNTL_A 0x7ff8 +-#define TODC_TYPE_MK48T37_WATCHDOG 0x7ff7 +-#define TODC_TYPE_MK48T37_INTERRUPTS 0x7ff6 +-#define TODC_TYPE_MK48T37_ALARM_DATE 0x7ff5 +-#define TODC_TYPE_MK48T37_ALARM_HOUR 0x7ff4 +-#define TODC_TYPE_MK48T37_ALARM_MINUTES 0x7ff3 +-#define TODC_TYPE_MK48T37_ALARM_SECONDS 0x7ff2 +-#define TODC_TYPE_MK48T37_CENTURY 0x7ff1 +-#define TODC_TYPE_MK48T37_FLAGS 0x7ff0 +-#define TODC_TYPE_MK48T37_NVRAM_ADDR_REG 0 +-#define TODC_TYPE_MK48T37_NVRAM_DATA_REG 0 +- +-#define TODC_TYPE_MK48T59_NVRAM_SIZE 0x1ff0 +-#define TODC_TYPE_MK48T59_SW_FLAGS 0 +-#define TODC_TYPE_MK48T59_YEAR 0x1fff +-#define TODC_TYPE_MK48T59_MONTH 0x1ffe +-#define TODC_TYPE_MK48T59_DOM 0x1ffd /* Day of Month */ +-#define TODC_TYPE_MK48T59_DOW 0x1ffc /* Day of Week */ +-#define TODC_TYPE_MK48T59_HOURS 0x1ffb +-#define TODC_TYPE_MK48T59_MINUTES 0x1ffa +-#define TODC_TYPE_MK48T59_SECONDS 0x1ff9 +-#define TODC_TYPE_MK48T59_CNTL_B 0x1ff9 +-#define TODC_TYPE_MK48T59_CNTL_A 0x1ff8 +-#define TODC_TYPE_MK48T59_WATCHDOG 0x1fff +-#define TODC_TYPE_MK48T59_INTERRUPTS 0x1fff +-#define TODC_TYPE_MK48T59_ALARM_DATE 0x1fff +-#define TODC_TYPE_MK48T59_ALARM_HOUR 0x1fff +-#define TODC_TYPE_MK48T59_ALARM_MINUTES 0x1fff +-#define TODC_TYPE_MK48T59_ALARM_SECONDS 0x1fff +-#define TODC_TYPE_MK48T59_CENTURY 0x1fff +-#define TODC_TYPE_MK48T59_FLAGS 0x1fff +-#define TODC_TYPE_MK48T59_NVRAM_ADDR_REG 0 +-#define TODC_TYPE_MK48T59_NVRAM_DATA_REG 0 +- +-#define TODC_TYPE_DS1501_NVRAM_SIZE 0x100 +-#define TODC_TYPE_DS1501_SW_FLAGS TODC_FLAG_2_LEVEL_NVRAM +-#define TODC_TYPE_DS1501_YEAR (TODC_TYPE_DS1501_NVRAM_SIZE + 0x06) +-#define TODC_TYPE_DS1501_MONTH (TODC_TYPE_DS1501_NVRAM_SIZE + 0x05) +-#define TODC_TYPE_DS1501_DOM (TODC_TYPE_DS1501_NVRAM_SIZE + 0x04) +-#define TODC_TYPE_DS1501_DOW (TODC_TYPE_DS1501_NVRAM_SIZE + 0x03) +-#define TODC_TYPE_DS1501_HOURS (TODC_TYPE_DS1501_NVRAM_SIZE + 0x02) +-#define TODC_TYPE_DS1501_MINUTES (TODC_TYPE_DS1501_NVRAM_SIZE + 0x01) +-#define TODC_TYPE_DS1501_SECONDS (TODC_TYPE_DS1501_NVRAM_SIZE + 0x00) +-#define TODC_TYPE_DS1501_CNTL_B (TODC_TYPE_DS1501_NVRAM_SIZE + 0x0f) +-#define TODC_TYPE_DS1501_CNTL_A (TODC_TYPE_DS1501_NVRAM_SIZE + 0x0f) +-#define TODC_TYPE_DS1501_WATCHDOG (TODC_TYPE_DS1501_NVRAM_SIZE + 0xff) +-#define TODC_TYPE_DS1501_INTERRUPTS (TODC_TYPE_DS1501_NVRAM_SIZE + 0xff) +-#define TODC_TYPE_DS1501_ALARM_DATE (TODC_TYPE_DS1501_NVRAM_SIZE + 0x0b) +-#define TODC_TYPE_DS1501_ALARM_HOUR (TODC_TYPE_DS1501_NVRAM_SIZE + 0x0a) +-#define TODC_TYPE_DS1501_ALARM_MINUTES (TODC_TYPE_DS1501_NVRAM_SIZE + 0x09) +-#define TODC_TYPE_DS1501_ALARM_SECONDS (TODC_TYPE_DS1501_NVRAM_SIZE + 0x08) +-#define TODC_TYPE_DS1501_CENTURY (TODC_TYPE_DS1501_NVRAM_SIZE + 0x07) +-#define TODC_TYPE_DS1501_FLAGS (TODC_TYPE_DS1501_NVRAM_SIZE + 0xff) +-#define TODC_TYPE_DS1501_NVRAM_ADDR_REG 0x10 +-#define TODC_TYPE_DS1501_NVRAM_DATA_REG 0x13 +- +-#define TODC_TYPE_DS1553_NVRAM_SIZE 0x1ff0 +-#define TODC_TYPE_DS1553_SW_FLAGS 0 +-#define TODC_TYPE_DS1553_YEAR 0x1fff +-#define TODC_TYPE_DS1553_MONTH 0x1ffe +-#define TODC_TYPE_DS1553_DOM 0x1ffd /* Day of Month */ +-#define TODC_TYPE_DS1553_DOW 0x1ffc /* Day of Week */ +-#define TODC_TYPE_DS1553_HOURS 0x1ffb +-#define TODC_TYPE_DS1553_MINUTES 0x1ffa +-#define TODC_TYPE_DS1553_SECONDS 0x1ff9 +-#define TODC_TYPE_DS1553_CNTL_B 0x1ff9 +-#define TODC_TYPE_DS1553_CNTL_A 0x1ff8 /* control_a R/W regs */ +-#define TODC_TYPE_DS1553_WATCHDOG 0x1ff7 +-#define TODC_TYPE_DS1553_INTERRUPTS 0x1ff6 +-#define TODC_TYPE_DS1553_ALARM_DATE 0x1ff5 +-#define TODC_TYPE_DS1553_ALARM_HOUR 0x1ff4 +-#define TODC_TYPE_DS1553_ALARM_MINUTES 0x1ff3 +-#define TODC_TYPE_DS1553_ALARM_SECONDS 0x1ff2 +-#define TODC_TYPE_DS1553_CENTURY 0x1ff8 +-#define TODC_TYPE_DS1553_FLAGS 0x1ff0 +-#define TODC_TYPE_DS1553_NVRAM_ADDR_REG 0 +-#define TODC_TYPE_DS1553_NVRAM_DATA_REG 0 +- +-#define TODC_TYPE_DS1557_NVRAM_SIZE 0x7fff0 +-#define TODC_TYPE_DS1557_SW_FLAGS 0 +-#define TODC_TYPE_DS1557_YEAR 0x7ffff +-#define TODC_TYPE_DS1557_MONTH 0x7fffe +-#define TODC_TYPE_DS1557_DOM 0x7fffd /* Day of Month */ +-#define TODC_TYPE_DS1557_DOW 0x7fffc /* Day of Week */ +-#define TODC_TYPE_DS1557_HOURS 0x7fffb +-#define TODC_TYPE_DS1557_MINUTES 0x7fffa +-#define TODC_TYPE_DS1557_SECONDS 0x7fff9 +-#define TODC_TYPE_DS1557_CNTL_B 0x7fff9 +-#define TODC_TYPE_DS1557_CNTL_A 0x7fff8 /* control_a R/W regs */ +-#define TODC_TYPE_DS1557_WATCHDOG 0x7fff7 +-#define TODC_TYPE_DS1557_INTERRUPTS 0x7fff6 +-#define TODC_TYPE_DS1557_ALARM_DATE 0x7fff5 +-#define TODC_TYPE_DS1557_ALARM_HOUR 0x7fff4 +-#define TODC_TYPE_DS1557_ALARM_MINUTES 0x7fff3 +-#define TODC_TYPE_DS1557_ALARM_SECONDS 0x7fff2 +-#define TODC_TYPE_DS1557_CENTURY 0x7fff8 +-#define TODC_TYPE_DS1557_FLAGS 0x7fff0 +-#define TODC_TYPE_DS1557_NVRAM_ADDR_REG 0 +-#define TODC_TYPE_DS1557_NVRAM_DATA_REG 0 +- +-#define TODC_TYPE_DS1643_NVRAM_SIZE 0x1ff8 +-#define TODC_TYPE_DS1643_SW_FLAGS 0 +-#define TODC_TYPE_DS1643_YEAR 0x1fff +-#define TODC_TYPE_DS1643_MONTH 0x1ffe +-#define TODC_TYPE_DS1643_DOM 0x1ffd /* Day of Month */ +-#define TODC_TYPE_DS1643_DOW 0x1ffc /* Day of Week */ +-#define TODC_TYPE_DS1643_HOURS 0x1ffb +-#define TODC_TYPE_DS1643_MINUTES 0x1ffa +-#define TODC_TYPE_DS1643_SECONDS 0x1ff9 +-#define TODC_TYPE_DS1643_CNTL_B 0x1ff9 +-#define TODC_TYPE_DS1643_CNTL_A 0x1ff8 /* control_a R/W regs */ +-#define TODC_TYPE_DS1643_WATCHDOG 0x1fff +-#define TODC_TYPE_DS1643_INTERRUPTS 0x1fff +-#define TODC_TYPE_DS1643_ALARM_DATE 0x1fff +-#define TODC_TYPE_DS1643_ALARM_HOUR 0x1fff +-#define TODC_TYPE_DS1643_ALARM_MINUTES 0x1fff +-#define TODC_TYPE_DS1643_ALARM_SECONDS 0x1fff +-#define TODC_TYPE_DS1643_CENTURY 0x1ff8 +-#define TODC_TYPE_DS1643_FLAGS 0x1fff +-#define TODC_TYPE_DS1643_NVRAM_ADDR_REG 0 +-#define TODC_TYPE_DS1643_NVRAM_DATA_REG 0 +- +-#define TODC_TYPE_DS1693_NVRAM_SIZE 0 /* Not handled yet */ +-#define TODC_TYPE_DS1693_SW_FLAGS 0 +-#define TODC_TYPE_DS1693_YEAR 0x09 +-#define TODC_TYPE_DS1693_MONTH 0x08 +-#define TODC_TYPE_DS1693_DOM 0x07 /* Day of Month */ +-#define TODC_TYPE_DS1693_DOW 0x06 /* Day of Week */ +-#define TODC_TYPE_DS1693_HOURS 0x04 +-#define TODC_TYPE_DS1693_MINUTES 0x02 +-#define TODC_TYPE_DS1693_SECONDS 0x00 +-#define TODC_TYPE_DS1693_CNTL_B 0x0b +-#define TODC_TYPE_DS1693_CNTL_A 0x0a +-#define TODC_TYPE_DS1693_WATCHDOG 0xff +-#define TODC_TYPE_DS1693_INTERRUPTS 0xff +-#define TODC_TYPE_DS1693_ALARM_DATE 0x49 +-#define TODC_TYPE_DS1693_ALARM_HOUR 0x05 +-#define TODC_TYPE_DS1693_ALARM_MINUTES 0x03 +-#define TODC_TYPE_DS1693_ALARM_SECONDS 0x01 +-#define TODC_TYPE_DS1693_CENTURY 0x48 +-#define TODC_TYPE_DS1693_FLAGS 0xff +-#define TODC_TYPE_DS1693_NVRAM_ADDR_REG 0 +-#define TODC_TYPE_DS1693_NVRAM_DATA_REG 0 +- +-#define TODC_TYPE_DS1743_NVRAM_SIZE 0x1ff8 +-#define TODC_TYPE_DS1743_SW_FLAGS 0 +-#define TODC_TYPE_DS1743_YEAR 0x1fff +-#define TODC_TYPE_DS1743_MONTH 0x1ffe +-#define TODC_TYPE_DS1743_DOM 0x1ffd /* Day of Month */ +-#define TODC_TYPE_DS1743_DOW 0x1ffc /* Day of Week */ +-#define TODC_TYPE_DS1743_HOURS 0x1ffb +-#define TODC_TYPE_DS1743_MINUTES 0x1ffa +-#define TODC_TYPE_DS1743_SECONDS 0x1ff9 +-#define TODC_TYPE_DS1743_CNTL_B 0x1ff9 +-#define TODC_TYPE_DS1743_CNTL_A 0x1ff8 /* control_a R/W regs */ +-#define TODC_TYPE_DS1743_WATCHDOG 0x1fff +-#define TODC_TYPE_DS1743_INTERRUPTS 0x1fff +-#define TODC_TYPE_DS1743_ALARM_DATE 0x1fff +-#define TODC_TYPE_DS1743_ALARM_HOUR 0x1fff +-#define TODC_TYPE_DS1743_ALARM_MINUTES 0x1fff +-#define TODC_TYPE_DS1743_ALARM_SECONDS 0x1fff +-#define TODC_TYPE_DS1743_CENTURY 0x1ff8 +-#define TODC_TYPE_DS1743_FLAGS 0x1fff +-#define TODC_TYPE_DS1743_NVRAM_ADDR_REG 0 +-#define TODC_TYPE_DS1743_NVRAM_DATA_REG 0 +- +-#define TODC_TYPE_DS1746_NVRAM_SIZE 0x1fff8 +-#define TODC_TYPE_DS1746_SW_FLAGS 0 +-#define TODC_TYPE_DS1746_YEAR 0x1ffff +-#define TODC_TYPE_DS1746_MONTH 0x1fffe +-#define TODC_TYPE_DS1746_DOM 0x1fffd /* Day of Month */ +-#define TODC_TYPE_DS1746_DOW 0x1fffc /* Day of Week */ +-#define TODC_TYPE_DS1746_HOURS 0x1fffb +-#define TODC_TYPE_DS1746_MINUTES 0x1fffa +-#define TODC_TYPE_DS1746_SECONDS 0x1fff9 +-#define TODC_TYPE_DS1746_CNTL_B 0x1fff9 +-#define TODC_TYPE_DS1746_CNTL_A 0x1fff8 /* control_a R/W regs */ +-#define TODC_TYPE_DS1746_WATCHDOG 0x00000 +-#define TODC_TYPE_DS1746_INTERRUPTS 0x00000 +-#define TODC_TYPE_DS1746_ALARM_DATE 0x00000 +-#define TODC_TYPE_DS1746_ALARM_HOUR 0x00000 +-#define TODC_TYPE_DS1746_ALARM_MINUTES 0x00000 +-#define TODC_TYPE_DS1746_ALARM_SECONDS 0x00000 +-#define TODC_TYPE_DS1746_CENTURY 0x00000 +-#define TODC_TYPE_DS1746_FLAGS 0x00000 +-#define TODC_TYPE_DS1746_NVRAM_ADDR_REG 0 +-#define TODC_TYPE_DS1746_NVRAM_DATA_REG 0 +- +-#define TODC_TYPE_DS1747_NVRAM_SIZE 0x7fff8 +-#define TODC_TYPE_DS1747_SW_FLAGS 0 +-#define TODC_TYPE_DS1747_YEAR 0x7ffff +-#define TODC_TYPE_DS1747_MONTH 0x7fffe +-#define TODC_TYPE_DS1747_DOM 0x7fffd /* Day of Month */ +-#define TODC_TYPE_DS1747_DOW 0x7fffc /* Day of Week */ +-#define TODC_TYPE_DS1747_HOURS 0x7fffb +-#define TODC_TYPE_DS1747_MINUTES 0x7fffa +-#define TODC_TYPE_DS1747_SECONDS 0x7fff9 +-#define TODC_TYPE_DS1747_CNTL_B 0x7fff9 +-#define TODC_TYPE_DS1747_CNTL_A 0x7fff8 /* control_a R/W regs */ +-#define TODC_TYPE_DS1747_WATCHDOG 0x00000 +-#define TODC_TYPE_DS1747_INTERRUPTS 0x00000 +-#define TODC_TYPE_DS1747_ALARM_DATE 0x00000 +-#define TODC_TYPE_DS1747_ALARM_HOUR 0x00000 +-#define TODC_TYPE_DS1747_ALARM_MINUTES 0x00000 +-#define TODC_TYPE_DS1747_ALARM_SECONDS 0x00000 +-#define TODC_TYPE_DS1747_CENTURY 0x00000 +-#define TODC_TYPE_DS1747_FLAGS 0x00000 +-#define TODC_TYPE_DS1747_NVRAM_ADDR_REG 0 +-#define TODC_TYPE_DS1747_NVRAM_DATA_REG 0 +- +-#define TODC_TYPE_DS17285_NVRAM_SIZE (0x1000-0x80) /* 4Kx8 NVRAM (minus RTC regs) */ +-#define TODC_TYPE_DS17285_SW_FLAGS TODC_FLAG_2_LEVEL_NVRAM +-#define TODC_TYPE_DS17285_SECONDS (TODC_TYPE_DS17285_NVRAM_SIZE + 0x00) +-#define TODC_TYPE_DS17285_ALARM_SECONDS (TODC_TYPE_DS17285_NVRAM_SIZE + 0x01) +-#define TODC_TYPE_DS17285_MINUTES (TODC_TYPE_DS17285_NVRAM_SIZE + 0x02) +-#define TODC_TYPE_DS17285_ALARM_MINUTES (TODC_TYPE_DS17285_NVRAM_SIZE + 0x03) +-#define TODC_TYPE_DS17285_HOURS (TODC_TYPE_DS17285_NVRAM_SIZE + 0x04) +-#define TODC_TYPE_DS17285_ALARM_HOUR (TODC_TYPE_DS17285_NVRAM_SIZE + 0x05) +-#define TODC_TYPE_DS17285_DOW (TODC_TYPE_DS17285_NVRAM_SIZE + 0x06) +-#define TODC_TYPE_DS17285_DOM (TODC_TYPE_DS17285_NVRAM_SIZE + 0x07) +-#define TODC_TYPE_DS17285_MONTH (TODC_TYPE_DS17285_NVRAM_SIZE + 0x08) +-#define TODC_TYPE_DS17285_YEAR (TODC_TYPE_DS17285_NVRAM_SIZE + 0x09) +-#define TODC_TYPE_DS17285_CNTL_A (TODC_TYPE_DS17285_NVRAM_SIZE + 0x0A) +-#define TODC_TYPE_DS17285_CNTL_B (TODC_TYPE_DS17285_NVRAM_SIZE + 0x0B) +-#define TODC_TYPE_DS17285_CNTL_C (TODC_TYPE_DS17285_NVRAM_SIZE + 0x0C) +-#define TODC_TYPE_DS17285_CNTL_D (TODC_TYPE_DS17285_NVRAM_SIZE + 0x0D) +-#define TODC_TYPE_DS17285_WATCHDOG 0 +-#define TODC_TYPE_DS17285_INTERRUPTS 0 +-#define TODC_TYPE_DS17285_ALARM_DATE 0 +-#define TODC_TYPE_DS17285_CENTURY 0 +-#define TODC_TYPE_DS17285_FLAGS 0 +-#define TODC_TYPE_DS17285_NVRAM_ADDR_REG 0x50 +-#define TODC_TYPE_DS17285_NVRAM_DATA_REG 0x53 +- +-#define TODC_TYPE_MC146818_NVRAM_SIZE 0 /* XXXX */ +-#define TODC_TYPE_MC146818_SW_FLAGS 0 +-#define TODC_TYPE_MC146818_YEAR 0x09 +-#define TODC_TYPE_MC146818_MONTH 0x08 +-#define TODC_TYPE_MC146818_DOM 0x07 /* Day of Month */ +-#define TODC_TYPE_MC146818_DOW 0x06 /* Day of Week */ +-#define TODC_TYPE_MC146818_HOURS 0x04 +-#define TODC_TYPE_MC146818_MINUTES 0x02 +-#define TODC_TYPE_MC146818_SECONDS 0x00 +-#define TODC_TYPE_MC146818_CNTL_B 0x0a +-#define TODC_TYPE_MC146818_CNTL_A 0x0b /* control_a R/W regs */ +-#define TODC_TYPE_MC146818_WATCHDOG 0 +-#define TODC_TYPE_MC146818_INTERRUPTS 0x0c +-#define TODC_TYPE_MC146818_ALARM_DATE 0xff +-#define TODC_TYPE_MC146818_ALARM_HOUR 0x05 +-#define TODC_TYPE_MC146818_ALARM_MINUTES 0x03 +-#define TODC_TYPE_MC146818_ALARM_SECONDS 0x01 +-#define TODC_TYPE_MC146818_CENTURY 0xff +-#define TODC_TYPE_MC146818_FLAGS 0xff +-#define TODC_TYPE_MC146818_NVRAM_ADDR_REG 0 +-#define TODC_TYPE_MC146818_NVRAM_DATA_REG 0 +- +-#define TODC_TYPE_PC97307_NVRAM_SIZE 0 /* No NVRAM? */ +-#define TODC_TYPE_PC97307_SW_FLAGS 0 +-#define TODC_TYPE_PC97307_YEAR 0x09 +-#define TODC_TYPE_PC97307_MONTH 0x08 +-#define TODC_TYPE_PC97307_DOM 0x07 /* Day of Month */ +-#define TODC_TYPE_PC97307_DOW 0x06 /* Day of Week */ +-#define TODC_TYPE_PC97307_HOURS 0x04 +-#define TODC_TYPE_PC97307_MINUTES 0x02 +-#define TODC_TYPE_PC97307_SECONDS 0x00 +-#define TODC_TYPE_PC97307_CNTL_B 0x0a +-#define TODC_TYPE_PC97307_CNTL_A 0x0b /* control_a R/W regs */ +-#define TODC_TYPE_PC97307_WATCHDOG 0x0c +-#define TODC_TYPE_PC97307_INTERRUPTS 0x0d +-#define TODC_TYPE_PC97307_ALARM_DATE 0xff +-#define TODC_TYPE_PC97307_ALARM_HOUR 0x05 +-#define TODC_TYPE_PC97307_ALARM_MINUTES 0x03 +-#define TODC_TYPE_PC97307_ALARM_SECONDS 0x01 +-#define TODC_TYPE_PC97307_CENTURY 0xff +-#define TODC_TYPE_PC97307_FLAGS 0xff +-#define TODC_TYPE_PC97307_NVRAM_ADDR_REG 0 +-#define TODC_TYPE_PC97307_NVRAM_DATA_REG 0 +- +-/* +- * Define macros to allocate and init the todc_info_t table that will +- * be used by the todc_time.c routines. +- */ +-#define TODC_ALLOC() \ +- static todc_info_t todc_info_alloc; \ +- todc_info_t *todc_info = &todc_info_alloc; +- +-#define TODC_INIT(clock_type, as0, as1, data, bits) { \ +- todc_info->rtc_type = clock_type; \ +- \ +- todc_info->nvram_as0 = (unsigned int)(as0); \ +- todc_info->nvram_as1 = (unsigned int)(as1); \ +- todc_info->nvram_data = (unsigned int)(data); \ +- \ +- todc_info->as0_bits = (bits); \ +- \ +- todc_info->nvram_size = clock_type ##_NVRAM_SIZE; \ +- todc_info->sw_flags = clock_type ##_SW_FLAGS; \ +- \ +- todc_info->year = clock_type ##_YEAR; \ +- todc_info->month = clock_type ##_MONTH; \ +- todc_info->day_of_month = clock_type ##_DOM; \ +- todc_info->day_of_week = clock_type ##_DOW; \ +- todc_info->hours = clock_type ##_HOURS; \ +- todc_info->minutes = clock_type ##_MINUTES; \ +- todc_info->seconds = clock_type ##_SECONDS; \ +- todc_info->control_b = clock_type ##_CNTL_B; \ +- todc_info->control_a = clock_type ##_CNTL_A; \ +- todc_info->watchdog = clock_type ##_WATCHDOG; \ +- todc_info->interrupts = clock_type ##_INTERRUPTS; \ +- todc_info->alarm_date = clock_type ##_ALARM_DATE; \ +- todc_info->alarm_hour = clock_type ##_ALARM_HOUR; \ +- todc_info->alarm_minutes = clock_type ##_ALARM_MINUTES; \ +- todc_info->alarm_seconds = clock_type ##_ALARM_SECONDS; \ +- todc_info->century = clock_type ##_CENTURY; \ +- todc_info->flags = clock_type ##_FLAGS; \ +- \ +- todc_info->nvram_addr_reg = clock_type ##_NVRAM_ADDR_REG; \ +- todc_info->nvram_data_reg = clock_type ##_NVRAM_DATA_REG; \ +-} +- +-extern todc_info_t *todc_info; +- +-unsigned char todc_direct_read_val(int addr); +-void todc_direct_write_val(int addr, unsigned char val); +-unsigned char todc_m48txx_read_val(int addr); +-void todc_m48txx_write_val(int addr, unsigned char val); +-unsigned char todc_mc146818_read_val(int addr); +-void todc_mc146818_write_val(int addr, unsigned char val); +- +-long todc_time_init(void); +-void todc_get_rtc_time(struct rtc_time *); +-int todc_set_rtc_time(struct rtc_time *); +-void todc_calibrate_decr(void); +- +-#endif /* __PPC_KERNEL_TODC_H */ +Index: working-2.6/arch/powerpc/sysdev/Makefile +=================================================================== +--- working-2.6.orig/arch/powerpc/sysdev/Makefile 2006-10-03 14:57:15.000000000 +1000 ++++ working-2.6/arch/powerpc/sysdev/Makefile 2006-10-03 16:31:48.000000000 +1000 +@@ -10,7 +10,6 @@ obj-$(CONFIG_40x) += dcr.o + obj-$(CONFIG_U3_DART) += dart_iommu.o + obj-$(CONFIG_MMIO_NVRAM) += mmio_nvram.o + obj-$(CONFIG_FSL_SOC) += fsl_soc.o +-obj-$(CONFIG_PPC_TODC) += todc.o + obj-$(CONFIG_TSI108_BRIDGE) += tsi108_pci.o tsi108_dev.o + + ifeq ($(CONFIG_PPC_MERGE),y) +Index: working-2.6/arch/powerpc/Kconfig +=================================================================== +--- working-2.6.orig/arch/powerpc/Kconfig 2006-10-03 16:26:20.000000000 +1000 ++++ working-2.6/arch/powerpc/Kconfig 2006-10-03 16:33:10.000000000 +1000 +@@ -584,12 +584,6 @@ config TAU_AVERAGE + + If in doubt, say N here. + +-config PPC_TODC +- depends on EMBEDDED6xx +- bool "Generic Time-of-day Clock (TODC) support" +- ---help--- +- This adds support for many TODC/RTC chips. +- + endmenu + + source arch/powerpc/platforms/embedded6xx/Kconfig + + diff --git a/packages/linux/linux-dht-walnut_2.6.20.bb b/packages/linux/linux-dht-walnut_2.6.20.bb index 89a776e075..61836ac204 100644 --- a/packages/linux/linux-dht-walnut_2.6.20.bb +++ b/packages/linux/linux-dht-walnut_2.6.20.bb @@ -1,65 +1,43 @@ # Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved # Released under the MIT license (see packages/COPYING) -SECTION = "kernel" +require linux.inc + DESCRIPTION = "Linux kernel for DHT-Walnut (ppc) machine" -LICENSE = "GPL" -PR = "r3" + +PR = "r4" DEPENDS = "u-boot" COMPATIBLE_MACHINE = "dht-walnut" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://dht-walnut_defconfig" - + file://defconfig" S = "${WORKDIR}/linux-${PV}" -inherit kernel - - FILES_kernel-image = "/boot/zImage.elf" export OS = "Linux" ARCH = "ppc" -KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf" - - - - -do_configure_prepend() { - install -m 0644 ${WORKDIR}/dht-walnut_defconfig ${S}/.config -} - do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } - - - - do_install_append () { install -d ${DEPLOY_DIR_IMAGE} - install -m 0755 arch/ppc/boot/images/zImage.elf \ + if [ -e arch/ppc/boot/images/zImage.elf ] ; then + cp -a arch/ppc/boot/images/zImage.elf arch/ppc/boot/images/zImage + install -m 0755 arch/ppc/boot/images/zImage.elf \ ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.elf + fi install -m 0755 vmlinux ${DEPLOY_DIR_IMAGE}/ - powerpc${TARGET_VENDOR}-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S \ - ${DEPLOY_DIR_IMAGE}/vmlinux ${DEPLOY_DIR_IMAGE}/linux.bin - gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin - mkimage -A ppc -O linux -T kernel -C gzip -a 0 -e 0 -n "ppc405"+${PV} -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz \ - ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${MACHINE}-${DATETIME}.bin - rm ${DEPLOY_DIR_IMAGE}/vmlinux - rm ${DEPLOY_DIR_IMAGE}/linux.bin.gz - - } diff --git a/packages/linux/linux-dht-walnut_2.6.23.bb b/packages/linux/linux-dht-walnut_2.6.23.bb new file mode 100644 index 0000000000..181488190e --- /dev/null +++ b/packages/linux/linux-dht-walnut_2.6.23.bb @@ -0,0 +1,56 @@ +# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved +# Released under the MIT license (see packages/COPYING) +require linux.inc + +DESCRIPTION = "Linux kernel for DHT-Walnut (ppc) machine" + +DEFAULT_PREFERENCE = "-1" + +PR = "r0" +DEPENDS = "u-boot" + +COMPATIBLE_MACHINE = "dht-walnut" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + file://defconfig" + +S = "${WORKDIR}/linux-${PV}" + +FILES_kernel-image = "/boot/zImage.elf" + +export OS = "Linux" +ARCH = "ppc" + +do_stage_append () { +#need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split + + install -d ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ +} + +do_install_append () { + install -d ${DEPLOY_DIR_IMAGE} + if [ -e arch/ppc/boot/images/zImage.elf ] ; then + cp -a arch/ppc/boot/images/zImage.elf arch/ppc/boot/images/zImage + install -m 0755 arch/ppc/boot/images/zImage.elf \ + ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.elf + fi + install -m 0755 vmlinux ${DEPLOY_DIR_IMAGE}/ +} + + +pkg_postinst_kernel () { + true +} + +pkg_postrm_kernel () { + true +} + + + + diff --git a/packages/linux/linux-efika_2.6.20.20.bb b/packages/linux/linux-efika_2.6.20.20.bb index 630e5a6274..8ef0af6c78 100644 --- a/packages/linux/linux-efika_2.6.20.20.bb +++ b/packages/linux/linux-efika_2.6.20.20.bb @@ -63,12 +63,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } do_deploy() { diff --git a/packages/linux/linux-efika_2.6.20.bb b/packages/linux/linux-efika_2.6.20.bb index ddf3ee3257..87c769a1ae 100644 --- a/packages/linux/linux-efika_2.6.20.bb +++ b/packages/linux/linux-efika_2.6.20.bb @@ -60,12 +60,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux-efika_2.6.21+git.bb b/packages/linux/linux-efika_2.6.21+git.bb index 80a4e69a4a..5f8427ef1e 100644 --- a/packages/linux/linux-efika_2.6.21+git.bb +++ b/packages/linux/linux-efika_2.6.21+git.bb @@ -47,12 +47,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } do_deploy() { diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig index 6a2bc0475b..68e39e7019 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:12 2007 +# Wed Dec 26 16:55:31 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -378,20 +378,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -975,12 +1028,13 @@ CONFIG_USB_PXA2XX=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # CONFIG_USB_PXA2XX_GPIO is not set @@ -1029,8 +1083,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1096,17 +1156,16 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig index f6c7789570..3c1cfbad8f 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:12 2007 +# Wed Dec 26 16:55:31 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -384,20 +384,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -1079,12 +1132,13 @@ CONFIG_USB_PXA27X=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # CONFIG_USB_PXA2XX_GPIO is not set @@ -1139,8 +1193,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1217,17 +1277,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig index 89bfc0908a..8e845fb396 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:13 2007 +# Wed Dec 26 16:55:32 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -378,20 +378,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -960,12 +1013,13 @@ CONFIG_USB_PXA27X=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # CONFIG_USB_PXA2XX_GPIO is not set @@ -1014,8 +1068,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1081,17 +1141,16 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig index b1f87fb443..49a907e5fe 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:13 2007 +# Wed Dec 26 16:55:32 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -367,20 +367,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -951,12 +1004,13 @@ CONFIG_USB_S3C2410=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set @@ -1004,8 +1058,14 @@ CONFIG_RTC_DRV_S3C=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1071,17 +1131,16 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig index 902434149b..dd20e0baff 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:14 2007 +# Wed Dec 26 16:55:32 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -376,20 +376,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -1023,12 +1076,13 @@ CONFIG_USB_PXA2XX=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # CONFIG_USB_PXA2XX_GPIO is not set @@ -1084,8 +1138,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1151,17 +1211,16 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig index 1d53dfd987..532752a44f 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:14 2007 +# Wed Dec 26 16:55:33 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -384,20 +384,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -1414,12 +1467,13 @@ CONFIG_USB_PXA2XX=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set CONFIG_USB_PXA2XX_GPIO=y @@ -1474,8 +1528,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1552,17 +1612,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig index a8012cc460..2a29e61877 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:15 2007 +# Wed Dec 26 16:55:33 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -163,7 +163,7 @@ CONFIG_SA1100_H3XXX=y # CONFIG_SA1100_SIMPAD is not set # CONFIG_SA1100_SSP is not set # CONFIG_H3600_SLEEVE is not set -CONFIG_SA1100_USB=y +CONFIG_SA1100_USB=m # CONFIG_SA1100_USB_NETLINK is not set # CONFIG_SA1100_USB_CHAR is not set CONFIG_IPAQ_H3600_LCD=y @@ -355,20 +355,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -992,8 +1045,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1070,17 +1129,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig index d110b3f223..2132550832 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:15 2007 +# Wed Dec 26 16:55:34 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -162,7 +162,7 @@ CONFIG_SA1100_H3XXX=y # CONFIG_SA1100_SHANNON is not set # CONFIG_SA1100_SIMPAD is not set # CONFIG_SA1100_SSP is not set -CONFIG_SA1100_USB=y +CONFIG_SA1100_USB=m # CONFIG_SA1100_USB_NETLINK is not set # CONFIG_SA1100_USB_CHAR is not set @@ -353,20 +353,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -990,8 +1043,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1068,17 +1127,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig index fe9fa52b84..53bbe32ec0 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:16 2007 +# Wed Dec 26 16:55:34 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -377,20 +377,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -1046,12 +1099,13 @@ CONFIG_USB_PXA2XX=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # CONFIG_USB_PXA2XX_GPIO is not set @@ -1108,8 +1162,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1186,17 +1246,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig index d0b8f08fbb..d3b7c58d08 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:17 2007 +# Wed Dec 26 16:55:34 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -390,20 +390,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -1172,12 +1225,13 @@ CONFIG_USB_PXA2XX=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set CONFIG_USB_PXA2XX_GPIO=y @@ -1233,8 +1287,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1311,17 +1371,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig index a293dfea57..b72cc16514 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:17 2007 +# Wed Dec 26 16:55:35 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -377,20 +377,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -746,9 +799,9 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set -CONFIG_GPIODEV_KEYS=y -# CONFIG_GPIODEV_KEYS2 is not set -CONFIG_GPIODEV_DIAGONAL=y +# CONFIG_GPIODEV_KEYS is not set +CONFIG_GPIODEV_KEYS2=y +# CONFIG_GPIODEV_DIAGONAL is not set # CONFIG_KEYBOARD_GPIO is not set CONFIG_INPUT_MOUSE=y # CONFIG_MOUSE_PS2 is not set @@ -829,7 +882,42 @@ CONFIG_LEGACY_PTY_COUNT=32 # # I2C support # -# CONFIG_I2C is not set +CONFIG_I2C=m +# CONFIG_I2C_CHARDEV is not set + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +CONFIG_I2C_PXA=m +# CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCA9535 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_SENSORS_MAX6875 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 # # SPI support @@ -845,6 +933,7 @@ CONFIG_W1=y # # 1-wire Bus Masters # +# CONFIG_W1_MASTER_DS2482 is not set CONFIG_W1_MASTER_DS1WM=y # @@ -1011,7 +1100,82 @@ CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -# CONFIG_SND is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m +CONFIG_SND_PCM_OSS_PLUGINS=y +# 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 + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# +# CONFIG_SND_H5XXX_AK4535 is not set +# CONFIG_SND_PXA2XX_AC97 is not set +# CONFIG_SND_RECON is not set + +# +# SoC audio support +# +CONFIG_SND_SOC=m + +# +# SoC Platforms +# + +# +# SoC Audio for the Atmel AT91 +# + +# +# SoC Audio for the Intel PXA2xx +# +CONFIG_SND_PXA2XX_SOC=m +CONFIG_SND_PXA2XX_SOC_I2S=m +# CONFIG_SND_PXA2XX_SOC_MAGICIAN is not set +# CONFIG_SND_PXA2XX_SOC_BLUEANGEL is not set +CONFIG_SND_PXA2XX_SOC_H5000=m + +# +# SoC Audio for the Freescale i.MX +# + +# +# SoC Audio for the Samsung S3C24XX +# +# CONFIG_SND_SOC_AC97_CODEC is not set +# CONFIG_SND_SOC_WM8711 is not set +# CONFIG_SND_SOC_WM8510 is not set +# CONFIG_SND_SOC_WM8731 is not set +# CONFIG_SND_SOC_WM8750 is not set +# CONFIG_SND_SOC_WM8753 is not set +# CONFIG_SND_SOC_WM8772 is not set +# CONFIG_SND_SOC_WM8971 is not set +# CONFIG_SND_SOC_WM8956 is not set +# CONFIG_SND_SOC_WM8960 is not set +# CONFIG_SND_SOC_WM8976 is not set +# CONFIG_SND_SOC_WM8974 is not set +# CONFIG_SND_SOC_WM8980 is not set +# CONFIG_SND_SOC_WM9705 is not set +# CONFIG_SND_SOC_WM9713 is not set +# CONFIG_SND_SOC_WM9712 is not set +# CONFIG_SND_SOC_UDA1380 is not set +CONFIG_SND_SOC_AK4535=m # # Open Sound System @@ -1055,12 +1219,13 @@ CONFIG_USB_PXA2XX=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # CONFIG_USB_PXA2XX_GPIO is not set @@ -1096,8 +1261,14 @@ CONFIG_RTC_INTF_DEV=y # RTC drivers # # CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set # CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_RS5C372 is not set # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_SA1100=y # CONFIG_RTC_DRV_TEST is not set @@ -1109,8 +1280,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1187,17 +1364,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig index 0733574b59..457ed57863 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:19 2007 +# Wed Dec 26 16:55:36 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -376,20 +376,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -970,12 +1023,13 @@ CONFIG_USB_PXA27X=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # CONFIG_USB_PXA2XX_GPIO is not set @@ -1024,8 +1078,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1091,17 +1151,16 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig index 04c849d5b8..24a0ba0bb3 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:19 2007 +# Wed Dec 26 16:55:37 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -376,20 +376,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -1055,12 +1108,13 @@ CONFIG_USB_PXA27X=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # CONFIG_USB_PXA2XX_GPIO is not set @@ -1115,8 +1169,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1182,17 +1242,16 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig index c295e2a1c6..bc71c235e3 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:20 2007 +# Wed Dec 26 16:55:37 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -380,20 +380,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -976,12 +1029,13 @@ CONFIG_USB_PXA27X=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # CONFIG_USB_PXA2XX_GPIO is not set @@ -1031,8 +1085,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1098,17 +1158,16 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig index 61f84a4588..41012c93a0 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:20 2007 +# Wed Dec 26 16:55:37 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -397,20 +397,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -1068,13 +1121,13 @@ CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m # CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y # CONFIG_SND_DYNAMIC_MINORS is not set CONFIG_SND_SUPPORT_OLD_API=y @@ -1193,12 +1246,13 @@ CONFIG_USB_PXA2XX=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set CONFIG_USB_PXA2XX_GPIO=y @@ -1254,12 +1308,12 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=y +CONFIG_EXT3_FS=m CONFIG_EXT3_FS_XATTR=y # CONFIG_EXT3_FS_POSIX_ACL is not set # CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set -CONFIG_JBD=y +CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set @@ -1338,17 +1392,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig index 507d5e4541..51cf1468da 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:21 2007 +# Wed Dec 26 16:55:38 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -378,20 +378,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -972,12 +1025,13 @@ CONFIG_USB_PXA2XX=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # CONFIG_USB_PXA2XX_GPIO is not set @@ -1027,8 +1081,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1094,17 +1154,16 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig index 9ee6a3cdd3..9aea8e2d09 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:21 2007 +# Wed Dec 26 16:55:38 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -380,20 +380,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -1070,12 +1123,13 @@ CONFIG_USB_PXA27X=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # CONFIG_USB_PXA2XX_GPIO is not set @@ -1131,8 +1185,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1209,17 +1269,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig index 9da03d8f2e..538258dca9 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:22 2007 +# Wed Dec 26 16:55:39 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -387,20 +387,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -1087,12 +1140,13 @@ CONFIG_USB_PXA27X=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # CONFIG_USB_PXA2XX_GPIO is not set @@ -1148,11 +1202,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=y -# CONFIG_EXT3_FS_XATTR is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set -CONFIG_JBD=y +CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1218,17 +1275,16 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig index d69e574934..c4f636f1ba 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:22 2007 +# Wed Dec 26 16:55:39 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -161,7 +161,7 @@ CONFIG_SA1100_XDA=y # CONFIG_SA1100_SHANNON is not set # CONFIG_SA1100_SIMPAD is not set # CONFIG_SA1100_SSP is not set -CONFIG_SA1100_USB=y +CONFIG_SA1100_USB=m # CONFIG_SA1100_USB_NETLINK is not set # CONFIG_SA1100_USB_CHAR is not set @@ -352,20 +352,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -991,8 +1044,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1069,17 +1128,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig index 97403f4a22..d8a7c87f24 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:18 2007 +# Wed Dec 26 16:55:35 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -392,20 +392,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -1430,12 +1483,13 @@ CONFIG_USB_PXA27X=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set CONFIG_USB_PXA2XX_GPIO=y @@ -1491,8 +1545,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1569,17 +1629,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig index 83aff689f4..065435406d 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:23 2007 +# Wed Dec 26 16:55:39 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -374,20 +374,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -973,12 +1026,13 @@ CONFIG_USB_PXA27X=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # CONFIG_USB_PXA2XX_GPIO is not set @@ -1027,8 +1081,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1094,17 +1154,16 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig index 477ae6ead4..e3712ec2e5 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:18 2007 +# Wed Dec 26 16:55:36 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -381,20 +381,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -1053,13 +1106,13 @@ CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m # CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y # CONFIG_SND_DYNAMIC_MINORS is not set CONFIG_SND_SUPPORT_OLD_API=y @@ -1285,12 +1338,13 @@ CONFIG_USB_PXA27X=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set # CONFIG_USB_PXA2XX_GPIO is not set @@ -1345,8 +1399,14 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1423,17 +1483,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig index f717a91179..5c59ed5282 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:23 2007 +# Wed Dec 26 16:55:40 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -369,20 +369,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -1008,12 +1061,13 @@ CONFIG_USB_S3C2410=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set @@ -1061,8 +1115,14 @@ CONFIG_RTC_DRV_S3C=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1128,17 +1188,16 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig index af0393df6b..76a2c5fc0d 100644 --- a/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig +++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.21-hh20 -# Sat Dec 22 21:02:24 2007 +# Wed Dec 26 16:55:40 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -189,7 +189,7 @@ CONFIG_RX3000_BLUETOOTH=m CONFIG_RX3000_BUTTONS=y CONFIG_RX3000_SERIAL=y CONFIG_RX3000_TS=y -CONFIG_RX3000_UDC=y +CONFIG_RX3000_UDC=m # CONFIG_ARCH_S3C2440 is not set # CONFIG_MACH_NEXCODER_2440 is not set # CONFIG_MACH_G500 is not set @@ -376,20 +376,73 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +CONFIG_NETFILTER_XT_TARGET_MARK=m +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP 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_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # # CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS is not set +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +CONFIG_IP_NF_RAW=m # CONFIG_IP_NF_ARPTABLES is not set # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_IP6_NF_IPTABLES=m +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_OWNER is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_FILTER is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set # # DCCP Configuration (EXPERIMENTAL) @@ -1124,12 +1177,13 @@ CONFIG_USB_S3C2410=y # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set -# CONFIG_USB_ZERO is not set -CONFIG_USB_ETH=y +CONFIG_USB_ZERO=m +CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y -# CONFIG_USB_GADGETFS is not set -# CONFIG_USB_FILE_STORAGE is not set -# CONFIG_USB_G_SERIAL is not set +CONFIG_USB_GADGETFS=m +CONFIG_USB_FILE_STORAGE=m +# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_G_SERIAL=m # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_G_CHAR is not set @@ -1184,8 +1238,14 @@ CONFIG_RTC_DRV_S3C=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set # CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set @@ -1251,17 +1311,16 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set # CONFIG_NFS_DIRECTIO is not set # CONFIG_NFSD is not set -CONFIG_ROOT_NFS=y -CONFIG_LOCKD=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=y +CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb index 48f3f224e2..f15b71c325 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r2" +PR = "r6" DEFAULT_PREFERENCE = "-1" diff --git a/packages/linux/linux-magicbox_2.6.18.6.bb b/packages/linux/linux-magicbox_2.6.18.6.bb index 9410294020..bd9a1c4060 100644 --- a/packages/linux/linux-magicbox_2.6.18.6.bb +++ b/packages/linux/linux-magicbox_2.6.18.6.bb @@ -44,11 +44,11 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux-magicbox_2.6.19.2.bb b/packages/linux/linux-magicbox_2.6.19.2.bb index 82576776f3..2c79a94e10 100644 --- a/packages/linux/linux-magicbox_2.6.19.2.bb +++ b/packages/linux/linux-magicbox_2.6.19.2.bb @@ -77,11 +77,11 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } @@ -93,7 +93,7 @@ do_install_append () { powerpc${TARGET_VENDOR}-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR_IMAGE}/vmlinux \ ${DEPLOY_DIR_IMAGE}/linux.bin gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin - cp -a ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/linux-${PV}-${MACHINE}-${DATETIME}.bin.gz + cp -pPR ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/linux-${PV}-${MACHINE}-${DATETIME}.bin.gz mkimage -A ppc -O linux -T kernel -C gzip -a 00000000 -e 00000000 -n "magicbox"-${PV} \ -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${MACHINE}-${DATETIME}.bin rm ${DEPLOY_DIR_IMAGE}/vmlinux diff --git a/packages/linux/linux-ml403-mvista-2.6.x_git.bb b/packages/linux/linux-ml403-mvista-2.6.x_git.bb index 76fa75f65d..77b0bbc326 100644 --- a/packages/linux/linux-ml403-mvista-2.6.x_git.bb +++ b/packages/linux/linux-ml403-mvista-2.6.x_git.bb @@ -33,12 +33,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$ install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux-ml403-slab-2.6.x_git.bb b/packages/linux/linux-ml403-slab-2.6.x_git.bb index 75233492eb..f0408f365c 100644 --- a/packages/linux/linux-ml403-slab-2.6.x_git.bb +++ b/packages/linux/linux-ml403-slab-2.6.x_git.bb @@ -56,12 +56,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$ install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux-openmoko-devel/defconfig-2.6.24-rc6 b/packages/linux/linux-openmoko-devel/defconfig-2.6.24-rc6 new file mode 100644 index 0000000000..9dac6e8e8e --- /dev/null +++ b/packages/linux/linux-openmoko-devel/defconfig-2.6.24-rc6 @@ -0,0 +1,1814 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.24-rc6 +# Sat Dec 29 04:40:52 2007 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +# CONFIG_GENERIC_TIME is not set +# CONFIG_GENERIC_CLOCKEVENTS is not set +CONFIG_MMU=y +CONFIG_NO_IOPORT=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="-moko11" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_CGROUPS is not set +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_FAIR_USER_SCHED=y +# CONFIG_FAIR_CGROUP_SCHED is not set +# CONFIG_SYSFS_DEPRECATED is not set +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +# CONFIG_EMBEDDED is not set +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_ANON_INODES=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_RT_MUTEXES=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y +CONFIG_BLOCK=y +# CONFIG_LBD is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set +# CONFIG_BLK_DEV_BSG is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_AS=m +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=m +# CONFIG_DEFAULT_AS is not set +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" + +# +# System Type +# +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set +# CONFIG_ARCH_CLPS7500 is not set +# CONFIG_ARCH_CLPS711X is not set +# CONFIG_ARCH_CO285 is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_PNX4008 is not set +# CONFIG_ARCH_PXA is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +CONFIG_ARCH_S3C2410=y +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set +# CONFIG_ARCH_OMAP is not set +CONFIG_PLAT_S3C24XX=y +CONFIG_CPU_S3C244X=y +CONFIG_S3C2410_DMA=y +# CONFIG_S3C2410_DMA_DEBUG is not set +CONFIG_MACH_SMDK=y +CONFIG_MACH_NEO1973=y +CONFIG_PLAT_S3C=y +CONFIG_CPU_LLSERIAL_S3C2410=y +CONFIG_CPU_LLSERIAL_S3C2440=y + +# +# Boot options +# +# CONFIG_S3C_BOOT_WATCHDOG is not set +# CONFIG_S3C_BOOT_ERROR_RESET is not set + +# +# Power management +# +CONFIG_S3C2410_PM_DEBUG=y +# CONFIG_S3C2410_PM_CHECK is not set +CONFIG_S3C_LOWLEVEL_UART_PORT=0 + +# +# S3C2400 Machines +# +CONFIG_CPU_S3C2410=y +CONFIG_CPU_S3C2410_DMA=y +CONFIG_S3C2410_PM=y +CONFIG_S3C2410_GPIO=y +CONFIG_S3C2410_CLOCK=y +CONFIG_S3C2410_PWM=y + +# +# S3C2410 Machines +# +# CONFIG_ARCH_SMDK2410 is not set +# CONFIG_ARCH_H1940 is not set +# CONFIG_MACH_N30 is not set +# CONFIG_ARCH_BAST is not set +# CONFIG_MACH_OTOM is not set +# CONFIG_MACH_AML_M5900 is not set +# CONFIG_MACH_VR1000 is not set +CONFIG_MACH_QT2410=y +CONFIG_MACH_NEO1973_GTA01=y + +# +# S3C2412 Machines +# +# CONFIG_MACH_SMDK2413 is not set +# CONFIG_MACH_SMDK2412 is not set +# CONFIG_MACH_VSTMS is not set +CONFIG_CPU_S3C2440=y +CONFIG_S3C2440_DMA=y + +# +# S3C2440 Machines +# +# CONFIG_MACH_ANUBIS is not set +# CONFIG_MACH_OSIRIS is not set +# CONFIG_MACH_RX3715 is not set +CONFIG_ARCH_S3C2440=y +# CONFIG_MACH_NEXCODER_2440 is not set +CONFIG_SMDK2440_CPU2440=y +CONFIG_MACH_HXD8=y +CONFIG_MACH_NEO1973_GTA02=y +# CONFIG_NEO1973_GTA02_2440 is not set +CONFIG_CPU_S3C2442=y + +# +# S3C2442 Machines +# +# CONFIG_SMDK2440_CPU2442 is not set + +# +# S3C2443 Machines +# +# CONFIG_MACH_SMDK2443 is not set + +# +# Processor Type +# +CONFIG_CPU_32=y +CONFIG_CPU_ARM920T=y +CONFIG_CPU_32v4T=y +CONFIG_CPU_ABRT_EV4T=y +CONFIG_CPU_CACHE_V4WT=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set +# CONFIG_OUTER_CACHE is not set + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +# CONFIG_PCCARD is not set + +# +# Kernel Features +# +# CONFIG_TICK_ONESHOT is not set +CONFIG_PREEMPT=y +CONFIG_NO_IDLE_HZ=y +CONFIG_HZ=200 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +# CONFIG_SPARSEMEM_STATIC is not set +# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set +CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +CONFIG_ALIGNMENT_TRAP=y + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="unused -- bootloader passes ATAG list debug " +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# +CONFIG_FPE_NWFPE=y +# CONFIG_FPE_NWFPE_XP is not set +# CONFIG_FPE_FASTFPE is not set + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +CONFIG_PM=y +CONFIG_PM_LEGACY=y +CONFIG_PM_DEBUG=y +# CONFIG_PM_VERBOSE is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND_UP_POSSIBLE=y +CONFIG_SUSPEND=y +CONFIG_APM_EMULATION=y + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=m +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y +CONFIG_XFRM=y +# CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +CONFIG_XFRM_MIGRATE=y +CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y +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_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +# CONFIG_IP_ROUTE_MULTIPATH is not set +# CONFIG_IP_ROUTE_VERBOSE is not set +CONFIG_IP_PNP=y +# CONFIG_IP_PNP_DHCP is not set +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m +# CONFIG_NET_IPGRE_BROADCAST 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=m +# CONFIG_INET_LRO is not set +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +CONFIG_TCP_MD5SIG=y +# CONFIG_IP_VS is not set +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +# 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_TUNNEL=m +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NF_CONNTRACK_ENABLED=m +CONFIG_NF_CONNTRACK=m +CONFIG_NF_CT_ACCT=y +CONFIG_NF_CONNTRACK_MARK=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CT_PROTO_GRE=m +CONFIG_NF_CT_PROTO_SCTP=m +# CONFIG_NF_CT_PROTO_UDPLITE is not set +# CONFIG_NF_CONNTRACK_AMANDA is not set +CONFIG_NF_CONNTRACK_FTP=m +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +CONFIG_NF_CONNTRACK_NETBIOS_NS=m +CONFIG_NF_CONNTRACK_PPTP=m +CONFIG_NF_CONNTRACK_SANE=m +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=m +CONFIG_NF_CT_NETLINK=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_DSCP=m +CONFIG_NETFILTER_XT_MATCH_ESP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +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_POLICY=m +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_QUOTA=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=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=m +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m + +# +# IP: Netfilter Configuration +# +CONFIG_NF_CONNTRACK_IPV4=m +CONFIG_NF_CONNTRACK_PROC_COMPAT=y +# CONFIG_IP_NF_QUEUE is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +# CONFIG_IP_NF_MATCH_RECENT is not set +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_IP_NF_TARGET_REDIRECT=m +CONFIG_IP_NF_TARGET_NETMAP=m +CONFIG_IP_NF_TARGET_SAME=m +CONFIG_NF_NAT_SNMP_BASIC=m +CONFIG_NF_NAT_PROTO_GRE=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_TFTP=m +# CONFIG_NF_NAT_AMANDA is not set +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +CONFIG_NF_NAT_SIP=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +# CONFIG_IP_NF_RAW is not set +# CONFIG_IP_NF_ARPTABLES is not set + +# +# IPv6: Netfilter Configuration (EXPERIMENTAL) +# +CONFIG_NF_CONNTRACK_IPV6=m +# CONFIG_IP6_NF_QUEUE is not set +CONFIG_IP6_NF_IPTABLES=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m +CONFIG_IP6_NF_MATCH_OWNER=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m +CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_MH=m +CONFIG_IP6_NF_MATCH_EUI64=m +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m +CONFIG_IP6_NF_MANGLE=m +CONFIG_IP6_NF_TARGET_HL=m +# CONFIG_IP6_NF_RAW is not set + +# +# Bridge: Netfilter Configuration +# +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_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_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +CONFIG_BRIDGE=y +# CONFIG_VLAN_8021Q is not set +# CONFIG_DECNET is not set +CONFIG_LLC=y +# 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_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_RR=m +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_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_EMATCH is not set +# CONFIG_NET_CLS_ACT is not set +# CONFIG_NET_CLS_POLICE is not set +# CONFIG_NET_CLS_IND is not set +CONFIG_NET_SCH_FIFO=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +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_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +# CONFIG_BT_HCIBTSDIO is not set +# CONFIG_BT_HCIUART is not set +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y + +# +# Wireless +# +# CONFIG_CFG80211 is not set +# CONFIG_WIRELESS_EXT is not set +# CONFIG_MAC80211 is not set +# CONFIG_IEEE80211 is not set +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=m +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_CONNECTOR=m +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# 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 is not set +# CONFIG_MTD_JEDECPROBE 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_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=y +CONFIG_MTD_NAND_S3C2410=y +# CONFIG_MTD_NAND_S3C2410_DEBUG is not set +CONFIG_MTD_NAND_S3C2410_HWECC=y +CONFIG_MTD_NAND_S3C2410_CLKSTOP=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ALAUDA is not set +# CONFIG_MTD_ONENAND is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_UB=m +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +CONFIG_MISC_DEVICES=y +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_IDE is not set + +# +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set +CONFIG_SCSI_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +# CONFIG_CHR_DEV_ST is not set +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=m +# CONFIG_CHR_DEV_SCH is not set + +# +# Some SCSI devices (e.g. CD jukebox) support multiple LUNs +# +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_WAIT_SCAN=m + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_ATA is not set +CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_UEVENT is not set +CONFIG_NETDEVICES=y +# CONFIG_NETDEVICES_MULTIQUEUE is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +# CONFIG_VETH is not set +# CONFIG_PHYLIB is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=m +# CONFIG_AX88796 is not set +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +CONFIG_NET_PCI=y +# CONFIG_B44 is not set +CONFIG_CS89x0=m +# CONFIG_NETDEV_1000 is not set +# CONFIG_NETDEV_10000 is not set + +# +# Wireless LAN +# +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set + +# +# 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_DM9601=m +CONFIG_USB_NET_GL620A=m +CONFIG_USB_NET_NET1080=m +CONFIG_USB_NET_PLUSB=m +CONFIG_USB_NET_MCS7830=m +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=y +CONFIG_USB_NET_ZAURUS=m +# CONFIG_WAN 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 is not set +# CONFIG_PPPOL2TP is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=m +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=y +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set +CONFIG_INPUT_MOUSEDEV_SCREEN_X=480 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640 +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_EVBUG=m + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_KEYBOARD_STOWAWAY=m +CONFIG_KEYBOARD_GPIO=m +CONFIG_KEYBOARD_NEO1973=y +CONFIG_KEYBOARD_QT2410=y +CONFIG_INPUT_MOUSE=y +# CONFIG_MOUSE_PS2 is not set +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +CONFIG_INPUT_TOUCHSCREEN=y +# CONFIG_TOUCHSCREEN_ADS7846 is not set +# CONFIG_TOUCHSCREEN_FUJITSU is not set +CONFIG_TOUCHSCREEN_S3C2410=y +# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set +# CONFIG_TOUCHSCREEN_GUNZE is not set +# CONFIG_TOUCHSCREEN_ELO is not set +# CONFIG_TOUCHSCREEN_MTOUCH is not set +# CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set +# CONFIG_INPUT_MISC is not set + +# +# Hardware I/O ports +# +CONFIG_SERIO=y +# CONFIG_SERIO_SERPORT is not set +# CONFIG_SERIO_RAW is not set +# CONFIG_GAMEPORT is not set + +# +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_NR_TTY_DEVICES=4 +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +# CONFIG_SERIAL_NONSTANDARD is not set + +# +# Serial drivers +# +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +CONFIG_SERIAL_S3C2410=y +CONFIG_SERIAL_S3C2410_CONSOLE=y +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_UNIX98_PTYS=y +# CONFIG_LEGACY_PTYS is not set +# CONFIG_IPMI_HANDLER is not set +# CONFIG_HW_RANDOM is not set +# CONFIG_NVRAM is not set +# CONFIG_R3964 is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_TCG_TPM is not set +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +CONFIG_I2C_S3C2410=y +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_DS1682 is not set +# CONFIG_SENSORS_EEPROM is not set +CONFIG_SENSORS_PCF50606=y +CONFIG_SENSORS_PCF50633=y +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_SENSORS_TSL2550 is not set +CONFIG_SENSORS_TSL256X=m +# 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 + +# +# SPI support +# +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI_BITBANG=y +CONFIG_SPI_S3C24XX=y +CONFIG_SPI_S3C24XX_GPIO=y + +# +# SPI Protocol Masters +# +# CONFIG_SPI_AT25 is not set +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set +# CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +CONFIG_S3C2410_WATCHDOG=m + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set + +# +# Sonics Silicon Backplane +# +CONFIG_SSB_POSSIBLE=y +# CONFIG_SSB is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set +CONFIG_MFD_GLAMO=y + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +CONFIG_DAB=y +# CONFIG_USB_DABUSB is not set + +# +# Graphics support +# +# CONFIG_VGASTATE is not set +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +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 is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_UVESA is not set +# CONFIG_FB_S1D13XXX is not set +CONFIG_FB_S3C2410=y +# CONFIG_FB_S3C2410_DEBUG is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=y +# CONFIG_LCD_LTV350QV is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_CORGI is not set +CONFIG_BACKLIGHT_GTA01=y + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT is not set +CONFIG_DISPLAY_JBT6K74=y + +# +# Console display driver support +# +# CONFIG_VGA_CONSOLE is not set +CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +CONFIG_FONTS=y +# CONFIG_FONT_8x8 is not set +# CONFIG_FONT_8x16 is not set +CONFIG_FONT_6x11=y +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO_OPENMOKO_CLUT224 is not set + +# +# Sound +# +CONFIG_SOUND=y + +# +# Advanced Linux Sound Architecture +# +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_OSSEMUL=y +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y +CONFIG_SND_PCM_OSS_PLUGINS=y +# 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 + +# +# Generic devices +# +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set + +# +# ALSA ARM devices +# + +# +# SPI devices +# + +# +# USB devices +# +CONFIG_SND_USB_AUDIO=m +# CONFIG_SND_USB_CAIAQ is not set + +# +# System on Chip audio support +# +CONFIG_SND_SOC=y +CONFIG_SND_S3C24XX_SOC=y +CONFIG_SND_S3C24XX_SOC_I2S=y +CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y +# CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753 is not set + +# +# SoC Audio support for SuperH +# +CONFIG_SND_SOC_WM8753=y + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_DEBUG is not set +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +CONFIG_USB_HID=m +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +CONFIG_USB_SUPPORT=y +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEVICEFS=y +CONFIG_USB_DEVICE_CLASS=y +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_SUSPEND is not set +# CONFIG_USB_PERSIST is not set +# CONFIG_USB_OTG is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=m +# 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_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set + +# +# USB Device Class drivers +# +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' +# + +# +# may also be needed; see USB_STORAGE Help for more information +# +CONFIG_USB_STORAGE=m +# CONFIG_USB_STORAGE_DEBUG is not set +CONFIG_USB_STORAGE_DATAFAB=y +CONFIG_USB_STORAGE_FREECOM=y +# CONFIG_USB_STORAGE_ISD200 is not set +CONFIG_USB_STORAGE_DPCM=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_KARMA=y +CONFIG_USB_LIBUSUAL=y + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# + +# +# USB Serial Converter support +# +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_AIRPRIME=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +# CONFIG_USB_SERIAL_CH341 is not set +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP2101=m +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_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +CONFIG_USB_SERIAL_SAFE_PADDED=y +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +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_DEBUG is not set +CONFIG_USB_EZUSB=y + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_AUERSWALD is not set +# CONFIG_USB_RIO500 is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +CONFIG_USB_BERRY_CHARGE=m +# CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_PHIDGET is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_USB_LD is not set +CONFIG_USB_TRANCEVIBRATOR=m +CONFIG_USB_IOWARRIOR=m +# CONFIG_USB_TEST is not set + +# +# USB DSL modem support +# + +# +# USB Gadget Support +# +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_ATMEL_USBA is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set +# CONFIG_USB_GADGET_NET2280 is not set +# CONFIG_USB_GADGET_PXA2XX is not set +# CONFIG_USB_GADGET_M66592 is not set +# CONFIG_USB_GADGET_GOKU is not set +# CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_OMAP is not set +CONFIG_USB_GADGET_S3C2410=y +CONFIG_USB_S3C2410=y +# CONFIG_USB_S3C2410_DEBUG is not set +# CONFIG_USB_GADGET_AT91 is not set +# CONFIG_USB_GADGET_DUMMY_HCD is not set +# CONFIG_USB_GADGET_DUALSPEED is not set +# CONFIG_USB_ZERO is not set +CONFIG_USB_ETH=y +CONFIG_USB_ETH_RNDIS=y +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +CONFIG_MMC=y +# CONFIG_MMC_DEBUG is not set +CONFIG_MMC_UNSAFE_RESUME=y + +# +# MMC/SD Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set + +# +# MMC/SD Host Controller Drivers +# +# CONFIG_MMC_SPI is not set +CONFIG_MMC_S3C=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_S3C24XX=y +# CONFIG_LEDS_GPIO is not set +# CONFIG_LEDS_NEO1973_VIBRATOR is not set +# CONFIG_LEDS_NEO1973_GTA02 is not set + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +CONFIG_RTC_DEBUG=y + +# +# 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 + +# +# SPI RTC drivers +# +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_MAX6902 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_S3C=m + +# +# File systems +# +CONFIG_EXT2_FS=m +# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_XATTR is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +CONFIG_ROMFS_FS=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +CONFIG_DNOTIFY=y +# CONFIG_AUTOFS_FS is not set +CONFIG_AUTOFS4_FS=m +CONFIG_FUSE_FS=m + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +# CONFIG_ZISOFS 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 is not set + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_CONFIGFS_FS=m + +# +# Miscellaneous filesystems +# +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_YAFFS_FS=y +CONFIG_YAFFS_YAFFS1=y +# CONFIG_YAFFS_9BYTE_TAGS is not set +# CONFIG_YAFFS_DOES_ECC is not set +CONFIG_YAFFS_YAFFS2=y +CONFIG_YAFFS_AUTO_YAFFS2=y +# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set +CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10 +# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set +# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set +CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +CONFIG_JFFS2_SUMMARY=y +# CONFIG_JFFS2_FS_XATTR is not set +# 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_VXFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +# CONFIG_SUNRPC_BIND34 is not set +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +CONFIG_CIFS_WEAK_PW_HASH=y +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL 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 is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_NLS=m +CONFIG_NLS_DEFAULT="iso8859-1" +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 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=m +# 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 is not set +# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_UTF8=m +# CONFIG_DLM is not set +CONFIG_INSTRUMENTATION=y +# CONFIG_PROFILING is not set +# CONFIG_MARKERS is not set + +# +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_WARN_DEPRECATED=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_MAGIC_SYSRQ=y +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_SHIRQ is not set +CONFIG_DETECT_SOFTLOCKUP=y +CONFIG_SCHED_DEBUG=y +# CONFIG_SCHEDSTATS is not set +# CONFIG_TIMER_STATS is not set +# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_PREEMPT=y +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_DEBUG_BUGVERBOSE=y +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +CONFIG_FRAME_POINTER=y +CONFIG_FORCED_INLINING=y +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_SAMPLES is not set +# CONFIG_DEBUG_USER is not set +CONFIG_DEBUG_ERRORS=y +CONFIG_DEBUG_LL=y +# CONFIG_DEBUG_ICEDCC is not set +CONFIG_DEBUG_S3C_PORT=y +CONFIG_DEBUG_S3C_UART=2 + +# +# Security options +# +# CONFIG_KEYS is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITY_FILE_CAPABILITIES is not set +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_BLKCIPHER=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_LRW=m +# CONFIG_CRYPTO_XTS is not set +# CONFIG_CRYPTO_CRYPTD is not set +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +# CONFIG_CRYPTO_SEED is not set +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_TEST=m +# CONFIG_CRYPTO_AUTHENC is not set +CONFIG_CRYPTO_HW=y + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_DMA=y diff --git a/packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb b/packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb new file mode 100644 index 0000000000..733cd3fb3b --- /dev/null +++ b/packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb @@ -0,0 +1,68 @@ +require linux.inc +require linux-openmoko.inc + +DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko" +VANILLA_VERSION = "2.6.23" +KERNEL_RELEASE = "2.6.24-rc6" + +KERNEL_VERSION = "${KERNEL_RELEASE}" + +# If you use a rc, you will need to use this: +PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" +#PV = "${KERNEL_RELEASE}+svnr${SRCREV}" +PR = "r2" + +KERNEL_IMAGETYPE = "uImage" +UBOOT_ENTRYPOINT = "30008000" + +############################################################## +# source and patches +# +SRCREV_FORMAT = "patches" +SRCREV = "3741" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2 \ + svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \ +# file://squashfs-2.6.23.patch;patch=1 \ +# file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1 \ +# file://printascii-2.6.23.patch;patch=1 \ +# file://hack-gta02-cpu.patch;patch=1 \ +# file://fix-gta01-flowcontrol2-2.6.23.patch;patch=1 \ + file://defconfig-${KERNEL_VERSION} \ + file://logo_linux_clut224.ppm" +S = "${WORKDIR}/linux-${VANILLA_VERSION}" + +############################################################## +# kernel image resides on a seperate flash partition (for now) +# +FILES_kernel-image = "" +ALLOW_EMPTY = "1" + +COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' + +CMDLINE = "unused -- bootloader passes ATAG list" + +############################################################### +# module configs specific to this kernel +# + +# usb +module_autoload_ohci-hcd = "ohci-hcd" +module_autoload_hci_usb = "hci_usb" +module_autoload_g_ether = "g_ether" +# audio +module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" +# sd/mmc +module_autoload_s3cmci = "s3cmci" + +do_prepatch() { + cd ${S} && patch -p1 < ${WORKDIR}/patch-${KERNEL_VERSION} + mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av + mv patches patches.openmoko + mv .pc .pc.old + mv ${WORKDIR}/defconfig-${KERNEL_VERSION} ${WORKDIR}/defconfig +} + +addtask prepatch after do_unpack before do_patch diff --git a/packages/linux/linux-rp-2.6.20/defconfig-c7x0 b/packages/linux/linux-rp-2.6.20/defconfig-c7x0 index 452e0a669c..3ac91adcc0 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-c7x0 +++ b/packages/linux/linux-rp-2.6.20/defconfig-c7x0 @@ -1494,7 +1494,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m # CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set diff --git a/packages/linux/linux-rp-2.6.20/defconfig-collie b/packages/linux/linux-rp-2.6.20/defconfig-collie index 422ed94df3..c161dd564b 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-collie +++ b/packages/linux/linux-rp-2.6.20/defconfig-collie @@ -1457,7 +1457,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=m # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m # CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set diff --git a/packages/linux/linux-rp-2.6.20/defconfig-poodle b/packages/linux/linux-rp-2.6.20/defconfig-poodle index 13616c08f1..a2dba2d7d5 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-poodle +++ b/packages/linux/linux-rp-2.6.20/defconfig-poodle @@ -1404,7 +1404,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set diff --git a/packages/linux/linux-rp-2.6.20/defconfig-tosa b/packages/linux/linux-rp-2.6.20/defconfig-tosa index 4360f7a179..90527cf2e9 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-tosa +++ b/packages/linux/linux-rp-2.6.20/defconfig-tosa @@ -1360,7 +1360,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set diff --git a/packages/linux/linux-rp-2.6.21/defconfig-collie b/packages/linux/linux-rp-2.6.21/defconfig-collie index 422ed94df3..c161dd564b 100644 --- a/packages/linux/linux-rp-2.6.21/defconfig-collie +++ b/packages/linux/linux-rp-2.6.21/defconfig-collie @@ -1457,7 +1457,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=m # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m # CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set diff --git a/packages/linux/linux-rp-2.6.21/defconfig-poodle b/packages/linux/linux-rp-2.6.21/defconfig-poodle index fa7b83df77..571cc23442 100644 --- a/packages/linux/linux-rp-2.6.21/defconfig-poodle +++ b/packages/linux/linux-rp-2.6.21/defconfig-poodle @@ -1404,7 +1404,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set diff --git a/packages/linux/linux-rp-2.6.21/defconfig-tosa b/packages/linux/linux-rp-2.6.21/defconfig-tosa index 392acf47e9..558084b345 100644 --- a/packages/linux/linux-rp-2.6.21/defconfig-tosa +++ b/packages/linux/linux-rp-2.6.21/defconfig-tosa @@ -1360,7 +1360,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set diff --git a/packages/linux/linux-rp-2.6.23/defconfig-akita b/packages/linux/linux-rp-2.6.23/defconfig-akita index 7d9adaf0e3..78ede10b56 100644 --- a/packages/linux/linux-rp-2.6.23/defconfig-akita +++ b/packages/linux/linux-rp-2.6.23/defconfig-akita @@ -244,6 +244,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 dyntick=enable quiet" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Frequency scaling @@ -346,14 +347,59 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set # CONFIG_NF_CONNTRACK is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # CONFIG_IP_NF_QUEUE=m -# CONFIG_IP_NF_IPTABLES is not set -# CONFIG_IP_NF_ARPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration (EXPERIMENTAL) @@ -1114,7 +1160,7 @@ CONFIG_SND_SOC_WM8750=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m CONFIG_HID_SUPPORT=y -CONFIG_HID=y +CONFIG_HID=m # CONFIG_HID_DEBUG is not set # diff --git a/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 b/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 index 833f72ac9e..23ae307b14 100644 --- a/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 +++ b/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 @@ -217,7 +217,8 @@ CONFIG_HZ_250=y # CONFIG_HZ_300 is not set # CONFIG_HZ_1000 is not set CONFIG_HZ=250 -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y CONFIG_PHYSICAL_START=0x100000 # CONFIG_RELOCATABLE is not set CONFIG_PHYSICAL_ALIGN=0x100000 @@ -348,7 +349,69 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set # CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETFILTER is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NF_CONNTRACK is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + # # DCCP Configuration (EXPERIMENTAL) @@ -1367,7 +1430,7 @@ CONFIG_USB_WACOM=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m # CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set @@ -1435,7 +1498,7 @@ CONFIG_RAMFS=y # # Network File Systems # -# CONFIG_NFS_FS is not set +CONFIG_NFS_FS=y # CONFIG_NFSD is not set # CONFIG_SMB_FS is not set # CONFIG_CIFS is not set diff --git a/packages/linux/linux-rp-2.6.23/defconfig-c7x0 b/packages/linux/linux-rp-2.6.23/defconfig-c7x0 index bd11500398..e937b3b13c 100644 --- a/packages/linux/linux-rp-2.6.23/defconfig-c7x0 +++ b/packages/linux/linux-rp-2.6.23/defconfig-c7x0 @@ -246,6 +246,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 dyntick=enable quiet" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y CONFIG_CPU_FREQ_PXA25x=y # @@ -360,14 +361,59 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set # CONFIG_NF_CONNTRACK is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # CONFIG_IP_NF_QUEUE=m -# CONFIG_IP_NF_IPTABLES is not set -# CONFIG_IP_NF_ARPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration (EXPERIMENTAL) @@ -1395,7 +1441,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m # CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set diff --git a/packages/linux/linux-rp-2.6.23/defconfig-collie b/packages/linux/linux-rp-2.6.23/defconfig-collie index 49d9596b92..fb3fbbcdbd 100644 --- a/packages/linux/linux-rp-2.6.23/defconfig-collie +++ b/packages/linux/linux-rp-2.6.23/defconfig-collie @@ -222,6 +222,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Frequency scaling @@ -325,12 +326,60 @@ CONFIG_NETFILTER=y # # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set -# CONFIG_NETFILTER_XTABLES is not set +# CONFIG_NF_CONNTRACK is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration (EXPERIMENTAL) @@ -1459,7 +1508,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=m # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m # CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set diff --git a/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal b/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal index 2b02621499..90147e15f7 100644 --- a/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal +++ b/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal @@ -241,6 +241,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 dyntick=enable debug" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Frequency scaling @@ -337,28 +338,59 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set # CONFIG_NF_CONNTRACK is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # -# CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set -# CONFIG_IP_NF_ARPTABLES 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_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_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m # # QoS and/or fair queueing diff --git a/packages/linux/linux-rp-2.6.23/defconfig-hx2000 b/packages/linux/linux-rp-2.6.23/defconfig-hx2000 index ee05db4e5a..bb4bbaf145 100644 --- a/packages/linux/linux-rp-2.6.23/defconfig-hx2000 +++ b/packages/linux/linux-rp-2.6.23/defconfig-hx2000 @@ -210,7 +210,8 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 dyntick=enable debug" # CONFIG_XIP_KERNEL is not set -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Frequency scaling @@ -288,7 +289,69 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set # CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETFILTER is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NF_CONNTRACK is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + # # DCCP Configuration (EXPERIMENTAL) @@ -844,7 +907,7 @@ CONFIG_BACKLIGHT_HX2750=y # # HID Devices # -CONFIG_HID=y +CONFIG_HID=m # # USB support @@ -907,7 +970,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m # CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set @@ -986,7 +1049,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # # Network File Systems # -# CONFIG_NFS_FS is not set +CONFIG_NFS_FS=m # CONFIG_NFSD is not set # CONFIG_SMB_FS is not set # CONFIG_CIFS is not set diff --git a/packages/linux/linux-rp-2.6.23/defconfig-poodle b/packages/linux/linux-rp-2.6.23/defconfig-poodle index 387b5e9bff..d6423a7b6a 100644 --- a/packages/linux/linux-rp-2.6.23/defconfig-poodle +++ b/packages/linux/linux-rp-2.6.23/defconfig-poodle @@ -1,42 +1,59 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17 -# Mon Jul 10 23:38:56 2006 +# Linux kernel version: 2.6.23 +# Fri Dec 28 17:28:59 2007 # CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_MMU=y +# CONFIG_NO_IOPORT is not set +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y CONFIG_ARCH_MTD_XIP=y CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # -# Code maturity level options +# General setup # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 - -# -# General setup -# CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y # CONFIG_POSIX_MQUEUE is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set -CONFIG_SYSCTL=y +# CONFIG_TASKSTATS is not set +# CONFIG_USER_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set -CONFIG_INITRAMFS_SOURCE="" -CONFIG_UID16=y +# CONFIG_BLK_DEV_INITRD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set @@ -46,27 +63,29 @@ CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y +CONFIG_ANON_INODES=y CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_EVENTFD=y CONFIG_SHMEM=y +CONFIG_VM_EVENT_COUNTERS=y CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 -# CONFIG_SLOB is not set - -# -# Loadable module support -# CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y - -# -# Block layer -# +CONFIG_BLOCK=y +# CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set +# CONFIG_BLK_DEV_BSG is not set # # IO Schedulers @@ -84,31 +103,39 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # # System Type # +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_CLPS7500 is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CO285 is not set # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_INTEGRATOR is not set -# CONFIG_ARCH_IOP3XX is not set -# CONFIG_ARCH_IXP4XX is not set -# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set # CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_PNX4008 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set # CONFIG_ARCH_S3C2410 is not set # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_DAVINCI is not set # CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_REALVIEW is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_AT91RM9200 is not set # # Intel PXA2xx Implementations @@ -118,7 +145,10 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_MAINSTONE is not set # CONFIG_ARCH_PXA_IDP is not set CONFIG_PXA_SHARPSL=y +# CONFIG_MACH_TRIZEPS4 is not set +# CONFIG_MACH_EM_X270 is not set # CONFIG_MACH_HX2750 is not set +# CONFIG_MACH_HTCUNIVERSAL is not set CONFIG_PXA_SHARPSL_25x=y # CONFIG_PXA_SHARPSL_27x is not set CONFIG_MACH_POODLE=y @@ -127,8 +157,16 @@ CONFIG_MACH_POODLE=y # CONFIG_MACH_HUSKY is not set # CONFIG_MACH_TOSA is not set CONFIG_PXA25x=y -# CONFIG_PXA_KEYS is not set CONFIG_PXA_SSP=y +# CONFIG_PXA_KEYS is not set + +# +# Boot options +# + +# +# Power management +# # # Processor Type @@ -139,13 +177,17 @@ CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y # # Processor Features # CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +# CONFIG_OUTER_CACHE is not set +# CONFIG_IWMMXT is not set CONFIG_XSCALE_PMU=y -CONFIG_KEXEC=y CONFIG_SHARP_LOCOMO=y CONFIG_SHARP_PARAM=y CONFIG_SHARPSL_PM=y @@ -154,6 +196,8 @@ CONFIG_SHARP_SCOOP=y # # Bus support # +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set # # PCCARD (PCMCIA/CardBus) support @@ -172,10 +216,13 @@ CONFIG_PCMCIA_PXA2XX=y # # Kernel Features # +# CONFIG_TICK_ONESHOT is not set +# CONFIG_NO_HZ is not set +# CONFIG_HIGH_RES_TIMERS is not set CONFIG_PREEMPT=y -CONFIG_NO_IDLE_HZ=y CONFIG_HZ=100 -# CONFIG_AEABI is not set +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -185,6 +232,10 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y CONFIG_ALIGNMENT_TRAP=y # @@ -194,6 +245,9 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 dyntick=enable debug" # CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y +CONFIG_CPU_FREQ_PXA25x=y # # CPU Frequency scaling @@ -210,7 +264,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y -CONFIG_CPU_FREQ_PXA25x=y # # Floating point emulation @@ -229,7 +282,6 @@ CONFIG_FPE_NWFPE=y CONFIG_BINFMT_ELF=y CONFIG_BINFMT_AOUT=m CONFIG_BINFMT_MISC=m -# CONFIG_ARTHUR is not set # # Power management options @@ -237,7 +289,10 @@ CONFIG_BINFMT_MISC=m CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set -CONFIG_APM=y +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND_UP_POSSIBLE=y +CONFIG_SUSPEND=y +CONFIG_APM_EMULATION=y # # Networking @@ -247,12 +302,13 @@ CONFIG_NET=y # # Networking options # -# CONFIG_NETDEBUG is not set -CONFIG_PACKET=y +CONFIG_PACKET=m CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set @@ -267,25 +323,35 @@ CONFIG_SYN_COOKIES=y # 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_TUNNEL=m +CONFIG_INET_XFRM_MODE_TRANSPORT=m +CONFIG_INET_XFRM_MODE_TUNNEL=m +CONFIG_INET_XFRM_MODE_BEET=m CONFIG_INET_DIAG=m CONFIG_INET_TCP_DIAG=m # CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y - -# -# IP: Virtual Server Configuration -# +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set # CONFIG_IP_VS is not set CONFIG_IPV6=m # CONFIG_IPV6_PRIVACY is not set # 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_TUNNEL=m +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_NETWORK_SECMARK is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set @@ -293,43 +359,69 @@ CONFIG_NETFILTER=y # Core Netfilter Configuration # # CONFIG_NETFILTER_NETLINK is not set -# CONFIG_NETFILTER_XTABLES is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NF_CONNTRACK is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # -CONFIG_IP_NF_CONNTRACK=m -# CONFIG_IP_NF_CT_ACCT is not set -# CONFIG_IP_NF_CONNTRACK_MARK is not set -# CONFIG_IP_NF_CONNTRACK_EVENTS is not set -CONFIG_IP_NF_CT_PROTO_SCTP=m -CONFIG_IP_NF_FTP=m -CONFIG_IP_NF_IRC=m -# CONFIG_IP_NF_NETBIOS_NS is not set -CONFIG_IP_NF_TFTP=m -CONFIG_IP_NF_AMANDA=m -# CONFIG_IP_NF_PPTP is not set -# CONFIG_IP_NF_H323 is not set CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration (EXPERIMENTAL) # # CONFIG_IP6_NF_QUEUE is not set - -# -# DCCP Configuration (EXPERIMENTAL) -# +# CONFIG_IP6_NF_IPTABLES is not set # CONFIG_IP_DCCP is not set - -# -# SCTP Configuration (EXPERIMENTAL) -# # CONFIG_IP_SCTP is not set - -# -# TIPC Configuration (EXPERIMENTAL) -# # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_BRIDGE is not set @@ -340,7 +432,6 @@ CONFIG_IP_NF_QUEUE=m # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -383,6 +474,7 @@ CONFIG_IRCOMM=m # # Dongle support # +# CONFIG_KINGSUN_DONGLE is not set # # Old SIR device drivers @@ -399,6 +491,7 @@ CONFIG_IRCOMM=m # CONFIG_USB_IRDA is not set # CONFIG_SIGMATEL_FIR is not set CONFIG_PXA_FICP=m +# CONFIG_MCS_FIR is not set CONFIG_BT=m CONFIG_BT_L2CAP=m CONFIG_BT_SCO=m @@ -425,13 +518,22 @@ CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBLUECARD=m CONFIG_BT_HCIBTUART=m CONFIG_BT_HCIVHCI=m +# CONFIG_AF_RXRPC is not set + +# +# Wireless +# +# CONFIG_CFG80211 is not set +CONFIG_WIRELESS_EXT=y +# CONFIG_MAC80211 is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m # CONFIG_IEEE80211_SOFTMAC is not set -CONFIG_WIRELESS_EXT=y +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set # # Device Drivers @@ -444,15 +546,9 @@ CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # CONFIG_DEBUG_DRIVER is not set - -# -# Connector - unified userspace <-> kernelspace linker -# +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set # CONFIG_CONNECTOR is not set - -# -# Memory Technology Devices (MTD) -# CONFIG_MTD=y # CONFIG_MTD_DEBUG is not set # CONFIG_MTD_CONCAT is not set @@ -465,11 +561,13 @@ CONFIG_MTD_CMDLINE_PARTS=y # User Modules And Translation Layers # CONFIG_MTD_CHAR=y +CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # 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 # # RAM/ROM/Flash chip drivers @@ -489,12 +587,12 @@ CONFIG_MTD_CFI_I2=y # CONFIG_MTD_RAM is not set CONFIG_MTD_ROM=y # CONFIG_MTD_ABSENT is not set -# CONFIG_MTD_OBSOLETE_CHIPS is not set # # Mapping drivers for chip access # CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PHYSMAP is not set CONFIG_MTD_SHARP_SL=y # CONFIG_MTD_PLATRAM is not set @@ -512,49 +610,34 @@ CONFIG_MTD_SHARP_SL=y # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set - -# -# NAND Flash Device Drivers -# CONFIG_MTD_NAND=y CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set # CONFIG_MTD_NAND_H1900 is not set CONFIG_MTD_NAND_IDS=y # CONFIG_MTD_NAND_DISKONCHIP is not set CONFIG_MTD_NAND_SHARPSL=y # CONFIG_MTD_NAND_NANDSIM is not set - -# -# OneNAND Flash Device Drivers -# +# CONFIG_MTD_NAND_PLATFORM is not set # CONFIG_MTD_ONENAND is not set # -# Parallel port support +# UBI - Unsorted block images # +# CONFIG_MTD_UBI is not set # CONFIG_PARPORT is not set - -# -# Plug and Play support -# - -# -# Block devices -# +CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set # CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_UB is not set # CONFIG_BLK_DEV_RAM is not set -# CONFIG_BLK_DEV_INITRD is not set # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set - -# -# ATA/ATAPI/MFM/RLL support -# CONFIG_IDE=y +CONFIG_IDE_MAX_HWIFS=4 CONFIG_BLK_DEV_IDE=y # @@ -569,14 +652,15 @@ CONFIG_BLK_DEV_IDECS=y # CONFIG_BLK_DEV_IDEFLOPPY is not set # CONFIG_BLK_DEV_IDESCSI is not set # CONFIG_IDE_TASK_IOCTL is not set +CONFIG_IDE_PROC_FS=y # # IDE chipset support/bugfixes # CONFIG_IDE_GENERIC=y +# CONFIG_IDEPCI_PCIBUS_ORDER is not set # CONFIG_IDE_ARM is not set # CONFIG_BLK_DEV_IDEDMA is not set -# CONFIG_IDEDMA_AUTO is not set # CONFIG_BLK_DEV_HD is not set # @@ -584,6 +668,9 @@ CONFIG_IDE_GENERIC=y # # CONFIG_RAID_ATTRS is not set CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set CONFIG_SCSI_PROC_FS=y # @@ -603,130 +690,75 @@ CONFIG_CHR_DEV_SG=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set +CONFIG_SCSI_WAIT_SCAN=m # -# SCSI Transport Attributes +# SCSI Transports # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set -# CONFIG_SCSI_SAS_ATTRS is not set - -# -# SCSI low-level drivers -# +# CONFIG_SCSI_SAS_LIBSAS is not set +CONFIG_SCSI_LOWLEVEL=y # CONFIG_ISCSI_TCP is not set -# CONFIG_SCSI_SATA is not set # CONFIG_SCSI_DEBUG is not set - -# -# PCMCIA SCSI adapter support -# -# CONFIG_PCMCIA_AHA152X is not set -# CONFIG_PCMCIA_FDOMAIN is not set -# CONFIG_PCMCIA_NINJA_SCSI is not set -# CONFIG_PCMCIA_QLOGIC is not set -# CONFIG_PCMCIA_SYM53C500 is not set - -# -# Multi-device support (RAID and LVM) -# +# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set +# CONFIG_ATA is not set CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set 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_MULTIPATH_EMC=m - -# -# Fusion MPT device support -# -# CONFIG_FUSION is not set - -# -# IEEE 1394 (FireWire) support -# - -# -# I2O device support -# - -# -# Network device support -# +# CONFIG_DM_MULTIPATH_RDAC is not set +# CONFIG_DM_DELAY is not set CONFIG_NETDEVICES=y +# CONFIG_NETDEVICES_MULTIQUEUE is not set # CONFIG_DUMMY is not set # CONFIG_BONDING is not set +# CONFIG_MACVLAN is not set # CONFIG_EQUALIZER is not set CONFIG_TUN=m - -# -# PHY device support -# # CONFIG_PHYLIB is not set - -# -# Ethernet (10 or 100Mbit) -# CONFIG_NET_ETHERNET=y CONFIG_MII=m +# CONFIG_AX88796 is not set # CONFIG_SMC91X is not set # CONFIG_DM9000 is not set +# CONFIG_SMC911X is not set +CONFIG_NETDEV_1000=y +CONFIG_NETDEV_10000=y # -# Ethernet (1000 Mbit) +# Wireless LAN # +# CONFIG_WLAN_PRE80211 is not set +# CONFIG_WLAN_80211 is not set # -# Ethernet (10000 Mbit) -# - -# -# Token Ring devices -# - -# -# Wireless LAN (non-hamradio) -# -CONFIG_NET_RADIO=y -# CONFIG_NET_WIRELESS_RTNETLINK is not set - -# -# Obsolete Wireless cards support (pre-802.11) -# -# CONFIG_STRIP is not set -# CONFIG_PCMCIA_WAVELAN is not set -# CONFIG_PCMCIA_NETWAVE is not set - -# -# Wireless 802.11 Frequency Hopping cards support -# -# CONFIG_PCMCIA_RAYCS is not set - -# -# Wireless 802.11b ISA/PCI cards support -# -CONFIG_HERMES=m -# CONFIG_ATMEL is not set - -# -# Wireless 802.11b Pcmcia/Cardbus cards support -# -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m -# CONFIG_AIRO_CS is not set -# CONFIG_PCMCIA_WL3501 is not set -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set -CONFIG_HOSTAP_CS=m -CONFIG_NET_WIRELESS=y - -# -# PCMCIA network device support +# USB Network Adapters # +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_USBNET_MII=m +CONFIG_USB_USBNET=m +CONFIG_USB_NET_AX8817X=m +CONFIG_USB_NET_CDCETHER=m +# CONFIG_USB_NET_DM9601 is not set +# CONFIG_USB_NET_GL620A is not set +CONFIG_USB_NET_NET1080=m +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +CONFIG_USB_NET_ZAURUS=m CONFIG_NET_PCMCIA=y # CONFIG_PCMCIA_3C589 is not set # CONFIG_PCMCIA_3C574 is not set @@ -736,10 +768,6 @@ CONFIG_PCMCIA_PCNET=m # CONFIG_PCMCIA_SMC91C92 is not set # CONFIG_PCMCIA_XIRC2PS is not set # CONFIG_PCMCIA_AXNET is not set - -# -# Wan interfaces -# # CONFIG_WAN is not set CONFIG_PPP=m # CONFIG_PPP_MULTILINK is not set @@ -750,21 +778,21 @@ CONFIG_PPP_DEFLATE=m CONFIG_PPP_BSDCOMP=m # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set +# CONFIG_PPPOL2TP is not set # CONFIG_SLIP is not set +CONFIG_SLHC=m # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set - -# -# ISDN subsystem -# # CONFIG_ISDN is not set # # Input device support # CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_POLLDEV is not set # # Userland interfaces @@ -789,17 +817,31 @@ CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_LOCOMO=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_CORGI is not set # CONFIG_KEYBOARD_SPITZ is not set +# CONFIG_KEYBOARD_GPIO is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_CORGI=y +# CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_MK712 is not set +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set +# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set CONFIG_INPUT_MISC=y +# 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_UINPUT=m # @@ -814,6 +856,7 @@ CONFIG_INPUT_UINPUT=m CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -834,42 +877,22 @@ CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y # CONFIG_LEGACY_PTYS is not set - -# -# IPMI -# # CONFIG_IPMI_HANDLER is not set - -# -# Watchdog Cards -# # CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=m # CONFIG_NVRAM is not set -# CONFIG_DTLK is not set # CONFIG_R3964 is not set # -# Ftape, the floppy tape device driver -# - -# # PCMCIA character devices # # CONFIG_SYNCLINK_CS is not set # CONFIG_CARDMAN_4000 is not set # CONFIG_CARDMAN_4040 is not set # CONFIG_RAW_DRIVER is not set - -# -# TPM devices -# # CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set - -# -# I2C support -# CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y # CONFIG_I2C_CHARDEV is not set # @@ -882,22 +905,28 @@ CONFIG_I2C_ALGOBIT=y # # I2C Hardware Bus support # +# CONFIG_I2C_GPIO is not set CONFIG_I2C_PXA=y # CONFIG_I2C_PXA_SLAVE is not set +# CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set -# CONFIG_I2C_PCA_ISA is not set +# CONFIG_I2C_TINY_USB is not set # # Miscellaneous I2C Chip support # # CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_DS1374 is not set +# CONFIG_DS1682 is not set # CONFIG_SENSORS_EEPROM is not set # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set # CONFIG_SENSORS_MAX6875 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 @@ -908,29 +937,22 @@ CONFIG_I2C_PXA=y # # CONFIG_SPI is not set # CONFIG_SPI_MASTER is not set - -# -# Dallas's 1-wire bus -# # CONFIG_W1 is not set - -# -# Hardware Monitoring support -# +# CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set -# CONFIG_HWMON_VID is not set +CONFIG_MISC_DEVICES=y +# CONFIG_EEPROM_93CX6 is not set # -# Misc devices +# Multifunction device drivers # +# CONFIG_MFD_SM501 is not set +# CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_ASIC3_DS1WM is not set # # Multi-Function Devices # - -# -# LED devices -# CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y @@ -939,6 +961,7 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LOCOMO=y # CONFIG_LEDS_TOSA is not set +# CONFIG_LEDS_GPIO is not set # # LED Triggers @@ -946,6 +969,7 @@ CONFIG_LEDS_LOCOMO=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_IDE_DISK=y +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set # # Multimedia devices @@ -954,79 +978,82 @@ CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y - -# -# Video Capture Adapters -# - -# -# Video Capture Adapters -# +CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_VIVI is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y # 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_TUNER_3036 is not set -# CONFIG_VIDEO_OVCAMCHIP is not set - -# -# Encoders and Decoders -# -# CONFIG_VIDEO_MSP3400 is not set -# CONFIG_VIDEO_CS53L32A is not set -# CONFIG_VIDEO_WM8775 is not set -# CONFIG_VIDEO_WM8739 is not set -# CONFIG_VIDEO_CX25840 is not set -# CONFIG_VIDEO_SAA711X is not set -# CONFIG_VIDEO_SAA7127 is not set -# CONFIG_VIDEO_UPD64031A is not set -# CONFIG_VIDEO_UPD64083 is not set - -# -# V4L USB devices -# +# CONFIG_TUNER_TEA5761 is not set +CONFIG_V4L_USB_DRIVERS=y +# CONFIG_VIDEO_PVRUSB2 is not set # CONFIG_VIDEO_EM28XX is not set -CONFIG_USB_DSBR=m +# CONFIG_VIDEO_USBVISION is not set CONFIG_VIDEO_USBVIDEO=m CONFIG_USB_VICAM=m CONFIG_USB_IBMCAM=m CONFIG_USB_KONICAWC=m +# CONFIG_USB_QUICKCAM_MESSENGER is not set # CONFIG_USB_ET61X251 is not set +# CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_USB_W9968CF is not set CONFIG_USB_OV511=m CONFIG_USB_SE401=m CONFIG_USB_SN9C102=m CONFIG_USB_STV680=m -# CONFIG_USB_W9968CF is not set # CONFIG_USB_ZC0301 is not set # CONFIG_USB_PWC is not set +# CONFIG_USB_ZR364XX is not set +CONFIG_RADIO_ADAPTERS=y +CONFIG_USB_DSBR=m +# CONFIG_DVB_CORE is not set +CONFIG_DAB=y +CONFIG_USB_DABUSB=m # -# Radio Adapters -# -# CONFIG_RADIO_MAESTRO is not set - -# -# Digital Video Broadcasting Devices +# Graphics support # -# CONFIG_DVB is not set -CONFIG_USB_DABUSB=m +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_CORGI is not set +CONFIG_BACKLIGHT_LOCOMO=y # -# Graphics support +# Display device support # +# CONFIG_DISPLAY_SUPPORT is not set +# CONFIG_VGASTATE is not set +CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_SYS_FOPS is not set +CONFIG_FB_DEFERRED_IO=y +# CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set -CONFIG_FB_FIRMWARE_EDID=y +# CONFIG_FB_BACKLIGHT is not set CONFIG_FB_MODE_HELPERS=y # CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# # CONFIG_FB_S1D13XXX is not set CONFIG_FB_PXA=y +CONFIG_FB_PXA_LCD_QVGA=y +# CONFIG_FB_PXA_LCD_VGA is not set +# CONFIG_FB_PXA_OVERLAY is not set # CONFIG_FB_PXA_PARAMETERS is not set +# CONFIG_FB_MBX is not set # CONFIG_FB_W100 is not set # CONFIG_FB_VIRTUAL is not set @@ -1036,6 +1063,7 @@ CONFIG_FB_PXA=y # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONTS=y # CONFIG_FONT_8x8 is not set @@ -1048,25 +1076,14 @@ CONFIG_FONT_MINI_4x6=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set - -# -# Logo configuration -# CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y # CONFIG_LOGO_LINUX_CLUT224 is not set -# CONFIG_LOGO_OHAND_CLUT224 is not set -CONFIG_LOGO_OZ240_CLUT224=y +CONFIG_LOGO_OHAND_CLUT224=y +# CONFIG_LOGO_OZ240_CLUT224 is not set # CONFIG_LOGO_OZ480_CLUT224 is not set # CONFIG_LOGO_OZ640_CLUT224 is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_DEVICE=y -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_DEVICE=y -# CONFIG_BACKLIGHT_CORGI is not set -CONFIG_BACKLIGHT_LOCOMO=y # # Sound @@ -1107,6 +1124,7 @@ CONFIG_SND_VERBOSE_PROCFS=y # USB devices # # CONFIG_SND_USB_AUDIO is not set +# CONFIG_SND_USB_CAIAQ is not set # # PCMCIA devices @@ -1115,54 +1133,37 @@ CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_PDAUDIOCF is not set # -# SoC audio support +# System on Chip audio support # CONFIG_SND_SOC=m +# CONFIG_SND_PXA2XX_SOC is not set # -# Soc Platforms -# - -# -# SoC Audio for the Intel PXA2xx +# SoC Audio support for SuperH # -CONFIG_SND_PXA2xx_SOC=m -# CONFIG_SND_PXA2xx_SOC_MAINSTONE is not set -# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM8731 is not set -# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM8753 is not set -# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM8974 is not set -# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM9713 is not set -# CONFIG_SND_MAINSTONE_BASEBAND is not set -# CONFIG_SND_MAINSTONE_BLUETOOTH is not set -# CONFIG_SND_PXA2xx_SOC_MAINSTONE_WM9712 is not set -# CONFIG_SND_PXA2xx_SOC_CORGI is not set -# CONFIG_SND_PXA2xx_SOC_SPITZ is not set -CONFIG_SND_PXA2xx_SOC_POODLE=m -# CONFIG_SND_PXA2xx_SOC_TOSA is not set # -# Soc Codecs +# Open Sound System # -# CONFIG_SND_SOC_AC97_CODEC is not set -CONFIG_SND_SOC_WM8731=m -# CONFIG_SND_SOC_WM8750 is not set -# CONFIG_SND_SOC_WM8753 is not set -# CONFIG_SND_SOC_WM8772 is not set -# CONFIG_SND_SOC_WM8971 is not set -# CONFIG_SND_SOC_WM8974 is not set -# CONFIG_SND_SOC_WM9713 is not set -# CONFIG_SND_SOC_WM9712 is not set -# CONFIG_SND_SOC_UDA1380 is not set -# CONFIG_SND_SOC_AK4535 is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=m +# CONFIG_HID_DEBUG is not set # -# Open Sound System +# USB Input Devices # -# CONFIG_SOUND_PRIME is not set +CONFIG_USB_HID=m +# CONFIG_USB_HIDINPUT_POWERBOOK is not set +# CONFIG_HID_FF is not set +# CONFIG_USB_HIDDEV is not set # -# USB support +# USB HID Boot Protocol drivers # +CONFIG_USB_KBD=m +CONFIG_USB_MOUSE=m +CONFIG_USB_SUPPORT=y CONFIG_USB_ARCH_HAS_HCD=y # CONFIG_USB_ARCH_HAS_OHCI is not set # CONFIG_USB_ARCH_HAS_EHCI is not set @@ -1173,9 +1174,10 @@ CONFIG_USB=m # Miscellaneous USB options # CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set +CONFIG_USB_DEVICE_CLASS=y # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set +# CONFIG_USB_PERSIST is not set # CONFIG_USB_OTG is not set # @@ -1184,6 +1186,7 @@ CONFIG_USB_DEVICEFS=y # CONFIG_USB_ISP116X_HCD is not set CONFIG_USB_SL811_HCD=m CONFIG_USB_SL811_CS=m +# CONFIG_USB_R8A66597_HCD is not set # # USB Device Class drivers @@ -1209,58 +1212,14 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_SDDR55 is not set # CONFIG_USB_STORAGE_JUMPSHOT is not set # CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_LIBUSUAL is not set # -# USB Input Devices -# -CONFIG_USB_HID=m -CONFIG_USB_HIDINPUT=y -# CONFIG_USB_HIDINPUT_POWERBOOK is not set -# CONFIG_HID_FF is not set -# CONFIG_USB_HIDDEV is not set - -# -# USB HID Boot Protocol drivers -# -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m -CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m -# CONFIG_USB_ACECAD is not set -CONFIG_USB_KBTAB=m -CONFIG_USB_POWERMATE=m -# CONFIG_USB_TOUCHSCREEN is not set -# CONFIG_USB_YEALINK is not set -CONFIG_USB_XPAD=m -CONFIG_USB_ATI_REMOTE=m -# CONFIG_USB_ATI_REMOTE2 is not set -# CONFIG_USB_KEYSPAN_REMOTE is not set -# CONFIG_USB_APPLETOUCH is not set - -# # USB Imaging devices # CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m - -# -# 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_GL620A is not set -CONFIG_USB_NET_NET1080=m -# CONFIG_USB_NET_PLUSB is not set -# CONFIG_USB_NET_RNDIS_HOST is not set -# CONFIG_USB_NET_CDC_SUBSET is not set -CONFIG_USB_NET_ZAURUS=m -# CONFIG_USB_ZD1201 is not set CONFIG_USB_MON=y # @@ -1272,8 +1231,8 @@ CONFIG_USB_MON=y # CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRCABLE is not set # CONFIG_USB_SERIAL_AIRPRIME is not set -# CONFIG_USB_SERIAL_ANYDATA is not set # CONFIG_USB_SERIAL_ARK3116 is not set CONFIG_USB_SERIAL_BELKIN=m # CONFIG_USB_SERIAL_WHITEHEAT is not set @@ -1307,15 +1266,21 @@ CONFIG_USB_SERIAL_KEYSPAN=m 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_NAVMAN is not set CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_OTI6858 is not set # CONFIG_USB_SERIAL_HP4X is not set CONFIG_USB_SERIAL_SAFE=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set +# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set CONFIG_USB_SERIAL_TI=m CONFIG_USB_SERIAL_CYBERJACK=m CONFIG_USB_SERIAL_XIRCOM=m +# CONFIG_USB_SERIAL_OPTION is not set CONFIG_USB_SERIAL_OMNINET=m +# CONFIG_USB_SERIAL_DEBUG is not set CONFIG_USB_EZUSB=y # @@ -1323,16 +1288,22 @@ CONFIG_USB_EZUSB=y # CONFIG_USB_EMI62=m CONFIG_USB_EMI26=m +# CONFIG_USB_ADUTUX is not set CONFIG_USB_AUERSWALD=m CONFIG_USB_RIO500=m CONFIG_USB_LEGOTOWER=m CONFIG_USB_LCD=m +# CONFIG_USB_BERRY_CHARGE is not set CONFIG_USB_LED=m +# CONFIG_USB_CYPRESS_CY7C63 is not set CONFIG_USB_CYTHERM=m -CONFIG_USB_PHIDGETKIT=m -CONFIG_USB_PHIDGETSERVO=m +# CONFIG_USB_PHIDGET is not set CONFIG_USB_IDMOUSE=m +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set # CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_TEST is not set # @@ -1343,16 +1314,21 @@ CONFIG_USB_IDMOUSE=m # USB Gadget Support # CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG is not set # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y +# CONFIG_USB_GADGET_AMD5536UDC is not set +# CONFIG_USB_GADGET_FSL_USB2 is not set # CONFIG_USB_GADGET_NET2280 is not set CONFIG_USB_GADGET_PXA2XX=y CONFIG_USB_PXA2XX=y # CONFIG_USB_PXA2XX_SMALL is not set +# CONFIG_USB_GADGET_M66592 is not set # CONFIG_USB_GADGET_PXA27X is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set +# CONFIG_USB_GADGET_S3C2410 is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set # CONFIG_USB_GADGET_DUALSPEED is not set @@ -1363,24 +1339,26 @@ CONFIG_USB_GADGETFS=m CONFIG_USB_FILE_STORAGE=m # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_G_SERIAL=m - -# -# MMC/SD Card support -# +# CONFIG_USB_MIDI_GADGET is not set CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set -CONFIG_MMC_BLOCK=y -CONFIG_MMC_PXA=y CONFIG_MMC_UNSAFE_RESUME=y +# +# MMC/SD Card Drivers +# +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_BOUNCE=y # -# Real Time Clock +# MMC/SD Host Controller Drivers # +CONFIG_MMC_PXA=y 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 @@ -1388,17 +1366,54 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 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 # -# RTC drivers +# I2C RTC drivers # -# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_DS1307 is not set # CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_PCF8563 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 + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_CMOS is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_M48T86 is not set -CONFIG_RTC_DRV_SA1100=y -# CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_V3020 is not set + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_SA1100=m + +# +# DMA Engine support +# +# CONFIG_DMA_ENGINE is not set + +# +# DMA Clients +# + +# +# DMA Devices +# # # File systems @@ -1406,15 +1421,24 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m +CONFIG_EXT3_FS_XATTR=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +# CONFIG_EXT4DEV_FS is not set +CONFIG_JBD=m +# CONFIG_JBD_DEBUG is not set +CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y # CONFIG_AUTOFS_FS is not set @@ -1441,8 +1465,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # Pseudo filesystems # CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y # CONFIG_CONFIGFS_FS is not set @@ -1457,18 +1483,21 @@ CONFIG_RAMFS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -# CONFIG_JFFS_FS is not set CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y CONFIG_JFFS2_SUMMARY=y +# CONFIG_JFFS2_FS_XATTR is not set +# CONFIG_JFFS2_SYSFS is not set CONFIG_JFFS2_COMPRESSION_OPTIONS=y CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_LZO=y CONFIG_JFFS2_RTIME=y CONFIG_JFFS2_RUBIN=y # CONFIG_JFFS2_CMODE_NONE is not set CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_JFFS2_CMODE_SIZE is not set +# CONFIG_JFFS2_CMODE_FAVOURLZO is not set CONFIG_CRAMFS=m CONFIG_SQUASHFS=m # CONFIG_SQUASHFS_EMBEDDED is not set @@ -1494,6 +1523,7 @@ CONFIG_LOCKD_V4=y CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +# CONFIG_SUNRPC_BIND34 is not set CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m @@ -1501,12 +1531,13 @@ CONFIG_SMB_NLS_DEFAULT=y CONFIG_SMB_NLS_REMOTE="cp437" CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set -# CONFIG_9P_FS is not set # # Partition Types @@ -1528,6 +1559,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_SUN_PARTITION is not set # CONFIG_KARMA_PARTITION is not set # CONFIG_EFI_PARTITION is not set +# CONFIG_SYSV68_PARTITION is not set # # Native Language Support @@ -1574,6 +1606,11 @@ CONFIG_NLS_KOI8_U=m CONFIG_NLS_UTF8=y # +# Distributed Lock Manager +# +# CONFIG_DLM is not set + +# # Profiling support # CONFIG_PROFILING=y @@ -1583,28 +1620,38 @@ CONFIG_OPROFILE=m # Kernel hacking # # CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y CONFIG_MAGIC_SYSRQ=y +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_DETECT_SOFTLOCKUP=y -CONFIG_TIMER_STATS=y +# CONFIG_DEBUG_SHIRQ is not set +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHED_DEBUG is not set # CONFIG_SCHEDSTATS is not set +CONFIG_TIMER_STATS=y # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_PREEMPT is not set -# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set -# CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set CONFIG_FRAME_POINTER=y -# CONFIG_UNWIND_INFO is not set # CONFIG_FORCED_INLINING is not set # CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_FAULT_INJECTION is not set # CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_WAITQ is not set CONFIG_DEBUG_ERRORS=y # CONFIG_DEBUG_LL is not set @@ -1613,12 +1660,13 @@ CONFIG_DEBUG_ERRORS=y # # CONFIG_KEYS is not set # CONFIG_SECURITY is not set - -# -# Cryptographic options -# CONFIG_CRYPTO=y -CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_HMAC=m +# CONFIG_CRYPTO_XCBC is not set CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m @@ -1627,9 +1675,17 @@ CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_WP512=m # CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_CRYPTD is not set CONFIG_CRYPTO_DES=m +# CONFIG_CRYPTO_FCRYPT is not set CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_CAST5=m @@ -1639,21 +1695,28 @@ CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_ANUBIS=m CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_LZO=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_TEST=m - -# -# Hardware crypto devices -# +CONFIG_CRYPTO_HW=y # # Library routines # +CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=y # CONFIG_CRC16 is not set +# CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y +# CONFIG_CRC7 is not set CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=y -# CONFIG_SHARPSL_RC is not set +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y diff --git a/packages/linux/linux-rp-2.6.23/defconfig-qemuarm b/packages/linux/linux-rp-2.6.23/defconfig-qemuarm index 35cf3f5b17..d4970059aa 100644 --- a/packages/linux/linux-rp-2.6.23/defconfig-qemuarm +++ b/packages/linux/linux-rp-2.6.23/defconfig-qemuarm @@ -134,7 +134,8 @@ CONFIG_ARM_THUMB=y # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_DCACHE_WRITETHROUGH is not set # CONFIG_CPU_CACHE_ROUND_ROBIN is not set -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y CONFIG_ARM_VIC=y CONFIG_ICST307=y @@ -245,7 +246,69 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set -# CONFIG_NETFILTER is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NF_CONNTRACK is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + # # DCCP Configuration (EXPERIMENTAL) @@ -974,7 +1037,7 @@ CONFIG_RTC_INTF_DEV=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set diff --git a/packages/linux/linux-rp-2.6.23/defconfig-qemux86 b/packages/linux/linux-rp-2.6.23/defconfig-qemux86 index e9eb83e2dd..bc3f9cce0d 100644 --- a/packages/linux/linux-rp-2.6.23/defconfig-qemux86 +++ b/packages/linux/linux-rp-2.6.23/defconfig-qemux86 @@ -177,7 +177,8 @@ CONFIG_SECCOMP=y CONFIG_HZ_250=y # CONFIG_HZ_1000 is not set CONFIG_HZ=250 -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y CONFIG_PHYSICAL_START=0x100000 # CONFIG_HOTPLUG_CPU is not set @@ -308,24 +309,61 @@ CONFIG_NETFILTER=y # Core Netfilter Configuration # # CONFIG_NETFILTER_NETLINK is not set -# CONFIG_NETFILTER_XTABLES is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NF_CONNTRACK is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # -CONFIG_IP_NF_CONNTRACK=y -# CONFIG_IP_NF_CT_ACCT is not set -# CONFIG_IP_NF_CONNTRACK_MARK is not set -# CONFIG_IP_NF_CONNTRACK_EVENTS is not set -# CONFIG_IP_NF_CT_PROTO_SCTP is not set -# CONFIG_IP_NF_FTP is not set -# CONFIG_IP_NF_IRC is not set -# CONFIG_IP_NF_NETBIOS_NS is not set -# CONFIG_IP_NF_TFTP is not set -# CONFIG_IP_NF_AMANDA is not set -# CONFIG_IP_NF_PPTP is not set -# CONFIG_IP_NF_H323 is not set -CONFIG_IP_NF_QUEUE=y +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m # # DCCP Configuration (EXPERIMENTAL) diff --git a/packages/linux/linux-rp-2.6.23/defconfig-spitz b/packages/linux/linux-rp-2.6.23/defconfig-spitz index 8e044e6a14..74d7f828a0 100644 --- a/packages/linux/linux-rp-2.6.23/defconfig-spitz +++ b/packages/linux/linux-rp-2.6.23/defconfig-spitz @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.23-rc4 -# Tue Aug 28 22:32:38 2007 +# Linux kernel version: 2.6.23 +# Thu Dec 27 17:03:44 2007 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -66,7 +66,6 @@ CONFIG_FUTEX=y CONFIG_ANON_INODES=y CONFIG_EPOLL=y CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y @@ -149,6 +148,7 @@ CONFIG_PXA_SHARPSL=y # CONFIG_MACH_TRIZEPS4 is not set # CONFIG_MACH_EM_X270 is not set # CONFIG_MACH_HX2750 is not set +# CONFIG_MACH_HTCUNIVERSAL is not set # CONFIG_PXA_SHARPSL_25x is not set CONFIG_PXA_SHARPSL_27x=y CONFIG_MACH_AKITA=y @@ -244,6 +244,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw fbcon=rotate:1 dyntick=enable debug" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Frequency scaling @@ -275,6 +276,7 @@ CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set CONFIG_PM_SLEEP=y +CONFIG_SUSPEND_UP_POSSIBLE=y CONFIG_SUSPEND=y CONFIG_APM_EMULATION=y @@ -345,14 +347,59 @@ CONFIG_NETFILTER=y # CONFIG_NETFILTER_NETLINK is not set # CONFIG_NF_CONNTRACK_ENABLED is not set # CONFIG_NF_CONNTRACK is not set -# CONFIG_NETFILTER_XTABLES is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # CONFIG_IP_NF_QUEUE=m -# CONFIG_IP_NF_IPTABLES is not set -# CONFIG_IP_NF_ARPTABLES is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m # # IPv6: Netfilter Configuration (EXPERIMENTAL) @@ -493,7 +540,6 @@ CONFIG_MTD=m # CONFIG_MTD_CONCAT is not set CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_REDBOOT_PARTS is not set -CONFIG_MTD_CMDLINE_PARTS=y # CONFIG_MTD_AFS_PARTS is not set # @@ -502,6 +548,7 @@ CONFIG_MTD_CMDLINE_PARTS=y 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 @@ -524,7 +571,7 @@ CONFIG_MTD_CFI_I2=y # CONFIG_MTD_CFI_I4 is not set # CONFIG_MTD_CFI_I8 is not set # CONFIG_MTD_RAM is not set -CONFIG_MTD_ROM=y +CONFIG_MTD_ROM=m # CONFIG_MTD_ABSENT is not set # @@ -549,14 +596,14 @@ CONFIG_MTD_SHARP_SL=y # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set -CONFIG_MTD_NAND=y +CONFIG_MTD_NAND=m CONFIG_MTD_NAND_VERIFY_WRITE=y # CONFIG_MTD_NAND_ECC_SMC is not set # CONFIG_MTD_NAND_MUSEUM_IDS is not set # CONFIG_MTD_NAND_H1900 is not set -CONFIG_MTD_NAND_IDS=y +CONFIG_MTD_NAND_IDS=m # CONFIG_MTD_NAND_DISKONCHIP is not set -CONFIG_MTD_NAND_SHARPSL=y +CONFIG_MTD_NAND_SHARPSL=m # CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_PLATFORM is not set # CONFIG_MTD_ONENAND is not set @@ -893,6 +940,7 @@ CONFIG_I2C_PXA=y # CONFIG_SPI is not set # CONFIG_SPI_MASTER is not set # CONFIG_W1 is not set +# CONFIG_POWER_SUPPLY is not set # CONFIG_HWMON is not set CONFIG_MISC_DEVICES=y # CONFIG_EEPROM_93CX6 is not set @@ -901,6 +949,8 @@ CONFIG_MISC_DEVICES=y # Multifunction device drivers # # CONFIG_MFD_SM501 is not set +# CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_ASIC3_DS1WM is not set # # Multi-Function Devices @@ -1110,7 +1160,7 @@ CONFIG_SND_SOC_WM8750=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m CONFIG_HID_SUPPORT=y -CONFIG_HID=y +CONFIG_HID=m # CONFIG_HID_DEBUG is not set # diff --git a/packages/linux/linux-rp-2.6.23/defconfig-tosa b/packages/linux/linux-rp-2.6.23/defconfig-tosa index d3dc74bcc0..f80caf7d16 100644 --- a/packages/linux/linux-rp-2.6.23/defconfig-tosa +++ b/packages/linux/linux-rp-2.6.23/defconfig-tosa @@ -143,6 +143,7 @@ CONFIG_CPU_TLB_V4WBI=y CONFIG_ARM_THUMB=y CONFIG_XSCALE_PMU=y CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y CONFIG_SHARP_PARAM=y CONFIG_SHARPSL_PM=y CONFIG_SHARP_SCOOP=y @@ -288,23 +289,64 @@ CONFIG_NETFILTER=y # Core Netfilter Configuration # # CONFIG_NETFILTER_NETLINK is not set -# CONFIG_NETFILTER_XTABLES is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NF_CONNTRACK is not set + +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set # # IP: Netfilter Configuration # -CONFIG_IP_NF_CONNTRACK=m -# CONFIG_IP_NF_CT_ACCT is not set -# CONFIG_IP_NF_CONNTRACK_MARK is not set -# CONFIG_IP_NF_CONNTRACK_EVENTS is not set -CONFIG_IP_NF_CT_PROTO_SCTP=m -CONFIG_IP_NF_FTP=m -CONFIG_IP_NF_IRC=m -# CONFIG_IP_NF_NETBIOS_NS is not set -CONFIG_IP_NF_TFTP=m -CONFIG_IP_NF_AMANDA=m -# CONFIG_IP_NF_PPTP is not set CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + +# # # IPv6: Netfilter Configuration (EXPERIMENTAL) @@ -1105,8 +1147,10 @@ CONFIG_SND_SOC_WM9712=y # Open Sound System # # CONFIG_SOUND_PRIME is not set +CONFIG_HID_SUPPORT=y CONFIG_HID=m + # # USB support # @@ -1366,7 +1410,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set diff --git a/packages/linux/linux-rp-2.6.23/defconfig-zylonite b/packages/linux/linux-rp-2.6.23/defconfig-zylonite index 0321704a1f..13fd6e3886 100644 --- a/packages/linux/linux-rp-2.6.23/defconfig-zylonite +++ b/packages/linux/linux-rp-2.6.23/defconfig-zylonite @@ -232,7 +232,8 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyS0,38400 root=/dev/mtdblock2 rootfstype=jffs2 mem=64M dyntick=enable debug" # CONFIG_XIP_KERNEL is not set -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y # # CPU Frequency scaling @@ -307,7 +308,69 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set # CONFIG_NETWORK_SECMARK is not set -# CONFIG_NETFILTER is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set +# CONFIG_NF_CONNTRACK is not set +CONFIG_NETFILTER_XTABLES=m +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_DSCP is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_TRACE is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +# CONFIG_NETFILTER_XT_MATCH_POLICY is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set + +# +# IP: Netfilter Configuration +# +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_IPRANGE=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_MATCH_OWNER=m +CONFIG_IP_NF_MATCH_ADDRTYPE=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_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_TTL=m +CONFIG_IP_NF_RAW=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m + # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_TIPC is not set @@ -962,7 +1025,7 @@ CONFIG_SND_VERBOSE_PROCFS=y # # CONFIG_SOUND_PRIME is not set CONFIG_HID_SUPPORT=y -CONFIG_HID=y +CONFIG_HID=m # CONFIG_HID_DEBUG is not set # @@ -1173,7 +1236,7 @@ CONFIG_RTC_DRV_SA1100=y CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set -# CONFIG_EXT3_FS is not set +CONFIG_EXT3_FS=m # CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set diff --git a/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch b/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch index 034acc7b8e..9b8434a0bc 100644 --- a/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch +++ b/packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch @@ -3,8 +3,8 @@ Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.23/drivers/usb/host/ohci-tmio.c 2007-11-13 01:35:13.049455112 +0300 -@@ -0,0 +1,417 @@ ++++ linux-2.6.23/drivers/usb/host/ohci-tmio.c 2007-11-14 16:58:47.637707413 +0300 +@@ -0,0 +1,530 @@ +/* + * OHCI HCD(Host Controller Driver) for USB. + * @@ -53,6 +53,14 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + +/*-------------------------------------------------------------------------*/ + ++#define MAX_TMIO_USB_PORTS 2 ++static bool default_tmio_ports[MAX_TMIO_USB_PORTS]; ++module_param_array(default_tmio_ports, bool, NULL, 0644); ++MODULE_PARM_DESC(default_tmio_ports, ++ "disable specified TC6393 usb ports (default: all enabled)"); ++ ++/*-------------------------------------------------------------------------*/ ++ +/* + * USB Host Controller Configuration Register + */ @@ -87,8 +95,8 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c +struct { + unsigned gcken:1; /* D0 */ + unsigned ckrnen:1; /* D1 */ -+ unsigned uspw1:1; /* D2 USB Port 1 Power Disable */ -+ unsigned uspw2:1; /* D3 USB Port 2 Power Disable */ ++ unsigned uspw0:1; /* D2 USB Port 1 Power Disable */ ++ unsigned uspw1:1; /* D3 USB Port 2 Power Disable */ + unsigned x00:4; + unsigned pmee:1; /* D8 */ + unsigned x01:6; @@ -100,6 +108,7 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + +struct tmio_hcd { + struct tmio_uhccr __iomem *ccr; ++ bool disabled_ports[MAX_TMIO_USB_PORTS]; +}; + +#define hcd_to_tmio(hcd) ((struct tmio_hcd *)(hcd_to_ohci(hcd) + 1)) @@ -107,6 +116,39 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + +/*-------------------------------------------------------------------------*/ + ++struct indexed_device_attribute{ ++ struct device_attribute dev_attr; ++ int index; ++}; ++#define to_indexed_dev_attr(_dev_attr) \ ++ container_of(_dev_attr, struct indexed_device_attribute, dev_attr) ++ ++#define INDEXED_ATTR(_name, _mode, _show, _store, _index) \ ++ { .dev_attr = __ATTR(_name ## _index, _mode, _show, _store), \ ++ .index = _index } ++ ++#define INDEXED_DEVICE_ATTR(_name, _mode, _show, _store, _index) \ ++struct indexed_device_attribute dev_attr_##_name ## _index \ ++ = INDEXED_ATTR(_name, _mode, _show, _store, _index) ++ ++/*-------------------------------------------------------------------------*/ ++ ++ ++static void tmio_fill_pm(struct tmio_hcd *tmio, union tmio_uhccr_pm *pm) ++{ ++ pm->raw = 0; ++ ++ pm->pmee = 1; ++ pm->pmes = 1; ++ pm->gcken = 1; ++ pm->ckrnen = 1; ++ ++ if (tmio->disabled_ports[0]) ++ pm->uspw0 = 1; ++ if (tmio->disabled_ports[1]) ++ pm->uspw1 = 1; ++} ++ +static void tmio_stop_hc(struct device *dev) +{ + struct tmio_device *tdev = dev_to_tdev(dev); @@ -117,8 +159,8 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + + pm.gcken = 1; + pm.ckrnen = 1; ++ pm.uspw0 = 1; + pm.uspw1 = 1; -+ pm.uspw2 = 1; + + iowrite8(0, &ccr->intc); + iowrite8(0, &ccr->ilme); @@ -139,10 +181,7 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + union tmio_uhccr_pm pm = {0}; + unsigned long base = hcd->rsrc_start; + -+ pm.pmes = 1; -+ pm.pmee = 1; -+ pm.ckrnen = 1; -+ pm.gcken = 1; ++ tmio_fill_pm(tmio, &pm); + + tdev->ops->clock(dev, 1); + tdev->ops->function(dev, 1); @@ -157,6 +196,54 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + ioread8(&ccr->revid), hcd->rsrc_start, hcd->irq); +} + ++static ssize_t tmio_disabled_port_show(struct device *dev, ++ struct device_attribute *attr, ++ char *buf) ++{ ++ struct usb_hcd *hcd = dev_get_drvdata(dev); ++ struct tmio_hcd *tmio = hcd_to_tmio(hcd); ++ int index = to_indexed_dev_attr(attr)->index; ++ return snprintf(buf, PAGE_SIZE, "%c", ++ tmio->disabled_ports[index]? 'Y': 'N'); ++} ++ ++static ssize_t tmio_disabled_port_store(struct device *dev, ++ struct device_attribute *attr, ++ const char *buf, size_t count) ++{ ++ struct usb_hcd *hcd = dev_get_drvdata(dev); ++ struct tmio_hcd *tmio = hcd_to_tmio(hcd); ++ struct tmio_uhccr __iomem *ccr = tmio->ccr; ++ union tmio_uhccr_pm pm = {0}; ++ int index = to_indexed_dev_attr(attr)->index; ++ ++ if (!count) ++ return -EINVAL; ++ ++ switch (buf[0]) { ++ case 'y': case 'Y': case '1': ++ tmio->disabled_ports[index] = true; ++ break; ++ case 'n': case 'N': case '0': ++ tmio->disabled_ports[index] = false; ++ break; ++ default: ++ return -EINVAL; ++ } ++ ++ tmio_fill_pm(tmio, &pm); ++ ++ iowrite16(pm.raw, &ccr->pm); ++ ++ return 1; ++} ++ ++ ++static INDEXED_DEVICE_ATTR(disabled_usb_port, S_IRUGO | S_IWUSR, ++ tmio_disabled_port_show, tmio_disabled_port_store, 0); ++static INDEXED_DEVICE_ATTR(disabled_usb_port, S_IRUGO | S_IWUSR, ++ tmio_disabled_port_show, tmio_disabled_port_store, 1); ++ +static int usb_hcd_tmio_probe(const struct hc_driver *driver, + struct device *dev) +{ @@ -195,6 +282,9 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + hcd->rsrc_len = regs->end - regs->start + 1; + + tmio = hcd_to_tmio(hcd); ++ memcpy(tmio->disabled_ports, ++ default_tmio_ports, ++ sizeof(default_tmio_ports)); + + tmio->ccr = ioremap(config->start, config->end - config->start + 1); + if (!tmio->ccr) { @@ -224,11 +314,23 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + ohci = hcd_to_ohci(hcd); + ohci_hcd_init(ohci); + ++ retval = device_create_file(dev, ++ &dev_attr_disabled_usb_port0.dev_attr); ++ retval |= device_create_file(dev, ++ &dev_attr_disabled_usb_port1.dev_attr); ++ ++ if (retval) ++ goto err_create_file; ++ + retval = usb_add_hcd(hcd, irq->start, IRQF_DISABLED); + + if (retval == 0) + return retval; + ++err_create_file: ++ device_remove_file(dev, &dev_attr_disabled_usb_port1.dev_attr); ++ device_remove_file(dev, &dev_attr_disabled_usb_port0.dev_attr); ++ + tmio_stop_hc(dev); + + dmabounce_unregister_dev(dev); @@ -256,6 +358,8 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c + struct tmio_hcd *tmio = hcd_to_tmio(hcd); + + usb_remove_hcd(hcd); ++ device_remove_file(dev, &dev_attr_disabled_usb_port1.dev_attr); ++ device_remove_file(dev, &dev_attr_disabled_usb_port0.dev_attr); + tmio_stop_hc(dev); + dmabounce_unregister_dev(dev); + dma_release_declared_memory(dev); @@ -343,13 +447,22 @@ Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c +static int ohci_hcd_tmio_drv_probe(struct device *dev) +{ + struct resource *sram = tmio_resource_mem(dev); ++ int retval; + + dev->dma_mask = &dma_mask; + dev->coherent_dma_mask = DMA_32BIT_MASK; + ++ /* FIXME: move dmabounce checkers to tc6393 core? */ + dmabounce_register_checker(tmio_dmabounce_check, sram); + -+ return usb_hcd_tmio_probe(&ohci_tmio_hc_driver, dev); ++ retval = usb_hcd_tmio_probe(&ohci_tmio_hc_driver, dev); ++ ++ if (retval == 0) ++ return retval; ++ ++ dmabounce_remove_checker(tmio_dmabounce_check, sram); ++ ++ return retval; +} + +static int ohci_hcd_tmio_drv_remove(struct device *dev) @@ -437,7 +550,7 @@ Index: linux-2.6.23/drivers/usb/host/Kconfig Index: linux-2.6.23/drivers/usb/host/ohci-hcd.c =================================================================== --- linux-2.6.23.orig/drivers/usb/host/ohci-hcd.c 2007-11-12 13:46:52.894560883 +0300 -+++ linux-2.6.23/drivers/usb/host/ohci-hcd.c 2007-11-13 01:03:53.950798640 +0300 ++++ linux-2.6.23/drivers/usb/host/ohci-hcd.c 2007-11-14 16:44:32.788069355 +0300 @@ -915,6 +915,10 @@ #define PLATFORM_DRIVER usb_hcd_pnx4008_driver #endif diff --git a/packages/linux/linux-rp_2.6.17.bb b/packages/linux/linux-rp_2.6.17.bb index de898b3f11..eadbdbafce 100644 --- a/packages/linux/linux-rp_2.6.17.bb +++ b/packages/linux/linux-rp_2.6.17.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r38" +PR = "r39" DEFAULT_PREFERENCE_poodle = "99" diff --git a/packages/linux/linux-rp_2.6.20.bb b/packages/linux/linux-rp_2.6.20.bb index 9ee189e50a..e5cb03d4eb 100644 --- a/packages/linux/linux-rp_2.6.20.bb +++ b/packages/linux/linux-rp_2.6.20.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r19" +PR = "r20" DEFAULT_PREFERENCE_poodle = "-99" DEFAULT_PREFERENCE_collie = "1" diff --git a/packages/linux/linux-rp_2.6.21.bb b/packages/linux/linux-rp_2.6.21.bb index e388a0c1a4..e5c63d7cfe 100644 --- a/packages/linux/linux-rp_2.6.21.bb +++ b/packages/linux/linux-rp_2.6.21.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r12" +PR = "r13" DEFAULT_PREFERENCE_poodle = "-99" DEFAULT_PREFERENCE_collie = "-1" diff --git a/packages/linux/linux-rp_2.6.23.bb b/packages/linux/linux-rp_2.6.23.bb index 53625791a7..71d874469d 100644 --- a/packages/linux/linux-rp_2.6.23.bb +++ b/packages/linux/linux-rp_2.6.23.bb @@ -1,23 +1,22 @@ require linux-rp.inc -PR = "r10" +PR = "r16" DEFAULT_PREFERENCE_qemuarm = "-1" DEFAULT_PREFERENCE_qemux86 = "-1" -DEFAULT_PREFERENCE_poodle = "-99" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 -# http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 -# http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.20-rc4.tar.bz2 -# http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;patch=1 -# http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;patch=1 -# http://www.kernel.org/pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 -# http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 +# ${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 +# ${KERNELORG_MIRROR}pub/linux/kernel/v2.6/testing/linux-2.6.20-rc4.tar.bz2 +# ${KERNELORG_MIRROR}pub/linux/kernel/v2.6/testing/patch-2.6.18-rc6.bz2;patch=1 +# ${KERNELORG_MIRROR}pub/linux/kernel/v2.6/snapshots/patch-2.6.18-rc2-git1.bz2;patch=1 +# ${KERNELORG_MIRROR}pub/linux/kernel/people/alan/linux-2.6/2.6.10/patch-2.6.10-ac8.gz;patch=1 +# ${KERNELORG_MIRROR}pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 # Patches submitted upstream are towards top of this list # Hacks should clearly named and at the bottom -SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ ${RPSRC}/lzo_jffs2-r3.patch;patch=1 \ ${RPSRC}/lzo_crypto-r2.patch;patch=1 \ ${RPSRC}/lzo_jffs2_lzomode-r1.patch;patch=1 \ @@ -39,6 +38,10 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ ${RPSRC}/pxa27x_overlay-r6.patch;patch=1 \ ${RPSRC}/w100_extaccel-r1.patch;patch=1 \ ${RPSRC}/w100_extmem-r1.patch;patch=1 \ + ${RPSRC}/spitzkbd_fix-r0.patch;patch=1 \ + ${RPSRC}/export_atags-r0.patch;patch=1 \ + ${RPSRC}/pxa25x_suspend_fixes-r0.patch;patch=1 \ + ${RPSRC}/poodle_lcd_hack-r0.patch;patch=1 \ file://w100fb-unused-var.patch;patch=1 \ file://hostap-monitor-mode.patch;patch=1 \ file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \ diff --git a/packages/linux/linux-sequoia_2.6.21.bb b/packages/linux/linux-sequoia_2.6.21.bb index 1fa520e914..49c7878ca2 100644 --- a/packages/linux/linux-sequoia_2.6.21.bb +++ b/packages/linux/linux-sequoia_2.6.21.bb @@ -31,12 +31,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$ install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux_2.6.23.bb b/packages/linux/linux_2.6.23.bb index 0b276b4d63..5e5d507247 100644 --- a/packages/linux/linux_2.6.23.bb +++ b/packages/linux/linux_2.6.23.bb @@ -10,13 +10,20 @@ DEFAULT_PREFERENCE_avr32 = "1" DEPENDS_append_mpc8313e-rdb = " dtc-native" DEPENDS_append_mpc8323e-rdb = " dtc-native" -PR = "r8" +PR = "r9" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \ file://binutils-buildid-arm.patch;patch=1 \ file://defconfig \ " +# Bug fixes on the 2.6.23.x stable branch +SRC_URI += "http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.23.12.bz2;patch=1" +# Add support for squashfs-lzma (a highly compressed read-only filesystem) +SRC_URI += "http://kamikaze.waninkoko.info/patches/2.6.23/klight1/broken-out/squashfs-lzma-2.6.23.patch;patch=1" +# Completely fair scheduler +SRC_URI += "http://people.redhat.com/mingo/cfs-scheduler/sched-cfs-v2.6.23.12-v24.1.patch;patch=1" + SRC_URI_append_avr32 = " \ http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.23.atmel.3.patch.bz2;patch=1 \ " @@ -93,3 +100,4 @@ do_devicetree_image() { addtask compulab_image after do_deploy before do_package addtask devicetree_image after do_deploy before do_package + diff --git a/packages/uboot/u-boot-1.2.0/turbostation/.mtn2git_empty b/packages/matchbox-applet-startup-monitor/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uboot/u-boot-1.2.0/turbostation/.mtn2git_empty +++ b/packages/matchbox-applet-startup-monitor/files/.mtn2git_empty diff --git a/packages/matchbox-applet-startup-monitor/files/mb-applet-startup-monitor.desktop b/packages/matchbox-applet-startup-monitor/files/mb-applet-startup-monitor.desktop new file mode 100644 index 0000000000..fa93f768db --- /dev/null +++ b/packages/matchbox-applet-startup-monitor/files/mb-applet-startup-monitor.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Startup Monitor +Comment=Panel based startup monitor +Exec=mb-applet-startup-monitor +Type=PanelApp +Icon=hourglass-1.png +Categories=Panel;Utility;MB; diff --git a/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb b/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb index e95665041e..86a9959753 100644 --- a/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb +++ b/packages/matchbox-applet-startup-monitor/matchbox-applet-startup-monitor_0.1.bb @@ -3,12 +3,17 @@ LICENSE = "GPL" DEPENDS = "libmatchbox startup-notification" SECTION = "x11/wm" -PR = "r1" +PR = "r2" -SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-startup-monitor/${PV}/mb-applet-startup-monitor-${PV}.tar.gz" +SRC_URI = "http://projects.o-hand.com/matchbox/sources/mb-applet-startup-monitor/${PV}/mb-applet-startup-monitor-${PV}.tar.gz \ + file://mb-applet-startup-monitor.desktop" S = "${WORKDIR}/mb-applet-startup-monitor-${PV}" inherit autotools pkgconfig FILES_${PN} = "${bindir}/* ${datadir}/applications ${datadir}/pixmaps" +do_install_append() { + install -d ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/mb-applet-startup-monitor.desktop ${D}${datadir}/applications/ +} diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb index c483ea26a6..47d9a93a15 100644 --- a/packages/meta/external-toolchain.bb +++ b/packages/meta/external-toolchain.bb @@ -30,21 +30,21 @@ do_stage() { install -d ${STAGING_DIR}/pkgdata/ install -d ${STAGING_DIR_TARGET}/shlibs/ - cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/ - cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/ + cp -pPRr ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/ + cp -pPRr ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/ if [ -d ${prefix}/ipk ]; then install -d ${DEPLOY_DIR_IPK}/ - cp -ar ${prefix}/ipk/* ${DEPLOY_DIR_IPK}/ + cp -pPRr ${prefix}/ipk/* ${DEPLOY_DIR_IPK}/ fi if [ -d ${prefix}/deb ]; then install -d ${DEPLOY_DIR_DEB}/ - cp -ar ${prefix}/deb/* ${DEPLOY_DIR_DEB}/ + cp -pPRr ${prefix}/deb/* ${DEPLOY_DIR_DEB}/ fi if [ -d ${prefix}/pstage -a "x${DEPLOY_DIR_PSTAGE}" != "x" ]; then install -d ${DEPLOY_DIR_PSTAGE}/ - cp -ar ${prefix}/pstage/* ${DEPLOY_DIR_PSTAGE}/ + cp -pPRr ${prefix}/pstage/* ${DEPLOY_DIR_PSTAGE}/ fi } diff --git a/packages/meta/meta-nas-server.bb b/packages/meta/meta-nas-server.bb new file mode 100644 index 0000000000..3deb44c2bd --- /dev/null +++ b/packages/meta/meta-nas-server.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Meta-package for a network attached storage server" +LICENSE = "MIT" +PR = "r0" + +RDEPENDS = "\ + task-nas-server-everything \ + " + +inherit meta + diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index c007899afd..3452f4e3bd 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r43" +PR = "r44" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -250,6 +250,8 @@ SLUGOS_EXTRA_PACKAGES ?= "" DEPENDS = "\ slugos-image \ slugos-native \ + task-nas-server-everything \ + task-proper-tools \ ${SLUGOS_PACKAGES} \ ${SLUGOS_EXTRA_PACKAGES} \ package-index \ diff --git a/packages/meta/unslung-binary-kernel-packages.bb b/packages/meta/unslung-binary-kernel-packages.bb deleted file mode 100644 index eb95b847fd..0000000000 --- a/packages/meta/unslung-binary-kernel-packages.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Packages that are compatible with the Unslung binary kernel firmware" -LICENSE = "MIT" -PR = "r2" -COMPATIBLE_MACHINE = "nslu2" - -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" - -inherit meta - -UNSLUNG_PACKAGES = "\ - " - -BROKEN_PACKAGES = "\ - " - -DEPENDS = 'unslung-image \ - ${UNSLUNG_PACKAGES} \ - package-index' diff --git a/packages/mkbot/mkbot_0.3.bb b/packages/mkbot/mkbot_0.3.bb index 195d74ca52..92df433e45 100644 --- a/packages/mkbot/mkbot_0.3.bb +++ b/packages/mkbot/mkbot_0.3.bb @@ -8,6 +8,6 @@ SECTION = "network" SRC_URI = "http://files.fredemmott.co.uk/mkbot-${PV}.tar.bz2" S = "${WORKDIR}/MKbot-0.3" -inherit qmake qt4x11 +inherit qt4x11 #FIXME: lacks packaging diff --git a/packages/mtd/mtd-utils_1.0.0+git.bb b/packages/mtd/mtd-utils_1.0.0+git.bb index 33f95853f6..d4e67f3aae 100644 --- a/packages/mtd/mtd-utils_1.0.0+git.bb +++ b/packages/mtd/mtd-utils_1.0.0+git.bb @@ -3,7 +3,7 @@ SECTION = "base" DEPENDS = "zlib lzo" HOMEPAGE = "http://www.linux-mtd.infradead.org/" LICENSE = "GPLv2" -PR = "r6" +PR = "r7" # This is the default package, thus we lock to a specific git version so # upstream changes will not break builds. @@ -40,3 +40,7 @@ do_install () { install -m 0755 $binary ${D}${bindir} done } + +PACKAGES =+ "mkfs-jffs mkfs-jffs2" +FILES_mkfs-jffs = "${bindir}/mkfs.jffs" +FILES_mkfs-jffs2 = "${bindir}/mkfs.jffs2" diff --git a/packages/navit/navit.inc b/packages/navit/navit.inc new file mode 100644 index 0000000000..3754e1580a --- /dev/null +++ b/packages/navit/navit.inc @@ -0,0 +1,11 @@ +DESCRIPTION = "Navit is a car navigation system with routing engine." +LICENSE = "GPL" +DEPENDS = "glib-2.0 gtk+" +RRECOMMENDS = "gpsd speechd flite" + +inherit autotools + +PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale" + +FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug" +FILES_${PN}-dev += "${libdir}/${PN}/*/*.so" diff --git a/packages/navit/navit_0.0.1.bb b/packages/navit/navit_0.0.1.bb index 2db71a3e87..f96a04ec16 100644 --- a/packages/navit/navit_0.0.1.bb +++ b/packages/navit/navit_0.0.1.bb @@ -1,13 +1,8 @@ -DESCRIPTION = "Navit is a car navigation system with routing engine." -LICENSE = "GPL" -DEPENDS = "glib-2.0 gtk+" -PR = "r2" +require navit.inc -inherit autotools +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \ file://compile-fix.patch;patch=1" EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --enable-avoid-unaligned --enable-avoid-float" - -FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug" diff --git a/packages/navit/navit_0.0.2.bb b/packages/navit/navit_0.0.2.bb index ce34ee835b..794f901db5 100644 --- a/packages/navit/navit_0.0.2.bb +++ b/packages/navit/navit_0.0.2.bb @@ -1,13 +1,7 @@ -DESCRIPTION = "Navit is a car navigation system with routing engine." -LICENSE = "GPL" -DEPENDS = "glib-2.0 gtk+" -PR = "r0" +require navit.inc -inherit autotools +PR = "r2" -SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \ - file://compile-fix.patch;patch=1" +SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz" -EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --enable-avoid-unaligned --enable-avoid-float" - -FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug" +EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --disable-samplemap --enable-avoid-unaligned --enable-avoid-float" diff --git a/packages/navit/navit_0.0.3.bb b/packages/navit/navit_0.0.3.bb new file mode 100644 index 0000000000..d0c1c553d6 --- /dev/null +++ b/packages/navit/navit_0.0.3.bb @@ -0,0 +1,7 @@ +require navit.inc + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz" + +EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned" diff --git a/packages/navit/navit_cvs.bb b/packages/navit/navit_cvs.bb index 8f158d4f79..8b10c908ec 100644 --- a/packages/navit/navit_cvs.bb +++ b/packages/navit/navit_cvs.bb @@ -1,19 +1,13 @@ -DESCRIPTION = "Navit is a car navigation system with routing engine." -LICENSE = "GPL" -DEPENDS = "glib-2.0 gtk+" -PV = "0.0.2+cvs${SRCDATE}" +require navit.inc + +PV = "0.0.3+cvs${SRCDATE}" PR = "r0" -inherit autotools S = "${WORKDIR}/navit" -SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit \ - " +SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit" EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned" -#--enable-shared EXTRA_AUTORECONF = " -I m4" -FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug" - diff --git a/packages/netbase/netbase/interfaces b/packages/netbase/netbase/interfaces index ca449168a9..c615642e35 100644 --- a/packages/netbase/netbase/interfaces +++ b/packages/netbase/netbase/interfaces @@ -29,14 +29,23 @@ iface wlan0 inet dhcp # wireless-mode managed # # A WPA1 or WPA2 encrypted connection locked to a specific access point. -# The WLAN cards firmware is updated temporarily to allow WPA -# connections. Your card may or may not need the update. +# This is the best option for non-roaming, single-network usage. +# Note that your card may require a firmware update to use WPA. +# Some distributions install a temporary volatile firmware update on ifup. # #iface wlan0 inet dhcp # wpa-essid some-essid # wpa-psk My-PlainText-Password -# pre-up iwpriv wlan0 reset 1 -# pre-up prism2_srec -r wlan0 /etc/pcmcia/rf010804.hex +# +# A WPA1 or WPA2 encrypted connection using an external configuration file +# for wpa-supplicant. This is the way to go if you need to configure multiple +# networks with different keys and / or WPA settings and roaming support. +# +# iface wlan0 inet dhcp +# wpa-conf /etc/wpa_supplicant.conf +# wpa-driver hostap + + iface atml0 inet dhcp diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index 82464d82c6..1f2837a8c1 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." SECTION = "base" LICENSE = "GPL" -PR = "r25" +PR = "r26" inherit update-rc.d diff --git a/packages/nslu2-binary-only/unslung-rootfs/NOTES b/packages/nslu2-binary-only/unslung-rootfs/NOTES index 34d319d656..f5d82a7659 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/NOTES +++ b/packages/nslu2-binary-only/unslung-rootfs/NOTES @@ -553,3 +553,17 @@ Replaced Linksys busybox with slingbox entirely. Modified "unsling" script to use tar instead of find and cpio; removed obsolete and untested unsling utilities (eg: resling). + +Replace mkfs.ext3 with a script in order to fix an obscure formatting bug +with the Linksys GUI. + +Increased the bootup delay from 5 seconds to 15 seconds in linuxrc; +required by some large disks which require additional time to become ready. +Touching "/.fastdisk" on the flash filesystem will revert to the original +5 second delay, which is useful to retain reasonably boot times. + +Added the bootdisk mechanism: at initial boot time, partitions mounted +on the HDD mountpoints are scanned for a special directory structure +containing startup script, which are executed. This facilitates easy +customization of the boot for debugging purposes, or even automated +installation and configuration processes. diff --git a/packages/nslu2-binary-only/unslung-rootfs/linuxrc b/packages/nslu2-binary-only/unslung-rootfs/linuxrc index 77185b9443..1500779280 100755 --- a/packages/nslu2-binary-only/unslung-rootfs/linuxrc +++ b/packages/nslu2-binary-only/unslung-rootfs/linuxrc @@ -41,9 +41,13 @@ if ( ! [ -f /.nodisk ] ) ; then [ -e /.sdb1root -a -f /proc/hdd_sdb ] && cnt=0 cnt=`expr $cnt - 1` done - echo + /bin/echo - /bin/sleep 5 + if [ -e /.fastdisk ] ; then + /bin/sleep 5 + else + /bin/sleep 15 + fi mounted= diff --git a/packages/nslu2-binary-only/unslung-rootfs/telnet.htm b/packages/nslu2-binary-only/unslung-rootfs/telnet.htm index 7807f228a2..c1d339777a 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/telnet.htm +++ b/packages/nslu2-binary-only/unslung-rootfs/telnet.htm @@ -22,7 +22,7 @@ </CENTER>
<HR>
<P>NOTICE: The telnet service is inherently not secure. Among other security concerns, the login id and passwords you enter will be sent in plaintext across the network. In order to provide a slightly higher degree of security, the service will not be automatically restarted upon reboot. However, if you do not intend to reboot soon, it is recommended that you use this page to disable the service as soon as it is no longer needed.</P>
- <P>A better solution than telnet for network terminal access to the NSLU2 is to use an SSH package, such as "openssh" or "dropbear". These packages are secure, and will not require any special steps to enable once installed. Openssh can be installed using the standard "ipkg" mechanism: "ipkg install openssh".</P>
+ <P>A better solution than telnet for network terminal access to the NSLU2 is to use an SSH package, such as "openssh". This package is secure, will remove the need to use a web browser to enable access, and is less prone to inadvertent disabling than telnet. Openssh can be installed using the standard "ipkg" mechanism: "ipkg install openssh". No additional configuration is required; the installer will perform all the necessary configuration to setup openssh as a telnet replacement. <B>You are strongly encouraged to install openssh as soon as possible.</B></P>
<HR>
<CENTER>
<P><A HREF="/index.cgi">Back</A></P>
diff --git a/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm b/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm index 2301a89c0f..39c65b2e7c 100644 --- a/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm +++ b/packages/nslu2-binary-only/unslung-rootfs/upgrade.htm @@ -95,7 +95,12 @@ <tr> <td colspan="2" align="left" class="smsg"> NOTE: You cannot use this upgrade page to install new firmware on Unslung. -You must use the Redboot mechanism in order to install new firmware instead. +Instead, use the "reset button" method to enter upgrade mode, and use either +the "sercomm" or the "upslug2" utility to perform the reflash operation. See +<a href="http://www.nslu2-linux.org/wiki/HowTo/UseTheResetButtonToEnterUpgradeMode"> +"How To Use The Reset Button To Enter Upgrade Mode"</a>, and +<a href="http://www.nslu2-linux.org/wiki/HowTo/RecoverFromABadFlash"> +"How To Recover From A Bad Flash"</a> if you need more information. </td> </tr> </table></div> </td> diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb index 23b240debc..8f27b72d21 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb @@ -1,7 +1,7 @@ SECTION = "base" COMPATIBLE_MACHINE = "nslu2" -PR = "r19" +PR = "r21" DEPENDS = "nslu2-linksys-libs nslu2-linksys-sambacodepages" diff --git a/packages/octave/octave_3.0.0.bb b/packages/octave/octave_3.0.0.bb new file mode 100644 index 0000000000..b92a181754 --- /dev/null +++ b/packages/octave/octave_3.0.0.bb @@ -0,0 +1,27 @@ +require octave.inc + +SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \ + file://configure.patch;patch=1" + +PR = "r0" + +PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \ + libcruft-dev liboctave-dev liboctinterp-dev \ + libcruft-dbg liboctave-dbg liboctinterp-dbg" + +FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*" +FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so" +FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*" + +FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*" +FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so" +FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*" + +FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*" +FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so" +FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*" + +# octave-oct provides subroutines in .oct file format +FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct" + +FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug" diff --git a/packages/openmoko2/openmoko-messages2_svn.bb b/packages/openmoko2/openmoko-messages2_svn.bb index bc1bcaff5e..8ec0a9103a 100644 --- a/packages/openmoko2/openmoko-messages2_svn.bb +++ b/packages/openmoko2/openmoko-messages2_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Message application" SECTION = "openmoko/pim" -DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2" +DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana" PV = "0.1.0+svnr${SRCREV}" PR = "r0" diff --git a/packages/openmoko2/openmoko-sample2_svn.bb b/packages/openmoko2/openmoko-sample2_svn.bb index c05b6d3618..4c2c5aad46 100644 --- a/packages/openmoko2/openmoko-sample2_svn.bb +++ b/packages/openmoko2/openmoko-sample2_svn.bb @@ -13,12 +13,12 @@ PACKAGE_ARCH_${PN}-src = "all" do_configure_prepend() { install -d ${WORKDIR}/source - cp -a ${S} ${WORKDIR}/source/ + cp -pPR ${S} ${WORKDIR}/source/ find ${WORKDIR}/source -name ".svn"|xargs rm -rf } do_install_append() { install -d ${D}/usr/local/openmoko/source/ - cp -a ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/ + cp -pPR ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/ } diff --git a/packages/opie-reader/uqtreader_cvs.bb b/packages/opie-reader/uqtreader_cvs.bb index 9fb7af2db5..9b7ae57196 100644 --- a/packages/opie-reader/uqtreader_cvs.bb +++ b/packages/opie-reader/uqtreader_cvs.bb @@ -17,7 +17,7 @@ S = "${WORKDIR}/opie-reader" export OPIEDIR="${S}/opiedir" -inherit qmake_base qt4x11 +inherit qt4x11 do_configure() { ${OE_QMAKE_QMAKE} -recursive opie-reader.pro UQT_DATADIR="${datadir}/${PN}" UQT_LIBDIR="${libdir}/${PN}" diff --git a/packages/poppler/poppler0.6_cvs.bb b/packages/poppler/poppler0.6_cvs.bb deleted file mode 100644 index 15f94a775a..0000000000 --- a/packages/poppler/poppler0.6_cvs.bb +++ /dev/null @@ -1,6 +0,0 @@ -require poppler.inc -PV = "0.5.9+cvs${SRCDATE}" -PR = "r1" - -SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/poppler;module=poppler" -S = "${WORKDIR}/poppler" diff --git a/packages/psplash/files/psplash-init b/packages/psplash/files/psplash-init index 5587346cb1..7f7eb36fbe 100644 --- a/packages/psplash/files/psplash-init +++ b/packages/psplash/files/psplash-init @@ -9,10 +9,14 @@ for x in $(cat /proc/cmdline); do esac done +. /etc/init.d/functions + psplash_args='' -case "`grep ^Hardware /proc/cpuinfo|cut -d: -f2 |tr A-Z a-z`" in - "hp ipaq h3100"|"hp ipaq h3800") pspash_args='-a 90' ;; - "hp ipaq 3600"|"hp ipaq 3700"|"hp ipaq h3900"|"htc universal"|*collie|*poodle|*akita|*spitz|*borzoi) psplash_args='-a 270' ;; +case `machine_id` in + "hp_ipaq_h3100"|"hp_ipaq_h3800") + pspash_args='-a 90' ;; + "hp_ipaq_3600"|"hp_ipaq_3700"|"hp_ipaq_h3900"|"htc_universal"|*collie|*poodle|*akita|*spitz|*borzoi) + psplash_args='-a 270' ;; esac export TMPDIR=/mnt/.psplash @@ -20,4 +24,5 @@ mount tmpfs -t tmpfs $TMPDIR -o,size=40k /usr/bin/psplash $psplash_args & +# Timetrap against hanging with splash hiding console messages. (sleep 120; psplash-write "QUIT") & diff --git a/packages/psplash/psplash_svn.bb b/packages/psplash/psplash_svn.bb index cf6e228d92..17b459a15f 100644 --- a/packages/psplash/psplash_svn.bb +++ b/packages/psplash/psplash_svn.bb @@ -3,7 +3,8 @@ HOMEPAGE = "http://projects.o-hand.com/psplash" SECTION = "base" LICENSE = "GPL" PV = "0.0+svnr${SRCREV}" -PR = "r11" +PR = "r12" +RDEPENDS = "initscripts" # You can create your own pslash-hand-img.h by doing # ./make-image-header.sh <file>.png HAND diff --git a/packages/python/python-gammu_0.21.bb b/packages/python/python-gammu_0.24.bb index f8989d9181..f8989d9181 100644 --- a/packages/python/python-gammu_0.21.bb +++ b/packages/python/python-gammu_0.24.bb diff --git a/packages/python/python-pyqt_4.3.3.bb b/packages/python/python-pyqt_4.3.3.bb index 74a16c4720..0bb4b1e588 100644 --- a/packages/python/python-pyqt_4.3.3.bb +++ b/packages/python/python-pyqt_4.3.3.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS = "python-core" SRCNAME = "pyqt" -PR = "ml0" +PR = "ml1" SRC_URI = "\ http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/PyQt-x11-gpl-${PV}.tar.gz \ @@ -39,13 +39,13 @@ FIX_QREAL = "\ " do_generate_prepend() { - for i in ${FIX_QREAL}; do - sed -i -e s,qreal,float,g sip/$i - done + for i in ${FIX_QREAL}; do + sed -i -e s,qreal,float,g sip/$i + done } do_configure_prepend() { - echo "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro + echo -e "TEMPLATE=subdirs\nSUBDIRS=${SIP_MODULES}\n" >pyqt.pro } do_stage() { diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc new file mode 100644 index 0000000000..0a204bb535 --- /dev/null +++ b/packages/qmake/qmake2-native.inc @@ -0,0 +1,68 @@ +DESCRIPTION = "TrollTech Makefile Generator" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +SECTION = "devel" +LICENSE = "GPL" +PR = "r2" + +QTVER = "qtopia-core-opensource-src-${QTVERSION}" + +FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native" +SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ + file://0001-fix-mkspecs.patch;patch=1 \ + file://0008-backport-qt-lib-infix.patch;patch=1 \ + file://qt-config.patch;patch=1 \ + file://use-lflags-last.patch;patch=1 \ + file://linux-oe-qmake.conf" +S = "${WORKDIR}/${QTVER}" + +# we need the real target system here +CROSS_SYS := "${TARGET_SYS}" +inherit autotools cross + +export QTDIR = "${S}" +EXTRA_OEMAKE = "-e" + +do_configure() { + # Install the OE build templates + for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ + do + install -d ${S}/mkspecs/$template + install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf + ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h + done + + QMAKESPEC= + PLATFORM=${HOST_OS}-oe-g++ + export PLATFORM + # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M: + export OE_QMAKE_CC="${CC}" + export OE_QMAKE_CFLAGS="${CFLAGS}" + export OE_QMAKE_CXX="${CXX}" + export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}" + export OE_QMAKE_LDFLAGS="${LDFLAGS}" + export OE_QMAKE_LINK="${CCLD}" + export OE_QMAKE_AR="${AR}" + export OE_QMAKE_STRIP="${STRIP}" + export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" + export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" + export OE_QMAKE_RCC="non-existant" + export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" + export OE_QMAKE_RPATH="-Wl,-rpath-link," + echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" +} + +do_compile() { + : +} + +do_stage() { + install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 + install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4 + install -d ${CROSS_DATADIR}/qt4 + cp -PfR mkspecs ${CROSS_DATADIR}/qt4/ +} + +do_install() { + : +} diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/.mtn2git_empty b/packages/qmake/qmake2-native/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/.mtn2git_empty +++ b/packages/qmake/qmake2-native/.mtn2git_empty diff --git a/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch b/packages/qmake/qmake2-native/0001-fix-mkspecs.patch index abebfdfa27..e0ebe512c8 100644 --- a/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch +++ b/packages/qmake/qmake2-native/0001-fix-mkspecs.patch @@ -1,4 +1,4 @@ -From 594157753a24d0575aaf948dc0e9500f6bdb2178 Mon Sep 17 00:00:00 2001 +From aa0377910cfd8d0fce6bdc9355994a4e267b1696 Mon Sep 17 00:00:00 2001 From: Michael Krelin <hacker@klever.net> Date: Sat, 2 Jun 2007 16:39:58 +0200 Subject: [PATCH] fix mkspecs @@ -8,10 +8,10 @@ Subject: [PATCH] fix mkspecs mkspecs/common/linux.conf | 26 +++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) -diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf -index f5a5c8e..4007c7e 100644 ---- a/mkspecs/common/g++.conf -+++ b/mkspecs/common/g++.conf +Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/g++.conf 2007-12-04 18:07:53.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf 2007-12-26 19:47:02.000000000 +0100 @@ -2,12 +2,12 @@ # qmake configuration for common gcc # @@ -24,11 +24,11 @@ index f5a5c8e..4007c7e 100644 QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w -QMAKE_CFLAGS_RELEASE += -O2 -+QMAKE_CFLAGS_RELEASE += -O2 ++QMAKE_CFLAGS_RELEASE += QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += -fPIC QMAKE_CFLAGS_STATIC_LIB += -fPIC -@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden +@@ -16,8 +16,8 @@ QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} @@ -39,7 +39,7 @@ index f5a5c8e..4007c7e 100644 QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF -@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden +@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE @@ -52,7 +52,7 @@ index f5a5c8e..4007c7e 100644 QMAKE_LFLAGS_RELEASE += QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += -@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB += -shared +@@ -40,7 +40,7 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_THREAD += @@ -61,11 +61,11 @@ index f5a5c8e..4007c7e 100644 QMAKE_PCH_OUTPUT_EXT = .gch -diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf -index 3796a87..52acf16 100644 ---- a/mkspecs/common/linux.conf -+++ b/mkspecs/common/linux.conf -@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD +Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/linux.conf 2007-12-04 18:07:53.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf 2007-12-26 19:47:02.000000000 +0100 +@@ -7,26 +7,26 @@ QMAKE_INCDIR = QMAKE_LIBDIR = @@ -103,7 +103,7 @@ index 3796a87..52acf16 100644 QMAKE_RANLIB = QMAKE_TAR = tar -cf -@@ -38,11 +38,11 @@ QMAKE_COPY_DIR = $(COPY) -r +@@ -38,11 +38,11 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir @@ -118,6 +118,29 @@ index 3796a87..52acf16 100644 -include(unix.conf) \ No newline at end of file +include(unix.conf) --- -1.5.1.6 - +Index: qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/linux-g++/qmake.conf 2007-12-04 18:07:53.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf 2007-12-26 19:47:02.000000000 +0100 +@@ -5,7 +5,7 @@ + MAKEFILE_GENERATOR = UNIX + TEMPLATE = app + CONFIG += qt warn_on release incremental link_prl +-QT += core gui ++QT += core gui $$(OE_QMAKE_EXTRA_MODULES) + QMAKE_INCREMENTAL_STYLE = sublib + + include(../common/g++.conf) +Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/unix.conf +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/unix.conf 2007-12-26 19:48:20.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/unix.conf 2007-12-26 19:49:50.000000000 +0100 +@@ -10,6 +10,8 @@ + QMAKE_YACC_HEADER = $base.tab.h + QMAKE_YACC_SOURCE = $base.tab.c + ++QMAKE_RCC = $$(OE_QMAKE_RCC) ++ + QMAKE_SEPARATE_DEBUG_INFO = (test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; objcopy --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && objcopy --strip-debug \"\$\$targ\" && objcopy --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\" ) ; + + QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z "$(DESTDIR)" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/ diff --git a/packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch b/packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch new file mode 100644 index 0000000000..f87576a07b --- /dev/null +++ b/packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch @@ -0,0 +1,33 @@ +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 32a7fd5..48d584f 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -28,7 +28,7 @@ defineTest(qtAddLibrary) { + INCLUDEPATH -= $$FRAMEWORK_INCLUDE + INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH + } +- LINKAGE = -framework $${LIB_NAME} ++ LINKAGE = -framework $${LIB_NAME}$${QT_LIBINFIX} + } else:!qt_no_framework { #detection + for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) { + exists($${frmwrk_dir}/$${LIB_NAME}.framework) { +@@ -46,15 +46,15 @@ defineTest(qtAddLibrary) { + } + isEmpty(LINKAGE) { + CONFIG(debug, debug|release) { +- win32:LINKAGE = -l$${LIB_NAME}d +- mac:LINKAGE = -l$${LIB_NAME}_debug ++ win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d ++ mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug + } +- isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME} ++ isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX} + } + !isEmpty(QMAKE_LSB) { + QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT + QMAKE_LFLAGS *= -L/opt/lsb/lib +- QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME} ++ QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}${QT_LIBINFIX} + } + LIBS += $$LINKAGE + export(LIBS) diff --git a/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf b/packages/qmake/qmake2-native/linux-oe-qmake.conf index f58481a693..f58481a693 100644 --- a/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf +++ b/packages/qmake/qmake2-native/linux-oe-qmake.conf diff --git a/packages/qmake/qmake2-native/qt-config.patch b/packages/qmake/qmake2-native/qt-config.patch new file mode 100644 index 0000000000..b2d86de2c5 --- /dev/null +++ b/packages/qmake/qmake2-native/qt-config.patch @@ -0,0 +1,27 @@ +Allow to set a qt.conf from the outside using the environment. This allows +to inject new prefixes and other paths into qmake. This is needed when using +the same qmake binary to build qt/x11 and qt/embedded + +Index: qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/src/corelib/global/qlibraryinfo.cpp 2007-12-25 00:55:32.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/src/corelib/global/qlibraryinfo.cpp 2007-12-25 01:20:18.000000000 +0100 +@@ -42,6 +42,7 @@ + #include "qpointer.h" + #ifdef QT_BUILD_QMAKE + extern QString qmake_libraryInfoFile(); ++#include <stdlib.h> + #else + # include "qcoreapplication.h" + #endif +@@ -107,6 +108,10 @@ + #ifdef QT_BUILD_QMAKE + if(!QFile::exists(qtconfig)) + qtconfig = qmake_libraryInfoFile(); ++ if (!QFile::exists(qtconfig)) { ++ QByteArray config = getenv("QT_CONF_PATH"); ++ qtconfig = config; ++ } + #else + if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { + #ifdef Q_OS_MAC diff --git a/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch b/packages/qmake/qmake2-native/use-lflags-last.patch index 4197dbbf64..4197dbbf64 100644 --- a/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch +++ b/packages/qmake/qmake2-native/use-lflags-last.patch diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb index d9071193a9..89b2ae5a82 100644 --- a/packages/qmake/qmake2-native_2.10a.bb +++ b/packages/qmake/qmake2-native_2.10a.bb @@ -1,67 +1,2 @@ -DESCRIPTION = "TrollTech Makefile Generator" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -SECTION = "devel" -LICENSE = "GPL" -PR = "r2" - -QTVER = "qtopia-core-opensource-src-4.3.2" - -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ - file://0001-fix-mkspecs.patch;patch=1 \ - file://use-lflags-last.patch;patch=1 \ - file://linux-oe-qmake.conf" -S = "${WORKDIR}/${QTVER}" - -# we need the real target system here -CROSS_SYS := "${TARGET_SYS}" -inherit autotools cross - -export QTDIR = "${S}" -EXTRA_OEMAKE = "-e" - -do_configure() { - # Install the OE build templates - for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ - do - install -d ${S}/mkspecs/$template - install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h - done - - QMAKESPEC= - PLATFORM=${HOST_OS}-oe-g++ - export PLATFORM - # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M: - export OE_QMAKE_CC="${CC}" - export OE_QMAKE_CFLAGS="${CFLAGS}" - export OE_QMAKE_CXX="${CXX}" - export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}" - export OE_QMAKE_LDFLAGS="${LDFLAGS}" - export OE_QMAKE_LINK="${CCLD}" - export OE_QMAKE_AR="${AR}" - export OE_QMAKE_STRIP="${STRIP}" - export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" - export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" - export OE_QMAKE_RCC="non-existant" - export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" - export OE_QMAKE_RPATH="-Wl,-rpath-link," - echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" -} - -do_compile() { - : -} - -do_stage() { - install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 - install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4 - install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/ - cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/ - install -d ${STAGING_DIR}/${HOST_SYS}/qt4/ - cp -PfR mkspecs ${STAGING_DIR}/${HOST_SYS}/qt4/ -} - -do_install() { - : -} +QTVERSION="4.3.3" +require ${PN}.inc diff --git a/packages/qsvn/qsvn-qte_0.3.0.bb b/packages/qsvn/qsvn-qte_0.3.0.bb new file mode 100644 index 0000000000..59b46edf9c --- /dev/null +++ b/packages/qsvn/qsvn-qte_0.3.0.bb @@ -0,0 +1,3 @@ +require qsvn.inc +FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qsvn" +inherit qtopia4core diff --git a/packages/qsvn/qsvn.inc b/packages/qsvn/qsvn.inc new file mode 100644 index 0000000000..c27bbab114 --- /dev/null +++ b/packages/qsvn/qsvn.inc @@ -0,0 +1,25 @@ +DESCRIPTION = "QSvn is a graphical Subversion client for Linux, UNIX, Mac OS X and Windows. \ +It is written in C++ using the Qt4 toolkit from Trolltech." +HOMEPAGE = "http://ar.oszine.de/projects/qsvn/" +AUTHOR = "Andreas Richter, Rajko Albrecht" +LICENSE = "GPL" +SECTION = "network" +DEPENDS = "apr-util subversion" +PR = "r0" + +def vars_from_file(filename): + import os + return os.path.splitext(os.path.basename(filename))[0] + +FN := "${@vars_from_file(bb.data.getVar('FILE',d))}" + +SRC_URI = "http://download2.berlios.de/${FN}/${FN}-${PV}-src.tar.gz \ + file://build.patch;patch=1" +S = "${WORKDIR}/${FN}-${PV}" + +EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/subversion-1" + +do_install() { + install -d ${D}${bindir} + install -m 0755 bin/qsvn ${D}${bindir}/${PN} +} diff --git a/packages/qsvn/qsvn_0.3.0.bb b/packages/qsvn/qsvn_0.3.0.bb index 575e9359b7..db3cc0918d 100644 --- a/packages/qsvn/qsvn_0.3.0.bb +++ b/packages/qsvn/qsvn_0.3.0.bb @@ -1,20 +1,2 @@ -DESCRIPTION = "QSvn is a graphical Subversion client for Linux, UNIX, Mac OS X and Windows. \ -It is written in C++ using the Qt4 toolkit from Trolltech." -HOMEPAGE = "http://ar.oszine.de/projects/qsvn/" -AUTHOR = "Andreas Richter, Rajko Albrecht" -LICENSE = "GPL" -SECTION = "network" -DEPENDS = "apr-util subversion" -PR = "r0" - -SRC_URI = "http://download2.berlios.de/qsvn/qsvn-${PV}-src.tar.gz \ - file://build.patch;patch=1" - -inherit qmake qt4x11 - -EXTRA_QMAKEVARS_POST += "INCLUDEPATH+=${STAGING_INCDIR}/subversion-1" - -do_install() { - install -d ${D}${bindir} - install -m 0755 bin/qsvn ${D}${bindir} -} +require qsvn.inc +inherit qt4x11 diff --git a/packages/qt/qt4-x11-free_4.3.2.bb b/packages/qt/qt4-x11-free_4.3.2.bb deleted file mode 100644 index 2fa53a4d54..0000000000 --- a/packages/qt/qt4-x11-free_4.3.2.bb +++ /dev/null @@ -1,187 +0,0 @@ -DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." -SECTION = "x11/libs" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -LICENSE = "GPL QPL" -DEPENDS = "pkgconfig-native uicmoc4-native qmake2-native freetype jpeg virtual/libx11 \ - xft libxext libxrender libxrandr libxcursor dbus openssl" -RDEPENDS_${PN} = "${NONDEV_PACKAGES}" -PROVIDES = "qt4x11" -PR = "r6" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ - file://0001-cross-compile.patch;patch=1 \ - file://0002-fix-resinit-declaration.patch;patch=1 \ - file://0003-no-tools.patch;patch=1 \ - file://0004-no-qmake.patch;patch=1 \ - file://0005-fix-mkspecs.patch;patch=1 \ - file://0006-freetype-host-includes.patch;patch=1 \ - file://0007-openssl-host-includes.patch;patch=1" -S = "${WORKDIR}/qt-x11-opensource-src-${PV}" - -PARALLEL_MAKE = "" - -inherit qmake_base qt4x11 - -export QTDIR = "${S}" -STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4" -EXTRA_OEMAKE = "-e" - -require qt4_arch.inc - -QT_ARCH := "${@qt_arch(d)}" - -# FIXME: -# * add missing options -QT_CONFIG_FLAGS = "-release -shared -qt-zlib -system-libjpeg -no-nas-sound -no-sm -no-libmng -qt-libpng -no-gif -no-xinerama \ - -no-tablet -no-xkb -no-nis -no-cups -no-opengl \ - -no-sse -no-sse2 -no-mmx -no-3dnow \ - -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ - -qdbus \ - -verbose -stl -no-accessibility \ - -pch -no-glib" - -EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after DEFINES+=QT_NO_XIM INCPATH+=${STAGING_INCDIR} \ - INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ - QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ - AR="${TARGET_PREFIX}ar cqs" \ - MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"' - -do_configure() { - echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri - echo "DEFINES += QT_NO_XIM" >>src/qbase.pri - unset QMAKESPEC - ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake - ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++ - #export QMAKESPEC="linux-oe-g++" - #rm -rf ./mkspecs - #ln -sf ${QMAKE_MKSPEC_PATH} ./mkspecs - echo yes | ./configure -prefix / -platform ${TARGET_OS}-oe-g++ -crossarch ${QT_ARCH} ${QT_CONFIG_FLAGS} -fast \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql -} - -# FIXME: Might want to compile the cross tools for the -dev packages as well... -do_compile() { - unset CFLAGS CXXFLAGS - install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc - install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc - install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic - - oe_runmake ${EXTRA_ENV} -} - -PARTS = "3Support AssistantClient Core DBus Designer DesignerComponents Gui Network Script Sql Svg Test Xml" - -do_stage() { - oe_runmake install INSTALL_ROOT=/ - install -d ${STAGING_QT_DIR} - install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc - install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc - install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic - sed -i -e 's,^QMAKE_RPATHDIR.*,QMAKE_RPATHDIR=${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/mkspecs/qconfig.pri - for pcc in AssistantClient DBus Test UiTools ; do - sed -i -e 's,${S}/lib,${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/lib/pkgconfig/Qt${pcc}.pc - done - install -d ${PKG_CONFIG_DIR}/ - for pc in ${STAGING_QT_DIR}/lib/pkgconfig/*.pc ; do - sed -i -e 's,$(OE_QMAKE_LIBS_X11),-lX11 -lXext,g' $pc - install -m 0644 $pc ${PKG_CONFIG_DIR}/ - done -} - -# FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well... -# FIXME: Might want to install everything into ${libdir}/qt4/* to match the usual packing... -do_install() { - install -d ${D}${libdir} - install -d ${D}${bindir} - install -d ${D}${includedir} - for part in ${PARTS} - do - oe_libinstall -so -C lib libQt$part ${D}${libdir} - done - oe_libinstall -a -C lib libQtUiTools ${D}${libdir} - cp -pPR include/* ${D}${includedir} - cp -pPR plugins ${D}${libdir} - cp -pPR bin/* ${D}${bindir} - - install -d ${D}${bindir}/qt4-examples - for binary in `find examples -perm 0755 -type f` - do - install -m 0755 $binary ${D}${bindir}/qt4-examples/ - done - install -d ${D}${bindir}/qt4-demos - for binary in `find demos -perm 0755 -type f` - do - install -m 0755 $binary ${D}${bindir}/qt4-demos/ - done - rm ${D}${bindir}/rcc ${D}${bindir}/uic ${D}${bindir}/moc -} - -NONDEV_PACKAGES = "libqtcore4 libqtgui4 libqtnetwork4 \ - libqtsql4 libqtsvg4 libqttest4 \ - libqtxml4 \ - libqtdesigner4 libqtdesignercomponents4 \ - libqt3support4 \ - libqtassistantclient4 libqtscript4 \ - libqtdbus4 \ - qt4-assistant qt4-common qt4-designer qt4-demos qt4-examples qt4-linguist \ - qt4-pixeltool qt4-dbus \ - qt4-plugins-accessible qt4-plugins-codecs qt4-plugins-designer qt4-plugins-imageformats qt4-plugins-sqldrivers \ - qt4-plugins-inputmethods qt4-plugins-iconengines" - -PACKAGES += "libqtcore4-dev libqtgui4-dev libqtnetwork4-dev libqtsql4-dev libqtsvg4-dev libqttest4-dev \ - libqtxml4-dev libqtdesigner4-dev libqtdesignercomponents4-dev libqt3support4-dev \ - libqtassistantclient4-dev libqtscript4-dev libqtdbus4-dev \ - ${NONDEV_PACKAGES}" - -ALLOW_EMPTY = "1" -FILES_${PN} = "" - -FILES_libqtcore4 = "${libdir}/libQtCore.so.*" -FILES_libqtcore4-dev = "${libdir}/libQtCore.so" -FILES_libqtgui4 = "${libdir}/libQtGui.so.*" -FILES_libqtgui4-dev = "${libdir}/libQtGui.so" -FILES_libqtnetwork4 = "${libdir}/libQtNetwork.so.*" -FILES_libqtnetwork4-dev = "${libdir}/libQtNetwork.so" -FILES_libqtsql4 = "${libdir}/libQtSql.so.*" -FILES_libqtsql4-dev = "${libdir}/libQtSql.so" -FILES_libqtsvg4 = "${libdir}/libQtSvg.so.*" -FILES_libqtsvg4-dev = "${libdir}/libQtSvg.so" -FILES_libqttest4 = "${libdir}/libQtTest.so.*" -FILES_libqttest4-dev = "${libdir}/libQtTest.so" -FILES_libqtxml4 = "${libdir}/libQtXml.so.*" -FILES_libqtxml4-dev = "${libdir}/libQtXml.so" -FILES_libqtdesigner4 = "${libdir}/libQtDesigner.so.*" -FILES_libqtdesigner4-dev = "${libdir}/libQtDesigner.so" -FILES_libqtdesignercomponents4 = "${libdir}/libQtDesignerComponents.so.*" -FILES_libqtdesignercomponents4-dev = "${libdir}/libQtDesignerComponents.so" -FILES_libqt3support4 = "${libdir}/libQt3Support.so.*" -FILES_libqt3support4-dev = "${libdir}/libQt3Support.so" -FILES_libqtassistantclient4 = "${libdir}/libQtAssistantClient.so.*" -FILES_libqtassistantclient4-dev = "${libdir}/libQtAssistantClient.so" -FILES_libqtscript4 = "${libdir}/libQtScript.so.*" -FILES_libqtscript4-dev = "${libdir}/libQtScript.so" -FILES_libqtdbus4 = "${libdir}/libQtDBus.so.*" -FILES_libqtdbus4-dev = "${libdir}/libQtDBus.so" - -FILES_qt4-plugins-accessible = "${libdir}/plugins/accessible/*.so" -FILES_qt4-plugins-codecs = "${libdir}/plugins/codecs/*.so" -FILES_qt4-plugins-designer = "${libdir}/plugins/designer/*.so" -FILES_qt4-plugins-imageformats = "${libdir}/plugins/imageformats/*.so" -FILES_qt4-plugins-sqldrivers = "${libdir}/plugins/sqldrivers/*.so" -FILES_qt4-plugins-inputmethods = "${libdir}/plugins/inputmethods/*.so" -FILES_qt4-plugins-iconengines = "${libdir}/plugins/iconengines/*.so" - -FILES_qt4-assistant = "${bindir}/*assistant*" -FILES_qt4-designer = "${bindir}/*designer*" -FILES_qt4-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" -FILES_qt4-pixeltool = "${bindir}/pixeltool" -FILES_qt4-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer" - -FILES_qt4-common = "${bindir}/qtconfig" -FILES_qt4-examples = "${bindir}/qt4-examples/*" -FILES_qt4-demos = "${bindir}/qtdemo ${bindir}/qt4-demos/*" - -FILES_${PN}-dev += "${bindir}/rcc ${bindir}/uic* ${bindir}/moc ${bindir}/qmake ${bindir}/syncqt \ - ${bindir}/qt3to4 ${bindir}/findtr" -FILES_${PN}-dbg += "${bindir}/*/.debug ${plugindir}/.debug" diff --git a/packages/qt/qt4_arch.inc b/packages/qt/qt4_arch.inc deleted file mode 100644 index 6dcbd2bc4a..0000000000 --- a/packages/qt/qt4_arch.inc +++ /dev/null @@ -1,13 +0,0 @@ -def qt_arch(d): - import bb, re - arch = bb.data.getVar('TARGET_ARCH', d, 1) - if re.match("^i.86$", arch): - arch = "i386" - elif re.match("^arm.*", arch): - arch = "arm" - elif arch == "x86_64": - arch = "x86" - elif arch == "mipsel": - arch = "mips" - return arch - diff --git a/packages/uboot/u-boot-omap2430sdp-1.1.4/.mtn2git_empty b/packages/qt4/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uboot/u-boot-omap2430sdp-1.1.4/.mtn2git_empty +++ b/packages/qt4/.mtn2git_empty diff --git a/packages/qt4/files/.mtn2git_empty b/packages/qt4/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qt4/files/.mtn2git_empty diff --git a/packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch b/packages/qt4/files/0001-cross-compile.patch index 6e2b8e755e..6e2b8e755e 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch +++ b/packages/qt4/files/0001-cross-compile.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch b/packages/qt4/files/0003-no-tools.patch index 5412c90377..5412c90377 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch +++ b/packages/qt4/files/0003-no-tools.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch b/packages/qt4/files/0005-fix-mkspecs.patch index 93692699dc..faf0ba028a 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch +++ b/packages/qt4/files/0005-fix-mkspecs.patch @@ -8,10 +8,10 @@ Subject: [PATCH] fix mkspecs mkspecs/common/linux.conf | 26 +++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) -diff --git a/mkspecs/common/g++.conf b/mkspecs/common/g++.conf -index f5a5c8e..4007c7e 100644 ---- a/mkspecs/common/g++.conf -+++ b/mkspecs/common/g++.conf +Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/g++.conf 2007-12-26 02:58:15.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/g++.conf 2007-12-26 02:58:21.000000000 +0100 @@ -2,12 +2,12 @@ # qmake configuration for common gcc # @@ -24,11 +24,11 @@ index f5a5c8e..4007c7e 100644 QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w -QMAKE_CFLAGS_RELEASE += -O2 -+QMAKE_CFLAGS_RELEASE += -O2 ++QMAKE_CFLAGS_RELEASE += QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += -fPIC QMAKE_CFLAGS_STATIC_LIB += -fPIC -@@ -16,8 +16,8 @@ QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden +@@ -16,8 +16,8 @@ QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} @@ -39,7 +39,7 @@ index f5a5c8e..4007c7e 100644 QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF -@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden +@@ -30,9 +30,9 @@ QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE @@ -52,7 +52,7 @@ index f5a5c8e..4007c7e 100644 QMAKE_LFLAGS_RELEASE += QMAKE_LFLAGS_DEBUG += QMAKE_LFLAGS_APP += -@@ -40,7 +40,7 @@ QMAKE_LFLAGS_SHLIB += -shared +@@ -40,7 +40,7 @@ QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME += -Wl,-soname, QMAKE_LFLAGS_THREAD += @@ -61,11 +61,11 @@ index f5a5c8e..4007c7e 100644 QMAKE_PCH_OUTPUT_EXT = .gch -diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf -index 3796a87..52acf16 100644 ---- a/mkspecs/common/linux.conf -+++ b/mkspecs/common/linux.conf -@@ -7,26 +7,26 @@ QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD +Index: qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/common/linux.conf 2007-12-26 02:58:15.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/mkspecs/common/linux.conf 2007-12-26 02:58:21.000000000 +0100 +@@ -7,26 +7,26 @@ QMAKE_INCDIR = QMAKE_LIBDIR = @@ -103,7 +103,7 @@ index 3796a87..52acf16 100644 QMAKE_RANLIB = QMAKE_TAR = tar -cf -@@ -38,11 +38,11 @@ QMAKE_COPY_DIR = $(COPY) -r +@@ -38,11 +38,11 @@ QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir @@ -118,6 +118,16 @@ index 3796a87..52acf16 100644 -include(unix.conf) \ No newline at end of file +include(unix.conf) --- -1.5.0.7 - +Index: qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/linux-g++/qmake.conf 2007-12-26 02:58:15.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/mkspecs/linux-g++/qmake.conf 2007-12-26 03:00:49.000000000 +0100 +@@ -5,7 +5,7 @@ + MAKEFILE_GENERATOR = UNIX + TEMPLATE = app + CONFIG += qt warn_on release incremental link_prl +-QT += core gui ++QT += core gui $$(OE_QMAKE_EXTRA_MODULES) + QMAKE_INCREMENTAL_STYLE = sublib + + include(../common/g++.conf) diff --git a/packages/qt4/files/0008-backport-qt-lib-infix.patch b/packages/qt4/files/0008-backport-qt-lib-infix.patch new file mode 100644 index 0000000000..c93f58ca41 --- /dev/null +++ b/packages/qt4/files/0008-backport-qt-lib-infix.patch @@ -0,0 +1,166 @@ +Index: qtopia-core-opensource-src-4.3.3/configure +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/configure 2007-12-27 17:26:19.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/configure 2007-12-27 17:26:19.000000000 +0100 +@@ -782,6 +782,11 @@ + VAR=endian + VAL=`echo $1 | sed "s,^-\(.*\)-.*,\1,"` + ;; ++ -qtlibinfix) ++ VAR="qtlibinfix" ++ shift ++ VAL="$1" ++ ;; + -D?*|-D) + VAR="add_define" + if [ "$1" = "-D" ]; then +@@ -903,6 +908,9 @@ + libdir) + QT_INSTALL_LIBS="$VAL" + ;; ++ qtlibinfix) ++ QT_LIBINFIX="$VAL" ++ ;; + translationdir) + QT_INSTALL_TRANSLATIONS="$VAL" + ;; +@@ -2606,6 +2614,8 @@ + -no-sse ............ Do not compile with use of SSE instructions. + -no-sse2 ........... Do not compile with use of SSE2 instructions. + ++ -qtlibinfix <infix> Renames all libQt*.so to libQt<infix>.so. ++ + -D <string> ........ Add an explicit define to the preprocessor. + -I <string> ........ Add an explicit include path. + -L <string> ........ Add an explicit library path. +@@ -5273,6 +5283,8 @@ + QT_MINOR_VERSION = $QT_MINOR_VERSION + QT_PATCH_VERSION = $QT_PATCH_VERSION + ++QT_LIBINFIX = $QT_LIBINFIX ++ + EOF + if [ "$CFG_RPATH" = "yes" ]; then + echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp" +Index: qtopia-core-opensource-src-4.3.3/mkspecs/features/qt_functions.prf +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/features/qt_functions.prf 2007-12-04 18:07:53.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/mkspecs/features/qt_functions.prf 2007-12-27 17:26:19.000000000 +0100 +@@ -28,7 +28,7 @@ + INCLUDEPATH -= $$FRAMEWORK_INCLUDE + INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH + } +- LINKAGE = -framework $${LIB_NAME} ++ LINKAGE = -framework $${LIB_NAME}$${QT_LIBINFIX} + } else:!qt_no_framework { #detection + for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) { + exists($${frmwrk_dir}/$${LIB_NAME}.framework) { +@@ -46,15 +46,15 @@ + } + isEmpty(LINKAGE) { + CONFIG(debug, debug|release) { +- win32:LINKAGE = -l$${LIB_NAME}d +- mac:LINKAGE = -l$${LIB_NAME}_debug ++ win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d ++ mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug + } +- isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME} ++ isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX} + } + !isEmpty(QMAKE_LSB) { + QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT + QMAKE_LFLAGS *= -L/opt/lsb/lib +- QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME} ++ QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}${QT_LIBINFIX} + } + LIBS += $$LINKAGE + export(LIBS) +Index: qtopia-core-opensource-src-4.3.3/src/qbase.pri +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/src/qbase.pri 2007-12-04 18:08:13.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/src/qbase.pri 2007-12-27 17:26:19.000000000 +0100 +@@ -138,7 +138,7 @@ + contains(QT_CONFIG, qt3support):DEFINES *= QT3_SUPPORT + DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code + +-TARGET = $$qtLibraryTarget($$TARGET) #do this towards the end ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end + + moc_dir.name = moc_location + moc_dir.variable = QMAKE_MOC +Index: qtopia-core-opensource-src-4.3.3/tools/assistant/lib/lib.pro +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/tools/assistant/lib/lib.pro 2007-12-04 18:08:19.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/tools/assistant/lib/lib.pro 2007-12-27 17:26:19.000000000 +0100 +@@ -52,7 +52,7 @@ + } + } + +-TARGET = $$qtLibraryTarget($$TARGET) #done towards the end ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #done towards the end + + target.path=$$[QT_INSTALL_LIBS] + INSTALLS += target +Index: qtopia-core-opensource-src-4.3.3/tools/designer/src/components/component.pri +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/tools/designer/src/components/component.pri 2007-12-04 18:08:43.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/tools/designer/src/components/component.pri 2007-12-27 17:26:19.000000000 +0100 +@@ -1,2 +1,2 @@ + +-TARGET = $$qtLibraryTarget($$TARGET) ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) +Index: qtopia-core-opensource-src-4.3.3/tools/qdbus/src/src.pro +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/tools/qdbus/src/src.pro 2007-12-04 18:08:18.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/tools/qdbus/src/src.pro 2007-12-27 17:26:19.000000000 +0100 +@@ -70,7 +70,7 @@ + } + } + +-TARGET = $$qtLibraryTarget($$TARGET) #done towards the end (after framework) ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #done towards the end (after framework) + + # Input + +Index: qtopia-core-opensource-src-4.3.3/tools/qtestlib/src/src.pro +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/tools/qtestlib/src/src.pro 2007-12-04 18:08:18.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/tools/qtestlib/src/src.pro 2007-12-27 17:26:19.000000000 +0100 +@@ -61,7 +61,7 @@ + } + } + +-TARGET = $$qtLibraryTarget($$TARGET) #done towards the end (after framework) ++TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #done towards the end (after framework) + + # Input + HEADERS = qtest_global.h qtestcase.h qtestdata.h qtesteventloop.h +Index: qtopia-core-opensource-src-4.3.3/tools/designer/src/uitools/uitools.pro +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/tools/designer/src/uitools/uitools.pro 2007-12-04 18:08:43.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/tools/designer/src/uitools/uitools.pro 2007-12-27 17:26:19.000000000 +0100 +@@ -1,5 +1,5 @@ + TEMPLATE = lib +-TARGET = $$qtLibraryTarget(QtUiTools) ++TARGET = $$qtLibraryTarget(QtUiTools$$QT_LIBINFIX) + QT += xml + CONFIG += qt staticlib + DESTDIR = ../../../../lib +Index: qtopia-core-opensource-src-4.3.3/mkspecs/features/uitools.prf +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/mkspecs/features/uitools.prf 2007-12-27 17:32:57.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/mkspecs/features/uitools.prf 2007-12-27 17:33:56.000000000 +0100 +@@ -2,10 +2,10 @@ + qt:load(qt) + + # Include the correct version of the UiLoader library +-QTUITOOLS_LINKAGE = -lQtUiTools ++QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX} + CONFIG(debug, debug|release) { +- mac: QTUITOOLS_LINKAGE = -lQtUiTools_debug +- win32: QTUITOOLS_LINKAGE = -lQtUiToolsd ++ mac: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}_debug ++ win32: QTUITOOLS_LINKAGE = -lQtUiTools$${QT_LIBINFIX}d + } + LIBS += $$QTUITOOLS_LINKAGE + diff --git a/packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.1.2/.mtn2git_empty diff --git a/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch b/packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch index ab943db1ff..ab943db1ff 100644 --- a/packages/qt/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/configurable-cpu-extensions.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch b/packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch index 7c8665c9c1..7c8665c9c1 100644 --- a/packages/qt/qt4-x11-free-4.1.2/cross-compile.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/cross-compile.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-asm-constraints.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch index 93fc52d055..93fc52d055 100644 --- a/packages/qt/qt4-x11-free-4.1.2/fix-asm-constraints.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/fix-asm-constraints.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch index e927df9c7d..e927df9c7d 100644 --- a/packages/qt/qt4-x11-free-4.1.2/fix-mkspecs.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/fix-mkspecs.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch index fcd5de6f97..fcd5de6f97 100644 --- a/packages/qt/qt4-x11-free-4.1.2/fix-resinit-declaration.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/fix-resinit-declaration.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch b/packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch index 392aaf4f5f..392aaf4f5f 100644 --- a/packages/qt/qt4-x11-free-4.1.2/gcc4_1.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/gcc4_1.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch b/packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch index 324f44303a..324f44303a 100644 --- a/packages/qt/qt4-x11-free-4.1.2/no-qmake.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/no-qmake.patch diff --git a/packages/qt/qt4-x11-free-4.1.2/no-tools.patch b/packages/qt4/qt4-x11-free-4.1.2/no-tools.patch index 2bda49c9c5..2bda49c9c5 100644 --- a/packages/qt/qt4-x11-free-4.1.2/no-tools.patch +++ b/packages/qt4/qt4-x11-free-4.1.2/no-tools.patch diff --git a/packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty b/packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qt4/qt4-x11-free-4.3.3/.mtn2git_empty diff --git a/packages/qt/qt4-x11-free-4.3.2/0002-fix-resinit-declaration.patch b/packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch index e479a64a2b..e479a64a2b 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0002-fix-resinit-declaration.patch +++ b/packages/qt4/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0004-no-qmake.patch b/packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch index 359f6df9d5..359f6df9d5 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0004-no-qmake.patch +++ b/packages/qt4/qt4-x11-free-4.3.3/0004-no-qmake.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0006-freetype-host-includes.patch b/packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch index cc8e115fee..cc8e115fee 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0006-freetype-host-includes.patch +++ b/packages/qt4/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0007-openssl-host-includes.patch b/packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch index 35b71d9694..35b71d9694 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0007-openssl-host-includes.patch +++ b/packages/qt4/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc new file mode 100644 index 0000000000..1647b07fd3 --- /dev/null +++ b/packages/qt4/qt4-x11-free.inc @@ -0,0 +1,27 @@ +DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version." +SECTION = "x11/libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +LICENSE = "GPL QPL" +DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" +PROVIDES = "qt4x11" +PR = "r7" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ + file://0001-cross-compile.patch;patch=1 \ + file://0003-no-tools.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0005-fix-mkspecs.patch;patch=1" +S = "${WORKDIR}/qt-x11-opensource-src-${PV}" + + +QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl" +QT_BASE_NAME = "qt4" +QT_BASE_LIB = "libqt" +QT_DIR_NAME = "qt4" +require qt_depends.inc +require qt_configuration.inc +require qt_packaging.inc +require qt_staging.inc + +inherit qt4x11 diff --git a/packages/qt/qt4-x11-free_4.1.2.bb b/packages/qt4/qt4-x11-free_4.1.2.bb index 77fa6dba12..77fa6dba12 100644 --- a/packages/qt/qt4-x11-free_4.1.2.bb +++ b/packages/qt4/qt4-x11-free_4.1.2.bb diff --git a/packages/qt4/qt4-x11-free_4.3.3.bb b/packages/qt4/qt4-x11-free_4.3.3.bb new file mode 100644 index 0000000000..7d30503c07 --- /dev/null +++ b/packages/qt4/qt4-x11-free_4.3.3.bb @@ -0,0 +1,5 @@ +require qt4-x11-free.inc +SRC_URI += " \ + file://0002-fix-resinit-declaration.patch;patch=1 \ + file://0006-freetype-host-includes.patch;patch=1 \ + file://0007-openssl-host-includes.patch;patch=1 " diff --git a/packages/qt4/qt4_arch.inc b/packages/qt4/qt4_arch.inc new file mode 100644 index 0000000000..60ede1db2b --- /dev/null +++ b/packages/qt4/qt4_arch.inc @@ -0,0 +1,23 @@ +inherit siteinfo + +def qt_arch(d): + import bb, re + arch = bb.data.getVar('TARGET_ARCH', d, 1) + if re.match("^i.86$", arch): + arch = "i386" + elif re.match("^arm.*", arch): + arch = "arm" + elif arch == "x86_64": + arch = "x86" + elif arch == "mipsel": + arch = "mips" + return arch + +def qt_endian(d): + import bb + if bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "le": + return "-little-endian" + elif bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "be": + return "-big-endian" + else: + assert False diff --git a/packages/qt4/qt_configuration.inc b/packages/qt4/qt_configuration.inc new file mode 100644 index 0000000000..252a80a408 --- /dev/null +++ b/packages/qt4/qt_configuration.inc @@ -0,0 +1,82 @@ +require qt4_arch.inc +QT_ARCH := "${@qt_arch(d)}" +QT_ENDIAN = "${@qt_endian(d)}" + +QT_CONFIG_FLAGS += "-release -no-cups -no-accessibility -reduce-relocations \ + -shared -no-nas-sound -no-sm -no-nis \ + -qt-gif -system-libjpeg -system-libpng -system-zlib \ + -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \ + -no-pch -qdbus -stl -glib" + +EXTRA_OEMAKE = "-e" + +EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake2 -after \ + INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \ + QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \ + AR="${TARGET_PREFIX}ar cqs" \ + MOC="${STAGING_BINDIR_NATIVE}/moc4" UIC="${STAGING_BINDIR_NATIVE}/uic4" MAKE="make -e"' + +export QT_CONF_PATH="${WORKDIR}/qt.conf" + +do_configure() { + unset QMAKESPEC + unset QTDIR + ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake + ln -s linux-g++ mkspecs/${TARGET_OS}-oe-g++ + + echo "[Paths]" > $QT_CONF_PATH + echo "Prefix=${prefix}" >> $QT_CONF_PATH + echo "Documentation=${docdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Headers=${includedir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Libraries=${libdir}" >> $QT_CONF_PATH + echo "Binaries=${bindir}" >> $QT_CONF_PATH + echo "Plugins=${libdir}/${QT_DIR_NAME}/plugins" >> $QT_CONF_PATH + echo "Data=${datadir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Translations=${datadir}/${QT_DIR_NAME}/translations" >> $QT_CONF_PATH + echo "Settings=${sysconfdir}/${QT_DIR_NAME}" >> $QT_CONF_PATH + echo "Examples=${bindir}/${QT_DIR_NAME}/examples" >> $QT_CONF_PATH + echo "Demos=${bindir}/${QT_DIR_NAME}/demos" >> $QT_CONF_PATH + + echo yes | ./configure -v \ + -prefix ${prefix} \ + -bindir ${bindir} \ + -libdir ${libdir} \ + -datadir ${datadir}/${QT_DIR_NAME} \ + -sysconfdir ${sysconfdir}/${QT_DIR_NAME} \ + -docdir ${docdir}/${QT_DIR_NAME} \ + -headerdir ${includedir}/${QT_DIR_NAME} \ + -plugindir ${libdir}/${QT_DIR_NAME}/plugins \ + -translationdir ${datadir}/${QT_DIR_NAME}/translations \ + -examplesdir ${bindir}/${QT_DIR_NAME}/examples \ + -demosdir ${bindir}/${QT_DIR_NAME}/demos \ + -platform ${TARGET_OS}-oe-g++ \ + -xplatform ${TARGET_OS}-oe-g++ \ + -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \ + -crossarch ${QT_ARCH} \ + ${QT_CONFIG_FLAGS} -fast \ + -L${STAGING_LIBDIR} -I${STAGING_INCDIR} \ + -I${STAGING_INCDIR}/freetype2 +} + +do_compile() { + unset CFLAGS CXXFLAGS + install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc + install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc + install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic + + oe_runmake ${EXTRA_ENV} +} + +# +# Fixup some pkgconfig files +# moc_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/moc +# uic_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/uic +# +# Libs: -L${libdir} -lQtNetwork -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib $(LIBS_EXTRA) -lQtCore -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib -lm -lrt -lpthread -ldl +# +do_compile_append() { + cd ${S}/lib/pkgconfig + sed -i s#"-L${S}/lib"##g *.pc + sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# *.pc + sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# *.pc +} diff --git a/packages/qt4/qt_depends.inc b/packages/qt4/qt_depends.inc new file mode 100644 index 0000000000..289b625d0e --- /dev/null +++ b/packages/qt4/qt_depends.inc @@ -0,0 +1,3 @@ +inherit pkgconfig qmake_base + +DEPENDS += " uicmoc4-native qmake2-native freetype jpeg libpng zlib dbus openssl glib-2.0" diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc new file mode 100644 index 0000000000..e610245c05 --- /dev/null +++ b/packages/qt4/qt_packaging.inc @@ -0,0 +1,153 @@ +NONDEV_PACKAGES = "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network4 \ + ${QT_BASE_LIB}sql4 ${QT_BASE_LIB}svg4 ${QT_BASE_LIB}test4 ${QT_BASE_LIB}xml4 \ + ${QT_BASE_LIB}designer4 ${QT_BASE_LIB}designercomponents4 \ + ${QT_BASE_LIB}3support4 ${QT_BASE_LIB}assistantclient4 ${QT_BASE_LIB}script4 \ + ${QT_BASE_LIB}dbus4 ${QT_BASE_LIB}opengl4 \ + ${QT_BASE_NAME}-assistant ${QT_BASE_NAME}-common \ + ${QT_BASE_NAME}-designer \ + ${QT_BASE_NAME}-demos ${QT_BASE_NAME}-examples \ + ${QT_BASE_NAME}-linguist \ + ${QT_BASE_NAME}-pixeltool ${QT_BASE_NAME}-dbus \ + ${QT_BASE_NAME}-plugins-accessible \ + ${QT_BASE_NAME}-plugins-codecs \ + ${QT_BASE_NAME}-plugins-designer \ + ${QT_BASE_NAME}-plugins-imageformats \ + ${QT_BASE_NAME}-plugins-sqldrivers \ + ${QT_BASE_NAME}-plugins-inputmethods \ + ${QT_BASE_NAME}-plugins-iconengines \ + ${QT_BASE_NAME}-fonts " + +DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \ + ${QT_BASE_LIB}gui4-dev \ + ${QT_BASE_LIB}network4-dev \ + ${QT_BASE_LIB}sql4-dev \ + ${QT_BASE_LIB}svg4-dev \ + ${QT_BASE_LIB}test4-dev \ + ${QT_BASE_LIB}xml4-dev \ + ${QT_BASE_LIB}designer4-dev \ + ${QT_BASE_LIB}designercomponents4-dev \ + ${QT_BASE_LIB}3support4-dev \ + ${QT_BASE_LIB}assistantclient4-dev \ + ${QT_BASE_LIB}script4-dev \ + ${QT_BASE_LIB}dbus4-dev \ + ${QT_BASE_LIB}opengl4-dev \ + ${QT_BASE_LIB}uitools4-dev" + +DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \ + ${QT_BASE_LIB}gui4-dbg \ + ${QT_BASE_LIB}network4-dbg \ + ${QT_BASE_LIB}sql4-dbg \ + ${QT_BASE_LIB}svg4-dbg \ + ${QT_BASE_LIB}test4-dbg \ + ${QT_BASE_LIB}xml4-dbg \ + ${QT_BASE_LIB}designer4-dbg \ + ${QT_BASE_LIB}designercomponents4-dbg \ + ${QT_BASE_LIB}3support4-dbg \ + ${QT_BASE_LIB}assistantclient4-dbg \ + ${QT_BASE_LIB}script4-dbg \ + ${QT_BASE_LIB}dbus4-dbg \ + ${QT_BASE_LIB}opengl4-dbg " + + +PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}" + +ALLOW_EMPTY_${PN} = "1" +FILES_${PN} = "" +FILES_${PN}-dev = " ${includedir}/${QT_DIR_NAME}/Qt/*" +FILES_${PN}-dbg = "${bindir}/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*.so" +RDEPENDS_${PN} = "${NONDEV_PACKAGES}" +RDEPENDS_${PN}-dev = "${DEV_PACKAGES}" +RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}" + +def qt_default_dev(name): + return """${libdir}/libQt%(name)s${QT_LIBINFIX}.la + ${libdir}/libQt%(name)s${QT_LIBINFIX}.prl + ${libdir}/libQt%(name)s${QT_LIBINFIX}.so + ${includedir}/${QT_DIR_NAME}/Qt%(name)s* + ${libdir}/pkgconfig/Qt%(name)s${QT_LIBINFIX}.pc""" % locals() + + +FILES_${QT_BASE_LIB}core4 = "${libdir}/libQtCore${QT_LIBINFIX}.so.*" +FILES_${QT_BASE_LIB}core4-dev = "${@qt_default_dev('Core')}" +FILES_${QT_BASE_LIB}core4-dbg = "${libdir}/.debug/libQtCore*" +FILES_${QT_BASE_LIB}gui4 = "${libdir}/libQtGui${QT_LIBINFIX}.so.*" +FILES_${QT_BASE_LIB}gui4-dev = "${@qt_default_dev('Gui')}" +FILES_${QT_BASE_LIB}gui4-dbg = "${libdir}/.debug/libQtGui*" +FILES_${QT_BASE_LIB}network4 = "${libdir}/libQtNetwork${QT_LIBINFIX}.so.*" +FILES_${QT_BASE_LIB}network4-dev = "${@qt_default_dev('Network')}" +FILES_${QT_BASE_LIB}network4-dbg = "${libdir}/.debug/libQtNetwork${QT_LIBINFIX}*" +FILES_${QT_BASE_LIB}sql4 = "${libdir}/libQtSql${QT_LIBINFIX}.so.*" +FILES_${QT_BASE_LIB}sql4-dev = "${@qt_default_dev('Sql')}" +FILES_${QT_BASE_LIB}sql4-dbg = "${libdir}/.debug/libQtSql*" +FILES_${QT_BASE_LIB}svg4 = "${libdir}/libQtSvg${QT_LIBINFIX}.so.*" +FILES_${QT_BASE_LIB}svg4-dev = "${@qt_default_dev('Svg')}" +FILES_${QT_BASE_LIB}svg4-dbg = "${libdir}/.debug/libQtSvg*" +FILES_${QT_BASE_LIB}test4 = "${libdir}/libQtTest${QT_LIBINFIX}.so.*" +FILES_${QT_BASE_LIB}test4-dev = "${@qt_default_dev('Test')}" +FILES_${QT_BASE_LIB}test4-dbg = "${libdir}/.debug/libQtTest*" +FILES_${QT_BASE_LIB}xml4 = "${libdir}/libQtXml${QT_LIBINFIX}.so.*" +FILES_${QT_BASE_LIB}xml4-dev = "${@qt_default_dev('Xml')}" +FILES_${QT_BASE_LIB}xml4-dbg = "${libdir}/.debug/libQtXml*" +FILES_${QT_BASE_LIB}designer4 = "${libdir}/libQtDesigner${QT_LIBINFIX}.so.*" +FILES_${QT_BASE_LIB}designer4-dev = "${@qt_default_dev('Designer')}" +FILES_${QT_BASE_LIB}designer4-dbg = "${libdir}/.debug/libQtDesigner*" +FILES_${QT_BASE_LIB}designercomponents4 = "${libdir}/libQtDesignerComponents${QT_LIBINFIX}.so.*" +FILES_${QT_BASE_LIB}designercomponents4-dev = "${@qt_default_dev('DesignerComponents')}" +FILES_${QT_BASE_LIB}designercomponents4-dbg = "${libdir}/.debug/libQtDesignerComponents*" +FILES_${QT_BASE_LIB}3support4 = "${libdir}/libQt3Support${QT_LIBINFIX}.so.*" +FILES_${QT_BASE_LIB}3support4-dev = "${@qt_default_dev('3Support')}" +FILES_${QT_BASE_LIB}3support4-dbg = "${libdir}/.debug/libQt3Support*" +FILES_${QT_BASE_LIB}assistantclient4 = "${libdir}/libQtAssistantClient${QT_LIBINFIX}.so.*" +FILES_${QT_BASE_LIB}assistantclient4-dev = "${@qt_default_dev('AssistantClient')} ${includedir}/${QT_DIR_NAME}/QtAssistant*" +FILES_${QT_BASE_LIB}assistantclient4-dbg = "${libdir}/.debug/libQtAssistantClient*" +FILES_${QT_BASE_LIB}script4 = "${libdir}/libQtScript${QT_LIBINFIX}.so.*" +FILES_${QT_BASE_LIB}script4-dev = "${@qt_default_dev('Script')}" +FILES_${QT_BASE_LIB}script4-dbg = "${libdir}/.debug/libQtScript*" +FILES_${QT_BASE_LIB}dbus4 = "${libdir}/libQtDBus${QT_LIBINFIX}.so.*" +FILES_${QT_BASE_LIB}dbus4-dev = "${@qt_default_dev('DBus')}" +FILES_${QT_BASE_LIB}dbus4-dbg = "${libdir}/.debug/libQtDBus*" +FILES_${QT_BASE_LIB}opengl4 = "${libdir}/libQtOpenGL${QT_LIBINFIX}.so.*" +FILES_${QT_BASE_LIB}opengl4-dev = "${@qt_default_dev('OpenGL')}" +FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/libQtOpenGL*" +FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/libQtUiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/QtUiTools${QT_LIBINFIX}.pc" + + +FILES_${QT_BASE_NAME}-plugins-accessible = "${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so" +FILES_${QT_BASE_NAME}-plugins-codecs = "${libdir}/${QT_DIR_NAME}/plugins/codecs/*.so" +FILES_${QT_BASE_NAME}-plugins-designer = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so" +FILES_${QT_BASE_NAME}-plugins-imageformats = "${libdir}/${QT_DIR_NAME}/plugins/imageformats/*.so" +FILES_${QT_BASE_NAME}-plugins-sqldrivers = "${libdir}/${QT_DIR_NAME}/plugins/sqldrivers/*.so" +FILES_${QT_BASE_NAME}-plugins-inputmethods = "${libdir}/${QT_DIR_NAME}/plugins/inputmethods/*.so" +FILES_${QT_BASE_NAME}-plugins-iconengines = "${libdir}/${QT_DIR_NAME}/plugins/iconengines/*.so" + +FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant*" +FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*" +FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts" +FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool" +FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer" + +FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig" +FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*" +FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_DIR_NAME}/demos/*" + +FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts" + +python populate_packages_prepend() { + translationdir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) + do_split_packages(d, translationdir, '^qt_(.*)\.qm$', '${QT_DIR_NAME}-translation-%s', '{PN} translation for %s', extra_depends='' ) +} + + +do_install() { + oe_runmake install INSTALL_ROOT=${D} + + # These are host binaries, we should only use them in staging + rm -rf ${D}/${bindir}/qmake + + # XXX, FIXME, TODO: package the demos and examples properly + rm -rf ${D}/${bindir}/${QT_DIR_NAME} + rm -rf ${D}/${datadir}/${QT_DIR_NAME}/mkspecs + + install -d ${D}/${libdir}/fonts + touch ${D}/${libdir}/fonts/fontdir +} diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc new file mode 100644 index 0000000000..ddc28720a3 --- /dev/null +++ b/packages/qt4/qt_staging.inc @@ -0,0 +1,36 @@ +# Fixing up some Qt .pc files +do_stage_append() { + cd ${STAGING_LIBDIR}/pkgconfig + sed -i s#"-L${S}/lib"##g Qt*.pc + sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc + sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc +} + +STAGE_TEMP = "${WORKDIR}/temp-staging" +do_stage() { + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake install INSTALL_ROOT=${STAGE_TEMP} + + install -d ${STAGING_INCDIR}/ + install -d ${STAGING_LIBDIR}/${QT_DIR_NAME} + cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/ + + for i in ${STAGE_TEMP}/${libdir}/*.la + do + sed -i s,installed=yes,installed=no, $i + cp -fpPR $i ${STAGING_LIBDIR}/${QT_DIR_NAME}/ + cp -fpPR ${STAGE_TEMP}/${libdir}/$(basename $i .la).prl ${STAGING_LIBDIR}/${QT_DIR_NAME} + oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/${QT_DIR_NAME} + done + + for i in libQtAssistantClient${QT_LIBINFIX} libQtDesignerComponents${QT_LIBINFIX} libQtUiTools${QT_LIBINFIX} libQtUiTools${QT_LIBINFIX} libQtDesigner${QT_LIBINFIX} + do + cp ${STAGE_TEMP}/${libdir}/$i.prl ${STAGING_LIBDIR}/${QT_DIR_NAME} || true + cp ${STAGE_TEMP}/${libdir}/$i.la ${STAGING_LIBDIR}/${QT_DIR_NAME} || true + oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $i ${STAGING_LIBDIR}/${QT_DIR_NAME} || true + oe_libinstall -C ${STAGE_TEMP}/${libdir} -a $i ${STAGING_LIBDIR}/${QT_DIR_NAME} || true + done + + rm -rf ${STAGE_TEMP} +} diff --git a/packages/qt4/qtopia-core-4.3.3/.mtn2git_empty b/packages/qt4/qtopia-core-4.3.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qt4/qtopia-core-4.3.3/.mtn2git_empty diff --git a/packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch b/packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch new file mode 100644 index 0000000000..cc8e115fee --- /dev/null +++ b/packages/qt4/qtopia-core-4.3.3/0006-freetype-host-includes.patch @@ -0,0 +1,23 @@ +From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001 +From: Michael Krelin <hacker@klever.net> +Date: Mon, 4 Jun 2007 14:48:50 +0200 +Subject: [PATCH] freetype host includes + +--- + config.tests/unix/freetype/freetype.pri | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri +index 84974bf..ab9a6f2 100644 +--- a/config.tests/unix/freetype/freetype.pri ++++ b/config.tests/unix/freetype/freetype.pri +@@ -1,5 +1,5 @@ + !cross_compile { +- TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH ++ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH + for(p, TRY_INCLUDEPATHS) { + p = $$join(p, "", "", "/freetype2") + exists($$p):INCLUDEPATH *= $$p +-- +1.5.0.7 + diff --git a/packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch b/packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch new file mode 100644 index 0000000000..35b71d9694 --- /dev/null +++ b/packages/qt4/qtopia-core-4.3.3/0007-openssl-host-includes.patch @@ -0,0 +1,23 @@ +From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001 +From: Michael Krelin <hacker@klever.net> +Date: Mon, 4 Jun 2007 14:58:34 +0200 +Subject: [PATCH] openssl host includes + +--- + config.tests/unix/openssl/openssl.pri | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri +index 756e5fe..19b4061 100644 +--- a/config.tests/unix/openssl/openssl.pri ++++ b/config.tests/unix/openssl/openssl.pri +@@ -1,5 +1,5 @@ + !cross_compile { +- TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH ++ TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH + for(p, TRY_INCLUDEPATHS) { + pp = $$join(p, "", "", "/openssl") + exists($$pp):INCLUDEPATH *= $$p +-- +1.5.0.7 + diff --git a/packages/qt4/qtopia-core.inc b/packages/qt4/qtopia-core.inc new file mode 100644 index 0000000000..05727b7c90 --- /dev/null +++ b/packages/qt4/qtopia-core.inc @@ -0,0 +1,30 @@ +SUMMARY = "Qt is a versatile cross-platform application framework -- this is the QtopiaCore/Embedded version." +SECTION = "libs" +LICENSE = "GPL" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +DEPENDS += "tslib" +PR = "r1" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ + file://0001-cross-compile.patch;patch=1 \ + file://0003-no-tools.patch;patch=1 \ + file://0004-no-qmake.patch;patch=1 \ + file://0005-fix-mkspecs.patch;patch=1 \ + file://build-tools.patch;patch=1" +S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" + + +QT_CONFIG_FLAGS += " \ + -nomake demos -nomake examples -nomake tools -qtlibinfix E\ + -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}" +QT_BASE_NAME = "qtopiacore" +QT_BASE_LIB = "libqtopiacore" +QT_DIR_NAME = "qtopia" +QT_LIBINFIX="E" +require qt_depends.inc +require qt_configuration.inc +require qt_packaging.inc +require qt_staging.inc + +inherit qtopia4core diff --git a/packages/qt4/qtopia-core/.mtn2git_empty b/packages/qt4/qtopia-core/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qt4/qtopia-core/.mtn2git_empty diff --git a/packages/qt4/qtopia-core/0004-no-qmake.patch b/packages/qt4/qtopia-core/0004-no-qmake.patch new file mode 100644 index 0000000000..28f8d3ad9d --- /dev/null +++ b/packages/qt4/qtopia-core/0004-no-qmake.patch @@ -0,0 +1,25 @@ +From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001 +From: Michael Krelin <hacker@klever.net> +Date: Sat, 2 Jun 2007 16:06:59 +0200 +Subject: [PATCH] no qmake + +--- + configure | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index b3c2a52..1901e57 100755 +--- a/configure ++++ b/configure +@@ -3517,7 +3517,7 @@ END { + } + + # build qmake +-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; ++if false; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Creating qmake. Please wait..." + + OLD_QCONFIG_H= +-- +1.5.0.7 + diff --git a/packages/qt4/qtopia-core/build-tools.patch b/packages/qt4/qtopia-core/build-tools.patch new file mode 100644 index 0000000000..54ad666374 --- /dev/null +++ b/packages/qt4/qtopia-core/build-tools.patch @@ -0,0 +1,28 @@ +Do not disable tools, examples and demos for the QWS build. Use brute-force +to do this. + +Index: qtopia-core-opensource-src-4.3.3/configure +=================================================================== +--- qtopia-core-opensource-src-4.3.3.orig/configure 2007-12-27 16:30:36.000000000 +0100 ++++ qtopia-core-opensource-src-4.3.3/configure 2007-12-27 16:30:52.000000000 +0100 +@@ -2265,13 +2265,13 @@ + CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS" + + # don't build tools by default when cross-compiling +- if [ "$PLATFORM" != "$XPLATFORM" ]; then +- CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"` +- fi +-fi +-for nobuild in $CFG_NOBUILD_PARTS; do +- CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"` +-done ++ #if [ "$PLATFORM" != "$XPLATFORM" ]; then ++ # CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"` ++ #fi ++fi ++#for nobuild in $CFG_NOBUILD_PARTS; do ++# CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"` ++#done + if echo $CFG_BUILD_PARTS | grep -v libs >/dev/null 2>&1; then + # echo + # echo "WARNING: libs is a required part of the build." diff --git a/packages/qte/qtopia-core/linux-oe-qmake.conf b/packages/qt4/qtopia-core/linux-oe-qmake.conf index fc5ac6dc5c..fc5ac6dc5c 100644 --- a/packages/qte/qtopia-core/linux-oe-qmake.conf +++ b/packages/qt4/qtopia-core/linux-oe-qmake.conf diff --git a/packages/qt4/qtopia-core_4.2.0.bb b/packages/qt4/qtopia-core_4.2.0.bb new file mode 100644 index 0000000000..bd54419686 --- /dev/null +++ b/packages/qt4/qtopia-core_4.2.0.bb @@ -0,0 +1 @@ +require ${PN}.inc diff --git a/packages/qt4/qtopia-core_4.3.3.bb b/packages/qt4/qtopia-core_4.3.3.bb new file mode 100644 index 0000000000..9dad97f49a --- /dev/null +++ b/packages/qt4/qtopia-core_4.3.3.bb @@ -0,0 +1,5 @@ +require qtopia-core.inc +SRC_URI += " \ + file://0006-freetype-host-includes.patch;patch=1 \ + file://0007-openssl-host-includes.patch;patch=1 \ + file://0008-backport-qt-lib-infix.patch;patch=1" diff --git a/packages/qte/qtopia-core_4.2.0.bb b/packages/qte/qtopia-core_4.2.0.bb deleted file mode 100644 index ab07ecf35d..0000000000 --- a/packages/qte/qtopia-core_4.2.0.bb +++ /dev/null @@ -1,218 +0,0 @@ -DESCRIPTION = "Qtopia Core (aka: Qt/Embedded)" -SECTION = "libs" -LICENSE = "GPL" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -DEPENDS = "glib-2.0 freetype dbus-glib tslib" - -PR = "r2" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ - file://linux-oe-qmake.conf" - -S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" - -inherit pkgconfig - -# I'm not sure about the globals QTDIR and QTOPIADIR, or if they're even -# needed. On the same issue, I'm not sure what the best place for all the -# Qtopia Core related files is. For now, I've just put the libraries in -# ${libdir}, the includes in ${includedir} etc. Other possibilities are -# to sandbox everything (e.g., in /usr/local/Trolltech or /opt/Qtopia oslt), -# or to put libraries in /usr/lib/qtopia (or /usr/lib/qt4) etc. As said, -# I'm fine with this, but I'm also fine with another solution. - -# set QTDIR and QTOPIADIR globally (change QTOPIA dir to QTDIR?) -# This should be the default for other packages: -# export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" -# export QTOPIADIR = "${STAGING_DIR}/${HOST_SYS}/qtopia" -export QTDIR = "${S}" -export QTOPIADIR = "${S}" - -# Qmake gets confused by environment variables, as it builds both HOST -# and TARGET objects. The correct compiler settings come from the mkspec -# and are set with the OE_QMAKE_ variables -PARALLEL_MAKE = "" -EXTRA_OEMAKE = " MAKEFLAGS= " - -# This stuff could also be done by inheriting qmake, but I didn't want to -# bother with the qmake separation from the Qtopia configure. This separation -# is probably nothing more than a patch on the configure and setting some -# environment variables to use our own qmake/moc/uic, but that's something -# to figure out later. -export OE_QMAKE_CC="${CC}" -export OE_QMAKE_CFLAGS="${CFLAGS}" -export OE_QMAKE_CXX="${CXX}" -export OE_QMAKE_CXXFLAGS="-fno-exceptions ${CXXFLAGS}" -export OE_QMAKE_LDFLAGS="${LDFLAGS}" -export OE_QMAKE_LINK="${CXX}" -export OE_QMAKE_AR="${AR}" -export OE_QMAKE_RANLIB="${RANLIB}" -export OE_QMAKE_STRIP="echo" -export OE_QMAKE_RPATH="-Wl,-rpath-link," -export OE_QMAKE_INCDIR_QT="${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include" -export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib" - -require qte-functions.inc -QT_ARCH := "${@qte_arch(d)}" - -# FIXME use info.bbclass once it has been commited -QT_ENDIAN = "-little-endian" - -# We don't build the examples and demos atm. They're quite big and not used -# frequently, only for testing maybe. Feel free to change and to package -# them separately. -QT_CONFIG_FLAGS = "-release \ - -no-cups -no-accessibility \ - -nomake demos -nomake examples -nomake tools \ - -qt-mouse-tslib" - -do_configure() { - # Install the OE build templates (something which might be done - # by inheriting qmake) - for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ - do - install -d ${S}/mkspecs/$template - install -m 0644 ${WORKDIR}/linux-oe-qmake.conf \ - ${S}/mkspecs/$template/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h \ - ${S}/mkspecs/$template/qplatformdefs.h - done - - # The Qmake Makefile generation doesn't like these environment - # variables, as they mess up the HOST tools builds - unset CC - unset CXX - unset CFLAGS - unset CXXFLAGS - unset LDFLAGS - - # For rationale behind the installation locations, see remark above - echo yes | ./configure -v \ - -prefix ${prefix} \ - -bindir ${bindir} \ - -libdir ${libdir} \ - -docdir ${docdir}/qtopia \ - -headerdir ${includedir} \ - -plugindir ${datadir}/qtopia/plugins \ - -datadir ${datadir} \ - -translationdir ${datadir}/qtopia/translations \ - -sysconfdir ${sysconfdir} \ - -examplesdir ${bindir}/qtopia/examples \ - -demosdir ${bindir}/qtopia/demos \ - -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \ - -xplatform linux-oe-g++ \ - ${QT_CONFIG_FLAGS} \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -} - -do_install() { - oe_runmake install INSTALL_ROOT=${D} - - # These are host binaries, we should only use them in staging - rm -rf ${D}/${bindir} - rm -rf ${D}/${datadir}/mkspecs - - touch ${D}/${libdir}/fonts/fontdir - - #TT is still new to pkgconfig, so fix it up - install -d ${D}${libdir}/pkgconfig - mv ${D}/${libdir}/*.pc ${D}${libdir}/pkgconfig/ -} - -# We might want to package all the libraries separately, so you can really -# fine-tune what to install. This is e.g. done in qt4-x11-free_4.1.2.bb. -# What should these packages be called? I'm tempted to call them the same -# as in qt4 version, as the API is supposed to be compatible, e.g. -# libqtcore4 and libqtgui4. This will however conflict if you have QT and -# Qtopia, but this is something you don't want anyway, I guess. -# Another solution is making virtual/libqtfoo4, and DEPENDing on that one -# and let both the PACKAGES in QT and Qtopia PROVIDE these. The packages -# themselves could then be called libqtopiafoo4. -# I'll postpone this discussion by not making separate Qtopia packages. - -# Also, I don't package the plugins and translations atm, I don't use them -# and I don't feel like thinking about a sensible separation. - -PACKAGES =+ " libqtcore libqtcore-dev libqtcore-dbg \ - libqtxml libqtxml-dev libqtxml-dbg \ - libqtgui libqtgui-dev libqtgui-dbg \ - libqtsql libqtsql-dev libqtsql-dbg \ - libqtnetwork libqtnetwork-dev libqtnetwork-dbg \ - libqtsvg libqtsvg-dev libqtsvg-dbg \ - libqt3support libqt3support-dev libqt3support-dbg \ - qtopia-core-plugins qtopia-core-plugins-dbg\ - " - -PACKAGES += " ${PN}-fonts " - -# The default included fonts are around 75MB and consist of a number of -# FreeType-renderable fonts as well as QPF (Qtopia Prerendered Fonts). -# As FreeType is generally slow on embedded platforms, and 75MB is -# quite huge, we downsize the fonts dir in the do_install. I've decided -# to include only the QPF (Helvetica and Fixed), amounting to 500KB. This -# also results in tremendously faster application startup time. -FILES_libqtcore += " ${libdir}/fonts/helvetic* ${libdir}/fonts/fixed* ${D}/${libdir}/fonts/fontdir" -FILES_${PN}-fonts = "${libdir}/fonts" - -FILES_qtopia-core-plugins += "${datadir}/qtopia/plugins/*/*.so" -FILES_qtopia-core-plugins-dbg += "${datadir}/qtopia/plugins/*/.debug/*.so" - -FILES_libqtcore += "${libdir}/libQtCore.so.*" -FILES_libqtxml += "${libdir}/libQtXml.so.*" -FILES_libqtgui += "${libdir}/libQtGui.so.*" -FILES_libqtsql += "${libdir}/libQtSql.so.*" -FILES_libqtnetwork += "${libdir}/libQtNetwork.so.*" -FILES_libqtsvg += "${libdir}/libQtSvg.so.*" -FILES_libqt3support += "${libdir}/libQt3Support.so.*" - -FILES_libqtcore-dev += "${libdir}/*QtCore.*" -FILES_libqtxml-dev += "${libdir}/*QtXml.*" -FILES_libqtgui-dev += "${libdir}/*QtGui.*" -FILES_libqtsql-dev += "${libdir}/*QtSql.*" -FILES_libqtnetwork-dev += "${libdir}/*QtNetwork.*" -FILES_libqtsvg-dev += "${libdir}/*QtSvg.*" -FILES_libqt3support-dev += "${libdir}/*Qt3Support.*" - -FILES_libqtcore-dbg += "${libdir}/.debug/libQtCore*" -FILES_libqtxml-dbg += "${libdir}/.debug/libQtXml*" -FILES_libqtgui-dbg += "${libdir}/.debug/libQtGui*" -FILES_libqtsql-dbg += "${libdir}/.debug/libQtSql*" -FILES_libqtnetwork-dbg += "${libdir}/.debug/libQtNetwork*" -FILES_libqtsvg-dbg += "${libdir}/.debug/libQtSvg*" -FILES_libqt3support-dbg += "${libdir}/.debug/libQt3Support*" - - -python populate_packages_prepend() { - translationdir = bb.data.expand('${datadir}/qtopia/translations/', d) - do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' ) -} - - - -STAGE_TEMP = "${WORKDIR}/temp-staging" -do_stage() { - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - oe_runmake install INSTALL_ROOT=${STAGE_TEMP} - - cp -af ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR} - - for i in ${STAGE_TEMP}/${libdir}/*.la - do - oe_libinstall -C ${STAGE_TEMP}/${libdir} \ - -so $(basename $i .la) ${STAGING_LIBDIR} - done - - # Install qmake/moc/uic/rcc in staging (is this needed?) - install -m 0755 ${STAGE_TEMP}/${bindir}/rcc ${STAGING_BINDIR} - install -m 0755 ${STAGE_TEMP}/${bindir}/moc ${STAGING_BINDIR} - install -m 0755 ${STAGE_TEMP}/${bindir}/uic ${STAGING_BINDIR} - install -m 0755 ${STAGE_TEMP}/${bindir}/qmake ${STAGING_BINDIR} - # what about mkspecs? - - rm -rf ${STAGE_TEMP} -} - diff --git a/packages/qte/qtopia-core_4.3.2.bb b/packages/qte/qtopia-core_4.3.2.bb deleted file mode 100644 index c486ba164f..0000000000 --- a/packages/qte/qtopia-core_4.3.2.bb +++ /dev/null @@ -1,222 +0,0 @@ -SUMMARY = "QtopiaCore" -SECTION = "libs" -LICENSE = "GPL" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -DEPENDS = "freetype tslib" - -PR = "r0" - -SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \ - file://linux-oe-qmake.conf" - -S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" - -inherit pkgconfig - -# Qmake gets confused by environment variables, as it builds both HOST -# and TARGET objects. The correct compiler settings come from the mkspec -# and are set with the OE_QMAKE_ variables -PARALLEL_MAKE = "" -EXTRA_OEMAKE = " MAKEFLAGS= " - -# This stuff could also be done by inheriting qmake, but I didn't want to -# bother with the qmake separation from the Qtopia configure. This separation -# is probably nothing more than a patch on the configure and setting some -# environment variables to use our own qmake/moc/uic, but that's something -# to figure out later. -export OE_QMAKE_CC="${CC}" -export OE_QMAKE_CFLAGS="${CFLAGS}" -export OE_QMAKE_CXX="${CXX}" -export OE_QMAKE_CXXFLAGS="-fno-exceptions ${CXXFLAGS}" -export OE_QMAKE_LDFLAGS="${LDFLAGS}" -export OE_QMAKE_LINK="${CXX}" -export OE_QMAKE_AR="${AR}" -export OE_QMAKE_RANLIB="${RANLIB}" -export OE_QMAKE_STRIP="echo" -export OE_QMAKE_RPATH="-Wl,-rpath-link," -export OE_QMAKE_INCDIR_QT="${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_INCDIR_QTOPIA="${QTOPIADIR}/include" -export OE_QMAKE_LIBDIR_QTOPIA="${QTOPIADIR}/lib" - -require qte-functions.inc -QT_ARCH := "${@qte_arch(d)}" - -# FIXME use info.bbclass once it has been commited -QT_ENDIAN = "-little-endian" - -# We don't build the examples and demos atm. They're quite big and not used -# frequently, only for testing maybe. Feel free to change and to package -# them separately. -QT_CONFIG_FLAGS = "-release \ - -no-cups -no-accessibility \ - -nomake demos -nomake examples -nomake tools -reduce-relocations \ - -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}" - -do_configure() { - # Hack to honor our compiler flags - sed -i s/-O2//g ${S}/mkspecs/*/qmake.conf - sed -i s/-O2//g ${S}/mkspecs/*/*/qmake.conf - - - # Install the OE build templates (something which might be done - # by inheriting qmake) - for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ - do - install -d ${S}/mkspecs/$template - install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h - done - - # The Qmake Makefile generation doesn't like these environment - # variables, as they mess up the HOST tools builds - unset CC - unset CXX - unset CFLAGS - unset CXXFLAGS - unset LDFLAGS - - # For rationale behind the installation locations, see remark above - echo yes | ./configure -v \ - -prefix ${prefix} \ - -bindir ${bindir} \ - -libdir ${libdir} \ - -docdir ${docdir}/qtopia \ - -headerdir ${includedir} \ - -plugindir ${datadir}/qtopia/plugins \ - -datadir ${datadir} \ - -translationdir ${datadir}/qtopia/translations \ - -sysconfdir ${sysconfdir} \ - -examplesdir ${bindir}/qtopia/examples \ - -demosdir ${bindir}/qtopia/demos \ - -embedded ${QT_ARCH} ${QT_ENDIAN} -fast \ - -xplatform linux-oe-g++ \ - ${QT_CONFIG_FLAGS} \ - -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -} - -# -# Fixup some pkgconfig files -# moc_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/moc -# uic_location=/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/bin/uic -# -# Libs: -L${libdir} -lQtNetwork -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib $(LIBS_EXTRA) -lQtCore -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/staging/arm-angstrom-linux/lib -L/home/zecke/gmit/dela_build/git/openembedded-gmit.zecke/build/oetmp/work/arm-oabi-angstrom-linux/qtopia-core-4.3.0-r2/qtopia-core-opensource-src-4.3.0/lib -lm -lrt -lpthread -ldl -# -do_compile_append() { - cd ${S}/lib/pkgconfig - sed -i s#"-L${S}/lib"##g *.pc - sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# *.pc - sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# *.pc -} - -do_stage_append() { - echo "Fixing up Qt" - cd ${STAGING_LIBDIR}/pkgconfig - sed -i s#"-L${S}/lib"##g Qt*.pc - sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc - sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc -} - -do_install() { - oe_runmake install INSTALL_ROOT=${D} - - # These are host binaries, we should only use them in staging - rm -rf ${D}/${bindir} - rm -rf ${D}/${datadir}/mkspecs - - touch ${D}/${libdir}/fonts/fontdir -} - -# We might want to package all the libraries separately, so you can really -# fine-tune what to install. This is e.g. done in qt4-x11-free_4.1.2.bb. -# What should these packages be called? I'm tempted to call them the same -# as in qt4 version, as the API is supposed to be compatible, e.g. -# libqtcore4 and libqtgui4. This will however conflict if you have QT and -# Qtopia, but this is something you don't want anyway, I guess. -# Another solution is making virtual/libqtfoo4, and DEPENDing on that one -# and let both the PACKAGES in QT and Qtopia PROVIDE these. The packages -# themselves could then be called libqtopiafoo4. -# I'll postpone this discussion by not making separate Qtopia packages. - -# Also, I don't package the plugins and translations atm, I don't use them -# and I don't feel like thinking about a sensible separation. - -PACKAGES =+ " libqtcore libqtcore-dev libqtcore-dbg \ - libqtxml libqtxml-dev libqtxml-dbg \ - libqtgui libqtgui-dev libqtgui-dbg \ - libqtsql libqtsql-dev libqtsql-dbg \ - libqtnetwork libqtnetwork-dev libqtnetwork-dbg \ - libqtsvg libqtsvg-dev libqtsvg-dbg \ - libqt3support libqt3support-dev libqt3support-dbg \ - qtopia-core-plugins qtopia-core-plugins-dbg \ - libqtscript libqtscript-dev libqtscript-dbg \ - " - -PACKAGES += " ${PN}-fonts " - -# The default included fonts are around 75MB and consist of a number of -# FreeType-renderable fonts as well as QPF (Qtopia Prerendered Fonts). -# As FreeType is generally slow on embedded platforms, and 75MB is -# quite huge, we downsize the fonts dir in the do_install. I've decided -# to include only the QPF (Helvetica and Fixed), amounting to 500KB. This -# also results in tremendously faster application startup time. -FILES_libqtcore += " ${libdir}/fonts/helvetic* ${libdir}/fonts/fixed* ${D}/${libdir}/fonts/fontdir" -FILES_${PN}-fonts = "${libdir}/fonts" - -FILES_qtopia-core-plugins += "${datadir}/qtopia/plugins/*/*.so" -FILES_qtopia-core-plugins-dbg += "${datadir}/qtopia/plugins/*/.debug/*.so" - -FILES_libqtcore += "${libdir}/libQtCore.so.*" -FILES_libqtxml += "${libdir}/libQtXml.so.*" -FILES_libqtgui += "${libdir}/libQtGui.so.*" -FILES_libqtsql += "${libdir}/libQtSql.so.*" -FILES_libqtnetwork += "${libdir}/libQtNetwork.so.*" -FILES_libqtsvg += "${libdir}/libQtSvg.so.*" -FILES_libqt3support += "${libdir}/libQt3Support.so.*" -FILES_libqtscript += "${libdir}/libQtScript.so.*" - -FILES_libqtcore-dev += "${libdir}/*QtCore.*" -FILES_libqtxml-dev += "${libdir}/*QtXml.*" -FILES_libqtgui-dev += "${libdir}/*QtGui.*" -FILES_libqtsql-dev += "${libdir}/*QtSql.*" -FILES_libqtnetwork-dev += "${libdir}/*QtNetwork.*" -FILES_libqtsvg-dev += "${libdir}/*QtSvg.*" -FILES_libqt3support-dev += "${libdir}/*Qt3Support.*" -FILES_libqtscript-dev += "${libdir}/*QtScript.*" - -FILES_libqtcore-dbg += "${libdir}/.debug/libQtCore*" -FILES_libqtxml-dbg += "${libdir}/.debug/libQtXml*" -FILES_libqtgui-dbg += "${libdir}/.debug/libQtGui*" -FILES_libqtsql-dbg += "${libdir}/.debug/libQtSql*" -FILES_libqtnetwork-dbg += "${libdir}/.debug/libQtNetwork*" -FILES_libqtsvg-dbg += "${libdir}/.debug/libQtSvg*" -FILES_libqt3support-dbg += "${libdir}/.debug/libQt3Support*" -FILES_libqtscript-dbg += "${libdir}/.debug/libQtScript*" - - -python populate_packages_prepend() { - translationdir = bb.data.expand('${datadir}/qtopia/translations/', d) - do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' ) -} - - - -STAGE_TEMP = "${WORKDIR}/temp-staging" -do_stage() { - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - oe_runmake install INSTALL_ROOT=${STAGE_TEMP} - - install -d ${STAGING_INCDIR}/qtopiacore4 - install -d ${STAGING_LIBDIR}/qtopiacore4 - cp -af ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/qtopiacore4/ - - for i in ${STAGE_TEMP}/${libdir}/*.la - do - oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/qtopiacore4 - done - - rm -rf ${STAGE_TEMP} -} - diff --git a/packages/qxmp/qxmp_1.0.bb b/packages/qxmp/qxmp_1.0.bb index e0a1acab21..bad972d54f 100644 --- a/packages/qxmp/qxmp_1.0.bb +++ b/packages/qxmp/qxmp_1.0.bb @@ -6,7 +6,7 @@ RDEPENDS = "mplayer" SRC_URI = "http://www.xm1math.net/qxmp/qxmp-${PV}.tar.bz2" -inherit qmake qt4x11 +inherit qt4x11 do_install() { install -d ${D}${bindir} diff --git a/packages/roadmap/files/qt/roadmap.desktop.patch b/packages/roadmap/files/roadmap.desktop.patch index 98d5b06130..98d5b06130 100644 --- a/packages/roadmap/files/qt/roadmap.desktop.patch +++ b/packages/roadmap/files/roadmap.desktop.patch diff --git a/packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty b/packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty diff --git a/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch b/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch new file mode 100644 index 0000000000..8f79b5503f --- /dev/null +++ b/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch @@ -0,0 +1,11 @@ +--- src/qt/ipkg/zroadgps.desktop.old 2007-12-24 19:35:34.000000000 -0600 ++++ src/qt/ipkg/zroadgps.desktop 2007-12-24 19:37:12.000000000 -0600 +@@ -1,6 +1,7 @@ + [Desktop Entry] + Comment=RoadMap + Exec=roadgps +-Icon=zroadgps ++Icon=roadgps + Type=Application + Name=RoadMapGPS ++Categories=Graphics;Viewer;GTK; diff --git a/packages/roadmap/roadmap-gtk2_1.0.12.bb b/packages/roadmap/roadmap-gtk2_1.0.12.bb new file mode 100644 index 0000000000..e2ce5f2316 --- /dev/null +++ b/packages/roadmap/roadmap-gtk2_1.0.12.bb @@ -0,0 +1,44 @@ +require roadmap.inc + +DEPENDS = "gtk+" +PR = "r0" + +SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ + file://roadmap.desktop.patch;patch=1 \ + file://roadgps.desktop.patch;patch=1 \ + http://www.roadmap.digitalomaha.net/maps-1.0.12/usdir.rdm.tgz \ + file://zroadgps.png " + +S = "${WORKDIR}/roadmap-${PV}/src" + +DESKTOP = "GTK2" +CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \ + -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} " + +do_compile() { + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a + cd gtk2 && oe_runmake +} + +do_install() { + install -d ${D}${bindir} + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + install -d ${D}${datadir}/roadmap + + install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap + install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps + + install -m 0644 icons/*png ${D}${datadir}/pixmaps/ + install -m 0644 roadmap.png ${D}${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png + + install -m 0644 roadmap.desktop ${D}${datadir}/applications/ + install -m 0644 qt/ipkg/zroadgps.desktop ${D}${datadir}/applications/roadgps.desktop + + install -m 0644 sprites schema preferences ${D}${datadir}/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ +} + +FILES_${PN} += "${datadir}/roadmap" + diff --git a/packages/roadmap/roadmap-gtk2_1.1.0.bb b/packages/roadmap/roadmap-gtk2_1.1.0.bb new file mode 100644 index 0000000000..f638cf1fdd --- /dev/null +++ b/packages/roadmap/roadmap-gtk2_1.1.0.bb @@ -0,0 +1,46 @@ +require roadmap.inc + +DEPENDS = "agg expat gtk+" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ + file://cross.patch;patch=1;pnum=2 \ + file://roadmap.desktop.patch;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + file://zroadgps.png" + +S = "${WORKDIR}/roadmap-${PV}/src" + +DESKTOP = "GTK2" +POPT = "NO" +AGG = "rgba32" +CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \ + -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} " + +do_compile() { + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a + oe_runmake -C gpx libgpx.a + oe_runmake -C unix libosroadmap.a + oe_runmake -C gtk2 gtkroadmap gtkroadgps +} + +do_install() { + install -d ${D}${bindir} + install -d ${D}${datadir}/applications + install -d ${D}${datadir}/pixmaps + install -d ${D}${datadir}/roadmap + + install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap + install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps + + install -m 0644 icons/*png ${D}${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png + + install -m 0644 roadmap.desktop ${D}${datadir}/applications/ + + install -m 0644 sprites preferences ${D}${datadir}/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ +} + +FILES_${PN} += "${datadir}/roadmap" + diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb index 557c4a1096..2ece0de929 100644 --- a/packages/roadmap/roadmap-gtk2_cvs.bb +++ b/packages/roadmap/roadmap-gtk2_cvs.bb @@ -1,22 +1,26 @@ require roadmap.inc -DEPENDS = "expat gtk+" -PV = "1.0.12+cvs${SRCDATE}" -PR = "r1" +DEPENDS = "agg expat gtk+" +PV = "1.1.0+cvs${SRCDATE}" +PR = "r0" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ - " + file://zroadgps.png" S = "${WORKDIR}/roadmap/src" -CFLAGS += " -I${S} " - +DESKTOP = "GTK2" +AGG = "rgba32" +CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \ + -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} " do_compile() { - oe_runmake - oe_runmake gtk2 + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a + oe_runmake -C gpx libgpx.a + oe_runmake -C unix libosroadmap.a + oe_runmake -C gtk2 gtkroadmap gtkroadgps } do_install() { @@ -25,11 +29,15 @@ do_install() { install -d ${D}${datadir}/pixmaps install -d ${D}${datadir}/roadmap - install -m 0755 gtk2/gtkroad* ${D}${bindir} + install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap + install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps - install -m 0644 icons/*png ${D}${datadir}/pixmaps + install -m 0644 icons/*png ${D}${datadir}/pixmaps/ + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png + + install -m 0644 roadmap.desktop ${D}${datadir}/applications/ - install -m 0644 sprites preferences ${D}${datadir}/roadmap + install -m 0644 sprites preferences ${D}${datadir}/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ } diff --git a/packages/roadmap/roadmap.inc b/packages/roadmap/roadmap.inc index 43577badb9..e9598df178 100644 --- a/packages/roadmap/roadmap.inc +++ b/packages/roadmap/roadmap.inc @@ -3,5 +3,6 @@ PRIORITY = "optional" AUTHOR = "Pascal Martin <pascal.martin@iname.com>" HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" LICENSE = "GPL" +RRECOMMENDS = "gpsd flite" PARALLEL_MAKE = "" diff --git a/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch deleted file mode 100644 index 24fe1c9bdb..0000000000 --- a/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# -# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de> -# - ---- src/qt/qt_main.cc~qt2-fixes-r1.patch -+++ src/qt/qt_main.cc -@@ -137,7 +137,7 @@ - switch (orientation[0]) { - case 't': - case 'T': break; -- -+#ifndef QWS - case 'b': - case 'B': moveDockWindow (toolBar, DockBottom); break; - -@@ -146,7 +146,7 @@ - - case 'r': - case 'R': moveDockWindow (toolBar, DockRight); break; -- -+#endif - default: roadmap_log (ROADMAP_FATAL, - "Invalid toolbar orientation %s", orientation); - } ---- src/qt/Makefile~qt2-fixes-r1.patch -+++ src/qt/Makefile -@@ -19,7 +19,7 @@ - - ifeq ($(DESKTOP),QPE) - CFLAGS += -I$(QTDIR)/include -DQWS -- LIBS += -lqte -lqpe -+ LIBS += -lqpe - INSTALLDIR=$(QTDIR) - endif - diff --git a/packages/roadmap/zroadmap_1.0.12.bb b/packages/roadmap/zroadmap_1.0.12.bb index 9a7b73d1a1..c7fc851d0d 100644 --- a/packages/roadmap/zroadmap_1.0.12.bb +++ b/packages/roadmap/zroadmap_1.0.12.bb @@ -4,8 +4,9 @@ PR = "r1" SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ file://qt2-fixes.patch;pnum=2;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + http://www.roadmap.digitalomaha.net/maps-1.0.12/usdir.rdm.tgz \ file://zroadgps.png" + S = "${WORKDIR}/roadmap-${PV}/src" EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \ @@ -21,13 +22,17 @@ do_install() { install -d ${D}${palmtopdir}/bin install -d ${D}${palmtopdir}/apps/Applications install -d ${D}${palmtopdir}/pics + install -d ${D}${palmtopdir}/share/roadmap + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ - install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ } diff --git a/packages/roadmap/zroadmap_1.1.0.bb b/packages/roadmap/zroadmap_1.1.0.bb index 42184ce62b..bafcc7c27d 100644 --- a/packages/roadmap/zroadmap_1.1.0.bb +++ b/packages/roadmap/zroadmap_1.1.0.bb @@ -1,7 +1,7 @@ require zroadmap.inc -DEPENDS += "expat" -PR = "r0" +DEPENDS = "expat" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ file://cross.patch;patch=1;pnum=2 \ @@ -9,9 +9,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ file://qt/qt_canvas.patch;patch=1 \ file://qt/qt_main.patch;patch=1 \ file://qt/roadmap_main.patch;patch=1 \ - file://qt/roadmap.desktop.patch;patch=1 \ + file://roadmap.desktop.patch;patch=1 \ http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ file://zroadgps.png" + S = "${WORKDIR}/roadmap-${PV}/src" EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} POPT=NO \ @@ -29,12 +30,16 @@ do_install() { install -d ${D}${palmtopdir}/bin install -d ${D}${palmtopdir}/apps/Applications install -d ${D}${palmtopdir}/pics + install -d ${D}${palmtopdir}/share/roadmap + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ - install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ } diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb index 5b39faf071..cb81756041 100644 --- a/packages/roadmap/zroadmap_cvs.bb +++ b/packages/roadmap/zroadmap_cvs.bb @@ -1,19 +1,15 @@ require zroadmap.inc -DEPENDS += "expat" -SRCDATE = "20071212" -PV = "1.1.0+cvs-${SRCDATE}" -PR = "r0" +DEPENDS = "expat" +PV = "1.1.0+cvs${SRCDATE}" +PR = "r1" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ file://qt/qt2-fixes.patch;patch=1 \ - file://qt/qt_canvas.patch;patch=1 \ -#upstream file://qt/qt_main.patch;patch=1 \ - file://qt/roadmap_main.patch;patch=1 \ -#upstream file://qt/roadmap.desktop.patch;patch=1 \ http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ file://zroadgps.png" + S = "${WORKDIR}/roadmap/src" EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ @@ -31,12 +27,16 @@ do_install() { install -d ${D}${palmtopdir}/bin install -d ${D}${palmtopdir}/apps/Applications install -d ${D}${palmtopdir}/pics + install -d ${D}${palmtopdir}/share/roadmap + install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ - install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ } diff --git a/packages/settings-daemon/settings-daemon_svn.bb b/packages/settings-daemon/settings-daemon_svn.bb index fb24fb1d75..eaffbfebb4 100644 --- a/packages/settings-daemon/settings-daemon_svn.bb +++ b/packages/settings-daemon/settings-daemon_svn.bb @@ -1,10 +1,12 @@ DESCRIPTION = "Settings-daemon provides a bridge between gconf and xsettings" LICENSE = "GPL" -DEPENDS = "gconf glib-2.0" +DEPENDS = "gconf glib-2.0 gtk+" RDEPENDS = "xrdb" SECTION = "x11" PV = "0.0+svnr${SRCREV}" +PR = "r1" + SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://70settings-daemon" diff --git a/packages/slugos-init/slugos-init_4.8.bb b/packages/slugos-init/slugos-init_4.8.bb new file mode 100644 index 0000000000..49c3e1fee6 --- /dev/null +++ b/packages/slugos-init/slugos-init_4.8.bb @@ -0,0 +1,149 @@ +DESCRIPTION = "SlugOS initial network config via sysconf" +SECTION = "base" +PRIORITY = "required" +LICENSE = "GPL" +DEPENDS = "base-files devio" +RDEPENDS = "busybox devio" +PR = "r0" + +SRC_URI = "file://boot/flash \ + file://boot/disk \ + file://boot/nfs \ + file://boot/ram \ + file://boot/kexec \ + file://boot/network \ + file://boot/udhcpc.script \ + file://initscripts/fixfstab \ + file://initscripts/syslog.buffer \ + file://initscripts/syslog.file \ + file://initscripts/syslog.network \ + file://initscripts/zleds \ + file://initscripts/leds_startup \ + file://initscripts/rmrecovery \ + file://initscripts/sysconfsetup \ + file://initscripts/umountinitrd.sh \ + file://initscripts/loadmodules.sh \ + file://functions \ + file://modulefunctions \ + file://conffiles \ + file://sysconf \ + file://leds \ + file://turnup \ + " + +SBINPROGS = "" +USRSBINPROGS = "" +CPROGS = "${USRSBINPROGS} ${SBINPROGS}" +SCRIPTS = "turnup leds sysconf" +BOOTSCRIPTS = "flash disk nfs ram kexec network udhcpc.script" +INITSCRIPTS = "syslog.buffer syslog.file syslog.network zleds\ + leds_startup rmrecovery sysconfsetup umountinitrd.sh\ + fixfstab loadmodules.sh" + +# This just makes things easier... +S="${WORKDIR}" + +do_compile() { + set -ex + for p in ${CPROGS} + do + ${CC} ${CFLAGS} -o $p $p.c + done + set +ex +} + +do_install() { + set -ex + + # Directories + install -d ${D}${sysconfdir} \ + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/init.d \ + ${D}${sysconfdir}/modutils \ + ${D}${sysconfdir}/udev \ + ${D}${sbindir} \ + ${D}${base_sbindir} \ + ${D}/initrd \ + ${D}/boot + + # linuxrc + rm -f ${D}/linuxrc + ln -s boot/flash ${D}/linuxrc + + # C programs + for p in ${USRSBINPROGS} + do + install -m 0755 $p ${D}${sbindir}/$p + done + for p in ${SBINPROGS} + do + install -m 0755 $p ${D}${base_sbindir}/$p + done + + # Shell scripts + for p in ${SCRIPTS} + do + install -m 0755 $p ${D}${base_sbindir}/$p + done + + # + # Init scripts + install -m 0644 functions ${D}${sysconfdir}/default + install -m 0644 modulefunctions ${D}${sysconfdir}/default + for s in ${INITSCRIPTS} + do + install -m 0755 initscripts/$s ${D}${sysconfdir}/init.d/ + done + + # + # Boot scripts + for p in ${BOOTSCRIPTS} + do + install -m 0755 boot/$p ${D}/boot + done + + # Configuration files + install -m 0644 conffiles ${D}${sysconfdir}/default + + set +ex +} + +# If the package is installed on an NSLU2 $D will be empty, in that +# case it is normal to run 'start' and 'stop', but because the conf +# files installed don't actually start or stop anything this is +# unnecessary, so the package postfoo handling is simplified here. +#NB: do not use '08' (etc) for the first argument after start/stop, +# the value is interpreted as an octal number if there is a leading +# zero. +pkg_postinst_slugos-init() { + opt= + test -n "$D" && opt="-r $D" + update-rc.d $opt hwclock.sh start 8 S . start 45 0 6 . + update-rc.d $opt umountinitrd.sh start 9 S . + update-rc.d $opt fixfstab start 10 S . + update-rc.d $opt syslog.buffer start 11 S . start 49 0 6 . + update-rc.d $opt sysconfsetup start 12 S . + update-rc.d $opt loadmodules.sh start 21 S . + update-rc.d $opt syslog.file start 39 S . start 47 0 6 . + update-rc.d $opt syslog.network start 44 S . start 39 0 6 . + update-rc.d $opt zleds start 99 S 1 2 3 4 5 . start 89 0 6 . stop 5 0 1 2 3 4 5 6 . + update-rc.d $opt rmrecovery start 99 1 2 3 4 5 . + # bug fix for startup + update-rc.d $opt leds_startup start 1 1 2 3 4 5 . +} + +pkg_postrm_slugos-init() { + opt= + test -n "$D" && opt="-r $D" + for s in ${INITSCRIPTS} + do + update-rc.d $opt "$s" remove + done +} + +PACKAGES = "${PN}" +FILES_${PN} = "/" + +# It is bad to overwrite /linuxrc as it puts the system back to +# a flash boot (and the flash has potentially not been upgraded!) +CONFFILES_${PN} = "/linuxrc ${sysconfdir}/default/conffiles" diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index da1fdf97cd..40ef6ddce8 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r54" +PR = "r56" inherit task @@ -226,8 +226,6 @@ RRECOMMENDS_task-base-pcmcia = "\ " task-base-pcmcia24 = "\ - ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-modules-cs', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-modules-cs', '',d)} \ " task-base-pcmcia26 = "\ diff --git a/packages/tasks/task-nas-server.bb b/packages/tasks/task-nas-server.bb new file mode 100644 index 0000000000..f46a3306fe --- /dev/null +++ b/packages/tasks/task-nas-server.bb @@ -0,0 +1,102 @@ +DESCRIPTION = "Tasks for a Network Attached Storage server" +LICENSE = "MIT" +PROVIDES = "task-nas-server-everything" +PR = "r1" + +inherit task + +PACKAGES = "\ + task-nas-server-everything \ + ${NAS_SERVER_PACKAGES} \ +" + +NAS_SERVER_PACKAGES = "\ + task-nas-server-base \ + task-nas-server-samba \ + task-nas-server-dnsmasq \ + task-nas-server-iptables \ + task-nas-server-openmoko \ + task-nas-server-tzdata \ + task-nas-server-nfs \ + task-nas-server-vfat \ + task-nas-server-ntfs \ + task-nas-server-ext3 \ + task-nas-server-reiserfs \ +" + +RDEPENDS_task-nas-server-everything = "${NAS_SERVER_PACKAGES}" + +DESCRIPTION_task-nas-server-base = "NAS-Server: Base Packages" +RDEPENDS_task-nas-server-base = "\ +" +RRECOMMENDS_task-nas-server-base = "\ +" + +DESCRIPTION_task-nas-server-samba = "NAS-Server: Samba Server" +RDEPENDS_task-nas-server-samba = "\ + samba swat \ +" +RRECOMMENDS_task-nas-server-samba = "\ +" + +DESCRIPTION_task-nas-server-dnsmasq = "NAS-Server: DNS/DHCP Server" +RDEPENDS_task-nas-server-dnsmasq = "\ + dnsmasq \ +" +RRECOMMENDS_task-nas-server-dnsmasq = "\ +" + +DESCRIPTION_task-nas-server-iptables = "NAS-Server: Netfilter/Iptables Support" +RDEPENDS_task-nas-server-iptables = "\ + iptables \ +" +RRECOMMENDS_task-nas-server-iptables = "\ + kernel-module-iptable-nat \ + kernel-module-iptable-mangle \ + kernel-module-ipt-masquerade \ +" + +DESCRIPTION_task-nas-server-openmoko = "NAS-Server: OpenMoko Support" +RDEPENDS_task-nas-server-openmoko = "\ + dfu-util \ +" +RRECOMMENDS_task-nas-server-openmoko = "\ +" + +DESCRIPTION_task-nas-server-tzdata = "NAS-Server: Timezone Support" +RDEPENDS_task-nas-server-tzdata = "\ + tzdata \ +" +RRECOMMENDS_task-nas-server-tzdata = "\ +" + +DESCRIPTION_task-nas-server-nfs = "NAS-Server: NFS Server" +RDEPENDS_task-nas-server-nfs = "\ + nfs-utils portmap \ +" +RRECOMMENDS_task-nas-server-nfs = "\ +" + +DESCRIPTION_task-nas-server-vfat = "NAS-Server: FAT Filesystem" +RDEPENDS_task-nas-server-vfat = "\ +" +RRECOMMENDS_task-nas-server-vfat = "\ +" + +DESCRIPTION_task-nas-server-ntfs = "NAS-Server: NTFS Filesystem" +RDEPENDS_task-nas-server-ntfs = "\ +" +RRECOMMENDS_task-nas-server-ntfs = "\ +" + +DESCRIPTION_task-nas-server-ext3 = "NAS-Server: EXT3 Filesystem" +RDEPENDS_task-nas-server-ext3 = "\ +" +RRECOMMENDS_task-nas-server-ext3 = "\ +" + +DESCRIPTION_task-nas-server-reiserfs = "NAS-Server: ReiserFS Filesystem" +RDEPENDS_task-nas-server-reiserfs = "\ +" +RRECOMMENDS_task-nas-server-reiserfs = "\ +" diff --git a/packages/texmaker/texmaker_1.3.bb b/packages/texmaker/texmaker_1.3.bb index 5682338f31..b612302544 100644 --- a/packages/texmaker/texmaker_1.3.bb +++ b/packages/texmaker/texmaker_1.3.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" SRC_URI = "http://www.xm1math.net/texmaker/texmaker-${PV}.tar.bz2" -inherit qmake qt4x11 +inherit qt4x11 do_install() { install -d ${D}${bindir} diff --git a/packages/tzdata/tzdata_2007e.bb b/packages/tzdata/tzdata_2007e.bb index 46d941c269..d873bfd0d6 100644 --- a/packages/tzdata/tzdata_2007e.bb +++ b/packages/tzdata/tzdata_2007e.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "optional" DEPENDS = "tzcode-native" -PR = "r0" +PR = "r1" PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ @@ -126,6 +126,9 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ ${datadir}/zoneinfo/Asia/Bankok \ ${datadir}/zoneinfo/Asia/Hong_Kong \ ${datadir}/zoneinfo/Asia/Tokyo \ + ${datadir}/zoneinfo/Australia/Darwin \ + ${datadir}/zoneinfo/Australia/Adelaide \ + ${datadir}/zoneinfo/Australia/Brisbane \ ${datadir}/zoneinfo/Australia/Sydney \ ${datadir}/zoneinfo/Pacific/Noumea \ ${datadir}/zoneinfo/CET \ diff --git a/packages/u-boot/.mtn2git_empty b/packages/u-boot/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/u-boot/.mtn2git_empty diff --git a/packages/u-boot/files/.mtn2git_empty b/packages/u-boot/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/u-boot/files/.mtn2git_empty diff --git a/packages/uboot/files/arm_flags.patch b/packages/u-boot/files/arm_flags.patch index 84b8cada39..84b8cada39 100644 --- a/packages/uboot/files/arm_flags.patch +++ b/packages/u-boot/files/arm_flags.patch diff --git a/packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch b/packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch new file mode 100644 index 0000000000..c97880a01c --- /dev/null +++ b/packages/u-boot/files/boot-menu-gfx-fix-openmoko-bug-1140.patch @@ -0,0 +1,29 @@ +--- git.orig/drivers/video/cfb_console.c 2007-12-27 00:59:35.000000000 -0800 ++++ git/drivers/video/cfb_console.c 2007-12-27 08:23:42.000000000 -0800 +@@ -141,6 +141,14 @@ + #endif + + /*****************************************************************************/ ++/* Defines for the S3C2410 driver */ ++/*****************************************************************************/ ++#ifdef CONFIG_VIDEO_S3C2410 ++/* it actually is little-endian, but the host CPU, too ! */ ++//#define VIDEO_FB_LITTLE_ENDIAN ++#endif ++ ++/*****************************************************************************/ + /* Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc */ + /*****************************************************************************/ + #include <video_fb.h> +@@ -309,6 +317,11 @@ + #define SHORTSWAP32(x) (x) + #endif + ++#ifdef CONFIG_VIDEO_S3C2410 ++#undef SHORTSWAP32 ++#define SHORTSWAP32(x) ((((x) & 0xffff) << 16) | (((x) >> 16) & 0xffff)) ++#endif ++ + #if defined(DEBUG) || defined(DEBUG_CFB_CONSOLE) + #define PRINTD(x) printf(x) + #else diff --git a/packages/uboot/files/fix-arm920t-eabi.patch b/packages/u-boot/files/fix-arm920t-eabi.patch index 9896388c8f..9896388c8f 100644 --- a/packages/uboot/files/fix-arm920t-eabi.patch +++ b/packages/u-boot/files/fix-arm920t-eabi.patch diff --git a/packages/uboot/files/makefile-no-dirafter.patch b/packages/u-boot/files/makefile-no-dirafter.patch index 2ed26c3127..2ed26c3127 100644 --- a/packages/uboot/files/makefile-no-dirafter.patch +++ b/packages/u-boot/files/makefile-no-dirafter.patch diff --git a/packages/uboot/files/u-boot-20061030-ext2load_hex.patch b/packages/u-boot/files/u-boot-20061030-ext2load_hex.patch index 3cecb7485d..3cecb7485d 100644 --- a/packages/uboot/files/u-boot-20061030-ext2load_hex.patch +++ b/packages/u-boot/files/u-boot-20061030-ext2load_hex.patch diff --git a/packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch b/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch index e90cc0de71..e90cc0de71 100644 --- a/packages/uboot/files/uboot-20070311-tools_makefile_ln_sf.patch +++ b/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch diff --git a/packages/uboot/files/uboot-eabi-fix-HACK.patch b/packages/u-boot/files/uboot-eabi-fix-HACK.patch index 65b212917d..65b212917d 100644 --- a/packages/uboot/files/uboot-eabi-fix-HACK.patch +++ b/packages/u-boot/files/uboot-eabi-fix-HACK.patch diff --git a/packages/u-boot/u-boot-1.1.2/.mtn2git_empty b/packages/u-boot/u-boot-1.1.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/u-boot/u-boot-1.1.2/.mtn2git_empty diff --git a/packages/uboot/u-boot-1.1.2/arm_flags.patch b/packages/u-boot/u-boot-1.1.2/arm_flags.patch index 48c7b78043..48c7b78043 100644 --- a/packages/uboot/u-boot-1.1.2/arm_flags.patch +++ b/packages/u-boot/u-boot-1.1.2/arm_flags.patch diff --git a/packages/uboot/u-boot-1.1.2/cmd-arm-linux.patch b/packages/u-boot/u-boot-1.1.2/cmd-arm-linux.patch index e7ef37e061..e7ef37e061 100644 --- a/packages/uboot/u-boot-1.1.2/cmd-arm-linux.patch +++ b/packages/u-boot/u-boot-1.1.2/cmd-arm-linux.patch diff --git a/packages/uboot/u-boot-1.1.2/command-names.patch b/packages/u-boot/u-boot-1.1.2/command-names.patch index dd9a7fab44..dd9a7fab44 100644 --- a/packages/uboot/u-boot-1.1.2/command-names.patch +++ b/packages/u-boot/u-boot-1.1.2/command-names.patch diff --git a/packages/uboot/u-boot-1.1.2/mnci-jffs2.patch b/packages/u-boot/u-boot-1.1.2/mnci-jffs2.patch index 8b2571ad99..8b2571ad99 100644 --- a/packages/uboot/u-boot-1.1.2/mnci-jffs2.patch +++ b/packages/u-boot/u-boot-1.1.2/mnci-jffs2.patch diff --git a/packages/uboot/u-boot-1.1.2/mnci.patch b/packages/u-boot/u-boot-1.1.2/mnci.patch index d69cf8eb72..d69cf8eb72 100644 --- a/packages/uboot/u-boot-1.1.2/mnci.patch +++ b/packages/u-boot/u-boot-1.1.2/mnci.patch diff --git a/packages/uboot/u-boot-1.1.2/u-boot-1.1.2-neon.patch b/packages/u-boot/u-boot-1.1.2/u-boot-1.1.2-neon.patch index ed959d43d8..ed959d43d8 100644 --- a/packages/uboot/u-boot-1.1.2/u-boot-1.1.2-neon.patch +++ b/packages/u-boot/u-boot-1.1.2/u-boot-1.1.2-neon.patch diff --git a/packages/uboot/u-boot-1.1.2/u-boot-emetec.patch b/packages/u-boot/u-boot-1.1.2/u-boot-emetec.patch index ab3f106e71..ab3f106e71 100644 --- a/packages/uboot/u-boot-1.1.2/u-boot-emetec.patch +++ b/packages/u-boot/u-boot-1.1.2/u-boot-emetec.patch diff --git a/packages/u-boot/u-boot-1.1.4/.mtn2git_empty b/packages/u-boot/u-boot-1.1.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/.mtn2git_empty diff --git a/packages/uboot/u-boot-1.1.4/u-boot-autoscript.patch b/packages/u-boot/u-boot-1.1.4/u-boot-autoscript.patch index 1864b4494e..1864b4494e 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-autoscript.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-autoscript.patch diff --git a/packages/uboot/u-boot-1.1.4/u-boot-base.patch b/packages/u-boot/u-boot-1.1.4/u-boot-base.patch index d866c1c26e..d866c1c26e 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-base.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-base.patch diff --git a/packages/uboot/u-boot-1.1.4/u-boot-crc-warning-not-so-scary.patch b/packages/u-boot/u-boot-1.1.4/u-boot-crc-warning-not-so-scary.patch index b5736894c6..b5736894c6 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-crc-warning-not-so-scary.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-crc-warning-not-so-scary.patch diff --git a/packages/uboot/u-boot-1.1.4/u-boot-dht-walnut-df2.patch b/packages/u-boot/u-boot-1.1.4/u-boot-dht-walnut-df2.patch index d919ea504e..d919ea504e 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-dht-walnut-df2.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-dht-walnut-df2.patch diff --git a/packages/uboot/u-boot-1.1.4/u-boot-flash-protect-fixup.patch b/packages/u-boot/u-boot-1.1.4/u-boot-flash-protect-fixup.patch index 1bbbbcb32d..1bbbbcb32d 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-flash-protect-fixup.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-flash-protect-fixup.patch diff --git a/packages/uboot/u-boot-1.1.4/u-boot-fw_printenv.patch b/packages/u-boot/u-boot-1.1.4/u-boot-fw_printenv.patch index 5e33452d11..5e33452d11 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-fw_printenv.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-fw_printenv.patch diff --git a/packages/uboot/u-boot-1.1.4/u-boot-install.patch b/packages/u-boot/u-boot-1.1.4/u-boot-install.patch index 50c149c0a1..50c149c0a1 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-install.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-install.patch diff --git a/packages/uboot/u-boot-1.1.4/u-boot-jerase-cmd.patch b/packages/u-boot/u-boot-1.1.4/u-boot-jerase-cmd.patch index 698f7a2d78..698f7a2d78 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-jerase-cmd.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-jerase-cmd.patch diff --git a/packages/uboot/u-boot-1.1.4/u-boot-jffs2-new-nodetypes.patch b/packages/u-boot/u-boot-1.1.4/u-boot-jffs2-new-nodetypes.patch index cce41aca18..cce41aca18 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-jffs2-new-nodetypes.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-jffs2-new-nodetypes.patch diff --git a/packages/uboot/u-boot-1.1.4/u-boot-loadb-safe.patch b/packages/u-boot/u-boot-1.1.4/u-boot-loadb-safe.patch index d4b8ef3935..d4b8ef3935 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-loadb-safe.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-loadb-safe.patch diff --git a/packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch b/packages/u-boot/u-boot-1.1.4/u-boot-make381-fix.patch index 89555ac027..89555ac027 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-make381-fix.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-make381-fix.patch diff --git a/packages/uboot/u-boot-1.1.4/u-boot-mmc-init.patch b/packages/u-boot/u-boot-1.1.4/u-boot-mmc-init.patch index a18d4d3609..a18d4d3609 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-mmc-init.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-mmc-init.patch diff --git a/packages/uboot/u-boot-1.1.4/u-boot-mmcclk-alternate.patch b/packages/u-boot/u-boot-1.1.4/u-boot-mmcclk-alternate.patch index 5eb8324630..5eb8324630 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-mmcclk-alternate.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-mmcclk-alternate.patch diff --git a/packages/uboot/u-boot-1.1.4/u-boot-smc91x-multi.patch b/packages/u-boot/u-boot-1.1.4/u-boot-smc91x-multi.patch index 3f285e34dc..3f285e34dc 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-smc91x-multi.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-smc91x-multi.patch diff --git a/packages/uboot/u-boot-1.1.4/u-boot-zzz-osx.patch b/packages/u-boot/u-boot-1.1.4/u-boot-zzz-osx.patch index f9d52c7dfe..f9d52c7dfe 100644 --- a/packages/uboot/u-boot-1.1.4/u-boot-zzz-osx.patch +++ b/packages/u-boot/u-boot-1.1.4/u-boot-zzz-osx.patch diff --git a/packages/u-boot/u-boot-1.1.6/.mtn2git_empty b/packages/u-boot/u-boot-1.1.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/u-boot/u-boot-1.1.6/.mtn2git_empty diff --git a/packages/uboot/u-boot-1.1.6/devkit-idp.patch b/packages/u-boot/u-boot-1.1.6/devkit-idp.patch index 1460c3d1f0..1460c3d1f0 100644 --- a/packages/uboot/u-boot-1.1.6/devkit-idp.patch +++ b/packages/u-boot/u-boot-1.1.6/devkit-idp.patch diff --git a/packages/uboot/u-boot-1.1.6/sarge-uboot.patch b/packages/u-boot/u-boot-1.1.6/sarge-uboot.patch index 0c0d56f4d1..0c0d56f4d1 100644 --- a/packages/uboot/u-boot-1.1.6/sarge-uboot.patch +++ b/packages/u-boot/u-boot-1.1.6/sarge-uboot.patch diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-83xx-optimizations.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-83xx-optimizations.patch index fe85228771..fe85228771 100644 --- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-83xx-optimizations.patch +++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-83xx-optimizations.patch diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch index 5018cd3434..5018cd3434 100644 --- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch +++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-support-for-the-MPC832XEMDS-board.patch diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch index b5e2a87b16..b5e2a87b16 100644 --- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch +++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Add-the-MPC832XEMDS-board-readme.patch diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch index 23a9717e74..23a9717e74 100644 --- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch +++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Added-MPC8323E-RDB-board-support-2.patch diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch index ad2ff243e8..ad2ff243e8 100644 --- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch +++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-Fix-the-UEC-driver-bug-of-QE.patch diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch index 9e2829bd3e..9e2829bd3e 100644 --- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch +++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-UEC-remove-udelay.patch diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-mpc83xx-20061206.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-mpc83xx-20061206.patch index 5f3e1f7aaa..5f3e1f7aaa 100644 --- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-mpc83xx-20061206.patch +++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-mpc83xx-20061206.patch diff --git a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch index 30981dc43c..30981dc43c 100644 --- a/packages/uboot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch +++ b/packages/u-boot/u-boot-1.1.6/u-boot-1.1.6-fsl-1-streamline-the-83xx-immr-head-file.patch diff --git a/packages/u-boot/u-boot-1.2.0/.mtn2git_empty b/packages/u-boot/u-boot-1.2.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/u-boot/u-boot-1.2.0/.mtn2git_empty diff --git a/packages/uboot/u-boot-1.2.0/defconfig_lsppchd b/packages/u-boot/u-boot-1.2.0/defconfig_lsppchd index 5919f5eb2c..5919f5eb2c 100644 --- a/packages/uboot/u-boot-1.2.0/defconfig_lsppchd +++ b/packages/u-boot/u-boot-1.2.0/defconfig_lsppchd diff --git a/packages/uboot/u-boot-1.2.0/defconfig_lsppchg b/packages/u-boot/u-boot-1.2.0/defconfig_lsppchg index b9943b4c76..b9943b4c76 100644 --- a/packages/uboot/u-boot-1.2.0/defconfig_lsppchg +++ b/packages/u-boot/u-boot-1.2.0/defconfig_lsppchg diff --git a/packages/uboot/u-boot-1.2.0/env-Makefile.patch b/packages/u-boot/u-boot-1.2.0/env-Makefile.patch index f6e9cb39ae..f6e9cb39ae 100644 --- a/packages/uboot/u-boot-1.2.0/env-Makefile.patch +++ b/packages/u-boot/u-boot-1.2.0/env-Makefile.patch diff --git a/packages/u-boot/u-boot-1.2.0/fic-gta01/.mtn2git_empty b/packages/u-boot/u-boot-1.2.0/fic-gta01/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/u-boot/u-boot-1.2.0/fic-gta01/.mtn2git_empty diff --git a/packages/uboot/u-boot-1.2.0/fic-gta01/fw_env.config b/packages/u-boot/u-boot-1.2.0/fic-gta01/fw_env.config index 9fe07672c5..9fe07672c5 100644 --- a/packages/uboot/u-boot-1.2.0/fic-gta01/fw_env.config +++ b/packages/u-boot/u-boot-1.2.0/fic-gta01/fw_env.config diff --git a/packages/uboot/u-boot-1.2.0/fw_env.c.patch b/packages/u-boot/u-boot-1.2.0/fw_env.c.patch index 62f364ad4a..62f364ad4a 100644 --- a/packages/uboot/u-boot-1.2.0/fw_env.c.patch +++ b/packages/u-boot/u-boot-1.2.0/fw_env.c.patch diff --git a/packages/uboot/u-boot-1.2.0/fw_env.config b/packages/u-boot/u-boot-1.2.0/fw_env.config index 2432bd866c..2432bd866c 100644 --- a/packages/uboot/u-boot-1.2.0/fw_env.config +++ b/packages/u-boot/u-boot-1.2.0/fw_env.config diff --git a/packages/uboot/u-boot-1.2.0/kurobox_powerpc-20061105_target.gitdiff b/packages/u-boot/u-boot-1.2.0/kurobox_powerpc-20061105_target.gitdiff index 02027b1062..02027b1062 100644 --- a/packages/uboot/u-boot-1.2.0/kurobox_powerpc-20061105_target.gitdiff +++ b/packages/u-boot/u-boot-1.2.0/kurobox_powerpc-20061105_target.gitdiff diff --git a/packages/uboot/u-boot-1.2.0/qnap.diff b/packages/u-boot/u-boot-1.2.0/qnap.diff index b9ac34e6a8..b9ac34e6a8 100644 --- a/packages/uboot/u-boot-1.2.0/qnap.diff +++ b/packages/u-boot/u-boot-1.2.0/qnap.diff diff --git a/packages/uboot/u-boot-1.2.0/tools-Makefile.patch b/packages/u-boot/u-boot-1.2.0/tools-Makefile.patch index a44bc917d6..a44bc917d6 100644 --- a/packages/uboot/u-boot-1.2.0/tools-Makefile.patch +++ b/packages/u-boot/u-boot-1.2.0/tools-Makefile.patch diff --git a/packages/u-boot/u-boot-1.2.0/turbostation/.mtn2git_empty b/packages/u-boot/u-boot-1.2.0/turbostation/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/u-boot/u-boot-1.2.0/turbostation/.mtn2git_empty diff --git a/packages/uboot/u-boot-1.2.0/turbostation/fw_env.config b/packages/u-boot/u-boot-1.2.0/turbostation/fw_env.config index 2432bd866c..2432bd866c 100644 --- a/packages/uboot/u-boot-1.2.0/turbostation/fw_env.config +++ b/packages/u-boot/u-boot-1.2.0/turbostation/fw_env.config diff --git a/packages/uboot/u-boot-1.2.0/u-boot-kurobox-fdt.patch b/packages/u-boot/u-boot-1.2.0/u-boot-kurobox-fdt.patch index 182c3785c7..182c3785c7 100644 --- a/packages/uboot/u-boot-1.2.0/u-boot-kurobox-fdt.patch +++ b/packages/u-boot/u-boot-1.2.0/u-boot-kurobox-fdt.patch diff --git a/packages/uboot/u-boot-1.2.0/u-boot-kurobox.patch b/packages/u-boot/u-boot-1.2.0/u-boot-kurobox.patch index 79f7a8e48a..79f7a8e48a 100644 --- a/packages/uboot/u-boot-1.2.0/u-boot-kurobox.patch +++ b/packages/u-boot/u-boot-1.2.0/u-boot-kurobox.patch diff --git a/packages/uboot/u-boot-1.2.0/uboot-qnap.diff b/packages/u-boot/u-boot-1.2.0/uboot-qnap.diff index 2b2a17da7f..2b2a17da7f 100644 --- a/packages/uboot/u-boot-1.2.0/uboot-qnap.diff +++ b/packages/u-boot/u-boot-1.2.0/uboot-qnap.diff diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native/.mtn2git_empty b/packages/u-boot/u-boot-mkimage-openmoko-native/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/.mtn2git_empty diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch index d7a2a872e5..d7a2a872e5 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/bbt-create-optional.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch index 37b2807908..37b2807908 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/bbt-scan-second.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch index fa0de39ab7..fa0de39ab7 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/boot-from-ram-and-nand.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch index 53a3e05c67..53a3e05c67 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/boot-from-ram-reloc.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/boot-menu.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/boot-menu.patch index 352967ae06..352967ae06 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/boot-menu.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/boot-menu.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/cmd-unzip.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/cmd-unzip.patch index ee4c1984fc..ee4c1984fc 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/cmd-unzip.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/cmd-unzip.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/console-ansi.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/console-ansi.patch index 2ac5b75dee..2ac5b75dee 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/console-ansi.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/console-ansi.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/default-env.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/default-env.patch index b9ae4f29fe..b9ae4f29fe 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/default-env.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/default-env.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/dontask.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/dontask.patch index 23d4b13626..23d4b13626 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/dontask.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/dontask.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/dynenv-harden.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/dynenv-harden.patch index cf12352553..cf12352553 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/dynenv-harden.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/dynenv-harden.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/early-powerdown.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/early-powerdown.patch index 7326c2daa6..7326c2daa6 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/early-powerdown.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/early-powerdown.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch index dcb721c8d3..dcb721c8d3 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/enable-splash-bmp.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/env_nand_oob.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/env_nand_oob.patch index 5a2dd61461..5a2dd61461 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/env_nand_oob.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/env_nand_oob.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/ext2load_hex.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/ext2load_hex.patch index ff8e9cd6fc..ff8e9cd6fc 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/ext2load_hex.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/ext2load_hex.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch index 715c46ed81..715c46ed81 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/lowlevel_foo.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch index fcf54b9fd1..fcf54b9fd1 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/mmcinit-power-up.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-badisbad.patch index a5800e2499..a5800e2499 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/nand-badisbad.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-badisbad.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/nand-createbbt.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-createbbt.patch index 74b79da0a9..74b79da0a9 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/nand-createbbt.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-createbbt.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch index ecce004ca6..ecce004ca6 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-dynamic_partitions.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/nand-otp.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-otp.patch index b0e9bf4c4b..b0e9bf4c4b 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/nand-otp.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-otp.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch index 8360409e46..8360409e46 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/nand-read_write_oob.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch index 6f6af2c758..6f6af2c758 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/neo1973-chargefast.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/preboot-override.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/preboot-override.patch index f32cbde27b..f32cbde27b 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/preboot-override.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/preboot-override.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/raise-limits.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/raise-limits.patch index a1c381a2cf..a1c381a2cf 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/raise-limits.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/raise-limits.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/series b/packages/u-boot/u-boot-mkimage-openmoko-native/series index 4fc7d1342f..4fc7d1342f 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/series +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/series diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/splashimage-command.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/splashimage-command.patch index 8ea48cf484..8ea48cf484 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/splashimage-command.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/splashimage-command.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch index 7c70244b38..7c70244b38 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-neo1973.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch index 343598902f..343598902f 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-20061030-qt2410.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch index b39a268c84..b39a268c84 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-arm920_s3c2410_irq_demux.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch index b3d7bc1166..b3d7bc1166 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-arm920t-gd_in_irq.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch index 9b1febe956..9b1febe956 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-bbt-quiet.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch index 993ef4f6f2..993ef4f6f2 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cmd_s3c2410.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch index 349b83697e..349b83697e 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-cramfs_but_no_jffs2.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-dfu.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-dfu.patch index 1122f4894f..1122f4894f 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-dfu.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-dfu.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-gta02.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-gta02.patch index ca54ebeff7..ca54ebeff7 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-gta02.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-gta02.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch index f85fdea836..f85fdea836 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-hxd8.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-license.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch index 227a97e71a..227a97e71a 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-license.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-license.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch index db3cee6e99..db3cee6e99 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-machtypes.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch index a44434155e..a44434155e 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-mokoversion.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch index d630889e3c..d630889e3c 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-nand-markbad-reallybad.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch index 7e3aa4f480..7e3aa4f480 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-neo1973-defaultenv.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch index 19d912620d..19d912620d 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-neo1973-resume.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch index 6efe24651a..6efe24651a 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-misccr-definitions.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch index b775beaa07..b775beaa07 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-mmc.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch index dc363bbbab..dc363bbbab 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-nand.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch index 0d5a49771d..0d5a49771d 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-norelocate_irqvec_cpy.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch index 8cc442a865..8cc442a865 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410-warnings-fix.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch index b50853554b..b50853554b 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_fb.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch index 16bee3e26a..16bee3e26a 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2410_udc.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch index da0fb8cf2d..da0fb8cf2d 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2440.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch index 62ae5592ab..62ae5592ab 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-s3c2443.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch index 09392ad2cf..09392ad2cf 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2440.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch index 5757cc078b..5757cc078b 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-smdk2443.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch index a88e94b006..a88e94b006 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-strtoul.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch index 722a227aa6..722a227aa6 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/uboot-usbtty-acm.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch index 680b301620..680b301620 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/unbusy-i2c.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch index 339289699a..339289699a 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/usbdcore-multiple_configs.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch b/packages/u-boot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch index 132a9f8da5..132a9f8da5 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch +++ b/packages/u-boot/u-boot-mkimage-openmoko-native/wakeup-reason-nand-only.patch diff --git a/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb b/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb index e7812a5ed0..08c0062fab 100644 --- a/packages/uboot/u-boot-mkimage-openmoko-native_oe.bb +++ b/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb @@ -1,4 +1,4 @@ -require uboot-openmoko_svn.bb +require u-boot-openmoko_svn.bb inherit native diff --git a/packages/u-boot/u-boot-omap2430sdp-1.1.4/.mtn2git_empty b/packages/u-boot/u-boot-omap2430sdp-1.1.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/u-boot/u-boot-omap2430sdp-1.1.4/.mtn2git_empty diff --git a/packages/uboot/u-boot-omap2430sdp-1.1.4/u-boot-makefile-3.81.patch b/packages/u-boot/u-boot-omap2430sdp-1.1.4/u-boot-makefile-3.81.patch index f45a1d3aa3..f45a1d3aa3 100644 --- a/packages/uboot/u-boot-omap2430sdp-1.1.4/u-boot-makefile-3.81.patch +++ b/packages/u-boot/u-boot-omap2430sdp-1.1.4/u-boot-makefile-3.81.patch diff --git a/packages/uboot/u-boot-omap2430sdp_1.1.4.bb b/packages/u-boot/u-boot-omap2430sdp_1.1.4.bb index 4dcc989107..4dcc989107 100644 --- a/packages/uboot/u-boot-omap2430sdp_1.1.4.bb +++ b/packages/u-boot/u-boot-omap2430sdp_1.1.4.bb diff --git a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb b/packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb index 1cee1edf37..1cee1edf37 100644 --- a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb +++ b/packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/u-boot/u-boot-openmoko_svn.bb index 1e59e0746d..550ff5d499 100644 --- a/packages/uboot/uboot-openmoko_svn.bb +++ b/packages/u-boot/u-boot-openmoko_svn.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" PROVIDES = "virtual/bootloader" LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}" PV = "1.3.1${LOCALVERSION}" -PR = "r1" +PR = "r2" SRCREV_FORMAT = "patches" @@ -20,6 +20,7 @@ SRC_URI = "\ file://uboot-eabi-fix-HACK.patch \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ file://makefile-no-dirafter.patch;patch=1 \ + file://boot-menu-gfx-fix-openmoko-bug-1140.patch;patch=1 \ " S = "${WORKDIR}/git" @@ -27,14 +28,13 @@ EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" TARGET_LDFLAGS = "" do_quilt() { - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - rm -Rf patches .pc + mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av + rm -Rf patches .pc } do_svnrev() { mv -f tools/setlocalversion tools/setlocalversion.old - echo -n "echo " >>tools/setlocalversion - echo ${PV} >>tools/setlocalversion + echo "echo ${LOCALVERSION}" >>tools/setlocalversion } do_configure_prepend() { @@ -44,27 +44,25 @@ do_configure_prepend() { } do_compile () { - chmod +x board/neo1973/gta*/split_by_variant.sh - for mach in ${UBOOT_MACHINES} - do - oe_runmake ${mach}_config - oe_runmake clean - find board -name lowlevel_foo.bin -exec rm '{}' \; - oe_runmake all - oe_runmake u-boot.udfu - if [ -f u-boot.udfu ]; then - mv u-boot.udfu u-boot_${mach}.bin - else - mv u-boot.bin u-boot_${mach}.bin - fi - if [ -f board/${mach}/lowlevel_foo.bin ]; then - mv board/${mach}/lowlevel_foo.bin \ - lowlevel_foo_${mach}.bin - else - find board -name lowlevel_foo.bin \ - -exec mv '{}' lowlevel_foo_${mach}.bin \; - fi - done + chmod +x board/neo1973/gta*/split_by_variant.sh + for mach in ${UBOOT_MACHINES} + do + oe_runmake ${mach}_config + oe_runmake clean + find board -name lowlevel_foo.bin -exec rm '{}' \; + oe_runmake all + oe_runmake u-boot.udfu + if [ -f u-boot.udfu ]; then + mv u-boot.udfu u-boot_${mach}.bin + else + mv u-boot.bin u-boot_${mach}.bin + fi + if [ -f board/${mach}/lowlevel_foo.bin ]; then + mv board/${mach}/lowlevel_foo.bin lowlevel_foo_${mach}.bin + else + find board -name lowlevel_foo.bin -exec mv '{}' lowlevel_foo_${mach}.bin \; + fi + done } do_deploy () { diff --git a/packages/uboot/u-boot-utils-native_1.2.0.bb b/packages/u-boot/u-boot-utils-native_1.2.0.bb index b04b366ffe..b04b366ffe 100644 --- a/packages/uboot/u-boot-utils-native_1.2.0.bb +++ b/packages/u-boot/u-boot-utils-native_1.2.0.bb diff --git a/packages/uboot/u-boot-utils_1.2.0.bb b/packages/u-boot/u-boot-utils_1.2.0.bb index 1734b41a0e..1734b41a0e 100644 --- a/packages/uboot/u-boot-utils_1.2.0.bb +++ b/packages/u-boot/u-boot-utils_1.2.0.bb diff --git a/packages/uboot/u-boot.inc b/packages/u-boot/u-boot.inc index 9f7356d5d7..9f7356d5d7 100644 --- a/packages/uboot/u-boot.inc +++ b/packages/u-boot/u-boot.inc diff --git a/packages/uboot/u-boot_1.1.2.bb b/packages/u-boot/u-boot_1.1.2.bb index 82b169ccc4..82b169ccc4 100644 --- a/packages/uboot/u-boot_1.1.2.bb +++ b/packages/u-boot/u-boot_1.1.2.bb diff --git a/packages/uboot/u-boot_1.1.4.bb b/packages/u-boot/u-boot_1.1.4.bb index 7a92b57c34..7a92b57c34 100644 --- a/packages/uboot/u-boot_1.1.4.bb +++ b/packages/u-boot/u-boot_1.1.4.bb diff --git a/packages/uboot/u-boot_1.1.6.bb b/packages/u-boot/u-boot_1.1.6.bb index e003c69d7b..e003c69d7b 100644 --- a/packages/uboot/u-boot_1.1.6.bb +++ b/packages/u-boot/u-boot_1.1.6.bb diff --git a/packages/uboot/u-boot_1.2.0.bb b/packages/u-boot/u-boot_1.2.0.bb index f1075bb00b..f1075bb00b 100644 --- a/packages/uboot/u-boot_1.2.0.bb +++ b/packages/u-boot/u-boot_1.2.0.bb diff --git a/packages/uboot/u-boot_1.3.0.bb b/packages/u-boot/u-boot_1.3.0.bb index 2886ddecc8..2886ddecc8 100644 --- a/packages/uboot/u-boot_1.3.0.bb +++ b/packages/u-boot/u-boot_1.3.0.bb diff --git a/packages/uboot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb index 60ab0ab3f6..60ab0ab3f6 100644 --- a/packages/uboot/u-boot_git.bb +++ b/packages/u-boot/u-boot_git.bb diff --git a/packages/uicmoc/uicmoc4-native.inc b/packages/uicmoc/uicmoc4-native.inc index 8f0c715a89..298c103fb1 100644 --- a/packages/uicmoc/uicmoc4-native.inc +++ b/packages/uicmoc/uicmoc4-native.inc @@ -27,8 +27,8 @@ EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \ EXTRA_OEMAKE = " " do_configure() { - sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" + sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro + echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" } TOBUILD = "\ @@ -45,17 +45,18 @@ TOBUILD = "\ " do_compile() { - unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS - for i in ${TOBUILD}; do - cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" - done + unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS + for i in ${TOBUILD}; + do + cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" + done } do_stage() { - install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 - install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 - install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 - install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 - install -d ${STAGING_DIR_NATIVE}/qt4/ - install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/ + install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 + install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 + install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 + install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 + install -d ${STAGING_DIR_NATIVE}/qt4/ + install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/ } diff --git a/packages/uicmoc/uicmoc4-native_4.3.2.bb b/packages/uicmoc/uicmoc4-native_4.3.3.bb index 1950f63068..1950f63068 100644 --- a/packages/uicmoc/uicmoc4-native_4.3.2.bb +++ b/packages/uicmoc/uicmoc4-native_4.3.3.bb diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch new file mode 100644 index 0000000000..a935bc57de --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch @@ -0,0 +1,13 @@ +--- xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c.old 2007-12-24 04:54:13.000000000 -0600 ++++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2007-12-25 01:13:27.000000000 -0600 +@@ -357,10 +357,7 @@ fbdevMapFramebuffer (KdScreenInfo *scree + KdMouseMatrix m; + FbdevPriv *priv = screen->card->driver; + +- if (scrpriv->randr != RR_Rotate_0 || priv->Have18Bpp) + scrpriv->shadow = TRUE; +- else +- scrpriv->shadow = FALSE; + + KdComputeMouseMatrix (&m, scrpriv->randr, screen->width, screen->height); + diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb index 83ef9ea611..71d0eccba8 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r21" +PR = "r23" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ @@ -33,6 +33,9 @@ SRC_URI_append_avr32 = " \ file://xorg-avr32-support.diff;patch=1 \ " +SRC_URI_append_tosa = "file://tosa-fbdev.patch;patch=1" +PACKAGE_ARCH_xserver-kdrive-fbdev_tosa = "${MACHINE_ARCH}" + S = "${WORKDIR}/xorg-server-${PV}" W100_OECONF = "--disable-w100" diff --git a/packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch b/packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch new file mode 100644 index 0000000000..723d8bd956 --- /dev/null +++ b/packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch @@ -0,0 +1,72 @@ +--- xscreensaver-4.22/configure.in.orig 2007-12-23 18:33:43.000000000 +0000 ++++ xscreensaver-4.22/configure.in 2007-12-23 18:35:33.000000000 +0000 +@@ -944,9 +944,6 @@ + # + AC_DEFUN(AC_CHECK_X_HEADER, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_CHECK_HEADER([$1],[$2],[$3],[$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -955,9 +952,6 @@ + # + AC_DEFUN(AC_EGREP_X_HEADER, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_EGREP_HEADER([$1], [$2], [$3], [$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -966,9 +960,6 @@ + # + AC_DEFUN(AC_TRY_X_COMPILE, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_TRY_COMPILE([$1], [$2], [$3], [$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -982,9 +973,6 @@ + ac_save_LDFLAGS="$LDFLAGS" + # ac_save_LIBS="$LIBS" + +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + +@@ -1005,9 +993,6 @@ + # + AC_DEFUN(AC_TRY_X_RUN, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_TRY_RUN([$1], [$2], [$3], [$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -2763,9 +2748,6 @@ + EOF + + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + + mglv=`(eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | grep configure:` +@@ -3395,9 +3377,6 @@ + DEPEND_DEFINES= + + +-if test \! -z "$includedir" ; then +- INCLUDES="$INCLUDES -I$includedir" +-fi + + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb index 6c2776d6aa..cac3776724 100644 --- a/packages/xscreensaver/xscreensaver_4.22.bb +++ b/packages/xscreensaver/xscreensaver_4.22.bb @@ -8,9 +8,12 @@ SECTION = "x11-misc" LICENSE = "BSD" DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade" +PR = "r1" + SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \ file://fixes.patch;patch=1 \ file://configure.in.patch;patch=1 \ + file://configure.in-includedir.patch;patch=1 \ file://XScreenSaver" # xscreensaver-demo is a glade app @@ -35,6 +38,8 @@ FILES_xscreensaver-extra="${bindir}/xscreensaver-getimage*" do_configure_prepend() { sed -i 's:GTK_DATADIR="$GTK_DATADIR/share":GTK_DATADIR="${datadir}":' ${S}/configure.in + + export includedir="/lib" } do_compile() { diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb index f98ece35d7..052560dcc9 100644 --- a/packages/zaurus-updater/zaurus-updater.bb +++ b/packages/zaurus-updater/zaurus-updater.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update" DEPENDS = "encdec-updater-native" LICENSE = "zaurus-updater" -PR = "r18" +PR = "r20" PACKAGES = "" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -11,6 +11,10 @@ SRC_URI = "file://updater.sh \ file://gnu-tar.gz" S = "${WORKDIR}" +do_configure() { + sed -i "s/ZAURUS_UPDATER_VERSION/${PR}/" "${S}/updater.sh" +} + do_compile() { encdec-updater -e updater.sh } diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh index 2efa946f6c..22d4b3914d 100644 --- a/packages/zaurus-updater/zaurus-updater/updater.sh +++ b/packages/zaurus-updater/zaurus-updater/updater.sh @@ -34,6 +34,17 @@ # - Reformatted file - please use spaces not tabs # - "version check" is only on Tosa and Poodle - breaks other machines # +# 2007.12.23 Matthias 'CoreDump' Hentges +# - Fix kernel install on spitz machines +# - Unify format of do_flashing()... +# - Display ${PR} of zaurus-updater.bb to the user +# - Polish HDD installer messages +# +# 2007.12.25 Matthias 'CoreDump' Hentges +# -Add support for installing / updating u-boot + +# Set to "yes" to enable +ENABLE_UBOOT_UPDATER="no" DATAPATH=$1 TMPPATH=/tmp/update @@ -120,16 +131,19 @@ check_for_tar() do_rootfs_extraction() { UNPACKED_ROOTFS=1 - echo 'HDD root file system' + echo 'Installing HDD root file system' if [ ! -f /hdd1/NotAvailable ]; then umount /hdd1 fi - echo 'Now formatting...' + echo -n '* Now formatting...' mke2fs $MKE2FSOPT /dev/${IDE1}1 > /dev/null 2>&1 e2fsck -p /dev/${IDE1}1 > /dev/null if [ "$?" != "0" ]; then + echo "FAILED" echo "Error: Unable to create filesystem on microdrive!" exit "$?" + else + echo "Done" fi mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1 @@ -139,14 +153,17 @@ do_rootfs_extraction() fi cd /hdd1 - echo 'Now extracting...' + echo -n '* Now extracting (this can take over 5m)...' gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf - if [ "$?" != "0" ]; then + echo "FAILED" echo "Error: Unable to extract root filesystem archive!" exit "$?" + else + echo "Done" fi - echo 'Done.' + echo 'HDD Installation Finished.' # remount as RO cd / @@ -156,60 +173,67 @@ do_rootfs_extraction() do_flashing() { - if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ] - then - echo "Error: File is too big to flash!" - echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]" - return - fi - - if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ] - then - #check version - /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD - if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1 - then - #no version info... - rm -f $TMPHEAD > /dev/null 2>&1 - DATAPOS=0 - fi - fi - - if [ $ISFORMATTED = 0 ] - then - /sbin/eraseall $TARGET_MTD > /dev/null 2>&1 - ISFORMATTED=1 - fi - - echo '' - echo '0% 100%' - PROGSTEP=`expr $DATASIZE / $ONESIZE + 1` - PROGSTEP=`expr 25 / $PROGSTEP` - if [ $PROGSTEP = 0 ] - then - PROGSTEP=1 - fi - - if [ -e $TMPHEAD ] - then - VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp' - MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp' - /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 - /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 - - /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 - /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 - fi - - # Looks like Akita is quite unique when it comes to kernel flashing + if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ] + then + echo "Error: File is too big to flash!" + echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]" + return + fi + + if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ] + then + #check version + /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD + + if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1 + then + #no version info... + rm -f $TMPHEAD > /dev/null 2>&1 + DATAPOS=0 + fi + fi + + if [ $ISFORMATTED = 0 ] + then + /sbin/eraseall $TARGET_MTD > /dev/null 2>&1 + ISFORMATTED=1 + fi + + if [ -e $TMPHEAD ] + then + VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp' + MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp' + /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 + /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 + + /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 + /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1 + fi + + # Looks like Akita and Spitz are unique when it comes to kernel flashing - if [ "$ZAURUS" = "akita" ] && [ $FLASH_TYPE = kernel ]; then - echo $TARGETFILE':'$DATASIZE'bytes' - echo ' ' > /tmp/data - /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1 - /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1 - /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1 - else + if [ "$ZAURUS" = "akita" -o "$ZAURUS" = "c3x00" ] && [ "$FLASH_TYPE" = "kernel" ] + then +# echo $TARGETFILE':'$DATASIZE'bytes' + echo "" + echo -n "Installing SL-Cxx00 kernel..." + echo ' ' > /tmp/data + test "$ZAURUS" = "akita" && /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1 + /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1 + test "$ZAURUS" = "akita" && /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1 + echo "Done" + else + + echo '' + echo '0% 100%' + PROGSTEP=`expr $DATASIZE / $ONESIZE + 1` + PROGSTEP=`expr 25 / $PROGSTEP` + + if [ $PROGSTEP = 0 ] + then + PROGSTEP=1 + fi + #loop while [ $DATAPOS -lt $DATASIZE ] do @@ -246,27 +270,76 @@ do_flashing() done done fi - echo '' - - #finish - rm -f $TMPPATH/*.bin > /dev/null 2>&1 + echo '' + + #finish + rm -f $TMPPATH/*.bin > /dev/null 2>&1 + + if [ $RESULT = 0 ] + then + if [ -e $VTMPNAME ] + then + /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 + rm -f $VTMPNAME > /dev/null 2>&1 + fi + + if [ -e $MTMPNAME ] + then + /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 + rm -f $MTMPNAME > /dev/null 2>&1 + fi + + [ "$FLASH_TYPE" != "kernel" ] && echo 'Done.' + else + echo 'Error!' + fi +} - if [ $RESULT = 0 ] - then - if [ -e $VTMPNAME ] - then - /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1 - rm -f $VTMPNAME > /dev/null 2>&1 - fi - if [ -e $MTMPNAME ] - then - /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1 - rm -f $MTMPNAME > /dev/null 2>&1 - fi - echo 'Done.' - else - echo 'Error!' - fi +update_uboot() { + # The flashing part of this function is based on pdaXrom's + # updater.sh + + if test "$ENABLE_UBOOT_UPDATER" != "yes" -o -z "$1" + then + echo "u-boot updates not allowed." + return + fi + + echo "" + echo "Installing u-boot bootloader:" + + DATASIZE=`wc -c $TARGETFILE` + FSIZE=`echo $DATASIZE | cut -d' ' -f1` + + echo -n "* Creating backup ($FSIZE Bytes)..." + if ( nandlogical /dev/mtd1 READ 0 $FSIZE /tmp/sharploader.bin ) > /dev/null 2>&1 + then + echo "Ok" + + echo -n "* Flashing u-boot..." + if ( nandlogical /dev/mtd1 WRITE 0 $FSIZE $1 ) > /dev/null 2>&1 + then + echo "Success" + else + echo "FAILED" + echo "ERROR: Installation of u-boot failed!" + + echo -n "* Trying to restore backup..." + if ( nandlogical /dev/mtd1 WRITE 0 $FSIZE /tmp/sharploader.bin ) > /dev/null 2>&1 + then + echo "Success" + echo "Your old bootloader has been restored" + else + echo "FAILED" + echo "Sorry, it's NAND-Restore time for you =(" + fi + fi + else + echo "FAILED" + echo "Could not create backup, aborting!" + echo "Your bootloader has not been altered in any way." + exit 1 + fi } ### Check model ### @@ -300,13 +373,15 @@ case "$MODEL" in ;; esac +clear +echo "---- Universal Zaurus Updater ZAURUS_UPDATER_VERSION ----" echo 'MODEL: '$MODEL' ('$ZAURUS')' mkdir -p $TMPPATH > /dev/null 2>&1 cd $DATAPATH/ -for TARGETFILE in zimage zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN hdimage1.tgz HDIMAGE1.TGZ +for TARGETFILE in u-boot.bin U-BOOT.BIN zimage zImage zImage.bin zimage.bin ZIMAGE ZIMAGE.BIN initrd.bin INITRD.BIN hdimage1.tgz HDIMAGE1.TGZ do if [ ! -e $TARGETFILE ] then @@ -366,10 +441,18 @@ do hdimage1.tgz) if [ $UNPACKED_ROOTFS = 0 ] then - do_rootfs_extraction + do_rootfs_extraction fi ;; - + + u-boot.bin) + if [ FLASHED_UBOOT != 1 ] + then + update_uboot "$TARGETFILE" + FLASHED_UBOOT="1" + fi + ;; + *) ;; esac diff --git a/packages/zaurusd/files/alsa-6000x-default.state.patch b/packages/zaurusd/files/alsa-6000x-default.state.patch new file mode 100644 index 0000000000..e019f3a117 --- /dev/null +++ b/packages/zaurusd/files/alsa-6000x-default.state.patch @@ -0,0 +1,750 @@ +--- zaurusd/config/alsa/6000x-default.state.old 2007-12-22 04:31:38.000000000 -0600 ++++ zaurusd/config/alsa/6000x-default.state 2007-12-26 00:06:02.000000000 -0600 +@@ -37,13 +37,23 @@ state.Tosa { + } + control.5 { + comment.access 'read write' ++ comment.type INTEGER ++ comment.count 2 ++ comment.range '0 - 31' ++ iface MIXER ++ name 'PCM Playback Volume' ++ value.0 23 ++ value.1 23 ++ } ++ control.6 { ++ comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Speaker Playback ZC Switch' + value true + } +- control.6 { ++ control.7 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -51,7 +61,7 @@ state.Tosa { + name 'Speaker Playback Invert Switch' + value true + } +- control.7 { ++ control.8 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -59,7 +69,7 @@ state.Tosa { + name 'Headphone Playback ZC Switch' + value true + } +- control.8 { ++ control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -67,7 +77,7 @@ state.Tosa { + name 'Mono Playback ZC Switch' + value false + } +- control.9 { ++ control.10 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -76,7 +86,7 @@ state.Tosa { + name 'Mono Playback Volume' + value 0 + } +- control.10 { ++ control.11 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -85,16 +95,16 @@ state.Tosa { + name 'ALC Target Volume' + value 11 + } +- control.11 { ++ control.12 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name 'ALC Hold Time' +- value 0 ++ value 2 + } +- control.12 { ++ control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -103,7 +113,7 @@ state.Tosa { + name 'ALC Decay Time' + value 3 + } +- control.13 { ++ control.14 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -112,7 +122,7 @@ state.Tosa { + name 'ALC Attack Time' + value 2 + } +- control.14 { ++ control.15 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 +@@ -124,7 +134,7 @@ state.Tosa { + name 'ALC Function' + value None + } +- control.15 { ++ control.16 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -133,7 +143,7 @@ state.Tosa { + name 'ALC Max Volume' + value 7 + } +- control.16 { ++ control.17 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -142,7 +152,7 @@ state.Tosa { + name 'ALC ZC Timeout' + value 0 + } +- control.17 { ++ control.18 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -150,7 +160,7 @@ state.Tosa { + name 'ALC ZC Switch' + value false + } +- control.18 { ++ control.19 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -158,7 +168,7 @@ state.Tosa { + name 'ALC NG Switch' + value false + } +- control.19 { ++ control.20 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 +@@ -168,7 +178,7 @@ state.Tosa { + name 'ALC NG Type' + value 'Constant Gain' + } +- control.20 { ++ control.21 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -177,16 +187,16 @@ state.Tosa { + name 'ALC NG Threshold' + value 31 + } +- control.21 { ++ control.22 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'Mic Headphone Volume' +- value 3 ++ value 7 + } +- control.22 { ++ control.23 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -195,7 +205,7 @@ state.Tosa { + name 'ALC Headphone Volume' + value 5 + } +- control.23 { ++ control.24 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -203,7 +213,7 @@ state.Tosa { + name 'Out3 Switch' + value false + } +- control.24 { ++ control.25 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -211,7 +221,7 @@ state.Tosa { + name 'Out3 ZC Switch' + value true + } +- control.25 { ++ control.26 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -220,7 +230,7 @@ state.Tosa { + name 'Out3 Volume' + value 0 + } +- control.26 { ++ control.27 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -229,7 +239,7 @@ state.Tosa { + name 'PCBeep Bypass Headphone Volume' + value 0 + } +- control.27 { ++ control.28 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -238,7 +248,7 @@ state.Tosa { + name 'PCBeep Bypass Speaker Volume' + value 0 + } +- control.28 { ++ control.29 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -247,16 +257,16 @@ state.Tosa { + name 'PCBeep Bypass Phone Volume' + value 0 + } +- control.29 { ++ control.30 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'Aux Playback Headphone Volume' +- value 6 ++ value 5 + } +- control.30 { ++ control.31 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -265,7 +275,7 @@ state.Tosa { + name 'Aux Playback Speaker Volume' + value 0 + } +- control.31 { ++ control.32 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -274,7 +284,7 @@ state.Tosa { + name 'Aux Playback Phone Volume' + value 0 + } +- control.32 { ++ control.33 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -283,7 +293,7 @@ state.Tosa { + name 'Phone Volume' + value 0 + } +- control.33 { ++ control.34 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 +@@ -293,7 +303,7 @@ state.Tosa { + value.0 23 + value.1 23 + } +- control.34 { ++ control.35 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -301,7 +311,7 @@ state.Tosa { + name 'Capture 20dB Boost Switch' + value true + } +- control.35 { ++ control.36 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -309,7 +319,7 @@ state.Tosa { + name 'Capture to Phone 20dB Boost Switch' + value true + } +- control.36 { ++ control.37 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -317,7 +327,7 @@ state.Tosa { + name '3D Upper Cut-off Switch' + value false + } +- control.37 { ++ control.38 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -325,7 +335,7 @@ state.Tosa { + name '3D Lower Cut-off Switch' + value false + } +- control.38 { ++ control.39 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -334,7 +344,7 @@ state.Tosa { + name '3D Playback Volume' + value 0 + } +- control.39 { ++ control.40 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 +@@ -344,7 +354,7 @@ state.Tosa { + name 'Bass Control' + value 'Adaptive Boost' + } +- control.40 { ++ control.41 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -352,7 +362,7 @@ state.Tosa { + name 'Bass Cut-off Switch' + value true + } +- control.41 { ++ control.42 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -360,7 +370,7 @@ state.Tosa { + name 'Tone Cut-off Switch' + value false + } +- control.42 { ++ control.43 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -368,7 +378,7 @@ state.Tosa { + name 'Playback Attenuate (-6dB) Switch' + value false + } +- control.43 { ++ control.44 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -377,7 +387,7 @@ state.Tosa { + name 'Bass Volume' + value 8 + } +- control.44 { ++ control.45 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -386,7 +396,7 @@ state.Tosa { + name 'Treble Volume' + value 5 + } +- control.45 { ++ control.46 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -394,7 +404,7 @@ state.Tosa { + name 'Capture ADC Switch' + value false + } +- control.46 { ++ control.47 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 2 +@@ -405,17 +415,17 @@ state.Tosa { + value.0 '+0.75dB Steps' + value.1 '+0.75dB Steps' + } +- control.47 { ++ control.48 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 63' + iface MIXER + name 'Capture Volume' +- value.0 63 +- value.1 63 ++ value.0 0 ++ value.1 0 + } +- control.48 { ++ control.49 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -423,7 +433,7 @@ state.Tosa { + name 'Capture ZC Switch' + value false + } +- control.49 { ++ control.50 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -432,7 +442,7 @@ state.Tosa { + name 'Mic 1 Volume' + value 23 + } +- control.50 { ++ control.51 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 +@@ -441,7 +451,7 @@ state.Tosa { + name 'Mic 2 Volume' + value 23 + } +- control.51 { ++ control.52 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -449,7 +459,7 @@ state.Tosa { + name 'Mic 20dB Boost Switch' + value false + } +- control.52 { ++ control.53 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -457,7 +467,7 @@ state.Tosa { + name 'Speaker Mixer PCBeep Bypass Swi' + value false + } +- control.53 { ++ control.54 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -465,7 +475,7 @@ state.Tosa { + name 'Speaker Mixer Aux Playback Swit' + value false + } +- control.54 { ++ control.55 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -473,7 +483,7 @@ state.Tosa { + name 'Speaker Mixer Phone Bypass Swit' + value false + } +- control.55 { ++ control.56 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -481,7 +491,7 @@ state.Tosa { + name 'Speaker Mixer Line Bypass Switc' + value false + } +- control.56 { ++ control.57 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -489,7 +499,7 @@ state.Tosa { + name 'Speaker Mixer PCM Playback Swit' + value true + } +- control.57 { ++ control.58 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -497,7 +507,7 @@ state.Tosa { + name 'Phone Mixer PCBeep Bypass Switc' + value false + } +- control.58 { ++ control.59 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -505,7 +515,7 @@ state.Tosa { + name 'Phone Mixer Aux Playback Switch' + value false + } +- control.59 { ++ control.60 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -513,7 +523,7 @@ state.Tosa { + name 'Phone Mixer Line Bypass Switch' + value false + } +- control.60 { ++ control.61 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -521,7 +531,7 @@ state.Tosa { + name 'Phone Mixer PCM Playback Switch' + value false + } +- control.61 { ++ control.62 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -529,7 +539,7 @@ state.Tosa { + name 'Phone Mixer Mic 1 Sidetone Swit' + value false + } +- control.62 { ++ control.63 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 +@@ -537,55 +547,103 @@ state.Tosa { + name 'Phone Mixer Mic 2 Sidetone Swit' + value false + } +- control.63 { ++ control.64 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER +- name 'HP Mixer PCBeep Bypass Switch' ++ name 'Right HP Mixer PCBeep Bypass Sw' + value false + } +- control.64 { ++ control.65 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER +- name 'HP Mixer Aux Playback Switch' ++ name 'Right HP Mixer Aux Playback Swi' + value false + } +- control.65 { ++ control.66 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER +- name 'HP Mixer Phone Bypass Switch' ++ name 'Right HP Mixer Phone Bypass Swi' + value false + } +- control.66 { ++ control.67 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER +- name 'HP Mixer Line Bypass Switch' ++ name 'Right HP Mixer Line Bypass Swit' + value false + } +- control.67 { ++ control.68 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER +- name 'HP Mixer PCM Playback Switch' ++ name 'Right HP Mixer PCM Playback Swi' + value true + } +- control.68 { ++ control.69 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER +- name 'HP Mixer Mic Sidetone Switch' ++ name 'Right HP Mixer Mic Sidetone Swi' + value false + } +- control.69 { ++ control.70 { ++ comment.access 'read write' ++ comment.type BOOLEAN ++ comment.count 1 ++ iface MIXER ++ name 'Left HP Mixer PCBeep Bypass Swi' ++ value false ++ } ++ control.71 { ++ comment.access 'read write' ++ comment.type BOOLEAN ++ comment.count 1 ++ iface MIXER ++ name 'Left HP Mixer Aux Playback Swit' ++ value false ++ } ++ control.72 { ++ comment.access 'read write' ++ comment.type BOOLEAN ++ comment.count 1 ++ iface MIXER ++ name 'Left HP Mixer Phone Bypass Swit' ++ value false ++ } ++ control.73 { ++ comment.access 'read write' ++ comment.type BOOLEAN ++ comment.count 1 ++ iface MIXER ++ name 'Left HP Mixer Line Bypass Switc' ++ value false ++ } ++ control.74 { ++ comment.access 'read write' ++ comment.type BOOLEAN ++ comment.count 1 ++ iface MIXER ++ name 'Left HP Mixer PCM Playback Swit' ++ value true ++ } ++ control.75 { ++ comment.access 'read write' ++ comment.type BOOLEAN ++ comment.count 1 ++ iface MIXER ++ name 'Left HP Mixer Mic Sidetone Swit' ++ value false ++ } ++ control.76 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 +@@ -595,7 +653,7 @@ state.Tosa { + name 'Differential Source' + value Mic + } +- control.70 { ++ control.77 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 +@@ -607,7 +665,7 @@ state.Tosa { + name 'Mic Select Source' + value Differential + } +- control.71 { ++ control.78 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 +@@ -623,7 +681,7 @@ state.Tosa { + name 'Right Capture Select' + value Mic + } +- control.72 { ++ control.79 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 +@@ -639,7 +697,7 @@ state.Tosa { + name 'Left Capture Select' + value Mic + } +- control.73 { ++ control.80 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 +@@ -651,7 +709,7 @@ state.Tosa { + name 'Capture Phone Mux' + value Mute + } +- control.74 { ++ control.81 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 +@@ -661,7 +719,7 @@ state.Tosa { + name 'Speaker Mux' + value 'Headphone Mix' + } +- control.75 { ++ control.82 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 +@@ -673,7 +731,7 @@ state.Tosa { + name 'Out3 Mux' + value Left + } +- control.76 { ++ control.83 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 +@@ -685,7 +743,7 @@ state.Tosa { + name 'ALC Sidetone Mux' + value Stereo + } +- control.77 { ++ control.84 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 +@@ -698,15 +756,14 @@ state.Tosa { + name 'Jack Function' + value Headphone + } +- control.78 { ++ control.85 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 +- comment.item.0 Auto +- comment.item.1 On +- comment.item.2 Off ++ comment.item.0 On ++ comment.item.1 Off + iface MIXER + name 'Speaker Function' +- value Auto ++ value On + } + } diff --git a/packages/zaurusd/files/zaurus-hinge.bl-off b/packages/zaurusd/files/zaurus-hinge.bl-off index ec3cefb2ca..ba6746ce1b 100644 --- a/packages/zaurusd/files/zaurus-hinge.bl-off +++ b/packages/zaurusd/files/zaurus-hinge.bl-off @@ -6,13 +6,14 @@ # Filename: zaurus-hinge.bl-off # Date: 04-Jun-06 -#test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin" -#${ZD_BINDIR}/bl off - - -STEP=5 DRIVER="`ls /sys/class/backlight/|head -n 1`" BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness" -cat "$BRIGHTNESS_FILE" > /var/run/display_brightness.tmp -echo 0 > "$BRIGHTNESS_FILE" +if mkdir /var/run/display_brightness.lock +then + cat "$BRIGHTNESS_FILE" > /var/run/display_brightness.tmp + echo 0 > "$BRIGHTNESS_FILE" + rm -rf /var/run/display_brightness.lock +else + echo "BRIGHTNESS IS LOCKED" +fi diff --git a/packages/zaurusd/files/zaurus-hinge.bl-on b/packages/zaurusd/files/zaurus-hinge.bl-on index 61598155f2..58227e8c5a 100644 --- a/packages/zaurusd/files/zaurus-hinge.bl-on +++ b/packages/zaurusd/files/zaurus-hinge.bl-on @@ -7,24 +7,39 @@ # Date: 04-Jun-06 test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin" -${ZD_BINDIR}/bl on +test -x ${ZD_BINDIR}/bl && ${ZD_BINDIR}/bl on -# If the backlight does not come back on after a suspend, the driver is -# still "on" (hence "bl on" does nothing) with a brightness of "0" -( if test "`bl | awk '{print $2}'`" = "0" -then - x=0 - while test "$x" != 4 - do - bl 10 - usleep 10 - bl 50 - usleep 10 - - let x=$x+1 - done +BL="fakeBl" + +fakeBl() { + + + case "$1" in + on) test -n "$2" && echo "$2" > "$BL_DRIVER" ;; + "") echo "on `cat "$BL_DRIVER"`";; + *) echo "$1" > "$BL_DRIVER" ;; + esac +} + +for dir in `ls -1 /sys/class/backlight/` +do + if test -e /sys/class/backlight/$dir/brightness + then + echo "Using [$dir] backlight driver" + BL_DRIVER="/sys/class/backlight/$dir/brightness" + break + fi +done + + +echo "### `$BL` ###" +( if test "`$BL | awk '{print $2}'`" = "0" +then + + $BL 20 + if mkdir /var/run/display_brightness.lock then if test -e /var/run/display_brightness.tmp @@ -34,12 +49,8 @@ then if test "$OLD_VALUE" -gt 1 then - STEP=5 - DRIVER="`ls /sys/class/backlight/|head -n 1`" - BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness" - echo "SETTING $OLD_VALUE!" - echo "$OLD_VALUE" > "$BRIGHTNESS_FILE" + $BL "$OLD_VALUE" rm /var/run/display_brightness.tmp echo "FINISH!" fi diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index 8bc0b2ba58..3ea0d2b22f 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -4,12 +4,13 @@ LICENSE = "GPL" DEPENDS = "tslib" RDEPENDS = "procps" PV = "0.0+svn${SRCDATE}" -PR = "r14" +PR = "r16" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ file://zaurus-hinge.in \ file://add-poodle.patch;patch=1 \ file://alsa-cxx00-default.state.patch;patch=1 \ + file://alsa-6000x-default.state.patch;patch=1 \ file://disable-alsa-handling.patch;patch=1 \ file://zaurus-hinge.matchbox-portrait \ file://zaurus-hinge.matchbox-landscape \ |