armadeus-commitlog Mailing List for armadeus (Page 106)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Fabien M <fa...@us...> - 2010-07-07 08:31:01
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via cfcd5af421528a5af9cc0f26c9737ddd48a5927a (commit)
from a41ef6cf042f3ec149c01b3c9e3da3798b4d286a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cfcd5af421528a5af9cc0f26c9737ddd48a5927a
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jul 7 10:25:25 2010 +0200
[package] Adding jstest and jscal joystick testing programs
-----------------------------------------------------------------------
Summary of changes:
...est-add_joystick_testing_programs_package.patch | 264 ++++++++++++++++++++
1 files changed, 264 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
diff --git a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
new file mode 100644
index 0000000..68f5fe0
--- /dev/null
+++ b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
@@ -0,0 +1,264 @@
+Adding jstest and jscal joystick testing programs
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
+Index: buildroot/package/joysticktest/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/joysticktest/Config.in 2010-07-07 09:46:38.000000000 +0200
+@@ -0,0 +1,4 @@
++config BR2_PACKAGE_JOYSTICKTEST
++ bool "joysticktest"
++ help
++ jstest and jscal joystick testing programs.
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-07-07 09:42:49.000000000 +0200
++++ buildroot/package/Config.in 2010-07-07 09:57:48.000000000 +0200
+@@ -499,5 +499,6 @@
+
+ # various games packages
+ source "package/games/Config.in"
++source "package/joysticktest/Config.in"
+
+ endmenu
+Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch 2010-07-07 09:26:04.000000000 +0200
+@@ -0,0 +1,204 @@
++Index: joystick-1.2.15/Makefile
++===================================================================
++--- joystick-1.2.15.orig/Makefile 2010-07-07 09:16:58.000000000 +0200
+++++ joystick-1.2.15/Makefile 2010-07-07 09:23:33.000000000 +0200
++@@ -27,168 +27,28 @@
++ # Edit the options below to suit your needs
++ #
++
++-CC = gcc
+++ifeq ($(ARMADEUS_BASE_DIR),)
+++ ARMADEUS_BASE_DIR=~/armadeus_trees/apf27_virgin/
+++endif
+++include $(ARMADEUS_BASE_DIR)/Makefile.in
++
++-CPPFLAGS = -I.# # for joystick.h
+++CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
++
++-CFLAGS = -O2 -Wall -pipe -m486 -fomit-frame-pointer# # i386
++-# CFLAGS = -O2 -Wall -pipe -m68020 -ffixed-a2# # m68k
++-# CFLAGS = -O2 -Wall -pipe -fomit-frame-pointer -ffixed-8# Alpha
++-# CFLAGS = -O2 -Wall -pipe# # Generic
++-
++-MODFLAGS = -D__KERNEL__ -DMODULE# # Normal modules
++-#MODFLAGS = -D__KERNEL__ -DMODULE -DMODVERSIONS\
++-# -include /usr/src/linux/include/linux/modversions.h # Versioned modules
++-
++-DRIVERS = joy-analog.o joy-sidewinder.o joy-logitech.o\
++- joy-assassin.o joy-gravis.o joy-lightning.o\
++- joy-thrustmaster.o joy-creative.o joy-console.o\
++- joy-db9.o joy-turbografx.o joy-spaceorb.o\
++- joy-spaceball.o joy-magellan.o joy-warrior.o\
++- joy-pci.o# # PC drivers
++-# DRIVERS = joy-amiga.o# # Amiga driver
+++CFLAGS=-Wall -g -O2 -lm
+++LDFLAGS=-L$(ARMADEUS_STAGING_DIR)/usr/lib/
+++INCLUDE=
+++LIB=
++
++-MODDIR = /lib/modules/preferred/misc# # RedHat location
++-# MODDIR = /lib/modules/current/misc# # For some others?
+++all: jscal jstest
++
++-PROGRAMS = jstest jscal jsattach
+++jscal: jscal.c
+++ ${CC} ${CFLAGS} $< -o $@ ${LDFLAGS}
++
++-#
++-# Nothing should need to be changed below this line
++-#
++-
++-JOYPATH := $(shell pwd)
++-JOYDIR := $(shell basename "$(JOYPATH)")
++-JOYVER := $(shell expr "$(JOYDIR)" : "joystick-\(.*\)")
++-JOYOPRE := $(shell if [ -f .prerelease ]; then cat .prerelease; else echo 0; fi)
++-JOYPRE := $(shell expr $(JOYOPRE) + 1)
++-
++-compile: joystick.o $(DRIVERS) $(PROGRAMS)
++-
++-install: compile
++- mkdir -p $(MODDIR)
++- rm -f $(MODDIR)/joy*.o
++- cp joy*.o $(MODDIR)
++- /sbin/depmod -a
++- install -m 644 joystick.h /usr/include/linux
++- install -m 755 jscal /usr/local/bin
++- install -m 755 jstest /usr/local/bin
++- install -m 755 jsattach /usr/local/bin
++- install -m 644 jscal.1 /usr/local/man/man1
++- install -m 644 jstest.1 /usr/local/man/man1
++- install -m 644 jsattach.1 /usr/local/man/man1
++-
++-joystick.o: joystick.c joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -DEXPORT_SYMTAB -c joystick.c -o joystick.o
++-
++-joy-analog.o: joy-analog.c joy-analog.h joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-analog.c -o joy-analog.o
++-
++-joy-sidewinder.o: joy-sidewinder.c joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-sidewinder.c -o joy-sidewinder.o
++-
++-joy-logitech.o: joy-logitech.c joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-logitech.c -o joy-logitech.o
++-
++-joy-gravis.o: joy-gravis.c joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-gravis.c -o joy-gravis.o
++-
++-joy-assassin.o: joy-assassin.c joy-analog.h joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-assassin.c -o joy-assassin.o
++-
++-joy-thrustmaster.o: joy-thrustmaster.c joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-thrustmaster.c -o joy-thrustmaster.o
++-
++-joy-creative.o: joy-creative.c joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-creative.c -o joy-creative.o
++-
++-joy-lightning.o: joy-lightning.c joy-analog.h joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-lightning.c -o joy-lightning.o
++-
++-joy-pci.o: joy-pci.c joy-analog.h joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-pci.c -o joy-pci.o
++-
++-joy-amiga.o: joy-amiga.c joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-amiga.c -o joy-amiga.o
++-
++-joy-console.o: joy-console.c joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-console.c -o joy-console.o
++-
++-joy-db9.o: joy-db9.c joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-db9.c -o joy-db9.o
++-
++-joy-turbografx.o: joy-turbografx.c joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-turbografx.c -o joy-turbografx.o
++-
++-joy-spaceorb.o: joy-spaceorb.c joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-spaceorb.c -o joy-spaceorb.o
++-
++-joy-spaceball.o: joy-spaceball.c joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-spaceball.c -o joy-spaceball.o
++-
++-joy-magellan.o: joy-magellan.c joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-magellan.c -o joy-magellan.o
++-
++-joy-warrior.o: joy-warrior.c joystick.h
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joy-warrior.c -o joy-warrior.o
++-
++-joydump: joydump.o
++-
++-joydump.o: joydump.c
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c joydump.c -o joydump.o
++-
++-legacy.o: legacy.c
++- $(CC) $(CFLAGS) $(CPPFLAGS) $(MODFLAGS) -c legacy.c -o legacy.o
++-
++-jscal: jscal.o
++- $(CC) $(cflags) $(cppflags) -lm $^ -o $@
++-
++-jstest: jstest.o
++- $(CC) $(cflags) $(cppflags) $^ -o $@
++-
++-devs:
++- -$(RM) /dev/js0 /dev/js1 /dev/js2 /dev/js3
++- mknod /dev/js0 c 15 0
++- mknod /dev/js1 c 15 1
++- mknod /dev/js2 c 15 2
++- mknod /dev/js3 c 15 3
+++jstest: jstest.c
+++ ${CC} ${CFLAGS} $< -o $@ ${LDFLAGS}
++
+++eventtest: eventtest.c
+++ ${CC} ${CFLAGS} $< -o $@ ${LDFLAGS}
++ clean:
++- -$(RM) *.o *.swp $(PROGRAMS) *.orig *.rej map
++-
++-dist: clean
++- ( \
++- rm -f *.diff ;\
++- cd .. ;\
++- mkdir -p arch ;\
++- rm -f arch/$(JOYDIR).tar.gz ;\
++- tar czf arch/$(JOYDIR).tar.gz $(JOYDIR) ;\
++- )
++-
++-bumprel: clean
++- echo $(JOYPRE) > .prerelease
++-
++-pre: compile bumprel dist
++- ( \
++- cd .. ;\
++- mv arch/$(JOYDIR).tar.gz arch/devel/joystick-pre-$(JOYVER)-$(JOYPRE).tar.gz ;\
++- scp arch/devel/joystick-pre-$(JOYVER)-$(JOYPRE).tar.gz atrey:joystick/devel ;\
++- scp arch/devel/joystick-pre-$(JOYVER)-$(JOYPRE).tar.gz suse-ftp:joystick/devel ;\
++- )
++-
++-relclean: clean
++- $(RM) .prerelease
++-
++-release: compile relclean dist
++- ( \
++- echo 0 > .prerelease ;\
++- cd .. ;\
++- scp arch/$(JOYDIR).tar.gz atrey:joystick ;\
++- scp arch/$(JOYDIR).tar.gz suse-ftp:joystick ;\
++- ssh atrey rm -f "joystick/devel/*" &\
++- ssh suse-ftp rm -f "joystick/devel/*" &\
++- )
++-
++-jstest.o: jstest.c joystick.h
++-jscal.o: jscal.c joystick.h
++-jsattach.o: jsattach.c
+++ rm jscal
+++ rm jstest
++Index: joystick-1.2.15/jscal.c
++===================================================================
++--- joystick-1.2.15.orig/jscal.c 2010-07-07 09:24:59.000000000 +0200
+++++ joystick-1.2.15/jscal.c 2010-07-07 09:25:48.000000000 +0200
++@@ -30,6 +30,8 @@
++ * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic
++ */
++
+++#include <stdlib.h>
+++
++ #include <sys/ioctl.h>
++ #include <sys/time.h>
++ #include <fcntl.h>
+Index: buildroot/package/joysticktest/joysticktest.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/joysticktest/joysticktest.mk 2010-07-07 10:14:49.000000000 +0200
+@@ -0,0 +1,26 @@
++############################################################
++#
++# Joysticktest
++#
++############################################################
++JOYSTICKTEST_VERSION:=1.2.15
++JOYSTICKTEST_SOURCE:=joystick-$(JOYSTICKTEST_VERSION).tar.gz
++JOYSTICKTEST_SITE:=ftp://atrey.karlin.mff.cuni.cz/pub/linux/joystick/
++JOYSTICKTEST_INSTALL_STAGING=YES
++JOYSTICKTEST_DEPENDENCIES =
++
++define JOYSTICKTEST_BUILD_CMDS
++ $(MAKE) CC=$(TARGET_CC) LD=$(TARGET_LD) -C $(@D) all
++endef
++
++define JOYSTICKTEST_INSTALL_STAGING_CMDS
++ $(INSTALL) -D $(@D)/jstest $(STAGING_DIR)/usr/bin/jstest
++ $(INSTALL) -D $(@D)/jscal $(STAGING_DIR)/usr/bin/jscal
++endef
++
++define JOYSTICKTEST_INSTALL_TARGET_CMDS
++ cp -dpf $(@D)/jstest $(TARGET_DIR)/usr/bin/jstest
++ cp -dpf $(@D)/jscal $(TARGET_DIR)/usr/bin/jscal
++endef
++
++$(eval $(call GENTARGETS,package,joysticktest,target))
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-07-06 16:13:07
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via a41ef6cf042f3ec149c01b3c9e3da3798b4d286a (commit)
via 7f16ae290fbf4da9705f8f35d20a622505c74ba6 (commit)
from c827f8a4e123e8cef72014d484642934699f5ead (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a41ef6cf042f3ec149c01b3c9e3da3798b4d286a
Merge: 7f16ae290fbf4da9705f8f35d20a622505c74ba6 c827f8a4e123e8cef72014d484642934699f5ead
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jul 6 18:12:36 2010 +0200
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 7f16ae290fbf4da9705f8f35d20a622505c74ba6
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jul 6 18:12:10 2010 +0200
[package][as_devices] Change data lenght for spi msg command
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/c/as_spi.c | 20 ++++++++++----------
target/packages/as_devices/c/as_spi.h | 20 ++++++++++----------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/target/packages/as_devices/c/as_spi.c b/target/packages/as_devices/c/as_spi.c
index b5af328..2aaccb5 100644
--- a/target/packages/as_devices/c/as_spi.c
+++ b/target/packages/as_devices/c/as_spi.c
@@ -3,18 +3,18 @@
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of the
* License, or (at your option) any later version.
- *
+ *
* This library 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
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*
- * Copyright (C) 2009-2010 Fabien Marteau <fab...@ar...>
+ * Copyright (C) 2009-2010 Fabien Marteau <fab...@ar...>
*
*/
@@ -158,17 +158,17 @@ int as_spi_set_bits_per_word(int aFd, uint8_t aBits)
/*--------------------------------------------------------------*/
-uint32_t as_spi_msg(int aFd,
- uint32_t aMsg,
- size_t aLen,
- uint32_t aSpeed)
+unsigned long long as_spi_msg(int aFd,
+ unsigned long long aMsg,
+ size_t aLen,
+ uint32_t aSpeed)
{
uint32_t msg;
int len;
struct spi_ioc_transfer xfer[1];
- unsigned char buf[32];
- unsigned char buf_read[32];
+ unsigned char buf[64];
+ unsigned char buf_read[64];
int status;
int i;
@@ -208,7 +208,7 @@ uint32_t as_spi_msg(int aFd,
msg = msg << 1;
msg = msg | buf_read[i];
}
- return msg;
+ return msg;
}
/*--------------------------------------------------------------*/
diff --git a/target/packages/as_devices/c/as_spi.h b/target/packages/as_devices/c/as_spi.h
index 8253723..511f2fc 100644
--- a/target/packages/as_devices/c/as_spi.h
+++ b/target/packages/as_devices/c/as_spi.h
@@ -3,18 +3,18 @@
* it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of the
* License, or (at your option) any later version.
- *
+ *
* This library 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
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*
- * Copyright (C) 2009 Fabien Marteau <fab...@ar...>
+ * Copyright (C) 2009 Fabien Marteau <fab...@ar...>
*
*/
@@ -36,7 +36,7 @@ extern "C" {
/** @brief Open a SPI bus.
*
- * @param aSpidev_name path name
+ * @param aSpidev_name path name
*
* @return the file descriptor of the opened device, -1Â on error
*/
@@ -76,7 +76,7 @@ int as_spi_set_mode(int aFd, uint8_t aMode);
* @param aFd spidev file handler
*
* @return mode if positive value, negative value on error
- * TODO: test it
+ * TODO: test it
*/
int as_spi_get_mode(int aFd);
@@ -85,7 +85,7 @@ int as_spi_get_mode(int aFd);
* @param aFd spidev file handler
*
* @return lsb first if positive, msb first if 0, negative value on error
- *
+ *
*/
int as_spi_get_lsb(int aFd);
@@ -135,10 +135,10 @@ int as_spi_set_bits_per_word(int aFd, uint8_t aBits);
*
* @return message read
*/
-uint32_t as_spi_msg(int aFd,
- uint32_t aMsg,
- size_t aLen,
- uint32_t aSpeed);
+unsigned long long as_spi_msg(int aFd,
+ unsigned long long aMsg,
+ size_t aLen,
+ uint32_t aSpeed);
/** @brief Close a SPI bus.
*
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-07-05 17:06:34
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via c827f8a4e123e8cef72014d484642934699f5ead (commit)
from 0b5e7db124792b662fd241a36b401aac18b031f5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c827f8a4e123e8cef72014d484642934699f5ead
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jul 5 19:05:18 2010 +0200
[LINUX] ov96xx: updates driver to make it more friendly with V4L apps
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 74 +++-
.../319-apf27-armadeus-ov96xx_sensors_driver.patch | 481 ++++++++------------
2 files changed, 238 insertions(+), 317 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index 72d2112..40b465b 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -9,7 +9,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2010-04-26 13:53:19.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2010-06-29 16:12:27.000000000 +0200
@@ -0,0 +1,789 @@
+ /*
+ * apf27.c
@@ -803,8 +803,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2010-04-26 15:06:48.000000000 +0200
-@@ -0,0 +1,1019 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2010-07-01 16:25:06.000000000 +0200
+@@ -0,0 +1,1049 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -865,15 +865,12 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#include "../../../drivers/net/can/mcp251x.h"
+#include "../../../drivers/armadeus/pwm/pwm.h"
+#include <media/ad9889.h>
-+#if defined(CONFIG_SND) || defined (CONFIG_SND_MODULE)
+#include <mach/imx_dam.h>
+#include <mach/imx_sound.h>
+#include <mach/imx_ssi.h>
+#include <mach/imx-alsa.h>
-+#endif
-+#if defined(CONFIG_VIDEO_MX27_MODULE) || defined(CONFIG_VIDEO_MX27)
+#include <mach/imx_cam.h>
-+#endif
++#include <media/soc_camera.h>
+#if defined(CONFIG_CPU_FREQ_IMX27) || defined(CONFIG_CPU_FREQ_IMX27_MODULE)
+#include "cpufreq_imx.h"
+#endif
@@ -948,6 +945,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+};
+
+/* I2C1 devices: RTC & Optionnal Camera */
++# ifdef CONFIG_VIDEO_OV96xx
++static struct soc_camera_link ov96xx_iclink; /* declared later */
++#endif
+static struct i2c_board_info apf27dev_i2c_devices_bus0[] = {
+ [0] = {
+ /* APF27Dev has an RTC */
@@ -962,7 +962,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .type = "ov96xx",
+ .flags = 0, /* FIXME */
+ .addr = 0x30,
-+ .platform_data = NULL,
++ .platform_data = &ov96xx_iclink,
+ .irq = 0
+ },
+# endif
@@ -1623,14 +1623,13 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+
+/* APF27Dev can have an optionnal Camera module extension using i.MX27 CSI */
-+/* TO BE DONE */
+#ifdef CONFIG_VIDEO_MX27
+# ifdef CONFIG_VIDEO_OV96xx
-+#define OV9653_PWDN (GPIO_PORTC | 30) /* SSI3_TX as POWERDOWN*/
++#define OV9653_PWRDN (GPIO_PORTC | 30) /* SSI3_TX as POWERDOWN*/
+#define OV9653_RESET (GPIO_PORTC | 31) /* SSI3_CLK as RESET */
+
+static int apf27dev_ov9653_ctl_pins[] = {
-+ (OV9653_PWDN | GPIO_OUT | GPIO_GPIO),
++ (OV9653_PWRDN | GPIO_OUT | GPIO_GPIO),
+ (OV9653_RESET | GPIO_OUT | GPIO_GPIO),
+};
+# endif
@@ -1653,28 +1652,26 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+static int apf27dev_camera_init(struct platform_device *pdev)
+{
+# ifdef CONFIG_VIDEO_OV96xx
-+ /* To be put in OV96xx driver init part: */
+ int err;
+
-+ gpio_set_value(OV9653_PWDN, 0);
++ /* Setup PWRDN/RESET pins default value */
++ gpio_set_value(OV9653_PWRDN, 0);
+ gpio_set_value(OV9653_RESET, 0);
+ err = mxc_gpio_setup_multiple_pins(apf27dev_ov9653_ctl_pins,
-+ ARRAY_SIZE(apf27dev_ov9653_ctl_pins), "OV9653");
-+ if (err) {
++ ARRAY_SIZE(apf27dev_ov9653_ctl_pins), "OV9653");
++ if (err)
+ printk("Error %s", __func__);
-+ }
+# endif
+
+ return mxc_gpio_setup_multiple_pins(apf27dev_csi_pins,
-+ ARRAY_SIZE(apf27dev_csi_pins), "CSI");
++ ARRAY_SIZE(apf27dev_csi_pins), "CSI");
+}
+
+static int apf27dev_camera_exit(struct platform_device *pdev)
+{
+# ifdef CONFIG_VIDEO_OV96xx
-+ /* To be put in OV96xx driver specific exit */
+ mxc_gpio_release_multiple_pins(apf27dev_ov9653_ctl_pins,
-+ ARRAY_SIZE(apf27dev_ov9653_ctl_pins));
++ ARRAY_SIZE(apf27dev_ov9653_ctl_pins));
+# endif
+
+ mxc_gpio_release_multiple_pins(apf27dev_csi_pins, ARRAY_SIZE(apf27dev_csi_pins));
@@ -1687,8 +1684,41 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .exit = apf27dev_camera_exit,
+ .clk = 26600000,
+ .flags = MX27_CAMERA_HSYNC_HIGH | MX27_CAMERA_GATED_CLOCK |
-+ MX27_CAMERA_PACK_DIR_MSB,
++ MX27_CAMERA_SWAP16,
+};
++
++# ifdef CONFIG_VIDEO_OV96xx
++static int ov96xx_power(struct device *dev, int state)
++{
++ printk(KERN_DEBUG "*** %s %d\n", __func__, state);
++
++ if (state) /* UP */
++ gpio_set_value(OV9653_PWRDN, 0);
++ else /* DOWN */
++ gpio_set_value(OV9653_PWRDN, 1);
++
++ return 0;
++}
++
++static int ov96xx_reset(struct device *dev)
++{
++ printk(KERN_DEBUG "*** %s\n", __func__);
++
++ gpio_set_value(OV9653_RESET, 1);
++ msleep(10);
++ gpio_set_value(OV9653_RESET, 0);
++ msleep(10);
++
++ return 0;
++}
++
++static struct soc_camera_link ov96xx_iclink = {
++ .bus_id = 0,
++ .power = ov96xx_power,
++ .reset = ov96xx_reset,
++};
++# endif
++
+#endif /* CONFIG_VIDEO_MX27 */
+
+
@@ -1827,7 +1857,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2010-04-26 13:53:19.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2010-06-29 16:12:27.000000000 +0200
@@ -0,0 +1,220 @@
+/*
+ * apf27-lcd.c
@@ -2052,7 +2082,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2010-04-26 14:56:34.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2010-06-29 16:12:27.000000000 +0200
@@ -0,0 +1,190 @@
+ /*
+ * apf27-dev-ext-apw.c
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch
index e2e612a..98083dd 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch
@@ -6,8 +6,8 @@ Signed-off-by: Julien boibessot <jul...@ar...>
Index: linux-2.6.29.6/drivers/media/video/Kconfig
===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2010-05-19 17:05:55.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-05-19 17:48:31.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2010-07-01 16:25:15.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-07-05 18:34:51.000000000 +0200
@@ -298,6 +298,13 @@
OV7670 VGA camera. It currently only works with the M88ALP01
controller.
@@ -24,8 +24,8 @@ Index: linux-2.6.29.6/drivers/media/video/Kconfig
depends on I2C && VIDEO_V4L2
Index: linux-2.6.29.6/drivers/media/video/Makefile
===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Makefile 2010-05-19 17:05:55.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Makefile 2010-05-19 17:48:31.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/media/video/Makefile 2010-07-01 16:25:15.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Makefile 2010-07-05 18:34:51.000000000 +0200
@@ -106,6 +106,7 @@
obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
@@ -37,8 +37,8 @@ Index: linux-2.6.29.6/drivers/media/video/Makefile
Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/media/video/ov96xx.c 2010-05-19 17:05:55.000000000 +0200
-@@ -0,0 +1,1785 @@
++++ linux-2.6.29.6/drivers/media/video/ov96xx.c 2010-07-05 18:20:21.000000000 +0200
+@@ -0,0 +1,1676 @@
+/*
+ * drivers/media/video/ov96xx.c
+ *
@@ -51,7 +51,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ *
+ * Copyright (C) 2004 MontaVista Software, Inc.
+ * Copyright (C) 2004 Texas Instruments.
-+ * Copyright (C) 2009 Armadeus Systems
++ * Copyright (C) 2009-2010 Armadeus Systems
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
@@ -64,7 +64,10 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+#include <linux/proc_fs.h>
+#include <media/soc_camera.h>
+
++#define DEBUG
+// #include "ov9640.h"
++/* to put in include/media/v4l2-chip-ident.h : */
++#define V4L2_IDENT_OV9653 253
+
+#define DRIVER_NAME "ov96xx"
+/* ov96xx i2c address 0x30
@@ -72,7 +75,9 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ * and call i2c_register_board_info() */
+#define OV96XX_I2C_ADDR 0x30 /* = 0x60 with read/write bit */
+
-+/* define register offsets for the OV9640 sensor chip */
++/*
++ * register offsets
++ */
+#define OV96XX_GAIN 0x00
+#define OV96XX_BLUE 0x01
+#define OV96XX_RED 0x02
@@ -90,7 +95,17 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+#define OV96XX_COM6 0x0F
+#define OV96XX_AECH 0x10
+#define OV96XX_CLKRC 0x11
-+#define OV96XX_COM7 0x12
++#define REG_COM7 0x12 /* Control 7 */
++#define COM7_RESET 0x80 /* Register reset */
++#define COM7_FMT_MASK 0x78
++#define COM7_FMT_VGA 0x40
++#define COM7_FMT_CIF 0x20 /* CIF format */
++#define COM7_FMT_QVGA 0x10 /* QVGA format */
++#define COM7_FMT_QCIF 0x08 /* QCIF format */
++#define COM7_RGB 0x04 /* RGB */
++#define COM7_YUV 0x00 /* YUV */
++#define COM7_BAYER 0x01 /* Bayer format */
++#define COM7_PBAYER 0x05 /* "Processed bayer" */
+#define OV96XX_COM8 0x13
+#define OV96XX_COM9 0x14
+#define OV96XX_COM10 0x15
@@ -204,8 +219,8 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ unsigned char val;
+};
+
-+enum image_size { QQCIF, QQVGA, QCIF, QVGA, CIF, VGA, SXGA };
-+enum pixel_format { YUV, RGB565, RGB555 };
++enum image_size { QQCIF = 0, QQVGA, QCIF, QVGA, CIF, VGA, SXGA };
++enum pixel_format { YUV = 0, RGB565, RGB555 };
+
+#define NUM_IMAGE_SIZES 7
+#define NUM_PIXEL_FORMATS 3
@@ -235,6 +250,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ { 352, 288 }, /* CIF */
+ { 640, 480 }, /* VGA */
+ { 1280, 960 }, /* SXGA */
++ { 0, 0 }, /* END */
+};
+
+
@@ -242,6 +258,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+struct ov96xx_sensor {
+ struct i2c_client *i2c_client;
+ struct soc_camera_device icd;
++ int model;
+ int ver; /*ov96xx chip version*/
+
+ const struct ov96xx_platform_data *pdata;
@@ -268,6 +285,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ */
+ .name = "RGB565, le",
+ .fourcc = V4L2_PIX_FMT_RGB565,
++ .depth = 16,
+ },
+ {
+ /* Note: V4L2 defines RGB565X as:
@@ -282,14 +300,17 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ */
+ .name = "RGB565, be",
+ .fourcc = V4L2_PIX_FMT_RGB565X,
++ .depth = 16,
+ },
+ {
+ .name = "YUYV (YUV 4:2:2), packed",
+ .fourcc = V4L2_PIX_FMT_YUYV,
++ .depth = 16,
+ },
+ {
+ .name = "UYVY, packed",
+ .fourcc = V4L2_PIX_FMT_UYVY,
++ .depth = 16,
+ },
+ {
+ /* Note: V4L2 defines RGB555 as:
@@ -304,6 +325,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ */
+ .name = "RGB555, le",
+ .fourcc = V4L2_PIX_FMT_RGB555,
++ .depth = 16,
+ },
+ {
+ /* Note: V4L2 defines RGB555X as:
@@ -318,6 +340,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ */
+ .name = "RGB555, be",
+ .fourcc = V4L2_PIX_FMT_RGB555X,
++ .depth = 16,
+ },
+};
+
@@ -751,8 +774,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ * Write a value to a register in an OV96xx sensor device.
+ * Returns zero if successful, or non-zero otherwise.
+ */
-+static int
-+ov96xx_write_reg(struct i2c_client *client, u8 reg, u8 val)
++static int ov96xx_write(struct i2c_client *client, u8 reg, u8 val)
+{
+ int err;
+ struct i2c_msg msg[1];
@@ -792,7 +814,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ }
+
+ /* write the new value to the register */
-+ rc = ov96xx_write_reg(client, reg, newval);
++ rc = ov96xx_write(client, reg, newval);
+ if (rc)
+ return rc;
+
@@ -831,7 +853,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+
+ while (!((next->reg == OV96XX_REG_TERM)
+ && (next->val == OV96XX_VAL_TERM))) {
-+ err = ov96xx_write_reg(client, next->reg, next->val);
++ err = ov96xx_write(client, next->reg, next->val);
+ udelay(100);
+ if (err)
+ return err;
@@ -1016,9 +1038,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ * The actual frame period is returned in fper.
+ */
+static int ov96xx_configure(struct soc_camera_device *icd)
-+// struct v4l2_int_device *s)
+{
-+// struct ov96xx_sensor *sensor = s->priv;
+ struct ov96xx_sensor *sensor = container_of(icd, struct ov96xx_sensor, icd);
+ struct v4l2_pix_format *pix = &sensor->pix;
+ struct v4l2_fract *fper = &sensor->timeperframe;
@@ -1046,7 +1066,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ }
+
+ xclk = ov96xxsensor_calc_xclk(client);
-+ printk("%s xclk: %d\n", __func__, xclk);
++ printk("%s xclk: %lu\n", __func__, xclk);
+ return 0;
+
+ isize = ov96xx_find_size(pix->width, pix->height);
@@ -1063,7 +1083,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+
+ /* configure frame rate */
+ clkrc = ov96xx_clkrc(isize, xclk, fper);
-+ err = ov96xx_write_reg(client, OV96XX_CLKRC, clkrc);
++ err = ov96xx_write(client, OV96XX_CLKRC, clkrc);
+ if (err)
+ return err;
+
@@ -1113,49 +1133,6 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ return ver;
+}
+
-+static int ioctl_g_ext_clk(struct v4l2_int_device *s, u32 *xclk)
-+{
-+ struct ov96xx_sensor *sensor = s->priv;
-+ struct i2c_client *client = sensor->i2c_client;
-+ unsigned long tgt_xclk;
-+
-+ tgt_xclk = ov96xxsensor_calc_xclk(client);
-+
-+ *xclk = tgt_xclk;
-+
-+ return 0;
-+}
-+
-+static int ioctl_s_ext_clk(struct v4l2_int_device *s, u32 xclk)
-+{
-+ if (xclk > XCLK_MAX || xclk < XCLK_MIN)
-+ return -EINVAL;
-+
-+ return 0;
-+}
-+
-+/*
-+ * following are sensor interface functions implemented by
-+ * OV9640 sensor driver.
-+ */
-+/*static int ioctl_queryctrl(struct v4l2_int_device *s,
-+ struct v4l2_queryctrl *qc)
-+{
-+ int i;
-+
-+ i = find_vctrl(qc->id);
-+ if (i == -EINVAL) {
-+ qc->flags = V4L2_CTRL_FLAG_DISABLED;
-+ return 0;
-+ }
-+ if (i < 0)
-+ return -EINVAL;
-+
-+ *qc = video_control[i].qc;
-+ return 0;
-+}*/
-+
-+// static int ioctl_g_ctrl(struct v4l2_int_device *s,
+static int ov96xx_get_control(struct soc_camera_device *icd,
+ struct v4l2_control *vctrl)
+{
@@ -1180,17 +1157,16 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ return val;
+}
+
-+// static int ioctl_s_ctrl(struct v4l2_int_device *s,
+static int ov96xx_set_control(struct soc_camera_device *icd,
-+ struct v4l2_control *vc)
++ struct v4l2_control *ctrl)
+{
+ struct ov96xx_sensor *sensor = container_of(icd, struct ov96xx_sensor, icd);
+ struct i2c_client *client = sensor->i2c_client;
+ struct vcontrol *lvc;
-+ int val = vc->value;
++ int val = ctrl->value;
+ int i;
+
-+ i = find_vctrl(vc->id);
++ i = find_vctrl(ctrl->id);
+ if (i < 0)
+ return -EINVAL;
+
@@ -1208,77 +1184,55 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+}
+
+static int ov96xx_get_chip_id(struct soc_camera_device *icd,
-+ struct v4l2_chip_ident_old *id)
++ struct v4l2_dbg_chip_ident *id)
+{
-+/* struct mt9m001 *mt9m001 = container_of(icd, struct mt9m001, icd);
++ struct ov96xx_sensor *ov96xx = container_of(icd, struct ov96xx_sensor, icd);
+
-+ if (id->match_type != V4L2_CHIP_MATCH_I2C_ADDR)
++ if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)
+ return -EINVAL;
+
-+ if (id->match_chip != mt9m001->client->addr)
-+ return -ENODEV;*/
++ if (id->match.addr != ov96xx->i2c_client->addr)
++ return -ENODEV;
+
-+ id->ident = 0x53; //mt9m001->model;
++ id->ident = ov96xx->model;
+ id->revision = 0;
+
+ return 0;
+}
+
+/*
-+ * Implement the VIDIOC_ENUM_FMT ioctl for the CAPTURE buffer type.
++ * Negotiates the image capture size and pixel format without actually making
++ * it take effect.
+ */
-+// static int ioctl_enum_fmt_cap(struct v4l2_int_device *s,
-+// struct v4l2_fmtdesc *fmt)
-+// {
-+// int index = fmt->index;
-+// enum v4l2_buf_type type = fmt->type;
-+//
-+// memset(fmt, 0, sizeof(*fmt));
-+// fmt->index = index;
-+// fmt->type = type;
-+//
-+// switch (fmt->type) {
-+// case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-+// if (index >= NUM_CAPTURE_FORMATS)
-+// return -EINVAL;
-+// break;
-+// default:
-+// return -EINVAL;
-+// }
-+//
-+// fmt->flags = ov96xx_formats[index].flags;
-+// strlcpy(fmt->description, ov96xx_formats[index].description,
-+// sizeof(fmt->description));
-+// fmt->pixelformat = ov96xx_formats[index].pixelformat;
-+//
-+// return 0;
-+// }
-+
-+/*
-+ * Implement the VIDIOC_TRY_FMT ioctl for the CAPTURE buffer type. This
-+ * ioctl is used to negotiate the image capture size and pixel format
-+ * without actually making it take effect.
-+ */
-+static int ov96xx_try_fmt_cap(struct soc_camera_device *icd, /*struct v4l2_int_device *s,*/
-+ struct v4l2_format *f)
++static int ov96xx_try_fmt(struct soc_camera_device *icd, struct v4l2_format *fmt)
+{
+ enum image_size isize;
+ int ifmt;
-+ struct v4l2_pix_format *pix = &f->fmt.pix;
++ struct v4l2_pix_format *pix;
++
++ if ((!fmt) || (fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)) {
++ printk("Invalid format\n");
++ return -EINVAL;
++ }
++ pix = &(fmt->fmt.pix);
+
+ isize = ov96xx_find_size(pix->width, pix->height);
++
+ pix->width = ov96xx_sizes[isize].width;
+ pix->height = ov96xx_sizes[isize].height;
++
+ for (ifmt = 0; ifmt < NUM_CAPTURE_FORMATS; ifmt++) {
+ if (pix->pixelformat == ov96xx_formats[ifmt].fourcc)
+ break;
+ }
+ if (ifmt == NUM_CAPTURE_FORMATS)
-+ ifmt = 0;
++ ifmt = 0; /* default to first format */
++
+ pix->pixelformat = ov96xx_formats[ifmt].fourcc;
+ pix->field = V4L2_FIELD_NONE;
-+ pix->bytesperline = pix->width*2;
-+ pix->sizeimage = pix->bytesperline*pix->height;
++ pix->bytesperline = pix->width * (ov96xx_formats[ifmt].depth <= 8 ? 1 : 2);
++ printk("%s bytesperline = %d\n", __func__, pix->bytesperline);
++ pix->sizeimage = pix->bytesperline * pix->height;
+ pix->priv = 0;
+ switch (pix->pixelformat) {
+ case V4L2_PIX_FMT_YUYV:
@@ -1341,116 +1295,65 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ width_flag;
+}
+
-+static int ov96xx_set_fmt_cap(struct soc_camera_device *icd,/*struct v4l2_int_device *s,*/
-+ struct v4l2_format *f)
++static int ov96xx_set_fmt(struct soc_camera_device *icd,
++ __u32 pixfmt,
++ struct v4l2_rect *rect)
+{
+ struct ov96xx_sensor *ov96xx = container_of(icd, struct ov96xx_sensor, icd);
-+ struct v4l2_pix_format *pix = &f->fmt.pix;
-+ int rval;
-+
-+ rval = ov96xx_try_fmt_cap(icd, f);
-+ if (rval)
-+ return rval;
-+
-+ rval = ov96xx_configure(icd);
++// struct v4l2_pix_format *pix = &fmt->fmt.pix;
++ int ret;
++ int i;
+
-+ if (!rval)
-+ ov96xx->pix = *pix;
++ printk("%s %d 0x%08x\n", __func__, __LINE__, pixfmt);
+
-+ return rval;
-+}
-+
-+static int ioctl_g_fmt_cap(struct v4l2_int_device *s,
-+ struct v4l2_format *f)
-+{
-+ struct ov96xx_sensor *sensor = s->priv;
++ for (i = 0; i < NUM_CAPTURE_FORMATS; i++) {
++ if (pixfmt == ov96xx_formats[i].fourcc) {
++ ov96xx->pix.pixelformat = ov96xx_formats[i].fourcc;
++ icd->current_fmt = &ov96xx_formats[i];
++ break;
++ }
++ }
++ if (i == NUM_CAPTURE_FORMATS)
++ return -EINVAL;
+
-+ f->fmt.pix = sensor->pix;
++ printk("%s %d 0x%08x\n", __func__, __LINE__, pixfmt);
+
-+ return 0;
-+}
++ ov96xx->pix.width = rect->width;
++ ov96xx->pix.height = rect->height;
++/* rval = ov96xx_try_fmt(icd, fmt);
++ if (rval)
++ return rval; */
+
-+// static int ioctl_g_parm(struct v4l2_int_device *s,
-+// struct v4l2_streamparm *a)
-+// {
-+// struct ov96xx_sensor *sensor = s->priv;
-+// struct v4l2_captureparm *cparm = &a->parm.capture;
-+//
-+// if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
-+// return -EINVAL;
-+//
-+// memset(a, 0, sizeof(*a));
-+// a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+//
-+// cparm->capability = V4L2_CAP_TIMEPERFRAME;
-+// cparm->timeperframe = sensor->timeperframe;
-+//
-+// return 0;
-+// }
-+//
-+// static int ioctl_s_parm(struct v4l2_int_device *s,
-+// struct v4l2_streamparm *a)
-+// {
-+// struct ov96xx_sensor *sensor = s->priv;
-+// struct v4l2_fract *timeperframe = &a->parm.capture.timeperframe;
-+// struct v4l2_fract timeperframe_old;
-+// int rval;
-+//
-+// timeperframe_old = sensor->timeperframe;
-+// sensor->timeperframe = *timeperframe;
-+//
-+// rval = ov96xx_configure(s);
-+//
-+// if (rval)
-+// sensor->timeperframe = timeperframe_old;
-+// else
-+// *timeperframe = sensor->timeperframe;
-+//
-+// return rval;
-+// }
-+//
-+// static int ioctl_g_ifparm(struct v4l2_int_device *s, struct v4l2_ifparm *p)
-+// {
-+// struct ov96xx_sensor *sensor = s->priv;
-+//
-+// return sensor->pdata->ifparm(p);
-+// }
-+//
-+// static int ioctl_s_power(struct v4l2_int_device *s, int on)
-+// {
-+// struct ov96xx_sensor *sensor = s->priv;
-+//
-+// return sensor->pdata->power_set(on);
-+// }
++ ret = ov96xx_configure(icd);
+
++/* if (!ret)
++ ov96xx->pix = *pix; */
+
-+static int ov96xx_init(struct soc_camera_device *icd)
-+{
-+ printk("%s\n", __func__);
-+ return ov96xx_configure(icd);
++ return ret;
+}
+
-+static int ioctl_dev_exit(struct v4l2_int_device *s)
++static void ov96xx_reset(struct i2c_client *client)
+{
-+ return 0;
++ ov96xx_write(client, REG_COM7, COM7_RESET);
++ msleep(1);
+}
+
-+static int ioctl_dev_init(struct v4l2_int_device *s)
++static int ov96xx_init(struct soc_camera_device *icd)
+{
-+ struct ov96xx_sensor *sensor = s->priv;
-+ struct i2c_client *c = sensor->i2c_client;
-+ int err;
++ struct ov96xx_sensor *ov96xx = container_of(icd, struct ov96xx_sensor, icd);
++ struct soc_camera_link *icl = ov96xx->i2c_client->dev.platform_data;
++ int ret;
+
-+ err = ov96xx_detect(c);
-+ if (err < 0) {
-+ dev_err(&c->dev, "Unable to detect " DRIVER_NAME " sensor\n");
-+ return err;
++ if (icl->power) {
++ ret = icl->power(&ov96xx->i2c_client->dev, 1);
++ if (ret < 0) {
++ dev_err(icd->vdev->parent,
++ "Platform failed to power-on the camera.\n");
++ return ret;
++ }
+ }
+
-+ sensor->ver = err;
-+ pr_info(DRIVER_NAME " chip version 0x%02x detected\n", sensor->ver);
-+
-+ return 0;
++ return 0; /*ov96xx_configure(icd);*/
+}
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -1488,66 +1391,17 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ if (reg->match_chip != ov96xx->i2c_client->addr)
+ return -ENODEV;
+
-+ ret = ov96xx_write_reg(ov96xx->i2c_client, (u8)reg->reg, (u8)reg->val);
++ ret = ov96xx_write(ov96xx->i2c_client, (u8)reg->reg, (u8)reg->val);
+ if (ret)
+ return ret;
+
+ return 0;
+}
-+#endif
-+// static struct v4l2_int_ioctl_desc ov96xx_ioctl_desc[] = {
-+// { vidioc_int_dev_init_num,
-+// (v4l2_int_ioctl_func *)ioctl_dev_init },
-+// { vidioc_int_dev_exit_num,
-+// (v4l2_int_ioctl_func *)ioctl_dev_exit },
-+// { vidioc_int_s_power_num,
-+// (v4l2_int_ioctl_func *)ioctl_s_power },
-+// /* { vidioc_int_g_ext_clk_num,
-+// (v4l2_int_ioctl_func *)ioctl_g_ext_clk },*/
-+// { vidioc_int_g_ifparm_num,
-+// (v4l2_int_ioctl_func *)ioctl_g_ifparm },
-+// /* { vidioc_int_s_ext_clk_num,
-+// (v4l2_int_ioctl_func *)ioctl_s_ext_clk },*/
-+// { vidioc_int_init_num,
-+// (v4l2_int_ioctl_func *)ioctl_init },
-+// { vidioc_int_enum_fmt_cap_num,
-+// (v4l2_int_ioctl_func *)ioctl_enum_fmt_cap },
-+// { vidioc_int_try_fmt_cap_num,
-+// (v4l2_int_ioctl_func *)ioctl_try_fmt_cap },
-+// { vidioc_int_g_fmt_cap_num,
-+// (v4l2_int_ioctl_func *)ioctl_g_fmt_cap },
-+// { vidioc_int_s_fmt_cap_num,
-+// (v4l2_int_ioctl_func *)ioctl_s_fmt_cap },
-+// { vidioc_int_g_parm_num,
-+// (v4l2_int_ioctl_func *)ioctl_g_parm },
-+// { vidioc_int_s_parm_num,
-+// (v4l2_int_ioctl_func *)ioctl_s_parm },
-+// { vidioc_int_queryctrl_num,
-+// (v4l2_int_ioctl_func *)ioctl_queryctrl },
-+// { vidioc_int_g_ctrl_num,
-+// (v4l2_int_ioctl_func *)ioctl_g_ctrl },
-+// { vidioc_int_s_ctrl_num,
-+// (v4l2_int_ioctl_func *)ioctl_s_ctrl },
-+// };
-+//
-+// static struct v4l2_int_slave ov96xx_slave = {
-+// .ioctls = ov96xx_ioctl_desc,
-+// .num_ioctls = ARRAY_SIZE(ov96xx_ioctl_desc),
-+// };
-+//
-+// static struct v4l2_int_device ov96xx_int_device = {
-+// .module = THIS_MODULE,
-+// .name = DRIVER_NAME,
-+// .priv = &ov96xx,
-+// .type = v4l2_int_type_slave,
-+// .u = {
-+// .slave = &ov96xx_slave,
-+// },
-+// };
-+
++#endif /* CONFIG_VIDEO_ADV_DEBUG */
+
+static u8 current_reg_addr;
+
++#ifdef DEBUG
+static int ov96xx_proc_read_register( __attribute__ ((unused)) struct file *file, const char *buf, unsigned long count, void *data)
+{
+ int len;
@@ -1601,12 +1455,9 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ return -EFAULT;
+ }
+
-+ ov96xx_read_reg(i2c_client, current_reg_addr, ®_val);
-+ printk("Read 0x%02x @ 0x%02x\n", reg_val, current_reg_addr);
-+
+ reg_val = (u8)(simple_strtol(given_param, 0, 16));
-+ printk("Writing+ 0x%02x @ 0x%02x\n", reg_val, current_reg_addr);
-+// ret = ov96xx_write_reg(i2c_client, current_reg_addr, reg_val);
++ printk("Writing 0x%02x @ 0x%02x\n", reg_val, current_reg_addr);
++/* ret = ov96xx_write(i2c_client, current_reg_addr, reg_val); */
+ ret = i2c_smbus_write_byte_data(i2c_client, current_reg_addr, reg_val);
+ udelay(100);
+ if (ret) {
@@ -1615,20 +1466,33 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+
+ return len;
+}
++#endif /* DEBUG */
++
+
+/* Interface active, can use i2c. If it fails, it can indeed mean, that
+ * this wasn't our capture interface, so, we wait for the right one */
+static int ov96xx_video_probe(struct soc_camera_device *icd)
+{
+ struct ov96xx_sensor *ov96xx = container_of(icd, struct ov96xx_sensor, icd);
++ struct soc_camera_link *icl = ov96xx->i2c_client->dev.platform_data;
++#ifdef DEBUG
+ struct proc_dir_entry *proc_read, *proc_write;
++#endif
+ struct i2c_client *client = ov96xx->i2c_client;
+ int version, ret;
+
+ /* Make the default capture format QCIF RGB565 */
-+ ov96xx->pix.width = ov96xx_sizes[QCIF].width;
++/* ov96xx->pix.width = ov96xx_sizes[QCIF].width;
+ ov96xx->pix.height = ov96xx_sizes[QCIF].height;
-+ ov96xx->pix.pixelformat = V4L2_PIX_FMT_RGB565;
++ ov96xx->pix.pixelformat = V4L2_PIX_FMT_RGB565; */
++
++ if (icl->reset) {
++ ret = icl->reset(&ov96xx->i2c_client->dev);
++ } else {
++ dev_info(&client->dev, "No hardware reset available,"
++ " using soft one\n");
++ ov96xx_reset(client); /* soft reset */
++ }
+
+ version = ov96xx_detect(client);
+ if (version < 0) {
@@ -1638,6 +1502,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+
+ dev_info(&icd->dev, "Detected an ov96%02x sensor\n", version);
+// switch (version) { ??
++ ov96xx->model = V4L2_IDENT_OV9653;
+ icd->formats = ov96xx_formats;
+ icd->num_formats = ARRAY_SIZE(ov96xx_formats);
+
@@ -1646,6 +1511,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ if (ret)
+ goto err;
+
++#ifdef DEBUG
+ /* create proc files */
+ proc_read = create_proc_entry("driver/ovread", S_IWUSR | S_IRGRP | S_IROTH, NULL);
+ proc_write = create_proc_entry("driver/ovwrite", S_IWUSR | S_IRGRP | S_IROTH, NULL);
@@ -1658,6 +1524,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ proc_write->write_proc = ov96xx_proc_write_register;
+ proc_write->data = client;
+ }
++#endif
+
+ /* Now that we know the model, we can start video */
+ ret = soc_camera_video_start(icd);
@@ -1676,19 +1543,62 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+
+ dev_dbg(&icd->dev, "Video %x removed: %p, %p\n", ov96xx->i2c_client->addr,
+ ov96xx->icd.dev.parent, ov96xx->icd.vdev);
-+ soc_camera_video_stop(&ov96xx->icd);
++ soc_camera_video_stop(icd);
++}
++
++static int ov96xx_suspend(struct soc_camera_device *icd, pm_message_t state)
++{
++ struct ov96xx_sensor *ov96xx = container_of(icd, struct ov96xx_sensor, icd);
++ struct soc_camera_link *icl = ov96xx->i2c_client->dev.platform_data;
++ int ret;
++
++ printk("--- %s %d\n", __func__, state.event);
++
++ /* supposing camera link power() is a powerdown: */
++ if (icl->power) {
++ ret = icl->power(&ov96xx->i2c_client->dev, 0);
++ if (ret < 0) {
++ dev_err(icd->vdev->parent,
++ "Platform failed to powerdown the camera.\n");
++ return ret;
++ }
++ }
++
++ return 0;
++}
++
++static int ov96xx_resume(struct soc_camera_device *icd)
++{
++ struct ov96xx_sensor *ov96xx = container_of(icd, struct ov96xx_sensor, icd);
++ struct soc_camera_link *icl = ov96xx->i2c_client->dev.platform_data;
++ int ret;
++
++ printk("--- %s\n", __func__);
++
++ if (icl->power) {
++ ret = icl->power(&ov96xx->i2c_client->dev, 1);
++ if (ret < 0) {
++ dev_err(icd->vdev->parent,
++ "Platform failed to resume the camera.\n");
++ return ret;
++ }
++ }
++
++ return 0;
+}
+
+static struct soc_camera_ops ov96xx_ops = {
+ .owner = THIS_MODULE,
+ .probe = ov96xx_video_probe,
+ .remove = ov96xx_video_remove,
++ .suspend = ov96xx_suspend,
++ .resume = ov96xx_resume,
+ .init = ov96xx_init,
+ .release = ov96xx_release,
+ .start_capture = ov96xx_start_capture,
+ .stop_capture = ov96xx_stop_capture,
-+ .set_fmt = ov96xx_set_fmt_cap,
-+ .try_fmt = ov96xx_try_fmt_cap,
++ .set_fmt = ov96xx_set_fmt,
++ .try_fmt = ov96xx_try_fmt,
+ .set_bus_param = ov96xx_set_bus_param,
+ .query_bus_param = ov96xx_query_bus_param,
+ .controls = ov96xx_controls,
@@ -1702,16 +1612,10 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+#endif
+};
+
-+// static struct ov96xx_sensor ov96xx = {
-+// .timeperframe = {
-+// .numerator = 1,
-+// .denominator = 15,
-+// },
-+// };
-+
-+static int __init
-+ov96xx_probe(struct i2c_client *client, const struct i2c_device_id *did)
++static int __init ov96xx_probe(struct i2c_client *client,
++ const struct i2c_device_id *did)
+{
++
+ struct ov96xx_sensor *ov96xx;
+ struct soc_camera_device *icd;
+ struct soc_camera_link *icl = client->dev.platform_data;
@@ -1719,21 +1623,12 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+
+ if (!icl) {
+ dev_err(&client->dev, DRIVER_NAME " driver needs platform data\n");
-+// return -EINVAL;
++ return -EINVAL;
+ }
+
-+ printk("%s\n", __func__);
-+
+ if (i2c_get_clientdata(client))
+ return -EBUSY;
+
-+// sensor->pdata = client->dev.platform_data;
-+//
-+// if (!sensor->pdata || !sensor->pdata->default_regs) {
-+// dev_err(&client->dev, "no platform data?\n");
-+// // return -ENODEV;
-+// }
-+
+ ov96xx = kzalloc(sizeof(struct ov96xx_sensor), GFP_KERNEL);
+ if (!ov96xx)
+ return -ENOMEM;
@@ -1755,7 +1650,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+ icd->height_min = 72;
+ icd->height_max = 1024;
+ icd->y_skip_top = 1;
-+// icd->iface = icl->bus_id;
++/* icd->iface = icl->bus_id; XXX */
+
+ ret = soc_camera_device_register(icd);
+ if (ret)
@@ -1763,28 +1658,23 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+
+ return 0;
+
-+/* err = v4l2_int_device_register(sensor->v4l2_int_device);
-+ if (err)
-+ i2c_set_clientdata(client, NULL);*/
-+
+err:
++ i2c_set_clientdata(client, NULL);
+ kfree(ov96xx);
+ return ret;
+}
+
-+static int __exit
-+ov96xx_remove(struct i2c_client *client)
++static int __exit ov96xx_remove(struct i2c_client *client)
+{
+ struct ov96xx_sensor *ov96xx = i2c_get_clientdata(client);
+
+ if (!client->adapter)
+ return -ENODEV; /* our client isn't attached */
-+
++#ifdef DEBUG
+ remove_proc_entry("driver/ovread", NULL);
+ remove_proc_entry("driver/ovwrite", NULL);
-+
++#endif
+ soc_camera_device_unregister(&ov96xx->icd);
-+// v4l2_int_device_unregister(sensor->v4l2_int_device);
+ i2c_set_clientdata(client, NULL);
+ kfree(ov96xx);
+
@@ -1810,6 +1700,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+
+static int __init ov96xx_mod_init(void)
+{
++ printk(KERN_NOTICE "OmniVision ov96xx sensor driver, at your service\n");
+ return i2c_add_driver(&ov96xx_i2c_driver);
+}
+
@@ -1821,6 +1712,6 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+module_init(ov96xx_mod_init);
+module_exit(ov96xx_mod_exit);
+
-+MODULE_DESCRIPTION("OV96xx camera sensor driver");
++MODULE_DESCRIPTION("SoC camera driver for OV96xx");
+MODULE_AUTHOR("Julien Boibessot <jul...@ar...>");
+MODULE_LICENSE("GPL");
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-07-04 16:30:06
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0b5e7db124792b662fd241a36b401aac18b031f5 (commit)
via 9220fcec98485f5f9cd115124bbad52aecbb049c (commit)
via 697b390371644ee5673a1161b936f4f97f80f464 (commit)
via 7003c1780e82ffd3f13c1054f8437da4c30c0916 (commit)
via ead0d3b37adff6496648e8b5275d55c9f80515aa (commit)
via 72b6b59372286401b3c98187d0530762ca635e67 (commit)
from 5d8ba1710593b2adc5d5a0290c22a1d8e7fd0b3a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0b5e7db124792b662fd241a36b401aac18b031f5
Merge: 9220fcec98485f5f9cd115124bbad52aecbb049c 5d8ba1710593b2adc5d5a0290c22a1d8e7fd0b3a
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jul 4 18:29:34 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 9220fcec98485f5f9cd115124bbad52aecbb049c
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jul 4 18:26:39 2010 +0200
[BUILDROOT] [2010.05] Add pywebradio, e-uae & opentyrian packages
commit 697b390371644ee5673a1161b936f4f97f80f464
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jul 4 17:49:09 2010 +0200
[LINUX] Add vivi (v4l test driver) to default apf27 configs
commit 7003c1780e82ffd3f13c1054f8437da4c30c0916
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jul 4 17:38:32 2010 +0200
[BUILDROOT] [2010.05] Reactivates ad9889, fpgaregs and imxregs in default APF27 config
commit ead0d3b37adff6496648e8b5275d55c9f80515aa
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 29 14:28:06 2010 +0200
[BUILD] Updates some envt variables for BR 2010.05
commit 72b6b59372286401b3c98187d0530762ca635e67
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 29 14:26:58 2010 +0200
[BUILDROOT] [2010.05] Makes the configurations correctly detected
-----------------------------------------------------------------------
Summary of changes:
Makefile | 6 +-
Makefile.in | 6 +-
buildroot/configs/apf27_defconfig | 8 +-
.../{apf27_defconfig => apf27_webradio_defconfig} | 101 ++++++++++++++++----
buildroot/local/apf27_test/linux-2.6.29.4.config | 5 +-
.../armadeus/apf27/apf27-linux-2.6.29.config | 7 +-
.../2010.05/123-pywebradio-add_package.patch | 56 +++++++++++
.../buildroot/2010.05/124-e-uae-add_package.patch | 54 +++++++++++
.../2010.05/125-opentyrian-add_package.patch | 83 ++++++++++++++++
patches/buildroot/2010.05/cleanup_buildroot.sh | 3 +
10 files changed, 298 insertions(+), 31 deletions(-)
copy buildroot/configs/{apf27_defconfig => apf27_webradio_defconfig} (91%)
create mode 100644 patches/buildroot/2010.05/123-pywebradio-add_package.patch
create mode 100644 patches/buildroot/2010.05/124-e-uae-add_package.patch
create mode 100644 patches/buildroot/2010.05/125-opentyrian-add_package.patch
diff --git a/Makefile b/Makefile
index b05addc..9c3cf13 100644
--- a/Makefile
+++ b/Makefile
@@ -31,10 +31,12 @@ ifeq ($(BUILDROOT_VERSION),)
BUILDROOT_VERSION:=20081103
BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot
+ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/target/device/armadeus
else
#BUILDROOT_VERSION:=2010.05
BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
+ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
endif
#--- End of user conf (don't touch anything below unless you know what you're doing !! ;-) )
@@ -51,7 +53,7 @@ ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
echo " "; \
echo " System not configured. Use make <board>_defconfig " >&2; \
echo " armadeus valid configurations are: " >&2; \
- echo " "$(shell find $(BUILDROOT_DIR)/target/device/armadeus -name *_defconfig|sed 's/.*\///');\
+ echo " "$(shell find $(ARMADEUS_CONFIG_DIR) -name "apf*_defconfig" | sed 's/.*\///');\
echo " "; \
echo -en "\033[0m";
@@ -146,7 +148,7 @@ linux26-clean: $(BUILDROOT_DIR)/.configured
@$(MAKE) -C $(BUILDROOT_DIR) linux26clean
%_defconfig: $(BUILDROOT_DIR)/.patched
- @if [ -e "$(BUILDROOT_DIR)/target/device/armadeus/$(patsubst %_defconfig,%,$@)/$@" ]; then \
+ @if [ -e "$(ARMADEUS_CONFIG_DIR)/$@" ] || [ -e "$(ARMADEUS_CONFIG_DIR)/$(patsubst %_defconfig,%,$@)/$@" ]; then \
rm -f $(BUILDROOT_DIR)/.config ; \
$(MAKE) -C $(BUILDROOT_DIR) $@ ; \
$(MAKE) -C $(BUILDROOT_DIR) menuconfig ; \
diff --git a/Makefile.in b/Makefile.in
index 8934896..f674b4b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,11 +46,15 @@ BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_AR
BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_DIR)/toolchain_build_$(ARMADEUS_TARGET_ARCH)
BUILDROOT_BUILD_DIR:=$(BUILDROOT_DIR)/build_$(ARMADEUS_TARGET_ARCH)
ARMADEUS_BINARIES:=$(BUILDROOT_DIR)/binaries/$(ARMADEUS_PROJECT_NAME)
+ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/root
+ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.arm.tar
else
BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_DIR)/output/build
BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_DIR)/output/toolchain
BUILDROOT_BUILD_DIR:=$(BUILDROOT_DIR)/output/build
ARMADEUS_BINARIES:=$(BUILDROOT_DIR)/output/images
+ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_DIR)/output/target
+ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/rootfs.tar
endif
ARMADEUS_LINUX_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/linux-$(ARMADEUS_LINUX_VERSION)
@@ -58,8 +62,6 @@ ARMADEUS_LINUX_PATCH_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/linux/kernel-p
ARMADEUS_U_BOOT_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/u-boot-$(ARMADEUS_U_BOOT_VERSION)
ARMADEUS_UCLIBC_DIR:=$(BUILDROOT_TOOLCHAIN_BUILD_DIR)/uClibc-$(ARMADEUS_UCLIBC_VERSION)
ARMADEUS_BOARD_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/$(ARMADEUS_BOARD_NAME)
-ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/root
-ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.arm.tar
ARMADEUS_STAGING_DIR:=$(BUILDROOT_BUILD_DIR)/staging_dir
ARMADEUS_TOOLCHAIN_PATH:=$(ARMADEUS_STAGING_DIR)/usr/bin
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index c6494b9..7adfbc6 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Wed Jun 23 14:22:58 2010
+# Sun Jul 4 16:19:24 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.05"
@@ -274,12 +274,12 @@ BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION
#
# Armadeus specific tools/utilities
#
-# BR2_PACKAGE_AD9889CTRL is not set
+BR2_PACKAGE_AD9889CTRL=y
# BR2_PACKAGE_AS_DEVICES is not set
# BR2_PACKAGE_CH7024CTRL is not set
# BR2_PACKAGE_ARMADEUS_DEMOS is not set
-# BR2_PACKAGE_FPGAREGS is not set
-# BR2_PACKAGE_IMXREGS is not set
+BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_webradio_defconfig
similarity index 91%
copy from buildroot/configs/apf27_defconfig
copy to buildroot/configs/apf27_webradio_defconfig
index c6494b9..6166cbd 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Wed Jun 23 14:22:58 2010
+# Sun Jul 4 16:19:24 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.05"
@@ -96,7 +96,7 @@ BR2_GIT="git clone"
BR2_ZCAT="gzip -d -c"
BR2_BZCAT="bzcat"
BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/../downloads"
+BR2_DL_DIR="/local/downloads"
BR2_COPYTO=""
BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
@@ -274,12 +274,12 @@ BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION
#
# Armadeus specific tools/utilities
#
-# BR2_PACKAGE_AD9889CTRL is not set
+BR2_PACKAGE_AD9889CTRL=y
# BR2_PACKAGE_AS_DEVICES is not set
# BR2_PACKAGE_CH7024CTRL is not set
# BR2_PACKAGE_ARMADEUS_DEMOS is not set
-# BR2_PACKAGE_FPGAREGS is not set
-# BR2_PACKAGE_IMXREGS is not set
+BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
@@ -288,6 +288,7 @@ BR2_PACKAGE_MAX5821CTRL=y
# Audio and video libraries and applications
#
BR2_PACKAGE_ALSA_LIB=y
+# BR2_PACKAGE_ALSA_LIB_PYTHON is not set
#
# ALSA lib selection
@@ -330,7 +331,7 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
# BR2_PACKAGE_LIBDVDREAD is not set
# BR2_PACKAGE_LIBDVDNAV is not set
# BR2_PACKAGE_LIBID3TAG is not set
-# BR2_PACKAGE_LIBMAD is not set
+BR2_PACKAGE_LIBMAD=y
# BR2_PACKAGE_LIBMMS is not set
# BR2_PACKAGE_LIBMPD is not set
# BR2_PACKAGE_LIBOGG is not set
@@ -339,7 +340,8 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
# BR2_PACKAGE_LIBVORBIS is not set
# BR2_PACKAGE_MADPLAY is not set
# BR2_PACKAGE_MPG123 is not set
-# BR2_PACKAGE_MPLAYER is not set
+BR2_PACKAGE_MPLAYER=y
+BR2_PACKAGE_PYWEBRADIO=y
# BR2_PACKAGE_SPEEX is not set
# BR2_PACKAGE_SWFDEC is not set
# BR2_PACKAGE_FESTIVAL is not set
@@ -394,6 +396,7 @@ BR2_PACKAGE_STRACE=y
#
# Games
#
+# BR2_PACKAGE_E_UAE is not set
# BR2_PACKAGE_GNUCHESS is not set
# BR2_PACKAGE_PRBOOM is not set
# BR2_PACKAGE_SDLQUAKE is not set
@@ -415,7 +418,55 @@ BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_FBV is not set
# BR2_PACKAGE_IMAGEMAGICK is not set
# BR2_PACKAGE_LINUX_FUSION is not set
-# BR2_PACKAGE_SDL is not set
+BR2_PACKAGE_PYGAME=y
+
+#
+# pygame optional modules selection
+#
+BR2_PACKAGE_PYGAME_IMAGE=y
+
+#
+# Image formats
+#
+BR2_PACKAGE_PYGAME_IMAGE_PNG=y
+BR2_PACKAGE_PYGAME_IMAGE_JPEG=y
+BR2_PACKAGE_PYGAME_FONT=y
+BR2_PACKAGE_PYGAME_MIXER=y
+BR2_PACKAGE_PYGAME_MIXER_MUSIC=y
+
+#
+# pygame.sndarray depends on Python's Numeric extension that is not (yet) supported
+#
+
+#
+# pygame.surfarray depends on Python's Numeric extension that is not (yet) supported
+#
+# BR2_PACKAGE_PYGAME_MOVIE is not set
+BR2_PACKAGE_SDL=y
+BR2_PACKAGE_SDL_FBCON=y
+BR2_PACKAGE_SDL_IMAGE=y
+
+#
+# SDL_image file format support
+#
+BR2_PACKAGE_SDL_IMAGE_BMP=y
+BR2_PACKAGE_SDL_IMAGE_GIF=y
+BR2_PACKAGE_SDL_IMAGE_JPEG=y
+# BR2_PACKAGE_SDL_IMAGE_LBM is not set
+# BR2_PACKAGE_SDL_IMAGE_PCX is not set
+BR2_PACKAGE_SDL_IMAGE_PNG=y
+# BR2_PACKAGE_SDL_IMAGE_PNM is not set
+# BR2_PACKAGE_SDL_IMAGE_TARGA is not set
+# BR2_PACKAGE_SDL_IMAGE_TIFF is not set
+# BR2_PACKAGE_SDL_IMAGE_XCF is not set
+# BR2_PACKAGE_SDL_IMAGE_XPM is not set
+# BR2_PACKAGE_SDL_IMAGE_XV is not set
+BR2_PACKAGE_SDL_MIXER=y
+# BR2_PACKAGE_SDL_SOUND is not set
+BR2_PACKAGE_SDL_NET=y
+BR2_PACKAGE_SDL_TTF=y
+# BR2_PACKAGE_SDL_GFX is not set
+# BR2_PACKAGE_SLIDESHOW is not set
#
# Demos
@@ -448,10 +499,7 @@ BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_CDRKIT is not set
# BR2_PACKAGE_CRAMFS is not set
# BR2_PACKAGE_CWIID is not set
-
-#
-# dbus not available (need expat or libxml2)
-#
+# BR2_PACKAGE_DBUS is not set
# BR2_PACKAGE_DMRAID is not set
# BR2_PACKAGE_DOSFSTOOLS is not set
# BR2_PACKAGE_E2FSPROGS is not set
@@ -526,6 +574,7 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_SMARTMONTOOLS is not set
# BR2_PACKAGE_SQUASHFS is not set
# BR2_PACKAGE_SYSSTAT is not set
+BR2_PACKAGE_URG=y
# BR2_PACKAGE_USB_MODESWITCH is not set
# BR2_PACKAGE_USBMOUNT is not set
# BR2_PACKAGE_USBUTILS is not set
@@ -540,7 +589,25 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_LUA is not set
# BR2_PACKAGE_MICROPERL is not set
# BR2_PACKAGE_PHP is not set
-# BR2_PACKAGE_PYTHON is not set
+BR2_PACKAGE_PYTHON=y
+# BR2_PACKAGE_PYTHON_DEV is not set
+BR2_PACKAGE_PYTHON_PY_ONLY=y
+# BR2_PACKAGE_PYTHON_PYC_ONLY is not set
+# BR2_PACKAGE_PYTHON_PY_PYC is not set
+
+#
+# The following modules are unusual or require extra libraries
+#
+# BR2_PACKAGE_PYTHON_BSDDB is not set
+BR2_PACKAGE_PYTHON_CODECSCJK=y
+# BR2_PACKAGE_PYTHON_CURSES is not set
+BR2_PACKAGE_PYTHON_PYEXPAT=y
+# BR2_PACKAGE_PYTHON_READLINE is not set
+# BR2_PACKAGE_PYTHON_SSL is not set
+# BR2_PACKAGE_PYTHON_TKINTER is not set
+BR2_PACKAGE_PYTHON_UNICODEDATA=y
+# BR2_PACKAGE_PYSERIAL is not set
+# BR2_PACKAGE_PYMYSQL is not set
# BR2_PACKAGE_RUBY is not set
# BR2_PACKAGE_TCL is not set
@@ -586,10 +653,10 @@ BR2_PACKAGE_ZLIB=y
# BR2_PACKAGE_ATK is not set
# BR2_PACKAGE_CAIRO is not set
# BR2_PACKAGE_FONTCONFIG is not set
-# BR2_PACKAGE_FREETYPE is not set
-# BR2_PACKAGE_JPEG is not set
+BR2_PACKAGE_FREETYPE=y
+BR2_PACKAGE_JPEG=y
# BR2_PACKAGE_LIBART is not set
-# BR2_PACKAGE_LIBPNG is not set
+BR2_PACKAGE_LIBPNG=y
# BR2_PACKAGE_LIBUNGIF is not set
# BR2_PACKAGE_MESALIB is not set
# BR2_PACKAGE_PANGO is not set
@@ -658,7 +725,7 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
#
# XML
#
-# BR2_PACKAGE_EXPAT is not set
+BR2_PACKAGE_EXPAT=y
# BR2_PACKAGE_EZXML is not set
# BR2_PACKAGE_LIBXML_PARSER_PERL is not set
# BR2_PACKAGE_LIBXML2 is not set
diff --git a/buildroot/local/apf27_test/linux-2.6.29.4.config b/buildroot/local/apf27_test/linux-2.6.29.4.config
index cd0fe9b..e897f72 100644
--- a/buildroot/local/apf27_test/linux-2.6.29.4.config
+++ b/buildroot/local/apf27_test/linux-2.6.29.4.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Wed Jun 23 08:59:05 2010
+# Wed Jun 30 15:23:25 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1065,6 +1065,7 @@ CONFIG_MEDIA_TUNER_CUSTOMIZE=y
# CONFIG_MEDIA_TUNER_MXL5007T is not set
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_VMALLOC=m
CONFIG_VIDEOBUF_DMA_CONTIG=m
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
@@ -1125,7 +1126,7 @@ CONFIG_VIDEO_AD9889=m
#
# CONFIG_VIDEO_UPD64031A is not set
# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_VIVI is not set
+CONFIG_VIDEO_VIVI=m
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
CONFIG_SOC_CAMERA=m
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
index 321519a..d2b1a6a 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Wed Jun 23 08:59:05 2010
+# Wed Jun 30 15:23:25 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1062,6 +1062,7 @@ CONFIG_MEDIA_TUNER_CUSTOMIZE=y
# CONFIG_MEDIA_TUNER_MXL5007T is not set
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_VMALLOC=m
CONFIG_VIDEOBUF_DMA_CONTIG=m
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
@@ -1122,7 +1123,7 @@ CONFIG_VIDEO_AD9889=m
#
# CONFIG_VIDEO_UPD64031A is not set
# CONFIG_VIDEO_UPD64083 is not set
-# CONFIG_VIDEO_VIVI is not set
+CONFIG_VIDEO_VIVI=m
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
CONFIG_SOC_CAMERA=m
@@ -1191,10 +1192,8 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
# CONFIG_LCD_LTV350QV is not set
# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_HX5116 is not set
# CONFIG_LCD_TDO24M is not set
# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LCD_P0340WQL is not set
# CONFIG_LCD_PLATFORM is not set
CONFIG_BACKLIGHT_CLASS_DEVICE=m
CONFIG_BACKLIGHT_GENERIC=m
diff --git a/patches/buildroot/2010.05/123-pywebradio-add_package.patch b/patches/buildroot/2010.05/123-pywebradio-add_package.patch
new file mode 100644
index 0000000..ff919e7
--- /dev/null
+++ b/patches/buildroot/2010.05/123-pywebradio-add_package.patch
@@ -0,0 +1,56 @@
+Index: buildroot/package/multimedia/Config.in
+===================================================================
+--- buildroot.orig/package/multimedia/Config.in 2010-06-27 18:58:38.000000000 +0200
++++ buildroot/package/multimedia/Config.in 2010-06-29 09:30:18.000000000 +0200
+@@ -23,6 +23,7 @@
+ source "package/multimedia/madplay/Config.in"
+ source "package/multimedia/mpg123/Config.in"
+ source "package/multimedia/mplayer/Config.in"
++source "package/pywebradio/Config.in"
+ source "package/multimedia/speex/Config.in"
+ source "package/multimedia/swfdec/Config.in"
+ source "package/multimedia/festival/Config.in"
+Index: buildroot/package/pywebradio/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/pywebradio/Config.in 2010-06-29 09:30:18.000000000 +0200
+@@ -0,0 +1,6 @@
++config BR2_PACKAGE_PYWEBRADIO
++ bool "pywebradio"
++ help
++ Play web radios
++
++ http://www.pystream.info/
+Index: buildroot/package/pywebradio/pywebradio.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/pywebradio/pywebradio.mk 2010-07-04 18:13:38.000000000 +0200
+@@ -0,0 +1,28 @@
++#############################################################
++#
++# pywebradio
++#
++#############################################################
++
++PYWEBRADIO_TRUNK:=http://forge.doumenc.org/svn/pyqtradio/trunk
++PYWEBRADIO_SITE:=
++PYWEBRADIO_VERSION:=381
++PYWEBRADIO_NAME:=pywebradio-svn-r$(PYWEBRADIO_VERSION)
++PYWEBRADIO_DIR:=$(BUILD_DIR)/$(PYWEBRADIO_NAME)
++PYWEBRADIO_SOURCE:=$(PYWEBRADIO_NAME).tar.bz2
++
++# GENTARGETS do not allow to get sources from SVN ??
++#$(DL_DIR)/$(PYWEBRADIO_SOURCE):
++# $(SVN_CO) -r $(PYWEBRADIO_VERSION) $(PYWEBRADIO_TRUNK) $(PYWEBRADIO_DIR)
++# tar -cv -C $(BUILD_DIR) $(PYWEBRADIO_NAME) | bzip2 - -c > $@
++
++define PYWEBRADIO_INSTALL_TARGET_CMDS
++ cd $(@D); \
++ python install.py -v -i pygame \
++ -s /usr/share/radio \
++ -c /etc/radio \
++ -e /usr/bin \
++ -p $(TARGET_DIR)
++endef
++
++$(eval $(call GENTARGETS,package,pywebradio))
diff --git a/patches/buildroot/2010.05/124-e-uae-add_package.patch b/patches/buildroot/2010.05/124-e-uae-add_package.patch
new file mode 100644
index 0000000..88515ef
--- /dev/null
+++ b/patches/buildroot/2010.05/124-e-uae-add_package.patch
@@ -0,0 +1,54 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-29 11:20:37.000000000 +0200
++++ buildroot/package/Config.in 2010-07-04 18:03:11.000000000 +0200
+@@ -79,6 +79,7 @@
+ menu "Games"
+ source "package/games/ace_of_penguins/Config.in"
+ source "package/games/doom-wad/Config.in"
++source "package/e-uae/Config.in"
+ source "package/games/gnuchess/Config.in"
+ source "package/games/lxdoom/Config.in"
+ source "package/games/magiccube4d/Config.in"
+Index: buildroot/package/e-uae/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/e-uae/Config.in 2010-07-04 18:05:06.000000000 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_E_UAE
++ bool "e-uae"
++ select BR2_PACKAGE_SDL
++ help
++ This is a version of UAE, the Ubiquitous Amiga Emulator, with an
++ emulation core largely based on WinUAE. It attempts to bring many of
++ the great features of WinUAE to non-Windows platforms.
++
++ http://www.rcdrummond.net/uae/
+Index: buildroot/package/e-uae/e-uae.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/e-uae/e-uae.mk 2010-07-04 18:06:43.000000000 +0200
+@@ -0,0 +1,23 @@
++#############################################################
++#
++# e-uae
++#
++#############################################################
++E_UAE_VERSION:=0.8.29-WIP4
++E_UAE_SITE = http://www.rcdrummond.net/uae/e-uae-$(E_UAE_VERSION)
++E_UAE_SOURCE:=e-uae-$(E_UAE_VERSION).tar.bz2
++
++E_UAE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -g -DSTAT_STATFS2_BSIZE=1"
++
++E_UAE_CONF_OPT = \
++ --with-hostcc=gcc \
++ --disable-ui \
++ --without-x \
++ --without-gtk \
++ --with-zlib=$(STAGING_DIR) \
++ --with-sdl \
++ --with-sdl-sound \
++ --with-sdl-gfx \
++ --with-sdl-prefix=$(STAGING_DIR)/usr
++
++$(eval $(call AUTOTARGETS,package,e-uae))
diff --git a/patches/buildroot/2010.05/125-opentyrian-add_package.patch b/patches/buildroot/2010.05/125-opentyrian-add_package.patch
new file mode 100644
index 0000000..632f007
--- /dev/null
+++ b/patches/buildroot/2010.05/125-opentyrian-add_package.patch
@@ -0,0 +1,83 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-29 11:21:25.000000000 +0200
++++ buildroot/package/Config.in 2010-06-29 11:21:25.000000000 +0200
+@@ -83,6 +83,7 @@
+ source "package/games/gnuchess/Config.in"
+ source "package/games/lxdoom/Config.in"
+ source "package/games/magiccube4d/Config.in"
++source "package/opentyrian/Config.in"
+ source "package/games/prboom/Config.in"
+ source "package/games/quake-pak/Config.in"
+ source "package/games/rubix/Config.in"
+Index: buildroot/package/opentyrian/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/opentyrian/Config.in 2010-06-29 11:21:25.000000000 +0200
+@@ -0,0 +1,11 @@
++config BR2_PACKAGE_OPENTYRIAN
++ bool "OpenTyrian"
++ select BR2_PACKAGE_SDL
++ select BR2_PACKAGE_SDL_NET
++ help
++ OpenTyrian is a port of the DOS shoot-em-up Tyrian. Jason Emery
++ generously gave the OpenTyrian developers a copy of the Tyrian 2.1
++ source code, which has since been ported from Turbo Pascal to C.
++ The port uses SDL, making it easily cross-platform.
++
++ http://code.google.com/p/opentyrian/
+Index: buildroot/package/opentyrian/opentyrian.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/opentyrian/opentyrian.mk 2010-07-04 18:03:01.000000000 +0200
+@@ -0,0 +1,50 @@
++#############################################################
++#
++# OpenTyrian
++#
++#############################################################
++
++OPENTYRIAN_TRUNK:=https://opentyrian.googlecode.com/hg/
++# Opentyrian sources should be checked out from it's main repository (they
++# dont't provide stable versions), but this would require mercurial to be
++# intalled on host system. So I use a custom made tar.bz2
++OPENTYRIAN_SITE:=ftp://ftp2.armadeus.com/armadeusw/download/
++OPENTYRIAN_VERSION:=2a8a946b62bd
++OPENTYRIAN_NAME:=opentyrian-hg-r$(OPENTYRIAN_VERSION)
++OPENTYRIAN_DIR:=$(BUILD_DIR)/$(OPENTYRIAN_NAME)
++OPENTYRIAN_SOURCE:=$(OPENTYRIAN_NAME).tar.bz2
++OPENTYRIAN_CAT=$(BZCAT)
++OPENTYRIAN_DATA:=tyrian21.zip
++OPENTYRIAN_DATA_SITE:=http://camanis.net/tyrian
++
++define OPENTYRIAN_DOWNLOAD_DATA
++ $(call DOWNLOAD,$(OPENTYRIAN_DATA_SITE),$(OPENTYRIAN_DATA))
++ unzip $(DL_DIR)/$(OPENTYRIAN_DATA) -d $(OPENTYRIAN_DIR)
++endef
++
++OPENTYRIAN_POST_EXTRACT_HOOKS += OPENTYRIAN_DOWNLOAD_DATA
++
++define OPENTYRIAN_BUILD_CMDS
++ $(MAKE) PLATFORM=UNIX \
++ CC=$(TARGET_CC) \
++ STRIP="$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)" \
++ SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config \
++ -C $(OPENTYRIAN_DIR) \
++ release
++endef
++
++define OPENTYRIAN_INSTALL_TARGET_CMDS
++ mkdir -p $(TARGET_DIR)/usr/games
++ cp $(@D)/opentyrian $(TARGET_DIR)/usr/games/
++ mkdir -p $(TARGET_DIR)/usr/share/opentyrian/data/
++ cp $(@D)/tyrian21/* $(TARGET_DIR)/usr/share/opentyrian/data/
++ rm -f $(TARGET_DIR)/usr/share/opentyrian/data/*.doc
++ rm -f $(TARGET_DIR)/usr/share/opentyrian/data/*.exe
++endef
++
++define OPENTYRIAN_UNINSTALL_TARGET_CMDS
++ rm -rf $(TARGET_DIR)/usr/share/opentyrian
++ rm -f $(TARGET_DIR)/usr/games/opentyrian
++endef
++
++$(eval $(call GENTARGETS,package,opentyrian))
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index d84d381..7b23b5b 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -41,3 +41,6 @@ rm -rf buildroot/package/fbtest/
rm -rf buildroot/package/xenomai/
rm -rf buildroot/package/cwiid/
rm -rf buildroot/package/urg/
+rm -rf buildroot/package/pywebradio/
+rm -rf buildroot/package/e-uae/
+rm -rf buildroot/package/opentyrian/
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-07-01 12:29:30
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5d8ba1710593b2adc5d5a0290c22a1d8e7fd0b3a (commit)
from 9d9d471c44c8df8d92bd4ccd07de7efb0cd98b73 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5d8ba1710593b2adc5d5a0290c22a1d8e7fd0b3a
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jul 1 14:28:29 2010 +0200
[linux] Working version of as5011 joystick driver
-----------------------------------------------------------------------
Summary of changes:
...us-joystick-adding_as5011_joystick_driver.patch | 362 ++++++++++++++++++--
1 files changed, 334 insertions(+), 28 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
index 71598d7..24292bf 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
@@ -5,8 +5,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-06-25 17:58:01.000000000 +0200
-@@ -0,0 +1,200 @@
++++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-07-01 14:26:46.000000000 +0200
+@@ -0,0 +1,429 @@
+/*
+ * Copyright (c) 2010 Fabien Marteau <fab...@ar...>
+ *
@@ -31,6 +31,9 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ * 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
++ *
++ * TODO:
++ * - Manage power mode
+ */
+
+#include <linux/module.h>
@@ -52,6 +55,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+
+#include <linux/input.h>
+#include <linux/gpio.h>
++#include <linux/workqueue.h>
+
+#include <linux/as5011.h>
+#define DRIVER_DESC "Driver for Austria Microsystems AS5011 joystick"
@@ -61,34 +65,134 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+MODULE_LICENSE("GPL");
+
+#define SIZE_NAME 30
++#define AS5011_MAX_AXIS 80
++#define AS5011_MIN_AXIS (-80)
++#define AS5011_FUZZ 8
++#define AS5011_FLAT 40
++
++static int g_num = 0; /* device counter */
++
++static signed char as5011_i2c_read(struct i2c_client *client,
++ uint8_t aRegAddr);
++static int as5011_i2c_write(struct i2c_client *client,
++ uint8_t aRegAddr,
++ uint8_t aValue);
++
+/*
-+ * input operations
++ * interrupts operations
+ */
+
+static irqreturn_t button_interrupt(int irq, void *dev_id)
+{
+ struct as5011_platform_data *plat_dat = (struct as5011_platform_data *)dev_id;
+ int ret;
++
+ ret = gpio_get_value(plat_dat->button_gpio);
-+ input_report_key(plat_dat->input_dev, BTN_0, 1);
++ if (ret) {
++ input_report_key(plat_dat->input_dev, BTN_JOYSTICK, 0);
++ } else {
++ input_report_key(plat_dat->input_dev, BTN_JOYSTICK, 1);
++ }
+ input_sync(plat_dat->input_dev);
+ return IRQ_HANDLED;
+}
+
++static void as5011_update_axes(struct work_struct *work)
++{
++ struct as5011_platform_data *plat_dat = container_of(work, struct as5011_platform_data, update_axes_work);
++ signed char x, y;
++
++ x = as5011_i2c_read(plat_dat->i2c_client, AS5011_X_RES_INT);
++ y = as5011_i2c_read(plat_dat->i2c_client, AS5011_Y_RES_INT);
++ input_report_abs(plat_dat->input_dev, ABS_X, x);
++ input_report_abs(plat_dat->input_dev, ABS_Y, y);
++ input_sync(plat_dat->input_dev);
++}
++
++static irqreturn_t as5011_int_interrupt(int irq, void *dev_id)
++{
++ struct as5011_platform_data *plat_dat = (struct as5011_platform_data *)dev_id;
++
++ queue_work(plat_dat->workqueue, &plat_dat->update_axes_work);
++
++ return IRQ_HANDLED;
++}
++
+/*
+ * I2C bus operation
+ */
++
++static int as5011_i2c_write(struct i2c_client *client,
++ uint8_t aRegAddr,
++ uint8_t aValue)
++{
++ int ret;
++ uint8_t data[2] = { aRegAddr, aValue };
++ struct i2c_msg msg = { client->addr, I2C_M_IGNORE_NAK, 2, (uint8_t *)data };
++
++ ret = i2c_transfer(client->adapter, &msg, 1);
++ if (ret < 0) {
++ return -EINVAL;
++ }
++ return 1;
++}
++
++static signed char as5011_i2c_read(struct i2c_client *client,
++ uint8_t aRegAddr)
++{
++ int ret;
++ uint8_t data[2];
++ struct i2c_msg msg_set[2];
++ struct i2c_msg msg1 = {client->addr, I2C_M_REV_DIR_ADDR, 1, (uint8_t *)data};
++ struct i2c_msg msg2 = {client->addr, I2C_M_RD|I2C_M_NOSTART, 1, (uint8_t *)data};
++
++ data[0] = aRegAddr;
++ msg_set[0] = msg1;
++ msg_set[1] = msg2;
++
++ ret = i2c_transfer(client->adapter, msg_set, 2);
++ if (ret < 0) {
++ return -EINVAL;
++ }
++
++ if (data[0] & 0x80) {
++ return (-1*(1+(~data[0])));
++ } else {
++ return data[0];
++ }
++}
++
+static int as5011_probe(struct i2c_client *client, const struct i2c_device_id *id)
+{
+ struct as5011_platform_data *plat_dat = client->dev.platform_data;
+ int retval = 0;
+
++ plat_dat->num = g_num;
++ g_num++;
++
++ retval = snprintf(plat_dat->workqueue_name, SIZE_NAME, "as5011_%d_workqueue", plat_dat->num);
++ if (retval < 0)
++ {
++ dev_err(&client->dev, "as5011: Failed to give workqueue name\n");
++ retval = -1;
++ goto workqueue_name_error;
++ }
++ plat_dat->workqueue = create_singlethread_workqueue(plat_dat->workqueue_name);
++ if (plat_dat->workqueue == NULL) {
++ dev_err(&client->dev, "as5011: Failed to create workqueue\n");
++ retval = -EINVAL;
++ goto workqueue_create_error;
++ }
++
++ INIT_WORK(&plat_dat->update_axes_work, as5011_update_axes);
++
+ if (!i2c_check_functionality(client->adapter,I2C_FUNC_PROTOCOL_MANGLING)) {
+ dev_err(&client->dev,
+ "i2c bus does not support protocol mangling, as5011 can't work\n");
+ retval = -ENODEV;
+ goto i2c_protocol_error;
+ }
++ plat_dat->i2c_client = client;
+
+ plat_dat->input_dev = input_allocate_device();
+ if (plat_dat->input_dev < 0) {
@@ -98,10 +202,21 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ goto input_allocate_device_error;
+ }
+
-+ plat_dat->input_dev->evbit[0] = BIT_MASK(EV_KEY);
-+ plat_dat->input_dev->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0);
-+
-+ plat_dat->button_irq_name = (unsigned char *)kmalloc(sizeof(unsigned char)*SIZE_NAME, GFP_KERNEL);
++ plat_dat->input_dev->name = "Austria Microsystem as5011 joystick";
++ plat_dat->input_dev->uniq = "Austria0";//XXX
++ plat_dat->input_dev->id.bustype = BUS_I2C;
++ plat_dat->input_dev->phys = "/dev/input/event0";//XXX
++ plat_dat->input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
++ plat_dat->input_dev->keybit[BIT_WORD(BTN_JOYSTICK)] = BIT_MASK(BTN_JOYSTICK);
++
++ input_set_abs_params(plat_dat->input_dev, ABS_X,
++ AS5011_MIN_AXIS, AS5011_MAX_AXIS, AS5011_FUZZ, AS5011_FLAT);
++ input_set_abs_params(plat_dat->input_dev, ABS_Y,
++ AS5011_MIN_AXIS, AS5011_MAX_AXIS, AS5011_FUZZ, AS5011_FLAT);
++
++ plat_dat->button_irq_name =
++ (unsigned char *)kmalloc(sizeof(unsigned char)*SIZE_NAME,
++ GFP_KERNEL);
+ if (plat_dat->button_irq_name == NULL)
+ {
+ dev_err(&client->dev,
@@ -115,43 +230,154 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ if (retval < 0)
+ {
+ dev_err(&client->dev, "as5011: Failed to give button irq name\n");
-+ retval = -1; //FIXME:Â find the right code
++ retval = -EINVAL;
+ goto button_irq_name_error;
+ }
+
+ if (request_irq(plat_dat->button_irq, button_interrupt,
+ 0, plat_dat->button_irq_name, (void *)plat_dat)) {
-+ dev_err(&client->dev, "as5011: Can't allocate irq %d\n",
++ dev_err(&client->dev, "as5011: Can't allocate irq %d\n",
+ plat_dat->button_irq);
-+ retval = -EBUSY;
++ retval = -EBUSY;
+ goto request_irq_error;
-+ }
++ }
++
++ plat_dat->int_irq_name =
++ (unsigned char *)kmalloc(sizeof(unsigned char)*SIZE_NAME,
++ GFP_KERNEL);
++ if (plat_dat->int_irq_name == NULL)
++ {
++ dev_err(&client->dev,
++ "not enough memory for input devices int irq name\n");
++ retval = -ENOMEM;
++ goto input_allocate_int_device_name_error;
++ }
++
++ retval = snprintf(plat_dat->int_irq_name, SIZE_NAME, "as5011_%d_int", plat_dat->num);
++ if (retval < 0)
++ {
++ dev_err(&client->dev, "as5011: Failed to give int irq name\n");
++ retval = -EINVAL;
++ goto int_irq_name_error;
++ }
++
++
++ if (request_irq(plat_dat->int_irq, as5011_int_interrupt,
++ 0, plat_dat->int_irq_name, (void *)plat_dat)) {
++ dev_err(&client->dev, "as5011: Can't allocate int irq %d\n",
++ plat_dat->int_irq);
++ retval = -EBUSY;
++ goto request_int_irq_error;
++ }
+
+ retval = input_register_device(plat_dat->input_dev);
+ if (retval) {
+ dev_err(&client->dev, "as5011: Failed to register device\n");
-+ retval = -1; //FIXME:Â find the right code
++ retval = -EINVAL;
+ goto input_register_device_error;
+ }
+
+ retval = plat_dat->init_gpio();
+ if (retval < 0) {
+ dev_err(&client->dev, "as5011: Failed to init gpios\n");
-+ retval = -1; //FIXME:Â find the right code
++ retval = -EINVAL;
+ goto init_gpio_error;
+ }
+
++ /* chip soft reset */
++ retval = as5011_i2c_write(plat_dat->i2c_client,
++ AS5011_CTRL1,
++ AS5011_CTRL1_SOFT_RST);
++ if (retval < 0) {
++ dev_err(&plat_dat->i2c_client->dev,
++ "as5011: soft reset failed\n");
++ retval = -EINVAL;
++ goto soft_reset_error;
++ }
++
++ retval = as5011_i2c_write(plat_dat->i2c_client,
++ AS5011_CTRL1,
++ AS5011_CTRL1_LP_PULSED |
++ //AS5011_CTRL1_LP_ACTIVE |
++ //AS5011_CTRL1_INT_ACT_EN|
++ AS5011_CTRL1_INT_WUP_EN
++ );
++ if (retval < 0) {
++ dev_err(&plat_dat->i2c_client->dev,
++ "as5011: power config failed\n");
++ retval = -EINVAL;
++ goto soft_reset_error;
++ }
+
++ retval = as5011_i2c_write(plat_dat->i2c_client,
++ AS5011_CTRL2,
++ AS5011_CTRL2_INV_SPINNING);
++ if (retval < 0) {
++ dev_err(&plat_dat->i2c_client->dev,
++ "as5011: can't invert spinning\n");
++ retval = -EINVAL;
++ goto invert_spinning_error;
++ }
++
++ /* write threshold */
++ retval = as5011_i2c_write(plat_dat->i2c_client,
++ AS5011_XP,
++ plat_dat->Xp);
++ if (retval < 0) {
++ dev_err(&plat_dat->i2c_client->dev,
++ "as5011: can't write threshold\n");
++ retval = -EINVAL;
++ goto threshold_error;
++ }
++
++ retval = as5011_i2c_write(plat_dat->i2c_client,
++ AS5011_XN,
++ plat_dat->Xn);
++ if (retval < 0) {
++ dev_err(&plat_dat->i2c_client->dev,
++ "as5011: can't write threshold\n");
++ retval = -EINVAL;
++ goto threshold_error;
++ }
++
++ retval = as5011_i2c_write(plat_dat->i2c_client,
++ AS5011_YP,
++ plat_dat->Yp);
++ if (retval < 0) {
++ dev_err(&plat_dat->i2c_client->dev,
++ "as5011: can't write threshold\n");
++ retval = -EINVAL;
++ goto threshold_error;
++ }
++
++ retval = as5011_i2c_write(plat_dat->i2c_client,
++ AS5011_YN,
++ plat_dat->Yn);
++ if (retval < 0) {
++ dev_err(&plat_dat->i2c_client->dev,
++ "as5011: can't write threshold\n");
++ retval = -EINVAL;
++ goto threshold_error;
++ }
++
++ /* to free irq gpio in chip*/
++ as5011_i2c_read(plat_dat->i2c_client, AS5011_X_RES_INT);
+
-+ printk(KERN_DEBUG "as5011 probed\n");//XXX
+ return 0;
+
+ /* Error management */
-+
++threshold_error:
++invert_spinning_error:
++soft_reset_error:
+ plat_dat->exit_gpio();
+init_gpio_error:
+ input_unregister_device(plat_dat->input_dev);
+input_register_device_error:
++ free_irq(plat_dat->int_irq, as5011_int_interrupt);
++request_int_irq_error:
++int_irq_name_error:
++ kfree(plat_dat->int_irq_name);
++input_allocate_int_device_name_error:
+ free_irq(plat_dat->button_irq, button_interrupt);
+request_irq_error:
+button_irq_name_error:
@@ -160,19 +386,24 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ input_free_device(plat_dat->input_dev);
+input_allocate_device_error:
+i2c_protocol_error:
++ destroy_workqueue(plat_dat->workqueue);
++workqueue_create_error:
++ kfree(plat_dat->workqueue_name);
++workqueue_name_error:
+ return retval;
+}
+static int as5011_remove(struct i2c_client *client)
+{
+ struct as5011_platform_data *plat_dat = client->dev.platform_data;
+
++ destroy_workqueue(plat_dat->workqueue);
+ input_unregister_device(plat_dat->input_dev);
+ free_irq(plat_dat->button_irq, plat_dat);
++ free_irq(plat_dat->int_irq, plat_dat);
+ kfree(plat_dat->button_irq_name);
+ input_free_device(plat_dat->input_dev);
+ plat_dat->exit_gpio();
+
-+ printk(KERN_DEBUG "as5011_remove\n");//XXX
+ return 0;
+}
+static const struct i2c_device_id as5011_id[] = {
@@ -184,9 +415,9 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ .driver = {
+ .name = "as5011",
+ },
-+ .probe = as5011_probe,
-+ .remove = as5011_remove,
-+ .id_table = as5011_id,
++ .probe = as5011_probe,
++ .remove = as5011_remove,
++ .id_table = as5011_id,
+};
+
+/*
@@ -195,22 +426,20 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+
+static int __init as5011_init(void)
+{
-+ printk(KERN_DEBUG "as5011_init\n");//XXX
-+ return i2c_add_driver(&as5011_driver);
++ return i2c_add_driver(&as5011_driver);
+}
+
+static void __exit as5011_exit(void)
+{
-+ printk(KERN_DEBUG "as5011_exit\n");//XXX
-+ i2c_del_driver(&as5011_driver);
++ i2c_del_driver(&as5011_driver);
+}
+
+module_init(as5011_init);
+module_exit(as5011_exit);
Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
===================================================================
---- linux-2.6.29.6.orig/drivers/input/joystick/Kconfig 2010-06-24 15:11:45.000000000 +0200
-+++ linux-2.6.29.6/drivers/input/joystick/Kconfig 2010-06-24 15:15:16.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/input/joystick/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.6/drivers/input/joystick/Kconfig 2010-06-28 09:20:47.000000000 +0200
@@ -254,6 +254,15 @@
To compile this driver as a module, choose M here: the
module will be called amijoy.
@@ -229,8 +458,8 @@ Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
select GAMEPORT
Index: linux-2.6.29.6/drivers/input/joystick/Makefile
===================================================================
---- linux-2.6.29.6.orig/drivers/input/joystick/Makefile 2010-06-24 15:11:05.000000000 +0200
-+++ linux-2.6.29.6/drivers/input/joystick/Makefile 2010-06-24 15:11:27.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/input/joystick/Makefile 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.6/drivers/input/joystick/Makefile 2010-06-28 09:20:47.000000000 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_JOYSTICK_A3D) += a3d.o
obj-$(CONFIG_JOYSTICK_ADI) += adi.o
@@ -239,3 +468,80 @@ Index: linux-2.6.29.6/drivers/input/joystick/Makefile
obj-$(CONFIG_JOYSTICK_ANALOG) += analog.o
obj-$(CONFIG_JOYSTICK_COBRA) += cobra.o
obj-$(CONFIG_JOYSTICK_DB9) += db9.o
+Index: linux-2.6.29.6/include/linux/as5011.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/include/linux/as5011.h 2010-07-01 11:11:11.000000000 +0200
+@@ -0,0 +1,72 @@
++#ifndef _AS5011_H
++#define _AS5011_H
++
++/*
++ * Copyright (c) 2010 Fabien Marteau
++ *
++ * 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.
++ */
++
++#define AS5011_MAX_NAME_LENGTH 64
++#define AS5011_MAX_CNAME_LENGTH 16
++#define AS5011_MAX_PHYS_LENGTH 64
++#define AS5011_MAX_LENGTH 64
++
++/* registers */
++#define AS5011_CTRL1 0x76
++#define AS5011_CTRL2 0x75
++#define AS5011_XP 0x43
++#define AS5011_XN 0x44
++#define AS5011_YP 0x53
++#define AS5011_YN 0x54
++#define AS5011_X_REG 0x41
++#define AS5011_Y_REG 0x42
++#define AS5011_X_RES_INT 0x51
++#define AS5011_Y_RES_INT 0x52
++
++/* CTRL1 bits */
++#define AS5011_CTRL1_LP_PULSED 0x80
++#define AS5011_CTRL1_LP_ACTIVE 0x40
++#define AS5011_CTRL1_LP_CONTINUE 0x20
++#define AS5011_CTRL1_INT_WUP_EN 0x10
++#define AS5011_CTRL1_INT_ACT_EN 0x08
++#define AS5011_CTRL1_EXT_CLK_EN 0x04
++#define AS5011_CTRL1_SOFT_RST 0x02
++#define AS5011_CTRL1_DATA_VALID 0x01
++
++/* CTRL2 bits */
++#define AS5011_CTRL2_EXT_SAMPLE_EN 0x08
++#define AS5011_CTRL2_RC_BIAS_ON 0x04
++#define AS5011_CTRL2_INV_SPINNING 0x02
++
++
++struct as5011_platform_data {
++ /* public */
++ int button_gpio;
++ int button_irq;
++ int int_gpio;
++ int int_irq;
++ char Xp, Xn; /* threshold for x axis */
++ char Yp, Yn; /* threshold for y axis */
++
++ int (*init_gpio)(void); /* init interrupts gpios */
++ void (*exit_gpio)(void);/* exit gpios */
++
++ /* private */
++ int num;
++ struct input_dev *input_dev;
++ struct i2c_client *i2c_client;
++ unsigned char *button_irq_name;
++ unsigned char *int_irq_name;
++ char name[AS5011_MAX_NAME_LENGTH];
++ char cname[AS5011_MAX_CNAME_LENGTH];
++ char phys[AS5011_MAX_PHYS_LENGTH];
++ unsigned char data[AS5011_MAX_LENGTH];
++ char workqueue_name[AS5011_MAX_NAME_LENGTH];
++ struct workqueue_struct *workqueue;
++ struct work_struct update_axes_work;
++};
++
++#endif /* _AS5011_H */
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-25 17:20:03
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9d9d471c44c8df8d92bd4ccd07de7efb0cd98b73 (commit)
from 31cfdef71c95d991a4bf41d72a68a64744b89692 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9d9d471c44c8df8d92bd4ccd07de7efb0cd98b73
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 25 19:19:32 2010 +0200
The role of a patch is not to change the indentation of the patched file but rather try to be as small as possible in order to maintainable
-----------------------------------------------------------------------
Summary of changes:
...ing_mangling_capability_on_i2c_mxc_driver.patch | 133 +++++---------------
1 files changed, 29 insertions(+), 104 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
index 4b0d46d..731ba59 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
@@ -4,8 +4,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
===================================================================
---- linux-2.6.29.6.orig/drivers/i2c/busses/i2c-mxc.c 2010-06-25 18:19:38.000000000 +0200
-+++ linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c 2010-06-25 18:23:43.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/i2c/busses/i2c-mxc.c 2010-06-25 18:56:39.000000000 +0200
++++ linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c 2010-06-25 19:09:05.000000000 +0200
@@ -45,6 +45,7 @@
struct clk *clk;
bool low_power;
@@ -14,48 +14,33 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
} imx_i2c_device;
/*
-@@ -99,7 +100,9 @@
- */
- for (;;) {
- unsigned int sr = readw(dev->membase + MXC_I2SR);
-- if ((sr & MXC_I2SR_IBB) == 0) break;
-+ if ((sr & MXC_I2SR_IBB) == 0) {
-+ break;
-+ }
- if (retry-- <= 0) {
- #ifdef I2C_DEBUG
- printk(KERN_DEBUG "Bus busy\n");
-@@ -118,7 +121,13 @@
+@@ -118,7 +119,12 @@
*/
static int imx_i2c_wait_for_tc(imx_i2c_device * dev, int trans_flag)
{
- int retry = 4;
+ int retry;
+
-+ if (trans_flag & I2C_M_IGNORE_NAK) {
++ if (trans_flag & I2C_M_IGNORE_NAK)
+ retry = 1;
-+ } else {
++ else
+ retry = 4;
-+ }
while (retry-- && !transfer_done) {
wait_event_interruptible_timeout(dev->wq,
-@@ -138,8 +147,12 @@
+@@ -138,7 +144,10 @@
#ifdef I2C_DEBUG
printk(KERN_DEBUG "Data not transmitted\n");
#endif
- return -1;
-- }
-+ if (trans_flag & I2C_M_IGNORE_NAK) {
++ if (trans_flag & I2C_M_IGNORE_NAK)
+ return 0;
-+ } else {
++ else
+ return -1;
-+ }
-+ }
+ }
return 0;
- }
-@@ -156,7 +169,9 @@
+@@ -156,7 +165,9 @@
* in the data register
*/
addr_trans = msg->addr << 1;
@@ -66,7 +51,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
addr_trans |= 0x01;
}
-@@ -196,7 +211,9 @@
+@@ -196,7 +207,9 @@
* in the data register
*/
addr_trans = msg->addr << 1;
@@ -77,30 +62,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
addr_trans |= 0x01;
}
cr = readw(dev->membase + MXC_I2CR);
-@@ -227,17 +244,19 @@
- /*
- * Clear the TXAK bit to gen an ack when receiving only one byte.
- */
-- if (len == 1)
-+ if (len == 1) {
- cr |= MXC_I2CR_TXAK;
-- else
-+ } else {
- cr &= ~MXC_I2CR_TXAK;
-+ }
-
- writew(cr, dev->membase + MXC_I2CR);
- /*
- * Dummy read only at the end of an address cycle
- */
-- if (addr_comp > 0)
-+ if (addr_comp > 0) {
- readw(dev->membase + MXC_I2DR);
-+ }
-
- for (i = 0; i < len; i++) {
- /* Wait for data transmission to complete */
-@@ -245,14 +264,21 @@
+@@ -245,10 +258,15 @@
imx_i2c_stop(dev);
return -1;
}
@@ -111,32 +73,14 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
if (i == (len - 2)) {
cr = readw(dev->membase + MXC_I2CR);
- cr |= MXC_I2CR_TXAK;
-+ if ((msg->flags & I2C_M_NO_RD_ACK) == 0) {
++ if ((msg->flags & I2C_M_NO_RD_ACK) == 0)
+ cr |= MXC_I2CR_TXAK;
-+ } else {
++ else
+ cr &= ~MXC_I2CR_TXAK;
-+ }
writew(cr, dev->membase + MXC_I2CR);
} else if (i == (len - 1)) {
-- if (last)
-+ if (last) {
- imx_i2c_stop(dev);
-+ }
- }
- /* Read the data */
- *buf++ = readw(dev->membase + MXC_I2DR);
-@@ -333,8 +359,9 @@
- return -EREMOTEIO;
- }
-
-- if (num < 1)
-+ if (num < 1) {
- return 0;
-+ }
-
- imx_i2c_module_en(dev, msgs[0].flags);
- sr = readw(dev->membase + MXC_I2SR);
-@@ -352,6 +379,7 @@
+ if (last)
+@@ -352,6 +370,7 @@
tx_success = false;
for (i = 0; i < num && ret >= 0; i++) {
addr_comp = 0;
@@ -144,36 +88,28 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
/*
* Send the slave address and transfer direction in the
* address cycle
-@@ -372,16 +400,18 @@
- * changed or the transfer direction changed
- */
+@@ -374,12 +393,14 @@
if ((msgs[i].addr != msgs[i - 1].addr) ||
-- ((msgs[i].flags & I2C_M_RD) !=
-- (msgs[i - 1].flags & I2C_M_RD))) {
+ ((msgs[i].flags & I2C_M_RD) !=
+ (msgs[i - 1].flags & I2C_M_RD))) {
- imx_i2c_repstart(dev, &msgs[i]);
- /* Wait for the address cycle to complete */
- if (imx_i2c_wait_for_tc(dev, msgs[i].flags)) {
- imx_i2c_stop(dev);
- imx_i2c_module_dis(dev);
- return -EREMOTEIO;
-- }
-- addr_comp = 1;
-+ ((msgs[i].flags & I2C_M_RD) !=
-+ (msgs[i - 1].flags & I2C_M_RD))) {
-+ if ((msgs[i].flags & I2C_M_NOSTART) == 0) {
-+ imx_i2c_repstart(dev, &msgs[i]);
-+ /* Wait for the address cycle to complete */
-+ if (imx_i2c_wait_for_tc(dev, msgs[i].flags)) {
-+ imx_i2c_stop(dev);
-+ imx_i2c_module_dis(dev);
-+ return -EREMOTEIO;
-+ }
++ if ((msgs[i].flags & I2C_M_NOSTART) == 0) {
++ imx_i2c_repstart(dev, &msgs[i]);
++ /* Wait for the address cycle to complete */
++ if (imx_i2c_wait_for_tc(dev, msgs[i].flags)) {
++ imx_i2c_stop(dev);
++ imx_i2c_module_dis(dev);
++ return -EREMOTEIO;
+ }
-+ addr_comp = 1;
+ }
+ addr_comp = 1;
}
- }
-
-@@ -414,7 +444,7 @@
+@@ -414,7 +435,7 @@
*/
static u32 imx_i2c_func(struct i2c_adapter *adap)
{
@@ -182,14 +118,3 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
}
/*
-@@ -505,8 +535,9 @@
- {
- imx_i2c_device *mxcdev = platform_get_drvdata(pdev);
-
-- if (mxcdev == NULL)
-+ if (mxcdev == NULL) {
- return -1;
-+ }
-
- mxcdev->low_power = false;
- mxcdev->pdata->init(pdev);
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-25 16:26:40
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 31cfdef71c95d991a4bf41d72a68a64744b89692 (commit)
via 96e188bcc108ff176542c980f55bdabe8d2f6627 (commit)
via 6e8b9a7a9275fb90146b8962fb2ab70abe4ed25a (commit)
from 8fdf22c35b3fb338b5eb523a37bcd31521aa82b0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 31cfdef71c95d991a4bf41d72a68a64744b89692
Merge: 96e188bcc108ff176542c980f55bdabe8d2f6627 8fdf22c35b3fb338b5eb523a37bcd31521aa82b0
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jun 25 18:26:01 2010 +0200
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 96e188bcc108ff176542c980f55bdabe8d2f6627
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jun 25 18:25:44 2010 +0200
parenthesis
commit 6e8b9a7a9275fb90146b8962fb2ab70abe4ed25a
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jun 25 18:03:20 2010 +0200
[linux] adding_as5011_joystick_driver
-----------------------------------------------------------------------
Summary of changes:
...ing_mangling_capability_on_i2c_mxc_driver.patch | 118 ++++++++---
...us-joystick-adding_as5011_joystick_driver.patch | 241 ++++++++++++++++++++
2 files changed, 332 insertions(+), 27 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
index ed1cd95..4b0d46d 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
@@ -4,8 +4,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
===================================================================
---- linux-2.6.29.6.orig/drivers/i2c/busses/i2c-mxc.c 2010-06-23 17:56:23.000000000 +0200
-+++ linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c 2010-06-24 09:42:49.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/i2c/busses/i2c-mxc.c 2010-06-25 18:19:38.000000000 +0200
++++ linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c 2010-06-25 18:23:43.000000000 +0200
@@ -45,6 +45,7 @@
struct clk *clk;
bool low_power;
@@ -14,7 +14,18 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
} imx_i2c_device;
/*
-@@ -118,7 +119,13 @@
+@@ -99,7 +100,9 @@
+ */
+ for (;;) {
+ unsigned int sr = readw(dev->membase + MXC_I2SR);
+- if ((sr & MXC_I2SR_IBB) == 0) break;
++ if ((sr & MXC_I2SR_IBB) == 0) {
++ break;
++ }
+ if (retry-- <= 0) {
+ #ifdef I2C_DEBUG
+ printk(KERN_DEBUG "Bus busy\n");
+@@ -118,7 +121,13 @@
*/
static int imx_i2c_wait_for_tc(imx_i2c_device * dev, int trans_flag)
{
@@ -29,21 +40,22 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
while (retry-- && !transfer_done) {
wait_event_interruptible_timeout(dev->wq,
-@@ -138,8 +145,11 @@
+@@ -138,8 +147,12 @@
#ifdef I2C_DEBUG
printk(KERN_DEBUG "Data not transmitted\n");
#endif
- return -1;
- }
-+ if (trans_flag & I2C_M_IGNORE_NAK)
-+ return 0;
-+ else
-+ return -1;
++ if (trans_flag & I2C_M_IGNORE_NAK) {
++ return 0;
++ } else {
++ return -1;
++ }
+ }
return 0;
}
-@@ -156,7 +166,9 @@
+@@ -156,7 +169,9 @@
* in the data register
*/
addr_trans = msg->addr << 1;
@@ -54,7 +66,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
addr_trans |= 0x01;
}
-@@ -196,7 +208,9 @@
+@@ -196,7 +211,9 @@
* in the data register
*/
addr_trans = msg->addr << 1;
@@ -65,7 +77,30 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
addr_trans |= 0x01;
}
cr = readw(dev->membase + MXC_I2CR);
-@@ -245,10 +259,16 @@
+@@ -227,17 +244,19 @@
+ /*
+ * Clear the TXAK bit to gen an ack when receiving only one byte.
+ */
+- if (len == 1)
++ if (len == 1) {
+ cr |= MXC_I2CR_TXAK;
+- else
++ } else {
+ cr &= ~MXC_I2CR_TXAK;
++ }
+
+ writew(cr, dev->membase + MXC_I2CR);
+ /*
+ * Dummy read only at the end of an address cycle
+ */
+- if (addr_comp > 0)
++ if (addr_comp > 0) {
+ readw(dev->membase + MXC_I2DR);
++ }
+
+ for (i = 0; i < len; i++) {
+ /* Wait for data transmission to complete */
+@@ -245,14 +264,21 @@
imx_i2c_stop(dev);
return -1;
}
@@ -83,8 +118,25 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
+ }
writew(cr, dev->membase + MXC_I2CR);
} else if (i == (len - 1)) {
- if (last)
-@@ -352,6 +372,7 @@
+- if (last)
++ if (last) {
+ imx_i2c_stop(dev);
++ }
+ }
+ /* Read the data */
+ *buf++ = readw(dev->membase + MXC_I2DR);
+@@ -333,8 +359,9 @@
+ return -EREMOTEIO;
+ }
+
+- if (num < 1)
++ if (num < 1) {
+ return 0;
++ }
+
+ imx_i2c_module_en(dev, msgs[0].flags);
+ sr = readw(dev->membase + MXC_I2SR);
+@@ -352,6 +379,7 @@
tx_success = false;
for (i = 0; i < num && ret >= 0; i++) {
addr_comp = 0;
@@ -92,7 +144,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
/*
* Send the slave address and transfer direction in the
* address cycle
-@@ -372,17 +393,18 @@
+@@ -372,16 +400,18 @@
* changed or the transfer direction changed
*/
if ((msgs[i].addr != msgs[i - 1].addr) ||
@@ -104,23 +156,24 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
- imx_i2c_stop(dev);
- imx_i2c_module_dis(dev);
- return -EREMOTEIO;
+- }
+- addr_comp = 1;
+ ((msgs[i].flags & I2C_M_RD) !=
-+ (msgs[i - 1].flags & I2C_M_RD)))
-+ if ((msgs[i].flags & I2C_M_NOSTART) == 0) {
-+ imx_i2c_repstart(dev, &msgs[i]);
-+ /* Wait for the address cycle to complete */
-+ if (imx_i2c_wait_for_tc(dev, msgs[i].flags)) {
-+ imx_i2c_stop(dev);
-+ imx_i2c_module_dis(dev);
-+ return -EREMOTEIO;
++ (msgs[i - 1].flags & I2C_M_RD))) {
++ if ((msgs[i].flags & I2C_M_NOSTART) == 0) {
++ imx_i2c_repstart(dev, &msgs[i]);
++ /* Wait for the address cycle to complete */
++ if (imx_i2c_wait_for_tc(dev, msgs[i].flags)) {
++ imx_i2c_stop(dev);
++ imx_i2c_module_dis(dev);
++ return -EREMOTEIO;
++ }
+ }
- }
- addr_comp = 1;
-- }
++ addr_comp = 1;
+ }
}
- /* Transfer the data */
-@@ -414,7 +436,7 @@
+@@ -414,7 +444,7 @@
*/
static u32 imx_i2c_func(struct i2c_adapter *adap)
{
@@ -129,3 +182,14 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
}
/*
+@@ -505,8 +535,9 @@
+ {
+ imx_i2c_device *mxcdev = platform_get_drvdata(pdev);
+
+- if (mxcdev == NULL)
++ if (mxcdev == NULL) {
+ return -1;
++ }
+
+ mxcdev->low_power = false;
+ mxcdev->pdata->init(pdev);
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
new file mode 100644
index 0000000..71598d7
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
@@ -0,0 +1,241 @@
+Adding Austria Microsystem AS5011 joystick driver
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
+Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-06-25 17:58:01.000000000 +0200
+@@ -0,0 +1,200 @@
++/*
++ * Copyright (c) 2010 Fabien Marteau <fab...@ar...>
++ *
++ * Sponsored by ARMadeus Systems
++ */
++
++/*
++ * Driver for Austria Microsystems joysticks AS5011
++ */
++
++/*
++ * 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 <linux/module.h>
++#include <linux/init.h>
++#include <linux/slab.h>
++#include <linux/i2c.h>
++#include <linux/string.h>
++#include <linux/list.h>
++#include <linux/sysfs.h>
++#include <linux/ctype.h>
++#include <linux/hwmon-sysfs.h>
++
++#include <linux/types.h>
++#include <linux/errno.h>
++#include <linux/kernel.h>
++#include <linux/input.h>
++#include <linux/interrupt.h>
++#include <linux/mutex.h>
++
++#include <linux/input.h>
++#include <linux/gpio.h>
++
++#include <linux/as5011.h>
++#define DRIVER_DESC "Driver for Austria Microsystems AS5011 joystick"
++
++MODULE_AUTHOR("Fabien Marteau <fab...@ar...>");
++MODULE_DESCRIPTION(DRIVER_DESC);
++MODULE_LICENSE("GPL");
++
++#define SIZE_NAME 30
++/*
++ * input operations
++ */
++
++static irqreturn_t button_interrupt(int irq, void *dev_id)
++{
++ struct as5011_platform_data *plat_dat = (struct as5011_platform_data *)dev_id;
++ int ret;
++ ret = gpio_get_value(plat_dat->button_gpio);
++ input_report_key(plat_dat->input_dev, BTN_0, 1);
++ input_sync(plat_dat->input_dev);
++ return IRQ_HANDLED;
++}
++
++/*
++ * I2C bus operation
++ */
++static int as5011_probe(struct i2c_client *client, const struct i2c_device_id *id)
++{
++ struct as5011_platform_data *plat_dat = client->dev.platform_data;
++ int retval = 0;
++
++ if (!i2c_check_functionality(client->adapter,I2C_FUNC_PROTOCOL_MANGLING)) {
++ dev_err(&client->dev,
++ "i2c bus does not support protocol mangling, as5011 can't work\n");
++ retval = -ENODEV;
++ goto i2c_protocol_error;
++ }
++
++ plat_dat->input_dev = input_allocate_device();
++ if (plat_dat->input_dev < 0) {
++ dev_err(&client->dev,
++ "not enough memory for input devices structure\n");
++ retval = -ENOMEM;
++ goto input_allocate_device_error;
++ }
++
++ plat_dat->input_dev->evbit[0] = BIT_MASK(EV_KEY);
++ plat_dat->input_dev->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0);
++
++ plat_dat->button_irq_name = (unsigned char *)kmalloc(sizeof(unsigned char)*SIZE_NAME, GFP_KERNEL);
++ if (plat_dat->button_irq_name == NULL)
++ {
++ dev_err(&client->dev,
++ "not enough memory for input devices irq name\n");
++ retval = -ENOMEM;
++ goto input_allocate_device_name_error;
++ }
++
++
++ retval = snprintf(plat_dat->button_irq_name, SIZE_NAME, "as5011_%d_button", plat_dat->num);
++ if (retval < 0)
++ {
++ dev_err(&client->dev, "as5011: Failed to give button irq name\n");
++ retval = -1; //FIXME:Â find the right code
++ goto button_irq_name_error;
++ }
++
++ if (request_irq(plat_dat->button_irq, button_interrupt,
++ 0, plat_dat->button_irq_name, (void *)plat_dat)) {
++ dev_err(&client->dev, "as5011: Can't allocate irq %d\n",
++ plat_dat->button_irq);
++ retval = -EBUSY;
++ goto request_irq_error;
++ }
++
++ retval = input_register_device(plat_dat->input_dev);
++ if (retval) {
++ dev_err(&client->dev, "as5011: Failed to register device\n");
++ retval = -1; //FIXME:Â find the right code
++ goto input_register_device_error;
++ }
++
++ retval = plat_dat->init_gpio();
++ if (retval < 0) {
++ dev_err(&client->dev, "as5011: Failed to init gpios\n");
++ retval = -1; //FIXME:Â find the right code
++ goto init_gpio_error;
++ }
++
++
++
++ printk(KERN_DEBUG "as5011 probed\n");//XXX
++ return 0;
++
++ /* Error management */
++
++ plat_dat->exit_gpio();
++init_gpio_error:
++ input_unregister_device(plat_dat->input_dev);
++input_register_device_error:
++ free_irq(plat_dat->button_irq, button_interrupt);
++request_irq_error:
++button_irq_name_error:
++ kfree(plat_dat->button_irq_name);
++input_allocate_device_name_error:
++ input_free_device(plat_dat->input_dev);
++input_allocate_device_error:
++i2c_protocol_error:
++ return retval;
++}
++static int as5011_remove(struct i2c_client *client)
++{
++ struct as5011_platform_data *plat_dat = client->dev.platform_data;
++
++ input_unregister_device(plat_dat->input_dev);
++ free_irq(plat_dat->button_irq, plat_dat);
++ kfree(plat_dat->button_irq_name);
++ input_free_device(plat_dat->input_dev);
++ plat_dat->exit_gpio();
++
++ printk(KERN_DEBUG "as5011_remove\n");//XXX
++ return 0;
++}
++static const struct i2c_device_id as5011_id[] = {
++ { "as5011", 0 },
++ { }
++};
++
++static struct i2c_driver as5011_driver = {
++ .driver = {
++ .name = "as5011",
++ },
++ .probe = as5011_probe,
++ .remove = as5011_remove,
++ .id_table = as5011_id,
++};
++
++/*
++ * Module initialization
++ */
++
++static int __init as5011_init(void)
++{
++ printk(KERN_DEBUG "as5011_init\n");//XXX
++ return i2c_add_driver(&as5011_driver);
++}
++
++static void __exit as5011_exit(void)
++{
++ printk(KERN_DEBUG "as5011_exit\n");//XXX
++ i2c_del_driver(&as5011_driver);
++}
++
++module_init(as5011_init);
++module_exit(as5011_exit);
+Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
+===================================================================
+--- linux-2.6.29.6.orig/drivers/input/joystick/Kconfig 2010-06-24 15:11:45.000000000 +0200
++++ linux-2.6.29.6/drivers/input/joystick/Kconfig 2010-06-24 15:15:16.000000000 +0200
+@@ -254,6 +254,15 @@
+ To compile this driver as a module, choose M here: the
+ module will be called amijoy.
+
++config JOYSTICK_AS5011
++ tristate "Austria Microsystem AS5011 joystick"
++ depends on I2C
++ help
++ Say Y here if you have an AS5011 digital joystick.
++
++ To compile this driver as a module, choose M here: the
++ module will be called as5011.
++
+ config JOYSTICK_JOYDUMP
+ tristate "Gameport data dumper"
+ select GAMEPORT
+Index: linux-2.6.29.6/drivers/input/joystick/Makefile
+===================================================================
+--- linux-2.6.29.6.orig/drivers/input/joystick/Makefile 2010-06-24 15:11:05.000000000 +0200
++++ linux-2.6.29.6/drivers/input/joystick/Makefile 2010-06-24 15:11:27.000000000 +0200
+@@ -7,6 +7,7 @@
+ obj-$(CONFIG_JOYSTICK_A3D) += a3d.o
+ obj-$(CONFIG_JOYSTICK_ADI) += adi.o
+ obj-$(CONFIG_JOYSTICK_AMIGA) += amijoy.o
++obj-$(CONFIG_JOYSTICK_AS5011) += as5011.o
+ obj-$(CONFIG_JOYSTICK_ANALOG) += analog.o
+ obj-$(CONFIG_JOYSTICK_COBRA) += cobra.o
+ obj-$(CONFIG_JOYSTICK_DB9) += db9.o
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2010-06-25 08:57:25
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 8fdf22c35b3fb338b5eb523a37bcd31521aa82b0 (commit)
from bb94a99c28cf622255988be374745db767c1380a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8fdf22c35b3fb338b5eb523a37bcd31521aa82b0
Author: nicolas colombain <nic...@ar...>
Date: Fri Jun 25 10:56:35 2010 +0200
[LINUX] change tsc2102 precharge time
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/073-armadeus-tsc2102.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102.patch
index 744af66..9c15479 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102.patch
@@ -379,7 +379,7 @@ Index: linux-2.6.29.6/drivers/spi/tsc2102.c
+#define TSC2102_ADC_INT_REF_250 0x0017
+#define TSC2102_ADC_REF TSC2102_ADC_INT_REF_250 /*2.5V*/
+#define TSC2102_ADC_EXT_REF 0x0002
-+#define TSC2102_CONFIG_TIMES 0x0008
++#define TSC2102_CONFIG_TIMES 0x0012
+#define TSC2102_RESET 0xbb00
+#define TSC2102_ADC_PSTCM (1 << 15)
+#define TSC2102_ADC_ADST (1 << 14)
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-24 14:42:25
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via bb94a99c28cf622255988be374745db767c1380a (commit)
from 5067060d5aa40c9736ae1715af9a30d602db0620 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bb94a99c28cf622255988be374745db767c1380a
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 24 16:17:44 2010 +0200
Updates default BR configs
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/apf27_test.config | 3 ++-
buildroot/local/apf9328_test/apf9328_test.config | 3 ++-
.../target/device/armadeus/apf27/apf27_defconfig | 3 ++-
.../device/armadeus/apf9328/apf9328_defconfig | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/buildroot/local/apf27_test/apf27_test.config b/buildroot/local/apf27_test/apf27_test.config
index 23aac22..190ba47 100644
--- a/buildroot/local/apf27_test/apf27_test.config
+++ b/buildroot/local/apf27_test/apf27_test.config
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Fri Jun 4 11:20:33 2010
+# Thu Jun 24 16:14:29 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -578,6 +578,7 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_RAIDTOOLS is not set
# BR2_PACKAGE_SETSERIAL is not set
# BR2_PACKAGE_SMARTMONTOOLS is not set
+# BR2_PACKAGE_URG is not set
# BR2_PACKAGE_USBMOUNT is not set
# BR2_PACKAGE_USBUTILS is not set
# BR2_PACKAGE_WIPE is not set
diff --git a/buildroot/local/apf9328_test/apf9328_test.config b/buildroot/local/apf9328_test/apf9328_test.config
index 4836b60..f9a38a4 100644
--- a/buildroot/local/apf9328_test/apf9328_test.config
+++ b/buildroot/local/apf9328_test/apf9328_test.config
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Wed Jun 16 16:58:03 2010
+# Thu Jun 24 16:15:39 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -576,6 +576,7 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_RAIDTOOLS is not set
BR2_PACKAGE_SETSERIAL=y
# BR2_PACKAGE_SMARTMONTOOLS is not set
+# BR2_PACKAGE_URG is not set
# BR2_PACKAGE_USBMOUNT is not set
# BR2_PACKAGE_USBUTILS is not set
# BR2_PACKAGE_WIPE is not set
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index c4e8e08..ece2063 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Jun 22 13:58:00 2010
+# Thu Jun 24 16:14:29 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -556,6 +556,7 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_RAIDTOOLS is not set
# BR2_PACKAGE_SETSERIAL is not set
# BR2_PACKAGE_SMARTMONTOOLS is not set
+# BR2_PACKAGE_URG is not set
# BR2_PACKAGE_USBMOUNT is not set
# BR2_PACKAGE_USBUTILS is not set
# BR2_PACKAGE_WIPE is not set
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index 3d88764..7673d03 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
+++ b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Jun 22 11:39:22 2010
+# Thu Jun 24 16:15:39 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -552,6 +552,7 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_RAIDTOOLS is not set
# BR2_PACKAGE_SETSERIAL is not set
# BR2_PACKAGE_SMARTMONTOOLS is not set
+# BR2_PACKAGE_URG is not set
# BR2_PACKAGE_USBMOUNT is not set
# BR2_PACKAGE_USBUTILS is not set
# BR2_PACKAGE_WIPE is not set
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-24 13:52:26
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5067060d5aa40c9736ae1715af9a30d602db0620 (commit)
from 5f04742b90177c806ef2f8b82b919df7e9af6c0d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5067060d5aa40c9736ae1715af9a30d602db0620
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 24 15:51:54 2010 +0200
[DEMOS] capture: add yuv422_to_greyscale()
-----------------------------------------------------------------------
Summary of changes:
target/demos/camera/capture/capture.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index dc7e7ba..84862e7 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -141,6 +141,25 @@ static Uint16 inline YUV2B(int Y, int U, int V)
return B;
}
+static void yuv422_to_greyscale(void *yuv, int size, void *grey)
+{
+ unsigned int Y, Y2, yuv32;
+ int i;
+ Uint8 *dest = (Uint8*) grey;
+ Uint32 *src = (Uint32*) yuv;
+
+ for (i=size/4; i; i--) {
+ yuv32 = *(src++);
+
+ /* takes Ys from YUV422 packed format */
+ Y = (yuv32 & 0x000000ff);
+ Y2 = (yuv32 & 0x00ff0000) >> 16;
+
+ *(dest++) = (Uint8)Y;
+ *(dest++) = (Uint8)Y2;
+ }
+}
+
static void yuv422_to_rgb565(void *yuv, int size, void *rgb)
{
unsigned int Y, Y2, U, V, yuv32, rgb32;
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-24 08:59:13
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5f04742b90177c806ef2f8b82b919df7e9af6c0d (commit)
via 19f456ce5a5ffdf9c4d0a56d1f2a6b8a10d1abaa (commit)
from 69723ee95bbd2bfbd559a8fc179746ec4e0eb031 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5f04742b90177c806ef2f8b82b919df7e9af6c0d
Merge: 19f456ce5a5ffdf9c4d0a56d1f2a6b8a10d1abaa 69723ee95bbd2bfbd559a8fc179746ec4e0eb031
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 24 10:58:44 2010 +0200
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 19f456ce5a5ffdf9c4d0a56d1f2a6b8a10d1abaa
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 24 10:58:19 2010 +0200
Cosmetic again
-----------------------------------------------------------------------
Summary of changes:
...ing_mangling_capability_on_i2c_mxc_driver.patch | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
index a01bf99..ed1cd95 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
@@ -1,3 +1,7 @@
+Adding mangling capability on mxc I²C driver.
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
===================================================================
--- linux-2.6.29.6.orig/drivers/i2c/busses/i2c-mxc.c 2010-06-23 17:56:23.000000000 +0200
@@ -17,7 +21,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
- int retry = 4;
+ int retry;
+
-+ if (trans_flag& I2C_M_IGNORE_NAK) {
++ if (trans_flag & I2C_M_IGNORE_NAK) {
+ retry = 1;
+ } else {
+ retry = 4;
@@ -31,11 +35,11 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
#endif
- return -1;
- }
-+ if (trans_flag& I2C_M_IGNORE_NAK)
-+ return 0;
-+ else
-+ return -1;
-+ }
++ if (trans_flag & I2C_M_IGNORE_NAK)
++ return 0;
++ else
++ return -1;
++ }
return 0;
}
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-24 07:47:15
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 69723ee95bbd2bfbd559a8fc179746ec4e0eb031 (commit)
via 566890ba5bfa5a9d1e445490e46877890b99f541 (commit)
from 422fa54856442ff19721f529256b0658062e0b3b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 69723ee95bbd2bfbd559a8fc179746ec4e0eb031
Merge: 566890ba5bfa5a9d1e445490e46877890b99f541 422fa54856442ff19721f529256b0658062e0b3b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 24 09:46:41 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 566890ba5bfa5a9d1e445490e46877890b99f541
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 24 09:40:09 2010 +0200
[BUILDROOT] Add Hokuyo's URG series sensor control library/tools
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/122-urg-add_package.patch | 56 ++++++++++++++++++++
.../buildroot/2010.05/122-urg-add_package.patch | 56 ++++++++++++++++++++
patches/buildroot/2010.05/cleanup_buildroot.sh | 1 +
patches/buildroot/cleanup_buildroot.sh | 1 +
4 files changed, 114 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/122-urg-add_package.patch
create mode 100644 patches/buildroot/2010.05/122-urg-add_package.patch
diff --git a/patches/buildroot/122-urg-add_package.patch b/patches/buildroot/122-urg-add_package.patch
new file mode 100644
index 0000000..43328db
--- /dev/null
+++ b/patches/buildroot/122-urg-add_package.patch
@@ -0,0 +1,56 @@
+Add URG sensors control library to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-24 09:27:20.000000000 +0200
++++ buildroot/package/Config.in 2010-06-24 09:27:55.000000000 +0200
+@@ -292,6 +292,7 @@
+ # mdev
+ source "package/udev/Config.in"
+ endif
++source "package/urg/Config.in"
+ source "package/usbmount/Config.in"
+ source "package/usbutils/Config.in"
+ source "package/wipe/Config.in"
+Index: buildroot/package/urg/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/urg/Config.in 2010-06-24 09:32:29.000000000 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_URG
++ bool "urg library"
++ select BR2_PACKAGE_SDL
++ select BR2_PACKAGE_SDL_NET
++ help
++ Library to control Hokuyo's URG series sensors.
++ Requires SDL & SDL_net.
++
++ http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
+Index: buildroot/package/urg/urg.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/urg/urg.mk 2010-06-24 09:29:11.000000000 +0200
+@@ -0,0 +1,21 @@
++#############################################################
++#
++# urg library
++#
++#############################################################
++URG_VERSION:=0.8.11
++URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
++URG_SOURCE = urg-$(URG_VERSION).tar.gz
++URG_LIBTOOL_PATCH = NO
++URG_INSTALL_STAGING = YES
++URG_INSTALL_TARGET = YES
++
++URG_CONF_OPT:=--with-sdl-prefix=$(STAGING_DIR)/usr \
++ --with-sdl-exec-prefix=$(STAGING_DIR)/usr
++
++$(eval $(call AUTOTARGETS,package,urg))
++
++$(URG_HOOK_POST_EXTRACT):
++ @$(call MESSAGE,"Post extracting")
++ chmod a+x $(URG_DIR)/configure
++
diff --git a/patches/buildroot/2010.05/122-urg-add_package.patch b/patches/buildroot/2010.05/122-urg-add_package.patch
new file mode 100644
index 0000000..d56ead4
--- /dev/null
+++ b/patches/buildroot/2010.05/122-urg-add_package.patch
@@ -0,0 +1,56 @@
+Add URG sensors control library to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-24 09:27:20.000000000 +0200
++++ buildroot/package/Config.in 2010-06-24 09:27:55.000000000 +0200
+@@ -196,6 +196,7 @@
+ # mdev
+ source "package/udev/Config.in"
+ endif
++source "package/urg/Config.in"
+ source "package/usb_modeswitch/Config.in"
+ source "package/usbmount/Config.in"
+ source "package/usbutils/Config.in"
+Index: buildroot/package/urg/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/urg/Config.in 2010-06-24 09:32:29.000000000 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_URG
++ bool "urg library"
++ select BR2_PACKAGE_SDL
++ select BR2_PACKAGE_SDL_NET
++ help
++ Library to control Hokuyo's URG series sensors.
++ Requires SDL & SDL_net.
++
++ http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
+Index: buildroot/package/urg/urg.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/urg/urg.mk 2010-06-24 09:29:11.000000000 +0200
+@@ -0,0 +1,21 @@
++#############################################################
++#
++# urg library
++#
++#############################################################
++URG_VERSION:=0.8.11
++URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
++URG_SOURCE = urg-$(URG_VERSION).tar.gz
++URG_LIBTOOL_PATCH = NO
++URG_INSTALL_STAGING = YES
++URG_INSTALL_TARGET = YES
++
++URG_CONF_OPT:=--with-sdl-prefix=$(STAGING_DIR)/usr \
++ --with-sdl-exec-prefix=$(STAGING_DIR)/usr
++
++$(eval $(call AUTOTARGETS,package,urg))
++
++$(URG_HOOK_POST_EXTRACT):
++ @$(call MESSAGE,"Post extracting")
++ chmod a+x $(URG_DIR)/configure
++
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index c873a68..d84d381 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -40,3 +40,4 @@ rm -rf buildroot/package/fbgrab/
rm -rf buildroot/package/fbtest/
rm -rf buildroot/package/xenomai/
rm -rf buildroot/package/cwiid/
+rm -rf buildroot/package/urg/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 3883cf5..75d5faa 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -44,3 +44,4 @@ rm -rf buildroot/package/fbgrab/
rm -rf buildroot/package/fbtest/
rm -rf buildroot/package/xenomai/
rm -rf buildroot/package/cwiid/
+rm -rf buildroot/package/urg/
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-24 07:44:25
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 422fa54856442ff19721f529256b0658062e0b3b (commit)
from 69e8c126199a4e9d29db461ce6e50b23d57cf81f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 422fa54856442ff19721f529256b0658062e0b3b
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 24 09:43:55 2010 +0200
Suppress some indent modification
-----------------------------------------------------------------------
Summary of changes:
...ing_mangling_capability_on_i2c_mxc_driver.patch | 41 +-------------------
1 files changed, 1 insertions(+), 40 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
index e410285..a01bf99 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
@@ -1,11 +1,7 @@
-Adding mangling capability on mxc I²C driver.
-
-Signed-off-by: Fabien Marteau <fab...@ar...>
-
Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
===================================================================
--- linux-2.6.29.6.orig/drivers/i2c/busses/i2c-mxc.c 2010-06-23 17:56:23.000000000 +0200
-+++ linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c 2010-06-24 09:05:32.000000000 +0200
++++ linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c 2010-06-24 09:42:49.000000000 +0200
@@ -45,6 +45,7 @@
struct clk *clk;
bool low_power;
@@ -65,15 +61,6 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
addr_trans |= 0x01;
}
cr = readw(dev->membase + MXC_I2CR);
-@@ -213,7 +227,7 @@
- * The function returns the number of bytes read or -1 on time out.
- */
- static int imx_i2c_readbytes(imx_i2c_device * dev, struct i2c_msg *msg,
-- int last, int addr_comp)
-+ int last, int addr_comp)
- {
- int i;
- char *buf = msg->buf;
@@ -245,10 +259,16 @@
imx_i2c_stop(dev);
return -1;
@@ -138,29 +125,3 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
}
/*
-@@ -450,6 +472,7 @@
- #endif
- } else {
- /* Interrupt due byte transfer completion */
-+
- tx_success = false;
- /* Check if RXAK is received in Transmit mode */
- if (cr & MXC_I2CR_MTX) {
-@@ -542,7 +565,7 @@
- }
- if (!request_mem_region(res->start, res->end - res->start + 1, DRV_NAME)) {
- dev_err(&pdev->dev, "request_mem_region failed for IMX I2C %d\n", id);
-- ret = -EBUSY;
-+ ret = -EBUSY;
- goto err1;
- }
-
-@@ -581,7 +604,7 @@
- if (i2c_plat_data->max_clk) {
- /* Calculate divider and round up any fractional part */
- int div = (clk_freq + i2c_plat_data->max_clk - 1) /
-- i2c_plat_data->max_clk;
-+ i2c_plat_data->max_clk;
- for (i = 0; i2c_clk_table[i].div != 0; i++) {
- if (i2c_clk_table[i].div >= div) {
- imx_i2c->clkdiv = i2c_clk_table[i].reg_value;
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-24 07:10:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 69e8c126199a4e9d29db461ce6e50b23d57cf81f (commit)
from 5694b896eebc4f7085e3ddc81841bdca01bf9d70 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 69e8c126199a4e9d29db461ce6e50b23d57cf81f
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jun 24 09:09:45 2010 +0200
Indentation & comments
-----------------------------------------------------------------------
Summary of changes:
...ing_mangling_capability_on_i2c_mxc_driver.patch | 59 ++++++++++---------
1 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
index a49a57f..e410285 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
@@ -1,7 +1,11 @@
+Adding mangling capability on mxc I²C driver.
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
===================================================================
--- linux-2.6.29.6.orig/drivers/i2c/busses/i2c-mxc.c 2010-06-23 17:56:23.000000000 +0200
-+++ linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c 2010-06-23 17:57:16.000000000 +0200
++++ linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c 2010-06-24 09:05:32.000000000 +0200
@@ -45,6 +45,7 @@
struct clk *clk;
bool low_power;
@@ -10,15 +14,14 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
} imx_i2c_device;
/*
-@@ -118,7 +119,14 @@
+@@ -118,7 +119,13 @@
*/
static int imx_i2c_wait_for_tc(imx_i2c_device * dev, int trans_flag)
{
- int retry = 4;
+ int retry;
+
-+ if (trans_flag& I2C_M_IGNORE_NAK)
-+ {
++ if (trans_flag& I2C_M_IGNORE_NAK) {
+ retry = 1;
+ } else {
+ retry = 4;
@@ -26,41 +29,43 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
while (retry-- && !transfer_done) {
wait_event_interruptible_timeout(dev->wq,
-@@ -138,6 +146,9 @@
+@@ -138,8 +145,11 @@
#ifdef I2C_DEBUG
printk(KERN_DEBUG "Data not transmitted\n");
#endif
-+ if (trans_flag& I2C_M_IGNORE_NAK)
-+ return 0;
-+ else
- return -1;
- }
+- return -1;
+- }
++ if (trans_flag& I2C_M_IGNORE_NAK)
++ return 0;
++ else
++ return -1;
++ }
-@@ -156,7 +167,10 @@
+ return 0;
+ }
+@@ -156,7 +166,9 @@
* in the data register
*/
addr_trans = msg->addr << 1;
- if (msg->flags & I2C_M_RD) {
+ if ((msg->flags & I2C_M_RD) && ((msg->flags & I2C_M_REV_DIR_ADDR)==0)) {
+ addr_trans |= 0x01;
-+ } else if ((msg->flags & I2C_M_REV_DIR_ADDR) != 0)
-+ {
++ } else if ((msg->flags & I2C_M_REV_DIR_ADDR) != 0) {
addr_trans |= 0x01;
}
-@@ -196,7 +210,10 @@
+@@ -196,7 +208,9 @@
* in the data register
*/
addr_trans = msg->addr << 1;
- if (msg->flags & I2C_M_RD) {
+ if ((msg->flags & I2C_M_RD) && ((msg->flags & I2C_M_REV_DIR_ADDR)==0)) {
+ addr_trans |= 0x01;
-+ } else if ((msg->flags & I2C_M_REV_DIR_ADDR) != 0)
-+ {
++ } else if ((msg->flags & I2C_M_REV_DIR_ADDR) != 0) {
addr_trans |= 0x01;
}
cr = readw(dev->membase + MXC_I2CR);
-@@ -213,7 +230,7 @@
+@@ -213,7 +227,7 @@
* The function returns the number of bytes read or -1 on time out.
*/
static int imx_i2c_readbytes(imx_i2c_device * dev, struct i2c_msg *msg,
@@ -69,7 +74,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
{
int i;
char *buf = msg->buf;
-@@ -245,10 +262,17 @@
+@@ -245,10 +259,16 @@
imx_i2c_stop(dev);
return -1;
}
@@ -80,8 +85,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
if (i == (len - 2)) {
cr = readw(dev->membase + MXC_I2CR);
- cr |= MXC_I2CR_TXAK;
-+ if ((msg->flags & I2C_M_NO_RD_ACK) == 0)
-+ {
++ if ((msg->flags & I2C_M_NO_RD_ACK) == 0) {
+ cr |= MXC_I2CR_TXAK;
+ } else {
+ cr &= ~MXC_I2CR_TXAK;
@@ -89,7 +93,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
writew(cr, dev->membase + MXC_I2CR);
} else if (i == (len - 1)) {
if (last)
-@@ -352,6 +376,7 @@
+@@ -352,6 +372,7 @@
tx_success = false;
for (i = 0; i < num && ret >= 0; i++) {
addr_comp = 0;
@@ -97,7 +101,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
/*
* Send the slave address and transfer direction in the
* address cycle
-@@ -372,17 +397,19 @@
+@@ -372,17 +393,18 @@
* changed or the transfer direction changed
*/
if ((msgs[i].addr != msgs[i - 1].addr) ||
@@ -111,8 +115,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
- return -EREMOTEIO;
+ ((msgs[i].flags & I2C_M_RD) !=
+ (msgs[i - 1].flags & I2C_M_RD)))
-+ if ((msgs[i].flags & I2C_M_NOSTART) == 0)
-+ {
++ if ((msgs[i].flags & I2C_M_NOSTART) == 0) {
+ imx_i2c_repstart(dev, &msgs[i]);
+ /* Wait for the address cycle to complete */
+ if (imx_i2c_wait_for_tc(dev, msgs[i].flags)) {
@@ -126,7 +129,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
}
/* Transfer the data */
-@@ -414,7 +441,7 @@
+@@ -414,7 +436,7 @@
*/
static u32 imx_i2c_func(struct i2c_adapter *adap)
{
@@ -135,7 +138,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
}
/*
-@@ -450,6 +477,7 @@
+@@ -450,6 +472,7 @@
#endif
} else {
/* Interrupt due byte transfer completion */
@@ -143,7 +146,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
tx_success = false;
/* Check if RXAK is received in Transmit mode */
if (cr & MXC_I2CR_MTX) {
-@@ -542,7 +570,7 @@
+@@ -542,7 +565,7 @@
}
if (!request_mem_region(res->start, res->end - res->start + 1, DRV_NAME)) {
dev_err(&pdev->dev, "request_mem_region failed for IMX I2C %d\n", id);
@@ -152,7 +155,7 @@ Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
goto err1;
}
-@@ -581,7 +609,7 @@
+@@ -581,7 +604,7 @@
if (i2c_plat_data->max_clk) {
/* Calculate divider and round up any fractional part */
int div = (clk_freq + i2c_plat_data->max_clk - 1) /
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-23 15:59:12
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5694b896eebc4f7085e3ddc81841bdca01bf9d70 (commit)
from 53da993b94e908532e785b7686d2c88d05c7a75a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5694b896eebc4f7085e3ddc81841bdca01bf9d70
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jun 23 17:58:35 2010 +0200
[linux][i2c] adding_mangling_capability_on_i2c_mxc_driver
-----------------------------------------------------------------------
Summary of changes:
...ing_mangling_capability_on_i2c_mxc_driver.patch | 163 ++++++++++++++++++++
1 files changed, 163 insertions(+), 0 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
new file mode 100644
index 0000000..a49a57f
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/358-armadeus-imx-adding_mangling_capability_on_i2c_mxc_driver.patch
@@ -0,0 +1,163 @@
+Index: linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c
+===================================================================
+--- linux-2.6.29.6.orig/drivers/i2c/busses/i2c-mxc.c 2010-06-23 17:56:23.000000000 +0200
++++ linux-2.6.29.6/drivers/i2c/busses/i2c-mxc.c 2010-06-23 17:57:16.000000000 +0200
+@@ -45,6 +45,7 @@
+ struct clk *clk;
+ bool low_power;
+ struct imx_i2c_platform_data *pdata;
++ int trans_flag;
+ } imx_i2c_device;
+
+ /*
+@@ -118,7 +119,14 @@
+ */
+ static int imx_i2c_wait_for_tc(imx_i2c_device * dev, int trans_flag)
+ {
+- int retry = 4;
++ int retry;
++
++ if (trans_flag& I2C_M_IGNORE_NAK)
++ {
++ retry = 1;
++ } else {
++ retry = 4;
++ }
+
+ while (retry-- && !transfer_done) {
+ wait_event_interruptible_timeout(dev->wq,
+@@ -138,6 +146,9 @@
+ #ifdef I2C_DEBUG
+ printk(KERN_DEBUG "Data not transmitted\n");
+ #endif
++ if (trans_flag& I2C_M_IGNORE_NAK)
++ return 0;
++ else
+ return -1;
+ }
+
+@@ -156,7 +167,10 @@
+ * in the data register
+ */
+ addr_trans = msg->addr << 1;
+- if (msg->flags & I2C_M_RD) {
++ if ((msg->flags & I2C_M_RD) && ((msg->flags & I2C_M_REV_DIR_ADDR)==0)) {
++ addr_trans |= 0x01;
++ } else if ((msg->flags & I2C_M_REV_DIR_ADDR) != 0)
++ {
+ addr_trans |= 0x01;
+ }
+
+@@ -196,7 +210,10 @@
+ * in the data register
+ */
+ addr_trans = msg->addr << 1;
+- if (msg->flags & I2C_M_RD) {
++ if ((msg->flags & I2C_M_RD) && ((msg->flags & I2C_M_REV_DIR_ADDR)==0)) {
++ addr_trans |= 0x01;
++ } else if ((msg->flags & I2C_M_REV_DIR_ADDR) != 0)
++ {
+ addr_trans |= 0x01;
+ }
+ cr = readw(dev->membase + MXC_I2CR);
+@@ -213,7 +230,7 @@
+ * The function returns the number of bytes read or -1 on time out.
+ */
+ static int imx_i2c_readbytes(imx_i2c_device * dev, struct i2c_msg *msg,
+- int last, int addr_comp)
++ int last, int addr_comp)
+ {
+ int i;
+ char *buf = msg->buf;
+@@ -245,10 +262,17 @@
+ imx_i2c_stop(dev);
+ return -1;
+ }
+- /* Do not generate an ACK for the last byte */
++ /* Do not generate an ACK for the last byte
++ * or if I2C_M_NO_RD_ACK flag is set
++ */
+ if (i == (len - 2)) {
+ cr = readw(dev->membase + MXC_I2CR);
+- cr |= MXC_I2CR_TXAK;
++ if ((msg->flags & I2C_M_NO_RD_ACK) == 0)
++ {
++ cr |= MXC_I2CR_TXAK;
++ } else {
++ cr &= ~MXC_I2CR_TXAK;
++ }
+ writew(cr, dev->membase + MXC_I2CR);
+ } else if (i == (len - 1)) {
+ if (last)
+@@ -352,6 +376,7 @@
+ tx_success = false;
+ for (i = 0; i < num && ret >= 0; i++) {
+ addr_comp = 0;
++ dev->trans_flag = msgs[i].flags;
+ /*
+ * Send the slave address and transfer direction in the
+ * address cycle
+@@ -372,17 +397,19 @@
+ * changed or the transfer direction changed
+ */
+ if ((msgs[i].addr != msgs[i - 1].addr) ||
+- ((msgs[i].flags & I2C_M_RD) !=
+- (msgs[i - 1].flags & I2C_M_RD))) {
+- imx_i2c_repstart(dev, &msgs[i]);
+- /* Wait for the address cycle to complete */
+- if (imx_i2c_wait_for_tc(dev, msgs[i].flags)) {
+- imx_i2c_stop(dev);
+- imx_i2c_module_dis(dev);
+- return -EREMOTEIO;
++ ((msgs[i].flags & I2C_M_RD) !=
++ (msgs[i - 1].flags & I2C_M_RD)))
++ if ((msgs[i].flags & I2C_M_NOSTART) == 0)
++ {
++ imx_i2c_repstart(dev, &msgs[i]);
++ /* Wait for the address cycle to complete */
++ if (imx_i2c_wait_for_tc(dev, msgs[i].flags)) {
++ imx_i2c_stop(dev);
++ imx_i2c_module_dis(dev);
++ return -EREMOTEIO;
++ }
+ }
+ addr_comp = 1;
+- }
+ }
+
+ /* Transfer the data */
+@@ -414,7 +441,7 @@
+ */
+ static u32 imx_i2c_func(struct i2c_adapter *adap)
+ {
+- return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
++ return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_PROTOCOL_MANGLING ;
+ }
+
+ /*
+@@ -450,6 +477,7 @@
+ #endif
+ } else {
+ /* Interrupt due byte transfer completion */
++
+ tx_success = false;
+ /* Check if RXAK is received in Transmit mode */
+ if (cr & MXC_I2CR_MTX) {
+@@ -542,7 +570,7 @@
+ }
+ if (!request_mem_region(res->start, res->end - res->start + 1, DRV_NAME)) {
+ dev_err(&pdev->dev, "request_mem_region failed for IMX I2C %d\n", id);
+- ret = -EBUSY;
++ ret = -EBUSY;
+ goto err1;
+ }
+
+@@ -581,7 +609,7 @@
+ if (i2c_plat_data->max_clk) {
+ /* Calculate divider and round up any fractional part */
+ int div = (clk_freq + i2c_plat_data->max_clk - 1) /
+- i2c_plat_data->max_clk;
++ i2c_plat_data->max_clk;
+ for (i = 0; i2c_clk_table[i].div != 0; i++) {
+ if (i2c_clk_table[i].div >= div) {
+ imx_i2c->clkdiv = i2c_clk_table[i].reg_value;
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-23 14:14:00
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 53da993b94e908532e785b7686d2c88d05c7a75a (commit)
from fb47d6f0427ea903f72557d4fc3d611e636f33ce (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 53da993b94e908532e785b7686d2c88d05c7a75a
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 23 16:13:25 2010 +0200
[BUILDROOT] Bump NcFTP version to 3.2.4
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/121-ncftp-bump_version.patch | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/121-ncftp-bump_version.patch
diff --git a/patches/buildroot/121-ncftp-bump_version.patch b/patches/buildroot/121-ncftp-bump_version.patch
new file mode 100644
index 0000000..d994dc0
--- /dev/null
+++ b/patches/buildroot/121-ncftp-bump_version.patch
@@ -0,0 +1,24 @@
+From bc065596b4dd69fa36e2f8319b63fc4cd9e18529 Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Sat, 29 May 2010 10:47:04 +0000
+Subject: ncftp: bump version
+
+Due to recent 3.2.4 release, 3.2.2 download address has changed, so
+I prefered bump version to 3.2.4 rather than changing NCFTP_SITE.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+Index: buildroot/package/ncftp/ncftp.mk
+===================================================================
+--- buildroot.orig/package/ncftp/ncftp.mk 2008-11-03 09:15:12.000000000 +0100
++++ buildroot/package/ncftp/ncftp.mk 2010-06-23 16:11:34.000000000 +0200
+@@ -3,7 +3,7 @@
+ # ncftp client
+ #
+ #############################################################
+-NCFTP_VERSION:=3.2.2
++NCFTP_VERSION:=3.2.4
+ NCFTP_SOURCE:=ncftp-$(NCFTP_VERSION)-src.tar.bz2
+ NCFTP_SITE:=ftp://ftp.ncftp.com/ncftp
+ NCFTP_DIR:=$(BUILD_DIR)/ncftp-$(NCFTP_VERSION)
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-23 12:27:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via fb47d6f0427ea903f72557d4fc3d611e636f33ce (commit)
from 5aa3c3b458225bb67f71c0a260ee9f7d1e4905e4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fb47d6f0427ea903f72557d4fc3d611e636f33ce
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 23 14:26:31 2010 +0200
[BUILDROOT] [2010.05] Reactivates Armadeus specific packages in menuconfig
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 15 ++++++++++++++-
.../2010.05/001-add_armadeus_device.patch | 20 ++++++++++++++++++--
patches/buildroot/2010.05/006-lcd4linux.patch | 16 ++++++++--------
patches/buildroot/2010.05/018-allegro.patch | 10 +++++-----
.../buildroot/2010.05/021-sdl-water-config.patch | 10 +++++-----
patches/buildroot/2010.05/034-slideshow.patch | 14 +++++++-------
patches/buildroot/2010.05/041-fbgrab.patch | 12 ++++++------
patches/buildroot/2010.05/042-socketcan.patch | 14 +++++++-------
.../buildroot/2010.05/043-mesa-add_packages.patch | 12 ++++++------
.../2010.05/055-pyserial-add_package.patch | 10 +++++-----
.../2010.05/057-pymysql-add_package.patch | 14 +++++++-------
.../buildroot/2010.05/072-xenomai-package.patch | 20 ++++++++++----------
.../buildroot/2010.05/081-adds_quake_package.patch | 20 ++++++++++----------
.../2010.05/083-adds_pygame_package.patch | 12 ++++++------
.../buildroot/2010.05/085-adds_gpm_package.patch | 14 +++++++-------
.../buildroot/2010.05/095-uucp-add_packages.patch | 10 +++++-----
...e-add_infrastructure_to_install_firmwares.patch | 10 +++++-----
.../buildroot/2010.05/107-games-add_wolf4sdl.patch | 14 +++++++-------
.../buildroot/2010.05/110-bluez-add_package.patch | 6 +++---
.../buildroot/2010.05/113-gpsd-add_package.patch | 12 ++++++------
.../2010.05/116-openobex-add_package.patch | 14 +++++++-------
.../2010.05/117-ussp-push-add_package.patch | 10 +++++-----
.../buildroot/2010.05/118-snes9x-add_package.patch | 16 ++++++++--------
.../buildroot/2010.05/119-fbtest-add_package.patch | 16 ++++++++--------
.../buildroot/2010.05/120-cwiid-add_package.patch | 14 +++++++-------
25 files changed, 182 insertions(+), 153 deletions(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index a6f88a4..c6494b9 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Wed Jun 23 11:44:57 2010
+# Wed Jun 23 14:22:58 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.05"
@@ -272,6 +272,19 @@ BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION
# BR2_PACKAGE_CUSTOMIZE is not set
#
+# Armadeus specific tools/utilities
+#
+# BR2_PACKAGE_AD9889CTRL is not set
+# BR2_PACKAGE_AS_DEVICES is not set
+# BR2_PACKAGE_CH7024CTRL is not set
+# BR2_PACKAGE_ARMADEUS_DEMOS is not set
+# BR2_PACKAGE_FPGAREGS is not set
+# BR2_PACKAGE_IMXREGS is not set
+# BR2_PACKAGE_IMXSSI is not set
+BR2_PACKAGE_MAX5821CTRL=y
+# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
+
+#
# Audio and video libraries and applications
#
BR2_PACKAGE_ALSA_LIB=y
diff --git a/patches/buildroot/2010.05/001-add_armadeus_device.patch b/patches/buildroot/2010.05/001-add_armadeus_device.patch
index 5cb3aea..e724ffe 100644
--- a/patches/buildroot/2010.05/001-add_armadeus_device.patch
+++ b/patches/buildroot/2010.05/001-add_armadeus_device.patch
@@ -1,7 +1,9 @@
+Add armadeus target and packages specific menu to BR.
+
Index: buildroot/target/device/Config.in
===================================================================
---- buildroot.orig/target/device/Config.in 2010-06-17 16:45:14.000000000 +0200
-+++ buildroot/target/device/Config.in 2010-06-17 16:45:25.000000000 +0200
+--- buildroot.orig/target/device/Config.in 2010-05-30 22:24:10.000000000 +0200
++++ buildroot/target/device/Config.in 2010-06-23 14:05:46.000000000 +0200
@@ -2,6 +2,7 @@
comment "Preset Devices"
@@ -10,3 +12,17 @@ Index: buildroot/target/device/Config.in
source "target/device/ARMLTD/Config.in"
source "target/device/Atmel/Config.in"
source "target/device/KwikByte/Config.in"
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-23 14:06:51.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:09:19.000000000 +0200
+@@ -3,6 +3,9 @@
+ source "package/busybox/Config.in"
+ source "package/customize/Config.in"
+
++# Armadeus specific
++source "package/armadeus/Config.in"
++
+ # Audio and video applications
+ source "package/multimedia/Config.in"
+
diff --git a/patches/buildroot/2010.05/006-lcd4linux.patch b/patches/buildroot/2010.05/006-lcd4linux.patch
index b9f1621..d16e71b 100644
--- a/patches/buildroot/2010.05/006-lcd4linux.patch
+++ b/patches/buildroot/2010.05/006-lcd4linux.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:45:14.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:45:46.000000000 +0200
-@@ -172,6 +172,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:09:19.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:09:53.000000000 +0200
+@@ -175,6 +175,7 @@
source "package/i2c-tools/Config.in"
source "package/input-tools/Config.in"
source "package/iostat/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/lcd4linux/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/Config.in 2010-06-18 18:00:21.000000000 +0200
++++ buildroot/package/lcd4linux/Config.in 2010-06-23 14:09:53.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LCD4LINUX
+ bool "LCD4Linux daemon"
@@ -29,7 +29,7 @@ Index: buildroot/package/lcd4linux/Config.in
Index: buildroot/package/lcd4linux/lcd4linux.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/lcd4linux.mk 2010-06-18 17:25:24.000000000 +0200
++++ buildroot/package/lcd4linux/lcd4linux.mk 2010-06-23 14:09:53.000000000 +0200
@@ -0,0 +1,66 @@
+#############################################################
+#
@@ -100,7 +100,7 @@ Index: buildroot/package/lcd4linux/lcd4linux.mk
Index: buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch 2010-06-18 17:26:55.000000000 +0200
++++ buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch 2010-06-23 14:09:53.000000000 +0200
@@ -0,0 +1,13 @@
+This plugin doesn't compile yet (/anymore?)
+
@@ -118,7 +118,7 @@ Index: buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch
Index: buildroot/package/lcd4linux/lcd4linux-armadeus.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/lcd4linux-armadeus.patch 2010-06-18 17:27:39.000000000 +0200
++++ buildroot/package/lcd4linux/lcd4linux-armadeus.patch 2010-06-23 14:09:53.000000000 +0200
@@ -0,0 +1,181 @@
+diff -uprN lcd4linux-0.10.0/configure lcd4linux-0.10.0.armadeus/configure
+--- lcd4linux-0.10.0/configure 2005-06-10 13:21:49.000000000 +0200
@@ -304,7 +304,7 @@ Index: buildroot/package/lcd4linux/lcd4linux-armadeus.patch
Index: buildroot/package/lcd4linux/lcd4linux_armadeus.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/lcd4linux_armadeus.conf 2010-06-18 17:32:42.000000000 +0200
++++ buildroot/package/lcd4linux/lcd4linux_armadeus.conf 2010-06-23 14:09:53.000000000 +0200
@@ -0,0 +1,445 @@
+
+# Armadeus HD44780 display (Nico wiring ;-))
diff --git a/patches/buildroot/2010.05/018-allegro.patch b/patches/buildroot/2010.05/018-allegro.patch
index 2629af3..3863334 100644
--- a/patches/buildroot/2010.05/018-allegro.patch
+++ b/patches/buildroot/2010.05/018-allegro.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:45:46.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:45:48.000000000 +0200
-@@ -86,6 +86,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:09:53.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:10:14.000000000 +0200
+@@ -89,6 +89,7 @@
menu "Graphic libraries and applications (graphic/text)"
comment "graphic libraries"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/allegro/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/allegro/Config.in 2010-06-18 21:14:34.000000000 +0200
++++ buildroot/package/allegro/Config.in 2010-06-23 14:10:14.000000000 +0200
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_ALLEGRO
+ bool "Allegro"
@@ -35,7 +35,7 @@ Index: buildroot/package/allegro/Config.in
Index: buildroot/package/allegro/allegro.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/allegro/allegro.mk 2010-06-18 21:28:35.000000000 +0200
++++ buildroot/package/allegro/allegro.mk 2010-06-23 14:10:14.000000000 +0200
@@ -0,0 +1,75 @@
+#############################################################
+#
diff --git a/patches/buildroot/2010.05/021-sdl-water-config.patch b/patches/buildroot/2010.05/021-sdl-water-config.patch
index f0af0e1..ecfcfb5 100644
--- a/patches/buildroot/2010.05/021-sdl-water-config.patch
+++ b/patches/buildroot/2010.05/021-sdl-water-config.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-21 09:55:43.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-21 09:56:05.000000000 +0200
-@@ -106,6 +106,8 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:10:14.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:10:18.000000000 +0200
+@@ -109,6 +109,8 @@
source "package/sdl_net/Config.in"
source "package/sdl_ttf/Config.in"
source "package/sdl_gfx/Config.in"
@@ -18,7 +18,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/sdlwater/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdlwater/Config.in 2010-06-21 09:55:43.000000000 +0200
++++ buildroot/package/sdlwater/Config.in 2010-06-23 14:10:18.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_SDL_WATER
+ bool "SDL_water"
@@ -30,7 +30,7 @@ Index: buildroot/package/sdlwater/Config.in
Index: buildroot/package/sdlwater/sdlwater.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdlwater/sdlwater.mk 2010-06-21 09:55:43.000000000 +0200
++++ buildroot/package/sdlwater/sdlwater.mk 2010-06-23 14:10:18.000000000 +0200
@@ -0,0 +1,65 @@
+#############################################################
+#
diff --git a/patches/buildroot/2010.05/034-slideshow.patch b/patches/buildroot/2010.05/034-slideshow.patch
index 6031287..901ef7f 100644
--- a/patches/buildroot/2010.05/034-slideshow.patch
+++ b/patches/buildroot/2010.05/034-slideshow.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:46:13.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:46:21.000000000 +0200
-@@ -106,6 +106,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:10:18.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:10:23.000000000 +0200
+@@ -109,6 +109,7 @@
source "package/sdl_net/Config.in"
source "package/sdl_ttf/Config.in"
source "package/sdl_gfx/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/slideshow/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/Config.in 2010-06-18 11:33:25.000000000 +0200
++++ buildroot/package/slideshow/Config.in 2010-06-23 14:10:23.000000000 +0200
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_SLIDESHOW
+ bool "Slideshow"
@@ -31,7 +31,7 @@ Index: buildroot/package/slideshow/Config.in
Index: buildroot/package/slideshow/slideshow.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow.mk 2010-06-18 11:48:12.000000000 +0200
++++ buildroot/package/slideshow/slideshow.mk 2010-06-23 14:10:23.000000000 +0200
@@ -0,0 +1,51 @@
+#############################################################
+#
@@ -87,7 +87,7 @@ Index: buildroot/package/slideshow/slideshow.mk
Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2010-06-18 11:50:12.000000000 +0200
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2010-06-23 14:10:23.000000000 +0200
@@ -0,0 +1,73 @@
+--- slideshow/slideshow.cpp 2003-12-08 22:17:38.000000000 +0100
++++ slideshow.mod/slideshow.cpp 2007-09-08 19:05:10.000000000 +0200
@@ -165,7 +165,7 @@ Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2010-06-18 11:50:59.000000000 +0200
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2010-06-23 14:10:23.000000000 +0200
@@ -0,0 +1,13 @@
+--- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
++++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
diff --git a/patches/buildroot/2010.05/041-fbgrab.patch b/patches/buildroot/2010.05/041-fbgrab.patch
index b04449d..c7a34fd 100644
--- a/patches/buildroot/2010.05/041-fbgrab.patch
+++ b/patches/buildroot/2010.05/041-fbgrab.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:46:21.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:46:29.000000000 +0200
-@@ -91,6 +91,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:10:23.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:10:31.000000000 +0200
+@@ -94,6 +94,7 @@
source "package/directfb-examples/Config.in"
source "package/divine/Config.in"
source "package/fbdump/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/fbgrab/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbgrab/Config.in 2010-06-18 23:13:05.000000000 +0200
++++ buildroot/package/fbgrab/Config.in 2010-06-23 14:10:31.000000000 +0200
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_FBGRAB
+ bool "fbgrab"
@@ -31,7 +31,7 @@ Index: buildroot/package/fbgrab/Config.in
Index: buildroot/package/fbgrab/fbgrab.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbgrab/fbgrab.mk 2010-06-18 23:02:49.000000000 +0200
++++ buildroot/package/fbgrab/fbgrab.mk 2010-06-23 14:10:31.000000000 +0200
@@ -0,0 +1,48 @@
+#############################################################
+#
@@ -84,7 +84,7 @@ Index: buildroot/package/fbgrab/fbgrab.mk
Index: buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch 2010-06-18 23:07:20.000000000 +0200
++++ buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch 2010-06-23 14:10:31.000000000 +0200
@@ -0,0 +1,14 @@
+diff -urN fbgrab-1.0/Makefile fbgrab-1.0.mod/Makefile
+--- fbgrab-1.0/Makefile 2002-03-20 20:49:06.000000000 +0100
diff --git a/patches/buildroot/2010.05/042-socketcan.patch b/patches/buildroot/2010.05/042-socketcan.patch
index fe1ab54..e14d1c3 100644
--- a/patches/buildroot/2010.05/042-socketcan.patch
+++ b/patches/buildroot/2010.05/042-socketcan.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:46:29.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:46:31.000000000 +0200
-@@ -408,6 +408,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:10:31.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:10:36.000000000 +0200
+@@ -411,6 +411,7 @@
source "package/samba/Config.in"
source "package/ser2net/Config.in"
source "package/socat/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/socketcan/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/Config.in 2010-06-18 16:59:38.000000000 +0200
++++ buildroot/package/socketcan/Config.in 2010-06-23 14:10:36.000000000 +0200
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_SOCKETCAN
+ bool "Socket CAN"
@@ -43,7 +43,7 @@ Index: buildroot/package/socketcan/Config.in
Index: buildroot/package/socketcan/socketcan.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan.mk 2010-06-18 17:03:14.000000000 +0200
++++ buildroot/package/socketcan/socketcan.mk 2010-06-23 14:10:36.000000000 +0200
@@ -0,0 +1,69 @@
+#############################################################
+#
@@ -117,7 +117,7 @@ Index: buildroot/package/socketcan/socketcan.mk
Index: buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch 2010-06-18 17:03:41.000000000 +0200
++++ buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch 2010-06-23 14:10:36.000000000 +0200
@@ -0,0 +1,33 @@
+diff -urN socketcan-svn-rev810.org/can-utils/Makefile socketcan-svn-rev810/can-utils/Makefile
+--- socketcan-svn-rev810.org/can-utils/Makefile 2008-07-16 10:52:02.000000000 +0200
@@ -155,7 +155,7 @@ Index: buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch
Index: buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch 2010-06-18 17:04:29.000000000 +0200
++++ buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch 2010-06-23 14:10:36.000000000 +0200
@@ -0,0 +1,63 @@
+diff -urN socketcan-svn-rev810.org/can-utils/Makefile socketcan-svn-rev810/can-utils/Makefile
+--- socketcan-svn-rev874.org/can-utils/Makefile 2008-07-16 10:52:02.000000000 +0200
diff --git a/patches/buildroot/2010.05/043-mesa-add_packages.patch b/patches/buildroot/2010.05/043-mesa-add_packages.patch
index d0b8ede..95c280b 100644
--- a/patches/buildroot/2010.05/043-mesa-add_packages.patch
+++ b/patches/buildroot/2010.05/043-mesa-add_packages.patch
@@ -1,8 +1,8 @@
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-18 18:15:21.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-18 18:16:00.000000000 +0200
-@@ -266,6 +266,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:10:36.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:10:43.000000000 +0200
+@@ -269,6 +269,7 @@
source "package/libgtk2/Config.in"
source "package/libpng/Config.in"
source "package/libungif/Config.in"
@@ -13,7 +13,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/mesa/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/mesa/Config.in 2010-06-18 18:17:52.000000000 +0200
++++ buildroot/package/mesa/Config.in 2010-06-23 14:10:43.000000000 +0200
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_MESALIB
+ bool "Mesa library"
@@ -24,7 +24,7 @@ Index: buildroot/package/mesa/Config.in
Index: buildroot/package/mesa/mesa.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/mesa/mesa.mk 2010-06-18 18:21:31.000000000 +0200
++++ buildroot/package/mesa/mesa.mk 2010-06-23 14:10:43.000000000 +0200
@@ -0,0 +1,66 @@
+#############################################################
+#
@@ -95,7 +95,7 @@ Index: buildroot/package/mesa/mesa.mk
Index: buildroot/package/mesa/mesa.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/mesa/mesa.patch 2010-06-18 18:24:03.000000000 +0200
++++ buildroot/package/mesa/mesa.patch 2010-06-23 14:10:43.000000000 +0200
@@ -0,0 +1,188 @@
+diff -bruN Mesa-7.0.orig/configs/arm-linux-osmesa Mesa-7.0/configs/arm-linux-osmesa
+--- Mesa-7.0.orig/configs/arm-linux-osmesa 1970-01-01 01:00:00.000000000 +0100
diff --git a/patches/buildroot/2010.05/055-pyserial-add_package.patch b/patches/buildroot/2010.05/055-pyserial-add_package.patch
index 2a27d97..d73be12 100644
--- a/patches/buildroot/2010.05/055-pyserial-add_package.patch
+++ b/patches/buildroot/2010.05/055-pyserial-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:46:31.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:47:12.000000000 +0200
-@@ -216,6 +216,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:10:43.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:11:10.000000000 +0200
+@@ -219,6 +219,7 @@
source "package/microperl/Config.in"
source "package/php/Config.in"
source "package/python/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/pyserial/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pyserial/Config.in 2010-06-18 14:16:37.000000000 +0200
++++ buildroot/package/pyserial/Config.in 2010-06-23 14:11:10.000000000 +0200
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_PYSERIAL
+ bool "pyserial"
@@ -27,7 +27,7 @@ Index: buildroot/package/pyserial/Config.in
Index: buildroot/package/pyserial/pyserial.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pyserial/pyserial.mk 2010-06-18 15:07:52.000000000 +0200
++++ buildroot/package/pyserial/pyserial.mk 2010-06-23 14:11:10.000000000 +0200
@@ -0,0 +1,33 @@
+PYSERIAL_VERSION=2.2
+PYSERIAL_SOURCE=pyserial-$(PYSERIAL_VERSION).zip
diff --git a/patches/buildroot/2010.05/057-pymysql-add_package.patch b/patches/buildroot/2010.05/057-pymysql-add_package.patch
index 07d5986..484d431 100644
--- a/patches/buildroot/2010.05/057-pymysql-add_package.patch
+++ b/patches/buildroot/2010.05/057-pymysql-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:47:12.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:47:13.000000000 +0200
-@@ -217,6 +217,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:11:10.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:11:14.000000000 +0200
+@@ -220,6 +220,7 @@
source "package/php/Config.in"
source "package/python/Config.in"
source "package/pyserial/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/pymysql/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pymysql/Config.in 2010-06-18 15:53:08.000000000 +0200
++++ buildroot/package/pymysql/Config.in 2010-06-23 14:11:14.000000000 +0200
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYMYSQL
+ depends on BR2_PACKAGE_PYTHON
@@ -31,7 +31,7 @@ Index: buildroot/package/pymysql/Config.in
Index: buildroot/package/pymysql/pymysql.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pymysql/pymysql.mk 2010-06-18 16:33:05.000000000 +0200
++++ buildroot/package/pymysql/pymysql.mk 2010-06-23 14:11:14.000000000 +0200
@@ -0,0 +1,76 @@
+#############################################################
+#
@@ -112,7 +112,7 @@ Index: buildroot/package/pymysql/pymysql.mk
Index: buildroot/package/pymysql/pymysql-000-setup.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pymysql/pymysql-000-setup.patch 2010-06-18 15:53:08.000000000 +0200
++++ buildroot/package/pymysql/pymysql-000-setup.patch 2010-06-23 14:11:14.000000000 +0200
@@ -0,0 +1,12 @@
+--- MySQL-python-1.2.2/setup.py 2007-02-25 04:37:12.000000000 +0100
++++ MySQL-python-1.2.2/setup.py 2007-08-15 12:23:18.000000000 +0200
@@ -129,7 +129,7 @@ Index: buildroot/package/pymysql/pymysql-000-setup.patch
Index: buildroot/package/pymysql/pymysql-010-threadsafe.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pymysql/pymysql-010-threadsafe.patch 2010-06-18 15:53:08.000000000 +0200
++++ buildroot/package/pymysql/pymysql-010-threadsafe.patch 2010-06-23 14:11:14.000000000 +0200
@@ -0,0 +1,11 @@
+--- MySQL-python-1.2.2/site_orig.cfg 2007-08-15 12:58:40.000000000 +0200
++++ MySQL-python-1.2.2/site.cfg 2007-08-15 12:58:49.000000000 +0200
diff --git a/patches/buildroot/2010.05/072-xenomai-package.patch b/patches/buildroot/2010.05/072-xenomai-package.patch
index 211138e..69fb29e 100644
--- a/patches/buildroot/2010.05/072-xenomai-package.patch
+++ b/patches/buildroot/2010.05/072-xenomai-package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-21 09:56:27.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-21 09:56:27.000000000 +0200
-@@ -206,6 +206,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:11:14.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:11:22.000000000 +0200
+@@ -209,6 +209,7 @@
source "package/usbmount/Config.in"
source "package/usbutils/Config.in"
source "package/wipe/Config.in"
@@ -16,8 +16,8 @@ Index: buildroot/package/Config.in
Index: buildroot/target/linux/Makefile.in.advanced
===================================================================
---- buildroot.orig/target/linux/Makefile.in.advanced 2010-06-21 09:56:27.000000000 +0200
-+++ buildroot/target/linux/Makefile.in.advanced 2010-06-21 09:56:27.000000000 +0200
+--- buildroot.orig/target/linux/Makefile.in.advanced 2010-06-23 14:11:21.000000000 +0200
++++ buildroot/target/linux/Makefile.in.advanced 2010-06-23 14:11:22.000000000 +0200
@@ -373,6 +373,9 @@
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
(cd $(LINUX_DIR)/drivers; ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ armadeus)
@@ -31,7 +31,7 @@ Index: buildroot/target/linux/Makefile.in.advanced
Index: buildroot/package/xenomai/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/Config.in 2010-06-21 09:56:27.000000000 +0200
++++ buildroot/package/xenomai/Config.in 2010-06-23 14:11:22.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XENOMAI
+ bool "Xenomai"
@@ -43,7 +43,7 @@ Index: buildroot/package/xenomai/Config.in
Index: buildroot/package/xenomai/xenomai.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/xenomai.mk 2010-06-21 09:56:27.000000000 +0200
++++ buildroot/package/xenomai/xenomai.mk 2010-06-23 14:11:22.000000000 +0200
@@ -0,0 +1,99 @@
+#############################################################
+#
@@ -147,7 +147,7 @@ Index: buildroot/package/xenomai/xenomai.mk
Index: buildroot/package/xenomai/xeno-kernel.config
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/xeno-kernel.config 2010-06-21 09:56:27.000000000 +0200
++++ buildroot/package/xenomai/xeno-kernel.config 2010-06-23 14:11:22.000000000 +0200
@@ -0,0 +1,59 @@
+CONFIG_XENOMAI=y
+CONFIG_XENO_OPT_NUCLEUS=y
@@ -212,7 +212,7 @@ Index: buildroot/package/xenomai/xeno-kernel.config
Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2010-06-21 09:56:27.000000000 +0200
++++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2010-06-23 14:11:22.000000000 +0200
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-imx/include/mach/imxfb.h
++++ b/arch/arm/mach-imx/include/mach/imxfb.h
@@ -227,7 +227,7 @@ Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.pat
Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2010-06-21 09:56:27.000000000 +0200
++++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2010-06-23 14:11:22.000000000 +0200
@@ -0,0 +1,23 @@
+Corrects Freeze problem with MX2 when Adeos is active and
+application/driver uses interruption on GPIO
diff --git a/patches/buildroot/2010.05/081-adds_quake_package.patch b/patches/buildroot/2010.05/081-adds_quake_package.patch
index 5572fcd..7f09ece 100644
--- a/patches/buildroot/2010.05/081-adds_quake_package.patch
+++ b/patches/buildroot/2010.05/081-adds_quake_package.patch
@@ -16,7 +16,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/games/sdlquake/sdlquake.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake.mk 2010-06-21 09:56:48.000000000 +0200
++++ buildroot/package/games/sdlquake/sdlquake.mk 2010-06-23 14:11:31.000000000 +0200
@@ -0,0 +1,31 @@
+#############################################################
+#
@@ -52,7 +52,7 @@ Index: buildroot/package/games/sdlquake/sdlquake.mk
Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2010-06-21 09:56:48.000000000 +0200
++++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2010-06-23 14:11:31.000000000 +0200
@@ -0,0 +1,35 @@
+--- /tmp/Makefile.am 2008-08-11 20:31:09.000000000 +0200
++++ sdlquake-1.0.9/Makefile.am 2008-08-11 20:55:00.263198000 +0200
@@ -92,7 +92,7 @@ Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
Index: buildroot/package/games/sdlquake/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/Config.in 2010-06-21 09:56:48.000000000 +0200
++++ buildroot/package/games/sdlquake/Config.in 2010-06-23 14:11:31.000000000 +0200
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_SDLQUAKE
+ bool "sdlquake"
@@ -107,7 +107,7 @@ Index: buildroot/package/games/sdlquake/Config.in
Index: buildroot/package/games/quake-pak/quake-pak.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/quake-pak/quake-pak.mk 2010-06-21 09:56:48.000000000 +0200
++++ buildroot/package/games/quake-pak/quake-pak.mk 2010-06-23 14:11:31.000000000 +0200
@@ -0,0 +1,34 @@
+#############################################################
+#
@@ -146,7 +146,7 @@ Index: buildroot/package/games/quake-pak/quake-pak.mk
Index: buildroot/package/games/quake-pak/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/quake-pak/Config.in 2010-06-21 09:56:48.000000000 +0200
++++ buildroot/package/games/quake-pak/Config.in 2010-06-23 14:11:31.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_QUAKE_PAK
+ bool "shareware Quake PAK/WAD file"
@@ -157,8 +157,8 @@ Index: buildroot/package/games/quake-pak/Config.in
+ The file will be placed in the /usr/share/games/quake/ directory.
Index: buildroot/package/games/Config.in
===================================================================
---- buildroot.orig/package/games/Config.in 2010-06-21 09:56:03.000000000 +0200
-+++ buildroot/package/games/Config.in 2010-06-21 09:56:48.000000000 +0200
+--- buildroot.orig/package/games/Config.in 2010-06-23 14:06:27.000000000 +0200
++++ buildroot/package/games/Config.in 2010-06-23 14:11:31.000000000 +0200
@@ -5,5 +5,7 @@
source "package/games/lxdoom/Config.in"
source "package/games/magiccube4d/Config.in"
@@ -169,9 +169,9 @@ Index: buildroot/package/games/Config.in
endmenu
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-21 09:57:11.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-21 10:00:07.000000000 +0200
-@@ -80,7 +80,9 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:11:22.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:11:31.000000000 +0200
+@@ -83,7 +83,9 @@
source "package/games/lxdoom/Config.in"
source "package/games/magiccube4d/Config.in"
source "package/games/prboom/Config.in"
diff --git a/patches/buildroot/2010.05/083-adds_pygame_package.patch b/patches/buildroot/2010.05/083-adds_pygame_package.patch
index 5348753..6bc63fb 100644
--- a/patches/buildroot/2010.05/083-adds_pygame_package.patch
+++ b/patches/buildroot/2010.05/083-adds_pygame_package.patch
@@ -13,7 +13,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/pygame/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/Config.in 2010-06-17 16:49:15.000000000 +0200
++++ buildroot/package/pygame/Config.in 2010-06-23 14:11:36.000000000 +0200
@@ -0,0 +1,92 @@
+config BR2_PACKAGE_PYGAME
+ bool "pygame"
@@ -110,7 +110,7 @@ Index: buildroot/package/pygame/Config.in
Index: buildroot/package/pygame/pygame.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/pygame.mk 2010-06-17 16:49:15.000000000 +0200
++++ buildroot/package/pygame/pygame.mk 2010-06-23 14:11:36.000000000 +0200
@@ -0,0 +1,100 @@
+#
+# Pygame
@@ -214,9 +214,9 @@ Index: buildroot/package/pygame/pygame.mk
+endif
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:47:20.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:49:15.000000000 +0200
-@@ -99,6 +99,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:11:31.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:11:36.000000000 +0200
+@@ -104,6 +104,7 @@
source "package/imagemagick/Config.in"
source "package/linux-fusion/Config.in"
source "package/lite/Config.in"
@@ -227,7 +227,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/pygame/Setup
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/Setup 2010-06-17 16:49:15.000000000 +0200
++++ buildroot/package/pygame/Setup 2010-06-23 14:11:36.000000000 +0200
@@ -0,0 +1,64 @@
+#This Setup file is used by the setup.py script to configure the
+#python extensions. You will likely use the "config.py" which will
diff --git a/patches/buildroot/2010.05/085-adds_gpm_package.patch b/patches/buildroot/2010.05/085-adds_gpm_package.patch
index 9f646cb..6997db4 100644
--- a/patches/buildroot/2010.05/085-adds_gpm_package.patch
+++ b/patches/buildroot/2010.05/085-adds_gpm_package.patch
@@ -5,7 +5,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/gpm/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/Config.in 2010-06-17 16:49:17.000000000 +0200
++++ buildroot/package/gpm/Config.in 2010-06-23 14:11:42.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_GPM
+ bool "gpm mouse server"
@@ -17,7 +17,7 @@ Index: buildroot/package/gpm/Config.in
Index: buildroot/package/gpm/gpm.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm.mk 2010-06-17 16:49:17.000000000 +0200
++++ buildroot/package/gpm/gpm.mk 2010-06-23 14:11:42.000000000 +0200
@@ -0,0 +1,18 @@
+#############################################################
+#
@@ -40,7 +40,7 @@ Index: buildroot/package/gpm/gpm.mk
Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch 2010-06-17 16:49:17.000000000 +0200
++++ buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch 2010-06-23 14:11:42.000000000 +0200
@@ -0,0 +1,77 @@
+
+Replaces all "obsolete" functions (at least to compile for uClibc).
@@ -121,9 +121,9 @@ Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
+ gpm_report (GPM_PR_WARN,"Flag value (%s) for parameter %s is invalid",
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:49:15.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:49:17.000000000 +0200
-@@ -168,6 +168,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:11:36.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:11:42.000000000 +0200
+@@ -173,6 +173,7 @@
source "package/gadgetfs-test/Config.in"
source "package/genext2fs/Config.in"
source "package/genromfs/Config.in"
@@ -134,7 +134,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch 2010-06-17 16:49:17.000000000 +0200
++++ buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch 2010-06-23 14:11:42.000000000 +0200
@@ -0,0 +1,30 @@
+GPM asks "install" to strip the executables while installing it.
+This doesn't seems cross-compiling friendly, so remove the option (-s) and let
diff --git a/patches/buildroot/2010.05/095-uucp-add_packages.patch b/patches/buildroot/2010.05/095-uucp-add_packages.patch
index 35ed448..f3dbd3d 100644
--- a/patches/buildroot/2010.05/095-uucp-add_packages.patch
+++ b/patches/buildroot/2010.05/095-uucp-add_packages.patch
@@ -6,9 +6,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-21 10:00:36.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-21 10:00:36.000000000 +0200
-@@ -430,6 +430,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:11:42.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:11:47.000000000 +0200
+@@ -433,6 +433,7 @@
source "package/tn5250/Config.in"
source "package/ttcp/Config.in"
source "package/udpcast/Config.in"
@@ -19,7 +19,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/uucp/uucp.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/uucp/uucp.mk 2010-06-21 10:00:36.000000000 +0200
++++ buildroot/package/uucp/uucp.mk 2010-06-23 14:11:47.000000000 +0200
@@ -0,0 +1,17 @@
+#############################################################
+#
@@ -41,7 +41,7 @@ Index: buildroot/package/uucp/uucp.mk
Index: buildroot/package/uucp/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/uucp/Config.in 2010-06-21 10:00:36.000000000 +0200
++++ buildroot/package/uucp/Config.in 2010-06-23 14:11:47.000000000 +0200
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_UUCP
+ bool "uucp"
diff --git a/patches/buildroot/2010.05/106-firmware-add_infrastructure_to_install_firmwares.patch b/patches/buildroot/2010.05/106-firmware-add_infrastructure_to_install_firmwares.patch
index d5a80fd..3951149 100644
--- a/patches/buildroot/2010.05/106-firmware-add_infrastructure_to_install_firmwares.patch
+++ b/patches/buildroot/2010.05/106-firmware-add_infrastructure_to_install_firmwares.patch
@@ -5,9 +5,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:49:17.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:50:24.000000000 +0200
-@@ -164,6 +164,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:11:47.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:12:57.000000000 +0200
+@@ -169,6 +169,7 @@
source "package/e2fsprogs/Config.in"
source "package/eeprog/Config.in"
source "package/fconfig/Config.in"
@@ -18,7 +18,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/firmware/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/firmware/Config.in 2010-06-17 16:50:24.000000000 +0200
++++ buildroot/package/firmware/Config.in 2010-06-23 14:12:57.000000000 +0200
@@ -0,0 +1,49 @@
+menuconfig BR2_PACKAGE_FIRMWARE
+ bool "linux-firmware"
@@ -72,7 +72,7 @@ Index: buildroot/package/firmware/Config.in
Index: buildroot/package/firmware/firmware.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/firmware/firmware.mk 2010-06-17 16:50:24.000000000 +0200
++++ buildroot/package/firmware/firmware.mk 2010-06-23 14:12:57.000000000 +0200
@@ -0,0 +1,71 @@
+#############################################################
+#
diff --git a/patches/buildroot/2010.05/107-games-add_wolf4sdl.patch b/patches/buildroot/2010.05/107-games-add_wolf4sdl.patch
index 9906a4e..c2e848e 100644
--- a/patches/buildroot/2010.05/107-games-add_wolf4sdl.patch
+++ b/patches/buildroot/2010.05/107-games-add_wolf4sdl.patch
@@ -5,7 +5,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/games/wolf4sdl/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/wolf4sdl/Config.in 2010-06-21 10:00:59.000000000 +0200
++++ buildroot/package/games/wolf4sdl/Config.in 2010-06-23 14:13:01.000000000 +0200
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_WOLF4SDL
+ bool "Wolf4SDL"
@@ -21,7 +21,7 @@ Index: buildroot/package/games/wolf4sdl/Config.in
Index: buildroot/package/games/wolf4sdl/wolf4sdl.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/wolf4sdl/wolf4sdl.mk 2010-06-21 10:00:59.000000000 +0200
++++ buildroot/package/games/wolf4sdl/wolf4sdl.mk 2010-06-23 14:13:01.000000000 +0200
@@ -0,0 +1,55 @@
+#############################################################
+#
@@ -80,8 +80,8 @@ Index: buildroot/package/games/wolf4sdl/wolf4sdl.mk
+endif
Index: buildroot/package/games/Config.in
===================================================================
---- buildroot.orig/package/games/Config.in 2010-06-21 09:56:48.000000000 +0200
-+++ buildroot/package/games/Config.in 2010-06-21 10:00:59.000000000 +0200
+--- buildroot.orig/package/games/Config.in 2010-06-23 14:11:31.000000000 +0200
++++ buildroot/package/games/Config.in 2010-06-23 14:13:01.000000000 +0200
@@ -8,4 +8,5 @@
source "package/games/quake-pak/Config.in"
source "package/games/rubix/Config.in"
@@ -90,9 +90,9 @@ Index: buildroot/package/games/Config.in
endmenu
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-21 10:01:27.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-21 10:01:48.000000000 +0200
-@@ -83,6 +83,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:12:57.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:13:01.000000000 +0200
+@@ -86,6 +86,7 @@
source "package/games/quake-pak/Config.in"
source "package/games/rubix/Config.in"
source "package/games/sdlquake/Config.in"
diff --git a/patches/buildroot/2010.05/110-bluez-add_package.patch b/patches/buildroot/2010.05/110-bluez-add_package.patch
index 7a6df7e..c275a5c 100644
--- a/patches/buildroot/2010.05/110-bluez-add_package.patch
+++ b/patches/buildroot/2010.05/110-bluez-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-22 11:34:20.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-22 11:35:22.000000000 +0200
-@@ -365,6 +365,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:13:01.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:13:05.000000000 +0200
+@@ -364,6 +364,7 @@
source "package/boa/Config.in"
endif
source "package/bind/Config.in"
diff --git a/patches/buildroot/2010.05/113-gpsd-add_package.patch b/patches/buildroot/2010.05/113-gpsd-add_package.patch
index 2c0cc23..5a7456e 100644
--- a/patches/buildroot/2010.05/113-gpsd-add_package.patch
+++ b/patches/buildroot/2010.05/113-gpsd-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:50:24.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:51:05.000000000 +0200
-@@ -170,6 +170,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:13:05.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:13:13.000000000 +0200
+@@ -176,6 +176,7 @@
source "package/genext2fs/Config.in"
source "package/genromfs/Config.in"
source "package/gpm/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/gpsd/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpsd/Config.in 2010-06-17 16:51:05.000000000 +0200
++++ buildroot/package/gpsd/Config.in 2010-06-23 14:13:13.000000000 +0200
@@ -0,0 +1,244 @@
+config BR2_PACKAGE_GPSD
+ bool "gpsd"
@@ -266,7 +266,7 @@ Index: buildroot/package/gpsd/Config.in
Index: buildroot/package/gpsd/gpsd.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpsd/gpsd.mk 2010-06-17 16:51:05.000000000 +0200
++++ buildroot/package/gpsd/gpsd.mk 2010-06-23 14:13:13.000000000 +0200
@@ -0,0 +1,169 @@
+#############################################################
+#
@@ -440,7 +440,7 @@ Index: buildroot/package/gpsd/gpsd.mk
Index: buildroot/package/gpsd/S50gpsd
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpsd/S50gpsd 2010-06-17 16:51:05.000000000 +0200
++++ buildroot/package/gpsd/S50gpsd 2010-06-23 14:13:13.000000000 +0200
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
diff --git a/patches/buildroot/2010.05/116-openobex-add_package.patch b/patches/buildroot/2010.05/116-openobex-add_package.patch
index d135d45..7521e66 100644
--- a/patches/buildroot/2010.05/116-openobex-add_package.patch
+++ b/patches/buildroot/2010.05/116-openobex-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-21 10:02:10.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-21 10:02:10.000000000 +0200
-@@ -406,6 +406,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:13:13.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:13:18.000000000 +0200
+@@ -410,6 +410,7 @@
source "package/ntp/Config.in"
source "package/olsr/Config.in"
source "package/openntpd/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/openobex/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/Config.in 2010-06-21 10:02:10.000000000 +0200
++++ buildroot/package/openobex/Config.in 2010-06-23 14:13:18.000000000 +0200
@@ -0,0 +1,25 @@
+config BR2_PACKAGE_OPENOBEX
+ bool "openobex"
@@ -47,7 +47,7 @@ Index: buildroot/package/openobex/Config.in
Index: buildroot/package/openobex/openobex.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex.mk 2010-06-21 10:02:10.000000000 +0200
++++ buildroot/package/openobex/openobex.mk 2010-06-23 14:13:18.000000000 +0200
@@ -0,0 +1,47 @@
+#############################################################
+#
@@ -99,7 +99,7 @@ Index: buildroot/package/openobex/openobex.mk
Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch 2010-06-21 10:02:10.000000000 +0200
++++ buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch 2010-06-23 14:13:18.000000000 +0200
@@ -0,0 +1,13 @@
+Index: openobex-1.5/acinclude.m4
+===================================================================
@@ -117,7 +117,7 @@ Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.pat
Index: buildroot/package/openobex/openobex-replace_deprecated_functions.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex-replace_deprecated_functions.patch 2010-06-21 10:02:10.000000000 +0200
++++ buildroot/package/openobex/openobex-replace_deprecated_functions.patch 2010-06-23 14:13:18.000000000 +0200
@@ -0,0 +1,25 @@
+Index: openobex-1.5/apps/obex_test_cable.c
+===================================================================
diff --git a/patches/buildroot/2010.05/117-ussp-push-add_package.patch b/patches/buildroot/2010.05/117-ussp-push-add_package.patch
index d51bee7..abdb50e 100644
--- a/patches/buildroot/2010.05/117-ussp-push-add_package.patch
+++ b/patches/buildroot/2010.05/117-ussp-push-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:51:08.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:51:13.000000000 +0200
-@@ -431,6 +431,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:13:18.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:13:23.000000000 +0200
+@@ -438,6 +438,7 @@
source "package/tn5250/Config.in"
source "package/ttcp/Config.in"
source "package/udpcast/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/ussp-push/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ussp-push/Config.in 2010-06-17 16:51:13.000000000 +0200
++++ buildroot/package/ussp-push/Config.in 2010-06-23 14:13:23.000000000 +0200
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_USSP_PUSH
+ bool "ussp-push"
@@ -32,7 +32,7 @@ Index: buildroot/package/ussp-push/Config.in
Index: buildroot/package/ussp-push/ussp-push.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ussp-push/ussp-push.mk 2010-06-17 16:51:13.000000000 +0200
++++ buildroot/package/ussp-push/ussp-push.mk 2010-06-23 14:13:23.000000000 +0200
@@ -0,0 +1,12 @@
+#############################################################
+#
diff --git a/patches/buildroot/2010.05/118-snes9x-add_package.patch b/patches/buildroot/2010.05/118-snes9x-add_package.patch
index 133a72a..1e864a9 100644
--- a/patches/buildroot/2010.05/118-snes9x-add_package.patch
+++ b/patches/buildroot/2010.05/118-snes9x-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/games/Config.in
===================================================================
---- buildroot.orig/package/games/Config.in 2010-06-21 10:00:59.000000000 +0200
-+++ buildroot/package/games/Config.in 2010-06-21 10:02:24.000000000 +0200
+--- buildroot.orig/package/games/Config.in 2010-06-23 14:13:01.000000000 +0200
++++ buildroot/package/games/Config.in 2010-06-23 14:13:28.000000000 +0200
@@ -8,5 +8,6 @@
source "package/games/quake-pak/Config.in"
source "package/games/rubix/Config.in"
@@ -16,7 +16,7 @@ Index: buildroot/package/games/Config.in
Index: buildroot/package/games/snes9x/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/snes9x/Config.in 2010-06-21 10:02:24.000000000 +0200
++++ buildroot/package/games/snes9x/Config.in 2010-06-23 14:13:28.000000000 +0200
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_SNES9X
+ bool "Snes9X"
@@ -32,7 +32,7 @@ Index: buildroot/package/games/snes9x/Config.in
Index: buildroot/package/games/snes9x/snes9x.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/snes9x/snes9x.mk 2010-06-21 10:02:24.000000000 +0200
++++ buildroot/package/games/snes9x/snes9x.mk 2010-06-23 14:13:28.000000000 +0200
@@ -0,0 +1,80 @@
+#############################################################
+#
@@ -117,7 +117,7 @@ Index: buildroot/package/games/snes9x/snes9x.mk
Index: buildroot/package/games/snes9x/snes9x-1.39-compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/snes9x/snes9x-1.39-compile.patch 2010-06-21 10:02:24.000000000 +0200
++++ buildroot/package/games/snes9x/snes9x-1.39-compile.patch 2010-06-23 14:13:28.000000000 +0200
@@ -0,0 +1,295 @@
+
+#
@@ -416,9 +416,9 @@ Index: buildroot/package/games/snes9x/snes9x-1.39-compile.patch
+
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-21 10:02:49.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-21 10:03:19.000000000 +0200
-@@ -83,6 +83,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:13:23.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:13:28.000000000 +0200
+@@ -86,6 +86,7 @@
source "package/games/quake-pak/Config.in"
source "package/games/rubix/Config.in"
source "package/games/sdlquake/Config.in"
diff --git a/patches/buildroot/2010.05/119-fbtest-add_package.patch b/patches/buildroot/2010.05/119-fbtest-add_package.patch
index f62df8a..2490f8c 100644
--- a/patches/buildroot/2010.05/119-fbtest-add_package.patch
+++ b/patches/buildroot/2010.05/119-fbtest-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-21 16:33:40.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-21 16:34:21.000000000 +0200
-@@ -99,6 +99,7 @@
+--- buildroot.orig/package/Config.in 2010-06-23 14:13:28.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:13:31.000000000 +0200
+@@ -102,6 +102,7 @@
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/fbset/Config.in"
endif
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/fbtest/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/Config.in 2010-06-21 16:33:40.000000000 +0200
++++ buildroot/package/fbtest/Config.in 2010-06-23 14:13:31.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_FBTEST
+ bool "fbtest"
@@ -29,7 +29,7 @@ Index: buildroot/package/fbtest/Config.in
Index: buildroot/package/fbtest/fbtest.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest.mk 2010-06-21 16:33:40.000000000 +0200
++++ buildroot/package/fbtest/fbtest.mk 2010-06-23 14:13:31.000000000 +0200
@@ ...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2010-06-23 09:48:46
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5aa3c3b458225bb67f71c0a260ee9f7d1e4905e4 (commit)
from 1f553a4f2a9e20f47b0f116b94463c52d48b93d5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5aa3c3b458225bb67f71c0a260ee9f7d1e4905e4
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 23 11:48:20 2010 +0200
[BUILDROOT] [2010.05] Updates apf27 default config
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index b5ab1ab..a6f88a4 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Mon Jun 21 14:41:46 2010
+# Wed Jun 23 11:44:57 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.05"
@@ -664,6 +664,11 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BIND is not set
+# BR2_PACKAGE_BLUEZ_LIBS is not set
+
+#
+# bluez-utils not available (need dbus)
+#
# BR2_PACKAGE_BMON is not set
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_CTORRENT is not set
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-23 09:31:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 1f553a4f2a9e20f47b0f116b94463c52d48b93d5 (commit)
from ad7d7981a179dc7310d8d69e59195a0a5caca179 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1f553a4f2a9e20f47b0f116b94463c52d48b93d5
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 23 11:30:44 2010 +0200
[BUILD] Makes Buildroot version choosable with "make BUILDROOT_VERSION=20xx.xx"
-----------------------------------------------------------------------
Summary of changes:
Makefile | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 77cfd19..b05addc 100644
--- a/Makefile
+++ b/Makefile
@@ -27,12 +27,15 @@ ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
#--- User configurable stuff:
-#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
-#BUILDROOT_VERSION:=2010.02
-#BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/2010.02
-BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
+ifeq ($(BUILDROOT_VERSION),)
BUILDROOT_VERSION:=20081103
+BUILDROOT_SITE:=http://downloads.sourceforge.net/armadeus
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot
+else
+#BUILDROOT_VERSION:=2010.05
+BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
+BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
+endif
#--- End of user conf (don't touch anything below unless you know what you're doing !! ;-) )
BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-23 08:19:39
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ad7d7981a179dc7310d8d69e59195a0a5caca179 (commit)
from 02fa13ce19a0268442959e005227f3673dc90b25 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ad7d7981a179dc7310d8d69e59195a0a5caca179
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 23 10:19:05 2010 +0200
[LINUX] Add uinput driver in default configs
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/linux-2.6.29.4.config | 11 +++++++++--
.../armadeus/apf27/apf27-linux-2.6.29.config | 11 +++++++++--
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/buildroot/local/apf27_test/linux-2.6.29.4.config b/buildroot/local/apf27_test/linux-2.6.29.4.config
index 633eeda..cd0fe9b 100644
--- a/buildroot/local/apf27_test/linux-2.6.29.4.config
+++ b/buildroot/local/apf27_test/linux-2.6.29.4.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Thu Apr 22 15:30:47 2010
+# Wed Jun 23 08:59:05 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -788,7 +788,14 @@ CONFIG_TOUCHSCREEN_TSC2102=m
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+CONFIG_INPUT_UINPUT=m
#
# Hardware I/O ports
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
index 0883c54..321519a 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Thu Apr 22 15:30:47 2010
+# Wed Jun 23 08:59:05 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -784,7 +784,14 @@ CONFIG_TOUCHSCREEN_TSC2102=m
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+# CONFIG_INPUT_CM109 is not set
+CONFIG_INPUT_UINPUT=m
#
# Hardware I/O ports
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-22 12:05:43
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 02fa13ce19a0268442959e005227f3673dc90b25 (commit)
from 9149a3d57af0fbfcbe3675bdd45e5123dba48736 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 02fa13ce19a0268442959e005227f3673dc90b25
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 22 14:05:11 2010 +0200
[BUILDROOT] Continue the (not armadeus specific) packages moving to BR patches. Only bluez3 remains.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 -
buildroot/package/bluez3/bluetooth.init | 102 --------------------
.../bluez3/bluez-utils-bluez-include-patch.patch | 11 --
.../target/device/armadeus/apf27/apf27_defconfig | 44 ++++-----
.../device/armadeus/apf9328/apf9328_defconfig | 44 ++++-----
patches/buildroot/001-add_armadeus_device.patch | 25 ++++-
patches/buildroot/110-bluez-add_package.patch | 16 +++
patches/buildroot/113-gpsd-add_package.patch | 12 +-
patches/buildroot/116-openobex-add_package.patch | 14 ++--
patches/buildroot/117-ussp-push-add_package.patch | 10 +-
patches/buildroot/119-fbtest-add_package.patch | 16 ++--
patches/buildroot/120-cwiid-add_package.patch | 16 ++--
.../buildroot/2010.05/110-bluez-add_package.patch | 16 +++
.../buildroot/2010.05/120-cwiid-add_package.patch | 2 +-
14 files changed, 126 insertions(+), 204 deletions(-)
delete mode 100644 buildroot/package/bluez3/bluetooth.init
delete mode 100644 buildroot/package/bluez3/bluez-utils-bluez-include-patch.patch
create mode 100644 patches/buildroot/110-bluez-add_package.patch
create mode 100644 patches/buildroot/2010.05/110-bluez-add_package.patch
diff --git a/Makefile b/Makefile
index 138b4d1..77cfd19 100644
--- a/Makefile
+++ b/Makefile
@@ -113,8 +113,6 @@ buildroot-unpacked: $(BUILDROOT_DIR)/.unpacked
$(BUILDROOT_DIR)/.patched: $(BUILDROOT_DIR)/.unpacked
$(BUILDROOT_DIR)/toolchain/patch-kernel.sh $(BUILDROOT_DIR) $(BUILDROOT_PATCH_DIR) \*.patch
-# Since patches may add/delete packages, we process extra packages after patching
- perl $(BUILDROOT_PATCH_DIR)/add_packages_config_entry.pl buildroot=$(BUILDROOT_DIR)
touch $@
buildroot-patched: $(BUILDROOT_DIR)/.patched
diff --git a/buildroot/package/bluez3/bluetooth.init b/buildroot/package/bluez3/bluetooth.init
deleted file mode 100644
index 171f8e0..0000000
--- a/buildroot/package/bluez3/bluetooth.init
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-#
-# Start/stop the Bluetooth daemons
-#
-
-set -e
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-NAME=bluetooth
-DESC="Bluetooth subsystem"
-
-HCIATTACH_NAME=hciattach
-DAEMON_NAME=hcid
-HID2HCI_NAME=hid2hci
-RFCOMM_NAME=rfcomm
-RFCOMM_GETTY_NAME=rfcomm-getty
-
-HCIATTACH_EXEC="`which $HCIATTACH_NAME || true`"
-DAEMON_EXEC="`which $DAEMON_NAME || true`"
-HID2HCI_EXEC="`which $HID2HCI_NAME || true`"
-RFCOMM_EXEC="`which $RFCOMM_NAME || true`"
-
-DAEMON_ENABLE=true
-HID2HCI_ENABLE=false
-RFCOMM_ENABLE=true
-
-DAEMON_CONFIG="/etc/bluetooth/hcid.conf"
-RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-RFCOMM_GETTY=/etc/bluetooth/rfcomm/rfcomm-getty
-
-HCIATTACH_ENABLE=true
-HCIATTACH_TTY=ttyS1
-HCIATTACH_TYPE=gumstix
-HCIATTACH_START_SPEED=57600
-HCIATTACH_SPEED=921600
-HCIATTACH_HANDSHAKE=flow
-
-[ -e /etc/default/bluetooth ] && . /etc/default/bluetooth
-
-case "$1" in
- start)
-
- echo -n "Starting 32kHz clock..."
- /usr/sbin/pxaregs OSCC_OON 1
- while /usr/sbin/pxaregs OSCC_OOK | tail -n 1 | grep -q -v 1;do
- echo -n '.'
- sleep 1
- done
- echo "Settled"
-
- /sbin/modprobe gumstix_bluetooth
- /sbin/modprobe proc_gpio
-
- echo "AF1 in" >/proc/gpio/GPIO42
- echo "AF2 out" >/proc/gpio/GPIO43
- echo "AF1 in" >/proc/gpio/GPIO44
- echo "AF2 out" >/proc/gpio/GPIO45
-
- echo -n "Starting $DESC:"
- if $HCIATTACH_ENABLE && [ -x "$HCIATTACH_EXEC" ] ; then
- $HCIATTACH_EXEC -s $HCIATTACH_START_SPEED $HCIATTACH_TTY $HCIATTACH_TYPE $HCIATTACH_SPEED $HCIATTACH_HANDSHAKE
- echo -n " $HCIATTACH_TTY"
- fi
- if $DAEMON_ENABLE && [ -x "$DAEMON_EXEC" ] && [ -f "$DAEMON_CONFIG" ] ; then
- $DAEMON_EXEC -s -f $DAEMON_CONFIG
- echo -n " $DAEMON_NAME"
- fi
- if $HID2HCI_ENABLE && [ -x "$HID2HCI_EXEC" ] ; then
- $HID2HCI_EXEC --tohci > /dev/null 2>&1 || true
- echo -n " $HID2HCI_NAME"
- fi
- if $RFCOMM_ENABLE && [ -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ] ; then
- sleep 1
- /usr/bin/sdptool add --channel=1 SP > /dev/null
- rfcomm -r watch 0 1 /sbin/getty -w -L rfcomm0 115200 vt100 &
-# $RFCOMM_EXEC -r -f $RFCOMM_CONFIG watch all > /dev/null 2>&1 &
-# $RFCOMM_GETTY > /dev/null 2>&1 &
- echo -n " $RFCOMM_NAME"
- fi
- echo "."
- ;;
- stop)
- echo -n "Stopping $DESC:"
- killall $RFCOMM_NAME > /dev/null 2>&1 || true
- echo -n " $RFCOMM_NAME"
- killall $HID2HCI_NAME > /dev/null 2>&1 || true
- echo -n " $HID2HCI_NAME"
- killall $DAEMON_NAME > /dev/null 2>&1 || true
- echo -n " $DAEMON_NAME"
- killall $HCIATTACH_NAME > /dev/null 2>&1 || true
- echo -n " $HCIATTACH_NAME"
- echo "."
- ;;
- *)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop}" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/buildroot/package/bluez3/bluez-utils-bluez-include-patch.patch b/buildroot/package/bluez3/bluez-utils-bluez-include-patch.patch
deleted file mode 100644
index f3465e8..0000000
--- a/buildroot/package/bluez3/bluez-utils-bluez-include-patch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bluez-utils-3.13/common/Makefile.in.orig 2007-08-01 14:00:11.000000000 -0700
-+++ bluez-utils-3.13/common/Makefile.in 2007-08-01 14:00:30.000000000 -0700
-@@ -226,7 +226,7 @@
- hal.h $(hal_sources) notify.h $(notify_sources)
-
- test_textfile_LDADD = libhelper.a
--AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@
-+AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
- EXTRA_DIST = ppoll.h uinput.h hal-dummy.c hal-libhal.c \
- notify-dummy.c notify-inotify.c \
- sdp-dummy.c sdp-expat.c sdp-glib.c
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index fd2c916..c4e8e08 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Mon Jun 21 10:10:19 2010
+# Tue Jun 22 13:58:00 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -328,30 +328,6 @@ BR2_PACKAGE_PKGCONFIG=y
# BR2_PACKAGE_PCRE is not set
#
-# Armadeus specific packages
-#
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
-
-#
-# bluez-utils not available (need dbus)
-#
-
-#
-# Armadeus specific tools/utilities
-#
-BR2_PACKAGE_AD9889CTRL=y
-# BR2_PACKAGE_AS_DEVICES is not set
-# BR2_PACKAGE_CH7024CTRL is not set
-# BR2_PACKAGE_ARMADEUS_DEMOS is not set
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_IMXREGS=y
-# BR2_PACKAGE_IMXSSI is not set
-BR2_PACKAGE_MAX5821CTRL=y
-# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
-# BR2_PACKAGE_DUMMY is not set
-
-#
# Other stuff
#
# BR2_PACKAGE_AT is not set
@@ -389,6 +365,19 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_STARTUP_NOTIFICATION is not set
BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_SUDO is not set
+
+#
+# Armadeus specific tools/utilities
+#
+BR2_PACKAGE_AD9889CTRL=y
+# BR2_PACKAGE_AS_DEVICES is not set
+# BR2_PACKAGE_CH7024CTRL is not set
+# BR2_PACKAGE_ARMADEUS_DEMOS is not set
+BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_IMXREGS=y
+# BR2_PACKAGE_IMXSSI is not set
+BR2_PACKAGE_MAX5821CTRL=y
+# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
# BR2_DATABASE_SUPPORT is not set
BR2_TEXTEDIT_SUPPORT=y
# BR2_PACKAGE_ED is not set
@@ -404,6 +393,11 @@ BR2_NETWORK_SUPPORT=y
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BOA is not set
# BR2_PACKAGE_BIND is not set
+# BR2_PACKAGE_BLUEZ_LIBS is not set
+
+#
+# bluez-utils not available (need dbus)
+#
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index 081d322..3d88764 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
+++ b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Mon Jun 21 10:30:46 2010
+# Tue Jun 22 11:39:22 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -324,30 +324,6 @@ BR2_PACKAGE_PKGCONFIG=y
# BR2_PACKAGE_PCRE is not set
#
-# Armadeus specific packages
-#
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
-
-#
-# bluez-utils not available (need dbus)
-#
-
-#
-# Armadeus specific tools/utilities
-#
-# BR2_PACKAGE_AD9889CTRL is not set
-# BR2_PACKAGE_AS_DEVICES is not set
-BR2_PACKAGE_CH7024CTRL=y
-# BR2_PACKAGE_ARMADEUS_DEMOS is not set
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_IMXREGS=y
-# BR2_PACKAGE_IMXSSI is not set
-BR2_PACKAGE_MAX5821CTRL=y
-# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
-# BR2_PACKAGE_DUMMY is not set
-
-#
# Other stuff
#
# BR2_PACKAGE_AT is not set
@@ -385,6 +361,19 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_STARTUP_NOTIFICATION is not set
# BR2_PACKAGE_STRACE is not set
# BR2_PACKAGE_SUDO is not set
+
+#
+# Armadeus specific tools/utilities
+#
+# BR2_PACKAGE_AD9889CTRL is not set
+# BR2_PACKAGE_AS_DEVICES is not set
+# BR2_PACKAGE_CH7024CTRL is not set
+# BR2_PACKAGE_ARMADEUS_DEMOS is not set
+# BR2_PACKAGE_FPGAREGS is not set
+# BR2_PACKAGE_IMXREGS is not set
+# BR2_PACKAGE_IMXSSI is not set
+BR2_PACKAGE_MAX5821CTRL=y
+# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
# BR2_DATABASE_SUPPORT is not set
BR2_TEXTEDIT_SUPPORT=y
# BR2_PACKAGE_ED is not set
@@ -400,6 +389,11 @@ BR2_NETWORK_SUPPORT=y
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BOA is not set
# BR2_PACKAGE_BIND is not set
+# BR2_PACKAGE_BLUEZ_LIBS is not set
+
+#
+# bluez-utils not available (need dbus)
+#
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
diff --git a/patches/buildroot/001-add_armadeus_device.patch b/patches/buildroot/001-add_armadeus_device.patch
index 793cfab..61e69e4 100644
--- a/patches/buildroot/001-add_armadeus_device.patch
+++ b/patches/buildroot/001-add_armadeus_device.patch
@@ -1,8 +1,25 @@
---- buildroot/target/device/Config.in.ref 2008-11-03 15:31:26.000000000 +0100
-+++ buildroot/target/device/Config.in 2008-11-03 15:32:00.000000000 +0100
-@@ -5,6 +5,7 @@ source "project/Config.in"
- comment "Preset Devices"
+Add armadeus target and packages specific menu to BR.
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-22 11:13:07.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:22:16.000000000 +0200
+@@ -120,6 +120,8 @@
+ source "package/which/Config.in"
+ endif
+
++source "package/armadeus/Config.in"
++
+ source "package/database/Config.in"
+
+ if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+Index: buildroot/target/device/Config.in
+===================================================================
+--- buildroot.orig/target/device/Config.in 2008-11-03 09:15:09.000000000 +0100
++++ buildroot/target/device/Config.in 2010-06-22 11:10:57.000000000 +0200
+@@ -5,6 +5,7 @@
+ comment "Preset Devices"
+
source "target/device/AMD/Config.in"
+source "target/device/armadeus/Config.in"
source "target/device/ARMLTD/Config.in"
diff --git a/patches/buildroot/110-bluez-add_package.patch b/patches/buildroot/110-bluez-add_package.patch
new file mode 100644
index 0000000..a207239
--- /dev/null
+++ b/patches/buildroot/110-bluez-add_package.patch
@@ -0,0 +1,16 @@
+Add bluez package (3.36) to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-22 11:34:20.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:35:22.000000000 +0200
+@@ -141,6 +141,7 @@
+ source "package/axel/Config.in"
+ source "package/boa/Config.in"
+ source "package/bind/Config.in"
++source "package/bluez3/Config.in"
+ source "package/bridge-utils/Config.in"
+ if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+ source "package/dhcp/Config.in"
diff --git a/patches/buildroot/113-gpsd-add_package.patch b/patches/buildroot/113-gpsd-add_package.patch
index 248a5b9..6b8bdff 100644
--- a/patches/buildroot/113-gpsd-add_package.patch
+++ b/patches/buildroot/113-gpsd-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-09 10:53:23.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-09 10:55:54.000000000 +0200
-@@ -253,6 +253,7 @@
+--- buildroot.orig/package/Config.in 2010-06-22 11:35:22.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:37:00.000000000 +0200
+@@ -255,6 +255,7 @@
source "package/fuse/Config.in"
source "package/gadgetfs-test/Config.in"
source "package/gpm/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/gpsd/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpsd/Config.in 2010-06-09 18:59:50.000000000 +0200
++++ buildroot/package/gpsd/Config.in 2010-06-22 11:37:01.000000000 +0200
@@ -0,0 +1,244 @@
+config BR2_PACKAGE_GPSD
+ bool "gpsd"
@@ -266,7 +266,7 @@ Index: buildroot/package/gpsd/Config.in
Index: buildroot/package/gpsd/gpsd.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpsd/gpsd.mk 2010-06-09 19:29:23.000000000 +0200
++++ buildroot/package/gpsd/gpsd.mk 2010-06-22 11:37:01.000000000 +0200
@@ -0,0 +1,169 @@
+#############################################################
+#
@@ -440,7 +440,7 @@ Index: buildroot/package/gpsd/gpsd.mk
Index: buildroot/package/gpsd/S50gpsd
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpsd/S50gpsd 2010-06-09 18:53:01.000000000 +0200
++++ buildroot/package/gpsd/S50gpsd 2010-06-22 11:37:01.000000000 +0200
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
diff --git a/patches/buildroot/116-openobex-add_package.patch b/patches/buildroot/116-openobex-add_package.patch
index bd8c9cf..a142be7 100644
--- a/patches/buildroot/116-openobex-add_package.patch
+++ b/patches/buildroot/116-openobex-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-16 10:21:22.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-16 16:33:02.000000000 +0200
-@@ -191,6 +191,7 @@
+--- buildroot.orig/package/Config.in 2010-06-22 11:37:00.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:37:56.000000000 +0200
+@@ -192,6 +192,7 @@
source "package/ntp/Config.in"
source "package/olsr/Config.in"
source "package/openntpd/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/openobex/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/Config.in 2010-06-16 13:24:33.000000000 +0200
++++ buildroot/package/openobex/Config.in 2010-06-22 11:37:56.000000000 +0200
@@ -0,0 +1,25 @@
+config BR2_PACKAGE_OPENOBEX
+ bool "openobex"
@@ -47,7 +47,7 @@ Index: buildroot/package/openobex/Config.in
Index: buildroot/package/openobex/openobex.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex.mk 2010-06-16 16:35:17.000000000 +0200
++++ buildroot/package/openobex/openobex.mk 2010-06-22 11:37:56.000000000 +0200
@@ -0,0 +1,47 @@
+#############################################################
+#
@@ -99,7 +99,7 @@ Index: buildroot/package/openobex/openobex.mk
Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch 2010-06-16 13:20:42.000000000 +0200
++++ buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch 2010-06-22 11:37:56.000000000 +0200
@@ -0,0 +1,13 @@
+Index: openobex-1.5/acinclude.m4
+===================================================================
@@ -117,7 +117,7 @@ Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.pat
Index: buildroot/package/openobex/openobex-replace_deprecated_functions.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex-replace_deprecated_functions.patch 2010-06-16 13:20:42.000000000 +0200
++++ buildroot/package/openobex/openobex-replace_deprecated_functions.patch 2010-06-22 11:37:56.000000000 +0200
@@ -0,0 +1,25 @@
+Index: openobex-1.5/apps/obex_test_cable.c
+===================================================================
diff --git a/patches/buildroot/117-ussp-push-add_package.patch b/patches/buildroot/117-ussp-push-add_package.patch
index c6b330d..f251c04 100644
--- a/patches/buildroot/117-ussp-push-add_package.patch
+++ b/patches/buildroot/117-ussp-push-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-20 11:57:30.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-20 11:58:27.000000000 +0200
-@@ -220,6 +220,7 @@
+--- buildroot.orig/package/Config.in 2010-06-22 11:37:56.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:38:03.000000000 +0200
+@@ -221,6 +221,7 @@
#source "package/udhcp/Config.in"
#endif
source "package/udpcast/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/ussp-push/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ussp-push/Config.in 2010-06-20 11:57:35.000000000 +0200
++++ buildroot/package/ussp-push/Config.in 2010-06-22 11:38:03.000000000 +0200
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_USSP_PUSH
+ bool "ussp-push"
@@ -32,7 +32,7 @@ Index: buildroot/package/ussp-push/Config.in
Index: buildroot/package/ussp-push/ussp-push.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ussp-push/ussp-push.mk 2010-06-20 11:57:35.000000000 +0200
++++ buildroot/package/ussp-push/ussp-push.mk 2010-06-22 11:38:03.000000000 +0200
@@ -0,0 +1,12 @@
+#############################################################
+#
diff --git a/patches/buildroot/119-fbtest-add_package.patch b/patches/buildroot/119-fbtest-add_package.patch
index 4406f6b..ee15790 100644
--- a/patches/buildroot/119-fbtest-add_package.patch
+++ b/patches/buildroot/119-fbtest-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-18 23:44:05.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-18 23:49:19.000000000 +0200
-@@ -344,6 +344,7 @@
+--- buildroot.orig/package/Config.in 2010-06-22 11:38:03.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:38:17.000000000 +0200
+@@ -347,6 +347,7 @@
comment "--> May be broken in busybox"
source "package/fbv/Config.in"
source "package/fbset/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/fbtest/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/Config.in 2010-06-18 23:51:27.000000000 +0200
++++ buildroot/package/fbtest/Config.in 2010-06-22 11:38:17.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_FBTEST
+ bool "fbtest"
@@ -29,7 +29,7 @@ Index: buildroot/package/fbtest/Config.in
Index: buildroot/package/fbtest/fbtest.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest.mk 2010-06-18 23:56:39.000000000 +0200
++++ buildroot/package/fbtest/fbtest.mk 2010-06-22 11:38:17.000000000 +0200
@@ -0,0 +1,51 @@
+#############################################################
+#
@@ -85,7 +85,7 @@ Index: buildroot/package/fbtest/fbtest.mk
Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch 2010-06-18 23:56:15.000000000 +0200
++++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch 2010-06-22 11:38:17.000000000 +0200
@@ -0,0 +1,36 @@
+--- fbtest-20041102-1.org/fb.c 2003-04-04 14:07:55.000000000 +0200
++++ fbtest-20041102-1/fb.c 2009-05-20 10:32:32.000000000 +0200
@@ -126,7 +126,7 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch 2010-06-19 00:01:03.000000000 +0200
++++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch 2010-06-22 11:38:17.000000000 +0200
@@ -0,0 +1,11 @@
+--- fbtest-20041102-1.org/Makefile 2009-05-21 10:16:05.000000000 +0200
++++ fbtest-20041102-1/Makefile 2009-05-21 10:17:47.000000000 +0200
@@ -142,7 +142,7 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
Index: buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch 2010-06-21 16:35:18.000000000 +0200
++++ buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch 2010-06-22 11:38:17.000000000 +0200
@@ -0,0 +1,11 @@
+--- fbtest-20041102-1.org/pnmtohex/Makefile 2004-11-02 09:43:02.000000000 +0100
++++ fbtest-20041102-1/pnmtohex/Makefile 2005-11-16 22:24:08.406157582 +0100
diff --git a/patches/buildroot/120-cwiid-add_package.patch b/patches/buildroot/120-cwiid-add_package.patch
index 087795a..ba7b1ef 100644
--- a/patches/buildroot/120-cwiid-add_package.patch
+++ b/patches/buildroot/120-cwiid-add_package.patch
@@ -5,9 +5,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-20 19:58:08.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-20 20:45:06.000000000 +0200
-@@ -241,6 +241,7 @@
+--- buildroot.orig/package/Config.in 2010-06-22 11:38:17.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:38:24.000000000 +0200
+@@ -244,6 +244,7 @@
if BR2_BLOCKDEV_SUPPORT
source "package/acpid/Config.in"
@@ -18,11 +18,11 @@ Index: buildroot/package/Config.in
Index: buildroot/package/cwiid/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/cwiid/Config.in 2010-06-20 23:14:48.000000000 +0200
++++ buildroot/package/cwiid/Config.in 2010-06-22 11:38:44.000000000 +0200
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_CWIID
+ bool "cwiid"
-+ select BR2_PACKAGE_BLUEZ
++ select BR2_PACKAGE_BLUEZ_LIBS
+ help
+ A collection of Linux tools written in C for interfacing to the
+ Nintendo Wiimote.
@@ -31,7 +31,7 @@ Index: buildroot/package/cwiid/Config.in
Index: buildroot/package/cwiid/cwiid.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/cwiid/cwiid.mk 2010-06-20 23:03:30.000000000 +0200
++++ buildroot/package/cwiid/cwiid.mk 2010-06-22 11:38:24.000000000 +0200
@@ -0,0 +1,28 @@
+#############################################################
+#
@@ -64,7 +64,7 @@ Index: buildroot/package/cwiid/cwiid.mk
Index: buildroot/package/cwiid/cwiid-0.6.00-configure_ac_remove_gtk_dependancy.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/cwiid/cwiid-0.6.00-configure_ac_remove_gtk_dependancy.patch 2010-06-20 21:07:24.000000000 +0200
++++ buildroot/package/cwiid/cwiid-0.6.00-configure_ac_remove_gtk_dependancy.patch 2010-06-22 11:38:24.000000000 +0200
@@ -0,0 +1,22 @@
+--- cwiid-0.6.00.org/configure.ac 2007-08-27 02:27:58.000000000 +0200
++++ cwiid-0.6.00/configure.ac 2010-03-01 17:28:00.425401362 +0100
@@ -91,7 +91,7 @@ Index: buildroot/package/cwiid/cwiid-0.6.00-configure_ac_remove_gtk_dependancy.p
Index: buildroot/package/cwiid/cwiid-0.6.00-makefile_in-remove_wmgui.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/cwiid/cwiid-0.6.00-makefile_in-remove_wmgui.patch 2010-06-20 21:13:26.000000000 +0200
++++ buildroot/package/cwiid/cwiid-0.6.00-makefile_in-remove_wmgui.patch 2010-06-22 11:38:24.000000000 +0200
@@ -0,0 +1,11 @@
+--- cwiid-0.6.00.org/Makefile.in 2007-07-28 20:47:03.000000000 +0200
++++ cwiid-0.6.00/Makefile.in 2010-03-01 17:28:08.337399709 +0100
diff --git a/patches/buildroot/2010.05/110-bluez-add_package.patch b/patches/buildroot/2010.05/110-bluez-add_package.patch
new file mode 100644
index 0000000..7a6df7e
--- /dev/null
+++ b/patches/buildroot/2010.05/110-bluez-add_package.patch
@@ -0,0 +1,16 @@
+Add bluez package (3.36) to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-22 11:34:20.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:35:22.000000000 +0200
+@@ -365,6 +365,7 @@
+ source "package/boa/Config.in"
+ endif
+ source "package/bind/Config.in"
++source "package/bluez3/Config.in"
+ source "package/bmon/Config.in"
+ source "package/bridge-utils/Config.in"
+ source "package/ctorrent/Config.in"
diff --git a/patches/buildroot/2010.05/120-cwiid-add_package.patch b/patches/buildroot/2010.05/120-cwiid-add_package.patch
index 4e2f15e..d9f1a62 100644
--- a/patches/buildroot/2010.05/120-cwiid-add_package.patch
+++ b/patches/buildroot/2010.05/120-cwiid-add_package.patch
@@ -22,7 +22,7 @@ Index: buildroot/package/cwiid/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_CWIID
+ bool "cwiid"
-+ select BR2_PACKAGE_BLUEZ
++ select BR2_PACKAGE_BLUEZ_LIBS
+ help
+ A collection of Linux tools written in C for interfacing to the
+ Nintendo Wiimote.
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-21 15:44:08
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9149a3d57af0fbfcbe3675bdd45e5123dba48736 (commit)
from 144a9f147c815612cf5b2826d63a1ae04bab7876 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9149a3d57af0fbfcbe3675bdd45e5123dba48736
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 21 16:43:41 2010 +0200
Forgot a patch file when moving fbtest package as BR patch
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/119-fbtest-add_package.patch | 16 ++++++++++
.../buildroot/2010.05/119-fbtest-add_package.patch | 30 +++++++++++++++----
2 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/patches/buildroot/119-fbtest-add_package.patch b/patches/buildroot/119-fbtest-add_package.patch
index 5ddfb1e..4406f6b 100644
--- a/patches/buildroot/119-fbtest-add_package.patch
+++ b/patches/buildroot/119-fbtest-add_package.patch
@@ -139,3 +139,19 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
+
+ OBJS += drawops/drawops.o fonts/fonts.o images/images.o visops/visops.o \
+ tests/tests.o
+Index: buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch 2010-06-21 16:35:18.000000000 +0200
+@@ -0,0 +1,11 @@
++--- fbtest-20041102-1.org/pnmtohex/Makefile 2004-11-02 09:43:02.000000000 +0100
+++++ fbtest-20041102-1/pnmtohex/Makefile 2005-11-16 22:24:08.406157582 +0100
++@@ -3,7 +3,7 @@ TOPDIR = ..
++
++ HOST_TARGET = pnmtohex
++
++-LIBS += -lnetpnm -lnetpbm -lnetpgm -lnetppm
+++LIBS += -lnetpbm -lm
++
++ include $(TOPDIR)/Rules.make
++
diff --git a/patches/buildroot/2010.05/119-fbtest-add_package.patch b/patches/buildroot/2010.05/119-fbtest-add_package.patch
index 33b4125..f62df8a 100644
--- a/patches/buildroot/2010.05/119-fbtest-add_package.patch
+++ b/patches/buildroot/2010.05/119-fbtest-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-18 23:44:05.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-18 23:49:19.000000000 +0200
-@@ -95,6 +95,7 @@
+--- buildroot.orig/package/Config.in 2010-06-21 16:33:40.000000000 +0200
++++ buildroot/package/Config.in 2010-06-21 16:34:21.000000000 +0200
+@@ -99,6 +99,7 @@
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/fbset/Config.in"
endif
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/fbtest/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/Config.in 2010-06-18 23:51:27.000000000 +0200
++++ buildroot/package/fbtest/Config.in 2010-06-21 16:33:40.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_FBTEST
+ bool "fbtest"
@@ -29,7 +29,7 @@ Index: buildroot/package/fbtest/Config.in
Index: buildroot/package/fbtest/fbtest.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest.mk 2010-06-18 23:56:39.000000000 +0200
++++ buildroot/package/fbtest/fbtest.mk 2010-06-21 16:33:40.000000000 +0200
@@ -0,0 +1,51 @@
+#############################################################
+#
@@ -85,7 +85,7 @@ Index: buildroot/package/fbtest/fbtest.mk
Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch 2010-06-18 23:56:15.000000000 +0200
++++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch 2010-06-21 16:33:40.000000000 +0200
@@ -0,0 +1,36 @@
+--- fbtest-20041102-1.org/fb.c 2003-04-04 14:07:55.000000000 +0200
++++ fbtest-20041102-1/fb.c 2009-05-20 10:32:32.000000000 +0200
@@ -126,7 +126,7 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch 2010-06-19 00:01:03.000000000 +0200
++++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch 2010-06-21 16:33:40.000000000 +0200
@@ -0,0 +1,11 @@
+--- fbtest-20041102-1.org/Makefile 2009-05-21 10:16:05.000000000 +0200
++++ fbtest-20041102-1/Makefile 2009-05-21 10:17:47.000000000 +0200
@@ -139,3 +139,19 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
+
+ OBJS += drawops/drawops.o fonts/fonts.o images/images.o visops/visops.o \
+ tests/tests.o
+Index: buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch 2010-06-21 16:35:18.000000000 +0200
+@@ -0,0 +1,11 @@
++--- fbtest-20041102-1.org/pnmtohex/Makefile 2004-11-02 09:43:02.000000000 +0100
+++++ fbtest-20041102-1/pnmtohex/Makefile 2005-11-16 22:24:08.406157582 +0100
++@@ -3,7 +3,7 @@ TOPDIR = ..
++
++ HOST_TARGET = pnmtohex
++
++-LIBS += -lnetpnm -lnetpbm -lnetpgm -lnetppm
+++LIBS += -lnetpbm -lm
++
++ include $(TOPDIR)/Rules.make
++
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-21 13:02:07
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 144a9f147c815612cf5b2826d63a1ae04bab7876 (commit)
via 3b5ce2da5d6f09f67626e4c336beea0151accab6 (commit)
via 613a9cc26f010a14830d502c0325bc0ff9d3f0b9 (commit)
via f2aadfa1da8b379091764c77e22f5854692aa565 (commit)
via 1e13487ebe1da8591a8b144cfc12b3a03a692eed (commit)
from 4e8e8c4d495e63007da1015b6823f3a937770515 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 144a9f147c815612cf5b2826d63a1ae04bab7876
Merge: 3b5ce2da5d6f09f67626e4c336beea0151accab6 4e8e8c4d495e63007da1015b6823f3a937770515
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 21 15:00:59 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 3b5ce2da5d6f09f67626e4c336beea0151accab6
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 21 15:00:35 2010 +0200
[BUILDROOT] [2010.05] Updates apf9328 & apf27 default configs
commit 613a9cc26f010a14830d502c0325bc0ff9d3f0b9
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 21 15:00:07 2010 +0200
[BUILDROOT] [2010.05] Add some minor patches for arm926t arch
commit f2aadfa1da8b379091764c77e22f5854692aa565
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 21 14:38:32 2010 +0200
[BUILDROOT] [2010.05] Also adds Cwiid...
commit 1e13487ebe1da8591a8b144cfc12b3a03a692eed
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 21 11:19:59 2010 +0200
[BUILDROOT] [2010.05] Updates patches so that they apply without errors
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 669 ++++++++++----------
buildroot/configs/apf9328_defconfig | 9 +-
.../buildroot/2010.05/021-sdl-water-config.patch | 10 +-
.../buildroot/2010.05/043-mesa-add_packages.patch | 8 +-
.../buildroot/2010.05/072-xenomai-package.patch | 20 +-
.../buildroot/2010.05/081-adds_quake_package.patch | 28 +-
.../buildroot/2010.05/095-uucp-add_packages.patch | 14 +-
.../buildroot/2010.05/107-games-add_wolf4sdl.patch | 20 +-
.../2010.05/116-openobex-add_package.patch | 14 +-
.../2010.05/117-ussp-push-add_package.patch | 4 +-
.../buildroot/2010.05/118-snes9x-add_package.patch | 31 +-
.../buildroot/2010.05/119-fbtest-add_package.patch | 12 +-
.../{ => 2010.05}/120-cwiid-add_package.patch | 8 +-
..._correct_gcc_tune_option_for_arm926t_core.patch | 23 +
.../2010.05/121-target-arm926t_is_arm926ej-s.patch | 18 +
patches/buildroot/2010.05/cleanup_buildroot.sh | 1 +
16 files changed, 489 insertions(+), 400 deletions(-)
copy patches/buildroot/{ => 2010.05}/120-cwiid-add_package.patch (96%)
create mode 100644 patches/buildroot/2010.05/121-set_correct_gcc_tune_option_for_arm926t_core.patch
create mode 100644 patches/buildroot/2010.05/121-target-arm926t_is_arm926ej-s.patch
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index eb801a8..b5ab1ab 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,9 +1,9 @@
#
# Automatically generated make config: don't edit
-# Thu Jun 3 17:54:06 2010
+# Mon Jun 21 14:41:46 2010
#
BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2010.02-rc1"
+BR2_VERSION="2010.05"
# BR2_alpha is not set
BR2_arm=y
# BR2_armeb is not set
@@ -14,7 +14,6 @@ BR2_arm=y
# BR2_m68k is not set
# BR2_mips is not set
# BR2_mipsel is not set
-# BR2_nios2 is not set
# BR2_powerpc is not set
# BR2_sh is not set
# BR2_sh64 is not set
@@ -84,6 +83,10 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
#
# Build options
#
+
+#
+# Commands
+#
BR2_WGET="wget --passive-ftp"
BR2_SVN_CO="svn co"
BR2_SVN_UP="svn up"
@@ -95,6 +98,7 @@ BR2_BZCAT="bzcat"
BR2_TAR_OPTIONS=""
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_COPYTO=""
+BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
#
# Mirrors and Download locations
@@ -105,14 +109,8 @@ BR2_SOURCEFORGE_MIRROR="easynews"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibcgnueabi"
BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
-BR2_RECENT=y
-BR2_CONFIG_CACHE=y
# BR2_ENABLE_DEBUG is not set
# BR2_STRIP_strip is not set
BR2_STRIP_sstrip=y
@@ -123,11 +121,13 @@ BR2_STRIP_sstrip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
+
+#
+# Advanced
+#
+BR2_CONFIG_CACHE=y
#
# Toolchain
@@ -138,13 +138,13 @@ BR2_TOOLCHAIN_BUILDROOT=y
#
# Kernel Header Options
#
-# BR2_KERNEL_HEADERS_2_6_26 is not set
# BR2_KERNEL_HEADERS_2_6_27 is not set
# BR2_KERNEL_HEADERS_2_6_28 is not set
# BR2_KERNEL_HEADERS_2_6_29 is not set
# BR2_KERNEL_HEADERS_2_6_30 is not set
# BR2_KERNEL_HEADERS_2_6_31 is not set
# BR2_KERNEL_HEADERS_2_6_32 is not set
+# BR2_KERNEL_HEADERS_2_6_33 is not set
BR2_KERNEL_HEADERS_VERSION=y
# BR2_KERNEL_HEADERS_SNAP is not set
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
@@ -155,11 +155,10 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.29.6"
#
# BR2_UCLIBC_VERSION_0_9_28_3 is not set
# BR2_UCLIBC_VERSION_0_9_29 is not set
-# BR2_UCLIBC_VERSION_0_9_30 is not set
-# BR2_UCLIBC_VERSION_0_9_30_1 is not set
-BR2_UCLIBC_VERSION_0_9_30_2=y
+BR2_UCLIBC_VERSION_0_9_30=y
+# BR2_UCLIBC_VERSION_0_9_31 is not set
# BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_VERSION_STRING="0.9.30.2"
+BR2_UCLIBC_VERSION_STRING="0.9.30.3"
BR2_UCLIBC_CONFIG="$(BR2_BOARD_PATH)/uClibc-0.9.30.config.arm"
# BR2_PTHREAD_DEBUG is not set
# BR2_UCLIBC_INSTALL_TEST_SUITE is not set
@@ -169,11 +168,11 @@ BR2_UCLIBC_CONFIG="$(BR2_BOARD_PATH)/uClibc-0.9.30.config.arm"
#
# BR2_BINUTILS_VERSION_2_17 is not set
# BR2_BINUTILS_VERSION_2_18 is not set
-# BR2_BINUTILS_VERSION_2_18_50_0_9 is not set
# BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1 is not set
# BR2_BINUTILS_VERSION_2_19 is not set
# BR2_BINUTILS_VERSION_2_19_1 is not set
BR2_BINUTILS_VERSION_2_20=y
+# BR2_BINUTILS_VERSION_2_20_1 is not set
BR2_BINUTILS_VERSION="2.20"
BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
@@ -193,7 +192,7 @@ BR2_GCC_VERSION_4_4_X=y
# BR2_GCC_VERSION_SNAP is not set
BR2_GCC_SUPPORTS_SYSROOT=y
BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
-BR2_GCC_VERSION="4.4.3"
+BR2_GCC_VERSION="4.4.4"
BR2_TOOLCHAIN_SYSROOT=y
# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
BR2_EXTRA_GCC_CONFIG_OPTIONS=""
@@ -213,14 +212,18 @@ BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"
# Gdb Options
#
# BR2_PACKAGE_GDB is not set
+
+#
+# Gdb debugger for the target needs WCHAR support in toolchain
+#
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
-# BR2_GDB_VERSION_6_4 is not set
-# BR2_GDB_VERSION_6_5 is not set
# BR2_GDB_VERSION_6_6 is not set
BR2_GDB_VERSION_6_7_1=y
# BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 is not set
# BR2_GDB_VERSION_6_8 is not set
+# BR2_GDB_VERSION_7_0_1 is not set
+# BR2_GDB_VERSION_7_1 is not set
BR2_GDB_VERSION="6.7.1"
#
@@ -231,6 +234,7 @@ BR2_INET_IPV6=y
BR2_INET_RPC=y
# BR2_ENABLE_LOCALE is not set
# BR2_ENABLE_LOCALE_PURGE is not set
+BR2_NEEDS_GETTEXT=y
BR2_USE_WCHAR=y
BR2_PREFER_SOFT_FLOAT=y
BR2_SOFT_FLOAT=y
@@ -260,219 +264,177 @@ BR2_PACKAGE_BUSYBOX=y
# BR2_BUSYBOX_VERSION_1_15_X is not set
BR2_BUSYBOX_VERSION_1_16_X=y
# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.16.0"
+BR2_BUSYBOX_VERSION="1.16.1"
BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION).config"
# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
# BR2_PACKAGE_BUSYBOX_SKELETON is not set
+# BR2_PACKAGE_CUSTOMIZE is not set
#
-# The minimum needed to build a uClibc development system
+# Audio and video libraries and applications
#
-# BR2_PACKAGE_FLEX is not set
+BR2_PACKAGE_ALSA_LIB=y
#
-# native toolchain needs development files in target filesystem
+# ALSA lib selection
#
-# BR2_PACKAGE_MAKE is not set
+BR2_PACKAGE_ALSA_LIB_DEVDIR="/dev/snd"
+BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS="all"
+BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS="all"
+BR2_PACKAGE_ALSA_LIB_ALOAD=y
+BR2_PACKAGE_ALSA_LIB_MIXER=y
+BR2_PACKAGE_ALSA_LIB_PCM=y
+BR2_PACKAGE_ALSA_LIB_RAWMIDI=y
+BR2_PACKAGE_ALSA_LIB_HWDEP=y
+BR2_PACKAGE_ALSA_LIB_SEQ=y
+BR2_PACKAGE_ALSA_LIB_ALISP=y
+BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS=y
+BR2_PACKAGE_ALSA_UTILS=y
+
+#
+# ALSA utils selection
+#
+# BR2_PACKAGE_ALSA_UTILS_ALSACONF is not set
+BR2_PACKAGE_ALSA_UTILS_ALSACTL=y
+BR2_PACKAGE_ALSA_UTILS_ALSAMIXER=y
+# BR2_PACKAGE_ALSA_UTILS_AMIDI is not set
+BR2_PACKAGE_ALSA_UTILS_AMIXER=y
+BR2_PACKAGE_ALSA_UTILS_APLAY=y
+BR2_PACKAGE_ALSA_UTILS_ARECORD=y
+# BR2_PACKAGE_ALSA_UTILS_IECSET is not set
+# BR2_PACKAGE_ALSA_UTILS_ACONNECT is not set
+# BR2_PACKAGE_ALSA_UTILS_APLAYMIDI is not set
+# BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI is not set
+# BR2_PACKAGE_ALSA_UTILS_ASEQDUMP is not set
+# BR2_PACKAGE_ALSA_UTILS_ASEQNET is not set
+BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+# BR2_PACKAGE_AUMIX is not set
+# BR2_PACKAGE_FLAC is not set
+# BR2_PACKAGE_FLITE is not set
+# BR2_PACKAGE_GSTREAMER is not set
+# BR2_PACKAGE_LIBCDAUDIO is not set
+# BR2_PACKAGE_LIBDVDREAD is not set
+# BR2_PACKAGE_LIBDVDNAV is not set
+# BR2_PACKAGE_LIBID3TAG is not set
+# BR2_PACKAGE_LIBMAD is not set
+# BR2_PACKAGE_LIBMMS is not set
+# BR2_PACKAGE_LIBMPD is not set
+# BR2_PACKAGE_LIBOGG is not set
+# BR2_PACKAGE_LIBSNDFILE is not set
+# BR2_PACKAGE_LIBTHEORA is not set
+# BR2_PACKAGE_LIBVORBIS is not set
+# BR2_PACKAGE_MADPLAY is not set
+# BR2_PACKAGE_MPG123 is not set
+# BR2_PACKAGE_MPLAYER is not set
+# BR2_PACKAGE_SPEEX is not set
+# BR2_PACKAGE_SWFDEC is not set
+# BR2_PACKAGE_FESTIVAL is not set
+# BR2_PACKAGE_TAGLIB is not set
+# BR2_PACKAGE_TREMOR is not set
#
-# Other development stuff
+# Compressors and decompressors
+#
+# BR2_PACKAGE_LZOP is not set
+# BR2_PACKAGE_LZMA is not set
+
+#
+# Debugging, profiling and benchmark
+#
+# BR2_PACKAGE_DMALLOC is not set
+# BR2_PACKAGE_KEXEC is not set
+# BR2_PACKAGE_LMBENCH is not set
+# BR2_PACKAGE_LSOF is not set
+# BR2_PACKAGE_LTRACE is not set
+# BR2_PACKAGE_MEMSTAT is not set
+# BR2_PACKAGE_NETPERF is not set
+# BR2_PACKAGE_OPROFILE is not set
+BR2_PACKAGE_STRACE=y
+
+#
+# Development tools
#
# BR2_PACKAGE_AUTOCONF is not set
# BR2_PACKAGE_AUTOMAKE is not set
# BR2_PACKAGE_BISON is not set
-# BR2_PACKAGE_CCACHE_TARGET is not set
+# BR2_PACKAGE_BSDIFF is not set
# BR2_PACKAGE_CVS is not set
# BR2_PACKAGE_DISTCC is not set
-# BR2_PACKAGE_DMALLOC is not set
# BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
+# BR2_PACKAGE_FLEX is not set
+
+#
+# native toolchain needs development files in target filesystem
+#
# BR2_PACKAGE_GETTEXT is not set
# BR2_PACKAGE_LIBINTL is not set
# BR2_PACKAGE_LIBGMP is not set
# BR2_PACKAGE_GPERF is not set
+# BR2_PACKAGE_INTLTOOL is not set
+# BR2_PACKAGE_MAKE is not set
# BR2_PACKAGE_LIBMPFR is not set
# BR2_PACKAGE_LIBTOOL is not set
# BR2_PACKAGE_M4 is not set
-# BR2_PACKAGE_OPROFILE is not set
# BR2_PACKAGE_PKG_CONFIG is not set
-# BR2_PACKAGE_READLINE is not set
-# BR2_PACKAGE_PCRE is not set
#
-# Armadeus specific packages
+# Games
#
-# BR2_PACKAGE_UUCP is not set
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
+# BR2_PACKAGE_GNUCHESS is not set
+# BR2_PACKAGE_PRBOOM is not set
+# BR2_PACKAGE_SDLQUAKE is not set
+# BR2_PACKAGE_SNES9X is not set
+# BR2_PACKAGE_WOLF4SDL is not set
#
-# bluez-utils not available (need dbus)
+# Graphic libraries and applications (graphic/text)
#
-# BR2_PACKAGE_MESALIB is not set
-# BR2_PACKAGE_FBTEST is not set
#
-# Armadeus specific tools/utilities
+# graphic libraries
#
-BR2_PACKAGE_AD9889CTRL=y
-# BR2_PACKAGE_AS_DEVICES is not set
-# BR2_PACKAGE_CH7024CTRL is not set
-# BR2_PACKAGE_ARMADEUS_DEMOS is not set
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_IMXREGS=y
-# BR2_PACKAGE_IMXSSI is not set
-BR2_PACKAGE_MAX5821CTRL=y
-# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
-# BR2_PACKAGE_FIRMWARE is not set
-# BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8 is not set
-# BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9 is not set
-# BR2_PACKAGE_DUMMY is not set
-# BR2_PACKAGE_SNES9X is not set
+# BR2_PACKAGE_ALLEGRO is not set
+# BR2_PACKAGE_DIRECTFB is not set
+# BR2_PACKAGE_FBDUMP is not set
+# BR2_PACKAGE_FBGRAB is not set
+# BR2_PACKAGE_FBTEST is not set
+# BR2_PACKAGE_FBV is not set
+# BR2_PACKAGE_IMAGEMAGICK is not set
+# BR2_PACKAGE_LINUX_FUSION is not set
+# BR2_PACKAGE_SDL is not set
#
-# Other stuff
+# Demos
#
-# BR2_PACKAGE_AT is not set
-# BR2_PACKAGE_BEECRYPT is not set
-# BR2_PACKAGE_BERKELEYDB is not set
-# BR2_PACKAGE_BSDIFF is not set
-# BR2_PACKAGE_CUPS is not set
-# BR2_PACKAGE_CUSTOMIZE is not set
-# BR2_PACKAGE_ENCHANT is not set
-# BR2_PACKAGE_FILE is not set
-# BR2_PACKAGE_GAMIN is not set
-# BR2_PACKAGE_ICU is not set
-# BR2_PACKAGE_KEXEC is not set
-# BR2_PACKAGE_LIBCONFIG is not set
-# BR2_PACKAGE_LIBCONFUSE is not set
-# BR2_PACKAGE_LIBDAEMON is not set
-# BR2_PACKAGE_LIBELF is not set
-# BR2_PACKAGE_LIBEVENT is not set
-# BR2_PACKAGE_LIBGCRYPT is not set
-# BR2_PACKAGE_LIBGPG_ERROR is not set
-# BR2_PACKAGE_LIBICONV is not set
-# BR2_PACKAGE_LIBIDN is not set
-# BR2_PACKAGE_LIBLOCKFILE is not set
-# BR2_PACKAGE_LIBOIL is not set
-# BR2_PACKAGE_LIBSYSFS is not set
-# BR2_PACKAGE_LMBENCH is not set
-# BR2_PACKAGE_LOCKFILE_PROGS is not set
-# BR2_PACKAGE_LOGROTATE is not set
-# BR2_PACKAGE_LSOF is not set
-# BR2_PACKAGE_LTP-TESTSUITE is not set
-# BR2_PACKAGE_LTRACE is not set
-# BR2_PACKAGE_MEMSTAT is not set
-# BR2_PACKAGE_POPT is not set
-# BR2_PACKAGE_SCREEN is not set
-# BR2_PACKAGE_SHARED_MIME_INFO is not set
-# BR2_PACKAGE_STARTUP_NOTIFICATION is not set
-BR2_PACKAGE_STRACE=y
-# BR2_PACKAGE_SUDO is not set
-# BR2_PACKAGE_XENOMAI is not set
+# BR2_PACKAGE_SDL_WATER is not set
#
-# Database
+# other GUIs
#
-# BR2_PACKAGE_MYSQL_CLIENT is not set
-# BR2_PACKAGE_SQLITE is not set
+# BR2_PACKAGE_QT is not set
+# BR2_PACKAGE_XORG7 is not set
#
-# Text editors
+# X libraries and helper libraries
#
-# BR2_PACKAGE_ED is not set
-BR2_PACKAGE_NANO=y
-# BR2_PACKAGE_UEMACS is not set
+# BR2_PACKAGE_LIBERATION is not set
#
-# Networking
+# X Window managers
#
#
-# Networking applications
+# X applications
#
-# BR2_PACKAGE_ARGUS is not set
-# BR2_PACKAGE_AVAHI is not set
-# BR2_PACKAGE_AXEL is not set
-# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BMON is not set
-# BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_CTORRENT is not set
-# BR2_PACKAGE_DNSMASQ is not set
-# BR2_PACKAGE_DROPBEAR is not set
-# BR2_PACKAGE_ETHTOOL is not set
-# BR2_PACKAGE_HASERL is not set
-# BR2_PACKAGE_HOSTAPD is not set
-# BR2_PACKAGE_IFPLUGD is not set
-# BR2_PACKAGE_IPERF is not set
-# BR2_PACKAGE_IPROUTE2 is not set
-# BR2_PACKAGE_IPSEC_TOOLS is not set
-# BR2_PACKAGE_IPTABLES is not set
-# BR2_PACKAGE_IW is not set
-# BR2_PACKAGE_KISMET is not set
-# BR2_PACKAGE_L2TP is not set
-# BR2_PACKAGE_LIBCGI is not set
-# BR2_PACKAGE_LIBCGICC is not set
-# BR2_PACKAGE_LIBCURL is not set
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_LIBEXOSIP2 is not set
-# BR2_PACKAGE_LIBMICROHTTPD is not set
-# BR2_PACKAGE_LIBNL is not set
-# BR2_PACKAGE_LIBOSIP2 is not set
-# BR2_PACKAGE_LIBPCAP is not set
-# BR2_PACKAGE_LIBSOUP is not set
-# BR2_PACKAGE_LIBUPNP is not set
-# BR2_PACKAGE_LINKS is not set
-# BR2_PACKAGE_LRZSZ is not set
-# BR2_PACKAGE_MIIDIAG is not set
-# BR2_PACKAGE_MROUTED is not set
-# BR2_PACKAGE_MUTT is not set
-# BR2_PACKAGE_NBD is not set
-# BR2_PACKAGE_NCFTP is not set
-# BR2_PACKAGE_NEON is not set
-# BR2_PACKAGE_NETPLUG is not set
-# BR2_PACKAGE_NETSNMP is not set
-# BR2_PACKAGE_NETSTAT_NAT is not set
-# BR2_PACKAGE_NFS_UTILS is not set
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-# BR2_PACKAGE_NTP_SNTP is not set
-# BR2_PACKAGE_OLSR is not set
-# BR2_PACKAGE_OPENNTPD is not set
-# BR2_PACKAGE_OPENSSH is not set
-# BR2_PACKAGE_OPENSSL is not set
-# BR2_PACKAGE_OPENVPN is not set
-BR2_PACKAGE_PORTMAP=y
-# BR2_PACKAGE_PPPD is not set
-# BR2_PACKAGE_RADVD is not set
-# BR2_PACKAGE_RP_PPPOE is not set
-# BR2_PACKAGE_PPTP_LINUX is not set
-# BR2_PACKAGE_PROFTPD is not set
-# BR2_PACKAGE_QUAGGA is not set
-# BR2_PACKAGE_RSYNC is not set
-# BR2_PACKAGE_SAMBA is not set
-# BR2_PACKAGE_SER2NET is not set
-# BR2_PACKAGE_SOCAT is not set
-# BR2_PACKAGE_SOCKETCAN is not set
-# BR2_PACKAGE_SPAWN_FCGI is not set
-# BR2_PACKAGE_STUNNEL is not set
-# BR2_PACKAGE_TCPDUMP is not set
-# BR2_PACKAGE_DHCPDUMP is not set
-# BR2_PACKAGE_TCPREPLAY is not set
-# BR2_PACKAGE_TN5250 is not set
-# BR2_PACKAGE_TTCP is not set
-# BR2_PACKAGE_UDPCAST is not set
-# BR2_PACKAGE_VPNC is not set
-# BR2_PACKAGE_VSFTPD is not set
-# BR2_PACKAGE_VTUN is not set
-# BR2_PACKAGE_WEBIF is not set
-BR2_PACKAGE_WIRELESS_TOOLS=y
-# BR2_PACKAGE_WPA_SUPPLICANT is not set
+# BR2_PACKAGE_GOB2 is not set
#
-# Hardware handling / blockdevices and filesystem maintenance
+# Hardware handling
#
+# BR2_PACKAGE_CDRKIT is not set
+# BR2_PACKAGE_CRAMFS is not set
+# BR2_PACKAGE_CWIID is not set
#
# dbus not available (need expat or libxml2)
@@ -482,10 +444,13 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
# BR2_PACKAGE_E2FSPROGS is not set
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
+# BR2_PACKAGE_FIRMWARE is not set
# BR2_PACKAGE_FIS is not set
-# BR2_PACKAGE_LIBFUSE is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
+# BR2_PACKAGE_GENEXT2FS is not set
+# BR2_PACKAGE_GENROMFS is not set
# BR2_PACKAGE_GPM is not set
+# BR2_PACKAGE_GPSD is not set
# BR2_PACKAGE_GVFS is not set
# BR2_PACKAGE_HAL is not set
# BR2_PACKAGE_HWDATA is not set
@@ -493,11 +458,9 @@ BR2_PACKAGE_I2C_TOOLS=y
# BR2_PACKAGE_INPUT_TOOLS is not set
# BR2_PACKAGE_IOSTAT is not set
# BR2_PACKAGE_LCD4LINUX is not set
-# BR2_PACKAGE_LIBAIO is not set
-# BR2_PACKAGE_LIBRAW1394 is not set
-# BR2_PACKAGE_LIBUSB is not set
# BR2_PACKAGE_LM_SENSORS is not set
# BR2_PACKAGE_LVM2 is not set
+# BR2_PACKAGE_MAKEDEVS is not set
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTESTER is not set
BR2_PACKAGE_MTD=y
@@ -530,6 +493,7 @@ BR2_PACKAGE_MTD_NANDWRITE=y
# BR2_PACKAGE_MTD_RFDFORMAT is not set
# BR2_PACKAGE_MTD_SERVE_IMAGE is not set
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_MTD_MTDINFO=y
BR2_PACKAGE_MTD_UBIATTACH=y
BR2_PACKAGE_MTD_UBICRC32=y
BR2_PACKAGE_MTD_UBIDETACH=y
@@ -547,168 +511,223 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_PCMCIA is not set
# BR2_PACKAGE_SETSERIAL is not set
# BR2_PACKAGE_SMARTMONTOOLS is not set
+# BR2_PACKAGE_SQUASHFS is not set
# BR2_PACKAGE_SYSSTAT is not set
# BR2_PACKAGE_USB_MODESWITCH is not set
# BR2_PACKAGE_USBMOUNT is not set
# BR2_PACKAGE_USBUTILS is not set
# BR2_PACKAGE_WIPE is not set
+# BR2_PACKAGE_XENOMAI is not set
# BR2_PACKAGE_XFSPROGS is not set
#
-# Audio and video libraries and applications
+# Interpreter languages and scripting
#
-BR2_PACKAGE_ALSA_LIB=y
+# BR2_PACKAGE_HASERL is not set
+# BR2_PACKAGE_LUA is not set
+# BR2_PACKAGE_MICROPERL is not set
+# BR2_PACKAGE_PHP is not set
+# BR2_PACKAGE_PYTHON is not set
+# BR2_PACKAGE_RUBY is not set
+# BR2_PACKAGE_TCL is not set
#
-# ALSA lib selection
+# Libraries
#
-BR2_PACKAGE_ALSA_LIB_DEVDIR="/dev/snd"
-BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS="all"
-BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS="all"
-BR2_PACKAGE_ALSA_LIB_ALOAD=y
-BR2_PACKAGE_ALSA_LIB_MIXER=y
-BR2_PACKAGE_ALSA_LIB_PCM=y
-BR2_PACKAGE_ALSA_LIB_RAWMIDI=y
-BR2_PACKAGE_ALSA_LIB_HWDEP=y
-BR2_PACKAGE_ALSA_LIB_SEQ=y
-BR2_PACKAGE_ALSA_LIB_ALISP=y
-BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS=y
-BR2_PACKAGE_ALSA_UTILS=y
#
-# ALSA utils selection
+# Compression and decompression
#
-# BR2_PACKAGE_ALSA_UTILS_ALSACONF is not set
-BR2_PACKAGE_ALSA_UTILS_ALSACTL=y
-BR2_PACKAGE_ALSA_UTILS_ALSAMIXER=y
-# BR2_PACKAGE_ALSA_UTILS_AMIDI is not set
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_ARECORD=y
-# BR2_PACKAGE_ALSA_UTILS_IECSET is not set
-# BR2_PACKAGE_ALSA_UTILS_ACONNECT is not set
-# BR2_PACKAGE_ALSA_UTILS_APLAYMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_ASEQDUMP is not set
-# BR2_PACKAGE_ALSA_UTILS_ASEQNET is not set
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-# BR2_PACKAGE_AUMIX is not set
-# BR2_PACKAGE_FLAC is not set
-# BR2_PACKAGE_GSTREAMER is not set
-# BR2_PACKAGE_LIBCDAUDIO is not set
-# BR2_PACKAGE_LIBDVDREAD is not set
-# BR2_PACKAGE_LIBDVDNAV is not set
-# BR2_PACKAGE_LIBID3TAG is not set
-# BR2_PACKAGE_LIBMAD is not set
-# BR2_PACKAGE_LIBMMS is not set
-# BR2_PACKAGE_LIBMPD is not set
-# BR2_PACKAGE_LIBOGG is not set
-# BR2_PACKAGE_LIBSNDFILE is not set
-# BR2_PACKAGE_LIBTHEORA is not set
-# BR2_PACKAGE_LIBVORBIS is not set
-# BR2_PACKAGE_MADPLAY is not set
-# BR2_PACKAGE_MPG123 is not set
-# BR2_PACKAGE_MPLAYER is not set
-# BR2_PACKAGE_SPEEX is not set
-# BR2_PACKAGE_SWFDEC is not set
-# BR2_PACKAGE_FESTIVAL is not set
-# BR2_PACKAGE_FLITE is not set
-# BR2_PACKAGE_TAGLIB is not set
-# BR2_PACKAGE_TREMOR is not set
-# BR2_PACKAGE_VLC is not set
+# BR2_PACKAGE_LIBARCHIVE is not set
+BR2_PACKAGE_LZO=y
+BR2_PACKAGE_ZLIB=y
#
-# Graphic libraries and applications (graphic/text)
+# Crypto
#
+# BR2_PACKAGE_BEECRYPT is not set
+# BR2_PACKAGE_LIBGCRYPT is not set
+# BR2_PACKAGE_LIBGPG_ERROR is not set
+# BR2_PACKAGE_OPENSSL is not set
#
-# text rendering libraries
+# Database
#
-BR2_PACKAGE_NCURSES=y
-# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
-# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
-# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
-# BR2_PACKAGE_NEWT is not set
-# BR2_PACKAGE_SLANG is not set
+# BR2_PACKAGE_BERKELEYDB is not set
+# BR2_PACKAGE_MYSQL_CLIENT is not set
+# BR2_PACKAGE_SQLITE is not set
#
-# text rendering applications
+# Filesystem
#
-# BR2_PACKAGE_DIALOG is not set
+# BR2_PACKAGE_GAMIN is not set
+# BR2_PACKAGE_LIBCONFIG is not set
+# BR2_PACKAGE_LIBCONFUSE is not set
+# BR2_PACKAGE_LIBFUSE is not set
+# BR2_PACKAGE_LIBLOCKFILE is not set
+# BR2_PACKAGE_LIBSYSFS is not set
#
-# graphic libraries
+# Graphics
#
-# BR2_PACKAGE_ALLEGRO is not set
-# BR2_PACKAGE_DIRECTFB is not set
-# BR2_PACKAGE_FBDUMP is not set
-# BR2_PACKAGE_IMAGEMAGICK is not set
+# BR2_PACKAGE_ATK is not set
+# BR2_PACKAGE_CAIRO is not set
+# BR2_PACKAGE_FONTCONFIG is not set
+# BR2_PACKAGE_FREETYPE is not set
# BR2_PACKAGE_JPEG is not set
# BR2_PACKAGE_LIBART is not set
# BR2_PACKAGE_LIBPNG is not set
# BR2_PACKAGE_LIBUNGIF is not set
-# BR2_PACKAGE_LINUX_FUSION is not set
+# BR2_PACKAGE_MESALIB is not set
+# BR2_PACKAGE_PANGO is not set
# BR2_PACKAGE_PIXMAN is not set
-# BR2_PACKAGE_SDL is not set
# BR2_PACKAGE_TIFF is not set
#
-# Demos
+# Hardware handling
#
-# BR2_PACKAGE_SDL_WATER is not set
+# BR2_PACKAGE_LIBAIO is not set
+# BR2_PACKAGE_LIBRAW1394 is not set
+BR2_PACKAGE_TSLIB=y
+# BR2_PACKAGE_LIBUSB is not set
#
-# busybox graphic applications
+# Java
#
+# BR2_PACKAGE_CLASSPATH is not set
#
-# --> May be broken in busybox
+# Networking
#
-# BR2_PACKAGE_FBV is not set
-# BR2_PACKAGE_FBSET is not set
-# BR2_PACKAGE_FBGRAB is not set
+# BR2_PACKAGE_LIBCGI is not set
+# BR2_PACKAGE_LIBCGICC is not set
+# BR2_PACKAGE_LIBCURL is not set
+# BR2_PACKAGE_LIBDNET is not set
+# BR2_PACKAGE_LIBEXOSIP2 is not set
+# BR2_PACKAGE_LIBIDN is not set
+# BR2_PACKAGE_LIBMICROHTTPD is not set
+# BR2_PACKAGE_NEON is not set
+# BR2_PACKAGE_LIBNL is not set
+# BR2_PACKAGE_LIBPCAP is not set
+# BR2_PACKAGE_LIBOSIP2 is not set
+# BR2_PACKAGE_LIBRSYNC is not set
+# BR2_PACKAGE_LIBSOUP is not set
+# BR2_PACKAGE_LIBUPNP is not set
#
-# other GUIs
+# Other
#
-# BR2_PACKAGE_QT is not set
-# BR2_PACKAGE_XORG7 is not set
+# BR2_PACKAGE_LIBATOMIC_OPS is not set
+# BR2_PACKAGE_LIBCAP is not set
+# BR2_PACKAGE_LIBDAEMON is not set
+# BR2_PACKAGE_LIBELF is not set
+# BR2_PACKAGE_LIBEVENT is not set
+# BR2_PACKAGE_LIBGLIB12 is not set
+# BR2_PACKAGE_LIBGLIB2 is not set
+# BR2_PACKAGE_LIBOIL is not set
#
-# X libraries and helper libraries
+# Text and terminal handling
#
-# BR2_PACKAGE_ATK is not set
-# BR2_PACKAGE_CAIRO is not set
-# BR2_PACKAGE_PANGO is not set
-# BR2_PACKAGE_LIBDRM is not set
-# BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
-# BR2_PACKAGE_LIBGLIB2 is not set
-# BR2_PACKAGE_OPENMOTIF is not set
-# BR2_PACKAGE_FONTCONFIG is not set
-# BR2_PACKAGE_FREETYPE is not set
-BR2_PACKAGE_TSLIB=y
-# BR2_PACKAGE_WEBKIT is not set
+# BR2_PACKAGE_ENCHANT is not set
+# BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_LIBICONV is not set
+BR2_PACKAGE_NCURSES=y
+BR2_PACKAGE_NCURSES_TARGET_PANEL=y
+BR2_PACKAGE_NCURSES_TARGET_FORM=y
+BR2_PACKAGE_NCURSES_TARGET_MENU=y
+# BR2_PACKAGE_NEWT is not set
+# BR2_PACKAGE_PCRE is not set
+# BR2_PACKAGE_POPT is not set
+# BR2_PACKAGE_READLINE is not set
+# BR2_PACKAGE_SLANG is not set
#
-# X Window managers
+# XML
#
+# BR2_PACKAGE_EXPAT is not set
+# BR2_PACKAGE_EZXML is not set
+# BR2_PACKAGE_LIBXML_PARSER_PERL is not set
+# BR2_PACKAGE_LIBXML2 is not set
+# BR2_PACKAGE_LIBXSLT is not set
+# BR2_PACKAGE_XERCES is not set
#
-# X applications
+# Miscellaneous
#
-# BR2_PACKAGE_GOB2 is not set
-# BR2_PACKAGE_SYLPHEED is not set
-# BR2_PACKAGE_XPDF is not set
+# BR2_PACKAGE_SHARED_MIME_INFO is not set
#
-# Compressors / decompressors
+# Networking applications
#
-# BR2_PACKAGE_LIBARCHIVE is not set
-BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_LZMA is not set
-BR2_PACKAGE_ZLIB=y
+# BR2_PACKAGE_ARGUS is not set
+# BR2_PACKAGE_AVAHI is not set
+# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BIND is not set
+# BR2_PACKAGE_BMON is not set
+# BR2_PACKAGE_BRIDGE is not set
+# BR2_PACKAGE_CTORRENT is not set
+# BR2_PACKAGE_CUPS is not set
+# BR2_PACKAGE_DNSMASQ is not set
+# BR2_PACKAGE_DROPBEAR is not set
+# BR2_PACKAGE_ETHTOOL is not set
+# BR2_PACKAGE_HOSTAPD is not set
+# BR2_PACKAGE_IFPLUGD is not set
+# BR2_PACKAGE_IPERF is not set
+# BR2_PACKAGE_IPROUTE2 is not set
+# BR2_PACKAGE_IPSEC_TOOLS is not set
+# BR2_PACKAGE_IPTABLES is not set
+# BR2_PACKAGE_IW is not set
+# BR2_PACKAGE_KISMET is not set
+# BR2_PACKAGE_L2TP is not set
+# BR2_PACKAGE_LINKS is not set
+# BR2_PACKAGE_LRZSZ is not set
+# BR2_PACKAGE_MIIDIAG is not set
+# BR2_PACKAGE_MROUTED is not set
+# BR2_PACKAGE_MUTT is not set
+# BR2_PACKAGE_NBD is not set
+# BR2_PACKAGE_NCFTP is not set
+# BR2_PACKAGE_NETPLUG is not set
+# BR2_PACKAGE_NETSNMP is not set
+# BR2_PACKAGE_NETSTAT_NAT is not set
+# BR2_PACKAGE_NFS_UTILS is not set
+BR2_PACKAGE_NTP=y
+# BR2_PACKAGE_NTP_NTPD is not set
+# BR2_PACKAGE_NTP_SNTP is not set
+# BR2_PACKAGE_OLSR is not set
+# BR2_PACKAGE_OPENNTPD is not set
+# BR2_PACKAGE_OPENOBEX is not set
+# BR2_PACKAGE_OPENSSH is not set
+# BR2_PACKAGE_OPENVPN is not set
+BR2_PACKAGE_PORTMAP=y
+# BR2_PACKAGE_PPPD is not set
+# BR2_PACKAGE_RADVD is not set
+# BR2_PACKAGE_RP_PPPOE is not set
+# BR2_PACKAGE_PPTP_LINUX is not set
+# BR2_PACKAGE_PROFTPD is not set
+# BR2_PACKAGE_QUAGGA is not set
+# BR2_PACKAGE_RSYNC is not set
+# BR2_PACKAGE_SAMBA is not set
+# BR2_PACKAGE_SER2NET is not set
+# BR2_PACKAGE_SOCAT is not set
+# BR2_PACKAGE_SOCKETCAN is not set
+# BR2_PACKAGE_SPAWN_FCGI is not set
+# BR2_PACKAGE_SQUID is not set
+# BR2_PACKAGE_STUNNEL is not set
+# BR2_PACKAGE_TCPDUMP is not set
+# BR2_PACKAGE_DHCPDUMP is not set
+# BR2_PACKAGE_TCPREPLAY is not set
+# BR2_PACKAGE_TN5250 is not set
+# BR2_PACKAGE_TTCP is not set
+# BR2_PACKAGE_UDPCAST is not set
+# BR2_PACKAGE_USSP_PUSH is not set
+# BR2_PACKAGE_UUCP is not set
+# BR2_PACKAGE_VPNC is not set
+# BR2_PACKAGE_VSFTPD is not set
+# BR2_PACKAGE_VTUN is not set
+# BR2_PACKAGE_WEBIF is not set
+BR2_PACKAGE_WIRELESS_TOOLS=y
+# BR2_PACKAGE_WPA_SUPPLICANT is not set
#
# Package managers
@@ -717,46 +736,33 @@ BR2_PACKAGE_ZLIB=y
# BR2_PACKAGE_PORTAGE is not set
#
-# Interpreter languages / Scripting
+# Shell and utilities
#
-# BR2_PACKAGE_LUA is not set
-# BR2_PACKAGE_MICROPERL is not set
-# BR2_PACKAGE_PYTHON is not set
-# BR2_PACKAGE_RUBY is not set
-# BR2_PACKAGE_TCL is not set
-# BR2_PACKAGE_PHP is not set
-
-#
-# XML handling
-#
-# BR2_PACKAGE_EXPAT is not set
-# BR2_PACKAGE_EZXML is not set
-# BR2_PACKAGE_LIBXML2 is not set
-# BR2_PACKAGE_LIBXSLT is not set
-# BR2_PACKAGE_XERCES is not set
+# BR2_PACKAGE_AT is not set
+# BR2_PACKAGE_DIALOG is not set
+# BR2_PACKAGE_FILE is not set
+# BR2_PACKAGE_LOCKFILE_PROGS is not set
+# BR2_PACKAGE_LOGROTATE is not set
+# BR2_PACKAGE_SCREEN is not set
+# BR2_PACKAGE_SUDO is not set
+# BR2_PACKAGE_WHICH is not set
#
-# Java
+# System tools
#
-# BR2_PACKAGE_CLASSPATH is not set
#
-# Games
+# Text editors and viewers
#
-# BR2_PACKAGE_GNUCHESS is not set
-# BR2_PACKAGE_PRBOOM is not set
-# BR2_PACKAGE_SDLQUAKE is not set
+# BR2_PACKAGE_ED is not set
+BR2_PACKAGE_NANO=y
+# BR2_PACKAGE_UEMACS is not set
#
# Target filesystem options
#
-BR2_ROOTFS_PREFIX="$(BR2_BOARD_NAME)-rootfs"
-BR2_ROOTFS_SUFFIX=""
BR2_ROOTFS_POST_BUILD_SCRIPT=""
-
-#
-# filesystem for target device
-#
+BR2_ROOTFS_DEVICE_TABLE="target/device/armadeus/rootfs/device_table.txt"
# BR2_TARGET_ROOTFS_CRAMFS is not set
# BR2_TARGET_ROOTFS_CLOOP is not set
# BR2_TARGET_ROOTFS_EXT2 is not set
@@ -777,8 +783,7 @@ BR2_TARGET_ROOTFS_JFFS2_PADSIZE=0x0
BR2_TARGET_ROOTFS_JFFS2_LE=y
# BR2_TARGET_ROOTFS_JFFS2_BE is not set
# BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
+# BR2_TARGET_ROOTFS_UBIFS is not set
# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
BR2_TARGET_ROOTFS_TAR_NONE=y
@@ -786,13 +791,12 @@ BR2_TARGET_ROOTFS_TAR_NONE=y
# BR2_TARGET_ROOTFS_TAR_BZIP2 is not set
# BR2_TARGET_ROOTFS_TAR_LZMA is not set
BR2_TARGET_ROOTFS_TAR_OPTIONS=""
-BR2_TARGET_ROOTFS_TAR_COPYTO=""
# BR2_TARGET_ROOTFS_CPIO is not set
# BR2_TARGET_ROOTFS_INITRAMFS is not set
# BR2_TARGET_ROOTFS_ROMFS is not set
#
-# bootloader for target device
+# Bootloaders
#
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
@@ -825,30 +829,27 @@ BR2_KERNEL_LINUX_ADVANCED=y
BR2_PACKAGE_LINUX=y
BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
BR2_PACKAGE_LINUX_FORMAT="uImage"
-BR2_KERNEL_CURRENT_VERSION="2.6.30.2"
-BR2_KERNEL_LATEST_2_6_30="2"
+BR2_KERNEL_CURRENT_VERSION="2.6.33.4"
+BR2_KERNEL_LATEST_2_6_33="4"
+BR2_KERNEL_LATEST_2_6_32="13"
+BR2_KERNEL_LATEST_2_6_31="13"
+BR2_KERNEL_LATEST_2_6_30="10"
BR2_KERNEL_LATEST_2_6_29="6"
BR2_KERNEL_LATEST_2_6_28="10"
-BR2_KERNEL_LATEST_2_6_27="27"
-BR2_KERNEL_LATEST_2_6_26="8"
-BR2_KERNEL_LATEST_2_6_25="19"
-BR2_KERNEL_LATEST_2_6_24="7"
+BR2_KERNEL_LATEST_2_6_27="46"
BR2_KERNEL_PATCH_LEVEL="$(BR2_KERNEL_MINORLEVEL)"
BR2_KERNEL_NEXT_VERSION="2.6.30"
BR2_KERNEL_THIS_VERSION="2.6.29"
BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6"
-BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
-BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
BR2_KERNEL_PATCH_SITE="$(BR2_KERNEL_SITE)"
# BR2_LINUX_2_6_STABLE is not set
+# BR2_LINUX_2_6_33 is not set
+# BR2_LINUX_2_6_32 is not set
+# BR2_LINUX_2_6_31 is not set
# BR2_LINUX_2_6_30 is not set
BR2_LINUX_2_6_29=y
# BR2_LINUX_2_6_28 is not set
# BR2_LINUX_2_6_27 is not set
-# BR2_LINUX_2_6_26 is not set
-# BR2_LINUX_2_6_25 is not set
-# BR2_LINUX_2_6_24 is not set
-# BR2_LINUX_2_6_31 is not set
# BR2_LINUX26_CUSTOM is not set
#
@@ -862,8 +863,6 @@ BR2_KERNEL_ADD_MINORPATCH=y
# BR2_KERNEL_ADD_RC_PATCH is not set
# BR2_KERNEL_ADD_LATEST_SNAPSHOT is not set
# BR2_KERNEL_ADD_SNAPSHOT is not set
-# BR2_KERNEL_ADD_LATEST_MM_PATCH is not set
-# BR2_KERNEL_ADD_MM_PATCH is not set
BR2_KERNEL_ADD_PATCH=y
BR2_KERNEL_MINORLEVEL="6"
# BR2_KERNEL_ARCH_PATCH_ENABLED is not set
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index e9c28cc..11dd7a6 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Jun 17 15:34:40 2010
+# Mon Jun 21 14:37:01 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.05"
@@ -379,6 +379,9 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
#
# BR2_PACKAGE_GNUCHESS is not set
# BR2_PACKAGE_PRBOOM is not set
+# BR2_PACKAGE_SDLQUAKE is not set
+# BR2_PACKAGE_SNES9X is not set
+# BR2_PACKAGE_WOLF4SDL is not set
#
# Graphic libraries and applications (graphic/text)
@@ -391,6 +394,7 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
# BR2_PACKAGE_DIRECTFB is not set
# BR2_PACKAGE_FBDUMP is not set
# BR2_PACKAGE_FBGRAB is not set
+# BR2_PACKAGE_FBTEST is not set
# BR2_PACKAGE_FBV is not set
# BR2_PACKAGE_IMAGEMAGICK is not set
# BR2_PACKAGE_LINUX_FUSION is not set
@@ -426,6 +430,7 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
#
# BR2_PACKAGE_CDRKIT is not set
# BR2_PACKAGE_CRAMFS is not set
+# BR2_PACKAGE_CWIID is not set
#
# dbus not available (need expat or libxml2)
@@ -569,6 +574,7 @@ BR2_PACKAGE_ZLIB=y
# BR2_PACKAGE_LIBART is not set
# BR2_PACKAGE_LIBPNG is not set
# BR2_PACKAGE_LIBUNGIF is not set
+# BR2_PACKAGE_MESALIB is not set
# BR2_PACKAGE_PANGO is not set
# BR2_PACKAGE_PIXMAN is not set
# BR2_PACKAGE_TIFF is not set
@@ -711,6 +717,7 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
# BR2_PACKAGE_USSP_PUSH is not set
+# BR2_PACKAGE_UUCP is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
diff --git a/patches/buildroot/2010.05/021-sdl-water-config.patch b/patches/buildroot/2010.05/021-sdl-water-config.patch
index bfc36ae..f0af0e1 100644
--- a/patches/buildroot/2010.05/021-sdl-water-config.patch
+++ b/patches/buildroot/2010.05/021-sdl-water-config.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:45:48.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:46:13.000000000 +0200
+--- buildroot.orig/package/Config.in 2010-06-21 09:55:43.000000000 +0200
++++ buildroot/package/Config.in 2010-06-21 09:56:05.000000000 +0200
@@ -106,6 +106,8 @@
source "package/sdl_net/Config.in"
source "package/sdl_ttf/Config.in"
@@ -14,11 +14,11 @@ Index: buildroot/package/Config.in
+source "package/sdlwater/Config.in"
comment "other GUIs"
- comment "--> May be broken in busybox"
+ source "package/qt/Config.in"
Index: buildroot/package/sdlwater/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdlwater/Config.in 2010-06-18 19:09:30.000000000 +0200
++++ buildroot/package/sdlwater/Config.in 2010-06-21 09:55:43.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_SDL_WATER
+ bool "SDL_water"
@@ -30,7 +30,7 @@ Index: buildroot/package/sdlwater/Config.in
Index: buildroot/package/sdlwater/sdlwater.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdlwater/sdlwater.mk 2010-06-18 20:48:40.000000000 +0200
++++ buildroot/package/sdlwater/sdlwater.mk 2010-06-21 09:55:43.000000000 +0200
@@ -0,0 +1,65 @@
+#############################################################
+#
diff --git a/patches/buildroot/2010.05/043-mesa-add_packages.patch b/patches/buildroot/2010.05/043-mesa-add_packages.patch
index 507c88c..d0b8ede 100644
--- a/patches/buildroot/2010.05/043-mesa-add_packages.patch
+++ b/patches/buildroot/2010.05/043-mesa-add_packages.patch
@@ -2,14 +2,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2010-06-18 18:15:21.000000000 +0200
+++ buildroot/package/Config.in 2010-06-18 18:16:00.000000000 +0200
-@@ -323,6 +323,7 @@
+@@ -266,6 +266,7 @@
+ source "package/libgtk2/Config.in"
source "package/libpng/Config.in"
source "package/libungif/Config.in"
- source "package/lite/Config.in"
+source "package/mesa/Config.in"
+ source "package/pango/Config.in"
source "package/pixman/Config.in"
- source "package/sawman/Config.in"
- source "package/sdl/Config.in"
+ source "package/tiff/Config.in"
Index: buildroot/package/mesa/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2010.05/072-xenomai-package.patch b/patches/buildroot/2010.05/072-xenomai-package.patch
index d10eb97..211138e 100644
--- a/patches/buildroot/2010.05/072-xenomai-package.patch
+++ b/patches/buildroot/2010.05/072-xenomai-package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:47:13.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:47:20.000000000 +0200
+--- buildroot.orig/package/Config.in 2010-06-21 09:56:27.000000000 +0200
++++ buildroot/package/Config.in 2010-06-21 09:56:27.000000000 +0200
@@ -206,6 +206,7 @@
source "package/usbmount/Config.in"
source "package/usbutils/Config.in"
@@ -16,9 +16,9 @@ Index: buildroot/package/Config.in
Index: buildroot/target/linux/Makefile.in.advanced
===================================================================
---- buildroot.orig/target/linux/Makefile.in.advanced 2010-06-20 18:22:31.000000000 +0200
-+++ buildroot/target/linux/Makefile.in.advanced 2010-06-20 18:26:32.000000000 +0200
-@@ -382,6 +382,9 @@
+--- buildroot.orig/target/linux/Makefile.in.advanced 2010-06-21 09:56:27.000000000 +0200
++++ buildroot/target/linux/Makefile.in.advanced 2010-06-21 09:56:27.000000000 +0200
+@@ -373,6 +373,9 @@
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
(cd $(LINUX_DIR)/drivers; ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ armadeus)
endif
@@ -31,7 +31,7 @@ Index: buildroot/target/linux/Makefile.in.advanced
Index: buildroot/package/xenomai/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/Config.in 2010-06-20 18:38:51.000000000 +0200
++++ buildroot/package/xenomai/Config.in 2010-06-21 09:56:27.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_XENOMAI
+ bool "Xenomai"
@@ -43,7 +43,7 @@ Index: buildroot/package/xenomai/Config.in
Index: buildroot/package/xenomai/xenomai.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/xenomai.mk 2010-06-20 18:35:44.000000000 +0200
++++ buildroot/package/xenomai/xenomai.mk 2010-06-21 09:56:27.000000000 +0200
@@ -0,0 +1,99 @@
+#############################################################
+#
@@ -147,7 +147,7 @@ Index: buildroot/package/xenomai/xenomai.mk
Index: buildroot/package/xenomai/xeno-kernel.config
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/xeno-kernel.config 2010-06-20 18:36:20.000000000 +0200
++++ buildroot/package/xenomai/xeno-kernel.config 2010-06-21 09:56:27.000000000 +0200
@@ -0,0 +1,59 @@
+CONFIG_XENOMAI=y
+CONFIG_XENO_OPT_NUCLEUS=y
@@ -212,7 +212,7 @@ Index: buildroot/package/xenomai/xeno-kernel.config
Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2010-06-20 18:36:48.000000000 +0200
++++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2010-06-21 09:56:27.000000000 +0200
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-imx/include/mach/imxfb.h
++++ b/arch/arm/mach-imx/include/mach/imxfb.h
@@ -227,7 +227,7 @@ Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.pat
Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2010-06-20 18:37:17.000000000 +0200
++++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2010-06-21 09:56:27.000000000 +0200
@@ -0,0 +1,23 @@
+Corrects Freeze problem with MX2 when Adeos is active and
+application/driver uses interruption on GPIO
diff --git a/patches/buildroot/2010.05/081-adds_quake_package.patch b/patches/buildroot/2010.05/081-adds_quake_package.patch
index e402222..5572fcd 100644
--- a/patches/buildroot/2010.05/081-adds_quake_package.patch
+++ b/patches/buildroot/2010.05/081-adds_quake_package.patch
@@ -16,7 +16,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/games/sdlquake/sdlquake.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake.mk 2010-06-17 16:47:28.000000000 +0200
++++ buildroot/package/games/sdlquake/sdlquake.mk 2010-06-21 09:56:48.000000000 +0200
@@ -0,0 +1,31 @@
+#############################################################
+#
@@ -52,7 +52,7 @@ Index: buildroot/package/games/sdlquake/sdlquake.mk
Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2010-06-17 16:47:28.000000000 +0200
++++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2010-06-21 09:56:48.000000000 +0200
@@ -0,0 +1,35 @@
+--- /tmp/Makefile.am 2008-08-11 20:31:09.000000000 +0200
++++ sdlquake-1.0.9/Makefile.am 2008-08-11 20:55:00.263198000 +0200
@@ -92,7 +92,7 @@ Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
Index: buildroot/package/games/sdlquake/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/Config.in 2010-06-17 16:47:28.000000000 +0200
++++ buildroot/package/games/sdlquake/Config.in 2010-06-21 09:56:48.000000000 +0200
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_SDLQUAKE
+ bool "sdlquake"
@@ -107,7 +107,7 @@ Index: buildroot/package/games/sdlquake/Config.in
Index: buildroot/package/games/quake-pak/quake-pak.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/quake-pak/quake-pak.mk 2010-06-17 16:47:28.000000000 +0200
++++ buildroot/package/games/quake-pak/quake-pak.mk 2010-06-21 09:56:48.000000000 +0200
@@ -0,0 +1,34 @@
+#############################################################
+#
@@ -146,7 +146,7 @@ Index: buildroot/package/games/quake-pak/quake-pak.mk
Index: buildroot/package/games/quake-pak/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/quake-pak/Config.in 2010-06-17 16:47:28.000000000 +0200
++++ buildroot/package/games/quake-pak/Config.in 2010-06-21 09:56:48.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_QUAKE_PAK
+ bool "shareware Quake PAK/WAD file"
@@ -157,8 +157,8 @@ Index: buildroot/package/games/quake-pak/Config.in
+ The file will be placed in the /usr/share/games/quake/ directory.
Index: buildroot/package/games/Config.in
===================================================================
---- buildroot.orig/package/games/Config.in 2010-06-17 16:45:11.000000000 +0200
-+++ buildroot/package/games/Config.in 2010-06-17 16:47:28.000000000 +0200
+--- buildroot.orig/package/games/Config.in 2010-06-21 09:56:03.000000000 +0200
++++ buildroot/package/games/Config.in 2010-06-21 09:56:48.000000000 +0200
@@ -5,5 +5,7 @@
source "package/games/lxdoom/Config.in"
source "package/games/magiccube4d/Config.in"
@@ -167,3 +167,17 @@ Index: buildroot/package/games/Config.in
source "package/games/rubix/Config.in"
+source "package/games/sdlquake/Config.in"
endmenu
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-21 09:57:11.000000000 +0200
++++ buildroot/package/Config.in 2010-06-21 10:00:07.000000000 +0200
+@@ -80,7 +80,9 @@
+ source "package/games/lxdoom/Config.in"
+ source "package/games/magiccube4d/Config.in"
+ source "package/games/prboom/Config.in"
++source "package/games/quake-pak/Config.in"
+ source "package/games/rubix/Config.in"
++source "package/games/sdlquake/Config.in"
+ endmenu
+
+ menu "Graphic libraries and applications (graphic/text)"
diff --git a/patches/buildroot/2010.05/095-uucp-add_packages.patch b/patches/buildroot/2010.05/095-uucp-add_packages.patch
index ce6dd00..35ed448 100644
--- a/patches/buildroot/2010.05/095-uucp-add_packages.patch
+++ b/patches/buildroot/2010.05/095-uucp-add_packages.patch
@@ -6,11 +6,11 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-20 11:48:11.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-20 11:49:30.000000000 +0200
-@@ -219,6 +219,7 @@
- #source "package/udhcp/Config.in"
- #endif
+--- buildroot.orig/package/Config.in 2010-06-21 10:00:36.000000000 +0200
++++ buildroot/package/Config.in 2010-06-21 10:00:36.000000000 +0200
+@@ -430,6 +430,7 @@
+ source "package/tn5250/Config.in"
+ source "package/ttcp/Config.in"
source "package/udpcast/Config.in"
+source "package/uucp/Config.in"
source "package/vpnc/Config.in"
@@ -19,7 +19,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/uucp/uucp.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/uucp/uucp.mk 2010-06-17 16:49:43.000000000 +0200
++++ buildroot/package/uucp/uucp.mk 2010-06-21 10:00:36.000000000 +0200
@@ -0,0 +1,17 @@
+#############################################################
+#
@@ -41,7 +41,7 @@ Index: buildroot/package/uucp/uucp.mk
Index: buildroot/package/uucp/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/uucp/Config.in 2010-06-17 16:49:43.000000000 +0200
++++ buildroot/package/uucp/Config.in 2010-06-21 10:00:36.000000000 +0200
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_UUCP
+ bool "uucp"
diff --git a/patches/buildroot/2010.05/107-games-add_wolf4sdl.patch b/patches/buildroot/2010.05/107-games-add_wolf4sdl.patch
index 533ea6b..9906a4e 100644
--- a/patches/buildroot/2010.05/107-games-add_wolf4sdl.patch
+++ b/patches/buildroot/2010.05/107-games-add_wolf4sdl.patch
@@ -5,7 +5,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/games/wolf4sdl/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/wolf4sdl/Config.in 2010-06-17 16:50:31.000000000 +0200
++++ buildroot/package/games/wolf4sdl/Config.in 2010-06-21 10:00:59.000000000 +0200
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_WOLF4SDL
+ bool "Wolf4SDL"
@@ -21,7 +21,7 @@ Index: buildroot/package/games/wolf4sdl/Config.in
Index: buildroot/package/games/wolf4sdl/wolf4sdl.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/wolf4sdl/wolf4sdl.mk 2010-06-17 16:50:31.000000000 +0200
++++ buildroot/package/games/wolf4sdl/wolf4sdl.mk 2010-06-21 10:00:59.000000000 +0200
@@ -0,0 +1,55 @@
+#############################################################
+#
@@ -80,11 +80,23 @@ Index: buildroot/package/games/wolf4sdl/wolf4sdl.mk
+endif
Index: buildroot/package/games/Config.in
===================================================================
---- buildroot.orig/package/games/Config.in 2010-06-17 16:47:28.000000000 +0200
-+++ buildroot/package/games/Config.in 2010-06-17 16:50:31.000000000 +0200
+--- buildroot.orig/package/games/Config.in 2010-06-21 09:56:48.000000000 +0200
++++ buildroot/package/games/Config.in 2010-06-21 10:00:59.000000000 +0200
@@ -8,4 +8,5 @@
source "package/games/quake-pak/Config.in"
source "package/games/rubix/Config.in"
source "package/games/sdlquake/Config.in"
+source "package/games/wolf4sdl/Config.in"
endmenu
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-21 10:01:27.000000000 +0200
++++ buildroot/package/Config.in 2010-06-21 10:01:48.000000000 +0200
+@@ -83,6 +83,7 @@
+ source "package/games/quake-pak/Config.in"
+ source "package/games/rubix/Config.in"
+ source "package/games/sdlquake/Config.in"
++source "package/games/wolf4sdl/Config.in"
+ endmenu
+
+ menu "Graphic libraries and applications (graphic/text)"
diff --git a/patches/buildroot/2010.05/116-openobex-add_package.patch b/patches/buildroot/2010.05/116-openobex-add_package.patch
index f5d96df..d135d45 100644
--- a/patches/buildroot/2010.05/116-openobex-add_package.patch
+++ b/patches/buildroot/2010.05/116-openobex-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-17 16:51:05.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-17 16:51:08.000000000 +0200
-@@ -402,6 +402,7 @@
+--- buildroot.orig/package/Config.in 2010-06-21 10:02:10.000000000 +0200
++++ buildroot/package/Config.in 2010-06-21 10:02:10.000000000 +0200
+@@ -406,6 +406,7 @@
source "package/ntp/Config.in"
source "package/olsr/Config.in"
source "package/openntpd/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/openobex/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/Config.in 2010-06-17 16:51:08.000000000 +0200
++++ buildroot/package/openobex/Config.in 2010-06-21 10:02:10.000000000 +0200
@@ -0,0 +1,25 @@
+config BR2_PACKAGE_OPENOBEX
+ bool "openobex"
@@ -47,7 +47,7 @@ Index: buildroot/package/openobex/Config.in
Index: buildroot/package/openobex/openobex.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex.mk 2010-06-17 16:51:08.000000000 +0200
++++ buildroot/package/openobex/openobex.mk 2010-06-21 10:02:10.000000000 +0200
@@ -0,0 +1,47 @@
+#############################################################
+#
@@ -99,7 +99,7 @@ Index: buildroot/package/openobex/openobex.mk
Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch 2010-06-17 16:51:08.000000000 +0200
++++ buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch 2010-06-21 10:02:10.000000000 +0200
@@ -0,0 +1,13 @@
+Index: openobex-1.5/acinclude.m4
+===================================================================
@@ -117,7 +117,7 @@ Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.pat
Index: buildroot/package/openobex/openobex-replace_deprecated_functions.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex-replace_deprecated_functions.patch 2010-06-17 16:51:08.000000000 +0200
++++ buildroot/package/openobex/openobex-replace_deprecated_functions.patch 2010-06-21 10:02:10.000000000 +0200
@@ -0,0 +1,25 @@
+Index: openobex-1.5/apps/obex_test_cable.c
+===================================================================
diff --git a/patches/buildroot/2010.05/117-ussp-push-add_package.patch b/patches/buildroot/2010.05/117-ussp-push-add_package.patch
index e99103d..d51bee7 100644
--- a/patches/buildroot/2010.05/117-ussp-push-add_package.patch
+++ b/patches/buildroot/2010.05/117-ussp-push-add_package.patch
@@ -6,14 +6,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2010-06-17 16:51:08.000000000 +0200
+++ buildroot/package/Config.in 2010-06-17 16:51:13.000000000 +0200
-@@ -430,6 +430,7 @@
+@@ -431,6 +431,7 @@
source "package/tn5250/Config.in"
source "package/ttcp/Config.in"
source "package/udpcast/Config.in"
+source "package/ussp-push/Config.in"
+ source "package/uucp/Config.in"
source "package/vpnc/Config.in"
source "package/vsftpd/Config.in"
- source "package/vtun/Config.in"
Index: buildroot/package/ussp-push/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2010.05/118-snes9x-add_package.patch b/patches/buildroot/2010.05/118-snes9x-add_package.patch
index 8c98d33..133a72a 100644
--- a/patches/buildroot/2010.05/118-snes9x-add_package.patch
+++ b/patches/buildroot/2010.05/118-snes9x-add_package.patch
@@ -1,19 +1,22 @@
+Add snes9x package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: buildroot/package/games/Config.in
===================================================================
---- buildroot.orig/package/games/Config.in 2010-06-18 18:41:36.000000000 +0200
-+++ buildroot/package/games/Config.in 2010-06-18 18:42:27.000000000 +0200
-@@ -14,6 +14,7 @@
+--- buildroot.orig/package/games/Config.in 2010-06-21 10:00:59.000000000 +0200
++++ buildroot/package/games/Config.in 2010-06-21 10:02:24.000000000 +0200
+@@ -8,5 +8,6 @@
source "package/games/quake-pak/Config.in"
source "package/games/rubix/Config.in"
source "package/games/sdlquake/Config.in"
+source "package/games/snes9x/Config.in"
- source "package/games/vice/Config.in"
source "package/games/wolf4sdl/Config.in"
- source "package/games/xboard/Config.in"
+ endmenu
Index: buildroot/package/games/snes9x/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/snes9x/Config.in 2010-06-18 18:43:27.000000000 +0200
++++ buildroot/package/games/snes9x/Config.in 2010-06-21 10:02:24.000000000 +0200
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_SNES9X
+ bool "Snes9X"
@@ -29,7 +32,7 @@ Index: buildroot/package/games/snes9x/Config.in
Index: buildroot/package/games/snes9x/snes9x.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/snes9x/snes9x.mk 2010-06-18 18:46:07.000000000 +0200
++++ buildroot/package/games/snes9x/snes9x.mk 2010-06-21 10:02:24.000000000 +0200
@@ -0,0 +1,80 @@
+#############################################################
+#
@@ -114,7 +117,7 @@ Index: buildroot/package/games/snes9x/snes9x.mk
Index: buildroot/package/games/snes9x/snes9x-1.39-compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/snes9x/snes9x-1.39-compile.patch 2010-06-18 18:44:21.000000000 +0200
++++ buildroot/package/games/snes9x/snes9x-1.39-compile.patch 2010-06-21 10:02:24.000000000 +0200
@@ -0,0 +1,295 @@
+
+#
@@ -411,3 +414,15 @@ Index: buildroot/package/games/snes9x/snes9x-1.39-compile.patch
+ struct SRegisters SA1Registers;
+ //struct SSA1Registers SA1Registers;
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-21 10:02:49.000000000 +0200
++++ buildroot/package/Config.in 2010-06-21 10:03:19.000000000 +0200
+@@ -83,6 +83,7 @@
+ source "package/games/quake-pak/Config.in"
+ source "package/games/rubix/Config.in"
+ source "package/games/sdlquake/Config.in"
++source "package/games/snes9x/Config.in"
+ source "package/games/wolf4sdl/Config.in"
+ endmenu
+
diff --git a/patches/buildroot/2010.05/119-fbtest-add_package.patch b/patches/buildroot/2010.05/119-fbtest-add_package.patch
index 5ddfb1e..33b4125 100644
--- a/patches/buildroot/2010.05/119-fbtest-add_package.patch
+++ b/patches/buildroot/2010.05/119-fbtest-add_package.patch
@@ -6,14 +6,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2010-06-18 23:44:05.000000000 +0200
+++ buildroot/package/Config.in 2010-06-18 23:49:19.000000000 +0200
-@@ -344,6 +344,7 @@
- comment "--> May be broken in busybox"
- source "package/fbv/Config.in"
+@@ -95,6 +95,7 @@
+ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/fbset/Config.in"
+ endif
+source "package/fbtest/Config.in"
- source "package/fbgrab/Config.in"
-
- comment "other GUIs"
+ source "package/fbv/Config.in"
+ source "package/imagemagick/Config.in"
+ source "package/linux-fusion/Config.in"
Index: buildroot/package/fbtest/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/120-cwiid-add_package.patch b/patches/buildroot/2010.05/120-cwiid-add_package.patch
similarity index 96%
copy from patches/buildroot/120-cwiid-add_package.patch
copy to patches/buildroot/2010.05/120-cwiid-add_package.patch
index 087795a..4e2f15e 100644
--- a/patches/buildroot/120-cwiid-add_package.patch
+++ b/patches/buildroot/2010.05/120-cwiid-add_package.patch
@@ -7,14 +7,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2010-06-20 19:58:08.000000000 +0200
+++ buildroot/package/Config.in 2010-06-20 20:45:06.000000000 +0200
-@@ -241,6 +241,7 @@
-
- if BR2_BLOCKDEV_SUPPORT
+@@ -158,6 +158,7 @@
source "package/acpid/Config.in"
+ source "package/cdrkit/Config.in"
+ source "package/cramfs/Config.in"
+source "package/cwiid/Config.in"
source "package/dbus/Config.in"
source "package/dbus-glib/Config.in"
- source "package/devmem2/Config.in"
+ source "package/dbus-python/Config.in"
Index: buildroot/package/cwiid/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2010.05/121-set_correct_gcc_tune_option_for_arm926t_core.patch b/patches/buildroot/2010.05/121-set_correct_gcc_tune_option_for_arm926t_core.patch
new file mode 100644
index 0000000..4f2ca84
--- /dev/null
+++ b/patches/buildroot/2010.05/121-set_correct_gcc_tune_option_for_arm926t_core.patch
@@ -0,0 +1,23 @@
+From 133a3f90ba01f76568a8b8dec39fd5cf158dd494 Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Fri, 04 Jun 2010 15:21:04 +0000
+Subject: Set correct GCC tune option for ARM926T(==ARM926EJ-S) core
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+diff --git a/target/Config.in.arch b/target/Config.in.arch
+index 1de679f..62721c9 100644
+--- a/t...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2010-06-21 12:04:06
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4e8e8c4d495e63007da1015b6823f3a937770515 (commit)
via 30d1b6a9dc6c84358e3ec81e9868e9d39a4b09ee (commit)
via 57e1450bf00b446a7828bbb831718c9c1ddc595c (commit)
from b1acd8e54a8506812bdb507c64d4c4ed27416b25 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 4e8e8c4d495e63007da1015b6823f3a937770515
Merge: 30d1b6a9dc6c84358e3ec81e9868e9d39a4b09ee b1acd8e54a8506812bdb507c64d4c4ed27416b25
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 21 14:03:33 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 30d1b6a9dc6c84358e3ec81e9868e9d39a4b09ee
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 21 13:59:25 2010 +0200
Updates cleanup_buildroot.sh
commit 57e1450bf00b446a7828bbb831718c9c1ddc595c
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 21 13:57:01 2010 +0200
[UCLIBC] Add patch for ftruncate64() pb on ARM EABI (uClibc 0.9.29)
-----------------------------------------------------------------------
Summary of changes:
...m_eabi_needs_uclibc_truncate64_has_4_args.patch | 25 ++++++++++++++++++++
patches/buildroot/cleanup_buildroot.sh | 1 +
2 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 buildroot/toolchain/uClibc/uClibc-0.9.29-z-004-arm_eabi_needs_uclibc_truncate64_has_4_args.patch
diff --git a/buildroot/toolchain/uClibc/uClibc-0.9.29-z-004-arm_eabi_needs_uclibc_truncate64_has_4_args.patch b/buildroot/toolchain/uClibc/uClibc-0.9.29-z-004-arm_eabi_needs_uclibc_truncate64_has_4_args.patch
new file mode 100644
index 0000000..4b919f9
--- /dev/null
+++ b/buildroot/toolchain/uClibc/uClibc-0.9.29-z-004-arm_eabi_needs_uclibc_truncate64_has_4_args.patch
@@ -0,0 +1,25 @@
+From 093b396bc55a3ca43a93973e79cdaccb43d9f8d6 Mon Sep 17 00:00:00 2001
+From: Bernhard Reutner-Fischer <rep...@gm...>
+Date: Thu, 25 Sep 2008 08:50:56 +0000
+Subject: - arm eabi needs __UCLIBC_TRUNCATE64_HAS_4_ARGS__
+
+ (75_all_uClibc-arm-ftruncate64.patch from gentoo)
+---
+diff --git a/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h b/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
+index 85c9adb..0e33f9c 100644
+--- a/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
++++ b/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
+@@ -12,7 +12,11 @@
+ #undef __UCLIBC_MMAP_HAS_6_ARGS__
+
+ /* does your target use syscall4() for truncate64 ? (32bit arches only) */
++#ifdef __ARM_EABI__
++#define __UCLIBC_TRUNCATE64_HAS_4_ARGS__
++#else
+ #undef __UCLIBC_TRUNCATE64_HAS_4_ARGS__
++#endif
+
+ /* does your target have a broken create_module() ? */
+ #define __UCLIBC_BROKEN_CREATE_MODULE__
+--
+cgit v0.8.2.1
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 4a1a1ef..3883cf5 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -43,3 +43,4 @@ rm -rf buildroot/package/allegro/
rm -rf buildroot/package/fbgrab/
rm -rf buildroot/package/fbtest/
rm -rf buildroot/package/xenomai/
+rm -rf buildroot/package/cwiid/
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-21 09:21:27
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b1acd8e54a8506812bdb507c64d4c4ed27416b25 (commit)
via 127aee0847c7d1ee6895f3cbf121948b14705d9e (commit)
from 4f6bf597243a73cb67a6df1108f626e8d5d10c1d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b1acd8e54a8506812bdb507c64d4c4ed27416b25
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jun 21 11:20:51 2010 +0200
[buildroot] update config file for package cwiid (apf9328)
commit 127aee0847c7d1ee6895f3cbf121948b14705d9e
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jun 21 11:17:13 2010 +0200
[buildroot] update config file for package cwiid
-----------------------------------------------------------------------
Summary of changes:
.../target/device/armadeus/apf27/apf27_defconfig | 16 ++++-----
.../device/armadeus/apf9328/apf9328_defconfig | 34 ++++++-------------
2 files changed, 18 insertions(+), 32 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index 849b58e..fd2c916 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Jun 17 18:25:20 2010
+# Mon Jun 21 10:10:19 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -330,14 +330,12 @@ BR2_PACKAGE_PKGCONFIG=y
#
# Armadeus specific packages
#
-# BR2_PACKAGE_UUCP is not set
# BR2_PACKAGE_LIBDNET is not set
# BR2_PACKAGE_BLUEZ_LIBS is not set
#
# bluez-utils not available (need dbus)
#
-# BR2_PACKAGE_MESALIB is not set
#
# Armadeus specific tools/utilities
@@ -351,12 +349,7 @@ BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
-# BR2_PACKAGE_FIRMWARE is not set
-# BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8 is not set
-# BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9 is not set
# BR2_PACKAGE_DUMMY is not set
-# BR2_PACKAGE_FBTEST is not set
-# BR2_PACKAGE_SNES9X is not set
#
# Other stuff
@@ -396,7 +389,6 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_STARTUP_NOTIFICATION is not set
BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_SUDO is not set
-# BR2_PACKAGE_XENOMAI is not set
# BR2_DATABASE_SUPPORT is not set
BR2_TEXTEDIT_SUPPORT=y
# BR2_PACKAGE_ED is not set
@@ -489,6 +481,7 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
# BR2_PACKAGE_USSP_PUSH is not set
+# BR2_PACKAGE_UUCP is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
@@ -496,6 +489,7 @@ BR2_PACKAGE_PORTMAP=y
BR2_PACKAGE_WIRELESS_TOOLS=y
# BR2_PACKAGE_WPA_SUPPLICANT is not set
BR2_BLOCKDEV_SUPPORT=y
+# BR2_PACKAGE_CWIID is not set
#
# dbus not available (need expat or libxml2)
@@ -506,6 +500,7 @@ BR2_BLOCKDEV_SUPPORT=y
# BR2_PACKAGE_E2FSPROGS is not set
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
+# BR2_PACKAGE_FIRMWARE is not set
# BR2_PACKAGE_FIS is not set
# BR2_PACKAGE_LIBFUSE is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
@@ -570,6 +565,7 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_USBMOUNT is not set
# BR2_PACKAGE_USBUTILS is not set
# BR2_PACKAGE_WIPE is not set
+# BR2_PACKAGE_XENOMAI is not set
# BR2_PACKAGE_XFSPROGS is not set
BR2_AUDIO_SUPPORT=y
BR2_PACKAGE_ALSA_LIB=y
@@ -640,6 +636,7 @@ BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_LIBART is not set
# BR2_PACKAGE_LIBPNG is not set
# BR2_PACKAGE_LIBUNGIF is not set
+# BR2_PACKAGE_MESALIB is not set
# BR2_PACKAGE_PIXMAN is not set
# BR2_PACKAGE_SDL is not set
# BR2_PACKAGE_TIFF is not set
@@ -658,6 +655,7 @@ BR2_PACKAGE_NCURSES=y
#
# BR2_PACKAGE_FBV is not set
# BR2_PACKAGE_FBSET is not set
+# BR2_PACKAGE_FBTEST is not set
# BR2_PACKAGE_FBGRAB is not set
#
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index abb21e6..081d322 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
+++ b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Jun 17 18:25:20 2010
+# Mon Jun 21 10:30:46 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -326,9 +326,12 @@ BR2_PACKAGE_PKGCONFIG=y
#
# Armadeus specific packages
#
-# BR2_PACKAGE_UUCP is not set
# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_MESALIB is not set
+# BR2_PACKAGE_BLUEZ_LIBS is not set
+
+#
+# bluez-utils not available (need dbus)
+#
#
# Armadeus specific tools/utilities
@@ -343,13 +346,6 @@ BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
# BR2_PACKAGE_DUMMY is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
-
-#
-# bluez-utils not available (need dbus)
-#
-# BR2_PACKAGE_FBTEST is not set
-# BR2_PACKAGE_SNES9X is not set
#
# Other stuff
@@ -389,7 +385,6 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_STARTUP_NOTIFICATION is not set
# BR2_PACKAGE_STRACE is not set
# BR2_PACKAGE_SUDO is not set
-# BR2_PACKAGE_XENOMAI is not set
# BR2_DATABASE_SUPPORT is not set
BR2_TEXTEDIT_SUPPORT=y
# BR2_PACKAGE_ED is not set
@@ -482,6 +477,7 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
# BR2_PACKAGE_USSP_PUSH is not set
+# BR2_PACKAGE_UUCP is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
@@ -489,6 +485,7 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
BR2_BLOCKDEV_SUPPORT=y
+# BR2_PACKAGE_CWIID is not set
#
# dbus not available (need expat or libxml2)
@@ -564,6 +561,7 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_USBMOUNT is not set
# BR2_PACKAGE_USBUTILS is not set
# BR2_PACKAGE_WIPE is not set
+# BR2_PACKAGE_XENOMAI is not set
# BR2_PACKAGE_XFSPROGS is not set
BR2_AUDIO_SUPPORT=y
BR2_PACKAGE_ALSA_LIB=y
@@ -634,6 +632,7 @@ BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_LIBART is not set
# BR2_PACKAGE_LIBPNG is not set
# BR2_PACKAGE_LIBUNGIF is not set
+# BR2_PACKAGE_MESALIB is not set
# BR2_PACKAGE_PIXMAN is not set
# BR2_PACKAGE_SDL is not set
# BR2_PACKAGE_TIFF is not set
@@ -652,6 +651,7 @@ BR2_PACKAGE_NCURSES=y
#
# BR2_PACKAGE_FBV is not set
# BR2_PACKAGE_FBSET is not set
+# BR2_PACKAGE_FBTEST is not set
# BR2_PACKAGE_FBGRAB is not set
#
@@ -777,18 +777,6 @@ BR2_TARGET_ROOTFS_TAR_COPYTO=""
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
-BR2_TARGET_UBOOT_1_3_4=y
-# BR2_TARGET_UBOOT_2010_03 is not set
-# BR2_TARGET_UBOOT_2009_11 is not set
-# BR2_TARGET_UBOOT_2009_08 is not set
-# BR2_TARGET_UBOOT_2009_06 is not set
-# BR2_TARGET_UBOOT_2009_03 is not set
-# BR2_TARGET_UBOOT_2009_01 is not set
-# BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
-BR2_UBOOT_VERSION="1.3.4"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
BR2_TARGET_UBOOT_CUSTOM_PATCH=""
BR2_TARGET_UBOOT_SERVERIP=""
BR2_TARGET_UBOOT_IPADDR=""
hooks/post-receive
--
armadeus
|
