diff options
Diffstat (limited to 'packages')
321 files changed, 11644 insertions, 5668 deletions
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 7d57364292..d13b9d8270 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -9,7 +9,7 @@ LICENSE = "GPL" RRECOMMENDS_alsa-state = "alsa-states" RRECOMMENDS_${PN}_openmoko = "openmoko-alsa-scenarios" PV = "0.1.0" -PR = "r12" +PR = "r15" SRC_URI = " \ file://asoundrc \ diff --git a/packages/alsa/alsa-utils_1.0.13.bb b/packages/alsa/alsa-utils_1.0.13.bb index e1ae7aa399..1e6af1ec09 100644 --- a/packages/alsa/alsa-utils_1.0.13.bb +++ b/packages/alsa/alsa-utils_1.0.13.bb @@ -8,7 +8,7 @@ PR = "r1" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" # lazy hack. needs proper fixing in gettext.m4, see -# http://bugs.openembedded.org/show_bug.cgi?id=2348 +# http://bugs.openembedded.net/show_bug.cgi?id=2348 # please close bug and remove this comment when properly fixed # EXTRA_OECONF_linux-uclibc = "--disable-nls" diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR80.bb b/packages/altboot/altboot_1.1.1+wip-SVNR83.bb index b333264d34..b9056e655a 100644 --- a/packages/altboot/altboot_1.1.1+wip-SVNR80.bb +++ b/packages/altboot/altboot_1.1.1+wip-SVNR83.bb @@ -2,7 +2,7 @@ require altboot.inc PR = "r0" -SVN_REV = "80" +SVN_REV = "83" 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 036f1af75a..3762d78be2 100644 --- a/packages/angstrom/angstrom-gpe-task-base.bb +++ b/packages/angstrom/angstrom-gpe-task-base.bb @@ -1,11 +1,12 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r34" +PR = "r35" inherit task PACKAGE_ARCH = "${MACHINE_ARCH}" RDEPENDS_${PN} = "\ + gpe-scap \ matchbox \ matchbox-panel-hacks \ matchbox-applet-startup-monitor \ diff --git a/packages/asterisk/asterisk-1.4.10/.mtn2git_empty b/packages/asterisk/asterisk-1.2.28/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/asterisk/asterisk-1.4.10/.mtn2git_empty +++ b/packages/asterisk/asterisk-1.2.28/.mtn2git_empty diff --git a/packages/asterisk/asterisk-1.2.28/asterisk.patch b/packages/asterisk/asterisk-1.2.28/asterisk.patch new file mode 100644 index 0000000000..006b8e9291 --- /dev/null +++ b/packages/asterisk/asterisk-1.2.28/asterisk.patch @@ -0,0 +1,221 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- asterisk-1.2.9.1/./Makefile~asterisk ++++ asterisk-1.2.9.1/./Makefile +@@ -331,7 +331,7 @@ + ASTCFLAGS+= $(TRACE_FRAMES) + ASTCFLAGS+= $(MALLOC_DEBUG) + ASTCFLAGS+= $(BUSYDETECT) +-ASTCFLAGS+= $(OPTIONS) ++#ASTCFLAGS+= $(OPTIONS) + ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize) + ASTCFLAGS+= -fomit-frame-pointer + endif +@@ -347,12 +347,12 @@ + netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \ + cryptostub.o + +-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),) ++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/sys/poll.h),) + OBJS+= poll.o + ASTCFLAGS+=-DPOLLCOMPAT + endif + +-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),) ++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/dlfcn.h),) + OBJS+= dlfcn.o + ASTCFLAGS+=-DDLFCNCOMPAT + endif +@@ -397,7 +397,7 @@ + endif + + ifeq ($(MAKETOPLEVEL),$(MAKELEVEL)) +- CFLAGS+=$(ASTCFLAGS) ++override CFLAGS+=$(ASTCFLAGS) + endif + + # This is used when generating the doxygen documentation +@@ -519,7 +519,7 @@ + fi + rm -f include/asterisk/build.h.tmp + $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c +- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) ++ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS) + + muted: muted.o + $(CC) $(AUDIO_LIBS) -o muted muted.o +--- asterisk-1.2.9.1/codecs/gsm/Makefile~asterisk ++++ asterisk-1.2.9.1/codecs/gsm/Makefile +@@ -51,7 +51,7 @@ + ifneq (${PROC},ppc) + ifneq (${PROC},ppc64) + ifneq (${PROC},s390) +-OPTIMIZE+=-march=$(PROC) ++#OPTIMIZE+=-march=$(PROC) + endif + endif + endif +@@ -243,7 +243,7 @@ + ifneq (${PROC},arm) + ifneq ($(shell uname -m), parisc) + ifneq ($(shell uname -m),s390) +-GSM_SOURCES+= $(SRC)/k6opt.s ++#GSM_SOURCES+= $(SRC)/k6opt.s + endif + endif + endif +@@ -309,7 +309,7 @@ + ifneq ($(shell uname -m), armv4l) + ifneq ($(shell uname -m), parisc) + ifneq ($(shell uname -m),s390) +-GSM_OBJECTS+= $(SRC)/k6opt.o ++#GSM_OBJECTS+= $(SRC)/k6opt.o + endif + endif + endif +--- asterisk-1.2.9.1/res/Makefile~asterisk ++++ asterisk-1.2.9.1/res/Makefile +@@ -89,7 +89,7 @@ + fi + + res_crypto.so: res_crypto.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS) ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} $(CRYPTO_LIBS) + + clean: + rm -f *.so *.o .depend +--- asterisk-1.2.9.1/channels/Makefile~asterisk ++++ asterisk-1.2.9.1/channels/Makefile +@@ -73,7 +73,7 @@ + SOLINK+=-lrt + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/ixjuser.h),) + CHANNEL_LIBS+=chan_phone.so + endif + +@@ -88,16 +88,16 @@ + + CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/alsa/asoundlib.h),) + CHANNEL_LIBS+=chan_alsa.so + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libpri.so.1),) + CFLAGS+=-DZAPATA_PRI + ZAPPRI=-lpri + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libmfcr2.so.1),) + CFLAGS+=-DZAPATA_R2 + ZAPR2=-lmfcr2 + endif +@@ -110,7 +110,7 @@ + endif + + ifndef WITHOUT_ZAPTEL +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/zaptel.h),) + ifeq (${OSARCH},NetBSD) + SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib + endif +@@ -122,7 +122,7 @@ + endif + endif # WITHOUT_ZAPTEL + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vpbapi.h),) + CHANNEL_LIBS+=chan_vpb.so + CFLAGS+=-DLINUX + endif +@@ -137,7 +137,7 @@ + + ZAPDIR=/usr/lib + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/nbs.h),) + CHANNEL_LIBS+=chan_nbs.so + endif + +@@ -158,7 +158,7 @@ + rm -f busy.h ringtone.h gentone gentone-ulaw + + %.so : %.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS} ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} ${LIBS} + + ifneq ($(wildcard .depend),) + include .depend +@@ -215,7 +215,7 @@ + chan_alsa.o: $(ALSA_SRC) + + chan_alsa.so: chan_alsa.o +- $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl ++ $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl $(LDFLAGS) + + chan_nbs.so: chan_nbs.o + $(CC) $(SOLINK) -o $@ $< -lnbs +--- asterisk-1.2.9.1/pbx/Makefile~asterisk ++++ asterisk-1.2.9.1/pbx/Makefile +@@ -59,7 +59,7 @@ + $(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS) + + pbx_dundi.so: dundi-parser.o pbx_dundi.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} $(LDFLAGS) + + %.moc : %.h + $(MOC) $< -o $@ +--- asterisk-1.2.9.1/formats/Makefile~asterisk ++++ asterisk-1.2.9.1/formats/Makefile +@@ -25,7 +25,7 @@ + # + # OGG/Vorbis format + # +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vorbis/codec.h),) + FORMAT_LIBS+=format_ogg_vorbis.so + endif + +@@ -57,7 +57,7 @@ + $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lm + + format_ogg_vorbis.so : format_ogg_vorbis.o +- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm ++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm $(LDFLAGS) + + install: all + for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done +--- asterisk-1.2.9.1/utils/Makefile~asterisk ++++ asterisk-1.2.9.1/utils/Makefile +@@ -22,11 +22,11 @@ + + TARGET=stereorize streamplayer + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/popt.h),) + TARGET+=smsq + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/newt.h),) + TARGET+=astman + endif + +@@ -64,7 +64,7 @@ + $(CC) $(CFLAGS) -o $@ $^ + + smsq: smsq.o +- $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt ++ $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt $(LDFLAGS) + + streamplayer: streamplayer.o + $(CC) $(CFLAGS) -o streamplayer ${SOL} streamplayer.o ${SOLLIBS} diff --git a/packages/asterisk/asterisk-1.2.28/enable-speex.patch b/packages/asterisk/asterisk-1.2.28/enable-speex.patch new file mode 100644 index 0000000000..0f5c578bd9 --- /dev/null +++ b/packages/asterisk/asterisk-1.2.28/enable-speex.patch @@ -0,0 +1,21 @@ +--- /codecs/orig-Makefile 2005-11-29 13:24:39.000000000 -0500 ++++ /codecs/Makefile 2007-02-28 09:54:42.000000000 -0500 +@@ -29,7 +29,7 @@ + endif + + UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h) +-UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h) ++UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/include/speex/speex.h) + ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h) + ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h) + ifneq (${UI_SPEEX},) +@@ -38,7 +38,8 @@ + endif + ifneq (${UIS_SPEEX},) + MODSPEEX=codec_speex.so +- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/include/speex ++ CFLAGS+=-I$(CROSS_COMPILE_TARGET)/include/speex ++ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/lib + LIBSPEEX+=-lspeex -lm + endif + ifneq (${ULI_SPEEX},) diff --git a/packages/asterisk/asterisk-1.2.28/uclibc-compat-getloadavg.patch b/packages/asterisk/asterisk-1.2.28/uclibc-compat-getloadavg.patch new file mode 100644 index 0000000000..a909513b1c --- /dev/null +++ b/packages/asterisk/asterisk-1.2.28/uclibc-compat-getloadavg.patch @@ -0,0 +1,13 @@ +diff -ruN asterisk-1.2.0-old/include/asterisk/compat.h asterisk-1.2.0-new/include/asterisk/compat.h +--- asterisk-1.2.0-old/include/asterisk/compat.h 2005-11-08 05:13:19.000000000 +0100 ++++ asterisk-1.2.0-new/include/asterisk/compat.h 2005-12-04 05:32:31.000000000 +0100 +@@ -75,7 +75,9 @@ + #define HAVE_STRTOQ + + #ifdef _BSD_SOURCE ++#ifndef __UCLIBC__ + #define HAVE_GETLOADAVG ++#endif /* __UCLIBC__ */ + #endif + + #ifdef __linux__ diff --git a/packages/asterisk/asterisk-1.2.28/uclibc-dns.patch b/packages/asterisk/asterisk-1.2.28/uclibc-dns.patch new file mode 100644 index 0000000000..4ba8b6205b --- /dev/null +++ b/packages/asterisk/asterisk-1.2.28/uclibc-dns.patch @@ -0,0 +1,18 @@ +--- /orig-dns.c 2007-07-16 23:46:58.000000000 +0300 ++++ /dns.c 2007-07-26 16:29:44.000000000 +0300 +@@ -237,7 +237,14 @@ + #if defined(res_ndestroy) + #define HAS_RES_NDESTROY + #endif +-#else ++#endif ++ ++#ifdef __UCLIBC__ ++#undef HAS_RES_NINIT ++#undef HAS_RES_NDESTROY ++#endif ++ ++#ifndef HAS_RES_NINIT + AST_MUTEX_DEFINE_STATIC(res_lock); + #if 0 + #warning "Warning, res_ninit is missing... Could have reentrancy issues" diff --git a/packages/asterisk/asterisk-1.4.10/Makefile.patch b/packages/asterisk/asterisk-1.4.10/Makefile.patch deleted file mode 100644 index a6d630949e..0000000000 --- a/packages/asterisk/asterisk-1.4.10/Makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- asterisk-1.4.5/Makefile 2007-05-24 15:05:08.000000000 -0400 -+++ asterisk-1.4.5/Makefile.new 2007-06-17 05:36:44.000000000 -0400 -@@ -115,7 +115,7 @@ else - ASTSBINDIR=$(sbindir) - ASTSPOOLDIR=$(localstatedir)/spool/asterisk - ASTLOGDIR=$(localstatedir)/log/asterisk -- ASTVARRUNDIR=$(localstatedir)/run -+ ASTVARRUNDIR=$(localstatedir)/run/asterisk - ASTMANDIR=$(mandir) - ifeq ($(OSARCH),FreeBSD) - ASTVARLIBDIR=$(prefix)/share/asterisk -@@ -468,7 +468,7 @@ oldmodcheck: - echo " WARNING WARNING WARNING" ;\ - fi - --install: datafiles bininstall $(SUBDIRS_INSTALL) -+install: datafiles bininstall $(SUBDIRS_INSTALL) samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ - fi diff --git a/packages/asterisk/asterisk-1.4.11/init b/packages/asterisk/asterisk-1.4.11/init deleted file mode 100644 index d53a9a1e5e..0000000000 --- a/packages/asterisk/asterisk-1.4.11/init +++ /dev/null @@ -1,77 +0,0 @@ -#! /bin/sh -# -# This is an init script for openembedded -# Copy it to /etc/init.d/callweaver and type -# > update-rc.d asterisk defaults 60 -# -asterisk=/usr/sbin/asterisk -pidfile=/var/run/asterisk/asterisk.pid -asterisk_args="-npqT -U asterisk -G asterisk" - -test -x "$asterisk" || exit 0 - -case "$1" in - start) - echo -n "Starting Asterisk" - start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args - echo "." - ;; - stop) - echo -n "Stopping Asterisk" - $asterisk -rx "stop gracefully" - sleep 4 - if [ -f $pidfile ]; then - start-stop-daemon --stop --quiet --pidfile $pidfile - fi - echo "." - ;; - force-stop) - echo -n "Stopping Asterisk" - $asterisk -rx "stop now" - sleep 2 - if [ -f $pidfile ]; then - start-stop-daemon --stop --quiet --pidfile $pidfile - fi - echo "." - ;; - restart) - echo -n "Restarting Asterisk" - if [ -f $pidfile ]; then - $asterisk -rx "restart gracefully" - sleep 2 - else - start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args - fi - echo "." - ;; - force-restart) - echo -n "Forcibly Restarting Asterisk" - if [ -f $pidfile ]; then - $asterisk -rx "restart now" - sleep 2 - else - start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args - fi - echo "." - ;; - reload) - echo -n "Reloading Asterisk Configuration" - if [ -f $pidfile ]; then - $asterisk -rx "reload" - else - start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args - fi - echo "." - ;; - logger-reload) - if [ -f $pidfile ]; then - $asterisk -rx "logger reload" - fi - ;; - *) - echo "Usage: /etc/init.d/asterisk {start|stop|force-stop|restart|force-restart|reload|logger-reload}" - exit 1 -esac - -exit 0 - diff --git a/packages/asterisk/asterisk-1.4.11/.mtn2git_empty b/packages/asterisk/asterisk-1.4.19.1/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/asterisk/asterisk-1.4.11/.mtn2git_empty +++ b/packages/asterisk/asterisk-1.4.19.1/.mtn2git_empty diff --git a/packages/asterisk/asterisk-1.4.11/Makefile.patch b/packages/asterisk/asterisk-1.4.19.1/Makefile.patch index a6d630949e..857b482100 100644 --- a/packages/asterisk/asterisk-1.4.11/Makefile.patch +++ b/packages/asterisk/asterisk-1.4.19.1/Makefile.patch @@ -13,8 +13,8 @@ echo " WARNING WARNING WARNING" ;\ fi --install: datafiles bininstall $(SUBDIRS_INSTALL) -+install: datafiles bininstall $(SUBDIRS_INSTALL) samples +-install: badshell datafiles bininstall $(SUBDIRS_INSTALL) ++install: badshell datafiles bininstall $(SUBDIRS_INSTALL) samples @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ fi diff --git a/packages/asterisk/asterisk-1.4.10/init b/packages/asterisk/asterisk-1.4.19.1/init index d53a9a1e5e..d53a9a1e5e 100644 --- a/packages/asterisk/asterisk-1.4.10/init +++ b/packages/asterisk/asterisk-1.4.19.1/init diff --git a/packages/asterisk/asterisk-1.4.10/logrotate b/packages/asterisk/asterisk-1.4.19.1/logrotate index dfd25ee55c..dfd25ee55c 100644 --- a/packages/asterisk/asterisk-1.4.10/logrotate +++ b/packages/asterisk/asterisk-1.4.19.1/logrotate diff --git a/packages/asterisk/asterisk-1.4.10/sounds.xml.patch b/packages/asterisk/asterisk-1.4.19.1/sounds.xml.patch index b549fea132..b549fea132 100644 --- a/packages/asterisk/asterisk-1.4.10/sounds.xml.patch +++ b/packages/asterisk/asterisk-1.4.19.1/sounds.xml.patch diff --git a/packages/asterisk/asterisk-1.4.10/volatiles b/packages/asterisk/asterisk-1.4.19.1/volatiles index c68e786c90..c68e786c90 100644 --- a/packages/asterisk/asterisk-1.4.10/volatiles +++ b/packages/asterisk/asterisk-1.4.19.1/volatiles diff --git a/packages/asterisk/asterisk-1.6.0-beta6/logrotate b/packages/asterisk/asterisk-1.6.0-beta6/logrotate deleted file mode 100644 index dfd25ee55c..0000000000 --- a/packages/asterisk/asterisk-1.6.0-beta6/logrotate +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/asterisk/cdr-csv/Master.csv /var/log/asterisk/cdr-custom/Master.csv /var/log/asterisk/queue_log /var/log/asterisk/event_log /var/log/asterisk/messages { - daily - missingok - compress - delaycompress - rotate 30 - sharedscripts - postrotate - /etc/init.d/asterisk logger-reload - endscript -} - diff --git a/packages/asterisk/asterisk-1.6.0-beta6/sounds.xml.patch b/packages/asterisk/asterisk-1.6.0-beta6/sounds.xml.patch deleted file mode 100644 index b549fea132..0000000000 --- a/packages/asterisk/asterisk-1.6.0-beta6/sounds.xml.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- asterisk-1.4.4/sounds/sounds.xml 2007-05-24 17:00:45.000000000 -0400 -+++ asterisk-1.4.4/sounds/sounds.xml.new 2007-05-25 13:23:41.000000000 -0400 -@@ -6,7 +6,6 @@ - <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format"> - </member> - <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" > -- <defaultenabled>yes</defaultenabled> - </member> - <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format"> - </member> -@@ -39,7 +38,6 @@ - </category> - <category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes"> - <member name="MOH-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" > -- <defaultenabled>yes</defaultenabled> - </member> - <member name="MOH-FREEPLAY-ULAW" displayname="FreePlay Music On Hold Files, mu-Law format" > - </member> diff --git a/packages/asterisk/asterisk-1.6.0-beta6/volatiles b/packages/asterisk/asterisk-1.6.0-beta6/volatiles deleted file mode 100644 index c68e786c90..0000000000 --- a/packages/asterisk/asterisk-1.6.0-beta6/volatiles +++ /dev/null @@ -1,7 +0,0 @@ -d asterisk asterisk 0775 /var/run/asterisk none -d asterisk asterisk 0775 /var/lib/asterisk none -d asterisk asterisk 0775 /var/log/asterisk none -d asterisk asterisk 0775 /var/log/asterisk/cdr-csv none -d asterisk asterisk 0775 /var/log/asterisk/cdr-custom none -d asterisk asterisk 0775 /var/spool/asterisk/outgoing none -d asterisk asterisk 0775 /var/spool/asterisk/voicemail none diff --git a/packages/asterisk/asterisk-1.6.0-beta6/.mtn2git_empty b/packages/asterisk/asterisk-1.6.0-beta8/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/asterisk/asterisk-1.6.0-beta6/.mtn2git_empty +++ b/packages/asterisk/asterisk-1.6.0-beta8/.mtn2git_empty diff --git a/packages/asterisk/asterisk-1.6.0-beta6/Makefile.patch b/packages/asterisk/asterisk-1.6.0-beta8/Makefile.patch index ee7db5d5f0..cdbbe2bdae 100644 --- a/packages/asterisk/asterisk-1.6.0-beta6/Makefile.patch +++ b/packages/asterisk/asterisk-1.6.0-beta8/Makefile.patch @@ -13,8 +13,8 @@ @exit 1 endif --install: badshell datafiles bininstall $(SUBDIRS_INSTALL) -+install: badshell datafiles bininstall $(SUBDIRS_INSTALL) samples +-install: badshell datafiles bininstall ++install: badshell datafiles bininstall samples @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ fi diff --git a/packages/asterisk/asterisk-1.6.0-beta6/init b/packages/asterisk/asterisk-1.6.0-beta8/init index f26ad38db3..f26ad38db3 100644 --- a/packages/asterisk/asterisk-1.6.0-beta6/init +++ b/packages/asterisk/asterisk-1.6.0-beta8/init diff --git a/packages/asterisk/asterisk-1.4.11/logrotate b/packages/asterisk/asterisk-1.6.0-beta8/logrotate index dfd25ee55c..dfd25ee55c 100644 --- a/packages/asterisk/asterisk-1.4.11/logrotate +++ b/packages/asterisk/asterisk-1.6.0-beta8/logrotate diff --git a/packages/asterisk/asterisk-1.4.11/sounds.xml.patch b/packages/asterisk/asterisk-1.6.0-beta8/sounds.xml.patch index b549fea132..b549fea132 100644 --- a/packages/asterisk/asterisk-1.4.11/sounds.xml.patch +++ b/packages/asterisk/asterisk-1.6.0-beta8/sounds.xml.patch diff --git a/packages/asterisk/asterisk-1.4.11/volatiles b/packages/asterisk/asterisk-1.6.0-beta8/volatiles index c68e786c90..c68e786c90 100644 --- a/packages/asterisk/asterisk-1.4.11/volatiles +++ b/packages/asterisk/asterisk-1.6.0-beta8/volatiles diff --git a/packages/asterisk/asterisk_1.2.24.bb b/packages/asterisk/asterisk_1.2.24.bb index 1673276f45..c57707eb2a 100644 --- a/packages/asterisk/asterisk_1.2.24.bb +++ b/packages/asterisk/asterisk_1.2.24.bb @@ -10,6 +10,7 @@ PR = "r0" SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ file://uclibc-compat-getloadavg.patch;patch=1 \ file://uclibc-dns.patch;patch=1 \ +# file://uclibc-define-glob.patch;patch=1 \ file://asterisk.patch;patch=1 \ file://enable-speex.patch;patch=1" diff --git a/packages/asterisk/asterisk_1.2.28.bb b/packages/asterisk/asterisk_1.2.28.bb new file mode 100644 index 0000000000..90e756bf66 --- /dev/null +++ b/packages/asterisk/asterisk_1.2.28.bb @@ -0,0 +1,46 @@ +# Copyright (C) 2007-2008, Stelios Koroneos - Digital OPSiS, All Rights Reserved +# Released under the MIT license (see packages/COPYING) +DESCRIPTION="The Asterisk open source software PBX" +HOMEPAGE="www.asterisk.org" +LICENSE="GPL" +DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis speex" +SECTION = "console/telephony" +PR = "r0" + +SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ + file://uclibc-compat-getloadavg.patch;patch=1 \ + file://uclibc-dns.patch;patch=1 \ + file://asterisk.patch;patch=1 \ + file://enable-speex.patch;patch=1" + +S = "${WORKDIR}/asterisk-${PV}" + + +export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}" +export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}" +export CROSS_COMPILE_TARGET="${STAGING_DIR_HOST}" + +export CROSS_ARCH="Linux" +export CROSS_PROC="${TARGET_ARCH}" + +export MAKECMDGOALS="dont-optimize" + +# We will probably have to edit the CFLAG in the Makefile + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install +} + +do_stage () { + install -d ${STAGING_INCDIR}/asterisk + install -m 0644 ${S}/include/asterisk/*.h ${STAGING_INCDIR}/asterisk/ +} + + +FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug" +FILES_${PN}-dbg += "/var/lib/asterisk/agi-bin/.debug" + diff --git a/packages/asterisk/asterisk_1.4.11.bb b/packages/asterisk/asterisk_1.4.11.bb deleted file mode 100644 index 2f116864e4..0000000000 --- a/packages/asterisk/asterisk_1.4.11.bb +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved -# Released under the MIT license (see packages/COPYING) -DESCRIPTION = "The Asterisk open source software PBX" -HOMEPAGE = "http://www.asterisk.org" -SECTION = "voip" -LICENSE = "GPLv2" -PRIORITY = "optional" -SECTION = "console/telephony" -DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis" -#RRECOMMENDS_${PN} = "logrotate" -PR = "r0" - -#DEFAULT_PREFERENCE = "-1" - -SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\ - file://sounds.xml.patch;patch=1\ - file://Makefile.patch;patch=1\ - file://logrotate \ - file://volatiles \ - file://init" - -ARCH_efika="ppc" -ARCH_dht-walnut="ppc" -ARCH_magicbox="ppc" -ARCH_sequoia="ppc" - - - - -INITSCRIPT_NAME = "asterisk" -INITSCRIPT_PARAMS = "defaults 60" - -inherit autotools update-rc.d - -EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR}\ - --with-z=${STAGING_EXECPREFIXDIR}\ - --with-curl=${STAGING_EXECPREFIXDIR}\ - --with-termcap=${STAGING_EXECPREFIXDIR}\ - --with-ogg=${STAGING_EXECPREFIXDIR}\ - --with-vorbis=${STAGING_EXECPREFIXDIR}\ - --with-sqlite=${STAGING_EXECPREFIXDIR}\ - --with-popt=${STAGING_EXECPREFIXDIR}\ - --with-gnutls=${STAGING_EXECPREFIXDIR}\ - --without-curses\ - --with-ncurses=${STAGING_EXECPREFIXDIR}\ - --without-imap\ - --without-netsnmp\ - --without-odbc\ - --without-osptk\ - --without-nbs\ - --without-pwlib\ - --without-radius\ - --without-tds\ - --without-postgres\ - --without-zaptel\ - " - -#export NOISY_BUILD=yes - -export ASTCFLAGS = "-fsigned-char -I${STAGING_INCDIR} -DPATH_MAX=4096" -export ASTLDFLAGS="${LDFLAGS} -lpthread -ldl -lresolv " -export PROC="${ARCH}" - -do_configure_prepend () { - sed -i 's:/var:${localstatedir}:' ${WORKDIR}/logrotate - sed -i 's:/etc/init.d:${sysconfdir}/init.d:' ${WORKDIR}/logrotate - sed -i 's:/var:${localstatedir}:' ${WORKDIR}/volatiles -} - -do_configure () { - # Looks like rebuilding configure doesn't work, so we are skipping - # that and are just using the shipped one - gnu-configize - libtoolize --force - oe_runconf -} - - -do_compile() { - ( - #make sure that menuselect gets build using host toolchain - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd menuselect - ./configure - oe_runmake - cd ../ - ) || exit 1 - oe_runmake -} - - - - -do_install_append() { - install -d ${D}${sysconfdir}/init.d/ - install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/asterisk - install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/asterisk - install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/asterisk -} - -pkg_postinst_prepend() { - grep -q asterisk ${sysconfdir}/group || addgroup --system asterisk - grep -q asterisk ${sysconfdir}/passwd || adduser --system --home ${localstatedir}/run/asterisk --no-create-home --disabled-password --ingroup asterisk -s ${base_bindir}/false asterisk - chown -R asterisk:asterisk ${libdir}/asterisk ${localstatedir}/lib/asterisk ${localstatedir}/spool/asterisk ${localstatedir}/log/asterisk ${localstatedir}/run/asterisk ${sysconfdir}/asterisk -} - -FILES_${PN} += "${libdir}/asterisk/modules/*" -FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug \ - ${localstatedir}/lib/asterisk/*/.debug" - -CONFFILES_${PN} += "${sysconfdir}/asterisk/adsi.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/adtranvofr.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/agents.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/alarmreceiver.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/alsa.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/amd.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/asterisk.adsi" -CONFFILES_${PN} += "${sysconfdir}/asterisk/asterisk.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_custom.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_manager.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_odbc.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_pgsql.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_tds.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/codecs.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/dnsmgr.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/dundi.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/enum.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/extconfig.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/extensions.ael" -CONFFILES_${PN} += "${sysconfdir}/asterisk/extensions.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/features.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/festival.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/followme.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/func_odbc.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/gtalk.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/h323.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/http.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/iax.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/iaxprov.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/indications.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/jabber.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/logger.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/manager.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/meetme.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/mgcp.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/misdn.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/modem.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/modules.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/musiconhold.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/muted.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/osp.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/oss.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/phone.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/privacy.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/queues.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/res_odbc.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/res_snmp.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/rpt.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/rtp.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/say.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/sip.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/sip_notify.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/skinny.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/sla.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/smdi.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/telcordia-1.adsi" -CONFFILES_${PN} += "${sysconfdir}/asterisk/udptl.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/users.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/voicemail.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/vpb.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/zapata.conf" -CONFFILES_${PN} += "${sysconfdir}/logrotate.d/asterisk" diff --git a/packages/asterisk/asterisk_1.4.10.bb b/packages/asterisk/asterisk_1.4.19.1.bb index 416495a0b8..2e05896cc6 100644 --- a/packages/asterisk/asterisk_1.4.10.bb +++ b/packages/asterisk/asterisk_1.4.19.1.bb @@ -1,14 +1,14 @@ +# Copyright (C) 2007-2008, Stelios Koroneos - Digital OPSiS, All Rights Reserved +# Released under the MIT license (see packages/COPYING) DESCRIPTION = "The Asterisk open source software PBX" HOMEPAGE = "http://www.asterisk.org" -SECTION = "voip" LICENSE = "GPLv2" PRIORITY = "optional" SECTION = "console/telephony" DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis" -RRECOMMENDS_${PN} = "logrotate" -PR = "r1" +#RRECOMMENDS_${PN} = "logrotate" +PR = "r0" -DEFAULT_PREFERENCE = "-1" SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\ file://sounds.xml.patch;patch=1\ @@ -17,10 +17,10 @@ SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\ file://volatiles \ file://init" -ARCH_efika="ppc" -ARCH_dht-walnut="ppc" -ARCH_magicbox="ppc" -ARCH_sequoia="ppc" +ARCH_efika="powerpc" +ARCH_dht-walnut="powerpc" +ARCH_magicbox="powerpc" +ARCH_sequoia="powerpc" @@ -77,7 +77,7 @@ do_configure () { do_compile() { ( #make sure that menuselect gets build using host toolchain - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS RANLIB cd menuselect ./configure oe_runmake @@ -143,7 +143,6 @@ CONFFILES_${PN} += "${sysconfdir}/asterisk/manager.conf" CONFFILES_${PN} += "${sysconfdir}/asterisk/meetme.conf" CONFFILES_${PN} += "${sysconfdir}/asterisk/mgcp.conf" CONFFILES_${PN} += "${sysconfdir}/asterisk/misdn.conf" -CONFFILES_${PN} += "${sysconfdir}/asterisk/modem.conf" CONFFILES_${PN} += "${sysconfdir}/asterisk/modules.conf" CONFFILES_${PN} += "${sysconfdir}/asterisk/musiconhold.conf" CONFFILES_${PN} += "${sysconfdir}/asterisk/muted.conf" diff --git a/packages/asterisk/asterisk_1.6.0-beta6.bb b/packages/asterisk/asterisk_1.6.0-beta8.bb index d1c2faf87c..202b689a68 100644 --- a/packages/asterisk/asterisk_1.6.0-beta6.bb +++ b/packages/asterisk/asterisk_1.6.0-beta8.bb @@ -1,8 +1,8 @@ # Copyright (C) 2008, Ovidiu Sas - VoIP Embedded Inc., All Rights Reserved +# Copyright (C) 2008, Stelios Koroneos - Digital OPSiS, All Rights Reserved # Released under the MIT license (see packages/COPYING) DESCRIPTION = "The Asterisk open source software PBX" HOMEPAGE = "http://www.asterisk.org" -SECTION = "voip" LICENSE = "GPLv2" PRIORITY = "optional" SECTION = "console/telephony" @@ -20,10 +20,10 @@ SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\ file://volatiles \ file://init" -ARCH_efika="ppc" -ARCH_dht-walnut="ppc" -ARCH_magicbox="ppc" -ARCH_sequoia="ppc" +ARCH_efika="powerpc" +ARCH_dht-walnut="powerpc" +ARCH_magicbox="powerpc" +ARCH_sequoia="powerpc" INITSCRIPT_NAME = "asterisk" INITSCRIPT_PARAMS = "defaults 60" diff --git a/packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2 b/packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2 Binary files differnew file mode 100644 index 0000000000..583ea40a84 --- /dev/null +++ b/packages/binutils/binutils-2.17/binutils-2.17.atmel.1.2.6.patch.bz2 diff --git a/packages/binutils/binutils-avr32.inc b/packages/binutils/binutils-avr32.inc new file mode 100644 index 0000000000..38c3866f96 --- /dev/null +++ b/packages/binutils/binutils-avr32.inc @@ -0,0 +1,28 @@ +# Extra tasks required when using Atmel's patches to binutils +# See http://avr32linux.org/twiki/bin/view/Main/BinutilsPatches for +# more information + + +do_avr32_reconf () { + if test ${TARGET_ARCH} == avr32; then + (cd ${S} && autoconf2.13) || die "Error running autoconf" + for dir in bfd opcodes binutils ld; do + (cd "${S}/$dir" && + aclocal && + autoconf && + automake && + autoheader) || die "Error reconfiguring $dir" + done + fi +} + +do_avr32_configure_bfd () { + if test ${TARGET_ARCH} == avr32; then + (cd ${B} && make configure-bfd) || die "Error running 'make configure-bfd'" + (cd ${B}/bfd && make headers) || die "Error running 'make headers'" + fi +} + +addtask avr32_reconf after do_patch before do_configure +addtask avr32_configure_bfd after do_configure before do_compile + diff --git a/packages/binutils/binutils.inc b/packages/binutils/binutils.inc index 684cf54b8e..49d3aeaa3c 100644 --- a/packages/binutils/binutils.inc +++ b/packages/binutils/binutils.inc @@ -67,6 +67,11 @@ export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" do_configure () { (cd ${S}; gnu-configize) || die "Failed to run gnu-configize" + + # Fix for issues when system's texinfo version >= 4.10 + # (See https://bugzilla.redhat.com/show_bug.cgi?id=345621) + sed -i -e "s@egrep 'texinfo.*'@egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|4.[1-9][0-9]+|[5-9])'@" '${S}/configure' + oe_runconf # # must prime config.cache to ensure the build of libiberty diff --git a/packages/binutils/binutils_2.17.bb b/packages/binutils/binutils_2.17.bb index 0696a24e72..e721cb41f3 100644 --- a/packages/binutils/binutils_2.17.bb +++ b/packages/binutils/binutils_2.17.bb @@ -1,6 +1,7 @@ require binutils.inc +require binutils-avr32.inc -PR = "r4" +PR = "r5" SRC_URI = \ "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \ @@ -18,8 +19,13 @@ SRC_URI += "\ file://300-012_check_ldrunpath_length.patch;patch=1 \ file://300-001_ld_makefile_patch.patch;patch=1 \ file://400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1 \ - file://500-avr32-atmel.1.3.0.patch;patch=1 \ - file://501-avr32-fix-pool-alignment.patch;patch=1 \ +" +# removed in favor of the atmel 1.2.6 patch which is supposedly newer (yes) +# file://500-avr32-atmel.1.3.0.patch;patch=1 \ +# file://501-avr32-fix-pool-alignment.patch;patch=1 \ + +SRC_URI_append_avr32 = "\ + file://binutils-2.17.atmel.1.2.6.patch.bz2;patch=1 \ " # Zecke's OSX fixes diff --git a/packages/bitchx/bitchx_1.1.bb b/packages/bitchx/bitchx_1.1.bb index d99ef56d97..9fbeb08c35 100644 --- a/packages/bitchx/bitchx_1.1.bb +++ b/packages/bitchx/bitchx_1.1.bb @@ -4,7 +4,7 @@ SECTION = "console/network" LICENSE = "BSD" #PR = "-r1" -SRC_URI = "http://www.bitchx.org/files/source/ircii-pana-${PV}-final.tar.gz \ +SRC_URI = "http://bitchx.sourceforge.net/ircii-pana-${PV}-final.tar.gz \ file://gcc34.patch;patch=1" S = "${WORKDIR}/BitchX" diff --git a/packages/bluez/bluez-gnome_0.26.bb b/packages/bluez/bluez-gnome_0.26.bb new file mode 100644 index 0000000000..d16c3a5894 --- /dev/null +++ b/packages/bluez/bluez-gnome_0.26.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Bluetooth configuration applet" +LICENSE = "GPL+LGPL" + +DEPENDS = "dbus-glib gconf libnotify gtk+" +RRECOMMENDS = "gnome-icon-theme" + +SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" + +inherit autotools pkgconfig gconf + +FILES_${PN} += "${datadir}/gconf" + diff --git a/packages/bluez/bluez-libs_3.30.bb b/packages/bluez/bluez-libs_3.30.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.30.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/busybox/busybox-1.9.1/.mtn2git_empty b/packages/bluez/bluez-utils-3.30/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/busybox/busybox-1.9.1/.mtn2git_empty +++ b/packages/bluez/bluez-utils-3.30/.mtn2git_empty diff --git a/packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch new file mode 100644 index 0000000000..1b208f7979 --- /dev/null +++ b/packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch @@ -0,0 +1,477 @@ +--- 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 +@@ -60,6 +60,8 @@ + #define HCI_UART_3WIRE 2 + #define HCI_UART_H4DS 3 + ++#include "ti_bts.h" ++ + struct uart_t { + char *type; + int m_id; +@@ -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 +@@ -279,6 +282,114 @@ + return 0; + } + ++static int brf6150(int fd, struct uart_t *u, struct termios *ti) ++{ ++ bts_t *bfp; ++ int i; ++ unsigned long vers; ++ unsigned char actionbuf[256]; ++ unsigned char resp[128]; /* Response */ ++ unsigned long count; ++ unsigned short atype; ++ ++ if (u->bts == NULL) /* no script, ignore */ ++ return 0; ++ ++ bfp = bts_load_script( u->bts, &vers ); ++ if (bfp == NULL) ++ return -1; ++ ++ fprintf( stderr, "Loading BTS script version %lu\n", vers ); ++ ++ while ((count = bts_next_action( bfp, actionbuf, ++ sizeof actionbuf - 1, &atype )) != 0) { ++ if (atype == ACTION_REMARKS) { ++ if (actionbuf[0] != 0) ++ fprintf( stderr, "%s\n", actionbuf ); ++ } ++ else if (atype == ACTION_SEND_COMMAND) { ++#if 0 ++ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype ); ++ for (i=0; i<count; i++) { ++ fprintf( stderr, "0x%02x ", actionbuf[i] ); ++ } ++ fprintf( stderr, "\n" ); ++#endif ++ int n; ++ n = write(fd, actionbuf, count); ++ if (n < 0 || n < count) { ++ perror("Failed to write TI action command"); ++ return -1; ++ } ++ } ++ else if (atype == ACTION_WAIT_EVENT) { ++ action_wait_t *wait = (action_wait_t *)actionbuf; ++#if 0 ++ fprintf( stderr, "ACTION_WAIT_EVENT: %u msec, %u size, data = ", wait->msec, wait->size ); ++ for (i=0; i<wait->size; i++) { ++ fprintf( stderr, "0x%02x ", wait->data[i] ); ++ } ++ fprintf( stderr, "\n" ); ++#endif ++ usleep(wait->msec); /* seems they give usec, not msec */ ++ /* Read reply. */ ++ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) { ++ perror("Failed to read TI command response"); ++ return -1; ++ } ++ if (count < wait->size) { ++ fprintf( stderr, "TI command response is short."); ++ } ++ for (i=0; i<wait->size; i++) { ++ if (i == 3) continue; /* ignore */ ++ if (resp[i] != wait->data[i]) { ++ fprintf( stderr, "TI command response does not match expected result.\n" ); ++ } ++ } ++ } ++ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) { ++ action_serial_t *sercmd = (action_serial_t *)actionbuf; ++ ++ /* Set actual baudrate */ ++ fprintf( stderr, ++ "BTS changing baud rate to %u, flow control to %u\n", ++ sercmd->baud, sercmd->flow_control ); ++ ++ tcflush(fd, TCIOFLUSH); ++ ++ if (sercmd->flow_control) ++ ti->c_cflag |= CRTSCTS; ++ else ++ ti->c_cflag &= ~CRTSCTS; ++ if (tcsetattr(fd, TCSANOW, ti) < 0) { ++ perror("Can't set port settings"); ++ return -1; ++ } ++ ++ u->speed = sercmd->baud; ++ ++ tcflush(fd, TCIOFLUSH); ++ if (set_speed(fd, ti, sercmd->baud) < 0) { ++ perror("Can't set baud rate"); ++ return -1; ++ } ++ } ++ else if (atype == ACTION_DELAY) { ++ action_delay_t *delay = (action_delay_t *)actionbuf; ++ usleep(delay->msec); /* seems they give usec, not msec */ ++ } ++ else { ++ fprintf( stderr, "BTS action type = %d: ", (int)atype ); ++ for (i=0; i<count; i++) { ++ fprintf( stderr, "0x%02x ", actionbuf[i] ); ++ } ++ fprintf( stderr, "\n" ); ++ } ++ } ++ bts_unload_script( bfp ); ++ return 0; ++} ++ + static int texas(int fd, struct uart_t *u, struct termios *ti) + { + struct timespec tm = {0, 50000}; +@@ -328,6 +439,17 @@ + /* Print LMP subversion */ + 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); ++ if ((err = brf6150(fd, u, ti)) != 0) { ++ fprintf(stderr, "Texas module script failed (err=%d)\n", err); ++ return -1; ++ } ++ } ++ + nanosleep(&tm, NULL); + return 0; + } +@@ -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] [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"); + } + +@@ -1219,11 +1341,12 @@ + struct sigaction sa; + struct pollfd p; + char dev[PATH_MAX]; ++ char *bts = NULL; + + detach = 1; + printpid = 0; + +- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) { ++ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) { + switch(opt) { + case 'b': + send_break = 1; +@@ -1245,6 +1368,10 @@ + init_speed = atoi(optarg); + break; + ++ case 'S': ++ bts = optarg; ++ break; ++ + case 'l': + for (i = 0; uart[i].type; i++) { + printf("%-10s0x%04x,0x%04x\n", uart[i].type, +@@ -1320,6 +1447,8 @@ + if (init_speed) + u->init_speed = init_speed; + ++ u->bts = bts; ++ + memset(&sa, 0, sizeof(sa)); + sa.sa_flags = SA_NOCLDSTOP; + sa.sa_handler = sig_alarm; +--- 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 @@ ++/* ++ * Copyright (c) 2005 Texas Instruments, Inc. ++ * Ported by SDG Systems, LLC ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation; ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. ++ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY ++ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ * ++ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, ++ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS ++ * SOFTWARE IS DISCLAIMED. ++ * ++ */ ++ ++#ifndef BT_SCRIPT_H ++#define BT_SCRIPT_H ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* ++ * Define the interface of Bluetooth Script ++ */ ++ ++typedef void bts_t; ++ ++ ++#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */ ++#define ACTION_WAIT_EVENT 2 /* Wait for data */ ++#define ACTION_SERIAL_PORT_PARAMETERS 3 ++#define ACTION_DELAY 4 ++#define ACTION_RUN_SCRIPT 5 ++#define ACTION_REMARKS 6 ++ ++/* ++ * Structure for ACTION_SEND_COMMAND ++ */ ++typedef struct tagCActionCommand ++{ ++ unsigned char data[1]; /* Data to send */ ++} action_command_t; ++ ++/* ++ * Structure for ACTION_WAIT_EVENT ++ */ ++typedef struct tagCActionWaitEvent ++{ ++ unsigned long msec; /* in milliseconds */ ++ unsigned long size; ++ unsigned char data[1]; /* Data to wait for */ ++} action_wait_t; ++ ++ ++/* ++ * Structure for ACTION_SERIAL_PORT_PARAMETERS ++ */ ++typedef struct tagCActionSerialPortParameters ++{ ++ unsigned long baud; ++ unsigned long flow_control; ++} action_serial_t; ++ ++/* Flow Control Type */ ++#define FCT_NONE 0 ++#define FCT_HARDWARE 1 ++ ++#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */ ++ ++ ++/* ++ * Structure for ACTION_DELAY ++ */ ++typedef struct tagCActionDelay ++{ ++ unsigned long msec; /* in milliseconds */ ++} action_delay_t; ++ ++/* ++ * Structure for ACTION_RUN_SCRIPT ++ */ ++typedef struct tagCActionRunScript ++{ ++ char filename[1]; ++} action_run_t; ++ ++/* ++ * Structure for ACTION_REMARKS ++ */ ++typedef struct tagCActionRemarks ++{ ++ char m_szRemarks[1]; ++} action_remarks_t; ++ ++ ++const char *cis_create_filename(const unsigned char* cmdparms); ++bts_t * bts_load_script(const char* fname, unsigned long* version); ++unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, ++ unsigned long nMaxSize, unsigned short* ptype); ++void bts_unload_script(bts_t* bts_fp); ++ ++#ifdef __cplusplus ++}; ++#endif ++ ++#endif /* BT_SCRIPT_H */ ++ +--- bluez-utils-3.1/tools/ti_bts.c.orig 2006-07-23 14:07:28.000000000 +0200 ++++ bluez-utils-3.1/tools/ti_bts.c 2006-07-23 14:07:46.000000000 +0200 +@@ -0,0 +1,149 @@ ++/* ++ * Copyright (c) 2005 Texas Instruments, Inc. ++ * Ported by SDG Systems, LLC ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation; ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. ++ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY ++ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ * ++ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, ++ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS ++ * SOFTWARE IS DISCLAIMED. ++ * ++ */ ++ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include "ti_bts.h" ++ ++#ifndef MAKEWORD ++#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8)) ++#endif ++ ++#define TI_MANUFACTURER_ID 13 ++ ++/* ++ * Common Init Script specific ++ */ ++const char * ++cis_create_filename(const unsigned char* cmdparms) ++{ ++ static char bts_file[50]; ++ ++ /* Check for TI's id */ ++ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]); ++ ++ if (TI_MANUFACTURER_ID == manfid) { ++ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]); ++ ++ unsigned short chip = (version & 0x7C00) >> 10; ++ unsigned short min_ver = (version & 0x007F); ++ unsigned short maj_ver = (version & 0x0380) >> 7; ++ ++ if (0 != (version & 0x8000)) { ++ maj_ver |= 0x0008; ++ } ++ ++ sprintf( bts_file, "TIInit_%d.%d.%d.bts", ++ (int)chip, (int)maj_ver, (int)min_ver); ++ ++ return &bts_file[0]; ++ } ++ return NULL; ++} ++ ++typedef struct tagCHeader ++{ ++ unsigned long magic; ++ unsigned long version; ++ unsigned char future[24]; ++} cheader_t; ++ ++ ++/* The value 0x42535442 stands for (in ASCII) BTSB */ ++/* which is Bluetooth Script Binary */ ++#define FILE_HEADER_MAGIC 0x42535442 ++ ++ ++bts_t * ++bts_load_script(const char* fname, unsigned long* version) ++{ ++ bts_t* bts = NULL; ++ FILE* fp = fopen(fname, "rb"); ++ ++ if (NULL != fp) { ++ /* Read header */ ++ cheader_t header; ++ ++ /* Read header */ ++ if (1 == fread(&header, sizeof(header), 1, fp)) { ++ /* Check magic number for correctness */ ++ if (header.magic == FILE_HEADER_MAGIC) { ++ /* If user wants the version number */ ++ if (NULL != version) { ++ *version = header.version; ++ } ++ bts = (bts_t*)fp; ++ } ++ } ++ /* If failed reading the file, close it */ ++ if (NULL == bts) { ++ fclose(fp); ++ } ++ } ++ return bts; ++} ++ ++unsigned long ++bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, ++ unsigned long nMaxSize, unsigned short* ptype) ++{ ++ unsigned long bytes = 0; ++ FILE* fp = (FILE*)bts_fp; ++ unsigned char action_hdr[4]; ++ ++ if (bts_fp == NULL) ++ return 0; ++ ++ /* Each Action has the following: */ ++ /* UINT16 type of this action */ ++ /* UINT16 size of rest */ ++ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */ ++ ++ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) { ++ unsigned short type = *(unsigned short*)&action_hdr[0]; ++ unsigned short size = *(unsigned short*)&action_hdr[2]; ++ ++ if (size <= nMaxSize) { ++ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp); ++ ++ if (nread == size) { ++ *ptype = type; ++ bytes = (unsigned long)size; ++ } ++ } ++ } ++ ++ return bytes; ++} ++ ++void ++bts_unload_script(bts_t* bts_fp) ++{ ++ FILE* fp = (FILE*)bts_fp; ++ ++ if (NULL != fp) { ++ fclose(fp); ++ } ++} ++ +--- 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-utils_3.30.bb b/packages/bluez/bluez-utils_3.30.bb new file mode 100644 index 0000000000..e4b5f21a84 --- /dev/null +++ b/packages/bluez/bluez-utils_3.30.bb @@ -0,0 +1,55 @@ +require bluez-utils3.inc + +# see bluez-utils3.inc for the explanation of these option +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --disable-alsa \ + --disable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +PACKAGES =+ "bluez-audio" + +FILES_${PN} = " \ + ${base_sbindir}/hcid \ + ${libdir}/bluetooth/plugins/*.so \ + ${sysconfdir}/init.d/bluetooth \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default \ + ${sysconfdir}/dbus-1 \ + ${base_sbindir}/hciattach \ + " + +FILES_bluez-audio = " \ + ${libdir}/bluetooth/plugins/libaudio.so \ + ${libdir}/gstreamer-0.10/*.so \ + " + +FILES_${PN}-dbg += " \ + ${libdir}/bluetooth/plugins/.debug \ + ${libdir}/gstreamer-0.10/.debug \ + " + +FILES_${PN}-dev += " \ + ${libdir}/bluetooth/plugins/*.la \ + ${libdir}/gstreamer-0.10/*.la \ + " diff --git a/packages/boost/boost_1.33.1.bb b/packages/boost/boost_1.33.1.bb index b71e2f446f..6632f6c8ea 100644 --- a/packages/boost/boost_1.33.1.bb +++ b/packages/boost/boost_1.33.1.bb @@ -9,7 +9,7 @@ SECTION = "libs" DEPENDS = "boost-jam-native zlib" PRIORITY = "optional" LICENSE = "Boost Software License" -PR = "r0" +PR = "r1" BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" @@ -17,6 +17,7 @@ BOOST_P = "boost_${BOOST_VER}" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" #SRC_URI += "file://unit_test_log10f.patch;patch=1" SRC_URI += "file://linux-uclibc.patch;patch=1" +SRC_URI += "file://atomic_count_gcc_atomicity.patch;patch=1" S = "${WORKDIR}/${BOOST_P}" diff --git a/packages/boost/files/atomic_count_gcc_atomicity.patch b/packages/boost/files/atomic_count_gcc_atomicity.patch new file mode 100644 index 0000000000..7d08e73550 --- /dev/null +++ b/packages/boost/files/atomic_count_gcc_atomicity.patch @@ -0,0 +1,13 @@ +Index: boost_1_33_1/boost/detail/atomic_count_gcc.hpp +=================================================================== +--- boost_1_33_1.orig/boost/detail/atomic_count_gcc.hpp 2008-05-01 20:43:45.000000000 +0200 ++++ boost_1_33_1/boost/detail/atomic_count_gcc.hpp 2008-05-01 20:43:55.000000000 +0200 +@@ -17,7 +17,7 @@ + // http://www.boost.org/LICENSE_1_0.txt) + // + +-#include <bits/atomicity.h> ++#include <ext/atomicity.h> + + namespace boost + { diff --git a/packages/freesmartphone/py-odeviced/.mtn2git_empty b/packages/busybox/busybox-1.9.2/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/freesmartphone/py-odeviced/.mtn2git_empty +++ b/packages/busybox/busybox-1.9.2/.mtn2git_empty diff --git a/packages/busybox/busybox-1.9.1/adduser-longops.patch b/packages/busybox/busybox-1.9.2/adduser-longops.patch index f221d30895..f221d30895 100644 --- a/packages/busybox/busybox-1.9.1/adduser-longops.patch +++ b/packages/busybox/busybox-1.9.2/adduser-longops.patch diff --git a/packages/busybox/busybox-1.9.1/defconfig b/packages/busybox/busybox-1.9.2/defconfig index 33d30911da..a7b8ed53a0 100644 --- a/packages/busybox/busybox-1.9.1/defconfig +++ b/packages/busybox/busybox-1.9.2/defconfig @@ -619,8 +619,8 @@ CONFIG_FEATURE_IP_TUNNEL=y # CONFIG_NAMEIF is not set # CONFIG_FEATURE_NAMEIF_EXTENDED is not set CONFIG_NC=y -# CONFIG_NC_SERVER is not set -# CONFIG_NC_EXTRA is not set +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y CONFIG_NETSTAT=y # CONFIG_FEATURE_NETSTAT_WIDE is not set CONFIG_NSLOOKUP=y diff --git a/packages/busybox/busybox-1.9.1/sort-z-nul.patch b/packages/busybox/busybox-1.9.2/sort-z-nul.patch index 55452a4524..55452a4524 100644 --- a/packages/busybox/busybox-1.9.1/sort-z-nul.patch +++ b/packages/busybox/busybox-1.9.2/sort-z-nul.patch diff --git a/packages/busybox/busybox-1.9.1/udhcpscript.patch b/packages/busybox/busybox-1.9.2/udhcpscript.patch index fc21d440cd..fc21d440cd 100644 --- a/packages/busybox/busybox-1.9.1/udhcpscript.patch +++ b/packages/busybox/busybox-1.9.2/udhcpscript.patch diff --git a/packages/busybox/busybox_1.9.1.bb b/packages/busybox/busybox_1.9.2.bb index cec4af8d59..5da0f03093 100644 --- a/packages/busybox/busybox_1.9.1.bb +++ b/packages/busybox/busybox_1.9.2.bb @@ -1,8 +1,7 @@ require busybox.inc -PR = "r4" +PR = "r0" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \ file://udhcpscript.patch;patch=1 \ file://adduser-longops.patch;patch=1 \ file://sort-z-nul.patch;patch=1;status=upstream \ diff --git a/packages/dbus/dbus-1.2.1/dbus-1.init b/packages/dbus/dbus-1.2.1/dbus-1.init index 0725083c69..bf002748a1 100644 --- a/packages/dbus/dbus-1.2.1/dbus-1.init +++ b/packages/dbus/dbus-1.2.1/dbus-1.init @@ -2,14 +2,15 @@ # -*- coding: utf-8 -*- # Debian init.d script for D-BUS # Copyright © 2003 Colin Walters <walters@debian.org> +# Copyright 2008 OE Team set -e DAEMON=/usr/bin/dbus-daemon NAME=dbus DAEMONUSER=messagebus -PIDDIR=/var/run/dbus -PIDFILE=$PIDDIR/pid +RUNDIR=/var/run/dbus +PIDFILE=/var/run/messagebus.pid UUIDDIR=/var/lib/dbus DESC="system message bus" EVENTDIR=/etc/dbus-1/event.d @@ -27,10 +28,10 @@ test "$ENABLED" != "0" || exit 0 start_it_up() { - if [ ! -d $PIDDIR ]; then - mkdir -p $PIDDIR - chown $DAEMONUSER $PIDDIR - chgrp $DAEMONUSER $PIDDIR + if [ ! -d $RUNDIR ]; then + mkdir -p $RUNDIR + chown $DAEMONUSER $RUNDIR + chgrp $DAEMONUSER $RUNDIR fi if [ -e $PIDFILE ]; then PIDDIR=/proc/$(cat $PIDFILE) @@ -51,7 +52,7 @@ start_it_up() dbus-uuidgen --ensure echo -n "Starting $DESC: " - start-stop-daemon --start --quiet --pidfile $PIDFILE \ + start-stop-daemon --start --pidfile $PIDFILE \ --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS echo "$NAME." if [ -d $EVENTDIR ]; then @@ -66,7 +67,7 @@ shut_it_down() run-parts --arg=stop $EVENTDIR fi echo -n "Stopping $DESC: " - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + start-stop-daemon --stop --oknodo --pidfile $PIDFILE \ --user $DAEMONUSER # We no longer include these arguments so that start-stop-daemon # can do its job even given that we may have been upgraded. diff --git a/packages/dbus/dbus_1.2.1.bb b/packages/dbus/dbus_1.2.1.bb index f331b140aa..8e3e329fde 100644 --- a/packages/dbus/dbus_1.2.1.bb +++ b/packages/dbus/dbus_1.2.1.bb @@ -1,3 +1,3 @@ include dbus.inc -PR = "r0" +PR = "r1" diff --git a/packages/diffutils/diffutils_2.8.1.bb b/packages/diffutils/diffutils_2.8.1.bb index 584188c2a3..b979fa89f6 100644 --- a/packages/diffutils/diffutils_2.8.1.bb +++ b/packages/diffutils/diffutils_2.8.1.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DESCRIPTION = "Diffutils contains the GNU diff, diff3, \ sdiff, and cmp utilities. These programs are usually \ used for creating patch files." -PR = "r3" +PR = "r4" SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz" @@ -15,6 +15,7 @@ inherit autotools update-alternatives # because it uses __mempcpy, there are other things (TBD: # see diffutils.mk in buildroot) EXTRA_OECONF_linux-uclibc = "--without-included-regex" +EXTRA_OECONF_linux-uclibcgnueabi = "--without-included-regex" do_install_append () { mv ${D}${bindir}/diff ${D}${bindir}/diff.${PN} diff --git a/packages/dosbox/dosbox.inc b/packages/dosbox/dosbox.inc new file mode 100644 index 0000000000..9cad5f35cd --- /dev/null +++ b/packages/dosbox/dosbox.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Dos Emulator based on SDL" +SECTION = "base" +PRIORITY = "optional" +DEPENDS = "virtual/libsdl" +LICENSE = "GPL" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/dosbox/dosbox-${PV}.tar.gz \ + file://nocdrom.patch;patch=1" + +CXXFLAGS_append = " -DC_SDL_NOCDROM" + +inherit autotools diff --git a/packages/dosbox/dosbox_0.63.bb b/packages/dosbox/dosbox_0.63.bb index 9d68e27515..1d29ce0401 100644 --- a/packages/dosbox/dosbox_0.63.bb +++ b/packages/dosbox/dosbox_0.63.bb @@ -1,12 +1 @@ -DESCRIPTION = "Dos Emulator based on SDL" -SECTION = "base" -PRIORITY = "optional" -DEPENDS = "virtual/libsdl" -LICENSE = "GPL" - -SRC_URI = "${SOURCEFORGE_MIRROR}/dosbox/dosbox-${PV}.tar.gz \ - file://nocdrom.patch;patch=1" -CXXFLAGS_append = " -DC_SDL_NOCDROM" - -inherit autotools - +require dosbox.inc diff --git a/packages/dosbox/dosbox_0.70.bb b/packages/dosbox/dosbox_0.70.bb index 9d68e27515..1d29ce0401 100644 --- a/packages/dosbox/dosbox_0.70.bb +++ b/packages/dosbox/dosbox_0.70.bb @@ -1,12 +1 @@ -DESCRIPTION = "Dos Emulator based on SDL" -SECTION = "base" -PRIORITY = "optional" -DEPENDS = "virtual/libsdl" -LICENSE = "GPL" - -SRC_URI = "${SOURCEFORGE_MIRROR}/dosbox/dosbox-${PV}.tar.gz \ - file://nocdrom.patch;patch=1" -CXXFLAGS_append = " -DC_SDL_NOCDROM" - -inherit autotools - +require dosbox.inc diff --git a/packages/dosbox/dosbox_0.72.bb b/packages/dosbox/dosbox_0.72.bb new file mode 100644 index 0000000000..01a2166328 --- /dev/null +++ b/packages/dosbox/dosbox_0.72.bb @@ -0,0 +1,2 @@ +require dosbox.inc + diff --git a/packages/efl1/imlib2_cvs.bb b/packages/efl1/imlib2_cvs.bb index c1d1f72791..18cca99ae4 100644 --- a/packages/efl1/imlib2_cvs.bb +++ b/packages/efl1/imlib2_cvs.bb @@ -3,12 +3,10 @@ LICENSE = "BSD" # can also depend on tiff34, ungif or gif, z, bz2, id3tag DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" PV = "1.4.1.000+cvs${SRCDATE}" -PR = "r0" +PR = "r1" inherit efl -SRC_URI += "file://remove-local-includes.patch;patch=1" - EXTRA_OECONF = "--with-x" # TODO: Use more fine granular version diff --git a/packages/ezx/ezx-boot-usb-native_0.2.0.bb b/packages/ezx/ezx-boot-usb-native_0.2.0.bb new file mode 100644 index 0000000000..6091e36d11 --- /dev/null +++ b/packages/ezx/ezx-boot-usb-native_0.2.0.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Boots a Motorola EZX device with a user supplied kernel zImage" +DEPENDS = "libusb-native" +SECTION = "devel" +AUTHOR = "Team OpenEZX <openezx-devel@lists.openezx.org>" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.openezx.org/download/boot_usb-${PV}.tar.bz2 \ + file://asm-arm" +S = "${WORKDIR}/boot_usb-${PV}" + +inherit native + +do_compile() { + ${CC} ${CFLAGS} -I${WORKDIR} ${LDFLAGS} -lusb -o ezx-boot-usb boot_usb.c +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0755 ezx-boot-usb ${DEPLOY_DIR_IMAGE}/ezx-boot-usb +} + +do_stage() { + : +} + +do_install() { + : +} + +addtask deploy before do_build after do_compile diff --git a/packages/freesmartphone/py-odeviced/om-gta02/.mtn2git_empty b/packages/ezx/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/freesmartphone/py-odeviced/om-gta02/.mtn2git_empty +++ b/packages/ezx/files/.mtn2git_empty diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty b/packages/ezx/files/asm-arm/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty +++ b/packages/ezx/files/asm-arm/.mtn2git_empty diff --git a/packages/ezx/files/asm-arm/setup.h b/packages/ezx/files/asm-arm/setup.h new file mode 100644 index 0000000000..7bbf105463 --- /dev/null +++ b/packages/ezx/files/asm-arm/setup.h @@ -0,0 +1,226 @@ +/* + * linux/include/asm/setup.h + * + * Copyright (C) 1997-1999 Russell King + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Structure passed to kernel to tell it about the + * hardware it's running on. See Documentation/arm/Setup + * for more info. + */ +#ifndef __ASMARM_SETUP_H +#define __ASMARM_SETUP_H + +#include <asm/types.h> + +#define COMMAND_LINE_SIZE 1024 + +/* The list ends with an ATAG_NONE node. */ +#define ATAG_NONE 0x00000000 + +struct tag_header { + __u32 size; + __u32 tag; +}; + +/* The list must start with an ATAG_CORE node */ +#define ATAG_CORE 0x54410001 + +struct tag_core { + __u32 flags; /* bit 0 = read-only */ + __u32 pagesize; + __u32 rootdev; +}; + +/* it is allowed to have multiple ATAG_MEM nodes */ +#define ATAG_MEM 0x54410002 + +struct tag_mem32 { + __u32 size; + __u32 start; /* physical start address */ +}; + +/* VGA text type displays */ +#define ATAG_VIDEOTEXT 0x54410003 + +struct tag_videotext { + __u8 x; + __u8 y; + __u16 video_page; + __u8 video_mode; + __u8 video_cols; + __u16 video_ega_bx; + __u8 video_lines; + __u8 video_isvga; + __u16 video_points; +}; + +/* describes how the ramdisk will be used in kernel */ +#define ATAG_RAMDISK 0x54410004 + +struct tag_ramdisk { + __u32 flags; /* bit 0 = load, bit 1 = prompt */ + __u32 size; /* decompressed ramdisk size in _kilo_ bytes */ + __u32 start; /* starting block of floppy-based RAM disk image */ +}; + +/* 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 { + __u32 start; /* physical start address */ + __u32 size; /* size of compressed ramdisk image in bytes */ +}; + +/* board serial number. "64 bits should be enough for everybody" */ +#define ATAG_SERIAL 0x54410006 + +struct tag_serialnr { + __u32 low; + __u32 high; +}; + +/* board revision */ +#define ATAG_REVISION 0x54410007 + +struct tag_revision { + __u32 rev; +}; + +/* initial values for vesafb-type framebuffers. see struct screen_info + * in include/linux/tty.h + */ +#define ATAG_VIDEOLFB 0x54410008 + +struct tag_videolfb { + __u16 lfb_width; + __u16 lfb_height; + __u16 lfb_depth; + __u16 lfb_linelength; + __u32 lfb_base; + __u32 lfb_size; + __u8 red_size; + __u8 red_pos; + __u8 green_size; + __u8 green_pos; + __u8 blue_size; + __u8 blue_pos; + __u8 rsvd_size; + __u8 rsvd_pos; +}; + +/* command line: \0 terminated string */ +#define ATAG_CMDLINE 0x54410009 + +struct tag_cmdline { + char cmdline[1]; /* this is the minimum size */ +}; + +/* acorn RiscPC specific information */ +#define ATAG_ACORN 0x41000101 + +struct tag_acorn { + __u32 memc_control_reg; + __u32 vram_pages; + __u8 sounddefault; + __u8 adfsdrives; +}; + +/* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */ +#define ATAG_MEMCLK 0x41000402 + +struct tag_memclk { + __u32 fmemclk; +}; + +struct tag { + struct tag_header hdr; + union { + struct tag_core core; + struct tag_mem32 mem; + struct tag_videotext videotext; + struct tag_ramdisk ramdisk; + struct tag_initrd initrd; + struct tag_serialnr serialnr; + struct tag_revision revision; + struct tag_videolfb videolfb; + struct tag_cmdline cmdline; + + /* + * Acorn specific + */ + struct tag_acorn acorn; + + /* + * DC21285 specific + */ + struct tag_memclk memclk; + } u; +}; + +struct tagtable { + __u32 tag; + int (*parse)(const struct tag *); +}; + +#define tag_member_present(tag,member) \ + ((unsigned long)(&((struct tag *)0L)->member + 1) \ + <= (tag)->hdr.size * 4) + +#define tag_next(t) ((struct tag *)((__u32 *)(t) + (t)->hdr.size)) +#define tag_size(type) ((sizeof(struct tag_header) + sizeof(struct type)) >> 2) + +#define for_each_tag(t,base) \ + for (t = base; t->hdr.size; t = tag_next(t)) + +#ifdef __KERNEL__ + +#define __tag __used __attribute__((__section__(".taglist.init"))) +#define __tagtable(tag, fn) \ +static struct tagtable __tagtable_##fn __tag = { tag, fn } + +/* + * Memory map description + */ +#ifdef CONFIG_ARCH_LH7A40X +# define NR_BANKS 16 +#else +# define NR_BANKS 8 +#endif + +struct membank { + unsigned long start; + unsigned long size; + int node; +}; + +struct meminfo { + int nr_banks; + struct membank bank[NR_BANKS]; +}; + +/* + * Early command line parameters. + */ +struct early_params { + const char *arg; + void (*fn)(char **p); +}; + +#define __early_param(name,fn) \ +static struct early_params __early_##fn __used \ +__attribute__((__section__(".early_param.init"))) = { name, fn } + +#endif /* __KERNEL__ */ + +#endif diff --git a/packages/freesmartphone/gsm0710muxd_git.bb b/packages/freesmartphone/gsm0710muxd_git.bb new file mode 100644 index 0000000000..d5e9bd0672 --- /dev/null +++ b/packages/freesmartphone/gsm0710muxd_git.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "GSM 07.10 muxer userspace daemon" +HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd" +AUTHOR = "M. Dietrich" +SECTION = "console/network" +DEPENDS = "dbus dbus-glib" +RDEPENDS = "dbus dbus-glib" +LICENSE = "GPL" +PV = "0.9.1+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +inherit autotools + +# install init script for people who want to manually +# start/stop it, but don't add runlevels. +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -m 0755 data/gsm0710muxd ${D}${sysconfdir}/init.d/ +} + +FILES_${PN} += "${datadir} ${sysconfdir}" diff --git a/packages/freesmartphone/gsm0710muxd_svn.bb b/packages/freesmartphone/gsm0710muxd_svn.bb deleted file mode 100644 index 09b3b8c4fb..0000000000 --- a/packages/freesmartphone/gsm0710muxd_svn.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "GSM 07.10 muxer userspace daemon" -HOMEPAGE = "http://www.freesmartphone.org" -AUTHOR = "M. Dietrich" -SECTION = "console/network" -DEPENDS = "intltool-native dbus dbus-glib" -RDEPENDS = "dbus dbus-glib" -LICENSE = "GPL" -PV = "0.9.0+svnr${SRCREV}" -PR = "r0" - -SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd" -S = "${WORKDIR}/gsm0710muxd" - -inherit autotools - -do_install_append() { - # temp hack - mv -f ${D}${datadir}/dbus-1/system-services/org.freesmartphone.GSM.MUX.service ${D}${datadir}/dbus-1/system-services/org.mobile.mux.service -} - -pkg_postinst_${PN}() { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - # reload dbus configuration files - for i in `pidof dbus-daemon`; do - kill -SIGHUP $i - done -} - -FILES_${PN} += "${datadir}" - diff --git a/packages/freesmartphone/pygsm_git.bb b/packages/freesmartphone/pygsm_git.bb new file mode 100644 index 0000000000..7ee9d6824f --- /dev/null +++ b/packages/freesmartphone/pygsm_git.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Python support library for GSM 07.07 / GSM 07.05 daemons" +AUTHOR = "Michael Dietrich" +SECTION = "console/network" +DEPENDS = "python-cython-native python-pyrex-native" +LICENSE = "GPL" +PV = "0.0.0+gitr${SRCREV}" +PR = "r0" + +inherit distutils + +SRC_URI = "${FREESMARTPHONE_GIT}/pygsm.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +RDEPENDS_${PN} += "\ + python-dbus \ + python-pygobject \ + python-syslog \ +" diff --git a/packages/freesmartphone/pyneod_svn.bb b/packages/freesmartphone/pyneod_git.bb index 1ca728afe1..7cdfaace22 100644 --- a/packages/freesmartphone/pyneod_svn.bb +++ b/packages/freesmartphone/pyneod_git.bb @@ -1,18 +1,19 @@ -DESCRIPTION = "FIC Neo Smartphone daemons implementing the freesmartphone.org dbus APIs" +DESCRIPTION = "Zad - daemons" +HOMEPAGE = "http://neo1973-germany.de/wiki/Zad" AUTHOR = "M. Dietrich" SECTION = "console/network" DEPENDS = "python" LICENSE = "GPL" -PV = "0.0+svnr${SRCREV}" -PR = "r3" +PV = "0.0.0+gitr${SRCREV}" +PR = "r0" inherit update-rc.d INITSCRIPT_NAME = "pyneod" INITSCRIPT_PARAMS = "defaults 40" -SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneod" -S = "${WORKDIR}/pyneod" +SRC_URI = "${FREESMARTPHONE_GIT}/pyneo.git;protocol=git;branch=master" +S = "${WORKDIR}/git/pyneod" export D := "${D}" export PREFIX = "${prefix}" diff --git a/packages/freesmartphone/pyneog_svn.bb b/packages/freesmartphone/pyneog_git.bb index 389c7369e5..c7d0235d03 100644 --- a/packages/freesmartphone/pyneog_svn.bb +++ b/packages/freesmartphone/pyneog_git.bb @@ -1,12 +1,13 @@ -DESCRIPTION = "FIC Neo Smartphone UI Environment" +DESCRIPTION = "Zad - GUI" +HOMEPAGE = "http://neo1973-germany.de/wiki/Zad" AUTHOR = "M. Dietrich" SECTION = "python/ui" LICENSE = "GPL" -PV = "0.0+svnr${SRCREV}" +PV = "0.0.0+gitr${SRCREV}" PR = "r0" -SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneog" -S = "${WORKDIR}/pyneog" +SRC_URI = "${FREESMARTPHONE_GIT}/pyneo.git;protocol=git;branch=master" +S = "${WORKDIR}/git/pyneog" do_compile() { : diff --git a/packages/gqview/gqview-2.1.1/.mtn2git_empty b/packages/freesmartphone/python-odeviced/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/gqview/gqview-2.1.1/.mtn2git_empty +++ b/packages/freesmartphone/python-odeviced/.mtn2git_empty diff --git a/packages/freesmartphone/py-odeviced/odeviced b/packages/freesmartphone/python-odeviced/odeviced index 52d3a1d196..52d3a1d196 100644 --- a/packages/freesmartphone/py-odeviced/odeviced +++ b/packages/freesmartphone/python-odeviced/odeviced diff --git a/packages/freesmartphone/py-odeviced/odeviced.conf b/packages/freesmartphone/python-odeviced/odeviced.conf index e69de29bb2..e69de29bb2 100644 --- a/packages/freesmartphone/py-odeviced/odeviced.conf +++ b/packages/freesmartphone/python-odeviced/odeviced.conf diff --git a/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty b/packages/freesmartphone/python-odeviced/om-gta02/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/hostap/hostap-daemon-0.6.3/.mtn2git_empty +++ b/packages/freesmartphone/python-odeviced/om-gta02/.mtn2git_empty diff --git a/packages/freesmartphone/py-odeviced/om-gta02/odeviced.conf b/packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf index b2f979a784..b2f979a784 100644 --- a/packages/freesmartphone/py-odeviced/om-gta02/odeviced.conf +++ b/packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf diff --git a/packages/freesmartphone/py-odeviced_svn.bb b/packages/freesmartphone/python-odeviced_git.bb index 0819499ed6..d380473878 100644 --- a/packages/freesmartphone/py-odeviced_svn.bb +++ b/packages/freesmartphone/python-odeviced_git.bb @@ -1,10 +1,10 @@ DESCRIPTION = "The Open Device Daemon Prototype in Python" -HOMEPAGE = "http://www.freesmartphone.org" +HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenDeviceDaemon" AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPLv2" -PV = "0.7.9+svnr${SRCREV}" +PV = "0.7.9+gitr${SRCREV}" PR = "r0" inherit distutils update-rc.d @@ -12,20 +12,24 @@ inherit distutils update-rc.d INITSCRIPT_NAME = "odeviced" INITSCRIPT_PARAMS = "defaults 20" -SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=py-odeviced \ +SRC_URI = "${FREESMARTPHONE_GIT}/python-odeviced.git;protocol=git;branch=master \ file://odeviced \ file://odeviced.conf" -S = "${WORKDIR}/py-odeviced" +S = "${WORKDIR}/git" do_install_append() { install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/odeviced ${D}${sysconfdir}/init.d/ install -m 0644 ${WORKDIR}/odeviced.conf ${D}${sysconfdir} + install -d ${D}${sysconfdir}/dbus-1/system.d/ + mv -f ${D}${datadir}/etc/dbus-1/system.d/odeviced.conf ${D}${sysconfdir}/dbus-1/system.d/ } RDEPENDS_${PN} += "\ python-dbus \ python-pygobject \ + python-pyrtc \ + python-syslog \ " FILES_${PN} += "${sysconfdir}" diff --git a/packages/linux/linux-2.6.22+2.6.23-rc5/.mtn2git_empty b/packages/freesmartphone/python-ophoned/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-2.6.22+2.6.23-rc5/.mtn2git_empty +++ b/packages/freesmartphone/python-ophoned/.mtn2git_empty diff --git a/packages/freesmartphone/python-ophoned_git.bb b/packages/freesmartphone/python-ophoned_git.bb new file mode 100644 index 0000000000..ebfe0c4b13 --- /dev/null +++ b/packages/freesmartphone/python-ophoned_git.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "The Open Phone Daemon (Python Implementation)" +HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenPhoneServer" +AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" +SECTION = "console/network" +DEPENDS = "python-cython-native python-pyrex-native" +LICENSE = "GPLv2" +PV = "0.0.0+gitr${SRCREV}" +PR = "r0" + +inherit distutils update-rc.d + +INITSCRIPT_NAME = "ophoned" +INITSCRIPT_PARAMS = "defaults 20" + +SRC_URI = "${FREESMARTPHONE_GIT}/python-ophoned.git;protocol=git;branch=master \ + file://ophoned" +S = "${WORKDIR}/git" + +do_install_append() { + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/ophoned ${D}${sysconfdir}/init.d/ +# install -m 0644 ${WORKDIR}/odeviced.conf ${D}${sysconfdir} + install -d ${D}${sysconfdir}/dbus-1/system.d/ +# mv -f ${D}${datadir}/etc/dbus-1/system.d/odeviced.conf ${D}${sysconfdir}/dbus-1/system.d/ +} + +RDEPENDS_${PN} += "\ + python-dbus \ + python-pygobject \ + python-pyrtc \ + python-syslog \ +" + +FILES_${PN} += "${sysconfdir}" diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc index 02fe1162bc..1392b3e830 100644 --- a/packages/gcc/gcc-4.2.2.inc +++ b/packages/gcc/gcc-4.2.2.inc @@ -40,6 +40,13 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://intermask-bigendian.patch;patch=1 \ " + +SRC_URI_append_avr32 = " \ + file://gcc-4.2.2.atmel.1.0.8.patch.bz2;patch=1 \ + file://901-avr32-no-cond-exec-before-reload-by-default.patch;patch=1 \ +" + + SRC_URI_append_ep93xx = " \ file://arm-crunch-saveregs.patch;patch=1 \ file://arm-crunch-20000320.patch;patch=1 \ @@ -71,4 +78,4 @@ JAVA = "" EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" -ARM_INSTRUCTION_SET = "arm"
\ No newline at end of file +ARM_INSTRUCTION_SET = "arm" diff --git a/packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch b/packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch new file mode 100644 index 0000000000..ab55ea4da1 --- /dev/null +++ b/packages/gcc/gcc-4.2.2/901-avr32-no-cond-exec-before-reload-by-default.patch @@ -0,0 +1,13 @@ +Index: gcc-4.2.2/gcc/config/avr32/avr32.c +=================================================================== +--- gcc-4.2.2.orig/gcc/config/avr32/avr32.c 2008-04-08 10:42:47.000000000 +0200 ++++ gcc-4.2.2/gcc/config/avr32/avr32.c 2008-04-08 10:43:33.000000000 +0200 +@@ -161,7 +161,7 @@ + /* Set default target_flags. */ + #undef TARGET_DEFAULT_TARGET_FLAGS + #define TARGET_DEFAULT_TARGET_FLAGS \ +- (MASK_HAS_ASM_ADDR_PSEUDOS | MASK_MD_REORG_OPTIMIZATION | MASK_COND_EXEC_BEFORE_RELOAD) ++ (MASK_HAS_ASM_ADDR_PSEUDOS | MASK_MD_REORG_OPTIMIZATION) + + void + avr32_optimization_options (int level, diff --git a/packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2 b/packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2 Binary files differnew file mode 100644 index 0000000000..4be097b095 --- /dev/null +++ b/packages/gcc/gcc-4.2.2/gcc-4.2.2.atmel.1.0.8.patch.bz2 diff --git a/packages/linux/linux-2.6.22.6/ts72xx/.mtn2git_empty b/packages/gdb/gdb-6.8/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/linux-2.6.22.6/ts72xx/.mtn2git_empty +++ b/packages/gdb/gdb-6.8/.mtn2git_empty diff --git a/packages/gdb/gdb-6.8/early_debug_in_nptl.patch b/packages/gdb/gdb-6.8/early_debug_in_nptl.patch new file mode 100644 index 0000000000..c53f0d8ad5 --- /dev/null +++ b/packages/gdb/gdb-6.8/early_debug_in_nptl.patch @@ -0,0 +1,306 @@ +http://sourceware.org/ml/gdb-patches/2007-06/msg00479.html + +Index: gdb/linux-thread-db.c +=================================================================== +--- gdb/linux-thread-db.c.orig 2006-10-20 03:08:14.000000000 +0200 ++++ gdb/linux-thread-db.c 2008-03-01 14:45:52.000000000 +0100 +@@ -213,6 +213,21 @@ + } + } + ++/* Return 1 if any threads have been registered. There may be none if ++ the threading library is not fully initialized yet. */ ++ ++static int ++have_threads_callback (struct thread_info *thread, void *dummy) ++{ ++ return 1; ++} ++ ++static int ++have_threads (void) ++{ ++ return iterate_over_threads (have_threads_callback, NULL) != NULL; ++} ++ + /* A callback function for td_ta_thr_iter, which we use to map all + threads to LWPs. + +@@ -700,23 +715,6 @@ + } + + static void +-thread_db_attach (char *args, int from_tty) +-{ +- target_beneath->to_attach (args, from_tty); +- +- /* Destroy thread info; it's no longer valid. */ +- init_thread_list (); +- +- /* The child process is now the actual multi-threaded +- program. Snatch its process ID... */ +- proc_handle.pid = GET_PID (inferior_ptid); +- +- /* ...and perform the remaining initialization steps. */ +- enable_thread_event_reporting (); +- thread_db_find_new_threads (); +-} +- +-static void + detach_thread (ptid_t ptid, int verbose) + { + struct thread_info *thread_info; +@@ -742,14 +740,13 @@ + disable_thread_event_reporting (); + + /* There's no need to save & restore inferior_ptid here, since the +- inferior is supposed to be survive this function call. */ ++ inferior is not supposed to survive this function call. */ + inferior_ptid = lwp_from_thread (inferior_ptid); + +- /* Forget about the child's process ID. We shouldn't need it +- anymore. */ +- proc_handle.pid = 0; +- + target_beneath->to_detach (args, from_tty); ++ ++ /* Should this be done by detach_command? */ ++ target_mourn_inferior (); + } + + static int +@@ -870,12 +867,6 @@ + + ptid = target_beneath->to_wait (ptid, ourstatus); + +- if (proc_handle.pid == 0) +- /* The current child process isn't the actual multi-threaded +- program yet, so don't try to do any special thread-specific +- post-processing and bail out early. */ +- return ptid; +- + if (ourstatus->kind == TARGET_WAITKIND_EXITED + || ourstatus->kind == TARGET_WAITKIND_SIGNALLED) + return pid_to_ptid (-1); +@@ -889,23 +880,32 @@ + return pid_to_ptid (GET_PID (ptid)); + } + ++ /* If we do not know about the main thread yet, this would be a good time to ++ find it. */ ++ if (ourstatus->kind == TARGET_WAITKIND_STOPPED && !have_threads ()) ++ thread_db_find_new_threads (); ++ + if (ourstatus->kind == TARGET_WAITKIND_STOPPED + && ourstatus->value.sig == TARGET_SIGNAL_TRAP) + /* Check for a thread event. */ + check_event (ptid); + +- if (!ptid_equal (trap_ptid, null_ptid)) +- trap_ptid = thread_from_lwp (trap_ptid); ++ if (have_threads ()) ++ { ++ /* Change ptids back into the higher level PID + TID format. If ++ the thread is dead and no longer on the thread list, we will ++ get back a dead ptid. This can occur if the thread death ++ event gets postponed by other simultaneous events. In such a ++ case, we want to just ignore the event and continue on. */ ++ ++ if (!ptid_equal (trap_ptid, null_ptid)) ++ trap_ptid = thread_from_lwp (trap_ptid); ++ ++ ptid = thread_from_lwp (ptid); ++ if (GET_PID (ptid) == -1) ++ ourstatus->kind = TARGET_WAITKIND_SPURIOUS; ++ } + +- /* Change the ptid back into the higher level PID + TID format. +- If the thread is dead and no longer on the thread list, we will +- get back a dead ptid. This can occur if the thread death event +- gets postponed by other simultaneous events. In such a case, +- we want to just ignore the event and continue on. */ +- ptid = thread_from_lwp (ptid); +- if (GET_PID (ptid) == -1) +- ourstatus->kind = TARGET_WAITKIND_SPURIOUS; +- + return ptid; + } + +@@ -944,30 +944,6 @@ + } + + static void +-thread_db_create_inferior (char *exec_file, char *allargs, char **env, +- int from_tty) +-{ +- unpush_target (&thread_db_ops); +- using_thread_db = 0; +- target_beneath->to_create_inferior (exec_file, allargs, env, from_tty); +-} +- +-static void +-thread_db_post_startup_inferior (ptid_t ptid) +-{ +- if (proc_handle.pid == 0) +- { +- /* The child process is now the actual multi-threaded +- program. Snatch its process ID... */ +- proc_handle.pid = GET_PID (ptid); +- +- /* ...and perform the remaining initialization steps. */ +- enable_thread_event_reporting (); +- thread_db_find_new_threads (); +- } +-} +- +-static void + thread_db_mourn_inferior (void) + { + /* Forget about the child's process ID. We shouldn't need it +@@ -1002,6 +978,22 @@ + + ptid = ptid_build (GET_PID (inferior_ptid), ti.ti_lid, ti.ti_tid); + ++ if (ti.ti_tid == 0) ++ { ++ /* A thread ID of zero means that this is the main thread, but ++ glibc has not yet initialized thread-local storage and the ++ pthread library. We do not know what the thread's TID will ++ be yet. Just enable event reporting and otherwise ignore ++ it. */ ++ ++ err = td_thr_event_enable_p (th_p, 1); ++ if (err != TD_OK) ++ error (_("Cannot enable thread event reporting for %s: %s"), ++ target_pid_to_str (ptid), thread_db_err_str (err)); ++ ++ return 0; ++ } ++ + if (!in_thread_list (ptid)) + attach_thread (ptid, th_p, &ti, 1); + +@@ -1058,6 +1050,16 @@ + return NULL; + } + ++/* Return 1 if this thread has the same LWP as the passed PTID. */ ++ ++static int ++same_ptid_callback (struct thread_info *thread, void *arg) ++{ ++ ptid_t *ptid_p = arg; ++ ++ return GET_LWP (thread->ptid) == GET_LWP (*ptid_p); ++} ++ + /* Get the address of the thread local variable in load module LM which + is stored at OFFSET within the thread local storage for thread PTID. */ + +@@ -1066,6 +1068,21 @@ + CORE_ADDR lm, + CORE_ADDR offset) + { ++ /* If we have not discovered any threads yet, check now. */ ++ if (!is_thread (ptid) && !have_threads ()) ++ thread_db_find_new_threads (); ++ ++ /* Try to find a matching thread if we still have the LWP ID instead ++ of the thread ID. */ ++ if (!is_thread (ptid)) ++ { ++ struct thread_info *thread; ++ ++ thread = iterate_over_threads (same_ptid_callback, &ptid); ++ if (thread != NULL) ++ ptid = thread->ptid; ++ } ++ + if (is_thread (ptid)) + { + td_err_e err; +@@ -1125,14 +1142,11 @@ + thread_db_ops.to_shortname = "multi-thread"; + thread_db_ops.to_longname = "multi-threaded child process."; + thread_db_ops.to_doc = "Threads and pthreads support."; +- thread_db_ops.to_attach = thread_db_attach; + thread_db_ops.to_detach = thread_db_detach; + thread_db_ops.to_resume = thread_db_resume; + thread_db_ops.to_wait = thread_db_wait; + thread_db_ops.to_xfer_partial = thread_db_xfer_partial; + thread_db_ops.to_kill = thread_db_kill; +- thread_db_ops.to_create_inferior = thread_db_create_inferior; +- thread_db_ops.to_post_startup_inferior = thread_db_post_startup_inferior; + thread_db_ops.to_mourn_inferior = thread_db_mourn_inferior; + thread_db_ops.to_find_new_threads = thread_db_find_new_threads; + thread_db_ops.to_pid_to_str = thread_db_pid_to_str; +Index: gdb/gdbserver/thread-db.c +=================================================================== +--- gdb/gdbserver/thread-db.c.orig 2006-10-17 18:02:27.000000000 +0200 ++++ gdb/gdbserver/thread-db.c 2008-03-01 14:44:41.000000000 +0100 +@@ -40,6 +40,7 @@ + /* Connection to the libthread_db library. */ + static td_thragent_t *thread_agent; + ++static void thread_db_find_new_threads (void); + static int find_new_threads_callback (const td_thrhandle_t *th_p, void *data); + + static char * +@@ -134,6 +135,8 @@ + td_event_msg_t msg; + td_err_e err; + struct inferior_linux_data *tdata; ++ struct thread_info *inferior; ++ struct process_info *process; + + if (debug_threads) + fprintf (stderr, "Thread creation event.\n"); +@@ -149,6 +152,14 @@ + fprintf (stderr, "thread getmsg err: %s\n", + thread_db_err_str (err)); + ++ /* If we do not know about the main thread yet, this would be a good time to ++ find it. We need to do this to pick up the main thread before any newly ++ created threads. */ ++ inferior = (struct thread_info *) all_threads.head; ++ process = get_thread_process (inferior); ++ if (process->thread_known == 0) ++ thread_db_find_new_threads (); ++ + /* msg.event == TD_EVENT_CREATE */ + + find_new_threads_callback (msg.th_p, NULL); +@@ -231,8 +242,24 @@ + { + inferior = (struct thread_info *) all_threads.head; + process = get_thread_process (inferior); ++ + if (process->thread_known == 0) + { ++ /* If the new thread ID is zero, a final thread ID will be ++ available later. Do not enable thread debugging yet. */ ++ if (ti_p->ti_tid == 0) ++ { ++ err = td_thr_event_enable (th_p, 1); ++ if (err != TD_OK) ++ error ("Cannot enable thread event reporting for %d: %s", ++ ti_p->ti_lid, thread_db_err_str (err)); ++ return; ++ } ++ ++ if (process->lwpid != ti_p->ti_lid) ++ fatal ("PID mismatch! Expected %ld, got %ld", ++ (long) process->lwpid, (long) ti_p->ti_lid); ++ + /* Switch to indexing the threads list by TID. */ + change_inferior_id (&all_threads, ti_p->ti_tid); + goto found; +@@ -331,6 +358,8 @@ + + process = get_thread_process (thread); + if (!process->thread_known) ++ thread_db_find_new_threads (); ++ if (!process->thread_known) + return TD_NOTHR; + + err = td_thr_tls_get_addr (&process->th, (psaddr_t) load_module, offset, diff --git a/packages/gdb/gdb-avr32.inc b/packages/gdb/gdb-avr32.inc new file mode 100644 index 0000000000..0c0255fdb2 --- /dev/null +++ b/packages/gdb/gdb-avr32.inc @@ -0,0 +1,32 @@ +# Perform tasks required to use Atmel's AVR32 patches +# See http://avr32linux.org/twiki/bin/view/Main/GDBPatches for more info + + +do_avr32_reconf () { + if test ${TARGET_ARCH} == "avr32"; then + (cd ${S} && autoconf) || \ + die "failure running autoconf in top-level gdb" + + (cd ${S}/bfd && autoreconf) || \ + die "failure running autoreconf in bfd/" + + (cd ${S}/opcodes && autoreconf) || \ + die "failure running autoreconf in opcodes/" + fi + +} + + + +do_avr32_configure_bfd () { + if test ${TARGET_ARCH} == "avr32"; then + (cd ${B} && make configure-bfd) || die "Error running configure-bfd" + (cd ${B}/bfd && make headers) || \ + die "error running 'make headers' in bfd" + fi +} + + +addtask avr32_reconf after do_patch before do_configure +addtask avr32_configure_bfd after do_configure before do_compile + diff --git a/packages/gdb/gdb-cross-sdk_6.8.bb b/packages/gdb/gdb-cross-sdk_6.8.bb new file mode 100644 index 0000000000..b96348959f --- /dev/null +++ b/packages/gdb/gdb-cross-sdk_6.8.bb @@ -0,0 +1,7 @@ +require gdb-cross.inc + +inherit sdk + +do_stage() { + : +} diff --git a/packages/gdb/gdb-cross.inc b/packages/gdb/gdb-cross.inc index 480cce4931..6d4c3d177e 100644 --- a/packages/gdb/gdb-cross.inc +++ b/packages/gdb/gdb-cross.inc @@ -10,6 +10,12 @@ do_configure () { # override this function to avoid the autoconf/automake/aclocal/autoheader # calls for now (cd ${S} && gnu-configize) || die "failure in running gnu-configize" + + # Fix for issues when system's texinfo version >= 4.10 + # (See https://bugzilla.redhat.com/show_bug.cgi?id=345621) + sed -i -e "s@egrep 'texinfo.*'@egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|4.[1-9][0-9]+|[5-9])'@" '${S}/configure' + + oe_runconf } diff --git a/packages/gdb/gdb-cross_6.8.bb b/packages/gdb/gdb-cross_6.8.bb new file mode 100644 index 0000000000..b0fb2e5788 --- /dev/null +++ b/packages/gdb/gdb-cross_6.8.bb @@ -0,0 +1,8 @@ +require gdb-cross.inc + +SRC_URI += "file://sim-install-6.6.patch;patch=1" +SRC_URI += "file://early_debug_in_nptl.patch;patch=1;pnum=0" + +inherit cross + +PR = "r1" diff --git a/packages/gdb/gdb_6.8.bb b/packages/gdb/gdb_6.8.bb new file mode 100644 index 0000000000..5b8f3769bd --- /dev/null +++ b/packages/gdb/gdb_6.8.bb @@ -0,0 +1,3 @@ +require gdb.inc + +PR = "r1" diff --git a/packages/wpa-supplicant/wpa-supplicant-nossl/.mtn2git_empty b/packages/geany/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/wpa-supplicant/wpa-supplicant-nossl/.mtn2git_empty +++ b/packages/geany/.mtn2git_empty diff --git a/packages/geany/geany_0.14.bb b/packages/geany/geany_0.14.bb new file mode 100644 index 0000000000..525f4cfa0a --- /dev/null +++ b/packages/geany/geany_0.14.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Text editor with some IDE functionality" +HOMEPAGE = "http://geany.sf.net" +SECTION = "editors" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/geany/${P}.tar.bz2" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-plugins --disable-vte" diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc new file mode 100644 index 0000000000..d0bc8d62a0 --- /dev/null +++ b/packages/gnash/gnash-minimal.inc @@ -0,0 +1,49 @@ +DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" +HOMEPAGE = "http://www.gnu.org/software/gnash" +LICENSE = "GPL-2" +DEPENDS = "agg libxml2 libmad zlib boost jpeg pango curl freetype" +PR = "r4" + +SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" +S = ${WORKDIR}/gnash-${PV} + +inherit autotools pkgconfig + +# gnash-minimal is intended for running directly on a framebuffer device +# for memory constrained devices, but does not accept all SWF files. +# As such, it is useful as a GUI frontend for dedicated SWF files. + +# JPEG support and libz cannot be disabled due to a bug in 0.8.2. +# maintainer-mode is enabled to disable the testsuite. + +EXTRA_OECONF="--enable-gui=gtk \ + --enable-renderer=agg \ + --enable-media=none \ + --enable-agg \ + --enable-gui=fb \ + --enable-z \ + --enable-jpeg \ + --disable-klash \ + --disable-glext \ + --disable-Xft \ + --disable-expat \ + --disable-mad \ + --disable-gstreamer \ + --disable-cairo \ + --disable-plugin \ + --disable-cygnal \ + --disable-testsuite \ + --enable-maintainer-mode \ + --enable-fps-debug \ + --enable-allstatic \ + --with-top-level=${STAGING_DIR_HOST}/usr \ + " + +PACKAGES =+ " libgnashamf libgnashbase libgnashserver libgnashmedia libltdl" + +FILES_libltdl = "${libdir}/gnash/libltdl*.so*" +FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so" +FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so" +FILES_libgnashmedia = "${libdir}/gnash/libgnashmedia-${PV}.so" +FILES_libgnashserver = "${libdir}/gnash/libgnashserver-${PV}.so" + diff --git a/packages/gnash/gnash-minimal_0.8.2.bb b/packages/gnash/gnash-minimal_0.8.2.bb new file mode 100644 index 0000000000..bcfb88c42f --- /dev/null +++ b/packages/gnash/gnash-minimal_0.8.2.bb @@ -0,0 +1,2 @@ +require gnash-minimal.inc + diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb new file mode 100644 index 0000000000..c079caadc6 --- /dev/null +++ b/packages/gnash/gnash-minimal_cvs.bb @@ -0,0 +1,4 @@ +require gnash-minimal.inc + +SRC_URI = "cvs://anonymous:anonymous@cvs.sv.gnu.org/sources/gnash;module=gnash" +S = ${WORKDIR}/gnash diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc index 113422596a..31e84b84ac 100644 --- a/packages/gnash/gnash.inc +++ b/packages/gnash/gnash.inc @@ -27,12 +27,12 @@ EXTRA_OECONF = "--enable-gui=gtk \ PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver " -FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so" -FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so" -FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so" -FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so" -FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so" -FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so" -FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so" +FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so" +FILES_libgnashbackend = "${libdir}/gnash/libgnashbackend-${PV}.so" +FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so" +FILES_libgnashgeo = "${libdir}/gnash/libgnashgeo-${PV}.so" +FILES_libgnashgui = "${libdir}/gnash/libgnashgui-${PV}.so" +FILES_libgnashplayer = "${libdir}/gnash/libgnashplayer-${PV}.so" +FILES_libgnashserver = "${libdir}/gnash/libgnashserver-${PV}.so" PARALLEL_MAKE = "" diff --git a/packages/gnome/epiphany_2.22.1.bb b/packages/gnome/epiphany_2.22.1.bb new file mode 100644 index 0000000000..82f158eae2 --- /dev/null +++ b/packages/gnome/epiphany_2.22.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "GNOME default webbrowser" +DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" +RDEPENDS = "gnome-vfs-plugin-http" + +inherit gnome + + +EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}" + +do_configure_prepend() { + touch ${S}/gnome-doc-utils.make + sed -i -e s:help::g Makefile.am +} + +FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" + + diff --git a/packages/gnome/libsoup_2.2.100.bb b/packages/gnome/libsoup_2.2.100.bb index e642b83cc7..a7d96ec8e4 100644 --- a/packages/gnome/libsoup_2.2.100.bb +++ b/packages/gnome/libsoup_2.2.100.bb @@ -13,7 +13,6 @@ FILES_${PN}-dev = "${includedir}/ ${libdir}/" FILES_${PN}-doc = "${datadir}/" do_stage() { - rm -f ${PKG_CONFIG_DIR}/libsoup* autotools_stage_all - ln -sf ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc + cp ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.2.pc } diff --git a/packages/gnome/libsoup_2.4.1.bb b/packages/gnome/libsoup_2.4.1.bb new file mode 100644 index 0000000000..42e5decb05 --- /dev/null +++ b/packages/gnome/libsoup_2.4.1.bb @@ -0,0 +1,19 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "An HTTP library implementation in C" +SECTION = "x11/gnome/libs" +LICENSE = "GPL" +DEPENDS = "glib-2.0 gnutls libxml2" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/${PN}-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all + cp ${PKG_CONFIG_DIR}/libsoup.pc ${PKG_CONFIG_DIR}/libsoup-2.4.pc +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${includedir}/ ${libdir}/" +FILES_${PN}-doc = "${datadir}/" diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc index 79b1fcefa5..ddf7c68eca 100644 --- a/packages/gnuradio/gnuradio.inc +++ b/packages/gnuradio/gnuradio.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = " guile-native fftwf python libusb virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native" -RDEPENDS_${PN} = "python-core python-audio python-codecs python-lang python-textutils" +RDEPENDS_${PN} = "python-core python-audio python-threading python-codecs python-lang python-textutils" RDEPENDS_gnuradio-usrp = "python-core" inherit autotools pkgconfig diff --git a/packages/gnuradio/gnuradio_3.0.4.bb b/packages/gnuradio/gnuradio_3.0.4.bb index 30a6d0ab5e..0474e0d5c2 100644 --- a/packages/gnuradio/gnuradio_3.0.4.bb +++ b/packages/gnuradio/gnuradio_3.0.4.bb @@ -1,6 +1,6 @@ require gnuradio.inc -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \ file://no-trellis-doc.patch;patch=1 \ diff --git a/packages/gnuradio/gnuradio_3.1.2.bb b/packages/gnuradio/gnuradio_3.1.2.bb index 30a6d0ab5e..0474e0d5c2 100644 --- a/packages/gnuradio/gnuradio_3.1.2.bb +++ b/packages/gnuradio/gnuradio_3.1.2.bb @@ -1,6 +1,6 @@ require gnuradio.inc -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \ file://no-trellis-doc.patch;patch=1 \ diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb index 00d3a04056..e7ac492714 100644 --- a/packages/gnuradio/gnuradio_svn.bb +++ b/packages/gnuradio/gnuradio_svn.bb @@ -3,7 +3,7 @@ require gnuradio.inc DEFAULT_PREFERENCE = "-1" PV = "3.0.4+svnr${SRCREV}" -PR = "r2" +PR = "r3" SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \ file://no-trellis-doc.patch;patch=1 \ diff --git a/packages/gpgme/gpgme.inc b/packages/gpgme/gpgme.inc index 71cd68fa2b..e89d402b6a 100644 --- a/packages/gpgme/gpgme.inc +++ b/packages/gpgme/gpgme.inc @@ -2,6 +2,7 @@ DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to G HOMEPAGE = "http://www.gnupg.org/gpgme.html" LICENSE = "GPL" DEPENDS = "libgpg-error pth libassuan" +RRECOMMENDS_${PN} = "gnupg" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz" diff --git a/packages/gpgme/gpgme_1.0.0.bb b/packages/gpgme/gpgme_1.0.0.bb index 2a8923ba4c..2b8b07c90e 100644 --- a/packages/gpgme/gpgme_1.0.0.bb +++ b/packages/gpgme/gpgme_1.0.0.bb @@ -1,3 +1,3 @@ require gpgme.inc -PR = "r2" +PR = "r3" diff --git a/packages/gpgme/gpgme_1.0.3.bb b/packages/gpgme/gpgme_1.0.3.bb index 2a8923ba4c..2b8b07c90e 100644 --- a/packages/gpgme/gpgme_1.0.3.bb +++ b/packages/gpgme/gpgme_1.0.3.bb @@ -1,3 +1,3 @@ require gpgme.inc -PR = "r2" +PR = "r3" diff --git a/packages/gpgme/gpgme_1.1.4.bb b/packages/gpgme/gpgme_1.1.4.bb index 2b8b07c90e..7ab54ec5d7 100644 --- a/packages/gpgme/gpgme_1.1.4.bb +++ b/packages/gpgme/gpgme_1.1.4.bb @@ -1,3 +1,3 @@ require gpgme.inc -PR = "r3" +PR = "r4" diff --git a/packages/gpsd/gpsd_2.37.bb b/packages/gpsd/gpsd_2.37.bb new file mode 100644 index 0000000000..58e9ebeee2 --- /dev/null +++ b/packages/gpsd/gpsd_2.37.bb @@ -0,0 +1,3 @@ +require gpsd.inc + +PR = "r0" diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch deleted file mode 100644 index 878cb1dba9..0000000000 --- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl ---- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl 2007-12-28 18:49:44.000000000 +0100 -+++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl 2008-01-04 19:01:35.000000000 +0100 -@@ -35,6 +35,7 @@ - modified (Jul 2005) by Jaroslaw Zachwieja <grok\@filippa.org.uk> - modified (Dec 2005) by David Pollard <david dot pollard\@optusnet.com.au> - modified (Jul 2007) by Maciek Kaliszewski <mkalkal\@interia.pl> -+modified (Jan 2008) by Gernot Hillier <gernot\@hillier.de> (added Openstreetmap support) - Version svn-$Version - "; - -@@ -176,6 +177,25 @@ - 15812 => 3 , - 7906 => 2, - 3953 => 1 -+ }, -+ openstreetmap_tah => { -+ 256*576000 => 1, -+ 128*576000 => 2, -+ 64*576000 => 3, -+ 32*576000 => 4, -+ 16*576000 => 5, -+ 8*576000 => 6, -+ 4*576000 => 7, -+ 2*576000 => 8, -+ 576000 => 9, -+ 288000 => 10, -+ 144000 => 11, -+ 72000 => 12, -+ 36000 => 13, -+ 18000 => 14, -+ 9000 => 15, -+ 4500 => 16, -+ 2250 => 17 - } - }; - -@@ -331,7 +351,6 @@ - exit(); - } - -- - # Verify that we have the options that we need - pod2usage(1) if (&error_check); - -@@ -417,6 +436,13 @@ - print "+-----------------------------------------------------------+\n"; - print "| Landsat Maps are Copyright, ..... |\n"; - print "| They are free for non commercial use. |\n"; -+}elsif ( $mapserver eq 'openstreetmap_tah' ){ -+ print "+-----------------------------------------------------------+\n"; -+ print "| OpenStreetmap Maps are Copyright by the OpenStreetmap |\n"; -+ print "| project. |\n"; -+ print "| They are free for use under the terms of the |\n"; -+ print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\" |\n"; -+ print "| license. See http://www.openstreetmap.org for details. |\n"; - } elsif ( ! $force) { - print "You are violating the map servers copyright!\n"; - print "Are you sure you want to continue? [y|n] "; -@@ -700,6 +726,11 @@ - { - ($url,$mapscale)=googlemap_url($lati,$long,$scale); - } -+ elsif ( $mapserver eq 'openstreetmap_tah') -+ { -+ $filename=~s/\.gif/.png/; -+ ($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale); -+ } - else - { - print "Unknown map sever :", $mapserver, "\n"; -@@ -935,6 +966,37 @@ - return ($url,$mapscale); - } - -+############################################################################# -+sub openstreetmap_tah_url($$$){ -+ my $lati = shift; -+ my $long = shift; -+ my $scale = shift; -+ -+ my $mapscale = $scale; -+ my $zoom = undef; -+ for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) { -+ next unless $s == $scale; -+ $zoom = $Scale2Zoom->{openstreetmap_tah}->{$s}; -+ $mapscale = $s; -+ last; -+ } -+ -+ unless ( $zoom ) { -+ print "Error calculating Zoomlevel for Scale: $scale\n"; -+ return (undef,undef); -+ } -+ -+ if ($debug) { -+ print "\n"; -+ print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n"; -+ print "lat: $lati\n"; -+ print "lon: $long\n"; -+ } -+ -+ my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png"; -+# print "$url\n"; -+ return ($url,$mapscale); -+} - - ############################################################################# - sub eniro_url($$$){ -@@ -2284,7 +2346,7 @@ - =item B<--mapserver <MAPSERVER>> - - Mapserver to download from. Default: 'expedia'. --Currently can use: landsat or expedia. -+Currently usable: landsat, expedia or openstreetmap_tah. - - geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs, - but they are !!!NOT!!!! in the right scale. -@@ -2294,6 +2356,9 @@ - - landsat covers the whole world with satelite Photos - -+openstreetmap_tah: Free maps from the OpenStreetmap Tiles@Home project, see -+ http://www.openstreetmap.org and http://tah.openstreetmap.org. -+ - gov_au is for Australia - - incrementp for japanese Maps diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch deleted file mode 100644 index c51c80931c..0000000000 --- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: src/map_handler.c -=================================================================== ---- aa/src/map_handler.c (Revision 1699) -+++ aa/src/map_handler.c (Revision 1700) -@@ -660,9 +660,12 @@ - if (maploaded) - gdk_pixbuf_unref (image); - -+#ifdef MAPNIK - if ( !strcmp (filename,"mapnik") ) { - limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL); -- } else { -+ } else -+#endif -+ { - limage = gdk_pixbuf_new_from_file (filename, NULL); - if (limage == NULL) - { diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch deleted file mode 100644 index c8c0fe9c6a..0000000000 --- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am ---- gpsdrive-2.10pre4.orig/src/Makefile.am 2007-12-28 18:49:44.000000000 +0100 -+++ gpsdrive-2.10pre4/src/Makefile.am 2007-12-28 18:50:29.000000000 +0100 -@@ -14,14 +14,14 @@ - -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \ - -DLIBDIR=\"${libdir}\" \ - -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \ -- ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\ -- -I/usr/include/ \ -- -I/usr/local/include \ -- -I/opt/boost_1_35/include/boost-1_35 \ -- -I/usr/local/include/freetype2 \ -- -I/usr/include/freetype2 \ -+ ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK} -+# -I/usr/include/ \ -+# -I/usr/local/include \ -+# -I/opt/boost_1_35/include/boost-1_35 \ -+# -I/usr/local/include/freetype2 \ -+# -I/usr/include/freetype2 \ - -I. \ -- -L/usr/local/lib -+# -L/usr/local/lib - - # -I/usr/include/dbus-1.0/ - -diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure ---- gpsdrive-2.10pre4.orig/configure 2007-12-28 18:49:44.000000000 +0100 -+++ gpsdrive-2.10pre4/configure 2008-01-06 14:49:11.000000000 +0100 -@@ -35950,10 +35950,13 @@ - # Yep, its ebil, but I does not know better... - #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"` - # default on debian should be: /usr/share/perl5/ --PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` -+#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` - #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"` --PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` -+#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` - -+# hard code path for OpenEmbedded environment as I don't know a way -+# to detect it automatically -+PERL_PACKAGE_DIR="/usr/share/perl5" - - ac_perl_modules="File::Basename " - # Make sure we have perl -@@ -37840,11 +37843,11 @@ - # AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') - #fi - --if test -f /usr/include/mysql/mysql.h; then -- CFLAGS="$CFLAGS -I/usr/include/mysql" --else -- CFLAGS="$CFLAGS -Imysql" --fi -+#if test -f /usr/include/mysql/mysql.h; then -+# CFLAGS="$CFLAGS -I/usr/include/mysql" -+#else -+# CFLAGS="$CFLAGS -Imysql" -+#fi - - CFLAGS="$CFLAGS $OPT_CFLAGS" - CXXFLAGS="$CXXFLAGS $OPT_CFLAGS" -diff -ur gpsdrive-2.10pre4.orig/configure.ac gpsdrive-2.10pre4/configure.ac ---- gpsdrive-2.10pre4.orig/configure.ac 2007-12-28 18:49:44.000000000 +0100 -+++ gpsdrive-2.10pre4/configure.ac 2008-01-06 14:48:50.000000000 +0100 -@@ -662,9 +662,12 @@ - # Yep, its ebil, but I does not know better... - #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"` - # default on debian should be: /usr/share/perl5/ --PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` -+#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` - #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"` --PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` -+#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` -+# hard code path for OpenEmbedded environment as I don't know a way -+# to detect it automatically -+PERL_PACKAGE_DIR="/usr/share/perl5" - AC_SUBST(PERL_PACKAGE_DIR) - - AC_PROG_PERL_MODULES(File::Basename , , AC_MSG_ERROR(Need Perl module File::Basename)) -@@ -719,11 +722,11 @@ - # AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') - #fi - --if test -f /usr/include/mysql/mysql.h; then -- CFLAGS="$CFLAGS -I/usr/include/mysql" --else -- CFLAGS="$CFLAGS -Imysql" --fi -+#if test -f /usr/include/mysql/mysql.h; then -+# CFLAGS="$CFLAGS -I/usr/include/mysql" -+#else -+# CFLAGS="$CFLAGS -Imysql" -+#fi - - CFLAGS="$CFLAGS $OPT_CFLAGS" - CXXFLAGS="$CXXFLAGS $OPT_CFLAGS" diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop deleted file mode 100644 index 96e8155861..0000000000 --- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=GPSDrive -Comment=GPS map software -Exec=gpsdrive -M pda -1 -Icon=gpsicon -Terminal=false -Type=Application -Categories=Graphics;Network;Geography;Application;Other -StartupNotify=true diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb deleted file mode 100644 index 102a917c1f..0000000000 --- a/packages/gpsdrive/gpsdrive_2.10pre4.bb +++ /dev/null @@ -1,33 +0,0 @@ -require gpsdrive.inc - -DEPENDS += "libwww-perl-native libart-lgpl libxml2 cairo mysql" -RDEPENDS_${PN} += "libwww-perl" - -PR = "r2" - -SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \ - file://gpsdrive_2.10pre4.desktop \ - file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \ - file://gpsdrive-ifdef-mapnik.patch;patch=1 \ - file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1" - -do_install_append () { - mkdir -p ${D}${datadir}/applications - install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop - mkdir -p ${D}${datadir}/pixmaps - cp ${D}${datadir}/${PN}/pixmaps/gpsicon.png ${D}${datadir}/pixmaps - # remove stuff we don't want to package - rm ${D}${datadir}/${PN}/gpsdrive.desktop # we have our own one - rm -rf ${D}${datadir}/${PN}/DSL # for Damn Small Linux - rm -rf ${D}${datadir}/${PN}/gentoo # for Gentoo -} - -PACKAGES += "gpsdrive-maps gpsdrive-map-icons-classic gpsdrive-map-icons-other gpsdrive-addons" - -FILES_${PN} = "${bindir}/gpsdrive ${datadir}/applications ${datadir}/map-icons/icons.xml" -FILES_${PN} += "${datadir}/pixmaps ${datadir}/${PN}/pixmaps ${datadir}/${PN}/poi" -FILES_${PN}-addons = "${bindir}/*.pl ${bindir}/friendsd2 ${bindir}/geo* ${bindir}/*.sh ${bindir}/*.py ${bindir}/gpsreplay ${bindir}/gpssmswatch ${bindir}/wp* ${datadir}/mapnik ${datadir}/perl*/Geo ${datadir}/perl*/Utils" -FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small" -FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg" -FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt" -FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation" diff --git a/packages/wpa-supplicant/wpa-supplicant-ssl/.mtn2git_empty b/packages/gqview/gqview-2.1.5/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/wpa-supplicant/wpa-supplicant-ssl/.mtn2git_empty +++ b/packages/gqview/gqview-2.1.5/.mtn2git_empty diff --git a/packages/gqview/gqview-2.1.1/include-path-fix.patch b/packages/gqview/gqview-2.1.5/include-path-fix.patch index 614c69a2c3..614c69a2c3 100644 --- a/packages/gqview/gqview-2.1.1/include-path-fix.patch +++ b/packages/gqview/gqview-2.1.5/include-path-fix.patch diff --git a/packages/gqview/gqview_2.1.1.bb b/packages/gqview/gqview_2.1.5.bb index 619e995771..60f74c4b4e 100644 --- a/packages/gqview/gqview_2.1.1.bb +++ b/packages/gqview/gqview_2.1.5.bb @@ -6,8 +6,7 @@ HOMEPAGE = "http://gqview.sourceforge.net/" RRECOMMENDS = "gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png gdk-pixbuf-loader-gif" PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/gqview/gqview-2.1.1.tar.gz \ +SRC_URI = "${SOURCEFORGE_MIRROR}/gqview/gqview-2.1.5.tar.gz \ file://include-path-fix.patch;patch=1" inherit autotools - diff --git a/packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch b/packages/gtk+/files/gtklabel-resize-patch index df29656343..df29656343 100644 --- a/packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch +++ b/packages/gtk+/files/gtklabel-resize-patch diff --git a/packages/gtk+/gtk+-2.10.14/xsettings.patch b/packages/gtk+/files/xsettings.patch index b63e262d34..b63e262d34 100644 --- a/packages/gtk+/gtk+-2.10.14/xsettings.patch +++ b/packages/gtk+/files/xsettings.patch diff --git a/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch b/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.12.0/xsettings.patch b/packages/gtk+/gtk+-2.12.0/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.12.0/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch b/packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.12.3/xsettings.patch b/packages/gtk+/gtk+-2.12.3/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.12.3/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch b/packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.6.10/xsettings.patch b/packages/gtk+/gtk+-2.6.10/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.6.10/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch b/packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.8.16/xsettings.patch b/packages/gtk+/gtk+-2.8.16/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.8.16/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch b/packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch deleted file mode 100644 index df29656343..0000000000 --- a/packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - static void diff --git a/packages/gtk+/gtk+-2.8.9/xsettings.patch b/packages/gtk+/gtk+-2.8.9/xsettings.patch deleted file mode 100644 index b63e262d34..0000000000 --- a/packages/gtk+/gtk+-2.8.9/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - static void diff --git a/packages/hal/files/20hal b/packages/hal/files/20hal index ff6ffc2b4c..834e51afc0 100644 --- a/packages/hal/files/20hal +++ b/packages/hal/files/20hal @@ -12,7 +12,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/hald PIDDIR=/var/run/hald -PIDFILE=$PIDDIR/hald.pid +PIDFILE=$PIDDIR/pid NAME=hald DAEMONUSER=haldaemon DESC="Hardware abstraction layer" diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb index e835f80434..d84179eb1e 100644 --- a/packages/hal/hal_0.5.9.bb +++ b/packages/hal/hal_0.5.9.bb @@ -5,7 +5,7 @@ RDEPENDS += "udev hal-info" #RDEPENDS_hal-device-manager = "python hal python-pygnome" RRECOMMENDS = "udev-utils" -PR = "r5" +PR = "r6" SRC_URI += "file://99_hal \ file://20hal \ diff --git a/packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty b/packages/hostap/hostap-daemon-0.5.10/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty +++ b/packages/hostap/hostap-daemon-0.5.10/.mtn2git_empty diff --git a/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff b/packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff index 9534199e78..43b275c67b 100644 --- a/packages/hostap/hostap-daemon-0.6.3/makefile-cross.diff +++ b/packages/hostap/hostap-daemon-0.5.10/makefile-cross.diff @@ -1,7 +1,13 @@ -diff -urN hostapd.orig/Makefile hostapd/Makefile ---- hostapd.orig/Makefile 2007-05-28 19:26:55.000000000 +0200 -+++ hostapd/Makefile 2007-11-22 16:28:44.000000000 +0100 -@@ -6,6 +6,8 @@ +diff -urN hostapd-0.5.10.orig/Makefile hostapd-0.5.10/Makefile +--- hostapd-0.5.10.orig/Makefile 2008-02-20 01:08:54.000000000 +0100 ++++ hostapd-0.5.10/Makefile 2008-04-28 17:01:36.000000000 +0200 +@@ -1,10 +1,14 @@ ++ifndef CC + CC=gcc ++endif + DIR_WPA_SUPPLICANT=. + + ifndef CFLAGS CFLAGS = -MMD -O2 -Wall -g endif @@ -10,7 +16,7 @@ diff -urN hostapd.orig/Makefile hostapd/Makefile # define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to # a file (undefine it, if you want to save in binary size) CFLAGS += -DHOSTAPD_DUMP_STATE -@@ -361,10 +363,10 @@ +@@ -333,10 +337,10 @@ fi install: all @@ -21,5 +27,5 @@ diff -urN hostapd.orig/Makefile hostapd/Makefile - $(CC) -o hostapd $(OBJS) $(LIBS) + $(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS) - OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o - hostapd_cli: $(OBJS_c) + driver_conf.c: Makefile .config + rm -f driver_conf.c diff --git a/packages/hostap/hostap-daemon-0.6.3/init b/packages/hostap/hostap-daemon-0.6.3/init deleted file mode 100644 index 79f74b681e..0000000000 --- a/packages/hostap/hostap-daemon-0.6.3/init +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -DAEMON=/usr/sbin/hostapd -NAME=hostapd -DESC="HOSTAP Daemon" -ARGS="/etc/hostapd.conf -B" - -test -f $DAEMON || exit 0 - -set -e - -case "$1" in - start) - echo -n "Starting $DESC: " - start-stop-daemon -S -x $DAEMON -- $ARGS - echo "$NAME." - ;; - stop) - echo -n "Stopping $DESC: " - start-stop-daemon -K -x $DAEMON - echo "$NAME." - ;; - restart) - $0 stop - $0 start - ;; - reload) - echo -n "Reloading $DESC: " - killall -HUP $(basename ${DAEMON}) - echo "$NAME." - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/packages/hostap/hostap-daemon/init b/packages/hostap/hostap-daemon/init index ed4c9de1a9..79f74b681e 100644 --- a/packages/hostap/hostap-daemon/init +++ b/packages/hostap/hostap-daemon/init @@ -2,7 +2,7 @@ DAEMON=/usr/sbin/hostapd NAME=hostapd DESC="HOSTAP Daemon" -ARGS="/etc/hostapd.conf" +ARGS="/etc/hostapd.conf -B" test -f $DAEMON || exit 0 @@ -10,25 +10,23 @@ set -e case "$1" in start) - echo -n "starting $DESC: $NAME... " - start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS - echo "done." + echo -n "Starting $DESC: " + start-stop-daemon -S -x $DAEMON -- $ARGS + echo "$NAME." ;; stop) - echo -n "stopping $DESC: $NAME... " - start-stop-daemon -K -n $NAME - echo "done." + echo -n "Stopping $DESC: " + start-stop-daemon -K -x $DAEMON + echo "$NAME." ;; restart) - echo "restarting $DESC: $NAME... " - $0 stop + $0 stop $0 start - echo "done." ;; reload) - echo -n "reloading $DESC: $NAME... " - killall -HUP $(basename ${DAEMON}) - echo "done." + echo -n "Reloading $DESC: " + killall -HUP $(basename ${DAEMON}) + echo "$NAME." ;; *) echo "Usage: $0 {start|stop|restart|reload}" diff --git a/packages/hostap/hostap-daemon_0.3.7.bb b/packages/hostap/hostap-daemon_0.3.7.bb deleted file mode 100644 index bece7d1450..0000000000 --- a/packages/hostap/hostap-daemon_0.3.7.bb +++ /dev/null @@ -1,3 +0,0 @@ -require hostap-daemon.inc - -PR = "r2" diff --git a/packages/hostap/hostap-daemon_0.5.1.bb b/packages/hostap/hostap-daemon_0.5.1.bb deleted file mode 100644 index de3abdbea5..0000000000 --- a/packages/hostap/hostap-daemon_0.5.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require hostap-daemon.inc - -PR = "r1" - -DEFAULT_PREFERENCE = "-1" diff --git a/packages/hostap/hostap-daemon_0.6.3.bb b/packages/hostap/hostap-daemon_0.5.10.bb index 37b710db19..f75efc4a34 100644 --- a/packages/hostap/hostap-daemon_0.6.3.bb +++ b/packages/hostap/hostap-daemon_0.5.10.bb @@ -5,14 +5,16 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "openssl ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" -DEFAULT_PREFERENCE = "-1" +#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds +MY_ARCH := "${PACKAGE_ARCH}" +PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}" SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \ file://makefile-cross.diff;patch=1 \ file://defconfig \ file://init" -S = "${WORKDIR}/hostapd-${PV}/hostapd" +S = "${WORKDIR}/hostapd-${PV}" export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}" @@ -28,7 +30,7 @@ do_configure() { } do_compile() { - CFLAGS='${CFLAGS}' CC='${CC}' make + make } do_install() { diff --git a/packages/hostap/hostap-modules_0.3.10.bb b/packages/hostap/hostap-modules_0.3.10.bb deleted file mode 100644 index 7a76a0c1fa..0000000000 --- a/packages/hostap/hostap-modules_0.3.10.bb +++ /dev/null @@ -1,7 +0,0 @@ -require hostap-modules.inc -PR = "r9" - -SRC_URI += "file://Makefile.patch;patch=1 \ - file://add_event.patch;patch=1 \ - file://hostap-utsname.patch;patch=1 \ - file://hostap_cardid.patch;patch=1" diff --git a/packages/hostap/hostap-modules_0.3.7.bb b/packages/hostap/hostap-modules_0.3.7.bb deleted file mode 100644 index 8daa3455d8..0000000000 --- a/packages/hostap/hostap-modules_0.3.7.bb +++ /dev/null @@ -1,6 +0,0 @@ -require hostap-modules.inc -PR = "r9" - -SRC_URI += "file://Makefile.patch;patch=1 \ - file://add_event.patch;patch=1 \ - file://hostap-utsname.patch;patch=1" diff --git a/packages/hostap/hostap-modules_0.3.9.bb b/packages/hostap/hostap-modules_0.3.9.bb deleted file mode 100644 index aa1dfde03a..0000000000 --- a/packages/hostap/hostap-modules_0.3.9.bb +++ /dev/null @@ -1,7 +0,0 @@ -require hostap-modules.inc -PR = "r11" - -SRC_URI += "file://Makefile.patch;patch=1 \ - file://add_event.patch;patch=1 \ - file://hostap-utsname.patch;patch=1 \ - file://hostap_cardid.patch;patch=1" diff --git a/packages/hostap/hostap-utils_0.3.7.bb b/packages/hostap/hostap-utils_0.3.7.bb deleted file mode 100644 index 9fe362b19f..0000000000 --- a/packages/hostap/hostap-utils_0.3.7.bb +++ /dev/null @@ -1 +0,0 @@ -require hostap-utils.inc diff --git a/packages/images/sdr-image.bb b/packages/images/sdr-image.bb index 28a62113ee..8ad9af7cca 100644 --- a/packages/images/sdr-image.bb +++ b/packages/images/sdr-image.bb @@ -2,11 +2,10 @@ # An image with tools for software defined radio and unicorn radio # TODO: -# http://poh9.blogspot.com/2008/02/for-my-own-future-reference-how-to.html # X demo # xorg.conf -PR = "r2" +PR = "r3" IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" @@ -15,9 +14,10 @@ IMAGE_FSTYPES += "tar.bz2" ANGSTROM_EXTRA_INSTALL ?= "" DISTRO_SSH_DAEMON ?= "dropbear" +XSERVER ?= "xserver-kdrive-fbdev" # Install "big" X if the target has a screen -GUIPACKAGES = " \ +GUIPACKAGES_BIGX = " \ xf86-input-evdev \ xf86-input-mouse \ xf86-video-dummy \ @@ -26,10 +26,18 @@ GUIPACKAGES = " \ xf86-video-vesa \ " +GUIPACKAGES = " \ + ${XSERVER} \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + xterm e-wm \ +" + IMAGE_INSTALL = " task-base-extended \ kernel-modules \ gnuradio gnuradio-usrp \ - gnuplot \ + screen procps \ ${@base_contains("MACHINE_FEATURES", "screen", "${GUIPACKAGES}", "",d)} \ python-core perl \ uucp picocom \ diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index cb2a20b75e..9ac4140a14 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -100,4 +100,12 @@ nslu2_pack_image () { -m ${STAGING_FIRMWARE_DIR}/NPE-B \ -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin + slugimage -F -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-16mb.bin } diff --git a/packages/ipkg/files/ipkg_bugfix.patch b/packages/ipkg/files/ipkg_bugfix.patch deleted file mode 100644 index 51eccbb2bd..0000000000 --- a/packages/ipkg/files/ipkg_bugfix.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: C/ipkg_conf.c -=================================================================== ---- C.orig/ipkg_conf.c 2005-06-21 13:59:32.000000000 +0000 -+++ C/ipkg_conf.c 2007-11-27 01:11:17.000000000 +0000 -@@ -423,6 +423,7 @@ - nv_pair_t *nv_pair; - pkg_dest_t *dest; - char *root_dir; -+ char *list_dir2; - - for (iter = nv_pair_list->head; iter; iter = iter->next) { - nv_pair = iter->data; -@@ -432,8 +433,14 @@ - } else { - root_dir = strdup(nv_pair->value); - } -- dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, lists_dir); -+ if (conf->offline_root) { -+ sprintf_alloc(&list_dir2, "%s%s", conf->offline_root, lists_dir); -+ } else { -+ list_dir2 = strdup(lists_dir); -+ } -+ dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, list_dir2); - free(root_dir); -+ free(list_dir2); - if (dest == NULL) { - continue; - } -@@ -562,13 +569,13 @@ - } else if (strcmp(type, "dest") == 0) { - nv_pair_list_append(tmp_dest_nv_pair_list, name, value); - } else if (strcmp(type, "lists_dir") == 0) { -- *lists_dir = realloc(*lists_dir,strlen(value)+1); -+ *lists_dir = realloc(*lists_dir,strlen(name)+1); - if (*lists_dir == NULL) { - ipkg_message(conf, IPKG_ERROR, "ERROR: Not enough memory\n"); - free(options); - return EINVAL; - } -- sprintf (*lists_dir,"%s",value); -+ sprintf (*lists_dir,"%s", name); - } else if (strcmp(type, "arch") == 0) { - ipkg_message(conf, IPKG_INFO, "supported arch %s priority (%s)\n", name, value); - if (!value) { diff --git a/packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map b/packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map new file mode 100644 index 0000000000..454a1dae68 --- /dev/null +++ b/packages/keymaps/files/jornada6xx/keymap-620lx-660lx.map @@ -0,0 +1,239 @@ +# English keymap for Jornada 620/660 devices. +# for the jornada680.c driver +# +# plain, shift, altgr, ctrl, shift + ctrl, alt, ctrl + alt + +keymaps 0-2,4-5,8,12 +keycode 57 = Escape Escape + alt keycode 1 = Meta_Escape +keycode 59 = one exclam asciitilde + alt keycode 2 = Meta_one +keycode 60 = two at grave + alt keycode 3 = Meta_two +keycode 61 = three numbersign + alt keycode 4 = Meta_three + altgr keycode 4 = pound +keycode 66 = four dollar + control keycode 5 = Control_backslash + alt keycode 5 = Meta_four + altgr keycode 5 = currency +keycode 65 = five percent + control keycode 6 = Control_bracketright + alt keycode 6 = Meta_five +keycode 64 = six asciicircum + control keycode 7 = Control_asciicircum + alt keycode 7 = Meta_six +keycode 62 = seven ampersand braceleft + control keycode 8 = Control_underscore + alt keycode 8 = KP_7 +keycode 63 = eight asterisk bracketleft + control keycode 9 = Delete + alt keycode 9 = KP_8 +keycode 58 = nine parenleft bracketright + alt keycode 10 = KP_9 +keycode 112 = zero parenright braceright + alt keycode 11 = KP_Divide +keycode 29 = minus underscore backslash + control keycode 11 = Control_underscore + shift control keycode 11 = Control_underscore + alt keycode 11 = Meta_minus +keycode 28 = equal plus + alt keycode 13 = Meta_equal +keycode 88 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete +keycode 76 = BackSpace +keycode 32 = Tab Tab + alt keycode 58 = Meta_Tab +keycode 45 = q +keycode 46 = w +keycode 47 = e + Shift keycode 18 = E +keycode 52 = r +keycode 51 = t +keycode 50 = y + alt keycode 21 = KP_4 +keycode 48 = u + alt keycode 22 = KP_5 +keycode 49 = i + alt keycode 23 = KP_6 +keycode 53 = o + alt keycode 24 = KP_Multiply +keycode 40 = p + AltGr keycode 25 = braceleft +keycode 81 = backslash bar +keycode 77 = bracketleft braceleft +keycode 82 = bracketright braceright +keycode 43 = Return + alt keycode 28 = Meta_Control_m +keycode 1 = Control + altgr keycode 29 = Num_Lock +keycode 68 = a +keycode 89 = s +keycode 67 = d +keycode 75 = f +keycode 69 = g +keycode 70 = h + alt keycode 35 = KP_1 +keycode 56 = j + alt keycode 36 = KP_2 +keycode 123 = k + alt keycode 37 = KP_3 +keycode 80 = l + alt keycode 38 = KP_Subtract +keycode 90 = semicolon colon bracketleft + alt keycode 39 = Meta_semicolon +keycode 27 = apostrophe quotedbl bracketright + control keycode 40 = Control_g + alt keycode 40 = Meta_apostrophe +keycode 41 = Shift +keycode 74 = Caps_Lock +keycode 18 = z +keycode 42 = x +keycode 71 = c +keycode 37 = v +keycode 79 = b +keycode 87 = n + alt keycode 49 = KP_0 +keycode 78 = m + alt keycode 50 = KP_Comma +keycode 55 = comma less + alt keycode 51 = KP_Period +keycode 35 = period greater + control keycode 52 = Compose + alt keycode 52 = KP_Add +keycode 54 = Shift +keycode 73 = Alt +keycode 23 = space space + alt keycode 57 = Meta_space +keycode 15 = Control +keycode 5 = F1 +keycode 10 = F2 +keycode 9 = F3 +keycode 8 = F4 +keycode 6 = F5 +keycode 7 = F6 +keycode 11 = F7 +keycode 12 = F8 +keycode 72 = Up + shift keycode 72 = Scroll_Backward + altgr keycode 72 = Scroll_Backward + alt keycode 72 = Prior +keycode 25 = Left + altgr keycode 75 = Decr_Console + alt keycode 75 = Find +keycode 125 = Right + altgr keycode 77 = Incr_Console + alt keycode 77 = Select +keycode 26 = Down + shift keycode 80 = Scroll_Forward + altgr keycode 80 = Scroll_Forward + alt keycode 80 = Next +keycode 88 = Remove Remove Meta_Delete + alt keycode 83 = Meta_Delete +#keycode 112 = F10 +# shift keycode 112 = F20 +# altgr keycode 112 = Console_22 +# alt keycode 112 = Console_10 +# control alt keycode 112 = Console_10 +keycode 39 = slash question + control keycode 115 = Delete + alt keycode 115 = Meta_slash +keycode 20 = AltGr +keycode 219 = Insert +string F1 = "\033[[A" +string F2 = "\033[[B" +string F3 = "\033[[C" +string F4 = "\033[[D" +string F5 = "\033[[E" +string F6 = "\033[17~" +string F7 = "\033[18~" +string F8 = "\033[19~" +string F9 = "\033[20~" +string F10 = "\033[21~" +string F11 = "\033[23~" +string F12 = "\033[24~" +string F13 = "\033[25~" +string F14 = "\033[26~" +string F15 = "\033[28~" +string F16 = "\033[29~" +string F17 = "\033[31~" +string F18 = "\033[32~" +string F19 = "\033[33~" +string F20 = "\033[34~" +string Find = "\033[1~" +string Insert = "\033[2~" +string Remove = "\033[3~" +string Select = "\033[4~" +string Prior = "\033[5~" +string Next = "\033[6~" +string Macro = "\033[M" +string Pause = "\033[P" +compose '`' 'A' to 'À' +compose '`' 'a' to 'à' +compose '\'' 'A' to 'Á' +compose '\'' 'a' to 'á' +compose '^' 'A' to 'Â' +compose '^' 'a' to 'â' +compose '~' 'A' to 'Ã' +compose '~' 'a' to 'ã' +compose '"' 'A' to 'Ä' +compose '"' 'a' to 'ä' +compose 'O' 'A' to 'Å' +compose 'o' 'a' to 'å' +compose '0' 'A' to 'Å' +compose '0' 'a' to 'å' +compose 'A' 'A' to 'Å' +compose 'a' 'a' to 'å' +compose 'A' 'E' to 'Æ' +compose 'a' 'e' to 'æ' +compose ',' 'C' to 'Ç' +compose ',' 'c' to 'ç' +compose '`' 'E' to 'È' +compose '`' 'e' to 'è' +compose '\'' 'E' to 'É' +compose '\'' 'e' to 'é' +compose '^' 'E' to 'Ê' +compose '^' 'e' to 'ê' +compose '"' 'E' to 'Ë' +compose '"' 'e' to 'ë' +compose '`' 'I' to 'Ì' +compose '`' 'i' to 'ì' +compose '\'' 'I' to 'Í' +compose '\'' 'i' to 'í' +compose '^' 'I' to 'Î' +compose '^' 'i' to 'î' +compose '"' 'I' to 'Ï' +compose '"' 'i' to 'ï' +compose '-' 'D' to 'Ð' +compose '-' 'd' to 'ð' +compose '~' 'N' to 'Ñ' +compose '~' 'n' to 'ñ' +compose '`' 'O' to 'Ò' +compose '`' 'o' to 'ò' +compose '\'' 'O' to 'Ó' +compose '\'' 'o' to 'ó' +compose '^' 'O' to 'Ô' +compose '^' 'o' to 'ô' +compose '~' 'O' to 'Õ' +compose '~' 'o' to 'õ' +compose '"' 'O' to 'Ö' +compose '"' 'o' to 'ö' +compose '/' 'O' to 'Ø' +compose '/' 'o' to 'ø' +compose '`' 'U' to 'Ù' +compose '`' 'u' to 'ù' +compose '\'' 'U' to 'Ú' +compose '\'' 'u' to 'ú' +compose '^' 'U' to 'Û' +compose '^' 'u' to 'û' +compose '"' 'U' to 'Ü' +compose '"' 'u' to 'ü' +compose '\'' 'Y' to 'Ý' +compose '\'' 'y' to 'ý' +compose 'T' 'H' to 'Þ' +compose 't' 'h' to 'þ' +compose 's' 's' to 'ß' +compose '"' 'y' to 'ÿ' +compose 's' 'z' to 'ß' +compose 'i' 'j' to 'ÿ' diff --git a/packages/keymaps/files/jornada6xx/keymap-br.map b/packages/keymaps/files/jornada6xx/keymap-br.map new file mode 100644 index 0000000000..8bc0f0fab6 --- /dev/null +++ b/packages/keymaps/files/jornada6xx/keymap-br.map @@ -0,0 +1,285 @@ +# Brazilian keymap for Jornada 6xx devices. +# +# Created by Tibor Zenis ( zenis <at> fmph.uniba.sk ) +# (Lightly) Modified by Alex Palestras ( B_Linuz <at> yahoo.com ) +# Mrazilian adaptation by Paulo Roberto ( stpaul <at> 0xbadc0ffe.org ) +# plain, shift, altgr, ctrl, shift + ctrl, alt, ctrl + alt + +keymaps 0-2,4-5,8,12 +keycode 1 = Escape Escape + alt keycode 1 = Meta_Escape +keycode 2 = one exclam asciitilde + alt keycode 2 = Meta_one +keycode 3 = two at grave + alt keycode 3 = Meta_two +keycode 4 = three numbersign + alt keycode 4 = Meta_three + altgr keycode 4 = pound +keycode 5 = four backslash + control keycode 5 = Control_backslash + alt keycode 5 = Meta_four + altgr keycode 5 = dollar +keycode 6 = five percent + control keycode 6 = Control_bracketright + alt keycode 6 = Meta_five +keycode 7 = six dead_diaeresis + AltGr keycode 7 = notsign + alt keycode 7 = Meta_six +keycode 8 = seven ampersand braceleft + control keycode 8 = Control_underscore + alt keycode 8 = KP_7 +keycode 9 = eight asterisk bracketleft + control keycode 9 = Delete + alt keycode 9 = KP_8 +keycode 10 = nine parenleft bracketright + alt keycode 10 = KP_9 +keycode 11 = zero parenright braceright + alt keycode 11 = KP_Divide +keycode 12 = minus underscore backslash + control keycode 11 = Control_underscore + shift control keycode 11 = Control_underscore + alt keycode 11 = Meta_minus +keycode 13 = equal plus + alt keycode 13 = Meta_equal +keycode 14 = Delete Delete + control keycode 14 = BackSpace + alt keycode 14 = Meta_Delete +keycode 15 = Tab Tab + alt keycode 15 = Meta_Tab +keycode 16 = q + AltGr keycode 16 = slash +keycode 17 = w + AltGr keycode 17 = question +keycode 18 = e + AltGr keycode 18 = E +keycode 19 = r +keycode 20 = t +keycode 21 = y +keycode 22 = u + alt keycode 22 = KP_4 +keycode 23 = i + alt keycode 23 = KP_5 +keycode 24 = o + alt keycode 24 = KP_6 +keycode 25 = p + alt keycode 25 = KP_Multiply +keycode 26 = dead_acute dead_grave +keycode 27 = bracketleft braceleft + AltGr keycode 27 = ordfeminine +keycode 28 = Return + alt keycode 28 = Meta_Control_m +keycode 29 = F11 + shift keycode 29 = F21 + altgr keycode 29 = Console_23 + alt keycode 29 = Console_11 + control alt keycode 29 = Console_11 +keycode 30 = a + AltGr keycode 30 = degree +keycode 31 = s +keycode 32 = d +keycode 33 = f +keycode 34 = g +keycode 35 = h +keycode 36 = j + alt keycode 36 = KP_1 +keycode 37 = k + alt keycode 37 = KP_2 +keycode 38 = l + alt keycode 38 = KP_3 +keycode 39 = +ccedilla +Ccedilla + alt keycode 38 = KP_Subtract +keycode 40 = dead_tilde dead_circumflex + shift control keycode 40 = Control_asciicircum + alt keycode 40 = Meta_apostrophe +keycode 42 = Shift + altgr keycode 42 = Caps_Lock +keycode 43 = bracketright braceright + AltGr keycode 43 = masculine +keycode 44 = z + AltGr keycode 44 = backslash +keycode 45 = x + AltGr keycode 45 = bar +keycode 46 = c +keycode 47 = v +keycode 48 = b +keycode 49 = n +keycode 50 = m + alt keycode 49 = KP_0 +keycode 51 = comma less + alt keycode 50 = KP_Comma +keycode 52 = period greater + control keycode 52 = Compose + alt keycode 51 = KP_Period +keycode 53 = semicolon colon + alt keycode 52 = KP_Add +keycode 54 = Shift +keycode 55 = apostrophe +keycode 56 = Alt +keycode 57 = space space + alt keycode 57 = Meta_space +keycode 58 = F9 + shift keycode 58 = F19 + altgr keycode 58 = Console_21 + alt keycode 58 = Console_9 + control alt keycode 58 = Console_9 +keycode 59 = F1 + altgr keycode 59 = Console_13 + alt keycode 59 = Console_1 + control alt keycode 59 = Console_1 +keycode 60 = F2 + shift keycode 60 = F12 + altgr keycode 60 = Console_14 + alt keycode 60 = Console_2 + control alt keycode 60 = Console_2 +keycode 61 = F3 + shift keycode 61 = F13 + altgr keycode 61 = Console_15 + alt keycode 61 = Console_3 + control alt keycode 61 = Console_3 +keycode 62 = F4 + shift keycode 62 = F14 + altgr keycode 62 = Console_16 + alt keycode 62 = Console_4 + control alt keycode 62 = Console_4 +keycode 63 = F5 + shift keycode 63 = F15 + altgr keycode 63 = Console_17 + alt keycode 63 = Console_5 + control alt keycode 63 = Console_5 +keycode 64 = F6 + shift keycode 64 = F16 + altgr keycode 64 = Console_18 + alt keycode 64 = Console_6 + control alt keycode 64 = Console_6 +keycode 65 = F7 + shift keycode 65 = F17 + altgr keycode 65 = Console_19 + alt keycode 65 = Console_7 + control alt keycode 65 = Console_7 +keycode 66 = F8 + shift keycode 66 = F18 + altgr keycode 66 = Console_20 + alt keycode 66 = Console_8 + control alt keycode 66 = Console_8 +keycode 72 = Up + shift keycode 72 = Scroll_Backward + altgr keycode 72 = Scroll_Backward + alt keycode 72 = Prior +keycode 74 = Control + altgr keycode 74 = Num_Lock +keycode 75 = Left + altgr keycode 75 = Decr_Console + alt keycode 75 = Find +keycode 77 = Right + altgr keycode 77 = Incr_Console + alt keycode 77 = Select +keycode 80 = Down + shift keycode 80 = Scroll_Forward + altgr keycode 80 = Scroll_Forward + alt keycode 80 = Next +keycode 83 = Remove Remove Meta_Delete + alt keycode 83 = Meta_Delete +keycode 112 = F10 + shift keycode 112 = F20 + altgr keycode 112 = Console_22 + alt keycode 112 = Console_10 + control alt keycode 112 = Console_10 +keycode 115 = AltGr +keycode 123 = comma quotedbl +keycode 0 = Insert +string F1 = "\033[[A" +string F2 = "\033[[B" +string F3 = "\033[[C" +string F4 = "\033[[D" +string F5 = "\033[[E" +string F6 = "\033[17~" +string F7 = "\033[18~" +string F8 = "\033[19~" +string F9 = "\033[20~" +string F10 = "\033[21~" +string F11 = "\033[23~" +string F12 = "\033[24~" +string F13 = "\033[25~" +string F14 = "\033[26~" +string F15 = "\033[28~" +string F16 = "\033[29~" +string F17 = "\033[31~" +string F18 = "\033[32~" +string F19 = "\033[33~" +string F20 = "\033[34~" +string Find = "\033[1~" +string Insert = "\033[2~" +string Remove = "\033[3~" +string Select = "\033[4~" +string Prior = "\033[5~" +string Next = "\033[6~" +string Macro = "\033[M" +string Pause = "\033[P" +compose '`' 'A' to 'À' +compose '`' 'a' to 'à' +compose '\'' 'A' to 'Á' +compose '\'' 'a' to 'á' +compose '^' 'A' to 'Â' +compose '^' 'a' to 'â' +compose '~' 'A' to 'Ã' +compose '~' 'a' to 'ã' +compose '"' 'A' to 'Ä' +compose '"' 'a' to 'ä' +compose 'O' 'A' to 'Å' +compose 'o' 'a' to 'å' +compose '0' 'A' to 'Å' +compose '0' 'a' to 'å' +compose 'A' 'A' to 'Å' +compose 'a' 'a' to 'å' +compose 'A' 'E' to 'Æ' +compose 'a' 'e' to 'æ' +compose ',' 'C' to 'Ç' +compose ',' 'c' to 'ç' +compose '`' 'E' to 'È' +compose '`' 'e' to 'è' +compose '\'' 'E' to 'É' +compose '\'' 'e' to 'é' +compose '^' 'E' to 'Ê' +compose '^' 'e' to 'ê' +compose '"' 'E' to 'Ë' +compose '"' 'e' to 'ë' +compose '`' 'I' to 'Ì' +compose '`' 'i' to 'ì' +compose '\'' 'I' to 'Í' +compose '\'' 'i' to 'í' +compose '^' 'I' to 'Î' +compose '^' 'i' to 'î' +compose '"' 'I' to 'Ï' +compose '"' 'i' to 'ï' +compose '-' 'D' to 'Ð' +compose '-' 'd' to 'ð' +compose '~' 'N' to 'Ñ' +compose '~' 'n' to 'ñ' +compose '`' 'O' to 'Ò' +compose '`' 'o' to 'ò' +compose '\'' 'O' to 'Ó' +compose '\'' 'o' to 'ó' +compose '^' 'O' to 'Ô' +compose '^' 'o' to 'ô' +compose '~' 'O' to 'Õ' +compose '~' 'o' to 'õ' +compose '"' 'O' to 'Ö' +compose '"' 'o' to 'ö' +compose '/' 'O' to 'Ø' +compose '/' 'o' to 'ø' +compose '`' 'U' to 'Ù' +compose '`' 'u' to 'ù' +compose '\'' 'U' to 'Ú' +compose '\'' 'u' to 'ú' +compose '^' 'U' to 'Û' +compose '^' 'u' to 'û' +compose '"' 'U' to 'Ü' +compose '"' 'u' to 'ü' +compose '\'' 'Y' to 'Ý' +compose '\'' 'y' to 'ý' +compose 'T' 'H' to 'Þ' +compose 't' 'h' to 'þ' +compose 's' 's' to 'ß' +compose '"' 'y' to 'ÿ' +compose 's' 'z' to 'ß' +compose 'i' 'j' to 'ÿ' diff --git a/packages/keymaps/files/jornada6xx/keymap-de.map b/packages/keymaps/files/jornada6xx/keymap-de.map index 98083d2e58..4f6f53a74c 100644 --- a/packages/keymaps/files/jornada6xx/keymap-de.map +++ b/packages/keymaps/files/jornada6xx/keymap-de.map @@ -148,9 +148,9 @@ keycode 27 = plus asterisk asciitilde keycode 28 = Return shift altgr keycode 28 = VoidSymbol alt keycode 28 = Meta_Control_m -keycode 29 = Control - shift keycode 29 = Compose - shift altgr keycode 29 = VoidSymbol +keycode 29 = F11 F23 + control keycode 29 = Control_asciicircum + control alt keycode 29 = Meta_Control_asciicircum keycode 30 = +a shift keycode 30 = +A shift altgr keycode 30 = VoidSymbol @@ -243,9 +243,6 @@ keycode 38 = +l control alt keycode 38 = Meta_Control_l keycode 39 = +odiaeresis +Odiaeresis keycode 40 = +adiaeresis +Adiaeresis -keycode 41 = F11 F23 - control keycode 41 = Control_asciicircum - control alt keycode 41 = Meta_Control_asciicircum keycode 42 = Shift Shift Caps_Lock shift altgr keycode 42 = VoidSymbol control keycode 42 = Compose @@ -373,6 +370,9 @@ keycode 66 = F8 F20 Console_20 keycode 72 = Up alt keycode 72 = Prior shift alt keycode 72 = Scroll_Backward +keycode 74 = Control + shift keycode 74 = Compose + shift altgr keycode 74 = VoidSymbol keycode 75 = KP_4 altgr keycode 75 = Hex_4 shift altgr keycode 75 = VoidSymbol diff --git a/packages/keymaps/files/jornada6xx/keymap-sp.map b/packages/keymaps/files/jornada6xx/keymap-sp.map index ba05387743..2e5d7388f0 100644 --- a/packages/keymaps/files/jornada6xx/keymap-sp.map +++ b/packages/keymaps/files/jornada6xx/keymap-sp.map @@ -60,8 +60,10 @@ keycode 26 = dead_acute shift keycode 26 = dead_diaeresis keycode 27 = plus asterisk asciitilde keycode 28 = Return -keycode 29 = Control - AltGr keycode 29 = Num_Lock +keycode 29 = F11 + alt keycode 29 = Console_11 + shift keycode 29 = F12 + shift alt keycode 29 = Console_12 keycode 30 = +a shift keycode 30 = +A keycode 31 = +s @@ -85,10 +87,6 @@ keycode 39 = +0244 keycode 40 = braceleft shift keycode 40 = bracketleft AltGr keycode 40 = dead_circumflex -keycode 41 = F11 - alt keycode 41 = Console_11 - shift keycode 41 = F12 - shift alt keycode 41 = Console_12 keycode 42 = Shift AltGr keycode 42 = Caps_Lock keycode 43 = braceright @@ -135,6 +133,8 @@ keycode 66 = F8 keycode 72 = Up alt keycode 72 = PageUp shift alt keycode 72 = Scroll_Backward +keycode 74 = Control + AltGr keycode 74 = Num_Lock keycode 75 = Left alt keycode 75 = Home keycode 77 = Right diff --git a/packages/keymaps/files/jornada6xx/keymap-uk.map b/packages/keymaps/files/jornada6xx/keymap-uk.map index a7bb082464..6bb959801c 100644 --- a/packages/keymaps/files/jornada6xx/keymap-uk.map +++ b/packages/keymaps/files/jornada6xx/keymap-uk.map @@ -65,8 +65,11 @@ keycode 26 = backslash bar AltGr keycode 26 = braceright keycode 28 = Return alt keycode 28 = Meta_Control_m -keycode 29 = Control - altgr keycode 29 = Num_Lock +keycode 29 = F11 + shift keycode 29 = F21 + altgr keycode 29 = Console_23 + alt keycode 29 = Console_11 + control alt keycode 29 = Console_11 keycode 30 = a keycode 31 = s keycode 32 = d @@ -84,12 +87,7 @@ keycode 39 = semicolon colon bracketleft alt keycode 39 = Meta_semicolon keycode 40 = apostrophe quotedbl bracketright control keycode 40 = Control_g - alt keycode 40 = Meta_apostrophe -keycode 41 = F11 - shift keycode 41 = F21 - altgr keycode 41 = Console_23 - alt keycode 41 = Console_11 - control alt keycode 41 = Console_11 + alt keycode 40 = Meta_apostrophe keycode 42 = Shift altgr keycode 42 = Caps_Lock keycode 44 = z @@ -158,6 +156,8 @@ keycode 72 = Up shift keycode 72 = Scroll_Backward altgr keycode 72 = Scroll_Backward alt keycode 72 = Prior +keycode 74 = Control + altgr keycode 74 = Num_Lock keycode 75 = Left altgr keycode 75 = Decr_Console alt keycode 75 = Find @@ -179,12 +179,12 @@ keycode 115 = slash question control keycode 115 = Delete alt keycode 115 = Meta_slash keycode 123 = AltGr -keycode 219 = Insert -string F1 = "\033[11~" -string F2 = "\033[12~" -string F3 = "\033[13~" -string F4 = "\033[14~" -string F5 = "\033[15~" +keycode 0 = Insert +string F1 = "\033[[A" +string F2 = "\033[[B" +string F3 = "\033[[C" +string F4 = "\033[[D" +string F5 = "\033[[E" string F6 = "\033[17~" string F7 = "\033[18~" string F8 = "\033[19~" diff --git a/packages/libc-client/libc-client_2007.bb b/packages/libc-client/libc-client_2007a1.bb index cdfeca0b2b..b337a344a7 100644 --- a/packages/libc-client/libc-client_2007.bb +++ b/packages/libc-client/libc-client_2007a1.bb @@ -3,12 +3,11 @@ SECTION = "devel" PRIORITY = "optional" LICENSE = "University of Washington's Free-Fork License" DEPENDS = "libpam openssl" -PR = "r1" -SRC_URI = "ftp://ftp.cac.washington.edu/imap/c-client.tar.Z \ +SRC_URI = "ftp://ftp.cac.washington.edu/imap/imap-${PV}.tar.Z \ file://quote_cctype.patch;patch=1" -S = "${WORKDIR}/imap-2007" +S = "${WORKDIR}/imap-2007a" EXTRA_OEMAKE = "CC='${CC}'" diff --git a/packages/libgcrypt/libgcrypt-1.4.1/.mtn2git_empty b/packages/libgcrypt/libgcrypt-1.4.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libgcrypt/libgcrypt-1.4.1/.mtn2git_empty diff --git a/packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch b/packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch new file mode 100644 index 0000000000..a4e5a65d65 --- /dev/null +++ b/packages/libgcrypt/libgcrypt-1.4.1/add-pkgconfig-support.patch @@ -0,0 +1,49 @@ +Index: libgcrypt-1.4.0/configure.ac +=================================================================== +--- libgcrypt-1.4.0.orig/configure.ac ++++ libgcrypt-1.4.0/configure.ac +@@ -1072,6 +1072,7 @@ cipher/Makefile + doc/Makefile + src/Makefile + src/gcrypt.h ++src/libgcrypt.pc + src/libgcrypt-config + src/versioninfo.rc + tests/Makefile +Index: libgcrypt-1.4.0/src/libgcrypt.pc.in +=================================================================== +--- /dev/null ++++ libgcrypt-1.4.0/src/libgcrypt.pc.in +@@ -0,0 +1,32 @@ ++# Process this file with autoconf to produce a pkg-config metadata file. ++# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation ++# Author: Simon Josefsson ++# ++# This file is free software; as a special exception the author gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++# ++# This file is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the ++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++# API info ++api_version=@LIBGCRYPT_CONFIG_API_VERSION@ ++ ++# Misc information. ++symmetric_ciphers=@LIBGCRYPT_CIPHERS@ ++asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@ ++digests=@LIBGCRYPT_DIGESTS@ ++ ++Name: libgcrypt ++Description: GNU crypto library ++URL: http://www.gnupg.org ++Version: @VERSION@ ++Libs: -L${libdir} -lgcrypt ++Libs.private: -L${libdir} -lgpg-error ++Cflags: -I${includedir} diff --git a/packages/libgcrypt/libgcrypt.inc b/packages/libgcrypt/libgcrypt.inc index 65f78db647..691f4fe133 100644 --- a/packages/libgcrypt/libgcrypt.inc +++ b/packages/libgcrypt/libgcrypt.inc @@ -7,16 +7,18 @@ DEPENDS = "libgpg-error" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz \ file://add-pkgconfig-support.patch;patch=1" -inherit autotools binconfig pkgconfig +inherit autotools binconfig pkgconfig lib_package EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" ARM_INSTRUCTION_SET = "arm" +do_install_append() { + install -d ${D}/${libdir}/pkgconfig/ + cp ${S}/src/*.pc ${D}/${libdir}/pkgconfig/ +} + do_stage() { autotools_stage_all } -# move libgcrypt-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" diff --git a/packages/libgcrypt/libgcrypt_1.4.1.bb b/packages/libgcrypt/libgcrypt_1.4.1.bb new file mode 100644 index 0000000000..c0b5e6531c --- /dev/null +++ b/packages/libgcrypt/libgcrypt_1.4.1.bb @@ -0,0 +1,2 @@ +require libgcrypt.inc + diff --git a/packages/libgpg-error/libgpg-error.inc b/packages/libgpg-error/libgpg-error.inc new file mode 100644 index 0000000000..20f62da63b --- /dev/null +++ b/packages/libgpg-error/libgpg-error.inc @@ -0,0 +1,28 @@ +DESCRIPTION = "GPG-Error library" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL LGPL FDL" + +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \ + file://pkgconfig.patch;patch=1" + +# move libgpg-error-config into -dev package +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}/*" + +inherit autotools binconfig pkgconfig + +do_stage() { + oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR} + install -d ${STAGING_BINDIR_CROSS}/ + install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/ + + install -d ${STAGING_INCDIR}/ + for X in gpg-error.h + do + install -m 0644 ${S}/src/$X ${STAGING_INCDIR}/$X + done + + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 src/gpg-error.m4 ${STAGING_DATADIR}/aclocal/ +} diff --git a/packages/libgpg-error/libgpg-error_0.7.bb b/packages/libgpg-error/libgpg-error_0.7.bb index 7edea97fe1..edbe91afea 100644 --- a/packages/libgpg-error/libgpg-error_0.7.bb +++ b/packages/libgpg-error/libgpg-error_0.7.bb @@ -1,29 +1,6 @@ +require libgpg-error.inc + PR = "r4" -DESCRIPTION = "GPG-Error library" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar.gz \ file://pkgconfig.patch;patch=1" - -# move libgpg-error-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}" - -inherit autotools binconfig pkgconfig - -do_stage() { - oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR} - install -d ${STAGING_BINDIR_CROSS}/ - install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/ - - install -d ${STAGING_INCDIR}/ - for X in gpg-error.h - do - install -m 0644 ${S}/src/$X ${STAGING_INCDIR}/$X - done - - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 src/gpg-error.m4 ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/libgpg-error/libgpg-error_1.0.bb b/packages/libgpg-error/libgpg-error_1.0.bb index e520a23ae0..bdbbed0b34 100644 --- a/packages/libgpg-error/libgpg-error_1.0.bb +++ b/packages/libgpg-error/libgpg-error_1.0.bb @@ -1,29 +1,3 @@ -PR = "r1" -DESCRIPTION = "GPG-Error library" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \ - file://pkgconfig.patch;patch=1" - -# move libgpg-error-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/*" - -inherit autotools binconfig pkgconfig +require libgpg-error.inc -do_stage() { - oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR} - install -d ${STAGING_BINDIR_CROSS}/ - install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/ - - install -d ${STAGING_INCDIR}/ - for X in gpg-error.h - do - install -m 0644 ${S}/src/$X ${STAGING_INCDIR}/$X - done - - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 src/gpg-error.m4 ${STAGING_DATADIR}/aclocal/ -} +PR = "r1" diff --git a/packages/libgpg-error/libgpg-error_1.3.bb b/packages/libgpg-error/libgpg-error_1.3.bb index e520a23ae0..bdbbed0b34 100644 --- a/packages/libgpg-error/libgpg-error_1.3.bb +++ b/packages/libgpg-error/libgpg-error_1.3.bb @@ -1,29 +1,3 @@ -PR = "r1" -DESCRIPTION = "GPG-Error library" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \ - file://pkgconfig.patch;patch=1" - -# move libgpg-error-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/*" - -inherit autotools binconfig pkgconfig +require libgpg-error.inc -do_stage() { - oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR} - install -d ${STAGING_BINDIR_CROSS}/ - install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/ - - install -d ${STAGING_INCDIR}/ - for X in gpg-error.h - do - install -m 0644 ${S}/src/$X ${STAGING_INCDIR}/$X - done - - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 src/gpg-error.m4 ${STAGING_DATADIR}/aclocal/ -} +PR = "r1" diff --git a/packages/libgpg-error/libgpg-error_1.4.bb b/packages/libgpg-error/libgpg-error_1.4.bb index e520a23ae0..bdbbed0b34 100644 --- a/packages/libgpg-error/libgpg-error_1.4.bb +++ b/packages/libgpg-error/libgpg-error_1.4.bb @@ -1,29 +1,3 @@ -PR = "r1" -DESCRIPTION = "GPG-Error library" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL LGPL FDL" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${PV}.tar.gz \ - file://pkgconfig.patch;patch=1" - -# move libgpg-error-config into -dev package -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/*" - -inherit autotools binconfig pkgconfig +require libgpg-error.inc -do_stage() { - oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR} - install -d ${STAGING_BINDIR_CROSS}/ - install -m 0755 src/gpg-error-config ${STAGING_BINDIR_CROSS}/ - - install -d ${STAGING_INCDIR}/ - for X in gpg-error.h - do - install -m 0644 ${S}/src/$X ${STAGING_INCDIR}/$X - done - - install -d ${STAGING_DATADIR}/aclocal - install -m 0644 src/gpg-error.m4 ${STAGING_DATADIR}/aclocal/ -} +PR = "r1" diff --git a/packages/libpcre/libpcre_7.6.bb b/packages/libpcre/libpcre_7.6.bb index 3171e10e68..a065b56cfc 100644 --- a/packages/libpcre/libpcre_7.6.bb +++ b/packages/libpcre/libpcre_7.6.bb @@ -5,7 +5,7 @@ provides a POSIX calling interface to PCRE; the regular expressions \ themselves still follow Perl syntax and semantics. The header file for \ the POSIX-style functions is called pcreposix.h." SECTION = "devel" -PR = "r1" +PR = "r2" LICENSE = "BSD" SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ file://pcre-cross.patch;patch=1" @@ -19,6 +19,7 @@ PARALLEL_MAKE = "" LEAD_SONAME = "libpcre.so" CFLAGS_append = " -D_REENTRANT" +CXXFLAGS_powerpc += "-lstdc++" EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000 --enable-rebuild-chartables --enable-utf8" do_compile () { diff --git a/packages/libxsettings-client/files/.mtn2git_empty b/packages/libxsettings-client/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libxsettings-client/files/.mtn2git_empty diff --git a/packages/libxsettings-client/make_pkgconfig_x11.patch b/packages/libxsettings-client/files/make_pkgconfig_x11.patch index 3a386672d2..3a386672d2 100644 --- a/packages/libxsettings-client/make_pkgconfig_x11.patch +++ b/packages/libxsettings-client/files/make_pkgconfig_x11.patch diff --git a/packages/libxsettings-client/no-host-includes.patch b/packages/libxsettings-client/files/no-host-includes.patch index 137c5269f1..137c5269f1 100644 --- a/packages/libxsettings-client/no-host-includes.patch +++ b/packages/libxsettings-client/files/no-host-includes.patch diff --git a/packages/libxsettings-client/libxsettings-client.inc b/packages/libxsettings-client/libxsettings-client.inc new file mode 100644 index 0000000000..bfcf1245f6 --- /dev/null +++ b/packages/libxsettings-client/libxsettings-client.inc @@ -0,0 +1,22 @@ +SECTION = "gpe/libs" +LICENSE = "BSD-X" +PRIORITY = "optional" +DEPENDS = "libxsettings virtual/libx11 libxt" +# libxt is required to stop configure breaking builds by +# including system paths to find it if it isn't present. + +GPE_TARBALL_SUFFIX = "bz2" +inherit autotools pkgconfig gpe + +SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \ +" + +headers = "xsettings-client.h xsettings-common.h" +do_stage () { + oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} + mkdir -p ${STAGING_INCDIR} + for h in ${headers}; do + install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h + done +} + diff --git a/packages/libxsettings-client/libxsettings-client_0.14.bb b/packages/libxsettings-client/libxsettings-client_0.14.bb index 6504405d49..35a2e5ec33 100644 --- a/packages/libxsettings-client/libxsettings-client_0.14.bb +++ b/packages/libxsettings-client/libxsettings-client_0.14.bb @@ -1,21 +1,5 @@ -SECTION = "gpe/libs" -LICENSE = "BSD-X" -PRIORITY = "optional" -DEPENDS = "libxsettings virtual/libx11 libxt" -# libxt is required to stop configure breaking builds by -# including system paths to find it if it isn't present. +require libxsettings-client.inc -inherit autotools pkgconfig gpe +PR = "r1" SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2" -S = "${WORKDIR}/xsettings-client-${PV}" - - -headers = "xsettings-client.h xsettings-common.h" -do_stage () { - oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} - mkdir -p ${STAGING_INCDIR} - for h in ${headers}; do - install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h - done -} diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb index cfec0904e9..dff73c3422 100644 --- a/packages/libxsettings-client/libxsettings-client_0.16.bb +++ b/packages/libxsettings-client/libxsettings-client_0.16.bb @@ -1,23 +1,6 @@ -SECTION = "gpe/libs" -LICENSE = "BSD-X" -PRIORITY = "optional" -DEPENDS = "libxsettings virtual/libx11 libxt" -# libxt is required to stop configure breaking builds by -# including system paths to find it if it isn't present. -PR="r1" +require libxsettings-client.inc -inherit autotools pkgconfig gpe +SRC_URI += " file://Makefile-am.patch;patch=1" -SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \ - file://Makefile-am.patch;patch=1" - - -headers = "xsettings-client.h xsettings-common.h" -do_stage () { - oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} - mkdir -p ${STAGING_INCDIR} - for h in ${headers}; do - install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h - done -} +PR="r2" diff --git a/packages/libxsettings-client/libxsettings-client_0.17.bb b/packages/libxsettings-client/libxsettings-client_0.17.bb index 41f3e8f6e4..2178b749fb 100644 --- a/packages/libxsettings-client/libxsettings-client_0.17.bb +++ b/packages/libxsettings-client/libxsettings-client_0.17.bb @@ -1,22 +1,6 @@ -SECTION = "gpe/libs" -LICENSE = "BSD-X" -PRIORITY = "optional" -DEPENDS = "libxsettings virtual/libx11 libxt gtk-doc" -# libxt is required to stop configure breaking builds by -# including system paths to find it if it isn't present. -PR="r1" +require libxsettings-client.inc -GPE_TARBALL_SUFFIX = "bz2" -inherit autotools pkgconfig gpe +DEPENDS += "gtk-doc" +PR="r2" SRC_URI += "file://no-host-includes.patch;patch=1 " - -headers = "xsettings-client.h xsettings-common.h" -do_stage () { - oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} - mkdir -p ${STAGING_INCDIR} - for h in ${headers}; do - install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h - done -} - diff --git a/packages/libxsettings-client/libxsettings-client_svn.bb b/packages/libxsettings-client/libxsettings-client_svn.bb index 111c692603..c9705b5673 100644 --- a/packages/libxsettings-client/libxsettings-client_svn.bb +++ b/packages/libxsettings-client/libxsettings-client_svn.bb @@ -1,26 +1,10 @@ -SECTION = "gpe/libs" -PRIORITY = "optional" -LICENSE = "BSD-X" -DEPENDS = "libxsettings virtual/libx11 libxt gtk-doc" -PV = "0.17+svn${SRCDATE}" -# libxt is required to stop configure breaking builds by -# including system paths to find it if it isn't present. -PR = "r0" +require libxsettings-client.inc -inherit autotools pkgconfig gpe +DEPENDS += "gtk-doc" +PV = "0.17+svn${SRCDATE}" +PR = "r1" SRC_URI = "${GPE_SVN}" - S = "${WORKDIR}/${PN}" -do_stage () { - oe_libinstall -so libXsettings-client ${STAGING_LIBDIR} - mkdir -p ${STAGING_INCDIR} - for h in ${headers}; do - install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h - done -} - -headers = "xsettings-client.h xsettings-common.h" - DEFAULT_PREFERENCE = "-1" diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-gpio-interrupt-debounce.diff b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-gpio-interrupt-debounce.diff deleted file mode 100644 index 27146c30f1..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-gpio-interrupt-debounce.diff +++ /dev/null @@ -1,87 +0,0 @@ - -Implement GPIO interrupt debouncing on ep93xx. - -Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> - -Index: linux-2.6.22/arch/arm/mach-ep93xx/core.c -=================================================================== ---- linux-2.6.22.orig/arch/arm/mach-ep93xx/core.c -+++ linux-2.6.22/arch/arm/mach-ep93xx/core.c -@@ -154,6 +154,7 @@ struct sys_timer ep93xx_timer = { - *************************************************************************/ - static unsigned char gpio_int_unmasked[3]; - static unsigned char gpio_int_enabled[3]; -+static unsigned char gpio_int_debounce[3]; - static unsigned char gpio_int_type1[3]; - static unsigned char gpio_int_type2[3]; - -@@ -161,16 +162,19 @@ static void update_gpio_int_params(int a - { - if (abf == 0) { - __raw_writeb(0, EP93XX_GPIO_A_INT_ENABLE); -+ __raw_writeb(gpio_int_debounce[0], EP93XX_GPIO_A_INT_DEBOUNCE); - __raw_writeb(gpio_int_type2[0], EP93XX_GPIO_A_INT_TYPE2); - __raw_writeb(gpio_int_type1[0], EP93XX_GPIO_A_INT_TYPE1); - __raw_writeb(gpio_int_unmasked[0] & gpio_int_enabled[0], EP93XX_GPIO_A_INT_ENABLE); - } else if (abf == 1) { - __raw_writeb(0, EP93XX_GPIO_B_INT_ENABLE); -+ __raw_writeb(gpio_int_debounce[1], EP93XX_GPIO_B_INT_DEBOUNCE); - __raw_writeb(gpio_int_type2[1], EP93XX_GPIO_B_INT_TYPE2); - __raw_writeb(gpio_int_type1[1], EP93XX_GPIO_B_INT_TYPE1); - __raw_writeb(gpio_int_unmasked[1] & gpio_int_enabled[1], EP93XX_GPIO_B_INT_ENABLE); - } else if (abf == 2) { - __raw_writeb(0, EP93XX_GPIO_F_INT_ENABLE); -+ __raw_writeb(gpio_int_debounce[2], EP93XX_GPIO_F_INT_DEBOUNCE); - __raw_writeb(gpio_int_type2[2], EP93XX_GPIO_F_INT_TYPE2); - __raw_writeb(gpio_int_type1[2], EP93XX_GPIO_F_INT_TYPE1); - __raw_writeb(gpio_int_unmasked[2] & gpio_int_enabled[2], EP93XX_GPIO_F_INT_ENABLE); -@@ -361,6 +365,13 @@ static int ep93xx_gpio_irq_type(unsigned - } else { - gpio_int_enabled[port] &= ~(1 << line); - } -+ -+ if (type & IRQ_TYPE_DEBOUNCE) { -+ gpio_int_debounce[port] |= 1 << line; -+ } else { -+ gpio_int_debounce[port] &= ~(1 << line); -+ } -+ - update_gpio_int_params(port); - - return 0; -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h -@@ -78,16 +78,19 @@ - #define EP93XX_GPIO_F_INT_ACK EP93XX_GPIO_REG(0x54) - #define EP93XX_GPIO_F_INT_ENABLE EP93XX_GPIO_REG(0x58) - #define EP93XX_GPIO_F_INT_STATUS EP93XX_GPIO_REG(0x5c) -+#define EP93XX_GPIO_F_INT_DEBOUNCE EP93XX_GPIO_REG(0x64) - #define EP93XX_GPIO_A_INT_TYPE1 EP93XX_GPIO_REG(0x90) - #define EP93XX_GPIO_A_INT_TYPE2 EP93XX_GPIO_REG(0x94) - #define EP93XX_GPIO_A_INT_ACK EP93XX_GPIO_REG(0x98) - #define EP93XX_GPIO_A_INT_ENABLE EP93XX_GPIO_REG(0x9c) - #define EP93XX_GPIO_A_INT_STATUS EP93XX_GPIO_REG(0xa0) -+#define EP93XX_GPIO_A_INT_DEBOUNCE EP93XX_GPIO_REG(0xa8) - #define EP93XX_GPIO_B_INT_TYPE1 EP93XX_GPIO_REG(0xac) - #define EP93XX_GPIO_B_INT_TYPE2 EP93XX_GPIO_REG(0xb0) - #define EP93XX_GPIO_B_INT_ACK EP93XX_GPIO_REG(0xb4) - #define EP93XX_GPIO_B_INT_ENABLE EP93XX_GPIO_REG(0xb8) - #define EP93XX_GPIO_B_INT_STATUS EP93XX_GPIO_REG(0xbc) -+#define EP93XX_GPIO_B_INT_DEBOUNCE EP93XX_GPIO_REG(0xc4) - - #define EP93XX_AAC_BASE (EP93XX_APB_VIRT_BASE + 0x00080000) - -Index: linux-2.6.22/include/linux/irq.h -=================================================================== ---- linux-2.6.22.orig/include/linux/irq.h -+++ linux-2.6.22/include/linux/irq.h -@@ -44,6 +44,7 @@ typedef void fastcall (*irq_flow_handler - #define IRQ_TYPE_LEVEL_LOW 0x00000008 /* Level low type */ - #define IRQ_TYPE_SENSE_MASK 0x0000000f /* Mask of the above */ - #define IRQ_TYPE_PROBE 0x00000010 /* Probing in progress */ -+#define IRQ_TYPE_DEBOUNCE 0x00000020 /* Enable HW debounce */ - - /* Internal flags */ - #define IRQ_INPROGRESS 0x00000100 /* IRQ handler active - do not enter! */ diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c-bus.diff b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c-bus.diff deleted file mode 100644 index d3c66940de..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c-bus.diff +++ /dev/null @@ -1,220 +0,0 @@ - -I2C bus driver using ep93xx GPIOs. - -Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> - -Index: linux-2.6.22/drivers/i2c/busses/Kconfig -=================================================================== ---- linux-2.6.22.orig/drivers/i2c/busses/Kconfig 2007-08-30 00:42:45.000000000 +0200 -+++ linux-2.6.22/drivers/i2c/busses/Kconfig 2007-08-30 00:42:52.000000000 +0200 -@@ -635,4 +635,16 @@ - This driver can also be built as a module. If so, the module - will be called i2c-pnx. - -+config I2C_EP93XX -+ tristate "Cirrus Logic EP93XX GPIO-based I2C interface" -+ depends on I2C && ARCH_EP93XX -+ select I2C_ALGOBIT -+ help -+ Say Y here if you have an Cirrus Logic EP93XX based -+ system and are using GPIO lines for an I2C bus. -+ -+ This support is also available as a module. If so, the module -+ will be called i2c-ep93xx. -+ -+ - endmenu -Index: linux-2.6.22/drivers/i2c/busses/Makefile -=================================================================== ---- linux-2.6.22.orig/drivers/i2c/busses/Makefile 2007-08-30 00:42:45.000000000 +0200 -+++ linux-2.6.22/drivers/i2c/busses/Makefile 2007-08-30 00:42:52.000000000 +0200 -@@ -52,6 +52,7 @@ - obj-$(CONFIG_I2C_VOODOO3) += i2c-voodoo3.o - obj-$(CONFIG_SCx200_ACB) += scx200_acb.o - obj-$(CONFIG_SCx200_I2C) += scx200_i2c.o -+obj-$(CONFIG_I2C_EP93XX) += i2c-ep93xx.o - - ifeq ($(CONFIG_I2C_DEBUG_BUS),y) - EXTRA_CFLAGS += -DDEBUG -Index: linux-2.6.22/drivers/i2c/busses/i2c-ep93xx.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22/drivers/i2c/busses/i2c-ep93xx.c 2007-08-30 00:42:52.000000000 +0200 -@@ -0,0 +1,159 @@ -+/* -+ * EP93XX I2C bus driver. -+ * Copyright (C) 2007 Lennert Buytenhek <buytenh@wantstofly.org> -+ * -+ * An I2C bus driver for the Cirrus Logic EP93xx SoC. -+ * -+ * Based on an earlier version by Alessandro Zummo. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/platform_device.h> -+#include <linux/module.h> -+#include <linux/i2c.h> -+#include <linux/i2c-algo-bit.h> -+#include <asm/hardware.h> -+#include <asm/arch/gpio.h> -+ -+struct ep93xx_i2c_priv { -+ struct ep93xx_i2c_data *data; -+ struct i2c_adapter adapter; -+ struct i2c_algo_bit_data algo_data; -+ int sda; -+ int scl; -+}; -+ -+ -+static void ep93xx_bit_setsda(void *cookie, int val) -+{ -+ struct ep93xx_i2c_priv *priv = cookie; -+ -+ if (val) { -+ gpio_line_config(priv->data->sda_pin, GPIO_IN); -+ if (priv->scl && !priv->sda && priv->data->stop != NULL) -+ priv->data->stop(priv->data->cookie); -+ priv->sda = 1; -+ } else { -+ if (priv->scl && priv->sda && priv->data->start != NULL) -+ priv->data->start(priv->data->cookie); -+ gpio_line_config(priv->data->sda_pin, GPIO_OUT); -+ gpio_line_set(priv->data->sda_pin, 0); -+ priv->sda = 0; -+ } -+} -+ -+static void ep93xx_bit_setscl(void *cookie, int val) -+{ -+ struct ep93xx_i2c_priv *priv = cookie; -+ -+ if (val) { -+ gpio_line_config(priv->data->scl_pin, GPIO_IN); -+ priv->scl = 1; -+ } else { -+ gpio_line_config(priv->data->scl_pin, GPIO_OUT); -+ gpio_line_set(priv->data->scl_pin, 0); -+ priv->scl = 0; -+ } -+} -+ -+static int ep93xx_bit_getsda(void *cookie) -+{ -+ struct ep93xx_i2c_priv *priv = cookie; -+ -+ if (priv->sda == 0) -+ BUG(); -+ -+ return gpio_line_get(priv->data->sda_pin); -+} -+ -+static int ep93xx_bit_getscl(void *cookie) -+{ -+ struct ep93xx_i2c_priv *priv = cookie; -+ -+ if (priv->scl == 0) -+ BUG(); -+ -+ return gpio_line_get(priv->data->scl_pin); -+} -+ -+ -+static int ep93xx_i2c_probe(struct platform_device *pdev) -+{ -+ struct ep93xx_i2c_priv *priv; -+ int err; -+ -+ priv = kzalloc(sizeof(struct ep93xx_i2c_priv), GFP_KERNEL); -+ if (priv == NULL) -+ return -ENOMEM; -+ -+ priv->data = pdev->dev.platform_data; -+ -+ strlcpy(priv->adapter.name, pdev->dev.driver->name, I2C_NAME_SIZE); -+ priv->adapter.algo_data = &priv->algo_data; -+ priv->adapter.class = I2C_CLASS_ALL; -+ priv->adapter.dev.parent = &pdev->dev; -+ -+ priv->algo_data.data = priv; -+ priv->algo_data.setsda = ep93xx_bit_setsda; -+ priv->algo_data.setscl = ep93xx_bit_setscl; -+ priv->algo_data.getsda = ep93xx_bit_getsda; -+ priv->algo_data.getscl = ep93xx_bit_getscl; -+ priv->algo_data.udelay = 10; -+ priv->algo_data.timeout = 100; -+ -+ priv->sda = 1; -+ gpio_line_config(priv->data->sda_pin, GPIO_IN); -+ -+ priv->scl = 1; -+ gpio_line_config(priv->data->scl_pin, GPIO_IN); -+ -+ err = i2c_bit_add_bus(&priv->adapter); -+ if (err) { -+ printk(KERN_ERR "ERROR: Could not install %s\n", -+ pdev->dev.bus_id); -+ kfree(priv); -+ return err; -+ } -+ -+ platform_set_drvdata(pdev, priv); -+ -+ return 0; -+} -+ -+static int ep93xx_i2c_remove(struct platform_device *pdev) -+{ -+ struct ep93xx_i2c_priv *priv; -+ -+ priv = platform_get_drvdata(pdev); -+ i2c_del_adapter(&priv->adapter); -+ platform_set_drvdata(pdev, NULL); -+ kfree(priv); -+ -+ return 0; -+} -+ -+static struct platform_driver ep93xx_i2c_driver = { -+ .probe = ep93xx_i2c_probe, -+ .remove = ep93xx_i2c_remove, -+ .driver = { -+ .name = "ep93xx-i2c", -+ .owner = THIS_MODULE, -+ }, -+}; -+ -+static int __init ep93xx_i2c_init(void) -+{ -+ return platform_driver_register(&ep93xx_i2c_driver); -+} -+ -+static void __exit ep93xx_i2c_exit(void) -+{ -+ platform_driver_unregister(&ep93xx_i2c_driver); -+} -+ -+module_init(ep93xx_i2c_init); -+module_exit(ep93xx_i2c_exit); -+ -+MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>"); -+MODULE_DESCRIPTION("GPIO-based I2C adapter for EP93XX systems"); -+MODULE_LICENSE("GPL"); -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/platform.h 2007-08-30 00:42:45.000000000 +0200 -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h 2007-08-30 00:42:52.000000000 +0200 -@@ -16,5 +16,13 @@ - unsigned char phy_id; - }; - -+struct ep93xx_i2c_data { -+ int sda_pin; -+ int scl_pin; -+ void *cookie; -+ void (*start)(void *); -+ void (*stop)(void *); -+}; -+ - - #endif diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c.diff b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c.diff deleted file mode 100644 index b68fb14e2e..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-i2c.diff +++ /dev/null @@ -1,110 +0,0 @@ - -Instantiate the ep93xx gpio i2c bus driver in the generic ep93xx -code. - -Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> - -Index: linux-2.6.22/arch/arm/mach-ep93xx/core.c -=================================================================== ---- linux-2.6.22.orig/arch/arm/mach-ep93xx/core.c 2007-08-30 00:42:49.000000000 +0200 -+++ linux-2.6.22/arch/arm/mach-ep93xx/core.c 2007-08-30 00:43:00.000000000 +0200 -@@ -509,6 +509,52 @@ - }; - - -+static DEFINE_MUTEX(eeclk_eedat_mutex); -+static int i2c_transaction_in_progress; -+ -+static void ep93xx_i2c_start_condition(void *cookie) -+{ -+ if (!i2c_transaction_in_progress) { -+ mutex_lock(&eeclk_eedat_mutex); -+ i2c_transaction_in_progress = 1; -+ } -+} -+ -+static void ep93xx_i2c_stop_condition(void *cookie) -+{ -+ if (i2c_transaction_in_progress) { -+ mutex_unlock(&eeclk_eedat_mutex); -+ i2c_transaction_in_progress = 0; -+ } else { -+ printk(KERN_WARNING "ep93xx: i2c stop without start??\n"); -+ } -+} -+ -+static struct ep93xx_i2c_data ep93xx_i2c_gpio_data = { -+ .sda_pin = EP93XX_GPIO_LINE_EEDAT, -+ .scl_pin = EP93XX_GPIO_LINE_EECLK, -+ .start = ep93xx_i2c_start_condition, -+ .stop = ep93xx_i2c_stop_condition, -+}; -+ -+static struct platform_device ep93xx_i2c_device = { -+ .name = "ep93xx-i2c", -+ .id = 0, -+ .dev.platform_data = &ep93xx_i2c_gpio_data, -+ .num_resources = 0, -+}; -+ -+void eeclk_eedat_claim(void) -+{ -+ mutex_lock(&eeclk_eedat_mutex); -+} -+ -+void eeclk_eedat_release(void) -+{ -+ mutex_unlock(&eeclk_eedat_mutex); -+} -+ -+ - void __init ep93xx_init_devices(void) - { - unsigned int v; -@@ -521,10 +567,20 @@ - __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK); - __raw_writel(v, EP93XX_SYSCON_DEVICE_CONFIG); - -+ /* -+ * When EECLK/EEDAT are in open drain mode (EEDRIVE=0b11), -+ * writing a 1 to their Data Register bits causes subsequent -+ * reads from the Data Direction Register to return 'input', -+ * which confuses gpio_line_config(). So, we use CMOS drive -+ * mode instead. -+ */ -+ __raw_writel(0, EP93XX_GPIO_EEDRIVE); -+ - amba_device_register(&uart1_device, &iomem_resource); - amba_device_register(&uart2_device, &iomem_resource); - amba_device_register(&uart3_device, &iomem_resource); - - platform_device_register(&ep93xx_rtc_device); - platform_device_register(&ep93xx_ohci_device); -+ platform_device_register(&ep93xx_i2c_device); - } -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h 2007-08-30 00:42:49.000000000 +0200 -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h 2007-08-30 00:43:00.000000000 +0200 -@@ -91,6 +91,7 @@ - #define EP93XX_GPIO_B_INT_ENABLE EP93XX_GPIO_REG(0xb8) - #define EP93XX_GPIO_B_INT_STATUS EP93XX_GPIO_REG(0xbc) - #define EP93XX_GPIO_B_INT_DEBOUNCE EP93XX_GPIO_REG(0xc4) -+#define EP93XX_GPIO_EEDRIVE EP93XX_GPIO_REG(0xc8) - - #define EP93XX_AAC_BASE (EP93XX_APB_VIRT_BASE + 0x00080000) - -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/platform.h 2007-08-30 00:42:52.000000000 +0200 -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/platform.h 2007-08-30 00:43:00.000000000 +0200 -@@ -10,6 +10,9 @@ - void ep93xx_init_devices(void); - extern struct sys_timer ep93xx_timer; - -+void eeclk_eedat_claim(void); -+void eeclk_eedat_release(void); -+ - struct ep93xx_eth_data - { - unsigned char dev_addr[6]; diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-leds.diff b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-leds.diff deleted file mode 100644 index 0d11311d10..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-leds.diff +++ /dev/null @@ -1,181 +0,0 @@ - -EP93xx leds driver - -Signed-off-by: Petr Stetiar <ynezz@true.cz> - -Index: linux-2.6.22/arch/arm/mach-ep93xx/core.c -=================================================================== ---- linux-2.6.22.orig/arch/arm/mach-ep93xx/core.c -+++ linux-2.6.22/arch/arm/mach-ep93xx/core.c -@@ -555,6 +555,12 @@ void eeclk_eedat_release(void) - } - - -+static struct platform_device ep93xx_led_device = { -+ .name = "ep93xx-led", -+ .id = -1, -+}; -+ -+ - void __init ep93xx_init_devices(void) - { - unsigned int v; -@@ -583,4 +589,5 @@ void __init ep93xx_init_devices(void) - platform_device_register(&ep93xx_rtc_device); - platform_device_register(&ep93xx_ohci_device); - platform_device_register(&ep93xx_i2c_device); -+ platform_device_register(&ep93xx_led_device); - } -Index: linux-2.6.22/drivers/leds/Kconfig -=================================================================== ---- linux-2.6.22.orig/drivers/leds/Kconfig -+++ linux-2.6.22/drivers/leds/Kconfig -@@ -95,6 +95,12 @@ config LEDS_COBALT - help - This option enables support for the front LED on Cobalt Server - -+config LEDS_EP93XX -+ tristate "LED Support for Cirrus Logic EP93xx" -+ depends on LEDS_CLASS && ARCH_EP93XX -+ help -+ This option enables support for the Cirrus Logic EP93xx based boards. -+ - comment "LED Triggers" - - config LEDS_TRIGGERS -Index: linux-2.6.22/drivers/leds/Makefile -=================================================================== ---- linux-2.6.22.orig/drivers/leds/Makefile -+++ linux-2.6.22/drivers/leds/Makefile -@@ -16,6 +16,7 @@ obj-$(CONFIG_LEDS_NET48XX) += leds-net4 - obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o - obj-$(CONFIG_LEDS_H1940) += leds-h1940.o - obj-$(CONFIG_LEDS_COBALT) += leds-cobalt.o -+obj-$(CONFIG_LEDS_EP93XX) += leds-ep93xx.o - - # LED Triggers - obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o -Index: linux-2.6.22/drivers/leds/leds-ep93xx.c -=================================================================== ---- /dev/null -+++ linux-2.6.22/drivers/leds/leds-ep93xx.c -@@ -0,0 +1,119 @@ -+/* -+ * LEDs driver for Cirrus Logic EP93xx -+ * -+ * Author: Petr Stetiar <ynezz@true.cz> -+ * -+ * Based on leds-corgi.c by Richard Purdie -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/platform_device.h> -+#include <linux/leds.h> -+#include <asm/mach-types.h> -+#include <asm/arch/hardware.h> -+#include <asm/arch/gpio.h> -+ -+static void ep93xx_green_led_set(struct led_classdev *led_cdev, enum led_brightness value) -+{ -+ if (value) -+ gpio_line_set(EP93XX_GPIO_LINE_GRLED, EP93XX_GPIO_HIGH); -+ else -+ gpio_line_set(EP93XX_GPIO_LINE_GRLED, EP93XX_GPIO_LOW); -+} -+ -+static void ep93xx_red_led_set(struct led_classdev *led_cdev, enum led_brightness value) -+{ -+ if (value) -+ gpio_line_set(EP93XX_GPIO_LINE_RDLED, EP93XX_GPIO_HIGH); -+ else -+ gpio_line_set(EP93XX_GPIO_LINE_RDLED, EP93XX_GPIO_LOW); -+} -+ -+ -+static struct led_classdev ep93xx_green_led = { -+ .name = "ep93xx:green", -+ .default_trigger = "none", -+ .brightness_set = ep93xx_green_led_set, -+}; -+ -+static struct led_classdev ep93xx_red_led = { -+ .name = "ep93xx:red", -+ .default_trigger = "heartbeat", -+ .brightness_set = ep93xx_red_led_set, -+}; -+ -+#ifdef CONFIG_PM -+static int ep93xx_led_suspend(struct platform_device *dev, pm_message_t state) -+{ -+ led_classdev_suspend(&ep93xx_green_led); -+ led_classdev_suspend(&ep93xx_red_led); -+ return 0; -+} -+ -+static int ep93xx_led_resume(struct platform_device *dev) -+{ -+ led_classdev_resume(&ep93xx_red_led); -+ led_classdev_resume(&ep93xx_green_led); -+ return 0; -+} -+#endif -+ -+static int ep93xx_led_probe(struct platform_device *pdev) -+{ -+ int ret; -+ -+ gpio_line_config(EP93XX_GPIO_LINE_GRLED, GPIO_OUT); -+ gpio_line_config(EP93XX_GPIO_LINE_RDLED, GPIO_OUT); -+ -+ ret = led_classdev_register(&pdev->dev, &ep93xx_green_led); -+ if (ret < 0) -+ return ret; -+ -+ ret = led_classdev_register(&pdev->dev, &ep93xx_red_led); -+ if (ret < 0) -+ led_classdev_unregister(&ep93xx_green_led); -+ -+ return ret; -+} -+ -+static int ep93xx_led_remove(struct platform_device *pdev) -+{ -+ led_classdev_unregister(&ep93xx_green_led); -+ led_classdev_unregister(&ep93xx_red_led); -+ return 0; -+} -+ -+static struct platform_driver ep93xx_led_driver = { -+ .probe = ep93xx_led_probe, -+ .remove = ep93xx_led_remove, -+#ifdef CONFIG_PM -+ .suspend = ep93xx_led_suspend, -+ .resume = ep93xx_led_resume, -+#endif -+ .driver = { -+ .name = "ep93xx-led", -+ }, -+}; -+ -+static int __init ep93xx_led_init(void) -+{ -+ return platform_driver_register(&ep93xx_led_driver); -+} -+ -+static void __exit ep93xx_led_exit(void) -+{ -+ platform_driver_unregister(&ep93xx_led_driver); -+} -+ -+module_init(ep93xx_led_init); -+module_exit(ep93xx_led_exit); -+ -+MODULE_AUTHOR("Petr Stetiar <ynezz@true.cz>"); -+MODULE_DESCRIPTION("Cirrus Logic EP93xx LED driver"); -+MODULE_LICENSE("GPL"); diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-maverick-uniqid.patch b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-maverick-uniqid.patch deleted file mode 100644 index fb6c8cfe18..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-maverick-uniqid.patch +++ /dev/null @@ -1,38 +0,0 @@ - -Adds support for SoC's unique ID (Maverick Key) in /proc/cpuinfo - -Signed-off-by: Petr Stetiar <ynezz@true.cz> - -Index: linux-2.6.22/arch/arm/kernel/setup.c -=================================================================== ---- linux-2.6.22.orig/arch/arm/kernel/setup.c 2007-09-02 23:08:51.000000000 +0200 -+++ linux-2.6.22/arch/arm/kernel/setup.c 2007-09-02 23:10:24.000000000 +0200 -@@ -959,8 +959,15 @@ - - seq_printf(m, "Hardware\t: %s\n", machine_name); - seq_printf(m, "Revision\t: %04x\n", system_rev); -+ -+#if defined(CONFIG_ARCH_EP93XX) -+#include <asm/arch/ep93xx-regs.h> -+ seq_printf(m, "Serial\t\t: %016x\n", -+ *((unsigned int *)EP93XX_SECURITY_UNIQID)); -+#else - seq_printf(m, "Serial\t\t: %08x%08x\n", - system_serial_high, system_serial_low); -+#endif - - return 0; - } -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/ep93xx-regs.h 2007-09-02 23:06:45.000000000 +0200 -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/ep93xx-regs.h 2007-09-02 23:08:34.000000000 +0200 -@@ -70,6 +70,8 @@ - #define EP93XX_I2S_BASE (EP93XX_APB_VIRT_BASE + 0x00020000) - - #define EP93XX_SECURITY_BASE (EP93XX_APB_VIRT_BASE + 0x00030000) -+#define EP93XX_SECURITY_REG(x) (EP93XX_SECURITY_BASE + (x)) -+#define EP93XX_SECURITY_UNIQID EP93XX_SECURITY_REG(0x2440) - - #define EP93XX_GPIO_BASE (EP93XX_APB_VIRT_BASE + 0x00040000) - #define EP93XX_GPIO_REG(x) (EP93XX_GPIO_BASE + (x)) diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-clocks.diff b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-clocks.diff deleted file mode 100644 index 9eb2d9de98..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-clocks.diff +++ /dev/null @@ -1,42 +0,0 @@ - -Hackishly enable all UART clocks before uncompressing the kernel, -so that using ttyAM1 or ttyAM2 as console can work. - -Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> - -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/uncompress.h -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h -@@ -78,6 +78,23 @@ static void ethernet_reset(void) - - - /* -+ * We don't have clock management for the UARTs (amba-pl010) -+ * yet, so hackily enable all UART clocks here for now. -+ */ -+#define PHYS_SYSCON_DEVICE_CONFIG 0x80930080 -+#define PHYS_SYSCON_SWLOCK 0x809300c0 -+ -+static void enable_all_uart_clocks(void) -+{ -+ unsigned int v; -+ -+ v = __raw_readl(PHYS_SYSCON_DEVICE_CONFIG); -+ __raw_writel(0xaa, PHYS_SYSCON_SWLOCK); -+ __raw_writel(v | 0x01140000, PHYS_SYSCON_DEVICE_CONFIG); -+} -+ -+ -+/* - * Some bootloaders don't turn on the UARTBAUD bit, which means that - * the UARTs will be running off a divided 7.3728 MHz clock instead of - * the 14.7456 MHz peripheral clock when linux boots. -@@ -126,6 +143,7 @@ static void fix_uart_base(void) - static void arch_decomp_setup(void) - { - ethernet_reset(); -+ enable_all_uart_clocks(); - fix_uart_base(); - } - diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-uartbaud.diff b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-uartbaud.diff deleted file mode 100644 index 7183ab626e..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-serial-uartbaud.diff +++ /dev/null @@ -1,66 +0,0 @@ - -Force UARTBAUD on before uncompressing. - -Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> - -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/uncompress.h -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/uncompress.h -@@ -77,9 +77,56 @@ static void ethernet_reset(void) - } - - -+/* -+ * Some bootloaders don't turn on the UARTBAUD bit, which means that -+ * the UARTs will be running off a divided 7.3728 MHz clock instead of -+ * the 14.7456 MHz peripheral clock when linux boots. -+ * -+ * We detect that condition here and fix it by turning on UARTBAUD, and -+ * then reprogramming the divisors on all enabled UARTs to twice what -+ * they were before we turned UARTBAUD on, to preserve the programmed -+ * baud rate. -+ */ -+#define PHYS_SYSCON_CLOCK_CONTROL 0x80930004 -+#define SYSCON_CLOCK_UARTBAUD 0x20000000 -+#define PHYS_UART1_BASE 0x808c0000 -+#define PHYS_UART2_BASE 0x808d0000 -+#define PHYS_UART3_BASE 0x808e0000 -+ -+static void uart_divisor_times_two(unsigned int base) -+{ -+ u16 divisor; -+ -+ divisor = __raw_readb(base + 0x0c) << 8; -+ divisor |= __raw_readb(base + 0x10); -+ if (divisor) { -+ divisor = (2 * (divisor + 1)) - 1; -+ __raw_writeb(divisor >> 8, base + 0x0c); -+ __raw_writeb(divisor & 0xff, base + 0x10); -+ __raw_writeb(__raw_readb(base + 0x08), base + 0x08); -+ } -+} -+ -+static void fix_uart_base(void) -+{ -+ unsigned int v; -+ -+ v = __raw_readl(PHYS_SYSCON_CLOCK_CONTROL); -+ if ((v & SYSCON_CLOCK_UARTBAUD) == 0) { -+ v |= SYSCON_CLOCK_UARTBAUD; -+ __raw_writel(v, PHYS_SYSCON_CLOCK_CONTROL); -+ -+ uart_divisor_times_two(PHYS_UART1_BASE); -+ uart_divisor_times_two(PHYS_UART2_BASE); -+ uart_divisor_times_two(PHYS_UART3_BASE); -+ } -+} -+ -+ - static void arch_decomp_setup(void) - { - ethernet_reset(); -+ fix_uart_base(); - } - - #define arch_decomp_wdog() diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-timer-accuracy.diff b/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-timer-accuracy.diff deleted file mode 100644 index 8254153b69..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ep93xx-timer-accuracy.diff +++ /dev/null @@ -1,59 +0,0 @@ - -The ep93xx has a weird timer tick base (983.04 kHz.) This experimental -patch tries to increase time of day accuracy by keeping the number of -ticks until the next jiffy in a fractional value representation. - -Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> - -Index: linux-2.6.22/arch/arm/mach-ep93xx/core.c -=================================================================== ---- linux-2.6.22.orig/arch/arm/mach-ep93xx/core.c -+++ linux-2.6.22/arch/arm/mach-ep93xx/core.c -@@ -94,19 +94,32 @@ void __init ep93xx_map_io(void) - * track of lost jiffies. - */ - static unsigned int last_jiffy_time; -+static unsigned int next_jiffy_time; -+static unsigned int accumulator; - --#define TIMER4_TICKS_PER_JIFFY ((CLOCK_TICK_RATE + (HZ/2)) / HZ) -+#define TIMER4_TICKS_PER_JIFFY (983040 / HZ) -+#define TIMER4_TICKS_MOD_JIFFY (983040 % HZ) -+ -+static int after_eq(unsigned long a, unsigned long b) -+{ -+ return ((signed long)(a - b)) >= 0; -+} - - static int ep93xx_timer_interrupt(int irq, void *dev_id) - { - write_seqlock(&xtime_lock); - - __raw_writel(1, EP93XX_TIMER1_CLEAR); -- while ((signed long) -- (__raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time) -- >= TIMER4_TICKS_PER_JIFFY) { -- last_jiffy_time += TIMER4_TICKS_PER_JIFFY; -+ while (after_eq(__raw_readl(EP93XX_TIMER4_VALUE_LOW), next_jiffy_time)) { - timer_tick(); -+ -+ last_jiffy_time = next_jiffy_time; -+ next_jiffy_time += TIMER4_TICKS_PER_JIFFY; -+ accumulator += TIMER4_TICKS_MOD_JIFFY; -+ if (accumulator >= HZ) { -+ next_jiffy_time++; -+ accumulator -= HZ; -+ } - } - - write_sequnlock(&xtime_lock); -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/timex.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/timex.h -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/timex.h -@@ -2,4 +2,4 @@ - * linux/include/asm-arm/arch-ep93xx/timex.h - */ - --#define CLOCK_TICK_RATE 983040 -+#define CLOCK_TICK_RATE (1000 * HZ) diff --git a/packages/linux/linux-2.6.22.6/ts72xx/series b/packages/linux/linux-2.6.22.6/ts72xx/series deleted file mode 100644 index e5455efd3c..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/series +++ /dev/null @@ -1,12 +0,0 @@ -ep93xx-gpio-interrupt-debounce.diff -ep93xx-i2c-bus.diff -ep93xx-i2c.diff -ep93xx-leds.diff -ep93xx-serial-uartbaud.diff -ep93xx-serial-clocks.diff -ep93xx-timer-accuracy.diff -ep93xx-maverick-uniqid.patch -ts72xx-machine-id-fix.patch -ts72xx-nfbit-fix.patch -ts72xx-watchdog.patch -ts72xx-use-cpld-reset.patch diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-machine-id-fix.patch b/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-machine-id-fix.patch deleted file mode 100644 index 64c38398db..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-machine-id-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ - -Fix wrong machine ID passed from RedBoot - -Signed-off-by: Petr Stetiar <ynezz@true.cz> - -Index: linux-2.6.22/arch/arm/kernel/head.S -=================================================================== ---- linux-2.6.22.orig/arch/arm/kernel/head.S 2007-08-30 00:42:45.000000000 +0200 -+++ linux-2.6.22/arch/arm/kernel/head.S 2007-08-30 00:43:13.000000000 +0200 -@@ -82,6 +82,7 @@ - bl __lookup_processor_type @ r5=procinfo r9=cpuid - movs r10, r5 @ invalid processor (r5=0)? - beq __error_p @ yes, error 'p' -+ ldr r1, =0x000002a1 @ mach-type = TS-7250 - bl __lookup_machine_type @ r5=machinfo - movs r8, r5 @ invalid machine (r5=0)? - beq __error_a @ yes, error 'a' diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-nfbit-fix.patch b/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-nfbit-fix.patch deleted file mode 100644 index eab73154a8..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-nfbit-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ - -Force the nF bit on. Usually this is set by the bootrom. If it is not set, -then the CPU core will run from HCLK instead of FCLK, and performance will -suffer. If you see BogoMIPS of about 1/4 of your CPU clock, try turning this -on; your performance should double. - ---- linux-2.6.21.4/arch/arm/mm/proc-arm920.S 2007-06-07 23:27:31.000000000 +0200 -+++ linux-2.6.21.4-arm/arch/arm/mm/proc-arm920.S 2007-06-08 22:59:48.000000000 +0200 -@@ -395,6 +395,7 @@ - mrc p15, 0, r0, c1, c0 @ get control register v4 - bic r0, r0, r5 - orr r0, r0, r6 -+ orr r0, r0, #0x40000000 - mov pc, lr - .size __arm920_setup, . - __arm920_setup diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-use-cpld-reset.patch b/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-use-cpld-reset.patch deleted file mode 100644 index 9744a67653..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-use-cpld-reset.patch +++ /dev/null @@ -1,41 +0,0 @@ - -Use CPLD watchdog to reset the machine instead of buggy ep93xx one, which -sometimes get stuck... - -Signed-off-by: Petr Stetiar <ynezz@true.cz> - -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/system.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/system.h 2007-08-30 00:53:47.000000000 +0200 -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/system.h 2007-08-30 00:54:28.000000000 +0200 -@@ -3,6 +3,7 @@ - */ - - #include <asm/hardware.h> -+#include <asm/mach-types.h> - - static inline void arch_idle(void) - { -@@ -15,11 +16,17 @@ - - local_irq_disable(); - -- devicecfg = __raw_readl(EP93XX_SYSCON_DEVICE_CONFIG); -- __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK); -- __raw_writel(devicecfg | 0x80000000, EP93XX_SYSCON_DEVICE_CONFIG); -- __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK); -- __raw_writel(devicecfg & ~0x80000000, EP93XX_SYSCON_DEVICE_CONFIG); -+ if (machine_is_ts72xx()) { -+ __raw_writeb(0x5, TS72XX_WATCHDOG_FEED_PHYS_BASE); -+ __raw_writeb(0x1, TS72XX_WATCHDOG_CONTROL_PHYS_BASE); -+ } else { -+ devicecfg = __raw_readl(EP93XX_SYSCON_DEVICE_CONFIG); -+ __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK); -+ __raw_writel(devicecfg | 0x80000000, EP93XX_SYSCON_DEVICE_CONFIG); -+ __raw_writel(0xaa, EP93XX_SYSCON_SWLOCK); -+ __raw_writel(devicecfg & ~0x80000000, EP93XX_SYSCON_DEVICE_CONFIG); -+ } -+ - - while (1) - ; diff --git a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-watchdog.patch b/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-watchdog.patch deleted file mode 100644 index aa2cb834f9..0000000000 --- a/packages/linux/linux-2.6.22.6/ts72xx/ts72xx-watchdog.patch +++ /dev/null @@ -1,430 +0,0 @@ - -TS-72xx watchdog driver - -Signed-off-by: Matthieu Crapet <mcrapet@gmail.com> - -Index: linux-2.6.22/arch/arm/mach-ep93xx/ts72xx.c -=================================================================== ---- linux-2.6.22.orig/arch/arm/mach-ep93xx/ts72xx.c 2007-08-30 01:33:00.000000000 +0200 -+++ linux-2.6.22/arch/arm/mach-ep93xx/ts72xx.c 2007-08-30 01:33:10.000000000 +0200 -@@ -183,6 +183,26 @@ - .resource = ts72xx_eth_resource, - }; - -+static struct resource ts72xx_watchdog_resources[] = { -+ [0] = { -+ .start = TS72XX_WATCHDOG_CONTROL_PHYS_BASE, -+ .end = TS72XX_WATCHDOG_CONTROL_PHYS_BASE + 0x0fff, -+ .flags = IORESOURCE_MEM, -+ }, -+ [1] = { -+ .start = TS72XX_WATCHDOG_FEED_PHYS_BASE, -+ .end = TS72XX_WATCHDOG_FEED_PHYS_BASE + 0x0fff, -+ .flags = IORESOURCE_MEM, -+ }, -+}; -+ -+static struct platform_device ts72xx_watchdog_device = { -+ .name = "ts72xx_wdt", -+ .id = -1, -+ .num_resources = ARRAY_SIZE(ts72xx_watchdog_resources), -+ .resource = ts72xx_watchdog_resources, -+}; -+ - static void __init ts72xx_init_machine(void) - { - ep93xx_init_devices(); -@@ -193,6 +213,7 @@ - memcpy(ts72xx_eth_data.dev_addr, - (void *)(EP93XX_ETHERNET_BASE + 0x50), 6); - platform_device_register(&ts72xx_eth_device); -+ platform_device_register(&ts72xx_watchdog_device); - } - - MACHINE_START(TS72XX, "Technologic Systems TS-72xx SBC") -Index: linux-2.6.22/drivers/char/watchdog/Kconfig -=================================================================== ---- linux-2.6.22.orig/drivers/char/watchdog/Kconfig 2007-08-30 01:33:00.000000000 +0200 -+++ linux-2.6.22/drivers/char/watchdog/Kconfig 2007-08-30 01:33:10.000000000 +0200 -@@ -187,6 +187,18 @@ - - Say N if you are unsure. - -+config TS72XX_WATCHDOG -+ tristate "TS-72xx Watchdog" -+ depends on WATCHDOG && ARCH_EP93XX && MACH_TS72XX -+ help -+ Say Y here if to include support for the CPLD watchdog -+ included on Technologic Systems SBC. -+ -+ NOTE: timeout value is given in milliseconds, not in seconds. -+ -+ To compile this driver as a module, choose M here: the -+ module will be called ts72xx_wdt. -+ - # X86 (i386 + ia64 + x86_64) Architecture - - config ACQUIRE_WDT -Index: linux-2.6.22/drivers/char/watchdog/Makefile -=================================================================== ---- linux-2.6.22.orig/drivers/char/watchdog/Makefile 2007-08-30 01:33:00.000000000 +0200 -+++ linux-2.6.22/drivers/char/watchdog/Makefile 2007-08-30 01:33:10.000000000 +0200 -@@ -34,6 +34,7 @@ - obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o - obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o - obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o -+obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o - obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o - - # X86 (i386 + ia64 + x86_64) Architecture -Index: linux-2.6.22/drivers/char/watchdog/ts72xx_wdt.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.22/drivers/char/watchdog/ts72xx_wdt.c 2007-08-30 01:33:10.000000000 +0200 -@@ -0,0 +1,332 @@ -+/* -+ * TS-72xx Watchdog Driver for Technologic Systems boards. -+ * -+ * Based on ep93xx_wdt.c by Lehtiniemi <rayl@mail.com> & -+ * Alessandro Zummo <a.zummo@towertech.it> -+ * and ib700wdt.c by Charles Howes <chowes@vsol.net> -+ * and mpc83xx_wdt.c by Dave Updegraff <dave@cray.org> & -+ * Kumar Gala <galak@kernel.crashing.org> -+ * -+ * (c) Copyright 2006 Matthieu Crapet <mcrapet@gmail.com> -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ * -+ * This driver only deals with native timeout provided by CPLD : -+ * 1/4s, 1/2s, 1s, 2s, 4s and 8s. No external timer is used. -+ * Notice that we must ping before modifying the control register. -+ */ -+ -+#include <linux/module.h> -+#include <linux/moduleparam.h> -+#include <linux/types.h> -+#include <linux/kernel.h> -+#include <linux/fs.h> -+#include <linux/miscdevice.h> -+#include <linux/platform_device.h> -+#include <linux/init.h> -+#include <linux/watchdog.h> -+#include <asm/io.h> -+#include <asm/uaccess.h> -+#include <asm/system.h> -+#include <asm/mach-types.h> -+ -+#define WATCHDOG_VERSION "0.2" -+#define PFX "ts72xx_wdt: " -+ -+#define WATCHDOG_TIMEOUT 8000 /* 8 seconds */ -+#define WDT_IN_USE 0 -+#define WDT_OK_TO_CLOSE 1 -+ -+static unsigned long ts72xx_wdt_status; -+static unsigned char ts72xx_wdt_cpld_value = 0x7; -+static int nowayout = WATCHDOG_NOWAYOUT; -+static int timeout = WATCHDOG_TIMEOUT; -+ -+static int ts72xx_wdt_times[12] = { -+ 6000, 3000, 1500, 750, 275, 0, -+ 8000, 4000, 2000, 1000, 500, 250 -+}; -+ -+static void __iomem *control_register; -+static void __iomem *feed_register; -+ -+ -+/* -+ * Kernel methods. -+ */ -+ -+static inline void ts72xx_wdt_ping(void) -+{ -+ __raw_writew(0x05, feed_register); -+} -+ -+static inline void ts72xx_wdt_enable(void) -+{ -+ __raw_writew(0x05, feed_register); -+ __raw_writew(ts72xx_wdt_cpld_value, control_register); -+} -+ -+static inline void ts72xx_wdt_disable(void) -+{ -+ __raw_writew(0x05, feed_register); -+ __raw_writew(0, control_register); -+} -+ -+static inline void ts72xx_parse_timeout(int value) -+{ -+ unsigned char cpld_value = 0x7; -+ int i; -+ -+ if ((value > 8000) || (value < 250)) { -+ timeout = WATCHDOG_TIMEOUT; -+ printk(KERN_INFO PFX "Timeout value out of range, set to %d\n", timeout); -+ } else { -+ for (i = 0; i < 6; i++) { -+ if (value >= ts72xx_wdt_times[i]) { -+ timeout = ts72xx_wdt_times[i+6]; -+ -+ if (value != timeout) -+ printk(KERN_INFO PFX "Timeout value rounded to %d\n", timeout); -+ -+ if (i >= 3) /* cpld_value can't be 4 */ -+ i++; -+ -+ cpld_value = 7 - i; -+ break; -+ } -+ } -+ } -+ -+ ts72xx_wdt_cpld_value = cpld_value; -+} -+ -+static ssize_t ts72xx_wdt_write(struct file *file, const char __user *buf, -+ size_t count, loff_t *ppos) -+{ -+ /* Can't seek (pwrite) on this device */ -+ if (*ppos != file->f_pos) -+ return -ESPIPE; -+ -+ if (count) { -+ if (!nowayout) { -+ size_t i; -+ -+ clear_bit(WDT_OK_TO_CLOSE, &ts72xx_wdt_status); -+ -+ for (i = 0; i != count; i++) { -+ char c; -+ -+ if (get_user(c, buf + i)) -+ return -EFAULT; -+ -+ if (c == 'V') -+ set_bit(WDT_OK_TO_CLOSE, &ts72xx_wdt_status); -+ else -+ clear_bit(WDT_OK_TO_CLOSE, &ts72xx_wdt_status); -+ } -+ } -+ ts72xx_wdt_ping(); -+ } -+ -+ return count; -+} -+ -+static int ts72xx_wdt_ioctl(struct inode *inode, struct file *file, -+ unsigned int cmd, unsigned long arg) -+{ -+ int new_margin; -+ int ret = -ENOIOCTLCMD; -+ -+ static struct watchdog_info ident = { -+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, -+ .firmware_version = 1, -+ .identity = "TS-72xx Watchdog", -+ }; -+ -+ switch (cmd) { -+ case WDIOC_GETSUPPORT: -+ ret = copy_to_user((struct watchdog_info __user *)arg, &ident, -+ sizeof(ident)) ? -EFAULT : 0; -+ break; -+ -+ case WDIOC_GETSTATUS: -+ case WDIOC_GETBOOTSTATUS: -+ ret = put_user(0, (int __user *)arg); -+ break; -+ -+ case WDIOC_KEEPALIVE: -+ ts72xx_wdt_ping(); -+ ret = 0; -+ break; -+ -+ case WDIOC_SETTIMEOUT: -+ if (get_user(new_margin, (int __user *)arg)) -+ return -EFAULT; -+ -+ ts72xx_parse_timeout(new_margin); -+ ts72xx_wdt_enable(); -+ /* Fall */ -+ -+ case WDIOC_GETTIMEOUT: -+ ret = put_user(timeout, (int __user *)arg); -+ break; -+ } -+ -+ return ret; -+} -+ -+static int ts72xx_wdt_open(struct inode *inode, struct file *file) -+{ -+ if (test_and_set_bit(WDT_IN_USE, &ts72xx_wdt_status)) -+ return -EBUSY; -+ -+ if (nowayout) { -+ __module_get(THIS_MODULE); -+ } -+ -+ ts72xx_wdt_enable(); -+ ts72xx_wdt_ping(); -+ -+ return nonseekable_open(inode, file); -+} -+ -+static int ts72xx_wdt_close(struct inode *inode, struct file *file) -+{ -+ if (test_bit(WDT_OK_TO_CLOSE, &ts72xx_wdt_status)) -+ ts72xx_wdt_disable(); -+ else -+ printk(KERN_CRIT PFX "Device file closed unexpectedly. " -+ "Will not stop the WDT!\n"); -+ -+ clear_bit(WDT_IN_USE, &ts72xx_wdt_status); -+ -+ return 0; -+} -+ -+/* -+ * Kernel Interfaces -+ */ -+ -+static struct file_operations ts72xx_wdt_fops = { -+ .owner = THIS_MODULE, -+ .llseek = no_llseek, -+ .write = ts72xx_wdt_write, -+ .ioctl = ts72xx_wdt_ioctl, -+ .open = ts72xx_wdt_open, -+ .release = ts72xx_wdt_close, -+}; -+ -+static struct miscdevice ts72xx_wdt_miscdev = { -+ .minor = WATCHDOG_MINOR, -+ .name = "watchdog", -+ .fops = &ts72xx_wdt_fops, -+}; -+ -+static void ts72xx_wdt_shutdown(struct platform_device *dev) -+{ -+ ts72xx_wdt_disable(); -+} -+ -+static int __devinit ts72xx_wdt_probe(struct platform_device *dev) -+{ -+ struct resource *r; -+ int ret; -+ -+ if (!machine_is_ts72xx()) -+ return -ENODEV; -+ -+ r = platform_get_resource(dev, IORESOURCE_MEM, 0); -+ -+ if (!r) { -+ ret = -ENODEV; -+ goto err_out; -+ } -+ -+ control_register = ioremap(r->start, r->end - r->start + 1); -+ -+ if (control_register == NULL) { -+ ret = -ENOMEM; -+ goto err_out; -+ } -+ -+ r = platform_get_resource(dev, IORESOURCE_MEM, 1); -+ -+ if (!r) { -+ ret = -ENODEV; -+ goto err_unmap1; -+ } -+ -+ feed_register = ioremap(r->start, r->end - r->start + 1); -+ -+ if (feed_register == NULL) { -+ ret = -ENOMEM; -+ goto err_unmap1; -+ } -+ -+ ret = misc_register(&ts72xx_wdt_miscdev); -+ if (ret) { -+ printk(KERN_ERR PFX "cannot register miscdev on minor=%d " -+ "(err=%d), ep93xx_watchdog already loaded?!\n", WATCHDOG_MINOR, ret); -+ goto err_unmap2; -+ } -+ -+ printk(KERN_INFO PFX "TS-72xx watchdog driver, v%s\n", WATCHDOG_VERSION); -+ ts72xx_parse_timeout(timeout); -+ -+ return 0; -+ -+err_unmap2: -+ iounmap(feed_register); -+err_unmap1: -+ iounmap(control_register); -+err_out: -+ return ret; -+} -+ -+static int __devexit ts72xx_wdt_remove(struct platform_device *dev) -+{ -+ misc_deregister(&ts72xx_wdt_miscdev); -+ iounmap(feed_register); -+ iounmap(control_register); -+ -+ return 0; -+} -+ -+static struct platform_driver ts72xx_wdt_driver = { -+ .probe = ts72xx_wdt_probe, -+ .remove = __devexit_p(ts72xx_wdt_remove), -+ .shutdown = ts72xx_wdt_shutdown, -+ .driver = { -+ .owner = THIS_MODULE, -+ .name = "ts72xx_wdt", -+ }, -+}; -+ -+static int __init ts72xx_wdt_init(void) -+{ -+ return platform_driver_register(&ts72xx_wdt_driver); -+} -+ -+static void __exit ts72xx_wdt_exit(void) -+{ -+ platform_driver_unregister(&ts72xx_wdt_driver); -+} -+ -+module_init(ts72xx_wdt_init); -+module_exit(ts72xx_wdt_exit); -+ -+#ifdef CONFIG_WATCHDOG_NOWAYOUT -+module_param(nowayout, int, 0); -+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); -+#endif -+ -+module_param(timeout, int, 0); -+MODULE_PARM_DESC(timeout,"Watchdog timeout in milliseconds (250..8000, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); -+ -+MODULE_AUTHOR("Matthieu Crapet <mcrapet@gmail.com>"); -+MODULE_DESCRIPTION("TS-72xx watchdog driver"); -+MODULE_LICENSE("GPL"); -+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); -Index: linux-2.6.22/include/asm-arm/arch-ep93xx/ts72xx.h -=================================================================== ---- linux-2.6.22.orig/include/asm-arm/arch-ep93xx/ts72xx.h 2007-08-30 01:33:25.000000000 +0200 -+++ linux-2.6.22/include/asm-arm/arch-ep93xx/ts72xx.h 2007-08-30 01:34:14.000000000 +0200 -@@ -68,6 +68,9 @@ - #define TS72XX_RTC_DATA_PHYS_BASE 0x11700000 - #define TS72XX_RTC_DATA_SIZE 0x00001000 - -+#define TS72XX_WATCHDOG_CONTROL_PHYS_BASE 0x23800000 -+#define TS72XX_WATCHDOG_FEED_PHYS_BASE 0x23c00000 -+ - #ifndef __ASSEMBLY__ - #include <asm/io.h> - diff --git a/packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch b/packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch new file mode 100644 index 0000000000..0883322c28 --- /dev/null +++ b/packages/linux/linux-2.6.24/ts72xx/ts72xx-rs485.patch @@ -0,0 +1,219 @@ +RS485 auto mode support ported from 2.4 (diff against 2.6.19-rc6-git10) + +Signed-off-by: Petr Stetiar <ynezz@true.cz> + +diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c +index 4213fab..5b3c5ff 100644 +--- a/drivers/serial/amba-pl010.c ++++ b/drivers/serial/amba-pl010.c +@@ -50,6 +50,7 @@ + #include <linux/amba/serial.h> + + #include <asm/io.h> ++#include <asm/hardware.h> + + #define UART_NR 8 + +@@ -65,6 +66,11 @@ + #define UART_DUMMY_RSR_RX 256 + #define UART_PORT_SIZE 64 + ++#ifdef CONFIG_MACH_TS72XX ++static void __iomem *ts_rs485_data9_register; ++static void __iomem *ts_rs485_control_register; ++#endif ++ + /* + * We wrap our port structure around the generic uart_port. + */ +@@ -487,6 +493,107 @@ static int pl010_verify_port(struct uart + return ret; + } + ++#ifdef CONFIG_MACH_TS72XX ++static int ts72xx_rs485_init(void) ++{ ++ ts_rs485_data9_register = ioremap(TS72XX_RS485_DATA9_PHYS_BASE, 4096); ++ if (ts_rs485_data9_register == NULL) { ++ return -1; ++ } ++ ++ ts_rs485_control_register = ioremap(TS72XX_RS485_CONTROL_PHYS_BASE, 4096); ++ if (ts_rs485_control_register == NULL) { ++ iounmap(ts_rs485_data9_register); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++static int ts72xx_auto485(struct uart_port *port, unsigned int cmd, unsigned long *arg) ++{ ++ int baud, cflag, mode; ++ int datalength; ++ ++ mode = (int)*arg; ++ if (!is_rs485_installed()) { ++ printk("amba-pl010.c: this board does not support RS485 auto mode\n"); ++ return -EINVAL; ++ } ++ ++ if (port->line != 1) { ++ printk("amba-pl010.c: auto RS485 mode is only supported on second port (/dev/ttyAM1)\n"); ++ return -EINVAL; ++ } ++ ++ datalength = 8; ++ cflag = port->info->tty->termios->c_cflag ; ++ if (cflag & PARENB) ++ datalength++; ++ ++ if (cflag & CSTOPB) ++ datalength++; ++ ++ baud = tty_get_baud_rate(port->info->tty); ++ ++ switch (cmd) { ++ case TIOC_SBCC485: ++ if ((mode & TS72XX_RS485_AUTO485FD) || (mode & TS72XX_RS485_AUTO485HD)) { ++ printk("amba-pl010.c: unsetting auto RS485 mode\n"); ++ __raw_writew(TS72XX_RS485_MODE_RS232, ts_rs485_control_register); ++ __raw_writew(TS72XX_RS485_MODE_RS232, ts_rs485_data9_register); ++ } ++ break; ++ case TIOC_SBCS485: ++ if (mode & TS72XX_RS485_AUTO485FD) { ++ printk ("amba-pl010.c: setting FULL duplex auto RS485 mode\n"); ++ __raw_writew(TS72XX_RS485_MODE_FD, ts_rs485_control_register); ++ if (datalength > 8) ++ __raw_writew(TS72XX_RS485_MODE_FD, ts_rs485_data9_register); ++ } else if (mode & TS72XX_RS485_AUTO485HD) { ++ printk("amba-pl010.c: setting HALF DUPLEX auto RS485 mode\n"); ++ switch (baud) { ++ case 9600: ++ __raw_writew(TS72XX_RS485_MODE_9600_HD, ts_rs485_control_register); ++ break; ++ case 19200: ++ __raw_writew(TS72XX_RS485_MODE_19200_HD, ts_rs485_control_register); ++ break; ++ case 57600: ++ __raw_writew(TS72XX_RS485_MODE_57600_HD, ts_rs485_control_register); ++ break; ++ case 115200: ++ __raw_writew(TS72XX_RS485_MODE_115200_HD, ts_rs485_control_register); ++ break; ++ default: ++ printk("amba-pl010.c: %d baud rate is not supported for auto RS485 mode\n", baud); ++ return -1; ++ } ++ if (datalength > 8) ++ __raw_writew(TS72XX_RS485_MODE_FD, ts_rs485_data9_register); ++ } ++ break; ++ } ++ ++ return 0; ++} ++#endif ++ ++int pl010_ioctl(struct uart_port *port, unsigned int cmd, unsigned long arg) ++{ ++#ifdef CONFIG_MACH_TS72XX ++ switch (cmd) { ++ case TIOC_SBCC485: ++ case TIOC_SBCS485: ++ return ts72xx_auto485(port, cmd, (unsigned long *)arg); ++ break; ++ default: ++ return -ENOIOCTLCMD; ++ } ++#endif ++ return -ENOIOCTLCMD; ++} ++ + static struct uart_ops amba_pl010_pops = { + .tx_empty = pl010_tx_empty, + .set_mctrl = pl010_set_mctrl, +@@ -504,6 +611,7 @@ static struct uart_ops amba_pl010_pops = + .request_port = pl010_request_port, + .config_port = pl010_config_port, + .verify_port = pl010_verify_port, ++ .ioctl = pl010_ioctl, + }; + + static struct uart_amba_port *amba_ports[UART_NR]; +@@ -746,6 +854,15 @@ static int __init pl010_init(void) + ret = uart_register_driver(&amba_reg); + if (ret == 0) { + ret = amba_driver_register(&pl010_driver); ++#ifdef CONFIG_MACH_TS72XX ++ if (!ret && is_rs485_installed()) { ++ ret = ts72xx_rs485_init(); ++ if (ret) ++ printk("amba-pl010.c: ts72xx_rs485_init() failed\n"); ++ else ++ printk("amba-pl010.c: auto RS485 mode initialized\n"); ++ } ++#endif + if (ret) + uart_unregister_driver(&amba_reg); + } +@@ -756,6 +873,10 @@ static void __exit pl010_exit(void) + { + amba_driver_unregister(&pl010_driver); + uart_unregister_driver(&amba_reg); ++#ifdef CONFIG_MACH_TS72XX ++ iounmap(ts_rs485_data9_register); ++ iounmap(ts_rs485_control_register); ++#endif + } + + module_init(pl010_init); +diff --git a/include/asm-arm/arch-ep93xx/ts72xx.h b/include/asm-arm/arch-ep93xx/ts72xx.h +index a94f63f..4c9396b 100644 +--- a/include/asm-arm/arch-ep93xx/ts72xx.h ++++ b/include/asm-arm/arch-ep93xx/ts72xx.h +@@ -68,6 +68,16 @@ + #define TS72XX_RTC_DATA_PHYS_BASE 0x11700000 + #define TS72XX_RTC_DATA_SIZE 0x00001000 + ++#define TS72XX_RS485_CONTROL_PHYS_BASE 0x22C00000 ++#define TS72XX_RS485_DATA9_PHYS_BASE 0x23000000 ++#define TS72XX_RS485_AUTO485FD 1 ++#define TS72XX_RS485_AUTO485HD 2 ++#define TS72XX_RS485_MODE_RS232 0x00 ++#define TS72XX_RS485_MODE_FD 0x01 ++#define TS72XX_RS485_MODE_9600_HD 0x04 ++#define TS72XX_RS485_MODE_19200_HD 0x05 ++#define TS72XX_RS485_MODE_57600_HD 0x06 ++#define TS72XX_RS485_MODE_115200_HD 0x07 + + #ifndef __ASSEMBLY__ + #include <asm/io.h> +@@ -87,6 +100,12 @@ static inline int board_is_ts7260(void) + return __raw_readb(TS72XX_MODEL_VIRT_BASE) == TS72XX_MODEL_TS7260; + } + ++static inline int is_rs485_installed(void) ++{ ++ return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE) & ++ TS72XX_OPTIONS_COM2_RS485); ++} ++ + static inline int is_max197_installed(void) + { + return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE) & +diff --git a/include/asm-arm/ioctls.h b/include/asm-arm/ioctls.h +index bb9a7aa..4d7dad1 100644 +--- a/include/asm-arm/ioctls.h ++++ b/include/asm-arm/ioctls.h +@@ -66,6 +66,9 @@ + #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ + #define FIOQSIZE 0x545E + ++#define TIOC_SBCC485 0x545F /* TS72xx RTS/485 mode clear */ ++#define TIOC_SBCS485 0x5460 /* TS72xx RTS/485 mode set */ ++ + /* Used for packet mode */ + #define TIOCPKT_DATA 0 + #define TIOCPKT_FLUSHREAD 1 diff --git a/packages/linux/linux-2.6.25/sequoia/.mtn2git_empty b/packages/linux/linux-2.6.25/sequoia/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-2.6.25/sequoia/.mtn2git_empty diff --git a/packages/linux/linux-2.6.25/sequoia/defconfig b/packages/linux/linux-2.6.25/sequoia/defconfig new file mode 100644 index 0000000000..830d6108f3 --- /dev/null +++ b/packages/linux/linux-2.6.25/sequoia/defconfig @@ -0,0 +1,2158 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.25 +# Mon May 5 11:59:35 2008 +# +# CONFIG_PPC64 is not set + +# +# Processor support +# +# CONFIG_6xx is not set +# CONFIG_PPC_85xx is not set +# CONFIG_PPC_8xx is not set +# CONFIG_40x is not set +CONFIG_44x=y +# CONFIG_E200 is not set +CONFIG_PPC_FPU=y +CONFIG_4xx=y +CONFIG_BOOKE=y +CONFIG_PTE_64BIT=y +CONFIG_PHYS_64BIT=y +# CONFIG_PPC_MM_SLICES is not set +CONFIG_NOT_COHERENT_CACHE=y +CONFIG_PPC32=y +CONFIG_WORD_SIZE=32 +CONFIG_PPC_MERGE=y +CONFIG_MMU=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_HARDIRQS=y +# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set +CONFIG_IRQ_PER_CPU=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_ARCH_HAS_ILOG2_U32=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +# CONFIG_ARCH_NO_VIRT_TO_BUS is not set +CONFIG_PPC=y +CONFIG_EARLY_PRINTK=y +CONFIG_GENERIC_NVRAM=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_PPC_OF=y +CONFIG_OF=y +CONFIG_PPC_UDBG_16550=y +# CONFIG_GENERIC_TBSYNC is not set +CONFIG_AUDIT_ARCH=y +CONFIG_GENERIC_BUG=y +# CONFIG_DEFAULT_UIMAGE is not set +CONFIG_PPC_DCR_NATIVE=y +# CONFIG_PPC_DCR_MMIO is not set +CONFIG_PPC_DCR=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=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 is not set +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_AUDIT is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_CGROUPS is not set +CONFIG_GROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set +CONFIG_USER_SCHED=y +# CONFIG_CGROUP_SCHED is not set +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +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_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set +# CONFIG_HOTPLUG is not set +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_COMPAT_BRK=y +CONFIG_BASE_FULL=y +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 +CONFIG_SLAB=y +# CONFIG_SLUB is not set +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +# CONFIG_MARKERS is not set +CONFIG_HAVE_OPROFILE=y +# CONFIG_KPROBES is not set +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_PROC_PAGE_MONITOR=y +CONFIG_SLABINFO=y +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 is not set +# 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=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +# CONFIG_DEFAULT_AS is not set +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_CLASSIC_RCU=y +# CONFIG_PPC4xx_PCI_EXPRESS is not set + +# +# Platform support +# +# CONFIG_PPC_MPC512x is not set +# CONFIG_PPC_MPC5121 is not set +# CONFIG_PPC_CELL is not set +# CONFIG_PPC_CELL_NATIVE is not set +# CONFIG_PQ2ADS is not set +# CONFIG_BAMBOO is not set +# CONFIG_EBONY is not set +CONFIG_SEQUOIA=y +# CONFIG_TAISHAN is not set +# CONFIG_KATMAI is not set +# CONFIG_RAINIER is not set +# CONFIG_WARP is not set +CONFIG_440EPX=y +# CONFIG_IPIC is not set +# CONFIG_MPIC is not set +# CONFIG_MPIC_WEIRD is not set +# CONFIG_PPC_I8259 is not set +# CONFIG_PPC_RTAS is not set +# CONFIG_MMIO_NVRAM is not set +# CONFIG_PPC_MPC106 is not set +# CONFIG_PPC_970_NAP is not set +# CONFIG_PPC_INDIRECT_IO is not set +# CONFIG_GENERIC_IOMAP is not set +# CONFIG_CPU_FREQ is not set +# CONFIG_FSL_ULI1575 is not set + +# +# Kernel options +# +# CONFIG_HIGHMEM is not set +# CONFIG_TICK_ONESHOT is not set +# CONFIG_NO_HZ is not set +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +# CONFIG_SCHED_HRTICK is not set +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_BINFMT_ELF=y +# CONFIG_BINFMT_MISC is not set +# CONFIG_MATH_EMULATION is not set +# CONFIG_IOMMU_HELPER is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_HAS_WALK_MEMORY=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_POPULATES_NODE_MAP=y +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=4 +CONFIG_RESOURCES_64BIT=y +CONFIG_ZONE_DMA_FLAG=1 +CONFIG_BOUNCE=y +CONFIG_VIRT_TO_BUS=y +# CONFIG_PROC_DEVICETREE is not set +CONFIG_CMDLINE_BOOL=y +CONFIG_CMDLINE=" debug " +CONFIG_SECCOMP=y +CONFIG_ISA_DMA_API=y + +# +# Bus options +# +CONFIG_ZONE_DMA=y +CONFIG_PPC_INDIRECT_PCI=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_SYSCALL=y +CONFIG_PCIEPORTBUS=y +CONFIG_PCIEAER=y +CONFIG_ARCH_SUPPORTS_MSI=y +# CONFIG_PCI_MSI is not set +CONFIG_PCI_LEGACY=y +# CONFIG_PCI_DEBUG is not set + +# +# 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=0xc0000000 +# 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=0x01000000 + +# +# Networking +# +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +# CONFIG_PACKET_MMAP is not set +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_XFRM_STATISTICS 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 is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# 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 is not set +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=m +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +CONFIG_TCP_CONG_ADVANCED=y +CONFIG_TCP_CONG_BIC=m +CONFIG_TCP_CONG_CUBIC=y +CONFIG_TCP_CONG_WESTWOOD=m +CONFIG_TCP_CONG_HTCP=m +CONFIG_TCP_CONG_HSTCP=m +CONFIG_TCP_CONG_HYBLA=m +CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_SCALABLE=m +CONFIG_TCP_CONG_LP=m +CONFIG_TCP_CONG_VENO=m +CONFIG_TCP_CONG_YEAH=m +CONFIG_TCP_CONG_ILLINOIS=m +# CONFIG_DEFAULT_BIC is not set +CONFIG_DEFAULT_CUBIC=y +# CONFIG_DEFAULT_HTCP is not set +# CONFIG_DEFAULT_VEGAS is not set +# CONFIG_DEFAULT_WESTWOOD is not set +# CONFIG_DEFAULT_RENO is not set +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IP_VS=m +# CONFIG_IP_VS_DEBUG is not set +CONFIG_IP_VS_TAB_BITS=12 + +# +# IPVS transport protocol load balancing support +# +# CONFIG_IP_VS_PROTO_TCP is not set +# CONFIG_IP_VS_PROTO_UDP is not set +# CONFIG_IP_VS_PROTO_ESP is not set +# CONFIG_IP_VS_PROTO_AH is not set + +# +# IPVS scheduler +# +CONFIG_IP_VS_RR=m +CONFIG_IP_VS_WRR=m +CONFIG_IP_VS_LC=m +CONFIG_IP_VS_WLC=m +CONFIG_IP_VS_LBLC=m +CONFIG_IP_VS_LBLCR=m +CONFIG_IP_VS_DH=m +CONFIG_IP_VS_SH=m +CONFIG_IP_VS_SED=m +CONFIG_IP_VS_NQ=m + +# +# IPVS application helper +# +CONFIG_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=m +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=m +CONFIG_IPV6_SIT=m +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_NETFILTER_ADVANCED=y +CONFIG_BRIDGE_NETFILTER=y + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +# CONFIG_NETFILTER_NETLINK_LOG is not set +# CONFIG_NF_CONNTRACK is not set +# CONFIG_NETFILTER_XTABLES 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 + +# +# IPv6: Netfilter Configuration +# +# CONFIG_IP6_NF_QUEUE is not set +# CONFIG_IP6_NF_IPTABLES is not set + +# +# DECnet: Netfilter Configuration +# +# CONFIG_DECNET_NF_GRABULATOR is not set + +# +# Bridge: Netfilter Configuration +# +# CONFIG_BRIDGE_NF_EBTABLES is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# 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=m +# CONFIG_IPDDP 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 +CONFIG_NET_SCHED=y + +# +# Queueing/Scheduling +# +CONFIG_NET_SCH_CBQ=m +CONFIG_NET_SCH_HTB=m +CONFIG_NET_SCH_HFSC=m +CONFIG_NET_SCH_ATM=m +CONFIG_NET_SCH_PRIO=m +CONFIG_NET_SCH_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 is not set +# CONFIG_CLS_U32_MARK is not set +CONFIG_NET_CLS_RSVP=m +CONFIG_NET_CLS_RSVP6=m +CONFIG_NET_CLS_FLOW=m +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_STACK=32 +CONFIG_NET_EMATCH_CMP=m +CONFIG_NET_EMATCH_NBYTE=m +CONFIG_NET_EMATCH_U32=m +CONFIG_NET_EMATCH_META=m +CONFIG_NET_EMATCH_TEXT=m +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=m +CONFIG_NET_ACT_GACT=m +# CONFIG_GACT_PROB is not set +CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_NAT=m +CONFIG_NET_ACT_PEDIT=m +CONFIG_NET_ACT_SIMP=m +CONFIG_NET_CLS_IND=y +CONFIG_NET_SCH_FIFO=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# CONFIG_HAMRADIO is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +# CONFIG_CAN_DEBUG_DEVICES 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 is not set +# CONFIG_BT_BNEP_PROTO_FILTER is not set +# CONFIG_BT_CMTP is not set +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=m +CONFIG_BT_HCIUART_H4=y +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIVHCI=m +# CONFIG_AF_RXRPC is not set +CONFIG_FIB_RULES=y + +# +# Wireless +# +CONFIG_CFG80211=m +CONFIG_NL80211=y +CONFIG_WIRELESS_EXT=y +CONFIG_MAC80211=m + +# +# Rate control algorithm selection +# +CONFIG_MAC80211_RC_DEFAULT_PID=y +# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set +# CONFIG_MAC80211_RC_DEFAULT_NONE is not set + +# +# Selecting 'y' for an algorithm will +# + +# +# build the algorithm into mac80211. +# +CONFIG_MAC80211_RC_DEFAULT="pid" +CONFIG_MAC80211_RC_PID=y +# CONFIG_MAC80211_RC_SIMPLE is not set +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT 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=m +# CONFIG_RFKILL_INPUT 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=m +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_CONNECTOR is not set +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_OF_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=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_GEN_PROBE=y +# 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 is not set +CONFIG_MTD_CFI_AMDSTD=y +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +# 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_PHYSMAP=y +CONFIG_MTD_PHYSMAP_START=0x8000000 +CONFIG_MTD_PHYSMAP_LEN=0x0 +CONFIG_MTD_PHYSMAP_BANKWIDTH=2 +# CONFIG_MTD_PHYSMAP_OF is not set +# CONFIG_MTD_INTEL_VR_NOR is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# 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=y +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_CAFE 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_NAND_FSL_ELBC is not set +# CONFIG_MTD_ONENAND is not set + +# +# UBI - Unsorted block images +# +# CONFIG_MTD_UBI is not set +CONFIG_OF_DEVICE=y +CONFIG_PARPORT=m +# CONFIG_PARPORT_PC is not set +# CONFIG_PARPORT_GSC is not set +# CONFIG_PARPORT_AX88796 is not set +# CONFIG_PARPORT_1284 is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_FD 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=m +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_BLK_DEV_UB is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=16 +CONFIG_BLK_DEV_RAM_SIZE=4096 +# CONFIG_BLK_DEV_XIP is not set +# CONFIG_CDROM_PKTCDVD 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=m +# CONFIG_SGI_IOC4 is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_ENCLOSURE_SERVICES is not set +CONFIG_HAVE_IDE=y +CONFIG_IDE=y +CONFIG_IDE_MAX_HWIFS=4 +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide/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_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# 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_BLK_DEV_PLATFORM is not set +CONFIG_BLK_DEV_IDEDMA_SFF=y + +# +# PCI IDE chipsets support +# +CONFIG_BLK_DEV_IDEPCI=y +CONFIG_IDEPCI_PCIBUS_ORDER=y +# CONFIG_BLK_DEV_GENERIC is not set +# CONFIG_BLK_DEV_OPTI621 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +# 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=y +# 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 is not set +# 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_BLK_DEV_IDEDMA=y +CONFIG_IDE_ARCH_OBSOLETE_INIT=y +# 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 is not set +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 is not set +# CONFIG_CHR_DEV_SG is not set +# 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 is not set +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_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_ADVANSYS 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_MVSAS is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR 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_ATA=y +# CONFIG_ATA_NONSTANDARD is not set +# CONFIG_SATA_AHCI is not set +# CONFIG_SATA_SVW is not set +# CONFIG_ATA_PIIX is not set +# CONFIG_SATA_MV is not set +# CONFIG_SATA_NV is not set +# CONFIG_PDC_ADMA is not set +# CONFIG_SATA_QSTOR is not set +# CONFIG_SATA_PROMISE is not set +# CONFIG_SATA_SX4 is not set +# CONFIG_SATA_SIL is not set +# CONFIG_SATA_SIL24 is not set +# CONFIG_SATA_SIS is not set +# CONFIG_SATA_ULI is not set +# CONFIG_SATA_VIA is not set +# CONFIG_SATA_VITESSE is not set +# CONFIG_SATA_INIC162X is not set +# CONFIG_PATA_ALI is not set +# CONFIG_PATA_AMD is not set +# CONFIG_PATA_ARTOP is not set +# CONFIG_PATA_ATIIXP is not set +# CONFIG_PATA_CMD640_PCI is not set +# CONFIG_PATA_CMD64X is not set +# CONFIG_PATA_CS5520 is not set +# CONFIG_PATA_CS5530 is not set +# CONFIG_PATA_CYPRESS is not set +# CONFIG_PATA_EFAR is not set +# CONFIG_ATA_GENERIC is not set +# CONFIG_PATA_HPT366 is not set +# CONFIG_PATA_HPT37X is not set +# CONFIG_PATA_HPT3X2N is not set +# CONFIG_PATA_HPT3X3 is not set +# CONFIG_PATA_IT821X is not set +# CONFIG_PATA_IT8213 is not set +# CONFIG_PATA_JMICRON is not set +# CONFIG_PATA_TRIFLEX is not set +# CONFIG_PATA_MARVELL is not set +# CONFIG_PATA_MPIIX is not set +# CONFIG_PATA_OLDPIIX is not set +# CONFIG_PATA_NETCELL is not set +# CONFIG_PATA_NINJA32 is not set +# CONFIG_PATA_NS87410 is not set +# CONFIG_PATA_NS87415 is not set +# CONFIG_PATA_OPTI is not set +# CONFIG_PATA_OPTIDMA is not set +# CONFIG_PATA_PDC_OLD is not set +# CONFIG_PATA_RADISYS is not set +# CONFIG_PATA_RZ1000 is not set +# CONFIG_PATA_SC1200 is not set +# CONFIG_PATA_SERVERWORKS is not set +# CONFIG_PATA_PDC2027X is not set +# CONFIG_PATA_SIL680 is not set +# CONFIG_PATA_SIS is not set +# CONFIG_PATA_VIA is not set +# CONFIG_PATA_WINBOND is not set +# CONFIG_PATA_PLATFORM is not set +# CONFIG_MD is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# +# CONFIG_FIREWIRE is not set +# CONFIG_IEEE1394 is not set +# 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 is not set +# CONFIG_MACVLAN is not set +# CONFIG_EQUALIZER is not set +CONFIG_TUN=m +# CONFIG_VETH is not set +# CONFIG_ARCNET is not set +CONFIG_PHYLIB=y + +# +# MII PHY device drivers +# +CONFIG_MARVELL_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_QSEMI_PHY=m +CONFIG_LXT_PHY=m +CONFIG_CICADA_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_SMSC_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_REALTEK_PHY=m +CONFIG_FIXED_PHY=y +CONFIG_MDIO_BITBANG=m +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 is not set +# CONFIG_ENC28J60 is not set +# CONFIG_NET_TULIP is not set +# CONFIG_HP100 is not set +# CONFIG_IBM_NEW_EMAC is not set +CONFIG_IBM_NEW_EMAC_ZMII=y +CONFIG_IBM_NEW_EMAC_RGMII=y +# CONFIG_IBM_NEW_EMAC_TAH is not set +CONFIG_IBM_NEW_EMAC_EMAC4=y +CONFIG_NET_PCI=y +# CONFIG_PCNET32 is not set +# CONFIG_AMD8111_ETH is not set +# CONFIG_ADAPTEC_STARFIRE is not set +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_FORCEDETH=m +# CONFIG_FORCEDETH_NAPI is not set +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=y +# CONFIG_8139TOO_TUNE_TWISTER is not set +# CONFIG_8139TOO_8129 is not set +# CONFIG_8139_OLD_RX_RESET is not set +CONFIG_R6040=m +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=m +# 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_E1000E=m +CONFIG_E1000E_ENABLED=y +CONFIG_IP1000=m +CONFIG_IGB=m +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=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_SK98LIN=m +CONFIG_VIA_VELOCITY=m +CONFIG_TIGON3=m +CONFIG_BNX2=m +CONFIG_QLA3XXX=m +CONFIG_ATL1=m +CONFIG_NETDEV_10000=y +CONFIG_CHELSIO_T1=m +# CONFIG_CHELSIO_T1_1G is not set +CONFIG_CHELSIO_T1_NAPI=y +CONFIG_CHELSIO_T3=m +CONFIG_IXGBE=m +CONFIG_IXGB=m +# CONFIG_IXGB_NAPI is not set +CONFIG_S2IO=m +# CONFIG_S2IO_NAPI is not set +CONFIG_MYRI10GE=m +CONFIG_NETXEN_NIC=m +CONFIG_NIU=m +# CONFIG_MLX4_CORE is not set +CONFIG_TEHUTI=m +CONFIG_BNX2X=m +# CONFIG_TR is not set + +# +# Wireless LAN +# +CONFIG_WLAN_PRE80211=y +# CONFIG_STRIP is not set +CONFIG_WLAN_80211=y +CONFIG_IPW2100=m +# CONFIG_IPW2100_MONITOR is not set +# CONFIG_IPW2100_DEBUG is not set +CONFIG_IPW2200=m +# CONFIG_IPW2200_MONITOR is not set +# CONFIG_IPW2200_QOS is not set +# CONFIG_IPW2200_DEBUG is not set +CONFIG_LIBERTAS=m +# CONFIG_LIBERTAS_USB is not set +# CONFIG_LIBERTAS_SDIO is not set +# CONFIG_LIBERTAS_DEBUG is not set +CONFIG_AIRO=m +CONFIG_HERMES=m +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_ATMEL=m +CONFIG_PCI_ATMEL=m +CONFIG_PRISM54=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_ADM8211=m +CONFIG_P54_COMMON=m +CONFIG_P54_USB=m +CONFIG_P54_PCI=m +CONFIG_ATH5K=m +CONFIG_IWL4965=m +CONFIG_IWL4965_QOS=y +CONFIG_IWL4965_HT=y +CONFIG_IWL4965_SPECTRUM_MEASUREMENT=y +CONFIG_IWL4965_SENSITIVITY=y +# CONFIG_IWL4965_DEBUG is not set +CONFIG_IWL3945=m +CONFIG_IWL3945_QOS=y +CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y +# CONFIG_IWL3945_DEBUG is not set +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set +CONFIG_HOSTAP_PLX=m +CONFIG_HOSTAP_PCI=m +CONFIG_BCM43XX=m +CONFIG_BCM43XX_DEBUG=y +CONFIG_BCM43XX_DMA=y +CONFIG_BCM43XX_PIO=y +CONFIG_BCM43XX_DMA_AND_PIO_MODE=y +# CONFIG_BCM43XX_DMA_MODE is not set +# CONFIG_BCM43XX_PIO_MODE is not set +CONFIG_B43=m +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +# CONFIG_B43_DEBUG is not set +CONFIG_B43LEGACY=m +CONFIG_B43LEGACY_PCI_AUTOSELECT=y +CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y +CONFIG_B43LEGACY_DEBUG=y +CONFIG_B43LEGACY_DMA=y +CONFIG_B43LEGACY_PIO=y +CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +# CONFIG_B43LEGACY_DMA_MODE is not set +# CONFIG_B43LEGACY_PIO_MODE is not set +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_RT2X00=m +CONFIG_RT2X00_LIB=m +CONFIG_RT2X00_LIB_PCI=m +CONFIG_RT2X00_LIB_USB=m +CONFIG_RT2X00_LIB_FIRMWARE=y +CONFIG_RT2X00_LIB_RFKILL=y +CONFIG_RT2400PCI=m +# CONFIG_RT2400PCI_RFKILL is not set +CONFIG_RT2500PCI=m +CONFIG_RT2500PCI_RFKILL=y +CONFIG_RT61PCI=m +CONFIG_RT61PCI_RFKILL=y +CONFIG_RT2500USB=m +CONFIG_RT73USB=m +# CONFIG_RT2X00_DEBUG is not set + +# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +CONFIG_USB_USBNET=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=m +CONFIG_USB_NET_CDC_SUBSET=m +# CONFIG_USB_ALI_M5632 is not set +# CONFIG_USB_AN2720 is not set +CONFIG_USB_BELKIN=y +CONFIG_USB_ARMLINUX=y +# CONFIG_USB_EPSON2888 is not set +# CONFIG_USB_KC2190 is not set +CONFIG_USB_NET_ZAURUS=m +CONFIG_WAN=y +CONFIG_LANMEDIA=m +CONFIG_HDLC=m +CONFIG_HDLC_RAW=m +CONFIG_HDLC_RAW_ETH=m +CONFIG_HDLC_CISCO=m +CONFIG_HDLC_FR=m +CONFIG_HDLC_X25=m +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=m +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=m +CONFIG_CYCLADES_SYNC=m +# CONFIG_CYCLOMX_X25 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=y +CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set +CONFIG_SKFP=m +# CONFIG_HIPPI is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPP_FILTER=y +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m +CONFIG_PPPOATM=m +CONFIG_PPPOL2TP=m +# CONFIG_SLIP is not set +CONFIG_SLHC=m +# CONFIG_NET_FC is not set +# CONFIG_NETCONSOLE is not set +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_ISDN=m +# CONFIG_ISDN_I4L is not set +CONFIG_ISDN_CAPI=m +CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y +CONFIG_CAPI_TRACE=y +# CONFIG_ISDN_CAPI_MIDDLEWARE is not set +CONFIG_ISDN_CAPI_CAPI20=m + +# +# CAPI hardware drivers +# +CONFIG_CAPI_AVM=y +CONFIG_ISDN_DRV_AVMB1_B1PCI=m +# CONFIG_ISDN_DRV_AVMB1_B1PCIV4 is not set +CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m +CONFIG_ISDN_DRV_AVMB1_T1PCI=m +CONFIG_ISDN_DRV_AVMB1_C4=m +CONFIG_CAPI_EICON=y +CONFIG_ISDN_DIVAS=m +# CONFIG_ISDN_DIVAS_BRIPCI is not set +# CONFIG_ISDN_DIVAS_PRIPCI is not set +CONFIG_ISDN_DIVAS_DIVACAPI=m +CONFIG_ISDN_DIVAS_USERIDI=m +CONFIG_ISDN_DIVAS_MAINT=m +# CONFIG_PHONE is not set + +# +# Input device support +# +CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set +CONFIG_INPUT_POLLDEV=m + +# +# 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_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +# CONFIG_INPUT_KEYBOARD 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_ADS7846 is not set +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_USB_COMPOSITE=m +CONFIG_TOUCHSCREEN_USB_EGALAX=y +CONFIG_TOUCHSCREEN_USB_PANJIT=y +CONFIG_TOUCHSCREEN_USB_3M=y +CONFIG_TOUCHSCREEN_USB_ITM=y +CONFIG_TOUCHSCREEN_USB_ETURBO=y +CONFIG_TOUCHSCREEN_USB_GUNZE=y +CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y +CONFIG_TOUCHSCREEN_USB_IRTOUCH=y +CONFIG_TOUCHSCREEN_USB_IDEALTEK=y +CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y +CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_ATI_REMOTE=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_UINPUT=m + +# +# 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 is not set +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_NOZOMI=m + +# +# Serial drivers +# +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PCI=y +CONFIG_SERIAL_8250_NR_UARTS=4 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +# CONFIG_SERIAL_8250_DETECT_IRQ is not set +# CONFIG_SERIAL_8250_RSA 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_SERIAL_OF_PLATFORM=m +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_NVRAM is not set +CONFIG_GEN_RTC=m +CONFIG_GEN_RTC_X=y +# CONFIG_R3964 is not set +# CONFIG_APPLICOM 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_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_DS1682=m +CONFIG_SENSORS_EEPROM=y +CONFIG_SENSORS_PCF8574=m +CONFIG_PCF8575=m +CONFIG_SENSORS_PCF8591=m +CONFIG_TPS65010=m +CONFIG_SENSORS_MAX6875=m +CONFIG_SENSORS_TSL2550=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=m +# CONFIG_SPI_BUTTERFLY is not set +# CONFIG_SPI_LM70_LLP is not set + +# +# SPI Protocol Masters +# +CONFIG_SPI_AT25=m +CONFIG_SPI_SPIDEV=m +CONFIG_SPI_TLE62X0=m +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=m +# 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_ADT7473 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_I5K_AMB 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_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_ADS7828 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_W83L786NG is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +# CONFIG_HWMON_DEBUG_CHIP is not set +# CONFIG_THERMAL is not set +CONFIG_WATCHDOG=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_BOOKE_WDT=y + +# +# PCI-based Watchdog Cards +# +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set + +# +# Sonics Silicon Backplane +# +CONFIG_SSB_POSSIBLE=y +CONFIG_SSB=m +CONFIG_SSB_PCIHOST_POSSIBLE=y +CONFIG_SSB_PCIHOST=y +CONFIG_SSB_B43_PCI_BRIDGE=y +# CONFIG_SSB_SILENT is not set +# CONFIG_SSB_DEBUG is not set +CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y +CONFIG_SSB_DRIVER_PCICORE=y + +# +# Multifunction device drivers +# +# CONFIG_MFD_SM501 is not set + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set +# CONFIG_DVB_CORE is not set +# CONFIG_DAB is not set + +# +# Graphics support +# +# CONFIG_AGP is not set +# CONFIG_DRM is not set +# CONFIG_VGASTATE is not set +# CONFIG_VIDEO_OUTPUT_CONTROL is not set +# CONFIG_FB is not set +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set + +# +# Display device support +# +# CONFIG_DISPLAY_SUPPORT 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 is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_VERBOSE_PRINTK is not set +# CONFIG_SND_DEBUG is not set + +# +# 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=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_MTS64=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m +CONFIG_SND_PORTMAN2X4=m +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 is not set +CONFIG_SND_CA0106=m +CONFIG_SND_CMIPCI=m +CONFIG_SND_OXYGEN_LIB=m +CONFIG_SND_OXYGEN=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 is not set +CONFIG_SND_HDA_INTEL=m +# CONFIG_SND_HDA_HWDEP is not set +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_ANALOG=y +CONFIG_SND_HDA_CODEC_SIGMATEL=y +CONFIG_SND_HDA_CODEC_VIA=y +CONFIG_SND_HDA_CODEC_ATIHDMI=y +CONFIG_SND_HDA_CODEC_CONEXANT=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=y +# CONFIG_SND_HDA_POWER_SAVE is not set +CONFIG_SND_HDSP=m +CONFIG_SND_HDSPM=m +CONFIG_SND_HIFIER=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 is not set +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_VIRTUOSO=m +CONFIG_SND_VX222=m +CONFIG_SND_YMFPCI=m +CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y +# CONFIG_SND_AC97_POWER_SAVE is not set + +# +# ALSA PowerMac devices +# + +# +# ALSA PowerPC devices +# + +# +# SPI devices +# + +# +# USB devices +# +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_USX2Y=m +CONFIG_SND_USB_CAIAQ=m +CONFIG_SND_USB_CAIAQ_INPUT=y + +# +# System on Chip audio support +# +CONFIG_SND_SOC=m + +# +# SoC Audio support for SuperH +# + +# +# ALSA SoC audio for Freescale SOCs +# + +# +# 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 +# CONFIG_HIDRAW is not set + +# +# USB Input Devices +# +# CONFIG_USB_HID 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=y +CONFIG_USB=y +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +# CONFIG_USB_DEVICEFS is not set +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 is not set +# CONFIG_USB_ISP116X_HCD is not set +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PPC_OF=y +CONFIG_USB_OHCI_HCD_PPC_OF_BE=y +# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set +CONFIG_USB_OHCI_HCD_PCI=y +CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y +CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_UHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set + +# +# 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 is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_DPCM is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# 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 Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set +CONFIG_USB_MON=y + +# +# USB port drivers +# +# CONFIG_USB_USS720 is not set +# CONFIG_USB_SERIAL is not set + +# +# 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 is not set +# 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 is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_ATM is not set +CONFIG_USB_GADGET=y +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_SELECTED=y +CONFIG_USB_GADGET_AMD5536UDC=y +CONFIG_USB_AMD5536UDC=y +# 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 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 is not set +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_MIDI_GADGET is not set +# CONFIG_USB_G_PRINTER is not set +CONFIG_MMC=m +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_UNSAFE_RESUME is not set + +# +# MMC/SD Card Drivers +# +CONFIG_MMC_BLOCK=m +CONFIG_MMC_BLOCK_BOUNCE=y +# CONFIG_SDIO_UART is not set + +# +# MMC/SD Host Controller Drivers +# +# CONFIG_MMC_SDHCI is not set +# CONFIG_MMC_WBSD is not set +# CONFIG_MMC_TIFM_SD is not set +# CONFIG_MMC_SPI is not set +# CONFIG_MEMSTICK is not set +# CONFIG_NEW_LEDS is not set +# CONFIG_INFINIBAND is not set +# CONFIG_EDAC is not set +# CONFIG_RTC_CLASS is not set +# CONFIG_DMADEVICES is not set +# CONFIG_AUXDISPLAY is not set + +# +# Userspace I/O +# +CONFIG_UIO=m +CONFIG_UIO_CIF=m + +# +# File systems +# +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_EXT4DEV_FS is not set +# 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_DNOTIFY=y +CONFIG_INOTIFY=y +CONFIG_INOTIFY_USER=y +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_FUSE_FS is not set +CONFIG_GENERIC_ACL=y + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set + +# +# DOS/FAT/NT Filesystems +# +CONFIG_FAT_FS=y +# CONFIG_MSDOS_FS is not set +CONFIG_VFAT_FS=y +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_KCORE=y +CONFIG_PROC_SYSCTL=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +# CONFIG_HUGETLB_PAGE is not set +# CONFIG_CONFIGFS_FS is not set + +# +# 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_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_FS_WBUF_VERIFY is not set +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_FS_XATTR 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 is not set +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_ROMFS_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 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_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_SUNRPC_BIND34 is not set +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set +# CONFIG_NCP_FS is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set + +# +# Partition Types +# +# CONFIG_PARTITION_ADVANCED is not set +CONFIG_MSDOS_PARTITION=y +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# 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 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# 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=y +# 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 is not set +# CONFIG_DLM is not set + +# +# Library routines +# +CONFIG_BITREVERSE=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=m +CONFIG_LZO_DECOMPRESS=m +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_PLIST=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_DMA=y + +# +# 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=y +# 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_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_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_BACKTRACE_SELF_TEST is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_SAMPLES is not set +# CONFIG_DEBUG_STACKOVERFLOW is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_DEBUGGER is not set +# CONFIG_VIRQ_DEBUG is not set +CONFIG_BDI_SWITCH=y +# CONFIG_PPC_EARLY_DEBUG is not set + +# +# 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=m +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_HASH=m +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_HMAC=m +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=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_DES=m +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=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_MICHAEL_MIC=m +CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_LZO=m +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_HIFN_795X=m +CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y +# CONFIG_PPC_CLOCK is not set diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 index 555248c29d..3a3b506d06 100644 --- a/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 +++ b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4 @@ -764,7 +764,7 @@ CONFIG_ISCSI_TCP=m # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set # CONFIG_SCSI_SRP is not set -CONFIG_ATA=m +CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set # CONFIG_SATA_AHCI is not set # CONFIG_SATA_SVW is not set @@ -779,12 +779,12 @@ CONFIG_ATA=m # CONFIG_SATA_SIL24 is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_ULI is not set -CONFIG_SATA_VIA=m +CONFIG_SATA_VIA=y # CONFIG_SATA_VITESSE is not set # CONFIG_SATA_INIC162X is not set # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set -CONFIG_PATA_ARTOP=m +CONFIG_PATA_ARTOP=y # CONFIG_PATA_ATIIXP is not set # CONFIG_PATA_CMD640_PCI is not set # CONFIG_PATA_CMD64X is not set diff --git a/packages/linux/linux-ixp4xx_2.6.24.4.bb b/packages/linux/linux-ixp4xx_2.6.24.4.bb index 1964c23839..05aea212e0 100644 --- a/packages/linux/linux-ixp4xx_2.6.24.4.bb +++ b/packages/linux/linux-ixp4xx_2.6.24.4.bb @@ -8,7 +8,7 @@ KERNEL_RELEASE = "2.6.24.4" #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ diff --git a/packages/linux/linux-kaiser_2.6.24+git.bb b/packages/linux/linux-kaiser_2.6.24+git.bb new file mode 100644 index 0000000000..ba4e6c1973 --- /dev/null +++ b/packages/linux/linux-kaiser_2.6.24+git.bb @@ -0,0 +1,15 @@ +require linux.inc + +PV = "2.6.24+git${SRCREV}" + +COMPATIBLE_MACHINE = "htckaiser" + +SRC_URI = "git://git.android.com/kernel.git;branch=android-msm;protocol=git \ + http://baliniak.pl/android/kernel.diff;patch=1" + +S = "${WORKDIR}/git" + +do_configure_prepend() { + cp .config ../defconfig +} + diff --git a/packages/linux/linux-mainstone_2.6.25-rc4.bb b/packages/linux/linux-mainstone_2.6.25.bb index fd5c30e37f..fd5c30e37f 100644 --- a/packages/linux/linux-mainstone_2.6.25-rc4.bb +++ b/packages/linux/linux-mainstone_2.6.25.bb diff --git a/packages/linux/linux-omap2-git/beagleboard/1-rearrange-omap3.patch b/packages/linux/linux-omap2-git/beagleboard/1-rearrange-omap3.patch deleted file mode 100644 index a118a08f0d..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/1-rearrange-omap3.patch +++ /dev/null @@ -1,30 +0,0 @@ -Re-arranging OMAP2 and OMAP3 boards - -Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> ---- - arch/arm/mach-omap2/Kconfig | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -Index: my_branch/arch/arm/mach-omap2/Kconfig -=================================================================== ---- my_branch.orig/arch/arm/mach-omap2/Kconfig 2008-04-16 14:39:51.000000000 +0530 -+++ my_branch/arch/arm/mach-omap2/Kconfig 2008-04-16 14:40:02.000000000 +0530 -@@ -98,10 +98,11 @@ - bool "OMAP 2430 SDP board" - depends on ARCH_OMAP2 && ARCH_OMAP2430 - -+config MACH_OMAP_2430OSK -+ bool "OMAP 2430 OSK board" -+ depends on ARCH_OMAP2 && ARCH_OMAP24XX -+ - config MACH_OMAP_3430SDP - bool "OMAP 3430 SDP board" - depends on ARCH_OMAP3 && ARCH_OMAP34XX - --config MACH_OMAP_2430OSK -- bool "OMAP 2430 OSK board" -- depends on ARCH_OMAP2 && ARCH_OMAP24XX --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/2-update-omap3evm-kconfig.patch b/packages/linux/linux-omap2-git/beagleboard/2-update-omap3evm-kconfig.patch deleted file mode 100644 index 6b9d719ceb..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/2-update-omap3evm-kconfig.patch +++ /dev/null @@ -1,37 +0,0 @@ - -Updated Kconfig and Makefile to add OMAP3 EVM Board - -Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> ---- - arch/arm/mach-omap2/Kconfig | 3 +++ - arch/arm/mach-omap2/Makefile | 1 + - 2 files changed, 4 insertions(+) - -Index: my_branch/arch/arm/mach-omap2/Makefile -=================================================================== ---- my_branch.orig/arch/arm/mach-omap2/Makefile 2008-04-16 14:39:51.000000000 +0530 -+++ my_branch/arch/arm/mach-omap2/Makefile 2008-04-16 14:41:28.000000000 +0530 -@@ -34,6 +34,7 @@ - board-sdp-hsmmc.o \ - board-3430sdp-usb.o \ - board-3430sdp-flash.o -+obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o - obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o \ - board-apollon-mmc.o \ - board-apollon-keys.o - -Index: my_branch/arch/arm/mach-omap2/Kconfig -=================================================================== ---- my_branch.orig/arch/arm/mach-omap2/Kconfig 2008-04-16 14:40:02.000000000 +0530 -+++ my_branch/arch/arm/mach-omap2/Kconfig 2008-04-16 14:41:28.000000000 +0530 -@@ -106,3 +106,6 @@ - bool "OMAP 3430 SDP board" - depends on ARCH_OMAP3 && ARCH_OMAP34XX - -+config MACH_OMAP3EVM -+ bool "OMAP 3530 EVM board" -+ depends on ARCH_OMAP3 && ARCH_OMAP34XX --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/3-omap3evm-board.patch b/packages/linux/linux-omap2-git/beagleboard/3-omap3evm-board.patch deleted file mode 100644 index bc0efbcc12..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/3-omap3evm-board.patch +++ /dev/null @@ -1,96 +0,0 @@ - -New board file for OMAP3 EVM - -Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> ---- - arch/arm/mach-omap2/board-omap3evm.c | 79 +++++++++++++++++++++++++++++++++++ - 1 file changed, 79 insertions(+) - -Index: my_branch/arch/arm/mach-omap2/board-omap3evm.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ my_branch/arch/arm/mach-omap2/board-omap3evm.c 2008-04-16 14:42:30.000000000 +0530 -@@ -0,0 +1,79 @@ -+/* -+ * linux/arch/arm/mach-omap2/board-omap3evm.c -+ * -+ * Copyright (C) 2008 Texas Instruments -+ * -+ * Modified from mach-omap2/board-3430sdp.c -+ * -+ * Initial code: Syed Mohammed Khasim -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/platform_device.h> -+#include <linux/delay.h> -+#include <linux/err.h> -+#include <linux/clk.h> -+#include <linux/io.h> -+ -+#include <asm/hardware.h> -+#include <asm/mach-types.h> -+#include <asm/mach/arch.h> -+#include <asm/mach/map.h> -+ -+#include <asm/arch/gpio.h> -+#include <asm/arch/board.h> -+#include <asm/arch/common.h> -+ -+static struct omap_uart_config omap3_evm_uart_config __initdata = { -+ .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), -+}; -+ -+static int __init omap3_evm_i2c_init(void) -+{ -+ omap_register_i2c_bus(1, 2600, NULL, 0); -+ omap_register_i2c_bus(2, 400, NULL, 0); -+ omap_register_i2c_bus(3, 400, NULL, 0); -+ return 0; -+} -+ -+static void __init omap3_evm_init_irq(void) -+{ -+ omap2_init_common_hw(); -+ omap_init_irq(); -+ omap_gpio_init(); -+} -+ -+static struct omap_board_config_kernel omap3_evm_config[] __initdata = { -+ {OMAP_TAG_UART, &omap3_evm_uart_config }, -+}; -+ -+static void __init omap3_evm_init(void) -+{ -+ omap_board_config = omap3_evm_config; -+ omap_board_config_size = ARRAY_SIZE(omap3_evm_config); -+ omap_serial_init(); -+} -+ -+arch_initcall(omap3_evm_i2c_init); -+ -+static void __init omap3_evm_map_io(void) -+{ -+ omap2_set_globals_343x(); -+ omap2_map_common_io(); -+} -+ -+MACHINE_START(OMAP3EVM, "OMAP3 EVM") -+ /* Maintainer: Syed Mohammed Khasim - Texas Instruments */ -+ .phys_io = 0x48000000, -+ .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, -+ .boot_params = 0x80000100, -+ .map_io = omap3_evm_map_io, -+ .init_irq = omap3_evm_init_irq, -+ .init_machine = omap3_evm_init, -+ .timer = &omap_timer, -+MACHINE_END --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/4-omap3evm-config.patch b/packages/linux/linux-omap2-git/beagleboard/4-omap3evm-config.patch deleted file mode 100644 index 19294ec68b..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/4-omap3evm-config.patch +++ /dev/null @@ -1,976 +0,0 @@ -New default configuration file for OMAP3 EVM - -Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> ---- - arch/arm/configs/omap3_evm_defconfig | 960 +++++++++++++++++++++++++++++++++++ - 1 file changed, 960 insertions(+) - -Index: my_branch/arch/arm/configs/omap3_evm_defconfig -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ my_branch/arch/arm/configs/omap3_evm_defconfig 2008-04-16 14:43:02.000000000 +0530 -@@ -0,0 +1,960 @@ -+# -+# Automatically generated make config: don't edit -+# Linux kernel version: 2.6.25-rc9-omap1 -+# Mon Apr 14 12:24:20 2008 -+# -+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_ARCH_SUPPORTS_AOUT=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_INIT_ENV_ARG_LIMIT=32 -+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_TASKSTATS is not set -+# CONFIG_AUDIT is not set -+# CONFIG_IKCONFIG is not set -+CONFIG_LOG_BUF_SHIFT=14 -+# CONFIG_CGROUPS is not set -+CONFIG_GROUP_SCHED=y -+CONFIG_FAIR_GROUP_SCHED=y -+# CONFIG_RT_GROUP_SCHED is not set -+CONFIG_USER_SCHED=y -+# CONFIG_CGROUP_SCHED is not set -+CONFIG_SYSFS_DEPRECATED=y -+CONFIG_SYSFS_DEPRECATED_V2=y -+# CONFIG_RELAY is not set -+# CONFIG_NAMESPACES is not set -+CONFIG_BLK_DEV_INITRD=y -+CONFIG_INITRAMFS_SOURCE="" -+CONFIG_CC_OPTIMIZE_FOR_SIZE=y -+CONFIG_SYSCTL=y -+CONFIG_EMBEDDED=y -+CONFIG_UID16=y -+# CONFIG_SYSCTL_SYSCALL is not set -+CONFIG_KALLSYMS=y -+# CONFIG_KALLSYMS_ALL is not set -+CONFIG_KALLSYMS_EXTRA_PASS=y -+CONFIG_HOTPLUG=y -+CONFIG_PRINTK=y -+CONFIG_BUG=y -+CONFIG_ELF_CORE=y -+CONFIG_COMPAT_BRK=y -+CONFIG_BASE_FULL=y -+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 -+CONFIG_SLAB=y -+# CONFIG_SLUB is not set -+# CONFIG_SLOB is not set -+# CONFIG_PROFILING is not set -+# CONFIG_MARKERS is not set -+CONFIG_HAVE_OPROFILE=y -+# CONFIG_KPROBES is not set -+CONFIG_HAVE_KPROBES=y -+CONFIG_HAVE_KRETPROBES=y -+CONFIG_PROC_PAGE_MONITOR=y -+CONFIG_SLABINFO=y -+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 is not set -+CONFIG_MODVERSIONS=y -+CONFIG_MODULE_SRCVERSION_ALL=y -+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=y -+CONFIG_IOSCHED_DEADLINE=y -+CONFIG_IOSCHED_CFQ=y -+CONFIG_DEFAULT_AS=y -+# CONFIG_DEFAULT_DEADLINE is not set -+# CONFIG_DEFAULT_CFQ is not set -+# CONFIG_DEFAULT_NOOP is not set -+CONFIG_DEFAULT_IOSCHED="anticipatory" -+CONFIG_CLASSIC_RCU=y -+ -+# -+# 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_ORION 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 is not set -+# CONFIG_ARCH_SHARK is not set -+# CONFIG_ARCH_LH7A40X is not set -+# CONFIG_ARCH_DAVINCI is not set -+CONFIG_ARCH_OMAP=y -+# CONFIG_ARCH_MSM7X00A is not set -+ -+# -+# TI OMAP Implementations -+# -+CONFIG_ARCH_OMAP_OTG=y -+# CONFIG_ARCH_OMAP1 is not set -+# CONFIG_ARCH_OMAP2 is not set -+CONFIG_ARCH_OMAP3=y -+ -+# -+# OMAP Feature Selections -+# -+CONFIG_OMAP_DEBUG_SRAM_PATCH=y -+# CONFIG_OMAP_RESET_CLOCKS is not set -+CONFIG_OMAP_BOOT_TAG=y -+CONFIG_OMAP_BOOT_REASON=y -+# CONFIG_OMAP_COMPONENT_VERSION is not set -+# CONFIG_OMAP_GPIO_SWITCH is not set -+# CONFIG_OMAP_MUX is not set -+# CONFIG_OMAP_MCBSP is not set -+# CONFIG_OMAP_MMU_FWK is not set -+# CONFIG_OMAP_MBOX_FWK is not set -+# CONFIG_OMAP_MPU_TIMER is not set -+CONFIG_OMAP_32K_TIMER=y -+CONFIG_OMAP_32K_TIMER_HZ=128 -+CONFIG_OMAP_DM_TIMER=y -+CONFIG_OMAP_LL_DEBUG_UART1=y -+# CONFIG_OMAP_LL_DEBUG_UART2 is not set -+# CONFIG_OMAP_LL_DEBUG_UART3 is not set -+CONFIG_ARCH_OMAP34XX=y -+CONFIG_ARCH_OMAP3430=y -+ -+# -+# OMAP Board Type -+# -+# CONFIG_MACH_OMAP_3430SDP is not set -+CONFIG_MACH_OMAP3EVM=y -+ -+# -+# Boot options -+# -+ -+# -+# Power management -+# -+ -+# -+# Processor Type -+# -+CONFIG_CPU_32=y -+CONFIG_CPU_32v6K=y -+CONFIG_CPU_V7=y -+CONFIG_CPU_32v7=y -+CONFIG_CPU_ABRT_EV7=y -+CONFIG_CPU_PABRT_IFAR=y -+CONFIG_CPU_CACHE_V7=y -+CONFIG_CPU_CACHE_VIPT=y -+CONFIG_CPU_COPY_V6=y -+CONFIG_CPU_TLB_V7=y -+CONFIG_CPU_HAS_ASID=y -+CONFIG_CPU_CP15=y -+CONFIG_CPU_CP15_MMU=y -+ -+# -+# Processor Features -+# -+CONFIG_ARM_THUMB=y -+# CONFIG_ARM_XENON is not set -+# CONFIG_CPU_ICACHE_DISABLE is not set -+# CONFIG_CPU_DCACHE_DISABLE is not set -+# CONFIG_CPU_BPREDICT_DISABLE is not set -+CONFIG_HAS_TLS_REG=y -+# 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=y -+CONFIG_NO_HZ=y -+CONFIG_HIGH_RES_TIMERS=y -+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -+# CONFIG_PREEMPT is not set -+CONFIG_HZ=128 -+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=4 -+# CONFIG_RESOURCES_64BIT is not set -+CONFIG_ZONE_DMA_FLAG=1 -+CONFIG_BOUNCE=y -+CONFIG_VIRT_TO_BUS=y -+# CONFIG_LEDS is not set -+CONFIG_ALIGNMENT_TRAP=y -+ -+# -+# Boot options -+# -+CONFIG_ZBOOT_ROM_TEXT=0x0 -+CONFIG_ZBOOT_ROM_BSS=0x0 -+CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8" -+# CONFIG_XIP_KERNEL is not set -+# CONFIG_KEXEC is not set -+ -+# -+# CPU Frequency scaling -+# -+# CONFIG_CPU_FREQ is not set -+ -+# -+# 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 -+CONFIG_VFP=y -+CONFIG_VFPv3=y -+# CONFIG_NEON is not set -+ -+# -+# Userspace binary formats -+# -+CONFIG_BINFMT_ELF=y -+# CONFIG_BINFMT_AOUT is not set -+CONFIG_BINFMT_MISC=y -+ -+# -+# Power management options -+# -+CONFIG_PM=y -+# CONFIG_PM_LEGACY is not set -+# CONFIG_PM_DEBUG is not set -+# CONFIG_SUSPEND is not set -+# CONFIG_APM_EMULATION is not set -+CONFIG_ARCH_SUSPEND_POSSIBLE=y -+ -+# -+# Networking -+# -+CONFIG_NET=y -+ -+# -+# Networking options -+# -+CONFIG_PACKET=y -+# CONFIG_PACKET_MMAP is not set -+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_XFRM_STATISTICS is not set -+CONFIG_NET_KEY=y -+# CONFIG_NET_KEY_MIGRATE is not set -+CONFIG_INET=y -+# CONFIG_IP_MULTICAST is not set -+# CONFIG_IP_ADVANCED_ROUTER is not set -+CONFIG_IP_FIB_HASH=y -+CONFIG_IP_PNP=y -+CONFIG_IP_PNP_DHCP=y -+CONFIG_IP_PNP_BOOTP=y -+CONFIG_IP_PNP_RARP=y -+# CONFIG_NET_IPIP is not set -+# CONFIG_NET_IPGRE is not set -+# CONFIG_ARPD is not set -+# CONFIG_SYN_COOKIES is not set -+# CONFIG_INET_AH is not set -+# CONFIG_INET_ESP is not set -+# CONFIG_INET_IPCOMP is not set -+# CONFIG_INET_XFRM_TUNNEL is not set -+# CONFIG_INET_TUNNEL is not set -+CONFIG_INET_XFRM_MODE_TRANSPORT=y -+CONFIG_INET_XFRM_MODE_TUNNEL=y -+CONFIG_INET_XFRM_MODE_BEET=y -+# 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 is not set -+# CONFIG_IPV6 is not set -+# 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_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_NET_SCHED is not set -+ -+# -+# Network testing -+# -+# CONFIG_NET_PKTGEN is not set -+# CONFIG_HAMRADIO is not set -+# CONFIG_CAN is not set -+# CONFIG_IRDA is not set -+# CONFIG_BT is not set -+# CONFIG_AF_RXRPC is not set -+ -+# -+# 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 is not set -+# CONFIG_DEBUG_DRIVER is not set -+# CONFIG_DEBUG_DEVRES is not set -+# CONFIG_SYS_HYPERVISOR is not set -+# CONFIG_CONNECTOR is not set -+# CONFIG_MTD is not set -+# CONFIG_PARPORT is not set -+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_RAM=y -+CONFIG_BLK_DEV_RAM_COUNT=16 -+CONFIG_BLK_DEV_RAM_SIZE=16384 -+# CONFIG_BLK_DEV_XIP is not set -+# CONFIG_CDROM_PKTCDVD is not set -+# CONFIG_ATA_OVER_ETH is not set -+# CONFIG_MISC_DEVICES is not set -+# CONFIG_HAVE_IDE 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 is not set -+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 is not set -+# CONFIG_CHR_DEV_SG is not set -+# 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 is not set -+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 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 is not set -+# CONFIG_VETH is not set -+# CONFIG_NET_ETHERNET is not set -+# 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 -+# CONFIG_WAN is not set -+# CONFIG_PPP is not set -+# CONFIG_SLIP 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 is not set -+# CONFIG_INPUT_JOYDEV is not set -+# CONFIG_INPUT_EVDEV is not set -+# CONFIG_INPUT_EVBUG is not set -+ -+# -+# Input Device Drivers -+# -+# CONFIG_INPUT_KEYBOARD is not set -+# CONFIG_INPUT_MOUSE 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 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_NR_UARTS=32 -+CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -+CONFIG_SERIAL_8250_EXTENDED=y -+CONFIG_SERIAL_8250_MANY_PORTS=y -+CONFIG_SERIAL_8250_SHARE_IRQ=y -+CONFIG_SERIAL_8250_DETECT_IRQ=y -+CONFIG_SERIAL_8250_RSA=y -+ -+# -+# Non-8250 serial port support -+# -+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=y -+# 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_OMAP=y -+# 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 -+ -+# -+# Miscellaneous I2C Chip support -+# -+# CONFIG_DS1682 is not set -+# CONFIG_SENSORS_EEPROM is not set -+# CONFIG_SENSORS_PCF8574 is not set -+# CONFIG_PCF8575 is not set -+# CONFIG_SENSORS_PCF8591 is not set -+# CONFIG_ISP1301_OMAP is not set -+# CONFIG_TPS65010 is not set -+# CONFIG_SENSORS_TLV320AIC23 is not set -+CONFIG_TWL4030_CORE=y -+CONFIG_TWL4030_GPIO=y -+# CONFIG_TWL4030_MADC is not set -+CONFIG_TWL4030_USB=y -+# CONFIG_TWL4030_PWRBUTTON is not set -+CONFIG_TWL4030_USB_HS_ULPI=y -+# CONFIG_TWL4030_POWEROFF 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 -+# CONFIG_I2C_DEBUG_CHIP is not set -+ -+# -+# SPI support -+# -+# CONFIG_SPI is not set -+# CONFIG_SPI_MASTER is not set -+CONFIG_HAVE_GPIO_LIB=y -+ -+# -+# GPIO Support -+# -+# CONFIG_DEBUG_GPIO is not set -+ -+# -+# I2C GPIO expanders: -+# -+# CONFIG_GPIO_PCA953X is not set -+# CONFIG_GPIO_PCF857X is not set -+ -+# -+# SPI GPIO expanders: -+# -+# CONFIG_W1 is not set -+# CONFIG_POWER_SUPPLY is not set -+# CONFIG_HWMON is not set -+# CONFIG_WATCHDOG 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_ASIC3 is not set -+ -+# -+# Multimedia devices -+# -+# CONFIG_VIDEO_DEV is not set -+# CONFIG_DVB_CORE is not set -+CONFIG_DAB=y -+ -+# -+# Graphics support -+# -+# CONFIG_VGASTATE is not set -+# CONFIG_VIDEO_OUTPUT_CONTROL is not set -+# CONFIG_FB is not set -+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set -+ -+# -+# Display device support -+# -+# CONFIG_DISPLAY_SUPPORT is not set -+ -+# -+# Console display driver support -+# -+# CONFIG_VGA_CONSOLE is not set -+CONFIG_DUMMY_CONSOLE=y -+ -+# -+# Sound -+# -+# CONFIG_SOUND is not set -+# CONFIG_HID_SUPPORT is not set -+# CONFIG_USB_SUPPORT is not set -+# CONFIG_MMC is not set -+# CONFIG_NEW_LEDS is not set -+CONFIG_RTC_LIB=y -+# CONFIG_RTC_CLASS is not set -+ -+# -+# CBUS support -+# -+# CONFIG_CBUS 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_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_DNOTIFY=y -+CONFIG_INOTIFY=y -+CONFIG_INOTIFY_USER=y -+CONFIG_QUOTA=y -+# CONFIG_QUOTA_NETLINK_INTERFACE is not set -+CONFIG_PRINT_QUOTA_WARNING=y -+# CONFIG_QFMT_V1 is not set -+CONFIG_QFMT_V2=y -+CONFIG_QUOTACTL=y -+# CONFIG_AUTOFS_FS is not set -+# CONFIG_AUTOFS4_FS is not set -+# CONFIG_FUSE_FS is not set -+ -+# -+# CD-ROM/DVD Filesystems -+# -+# CONFIG_ISO9660_FS is not set -+# CONFIG_UDF_FS is not set -+ -+# -+# DOS/FAT/NT Filesystems -+# -+CONFIG_FAT_FS=y -+CONFIG_MSDOS_FS=y -+CONFIG_VFAT_FS=y -+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 is not set -+ -+# -+# 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_CRAMFS is not set -+# CONFIG_VXFS_FS is not set -+# CONFIG_MINIX_FS is not set -+# CONFIG_HPFS_FS is not set -+# CONFIG_QNX4FS_FS is not set -+# CONFIG_ROMFS_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 is not set -+CONFIG_ROOT_NFS=y -+CONFIG_LOCKD=y -+CONFIG_LOCKD_V4=y -+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 is not set -+# CONFIG_NCP_FS is not set -+# CONFIG_CODA_FS is not set -+# CONFIG_AFS_FS is not set -+ -+# -+# Partition Types -+# -+CONFIG_PARTITION_ADVANCED=y -+# CONFIG_ACORN_PARTITION is not set -+# CONFIG_OSF_PARTITION is not set -+# CONFIG_AMIGA_PARTITION is not set -+# CONFIG_ATARI_PARTITION is not set -+# CONFIG_MAC_PARTITION is not set -+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 -+CONFIG_NLS=y -+CONFIG_NLS_DEFAULT="iso8859-1" -+CONFIG_NLS_CODEPAGE_437=y -+# CONFIG_NLS_CODEPAGE_737 is not set -+# CONFIG_NLS_CODEPAGE_775 is not set -+# CONFIG_NLS_CODEPAGE_850 is not set -+# 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 is not set -+# CONFIG_NLS_CODEPAGE_950 is not set -+# 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=y -+# 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 is not set -+# CONFIG_DLM 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_RT_MUTEXES is not set -+# CONFIG_RT_MUTEX_TESTER is not set -+# CONFIG_DEBUG_SPINLOCK is not set -+CONFIG_DEBUG_MUTEXES=y -+# 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 is not set -+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_BOOT_PRINTK_DELAY is not set -+# CONFIG_RCU_TORTURE_TEST is not set -+# CONFIG_BACKTRACE_SELF_TEST is not set -+# CONFIG_FAULT_INJECTION is not set -+# CONFIG_SAMPLES is not set -+# CONFIG_DEBUG_USER is not set -+# CONFIG_DEBUG_ERRORS is not set -+# CONFIG_DEBUG_STACK_USAGE is not set -+CONFIG_DEBUG_LL=y -+# CONFIG_DEBUG_ICEDCC is not set -+ -+# -+# 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_SEQIV is not set -+CONFIG_CRYPTO_MANAGER=y -+# CONFIG_CRYPTO_HMAC is not set -+# CONFIG_CRYPTO_XCBC is not set -+# CONFIG_CRYPTO_NULL is not set -+# CONFIG_CRYPTO_MD4 is not set -+CONFIG_CRYPTO_MD5=y -+# CONFIG_CRYPTO_SHA1 is not set -+# CONFIG_CRYPTO_SHA256 is not set -+# CONFIG_CRYPTO_SHA512 is not set -+# CONFIG_CRYPTO_WP512 is not set -+# CONFIG_CRYPTO_TGR192 is not set -+# CONFIG_CRYPTO_GF128MUL is not set -+CONFIG_CRYPTO_ECB=m -+CONFIG_CRYPTO_CBC=y -+CONFIG_CRYPTO_PCBC=m -+# CONFIG_CRYPTO_LRW is not set -+# CONFIG_CRYPTO_XTS is not set -+# CONFIG_CRYPTO_CTR is not set -+# CONFIG_CRYPTO_GCM is not set -+# CONFIG_CRYPTO_CCM is not set -+# CONFIG_CRYPTO_CRYPTD is not set -+CONFIG_CRYPTO_DES=y -+# CONFIG_CRYPTO_FCRYPT is not set -+# CONFIG_CRYPTO_BLOWFISH is not set -+# CONFIG_CRYPTO_TWOFISH is not set -+# CONFIG_CRYPTO_SERPENT is not set -+# CONFIG_CRYPTO_AES is not set -+# CONFIG_CRYPTO_CAST5 is not set -+# CONFIG_CRYPTO_CAST6 is not set -+# CONFIG_CRYPTO_TEA is not set -+# CONFIG_CRYPTO_ARC4 is not set -+# CONFIG_CRYPTO_KHAZAD is not set -+# CONFIG_CRYPTO_ANUBIS is not set -+# CONFIG_CRYPTO_SEED is not set -+# CONFIG_CRYPTO_SALSA20 is not set -+# CONFIG_CRYPTO_DEFLATE is not set -+# CONFIG_CRYPTO_MICHAEL_MIC is not set -+# CONFIG_CRYPTO_CRC32C is not set -+# CONFIG_CRYPTO_CAMELLIA is not set -+# CONFIG_CRYPTO_TEST is not set -+# CONFIG_CRYPTO_AUTHENC is not set -+# CONFIG_CRYPTO_LZO is not set -+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=y -+CONFIG_PLIST=y -+CONFIG_HAS_IOMEM=y -+CONFIG_HAS_IOPORT=y -+CONFIG_HAS_DMA=y --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch b/packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch deleted file mode 100644 index 00fd482601..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/5-omap3evm-header.patch +++ /dev/null @@ -1,86 +0,0 @@ - -Added new board header file for OMAP3 EVM - -Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> ---- - include/asm-arm/arch-omap/board-omap3evm.h | 53 +++++++++++++++++++++++++++++ - include/asm-arm/arch-omap/hardware.h | 4 ++ - 2 files changed, 57 insertions(+) - -Index: my_branch/include/asm-arm/arch-omap/hardware.h -=================================================================== ---- my_branch.orig/include/asm-arm/arch-omap/hardware.h 2008-04-16 14:39:51.000000000 +0530 -+++ my_branch/include/asm-arm/arch-omap/hardware.h 2008-04-16 14:44:09.000000000 +0530 -@@ -335,6 +335,10 @@ - #include "board-3430sdp.h" - #endif - -+#ifdef CONFIG_MACH_OMAP3EVM -+#include "board-omap3evm.h" -+#endif -+ - #ifdef CONFIG_MACH_OMAP_APOLLON - #include "board-apollon.h" - #endif -Index: my_branch/include/asm-arm/arch-omap/board-omap3evm.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ my_branch/include/asm-arm/arch-omap/board-omap3evm.h 2008-04-16 14:44:09.000000000 +0530 -@@ -0,0 +1,53 @@ -+/* -+ * linux/include/asm-arm/arch-omap/board-omap3evm.h -+ * -+ * Hardware definitions for TI OMAP3 EVM. -+ * -+ * Initial creation by Syed Mohammed Khasim <khasim@ti.com> -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License as published by the -+ * Free Software Foundation; either version 2 of the License, or (at your -+ * option) any later version. -+ * -+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN -+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 675 Mass Ave, Cambridge, MA 02139, USA. -+ */ -+ -+#ifndef __ASM_ARCH_OMAP3_EVM_H -+#define __ASM_ARCH_OMAP3_EVM_H -+ -+#ifdef CONFIG_TWL4030_CORE -+ -+#define TWL4030_IRQNUM INT_34XX_SYS_NIRQ -+ -+/* TWL4030 Primary Interrupt Handler (PIH) interrupts */ -+#define IH_TWL4030_BASE IH_BOARD_BASE -+#define IH_TWL4030_END (IH_TWL4030_BASE+8) -+#define IH_TWL4030_PWRBASE (IH_TWL4030_END) -+#define IH_TWL4030_PWRBASE_END (IH_TWL4030_PWRBASE+8) -+ -+#ifdef CONFIG_TWL4030_GPIO -+/* TWL4030 GPIO Interrupts */ -+#define IH_TWL4030_GPIO_BASE (IH_TWL4030_PWRBASE_END) -+#define IH_TWL4030_GPIO_END (IH_TWL4030_GPIO_BASE+18) -+#define NR_IRQS (IH_TWL4030_GPIO_END) -+#else -+#define NR_IRQS (IH_TWL4030_PWRBASE_END) -+#endif /* CONFIG_I2C_TWL4030_GPIO */ -+ -+#endif /* End of support for TWL4030 */ -+#endif /* __ASM_ARCH_OMAP3_EVM_H */ -+ --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff b/packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff deleted file mode 100644 index 26278d381c..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/add-beagle-sd-support.diff +++ /dev/null @@ -1,49 +0,0 @@ -omap3beagle: register SD interface - -Signed-off-by: Koen Kooi <koen@openembedded.org> ---- - Makefile | 3 ++- - board-omap3beagle.c | 12 ++++++++++++ - 2 files changed, 14 insertions(+), 1 deletion(-) ---- /tmp/board-omap3beagle.c 2008-04-16 18:12:56.347129861 +0200 -+++ git/arch/arm/mach-omap2/board-omap3beagle.c 2008-04-16 19:02:08.490169463 +0200 -@@ -48,15 +48,27 @@ - omap_gpio_init(); - } - -+ -+static struct omap_mmc_config omap3beagle_mmc_config __initdata = { -+ .mmc [0] = { -+ .enabled = 1, -+ .wire4 = 1, -+ }, -+}; -+ - static struct omap_board_config_kernel omap3_beagle_config[] __initdata = { - {OMAP_TAG_UART, &omap3_beagle_uart_config }, -+ {OMAP_TAG_MMC, &omap3beagle_mmc_config }, - }; - -+extern void __init sdp_mmc_init(void); -+ - static void __init omap3_beagle_init(void) - { - omap_board_config = omap3_beagle_config; - omap_board_config_size = ARRAY_SIZE(omap3_beagle_config); - omap_serial_init(); -+ sdp_mmc_init(); - } - - arch_initcall(omap3_beagle_i2c_init); ---- /tmp/Makefile 2008-04-16 19:08:53.653462476 +0200 -+++ git/arch/arm/mach-omap2/Makefile 2008-04-16 19:09:15.836793250 +0200 -@@ -35,7 +35,8 @@ - board-3430sdp-usb.o \ - board-3430sdp-flash.o - obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o --obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o -+obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \ -+ board-sdp-hsmmc.o - obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o \ - board-apollon-mmc.o \ - board-apollon-keys.o diff --git a/packages/linux/linux-omap2-git/beagleboard/beagle-board-file.diff b/packages/linux/linux-omap2-git/beagleboard/beagle-board-file.diff deleted file mode 100644 index aa5f448de6..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/beagle-board-file.diff +++ /dev/null @@ -1,98 +0,0 @@ - -Add new board file for OMAP3 Beagle Board. - -For more info regarding this board visit http://beagleboard.org - -Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> ---- - arch/arm/mach-omap2/board-omap3beagle.c | 79 ++++++++++++++++++++++++++++++++ - 1 file changed, 79 insertions(+) - -Index: my_branch/arch/arm/mach-omap2/board-omap3beagle.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ my_branch/arch/arm/mach-omap2/board-omap3beagle.c 2008-04-16 14:45:52.000000000 +0530 -@@ -0,0 +1,79 @@ -+/* -+ * linux/arch/arm/mach-omap2/board-omap3beagle.c -+ * -+ * Copyright (C) 2008 Texas Instruments -+ * -+ * Modified from mach-omap2/board-3430sdp.c -+ * -+ * Initial code: Syed Mohammed Khasim -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/platform_device.h> -+#include <linux/delay.h> -+#include <linux/err.h> -+#include <linux/clk.h> -+#include <linux/io.h> -+ -+#include <asm/hardware.h> -+#include <asm/mach-types.h> -+#include <asm/mach/arch.h> -+#include <asm/mach/map.h> -+ -+#include <asm/arch/gpio.h> -+#include <asm/arch/board.h> -+#include <asm/arch/common.h> -+ -+static struct omap_uart_config omap3_beagle_uart_config __initdata = { -+ .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), -+}; -+ -+static int __init omap3_beagle_i2c_init(void) -+{ -+ omap_register_i2c_bus(1, 2600, NULL, 0); -+ omap_register_i2c_bus(2, 400, NULL, 0); -+ omap_register_i2c_bus(3, 400, NULL, 0); -+ return 0; -+} -+ -+static void __init omap3_beagle_init_irq(void) -+{ -+ omap2_init_common_hw(); -+ omap_init_irq(); -+ omap_gpio_init(); -+} -+ -+static struct omap_board_config_kernel omap3_beagle_config[] __initdata = { -+ {OMAP_TAG_UART, &omap3_beagle_uart_config }, -+}; -+ -+static void __init omap3_beagle_init(void) -+{ -+ omap_board_config = omap3_beagle_config; -+ omap_board_config_size = ARRAY_SIZE(omap3_beagle_config); -+ omap_serial_init(); -+} -+ -+arch_initcall(omap3_beagle_i2c_init); -+ -+static void __init omap3_beagle_map_io(void) -+{ -+ omap2_set_globals_343x(); -+ omap2_map_common_io(); -+} -+ -+MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board") -+ /* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */ -+ .phys_io = 0x48000000, -+ .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, -+ .boot_params = 0x80000100, -+ .map_io = omap3_beagle_map_io, -+ .init_irq = omap3_beagle_init_irq, -+ .init_machine = omap3_beagle_init, -+ .timer = &omap_timer, -+MACHINE_END --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/beagle-board-header.diff b/packages/linux/linux-omap2-git/beagleboard/beagle-board-header.diff deleted file mode 100644 index 8bf4ec8c54..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/beagle-board-header.diff +++ /dev/null @@ -1,87 +0,0 @@ - -New board header file for OMAP3 Beagle Board. - -Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> ---- - include/asm-arm/arch-omap/board-omap3beagle.h | 53 ++++++++++++++++++++++++++ - include/asm-arm/arch-omap/hardware.h | 4 + - 2 files changed, 57 insertions(+) - -Index: my_branch/include/asm-arm/arch-omap/board-omap3beagle.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ my_branch/include/asm-arm/arch-omap/board-omap3beagle.h 2008-04-16 14:47:14.000000000 +0530 -@@ -0,0 +1,53 @@ -+/* -+ * linux/include/asm-arm/arch-omap/board-omap3beagle.h -+ * -+ * Hardware definitions for TI OMAP3 BEAGLE. -+ * -+ * Initial creation by Syed Mohammed Khasim <khasim@ti.com> -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License as published by the -+ * Free Software Foundation; either version 2 of the License, or (at your -+ * option) any later version. -+ * -+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN -+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 675 Mass Ave, Cambridge, MA 02139, USA. -+ */ -+ -+#ifndef __ASM_ARCH_OMAP3_BEAGLE_H -+#define __ASM_ARCH_OMAP3_BEAGLE_H -+ -+#ifdef CONFIG_TWL4030_CORE -+ -+#define TWL4030_IRQNUM INT_34XX_SYS_NIRQ -+ -+/* TWL4030 Primary Interrupt Handler (PIH) interrupts */ -+#define IH_TWL4030_BASE IH_BOARD_BASE -+#define IH_TWL4030_END (IH_TWL4030_BASE+8) -+#define IH_TWL4030_PWRBASE (IH_TWL4030_END) -+#define IH_TWL4030_PWRBASE_END (IH_TWL4030_PWRBASE+8) -+ -+#ifdef CONFIG_TWL4030_GPIO -+/* TWL4030 GPIO Interrupts */ -+#define IH_TWL4030_GPIO_BASE (IH_TWL4030_PWRBASE_END) -+#define IH_TWL4030_GPIO_END (IH_TWL4030_GPIO_BASE+18) -+#define NR_IRQS (IH_TWL4030_GPIO_END) -+#else -+#define NR_IRQS (IH_TWL4030_PWRBASE_END) -+#endif /* CONFIG_I2C_TWL4030_GPIO */ -+ -+#endif /* End of support for TWL4030 */ -+#endif /* __ASM_ARCH_OMAP3_BEAGLE_H */ -+ - -Index: my_branch/include/asm-arm/arch-omap/hardware.h -=================================================================== ---- my_branch.orig/include/asm-arm/arch-omap/hardware.h 2008-04-16 14:44:09.000000000 +0530 -+++ my_branch/include/asm-arm/arch-omap/hardware.h 2008-04-16 14:47:14.000000000 +0530 -@@ -339,6 +339,10 @@ - #include "board-omap3evm.h" - #endif - -+#ifdef CONFIG_MACH_OMAP3_BEAGLE -+#include "board-omap3beagle.h" -+#endif -+ - #ifdef CONFIG_MACH_OMAP_APOLLON - #include "board-apollon.h" - #endif --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff b/packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff deleted file mode 100644 index b382423635..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/beagle-board-patch-dirk.diff +++ /dev/null @@ -1,1103 +0,0 @@ -Index: linux-osk/arch/arm/configs/omap3_beagle_defconfig -=================================================================== ---- /dev/null -+++ linux-osk/arch/arm/configs/omap3_beagle_defconfig -@@ -0,0 +1,843 @@ -+# -+# Automatically generated make config: don't edit -+# Linux kernel version: 2.6.25-rc7-omap1 -+# Sun Mar 30 15:03:23 2008 -+# -+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_ARCH_SUPPORTS_AOUT=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_INIT_ENV_ARG_LIMIT=32 -+CONFIG_LOCALVERSION="" -+CONFIG_LOCALVERSION_AUTO=y -+CONFIG_SWAP=y -+CONFIG_SYSVIPC=y -+CONFIG_SYSVIPC_SYSCTL=y -+CONFIG_BSD_PROCESS_ACCT=y -+# CONFIG_BSD_PROCESS_ACCT_V3 is not set -+# CONFIG_IKCONFIG is not set -+CONFIG_LOG_BUF_SHIFT=14 -+# CONFIG_CGROUPS is not set -+CONFIG_GROUP_SCHED=y -+CONFIG_FAIR_GROUP_SCHED=y -+# CONFIG_RT_GROUP_SCHED is not set -+CONFIG_USER_SCHED=y -+# CONFIG_CGROUP_SCHED is not set -+CONFIG_SYSFS_DEPRECATED=y -+CONFIG_SYSFS_DEPRECATED_V2=y -+# CONFIG_RELAY is not set -+# CONFIG_NAMESPACES is not set -+CONFIG_BLK_DEV_INITRD=y -+CONFIG_INITRAMFS_SOURCE="" -+CONFIG_CC_OPTIMIZE_FOR_SIZE=y -+CONFIG_SYSCTL=y -+CONFIG_EMBEDDED=y -+CONFIG_UID16=y -+# CONFIG_SYSCTL_SYSCALL is not set -+CONFIG_KALLSYMS=y -+# CONFIG_KALLSYMS_ALL is not set -+CONFIG_KALLSYMS_EXTRA_PASS=y -+CONFIG_HOTPLUG=y -+CONFIG_PRINTK=y -+CONFIG_BUG=y -+CONFIG_ELF_CORE=y -+CONFIG_COMPAT_BRK=y -+CONFIG_BASE_FULL=y -+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 -+CONFIG_SLAB=y -+# CONFIG_SLUB is not set -+# CONFIG_SLOB is not set -+# CONFIG_PROFILING is not set -+# CONFIG_MARKERS is not set -+CONFIG_HAVE_OPROFILE=y -+# CONFIG_KPROBES is not set -+CONFIG_HAVE_KPROBES=y -+CONFIG_HAVE_KRETPROBES=y -+CONFIG_PROC_PAGE_MONITOR=y -+CONFIG_SLABINFO=y -+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 is not set -+CONFIG_MODVERSIONS=y -+CONFIG_MODULE_SRCVERSION_ALL=y -+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=y -+CONFIG_IOSCHED_DEADLINE=y -+CONFIG_IOSCHED_CFQ=y -+CONFIG_DEFAULT_AS=y -+# CONFIG_DEFAULT_DEADLINE is not set -+# CONFIG_DEFAULT_CFQ is not set -+# CONFIG_DEFAULT_NOOP is not set -+CONFIG_DEFAULT_IOSCHED="anticipatory" -+CONFIG_CLASSIC_RCU=y -+ -+# -+# 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_ORION 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 is not set -+# CONFIG_ARCH_SHARK is not set -+# CONFIG_ARCH_LH7A40X is not set -+# CONFIG_ARCH_DAVINCI is not set -+CONFIG_ARCH_OMAP=y -+# CONFIG_ARCH_MSM7X00A is not set -+ -+# -+# TI OMAP Implementations -+# -+CONFIG_ARCH_OMAP_OTG=y -+# CONFIG_ARCH_OMAP1 is not set -+# CONFIG_ARCH_OMAP2 is not set -+CONFIG_ARCH_OMAP3=y -+ -+# -+# OMAP Feature Selections -+# -+CONFIG_OMAP_DEBUG_SRAM_PATCH=y -+# CONFIG_OMAP_RESET_CLOCKS is not set -+CONFIG_OMAP_BOOT_TAG=y -+CONFIG_OMAP_BOOT_REASON=y -+# CONFIG_OMAP_COMPONENT_VERSION is not set -+# CONFIG_OMAP_GPIO_SWITCH is not set -+CONFIG_OMAP_MUX=y -+CONFIG_OMAP_MUX_DEBUG=y -+CONFIG_OMAP_MUX_WARNINGS=y -+# CONFIG_OMAP_MCBSP is not set -+# CONFIG_OMAP_MMU_FWK is not set -+# CONFIG_OMAP_MBOX_FWK is not set -+CONFIG_OMAP_MPU_TIMER=y -+# CONFIG_OMAP_32K_TIMER is not set -+CONFIG_OMAP_DM_TIMER=y -+CONFIG_OMAP_LL_DEBUG_UART1=y -+# CONFIG_OMAP_LL_DEBUG_UART2 is not set -+# CONFIG_OMAP_LL_DEBUG_UART3 is not set -+CONFIG_OMAP_SERIAL_WAKE=y -+CONFIG_ARCH_OMAP34XX=y -+CONFIG_ARCH_OMAP3430=y -+ -+# -+# OMAP Board Type -+# -+# CONFIG_MACH_OMAP_3430SDP is not set -+CONFIG_MACH_OMAP3_BEAGLE=y -+ -+# -+# Boot options -+# -+ -+# -+# Power management -+# -+ -+# -+# Processor Type -+# -+CONFIG_CPU_32=y -+CONFIG_CPU_32v6K=y -+CONFIG_CPU_V7=y -+CONFIG_CPU_32v7=y -+CONFIG_CPU_ABRT_EV7=y -+CONFIG_CPU_PABRT_IFAR=y -+CONFIG_CPU_CACHE_V7=y -+CONFIG_CPU_CACHE_VIPT=y -+CONFIG_CPU_COPY_V6=y -+CONFIG_CPU_TLB_V7=y -+CONFIG_CPU_HAS_ASID=y -+CONFIG_CPU_CP15=y -+CONFIG_CPU_CP15_MMU=y -+ -+# -+# Processor Features -+# -+CONFIG_ARM_THUMB=y -+# CONFIG_ARM_XENON is not set -+# CONFIG_CPU_ICACHE_DISABLE is not set -+# CONFIG_CPU_DCACHE_DISABLE is not set -+# CONFIG_CPU_BPREDICT_DISABLE is not set -+CONFIG_HAS_TLS_REG=y -+# 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_NO_HZ is not set -+# CONFIG_HIGH_RES_TIMERS is not set -+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -+# CONFIG_PREEMPT is not set -+CONFIG_HZ=100 -+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=4 -+# CONFIG_RESOURCES_64BIT is not set -+CONFIG_ZONE_DMA_FLAG=1 -+CONFIG_BOUNCE=y -+CONFIG_VIRT_TO_BUS=y -+# CONFIG_LEDS is not set -+CONFIG_ALIGNMENT_TRAP=y -+ -+# -+# Boot options -+# -+CONFIG_ZBOOT_ROM_TEXT=0x0 -+CONFIG_ZBOOT_ROM_BSS=0x0 -+CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8" -+# CONFIG_XIP_KERNEL is not set -+# CONFIG_KEXEC is not set -+ -+# -+# CPU Frequency scaling -+# -+# CONFIG_CPU_FREQ is not set -+ -+# -+# 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 -+CONFIG_VFP=y -+CONFIG_VFPv3=y -+# CONFIG_NEON is not set -+ -+# -+# Userspace binary formats -+# -+CONFIG_BINFMT_ELF=y -+# CONFIG_BINFMT_AOUT is not set -+CONFIG_BINFMT_MISC=y -+ -+# -+# Power management options -+# -+# CONFIG_PM is not set -+CONFIG_ARCH_SUSPEND_POSSIBLE=y -+ -+# -+# Networking -+# -+# CONFIG_NET 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 is not set -+# CONFIG_DEBUG_DRIVER is not set -+# CONFIG_DEBUG_DEVRES is not set -+# CONFIG_SYS_HYPERVISOR is not set -+# CONFIG_MTD is not set -+# CONFIG_PARPORT is not set -+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_RAM=y -+CONFIG_BLK_DEV_RAM_COUNT=16 -+CONFIG_BLK_DEV_RAM_SIZE=16384 -+# CONFIG_BLK_DEV_XIP is not set -+# CONFIG_CDROM_PKTCDVD is not set -+CONFIG_MISC_DEVICES=y -+# CONFIG_EEPROM_93CX6 is not set -+# CONFIG_OMAP_STI is not set -+# CONFIG_ENCLOSURE_SERVICES is not set -+# CONFIG_HAVE_IDE is not set -+ -+# -+# SCSI device support -+# -+# CONFIG_RAID_ATTRS is not set -+# CONFIG_SCSI is not set -+# CONFIG_SCSI_DMA is not set -+# CONFIG_SCSI_NETLINK is not set -+# CONFIG_ATA is not set -+# CONFIG_MD 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 is not set -+# CONFIG_INPUT_JOYDEV is not set -+CONFIG_INPUT_EVDEV=y -+# 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_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_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 is not set -+ -+# -+# Hardware I/O ports -+# -+# CONFIG_SERIO 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_NR_UARTS=32 -+CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -+CONFIG_SERIAL_8250_EXTENDED=y -+CONFIG_SERIAL_8250_MANY_PORTS=y -+CONFIG_SERIAL_8250_SHARE_IRQ=y -+CONFIG_SERIAL_8250_DETECT_IRQ=y -+CONFIG_SERIAL_8250_RSA=y -+ -+# -+# Non-8250 serial port support -+# -+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=y -+# 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_OMAP=y -+# 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 -+ -+# -+# Miscellaneous I2C Chip support -+# -+# CONFIG_DS1682 is not set -+# CONFIG_SENSORS_EEPROM is not set -+# CONFIG_SENSORS_PCF8574 is not set -+# CONFIG_PCF8575 is not set -+# CONFIG_SENSORS_PCF8591 is not set -+# CONFIG_ISP1301_OMAP is not set -+# CONFIG_TPS65010 is not set -+# CONFIG_SENSORS_TLV320AIC23 is not set -+CONFIG_TWL4030_CORE=y -+CONFIG_TWL4030_GPIO=y -+# CONFIG_TWL4030_USB is not set -+# CONFIG_TWL4030_POWEROFF 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 -+# CONFIG_I2C_DEBUG_CHIP is not set -+ -+# -+# SPI support -+# -+# CONFIG_SPI is not set -+# CONFIG_SPI_MASTER is not set -+CONFIG_HAVE_GPIO_LIB=y -+ -+# -+# GPIO Support -+# -+# CONFIG_DEBUG_GPIO is not set -+ -+# -+# I2C GPIO expanders: -+# -+# CONFIG_GPIO_PCA953X is not set -+# CONFIG_GPIO_PCF857X is not set -+ -+# -+# SPI GPIO expanders: -+# -+# CONFIG_W1 is not set -+# CONFIG_POWER_SUPPLY is not set -+# CONFIG_HWMON is not set -+CONFIG_WATCHDOG=y -+CONFIG_WATCHDOG_NOWAYOUT=y -+ -+# -+# Watchdog Device Drivers -+# -+# CONFIG_SOFT_WATCHDOG is not set -+CONFIG_OMAP_WATCHDOG=y -+ -+# -+# Sonics Silicon Backplane -+# -+CONFIG_SSB_POSSIBLE=y -+# CONFIG_SSB is not set -+ -+# -+# Multifunction device drivers -+# -+# CONFIG_MFD_SM501 is not set -+# CONFIG_MFD_ASIC3 is not set -+ -+# -+# Multimedia devices -+# -+# CONFIG_VIDEO_DEV is not set -+CONFIG_DAB=y -+ -+# -+# Graphics support -+# -+# CONFIG_VGASTATE is not set -+CONFIG_VIDEO_OUTPUT_CONTROL=m -+# CONFIG_FB is not set -+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set -+ -+# -+# Display device support -+# -+# CONFIG_DISPLAY_SUPPORT is not set -+ -+# -+# Console display driver support -+# -+# CONFIG_VGA_CONSOLE is not set -+CONFIG_DUMMY_CONSOLE=y -+ -+# -+# Sound -+# -+# CONFIG_SOUND is not set -+CONFIG_HID_SUPPORT=y -+CONFIG_HID=y -+# CONFIG_HID_DEBUG is not set -+# CONFIG_HIDRAW is not set -+CONFIG_USB_SUPPORT=y -+CONFIG_USB_ARCH_HAS_HCD=y -+CONFIG_USB_ARCH_HAS_OHCI=y -+CONFIG_USB_ARCH_HAS_EHCI=y -+# CONFIG_USB is not set -+ -+# -+# Enable Host or Gadget support to see Inventra options -+# -+ -+# -+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' -+# -+# CONFIG_USB_GADGET is not set -+CONFIG_MMC=y -+# CONFIG_MMC_DEBUG is not set -+# CONFIG_MMC_UNSAFE_RESUME is not set -+ -+# -+# 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_OMAP_HS is not set -+# CONFIG_NEW_LEDS is not set -+CONFIG_RTC_LIB=y -+# CONFIG_RTC_CLASS is not set -+ -+# -+# CBUS support -+# -+# CONFIG_CBUS 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_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_DNOTIFY=y -+CONFIG_INOTIFY=y -+CONFIG_INOTIFY_USER=y -+CONFIG_QUOTA=y -+CONFIG_PRINT_QUOTA_WARNING=y -+# CONFIG_QFMT_V1 is not set -+CONFIG_QFMT_V2=y -+CONFIG_QUOTACTL=y -+# CONFIG_AUTOFS_FS is not set -+# CONFIG_AUTOFS4_FS is not set -+# CONFIG_FUSE_FS is not set -+ -+# -+# CD-ROM/DVD Filesystems -+# -+# CONFIG_ISO9660_FS is not set -+# CONFIG_UDF_FS is not set -+ -+# -+# DOS/FAT/NT Filesystems -+# -+CONFIG_FAT_FS=y -+CONFIG_MSDOS_FS=y -+CONFIG_VFAT_FS=y -+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 is not set -+ -+# -+# 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_CRAMFS is not set -+# CONFIG_VXFS_FS is not set -+# CONFIG_MINIX_FS is not set -+# CONFIG_HPFS_FS is not set -+# CONFIG_QNX4FS_FS is not set -+# CONFIG_ROMFS_FS is not set -+# CONFIG_SYSV_FS is not set -+# CONFIG_UFS_FS 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 is not set -+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 -+CONFIG_NLS=y -+CONFIG_NLS_DEFAULT="iso8859-1" -+CONFIG_NLS_CODEPAGE_437=y -+# CONFIG_NLS_CODEPAGE_737 is not set -+# CONFIG_NLS_CODEPAGE_775 is not set -+# CONFIG_NLS_CODEPAGE_850 is not set -+# 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 is not set -+# CONFIG_NLS_CODEPAGE_950 is not set -+# 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 is not set -+# CONFIG_NLS_ISO8859_2 is not set -+# CONFIG_NLS_ISO8859_3 is not set -+# CONFIG_NLS_ISO8859_4 is not set -+# CONFIG_NLS_ISO8859_5 is not set -+# CONFIG_NLS_ISO8859_6 is not set -+# CONFIG_NLS_ISO8859_7 is not set -+# CONFIG_NLS_ISO8859_9 is not set -+# CONFIG_NLS_ISO8859_13 is not set -+# CONFIG_NLS_ISO8859_14 is not set -+# CONFIG_NLS_ISO8859_15 is not set -+# CONFIG_NLS_KOI8_R is not set -+# CONFIG_NLS_KOI8_U is not set -+# CONFIG_NLS_UTF8 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_RT_MUTEXES is not set -+# CONFIG_RT_MUTEX_TESTER is not set -+# CONFIG_DEBUG_SPINLOCK is not set -+CONFIG_DEBUG_MUTEXES=y -+# 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 is not set -+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_BOOT_PRINTK_DELAY is not set -+# CONFIG_RCU_TORTURE_TEST is not set -+# CONFIG_BACKTRACE_SELF_TEST is not set -+# CONFIG_FAULT_INJECTION is not set -+# CONFIG_SAMPLES is not set -+# CONFIG_DEBUG_USER is not set -+# CONFIG_DEBUG_ERRORS is not set -+# CONFIG_DEBUG_STACK_USAGE is not set -+CONFIG_DEBUG_LL=y -+# CONFIG_DEBUG_ICEDCC is not set -+ -+# -+# 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_SEQIV is not set -+CONFIG_CRYPTO_MANAGER=y -+# CONFIG_CRYPTO_HMAC is not set -+# CONFIG_CRYPTO_XCBC is not set -+# CONFIG_CRYPTO_NULL is not set -+# CONFIG_CRYPTO_MD4 is not set -+CONFIG_CRYPTO_MD5=y -+# CONFIG_CRYPTO_SHA1 is not set -+# CONFIG_CRYPTO_SHA256 is not set -+# CONFIG_CRYPTO_SHA512 is not set -+# CONFIG_CRYPTO_WP512 is not set -+# CONFIG_CRYPTO_TGR192 is not set -+# CONFIG_CRYPTO_GF128MUL is not set -+CONFIG_CRYPTO_ECB=m -+CONFIG_CRYPTO_CBC=y -+CONFIG_CRYPTO_PCBC=m -+# CONFIG_CRYPTO_LRW is not set -+# CONFIG_CRYPTO_XTS is not set -+# CONFIG_CRYPTO_CTR is not set -+# CONFIG_CRYPTO_GCM is not set -+# CONFIG_CRYPTO_CCM is not set -+# CONFIG_CRYPTO_CRYPTD is not set -+CONFIG_CRYPTO_DES=y -+# CONFIG_CRYPTO_FCRYPT is not set -+# CONFIG_CRYPTO_BLOWFISH is not set -+# CONFIG_CRYPTO_TWOFISH is not set -+# CONFIG_CRYPTO_SERPENT is not set -+# CONFIG_CRYPTO_AES is not set -+# CONFIG_CRYPTO_CAST5 is not set -+# CONFIG_CRYPTO_CAST6 is not set -+# CONFIG_CRYPTO_TEA is not set -+# CONFIG_CRYPTO_ARC4 is not set -+# CONFIG_CRYPTO_KHAZAD is not set -+# CONFIG_CRYPTO_ANUBIS is not set -+# CONFIG_CRYPTO_SEED is not set -+# CONFIG_CRYPTO_SALSA20 is not set -+# CONFIG_CRYPTO_DEFLATE is not set -+# CONFIG_CRYPTO_MICHAEL_MIC is not set -+# CONFIG_CRYPTO_CRC32C is not set -+# CONFIG_CRYPTO_CAMELLIA is not set -+# CONFIG_CRYPTO_TEST is not set -+# CONFIG_CRYPTO_AUTHENC is not set -+# CONFIG_CRYPTO_LZO is not set -+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=y -+CONFIG_PLIST=y -+CONFIG_HAS_IOMEM=y -+CONFIG_HAS_IOPORT=y -+CONFIG_HAS_DMA=y -Index: linux-osk/arch/arm/mach-omap2/Kconfig -=================================================================== ---- linux-osk.orig/arch/arm/mach-omap2/Kconfig -+++ linux-osk/arch/arm/mach-omap2/Kconfig -@@ -102,6 +102,10 @@ config MACH_OMAP_3430SDP - bool "OMAP 3430 SDP board" - depends on ARCH_OMAP3 && ARCH_OMAP34XX - -+config MACH_OMAP3_BEAGLE -+ bool "OMAP3 BEAGLE board" -+ depends on ARCH_OMAP3 && ARCH_OMAP34XX -+ - config MACH_OMAP_2430OSK - bool "OMAP 2430 OSK board" - depends on ARCH_OMAP2 && ARCH_OMAP24XX -Index: linux-osk/arch/arm/mach-omap2/board-omap3beagle.c -=================================================================== ---- /dev/null -+++ linux-osk/arch/arm/mach-omap2/board-omap3beagle.c -@@ -0,0 +1,136 @@ -+/* -+ * linux/arch/arm/mach-omap2/board-omap3beagle.c -+ * -+ * Copyright (C) 2007-2008 Texas Instruments -+ * -+ * Modified from mach-omap2/board-generic.c -+ * -+ * Initial code: Syed Mohammed Khasim -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include <linux/kernel.h> -+#include <linux/init.h> -+#include <linux/platform_device.h> -+#include <linux/mtd/mtd.h> -+#include <linux/mtd/partitions.h> -+ -+#include <asm/hardware.h> -+#include <asm/mach-types.h> -+#include <asm/mach/arch.h> -+#include <asm/mach/map.h> -+#include <asm/mach/flash.h> -+ -+#include <asm/arch/gpio.h> -+#include <asm/arch/board.h> -+#include <asm/arch/common.h> -+ -+static struct mtd_partition beagleboard_partitions[] = { -+ /* bootloader (U-Boot, etc) in first sector */ -+ { -+ .name = "bootloader", -+ .offset = 0, -+ .size = SZ_256K, -+ .mask_flags = MTD_WRITEABLE, /* force read-only */ -+ }, -+ /* bootloader params in the next sector */ -+ { -+ .name = "params", -+ .offset = MTDPART_OFS_APPEND, -+ .size = SZ_128K, -+ .mask_flags = 0, -+ }, -+ /* kernel */ -+ { -+ .name = "kernel", -+ .offset = MTDPART_OFS_APPEND, -+ .size = SZ_2M, -+ .mask_flags = 0 -+ }, -+ /* file system */ -+ { -+ .name = "filesystem", -+ .offset = MTDPART_OFS_APPEND, -+ .size = MTDPART_SIZ_FULL, -+ .mask_flags = 0 -+ } -+}; -+ -+static struct flash_platform_data beagleboard_flash_data = { -+ .map_name = "cfi_probe", -+ .width = 2, -+ .parts = beagleboard_partitions, -+ .nr_parts = ARRAY_SIZE(beagleboard_partitions), -+}; -+ -+static struct resource beagleboard_flash_resource = { -+ .start = FLASH_BASE, -+ .end = FLASH_BASE + SZ_64M - 1, -+ .flags = IORESOURCE_MEM, -+}; -+ -+static struct platform_device beagleboard_flash_device = { -+ .name = "omapflash", -+ .id = 0, -+ .dev = { -+ .platform_data = &beagleboard_flash_data, -+ }, -+ .num_resources = 1, -+ .resource = &beagleboard_flash_resource, -+}; -+ -+static struct platform_device *beagleboard_devices[] = { -+ &beagleboard_flash_device, -+}; -+ -+static void __init beagleboard_init_irq(void) -+{ -+ omap2_init_common_hw(); -+ omap_init_irq(); -+ omap_gpio_init(); -+} -+ -+static struct omap_uart_config beagleboard_uart_config __initdata = { -+ .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), -+}; -+ -+static struct omap_board_config_kernel beagleboard_config[] __initdata = { -+ { OMAP_TAG_UART, &beagleboard_uart_config }, -+}; -+static int __init beagleboard_i2c_init(void) -+{ -+ omap_register_i2c_bus(1, 2600, NULL, 0); -+ omap_register_i2c_bus(2, 400, NULL, 0); -+ omap_register_i2c_bus(3, 400, NULL, 0); -+ return 0; -+} -+ -+static void __init beagleboard_init(void) -+{ -+ platform_add_devices(beagleboard_devices, -+ ARRAY_SIZE(beagleboard_devices)); -+ omap_board_config = beagleboard_config; -+ omap_board_config_size = ARRAY_SIZE(beagleboard_config); -+ omap_serial_init(); -+} -+ -+static void __init beagleboard_map_io(void) -+{ -+ omap2_set_globals_343x(); -+ omap2_map_common_io(); -+} -+arch_initcall(beagleboard_i2c_init); -+ -+MACHINE_START(OMAP3_BEAGLE, "OMAP3 BEAGLE board") -+ /* Maintainer: Syed Khasim - Texas Instruments Inc */ -+ .phys_io = 0x48000000, -+ .io_pg_offst = ((0xd8000000) >> 18) & 0xfffc, -+ .boot_params = 0x80000100, -+ .map_io = beagleboard_map_io, -+ .init_irq = beagleboard_init_irq, -+ .init_machine = beagleboard_init, -+ .timer = &omap_timer, -+MACHINE_END -Index: linux-osk/include/asm-arm/arch-omap/board-omap3beagle.h -=================================================================== ---- /dev/null -+++ linux-osk/include/asm-arm/arch-omap/board-omap3beagle.h -@@ -0,0 +1,54 @@ -+/* -+ * linux/include/asm-arm/arch-omap/board-omap3beagle.h -+ * -+ * Hardware definitions for TI OMAP3530 beagle board. -+ * -+ * Initial creation by Syed Mohammed Khasim -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License as published by the -+ * Free Software Foundation; either version 2 of the License, or (at your -+ * option) any later version. -+ * -+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED -+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN -+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 675 Mass Ave, Cambridge, MA 02139, USA. -+ */ -+ -+#ifndef __ASM_ARCH_OMAP_3530BEAGLE_H -+#define __ASM_ARCH_OMAP_3530BEAGLE_H -+ -+#define FLASH_BASE 0x04000000 /* NOR flash (64 Meg aligned) */ -+#define NAND_BASE 0x0C000000 /* NAND flash */ -+#define ONENAND_MAP 0x20000000 /* OneNand flash */ -+ -+#ifdef CONFIG_TWL4030_CORE -+ -+#define TWL4030_IRQNUM INT_34XX_SYS_NIRQ -+ -+/* TWL4030 Primary Interrupt Handler (PIH) interrupts */ -+#define IH_TWL4030_BASE IH_BOARD_BASE -+#define IH_TWL4030_END (IH_TWL4030_BASE+8) -+ -+#ifdef CONFIG_TWL4030_GPIO -+ -+/* TWL4030 GPIO Interrupts */ -+#define IH_TWL4030_GPIO_BASE (IH_TWL4030_END) -+#define IH_TWL4030_GPIO_END (IH_TWL4030_BASE+18) -+#define NR_IRQS (IH_TWL4030_GPIO_END) -+#else -+#define NR_IRQS (IH_TWL4030_END) -+#endif /* CONFIG_I2C_TWL4030_GPIO */ -+#endif /* End of support for TWL4030 */ -+#endif /* __ASM_ARCH_OMAP_3530BEAGLE_H */ -Index: linux-osk/include/asm-arm/arch-omap/hardware.h -=================================================================== ---- linux-osk.orig/include/asm-arm/arch-omap/hardware.h -+++ linux-osk/include/asm-arm/arch-omap/hardware.h -@@ -335,6 +335,10 @@ - #include "board-3430sdp.h" - #endif - -+#ifdef CONFIG_MACH_OMAP3_BEAGLE -+#include "board-omap3beagle.h" -+#endif -+ - #ifdef CONFIG_MACH_OMAP_APOLLON - #include "board-apollon.h" - #endif -Index: linux-osk/Makefile -=================================================================== ---- linux-osk.orig/Makefile -+++ linux-osk/Makefile -@@ -196,7 +196,7 @@ SUBARCH := arm - # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile - export KBUILD_BUILDHOST := $(SUBARCH) - ARCH ?= $(SUBARCH) --CROSS_COMPILE ?= arm-linux- -+CROSS_COMPILE ?= arm-none-linux-gnueabi- - - # Architecture as present in compile.h - UTS_MACHINE := $(ARCH) -Index: linux-osk/arch/arm/mach-omap2/Makefile -=================================================================== ---- linux-osk.orig/arch/arm/mach-omap2/Makefile -+++ linux-osk/arch/arm/mach-omap2/Makefile -@@ -34,6 +34,7 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += boar - board-sdp-hsmmc.o \ - board-3430sdp-usb.o \ - board-3430sdp-flash.o -+obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o - obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o \ - board-apollon-mmc.o \ - board-apollon-keys.o diff --git a/packages/linux/linux-omap2-git/beagleboard/beagle-kconfig-makefile.diff b/packages/linux/linux-omap2-git/beagleboard/beagle-kconfig-makefile.diff deleted file mode 100644 index 804ed92858..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/beagle-kconfig-makefile.diff +++ /dev/null @@ -1,38 +0,0 @@ - -Updated Kconfig and Makefile to add OMAP3 Beagle Board - -Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> ---- - arch/arm/mach-omap2/Kconfig | 4 ++++ - arch/arm/mach-omap2/Makefile | 1 + - 2 files changed, 5 insertions(+) - -Index: my_branch/arch/arm/mach-omap2/Kconfig -=================================================================== ---- my_branch.orig/arch/arm/mach-omap2/Kconfig 2008-04-16 14:41:28.000000000 +0530 -+++ my_branch/arch/arm/mach-omap2/Kconfig 2008-04-16 14:45:38.000000000 +0530 -@@ -109,3 +109,7 @@ - config MACH_OMAP3EVM - bool "OMAP 3530 EVM board" - depends on ARCH_OMAP3 && ARCH_OMAP34XX -+ -+config MACH_OMAP3_BEAGLE -+ bool "OMAP3 BEAGLE board" -+ depends on ARCH_OMAP3 && ARCH_OMAP34XX - -Index: my_branch/arch/arm/mach-omap2/Makefile -=================================================================== ---- my_branch.orig/arch/arm/mach-omap2/Makefile 2008-04-16 14:41:28.000000000 +0530 -+++ my_branch/arch/arm/mach-omap2/Makefile 2008-04-16 14:45:38.000000000 +0530 -@@ -35,6 +35,7 @@ - board-3430sdp-usb.o \ - board-3430sdp-flash.o - obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o -+obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o - obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o \ - board-apollon-mmc.o \ - board-apollon-keys.o --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html
\ No newline at end of file diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 81464fd6ce..135e9c48d2 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.25-omap1 -# Mon Apr 21 08:54:46 2008 +# Wed Apr 30 11:44:55 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -31,7 +31,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y -CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y @@ -65,12 +64,12 @@ CONFIG_UID16=y # CONFIG_SYSCTL_SYSCALL is not set CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set -CONFIG_KALLSYMS_EXTRA_PASS=y +# CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_COMPAT_BRK=y +# CONFIG_ELF_CORE is not set +# CONFIG_COMPAT_BRK is not set CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_ANON_INODES=y @@ -113,11 +112,11 @@ CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y -CONFIG_DEFAULT_AS=y +# CONFIG_DEFAULT_AS is not set # CONFIG_DEFAULT_DEADLINE is not set -# CONFIG_DEFAULT_CFQ is not set +CONFIG_DEFAULT_CFQ=y # CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="anticipatory" +CONFIG_DEFAULT_IOSCHED="cfq" CONFIG_CLASSIC_RCU=y # @@ -147,7 +146,7 @@ CONFIG_CLASSIC_RCU=y # CONFIG_ARCH_KS8695 is not set # CONFIG_ARCH_NS9XXX is not set # CONFIG_ARCH_MXC is not set -# CONFIG_ARCH_ORION is not set +# CONFIG_ARCH_ORION5X is not set # CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set @@ -171,6 +170,8 @@ CONFIG_ARCH_OMAP3=y # OMAP Feature Selections # CONFIG_OMAP_DEBUG_SRAM_PATCH=y +# CONFIG_OMAP_DEBUG_POWERDOMAIN is not set +# CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set # CONFIG_OMAP_RESET_CLOCKS is not set CONFIG_OMAP_BOOT_TAG=y CONFIG_OMAP_BOOT_REASON=y @@ -193,8 +194,8 @@ CONFIG_ARCH_OMAP3430=y # # OMAP Board Type # -CONFIG_MACH_OMAP_3430SDP=y -CONFIG_MACH_OMAP3EVM=y +# CONFIG_MACH_OMAP_3430SDP is not set +# CONFIG_MACH_OMAP3EVM is not set CONFIG_MACH_OMAP3_BEAGLE=y # @@ -226,7 +227,7 @@ CONFIG_CPU_CP15_MMU=y # Processor Features # CONFIG_ARM_THUMB=y -# CONFIG_ARM_XENON is not set +# CONFIG_ARM_THUMBEE is not set # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set @@ -247,7 +248,7 @@ CONFIG_TICK_ONESHOT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_PREEMPT=y +# CONFIG_PREEMPT is not set CONFIG_HZ=128 CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set @@ -386,8 +387,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET6_XFRM_MODE_BEET=m # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set CONFIG_IPV6_SIT=m +CONFIG_IPV6_NDISC_NODETYPE=y # CONFIG_IPV6_TUNNEL is not set # CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set # CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set # CONFIG_IP_DCCP is not set @@ -451,7 +454,6 @@ CONFIG_MAC80211=y # Rate control algorithm selection # CONFIG_MAC80211_RC_DEFAULT_PID=y -# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set # CONFIG_MAC80211_RC_DEFAULT_NONE is not set # @@ -463,7 +465,7 @@ CONFIG_MAC80211_RC_DEFAULT_PID=y # CONFIG_MAC80211_RC_DEFAULT="pid" CONFIG_MAC80211_RC_PID=y -# CONFIG_MAC80211_RC_SIMPLE is not set +# CONFIG_MAC80211_MESH is not set # CONFIG_MAC80211_LEDS is not set # CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set # CONFIG_MAC80211_DEBUG is not set @@ -472,8 +474,6 @@ CONFIG_IEEE80211=y CONFIG_IEEE80211_CRYPT_WEP=y CONFIG_IEEE80211_CRYPT_CCMP=y CONFIG_IEEE80211_CRYPT_TKIP=y -CONFIG_IEEE80211_SOFTMAC=y -# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set @@ -679,6 +679,7 @@ CONFIG_USB_ZD1201=m # CONFIG_USB_NET_RNDIS_WLAN is not set # CONFIG_RTL8187 is not set # CONFIG_P54_COMMON is not set +# CONFIG_IWLWIFI_LEDS is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -758,7 +759,6 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_TWL4030 is not set # CONFIG_KEYBOARD_LM8323 is not set # CONFIG_KEYBOARD_GPIO is not set CONFIG_INPUT_MOUSE=y @@ -827,13 +827,6 @@ 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 @@ -844,6 +837,7 @@ CONFIG_I2C_OMAP=y # CONFIG_I2C_TAOS_EVM is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_TINY_USB is not set +# CONFIG_I2C_PCA_PLATFORM is not set # # Miscellaneous I2C Chip support @@ -860,8 +854,8 @@ CONFIG_TWL4030_CORE=y CONFIG_TWL4030_GPIO=y # CONFIG_TWL4030_MADC is not set CONFIG_TWL4030_USB=y -# CONFIG_TWL4030_PWRBUTTON is not set CONFIG_TWL4030_USB_HS_ULPI=y +CONFIG_TWL4030_PWRBUTTON=y # CONFIG_TWL4030_POWEROFF is not set # CONFIG_SENSORS_MAX6875 is not set # CONFIG_SENSORS_TSL2550 is not set @@ -939,15 +933,18 @@ CONFIG_SSB_POSSIBLE=y # # CONFIG_MFD_SM501 is not set # CONFIG_MFD_ASIC3 is not set +# CONFIG_HTC_EGPIO is not set +# CONFIG_HTC_PASIC3 is not set # # Multimedia devices # CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_COMMON=y -# CONFIG_VIDEO_V4L1 is not set +CONFIG_VIDEO_ALLOW_V4L1=y CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L1=y CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set @@ -977,11 +974,21 @@ CONFIG_VIDEO_WM8775=m # # Video decoders # +# CONFIG_VIDEO_BT819 is not set +# CONFIG_VIDEO_BT856 is not set +# CONFIG_VIDEO_BT866 is not set +# CONFIG_VIDEO_KS0127 is not set # CONFIG_VIDEO_OV7670 is not set # CONFIG_VIDEO_TCM825X is not set # CONFIG_VIDEO_OV9640 is not set +# CONFIG_VIDEO_SAA7110 is not set +# CONFIG_VIDEO_SAA7111 is not set +# CONFIG_VIDEO_SAA7114 is not set CONFIG_VIDEO_SAA711X=m +# CONFIG_VIDEO_SAA717X is not set +# CONFIG_VIDEO_SAA7191 is not set # CONFIG_VIDEO_TVP5150 is not set +# CONFIG_VIDEO_VPX3220 is not set # # Video and audio decoders @@ -997,6 +1004,9 @@ CONFIG_VIDEO_CX2341X=m # Video encoders # # CONFIG_VIDEO_SAA7127 is not set +# CONFIG_VIDEO_SAA7185 is not set +# CONFIG_VIDEO_ADV7170 is not set +# CONFIG_VIDEO_ADV7175 is not set # # Video improvement chips @@ -1004,22 +1014,39 @@ CONFIG_VIDEO_CX2341X=m # CONFIG_VIDEO_UPD64031A is not set # CONFIG_VIDEO_UPD64083 is not set CONFIG_VIDEO_VIVI=m +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_SAA5246A=m CONFIG_VIDEO_SAA5249=m +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_AU0828 is not set CONFIG_V4L_USB_DRIVERS=y CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR=y CONFIG_VIDEO_PVRUSB2_ONAIR_USB2=y CONFIG_VIDEO_PVRUSB2_SYSFS=y +# CONFIG_VIDEO_PVRUSB2_DVB is not set # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_EM28XX_ALSA=m +# CONFIG_VIDEO_EM28XX_DVB is not set CONFIG_VIDEO_USBVISION=m +# CONFIG_USB_VICAM is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_QUICKCAM_MESSENGER is not set CONFIG_USB_ET61X251=m +# CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_USB_W9968CF is not set +# CONFIG_USB_OV511 is not set +# CONFIG_USB_SE401 is not set CONFIG_USB_SN9C102=m +# CONFIG_USB_STV680 is not set CONFIG_USB_ZC0301=m +# CONFIG_USB_PWC is not set CONFIG_USB_ZR364XX=m CONFIG_USB_STKWEBCAM=m +# CONFIG_SOC_CAMERA is not set # CONFIG_RADIO_ADAPTERS is not set CONFIG_DVB_CORE=m CONFIG_DVB_CORE_ATTACH=y @@ -1098,6 +1125,7 @@ CONFIG_DVB_DIB3000MB=m CONFIG_DVB_DIB3000MC=m CONFIG_DVB_DIB7000M=m CONFIG_DVB_DIB7000P=m +# CONFIG_DVB_TDA10048 is not set # # DVB-C (cable) frontends @@ -1116,6 +1144,7 @@ CONFIG_DVB_OR51132=m CONFIG_DVB_BCM3510=m CONFIG_DVB_LGDT330X=m CONFIG_DVB_S5H1409=m +# CONFIG_DVB_AU8522 is not set # # Tuners/PLL support @@ -1130,11 +1159,13 @@ CONFIG_DVB_TUNER_MT2266=m CONFIG_DVB_TUNER_MT2131=m CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_TUNER_XC5000=m +# CONFIG_DVB_TUNER_ITD1000 is not set # # Miscellaneous devices # CONFIG_DVB_LNBP21=m +# CONFIG_DVB_ISL6405 is not set CONFIG_DVB_ISL6421=m CONFIG_DVB_TUA6100=m CONFIG_VIDEO_TUNER=m @@ -1219,11 +1250,13 @@ CONFIG_SND_TIMER=y CONFIG_SND_PCM=y CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m -# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_SEQUENCER=m +# CONFIG_SND_SEQ_DUMMY 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_SEQUENCER_OSS is not set # CONFIG_SND_DYNAMIC_MINORS is not set CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_VERBOSE_PROCFS=y @@ -1234,6 +1267,7 @@ CONFIG_SND_VERBOSE_PROCFS=y # Generic devices # # CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set @@ -1245,7 +1279,7 @@ CONFIG_SND_VERBOSE_PROCFS=y # CONFIG_SND_OMAP_TSC2101 is not set # CONFIG_SND_SX1 is not set # CONFIG_SND_OMAP_TSC2102 is not set -CONFIG_SND_OMAP24XX_EAC=y +# CONFIG_SND_OMAP24XX_EAC is not set # # SPI devices @@ -1264,12 +1298,13 @@ CONFIG_SND_USB_CAIAQ=m CONFIG_SND_SOC=y # -# SoC Audio support for SuperH +# ALSA SoC audio for Freescale SOCs # # -# ALSA SoC audio for Freescale SOCs +# SoC Audio for the Texas Instruments OMAP # +CONFIG_SND_OMAP_SOC=y # # Open Sound System @@ -1308,7 +1343,7 @@ CONFIG_USB_SUSPEND=y # # USB Host Controller Drivers # -CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD=m CONFIG_OMAP_EHCI_PHY_MODE=y # CONFIG_OMAP_EHCI_TLL_MODE is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y @@ -1430,7 +1465,7 @@ CONFIG_USB_LED=m # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_APPLEDISPLAY is not set -CONFIG_USB_SISUSBVGA=y +CONFIG_USB_SISUSBVGA=m CONFIG_USB_SISUSBVGA_CON=y # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set @@ -1547,6 +1582,7 @@ CONFIG_RTC_DRV_TWL4030=y # # on-CPU RTC drivers # +# CONFIG_UIO is not set # # CBUS support @@ -1633,7 +1669,6 @@ 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 is not set CONFIG_ROOT_NFS=y CONFIG_LOCKD=y @@ -1730,7 +1765,6 @@ 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 @@ -1741,9 +1775,10 @@ CONFIG_DEBUG_MUTEXES=y # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_DEBUG_INFO=y +CONFIG_DEBUG_BUGVERBOSE=y +# CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_WRITECOUNT is not set # CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_SG is not set CONFIG_FRAME_POINTER=y @@ -1753,7 +1788,7 @@ CONFIG_FRAME_POINTER=y # CONFIG_FAULT_INJECTION is not set # CONFIG_SAMPLES is not set # CONFIG_DEBUG_USER is not set -# CONFIG_DEBUG_ERRORS is not set +CONFIG_DEBUG_ERRORS=y # CONFIG_DEBUG_STACK_USAGE is not set CONFIG_DEBUG_LL=y # CONFIG_DEBUG_ICEDCC is not set @@ -1769,53 +1804,82 @@ CONFIG_ASYNC_CORE=m CONFIG_ASYNC_MEMCPY=m CONFIG_ASYNC_XOR=m CONFIG_CRYPTO=y + +# +# Crypto core or helper +# CONFIG_CRYPTO_ALGAPI=y CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_BLKCIPHER=y -# CONFIG_CRYPTO_SEQIV is not set CONFIG_CRYPTO_HASH=m CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_CRYPTD=m +# CONFIG_CRYPTO_AUTHENC is not set +CONFIG_CRYPTO_TEST=m + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +CONFIG_CRYPTO_CBC=y +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_PCBC=m +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# CONFIG_CRYPTO_HMAC=m CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_NULL=m + +# +# Digest +# +CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=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=y -CONFIG_CRYPTO_CBC=y -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_LRW=m -# CONFIG_CRYPTO_XTS is not set -# CONFIG_CRYPTO_CTR is not set -# CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_CCM is not set -CONFIG_CRYPTO_CRYPTD=m -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_WP512=m + +# +# Ciphers +# CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_ANUBIS=m -# CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m + +# +# Compression +# CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_MICHAEL_MIC=y -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_TEST=m -# CONFIG_CRYPTO_AUTHENC is not set # CONFIG_CRYPTO_LZO is not set CONFIG_CRYPTO_HW=y @@ -1824,7 +1888,7 @@ CONFIG_CRYPTO_HW=y # CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=y -# CONFIG_CRC16 is not set +CONFIG_CRC16=m CONFIG_CRC_ITU_T=y CONFIG_CRC32=y CONFIG_CRC7=y diff --git a/packages/linux/linux-omap2-git/beagleboard/l2-cache.patch b/packages/linux/linux-omap2-git/beagleboard/l2-cache.patch new file mode 100644 index 0000000000..7e93c29036 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/l2-cache.patch @@ -0,0 +1,38 @@ +diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig +index 15066c2..70f85c1 100644 +--- a/arch/arm/mm/Kconfig ++++ b/arch/arm/mm/Kconfig +@@ -665,6 +665,12 @@ config CPU_CACHE_ROUND_ROBIN + Say Y here to use the predictable round-robin cache replacement + policy. Unless you specifically require this or are unsure, say N. + ++config CPU_L2CACHE_DISABLE ++ bool "Disable level 2 cache" ++ depends on CPU_V7 ++ help ++ Say Y here to disable the level 2 cache. If unsure, say N. ++ + config CPU_BPREDICT_DISABLE + bool "Disable branch prediction" + depends on CPU_ARM1020 || CPU_V6 || CPU_XSC3 || CPU_V7 +diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S +index a1d7331..432ddab 100644 +--- a/arch/arm/mm/proc-v7.S ++++ b/arch/arm/mm/proc-v7.S +@@ -181,6 +181,16 @@ __v7_setup: + mcr p15, 0, r4, c2, c0, 1 @ load TTB1 + mov r10, #0x1f @ domains 0, 1 = manager + mcr p15, 0, r10, c3, c0, 0 @ load domain access register ++#ifndef CONFIG_CPU_L2CACHE_DISABLE ++ @ L2 cache configuration in the L2 aux control register ++ mrc p15, 1, r10, c9, c0, 2 ++ bic r10, r10, #(1 << 16) @ L2 outer cache ++ mcr p15, 1, r10, c9, c0, 2 ++ @ L2 cache is enabled in the aux control register ++ mrc p15, 0, r10, c1, c0, 1 ++ orr r10, r10, #2 ++ mcr p15, 0, r10, c1, c0, 1 ++#endif + #endif + adr r5, v7_crval + ldmia r5, {r5, r6} diff --git a/packages/linux/linux-omap2-git/beagleboard/no-harry-potter.diff b/packages/linux/linux-omap2-git/beagleboard/no-harry-potter.diff new file mode 100644 index 0000000000..2bb20ab9c0 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/no-harry-potter.diff @@ -0,0 +1,11 @@ +--- /tmp/Makefile 2008-04-24 14:36:20.509598016 +0200 ++++ git/arch/arm/Makefile 2008-04-24 14:36:31.949546584 +0200 +@@ -47,7 +47,7 @@ + # Note that GCC does not numerically define an architecture version + # macro, but instead defines a whole series of macros which makes + # testing for a specific architecture or later rather impossible. +-arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7a,-march=armv5t -Wa$(comma)-march=armv7a) ++arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a) + arch-$(CONFIG_CPU_32v6) :=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6) + # Only override the compiler option if ARMv6. The ARMv6K extensions are + # always available in ARMv7 diff --git a/packages/linux/linux-omap2-git/beagleboard/usb-timout.patch b/packages/linux/linux-omap2-git/beagleboard/usb-timout.patch new file mode 100644 index 0000000000..2d1797cb66 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/usb-timout.patch @@ -0,0 +1,11 @@ +--- /tmp/ehci-hub.c 2008-04-30 11:41:59.381876290 +0200 ++++ git/drivers/usb/host/ehci-hub.c 2008-04-30 11:42:20.522875367 +0200 +@@ -734,7 +734,7 @@ + * this bit; seems too long to spin routinely... + */ + retval = handshake(ehci, status_reg, +- PORT_RESET, 0, 750); ++ PORT_RESET, 0, 1250); + if (retval != 0) { + ehci_err (ehci, "port %d reset error %d\n", + wIndex + 1, retval); diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index 4bf3c2a0ce..71bd173541 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -2,27 +2,18 @@ require linux-omap.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}" -SRCREV = "e015fc7dba8f5002daa0982eb81d33cc72e68e95" +SRCREV = "547ba9200727d2334f779cbf46ab62accb1281aa" -# The e105fc commit is the merge of 2.6.25 into the omap tree, so we leave of the +git part of PV -#PV = "2.6.25+git${SRCREV}" -PV = "2.6.25" -PR = "r5" +PV = "2.6.25+git${SRCREV}" +PR = "r8" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ - file://defconfig" - -SRC_URI_append_beagleboard = " \ - file://2-update-omap3evm-kconfig.patch;patch=1 \ - file://3-omap3evm-board.patch;patch=1 \ - file://4-omap3evm-config.patch;patch=1 \ - file://5-omap3evm-header.patch;patch=1 \ - file://beagle-board-file.diff;patch=1 \ - file://beagle-board-header.diff;patch=1 \ - file://beagle-kconfig-makefile.diff;patch=1 \ - file://add-beagle-sd-support.diff;patch=1 \ - file://add-beagle-usb-support.diff;patch=1 \ + file://defconfig" + +SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ + file://usb-timout.patch;patch=1 \ +# file://l2-cache.patch;patch=1 \ " COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard" diff --git a/packages/linux/linux-rp-2.6.24/defconfig-qemux86 b/packages/linux/linux-rp-2.6.24/defconfig-qemux86 index c143746db8..b91171b1f2 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-qemux86 +++ b/packages/linux/linux-rp-2.6.24/defconfig-qemux86 @@ -336,7 +336,7 @@ CONFIG_NET=y # # Networking options # -CONFIG_PACKET=m +CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb index 62dca60e2a..3a8eb63eb4 100644 --- a/packages/linux/linux-rp_2.6.24.bb +++ b/packages/linux/linux-rp_2.6.24.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r9" +PR = "r10" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index a13ace3fac..8dfa25c17a 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -23,6 +23,7 @@ CMDLINE_append = " ${CMDLINE_DEBUG} " KERNEL_DEVICETREE_mpc8313e-rdb = "arch/${ARCH}/boot/dts/mpc8313erdb.dts" KERNEL_DEVICETREE_mpc8323e-rdb = "arch/${ARCH}/boot/dts/mpc832x_rdb.dts" KERNEL_DEVICETREE_kilauea = "arch/${ARCH}/boot/dts/kilauea.dts" +KERNEL_DEVICETREE_sequoia = "arch/${ARCH}/boot/dts/sequoia.dts" KERNEL_DEVICETREE_FLAGS = "-R 8 -S 0x3000" diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb index 4c84ffe7ac..63910cb888 100644 --- a/packages/linux/linux_2.6.25.bb +++ b/packages/linux/linux_2.6.25.bb @@ -4,6 +4,7 @@ require linux.inc DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_mpc8313e-rdb = "1" DEFAULT_PREFERENCE_kilauea = "1" +DEFAULT_PREFERENCE_sequoia = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \ file://defconfig" diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc index c6bee78e22..be2b889da7 100644 --- a/packages/madwifi/madwifi-ng_r.inc +++ b/packages/madwifi/madwifi-ng_r.inc @@ -10,7 +10,7 @@ WACKELF_SRC_URI = "" WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch;patch=1" WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf.patch;patch=1" -SRC_URI = "http://snapshots.madwifi.org/${PN}/${PN}-${PV}.tar.gz \ +SRC_URI = "http://snapshots.madwifi.org/madwifi-trunk/${PN}-${PV}.tar.gz \ file://10-xscale-be-elf-copts.patch;patch=1 \ file://10-xscale-le-elf-copts.patch;patch=1 \ file://10-sh4-le-elf-copts.patch;patch=1 \ diff --git a/packages/madwifi/madwifi-ng_r1844-20061208.bb b/packages/madwifi/madwifi-ng_r1844-20061208.bb deleted file mode 100644 index 42d8ccafe4..0000000000 --- a/packages/madwifi/madwifi-ng_r1844-20061208.bb +++ /dev/null @@ -1,3 +0,0 @@ -PR = "r0" - -require madwifi-ng_r.inc diff --git a/packages/madwifi/madwifi-ng_r2100-20070210.bb b/packages/madwifi/madwifi-ng_r2100-20070210.bb deleted file mode 100644 index 42d8ccafe4..0000000000 --- a/packages/madwifi/madwifi-ng_r2100-20070210.bb +++ /dev/null @@ -1,3 +0,0 @@ -PR = "r0" - -require madwifi-ng_r.inc diff --git a/packages/madwifi/madwifi-ng_r2156-20070225.bb b/packages/madwifi/madwifi-ng_r2156-20070225.bb deleted file mode 100644 index 42d8ccafe4..0000000000 --- a/packages/madwifi/madwifi-ng_r2156-20070225.bb +++ /dev/null @@ -1,3 +0,0 @@ -PR = "r0" - -require madwifi-ng_r.inc diff --git a/packages/madwifi/madwifi-ng_r2182-20070308.bb b/packages/madwifi/madwifi-ng_r2182-20070308.bb deleted file mode 100644 index 42d8ccafe4..0000000000 --- a/packages/madwifi/madwifi-ng_r2182-20070308.bb +++ /dev/null @@ -1,3 +0,0 @@ -PR = "r0" - -require madwifi-ng_r.inc diff --git a/packages/madwifi/madwifi-ng_r2187-20070309.bb b/packages/madwifi/madwifi-ng_r2187-20070309.bb deleted file mode 100644 index 42d8ccafe4..0000000000 --- a/packages/madwifi/madwifi-ng_r2187-20070309.bb +++ /dev/null @@ -1,3 +0,0 @@ -PR = "r0" - -require madwifi-ng_r.inc diff --git a/packages/madwifi/madwifi-ng_r2518-20070626.bb b/packages/madwifi/madwifi-ng_r2518-20070626.bb deleted file mode 100644 index 9f042ac926..0000000000 --- a/packages/madwifi/madwifi-ng_r2518-20070626.bb +++ /dev/null @@ -1,7 +0,0 @@ -PR = "r0" - -# Disable stripping of kernel modules, since this action strips too -# much out, and the resulting module won't load. -INHIBIT_PACKAGE_STRIP = "1" - -require madwifi-ng_r.inc diff --git a/packages/madwifi/madwifi-ng_r2702-20070903.bb b/packages/madwifi/madwifi-ng_r2702-20070903.bb deleted file mode 100644 index 627d4f52b5..0000000000 --- a/packages/madwifi/madwifi-ng_r2702-20070903.bb +++ /dev/null @@ -1,13 +0,0 @@ -# Bitbake recipe for the madwifi-ng driver - -# Don't use this unless you know what you're doing -- this version does -# *NOT* build on BE kernels. - -# Disable stripping of kernel modules, since this action strips too -# much out, and the resulting module won't load. -INHIBIT_PACKAGE_STRIP = "1" - -require madwifi-ng_r.inc - -# PR set after the include, to override what's set in the included file. -PR = "r0" diff --git a/packages/madwifi/madwifi-ng_r3314-20080131.bb b/packages/madwifi/madwifi-ng_r3314-20080131.bb index d47a0959a8..fb5cde036f 100644 --- a/packages/madwifi/madwifi-ng_r3314-20080131.bb +++ b/packages/madwifi/madwifi-ng_r3314-20080131.bb @@ -1,8 +1,5 @@ # Bitbake recipe for the madwifi-ng driver -DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_ixp4xx = "1" - # Disable stripping of kernel modules, since this action strips too # much out, and the resulting module won't load. INHIBIT_PACKAGE_STRIP = "1" diff --git a/packages/make/make.inc b/packages/make/make.inc index 31223cbbf1..8a43f40a24 100644 --- a/packages/make/make.inc +++ b/packages/make/make.inc @@ -9,3 +9,11 @@ SRC_URI = "${GNU_MIRROR}/make/make-${PV}.tar.bz2 \ file://SCCS.patch;patch=1" inherit autotools + +do_configure_prepend() { + if [ "${TARGET_OS}" = "linux-uclibc" -o "${TARGET_OS}" = "linux-uclibcgnueabi" ]; then + export make_cv_sys_gnu_glob="no" + export GLOBINC=-I`pwd`/glob + export GLOBLIB=glob/libglob.a + fi +} diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 5401237c49..80be619311 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 = "r50" +PR = "r53" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -50,6 +50,7 @@ SLUGOS_PACKAGES = "\ bluez-utils \ bluez-hcidump \ bogofilter \ + bonnie++ \ boost \ bridge-utils \ bzip2 \ @@ -103,6 +104,7 @@ SLUGOS_PACKAGES = "\ hdparm \ ifupdown \ inetutils \ + iozone3 \ iperf \ ipkg-utils \ iptables \ @@ -176,6 +178,7 @@ SLUGOS_PACKAGES = "\ openobex-apps \ openntpd \ openobex \ + openocd \ openssh \ openvpn \ patch \ @@ -216,6 +219,7 @@ SLUGOS_PACKAGES = "\ sudo \ sysfsutils \ tar \ + task-mokogateway-everything \ tcpdump \ thttpd \ tiff \ @@ -262,7 +266,6 @@ SLUGOS_BROKEN_PACKAGES = "\ pwc \ qc-usb-messenger \ syslog-ng \ - openocd task-mokogateway-everything \ task-native-sdk \ unionfs-modules unionfs-utils \ wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \ diff --git a/packages/mozilla/minimo/bug-322806.diff b/packages/mozilla/minimo/bug-322806.diff index e001e3fc67..c3e0ec2e9c 100644 --- a/packages/mozilla/minimo/bug-322806.diff +++ b/packages/mozilla/minimo/bug-322806.diff @@ -1,4 +1,4 @@ -See https://bugzilla.mozilla.org/show_bug.cgi?id=322806 and http://bugs.openembedded.org/show_bug.cgi?id=1600 +See https://bugzilla.mozilla.org/show_bug.cgi?id=322806 and http://bugs.openembedded.net/show_bug.cgi?id=1600 --- /tmp/xptcinvoke_arm.cpp 2006-12-10 20:02:57.000000000 +0100 +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp 2006-12-10 20:03:54.592227000 +0100 diff --git a/packages/netbase/netbase/mpc8313e-rdb/.mtn2git_empty b/packages/netbase/netbase/mpc8313e-rdb/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/netbase/netbase/mpc8313e-rdb/.mtn2git_empty diff --git a/packages/netbase/netbase/mpc8313e-rdb/interfaces b/packages/netbase/netbase/mpc8313e-rdb/interfaces new file mode 100644 index 0000000000..64d65e3ad9 --- /dev/null +++ b/packages/netbase/netbase/mpc8313e-rdb/interfaces @@ -0,0 +1,16 @@ +# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) + +# The loopback interface +auto lo +iface lo inet loopback + +# Wired interface +auto eth1 +iface eth1 inet dhcp + +# Wireless interface +auto ath0 +iface ath0 inet static + address 192.168.99.1 + netmask 255.255.255.0 + diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb index 2815324521..d5c5ba05cd 100644 --- a/packages/openocd/openocd_svn.bb +++ b/packages/openocd/openocd_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Bounda HOMEPAGE = "http://openocd.berlios.de/" LICENSE = "GPL" PV = "0.0+r${SRCREV}" -PR = "r1" +PR = "r2" inherit autotools @@ -10,4 +10,5 @@ SRC_URI = "svn://svn.berlios.de/openocd;module=trunk \ file://openocd-link-static.patch;patch=1" S = "${WORKDIR}/trunk" +DEPENDS = "libftdi" EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx" diff --git a/packages/opkg/opkg_svn.bb b/packages/opkg/opkg_svn.bb index 81401dda14..58aaf748ab 100644 --- a/packages/opkg/opkg_svn.bb +++ b/packages/opkg/opkg_svn.bb @@ -1,6 +1,6 @@ require opkg.inc -PR = "r3" +PR = "r4" PACKAGES =+ "libopkg-dev libopkg" @@ -12,7 +12,7 @@ FILES_libopkg = "${libdir}/*.so.*" OPKG_INIT_POSITION = "98" OPKG_INIT_POSITION_slugos = "41" -pkg_postinst_opkg () { +pkg_postinst_${PN} () { #!/bin/sh if [ "x$D" != "x" ]; then install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d @@ -26,7 +26,7 @@ fi update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100 } -pkg_postrm_opkg () { +pkg_postrm_${PN} () { #!/bin/sh update-alternatives --remove opkg ${bindir}/opkg-cl } diff --git a/packages/perl/files/perl-5.8.8-gcc-4.2.patch b/packages/perl/files/perl-5.8.8-gcc-4.2.patch index d9869e1974..653a4758f4 100644 --- a/packages/perl/files/perl-5.8.8-gcc-4.2.patch +++ b/packages/perl/files/perl-5.8.8-gcc-4.2.patch @@ -1,4 +1,4 @@ -See http://bugs.openembedded.org/show_bug.cgi?id=2168 +See http://bugs.openembedded.net/show_bug.cgi?id=2168 Fix for gcc 4.2 --- perl-5.8.8/makedepend.SH.ark 2006-11-01 16:32:05.000000000 +0100 diff --git a/packages/perl/libwww-perl-native_5.808.bb b/packages/perl/libwww-perl-native_5.808.bb deleted file mode 100644 index 68fdcbbbe5..0000000000 --- a/packages/perl/libwww-perl-native_5.808.bb +++ /dev/null @@ -1,5 +0,0 @@ -SECTION = "libs" - -inherit native - -require libwww-perl_${PV}.bb diff --git a/packages/perl/libwww-perl_5.808.bb b/packages/perl/libwww-perl_5.808.bb deleted file mode 100644 index 2bea48a2d0..0000000000 --- a/packages/perl/libwww-perl_5.808.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "libwww-perl provides a simple and consistent API to the World Wide Web" -SECTION = "libs" -LICENSE = "Artistic" -DEPENDS = "liburi-perl-native" -RDEPENDS = "liburi-perl" -PR = "r1" - -SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz" - -S = "${WORKDIR}/libwww-perl-${PV}" - -inherit cpan diff --git a/packages/perl/perl-5.8.8/native-ssp.patch b/packages/perl/perl-5.8.8/native-ssp.patch index f815aad452..1c825f50d0 100644 --- a/packages/perl/perl-5.8.8/native-ssp.patch +++ b/packages/perl/perl-5.8.8/native-ssp.patch @@ -1,5 +1,5 @@ Fix for compiling with ssp enabled gcc: -See http://bugs.openembedded.org/show_bug.cgi?id=1980 +See http://bugs.openembedded.net/show_bug.cgi?id=1980 diff -Naur perl-5.8.7.orig/cflags.SH perl-5.8.7/cflags.SH --- perl-5.8.7.orig/cflags.SH 2002-09-30 10:59:07.000000000 +0000 diff --git a/packages/popt/popt-native_1.13.bb b/packages/popt/popt-native_1.14.bb index 0124aa8485..54712ab812 100644 --- a/packages/popt/popt-native_1.13.bb +++ b/packages/popt/popt-native_1.14.bb @@ -6,7 +6,7 @@ PR = "r0" inherit native autotools -SRC_URI = "http://freshmeat.net/redir/popt/72854/url_bz2/popt-${PV}.tar.gz" +SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz" S = "${WORKDIR}/popt-${PV}" diff --git a/packages/popt/popt.inc b/packages/popt/popt.inc index 3917805129..bc4da2d2a7 100644 --- a/packages/popt/popt.inc +++ b/packages/popt/popt.inc @@ -1,5 +1,5 @@ DESCRIPTION = "Popt is a C library for parsing command line parameters" -HOMEPAGE = "http://freshmeat.net/projects/popt" +HOMEPAGE = "http://rpm5.org" AUTHOR = "Jeff Johnson" LICENSE = "MIT" SECTION = "libs" diff --git a/packages/popt/popt_1.13.bb b/packages/popt/popt_1.14.bb index 7a736bde87..d78d8dc337 100644 --- a/packages/popt/popt_1.13.bb +++ b/packages/popt/popt_1.14.bb @@ -6,9 +6,8 @@ PR = "r1" inherit autotools -SRC_URI = "http://freshmeat.net/redir/popt/72854/url_bz2/popt-${PV}.tar.gz \ - file://iconv.patch;patch=1 \ - " +SRC_URI = "http://rpm5.org/files/popt/popt-${PV}.tar.gz" + do_stage() { oe_libinstall -a -so libpopt ${STAGING_LIBDIR} diff --git a/packages/postfix/postfix_2.0.20.bb b/packages/postfix/postfix_2.0.20.bb index 280f073333..44e1515f1c 100644 --- a/packages/postfix/postfix_2.0.20.bb +++ b/packages/postfix/postfix_2.0.20.bb @@ -1,7 +1,7 @@ SECTION = "console/network" DEPENDS = "virtual/db libpcre postfix-native" LICENSE = "IPL" -PR = "r11" +PR = "r12" SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \ file://${FILESDIR}/makedefs.patch;patch=1 \ @@ -53,6 +53,7 @@ do_install () { } pkg_postinst () { + update-alternatives --install ${sbindir}/sendmail sendmail sendmail.${PN} 40 grep postfix /etc/group || addgroup postfix grep postdrop /etc/group || addgroup postdrop grep vmail /etc/group || addgroup vmail @@ -69,11 +70,10 @@ pkg_postinst () { /etc/init.d/populate-volatile.sh update touch /etc/aliases newaliases - update-alternatives --install sendmail sendmail ${sbindir}/sendmail.${PN} 40 } pkg_postrm () { - update-alternatives --remove sendmail ${sbindir}/sendmail + update-alternatives --remove sendmail sendmail.${PN} } # Exclude .debug directories from the main package diff --git a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb index 22309f9203..b7c71002af 100644 --- a/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb +++ b/packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb @@ -26,10 +26,12 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ --with-sqlite-libs=${STAGING_LIBDIR} \ --without-athena --enable-dbus \ --with-libiw=${STAGING_EXECPREFIXDIR}" - CFLAGS =+ "-I${S}/include" LDFLAGS += "-lz" +# Ugly hack to find libstdc++ for libgps +EXTRA_OEMAKE_append = 'CCLD="${CXX}"' + FILES_${PN} = "${bindir}/prismstumbler" FILES_prismstumbler-frontend = "${bindir}/psfront ${bindir}/pst \ diff --git a/packages/pth/files/.mtn2git_empty b/packages/pth/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pth/files/.mtn2git_empty diff --git a/packages/pth/files/m4-warning.patch b/packages/pth/files/m4-warning.patch new file mode 100644 index 0000000000..6cdc5bbd61 --- /dev/null +++ b/packages/pth/files/m4-warning.patch @@ -0,0 +1,34 @@ +Index: pth-2.0.2/pth.m4 +=================================================================== +--- pth-2.0.2.orig/pth.m4 2004-09-12 13:40:59.000000000 +0200 ++++ pth-2.0.2/pth.m4 2008-05-03 16:31:46.000000000 +0200 +@@ -40,7 +40,7 @@ + dnl ## + dnl + dnl # auxilliary macros +-AC_DEFUN(_AC_PTH_ERROR, [dnl ++AC_DEFUN([_AC_PTH_ERROR], [dnl + AC_MSG_RESULT([*FAILED*]) + m4_define(_ac_pth_line,dnl + "+------------------------------------------------------------------------+") +@@ -51,13 +51,13 @@ + echo " _ac_pth_line" 1>&2 + exit 1 + ]) +-AC_DEFUN(_AC_PTH_VERBOSE, [dnl ++AC_DEFUN([_AC_PTH_VERBOSE], [dnl + if test ".$verbose" = .yes; then + AC_MSG_RESULT([ $1]) + fi + ]) + dnl # the user macro +-AC_DEFUN(AC_CHECK_PTH, [dnl ++AC_DEFUN([AC_CHECK_PTH], [dnl + dnl + dnl # prerequisites + AC_REQUIRE([AC_PROG_CC])dnl +@@ -399,4 +399,3 @@ + ifelse([$6], , :, [$6]) + fi + ]) +- diff --git a/packages/pth/pth_2.0.2.bb b/packages/pth/pth_2.0.2.bb index 78c06bfd93..81b8a71b63 100644 --- a/packages/pth/pth_2.0.2.bb +++ b/packages/pth/pth_2.0.2.bb @@ -2,9 +2,11 @@ DESCRIPTION = "GNU Portable Threads" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL LGPL FDL" -PR = "r0" +PR = "r1" -SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz" +SRC_URI = "${GNU_MIRROR}/pth/pth-${PV}.tar.gz \ + file://m4-warning.patch;patch=1 \ + " PARALLEL_MAKE="" diff --git a/packages/pulseaudio/pulseaudio-0.9.10/.mtn2git_empty b/packages/pulseaudio/pulseaudio-0.9.10/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pulseaudio/pulseaudio-0.9.10/.mtn2git_empty diff --git a/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch b/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch new file mode 100644 index 0000000000..4234af5f53 --- /dev/null +++ b/packages/pulseaudio/pulseaudio-0.9.10/libpulsedsp-references-libpulsecore.patch @@ -0,0 +1,24 @@ +upstream: http://pulseaudio.org/ticket/287 + +Index: pulseaudio-0.9.10/src/Makefile.am +=================================================================== +--- pulseaudio-0.9.10.orig/src/Makefile.am 2008-03-30 03:43:05.000000000 +0200 ++++ pulseaudio-0.9.10/src/Makefile.am 2008-05-03 11:55:46.000000000 +0200 +@@ -605,7 +605,7 @@ + + libpulsedsp_la_SOURCES = utils/padsp.c + libpulsedsp_la_CFLAGS = $(AM_CFLAGS) +-libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la ++libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecore.la + libpulsedsp_la_LDFLAGS = -avoid-version + + ################################### +@@ -888,7 +888,7 @@ + + libpstream_util_la_SOURCES = pulsecore/pstream-util.c pulsecore/pstream-util.h + libpstream_util_la_LDFLAGS = -avoid-version +-libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la ++libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la libpulsecore.la + + libpdispatch_la_SOURCES = pulsecore/pdispatch.c pulsecore/pdispatch.h + libpdispatch_la_LDFLAGS = -avoid-version diff --git a/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch b/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch new file mode 100644 index 0000000000..74ea6ac060 --- /dev/null +++ b/packages/pulseaudio/pulseaudio-0.9.10/pa-drop-caps-returns-void.patch @@ -0,0 +1,17 @@ +upstream: http://pulseaudio.org/changeset/2213 + +Index: pulseaudio-0.9.10/src/daemon/caps.c +=================================================================== +--- pulseaudio-0.9.10.orig/src/daemon/caps.c 2008-05-03 12:10:26.000000000 +0200 ++++ pulseaudio-0.9.10/src/daemon/caps.c 2008-05-03 12:10:30.000000000 +0200 +@@ -131,9 +131,8 @@ + return 0; + } + +-int pa_drop_caps(void) { ++void pa_drop_caps(void) { + pa_drop_root(); +- return 0; + } + + #endif diff --git a/packages/pulseaudio/pulseaudio_0.9.10.bb b/packages/pulseaudio/pulseaudio_0.9.10.bb new file mode 100644 index 0000000000..5a445a45cb --- /dev/null +++ b/packages/pulseaudio/pulseaudio_0.9.10.bb @@ -0,0 +1,16 @@ +require pulse.inc + +DEPENDS += "dbus" +PR = "r1" + +# this is not correct (see below) +SRC_URI += "\ + file://disable-using-glibc-tls.patch;patch=1 \ + file://libpulsedsp-references-libpulsecore.patch;patch=1 \ + file://pa-drop-caps-returns-void.patch;patch=1 \ +" + +# problems w/ pulseaudio 0.9.10 atm: +# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime) +# 2.) doesn't build w/ glibc TLS support (hence patched out) +# 3.) fails with hierarchical pthread stuff w/ gst-pulse (hence patched out) diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index fda9f4143a..06c187fe91 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Thu Apr 10 16:47:00 2008 +### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Thu May 1 12:24:55 2008 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -68,9 +68,9 @@ RDEPENDS_python-compiler="python-core" FILES_python-compiler="${libdir}/python2.5/compiler " DESCRIPTION_python-compression="Python High Level Compression Support" -PR_python-compression="ml0" +PR_python-compression="ml1" RDEPENDS_python-compression="python-core python-zlib" -FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* " +FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* ${libdir}/python2.5/tarfile.* " DESCRIPTION_python-re="Python Regular Expression APIs" PR_python-re="ml0" diff --git a/packages/python/python-netfilter_0.5.4.bb b/packages/python/python-netfilter_0.5.4.bb new file mode 100644 index 0000000000..5468245a6b --- /dev/null +++ b/packages/python/python-netfilter_0.5.4.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Python module to manage netfilter rules" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "iptables iptables-utils python-logging python-shell python-subprocess" +SRCNAME = "python-netfilter" + +SRC_URI = "http://opensource.bolloretelecom.eu/files/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils diff --git a/packages/python/python-pyrtc_svn.bb b/packages/python/python-pyrtc_git.bb index 60277a029d..e8532711af 100644 --- a/packages/python/python-pyrtc_svn.bb +++ b/packages/python/python-pyrtc_git.bb @@ -6,11 +6,11 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" LICENSE = "GPLv2" SRCNAME = "pyrtc" DEPENDS = "python-cython-native" -PV = "1.0.0+svnr${SRCREV}" +PV = "1.0.0+gitr${SRCREV}" PR = "ml0" -SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=${SRCNAME}" -S = "${WORKDIR}/${SRCNAME}" +SRC_URI = "git://git.freesmartphone.org/python-helpers.git;protocol=git;branch=master" +S = "${WORKDIR}/git/${SRCNAME}" inherit distutils diff --git a/packages/python/python-setuptools-native_0.6c6.bb b/packages/python/python-setuptools-native_0.6c6.bb new file mode 100644 index 0000000000..1b9f90911d --- /dev/null +++ b/packages/python/python-setuptools-native_0.6c6.bb @@ -0,0 +1,8 @@ +require python-setuptools_${PV}.bb + +DEPENDS = "python-native" + +do_stage() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR_NATIVE}/python setup.py install +} diff --git a/packages/python/python-setuptools_0.6c6.bb b/packages/python/python-setuptools_0.6c6.bb index ef56b9b652..721b29961e 100644 --- a/packages/python/python-setuptools_0.6c6.bb +++ b/packages/python/python-setuptools_0.6c6.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "MIT-like" -RDEPENDS = "python-core python-zlib" +RDEPENDS = "python-distutils python-compression" SRCNAME = "setuptools" PR = "ml1" @@ -15,8 +15,3 @@ inherit distutils do_install_prepend() { install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages } - -do_stage() { - BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python setup.py install -} diff --git a/packages/python/python-simplejson_1.7.1.bb b/packages/python/python-simplejson_1.7.1.bb index 129f4fb9eb..67270f2df1 100644 --- a/packages/python/python-simplejson_1.7.1.bb +++ b/packages/python/python-simplejson_1.7.1.bb @@ -3,14 +3,13 @@ HOMEPAGE = "http://cheeseshop.python.org/pypi/simplejson" SECTION = "devel/python" PRIORITY = "optional" LICENSE = "MIT" -DEPENDS = "python-setuptools" # python-netserver is needed for cgi stuff # python-zlib is needed to unpack egg created by setuptools RDEPENDS = "python-core python-re python-io python-netserver python-zlib" SRCNAME = "simplejson" -PR = "r1" +PR = "r2" SRC_URI = "http://cheeseshop.python.org/packages/source/s/simplejson/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit distutils +inherit setuptools diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index 325e541b97..7f30badfad 100644 --- a/packages/python/python_2.5.2.bb +++ b/packages/python/python_2.5.2.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" # bump this on every change in contrib/python/generate-manifest-2.5.py -PR = "ml2" +PR = "ml3" PYTHON_MAJMIN = "2.5" diff --git a/packages/qt4/qt4-x11-free.inc b/packages/qt4/qt4-x11-free.inc index 60c266bc73..17f2fff0fe 100644 --- a/packages/qt4/qt4-x11-free.inc +++ b/packages/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" -PR = "r9" +PR = "r10" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index 1c3d69c1af..a49be4757e 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -9,6 +9,7 @@ do_stage_append() { cd ${STAGING_LIBDIR} sed -i s#"-L${S}/lib"##g libQt*.la + sed -i s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g libQt*.la } STAGE_TEMP = "${WORKDIR}/temp-staging" diff --git a/packages/rsync/rsync.inc b/packages/rsync/rsync.inc index bc24f4daac..7ec83293ff 100644 --- a/packages/rsync/rsync.inc +++ b/packages/rsync/rsync.inc @@ -7,6 +7,8 @@ DEPENDS += "popt" inherit autotools +SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz" + EXTRA_OEMAKE='STRIP=""' do_install_append() { diff --git a/packages/rsync/rsync_2.6.9.bb b/packages/rsync/rsync_2.6.9.bb index 075dfa7b09..067df4f2f3 100644 --- a/packages/rsync/rsync_2.6.9.bb +++ b/packages/rsync/rsync_2.6.9.bb @@ -2,5 +2,4 @@ require rsync.inc PR = "r2" -SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz \ - file://rsyncd.conf" +SRC_URI += "file://rsyncd.conf" diff --git a/packages/rsync/rsync_3.0.0.bb b/packages/rsync/rsync_3.0.0.bb index 720ef04521..99bec628d3 100644 --- a/packages/rsync/rsync_3.0.0.bb +++ b/packages/rsync/rsync_3.0.0.bb @@ -2,9 +2,10 @@ require rsync.inc PR = "r0" -SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz \ - file://m4.patch;patch=1 \ - file://rsyncd.conf" +SRC_URI += "\ + file://m4.patch;patch=1 \ + file://rsyncd.conf \ +" do_compile_prepend() { sed -i "s/conf_stop make_stop//" Makefile diff --git a/packages/sailcut/.mtn2git_empty b/packages/sailcut/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sailcut/.mtn2git_empty diff --git a/packages/sailcut/sailcut_1.3.2.bb b/packages/sailcut/sailcut_1.3.2.bb new file mode 100644 index 0000000000..0063348e85 --- /dev/null +++ b/packages/sailcut/sailcut_1.3.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Sail design and plotting software" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "qt4-x11-free" +SRCNAME = "sailcut" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" +EXTRA_OECONF = "\ + --with-qt-includes=${STAGING_INCDIR}/qt4 \ + --with-qt-libraries=${STAGING_LIBDIR} \ + MOC=moc4 UIC=uic4" + +inherit autotools + diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index c3ada840e2..a59002654a 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 = "r67" +PR = "r68" inherit task diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/.mtn2git_empty b/packages/u-boot/u-boot-1.1.4/at32stk1000/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/.mtn2git_empty diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/ap7000-add-spi-device-and-lcdc-base-address.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/ap7000-add-spi-device-and-lcdc-base-address.patch new file mode 100644 index 0000000000..fa8c8f701f --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/ap7000-add-spi-device-and-lcdc-base-address.patch @@ -0,0 +1,112 @@ +diff -uprN u-boot-orig/cpu/at32ap7xxx/ap7000/devices.c u-boot/cpu/at32ap7xxx/ap7000/devices.c +--- u-boot-orig/cpu/at32ap7xxx/ap7000/devices.c 2007-01-01 19:26:46.000000000 +0100 ++++ u-boot/cpu/at32ap7xxx/ap7000/devices.c 2006-12-22 14:51:26.000000000 +0100 +@@ -223,6 +223,46 @@ static const struct resource macb1_resou + }, + }; + #endif ++#if defined(CFG_SPI0) ++static const struct resource spi0_resource[] = { ++ { ++ .type = RESOURCE_CLOCK, ++ .u = { ++ .clock = { CLOCK_APBA, 0 }, ++ }, ++ }, { ++ .type = RESOURCE_GPIO, ++ .u = { ++ .gpio = { 6, DEVICE_PIOA, GPIO_FUNC_A, 0 }, ++ }, ++ }, { ++ .type = RESOURCE_GPIO, ++ .u = { ++ .gpio = { 1, DEVICE_PIOA, GPIO_FUNC_B, 20 }, ++ }, ++ }, ++}; ++#endif ++#if defined(CFG_SPI1) ++static const struct resource spi1_resource[] = { ++ { ++ .type = RESOURCE_CLOCK, ++ .u = { ++ .clock = { CLOCK_APBA, 1 }, ++ }, ++ }, { ++ .type = RESOURCE_GPIO, ++ .u = { ++ .gpio = { 6, DEVICE_PIOB, GPIO_FUNC_B, 0 }, ++ }, ++ }, { ++ .type = RESOURCE_GPIO, ++ .u = { ++ .gpio = { 1, DEVICE_PIOA, GPIO_FUNC_A, 27 }, ++ }, ++ }, ++}; ++#endif + #if defined(CFG_LCDC) + static const struct resource lcdc_resource[] = { + { +@@ -230,6 +270,16 @@ static const struct resource lcdc_resour + .u = { + .clock = { CLOCK_AHB, 7 }, + }, ++ }, { ++ .type = RESOURCE_GPIO, ++ .u = { ++ .gpio = { 13, DEVICE_PIOC, GPIO_FUNC_A, 19 }, ++ }, ++ }, { ++ .type = RESOURCE_GPIO, ++ .u = { ++ .gpio = { 18, DEVICE_PIOD, GPIO_FUNC_A, 0 }, ++ }, + }, + }; + #endif +@@ -390,6 +440,20 @@ const struct device chip_device[] = { + .resource = macb0_resource, + }, + #endif ++#if defined(CFG_SPI0) ++ [DEVICE_SPI0] = { ++ .regs = (void *)SPI0_BASE, ++ .nr_resources = ARRAY_SIZE(spi0_resource), ++ .resource = spi0_resource, ++ }, ++#endif ++#if defined(CFG_SPI1) ++ [DEVICE_SPI1] = { ++ .regs = (void *)SPI1_BASE, ++ .nr_resources = ARRAY_SIZE(spi1_resource), ++ .resource = spi1_resource, ++ }, ++#endif + #if defined(CFG_MACB1) + [DEVICE_MACB1] = { + .regs = (void *)MACB1_BASE, +@@ -399,6 +463,7 @@ const struct device chip_device[] = { + #endif + #if defined(CFG_LCDC) + [DEVICE_LCDC] = { ++ .regs = (void *)LCDC_BASE, + .nr_resources = ARRAY_SIZE(lcdc_resource), + .resource = lcdc_resource, + }, +diff -uprN u-boot-orig/include/asm-avr32/arch-ap7000/platform.h u-boot/include/asm-avr32/arch-ap7000/platform.h +--- u-boot-orig/include/asm-avr32/arch-ap7000/platform.h 2007-01-01 19:26:46.000000000 +0100 ++++ u-boot/include/asm-avr32/arch-ap7000/platform.h 2006-12-22 14:20:39.000000000 +0100 +@@ -66,6 +66,12 @@ enum device_id { + #if defined(CFG_MACB1) + DEVICE_MACB1, + #endif ++#if defined(CFG_SPI0) ++ DEVICE_SPI0, ++#endif ++#if defined(CFG_SPI1) ++ DEVICE_SPI1, ++#endif + #if defined(CFG_LCDC) + DEVICE_LCDC, + #endif diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-define-for-sdram-test.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-define-for-sdram-test.patch new file mode 100644 index 0000000000..33c5eb9b7c --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-define-for-sdram-test.patch @@ -0,0 +1,117 @@ +Index: u-boot-1.1.4/cpu/at32ap7xxx/hsdramc.c +=================================================================== +--- u-boot-1.1.4.orig/cpu/at32ap7xxx/hsdramc.c 2007-01-11 15:28:40.000000000 +0100 ++++ u-boot-1.1.4/cpu/at32ap7xxx/hsdramc.c 2007-01-11 15:29:36.000000000 +0100 +@@ -133,6 +133,7 @@ + printf("SDRAM: %u MB at address 0x%08lx\n", + sdram_size >> 20, info->phys_addr); + ++#ifdef CONFIG_SDRAM_TEST + printf("Testing SDRAM..."); + for (i = 0; i < sdram_size / 4; i++) + sdram[i] = i; +@@ -148,6 +149,7 @@ + } + + puts("OK\n"); ++#endif + + return sdram_size; + } +Index: u-boot-1.1.4/include/configs/atngw.h +=================================================================== +--- u-boot-1.1.4.orig/include/configs/atngw.h 2007-01-11 15:28:40.000000000 +0100 ++++ u-boot-1.1.4/include/configs/atngw.h 2007-01-30 16:41:23.000000000 +0100 +@@ -31,6 +31,10 @@ + + #define CONFIG_NGW_EXT_FLASH 1 + ++/* Handy macros for making strings */ ++#define xstringify(x) #x ++#define stringify(x) xstringify(x) ++ + /* + * Timer clock frequency. We're using the CPU-internal COUNT register + * for this, so this is equivalent to the CPU core clock frequency +@@ -80,9 +84,9 @@ + + #define CONFIG_BAUDRATE 115200 + #define CONFIG_BOOTARGS \ +- "console=ttyS0 root=/dev/mmcblk0p1" ++ "console=ttyS0 root=/dev/mtdblock1 rootfstype=jffs2" + #define CONFIG_BOOTCOMMAND \ +- "mmcinit; ext2load mmc 0:1 0x90400000 /uImage; bootm 0x90400000" ++ "fsload 0x90250000 /uImage; bootm 0x90250000" + + #define CONFIG_BOOTDELAY 2 + #define CONFIG_AUTOBOOT 1 +@@ -105,8 +109,8 @@ + * generated and assigned to the environment variables "ethaddr" and + * "eth1addr". + */ +-#define CONFIG_ETHADDR "6a:87:71:14:cd:cb" +-#define CONFIG_ETH1ADDR "ca:f8:15:e6:3e:e6" ++#define CONFIG_ETHADDR "42:b2:13:36:50:94" ++#define CONFIG_ETH1ADDR "4e:29:49:7e:5c:b9" + #define CONFIG_OVERWRITE_ETHADDR_ONCE 1 + #define CONFIG_NET_MULTI 1 + +@@ -183,6 +187,7 @@ + + #define CFG_SDRAM_BASE 0x10000000 + #define CFG_SDRAM_16BIT 1 ++#define CONFIG_SDRAM_TEST 1 + + #define CFG_ENV_IS_IN_FLASH 1 + #define CFG_ENV_SIZE 65536 +@@ -202,7 +207,7 @@ + #define CFG_DMA_ALLOC_END (CFG_MALLOC_START) + #define CFG_DMA_ALLOC_START (CFG_DMA_ALLOC_END - CFG_DMA_ALLOC_LEN) + /* Allow 2MB for the kernel run-time image */ +-#define CFG_LOAD_ADDR (CFG_SDRAM_BASE + 0x00200000) ++#define CFG_LOAD_ADDR (CFG_SDRAM_BASE + 0x00250000) + #define CFG_BOOTPARAMS_LEN (16 * 1024) + + /* Other configuration settings that shouldn't have to change all that often */ +Index: u-boot-1.1.4/include/configs/atstk1002.h +=================================================================== +--- u-boot-1.1.4.orig/include/configs/atstk1002.h 2007-01-11 15:29:36.000000000 +0100 ++++ u-boot-1.1.4/include/configs/atstk1002.h 2007-01-30 16:41:25.000000000 +0100 +@@ -98,7 +98,7 @@ + #define CFG_CONSOLE_UART_DEV DEVICE_USART1 + + /* Define to force consol on serial */ +-/* #define CFG_CONSOLE_ALLWAYS_UART 1 */ ++#define CFG_CONSOLE_ALLWAYS_UART 1 + #ifdef CFG_CONSOLE_ALLWAYS_UART + #define CFG_CONSOLE_IS_IN_ENV 1 + #define CFG_CONSOLE_OVERWRITE_ROUTINE 1 +@@ -123,7 +123,7 @@ + #endif + + #define CONFIG_BOOTCOMMAND \ +- "mmcinit; ext2load mmc 0:1 /uImage; bootm" ++ "mmcinit; ext2load mmc 0:1 0x90250000 /uImage; bootm 0x90250000" + #define CONFIG_BOOTDELAY 2 + #define CONFIG_AUTOBOOT 1 + +@@ -145,8 +145,8 @@ + * generated and assigned to the environment variables "ethaddr" and + * "eth1addr". + */ +-#define CONFIG_ETHADDR "6a:87:71:14:cd:cb" +-#define CONFIG_ETH1ADDR "ca:f8:15:e6:3e:e6" ++#define CONFIG_ETHADDR "42:b2:13:36:50:94" ++#define CONFIG_ETH1ADDR "4e:29:49:7e:5c:b9" + #define CONFIG_OVERWRITE_ETHADDR_ONCE 1 + #define CONFIG_NET_MULTI 1 + +@@ -233,6 +233,8 @@ + #define CFG_INTRAM_SIZE 0x8000 + + #define CFG_SDRAM_BASE 0x10000000 ++/* Will do SDRAM test if defined */ ++#define CONFIG_SDRAM_TEST 1 + + #define CFG_ENV_IS_IN_FLASH 1 + #define CFG_ENV_SIZE 65536 diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-framebuffer-address.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-framebuffer-address.patch new file mode 100644 index 0000000000..cac9be5d55 --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-framebuffer-address.patch @@ -0,0 +1,11 @@ +diff -uprN u-boot-orig/include/asm-avr32/global_data.h u-boot/include/asm-avr32/global_data.h +--- u-boot-orig/include/asm-avr32/global_data.h 2007-01-01 19:26:46.000000000 +0100 ++++ u-boot/include/asm-avr32/global_data.h 2006-12-19 11:08:14.000000000 +0100 +@@ -44,6 +44,7 @@ typedef struct global_data { + unsigned long env_addr; /* Address of env struct */ + unsigned long env_valid; /* Checksum of env valid? */ + unsigned long cpu_hz; /* TODO: remove */ ++ unsigned long fb_base; /* Address to framebuffer */ + void **jt; + } gd_t; + diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-spi-initcalls.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-spi-initcalls.patch new file mode 100644 index 0000000000..397d6b00aa --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-spi-initcalls.patch @@ -0,0 +1,16 @@ +diff -uprN u-boot-orig/include/asm-avr32/initcalls.h u-boot/include/asm-avr32/initcalls.h +--- u-boot-orig/include/asm-avr32/initcalls.h 2007-01-01 19:26:46.000000000 +0100 ++++ u-boot/include/asm-avr32/initcalls.h 2007-01-05 13:29:16.000000000 +0100 +@@ -30,6 +30,12 @@ extern void board_init_memories(void); + extern void board_init_pio(void); + extern void board_init_info(void); + ++#if CONFIG_SPI ++extern void board_init_spi(void); ++#else ++static inline void board_init_spi(void) { } ++#endif ++ + #if (CONFIG_COMMANDS & CFG_CMD_NET) + extern void net_init(void); + #else diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-system-manager-header-file.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-system-manager-header-file.patch new file mode 100644 index 0000000000..221333c4bc --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/at32ap-add-system-manager-header-file.patch @@ -0,0 +1,252 @@ +diff -uprN u-boot-orig/include/asm-avr32/arch-ap7000/sm.h u-boot/include/asm-avr32/arch-ap7000/sm.h +--- u-boot-orig/include/asm-avr32/arch-ap7000/sm.h 1970-01-01 01:00:00.000000000 +0100 ++++ u-boot/include/asm-avr32/arch-ap7000/sm.h 2006-12-21 16:28:04.000000000 +0100 +@@ -0,0 +1,248 @@ ++/* ++ * Register definitions for SM ++ * ++ * System Manager ++ */ ++#ifndef __ASM_AVR32_SM_H__ ++#define __ASM_AVR32_SM_H__ ++ ++/* SM register offsets */ ++#define SM_PM_MCCTRL 0x0000 ++#define SM_PM_CKSEL 0x0004 ++#define SM_PM_CPU_MASK 0x0008 ++#define SM_PM_AHB_MASK 0x000c ++#define SM_PM_APBA_MASK 0x0010 ++#define SM_PM_APBB_MASK 0x0014 ++#define SM_PM_PLL0 0x0020 ++#define SM_PM_PLL1 0x0024 ++#define SM_PM_VCTRL 0x0030 ++#define SM_PM_VMREF 0x0034 ++#define SM_PM_VMV 0x0038 ++#define SM_PM_IER 0x0040 ++#define SM_PM_IDR 0x0044 ++#define SM_PM_IMR 0x0048 ++#define SM_PM_ISR 0x004c ++#define SM_PM_ICR 0x0050 ++#define SM_PM_GCCTRL 0x0060 ++#define SM_PM_GCCTRL0 0x0060 ++#define SM_PM_GCCTRL1 0x0064 ++#define SM_PM_GCCTRL2 0x0068 ++#define SM_PM_GCCTRL3 0x006c ++#define SM_PM_GCCTRL4 0x0070 ++#define SM_PM_GCCTRL5 0x0074 ++#define SM_PM_GCCTRL6 0x0078 ++#define SM_PM_GCCTRL7 0x007c ++#define SM_RTC_CTRL 0x0080 ++#define SM_RTC_VAL 0x0084 ++#define SM_RTC_TOP 0x0088 ++#define SM_RTC_IER 0x0090 ++#define SM_RTC_IDR 0x0094 ++#define SM_RTC_IMR 0x0098 ++#define SM_RTC_ISR 0x009c ++#define SM_RTC_ICR 0x00a0 ++#define SM_WDT_CTRL 0x00b0 ++#define SM_WDT_CLR 0x00b4 ++#define SM_WDT_EXT 0x00b8 ++#define SM_RC_RCAUSE 0x00c0 ++#define SM_EIM_IER 0x0100 ++#define SM_EIM_IDR 0x0104 ++#define SM_EIM_IMR 0x0108 ++#define SM_EIM_ISR 0x010c ++#define SM_EIM_ICR 0x0110 ++#define SM_EIM_MODE 0x0114 ++#define SM_EIM_EDGE 0x0118 ++#define SM_EIM_LEVEL 0x011c ++#define SM_EIM_TEST 0x0120 ++#define SM_EIM_NMIC 0x0124 ++ ++/* Bitfields in PM_MCCTRL */ ++ ++/* Bitfields in PM_CKSEL */ ++#define SM_CPUSEL_OFFSET 0 ++#define SM_CPUSEL_SIZE 3 ++#define SM_CPUDIV_OFFSET 7 ++#define SM_CPUDIV_SIZE 1 ++#define SM_AHBSEL_OFFSET 8 ++#define SM_AHBSEL_SIZE 3 ++#define SM_AHBDIV_OFFSET 15 ++#define SM_AHBDIV_SIZE 1 ++#define SM_APBASEL_OFFSET 16 ++#define SM_APBASEL_SIZE 3 ++#define SM_APBADIV_OFFSET 23 ++#define SM_APBADIV_SIZE 1 ++#define SM_APBBSEL_OFFSET 24 ++#define SM_APBBSEL_SIZE 3 ++#define SM_APBBDIV_OFFSET 31 ++#define SM_APBBDIV_SIZE 1 ++ ++/* Bitfields in PM_CPU_MASK */ ++ ++/* Bitfields in PM_AHB_MASK */ ++ ++/* Bitfields in PM_APBA_MASK */ ++ ++/* Bitfields in PM_APBB_MASK */ ++ ++/* Bitfields in PM_PLL0 */ ++#define SM_PLLEN_OFFSET 0 ++#define SM_PLLEN_SIZE 1 ++#define SM_PLLOSC_OFFSET 1 ++#define SM_PLLOSC_SIZE 1 ++#define SM_PLLOPT_OFFSET 2 ++#define SM_PLLOPT_SIZE 3 ++#define SM_PLLDIV_OFFSET 8 ++#define SM_PLLDIV_SIZE 8 ++#define SM_PLLMUL_OFFSET 16 ++#define SM_PLLMUL_SIZE 8 ++#define SM_PLLCOUNT_OFFSET 24 ++#define SM_PLLCOUNT_SIZE 6 ++#define SM_PLLTEST_OFFSET 31 ++#define SM_PLLTEST_SIZE 1 ++ ++/* Bitfields in PM_PLL1 */ ++ ++/* Bitfields in PM_VCTRL */ ++#define SM_VAUTO_OFFSET 0 ++#define SM_VAUTO_SIZE 1 ++#define SM_PM_VCTRL_VAL_OFFSET 8 ++#define SM_PM_VCTRL_VAL_SIZE 7 ++ ++/* Bitfields in PM_VMREF */ ++#define SM_REFSEL_OFFSET 0 ++#define SM_REFSEL_SIZE 4 ++ ++/* Bitfields in PM_VMV */ ++#define SM_PM_VMV_VAL_OFFSET 0 ++#define SM_PM_VMV_VAL_SIZE 8 ++ ++/* Bitfields in PM_IER */ ++ ++/* Bitfields in PM_IDR */ ++ ++/* Bitfields in PM_IMR */ ++ ++/* Bitfields in PM_ISR */ ++ ++/* Bitfields in PM_ICR */ ++#define SM_LOCK0_OFFSET 0 ++#define SM_LOCK0_SIZE 1 ++#define SM_LOCK1_OFFSET 1 ++#define SM_LOCK1_SIZE 1 ++#define SM_WAKE_OFFSET 2 ++#define SM_WAKE_SIZE 1 ++#define SM_VOK_OFFSET 3 ++#define SM_VOK_SIZE 1 ++#define SM_VMRDY_OFFSET 4 ++#define SM_VMRDY_SIZE 1 ++#define SM_CKRDY_OFFSET 5 ++#define SM_CKRDY_SIZE 1 ++ ++/* Bitfields in PM_GCCTRL */ ++#define SM_OSCSEL_OFFSET 0 ++#define SM_OSCSEL_SIZE 1 ++#define SM_PLLSEL_OFFSET 1 ++#define SM_PLLSEL_SIZE 1 ++#define SM_CEN_OFFSET 2 ++#define SM_CEN_SIZE 1 ++#define SM_CPC_OFFSET 3 ++#define SM_CPC_SIZE 1 ++#define SM_DIVEN_OFFSET 4 ++#define SM_DIVEN_SIZE 1 ++#define SM_DIV_OFFSET 8 ++#define SM_DIV_SIZE 8 ++ ++/* Bitfields in RTC_CTRL */ ++#define SM_PCLR_OFFSET 1 ++#define SM_PCLR_SIZE 1 ++#define SM_TOPEN_OFFSET 2 ++#define SM_TOPEN_SIZE 1 ++#define SM_CLKEN_OFFSET 3 ++#define SM_CLKEN_SIZE 1 ++#define SM_PSEL_OFFSET 8 ++#define SM_PSEL_SIZE 16 ++ ++/* Bitfields in RTC_VAL */ ++#define SM_RTC_VAL_VAL_OFFSET 0 ++#define SM_RTC_VAL_VAL_SIZE 31 ++ ++/* Bitfields in RTC_TOP */ ++#define SM_RTC_TOP_VAL_OFFSET 0 ++#define SM_RTC_TOP_VAL_SIZE 32 ++ ++/* Bitfields in RTC_IER */ ++ ++/* Bitfields in RTC_IDR */ ++ ++/* Bitfields in RTC_IMR */ ++ ++/* Bitfields in RTC_ISR */ ++ ++/* Bitfields in RTC_ICR */ ++#define SM_TOPI_OFFSET 0 ++#define SM_TOPI_SIZE 1 ++ ++/* Bitfields in WDT_CTRL */ ++#define SM_KEY_OFFSET 24 ++#define SM_KEY_SIZE 8 ++ ++/* Bitfields in WDT_CLR */ ++ ++/* Bitfields in WDT_EXT */ ++ ++/* Bitfields in RC_RCAUSE */ ++#define SM_POR_OFFSET 0 ++#define SM_POR_SIZE 1 ++#define SM_BOD_OFFSET 1 ++#define SM_BOD_SIZE 1 ++#define SM_EXT_OFFSET 2 ++#define SM_EXT_SIZE 1 ++#define SM_WDT_OFFSET 3 ++#define SM_WDT_SIZE 1 ++#define SM_NTAE_OFFSET 4 ++#define SM_NTAE_SIZE 1 ++#define SM_SERP_OFFSET 5 ++#define SM_SERP_SIZE 1 ++ ++/* Bitfields in EIM_IER */ ++ ++/* Bitfields in EIM_IDR */ ++ ++/* Bitfields in EIM_IMR */ ++ ++/* Bitfields in EIM_ISR */ ++ ++/* Bitfields in EIM_ICR */ ++ ++/* Bitfields in EIM_MODE */ ++ ++/* Bitfields in EIM_EDGE */ ++#define SM_INT0_OFFSET 0 ++#define SM_INT0_SIZE 1 ++#define SM_INT1_OFFSET 1 ++#define SM_INT1_SIZE 1 ++#define SM_INT2_OFFSET 2 ++#define SM_INT2_SIZE 1 ++#define SM_INT3_OFFSET 3 ++#define SM_INT3_SIZE 1 ++ ++/* Bitfields in EIM_LEVEL */ ++ ++/* Bitfields in EIM_TEST */ ++#define SM_TESTEN_OFFSET 31 ++#define SM_TESTEN_SIZE 1 ++ ++/* Bitfields in EIM_NMIC */ ++#define SM_EN_OFFSET 0 ++#define SM_EN_SIZE 1 ++ ++/* Bit manipulation macros */ ++#define SM_BIT(name) (1 << SM_##name##_OFFSET) ++#define SM_BF(name,value) (((value) & ((1 << SM_##name##_SIZE) - 1)) << SM_##name##_OFFSET) ++#define SM_BFEXT(name,value) (((value) >> SM_##name##_OFFSET) & ((1 << SM_##name##_SIZE) - 1)) ++#define SM_BFINS(name,value,old) (((old) & ~(((1 << SM_##name##_SIZE) - 1) << SM_##name##_OFFSET)) | SM_BF(name,value)) ++ ++/* Register access macros */ ++#define sm_readl(port,reg) readl((port)->regs + SM_##reg) ++#define sm_writel(port,reg,value) writel((value), (port)->regs + SM_##reg) ++ ++#endif /* __ASM_AVR32_SM_H__ */ diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-add-lcd-and-spi-to-config.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-add-lcd-and-spi-to-config.patch new file mode 100644 index 0000000000..4deb284564 --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-add-lcd-and-spi-to-config.patch @@ -0,0 +1,124 @@ +Index: u-boot-orig/include/configs/atstk1002.h +=================================================================== +--- u-boot-orig.orig/include/configs/atstk1002.h 2007-01-05 15:58:53.000000000 +0100 ++++ u-boot-orig/include/configs/atstk1002.h 2007-01-05 16:04:50.000000000 +0100 +@@ -32,6 +32,10 @@ + + #define CONFIG_ATSTK1000_EXT_FLASH 1 + ++/* Handy macros for making strings */ ++#define xstringify(x) #x ++#define stringify(x) xstringify(x) ++ + /* + * Timer clock frequency. We're using the CPU-internal COUNT register + * for this, so this is equivalent to the CPU core clock frequency +@@ -68,10 +72,39 @@ + #define CFG_USART1 1 + #define CFG_MMCI 1 + #define CFG_MACB0 1 +-#define CFG_MACB1 1 ++/* #define CFG_MACB1 1 */ ++ ++/* Enable SPI support */ ++#define CONFIG_SPI 1 ++#define CONFIG_ATMEL_SPI 1 ++#define CFG_SPI0 1 ++ ++/* Enable LCD support */ ++#define CFG_DMAC 1 ++#define CFG_LCDC 1 ++#define CONFIG_LCD 1 ++#define CONFIG_ATMEL_LCDC 1 ++#define CONFIG_DISPLAY_LTV350QV 1 ++ ++/* Setup LCD */ ++#define LCD_BPP LCD_COLOR24 ++/* CFG_SDRAM_BASE + 0x00500000 */ ++#define CFG_LCD_BASE 0x10500000 ++#define CFG_WHITE_ON_BLACK 1 ++#define CONFIG_VIDEO_BMP_GZIP 1 ++#define CFG_VIDEO_LOGO_MAX_SIZE 262144 /* > 320 * 240 * 3 */ ++/* #define CONFIG_SPLASH_SCREEN 1 */ + + #define CFG_CONSOLE_UART_DEV DEVICE_USART1 + ++/* Define to force consol on serial */ ++/* #define CFG_CONSOLE_ALLWAYS_UART 1 */ ++#ifdef CFG_CONSOLE_ALLWAYS_UART ++#define CFG_CONSOLE_IS_IN_ENV 1 ++#define CFG_CONSOLE_OVERWRITE_ROUTINE 1 ++#define CFG_CONSOLE_ENV_OVERWRITE 1 ++#endif ++ + /* User serviceable stuff */ + #define CONFIG_CMDLINE_TAG 1 + #define CONFIG_SETUP_MEMORY_TAGS 1 +@@ -80,11 +113,17 @@ + #define CONFIG_STACKSIZE (2048) + + #define CONFIG_BAUDRATE 115200 ++ ++#ifdef CFG_LCD_BASE + #define CONFIG_BOOTARGS \ +- "console=ttyUS0 root=/dev/mmcblk0p1 fbmem=600k" +-#define CONFIG_BOOTCOMMAND \ +- "mmcinit; ext2load mmc 0:1 0x90400000 /uImage; bootm 0x90400000" ++ "console=ttyS0 root=/dev/mmcblk0p1 fbmem=600k@" stringify(CFG_LCD_BASE) ++#else ++#define CONFIG_BOOTARGS \ ++ "console=ttyS0 root=/dev/mmcblk0p1 fbmem=600k" ++#endif + ++#define CONFIG_BOOTCOMMAND \ ++ "mmcinit; ext2load mmc 0:1 /uImage; bootm" + #define CONFIG_BOOTDELAY 2 + #define CONFIG_AUTOBOOT 1 + +@@ -144,7 +183,7 @@ + /* | CFG_CMD_DIAG */ \ + /* | CFG_CMD_HWFLOW */ \ + /* | CFG_CMD_SAVES */ \ +- /* | CFG_CMD_SPI */ \ ++ | CFG_CMD_SPI \ + /* | CFG_CMD_PING */ \ + | CFG_CMD_MMC \ + /* | CFG_CMD_FAT */ \ +@@ -152,6 +191,7 @@ + /* | CFG_CMD_ITEST */ \ + | CFG_CMD_EXT2 \ + | CFG_CMD_JFFS2 \ ++ | CFG_CMD_BMP \ + ) + + #include <cmd_confdefs.h> +@@ -201,7 +241,7 @@ + #define CFG_INIT_SP_ADDR (CFG_INTRAM_BASE + CFG_INTRAM_SIZE) + + #ifdef CONFIG_ATSTK1000 +-# define CFG_MALLOC_LEN (256*1024) ++# define CFG_MALLOC_LEN (512*1024) + # define CFG_MALLOC_END \ + ({ \ + DECLARE_GLOBAL_DATA_PTR; \ +@@ -213,7 +253,7 @@ + # define CFG_DMA_ALLOC_END (CFG_MALLOC_START) + # define CFG_DMA_ALLOC_START (CFG_DMA_ALLOC_END - CFG_DMA_ALLOC_LEN) + /* Allow 2MB for the kernel run-time image */ +-# define CFG_LOAD_ADDR (CFG_SDRAM_BASE + 0x00200000) ++# define CFG_LOAD_ADDR (CFG_SDRAM_BASE + 0x00250000) + # define CFG_BOOTPARAMS_LEN (16 * 1024) + #else + # define CFG_MALLOC_LEN (8*1024) +Index: u-boot-orig/board/atstk1000/atstk1000.c +=================================================================== +--- u-boot-orig.orig/board/atstk1000/atstk1000.c 2007-01-05 16:02:33.000000000 +0100 ++++ u-boot-orig/board/atstk1000/atstk1000.c 2007-01-05 16:04:00.000000000 +0100 +@@ -52,3 +52,7 @@ + gd->bd->bi_phy_id[0] = 0x10; + gd->bd->bi_phy_id[1] = 0x11; + } ++ ++#ifdef CFG_CONSOLE_ALLWAYS_UART ++int overwrite_console(void) { return 1; } ++#endif diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-ltv350qv-display-support.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-ltv350qv-display-support.patch new file mode 100644 index 0000000000..57c0fae127 --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-ltv350qv-display-support.patch @@ -0,0 +1,163 @@ +diff -uprN u-boot-orig/board/atstk1000/ltv350qv.c u-boot/board/atstk1000/ltv350qv.c +--- u-boot-orig/board/atstk1000/ltv350qv.c 1970-01-01 01:00:00.000000000 +0100 ++++ u-boot/board/atstk1000/ltv350qv.c 2007-01-02 15:17:32.000000000 +0100 +@@ -0,0 +1,147 @@ ++/* ++ * Copyright (C) 2005-2006 Atmel Corporation ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++#include <common.h> ++ ++#ifdef CONFIG_LCD ++#ifndef CONFIG_SPI ++#error No SPI controller for LCD setup, enable CFG_SPI ++#endif ++ ++#include <spi.h> ++ ++#ifdef CONFIG_ATMEL_SPI ++#include <atmel_spi.h> ++#endif ++ ++static int ltv350qv_write_reg(u8 reg, u16 val) ++{ ++ int ret; ++ u8 buffer[3]; ++ ++ buffer[0] = 0x74; ++ buffer[1] = 0x00; ++ buffer[2] = reg & 0x7f; ++ ++ ret = spi_write(&buffer[0], 1, &buffer[1], 2); ++ if (ret != 3) { ++ printf("spi_write returned %d\n", ret); ++ return -1; ++ } ++ ++ buffer[0] = 0x76; ++ buffer[1] = val >> 8; ++ buffer[2] = val; ++ ++ ret = spi_write(&buffer[0], 1, &buffer[1], 2); ++ if (ret != 3) { ++ printf("spi_write returned %d\n", ret); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++#define write_reg(reg, val) \ ++ do { \ ++ ret = ltv350qv_write_reg(reg, val); \ ++ if (ret) \ ++ goto out; \ ++ } while (0) ++ ++void ltv350qv_power_on(void) ++{ ++ int ret; ++ ++#ifdef CONFIG_ATMEL_SPI ++ spi_select_chip(1); ++#endif ++ ++ debug ("ltv350qv: do power on sequence\n"); ++ ++ /* write startup procedure */ ++ write_reg(9, 0x0000); ++ udelay(15000); ++ write_reg(9, 0x4000); ++ write_reg(10, 0x2000); ++ write_reg(9, 0x4055); ++ udelay(55000); ++ write_reg(1, 0x409d); ++ write_reg(2, 0x0204); ++ write_reg(3, 0x0100); ++ write_reg(4, 0x3000); ++ write_reg(5, 0x4003); ++ write_reg(6, 0x000a); ++ write_reg(7, 0x0021); ++ write_reg(8, 0x0c00); ++ write_reg(10, 0x0103); ++ write_reg(11, 0x0301); ++ write_reg(12, 0x1f0f); ++ write_reg(13, 0x1f0f); ++ write_reg(14, 0x0707); ++ write_reg(15, 0x0307); ++ write_reg(16, 0x0707); ++ write_reg(17, 0x0000); ++ write_reg(18, 0x0004); ++ write_reg(19, 0x0000); ++ ++ udelay(20000); ++ write_reg(9, 0x4a55); ++ write_reg(5, 0x5003); ++ ++ debug ("ltv350qv: power on sequence done\n"); ++out: ++ return; ++} ++ ++void ltv350qv_power_off(void) ++{ ++ int ret; ++ ++#ifdef CONFIG_ATMEL_SPI ++ spi_select_chip(1); ++#endif ++ ++ debug ("ltv350qv: do power off sequence\n"); ++ /* GON -> 0, POC -> 0 */ ++ write_reg(9, 0x4055); ++ /* DSC -> 0 */ ++ write_reg(5, 0x4003); ++ /* VCOMG -> 0 */ ++ write_reg(10, 0x2103); ++ ++ udelay(1000000); ++ ++ /* AP[2:0] -> 000 */ ++ write_reg(9, 0x4050); ++ ++ debug ("ltv350qv: power off sequence done\n"); ++out: ++ return; ++} ++ ++void ltv350qv_init(void) ++{ ++ debug ("ltv350qv: initializing LTV350QV panel\n"); ++ ltv350qv_power_on(); ++} ++ ++#endif +diff -uprN u-boot-orig/board/atstk1000/Makefile u-boot/board/atstk1000/Makefile +--- u-boot-orig/board/atstk1000/Makefile 2007-01-01 19:26:46.000000000 +0100 ++++ u-boot/board/atstk1000/Makefile 2007-01-01 16:23:12.000000000 +0100 +@@ -30,7 +30,7 @@ endif + + LIB := lib$(BOARD).a + +-SRC := $(BOARD).c $(DAUGHTERBOARD).c eth.c flash.c ++SRC := $(BOARD).c $(DAUGHTERBOARD).c eth.c flash.c ltv350qv.c + SRC += spi.c + OBJS := $(addsuffix .o,$(basename $(SRC))) + diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-spi-support.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-spi-support.patch new file mode 100644 index 0000000000..b9cdba16ff --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/atstk1000-spi-support.patch @@ -0,0 +1,98 @@ +diff -uprN u-boot-orig/board/atstk1000/spi.c u-boot/board/atstk1000/spi.c +--- u-boot-orig/board/atstk1000/spi.c 1970-01-01 01:00:00.000000000 +0100 ++++ u-boot/board/atstk1000/spi.c 2007-01-03 08:46:36.000000000 +0100 +@@ -0,0 +1,83 @@ ++/* ++ * Copyright (C) 2006 Atmel Corporation ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++#include <common.h> ++ ++#include <spi.h> ++#include <asm/io.h> ++#include <atmel_spi.h> ++ ++extern void ltv350qv_init(void); ++ ++static struct spi_options_t cs0 = { ++ .reg = 0, ++ .baudrate = 200000, ++ .bits = 8, ++ .spck_delay = 0, ++ .trans_delay = 0, ++ .stay_act = 1, ++ .spi_mode = 3, ++}; ++static struct spi_options_t cs1 = { ++ .reg = 1, ++ .baudrate = 1500000, ++ .bits = 8, ++ .spck_delay = 0, ++ .trans_delay = 0, ++ .stay_act = 1, ++ .spi_mode = 3, ++}; ++ ++void spi_chipsel_dac(int cs) ++{ ++ if (cs) spi_select_chip(0); ++ else spi_unselect_chip(0); ++} ++ ++void spi_chipsel_lcd(int cs) ++{ ++ if (cs) spi_select_chip(1); ++ else spi_unselect_chip(1); ++} ++ ++spi_chipsel_type spi_chipsel[] = { ++ spi_chipsel_dac, ++ spi_chipsel_lcd, ++}; ++int spi_chipsel_cnt = sizeof(spi_chipsel) / sizeof(spi_chipsel[0]); ++ ++void board_init_spi(void) ++{ ++ int ret; ++ ++ spi_init(); ++ ++ ret = spi_setup_chip_reg(&cs0, 45000000); /* TODO: get APBA speed */ ++ if (ret) ++ return; ++ ret = spi_setup_chip_reg(&cs1, 45000000); /* TODO: get APBA speed */ ++ if (ret) ++ return; ++ ++ spi_enable(); ++ ++ ltv350qv_init(); ++} +diff -uprN u-boot-orig/board/atstk1000/Makefile u-boot/board/atstk1000/Makefile +--- u-boot-orig/board/atstk1000/Makefile 2007-01-01 19:26:46.000000000 +0100 ++++ u-boot/board/atstk1000/Makefile 2007-01-01 16:23:12.000000000 +0100 +@@ -31,6 +31,7 @@ endif + LIB := lib$(BOARD).a + + SRC := $(BOARD).c $(DAUGHTERBOARD).c eth.c flash.c ++SRC += spi.c + OBJS := $(addsuffix .o,$(basename $(SRC))) + + .PHONY: all diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/avr32-boards-fix-flash-read.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/avr32-boards-fix-flash-read.patch new file mode 100644 index 0000000000..a1e9fe89e5 --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/avr32-boards-fix-flash-read.patch @@ -0,0 +1,120 @@ +Index: u-boot-orig/board/atmel/ngw/flash.c +=================================================================== +--- u-boot-orig.orig/board/atmel/ngw/flash.c 2007-01-03 11:31:44.000000000 +0100 ++++ u-boot-orig/board/atmel/ngw/flash.c 2007-01-03 11:33:13.000000000 +0100 +@@ -161,7 +161,7 @@ + { + unsigned long flags; + uint16_t *base, *p, *s, *end; +- uint16_t word, status; ++ uint16_t word, status,status1; + int ret = ERR_OK; + + if (addr < info->start[0] +@@ -196,20 +196,36 @@ + sync_write_buffer(); + + /* Wait for completion */ +- do { ++ status1 = readw(p); ++ do { + /* TODO: Timeout */ +- status = readw(p); +- } while ((status != word) && !(status & 0x28)); +- ++ status = status1; ++ status1=readw(p); ++ } while ( ((status ^ status1) & 0x40) && // toggle bit has toggled ++ !(status1 & 0x28) // status is "working" ++ ); ++ ++ // We'll need to check once again for toggle bit because the toggle bit ++ // may stop toggling as I/O5 changes to "1" (ref at49bv642.pdf p9) ++ status1=readw(p); ++ status=readw(p); ++ if ((status ^ status1) & 0x40) ++ { ++ printf("Flash write error at address 0x%p: 0x%02x != 0x%02x\n", ++ p, status,word); ++ ret = ERR_PROG_ERROR; ++ writew(0xf0, base); ++ readw(base); ++ break; ++ } ++ // we can now verify status==word if we want to. ++ ++ // is this Product ID Exit command really required?? ++ // --If configuration is 00 (the default) the device is allready in read mode, ++ // and the instruction is not required! + writew(0xf0, base); + readw(base); + +- if (status != word) { +- printf("Flash write error at address 0x%p: 0x%02x\n", +- p, status); +- ret = ERR_PROG_ERROR; +- break; +- } + } + + local_irq_restore(flags); +Index: u-boot-orig/board/atstk1000/flash.c +=================================================================== +--- u-boot-orig.orig/board/atstk1000/flash.c 2007-01-03 11:31:44.000000000 +0100 ++++ u-boot-orig/board/atstk1000/flash.c 2007-01-03 11:33:13.000000000 +0100 +@@ -160,7 +160,7 @@ + { + unsigned long flags; + uint16_t *base, *p, *s, *end; +- uint16_t word, status; ++ uint16_t word, status,status1; + int ret = ERR_OK; + + if (addr < info->start[0] +@@ -195,20 +195,36 @@ + sync_write_buffer(); + + /* Wait for completion */ +- do { ++ status1 = readw(p); ++ do { + /* TODO: Timeout */ +- status = readw(p); +- } while ((status != word) && !(status & 0x28)); +- ++ status = status1; ++ status1=readw(p); ++ } while ( ((status ^ status1) & 0x40) && // toggle bit has toggled ++ !(status1 & 0x28) // status is "working" ++ ); ++ ++ // We'll need to check once again for toggle bit because the toggle bit ++ // may stop toggling as I/O5 changes to "1" (ref at49bv642.pdf p9) ++ status1=readw(p); ++ status=readw(p); ++ if ((status ^ status1) & 0x40) ++ { ++ printf("Flash write error at address 0x%p: 0x%02x != 0x%02x\n", ++ p, status,word); ++ ret = ERR_PROG_ERROR; ++ writew(0xf0, base); ++ readw(base); ++ break; ++ } ++ // we can now verify status==word if we want to. ++ ++ // is this Product ID Exit command really required?? ++ // --If configuration is 00 (the default) the device is allready in read mode, ++ // and the instruction is not required! + writew(0xf0, base); + readw(base); + +- if (status != word) { +- printf("Flash write error at address 0x%p: 0x%02x\n", +- p, status); +- ret = ERR_PROG_ERROR; +- break; +- } + } + + local_irq_restore(flags); diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/cmd-bmp-add-gzip-compressed-bmp.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/cmd-bmp-add-gzip-compressed-bmp.patch new file mode 100644 index 0000000000..47da73ef5e --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/cmd-bmp-add-gzip-compressed-bmp.patch @@ -0,0 +1,90 @@ +Index: u-boot-orig/common/cmd_bmp.c +=================================================================== +--- u-boot-orig.orig/common/cmd_bmp.c 2007-01-05 14:50:55.000000000 +0100 ++++ u-boot-orig/common/cmd_bmp.c 2007-01-05 15:59:21.000000000 +0100 +@@ -176,13 +176,83 @@ + */ + static int bmp_display(ulong addr, int x, int y) + { ++ int ret; ++#ifdef CONFIG_VIDEO_BMP_GZIP ++ bmp_image_t *bmp = (bmp_image_t *)addr; ++ unsigned char *dst = NULL; ++ ulong len; ++ ++ if (!((bmp->header.signature[0]=='B') && ++ (bmp->header.signature[1]=='M'))) { ++ ++ /* ++ * Decompress bmp image ++ */ ++ len = CFG_VIDEO_LOGO_MAX_SIZE; ++ dst = malloc(CFG_VIDEO_LOGO_MAX_SIZE); ++ if (dst == NULL) { ++ printf("Error: malloc in gunzip failed!\n"); ++ return(1); ++ } ++ if (gunzip(dst, CFG_VIDEO_LOGO_MAX_SIZE, (uchar *)addr, &len) != 0) { ++ free(dst); ++ printf("There is no valid bmp file at the given address\n"); ++ return(1); ++ } ++ if (len == CFG_VIDEO_LOGO_MAX_SIZE) { ++ printf("Image could be truncated " ++ "(increase CFG_VIDEO_LOGO_MAX_SIZE)!\n"); ++ } ++ ++ /* ++ * Set addr to decompressed image ++ */ ++ bmp = (bmp_image_t *)dst; ++ ++ /* ++ * Check for bmp mark 'BM' ++ */ ++ if (!((bmp->header.signature[0] == 'B') && ++ (bmp->header.signature[1] == 'M'))) { ++ printf("There is no valid bmp file at the given address\n"); ++ free(dst); ++ return(1); ++ } ++ } ++ ++ if (dst) { ++ addr = (ulong)dst; ++ } ++#endif /* CONFIG_VIDEO_BMP_GZIP */ ++ + #if defined(CONFIG_LCD) + extern int lcd_display_bitmap (ulong, int, int); + +- return (lcd_display_bitmap (addr, x, y)); ++ ret = lcd_display_bitmap (addr, x, y); ++ if (ret) { ++#ifdef CONFIG_VIDEO_BMP_GZIP ++ free(dst); ++#endif ++ return ret; ++ } ++#ifdef CONFIG_VIDEO_BMP_GZIP ++ free(dst); ++#endif ++ return 0; ++ + #elif defined(CONFIG_VIDEO) + extern int video_display_bitmap (ulong, int, int); +- return (video_display_bitmap (addr, x, y)); ++ ret = video_display_bitmap (addr, x, y); ++ if (ret) { ++#ifdef CONFIG_VIDEO_BMP_GZIP ++ free(dst); ++#endif ++ return ret; ++ } ++#ifdef CONFIG_VIDEO_BMP_GZIP ++ free(dst); ++#endif ++ return 0; + #else + # error bmp_display() requires CONFIG_LCD or CONFIG_VIDEO + #endif diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/fix-mmc-data-timeout.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/fix-mmc-data-timeout.patch new file mode 100644 index 0000000000..d78cbcaaaa --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/fix-mmc-data-timeout.patch @@ -0,0 +1,101 @@ +--- + cpu/at32ap7xxx/mmc.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 58 insertions(+) + +Index: u-boot-1.1.4-avr32/cpu/at32ap7xxx/mmc.c +=================================================================== +--- u-boot-1.1.4-avr32.orig/cpu/at32ap7xxx/mmc.c 2007-01-30 14:53:33.000000000 +0100 ++++ u-boot-1.1.4-avr32/cpu/at32ap7xxx/mmc.c 2007-01-30 15:45:37.000000000 +0100 +@@ -67,6 +67,7 @@ struct mmci { + unsigned int rca; + block_dev_desc_t blkdev; + const struct device *dev; ++ int card_is_sd; + }; + + struct mmci mmci = { +@@ -391,6 +392,8 @@ static int sd_init_card(struct mmci *mmc + mmc->rca = resp[0] >> 16; + if (verbose) + printf("SD Card detected (RCA %u)\n", mmc->rca); ++ mmc->card_is_sd = 1; ++ + return 0; + } + +@@ -425,6 +428,57 @@ static int mmc_init_card(struct mmci *mm + return ret; + } + ++static void mci_set_data_timeout(struct mmci *mmc, struct mmc_csd *csd) ++{ ++ static const unsigned int dtomul_to_shift[] = { ++ 0, 4, 7, 8, 10, 12, 16, 20, ++ }; ++ static const unsigned int taac_exp[] = { ++ 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, ++ }; ++ static const unsigned int taac_mant[] = { ++ 0, 10, 12, 13, 15, 60, 25, 30, ++ 35, 40, 45, 50, 55, 60, 70, 80, ++ }; ++ unsigned int timeout_ns, timeout_clks; ++ unsigned int e, m; ++ unsigned int dtocyc, dtomul; ++ u32 dtor; ++ ++ e = csd->taac & 0x07; ++ m = (csd->taac >> 3) & 0x0f; ++ ++ timeout_ns = (taac_exp[e] * taac_mant[m] + 9) / 10; ++ timeout_clks = csd->nsac * 100; ++ ++ timeout_clks += (((timeout_ns + 9) / 10) ++ * ((CFG_MMC_CLK_PP + 99999) / 100000) + 9999) / 10000; ++ if (!mmc->card_is_sd) ++ timeout_clks *= 10; ++ else ++ timeout_clks *= 100; ++ ++ dtocyc = timeout_clks; ++ dtomul = 0; ++ while (dtocyc > 15 && dtomul < 8) { ++ dtomul++; ++ dtocyc = timeout_clks >> dtomul_to_shift[dtomul]; ++ } ++ ++ if (dtomul >= 8) { ++ dtomul = 7; ++ dtocyc = 15; ++ puts("Warning: Using maximum data timeout\n"); ++ } ++ ++ dtor = (MMCI_MKBF(MCI_DTOR_DTOMUL, dtomul) ++ | MMCI_MKBF(MCI_DTOR_DTOCYC, dtocyc)); ++ mmci_writel(&mmci, MCI_DTOR, dtor); ++ ++ printf("mmc: Using %u cycles data timeout (DTOR=0x%x)\n", ++ dtocyc << dtomul_to_shift[dtomul], dtor); ++} ++ + int mmc_init(int verbose) + { + struct mmc_cid cid; +@@ -443,6 +497,8 @@ int mmc_init(int verbose) + mmci_writel(&mmci, MCI_IDR, ~0UL); + mci_set_mode(CFG_MMC_CLK_OD, CFG_MMC_BLKLEN); + ++ mmci.card_is_sd = 0; ++ + ret = sd_init_card(&mmci, &cid, verbose); + if (ret) { + mmci.rca = MMC_DEFAULT_RCA; +@@ -458,6 +514,8 @@ int mmc_init(int verbose) + if (verbose) + mmc_dump_csd(&csd); + ++ mci_set_data_timeout(&mmci, &csd); ++ + /* Initialize the blockdev structure */ + sprintf(mmci.blkdev.vendor, + "Man %02x%04x Snr %08x", diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/lcd-add-24-bpp-support-and-atmel-lcdc-support.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/lcd-add-24-bpp-support-and-atmel-lcdc-support.patch new file mode 100644 index 0000000000..126178b286 --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/lcd-add-24-bpp-support-and-atmel-lcdc-support.patch @@ -0,0 +1,670 @@ +Index: u-boot-1.1.4/common/lcd.c +=================================================================== +--- u-boot-1.1.4.orig/common/lcd.c 2007-01-11 15:25:03.000000000 +0100 ++++ u-boot-1.1.4/common/lcd.c 2007-01-11 15:28:54.000000000 +0100 +@@ -34,6 +34,7 @@ + #include <command.h> + #include <version.h> + #include <stdarg.h> ++#include <malloc.h> + #include <linux/types.h> + #include <devices.h> + #if defined(CONFIG_POST) +@@ -81,6 +82,9 @@ + extern void lcd_enable (void); + static void *lcd_logo (void); + ++#ifdef CONFIG_VIDEO_BMP_GZIP ++extern int gunzip(void *, int, unsigned char *, unsigned long *); ++#endif + + #if LCD_BPP == LCD_COLOR8 + extern void lcd_setcolreg (ushort regno, +@@ -112,9 +116,12 @@ + #if 1 + /* Copy up rows ignoring the first one */ + memcpy (CONSOLE_ROW_FIRST, CONSOLE_ROW_SECOND, CONSOLE_SCROLL_SIZE); +- + /* Clear the last one */ + memset (CONSOLE_ROW_LAST, COLOR_MASK(lcd_color_bg), CONSOLE_ROW_SIZE); ++#ifdef CONFIG_AVR32 ++ /* flush cache */ ++ dcache_clean_range(CONSOLE_ROW_FIRST, CONSOLE_SIZE); ++#endif + #else + /* + * Poor attempt to optimize speed by moving "long"s. +@@ -228,10 +235,23 @@ + static void lcd_drawchars (ushort x, ushort y, uchar *str, int count) + { + uchar *dest; +- ushort off, row; ++ ushort off, row, bpp, bytespp; ++#ifdef CONFIG_AVR32 ++ uchar *dest_start; ++#endif + +- dest = (uchar *)(lcd_base + y * lcd_line_length + x * (1 << LCD_BPP) / 8); +- off = x * (1 << LCD_BPP) % 8; ++#if (LCD_BPP > LCD_COLOR32) ++ bpp = LCD_BPP; ++#else ++ bpp = 1<<LCD_BPP; ++#endif ++ bytespp = (bpp + 7) / 8; ++ ++ dest = (uchar *)(lcd_base + y * lcd_line_length + x * bytespp); ++ off = x * bytespp * 8 % 8; ++#ifdef CONFIG_AVR32 ++ dest_start = dest; ++#endif + + for (row=0; row < VIDEO_FONT_HEIGHT; ++row, dest += lcd_line_length) { + uchar *s = str; +@@ -261,7 +281,17 @@ + bits <<= 1; + } + #elif LCD_BPP == LCD_COLOR16 +- for (c=0; c<16; ++c) { ++ for (c=0; c<8; ++c) { ++ *d++ = (bits & 0x80) ? ++ lcd_color_fg : lcd_color_bg; ++ bits <<= 1; ++ } ++#elif LCD_BPP == LCD_COLOR24 ++ for (c=0; c<8; ++c) { ++ *d++ = (bits & 0x80) ? ++ lcd_color_fg : lcd_color_bg; ++ *d++ = (bits & 0x80) ? ++ lcd_color_fg : lcd_color_bg; + *d++ = (bits & 0x80) ? + lcd_color_fg : lcd_color_bg; + bits <<= 1; +@@ -271,6 +301,10 @@ + #if LCD_BPP == LCD_MONOCHROME + *d = rest | (*d & ((1 << (8-off)) - 1)); + #endif ++#ifdef CONFIG_AVR32 ++ /* flush cache */ ++ dcache_clean_range(dest_start, (int)(d - dest_start)); ++#endif + } + } + +@@ -346,7 +380,11 @@ + + lcd_base = (void *)(gd->fb_base); + +- lcd_line_length = (panel_info.vl_col * NBITS (panel_info.vl_bpix)) / 8; ++ if (panel_info.vl_bpix > LCD_COLOR32) ++ lcd_line_length = (panel_info.vl_col * panel_info.vl_bpix) / 8; ++ else ++ lcd_line_length = (panel_info.vl_col ++ * NBITS (panel_info.vl_bpix)) / 8; + + lcd_init (lcd_base); /* LCD initialization */ + +@@ -407,6 +445,11 @@ + console_col = 0; + console_row = 0; + ++#ifdef CONFIG_AVR32 ++ /* flush cache */ ++ dcache_clean_range(CONSOLE_ROW_FIRST, CONSOLE_SIZE); ++#endif ++ + return (0); + } + +@@ -453,10 +496,17 @@ + ulong lcd_setmem (ulong addr) + { + ulong size; +- int line_length = (panel_info.vl_col * NBITS (panel_info.vl_bpix)) / 8; ++ int bpp; ++ int line_length; ++ if (panel_info.vl_bpix > LCD_COLOR32) ++ bpp = panel_info.vl_bpix; ++ else ++ bpp = NBITS (panel_info.vl_bpix); ++ ++ line_length = (panel_info.vl_col * bpp) / 8; + + debug ("LCD panel info: %d x %d, %d bit/pix\n", +- panel_info.vl_col, panel_info.vl_row, NBITS (panel_info.vl_bpix) ); ++ panel_info.vl_col, panel_info.vl_row, bpp); + + size = line_length * panel_info.vl_row; + +@@ -475,14 +525,22 @@ + + static void lcd_setfgcolor (int color) + { ++#if LCD_BPP <= LCD_COLOR8 + lcd_color_fg = color & 0x0F; ++#else ++ lcd_color_fg = color; ++#endif + } + + /*----------------------------------------------------------------------*/ + + static void lcd_setbgcolor (int color) + { ++#if LCD_BPP <= LCD_COLOR8 + lcd_color_bg = color & 0x0F; ++#else ++ lcd_color_bg = color; ++#endif + } + + /*----------------------------------------------------------------------*/ +@@ -509,7 +567,11 @@ + #ifdef CONFIG_LCD_LOGO + void bitmap_plot (int x, int y) + { ++#if !defined(CONFIG_ATMEL_LCDC) + ushort *cmap; ++#else ++ ulong *cmap; ++#endif + ushort i, j; + uchar *bmap; + uchar *fb; +@@ -519,6 +581,8 @@ + #elif defined(CONFIG_MPC823) + volatile immap_t *immr = (immap_t *) CFG_IMMR; + volatile cpm8xx_t *cp = &(immr->im_cpm); ++#elif defined(CONFIG_ATMEL_LCDC) ++ struct lcdc_info *cinfo = panel_info.lcdc; + #endif + + debug ("Logo: width %d height %d colors %d cmap %d\n", +@@ -534,6 +598,8 @@ + cmap = (ushort *)fbi->palette; + #elif defined(CONFIG_MPC823) + cmap = (ushort *)&(cp->lcd_cmap[BMP_LOGO_OFFSET*sizeof(ushort)]); ++#elif defined(CONFIG_ATMEL_LCDC) ++ cmap = (ulong *)(cinfo->palette) + BMP_LOGO_OFFSET; + #endif + + WATCHDOG_RESET(); +@@ -541,10 +607,19 @@ + /* Set color map */ + for (i=0; i<(sizeof(bmp_logo_palette)/(sizeof(ushort))); ++i) { + ushort colreg = bmp_logo_palette[i]; ++#if defined(CONFIG_ATMEL_LCDC) ++ /* convert to match palette registers */ ++ uchar red = (colreg >> 8) & 0x0f; ++ uchar green = (colreg >> 4) & 0x0f; ++ uchar blue = (colreg >> 0) & 0x0f; ++ colreg = (blue << 11); ++ colreg |= (green << 6); ++ colreg |= (red << 1); ++#endif + #ifdef CFG_INVERT_COLORS +- *cmap++ = 0xffff - colreg; ++ *(cmap++) = 0xffff - colreg; + #else +- *cmap++ = colreg; ++ *(cmap++) = colreg; + #endif + } + +@@ -579,14 +654,16 @@ + */ + int lcd_display_bitmap(ulong bmp_image, int x, int y) + { ++#if !defined(CONFIG_ATMEL_LCDC) + ushort *cmap; ++#endif + ushort i, j; + uchar *fb; + bmp_image_t *bmp=(bmp_image_t *)bmp_image; + uchar *bmap; + ushort padded_line; + unsigned long width, height; +- unsigned colors,bpix; ++ unsigned colors,bpix,bpp,bytespp; + unsigned long compression; + #if defined(CONFIG_PXA250) + struct pxafb_info *fbi = &panel_info.pxa; +@@ -597,82 +674,126 @@ + + if (!((bmp->header.signature[0]=='B') && + (bmp->header.signature[1]=='M'))) { +- printf ("Error: no valid bmp image at %lx\n", bmp_image); ++ printf ("[LCD] No valid BMP image at 0x%08lx\n", bmp_image); + return 1; +-} ++ } + + width = le32_to_cpu (bmp->header.width); + height = le32_to_cpu (bmp->header.height); ++ bpp = le16_to_cpu (bmp->header.bit_count); + colors = 1<<le16_to_cpu (bmp->header.bit_count); + compression = le32_to_cpu (bmp->header.compression); ++ bytespp = (panel_info.vl_bpix + 7) / 8; + +- bpix = NBITS(panel_info.vl_bpix); ++ if (panel_info.vl_bpix > LCD_COLOR32) ++ bpix = panel_info.vl_bpix; ++ else ++ bpix = NBITS(panel_info.vl_bpix); + +- if ((bpix != 1) && (bpix != 8)) { ++ if ((bpix != 1) && (bpix != 8) && (bpix != 24)) { + printf ("Error: %d bit/pixel mode not supported by U-Boot\n", + bpix); + return 1; + } + +- if (bpix != le16_to_cpu(bmp->header.bit_count)) { ++ if (bpix != bpp) { + printf ("Error: %d bit/pixel mode, but BMP has %d bit/pixel\n", +- bpix, +- le16_to_cpu(bmp->header.bit_count)); ++ bpix, bpp); + return 1; + } + +- debug ("Display-bmp: %d x %d with %d colors\n", +- (int)width, (int)height, (int)colors); ++ debug ("Display-bmp: %d x %d with %d colors (%d bpp)\n", ++ (int)width, (int)height, (int)colors, (int)bpp); + +- if (bpix==8) { ++ if (bpix == 8) { + #if defined(CONFIG_PXA250) + cmap = (ushort *)fbi->palette; + #elif defined(CONFIG_MPC823) + cmap = (ushort *)&(cp->lcd_cmap[255*sizeof(ushort)]); ++#elif defined(CONFIG_ATMEL_LCDC) ++ /* no need to have a palette link, we use lcd_setcolreg */ + #else + # error "Don't know location of color map" + #endif + + /* Set color map */ + for (i=0; i<colors; ++i) { ++#if LCP_BPP <= LCD_COLOR8 /* palette only for 8 bpp and less */ + bmp_color_table_entry_t cte = bmp->color_table[i]; ++#endif ++#if !defined(CONFIG_ATMEL_LCDC) + ushort colreg = + ( ((cte.red) << 8) & 0xf800) | + ( ((cte.green) << 3) & 0x07e0) | + ( ((cte.blue) >> 3) & 0x001f) ; + #ifdef CFG_INVERT_COLORS +- *cmap = 0xffff - colreg; +-#else +- *cmap = colreg; ++ colreg = 0xffff - colreg; + #endif + #if defined(CONFIG_PXA250) +- cmap++; ++ cmap[i] = colreg; + #elif defined(CONFIG_MPC823) +- cmap--; ++ cmap[colors-i] = colreg; ++#endif ++#else /* CONFIG_ATMEL_LCDC */ ++#if LCD_BPP <= LCD_COLOR8 ++ lcd_setcolreg(i, cte.red, cte.green, cte.blue); ++#endif + #endif + } + } + +- padded_line = (width&0x3) ? ((width&~0x3)+4) : (width); +- if ((x + width)>panel_info.vl_col) ++ padded_line = (((width * bpp + 7) / 8) + 3) & ~0x3; ++ if ((x + width) > panel_info.vl_col) + width = panel_info.vl_col - x; +- if ((y + height)>panel_info.vl_row) ++ if ((y + height) > panel_info.vl_row) + height = panel_info.vl_row - y; + + bmap = (uchar *)bmp + le32_to_cpu (bmp->header.data_offset); +- fb = (uchar *) (lcd_base + +- (y + height - 1) * lcd_line_length + x); +- for (i = 0; i < height; ++i) { +- WATCHDOG_RESET(); +- for (j = 0; j < width ; j++) ++ fb = (uchar *) (lcd_base + (y + height - 1) * lcd_line_length + x); ++ ++ switch (bpp) { ++ case 24: ++ for (i = 0; i < height; ++i) { ++ WATCHDOG_RESET(); ++ for (j = 0; j < width; j++) { + #if defined(CONFIG_PXA250) +- *(fb++)=*(bmap++); ++#error 24 bpp support not added for PXA250 ++#elif defined(CONFIG_ATMEL_LCDC) ++ fb[0] = bmap[0]; ++ fb[1] = bmap[1]; ++ fb[2] = bmap[2]; ++ fb += 3; ++ bmap += 3; + #elif defined(CONFIG_MPC823) +- *(fb++)=255-*(bmap++); ++#error 24 bpp support not added for MPC823 + #endif +- bmap += (width - padded_line); +- fb -= (width + lcd_line_length); +- } ++ } ++ bmap += (width * bytespp - padded_line); ++ fb -= (width * bytespp + lcd_line_length); ++ } ++ break; ++ case 1: /* pass through */ ++ case 8: ++ for (i = 0; i < height; ++i) { ++ WATCHDOG_RESET(); ++ for (j = 0; j < width; j++) { ++#if defined(CONFIG_PXA250) ++ *(fb++)=*(bmap++); ++#elif defined(CONFIG_ATMEL_LCDC) ++ *(fb++)=*(bmap++); ++#elif defined(CONFIG_MPC823) ++ *(fb++)=255-*(bmap++); ++#endif ++ } ++ bmap += (width * bytespp - padded_line); ++ fb -= (width * bytespp + lcd_line_length); ++ } ++ break; ++ default: ++ break; ++ }; ++ ++ /* TODO: flush fb */ + + return (0); + } +@@ -694,12 +815,68 @@ + static int do_splash = 1; + + if (do_splash && (s = getenv("splashimage")) != NULL) { ++#ifdef CONFIG_VIDEO_BMP_GZIP ++ bmp_image_t *bmp; ++ unsigned char *dst = NULL; ++ ulong len; ++#endif + addr = simple_strtoul(s, NULL, 16); + do_splash = 0; + ++#ifdef CONFIG_VIDEO_BMP_GZIP ++ bmp = (bmp_image_t *)addr; ++ ++ if (!((bmp->header.signature[0]=='B') && ++ (bmp->header.signature[1]=='M'))) { ++ len = CFG_VIDEO_LOGO_MAX_SIZE; ++ dst = malloc(CFG_VIDEO_LOGO_MAX_SIZE); ++ if (dst == NULL) { ++ printf("[LCD] Malloc for gunzip failed!\n"); ++ return ((void *)lcd_base); ++ } ++ if (gunzip(dst, CFG_VIDEO_LOGO_MAX_SIZE, ++ (uchar *)addr, &len) != 0) { ++ free(dst); ++ printf("[LCD] No valid BMP image at 0x%08lx\n", ++ addr); ++ return ((void *)lcd_base); ++ } ++ if (len == CFG_VIDEO_LOGO_MAX_SIZE) { ++ printf("[LCD] Image could be truncated (increase " ++ "CFG_VIDEO_LOGO_MAX_SIZE)!\n"); ++ } ++ ++ /* ++ * Set addr to decompressed image ++ */ ++ bmp = (bmp_image_t *)dst; ++ ++ /* ++ * Check for bmp mark 'BM' ++ */ ++ if (!((bmp->header.signature[0] == 'B') && ++ (bmp->header.signature[1] == 'M'))) { ++ printf("[LCD] No valid BMP image at 0x%08lx\n", ++ addr); ++ free(dst); ++ return ((void *)lcd_base); ++ } ++ ++ addr = (ulong)dst; ++ } ++#endif + if (lcd_display_bitmap (addr, 0, 0) == 0) { ++#ifdef CONFIG_VIDEO_BMP_GZIP ++ if (dst) ++ free(dst); ++#endif + return ((void *)lcd_base); + } ++ ++#ifdef CONFIG_VIDEO_BMP_GZIP ++ if (dst) ++ free(dst); ++#endif + } + #endif /* CONFIG_SPLASH_SCREEN */ + +Index: u-boot-1.1.4/include/lcd.h +=================================================================== +--- u-boot-1.1.4.orig/include/lcd.h 2007-01-11 15:25:03.000000000 +0100 ++++ u-boot-1.1.4/include/lcd.h 2007-01-11 15:25:38.000000000 +0100 +@@ -148,7 +148,159 @@ + + extern vidinfo_t panel_info; + +-#endif /* CONFIG_MPC823 or CONFIG_PXA250 */ ++#elif defined CONFIG_ATMEL_LCDC ++struct lcdc_bitfield { ++ u32 offset; /* beginning of bitfield */ ++ u32 length; /* length of bitfield */ ++ u32 msb_right; /* != 0 : Most significant bit is right */ ++}; ++ ++struct lcdc_var_screeninfo { ++ u32 xres; /* visible resolution */ ++ u32 yres; ++ u32 xres_virtual; /* virtual resolution */ ++ u32 yres_virtual; ++ u32 xoffset; /* offset from virtual to visible */ ++ u32 yoffset; /* resolution */ ++ ++ u32 bits_per_pixel; /* guess what */ ++ u32 grayscale; /* != 0 Graylevels instead of colors */ ++ ++ struct lcdc_bitfield red; /* bitfield in fb mem if true color, */ ++ struct lcdc_bitfield green; /* else only length is significant */ ++ struct lcdc_bitfield blue; ++ struct lcdc_bitfield transp; /* transparency */ ++ ++ u32 nonstd; /* != 0 Non standard pixel format */ ++ ++ u32 activate; /* see FB_ACTIVATE_* */ ++ ++ u32 height; /* height of picture in mm */ ++ u32 width; /* width of picture in mm */ ++ ++ u32 accel_flags; /* (OBSOLETE) see fb_info.flags */ ++ ++ /* Timing: All values in pixclocks, except pixclock (of course) */ ++ u32 pixclock; /* pixel clock in ps (pico seconds) */ ++ u32 left_margin; /* time from sync to picture */ ++ u32 right_margin; /* time from picture to sync */ ++ u32 upper_margin; /* time from sync to picture */ ++ u32 lower_margin; ++ u32 hsync_len; /* length of horizontal sync */ ++ u32 vsync_len; /* length of vertical sync */ ++ u32 sync; /* see FB_SYNC_* */ ++ u32 vmode; /* see FB_VMODE_* */ ++ u32 rotate; /* angle we rotate counter clockwise */ ++ u32 reserved[5]; /* Reserved for future compatibility */ ++}; ++ ++/* ++ * Atmel LCDC DMA descriptor ++ */ ++struct lcdc_dma_descriptor { ++ u_long fdadr; /* Frame descriptor address register */ ++ u_long fsadr; /* Frame source address register */ ++ u_long fidr; /* Frame ID register */ ++ u_long ldcmd; /* Command register */ ++}; ++ ++/* ++ * Atmel LCDC info ++ */ ++struct lcdc_info { ++ u_long reg_lccr3; ++ u_long reg_lccr2; ++ u_long reg_lccr1; ++ u_long reg_lccr0; ++ u_long fdadr0; ++ u_long fdadr1; ++ ++ void *regs; ++ ++ u_long guard_time; ++ u_long xres; ++ u_long yres; ++ u_long xres_virtual; ++ u_long yres_virtual; ++ u_long bits_per_pixel; ++ u_long smem_start; ++ u_long line_length; ++ u_long visual; ++ ++ u_long pixclock; ++ u_long left_margin; ++ u_long right_margin; ++ u_long upper_margin; ++ u_long lower_margin; ++ u_long hsync_len; ++ u_long vsync_len; ++ u_long sync; ++ u_long yoffset; ++ u_long xoffset; ++ ++ struct lcdc_var_screeninfo var; ++ ++ /* DMA descriptors */ ++ struct lcdc_dma_descriptor *dmadesc_fblow; ++ struct lcdc_dma_descriptor *dmadesc_fbhigh; ++ struct lcdc_dma_descriptor *dmadesc_palette; ++ ++ u_long screen; /* physical address of frame buffer */ ++ u_long palette; /* physical address of palette memory */ ++ u_int palette_size; ++ ++ /* Device resource */ ++ const struct device *dev; ++}; ++ ++/* ++ * LCD controller stucture for AVR32 CPU ++ */ ++typedef struct vidinfo { ++ ushort vl_col; /* Number of columns (i.e. 640) */ ++ ushort vl_row; /* Number of rows (i.e. 480) */ ++ ushort vl_width; /* Width of display area in millimeters */ ++ ushort vl_height; /* Height of display area in millimeters */ ++ ++ /* LCD configuration register */ ++ u_char vl_clkp; /* Clock polarity */ ++ u_char vl_oep; /* Output Enable polarity */ ++ u_char vl_hsp; /* Horizontal Sync polarity */ ++ u_char vl_vsp; /* Vertical Sync polarity */ ++ u_char vl_dp; /* Data polarity */ ++ u_char vl_bpix; /* Bits per pixel, 0 = 1, 1 = 2, 2 = 4, 3 = 8, 4 = 16 */ ++ u_char vl_lbw; /* LCD Bus width, 0 = 4, 1 = 8 */ ++ u_char vl_splt; /* Split display, 0 = single-scan, 1 = dual-scan */ ++ u_char vl_clor; /* Color, 0 = mono, 1 = color */ ++ u_char vl_tft; /* 0 = passive, 1 = TFT */ ++ ++ /* Horizontal control register. Timing from data sheet */ ++ ushort vl_hpw; /* Horz sync pulse width */ ++ u_char vl_blw; /* Wait before of line */ ++ u_char vl_elw; /* Wait end of line */ ++ ++ /* Vertical control register. */ ++ u_char vl_vpw; /* Vertical sync pulse width */ ++ u_char vl_bfw; /* Wait before of frame */ ++ u_char vl_efw; /* Wait end of frame */ ++ ++ /* Atmel LCDC controller params */ ++ struct lcdc_info *lcdc; ++ u_long pixclock; ++ u_long left_margin; ++ u_long right_margin; ++ u_long upper_margin; ++ u_long lower_margin; ++ u_long hsync_len; ++ u_long vsync_len; ++ u_long sync; ++ u_long yoffset; ++ u_long xoffset; ++} vidinfo_t; ++ ++extern vidinfo_t panel_info; ++ ++#endif /* CONFIG_MPC823 or CONFIG_PXA250 or CONFIG_ATMEL_LCDC */ + + /* Video functions */ + +@@ -184,6 +336,16 @@ + #define LCD_COLOR4 2 + #define LCD_COLOR8 3 + #define LCD_COLOR16 4 ++#define LCD_COLOR32 5 ++#define LCD_COLOR15 15 ++#define LCD_COLOR24 24 ++ ++#define FB_VISUAL_MONO01 0 /* Monochr. 1=Black 0=White */ ++#define FB_VISUAL_MONO10 1 /* Monochr. 1=White 0=Black */ ++#define FB_VISUAL_TRUECOLOR 2 /* True color */ ++#define FB_VISUAL_PSEUDOCOLOR 3 /* Pseudo color (like atari) */ ++#define FB_VISUAL_DIRECTCOLOR 4 /* Direct color */ ++#define FB_VISUAL_STATIC_PSEUDOCOLOR 5 /* Pseudo color readonly */ + + /*----------------------------------------------------------------------*/ + #if defined(CONFIG_LCD_INFO_BELOW_LOGO) +@@ -235,7 +397,7 @@ + # define CONSOLE_COLOR_GREY 14 + # define CONSOLE_COLOR_WHITE 15 /* Must remain last / highest */ + +-#else ++#elif LCD_BPP == LCD_COLOR16 + + /* + * 16bpp color definitions +@@ -243,6 +405,14 @@ + # define CONSOLE_COLOR_BLACK 0x0000 + # define CONSOLE_COLOR_WHITE 0xffff /* Must remain last / highest */ + ++#else ++ ++/* ++ * 24bpp color definitions ++ */ ++# define CONSOLE_COLOR_BLACK 0x000000 ++# define CONSOLE_COLOR_WHITE 0xffffff /* Must remain last / highest */ ++ + #endif /* color definitions */ + + /************************************************************************/ +@@ -274,6 +444,8 @@ + (c) << 4 | (c) << 5 | (c) << 6 | (c) << 7) + #elif LCD_BPP == LCD_COLOR8 + # define COLOR_MASK(c) (c) ++#elif LCD_BPP == LCD_COLOR24 ++# define COLOR_MASK(c) (c) + #else + # error Unsupported LCD BPP. + #endif diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/lcdc-driver-for-avr32.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/lcdc-driver-for-avr32.patch new file mode 100644 index 0000000000..e838360992 --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/lcdc-driver-for-avr32.patch @@ -0,0 +1,755 @@ +diff -uprN u-boot-orig/include/atmel_lcdc.h u-boot/include/atmel_lcdc.h +--- u-boot-orig/include/atmel_lcdc.h 1970-01-01 01:00:00.000000000 +0100 ++++ u-boot/include/atmel_lcdc.h 2006-12-21 16:26:10.000000000 +0100 +@@ -0,0 +1,269 @@ ++/* ++ * Register definitions for Atmel/SIDSA LCD Controller ++ * ++ * Copyright (C) 2004-2006 Atmel Corporation ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++#ifndef __ATMEL_LCDC_H__ ++#define __ATMEL_LCDC_H__ ++ ++#define LCDC_CONTRAST_CTR 0x00000840 ++# define LCDC_CONTRAST_CTR_ENA_OFFSET 3 ++# define LCDC_CONTRAST_CTR_ENA_SIZE 1 ++# define LCDC_CONTRAST_CTR_POL_OFFSET 2 ++# define LCDC_CONTRAST_CTR_POL_SIZE 1 ++# define LCDC_CONTRAST_CTR_PS_OFFSET 0 ++# define LCDC_CONTRAST_CTR_PS_SIZE 2 ++#define LCDC_CONTRAST_VAL 0x00000844 ++# define LCDC_CONTRAST_VAL_CVAL_OFFSET 0 ++# define LCDC_CONTRAST_VAL_CVAL_SIZE 8 ++#define LCDC_DMABADDR1 0x00000000 ++# define LCDC_DMABADDR1_BADDR_U_OFFSET 0 ++# define LCDC_DMABADDR1_BADDR_U_SIZE 32 ++#define LCDC_DMABADDR2 0x00000004 ++# define LCDC_DMABADDR2_BADDR_L_OFFSET 0 ++# define LCDC_DMABADDR2_BADDR_L_SIZE 32 ++#define LCDC_DMACON 0x0000001C ++# define LCDC_DMACON_DMABUSY_OFFSET 2 ++# define LCDC_DMACON_DMABUSY_SIZE 1 ++# define LCDC_DMACON_DMAEN_OFFSET 0 ++# define LCDC_DMACON_DMAEN_SIZE 1 ++# define LCDC_DMACON_DMARST_OFFSET 1 ++# define LCDC_DMACON_DMARST_SIZE 1 ++# define LCDC_DMACON_DMAUPDT_OFFSET 3 ++# define LCDC_DMACON_DMAUPDT_SIZE 1 ++# define LCDC_DMACON_DMA2DEN_OFFSET 4 ++# define LCDC_DMACON_DMA2DEN_SIZE 1 ++#define LCDC_DMAFRMADD1 0x00000010 ++# define LCDC_DMAFRMADD1_FRMADD_U_OFFSET 0 ++# define LCDC_DMAFRMADD1_FRMADD_U_SIZE 32 ++#define LCDC_DMAFRMADD2 0x00000014 ++# define LCDC_DMAFRMADD2_FRMADD_L_OFFSET 0 ++# define LCDC_DMAFRMADD2_FRMADD_L_SIZE 32 ++#define LCDC_DMAFRMCFG 0x00000018 ++# define LCDC_DMAFRMCFG_BRSTLEN_OFFSET 24 ++# define LCDC_DMAFRMCFG_BRSTLEN_SIZE 7 ++# define LCDC_DMAFRMCFG_FRMSIZE_OFFSET 0 ++# define LCDC_DMAFRMCFG_FRMSIZE_SIZE 23 ++#define LCDC_DMAFRMPT1 0x00000008 ++# define LCDC_DMAFRMPT1_FRMPT_U_OFFSET 0 ++# define LCDC_DMAFRMPT1_FRMPT_U_SIZE 23 ++#define LCDC_DMAFRMPT2 0x0000000C ++# define LCDC_DMAFRMPT2_FRMPT_L_OFFSET 0 ++# define LCDC_DMAFRMPT2_FRMPT_L_SIZE 23 ++#define LCDC_DMA2DCFG 0x00000020 ++# define LCDC_DMA2DCFG_ADDRINC_OFFSET 0 ++# define LCDC_DMA2DCFG_ADDRINC_SIZE 16 ++# define LCDC_DMA2DCFG_PIXELOFF_OFFSET 24 ++# define LCDC_DMA2DCFG_PIXELOFF_SIZE 5 ++#define LCDC_DP1_2 0x0000081C ++# define LCDC_DP1_2_DP1_2_OFFSET 0 ++# define LCDC_DP1_2_DP1_2_SIZE 8 ++#define LCDC_DP2_3 0x00000828 ++# define LCDC_DP2_3_DP2_3_OFFSET 0 ++# define LCDC_DP2_3_DP2_3_SIZE 12 ++#define LCDC_DP3_4 0x00000830 ++# define LCDC_DP3_4_DP3_4_OFFSET 0 ++# define LCDC_DP3_4_DP3_4_SIZE 16 ++#define LCDC_DP3_5 0x00000824 ++# define LCDC_DP3_5_DP3_5_OFFSET 0 ++# define LCDC_DP3_5_DP3_5_SIZE 20 ++#define LCDC_DP4_5 0x00000834 ++# define LCDC_DP4_5_DP4_5_OFFSET 0 ++# define LCDC_DP4_5_DP4_5_SIZE 20 ++#define LCDC_DP4_7 0x00000820 ++# define LCDC_DP4_7_DP4_7_OFFSET 0 ++# define LCDC_DP4_7_DP4_7_SIZE 28 ++#define LCDC_DP5_7 0x0000082C ++# define LCDC_DP5_7_DP5_7_OFFSET 0 ++# define LCDC_DP5_7_DP5_7_SIZE 28 ++#define LCDC_DP6_7 0x00000838 ++# define LCDC_DP6_7_DP6_7_OFFSET 0 ++# define LCDC_DP6_7_DP6_7_SIZE 28 ++#define LCDC_LCDCON1 0x00000800 ++# define LCDC_LCDCON1_BYPASS_OFFSET 0 ++# define LCDC_LCDCON1_BYPASS_SIZE 1 ++# define LCDC_LCDCON1_CLKVAL_OFFSET 12 ++# define LCDC_LCDCON1_CLKVAL_SIZE 9 ++# define LCDC_LCDCON1_LINECNT_OFFSET 21 ++# define LCDC_LCDCON1_LINECNT_SIZE 11 ++#define LCDC_LCDCON2 0x00000804 ++# define LCDC_LCDCON2_CLKMOD_OFFSET 15 ++# define LCDC_LCDCON2_CLKMOD_SIZE 1 ++# define LCDC_LCDCON2_DISTYPE_OFFSET 0 ++# define LCDC_LCDCON2_DISTYPE_SIZE 2 ++# define LCDC_LCDCON2_IFWIDTH_OFFSET 3 ++# define LCDC_LCDCON2_IFWIDTH_SIZE 2 ++# define LCDC_LCDCON2_INVCLK_OFFSET 11 ++# define LCDC_LCDCON2_INVCLK_SIZE 1 ++# define LCDC_LCDCON2_INVDVAL_OFFSET 12 ++# define LCDC_LCDCON2_INVDVAL_SIZE 1 ++# define LCDC_LCDCON2_INVFRAME_OFFSET 9 ++# define LCDC_LCDCON2_INVFRAME_SIZE 1 ++# define LCDC_LCDCON2_INVLINE_OFFSET 10 ++# define LCDC_LCDCON2_INVLINE_SIZE 1 ++# define LCDC_LCDCON2_INVVD_OFFSET 8 ++# define LCDC_LCDCON2_INVVD_SIZE 1 ++# define LCDC_LCDCON2_MEMOR_OFFSET 30 ++# define LCDC_LCDCON2_MEMOR_SIZE 2 ++# define LCDC_LCDCON2_PIXELSIZE_OFFSET 5 ++# define LCDC_LCDCON2_PIXELSIZE_SIZE 3 ++# define LCDC_LCDCON2_SCANMOD_OFFSET 2 ++# define LCDC_LCDCON2_SCANMOD_SIZE 1 ++#define LCDC_LCDFIFO 0x00000814 ++# define LCDC_LCDFIFO_FIFOTH_OFFSET 0 ++# define LCDC_LCDFIFO_FIFOTH_SIZE 16 ++#define LCDC_LCDFRMCFG 0x00000810 ++# define LCDC_LCDFRMCFG_LINESIZE_OFFSET 21 ++# define LCDC_LCDFRMCFG_LINESIZE_SIZE 11 ++# define LCDC_LCDFRMCFG_LINEVAL_OFFSET 0 ++# define LCDC_LCDFRMCFG_LINEVAL_SIZE 11 ++#define LCDC_LCDMVAL 0x00000818 ++# define LCDC_LCDMVAL_MMODE_OFFSET 31 ++# define LCDC_LCDMVAL_MMODE_SIZE 1 ++# define LCDC_LCDMVAL_MVAL_OFFSET 0 ++# define LCDC_LCDMVAL_MVAL_SIZE 8 ++#define LCDC_LCDTIM1 0x00000808 ++# define LCDC_LCDTIM1_VBP_OFFSET 8 ++# define LCDC_LCDTIM1_VBP_SIZE 8 ++# define LCDC_LCDTIM1_VFP_OFFSET 0 ++# define LCDC_LCDTIM1_VFP_SIZE 8 ++# define LCDC_LCDTIM1_VHDLY_OFFSET 24 ++# define LCDC_LCDTIM1_VHDLY_SIZE 4 ++# define LCDC_LCDTIM1_VPW_OFFSET 16 ++# define LCDC_LCDTIM1_VPW_SIZE 6 ++#define LCDC_LCDTIM2 0x0000080C ++# define LCDC_LCDTIM2_HBP_OFFSET 0 ++# define LCDC_LCDTIM2_HBP_SIZE 8 ++# define LCDC_LCDTIM2_HFP_OFFSET 21 ++# define LCDC_LCDTIM2_HFP_SIZE 11 ++# define LCDC_LCDTIM2_HPW_OFFSET 8 ++# define LCDC_LCDTIM2_HPW_SIZE 6 ++#define LCDC_LCD_GPR 0x0000085C ++# define LCDC_LCD_GPR_GPRB0_OFFSET 0 ++# define LCDC_LCD_GPR_GPRB0_SIZE 1 ++# define LCDC_LCD_GPR_GPRB1_OFFSET 1 ++# define LCDC_LCD_GPR_GPRB1_SIZE 1 ++# define LCDC_LCD_GPR_GPRB2_OFFSET 2 ++# define LCDC_LCD_GPR_GPRB2_SIZE 1 ++# define LCDC_LCD_GPR_GPRB3_OFFSET 3 ++# define LCDC_LCD_GPR_GPRB3_SIZE 1 ++# define LCDC_LCD_GPR_GPRB4_OFFSET 4 ++# define LCDC_LCD_GPR_GPRB4_SIZE 1 ++# define LCDC_LCD_GPR_GPRB5_OFFSET 5 ++# define LCDC_LCD_GPR_GPRB5_SIZE 1 ++# define LCDC_LCD_GPR_GPRB6_OFFSET 6 ++# define LCDC_LCD_GPR_GPRB6_SIZE 1 ++# define LCDC_LCD_GPR_GPRB7_OFFSET 7 ++# define LCDC_LCD_GPR_GPRB7_SIZE 1 ++#define LCDC_LCD_ICR 0x00000858 ++# define LCDC_LCD_ICR_EOFIC_OFFSET 2 ++# define LCDC_LCD_ICR_EOFIC_SIZE 1 ++# define LCDC_LCD_ICR_LNIC_OFFSET 0 ++# define LCDC_LCD_ICR_LNIC_SIZE 1 ++# define LCDC_LCD_ICR_LSTLNIC_OFFSET 1 ++# define LCDC_LCD_ICR_LSTLNIC_SIZE 1 ++# define LCDC_LCD_ICR_MERIC_OFFSET 6 ++# define LCDC_LCD_ICR_MERIC_SIZE 1 ++# define LCDC_LCD_ICR_OWRIC_OFFSET 5 ++# define LCDC_LCD_ICR_OWRIC_SIZE 1 ++# define LCDC_LCD_ICR_UFLWIC_OFFSET 4 ++# define LCDC_LCD_ICR_UFLWIC_SIZE 1 ++#define LCDC_LCD_IDR 0x0000084C ++# define LCDC_LCD_IDR_EOFID_OFFSET 2 ++# define LCDC_LCD_IDR_EOFID_SIZE 1 ++# define LCDC_LCD_IDR_LNID_OFFSET 0 ++# define LCDC_LCD_IDR_LNID_SIZE 1 ++# define LCDC_LCD_IDR_LSTLNID_OFFSET 1 ++# define LCDC_LCD_IDR_LSTLNID_SIZE 1 ++# define LCDC_LCD_IDR_MERID_OFFSET 6 ++# define LCDC_LCD_IDR_MERID_SIZE 1 ++# define LCDC_LCD_IDR_OWRID_OFFSET 5 ++# define LCDC_LCD_IDR_OWRID_SIZE 1 ++# define LCDC_LCD_IDR_UFLWID_OFFSET 4 ++# define LCDC_LCD_IDR_UFLWID_SIZE 1 ++#define LCDC_LCD_IER 0x00000848 ++# define LCDC_LCD_IER_EOFIE_OFFSET 2 ++# define LCDC_LCD_IER_EOFIE_SIZE 1 ++# define LCDC_LCD_IER_LNIE_OFFSET 0 ++# define LCDC_LCD_IER_LNIE_SIZE 1 ++# define LCDC_LCD_IER_LSTLNIE_OFFSET 1 ++# define LCDC_LCD_IER_LSTLNIE_SIZE 1 ++# define LCDC_LCD_IER_MERIE_OFFSET 6 ++# define LCDC_LCD_IER_MERIE_SIZE 1 ++# define LCDC_LCD_IER_OWRIE_OFFSET 5 ++# define LCDC_LCD_IER_OWRIE_SIZE 1 ++# define LCDC_LCD_IER_UFLWIE_OFFSET 4 ++# define LCDC_LCD_IER_UFLWIE_SIZE 1 ++#define LCDC_LCD_IMR 0x00000850 ++# define LCDC_LCD_IMR_EOFIM_OFFSET 2 ++# define LCDC_LCD_IMR_EOFIM_SIZE 1 ++# define LCDC_LCD_IMR_LNIM_OFFSET 0 ++# define LCDC_LCD_IMR_LNIM_SIZE 1 ++# define LCDC_LCD_IMR_LSTLNIM_OFFSET 1 ++# define LCDC_LCD_IMR_LSTLNIM_SIZE 1 ++# define LCDC_LCD_IMR_MERIM_OFFSET 6 ++# define LCDC_LCD_IMR_MERIM_SIZE 1 ++# define LCDC_LCD_IMR_OWRIM_OFFSET 5 ++# define LCDC_LCD_IMR_OWRIM_SIZE 1 ++# define LCDC_LCD_IMR_UFLWIM_OFFSET 4 ++# define LCDC_LCD_IMR_UFLWIM_SIZE 1 ++#define LCDC_LCD_IRR 0x00000864 ++# define LCDC_LCD_IRR_EOFIR_OFFSET 2 ++# define LCDC_LCD_IRR_EOFIR_SIZE 1 ++# define LCDC_LCD_IRR_LNIR_OFFSET 0 ++# define LCDC_LCD_IRR_LNIR_SIZE 1 ++# define LCDC_LCD_IRR_LSTLNIR_OFFSET 1 ++# define LCDC_LCD_IRR_LSTLNIR_SIZE 1 ++# define LCDC_LCD_IRR_MERIR_OFFSET 6 ++# define LCDC_LCD_IRR_MERIR_SIZE 1 ++# define LCDC_LCD_IRR_OWRIR_OFFSET 5 ++# define LCDC_LCD_IRR_OWRIR_SIZE 1 ++# define LCDC_LCD_IRR_UFLWIR_OFFSET 4 ++# define LCDC_LCD_IRR_UFLWIR_SIZE 1 ++#define LCDC_LCD_ISR 0x00000854 ++# define LCDC_LCD_ISR_EOFIS_OFFSET 2 ++# define LCDC_LCD_ISR_EOFIS_SIZE 1 ++# define LCDC_LCD_ISR_LNIS_OFFSET 0 ++# define LCDC_LCD_ISR_LNIS_SIZE 1 ++# define LCDC_LCD_ISR_LSTLNIS_OFFSET 1 ++# define LCDC_LCD_ISR_LSTLNIS_SIZE 1 ++# define LCDC_LCD_ISR_MERIS_OFFSET 6 ++# define LCDC_LCD_ISR_MERIS_SIZE 1 ++# define LCDC_LCD_ISR_OWRIS_OFFSET 5 ++# define LCDC_LCD_ISR_OWRIS_SIZE 1 ++# define LCDC_LCD_ISR_UFLWIS_OFFSET 4 ++# define LCDC_LCD_ISR_UFLWIS_SIZE 1 ++#define LCDC_LCD_ITR 0x00000860 ++# define LCDC_LCD_ITR_EOFIT_OFFSET 2 ++# define LCDC_LCD_ITR_EOFIT_SIZE 1 ++# define LCDC_LCD_ITR_LNIT_OFFSET 0 ++# define LCDC_LCD_ITR_LNIT_SIZE 1 ++# define LCDC_LCD_ITR_LSTLNIT_OFFSET 1 ++# define LCDC_LCD_ITR_LSTLNIT_SIZE 1 ++# define LCDC_LCD_ITR_MERIT_OFFSET 6 ++# define LCDC_LCD_ITR_MERIT_SIZE 1 ++# define LCDC_LCD_ITR_OWRIT_OFFSET 5 ++# define LCDC_LCD_ITR_OWRIT_SIZE 1 ++# define LCDC_LCD_ITR_UFLWIT_OFFSET 4 ++# define LCDC_LCD_ITR_UFLWIT_SIZE 1 ++#define LCDC_PWRCON 0x0000083C ++# define LCDC_PWRCON_GUARD_TIME_OFFSET 1 ++# define LCDC_PWRCON_GUARD_TIME_SIZE 7 ++# define LCDC_PWRCON_LCD_BUSY_OFFSET 31 ++# define LCDC_PWRCON_LCD_BUSY_SIZE 1 ++# define LCDC_PWRCON_LCD_PWR_OFFSET 0 ++# define LCDC_PWRCON_LCD_PWR_SIZE 1 ++ ++#define LCDC_BIT(name) (1 << LCDC_##name##_OFFSET) ++#define LCDC_MKBF(name,value) (((value) & ((1 << LCDC_##name##_SIZE) - 1)) << LCDC_##name##_OFFSET) ++#define LCDC_GETBF(name,value) (((value) >> LCDC_##name##_OFFSET) & ((1 << LCDC_##name##_SIZE) - 1)) ++#define LCDC_INSBF(name,value,old) (((old) & ~(((1 << LCDC_##name##_SIZE) - 1) << LCDC_##name##_OFFSET)) | LCDC_MKBF(name, value)) ++ ++#define lcdc_readl(port,reg) readl((port)->regs + LCDC_##reg) ++#define lcdc_writel(port,reg,value) writel((value), (port)->regs + LCDC_##reg) ++ ++#endif /* __ASM_AVR32_PERIPH_LCDC_H__ */ +diff -uprN u-boot-orig/drivers/atmel_lcdc.c u-boot/drivers/atmel_lcdc.c +--- u-boot-orig/drivers/atmel_lcdc.c 1970-01-01 01:00:00.000000000 +0100 ++++ u-boot/drivers/atmel_lcdc.c 2007-01-05 12:29:24.000000000 +0100 +@@ -0,0 +1,465 @@ ++/* ++ * Framebuffer Driver for Atmel/SIDSA LCD Controller ++ * ++ * Copyright (C) 2006 Atmel Corporation ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ */ ++ ++#include <common.h> ++ ++#if defined(CONFIG_ATMEL_LCDC) ++ ++#ifndef LCD_BPP ++# define LCD_BPP LCD_COLOR24 ++#endif ++ ++#include <lcd.h> ++#include <malloc.h> ++#include <video_fb.h> ++ ++#include <atmel_lcdc.h> ++ ++#include <asm/io.h> ++#include <asm/arch/sm.h> ++#include <asm/arch/platform.h> ++ ++/* Sync defines */ ++#define FB_SYNC_HOR_HIGH_ACT 1 /* horizontal sync high active */ ++#define FB_SYNC_VERT_HIGH_ACT 2 /* vertical sync high active */ ++#define FB_SYNC_EXT 4 /* external sync */ ++#define FB_SYNC_COMP_HIGH_ACT 8 /* composite sync high active */ ++#define FB_SYNC_BROADCAST 16 /* broadcast video timings */ ++/* vtotal = 144d/288n/576i => PAL */ ++/* vtotal = 121d/242n/484i => NTSC */ ++#define FB_SYNC_ON_GREEN 32 /* sync on green */ ++#define FB_SYNC_PCLK_RISING 64 /* pixel data sampled on rising pclk */ ++ ++/* More or less configurable parameters */ ++#define LCDC_FIFO_SIZE 512 ++#define LCDC_DMA_BURST_LEN 8 ++ ++/* TODO: These should be autogenerated from part description file */ ++#define LCDC_DISTYPE_STN_MONO 0 ++#define LCDC_DISTYPE_STN_COLOR 1 ++#define LCDC_DISTYPE_TFT 2 ++#define LCDC_LUT 0xc00 ++ ++#ifdef CONFIG_DISPLAY_LTV350QV ++/* 320x240x24 @ 75 Hz */ ++vidinfo_t panel_info = { ++ vl_col: 320, /* Number of columns */ ++ vl_row: 240, /* Number of rows */ ++ vl_width: 320, /* Width in mm */ ++ vl_height: 240, /* Height in mm */ ++ vl_clkp: CFG_HIGH, /* Clock polarity */ ++ vl_oep: CFG_HIGH, /* Output enable polarity */ ++ vl_hsp: CFG_HIGH, /* Horizontal sync polarity */ ++ vl_vsp: CFG_HIGH, /* Vertical sync polarity */ ++ vl_dp: CFG_HIGH, /* Data polarity */ ++ vl_bpix: LCD_BPP, /* Bits per pixel */ ++ vl_lbw: 1, /* LCD bus width */ ++ vl_splt: 0, /* Split display? 0=single, 1=dual */ ++ vl_clor: 1, /* Color? 0 = mono, 1 = color */ ++ vl_tft: 1, /* TFT? 0 = passive, 1 = TFT */ ++ vl_hpw: 16, /* Horizontal sync pulse width */ ++ vl_blw: 17, /* Wait before of line */ ++ vl_elw: 33, /* Wait end of line */ ++ vl_vpw: 1, /* Vertical sync pulse width */ ++ vl_bfw: 10, /* Wait before of frame */ ++ vl_efw: 10, /* Wait end of frame */ ++ ++ pixclock: 145111, ++ left_margin: 17, ++ right_margin: 33, ++ upper_margin: 10, ++ lower_margin: 10, ++ hsync_len: 16, ++ vsync_len: 1, ++ sync: FB_SYNC_PCLK_RISING, ++ yoffset: 0, ++ xoffset: 0, ++}; ++#else ++#error A display must be defined for the LCD controller ++#endif ++ ++void lcd_ctrl_init (void *lcdbase); ++void lcd_enable (void); ++ ++int lcd_line_length; ++int lcd_color_fg; ++int lcd_color_bg; ++ ++void *lcd_base; /* Start of framebuffer memory */ ++void *lcd_console_address; /* Start of console buffer */ ++ ++short console_col; ++short console_row; ++ ++static int lcdc_init_mem(void *lcdbase); ++void lcdc_init(void *lcdbase); ++ ++static inline u_int chan_to_field(u_int chan, const struct lcdc_bitfield *bf) ++{ ++ chan &= 0xffff; ++ chan >>= 16 - bf->length; ++ return chan << bf->offset; ++} ++ ++/* ++ * ************************************************************************* * ++ * Das U-Boot LCD functions * ++ * ************************************************************************* * ++ */ ++void lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue) ++{ ++ struct lcdc_info *cinfo = panel_info.lcdc; ++ u_int *palette = (u_int *)cinfo->palette; ++ u_int val; ++ ++ if (cinfo->var.grayscale) ++ red = green = blue = (19595 * red + 38470 * green ++ + 7471 * blue) >> 16; ++ ++ switch (cinfo->visual) { ++ case FB_VISUAL_TRUECOLOR: ++ if (regno < 16) { ++ /* TODO: I do not get why we need a palette here ++ palette = cinfo->pseudo_palette; ++ */ ++ ++ val = chan_to_field(red, &cinfo->var.red); ++ val |= chan_to_field(green, &cinfo->var.green); ++ val |= chan_to_field(blue, &cinfo->var.blue); ++ ++ palette[regno] = val; ++ } ++ break; ++ ++ case FB_VISUAL_PSEUDOCOLOR: ++ if (regno < 256) { ++ val = ((blue << 7) & 0x7c00); ++ val |= ((green << 2) & 0x03e0); ++ val |= ((red >> 3) & 0x001f); ++ ++ /* ++ * TODO: intensity bit. Maybe something like ++ * ~(red[10] ^ green[10] ^ blue[10]) & 1 ++ */ ++ palette[regno] = val; ++ } ++ break; ++ } ++} ++ ++void lcd_ctrl_init (void *lcdbase) ++{ ++ lcdc_init_mem(lcdbase); ++ lcdc_init(lcdbase); ++} ++ ++ ++ ++void lcd_enable (void) ++{ ++ return; ++} ++ ++ulong calc_fbsize (void) ++{ ++ ulong size; ++ int line_length; ++ if (panel_info.vl_bpix > LCD_COLOR32) ++ line_length = panel_info.vl_col * panel_info.vl_bpix / 8; ++ else ++ line_length = panel_info.vl_col * NBITS(panel_info.vl_bpix) / 8; ++ ++ size = line_length * panel_info.vl_row; ++ size += PAGE_SIZE; ++ ++ return size; ++} ++ ++/* ************************************************************************* * ++ * Architecture specific functions * ++ * ************************************************************************* * ++ */ ++static int lcdc_init_mem(void *lcdbase) ++{ ++ struct lcdc_info *cinfo; ++ const struct device *dev; ++ ++ cinfo = malloc(sizeof(struct lcdc_info)); ++ if (!cinfo) { ++ printf("lcdc: could not allocate RAM for lcdc_info\n"); ++ return -1; ++ } ++ ++ dev = get_device(DEVICE_LCDC); ++ if (!dev) ++ printf("lcdc: could not get LCDC\n"); ++ ++ cinfo->dev = dev; ++ cinfo->regs = dev->regs; ++ ++ cinfo->screen = (u_long)lcdbase; ++ cinfo->palette_size = NBITS(panel_info.vl_bpix) == 8 ? 256 : 16; ++ /* palette is stored in LCD controller IO memory */ ++ cinfo->palette = (u_long)cinfo->regs + LCDC_LUT; ++ ++ panel_info.lcdc = cinfo; ++ ++ return 0; ++} ++ ++static void lcdc_update_dma() ++{ ++ unsigned long dma_addr; ++ unsigned long pixeloff; ++ unsigned long dma2dcfg; ++ struct lcdc_info *cinfo = panel_info.lcdc; ++ ++ dma_addr = (cinfo->smem_start + cinfo->yoffset * cinfo->line_length ++ + cinfo->xoffset * cinfo->bits_per_pixel / 8); ++ ++ dma_addr &= ~3UL; ++ pixeloff = LCDC_MKBF(DMA2DCFG_PIXELOFF, cinfo->xoffset * cinfo->bits_per_pixel); ++ ++ /* Set framebuffer DMA base address and pixel offset */ ++ lcdc_writel(cinfo, DMABADDR1, dma_addr); ++ dma2dcfg = lcdc_readl(cinfo, DMA2DCFG); ++ dma2dcfg = LCDC_INSBF(DMA2DCFG_PIXELOFF, pixeloff, dma2dcfg); ++ lcdc_writel(cinfo, DMA2DCFG, dma2dcfg); ++ ++ /* Update configuration */ ++ lcdc_writel(cinfo, DMACON, (lcdc_readl(cinfo, DMACON) ++ | LCDC_BIT(DMACON_DMAUPDT))); ++} ++ ++static int lcdc_set_var(struct lcdc_info *info) ++{ ++ info->var.red.msb_right = info->var.green.msb_right ++ = info->var.blue.msb_right = 0; ++ info->var.transp.offset = info->var.transp.length = 0; ++ ++ switch (info->bits_per_pixel) { ++ case 2: ++ case 4: ++ case 8: ++ info->var.red.offset = info->var.green.offset ++ = info->var.blue.offset = 0; ++ info->var.red.length = info->var.green.length ++ = info->var.blue.length = info->var.bits_per_pixel; ++ break; ++ case 15: ++ case 16: ++ /* ++ * Bit 16 is the "intensity" bit, I think. Not sure ++ * what we're going to use that for... ++ */ ++ info->var.red.offset = 0; ++ info->var.green.offset = 5; ++ info->var.blue.offset = 10; ++ info->var.red.length = 5; ++ info->var.green.length = 5; ++ info->var.blue.length = 5; ++ break; ++ case 32: ++ info->var.transp.offset = 24; ++ info->var.transp.length = 8; ++ /* fall through */ ++ case 24: ++ info->var.red.offset = 16; ++ info->var.green.offset = 8; ++ info->var.blue.offset = 0; ++ info->var.red.length = info->var.green.length ++ = info->var.blue.length = 8; ++ break; ++ default: ++ printf("lcdc: color depth %d not supported\n", ++ info->var.bits_per_pixel); ++ return -1; ++ } ++ ++ info->var.xoffset = info->var.yoffset = 0; ++ info->var.red.msb_right = info->var.green.msb_right ++ = info->var.blue.msb_right = info->var.transp.msb_right = 0; ++ ++ return 0; ++} ++ ++void lcdc_init(void *lcdbase) ++{ ++ unsigned int value; ++ const struct device *sm; ++ struct lcdc_info *cinfo = panel_info.lcdc; ++ ++ sm = get_device(DEVICE_SM); ++ if (!sm) ++ printf("lcdc: could not get SM\n"); ++ ++ cinfo->xres = panel_info.vl_col; ++ cinfo->yres = panel_info.vl_row; ++ cinfo->xres_virtual = panel_info.vl_col; ++ cinfo->yres_virtual = panel_info.vl_row; ++ if (panel_info.vl_bpix > LCD_COLOR32) { ++ cinfo->bits_per_pixel = panel_info.vl_bpix; ++ } else { ++ cinfo->bits_per_pixel = (1<<panel_info.vl_bpix); ++ } ++ /* INFO: if you see weird offset errors when displaying data ++ * increase the guard_time */ ++ cinfo->guard_time = 2; ++ ++ cinfo->pixclock = panel_info.pixclock; ++ ++ cinfo->left_margin = panel_info.left_margin; ++ cinfo->right_margin = panel_info.right_margin; ++ cinfo->upper_margin = panel_info.upper_margin; ++ cinfo->lower_margin = panel_info.lower_margin; ++ ++ cinfo->hsync_len = panel_info.hsync_len; ++ cinfo->vsync_len = panel_info.vsync_len; ++ ++ cinfo->sync = panel_info.sync; ++ ++ cinfo->smem_start = (u_long)lcdbase; ++ cinfo->yoffset = panel_info.yoffset; ++ cinfo->xoffset = panel_info.xoffset; ++ cinfo->line_length = cinfo->xres; ++ ++ panel_info.lcdc = cinfo; ++ ++ if (cinfo->bits_per_pixel <= 8) { ++ cinfo->visual = FB_VISUAL_PSEUDOCOLOR; ++ } else { ++ cinfo->visual = FB_VISUAL_TRUECOLOR; ++ } ++ ++ /* setup var information */ ++ if (lcdc_set_var(cinfo) != 0) { ++ printf("lcdc: could not set var information\n"); ++ return; ++ } ++ ++ sm_writel(sm, PM_GCCTRL7, SM_BIT(PLLSEL)|SM_BIT(CEN)); ++ ++ debug("lcdc: resolution: %ux%u %dbpp (%ux%u virtual)\n", ++ cinfo->xres, cinfo->yres, cinfo->bits_per_pixel, ++ cinfo->xres_virtual, cinfo->yres_virtual); ++ ++ /* Turn off the LCD controller and the DMA controller */ ++ lcdc_writel(cinfo, PWRCON, ++ LCDC_MKBF(PWRCON_GUARD_TIME, cinfo->guard_time)); ++ lcdc_writel(cinfo, DMACON, 0); ++ ++ cinfo->line_length = (cinfo->xres_virtual ++ * (cinfo->bits_per_pixel / 8)); ++ ++ /* Re-initialize the DMA engine... */ ++ lcdc_update_dma(); ++ ++ /* ...set frame size and burst length = 8 words (?) */ ++ value = LCDC_MKBF(DMAFRMCFG_FRMSIZE, ++ (cinfo->yres * cinfo->line_length + 3) / 4); ++ value |= LCDC_MKBF(DMAFRMCFG_BRSTLEN, (LCDC_DMA_BURST_LEN - 1)); ++ lcdc_writel(cinfo, DMAFRMCFG, value); ++ ++ /* ...set 2D configuration (necessary for xres_virtual != xres) */ ++ value = LCDC_MKBF(DMA2DCFG_ADDRINC, ++ cinfo->xres_virtual - cinfo->xres); ++ lcdc_writel(cinfo, DMA2DCFG, value); ++ ++ /* ...wait for DMA engine to become idle... */ ++ while (lcdc_readl(cinfo, DMACON) & LCDC_BIT(DMACON_DMABUSY)); ++ ++ /* ...and enable it with updated configuration */ ++ lcdc_writel(cinfo, DMACON, (LCDC_BIT(DMACON_DMAEN) ++ | LCDC_BIT(DMACON_DMAUPDT) ++ | LCDC_BIT(DMACON_DMA2DEN))); ++ ++ /* Now, the LCD core... */ ++ ++ /* Set pixel clock. */ ++ value = 140000000 / 100000 * cinfo->pixclock; ++ value /= 10000000; ++ value = (value + 1) / 2; ++ if (value == 0) { ++ lcdc_writel(cinfo, LCDCON1, LCDC_BIT(LCDCON1_BYPASS)); ++ } else { ++ lcdc_writel(cinfo, LCDCON1, LCDC_MKBF(LCDCON1_CLKVAL, value - 1)); ++ } ++ ++ /* Initialize control register 2 */ ++ value = (LCDC_BIT(LCDCON2_CLKMOD) ++ | LCDC_MKBF(LCDCON2_DISTYPE, LCDC_DISTYPE_TFT)); ++ if (!(cinfo->sync & FB_SYNC_HOR_HIGH_ACT)) ++ value |= LCDC_BIT(LCDCON2_INVLINE); ++ if (!(cinfo->sync & FB_SYNC_VERT_HIGH_ACT)) ++ value |= LCDC_BIT(LCDCON2_INVFRAME); ++ if (cinfo->sync & FB_SYNC_PCLK_RISING) ++ value |= LCDC_BIT(LCDCON2_INVCLK); ++ ++ switch (cinfo->bits_per_pixel) { ++ case 1: value |= LCDC_MKBF(LCDCON2_PIXELSIZE, 0); break; ++ case 2: value |= LCDC_MKBF(LCDCON2_PIXELSIZE, 1); break; ++ case 4: value |= LCDC_MKBF(LCDCON2_PIXELSIZE, 2); break; ++ case 8: value |= LCDC_MKBF(LCDCON2_PIXELSIZE, 3); break; ++ case 15: /* fall through */ ++ case 16: value |= LCDC_MKBF(LCDCON2_PIXELSIZE, 4); break; ++ case 24: value |= LCDC_MKBF(LCDCON2_PIXELSIZE, 5); break; ++ case 32: value |= LCDC_MKBF(LCDCON2_PIXELSIZE, 6); break; ++ default: ++ printf("lcdc: %d bits per pixel not supported\n", ++ cinfo->bits_per_pixel); ++ return; ++ break; ++ } ++ lcdc_writel(cinfo, LCDCON2, value); ++ ++ /* Vertical timing */ ++ value = LCDC_MKBF(LCDTIM1_VPW, cinfo->vsync_len - 1); ++ value |= LCDC_MKBF(LCDTIM1_VBP, cinfo->upper_margin); ++ value |= LCDC_MKBF(LCDTIM1_VFP, cinfo->lower_margin); ++ lcdc_writel(cinfo, LCDTIM1, value); ++ ++ /* Horizontal timing */ ++ value = LCDC_MKBF(LCDTIM2_HFP, cinfo->right_margin - 1); ++ value |= LCDC_MKBF(LCDTIM2_HPW, cinfo->hsync_len - 1); ++ value |= LCDC_MKBF(LCDTIM2_HBP, cinfo->left_margin - 1); ++ lcdc_writel(cinfo, LCDTIM2, value); ++ ++ /* Display size */ ++ value = LCDC_MKBF(LCDFRMCFG_LINESIZE, cinfo->xres - 1); ++ value |= LCDC_MKBF(LCDFRMCFG_LINEVAL, cinfo->yres - 1); ++ lcdc_writel(cinfo, LCDFRMCFG, value); ++ ++ /* FIFO Threshold: Use formula from data sheet */ ++ value = LCDC_FIFO_SIZE - (2 * LCDC_DMA_BURST_LEN + 3); ++ lcdc_writel(cinfo, LCDFIFO, value); ++ ++ /* Toggle LCD_MODE every frame */ ++ lcdc_writel(cinfo, LCDMVAL, 0); ++ ++ /* Disable all interrupts */ ++ lcdc_writel(cinfo, LCD_IDR, ~0UL); ++ ++ /* Wait for the LCDC core to become idle and enable it */ ++ while (lcdc_readl(cinfo, PWRCON) & LCDC_BIT(PWRCON_LCD_BUSY)); ++ ++ lcdc_writel(cinfo, PWRCON, ++ LCDC_MKBF(PWRCON_GUARD_TIME, cinfo->guard_time) ++ | LCDC_BIT(PWRCON_LCD_PWR)); ++ ++ debug("lcdc: controller at 0x%08x, framebuffer at 0x%08x\n", ++ cinfo->regs, cinfo->smem_start); ++ ++ /* clear 320 x 240 x 24bpp area in framebuffer */ ++ memset((void *)cinfo->smem_start, 0, cinfo->xres * cinfo->yres * 3); ++ ++ return; ++} ++#endif +diff -uprN u-boot-orig/drivers/Makefile u-boot/drivers/Makefile +--- u-boot-orig/drivers/Makefile 2007-01-01 19:26:46.000000000 +0100 ++++ u-boot/drivers/Makefile 2007-01-01 16:10:49.000000000 +0100 +@@ -27,7 +27,8 @@ include $(TOPDIR)/config.mk + + LIB = libdrivers.a + +-OBJS = 3c589.o 5701rls.o ali512x.o atmel_usart.o \ ++OBJS = 3c589.o 5701rls.o ali512x.o \ ++ atmel_usart.o atmel_lcdc.o \ + bcm570x.o bcm570x_autoneg.o cfb_console.o cfi_flash.o \ + cs8900.o ct69000.o dataflash.o dc2114x.o dm9000x.o \ + e1000.o eepro100.o \ diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/libavr32-add-spi-and-lcd-board-support.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/libavr32-add-spi-and-lcd-board-support.patch new file mode 100644 index 0000000000..5212766115 --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/libavr32-add-spi-and-lcd-board-support.patch @@ -0,0 +1,61 @@ +diff -uprN u-boot-orig/lib_avr32/board.c u-boot/lib_avr32/board.c +--- u-boot-orig/lib_avr32/board.c 2007-01-01 19:26:46.000000000 +0100 ++++ u-boot/lib_avr32/board.c 2007-01-05 13:29:34.000000000 +0100 +@@ -28,6 +28,7 @@ + + #include <asm/initcalls.h> + #include <asm/sections.h> ++#include <asm/page.h> + + #ifndef CONFIG_IDENT_STRING + #define CONFIG_IDENT_STRING "" +@@ -128,6 +129,10 @@ void start_u_boot (void) + { + DECLARE_GLOBAL_DATA_PTR; + gd_t gd_data; ++#if defined(CONFIG_VFD) || defined(CONFIG_LCD) ++ unsigned long size; ++ unsigned long addr; ++#endif + + /* Initialize the global data pointer */ + memset(&gd_data, 0, sizeof(gd_data)); +@@ -172,9 +177,38 @@ void start_u_boot (void) + if (!gd->bd->bi_boot_params) + puts("WARNING: Cannot allocate space for boot parameters\n"); + ++#if CONFIG_SPI ++ board_init_spi(); ++#endif ++ ++#ifdef CONFIG_VFD ++ /* ++ * reserve memory for VFD display (always full pages) ++ */ ++ /* bss_end is defined in the board-specific linker script */ ++ addr = CFG_LCD_BASE; ++ size = vfd_setmem(addr); ++ gd->fb_base = addr; ++#endif /* CONFIG_VFD */ ++ ++#ifdef CONFIG_LCD ++ /* ++ * reserve memory for LCD display (always full pages) ++ */ ++ /* bss_end is defined in the board-specific linker script */ ++ addr = CFG_LCD_BASE; ++ size = lcd_setmem(addr); ++ gd->fb_base = addr; ++#endif /* CONFIG_LCD */ ++ + /* initialize environment */ + env_relocate(); + ++#ifdef CONFIG_VFD ++ /* must do this after the framebuffer is allocated */ ++ drv_vfd_init(); ++#endif /* CONFIG_VFD */ ++ + devices_init(); + jumptable_init(); + console_init_r(); diff --git a/packages/u-boot/u-boot-1.1.4/at32stk1000/spi-driver-for-avr32.patch b/packages/u-boot/u-boot-1.1.4/at32stk1000/spi-driver-for-avr32.patch new file mode 100644 index 0000000000..82c3fbc3c9 --- /dev/null +++ b/packages/u-boot/u-boot-1.1.4/at32stk1000/spi-driver-for-avr32.patch @@ -0,0 +1,1026 @@ +diff -uprN u-boot-orig/include/atmel_spi.h u-boot/include/atmel_spi.h +--- u-boot-orig/include/atmel_spi.h 1970-01-01 01:00:00.000000000 +0100 ++++ u-boot/include/atmel_spi.h 2007-01-01 18:45:27.000000000 +0100 +@@ -0,0 +1,676 @@ ++#ifndef __SPI_H_ ++#define __SPI_H_ ++ ++/*! \brief Timeout for spi read and write blocking functions */ ++#define SPI_TIMEOUT 10000 ++/*! \brief Enable PDC functions for SPI */ ++#define SPI_ENABLE_PDC ++ ++#define SPI_10_BPT 0x00000002 ++#define SPI_11_BPT 0x00000003 ++#define SPI_12_BPT 0x00000004 ++#define SPI_13_BPT 0x00000005 ++#define SPI_14_BPT 0x00000006 ++#define SPI_15_BPT 0x00000007 ++#define SPI_16_BPT 0x00000008 ++#define SPI_8_BPT 0x00000000 ++#define SPI_9_BPT 0x00000001 ++#define SPI_BITS 4 ++#define SPI_BITS_10_BPT 0x00000002 ++#define SPI_BITS_11_BPT 0x00000003 ++#define SPI_BITS_12_BPT 0x00000004 ++#define SPI_BITS_13_BPT 0x00000005 ++#define SPI_BITS_14_BPT 0x00000006 ++#define SPI_BITS_15_BPT 0x00000007 ++#define SPI_BITS_16_BPT 0x00000008 ++#define SPI_BITS_8_BPT 0x00000000 ++#define SPI_BITS_9_BPT 0x00000001 ++#define SPI_BITS_MASK 0x000000f0 ++#define SPI_BITS_OFFSET 4 ++#define SPI_BITS_SIZE 4 ++#define SPI_CPOL 0 ++#define SPI_CPOL_MASK 0x00000001 ++#define SPI_CPOL_OFFSET 0 ++#define SPI_CPOL_SIZE 1 ++#define SPI_CR 0x00000000 ++#define SPI_CR_LASTXFER 24 ++#define SPI_CR_LASTXFER_MASK 0x01000000 ++#define SPI_CR_LASTXFER_OFFSET 24 ++#define SPI_CR_LASTXFER_SIZE 1 ++#define SPI_CR_SPIDIS 1 ++#define SPI_CR_SPIDIS_MASK 0x00000002 ++#define SPI_CR_SPIDIS_OFFSET 1 ++#define SPI_CR_SPIDIS_SIZE 1 ++#define SPI_CR_SPIEN 0 ++#define SPI_CR_SPIEN_MASK 0x00000001 ++#define SPI_CR_SPIEN_OFFSET 0 ++#define SPI_CR_SPIEN_SIZE 1 ++#define SPI_CR_SWRST 7 ++#define SPI_CR_SWRST_MASK 0x00000080 ++#define SPI_CR_SWRST_OFFSET 7 ++#define SPI_CR_SWRST_SIZE 1 ++#define SPI_CSAAT 3 ++#define SPI_CSAAT_MASK 0x00000008 ++#define SPI_CSAAT_OFFSET 3 ++#define SPI_CSAAT_SIZE 1 ++#define SPI_CSR0 0x00000030 ++#define SPI_CSR0_BITS 4 ++#define SPI_CSR0_BITS_10_BPT 0x00000002 ++#define SPI_CSR0_BITS_11_BPT 0x00000003 ++#define SPI_CSR0_BITS_12_BPT 0x00000004 ++#define SPI_CSR0_BITS_13_BPT 0x00000005 ++#define SPI_CSR0_BITS_14_BPT 0x00000006 ++#define SPI_CSR0_BITS_15_BPT 0x00000007 ++#define SPI_CSR0_BITS_16_BPT 0x00000008 ++#define SPI_CSR0_BITS_8_BPT 0x00000000 ++#define SPI_CSR0_BITS_9_BPT 0x00000001 ++#define SPI_CSR0_BITS_MASK 0x000000f0 ++#define SPI_CSR0_BITS_OFFSET 4 ++#define SPI_CSR0_BITS_SIZE 4 ++#define SPI_CSR0_CPOL 0 ++#define SPI_CSR0_CPOL_MASK 0x00000001 ++#define SPI_CSR0_CPOL_OFFSET 0 ++#define SPI_CSR0_CPOL_SIZE 1 ++#define SPI_CSR0_CSAAT 3 ++#define SPI_CSR0_CSAAT_MASK 0x00000008 ++#define SPI_CSR0_CSAAT_OFFSET 3 ++#define SPI_CSR0_CSAAT_SIZE 1 ++#define SPI_CSR0_DLYBCT 24 ++#define SPI_CSR0_DLYBCT_MASK 0xff000000 ++#define SPI_CSR0_DLYBCT_OFFSET 24 ++#define SPI_CSR0_DLYBCT_SIZE 8 ++#define SPI_CSR0_DLYBS 16 ++#define SPI_CSR0_DLYBS_MASK 0x00ff0000 ++#define SPI_CSR0_DLYBS_OFFSET 16 ++#define SPI_CSR0_DLYBS_SIZE 8 ++#define SPI_CSR0_NCPHA 1 ++#define SPI_CSR0_NCPHA_MASK 0x00000002 ++#define SPI_CSR0_NCPHA_OFFSET 1 ++#define SPI_CSR0_NCPHA_SIZE 1 ++#define SPI_CSR0_SCBR 8 ++#define SPI_CSR0_SCBR_MASK 0x0000ff00 ++#define SPI_CSR0_SCBR_OFFSET 8 ++#define SPI_CSR0_SCBR_SIZE 8 ++#define SPI_CSR1 0x00000034 ++#define SPI_CSR1_BITS 4 ++#define SPI_CSR1_BITS_10_BPT 0x00000002 ++#define SPI_CSR1_BITS_11_BPT 0x00000003 ++#define SPI_CSR1_BITS_12_BPT 0x00000004 ++#define SPI_CSR1_BITS_13_BPT 0x00000005 ++#define SPI_CSR1_BITS_14_BPT 0x00000006 ++#define SPI_CSR1_BITS_15_BPT 0x00000007 ++#define SPI_CSR1_BITS_16_BPT 0x00000008 ++#define SPI_CSR1_BITS_8_BPT 0x00000000 ++#define SPI_CSR1_BITS_9_BPT 0x00000001 ++#define SPI_CSR1_BITS_MASK 0x000000f0 ++#define SPI_CSR1_BITS_OFFSET 4 ++#define SPI_CSR1_BITS_SIZE 4 ++#define SPI_CSR1_CPOL 0 ++#define SPI_CSR1_CPOL_MASK 0x00000001 ++#define SPI_CSR1_CPOL_OFFSET 0 ++#define SPI_CSR1_CPOL_SIZE 1 ++#define SPI_CSR1_CSAAT 3 ++#define SPI_CSR1_CSAAT_MASK 0x00000008 ++#define SPI_CSR1_CSAAT_OFFSET 3 ++#define SPI_CSR1_CSAAT_SIZE 1 ++#define SPI_CSR1_DLYBCT 24 ++#define SPI_CSR1_DLYBCT_MASK 0xff000000 ++#define SPI_CSR1_DLYBCT_OFFSET 24 ++#define SPI_CSR1_DLYBCT_SIZE 8 ++#define SPI_CSR1_DLYBS 16 ++#define SPI_CSR1_DLYBS_MASK 0x00ff0000 ++#define SPI_CSR1_DLYBS_OFFSET 16 ++#define SPI_CSR1_DLYBS_SIZE 8 ++#define SPI_CSR1_NCPHA 1 ++#define SPI_CSR1_NCPHA_MASK 0x00000002 ++#define SPI_CSR1_NCPHA_OFFSET 1 ++#define SPI_CSR1_NCPHA_SIZE 1 ++#define SPI_CSR1_SCBR 8 ++#define SPI_CSR1_SCBR_MASK 0x0000ff00 ++#define SPI_CSR1_SCBR_OFFSET 8 ++#define SPI_CSR1_SCBR_SIZE 8 ++#define SPI_CSR2 0x00000038 ++#define SPI_CSR2_BITS 4 ++#define SPI_CSR2_BITS_10_BPT 0x00000002 ++#define SPI_CSR2_BITS_11_BPT 0x00000003 ++#define SPI_CSR2_BITS_12_BPT 0x00000004 ++#define SPI_CSR2_BITS_13_BPT 0x00000005 ++#define SPI_CSR2_BITS_14_BPT 0x00000006 ++#define SPI_CSR2_BITS_15_BPT 0x00000007 ++#define SPI_CSR2_BITS_16_BPT 0x00000008 ++#define SPI_CSR2_BITS_8_BPT 0x00000000 ++#define SPI_CSR2_BITS_9_BPT 0x00000001 ++#define SPI_CSR2_BITS_MASK 0x000000f0 ++#define SPI_CSR2_BITS_OFFSET 4 ++#define SPI_CSR2_BITS_SIZE 4 ++#define SPI_CSR2_CPOL 0 ++#define SPI_CSR2_CPOL_MASK 0x00000001 ++#define SPI_CSR2_CPOL_OFFSET 0 ++#define SPI_CSR2_CPOL_SIZE 1 ++#define SPI_CSR2_CSAAT 3 ++#define SPI_CSR2_CSAAT_MASK 0x00000008 ++#define SPI_CSR2_CSAAT_OFFSET 3 ++#define SPI_CSR2_CSAAT_SIZE 1 ++#define SPI_CSR2_DLYBCT 24 ++#define SPI_CSR2_DLYBCT_MASK 0xff000000 ++#define SPI_CSR2_DLYBCT_OFFSET 24 ++#define SPI_CSR2_DLYBCT_SIZE 8 ++#define SPI_CSR2_DLYBS 16 ++#define SPI_CSR2_DLYBS_MASK 0x00ff0000 ++#define SPI_CSR2_DLYBS_OFFSET 16 ++#define SPI_CSR2_DLYBS_SIZE 8 ++#define SPI_CSR2_NCPHA 1 ++#define SPI_CSR2_NCPHA_MASK 0x00000002 ++#define SPI_CSR2_NCPHA_OFFSET 1 ++#define SPI_CSR2_NCPHA_SIZE 1 ++#define SPI_CSR2_SCBR 8 ++#define SPI_CSR2_SCBR_MASK 0x0000ff00 ++#define SPI_CSR2_SCBR_OFFSET 8 ++#define SPI_CSR2_SCBR_SIZE 8 ++#define SPI_CSR3 0x0000003c ++#define SPI_CSR3_BITS 4 ++#define SPI_CSR3_BITS_10_BPT 0x00000002 ++#define SPI_CSR3_BITS_11_BPT 0x00000003 ++#define SPI_CSR3_BITS_12_BPT 0x00000004 ++#define SPI_CSR3_BITS_13_BPT 0x00000005 ++#define SPI_CSR3_BITS_14_BPT 0x00000006 ++#define SPI_CSR3_BITS_15_BPT 0x00000007 ++#define SPI_CSR3_BITS_16_BPT 0x00000008 ++#define SPI_CSR3_BITS_8_BPT 0x00000000 ++#define SPI_CSR3_BITS_9_BPT 0x00000001 ++#define SPI_CSR3_BITS_MASK 0x000000f0 ++#define SPI_CSR3_BITS_OFFSET 4 ++#define SPI_CSR3_BITS_SIZE 4 ++#define SPI_CSR3_CPOL 0 ++#define SPI_CSR3_CPOL_MASK 0x00000001 ++#define SPI_CSR3_CPOL_OFFSET 0 ++#define SPI_CSR3_CPOL_SIZE 1 ++#define SPI_CSR3_CSAAT 3 ++#define SPI_CSR3_CSAAT_MASK 0x00000008 ++#define SPI_CSR3_CSAAT_OFFSET 3 ++#define SPI_CSR3_CSAAT_SIZE 1 ++#define SPI_CSR3_DLYBCT 24 ++#define SPI_CSR3_DLYBCT_MASK 0xff000000 ++#define SPI_CSR3_DLYBCT_OFFSET 24 ++#define SPI_CSR3_DLYBCT_SIZE 8 ++#define SPI_CSR3_DLYBS 16 ++#define SPI_CSR3_DLYBS_MASK 0x00ff0000 ++#define SPI_CSR3_DLYBS_OFFSET 16 ++#define SPI_CSR3_DLYBS_SIZE 8 ++#define SPI_CSR3_NCPHA 1 ++#define SPI_CSR3_NCPHA_MASK 0x00000002 ++#define SPI_CSR3_NCPHA_OFFSET 1 ++#define SPI_CSR3_NCPHA_SIZE 1 ++#define SPI_CSR3_SCBR 8 ++#define SPI_CSR3_SCBR_MASK 0x0000ff00 ++#define SPI_CSR3_SCBR_OFFSET 8 ++#define SPI_CSR3_SCBR_SIZE 8 ++#define SPI_DLYBCS 24 ++#define SPI_DLYBCS_MASK 0xff000000 ++#define SPI_DLYBCS_OFFSET 24 ++#define SPI_DLYBCS_SIZE 8 ++#define SPI_DLYBCT 24 ++#define SPI_DLYBCT_MASK 0xff000000 ++#define SPI_DLYBCT_OFFSET 24 ++#define SPI_DLYBCT_SIZE 8 ++#define SPI_DLYBS 16 ++#define SPI_DLYBS_MASK 0x00ff0000 ++#define SPI_DLYBS_OFFSET 16 ++#define SPI_DLYBS_SIZE 8 ++#define SPI_ENDRX 4 ++#define SPI_ENDRX_MASK 0x00000010 ++#define SPI_ENDRX_OFFSET 4 ++#define SPI_ENDRX_SIZE 1 ++#define SPI_ENDTX 5 ++#define SPI_ENDTX_MASK 0x00000020 ++#define SPI_ENDTX_OFFSET 5 ++#define SPI_ENDTX_SIZE 1 ++#define SPI_FDIV 3 ++#define SPI_FDIV_MASK 0x00000008 ++#define SPI_FDIV_OFFSET 3 ++#define SPI_FDIV_SIZE 1 ++#define SPI_IDR 0x00000018 ++#define SPI_IDR_ENDRX 4 ++#define SPI_IDR_ENDRX_MASK 0x00000010 ++#define SPI_IDR_ENDRX_OFFSET 4 ++#define SPI_IDR_ENDRX_SIZE 1 ++#define SPI_IDR_ENDTX 5 ++#define SPI_IDR_ENDTX_MASK 0x00000020 ++#define SPI_IDR_ENDTX_OFFSET 5 ++#define SPI_IDR_ENDTX_SIZE 1 ++#define SPI_IDR_MODF 2 ++#define SPI_IDR_MODF_MASK 0x00000004 ++#define SPI_IDR_MODF_OFFSET 2 ++#define SPI_IDR_MODF_SIZE 1 ++#define SPI_IDR_NSSR 8 ++#define SPI_IDR_NSSR_MASK 0x00000100 ++#define SPI_IDR_NSSR_OFFSET 8 ++#define SPI_IDR_NSSR_SIZE 1 ++#define SPI_IDR_OVRES 3 ++#define SPI_IDR_OVRES_MASK 0x00000008 ++#define SPI_IDR_OVRES_OFFSET 3 ++#define SPI_IDR_OVRES_SIZE 1 ++#define SPI_IDR_RDRF 0 ++#define SPI_IDR_RDRF_MASK 0x00000001 ++#define SPI_IDR_RDRF_OFFSET 0 ++#define SPI_IDR_RDRF_SIZE 1 ++#define SPI_IDR_RXBUFF 6 ++#define SPI_IDR_RXBUFF_MASK 0x00000040 ++#define SPI_IDR_RXBUFF_OFFSET 6 ++#define SPI_IDR_RXBUFF_SIZE 1 ++#define SPI_IDR_TDRE 1 ++#define SPI_IDR_TDRE_MASK 0x00000002 ++#define SPI_IDR_TDRE_OFFSET 1 ++#define SPI_IDR_TDRE_SIZE 1 ++#define SPI_IDR_TXBUFE 7 ++#define SPI_IDR_TXBUFE_MASK 0x00000080 ++#define SPI_IDR_TXBUFE_OFFSET 7 ++#define SPI_IDR_TXBUFE_SIZE 1 ++#define SPI_IDR_TXEMPTY 9 ++#define SPI_IDR_TXEMPTY_MASK 0x00000200 ++#define SPI_IDR_TXEMPTY_OFFSET 9 ++#define SPI_IDR_TXEMPTY_SIZE 1 ++#define SPI_IER 0x00000014 ++#define SPI_IER_ENDRX 4 ++#define SPI_IER_ENDRX_MASK 0x00000010 ++#define SPI_IER_ENDRX_OFFSET 4 ++#define SPI_IER_ENDRX_SIZE 1 ++#define SPI_IER_ENDTX 5 ++#define SPI_IER_ENDTX_MASK 0x00000020 ++#define SPI_IER_ENDTX_OFFSET 5 ++#define SPI_IER_ENDTX_SIZE 1 ++#define SPI_IER_MODF 2 ++#define SPI_IER_MODF_MASK 0x00000004 ++#define SPI_IER_MODF_OFFSET 2 ++#define SPI_IER_MODF_SIZE 1 ++#define SPI_IER_NSSR 8 ++#define SPI_IER_NSSR_MASK 0x00000100 ++#define SPI_IER_NSSR_OFFSET 8 ++#define SPI_IER_NSSR_SIZE 1 ++#define SPI_IER_OVRES 3 ++#define SPI_IER_OVRES_MASK 0x00000008 ++#define SPI_IER_OVRES_OFFSET 3 ++#define SPI_IER_OVRES_SIZE 1 ++#define SPI_IER_RDRF 0 ++#define SPI_IER_RDRF_MASK 0x00000001 ++#define SPI_IER_RDRF_OFFSET 0 ++#define SPI_IER_RDRF_SIZE 1 ++#define SPI_IER_RXBUFF 6 ++#define SPI_IER_RXBUFF_MASK 0x00000040 ++#define SPI_IER_RXBUFF_OFFSET 6 ++#define SPI_IER_RXBUFF_SIZE 1 ++#define SPI_IER_TDRE 1 ++#define SPI_IER_TDRE_MASK 0x00000002 ++#define SPI_IER_TDRE_OFFSET 1 ++#define SPI_IER_TDRE_SIZE 1 ++#define SPI_IER_TXBUFE 7 ++#define SPI_IER_TXBUFE_MASK 0x00000080 ++#define SPI_IER_TXBUFE_OFFSET 7 ++#define SPI_IER_TXBUFE_SIZE 1 ++#define SPI_IER_TXEMPTY 9 ++#define SPI_IER_TXEMPTY_MASK 0x00000200 ++#define SPI_IER_TXEMPTY_OFFSET 9 ++#define SPI_IER_TXEMPTY_SIZE 1 ++#define SPI_IMR 0x0000001c ++#define SPI_IMR_ENDRX 4 ++#define SPI_IMR_ENDRX_MASK 0x00000010 ++#define SPI_IMR_ENDRX_OFFSET 4 ++#define SPI_IMR_ENDRX_SIZE 1 ++#define SPI_IMR_ENDTX 5 ++#define SPI_IMR_ENDTX_MASK 0x00000020 ++#define SPI_IMR_ENDTX_OFFSET 5 ++#define SPI_IMR_ENDTX_SIZE 1 ++#define SPI_IMR_MODF 2 ++#define SPI_IMR_MODF_MASK 0x00000004 ++#define SPI_IMR_MODF_OFFSET 2 ++#define SPI_IMR_MODF_SIZE 1 ++#define SPI_IMR_NSSR 8 ++#define SPI_IMR_NSSR_MASK 0x00000100 ++#define SPI_IMR_NSSR_OFFSET 8 ++#define SPI_IMR_NSSR_SIZE 1 ++#define SPI_IMR_OVRES 3 ++#define SPI_IMR_OVRES_MASK 0x00000008 ++#define SPI_IMR_OVRES_OFFSET 3 ++#define SPI_IMR_OVRES_SIZE 1 ++#define SPI_IMR_RDRF 0 ++#define SPI_IMR_RDRF_MASK 0x00000001 ++#define SPI_IMR_RDRF_OFFSET 0 ++#define SPI_IMR_RDRF_SIZE 1 ++#define SPI_IMR_RXBUFF 6 ++#define SPI_IMR_RXBUFF_MASK 0x00000040 ++#define SPI_IMR_RXBUFF_OFFSET 6 ++#define SPI_IMR_RXBUFF_SIZE 1 ++#define SPI_IMR_TDRE 1 ++#define SPI_IMR_TDRE_MASK 0x00000002 ++#define SPI_IMR_TDRE_OFFSET 1 ++#define SPI_IMR_TDRE_SIZE 1 ++#define SPI_IMR_TXBUFE 7 ++#define SPI_IMR_TXBUFE_MASK 0x00000080 ++#define SPI_IMR_TXBUFE_OFFSET 7 ++#define SPI_IMR_TXBUFE_SIZE 1 ++#define SPI_IMR_TXEMPTY 9 ++#define SPI_IMR_TXEMPTY_MASK 0x00000200 ++#define SPI_IMR_TXEMPTY_OFFSET 9 ++#define SPI_IMR_TXEMPTY_SIZE 1 ++#define SPI_LASTXFER 24 ++#define SPI_LASTXFER_MASK 0x01000000 ++#define SPI_LASTXFER_OFFSET 24 ++#define SPI_LASTXFER_SIZE 1 ++#define SPI_LLB 7 ++#define SPI_LLB_MASK 0x00000080 ++#define SPI_LLB_OFFSET 7 ++#define SPI_LLB_SIZE 1 ++#define SPI_MODF 2 ++#define SPI_MODFDIS 4 ++#define SPI_MODFDIS_MASK 0x00000010 ++#define SPI_MODFDIS_OFFSET 4 ++#define SPI_MODFDIS_SIZE 1 ++#define SPI_MODF_MASK 0x00000004 ++#define SPI_MODF_OFFSET 2 ++#define SPI_MODF_SIZE 1 ++#define SPI_MR 0x00000004 ++#define SPI_MR_DLYBCS 24 ++#define SPI_MR_DLYBCS_MASK 0xff000000 ++#define SPI_MR_DLYBCS_OFFSET 24 ++#define SPI_MR_DLYBCS_SIZE 8 ++#define SPI_MR_FDIV 3 ++#define SPI_MR_FDIV_MASK 0x00000008 ++#define SPI_MR_FDIV_OFFSET 3 ++#define SPI_MR_FDIV_SIZE 1 ++#define SPI_MR_LLB 7 ++#define SPI_MR_LLB_MASK 0x00000080 ++#define SPI_MR_LLB_OFFSET 7 ++#define SPI_MR_LLB_SIZE 1 ++#define SPI_MR_MODFDIS 4 ++#define SPI_MR_MODFDIS_MASK 0x00000010 ++#define SPI_MR_MODFDIS_OFFSET 4 ++#define SPI_MR_MODFDIS_SIZE 1 ++#define SPI_MR_MSTR 0 ++#define SPI_MR_MSTR_MASK 0x00000001 ++#define SPI_MR_MSTR_OFFSET 0 ++#define SPI_MR_MSTR_SIZE 1 ++#define SPI_MR_PCS 16 ++#define SPI_MR_PCSDEC 2 ++#define SPI_MR_PCSDEC_MASK 0x00000004 ++#define SPI_MR_PCSDEC_OFFSET 2 ++#define SPI_MR_PCSDEC_SIZE 1 ++#define SPI_MR_PCS_MASK 0x000f0000 ++#define SPI_MR_PCS_OFFSET 16 ++#define SPI_MR_PCS_SIZE 4 ++#define SPI_MR_PS 1 ++#define SPI_MR_PS_MASK 0x00000002 ++#define SPI_MR_PS_OFFSET 1 ++#define SPI_MR_PS_SIZE 1 ++#define SPI_MSTR 0 ++#define SPI_MSTR_MASK 0x00000001 ++#define SPI_MSTR_OFFSET 0 ++#define SPI_MSTR_SIZE 1 ++#define SPI_NCPHA 1 ++#define SPI_NCPHA_MASK 0x00000002 ++#define SPI_NCPHA_OFFSET 1 ++#define SPI_NCPHA_SIZE 1 ++#define SPI_NSSR 8 ++#define SPI_NSSR_MASK 0x00000100 ++#define SPI_NSSR_OFFSET 8 ++#define SPI_NSSR_SIZE 1 ++#define SPI_OVRES 3 ++#define SPI_OVRES_MASK 0x00000008 ++#define SPI_OVRES_OFFSET 3 ++#define SPI_OVRES_SIZE 1 ++#define SPI_PCS 16 ++#define SPI_PCSDEC 2 ++#define SPI_PCSDEC_MASK 0x00000004 ++#define SPI_PCSDEC_OFFSET 2 ++#define SPI_PCSDEC_SIZE 1 ++#define SPI_PCS_MASK 0x000f0000 ++#define SPI_PCS_OFFSET 16 ++#define SPI_PCS_SIZE 4 ++#define SPI_PS 1 ++#define SPI_PS_MASK 0x00000002 ++#define SPI_PS_OFFSET 1 ++#define SPI_PS_SIZE 1 ++#define SPI_PTCR 0x00000120 ++#define SPI_PTCR_RXTDIS 1 ++#define SPI_PTCR_RXTDIS_MASK 0x00000002 ++#define SPI_PTCR_RXTDIS_OFFSET 1 ++#define SPI_PTCR_RXTDIS_SIZE 1 ++#define SPI_PTCR_RXTEN 0 ++#define SPI_PTCR_RXTEN_MASK 0x00000001 ++#define SPI_PTCR_RXTEN_OFFSET 0 ++#define SPI_PTCR_RXTEN_SIZE 1 ++#define SPI_PTCR_TXTDIS 9 ++#define SPI_PTCR_TXTDIS_MASK 0x00000200 ++#define SPI_PTCR_TXTDIS_OFFSET 9 ++#define SPI_PTCR_TXTDIS_SIZE 1 ++#define SPI_PTCR_TXTEN 8 ++#define SPI_PTCR_TXTEN_MASK 0x00000100 ++#define SPI_PTCR_TXTEN_OFFSET 8 ++#define SPI_PTCR_TXTEN_SIZE 1 ++#define SPI_PTSR 0x00000124 ++#define SPI_PTSR_RXTEN 0 ++#define SPI_PTSR_RXTEN_MASK 0x00000001 ++#define SPI_PTSR_RXTEN_OFFSET 0 ++#define SPI_PTSR_RXTEN_SIZE 1 ++#define SPI_PTSR_TXTEN 8 ++#define SPI_PTSR_TXTEN_MASK 0x00000100 ++#define SPI_PTSR_TXTEN_OFFSET 8 ++#define SPI_PTSR_TXTEN_SIZE 1 ++#define SPI_RCR 0x00000104 ++#define SPI_RCR_RXCTR 0 ++#define SPI_RCR_RXCTR_MASK 0x0000ffff ++#define SPI_RCR_RXCTR_OFFSET 0 ++#define SPI_RCR_RXCTR_SIZE 16 ++#define SPI_RD 0 ++#define SPI_RDR 0x00000008 ++#define SPI_RDRF 0 ++#define SPI_RDRF_MASK 0x00000001 ++#define SPI_RDRF_OFFSET 0 ++#define SPI_RDRF_SIZE 1 ++#define SPI_RDR_PCS 16 ++#define SPI_RDR_PCS_MASK 0x000f0000 ++#define SPI_RDR_PCS_OFFSET 16 ++#define SPI_RDR_PCS_SIZE 4 ++#define SPI_RDR_RD 0 ++#define SPI_RDR_RD_MASK 0x0000ffff ++#define SPI_RDR_RD_OFFSET 0 ++#define SPI_RDR_RD_SIZE 16 ++#define SPI_RD_MASK 0x0000ffff ++#define SPI_RD_OFFSET 0 ++#define SPI_RD_SIZE 16 ++#define SPI_RNCR 0x00000114 ++#define SPI_RNCR_RXNCR 0 ++#define SPI_RNCR_RXNCR_MASK 0x0000ffff ++#define SPI_RNCR_RXNCR_OFFSET 0 ++#define SPI_RNCR_RXNCR_SIZE 16 ++#define SPI_RNPR 0x00000110 ++#define SPI_RPR 0x00000100 ++#define SPI_RXBUFF 6 ++#define SPI_RXBUFF_MASK 0x00000040 ++#define SPI_RXBUFF_OFFSET 6 ++#define SPI_RXBUFF_SIZE 1 ++#define SPI_RXCTR 0 ++#define SPI_RXCTR_MASK 0x0000ffff ++#define SPI_RXCTR_OFFSET 0 ++#define SPI_RXCTR_SIZE 16 ++#define SPI_RXNCR 0 ++#define SPI_RXNCR_MASK 0x0000ffff ++#define SPI_RXNCR_OFFSET 0 ++#define SPI_RXNCR_SIZE 16 ++#define SPI_RXTDIS 1 ++#define SPI_RXTDIS_MASK 0x00000002 ++#define SPI_RXTDIS_OFFSET 1 ++#define SPI_RXTDIS_SIZE 1 ++#define SPI_RXTEN 0 ++#define SPI_RXTEN_MASK 0x00000001 ++#define SPI_RXTEN_OFFSET 0 ++#define SPI_RXTEN_SIZE 1 ++#define SPI_SCBR 8 ++#define SPI_SCBR_MASK 0x0000ff00 ++#define SPI_SCBR_OFFSET 8 ++#define SPI_SCBR_SIZE 8 ++#define SPI_SPIDIS 1 ++#define SPI_SPIDIS_MASK 0x00000002 ++#define SPI_SPIDIS_OFFSET 1 ++#define SPI_SPIDIS_SIZE 1 ++#define SPI_SPIEN 0 ++#define SPI_SPIENS 16 ++#define SPI_SPIENS_MASK 0x00010000 ++#define SPI_SPIENS_OFFSET 16 ++#define SPI_SPIENS_SIZE 1 ++#define SPI_SPIEN_MASK 0x00000001 ++#define SPI_SPIEN_OFFSET 0 ++#define SPI_SPIEN_SIZE 1 ++#define SPI_SR 0x00000010 ++#define SPI_SR_ENDRX 4 ++#define SPI_SR_ENDRX_MASK 0x00000010 ++#define SPI_SR_ENDRX_OFFSET 4 ++#define SPI_SR_ENDRX_SIZE 1 ++#define SPI_SR_ENDTX 5 ++#define SPI_SR_ENDTX_MASK 0x00000020 ++#define SPI_SR_ENDTX_OFFSET 5 ++#define SPI_SR_ENDTX_SIZE 1 ++#define SPI_SR_MODF 2 ++#define SPI_SR_MODF_MASK 0x00000004 ++#define SPI_SR_MODF_OFFSET 2 ++#define SPI_SR_MODF_SIZE 1 ++#define SPI_SR_NSSR 8 ++#define SPI_SR_NSSR_MASK 0x00000100 ++#define SPI_SR_NSSR_OFFSET 8 ++#define SPI_SR_NSSR_SIZE 1 ++#define SPI_SR_OVRES 3 ++#define SPI_SR_OVRES_MASK 0x00000008 ++#define SPI_SR_OVRES_OFFSET 3 ++#define SPI_SR_OVRES_SIZE 1 ++#define SPI_SR_RDRF 0 ++#define SPI_SR_RDRF_MASK 0x00000001 ++#define SPI_SR_RDRF_OFFSET 0 ++#define SPI_SR_RDRF_SIZE 1 ++#define SPI_SR_RXBUFF 6 ++#define SPI_SR_RXBUFF_MASK 0x00000040 ++#define SPI_SR_RXBUFF_OFFSET 6 ++#define SPI_SR_RXBUFF_SIZE 1 ++#define SPI_SR_SPIENS 16 ++#define SPI_SR_SPIENS_MASK 0x00010000 ++#define SPI_SR_SPIENS_OFFSET 16 ++#define SPI_SR_SPIENS_SIZE 1 ++#define SPI_SR_TDRE 1 ++#define SPI_SR_TDRE_MASK 0x00000002 ++#define SPI_SR_TDRE_OFFSET 1 ++#define SPI_SR_TDRE_SIZE 1 ++#define SPI_SR_TXBUFE 7 ++#define SPI_SR_TXBUFE_MASK 0x00000080 ++#define SPI_SR_TXBUFE_OFFSET 7 ++#define SPI_SR_TXBUFE_SIZE 1 ++#define SPI_SR_TXEMPTY 9 ++#define SPI_SR_TXEMPTY_MASK 0x00000200 ++#define SPI_SR_TXEMPTY_OFFSET 9 ++#define SPI_SR_TXEMPTY_SIZE 1 ++#define SPI_SWRST 7 ++#define SPI_SWRST_MASK 0x00000080 ++#define SPI_SWRST_OFFSET 7 ++#define SPI_SWRST_SIZE 1 ++#define SPI_TCR 0x0000010c ++#define SPI_TCR_TXCTR 0 ++#define SPI_TCR_TXCTR_MASK 0x0000ffff ++#define SPI_TCR_TXCTR_OFFSET 0 ++#define SPI_TCR_TXCTR_SIZE 16 ++#define SPI_TD 0 ++#define SPI_TDR 0x0000000c ++#define SPI_TDRE 1 ++#define SPI_TDRE_MASK 0x00000002 ++#define SPI_TDRE_OFFSET 1 ++#define SPI_TDRE_SIZE 1 ++#define SPI_TDR_LASTXFER 24 ++#define SPI_TDR_LASTXFER_MASK 0x01000000 ++#define SPI_TDR_LASTXFER_OFFSET 24 ++#define SPI_TDR_LASTXFER_SIZE 1 ++#define SPI_TDR_PCS 16 ++#define SPI_TDR_PCS_MASK 0x000f0000 ++#define SPI_TDR_PCS_OFFSET 16 ++#define SPI_TDR_PCS_SIZE 4 ++#define SPI_TDR_TD 0 ++#define SPI_TDR_TD_MASK 0x0000ffff ++#define SPI_TDR_TD_OFFSET 0 ++#define SPI_TDR_TD_SIZE 16 ++#define SPI_TD_MASK 0x0000ffff ++#define SPI_TD_OFFSET 0 ++#define SPI_TD_SIZE 16 ++#define SPI_TNCR 0x0000011c ++#define SPI_TNCR_TXNCR 0 ++#define SPI_TNCR_TXNCR_MASK 0x0000ffff ++#define SPI_TNCR_TXNCR_OFFSET 0 ++#define SPI_TNCR_TXNCR_SIZE 16 ++#define SPI_TNPR 0x00000118 ++#define SPI_TPR 0x00000108 ++#define SPI_TXBUFE 7 ++#define SPI_TXBUFE_MASK 0x00000080 ++#define SPI_TXBUFE_OFFSET 7 ++#define SPI_TXBUFE_SIZE 1 ++#define SPI_TXCTR 0 ++#define SPI_TXCTR_MASK 0x0000ffff ++#define SPI_TXCTR_OFFSET 0 ++#define SPI_TXCTR_SIZE 16 ++#define SPI_TXEMPTY 9 ++#define SPI_TXEMPTY_MASK 0x00000200 ++#define SPI_TXEMPTY_OFFSET 9 ++#define SPI_TXEMPTY_SIZE 1 ++#define SPI_TXNCR 0 ++#define SPI_TXNCR_MASK 0x0000ffff ++#define SPI_TXNCR_OFFSET 0 ++#define SPI_TXNCR_SIZE 16 ++#define SPI_TXTDIS 9 ++#define SPI_TXTDIS_MASK 0x00000200 ++#define SPI_TXTDIS_OFFSET 9 ++#define SPI_TXTDIS_SIZE 1 ++#define SPI_TXTEN 8 ++#define SPI_TXTEN_MASK 0x00000100 ++#define SPI_TXTEN_OFFSET 8 ++#define SPI_TXTEN_SIZE 1 ++ ++enum { ++ SPI_ERROR = -1, ++ SPI_OK = 0, ++ SPI_ERROR_TIMEOUT = 1, ++ SPI_ERROR_ARGUMENT, ++ SPI_ERROR_OVERRUN, ++ SPI_ERROR_MODE_FAULT, ++ SPI_ERROR_OVERRUN_AND_MODE_FAULT ++}; ++ ++struct spi_options_t { ++ unsigned char reg; ++ unsigned int baudrate; ++ unsigned char bits; ++ unsigned char spck_delay; ++ unsigned char trans_delay; ++ unsigned char stay_act; ++ unsigned char spi_mode; ++}; ++ ++struct spi_info { ++ void *regs; ++}; ++ ++int spi_select_chip(unsigned char chip); ++ ++int spi_unselect_chip(unsigned char chip); ++ ++int spi_setup_chip_reg(struct spi_options_t *options, unsigned int cpuHz); ++ ++void spi_enable(void); ++ ++void spi_disable(void); ++ ++int spi_write(uchar *addr, int alen, uchar *buffer, int len); ++ ++int spi_read(uchar *addr, int alen, uchar *buffer, int len); ++ ++#define SPI_BIT(name) (1 << SPI_##name##_OFFSET) ++#define SPI_MKBF(name,value) (((value) & ((1 << SPI_##name##_SIZE) - 1)) << SPI_##name##_OFFSET) ++#define SPI_GETBF(name,value) (((value) >> SPI_##name##_OFFSET) & ((1 << SPI_##name##_SIZE) - 1)) ++#define SPI_INSBF(name,value,old) (((old) & ~(((1 << SPI_##name##_SIZE) - 1) << SPI_##name##_OFFSET)) | SPI_MKBF(name, value)) ++ ++#define spi_readl(port,reg) readl((port)->regs + SPI_##reg) ++#define spi_writel(port,reg,value) writel((value), (port)->regs + SPI_##reg) ++ ++#endif /* #ifndef __SPI_H_ */ +diff -uprN u-boot-orig/drivers/atmel_spi.c u-boot/drivers/atmel_spi.c +--- u-boot-orig/drivers/atmel_spi.c 1970-01-01 01:00:00.000000000 +0100 ++++ u-boot/drivers/atmel_spi.c 2007-01-03 10:01:26.000000000 +0100 +@@ -0,0 +1,330 @@ ++/* ++ * Copyright (C) 2004-2006 Atmel Corporation ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++#include <common.h> ++ ++#ifdef CONFIG_ATMEL_SPI ++ ++#include <part.h> ++#include <malloc.h> ++#include <spi.h> ++#include <atmel_spi.h> ++ ++#include <asm/io.h> ++#include <asm/errno.h> ++#include <asm/byteorder.h> ++ ++#include <asm/arch/memory-map.h> ++#include <asm/arch/platform.h> ++ ++ ++struct spi_info *spi; ++ ++void spi_reset(struct spi_info *spi); ++ ++int get_baud_div(struct spi_options_t * options, int busHz); ++ ++int spi_selection_mode(unsigned char variable_ps, ++ unsigned char pcs_decode, ++ unsigned char delay); ++ ++void spi_reset(struct spi_info *spi) ++{ ++ spi_writel(spi, CR, SPI_BIT(CR_SWRST)); ++} ++ ++void spi_init() ++{ ++ const struct device *dev; ++ ++#ifdef CFG_SPI0 ++ dev = get_device(DEVICE_SPI0); ++#elif CFG_SPI1 ++ dev = get_device(DEVICE_SPI1); ++#else ++#error No SPI device available ++#endif ++ if (!dev) ++ return; ++ ++ spi = malloc(sizeof(struct spi_info)); ++ if (!spi) ++ return; ++ ++ spi->regs = dev->regs; ++ ++ /* Reset */ ++ spi_reset(spi); ++ ++ /* Master Mode */ ++ spi_writel(spi, MR, SPI_BIT(MR_MSTR) ++ |SPI_MR_PCS_MASK ++ |(0<<SPI_MR_FDIV_OFFSET) ++ |(0<<SPI_MR_MODFDIS_OFFSET)); ++ ++ /* Selection mode: ++ * no variable peripheral select ++ * no peripheral chip select decode ++ * 0 delay cycles after a chip select ++ */ ++ if (!spi_selection_mode(0, 0, 0)) ++ return; ++ ++ debug("spi: controller at 0x%08x\n", spi->regs); ++} ++ ++int spi_selection_mode(unsigned char variable_ps, ++ unsigned char pcs_decode, ++ unsigned char delay) ++{ ++ if (variable_ps > 1 || pcs_decode > 1) { ++ return SPI_ERROR_ARGUMENT; ++ } ++ ++ /* Unset bitfields */ ++ spi_writel(spi, MR, spi_readl(spi, MR) & ++ ~(SPI_MR_PS_MASK|SPI_MR_PCSDEC_MASK ++ |SPI_MR_DLYBCS_MASK)); ++ /* Set selction bits */ ++ spi_writel(spi, MR, spi_readl(spi, MR) ++ |SPI_MKBF(MR_PS, variable_ps) ++ |SPI_MKBF(MR_PCSDEC, pcs_decode) ++ |SPI_MKBF(MR_DLYBCS, delay)); ++ ++ return SPI_OK; ++} ++ ++int spi_select_chip(unsigned char chip) ++{ ++ /* Assert all lines; no peripheral is selected */ ++ spi_writel(spi, MR_PCS, spi_readl(spi, MR)|SPI_MR_PCS_MASK); ++ ++ if (spi_readl(spi, MR) & SPI_MR_PCSDEC_MASK) { ++ ulong status; ++ ++ /* The signal is decoded; allow up to 15 chips */ ++ if (chip > 14) { ++ return SPI_ERROR_ARGUMENT; ++ } ++ ++ status = spi_readl(spi, MR); ++ status &= ~SPI_MR_PCS_MASK; ++ status |= SPI_MKBF(MR_PCS, chip); ++ spi_writel(spi, MR, status); ++ } else { ++ if (chip > 3) { ++ return SPI_ERROR_ARGUMENT; ++ } ++ ++ spi_writel(spi, MR, spi_readl(spi, MR) & ++ ~(1<<(SPI_MR_PCS_OFFSET + chip))); ++ } ++ ++ debug("spi: chip select %d activated\n", chip); ++ ++ return SPI_OK; ++} ++ ++int spi_unselect_chip(unsigned char chip) ++{ ++ /* Assert all lines; no peripheral is selected */ ++ spi_writel(spi, MR, spi_readl(spi, MR)|SPI_MR_PCS_MASK); ++ ++ /* Last transfer, so deassert the current NPCS if CSAAT is set */ ++ spi_writel(spi, CR, spi_readl(spi, MR)|SPI_CR_LASTXFER_MASK); ++ ++ debug("spi: chip select %d deactivated\n", chip); ++ ++ return SPI_OK; ++} ++ ++int spi_setup_chip_reg(struct spi_options_t *options, ++ unsigned int busHz) ++{ ++ int baudDiv = -1; ++ unsigned long csr = 0; ++ ++ if (options->bits > 16 || options->bits < 8 || options->stay_act > 1) { ++ return SPI_ERROR_ARGUMENT; ++ } ++ ++ baudDiv = get_baud_div(options, busHz); ++ ++ if (baudDiv < 0) { ++ return -baudDiv; ++ } ++ ++ /* Will use CSR0 offsets; these are the same for CSR0 - CSR3 */ ++ csr = ((options->bits - 8)<<SPI_CSR0_BITS_OFFSET)| ++ (baudDiv<<SPI_CSR0_SCBR_OFFSET)| ++ (options->spck_delay<<SPI_CSR0_DLYBS_OFFSET)| ++ (options->trans_delay<<SPI_CSR0_DLYBCT_OFFSET)| ++ (options->stay_act<<SPI_CSR0_CSAAT_OFFSET); ++ ++ switch (options->spi_mode) { ++ case 0: ++ csr |= (1<<SPI_CSR0_NCPHA_OFFSET); /* pass through */ ++ case 1: ++ break; ++ case 2: ++ csr |= (1<<SPI_CSR0_NCPHA_OFFSET); /* pass through */ ++ case 3: ++ csr |= (1<<SPI_CSR0_CPOL_OFFSET); ++ break; ++ default: /* Not in legal range */ ++ return SPI_ERROR_ARGUMENT; ++ } ++ ++ switch (options->reg) { ++ case 0: ++ spi_writel(spi, CSR0, csr); ++ break; ++ case 1: ++ spi_writel(spi, CSR1, csr); ++ break; ++ case 2: ++ spi_writel(spi, CSR2, csr); ++ break; ++ case 3: ++ spi_writel(spi, CSR3, csr); ++ break; ++ default: ++ return SPI_ERROR_ARGUMENT; ++ } ++ ++ debug("spi: chip select %d registered\n", options->reg); ++ ++ return SPI_OK; ++} ++ ++void spi_enable() ++{ ++ spi_writel(spi, CR, SPI_BIT(CR_SPIEN)); ++} ++ ++void spi_disable() ++{ ++ spi_writel(spi, CR, SPI_BIT(CR_SPIDIS)); ++} ++ ++int spi_write(uchar *addr, int alen, uchar *buffer, int len) ++{ ++ int sent = 0; ++ uchar *addr_p = addr; ++ uchar *buffer_p = buffer; ++ unsigned int timeout = SPI_TIMEOUT; ++ ++ if ((alen + len) <= 0) ++ return -SPI_ERROR_ARGUMENT; ++ ++ do { ++ while (!(spi_readl(spi, SR) & SPI_BIT(SR_TXEMPTY)) && --timeout); ++ if (!timeout) ++ return -SPI_ERROR_TIMEOUT; ++ if (len > 0 || alen > 1) ++ spi_writel(spi, TDR, *addr_p++ & 0x0000FFFF); ++ else ++ spi_writel(spi, TDR, (*addr_p++ & 0x0000FFFF) ++ | SPI_BIT(TDR_LASTXFER)); ++ sent++; ++ } while (--alen > 0); ++ ++ timeout = SPI_TIMEOUT; ++ ++ do { ++ while (!(spi_readl(spi, SR) & SPI_BIT(SR_TXEMPTY)) && --timeout); ++ if (!timeout) ++ return -SPI_ERROR_TIMEOUT; ++ if (len > 1) ++ spi_writel(spi, TDR, *buffer_p++ & 0x0000FFFF); ++ else ++ spi_writel(spi, TDR, (*buffer_p++ & 0x0000FFFF) ++ | SPI_BIT(TDR_LASTXFER)); ++ sent++; ++ } while (--len > 0); ++ ++ return sent; ++} ++ ++int spi_read(uchar *addr, int alen, uchar *buffer, int len) ++{ ++ int received = 0; ++ uchar *addr_p = addr; ++ uchar *buffer_p = buffer; ++ unsigned int timeout = SPI_TIMEOUT; ++ ++ if ((alen + len) <= 0) ++ return SPI_ERROR_ARGUMENT; ++ ++ do { ++ while (!(spi_readl(spi, SR) & SPI_BIT(SR_RDRF)) && --timeout); ++ if (!timeout) ++ return -SPI_ERROR_TIMEOUT; ++ *addr_p++ = spi_readl(spi, RDR) & 0x000000FF; ++ --alen; ++ received++; ++ } while (alen > 0); ++ ++ timeout = SPI_TIMEOUT; ++ ++ do { ++ while (!(spi_readl(spi, SR) & SPI_BIT(SR_RDRF)) && --timeout); ++ if (!timeout) ++ return -SPI_ERROR_TIMEOUT; ++ *buffer_p++ = spi_readl(spi, RDR) & 0x000000FF; ++ --len; ++ received++; ++ } while (len > 0); ++ ++ return received; ++} ++ ++int spi_xfer(spi_chipsel_type chipsel, int bitlen, uchar *dout, uchar *din) ++{ ++ int len = 0; ++ uchar *dout_p = dout; ++ uchar *din_p = din; ++ ++ while (--bitlen) { ++ if (spi_write(dout_p++, 1, 0, 0) != 1) ++ break; ++ if (spi_read(din_p++, 1, 0, 0) != 1) ++ break; ++ len++; ++ } ++ ++ return len; ++} ++ ++int get_baud_div(struct spi_options_t *options, int busHz) { ++ int baudDiv = 0; ++ ++ baudDiv = busHz / options->baudrate; ++ ++ if (baudDiv > (SPI_CSR0_SCBR_MASK<<SPI_CSR0_SCBR_OFFSET) ++ || baudDiv <= 0) { ++ return -SPI_ERROR_ARGUMENT; ++ } ++ ++ return baudDiv; ++} ++ ++#endif /* CONFIG_ATMEL_SPI */ +diff -uprN u-boot-orig/drivers/Makefile u-boot/drivers/Makefile +--- u-boot-orig/drivers/Makefile 2007-01-01 19:26:46.000000000 +0100 ++++ u-boot/drivers/Makefile 2007-01-01 16:10:49.000000000 +0100 +@@ -28,7 +28,7 @@ include $(TOPDIR)/config.mk + LIB = libdrivers.a + + OBJS = 3c589.o 5701rls.o ali512x.o \ +- atmel_usart.o atmel_lcdc.o \ ++ atmel_usart.o atmel_lcdc.o atmel_spi.o \ + bcm570x.o bcm570x_autoneg.o cfb_console.o cfi_flash.o \ + cs8900.o ct69000.o dataflash.o dc2114x.o dm9000x.o \ + e1000.o eepro100.o \ diff --git a/packages/u-boot/u-boot-1.3.2/.mtn2git_empty b/packages/u-boot/u-boot-1.3.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/u-boot/u-boot-1.3.2/.mtn2git_empty diff --git a/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-autoboot.patch b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-autoboot.patch new file mode 100644 index 0000000000..ffca5a35c7 --- /dev/null +++ b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-autoboot.patch @@ -0,0 +1,12 @@ +diff -urN u-boot-1.3.1.orig/include/configs/MPC8313ERDB.h u-boot-1.3.1/include/configs/MPC8313ERDB.h +--- u-boot-1.3.1.orig/include/configs/MPC8313ERDB.h 2007-12-06 10:21:19.000000000 +0100 ++++ u-boot-1.3.1/include/configs/MPC8313ERDB.h 2008-01-31 17:38:10.000000000 +0100 +@@ -522,7 +522,7 @@ + #define CONFIG_FDTFILE mpc8313erdb.dtb + + #define CONFIG_LOADADDR 200000 /* default location for tftp and bootm */ +-#define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */ ++#define CONFIG_BOOTDELAY 3 /* autoboot after 3 seconds */ + #define CONFIG_BAUDRATE 115200 + + #define XMK_STR(x) #x diff --git a/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch new file mode 100644 index 0000000000..9071dfa419 --- /dev/null +++ b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-mtdparts.patch @@ -0,0 +1,35 @@ +diff -urN u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h u-boot-1.3.2/include/configs/MPC8313ERDB.h +--- u-boot-1.3.2.orig/include/configs/MPC8313ERDB.h 2008-03-09 16:20:02.000000000 +0100 ++++ u-boot-1.3.2/include/configs/MPC8313ERDB.h 2008-04-21 19:20:51.000000000 +0200 +@@ -179,7 +179,7 @@ + #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET + + /* CFG_MONITOR_LEN must be a multiple of CFG_ENV_SECT_SIZE */ +-#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */ ++#define CFG_MONITOR_LEN (384 * 1024) /* Reserve 384 kB for Mon */ + #define CFG_MALLOC_LEN (512 * 1024) /* Reserved for malloc */ + + /* +@@ -354,6 +354,7 @@ + #define CONFIG_CMD_PING + #define CONFIG_CMD_DHCP + #define CONFIG_CMD_I2C ++#define CONFIG_CMD_JFFS2 + #define CONFIG_CMD_MII + #define CONFIG_CMD_DATE + #define CONFIG_CMD_PCI +@@ -365,6 +366,14 @@ + + #define CONFIG_CMDLINE_EDITING 1 + ++/* ++ * JFFS2 partitions (mtdparts command line support) ++ */ ++#define CONFIG_JFFS2_CMDLINE ++#define CONFIG_JFFS2_NAND ++#define MTDIDS_DEFAULT "nor0=physmap-flash.0,nand0=nand0" ++#define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:384k(uboot),64k(env)" ++ + + /* + * Miscellaneous configurable options diff --git a/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-nand.patch b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-nand.patch new file mode 100644 index 0000000000..e653b75fb9 --- /dev/null +++ b/packages/u-boot/u-boot-1.3.2/mpc8313e-rdb-nand.patch @@ -0,0 +1,895 @@ +diff -urN u-boot-1.3.1.orig/board/freescale/mpc8313erdb/Makefile u-boot-1.3.1/board/freescale/mpc8313erdb/Makefile +--- u-boot-1.3.1.orig/board/freescale/mpc8313erdb/Makefile 2007-12-06 10:21:19.000000000 +0100 ++++ u-boot-1.3.1/board/freescale/mpc8313erdb/Makefile 2008-01-31 17:35:43.000000000 +0100 +@@ -25,7 +25,7 @@ + + LIB = $(obj)lib$(BOARD).a + +-COBJS := $(BOARD).o sdram.o ++COBJS := $(BOARD).o sdram.o nand.o + + SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) + OBJS := $(addprefix $(obj),$(COBJS)) +diff -urN u-boot-1.3.1.orig/board/freescale/mpc8313erdb/nand.c u-boot-1.3.1/board/freescale/mpc8313erdb/nand.c +--- u-boot-1.3.1.orig/board/freescale/mpc8313erdb/nand.c 1970-01-01 01:00:00.000000000 +0100 ++++ u-boot-1.3.1/board/freescale/mpc8313erdb/nand.c 2008-01-31 17:35:26.000000000 +0100 +@@ -0,0 +1,868 @@ ++/* ++ * Copyright (C) Freescale Semiconductor, Inc. 2006. ++ * ++ * Initialized by Nick.Spence@freescale.com ++ * Wilson.Lo@freescale.com ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include <common.h> ++ ++#if defined(CONFIG_CMD_NAND) ++#if defined(CFG_NAND_LEGACY) ++ #error "U-Boot legacy NAND commands not supported." ++#else ++ ++#include <malloc.h> ++#include <asm/errno.h> ++#include <nand.h> ++ ++#undef CFG_FCM_DEBUG ++#define CFG_FCM_DEBUG_LVL 1 ++#ifdef CFG_FCM_DEBUG ++#define FCM_DEBUG(n, args...) \ ++ do { \ ++ if (n <= (CFG_FCM_DEBUG_LVL + 0)) \ ++ printf(args); \ ++ } while(0) ++#else /* CONFIG_FCM_DEBUG */ ++#define FCM_DEBUG(n, args...) do { } while(0) ++#endif ++ ++#define MIN(x, y) ((x < y) ? x : y) ++ ++#define ERR_BYTE 0xFF /* Value returned for read bytes when read failed */ ++ ++#define FCM_TIMEOUT_USECS 100000 /* Maximum number of uSecs to wait for FCM */ ++ ++/* Private structure holding NAND Flash device specific information */ ++struct fcm_nand { ++ int bank; /* Chip select bank number */ ++ unsigned int base; /* Chip select base address */ ++ int pgs; /* NAND page size */ ++ int oobbuf; /* Pointer to OOB block */ ++ unsigned int page; /* Last page written to / read from */ ++ unsigned int fmr; /* FCM Flash Mode Register value */ ++ unsigned int mdr; /* UPM/FCM Data Register value */ ++ unsigned int use_mdr; /* Non zero if the MDR is to be set */ ++ u_char *addr; /* Address of assigned FCM buffer */ ++ unsigned int read_bytes; /* Number of bytes read during command */ ++ unsigned int index; /* Pointer to next byte to 'read' */ ++ unsigned int req_bytes; /* Number of bytes read if command ok */ ++ unsigned int req_index; /* New read index if command ok */ ++ unsigned int status; /* status read from LTESR after last op*/ ++}; ++ ++ ++/* These map to the positions used by the FCM hardware ECC generator */ ++ ++/* Small Page FLASH with FMR[ECCM] = 0 */ ++static struct nand_oobinfo fcm_oob_sp_eccm0 = { /* TODO */ ++ .useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */ ++ .eccbytes = 3, ++ .eccpos = {6, 7, 8}, ++ .oobfree = { {0, 5}, {9, 7} } ++}; ++ ++/* Small Page FLASH with FMR[ECCM] = 1 */ ++static struct nand_oobinfo fcm_oob_sp_eccm1 = { /* TODO */ ++ .useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */ ++ .eccbytes = 3, ++ .eccpos = {8, 9, 10}, ++ .oobfree = { {0, 5}, {6, 2}, {11, 5} } ++}; ++ ++/* Large Page FLASH with FMR[ECCM] = 0 */ ++static struct nand_oobinfo fcm_oob_lp_eccm0 = { ++ .useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */ ++ .eccbytes = 12, ++ .eccpos = {6, 7, 8, 22, 23, 24, 38, 39, 40, 54, 55, 56}, ++ .oobfree = { {1, 5}, {9, 13}, {25, 13}, {41, 13}, {57, 7} } ++}; ++ ++/* Large Page FLASH with FMR[ECCM] = 1 */ ++static struct nand_oobinfo fcm_oob_lp_eccm1 = { ++ .useecc = MTD_NANDECC_AUTOPL_USR, /* MTD_NANDECC_PLACEONLY, */ ++ .eccbytes = 12, ++ .eccpos = {8, 9, 10, 24, 25, 26, 40, 41, 42, 56, 57, 58}, ++ .oobfree = { {1, 7}, {11, 13}, {27, 13}, {43, 13}, {59, 5} } ++}; ++ ++/* ++ * execute FCM command and wait for it to complete ++ */ ++static int fcm_run_command(struct mtd_info *mtd) ++{ ++ volatile immap_t *im = (immap_t *) CFG_IMMR; ++ volatile lbus83xx_t *lbc= &im->lbus; ++ register struct nand_chip *this = mtd->priv; ++ struct fcm_nand *fcm = this->priv; ++ long long end_tick; ++ ++ /* Setup the FMR[OP] to execute without write protection */ ++ lbc->fmr = fcm->fmr | 3; ++ if (fcm->use_mdr) ++ lbc->mdr = fcm->mdr; ++ ++ FCM_DEBUG(5,"fcm_run_command: fmr= %08X fir= %08X fcr= %08X\n", ++ lbc->fmr, lbc->fir, lbc->fcr); ++ FCM_DEBUG(5,"fcm_run_command: fbar=%08X fpar=%08X fbcr=%08X bank=%d\n", ++ lbc->fbar, lbc->fpar, lbc->fbcr, fcm->bank); ++ ++ /* clear event registers */ ++ lbc->lteatr = 0; ++ lbc->ltesr |= (LTESR_FCT | LTESR_PAR | LTESR_CC); ++ ++ /* execute special operation */ ++ lbc->lsor = fcm->bank; ++ ++ /* wait for FCM complete flag or timeout */ ++ fcm->status = 0; ++ end_tick = usec2ticks(FCM_TIMEOUT_USECS) + get_ticks(); ++ ++ while (end_tick > get_ticks()) { ++ if (lbc->ltesr & LTESR_CC) { ++ fcm->status = lbc->ltesr & ++ (LTESR_FCT | LTESR_PAR | LTESR_CC); ++ break; ++ } ++ } ++ ++ /* store mdr value in case it was needed */ ++ if (fcm->use_mdr) ++ fcm->mdr = lbc->mdr; ++ ++ fcm->use_mdr = 0; ++ ++ FCM_DEBUG(5,"fcm_run_command: stat=%08X mdr= %08X fmr= %08X\n", ++ fcm->status, fcm->mdr, lbc->fmr); ++ ++ /* if the operation completed ok then set the read buffer pointers */ ++ if (fcm->status == LTESR_CC) { ++ fcm->read_bytes = fcm->req_bytes; ++ fcm->index = fcm->req_index; ++ return 0; ++ } ++ ++ return -1; ++} ++ ++/* ++ * Set up the FCM hardware block and page address fields, and the fcm ++ * structure addr field to point to the correct FCM buffer in memory ++ */ ++static void set_addr(struct mtd_info *mtd, int column, int page_addr, int oob) ++{ ++ volatile immap_t *im = (immap_t *) CFG_IMMR; ++ volatile lbus83xx_t *lbc= &im->lbus; ++ register struct nand_chip *this = mtd->priv; ++ struct fcm_nand *fcm = this->priv; ++ int buf_num; ++ ++ fcm->page = page_addr; ++ ++ lbc->fbar = page_addr >> (this->phys_erase_shift - this->page_shift); ++ if (fcm->pgs) { ++ lbc->fpar = ((page_addr << FPAR_LP_PI_SHIFT) & FPAR_LP_PI) | ++ ( oob ? FPAR_LP_MS : 0) | ++ column; ++ buf_num = (page_addr & 1) << 2; ++ } else { ++ lbc->fpar = ((page_addr << FPAR_SP_PI_SHIFT) & FPAR_SP_PI) | ++ ( oob ? FPAR_SP_MS : 0) | ++ column; ++ buf_num = page_addr & 7; ++ } ++ fcm->addr = (unsigned char*)(fcm->base + (buf_num * 1024)); ++ ++ /* for OOB data point to the second half of the buffer */ ++ if (oob) { ++ fcm->addr += (fcm->pgs ? 2048 : 512); ++ } ++} ++ ++/* not required for FCM */ ++static void fcm_hwcontrol(struct mtd_info *mtdinfo, int cmd) ++{ ++ return; ++} ++ ++ ++/* ++ * FCM does not support 16 bit data busses ++ */ ++static u16 fcm_read_word(struct mtd_info *mtd) ++{ ++ printf("fcm_read_word: UNIMPLEMENTED.\n"); ++ return 0; ++} ++static void fcm_write_word(struct mtd_info *mtd, u16 word) ++{ ++ printf("fcm_write_word: UNIMPLEMENTED.\n"); ++} ++ ++/* ++ * Write buf to the FCM Controller Data Buffer ++ */ ++static void fcm_write_buf(struct mtd_info *mtd, const u_char *buf, int len) ++{ ++ register struct nand_chip *this = mtd->priv; ++ struct fcm_nand *fcm = this->priv; ++ ++ FCM_DEBUG(3,"fcm_write_buf: writing %d bytes starting with 0x%x" ++ " at %d.\n", len, *((unsigned long*) buf), fcm->index); ++ ++ /* If armed catch the address of the OOB buffer so that it can be */ ++ /* updated with the real signature after the program comletes */ ++ if (!fcm->oobbuf) ++ fcm->oobbuf = (int) buf; ++ ++ /* copy the data into the FCM hardware buffer and update the index */ ++ memcpy(&(fcm->addr[fcm->index]), buf, len); ++ fcm->index += len; ++ return; ++} ++ ++ ++/* ++ * FCM does not support individual writes. Instead these are either commands ++ * or data being written, both of which are handled through the cmdfunc ++ * handler. ++ */ ++static void fcm_write_byte(struct mtd_info *mtd, u_char byte) ++{ ++ printf("fcm_write_byte: UNIMPLEMENTED.\n"); ++} ++ ++/* ++ * read a byte from either the FCM hardware buffer if it has any data left ++ * otherwise issue a command to read a single byte. ++ */ ++static u_char fcm_read_byte(struct mtd_info *mtd) ++{ ++ volatile immap_t *im = (immap_t *) CFG_IMMR; ++ volatile lbus83xx_t *lbc= &im->lbus; ++ register struct nand_chip *this = mtd->priv; ++ struct fcm_nand *fcm = this->priv; ++ unsigned char byte; ++ ++ /* If there are still bytes in the FCM then use the next byte */ ++ if(fcm->index < fcm->read_bytes) { ++ byte = fcm->addr[(fcm->index)++]; ++ FCM_DEBUG(4,"fcm_read_byte: byte %u (%02X): %d of %d.\n", ++ byte, byte, fcm->index-1, fcm->read_bytes); ++ } else { ++ /* otherwise issue a command to read 1 byte */ ++ lbc->fir = (FIR_OP_RSW << FIR_OP0_SHIFT); ++ fcm->use_mdr = 1; ++ fcm->read_bytes = 0; ++ fcm->index = 0; ++ fcm->req_bytes = 0; ++ fcm->req_index = 0; ++ byte = fcm_run_command(mtd) ? ERR_BYTE : fcm->mdr & 0xff; ++ FCM_DEBUG(4,"fcm_read_byte: byte %u (%02X) from bus.\n", ++ byte, byte); ++ } ++ ++ return byte; ++} ++ ++ ++/* ++ * Read from the FCM Controller Data Buffer ++ */ ++static void fcm_read_buf(struct mtd_info *mtd, u_char* buf, int len) ++{ ++ volatile immap_t *im = (immap_t *) CFG_IMMR; ++ volatile lbus83xx_t *lbc= &im->lbus; ++ register struct nand_chip *this = mtd->priv; ++ struct fcm_nand *fcm = this->priv; ++ int i; ++ int rest; ++ ++ FCM_DEBUG(3,"fcm_read_buf: reading %d bytes.\n", len); ++ ++ /* If last read failed then return error bytes */ ++ if (fcm->status != LTESR_CC) { ++ /* just keep copying bytes so that the oob works */ ++ memcpy(buf, &(fcm->addr[(fcm->index)]), len); ++ fcm->index += len; ++ } ++ else ++ { ++ /* see how much is still in the FCM buffer */ ++ i = min(len, (fcm->read_bytes - fcm->index)); ++ rest = i - len; ++ len = i; ++ ++ memcpy(buf, &(fcm->addr[(fcm->index)]), len); ++ fcm->index += len; ++ ++ /* If more data is needed then issue another block read */ ++ if (rest) { ++ FCM_DEBUG(3,"fcm_read_buf: getting %d more bytes.\n", ++ rest); ++ buf += len; ++ lbc->fir = (FIR_OP_RBW << FIR_OP0_SHIFT); ++ set_addr(mtd, 0, 0, 0); ++ lbc->fbcr = rest; ++ fcm->req_bytes = lbc->fbcr; ++ fcm->req_index = 0; ++ fcm->use_mdr = 0; ++ if (!fcm_run_command(mtd)) ++ fcm_read_buf(mtd, buf, rest); ++ else ++ memcpy(buf, fcm->addr, rest); ++ } ++ } ++ return; ++} ++ ++ ++/* ++ * Verify buffer against the FCM Controller Data Buffer ++ */ ++static int fcm_verify_buf(struct mtd_info *mtd, const u_char *buf, int len) ++{ ++ volatile immap_t *im = (immap_t *) CFG_IMMR; ++ volatile lbus83xx_t *lbc= &im->lbus; ++ register struct nand_chip *this = mtd->priv; ++ struct fcm_nand *fcm = this->priv; ++ int i; ++ int rest; ++ ++ FCM_DEBUG(3,"fcm_verify_buf: checking %d bytes starting with 0x%02x.\n", ++ len, *((unsigned long*) buf)); ++ /* If last read failed then return error bytes */ ++ if (fcm->status != LTESR_CC) { ++ return EFAULT; ++ } ++ ++ /* see how much is still in the FCM buffer */ ++ i = min(len, (fcm->read_bytes - fcm->index)); ++ rest = i - len; ++ len = i; ++ ++ if (memcmp(buf, &(fcm->addr[(fcm->index)]), len)) { ++ return EFAULT; ++ } ++ ++ fcm->index += len; ++ if (rest) { ++ FCM_DEBUG(3,"fcm_verify_buf: getting %d more bytes.\n", rest); ++ buf += len; ++ lbc->fir = (FIR_OP_RBW << FIR_OP0_SHIFT); ++ set_addr(mtd, 0, 0, 0); ++ lbc->fbcr = rest; ++ fcm->req_bytes = lbc->fbcr; ++ fcm->req_index = 0; ++ fcm->use_mdr = 0; ++ if (fcm_run_command(mtd)) ++ return EFAULT; ++ return fcm_verify_buf(mtd, buf, rest); ++ ++ } ++ return 0; ++} ++ ++/* this function is called after Program and Erase Operations to ++ * check for success or failure */ ++static int fcm_wait(struct mtd_info *mtd, struct nand_chip *this, int state) ++{ ++ volatile immap_t *im = (immap_t *) CFG_IMMR; ++ volatile lbus83xx_t *lbc= &im->lbus; ++ struct fcm_nand *fcm = this->priv; ++ ++ if (fcm->status != LTESR_CC) { ++ return(0x1); /* Status Read error */ ++ } ++ ++ /* Use READ_STATUS command, but wait for the device to be ready */ ++ fcm->use_mdr = 0; ++ fcm->req_index = 0; ++ fcm->read_bytes = 0; ++ fcm->index = 0; ++ fcm->oobbuf = -1; ++ lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | ++ (FIR_OP_RBW << FIR_OP1_SHIFT); ++ lbc->fcr = (NAND_CMD_STATUS << FCR_CMD0_SHIFT); ++ set_addr(mtd, 0, 0, 0); ++ lbc->fbcr = 1; ++ fcm->req_bytes = lbc->fbcr; ++ fcm_run_command(mtd); ++ if (fcm->status != LTESR_CC) { ++ return(0x1); /* Status Read error */ ++ } ++ return this->read_byte(mtd); ++} ++ ++ ++/* cmdfunc send commands to the FCM */ ++static void fcm_cmdfunc(struct mtd_info *mtd, unsigned command, ++ int column, int page_addr) ++{ ++ volatile immap_t *im = (immap_t *) CFG_IMMR; ++ volatile lbus83xx_t *lbc= &im->lbus; ++ register struct nand_chip *this = mtd->priv; ++ struct fcm_nand *fcm = this->priv; ++ ++ fcm->use_mdr = 0; ++ fcm->req_index = 0; ++ ++ /* clear the read buffer */ ++ fcm->read_bytes = 0; ++ if (command != NAND_CMD_PAGEPROG) { ++ fcm->index = 0; ++ fcm->oobbuf = -1; ++ } ++ ++ switch (command) { ++ /* READ0 and READ1 read the entire buffer to use hardware ECC */ ++ case NAND_CMD_READ1: ++ FCM_DEBUG(2,"fcm_cmdfunc: NAND_CMD_READ1, page_addr:" ++ " 0x%x, column: 0x%x.\n", page_addr, column); ++ fcm->req_index = column + 256; ++ goto read0; ++ case NAND_CMD_READ0: ++ FCM_DEBUG(2,"fcm_cmdfunc: NAND_CMD_READ0, page_addr:" ++ " 0x%x, column: 0x%x.\n", page_addr, column); ++ fcm->req_index = column; ++read0: ++ if (fcm->pgs) { ++ lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | ++ (FIR_OP_CA << FIR_OP1_SHIFT) | ++ (FIR_OP_PA << FIR_OP2_SHIFT) | ++ (FIR_OP_CW1 << FIR_OP3_SHIFT) | ++ (FIR_OP_RBW << FIR_OP4_SHIFT); ++ } else { ++ lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | ++ (FIR_OP_CA << FIR_OP1_SHIFT) | ++ (FIR_OP_PA << FIR_OP2_SHIFT) | ++ (FIR_OP_RBW << FIR_OP3_SHIFT); ++ } ++ lbc->fcr = (NAND_CMD_READ0 << FCR_CMD0_SHIFT) | ++ (NAND_CMD_READSTART << FCR_CMD1_SHIFT); ++ lbc->fbcr = 0; /* read entire page to enable ECC */ ++ set_addr(mtd, 0, page_addr, 0); ++ fcm->req_bytes = mtd->oobblock + mtd->oobsize; ++ goto write_cmd2; ++ /* READOOB read only the OOB becasue no ECC is performed */ ++ case NAND_CMD_READOOB: ++ FCM_DEBUG(2,"fcm_cmdfunc: NAND_CMD_READOOB, page_addr:" ++ " 0x%x, column: 0x%x.\n", page_addr, column); ++ if (fcm->pgs) { ++ lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | ++ (FIR_OP_CA << FIR_OP1_SHIFT) | ++ (FIR_OP_PA << FIR_OP2_SHIFT) | ++ (FIR_OP_CW1 << FIR_OP3_SHIFT) | ++ (FIR_OP_RBW << FIR_OP4_SHIFT); ++ lbc->fcr = (NAND_CMD_READ0 << FCR_CMD0_SHIFT) | ++ (NAND_CMD_READSTART << FCR_CMD1_SHIFT); ++ } else { ++ lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | ++ (FIR_OP_CA << FIR_OP1_SHIFT) | ++ (FIR_OP_PA << FIR_OP2_SHIFT) | ++ (FIR_OP_RBW << FIR_OP3_SHIFT); ++ lbc->fcr = (NAND_CMD_READOOB << FCR_CMD0_SHIFT); ++ } ++ lbc->fbcr = mtd->oobsize - column; ++ set_addr(mtd, column, page_addr, 1); ++ goto write_cmd1; ++ /* READID must read all 5 possible bytes while CEB is active */ ++ case NAND_CMD_READID: ++ FCM_DEBUG(2,"fcm_cmdfunc: NAND_CMD_READID.\n"); ++ lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | ++ (FIR_OP_UA << FIR_OP1_SHIFT) | ++ (FIR_OP_RBW << FIR_OP2_SHIFT); ++ lbc->fcr = (NAND_CMD_READID << FCR_CMD0_SHIFT); ++ lbc->fbcr = 5; /* 5 bytes for manuf, device and exts */ ++ fcm->use_mdr = 1; ++ fcm->mdr = 0; ++ goto write_cmd0; ++ /* ERASE1 stores the block and page address */ ++ case NAND_CMD_ERASE1: ++ FCM_DEBUG(2,"fcm_cmdfunc: NAND_CMD_ERASE1, page_addr:" ++ " 0x%x.\n", page_addr); ++ set_addr(mtd, 0, page_addr, 0); ++ goto end; ++ /* ERASE2 uses the block and page address from ERASE1 */ ++ case NAND_CMD_ERASE2: ++ FCM_DEBUG(2,"fcm_cmdfunc: NAND_CMD_ERASE2.\n"); ++ lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | ++ (FIR_OP_PA << FIR_OP1_SHIFT) | ++ (FIR_OP_CM1 << FIR_OP2_SHIFT); ++ lbc->fcr = (NAND_CMD_ERASE1 << FCR_CMD0_SHIFT) | ++ (NAND_CMD_ERASE2 << FCR_CMD1_SHIFT); ++ lbc->fbcr = 0; ++ goto write_cmd1; ++ /* SEQIN sets up the addr buffer and all registers except the length */ ++ case NAND_CMD_SEQIN: ++ FCM_DEBUG(2,"fcm_cmdfunc: NAND_CMD_SEQIN/PAGE_PROG, page_addr:" ++ " 0x%x, column: 0x%x.\n", page_addr, column); ++ if (column == 0) { ++ lbc->fbcr = 0; /* write entire page to enable ECC */ ++ } else { ++ lbc->fbcr = 1; /* mark as partial page so no HW ECC */ ++ } ++ if (fcm->pgs) { ++ /* always use READ0 for large page devices */ ++ lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | ++ (FIR_OP_CA << FIR_OP1_SHIFT) | ++ (FIR_OP_PA << FIR_OP2_SHIFT) | ++ (FIR_OP_WB << FIR_OP3_SHIFT) | ++ (FIR_OP_CW1 << FIR_OP4_SHIFT); ++ lbc->fcr = (NAND_CMD_SEQIN << FCR_CMD0_SHIFT) | ++ (NAND_CMD_PAGEPROG << FCR_CMD1_SHIFT); ++ set_addr(mtd, column, page_addr, 0); ++ } else { ++ lbc->fir = (FIR_OP_CW0 << FIR_OP0_SHIFT) | ++ (FIR_OP_CM2 << FIR_OP1_SHIFT) | ++ (FIR_OP_CA << FIR_OP2_SHIFT) | ++ (FIR_OP_PA << FIR_OP3_SHIFT) | ++ (FIR_OP_WB << FIR_OP4_SHIFT) | ++ (FIR_OP_CW1 << FIR_OP5_SHIFT); ++ if (column >= mtd->oobblock) { ++ /* OOB area --> READOOB */ ++ column -= mtd->oobblock; ++ lbc->fcr = (NAND_CMD_READOOB << FCR_CMD0_SHIFT) ++ | (NAND_CMD_PAGEPROG<< FCR_CMD1_SHIFT) ++ | (NAND_CMD_SEQIN << FCR_CMD2_SHIFT); ++ set_addr(mtd, column, page_addr, 1); ++ } else if (column < 256) { ++ /* First 256 bytes --> READ0 */ ++ lbc->fcr = (NAND_CMD_READ0 << FCR_CMD0_SHIFT) ++ | (NAND_CMD_PAGEPROG<< FCR_CMD1_SHIFT) ++ | (NAND_CMD_SEQIN << FCR_CMD2_SHIFT); ++ set_addr(mtd, column, page_addr, 0); ++ } else { ++ /* Second 256 bytes --> READ1 */ ++ column -= 256; ++ lbc->fcr = (NAND_CMD_READ1 << FCR_CMD0_SHIFT) ++ | (NAND_CMD_PAGEPROG<< FCR_CMD1_SHIFT) ++ | (NAND_CMD_SEQIN << FCR_CMD2_SHIFT); ++ set_addr(mtd, column, page_addr, 0); ++ } ++ } ++ goto end; ++ /* PAGEPROG reuses all of the setup from SEQIN and adds the length */ ++ case NAND_CMD_PAGEPROG: ++ FCM_DEBUG(2,"fcm_cmdfunc: NAND_CMD_PAGEPROG" ++ " writing %d bytes.\n",fcm->index); ++ /* if the write did not start at 0 or is not a full page */ ++ /* then set the exact length, otherwise use a full page */ ++ /* write so the HW generates the ECC. */ ++ if (lbc->fbcr || ++ (fcm->index != (mtd->oobblock + mtd->oobsize))) ++ lbc->fbcr = fcm->index; ++ fcm->req_bytes = 0; ++ goto write_cmd2; ++ /* CMD_STATUS must read the status byte while CEB is active */ ++ /* Note - it does not wait for the ready line */ ++ case NAND_CMD_STATUS: ++ FCM_DEBUG(2,"fcm_cmdfunc: NAND_CMD_STATUS.\n"); ++ lbc->fir = (FIR_OP_CM0 << FIR_OP0_SHIFT) | ++ (FIR_OP_RBW << FIR_OP1_SHIFT); ++ lbc->fcr = (NAND_CMD_STATUS << FCR_CMD0_SHIFT); ++ lbc->fbcr = 1; ++ goto write_cmd0; ++ /* RESET without waiting for the ready line */ ++ case NAND_CMD_RESET: ++ FCM_DEBUG(2,"fcm_cmdfunc: NAND_CMD_RESET.\n"); ++ lbc->fir = (FIR_OP_CM0 << FIR_OP0_SHIFT); ++ lbc->fcr = (NAND_CMD_RESET << FCR_CMD0_SHIFT); ++ lbc->fbcr = 0; ++ goto write_cmd0; ++ default: ++ printk("fcm_cmdfunc: error, unsupported command.\n"); ++ goto end; ++ } ++ ++ /* Short cuts fall through to save code */ ++ write_cmd0: ++ set_addr(mtd, 0, 0, 0); ++ write_cmd1: ++ fcm->req_bytes = lbc->fbcr; ++ write_cmd2: ++ fcm_run_command(mtd); ++ ++#ifdef CONFIG_MTD_NAND_VERIFY_WRITE ++ /* if we wrote a page then read back the oob to get the ECC */ ++ if ((command == NAND_CMD_PAGEPROG) && ++ (this->eccmode > NAND_ECC_SOFT) && ++ (lbc->fbcr == 0) && ++ (fcm->oobbuf != 0) && ++ (fcm->oobbuf != -1)) { ++ int i; ++ uint *oob_config; ++ unsigned char *oob_buf; ++ ++ i = fcm->page; ++ oob_buf = (unsigned char*) fcm->oobbuf; ++ oob_config = this->autooob->eccpos; ++ ++ /* wait for the write to complete and check it passed */ ++ if (!(this->waitfunc(mtd, this, FL_WRITING) & 0x01)) { ++ /* read back the OOB */ ++ fcm_cmdfunc(mtd, NAND_CMD_READOOB, 0, i); ++ /* if it succeeded then copy the ECC bytes */ ++ if (fcm->status == LTESR_CC) { ++ for (i = 0; i < this->eccbytes; i++) { ++ oob_buf[oob_config[i]] = ++ fcm->addr[oob_config[i]]; ++ } ++ } ++ } ++ } ++#endif ++ ++ end: ++ return; ++} ++ ++/* ++ * fcm_enable_hwecc - start ECC generation ++ */ ++static void fcm_enable_hwecc(struct mtd_info *mtd, int mode) ++{ ++ return; ++} ++ ++/* ++ * fcm_calculate_ecc - Calculate the ECC bytes ++ * This is done by hardware during the write process, so we use this ++ * to arm the oob buf capture on the next write_buf() call. The ECC bytes ++ * only need to be captured if CONFIG_MTD_NAND_VERIFY_WRITE is defined which ++ * reads back the pages and checks they match the data and oob buffers. ++ */ ++static int fcm_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code) ++{ ++ register struct nand_chip *this = mtd->priv; ++ struct fcm_nand *fcm = this->priv; ++ ++#ifdef CONFIG_MTD_NAND_VERIFY_WRITE ++ /* arm capture of oob buf ptr on next write_buf */ ++ fcm->oobbuf = 0; ++#endif ++ return 0; ++} ++ ++/* ++ * fcm_correct_data - Detect and correct bit error(s) ++ * The detection and correction is done automatically by the hardware, ++ * if the complete page was read. If the status code is okay then there ++ * was no error, otherwise we return an error code indicating an uncorrectable ++ * error. ++ */ ++static int fcm_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc) ++{ ++ register struct nand_chip *this = mtd->priv; ++ struct fcm_nand *fcm = this->priv; ++ ++ /* No errors */ ++ if (fcm->status == LTESR_CC) ++ return 0; ++ ++ return -1; /* uncorrectable error */ ++} ++ ++ ++ ++/* ++ * Dummy scan_bbt to complete setup of the FMR based on NAND size ++ */ ++static int fcm_scan_bbt (struct mtd_info *mtd) ++{ ++ volatile immap_t *im = (immap_t *) CFG_IMMR; ++ volatile lbus83xx_t *lbc= &im->lbus; ++ register struct nand_chip *this = mtd->priv; ++ struct fcm_nand *fcm = this->priv; ++ unsigned int i; ++ unsigned int al; ++ ++ if (!fcm) { ++ printk (KERN_ERR "fcm_scan_bbt():" \ ++ " Failed to allocate chip specific data structure\n"); ++ return -1; ++ } ++ ++ /* calculate FMR Address Length field */ ++ al = 0; ++ for (i = this->pagemask >> 16; i ; i >>= 8) { ++ al++; ++ } ++ ++ /* add to ECCM mode set in fcm_init */ ++ fcm->fmr |= 12 << FMR_CWTO_SHIFT | /* Timeout > 12 mSecs */ ++ al << FMR_AL_SHIFT; ++ ++ FCM_DEBUG(1,"fcm_init: nand->options = %08X\n", this->options); ++ FCM_DEBUG(1,"fcm_init: nand->numchips = %10d\n", this->numchips); ++ FCM_DEBUG(1,"fcm_init: nand->chipsize = %10d\n", this->chipsize); ++ FCM_DEBUG(1,"fcm_init: nand->pagemask = %10X\n", this->pagemask); ++ FCM_DEBUG(1,"fcm_init: nand->eccmode = %10d\n", this->eccmode ); ++ FCM_DEBUG(1,"fcm_init: nand->eccsize = %10d\n", this->eccsize ); ++ FCM_DEBUG(1,"fcm_init: nand->eccbytes = %10d\n", this->eccbytes); ++ FCM_DEBUG(1,"fcm_init: nand->eccsteps = %10d\n", this->eccsteps); ++ FCM_DEBUG(1,"fcm_init: nand->chip_delay = %8d\n", this->chip_delay); ++ FCM_DEBUG(1,"fcm_init: nand->badblockpos = %7d\n", this->badblockpos); ++ FCM_DEBUG(1,"fcm_init: nand->chip_shift = %8d\n", this->chip_shift); ++ FCM_DEBUG(1,"fcm_init: nand->page_shift = %8d\n", this->page_shift); ++ FCM_DEBUG(1,"fcm_init: nand->phys_erase_shift = %2d\n", ++ this->phys_erase_shift); ++ FCM_DEBUG(1,"fcm_init: mtd->flags = %08X\n", mtd->flags); ++ FCM_DEBUG(1,"fcm_init: mtd->size = %10d\n", mtd->size); ++ FCM_DEBUG(1,"fcm_init: mtd->erasesize = %10d\n", mtd->erasesize); ++ FCM_DEBUG(1,"fcm_init: mtd->oobblock = %10d\n", mtd->oobblock); ++ FCM_DEBUG(1,"fcm_init: mtd->oobsize = %10d\n", mtd->oobsize); ++ FCM_DEBUG(1,"fcm_init: mtd->oobavail = %10d\n", mtd->oobavail); ++ FCM_DEBUG(1,"fcm_init: mtd->ecctype = %10d\n", mtd->ecctype); ++ FCM_DEBUG(1,"fcm_init: mtd->eccsize = %10d\n", mtd->eccsize); ++ ++ /* adjust Option Register and ECC to match Flash page size */ ++ if (mtd->oobblock == 512) ++ lbc->bank[fcm->bank].or &= ~(OR_FCM_PGS); ++ else if (mtd->oobblock == 2048) { ++ lbc->bank[fcm->bank].or |= OR_FCM_PGS; ++ /* adjust ecc setup if needed */ ++ if ( (lbc->bank[fcm->bank].br & BR_DECC) == BR_DECC_CHK_GEN) { ++ mtd->eccsize = 2048; ++ mtd->oobavail -= 9; ++ this->eccmode = NAND_ECC_HW12_2048; ++ this->eccsize = 2048; ++ this->eccbytes += 9; ++ this->eccsteps = 1; ++ this->autooob = (fcm->fmr & FMR_ECCM) ? ++ &fcm_oob_lp_eccm1 : &fcm_oob_lp_eccm0; ++ memcpy(&mtd->oobinfo, this->autooob, ++ sizeof(mtd->oobinfo)); ++ } ++ } ++ else { ++ printf("fcm_init: page size %d is not supported\n", ++ mtd->oobblock); ++ return -1; ++ } ++ fcm->pgs = (lbc->bank[fcm->bank].or>>OR_FCM_PGS_SHIFT) & 1; ++ ++ if (al > 2) { ++ printf("fcm_init: %d address bytes is not supported\n", al+2); ++ return -1; ++ } ++ ++ /* restore default scan_bbt function and call it */ ++ this->scan_bbt = nand_default_bbt; ++ return nand_default_bbt(mtd); ++} ++ ++/* ++ * Board-specific NAND initialization. The following members of the ++ * argument are board-specific (per include/linux/mtd/nand_new.h): ++ * - IO_ADDR_R?: address to read the 8 I/O lines of the flash device ++ * - IO_ADDR_W?: address to write the 8 I/O lines of the flash device ++ * - hwcontrol: hardwarespecific function for accesing control-lines ++ * - dev_ready: hardwarespecific function for accesing device ready/busy line ++ * - enable_hwecc: function to enable (reset) hardware ecc generator. Must ++ * only be provided if a hardware ECC is available ++ * - eccmode: mode of ecc, see defines ++ * - chip_delay: chip dependent delay for transfering data from array to ++ * read regs (tR) ++ * - options: various chip options. They can partly be set to inform ++ * nand_scan about special functionality. See the defines for further ++ * explanation ++ * Members with a "?" were not set in the merged testing-NAND branch, ++ * so they are not set here either. ++ */ ++int board_nand_init(struct nand_chip *nand) ++{ ++ volatile immap_t *im = (immap_t *) CFG_IMMR; ++ volatile lbus83xx_t *lbc= &im->lbus; ++ struct fcm_nand *fcm; ++ unsigned int bank; ++ ++ /* Enable FCM detection of timeouts, ECC errors and completion */ ++ lbc->ltedr &= ~(LTESR_FCT | LTESR_PAR | LTESR_CC); ++ ++ fcm = kmalloc (sizeof(struct fcm_nand), GFP_KERNEL); ++ if (!fcm) { ++ printk (KERN_ERR "board_nand_init():" \ ++ " Cannot allocate read buffer data structure\n"); ++ return; ++ } ++ ++ /* Find which chip select bank is being used for this device */ ++ for (bank=0; bank<8; bank++) { ++ if ( (lbc->bank[bank].br & BR_V) && ++ ( (lbc->bank[bank].br & BR_MSEL) == BR_MS_FCM ) && ++ ( (lbc->bank[bank].br & BR_BA) == ++ (lbc->bank[bank].or & OR_FCM_AM & ++ (unsigned int)(nand->IO_ADDR_R) ) ) ) { ++ fcm->bank = bank; ++// TODO fcm->fmr = FMR_ECCM; /* rest filled in later */ ++ fcm->fmr = 0; /* rest filled in later */ ++ fcm->read_bytes = 0; ++ fcm->index = 0; ++ fcm->pgs = (lbc->bank[bank].or>>OR_FCM_PGS_SHIFT) & 1; ++ fcm->base = lbc->bank[bank].br & BR_BA; ++ fcm->addr = (unsigned char*) (fcm->base); ++ nand->priv = fcm; ++ fcm->oobbuf = -1; ++ break; ++ } ++ } ++ ++ if (!nand->priv) { ++ printk (KERN_ERR "board_nand_init():" \ ++ " Could not find matching Chip Select\n"); ++ return -1; ++ } ++ ++ /* set up nand options */ ++ nand->options = 0; ++ /* set up function call table */ ++ nand->hwcontrol = fcm_hwcontrol; ++ nand->waitfunc = fcm_wait; ++ nand->read_byte = fcm_read_byte; ++ nand->write_byte = fcm_write_byte; ++ nand->read_word = fcm_read_word; ++ nand->write_word = fcm_write_word; ++ nand->read_buf = fcm_read_buf; ++ nand->verify_buf = fcm_verify_buf; ++ nand->write_buf = fcm_write_buf; ++ nand->cmdfunc = fcm_cmdfunc; ++ nand->scan_bbt = fcm_scan_bbt; ++ ++ /* If CS Base Register selects full hardware ECC then use it */ ++ if ( ( (lbc->bank[bank].br & BR_DECC) >> BR_DECC_SHIFT) == 2) { ++ /* put in small page settings and adjust later if needed */ ++ nand->eccmode = NAND_ECC_HW3_512; ++ nand->autooob = (fcm->fmr & FMR_ECCM) ? ++ &fcm_oob_sp_eccm1 : &fcm_oob_sp_eccm0; ++ nand->calculate_ecc = fcm_calculate_ecc; ++ nand->correct_data = fcm_correct_data; ++ nand->enable_hwecc = fcm_enable_hwecc; ++ } else { ++ /* otherwise fall back to default software ECC */ ++ nand->eccmode = NAND_ECC_SOFT; ++ } ++ return 0; ++} ++ ++#endif ++#endif +diff -urN u-boot-1.3.1.orig/include/configs/MPC8313ERDB.h u-boot-1.3.1/include/configs/MPC8313ERDB.h +--- u-boot-1.3.1.orig/include/configs/MPC8313ERDB.h 2007-12-06 10:21:19.000000000 +0100 ++++ u-boot-1.3.1/include/configs/MPC8313ERDB.h 2008-01-31 17:36:18.000000000 +0100 +@@ -360,6 +360,7 @@ + #define CONFIG_CMD_MII + #define CONFIG_CMD_DATE + #define CONFIG_CMD_PCI ++#define CONFIG_CMD_NAND + + #if defined(CFG_RAMBOOT) + #undef CONFIG_CMD_ENV diff --git a/packages/u-boot/u-boot_1.1.4.bb b/packages/u-boot/u-boot_1.1.4.bb index 7a92b57c34..df6a357c63 100644 --- a/packages/u-boot/u-boot_1.1.4.bb +++ b/packages/u-boot/u-boot_1.1.4.bb @@ -1,24 +1,27 @@ require u-boot.inc +PR = "r1" + DEFAULT_PREFERENCE = "-1" SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ file://u-boot-make381-fix.patch;patch=1" SRC_URI_append_gumstix = "\ - file://u-boot-autoscript.patch;patch=1 \ - file://u-boot-base.patch;patch=1 \ - file://u-boot-crc-warning-not-so-scary.patch;patch=1 \ - file://u-boot-flash-protect-fixup.patch;patch=1 \ - file://u-boot-fw_printenv.patch;patch=1 \ - file://u-boot-install.patch;patch=1 \ - file://u-boot-jerase-cmd.patch;patch=1 \ - file://u-boot-jffs2-new-nodetypes.patch;patch=1 \ - file://u-boot-loadb-safe.patch;patch=1 \ - file://u-boot-mmc-init.patch;patch=1 \ - file://u-boot-mmcclk-alternate.patch;patch=1 \ - file://u-boot-smc91x-multi.patch;patch=1 \ - file://u-boot-zzz-osx.patch;patch=1" + file://u-boot-autoscript.patch;patch=1 \ + file://u-boot-base.patch;patch=1 \ + file://u-boot-crc-warning-not-so-scary.patch;patch=1 \ + file://u-boot-flash-protect-fixup.patch;patch=1 \ + file://u-boot-fw_printenv.patch;patch=1 \ + file://u-boot-install.patch;patch=1 \ + file://u-boot-jerase-cmd.patch;patch=1 \ + file://u-boot-jffs2-new-nodetypes.patch;patch=1 \ + file://u-boot-loadb-safe.patch;patch=1 \ + file://u-boot-mmc-init.patch;patch=1 \ + file://u-boot-mmcclk-alternate.patch;patch=1 \ + file://u-boot-smc91x-multi.patch;patch=1 \ + file://u-boot-zzz-osx.patch;patch=1" + SRC_URI_append_amsdelta = "\ http://the.earth.li/pub/e3/u-boot-amsdelta-20060519.diff;patch=1" @@ -26,8 +29,23 @@ SRC_URI_append_dht-walnut= "\ file://u-boot-dht-walnut-df2.patch;patch=1" SRC_URI_append_avr32= "\ - http://avr32linux.org/twiki/pub/Main/UbootPatches/u-boot-1.1.4-avr1.patch.bz2;patch=1" - + http://avr32linux.org/twiki/pub/Main/UbootPatches/u-boot-1.1.4-avr1.patch.bz2;patch=1 \ + file://avr32-boards-fix-flash-read.patch;patch=1 \ + file://lcdc-driver-for-avr32.patch;patch=1 \ + file://spi-driver-for-avr32.patch;patch=1 \ + file://at32ap-add-framebuffer-address.patch;patch=1 \ + file://at32ap-add-spi-initcalls.patch;patch=1 \ + file://at32ap-add-system-manager-header-file.patch;patch=1 \ + file://ap7000-add-spi-device-and-lcdc-base-address.patch;patch=1 \ + file://libavr32-add-spi-and-lcd-board-support.patch;patch=1 \ + file://cmd-bmp-add-gzip-compressed-bmp.patch;patch=1 \ + file://lcd-add-24-bpp-support-and-atmel-lcdc-support.patch;patch=1 \ + file://atstk1000-spi-support.patch;patch=1 \ + file://atstk1000-ltv350qv-display-support.patch;patch=1 \ + file://atstk1000-add-lcd-and-spi-to-config.patch;patch=1 \ + file://at32ap-add-define-for-sdram-test.patch;patch=1 \ + file://fix-mmc-data-timeout.patch;patch=1 \ +" EXTRA_OEMAKE_gumstix = "CROSS_COMPILE=${TARGET_PREFIX} GUMSTIX_400MHZ=${GUMSTIX_400MHZ}" TARGET_LDFLAGS = "" diff --git a/packages/u-boot/u-boot_1.3.2.bb b/packages/u-boot/u-boot_1.3.2.bb index 2886ddecc8..5c32b9a156 100644 --- a/packages/u-boot/u-boot_1.3.2.bb +++ b/packages/u-boot/u-boot_1.3.2.bb @@ -2,6 +2,11 @@ require u-boot.inc DEFAULT_PREFERENCE = "-1" -SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2" +PR = "r1" + +SRC_URI = "ftp://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ + file://mpc8313e-rdb-autoboot.patch;patch=1 \ + file://mpc8313e-rdb-mtdparts.patch;patch=1 \ + file://mpc8313e-rdb-nand.patch;patch=1" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine b/packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine index d8d2416b90..ed8b1a447e 100644 --- a/packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine +++ b/packages/uclibc/uclibc-0.9.29/avr32/uClibc.machine @@ -1,5 +1,6 @@ # # Automatically generated make config: don't edit +# Thu May 1 16:06:57 2008 # # TARGET_alpha is not set # TARGET_arm is not set @@ -9,8 +10,10 @@ TARGET_avr32=y # TARGET_e1 is not set # TARGET_frv is not set # TARGET_h8300 is not set +# TARGET_hppa is not set # TARGET_i386 is not set # TARGET_i960 is not set +# TARGET_ia64 is not set # TARGET_m68k is not set # TARGET_microblaze is not set # TARGET_mips is not set @@ -21,30 +24,31 @@ TARGET_avr32=y # TARGET_sh64 is not set # TARGET_sparc is not set # TARGET_v850 is not set +# TARGET_vax is not set # TARGET_x86_64 is not set # # Target Architecture Features and Options # -HAVE_ELF=y TARGET_ARCH="avr32" -ARCH_SUPPORTS_BIG_ENDIAN=y -UCLIBC_COMPLETELY_PIC=y -CONFIG_AP7000=y +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_AVR32_AP7=y LINKRELAX=y -# ARCH_LITTLE_ENDIAN is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# ARCH_BIG_ENDIAN=y -# ARCH_HAS_NO_MMU is not set + +# +# Using Big Endian +# ARCH_HAS_MMU=y +ARCH_USE_MMU=y UCLIBC_HAS_FLOATS=y -UCLIBC_HAS_FPU=n +# UCLIBC_HAS_FPU is not set UCLIBC_HAS_SOFT_FLOAT=y DO_C99_MATH=y -C_SYMBOL_PREFIX="" -KERNEL_HEADERS="Dummy value, correct value substituted by uclibc.inc" +KERNEL_HEADERS="/home/stelios/proj/OE/tmp/uclibc/staging/avr32-angstrom-linux-uclibc/usr/include" HAVE_DOT_CONFIG=y - - - - - diff --git a/packages/uclibc/uclibc-0.9.29/dht-walnut/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/dht-walnut/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/dht-walnut/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/dht-walnut/uClibc.machine b/packages/uclibc/uclibc-0.9.29/dht-walnut/uClibc.machine new file mode 100644 index 0000000000..2a38cfdd74 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/dht-walnut/uClibc.machine @@ -0,0 +1,54 @@ +# +# Automatically generated make config: don't edit +# Sun May 4 23:50:48 2008 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_avr32 is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_CLASSIC=y +# CONFIG_E500 is not set +TARGET_SUBARCH="classic" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/home/stelios/proj/OE/tmp/uclibc/staging/powerpc-angstrom-linux-uclibc/usr/include" +HAVE_DOT_CONFIG=y diff --git a/packages/uclibc/uclibc-0.9.29/kilauea/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/kilauea/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/kilauea/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/kilauea/uClibc.machine b/packages/uclibc/uclibc-0.9.29/kilauea/uClibc.machine new file mode 100644 index 0000000000..effef11099 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/kilauea/uClibc.machine @@ -0,0 +1,55 @@ +# +# Automatically generated make config: don't edit +# Sun May 4 23:50:48 2008 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_avr32 is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_CLASSIC=y +# CONFIG_E500 is not set +TARGET_SUBARCH="classic" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/home/stelios/proj/OE/tmp/uclibc/staging/powerpc-angstrom-linux-uclibc/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/sequoia/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/sequoia/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/sequoia/.mtn2git_empty diff --git a/packages/uclibc/uclibc-0.9.29/sequoia/uClibc.machine b/packages/uclibc/uclibc-0.9.29/sequoia/uClibc.machine new file mode 100644 index 0000000000..e059257c09 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/sequoia/uClibc.machine @@ -0,0 +1,53 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:25:50 2007 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_CLASSIC=y +# CONFIG_E500 is not set +TARGET_SUBARCH="classic" + +# +# Using ELF file format +# +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/powerpc-angstrom-linux-uclibc/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/uClibc.distro b/packages/uclibc/uclibc-0.9.29/uClibc.distro index b326ff03b5..1bd3bece28 100644 --- a/packages/uclibc/uclibc-0.9.29/uClibc.distro +++ b/packages/uclibc/uclibc-0.9.29/uClibc.distro @@ -105,7 +105,7 @@ UCLIBC_HAS_FNMATCH=y UCLIBC_HAS_WORDEXP=y UCLIBC_HAS_FTW=y UCLIBC_HAS_GLOB=y -# UCLIBC_HAS_GNU_GLOB is not set +UCLIBC_HAS_GNU_GLOB=y # # Library Installation Options diff --git a/packages/uclibc/uclibc-cvs/errno_values.h.patch b/packages/uclibc/uclibc-cvs/errno_values.h.patch new file mode 100644 index 0000000000..a1e39c181b --- /dev/null +++ b/packages/uclibc/uclibc-cvs/errno_values.h.patch @@ -0,0 +1,21 @@ +Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h +=================================================================== +--- uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h 2002-08-23 20:48:19.000000000 +0200 ++++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h 2007-07-01 22:11:53.000000000 +0200 +@@ -134,4 +134,16 @@ + #define ENOMEDIUM 123 /* No medium found */ + #define EMEDIUMTYPE 124 /* Wrong medium type */ + ++/* the following errornumbers are only in 2.6 */ ++ ++#define ECANCELED 125 /* Operation Canceled */ ++#define ENOKEY 126 /* Required key not available */ ++#define EKEYEXPIRED 127 /* Key has expired */ ++#define EKEYREVOKED 128 /* Key has been revoked */ ++#define EKEYREJECTED 129 /* Key was rejected by service */ ++ ++/* for robust mutexes */ ++#define EOWNERDEAD 130 /* Owner died */ ++#define ENOTRECOVERABLE 131 /* State not recoverable */ ++ + #endif /* _BITS_ERRNO_VALUES_H */ diff --git a/packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch b/packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch new file mode 100644 index 0000000000..504d37bcd2 --- /dev/null +++ b/packages/uclibc/uclibc-cvs/uclibc-arm-ftruncate64.patch @@ -0,0 +1,13 @@ +Index: uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h +=================================================================== +--- uclibc-0.9.29.orig/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h ++++ uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h +@@ -38,4 +38,8 @@ + /* define if target supports IEEE signed zero floats */ + #define __UCLIBC_HAVE_SIGNED_ZERO__ + ++#ifdef __ARM_EABI__ ++# define __UCLIBC_TRUNCATE64_HAS_4_ARGS__ ++#endif ++ + #endif /* _BITS_UCLIBC_ARCH_FEATURES_H */ diff --git a/packages/uclibc/uclibc-initial_0.9.29.bb b/packages/uclibc/uclibc-initial_0.9.29.bb index 57ac613b66..e75f612b88 100644 --- a/packages/uclibc/uclibc-initial_0.9.29.bb +++ b/packages/uclibc/uclibc-initial_0.9.29.bb @@ -3,7 +3,7 @@ require uclibc_${PV}.bb FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" -DEPENDS = "linux-libc-headers" +DEPENDS = "linux-libc-headers ncurses-native" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" diff --git a/packages/uclibc/uclibc-initial_svn.bb b/packages/uclibc/uclibc-initial_svn.bb index eb57f85b24..f3496839ff 100644 --- a/packages/uclibc/uclibc-initial_svn.bb +++ b/packages/uclibc/uclibc-initial_svn.bb @@ -3,20 +3,20 @@ require uclibc_svn.bb FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" -DEPENDS = "linux-libc-headers" +DEPENDS = "linux-libc-headers ncurses-native" PROVIDES = "virtual/${TARGET_PREFIX}libc-initial" PACKAGES = "" do_stage() { # Install initial headers into the cross dir - make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGING_PREFIX}/ \ - RUNTIME_PREFIX=${UCLIBC_STAGING_PREFIX}/ \ + make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ + RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \ pregen install_dev ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include # This conflicts with the c++ version of this header - rm -f ${UCLIBC_STAGING_PREFIX}/include/bits/atomicity.h + rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h } do_install() { diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index acbf249adf..07e49ac5cb 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -22,7 +22,7 @@ python __anonymous () { PROVIDES += "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES += "${@['virtual/libiconv', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']}" DEPENDS = "virtual/${TARGET_PREFIX}binutils \ - virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers" + virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers ncurses-native" # Blackfin needs a wrapper around ld DEPENDS_append_bfin = " elf2flt " @@ -72,7 +72,7 @@ UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${layout_prefix}" # the CFLAGS (for when building the utils). OEMAKE_NO_CC = "'STRIPTOOL=true' 'LD=${LD}' \ 'LOCALE_DATA_FILENAME=${UCLIBC_LOCALE_FILE}'" -EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' HOSTCFLAGS='-I${STAGING_INCDIR}'" +EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' HOSTCFLAGS='-I${STAGING_INCDIR_NATIVE}'" EXTRA_OEMAKE_task_do_populate_staging = "${OEMAKE_NO_CC}" EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}" diff --git a/packages/uclibc/uclibc_0.9.26.bb b/packages/uclibc/uclibc_0.9.26.bb index 40ac5cc69e..b9027c9939 100644 --- a/packages/uclibc/uclibc_0.9.26.bb +++ b/packages/uclibc/uclibc_0.9.26.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.27.bb b/packages/uclibc/uclibc_0.9.27.bb index 4731ec5392..856f70f2fc 100644 --- a/packages/uclibc/uclibc_0.9.27.bb +++ b/packages/uclibc/uclibc_0.9.27.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -PR = "r7" +PR = "r8" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb index 4d3a8d9d03..64dcaaab1f 100644 --- a/packages/uclibc/uclibc_0.9.28.bb +++ b/packages/uclibc/uclibc_0.9.28.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -PR = "r11" +PR = "r12" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb index c70b52d126..909efe51fb 100644 --- a/packages/uclibc/uclibc_0.9.29.bb +++ b/packages/uclibc/uclibc_0.9.29.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r13" +PR = "r16" require uclibc.inc diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index d19c986a7d..9f67a2a4d1 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -8,8 +8,8 @@ # UCLIBC_BASE ?= "0.9.29" PV = "${UCLIBC_BASE}+svnr${SRCREV}" -PR = "r5" - +PR = "r6" +DEFAULT_PREFERENCE = "2" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. @@ -28,10 +28,8 @@ KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}" SRC_URI += "svn://uclibc.org/trunk;module=uClibc \ file://uClibc.machine \ file://uClibc.distro \ - file://error_print_progname.patch;patch=1 \ - file://select.diff;patch=1 \ + file://uclibc-arm-ftruncate64.patch;patch=1 \ + file://errno_values.h.patch;patch=1 \ " S = "${WORKDIR}/uClibc" - - diff --git a/packages/uim/uim-native_1.3.1.bb b/packages/uim/uim-native_1.3.1.bb index e77d24d819..f23f6bd945 100644 --- a/packages/uim/uim-native_1.3.1.bb +++ b/packages/uim/uim-native_1.3.1.bb @@ -1,6 +1,8 @@ require uim.inc DEPENDS = "gtk+ anthy intltool-native" inherit native autotools pkgconfig -PR = "r1" +PR = "r2" S = "${WORKDIR}/uim-${PV}" + +EXTRA_OECONF += "--disable-xim" diff --git a/packages/uim/uim.inc b/packages/uim/uim.inc index dc8ba50b6f..b78d4019ac 100644 --- a/packages/uim/uim.inc +++ b/packages/uim/uim.inc @@ -15,4 +15,5 @@ EXTRA_OECONF += "--disable-applet \ SRC_URI = "http://uim.freedesktop.org/releases/uim/stable/uim-${PV}.tar.bz2" -FILES_${PN}-dbg += "${libdir}/*/*/immodules/.debug ${libdir}/uim/plugin" +FILES_${PN}-dbg += "${libdir}/*/*/*/.debug ${libdir}/*/*/.debug" +FILES_${PN}-dev += "${libdir}/uim/plugin/*.la" diff --git a/packages/ulxmlrpcpp/files/remove-local-includes.patch b/packages/ulxmlrpcpp/files/remove-local-includes.patch new file mode 100644 index 0000000000..13083c24aa --- /dev/null +++ b/packages/ulxmlrpcpp/files/remove-local-includes.patch @@ -0,0 +1,13 @@ +Index: ulxmlrpcpp-1.7.3/configure.in +=================================================================== +--- ulxmlrpcpp-1.7.3.orig/configure.in ++++ ulxmlrpcpp-1.7.3/configure.in +@@ -326,8 +326,6 @@ else + echo "*** ssl (OpenSSL) found." + echo "********************************************************" + AC_DEFINE(ULXR_INCLUDE_SSL_STUFF, 1, [Define to compile with ssl support.]) +- dnl should fix RedHat problem +- EA_EXTRA_INC="$EA_EXTRA_INC -I/usr/include/kerberos/" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], [[unsigned x = SSL_ERROR_WANT_ACCEPT; ]])],[AC_DEFINE(ULXR_HAVE_SSL_ERROR_WANT_ACCEPT, 1, Define if your ssl has SSL_ERROR_WANT_ACCEPT) + ],[]) + fi diff --git a/packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb b/packages/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb index c08d308c0a..5ef98de4b2 100644 --- a/packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb +++ b/packages/ulxmlrpcpp/ulxmlrpcpp_1.7.3.bb @@ -3,20 +3,23 @@ HOMEPAGE = "http://ulxmlrpcpp.sf.net" LICENSE = "LGPL" SECTION = "libs" DEPENDS = "expat" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/ulxmlrpcpp/ulxmlrpcpp-${PV}-src.tar.bz2 \ - file://disable-docs.patch;patch=1" + file://disable-docs.patch;patch=1 \ + file://remove-local-includes.patch;patch=1" inherit autotools -do_configure_prepend() { - install -d config - touch config/lib-prefix.m4 config/lib-link.m4 config/lib-ld.m4 +do_configure_append() { + echo "#define ulxr_snprintf snprintf" >>ulxmlrpcpp/ulxmlrpcpp.h +} + +do_stage() { + autotools_stage_all } LEAD_SONAME = "libulxmlrpcpp.so" PACKAGES =+ "${PN}-examples ${PN}-contrib" -FILES_${PN}-examples = "${bindir}" -FILES_${PN}-contrib = "${libdir}/*contrib*" - +FILES_${PN}-examples = "${bindir}/*" +FILES_${PN}-contrib = "${libdir}/*contrib.so.*" diff --git a/packages/webkit/webkit-gtk/.mtn2git_empty b/packages/webkit/webkit-gtk/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/webkit/webkit-gtk/.mtn2git_empty diff --git a/packages/webkit/webkit-gtk/GNUmakefile.am b/packages/webkit/webkit-gtk/GNUmakefile.am new file mode 100644 index 0000000000..725c79d3c6 --- /dev/null +++ b/packages/webkit/webkit-gtk/GNUmakefile.am @@ -0,0 +1,394 @@ +# Top-level Makefile rule for automake +# +# Variable conventions: +# +# _h_api = API headers that will be installed and included in the distribution +# _cppflags = flags that will be passed to the C/CXX Preprocessor +# _sources = sources that will be compiled and included in the distribution +# _headers = header files that will be part of the distribution +# _built_sources = files that will be autogenerated by the build system and +# will be part of the _SOURCES primary +# _built_nosources = files that are autogenerated but are not part of the +# _SOURCES primary +# _cleanfiles = files that will be removed by the clean target +# +# Sources, headers, flags, etc... should be added to the respective variables +# with the above suffix, e.g, webcore-specific sources should go to +# webcore_sources, gtk port-specific flags should go to webkitgtk_cppflags, +# etc... The only exceptions are the global variables. See Global Variables below. +# +# Global Variables +# +# global_cppflags = CPPFLAGS that apply to JSC, WebCore, and to any +# specific port +# global_cflags = CFLAGS that apply to JSC, WebCore, and to +# any specific port +# global_cxxflags = CXXFLAGS that apply to JSC, WebCore, and to any +# specific port + +srcdir = @srcdir@ +VPATH = @srcdir@ + +# Directory for autogenerated sources +GENSOURCES := $(top_builddir)/DerivedSources +GENPROGRAMS := $(top_builddir)/Programs + +# Script for creating hash tables +CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table + +# Libraries and support components +noinst_PROGRAMS := + +lib_LIBRARIES := + +IDL_BINDINGS := + +# Files that will be distributed +EXTRA_DIST := + +# Global flags to CPP +global_cppflags := + +global_cppflags += \ + -DWTF_USE_ICU_UNICODE=1 + +# Default compiler flags +global_cflags := \ + -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \ + -Wformat -Wformat-security -Wno-format-y2k -Wundef \ + -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \ + -Wno-unused-parameter -Wno-parentheses + +global_cxxflags := \ + $(SYMBOL_VISIBILITY_INLINES) + +if !ENABLE_DEBUG +global_cflags += \ + -fno-exceptions \ + $(SYMBOL_VISIBILITY) + +global_cxxflags += \ + -fno-rtti +endif + +# Shared libraries +lib_LTLIBRARIES = \ + libwebkit-1.0.la + +# Convenience libraries +noinst_LTLIBRARIES = \ + libJavaScriptCore.la \ + libWebCore.la + +# +# JavaScriptCore +javascriptcore_h_api := +javascriptcore_cppflags:= +javascriptcore_sources := +javascriptcore_built_sources := +javascriptcore_built_nosources := + +javascriptcore_cppflags += \ + -I$(srcdir)/JavaScriptCore \ + -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ + -I$(srcdir)/JavaScriptCore/wtf \ + -I$(srcdir)/JavaScriptCore/kjs \ + -I$(top_builddir)/DerivedSources + +# The variables above are already included below so no need to touch +# these variables unless you really have to +nodist_EXTRA_libJavaScriptCore_la_SOURCES = \ + $(javascriptcore_built_nosources) + +nodist_libJavaScriptCore_la_SOURCES = \ + $(javascriptcore_built_sources) + +libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore +libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api) + +libJavaScriptCore_la_SOURCES = \ + $(javascriptcore_sources) + +libJavaScriptCore_la_LIBADD = \ + $(UNICODE_LIBS) \ + $(GLOBALDEPS_LIBS) \ + -lpthread + +libJavaScriptCore_la_CXXFLAGS = \ + $(global_cxxflags) \ + $(global_cflags) \ + $(GLOBALDEPS_CFLAGS) \ + $(UNICODE_CFLAGS) \ + -fno-strict-aliasing + +libJavaScriptCore_la_CFLAGS = \ + $(global_cflags) \ + $(GLOBALDEPS_CFLAGS) \ + $(UNICODE_CFLAGS) \ + -fno-strict-aliasing + +libJavaScriptCore_la_CPPFLAGS = \ + $(global_cppflags) \ + $(javascriptcore_cppflags) + +# +# WebCore +webcore_cppflags := +webcore_sources := +webcore_headers := +webcore_libadd := +webcore_built_sources := +webcore_built_nosources := + +nodist_libWebCore_la_SOURCES = \ + $(webcore_built_sources) + +libWebCore_la_SOURCES = \ + $(webcore_headers) \ + $(webcore_sources) + +libWebCore_la_CXXFLAGS = \ + -fno-strict-aliasing \ + $(global_cxxflags) \ + $(global_cflags) \ + $(GLOBALDEPS_CFLAGS) \ + $(UNICODE_CFLAGS) \ + $(WEBKITDEPS_CFLAGS) \ + $(LIBCURL_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ + $(SQLITE3_CFLAGS) \ + $(GSTREAMER_CFLAGS) \ + $(LIBXSLT_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(HILDON_CFLAGS) + +libWebCore_la_CFLAGS = \ + -fno-strict-aliasing \ + $(global_cflags) \ + $(GLOBALDEPS_CFLAGS) \ + $(UNICODE_CFLAGS) \ + $(WEBKITDEPS_CFLAGS) \ + $(LIBCURL_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ + $(SQLITE3_CFLAGS) \ + $(GSTREAMER_CFLAGS) \ + $(LIBXSLT_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(HILDON_CFLAGS) + +libWebCore_la_CPPFLAGS = \ + $(global_cppflags) \ + $(webcore_cppflags) \ + $(javascriptcore_cppflags) \ + $(webkitgtk_cppflags) \ + $(HILDON_CPPFLAGS) + +libWebCore_la_LIBADD = \ + libJavaScriptCore.la \ + $(webcore_libadd) \ + $(GLOBALDEPS_LIBS) \ + $(WEBKITDEPS_LIBS) \ + $(LIBCURL_LIBS) \ + $(LIBSOUP_LIBS) \ + $(UNICODE_LIBS) \ + $(SQLITE3_LIBS) \ + $(GSTREAMER_LIBS) \ + $(LIBXSLT_LIBS) \ + $(HILDON_LIBS) \ + -lpthread \ + -ljpeg + +# WebKit +webkitgtk_h_api := +webkitgtk_headers := +webkitgtk_sources := +webkitgtk_cppflags := +webkitgtk_built_sources := +webkitgtk_built_nosources := +webkitgtk_cleanfiles := + +nodist_libwebkit_1_0_la_SOURCES = \ + $(webkitgtk_built_sources) + +libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit +libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api) + +libwebkit_1_0_la_SOURCES = \ + $(webkitgtk_headers) \ + $(webkitgtk_sources) + +libwebkit_1_0_la_CXXFLAGS = \ + $(libWebCore_la_CXXFLAGS) + +libwebkit_1_0_la_CFLAGS = \ + $(libWebCore_la_CFLAGS) + +libwebkit_1_0_la_CPPFLAGS = \ + $(libWebCore_la_CPPFLAGS) + +libwebkit_1_0_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + -version-info @LIBWEBKITGTK_VERSION@ + +libwebkit_1_0_la_LIBADD = \ + libWebCore.la + +# +# Extra checks and flags +global_cppflags += \ + -DBUILDING_GTK__=1 \ + -DWTF_CHANGES + +if !ENABLE_FAST_MALLOC +global_cppflags += \ + -DUSE_SYSTEM_MALLOC +endif + +if TARGET_X11 +global_cppflags += -DXP_UNIX +webcore_libadd += -lXt +endif + +if !ENABLE_DEBUG +global_cppflags += -DNDEBUG +else +webkitgtk_cppflags += \ + -DG_DISABLE_DEPRECATED \ + -DGDK_PIXBUF_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + -DPANGO_DISABLE_DEPRECATED + +# Might be useful in the future +# -DGDK_MULTIHEAD_SAFE \ +# -DGTK_MULTIHEAD_SAFE +endif + +if !ENABLE_DATABASE +global_cppflags += -DENABLE_DATABASE=0 +endif + +if !ENABLE_ICONDATABASE +global_cppflags += -DENABLE_ICONDATABASE=0 +endif + +if ENABLE_COVERAGE +global_cppflags += \ + -DGCC_GENERATE_TEST_COVERAGE_FILES \ + -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS +endif + +if ENABLE_VIDEO +webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10 +endif + +webkitgtk_cppflags += \ +-I$(top_builddir)/WebKit/gtk/webkit \ +-DBUILDING_CAIRO__=1 \ +-DBUILD_WEBKIT + +webkitgtk_h_api += \ + WebKit/gtk/webkit/webkit.h \ + WebKit/gtk/webkit/webkitdefines.h \ + WebKit/gtk/webkit/webkitnetworkrequest.h \ + WebKit/gtk/webkit/webkitwebbackforwardlist.h \ + WebKit/gtk/webkit/webkitwebframe.h \ + WebKit/gtk/webkit/webkitwebhistoryitem.h \ + WebKit/gtk/webkit/webkitwebsettings.h \ + WebKit/gtk/webkit/webkitwebview.h + +webkitgtk_built_sources += \ + DerivedSources/webkit-marshal.h \ + DerivedSources/webkit-marshal.cpp + +webkitgtk_headers += \ + WebKit/gtk/webkit/webkitprivate.h \ + WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ + WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ + WebKit/gtk/WebCoreSupport/DragClientGtk.h \ + WebKit/gtk/WebCoreSupport/EditorClientGtk.h \ + WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \ + WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \ + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h + +webkitgtk_sources += \ + WebKit/gtk/webkit/webkitnetworkrequest.cpp \ + WebKit/gtk/webkit/webkitprivate.cpp \ + WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ + WebKit/gtk/webkit/webkitwebframe.cpp \ + WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ + WebKit/gtk/webkit/webkitwebsettings.cpp \ + WebKit/gtk/webkit/webkitwebview.cpp \ + WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp + +webkitgtk_cleanfiles += \ + $(top_builddir)/Programs/GtkLauncher \ + $(top_builddir)/WebKit/gtk/webkit-1.0.pc + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc + +WEBKIT_MARSHAL = $(GENSOURCES)/webkit-marshal +WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list + +stamp_files := \ + stamp-webkit-marshal.cpp \ + stamp-webkit-marshal.h + +DerivedSources/webkit-marshal.cpp: stamp-webkit-marshal.cpp + @true + +DerivedSources/webkit-marshal.h: stamp-webkit-marshal.h + @true + +stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST) + echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \ + $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \ + echo timestamp > $(@F) + +stamp-webkit-marshal.h: $(WEBKIT_MARSHAL_LIST) + $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \ + echo timestamp > $(@F) + +# END WEBKIT GTK+ + +# Files that will be cleaned +MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) +DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) +CLEANFILES := $(stamp_files) $(BUILT_SOURCES) + +# Include module makefiles +include JavaScriptCore/GNUmakefile.am +include WebCore/GNUmakefile.am +include WebKitTools/GNUmakefile.am + +# Autogenerated sources +BUILT_SOURCES = \ + $(javascriptcore_built_sources) \ + $(javascriptcore_built_nosources) \ + $(webcore_built_sources) \ + $(webcore_built_nosources) \ + $(webkitgtk_built_sources) \ + $(webkitgtk_built_nosources) + +# Project-wide clean rules +CLEANFILES += \ + $(webkitgtk_cleanfiles) + +MAINTAINERCLEANFILES += \ + $(srcdir)/aconfig.h.in \ + configure \ + config.* \ + GNUmakefile.in \ + INSTALL \ + README + +# remove built sources and program directories +clean-local: + -rm -rf $(GENSOURCES) $(GENPROGRAMS) diff --git a/packages/webkit/webkit-gtk/Makefile b/packages/webkit/webkit-gtk/Makefile new file mode 100644 index 0000000000..fa7ea02426 --- /dev/null +++ b/packages/webkit/webkit-gtk/Makefile @@ -0,0 +1,29 @@ +MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools + +all: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +debug d development dev develop: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +release r deployment dep deploy: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +universal u: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +64: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +64u: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done + +clean: + @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ + if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done diff --git a/packages/webkit/webkit-gtk/Makefile.shared b/packages/webkit/webkit-gtk/Makefile.shared new file mode 100644 index 0000000000..dfad6fb54c --- /dev/null +++ b/packages/webkit/webkit-gtk/Makefile.shared @@ -0,0 +1,30 @@ +SCRIPTS_PATH ?= ../WebKitTools/Scripts +XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS) + +all: + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +debug d development dev develop: force + $(SCRIPTS_PATH)/set-webkit-configuration --debug + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +release r deployment dep deploy: force + $(SCRIPTS_PATH)/set-webkit-configuration --release + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +universal u: force + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} ) + +x86_64: force + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} ) + +64: force + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} ) + +64u: force + ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} ) + +clean: + ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) + +force: ; diff --git a/packages/webkit/webkit-gtk/WebKit.pri b/packages/webkit/webkit-gtk/WebKit.pri new file mode 100644 index 0000000000..d12423beb2 --- /dev/null +++ b/packages/webkit/webkit-gtk/WebKit.pri @@ -0,0 +1,107 @@ +# Include file to make it easy to include WebKit into Qt projects + + +isEmpty(OUTPUT_DIR) { + CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release + CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug +} + +!gtk-port:CONFIG += qt-port +qt-port:DEFINES += BUILDING_QT__=1 +qt-port:!building-libs { + QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR + LIBS += -lQtWebKit + DEPENDPATH += $$PWD/WebKit/qt/Api +} + +gtk-port:!building-libs { + QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR + LIBS += -lWebKitGtk + DEPENDPATH += $$PWD/WebKit/gtk $$PWD/WebKit/gtk/WebCoreSupport $$PWD/WebKit/gtk/webkit +} + +gtk-port { + CONFIG += link_pkgconfig + + DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1 + + # We use FreeType directly with Cairo + PKGCONFIG += cairo-ft + + directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0 + else: PKGCONFIG += cairo gtk+-2.0 + + # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb) + CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG) + + # We use the curl http backend on all platforms + PKGCONFIG += libcurl + DEFINES += WTF_USE_CURL=1 + + LIBS += -lWebKitGtk -ljpeg -lpng + + QMAKE_CXXFLAGS += $$system(icu-config --cppflags) + QMAKE_LIBS += $$system(icu-config --ldflags) + + # This set of warnings is borrowed from the Mac build + QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef + + # These flags are based on optimization experience from the Mac port: + # Helps code size significantly and speed a little + QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti + + DEPENDPATH += $$PWD/JavaScriptCore/API + INCLUDEPATH += $$PWD +} + +DEFINES += USE_SYSTEM_MALLOC +CONFIG(release) { + DEFINES += NDEBUG +} + +gtk-port:CONFIG(debug) { + DEFINES += G_DISABLE_DEPRECATED GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED +# maybe useful for debugging DEFINES += GDK_MULTIHEAD_SAFE GTK_MULTIHEAD_SAFE +} + +BASE_DIR = $$PWD +qt-port:INCLUDEPATH += \ + $$PWD/WebKit/qt/Api +gtk-port:INCLUDEPATH += \ + $$BASE_DIR/WebCore/platform/gtk \ + $$BASE_DIR/WebCore/platform/network/curl \ + $$BASE_DIR/WebCore/platform/graphics/cairo \ + $$BASE_DIR/WebCore/loader/gtk \ + $$BASE_DIR/WebCore/page/gtk \ + $$BASE_DIR/WebKit/gtk \ + $$BASE_DIR/WebKit/gtk/WebCoreSupport \ + $$BASE_DIR/WebKit/gtk/webkit +INCLUDEPATH += \ + $$BASE_DIR/JavaScriptCore/ \ + $$BASE_DIR/JavaScriptCore/kjs \ + $$BASE_DIR/JavaScriptCore/bindings \ + $$BASE_DIR/JavaScriptCore/bindings/c \ + $$BASE_DIR/JavaScriptCore/wtf \ + $$BASE_DIR/JavaScriptCore/ForwardingHeaders \ + $$BASE_DIR/WebCore \ + $$BASE_DIR/WebCore/ForwardingHeaders \ + $$BASE_DIR/WebCore/platform \ + $$BASE_DIR/WebCore/platform/network \ + $$BASE_DIR/WebCore/platform/graphics \ + $$BASE_DIR/WebCore/loader \ + $$BASE_DIR/WebCore/page \ + $$BASE_DIR/WebCore/css \ + $$BASE_DIR/WebCore/dom \ + $$BASE_DIR/WebCore/bridge \ + $$BASE_DIR/WebCore/editing \ + $$BASE_DIR/WebCore/rendering \ + $$BASE_DIR/WebCore/history \ + $$BASE_DIR/WebCore/xml \ + $$BASE_DIR/WebCore/html \ + $$BASE_DIR/WebCore/plugins + + +macx { + INCLUDEPATH += /usr/include/libxml2 + LIBS += -lxml2 -lxslt +} diff --git a/packages/webkit/webkit-gtk/WebKit.pro b/packages/webkit/webkit-gtk/WebKit.pro new file mode 100644 index 0000000000..bc14feb5f6 --- /dev/null +++ b/packages/webkit/webkit-gtk/WebKit.pro @@ -0,0 +1,21 @@ +TEMPLATE = subdirs +CONFIG += ordered +!gtk-port:CONFIG += qt-port +qt-port { + lessThan(QT_MINOR_VERSION, 4) { + !win32-*:SUBDIRS += WebKit/qt/Plugins + } +} +SUBDIRS += \ + WebCore \ + JavaScriptCore/kjs/testkjs.pro + +qt-port { + SUBDIRS += WebKit/qt/QtLauncher + + !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro +} + +gtk-port:SUBDIRS += \ + WebKitTools/GtkLauncher \ + WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro diff --git a/packages/webkit/webkit-gtk/autogen.sh b/packages/webkit/webkit-gtk/autogen.sh new file mode 100644 index 0000000000..a929538d20 --- /dev/null +++ b/packages/webkit/webkit-gtk/autogen.sh @@ -0,0 +1,57 @@ +#! /bin/sh + +# Allow invocation from a separate build directory; in that case, we change +# to the source directory to run the auto*, then change back before running configure +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +DIE=0 + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/" + DIE=1 +} + +(automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have automake installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" + DIE=1 +} + +LIBTOOLIZE=libtoolize +($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || { + LIBTOOLIZE=glibtoolize + ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have libtool installed to compile $PROJECT." + echo "Install the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/" + DIE=1 + } +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +rm -rf $top_srcdir/autom4te.cache + +touch README INSTALL + +aclocal || exit $? +$LIBTOOLIZE --force || exit $? +autoheader || exit $? +automake --foreign --add-missing || exit $? +autoconf || exit $? + +cd $ORIGDIR || exit 1 + +$srcdir/configure $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? diff --git a/packages/webkit/webkit-gtk/configure.ac b/packages/webkit/webkit-gtk/configure.ac new file mode 100644 index 0000000000..24488ef6c4 --- /dev/null +++ b/packages/webkit/webkit-gtk/configure.ac @@ -0,0 +1,585 @@ +AC_INIT([WebKit],[0.1],[http://bugs.webkit.org/]) + +AC_PREREQ(2.59) + +AC_CONFIG_HEADERS([aconfig.h]) +AC_CONFIG_SRCDIR([WebCore/config.h]) + +# see http://www.gnu.org/software/libtool/manual.html#Versioning +LIBWEBKITGTK_VERSION=1:0:0 +AC_SUBST([LIBWEBKITGTK_VERSION]) + +AM_INIT_AUTOMAKE([foreign subdir-objects]) + +AC_CANONICAL_HOST + +# host checking - inspired by the GTK+ configure.in +# TODO: os_mac, os_bsd +AC_MSG_CHECKING([for native Win32]) +case "$host" in + *-*-mingw*) + os_win32=yes + ;; + *) + os_win32=no + ;; +esac +AC_MSG_RESULT([$os_win32]) + +case "$host" in + *-*-linux*) + os_linux=yes + ;; + *-*-freebsd*) + os_freebsd=yes + ;; + *-*-darwin*) + os_darwin=yes + ;; +esac + +# If CXXFLAGS and CFLAGS are unset, default to -O2 +# This is to tell automake not to include '-g' if CXXFLAGS is not set +# For more info - http://www.gnu.org/software/automake/manual/autoconf.html#C_002b_002b-Compiler +if test -z "$CXXFLAGS"; then + CXXFLAGS="-O2" +fi +if test -z "$CFLAGS"; then + CFLAGS="-O2" +fi + +# programs +AC_DISABLE_STATIC +AM_PROG_LIBTOOL +AC_PROG_INSTALL +AM_PROG_CC_STDC +AC_PROG_CXX +AM_PROG_CC_C_O + +# check for -fvisibility=hidden compiler support (GCC >= 4) +saved_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden" +AC_MSG_CHECKING([if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden]) +AC_COMPILE_IFELSE([char foo;], + [ AC_MSG_RESULT([yes]) + SYMBOL_VISIBILITY="-fvisibility=hidden" SYMBOL_VISIBILITY_INLINES="-fvisibility-inlines-hidden" ], + AC_MSG_RESULT([no])) +CFLAGS="$saved_CFLAGS" +AC_SUBST(SYMBOL_VISIBILITY) +AC_SUBST(SYMBOL_VISIBILITY_INLINES) + +AC_PATH_PROG(PERL, perl) +if test -z "$PERL"; then + AC_MSG_ERROR([You need 'perl' to compile WebKit]) +fi + +AC_PATH_PROG(BISON, bison) +if test -z "$BISON"; then + AC_MSG_ERROR([You need the 'bison' parser generator to compile WebKit]) +fi + +AC_PATH_PROG(FLEX, flex) +if test -z "$FLEX"; then + AC_MSG_ERROR([You need the 'flex' lexer generator to compile WebKit]) +fi + +AC_PATH_PROG(GPERF, gperf) +if test -z "$GPERF"; then + AC_MSG_ERROR([You need the 'gperf' hash function generator to compile WebKit]) +fi + +AC_PATH_PROG(MV, mv) +if test -z "$MV"; then + AC_MSG_ERROR([You need 'mv' to compile WebKit]) +fi + +# GTK+ port only +# Check for glib-genmarshal and glib-mkenums +AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) +AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) +if test -z "$GLIB_GENMARSHAL" || test -z "$GLIB_MKENUMS"; then + AC_MSG_ERROR([You need the GLib dev tools in your path]) +fi + +# Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it +# doesn't exist) +AC_LANG_PUSH([C++]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[],[AC_MSG_ERROR([No C++ compiler found])]) +AC_LANG_POP([C++]) + +# C/C++ Language Features +AC_C_CONST +AC_C_INLINE +AC_C_VOLATILE + +# C/C++ Headers +AC_HEADER_STDC +AC_HEADER_STDBOOL + +# pthread (not needed on Windows) +if test "$os_win32" = "no"; then +AC_CHECK_HEADERS([pthread.h], + AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]), + AC_MSG_ERROR([pthread support is required to build WebKit])) +fi + +# libjpeg headers +AC_CHECK_HEADERS([jpeglib.h]) + +# check for pkg-config +AC_PATH_PROG(PKG_CONFIG, pkg-config, no) +if test "$PKG_CONFIG" = "no"; then + AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed in your PATH]) +fi + +# determine the Unicode backend +AC_MSG_CHECKING([the Unicode backend to use]) +AC_ARG_WITH(unicode_backend, + AC_HELP_STRING([--with-unicode-backend=@<:@icu@:>@], + [Select Unicode backend [default=icu]]), + [],[unicode_backend="icu"]) + +case "$unicode_backend" in + icu) ;; + *) AC_MSG_ERROR([Invalid Unicode backend: must be icu.]) ;; +esac + +AC_MSG_RESULT([$unicode_backend]) + +if test "$unicode_backend" = "icu"; then + # check for icu-config + if test "$os_darwin" = "yes"; then + UNICODE_CFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu" + UNICODE_LIBS="-licucore" + else + AC_PATH_PROG(icu_config, icu-config, no) + if test "$icu_config" = "no"; then + AC_MSG_ERROR([Cannot find icu-config. The ICU library is needed.]) + fi + + # We don't use --cflags as this gives us a lot of things that we don't + # necessarily want, like debugging and optimization flags + # See man (1) icu-config for more info. + UNICODE_CFLAGS=`$icu_config --cppflags` + UNICODE_LIBS=`$icu_config --ldflags` + fi +fi + +AC_SUBST([UNICODE_CFLAGS]) +AC_SUBST([UNICODE_LIBS]) + +# determine the GDK/GTK+ target +AC_MSG_CHECKING([the target windowing system]) +AC_ARG_WITH(target, + AC_HELP_STRING([--with-target=@<:@x11/win32/quartz/directfb@:>@], + [Select webkit target [default=x11]]), + [],[with_target="x11"]) + +case "$with_target" in + x11|win32|quartz|directfb) ;; + *) AC_MSG_ERROR([Invalid target: must be x11, quartz, win32, or directfb.]) ;; +esac + +AC_MSG_RESULT([$with_target]) + +AC_MSG_CHECKING([for Hildon UI extensions]) +AC_ARG_WITH(hildon, + AC_HELP_STRING([--with-hildon], + [Use Hildon UI extensions [default=no]]), + [],[with_hildon="no"]) +AC_MSG_RESULT([$with_hildon]) + +if test "$with_hildon" = "yes"; then + HILDON_CPPFLAGS="-DMAEMO_CHANGES" + PKG_CHECK_MODULES([HILDON], [hildon-1]) + AC_SUBST([HILDON_CPPFLAGS]) + AC_SUBST([HILDON_CFLAGS]) + AC_SUBST([HILDON_LIBS]) +fi + +# determine the http backend +AC_MSG_CHECKING([the HTTP backend to use]) +AC_ARG_WITH(http_backend, + AC_HELP_STRING([--with-http-backend=@<:@curl/soup@:>@], + [Select HTTP backend [default=curl]]), + [],[with_http_backend="curl"]) + +case "$with_http_backend" in + curl|soup) ;; + *) AC_MSG_ERROR([Invalid HTTP backend: must be curl, soup.]) ;; +esac + +AC_MSG_RESULT([$with_http_backend]) + +# minimum base dependencies +CAIRO_REQUIRED_VERSION=1.4 +FONTCONFIG_REQUIRED_VERSION=2.4 +FREETYPE2_REQUIRED_VERSION=9.0 +LIBXML_REQUIRED_VERSION=2.6 + +# minimum GTK+ base dependencies +GLIB_REQUIRED_VERSION=2.0 +GOBJECT_REQUIRED_VERSION=2.0 +GTHREAD_REQUIRED_VERSION=2.0 +PANGO_REQUIRED_VERSION=1.0 +GTK_REQUIRED_VERSION=2.8 + +# optional modules +LIBCURL_REQUIRED_VERSION=7.15 +LIBSOUP_REQUIRED_VERSION=2.23 +LIBXSLT_REQUIRED_VERSION=1.1.7 +SQLITE_REQUIRED_VERSION=3.0 +GSTREAMER_REQUIRED_VERSION=0.10 +GNOME_VFS_REQUIRED_VERSION=2.0 + +PKG_CHECK_MODULES([GLOBALDEPS], + [glib-2.0 >= $GLIB_REQUIRED_VERSION + gobject-2.0 >= $GOBJECT_REQUIRED_VERSION + gthread-2.0 >= $GTHREAD_REQUIRED_VERSION]) +AC_SUBST([GLOBALDEPS_CFLAGS]) +AC_SUBST([GLOBALDEPS_LIBS]) + +PKG_CHECK_MODULES([WEBKITDEPS], + [gtk+-2.0 >= $GTK_REQUIRED_VERSION + pango >= $PANGO_REQUIRED_VERSION + cairo >= $CAIRO_REQUIRED_VERSION + cairo-ft, + fontconfig >= $FONTCONFIG_REQUIRED_VERSION + freetype2 >= $FREETYPE2_REQUIRED_VERSION + libxml-2.0 >= $LIBXML_REQUIRED_VERSION]) +AC_SUBST([WEBKITDEPS_CFLAGS]) +AC_SUBST([WEBKITDEPS_LIBS]) + +# check whether to build with debugging enabled +AC_MSG_CHECKING([whether to do a debug build]) +AC_ARG_ENABLE(debug, + AC_HELP_STRING([--enable-debug], + [turn on debugging [default=no]]), + [],[enable_debug="no"]) +AC_MSG_RESULT([$enable_debug]) + +# check whether to enable dashboard support +AC_MSG_CHECKING([whether to enable Dashboard support]) +AC_ARG_ENABLE(dashboard_support, + AC_HELP_STRING([--enable-dashboard-support], + [enable Dashboard support [default=yes]]), + [],[enable_dashboard_support="yes"]) +AC_MSG_RESULT([$enable_dashboard_support]) + +# check whether to build with cross-document messaging support +AC_MSG_CHECKING([whether to enable HTML5 cross-document messaging support]) +AC_ARG_ENABLE(cross_document_messaging, + AC_HELP_STRING([--enable-cross-document-messaging], + [enable HTML5 cross-document messaging support [default=yes]]), + [],[enable_cross_document_messaging="yes"]) +AC_MSG_RESULT([$enable_cross_document_messaging]) + +# check whether to enable HTML5 Offline Web Applications support +AC_MSG_CHECKING([whether to enable HTML5 offline web applications support]) +AC_ARG_ENABLE(offline_web_applications, + AC_HELP_STRING([--enable-offline-web-applications], + [enable HTML5 offline web applications support [default=yes]]), + [],[enable_offline_web_applications="yes"]) +AC_MSG_RESULT([$enable_offline_web_applications]) + +# check whether to enable HTML5 client-side session and persitent storage support +AC_MSG_CHECKING([whether to enable HTML5 client-side session and persistent storage support]) +AC_ARG_ENABLE(dom_storage, + AC_HELP_STRING([--enable-dom-storage], + [enable HTML5 client-side session and persistent storage support [default=no]]), + [],[enable_dom_storage="no"]) +AC_MSG_RESULT([$enable_dom_storage]) + +# check whether to build with database support +AC_MSG_CHECKING([whether to enable HTML5 client-side database storage support]) +AC_ARG_ENABLE(database, + AC_HELP_STRING([--enable-database], + [enable HTML5 client-side database storage support [default=yes]]), + [],[enable_database="yes"]) +AC_MSG_RESULT([$enable_database]) + +# check whether to build with icon database support +AC_MSG_CHECKING([whether to enable icon database support]) +AC_ARG_ENABLE(icon_database, + AC_HELP_STRING([--enable-icon-database], + [enable icon database [default=no]]), + [],[enable_icon_database="no"]) +AC_MSG_RESULT([$enable_icon_database]) + +# check whether to enable HTML5 audio/video support +AC_MSG_CHECKING([whether to enable HTML5 video support]) +AC_ARG_ENABLE(video, + AC_HELP_STRING([--enable-video], + [enable HTML5 video support [default=no]]), + [],[enable_video="no"]) +AC_MSG_RESULT([$enable_video]) + +# check whether to enable XPath support +AC_MSG_CHECKING([whether to enable XPath support]) +AC_ARG_ENABLE(xpath, + AC_HELP_STRING([--enable-xpath], + [enable support for XPath [default=yes]]), + [],[enable_xpath="yes"]) +AC_MSG_RESULT([$enable_xpath]) + +# check whether to enable XSLT support +AC_MSG_CHECKING([whether to enable XSLT support]) +AC_ARG_ENABLE(xslt, + AC_HELP_STRING([--enable-xslt], + [enable support for XSLT [default=yes]]), + [],[enable_xslt="yes"]) +AC_MSG_RESULT([$enable_xslt]) + +# check whether to enable SVG experimental features +# Enable all SVG if it is +AC_MSG_CHECKING([whether to enable SVG experimental features]) +AC_ARG_ENABLE(svg_experimental, + AC_HELP_STRING([--enable-svg-experimental], + [enable support for SVG experimental features [default=no]]), + [],[enable_svg_experimental="no"]) +AC_MSG_RESULT([$enable_svg_experimental]) + +if test "$enable_svg_experimental" = "yes"; then + enable_svg=yes + enable_svg_animation=yes +# enable_svg_filters=yes + enable_svg_fonts=yes + enable_svg_foreign_object=yes + enable_svg_as_image=yes + enable_svg_use_element=yes +fi + +# check whether to enable SVG support +AC_MSG_CHECKING([whether to enable SVG support]) +AC_ARG_ENABLE(svg, + AC_HELP_STRING([--enable-svg], + [enable support for SVG [default=no]]), + [],[enable_svg="no"]) +AC_MSG_RESULT([$enable_svg]) + +# check whether to enable support for SVG animation +AC_MSG_CHECKING([whether to enable support for SVG animation]) +AC_ARG_ENABLE(svg_animation, + AC_HELP_STRING([--enable-svg-animation], + [enable support for SVG animation (experimental) [default=no]]), + [],[enable_svg_animation="no"]) +AC_MSG_RESULT([$enable_svg_animation]) + +# check whether to enable support for SVG filters +AC_MSG_CHECKING([whether to enable support for SVG filters]) +AC_ARG_ENABLE(svg_filters, + AC_HELP_STRING([--enable-svg-filters], + [enable support for SVG filters (experimental) [default=no]]), + [],[enable_svg_filters="no"]) +AC_MSG_RESULT([$enable_svg_filters]) + +# check whether to enable support for SVG fonts +AC_MSG_CHECKING([whether to enable support for SVG fonts]) +AC_ARG_ENABLE(svg_fonts, + AC_HELP_STRING([--enable-svg-fonts], + [enable support for SVG fonts (experimental) [default=no]]), + [],[enable_svg_fonts="no"]) +AC_MSG_RESULT([$enable_svg_fonts]) + +# check whether to enable foreign objects support for SVG +AC_MSG_CHECKING([whether to enable support for SVG foreign objects]) +AC_ARG_ENABLE(svg_foreign_object, + AC_HELP_STRING([--enable-svg-foreign-object], + [enable support for SVG foreign objects (experimental) [default=no]]), + [],[enable_svg_foreign_object="no"]) +AC_MSG_RESULT([$enable_svg_foreign_object]) + +# check whether to enable SVG As Image support +AC_MSG_CHECKING([whether to enable SVG as Image support]) +AC_ARG_ENABLE(svg_as_image, + AC_HELP_STRING([--enable-svg-as-image], + [enable SVG as Image support (experimental) [default=no]]), + [],[enable_svg_as_image="no"]) +AC_MSG_RESULT([$enable_svg_as_image]) + +# check whether to enable SVG USE element support +AC_MSG_CHECKING([whether to enable support for SVG use element]) +AC_ARG_ENABLE(svg_use_element, + AC_HELP_STRING([--enable-svg-use-element], + [enable SVG use element support (experimental) [default=no]]), + [],[enable_svg_use_element="no"]) +AC_MSG_RESULT([$enable_svg_use_element]) + +# check whether to enable code coverage +AC_MSG_CHECKING([whether to enable code coverage support]) +AC_ARG_ENABLE(coverage, + AC_HELP_STRING([--enable-coverage], + [enable code coverage support [default=no]]), + [],[enable_coverage="no"]) +AC_MSG_RESULT([$enable_coverage]) + +# check whether to enable FastMalloc +AC_MSG_CHECKING([whether to enable optimized memory allocator]) +AC_ARG_ENABLE(fast_malloc, + AC_HELP_STRING([--enable-fast-malloc], + [enable optimized memory allocator default=yes, default=no for debug builds]), + [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi]) +AC_MSG_RESULT([$enable_fast_malloc]) + +# determine the font backend +AC_MSG_CHECKING([the font backend to use]) +AC_ARG_WITH(font_backend, + AC_HELP_STRING([--with-font-backend=@<:@freetype/pango@:>@], + [Select font backend [default=freetype]]), + [],[with_font_backend="freetype"]) + +case "$with_font_backend" in + freetype|pango) ;; + *) AC_MSG_ERROR([Invalid font backend: must be freetype or pango.]) ;; +esac +AC_MSG_RESULT([$with_font_backend]) + +# Add '-g' flag to gcc if it's debug build +if test "$enable_debug" = "yes"; then + CXXFLAGS="$CXXFLAGS -g" + CFLAGS="$CFLAGS -g" +fi + +# check if curl is available +if test "$with_http_backend" = "curl"; then + PKG_CHECK_MODULES([LIBCURL], + [libcurl >= $LIBCURL_REQUIRED_VERSION]) + AC_SUBST([LIBCURL_CFLAGS]) + AC_SUBST([LIBCURL_LIBS]) +fi + +if test "$with_http_backend" = "soup"; then + PKG_CHECK_MODULES([LIBSOUP], + [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION]) + AC_SUBST([LIBSOUP_CFLAGS]) + AC_SUBST([LIBSOUP_LIBS]) +fi + +# check if sqlite 3 is available +if test "$enable_icon_database" = "yes" || test "$enable_database" = "yes"; then + PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $SQLITE_REQUIRED_VERSION]) + AC_SUBST([SQLITE3_CFLAGS]) + AC_SUBST([SQLITE3_LIBS]) +fi + +# check if libxslt is available +if test "$enable_xslt" = "yes"; then + PKG_CHECK_MODULES([LIBXSLT],[libxslt >= $LIBXSLT_REQUIRED_VERSION]) + AC_SUBST([LIBXSLT_CFLAGS]) + AC_SUBST([LIBXSLT_LIBS]) +fi + +# check if gstreamer is available +if test "$enable_video" = "yes"; then + PKG_CHECK_MODULES([GSTREAMER], + [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION + gstreamer-base-0.10, + gstreamer-plugins-base-0.10, + gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED_VERSION]) + AC_SUBST([GSTREAMER_CFLAGS]) + AC_SUBST([GSTREAMER_LIBS]) +fi + +# check for code coverage support +if test "$enable_coverage" = "yes"; then + COVERAGE_CFLAGS="-MD" + COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs" + AC_SUBST([COVERAGE_CFLAGS]) + AC_SUBST([COVERAGE_LDFLAGS]) +fi + +# check for SVG features, enabling SVG if necessary +if test "$enable_svg_animation" = "yes" || \ + test "$enable_svg_filters" = "yes" || \ + test "$enable_svg_fonts" = "yes" || \ + test "$enable_svg_foreign_object" = "yes" || \ + test "$enable_svg_as_image" = "yes" || \ + test "$enable_svg_use_element" = "yes"; then + svg_flags=yes + if test "$enable_svg" = "no"; then + AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support]) + enable_svg=yes + fi +fi + +# OS conditionals +AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"]) +AM_CONDITIONAL([OS_UNIX],[test "$os_win32" = "no"]) +AM_CONDITIONAL([OS_LINUX],[test "$os_linux" = "yes"]) +AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"]) + +# target conditionals +AM_CONDITIONAL([TARGET_X11], [test "$with_target" = "x11"]) +AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"]) +AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"]) +AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"]) + +# HTTP backend conditionals +AM_CONDITIONAL([USE_CURL], [test "$with_http_backend" = "curl"]) +AM_CONDITIONAL([USE_SOUP], [test "$with_http_backend" = "soup"]) + +# Font backend conditionals +AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"]) +AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"]) + +# WebKit feature conditionals +AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"]) +AM_CONDITIONAL([ENABLE_DASHBOARD_SUPPORT],[test "$enable_dashboard_support" = "yes"]) +AM_CONDITIONAL([ENABLE_CROSS_DOCUMENT_MESSAGING],[test "$enable_cross_document_messaging" = "yes"]) +AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"]) +AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"]) +AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"]) +AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"]) +AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"]) +AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"]) +AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_FILTERS],[test "$enable_svg_filters" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_FOREIGN_OBJECT],[test "$enable_svg_foreign_object" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use_element" = "yes"]) +AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"]) +AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"]) +AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"]) + +AC_CONFIG_FILES([ +GNUmakefile +WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in +] +) + +AC_OUTPUT + +echo " +WebKit was configured with the following options: + +Build configuration: + Enable debugging (slow) : $enable_debug + Code coverage support : $enable_coverage + Unicode backend : $unicode_backend + HTTP backend : $with_http_backend + Font backend : $with_font_backend + Optimized memory allocator : $enable_fast_malloc +Features: + Dashboard support : $enable_dashboard_support + HTML5 cross-document messaging : $enable_cross_document_messaging + HTML5 offline web applications support : $enable_offline_web_applications + HTML5 client-side session and persistent storage support : $enable_dom_storage + HTML5 client-side database storage support : $enable_database + HTML5 video element support : $enable_video + Icon database support : $enable_icon_database + SVG support : $enable_svg + SVG animation support : $enable_svg_animation + SVG filters support : $enable_svg_filters + SVG fonts support : $enable_svg_fonts + SVG foreign object support : $enable_svg_foreign_object + SVG as image support : $enable_svg_as_image + SVG use element support : $enable_svg_use_element + XPATH support : $enable_xpath + XSLT support : $enable_xslt +GTK+ configuration: + GDK target : $with_target + Hildon UI extensions : $with_hildon +" diff --git a/packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig b/packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig deleted file mode 100644 index bf5d5e28e7..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_DRIVER_WEXT=y -CONFIG_WIRELESS_EXTENSION=y -CONFIG_DRIVER_HOSTAP=y - diff --git a/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb b/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb deleted file mode 100644 index fe1a30b58b..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "User space helper for WPA and WPA2 client operations. \ -The Supplicant is used in WPA/WPA2 key handshakes to authenticate \ -with the AP and to generate dynamic encryption keys (TKIP or CCMP)." - -PR = "r3" - -require wpa-supplicant_${PV}.inc diff --git a/packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig b/packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig deleted file mode 100644 index 2dac008aa5..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig +++ /dev/null @@ -1,15 +0,0 @@ -# CONFIG_DRIVER_HOSTAP is not set -CONFIG_DRIVER_WEXT=y -CONFIG_WIRELESS_EXTENSION=y -CONFIG_DRIVER_HOSTAP=y -CONFIG_IEEE8021X_EAPOL=y -CONFIG_EAP_MD5=y -CONFIG_MSCHAPV2=y -CONFIG_EAP_TLS=y -CONFIG_EAP_PEAP=y -CONFIG_EAP_TTLS=y -CONFIG_EAP_GTC=y -CONFIG_EAP_OTP=y -CONFIG_EAP_SIM=y -CONFIG_EAP_LEAP=y -#CONFIG_PCSC=y diff --git a/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb b/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb deleted file mode 100644 index 34f370a10e..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "User space helper for WPA and WPA2 client operations with SSL. \ -The Supplicant is used in WPA/WPA2 key handshakes to authenticate \ -with the AP and to generate dynamic encryption keys (TKIP or CCMP)." -DEPENDSS = "openssl" -PR = "r3" - -EXTRA_OEMAKE="LIBS='-L${STAGING_LIBDIR} -lssl -lcrypto' LIBS_p='-L${STAGING_LIBDIR} -lssl -lcrypto'" - -require wpa-supplicant_${PV}.inc diff --git a/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch b/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch deleted file mode 100644 index 795306bb35..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: wpa_supplicant-0.5.5/tls_gnutls.c -=================================================================== ---- wpa_supplicant-0.5.5.orig/tls_gnutls.c 2006-06-25 03:05:07.000000000 +0200 -+++ wpa_supplicant-0.5.5/tls_gnutls.c 2006-10-29 15:12:21.000000000 +0100 -@@ -1029,8 +1029,13 @@ - const u8 *in_data, size_t in_len, - size_t *out_len) - { -+ u8 *appl_data; -+ size_t appl_data_len; -+ -+ appl_data = NULL; -+ - return tls_connection_handshake(ssl_ctx, conn, in_data, in_len, -- out_len); -+ out_len, appl_data, appl_data_len); - } - - diff --git a/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc b/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc deleted file mode 100644 index e75ce2e570..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc +++ /dev/null @@ -1,33 +0,0 @@ -SECTION = "kernel/userland" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ - file://wpa-defconfig \ - file://wpa_supplicant_default.conf" - -RREPLACES_${PN} = "hostap-${PN}" -RPROVIDES_${PN} = "hostap-${PN}" -RCONFLICTS_${PN} = "hostap-${PN}" - -S = "${WORKDIR}/wpa_supplicant-${PV}" - -do_compile() { - unset CFLAGS - base_do_compile -} - -do_configure() { - install -m 0644 ${WORKDIR}/wpa-defconfig .config -} - -do_install() { - install -d ${D}${sysconfdir} ${D}${bindir} - install -m 0644 wpa_supplicant.conf ${D}${sysconfdir}/wpa_supplicant.conf.sample - install -m 0644 ../wpa_supplicant_default.conf ${D}${sysconfdir}/wpa_supplicant.conf - install -m 0755 wpa_passphrase ${D}${bindir} - install -m 0755 wpa_cli ${D}${bindir} - install -m 0755 wpa_supplicant ${D}${bindir} -} - diff --git a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb deleted file mode 100644 index 365bcb78cc..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." -SECTION = "network" -LICENSE = "GPL" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "openssl" -PR = "r3" - -SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-0.3.6.tar.gz \ - file://defconfig \ - file://driver-hermes.patch;patch=1 \ - file://wpa_supplicant.conf" -S = "${WORKDIR}/wpa_supplicant-${PV}" - -do_configure () { - install -m 0755 ${WORKDIR}/defconfig .config -} - -do_compile () { - make -} - -do_install () { - install -d ${D}${sbindir} - install -m755 wpa_supplicant ${D}${sbindir} - install -m755 wpa_passphrase ${D}${sbindir} - install -m755 wpa_cli ${D}${sbindir} - - install -d ${D}${sysconfdir} - install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir} - - install -d ${D}${docdir}/wpa_supplicant - install -m644 README ${D}${docdir}/wpa_supplicant -} diff --git a/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb deleted file mode 100644 index e11bcbc7cb..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." -SECTION = "network" -LICENSE = "GPL" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "openssl" -DEPENDS_append_mtx-1 = " madwifi-modules" -DEPENDS_append_mtx-2 = " madwifi-modules" -PR = "r1" - -SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ - file://madwifi-bsd-fix.diff;patch=1;pnum=0 \ - file://defconfig \ - file://driver-hermes.patch;patch=1 \ - file://wpa_supplicant.conf" -S = "${WORKDIR}/wpa_supplicant-${PV}" - -do_configure () { - install -m 0755 ${WORKDIR}/defconfig .config -} - -do_compile () { - make -} - -do_install () { - install -d ${D}${sbindir} - install -m755 wpa_supplicant ${D}${sbindir} - install -m755 wpa_passphrase ${D}${sbindir} - install -m755 wpa_cli ${D}${sbindir} - - install -d ${D}${sysconfdir} - install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir} - - install -d ${D}${docdir}/wpa_supplicant - install -m644 README ${D}${docdir}/wpa_supplicant -} diff --git a/packages/wpa-supplicant/wpa-supplicant-0.5.inc b/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb index b5e53e3f56..ccded27ffb 100644 --- a/packages/wpa-supplicant/wpa-supplicant-0.5.inc +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb @@ -8,11 +8,8 @@ DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "", MY_ARCH := "${PACKAGE_ARCH}" PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}" -DEFAULT_PREFERENCE = "-2" - SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://defconfig-gnutls \ - file://gnutlsfix.patch;patch=1 \ file://ifupdown.sh \ file://functions.sh" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb deleted file mode 100644 index ce744b3fe7..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb +++ /dev/null @@ -1,3 +0,0 @@ -require wpa-supplicant-0.5.inc - -PR = "r3" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb deleted file mode 100644 index 2aa871bb74..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb +++ /dev/null @@ -1,3 +0,0 @@ -require wpa-supplicant-0.5.inc - -PR = "r1"
\ No newline at end of file diff --git a/packages/wpa-supplicant/wpa-supplicant_cvs.bb b/packages/wpa-supplicant/wpa-supplicant_cvs.bb deleted file mode 100644 index db1395d76b..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_cvs.bb +++ /dev/null @@ -1,58 +0,0 @@ -DESCRIPTION = "Client for Wi-Fi Protected Access (WPA)." -SECTION = "network" -LICENSE = "GPL" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "openssl" -PV = "0.0+cvs${SRCDATE}" -PR = "r2" - -SRC_URI = "cvs://anonymous@hostap.epitest.fi/cvs;module=hostap \ - file://use-channel.patch;patch=1 \ - file://driver-hermes.patch;patch=1 \ - file://defconfig \ - file://defaults \ - file://init.sh \ - file://wpa_supplicant.conf" -S = "${WORKDIR}/hostap/wpa_supplicant" - - -PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " -FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase" -FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli" - -RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" - - -INITSCRIPT_NAME = "wpa" -INITSCRIPT_PARAMS = "defaults 10" -inherit update-rc.d - - -do_configure () { - install -m 0755 ${WORKDIR}/defconfig .config -} - - -do_compile () { - make -} - - -do_install () { - set -x - install -d ${D}${sbindir} - install -m755 wpa_supplicant ${D}${sbindir} - install -m755 wpa_passphrase ${D}${sbindir} - install -m755 wpa_cli ${D}${sbindir} - - install -d ${D}${localstatedir}/run/wpa_supplicant - - install -d ${D}${docdir}/wpa_supplicant - install -m644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant - - install -d ${D}${sysconfdir}/init.d - install -m700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa - - install -d ${D}${sysconfdir}/default - install -m600 ${WORKDIR}/defaults ${D}${sysconfdir}/default/wpa -} diff --git a/packages/xapian/xapian-core-native_1.0.5.bb b/packages/xapian/xapian-core-native_1.0.5.bb new file mode 100644 index 0000000000..d3c425f6c4 --- /dev/null +++ b/packages/xapian/xapian-core-native_1.0.5.bb @@ -0,0 +1,5 @@ +require xapian-core_${PV}.bb + +inherit native + +S = "${WORKDIR}/xapian-core-${PV}" diff --git a/packages/xapian/xapian-quickstart.inc b/packages/xapian/xapian-quickstart.inc new file mode 100644 index 0000000000..aab599f64b --- /dev/null +++ b/packages/xapian/xapian-quickstart.inc @@ -0,0 +1,20 @@ +DESCRIPTION = "Simplest possible indexer (from an older release of xapian)." +HOMEPAGE = "http://users.softlab.ece.ntua.gr/~ttsiod/buildWikipediaOffline.html" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "xapian-core" + +BINARY_NAME = ${@bb.data.getVar("PN",d,1).replace("xapian-","").replace("-native","")} +S = "${WORKDIR}" + +SRC_URI = "http://users.softlab.ece.ntua.gr/~ttsiod/${BINARY_NAME}.cc" + +do_compile() { + ${CXX} ${CXXLAGS} ${LDFLAGS} -I${STAGING_INCDIR_NATIVE} -lxapian -o ${BINARY_NAME} ${BINARY_NAME}.cc +} + +do_install() { + install -d ${D}$ + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/${BINARY_NAME} ${D}${bindir}/ +} diff --git a/packages/xapian/xapian-quickstartindex-native_1.0.bb b/packages/xapian/xapian-quickstartindex-native_1.0.bb new file mode 100644 index 0000000000..fe84d4cbf5 --- /dev/null +++ b/packages/xapian/xapian-quickstartindex-native_1.0.bb @@ -0,0 +1,9 @@ +require xapian-quickstartindex_${PV}.bb + +DEPENDS = "xapian-core-native" + +inherit native + +do_stage() { + install -m 0744 ${WORKDIR}/${BINARY_NAME} ${STAGING_BINDIR} +} diff --git a/packages/xapian/xapian-quickstartindex_1.0.bb b/packages/xapian/xapian-quickstartindex_1.0.bb index 6deff9191e..7a17f7b354 100644 --- a/packages/xapian/xapian-quickstartindex_1.0.bb +++ b/packages/xapian/xapian-quickstartindex_1.0.bb @@ -1,18 +1,4 @@ -DESCRIPTION = "Simplest possible indexer (from older release of xapian)" -HOMEPAGE = "http://users.softlab.ece.ntua.gr/~ttsiod/buildWikipediaOffline.html" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "xapian-core" -PR = "r0" +require xapian-quickstart.inc -SRC_URI = "http://users.softlab.ece.ntua.gr/~ttsiod/quickstartindex.cc" -S = "${WORKDIR}" - -do_compile() { - ${CXX} ${CXXLAGS} ${LDFLAGS} -lxapian -o quickstartindex quickstartindex.cc -} - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${WORKDIR}/quickstartindex ${D}${bindir}/ -} +DESCRIPTION += "This package provides the tool for creating the index." +PR = "r1" diff --git a/packages/xapian/xapian-quickstartsearch_1.0.bb b/packages/xapian/xapian-quickstartsearch_1.0.bb new file mode 100644 index 0000000000..c3381f6abd --- /dev/null +++ b/packages/xapian/xapian-quickstartsearch_1.0.bb @@ -0,0 +1,4 @@ +require xapian-quickstart.inc + +DESCRIPTION += "This package provides the tool for searching the index." +PR = "r1" diff --git a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb index 8310db18df..f6b17c413e 100644 --- a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb +++ b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb @@ -9,9 +9,9 @@ DEPENDS += "libxkbfile libxcalibrate" RDEPENDS_${PN} = "xserver-kdrive" PROVIDES = "virtual/xserver" PE = "1" -PR = "r1" +PR = "r5" -XGLAMO_GIT_REV = "0d2605edeb50a4b118ac00ae1f00abd085477323" +XGLAMO_GIT_REV = "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f" SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;rev=${XGLAMO_GIT_REV} \ file://kmode.patch;patch=1 \ @@ -35,6 +35,7 @@ SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;rev=${XGLAMO_ file://w100-fix-offscreen-bmp.patch;patch=1 \ file://kdrive-1.3-18bpp.patch;patch=1 \ file://gumstix-kmode.patch;patch=1 \ + file://fix-picturestr-include-order.patch;patch=1 \ " FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.3.0.0:${FILE_DIRNAME}/xserver-kdrive:${FILE_DIRNAME}/files" diff --git a/packages/xserver-common/files/kdrive-1.4-fixes.patch b/packages/xserver-common/files/kdrive-1.4-fixes.patch index d43ffebc17..1526e73098 100644 --- a/packages/xserver-common/files/kdrive-1.4-fixes.patch +++ b/packages/xserver-common/files/kdrive-1.4-fixes.patch @@ -1,7 +1,57 @@ -Index: xserver-common-1.22/X11/default.xmodmap -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xserver-common-1.22/X11/default.xmodmap 2008-04-18 14:01:52.000000000 +0100 +diff -Nurd xserver-common-1.22.old/X11/Xinit.d/12keymap xserver-common-1.22/X11/Xinit.d/12keymap +--- xserver-common-1.22.old/X11/Xinit.d/12keymap 2008-02-07 16:53:16.000000000 +0100 ++++ xserver-common-1.22/X11/Xinit.d/12keymap 2008-05-04 17:30:48.278316443 +0200 +@@ -2,6 +2,9 @@ + + MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo` + ++# since kdrive 1.4 there is no default keymap in server ++xmodmap - </etc/X11/default.xmodmap ++ + case $MACHINE in + "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") + xmodmap - < /etc/X11/shepherd.xmodmap +diff -Nurd xserver-common-1.22.old/X11/Xserver xserver-common-1.22/X11/Xserver +--- xserver-common-1.22.old/X11/Xserver 2008-03-04 17:41:41.000000000 +0100 ++++ xserver-common-1.22/X11/Xserver 2008-05-04 17:31:04.388313190 +0200 +@@ -53,10 +53,14 @@ + ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00" + fi + +-# use usb mouse if present ++# kdrive 1.4 onwards needs -mouse args + # Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically +-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then +- ARGS="$ARGS -mouse /dev/input/mice" ++if [ -e "$TSLIB_TSDEVICE" ] ; then ++ ARGS="$ARGS -mouse tslib" ++else ++ if [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then ++ ARGS="$ARGS -mouse mouse" ++ fi + fi + + # start off server in conventional location. +@@ -103,8 +107,7 @@ + "Nokia RX-44") + ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;; + "GTA01" ) +- #we set 100 dpi for the time being, should the -dpi 285 +- ARGS="$ARGS -dpi 100 -screen 480x640" ;; ++ ARGS="$ARGS -dpi 285 -screen 480x640" ;; + "Motorola Ezx Platform") + ARGS="$ARGS -dpi 170 -screen 240x320" ;; + "ARM-IntegratorCP" | "ARM-Versatile PB") +@@ -130,4 +133,6 @@ + fi + esac + ++echo "tslib: $TSLIB_TSDEVICE" ++echo "exec $XSERVER $ARGS $*" + exec $XSERVER $ARGS $* +diff -Nurd xserver-common-1.22.old/X11/default.xmodmap xserver-common-1.22/X11/default.xmodmap +--- xserver-common-1.22.old/X11/default.xmodmap 1970-01-01 01:00:00.000000000 +0100 ++++ xserver-common-1.22/X11/default.xmodmap 2008-05-04 17:30:48.278316443 +0200 @@ -0,0 +1,260 @@ +keycode 8 = +keycode 9 = Escape @@ -263,43 +313,3 @@ Index: xserver-common-1.22/X11/default.xmodmap +add mod4 = Mode_switch +!mod5 + -Index: xserver-common-1.22/X11/Xinit.d/12keymap -=================================================================== ---- xserver-common-1.22.orig/X11/Xinit.d/12keymap 2008-02-07 15:53:16.000000000 +0000 -+++ xserver-common-1.22/X11/Xinit.d/12keymap 2008-04-18 13:55:33.000000000 +0100 -@@ -2,6 +2,9 @@ - - MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo` - -+# since kdrive 1.4 there is no default keymap in server -+xmodmap - </etc/X11/default.xmodmap -+ - case $MACHINE in - "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi") - xmodmap - < /etc/X11/shepherd.xmodmap -Index: xserver-common-1.22/X11/Xserver -=================================================================== ---- xserver-common-1.22.orig/X11/Xserver 2008-03-04 16:41:41.000000000 +0000 -+++ xserver-common-1.22/X11/Xserver 2008-04-18 13:55:33.000000000 +0100 -@@ -59,6 +59,11 @@ - ARGS="$ARGS -mouse /dev/input/mice" - fi - -+# kdrive 1.4 onwards needs -mouse args -+if [ -n "$TSLIB_TSDEVICE" ]; then -+ ARGS="$ARGS -mouse tslib" -+fi -+ - # start off server in conventional location. - case `module_id` in - "HP iPAQ H3100" | "HP iPAQ H3800") -@@ -103,8 +108,7 @@ - "Nokia RX-44") - ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;; - "GTA01" ) -- #we set 100 dpi for the time being, should the -dpi 285 -- ARGS="$ARGS -dpi 100 -screen 480x640" ;; -+ ARGS="$ARGS -dpi 285 -screen 480x640" ;; - "Motorola Ezx Platform") - ARGS="$ARGS -dpi 170 -screen 240x320" ;; - "ARM-IntegratorCP" | "ARM-Versatile PB") diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb index 5837c60a80..25f2abf148 100644 --- a/packages/xserver-common/xserver-common_1.22.bb +++ b/packages/xserver-common/xserver-common_1.22.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r1" +PR = "r4" PACKAGE_ARCH = "all" diff --git a/packages/zaurusd/files/alsa-cxx00-default.state.patch b/packages/zaurusd/files/alsa-cxx00-default.state.patch index b10e6c85dd..b7a149be00 100644 --- a/packages/zaurusd/files/alsa-cxx00-default.state.patch +++ b/packages/zaurusd/files/alsa-cxx00-default.state.patch @@ -1,4 +1,4 @@ -http://bugs.openembedded.org/show_bug.cgi?id=2617 +http://bugs.openembedded.net/show_bug.cgi?id=2617 - Fixes default ALSA state for SL-Cxx00. * Treble level reflects kernel fix alsa-wm8750-treble.patch (>2.6.24). * Increased Mic Levels and Boost. |