armadeus-commitlog Mailing List for armadeus (Page 103)

Brought to you by: sszy

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

Flat | Threaded

<< < 1 .. 101 102 103 104 105 .. 153 > >> (Page 103 of 153)

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-68-g0032876

From: Julien B a. A. <ar...@us...> - 2010-10-20 19:33:45

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  00328763da10300a4e771ae3355ad79e1396fae0 (commit)
      from  9f7983c8618e9e0219ecdf6514dac895bae8dfd3 (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 00328763da10300a4e771ae3355ad79e1396fae0
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 21:33:11 2010 +0200

    [BUILDROOT] [2010.11] Makes Linux image get the correct name when copied to ouput/images/

-----------------------------------------------------------------------

Summary of changes:
 patches/buildroot/2010.11/040-linux-makefile.patch |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/patches/buildroot/2010.11/040-linux-makefile.patch b/patches/buildroot/2010.11/040-linux-makefile.patch
index cf878e2..7feaa1d 100644
--- a/patches/buildroot/2010.11/040-linux-makefile.patch
+++ b/patches/buildroot/2010.11/040-linux-makefile.patch
@@ -1,7 +1,7 @@
 Index: buildroot/linux/linux.mk
 ===================================================================
---- buildroot.orig/linux/linux.mk	2010-10-17 22:17:19.000000000 +0200
-+++ buildroot/linux/linux.mk	2010-10-19 09:43:24.000000000 +0200
+--- buildroot.orig/linux/linux.mk	2010-10-14 21:40:47.000000000 +0200
++++ buildroot/linux/linux.mk	2010-10-20 21:26:50.000000000 +0200
 @@ -29,7 +29,8 @@
  
  # Get the real Linux version, which tells us where kernel modules are
@@ -22,6 +22,15 @@ Index: buildroot/linux/linux.mk
  	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig
  	$(Q)touch $@
  
+@@ -125,7 +129,7 @@
+ # Installation
+ $(LINUX26_DIR)/.stamp_installed: $(LINUX26_DIR)/.stamp_compiled
+ 	@$(call MESSAGE,"Installing kernel")
+-	cp $(LINUX26_IMAGE_PATH) $(BINARIES_DIR)
++	cp $(LINUX26_IMAGE_PATH) $(BINARIES_DIR)/$(LINUX26_KERNEL_NAME)
+ 	# Install modules and remove symbolic links pointing to build
+ 	# directories, not relevant on the target
+ 	@if [ $(shell grep -c "CONFIG_MODULES=y" $(LINUX26_DIR)/.config) != 0 ] ; then 	\
 @@ -151,7 +155,7 @@
  	# Build the kernel.
  	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) $(LINUX26_IMAGE_NAME)


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-67-g9f7983c

From: Julien B a. A. <ar...@us...> - 2010-10-20 19:17:04

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  9f7983c8618e9e0219ecdf6514dac895bae8dfd3 (commit)
       via  a9a80e5226faa17cbe296dce4091d29e3140b0c6 (commit)
      from  1a6eb085183ea4cf25806c34fdde0be34cd55b3e (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 9f7983c8618e9e0219ecdf6514dac895bae8dfd3
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 21:16:34 2010 +0200

    [BUILDROOT] [2010.11] Patch 052 wasn't right

commit a9a80e5226faa17cbe296dce4091d29e3140b0c6
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 21:08:34 2010 +0200

    [BUILDROOT] [2010.11] Add link for apf9328 Linux 2.6.29.6 config

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/apf9328/apf9328-linux-2.6.29.6.config |    1 +
 ...x-adds_linux26-patched_target_to_Makefile.patch |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 120000 buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.6.config

diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.6.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.6.config
new file mode 120000
index 0000000..bee37d7
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.6.config
@@ -0,0 +1 @@
+apf9328-linux-2.6.29.config
\ No newline at end of file
diff --git a/patches/buildroot/2010.11/052-linux-adds_linux26-patched_target_to_Makefile.patch b/patches/buildroot/2010.11/052-linux-adds_linux26-patched_target_to_Makefile.patch
index 3da0a8a..303a947 100644
--- a/patches/buildroot/2010.11/052-linux-adds_linux26-patched_target_to_Makefile.patch
+++ b/patches/buildroot/2010.11/052-linux-adds_linux26-patched_target_to_Makefile.patch
@@ -4,11 +4,12 @@ Index: buildroot/linux/linux.mk
 ===================================================================
 --- buildroot.orig/linux/linux.mk	2010-10-19 15:51:03.000000000 +0200
 +++ buildroot/linux/linux.mk	2010-10-19 15:55:06.000000000 +0200
-@@ -81,6 +81,7 @@
+@@ -81,6 +81,8 @@
  endif
  	$(Q)touch $@
  
-+linux26-patched: $(LINUX26_DIR)/.stamp_patched
++linux26-patched: $(LINUX26_DIR)/.stamp_extracted
++	touch $(LINUX26_DIR)/.stamp_patched
  
  # Configuration
  $(LINUX26_DIR)/.stamp_configured: $(LINUX26_DIR)/.stamp_patched


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-65-g1a6eb08

From: Julien B a. A. <ar...@us...> - 2010-10-20 16:32: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  1a6eb085183ea4cf25806c34fdde0be34cd55b3e (commit)
       via  f9b1f2719d2ca47d6be58f157778052c6eb11e84 (commit)
       via  54873480b5fcbdba775cd4adec4b89da39295aff (commit)
      from  bab28cfc6cb5a3bec027525590a39abe1d88fcfa (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 1a6eb085183ea4cf25806c34fdde0be34cd55b3e
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 18:31:34 2010 +0200

    [BUILDROOT] [2010.11] Makes ch70241ctrl compile OK

commit f9b1f2719d2ca47d6be58f157778052c6eb11e84
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 18:30:57 2010 +0200

    [BUILDROOT] [2010.11] Makes U-Boot & Linux version detected correctly in ARMADEUS_xx envt variables

commit 54873480b5fcbdba775cd4adec4b89da39295aff
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 18:29:57 2010 +0200

    [BUILDROOT] [2010.11] Removes unneeded patches 049 & 050

-----------------------------------------------------------------------

Summary of changes:
 Makefile.in                                        |    4 +-
 .../package/armadeus/ch7024ctrl/ch70241ctrl.mk     |    2 +-
 ...nor_patches_from_kernel_org_too.tofix_or_remove |   34 ----------------
 ...0-linux-remove_unsupported_kernel_version.tofix |   41 --------------------
 4 files changed, 3 insertions(+), 78 deletions(-)
 delete mode 100644 patches/buildroot/2010.11/049-linux-download_minor_patches_from_kernel_org_too.tofix_or_remove
 delete mode 100644 patches/buildroot/2010.11/050-linux-remove_unsupported_kernel_version.tofix

diff --git a/Makefile.in b/Makefile.in
index f674b4b..db0d67c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,8 +20,8 @@ ARMADEUS_UCLIBC_VERSION:=0.9.29
 ARMADEUS_QT_MAKEFILE:=package/qtopia4/qtopia4.mk
 else
 # New buildroot:
-ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_DEFAULT_KERNEL_VERSION))
-ARMADEUS_U_BOOT_VERSION:=$(shell echo $(BR2_UBOOT_VERSION))
+ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_LINUX_KERNEL_VERSION))
+ARMADEUS_U_BOOT_VERSION:=$(shell echo $(BR2_TARGET_UBOOT_VERSION))
 ARMADEUS_UCLIBC_VERSION:=$(shell echo $(BR2_UCLIBC_VERSION_STRING))
 ARMADEUS_QT_MAKEFILE:=package/qt/qt.mk
 endif
diff --git a/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk b/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk
index ccd7376..b102663 100644
--- a/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk
+++ b/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk
@@ -19,7 +19,7 @@ $(CH7024CTRL_DIR)/ch7024.c:
 	cp $(CH7024CTRL_SOURCE)/* $(CH7024CTRL_DIR)/
 
 $(CH7024CTRL_DIR)/$(CH7024CTRL_BINARY): $(CH7024CTRL_DIR)/ch7024.c $(CH7024CTRL_DIR)/ch7024.h
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(CH7024CTRL_DIR)
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" -C $(CH7024CTRL_DIR)
 
 $(TARGET_DIR)/$(CH7024CTRL_TARGET_BINARY): $(CH7024CTRL_DIR)/$(CH7024CTRL_BINARY)
 	install -D $< $@
diff --git a/patches/buildroot/2010.11/049-linux-download_minor_patches_from_kernel_org_too.tofix_or_remove b/patches/buildroot/2010.11/049-linux-download_minor_patches_from_kernel_org_too.tofix_or_remove
deleted file mode 100644
index 71aad5d..0000000
--- a/patches/buildroot/2010.11/049-linux-download_minor_patches_from_kernel_org_too.tofix_or_remove
+++ /dev/null
@@ -1,34 +0,0 @@
-"linux26-source" target only downloads bare kernel sources.
-This patch makes the (eventually needed) kernel.org minor patches are
-also downloaded.
-
-Sent to Buildroot guys. Integrated, then removed. Not clean ?
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/target/linux/Makefile.in.advanced
-===================================================================
---- buildroot.orig/target/linux/Makefile.in.advanced	2010-06-17 16:46:27.000000000 +0200
-+++ buildroot/target/linux/Makefile.in.advanced	2010-06-17 16:46:34.000000000 +0200
-@@ -201,9 +201,11 @@
- ifneq ($(strip $(LINUX26_PATCH_SOURCE)),)
- $(DL_DIR)/$(LINUX26_PATCH_SOURCE):
- 	 $(call DOWNLOAD,$(LINUX26_PATCH_SITE),$(LINUX26_PATCH_SOURCE))
-+
-+LINUX26_PATCH_SOURCE_FILE:=$(DL_DIR)/$(LINUX26_PATCH_SOURCE)
- endif
- 
--$(LINUX26_DIR)/.unpacked: $(DL_DIR)/$(LINUX26_SOURCE)
-+$(LINUX26_DIR)/.unpacked: $(DL_DIR)/$(LINUX26_SOURCE) $(LINUX26_PATCH_SOURCE_FILE)
- 	rm -rf $(LINUX26_DIR)
- 	@echo "*** Unpacking kernel source"
- 	$(LINUX26_BZCAT) $(DL_DIR)/$(LINUX26_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-@@ -464,7 +466,7 @@
- 
- linux26-modules: cross-depmod26 $(STAMP_DIR)/linux_modules_target_installed
- 
--linux26-source: $(DL_DIR)/$(LINUX26_SOURCE)
-+linux26-source: $(DL_DIR)/$(LINUX26_SOURCE) $(LINUX26_PATCH_SOURCE_FILE)
- 
- linux26-unpacked: $(LINUX26_DIR)/.patched
- 
diff --git a/patches/buildroot/2010.11/050-linux-remove_unsupported_kernel_version.tofix b/patches/buildroot/2010.11/050-linux-remove_unsupported_kernel_version.tofix
deleted file mode 100644
index 72211f0..0000000
--- a/patches/buildroot/2010.11/050-linux-remove_unsupported_kernel_version.tofix
+++ /dev/null
@@ -1,41 +0,0 @@
-Remove kernel versions not supported by Armadeus boards from user choice.
-
-Index: buildroot/target/linux/Config.in.advanced
-===================================================================
---- buildroot.orig/target/linux/Config.in.advanced	2010-06-17 16:45:13.000000000 +0200
-+++ buildroot/target/linux/Config.in.advanced	2010-06-17 16:46:36.000000000 +0200
-@@ -98,21 +98,26 @@
- 
- config BR2_LINUX_2_6_STABLE
- 	bool "The latest stable Linux kernel (2.6.33.4)"
-+	depends on !BR2_TARGET_ARMADEUS
- 
- config BR2_LINUX_2_6_33
- 	bool "Linux 2.6.33"
-+	depends on !BR2_TARGET_ARMADEUS
- 	select BR2_KERNEL_BASE
- 
- config BR2_LINUX_2_6_32
- 	bool "Linux 2.6.32"
-+	depends on !BR2_TARGET_ARMADEUS
- 	select BR2_KERNEL_BASE
- 
- config BR2_LINUX_2_6_31
- 	bool "Linux 2.6.31"
-+	depends on !BR2_TARGET_ARMADEUS
- 	select BR2_KERNEL_BASE
- 
- config BR2_LINUX_2_6_30
- 	bool "Linux 2.6.30"
-+	depends on !BR2_TARGET_ARMADEUS
- 	select BR2_KERNEL_BASE
- 
- config BR2_LINUX_2_6_29
-@@ -121,6 +126,7 @@
- 
- config BR2_LINUX_2_6_28
- 	bool "Linux 2.6.28"
-+	depends on !BR2_TARGET_ARMADEUS
- 	select BR2_KERNEL_BASE
- 
- config BR2_LINUX_2_6_27


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-62-gbab28cf

From: Julien B a. A. <ar...@us...> - 2010-10-20 13:03:36

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  bab28cfc6cb5a3bec027525590a39abe1d88fcfa (commit)
       via  087df1150a0f5e1d9f48df51ba77526fdd203755 (commit)
       via  a3129eff4e153ddb9a916b691a3341ee396785b3 (commit)
      from  ff3699d5222d0c1b62f0e75e1026e0805675ecf3 (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 bab28cfc6cb5a3bec027525590a39abe1d88fcfa
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 14:58:18 2010 +0200

    [BUILDROOT] [2010.11] u-boot: makes the resulting binary copied with the right name in output/images/

commit 087df1150a0f5e1d9f48df51ba77526fdd203755
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 13:53:56 2010 +0200

    [BUILDROOT] [2010.11] u-boot: makes u-boot.mk use the right config file for apf* (apf memory config wasn't taken into account before this change)

commit a3129eff4e153ddb9a916b691a3341ee396785b3
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 11:58:54 2010 +0200

    [BUILDROOT] [2010.11] Merge 051i U-Boot patch into 051d. Both patches apply on the same purpose

-----------------------------------------------------------------------

Summary of changes:
 buildroot/target/device/armadeus/u-boot/u-boot.mk  |    5 ++-
 .../2010.11/051-u-boot.a_refaire_entierement       |   46 --------------------
 ...d_possibility_to_choose_board_header_file.patch |   26 ++++++++---
 ...u-boot-add_1.3.4_version_specific_support.patch |   12 +++---
 ...madeus_specific_options_for_config_header.patch |    6 +-
 .../051g-u-boot-add_u-boot-unpacked_target.patch   |    6 +-
 ...ot-makes_binary_targets_name_overloadable.patch |   22 ++++++++-
 .../051i-u-boot-multi-version-support.patch        |   26 -----------
 8 files changed, 54 insertions(+), 95 deletions(-)
 delete mode 100644 patches/buildroot/2010.11/051i-u-boot-multi-version-support.patch

diff --git a/buildroot/target/device/armadeus/u-boot/u-boot.mk b/buildroot/target/device/armadeus/u-boot/u-boot.mk
index 9f9a84e..fe30fad 100644
--- a/buildroot/target/device/armadeus/u-boot/u-boot.mk
+++ b/buildroot/target/device/armadeus/u-boot/u-boot.mk
@@ -4,14 +4,17 @@
 #
 #############################################################
 
-U_BOOT_BIN=$(BOARD_NAME)-u-boot.bin
 BR2_TARGET_U_BOOT_CONFIG_BOARD=$(BR2_TARGET_UBOOT_BOARDNAME)_config
 ifndef BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE
 BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE=$(BOARD_PATH)/$(BOARD_NAME).h
 endif
 ifeq ($(BR2_VERSION),"0.10.0-svn")
+U_BOOT_BIN=$(BOARD_NAME)-u-boot.bin
 MKIMAGE_BINLOC:=$(STAGING_DIR)/usr/bin/mkimage
 MKIMAGE:=$(KERNEL_CROSS)mkimage
+else
+# New BR:
+U_BOOT_TARGET_BIN=$(BOARD_NAME)-u-boot.bin
 endif
 
 BR2_TARGET_UBOOT_ETH1ADDR=""
diff --git a/patches/buildroot/2010.11/051-u-boot.a_refaire_entierement b/patches/buildroot/2010.11/051-u-boot.a_refaire_entierement
index 908e27f..d95f0b1 100644
--- a/patches/buildroot/2010.11/051-u-boot.a_refaire_entierement
+++ b/patches/buildroot/2010.11/051-u-boot.a_refaire_entierement
@@ -1,43 +1,5 @@
 Never send to BR.
 
-Index: buildroot/target/u-boot/Config.in
-===================================================================
---- buildroot.orig/target/u-boot/Config.in	2008-11-03 09:15:09.000000000 +0100
-+++ buildroot/target/u-boot/Config.in	2010-01-06 22:23:02.000000000 +0100
-@@ -6,11 +6,18 @@
- if BR2_TARGET_UBOOT
- config BR2_TARGET_UBOOT_BOARDNAME
- 	string "board name"
--	default "$(BOARD_NAME)"
-+	default "$(BR2_BOARD_NAME)"
- 	help
- 	  One of U-Boot supported boards to be built.
- 	  This will be suffixed with _config to meet U-Boot standard naming.
- 
-+config BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE
-+	string "U-Boot header file"
-+	depends on BR2_TARGET_UBOOT
-+	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
-+	help
-+	  U-Boot config Header file to use to build U-Boot for your target.
-+
- choice
- 	prompt "U-Boot Version"
- 	default BR2_TARGET_UBOOT_2009_11
-@@ -132,6 +139,13 @@
- 	bool "fw_printenv tool in target"
- 	help
- 	  Install fw_printenv / fw_setenv tools in target.
-+
-+config BR2_TARGET_UBOOT_COPYTO
-+	string "also copy the image to..."
-+	depends on BR2_TARGET_UBOOT
-+	default ""
-+	help
-+	  Copies the resulting image to a secondary location.
- 
- menuconfig BR2_TARGET_UBOOT_DEFAULT_ENV
- 	bool "Generate a default environment"
 Index: buildroot/target/u-boot/Makefile.in
 ===================================================================
 --- buildroot.orig/target/u-boot/Makefile.in	2008-11-03 09:15:09.000000000 +0100
@@ -141,11 +103,3 @@ Index: buildroot/target/u-boot/Makefile.in
  
  u-boot-dirclean:
  	rm -rf $(U_BOOT_DIR)
-@@ -173,5 +204,7 @@
- 	@echo BR2_TARGET_UBOOT_BOOTARGS = $(BR2_TARGET_UBOOT_BOOTARGS)
- 	@echo BR2_TARGET_UBOOT_BOOTCMD = $(BR2_TARGET_UBOOT_BOOTCMD)
- 	@echo BR2_TARGET_UBOOT_SILENT = $(BR2_TARGET_UBOOT_SILENT)
-+	@echo BR2_TARGET_ARMADEUS_SDRAM_SIZE = $(BR2_TARGET_ARMADEUS_SDRAM_SIZE)
-+	@echo BR2_TARGET_ARMADEUS_NR_SDRAM = $(BR2_TARGET_ARMADEUS_NR_SDRAM)
- 	@echo
- 	@exit 0
diff --git a/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch b/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
index 44ba0fe..9a0e8a5 100644
--- a/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
+++ b/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
@@ -7,15 +7,15 @@ So this patch reverts the removing + refines it.
 
 Index: buildroot/boot/u-boot/Config.in
 ===================================================================
---- buildroot.orig/boot/u-boot/Config.in	2010-10-18 18:01:03.000000000 +0200
-+++ buildroot/boot/u-boot/Config.in	2010-10-18 18:01:07.000000000 +0200
+--- buildroot.orig/boot/u-boot/Config.in	2010-10-20 11:59:43.000000000 +0200
++++ buildroot/boot/u-boot/Config.in	2010-10-20 12:03:30.000000000 +0200
 @@ -11,6 +11,14 @@
  	  One of U-Boot supported boards to be built.
  	  This will be suffixed with _config to meet U-Boot standard naming.
  
 +config BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE
 +	string "U-Boot header file"
-+	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
++	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_UBOOT_VERSION).h"
 +	help
 +	  U-Boot config header file to use to build U-Boot for your target.
 +	  Mainly for people using boards not (yet) integrated in U-Boot's
@@ -26,16 +26,28 @@ Index: buildroot/boot/u-boot/Config.in
  	default BR2_TARGET_UBOOT_2010_06
 Index: buildroot/boot/u-boot/u-boot.mk
 ===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-18 18:01:06.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk	2010-10-18 18:01:07.000000000 +0200
-@@ -87,7 +87,13 @@
+--- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-20 11:59:43.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk	2010-10-20 12:09:50.000000000 +0200
+@@ -45,7 +45,11 @@
+ U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
+ endif
+ 
++ifneq ($(strip $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)),)
++U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/configs/$(BR2_TARGET_UBOOT_BOARDNAME).h
++else
+ U_BOOT_INC_CONF_FILE:=$(U_BOOT_DIR)/include/config.h
++endif
+ 
+ ifeq ($(BR2_TARGET_UBOOT_TOOL_MKIMAGE),y)
+ U_BOOT_TARGETS+=$(TARGET_DIR)/usr/bin/mkimage
+@@ -87,7 +91,13 @@
  endif
  	touch $@
  
 -$(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.patched
 +$(U_BOOT_DIR)/.config_header_copied: $(U_BOOT_DIR)/.patched
 +ifneq ($(strip $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)),)
-+	cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_DIR)/include/configs/
++	cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_INC_CONF_FILE)
 +endif
 +	touch $@
 +
diff --git a/patches/buildroot/2010.11/051e-u-boot-add_1.3.4_version_specific_support.patch b/patches/buildroot/2010.11/051e-u-boot-add_1.3.4_version_specific_support.patch
index ea8b76c..8b593ad 100644
--- a/patches/buildroot/2010.11/051e-u-boot-add_1.3.4_version_specific_support.patch
+++ b/patches/buildroot/2010.11/051e-u-boot-add_1.3.4_version_specific_support.patch
@@ -2,8 +2,8 @@ Specific for Armadeus boards.
 
 Index: buildroot/boot/u-boot/Config.in
 ===================================================================
---- buildroot.orig/boot/u-boot/Config.in	2010-10-18 18:01:07.000000000 +0200
-+++ buildroot/boot/u-boot/Config.in	2010-10-18 18:01:16.000000000 +0200
+--- buildroot.orig/boot/u-boot/Config.in	2010-10-20 12:03:30.000000000 +0200
++++ buildroot/boot/u-boot/Config.in	2010-10-20 13:42:06.000000000 +0200
 @@ -25,6 +25,9 @@
  	help
  	  Select the specific U-Boot version you want to use
@@ -24,9 +24,9 @@ Index: buildroot/boot/u-boot/Config.in
  	default "2009.11"	if BR2_TARGET_UBOOT_2009_11
 Index: buildroot/boot/u-boot/u-boot.mk
 ===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-18 18:01:07.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk	2010-10-18 18:01:16.000000000 +0200
-@@ -167,6 +167,11 @@
+--- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-20 12:09:50.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk	2010-10-20 13:42:06.000000000 +0200
+@@ -171,6 +171,11 @@
  # Build manually mkimage for the target
  $(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/.configured
  	mkdir -p $(@D)
@@ -38,7 +38,7 @@ Index: buildroot/boot/u-boot/u-boot.mk
  	$(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(U_BOOT_DIR)/tools \
  		-DUSE_HOSTCC -o $@ \
  		$(U_BOOT_DIR)/common/image.c \
-@@ -175,7 +180,7 @@
+@@ -179,7 +184,7 @@
  		$(addprefix $(U_BOOT_DIR)/lib*/,crc32.c md5.c sha1.c) \
  		$(U_BOOT_DIR)/tools/os_support.c \
  		$(wildcard $(U_BOOT_DIR)/libfdt/fdt*.c $(U_BOOT_DIR)/lib/libfdt/fdt*.c)
diff --git a/patches/buildroot/2010.11/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch b/patches/buildroot/2010.11/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
index ada50c9..3556a8c 100644
--- a/patches/buildroot/2010.11/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
+++ b/patches/buildroot/2010.11/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
@@ -2,9 +2,9 @@ Armadeus APF modules require some special U-Boot config variables to be set.
 
 Index: buildroot/boot/u-boot/u-boot.mk
 ===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-18 18:01:16.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk	2010-10-18 18:01:30.000000000 +0200
-@@ -133,6 +133,17 @@
+--- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-20 13:42:06.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk	2010-10-20 13:42:14.000000000 +0200
+@@ -137,6 +137,17 @@
  endif
  	@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE)
  endif # BR2_TARGET_UBOOT_NETWORK
diff --git a/patches/buildroot/2010.11/051g-u-boot-add_u-boot-unpacked_target.patch b/patches/buildroot/2010.11/051g-u-boot-add_u-boot-unpacked_target.patch
index 175e80b..d075b7f 100644
--- a/patches/buildroot/2010.11/051g-u-boot-add_u-boot-unpacked_target.patch
+++ b/patches/buildroot/2010.11/051g-u-boot-add_u-boot-unpacked_target.patch
@@ -2,9 +2,9 @@ Specific for Armadeus (needed by quiltify.sh script).
 
 Index: buildroot/boot/u-boot/u-boot.mk
 ===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-18 18:01:30.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk	2010-10-18 18:29:27.000000000 +0200
-@@ -78,6 +78,8 @@
+--- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-20 13:42:14.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk	2010-10-20 13:42:17.000000000 +0200
+@@ -82,6 +82,8 @@
  		| tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
  	touch $@
  
diff --git a/patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch b/patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch
index 4a95e54..a13444a 100644
--- a/patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch
+++ b/patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch
@@ -1,14 +1,16 @@
 Allow board custom Makefiles to choose the name of the U-Boot's resulting binary
 and the name it should take when copied to $(BINARIES_DIR).
 
+target/* Makefiles need to be sources before boot/* ones.
+
 Specific for Armadeus.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
 Index: buildroot/boot/u-boot/u-boot.mk
 ===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-18 18:30:21.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk	2010-10-18 18:43:14.000000000 +0200
+--- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-20 13:42:17.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk	2010-10-20 14:01:39.000000000 +0200
 @@ -34,10 +34,13 @@
  else
  U_BOOT_BIN:=u-boot.bin
@@ -24,7 +26,7 @@ Index: buildroot/boot/u-boot/u-boot.mk
  U_BOOT_ARCH=$(KERNEL_ARCH)
  
  # u-boot in the past used arch=ppc for powerpc
-@@ -158,9 +161,9 @@
+@@ -162,9 +165,9 @@
  		$(U_BOOT_MAKE_OPT) -C $(U_BOOT_DIR)
  
  # Copy the result to the images/ directory
@@ -36,3 +38,17 @@ Index: buildroot/boot/u-boot/u-boot.mk
  
  ifneq ($(U_BOOT_COPYTO),)
  $(U_BOOT_COPYTO)/$(U_BOOT_TARGET_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
+Index: buildroot/Makefile
+===================================================================
+--- buildroot.orig/Makefile	2010-10-20 14:49:41.000000000 +0200
++++ buildroot/Makefile	2010-10-20 14:49:52.000000000 +0200
+@@ -304,8 +304,8 @@
+ TARGETS+=target-purgelocales
+ endif
+ 
+-include boot/common.mk
+ include target/Makefile.in
++include boot/common.mk
+ include linux/linux.mk
+ include fs/common.mk
+ 
diff --git a/patches/buildroot/2010.11/051i-u-boot-multi-version-support.patch b/patches/buildroot/2010.11/051i-u-boot-multi-version-support.patch
deleted file mode 100644
index f7d7cde..0000000
--- a/patches/buildroot/2010.11/051i-u-boot-multi-version-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: buildroot/boot/u-boot/Config.in
-===================================================================
---- buildroot.orig/boot/u-boot/Config.in	2010-10-18 18:46:55.000000000 +0200
-+++ buildroot/boot/u-boot/Config.in	2010-10-18 18:47:42.000000000 +0200
-@@ -13,7 +13,7 @@
- 
- config BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE
- 	string "U-Boot header file"
--	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
-+	default "$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_UBOOT_VERSION).h"
- 	help
- 	  U-Boot config header file to use to build U-Boot for your target.
- 	  Mainly for people using boards not (yet) integrated in U-Boot's
-Index: buildroot/boot/u-boot/u-boot.mk
-===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk	2010-10-18 18:46:34.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk	2010-10-18 18:48:23.000000000 +0200
-@@ -94,7 +94,7 @@
- 
- $(U_BOOT_DIR)/.config_header_copied: $(U_BOOT_DIR)/.patched
- ifneq ($(strip $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)),)
--	cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_DIR)/include/configs/
-+	cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_DIR)/include/configs/$(BR2_TARGET_UBOOT_BOARDNAME).h
- endif
- 	touch $@
- 


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-59-gff3699d

From: Julien B a. A. <ar...@us...> - 2010-10-20 08:07:09

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  ff3699d5222d0c1b62f0e75e1026e0805675ecf3 (commit)
       via  2ab0d5c851002c1ccebd4c11d05cf5cc6885c004 (commit)
       via  8c09c1861dad03884d3082c50723ddd07163ca2c (commit)
       via  977f93cba68b03f50ad271c4b6579ad9ddf4c4cb (commit)
      from  2408af11ecb290b1f66a17ab1c6a18346c9a7f51 (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 ff3699d5222d0c1b62f0e75e1026e0805675ecf3
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 10:06:19 2010 +0200

    [BUILDROOT] [2010.05] Upgrade to soon coming 2010.11 (part 4: update Armadeus main Makefile

commit 2ab0d5c851002c1ccebd4c11d05cf5cc6885c004
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 09:42:20 2010 +0200

    [BUILDROOT] [2010.05] Upgrade to soon coming 2010.11 (part 3: rename patches dir)

commit 8c09c1861dad03884d3082c50723ddd07163ca2c
Author: Julien Boibessot <jul...@ar...>
Date:   Wed Oct 20 09:34:56 2010 +0200

    [BUILDROOT] [2010.05] Upgrade to soon coming 2010.11 (part 2: correct faulty patches)

commit 977f93cba68b03f50ad271c4b6579ad9ddf4c4cb
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Oct 19 18:22:48 2010 +0200

    [BUILDROOT] [2010.05] Upgrade to soon coming 2010.11 (part 1)

-----------------------------------------------------------------------

Summary of changes:
 Makefile                                           |    9 +-
 buildroot/configs/apf27_defconfig                  |  220 ++---
 buildroot/configs/apf27_webradio_defconfig         |  220 ++---
 buildroot/configs/apf9328_defconfig                |  199 ++---
 buildroot/package/armadeus/ad9889ctrl/ad9889.mk    |    2 +-
 .../package/armadeus/as_devices/as_devices.mk      |    6 +-
 buildroot/package/armadeus/demos/demos.mk          |    2 +-
 buildroot/package/armadeus/fpgaregs/fpgaregs.mk    |    2 +-
 buildroot/package/armadeus/imxregs/imxregs.mk      |    2 +-
 .../package/armadeus/max5821ctrl/max5821ctrl.mk    |    2 +-
 buildroot/target/device/armadeus/Makefile.in       |    5 +
 .../armadeus/apf27/apf27-linux-2.6.29.6.config     |    1 +
 .../target/device/armadeus/busybox-1.16.1.config   |  920 --------------------
 .../target/device/armadeus/busybox-1.16.2.config   |  920 ++++++++++++++++++++
 buildroot/target/device/armadeus/u-boot/u-boot.mk  |    4 +
 patches/buildroot/2010.05/040-linux-makefile.patch |   46 -
 patches/buildroot/2010.05/041-fbgrab.patch         |  102 ---
 patches/buildroot/2010.05/042-socketcan.patch      |  221 -----
 .../buildroot/2010.05/043-mesa-add_packages.patch  |  287 ------
 patches/buildroot/2010.05/047-uclibc-config.patch  |   28 -
 .../051a-u-boot-add_copy_to_functionnality.patch   |   57 --
 ...1b-u-boot-change_board_name_default_value.patch |   15 -
 ...51c-u-boot-makes_u-boot-clean_target_work.patch |   19 -
 ...d_possibility_to_choose_board_header_file.patch |   53 --
 ...u-boot-add_1.3.4_version_specific_support.patch |   49 -
 ...madeus_specific_options_for_config_header.patch |   30 -
 .../051g-u-boot-add_u-boot-unpacked_target.patch   |   15 -
 ...ot-makes_binary_targets_name_overloadable.patch |   44 -
 .../051i-u-boot-multi-version-support.patch        |   26 -
 ...x-adds_linux26-patched_target_to_Makefile.patch |   15 -
 .../054-ntp-allow_ntpd_selection_or_not.patch      |   47 -
 .../2010.05/057-pymysql-add_package.patch          |  144 ---
 ...x_in_a_standalone_way_after_configuration.patch |   13 -
 ...061-mysql_client-reduce_installation_size.patch |   49 -
 ...-linux-change_board_specific_patches_name.patch |   13 -
 .../buildroot/2010.05/072-xenomai-package.patch    |  254 ------
 .../buildroot/2010.05/081-adds_quake_package.patch |  183 ----
 .../buildroot/2010.05/097-adds_flite_package.patch |   81 --
 .../buildroot/2010.05/107-games-add_wolf4sdl.patch |  102 ---
 .../buildroot/2010.05/118-snes9x-add_package.patch |  428 ---------
 .../buildroot/2010.05/122-urg-add_package.patch    |   56 --
 .../buildroot/2010.05/124-e-uae-add_package.patch  |   54 --
 .../2010.05/130-lbreakout-add_package.patch        |   81 --
 .../2010.05/131-ltetris-add_package.patch          |   84 --
 ...-qt-full_integration_with_cross_compiling.patch |   86 --
 .../buildroot/2010.05/133-qwt-add_package.patch    |  163 ----
 ...ffs2-add_board_name_to_binary_rootfs_name.patch |   28 -
 patches/buildroot/2010.05/cleanup_buildroot.sh     |   50 --
 .../001-add_armadeus_device.patch                  |    0
 .../{2010.05 => 2010.11}/006-lcd4linux.patch       |    0
 .../{2010.05 => 2010.11}/018-allegro.patch         |    0
 .../021-sdl-water-config.patch                     |    0
 .../{2010.05 => 2010.11}/034-slideshow.patch       |    0
 .../038-fakeroot-bump_version.patch                |    0
 patches/buildroot/2010.11/040-linux-makefile.patch |   33 +
 patches/buildroot/2010.11/041-fbgrab.patch         |  102 +++
 patches/buildroot/2010.11/042-socketcan.patch      |  221 +++++
 .../buildroot/2010.11/043-mesa-add_packages.patch  |  287 ++++++
 ...dd_patch_for_recent_kernels_compatibility.patch |    0
 .../045-openssh-add_passwd_expire.patch            |    0
 patches/buildroot/2010.11/047-uclibc-config.patch  |   28 +
 ...or_patches_from_kernel_org_too.tofix_or_remove} |    0
 ...-linux-remove_unsupported_kernel_version.tofix} |    0
 ..._when_modules_compilation_fails.no_more_needed} |    0
 .../051-u-boot.a_refaire_entierement               |    0
 .../051a-u-boot-add_copy_to_functionnality.patch   |   50 ++
 ...1b-u-boot-change_board_name_default_value.patch |   14 +
 ...51c-u-boot-makes_u-boot-clean_target_work.patch |   19 +
 ...d_possibility_to_choose_board_header_file.patch |   45 +
 ...u-boot-add_1.3.4_version_specific_support.patch |   49 +
 ...madeus_specific_options_for_config_header.patch |   24 +
 .../051g-u-boot-add_u-boot-unpacked_target.patch   |   15 +
 ...ot-makes_binary_targets_name_overloadable.patch |   38 +
 .../051i-u-boot-multi-version-support.patch        |   26 +
 ...x-adds_linux26-patched_target_to_Makefile.patch |   14 +
 .../054-ntp-allow_ntpd_selection_or_not.patch      |   56 ++
 .../055-pyserial-add_package.patch                 |    0
 .../2010.11/057-pymysql-add_package.patch          |  144 +++
 ...sa_work_with_eabi_and_large_file_options.to_fix |    0
 ...x_in_a_standalone_way_after_configuration.patch |   13 +
 ...061-mysql_client-reduce_installation_size.patch |   52 ++
 .../062-add-uboot-conf-to-saved-project.to_fix     |    0
 ...-linux-change_board_specific_patches_name.patch |   13 +
 .../buildroot/2010.11/072-xenomai-package.patch    |  254 ++++++
 .../buildroot/{2010.05 => 2010.11}/076-ubifs.tofix |    0
 ...078-sdl-add_patch_for_paths_in_sdl_config.patch |    0
 ...-correct_libdir_path_in_libSDL.la.no_more_used} |    0
 .../buildroot/2010.11/081-adds_quake_package.patch |  172 ++++
 .../082-mtd-utils_with_ubi-utils.tofix             |    0
 .../083-adds_pygame_package.patch                  |    0
 .../085-adds_gpm_package.patch                     |    0
 .../086-bump_proftp_version.patch                  |    0
 .../095-uucp-add_packages.patch                    |    0
 ...-libsndfile-updates_makefile_to_autotool.to_fix |    0
 .../buildroot/2010.11/097-adds_flite_package.patch |   81 ++
 ...for_pld_asm_instruction_on_non_armv5_arch.patch |    0
 ...r-add_patch_for_recent_alsa_compatibility.patch |    0
 ...x-add_support_for_B921600_tty_speed.integrated} |    0
 ...e-add_infrastructure_to_install_firmwares.patch |    0
 .../buildroot/2010.11/107-games-add_wolf4sdl.patch |   92 ++
 .../110-bluez-add_package.patch                    |    0
 ...-linux_eabi_config_option_support_for_arm.patch |    0
 .../113-gpsd-add_package.patch                     |    0
 .../116-openobex-add_package.patch                 |    0
 .../117-ussp-push-add_package.patch                |    0
 .../buildroot/2010.11/118-snes9x-add_package.patch |  417 +++++++++
 .../119-fbtest-add_package.patch                   |    0
 .../120-cwiid-add_package.patch                    |    0
 ...ct_gcc_tune_option_for_arm926t_core.integrated} |    0
 .../121-target-arm926t_is_arm926ej-s.patch         |    0
 .../buildroot/2010.11/122-urg-add_package.patch    |   56 ++
 .../123-pywebradio-add_package.patch               |    0
 .../buildroot/2010.11/124-e-uae-add_package.patch  |   54 ++
 .../125-opentyrian-add_package.patch               |    0
 ...mp_version_and_convert_to_autotools.integrated} |    0
 .../126-tslib-test_add_quit_button.patch           |    0
 ...p-fix_section_length_corruption_bug.integrated} |    0
 .../128-flex-bump_patch_version.integrated}        |    0
 ...cy_functions_with_modern_equivalent.integrated} |    0
 .../2010.11/130-lbreakout-add_package.patch        |   81 ++
 .../2010.11/131-ltetris-add_package.patch          |   84 ++
 ...-qt-full_integration_with_cross_compiling.patch |   45 +
 .../buildroot/2010.11/133-qwt-add_package.patch    |  163 ++++
 ...ffs2-add_board_name_to_binary_rootfs_name.patch |   30 +
 .../add_packages_config_entry.pl                   |    0
 patches/buildroot/2010.11/cleanup_buildroot.sh     |   49 +
 126 files changed, 3975 insertions(+), 4283 deletions(-)
 create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.6.config
 delete mode 100644 buildroot/target/device/armadeus/busybox-1.16.1.config
 create mode 100644 buildroot/target/device/armadeus/busybox-1.16.2.config
 delete mode 100644 patches/buildroot/2010.05/040-linux-makefile.patch
 delete mode 100644 patches/buildroot/2010.05/041-fbgrab.patch
 delete mode 100644 patches/buildroot/2010.05/042-socketcan.patch
 delete mode 100644 patches/buildroot/2010.05/043-mesa-add_packages.patch
 delete mode 100644 patches/buildroot/2010.05/047-uclibc-config.patch
 delete mode 100644 patches/buildroot/2010.05/051a-u-boot-add_copy_to_functionnality.patch
 delete mode 100644 patches/buildroot/2010.05/051b-u-boot-change_board_name_default_value.patch
 delete mode 100644 patches/buildroot/2010.05/051c-u-boot-makes_u-boot-clean_target_work.patch
 delete mode 100644 patches/buildroot/2010.05/051d-u-boot-add_possibility_to_choose_board_header_file.patch
 delete mode 100644 patches/buildroot/2010.05/051e-u-boot-add_1.3.4_version_specific_support.patch
 delete mode 100644 patches/buildroot/2010.05/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
 delete mode 100644 patches/buildroot/2010.05/051g-u-boot-add_u-boot-unpacked_target.patch
 delete mode 100644 patches/buildroot/2010.05/051h-u-boot-makes_binary_targets_name_overloadable.patch
 delete mode 100644 patches/buildroot/2010.05/051i-u-boot-multi-version-support.patch
 delete mode 100644 patches/buildroot/2010.05/052-linux-adds_linux26-patched_target_to_Makefile.patch
 delete mode 100644 patches/buildroot/2010.05/054-ntp-allow_ntpd_selection_or_not.patch
 delete mode 100644 patches/buildroot/2010.05/057-pymysql-add_package.patch
 delete mode 100644 patches/buildroot/2010.05/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
 delete mode 100644 patches/buildroot/2010.05/061-mysql_client-reduce_installation_size.patch
 delete mode 100644 patches/buildroot/2010.05/071-linux-change_board_specific_patches_name.patch
 delete mode 100644 patches/buildroot/2010.05/072-xenomai-package.patch
 delete mode 100644 patches/buildroot/2010.05/081-adds_quake_package.patch
 delete mode 100644 patches/buildroot/2010.05/097-adds_flite_package.patch
 delete mode 100644 patches/buildroot/2010.05/107-games-add_wolf4sdl.patch
 delete mode 100644 patches/buildroot/2010.05/118-snes9x-add_package.patch
 delete mode 100644 patches/buildroot/2010.05/122-urg-add_package.patch
 delete mode 100644 patches/buildroot/2010.05/124-e-uae-add_package.patch
 delete mode 100644 patches/buildroot/2010.05/130-lbreakout-add_package.patch
 delete mode 100644 patches/buildroot/2010.05/131-ltetris-add_package.patch
 delete mode 100644 patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
 delete mode 100644 patches/buildroot/2010.05/133-qwt-add_package.patch
 delete mode 100644 patches/buildroot/2010.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch
 delete mode 100755 patches/buildroot/2010.05/cleanup_buildroot.sh
 rename patches/buildroot/{2010.05 => 2010.11}/001-add_armadeus_device.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/006-lcd4linux.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/018-allegro.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/021-sdl-water-config.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/034-slideshow.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/038-fakeroot-bump_version.patch (100%)
 create mode 100644 patches/buildroot/2010.11/040-linux-makefile.patch
 create mode 100644 patches/buildroot/2010.11/041-fbgrab.patch
 create mode 100644 patches/buildroot/2010.11/042-socketcan.patch
 create mode 100644 patches/buildroot/2010.11/043-mesa-add_packages.patch
 rename patches/buildroot/{2010.05 => 2010.11}/044-tslib-add_patch_for_recent_kernels_compatibility.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/045-openssh-add_passwd_expire.patch (100%)
 create mode 100644 patches/buildroot/2010.11/047-uclibc-config.patch
 rename patches/buildroot/{2010.05/049-linux-download_minor_patches_from_kernel_org_too.patch => 2010.11/049-linux-download_minor_patches_from_kernel_org_too.tofix_or_remove} (100%)
 rename patches/buildroot/{2010.05/050-linux-remove_unsupported_kernel_version.patch => 2010.11/050-linux-remove_unsupported_kernel_version.tofix} (100%)
 rename patches/buildroot/{2010.05/050-linux-stops_building_when_modules_compilation_fails.patch => 2010.11/050-linux-stops_building_when_modules_compilation_fails.no_more_needed} (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/051-u-boot.a_refaire_entierement (100%)
 create mode 100644 patches/buildroot/2010.11/051a-u-boot-add_copy_to_functionnality.patch
 create mode 100644 patches/buildroot/2010.11/051b-u-boot-change_board_name_default_value.patch
 create mode 100644 patches/buildroot/2010.11/051c-u-boot-makes_u-boot-clean_target_work.patch
 create mode 100644 patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
 create mode 100644 patches/buildroot/2010.11/051e-u-boot-add_1.3.4_version_specific_support.patch
 create mode 100644 patches/buildroot/2010.11/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
 create mode 100644 patches/buildroot/2010.11/051g-u-boot-add_u-boot-unpacked_target.patch
 create mode 100644 patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch
 create mode 100644 patches/buildroot/2010.11/051i-u-boot-multi-version-support.patch
 create mode 100644 patches/buildroot/2010.11/052-linux-adds_linux26-patched_target_to_Makefile.patch
 create mode 100644 patches/buildroot/2010.11/054-ntp-allow_ntpd_selection_or_not.patch
 rename patches/buildroot/{2010.05 => 2010.11}/055-pyserial-add_package.patch (100%)
 create mode 100644 patches/buildroot/2010.11/057-pymysql-add_package.patch
 rename patches/buildroot/{2010.05 => 2010.11}/058-makes_alsa_work_with_eabi_and_large_file_options.to_fix (100%)
 create mode 100644 patches/buildroot/2010.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
 create mode 100644 patches/buildroot/2010.11/061-mysql_client-reduce_installation_size.patch
 rename patches/buildroot/{2010.05 => 2010.11}/062-add-uboot-conf-to-saved-project.to_fix (100%)
 create mode 100644 patches/buildroot/2010.11/071-linux-change_board_specific_patches_name.patch
 create mode 100644 patches/buildroot/2010.11/072-xenomai-package.patch
 rename patches/buildroot/{2010.05 => 2010.11}/076-ubifs.tofix (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/078-sdl-add_patch_for_paths_in_sdl_config.patch (100%)
 rename patches/buildroot/{2010.05/078-sdl-correct_libdir_path_in_libSDL.la.patch => 2010.11/078-sdl-correct_libdir_path_in_libSDL.la.no_more_used} (100%)
 create mode 100644 patches/buildroot/2010.11/081-adds_quake_package.patch
 rename patches/buildroot/{2010.05 => 2010.11}/082-mtd-utils_with_ubi-utils.tofix (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/083-adds_pygame_package.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/085-adds_gpm_package.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/086-bump_proftp_version.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/095-uucp-add_packages.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/096-libsndfile-updates_makefile_to_autotool.to_fix (100%)
 create mode 100644 patches/buildroot/2010.11/097-adds_flite_package.patch
 rename patches/buildroot/{2010.05 => 2010.11}/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/101-mplayer-add_patch_for_recent_alsa_compatibility.patch (100%)
 rename patches/buildroot/{2010.05/105-busybox-add_support_for_B921600_tty_speed.patch => 2010.11/105-busybox-add_support_for_B921600_tty_speed.integrated} (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/106-firmware-add_infrastructure_to_install_firmwares.patch (100%)
 create mode 100644 patches/buildroot/2010.11/107-games-add_wolf4sdl.patch
 rename patches/buildroot/{2010.05 => 2010.11}/110-bluez-add_package.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/112-gcc-4_2_x-add_aapcs-linux_eabi_config_option_support_for_arm.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/113-gpsd-add_package.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/116-openobex-add_package.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/117-ussp-push-add_package.patch (100%)
 create mode 100644 patches/buildroot/2010.11/118-snes9x-add_package.patch
 rename patches/buildroot/{2010.05 => 2010.11}/119-fbtest-add_package.patch (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/120-cwiid-add_package.patch (100%)
 rename patches/buildroot/{2010.05/121-set_correct_gcc_tune_option_for_arm926t_core.patch => 2010.11/121-set_correct_gcc_tune_option_for_arm926t_core.integrated} (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/121-target-arm926t_is_arm926ej-s.patch (100%)
 create mode 100644 patches/buildroot/2010.11/122-urg-add_package.patch
 rename patches/buildroot/{2010.05 => 2010.11}/123-pywebradio-add_package.patch (100%)
 create mode 100644 patches/buildroot/2010.11/124-e-uae-add_package.patch
 rename patches/buildroot/{2010.05 => 2010.11}/125-opentyrian-add_package.patch (100%)
 rename patches/buildroot/{2010.05/126-ipsec-tools-bump_version_and_convert_to_autotools.patch => 2010.11/126-ipsec-tools-bump_version_and_convert_to_autotools.integrated} (100%)
 rename patches/buildroot/{2010.05 => 2010.11}/126-tslib-test_add_quit_button.patch (100%)
 rename patches/buildroot/{2010.05/127-sstrip-fix_section_length_corruption_bug.patch => 2010.11/127-sstrip-fix_section_length_corruption_bug.integrated} (100%)
 rename patches/buildroot/{2010.05/128-flex-bump_patch_version.patch => 2010.11/128-flex-bump_patch_version.integrated} (100%)
 rename patches/buildroot/{2010.05/129-ipsec-tools-replaces_susv3_legacy_functions_with_modern_equivalent.patch => 2010.11/129-ipsec-tools-replaces_susv3_legacy_functions_with_modern_equivalent.integrated} (100%)
 create mode 100644 patches/buildroot/2010.11/130-lbreakout-add_package.patch
 create mode 100644 patches/buildroot/2010.11/131-ltetris-add_package.patch
 create mode 100644 patches/buildroot/2010.11/132-qt-full_integration_with_cross_compiling.patch
 create mode 100644 patches/buildroot/2010.11/133-qwt-add_package.patch
 create mode 100644 patches/buildroot/2010.11/134-jffs2-add_board_name_to_binary_rootfs_name.patch
 rename patches/buildroot/{2010.05 => 2010.11}/add_packages_config_entry.pl (100%)
 create mode 100755 patches/buildroot/2010.11/cleanup_buildroot.sh

diff --git a/Makefile b/Makefile
index 9c3cf13..3978e93 100644
--- a/Makefile
+++ b/Makefile
@@ -33,9 +33,12 @@ 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)
+#BUILDROOT_VERSION:=2010.11
+#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
+#BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
+BUILDROOT_VERSION:=20101015
+BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
+BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/2010.11
 ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
 endif
 #--- End of user conf (don't touch anything below unless you know what you're doing !! ;-) )
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 7afbe81..2865fa3 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -1,24 +1,19 @@
 #
 # Automatically generated make config: don't edit
-# Thu Aug 26 14:21:28 2010
+# Tue Oct 19 15:36:56 2010
 #
 BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2010.05"
-# BR2_alpha is not set
+BR2_VERSION="2010.11-git"
 BR2_arm=y
 # BR2_armeb is not set
 # BR2_avr32 is not set
-# BR2_cris is not set
-# BR2_ia64 is not set
 # BR2_i386 is not set
-# BR2_m68k is not set
 # BR2_mips is not set
 # BR2_mipsel is not set
 # BR2_powerpc is not set
 # BR2_sh is not set
 # BR2_sh64 is not set
 # BR2_sparc is not set
-# BR2_sparc64 is not set
 # BR2_x86_64 is not set
 # BR2_xtensa is not set
 # BR2_generic_arm is not set
@@ -35,9 +30,10 @@ BR2_arm926t=y
 # BR2_arm1176jzf_s is not set
 
 #
-# cortex-A8 needs gcc >= 4.4.x
+# cortex-A8/A9 needs gcc >= 4.4.x
 #
 # BR2_cortex_a8 is not set
+# BR2_cortex_a9 is not set
 # BR2_sa110 is not set
 # BR2_sa1100 is not set
 # BR2_xscale is not set
@@ -88,10 +84,8 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
 # Commands
 #
 BR2_WGET="wget --passive-ftp"
-BR2_SVN_CO="svn co"
-BR2_SVN_UP="svn up"
-BR2_BZR_CO="bzr co"
-BR2_BZR_UP="bzr up"
+BR2_SVN="svn"
+BR2_BZR="bzr"
 BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
@@ -134,17 +128,14 @@ BR2_CONFIG_CACHE=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
+# BR2_TOOLCHAIN_CTNG is not set
 
 #
 # Kernel Header Options
 #
-# 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_2_6_34 is not set
+# BR2_KERNEL_HEADERS_2_6_35 is not set
 BR2_KERNEL_HEADERS_VERSION=y
 # BR2_KERNEL_HEADERS_SNAP is not set
 BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
@@ -153,8 +144,6 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.29.6"
 #
 # uClibc Options
 #
-# 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=y
 # BR2_UCLIBC_VERSION_0_9_31 is not set
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
@@ -166,11 +155,6 @@ BR2_UCLIBC_CONFIG="$(BR2_BOARD_PATH)/uClibc-0.9.30.config.arm"
 #
 # Binutils Options
 #
-# BR2_BINUTILS_VERSION_2_17 is not set
-# BR2_BINUTILS_VERSION_2_18 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"
@@ -179,25 +163,14 @@ BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 #
 # GCC Options
 #
-# BR2_GCC_VERSION_4_1_2 is not set
-# BR2_GCC_VERSION_4_2_1 is not set
-# BR2_GCC_VERSION_4_2_2 is not set
-# BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 is not set
-# BR2_GCC_VERSION_4_2_3 is not set
 # BR2_GCC_VERSION_4_2_4 is not set
-# BR2_GCC_VERSION_4_3_2 is not set
-# BR2_GCC_VERSION_4_3_3 is not set
-# BR2_GCC_VERSION_4_3_4 is not set
+# BR2_GCC_VERSION_4_3_X is not set
 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.4"
-BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
+BR2_GCC_VERSION="4.4.5"
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
-# BR2_INSTALL_LIBGCJ is not set
 # BR2_INSTALL_OBJC is not set
 # BR2_INSTALL_FORTRAN is not set
 BR2_GCC_SHARED_LIBGCC=y
@@ -212,15 +185,9 @@ 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_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
@@ -242,7 +209,6 @@ BR2_SOFT_FLOAT=y
 # BR2_PTHREADS_NONE is not set
 # BR2_PTHREADS is not set
 BR2_PTHREADS_OLD=y
-# BR2_PTHREADS_NATIVE is not set
 # BR2_PROGRAM_INVOCATION is not set
 BR2_GCC_CROSS_CXX=y
 BR2_INSTALL_LIBSTDCPP=y
@@ -251,24 +217,20 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 BR2_PACKAGE_SSTRIP_TARGET=y
 BR2_PACKAGE_SSTRIP_HOST=y
-BR2_ENABLE_MULTILIB=y
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 
 #
 # Package Selection for the target
 #
 BR2_PACKAGE_BUSYBOX=y
-# BR2_BUSYBOX_VERSION_1_12_X is not set
-# BR2_BUSYBOX_VERSION_1_13_X is not set
-# BR2_BUSYBOX_VERSION_1_14_X is not set
 # BR2_BUSYBOX_VERSION_1_15_X is not set
 BR2_BUSYBOX_VERSION_1_16_X=y
+# BR2_BUSYBOX_VERSION_1_17_X is not set
 # BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.16.1"
+BR2_BUSYBOX_VERSION="1.16.2"
 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
 
 #
@@ -325,6 +287,7 @@ 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_FFMPEG is not set
 # BR2_PACKAGE_GSTREAMER is not set
 # BR2_PACKAGE_LIBCDAUDIO is not set
 # BR2_PACKAGE_LIBDVDREAD is not set
@@ -333,6 +296,7 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
 # BR2_PACKAGE_LIBMAD is not set
 # BR2_PACKAGE_LIBMMS is not set
 # BR2_PACKAGE_LIBMPD is not set
+# BR2_PACKAGE_LIBMPEG2 is not set
 # BR2_PACKAGE_LIBOGG is not set
 # BR2_PACKAGE_LIBSNDFILE is not set
 # BR2_PACKAGE_LIBTHEORA is not set
@@ -351,7 +315,7 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
 # Compressors and decompressors
 #
 # BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_LZMA is not set
+# BR2_PACKAGE_XZ is not set
 
 #
 # Debugging, profiling and benchmark
@@ -385,7 +349,6 @@ BR2_PACKAGE_STRACE=y
 # 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
@@ -410,6 +373,11 @@ BR2_PACKAGE_STRACE=y
 #
 
 #
+# Graphic applications
+#
+# BR2_PACKAGE_RRDTOOL is not set
+
+#
 # graphic libraries
 #
 # BR2_PACKAGE_ALLEGRO is not set
@@ -431,6 +399,10 @@ BR2_PACKAGE_STRACE=y
 # other GUIs
 #
 # BR2_PACKAGE_QT is not set
+
+#
+# Qwt requires Qt to be installed
+#
 # BR2_PACKAGE_XORG7 is not set
 
 #
@@ -448,6 +420,10 @@ BR2_PACKAGE_STRACE=y
 # BR2_PACKAGE_GOB2 is not set
 
 #
+# midori requires C++, WCHAR in toolchain and libgtk2
+#
+
+#
 # Hardware handling
 #
 # BR2_PACKAGE_CDRKIT is not set
@@ -526,11 +502,11 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
 # BR2_PACKAGE_NTFS_3G is not set
 # BR2_PACKAGE_NTFSPROGS is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# 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_UDEV is not set
 # BR2_PACKAGE_URG is not set
 # BR2_PACKAGE_USB_MODESWITCH is not set
 # BR2_PACKAGE_USBMOUNT is not set
@@ -596,6 +572,7 @@ BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_JPEG is not set
 # BR2_PACKAGE_LIBART is not set
 # BR2_PACKAGE_LIBPNG is not set
+# BR2_PACKAGE_LIBSVGTINY is not set
 # BR2_PACKAGE_LIBUNGIF is not set
 # BR2_PACKAGE_MESALIB is not set
 # BR2_PACKAGE_PANGO is not set
@@ -603,6 +580,10 @@ BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_TIFF is not set
 
 #
+# webkit requires C++, WCHAR in toolchain and libgtk2
+#
+
+#
 # Hardware handling
 #
 # BR2_PACKAGE_LIBAIO is not set
@@ -611,11 +592,6 @@ BR2_PACKAGE_TSLIB=y
 # BR2_PACKAGE_LIBUSB is not set
 
 #
-# Java
-#
-# BR2_PACKAGE_CLASSPATH is not set
-
-#
 # Networking
 #
 # BR2_PACKAGE_LIBCGI is not set
@@ -641,7 +617,6 @@ BR2_PACKAGE_TSLIB=y
 # 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
 
@@ -666,7 +641,6 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
 #
 # 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
@@ -718,6 +692,10 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
 BR2_PACKAGE_NTP=y
 # BR2_PACKAGE_NTP_NTPD is not set
 # BR2_PACKAGE_NTP_SNTP is not set
+# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
+# BR2_PACKAGE_NTP_NTPDC is not set
+# BR2_PACKAGE_NTP_NTPQ is not set
+# BR2_PACKAGE_NTP_TICKADJ is not set
 # BR2_PACKAGE_OLSR is not set
 # BR2_PACKAGE_OPENNTPD is not set
 # BR2_PACKAGE_OPENOBEX is not set
@@ -726,7 +704,6 @@ BR2_PACKAGE_NTP=y
 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
@@ -737,7 +714,6 @@ BR2_PACKAGE_PORTMAP=y
 # 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
@@ -757,7 +733,6 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
 # Package managers
 #
 # BR2_PACKAGE_IPKG is not set
-# BR2_PACKAGE_PORTAGE is not set
 
 #
 # Shell and utilities
@@ -807,7 +782,17 @@ 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_UBIFS is not set
+BR2_TARGET_ROOTFS_UBIFS=y
+BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f800
+BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x800
+BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
+# BR2_TARGET_ROOTFS_UBIFS_RT_NONE is not set
+# BR2_TARGET_ROOTFS_UBIFS_RT_ZLIB is not set
+BR2_TARGET_ROOTFS_UBIFS_RT_LZO=y
+BR2_TARGET_ROOTFS_UBIFS_NONE=y
+# BR2_TARGET_ROOTFS_UBIFS_GZIP is not set
+# BR2_TARGET_ROOTFS_UBIFS_BZIP2 is not set
+# BR2_TARGET_ROOTFS_UBIFS_LZMA is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 BR2_TARGET_ROOTFS_TAR=y
 BR2_TARGET_ROOTFS_TAR_NONE=y
@@ -822,97 +807,40 @@ BR2_TARGET_ROOTFS_TAR_OPTIONS=""
 #
 # Bootloaders
 #
+# BR2_TARGET_BAREBOX is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_UBOOT_VERSION).h"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_TARGET_UBOOT_VERSION).h"
 BR2_TARGET_UBOOT_1_3_4=y
+# BR2_TARGET_UBOOT_2010_06 is not set
 # 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_SILENT is not set
+# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
+BR2_TARGET_UBOOT_VERSION="1.3.4"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+# BR2_TARGET_UBOOT_FORMAT_KWB is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 BR2_TARGET_UBOOT_TOOL_ENV=y
 BR2_TARGET_UBOOT_COPYTO=""
-# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
+# BR2_TARGET_UBOOT_NETWORK is not set
+# BR2_TARGET_AT91BOOTSTRAP is not set
+# BR2_TARGET_DATAFLASHBOOT is not set
 
 #
 # Kernel
 #
-# BR2_KERNEL_none is not set
-BR2_KERNEL_LINUX_ADVANCED=y
-# BR2_KERNEL_LINUX is not set
-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.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="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_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_LINUX26_CUSTOM is not set
-
-#
-# Patches
-#
-BR2_KERNEL_ADD_KERNEL_ORG_PATCH=y
-# BR2_KERNEL_ADD_LATEST is not set
-# BR2_KERNEL_ADD_LATEST_MINORPATCH is not set
-BR2_KERNEL_ADD_MINORPATCH=y
-# BR2_KERNEL_ADD_LATEST_RC_PATCH is not set
-# 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_PATCH=y
-BR2_KERNEL_MINORLEVEL="6"
-# BR2_KERNEL_ARCH_PATCH_ENABLED is not set
-BR2_LINUX_BSP_PATCH=""
-BR2_KERNEL_PATCH="patch-$(BR2_DOWNLOAD_LINUX26_VERSION).$(BR2_KERNEL_PATCH_LEVEL).bz2"
-BR2_EXTRA_VERSION=".$(BR2_KERNEL_PATCH_LEVEL)"
-BR2_KERNEL_BASE=y
-BR2_DOWNLOAD_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)"
-BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION).$(BR2_KERNEL_PATCH_LEVEL)"
-
-#
-# Linux Kernel Configuration
-#
-BR2_PACKAGE_LINUX_USE_KCONFIG=y
-# BR2_PACKAGE_LINUX_USE_DEFCONFIG is not set
-# BR2_PACKAGE_LINUX_USE_XCONFIG is not set
-# BR2_LINUX_BIN_BZIMAGE is not set
-BR2_LINUX_BIN_UIMAGE=y
-# BR2_LINUX_BIN_VMLINUX is not set
-# BR2_LINUX_BIN_ZIMAGE is not set
-# BR2_LINUX_BIN_CUSTOM is not set
-
-#
-# Destinations for linux kernel binaries
-#
-# BR2_LINUX_COPYTO_ROOTFS is not set
-# BR2_LINUX_COPYTO_TFTPBOOT is not set
-BR2_LINUX_COPYTO=""
-# BR2_LINUX_COPY_CONFIGURATION is not set
+BR2_LINUX_KERNEL=y
+# BR2_LINUX_KERNEL_2_6_35 is not set
+# BR2_LINUX_KERNEL_SAME_AS_HEADERS is not set
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+# BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
+BR2_LINUX_KERNEL_VERSION="2.6.29.6"
+BR2_LINUX_KERNEL_PATCH="$(LINUX26_PATCH_DIR)"
+# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_UIMAGE=y
+# BR2_LINUX_KERNEL_ZIMAGE is not set
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 6166cbd..bf93631 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -1,24 +1,19 @@
 #
 # Automatically generated make config: don't edit
-# Sun Jul  4 16:19:24 2010
+# Tue Oct 19 15:36:56 2010
 #
 BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2010.05"
-# BR2_alpha is not set
+BR2_VERSION="2010.11-git"
 BR2_arm=y
 # BR2_armeb is not set
 # BR2_avr32 is not set
-# BR2_cris is not set
-# BR2_ia64 is not set
 # BR2_i386 is not set
-# BR2_m68k is not set
 # BR2_mips is not set
 # BR2_mipsel is not set
 # BR2_powerpc is not set
 # BR2_sh is not set
 # BR2_sh64 is not set
 # BR2_sparc is not set
-# BR2_sparc64 is not set
 # BR2_x86_64 is not set
 # BR2_xtensa is not set
 # BR2_generic_arm is not set
@@ -35,9 +30,10 @@ BR2_arm926t=y
 # BR2_arm1176jzf_s is not set
 
 #
-# cortex-A8 needs gcc >= 4.4.x
+# cortex-A8/A9 needs gcc >= 4.4.x
 #
 # BR2_cortex_a8 is not set
+# BR2_cortex_a9 is not set
 # BR2_sa110 is not set
 # BR2_sa1100 is not set
 # BR2_xscale is not set
@@ -88,10 +84,8 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
 # Commands
 #
 BR2_WGET="wget --passive-ftp"
-BR2_SVN_CO="svn co"
-BR2_SVN_UP="svn up"
-BR2_BZR_CO="bzr co"
-BR2_BZR_UP="bzr up"
+BR2_SVN="svn"
+BR2_BZR="bzr"
 BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
@@ -134,17 +128,14 @@ BR2_CONFIG_CACHE=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
+# BR2_TOOLCHAIN_CTNG is not set
 
 #
 # Kernel Header Options
 #
-# 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_2_6_34 is not set
+# BR2_KERNEL_HEADERS_2_6_35 is not set
 BR2_KERNEL_HEADERS_VERSION=y
 # BR2_KERNEL_HEADERS_SNAP is not set
 BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
@@ -153,8 +144,6 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.29.6"
 #
 # uClibc Options
 #
-# 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=y
 # BR2_UCLIBC_VERSION_0_9_31 is not set
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
@@ -166,11 +155,6 @@ BR2_UCLIBC_CONFIG="$(BR2_BOARD_PATH)/uClibc-0.9.30.config.arm"
 #
 # Binutils Options
 #
-# BR2_BINUTILS_VERSION_2_17 is not set
-# BR2_BINUTILS_VERSION_2_18 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"
@@ -179,25 +163,14 @@ BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 #
 # GCC Options
 #
-# BR2_GCC_VERSION_4_1_2 is not set
-# BR2_GCC_VERSION_4_2_1 is not set
-# BR2_GCC_VERSION_4_2_2 is not set
-# BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 is not set
-# BR2_GCC_VERSION_4_2_3 is not set
 # BR2_GCC_VERSION_4_2_4 is not set
-# BR2_GCC_VERSION_4_3_2 is not set
-# BR2_GCC_VERSION_4_3_3 is not set
-# BR2_GCC_VERSION_4_3_4 is not set
+# BR2_GCC_VERSION_4_3_X is not set
 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.4"
-BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
+BR2_GCC_VERSION="4.4.5"
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
-# BR2_INSTALL_LIBGCJ is not set
 # BR2_INSTALL_OBJC is not set
 # BR2_INSTALL_FORTRAN is not set
 BR2_GCC_SHARED_LIBGCC=y
@@ -212,15 +185,9 @@ 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_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
@@ -242,7 +209,6 @@ BR2_SOFT_FLOAT=y
 # BR2_PTHREADS_NONE is not set
 # BR2_PTHREADS is not set
 BR2_PTHREADS_OLD=y
-# BR2_PTHREADS_NATIVE is not set
 # BR2_PROGRAM_INVOCATION is not set
 BR2_GCC_CROSS_CXX=y
 BR2_INSTALL_LIBSTDCPP=y
@@ -251,20 +217,17 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 BR2_PACKAGE_SSTRIP_TARGET=y
 BR2_PACKAGE_SSTRIP_HOST=y
-BR2_ENABLE_MULTILIB=y
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 
 #
 # Package Selection for the target
 #
 BR2_PACKAGE_BUSYBOX=y
-# BR2_BUSYBOX_VERSION_1_12_X is not set
-# BR2_BUSYBOX_VERSION_1_13_X is not set
-# BR2_BUSYBOX_VERSION_1_14_X is not set
 # BR2_BUSYBOX_VERSION_1_15_X is not set
 BR2_BUSYBOX_VERSION_1_16_X=y
+# BR2_BUSYBOX_VERSION_1_17_X is not set
 # BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.16.1"
+BR2_BUSYBOX_VERSION="1.16.2"
 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
@@ -326,6 +289,7 @@ 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_FFMPEG is not set
 # BR2_PACKAGE_GSTREAMER is not set
 # BR2_PACKAGE_LIBCDAUDIO is not set
 # BR2_PACKAGE_LIBDVDREAD is not set
@@ -334,6 +298,7 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
 BR2_PACKAGE_LIBMAD=y
 # BR2_PACKAGE_LIBMMS is not set
 # BR2_PACKAGE_LIBMPD is not set
+# BR2_PACKAGE_LIBMPEG2 is not set
 # BR2_PACKAGE_LIBOGG is not set
 # BR2_PACKAGE_LIBSNDFILE is not set
 # BR2_PACKAGE_LIBTHEORA is not set
@@ -352,7 +317,7 @@ BR2_PACKAGE_PYWEBRADIO=y
 # Compressors and decompressors
 #
 # BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_LZMA is not set
+# BR2_PACKAGE_XZ is not set
 
 #
 # Debugging, profiling and benchmark
@@ -386,7 +351,6 @@ BR2_PACKAGE_STRACE=y
 # 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
@@ -398,6 +362,9 @@ BR2_PACKAGE_STRACE=y
 #
 # BR2_PACKAGE_E_UAE is not set
 # BR2_PACKAGE_GNUCHESS is not set
+# BR2_PACKAGE_LBREAKOUT2 is not set
+# BR2_PACKAGE_LTRIS is not set
+# BR2_PACKAGE_OPENTYRIAN is not set
 # BR2_PACKAGE_PRBOOM is not set
 # BR2_PACKAGE_SDLQUAKE is not set
 # BR2_PACKAGE_SNES9X is not set
@@ -408,6 +375,11 @@ BR2_PACKAGE_STRACE=y
 #
 
 #
+# Graphic applications
+#
+# BR2_PACKAGE_RRDTOOL is not set
+
+#
 # graphic libraries
 #
 # BR2_PACKAGE_ALLEGRO is not set
@@ -477,6 +449,10 @@ BR2_PACKAGE_SDL_TTF=y
 # other GUIs
 #
 # BR2_PACKAGE_QT is not set
+
+#
+# Qwt requires Qt to be installed
+#
 # BR2_PACKAGE_XORG7 is not set
 
 #
@@ -494,6 +470,10 @@ BR2_PACKAGE_SDL_TTF=y
 # BR2_PACKAGE_GOB2 is not set
 
 #
+# midori requires C++, WCHAR in toolchain and libgtk2
+#
+
+#
 # Hardware handling
 #
 # BR2_PACKAGE_CDRKIT is not set
@@ -569,12 +549,12 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
 # BR2_PACKAGE_NTFS_3G is not set
 # BR2_PACKAGE_NTFSPROGS is not set
 # BR2_PACKAGE_PCIUTILS is not set
-# 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_URG=y
+# BR2_PACKAGE_UDEV is not set
+# BR2_PACKAGE_URG is not set
 # BR2_PACKAGE_USB_MODESWITCH is not set
 # BR2_PACKAGE_USBMOUNT is not set
 # BR2_PACKAGE_USBUTILS is not set
@@ -664,6 +644,10 @@ BR2_PACKAGE_LIBPNG=y
 # BR2_PACKAGE_TIFF is not set
 
 #
+# webkit requires C++, WCHAR in toolchain and libgtk2
+#
+
+#
 # Hardware handling
 #
 # BR2_PACKAGE_LIBAIO is not set
@@ -672,11 +656,6 @@ BR2_PACKAGE_TSLIB=y
 # BR2_PACKAGE_LIBUSB is not set
 
 #
-# Java
-#
-# BR2_PACKAGE_CLASSPATH is not set
-
-#
 # Networking
 #
 # BR2_PACKAGE_LIBCGI is not set
@@ -702,7 +681,6 @@ BR2_PACKAGE_TSLIB=y
 # 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
 
@@ -779,6 +757,10 @@ BR2_PACKAGE_EXPAT=y
 BR2_PACKAGE_NTP=y
 # BR2_PACKAGE_NTP_NTPD is not set
 # BR2_PACKAGE_NTP_SNTP is not set
+# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
+# BR2_PACKAGE_NTP_NTPDC is not set
+# BR2_PACKAGE_NTP_NTPQ is not set
+# BR2_PACKAGE_NTP_TICKADJ is not set
 # BR2_PACKAGE_OLSR is not set
 # BR2_PACKAGE_OPENNTPD is not set
 # BR2_PACKAGE_OPENOBEX is not set
@@ -818,7 +800,6 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
 # Package managers
 #
 # BR2_PACKAGE_IPKG is not set
-# BR2_PACKAGE_PORTAGE is not set
 
 #
 # Shell and utilities
@@ -868,7 +849,17 @@ 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_UBIFS is not set
+BR2_TARGET_ROOTFS_UBIFS=y
+BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f800
+BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x800
+BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
+# BR2_TARGET_ROOTFS_UBIFS_RT_NONE is not set
+# BR2_TARGET_ROOTFS_UBIFS_RT_ZLIB is not set
+BR2_TARGET_ROOTFS_UBIFS_RT_LZO=y
+BR2_TARGET_ROOTFS_UBIFS_NONE=y
+# BR2_TARGET_ROOTFS_UBIFS_GZIP is not set
+# BR2_TARGET_ROOTFS_UBIFS_BZIP2 is not set
+# BR2_TARGET_ROOTFS_UBIFS_LZMA is not set
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 BR2_TARGET_ROOTFS_TAR=y
 BR2_TARGET_ROOTFS_TAR_NONE=y
@@ -883,97 +874,40 @@ BR2_TARGET_ROOTFS_TAR_OPTIONS=""
 #
 # Bootloaders
 #
+# BR2_TARGET_BAREBOX is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_UBOOT_VERSION).h"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_TARGET_UBOOT_VERSION).h"
 BR2_TARGET_UBOOT_1_3_4=y
+# BR2_TARGET_UBOOT_2010_06 is not set
 # 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_SILENT is not set
+# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
+BR2_TARGET_UBOOT_VERSION="1.3.4"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+# BR2_TARGET_UBOOT_FORMAT_KWB is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 BR2_TARGET_UBOOT_TOOL_ENV=y
 BR2_TARGET_UBOOT_COPYTO=""
-# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
+# BR2_TARGET_UBOOT_NETWORK is not set
+# BR2_TARGET_AT91BOOTSTRAP is not set
+# BR2_TARGET_DATAFLASHBOOT is not set
 
 #
 # Kernel
 #
-# BR2_KERNEL_none is not set
-BR2_KERNEL_LINUX_ADVANCED=y
-# BR2_KERNEL_LINUX is not set
-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.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="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_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_LINUX26_CUSTOM is not set
-
-#
-# Patches
-#
-BR2_KERNEL_ADD_KERNEL_ORG_PATCH=y
-# BR2_KERNEL_ADD_LATEST is not set
-# BR2_KERNEL_ADD_LATEST_MINORPATCH is not set
-BR2_KERNEL_ADD_MINORPATCH=y
-# BR2_KERNEL_ADD_LATEST_RC_PATCH is not set
-# 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_PATCH=y
-BR2_KERNEL_MINORLEVEL="6"
-# BR2_KERNEL_ARCH_PATCH_ENABLED is not set
-BR2_LINUX_BSP_PATCH=""
-BR2_KERNEL_PATCH="patch-$(BR2_DOWNLOAD_LINUX26_VERSION).$(BR2_KERNEL_PATCH_LEVEL).bz2"
-BR2_EXTRA_VERSION=".$(BR2_KERNEL_PATCH_LEVEL)"
-BR2_KERNEL_BASE=y
-BR2_DOWNLOAD_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)"
-BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION).$(BR2_KERNEL_PATCH_LEVEL)"
-
-#
-# Linux Kernel Configuration
-#
-BR2_PACKAGE_LINUX_USE_KCONFIG=y
-# BR2_PACKAGE_LINUX_USE_DEFCONFIG is not set
-# BR2_PACKAGE_LINUX_USE_XCONFIG is not set
-# BR2_LINUX_BIN_BZIMAGE is not set
-BR2_LINUX_BIN_UIMAGE=y
-# BR2_LINUX_BIN_VMLINUX is not set
-# BR2_LINUX_BIN_ZIMAGE is not set
-# BR2_LINUX_BIN_CUSTOM is not set
-
-#
-# Destinations for linux kernel binaries
-#
-# BR2_LINUX_COPYTO_ROOTFS is not set
-# BR2_LINUX_COPYTO_TFTPBOOT is not set
-BR2_LINUX_COPYTO=""
-# BR2_LINUX_COPY_CONFIGURATION is not set
+BR2_LINUX_KERNEL=y
+# BR2_LINUX_KERNEL_2_6_35 is not set
+# BR2_LINUX_KERNEL_SAME_AS_HEADERS is not set
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+# BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
+BR2_LINUX_KERNEL_VERSION="2.6.29.6"
+BR2_LINUX_KERNEL_PATCH="$(LINUX26_PATCH_DIR)"
+# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_UIMAGE=y
+# BR2_LINUX_KERNEL_ZIMAGE is not set
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index d55228a..e09de02 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -1,24 +1,19 @@
 #
 # Automatically generated make config: don't edit
-# Thu Aug 26 14:31:57 2010
+# Tue Oct 19 15:36:56 2010
 #
 BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2010.05"
-# BR2_alpha is not set
+BR2_VERSION="2010.11-git"
 BR2_arm=y
 # BR2_armeb is not set
 # BR2_avr32 is not set
-# BR2_cris is not set
-# BR2_ia64 is not set
 # BR2_i386 is not set
-# BR2_m68k is not set
 # BR2_mips is not set
 # BR2_mipsel is not set
 # BR2_powerpc is not set
 # BR2_sh is not set
 # BR2_sh64 is not set
 # BR2_sparc is not set
-# BR2_sparc64 is not set
 # BR2_x86_64 is not set
 # BR2_xtensa is not set
 # BR2_generic_arm is not set
@@ -35,9 +30,10 @@ BR2_arm920t=y
 # BR2_arm1176jzf_s is not set
 
 #
-# cortex-A8 needs gcc >= 4.4.x
+# cortex-A8/A9 needs gcc >= 4.4.x
 #
 # BR2_cortex_a8 is not set
+# BR2_cortex_a9 is not set
 # BR2_sa110 is not set
 # BR2_sa1100 is not set
 # BR2_xscale is not set
@@ -84,10 +80,8 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
 # Commands
 #
 BR2_WGET="wget --passive-ftp"
-BR2_SVN_CO="svn co"
-BR2_SVN_UP="svn up"
-BR2_BZR_CO="bzr co"
-BR2_BZR_UP="bzr up"
+BR2_SVN="svn"
+BR2_BZR="bzr"
 BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
@@ -130,17 +124,14 @@ BR2_CONFIG_CACHE=y
 #
 BR2_TOOLCHAIN_BUILDROOT=y
 # BR2_TOOLCHAIN_EXTERNAL is not set
+# BR2_TOOLCHAIN_CTNG is not set
 
 #
 # Kernel Header Options
 #
-# 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_2_6_34 is not set
+# BR2_KERNEL_HEADERS_2_6_35 is not set
 BR2_KERNEL_HEADERS_VERSION=y
 # BR2_KERNEL_HEADERS_SNAP is not set
 BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
@@ -149,8 +140,6 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.29.6"
 #
 # uClibc Options
 #
-# 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=y
 # BR2_UCLIBC_VERSION_0_9_31 is not set
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
@@ -162,11 +151,6 @@ BR2_UCLIBC_CONFIG="$(BR2_BOARD_PATH)/uClibc-0.9.30.config.arm"
 #
 # Binutils Options
 #
-# BR2_BINUTILS_VERSION_2_17 is not set
-# BR2_BINUTILS_VERSION_2_18 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"
@@ -175,25 +159,14 @@ BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 #
 # GCC Options
 #
-# BR2_GCC_VERSION_4_1_2 is not set
-# BR2_GCC_VERSION_4_2_1 is not set
-# BR2_GCC_VERSION_4_2_2 is not set
-# BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 is not set
-# BR2_GCC_VERSION_4_2_3 is not set
 # BR2_GCC_VERSION_4_2_4 is not set
-# BR2_GCC_VERSION_4_3_2 is not set
-# BR2_GCC_VERSION_4_3_3 is not set
-# BR2_GCC_VERSION_4_3_4 is not set
+# BR2_GCC_VERSION_4_3_X is not set
 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.4"
-BR2_TOOLCHAIN_SYSROOT=y
-# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
+BR2_GCC_VERSION="4.4.5"
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
 # BR2_GCC_CROSS_FORTRAN is not set
-# BR2_INSTALL_LIBGCJ is not set
 # BR2_INSTALL_OBJC is not set
 # BR2_INSTALL_FORTRAN is not set
 BR2_GCC_SHARED_LIBGCC=y
@@ -208,15 +181,9 @@ 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_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
@@ -238,7 +205,6 @@ BR2_SOFT_FLOAT=y
 # BR2_PTHREADS_NONE is not set
 # BR2_PTHREADS is not set
 BR2_PTHREADS_OLD=y
-# BR2_PTHREADS_NATIVE is not set
 # BR2_PROGRAM_INVOCATION is not set
 BR2_GCC_CROSS_CXX=y
 BR2_INSTALL_LIBSTDCPP=y
@@ -247,20 +213,17 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 BR2_PACKAGE_SSTRIP_TARGET=y
 BR2_PACKAGE_SSTRIP_HOST=y
-BR2_ENABLE_MULTILIB=y
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 
 #
 # Package Selection for the target
 #
 BR2_PACKAGE_BUSYBOX=y
-# BR2_BUSYBOX_VERSION_1_12_X is not set
-# BR2_BUSYBOX_VERSION_1_13_X is not set
-# BR2_BUSYBOX_VERSION_1_14_X is not set
 # BR2_BUSYBOX_VERSION_1_15_X is not set
 BR2_BUSYBOX_VERSION_1_16_X=y
+# BR2_BUSYBOX_VERSION_1_17_X is not set
 # BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.16.1"
+BR2_BUSYBOX_VERSION="1.16.2"
 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
@@ -321,6 +284,7 @@ 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_FFMPEG is not set
 # BR2_PACKAGE_GSTREAMER is not set
 # BR2_PACKAGE_LIBCDAUDIO is not set
 # BR2_PACKAGE_LIBDVDREAD is not set
@@ -329,6 +293,7 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
 # BR2_PACKAGE_LIBMAD is not set
 # BR2_PACKAGE_LIBMMS is not set
 # BR2_PACKAGE_LIBMPD is not set
+# BR2_PACKAGE_LIBMPEG2 is not set
 # BR2_PACKAGE_LIBOGG is not set
 # BR2_PACKAGE_LIBSNDFILE is not set
 # BR2_PACKAGE_LIBTHEORA is not set
@@ -347,7 +312,7 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
 # Compressors and decompressors
 #
 # BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_LZMA is not set
+# BR2_PACKAGE_XZ is not set
 
 #
 # Debugging, profiling and benchmark
@@ -406,6 +371,11 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
 #
 
 #
+# Graphic applications
+#
+# BR2_PACKAGE_RRDTOOL is not set
+
+#
 # graphic libraries
 #
 # BR2_PACKAGE_ALLEGRO is not set
@@ -427,6 +397,10 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
 # other GUIs
 #
 # BR2_PACKAGE_QT is not set
+
+#
+# Qwt requires Qt to be installed
+#
 # BR2_PACKAGE_XORG7 is not set
 
 #
@@ -444,6 +418,10 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
 # BR2_PACKAGE_GOB2 is not set
 
 #
+# midori requires C++, WCHAR in toolchain and libgtk2
+#
+
+#
 # Hardware handling
 #
 # BR2_PACKAGE_CDRKIT is not set
@@ -527,6 +505,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_UDEV is not set
 # BR2_PACKAGE_URG is not set
 # BR2_PACKAGE_USB_MODESWITCH is not set
 # BR2_PACKAGE_USBMOUNT is not set
@@ -592,6 +571,7 @@ BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_JPEG is not set
 # BR2_PACKAGE_LIBART is not set
 # BR2_PACKAGE_LIBPNG is not set
+# BR2_PACKAGE_LIBSVGTINY is not set
 # BR2_PACKAGE_LIBUNGIF is not set
 # BR2_PACKAGE_MESALIB is not set
 # BR2_PACKAGE_PANGO is not set
@@ -599,6 +579,10 @@ BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_TIFF is not set
 
 #
+# webkit requires C++, WCHAR in toolchain and libgtk2
+#
+
+#
 # Hardware handling
 #
 # BR2_PACKAGE_LIBAIO is not set
@@ -607,11 +591,6 @@ BR2_PACKAGE_TSLIB=y
 # BR2_PACKAGE_LIBUSB is not set
 
 #
-# Java
-#
-# BR2_PACKAGE_CLASSPATH is not set
-
-#
 # Networking
 #
 # BR2_PACKAGE_LIBCGI is not set
@@ -637,7 +616,6 @@ BR2_PACKAGE_TSLIB=y
 # 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
 
@@ -662,7 +640,6 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
 #
 # 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
@@ -753,7 +730,6 @@ BR2_PACKAGE_PORTMAP=y
 # Package managers
 #
 # BR2_PACKAGE_IPKG is not set
-# BR2_PACKAGE_PORTAGE is not set
 
 #
 # Shell and utilities
@@ -818,97 +794,40 @@ BR2_TARGET_ROOTFS_TAR_OPTIONS=""
 #
 # Bootloaders
 #
+# BR2_TARGET_BAREBOX is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_UBOOT_VERSION).h"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_TARGET_UBOOT_VERSION).h"
 BR2_TARGET_UBOOT_1_3_4=y
+# BR2_TARGET_UBOOT_2010_06 is not set
 # 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_SILENT is not set
+# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
+BR2_TARGET_UBOOT_VERSION="1.3.4"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+# BR2_TARGET_UBOOT_FORMAT_KWB is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 BR2_TARGET_UBOOT_TOOL_ENV=y
 BR2_TARGET_UBOOT_COPYTO=""
-# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
+# BR2_TARGET_UBOOT_NETWORK is not set
+# BR2_TARGET_AT91BOOTSTRAP is not set
+# BR2_TARGET_DATAFLASHBOOT is not set
 
 #
 # Kernel
 #
-# BR2_KERNEL_none is not set
-BR2_KERNEL_LINUX_ADVANCED=y
-# BR2_KERNEL_LINUX is not set
-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.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="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_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_LINUX26_CUSTOM is not set
-
-#
-# Patches
-#
-BR2_KERNEL_ADD_KERNEL_ORG_PATCH=y
-# BR2_KERNEL_ADD_LATEST is not set
-# BR2_KERNEL_ADD_LATEST_MINORPATCH is not set
-BR2_KERNEL_ADD_MINORPATCH=y
-# BR2_KERNEL_ADD_LATEST_RC_PATCH is not set
-# 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_PATCH=y
-BR2_KERNEL_MINORLEVEL="6"
-# BR2_KERNEL_ARCH_PATCH_ENABLED is not set
-BR2_LINUX_BSP_PATCH=""
-BR2_KERNEL_...
 
[truncated message content]

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-55-g2408af1

From: Julien B a. A. <ar...@us...> - 2010-10-15 13:09:23

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  2408af11ecb290b1f66a17ab1c6a18346c9a7f51 (commit)
       via  9981262046d7862c2ea36cde5790b920d12796aa (commit)
      from  f20a4caef973f0feb6232437cd44d3f46c57eb13 (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 2408af11ecb290b1f66a17ab1c6a18346c9a7f51
Merge: 9981262046d7862c2ea36cde5790b920d12796aa f20a4caef973f0feb6232437cd44d3f46c57eb13
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Oct 15 15:08:34 2010 +0200

    Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 9981262046d7862c2ea36cde5790b920d12796aa
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Oct 15 11:52:18 2010 +0200

    [DEMOS] capture: add i.MX27 VPU support to stream captured video over IP (not fully functionnal yet)

-----------------------------------------------------------------------

Summary of changes:
 target/demos/camera/capture/Makefile    |   33 ++-
 target/demos/camera/capture/README      |    6 +-
 target/demos/camera/capture/capture.c   |  117 ++++--
 target/demos/camera/capture/rtp.c       |  288 +++++++++++++
 target/demos/camera/capture/rtp.h       |   68 +++
 target/demos/camera/capture/udp.c       |  101 +++++
 target/demos/camera/capture/udp.h       |   25 ++
 target/demos/camera/capture/vpu_codec.c |  688 +++++++++++++++++++++++++++++++
 target/demos/camera/capture/vpu_codec.h |  134 ++++++
 9 files changed, 1417 insertions(+), 43 deletions(-)
 create mode 100644 target/demos/camera/capture/rtp.c
 create mode 100644 target/demos/camera/capture/rtp.h
 create mode 100644 target/demos/camera/capture/udp.c
 create mode 100644 target/demos/camera/capture/udp.h
 create mode 100644 target/demos/camera/capture/vpu_codec.c
 create mode 100644 target/demos/camera/capture/vpu_codec.h

diff --git a/target/demos/camera/capture/Makefile b/target/demos/camera/capture/Makefile
index 20a62bc..2301316 100644
--- a/target/demos/camera/capture/Makefile
+++ b/target/demos/camera/capture/Makefile
@@ -2,26 +2,42 @@ ARMADEUS_BASE_DIR=../../../..
 -include $(ARMADEUS_BASE_DIR)/Makefile.in
 
 # Default values for local compiling:
-STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
+STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
 INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
 CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
 STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
 SDL_DIR:=$(ARMADEUS_SDL_DIR)
-CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags) -g
+CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_DIR)/sdl-config --cflags)
 
+#CFLAGS+=-Wall -g
 LDFLAGS= -lSDL -lpthread
-
-EXEC=capture
-SRC= $(wildcard *.c *.h)
+ifeq ($(VPU),yes)
+CFLAGS+=-I$(ARMADEUS_STAGING_DIR)/usr/include/ -DUSE_VPU
+LDFLAGS+= -L$(ARMADEUS_STAGING_DIR)/usr/lib/ -lvpu
+endif
+
+EXEC= capture
+SRC= capture.c
+ifeq ($(VPU),yes)
+SRC+= rtp.c udp.c vpu_codec.c
+endif
 OBJ= $(SRC:.c=.o)
 
+Q=@
+
 all: $(EXEC)
 
 $(EXEC): $(OBJ)
-	$(CC) -o $@ $^ $(LDFLAGS)
+	@echo "    LD $@"
+	$(Q)$(CC) -o $@ $^ $(LDFLAGS)
+
+capture.o: capture.c vpu_codec.h
+	@echo "    CC $@"
+	$(Q)$(CC) -o $@ -c $< $(CFLAGS)
 
-%.o: %.c
-	$(CC) -o $@ -c $< $(CFLAGS) 
+%.o: %.c %.h
+	@echo "    CC $@"
+	$(Q)$(CC) -o $@ -c $< $(CFLAGS)
 
 .PHONY: clean install
 
@@ -32,4 +48,5 @@ clean:
 install: all
 	mkdir -p $(INSTALL_DIR)
 	cp $(EXEC) $(INSTALL_DIR)
+	$(STRIP) $(INSTALL_DIR)/$(EXEC)
 
diff --git a/target/demos/camera/capture/README b/target/demos/camera/capture/README
index 53efb9c..5422084 100644
--- a/target/demos/camera/capture/README
+++ b/target/demos/camera/capture/README
@@ -1,5 +1,7 @@
 Compile me:
 * native:
-	$ make
+	$ make CC=gcc
 * cross-compilation:
-	$ make CC=/.../.../arm-linux-gcc
+	$ make
+* with i.MX27 VPU support:
+	$ make VPU=yes
diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index 84862e7..c7cb29d 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -31,11 +31,15 @@
 #include <sys/time.h>
 #include <sys/mman.h>
 #include <sys/ioctl.h>
+#include <sys/wait.h>		/* signal */
 #include <asm/types.h>          /* for videodev2.h */
 
 #include <linux/videodev2.h>
 #include <SDL/SDL.h>		/* TODO: make it compatible with Framebuffer only */
 
+#ifdef USE_VPU
+#include "vpu_codec.h"
+#endif
 
 #define CLEAR(x) memset (&(x), 0, sizeof (x))
 
@@ -52,8 +56,9 @@ typedef enum {
 } io_method;
 
 struct buffer {
-        void *                  start;
-        size_t                  length;
+        void   *start;
+        size_t length;
+	size_t offset;
 };
 
 static char *           dev_name        = NULL;
@@ -61,6 +66,7 @@ static io_method	io		= IO_METHOD_MMAP;
 static int              fd              = -1;
 struct buffer *         buffers         = NULL;
 static unsigned int     n_buffers       = 0;
+int g_use_codec = 0;
 
 SDL_Surface *screen = NULL, *image = NULL;
 
@@ -140,7 +146,7 @@ static Uint16 inline YUV2B(int Y, int U, int V)
 
 	return B;
 }
-
+#if 0
 static void yuv422_to_greyscale(void *yuv, int size, void *grey)
 {
 	unsigned int Y, Y2, yuv32;
@@ -159,7 +165,7 @@ static void yuv422_to_greyscale(void *yuv, int size, void *grey)
 		*(dest++) = (Uint8)Y2;
 	}
 }
-
+#endif
 static void yuv422_to_rgb565(void *yuv, int size, void *rgb)
 {
 	unsigned int Y, Y2, U, V, yuv32, rgb32;
@@ -294,7 +300,12 @@ static int read_frame(void)
 
                 assert (buf.index < n_buffers);
 
-	        process_image(buffers[buf.index].start, buf.length);
+#ifdef USE_VPU
+		if (g_use_codec)
+			vpu_codec_encode_next_frame(buffers[buf.index].offset, buffers[buf.index].start);
+#endif
+// 		else
+		process_image(buffers[buf.index].start, buf.length);
 
 		if (-1 == xioctl(fd, VIDIOC_QBUF, &buf))
 			errno_exit("VIDIOC_QBUF");
@@ -340,9 +351,11 @@ static int read_frame(void)
 	return 1;
 }
 
+static int go_on = 1;
+static int pause_capture = 0;
+
 static void mainloop(void)
 {
-	int go_on = 1;
 	SDL_Event event;
 
         while (go_on) {
@@ -372,7 +385,7 @@ static void mainloop(void)
                                 exit (EXIT_FAILURE);
                         }
 
-			if (read_frame ())
+			if (read_frame())
                     		break;
 	
 			/* EAGAIN - continue select loop. */
@@ -385,7 +398,8 @@ static void mainloop(void)
 					go_on = 0;
 			}
 		}
-// 		SDL_Delay(200);
+		while (pause_capture)
+			SDL_Delay(500);
         }
 }
 
@@ -553,13 +567,14 @@ static void init_mmap(void)
                         errno_exit ("VIDIOC_QUERYBUF");
 
                 buffers[n_buffers].length = buf.length;
+		buffers[n_buffers].offset = (size_t) buf.m.offset;
                 buffers[n_buffers].start =
                         mmap (NULL /* start anywhere */,
                               buf.length,
                               PROT_READ | PROT_WRITE /* required */,
                               MAP_SHARED /* recommended */,
                               fd, buf.m.offset);
-
+		/*printf("### start= 0x%08x offset=0x%08x\n", (unsigned int)(buffers[n_buffers].start), buffers[n_buffers].offset);*/
                 if (MAP_FAILED == buffers[n_buffers].start)
                         errno_exit ("mmap");
         }
@@ -653,7 +668,7 @@ static Uint32 get_a_supported_pix_fmt(void)
 	return 0;
 }
 
-static void init_device(unsigned int capt_width, unsigned int capt_height)
+static void init_capture_device(unsigned int capt_width, unsigned int capt_height)
 {
         struct v4l2_capability cap;
         struct v4l2_cropcap cropcap;
@@ -783,7 +798,7 @@ static void close_device(void)
         fd = -1;
 }
 
-static void open_device(void)
+static void open_capture_device(void)
 {
         struct stat st; 
 
@@ -809,20 +824,21 @@ static void open_device(void)
 
 static void usage(FILE *fp, int argc, char **argv)
 {
-        fprintf (fp,
-                 "Usage: %s [options]\n\n"
-                 "Options:\n"
-                 "-d | --device name   Video device name [/dev/video0]\n"
-                 "-h | --help          Print this message\n"
-                 "-m | --mmap          Use memory mapped buffers\n"
-                 "-r | --read          Use read() calls\n"
-                 "-u | --userp         Use application allocated buffers\n"
-                 "--width W            Use W as screen width (instead of %d)\n"
-                 "--height H           Use H as screen height (instead of %d)\n"
-                 "--camwidth W         Use W as camera picture width (instead of %d)\n"
-                 "--camheight H        Use H as camera picture height (instead of %d)\n"
-                 "",
-		 argv[0], SCREEN_WIDTH, SCREEN_HEIGHT, CAM_WIDTH, CAM_HEIGHT);
+	fprintf (fp,
+		"Usage: %s [options]\n\n"
+		"Options:\n"
+		"-d | --device name   Video device name [/dev/video0]\n"
+		"-h | --help          Print this message\n"
+		"-m | --mmap          Use memory mapped buffers\n"
+		"-r | --read          Use read() calls\n"
+		"-u | --userp         Use application allocated buffers\n"
+		"--width W            Use W as screen width (instead of %d)\n"
+		"--height H           Use H as screen height (instead of %d)\n"
+		"--cam_width W         Use W as camera picture width (instead of %d)\n"
+		"--cam_height H        Use H as camera picture height (instead of %d)\n"
+		"--use_vpu            Uses processor VPU to encode video (at camera size)\n"
+		"",
+		argv[0], SCREEN_WIDTH, SCREEN_HEIGHT, CAM_WIDTH, CAM_HEIGHT);
 }
 
 static const char short_options [] = "d:hmruwt";
@@ -835,11 +851,28 @@ static const struct option long_options [] = {
 	{ "userp",	no_argument,		NULL,	'u' },
 	{ "width",	required_argument,	NULL,	'w' },
 	{ "height",	required_argument,	NULL,	't' },
-	{ "camwidth",	required_argument,	NULL,	'y' },
-	{ "camheight",	required_argument,	NULL,	'z' },
+	{ "cam_width",	required_argument,	NULL,	'y' },
+	{ "cam_height",	required_argument,	NULL,	'z' },
+	{ "use_vpu",	no_argument,		NULL,	'v' },
 	{ 0, 0, 0, 0 }
 };
 
+static void signal_handler(int signal)
+{
+	printf("Caught signal %d\n", signal);
+	if (signal == SIGINT)
+		go_on = 0;
+
+	if (signal == SIGUSR1) {
+		printf("Starting capture\n");
+		pause_capture = 0;
+	}
+	if (signal == SIGUSR2) {
+		printf("Stopping capture\n");
+		pause_capture = 1;
+	}
+}
+
 int main(int argc, char **argv)
 {
 	int ret = EXIT_SUCCESS;
@@ -851,6 +884,12 @@ int main(int argc, char **argv)
         dev_name = "/dev/video0";
 
 	atexit(SDL_Quit);
+
+	/* Do something when following signals are called */
+	signal(SIGINT, signal_handler);
+	signal(SIGUSR1, signal_handler);
+	signal(SIGUSR2, signal_handler);
+
         for (;;) {
                 int index;
                 int c;
@@ -886,6 +925,10 @@ int main(int argc, char **argv)
                         io = IO_METHOD_USERPTR;
 			break;
 
+		case 'v':
+			g_use_codec = 1;
+			break;
+
 		case 'w':
 			width = atoi(optarg);
 			break;
@@ -908,10 +951,8 @@ int main(int argc, char **argv)
                 }
         }
 
-	open_device();
 	camwidth = camwidth > width ? width : camwidth;
 	camheight = camheight > height ? height : camheight;
-	init_device(camwidth, camheight);
 
 	if (SDL_Init(SDL_INIT_VIDEO) < 0) {
 		fprintf(stderr, "Unable to init SDL: %s\n", SDL_GetError());
@@ -927,13 +968,23 @@ int main(int argc, char **argv)
 		ret = EXIT_FAILURE;
 		goto the_end;
 	}
+#ifdef USE_VPU
+	if (g_use_codec)
+		vpu_codec_init(2, camwidth, camheight, 0 /* bitrate */, 2);
+#endif
+
+	open_capture_device();
+	init_capture_device(camwidth, camheight);
 
 	image = SDL_CreateRGBSurface(/*SDL_HWSURFACE*/0, mycamera.width, mycamera.height, 16, 0, 0, 0, 0);
 // 	printf("image fmt: RGB%d%d%d\n", image->format->Rshift, image->format->Gshift, image->format->Bshift);
-
-        start_capturing();
-        mainloop();
-        stop_capturing();
+	start_capturing();
+	mainloop();
+#ifdef USE_VPU
+	if (g_use_codec)
+		vpu_SystemShutdown();
+#endif
+	stop_capturing();
 
 the_end:
 	uninit_device();
diff --git a/target/demos/camera/capture/rtp.c b/target/demos/camera/capture/rtp.c
new file mode 100644
index 0000000..15666d3
--- /dev/null
+++ b/target/demos/camera/capture/rtp.c
@@ -0,0 +1,288 @@
+/*
+ * Implements H.264 streaming over RTP (RFC 3984)
+ *
+ * Copyright (c) 2009-2010, Armadeus Systems.
+ *
+ * Based on source code which is:
+ * Copyright 2004-2006 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * Copyright (c) 2006, Chips & Media.  All rights reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <memory.h>
+#include <sys/time.h>
+#include <errno.h>
+
+#include "udp.h"
+#include "rtp.h"
+
+/* RTP Flags MSB: */
+#define RTP_VER		(2 << 6)
+#define RTP_PAD		(1 << 5)
+#define RTP_EXT		(1 << 4)
+#define RTP_CC(count)	((count) << 0)
+/* RTP Flags LSB: */
+#define RTP_MRK		(1 << 7)
+#define RTP_TYP(typ)	((typ) << 0)
+
+
+typedef struct {
+	unsigned char flag_msb;
+	unsigned char flag_lsb;
+	unsigned short seq;
+	unsigned int time;
+	unsigned int ssrc;
+} __attribute__((packed)) rtph_t;
+
+
+int rtp_init(rtp_t * t, int bufsize)
+{
+	rtph_t *h;
+	int rt;
+
+	if (t->size < 4 || t->clock < 1000) {
+		return -2;
+	}
+
+	rt = t->size + sizeof(rtph_t);
+	t->rxbuf = calloc(2, rt);
+	if (!t->rxbuf) {
+		return -1;
+	}
+	t->txbuf = t->rxbuf + rt;
+	h = (rtph_t *) t->txbuf;
+	h->flag_msb = RTP_VER;
+	h->flag_lsb = RTP_TYP(t->type);
+
+	t->sock = udp_open(t->port, t->ip, &t->to);
+	if (t->sock < 0) {
+		free(t->rxbuf);
+		return -3;
+	}
+
+	if (bufsize > 0) {
+		bufsize *= rt;
+		setsockopt(t->sock, SOL_SOCKET, SO_RCVBUF, &bufsize, 4);
+	}
+
+	return 0;
+}
+
+int rtp_exit(rtp_t * t)
+{
+	free(t->rxbuf);
+	close(t->sock);
+	return 0;
+}
+
+#define chk_gen(buf, len)	0
+
+extern int g_state;
+
+static inline int min(int a, int b)
+{
+	if (a < b)
+		return a;
+	else
+		return b;
+}
+
+#define DEBUG(fmt, args...) do { ; } while (0)
+
+#define IS_ACCESS_UNIT(x) (((x) > 0x00) && ((x) < 0x06))
+
+int rtp_tx(rtp_t * t, char *buf, int len)
+{
+	rtph_t *h;
+	int tlen, hlen;
+	int rt;
+	struct timeval tv;
+	static unsigned short seq_num = 0;
+	int nal_type, mtu;
+	unsigned char nal_header;
+	unsigned char* payload;
+	int start, end;
+
+	h = (rtph_t *) t->txbuf;
+	h->flag_lsb &= ~RTP_MRK;
+	gettimeofday(&tv, 0);
+	h->time = htonl(((tv.tv_sec * 1000000) + tv.tv_usec)/10); /* important ? */
+	hlen = t->size;
+
+	/* Here we receive NALU one by one from codec,
+	   with 0x00000001 header, so skip it */
+	buf += 4;
+	len -= 4;
+
+	nal_type = buf[0] & 0x1f;
+	DEBUG("--- Processing packet with NAL type=%d\n", nal_type);
+	mtu = t->size;
+	if (len < mtu) {
+		DEBUG("NAL Unit fit in one packet datasize=%d mtu=%d\n", len, mtu);
+		memcpy(h + 1, buf, hlen);
+		rt = len + sizeof(rtph_t);
+		rt = sendto(t->sock, h, rt, 0,
+			    (struct sockaddr *)&t->to, sizeof(t->to));
+		if (rt < 0) {
+			printf("%s: rtp_tx err %d %d\n", t->name, rt, errno);
+			return rt;
+		}
+
+		seq_num++;
+		h->seq = htons(seq_num);
+		return len;
+	} else {
+		/* Divide NALU according to Fragmentation Unit A spec */
+		DEBUG("NAL Unit DOES NOT fit in one packet datasize=%d mtu=%d\n", len, mtu);
+		/* We keep 2 bytes for FU indicator and FU Header */
+		hlen -= 2;
+		start = 1;
+		end = 0;
+		/* skip NAL header in first frame as it will be reconstructed */
+		nal_header = *buf;
+		buf++;
+		len--;
+		for (tlen = 0; len > 0; tlen += hlen) {
+			if (len <= t->size) {
+				hlen = len;
+				h->flag_lsb |= RTP_MRK;
+				end = 1;
+				DEBUG("Last ");
+			}
+			payload = (unsigned char*)(h+1);
+			/* FU indicator (FU-A) */
+			payload[0] = (nal_header & 0x60) | 28;
+			/* FU Header */
+			payload[1] = (start << 7) | (end << 6) | (nal_header & 0x1f);
+			memcpy(&payload[2], buf, hlen);
+
+			rt = min((len+2), t->size) + sizeof(rtph_t);
+			rt = sendto(t->sock, h, rt, 0,
+				(struct sockaddr *)&t->to, sizeof(t->to));
+			if (rt < 0) {
+				printf("%s: rtp_tx err %d %d\n", t->name, rt, errno);
+				return rt;
+			}
+			DEBUG("Packet 0x%04x of %d bytes sent (%02x %02x %02x)\n", seq_num, rt,
+				buf[0], buf[1], buf[2]);
+	
+			seq_num++;
+			h->seq = htons(seq_num);
+			buf += hlen;
+			len -= hlen;
+			start = 0;
+		}
+		return tlen;
+	}
+}
+
+int rtp_rx(rtp_t * t, char *buf, int len)
+{
+	rtph_t *h;
+	int tlen;
+	int rt;
+	unsigned short seq;
+
+	tlen = 0;
+	h = (rtph_t *) t->rxbuf;
+	seq = h->seq;
+	do {
+		int slen;
+
+		slen = sizeof(t->to);
+		rt = recvfrom(t->sock, h, t->size + sizeof(rtph_t),MSG_WAITALL, (struct sockaddr *)&t->to, (unsigned int *)&slen);
+		if (rt < 0) {
+			printf("%s: rtp_rx err %d\n", t->name, rt);
+			return rt;
+		}
+		if (!rt) {
+			printf("%s: rtp_rx warn 0-size-pkt\n", t->name);
+			t->err++;
+			continue;
+		}
+
+		rt = chk_gen((char *)h, t->size + sizeof(rtph_t));
+		if (rt) {
+			t->err++;
+//		      lp_skip:
+			h->flag_lsb &= ~RTP_MRK;
+			continue;
+		}
+
+		if (seq != h->seq) {
+			t->skip++;
+			/* skip remaining frags of pkt */
+			while (!(h->flag_lsb & RTP_MRK)) {
+				slen = sizeof(t->to);
+				rt = recvfrom(t->sock, h,t->size + sizeof(rtph_t),MSG_WAITALL,(struct sockaddr *)&t->to,(unsigned int *)&slen);
+				if (rt < 0) 
+				{
+					return rt;
+				}
+				rt = chk_gen((char *)h,
+					     t->size + sizeof(rtph_t));
+				if (rt) {
+					printf("%s: rtp_rx(skip) warn pkt "
+					       "corrupt chk=%02X\n",
+					       t->name, rt);
+					h->flag_lsb &= ~RTP_MRK;
+					t->err++;
+				} else {
+					t->skip++;
+				}
+			}
+			tlen = 0;
+			h->flag_lsb &= ~RTP_MRK;
+			h->seq++;
+			tlen = 0;	/* discard previous frags of pkt */
+			seq = h->seq;
+			continue;
+		}
+
+		h->seq++;
+		seq = h->seq;
+		if (tlen > len) {
+			/* more data to read */
+			printf("%s: rtp_rx warn size %d < %d\n",
+			       t->name, len, tlen);
+			return tlen;
+		}
+	}
+	while (!(h->flag_lsb & RTP_MRK));
+	return tlen;
+}
+
+rtp_t* rtp_session_open()
+{
+	rtp_t *rtp = (rtp_t *) malloc(sizeof(rtp_t));
+	memset(rtp, 0, sizeof(rtp_t));
+	rtp->name = "rec";
+	rtp->ip = RTP_ADDRESS;
+	rtp->port = RTP_PORT;
+	rtp->type = RTP_TYPE_DYNAMIC;
+	rtp->size = 512;
+	rtp->clock = 1000000;
+	rtp_init(rtp, 0);
+	return rtp;
+}
+
+void rtp_send(char *packet, int size)
+{
+	static rtp_t* rtp_session = NULL;
+	if (rtp_session==NULL) 
+		rtp_session = rtp_session_open();
+	rtp_tx(rtp_session, packet, size);
+}
+
diff --git a/target/demos/camera/capture/rtp.h b/target/demos/camera/capture/rtp.h
new file mode 100644
index 0000000..d745132
--- /dev/null
+++ b/target/demos/camera/capture/rtp.h
@@ -0,0 +1,68 @@
+/*
+ * Implements H.264 streaming over RTP (RFC 3984)
+ *
+ * Copyright (c) 2009-2010, Armadeus Systems.
+ *
+ * Based on source code which is:
+ * Copyright 2004-2006 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * Copyright (c) 2006, Chips & Media.  All rights reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#ifndef _RTP_H
+#define _RTP_H
+
+#include "udp.h"
+
+#define RTP_TYPE_ULAW		0
+#define RTP_TYPE_ALAW		8
+#define RTP_TYPE_L16S44		10
+#define RTP_TYPE_L16M44		11
+#define RTP_TYPE_H263		34
+#define RTP_TYPE_DYNAMIC	96
+
+#define RTP_PORT 6666
+#define RTP_ADDRESS "192.168.0.2"
+
+typedef struct {
+	char *name;		/* local session id */
+	char *ip;		/* server ip */
+	short port;		/* server port */
+	unsigned short size;	/* rtp frame size */
+	unsigned char type;	/* RTP_TYPE_xxx */
+	int clock;		/* RTP clock rate */
+
+	/* stats */
+	unsigned int err;	/* #corrupted pkts */
+	unsigned int skip;	/* #out of seq skipped */
+
+	/* reserved - zeroed */
+	struct sockaddr_in to;
+	int sock;
+	char *rxbuf;
+	char *txbuf;
+} rtp_t;
+
+/*
+ 	bufsize is in # of RTP pkts to buffer in rx (to cut delays)
+	0 - default socket buffer size
+*/
+/*int rtp_init(rtp_t *, int bufsize);
+int rtp_tx(rtp_t *, char *buf, int len);
+int rtp_rx(rtp_t *, char *buf, int len);
+int rtp_exit(rtp_t *);
+*/
+
+rtp_t* rtp_session_open();
+void rtp_send(char *packet, int size);
+
+#endif
diff --git a/target/demos/camera/capture/udp.c b/target/demos/camera/capture/udp.c
new file mode 100644
index 0000000..c43d8dc
--- /dev/null
+++ b/target/demos/camera/capture/udp.c
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2004-2006 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * Copyright (c) 2006, Chips & Media.  All rights reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+
+/*
+ * port		server port#
+ * addr		NULL -> this is the server, else server INADDR for client
+ * taddr2	address returned for use in sendto by client
+ */
+int udp_open(int port, char *addr, struct sockaddr_in *taddr2)
+{
+	int rt;
+	int fd;
+	struct sockaddr_in taddr;
+
+	fd = socket(PF_INET, SOCK_DGRAM, 0);
+	if (fd == -1) {
+		return -1;
+	}
+
+	if (addr) {
+		taddr2->sin_family = AF_INET;
+		taddr2->sin_port = htons(port);
+		taddr2->sin_addr.s_addr = inet_addr(addr);
+		port = 0;
+	}
+
+	taddr.sin_family = AF_INET;
+	taddr.sin_port = htons(port);
+	taddr.sin_addr.s_addr = htonl(INADDR_ANY);
+	rt = bind(fd, (struct sockaddr *)&taddr, sizeof(taddr));
+	if (rt) {
+		close(fd);
+		return -2;
+	}
+
+	return fd;
+}
+
+//#define TEST
+#ifdef TEST
+#include <stdio.h>
+
+int main(void)
+{
+	struct sockaddr_in	taddr;
+	char	buf[1024];
+	int	h, h2;
+	int	len;
+	int	pid;
+
+	h = udp_open(6666, 0, &taddr);
+	if (h < 0)
+	{
+		printf("open failed\n");
+		return 1;
+	}
+	pid = fork();
+	if (!pid)
+	{
+		sleep(1);
+		h2 = udp_open(6666, "127.0.0.1", &taddr);
+		if (h2 < 0)
+		{
+			printf("open failed\n");
+			return 1;
+		}
+		strcpy(buf, "hello\n");
+		len = sendto(h2, buf, sizeof(buf), 0, (struct sockaddr*)&taddr, sizeof(taddr));
+		printf("sent %d bytes\n", len);
+		close(h2);
+	}
+	else
+	{
+		len = sizeof(taddr);
+		len = recvfrom(h, buf, sizeof(buf), 0, 
+				(struct sockaddr *)&taddr, &len);
+		printf("rx-ed %d bytes\n", len);
+		printf(buf);
+	}
+	close(h);
+	return 0;
+}
+#endif
diff --git a/target/demos/camera/capture/udp.h b/target/demos/camera/capture/udp.h
new file mode 100644
index 0000000..32cd211
--- /dev/null
+++ b/target/demos/camera/capture/udp.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2004-2006 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * Copyright (c) 2006, Chips & Media.  All rights reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#ifndef _UDP_H
+#define _UDP_H
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+int udp_open(int port, char *addr, struct sockaddr_in *);
+
+#endif
diff --git a/target/demos/camera/capture/vpu_codec.c b/target/demos/camera/capture/vpu_codec.c
new file mode 100644
index 0000000..4c6166f
--- /dev/null
+++ b/target/demos/camera/capture/vpu_codec.c
@@ -0,0 +1,688 @@
+/*
+ * Copyright 2004-2006 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * Copyright (c) 2006, Chips & Media.  All rights reserved.
+ *
+ * Copyright (c) 2010, Armadeus Systems.  All rights reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/*!
+ * @file vpu_codec.h
+ *
+ * @brief This file implement codec application.
+ *
+ * @ingroup VPU
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <string.h>
+#include <signal.h>
+#include <sys/time.h>
+#include <linux/videodev.h>
+
+#include "rtp.h"
+/*#include "vpu_voip_test.h"
+#include "vpu_display.h"
+#include "vpu_capture.h"*/
+#include "vpu_io.h"
+#include "vpu_lib.h"
+
+#include "vpu_codec.h"
+
+
+typedef struct {
+	int Index;
+	int AddrY;
+	int AddrCb;
+	int AddrCr;
+	int StrideY;
+	int StrideC;		/* Stride Cb/Cr */
+
+	int DispY;		/* DispY is the page aligned AddrY */
+	int DispCb;		/* DispCb is the page aligned AddrCb */
+	int DispCr;
+	vpu_mem_desc CurrImage;	/* Current memory descriptor for user space */
+} FRAME_BUF;
+
+// extern struct codec_file multi_yuv[MAX_NUM_INSTANCE];
+/******  Timing Stuff Begin******/
+typedef enum evType_t {
+	DEC_READ = 1,
+	DEC_RD_OVER,
+	DEC_START,
+	DEC_STOP,
+	DEC_OUT,
+	DEC_OUT_OVER,
+	ENC_READ,
+	ENC_RD_OVER,
+	ENC_START,
+	ENC_STOP,
+	ENC_OUT,
+	ENC_OUT_OVER,
+	TEST_BEGIN,
+	TEST_END,
+
+} evType;
+
+#define MEASURE_COUNT 3000
+
+typedef struct time_rec {
+	evType tag;
+	struct timeval tval;
+} time_rec_t;
+
+time_rec_t time_rec_vector[MEASURE_COUNT + 1];
+
+static unsigned long iter;
+
+unsigned int enc_core_time;
+unsigned int enc_core_time_max;
+unsigned int enc_core_time_min = 100000;
+unsigned int enc_idle_time;
+unsigned int enc_idle_time_max;
+unsigned int enc_idle_time_min = 100000;
+
+unsigned int dec_core_time;
+unsigned int dec_core_time_max;
+unsigned int dec_core_time_min = 100000;
+unsigned int dec_idle_time;
+unsigned int dec_idle_time_max;
+unsigned int dec_idle_time_min = 100000;
+
+unsigned int ttl_time = 0;
+
+#define	DIFF_TIME_TV_SEC(i, j)	\
+	(time_rec_vector[i].tval.tv_sec - time_rec_vector[j].tval.tv_sec)
+#define	DIFF_TIME_TV_USEC(i, j)	\
+	(time_rec_vector[i].tval.tv_usec - time_rec_vector[j].tval.tv_usec)
+#define DIFF_TIME_US(i, j) (DIFF_TIME_TV_SEC(i, j) * 1000000 + DIFF_TIME_TV_USEC(i, j))
+
+void timer(evType tag)
+{
+	if (iter >= MEASURE_COUNT)
+		return;
+
+	struct timeval tval;
+	gettimeofday(&tval, NULL);
+	time_rec_vector[iter].tag = tag;
+	time_rec_vector[iter].tval = tval;
+	iter++;
+}
+
+/******  Timing Stuff End******/
+
+// extern struct codec_file multi_bitstream[MAX_NUM_INSTANCE];
+#define EOSCHECK_APISCHEME
+
+int quitflag = 0;
+
+typedef struct codec_info {
+	CodecInst handle;
+	FRAME_BUF *FbPool;
+	int FbNumber;
+	vpu_mem_desc bitstream_buf;
+} codec_info;
+
+static struct codec_info enc_info;
+
+// static pthread_mutex_t codec_mutex;
+#ifdef INT_CALLBACK
+static pthread_mutex_t vpu_busy_mutex;
+static pthread_cond_t current_job_cond;
+#endif
+
+extern sigset_t mask;
+
+/* FrameBuffer is a round-robin buffer for Current buffer and reference */
+int FrameBufferInit(int strideY, int height,
+		    FRAME_BUF * FrameBuf, int FrameNumber)
+{
+	int i;
+
+	for (i = 0; i < FrameNumber; i++) {
+		memset(&(FrameBuf[i].CurrImage), 0, sizeof(vpu_mem_desc));
+		FrameBuf[i].CurrImage.size = (strideY * height * 3 / 2);
+		IOGetPhyMem(&(FrameBuf[i].CurrImage));
+		if (FrameBuf[i].CurrImage.phy_addr == 0) {
+			int j;
+			for (j = 0; j < i; j++) {
+				IOFreeVirtMem(&(FrameBuf[j].CurrImage));
+				IOFreePhyMem(&(FrameBuf[j].CurrImage));
+			}
+			printf("No enough mem for framebuffer!\n");
+			return -1;
+		}
+		FrameBuf[i].Index = i;
+		FrameBuf[i].AddrY = FrameBuf[i].CurrImage.phy_addr;
+		FrameBuf[i].AddrCb = FrameBuf[i].AddrY + strideY * height;
+		FrameBuf[i].AddrCr =
+		    FrameBuf[i].AddrCb + strideY / 2 * height / 2;
+		FrameBuf[i].StrideY = strideY;
+		FrameBuf[i].StrideC = strideY / 2;
+		FrameBuf[i].DispY = FrameBuf[i].AddrY;
+		FrameBuf[i].DispCb = FrameBuf[i].AddrCb;
+		FrameBuf[i].DispCr = FrameBuf[i].AddrCr;
+		FrameBuf[i].CurrImage.virt_uaddr =
+		    IOGetVirtMem(&(FrameBuf[i].CurrImage));
+	}
+	return 0;
+}
+
+void FrameBufferFree(FRAME_BUF * FrameBuf, int FrameNumber)
+{
+	int i;
+	for (i = 0; i < FrameNumber; i++) {
+		IOFreeVirtMem(&(FrameBuf[i].CurrImage));
+		IOFreePhyMem(&(FrameBuf[i].CurrImage));
+	}
+	return;
+}
+
+FRAME_BUF *GetFrameBuffer(int index, FRAME_BUF * FrameBuf)
+{
+	return &FrameBuf[index];
+}
+
+int GetFrameBufIndex(FRAME_BUF ** bufPool, int poolSize, FrameBuffer * frame)
+{
+	int i;
+
+	for (i = 0; i < poolSize; ++i) {
+		if ((*bufPool)->AddrY == frame->bufY) {
+			return i;
+		}
+		bufPool++;
+	}
+	return i;
+}
+
+#ifdef INT_CALLBACK
+void vpu_test_callback(int status)
+{
+#if 1
+	if (status & IRQ_PIC_RUN) {
+#else
+	if ((status & IRQ_PIC_RUN) || (status & IRQ_DEC_BUF_EMPTY)) {
+#endif
+		pthread_mutex_lock(&vpu_busy_mutex);
+		pthread_cond_signal(&current_job_cond);
+		pthread_mutex_unlock(&vpu_busy_mutex);
+	}
+
+	return;
+}
+#endif
+
+static int vpu_SystemInit(void)
+{
+	int ret = -1;
+// 	pthread_mutex_init(&codec_mutex, NULL);
+#ifdef INT_CALLBACK
+	pthread_mutex_init(&vpu_busy_mutex, NULL);
+	pthread_cond_init(&current_job_cond, NULL);
+
+	ret = IOSystemInit((void *)(vpu_test_callback));
+#else
+	ret = IOSystemInit(NULL);
+#endif
+	if (ret < 0) {
+		printf("IO system init failed!\n");
+		return -1;
+	}
+	return ret;
+}
+
+int vpu_SystemShutdown(void)
+{
+	if (enc_info.FbNumber) {
+		vpu_EncClose(&(enc_info.handle));
+		FrameBufferFree(enc_info.FbPool, enc_info.FbNumber);
+		IOFreeVirtMem(&(enc_info.bitstream_buf));
+		IOFreePhyMem(&(enc_info.bitstream_buf));
+		memset(&enc_info, 0, sizeof(struct codec_info));
+	}
+	IOSystemShutdown();
+// 	PrintTimingData();
+	DPRINTF("file close end\n");
+
+	return 0;
+}
+
+static void set_encoder_opening_parameters(EncOpenParam * enc_op_params, vpu_mem_desc *bit_stream_buf,
+					int mode, int width, int height, int bitrate)
+{
+	enc_op_params->bitstreamBuffer = bit_stream_buf->phy_addr;
+	enc_op_params->bitstreamBufferSize = bit_stream_buf->size;
+	enc_op_params->bitstreamFormat = mode;
+	enc_op_params->picWidth = width;
+	enc_op_params->picHeight = height;
+	enc_op_params->frameRateInfo = 15;
+	enc_op_params->bitRate = bitrate;
+	enc_op_params->initialDelay = 0;
+	enc_op_params->vbvBufferSize = 0;	/* 0 = ignore 8 */
+	enc_op_params->enableAutoSkip = 0;
+	enc_op_params->gopSize = 0;	/* only first picture is I */
+	enc_op_params->slicemode.sliceMode = 0;	/* 1 slice per picture */
+	enc_op_params->slicemode.sliceSizeMode = 0;
+	enc_op_params->slicemode.sliceSize = 4000;	/* not used if sliceMode is 0 */
+	enc_op_params->intraRefresh = 0;
+	enc_op_params->sliceReport = 0;
+	enc_op_params->mbReport = 0;
+	enc_op_params->mbQpReport = 0;
+	enc_op_params->rcIntraQp = -1;
+	enc_op_params->ringBufferEnable = 0;
+	enc_op_params->dynamicAllocEnable = 0;
+
+	if (mode == STD_MPEG4) {
+		enc_op_params->EncStdParam.mp4Param.mp4_dataPartitionEnable = 0;
+		enc_op_params->EncStdParam.mp4Param.mp4_reversibleVlcEnable = 0;
+		enc_op_params->EncStdParam.mp4Param.mp4_intraDcVlcThr = 0;
+		enc_op_params->EncStdParam.mp4Param.mp4_hecEnable = 0;
+		enc_op_params->EncStdParam.mp4Param.mp4_verid = 2;
+	} else if (mode == STD_H263) {
+		enc_op_params->EncStdParam.h263Param.h263_annexJEnable = 0;
+		enc_op_params->EncStdParam.h263Param.h263_annexKEnable = 0;
+		enc_op_params->EncStdParam.h263Param.h263_annexTEnable = 0;
+	} else if (mode == STD_AVC){
+		enc_op_params->EncStdParam.avcParam.avc_constrainedIntraPredFlag = 0;
+		enc_op_params->EncStdParam.avcParam.avc_disableDeblk = 0;
+		enc_op_params->EncStdParam.avcParam.avc_deblkFilterOffsetAlpha = 0;
+		enc_op_params->EncStdParam.avcParam.avc_deblkFilterOffsetBeta = 0;
+		enc_op_params->EncStdParam.avcParam.avc_chromaQpOffset = 0;
+		enc_op_params->EncStdParam.avcParam.avc_audEnable = 0;
+		/* FMO(Flexible macroblock ordering) support */
+		enc_op_params->EncStdParam.avcParam.avc_fmoEnable = 0;
+		enc_op_params->EncStdParam.avcParam.avc_fmoType = 0; /* 0 - interleaved, or 1 - dispersed */
+		enc_op_params->EncStdParam.avcParam.avc_fmoSliceNum = 2;
+	} else {
+		printf("Encoder: Invalid codec standard mode \n");
+// 		return NULL;
+	}
+}
+
+int gdest = PATH_NET;
+
+static void export_bitstream(char *packet, int size)
+{
+	if (gdest & PATH_NET) {
+		rtp_send(packet, size);
+	}
+}
+
+void vpu_codec_stop(void)
+{
+	quitflag = 1;
+}
+
+void vpu_codec_pause(void)
+{
+	quitflag = 0; /* TBDL */
+}
+
+
+EncHandle handle = { 0 };
+EncOpenParam encOP = { 0 };
+EncParam encParam = { 0 };
+EncHeaderParam encHeaderParam = { 0 };
+EncOutputInfo outputInfo = { 0 };
+
+int virt_bit_stream_buf;
+vpu_mem_desc bit_stream_buf;
+
+	FrameBuffer frameBuf[NUM_FRAME_BUF];
+	FRAME_BUF FrameBufPool[MAX_FRAME];
+
+int frame_index;
+	int srcFrameIdx;
+int image_size;
+int g_initialized = 0;
+
+
+/* for this test, only 1 reference */ /* no rotation */
+int vpu_codec_init(int mode, int picWidth, int picHeight, int bitRate, Uint32 dest)
+{
+	EncInitialInfo initialInfo = { 0 };
+	SearchRamParam searchPa = { 0 };
+	RetCode ret = RETCODE_SUCCESS;
+	int EXTRA_FB = 1;
+	int stride = 0;
+	Uint32 framebufWidth = 0, framebufHeight = 0;
+	FRAME_BUF *pFrame[NUM_FRAME_BUF];
+	int i;
+	struct v4l2_buffer prp_buffer;
+
+	image_size = picWidth * picHeight; /* in pixels */
+
+	memset(&encParam, 0, sizeof(EncParam));
+	memset(&encHeaderParam, 0, sizeof(EncHeaderParam));
+	memset(&handle, 0, sizeof(EncHandle));
+	memset(&encOP, 0, sizeof(EncOpenParam));
+	memset(&outputInfo, 0, sizeof(EncOutputInfo));
+
+	ret = vpu_SystemInit();
+	if (ret < 0)
+		return ret;
+
+	switch (mode) {
+	case STD_MPEG4:
+		DPRINTF("Enc mode: MPEG4\n");
+		break;
+	case STD_H263:
+		DPRINTF("Enc mode: H.263\n");
+		break;
+	case STD_AVC:
+		DPRINTF("Enc mode: H.264\n");
+		break;
+	default:
+		printf("Unknown Enc mode\n");
+		return -1;
+	}
+	DPRINTF("width %d, height %d, bitrate %d Kbps\n", picWidth, picHeight, bitRate);
+
+	memset(&enc_info, 0, sizeof(struct codec_info));
+
+	/* allocate the bitstream/output buffer */
+	memset(&bit_stream_buf, 0, sizeof(vpu_mem_desc));
+	bit_stream_buf.size = STREAM_BUF_SIZE;
+	IOGetPhyMem(&bit_stream_buf);
+	virt_bit_stream_buf = IOGetVirtMem(&bit_stream_buf);
+
+	/* framebufWidth and framebufHeight must be a multiple of 16 */
+	framebufWidth = ((picWidth + 15) & ~15);  	
+	framebufHeight = ((picHeight + 15) & ~15);
+
+	/* set Encoder start/opening Parameters */
+	set_encoder_opening_parameters(&encOP, &bit_stream_buf, mode, picWidth, picHeight, bitRate);
+
+	ret = vpu_EncOpen(&handle, &encOP);
+	if (ret != RETCODE_SUCCESS) {
+		printf("vpu_EncOpen failed. Error code is %d \n", ret);
+		goto ERR_ENC_INIT;
+	}
+
+	searchPa.searchRamAddr = DEFAULT_SEARCHRAM_ADDR;
+	ret = vpu_EncGiveCommand(handle, ENC_SET_SEARCHRAM_PARAM, &searchPa);
+	if (ret != RETCODE_SUCCESS) {
+		printf("vpu_EncGiveCommand ( ENC_SET_SEARCHRAM_PARAM ) failed. Error code is %d \n", ret);
+		goto ERR_ENC_OPEN;
+	}
+
+	ret = vpu_EncGetInitialInfo(handle, &initialInfo);
+	if (ret != RETCODE_SUCCESS) {
+		printf("vpu_EncGetInitialInfo failed. Error code is %d \n",
+		       ret);
+		goto ERR_ENC_OPEN;
+	}
+	DPRINTF("Enc: min buffer count= %d\n", initialInfo.minFrameBufferCount);
+	printf("Initial Infos: minFrameBufferCount=%d\n", initialInfo.minFrameBufferCount);
+
+	/* allocate the image buffer, rec buffer/ref buffer plus src buffer */
+	FrameBufferInit(picWidth, picHeight,
+			FrameBufPool,
+			initialInfo.minFrameBufferCount + EXTRA_FB);
+
+	enc_info.FbPool = FrameBufPool;
+	enc_info.FbNumber = initialInfo.minFrameBufferCount + EXTRA_FB;
+	memcpy(&(enc_info.bitstream_buf), &bit_stream_buf,
+	       sizeof(struct vpu_mem_desc));
+	memcpy(&(enc_info.handle), &handle, sizeof(DecHandle));
+
+	srcFrameIdx = initialInfo.minFrameBufferCount;
+
+	for (i = 0; i < initialInfo.minFrameBufferCount + EXTRA_FB; ++i) {
+		pFrame[i] = GetFrameBuffer(i, FrameBufPool);
+		frameBuf[i].bufY = pFrame[i]->AddrY;
+		frameBuf[i].bufCb = pFrame[i]->AddrCb;
+		frameBuf[i].bufCr = pFrame[i]->AddrCr;
+	}
+	
+	stride = framebufWidth;
+	ret = vpu_EncRegisterFrameBuffer(handle, frameBuf,
+					 initialInfo.minFrameBufferCount,
+					 stride);
+	if (ret != RETCODE_SUCCESS) {
+		printf("vpu_EncRegisterFrameBuffer failed.Error code is %d \n", ret);
+		goto ERR_ENC_OPEN;
+	}
+
+	DPRINTF("Disp %x, %x, %x,\n\tStore buf %x, %x, %x\n",
+		pFrame[srcFrameIdx]->DispY,
+		pFrame[srcFrameIdx]->DispCb,
+		pFrame[srcFrameIdx]->DispCr,
+		(unsigned int)frameBuf[srcFrameIdx].bufY,
+		(unsigned int)frameBuf[srcFrameIdx].bufCb,
+		(unsigned int)frameBuf[srcFrameIdx].bufCr);
+
+	frame_index = 0;
+	encParam.sourceFrame = &frameBuf[srcFrameIdx];
+	encParam.quantParam = 30;
+	encParam.forceIPicture = 0;
+	encParam.skipPicture = 0;
+
+	memset(&prp_buffer, 0, sizeof(struct v4l2_buffer));
+
+	/* Must put encode header before first picture encoding. */
+	if (mode == STD_MPEG4) {
+		encHeaderParam.headerType = VOS_HEADER;
+		vpu_EncGiveCommand(handle, ENC_PUT_MP4_HEADER, &encHeaderParam); 
+		if (encOP.ringBufferEnable == 0) {
+			export_bitstream((char *)(virt_bit_stream_buf + encHeaderParam.buf - bit_stream_buf.phy_addr), encHeaderParam.size);
+		}
+
+		encHeaderParam.headerType = VIS_HEADER;
+		vpu_EncGiveCommand(handle, ENC_PUT_MP4_HEADER, &encHeaderParam); 
+		if (encOP.ringBufferEnable == 0) {
+			export_bitstream((char *)(virt_bit_stream_buf + encHeaderParam.buf - bit_stream_buf.phy_addr), encHeaderParam.size);
+		}
+
+		encHeaderParam.headerType = VOL_HEADER;
+		vpu_EncGiveCommand(handle, ENC_PUT_MP4_HEADER, &encHeaderParam); 
+		if (encOP.ringBufferEnable == 0) {
+			export_bitstream((char *)(virt_bit_stream_buf + encHeaderParam.buf - bit_stream_buf.phy_addr), encHeaderParam.size);
+		}
+	} else if (mode == STD_AVC) {
+		encHeaderParam.headerType = SPS_RBSP;
+		vpu_EncGiveCommand(handle, ENC_PUT_AVC_HEADER, &encHeaderParam); 
+		if (encOP.ringBufferEnable == 0) {
+			export_bitstream((char *)(virt_bit_stream_buf + encHeaderParam.buf - bit_stream_buf.phy_addr), encHeaderParam.size);
+		}
+
+		encHeaderParam.headerType = PPS_RBSP;
+		vpu_EncGiveCommand(handle, ENC_PUT_AVC_HEADER, &encHeaderParam); 
+		if (encOP.ringBufferEnable == 0) {
+			export_bitstream((char *)(virt_bit_stream_buf + encHeaderParam.buf - bit_stream_buf.phy_addr), encHeaderParam.size);
+		}
+	}
+
+	g_initialized = 1;
+	goto NO_ERR;
+
+ERR_ENC_OPEN:
+	ret = vpu_EncClose(handle);
+	if (ret == RETCODE_FRAME_NOT_COMPLETE) {
+		vpu_EncGetOutputInfo(handle, &outputInfo);
+		vpu_EncClose(handle);
+	}
+
+ERR_ENC_INIT:
+	FrameBufferFree(FrameBufPool,
+			initialInfo.minFrameBufferCount + EXTRA_FB);
+	IOFreeVirtMem(&bit_stream_buf);
+	IOFreePhyMem(&bit_stream_buf);
+	DPRINTF("Enc closed\n");
+	memset(&enc_info, 0, sizeof(struct codec_info));
+
+NO_ERR:
+	return ret; //&codec_thread[usr_config->index];
+}
+
+int vpu_codec_encode_next_frame(size_t frame_offset, unsigned char* image)
+{
+	int ret;
+
+	if (!g_initialized) {
+		printf("%s: please initialize codec first !\n", __func__);
+		return -1;
+	}
+
+	/* main loop */
+// 	while (1) {
+	/*while (frame_index < 150)*/ {
+		if (frame_index % 100 == 0) {
+			DPRINTF(" Inst %d, No. %d\n",
+				((EncInst *) handle)->instIndex, frame_index);
+		}
+
+		if (gdest == PATH_NET) {
+			if (frame_index % 5 == 0) {
+				encParam.forceIPicture = 1;
+			} else {
+				encParam.forceIPicture = 0;
+			}
+		}
+
+		// change Rc para test
+		// GOP number change
+		if (frame_index == 10) {
+			int newGopNum = 0;
+			vpu_EncGiveCommand(handle, ENC_SET_GOP_NUMBER, &newGopNum);
+		}
+		// Intra Qp change
+		if (frame_index == 20) {
+			int newIntraQp = 0;
+			vpu_EncGiveCommand(handle, ENC_SET_INTRA_QP, &newIntraQp);
+		}
+		// Bit Rate change
+		if (frame_index == 30) {
+			int newBitrate = 384000;
+			vpu_EncGiveCommand(handle, ENC_SET_BITRATE, &newBitrate);
+		}
+		// Frame Rate change
+		if (frame_index == 40) {
+			int newFramerate = 30;
+			vpu_EncGiveCommand(handle, ENC_SET_FRAME_RATE, &newFramerate);
+			if (encOP.bitstreamFormat== STD_MPEG4) {
+				encHeaderParam.headerType = VOL_HEADER;
+				vpu_EncGiveCommand(handle, ENC_PUT_MP4_HEADER, &encHeaderParam); 
+				if (encOP.ringBufferEnable == 0) {
+					DPRINTF("MPEG4 encHeaderParam(VOL_HEADER) addr:%p len:%d\n", bsBuf0, size0);
+					export_bitstream((char *)(virt_bit_stream_buf + encHeaderParam.buf - bit_stream_buf.phy_addr), encHeaderParam.size);
+				}
+			}
+		}
+		// Intra Refresh Number change
+		if (frame_index == 50) {
+			int newIntraRefreshNum = 0;
+			vpu_EncGiveCommand(handle, ENC_SET_INTRA_MB_REFRESH_NUMBER, &newIntraRefreshNum);
+		}
+		// Slice Mode change
+		if (frame_index == 60) {
+			EncSliceMode newSlice;
+			newSlice.sliceMode = 0;
+			if(!newSlice.sliceMode) {
+				newSlice.sliceSizeMode	= 0;
+				newSlice.sliceSize	= 0;
+			} else {
+				// New Slice Size Mode[0:bit number, 1:MB number]
+				newSlice.sliceSizeMode = 0;
+				
+				newSlice.sliceSize = 3000; 
+			}
+			vpu_EncGiveCommand(handle, ENC_SET_SLICE_INFO, &newSlice);
+		}
+		// HEC Mode change
+		if (frame_index == 70) {
+			int newHecMode=0;
+			if (newHecMode > 0) {
+				vpu_EncGiveCommand(handle, ENC_ENABLE_HEC, &newHecMode);
+			} else {
+				vpu_EncGiveCommand(handle, ENC_DISABLE_HEC, &newHecMode);
+			}
+		}
+#if 0
+		/* get next frame to encode */
+		/*ret =
+		    FillYuvImageMulti(usr_config->src, usr_config->src_name,
+				      frameBuf[srcFrameIdx].bufY +
+				      FrameBufPool[srcFrameIdx].CurrImage.
+				      virt_uaddr -
+				      FrameBufPool[srcFrameIdx].CurrImage.
+				      phy_addr, (void *)&prp_buffer, picWidth,
+				      picHeight,
+				      ((EncInst *) handle)->instIndex,
+				      CODEC_READING, rot_en, output_ratio, 0);*/
+// 		if (usr_config->src == PATH_EMMA) {
+			frameBuf[srcFrameIdx].bufY = frame_offset;
+// 			    cap_buffers[prp_buffer.index].offset;
+			frameBuf[srcFrameIdx].bufCb =
+			    frameBuf[srcFrameIdx].bufY + image_size;
+			frameBuf[srcFrameIdx].bufCr =
+			    frameBuf[srcFrameIdx].bufCb + (image_size >> 2);
+#endif
+		memcpy((unsigned char*)(frameBuf[srcFrameIdx].bufY + FrameBufPool[srcFrameIdx].CurrImage.virt_uaddr - FrameBufPool[srcFrameIdx].CurrImage.phy_addr),
+			image,
+			FrameBufPool[srcFrameIdx].CurrImage.size);
+// 		memset((unsigned char*)(frameBuf[srcFrameIdx].bufY + FrameBufPool[srcFrameIdx].CurrImage.virt_uaddr - FrameBufPool[srcFrameIdx].CurrImage.phy_addr),
+// 			frame_index,
+// 			FrameBufPool[srcFrameIdx].CurrImage.size);
+
+		/* To fix the MPEG4 issue on MX27 TO2 */
+		CodStd codStd = ((EncInst *) handle)->CodecInfo.encInfo.openParam.bitstreamFormat;
+		DPRINTF("CodStd = %d\n", codStd);
+		if (codStd == STD_MPEG4 && (getChipVersion() == MX27_REV2)) {
+			vpu_ESDMISC_LHD(1);
+		}
+
+		/* encode frame */
+		ret = vpu_EncStartOneFrame(handle, &encParam);
+		if (ret != RETCODE_SUCCESS) {
+			printf("vpu_EncStartOneFrame failed. Error code is %d \n", ret);
+			return ret;
+		}
+		timer(ENC_START);
+#ifdef INT_CALLBACK
+		pthread_mutex_lock(&vpu_busy_mutex);
+		pthread_cond_wait(&current_job_cond, &vpu_busy_mutex);
+		pthread_mutex_unlock(&vpu_busy_mutex);
+#else
+		vpu_WaitForInt(200);
+#endif
+		timer(ENC_STOP);
+
+		/* get resulting bitstream */
+		ret = vpu_EncGetOutputInfo(handle, &outputInfo);
+		if (ret != RETCODE_SUCCESS) {
+			printf("vpu_EncGetOutputInfo failed. Error code is %d \n", ret);
+			return ret;
+		}
+
+		/* To fix the MPEG4 issue on MX27 TO2 */
+		if (codStd == STD_MPEG4 && (getChipVersion() == MX27_REV2)) {
+			vpu_ESDMISC_LHD(0);
+		}
+
+		/* send buffer to dest */
+		export_bitstream((char *)(virt_bit_stream_buf + outputInfo.bitstreamBuffer - bit_stream_buf.phy_addr), outputInfo.bitstreamSize);
+
+/*		if (encOP.mbQpReport == 1) {
+			SaveQpReport(outputInfo.mbQpInfo, encOP.picWidth, 
+				encOP.picHeight, frame_index, "encqpreport.dat" );
+		}*/
+
+		frame_index++;
+	}
+
+	return 0;
+}
diff --git a/target/demos/camera/capture/vpu_codec.h b/target/demos/camera/capture/vpu_codec.h
new file mode 100644
index 0000000..3bec2cc
--- /dev/null
+++ b/target/demos/camera/capture/vpu_codec.h
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2004-2006 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * Copyright (c) 2006, Chips & Media.  All rights reserved.
+ */
+
+/*
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/*!
+ * @file vpu_voip_test.h
+ *
+ * @brief This file is codec test header.
+ *
+ * @ingroup VPU
+ */
+
+#ifndef __VPU__VOIP__TEST__H
+#define __VPU__VOIP__TEST__H
+
+// #include "../../lib/vpu/vpu_io.h"
+// #include "../../lib/vpu/vpu_lib.h"
+#define Uint32 unsigned int
+
+#define PAL_MODE		0
+#define NTSC_MODE		1
+
+//#define	STREAM_BUF_SIZE		0x40000
+#define	STREAM_BUF_SIZE		0xA0000
+
+#if 0
+#ifdef PAL_MODE
+#define MAX_WIDTH		720
+#define MAX_HEIGHT		576
+#else
+#define MAX_WIDTH		720
+#define MAX_HEIGHT		480
+#endif
+#endif
+
+//#ifdef VGA_PANEL
+#define SCREEN_MAX_WIDTH	640
+#define SCREEN_MAX_HEIGHT	480
+//#else
+//#define SCREEN_MAX_WIDTH	240
+//#define SCREEN_MAX_HEIGHT	320
+//#endif
+
+#define MAX_WIDTH		720
+#define MAX_HEIGHT		480
+
+#define STRIDE			MAX_WIDTH
+
+#define STREAM_FILL_SIZE	0x8000
+#define	STREAM_END_SIZE		0
+
+enum {
+	COMMAND_NONE = 0,
+	COMMAND_DECODE,
+	COMMAND_ENCODE,
+	COMMAND_MULTI_DEC,
+	COMMAND_MULTI_CODEC
+};
+
+
+#define MAX_NUM_INSTANCE	4
+
+/*display1/reference16/reconstruction1/loopfilter1/rot1 for 1 video, 20 in total*/
+/*display4/reference16/reconstruction1/loopfilter1/rot1 for multi video, 23 in total */
+/*why 22 here? */
+#define NUM_FRAME_BUF	(1+17+2)
+#define MAX_FRAME	(16+2+4)
+
+struct codec_config {
+	Uint32 index;
+	Uint32 src;
+	char src_name[80];
+	Uint32 dst;
+	char dst_name[80];
+	Uint32 enc_flag;
+	Uint32 fps;
+	int bps;
+	Uint32 mode;
+	Uint32 width;
+	Uint32 height;
+	Uint32 gop;
+	Uint32 frame_count;
+	Uint32 rot_angle;
+	Uint32 out_ratio;
+	Uint32 mirror_angle;
+};
+
+// void *DecodeTest(void *param);
+int vpu_codec_init(int mode, int picWidth, int picHeight, int bitRate, Uint32 dest);
+// void *sig_thread(void *arg);	/* the thread is used to monitor signal */
+
+int FillBsBufMulti(int src, char *src_name, int targetAddr,
+		   int bsBufStartAddr, int bsBufEndAddr, int size,
+		   int index, int checkeof, int *streameof, int read_flag);
+/* Read/Write one frame raw data each time, for Encoder/Decoder respectively */
+int FillYuvImageMulti(int src, char *src_name, int buf, void *emma_buf,
+		      int inwidth, int inheight, int index, int read_flag,
+		      int rot_en, int output_ratio, int frame_num);
+
+int vpu_codec_encode_next_frame(Uint32 frame_offset, unsigned char* image);
+
+int vpu_SystemShutdown(void);
+void vpu_codec_stop(void);
+void vpu_codec_pause(void);
+
+#define TEST_BUFFER_NUM		3
+
+// #define CODEC_READING		0
+// #define CODEC_WRITING		1
+
+#define PATH_FILE		0
+#define PATH_EMMA		1
+#define PATH_NET		2
+
+// pthread_t codec_thread[MAX_NUM_INSTANCE];
+
+#ifdef DEBUG
+#define DPRINTF(fmt, args...) printf("%s: " fmt , __FUNCTION__, ## args)
+#else
+#define DPRINTF(fmt, args...)
+#endif
+
+#endif


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-53-gf20a4ca

From: jscheer <js...@us...> - 2010-10-15 09:45:10

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  f20a4caef973f0feb6232437cd44d3f46c57eb13 (commit)
      from  3213ae0d7e2619d576d7b1de51d002b0c8338153 (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 f20a4caef973f0feb6232437cd44d3f46c57eb13
Author: Jeremie Scheer <jer...@ar...>
Date:   Fri Oct 15 11:44:30 2010 +0200

    [BUILDROOT] Create patch 134-jffs2-add_board_name_to_binary_rootfs_name.patch to add board name to jffs2 binary file name in BR 2010.

-----------------------------------------------------------------------

Summary of changes:
 ...ffs2-add_board_name_to_binary_rootfs_name.patch |   28 ++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2010.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch

diff --git a/patches/buildroot/2010.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch b/patches/buildroot/2010.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch
new file mode 100644
index 0000000..007950e
--- /dev/null
+++ b/patches/buildroot/2010.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch
@@ -0,0 +1,28 @@
+Add BR2_BOARD_NAME to the jffs2 binary file name.
+
+Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
+
+Index: buildroot/fs/common.mk
+===================================================================
+--- buildroot.orig/fs/common.mk	2010-10-15 11:31:26.000000000 +0200
++++ buildroot/fs/common.mk	2010-10-15 11:33:23.000000000 +0200
+@@ -32,8 +32,8 @@
+ 
+ define ROOTFS_TARGET_INTERNAL
+ 
+-$(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
+-	@$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
++$(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.arm.$(1): $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
++	@$(call MESSAGE,"Generating root filesystem image $(BR2_BOARD_NAME)-rootfs.arm.$(1)")
+ 	$(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
+ 	rm -f $(FAKEROOT_SCRIPT)
+ 	touch $(BUILD_DIR)/.fakeroot.00000
+@@ -60,7 +60,7 @@
+ $(1)-root-show-depends:
+ 	@echo $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma)
+ 
+-$(1)-root: $(BINARIES_DIR)/rootfs.$(1)
++$(1)-root: $(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.arm.$(1)
+ 
+ ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)
+ TARGETS += $(1)-root


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-52-g3213ae0

From: jscheer <js...@us...> - 2010-10-13 11:53:59

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  3213ae0d7e2619d576d7b1de51d002b0c8338153 (commit)
      from  de19d8512418c1990eaa3cff15cbcffa4187be85 (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 3213ae0d7e2619d576d7b1de51d002b0c8338153
Author: Jeremie Scheer <jer...@ar...>
Date:   Wed Oct 13 13:53:32 2010 +0200

    [U-BOOT] Correction in patch 051i-u-boot-multi-version-support.patch to rename the config file according to BR2_TARGET_UBOOT_BOARDNAME instead of BR2_BOARD_NAME.

-----------------------------------------------------------------------

Summary of changes:
 .../051i-u-boot-multi-version-support.patch        |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/patches/buildroot/2010.05/051i-u-boot-multi-version-support.patch b/patches/buildroot/2010.05/051i-u-boot-multi-version-support.patch
index 62d3b60..edf778d 100644
--- a/patches/buildroot/2010.05/051i-u-boot-multi-version-support.patch
+++ b/patches/buildroot/2010.05/051i-u-boot-multi-version-support.patch
@@ -1,7 +1,7 @@
 Index: buildroot/target/u-boot/Config.in
 ===================================================================
---- buildroot.orig/target/u-boot/Config.in	2010-06-17 16:46:56.000000000 +0200
-+++ buildroot/target/u-boot/Config.in	2010-06-17 16:47:04.000000000 +0200
+--- buildroot.orig/target/u-boot/Config.in	2010-10-13 13:40:12.000000000 +0200
++++ buildroot/target/u-boot/Config.in	2010-10-13 13:40:12.000000000 +0200
 @@ -13,7 +13,7 @@
  
  config BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE
@@ -13,14 +13,14 @@ Index: buildroot/target/u-boot/Config.in
  	  Mainly for people using boards not (yet) integrated in U-Boot's
 Index: buildroot/target/u-boot/Makefile.in
 ===================================================================
---- buildroot.orig/target/u-boot/Makefile.in	2010-06-17 16:47:02.000000000 +0200
-+++ buildroot/target/u-boot/Makefile.in	2010-06-17 16:47:04.000000000 +0200
+--- buildroot.orig/target/u-boot/Makefile.in	2010-10-13 13:40:12.000000000 +0200
++++ buildroot/target/u-boot/Makefile.in	2010-10-13 13:49:30.000000000 +0200
 @@ -96,7 +96,7 @@
  
  $(U_BOOT_DIR)/.config_header_copied: $(U_BOOT_DIR)/.patched
  ifneq ($(strip $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)),)
 -	cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_DIR)/include/configs/
-+	cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_DIR)/include/configs/$(BR2_BOARD_NAME).h
++	cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_DIR)/include/configs/$(BR2_TARGET_UBOOT_BOARDNAME).h
  endif
  	touch $@
  


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-51-gde19d85

From: jscheer <js...@us...> - 2010-10-11 15:34:20

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  de19d8512418c1990eaa3cff15cbcffa4187be85 (commit)
      from  e0a7cfa4174aafa5e21d483583e22b2a06915d54 (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 de19d8512418c1990eaa3cff15cbcffa4187be85
Author: Jeremie Scheer <jer...@ar...>
Date:   Mon Oct 11 17:33:53 2010 +0200

    [BUILDROOT] Changes in patch 132-qt-full_integration_with_cross_compiling.patch : name of demos directory & use of variable QT_DEMOS_DIR.

-----------------------------------------------------------------------

Summary of changes:
 ...-qt-full_integration_with_cross_compiling.patch |   36 ++++++++++++--------
 ...-qt-full_integration_with_cross_compiling.patch |   36 ++++++++++++--------
 2 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
index 559de40..8b76ea6 100644
--- a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
@@ -6,7 +6,7 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 Index: buildroot/package/qtopia4/Config.in
 ===================================================================
 --- buildroot.orig/package/qtopia4/Config.in	2010-10-11 09:38:44.000000000 +0200
-+++ buildroot/package/qtopia4/Config.in	2010-10-11 09:38:44.000000000 +0200
++++ buildroot/package/qtopia4/Config.in	2010-10-11 09:49:36.000000000 +0200
 @@ -325,4 +325,14 @@
  	  Build the Qt Script Tools module.
  	  if unsure, say n.
@@ -25,8 +25,16 @@ Index: buildroot/package/qtopia4/Config.in
 Index: buildroot/package/qtopia4/qtopia4.mk
 ===================================================================
 --- buildroot.orig/package/qtopia4/qtopia4.mk	2010-10-11 09:38:44.000000000 +0200
-+++ buildroot/package/qtopia4/qtopia4.mk	2010-10-11 09:46:39.000000000 +0200
-@@ -345,6 +345,14 @@
++++ buildroot/package/qtopia4/qtopia4.mk	2010-10-11 16:36:12.000000000 +0200
+@@ -17,6 +17,7 @@
+ QT_SITE:=http://get.qt.nokia.com/qt/source
+ QT_CAT:=$(ZCAT)
+ QT_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QT_VERSION)
++QT_DEMOS_DIR:=/usr/local/qt-embedded-$(QT_VERSION)
+ 
+ QT_CONFIGURE:=#empty
+ 
+@@ -345,6 +346,14 @@
  QT_CONFIGURE+= -no-stl
  endif
  
@@ -41,12 +49,12 @@ Index: buildroot/package/qtopia4/qtopia4.mk
  # ccache and precompiled headers don't play well together
  ifeq ($(BR2_CCACHE),y)
  QT_CONFIGURE += -no-pch
-@@ -483,11 +491,11 @@
+@@ -483,11 +492,11 @@
  		-no-accessibility \
  		-no-separate-debug-info \
  		-prefix /usr \
-+		-examplesdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples \
-+		-demosdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos \
++		-examplesdir $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/examples \
++		-demosdir $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/demos \
  		-hostprefix $(STAGING_DIR)/usr \
  		-fast \
  		-no-rpath \
@@ -55,24 +63,24 @@ Index: buildroot/package/qtopia4/qtopia4.mk
  	)
  	touch $@
  
-@@ -560,8 +568,19 @@
+@@ -560,8 +569,19 @@
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
  endif
  
-+$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/demos.pro:
++$(TARGET_DIR)/$(QT_DEMOS_DIR)/demos/demos.pro:
 +ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
-+	mkdir -p $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos
-+	cp -dpfR $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/* $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/
++	mkdir -p $(TARGET_DIR)/$(QT_DEMOS_DIR)/demos
++	cp -dpfR $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/demos/* $(TARGET_DIR)/$(QT_DEMOS_DIR)/demos/
 +endif
 +
-+$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/examples.pro:
++$(TARGET_DIR)/$(QT_DEMOS_DIR)/examples/examples.pro:
 +ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
-+	mkdir -p $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples
-+	cp -dpfR $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/* $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/
++	mkdir -p $(TARGET_DIR)/$(QT_DEMOS_DIR)/examples
++	cp -dpfR $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/examples/* $(TARGET_DIR)/$(QT_DEMOS_DIR)/examples/
 +endif
  
 -$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
-+$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/demos.pro $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/examples.pro
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/$(QT_DEMOS_DIR)/demos/demos.pro $(TARGET_DIR)/$(QT_DEMOS_DIR)/examples/examples.pro
  	# Strip all installed libs
  ifeq ($(BR2_PACKAGE_QT_SHARED),y)
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
diff --git a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
index 9922cbf..cf3e443 100644
--- a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
@@ -6,7 +6,7 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 Index: buildroot/package/qt/Config.in
 ===================================================================
 --- buildroot.orig/package/qt/Config.in	2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/package/qt/Config.in	2010-10-11 10:36:06.000000000 +0200
++++ buildroot/package/qt/Config.in	2010-10-11 10:58:47.000000000 +0200
 @@ -372,4 +372,14 @@
  	  Build the Qt Script Tools module.
  	  if unsure, say n.
@@ -25,8 +25,16 @@ Index: buildroot/package/qt/Config.in
 Index: buildroot/package/qt/qt.mk
 ===================================================================
 --- buildroot.orig/package/qt/qt.mk	2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/package/qt/qt.mk	2010-10-11 10:55:00.000000000 +0200
-@@ -362,6 +362,14 @@
++++ buildroot/package/qt/qt.mk	2010-10-11 17:11:18.000000000 +0200
+@@ -17,6 +17,7 @@
+ QT_SITE:=http://get.qt.nokia.com/qt/source
+ QT_CAT:=$(ZCAT)
+ QT_TARGET_DIR:=$(BUILD_DIR)/qt-everywhere-opensource-src-$(QT_VERSION)
++QT_DEMOS_DIR:=/usr/local/qt-embedded-$(QT_VERSION)
+ 
+ QT_CONFIGURE:=#empty
+ 
+@@ -362,6 +363,14 @@
  QT_CONFIGURE+= -no-stl
  endif
  
@@ -41,12 +49,12 @@ Index: buildroot/package/qt/qt.mk
  # ccache and precompiled headers don't play well together
  ifeq ($(BR2_CCACHE),y)
  QT_CONFIGURE += -no-pch
-@@ -507,11 +515,11 @@
+@@ -507,11 +516,11 @@
  		-no-accessibility \
  		-no-separate-debug-info \
  		-prefix /usr \
-+		-examplesdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples \
-+		-demosdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos \
++		-examplesdir $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/examples \
++		-demosdir $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/demos \
  		-hostprefix $(STAGING_DIR)/usr \
  		-fast \
  		-no-rpath \
@@ -55,24 +63,24 @@ Index: buildroot/package/qt/qt.mk
  	)
  	touch $@
  
-@@ -589,8 +597,19 @@
+@@ -589,8 +598,19 @@
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
  endif
  
-+$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/demos.pro:
++$(TARGET_DIR)/$(QT_DEMOS_DIR)/demos/demos.pro:
 +ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
-+	mkdir -p $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos
-+	cp -dpfR $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/* $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/
++	mkdir -p $(TARGET_DIR)/$(QT_DEMOS_DIR)/demos
++	cp -dpfR $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/demos/* $(TARGET_DIR)/$(QT_DEMOS_DIR)/demos/
 +endif
 +
-+$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/examples.pro:
++$(TARGET_DIR)/$(QT_DEMOS_DIR)/examples/examples.pro:
 +ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
-+	mkdir -p $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples
-+	cp -dpfR $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/* $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/
++	mkdir -p $(TARGET_DIR)/$(QT_DEMOS_DIR)/examples
++	cp -dpfR $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/examples/* $(TARGET_DIR)/$(QT_DEMOS_DIR)/examples/
 +endif
  
 -$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
-+$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/demos.pro $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/examples.pro
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/$(QT_DEMOS_DIR)/demos/demos.pro $(TARGET_DIR)/$(QT_DEMOS_DIR)/examples/examples.pro
  	# Strip all installed libs
  ifeq ($(BR2_PACKAGE_QT_SHARED),y)
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-50-ge0a7cfa

From: jscheer <js...@us...> - 2010-10-11 09:44: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  e0a7cfa4174aafa5e21d483583e22b2a06915d54 (commit)
       via  f377feb11486917104fdabcd7f6ae31e3822b618 (commit)
      from  f51c74f63182219732b914a0e2482887292f9b9f (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 e0a7cfa4174aafa5e21d483583e22b2a06915d54
Merge: f377feb11486917104fdabcd7f6ae31e3822b618 f51c74f63182219732b914a0e2482887292f9b9f
Author: Jeremie Scheer <jer...@ar...>
Date:   Mon Oct 11 11:43:47 2010 +0200

    Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit f377feb11486917104fdabcd7f6ae31e3822b618
Author: Jeremie Scheer <jer...@ar...>
Date:   Mon Oct 11 11:37:55 2010 +0200

    [BUILDROOT] Modifications in patch 132-qt-full_integration_with_cross_compiling.patch : Change Qt demos & examples directory on install and target. Use the variable QT_VERSION instead of the number in the Makefile.

-----------------------------------------------------------------------

Summary of changes:
 ...-qt-full_integration_with_cross_compiling.patch |   26 ++++++++++----------
 ...-qt-full_integration_with_cross_compiling.patch |   22 ++++++++--------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
index 51b9162..559de40 100644
--- a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
@@ -5,8 +5,8 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 
 Index: buildroot/package/qtopia4/Config.in
 ===================================================================
---- buildroot.orig/package/qtopia4/Config.in	2010-10-06 16:58:24.000000000 +0200
-+++ buildroot/package/qtopia4/Config.in	2010-10-06 16:58:24.000000000 +0200
+--- buildroot.orig/package/qtopia4/Config.in	2010-10-11 09:38:44.000000000 +0200
++++ buildroot/package/qtopia4/Config.in	2010-10-11 09:38:44.000000000 +0200
 @@ -325,4 +325,14 @@
  	  Build the Qt Script Tools module.
  	  if unsure, say n.
@@ -24,8 +24,8 @@ Index: buildroot/package/qtopia4/Config.in
  endif # BR2_PACKAGE_QT
 Index: buildroot/package/qtopia4/qtopia4.mk
 ===================================================================
---- buildroot.orig/package/qtopia4/qtopia4.mk	2010-10-06 16:58:24.000000000 +0200
-+++ buildroot/package/qtopia4/qtopia4.mk	2010-10-07 11:37:07.000000000 +0200
+--- buildroot.orig/package/qtopia4/qtopia4.mk	2010-10-11 09:38:44.000000000 +0200
++++ buildroot/package/qtopia4/qtopia4.mk	2010-10-11 09:46:39.000000000 +0200
 @@ -345,6 +345,14 @@
  QT_CONFIGURE+= -no-stl
  endif
@@ -45,8 +45,8 @@ Index: buildroot/package/qtopia4/qtopia4.mk
  		-no-accessibility \
  		-no-separate-debug-info \
  		-prefix /usr \
-+		-examplesdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples \
-+		-demosdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos \
++		-examplesdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples \
++		-demosdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos \
  		-hostprefix $(STAGING_DIR)/usr \
  		-fast \
  		-no-rpath \
@@ -59,20 +59,20 @@ Index: buildroot/package/qtopia4/qtopia4.mk
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
  endif
  
-+$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/demos.pro:
++$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/demos.pro:
 +ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
-+	mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos
-+	cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/
++	mkdir -p $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos
++	cp -dpfR $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/* $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/
 +endif
 +
-+$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/examples.pro:
++$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/examples.pro:
 +ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
-+	mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples
-+	cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/
++	mkdir -p $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples
++	cp -dpfR $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/* $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/
 +endif
  
 -$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
-+$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/demos.pro $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/examples.pro
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/demos.pro $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/examples.pro
  	# Strip all installed libs
  ifeq ($(BR2_PACKAGE_QT_SHARED),y)
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
diff --git a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
index a0641c5..9922cbf 100644
--- a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
@@ -6,7 +6,7 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 Index: buildroot/package/qt/Config.in
 ===================================================================
 --- buildroot.orig/package/qt/Config.in	2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/package/qt/Config.in	2010-10-06 16:56:09.000000000 +0200
++++ buildroot/package/qt/Config.in	2010-10-11 10:36:06.000000000 +0200
 @@ -372,4 +372,14 @@
  	  Build the Qt Script Tools module.
  	  if unsure, say n.
@@ -25,7 +25,7 @@ Index: buildroot/package/qt/Config.in
 Index: buildroot/package/qt/qt.mk
 ===================================================================
 --- buildroot.orig/package/qt/qt.mk	2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/package/qt/qt.mk	2010-10-07 11:44:13.000000000 +0200
++++ buildroot/package/qt/qt.mk	2010-10-11 10:55:00.000000000 +0200
 @@ -362,6 +362,14 @@
  QT_CONFIGURE+= -no-stl
  endif
@@ -45,8 +45,8 @@ Index: buildroot/package/qt/qt.mk
  		-no-accessibility \
  		-no-separate-debug-info \
  		-prefix /usr \
-+		-examplesdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples \
-+		-demosdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos \
++		-examplesdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples \
++		-demosdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos \
  		-hostprefix $(STAGING_DIR)/usr \
  		-fast \
  		-no-rpath \
@@ -59,20 +59,20 @@ Index: buildroot/package/qt/qt.mk
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
  endif
  
-+$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/demos.pro:
++$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/demos.pro:
 +ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
-+	mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos
-+	cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/
++	mkdir -p $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos
++	cp -dpfR $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/* $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/
 +endif
 +
-+$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/examples.pro:
++$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/examples.pro:
 +ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
-+	mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples
-+	cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/
++	mkdir -p $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples
++	cp -dpfR $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/* $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/
 +endif
  
 -$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
-+$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/demos.pro $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/examples.pro
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/demos.pro $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/examples.pro
  	# Strip all installed libs
  ifeq ($(BR2_PACKAGE_QT_SHARED),y)
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-48-gf51c74f

From: Gwenhael <gwe...@us...> - 2010-10-08 14:16:54

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  f51c74f63182219732b914a0e2482887292f9b9f (commit)
       via  93902f453bb1d8702d2b0f1f9552fcea5bde47a9 (commit)
      from  8a68afd34b69368ef3e756987d29ef3c71fe532c (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 f51c74f63182219732b914a0e2482887292f9b9f
Merge: 93902f453bb1d8702d2b0f1f9552fcea5bde47a9 8a68afd34b69368ef3e756987d29ef3c71fe532c
Author: gwenhael <gwe...@us...>
Date:   Fri Oct 8 16:16:09 2010 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 93902f453bb1d8702d2b0f1f9552fcea5bde47a9
Author: gwenhael <gwe...@us...>
Date:   Fri Oct 8 16:15:34 2010 +0200

    [DEMOS] blink_led: update the demo to be according with the actual policy gpio's driver

-----------------------------------------------------------------------

Summary of changes:
 target/demos/gpio/blink_led.c |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/target/demos/gpio/blink_led.c b/target/demos/gpio/blink_led.c
index 8281e3b..c6d0521 100644
--- a/target/demos/gpio/blink_led.c
+++ b/target/demos/gpio/blink_led.c
@@ -31,11 +31,9 @@
 #include <linux/ppdev.h> 
 
 #ifdef apf9328
-#define LED_GPIO_PORT	"/dev/gpio/portD"
-#define LED_PIN		31
+#define LED_GPIO_PIN	"/dev/gpio/PD31"
 #elif apf27
-#define LED_GPIO_PORT   "/dev/gpio/portF"
-#define LED_PIN         14
+#define LED_GPIO_PIN   "/dev/gpio/PF14"
 #else
 #error Board not defined
 #endif
@@ -60,34 +58,31 @@ int main(int argc, char **argv)
 
 	printf("Toggling LED %d times \n", count);
 	
-	printf("Opening %s\n", LED_GPIO_PORT);
-	if ((fd = open(LED_GPIO_PORT, O_RDWR)) < 0) {
+	printf("Opening %s\n", LED_GPIO_PIN);
+	if ((fd = open(LED_GPIO_PIN, O_RDWR)) < 0) {
 		perror("Error");
 		exit(1);
 	}
 
 	/* Set LED PIN as GPIO; read/modify/write */
-	ioctl(fd, GPIORDMODE, &portval);
-	portval |= (1 << LED_PIN);
+	portval = 1;
 	ioctl(fd, GPIOWRMODE, &portval);
 
 	/* Set LED GPIO as output; read/modify/write */
-	ioctl(fd, GPIORDDIRECTION, &portval);
-	portval |= (1 << LED_PIN);
 	ioctl(fd, GPIOWRDIRECTION, &portval);
 
 	/* Blink the LED */
 	for (i = 0; i < count; i++) {
 		printf("Led ON\n"); /* pin <- 0 */
 		ioctl(fd, GPIORDDATA, &portval);
-		portval &= ~(1 << LED_PIN);
+		portval &= ~1;
 		ioctl(fd, GPIOWRDATA, &portval);
 
 		sleep(1);
 
 		printf("Led OFF\n"); /* pin <- 1 */
 		ioctl(fd, GPIORDDATA, &portval);
-		portval |= (1 << LED_PIN);
+		portval |= 1;
 		ioctl(fd, GPIOWRDATA, &portval);
 
 		sleep(1);


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-46-g8a68afd

From: jscheer <js...@us...> - 2010-10-07 09:55:32

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  8a68afd34b69368ef3e756987d29ef3c71fe532c (commit)
      from  11622d91f37fc77acc47ede98840a37cbf5d5f5b (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 8a68afd34b69368ef3e756987d29ef3c71fe532c
Author: Jeremie Scheer <jer...@ar...>
Date:   Thu Oct 7 11:55:07 2010 +0200

    [BUILDROOT] Bug corrected in patch 132-qt-full_integration_with_cross_compiling.patch : Qt demos and examples not erased if they already exist in rootfs

-----------------------------------------------------------------------

Summary of changes:
 ...-qt-full_integration_with_cross_compiling.patch |   20 ++++++++++++--------
 ...-qt-full_integration_with_cross_compiling.patch |   16 ++++++++++------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
index 2777acd..51b9162 100644
--- a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
@@ -5,8 +5,8 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 
 Index: buildroot/package/qtopia4/Config.in
 ===================================================================
---- buildroot.orig/package/qtopia4/Config.in	2010-10-06 15:02:23.000000000 +0200
-+++ buildroot/package/qtopia4/Config.in	2010-10-06 15:12:26.000000000 +0200
+--- buildroot.orig/package/qtopia4/Config.in	2010-10-06 16:58:24.000000000 +0200
++++ buildroot/package/qtopia4/Config.in	2010-10-06 16:58:24.000000000 +0200
 @@ -325,4 +325,14 @@
  	  Build the Qt Script Tools module.
  	  if unsure, say n.
@@ -24,8 +24,8 @@ Index: buildroot/package/qtopia4/Config.in
  endif # BR2_PACKAGE_QT
 Index: buildroot/package/qtopia4/qtopia4.mk
 ===================================================================
---- buildroot.orig/package/qtopia4/qtopia4.mk	2010-10-06 15:02:23.000000000 +0200
-+++ buildroot/package/qtopia4/qtopia4.mk	2010-10-06 16:49:51.000000000 +0200
+--- buildroot.orig/package/qtopia4/qtopia4.mk	2010-10-06 16:58:24.000000000 +0200
++++ buildroot/package/qtopia4/qtopia4.mk	2010-10-07 11:37:07.000000000 +0200
 @@ -345,6 +345,14 @@
  QT_CONFIGURE+= -no-stl
  endif
@@ -55,20 +55,24 @@ Index: buildroot/package/qtopia4/qtopia4.mk
  	)
  	touch $@
  
-@@ -560,8 +568,15 @@
+@@ -560,8 +568,19 @@
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
  endif
  
-+demos: $(STAGING_DIR)/usr/lib/libQtCore.la
++$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/demos.pro:
++ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
 +	mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos
 +	cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/
++endif
 +
-+examples: $(STAGING_DIR)/usr/lib/libQtCore.la
++$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/examples.pro:
++ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
 +	mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples
 +	cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/
++endif
  
 -$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
-+$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) demos examples
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/demos.pro $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/examples.pro
  	# Strip all installed libs
  ifeq ($(BR2_PACKAGE_QT_SHARED),y)
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
diff --git a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
index 816bb96..a0641c5 100644
--- a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
@@ -6,7 +6,7 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 Index: buildroot/package/qt/Config.in
 ===================================================================
 --- buildroot.orig/package/qt/Config.in	2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/package/qt/Config.in	2010-10-06 15:38:23.000000000 +0200
++++ buildroot/package/qt/Config.in	2010-10-06 16:56:09.000000000 +0200
 @@ -372,4 +372,14 @@
  	  Build the Qt Script Tools module.
  	  if unsure, say n.
@@ -25,7 +25,7 @@ Index: buildroot/package/qt/Config.in
 Index: buildroot/package/qt/qt.mk
 ===================================================================
 --- buildroot.orig/package/qt/qt.mk	2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/package/qt/qt.mk	2010-10-06 16:53:11.000000000 +0200
++++ buildroot/package/qt/qt.mk	2010-10-07 11:44:13.000000000 +0200
 @@ -362,6 +362,14 @@
  QT_CONFIGURE+= -no-stl
  endif
@@ -55,20 +55,24 @@ Index: buildroot/package/qt/qt.mk
  	)
  	touch $@
  
-@@ -589,8 +597,15 @@
+@@ -589,8 +597,19 @@
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
  endif
  
-+demos: $(STAGING_DIR)/usr/lib/libQtCore.la
++$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/demos.pro:
++ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
 +	mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos
 +	cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/
++endif
 +
-+examples: $(STAGING_DIR)/usr/lib/libQtCore.la
++$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/examples.pro:
++ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
 +	mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples
 +	cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/
++endif
  
 -$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
-+$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) demos examples
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/demos.pro $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/examples.pro
  	# Strip all installed libs
  ifeq ($(BR2_PACKAGE_QT_SHARED),y)
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-45-g11622d9

From: jscheer <js...@us...> - 2010-10-06 15:00:33

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  11622d91f37fc77acc47ede98840a37cbf5d5f5b (commit)
      from  402addedc2ccf7b6c8dd7ef9ee3e80cfc83845bc (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 11622d91f37fc77acc47ede98840a37cbf5d5f5b
Author: Jeremie Scheer <jer...@ar...>
Date:   Wed Oct 6 16:59:50 2010 +0200

    [BUILDROOT] Correct inversion of demos and examples directories in patch 132-qt-full_integration_with_cross_compiling.patch

-----------------------------------------------------------------------

Summary of changes:
 ...-qt-full_integration_with_cross_compiling.patch |    8 ++++----
 ...-qt-full_integration_with_cross_compiling.patch |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
index 53435fe..2777acd 100644
--- a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
@@ -6,7 +6,7 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 Index: buildroot/package/qtopia4/Config.in
 ===================================================================
 --- buildroot.orig/package/qtopia4/Config.in	2010-10-06 15:02:23.000000000 +0200
-+++ buildroot/package/qtopia4/Config.in	2010-10-06 15:02:24.000000000 +0200
++++ buildroot/package/qtopia4/Config.in	2010-10-06 15:12:26.000000000 +0200
 @@ -325,4 +325,14 @@
  	  Build the Qt Script Tools module.
  	  if unsure, say n.
@@ -25,7 +25,7 @@ Index: buildroot/package/qtopia4/Config.in
 Index: buildroot/package/qtopia4/qtopia4.mk
 ===================================================================
 --- buildroot.orig/package/qtopia4/qtopia4.mk	2010-10-06 15:02:23.000000000 +0200
-+++ buildroot/package/qtopia4/qtopia4.mk	2010-10-06 15:06:31.000000000 +0200
++++ buildroot/package/qtopia4/qtopia4.mk	2010-10-06 16:49:51.000000000 +0200
 @@ -345,6 +345,14 @@
  QT_CONFIGURE+= -no-stl
  endif
@@ -45,8 +45,8 @@ Index: buildroot/package/qtopia4/qtopia4.mk
  		-no-accessibility \
  		-no-separate-debug-info \
  		-prefix /usr \
-+		-examplesdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos \
-+		-demosdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples \
++		-examplesdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples \
++		-demosdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos \
  		-hostprefix $(STAGING_DIR)/usr \
  		-fast \
  		-no-rpath \
diff --git a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
index 0f528c1..816bb96 100644
--- a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
@@ -6,7 +6,7 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 Index: buildroot/package/qt/Config.in
 ===================================================================
 --- buildroot.orig/package/qt/Config.in	2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/package/qt/Config.in	2010-10-06 15:16:56.000000000 +0200
++++ buildroot/package/qt/Config.in	2010-10-06 15:38:23.000000000 +0200
 @@ -372,4 +372,14 @@
  	  Build the Qt Script Tools module.
  	  if unsure, say n.
@@ -25,7 +25,7 @@ Index: buildroot/package/qt/Config.in
 Index: buildroot/package/qt/qt.mk
 ===================================================================
 --- buildroot.orig/package/qt/qt.mk	2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/package/qt/qt.mk	2010-10-06 15:25:30.000000000 +0200
++++ buildroot/package/qt/qt.mk	2010-10-06 16:53:11.000000000 +0200
 @@ -362,6 +362,14 @@
  QT_CONFIGURE+= -no-stl
  endif
@@ -45,8 +45,8 @@ Index: buildroot/package/qt/qt.mk
  		-no-accessibility \
  		-no-separate-debug-info \
  		-prefix /usr \
-+		-examplesdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos \
-+		-demosdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples \
++		-examplesdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples \
++		-demosdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos \
  		-hostprefix $(STAGING_DIR)/usr \
  		-fast \
  		-no-rpath \


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-44-g402adde

From: jscheer <js...@us...> - 2010-10-06 13:48:47

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  402addedc2ccf7b6c8dd7ef9ee3e80cfc83845bc (commit)
      from  9204956b330d6568692ea98bb55271950ef45f20 (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 402addedc2ccf7b6c8dd7ef9ee3e80cfc83845bc
Author: Jeremie Scheer <jer...@ar...>
Date:   Wed Oct 6 15:47:44 2010 +0200

    [BUILDROOT] Bugs correction for patches 132-qt-full_integration_with_cross_compiling.patch and 133-qwt-add_package.patch : seek Qt fonts in /usr/lib/fonts

-----------------------------------------------------------------------

Summary of changes:
 ...-qt-full_integration_with_cross_compiling.patch |   18 +++++++++---------
 patches/buildroot/133-qwt-add_package.patch        |   16 ++++++++--------
 ...-qt-full_integration_with_cross_compiling.patch |   18 +++++++++---------
 .../buildroot/2010.05/133-qwt-add_package.patch    |   16 ++++++++--------
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
index 251bc1f..53435fe 100644
--- a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
@@ -5,8 +5,8 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 
 Index: buildroot/package/qtopia4/Config.in
 ===================================================================
---- buildroot.orig/package/qtopia4/Config.in	2010-10-04 15:36:08.000000000 +0200
-+++ buildroot/package/qtopia4/Config.in	2010-10-04 15:36:39.000000000 +0200
+--- buildroot.orig/package/qtopia4/Config.in	2010-10-06 15:02:23.000000000 +0200
++++ buildroot/package/qtopia4/Config.in	2010-10-06 15:02:24.000000000 +0200
 @@ -325,4 +325,14 @@
  	  Build the Qt Script Tools module.
  	  if unsure, say n.
@@ -24,8 +24,8 @@ Index: buildroot/package/qtopia4/Config.in
  endif # BR2_PACKAGE_QT
 Index: buildroot/package/qtopia4/qtopia4.mk
 ===================================================================
---- buildroot.orig/package/qtopia4/qtopia4.mk	2010-10-04 15:36:02.000000000 +0200
-+++ buildroot/package/qtopia4/qtopia4.mk	2010-10-04 15:37:11.000000000 +0200
+--- buildroot.orig/package/qtopia4/qtopia4.mk	2010-10-06 15:02:23.000000000 +0200
++++ buildroot/package/qtopia4/qtopia4.mk	2010-10-06 15:06:31.000000000 +0200
 @@ -345,6 +345,14 @@
  QT_CONFIGURE+= -no-stl
  endif
@@ -41,12 +41,12 @@ Index: buildroot/package/qtopia4/qtopia4.mk
  # ccache and precompiled headers don't play well together
  ifeq ($(BR2_CCACHE),y)
  QT_CONFIGURE += -no-pch
-@@ -482,12 +490,10 @@
- 		-no-nis \
+@@ -483,11 +491,11 @@
  		-no-accessibility \
  		-no-separate-debug-info \
--		-prefix /usr \
-+		-prefix $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm \
+ 		-prefix /usr \
++		-examplesdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos \
++		-demosdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples \
  		-hostprefix $(STAGING_DIR)/usr \
  		-fast \
  		-no-rpath \
@@ -55,7 +55,7 @@ Index: buildroot/package/qtopia4/qtopia4.mk
  	)
  	touch $@
  
-@@ -560,8 +566,15 @@
+@@ -560,8 +568,15 @@
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
  endif
  
diff --git a/patches/buildroot/133-qwt-add_package.patch b/patches/buildroot/133-qwt-add_package.patch
index 53af43f..a004ac0 100644
--- a/patches/buildroot/133-qwt-add_package.patch
+++ b/patches/buildroot/133-qwt-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 
 Index: buildroot/package/Config.in
 ===================================================================
---- buildroot.orig/package/Config.in	2010-09-29 16:56:33.000000000 +0200
-+++ buildroot/package/Config.in	2010-09-29 16:57:07.000000000 +0200
+--- buildroot.orig/package/Config.in	2010-10-06 15:04:04.000000000 +0200
++++ buildroot/package/Config.in	2010-10-06 15:07:30.000000000 +0200
 @@ -357,6 +357,7 @@
  comment "other GUIs"
  source "package/qte/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
 Index: buildroot/package/qwt/Config.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/Config.in	2010-09-29 16:58:58.000000000 +0200
++++ buildroot/package/qwt/Config.in	2010-10-06 15:07:30.000000000 +0200
 @@ -0,0 +1,20 @@
 +comment "Qwt requires Qt to be installed"
 +	depends on !BR2_PACKAGE_QT
@@ -42,7 +42,7 @@ Index: buildroot/package/qwt/Config.in
 Index: buildroot/package/qwt/qwt.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt.mk	2010-09-29 17:00:04.000000000 +0200
++++ buildroot/package/qwt/qwt.mk	2010-10-06 15:09:15.000000000 +0200
 @@ -0,0 +1,82 @@
 +######################################################################
 +#
@@ -85,10 +85,10 @@ Index: buildroot/package/qwt/qwt.mk
 +	(export INSTALL_ROOT=$(STAGING_DIR); $(MAKE) -C $(QWT_TARGET_DIR) install)
 +
 +$(TARGET_DIR)/usr/lib/libqwt.so: $(STAGING_DIR)/usr/lib/libqwt.so
-+	cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so.* $(TARGET_DIR)/usr/lib/
-+	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libqwt.so.*
++	cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so* $(TARGET_DIR)/usr/lib/
++	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libqwt.so*
 +
-+$(QWT_TARGET_DIR)/examples/.configured: $(TARGET_DIR)/usr/lib/libqwt.so
++$(QWT_TARGET_DIR)/examples/.configured:
 +	-[ -f $(QWT_TARGET_DIR)/examples/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR)/examples distclean
 +	$(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/examples/$(QWT_EXAMPLES_CONFIG_FILE)
 +	touch $@
@@ -129,7 +129,7 @@ Index: buildroot/package/qwt/qwt.mk
 Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch	2010-09-29 17:00:52.000000000 +0200
++++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch	2010-10-06 15:07:30.000000000 +0200
 @@ -0,0 +1,30 @@
 +--- qwt-5.2.1/qwtconfig.pri.orig	2010-09-28 14:34:01.000000000 +0200
 ++++ qwt-5.2.1/qwtconfig.pri	2010-09-28 15:37:02.000000000 +0200
diff --git a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
index f14c745..0f528c1 100644
--- a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
@@ -5,8 +5,8 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 
 Index: buildroot/package/qt/Config.in
 ===================================================================
---- buildroot.orig/package/qt/Config.in	2010-10-04 15:50:09.000000000 +0200
-+++ buildroot/package/qt/Config.in	2010-10-04 15:52:44.000000000 +0200
+--- buildroot.orig/package/qt/Config.in	2010-05-30 22:24:10.000000000 +0200
++++ buildroot/package/qt/Config.in	2010-10-06 15:16:56.000000000 +0200
 @@ -372,4 +372,14 @@
  	  Build the Qt Script Tools module.
  	  if unsure, say n.
@@ -24,8 +24,8 @@ Index: buildroot/package/qt/Config.in
  endif # BR2_PACKAGE_QT
 Index: buildroot/package/qt/qt.mk
 ===================================================================
---- buildroot.orig/package/qt/qt.mk	2010-10-04 15:49:36.000000000 +0200
-+++ buildroot/package/qt/qt.mk	2010-10-04 15:59:03.000000000 +0200
+--- buildroot.orig/package/qt/qt.mk	2010-05-30 22:24:10.000000000 +0200
++++ buildroot/package/qt/qt.mk	2010-10-06 15:25:30.000000000 +0200
 @@ -362,6 +362,14 @@
  QT_CONFIGURE+= -no-stl
  endif
@@ -41,12 +41,12 @@ Index: buildroot/package/qt/qt.mk
  # ccache and precompiled headers don't play well together
  ifeq ($(BR2_CCACHE),y)
  QT_CONFIGURE += -no-pch
-@@ -506,12 +514,10 @@
- 		-no-nis \
+@@ -507,11 +515,11 @@
  		-no-accessibility \
  		-no-separate-debug-info \
--		-prefix /usr \
-+		-prefix $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm \
+ 		-prefix /usr \
++		-examplesdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos \
++		-demosdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples \
  		-hostprefix $(STAGING_DIR)/usr \
  		-fast \
  		-no-rpath \
@@ -55,7 +55,7 @@ Index: buildroot/package/qt/qt.mk
  	)
  	touch $@
  
-@@ -589,8 +595,15 @@
+@@ -589,8 +597,15 @@
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
  endif
  
diff --git a/patches/buildroot/2010.05/133-qwt-add_package.patch b/patches/buildroot/2010.05/133-qwt-add_package.patch
index 490bdd7..0507f83 100644
--- a/patches/buildroot/2010.05/133-qwt-add_package.patch
+++ b/patches/buildroot/2010.05/133-qwt-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 
 Index: buildroot/package/Config.in
 ===================================================================
---- buildroot.orig/package/Config.in	2010-10-04 16:17:20.000000000 +0200
-+++ buildroot/package/Config.in	2010-10-04 16:22:39.000000000 +0200
+--- buildroot.orig/package/Config.in	2010-10-06 15:24:45.000000000 +0200
++++ buildroot/package/Config.in	2010-10-06 15:26:58.000000000 +0200
 @@ -126,6 +126,7 @@
  
  comment "other GUIs"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
 Index: buildroot/package/qwt/Config.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/Config.in	2010-10-04 16:23:25.000000000 +0200
++++ buildroot/package/qwt/Config.in	2010-10-06 15:26:58.000000000 +0200
 @@ -0,0 +1,20 @@
 +comment "Qwt requires Qt to be installed"
 +	depends on !BR2_PACKAGE_QT
@@ -42,7 +42,7 @@ Index: buildroot/package/qwt/Config.in
 Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch	2010-10-04 16:24:24.000000000 +0200
++++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch	2010-10-06 15:26:58.000000000 +0200
 @@ -0,0 +1,30 @@
 +--- qwt-5.2.1/qwtconfig.pri.orig	2010-09-28 14:34:01.000000000 +0200
 ++++ qwt-5.2.1/qwtconfig.pri	2010-09-28 15:37:02.000000000 +0200
@@ -77,7 +77,7 @@ Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
 Index: buildroot/package/qwt/qwt.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt.mk	2010-10-04 16:24:00.000000000 +0200
++++ buildroot/package/qwt/qwt.mk	2010-10-06 15:35:59.000000000 +0200
 @@ -0,0 +1,82 @@
 +######################################################################
 +#
@@ -120,10 +120,10 @@ Index: buildroot/package/qwt/qwt.mk
 +	(export INSTALL_ROOT=$(STAGING_DIR); $(MAKE) -C $(QWT_TARGET_DIR) install)
 +
 +$(TARGET_DIR)/usr/lib/libqwt.so: $(STAGING_DIR)/usr/lib/libqwt.so
-+	cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so.* $(TARGET_DIR)/usr/lib/
-+	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libqwt.so.*
++	cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so* $(TARGET_DIR)/usr/lib/
++	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libqwt.so*
 +
-+$(QWT_TARGET_DIR)/examples/.configured: $(TARGET_DIR)/usr/lib/libqwt.so
++$(QWT_TARGET_DIR)/examples/.configured:
 +	-[ -f $(QWT_TARGET_DIR)/examples/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR)/examples distclean
 +	$(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/examples/$(QWT_EXAMPLES_CONFIG_FILE)
 +	touch $@


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-43-g9204956

From: jscheer <js...@us...> - 2010-10-05 08:21: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  9204956b330d6568692ea98bb55271950ef45f20 (commit)
      from  abd13787added6092f3d61185f74eb4f3f6e9adb (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 9204956b330d6568692ea98bb55271950ef45f20
Author: Jeremie Scheer <jer...@ar...>
Date:   Tue Oct 5 10:20:03 2010 +0200

    [BUILDROOT] Add new package QWT 5.2.1 to Buildroot with examples that can be added to rootfs.
    [BUILDROOT] Add the possibility to build and install demos and examples in package Qt Embedded 4.6.2

-----------------------------------------------------------------------

Summary of changes:
 ...-qt-full_integration_with_cross_compiling.patch |   74 +++++++++
 patches/buildroot/133-qwt-add_package.patch        |  163 ++++++++++++++++++++
 ...-qt-full_integration_with_cross_compiling.patch |   74 +++++++++
 .../buildroot/2010.05/133-qwt-add_package.patch    |  163 ++++++++++++++++++++
 patches/buildroot/2010.05/cleanup_buildroot.sh     |    1 +
 patches/buildroot/cleanup_buildroot.sh             |    1 +
 6 files changed, 476 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
 create mode 100644 patches/buildroot/133-qwt-add_package.patch
 create mode 100644 patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
 create mode 100644 patches/buildroot/2010.05/133-qwt-add_package.patch

diff --git a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
new file mode 100644
index 0000000..251bc1f
--- /dev/null
+++ b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
@@ -0,0 +1,74 @@
+Add the possibility to build & install the Qt's demos and examples.
+This patch is still to be evolved toward Qt full integration in Buildroot.
+
+Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
+
+Index: buildroot/package/qtopia4/Config.in
+===================================================================
+--- buildroot.orig/package/qtopia4/Config.in	2010-10-04 15:36:08.000000000 +0200
++++ buildroot/package/qtopia4/Config.in	2010-10-04 15:36:39.000000000 +0200
+@@ -325,4 +325,14 @@
+ 	  Build the Qt Script Tools module.
+ 	  if unsure, say n.
+ 
++config BR2_PACKAGE_QT_DEMOS
++	bool "Demos"
++	help
++	  Build the Qt Demos.
++
++config BR2_PACKAGE_QT_EXAMPLES
++	bool "Examples"
++	help
++	  Build the Qt Examples.
++
+ endif # BR2_PACKAGE_QT
+Index: buildroot/package/qtopia4/qtopia4.mk
+===================================================================
+--- buildroot.orig/package/qtopia4/qtopia4.mk	2010-10-04 15:36:02.000000000 +0200
++++ buildroot/package/qtopia4/qtopia4.mk	2010-10-04 15:37:11.000000000 +0200
+@@ -345,6 +345,14 @@
+ QT_CONFIGURE+= -no-stl
+ endif
+ 
++ifneq ($(BR2_PACKAGE_QT_DEMOS),y)
++QT_CONFIGURE+= -nomake demos
++endif
++
++ifneq ($(BR2_PACKAGE_QT_EXAMPLES),y)
++QT_CONFIGURE+= -nomake examples
++endif
++
+ # ccache and precompiled headers don't play well together
+ ifeq ($(BR2_CCACHE),y)
+ QT_CONFIGURE += -no-pch
+@@ -482,12 +490,10 @@
+ 		-no-nis \
+ 		-no-accessibility \
+ 		-no-separate-debug-info \
+-		-prefix /usr \
++		-prefix $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm \
+ 		-hostprefix $(STAGING_DIR)/usr \
+ 		-fast \
+ 		-no-rpath \
+-		-nomake examples \
+-		-nomake demos \
+ 	)
+ 	touch $@
+ 
+@@ -560,8 +566,15 @@
+ 	cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
+ endif
+ 
++demos: $(STAGING_DIR)/usr/lib/libQtCore.la
++	mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos
++	cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/
++
++examples: $(STAGING_DIR)/usr/lib/libQtCore.la
++	mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples
++	cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/
+ 
+-$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) demos examples
+ 	# Strip all installed libs
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+ 	cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
diff --git a/patches/buildroot/133-qwt-add_package.patch b/patches/buildroot/133-qwt-add_package.patch
new file mode 100644
index 0000000..53af43f
--- /dev/null
+++ b/patches/buildroot/133-qwt-add_package.patch
@@ -0,0 +1,163 @@
+Add package QWT 5.2.1 to Buildroot. An option enables the build of the examples.
+
+Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in	2010-09-29 16:56:33.000000000 +0200
++++ buildroot/package/Config.in	2010-09-29 16:57:07.000000000 +0200
+@@ -357,6 +357,7 @@
+ comment "other GUIs"
+ source "package/qte/Config.in"
+ source "package/qtopia4/Config.in"
++source "package/qwt/Config.in"
+ 
+ #source "package/microwin/Config.in"
+ 
+Index: buildroot/package/qwt/Config.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qwt/Config.in	2010-09-29 16:58:58.000000000 +0200
+@@ -0,0 +1,20 @@
++comment "Qwt requires Qt to be installed"
++	depends on !BR2_PACKAGE_QT
++
++menuconfig BR2_PACKAGE_QWT
++	bool "Qwt"
++	depends on BR2_PACKAGE_QT
++	help
++	  Qwt for Embedded Linux.
++
++	  http://qwt.sourceforge.net/
++
++if BR2_PACKAGE_QWT
++
++config BR2_PACKAGE_QWT_EXAMPLES
++	bool "Examples"
++	select BR2_PACKAGE_QT_SVG
++	help
++	  Compile & install the examples.
++
++endif #BR2_PACKAGE_QWT
+Index: buildroot/package/qwt/qwt.mk
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qwt/qwt.mk	2010-09-29 17:00:04.000000000 +0200
+@@ -0,0 +1,82 @@
++######################################################################
++#
++# QWT
++#
++######################################################################
++
++QWT_VERSION:=5.2.1
++QWT_SOURCE:=qwt-$(QWT_VERSION).zip
++QWT_SITE:=https://sourceforge.net/projects/qwt/files/qwt/$(QWT_VERSION)
++QWT_UNZIP:=unzip
++QWT_TARGET_DIR:=$(BUILD_DIR)/qwt-$(QWT_VERSION)
++QWT_CONFIG_FILE:=qwt.pro
++QWT_EXAMPLES_CONFIG_FILE:=examples.pro
++QT_DIR:=$(STAGING_DIR)/usr
++
++$(DL_DIR)/$(QWT_SOURCE):
++	$(call DOWNLOAD,$(QWT_SITE),$(QWT_SOURCE))
++
++qwt-source: $(DL_DIR)/$(QWT_SOURCE)
++
++
++$(QWT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QWT_SOURCE)
++	$(QWT_UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(QWT_SOURCE)
++	toolchain/patch-kernel.sh $(QWT_TARGET_DIR) package/qwt/ \
++		qwt-$(QWT_VERSION)-\*.patch \
++		qwt-$(QWT_VERSION)-\*.patch.$(ARCH)
++	touch $@
++
++$(QWT_TARGET_DIR)/.configured: $(QWT_TARGET_DIR)/.unpacked
++	-[ -f $(QWT_TARGET_DIR)/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR) distclean
++	$(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/$(QWT_CONFIG_FILE)
++	touch $@
++
++$(QWT_TARGET_DIR)/.compiled: $(QWT_TARGET_DIR)/.configured
++	$(MAKE) -C $(QWT_TARGET_DIR)
++	touch $@
++
++$(STAGING_DIR)/usr/lib/libqwt.so: $(QWT_TARGET_DIR)/.compiled
++	(export INSTALL_ROOT=$(STAGING_DIR); $(MAKE) -C $(QWT_TARGET_DIR) install)
++
++$(TARGET_DIR)/usr/lib/libqwt.so: $(STAGING_DIR)/usr/lib/libqwt.so
++	cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so.* $(TARGET_DIR)/usr/lib/
++	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libqwt.so.*
++
++$(QWT_TARGET_DIR)/examples/.configured: $(TARGET_DIR)/usr/lib/libqwt.so
++	-[ -f $(QWT_TARGET_DIR)/examples/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR)/examples distclean
++	$(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/examples/$(QWT_EXAMPLES_CONFIG_FILE)
++	touch $@
++
++$(QWT_TARGET_DIR)/examples/.compiled: $(QWT_TARGET_DIR)/examples/.configured
++	$(MAKE) -C $(QWT_TARGET_DIR)/examples
++	touch $@
++
++$(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/bode: $(QWT_TARGET_DIR)/examples/.compiled
++	mkdir -p $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin
++	cp -f $(QWT_TARGET_DIR)/examples/bin/* $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin
++
++$(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin/bode: $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/bode
++	mkdir -p $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin
++	cp -f $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/* $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin
++
++ifneq ($(BR2_PACKAGE_QWT_EXAMPLES),y)
++qwt: qt $(TARGET_DIR)/usr/lib/libqwt.so
++else
++qwt: qt $(TARGET_DIR)/usr/lib/libqwt.so $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin/bode
++endif
++
++qwt-clean:
++	-$(MAKE) -C $(QWT_TARGET_DIR) clean
++	-rm $(TARGET_DIR)/usr/lib/libqwt.so.*
++
++qwt-dirclean:
++	rm -rf $(QWT_TARGET_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(BR2_PACKAGE_QWT),y)
++TARGETS+=qwt
++endif
+Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch	2010-09-29 17:00:52.000000000 +0200
+@@ -0,0 +1,30 @@
++--- qwt-5.2.1/qwtconfig.pri.orig	2010-09-28 14:34:01.000000000 +0200
+++++ qwt-5.2.1/qwtconfig.pri	2010-09-28 15:37:02.000000000 +0200
++@@ -115,7 +115,7 @@

++ # Otherwise you have to build it from the designer directory.

++ ######################################################################

++ 

++-CONFIG     += QwtDesigner

+++#CONFIG     += QwtDesigner

++ 

++ ######################################################################

++ # If you want to auto build the examples, enable the line below

++
++--- qwt-5.2.1/src/src.pro.orig	2010-09-28 14:40:39.000000000 +0200
+++++ qwt-5.2.1/src/src.pro	2010-09-28 14:41:29.000000000 +0200
++@@ -218,9 +218,12 @@

++ }

++ 

++ # Install directives

++-

++-headers.files  = $$HEADERS

++-doc.files      = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch

+++
+++target.path = /usr/lib

+++headers.files  = $$HEADERS
+++headers.path = /usr/include/qwt-5.2.1

+++doc.files      = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
+++doc.path = /usr/doc/qwt-5.2.1

++ unix {

++     doc.files      += $${QWT_ROOT}/doc/man

++ }
diff --git a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
new file mode 100644
index 0000000..f14c745
--- /dev/null
+++ b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
@@ -0,0 +1,74 @@
+Add the possibility to build & install the Qt's demos and examples.
+This patch is still to be evolved toward Qt full integration in Buildroot.
+
+Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
+
+Index: buildroot/package/qt/Config.in
+===================================================================
+--- buildroot.orig/package/qt/Config.in	2010-10-04 15:50:09.000000000 +0200
++++ buildroot/package/qt/Config.in	2010-10-04 15:52:44.000000000 +0200
+@@ -372,4 +372,14 @@
+ 	  Build the Qt Script Tools module.
+ 	  if unsure, say n.
+ 
++config BR2_PACKAGE_QT_DEMOS
++	bool "Demos"
++	help
++	  Build the Qt Demos.
++
++config BR2_PACKAGE_QT_EXAMPLES
++	bool "Examples"
++	help
++	  Build the Qt Examples.
++
+ endif # BR2_PACKAGE_QT
+Index: buildroot/package/qt/qt.mk
+===================================================================
+--- buildroot.orig/package/qt/qt.mk	2010-10-04 15:49:36.000000000 +0200
++++ buildroot/package/qt/qt.mk	2010-10-04 15:59:03.000000000 +0200
+@@ -362,6 +362,14 @@
+ QT_CONFIGURE+= -no-stl
+ endif
+ 
++ifneq ($(BR2_PACKAGE_QT_DEMOS),y)
++QT_CONFIGURE+= -nomake demos
++endif
++
++ifneq ($(BR2_PACKAGE_QT_EXAMPLES),y)
++QT_CONFIGURE+= -nomake examples
++endif
++
+ # ccache and precompiled headers don't play well together
+ ifeq ($(BR2_CCACHE),y)
+ QT_CONFIGURE += -no-pch
+@@ -506,12 +514,10 @@
+ 		-no-nis \
+ 		-no-accessibility \
+ 		-no-separate-debug-info \
+-		-prefix /usr \
++		-prefix $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm \
+ 		-hostprefix $(STAGING_DIR)/usr \
+ 		-fast \
+ 		-no-rpath \
+-		-nomake examples \
+-		-nomake demos \
+ 	)
+ 	touch $@
+ 
+@@ -589,8 +595,15 @@
+ 	cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
+ endif
+ 
++demos: $(STAGING_DIR)/usr/lib/libQtCore.la
++	mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos
++	cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/
++
++examples: $(STAGING_DIR)/usr/lib/libQtCore.la
++	mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples
++	cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/
+ 
+-$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) demos examples
+ 	# Strip all installed libs
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+ 	cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
diff --git a/patches/buildroot/2010.05/133-qwt-add_package.patch b/patches/buildroot/2010.05/133-qwt-add_package.patch
new file mode 100644
index 0000000..490bdd7
--- /dev/null
+++ b/patches/buildroot/2010.05/133-qwt-add_package.patch
@@ -0,0 +1,163 @@
+Add package QWT 5.2.1 to Buildroot. An option enables the build of the examples.
+
+Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in	2010-10-04 16:17:20.000000000 +0200
++++ buildroot/package/Config.in	2010-10-04 16:22:39.000000000 +0200
+@@ -126,6 +126,7 @@
+ 
+ comment "other GUIs"
+ source "package/qt/Config.in"
++source "package/qwt/Config.in"
+ 
+ #source "package/microwin/Config.in"
+ 
+Index: buildroot/package/qwt/Config.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qwt/Config.in	2010-10-04 16:23:25.000000000 +0200
+@@ -0,0 +1,20 @@
++comment "Qwt requires Qt to be installed"
++	depends on !BR2_PACKAGE_QT
++
++menuconfig BR2_PACKAGE_QWT
++	bool "Qwt"
++	depends on BR2_PACKAGE_QT
++	help
++	  Qwt for Embedded Linux.
++
++	  http://qwt.sourceforge.net/
++
++if BR2_PACKAGE_QWT
++
++config BR2_PACKAGE_QWT_EXAMPLES
++	bool "Examples"
++	select BR2_PACKAGE_QT_SVG
++	help
++	  Compile & install the examples.
++
++endif #BR2_PACKAGE_QWT
+Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch	2010-10-04 16:24:24.000000000 +0200
+@@ -0,0 +1,30 @@
++--- qwt-5.2.1/qwtconfig.pri.orig	2010-09-28 14:34:01.000000000 +0200
+++++ qwt-5.2.1/qwtconfig.pri	2010-09-28 15:37:02.000000000 +0200
++@@ -115,7 +115,7 @@

++ # Otherwise you have to build it from the designer directory.

++ ######################################################################

++ 

++-CONFIG     += QwtDesigner

+++#CONFIG     += QwtDesigner

++ 

++ ######################################################################

++ # If you want to auto build the examples, enable the line below

++
++--- qwt-5.2.1/src/src.pro.orig	2010-09-28 14:40:39.000000000 +0200
+++++ qwt-5.2.1/src/src.pro	2010-09-28 14:41:29.000000000 +0200
++@@ -218,9 +218,12 @@

++ }

++ 

++ # Install directives

++-

++-headers.files  = $$HEADERS

++-doc.files      = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch

+++
+++target.path = /usr/lib

+++headers.files  = $$HEADERS
+++headers.path = /usr/include/qwt-5.2.1

+++doc.files      = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
+++doc.path = /usr/doc/qwt-5.2.1

++ unix {

++     doc.files      += $${QWT_ROOT}/doc/man

++ }
+Index: buildroot/package/qwt/qwt.mk
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qwt/qwt.mk	2010-10-04 16:24:00.000000000 +0200
+@@ -0,0 +1,82 @@
++######################################################################
++#
++# QWT
++#
++######################################################################
++
++QWT_VERSION:=5.2.1
++QWT_SOURCE:=qwt-$(QWT_VERSION).zip
++QWT_SITE:=https://sourceforge.net/projects/qwt/files/qwt/$(QWT_VERSION)
++QWT_UNZIP:=unzip
++QWT_TARGET_DIR:=$(BUILD_DIR)/qwt-$(QWT_VERSION)
++QWT_CONFIG_FILE:=qwt.pro
++QWT_EXAMPLES_CONFIG_FILE:=examples.pro
++QT_DIR:=$(STAGING_DIR)/usr
++
++$(DL_DIR)/$(QWT_SOURCE):
++	$(call DOWNLOAD,$(QWT_SITE),$(QWT_SOURCE))
++
++qwt-source: $(DL_DIR)/$(QWT_SOURCE)
++
++
++$(QWT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QWT_SOURCE)
++	$(QWT_UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(QWT_SOURCE)
++	toolchain/patch-kernel.sh $(QWT_TARGET_DIR) package/qwt/ \
++		qwt-$(QWT_VERSION)-\*.patch \
++		qwt-$(QWT_VERSION)-\*.patch.$(ARCH)
++	touch $@
++
++$(QWT_TARGET_DIR)/.configured: $(QWT_TARGET_DIR)/.unpacked
++	-[ -f $(QWT_TARGET_DIR)/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR) distclean
++	$(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/$(QWT_CONFIG_FILE)
++	touch $@
++
++$(QWT_TARGET_DIR)/.compiled: $(QWT_TARGET_DIR)/.configured
++	$(MAKE) -C $(QWT_TARGET_DIR)
++	touch $@
++
++$(STAGING_DIR)/usr/lib/libqwt.so: $(QWT_TARGET_DIR)/.compiled
++	(export INSTALL_ROOT=$(STAGING_DIR); $(MAKE) -C $(QWT_TARGET_DIR) install)
++
++$(TARGET_DIR)/usr/lib/libqwt.so: $(STAGING_DIR)/usr/lib/libqwt.so
++	cp -dpf $(STAGING_DIR)/usr/lib/libqwt.so.* $(TARGET_DIR)/usr/lib/
++	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libqwt.so.*
++
++$(QWT_TARGET_DIR)/examples/.configured: $(TARGET_DIR)/usr/lib/libqwt.so
++	-[ -f $(QWT_TARGET_DIR)/examples/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR)/examples distclean
++	$(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/examples/$(QWT_EXAMPLES_CONFIG_FILE)
++	touch $@
++
++$(QWT_TARGET_DIR)/examples/.compiled: $(QWT_TARGET_DIR)/examples/.configured
++	$(MAKE) -C $(QWT_TARGET_DIR)/examples
++	touch $@
++
++$(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/bode: $(QWT_TARGET_DIR)/examples/.compiled
++	mkdir -p $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin
++	cp -f $(QWT_TARGET_DIR)/examples/bin/* $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin
++
++$(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin/bode: $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/bode
++	mkdir -p $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin
++	cp -f $(STAGING_DIR)/usr/local/qwt-5.2.1/examples/bin/* $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin
++
++ifneq ($(BR2_PACKAGE_QWT_EXAMPLES),y)
++qwt: qt $(TARGET_DIR)/usr/lib/libqwt.so
++else
++qwt: qt $(TARGET_DIR)/usr/lib/libqwt.so $(TARGET_DIR)/usr/local/qwt-5.2.1/examples/bin/bode
++endif
++
++qwt-clean:
++	-$(MAKE) -C $(QWT_TARGET_DIR) clean
++	-rm $(TARGET_DIR)/usr/lib/libqwt.so.*
++
++qwt-dirclean:
++	rm -rf $(QWT_TARGET_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(BR2_PACKAGE_QWT),y)
++TARGETS+=qwt
++endif
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index 339312b..41b3922 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -47,3 +47,4 @@ rm -rf buildroot/package/opentyrian/
 rm -rf buildroot/package/ipsec-tools/
 rm -rf buildroot/package/lbreakout2/
 rm -rf buildroot/package/ltris/
+rm -rf buildroot/package/qwt/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 556f19a..bf4397e 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -47,3 +47,4 @@ rm -rf buildroot/package/cwiid/
 rm -rf buildroot/package/urg/
 rm -rf buildroot/package/joysticktest/
 rm -rf buildroot/package/pickit2/
+rm -rf buildroot/package/qwt/


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-42-gabd1378

From: Gwenhael <gwe...@us...> - 2010-10-01 12:24:20

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  abd13787added6092f3d61185f74eb4f3f6e9adb (commit)
       via  b45f5e9cc63a47b6a17f00af87cc19339d66778b (commit)
      from  26111e5d2909cc920dc6e1541e98b5ed93bda0c3 (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 abd13787added6092f3d61185f74eb4f3f6e9adb
Merge: b45f5e9cc63a47b6a17f00af87cc19339d66778b 26111e5d2909cc920dc6e1541e98b5ed93bda0c3
Author: gwenhael <gwe...@us...>
Date:   Fri Oct 1 14:22:55 2010 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit b45f5e9cc63a47b6a17f00af87cc19339d66778b
Author: gwenhael <gwe...@us...>
Date:   Fri Oct 1 14:21:37 2010 +0200

    [LINUX] add support for spidev on apf9328

-----------------------------------------------------------------------

Summary of changes:
 .../2.6.29/021-armadeus-apf9328.patch              |   79 +++++++++++++++++---
 1 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
index fa9a6cc..d558383 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
@@ -3,8 +3,8 @@ DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
 (Take a look at armadeus/target/linux/ directory to know how to generate it)
 Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-imx/apf9328.c	2010-03-25 12:26:47.000000000 +0100
+--- /dev/null
++++ linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
 @@ -0,0 +1,627 @@
 +/*
 + * linux/arch/arm/mach-imx/apf9328.c
@@ -346,7 +346,7 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
 +};
 +
 +static struct spi_imx_master imx_spi1_master_info = {
-+	.num_chipselect	= 1,
++	.num_chipselect	= 2,
 +	.enable_dma     = 0,
 +};
 +
@@ -635,8 +635,8 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
 +MACHINE_END
 Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328_lcd_config.h
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-imx/apf9328_lcd_config.h	2010-03-25 11:50:57.000000000 +0100
+--- /dev/null
++++ linux-2.6.29.6/arch/arm/mach-imx/apf9328_lcd_config.h
 @@ -0,0 +1,301 @@
 +/*
 + *
@@ -941,8 +941,8 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328_lcd_config.h
 +#endif /* APF_LCD_CONFIG_H */
 Index: linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h	2010-03-25 11:50:57.000000000 +0100
+--- /dev/null
++++ linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h
 @@ -0,0 +1,68 @@
 +/*
 + * linux/include/asm-arm/arch-imx/apf9328.h
@@ -1014,9 +1014,9 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h
 +#endif /* __ASM_ARCH_APF9328_H */
 Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c	2010-03-25 11:50:57.000000000 +0100
-@@ -0,0 +1,281 @@
+--- /dev/null
++++ linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
+@@ -0,0 +1,338 @@
 +/*
 + * linux/arch/arm/mach-imx/apf9328-dev.c
 + * Declares hardware present on APF9328_DevLight or DevFull boards
@@ -1044,6 +1044,7 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
 +#include <linux/init.h>
 +#include <linux/interrupt.h>
 +#include <linux/spi/spi.h>
++#include <linux/spi/spidev.h>
 +#include <linux/spi/tsc2102.h>
 +#include "../../../drivers/net/can/mcp251x.h"
 +
@@ -1061,6 +1062,7 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
 +#include <mach/usb.h>
 +#include <mach/spi_imx.h>
 +#include <mach/imx-regs.h> /* imx_gpio_mode() */
++#include <mach/gpio.h>
 +#include <mach/imx-alsa.h>
 +#include <linux/usb/isp116x.h>
 +#include <mach/imx_ssi.h>
@@ -1077,6 +1079,10 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
 +#ifdef CONFIG_ARMADEUS_ISP1761_MODULE
 +#define CONFIG_ARMADEUS_ISP1761 1
 +#endif
++#ifdef CONFIG_SPI_SPIDEV_MODULE
++#define CONFIG_SPI_SPIDEV 1
++#endif
++
 +
 +
 +/*
@@ -1223,6 +1229,46 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
 +
 +#endif /* CONFIG_CAN_MCP251X */
 +
++/*
++ * APF9328 CONFIG SPIDEV
++ */
++#ifdef CONFIG_SPI_SPIDEV
++#define SPIDEV_CS_GPIOB 18
++
++static int spidev_init_gpio(void)
++{
++	/* SPI1 GPIOs */
++	imx_gpio_mode(PC14_PF_SPI1_SCLK);
++	imx_gpio_mode(PC16_PF_SPI1_MISO);
++	imx_gpio_mode(PC17_PF_SPI1_MOSI);
++
++	/* PortB 18 is used as chip select (in GPIO mode) */
++	DR(1) |= 1 << SPIDEV_CS_GPIOB; /* Initializes it High */
++	imx_gpio_mode(GPIO_PORTB | SPIDEV_CS_GPIOB | GPIO_OUT | GPIO_GIUS | GPIO_DR);
++
++	return 0;
++}
++
++/* Chip select command for spidev */
++static void spidev_cs(u32 command)
++{
++	/* PortB 18 is used as chip select */
++	if (command == SPI_CS_DEASSERT)
++		DR(1) |= 1<< SPIDEV_CS_GPIOB;
++	else
++		DR(1) &= ~(1<< SPIDEV_CS_GPIOB);
++}
++
++static struct spi_imx_chip spidev_hw = {
++	.cs_control     = spidev_cs,
++};
++
++static struct spidev_platform_data apf9328_spidev_config = {
++	.init = spidev_init_gpio,
++};
++
++#endif /* CONFIG_SPI_SPIDEV */
++
 +
 +static struct spi_board_info spi_dev_board_info[] __initdata = {
 +#ifdef CONFIG_SPI_TSC2102
@@ -1249,6 +1295,17 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
 +	.platform_data	= &apf9328_mcp251x_config,
 +},
 +#endif
++#ifdef CONFIG_SPI_SPIDEV
++{
++	.modalias          = "spidev",
++	.controller_data    = &spidev_hw,
++	.max_speed_hz      = 8000000, /* 8MHz */
++	.bus_num           = 1, /* SPI1 */
++	.mode              = SPI_MODE_0,
++	.chip_select       = 1, 
++	.platform_data     = &apf9328_spidev_config,
++},
++#endif /* CONFIG_SPI_SPIDEV */
 +};
 +
 +/*
@@ -1291,7 +1348,7 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
 +#endif
 +	platform_add_devices(devices, ARRAY_SIZE(devices));
 +
-+#if defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X)
++#if defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X) || defined(CONFIG_SPI_SPIDEV)
 +	spi_register_board_info(spi_dev_board_info, ARRAY_SIZE(spi_dev_board_info));
 +#endif
 +


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-40-g26111e5

From: Julien B a. A. <ar...@us...> - 2010-09-30 20:35: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  26111e5d2909cc920dc6e1541e98b5ed93bda0c3 (commit)
      from  af0d71b1094c063826a23044cae3cd5c5b6e3423 (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 26111e5d2909cc920dc6e1541e98b5ed93bda0c3
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Sep 30 22:35:02 2010 +0200

    [TOOLS] loadgpio.sh often needs to be overwritten by users, so change a little bit the way we install it

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/drivers-helpers/drivers-helpers.mk    |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/buildroot/package/armadeus/drivers-helpers/drivers-helpers.mk b/buildroot/package/armadeus/drivers-helpers/drivers-helpers.mk
index 6b46296..39b5777 100644
--- a/buildroot/package/armadeus/drivers-helpers/drivers-helpers.mk
+++ b/buildroot/package/armadeus/drivers-helpers/drivers-helpers.mk
@@ -8,8 +8,9 @@ ARMADEUS-DRIVERS_SOURCE_DIR:=$(TOPDIR)/../target/linux/modules
 ARMADEUS-DRIVERS-HELPERS_TARGET_DIR:=$(TARGET_DIR)/usr/bin
 
 
-$(ARMADEUS-DRIVERS-HELPERS_TARGET_DIR)/loadgpio.sh: $(ARMADEUS-DRIVERS_SOURCE_DIR)/gpio/loadgpio.sh
-	cp -f $^ $@
+# loadgpio.sh often needs to be overwritten by users
+$(ARMADEUS-DRIVERS-HELPERS_TARGET_DIR)/loadgpio.sh:
+	cp -f $(ARMADEUS-DRIVERS_SOURCE_DIR)/gpio/loadgpio.sh $@
 ARMADEUS-DRIVERS_TARGETS+=$(ARMADEUS-DRIVERS-HELPERS_TARGET_DIR)/loadgpio.sh
 
 $(ARMADEUS-DRIVERS-HELPERS_TARGET_DIR)/gpio_helpers.sh: $(ARMADEUS-DRIVERS_SOURCE_DIR)/gpio/gpio_helpers.sh


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-39-gaf0d71b

From: Julien B a. A. <ar...@us...> - 2010-09-30 20:05:58

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  af0d71b1094c063826a23044cae3cd5c5b6e3423 (commit)
       via  f5941bbf9b63225b0fb411472040b25ceba534f9 (commit)
       via  aa8155a96f14205409b02a6ecb5c02d2eaefbeeb (commit)
      from  53ec075d32b7664998c4aeb64fa47b225689a8d9 (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 af0d71b1094c063826a23044cae3cd5c5b6e3423
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Sep 30 22:05:19 2010 +0200

    [LINUX] apf9328: makes mach/gpio.h includable several times

commit f5941bbf9b63225b0fb411472040b25ceba534f9
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Sep 30 19:33:21 2010 +0200

    Updates apf9328 Linux default config

commit aa8155a96f14205409b02a6ecb5c02d2eaefbeeb
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Sep 30 19:03:02 2010 +0200

    [LINUX] ov3640: makes the sensor detected correctly and initialized in a default mode compatible with apf27

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/apf9328/apf9328-linux-2.6.29.config   |    4 +-
 ...mach-imx_gpio_h_includable_more_than_once.patch |   16 +
 ...adeus-soc_camera-add_ov3640_sensor_driver.patch | 1180 +++++++++++++++-----
 3 files changed, 940 insertions(+), 260 deletions(-)
 create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/080-apf9328-armadeus-makes_mach-imx_gpio_h_includable_more_than_once.patch

diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
index 047fb13..cd842d9 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29.6
-# Sun Dec 20 12:29:08 2009
+# Thu Sep 30 19:09:01 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -777,6 +777,7 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_AD7414 is not set
 # CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_AS1531 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -1190,6 +1191,7 @@ CONFIG_ARMADEUS_DRIVERS=y
 # Misc.
 #
 # CONFIG_ARMADEUS_GENERIC_DRIVER is not set
+# CONFIG_ARMADEUS_AS1531_PLAT is not set
 CONFIG_ARMADEUS_GPIO_DRIVER=m
 CONFIG_ARMADEUS_PPDEV_DRIVER=m
 CONFIG_ARMADEUS_KEYPAD_DRIVER=m
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/080-apf9328-armadeus-makes_mach-imx_gpio_h_includable_more_than_once.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/080-apf9328-armadeus-makes_mach-imx_gpio_h_includable_more_than_once.patch
new file mode 100644
index 0000000..a0e6166
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/080-apf9328-armadeus-makes_mach-imx_gpio_h_includable_more_than_once.patch
@@ -0,0 +1,16 @@
+
+Without this modification, it's not possible to "#include <mach/gpio.h>" in
+different places that can be called from the same source file.
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+
+Index: linux-2.6.29.6/arch/arm/mach-imx/include/mach/gpio.h
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/mach-imx/include/mach/gpio.h	2010-09-30 19:55:32.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-imx/include/mach/gpio.h	2010-09-30 19:55:51.000000000 +0200
+@@ -1,4 +1,5 @@
+ #ifndef _IMX_GPIO_H
++#define _IMX_GPIO_H
+ 
+ #include <linux/kernel.h>
+ #include <mach/imx-regs.h>
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/361-armadeus-soc_camera-add_ov3640_sensor_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/361-armadeus-soc_camera-add_ov3640_sensor_driver.patch
index f777fd3..2f7aa7c 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/361-armadeus-soc_camera-add_ov3640_sensor_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/361-armadeus-soc_camera-add_ov3640_sensor_driver.patch
@@ -1,7 +1,7 @@
 Index: linux-2.6.29.6/drivers/media/video/Kconfig
 ===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Kconfig	2010-07-23 11:41:31.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Kconfig	2010-07-23 11:41:31.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/media/video/Kconfig	2010-09-27 15:45:46.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Kconfig	2010-09-27 15:45:46.000000000 +0200
 @@ -783,6 +783,12 @@
  	help
  	  This is a generic SoC camera platform driver, useful for testing
@@ -17,8 +17,8 @@ Index: linux-2.6.29.6/drivers/media/video/Kconfig
  	depends on SOC_CAMERA && I2C
 Index: linux-2.6.29.6/drivers/media/video/Makefile
 ===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Makefile	2010-07-23 11:41:31.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Makefile	2010-07-23 11:41:31.000000000 +0200
+--- linux-2.6.29.6.orig/drivers/media/video/Makefile	2010-09-27 15:45:46.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Makefile	2010-09-27 15:45:46.000000000 +0200
 @@ -144,6 +144,7 @@
  obj-$(CONFIG_SOC_CAMERA_MT9M111)	+= mt9m111.o
  obj-$(CONFIG_SOC_CAMERA_MT9T031)	+= mt9t031.o
@@ -30,20 +30,24 @@ Index: linux-2.6.29.6/drivers/media/video/Makefile
 Index: linux-2.6.29.6/drivers/media/video/ov3640.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/media/video/ov3640.c	2010-07-27 12:28:15.000000000 +0200
-@@ -0,0 +1,1459 @@
++++ linux-2.6.29.6/drivers/media/video/ov3640.c	2010-09-30 18:46:25.000000000 +0200
+@@ -0,0 +1,2115 @@
 +/*
++ * OV3640 driver (soc_camera)
 + *
 + * Copyright 2010 Armadeus Systems
 + *
-+ * Based on work (init sequences) which is:
++ * Based on drivers which are:
 + * Copyright 2005-2009 Freescale Semiconductor, Inc. All Rights Reserved.
++ * Copyright 2010 Texas Instruments.
 + *
 + * This file is licensed under the terms of the GNU General Public License
 + * version 2. This program is licensed "as is" without any warranty of any
 + * kind, whether express or implied.
 + */
 +
++#define DEBUG
++
 +#include <linux/module.h>
 +#include <linux/init.h>
 +#include <linux/slab.h>
@@ -61,14 +65,6 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
 +
 +#define DRIVER_NAME "ov3640"
 +
-+#define CAMERA_DBG
-+
-+#ifdef CAMERA_DBG
-+	#define CAMERA_TRACE(x) (printk)x
-+#else
-+	#define CAMERA_TRACE(x)
-+#endif
-+
 +#define OV3640_VOLTAGE_ANALOG               2800000
 +#define OV3640_VOLTAGE_DIGITAL_CORE         1500000
 +#define OV3640_VOLTAGE_DIGITAL_IO           1800000
@@ -233,248 +229,908 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
 +#define NUM_CAPTURE_FORMATS (sizeof(ov3640_formats) / sizeof(ov3640_formats[0]))
 +
 +static struct reg_value ov3640_setting_15fps_QXGA_2048_1536[] = {
-+	{0x3012, 0x80, 0, 0}, {0x304d, 0x45, 0, 0}, {0x30a7, 0x5e, 0, 0},
-+	{0x3087, 0x16, 0, 0}, {0x309c, 0x1a, 0, 0}, {0x30a2, 0xe4, 0, 0},
-+	{0x30aa, 0x42, 0, 0}, {0x30b0, 0xff, 0, 0}, {0x30b1, 0xff, 0, 0},
-+	{0x30b2, 0x10, 0, 0}, {0x300e, 0x32, 0, 0}, {0x300f, 0x21, 0, 0},
-+	{0x3010, 0x20, 0, 0}, {0x3011, 0x00, 0, 0}, {0x304c, 0x81, 0, 0},
-+	{0x30d7, 0x10, 0, 0}, {0x30d9, 0x0d, 0, 0}, {0x30db, 0x08, 0, 0},
-+	{0x3016, 0x82, 0, 0}, {0x3018, 0x38, 0, 0}, {0x3019, 0x30, 0, 0},
-+	{0x301a, 0x61, 0, 0}, {0x307d, 0x00, 0, 0}, {0x3087, 0x02, 0, 0},
-+	{0x3082, 0x20, 0, 0}, {0x3015, 0x12, 0, 0}, {0x3014, 0x04, 0, 0},
-+	{0x3013, 0xf7, 0, 0}, {0x303c, 0x08, 0, 0}, {0x303d, 0x18, 0, 0},
-+	{0x303e, 0x06, 0, 0}, {0x303f, 0x0c, 0, 0}, {0x3030, 0x62, 0, 0},
-+	{0x3031, 0x26, 0, 0}, {0x3032, 0xe6, 0, 0}, {0x3033, 0x6e, 0, 0},
-+	{0x3034, 0xea, 0, 0}, {0x3035, 0xae, 0, 0}, {0x3036, 0xa6, 0, 0},
-+	{0x3037, 0x6a, 0, 0}, {0x3104, 0x02, 0, 0}, {0x3105, 0xfd, 0, 0},
-+	{0x3106, 0x00, 0, 0}, {0x3107, 0xff, 0, 0}, {0x3300, 0x12, 0, 0},
-+	{0x3301, 0xde, 0, 0}, {0x3302, 0xcf, 0, 0}, {0x3312, 0x26, 0, 0},
-+	{0x3314, 0x42, 0, 0}, {0x3313, 0x2b, 0, 0}, {0x3315, 0x42, 0, 0},
-+	{0x3310, 0xd0, 0, 0}, {0x3311, 0xbd, 0, 0}, {0x330c, 0x18, 0, 0},
-+	{0x330d, 0x18, 0, 0}, {0x330e, 0x56, 0, 0}, {0x330f, 0x5c, 0, 0},
-+	{0x330b, 0x1c, 0, 0}, {0x3306, 0x5c, 0, 0}, {0x3307, 0x11, 0, 0},
-+	{0x336a, 0x52, 0, 0}, {0x3370, 0x46, 0, 0}, {0x3376, 0x38, 0, 0},
-+	{0x30b8, 0x20, 0, 0}, {0x30b9, 0x17, 0, 0}, {0x30ba, 0x04, 0, 0},
-+	{0x30bb, 0x08, 0, 0}, {0x3507, 0x06, 0, 0}, {0x350a, 0x4f, 0, 0},
-+	{0x3100, 0x02, 0, 0}, {0x3301, 0xde, 0, 0}, {0x3304, 0x00, 0, 0},
-+	{0x3400, 0x00, 0, 0}, {0x3404, 0x02, 0, 0}, {0x3600, 0xc4, 0, 0},
-+	{0x3302, 0xef, 0, 0}, {0x3020, 0x01, 0, 0}, {0x3021, 0x1d, 0, 0},
-+	{0x3022, 0x00, 0, 0}, {0x3023, 0x0a, 0, 0}, {0x3024, 0x08, 0, 0},
-+	{0x3025, 0x00, 0, 0}, {0x3026, 0x06, 0, 0}, {0x3027, 0x00, 0, 0},
-+	{0x335f, 0x68, 0, 0}, {0x3360, 0x00, 0, 0}, {0x3361, 0x00, 0, 0},
-+	{0x3362, 0x68, 0, 0}, {0x3363, 0x00, 0, 0}, {0x3364, 0x00, 0, 0},
-+	{0x3403, 0x00, 0, 0}, {0x3088, 0x08, 0, 0}, {0x3089, 0x00, 0, 0},
-+	{0x308a, 0x06, 0, 0}, {0x308b, 0x00, 0, 0}, {0x307c, 0x10, 0, 0},
-+	{0x3090, 0xc0, 0, 0}, {0x304c, 0x84, 0, 0}, {0x308d, 0x04, 0, 0},
-+	{0x3086, 0x03, 0, 0}, {0x3086, 0x00, 0, 0}, {0x3012, 0x00, 0, 0},
-+	{0x3020, 0x01, 0, 0}, {0x3021, 0x1d, 0, 0}, {0x3022, 0x00, 0, 0},
-+	{0x3023, 0x0a, 0, 0}, {0x3024, 0x08, 0, 0}, {0x3025, 0x18, 0, 0},
-+	{0x3026, 0x06, 0, 0}, {0x3027, 0x0c, 0, 0}, {0x302a, 0x06, 0, 0},
-+	{0x302b, 0x20, 0, 0}, {0x3075, 0x44, 0, 0}, {0x300d, 0x00, 0, 0},
-+	{0x30d7, 0x00, 0, 0}, {0x3069, 0x40, 0, 0}, {0x303e, 0x01, 0, 0},
-+	{0x303f, 0x80, 0, 0}, {0x3302, 0x20, 0, 0}, {0x335f, 0x68, 0, 0},
-+	{0x3360, 0x18, 0, 0}, {0x3361, 0x0c, 0, 0}, {0x3362, 0x68, 0, 0},
-+	{0x3363, 0x08, 0, 0}, {0x3364, 0x04, 0, 0}, {0x3403, 0x42, 0, 0},
-+	{0x3088, 0x08, 0, 0}, {0x3089, 0x00, 0, 0}, {0x308a, 0x06, 0, 0},
-+	{0x308b, 0x00, 0, 0},
++	{OV3640_SYS, 0x80, 0, 0},
++	{0x304d, 0x45, 0, 0},
++	{0x30a7, 0x5e, 0, 0},
++	{OV3640_TMC11, 0x16, 0, 0},
++	{0x309c, 0x1a, 0, 0},	/* reserved */
++	{0x30a2, 0xe4, 0, 0},	/* reserved */
++	{0x30aa, 0x42, 0, 0},	/* reserved */
++	{OV3640_IO_CTRL0, 0xff, 0, 0},
++	{OV3640_IO_CTRL1, 0xff, 0, 0},
++	{OV3640_IO_CTRL2, 0x10, 0, 0},
++	{OV3640_PLL_1, 0x32, 0, 0},
++	{OV3640_PLL_2, 0x21, 0, 0},
++	{OV3640_PLL_3, 0x20, 0, 0},
++	{OV3640_CLK, 0x00, 0, 0},
++	{0x304c, 0x81, 0, 0},	/* reserved */
++	{0x30d7, 0x10, 0, 0},	/* reserved */
++	{0x30d9, 0x0d, 0, 0},	/* reserved */
++	{0x30db, 0x08, 0, 0},	/* reserved */
++	{0x3016, 0x82, 0, 0},	/* reserved */
++	{OV3640_WPT_HISH, 0x38, 0, 0},
++	{OV3640_BPT_HISL, 0x30, 0, 0},
++	{OV3640_VPT, 0x61, 0, 0},
++	{OV3640_TMC7, 0x00, 0, 0},
++	{OV3640_TMC11, 0x02, 0, 0},
++	{0x3082, 0x20, 0, 0},	/* reserved */
++	{OV3640_AUTO_3, 0x12, 0, 0},
++	{OV3640_AUTO_2, 0x04, 0, 0},
++	{OV3640_AUTO_1, 0xf7, 0, 0},
++	{OV3640_AHW_H, 0x08, 0, 0},
++	{OV3640_AHW_L, 0x18, 0, 0},
++	{OV3640_AVH_H, 0x06, 0, 0},
++	{OV3640_AVH_L, 0x0c, 0, 0},
++	{OV3640_WEIGHT0, 0x62, 0, 0},
++	{OV3640_WEIGHT1, 0x26, 0, 0},
++	{OV3640_WEIGHT2, 0xe6, 0, 0},
++	{OV3640_WEIGHT3, 0x6e, 0, 0},
++	{OV3640_WEIGHT4, 0xea, 0, 0},
++	{OV3640_WEIGHT5, 0xae, 0, 0},
++	{OV3640_WEIGHT6, 0xa6, 0, 0},
++	{OV3640_WEIGHT7, 0x6a, 0, 0},
++	{OV3640_SC_SYN_CTRL0, 0x02, 0, 0},
++	{OV3640_SC_SYN_CTRL1, 0xfd, 0, 0},
++	{OV3640_SC_SYN_CTRL2, 0x00, 0, 0},
++	{OV3640_SC_SYN_CTRL3, 0xff, 0, 0},
++	{OV3640_DSP_CTRL_0, 0x12, 0, 0},
++	{OV3640_DSP_CTRL_1, 0xde, 0, 0},
++	{OV3640_DSP_CTRL_2, 0xcf, 0, 0},
++	{0x3312, 0x26, 0, 0},
++	{0x3314, 0x42, 0, 0},
++	{0x3313, 0x2b, 0, 0},
++	{0x3315, 0x42, 0, 0},
++	{0x3310, 0xd0, 0, 0},
++	{0x3311, 0xbd, 0, 0},
++	{0x330c, 0x18, 0, 0},
++	{0x330d, 0x18, 0, 0},
++	{0x330e, 0x56, 0, 0},
++	{0x330f, 0x5c, 0, 0},
++	{0x330b, 0x1c, 0, 0},
++	{0x3306, 0x5c, 0, 0},
++	{0x3307, 0x11, 0, 0},
++	{OV3640_R_A1, 0x52, 0, 0},
++	{OV3640_G_A1, 0x46, 0, 0},
++	{OV3640_B_A1, 0x38, 0, 0},
++	{OV3640_DSPC0, 0x20, 0, 0},
++	{OV3640_DSPC1, 0x17, 0, 0},
++	{OV3640_DSPC2, 0x04, 0, 0},
++	{OV3640_DSPC3, 0x08, 0, 0},
++	{0x3507, 0x06, 0, 0},
++	{0x350a, 0x4f, 0, 0},
++	{OV3640_SC_CTRL0, 0x02, 0, 0},
++	{OV3640_DSP_CTRL_1, 0xde, 0, 0},
++	{OV3640_DSP_CTRL_4, 0x00, 0, 0},
++	{OV3640_FMT_MUX_CTRL0, 0x00, 0, 0},
++	{OV3640_FMT_CTRL00, 0x02, 0, 0},
++	{OV3640_OUT_CTRL00, 0xc4, 0, 0},
++	{OV3640_DSP_CTRL_2, 0xef, 0, 0},
++	{OV3640_HS_H, 0x01, 0, 0},
++	{OV3640_HS_L, 0x1d, 0, 0},
++	{OV3640_VS_H, 0x00, 0, 0},
++	{OV3640_VS_L, 0x0a, 0, 0},
++	{OV3640_HW_H, 0x08, 0, 0},
++	{OV3640_HW_L, 0x00, 0, 0},
++	{OV3640_VH_H, 0x06, 0, 0},
++	{OV3640_VH_L, 0x00, 0, 0},
++	{OV3640_SIZE_IN_MISC, 0x68, 0, 0},
++	{OV3640_HSIZE_IN_L, 0x00, 0, 0},
++	{OV3640_VSIZE_IN_L, 0x00, 0, 0},
++	{OV3640_SIZE_OUT_MISC, 0x68, 0, 0},
++	{OV3640_HSIZE_OUT_L, 0x00, 0, 0},
++	{OV3640_VSIZE_OUT_L, 0x00, 0, 0},
++	{OV3640_ISP_PAD_CTR2, 0x00, 0, 0},
++	{OV3640_ISP_XOUT_H, 0x08, 0, 0},
++	{OV3640_ISP_XOUT_L, 0x00, 0, 0},
++	{OV3640_ISP_YOUT_H, 0x06, 0, 0},
++	{OV3640_ISP_YOUT_L, 0x00, 0, 0},
++	{OV3640_TMC6, 0x10, 0, 0},
++	{0x3090, 0xc0, 0, 0},
++	{0x304c, 0x84, 0, 0},	/* reserved */
++	{OV3640_TMC13, 0x04, 0, 0},
++	{OV3640_TMC10, 0x03, 0, 0},
++	{OV3640_TMC10, 0x00, 0, 0},
++	{OV3640_SYS, 0x00, 0, 0},
++	{OV3640_HS_H, 0x01, 0, 0},
++	{OV3640_HS_L, 0x1d, 0, 0},
++	{OV3640_VS_H, 0x00, 0, 0},
++	{OV3640_VS_L, 0x0a, 0, 0},
++	{OV3640_HW_H, 0x08, 0, 0},
++	{OV3640_HW_L, 0x18, 0, 0},
++	{OV3640_VH_H, 0x06, 0, 0},
++	{OV3640_VH_L, 0x0c, 0, 0},
++	{OV3640_VTS_H, 0x06, 0, 0},
++	{OV3640_VTS_L, 0x20, 0, 0},
++	{OV3640_VSYNCOPT, 0x44, 0, 0},
++	{OV3640_PCLK, 0x00, 0, 0},
++	{0x30d7, 0x00, 0, 0},	/* reserved */
++	{OV3640_BLC9, 0x40, 0, 0},
++	{OV3640_AVH_H, 0x01, 0, 0},
++	{OV3640_AVH_L, 0x80, 0, 0},
++	{OV3640_DSP_CTRL_2, 0x20, 0, 0},
++	{OV3640_SIZE_IN_MISC, 0x68, 0, 0},
++	{OV3640_HSIZE_IN_L, 0x18, 0, 0},
++	{OV3640_VSIZE_IN_L, 0x0c, 0, 0},
++	{OV3640_SIZE_OUT_MISC, 0x68, 0, 0},
++	{OV3640_HSIZE_OUT_L, 0x08, 0, 0},
++	{OV3640_VSIZE_OUT_L, 0x04, 0, 0},
++	{OV3640_ISP_PAD_CTR2, 0x42, 0, 0},
++	{OV3640_ISP_XOUT_H, 0x08, 0, 0},
++	{OV3640_ISP_XOUT_L, 0x00, 0, 0},
++	{OV3640_ISP_YOUT_H, 0x06, 0, 0},
++	{OV3640_ISP_YOUT_L, 0x00, 0, 0},
 +};
 +
 +static struct reg_value ov3640_setting_15fps_XGA_1024_768[] = {
-+	{0x3012, 0x80, 0, 0}, {0x304d, 0x45, 0, 0}, {0x30a7, 0x5e, 0, 0},
-+	{0x3087, 0x16, 0, 0}, {0x309c, 0x1a, 0, 0}, {0x30a2, 0xe4, 0, 0},
-+	{0x30aa, 0x42, 0, 0}, {0x30b0, 0xff, 0, 0}, {0x30b1, 0xff, 0, 0},
-+	{0x30b2, 0x10, 0, 0}, {0x300e, 0x32, 0, 0}, {0x300f, 0x21, 0, 0},
-+	{0x3010, 0x20, 0, 0}, {0x3011, 0x00, 0, 0}, {0x304c, 0x81, 0, 0},
-+	{0x3016, 0x82, 0, 0}, {0x3018, 0x38, 0, 0}, {0x3019, 0x30, 0, 0},
-+	{0x301a, 0x61, 0, 0}, {0x307d, 0x00, 0, 0}, {0x3087, 0x02, 0, 0},
-+	{0x3082, 0x20, 0, 0}, {0x3015, 0x12, 0, 0}, {0x3014, 0x04, 0, 0},
-+	{0x3013, 0xf7, 0, 0}, {0x303c, 0x08, 0, 0}, {0x303d, 0x18, 0, 0},
-+	{0x303e, 0x06, 0, 0}, {0x303f, 0x0c, 0, 0}, {0x3030, 0x62, 0, 0},
-+	{0x3031, 0x26, 0, 0}, {0x3032, 0xe6, 0, 0}, {0x3033, 0x6e, 0, 0},
-+	{0x3034, 0xea, 0, 0}, {0x3035, 0xae, 0, 0}, {0x3036, 0xa6, 0, 0},
-+	{0x3037, 0x6a, 0, 0}, {0x3104, 0x02, 0, 0}, {0x3105, 0xfd, 0, 0},
-+	{0x3106, 0x00, 0, 0}, {0x3107, 0xff, 0, 0}, {0x3300, 0x12, 0, 0},
-+	{0x3301, 0xde, 0, 0}, {0x3302, 0xcf, 0, 0}, {0x3312, 0x26, 0, 0},
++	{OV3640_SYS, 0x80, 0, 0}, {0x304d, 0x45, 0, 0}, {0x30a7, 0x5e, 0, 0},
++	{OV3640_TMC11, 0x16, 0, 0}, {0x309c, 0x1a, 0, 0},	/* reserved */ {0x30a2, 0xe4, 0, 0},	/* reserved */
++	{0x30aa, 0x42, 0, 0},	/* reserved */ {OV3640_IO_CTRL0, 0xff, 0, 0}, {OV3640_IO_CTRL1, 0xff, 0, 0},
++	{OV3640_IO_CTRL2, 0x10, 0, 0}, {OV3640_PLL_1, 0x32, 0, 0}, {OV3640_PLL_2, 0x21, 0, 0},
++	{OV3640_PLL_3, 0x20, 0, 0}, {OV3640_CLK, 0x00, 0, 0}, {0x304c, 0x81, 0, 0},	/* reserved */
++	{0x3016, 0x82, 0, 0},	/* reserved */ {OV3640_WPT_HISH, 0x38, 0, 0}, {OV3640_BPT_HISL, 0x30, 0, 0},
++	{OV3640_VPT, 0x61, 0, 0}, {OV3640_TMC7, 0x00, 0, 0}, {OV3640_TMC11, 0x02, 0, 0},
++	{0x3082, 0x20, 0, 0},	/* reserved */ {OV3640_AUTO_3, 0x12, 0, 0}, {OV3640_AUTO_2, 0x04, 0, 0},
++	{OV3640_AUTO_1, 0xf7, 0, 0}, {OV3640_AHW_H, 0x08, 0, 0}, {OV3640_AHW_L, 0x18, 0, 0},
++	{OV3640_AVH_H, 0x06, 0, 0}, {OV3640_AVH_L, 0x0c, 0, 0}, {OV3640_WEIGHT0, 0x62, 0, 0},
++	{OV3640_WEIGHT1, 0x26, 0, 0}, {OV3640_WEIGHT2, 0xe6, 0, 0}, {OV3640_WEIGHT3, 0x6e, 0, 0},
++	{OV3640_WEIGHT4, 0xea, 0, 0}, {OV3640_WEIGHT5, 0xae, 0, 0}, {OV3640_WEIGHT6, 0xa6, 0, 0},
++	{OV3640_WEIGHT7, 0x6a, 0, 0}, {OV3640_SC_SYN_CTRL0, 0x02, 0, 0}, {OV3640_SC_SYN_CTRL1, 0xfd, 0, 0},
++	{OV3640_SC_SYN_CTRL2, 0x00, 0, 0}, {OV3640_SC_SYN_CTRL3, 0xff, 0, 0}, {OV3640_DSP_CTRL_0, 0x12, 0, 0},
++	{OV3640_DSP_CTRL_1, 0xde, 0, 0}, {OV3640_DSP_CTRL_2, 0xcf, 0, 0}, {0x3312, 0x26, 0, 0},
 +	{0x3314, 0x42, 0, 0}, {0x3313, 0x2b, 0, 0}, {0x3315, 0x42, 0, 0},
 +	{0x3310, 0xd0, 0, 0}, {0x3311, 0xbd, 0, 0}, {0x330c, 0x18, 0, 0},
 +	{0x330d, 0x18, 0, 0}, {0x330e, 0x56, 0, 0}, {0x330f, 0x5c, 0, 0},
 +	{0x330b, 0x1c, 0, 0}, {0x3306, 0x5c, 0, 0}, {0x3307, 0x11, 0, 0},
-+	{0x336a, 0x52, 0, 0}, {0x3370, 0x46, 0, 0}, {0x3376, 0x38, 0, 0},
-+	{0x30b8, 0x20, 0, 0}, {0x30b9, 0x17, 0, 0}, {0x30ba, 0x04, 0, 0},
-+	{0x30bb, 0x08, 0, 0}, {0x3507, 0x06, 0, 0}, {0x350a, 0x4f, 0, 0},
-+	{0x3100, 0x02, 0, 0}, {0x3301, 0xde, 0, 0}, {0x3304, 0x00, 0, 0},
-+	{0x3400, 0x01, 0, 0}, {0x3404, 0x1d, 0, 0}, {0x3600, 0xc4, 0, 0},
-+	{0x3302, 0xef, 0, 0}, {0x3020, 0x01, 0, 0}, {0x3021, 0x1d, 0, 0},
-+	{0x3022, 0x00, 0, 0}, {0x3023, 0x0a, 0, 0}, {0x3024, 0x08, 0, 0},
-+	{0x3025, 0x00, 0, 0}, {0x3026, 0x06, 0, 0}, {0x3027, 0x00, 0, 0},
-+	{0x335f, 0x68, 0, 0}, {0x3360, 0x00, 0, 0}, {0x3361, 0x00, 0, 0},
-+	{0x3362, 0x34, 0, 0}, {0x3363, 0x00, 0, 0}, {0x3364, 0x00, 0, 0},
-+	{0x3403, 0x00, 0, 0}, {0x3088, 0x04, 0, 0}, {0x3089, 0x00, 0, 0},
-+	{0x308a, 0x03, 0, 0}, {0x308b, 0x00, 0, 0}, {0x307c, 0x10, 0, 0},
-+	{0x3090, 0xc0, 0, 0}, {0x304c, 0x84, 0, 0}, {0x308d, 0x04, 0, 0},
-+	{0x3086, 0x03, 0, 0}, {0x3086, 0x00, 0, 0}, {0x3011, 0x01, 0, 0},
++	{OV3640_R_A1, 0x52, 0, 0}, {OV3640_G_A1, 0x46, 0, 0}, {OV3640_B_A1, 0x38, 0, 0},
++	{OV3640_DSPC0, 0x20, 0, 0}, {OV3640_DSPC1, 0x17, 0, 0}, {OV3640_DSPC2, 0x04, 0, 0},
++	{OV3640_DSPC3, 0x08, 0, 0}, {0x3507, 0x06, 0, 0}, {0x350a, 0x4f, 0, 0},
++	{OV3640_SC_CTRL0, 0x02, 0, 0}, {OV3640_DSP_CTRL_1, 0xde, 0, 0}, {OV3640_DSP_CTRL_4, 0x00, 0, 0},
++	{OV3640_FMT_MUX_CTRL0, 0x01, 0, 0}, {OV3640_FMT_CTRL00, 0x1d, 0, 0}, {OV3640_OUT_CTRL00, 0xc4, 0, 0},
++	{OV3640_DSP_CTRL_2, 0xef, 0, 0}, {OV3640_HS_H, 0x01, 0, 0}, {OV3640_HS_L, 0x1d, 0, 0},
++	{OV3640_VS_H, 0x00, 0, 0}, {OV3640_VS_L, 0x0a, 0, 0}, {OV3640_HW_H, 0x08, 0, 0},
++	{OV3640_HW_L, 0x00, 0, 0}, {OV3640_VH_H, 0x06, 0, 0}, {OV3640_VH_L, 0x00, 0, 0},
++	{OV3640_SIZE_IN_MISC, 0x68, 0, 0}, {OV3640_HSIZE_IN_L, 0x00, 0, 0}, {OV3640_VSIZE_IN_L, 0x00, 0, 0},
++	{OV3640_SIZE_OUT_MISC, 0x34, 0, 0}, {OV3640_HSIZE_OUT_L, 0x00, 0, 0}, {OV3640_VSIZE_OUT_L, 0x00, 0, 0},
++	{OV3640_ISP_PAD_CTR2, 0x00, 0, 0}, {OV3640_ISP_XOUT_H, 0x04, 0, 0}, {OV3640_ISP_XOUT_L, 0x00, 0, 0},
++	{OV3640_ISP_YOUT_H, 0x03, 0, 0}, {OV3640_ISP_YOUT_L, 0x00, 0, 0}, {OV3640_TMC6, 0x10, 0, 0},
++	{0x3090, 0xc0, 0, 0}, {0x304c, 0x84, 0, 0},	/* reserved */ {OV3640_TMC13, 0x04, 0, 0},
++	{OV3640_TMC10, 0x03, 0, 0}, {OV3640_TMC10, 0x00, 0, 0}, {OV3640_CLK, 0x01, 0, 0},
 +};
 +
 +static struct reg_value ov3640_setting_30fps_XGA_1024_768[] = {
 +	{0x0, 0x0, 0}
 +};
 +
++static struct reg_value ov3640_setting_15fps_VGA_640_480_org[] = {
++	{OV3640_SYS, OV3640_SYS_SRST, 0, 0},
++	{0x304d, 0x45, 0, 0},	/* reserved */
++	{0x30a7, 0x5e, 0, 0},	/* reserved */
++	{OV3640_TMC11, 0x16, 0, 0},
++	{0x309c, 0x1a, 0, 0},	/* reserved */
++	{0x30a2, 0xe4, 0, 0},	/* reserved */
++	{0x30aa, 0x42, 0, 0},	/* reserved */
++	{OV3640_IO_CTRL0, 0xff, 0, 0},
++	{OV3640_IO_CTRL1, 0xff, 0, 0},
++	{OV3640_IO_CTRL2, 0x10, 0, 0},
++	{OV3640_PLL_1, 0x32, 0, 0},
++	{OV3640_PLL_2, 0x21, 0, 0},
++	{OV3640_PLL_3, 0x20, 0, 0},
++	{OV3640_CLK, 0x00, 0, 0},
++	{0x304c, 0x81, 0, 0},	/* reserved */
++	{0x30d7, 0x10, 0, 0},	/* reserved */
++	{0x30d9, 0x0d, 0, 0},	/* reserved */
++	{0x30db, 0x08, 0, 0},	/* reserved */
++	{0x3016, 0x82, 0, 0},	/* reserved */
++	{OV3640_WPT_HISH, 0x38, 0, 0},
++	{OV3640_BPT_HISL, 0x30, 0, 0},
++	{OV3640_VPT, 0x61, 0, 0},
++	{OV3640_TMC7, 0x00, 0, 0},
++	{OV3640_TMC11, 0x02, 0, 0},
++	{0x3082, 0x20, 0, 0},	/* reserved */
++	{OV3640_AUTO_3, 0x12, 0, 0},
++	{OV3640_AUTO_2, 0x04, 0, 0},
++	{OV3640_AUTO_1, 0xf7, 0, 0},
++	{OV3640_AHW_H, 0x08, 0, 0},
++	{OV3640_AHW_L, 0x18, 0, 0},
++	{OV3640_AVH_H, 0x06, 0, 0},
++	{OV3640_AVH_L, 0x0c, 0, 0},
++	{OV3640_WEIGHT0, 0x62, 0, 0},
++	{OV3640_WEIGHT1, 0x26, 0, 0},
++	{OV3640_WEIGHT2, 0xe6, 0, 0},
++	{OV3640_WEIGHT3, 0x6e, 0, 0},
++	{OV3640_WEIGHT4, 0xea, 0, 0},
++	{OV3640_WEIGHT5, 0xae, 0, 0},
++	{OV3640_WEIGHT6, 0xa6, 0, 0},
++	{OV3640_WEIGHT7, 0x6a, 0, 0},
++	{OV3640_SC_SYN_CTRL0, 0x02, 0, 0},
++	{OV3640_SC_SYN_CTRL1, 0xfd, 0, 0},
++	{OV3640_SC_SYN_CTRL2, 0x00, 0, 0},
++	{OV3640_SC_SYN_CTRL3, 0xff, 0, 0},
++	{OV3640_DSP_CTRL_0, 0x12, 0, 0},
++	{OV3640_DSP_CTRL_1, 0xde, 0, 0},
++	{OV3640_DSP_CTRL_2, 0xcf, 0, 0},
++	{0x3312, 0x26, 0, 0},	/* reserved */
++	{0x3314, 0x42, 0, 0},	/* reserved */
++	{0x3313, 0x2b, 0, 0},	/* reserved */
++	{0x3315, 0x42, 0, 0},	/* reserved */
++	{0x3310, 0xd0, 0, 0},	/* reserved */
++	{0x3311, 0xbd, 0, 0},	/* reserved */
++	{0x330c, 0x18, 0, 0},	/* reserved */
++	{0x330d, 0x18, 0, 0},	/* reserved */
++	{0x330e, 0x56, 0, 0},	/* reserved */
++	{0x330f, 0x5c, 0, 0},	/* reserved */
++	{0x330b, 0x1c, 0, 0},	/* reserved */
++	{0x3306, 0x5c, 0, 0},	/* reserved */
++	{0x3307, 0x11, 0, 0},	/* reserved */
++	{OV3640_R_A1, 0x52, 0, 0},
++	{OV3640_G_A1, 0x46, 0, 0},
++	{OV3640_B_A1, 0x38, 0, 0},
++	{OV3640_DSPC0, 0x20, 0, 0},
++	{OV3640_DSPC1, 0x17, 0, 0},
++	{OV3640_DSPC2, 0x04, 0, 0},
++	{OV3640_DSPC3, 0x08, 0, 0},
++	{0x3507, 0x06, 0, 0},	/* reserved */
++	{0x350a, 0x4f, 0, 0},	/* reserved */
++	{OV3640_SC_CTRL0, 0x02, 0, 0},
++	{OV3640_DSP_CTRL_1, 0xde, 0, 0},
++	{OV3640_DSP_CTRL_4, 0x00, 0, 0},
++	{OV3640_FMT_MUX_CTRL0, 0x00, 0, 0},
++	{OV3640_FMT_CTRL00, 0x42, 0, 0},
++	{OV3640_OUT_CTRL00, 0xc4, 0, 0},
++	{OV3640_DSP_CTRL_2, 0xef, 0, 0},
++	{OV3640_HS_H, 0x01, 0, 0},
++	{OV3640_HS_L, 0x1d, 0, 0},
++	{OV3640_VS_H, 0x00, 0, 0},
++	{OV3640_VS_L, 0x0a, 0, 0},
++	{OV3640_HW_H, 0x08, 0, 0},
++	{OV3640_HW_L, 0x00, 0, 0},
++	{OV3640_VH_H, 0x06, 0, 0},
++	{OV3640_VH_L, 0x00, 0, 0},
++	{OV3640_SIZE_IN_MISC, 0x68, 0, 0},
++	{OV3640_HSIZE_IN_L, 0x00, 0, 0},
++	{OV3640_VSIZE_IN_L, 0x00, 0, 0},
++	{OV3640_SIZE_OUT_MISC, 0x12, 0, 0},
++	{OV3640_HSIZE_OUT_L, 0x80, 0, 0},
++	{OV3640_VSIZE_OUT_L, 0xe0, 0, 0},
++	{OV3640_ISP_PAD_CTR2, 0x00, 0, 0},
++	{OV3640_ISP_XOUT_H, 0x02, 0, 0},
++	{OV3640_ISP_XOUT_L, 0x80, 0, 0},
++	{OV3640_ISP_YOUT_H, 0x01, 0, 0},
++	{OV3640_ISP_YOUT_L, 0xe0, 0, 0},
++	{OV3640_TMC6, 0x10, 0, 0},
++	{0x3090, 0xc0, 0, 0},	/* reserved */
++	{0x304c, 0x84, 0, 0},	/* reserved */
++	{OV3640_TMC13, 0x04, 0, 0},
++	{OV3640_TMC10, 0x03, 0, 0},
++	{OV3640_TMC10, 0x00, 0, 0},
++	{OV3640_CLK, 0x00, 0, 0},
++};
++
++static struct reg_value ov3640_setting_15fps_VGA_640_480mine[] = {
++	{OV3640_SYS, OV3640_SYS_SRST, 0, 0},	/* reset */
++// 	{0x304d, 0x45, 0, 0},	/* reserved */
++// 	{0x30a7, 0x5e, 0, 0},	/* reserved */
++	{OV3640_TMC11, 0x16, 0, 0},
++// 	{0x309c, 0x1a, 0, 0},	/* reserved */
++// 	{0x30a2, 0xe4, 0, 0},	/* reserved */
++// 	{0x30aa, 0x42, 0, 0},	/* reserved */
++	{OV3640_IO_CTRL0, 0xff, 0, 0},	/* DATA = OUT */
++	{OV3640_IO_CTRL1, 0xff, 0, 0},	/* CTRL = OUT */
++	{OV3640_IO_CTRL2, 0x10, 0, 0},
++	{OV3640_PLL_1, 0x32, 0, 0},
++	{OV3640_PLL_2, 0x21, 0, 0},
++	{OV3640_PLL_3, 0x20, 0, 0},
++	{OV3640_CLK, 0x00, 0, 0},
++// 	{0x304c, 0x81, 0, 0},	/* reserved */
++// 	{0x30d7, 0x10, 0, 0},	/* reserved */
++// 	{0x30d9, 0x0d, 0, 0},	/* reserved */
++// 	{0x30db, 0x08, 0, 0},	/* reserved */
++// 	{0x3016, 0x82, 0, 0},	/* reserved */
++	{OV3640_WPT_HISH, 0x38, 0, 0},
++	{OV3640_BPT_HISL, 0x30, 0, 0},
++	{OV3640_VPT, 0x61, 0, 0},
++	{OV3640_TMC7, 0x00, 0, 0},
++	{OV3640_TMC11, 0x02, 0, 0},
++// 	{0x3082, 0x20, 0, 0},	/* reserved */
++	{OV3640_AUTO_3, 0x12, 0, 0},
++	{OV3640_AUTO_2, 0x04, 0, 0},
++	{OV3640_AUTO_1, 0xf7, 0, 0},
++	{OV3640_AHW_H, 0x08, 0, 0},
++	{OV3640_AHW_L, 0x18, 0, 0},
++	{OV3640_AVH_H, 0x06, 0, 0},
++	{OV3640_AVH_L, 0x0c, 0, 0},
++	{OV3640_WEIGHT0, 0x62, 0, 0},
++	{OV3640_WEIGHT1, 0x26, 0, 0},
++	{OV3640_WEIGHT2, 0xe6, 0, 0},
++	{OV3640_WEIGHT3, 0x6e, 0, 0},
++	{OV3640_WEIGHT4, 0xea, 0, 0},
++	{OV3640_WEIGHT5, 0xae, 0, 0},
++	{OV3640_WEIGHT6, 0xa6, 0, 0},
++	{OV3640_WEIGHT7, 0x6a, 0, 0},
++	/* Bring used modules out of reset */
++	{OV3640_SC_SYN_CTRL0, 0x02, 0, 0},
++	{OV3640_SC_SYN_CTRL1, 0xfd, 0, 0},
++	{OV3640_SC_SYN_CTRL2, 0x00, 0, 0},
++	{OV3640_SC_SYN_CTRL3, 0xff, 0, 0},
++	{OV3640_DSP_CTRL_0, 0x12, 0, 0},
++	{OV3640_DSP_CTRL_1, 0xde, 0, 0},
++	{OV3640_DSP_CTRL_2, 0xcf, 0, 0},
++// 	{0x3312, 0x26, 0, 0},	/* reserved */
++// 	{0x3314, 0x42, 0, 0},	/* reserved */
++// 	{0x3313, 0x2b, 0, 0},	/* reserved */
++// 	{0x3315, 0x42, 0, 0},	/* reserved */
++// 	{0x3310, 0xd0, 0, 0},	/* reserved */
++// 	{0x3311, 0xbd, 0, 0},	/* reserved */
++// 	{0x330c, 0x18, 0, 0},	/* reserved */
++// 	{0x330d, 0x18, 0, 0},	/* reserved */
++// 	{0x330e, 0x56, 0, 0},	/* reserved */
++// 	{0x330f, 0x5c, 0, 0},	/* reserved */
++// 	{0x330b, 0x1c, 0, 0},	/* reserved */
++// 	{0x3306, 0x5c, 0, 0},	/* reserved */
++// 	{0x3307, 0x11, 0, 0},	/* reserved */
++	{OV3640_R_A1, 0x52, 0, 0},
++	{OV3640_G_A1, 0x46, 0, 0},
++	{OV3640_B_A1, 0x38, 0, 0},
++	{OV3640_DSPC0, 0x20, 0, 0},
++	{OV3640_DSPC1, 0x17, 0, 0},
++	{OV3640_DSPC2, 0x04, 0, 0},
++	{OV3640_DSPC3, 0x08, 0, 0},
++// 	{0x3507, 0x06, 0, 0},	/* reserved */
++// 	{0x350a, 0x4f, 0, 0},	/* reserved */
++	{OV3640_SC_CTRL0, 0x02, 0, 0},	/* disable compression */
++//	{OV3640_DSP_CTRL_1, 0xde, 0, 0},
++	{OV3640_DSP_CTRL_4, 0x00, 0, 0},
++
++	{OV3640_FMT_MUX_CTRL0, 0x01, 0, 0},	/* ISP RGB */
++	{OV3640_FMT_CTRL00, 0x11, 0, 0},	/* RGB565 */
++	{OV3640_OUT_CTRL00, 0xc0, 0, 0},
++	{OV3640_OUT_CTRL01, 0x81, 0, 0},	/* PCLK gated */
++	{OV3640_DSP_CTRL_2, 0xef, 0, 0},
++	{OV3640_OUT_CTRL46, 0x4d, 0, 0},	/* HSYNC_EN + HSYNC_DVP_EN */
++
++	{OV3640_HS_H, 0x01, 0, 0},
++	{OV3640_HS_L, 0x1d, 0, 0},
++	{OV3640_VS_H, 0x00, 0, 0},
++	{OV3640_VS_L, 0x0a, 0, 0},
++	{OV3640_HW_H, 0x08, 0, 0},
++	{OV3640_HW_L, 0x00, 0, 0},
++	{OV3640_VH_H, 0x06, 0, 0},
++	{OV3640_VH_L, 0x00, 0, 0},
++	{OV3640_SIZE_IN_MISC, 0x68, 0, 0},
++	{OV3640_HSIZE_IN_L, 0x00, 0, 0},
++	{OV3640_VSIZE_IN_L, 0x00, 0, 0},
++	{OV3640_SIZE_OUT_MISC, 0x12, 0, 0},
++	{OV3640_HSIZE_OUT_L, 0x80, 0, 0},
++	{OV3640_VSIZE_OUT_L, 0xe0, 0, 0},
++	{OV3640_ISP_PAD_CTR2, 0x00, 0, 0},
++	/* 0x280 x 0x1e0 -> 640 x 480 */
++	{OV3640_ISP_XOUT_H, 0x02, 0, 0},
++	{OV3640_ISP_XOUT_L, 0x80, 0, 0},
++	{OV3640_ISP_YOUT_H, 0x01, 0, 0},
++	{OV3640_ISP_YOUT_L, 0xe0, 0, 0},
++//	{OV3640_TMC6, 0x10, 0, 0},
++// 	{0x3090, 0xc0, 0, 0},	/* reserved */
++// 	{0x304c, 0x84, 0, 0},	/* reserved */
++	{OV3640_TMC13, 0x04, 0, 0},
++	{OV3640_TMC10, 0x03, 0, 0},
++	{OV3640_TMC10, 0x00, 0, 0},
++	{OV3640_CLK, 0x00, 0, 0},
++};
++
++/* Generated by Omnivision tool : */
 +static struct reg_value ov3640_setting_15fps_VGA_640_480[] = {
-+	{0x3012, 0x80, 0, 0}, {0x304d, 0x45, 0, 0}, {0x30a7, 0x5e, 0, 0},
-+	{0x3087, 0x16, 0, 0}, {0x309c, 0x1a, 0, 0}, {0x30a2, 0xe4, 0, 0},
-+	{0x30aa, 0x42, 0, 0}, {0x30b0, 0xff, 0, 0}, {0x30b1, 0xff, 0, 0},
-+	{0x30b2, 0x10, 0, 0}, {0x300e, 0x32, 0, 0}, {0x300f, 0x21, 0, 0},
-+	{0x3010, 0x20, 0, 0}, {0x3011, 0x00, 0, 0}, {0x304c, 0x81, 0, 0},
-+	{0x30d7, 0x10, 0, 0}, {0x30d9, 0x0d, 0, 0}, {0x30db, 0x08, 0, 0},
-+	{0x3016, 0x82, 0, 0}, {0x3018, 0x38, 0, 0}, {0x3019, 0x30, 0, 0},
-+	{0x301a, 0x61, 0, 0}, {0x307d, 0x00, 0, 0}, {0x3087, 0x02, 0, 0},
-+	{0x3082, 0x20, 0, 0}, {0x3015, 0x12, 0, 0}, {0x3014, 0x04, 0, 0},
-+	{0x3013, 0xf7, 0, 0}, {0x303c, 0x08, 0, 0}, {0x303d, 0x18, 0, 0},
-+	{0x303e, 0x06, 0, 0}, {0x303f, 0x0c, 0, 0}, {0x3030, 0x62, 0, 0},
-+	{0x3031, 0x26, 0, 0}, {0x3032, 0xe6, 0, 0}, {0x3033, 0x6e, 0, 0},
-+	{0x3034, 0xea, 0, 0}, {0x3035, 0xae, 0, 0}, {0x3036, 0xa6, 0, 0},
-+	{0x3037, 0x6a, 0, 0}, {0x3104, 0x02, 0, 0}, {0x3105, 0xfd, 0, 0},
-+	{0x3106, 0x00, 0, 0}, {0x3107, 0xff, 0, 0}, {0x3300, 0x12, 0, 0},
-+	{0x3301, 0xde, 0, 0}, {0x3302, 0xcf, 0, 0}, {0x3312, 0x26, 0, 0},
-+	{0x3314, 0x42, 0, 0}, {0x3313, 0x2b, 0, 0}, {0x3315, 0x42, 0, 0},
-+	{0x3310, 0xd0, 0, 0}, {0x3311, 0xbd, 0, 0}, {0x330c, 0x18, 0, 0},
-+	{0x330d, 0x18, 0, 0}, {0x330e, 0x56, 0, 0}, {0x330f, 0x5c, 0, 0},
-+	{0x330b, 0x1c, 0, 0}, {0x3306, 0x5c, 0, 0}, {0x3307, 0x11, 0, 0},
-+	{0x336a, 0x52, 0, 0}, {0x3370, 0x46, 0, 0}, {0x3376, 0x38, 0, 0},
-+	{0x30b8, 0x20, 0, 0}, {0x30b9, 0x17, 0, 0}, {0x30ba, 0x04, 0, 0},
-+	{0x30bb, 0x08, 0, 0}, {0x3507, 0x06, 0, 0}, {0x350a, 0x4f, 0, 0},
-+	{0x3100, 0x02, 0, 0}, {0x3301, 0xde, 0, 0}, {0x3304, 0x00, 0, 0},
-+	{0x3400, 0x00, 0, 0}, {0x3404, 0x42, 0, 0}, {0x3600, 0xc4, 0, 0},
-+	{0x3302, 0xef, 0, 0}, {0x3020, 0x01, 0, 0}, {0x3021, 0x1d, 0, 0},
-+	{0x3022, 0x00, 0, 0}, {0x3023, 0x0a, 0, 0}, {0x3024, 0x08, 0, 0},
-+	{0x3025, 0x00, 0, 0}, {0x3026, 0x06, 0, 0}, {0x3027, 0x00, 0, 0},
-+	{0x335f, 0x68, 0, 0}, {0x3360, 0x00, 0, 0}, {0x3361, 0x00, 0, 0},
-+	{0x3362, 0x12, 0, 0}, {0x3363, 0x80, 0, 0}, {0x3364, 0xe0, 0, 0},
-+	{0x3403, 0x00, 0, 0}, {0x3088, 0x02, 0, 0}, {0x3089, 0x80, 0, 0},
-+	{0x308a, 0x01, 0, 0}, {0x308b, 0xe0, 0, 0}, {0x307c, 0x10, 0, 0},
-+	{0x3090, 0xc0, 0, 0}, {0x304c, 0x84, 0, 0}, {0x308d, 0x04, 0, 0},
-+	{0x3086, 0x03, 0, 0}, {0x3086, 0x00, 0, 0}, {0x3011, 0x00, 0, 0},
++	{OV3640_SYS, 0x00, 0, 0},
++
++	/* added by me */
++	{OV3640_IO_CTRL0, 0xff, 0, 0},	/* DATA = OUT */
++	{OV3640_IO_CTRL1, 0xff, 0, 0},	/* CTRL = OUT */
++	{OV3640_IO_CTRL2, 0x10, 0, 0},
++	{OV3640_OUT_CTRL01, 0x81, 0, 0},	/* PCLK gated */
++//	{OV3640_OUT_CTRL46, 0x4d, 0, 0},	/* HSYNC_EN + HSYNC_DVP_EN */
++
++	{OV3640_HS_H, 0x01, 0, 0},
++	{OV3640_HS_L, 0x1d, 0, 0},
++	{OV3640_VS_H, 0x00, 0, 0},
++	{OV3640_VS_L, 0x0a, 0, 0},
++	{OV3640_HW_H, 0x08, 0, 0},
++	{OV3640_HW_L, 0x18, 0, 0},
++	{OV3640_VH_H, 0x06, 0, 0},
++	{OV3640_VH_L, 0x0c, 0, 0},
++
++	{OV3640_VTS_H, 0x06, 0, 0},
++	{OV3640_VTS_L, 0x20, 0, 0},
++	{OV3640_VSYNCOPT, 0x44, 0, 0},
++	{OV3640_PCLK, 0x00, 0, 0},
++	{0x30d7, 0x00, 0x80, 0},
++	{OV3640_BLC9, 0x40, 0x40, 0},
++	{OV3640_AVH_H, 0x01, 0, 0},
++	{OV3640_AVH_L, 0x80, 0, 0},
++
++	{OV3640_DSP_CTRL_2, 0x20, 0x20, 0},
++	{OV3640_SIZE_IN_MISC, 0x68, 0, 0},
++	{OV3640_HSIZE_IN_L, 0x18, 0, 0},
++	{OV3640_VSIZE_IN_L, 0x0c, 0, 0},
++	{OV3640_SIZE_OUT_MISC, 0x12, 0, 0},// ;Zoom_out output size
++	{OV3640_HSIZE_OUT_L, 0x88, 0, 0},
++	{OV3640_VSIZE_OUT_L, 0xe4, 0, 0},
++	{OV3640_ISP_PAD_CTR2, 0x42, 0, 0},
++	/* 0x280 x 0x1e0 -> 640 x 480 */
++	{OV3640_ISP_XOUT_H, 0x02, 0, 0},// ;x_output_size
++	{OV3640_ISP_XOUT_L, 0x80, 0, 0},
++	{OV3640_ISP_YOUT_H, 0x01, 0, 0},// ;y_output_size
++	{OV3640_ISP_YOUT_L, 0xe0, 0, 0},
++
++	{OV3640_SC_CTRL0, 0x02, 0, 0},
++	{OV3640_DSP_CTRL_1, 0x10, 0x30, 0},
++	{OV3640_DSP_CTRL_4, 0x00, 0x03, 0},
++	{OV3640_FMT_MUX_CTRL0, 0x01, 0, 0}, /* ISP RGB */
++	{OV3640_FMT_CTRL00, 0x11, 0, 0},    /* RGB565 */
++
++	{0x304c, 0x84, 0, 0},
++	{OV3640_CLK, 00, 0, 0},// ;15fps
++};
++
++static struct reg_value ov3640_setting_30fps_VGA_640_480_org[] = {
++	{OV3640_SYS, 0x80, 0, 0},
++	{0x304d, 0x45, 0, 0},	/* reserved */
++	{0x30a7, 0x5e, 0, 0},	/* reserved */
++	{OV3640_TMC11, 0x16, 0, 0},
++	{0x309c, 0x1a, 0, 0},	/* reserved */
++	{0x30a2, 0xe4, 0, 0},	/* reserved */
++	{0x30aa, 0x42, 0, 0},	/* reserved */
++	{OV3640_IO_CTRL0, 0xff, 0, 0},
++	{OV3640_IO_CTRL1, 0xff, 0, 0},
++	{OV3640_IO_CTRL2, 0x10, 0, 0},
++	{OV3640_PLL_1, 0x32, 0, 0},
++	{OV3640_PLL_2, 0x21, 0, 0},
++	{OV3640_PLL_3, 0x20, 0, 0},
++	{OV3640_CLK, 0x01, 0, 0},
++	{0x304c, 0x82, 0, 0},	/* reserved */
++	{0x30d7, 0x10, 0, 0},	/* reserved */
++	{0x30d9, 0x0d, 0, 0},	/* reserved */
++	{0x30db, 0x08, 0, 0},	/* reserved */
++	{0x3016, 0x82, 0, 0},	/* reserved */
++	{OV3640_WPT_HISH, 0x38, 0, 0},
++	{OV3640_BPT_HISL, 0x30, 0, 0},
++	{OV3640_VPT, 0x61, 0, 0},
++	{OV3640_TMC7, 0x00, 0, 0},
++	{OV3640_TMC11, 0x02, 0, 0},
++	{0x3082, 0x20, 0, 0},	/* reserved */
++	{OV3640_AUTO_3, 0x12, 0, 0},
++	{OV3640_AUTO_2, 0x0c, 0, 0},
++	{OV3640_AUTO_1, 0xf7, 0, 0},
++	{OV3640_AHW_H, 0x08, 0, 0},
++	{OV3640_AHW_L, 0x18, 0, 0},
++	{OV3640_AVH_H, 0x06, 0, 0},
++	{OV3640_AVH_L, 0x0c, 0, 0},
++	{OV3640_WEIGHT0, 0x62, 0, 0},
++	{OV3640_WEIGHT1, 0x26, 0, 0},
++	{OV3640_WEIGHT2, 0xe6, 0, 0},
++	{OV3640_WEIGHT3, 0x6e, 0, 0},
++	{OV3640_WEIGHT4, 0xea, 0, 0},
++	{OV3640_WEIGHT5, 0xae, 0, 0},
++	{OV3640_WEIGHT6, 0xa6, 0, 0},
++	{OV3640_WEIGHT7, 0x6a, 0, 0},
++	{OV3640_SC_SYN_CTRL0, 0x02, 0, 0},
++	{OV3640_SC_SYN_CTRL1, 0xfd, 0, 0},
++	{OV3640_SC_SYN_CTRL2, 0x00, 0, 0},
++	{OV3640_SC_SYN_CTRL3, 0xff, 0, 0},
++	{OV3640_DSP_CTRL_0, 0x12, 0, 0},
++	{OV3640_DSP_CTRL_1, 0xde, 0, 0},
++	{OV3640_DSP_CTRL_2, 0xcf, 0, 0},
++	{0x3312, 0x26, 0, 0},	/* reserved */
++	{0x3314, 0x42, 0, 0},	/* reserved */
++	{0x3313, 0x2b, 0, 0},	/* reserved */
++	{0x3315, 0x42, 0, 0},	/* reserved */
++	{0x3310, 0xd0, 0, 0},	/* reserved */
++	{0x3311, 0xbd, 0, 0},	/* reserved */
++	{0x330c, 0x18, 0, 0},	/* reserved */
++	{0x330d, 0x18, 0, 0},	/* reserved */
++	{0x330e, 0x56, 0, 0},	/* reserved */
++	{0x330f, 0x5c, 0, 0},	/* reserved */
++	{0x330b, 0x1c, 0, 0},	/* reserved */
++	{0x3306, 0x5c, 0, 0},	/* reserved */
++	{0x3307, 0x11, 0, 0},	/* reserved */
++	{OV3640_R_A1, 0x52, 0, 0},
++	{OV3640_G_A1, 0x46, 0, 0},
++	{OV3640_B_A1, 0x38, 0, 0},
++	{OV3640_DSP_CTRL_0, 0x13, 0, 0},
++	{OV3640_DSPC0, 0x20, 0, 0},
++	{OV3640_DSPC1, 0x17, 0, 0},
++	{OV3640_DSPC2, 0x04, 0, 0},
++	{OV3640_DSPC3, 0x08, 0, 0},
++	{OV3640_SC_CTRL0, 0x02, 0, 0},
++	{OV3640_DSP_CTRL_1, 0x10, 0x30, 0},
++	{OV3640_DSP_CTRL_4, 0x00, 0x03, 0},
++	{OV3640_FMT_MUX_CTRL0, 0x00, 0, 0},
++	{OV3640_FMT_CTRL00, 0x02, 0, 0},
++	{OV3640_OUT_CTRL00, 0xc0, 0, 0},
++	{OV3640_TMC13, 0x04, 0, 0},
++	{OV3640_TMC10, 0x03, 0, 0},
++	{OV3640_TMC10, 0x00, 0, 0},
++	{OV3640_SYS, 0x10, 0, 0},
++	{OV3640_VS_L, 0x06, 0, 0},
++	{OV3640_VH_H, 0x03, 0, 0},
++	{OV3640_VH_L, 0x04, 0, 0},
++	{OV3640_VTS_H, 0x03, 0, 0},
++	{OV3640_VTS_L, 0x10, 0, 0},
++	{OV3640_VSYNCOPT, 0x24, 0, 0},
++	{OV3640_PCLK, 0x01, 0, 0},
++	{0x30d7, 0x80, 0x80, 0},	/* reserved */
++	{OV3640_BLC9, 0x00, 0x40, 0},
++	{OV3640_AVH_H, 0x00, 0, 0},
++	{OV3640_AVH_L, 0xc0, 0, 0},
++	{OV3640_DSP_CTRL_2, 0x20, 0x20, 0},
++	{OV3640_SIZE_IN_MISC, 0x34, 0, 0},
++	{OV3640_HSIZE_IN_L, 0x0c, 0, 0},
++	{OV3640_VSIZE_IN_L, 0x04, 0, 0},
++	{OV3640_SIZE_OUT_MISC, 0x12, 0, 0},
++	{OV3640_HSIZE_OUT_L, 0x88, 0, 0},
++	{OV3640_VSIZE_OUT_L, 0xe4, 0, 0},
++	{OV3640_ISP_PAD_CTR2, 0x42, 0, 0},
++	{OV3640_ISP_XOUT_H, 0x02, 0, 0},
++	{OV3640_ISP_XOUT_L, 0x80, 0, 0},
++	{OV3640_ISP_YOUT_H, 0x01, 0, 0},
++	{OV3640_ISP_YOUT_L, 0xe0, 0, 0},
++	{OV3640_SIZE_OUT_MISC, 0x12, 0, 0},
++	{OV3640_HSIZE_OUT_L, 0x88, 0, 0},
++	{OV3640_VSIZE_OUT_L, 0xe4, 0, 0},
++	{OV3640_ISP_PAD_CTR2, 0x42, 0, 0},
++	{OV3640_ISP_XOUT_H, 0x02, 0, 0},
++	{OV3640_ISP_XOUT_L, 0x80, 0, 0},
++	{OV3640_ISP_YOUT_H, 0x01, 0, 0},
++	{OV3640_ISP_YOUT_L, 0xe0, 0, 0},
++	{OV3640_PLL_1, 0x37, 0, 0},
++	{OV3640_PLL_2, 0xe1, 0, 0},
++	{OV3640_PLL_3, 0x22, 0, 0},
++	{OV3640_CLK, 0x01, 0, 0},
++	{0x304c, 0x84, 0, 0},	/* reserved */
++	{OV3640_AUTO_2, 0x04, 0, 0},
++	{OV3640_AUTO_3, 0x02, 0, 0},
++	{OV3640_EXVTS_L, 0x00, 0, 0},
++	{OV3640_EXVTS_H, 0x00, 0, 0},
 +};
 +
 +static struct reg_value ov3640_setting_30fps_VGA_640_480[] = {
-+	{0x3012, 0x80, 0, 0}, {0x304d, 0x45, 0, 0}, {0x30a7, 0x5e, 0, 0},
-+	{0x3087, 0x16, 0, 0}, {0x309c, 0x1a, 0, 0}, {0x30a2, 0xe4, 0, 0},
-+	{0x30aa, 0x42, 0, 0}, {0x30b0, 0xff, 0, 0}, {0x30b1, 0xff, 0, 0},
-+	{0x30b2, 0x10, 0, 0}, {0x300e, 0x32, 0, 0}, {0x300f, 0x21, 0, 0},
-+	{0x3010, 0x20, 0, 0}, {0x3011, 0x01, 0, 0}, {0x304c, 0x82, 0, 0},
-+	{0x30d7, 0x10, 0, 0}, {0x30d9, 0x0d, 0, 0}, {0x30db, 0x08, 0, 0},
-+	{0x3016, 0x82, 0, 0}, {0x3018, 0x38, 0, 0}, {0x3019, 0x30, 0, 0},
-+	{0x301a, 0x61, 0, 0}, {0x307d, 0x00, 0, 0}, {0x3087, 0x02, 0, 0},
-+	{0x3082, 0x20, 0, 0}, {0x3015, 0x12, 0, 0}, {0x3014, 0x0c, 0, 0},
-+	{0x3013, 0xf7, 0, 0}, {0x303c, 0x08, 0, 0}, {0x303d, 0x18, 0, 0},
-+	{0x303e, 0x06, 0, 0}, {0x303f, 0x0c, 0, 0}, {0x3030, 0x62, 0, 0},
-+	{0x3031, 0x26, 0, 0}, {0x3032, 0xe6, 0, 0}, {0x3033, 0x6e, 0, 0},
-+	{0x3034, 0xea, 0, 0}, {0x3035, 0xae, 0, 0}, {0x3036, 0xa6, 0, 0},
-+	{0x3037, 0x6a, 0, 0}, {0x3104, 0x02, 0, 0}, {0x3105, 0xfd, 0, 0},
-+	{0x3106, 0x00, 0, 0}, {0x3107, 0xff, 0, 0}, {0x3300, 0x12, 0, 0},
-+	{0x3301, 0xde, 0, 0}, {0x3302, 0xcf, 0, 0}, {0x3312, 0x26, 0, 0},
-+	{0x3314, 0x42, 0, 0}, {0x3313, 0x2b, 0, 0}, {0x3315, 0x42, 0, 0},
-+	{0x3310, 0xd0, 0, 0}, {0x3311, 0xbd, 0, 0}, {0x330c, 0x18, 0, 0},
-+	{0x330d, 0x18, 0, 0}, {0x330e, 0x56, 0, 0}, {0x330f, 0x5c, 0, 0},
-+	{0x330b, 0x1c, 0, 0}, {0x3306, 0x5c, 0, 0}, {0x3307, 0x11, 0, 0},
-+	{0x336a, 0x52, 0, 0}, {0x3370, 0x46, 0, 0}, {0x3376, 0x38, 0, 0},
-+	{0x3300, 0x13, 0, 0}, {0x30b8, 0x20, 0, 0}, {0x30b9, 0x17, 0, 0},
-+	{0x30ba, 0x04, 0, 0}, {0x30bb, 0x08, 0, 0}, {0x3100, 0x02, 0, 0},
-+	{0x3301, 0x10, 0x30, 0}, {0x3304, 0x00, 0x03, 0}, {0x3400, 0x00, 0, 0},
-+	{0x3404, 0x02, 0, 0}, {0x3600, 0xc0, 0, 0}, {0x308d, 0x04, 0, 0},
-+	{0x3086, 0x03, 0, 0}, {0x3086, 0x00, 0, 0}, {0x3012, 0x10, 0, 0},
-+	{0x3023, 0x06, 0, 0}, {0x3026, 0x03, 0, 0}, {0x3027, 0x04, 0, 0},
-+	{0x302a, 0x03, 0, 0}, {0x302b, 0x10, 0, 0}, {0x3075, 0x24, 0, 0},
-+	{0x300d, 0x01, 0, 0}, {0x30d7, 0x80, 0x80, 0}, {0x3069, 0x00, 0x40, 0},
-+	{0x303e, 0x00, 0, 0}, {0x303f, 0xc0, 0, 0}, {0x3302, 0x20, 0x20, 0},
-+	{0x335f, 0x34, 0, 0}, {0x3360, 0x0c, 0, 0}, {0x3361, 0x04, 0, 0},
-+	{0x3362, 0x12, 0, 0}, {0x3363, 0x88, 0, 0}, {0x3364, 0xe4, 0, 0},
-+	{0x3403, 0x42, 0, 0}, {0x3088, 0x02, 0, 0}, {0x3089, 0x80, 0, 0},
-+	{0x308a, 0x01, 0, 0}, {0x308b, 0xe0, 0, 0}, {0x3362, 0x12, 0, 0},
-+	{0x3363, 0x88, 0, 0}, {0x3364, 0xe4, 0, 0}, {0x3403, 0x42, 0, 0},
-+	{0x3088, 0x02, 0, 0}, {0x3089, 0x80, 0, 0}, {0x308a, 0x01, 0, 0},
-+	{0x308b, 0xe0, 0, 0}, {0x300e, 0x37, 0, 0}, {0x300f, 0xe1, 0, 0},
-+	{0x3010, 0x22, 0, 0}, {0x3011, 0x01, 0, 0}, {0x304c, 0x84, 0, 0},
-+	{0x3014, 0x04, 0, 0}, {0x3015, 0x02, 0, 0}, {0x302e, 0x00, 0, 0},
-+	{0x302d, 0x00, 0, 0},
++	{OV3640_SYS, OV3640_SYS_SRST, 0, 0},	/* reset */
++// 	{0x304d, 0x45, 0, 0},	/* reserved */
++// 	{0x30a7, 0x5e, 0, 0},	/* reserved */
++	{OV3640_TMC11, 0x16, 0, 0},
++// 	{0x309c, 0x1a, 0, 0},	/* reserved */
++// 	{0x30a2, 0xe4, 0, 0},	/* reserved */
++// 	{0x30aa, 0x42, 0, 0},	/* reserved */
++	{OV3640_IO_CTRL0, 0xff, 0, 0},	/* DATA = OUT */
++	{OV3640_IO_CTRL1, 0xff, 0, 0},	/* CTRL = OUT */
++	{OV3640_IO_CTRL2, 0x10, 0, 0},
++/*	{OV3640_PLL_1, 0x32, 0, 0},
++	{OV3640_PLL_2, 0x21, 0, 0},
++	{OV3640_PLL_3, 0x20, 0, 0},
++	{OV3640_CLK, 0x01, 0, 0}, */
++// 	{0x304c, 0x82, 0, 0},	/* reserved */
++// 	{0x30d7, 0x10, 0, 0},	/* reserved */
++// 	{0x30d9, 0x0d, 0, 0},	/* reserved */
++// 	{0x30db, 0x08, 0, 0},	/* reserved */
++// 	{0x3016, 0x82, 0, 0},	/* reserved */
++/*	{OV3640_WPT_HISH, 0x38, 0, 0},
++	{OV3640_BPT_HISL, 0x30, 0, 0},
++	{OV3640_VPT, 0x61, 0, 0}, */
++	{OV3640_TMC7, 0x00, 0, 0},
++	{OV3640_TMC11, 0x02, 0, 0},
++// 	{0x3082, 0x20, 0, 0},	/* reserved */
++/*	{OV3640_AUTO_3, 0x12, 0, 0},
++	{OV3640_AUTO_2, 0x0c, 0, 0},
++	{OV3640_AUTO_1, 0xf7, 0, 0},
++	{OV3640_AHW_H, 0x08, 0, 0},
++	{OV3640_AHW_L, 0x18, 0, 0},
++	{OV3640_AVH_H, 0x06, 0, 0},
++	{OV3640_AVH_L, 0x0c, 0, 0},
++	{OV3640_WEIGHT0, 0x62, 0, 0},
++	{OV3640_WEIGHT1, 0x26, 0, 0},
++	{OV3640_WEIGHT2, 0xe6, 0, 0},
++	{OV3640_WEIGHT3, 0x6e, 0, 0},
++	{OV3640_WEIGHT4, 0xea, 0, 0},
++	{OV3640_WEIGHT5, 0xae, 0, 0},
++	{OV3640_WEIGHT6, 0xa6, 0, 0},
++	{OV3640_WEIGHT7, 0x6a, 0, 0}, */
++	/* Bring used modules out of reset */
++	{OV3640_SC_SYN_CTRL0, 0x02, 0, 0},
++	{OV3640_SC_SYN_CTRL1, 0xfd, 0, 0},
++	{OV3640_SC_SYN_CTRL2, 0x00, 0, 0},
++	{OV3640_SC_SYN_CTRL3, 0xff, 0, 0},
++	{OV3640_DSP_CTRL_0, 0x12, 0, 0},
++	{OV3640_DSP_CTRL_1, 0xde, 0, 0},
++	{OV3640_DSP_CTRL_2, 0xcf, 0, 0},
++// 	{0x3312, 0x26, 0, 0},	/* reserved */
++// 	{0x3314, 0x42, 0, 0},	/* reserved */
++// 	{0x3313, 0x2b, 0, 0},	/* reserved */
++// 	{0x3315, 0x42, 0, 0},	/* reserved */
++// 	{0x3310, 0xd0, 0, 0},	/* reserved */
++// 	{0x3311, 0xbd, 0, 0},	/* reserved */
++// 	{0x330c, 0x18, 0, 0},	/* reserved */
++// 	{0x330d, 0x18, 0, 0},	/* reserved */
++// 	{0x330e, 0x56, 0, 0},	/* reserved */
++// 	{0x330f, 0x5c, 0, 0},	/* reserved */
++// 	{0x330b, 0x1c, 0, 0},	/* reserved */
++// 	{0x3306, 0x5c, 0, 0},	/* reserved */
++// 	{0x3307, 0x11, 0, 0},	/* reserved */
++	{OV3640_R_A1, 0x52, 0, 0},
++	{OV3640_G_A1, 0x46, 0, 0},
++	{OV3640_B_A1, 0x38, 0, 0},
++	{OV3640_DSPC0, 0x20, 0, 0},
++	{OV3640_DSPC1, 0x17, 0, 0},
++	{OV3640_DSPC2, 0x04, 0, 0},
++	{OV3640_DSPC3, 0x08, 0, 0},
++	{OV3640_SC_CTRL0, 0x02, 0, 0},	/* disable compression */
++	{OV3640_DSP_CTRL_0, 0x13, 0, 0},
++	{OV3640_DSP_CTRL_1, 0x10, 0x30, 0},
++	{OV3640_DSP_CTRL_4, 0x00, 0x03, 0},
++
++	{OV3640_FMT_MUX_CTRL0, 0x01, 0, 0},	/* ISP RGB */
++	{OV3640_FMT_CTRL00, 0x11, 0, 0},	/* RGB565 */
++	{OV3640_OUT_CTRL00, 0xc0, 0, 0},
++	{OV3640_OUT_CTRL01, 0x81, 0, 0},	/* PCLK gated */
++	{OV3640_DSP_CTRL_2, 0xef, 0, 0},
++	{OV3640_OUT_CTRL46, 0x4d, 0, 0},	/* HSYNC_EN + HSYNC_DVP_EN */
++
++	{OV3640_SYS, 0x10, 0, 0},	/* XGA @ 30 fps */
++	{OV3640_VS_L, 0x06, 0, 0},
++	{OV3640_VH_H, 0x03, 0, 0},
++	{OV3640_VH_L, 0x04, 0, 0},
++	{OV3640_VTS_H, 0x03, 0, 0},
++	{OV3640_VTS_L, 0x10, 0, 0},
++	{OV3640_VSYNCOPT, 0x24, 0, 0},
++	{OV3640_PCLK, 0x01, 0, 0},
++// 	{0x30d7, 0x80, 0x80, 0},	/* reserved */
++	{OV3640_BLC9, 0x00, 0x40, 0},
++	{OV3640_AVH_H, 0x00, 0, 0},
++	{OV3640_AVH_L, 0xc0, 0, 0},
++	{OV3640_DSP_CTRL_2, 0x20, 0x20, 0},
++	{OV3640_SIZE_IN_MISC, 0x34, 0, 0},
++	{OV3640_HSIZE_IN_L, 0x0c, 0, 0},
++	{OV3640_VSIZE_IN_L, 0x04, 0, 0},
++	{OV3640_SIZE_OUT_MISC, 0x12, 0, 0},
++	{OV3640_HSIZE_OUT_L, 0x88, 0, 0},
++	{OV3640_VSIZE_OUT_L, 0xe4, 0, 0},
++	{OV3640_ISP_PAD_CTR2, 0x42, 0, 0},
++	/* 0x280 x 0x1e0 -> 640 x 480 */
++	{OV3640_ISP_XOUT_H, 0x02, 0, 0},
++	{OV3640_ISP_XOUT_L, 0x80, 0, 0},
++	{OV3640_ISP_YOUT_H, 0x01, 0, 0},
++	{OV3640_ISP_YOUT_L, 0xe0, 0, 0},
++	{OV3640_PLL_1, 0x37, 0, 0},
++	{OV3640_PLL_2, 0xe1, 0, 0},
++	{OV3640_PLL_3, 0x22, 0, 0},
++// 	{0x304c, 0x84, 0, 0},	/* reserved */
++	{OV3640_AUTO_2, 0x04, 0, 0},
++	{OV3640_AUTO_3, 0x02, 0, 0},
++/*	{OV3640_EXVTS_L, 0x00, 0, 0},
++	{OV3640_EXVTS_H, 0x00, 0, 0}, */
++	{OV3640_TMC13, 0x04, 0, 0},
++	{OV3640_TMC10, 0x03, 0, 0},
++	{OV3640_TMC10, 0x00, 0, 0},
++	{OV3640_CLK, 0x01, 0, 0},
 +};
 +
 +static struct reg_value ov3640_setting_15fps_QVGA_320_240[] = {
-+	{0x3012, 0x80, 0, 0}, {0x304d, 0x45, 0, 0}, {0x30a7, 0x5e, 0, 0},
-+	{0x3087, 0x16, 0, 0}, {0x309c, 0x1a, 0, 0}, {0x30a2, 0xe4, 0, 0},
-+	{0x30aa, 0x42, 0, 0}, {0x30b0, 0xff, 0, 0}, {0x30b1, 0xff, 0, 0},
-+	{0x30b2, 0x10, 0, 0}, {0x300e, 0x32, 0, 0}, {0x300f, 0x21, 0, 0},
-+	{0x3010, 0x20, 0, 0}, {0x3011, 0x00, 0, 0}, {0x304c, 0x81, 0, 0},
-+	{0x30d7, 0x10, 0, 0}, {0x30d9, 0x0d, 0, 0}, {0x30db, 0x08, 0, 0},
-+	{0x3016, 0x82, 0, 0}, {0x3018, 0x38, 0, 0}, {0x3019, 0x30, 0, 0},
-+	{0x301a, 0x61, 0, 0}, {0x307d, 0x00, 0, 0}, {0x3087, 0x02, 0, 0},
-+	{0x3082, 0x20, 0, 0}, {0x3015, 0x12, 0, 0}, {0x3014, 0x04, 0, 0},
-+	{0x3013, 0xf7, 0, 0}, {0x303c, 0x08, 0, 0}, {0x303d, 0x18, 0, 0},
-+	{0x303e, 0x06, 0, 0}, {0x303f, 0x0c, 0, 0}, {0x3030, 0x62, 0, 0},
-+	{0x3031, 0x26, 0, 0}, {0x3032, 0xe6, 0, 0}, {0x3033, 0x6e, 0, 0},
-+	{0x3034, 0xea, 0, 0}, {0x3035, 0xae, 0, 0}, {0x3036, 0xa6, 0, 0},
-+	{0x3037, 0x6a, 0, 0}, {0x3104, 0x02, 0, 0}, {0x3105, 0xfd, 0, 0},
-+	{0x3106, 0x00, 0, 0}, {0x3107, 0xff, 0, 0}, {0x3300, 0x12, 0, 0},
-+	{0x3301, 0xde, 0, 0}, {0x3302, 0xcf, 0, 0}, {0x3312, 0x26, 0, 0},
-+	{0x3314, 0x42, 0, 0}, {0x3313, 0x2b, 0, 0}, {0x3315, 0x42, 0, 0},
-+	{0x3310, 0xd0, 0, 0}, {0x3311, 0xbd, 0, 0}, {0x330c, 0x18, 0, 0},
-+	{0x330d, 0x18, 0, 0}, {0x330e, 0x56, 0, 0}, {0x330f, 0x5c, 0, 0},
-+	{0x330b, 0x1c, 0, 0}, {0x3306, 0x5c, 0, 0}, {0x3307, 0x11, 0, 0},
-+	{0x336a, 0x52, 0, 0}, {0x3370, 0x46, 0, 0}, {0x3376, 0x38, 0, 0},
-+	{0x30b8, 0x20, 0, 0}, {0x30b9, 0x17, 0, 0}, {0x30ba, 0x04, 0, 0},
-+	{0x30bb, 0x08, 0, 0}, {0x3507, 0x06, 0, 0}, {0x350a, 0x4f, 0, 0},
-+	{0x3100, 0x02, 0, 0}, {0x3301, 0xde, 0, 0}, {0x3304, 0x00, 0, 0},
-+	{0x3400, 0x00, 0, 0}, {0x3404, 0x42, 0, 0}, {0x3600, 0xc4, 0, 0},
-+	{0x3302, 0xef, 0, 0}, {0x3020, 0x01, 0, 0}, {0x3021, 0x1d, 0, 0},
-+	{0x3022, 0x00, 0, 0}, {0x3023, 0x0a, 0, 0}, {0x3024, 0x08, 0, 0},
-+	{0x3025, 0x00, 0, 0}, {0x3026, 0x06, 0, 0}, {0x3027, 0x00, 0, 0},
-+	{0x335f, 0x68, 0, 0}, {0x3360, 0x00, 0, 0}, {0x3361, 0x00, 0, 0},
-+	{0x3362, 0x01, 0, 0}, {0x3363, 0x40, 0, 0}, {0x3364, 0xf0, 0, 0},
-+	{0x3403, 0x00, 0, 0}, {0x3088, 0x01, 0, 0}, {0x3089, 0x40, 0, 0},
-+	{0x308a, 0x00, 0, 0}, {0x308b, 0xf0, 0, 0}, {0x307c, 0x10, 0, 0},
-+	{0x3090, 0xc0, 0, 0}, {0x304c, 0x84, 0, 0}, {0x308d, 0x04, 0, 0},
-+	{0x3086, 0x03, 0, 0}, {0x3086, 0x00, 0, 0}, {0x3011, 0x01, 0, 0},
++	{OV3640_SYS, 0x80, 0, 0},
++	{0x304d, 0x45, 0, 0},
++	{0x30a7, 0x5e, 0, 0},
++	{OV3640_TMC11, 0x16, 0, 0},
++	{0x309c, 0x1a, 0, 0},	/* reserved */
++	{0x30a2, 0xe4, 0, 0},	/* reserved */
++	{0x30aa, 0x42, 0, 0},	/* reserved */
++	{OV3640_IO_CTRL0, 0xff, 0, 0},
++	{OV3640_IO_CTRL1, 0xff, 0, 0},
++	{OV3640_IO_CTRL2, 0x10, 0, 0},
++	{OV3640_PLL_1, 0x32, 0, 0},
++	{OV3640_PLL_2, 0x21, 0, 0},
++	{OV3640_PLL_3, 0x20, 0, 0},
++	{OV3640_CLK, 0x00, 0, 0},
++	{0x304c, 0x81, 0, 0},	/* reserved */
++	{0x30d7, 0x10, 0, 0},	/* reserved */
++	{0x30d9, 0x0d, 0, 0},	/* reserved */
++	{0x30db, 0x08, 0, 0},	/* reserved */
++	{0x3016, 0x82, 0, 0},	/* reserved */
++	{OV3640_WPT_HISH, 0x38, 0, 0},
++	{OV3640_BPT_HISL, 0x30, 0, 0},
++	{OV3640_VPT, 0x61, 0, 0},
++	{OV3640_TMC7, 0x00, 0, 0},
++	{OV3640_TMC11, 0x02, 0, 0},
++	{0x3082, 0x20, 0, 0},	/* reserved */
++	{OV3640_AUTO_3, 0x12, 0, 0},
++	{OV3640_AUTO_2, 0x04, 0, 0},
++	{OV3640_AUTO_1, 0xf7, 0, 0},
++	{OV3640_AHW_H, 0x08, 0, 0},
++	{OV3640_AHW_L, 0x18, 0, 0},
++	{OV3640_AVH_H, 0x06, 0, 0},
++	{OV3640_AVH_L, 0x0c, 0, 0},
++	{OV3640_WEIGHT0, 0x62, 0, 0},
++	{OV3640_WEIGHT1, 0x26, 0, 0},
++	{OV3640_WEIGHT2, 0xe6, 0, 0},
++	{OV3640_WEIGHT3, 0x6e, 0, 0},
++	{OV3640_WEIGHT4, 0xea, 0, 0},
++	{OV3640_WEIGHT5, 0xae, 0, 0},
++	{OV3640_WEIGHT6, 0xa6, 0, 0},
++	{OV3640_WEIGHT7, 0x6a, 0, 0},
++	{OV3640_SC_SYN_CTRL0, 0x02, 0, 0},
++	{OV3640_SC_SYN_CTRL1, 0xfd, 0, 0},
++	{OV3640_SC_SYN_CTRL2, 0x00, 0, 0},
++	{OV3640_SC_SYN_CTRL3, 0xff, 0, 0},
++	{OV3640_DSP_CTRL_0, 0x12, 0, 0},
++	{OV3640_DSP_CTRL_1, 0xde, 0, 0},
++	{OV3640_DSP_CTRL_2, 0xcf, 0, 0},
++	{0x3312, 0x26, 0, 0},
++	{0x3314, 0x42, 0, 0},
++	{0x3313, 0x2b, 0, 0},
++	{0x3315, 0x42, 0, 0},
++	{0x3310, 0xd0, 0, 0},
++	{0x3311, 0xbd, 0, 0},
++	{0x330c, 0x18, 0, 0},
++	{0x330d, 0x18, 0, 0},
++	{0x330e, 0x56, 0, 0},
++	{0x330f, 0x5c, 0, 0},
++	{0x330b, 0x1c, 0, 0},
++	{0x3306, 0x5c, 0, 0},
++	{0x3307, 0x11, 0, 0},
++	{OV3640_R_A1, 0x52, 0, 0},
++	{OV3640_G_A1, 0x46, 0, 0},
++	{OV3640_B_A1, 0x38, 0, 0},
++	{OV3640_DSPC0, 0x20, 0, 0},
++	{OV3640_DSPC1, 0x17, 0, 0},
++	{OV3640_DSPC2, 0x04, 0, 0},
++	{OV3640_DSPC3, 0x08, 0, 0},
++	{0x3507, 0x06, 0, 0},
++	{0x350a, 0x4f, 0, 0},
++	{OV3640_SC_CTRL0, 0x02, 0, 0},
++	{OV3640_DSP_CTRL_1, 0xde, 0, 0},
++	{OV3640_DSP_CTRL_4, 0x00, 0, 0},
++	{OV3640_FMT_MUX_CTRL0, 0x00, 0, 0},
++	{OV3640_FMT_CTRL00, 0x42, 0, 0},
++	{OV3640_OUT_CTRL00, 0xc4, 0, 0},
++	{OV3640_DSP_CTRL_2, 0xef, 0, 0},
++	{OV3640_HS_H, 0x01, 0, 0},
++	{OV3640_HS_L, 0x1d, 0, 0},
++	{OV3640_VS_H, 0x00, 0, 0},
++	{OV3640_VS_L, 0x0a, 0, 0},
++	{OV3640_HW_H, 0x08, 0, 0},
++	{OV3640_HW_L, 0x00, 0, 0},
++	{OV3640_VH_H, 0x06, 0, 0},
++	{OV3640_VH_L, 0x00, 0, 0},
++	{OV3640_SIZE_IN_MISC, 0x68, 0, 0},
++	{OV3640_HSIZE_IN_L, 0x00, 0, 0},
++	{OV3640_VSIZE_IN_L, 0x00, 0, 0},
++	{OV3640_SIZE_OUT_MISC, 0x01, 0, 0},
++	{OV3640_HSIZE_OUT_L, 0x40, 0, 0},
++	{OV3640_VSIZE_OUT_L, 0xf0, 0, 0},
++	{OV3640_ISP_PAD_CTR2, 0x00, 0, 0},
++	{OV3640_ISP_XOUT_H, 0x01, 0, 0},
++	{OV3640_ISP_XOUT_L, 0x40, 0, 0},
++	{OV3640_ISP_YOUT_H, 0x00, 0, 0},
++	{OV3640_ISP_YOUT_L, 0xf0, 0, 0},
++	{OV3640_TMC6, 0x10, 0, 0},
++	{0x3090, 0xc0, 0, 0},
++	{0x304c, 0x84, 0, 0},	/* reserved */
++	{OV3640_TMC13, 0x04, 0, 0},
++	{OV3640_TMC10, 0x03, 0, 0},
++	{OV3640_TMC10, 0x00, 0, 0},
++	{OV3640_CLK, 0x01, 0, 0},
 +};
 +
 +static struct reg_value ov3640_setting_30fps_QVGA_320_240[] = {
-+	{0x3012, 0x80, 0, 0}, {0x304d, 0x45, 0, 0}, {0x30a7, 0x5e, 0, 0},
-+	{0x3087, 0x16, 0, 0}, {0x309c, 0x1a, 0, 0}, {0x30a2, 0xe4, 0, 0},
-+	{0x30aa, 0x42, 0, 0}, {0x30b0, 0xff, 0, 0}, {0x30b1, 0xff, 0, 0},
-+	{0x30b2, 0x10, 0, 0}, {0x300e, 0x32, 0, 0}, {0x300f, 0x21, 0, 0},
-+	{0x3010, 0x20, 0, 0}, {0x3011, 0x01, 0, 0}, {0x304c, 0x82, 0, 0},
-+	{0x30d7, 0x10, 0, 0}, {0x30d9, 0x0d, 0, 0}, {0x30db, 0x08, 0, 0},
-+	{0x3016, 0x82, 0, 0}, {0x3018, 0x38, 0, 0}, {0x3019, 0x30, 0, 0},
-+	{0x301a, 0x61, 0, 0}, {0x307d, 0x00, 0, 0}, {0x3087, 0x02, 0, 0},
-+	{0x3082, 0x20, 0, 0}, {0x3015, 0x12, 0, 0}, {0x3014, 0x0c, 0, 0},
-+	{0x3013, 0xf7, 0, 0}, {0x303c, 0x08, 0, 0}, {0x303d, 0x18, 0, 0},
-+	{0x303e, 0x06, 0, 0}, {0x303f, 0x0c, 0, 0}, {0x3030, 0x62, 0, 0},
-+	{0x3031, 0x26, 0, 0}, {0x3032, 0xe6, 0, 0}, {0x3033, 0x6e, 0, 0},
-+	{0x3034, 0xea, 0, 0}, {0x3035, 0xae, 0, 0}, {0x3036, 0xa6, 0, 0},
-+	{0x3037, 0x6a, 0, 0}, {0x3104, 0x02, 0, 0}, {0x3105, 0xfd, 0, 0},
-+	{0x3106, 0x00, 0, 0}, {0x3107, 0xff, 0, 0}, {0x3300, 0x12, 0, 0},
-+	{0x3301, 0xde, 0, 0}, {0x3302, 0xcf, 0, 0}, {0x3312, 0x26, 0, 0},
-+	{0x3314, 0x42, 0, 0}, {0x3313, 0x2b, 0, 0}, {0x3315, 0x42, 0, 0},
-+	{0x3310, 0xd0, 0, 0}, {0x3311, 0xbd, 0, 0}, {0x330c, 0x18, 0, 0},
-+	{0x330d, 0x18, 0, 0}, {0x330e, 0x56, 0, 0}, {0x330f, 0x5c, 0, 0},
-+	{0x330b, 0x1c, 0, 0}, {0x3306, 0x5c, 0, 0}, {0x3307, 0x11, 0, 0},
-+	{0x336a, 0x52, 0, 0}, {0x3370, 0x46, 0, 0}, {0x3376, 0x38, 0, 0},
-+	{0x3300, 0x13, 0, 0}, {0x30b8, 0x20, 0, 0}, {0x30b9, 0x17, 0, 0},
-+	{0x30ba, 0x04, 0, 0}, {0x30bb, 0x08, 0, 0}, {0x3100, 0x02, 0, 0},
-+	{0x3301, 0x10, 0x30, 0}, {0x3304, 0x00, 0x03, 0}, {0x3400, 0x00, 0, 0},
-+	{0x3404, 0x02, 0, 0}, {0x3600, 0xc0, 0, 0}, {0x308d, 0x04, 0, 0},
-+	{0x3086, 0x03, 0, 0}, {0x3086, 0x00, 0, 0}, {0x3012, 0x10, 0, 0},
-+	{0x3023, 0x06, 0, 0}, {0x3026, 0x03, 0, 0}, {0x3027, 0x04, 0, 0},
-+	{0x302a, 0x03, 0, 0}, {0x302b, 0x10, 0, 0}, {0x3075, 0x24, 0, 0},
-+	{0x300d, 0x01, 0, 0}, {0x30d7, 0x80, 0x80, 0}, {0x3069, 0x00, 0x40, 0},
-+	{0x303e, 0x00, 0, 0}, {0x303f, 0xc0, 0, 0}, {0x3302, 0x20, 0x20, 0},
-+	{0x335f, 0x34, 0, 0}, {0x3360, 0x0c, 0, 0}, {0x3361, 0x04, 0, 0},
-+	{0x3362, 0x34, 0, 0}, {0x3363, 0x08, 0, 0}, {0x3364, 0x04, 0, 0},
-+	{0x3403, 0x42, 0, 0}, {0x3088, 0x04, 0, 0}, {0x3089, 0x00, 0, 0},
-+	{0x308a, 0x03, 0, 0}, {0x308b, 0x00, 0, 0}, {0x3362, 0x12, 0, 0},
-+	{0x3363, 0x88, 0, 0}, {0x3364, 0xe4, 0, 0}, {0x3403, 0x42, 0, 0},
-+	{0x3088, 0x02, 0, 0}, {0x3089, 0x80, 0, 0}, {0x308a, 0x01, 0, 0},
-+	{0x308b, 0xe0, 0, 0}, {0x300e, 0x37, 0, 0}, {0x300f, 0xe1, 0, 0},
-+	{0x3010, 0x22, 0, 0}, {0x3011, 0x01, 0, 0}, {0x304c, 0x84, 0, 0},
++	{OV3640_SYS, 0x80, 0, 0},
++	{0x304d, 0x45, 0, 0},
++	{0x30a7, 0x5e, 0, 0},
++	{OV3640_TMC11, 0x16, 0, 0},
++	{0x309c, 0x1a, 0, 0},	/* reserved */
++	{0x30a2, 0xe4, 0, 0},	/* reserved */
++	{0x30aa, 0x42, 0, 0},	/* reserved */
++	{OV3640_IO_CTRL0, 0xff, 0, 0},
++	{OV3640_IO_CTRL1, 0xff, 0, 0},
++	{OV3640_IO_CTRL2, 0x10, 0, 0},
++	{OV3640_PLL_1, 0x32, 0, 0},
++	{OV3640_PLL_2, 0x21, 0, 0},
++	{OV3640_PLL_3, 0x20, 0, 0},
++	{OV3640_CLK, 0x01, 0, 0},
++	{0x304c, 0x82, 0, 0},	/* reserved */
++	{0x30d7, 0x10, 0, 0},	/* reserved */
++	{0x30d9, 0x0d, 0, 0},	/* reserved */
++	{0x30db, 0x08, 0, 0},	/* reserved */
++	{0x3016, 0x82, 0, 0},	/* reserved */
++	{OV3640_WPT_HISH, 0x38, 0, 0},
++	{OV3640_BPT_HISL, 0x30, 0, 0},
++	{OV3640_VPT, 0x61, 0, 0},
++	{OV3640_TMC7, 0x00, 0, 0},
++	{OV3640_TMC11, 0x02, 0, 0},
++	{0x3082, 0x20, 0, 0},	/* reserved */
++	{OV3640_AUTO_3, 0x12, 0, 0},
++	{OV3640_AUTO_2, 0x0c, 0, 0},
++	{OV3640_AUTO_1, 0xf7, 0, 0},
++	{OV3640_AHW_H, 0x08, 0, 0},
++	{OV3640_AHW_L, 0x18, 0, 0},
++	{OV3640_AVH_H, 0x06, 0, 0},
++	{OV3640_AVH_L, 0x0c, 0, 0},
++	{OV3640_WEIGHT0, 0x62, 0, 0},
++	{OV3640_WEIGHT1, 0x26, 0, 0},
++	{OV3640_WEIGHT2, 0xe6, 0, 0},
++	{OV3640_WEIGHT3, 0x6e, 0, 0},
++	{OV3640_WEIGHT4, 0xea, 0, 0},
++	{OV3640_WEIGHT5, 0xae, 0, 0},
++	{OV3640_WEIGHT6, 0xa6, 0, 0},
++	{OV3640_WEIGHT7, 0x6a, 0, 0},
++	{OV3640_SC_SYN_CTRL0, 0x02, 0, 0},
++	{OV3640_SC_SYN_CTRL1, 0xfd, 0, 0},
++	{OV3640_SC_SYN_CTRL2, 0x00, 0, 0},
++	{OV3640_SC_SYN_CTRL3, 0xff, 0, 0},
++	{OV3640_DSP_CTRL_0, 0x12, 0, 0},
++	{OV3640_DSP_CTRL_1, 0xde, 0, 0},
++	{OV3640_DSP_CTRL_2, 0xcf, 0, 0},
++	{0x3312, 0x26, 0, 0},
++	{0x3314, 0x42, 0, 0},
++	{0x3313, 0x2b, 0, 0},
++	{0x3315, 0x42, 0, 0},
++	{0x3310, 0xd0, 0, 0},
++	{0x3311, 0xbd, 0, 0},
++	{0x330c, 0x18, 0, 0},
++	{0x330d, 0x18, 0, 0},
++	{0x330e, 0x56, 0, 0},
++	{0x330f, 0x5c, 0, 0},
++	{0x330b, 0x1c, 0, 0},
++	{0x3306, 0x5c, 0, 0},
++	{0x3307, 0x11, 0, 0},
++	{OV3640_R_A1, 0x52, 0, 0},
++	{OV3640_G_A1, 0x46, 0, 0},
++	{OV3640_B_A1, 0x38, 0, 0},
++	{OV3640_DSP_CTRL_0, 0x13, 0, 0},
++	{OV3640_DSPC0, 0x20, 0, 0},
++	{OV3640_DSPC1, 0x17, 0, 0},
++	{OV3640_DSPC2, 0x04, 0, 0},
++	{OV3640_DSPC3, 0x08, 0, 0},
++	{OV3640_SC_CTRL0, 0x02, 0, 0},
++	{OV3640_DSP_CTRL_1, 0x10, 0x30, 0},
++	{OV3640_DSP_CTRL_4, 0x00, 0x03, 0},
++	{OV3640_FMT_MUX_CTRL0, 0x00, 0, 0},
++	{OV3640_FMT_CTRL00, 0x02, 0, 0},
++	{OV3640_OUT_CTRL00, 0xc0, 0, 0},
++	{OV3640_TMC13, 0x04, 0, 0},
++	{OV3640_TMC10, 0x03, 0, 0},
++	{OV3640_TMC10, 0x00, 0, 0},
++	{OV3640_SYS, 0x10, 0, 0},
++	{OV3640_VS_L, 0x06, 0, 0},
++	{OV3640_VH_H, 0x03, 0, 0},
++	{OV3640_VH_L, 0x04, 0, 0},
++	{OV3640_VTS_H, 0x03, 0, 0},
++	{OV3640_VTS_L, 0x10, 0, 0},
++	{OV3640_VSYNCOPT, 0x24, 0, 0},
++	{OV3640_PCLK, 0x01, 0, 0},
++	{0x30d7, 0x80, 0x80, 0},	/* reserved */
++	{OV3640_BLC9, 0x00, 0x40, 0},
++	{OV3640_AVH_H, 0x00, 0, 0},
++	{OV3640_AVH_L, 0xc0, 0, 0},
++	{OV3640_DSP_CTRL_2, 0x20, 0x20, 0},
++	{OV3640_SIZE_IN_MISC, 0x34, 0, 0},
++	{OV3640_HSIZE_IN_L, 0x0c, 0, 0},
++	{OV3640_VSIZE_IN_L, 0x04, 0, 0},
++	{OV3640_SIZE_OUT_MISC, 0x34, 0, 0},
++	{OV3640_HSIZE_OUT_L, 0x08, 0, 0},
++	{OV3640_VSIZE_OUT_L, 0x04, 0, 0},
++	{OV3640_ISP_PAD_CTR2, 0x42, 0, 0},
++	{OV3640_ISP_XOUT_H, 0x04, 0, 0},
++	{OV3640_ISP_XOUT_L, 0x00, 0, 0},
++	{OV3640_ISP_YOUT_H, 0x03, 0, 0},
++	{OV3640_ISP_YOUT_L, 0x00, 0, 0},
++	{OV3640_SIZE_OUT_MISC, 0x12, 0, 0},
++	{OV3640_HSIZE_OUT_L, 0x88, 0, 0},
++	{OV3640_VSIZE_OUT_L, 0xe4, 0, 0},
++	{OV3640_ISP_PAD_CTR2, 0x42, 0, 0},
++	{OV3640_ISP_XOUT_H, 0x02, 0, 0},
++	{OV3640_ISP_XOUT_L, 0x80, 0, 0},
++	{OV3640_ISP_YOUT_H, 0x01, 0, 0},
++	{OV3640_ISP_YOUT_L, 0xe0, 0, 0},
++	{OV3640_PLL_1, 0x37, 0, 0},
++	{OV3640_PLL_2, 0xe1, 0, 0},
++	{OV3640_PLL_3, 0x22, 0, 0},
++	{OV3640_CLK, 0x01, 0, 0},
++	{0x304c, 0x84, 0, 0},	/* reserved */
 +};
 +
 +static struct ov3640_mode_info ov3640_mode_info_data[2][ov3640_mode_MAX + 1] = {
@@ -543,7 +1199,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
 +			.maximum = OV3640_MAX_BRIGHT,
 +			.step = OV3640_BRIGHT_STEP,
 +			.default_value = OV3640_DEF_BRIGHT,
-+		}, 
++		},
 +		.current_value = OV3640_DEF_BRIGHT,
 +	}, {
 +		{
@@ -697,7 +1353,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
 +static void ov3640_allocate_video_controls(void)
 +{
 +	int i;
-+ 
++
 +	for (i = 0; i < (ARRAY_SIZE(video_control) - 1); i++) {
 +		memcpy(&ov3640_controls[i], &video_control[i], sizeof(struct v4l2_queryctrl));
 +	}
@@ -717,7 +1373,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
 +	if (i2c_master_send(client, au8Buf, 3) < 0) {
 +		dev_err(&client->dev, "error while writing reg 0x%04x with val=0x%x\n",
 +			reg, val);
-+		return -1;
++		return -ENODEV;
 +	}
 +
 +	return 0;
@@ -725,6 +1381,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
 +
 +static int ov3640_read(struct i2c_client *client, u16 reg, u8 *val)
 +{
++	int ret = 0;
 +	u8 au8RegBuf[2] = {0};
 +	u8 u8RdVal = 0;
 +
@@ -737,18 +1394,18 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
 +	if (2 != i2c_master_send(client, au8RegBuf, 2)) {
 +		pr_err("%s:write reg error:reg=%x\n",
 +				__func__, reg);
-+		return -1;
++		return -ENODEV;
 +	}
 +
 +	if (1 != i2c_master_recv(client, &u8RdVal, 1)) {
 +		dev_err(&client->dev, "%s:read reg error:reg=%x,val=%x\n",
 +				__func__, reg, u8RdVal);
-+		return -1;
++		return -ENODEV;
 +	}
 +
 +	*val = u8RdVal;
 +
-+	return u8RdVal;
++	return ret;
 +}
 +
 +/*static int ov3640_init_mode(struct i2c_client *client,
@@ -774,9 +1431,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
 +
 +	/* XXX */
 +	enum ov3640_mode mode = ov3640_mode_VGA_640_480;
-+	enum ov3640_frame_rate frame_rate = ov3640_30_fps; 
-+
-+	CAMERA_TRACE(("CAMERA_DBG Entry: ov3640_init_mode\n"));
++	enum ov3640_frame_rate frame_rate = ov3640_15_fps;/*ov3640_30_fps;*/
 +
 +	if (mode > ov3640_mode_MAX || mode < ov3640_mode_MIN) {
 +		pr_err("Wrong ov3640 mode detected!\n");
@@ -814,7 +1469,6 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
 +			msleep(Delay_ms);
 +	}
 +err:
-+	CAMERA_TRACE(("CAMERA_DBG Exit: ov3640_init_mode\n"));
 +
 +	return retval;
 +}
@@ -1034,22 +1688,24 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
 +static int ov3640_detect(struct i2c_client *client)
 +{
 +	u8 pidh, pidl, sccb_id;
++	int ret;
 +
 +	if (!client)
 +		return -ENODEV;
 +
-+	if (ov3640_read(client, OV3640_PIDH, &pidh))
-+		return -ENODEV;
-+	if (ov3640_read(client, OV3640_PIDL, &pidl))
-+		return -ENODEV;
-+	if (ov3640_read(client, OV3640_SCCB_ID, &sccb_id))
-+		return -ENODEV;
++	if ((ret = ov3640_read(client, OV3640_PIDH, &pidh)))
++		return ret;
++	if ((ret = ov3640_read(client, OV3640_PIDL, &pidl)))
++		return ret;
++	if ((ret = ov3640_read(client, OV3640_SCCB_ID, &sccb_id)))
++		return ret;
 +
 +	dev_dbg(&client->dev, "PIDH=0x%02x PIDL=0x%02x SCCB_ID=0x%02x\n",
 +			pidh, pidl, sccb_id);
 +
-+	if ((pidh != 0x36)
-+		|| ( (pidl != 0x40) && (pidl != 0x40) && (pidl != 0x40) ))
++	if ((pidh != OV3640_PIDH_MAGIC) || ((pidl != OV3640_PIDL_MAGIC1A) &&
++						(pidl != OV3640_PIDL_MAGIC2A) &&
++						(pidl != OV3640_PIDL_MAGIC2C)))
 +		/*
 +		 * We didn't read the values we expected, so
 +		 * this must not be an OV3640.
@@ -1209,7 +1865,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
 +
 +static void ov3640_reset(struct i2c_client *client)
 +{
-+	/* XXX: tweak register 0x3104 */
++	/* XXX: tweak register OV3640_SC_SYN_CTRL0 */
 +	msleep(1);
 +}
 +
@@ -1301,10 +1957,10 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
 +	icd->num_formats = NUM_CAPTURE_FORMATS;
 +
 +	/* configure default image size and pixel format */
-+/*	ret = ov3640_write_regs(client, ov3640_reg_init[YUV][QVGA]);
++	ret = ov3640_configure(icd);
 +	if (ret)
 +		goto err;
-+*/
++
 +	/* Now that we know the model, we can start video */
 +	ret = soc_camera_video_start(icd);
 +	if (ret)
@@ -1494,8 +2150,8 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
 Index: linux-2.6.29.6/drivers/media/video/ov3640_regs.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/media/video/ov3640_regs.h	2010-07-23 11:41:31.000000000 +0200
-@@ -0,0 +1,596 @@
++++ linux-2.6.29.6/drivers/media/video/ov3640_regs.h	2010-09-27 15:45:46.000000000 +0200
+@@ -0,0 +1,602 @@
 +/*
 + * drivers/media/video/ov3640_regs.h
 + *
@@ -1527,7 +2183,11 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640_regs.h
 +#define OV3640_GREEN				0x3006
 +#define OV3640_BLUE				0x3007
 +#define OV3640_PIDH				0x300A
++#define OV3640_PIDH_MAGIC			0x36
 +#define OV3640_PIDL				0x300B
++#define OV3640_PIDL_MAGIC1A			0x40
++#define OV3640_PIDL_MAGIC2A			0x41
++#define OV3640_PIDL_MAGIC2C			0x4C
 +#define OV3640_SCCB_ID				0x300C
 +#define OV3640_PCLK				0x300D
 +#define OV3640_PCLK_HREFQUAL_OUT		(1 << 5)
@@ -2075,6 +2735,8 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640_regs.h
 +#define OV3640_OUT_CTRL43			0x3643
 +#define OV3640_OUT_CTRL44			0x3644
 +#define OV3640_OUT_CTRL46			0x3646
++#define OV3640_OUT_CTRL46_HSYNC_EN		(1 << 6)
++#define OV3640_OUT_CTRL46_HSYNC_DVP_EN		(1 << 2)
 +#define OV3640_MIPI_CTRL4C			0x364C
 +#define OV3640_MIPI_CTRL4C_ECC_PHBYTEORDER2	(1 << 2)
 +/*
@@ -2094,8 +2756,8 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640_regs.h
 +#endif				/* ifndef OV3640_REGS...
 
[truncated message content]

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-36-g53ec075

From: Julien B a. A. <ar...@us...> - 2010-09-30 10:48: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  53ec075d32b7664998c4aeb64fa47b225689a8d9 (commit)
       via  fdc715ea884c71d304347600e3415b6f71f05fdf (commit)
       via  cea448a84829b33033b5bef26f15241fcfa95b13 (commit)
      from  258d639395ec119f7a5f08c38dea96118815fe04 (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 53ec075d32b7664998c4aeb64fa47b225689a8d9
Merge: fdc715ea884c71d304347600e3415b6f71f05fdf 258d639395ec119f7a5f08c38dea96118815fe04
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Sep 30 12:48:06 2010 +0200

    Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit fdc715ea884c71d304347600e3415b6f71f05fdf
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Sep 30 12:47:08 2010 +0200

    [AS_DEVICES] increase version number

commit cea448a84829b33033b5bef26f15241fcfa95b13
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Sep 30 12:44:26 2010 +0200

    [AS_DEVICES] helpers: add as_read_int()

-----------------------------------------------------------------------

Summary of changes:
 .../package/armadeus/as_devices/as_devices.mk      |    2 +-
 target/packages/as_devices/c/as_pwm.c              |    8 +++---
 target/packages/as_devices/c/helpers.c             |   27 +++++++++++++++----
 target/packages/as_devices/c/helpers.h             |   20 +++++++++++---
 4 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index 1476a98..152e427 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -6,7 +6,7 @@
 
 PYTHON:=python2.4
 
-AS_DEVICES_VER:=0.14
+AS_DEVICES_VER:=0.15
 AS_DEVICES_SOURCE:=$(TOPDIR)/../target/packages/as_devices
 AS_DEVICES_DIR:=$(BUILD_DIR)/as_devices-$(AS_DEVICES_VER)
 AS_DEVICES_CAT:=zcat
diff --git a/target/packages/as_devices/c/as_pwm.c b/target/packages/as_devices/c/as_pwm.c
index d0bbaa8..f4c8b19 100644
--- a/target/packages/as_devices/c/as_pwm.c
+++ b/target/packages/as_devices/c/as_pwm.c
@@ -91,7 +91,7 @@ int32_t as_pwm_get_frequency(struct as_pwm_device *dev)
     char buffer[SIZE_OF_BUFF];
     int ret;
 
-    ret = as_read_buffer(dev->fileFrequency, buffer);
+    ret = as_read_buffer(dev->fileFrequency, buffer, SIZE_OF_BUFF);
     if (ret < 0) {
         ERROR("Can't read frequency\n");
         return ret;
@@ -114,7 +114,7 @@ int32_t as_pwm_get_period(struct as_pwm_device *dev)
     char buffer[SIZE_OF_BUFF];
     int ret;
 
-    ret = as_read_buffer(dev->filePeriod, buffer);
+    ret = as_read_buffer(dev->filePeriod, buffer, SIZE_OF_BUFF);
     if (ret < 0) {
         ERROR("Can't read period\n");
         return ret;
@@ -137,7 +137,7 @@ int32_t as_pwm_get_duty(struct as_pwm_device *dev)
     char buffer[SIZE_OF_BUFF];
     int ret;
 
-    ret = as_read_buffer(dev->fileDuty, buffer);
+    ret = as_read_buffer(dev->fileDuty, buffer, SIZE_OF_BUFF);
     if (ret < 0) {
         ERROR("Can't read duty\n");
         return ret;
@@ -171,7 +171,7 @@ int32_t as_pwm_get_state(struct as_pwm_device *dev)
     char buffer[SIZE_OF_BUFF];
     int ret;
 
-    ret = as_read_buffer(dev->fileActive, buffer);
+    ret = as_read_buffer(dev->fileActive, buffer, SIZE_OF_BUFF);
     if (ret < 0) {
         ERROR("Can't read state\n");
         return ret;
diff --git a/target/packages/as_devices/c/helpers.c b/target/packages/as_devices/c/helpers.c
index 57d63f6..702a88d 100644
--- a/target/packages/as_devices/c/helpers.c
+++ b/target/packages/as_devices/c/helpers.c
@@ -56,21 +56,36 @@ int as_write_buffer(int fd, int value)
     return buffer_len;
 }
 
-int readBuffer(int fd, char *buf)
+int as_read_buffer(int fd, char *buf, int size)
 {
-    int ret;
+    int ret, err;
 
-    ret = read(fd, buf, SIZE_OF_BUFF);
+    ret = read(fd, buf, size);
     if (ret < 0) {
         ERROR("Can't read file ");
         return ret;
     }
-    ret = lseek(fd, 0, SEEK_SET);
-    if (ret < 0) {
+    err = lseek(fd, 0, SEEK_SET);
+    if (err < 0) {
         ERROR("lseek error ");
-        return ret;
+        return err;
     }
 
     return ret;
 }
 
+int as_read_int(int fd, int *value_res)
+{
+    const int SIZEOFBUFF = 20;
+    ssize_t ret;
+    char buf[SIZEOFBUFF];
+    int value;
+
+    ret = as_read_buffer(fd, buf, SIZEOFBUFF);
+    buf[ret-1] = '\0';
+    value = strtol(buf, NULL, 10);
+    *value_res = value;
+
+    return 0;
+}
+
diff --git a/target/packages/as_devices/c/helpers.h b/target/packages/as_devices/c/helpers.h
index 2c027ae..4ff72e0 100644
--- a/target/packages/as_devices/c/helpers.h
+++ b/target/packages/as_devices/c/helpers.h
@@ -19,11 +19,11 @@
 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <string.h>
+#ifndef __ASHELPERS_H__
+#define __ASHELPERS_H__
+
 #include <stdio.h>
 #include <stdlib.h>
-//#include <fcntl.h>  /* for open()   */
-#include <unistd.h> /* for write()  */
 
 #ifdef DEBUG
 #   define ERROR(fmt, ...) printf(fmt, ##__VA_ARGS__)
@@ -44,8 +44,20 @@ int as_write_buffer(int fd, int value);
  *
  * @param fd: file handler
  * @param buf: char pointer to read buffer
+ * @param size: size of buffer
  *
  * @return number of chars read, negative value on error
  */
-int as_read_buffer(int fd, char *buf);
+int as_read_buffer(int fd, char *buf, int size);
+
+/** @brief read an int value stored as string in a /sys/ or /proc interface
+ *
+ * @param fd: file handler
+ * @param value_res: int pointer to store the value read
+ *
+ * @return negative value on error
+ */
+int as_read_int(int fd, int *value_res);
+
+#endif /* __ASHELPERS_H__ */
 


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-33-g258d639

From: Nicolas <th...@us...> - 2010-09-29 17:01:23

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  258d639395ec119f7a5f08c38dea96118815fe04 (commit)
      from  1afa0ec9c6d46c31919283037f3d70c9d2224edd (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 258d639395ec119f7a5f08c38dea96118815fe04
Author: Nicolas Colombain <nic...@ar...>
Date:   Wed Sep 29 18:59:38 2010 +0200

    [U-BOOT] fix error in tftp.c when compiling APF9328. bug#85

-----------------------------------------------------------------------

Summary of changes:
 ...u-boot-1.3.4-340-nand_large_file_download.patch |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildroot/target/u-boot/u-boot-1.3.4-340-nand_large_file_download.patch b/buildroot/target/u-boot/u-boot-1.3.4-340-nand_large_file_download.patch
index a26b094..a809979 100644
--- a/buildroot/target/u-boot/u-boot-1.3.4-340-nand_large_file_download.patch
+++ b/buildroot/target/u-boot/u-boot-1.3.4-340-nand_large_file_download.patch
@@ -74,7 +74,7 @@
  #endif	/* CONFIG_MCAST_TFTP */
  
 +
-+
++#if defined(CONFIG_CMD_NAND)
 +int tftp_nand_write(nand_info_t *meminfo, uchar *src, unsigned long *offset   )
 +{
 +	size_t written;
@@ -161,7 +161,7 @@
 +		}
 +	}
 +}
-+
++#endif
 +
  static __inline__ void
  store_block (unsigned block, uchar * src, unsigned len)


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-32-g1afa0ec

From: jscheer <js...@us...> - 2010-09-27 12:44:45

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  1afa0ec9c6d46c31919283037f3d70c9d2224edd (commit)
      from  631567984dee80bb1097354e5dc129b4888851e2 (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 1afa0ec9c6d46c31919283037f3d70c9d2224edd
Author: Jeremie Scheer <jer...@ar...>
Date:   Mon Sep 27 14:44:07 2010 +0200

    Change securetty serial port to ttyGS0.

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/rootfs/target_skeleton/etc/securetty  |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty
index f93577f..623807c 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/securetty
@@ -12,4 +12,4 @@ ttyS2
 ttyS3
 ttySMX0
 ttySMX1
-ttygserial
+ttyGS0


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-31-g6315679

From: Julien B a. A. <ar...@us...> - 2010-09-27 08:06: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  631567984dee80bb1097354e5dc129b4888851e2 (commit)
       via  8600a6ad4f8c85b6b3a714a984d55114270c42ac (commit)
       via  2da68cd6dc7eeeb31b7394f75891ab0177ac6397 (commit)
       via  31ce6a2559c8d10bee24a847270aa14aa721f4b6 (commit)
      from  9c74dab187adea3c7a806e868c3a99e79c6a9dfd (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 631567984dee80bb1097354e5dc129b4888851e2
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Sep 27 10:05:25 2010 +0200

    [ASDEVICES] add a helpers module to factorize methods used in other modules

commit 8600a6ad4f8c85b6b3a714a984d55114270c42ac
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Sep 27 09:57:48 2010 +0200

    [ASDEVICES] as_i2c.h: improves functions description

commit 2da68cd6dc7eeeb31b7394f75891ab0177ac6397
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Sep 27 09:56:56 2010 +0200

    Indentation

commit 31ce6a2559c8d10bee24a847270aa14aa721f4b6
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Sep 23 18:27:51 2010 +0200

    [AS_DEVICES] Indentation & beautifying

-----------------------------------------------------------------------

Summary of changes:
 target/packages/as_devices/c/Makefile              |   15 +-
 target/packages/as_devices/c/as_gpio.c             |   69 +++----
 target/packages/as_devices/c/as_gpio.h             |    8 +-
 target/packages/as_devices/c/as_i2c.c              |   97 ++++++-----
 target/packages/as_devices/c/as_i2c.h              |   32 +++-
 target/packages/as_devices/c/as_pwm.c              |  196 ++++++--------------
 target/packages/as_devices/c/helpers.c             |   76 ++++++++
 .../{cpp/as_apf27_pwm.hpp => c/helpers.h}          |   71 +++-----
 8 files changed, 279 insertions(+), 285 deletions(-)
 create mode 100644 target/packages/as_devices/c/helpers.c
 copy target/packages/as_devices/{cpp/as_apf27_pwm.hpp => c/helpers.h} (51%)

diff --git a/target/packages/as_devices/c/Makefile b/target/packages/as_devices/c/Makefile
index 1fc7a5c..1164cc2 100644
--- a/target/packages/as_devices/c/Makefile
+++ b/target/packages/as_devices/c/Makefile
@@ -13,13 +13,14 @@ CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
 STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
 CFLAGS+=
 
-OBJ=as_pwm.o
-OBJ+= as_i2c.o
-OBJ+= as_gpio.o
-OBJ+= as_93lcxx.o
-OBJ+= as_spi.o
-OBJ+= as_max1027.o
-OBJ+= as_max5821.o
+OBJ = as_pwm.o
+OBJ += as_i2c.o
+OBJ += as_gpio.o
+OBJ += as_93lcxx.o
+OBJ += as_spi.o
+OBJ += as_max1027.o
+OBJ += as_max5821.o
+OBJ += helpers.o
 
 LIBRARY=as_devices
 LIB_VERS=1
diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index bab67c0..7959313 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -19,8 +19,6 @@
  ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "as_gpio.h"
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -30,6 +28,11 @@
 #include <sys/ioctl.h>
 #include <linux/ppdev.h>
 
+/*#define DEBUG*/
+#include "helpers.h"
+#include "as_gpio.h"
+
+
 /* IOCTL */
 /* direction: 1 output, 0 input */
 #define GPIORDDIRECTION	_IOR(PP_IOCTL, 0xF0, int)
@@ -54,20 +57,13 @@
 
 #define BUFF_SIZE (300)
 
-//#define DEBUG
-#ifdef DEBUG
-#   define ERROR(fmt, ...) printf(fmt, ##__VA_ARGS__)
-#else
-#   define ERROR(fmt, ...) /*fmt, ##__VA_ARGS__*/
-#endif
-
 /*------------------------------------------------------------------------------*/
 
 struct as_gpio_device *as_gpio_open(char aPortChar, int aPinNum)
 {
     struct as_gpio_device *dev;
     char gpio_file_path[50];
-    int ret=0;
+    int ret = 0;
     int file;
     int value;
 
@@ -87,8 +83,7 @@ struct as_gpio_device *as_gpio_open(char aPortChar, int aPinNum)
     }
 
     dev = (struct as_gpio_device *)malloc(sizeof(struct as_gpio_device));
-    if (dev == NULL)
-    {
+    if (dev == NULL) {
         ERROR("Can't allocate memory for gpio device structure\n");
         goto malloc_error;
     }
@@ -99,8 +94,7 @@ struct as_gpio_device *as_gpio_open(char aPortChar, int aPinNum)
 
     value = 1;
     ret = ioctl(dev->fpin, GPIOWRMODE, &value); /* set pin on gpio mode */
-    if (ret < 0)
-    {
+    if (ret < 0) {
         ERROR("can't set pin in gpio mode.\n");
         goto mode_error;
     }
@@ -120,10 +114,10 @@ path_error:
 
 int32_t as_gpio_set_pin_direction(struct as_gpio_device *aDev, int aDirection)
 {
-    int ret=0;
+    int ret = 0;
     int portval;
 
-    portval = (aDirection != 0)?1:0;
+    portval = (aDirection != 0) ? 1 : 0;
 
     ret = ioctl(aDev->fpin, GPIOWRDIRECTION, &portval);
     if (ret < 0) {
@@ -137,7 +131,7 @@ int32_t as_gpio_set_pin_direction(struct as_gpio_device *aDev, int aDirection)
 
 int32_t as_gpio_get_pin_direction(struct as_gpio_device *aDev)
 {
-    int ret=0;
+    int ret = 0;
     int portval;
 
     ret = ioctl(aDev->fpin, GPIORDDIRECTION, &portval);
@@ -145,17 +139,17 @@ int32_t as_gpio_get_pin_direction(struct as_gpio_device *aDev)
         ERROR("Can't get gpio direction\n");
         return ret;
     }
-    return ((portval !=0)?1:0);
+    return ((portval !=0) ? 1 : 0);
 }
 
 /*------------------------------------------------------------------------------*/
 
 int32_t as_gpio_set_pin_value(struct as_gpio_device *aDev, int aValue)
 {
-    int ret=0;
+    int ret = 0;
     int portval;
 
-    portval = (aValue != 0)?1:0;
+    portval = (aValue != 0) ? 1 : 0;
     ret = ioctl(aDev->fpin, GPIOWRDATA, &portval);
     if (ret < 0) {
         ERROR("Can't write gpio data\n");
@@ -169,7 +163,7 @@ int32_t as_gpio_set_pin_value(struct as_gpio_device *aDev, int aValue)
 
 int32_t as_gpio_get_pin_value(struct as_gpio_device *aDev)
 {
-    int ret=0;
+    int ret = 0;
     int portval;
     
     ret = ioctl(aDev->fpin, GPIORDDATA, &portval);
@@ -193,14 +187,11 @@ int32_t as_gpio_blocking_get_pin_value(struct as_gpio_device *aDev,
 {
     int ret;
     char value;
-
     fd_set rfds;
     struct timeval tv;
     int retval;
 
-
-    if (as_gpio_get_irq_mode(aDev) == GPIO_IRQ_MODE_NOINT)
-    {
+    if (as_gpio_get_irq_mode(aDev) == GPIO_IRQ_MODE_NOINT) {
         ERROR("irq must be configured before\n");
         return -1;
     }
@@ -213,11 +204,9 @@ int32_t as_gpio_blocking_get_pin_value(struct as_gpio_device *aDev,
 
     /* flush the file */
     retval = select(aDev->fpin+1, &rfds, NULL, NULL, &tv);
-    if (retval > 0)
-    {
+    if (retval > 0) {
         ret = read(aDev->fpin, &value, 1);
-        if (ret < 0)
-        {
+        if (ret < 0) {
             ERROR("Can't read pin value\n");
             return -1;
         }
@@ -235,7 +224,7 @@ int32_t as_gpio_blocking_get_pin_value(struct as_gpio_device *aDev,
 
 int32_t as_gpio_get_pullup_value(struct as_gpio_device *aDev)
 {
-    int ret=0;
+    int ret = 0;
     int portval;
 
     ret = ioctl(aDev->fpin, GPIORDPULLUP, &portval);
@@ -249,14 +238,13 @@ int32_t as_gpio_get_pullup_value(struct as_gpio_device *aDev)
     } else {
         return 0;
     }
-
 }
 
 /*------------------------------------------------------------------------------*/
 
 int32_t as_gpio_set_pullup_value(struct as_gpio_device *aDev, int aValue)
 {
-    int ret=0;
+    int ret = 0;
     int portval;
 
     portval = (aValue != 0)?1:0;
@@ -274,7 +262,7 @@ int32_t as_gpio_set_pullup_value(struct as_gpio_device *aDev, int aValue)
 
 int32_t as_gpio_get_irq_mode(struct as_gpio_device *aDev)
 {
-    int ret=0;
+    int ret = 0;
     int portval;
 
     ret = ioctl(aDev->fpin, GPIORDIRQMODE, &portval);
@@ -290,10 +278,9 @@ int32_t as_gpio_get_irq_mode(struct as_gpio_device *aDev)
 
 int32_t as_gpio_set_irq_mode(struct as_gpio_device *aDev, int aMode)
 {
-    int ret=0;
+    int ret = 0;
     int portval;
     char buffer[BUFF_SIZE];
-
     fd_set rfds;
     struct timeval tv;
     int retval;
@@ -314,8 +301,7 @@ int32_t as_gpio_set_irq_mode(struct as_gpio_device *aDev, int aMode)
 
     /* flush the file */
     retval = select(aDev->fpin, &rfds, NULL, NULL, &tv);
-    if (retval > 0)
-    {
+    if (retval > 0) {
         read(aDev->fpin, buffer, BUFF_SIZE);
     }
     return 0;
@@ -324,12 +310,16 @@ int32_t as_gpio_set_irq_mode(struct as_gpio_device *aDev, int aMode)
 /*------------------------------------------------------------------------------*/
 
 int32_t as_gpio_get_pin_num(struct as_gpio_device *aDev)
-{ return aDev->pin_num;}
+{
+    return aDev->pin_num;
+}
 
 /*------------------------------------------------------------------------------*/
 
 int32_t as_gpio_get_port_letter(struct as_gpio_device *aDev)
-{ return aDev->port_letter;}
+{
+    return aDev->port_letter;
+}
 
 /*------------------------------------------------------------------------------*/
 
@@ -337,6 +327,7 @@ int32_t as_gpio_close(struct as_gpio_device *aDev)
 {
     close(aDev->fpin);
     free(aDev);
+
     return 0;
 }
 
diff --git a/target/packages/as_devices/c/as_gpio.h b/target/packages/as_devices/c/as_gpio.h
index 1a077ce..38b2dac 100644
--- a/target/packages/as_devices/c/as_gpio.h
+++ b/target/packages/as_devices/c/as_gpio.h
@@ -26,7 +26,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif // __cplusplus
+#endif /* __cplusplus */
 
 #define GPIO_IRQ_MODE_NOINT    (0)
 #define GPIO_IRQ_MODE_RISING   (1)
@@ -159,12 +159,12 @@ int32_t as_gpio_get_port_letter(struct as_gpio_device *aDev);
  *
  * @param aDev as_gpio_device pointer structure
  *
- * @return pin value if positive or null, error if negative
+ * @return error if negative
  */
 int32_t as_gpio_close(struct as_gpio_device *aDev);
 
 #ifdef __cplusplus
 }
-#endif // __cplusplus
+#endif /* __cplusplus */
 
-#endif // __ASGPIO_H__
+#endif /* __ASGPIO_H__ */
diff --git a/target/packages/as_devices/c/as_i2c.c b/target/packages/as_devices/c/as_i2c.c
index 0cb30eb..970bc89 100644
--- a/target/packages/as_devices/c/as_i2c.c
+++ b/target/packages/as_devices/c/as_i2c.c
@@ -30,7 +30,7 @@
 #include "as_i2c.h"
 
 
-/// Format of path to I2C devices
+/* Format of path to I2C devices */
 #define AS_I2C_DEV_PATH_FMT "/dev/i2c-%u"
 #define _STR(x) #x
 #define AS_I2C_DEV_PATH_SIZE (sizeof(AS_I2C_DEV_PATH_FMT)-2+sizeof(_STR(AS_I2C_DEV_COUNT))-1)
@@ -38,82 +38,93 @@
 
 int as_i2c_open(unsigned int i2c_id)
 {
-  char buf[AS_I2C_DEV_PATH_SIZE];
-  snprintf(buf, sizeof(buf), AS_I2C_DEV_PATH_FMT, i2c_id);
+    char buf[AS_I2C_DEV_PATH_SIZE];
 
-  return open(buf, O_RDWR);
+    snprintf(buf, sizeof(buf), AS_I2C_DEV_PATH_FMT, i2c_id);
+
+    return open(buf, O_RDWR);
 }
 
 int as_i2c_close(int fd)
 {
-  return close(fd);
+    return close(fd);
 }
 
 int as_i2c_set_slave(int fd, uint8_t addr)
 {
-  if( ioctl(fd, I2C_SLAVE_FORCE, addr) < 0 )
-    return -1;
-  return 0;
+    if (ioctl(fd, I2C_SLAVE_FORCE, addr) < 0)
+        return -1;
+
+    return 0;
 }
 
 
 int as_i2c_read(int fd, uint8_t addr, uint8_t *data, size_t n)
 {
-  struct i2c_msg msg = { addr, I2C_M_RD, n, data };
-  struct i2c_rdwr_ioctl_data rdwr = { &msg, 1 };
-  if( ioctl(fd, I2C_RDWR, &rdwr) < 0 )
-    return -1;
-  return 0;
+    struct i2c_msg msg = { addr, I2C_M_RD, n, data };
+    struct i2c_rdwr_ioctl_data rdwr = { &msg, 1 };
+
+    if (ioctl(fd, I2C_RDWR, &rdwr) < 0)
+        return -1;
+
+    return 0;
 }
 
 int as_i2c_write(int fd, uint8_t addr, const uint8_t *data, size_t n)
 {
-  struct i2c_msg msg = { addr, 0, n, (uint8_t *)data };
-  struct i2c_rdwr_ioctl_data rdwr = { &msg, 1 };
-  if( ioctl(fd, I2C_RDWR, &rdwr) < 0 )
-    return -1;
-  return 0;
+    struct i2c_msg msg = { addr, 0, n, (uint8_t *)data };
+    struct i2c_rdwr_ioctl_data rdwr = { &msg, 1 };
+
+    if (ioctl(fd, I2C_RDWR, &rdwr) < 0)
+        return -1;
+
+    return 0;
 }
 
 
 int as_i2c_read_reg(int fd, uint8_t addr, uint8_t reg, uint8_t *data, size_t n)
 {
-  // write reg
-  struct i2c_msg msg = { addr, 0, 1, &reg };
-  struct i2c_rdwr_ioctl_data rdwr = { &msg, 1 };
-  if( ioctl(fd, I2C_RDWR, &rdwr) < 0 )
-    return -1;
-  // read data
-  msg.flags = I2C_M_RD;
-  msg.len = n;
-  msg.buf = data;
-  if( ioctl(fd, I2C_RDWR, &rdwr) < 0 )
-    return -2;
-  return 0;
+    /* write reg */
+    struct i2c_msg msg = { addr, 0, 1, &reg };
+    struct i2c_rdwr_ioctl_data rdwr = { &msg, 1 };
+
+    if (ioctl(fd, I2C_RDWR, &rdwr) < 0)
+        return -1;
+    /* read data */
+    msg.flags = I2C_M_RD;
+    msg.len = n;
+    msg.buf = data;
+    if (ioctl(fd, I2C_RDWR, &rdwr) < 0)
+        return -2;
+
+    return 0;
 }
 
 int as_i2c_write_reg(int fd, uint8_t addr, uint8_t reg, const uint8_t *data, size_t n)
 {
-  uint8_t buf[n+1];
-  buf[0] = reg;
-  memcpy(buf+1, data, n);
-  return as_i2c_write(fd, addr, buf, sizeof(buf));
+    uint8_t buf[n+1];
+
+    buf[0] = reg;
+    memcpy(buf+1, data, n);
+
+    return as_i2c_write(fd, addr, buf, sizeof(buf));
 }
 
 
 int as_i2c_read_reg_byte(int fd, uint8_t addr, uint8_t reg)
 {
-  uint8_t val;
-  int ret = as_i2c_read_reg(fd, addr, reg, &val, 1);
-  if( ret < 0 )
-    return ret;
-  return val;
+    uint8_t val;
+    int ret = as_i2c_read_reg(fd, addr, reg, &val, 1);
+
+    if (ret < 0)
+        return ret;
+
+    return val;
 }
 
 int as_i2c_write_reg_byte(int fd, uint8_t addr, uint8_t reg, uint8_t val)
 {
-  uint8_t buf[2] = { reg, val };
-  return as_i2c_write(fd, addr, buf, 2);
-}
-
+    uint8_t buf[2] = { reg, val };
 
+    return as_i2c_write(fd, addr, buf, 2);
+}
diff --git a/target/packages/as_devices/c/as_i2c.h b/target/packages/as_devices/c/as_i2c.h
index 8f967b4..2865631 100644
--- a/target/packages/as_devices/c/as_i2c.h
+++ b/target/packages/as_devices/c/as_i2c.h
@@ -61,44 +61,54 @@ int as_i2c_open(unsigned int i2c_id);
  */
 int as_i2c_close(int fd);
 
-/** @brief Set I2C slave address to be used.
+/** @brief Set chip's I2C slave address (to be used with read() & write() method)
  *
  * @return 0 on success, -1 on error.
  */
 int as_i2c_set_slave(int fd, uint8_t addr);
 
-/** @brief Read several bytes.
+/** @brief Read several bytes (ioctl() method) from given chip.
+ *
+ * @param addr I2C address of chip to access
  *
  * @return 0 on success, -1 on error.
  */
 int as_i2c_read(int fd, uint8_t addr, uint8_t *data, size_t n);
 
-/** @brief Write several bytes.
+/** @brief Write several bytes (ioctl() method) to given chip.
+ *
+ * @param addr I2C address of chip to access
  *
  * @return 0 on success, -1 on error.
  */
 int as_i2c_write(int fd, uint8_t addr, const uint8_t *data, size_t n);
 
-/** @brief Read at a given register address.
+/** @brief Read from given chip at a given register address (ioctl() method).
  *
  * Send the \e reg byte, then read bytes.
  *
+ * @param addr I2C address of chip to access
+ *
  * @return 0 on success, -1 on write error (\e reg byte), -2 on read error.
  */
 int as_i2c_read_reg(int fd, uint8_t addr, uint8_t reg, uint8_t *data, size_t n);
 
-/** @brief Write at a given register address.
+/** @brief Write to given chip at a given register address (ioctl() method).
  *
  * Send the \e reg byte followed by data.
  *
+ * @param addr I2C address of chip to access
+ *
  * @return 0 on success, -1 on error.
  */
 int as_i2c_write_reg(int fd, uint8_t addr, uint8_t reg, const uint8_t *data, size_t n);
 
-/** @brief Read a given register byte.
+/** @brief Read a byte from the given register.
  *
  * Send the \e reg byte, then read and return a single byte.
  *
+ * @param addr I2C address of chip to access
+ *
  * @return the read byte, -1 on write error (\e reg byte), -2 on read error.
  *
  * @note Equivalent to \e as_i2c_read_reg() with a 1-byte buffer, but return
@@ -106,19 +116,21 @@ int as_i2c_write_reg(int fd, uint8_t addr, uint8_t reg, const uint8_t *data, siz
  */
 int as_i2c_read_reg_byte(int fd, uint8_t addr, uint8_t reg);
 
-/** @brief Write a given register byte.
+/** @brief Write a byte to the given register.
  *
  * Send the \e reg byte followed by the \e val byte.
  *
+ * @param addr I2C address of chip to access
+ *
  * @return 0 on success, -1 on error.
  *
- * @note Equivalent to \e as_i2c_write() with a 2-byte buffer.
+ * @note Equivalent to \e as_i2c_write() with a 2-byte buffer (reg + data).
  */
 int as_i2c_write_reg_byte(int fd, uint8_t addr, uint8_t reg, uint8_t val);
 
 #ifdef __cplusplus
 }
-#endif // __cplusplus
+#endif /* __cplusplus */
 
-#endif // AS_I2C_H_
+#endif /* AS_I2C_H_ */
 
diff --git a/target/packages/as_devices/c/as_pwm.c b/target/packages/as_devices/c/as_pwm.c
index 56ac4c5..d0bbaa8 100644
--- a/target/packages/as_devices/c/as_pwm.c
+++ b/target/packages/as_devices/c/as_pwm.c
@@ -1,5 +1,5 @@
 /*
-**    THE ARMadeus Systems
+** AsDevices - PWM access functions
 **
 **    Copyright (C) 2009-2010  The armadeus systems team
 **    Fabien Marteau <fab...@ar...>
@@ -18,20 +18,17 @@
 ** License along with this library; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>  /* for open()   */
 #include <unistd.h> /* for write()  */
 
+/* #define DEBUG */
+#include "helpers.h"
 #include "as_pwm.h"
 
-//#define DEBUG
-#ifdef DEBUG
-#   define ERROR(fmt, ...) printf(fmt, ##__VA_ARGS__)
-#else
-#   define ERROR(fmt, ...) /*fmt, ##__VA_ARGS__*/
-#endif
 
 #define PWM_SYS_PATH   "/sys/class/pwm/pwm"
 #define FREQUENCY_PATH "frequency"
@@ -41,59 +38,6 @@
 
 #define SIZE_OF_BUFF 50
 
-/*------------------------------------------------------------------------------*/
-
-/** @brief Write a string value in file
- *
- * @param aFile_handler: file handler
- * @param aValueWrite: string value
- *
- * @return number char wrote, negative value on error
- */
-int writeBuffer(int aFile_handler, char *aValueWrite)
-{
-    int ret;
-    ret = write(aFile_handler, aValueWrite, strlen(aValueWrite));
-    if (ret < 0)
-    {
-        ERROR("Can't write file ");
-        return ret;
-    }
-    ret = lseek(aFile_handler,0,SEEK_SET);
-    if (ret < 0)
-    {
-        ERROR("lseek error ");
-        return ret;
-    }
-    return ret;
-}
-
-/*------------------------------------------------------------------------------*/
-
-/** @brief read a string value in file
- *
- * @param aFile_handler: file handler
- * @param aValueRead[SIZE_OF_BUFF]: char pointer to read buffer
- *
- * @return number char read, negative value on error
- */
-int readBuffer(int aFile_handler, char *aValueRead)
-{
-    int ret;
-    ret = read(aFile_handler, aValueRead, SIZE_OF_BUFF);
-    if (ret < 0)
-    {
-        ERROR("Can't read file ");
-        return ret;
-    }
-    ret = lseek(aFile_handler,0,SEEK_SET);
-    if (ret < 0)
-    {
-        ERROR("lseek error ");
-        return ret;
-    }
-    return ret;
-}
 
 /*------------------------------------------------------------------------------*/
 
@@ -103,34 +47,29 @@ struct as_pwm_device *as_pwm_open(int aPwmNumber)
     struct as_pwm_device *dev;
 
     dev = (struct as_pwm_device *)malloc(sizeof(struct as_pwm_device));
-    if (dev == NULL)
-    {
+    if (dev == NULL) {
         ERROR("Can't allocate memory for pwm device structure\n");
         return NULL;
     }
 
-    /* open pwm files management */
-    snprintf(buffer,SIZE_OF_BUFF,"%s%d/%s",PWM_SYS_PATH,aPwmNumber,FREQUENCY_PATH);
-    if ((dev->fileFrequency = open(buffer,O_RDWR)) < 0)
-    {
+    /* open pwm management files */
+    snprintf(buffer, SIZE_OF_BUFF, "%s%d/%s", PWM_SYS_PATH, aPwmNumber, FREQUENCY_PATH);
+    if ((dev->fileFrequency = open(buffer, O_RDWR)) < 0) {
         ERROR("Can't open frequency files");
         return NULL;
     }
-    snprintf(buffer,SIZE_OF_BUFF,"%s%d/%s",PWM_SYS_PATH,aPwmNumber,PERIOD_PATH);
-    if ((dev->filePeriod = open(buffer,O_RDWR)) < 0)
-    {
+    snprintf(buffer, SIZE_OF_BUFF, "%s%d/%s", PWM_SYS_PATH, aPwmNumber, PERIOD_PATH);
+    if ((dev->filePeriod = open(buffer, O_RDWR)) < 0) {
         ERROR("Can't open period files");
         return NULL;
     }
-    snprintf(buffer,SIZE_OF_BUFF,"%s%d/%s",PWM_SYS_PATH,aPwmNumber,DUTY_PATH);
-    if((dev->fileDuty = open(buffer,O_RDWR)) < 0)
-    {
+    snprintf(buffer, SIZE_OF_BUFF, "%s%d/%s", PWM_SYS_PATH, aPwmNumber, DUTY_PATH);
+    if((dev->fileDuty = open(buffer, O_RDWR)) < 0) {
         ERROR("Can't open duty files");
         return NULL;
     }
-    snprintf(buffer,SIZE_OF_BUFF,"%s%d/%s",PWM_SYS_PATH,aPwmNumber,ACTIVE_PATH);
-    if((dev->fileActive = open(buffer,O_RDWR)) < 0)
-    {
+    snprintf(buffer, SIZE_OF_BUFF, "%s%d/%s", PWM_SYS_PATH, aPwmNumber, ACTIVE_PATH);
+    if((dev->fileActive = open(buffer, O_RDWR)) < 0) {
         ERROR("Can't open active files");
         return NULL;
     }
@@ -140,24 +79,20 @@ struct as_pwm_device *as_pwm_open(int aPwmNumber)
 
 /*------------------------------------------------------------------------------*/
 
-int32_t as_pwm_set_frequency(struct as_pwm_device *aDev, int aFrequency)
+int32_t as_pwm_set_frequency(struct as_pwm_device *dev, int freq)
 {
-    char buffer[SIZE_OF_BUFF];
-
-    snprintf(buffer,SIZE_OF_BUFF,"%d",aFrequency);
-    return writeBuffer(aDev->fileFrequency,buffer);
+    return as_write_buffer(dev->fileFrequency, freq);
 }
 
 /*------------------------------------------------------------------------------*/
 
-int32_t as_pwm_get_frequency(struct as_pwm_device *aDev)
+int32_t as_pwm_get_frequency(struct as_pwm_device *dev)
 {
     char buffer[SIZE_OF_BUFF];
     int ret;
 
-    ret = readBuffer(aDev->fileFrequency,  buffer);
-    if (ret < 0)
-    {
+    ret = as_read_buffer(dev->fileFrequency, buffer);
+    if (ret < 0) {
         ERROR("Can't read frequency\n");
         return ret;
     }
@@ -167,24 +102,20 @@ int32_t as_pwm_get_frequency(struct as_pwm_device *aDev)
 
 /*------------------------------------------------------------------------------*/
 
-int32_t as_pwm_set_period(struct as_pwm_device *aDev, int aPeriod)
+int32_t as_pwm_set_period(struct as_pwm_device *dev, int period)
 {
-    char buffer[SIZE_OF_BUFF];
-
-    snprintf(buffer,SIZE_OF_BUFF,"%d",aPeriod);
-    return writeBuffer(aDev->filePeriod, buffer);
+    return as_write_buffer(dev->filePeriod, period);
 }
 
 /*------------------------------------------------------------------------------*/
 
-int32_t as_pwm_get_period(struct as_pwm_device *aDev)
+int32_t as_pwm_get_period(struct as_pwm_device *dev)
 {
     char buffer[SIZE_OF_BUFF];
     int ret;
 
-    ret = readBuffer(aDev->filePeriod,  buffer);
-    if (ret < 0)
-    {
+    ret = as_read_buffer(dev->filePeriod, buffer);
+    if (ret < 0) {
         ERROR("Can't read period\n");
         return ret;
     }
@@ -194,24 +125,20 @@ int32_t as_pwm_get_period(struct as_pwm_device *aDev)
 
 /*------------------------------------------------------------------------------*/
 
-int32_t as_pwm_set_duty(struct as_pwm_device *aDev, int aDuty)
+int32_t as_pwm_set_duty(struct as_pwm_device *dev, int duty)
 {
-    char buffer[SIZE_OF_BUFF];
-
-    snprintf(buffer, SIZE_OF_BUFF, "%d", aDuty);
-    return writeBuffer( aDev->fileDuty, buffer);
+    return as_write_buffer(dev->fileDuty, duty);
 }
 
 /*------------------------------------------------------------------------------*/
 
-int32_t  as_pwm_get_duty(struct as_pwm_device *aDev)
+int32_t as_pwm_get_duty(struct as_pwm_device *dev)
 {
     char buffer[SIZE_OF_BUFF];
     int ret;
 
-    ret = readBuffer(aDev->fileDuty,  buffer);
-    if (ret < 0)
-    {
+    ret = as_read_buffer(dev->fileDuty, buffer);
+    if (ret < 0) {
         ERROR("Can't read duty\n");
         return ret;
     }
@@ -221,36 +148,31 @@ int32_t  as_pwm_get_duty(struct as_pwm_device *aDev)
 
 /*------------------------------------------------------------------------------*/
 
-int32_t as_pwm_set_state(struct as_pwm_device *aDev, int aEnable)
+int32_t as_pwm_set_state(struct as_pwm_device *pwm_dev, int enable)
 {
-    char one[] = "1";
-    char zero[] = "0";
-    int ret=0;
-
-    if(aEnable)
-    {
-        ret = writeBuffer(aDev->fileActive,one);
-    }else{
-        ret = writeBuffer(aDev->fileActive,zero);
+    int ret = 0;
+
+    if (enable) {
+        ret = as_write_buffer(pwm_dev->fileActive, 1);
+    } else {
+        ret = as_write_buffer(pwm_dev->fileActive, 0);
     }
-    if (ret < 0)
-    {
-        ERROR("Can't write file Active\n");
-        return ret;
+    if (ret < 0) {
+        ERROR("Can't write to pwmX/active\n");
     }
+
     return ret;
 }
 
 /*------------------------------------------------------------------------------*/
 
-int32_t as_pwm_get_state(struct as_pwm_device *aDev)
+int32_t as_pwm_get_state(struct as_pwm_device *dev)
 {
     char buffer[SIZE_OF_BUFF];
     int ret;
 
-    ret = readBuffer(aDev->fileActive,  buffer);
-    if (ret < 0)
-    {
+    ret = as_read_buffer(dev->fileActive, buffer);
+    if (ret < 0) {
         ERROR("Can't read state\n");
         return ret;
     }
@@ -260,36 +182,32 @@ int32_t as_pwm_get_state(struct as_pwm_device *aDev)
 
 /*------------------------------------------------------------------------------*/
 
-int32_t as_pwm_close(struct as_pwm_device *aDev)
+int32_t as_pwm_close(struct as_pwm_device *dev)
 {
     int ret = 0;
 
-    /* open pwm files management */
-    ret = close(aDev->fileFrequency);
-    if(ret < 0)
-    {
-        ERROR("Can't close frequency files");
+    /* Close pwm management files */
+    ret = close(dev->fileFrequency);
+    if (ret < 0) {
+        ERROR("Can't close /frequency");
         return ret;
     }
-    ret = close(aDev->filePeriod);
-    if(ret < 0)
-    {
-        ERROR("Can't close period files");
+    ret = close(dev->filePeriod);
+    if (ret < 0) {
+        ERROR("Can't close /period");
         return ret;
     }
-    ret = close(aDev->fileDuty);
-    if(ret < 0)
-    {
-        ERROR("Can't close duty files");
+    ret = close(dev->fileDuty);
+    if (ret < 0) {
+        ERROR("Can't close /duty");
         return ret;
     }
-    ret = close(aDev->fileActive);
-    if(ret < 0)
-    {
-        ERROR("Can't close active files");
+    ret = close(dev->fileActive);
+    if (ret < 0) {
+        ERROR("Can't close /active");
         return ret;
     }
 
     return ret;
-
 }
+
diff --git a/target/packages/as_devices/c/helpers.c b/target/packages/as_devices/c/helpers.c
new file mode 100644
index 0000000..57d63f6
--- /dev/null
+++ b/target/packages/as_devices/c/helpers.c
@@ -0,0 +1,76 @@
+/*
+** AsDevices - Helpers functions for other modules
+**
+**    Copyright (C) 2009-2010  The armadeus systems team
+**    Fabien Marteau <fab...@ar...>
+**
+** This library is free software; you can redistribute it and/or
+** modify 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
+*/
+
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <fcntl.h>  /* for open()   */
+#include <unistd.h> /* for write()  */
+
+/* #define DEBUG */
+#include "helpers.h"
+
+#define SIZE_OF_BUFF 50
+
+
+int as_write_buffer(int fd, int value)
+{
+    int ret;
+    char buffer[16];
+    int buffer_len;
+
+    ret = snprintf(buffer, 16, "%d", value);
+    if (ret < 0)
+        return ret;
+
+    buffer_len = strlen(buffer);
+    ret = write(fd, buffer, buffer_len);
+    if (ret < 0) {
+        ERROR("Can't write file ");
+        return ret;
+    }
+    ret = lseek(fd, 0, SEEK_SET);
+    if (ret < 0) {
+        ERROR("lseek error ");
+        return ret;
+    }
+
+    return buffer_len;
+}
+
+int readBuffer(int fd, char *buf)
+{
+    int ret;
+
+    ret = read(fd, buf, SIZE_OF_BUFF);
+    if (ret < 0) {
+        ERROR("Can't read file ");
+        return ret;
+    }
+    ret = lseek(fd, 0, SEEK_SET);
+    if (ret < 0) {
+        ERROR("lseek error ");
+        return ret;
+    }
+
+    return ret;
+}
+
diff --git a/target/packages/as_devices/cpp/as_apf27_pwm.hpp b/target/packages/as_devices/c/helpers.h
similarity index 51%
copy from target/packages/as_devices/cpp/as_apf27_pwm.hpp
copy to target/packages/as_devices/c/helpers.h
index 28d9a6b..2c027ae 100644
--- a/target/packages/as_devices/cpp/as_apf27_pwm.hpp
+++ b/target/packages/as_devices/c/helpers.h
@@ -1,66 +1,51 @@
 /*
-**    THE ARMadeus Systems
-** 
-**    Copyright (C) 2009  The armadeus systems team 
+** AsDevices - Helpers functions for other modules
+**
+**    Copyright (C) 2009-2010  The armadeus systems team
 **    Fabien Marteau <fab...@ar...>
-** 
+**
 ** This library is free software; you can redistribute it and/or
 ** modify 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
 */
 
-#ifndef __ASAPF27PWM_HPP__
-#define __ASAPF27PWM_HPP__
-
-#include "as_apf27_pwm.h"
+#include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+//#include <fcntl.h>  /* for open()   */
+#include <unistd.h> /* for write()  */
 
-#define PWM_NUMBER NUMBER_OF_PWM
-#define DYNAMIC_TABLE_SIZE PWM_NUMBER
-
-#include "as_dynamic_table.hpp"
+#ifdef DEBUG
+#   define ERROR(fmt, ...) printf(fmt, ##__VA_ARGS__)
+#else
+#   define ERROR(fmt, ...) /*fmt, ##__VA_ARGS__*/
+#endif
 
-/** AsApf27Pwm description
+/** @brief Write an int value as string in a /sys/ or /proc interface
  *
+ * @param fd: file handler
+ * @param value: int value to write
+ *
+ * @return number of chars written, negative value on error
  */
-class AsApf27Pwm {
-public:
-    static AsApf27Pwm * getInstance(int aPwmNumber);
-
-    void setFrequency(int aFrequency);
-    int  getFrequency(void);
-
-    void setPeriod(int aPeriod);
-    int  getPeriod(void);
-
-    void setDuty(int aDuty);
-    int  getDuty(void);
-
-    bool activate(bool aEnable);
-    bool getState(void);
-
-    virtual ~AsApf27Pwm();
-
-protected:
-
-    static AsDynamicTable * mInstances;
-
-    AsApf27Pwm(int aPwmNumber);
-    int mPwmNumber;
-
-};
-
-#endif /* __ASAPF27PWM_HPP__ */
+int as_write_buffer(int fd, int value);
 
+/** @brief read a string value in file
+ *
+ * @param fd: file handler
+ * @param buf: char pointer to read buffer
+ *
+ * @return number of chars read, negative value on error
+ */
+int as_read_buffer(int fd, char *buf);
 


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-27-g9c74dab

From: Julien B a. A. <ar...@us...> - 2010-09-17 11:39:56

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  9c74dab187adea3c7a806e868c3a99e79c6a9dfd (commit)
      from  ca0cf2917b2ac86eaaea484fa25ab9d94bc5065a (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 9c74dab187adea3c7a806e868c3a99e79c6a9dfd
Author: Julien Boibessot <jul...@ar...>
Date:   Fri Sep 17 13:39:27 2010 +0200

    [U-BOOT] Cleanup apf27.h

-----------------------------------------------------------------------

Summary of changes:
 buildroot/target/device/armadeus/apf27/apf27.h |   27 +-----------------------
 1 files changed, 1 insertions(+), 26 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27.h b/buildroot/target/device/armadeus/apf27/apf27.h
index f5e0391..816d3e1 100644
--- a/buildroot/target/device/armadeus/apf27/apf27.h
+++ b/buildroot/target/device/armadeus/apf27/apf27.h
@@ -206,7 +206,7 @@
 		" ${serverpath}${board_name}-rootfs.arm.ubifs\0"	\
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
-	"update_rootfs=run download_rootfs flash_rootfs\0"              \
+	"update_rootfs=run download_rootfs flash_rootfs\0"		\
 	"update_all=run download_kernel flash_kernel download_rootfs "	\
 		"flash_rootfs download_uboot flash_uboot\0"		\
 	"unlock_regs=mw 10000008 0; mw 10020008 0\0"			\
@@ -913,28 +913,3 @@
 
 #endif /* __CONFIG_H */
 
-/* Add a wrapper around the values Buildroot sets. */
-#ifndef __BR2_ADDED_CONFIG_H
-#define __BR2_ADDED_CONFIG_H
-#ifdef CONFIG_HOSTNAME
-#undef CONFIG_HOSTNAME
-#endif
-#define CONFIG_HOSTNAME  "apf27"
-#ifdef CONFIG_BOARD_NAME
-#undef CONFIG_BOARD_NAME
-#endif
-#define CONFIG_BOARD_NAME  apf27
-#endif /* __BR2_ADDED_CONFIG_H */
-
-/* Add a wrapper around the values Buildroot sets. */
-#ifndef __BR2_ADDED_CONFIG_H
-#define __BR2_ADDED_CONFIG_H
-#ifdef CONFIG_HOSTNAME
-#undef CONFIG_HOSTNAME
-#endif
-#define CONFIG_HOSTNAME  "apf27"
-#ifdef CONFIG_BOARD_NAME
-#undef CONFIG_BOARD_NAME
-#endif
-#define CONFIG_BOARD_NAME  apf27
-#endif /* __BR2_ADDED_CONFIG_H */


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-26-gca0cf29

From: Nicolas <th...@us...> - 2010-09-09 15:08: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  ca0cf2917b2ac86eaaea484fa25ab9d94bc5065a (commit)
      from  88b5a8a3cd95d3df130aad090ec72edcc8dec88d (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 ca0cf2917b2ac86eaaea484fa25ab9d94bc5065a
Author: Nicolas Colombain <nic...@ar...>
Date:   Thu Sep 9 17:07:53 2010 +0200

    [BUILDROOT] change linux and buildroot config to UBIFS

-----------------------------------------------------------------------

Summary of changes:
 .../armadeus/apf27/apf27-linux-2.6.29.config       |   22 ++-----------------
 .../target/device/armadeus/apf27/apf27_defconfig   |   19 +++++++++++++++-
 2 files changed, 20 insertions(+), 21 deletions(-)

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 44fe0bb..13f114c 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 Aug 19 11:51:32 2010
+# Thu Sep  9 16:05:02 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -560,21 +560,7 @@ CONFIG_MTD_UBI_BEB_RESERVE=1
 #
 # UBI debugging options
 #
-CONFIG_MTD_UBI_DEBUG=y
-CONFIG_MTD_UBI_DEBUG_MSG=y
-CONFIG_MTD_UBI_DEBUG_PARANOID=y
-# CONFIG_MTD_UBI_DEBUG_DISABLE_BGT is not set
-# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set
-# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set
-# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set
-
-#
-# Additional UBI debugging messages
-#
-CONFIG_MTD_UBI_DEBUG_MSG_BLD=y
-# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set
-# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set
-# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set
+# CONFIG_MTD_UBI_DEBUG is not set
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_COW_COMMON is not set
@@ -1672,9 +1658,7 @@ CONFIG_UBIFS_FS=y
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_DEBUG=y
-CONFIG_UBIFS_FS_DEBUG_MSG_LVL=3
-# CONFIG_UBIFS_FS_DEBUG_CHKS is not set
+# CONFIG_UBIFS_FS_DEBUG is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_SQUASHFS is not set
 # CONFIG_VXFS_FS is not set
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index 7f6cd0c..de1763b 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
-# Wed Jul  7 17:06:28 2010
+# Thu Sep  9 16:01:40 2010
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_VERSION="0.10.0-svn"
@@ -759,7 +759,22 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
 # 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_UBIFS=y
+BR2_TARGET_ROOTFS_UBIFS_PEBSIZE=0x20000
+BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f800
+BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x800
+BR2_TARGET_ROOTFS_UBIFS_SUBSIZE=512
+BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2047
+BR2_TARGET_ROOTFS_UBIFS_SQUASH=y
+BR2_TARGET_ROOTFS_UBIFS_OUTPUT="$(IMAGE).ubifs"
+# BR2_TARGET_ROOTFS_UBIFS_RT_NONE is not set
+# BR2_TARGET_ROOTFS_UBIFS_RT_ZLIB is not set
+BR2_TARGET_ROOTFS_UBIFS_RT_LZO=y
+BR2_TARGET_ROOTFS_UBIFS_NONE=y
+# BR2_TARGET_ROOTFS_UBIFS_GZIP is not set
+# BR2_TARGET_ROOTFS_UBIFS_BZIP2 is not set
+# BR2_TARGET_ROOTFS_UBIFS_LZMA is not set
+BR2_TARGET_ROOTFS_UBIFS_COPYTO=""
 # BR2_TARGET_ROOTFS_SQUASHFS is not set
 BR2_TARGET_ROOTFS_TAR=y
 BR2_TARGET_ROOTFS_TAR_NONE=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-25-g88b5a8a

From: Nicolas <th...@us...> - 2010-09-09 14:39: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  88b5a8a3cd95d3df130aad090ec72edcc8dec88d (commit)
      from  306d4143eb6709e72cbed335e594f7aaff02b022 (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 88b5a8a3cd95d3df130aad090ec72edcc8dec88d
Author: Nicolas Colombain <nic...@ar...>
Date:   Thu Sep 9 16:32:48 2010 +0200

    [U-BOOT] use UBIFS instead of JFFS2 for APF27

-----------------------------------------------------------------------

Summary of changes:
 buildroot/target/device/armadeus/apf27/apf27.h |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf27/apf27.h b/buildroot/target/device/armadeus/apf27/apf27.h
index 966f911..f5e0391 100644
--- a/buildroot/target/device/armadeus/apf27/apf27.h
+++ b/buildroot/target/device/armadeus/apf27/apf27.h
@@ -32,7 +32,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_ENV_VERSION 	"1.8"
+#define CONFIG_ENV_VERSION 	"1.9"
 #define CONFIG_IDENT_STRING	" apf27 patch 2.2"
 
 #define CONFIG_ARM926EJS	1	/* this is an ARM926EJS CPU */
@@ -203,7 +203,7 @@
 	"download_kernel=tftpboot ${loadaddr} "				\
 		" ${serverpath}${board_name}-linux.bin\0"		\
 	"download_rootfs=tftpboot ${loadaddr} "				\
-		" ${serverpath}${board_name}-rootfs.arm.jffs2\0"	\
+		" ${serverpath}${board_name}-rootfs.arm.ubifs\0"	\
 	"update_uboot=run download_uboot flash_uboot\0"			\
 	"update_kernel=run download_kernel flash_kernel\0"		\
 	"update_rootfs=run download_rootfs flash_rootfs\0"              \
@@ -211,7 +211,7 @@
 		"flash_rootfs download_uboot flash_uboot\0"		\
 	"unlock_regs=mw 10000008 0; mw 10020008 0\0"			\
 
-#define CONFIG_BOOTCOMMAND	"run jffsboot"
+#define CONFIG_BOOTCOMMAND	"run ubifsboot"
 #define CFG_AUTOLOAD		"no"
 #define CFG_DIRECT_FLASH_TFTP
 
@@ -925,3 +925,16 @@
 #endif
 #define CONFIG_BOARD_NAME  apf27
 #endif /* __BR2_ADDED_CONFIG_H */
+
+/* Add a wrapper around the values Buildroot sets. */
+#ifndef __BR2_ADDED_CONFIG_H
+#define __BR2_ADDED_CONFIG_H
+#ifdef CONFIG_HOSTNAME
+#undef CONFIG_HOSTNAME
+#endif
+#define CONFIG_HOSTNAME  "apf27"
+#ifdef CONFIG_BOARD_NAME
+#undef CONFIG_BOARD_NAME
+#endif
+#define CONFIG_BOARD_NAME  apf27
+#endif /* __BR2_ADDED_CONFIG_H */


hooks/post-receive
-- 
armadeus

Flat | Threaded

<< < 1 .. 101 102 103 104 105 .. 153 > >> (Page 103 of 153)