armadeus-commitlog Mailing List for armadeus (Page 105)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julien B a. A. <ar...@us...> - 2010-07-29 20:46:24
|
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 598b84aa1896f023f56737ac16356af31e1c84e7 (commit)
via aedc08f7e3d50842db153db20b498b0b0b74e0e9 (commit)
via c74a125c4c14f7a15d8e57893e488d37bcfed821 (commit)
via 5a9306725fd35e8c9f4db020a7922306869b6302 (commit)
from 94db1bf41a3f6ce69b66a988d56d5332c037c344 (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 598b84aa1896f023f56737ac16356af31e1c84e7
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 29 22:40:22 2010 +0200
Correct error from commit 75d48b481b760316c8f332e0b8296585a9540dcd
commit aedc08f7e3d50842db153db20b498b0b0b74e0e9
Merge: c74a125c4c14f7a15d8e57893e488d37bcfed821 94db1bf41a3f6ce69b66a988d56d5332c037c344
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 29 22:36:54 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit c74a125c4c14f7a15d8e57893e488d37bcfed821
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 29 17:18:58 2010 +0200
[TEST] Updates test scripts for 3.3 release
commit 5a9306725fd35e8c9f4db020a7922306869b6302
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 29 17:15:23 2010 +0200
[LINUX] pwm ressources were badly registered on APF9328
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/021-armadeus-apf9328.patch | 4 ++--
patches/buildroot/2010.05/cleanup_buildroot.sh | 1 -
patches/buildroot/cleanup_buildroot.sh | 1 +
target/test/mmc/media_perf.sh | 9 ++++++++-
target/test/packages/test_boa.sh | 2 +-
target/test/test_adc.sh | 2 +-
target/test/test_audio.sh | 2 +-
target/test/test_backlight.sh | 1 +
target/test/test_helpers.sh | 2 +-
target/test/test_pwm.sh | 4 ++--
target/test/test_release.sh | 9 +++++++--
target/test/test_rs232.sh | 1 +
target/test/test_usb_device.sh | 12 ++++++++----
target/test/test_usb_host.sh | 9 +++++----
14 files changed, 39 insertions(+), 20 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 5201554..fa9a6cc 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
@@ -114,8 +114,8 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
+#ifdef CONFIG_PWM
+static struct resource pwm_resources[] = {
+ [0] = {
-+ .start = (IMX_PWM_BASE),
-+ .end = (IMX_PWM_BASE + 0x0C),
++ .start = 0x00208000,
++ .end = 0x0020800c,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index 9065e2f..339312b 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -20,7 +20,6 @@ rm -rf buildroot/package/firmware/
rm -f buildroot/toolchain/gcc/4.2.1/999-4.2.1-armeabi-aapcs-linux.patch
rm -f buildroot/toolchain/gcc/4.2.4/999-4.2.4-armeabi-aapcs-linux.patch
rm -rf buildroot/package/games/wolf4sdl/
-rm -rf buildroot/package/qtopia4/
rm -rf buildroot/package/ussp-push/
rm -rf buildroot/package/openobex/
rm -rf buildroot/package/gpsd/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 99b69e3..556f19a 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -23,6 +23,7 @@ rm -f buildroot/package/strace/strace-arm-no-cachectl.patch
rm -f buildroot/toolchain/gcc/4.2.1/999-4.2.1-armeabi-aapcs-linux.patch
rm -f buildroot/toolchain/gcc/4.2.4/999-4.2.4-armeabi-aapcs-linux.patch
rm -rf buildroot/package/games/wolf4sdl/
+rm -rf buildroot/package/qtopia4/
rm -rf buildroot/package/ussp-push/
rm -rf buildroot/package/openobex/
rm -rf buildroot/package/gpsd/
diff --git a/target/test/mmc/media_perf.sh b/target/test/mmc/media_perf.sh
index 4d9abaf..bc80b65 100755
--- a/target/test/mmc/media_perf.sh
+++ b/target/test/mmc/media_perf.sh
@@ -23,7 +23,12 @@
source ./test_helpers.sh
# Script parameters
-TEMP_FILE_SIZE=16384 # kbytes (ex: 16384 24576)
+BOARD=`cat /etc/machine`
+if [ "$BOARD" == "APF9328" ]; then
+ TEMP_FILE_SIZE=4096
+else
+ TEMP_FILE_SIZE=16384 # kbytes (ex: 16384 24576)
+fi
NB_ITER=10
MMC_MOUNT_DIR="/media/mmc"
@@ -132,6 +137,8 @@ if [ "$2" != "" ]; then
MMC_DEVICE="$2"
fi
+show_test_banner "Storage medium performances"
+
if [ ! -b $MMC_DEVICE ] && [ ! -b $USB_DEVICE ]; then
echo -n "Please insert your storage device: MMC/SD/microSD or USB key"
it=0
diff --git a/target/test/packages/test_boa.sh b/target/test/packages/test_boa.sh
index 4f8cd80..6ef1e77 100755
--- a/target/test/packages/test_boa.sh
+++ b/target/test/packages/test_boa.sh
@@ -62,7 +62,7 @@ test_boa()
sleep 8
if [ "$?" == 0 ]; then
ask_user "Did you manage to show the web page ? (y/N)"
- if [ "$response" == "y" ]; then
+ if [ "$response" == "y" ] || [ "$response" == "yes" ]; then
echo_test_ok
test_cleanup
exit 0
diff --git a/target/test/test_adc.sh b/target/test/test_adc.sh
index c655652..b20de49 100755
--- a/target/test/test_adc.sh
+++ b/target/test/test_adc.sh
@@ -17,7 +17,7 @@ source ./test_env.sh
test_setup_apf9328()
{
- echo "I hope you didn't forget to wire EOC and CVNST !"
+ ask_user "Please connect EOC (ADC pin 11 & CSI pin 12) and CVNST (ADC pin 10 & CSI pin 9), then press ENTER"
ADC_SPI_SYS="/sys/bus/spi/devices/spi1.0"
}
diff --git a/target/test/test_audio.sh b/target/test/test_audio.sh
index 80eb2dd..e40b2ca 100755
--- a/target/test/test_audio.sh
+++ b/target/test/test_audio.sh
@@ -43,7 +43,7 @@ test_audio()
exit_failed
fi
- ask_user "Please connect an earphone to the Audio Out connector (top on APF27). Then press ENTER."
+ ask_user "Please connect an earphone to the Audio Out connector (top one on APF27). Then press ENTER."
aplay /usr/share/sounds/alsa/Side_Left.wav
if [ "$?" == 0 ]; then
ask_user "Did you hear something ? (y/N)"
diff --git a/target/test/test_backlight.sh b/target/test/test_backlight.sh
index 3699f32..6590b37 100755
--- a/target/test/test_backlight.sh
+++ b/target/test/test_backlight.sh
@@ -37,6 +37,7 @@ test_backlight()
ask_user "Backlight set to MAX, press ENTER"
echo 0 > $SYS_DIR/brightness
ask_user "Backlight set to MIN, press ENTER"
+ echo $current > $SYS_DIR/brightness
ask_user "I will now loop through brightness, press ENTER when ready"
for loop in `seq 1 2 150`; do
diff --git a/target/test/test_helpers.sh b/target/test/test_helpers.sh
index 281f7b0..4cce91a 100644
--- a/target/test/test_helpers.sh
+++ b/target/test/test_helpers.sh
@@ -55,7 +55,7 @@ ask_user()
AWAITEN="$2"
echo -e "\n >>>> $MESSAGE <<<<"
- read response
+ read -p "> " response
}
ask_user_banner()
diff --git a/target/test/test_pwm.sh b/target/test/test_pwm.sh
index 035e3e4..89ca840 100755
--- a/target/test/test_pwm.sh
+++ b/target/test/test_pwm.sh
@@ -28,12 +28,12 @@ SLEEP_TIME=4
prepare_test_for_apf9328()
{
- ask_user "Please connect your oscilloscope probe to pin 4 of X21 connector (press ENTER when ready)"
+ ask_user "Please connect your oscilloscope probe to pin 4 of X21/Timer connector (GND is on pin 8), then press ENTER when ready"
}
prepare_test_for_apf27()
{
- ask_user "Please connect your oscilloscope probe to pin 4 of J22 connector (press ENTER when ready)"
+ ask_user "Please connect your oscilloscope probe to pin 4 of J22 connector, then press ENTER when ready"
}
test_pwm()
diff --git a/target/test/test_release.sh b/target/test/test_release.sh
index 5a2d2b4..826a9a0 100755
--- a/target/test/test_release.sh
+++ b/target/test/test_release.sh
@@ -46,6 +46,9 @@ $THIS_DIR/test_rs232.sh
echo
$THIS_DIR/test_usb_device.sh
echo
+# FPGA test should be run before touch one on APF9328
+$THIS_DIR/test_fpga.sh
+echo
$THIS_DIR/test_backlight.sh
echo
$THIS_DIR/test_framebuffer.sh
@@ -58,13 +61,12 @@ $THIS_DIR/test_adc.sh
echo
$THIS_DIR/test_audio.sh
echo
-$THIS_DIR/test_fpga.sh
-echo
$THIS_DIR/test_gpio.sh
echo
$THIS_DIR/test_pwm.sh
echo
$THIS_DIR/media_perf.sh speed
+rm /tmp/data.bin
# Following tests needs Internet access:
ask_user "I will now try to configure Internet access. Press ENTER when ready"
$THIS_DIR/dhcp.sh
@@ -79,5 +81,8 @@ for package_test in $PACKAGES_TESTS; do
fi
done
+echo
+echo "--- END OF RELEASE TESTS ! ---"
+
exit 0
diff --git a/target/test/test_rs232.sh b/target/test/test_rs232.sh
index 84e887b..016061a 100755
--- a/target/test/test_rs232.sh
+++ b/target/test/test_rs232.sh
@@ -71,6 +71,7 @@ echo_apf27_ports()
echo " Available one: [ 2 ]"
}
+show_test_banner "Serial ports"
PORT="$1"
if [ "$1" == "" ]; then
echo "Please give the port number to test !"
diff --git a/target/test/test_usb_device.sh b/target/test/test_usb_device.sh
index a16c762..69267d5 100755
--- a/target/test/test_usb_device.sh
+++ b/target/test/test_usb_device.sh
@@ -22,15 +22,19 @@ test_usb_gadget()
if [ "$?" == 0 ]; then
udhcpc -i eth0
echo "Downloading test file from Internet"
- wget http://dl.free.fr/q9IKqqweK -O /tmp/backing_file.gz
+ wget http://dl.free.fr/q9IKqqweK -O $BACKING_FILE
if [ "$?" != 0 ]; then
exit_failed
fi
- gunzip /tmp/backing_file.gz
+ gunzip $BACKING_FILE
modprobe g_file_storage file=/tmp/backing_file
sleep 1
- ask_user "Please connect your board to your PC and see if a mass storage\ndevice is detected. Try to open the image inside the device.\n Do you see something interesting ? ;-) (y/n)"
- if [ "$response" == "y" ]; then
+ ask_user "Please connect your board to your PC with a USB cable and see if a mass storage\ndevice is detected. Try to open the image inside the device.\n Do you see something interesting ? ;-) (y/N)"
+ test_result=$response
+ ask_user "Please unmount mass storage device of your PC, unplug USB cable and then press ENTER"
+ rmmod g_file_storage
+ rm /tmp/backing_file
+ if [ "$test_result" == "y" ] || [ "$test_result" == "yes" ]; then
echo_test_ok
else
exit_failed
diff --git a/target/test/test_usb_host.sh b/target/test/test_usb_host.sh
index 7618623..ac1ffaf 100755
--- a/target/test/test_usb_host.sh
+++ b/target/test/test_usb_host.sh
@@ -14,6 +14,7 @@
source ./test_helpers.sh
source ./test_env.sh
+USB_MOUNT_POINT=/media/usbdisk
load_usb_host_driver_apf9328()
{
@@ -50,9 +51,9 @@ wait_key_removal()
check_usb_key()
{
- mount `ls /dev/sd*1` /mnt/mmc && ls /mnt/mmc/
+ mount `ls /dev/sd*1` $USB_MOUNT_POINT && ls $USB_MOUNT_POINT
df -h
- umount /mnt/mmc
+ umount $USB_MOUNT_POINT
if [ "$?" != 0 ]; then
exit_failed
fi
@@ -69,12 +70,12 @@ test_usb_host()
exit_failed
fi
- wait_key_insertion "upper"
+ wait_key_insertion "the UPPER"
check_usb_key
wait_key_removal
- wait_key_insertion "lower"
+ wait_key_insertion "the LOWER"
check_usb_key
wait_key_removal
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-07-29 20:29:41
|
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 94db1bf41a3f6ce69b66a988d56d5332c037c344 (commit)
via 75d48b481b760316c8f332e0b8296585a9540dcd (commit)
from 8fce6241b14d37ad70de0aaf01cb014a7df7bf29 (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 94db1bf41a3f6ce69b66a988d56d5332c037c344
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 29 22:29:09 2010 +0200
[BUILDROOT] Rename patches 132 (qt full integration) until it is fixed
commit 75d48b481b760316c8f332e0b8296585a9540dcd
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 29 21:13:54 2010 +0200
[BUILDROOT] [2010.05] Partial revert of commit 8fce6241b14d37ad70de0aaf01cb014a7df7bf29: patch 132-xx was not appropriate for recent BR
-----------------------------------------------------------------------
Summary of changes:
...qt-full_integration_with_cross_compiling.tofix} | 0
...-qt-full_integration_with_cross_compiling.patch | 2619 --------------------
patches/buildroot/cleanup_buildroot.sh | 1 -
3 files changed, 0 insertions(+), 2620 deletions(-)
rename patches/buildroot/{132-qt-full_integration_with_cross_compiling.patch => 132-qt-full_integration_with_cross_compiling.tofix} (100%)
delete mode 100644 patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
diff --git a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/132-qt-full_integration_with_cross_compiling.tofix
similarity index 100%
rename from patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
rename to patches/buildroot/132-qt-full_integration_with_cross_compiling.tofix
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
deleted file mode 100644
index 563a562..0000000
--- a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
+++ /dev/null
@@ -1,2619 +0,0 @@
-This patch fully integrates Qt 4.5.3 to Buildroot with some added features :
-* handling of sql, mouse, keyboard and gfx plugins
-* the cross-compiling of Qt is supported
-* possibility to install the cross-compiled version of Qt on the target
-* if you have already compiled Qt with the configuration you wanted, you can reuse it instead of entirely rebuild it
-
-Signed-off-by: Jérémie Scheer <jer...@ar...>
-
-Index: buildroot/package/qtopia4/Config.gfx.in
-===================================================================
---- buildroot.orig/package/qtopia4/Config.gfx.in 2010-07-23 12:16:59.000000000 +0200
-+++ buildroot/package/qtopia4/Config.gfx.in 2010-07-28 15:30:42.000000000 +0200
-@@ -1,5 +1,7 @@
- menu "Graphics drivers"
-
-+menu "Drivers"
-+
- config BR2_PACKAGE_QT_GFX_LINUXFB
- bool "Linux Framebuffer"
- default y
-@@ -17,3 +19,21 @@
- bool "multiscreen"
-
- endmenu
-+
-+menu "Plugins"
-+
-+config BR2_PACKAGE_QT_GFX_PLUGIN_LINUXFB
-+ bool "Linux Framebuffer"
-+
-+config BR2_PACKAGE_QT_GFX_PLUGIN_QVFB
-+ bool "Qt Virtual Framebuffer"
-+
-+config BR2_PACKAGE_QT_GFX_PLUGIN_TRANSFORMED
-+ bool "Transformed"
-+
-+config BR2_PACKAGE_QT_GFX_PLUGIN_VNC
-+ bool "VNC"
-+
-+endmenu
-+
-+endmenu
-Index: buildroot/package/qtopia4/Config.in
-===================================================================
---- buildroot.orig/package/qtopia4/Config.in 2010-07-23 12:16:59.000000000 +0200
-+++ buildroot/package/qtopia4/Config.in 2010-07-28 15:30:42.000000000 +0200
-@@ -11,6 +11,29 @@
-
- if BR2_PACKAGE_QT
-
-+source "package/qtopia4/Config.xcompile.in"
-+
-+config BR2_PACKAGE_QT_USE_EXISTING_INSTALL
-+ bool "Use existing Qt install"
-+ help
-+ If you don't want to entirely rebuild Qt and if you already have
-+ a Qt installation with the same configuration that you want for
-+ this project, you can use this existing installation.
-+ Only tools and libraries needed for developing applications will
-+ be copied.
-+
-+ Say N if you don't want to use an existing Qt
-+ installation.
-+
-+if BR2_PACKAGE_QT_USE_EXISTING_INSTALL
-+
-+config BR2_PACKAGE_QT_EXIST_INSTALL_DIR
-+ string "Existing Qt install dir"
-+ help
-+ Enter the existing Qt installation directory here.
-+ Must be the Qt root path.
-+endif
-+
- config BR2_PACKAGE_QT_DEBUG
- bool "Compile with debug support"
- help
-@@ -39,6 +62,25 @@
-
- endchoice
-
-+config BR2_PACKAGE_QT_FAST
-+ bool "Fast Makefile generation"
-+ default y
-+ help
-+ Configure Qt quickly by generating Makefiles only for library
-+ and subdirectory targets.
-+ All other Makefiles are created as wrappers, which will
-+ in turn run qmake.
-+
-+config BR2_PACKAGE_QT_EXCEPTIONS
-+ bool "Compilers exceptions"
-+ help
-+ Enable exceptions on compilers that support it.
-+
-+config BR2_PACKAGE_QT_OPTIMIZED_QMAKE
-+ bool "Optimized qmake"
-+ help
-+ Build optimized qmake.
-+
- config BR2_PACKAGE_QT_LICENSE_APPROVED
- bool "Approve free license"
- help
-@@ -214,6 +256,11 @@
- bool "Use Qt bundled libtiff"
- endchoice
-
-+config BR2_PACKAGE_QT_QWS_CURSOR
-+ bool "QWS cursor"
-+ help
-+ Display a QWS cursor on the target GUI.
-+
- endif # BR2_PACKAGE_QT_GUI_MODULE
-
- choice
-@@ -234,34 +281,98 @@
- Use the shared zlib from the system.
- endchoice
-
--config BR2_PACKAGE_QT_EMB_PLATFORM
-- string "The embedded platform we are making Qt for"
-- default "arm" if BR2_arm
-- default "arm" if BR2_armeb
-- default "avr32" if BR2_avr32
-- default "x86" if BR2_i386
-- default "x86_64" if BR2_x86_64
-- default "mips" if BR2_mips
-- default "mips" if BR2_mipsel
-- default "ppc" if BR2_powerpc
-+choice
-+ prompt "The embedded platform we are making Qt for"
-+ default BR2_PACKAGE_QT_ARM if BR2_arm
-+ default BR2_PACKAGE_QT_ARM if BR2_armeb
-+ default BR2_PACKAGE_QT_AVR32 if BR2_avr32
-+ default BR2_PACKAGE_QT_X86 if BR2_i386
-+ default BR2_PACKAGE_QT_X86_64 if BR2_x86_64
-+ default BR2_PACKAGE_QT_MIPS if BR2_mips
-+ default BR2_PACKAGE_QT_MIPS if BR2_mipsel
-+ default BR2_PACKAGE_QT_POWERPC if BR2_powerpc
- # Not that I really believe these will work..
-- default "generic" if BR2_alpha
-- default "generic" if BR2_chris
-- default "generic" if BR2_m68k
-- default "generic" if BR2_nios2
-- default "generic" if BR2_sh
-- default "generic" if BR2_sh64
-- default "generic" if BR2_sparc
-+ default BR2_PACKAGE_QT_GENERIC if BR2_alpha
-+ default BR2_PACKAGE_QT_GENERIC if BR2_chris
-+ default BR2_PACKAGE_QT_GENERIC if BR2_m68k
-+ default BR2_PACKAGE_QT_GENERIC if BR2_nios2
-+ default BR2_PACKAGE_QT_GENERIC if BR2_sh
-+ default BR2_PACKAGE_QT_GENERIC if BR2_sh64
-+ default BR2_PACKAGE_QT_GENERIC if BR2_sparc
- help
- The target platform.
-
-+config BR2_PACKAGE_QT_ARM
-+ bool "arm"
-+config BR2_PACKAGE_QT_AVR32
-+ bool "avr32"
-+config BR2_PACKAGE_QT_X86
-+ bool "x86"
-+config BR2_PACKAGE_QT_X86_64
-+ bool "x86_64"
-+config BR2_PACKAGE_QT_MIPS
-+ bool "mips"
-+config BR2_PACKAGE_QT_POWERPC
-+ bool "powerpc"
-+config BR2_PACKAGE_QT_GENERIC
-+ bool "generic"
-+endchoice
-+
-+
-+config BR2_PACKAGE_QT_INSTALL_DIR
-+ string "Install dir"
-+ default "$(STAGING_DIR)/usr/local/Trolltech/QtEmbedded"
-+ help
-+ Directory where all files relatives to Qt will be installed.
-+
-+ The default is $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded
-+
-+menu "Misc"
-+config BR2_PACKAGE_QT_NOMMX
-+ bool "No MMX"
-+ help
-+ Do not compile with use of MMX instructions.
-+config BR2_PACKAGE_QT_NO3DNOW
-+ bool "No 3DNOW"
-+ help
-+ Do not compile with use of 3DNOW instructions.
-+config BR2_PACKAGE_QT_NOSSE
-+ bool "No SSE"
-+ help
-+ Do not compile with use of SSE instructions.
-+config BR2_PACKAGE_QT_NOSSE2
-+ bool "No SSE2"
-+ help
-+ Do not compile with use of SSE2 instructions.
-+endmenu
-+
- source "package/qtopia4/Config.sql.in"
- if BR2_PACKAGE_QT_GUI_MODULE
- source "package/qtopia4/Config.gfx.in"
- source "package/qtopia4/Config.mouse.in"
- source "package/qtopia4/Config.keyboard.in"
-+
-+config BR2_PACKAGE_QT_QVFB
-+ bool "QVFB"
-+ help
-+ Compile QVFB gfx, mouse and keyboard drivers
- endif
-
-+config BR2_PACKAGE_QT_ICONV
-+ bool "Iconv"
-+ help
-+ Compile support for iconv.
-+
-+config BR2_PACKAGE_QT_DBUS
-+ bool "DBus Module"
-+ help
-+ Compile the QtDBus module and dynamically load libdbus.
-+
-+config BR2_PACKAGE_QT_GLIB
-+ bool "Glib"
-+ help
-+ Compile Glib support.
-+
- config BR2_PACKAGE_QT_XML
- bool "XML Module"
- default y
-@@ -325,4 +436,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/Config.mouse.in
-===================================================================
---- buildroot.orig/package/qtopia4/Config.mouse.in 2010-07-23 12:16:59.000000000 +0200
-+++ buildroot/package/qtopia4/Config.mouse.in 2010-07-28 15:31:36.000000000 +0200
-@@ -1,13 +1,17 @@
- menu "Mouse drivers"
-
-+menu "Drivers"
-+
- config BR2_PACKAGE_QT_MOUSE_PC
- bool "pc"
-+ default y
-
- config BR2_PACKAGE_QT_MOUSE_BUS
- bool "bus"
-
- config BR2_PACKAGE_QT_MOUSE_LINUXTP
- bool "linuxtp"
-+ default y
-
- config BR2_PACKAGE_QT_MOUSE_YOPY
- bool "yopy"
-@@ -22,3 +26,30 @@
- bool "qvfb"
-
- endmenu
-+
-+menu "Plugins"
-+
-+config BR2_PACKAGE_QT_MOUSE_PLUGIN_BUS
-+ bool "bus"
-+
-+config BR2_PACKAGE_QT_MOUSE_PLUGIN_LINUXIS
-+ bool "linuxis"
-+
-+config BR2_PACKAGE_QT_MOUSE_PLUGIN_LINUXTP
-+ bool "linuxtp"
-+
-+config BR2_PACKAGE_QT_MOUSE_PLUGIN_PC
-+ bool "pc"
-+
-+config BR2_PACKAGE_QT_MOUSE_PLUGIN_TSLIB
-+ bool "tslib"
-+
-+config BR2_PACKAGE_QT_MOUSE_PLUGIN_VR41XX
-+ bool "vr41xx"
-+
-+config BR2_PACKAGE_QT_MOUSE_PLUGIN_YOPY
-+ bool "yopy"
-+
-+endmenu
-+
-+endmenu
-Index: buildroot/package/qtopia4/Config.sql.in
-===================================================================
---- buildroot.orig/package/qtopia4/Config.sql.in 2010-07-23 12:16:59.000000000 +0200
-+++ buildroot/package/qtopia4/Config.sql.in 2010-07-28 15:30:42.000000000 +0200
-@@ -4,6 +4,9 @@
- Compile Qt SQL Module
-
- if BR2_PACKAGE_QT_SQL_MODULE
-+
-+menu "Drivers"
-+
- config BR2_PACKAGE_QT_MYSQL
- bool "MySQL Driver"
- help
-@@ -31,7 +34,7 @@
- config BR2_PACKAGE_QT_SQLITE
- bool "SQLite 3 Driver"
- help
-- Build SQLite driver
-+ Build SQLite 3 driver
- If unsure, say n.
-
- config BR2_PACKAGE_QT_SQLITE2
-@@ -39,4 +42,47 @@
- help
- Build SQLite 2 driver
- If unsure, say n.
-+
-+endmenu
-+
-+menu "Plugins"
-+
-+config BR2_PACKAGE_QT_PLUGIN_MYSQL
-+ bool "MySQL Plugin"
-+ help
-+ Build MySQL plugin
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_PLUGIN_IBASE
-+ bool "iBase Plugin"
-+ help
-+ Build iBase plugin
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_PLUGIN_ODBC
-+ bool "ODBC Plugin"
-+ help
-+ Build ODBC plugin
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_PLUGIN_PSQL
-+ bool "PostgreSQL Plugin"
-+ help
-+ Build PostgreSQL plugin
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_PLUGIN_SQLITE
-+ bool "SQLite 3 Plugin"
-+ help
-+ Build SQLite 3 plugin
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_PLUGIN_SQLITE2
-+ bool "SQLite 2 Plugin"
-+ help
-+ Build SQLite 2 plugin
-+ If unsure, say n.
-+
-+endmenu
-+
- endif
-Index: buildroot/package/qtopia4/qtopia4.mk
-===================================================================
---- buildroot.orig/package/qtopia4/qtopia4.mk 2010-07-23 12:16:59.000000000 +0200
-+++ buildroot/package/qtopia4/qtopia4.mk 2010-07-28 15:30:42.000000000 +0200
-@@ -20,6 +20,62 @@
-
- QT_CONFIGURE:=#empty
-
-+# x86x86fix
-+# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux
-+# host. It's unclear if this would happen on other hosts.
-+ifneq ($(findstring pc-linux,$(BR2_GNU_BUILD_SUFFIX)),)
-+ifeq ($(BR2_PACKAGE_QT_X86), y)
-+QT_CONFIGURE+= -xplatform linux-g++ -arch x86 -platform linux-g++
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X86_64), y)
-+QT_CONFIGURE+= -xplatform linux-g++-64 -arch x86_64 -platform linux-g++
-+endif
-+endif
-+# End of workaround.
-+
-+# Embedded platform
-+ifeq ($(BR2_PACKAGE_QT_ARM),y)
-+BR2_PACKAGE_QT_EMB_PLATFORM:=arm
-+endif
-+ifeq ($(BR2_PACKAGE_QT_AVR32),y)
-+BR2_PACKAGE_QT_EMB_PLATFORM:=avr32
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X86),y)
-+BR2_PACKAGE_QT_EMB_PLATFORM:=x86
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X86_64),y)
-+BR2_PACKAGE_QT_EMB_PLATFORM:=x86_64
-+endif
-+ifeq ($(BR2_PACKAGE_QT_MIPS),y)
-+BR2_PACKAGE_QT_EMB_PLATFORM:=mips
-+endif
-+ifeq ($(BR2_PACKAGE_QT_POWERPC),y)
-+BR2_PACKAGE_QT_EMB_PLATFORM:=powerpc
-+endif
-+ifeq ($(BR2_PACKAGE_QT_GENERIC),y)
-+BR2_PACKAGE_QT_EMB_PLATFORM:=generic
-+endif
-+
-+ifneq ($(BR2_PACKAGE_QT_USE_EXISTING_INSTALL),y)
-+TARGET_LIBS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-$(QT_VERSION)-$(BR2_PACKAGE_QT_EMB_PLATFORM)/lib
-+TARGET_PLUGINS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-$(QT_VERSION)-$(BR2_PACKAGE_QT_EMB_PLATFORM)/plugins
-+else
-+BR2_PACKAGE_QT_EXIST_INSTALL_DIR:=$(call qstrip, $(BR2_PACKAGE_QT_EXIST_INSTALL_DIR))
-+QT_EXIST_INSTALL_DIR_NAME:=`echo $(BR2_PACKAGE_QT_EXIST_INSTALL_DIR) | sed 's/.*\///'`
-+TARGET_LIBS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/$(QT_EXIST_INSTALL_DIR_NAME)/lib
-+TARGET_PLUGINS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/$(QT_EXIST_INSTALL_DIR_NAME)/plugins
-+endif
-+
-+BR2_PACKAGE_QT_INSTALL_DIR:=$(call qstrip, $(BR2_PACKAGE_QT_INSTALL_DIR))
-+ifneq ($(findstring $(STAGING_DIR)/usr/local/QtEmbedded,$(BR2_PACKAGE_QT_INSTALL_DIR)),)
-+QT_CONFIGURE += -demosdir $(BR2_PACKAGE_QT_INSTALL_DIR)/QtDemos
-+QT_CONFIGURE += -examplesdir $(BR2_PACKAGE_QT_INSTALL_DIR)/QtExamples
-+QT_CONFIGURE += -hostprefix $(BR2_PACKAGE_QT_INSTALL_DIR)
-+else
-+QT_CONFIGURE += -prefix $(BR2_PACKAGE_QT_INSTALL_DIR)
-+endif
-+
-+
- ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
- QT_CONFIGURE += -opensource -confirm-license
- endif
-@@ -90,23 +146,15 @@
- ### Display drivers
- ifeq ($(BR2_PACKAGE_QT_GFX_LINUXFB),y)
- QT_CONFIGURE += -qt-gfx-linuxfb
--else
--QT_CONFIGURE += -no-gfx-linuxfb
- endif
- ifeq ($(BR2_PACKAGE_QT_GFX_TRANSFORMED),y)
- QT_CONFIGURE += -qt-gfx-transformed
--else
--QT_CONFIGURE += -no-gfx-transformed
- endif
- ifeq ($(BR2_PACKAGE_QT_GFX_QVFB),y)
- QT_CONFIGURE += -qt-gfx-qvfb
--else
--QT_CONFIGURE += -no-gfx-qvfb
- endif
- ifeq ($(BR2_PACKAGE_QT_GFX_VNC),y)
- QT_CONFIGURE += -qt-gfx-vnc
--else
--QT_CONFIGURE += -no-gfx-vnc
- endif
- ifeq ($(BR2_PACKAGE_QT_GFX_MULTISCREEN),y)
- QT_CONFIGURE += -qt-gfx-multiscreen
-@@ -114,37 +162,55 @@
- QT_CONFIGURE += -no-gfx-multiscreen
- endif
-
-+### Display plugins
-+ifeq ($(BR2_PACKAGE_QT_GFX_PLUGIN_LINUXFB),y)
-+QT_CONFIGURE += -plugin-gfx-linuxfb
-+else
-+ifneq ($(BR2_PACKAGE_QT_GFX_LINUXFB),y)
-+QT_CONFIGURE += -no-gfx-linuxfb
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_GFX_PLUGIN_QVFB),y)
-+QT_CONFIGURE += -plugin-gfx-qvfb
-+else
-+ifneq ($(BR2_PACKAGE_QT_GFX_QVFB),y)
-+QT_CONFIGURE += -no-gfx-qvfb
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_GFX_PLUGIN_TRANSFORMED),y)
-+QT_CONFIGURE += -plugin-gfx-transformed
-+else
-+ifneq ($(BR2_PACKAGE_QT_GFX_TRANSFORMED),y)
-+QT_CONFIGURE += -no-gfx-transformed
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_GFX_PLUGIN_VNC),y)
-+QT_CONFIGURE += -plugin-gfx-vnc
-+else
-+ifneq ($(BR2_PACKAGE_QT_GFX_VNC),y)
-+QT_CONFIGURE += -no-gfx-vnc
-+endif
-+endif
-+
- ### Mouse drivers
- ifeq ($(BR2_PACKAGE_QT_MOUSE_PC),y)
- QT_CONFIGURE += -qt-mouse-pc
--else
--QT_CONFIGURE += -no-mouse-pc
- endif
- ifeq ($(BR2_PACKAGE_QT_MOUSE_BUS),y)
- QT_CONFIGURE += -qt-mouse-bus
--else
--QT_CONFIGURE += -no-mouse-bus
- endif
- ifeq ($(BR2_PACKAGE_QT_MOUSE_LINUXTP),y)
- QT_CONFIGURE += -qt-mouse-linuxtp
--else
--QT_CONFIGURE += -no-mouse-linuxtp
- endif
- ifeq ($(BR2_PACKAGE_QT_MOUSE_YOPY),y)
- QT_CONFIGURE += -qt-mouse-yopy
--else
--QT_CONFIGURE += -no-mouse-yopy
- endif
- ifeq ($(BR2_PACKAGE_QT_MOUSE_VR41XX),y)
- QT_CONFIGURE += -qt-mouse-vr41xx
--else
--QT_CONFIGURE += -no-mouse-vr41xx
- endif
- ifeq ($(BR2_PACKAGE_QT_MOUSE_TSLIB),y)
- QT_CONFIGURE += -qt-mouse-tslib
- QT_DEP_LIBS+=tslib
--else
--QT_CONFIGURE += -no-mouse-tslib
- endif
- ifeq ($(BR2_PACKAGE_QT_MOUSE_QVFB),y)
- QT_CONFIGURE += -qt-mouse-qvfb
-@@ -152,6 +218,53 @@
- QT_CONFIGURE += -no-mouse-qvfb
- endif
-
-+### Mouse plugins
-+ifeq ($(BR2_PACKAGE_QT_MOUSE_PLUGIN_BUS),y)
-+QT_CONFIGURE += -plugin-mouse-bus
-+else
-+ifneq ($(BR2_PACKAGE_QT_MOUSE_BUS),y)
-+QT_CONFIGURE += -no-mouse-bus
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_MOUSE_PLUGIN_LINUXIS),y)
-+QT_CONFIGURE += -plugin-mouse-linuxis
-+endif
-+ifeq ($(BR2_PACKAGE_QT_MOUSE_PLUGIN_LINUXTP),y)
-+QT_CONFIGURE += -plugin-mouse-linuxtp
-+else
-+ifneq ($(BR2_PACKAGE_QT_MOUSE_LINUXTP),y)
-+QT_CONFIGURE += -no-mouse-linuxtp
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_MOUSE_PLUGIN_PC),y)
-+QT_CONFIGURE += -plugin-mouse-pc
-+else
-+ifneq ($(BR2_PACKAGE_QT_MOUSE_PC),y)
-+QT_CONFIGURE += -no-mouse-pc
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_MOUSE_PLUGIN_TSLIB),y)
-+QT_CONFIGURE += -plugin-mouse-tslib
-+else
-+ifneq ($(BR2_PACKAGE_QT_MOUSE_TSLIB),y)
-+QT_CONFIGURE += -no-mouse-tslib
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_MOUSE_PLUGIN_VR41XX),y)
-+QT_CONFIGURE += -plugin-mouse-vr41xx
-+else
-+ifneq ($(BR2_PACKAGE_QT_MOUSE_VR41XX),y)
-+QT_CONFIGURE += -no-mouse-vr41xx
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_MOUSE_PLUGIN_YOPY),y)
-+QT_CONFIGURE += -plugin-mouse-yopy
-+else
-+ifneq ($(BR2_PACKAGE_QT_MOUSE_YOPY),y)
-+QT_CONFIGURE += -no-mouse-yopy
-+endif
-+endif
-+
- ### Keyboard drivers
- ifeq ($(BR2_PACKAGE_QT_KEYBOARD_TTY),y)
- QT_CONFIGURE += -qt-kbd-tty
-@@ -160,8 +273,6 @@
- endif
- ifeq ($(BR2_PACKAGE_QT_KEYBOARD_USB),y)
- QT_CONFIGURE += -qt-kbd-usb
--else
--QT_CONFIGURE += -no-kbd-usb
- endif
- ifeq ($(BR2_PACKAGE_QT_KEYBOARD_SL5000),y)
- QT_CONFIGURE += -qt-kbd-sl5000
-@@ -175,8 +286,6 @@
- endif
- ifeq ($(BR2_PACKAGE_QT_KEYBOARD_VR41XX),y)
- QT_CONFIGURE += -qt-kbd-vr41xx
--else
--QT_CONFIGURE += -no-kbd-vr41xx
- endif
- ifeq ($(BR2_PACKAGE_QT_KEYBOARD_QVFB),y)
- QT_CONFIGURE += -qt-kbd-qvfb
-@@ -184,6 +293,29 @@
- QT_CONFIGURE += -no-kbd-qvfb
- endif
-
-+### Keyboard plugins
-+ifeq ($(BR2_PACKAGE_QT_KEYBOARD_PLUGIN_LINUXIS),y)
-+QT_CONFIGURE += -plugin-kbd-linuxis
-+endif
-+ifeq ($(BR2_PACKAGE_QT_KEYBOARD_PLUGIN_USB),y)
-+QT_CONFIGURE += -plugin-kbd-usb
-+else
-+ifneq ($(BR2_PACKAGE_QT_KEYBOARD_USB),y)
-+QT_CONFIGURE += -no-kbd-usb
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_KEYBOARD_PLUGIN_VR41XX),y)
-+QT_CONFIGURE += -plugin-kbd-vr41xx
-+else
-+ifneq ($(BR2_PACKAGE_QT_KEYBOARD_VR41XX),y)
-+QT_CONFIGURE += -no-kbd-vr41xx
-+endif
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_QVFB),y)
-+QT_CONFIGURE+= -qvfb
-+endif
-+
- ifeq ($(BR2_PACKAGE_QT_DEBUG),y)
- QT_CONFIGURE+= -debug
- else
-@@ -196,6 +328,24 @@
- QT_CONFIGURE+= -static
- endif
-
-+ifeq ($(BR2_PACKAGE_QT_FAST),y)
-+QT_CONFIGURE+= -fast
-+else
-+QT_CONFIGURE+= -no-fast
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_EXCEPTIONS),y)
-+QT_CONFIGURE+= -exceptions
-+else
-+QT_CONFIGURE+= -no-exceptions
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_OPTIMIZED_QMAKE),y)
-+QT_CONFIGURE+= -optimized-qmake
-+else
-+QT_CONFIGURE+= -no-optimized-qmake
-+endif
-+
- ifeq ($(BR2_ENDIAN),"LITTLE")
- QT_CONFIGURE+= -little-endian
- else
-@@ -256,8 +406,12 @@
- endif
- endif
-
-+ifneq ($(BR2_PACKAGE_QT_QWS_CURSOR),y)
-+QT_CONFIGURE+= -DQT_NO_QWS_CURSOR
-+endif
-
--QT_FONTS = $(addprefix $(STAGING_DIR)/usr/lib/fonts/, $(addsuffix *.qpf, \
-+
-+QT_FONTS = $(addprefix $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/fonts/, $(addsuffix *.qpf, \
- $(if $(BR2_PACKAGE_QT_FONT_MICRO),micro) \
- $(if $(BR2_PACKAGE_QT_FONT_FIXED),fixed) \
- $(if $(BR2_PACKAGE_QT_FONT_HELVETICA),helvetica) \
-@@ -301,12 +455,35 @@
- endif
- ifeq ($(BR2_PACKAGE_QT_SQLITE),y)
- QT_CONFIGURE+= -qt-sql-sqlite
--else
--QT_CONFIGURE+= -no-sql-sqlite
- endif
- ifeq ($(BR2_PACKAGE_QT_SQLITE2),y)
- QT_CONFIGURE+= -qt-sql-sqlite2
- endif
-+
-+# Qt SQL Plugins
-+ifeq ($(BR2_PACKAGE_QT_PLUGIN_MYSQL),y)
-+QT_CONFIGURE+= -plugin-sql-mysql
-+endif
-+ifeq ($(BR2_PACKAGE_QT_PLUGIN_IBASE),y)
-+QT_CONFIGURE+= -plugin-sql-ibase
-+endif
-+ifeq ($(BR2_PACKAGE_QT_PLUGIN_ODBC),y)
-+QT_CONFIGURE+= -plugin-sql-odbc
-+endif
-+ifeq ($(BR2_PACKAGE_QT_PLUGIN_PSQL),y)
-+QT_CONFIGURE+= -plugin-sql-psql
-+endif
-+ifeq ($(BR2_PACKAGE_QT_PLUGIN_SQLITE),y)
-+QT_CONFIGURE+= -plugin-sql-sqlite
-+else
-+ifneq ($(BR2_PACKAGE_QT_SQLITE),y)
-+QT_CONFIGURE+= -no-sql-sqlite
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_PLUGIN_SQLITE2),y)
-+QT_CONFIGURE+= -plugin-sql-sqlite2
-+endif
-+
- else
- # By default, no SQL driver is turned on by configure.
- # but it seams sqlite isn't disabled despite what says
-@@ -314,6 +491,33 @@
- QT_CONFIGURE+= -no-sql-sqlite
- endif
-
-+#Misc
-+ifeq ($(BR2_PACKAGE_QT_NOMMX),y)
-+QT_CONFIGURE+= -no-mmx
-+endif
-+ifeq ($(BR2_PACKAGE_QT_NO3DNOW),y)
-+QT_CONFIGURE+= -no-3dnow
-+endif
-+ifeq ($(BR2_PACKAGE_QT_NOSSE),y)
-+QT_CONFIGURE+= -no-sse
-+endif
-+ifeq ($(BR2_PACKAGE_QT_NOSSE2),y)
-+QT_CONFIGURE+= -no-sse2
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_ICONV),y)
-+QT_CONFIGURE+= -iconv
-+else
-+QT_CONFIGURE+= -no-iconv
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_DBUS),y)
-+QT_CONFIGURE+= -dbus
-+QT_DEP_LIBS+=dbus
-+else
-+QT_CONFIGURE+= -no-dbus
-+endif
-+
- ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
- QT_CONFIGURE+= -xmlpatterns -exceptions
- else
-@@ -345,23 +549,20 @@
- QT_CONFIGURE+= -no-stl
- endif
-
--# ccache and precompiled headers don't play well together
--ifeq ($(BR2_CCACHE),y)
--QT_CONFIGURE += -no-pch
-+ifneq ($(BR2_PACKAGE_QT_DEMOS),y)
-+QT_CONFIGURE+= -nomake demos
- endif
-
--BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
--
--# x86x86fix
--# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux
--# host. It's unclear if this would happen on other hosts.
--ifneq ($(findstring pc-linux,$(BR2_GNU_BUILD_SUFFIX)),)
--ifneq ($(findstring x86,$(BR2_PACKAGE_QT_EMB_PLATFORM)),)
--QT_CONFIGURE+= -platform linux-g++
-+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
- endif
--# End of workaround.
-
-+ifneq ($(BR2_PACKAGE_QT_USE_EXISTING_INSTALL),y)
- # Figure out what libs to install in the target
- QT_LIBS=#empty
- ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
-@@ -394,11 +595,18 @@
- ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
- QT_LIBS+= qt-scripttools
- endif
-+ifeq ($(BR2_PACKAGE_QT_DBUS),y)
-+QT_LIBS+= qt-dbus
-+endif
-+else
-+QT_LIBS+=qt-gui qt-sql qt-phonon qt-svg qt-network qt-webkit qt-xml qt-xmlpatterns qt-script qt-scripttools qt-dbus
-+endif
-+
-
- QT_QMAKE_CONF:=$(QT_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++/qmake.conf
-
- # Variable for other Qt applications to use
--QT_QMAKE:=$(STAGING_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++
-+QT_QMAKE:=$(BR2_PACKAGE_QT_INSTALL_DIR)/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++
-
- ################################################################################
- # QT_QMAKE_SET -- helper macro to set QMAKE_<variable> = <value> in
-@@ -425,10 +633,10 @@
- # $(call QT_INSTALL_PLUGINS,sqldrivers)
- # ################################################################################
- define QT_INSTALL_PLUGINS
-- if [ -d $(STAGING_DIR)/usr/plugins/$(1) ]; then \
-- mkdir -p $(TARGET_DIR)/usr/plugins; \
-- cp -dpfr $(STAGING_DIR)/usr/plugins/$(1) $(TARGET_DIR)/usr/plugins/; \
-- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/$(1)/*; \
-+ if [ -d $(BR2_PACKAGE_QT_INSTALL_DIR)/plugins/$(1) ]; then \
-+ mkdir -p $(TARGET_PLUGINS_DIR); \
-+ cp -dpfr $(BR2_PACKAGE_QT_INSTALL_DIR)/plugins/$(1) $(TARGET_PLUGINS_DIR)/; \
-+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_PLUGINS_DIR)/$(1)/*; \
- fi
- endef
-
-@@ -468,9 +676,9 @@
- # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
- # instead of the host then. So set PKG_CONFIG* manually.
- (cd $(QT_TARGET_DIR); \
-- PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
-+ PKG_CONFIG_SYSROOT_DIR="$(BR2_PACKAGE_QT_INSTALL_DIR)/.." \
- PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-- PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
-+ PKG_CONFIG_PATH="$(BR2_PACKAGE_QT_INSTALL_DIR)/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
- ./configure \
- $(if $(VERBOSE),-verbose,-silent) \
- -force-pkg-config \
-@@ -482,12 +690,7 @@
- -no-nis \
- -no-accessibility \
- -no-separate-debug-info \
-- -prefix /usr \
-- -hostprefix $(STAGING_DIR)/usr \
-- -fast \
- -no-rpath \
-- -nomake examples \
-- -nomake demos \
- )
- touch $@
-
-@@ -495,91 +698,146 @@
- $(MAKE) -C $(QT_TARGET_DIR)
- touch $@
-
--$(STAGING_DIR)/usr/lib/libQtCore.la: $(QT_TARGET_DIR)/.compiled
-- $(MAKE) -C $(QT_TARGET_DIR) install
--
--qt-gui: $(STAGING_DIR)/usr/lib/libQtCore.la
-- mkdir -p $(TARGET_DIR)/usr/lib/fonts
-+ifneq ($(BR2_PACKAGE_QT_USE_EXISTING_INSTALL),y)
-+$(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la: $(QT_TARGET_DIR)/.compiled
-+ sudo $(MAKE) -C $(QT_TARGET_DIR) install
-+else
-+$(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la:
-+ if [ -d "$(BR2_PACKAGE_QT_EXIST_INSTALL_DIR)" ]; then \
-+ sudo mkdir -p $(BR2_PACKAGE_QT_INSTALL_DIR); \
-+ sudo chmod 777 $(BR2_PACKAGE_QT_X_INSTALL_DIR); \
-+ sudo cp -Rf $(BR2_PACKAGE_QT_EXIST_INSTALL_DIR)/bin $(BR2_PACKAGE_QT_INSTALL_DIR); \
-+ sudo cp -Rf $(BR2_PACKAGE_QT_EXIST_INSTALL_DIR)/include $(BR2_PACKAGE_QT_INSTALL_DIR); \
-+ sudo cp -Rf $(BR2_PACKAGE_QT_EXIST_INSTALL_DIR)/lib $(BR2_PACKAGE_QT_INSTALL_DIR); \
-+ sudo cp -Rf $(BR2_PACKAGE_QT_EXIST_INSTALL_DIR)/mkspecs $(BR2_PACKAGE_QT_INSTALL_DIR); \
-+ sudo cp -Rf $(BR2_PACKAGE_QT_EXIST_INSTALL_DIR)/plugins $(BR2_PACKAGE_QT_INSTALL_DIR); \
-+ else \
-+ echo "$(BR2_PACKAGE_QT_EXIST_INSTALL_DIR): No such file or directory"; \
-+ exit 2; \
-+ fi
-+endif
-+
-+qt-gui: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
-+ $(call QT_INSTALL_PLUGINS,mousedrivers)
-+ $(call QT_INSTALL_PLUGINS,gfxdrivers)
-+ $(call QT_INSTALL_PLUGINS,kbddrivers)
-+ mkdir -p $(TARGET_LIBS_DIR)/fonts
- ifneq ($(QT_FONTS),)
-- cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts
-+ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/fonts/*.qpf>/dev/null 2>/dev/null`; then \
-+ cp -dpf $(QT_FONTS) $(TARGET_LIBS_DIR)/fonts; \
-+ fi
- endif
- ifneq ($(BR2_PACKAGE_QT_NOFREETYPE),y)
-- cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
-+ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/fonts/*.ttf>/dev/null 2>/dev/null`; then \
-+ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/fonts/*.ttf $(TARGET_LIBS_DIR)/fonts; \
-+ fi
- endif
- # Install image plugins if they are built
- $(call QT_INSTALL_PLUGINS,imageformats)
- ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-- cp -dpf $(STAGING_DIR)/usr/lib/libQtGui.so.* $(TARGET_DIR)/usr/lib/
-+ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtGui.so.*>/dev/null 2>/dev/null`; then \
-+ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtGui.so.* $(TARGET_LIBS_DIR); \
-+ fi
- endif
-
--qt-sql: $(STAGING_DIR)/usr/lib/libQtCore.la
-+qt-sql: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
- $(call QT_INSTALL_PLUGINS,sqldrivers)
- ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-- cp -dpf $(STAGING_DIR)/usr/lib/libQtSql.so.* $(TARGET_DIR)/usr/lib/
-+ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtSql.so.*>/dev/null 2>/dev/null`; then \
-+ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtSql.so.* $(TARGET_LIBS_DIR); \
-+ fi
- endif
-
--qt-phonon: $(STAGING_DIR)/usr/lib/libQtCore.la
-+qt-phonon: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
- $(call QT_INSTALL_PLUGINS,phonon_backend)
- ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-- cp -dpf $(STAGING_DIR)/usr/lib/libphonon.so.* $(TARGET_DIR)/usr/lib/
-+ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libphonon.so.*>/dev/null 2>/dev/null`; then \
-+ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libphonon.so.* $(TARGET_LIBS_DIR); \
-+ fi
- endif
-
--qt-svg: $(STAGING_DIR)/usr/lib/libQtCore.la
-+qt-svg: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
- $(call QT_INSTALL_PLUGINS,iconengines)
- ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-- cp -dpf $(STAGING_DIR)/usr/lib/libQtSvg.so.* $(TARGET_DIR)/usr/lib/
-+ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtSvg.so.*>/dev/null 2>/dev/null`; then \
-+ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtSvg.so.* $(TARGET_LIBS_DIR); \
-+ fi
- endif
-
--qt-network: $(STAGING_DIR)/usr/lib/libQtCore.la
-+qt-network: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
- ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-- cp -dpf $(STAGING_DIR)/usr/lib/libQtNetwork.so.* $(TARGET_DIR)/usr/lib/
-+ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtNetwork.so.*>/dev/null 2>/dev/null`; then \
-+ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtNetwork.so.* $(TARGET_LIBS_DIR); \
-+ fi
- endif
-
--qt-webkit: $(STAGING_DIR)/usr/lib/libQtCore.la
-+qt-webkit: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
- ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-- cp -dpf $(STAGING_DIR)/usr/lib/libQtWebKit.so.* $(TARGET_DIR)/usr/lib/
-+ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtWebkit.so.*>/dev/null 2>/dev/null`; then \
-+ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtWebKit.so.* $(TARGET_LIBS_DIR); \
-+ fi
- endif
-
--qt-xml: $(STAGING_DIR)/usr/lib/libQtCore.la
-+qt-xml: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
- ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-- cp -dpf $(STAGING_DIR)/usr/lib/libQtXml.so.* $(TARGET_DIR)/usr/lib/
-+ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtXml.so.*>/dev/null 2>/dev/null`; then \
-+ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtXml.so.* $(TARGET_LIBS_DIR); \
-+ fi
- endif
-
--qt-xmlpatterns: $(STAGING_DIR)/usr/lib/libQtCore.la
-+qt-xmlpatterns: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
- ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-- cp -dpf $(STAGING_DIR)/usr/lib/libQtXmlPatterns.so.* $(TARGET_DIR)/usr/lib/
-+ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtXmlPatterns.so.*>/dev/null 2>/dev/null`; then \
-+ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtXmlPatterns.so.* $(TARGET_LIBS_DIR); \
-+ fi
- endif
-
--qt-script: $(STAGING_DIR)/usr/lib/libQtCore.la
-+qt-script: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
- ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-- cp -dpf $(STAGING_DIR)/usr/lib/libQtScript.so.* $(TARGET_DIR)/usr/lib/
-+ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtScript.so.*>/dev/null 2>/dev/null`; then \
-+ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtScript.so.* $(TARGET_LIBS_DIR); \
-+ fi
- endif
-
--qt-scripttools: $(STAGING_DIR)/usr/lib/libQtCore.la
-+qt-scripttools: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
- ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-- cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
-+ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtScriptTools.so.*>/dev/null 2>/dev/null`; then \
-+ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtScriptTools.so.* $(TARGET_LIBS_DIR); \
-+ fi
- endif
-
-+qt-dbus: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
-+ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-+ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtDBus.so.*>/dev/null 2>/dev/null`; then \
-+ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtDBus.so.* $(TARGET_LIBS_DIR); \
-+ fi
-+endif
-
--$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
-+$(TARGET_LIBS_DIR)/libQtCore.so.4: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la $(QT_LIBS)
- # Strip all installed libs
- ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-- cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
-- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.*
-+ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.so.* $(TARGET_LIBS_DIR)
-+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_LIBS_DIR)/libQt*.so.*
- endif
-
--qt: $(QT_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4
-+ifneq ($(BR2_PACKAGE_QT_USE_EXISTING_INSTALL),y)
-+qt: $(QT_DEP_LIBS) $(TARGET_LIBS_DIR)/libQtCore.so.4
-+else
-+qt: $(TARGET_LIBS_DIR)/libQtCore.so.4
-+endif
-
- qt-clean:
- -$(MAKE) -C $(QT_TARGET_DIR) clean
-- -rm -rf $(TARGET_DIR)/usr/lib/fonts
-+ -rm -rf $(BR2_PACKAGE_QT_INSTALL_DIR)
-+ -rm -rf $(TARGET_LIBS_DIR)/fonts
- ifeq ($(BR2_PACKAGE_QT_SHARED),y)
-- -rm $(TARGET_DIR)/usr/lib/libQt*.so.*
-- -rm $(TARGET_DIR)/usr/lib/libphonon.so.*
-+ -rm $(TARGET_LIBS_DIR)/libQt*.so.*
-+ -rm $(TARGET_LIBS_DIR)/libphonon.so.*
- endif
-
- qt-dirclean:
- rm -rf $(QT_TARGET_DIR)
-+ -rm -rf $(BR2_PACKAGE_QT_INSTALL_DIR)
-
- #############################################################
- #
-Index: buildroot/package/qtopia4/Config.keyboard.in
-===================================================================
---- buildroot.orig/package/qtopia4/Config.keyboard.in 2010-07-23 12:16:59.000000000 +0200
-+++ buildroot/package/qtopia4/Config.keyboard.in 2010-07-28 15:30:42.000000000 +0200
-@@ -1,7 +1,10 @@
- menu "Keyboard drivers"
-
-+menu "Drivers"
-+
- config BR2_PACKAGE_QT_KEYBOARD_TTY
- bool "tty"
-+ default y
-
- config BR2_PACKAGE_QT_KEYBOARD_USB
- bool "usb"
-@@ -19,3 +22,18 @@
- bool "qvfb"
-
- endmenu
-+
-+menu "Plugins"
-+
-+config BR2_PACKAGE_QT_KEYBOARD_PLUGIN_LINUXIS
-+ bool "linuxis"
-+
-+config BR2_PACKAGE_QT_KEYBOARD_PLUGIN_USB
-+ bool "usb"
-+
-+config BR2_PACKAGE_QT_KEYBOARD_PLUGIN_VR41XX
-+ bool "vr41xx"
-+
-+endmenu
-+
-+endmenu
-Index: buildroot/package/qtopia4/Config.xcompile.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtopia4/Config.xcompile.in 2010-07-28 15:30:42.000000000 +0200
-@@ -0,0 +1,432 @@
-+menuconfig BR2_PACKAGE_QT_CROSS_COMPILING
-+ bool "Qt Cross compiling"
-+ help
-+ Allows to cross-compile Qt Embedded.
-+
-+if BR2_PACKAGE_QT_CROSS_COMPILING
-+
-+config BR2_PACKAGE_QT_X_USE_EXISTING_INSTALL
-+ bool "Use existing Qt install"
-+ help
-+ If you don't want to entirely rebuild Qt and if you already have
-+ a Qt installation with the same configuration that you want for
-+ this project, you can use this existing installation.
-+ Only tools and libraries needed for developing applications will
-+ be copied.
-+
-+ Say N if you don't want to use an existing Qt
-+ installation.
-+
-+if BR2_PACKAGE_QT_X_USE_EXISTING_INSTALL
-+
-+config BR2_PACKAGE_QT_X_EXIST_INSTALL_DIR
-+ string "Existing Qt install dir"
-+ help
-+ Enter the existing Qt installation directory here.
-+ Must be the Qt root path.
-+endif
-+
-+config BR2_PACKAGE_QT_X_TARGET_INSTALL
-+ bool "Install on target"
-+ help
-+ Install the cross-compiled version of Qt on the target.
-+ Must be for an other platform than the first version.
-+ If unsure, say N.
-+
-+config BR2_PACKAGE_QT_X_DEBUG
-+ bool "Compile with debug support"
-+ help
-+ If unsure, say N.
-+
-+choice
-+ prompt "Library type"
-+ default BR2_PACKAGE_QT_X_SHARED
-+ help
-+ Selects the library type: Shared or Static
-+
-+config BR2_PACKAGE_QT_X_SHARED
-+ bool "Shared library"
-+ help
-+ Create and use shared Qt libraries.
-+ If you have multiple programs that depend on Qt or intend to use
-+ plugins, say Y.
-+
-+config BR2_PACKAGE_QT_X_STATIC
-+ bool "Static Library"
-+ help
-+ Create and use static Qt libraries.
-+ If you don't have multiple programs on the target that depends on
-+ Qt, then this will save you quite some of storage space.
-+ If unsure, say Y.
-+
-+endchoice
-+
-+config BR2_PACKAGE_QT_X_FAST
-+ bool "Fast Makefile generation"
-+ default y
-+ help
-+ Configure Qt quickly by generating Makefiles only for library
-+ and subdirectory targets.
-+ All other Makefiles are created as wrappers, which will
-+ in turn run qmake.
-+
-+config BR2_PACKAGE_QT_X_EXCEPTIONS
-+ bool "Compilers exceptions"
-+ help
-+ Enable exceptions on compilers that support it.
-+
-+config BR2_PACKAGE_QT_X_OPTIMIZED_QMAKE
-+ bool "Optimized qmake"
-+ help
-+ Build optimized qmake.
-+
-+config BR2_PACKAGE_QT_X_LICENSE_APPROVED
-+ bool "Approve free license"
-+ help
-+ Select this if you approve one of the available free licenses for the
-+ Qt4 library.
-+ By doing this you will not be asked while the library is compiled.
-+ Please read and understand the license terms before approving this.
-+
-+ LGPL v2.1: http://doc.trolltech.com/4.5/lgpl.html
-+ GPL v3.0: http://doc.trolltech.com/4.5/gpl.html
-+
-+config BR2_PACKAGE_QT_X_QT3SUPPORT
-+ bool "Compatibility with Qt3"
-+ help
-+ Turns on support for older Qt3. This will create an additional
-+ library with proxy code and increase the space required on target.
-+ If unsure say n.
-+
-+config BR2_PACKAGE_QT_X_GUI_MODULE
-+ bool "Gui Module"
-+ select BR2_PACKAGE_QT_X_NETWORK
-+ default y
-+ help
-+ Turns on support for Gui applications. If your board doesn't have
-+ video output, or you don't require Qt GUI, say n.
-+
-+if BR2_PACKAGE_QT_X_GUI_MODULE
-+menu "Pixel depths"
-+comment "Deselecting each option leads to Qt's default (8,16,32)"
-+
-+config BR2_PACKAGE_QT_X_PIXEL_DEPTH_1
-+ bool "1 bpp, black/white"
-+
-+config BR2_PACKAGE_QT_X_PIXEL_DEPTH_4
-+ bool "4 bpp, grayscale"
-+
-+config BR2_PACKAGE_QT_X_PIXEL_DEPTH_8
-+ bool "8 bpp, paletted"
-+ default y
-+
-+config BR2_PACKAGE_QT_X_PIXEL_DEPTH_12
-+ bool "12 bpp, rgb 4-4-4"
-+
-+config BR2_PACKAGE_QT_X_PIXEL_DEPTH_15
-+ bool "15 bpp, rgb 5-5-5"
-+
-+config BR2_PACKAGE_QT_X_PIXEL_DEPTH_16
-+ bool "16 bpp, rgb 5-6-5"
-+ default y
-+
-+config BR2_PACKAGE_QT_X_PIXEL_DEPTH_18
-+ bool "18 bpp, rgb 6-6-6"
-+
-+config BR2_PACKAGE_QT_X_PIXEL_DEPTH_24
-+ bool "24 bpp, rgb 8-8-8"
-+
-+config BR2_PACKAGE_QT_X_PIXEL_DEPTH_32
-+ bool "32 bpp, argb 8-8-8-8 and rgb 8-8-8"
-+ default y
-+
-+endmenu
-+
-+menu "Fonts"
-+
-+config BR2_PACKAGE_QT_X_FONT_MICRO
-+ bool "micro"
-+ default y
-+
-+config BR2_PACKAGE_QT_X_FONT_FIXED
-+ bool "fixed"
-+ default y
-+
-+config BR2_PACKAGE_QT_X_FONT_HELVETICA
-+ bool "helvetica"
-+ default y
-+
-+config BR2_PACKAGE_QT_X_FONT_JAPANESE
-+ bool "japanese"
-+
-+config BR2_PACKAGE_QT_X_FONT_UNIFONT
-+ bool "unicode"
-+
-+endmenu
-+
-+choice
-+ prompt "freetype2 support"
-+ default BR2_PACKAGE_QT_X_NOFREETYPE
-+ help
-+ Select freetype2 support.
-+
-+config BR2_PACKAGE_QT_X_NOFREETYPE
-+ bool "no freetype2 support"
-+ help
-+ Do not compile in Freetype2 support.
-+
-+config BR2_PACKAGE_QT_X_QTFREETYPE
-+ bool "Qt freetype2"
-+ help
-+ Use the libfreetype bundled with Qt.
-+
-+config BR2_PACKAGE_QT_X_SYSTEMFREETYPE
-+ bool "System freetype2"
-+ select BR2_PACKAGE_FREETYPE
-+ help
-+ Use shared libfreetype from the target system.
-+ See http://www.freetype.org/
-+endchoice
-+
-+config BR2_PACKAGE_QT_X_GIF
-+ bool "Enable GIF support"
-+ help
-+ This compiles and installs the plugin for GIF reading support.
-+
-+config BR2_PACKAGE_QT_X_LIBMNG
-+ bool "Enable libmng support"
-+ help
-+ This compiles and installs the plugin for MNG support.
-+
-+choice
-+ prompt "JPEG support"
-+ default BR2_PACKAGE_QT_X_NOJPEG
-+ help
-+ Select libjpeg support.
-+
-+config BR2_PACKAGE_QT_X_NOJPEG
-+ bool "No jpeg support"
-+ help
-+ Disable JPEG support
-+
-+config BR2_PACKAGE_QT_X_SYSTEMJPEG
-+ select BR2_PACKAGE_JPEG
-+ bool "System libjpeg"
-+ help
-+ Link against system libjpeg
-+
-+config BR2_PACKAGE_QT_X_QTJPEG
-+ bool "Use Qt bundled libjpeg"
-+ help
-+ Link against libjpeg proveded with Qt
-+endchoice
-+
-+choice
-+ prompt "PNG support"
-+ default BR2_PACKAGE_QT_X_NOPNG
-+ help
-+ Select which library to use if PNG support should be enabled.
-+
-+config BR2_PACKAGE_QT_X_NOPNG
-+ bool "No PNG support"
-+
-+config BR2_PACKAGE_QT_X_SYSTEMPNG
-+ bool "System libpng"
-+ select BR2_PACKAGE_LIBPNG
-+
-+config BR2_PACKAGE_QT_X_QTPNG
-+ bool "Use Qt bundled libpng"
-+endchoice
-+
-+choice
-+ prompt "TIFF support"
-+ default BR2_PACKAGE_QT_X_NOTIFF
-+ help
-+ Select which library to use if TIFF support should be enabled.
-+
-+config BR2_PACKAGE_QT_X_NOTIFF
-+ bool "No TIFF support"
-+
-+config BR2_PACKAGE_QT_X_SYSTEMTIFF
-+ bool "System libtiff"
-+ select BR2_PACKAGE_TIFF
-+
-+config BR2_PACKAGE_QT_X_QTTIFF
-+ bool "Use Qt bundled libtiff"
-+endchoice
-+
-+config BR2_PACKAGE_QT_X_QWS_CURSOR
-+ bool "QWS cursor"
-+ help
-+ Display a QWS cursor on the target GUI.
-+
-+endif # BR2_PACKAGE_QT_X_GUI_MODULE
-+
-+choice
-+ prompt "zlib support"
-+ default BR2_PACKAGE_QT_X_QTZLIB
-+ help
-+ Select zlib support.
-+
-+config BR2_PACKAGE_QT_X_QTZLIB
-+ bool "Qt zlib"
-+ help
-+ Use the zlib bundled with Qt.
-+
-+config BR2_PACKAGE_QT_X_SYSTEMZLIB
-+ bool "System zlib"
-+ select BR2_PACKAGE_ZLIB
-+ help
-+ Use the shared zlib from the system.
-+endchoice
-+
-+choice
-+ prompt "The embedded platform we are making Qt for"
-+ default BR2_PACKAGE_QT_X_X86
-+ help
-+ The target platform.
-+
-+config BR2_PACKAGE_QT_X_ARM
-+ bool "arm"
-+config BR2_PACKAGE_QT_X_AVR32
-+ bool "avr32"
-+config BR2_PACKAGE_QT_X_X86
-+ bool "x86"
-+config BR2_PACKAGE_QT_X_X86_64
-+ bool "x86_64"
-+config BR2_PACKAGE_QT_X_MIPS
-+ bool "mips"
-+config BR2_PACKAGE_QT_X_POWERPC
-+ bool "powerpc"
-+config BR2_PACKAGE_QT_X_GENERIC
-+ bool "generic"
-+endchoice
-+
-+config BR2_PACKAGE_QT_X_INSTALL_DIR
-+ string "Install dir"
-+ default "$(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-CC"
-+ help
-+ Directory where all files relatives to Qt will be installed.
-+
-+ The default is $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-CC
-+
-+menu "Misc"
-+config BR2_PACKAGE_QT_X_NOMMX
-+ bool "No MMX"
-+ help
-+ Do not compile with use of MMX instructions.
-+config BR2_PACKAGE_QT_X_NO3DNOW
-+ bool "No 3DNOW"
-+ help
-+ Do not compile with use of 3DNOW instructions.
-+config BR2_PACKAGE_QT_X_NOSSE
-+ bool "No SSE"
-+ help
-+ Do not compile with use of SSE instructions.
-+config BR2_PACKAGE_QT_X_NOSSE2
-+ bool "No SSE2"
-+ help
-+ Do not compile with use of SSE2 instructions.
-+endmenu
-+
-+source "package/qtopia4/Config.xcompile.sql.in"
-+if BR2_PACKAGE_QT_X_GUI_MODULE
-+source "package/qtopia4/Config.xcompile.gfx.in"
-+source "package/qtopia4/Config.xcompile.mouse.in"
-+source "package/qtopia4/Config.xcompile.keyboard.in"
-+
-+config BR2_PACKAGE_QT_X_QVFB
-+ bool "QVFB"
-+ help
-+ Compile QVFB gfx, mouse and keyboard drivers
-+endif
-+
-+config BR2_PACKAGE_QT_X_ICONV
-+ bool "Iconv"
-+ help
-+ Compile support for iconv.
-+
-+config BR2_PACKAGE_QT_X_DBUS
-+ bool "DBus Module"
-+ help
-+ Compile the QtDBus module and dynamically load libdbus.
-+
-+config BR2_PACKAGE_QT_X_GLIB
-+ bool "Glib"
-+ help
-+ Compile Glib support.
-+
-+config BR2_PACKAGE_QT_X_XML
-+ bool "XML Module"
-+ default y
-+ help
-+ Build the XML module.
-+
-+config BR2_PACKAGE_QT_X_XMLPATTERNS
-+ bool "XML Patterns Module"
-+ depends on BR2_PACKAGE_QT_XML
-+ help
-+ Build QtXmlPatterns module.
-+ If unsure, say n
-+
-+config BR2_PACKAGE_QT_X_SVG
-+ bool "SVG Module"
-+ help
-+ Build the SVG module.
-+ If unsure, say n
-+
-+config BR2_PACKAGE_QT_X_NETWORK
-+ bool "Network Module"
-+ default y
-+ help
-+ Install the Network module.
-+ if unsure, say y
-+
-+config BR2_PACKAGE_QT_X_WEBKIT
-+ bool "WebKit Module"
-+ depends on BR2_PACKAGE_QT_NETWORK
-+ help
-+ Build the WebKit module.
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_X_STL
-+ bool "STL support"
-+ help
-+ Compile STL support.
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_X_OPENSSL
-+ bool "Enable OpenSSL support"
-+ depends on BR2_PACKAGE_QT_X_NETWORK
-+ select BR2_PACKAGE_OPENSSL
-+ help
-+ Enable support for the OpenSSL encryption library. If you use
-+ QSslSocket say y here, otherwise, say no to save space on the
-+ target.
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_X_SCRIPT
-+ bool "Script Module"
-+ default y
-+ help
-+ Build the Qt Script module.
-+ if unsure, say y.
-+
-+config BR2_PACKAGE_QT_X_SCRIPTTOOLS
-+ bool "Script Tools Module"
-+ depends on BR2_PACKAGE_QT_X_SCRIPT
-+ help
-+ Build the Qt Script Tools module.
-+ if unsure, say n.
-+
-+config BR2_PACKAGE_QT_X_DEMOS
-+ bool "Demos"
-+ help
-+ Build the Qt Demos.
-+
-+config BR2_PACKAGE_QT_X_EXAMPLES
-+ bool "Examples"
-+ help
-+ Build the Qt Examples.
-+
-+endif # BR2_PACKAGE_QT_CROSS_COMPILING
-Index: buildroot/package/qtopia4/Config.xcompile.sql.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtopia4/Config.xcompile.sql.in 2010-07-28 15:30:42.000000000 +0200
-@@ -0,0 +1,88 @@
-+menuconfig BR2_PACKAGE_QT_X_SQL_MODULE
-+ bool "SQL Module"
-+ help
-+ Compile Qt SQL Module
-+
-+if BR2_PACKAGE_QT_X_SQL_MODULE
-+
-+menu "Drivers"
-+
-+config BR2_PACKAGE_QT_X_MYSQL
-+ bool "MySQL Driver"
-+ help
-+ Build MySQL driver
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_X_IBASE
-+ bool "iBase Driver"
-+ help
-+ Build iBase driver
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_X_ODBC
-+ bool "ODBC Driver"
-+ help
-+ Build ODBC driver
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_X_PSQL
-+ bool "PostgreSQL Driver"
-+ help
-+ Build PostgreSQL driver
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_X_SQLITE
-+ bool "SQLite 3 Driver"
-+ help
-+ Build SQLite 3 driver
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_X_SQLITE2
-+ bool "SQLite 2 Driver"
-+ help
-+ Build SQLite 2 driver
-+ If unsure, say n.
-+
-+endmenu
-+
-+menu "Plugins"
-+
-+config BR2_PACKAGE_QT_X_PLUGIN_MYSQL
-+ bool "MySQL Plugin"
-+ help
-+ Build MySQL plugin
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_X_PLUGIN_IBASE
-+ bool "iBase Plugin"
-+ help
-+ Build iBase plugin
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_X_PLUGIN_ODBC
-+ bool "ODBC Plugin"
-+ help
-+ Build ODBC plugin
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_X_PLUGIN_PSQL
-+ bool "PostgreSQL Plugin"
-+ help
-+ Build PostgreSQL plugin
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_X_PLUGIN_SQLITE
-+ bool "SQLite 3 Plugin"
-+ help
-+ Build SQLite 3 plugin
-+ If unsure, say n.
-+
-+config BR2_PACKAGE_QT_X_PLUGIN_SQLITE2
-+ bool "SQLite 2 Plugin"
-+ help
-+ Build SQLite 2 plugin
-+ If unsure, say n.
-+
-+endmenu
-+
-+endif
-Index: buildroot/package/qtopia4/Config.xcompile.gfx.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtopia4/Config.xcompile.gfx.in 2010-07-28 15:30:42.000000000 +0200
-@@ -0,0 +1,39 @@
-+menu "Graphics drivers"
-+
-+menu "Drivers"
-+
-+config BR2_PACKAGE_QT_X_GFX_LINUXFB
-+ bool "Linux Framebuffer"
-+ default y
-+
-+config BR2_PACKAGE_QT_X_GFX_TRANSFORMED
-+ bool "Transformed"
-+
-+config BR2_PACKAGE_QT_X_GFX_QVFB
-+ bool "Qt Virtual Framebuffer"
-+
-+config BR2_PACKAGE_QT_X_GFX_VNC
-+ bool "VNC"
-+
-+config BR2_PACKAGE_QT_X_GFX_MULTISCREEN
-+ bool "multiscreen"
-+
-+endmenu
-+
-+menu "Plugins"
-+
-+config BR2_PACKAGE_QT_X_GFX_PLUGIN_LINUXFB
-+ bool "Linux Framebuffer"
-+
-+config BR2_PACKAGE_QT_X_GFX_PLUGIN_QVFB
-+ bool "Qt Virtual Framebuffer"
-+
-+config BR2_PACKAGE_QT_X_GFX_PLUGIN_TRANSFORMED
-+ bool "Transformed"
-+
-+config BR2_PACKAGE_QT_X_GFX_PLUGIN_VNC
-+ bool "VNC"
-+
-+endmenu
-+
-+endmenu
-Index: buildroot/package/qtopia4/Config.xcompile.keyboard.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtopia4/Config.xcompile.keyboard.in 2010-07-28 15:30:42.000000000 +0200
-@@ -0,0 +1,39 @@
-+menu "Keyboard drivers"
-+
-+menu "Drivers"
-+
-+config BR2_PACKAGE_QT_X_KEYBOARD_TTY
-+ bool "tty"
-+ default y
-+
-+config BR2_PACKAGE_QT_X_KEYBOARD_USB
-+ bool "usb"
-+
-+config BR2_PACKAGE_QT_X_KEYBOARD_SL5000
-+ bool "sl5000"
-+
-+config BR2_PACKAGE_QT_X_KEYBOARD_YOPY
-+ bool "yopy"
-+
-+config BR2_PACKAGE_QT_X_KEYBOARD_VR41XX
-+ bool "vr41xx"
-+
-+config BR2_PACKAGE_QT_X_KEYBOARD_QVFB
-+ bool "qvfb"
-+
-+endmenu
-+
-+menu "Plugins"
-+
-+config BR2_PACKAGE_QT_X_KEYBOARD_PLUGIN_LINUXIS
-+ bool "linuxis"
-+
-+config BR2_PACKAGE_QT_X_KEYBOARD_PLUGIN_USB
-+ bool "usb"
-+
-+config BR2_PACKAGE_QT_X_KEYBOARD_PLUGIN_VR41XX
-+ bool "vr41xx"
-+
-+endmenu
-+
-+endmenu
-Index: buildroot/package/qtopia4/Config.xcompile.mouse.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtopia4/Config.xcompile.mouse.in 2010-07-28 15:30:42.000000000 +0200
-@@ -0,0 +1,55 @@
-+menu "Mouse drivers"
-+
-+menu "Drivers"
-+
-+config BR2_PACKAGE_QT_X_MOUSE_PC
-+ bool "pc"
-+ default y
-+
-+config BR2_PACKAGE_QT_X_MOUSE_BUS
-+ bool "bus"
-+
-+config BR2_PACKAGE_QT_X_MOUSE_LINUXTP
-+ bool "linuxtp"
-+ default y
-+
-+config BR2_PACKAGE_QT_X_MOUSE_YOPY
-+ bool "yopy"
-+
-+config BR2_PACKAGE_QT_X_MOUSE_VR41XX
-+ bool "vr41xx"
-+
-+config BR2_PACKAGE_QT_X_MOUSE_TSLIB
-+ bool "tslib"
-+
-+config BR2_PACKAGE_QT_X_MOUSE_QVFB
-+ bool "qvfb"
-+
-+endmenu
-+
-+menu "Plugins"
-+
-+config BR2_PACKAGE_QT_X_MOUSE_PLUGIN_BUS
-+ bool "bus"
-+
-+config BR2_PACKAGE_QT_X_MOUSE_PLUGIN_LINUXIS
-+ bool "linuxis"
-+
-+config BR2_PACKAGE_QT_X_MOUSE_PLUGIN_LINUXTP
-+ bool "linuxtp"
-+
-+config BR2_PACKAGE_QT_X_MOUSE_PLUGIN_PC
-+ bool "pc"
-+
-+config BR2_PACKAGE_QT_X_MOUSE_PLUGIN_TSLIB
-+ bool "tslib"
-+
-+config BR2_PACKAGE_QT_X_MOUSE_PLUGIN_VR41XX
-+ bool "vr41xx"
-+
-+config BR2_PACKAGE_QT_X_MOUSE_PLUGIN_YOPY
-+ bool "yopy"
-+
-+endmenu
-+
-+endmenu
-Index: buildroot/package/qtopia4/qtopia4.xcompile.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qtopia4/qtopia4.xcompile.mk 2010-07-28 15:30:42.000000000 +0200
-@@ -0,0 +1,863 @@
-+######################################################################
-+#
-+# Qt Embedded Cross Compiling for Linux 4.5
-+# http://www.qtsoftware.com/
-+#
-+# This makefile was originally composed by Thomas Lundquist <tho...@ze...>
-+# Later heavily modified by buildroot developers
-+#
-+# BTW, this uses alot of FPU calls and it's pretty slow if you use
-+# the kernels FPU emulation so it's better to choose soft float in the
-+# buildroot config (and uClibc.config of course, if you have your own.)
-+#
-+######################################################################
-+
-+QT_X_VERSION:=4.5.3
-+QT_X_SOURCE:=qt-embedded-linux-opensource-src-$(QT_X_VERSION).tar.gz
-+QT_X_SITE:=http://get.qt.nokia.com/qt/source
-+QT_X_CAT:=$(ZCAT)
-+QT_X_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QT_X_VERSION)-CC
-+QT_X_TMP_BUILD_DIR:=$(BUILD_DIR)/tmp
-+QT_X_TMP_TARGET_DIR:=$(BUILD_DIR)/tmp/qt-embedded-linux-opensource-src-$(QT_X_VERSION)
-+
-+QT_X_CONFIGURE:=#empty
-+
-+
-+# x86x86fix
-+# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux
-+# host. It's unclear if this would happen on other hosts.
-+ifneq ($(findstring pc-linux,$(BR2_GNU_BUILD_SUFFIX)),)
-+ifeq ($(BR2_PACKAGE_QT_X_X86), y)
-+QT_X_CONFIGURE+= -xplatform linux-g++ -arch x86 -platform linux-g++
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_X86_64), y)
-+QT_X_CONFIGURE+= -xplatform linux-g++-64 -arch x86_64 -platform linux-g++
-+endif
-+endif
-+# End of workaround.
-+
-+# Embedded platform
-+ifeq ($(BR2_PACKAGE_QT_X_ARM),y)
-+BR2_PACKAGE_QT_X_EMB_PLATFORM:=arm
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_AVR32),y)
-+BR2_PACKAGE_QT_X_EMB_PLATFORM:=avr32
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_X86),y)
-+BR2_PACKAGE_QT_X_EMB_PLATFORM:=x86
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_X86_64),y)
-+BR2_PACKAGE_QT_X_EMB_PLATFORM:=x86_64
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_MIPS),y)
-+BR2_PACKAGE_QT_X_EMB_PLATFORM:=mips
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_POWERPC),y)
-+BR2_PACKAGE_QT_X_EMB_PLATFORM:=powerpc
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_GENERIC),y)
-+BR2_PACKAGE_QT_X_EMB_PLATFORM:=generic
-+endif
-+
-+ifneq ($(BR2_PACKAGE_QT_X_USE_EXISTING_INSTALL),y)
-+X_TARGET_LIBS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-$(QT_X_VERSION)-$(BR2_PACKAGE_QT_X_EMB_PLATFORM)/lib
-+X_TARGET_PLUGINS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-$(QT_X_VERSION)-$(BR2_PACKAGE_QT_X_EMB_PLATFORM)/plugins
-+else
-+BR2_PACKAGE_QT_X_EXIST_INSTALL_DIR:=$(call qstrip, $(BR2_PACKAGE_QT_X_EXIST_INSTALL_DIR))
-+QT_X_EXIST_INSTALL_DIR_NAME:=`echo $(BR2_PACKAGE_QT_X_EXIST_INSTALL_DIR) | sed 's/.*\///'`
-+X_TARGET_LIBS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/$(QT_X_EXIST_INSTALL_DIR_NAME)/lib
-+X_TARGET_PLUGINS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/$(QT_X_EXIST_INSTALL_DIR_NAME)/plugins
-+endif
-+
-+BR2_PACKAGE_QT_X_INSTALL_DIR:=$(call qstrip, $(BR2_PACKAGE_QT_X_INSTALL_DIR))
-+ifneq ($(findstring $(STAGING_DIR)/usr/local/QtEmbedded-CC,$(BR2_PACKAGE_QT_X_INSTALL_DIR)),)
-+QT_X_CONFIGURE += -demosdir $(BR2_PACKAGE_QT_X_INSTALL_DIR)/QtDemos
-+QT_X_CONFIGURE += -examplesdir $(BR2_PACKAGE_QT_X_INSTALL_DIR)/QtExamples
-+QT_X_CONFIGURE += -hostprefix $(BR2_PACKAGE_QT_X_INSTALL_DIR)
-+else
-+QT_X_CONFIGURE += -prefix $(BR2_PACKAGE_QT_X_INSTALL_DIR)
-+endif
-+
-+
-+ifeq ($(BR2_PACKAGE_QT_X_LICENSE_APPROVED),y)
-+QT_X_CONFIGURE += -opensource -confirm-license
-+endif
-+
-+# If you want extra tweaking you can copy
-+# $(QT_TARGET_DIR)/src/corelib/global/qconfig-myfile.h
-+# to the qt packages directory (where this .mk file is) and
-+# remove the comment.
-+# QT_QCONFIG_COMMAND:=-qconfig myfile
-+#
-+# For the options you can set in this file, look at
-+# $(QT_TARGET_DIR)/src/corelib/global/qfeatures.txt
-+#
-+QT_X_QCONFIG_FILE:=package/qtopia4/qconfig-myfile.xcompile.h
-+QT_X_QCONFIG_FILE_LOCATION:=/src/corelib/global/
-+
-+ifeq ($(BR2_LARGEFILE),y)
-+QT_X_CONFIGURE+= -largefile
-+else
-+QT_X_CONFIGURE+= -no-largefile
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_X_QT3SUPPORT),y)
-+QT_X_CONFIGURE+= -qt3support
-+else
-+QT_X_CONFIGURE+= -no-qt3support
-+endif
-+
-+# ensure glib is built first if enabled for Qt's glib support
-+ifeq ($(BR2_PACKAGE_X_LIBGLIB2),y)
-+QT_X_DEP_LIBS+=libglib2
-+endif
-+
-+
-+### Pixel depths
-+QT_X_PIXEL_DEPTHS := # empty
-+ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_1),y)
-+QT_X_PIXEL_DEPTHS += 1
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_4),y)
-+QT_X_PIXEL_DEPTHS += 4
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_8),y)
-+QT_X_PIXEL_DEPTHS += 8
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_12),y)
-+QT_X_PIXEL_DEPTHS += 12
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_15),y)
-+QT_X_PIXEL_DEPTHS += 15
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_16),y)
-+QT_X_PIXEL_DEPTHS += 16
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_18),y)
-+QT_X_PIXEL_DEPTHS += 18
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_24),y)
-+QT_X_PIXEL_DEPTHS += 24
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_32),y)
-+QT_X_PIXEL_DEPTHS += 32
-+endif
-+ifneq ($(QT_X_PIXEL_DEPTHS),)
-+QT_X_CONFIGURE += -depths $(subst $(space),$(comma),$(strip $(QT_X_PIXEL_DEPTHS)))
-+endif
-+
-+### Display drivers
-+ifeq ($(BR2_PACKAGE_QT_X_GFX_LINUXFB),y)
-+QT_X_CONFIGURE += -qt-gfx-linuxfb
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_GFX_TRANSFORMED),y)
-+QT_X_CONFIGURE += -qt-gfx-transformed
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_GFX_QVFB),y)
-+QT_X_CONFIGURE += -qt-gfx-qvfb
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_GFX_VNC),y)
-+QT_X_CONFIGURE += -qt-gfx-vnc
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_GFX_MULTISCREEN),y)
-+QT_X_CONFIGURE += -qt-gfx-multiscreen
-+else
-+QT_X_CONFIGURE += -no-gfx-multiscreen
-+endif
-+
-+### Display plugins
-+ifeq ($(BR2_PACKAGE_QT_X_GFX_PLUGIN_LINUXFB),y)
-+QT_X_CONFIGURE += -plugin-gfx-linuxfb
-+else
-+ifneq ($(BR2_PACKAGE_QT_X_GFX_LINUXFB),y)
-+QT_X_CONFIGURE += -no-gfx-linuxfb
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_GFX_PLUGIN_QVFB),y)
-+QT_X_CONFIGURE += -plugin-gfx-qvfb
-+else
-+ifneq ($(BR2_PACKAGE_QT_X_GFX_QVFB),y)
-+QT_X_CONFIGURE += -no-gfx-qvfb
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_GFX_PLUGIN_TRANSFORMED),y)
-+QT_X_CONFIGURE += -plugin-gfx-transformed
-+else
-+ifneq ($(BR2_PACKAGE_QT_X_GFX_TRANSFORMED),y)
-+QT_X_CONFIGURE += -no-gfx-transformed
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_GFX_PLUGIN_VNC),y)
-+QT_X_CONFIGURE += -plugin-gfx-vnc
-+else
-+ifneq ($(BR2_PACKAGE_QT_X_GFX_VNC),y)
-+QT_X_CONFIGURE += -no-gfx-vnc
-+endif
-+endif
-+
-+### Mouse drivers
-+ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PC),y)
-+QT_X_CONFIGURE += -qt-mouse-pc
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_MOUSE_BUS),y)
-+QT_X_CONFIGURE += -qt-mouse-bus
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_MOUSE_LINUXTP),y)
-+QT_X_CONFIGURE += -qt-mouse-linuxtp
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_MOUSE_YOPY),y)
-+QT_X_CONFIGURE += -qt-mouse-yopy
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_MOUSE_VR41XX),y)
-+QT_X_CONFIGURE += -qt-mouse-vr41xx
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_MOUSE_TSLIB),y)
-+QT_X_CONFIGURE += -qt-mouse-tslib
-+QT_X_DEP_LIBS+=tslib
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_MOUSE_QVFB),y)
-+QT_X_CONFIGURE += -qt-mouse-qvfb
-+else
-+QT_X_CONFIGURE += -no-mouse-qvfb
-+endif
-+
-+### Mouse plugins
-+ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PLUGIN_BUS),y)
-+QT_X_CONFIGURE += -plugin-mouse-bus
-+else
-+ifneq ($(BR2_PACKAGE_QT_X_MOUSE_BUS),y)
-+QT_X_CONFIGURE += -no-mouse-bus
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PLUGIN_LINUXIS),y)
-+QT_X_CONFIGURE += -plugin-mouse-linuxis
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PLUGIN_LINUXTP),y)
-+QT_X_CONFIGURE += -plugin-mouse-linuxtp
-+else
-+ifneq ($(BR2_PACKAGE_QT_X_MOUSE_LINUXTP),y)
-+QT_X_CONFIGURE += -no-mouse-linuxtp
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PLUGIN_PC),y)
-+QT_X_CONFIGURE += -plugin-mouse-pc
-+else
-+ifneq ($(BR2_PACKAGE_QT_X_MOUSE_PC),y)
-+QT_X_CONFIGURE += -no-mouse-pc
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PLUGIN_TSLIB),y)
-+QT_X_CONFIGURE += -plugin-mouse-tslib
-+else
-+ifneq ($(BR2_PACKAGE_QT_X_MOUSE_TSLIB),y)
-+QT_X_CONFIGURE += -no-mouse-tslib
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PLUGIN_VR41XX),y)
-+QT_X_CONFIGURE += -plugin-mouse-vr41xx
-+else
-+ifneq ($(BR2_PACKAGE_QT_MOUSE_VR41XX),y)
-+QT_X_CONFIGURE += -no-mouse-vr41xx
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PLUGIN_YOPY),y)
-+QT_X_CONFIGURE += -plugin-mouse-yopy
-+else
-+ifneq ($(BR2_PACKAGE_QT_X_MOUSE_YOPY),y)
-+QT_X_CONFIGURE += -no-mouse-yopy
-+endif
-+endif
-+
-+### Keyboard drivers
-+ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_TTY),y)
-+QT_X_CONFIGURE += -qt-kbd-tty
-+else
-+QT_X_CONFIGURE += -no-kbd-tty
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_USB),y)
-+QT_X_CONFIGURE += -qt-kbd-usb
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_SL5000),y)
-+QT_X_CONFIGURE += -qt-kbd-sl5000
-+else
-+QT_X_CONFIGURE += -no-kbd-sl5000
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_YOPY),y)
-+QT_X_CONFIGURE += -qt-kbd-yopy
-+else
-+QT_X_CONFIGURE += -no-kbd-yopy
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_VR41XX),y)
-+QT_X_CONFIGURE += -qt-kbd-vr41xx
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_QVFB),y)
-+QT_X_CONFIGURE += -qt-kbd-qvfb
-+else
-+QT_X_CONFIGURE += -no-kbd-qvfb
-+endif
-+
-+### Keyboard plugins
-+ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_PLUGIN_LINUXIS),y)
-+QT_X_CONFIGURE += -plugin-kbd-linuxis
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_PLUGIN_USB),y)
-+QT_X_CONFIGURE += -plugin-kbd-usb
-+else
-+ifneq ($(BR2_PACKAGE_QT_X_KEYBOARD_USB),y)
-+QT_X_CONFIGURE += -no-kbd-usb
-+endif
-+endif
-+ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_PLUGIN_VR41XX),y)
-+QT_X_CONFIGURE += -plugin-kbd-vr41xx
-+else
-+ifneq ($(BR2_PACKAGE_QT_X_KEYBOARD_VR41XX),y)
-+QT_X_CONFIGURE += -no-kbd-vr41xx
-+endif
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_X_QVFB),y)
-+QT_X_CONFIGURE+= -qvfb
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_X_DEBUG),y)
-+QT_X_CONFIGURE+= -debug
-+else
-+QT_X_CONFIGURE+= -release
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_X_SHARED),y)
-+QT_X_CONFIGURE+= -shared
-+else
-+QT_X_CONFIGURE+= -static
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_X_FAST),y)
-+QT_X_CONFIGURE+= -fast
-+else
-+QT_X_CONFIGURE+= -no-fast
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_X_EXCEPTIONS),y)
-+QT_X_CONFIGURE+= -exceptions
-+else
-+QT_X_CONFIGURE+= -no-exceptions
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_X_OPTIMIZED_QMAKE),y)
-+QT_X_CONFIGURE+= -optimized-qmake
-+else
-+QT_X_CONFIGURE+= -no-optimized-qmake
-+endif
-+
-+ifeq ($(BR2_ENDIAN),"LITTLE")
-+QT_X_CONFIGURE+= -little-endian
-+else
-+QT_X_CONFIGURE+= -big-endian
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_X_GIF),y)
-+QT_X_CONFIGURE+= -qt-gif
-+else
-+QT_X_CONFIGURE+= -no-gif
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_X_LIBMNG),y)
-+QT_X_CONFIGURE+= -qt-libmng
-+else
-+QT_X_CONFIGURE+= -no-libmng
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT_X_QTZLIB),y)
-+QT_X_CONFIGURE+= -qt-zlib
-+else
-+ifeq ($(BR2_PACKAGE_QT_X_SYSTEMZLIB),y)
-+QT_X_CONFIGURE+= -system-zlib
-+QT_X_DEP_LIBS+=zlib
-+endif
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT...
[truncated message content] |
|
From: jscheer <js...@us...> - 2010-07-29 11:50:00
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 8fce6241b14d37ad70de0aaf01cb014a7df7bf29 (commit)
from 43d21daef0b92cb9fc69982d479ee69b3d346a76 (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 8fce6241b14d37ad70de0aaf01cb014a7df7bf29
Author: Jeremie SCHEER <jer...@ar...>
Date: Thu Jul 29 13:49:27 2010 +0200
Full integration of Qt 4.5.3 in Buildroot :
* sql, mouse, keyboard and gfx plugins
* Qt cross-compiling
* automatically install libs in rootfs
* usage of existing Qt installation
-----------------------------------------------------------------------
Summary of changes:
...-qt-full_integration_with_cross_compiling.patch | 2619 ++++++++++++++++++++
...-qt-full_integration_with_cross_compiling.patch | 2619 ++++++++++++++++++++
patches/buildroot/2010.05/cleanup_buildroot.sh | 1 +
3 files changed, 5239 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
create mode 100644 patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.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..563a562
--- /dev/null
+++ b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
@@ -0,0 +1,2619 @@
+This patch fully integrates Qt 4.5.3 to Buildroot with some added features :
+* handling of sql, mouse, keyboard and gfx plugins
+* the cross-compiling of Qt is supported
+* possibility to install the cross-compiled version of Qt on the target
+* if you have already compiled Qt with the configuration you wanted, you can reuse it instead of entirely rebuild it
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/qtopia4/Config.gfx.in
+===================================================================
+--- buildroot.orig/package/qtopia4/Config.gfx.in 2010-07-23 12:16:59.000000000 +0200
++++ buildroot/package/qtopia4/Config.gfx.in 2010-07-28 15:30:42.000000000 +0200
+@@ -1,5 +1,7 @@
+ menu "Graphics drivers"
+
++menu "Drivers"
++
+ config BR2_PACKAGE_QT_GFX_LINUXFB
+ bool "Linux Framebuffer"
+ default y
+@@ -17,3 +19,21 @@
+ bool "multiscreen"
+
+ endmenu
++
++menu "Plugins"
++
++config BR2_PACKAGE_QT_GFX_PLUGIN_LINUXFB
++ bool "Linux Framebuffer"
++
++config BR2_PACKAGE_QT_GFX_PLUGIN_QVFB
++ bool "Qt Virtual Framebuffer"
++
++config BR2_PACKAGE_QT_GFX_PLUGIN_TRANSFORMED
++ bool "Transformed"
++
++config BR2_PACKAGE_QT_GFX_PLUGIN_VNC
++ bool "VNC"
++
++endmenu
++
++endmenu
+Index: buildroot/package/qtopia4/Config.in
+===================================================================
+--- buildroot.orig/package/qtopia4/Config.in 2010-07-23 12:16:59.000000000 +0200
++++ buildroot/package/qtopia4/Config.in 2010-07-28 15:30:42.000000000 +0200
+@@ -11,6 +11,29 @@
+
+ if BR2_PACKAGE_QT
+
++source "package/qtopia4/Config.xcompile.in"
++
++config BR2_PACKAGE_QT_USE_EXISTING_INSTALL
++ bool "Use existing Qt install"
++ help
++ If you don't want to entirely rebuild Qt and if you already have
++ a Qt installation with the same configuration that you want for
++ this project, you can use this existing installation.
++ Only tools and libraries needed for developing applications will
++ be copied.
++
++ Say N if you don't want to use an existing Qt
++ installation.
++
++if BR2_PACKAGE_QT_USE_EXISTING_INSTALL
++
++config BR2_PACKAGE_QT_EXIST_INSTALL_DIR
++ string "Existing Qt install dir"
++ help
++ Enter the existing Qt installation directory here.
++ Must be the Qt root path.
++endif
++
+ config BR2_PACKAGE_QT_DEBUG
+ bool "Compile with debug support"
+ help
+@@ -39,6 +62,25 @@
+
+ endchoice
+
++config BR2_PACKAGE_QT_FAST
++ bool "Fast Makefile generation"
++ default y
++ help
++ Configure Qt quickly by generating Makefiles only for library
++ and subdirectory targets.
++ All other Makefiles are created as wrappers, which will
++ in turn run qmake.
++
++config BR2_PACKAGE_QT_EXCEPTIONS
++ bool "Compilers exceptions"
++ help
++ Enable exceptions on compilers that support it.
++
++config BR2_PACKAGE_QT_OPTIMIZED_QMAKE
++ bool "Optimized qmake"
++ help
++ Build optimized qmake.
++
+ config BR2_PACKAGE_QT_LICENSE_APPROVED
+ bool "Approve free license"
+ help
+@@ -214,6 +256,11 @@
+ bool "Use Qt bundled libtiff"
+ endchoice
+
++config BR2_PACKAGE_QT_QWS_CURSOR
++ bool "QWS cursor"
++ help
++ Display a QWS cursor on the target GUI.
++
+ endif # BR2_PACKAGE_QT_GUI_MODULE
+
+ choice
+@@ -234,34 +281,98 @@
+ Use the shared zlib from the system.
+ endchoice
+
+-config BR2_PACKAGE_QT_EMB_PLATFORM
+- string "The embedded platform we are making Qt for"
+- default "arm" if BR2_arm
+- default "arm" if BR2_armeb
+- default "avr32" if BR2_avr32
+- default "x86" if BR2_i386
+- default "x86_64" if BR2_x86_64
+- default "mips" if BR2_mips
+- default "mips" if BR2_mipsel
+- default "ppc" if BR2_powerpc
++choice
++ prompt "The embedded platform we are making Qt for"
++ default BR2_PACKAGE_QT_ARM if BR2_arm
++ default BR2_PACKAGE_QT_ARM if BR2_armeb
++ default BR2_PACKAGE_QT_AVR32 if BR2_avr32
++ default BR2_PACKAGE_QT_X86 if BR2_i386
++ default BR2_PACKAGE_QT_X86_64 if BR2_x86_64
++ default BR2_PACKAGE_QT_MIPS if BR2_mips
++ default BR2_PACKAGE_QT_MIPS if BR2_mipsel
++ default BR2_PACKAGE_QT_POWERPC if BR2_powerpc
+ # Not that I really believe these will work..
+- default "generic" if BR2_alpha
+- default "generic" if BR2_chris
+- default "generic" if BR2_m68k
+- default "generic" if BR2_nios2
+- default "generic" if BR2_sh
+- default "generic" if BR2_sh64
+- default "generic" if BR2_sparc
++ default BR2_PACKAGE_QT_GENERIC if BR2_alpha
++ default BR2_PACKAGE_QT_GENERIC if BR2_chris
++ default BR2_PACKAGE_QT_GENERIC if BR2_m68k
++ default BR2_PACKAGE_QT_GENERIC if BR2_nios2
++ default BR2_PACKAGE_QT_GENERIC if BR2_sh
++ default BR2_PACKAGE_QT_GENERIC if BR2_sh64
++ default BR2_PACKAGE_QT_GENERIC if BR2_sparc
+ help
+ The target platform.
+
++config BR2_PACKAGE_QT_ARM
++ bool "arm"
++config BR2_PACKAGE_QT_AVR32
++ bool "avr32"
++config BR2_PACKAGE_QT_X86
++ bool "x86"
++config BR2_PACKAGE_QT_X86_64
++ bool "x86_64"
++config BR2_PACKAGE_QT_MIPS
++ bool "mips"
++config BR2_PACKAGE_QT_POWERPC
++ bool "powerpc"
++config BR2_PACKAGE_QT_GENERIC
++ bool "generic"
++endchoice
++
++
++config BR2_PACKAGE_QT_INSTALL_DIR
++ string "Install dir"
++ default "$(STAGING_DIR)/usr/local/Trolltech/QtEmbedded"
++ help
++ Directory where all files relatives to Qt will be installed.
++
++ The default is $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded
++
++menu "Misc"
++config BR2_PACKAGE_QT_NOMMX
++ bool "No MMX"
++ help
++ Do not compile with use of MMX instructions.
++config BR2_PACKAGE_QT_NO3DNOW
++ bool "No 3DNOW"
++ help
++ Do not compile with use of 3DNOW instructions.
++config BR2_PACKAGE_QT_NOSSE
++ bool "No SSE"
++ help
++ Do not compile with use of SSE instructions.
++config BR2_PACKAGE_QT_NOSSE2
++ bool "No SSE2"
++ help
++ Do not compile with use of SSE2 instructions.
++endmenu
++
+ source "package/qtopia4/Config.sql.in"
+ if BR2_PACKAGE_QT_GUI_MODULE
+ source "package/qtopia4/Config.gfx.in"
+ source "package/qtopia4/Config.mouse.in"
+ source "package/qtopia4/Config.keyboard.in"
++
++config BR2_PACKAGE_QT_QVFB
++ bool "QVFB"
++ help
++ Compile QVFB gfx, mouse and keyboard drivers
+ endif
+
++config BR2_PACKAGE_QT_ICONV
++ bool "Iconv"
++ help
++ Compile support for iconv.
++
++config BR2_PACKAGE_QT_DBUS
++ bool "DBus Module"
++ help
++ Compile the QtDBus module and dynamically load libdbus.
++
++config BR2_PACKAGE_QT_GLIB
++ bool "Glib"
++ help
++ Compile Glib support.
++
+ config BR2_PACKAGE_QT_XML
+ bool "XML Module"
+ default y
+@@ -325,4 +436,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/Config.mouse.in
+===================================================================
+--- buildroot.orig/package/qtopia4/Config.mouse.in 2010-07-23 12:16:59.000000000 +0200
++++ buildroot/package/qtopia4/Config.mouse.in 2010-07-28 15:31:36.000000000 +0200
+@@ -1,13 +1,17 @@
+ menu "Mouse drivers"
+
++menu "Drivers"
++
+ config BR2_PACKAGE_QT_MOUSE_PC
+ bool "pc"
++ default y
+
+ config BR2_PACKAGE_QT_MOUSE_BUS
+ bool "bus"
+
+ config BR2_PACKAGE_QT_MOUSE_LINUXTP
+ bool "linuxtp"
++ default y
+
+ config BR2_PACKAGE_QT_MOUSE_YOPY
+ bool "yopy"
+@@ -22,3 +26,30 @@
+ bool "qvfb"
+
+ endmenu
++
++menu "Plugins"
++
++config BR2_PACKAGE_QT_MOUSE_PLUGIN_BUS
++ bool "bus"
++
++config BR2_PACKAGE_QT_MOUSE_PLUGIN_LINUXIS
++ bool "linuxis"
++
++config BR2_PACKAGE_QT_MOUSE_PLUGIN_LINUXTP
++ bool "linuxtp"
++
++config BR2_PACKAGE_QT_MOUSE_PLUGIN_PC
++ bool "pc"
++
++config BR2_PACKAGE_QT_MOUSE_PLUGIN_TSLIB
++ bool "tslib"
++
++config BR2_PACKAGE_QT_MOUSE_PLUGIN_VR41XX
++ bool "vr41xx"
++
++config BR2_PACKAGE_QT_MOUSE_PLUGIN_YOPY
++ bool "yopy"
++
++endmenu
++
++endmenu
+Index: buildroot/package/qtopia4/Config.sql.in
+===================================================================
+--- buildroot.orig/package/qtopia4/Config.sql.in 2010-07-23 12:16:59.000000000 +0200
++++ buildroot/package/qtopia4/Config.sql.in 2010-07-28 15:30:42.000000000 +0200
+@@ -4,6 +4,9 @@
+ Compile Qt SQL Module
+
+ if BR2_PACKAGE_QT_SQL_MODULE
++
++menu "Drivers"
++
+ config BR2_PACKAGE_QT_MYSQL
+ bool "MySQL Driver"
+ help
+@@ -31,7 +34,7 @@
+ config BR2_PACKAGE_QT_SQLITE
+ bool "SQLite 3 Driver"
+ help
+- Build SQLite driver
++ Build SQLite 3 driver
+ If unsure, say n.
+
+ config BR2_PACKAGE_QT_SQLITE2
+@@ -39,4 +42,47 @@
+ help
+ Build SQLite 2 driver
+ If unsure, say n.
++
++endmenu
++
++menu "Plugins"
++
++config BR2_PACKAGE_QT_PLUGIN_MYSQL
++ bool "MySQL Plugin"
++ help
++ Build MySQL plugin
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_PLUGIN_IBASE
++ bool "iBase Plugin"
++ help
++ Build iBase plugin
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_PLUGIN_ODBC
++ bool "ODBC Plugin"
++ help
++ Build ODBC plugin
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_PLUGIN_PSQL
++ bool "PostgreSQL Plugin"
++ help
++ Build PostgreSQL plugin
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_PLUGIN_SQLITE
++ bool "SQLite 3 Plugin"
++ help
++ Build SQLite 3 plugin
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_PLUGIN_SQLITE2
++ bool "SQLite 2 Plugin"
++ help
++ Build SQLite 2 plugin
++ If unsure, say n.
++
++endmenu
++
+ endif
+Index: buildroot/package/qtopia4/qtopia4.mk
+===================================================================
+--- buildroot.orig/package/qtopia4/qtopia4.mk 2010-07-23 12:16:59.000000000 +0200
++++ buildroot/package/qtopia4/qtopia4.mk 2010-07-28 15:30:42.000000000 +0200
+@@ -20,6 +20,62 @@
+
+ QT_CONFIGURE:=#empty
+
++# x86x86fix
++# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux
++# host. It's unclear if this would happen on other hosts.
++ifneq ($(findstring pc-linux,$(BR2_GNU_BUILD_SUFFIX)),)
++ifeq ($(BR2_PACKAGE_QT_X86), y)
++QT_CONFIGURE+= -xplatform linux-g++ -arch x86 -platform linux-g++
++endif
++ifeq ($(BR2_PACKAGE_QT_X86_64), y)
++QT_CONFIGURE+= -xplatform linux-g++-64 -arch x86_64 -platform linux-g++
++endif
++endif
++# End of workaround.
++
++# Embedded platform
++ifeq ($(BR2_PACKAGE_QT_ARM),y)
++BR2_PACKAGE_QT_EMB_PLATFORM:=arm
++endif
++ifeq ($(BR2_PACKAGE_QT_AVR32),y)
++BR2_PACKAGE_QT_EMB_PLATFORM:=avr32
++endif
++ifeq ($(BR2_PACKAGE_QT_X86),y)
++BR2_PACKAGE_QT_EMB_PLATFORM:=x86
++endif
++ifeq ($(BR2_PACKAGE_QT_X86_64),y)
++BR2_PACKAGE_QT_EMB_PLATFORM:=x86_64
++endif
++ifeq ($(BR2_PACKAGE_QT_MIPS),y)
++BR2_PACKAGE_QT_EMB_PLATFORM:=mips
++endif
++ifeq ($(BR2_PACKAGE_QT_POWERPC),y)
++BR2_PACKAGE_QT_EMB_PLATFORM:=powerpc
++endif
++ifeq ($(BR2_PACKAGE_QT_GENERIC),y)
++BR2_PACKAGE_QT_EMB_PLATFORM:=generic
++endif
++
++ifneq ($(BR2_PACKAGE_QT_USE_EXISTING_INSTALL),y)
++TARGET_LIBS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-$(QT_VERSION)-$(BR2_PACKAGE_QT_EMB_PLATFORM)/lib
++TARGET_PLUGINS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-$(QT_VERSION)-$(BR2_PACKAGE_QT_EMB_PLATFORM)/plugins
++else
++BR2_PACKAGE_QT_EXIST_INSTALL_DIR:=$(call qstrip, $(BR2_PACKAGE_QT_EXIST_INSTALL_DIR))
++QT_EXIST_INSTALL_DIR_NAME:=`echo $(BR2_PACKAGE_QT_EXIST_INSTALL_DIR) | sed 's/.*\///'`
++TARGET_LIBS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/$(QT_EXIST_INSTALL_DIR_NAME)/lib
++TARGET_PLUGINS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/$(QT_EXIST_INSTALL_DIR_NAME)/plugins
++endif
++
++BR2_PACKAGE_QT_INSTALL_DIR:=$(call qstrip, $(BR2_PACKAGE_QT_INSTALL_DIR))
++ifneq ($(findstring $(STAGING_DIR)/usr/local/QtEmbedded,$(BR2_PACKAGE_QT_INSTALL_DIR)),)
++QT_CONFIGURE += -demosdir $(BR2_PACKAGE_QT_INSTALL_DIR)/QtDemos
++QT_CONFIGURE += -examplesdir $(BR2_PACKAGE_QT_INSTALL_DIR)/QtExamples
++QT_CONFIGURE += -hostprefix $(BR2_PACKAGE_QT_INSTALL_DIR)
++else
++QT_CONFIGURE += -prefix $(BR2_PACKAGE_QT_INSTALL_DIR)
++endif
++
++
+ ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
+ QT_CONFIGURE += -opensource -confirm-license
+ endif
+@@ -90,23 +146,15 @@
+ ### Display drivers
+ ifeq ($(BR2_PACKAGE_QT_GFX_LINUXFB),y)
+ QT_CONFIGURE += -qt-gfx-linuxfb
+-else
+-QT_CONFIGURE += -no-gfx-linuxfb
+ endif
+ ifeq ($(BR2_PACKAGE_QT_GFX_TRANSFORMED),y)
+ QT_CONFIGURE += -qt-gfx-transformed
+-else
+-QT_CONFIGURE += -no-gfx-transformed
+ endif
+ ifeq ($(BR2_PACKAGE_QT_GFX_QVFB),y)
+ QT_CONFIGURE += -qt-gfx-qvfb
+-else
+-QT_CONFIGURE += -no-gfx-qvfb
+ endif
+ ifeq ($(BR2_PACKAGE_QT_GFX_VNC),y)
+ QT_CONFIGURE += -qt-gfx-vnc
+-else
+-QT_CONFIGURE += -no-gfx-vnc
+ endif
+ ifeq ($(BR2_PACKAGE_QT_GFX_MULTISCREEN),y)
+ QT_CONFIGURE += -qt-gfx-multiscreen
+@@ -114,37 +162,55 @@
+ QT_CONFIGURE += -no-gfx-multiscreen
+ endif
+
++### Display plugins
++ifeq ($(BR2_PACKAGE_QT_GFX_PLUGIN_LINUXFB),y)
++QT_CONFIGURE += -plugin-gfx-linuxfb
++else
++ifneq ($(BR2_PACKAGE_QT_GFX_LINUXFB),y)
++QT_CONFIGURE += -no-gfx-linuxfb
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_GFX_PLUGIN_QVFB),y)
++QT_CONFIGURE += -plugin-gfx-qvfb
++else
++ifneq ($(BR2_PACKAGE_QT_GFX_QVFB),y)
++QT_CONFIGURE += -no-gfx-qvfb
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_GFX_PLUGIN_TRANSFORMED),y)
++QT_CONFIGURE += -plugin-gfx-transformed
++else
++ifneq ($(BR2_PACKAGE_QT_GFX_TRANSFORMED),y)
++QT_CONFIGURE += -no-gfx-transformed
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_GFX_PLUGIN_VNC),y)
++QT_CONFIGURE += -plugin-gfx-vnc
++else
++ifneq ($(BR2_PACKAGE_QT_GFX_VNC),y)
++QT_CONFIGURE += -no-gfx-vnc
++endif
++endif
++
+ ### Mouse drivers
+ ifeq ($(BR2_PACKAGE_QT_MOUSE_PC),y)
+ QT_CONFIGURE += -qt-mouse-pc
+-else
+-QT_CONFIGURE += -no-mouse-pc
+ endif
+ ifeq ($(BR2_PACKAGE_QT_MOUSE_BUS),y)
+ QT_CONFIGURE += -qt-mouse-bus
+-else
+-QT_CONFIGURE += -no-mouse-bus
+ endif
+ ifeq ($(BR2_PACKAGE_QT_MOUSE_LINUXTP),y)
+ QT_CONFIGURE += -qt-mouse-linuxtp
+-else
+-QT_CONFIGURE += -no-mouse-linuxtp
+ endif
+ ifeq ($(BR2_PACKAGE_QT_MOUSE_YOPY),y)
+ QT_CONFIGURE += -qt-mouse-yopy
+-else
+-QT_CONFIGURE += -no-mouse-yopy
+ endif
+ ifeq ($(BR2_PACKAGE_QT_MOUSE_VR41XX),y)
+ QT_CONFIGURE += -qt-mouse-vr41xx
+-else
+-QT_CONFIGURE += -no-mouse-vr41xx
+ endif
+ ifeq ($(BR2_PACKAGE_QT_MOUSE_TSLIB),y)
+ QT_CONFIGURE += -qt-mouse-tslib
+ QT_DEP_LIBS+=tslib
+-else
+-QT_CONFIGURE += -no-mouse-tslib
+ endif
+ ifeq ($(BR2_PACKAGE_QT_MOUSE_QVFB),y)
+ QT_CONFIGURE += -qt-mouse-qvfb
+@@ -152,6 +218,53 @@
+ QT_CONFIGURE += -no-mouse-qvfb
+ endif
+
++### Mouse plugins
++ifeq ($(BR2_PACKAGE_QT_MOUSE_PLUGIN_BUS),y)
++QT_CONFIGURE += -plugin-mouse-bus
++else
++ifneq ($(BR2_PACKAGE_QT_MOUSE_BUS),y)
++QT_CONFIGURE += -no-mouse-bus
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_MOUSE_PLUGIN_LINUXIS),y)
++QT_CONFIGURE += -plugin-mouse-linuxis
++endif
++ifeq ($(BR2_PACKAGE_QT_MOUSE_PLUGIN_LINUXTP),y)
++QT_CONFIGURE += -plugin-mouse-linuxtp
++else
++ifneq ($(BR2_PACKAGE_QT_MOUSE_LINUXTP),y)
++QT_CONFIGURE += -no-mouse-linuxtp
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_MOUSE_PLUGIN_PC),y)
++QT_CONFIGURE += -plugin-mouse-pc
++else
++ifneq ($(BR2_PACKAGE_QT_MOUSE_PC),y)
++QT_CONFIGURE += -no-mouse-pc
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_MOUSE_PLUGIN_TSLIB),y)
++QT_CONFIGURE += -plugin-mouse-tslib
++else
++ifneq ($(BR2_PACKAGE_QT_MOUSE_TSLIB),y)
++QT_CONFIGURE += -no-mouse-tslib
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_MOUSE_PLUGIN_VR41XX),y)
++QT_CONFIGURE += -plugin-mouse-vr41xx
++else
++ifneq ($(BR2_PACKAGE_QT_MOUSE_VR41XX),y)
++QT_CONFIGURE += -no-mouse-vr41xx
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_MOUSE_PLUGIN_YOPY),y)
++QT_CONFIGURE += -plugin-mouse-yopy
++else
++ifneq ($(BR2_PACKAGE_QT_MOUSE_YOPY),y)
++QT_CONFIGURE += -no-mouse-yopy
++endif
++endif
++
+ ### Keyboard drivers
+ ifeq ($(BR2_PACKAGE_QT_KEYBOARD_TTY),y)
+ QT_CONFIGURE += -qt-kbd-tty
+@@ -160,8 +273,6 @@
+ endif
+ ifeq ($(BR2_PACKAGE_QT_KEYBOARD_USB),y)
+ QT_CONFIGURE += -qt-kbd-usb
+-else
+-QT_CONFIGURE += -no-kbd-usb
+ endif
+ ifeq ($(BR2_PACKAGE_QT_KEYBOARD_SL5000),y)
+ QT_CONFIGURE += -qt-kbd-sl5000
+@@ -175,8 +286,6 @@
+ endif
+ ifeq ($(BR2_PACKAGE_QT_KEYBOARD_VR41XX),y)
+ QT_CONFIGURE += -qt-kbd-vr41xx
+-else
+-QT_CONFIGURE += -no-kbd-vr41xx
+ endif
+ ifeq ($(BR2_PACKAGE_QT_KEYBOARD_QVFB),y)
+ QT_CONFIGURE += -qt-kbd-qvfb
+@@ -184,6 +293,29 @@
+ QT_CONFIGURE += -no-kbd-qvfb
+ endif
+
++### Keyboard plugins
++ifeq ($(BR2_PACKAGE_QT_KEYBOARD_PLUGIN_LINUXIS),y)
++QT_CONFIGURE += -plugin-kbd-linuxis
++endif
++ifeq ($(BR2_PACKAGE_QT_KEYBOARD_PLUGIN_USB),y)
++QT_CONFIGURE += -plugin-kbd-usb
++else
++ifneq ($(BR2_PACKAGE_QT_KEYBOARD_USB),y)
++QT_CONFIGURE += -no-kbd-usb
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_KEYBOARD_PLUGIN_VR41XX),y)
++QT_CONFIGURE += -plugin-kbd-vr41xx
++else
++ifneq ($(BR2_PACKAGE_QT_KEYBOARD_VR41XX),y)
++QT_CONFIGURE += -no-kbd-vr41xx
++endif
++endif
++
++ifeq ($(BR2_PACKAGE_QT_QVFB),y)
++QT_CONFIGURE+= -qvfb
++endif
++
+ ifeq ($(BR2_PACKAGE_QT_DEBUG),y)
+ QT_CONFIGURE+= -debug
+ else
+@@ -196,6 +328,24 @@
+ QT_CONFIGURE+= -static
+ endif
+
++ifeq ($(BR2_PACKAGE_QT_FAST),y)
++QT_CONFIGURE+= -fast
++else
++QT_CONFIGURE+= -no-fast
++endif
++
++ifeq ($(BR2_PACKAGE_QT_EXCEPTIONS),y)
++QT_CONFIGURE+= -exceptions
++else
++QT_CONFIGURE+= -no-exceptions
++endif
++
++ifeq ($(BR2_PACKAGE_QT_OPTIMIZED_QMAKE),y)
++QT_CONFIGURE+= -optimized-qmake
++else
++QT_CONFIGURE+= -no-optimized-qmake
++endif
++
+ ifeq ($(BR2_ENDIAN),"LITTLE")
+ QT_CONFIGURE+= -little-endian
+ else
+@@ -256,8 +406,12 @@
+ endif
+ endif
+
++ifneq ($(BR2_PACKAGE_QT_QWS_CURSOR),y)
++QT_CONFIGURE+= -DQT_NO_QWS_CURSOR
++endif
+
+-QT_FONTS = $(addprefix $(STAGING_DIR)/usr/lib/fonts/, $(addsuffix *.qpf, \
++
++QT_FONTS = $(addprefix $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/fonts/, $(addsuffix *.qpf, \
+ $(if $(BR2_PACKAGE_QT_FONT_MICRO),micro) \
+ $(if $(BR2_PACKAGE_QT_FONT_FIXED),fixed) \
+ $(if $(BR2_PACKAGE_QT_FONT_HELVETICA),helvetica) \
+@@ -301,12 +455,35 @@
+ endif
+ ifeq ($(BR2_PACKAGE_QT_SQLITE),y)
+ QT_CONFIGURE+= -qt-sql-sqlite
+-else
+-QT_CONFIGURE+= -no-sql-sqlite
+ endif
+ ifeq ($(BR2_PACKAGE_QT_SQLITE2),y)
+ QT_CONFIGURE+= -qt-sql-sqlite2
+ endif
++
++# Qt SQL Plugins
++ifeq ($(BR2_PACKAGE_QT_PLUGIN_MYSQL),y)
++QT_CONFIGURE+= -plugin-sql-mysql
++endif
++ifeq ($(BR2_PACKAGE_QT_PLUGIN_IBASE),y)
++QT_CONFIGURE+= -plugin-sql-ibase
++endif
++ifeq ($(BR2_PACKAGE_QT_PLUGIN_ODBC),y)
++QT_CONFIGURE+= -plugin-sql-odbc
++endif
++ifeq ($(BR2_PACKAGE_QT_PLUGIN_PSQL),y)
++QT_CONFIGURE+= -plugin-sql-psql
++endif
++ifeq ($(BR2_PACKAGE_QT_PLUGIN_SQLITE),y)
++QT_CONFIGURE+= -plugin-sql-sqlite
++else
++ifneq ($(BR2_PACKAGE_QT_SQLITE),y)
++QT_CONFIGURE+= -no-sql-sqlite
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_PLUGIN_SQLITE2),y)
++QT_CONFIGURE+= -plugin-sql-sqlite2
++endif
++
+ else
+ # By default, no SQL driver is turned on by configure.
+ # but it seams sqlite isn't disabled despite what says
+@@ -314,6 +491,33 @@
+ QT_CONFIGURE+= -no-sql-sqlite
+ endif
+
++#Misc
++ifeq ($(BR2_PACKAGE_QT_NOMMX),y)
++QT_CONFIGURE+= -no-mmx
++endif
++ifeq ($(BR2_PACKAGE_QT_NO3DNOW),y)
++QT_CONFIGURE+= -no-3dnow
++endif
++ifeq ($(BR2_PACKAGE_QT_NOSSE),y)
++QT_CONFIGURE+= -no-sse
++endif
++ifeq ($(BR2_PACKAGE_QT_NOSSE2),y)
++QT_CONFIGURE+= -no-sse2
++endif
++
++ifeq ($(BR2_PACKAGE_QT_ICONV),y)
++QT_CONFIGURE+= -iconv
++else
++QT_CONFIGURE+= -no-iconv
++endif
++
++ifeq ($(BR2_PACKAGE_QT_DBUS),y)
++QT_CONFIGURE+= -dbus
++QT_DEP_LIBS+=dbus
++else
++QT_CONFIGURE+= -no-dbus
++endif
++
+ ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
+ QT_CONFIGURE+= -xmlpatterns -exceptions
+ else
+@@ -345,23 +549,20 @@
+ QT_CONFIGURE+= -no-stl
+ endif
+
+-# ccache and precompiled headers don't play well together
+-ifeq ($(BR2_CCACHE),y)
+-QT_CONFIGURE += -no-pch
++ifneq ($(BR2_PACKAGE_QT_DEMOS),y)
++QT_CONFIGURE+= -nomake demos
+ endif
+
+-BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
+-
+-# x86x86fix
+-# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux
+-# host. It's unclear if this would happen on other hosts.
+-ifneq ($(findstring pc-linux,$(BR2_GNU_BUILD_SUFFIX)),)
+-ifneq ($(findstring x86,$(BR2_PACKAGE_QT_EMB_PLATFORM)),)
+-QT_CONFIGURE+= -platform linux-g++
++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
+ endif
+-# End of workaround.
+
++ifneq ($(BR2_PACKAGE_QT_USE_EXISTING_INSTALL),y)
+ # Figure out what libs to install in the target
+ QT_LIBS=#empty
+ ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
+@@ -394,11 +595,18 @@
+ ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
+ QT_LIBS+= qt-scripttools
+ endif
++ifeq ($(BR2_PACKAGE_QT_DBUS),y)
++QT_LIBS+= qt-dbus
++endif
++else
++QT_LIBS+=qt-gui qt-sql qt-phonon qt-svg qt-network qt-webkit qt-xml qt-xmlpatterns qt-script qt-scripttools qt-dbus
++endif
++
+
+ QT_QMAKE_CONF:=$(QT_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++/qmake.conf
+
+ # Variable for other Qt applications to use
+-QT_QMAKE:=$(STAGING_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++
++QT_QMAKE:=$(BR2_PACKAGE_QT_INSTALL_DIR)/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QT_EMB_PLATFORM)-g++
+
+ ################################################################################
+ # QT_QMAKE_SET -- helper macro to set QMAKE_<variable> = <value> in
+@@ -425,10 +633,10 @@
+ # $(call QT_INSTALL_PLUGINS,sqldrivers)
+ # ################################################################################
+ define QT_INSTALL_PLUGINS
+- if [ -d $(STAGING_DIR)/usr/plugins/$(1) ]; then \
+- mkdir -p $(TARGET_DIR)/usr/plugins; \
+- cp -dpfr $(STAGING_DIR)/usr/plugins/$(1) $(TARGET_DIR)/usr/plugins/; \
+- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/$(1)/*; \
++ if [ -d $(BR2_PACKAGE_QT_INSTALL_DIR)/plugins/$(1) ]; then \
++ mkdir -p $(TARGET_PLUGINS_DIR); \
++ cp -dpfr $(BR2_PACKAGE_QT_INSTALL_DIR)/plugins/$(1) $(TARGET_PLUGINS_DIR)/; \
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_PLUGINS_DIR)/$(1)/*; \
+ fi
+ endef
+
+@@ -468,9 +676,9 @@
+ # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
+ # instead of the host then. So set PKG_CONFIG* manually.
+ (cd $(QT_TARGET_DIR); \
+- PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
++ PKG_CONFIG_SYSROOT_DIR="$(BR2_PACKAGE_QT_INSTALL_DIR)/.." \
+ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+- PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
++ PKG_CONFIG_PATH="$(BR2_PACKAGE_QT_INSTALL_DIR)/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
+ ./configure \
+ $(if $(VERBOSE),-verbose,-silent) \
+ -force-pkg-config \
+@@ -482,12 +690,7 @@
+ -no-nis \
+ -no-accessibility \
+ -no-separate-debug-info \
+- -prefix /usr \
+- -hostprefix $(STAGING_DIR)/usr \
+- -fast \
+ -no-rpath \
+- -nomake examples \
+- -nomake demos \
+ )
+ touch $@
+
+@@ -495,91 +698,146 @@
+ $(MAKE) -C $(QT_TARGET_DIR)
+ touch $@
+
+-$(STAGING_DIR)/usr/lib/libQtCore.la: $(QT_TARGET_DIR)/.compiled
+- $(MAKE) -C $(QT_TARGET_DIR) install
+-
+-qt-gui: $(STAGING_DIR)/usr/lib/libQtCore.la
+- mkdir -p $(TARGET_DIR)/usr/lib/fonts
++ifneq ($(BR2_PACKAGE_QT_USE_EXISTING_INSTALL),y)
++$(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la: $(QT_TARGET_DIR)/.compiled
++ sudo $(MAKE) -C $(QT_TARGET_DIR) install
++else
++$(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la:
++ if [ -d "$(BR2_PACKAGE_QT_EXIST_INSTALL_DIR)" ]; then \
++ sudo mkdir -p $(BR2_PACKAGE_QT_INSTALL_DIR); \
++ sudo chmod 777 $(BR2_PACKAGE_QT_X_INSTALL_DIR); \
++ sudo cp -Rf $(BR2_PACKAGE_QT_EXIST_INSTALL_DIR)/bin $(BR2_PACKAGE_QT_INSTALL_DIR); \
++ sudo cp -Rf $(BR2_PACKAGE_QT_EXIST_INSTALL_DIR)/include $(BR2_PACKAGE_QT_INSTALL_DIR); \
++ sudo cp -Rf $(BR2_PACKAGE_QT_EXIST_INSTALL_DIR)/lib $(BR2_PACKAGE_QT_INSTALL_DIR); \
++ sudo cp -Rf $(BR2_PACKAGE_QT_EXIST_INSTALL_DIR)/mkspecs $(BR2_PACKAGE_QT_INSTALL_DIR); \
++ sudo cp -Rf $(BR2_PACKAGE_QT_EXIST_INSTALL_DIR)/plugins $(BR2_PACKAGE_QT_INSTALL_DIR); \
++ else \
++ echo "$(BR2_PACKAGE_QT_EXIST_INSTALL_DIR): No such file or directory"; \
++ exit 2; \
++ fi
++endif
++
++qt-gui: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
++ $(call QT_INSTALL_PLUGINS,mousedrivers)
++ $(call QT_INSTALL_PLUGINS,gfxdrivers)
++ $(call QT_INSTALL_PLUGINS,kbddrivers)
++ mkdir -p $(TARGET_LIBS_DIR)/fonts
+ ifneq ($(QT_FONTS),)
+- cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts
++ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/fonts/*.qpf>/dev/null 2>/dev/null`; then \
++ cp -dpf $(QT_FONTS) $(TARGET_LIBS_DIR)/fonts; \
++ fi
+ endif
+ ifneq ($(BR2_PACKAGE_QT_NOFREETYPE),y)
+- cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
++ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/fonts/*.ttf>/dev/null 2>/dev/null`; then \
++ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/fonts/*.ttf $(TARGET_LIBS_DIR)/fonts; \
++ fi
+ endif
+ # Install image plugins if they are built
+ $(call QT_INSTALL_PLUGINS,imageformats)
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+- cp -dpf $(STAGING_DIR)/usr/lib/libQtGui.so.* $(TARGET_DIR)/usr/lib/
++ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtGui.so.*>/dev/null 2>/dev/null`; then \
++ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtGui.so.* $(TARGET_LIBS_DIR); \
++ fi
+ endif
+
+-qt-sql: $(STAGING_DIR)/usr/lib/libQtCore.la
++qt-sql: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
+ $(call QT_INSTALL_PLUGINS,sqldrivers)
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+- cp -dpf $(STAGING_DIR)/usr/lib/libQtSql.so.* $(TARGET_DIR)/usr/lib/
++ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtSql.so.*>/dev/null 2>/dev/null`; then \
++ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtSql.so.* $(TARGET_LIBS_DIR); \
++ fi
+ endif
+
+-qt-phonon: $(STAGING_DIR)/usr/lib/libQtCore.la
++qt-phonon: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
+ $(call QT_INSTALL_PLUGINS,phonon_backend)
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+- cp -dpf $(STAGING_DIR)/usr/lib/libphonon.so.* $(TARGET_DIR)/usr/lib/
++ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libphonon.so.*>/dev/null 2>/dev/null`; then \
++ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libphonon.so.* $(TARGET_LIBS_DIR); \
++ fi
+ endif
+
+-qt-svg: $(STAGING_DIR)/usr/lib/libQtCore.la
++qt-svg: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
+ $(call QT_INSTALL_PLUGINS,iconengines)
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+- cp -dpf $(STAGING_DIR)/usr/lib/libQtSvg.so.* $(TARGET_DIR)/usr/lib/
++ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtSvg.so.*>/dev/null 2>/dev/null`; then \
++ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtSvg.so.* $(TARGET_LIBS_DIR); \
++ fi
+ endif
+
+-qt-network: $(STAGING_DIR)/usr/lib/libQtCore.la
++qt-network: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+- cp -dpf $(STAGING_DIR)/usr/lib/libQtNetwork.so.* $(TARGET_DIR)/usr/lib/
++ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtNetwork.so.*>/dev/null 2>/dev/null`; then \
++ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtNetwork.so.* $(TARGET_LIBS_DIR); \
++ fi
+ endif
+
+-qt-webkit: $(STAGING_DIR)/usr/lib/libQtCore.la
++qt-webkit: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+- cp -dpf $(STAGING_DIR)/usr/lib/libQtWebKit.so.* $(TARGET_DIR)/usr/lib/
++ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtWebkit.so.*>/dev/null 2>/dev/null`; then \
++ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtWebKit.so.* $(TARGET_LIBS_DIR); \
++ fi
+ endif
+
+-qt-xml: $(STAGING_DIR)/usr/lib/libQtCore.la
++qt-xml: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+- cp -dpf $(STAGING_DIR)/usr/lib/libQtXml.so.* $(TARGET_DIR)/usr/lib/
++ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtXml.so.*>/dev/null 2>/dev/null`; then \
++ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtXml.so.* $(TARGET_LIBS_DIR); \
++ fi
+ endif
+
+-qt-xmlpatterns: $(STAGING_DIR)/usr/lib/libQtCore.la
++qt-xmlpatterns: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+- cp -dpf $(STAGING_DIR)/usr/lib/libQtXmlPatterns.so.* $(TARGET_DIR)/usr/lib/
++ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtXmlPatterns.so.*>/dev/null 2>/dev/null`; then \
++ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtXmlPatterns.so.* $(TARGET_LIBS_DIR); \
++ fi
+ endif
+
+-qt-script: $(STAGING_DIR)/usr/lib/libQtCore.la
++qt-script: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+- cp -dpf $(STAGING_DIR)/usr/lib/libQtScript.so.* $(TARGET_DIR)/usr/lib/
++ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtScript.so.*>/dev/null 2>/dev/null`; then \
++ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtScript.so.* $(TARGET_LIBS_DIR); \
++ fi
+ endif
+
+-qt-scripttools: $(STAGING_DIR)/usr/lib/libQtCore.la
++qt-scripttools: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+- cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
++ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtScriptTools.so.*>/dev/null 2>/dev/null`; then \
++ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtScriptTools.so.* $(TARGET_LIBS_DIR); \
++ fi
+ endif
+
++qt-dbus: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la
++ifeq ($(BR2_PACKAGE_QT_SHARED),y)
++ if `ls $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtDBus.so.*>/dev/null 2>/dev/null`; then \
++ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtDBus.so.* $(TARGET_LIBS_DIR); \
++ fi
++endif
+
+-$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
++$(TARGET_LIBS_DIR)/libQtCore.so.4: $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.la $(QT_LIBS)
+ # Strip all installed libs
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+- cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
+- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.*
++ cp -dpf $(BR2_PACKAGE_QT_INSTALL_DIR)/lib/libQtCore.so.* $(TARGET_LIBS_DIR)
++ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_LIBS_DIR)/libQt*.so.*
+ endif
+
+-qt: $(QT_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4
++ifneq ($(BR2_PACKAGE_QT_USE_EXISTING_INSTALL),y)
++qt: $(QT_DEP_LIBS) $(TARGET_LIBS_DIR)/libQtCore.so.4
++else
++qt: $(TARGET_LIBS_DIR)/libQtCore.so.4
++endif
+
+ qt-clean:
+ -$(MAKE) -C $(QT_TARGET_DIR) clean
+- -rm -rf $(TARGET_DIR)/usr/lib/fonts
++ -rm -rf $(BR2_PACKAGE_QT_INSTALL_DIR)
++ -rm -rf $(TARGET_LIBS_DIR)/fonts
+ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+- -rm $(TARGET_DIR)/usr/lib/libQt*.so.*
+- -rm $(TARGET_DIR)/usr/lib/libphonon.so.*
++ -rm $(TARGET_LIBS_DIR)/libQt*.so.*
++ -rm $(TARGET_LIBS_DIR)/libphonon.so.*
+ endif
+
+ qt-dirclean:
+ rm -rf $(QT_TARGET_DIR)
++ -rm -rf $(BR2_PACKAGE_QT_INSTALL_DIR)
+
+ #############################################################
+ #
+Index: buildroot/package/qtopia4/Config.keyboard.in
+===================================================================
+--- buildroot.orig/package/qtopia4/Config.keyboard.in 2010-07-23 12:16:59.000000000 +0200
++++ buildroot/package/qtopia4/Config.keyboard.in 2010-07-28 15:30:42.000000000 +0200
+@@ -1,7 +1,10 @@
+ menu "Keyboard drivers"
+
++menu "Drivers"
++
+ config BR2_PACKAGE_QT_KEYBOARD_TTY
+ bool "tty"
++ default y
+
+ config BR2_PACKAGE_QT_KEYBOARD_USB
+ bool "usb"
+@@ -19,3 +22,18 @@
+ bool "qvfb"
+
+ endmenu
++
++menu "Plugins"
++
++config BR2_PACKAGE_QT_KEYBOARD_PLUGIN_LINUXIS
++ bool "linuxis"
++
++config BR2_PACKAGE_QT_KEYBOARD_PLUGIN_USB
++ bool "usb"
++
++config BR2_PACKAGE_QT_KEYBOARD_PLUGIN_VR41XX
++ bool "vr41xx"
++
++endmenu
++
++endmenu
+Index: buildroot/package/qtopia4/Config.xcompile.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtopia4/Config.xcompile.in 2010-07-28 15:30:42.000000000 +0200
+@@ -0,0 +1,432 @@
++menuconfig BR2_PACKAGE_QT_CROSS_COMPILING
++ bool "Qt Cross compiling"
++ help
++ Allows to cross-compile Qt Embedded.
++
++if BR2_PACKAGE_QT_CROSS_COMPILING
++
++config BR2_PACKAGE_QT_X_USE_EXISTING_INSTALL
++ bool "Use existing Qt install"
++ help
++ If you don't want to entirely rebuild Qt and if you already have
++ a Qt installation with the same configuration that you want for
++ this project, you can use this existing installation.
++ Only tools and libraries needed for developing applications will
++ be copied.
++
++ Say N if you don't want to use an existing Qt
++ installation.
++
++if BR2_PACKAGE_QT_X_USE_EXISTING_INSTALL
++
++config BR2_PACKAGE_QT_X_EXIST_INSTALL_DIR
++ string "Existing Qt install dir"
++ help
++ Enter the existing Qt installation directory here.
++ Must be the Qt root path.
++endif
++
++config BR2_PACKAGE_QT_X_TARGET_INSTALL
++ bool "Install on target"
++ help
++ Install the cross-compiled version of Qt on the target.
++ Must be for an other platform than the first version.
++ If unsure, say N.
++
++config BR2_PACKAGE_QT_X_DEBUG
++ bool "Compile with debug support"
++ help
++ If unsure, say N.
++
++choice
++ prompt "Library type"
++ default BR2_PACKAGE_QT_X_SHARED
++ help
++ Selects the library type: Shared or Static
++
++config BR2_PACKAGE_QT_X_SHARED
++ bool "Shared library"
++ help
++ Create and use shared Qt libraries.
++ If you have multiple programs that depend on Qt or intend to use
++ plugins, say Y.
++
++config BR2_PACKAGE_QT_X_STATIC
++ bool "Static Library"
++ help
++ Create and use static Qt libraries.
++ If you don't have multiple programs on the target that depends on
++ Qt, then this will save you quite some of storage space.
++ If unsure, say Y.
++
++endchoice
++
++config BR2_PACKAGE_QT_X_FAST
++ bool "Fast Makefile generation"
++ default y
++ help
++ Configure Qt quickly by generating Makefiles only for library
++ and subdirectory targets.
++ All other Makefiles are created as wrappers, which will
++ in turn run qmake.
++
++config BR2_PACKAGE_QT_X_EXCEPTIONS
++ bool "Compilers exceptions"
++ help
++ Enable exceptions on compilers that support it.
++
++config BR2_PACKAGE_QT_X_OPTIMIZED_QMAKE
++ bool "Optimized qmake"
++ help
++ Build optimized qmake.
++
++config BR2_PACKAGE_QT_X_LICENSE_APPROVED
++ bool "Approve free license"
++ help
++ Select this if you approve one of the available free licenses for the
++ Qt4 library.
++ By doing this you will not be asked while the library is compiled.
++ Please read and understand the license terms before approving this.
++
++ LGPL v2.1: http://doc.trolltech.com/4.5/lgpl.html
++ GPL v3.0: http://doc.trolltech.com/4.5/gpl.html
++
++config BR2_PACKAGE_QT_X_QT3SUPPORT
++ bool "Compatibility with Qt3"
++ help
++ Turns on support for older Qt3. This will create an additional
++ library with proxy code and increase the space required on target.
++ If unsure say n.
++
++config BR2_PACKAGE_QT_X_GUI_MODULE
++ bool "Gui Module"
++ select BR2_PACKAGE_QT_X_NETWORK
++ default y
++ help
++ Turns on support for Gui applications. If your board doesn't have
++ video output, or you don't require Qt GUI, say n.
++
++if BR2_PACKAGE_QT_X_GUI_MODULE
++menu "Pixel depths"
++comment "Deselecting each option leads to Qt's default (8,16,32)"
++
++config BR2_PACKAGE_QT_X_PIXEL_DEPTH_1
++ bool "1 bpp, black/white"
++
++config BR2_PACKAGE_QT_X_PIXEL_DEPTH_4
++ bool "4 bpp, grayscale"
++
++config BR2_PACKAGE_QT_X_PIXEL_DEPTH_8
++ bool "8 bpp, paletted"
++ default y
++
++config BR2_PACKAGE_QT_X_PIXEL_DEPTH_12
++ bool "12 bpp, rgb 4-4-4"
++
++config BR2_PACKAGE_QT_X_PIXEL_DEPTH_15
++ bool "15 bpp, rgb 5-5-5"
++
++config BR2_PACKAGE_QT_X_PIXEL_DEPTH_16
++ bool "16 bpp, rgb 5-6-5"
++ default y
++
++config BR2_PACKAGE_QT_X_PIXEL_DEPTH_18
++ bool "18 bpp, rgb 6-6-6"
++
++config BR2_PACKAGE_QT_X_PIXEL_DEPTH_24
++ bool "24 bpp, rgb 8-8-8"
++
++config BR2_PACKAGE_QT_X_PIXEL_DEPTH_32
++ bool "32 bpp, argb 8-8-8-8 and rgb 8-8-8"
++ default y
++
++endmenu
++
++menu "Fonts"
++
++config BR2_PACKAGE_QT_X_FONT_MICRO
++ bool "micro"
++ default y
++
++config BR2_PACKAGE_QT_X_FONT_FIXED
++ bool "fixed"
++ default y
++
++config BR2_PACKAGE_QT_X_FONT_HELVETICA
++ bool "helvetica"
++ default y
++
++config BR2_PACKAGE_QT_X_FONT_JAPANESE
++ bool "japanese"
++
++config BR2_PACKAGE_QT_X_FONT_UNIFONT
++ bool "unicode"
++
++endmenu
++
++choice
++ prompt "freetype2 support"
++ default BR2_PACKAGE_QT_X_NOFREETYPE
++ help
++ Select freetype2 support.
++
++config BR2_PACKAGE_QT_X_NOFREETYPE
++ bool "no freetype2 support"
++ help
++ Do not compile in Freetype2 support.
++
++config BR2_PACKAGE_QT_X_QTFREETYPE
++ bool "Qt freetype2"
++ help
++ Use the libfreetype bundled with Qt.
++
++config BR2_PACKAGE_QT_X_SYSTEMFREETYPE
++ bool "System freetype2"
++ select BR2_PACKAGE_FREETYPE
++ help
++ Use shared libfreetype from the target system.
++ See http://www.freetype.org/
++endchoice
++
++config BR2_PACKAGE_QT_X_GIF
++ bool "Enable GIF support"
++ help
++ This compiles and installs the plugin for GIF reading support.
++
++config BR2_PACKAGE_QT_X_LIBMNG
++ bool "Enable libmng support"
++ help
++ This compiles and installs the plugin for MNG support.
++
++choice
++ prompt "JPEG support"
++ default BR2_PACKAGE_QT_X_NOJPEG
++ help
++ Select libjpeg support.
++
++config BR2_PACKAGE_QT_X_NOJPEG
++ bool "No jpeg support"
++ help
++ Disable JPEG support
++
++config BR2_PACKAGE_QT_X_SYSTEMJPEG
++ select BR2_PACKAGE_JPEG
++ bool "System libjpeg"
++ help
++ Link against system libjpeg
++
++config BR2_PACKAGE_QT_X_QTJPEG
++ bool "Use Qt bundled libjpeg"
++ help
++ Link against libjpeg proveded with Qt
++endchoice
++
++choice
++ prompt "PNG support"
++ default BR2_PACKAGE_QT_X_NOPNG
++ help
++ Select which library to use if PNG support should be enabled.
++
++config BR2_PACKAGE_QT_X_NOPNG
++ bool "No PNG support"
++
++config BR2_PACKAGE_QT_X_SYSTEMPNG
++ bool "System libpng"
++ select BR2_PACKAGE_LIBPNG
++
++config BR2_PACKAGE_QT_X_QTPNG
++ bool "Use Qt bundled libpng"
++endchoice
++
++choice
++ prompt "TIFF support"
++ default BR2_PACKAGE_QT_X_NOTIFF
++ help
++ Select which library to use if TIFF support should be enabled.
++
++config BR2_PACKAGE_QT_X_NOTIFF
++ bool "No TIFF support"
++
++config BR2_PACKAGE_QT_X_SYSTEMTIFF
++ bool "System libtiff"
++ select BR2_PACKAGE_TIFF
++
++config BR2_PACKAGE_QT_X_QTTIFF
++ bool "Use Qt bundled libtiff"
++endchoice
++
++config BR2_PACKAGE_QT_X_QWS_CURSOR
++ bool "QWS cursor"
++ help
++ Display a QWS cursor on the target GUI.
++
++endif # BR2_PACKAGE_QT_X_GUI_MODULE
++
++choice
++ prompt "zlib support"
++ default BR2_PACKAGE_QT_X_QTZLIB
++ help
++ Select zlib support.
++
++config BR2_PACKAGE_QT_X_QTZLIB
++ bool "Qt zlib"
++ help
++ Use the zlib bundled with Qt.
++
++config BR2_PACKAGE_QT_X_SYSTEMZLIB
++ bool "System zlib"
++ select BR2_PACKAGE_ZLIB
++ help
++ Use the shared zlib from the system.
++endchoice
++
++choice
++ prompt "The embedded platform we are making Qt for"
++ default BR2_PACKAGE_QT_X_X86
++ help
++ The target platform.
++
++config BR2_PACKAGE_QT_X_ARM
++ bool "arm"
++config BR2_PACKAGE_QT_X_AVR32
++ bool "avr32"
++config BR2_PACKAGE_QT_X_X86
++ bool "x86"
++config BR2_PACKAGE_QT_X_X86_64
++ bool "x86_64"
++config BR2_PACKAGE_QT_X_MIPS
++ bool "mips"
++config BR2_PACKAGE_QT_X_POWERPC
++ bool "powerpc"
++config BR2_PACKAGE_QT_X_GENERIC
++ bool "generic"
++endchoice
++
++config BR2_PACKAGE_QT_X_INSTALL_DIR
++ string "Install dir"
++ default "$(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-CC"
++ help
++ Directory where all files relatives to Qt will be installed.
++
++ The default is $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-CC
++
++menu "Misc"
++config BR2_PACKAGE_QT_X_NOMMX
++ bool "No MMX"
++ help
++ Do not compile with use of MMX instructions.
++config BR2_PACKAGE_QT_X_NO3DNOW
++ bool "No 3DNOW"
++ help
++ Do not compile with use of 3DNOW instructions.
++config BR2_PACKAGE_QT_X_NOSSE
++ bool "No SSE"
++ help
++ Do not compile with use of SSE instructions.
++config BR2_PACKAGE_QT_X_NOSSE2
++ bool "No SSE2"
++ help
++ Do not compile with use of SSE2 instructions.
++endmenu
++
++source "package/qtopia4/Config.xcompile.sql.in"
++if BR2_PACKAGE_QT_X_GUI_MODULE
++source "package/qtopia4/Config.xcompile.gfx.in"
++source "package/qtopia4/Config.xcompile.mouse.in"
++source "package/qtopia4/Config.xcompile.keyboard.in"
++
++config BR2_PACKAGE_QT_X_QVFB
++ bool "QVFB"
++ help
++ Compile QVFB gfx, mouse and keyboard drivers
++endif
++
++config BR2_PACKAGE_QT_X_ICONV
++ bool "Iconv"
++ help
++ Compile support for iconv.
++
++config BR2_PACKAGE_QT_X_DBUS
++ bool "DBus Module"
++ help
++ Compile the QtDBus module and dynamically load libdbus.
++
++config BR2_PACKAGE_QT_X_GLIB
++ bool "Glib"
++ help
++ Compile Glib support.
++
++config BR2_PACKAGE_QT_X_XML
++ bool "XML Module"
++ default y
++ help
++ Build the XML module.
++
++config BR2_PACKAGE_QT_X_XMLPATTERNS
++ bool "XML Patterns Module"
++ depends on BR2_PACKAGE_QT_XML
++ help
++ Build QtXmlPatterns module.
++ If unsure, say n
++
++config BR2_PACKAGE_QT_X_SVG
++ bool "SVG Module"
++ help
++ Build the SVG module.
++ If unsure, say n
++
++config BR2_PACKAGE_QT_X_NETWORK
++ bool "Network Module"
++ default y
++ help
++ Install the Network module.
++ if unsure, say y
++
++config BR2_PACKAGE_QT_X_WEBKIT
++ bool "WebKit Module"
++ depends on BR2_PACKAGE_QT_NETWORK
++ help
++ Build the WebKit module.
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_X_STL
++ bool "STL support"
++ help
++ Compile STL support.
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_X_OPENSSL
++ bool "Enable OpenSSL support"
++ depends on BR2_PACKAGE_QT_X_NETWORK
++ select BR2_PACKAGE_OPENSSL
++ help
++ Enable support for the OpenSSL encryption library. If you use
++ QSslSocket say y here, otherwise, say no to save space on the
++ target.
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_X_SCRIPT
++ bool "Script Module"
++ default y
++ help
++ Build the Qt Script module.
++ if unsure, say y.
++
++config BR2_PACKAGE_QT_X_SCRIPTTOOLS
++ bool "Script Tools Module"
++ depends on BR2_PACKAGE_QT_X_SCRIPT
++ help
++ Build the Qt Script Tools module.
++ if unsure, say n.
++
++config BR2_PACKAGE_QT_X_DEMOS
++ bool "Demos"
++ help
++ Build the Qt Demos.
++
++config BR2_PACKAGE_QT_X_EXAMPLES
++ bool "Examples"
++ help
++ Build the Qt Examples.
++
++endif # BR2_PACKAGE_QT_CROSS_COMPILING
+Index: buildroot/package/qtopia4/Config.xcompile.sql.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtopia4/Config.xcompile.sql.in 2010-07-28 15:30:42.000000000 +0200
+@@ -0,0 +1,88 @@
++menuconfig BR2_PACKAGE_QT_X_SQL_MODULE
++ bool "SQL Module"
++ help
++ Compile Qt SQL Module
++
++if BR2_PACKAGE_QT_X_SQL_MODULE
++
++menu "Drivers"
++
++config BR2_PACKAGE_QT_X_MYSQL
++ bool "MySQL Driver"
++ help
++ Build MySQL driver
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_X_IBASE
++ bool "iBase Driver"
++ help
++ Build iBase driver
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_X_ODBC
++ bool "ODBC Driver"
++ help
++ Build ODBC driver
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_X_PSQL
++ bool "PostgreSQL Driver"
++ help
++ Build PostgreSQL driver
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_X_SQLITE
++ bool "SQLite 3 Driver"
++ help
++ Build SQLite 3 driver
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_X_SQLITE2
++ bool "SQLite 2 Driver"
++ help
++ Build SQLite 2 driver
++ If unsure, say n.
++
++endmenu
++
++menu "Plugins"
++
++config BR2_PACKAGE_QT_X_PLUGIN_MYSQL
++ bool "MySQL Plugin"
++ help
++ Build MySQL plugin
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_X_PLUGIN_IBASE
++ bool "iBase Plugin"
++ help
++ Build iBase plugin
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_X_PLUGIN_ODBC
++ bool "ODBC Plugin"
++ help
++ Build ODBC plugin
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_X_PLUGIN_PSQL
++ bool "PostgreSQL Plugin"
++ help
++ Build PostgreSQL plugin
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_X_PLUGIN_SQLITE
++ bool "SQLite 3 Plugin"
++ help
++ Build SQLite 3 plugin
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_X_PLUGIN_SQLITE2
++ bool "SQLite 2 Plugin"
++ help
++ Build SQLite 2 plugin
++ If unsure, say n.
++
++endmenu
++
++endif
+Index: buildroot/package/qtopia4/Config.xcompile.gfx.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtopia4/Config.xcompile.gfx.in 2010-07-28 15:30:42.000000000 +0200
+@@ -0,0 +1,39 @@
++menu "Graphics drivers"
++
++menu "Drivers"
++
++config BR2_PACKAGE_QT_X_GFX_LINUXFB
++ bool "Linux Framebuffer"
++ default y
++
++config BR2_PACKAGE_QT_X_GFX_TRANSFORMED
++ bool "Transformed"
++
++config BR2_PACKAGE_QT_X_GFX_QVFB
++ bool "Qt Virtual Framebuffer"
++
++config BR2_PACKAGE_QT_X_GFX_VNC
++ bool "VNC"
++
++config BR2_PACKAGE_QT_X_GFX_MULTISCREEN
++ bool "multiscreen"
++
++endmenu
++
++menu "Plugins"
++
++config BR2_PACKAGE_QT_X_GFX_PLUGIN_LINUXFB
++ bool "Linux Framebuffer"
++
++config BR2_PACKAGE_QT_X_GFX_PLUGIN_QVFB
++ bool "Qt Virtual Framebuffer"
++
++config BR2_PACKAGE_QT_X_GFX_PLUGIN_TRANSFORMED
++ bool "Transformed"
++
++config BR2_PACKAGE_QT_X_GFX_PLUGIN_VNC
++ bool "VNC"
++
++endmenu
++
++endmenu
+Index: buildroot/package/qtopia4/Config.xcompile.keyboard.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtopia4/Config.xcompile.keyboard.in 2010-07-28 15:30:42.000000000 +0200
+@@ -0,0 +1,39 @@
++menu "Keyboard drivers"
++
++menu "Drivers"
++
++config BR2_PACKAGE_QT_X_KEYBOARD_TTY
++ bool "tty"
++ default y
++
++config BR2_PACKAGE_QT_X_KEYBOARD_USB
++ bool "usb"
++
++config BR2_PACKAGE_QT_X_KEYBOARD_SL5000
++ bool "sl5000"
++
++config BR2_PACKAGE_QT_X_KEYBOARD_YOPY
++ bool "yopy"
++
++config BR2_PACKAGE_QT_X_KEYBOARD_VR41XX
++ bool "vr41xx"
++
++config BR2_PACKAGE_QT_X_KEYBOARD_QVFB
++ bool "qvfb"
++
++endmenu
++
++menu "Plugins"
++
++config BR2_PACKAGE_QT_X_KEYBOARD_PLUGIN_LINUXIS
++ bool "linuxis"
++
++config BR2_PACKAGE_QT_X_KEYBOARD_PLUGIN_USB
++ bool "usb"
++
++config BR2_PACKAGE_QT_X_KEYBOARD_PLUGIN_VR41XX
++ bool "vr41xx"
++
++endmenu
++
++endmenu
+Index: buildroot/package/qtopia4/Config.xcompile.mouse.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtopia4/Config.xcompile.mouse.in 2010-07-28 15:30:42.000000000 +0200
+@@ -0,0 +1,55 @@
++menu "Mouse drivers"
++
++menu "Drivers"
++
++config BR2_PACKAGE_QT_X_MOUSE_PC
++ bool "pc"
++ default y
++
++config BR2_PACKAGE_QT_X_MOUSE_BUS
++ bool "bus"
++
++config BR2_PACKAGE_QT_X_MOUSE_LINUXTP
++ bool "linuxtp"
++ default y
++
++config BR2_PACKAGE_QT_X_MOUSE_YOPY
++ bool "yopy"
++
++config BR2_PACKAGE_QT_X_MOUSE_VR41XX
++ bool "vr41xx"
++
++config BR2_PACKAGE_QT_X_MOUSE_TSLIB
++ bool "tslib"
++
++config BR2_PACKAGE_QT_X_MOUSE_QVFB
++ bool "qvfb"
++
++endmenu
++
++menu "Plugins"
++
++config BR2_PACKAGE_QT_X_MOUSE_PLUGIN_BUS
++ bool "bus"
++
++config BR2_PACKAGE_QT_X_MOUSE_PLUGIN_LINUXIS
++ bool "linuxis"
++
++config BR2_PACKAGE_QT_X_MOUSE_PLUGIN_LINUXTP
++ bool "linuxtp"
++
++config BR2_PACKAGE_QT_X_MOUSE_PLUGIN_PC
++ bool "pc"
++
++config BR2_PACKAGE_QT_X_MOUSE_PLUGIN_TSLIB
++ bool "tslib"
++
++config BR2_PACKAGE_QT_X_MOUSE_PLUGIN_VR41XX
++ bool "vr41xx"
++
++config BR2_PACKAGE_QT_X_MOUSE_PLUGIN_YOPY
++ bool "yopy"
++
++endmenu
++
++endmenu
+Index: buildroot/package/qtopia4/qtopia4.xcompile.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtopia4/qtopia4.xcompile.mk 2010-07-28 15:30:42.000000000 +0200
+@@ -0,0 +1,863 @@
++######################################################################
++#
++# Qt Embedded Cross Compiling for Linux 4.5
++# http://www.qtsoftware.com/
++#
++# This makefile was originally composed by Thomas Lundquist <tho...@ze...>
++# Later heavily modified by buildroot developers
++#
++# BTW, this uses alot of FPU calls and it's pretty slow if you use
++# the kernels FPU emulation so it's better to choose soft float in the
++# buildroot config (and uClibc.config of course, if you have your own.)
++#
++######################################################################
++
++QT_X_VERSION:=4.5.3
++QT_X_SOURCE:=qt-embedded-linux-opensource-src-$(QT_X_VERSION).tar.gz
++QT_X_SITE:=http://get.qt.nokia.com/qt/source
++QT_X_CAT:=$(ZCAT)
++QT_X_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QT_X_VERSION)-CC
++QT_X_TMP_BUILD_DIR:=$(BUILD_DIR)/tmp
++QT_X_TMP_TARGET_DIR:=$(BUILD_DIR)/tmp/qt-embedded-linux-opensource-src-$(QT_X_VERSION)
++
++QT_X_CONFIGURE:=#empty
++
++
++# x86x86fix
++# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux
++# host. It's unclear if this would happen on other hosts.
++ifneq ($(findstring pc-linux,$(BR2_GNU_BUILD_SUFFIX)),)
++ifeq ($(BR2_PACKAGE_QT_X_X86), y)
++QT_X_CONFIGURE+= -xplatform linux-g++ -arch x86 -platform linux-g++
++endif
++ifeq ($(BR2_PACKAGE_QT_X_X86_64), y)
++QT_X_CONFIGURE+= -xplatform linux-g++-64 -arch x86_64 -platform linux-g++
++endif
++endif
++# End of workaround.
++
++# Embedded platform
++ifeq ($(BR2_PACKAGE_QT_X_ARM),y)
++BR2_PACKAGE_QT_X_EMB_PLATFORM:=arm
++endif
++ifeq ($(BR2_PACKAGE_QT_X_AVR32),y)
++BR2_PACKAGE_QT_X_EMB_PLATFORM:=avr32
++endif
++ifeq ($(BR2_PACKAGE_QT_X_X86),y)
++BR2_PACKAGE_QT_X_EMB_PLATFORM:=x86
++endif
++ifeq ($(BR2_PACKAGE_QT_X_X86_64),y)
++BR2_PACKAGE_QT_X_EMB_PLATFORM:=x86_64
++endif
++ifeq ($(BR2_PACKAGE_QT_X_MIPS),y)
++BR2_PACKAGE_QT_X_EMB_PLATFORM:=mips
++endif
++ifeq ($(BR2_PACKAGE_QT_X_POWERPC),y)
++BR2_PACKAGE_QT_X_EMB_PLATFORM:=powerpc
++endif
++ifeq ($(BR2_PACKAGE_QT_X_GENERIC),y)
++BR2_PACKAGE_QT_X_EMB_PLATFORM:=generic
++endif
++
++ifneq ($(BR2_PACKAGE_QT_X_USE_EXISTING_INSTALL),y)
++X_TARGET_LIBS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-$(QT_X_VERSION)-$(BR2_PACKAGE_QT_X_EMB_PLATFORM)/lib
++X_TARGET_PLUGINS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-$(QT_X_VERSION)-$(BR2_PACKAGE_QT_X_EMB_PLATFORM)/plugins
++else
++BR2_PACKAGE_QT_X_EXIST_INSTALL_DIR:=$(call qstrip, $(BR2_PACKAGE_QT_X_EXIST_INSTALL_DIR))
++QT_X_EXIST_INSTALL_DIR_NAME:=`echo $(BR2_PACKAGE_QT_X_EXIST_INSTALL_DIR) | sed 's/.*\///'`
++X_TARGET_LIBS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/$(QT_X_EXIST_INSTALL_DIR_NAME)/lib
++X_TARGET_PLUGINS_DIR:=$(TARGET_DIR)/usr/local/Trolltech/$(QT_X_EXIST_INSTALL_DIR_NAME)/plugins
++endif
++
++BR2_PACKAGE_QT_X_INSTALL_DIR:=$(call qstrip, $(BR2_PACKAGE_QT_X_INSTALL_DIR))
++ifneq ($(findstring $(STAGING_DIR)/usr/local/QtEmbedded-CC,$(BR2_PACKAGE_QT_X_INSTALL_DIR)),)
++QT_X_CONFIGURE += -demosdir $(BR2_PACKAGE_QT_X_INSTALL_DIR)/QtDemos
++QT_X_CONFIGURE += -examplesdir $(BR2_PACKAGE_QT_X_INSTALL_DIR)/QtExamples
++QT_X_CONFIGURE += -hostprefix $(BR2_PACKAGE_QT_X_INSTALL_DIR)
++else
++QT_X_CONFIGURE += -prefix $(BR2_PACKAGE_QT_X_INSTALL_DIR)
++endif
++
++
++ifeq ($(BR2_PACKAGE_QT_X_LICENSE_APPROVED),y)
++QT_X_CONFIGURE += -opensource -confirm-license
++endif
++
++# If you want extra tweaking you can copy
++# $(QT_TARGET_DIR)/src/corelib/global/qconfig-myfile.h
++# to the qt packages directory (where this .mk file is) and
++# remove the comment.
++# QT_QCONFIG_COMMAND:=-qconfig myfile
++#
++# For the options you can set in this file, look at
++# $(QT_TARGET_DIR)/src/corelib/global/qfeatures.txt
++#
++QT_X_QCONFIG_FILE:=package/qtopia4/qconfig-myfile.xcompile.h
++QT_X_QCONFIG_FILE_LOCATION:=/src/corelib/global/
++
++ifeq ($(BR2_LARGEFILE),y)
++QT_X_CONFIGURE+= -largefile
++else
++QT_X_CONFIGURE+= -no-largefile
++endif
++
++ifeq ($(BR2_PACKAGE_QT_X_QT3SUPPORT),y)
++QT_X_CONFIGURE+= -qt3support
++else
++QT_X_CONFIGURE+= -no-qt3support
++endif
++
++# ensure glib is built first if enabled for Qt's glib support
++ifeq ($(BR2_PACKAGE_X_LIBGLIB2),y)
++QT_X_DEP_LIBS+=libglib2
++endif
++
++
++### Pixel depths
++QT_X_PIXEL_DEPTHS := # empty
++ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_1),y)
++QT_X_PIXEL_DEPTHS += 1
++endif
++ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_4),y)
++QT_X_PIXEL_DEPTHS += 4
++endif
++ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_8),y)
++QT_X_PIXEL_DEPTHS += 8
++endif
++ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_12),y)
++QT_X_PIXEL_DEPTHS += 12
++endif
++ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_15),y)
++QT_X_PIXEL_DEPTHS += 15
++endif
++ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_16),y)
++QT_X_PIXEL_DEPTHS += 16
++endif
++ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_18),y)
++QT_X_PIXEL_DEPTHS += 18
++endif
++ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_24),y)
++QT_X_PIXEL_DEPTHS += 24
++endif
++ifeq ($(BR2_PACKAGE_QT_X_PIXEL_DEPTH_32),y)
++QT_X_PIXEL_DEPTHS += 32
++endif
++ifneq ($(QT_X_PIXEL_DEPTHS),)
++QT_X_CONFIGURE += -depths $(subst $(space),$(comma),$(strip $(QT_X_PIXEL_DEPTHS)))
++endif
++
++### Display drivers
++ifeq ($(BR2_PACKAGE_QT_X_GFX_LINUXFB),y)
++QT_X_CONFIGURE += -qt-gfx-linuxfb
++endif
++ifeq ($(BR2_PACKAGE_QT_X_GFX_TRANSFORMED),y)
++QT_X_CONFIGURE += -qt-gfx-transformed
++endif
++ifeq ($(BR2_PACKAGE_QT_X_GFX_QVFB),y)
++QT_X_CONFIGURE += -qt-gfx-qvfb
++endif
++ifeq ($(BR2_PACKAGE_QT_X_GFX_VNC),y)
++QT_X_CONFIGURE += -qt-gfx-vnc
++endif
++ifeq ($(BR2_PACKAGE_QT_X_GFX_MULTISCREEN),y)
++QT_X_CONFIGURE += -qt-gfx-multiscreen
++else
++QT_X_CONFIGURE += -no-gfx-multiscreen
++endif
++
++### Display plugins
++ifeq ($(BR2_PACKAGE_QT_X_GFX_PLUGIN_LINUXFB),y)
++QT_X_CONFIGURE += -plugin-gfx-linuxfb
++else
++ifneq ($(BR2_PACKAGE_QT_X_GFX_LINUXFB),y)
++QT_X_CONFIGURE += -no-gfx-linuxfb
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_X_GFX_PLUGIN_QVFB),y)
++QT_X_CONFIGURE += -plugin-gfx-qvfb
++else
++ifneq ($(BR2_PACKAGE_QT_X_GFX_QVFB),y)
++QT_X_CONFIGURE += -no-gfx-qvfb
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_X_GFX_PLUGIN_TRANSFORMED),y)
++QT_X_CONFIGURE += -plugin-gfx-transformed
++else
++ifneq ($(BR2_PACKAGE_QT_X_GFX_TRANSFORMED),y)
++QT_X_CONFIGURE += -no-gfx-transformed
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_X_GFX_PLUGIN_VNC),y)
++QT_X_CONFIGURE += -plugin-gfx-vnc
++else
++ifneq ($(BR2_PACKAGE_QT_X_GFX_VNC),y)
++QT_X_CONFIGURE += -no-gfx-vnc
++endif
++endif
++
++### Mouse drivers
++ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PC),y)
++QT_X_CONFIGURE += -qt-mouse-pc
++endif
++ifeq ($(BR2_PACKAGE_QT_X_MOUSE_BUS),y)
++QT_X_CONFIGURE += -qt-mouse-bus
++endif
++ifeq ($(BR2_PACKAGE_QT_X_MOUSE_LINUXTP),y)
++QT_X_CONFIGURE += -qt-mouse-linuxtp
++endif
++ifeq ($(BR2_PACKAGE_QT_X_MOUSE_YOPY),y)
++QT_X_CONFIGURE += -qt-mouse-yopy
++endif
++ifeq ($(BR2_PACKAGE_QT_X_MOUSE_VR41XX),y)
++QT_X_CONFIGURE += -qt-mouse-vr41xx
++endif
++ifeq ($(BR2_PACKAGE_QT_X_MOUSE_TSLIB),y)
++QT_X_CONFIGURE += -qt-mouse-tslib
++QT_X_DEP_LIBS+=tslib
++endif
++ifeq ($(BR2_PACKAGE_QT_X_MOUSE_QVFB),y)
++QT_X_CONFIGURE += -qt-mouse-qvfb
++else
++QT_X_CONFIGURE += -no-mouse-qvfb
++endif
++
++### Mouse plugins
++ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PLUGIN_BUS),y)
++QT_X_CONFIGURE += -plugin-mouse-bus
++else
++ifneq ($(BR2_PACKAGE_QT_X_MOUSE_BUS),y)
++QT_X_CONFIGURE += -no-mouse-bus
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PLUGIN_LINUXIS),y)
++QT_X_CONFIGURE += -plugin-mouse-linuxis
++endif
++ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PLUGIN_LINUXTP),y)
++QT_X_CONFIGURE += -plugin-mouse-linuxtp
++else
++ifneq ($(BR2_PACKAGE_QT_X_MOUSE_LINUXTP),y)
++QT_X_CONFIGURE += -no-mouse-linuxtp
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PLUGIN_PC),y)
++QT_X_CONFIGURE += -plugin-mouse-pc
++else
++ifneq ($(BR2_PACKAGE_QT_X_MOUSE_PC),y)
++QT_X_CONFIGURE += -no-mouse-pc
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PLUGIN_TSLIB),y)
++QT_X_CONFIGURE += -plugin-mouse-tslib
++else
++ifneq ($(BR2_PACKAGE_QT_X_MOUSE_TSLIB),y)
++QT_X_CONFIGURE += -no-mouse-tslib
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PLUGIN_VR41XX),y)
++QT_X_CONFIGURE += -plugin-mouse-vr41xx
++else
++ifneq ($(BR2_PACKAGE_QT_MOUSE_VR41XX),y)
++QT_X_CONFIGURE += -no-mouse-vr41xx
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_X_MOUSE_PLUGIN_YOPY),y)
++QT_X_CONFIGURE += -plugin-mouse-yopy
++else
++ifneq ($(BR2_PACKAGE_QT_X_MOUSE_YOPY),y)
++QT_X_CONFIGURE += -no-mouse-yopy
++endif
++endif
++
++### Keyboard drivers
++ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_TTY),y)
++QT_X_CONFIGURE += -qt-kbd-tty
++else
++QT_X_CONFIGURE += -no-kbd-tty
++endif
++ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_USB),y)
++QT_X_CONFIGURE += -qt-kbd-usb
++endif
++ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_SL5000),y)
++QT_X_CONFIGURE += -qt-kbd-sl5000
++else
++QT_X_CONFIGURE += -no-kbd-sl5000
++endif
++ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_YOPY),y)
++QT_X_CONFIGURE += -qt-kbd-yopy
++else
++QT_X_CONFIGURE += -no-kbd-yopy
++endif
++ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_VR41XX),y)
++QT_X_CONFIGURE += -qt-kbd-vr41xx
++endif
++ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_QVFB),y)
++QT_X_CONFIGURE += -qt-kbd-qvfb
++else
++QT_X_CONFIGURE += -no-kbd-qvfb
++endif
++
++### Keyboard plugins
++ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_PLUGIN_LINUXIS),y)
++QT_X_CONFIGURE += -plugin-kbd-linuxis
++endif
++ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_PLUGIN_USB),y)
++QT_X_CONFIGURE += -plugin-kbd-usb
++else
++ifneq ($(BR2_PACKAGE_QT_X_KEYBOARD_USB),y)
++QT_X_CONFIGURE += -no-kbd-usb
++endif
++endif
++ifeq ($(BR2_PACKAGE_QT_X_KEYBOARD_PLUGIN_VR41XX),y)
++QT_X_CONFIGURE += -plugin-kbd-vr41xx
++else
++ifneq ($(BR2_PACKAGE_QT_X_KEYBOARD_VR41XX),y)
++QT_X_CONFIGURE += -no-kbd-vr41xx
++endif
++endif
++
++ifeq ($(BR2_PACKAGE_QT_X_QVFB),y)
++QT_X_CONFIGURE+= -qvfb
++endif
++
++ifeq ($(BR2_PACKAGE_QT_X_DEBUG),y)
++QT_X_CONFIGURE+= -debug
++else
++QT_X_CONFIGURE+= -release
++endif
++
++ifeq ($(BR2_PACKAGE_QT_X_SHARED),y)
++QT_X_CONFIGURE+= -shared
++else
++QT_X_CONFIGURE+= -static
++endif
++
++ifeq ($(BR2_PACKAGE_QT_X_FAST),y)
++QT_X_CONFIGURE+= -fast
++else
++QT_X_CONFIGURE+= -no-fast
++endif
++
++ifeq ($(BR2_PACKAGE_QT_X_EXCEPTIONS),y)
++QT_X_CONFIGURE+= -exceptions
++else
++QT_X_CONFIGURE+= -no-exceptions
++endif
++
++ifeq ($(BR2_PACKAGE_QT_X_OPTIMIZED_QMAKE),y)
++QT_X_CONFIGURE+= -optimized-qmake
++else
++QT_X_CONFIGURE+= -no-optimized-qmake
++endif
++
++ifeq ($(BR2_ENDIAN),"LITTLE")
++QT_X_CONFIGURE+= -little-endian
++else
++QT_X_CONFIGURE+= -big-endian
++endif
++
++ifeq ($(BR2_PACKAGE_QT_X_GIF),y)
++QT_X_CONFIGURE+= -qt-gif
++else
++QT_X_CONFIGURE+= -no-gif
++endif
++
++ifeq ($(BR2_PACKAGE_QT_X_LIBMNG),y)
++QT_X_CONFIGURE+= -qt-libmng
++else
++QT_X_CONFIGURE+= -no-libmng
++endif
++
++ifeq ($(BR2_PACKAGE_QT_X_QTZLIB),y)
++QT_X_CONFIGURE+= -qt-zlib
++else
++ifeq ($(BR2_PACKAGE_QT_X_SYSTEMZLIB),y)
++QT_X_CONFIGURE+= -system-zlib
++QT_X_DEP_LIBS+=zlib
++endif
++endif
++
++ifeq ($(BR2_PACKAGE_QT_X_QTJPEG),y)
++QT_X_CONFIGURE+= -qt-libjpeg
++else
++ifeq ($(BR2_PACKAGE_QT_X_SYSTEMJPEG),y)
++QT_X_CONFIGURE+= -system-libjpeg
++QT_X_DEP_LIBS+=jpeg
++else
++QT_X_CONFIGURE+= -no-libjpeg
++endif
++endif
++
++ifeq ($(BR2_PACKAGE_QT_X_QTPNG),y)
++QT_X_CONFIGURE+= -qt-libpng
++else
++ifeq ($(BR2_PACKAGE_QT_X_SYSTEMPNG),y)
++QT_X_CONFIGURE+= -system-libpng
++QT_X_DEP_LIBS+=libpng
++else
++QT_X_CONFIGURE+= -no-libpng
++endif
++endif
++
++ifeq ($(BR2_PACKAGE_QT_X_QTTIFF),y)
++QT_X_CONFIGURE+= -qt-libtiff
++else
++ifeq ($(BR2_PACKAGE_QT_X_SYSTEMTIFF),y)
++QT_X_CONFIGURE+= -system-libtiff
++QT_X_DEP_LIBS+=tiff
++else
++...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2010-07-29 08:58:11
|
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 43d21daef0b92cb9fc69982d479ee69b3d346a76 (commit)
from 1794d9a4a59d0fa566494ca4dced70bf6e176cd1 (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 43d21daef0b92cb9fc69982d479ee69b3d346a76
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 29 10:57:20 2010 +0200
[BUILDROOT] Updates apf9328_test configs
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf9328_test/apf9328_test.config | 85 ++++++++++---------
buildroot/local/apf9328_test/linux-2.6.29.4.config | 14 ++-
buildroot/local/apf9328_test/u-boot/apf9328.h | 36 ++-------
buildroot/local/apf9328_test/uclibc-0.9.29.config | 4 +-
4 files changed, 63 insertions(+), 76 deletions(-)
diff --git a/buildroot/local/apf9328_test/apf9328_test.config b/buildroot/local/apf9328_test/apf9328_test.config
index f9a38a4..197586f 100644
--- a/buildroot/local/apf9328_test/apf9328_test.config
+++ b/buildroot/local/apf9328_test/apf9328_test.config
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Jun 24 16:15:39 2010
+# Thu Jul 29 10:40:19 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -326,40 +326,6 @@ BR2_READLINE=y
# BR2_PACKAGE_PCRE is not set
#
-# Armadeus specific packages
-#
-# BR2_PACKAGE_UUCP is not set
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
-
-#
-# bluez-utils not available (need dbus)
-#
-# BR2_PACKAGE_MESALIB is not set
-BR2_PACKAGE_FBTEST=y
-# BR2_PACKAGE_IMXSSI is not set
-# BR2_PACKAGE_DUMMY is not set
-# BR2_PACKAGE_SNES9X is not set
-# BR2_PACKAGE_AS_DEVICES is not set
-
-#
-# Armadeus specific tools/utilities
-#
-BR2_PACKAGE_ARMADEUS_DEMOS=y
-
-#
-# Choose the demos to install
-#
-BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
-BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
-BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
-BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
-BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
-BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
-
-#
# Other stuff
#
# BR2_PACKAGE_AT is not set
@@ -398,7 +364,33 @@ BR2_PACKAGE_LTRACE=y
# BR2_PACKAGE_STARTUP_NOTIFICATION is not set
BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_SUDO is not set
-# BR2_PACKAGE_XENOMAI is not set
+
+#
+# Armadeus specific tools/utilities
+#
+# BR2_PACKAGE_AD9889CTRL is not set
+# BR2_PACKAGE_AS_DEVICES is not set
+BR2_PACKAGE_CH7024CTRL=y
+BR2_PACKAGE_ARMADEUS_DEMOS=y
+
+#
+# Choose the demos to install
+#
+BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
+BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
+BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
+# BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE is not set
+BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
+BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
+BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_IMXREGS=y
+# BR2_PACKAGE_IMXSSI is not set
+BR2_PACKAGE_MAX5821CTRL=y
+BR2_PACKAGE_ARMADEUS_TESTSUITE=y
# BR2_DATABASE_SUPPORT is not set
BR2_TEXTEDIT_SUPPORT=y
# BR2_PACKAGE_ED is not set
@@ -414,6 +406,11 @@ BR2_NETWORK_SUPPORT=y
# BR2_PACKAGE_AXEL is not set
BR2_PACKAGE_BOA=y
# BR2_PACKAGE_BIND is not set
+# BR2_PACKAGE_BLUEZ_LIBS is not set
+
+#
+# bluez-utils not available (need dbus)
+#
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_DNSMASQ is not set
BR2_PACKAGE_DROPBEAR=y
@@ -492,15 +489,15 @@ BR2_PACKAGE_SOCKETCAN=y
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
# BR2_PACKAGE_USSP_PUSH is not set
+# BR2_PACKAGE_UUCP is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
# BR2_PACKAGE_WEBIF is not set
BR2_PACKAGE_WIRELESS_TOOLS=y
+# BR2_PACKAGE_WPA_SUPPLICANT is not set
BR2_BLOCKDEV_SUPPORT=y
-BR2_PACKAGE_ARMADEUS_TESTSUITE=y
-# BR2_PACKAGE_AD9889CTRL is not set
-BR2_PACKAGE_CH7024CTRL=y
+# BR2_PACKAGE_CWIID is not set
#
# dbus not available (need expat or libxml2)
@@ -517,12 +514,15 @@ BR2_PACKAGE_FPGAREGS=y
# BR2_PACKAGE_LIBFUSE is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
# BR2_PACKAGE_GPM is not set
+# BR2_PACKAGE_GPSD is not set
# BR2_PACKAGE_HAL is not set
# BR2_PACKAGE_HWDATA is not set
BR2_PACKAGE_I2C_TOOLS=y
# BR2_PACKAGE_INPUT_TOOLS is not set
BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IOSTAT is not set
+# BR2_PACKAGE_PICKIT2 is not set
+# BR2_PACKAGE_JOYSTICKTEST is not set
# BR2_PACKAGE_LCD4LINUX is not set
# BR2_PACKAGE_LIBAIO is not set
# BR2_PACKAGE_LIBRAW1394 is not set
@@ -580,6 +580,7 @@ BR2_PACKAGE_SETSERIAL=y
# BR2_PACKAGE_USBMOUNT is not set
# BR2_PACKAGE_USBUTILS is not set
# BR2_PACKAGE_WIPE is not set
+# BR2_PACKAGE_XENOMAI is not set
# BR2_PACKAGE_XFSPROGS is not set
BR2_AUDIO_SUPPORT=y
BR2_PACKAGE_ALSA_LIB=y
@@ -622,6 +623,7 @@ BR2_PACKAGE_MADPLAY_ALSA=y
BR2_PACKAGE_MPG123_ALSA=y
# BR2_PACKAGE_SPEEX is not set
# BR2_PACKAGE_FESTIVAL is not set
+# BR2_PACKAGE_FLITE is not set
BR2_GRAPHIC_SUPPORT=y
#
@@ -651,7 +653,9 @@ BR2_PACKAGE_JPEG=y
# BR2_PACKAGE_LIBART is not set
BR2_PACKAGE_LIBPNG=y
# BR2_PACKAGE_LIBUNGIF is not set
+# BR2_PACKAGE_MESALIB is not set
# BR2_PACKAGE_PIXMAN is not set
+# BR2_PACKAGE_PYGAME is not set
BR2_PACKAGE_SDL=y
#
@@ -698,6 +702,7 @@ BR2_PACKAGE_SDL_WATER=y
#
# BR2_PACKAGE_FBV is not set
# BR2_PACKAGE_FBSET is not set
+BR2_PACKAGE_FBTEST=y
BR2_PACKAGE_FBGRAB=y
#
@@ -867,7 +872,7 @@ BR2_TARGET_UBOOT_NETMASK=""
BR2_TARGET_UBOOT_ETHADDR=""
# BR2_TARGET_UBOOT_SILENT is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
-# BR2_TARGET_UBOOT_TOOL_ENV is not set
+BR2_TARGET_UBOOT_TOOL_ENV=y
BR2_TARGET_UBOOT_COPYTO=""
#
diff --git a/buildroot/local/apf9328_test/linux-2.6.29.4.config b/buildroot/local/apf9328_test/linux-2.6.29.4.config
index e05c77d..add5513 100644
--- a/buildroot/local/apf9328_test/linux-2.6.29.4.config
+++ b/buildroot/local/apf9328_test/linux-2.6.29.4.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Sun Sep 27 11:02:36 2009
+# Thu Jul 29 09:57:54 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -895,13 +895,15 @@ CONFIG_FB_MODE_HELPERS=y
# Frame buffer hardware drivers
#
CONFIG_FB_IMX=y
-CONFIG_FB_IMX_SHARP_LQ043_TFT=y
+# CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT is not set
+# CONFIG_FB_IMX_HITACHI_TX12D17VM1BDP_TFT is not set
# CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT is not set
-# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
-# CONFIG_FB_IMX_OPTREX_F51900_CSTN is not set
# CONFIG_FB_IMX_MOTOROLA_A910_TFT is not set
-# CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT is not set
+# CONFIG_FB_IMX_OPTREX_F51900_CSTN is not set
# CONFIG_FB_IMX_OPTREX_T51638D084_TFT is not set
+CONFIG_FB_IMX_SHARP_LQ043_TFT=y
+# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
+# CONFIG_FB_IMX_CUSTOM_LCD is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
@@ -1192,6 +1194,7 @@ CONFIG_ARMADEUS_GPIO_DRIVER=m
CONFIG_ARMADEUS_PPDEV_DRIVER=m
CONFIG_ARMADEUS_KEYPAD_DRIVER=m
CONFIG_ARMADEUS_MAX1027=m
+# CONFIG_ARMADEUS_MAX9768 is not set
#
# FPGA related
@@ -1223,6 +1226,7 @@ CONFIG_ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER=m
#
CONFIG_ARMADEUS_PWM_DRIVER=m
CONFIG_IMX_BACKLIGHT=m
+# CONFIG_HX5116_DISPLAY is not set
#
# Communication bus related
diff --git a/buildroot/local/apf9328_test/u-boot/apf9328.h b/buildroot/local/apf9328_test/u-boot/apf9328.h
index 4876403..158c59c 100644
--- a/buildroot/local/apf9328_test/u-boot/apf9328.h
+++ b/buildroot/local/apf9328_test/u-boot/apf9328.h
@@ -32,8 +32,8 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_ENV_VERSION "3.5"
-#define CONFIG_IDENT_STRING " apf9328 patch 3.8"
+#define CONFIG_ENV_VERSION "3.6"
+#define CONFIG_IDENT_STRING " apf9328 patch 3.9"
#define CONFIG_ARM920T 1 /* this is an ARM920T CPU */
#define CONFIG_IMX 1 /* in a Motorola MC9328MXL Chip */
@@ -118,7 +118,7 @@
#define CONFIG_MTDMAP "physmap-flash.0"
#define MTDIDS_DEFAULT "nor0=" CONFIG_MTDMAP
#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":256k(U-boot)ro," \
- "128k(U-boot_env),256k(firmware),2048k(kernel),-(root)"
+ "128k(U-boot_env),256k(firmware),2048k(kernel),-(rootfs)"
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
@@ -146,6 +146,8 @@
"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
"addjffsargs=setenv bootargs ${bootargs} " \
"root=/dev/mtdblock4 rootfstype=jffs2\0" \
+ "addubifsargs=setenv bootargs ${bootargs} " \
+ "ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \
"addmmcargs=setenv bootargs ${bootargs} " \
"root=${mmcroot} rootfstype=${mmcrootfstype}\0" \
"addipargs=setenv bootargs ${bootargs} " \
@@ -154,6 +156,8 @@
"run addnfsargs addipargs; bootm ${kernel_addr}\0" \
"jffsboot=setenv bootargs ${console} ${mtdparts};" \
"run addjffsargs addipargs; bootm ${kernel_addr}\0" \
+ "ubifsboot=setenv bootargs ${console} ${mtdparts};" \
+ "run addubifsargs addipargs; bootm ${kernel_addr}\0" \
"mmcboot=setenv bootargs ${console} ${mtdparts};" \
"run addmmcargs addipargs; bootm ${kernel_addr}\0" \
"firmware_autoload=0\0" \
@@ -1003,29 +1007,3 @@
|(((((CFG_CS5_OE_ASSERT_DLY*2)+CFG_HCLK_LGTH-1)/CFG_HCLK_LGTH)&0x0F)<<28))
#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 "apf9328_test"
-#ifdef CONFIG_BOARD_NAME
-#undef CONFIG_BOARD_NAME
-#endif
-#define CONFIG_BOARD_NAME apf9328
-#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 "apf9328_test"
-#ifdef CONFIG_BOARD_NAME
-#undef CONFIG_BOARD_NAME
-#endif
-#define CONFIG_BOARD_NAME apf9328
-#endif /* __BR2_ADDED_CONFIG_H */
diff --git a/buildroot/local/apf9328_test/uclibc-0.9.29.config b/buildroot/local/apf9328_test/uclibc-0.9.29.config
index 9a613de..cb71de0 100644
--- a/buildroot/local/apf9328_test/uclibc-0.9.29.config
+++ b/buildroot/local/apf9328_test/uclibc-0.9.29.config
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Jun 2 17:35:00 2009
+# Mon Nov 3 21:39:03 2008
#
# TARGET_alpha is not set
TARGET_arm=y
@@ -86,7 +86,7 @@ LDSO_BASE_FILENAME="ld.so"
UCLIBC_CTOR_DTOR=y
# HAS_NO_THREADS is not set
UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
LINUXTHREADS_OLD=y
UCLIBC_HAS_LFS=y
# MALLOC is not set
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-07-28 15:23:38
|
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 1794d9a4a59d0fa566494ca4dced70bf6e176cd1 (commit)
from 4bcbe72de1441b11f0ca3180b8472707f9c3f75b (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 1794d9a4a59d0fa566494ca4dced70bf6e176cd1
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jul 28 13:42:07 2010 +0200
[TOOLS] Add error message to gpio_set_value when corresponding /dev/gpio/PXnn is not available
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/gpio/gpio_helpers.sh | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/target/linux/modules/gpio/gpio_helpers.sh b/target/linux/modules/gpio/gpio_helpers.sh
index 928ee7c..06cf193 100755
--- a/target/linux/modules/gpio/gpio_helpers.sh
+++ b/target/linux/modules/gpio/gpio_helpers.sh
@@ -26,10 +26,14 @@ gpio_set_value()
{
GPIO=$1
VALUE=$2
- if [ "$VALUE" == "1" ]; then
- echo -ne "\x01" > $GPIO_DEV_DIR/$GPIO
+ if [ -c "$GPIO_DEV_DIR/$GPIO" ]; then
+ if [ "$VALUE" == "1" ]; then
+ echo -ne "\x01" > $GPIO_DEV_DIR/$GPIO
+ else
+ echo -ne "\x00" > $GPIO_DEV_DIR/$GPIO
+ fi
else
- echo -ne "\x00" > $GPIO_DEV_DIR/$GPIO
+ echo "$GPIO GPIO not usable !"
fi
}
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-07-28 09:58: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 4bcbe72de1441b11f0ca3180b8472707f9c3f75b (commit)
via ad815df596d75197ac1068a2578d000c8b8f40f4 (commit)
via 4031ee10b2c1a0ee07bb2ed5ce0b4c93d1e0dffd (commit)
via 7312588cfdc2368ba0639243697f8bb71d98034a (commit)
from 665b5d2e27a33e95f683a810c88044878d42f949 (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 4bcbe72de1441b11f0ca3180b8472707f9c3f75b
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jul 28 11:54:17 2010 +0200
[LINUX] Merge patches 344 & 339 into 281 one + add new correct OV96xx config define
commit ad815df596d75197ac1068a2578d000c8b8f40f4
Merge: 4031ee10b2c1a0ee07bb2ed5ce0b4c93d1e0dffd 665b5d2e27a33e95f683a810c88044878d42f949
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jul 27 20:28:16 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 4031ee10b2c1a0ee07bb2ed5ce0b4c93d1e0dffd
Merge: 7312588cfdc2368ba0639243697f8bb71d98034a fb72aedbc92c05f903c6d438ffb0b2c3fc2c607a
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jul 27 17:57:19 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 7312588cfdc2368ba0639243697f8bb71d98034a
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jul 27 17:55:08 2010 +0200
[LINUX] Makes ov96xx, ov7670 & ov3640 drivers compile when CONFIG_ADV_DEBUG is used
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/281-apf27-armadeus-add_apf27.c.patch | 142 ++++++++++++++++---
...deus-soc_camera_add_ov96xx_sensors_driver.patch | 21 ++--
.../2.6.29/339-apf27-armadeus-spidev.patch | 100 +--------------
.../2.6.29/344-apf27-spi_configuration.patch | 143 --------------------
...adeus-soc_camera-add_ov7670_sensor_driver.patch | 4 +-
...adeus-soc_camera-add_ov3640_sensor_driver.patch | 35 +++---
6 files changed, 150 insertions(+), 295 deletions(-)
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/344-apf27-spi_configuration.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index 40b465b..d47bea5 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -9,7 +9,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2010-06-29 16:12:27.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c 2010-07-28 10:43:04.000000000 +0200
@@ -0,0 +1,789 @@
+ /*
+ * apf27.c
@@ -803,8 +803,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2010-07-01 16:25:06.000000000 +0200
-@@ -0,0 +1,1049 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2010-07-28 10:59:04.000000000 +0200
+@@ -0,0 +1,1147 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -831,6 +831,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#include <linux/mtd/physmap.h>
+#include <asm/mach/flash.h>
+#include <linux/spi/spi.h>
++#include <linux/spi/spidev.h>
+#include <linux/i2c.h>
+#include <linux/serial.h>
+#include <linux/delay.h>
@@ -900,6 +901,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#ifdef CONFIG_CAN_MCP251X_MODULE
+#define CONFIG_CAN_MCP251X 1
+#endif
++#ifdef CONFIG_SPI_SPIDEV_MODULE
++#define CONFIG_SPI_SPIDEV 1
++#endif
+#ifdef CONFIG_IMX_BACKLIGHT_MODULE
+#define CONFIG_IMX_BACKLIGHT
+#endif
@@ -909,8 +913,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#ifdef CONFIG_VIDEO_MX27_MODULE
+#define CONFIG_VIDEO_MX27 1
+#endif
-+#ifdef CONFIG_VIDEO_OV96xx_MODULE
-+#define CONFIG_VIDEO_OV96xx 1
++#ifdef CONFIG_SOC_CAMERA_OV96XX_MODULE
++#define CONFIG_SOC_CAMERA_OV96XX 1
+#endif
+#ifdef CONFIG_ARMADEUS_PWM_DRIVER_MODULE
+#define CONFIG_PWM
@@ -945,7 +949,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+};
+
+/* I2C1 devices: RTC & Optionnal Camera */
-+# ifdef CONFIG_VIDEO_OV96xx
++# ifdef CONFIG_SOC_CAMERA_OV96XX
+static struct soc_camera_link ov96xx_iclink; /* declared later */
+#endif
+static struct i2c_board_info apf27dev_i2c_devices_bus0[] = {
@@ -957,7 +961,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .platform_data = NULL,
+ .irq = 0
+ },
-+# ifdef CONFIG_VIDEO_OV96xx
++# ifdef CONFIG_SOC_CAMERA_OV96XX
+ [1] = {
+ .type = "ov96xx",
+ .flags = 0, /* FIXME */
@@ -1201,15 +1205,17 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#endif /* CONFIG_SERIAL_IMX_UART6 */
+
+
-+/* Both APF27 SPI ports are used on APF27Dev */
-+#ifdef CONFIG_SPI
++/* SPI ports declarations */
++#ifdef CONFIG_SPI_MXC_SELECT1
+static int mxc_cspi0_pins[] = {
+ /* PD28_PF_CSPI1_SS0, Preferably use CS pin as GPIO */
+ PD29_PF_CSPI1_SCLK,
+ PD30_PF_CSPI1_MISO,
+ PD31_PF_CSPI1_MOSI
+};
++#endif /* CONFIG_SPI_MXC_SELECT1 */
+
++#ifdef CONFIG_SPI_MXC_SELECT2
+static int mxc_cspi1_pins[] = {
+ /* PD19_PF_CSPI2_SS2,
+ PD20_PF_CSPI2_SS1, Preferably use CS pin as GPIO
@@ -1218,11 +1224,25 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ PD23_PF_CSPI2_MISO,
+ PD24_PF_CSPI2_MOSI
+};
++#endif /* CONFIG_SPI_MXC_SELECT2 */
++
++#ifdef CONFIG_SPI_MXC_SELECT3
++static int mxc_cspi2_pins[] = {
++ /*
++ PE21_AF_CSPI3_SS,
++ Preferably use CS pin as GPIO
++ */
++ PE23_AF_CSPI3_SCLK,
++ PE18_AF_CSPI3_MISO,
++ PE22_AF_CSPI3_MOSI
++};
++#endif /* CONFIG_SPI_MXC_SELECT3 */
+
++#ifdef CONFIG_SPI_MXC_SELECT1
+static int gpio_spi0_active(struct platform_device *pdev)
+{
+ return mxc_gpio_setup_multiple_pins(mxc_cspi0_pins,
-+ ARRAY_SIZE(mxc_cspi0_pins), "CSPI0");
++ ARRAY_SIZE(mxc_cspi0_pins), "CSPI1");
+}
+
+static int gpio_spi0_inactive(struct platform_device *pdev)
@@ -1230,11 +1250,13 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ mxc_gpio_release_multiple_pins(mxc_cspi0_pins, ARRAY_SIZE(mxc_cspi0_pins));
+ return 0;
+}
++#endif /* CONFIG_SPI_MXC_SELECT1 */
+
++#ifdef CONFIG_SPI_MXC_SELECT2
+static int gpio_spi1_active(struct platform_device *pdev)
+{
+ return mxc_gpio_setup_multiple_pins(mxc_cspi1_pins,
-+ ARRAY_SIZE(mxc_cspi1_pins), "CSPI1");
++ ARRAY_SIZE(mxc_cspi1_pins), "CSPI2");
+}
+
+static int gpio_spi1_inactive(struct platform_device *pdev)
@@ -1242,21 +1264,48 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ mxc_gpio_release_multiple_pins(mxc_cspi1_pins, ARRAY_SIZE(mxc_cspi1_pins));
+ return 0;
+}
++#endif /* CONFIG_SPI_MXC_SELECT2 */
++
++#ifdef CONFIG_SPI_MXC_SELECT3
++static int gpio_spi2_active(struct platform_device *pdev)
++{
++ return mxc_gpio_setup_multiple_pins(mxc_cspi2_pins, ARRAY_SIZE(mxc_cspi2_pins), "CSPI3");
++}
++
++static int gpio_spi2_inactive(struct platform_device *pdev)
++{
++ mxc_gpio_release_multiple_pins(mxc_cspi2_pins, ARRAY_SIZE(mxc_cspi2_pins));
++ return 0;
++}
++#endif /* CONFIG_SPI_MXC_SELECT3 */
+
++#ifdef CONFIG_SPI_MXC_SELECT1
+static struct spi_imx_master imx_spi0_master_info = {
+ .num_chipselect = 1,
+ .enable_dma = 0,
+ .init = gpio_spi0_active,
+ .exit = gpio_spi0_inactive,
+};
++#endif /* CONFIG_SPI_MXC_SELECT1 */
+
++#ifdef CONFIG_SPI_MXC_SELECT2
+static struct spi_imx_master imx_spi1_master_info = {
-+ .num_chipselect = 2,
++ .num_chipselect = 3,
+ .enable_dma = 0,
+ .init = gpio_spi1_active,
+ .exit = gpio_spi1_inactive,
+};
-+#endif /* CONFIG_SPI */
++#endif /* CONFIG_SPI_MXC_SELECT2 */
++
++#ifdef CONFIG_SPI_MXC_SELECT3
++static struct spi_imx_master imx_spi2_master_info = {
++ .num_chipselect = 1,
++ .enable_dma = 0,
++ .init = gpio_spi2_active,
++ .exit = gpio_spi2_inactive,
++};
++#endif /* CONFIG_SPI_MXC_SELECT3 */
++
+
+
+/* APF27Dev has an optionnal 7 channels 10 bits ADC (SPI1) */
@@ -1305,7 +1354,6 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+};
+#endif /* CONFIG_ARMADEUS_MAX1027 */
+
-+
+/* APF27Dev has a SPI Touchscreen controller */
+#define TSC2101_INT 17
+#define TSC2101_CS (GPIO_PORTD | 21) /* SPI2_SS0 used as GPIO */
@@ -1398,6 +1446,38 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+#endif /* CONFIG_CAN_MCP251X */
+
+
++/* SPI2 can be used as userspace general SPI bus (CS 2) */
++#ifdef CONFIG_SPI_SPIDEV
++#define SPIDEV_CS (GPIO_PORTB | 17)
++
++static int spidev_pins[] = {
++ (SPIDEV_CS | GPIO_OUT | GPIO_GPIO),
++};
++
++static int spidev_init_gpio(void)
++{
++ gpio_set_value(SPIDEV_CS, 1);
++ return mxc_gpio_setup_multiple_pins(spidev_pins, ARRAY_SIZE(spidev_pins), "spidev");
++}
++
++/* Chip select command for spidev */
++static void spidev_cs(u32 command)
++{
++ if (command == SPI_CS_DEASSERT)
++ gpio_set_value(SPIDEV_CS, 1);
++ else
++ gpio_set_value(SPIDEV_CS, 0);
++}
++
++static struct spi_imx_chip spidev_hw = {
++ .cs_control = spidev_cs,
++};
++
++static struct spidev_platform_data apf27_spidev_config = {
++ .init = spidev_init_gpio,
++};
++#endif /* CONFIG_SPI_SPIDEV */
++
+static struct spi_board_info spi_board_info[] __initdata = {
+#ifdef CONFIG_ARMADEUS_MAX1027
+ {
@@ -1435,6 +1515,17 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ .platform_data = &apf27_mcp251x_config,
+ },
+#endif /* CONFIG_CAN_MCP251X */
++#ifdef CONFIG_SPI_SPIDEV
++ {
++ .modalias = "spidev",
++ .controller_data = &spidev_hw,
++ .max_speed_hz = 8000000, /* 8MHz */
++ .bus_num = 1, /* SPI2 */
++ .mode = SPI_MODE_1,
++ .chip_select = 2,
++ .platform_data = &apf27_spidev_config,
++ },
++#endif /* CONFIG_SPI_SPIDEV */
+};
+
+
@@ -1624,7 +1715,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+/* APF27Dev can have an optionnal Camera module extension using i.MX27 CSI */
+#ifdef CONFIG_VIDEO_MX27
-+# ifdef CONFIG_VIDEO_OV96xx
++# ifdef CONFIG_SOC_CAMERA_OV96XX
+#define OV9653_PWRDN (GPIO_PORTC | 30) /* SSI3_TX as POWERDOWN*/
+#define OV9653_RESET (GPIO_PORTC | 31) /* SSI3_CLK as RESET */
+
@@ -1651,7 +1742,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+static int apf27dev_camera_init(struct platform_device *pdev)
+{
-+# ifdef CONFIG_VIDEO_OV96xx
++# ifdef CONFIG_SOC_CAMERA_OV96XX
+ int err;
+
+ /* Setup PWRDN/RESET pins default value */
@@ -1669,7 +1760,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+
+static int apf27dev_camera_exit(struct platform_device *pdev)
+{
-+# ifdef CONFIG_VIDEO_OV96xx
++# ifdef CONFIG_SOC_CAMERA_OV96XX
+ mxc_gpio_release_multiple_pins(apf27dev_ov9653_ctl_pins,
+ ARRAY_SIZE(apf27dev_ov9653_ctl_pins));
+# endif
@@ -1687,7 +1778,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ MX27_CAMERA_SWAP16,
+};
+
-+# ifdef CONFIG_VIDEO_OV96xx
++# ifdef CONFIG_SOC_CAMERA_OV96XX
+static int ov96xx_power(struct device *dev, int state)
+{
+ printk(KERN_DEBUG "*** %s %d\n", __func__, state);
@@ -1822,10 +1913,17 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ i2c_register_board_info(1, apf27dev_i2c_devices_bus1,
+ ARRAY_SIZE(apf27dev_i2c_devices_bus1));
+#endif
-+#ifdef CONFIG_SPI
++#ifdef CONFIG_SPI_MXC_SELECT1
+ mxc_register_device(&mxc_spi_device0, &imx_spi0_master_info);
++#endif
++#ifdef CONFIG_SPI_MXC_SELECT2
+ mxc_register_device(&mxc_spi_device1, &imx_spi1_master_info);
+#endif
++#ifdef CONFIG_SPI_MXC_SELECT3
++ mxc_register_device(&mxc_spi_device2, &imx_spi2_master_info);
++#endif
++
++
+ platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
+
+#ifdef CONFIG_SPI_TSC2102
@@ -1837,7 +1935,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
+ /* Reserve "fixed" GPIOs */
+ tsc2101_init_fixed_gpio();
+#endif
-+#if defined (CONFIG_ARMADEUS_MAX1027) || defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X)
++#if defined (CONFIG_ARMADEUS_MAX1027) || defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X) || defined(CONFIG_SPI_SPIDEV)
+ spi_register_board_info(spi_board_info,
+ ARRAY_SIZE(spi_board_info));
+#endif
@@ -1857,7 +1955,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2010-06-29 16:12:27.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c 2010-07-28 10:43:04.000000000 +0200
@@ -0,0 +1,220 @@
+/*
+ * apf27-lcd.c
@@ -2082,7 +2180,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2010-06-29 16:12:27.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c 2010-07-28 10:43:04.000000000 +0200
@@ -0,0 +1,190 @@
+ /*
+ * apf27-dev-ext-apw.c
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-armadeus-soc_camera_add_ov96xx_sensors_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-armadeus-soc_camera_add_ov96xx_sensors_driver.patch
index 90c57c7..30bd4c2 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-armadeus-soc_camera_add_ov96xx_sensors_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-armadeus-soc_camera_add_ov96xx_sensors_driver.patch
@@ -7,7 +7,7 @@ Signed-off-by: Julien boibessot <jul...@ar...>
Index: linux-2.6.29.6/drivers/media/video/Kconfig
===================================================================
--- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2010-07-01 16:25:15.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-07-20 15:22:05.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-07-27 17:11:53.000000000 +0200
@@ -789,6 +789,13 @@
help
This is a ov772x camera driver
@@ -25,7 +25,7 @@ Index: linux-2.6.29.6/drivers/media/video/Kconfig
Index: linux-2.6.29.6/drivers/media/video/Makefile
===================================================================
--- linux-2.6.29.6.orig/drivers/media/video/Makefile 2010-07-01 16:25:15.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Makefile 2010-07-20 15:22:05.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Makefile 2010-07-27 17:11:53.000000000 +0200
@@ -145,6 +145,7 @@
obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o
obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o
@@ -37,8 +37,8 @@ Index: linux-2.6.29.6/drivers/media/video/Makefile
Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/media/video/ov96xx.c 2010-07-20 15:21:57.000000000 +0200
-@@ -0,0 +1,1673 @@
++++ linux-2.6.29.6/drivers/media/video/ov96xx.c 2010-07-27 17:01:32.000000000 +0200
+@@ -0,0 +1,1672 @@
+/*
+ * drivers/media/video/ov96xx.c
+ *
@@ -1357,37 +1357,36 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+static int ov96xx_get_register(struct soc_camera_device *icd,
-+ struct v4l2_register *reg)
++ struct v4l2_dbg_register *reg)
+{
+ struct ov96xx_sensor *ov96xx = container_of(icd, struct ov96xx_sensor, icd);
+ int ret;
+ u8 val;
+
-+ if (reg->match_type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
++ if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
+ return -EINVAL;
+
-+ if (reg->match_chip != ov96xx->i2c_client->addr)
++ if (reg->match.addr != ov96xx->i2c_client->addr)
+ return -ENODEV;
+
+ ret = ov96xx_read_reg(ov96xx->i2c_client, (u8)reg->reg, &val);
+ if (ret)
+ return ret;
-+
+ reg->val = val;
+
+ return 0;
+}
+
+static int ov96xx_set_register(struct soc_camera_device *icd,
-+ struct v4l2_register *reg)
++ struct v4l2_dbg_register *reg)
+{
+ struct ov96xx_sensor *ov96xx = container_of(icd, struct ov96xx_sensor, icd);
+ int ret;
+
-+ if (reg->match_type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
++ if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
+ return -EINVAL;
+
-+ if (reg->match_chip != ov96xx->i2c_client->addr)
++ if (reg->match.addr != ov96xx->i2c_client->addr)
+ return -ENODEV;
+
+ ret = ov96xx_write(ov96xx->i2c_client, (u8)reg->reg, (u8)reg->val);
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
index 0937459..ec7012c 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
@@ -1,107 +1,9 @@
-Add platform init call to spidev + spidev support for APF27Dev on
-SPI2 (spi1 for Linux).
+Add platform init call to spidev.
Signed-off-by: Fabien Marteau <fab...@ar...>
Signed-off-by: Gwenhaël Goavec-Merou <gw...@tr...>
---
-Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
-===================================================================
---- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2010-01-19 14:37:17.000000000 +0100
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2010-01-19 14:53:32.000000000 +0100
-@@ -24,6 +24,7 @@
- #include <linux/mtd/physmap.h>
- #include <asm/mach/flash.h>
- #include <linux/spi/spi.h>
-+#include <linux/spi/spidev.h>
- #include <linux/i2c.h>
- #include <linux/serial.h>
- #include <linux/delay.h>
-@@ -96,6 +97,9 @@
- #ifdef CONFIG_CAN_MCP251X_MODULE
- #define CONFIG_CAN_MCP251X 1
- #endif
-+#ifdef CONFIG_SPI_SPIDEV_MODULE
-+#define CONFIG_SPI_SPIDEV 1
-+#endif
- #ifdef CONFIG_IMX_BACKLIGHT_MODULE
- #define CONFIG_IMX_BACKLIGHT
- #endif
-@@ -443,7 +447,7 @@
- };
-
- static struct spi_imx_master imx_spi1_master_info = {
-- .num_chipselect = 2,
-+ .num_chipselect = 3,
- .enable_dma = 0,
- .init = gpio_spi1_active,
- .exit = gpio_spi1_inactive,
-@@ -590,6 +594,38 @@
- #endif /* CONFIG_CAN_MCP251X */
-
-
-+/* SPI2 can be used as userspace general SPI bus (CS 2) */
-+#ifdef CONFIG_SPI_SPIDEV
-+#define SPIDEV_CS (GPIO_PORTB | 17)
-+
-+static int spidev_pins[] = {
-+ (SPIDEV_CS | GPIO_OUT | GPIO_GPIO),
-+};
-+
-+static int spidev_init_gpio(void)
-+{
-+ gpio_set_value(SPIDEV_CS, 1);
-+ return mxc_gpio_setup_multiple_pins(spidev_pins, ARRAY_SIZE(spidev_pins), "spidev");
-+}
-+
-+/* Chip select command for spidev */
-+static void spidev_cs(u32 command)
-+{
-+ if (command == SPI_CS_DEASSERT)
-+ gpio_set_value(SPIDEV_CS, 1);
-+ else
-+ gpio_set_value(SPIDEV_CS, 0);
-+}
-+
-+static struct spi_imx_chip spidev_hw = {
-+ .cs_control = spidev_cs,
-+};
-+
-+static struct spidev_platform_data apf27_spidev_config = {
-+ .init = spidev_init_gpio,
-+};
-+#endif /* CONFIG_SPI_SPIDEV */
-+
- static struct spi_board_info spi_board_info[] __initdata = {
- #ifdef CONFIG_ARMADEUS_MAX1027
- {
-@@ -627,6 +663,17 @@
- .platform_data = &apf27_mcp251x_config,
- },
- #endif /* CONFIG_CAN_MCP251X */
-+#ifdef CONFIG_SPI_SPIDEV
-+ {
-+ .modalias = "spidev",
-+ .controller_data = &spidev_hw,
-+ .max_speed_hz = 8000000, /* 8MHz */
-+ .bus_num = 1, /* SPI2 */
-+ .mode = SPI_MODE_1,
-+ .chip_select = 2,
-+ .platform_data = &apf27_spidev_config,
-+ },
-+#endif /* CONFIG_SPI_SPIDEV */
- };
-
-
-@@ -1044,7 +1091,7 @@
- /* Reserve "fixed" GPIOs */
- tsc2101_init_fixed_gpio();
- #endif
--#if defined (CONFIG_ARMADEUS_MAX1027) || defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X)
-+#if defined (CONFIG_ARMADEUS_MAX1027) || defined (CONFIG_SPI_TSC2102) || defined (CONFIG_CAN_MCP251X) || defined(CONFIG_SPI_SPIDEV)
- spi_register_board_info(spi_board_info,
- ARRAY_SIZE(spi_board_info));
- #endif
Index: linux-2.6.29.6/drivers/spi/spidev.c
===================================================================
--- linux-2.6.29.6.orig/drivers/spi/spidev.c 2009-03-24 00:12:14.000000000 +0100
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/344-apf27-spi_configuration.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/344-apf27-spi_configuration.patch
deleted file mode 100644
index b725de8..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/344-apf27-spi_configuration.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
-===================================================================
---- linux-2.6.29.6.orig/arch/arm/mach-mx2/apf27-dev.c 2009-12-17 19:43:17.000000000 +0100
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c 2009-12-17 19:43:17.000000000 +0100
-@@ -371,15 +371,17 @@
- #endif /* CONFIG_SERIAL_IMX_UART6 */
-
-
--/* Both APF27 SPI ports are used on APF27Dev */
--#ifdef CONFIG_SPI
-+/* SPI ports declarations */
-+#ifdef CONFIG_SPI_MXC_SELECT1
- static int mxc_cspi0_pins[] = {
- /* PD28_PF_CSPI1_SS0, Preferably use CS pin as GPIO */
- PD29_PF_CSPI1_SCLK,
- PD30_PF_CSPI1_MISO,
- PD31_PF_CSPI1_MOSI
- };
-+#endif /* CONFIG_SPI_MXC_SELECT1 */
-
-+#ifdef CONFIG_SPI_MXC_SELECT2
- static int mxc_cspi1_pins[] = {
- /* PD19_PF_CSPI2_SS2,
- PD20_PF_CSPI2_SS1, Preferably use CS pin as GPIO
-@@ -388,11 +390,25 @@
- PD23_PF_CSPI2_MISO,
- PD24_PF_CSPI2_MOSI
- };
-+#endif /* CONFIG_SPI_MXC_SELECT2 */
-
-+#ifdef CONFIG_SPI_MXC_SELECT3
-+static int mxc_cspi2_pins[] = {
-+ /*
-+ PE21_AF_CSPI3_SS,
-+ Preferably use CS pin as GPIO
-+ */
-+ PE23_AF_CSPI3_SCLK,
-+ PE18_AF_CSPI3_MISO,
-+ PE22_AF_CSPI3_MOSI
-+};
-+#endif /* CONFIG_SPI_MXC_SELECT3 */
-+
-+#ifdef CONFIG_SPI_MXC_SELECT1
- static int gpio_spi0_active(struct platform_device *pdev)
- {
- return mxc_gpio_setup_multiple_pins(mxc_cspi0_pins,
-- ARRAY_SIZE(mxc_cspi0_pins), "CSPI0");
-+ ARRAY_SIZE(mxc_cspi0_pins), "CSPI1");
- }
-
- static int gpio_spi0_inactive(struct platform_device *pdev)
-@@ -400,11 +416,13 @@
- mxc_gpio_release_multiple_pins(mxc_cspi0_pins, ARRAY_SIZE(mxc_cspi0_pins));
- return 0;
- }
-+#endif /* CONFIG_SPI_MXC_SELECT1 */
-
-+#ifdef CONFIG_SPI_MXC_SELECT2
- static int gpio_spi1_active(struct platform_device *pdev)
- {
- return mxc_gpio_setup_multiple_pins(mxc_cspi1_pins,
-- ARRAY_SIZE(mxc_cspi1_pins), "CSPI1");
-+ ARRAY_SIZE(mxc_cspi1_pins), "CSPI2");
- }
-
- static int gpio_spi1_inactive(struct platform_device *pdev)
-@@ -412,21 +430,48 @@
- mxc_gpio_release_multiple_pins(mxc_cspi1_pins, ARRAY_SIZE(mxc_cspi1_pins));
- return 0;
- }
-+#endif /* CONFIG_SPI_MXC_SELECT2 */
-+
-+#ifdef CONFIG_SPI_MXC_SELECT3
-+static int gpio_spi2_active(struct platform_device *pdev)
-+{
-+ return mxc_gpio_setup_multiple_pins(mxc_cspi2_pins, ARRAY_SIZE(mxc_cspi2_pins), "CSPI3");
-+}
-+
-+static int gpio_spi2_inactive(struct platform_device *pdev)
-+{
-+ mxc_gpio_release_multiple_pins(mxc_cspi2_pins, ARRAY_SIZE(mxc_cspi2_pins));
-+ return 0;
-+}
-+#endif /* CONFIG_SPI_MXC_SELECT3 */
-
-+#ifdef CONFIG_SPI_MXC_SELECT1
- static struct spi_imx_master imx_spi0_master_info = {
- .num_chipselect = 1,
- .enable_dma = 0,
- .init = gpio_spi0_active,
- .exit = gpio_spi0_inactive,
- };
-+#endif /* CONFIG_SPI_MXC_SELECT1 */
-
-+#ifdef CONFIG_SPI_MXC_SELECT2
- static struct spi_imx_master imx_spi1_master_info = {
- .num_chipselect = 3,
- .enable_dma = 0,
- .init = gpio_spi1_active,
- .exit = gpio_spi1_inactive,
- };
--#endif /* CONFIG_SPI */
-+#endif /* CONFIG_SPI_MXC_SELECT2 */
-+
-+#ifdef CONFIG_SPI_MXC_SELECT3
-+static struct spi_imx_master imx_spi2_master_info = {
-+ .num_chipselect = 1,
-+ .enable_dma = 0,
-+ .init = gpio_spi2_active,
-+ .exit = gpio_spi2_inactive,
-+};
-+#endif /* CONFIG_SPI_MXC_SELECT3 */
-+
-
-
- /* APF27Dev has an optionnal 7 channels 10 bits ADC (SPI) */
-@@ -475,7 +520,6 @@
- };
- #endif /* CONFIG_ARMADEUS_MAX1027 */
-
--
- /* APF27Dev has a SPI Touchscreen controller */
- #define TSC2101_INT 17
- #define TSC2101_CS (GPIO_PORTD | 21) /* SPI2_SS0 used as GPIO */
-@@ -1048,10 +1092,17 @@
- i2c_register_board_info(1, apf27dev_i2c_devices_bus1,
- ARRAY_SIZE(apf27dev_i2c_devices_bus1));
- #endif
--#ifdef CONFIG_SPI
-+#ifdef CONFIG_SPI_MXC_SELECT1
- mxc_register_device(&mxc_spi_device0, &imx_spi0_master_info);
-+#endif
-+#ifdef CONFIG_SPI_MXC_SELECT2
- mxc_register_device(&mxc_spi_device1, &imx_spi1_master_info);
- #endif
-+#ifdef CONFIG_SPI_MXC_SELECT3
-+ mxc_register_device(&mxc_spi_device2, &imx_spi2_master_info);
-+#endif
-+
-+
- platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
-
- #ifdef CONFIG_SPI_TSC2102
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/356-armadeus-soc_camera-add_ov7670_sensor_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/356-armadeus-soc_camera-add_ov7670_sensor_driver.patch
index 7ac44ab..7d42352 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/356-armadeus-soc_camera-add_ov7670_sensor_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/356-armadeus-soc_camera-add_ov7670_sensor_driver.patch
@@ -1612,10 +1612,10 @@ Index: linux-2.6.29.6/drivers/media/video/ov7670_soc.c
+ .get_control = ov7670_get_control,
+ .set_control = ov7670_set_control,
+ .get_chip_id = ov7670_get_chip_id,
-+#ifdef CONFIG_VIDEO_ADV_DEBUG
++/*#ifdef CONFIG_VIDEO_ADV_DEBUG
+ .get_register = ov7670_get_register,
+ .set_register = ov7670_set_register,
-+#endif
++#endif*/
+};
+
+static int __init
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 3e2e6c4..f777fd3 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-15 12:19:53.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-07-15 12:22:35.000000000 +0200
+--- 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
@@ -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-15 12:22:50.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Makefile 2010-07-15 12:23:50.000000000 +0200
+--- 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
@@ -144,6 +144,7 @@
obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o
obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o
@@ -30,8 +30,8 @@ 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-20 15:06:58.000000000 +0200
-@@ -0,0 +1,1460 @@
++++ linux-2.6.29.6/drivers/media/video/ov3640.c 2010-07-27 12:28:15.000000000 +0200
+@@ -0,0 +1,1459 @@
+/*
+ *
+ * Copyright 2010 Armadeus Systems
@@ -1234,40 +1234,39 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640.c
+
+#ifdef CONFIG_VIDEO_ADV_DEBUG
+static int ov3640_get_register(struct soc_camera_device *icd,
-+ struct v4l2_register *reg)
++ struct v4l2_dbg_register *reg)
+{
+ struct ov3640_sensor *ov3640 = container_of(icd, struct ov3640_sensor, icd);
+ int ret;
+ u8 val;
+
-+ if (reg->match_type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
++ if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xffff)
+ return -EINVAL;
+
-+ if (reg->match_chip != ov3640->i2c_client->addr)
++ if (reg->match.addr != ov3640->i2c_client->addr)
+ return -ENODEV;
+
-+ ret = ov3640_read(ov3640->i2c_client, (u8)reg->reg, &val);
++ ret = ov3640_read(ov3640->i2c_client, (u16)reg->reg, &val);
+ if (ret)
+ return ret;
-+
+ reg->val = val;
+
+ return 0;
+}
+
+static int ov3640_set_register(struct soc_camera_device *icd,
-+ struct v4l2_register *reg)
++ struct v4l2_dbg_register *reg)
+{
+ struct ov3640_sensor *ov3640 = container_of(icd, struct ov3640_sensor, icd);
+ int ret;
+
-+ if (reg->match_type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
++ if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xffff)
+ return -EINVAL;
+
-+ if (reg->match_chip != ov3640->i2c_client->addr)
++ if (reg->match.addr != ov3640->i2c_client->addr)
+ return -ENODEV;
+
-+ ret = ov3640_write(ov3640->i2c_client, (u8)reg->reg, (u8)reg->val);
++ ret = ov3640_write(ov3640->i2c_client, (u16)reg->reg, (u8)reg->val);
+ if (ret)
+ return ret;
+
@@ -1495,7 +1494,7 @@ 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-19 11:00:29.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/ov3640_regs.h 2010-07-23 11:41:31.000000000 +0200
@@ -0,0 +1,596 @@
+/*
+ * drivers/media/video/ov3640_regs.h
@@ -2095,8 +2094,8 @@ Index: linux-2.6.29.6/drivers/media/video/ov3640_regs.h
+#endif /* ifndef OV3640_REGS_H */
Index: linux-2.6.29.6/include/media/v4l2-chip-ident.h
===================================================================
---- linux-2.6.29.6.orig/include/media/v4l2-chip-ident.h 2010-07-19 15:43:26.000000000 +0200
-+++ linux-2.6.29.6/include/media/v4l2-chip-ident.h 2010-07-19 15:44:12.000000000 +0200
+--- linux-2.6.29.6.orig/include/media/v4l2-chip-ident.h 2010-07-23 11:36:30.000000000 +0200
++++ linux-2.6.29.6/include/media/v4l2-chip-ident.h 2010-07-23 11:41:31.000000000 +0200
@@ -62,6 +62,7 @@
V4L2_IDENT_OV7670 = 250,
V4L2_IDENT_OV7720 = 251,
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-07-27 16:26:30
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 665b5d2e27a33e95f683a810c88044878d42f949 (commit)
from fb72aedbc92c05f903c6d438ffb0b2c3fc2c607a (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 665b5d2e27a33e95f683a810c88044878d42f949
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jul 27 18:25:57 2010 +0200
[buildroot] fix buildroot patches
-----------------------------------------------------------------------
Summary of changes:
...ickit2-add_pickit2_programer_command_line.patch | 28 ++++++++++----------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch b/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
index 339b209..8324d5f 100644
--- a/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
+++ b/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
@@ -2,22 +2,10 @@ Adding PICKit 2 programmer command line
Signed-off-by: Fabien Marteau <fab...@ar...>
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in 2010-07-13 11:16:25.000000000 +0200
-+++ buildroot/package/Config.in 2010-07-13 11:16:25.000000000 +0200
-@@ -268,6 +268,7 @@
- source "package/i2c-tools/Config.in"
- source "package/input-tools/Config.in"
- source "package/iostat/Config.in"
-+source "package/pickit2/Config.in"
- source "package/lcd4linux/Config.in"
- source "package/libaio/Config.in"
- source "package/libraw1394/Config.in"
Index: buildroot/package/pickit2/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pickit2/Config.in 2010-07-13 11:16:25.000000000 +0200
++++ buildroot/package/pickit2/Config.in 2010-07-27 18:12:41.000000000 +0200
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_PICKIT2
+ bool "pickit2"
@@ -27,7 +15,7 @@ Index: buildroot/package/pickit2/Config.in
Index: buildroot/package/pickit2/pickit2.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pickit2/pickit2.mk 2010-07-13 11:22:52.000000000 +0200
++++ buildroot/package/pickit2/pickit2.mk 2010-07-27 18:12:41.000000000 +0200
@@ -0,0 +1,50 @@
+#############################################################
+#
@@ -79,3 +67,15 @@ Index: buildroot/package/pickit2/pickit2.mk
+TARGETS+=pickit2
+endif
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-07-27 18:16:48.000000000 +0200
++++ buildroot/package/Config.in 2010-07-27 18:21:54.000000000 +0200
+@@ -268,6 +268,7 @@
+ source "package/i2c-tools/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/iostat/Config.in"
++source "package/pickit2/Config.in"
+ source "package/joysticktest/Config.in"
+ source "package/lcd4linux/Config.in"
+ source "package/libaio/Config.in"
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-07-27 13:08: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 fb72aedbc92c05f903c6d438ffb0b2c3fc2c607a (commit)
via 0f0427e9b4e58c9e513db9e82f4cbde8ad857815 (commit)
from 53368b143adfe51c95f15afbcb78bad2a504cf30 (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 fb72aedbc92c05f903c6d438ffb0b2c3fc2c607a
Merge: 0f0427e9b4e58c9e513db9e82f4cbde8ad857815 53368b143adfe51c95f15afbcb78bad2a504cf30
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jul 27 15:08:11 2010 +0200
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 0f0427e9b4e58c9e513db9e82f4cbde8ad857815
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jul 27 15:07:15 2010 +0200
[buildroot] Put joysticktest package in the right place in menuconfig
-----------------------------------------------------------------------
Summary of changes:
...est-add_joystick_testing_programs_package.patch | 23 ++++++++++---------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
index 3b234cf..c86d77c 100644
--- a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
+++ b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
@@ -4,19 +4,20 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-07-13 15:27:37.000000000 +0200
-+++ buildroot/package/Config.in 2010-07-13 15:36:09.000000000 +0200
-@@ -499,5 +499,6 @@
-
- # various games packages
- source "package/games/Config.in"
+--- buildroot.orig/package/Config.in 2010-07-27 14:34:09.000000000 +0200
++++ buildroot/package/Config.in 2010-07-27 15:02:52.000000000 +0200
+@@ -268,6 +268,7 @@
+ source "package/i2c-tools/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/iostat/Config.in"
+source "package/joysticktest/Config.in"
-
- endmenu
+ source "package/lcd4linux/Config.in"
+ source "package/libaio/Config.in"
+ source "package/libraw1394/Config.in"
Index: buildroot/package/joysticktest/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/Config.in 2010-07-13 15:27:37.000000000 +0200
++++ buildroot/package/joysticktest/Config.in 2010-07-27 14:34:09.000000000 +0200
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_JOYSTICKTEST
+ bool "joysticktest"
@@ -25,7 +26,7 @@ Index: buildroot/package/joysticktest/Config.in
Index: buildroot/package/joysticktest/joysticktest.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/joysticktest.mk 2010-07-13 15:34:38.000000000 +0200
++++ buildroot/package/joysticktest/joysticktest.mk 2010-07-27 14:34:09.000000000 +0200
@@ -0,0 +1,51 @@
+#############################################################
+#
@@ -81,7 +82,7 @@ Index: buildroot/package/joysticktest/joysticktest.mk
Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch 2010-07-13 15:28:27.000000000 +0200
++++ buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch 2010-07-27 14:34:09.000000000 +0200
@@ -0,0 +1,198 @@
+Index: joystick-1.2.15/Makefile
+===================================================================
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-07-26 14:19: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 53368b143adfe51c95f15afbcb78bad2a504cf30 (commit)
via 5f21a704bc59a4b27d2fd59eb0381a331dcb524c (commit)
via ccb2d7fd128a8596fc4ee0dde592aa12c3fed359 (commit)
from 150a6501ff21f4e0a908ebe8f2ca3ee6c07559da (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 53368b143adfe51c95f15afbcb78bad2a504cf30
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jul 26 15:24:00 2010 +0200
Updates Changelog for 3.3 release
commit 5f21a704bc59a4b27d2fd59eb0381a331dcb524c
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jul 26 15:22:00 2010 +0200
[BUILD] Add As_Devices in release/changes.sh
commit ccb2d7fd128a8596fc4ee0dde592aa12c3fed359
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jul 23 18:13:49 2010 +0200
[BUILDROOT] [AS_DEVICES] Config.in: Indentation + spelling + 'n' is default value for options
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 385 ++++++++++++++++++++++-
buildroot/package/armadeus/as_devices/Config.in | 14 +-
release/changes.sh | 9 +-
3 files changed, 397 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3b00243..92f1702 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,390 @@
----
-Changes since last release
+Changes in release 3.3 (no due date yet)
+
+* Wiki dump available here: http://www.armadeus.com/assos_downloads/wiki/armadeus-3.3_wiki_dump.tar.gz
+
+* Corrected Tickets/Bugs:
+
+* Buildroot:
+ Main changes: Preliminary support of BR 2010.05, APW support (Bluetooth, WiFi, GSM & GPS),
+ toolchain moved to EABI by default, wiimote support, liburg, Qt 4.5.3
+
+ List of all changes:
+ - [AS_DEVICES] Config.in: Indentation + spelling + 'n' is default value for options
+ - Updates freescale-tools package: now uses DOWNLOAD helper and copy libvpu to staging_dir
+ - Updates apf27 test config
+ - Adding pickit2 in default configuration (not set)
+ - Add pickit2 programer command line program
+ - adding joysticktest package in cleanup script
+ - unselect joysticktest package in config file
+ - Add Hokuyo's URG series sensor control library/tools
+ - Bump NcFTP version to 3.2.4
+ - Continue the (not armadeus specific) packages moving to BR patches. Only bluez3 remains.
+ - update config file for package cwiid (apf9328)
+ - update config file for package cwiid
+ - Add Cwiid package (wiimote control). Thanks YaGeek!
+ - move xenomai package as patch against BR
+ - Updates uucp & ussp-push packages patches
+ - move fbtest, fbgrab, allegro, sdlwater, snes9x, mesa, lcd4linux, socketcan, pymysql, pyserial & slideshow packages as patches against BR
+ - Put sdl, openssh & tslib modifications as patches against BR
+ - unversion package/audio/
+ - Convert lmbench package as a patch
+ - Add gpsd package
+ - Change system timezone to France (CET+0).
+ - Add openobex and ussp-push packages
+ - Qt: bump version to 4.5.3
+ - Put correct as_devices version in package
+ - Busybox: add chat (Automated conversational script with a modem) to default configs
+ - Add new mount point for FLASH partitions (/mnt/flash)
+ - Remove /mnt/mmc of target skeleton (use /media/mmc instead)
+ - Add a file in rootfs to know armadeus bsp version used
+ - wolf3d: remove old unsupported version and replace it with wolf4SDL
+ - Put correct BR2_GNU_TARGET_SUFFIX in apf9328 default configs
+ - apf938: updates default configs
+ - Put correct BR2_GNU_TARGET_SUFFIX in apf27 BR default configs
+ - gcc 4.2.x: add support for --with-abi=aapcs-linux configure option
+ - strace: needs patches when compiled with EABI
+ - bluez: improve package config/compilation
+ - Move package/bluez -> package/bluez3, as there will be a bluez4 package
+ - Updates GCC optim & EABI flags selection for ARM926
+ - Upgrade bluez to 3.36 and do a little cleanup while we are at it.
+ - Cleanup default /etc/profile
+ - Convert lsof to DOWNLOAD helper
+ - aumix SITE has changed
+ - Correct bad dependencies in wpa_supplicant package
+ - Add spanish keymap
+ - Remove warnings in fbtest and uucp Config.in
+ - Add wpa_supplicant package (for 2008.11 Buildroot)
+ - Add an infrastructure to install closed source linux-firmwares
+ - Add a new (hidden) BR2_CPU_NAME config variable and updates imxregs accordingly
+ - Bluez: remove no more needed serial port speed patch
+ - Convert toolchain makefiles to DOWNLOAD helper (uClibc 0.9.29 archive moved)
+ - restore target_suffix original value
+ - Fixed apf27 UBoot boardname
+ - mkfs.ubifs depends on mtd-host
+ - toolchain/gcc: don't enable libssp support (as on BR mainline)
+ - Updates Imagemagick package to latest BR state
+ - Moves buildroot/package/audio/madplay/madplay-audio-alsa.patch as a BR patch
+ - Fixes freescale-tools building due to recent packages move
+ - Don't uncompress .gitignore from BR archive if present
+ - fbgrab depends on zlib
+ - Definitly remove no more used 'package/mplayer/' directory
+ - Removes buildroot/package/mplayer/mplayer-1.0rc1-armv4.patch from GIT and replace it by a patch in buildroot/patches/
+ - Add the possibility to choose Buildroot version + regroup configurable options in main Makefile
+ - Make armadeus specific packages source dir relative to BR's TOPDIR and not BUILD_DIR (which is not stable between BR versions). Remove implicit uClibc dependancy while we are at it.
+ - Makes TOPDIR an absolute path
+ - Pygame's tslib patch doesn't work properly on *Ubuntu 9.10. Mark it as 'to fix'
+ - Removes unused/unapplied sdl_ttf patch
+ - Merge curl -> libcurl transition in one single patch
+ - Cleanup patches after some packages moved in package/armadeus/
+ - Move freescale-tools package to package/armadeus/
+ - Move imxregs package to package/armadeus/
+ - Move fpgaregs package to package/armadeus/
+ - Move ch7024ctrl & max5821ctrl packages to package/armadeus/
+ - Move ad9889ctrl package to package/armadeus/
+ - Adds Flite speech synthesis engine
+ - Add uucp package (preliminary) + updates cleanup_buildroot.sh
+ - libsndfile: some refinements after moving to autotools infrastructure and 1.0.21 version
+ - Moves libsndfile to autotools infrastructure and bump version to 1.0.21 while we are at it.
+ - Add ALSA's arecord to default config
+ - mtd-utils GIT archive format has changed: handle the new one.
+ - Updates APF27 default Linux config
+ - Makes Quake visible/selectable in menuconfig
+ - Add 2 new mount points in default rootfs for removable media: /media/mmc and /media/usbdisk.
+ - Add a fix for uClibc 0.9.29 to be able to set speed > 115200 on serial terminal/port
+ - Fixes snes9x package build
+ - Fix 070-add_ad9889ctl_package.patch due to recent moves of packages to armadeus/
+ - Move as_devices to newly created package/armadeus/
+ - Move imxssi to newly created package/armadeus/
+ - Rename armadeus-tests.mk
+ - Move Drivers Helpers to newly created package/armadeus/
+ - Move TestSuite to newly created package/armadeus/
+ - Add an armadeus/ dir in package/ to store all Armadeus specific utilities/tools building. Add it demos stuff to start.
+ - Makes Mesa compile again and be better installed (Thanks CimCim)
+ - Improve GPM installation
+ - Add a button Quit in ts_test to be able to terminate the application even when SIGINT is not handled.
+ - Adding jstest and jscal joystick testing programs
+ - [XENOMAI] Renamed patch to distinguish if it's needed before or after adeos and Xenomai modifications
+ - [XENOMAI] Patch to prevent System freeze on mxc with gpio generated interrupts
+ - Fixed default uboot configuration with regular buildroot release
+ - uClibc: takes errno from kernel instead of redefining them
+ - [UCLIBC] Correct the times() system call: some return values are returned as errors but shouldn't
+ - Patch for uClibc : add the function trunc to avoid problems during Qt cross-compiling.
+ - [UCLIBC] Add patch for ftruncate64() pb on ARM EABI (uClibc 0.9.29)
+ - Busybox: add patch to be able to use serial speed of 921600 from stty
+ New BR support:
+ - [2010.05] Add LBreakout2 and LTris games
+ - [2010.05] Add series of patches from BR mainline to make ipsec-tools compiling better
+ - [2010.05] Add pywebradio, e-uae & opentyrian packages
+ - [2010.05] Reactivates ad9889, fpgaregs and imxregs in default APF27 config
+ - [2010.05] Makes the configurations correctly detected
+ - [2010.05] Reactivates Armadeus specific packages in menuconfig
+ - [2010.05] Updates apf27 default config
+ - [2010.05] Updates apf9328 & apf27 default configs
+ - [2010.05] Add some minor patches for arm926t arch
+ - [2010.05] Also adds Cwiid...
+ - [2010.05] Updates patches so that they apply without errors
+ - Upgrade new BR support from 2010.02 to 2010.05 (part IV: updates patches so that they don't generate warnings when applied)
+ - Upgrade new BR support from 2010.02 to 2010.05 (part III: updates apf9328 configs)
+ - Upgrade new BR support from 2010.02 to 2010.05 (part II: patches apply)
+ - Upgrade new BR support from 2010.02 to 2010.05 (part I)
+ - Finalizes support for BR 2010.02 version
+ - Fixed buildroot 2010.02 compilation failure on Ubuntu
+ - [2010.02] Add custom config file for busybox 1.16.0
+ - [2010.02] Makes mplayer compiles again (charset pb)
+ - [2010.02] Updates to latest available snapshot
+ - [2010.02] Add fixes to correctly build rsync and alsamixer
+ - [2010.02] Updates apf27_defconfig
+ - [2010.02] Adapt main Makefile.in for new BR
+ - [2010.02] Makes Linux use the correct config file again
+ - [2010.02] Makes U-Boot binary renaming work again
+ - [2010.02] Updates apf27 default config
+ - [2010.02] Makes 051/U-Boot patch work again by dividing it in functionnal sub-patches. Add a first U-Boot 1.3.4 fix for gcc 4.4 (from mainline).
+ - [2010.02] Fixes 053-libusb.patch
+ - [2010.02] Updates cleanup_buildroot.sh
+ - [2010.02] Removes unneeded 026-jffs2root.patch
+ - [2010.02] Removes unneeded 035 patch
+ - [2010.02] Alternate download site is now integrated in BR (Backup site)
+ - support ubifs with buildroot 2010.02
+ - improved apf9328 default configuration to be used with new buildroot
+ - added default uclibc config for new buildroot
+ - added default apf9328 to be used with new buildroot
+ - Patch 050 is now ok for 2010.02
+ - Ports patch 099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch to 2010.02 BR
+ - Add default configs for BR 2010.02 (apf27 & only for test)
+ - Add patches to support upcoming 2010.02 BR version (some patches still require to be fixed)
+* Linux:
+ Main changes: Better CMOS Camera & APW support, GPIO driver simplified, as5011 driver,
+ USB device, better audio & keypad support on APF27, hs5116 driver, max9768 driver
+ List of all changes:
+ - Updates apf27 linux default config and add OSS emulation
+ - Makes dma_test driver compile again
+ - Reorganizes patch 356 internals
+ - renames patch 319
+ - Add soc_camera driver for OV3640 and updates OV96xx & OV7670 ones
+ -[as5011] Do not try to free tabular pointer
+ - ov96xx: updates driver to make it more friendly with V4L apps
+ - Add vivi (v4l test driver) to default apf27 configs
+ - Working version of as5011 joystick driver
+ - adding_as5011_joystick_driver
+ - change tsc2102 precharge time
+ -[i2c] adding_mangling_capability_on_i2c_mxc_driver
+ - Add uinput driver in default configs
+ - Fix bug in irq mode gpio configuration
+ - gpio: rename core.h in gpio-dev.h
+ - Simplify gpio driver by removing all unneeded features (mostly on full port access)
+ - suppress both edge management in interrupt function for gpio driver
+ - change irq macro name for gpio driver
+ - Add pin management full capability on gpio driver module
+ - spi_imx: Add correct SPI clock calculation for i.MX27
+ - ov7670: remove compilation warnings
+ - tsc210x: improve suspend/resume
+ - ov7670: improve suspend/resume.
+ - mx27camera: handles PIXCLK rising edge sampling
+ - ov7670: add possibility to read registers through /proc in DEBUG mode
+ - Improve error message when failing to allocate a GPIO
+ - ov7670: change init/detect sequence
+ - gpio: correct bug in armadeus_gpio_dev_read() (thanks to CimCim) and apply Linux coding rules on some function names
+ - gpio: correct bug while getting IRQ state & add fasync handling (thanks to CimCim for both)
+ - fix some bugs in gpio driver, change version
+ - adding poll capability in gpio driver (for select() )
+ - Adding interrupt status read/write capability on gpio driver
+ - APW: Bluetooth RESET pin should be driven by userspace
+ - Add ov7670_soc driver in default APF27 Linux configs
+ - SoC camera: add driver for OV7670 sensors
+ - GPIO mask correction
+ - change gpio drivers version number
+ - GPIO: Workaround compilation problem due to recent commits (grrrrr) + indentation
+ - Add comments in 347x patches
+ - GPIO: Adding irq configuration capability and suppress trailling white space
+ - shrink lan95xx patch
+ - smsc95xx: add additional USB product IDs
+ - Adding ioctl for gpio pullup resistor
+ - Adding lan9500A in smsc95xx driver
+ - Fix smsc95xx led output
+ - Suppress i2c debuging messages from i2c-mxc.c
+ - Correcting comments in loadgpio.sh
+ - Add the possibility to use the 2nd Audio/Mic input of the TSC2101 (when available)
+ - DM9000 chip is not an option on APF9328. Moreover, with this modification, DM9000 driver can now be used as module (Thanks to Cyril Wallois for the report and the correction idea)
+ - Indentation in 015-armadeus-logo-add_armadeus-project_tux.patch
+ - Cleanup PWM driver & add automatic /dev creation
+ - Add 24MHz external clock support to TSC210x
+ - Update max1027 header
+ - update apf9328 linux config file
+ - Add (preliminary) support for USB device functionnality of APF27 module
+ - max1027 code cleanup
+ - fix suspend/resume of hrtimer. Must be corrected in 2.6.32
+ - max1027: allow CNVST pin to be used in low speed mode
+ - add suspend/resume for APF27 USB PHY
+ - add backlight power switch capability in fb driver
+ - suppress power_on function callback in hx5116.h
+ - Suppressing backlight powering capability from hx5116_display driver (this capability must be in imx_fb driver)
+ - Fixes APW Bluetooth module init and UART5 GPIOs freeing. Thanks to Nicolas S.
+ - Improve support of SDIO cards on APF27
+ - Remove old & obsolete APF27DevTest support
+ - Add support for WiFi module of APW
+ - Cleanup 339-apf27-armadeus-spidev.patch
+ - Previous changes on SPI (for spidev) broke the modprobing of tsc210x module. Corrects that...
+ - tsc210x/ALSA: increase ALSA PCM buffer
+ - tsc210x: improve error messages
+ - Adding timing initialization in hx5116_display driver
+ - Suppress traces under spi_gpio driver
+ - Improve configuration file to add HX5116_DISPLAY
+ - Add hx5116-display driver in ARMadeus specific drivers directory
+ - HX5116-display header improve. (adding reset function in structure
+ - Delete useless hx5116_backlight driver and improve hx5116.h for futur hx5116-display drivers
+ - Adding HX5116 Amoled driver in linux-menuconfig
+ - Patch 349 fixed
+ - Improve spi_gpio for single data pin
+ - Backport spi driver from 2.6.32.2 to use half duplex capabilities
+ - Fix little behavior bug in mxc_gpio_set()
+ - Add version number to tsc210x alsa pcm driver
+ - tsc2101: has a mono ADC but transmit data in 2 I2S channels to i.MX
+ - tsc2101/ALSA: makes DMA (for audio in) work
+ - Backport some 2.6.3x convenient patches for LAN95xx
+ - max9768: add possibility to read back internal values through /sys/ (were write only before)
+ - Makes TSC2101 Audio In usable on APF27 + add corresponding ALSA mixer controls. It still remains a DMA problem to fix
+ - Makes MAX9768 driver more verbose when errors occur
+ - apf9328: update default config with new LCDs
+ - On APF27 I2C1 bus configuration is baseboard specific, so move it from apf27.c to apf27-dev.c
+ - Add debug trace for GPIO allocation
+ - Renamed patch 342
+ - Add better serial port configuration (RTS/CTS) + config hiding when options are not available. Add configuration options for Bluetooth and WiFi on wireless extension board (APW). Add preliminary power management for APW.
+ - Adding spi3 in apf27-dev and manage spi with menuconfig
+ - Adding hx5116 and p0340wql amoled in default config
+ - Begin AMOLED p0340wql integration
+ - Move APF27Dev extension board support in a separate file. Ease UART selection for APF27 while we are at it.
+ - Make Linux 2.6.27 compiles on Ubuntu 9.10 (and probably other recent releases). Thanks Sebastien V.C. for the report.
+ - Add support for i.MX27 internal keypad controller
+ - Add comment to describe patch 339
+ - spidev patch
+ - Add custom driver for MAX9768 audio amplifier
+* U-Boot:
+ Main changes: preliminary support of 2010.03 version, bug fixes
+ List of all changes:
+ - removes thumb interworking warning when compiling U-Boot for apf9328
+ - Fix clock init to support bootstrap loader
+ - set active partition on rootsfs to support fsload, ls..
+ - move to the U-Boot release 2010.03
+ - APF27 migration to U-Boot 2010.03
+ - Fixed file naming convention
+ - Changed default U-Boot name of config file to support multiple U-Boot versions
+ - added U-Boot 2010.03-rc2 support for apf9328
+ - update rules to generate U-Boot binary files
+ - fixed apf9328 GCC4.4.x EABI compilation issues
+ - Makes fw_setenv command work with NAND Flash
+ - Make it linkable with gcc 4.3/4.4 EABI
+ - add zero boot delay check
+ - Rename u-boot-unpacked target to u-boot-src-unpacked
+* Firmware:
+* Demos:
+ - Adding camera capture tool in demos package
+ - capture: add yuv422_to_greyscale()
+ - capture: do not use double buffer as mx2fb do not support it yet
+ - Makes input_test quit correctly when using CTRL+Z+kill or CTRL+C. + Indentation
+ - Add better error handling in capture app
+ - Correct picture size bug in capture tool
+ - Capture: add RGR565 support (default format) + the possibility to choose screen and picture sizes
+ - Capture: link with libpthread otherwise runtime crash may occur
+ - Capture: improve doc
+ - Add a small app to test V4L2 compatible cameras (capture images and display them on LCD)
+ - Cleanup in oscillo & real_time/fractal
+ - Updates real_time/Makefile.in
+ - Fixes Config.in
+ - Add a new tool to seek LCD's dead pixels
+ - Homogenize demos build & install
+ - input_test now looks up in /usr/share/images/ too to load its image file
+* Debug:
+ - Cleanup imxregs build
+ - imxregs: differentiates both ULPI viewports on i.MX27
+ - Adding imx-fpga communication testing program
+ - Cleanup imxssi debug tool and add it Audio In -> Audio Out loop option
+* Test:
+ - Improves test_backlight.sh
+ - Improve media_perf.sh
+ - Add default capture volume to test_audio.sh
+ - Add a test for WiFi (only for APW for the moment)
+ - rename test_sound.sh to test_audio.sh (part 2)
+ - rename test_sound.sh to test_audio.sh
+ - Add test for Audio In (when applicable)
+ - Add newline before asking something to user (for clarity)
+ - Rename mmc_perf.sh to media_perf.sh
+ - Makes mmc_perf.sh usable with USB keys
+ - gpio test doesn't need test_env.sh
+ - Add test for GSM MoDem (APW)
+ - Add test for GPS (APW)
+ - Add test for Bluetooth
+ - test_gpio.sh: use gpio_mode instead of setbit and test driver is correctly unloading
+ - Adding image to test lcd
+ - Transform test_pwm.sh in a release test
+ - Move test_pwm.sh to the test scripts dir
+* Tools:
+ - Add gpio_helpers.sh to ease usage of gpio driver (extract of test_gpio.sh). New script will be located in /usr/bin/ on the target.
+ - Improves quiltify.sh for new BR handling and modify main Makefile accordingly
+ - Now U-Boot can be quiltified too
+ - quiltify: works on 2.6.X.y Linux sources instead of 2.6.X ones
+ - quiltify.sh: Correct date of renamed dir
+ - Cleanup Buildroot patches in a better way in quiltify.sh
+ - Add a small script to ease installation on Debian like systems. Thanks Sebastien.
+ - quiltify.sh: Check VCS used before launching correspondig status command
+ - Removes ambiguous message from quiltify.sh
+ - Suppress old named quilt script
+ - change quiltify script name
+ - little bug in ad5258 to be fixed
+ - quilt script messages update
+* As_Devices:
+ - Adding eeprom 93lcxx test in AsDevices test program
+ - [AS_DEVICES] adding python wrapper in menu
+ - [AS_DEVICES] Config.in: Indentation + spelling + 'n' is default value for options
+ - Change data lenght for spi msg command
+ - suppress -DAPFXX compilation option
+ - Cleanup makefiles and makes install targets work
+ - {} replaced by () in Makefiles
+ - ioctl changed
+ - as_gpio: no code in header
+ - Modify as_gpio to manage gpio pin independantly
+ - deleting a debug message
+ - adding timeout for blocking read
+ - as_spi: code done, test to be done
+ - as_pwm done and tested
+ - as_max5821 tested, little bug fixed
+ - adding Digital to Analog Chip as_max5821, not fully tested
+ - as_max1027 SLOW mode done
+ - GPIO IRQ tested
+ - suppressing spi tricks
+ - somes TODO in as_gpio python wrapper
+ - Adding irq and pullup function prototype for Python wrapper
+ - Add blocking read function (not tested), correct indent
+ - Add irq mode configuration function (not tested), suppress tab
+ - Adding pullup capability (not tested) and suppress trailling white space
+ - AsGpio python wrapper done
+ - python class asgpio in progress
+ - Adding python gpio multiton class
+ - Compiling gpio python wrapper low level api
+ - AsGpio python wrapper in progress
+ - Adding reading channel capability in as_max1027, not tested yet
+ - Adding reading temperature capability in as_max1027
+ - Adding test for max1027
+ - fix makefile platform variable
+ - Add platform parameter in compilation
+ - Adding as_max1027 in progressâ¦
+ - Fix makefile bug
+ - Suppress apf27 reference in pwm lib
+ - Testbench corrections
+ - Update as_gpio library
+ - AsDevice refactoring and bug correction in ad5258
+ - fix as_93lcxx lib bugs and clean indentation
+* Other:
+ - [BUILD] Updates some envt variables for BR 2010.05
+ - [BUILD] Makes Buildroot version choosable with "make BUILDROOT_VERSION=20xx.xx"
+ - [BUILD] Add message when compiling of BSP is successful
+ - [BUILD] Add ARMADEUS_XENOMAI_DIR envt variable
+ - [BUILD] Add U-Boot version to armadeus global envt variables
+ - [BUILD] Add U-Boot dir to armadeus global envt variables
+ - [BUILD] Add some more .gitignore files
+ - [BUILD] Updates .gitignore files
----
diff --git a/buildroot/package/armadeus/as_devices/Config.in b/buildroot/package/armadeus/as_devices/Config.in
index 2bf8b2f..c1c1c6d 100644
--- a/buildroot/package/armadeus/as_devices/Config.in
+++ b/buildroot/package/armadeus/as_devices/Config.in
@@ -1,9 +1,8 @@
config BR2_PACKAGE_AS_DEVICES
bool "as_devices"
depends on BR2_TARGET_ARMADEUS
- default n
help
- library that drive armadeus specific devices
+ Library that drives armadeus specific devices.
#config BR2_PACKAGE_AS_DEVICES_CPP
# depends on BR2_PACKAGE_AS_DEVICES
@@ -13,9 +12,8 @@ config BR2_PACKAGE_AS_DEVICES
# C++ wrapper for as_devices library
#
config BR2_PACKAGE_AS_DEVICES_PYTHON
- depends on BR2_PACKAGE_AS_DEVICES
- depends on BR2_PACKAGE_PYTHON
- bool "wrapper Python"
- default n
- help
- Python wrapper for as_devices library. need python
+ depends on BR2_PACKAGE_AS_DEVICES
+ depends on BR2_PACKAGE_PYTHON
+ bool "Python wrapper"
+ help
+ Python wrapper for as_devices library. needs python.
diff --git a/release/changes.sh b/release/changes.sh
index f97715e..7ebecf5 100755
--- a/release/changes.sh
+++ b/release/changes.sh
@@ -12,9 +12,10 @@ CHANGES_TEST=$TEMP_DIR/test.log
CHANGES_DEMOS=$TEMP_DIR/demos.log
CHANGES_DEBUG=$TEMP_DIR/debug.log
CHANGES_TOOLS=$TEMP_DIR/tools.log
+CHANGES_ASDEVICES=$TEMP_DIR/asdevices.log
CHANGES_OTHER=$TEMP_DIR/other.log
-LATEST_RELEASE_DATE="Wed Jul 1"
+LATEST_RELEASE_DATE="2009-12-02"
usage()
{
@@ -55,8 +56,10 @@ cat $LOG_CLEAN_TMP.6 | grep -i "\[DEBUG\]" > $CHANGES_DEBUG
cat $LOG_CLEAN_TMP.6 | grep -iv "\[DEBUG\]" > $LOG_CLEAN_TMP.7
cat $LOG_CLEAN_TMP.7 | grep -i "\[TOOLS\]" > $CHANGES_TOOLS
cat $LOG_CLEAN_TMP.7 | grep -iv "\[TOOLS\]" > $LOG_CLEAN_TMP.8
+cat $LOG_CLEAN_TMP.8 | grep -i "\[AS_DEVICES\]" > $CHANGES_ASDEVICES
+cat $LOG_CLEAN_TMP.8 | grep -iv "\[AS_DEVICES\]" > $LOG_CLEAN_TMP.9
-cat $LOG_CLEAN_TMP.8 > $CHANGES_OTHER
+cat $LOG_CLEAN_TMP.9 > $CHANGES_OTHER
# compose Changelog:
echo
@@ -80,6 +83,8 @@ echo "* Test:"
cat $CHANGES_TEST | grep -v "^$" | sed 's/\[[Tt][Ee][Ss][Tt]\]/ -/g'
echo "* Tools:"
cat $CHANGES_TOOLS | grep -v "^$" | sed 's/\[[Tt][Oo][Oo][Ll][Ss]\]/ -/g'
+echo "* As_Devices:"
+cat $CHANGES_ASDEVICES | grep -v "^$" | sed 's/\[[Aa][Ss]_[Dd][Ee][Vv][Ii][Ce][Ee][Ss]\]/ -/g'
echo "* Other:"
cat $CHANGES_OTHER | grep -v "^$"
echo
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-07-22 21:43:57
|
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 150a6501ff21f4e0a908ebe8f2ca3ee6c07559da (commit)
from e3ea18d0dc027939ca23ca8d04a445d1070f6795 (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 150a6501ff21f4e0a908ebe8f2ca3ee6c07559da
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 22 23:43:23 2010 +0200
[LINUX] Updates apf27 linux default config and add OSS emulation
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.29.config | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 d2b1a6a..6018cbe 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Wed Jun 30 15:23:25 2010
+# Thu Jul 22 23:36:31 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1095,7 +1095,6 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
# Video decoders
#
# CONFIG_VIDEO_OV7670 is not set
-CONFIG_VIDEO_OV96xx=m
# CONFIG_VIDEO_TCM825X is not set
# CONFIG_VIDEO_SAA711X is not set
# CONFIG_VIDEO_SAA717X is not set
@@ -1133,8 +1132,10 @@ CONFIG_SOC_CAMERA=m
# CONFIG_SOC_CAMERA_MT9V022 is not set
# CONFIG_SOC_CAMERA_TW9910 is not set
# CONFIG_SOC_CAMERA_PLATFORM is not set
-# CONFIG_SOC_CAMERA_OV772X is not set
+# CONFIG_SOC_CAMERA_OV3640 is not set
CONFIG_SOC_CAMERA_OV7670=m
+# CONFIG_SOC_CAMERA_OV772X is not set
+CONFIG_SOC_CAMERA_OV96XX=m
# CONFIG_V4L_USB_DRIVERS is not set
CONFIG_VIDEO_MX27=m
# CONFIG_RADIO_ADAPTERS is not set
@@ -1228,13 +1229,15 @@ CONFIG_LOGO=y
CONFIG_LOGO_LINUX_CLUT224=y
# CONFIG_LOGO_ARMADEUS_CLUT224 is not set
CONFIG_SOUND=m
-# CONFIG_SOUND_OSS_CORE is not set
+CONFIG_SOUND_OSS_CORE=y
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
# CONFIG_SND_HRTIMER is not set
# CONFIG_SND_DYNAMIC_MINORS is not set
CONFIG_SND_SUPPORT_OLD_API=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-07-22 21:41:48
|
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 e3ea18d0dc027939ca23ca8d04a445d1070f6795 (commit)
via 60040c27c7ad1d9b5fb8cd2dd10f1159985ef781 (commit)
from 1ec0b5e800626b4abb0d9dd648b57136cbe44c54 (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 e3ea18d0dc027939ca23ca8d04a445d1070f6795
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 22 23:41:12 2010 +0200
[BUILDROOT] Updates freescale-tools package: now uses DOWNLOAD helper and copy libvpu to staging_dir
commit 60040c27c7ad1d9b5fb8cd2dd10f1159985ef781
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 22 21:44:30 2010 +0200
[BUILDROOT] [2010.05] Increases pywebradio revision
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/freescale-tools/tools.mk | 17 ++++++++---------
.../2010.05/123-pywebradio-add_package.patch | 2 +-
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/buildroot/package/armadeus/freescale-tools/tools.mk b/buildroot/package/armadeus/freescale-tools/tools.mk
index bd764b2..98a1fae 100644
--- a/buildroot/package/armadeus/freescale-tools/tools.mk
+++ b/buildroot/package/armadeus/freescale-tools/tools.mk
@@ -16,12 +16,12 @@ FREESCALE_TOOLS_BIN:=mxc_vpu_test.out
$(DL_DIR)/$(FREESCALE_TOOLS_PATCH_SOURCE):
- $(WGET) -P $(DL_DIR) $(FREESCALE_TOOLS_PATCH_SITE)/$(FREESCALE_TOOLS_PATCH_SOURCE)
- $(WGET) -P $(DL_DIR) $(FREESCALE_TOOLS_PATCH_SITE)/$(FREESCALE_TOOLS_PATCH_SOURCE).md5
+ $(call DOWNLOAD,$(FREESCALE_TOOLS_PATCH_SITE),$(FREESCALE_TOOLS_PATCH_SOURCE))
+ $(call DOWNLOAD,$(FREESCALE_TOOLS_PATCH_SITE),$(FREESCALE_TOOLS_PATCH_SOURCE).md5)
$(DL_DIR)/$(FREESCALE_TOOLS_SOURCE):
- $(WGET) -P $(DL_DIR) $(FREESCALE_TOOLS_SITE)/$(FREESCALE_TOOLS_SOURCE)
- $(WGET) -P $(DL_DIR) $(FREESCALE_TOOLS_SITE)/$(FREESCALE_TOOLS_SOURCE).md5
+ $(call DOWNLOAD,$(FREESCALE_TOOLS_SITE),$(FREESCALE_TOOLS_SOURCE))
+ $(call DOWNLOAD,$(FREESCALE_TOOLS_SITE),$(FREESCALE_TOOLS_SOURCE).md5)
freescale-tools-source: $(DL_DIR)/$(FREESCALE_TOOLS_SOURCE) $(DL_DIR)/$(FREESCALE_TOOLS_PATCH_SOURCE)
@@ -32,18 +32,17 @@ $(FREESCALE_TOOLS_DIR)/.unpacked: $(DL_DIR)/$(FREESCALE_TOOLS_SOURCE) $(DL_DIR)/
toolchain/patch-kernel.sh $(FREESCALE_TOOLS_DIR) package/armadeus/freescale-tools \*misc-$(FREESCALE_TOOLS_VERSION)\*.patch
touch $@
-$(FREESCALE_TOOLS_DIR)/.configured: $(FREESCALE_TOOLS_DIR)/.unpacked
- touch $@
-
-$(FREESCALE_TOOLS_TARGET_DIR)/$(FREESCALE_TOOLS_BIN): $(FREESCALE_TOOLS_DIR)/.configured
+$(FREESCALE_TOOLS_TARGET_DIR)/$(FREESCALE_TOOLS_BIN): $(FREESCALE_TOOLS_DIR)/.unpacked
$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" PLATFORM=IMX27ADS -C $(FREESCALE_TOOLS_DIR)/lib/vpu/
$(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" PLATFORM=IMX27ADS \
TOPDIR=$(FREESCALE_TOOLS_DIR) \
OBJDIR="$(FREESCALE_TOOLS_TARGET_DIR)" \
-C $(FREESCALE_TOOLS_DIR)/test/mxc_vpu_test/
+ cp $(FREESCALE_TOOLS_DIR)/lib/vpu/*.h $(STAGING_DIR)/usr/include/
+ cp $(FREESCALE_TOOLS_DIR)/lib/vpu/libvpu.a $(STAGING_DIR)/usr/lib/
touch $@
-FREESCALE-TOOLS freescale-tools: uclibc $(FREESCALE_TOOLS_TARGET_DIR)/$(FREESCALE_TOOLS_BIN)
+FREESCALE-TOOLS freescale-tools: $(FREESCALE_TOOLS_TARGET_DIR)/$(FREESCALE_TOOLS_BIN)
freescale-tools-clean:
-$(MAKE) -C $(FREESCALE_TOOLS_DIR)/lib/vpu/ clean
diff --git a/patches/buildroot/2010.05/123-pywebradio-add_package.patch b/patches/buildroot/2010.05/123-pywebradio-add_package.patch
index ff919e7..998391b 100644
--- a/patches/buildroot/2010.05/123-pywebradio-add_package.patch
+++ b/patches/buildroot/2010.05/123-pywebradio-add_package.patch
@@ -34,7 +34,7 @@ Index: buildroot/package/pywebradio/pywebradio.mk
+
+PYWEBRADIO_TRUNK:=http://forge.doumenc.org/svn/pyqtradio/trunk
+PYWEBRADIO_SITE:=
-+PYWEBRADIO_VERSION:=381
++PYWEBRADIO_VERSION:=421
+PYWEBRADIO_NAME:=pywebradio-svn-r$(PYWEBRADIO_VERSION)
+PYWEBRADIO_DIR:=$(BUILD_DIR)/$(PYWEBRADIO_NAME)
+PYWEBRADIO_SOURCE:=$(PYWEBRADIO_NAME).tar.bz2
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-07-20 19:22:02
|
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 1ec0b5e800626b4abb0d9dd648b57136cbe44c54 (commit)
via bfcf5c3217356d36cdd1d18bcc924f680aae1d65 (commit)
via 7328f2e924b5bcf7021af8918e06ea6177490162 (commit)
via 44bcb38c78a8e158d557a2bf4fe8a120ad475f4f (commit)
from 3e91ca504f9dca1f5a964d732c0c4d6278bb3936 (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 1ec0b5e800626b4abb0d9dd648b57136cbe44c54
Author: Olivier Reynet <oli...@en...>
Date: Tue Jul 20 21:20:47 2010 +0200
[LINUX] Makes dma_test driver compile again
commit bfcf5c3217356d36cdd1d18bcc924f680aae1d65
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jul 20 15:36:01 2010 +0200
[LINUX] Reorganizes patch 356 internals
commit 7328f2e924b5bcf7021af8918e06ea6177490162
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jul 20 15:33:02 2010 +0200
[LINUX] renames patch 319
commit 44bcb38c78a8e158d557a2bf4fe8a120ad475f4f
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jul 20 15:30:58 2010 +0200
[LINUX] Add soc_camera driver for OV3640 and updates OV96xx & OV7670 ones
-----------------------------------------------------------------------
Summary of changes:
...eus-soc_camera_add_ov96xx_sensors_driver.patch} | 51 +-
...adeus-soc_camera-add_ov7670_sensor_driver.patch | 60 +-
...adeus-soc_camera-add_ov3640_sensor_driver.patch | 2107 ++++++++++++++++++++
target/linux/modules/dma_test/dma.c | 1 +
4 files changed, 2162 insertions(+), 57 deletions(-)
rename buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/{319-apf27-armadeus-ov96xx_sensors_driver.patch => 319-armadeus-soc_camera_add_ov96xx_sensors_driver.patch} (97%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/361-armadeus-soc_camera-add_ov3640_sensor_driver.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-armadeus-soc_camera_add_ov96xx_sensors_driver.patch
similarity index 97%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-armadeus-soc_camera_add_ov96xx_sensors_driver.patch
index 98083dd..90c57c7 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-apf27-armadeus-ov96xx_sensors_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/319-armadeus-soc_camera_add_ov96xx_sensors_driver.patch
@@ -7,38 +7,38 @@ Signed-off-by: Julien boibessot <jul...@ar...>
Index: linux-2.6.29.6/drivers/media/video/Kconfig
===================================================================
--- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2010-07-01 16:25:15.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-07-05 18:34:51.000000000 +0200
-@@ -298,6 +298,13 @@
- OV7670 VGA camera. It currently only works with the M88ALP01
- controller.
++++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-07-20 15:22:05.000000000 +0200
+@@ -789,6 +789,13 @@
+ help
+ This is a ov772x camera driver
-+config VIDEO_OV96xx
-+ tristate "OmniVision OV96xx sensor support"
-+ depends on I2C && VIDEO_V4L2
++config SOC_CAMERA_OV96XX
++ tristate "ov96xx support"
++ depends on SOC_CAMERA && I2C
+ ---help---
-+ This is a Video4Linux2 sensor-level driver for the OmniVision
-+ OV96xx camera. It currently only works on i.MX27 systems.
++ This driver supports ov96xx camera from OmniVision.
++ It currently only works on i.MX27 systems.
+
- config VIDEO_TCM825X
- tristate "TCM825x camera sensor support"
- depends on I2C && VIDEO_V4L2
+ config VIDEO_PXA27x
+ tristate "PXA27x Quick Capture Interface driver"
+ depends on VIDEO_DEV && PXA27x && SOC_CAMERA
Index: linux-2.6.29.6/drivers/media/video/Makefile
===================================================================
--- linux-2.6.29.6.orig/drivers/media/video/Makefile 2010-07-01 16:25:15.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Makefile 2010-07-05 18:34:51.000000000 +0200
-@@ -106,6 +106,7 @@
-
- obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
- obj-$(CONFIG_VIDEO_OV7670) += ov7670.o
-+obj-$(CONFIG_VIDEO_OV96xx) += ov96xx.o
-
- obj-$(CONFIG_VIDEO_TCM825X) += tcm825x.o
++++ linux-2.6.29.6/drivers/media/video/Makefile 2010-07-20 15:22:05.000000000 +0200
+@@ -145,6 +145,7 @@
+ obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o
+ obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o
+ obj-$(CONFIG_SOC_CAMERA_OV772X) += ov772x.o
++obj-$(CONFIG_SOC_CAMERA_OV96XX) += ov96xx.o
+ obj-$(CONFIG_SOC_CAMERA_PLATFORM) += soc_camera_platform.o
+ obj-$(CONFIG_SOC_CAMERA_TW9910) += tw9910.o
Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/media/video/ov96xx.c 2010-07-05 18:20:21.000000000 +0200
-@@ -0,0 +1,1676 @@
++++ linux-2.6.29.6/drivers/media/video/ov96xx.c 2010-07-20 15:21:57.000000000 +0200
+@@ -0,0 +1,1673 @@
+/*
+ * drivers/media/video/ov96xx.c
+ *
@@ -1134,7 +1134,7 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+}
+
+static int ov96xx_get_control(struct soc_camera_device *icd,
-+ struct v4l2_control *vctrl)
++ struct v4l2_control *vctrl)
+{
+ struct ov96xx_sensor *sensor = container_of(icd, struct ov96xx_sensor, icd);
+ struct i2c_client *client = sensor->i2c_client;
@@ -1284,10 +1284,9 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+
+static unsigned long ov96xx_query_bus_param(struct soc_camera_device *icd)
+{
-+// struct ov96xx_sensor *ov96xx = container_of(icd, struct ov96xx_sensor, icd);
+ unsigned int width_flag = SOCAM_DATAWIDTH_10 | SOCAM_DATAWIDTH_8;
+
-+ /* MT9M001 has all capture_format parameters fixed */
++ /* OV96xx has all capture_format parameters fixed */
+ return SOCAM_PCLK_SAMPLE_RISING |
+ SOCAM_HSYNC_ACTIVE_HIGH |
+ SOCAM_VSYNC_ACTIVE_HIGH |
@@ -1554,7 +1553,6 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+
+ printk("--- %s %d\n", __func__, state.event);
+
-+ /* supposing camera link power() is a powerdown: */
+ if (icl->power) {
+ ret = icl->power(&ov96xx->i2c_client->dev, 0);
+ if (ret < 0) {
@@ -1615,7 +1613,6 @@ Index: linux-2.6.29.6/drivers/media/video/ov96xx.c
+static int __init ov96xx_probe(struct i2c_client *client,
+ const struct i2c_device_id *did)
+{
-+
+ struct ov96xx_sensor *ov96xx;
+ struct soc_camera_device *icd;
+ struct soc_camera_link *icl = client->dev.platform_data;
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/356-armadeus-soc_camera-add_ov7670_sensor_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/356-armadeus-soc_camera-add_ov7670_sensor_driver.patch
index bc1e9be..7ac44ab 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/356-armadeus-soc_camera-add_ov7670_sensor_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/356-armadeus-soc_camera-add_ov7670_sensor_driver.patch
@@ -3,10 +3,39 @@ Adds a SoC camera compatible driver for OV7670.
Signed-off-by: Julien Boibessot <jul...@ar...>
+Index: linux-2.6.29.6/drivers/media/video/Kconfig
+===================================================================
+--- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2010-07-15 12:00:19.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-07-15 12:02:24.000000000 +0200
+@@ -783,6 +783,12 @@
+ help
+ This is a generic SoC camera platform driver, useful for testing
+
++config SOC_CAMERA_OV7670
++ tristate "ov7670 camera support"
++ depends on SOC_CAMERA && I2C
++ help
++ This is a (SoC camera compatible) ov7670 sensor driver
++
+ config SOC_CAMERA_OV772X
+ tristate "ov772x camera support"
+ 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-15 12:01:36.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Makefile 2010-07-15 12:02:24.000000000 +0200
+@@ -144,6 +144,7 @@
+ obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o
+ obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o
+ obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o
++obj-$(CONFIG_SOC_CAMERA_OV7670) += ov7670_soc.o
+ obj-$(CONFIG_SOC_CAMERA_OV772X) += ov772x.o
+ obj-$(CONFIG_SOC_CAMERA_OV96XX) += ov96xx.o
+ obj-$(CONFIG_SOC_CAMERA_PLATFORM) += soc_camera_platform.o
Index: linux-2.6.29.6/drivers/media/video/ov7670_soc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/media/video/ov7670_soc.c 2010-05-31 14:23:25.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/ov7670_soc.c 2010-07-15 12:02:24.000000000 +0200
@@ -0,0 +1,1682 @@
+/*
+ * A V4L2 driver for OmniVision OV7670 cameras.
@@ -1690,32 +1719,3 @@ Index: linux-2.6.29.6/drivers/media/video/ov7670_soc.c
+
+module_init(ov7670_mod_init);
+module_exit(ov7670_mod_exit);
-Index: linux-2.6.29.6/drivers/media/video/Kconfig
-===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2010-05-31 13:51:22.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-05-31 13:51:23.000000000 +0200
-@@ -796,6 +796,12 @@
- help
- This is a ov772x camera driver
-
-+config SOC_CAMERA_OV7670
-+ tristate "ov7670 camera support"
-+ depends on SOC_CAMERA && I2C
-+ help
-+ This is a (SoC camera compatible) ov7670 sensor driver
-+
- config VIDEO_PXA27x
- tristate "PXA27x Quick Capture Interface driver"
- depends on VIDEO_DEV && PXA27x && SOC_CAMERA
-Index: linux-2.6.29.6/drivers/media/video/Makefile
-===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Makefile 2010-05-31 13:51:22.000000000 +0200
-+++ linux-2.6.29.6/drivers/media/video/Makefile 2010-05-31 13:51:23.000000000 +0200
-@@ -145,6 +145,7 @@
- obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o
- obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o
- obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o
-+obj-$(CONFIG_SOC_CAMERA_OV7670) += ov7670_soc.o
- obj-$(CONFIG_SOC_CAMERA_OV772X) += ov772x.o
- obj-$(CONFIG_SOC_CAMERA_PLATFORM) += soc_camera_platform.o
- obj-$(CONFIG_SOC_CAMERA_TW9910) += tw9910.o
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
new file mode 100644
index 0000000..3e2e6c4
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/361-armadeus-soc_camera-add_ov3640_sensor_driver.patch
@@ -0,0 +1,2107 @@
+Index: linux-2.6.29.6/drivers/media/video/Kconfig
+===================================================================
+--- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2010-07-15 12:19:53.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Kconfig 2010-07-15 12:22:35.000000000 +0200
+@@ -783,6 +783,12 @@
+ help
+ This is a generic SoC camera platform driver, useful for testing
+
++config SOC_CAMERA_OV3640
++ tristate "ov3640 support"
++ depends on SOC_CAMERA && I2C
++ help
++ This driver supports ov3640 sensors from Omnivision
++
+ config SOC_CAMERA_OV7670
+ tristate "ov7670 camera support"
+ 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-15 12:22:50.000000000 +0200
++++ linux-2.6.29.6/drivers/media/video/Makefile 2010-07-15 12:23:50.000000000 +0200
+@@ -144,6 +144,7 @@
+ obj-$(CONFIG_SOC_CAMERA_MT9M111) += mt9m111.o
+ obj-$(CONFIG_SOC_CAMERA_MT9T031) += mt9t031.o
+ obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o
++obj-$(CONFIG_SOC_CAMERA_OV3640) += ov3640.o
+ obj-$(CONFIG_SOC_CAMERA_OV7670) += ov7670_soc.o
+ obj-$(CONFIG_SOC_CAMERA_OV772X) += ov772x.o
+ obj-$(CONFIG_SOC_CAMERA_OV96XX) += ov96xx.o
+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-20 15:06:58.000000000 +0200
+@@ -0,0 +1,1460 @@
++/*
++ *
++ * Copyright 2010 Armadeus Systems
++ *
++ * Based on work (init sequences) which is:
++ * Copyright 2005-2009 Freescale Semiconductor, Inc. All Rights Reserved.
++ *
++ * This file is licensed under the terms of the GNU General Public License
++ * version 2. This program is licensed "as is" without any warranty of any
++ * kind, whether express or implied.
++ */
++
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/slab.h>
++#include <linux/ctype.h>
++#include <linux/types.h>
++#include <linux/delay.h>
++#include <linux/device.h>
++#include <linux/i2c.h>
++/*#include <media/v4l2-int-device.h>
++#include "mxc_v4l2_capture.h" */
++#include <media/soc_camera.h>
++#include <media/v4l2-chip-ident.h>
++
++#include "ov3640_regs.h"
++
++#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
++
++
++/* Check these values! */
++#define MIN_FPS 15
++#define MAX_FPS 30
++#define DEFAULT_FPS 30
++
++#define OV3640_XCLK_MIN 6000000
++#define OV3640_XCLK_MAX 24000000
++
++#define OV3640_MIN_BRIGHT 0
++#define OV3640_MAX_BRIGHT 6
++#define OV3640_DEF_BRIGHT 0
++#define OV3640_BRIGHT_STEP 1
++
++#define OV3640_DEF_CONTRAST 0
++#define OV3640_MIN_CONTRAST 0
++#define OV3640_MAX_CONTRAST 6
++#define OV3640_CONTRAST_STEP 1
++
++#define OV3640_DEF_COLOR 0
++#define OV3640_MIN_COLOR 0
++#define OV3640_MAX_COLOR 2
++#define OV3640_COLOR_STEP 1
++
++/* Check these values : */
++#define OV3640_DEF_GAIN 31
++#define OV3640_DEF_AUTOGAIN 1
++#define OV3640_DEF_EXPOSURE 154
++#define OV3640_DEF_AEC 1
++#define OV3640_DEF_FREEZE_AGCAEC 0
++#define OV3640_DEF_BLUE 153
++#define OV3640_DEF_RED (255 - OV3640_DEF_BLUE)
++#define OV3640_DEF_AWB 1
++#define OV3640_DEF_HFLIP 0
++#define OV3640_DEF_VFLIP 0
++
++
++enum ov3640_mode {
++ ov3640_mode_MIN = 0,
++ ov3640_mode_VGA_640_480 = 0,
++ ov3640_mode_QVGA_320_240 = 1,
++ ov3640_mode_QXGA_2048_1536 = 2,
++ ov3640_mode_XGA_1024_768 = 3,
++ ov3640_mode_MAX = 3
++};
++
++enum ov3640_frame_rate {
++ ov3640_15_fps,
++ ov3640_30_fps
++};
++
++struct reg_value {
++ u16 u16RegAddr;
++ u8 u8Val;
++ u8 u8Mask;
++ u32 u32Delay_ms;
++};
++
++struct ov3640_mode_info {
++ enum ov3640_mode mode;
++ u32 width;
++ u32 height;
++ struct reg_value *init_data_ptr;
++ u32 init_data_size;
++};
++
++struct capture_size {
++ unsigned long width;
++ unsigned long height;
++};
++
++/*
++ * Array of image sizes supported by OV3640. These must be ordered from
++ * smallest image size to largest.
++ */
++const static struct capture_size ov3640_sizes[] = {
++ { 320, 240 }, /* QVGA */
++ { 640, 480 }, /* VGA */
++ { 1024, 768 }, /* XGA */
++ { 1280, 960 }, /* SXGA */
++ { 2048, 1536}, /* QXGA */
++ { 0, 0 }, /* END */
++};
++
++/*!
++ * Maintains the information on the current state of the sesor.
++ */
++struct ov3640_sensor {
++ struct soc_camera_device icd;
++ int model;
++ int ver;
++
++ const struct ov3640_platform_data *platform_data;
++ struct v4l2_int_device *v4l2_int_device;
++ struct i2c_client *i2c_client;
++ struct v4l2_pix_format pix;
++ struct v4l2_captureparm streamcap;
++ bool on;
++
++ /* control settings */
++ int brightness;
++ int hue;
++ int contrast;
++ int saturation;
++ int red;
++ int green;
++ int blue;
++ int ae_mode;
++
++ u32 mclk;
++ int csi;
++};
++
++/*struct ov3640_sensor ov3640_data; */
++
++/* List of image formats supported by OV3640 sensor */
++static const struct soc_camera_data_format ov3640_formats[] = {
++#ifdef OV3640_RAW_MODE
++ {
++ .name = "RAW10",
++ .fourcc = V4L2_PIX_FMT_SGRBG10,
++ .depth = 16,
++ },
++#else
++ {
++ .name = "RGB565, le",
++ .fourcc = V4L2_PIX_FMT_RGB565,
++ .depth = 16,
++ },
++ {
++ .name = "RGB565, be",
++ .fourcc = V4L2_PIX_FMT_RGB565X,
++ .depth = 16,
++ },
++ {
++ .name = "YUYV (YUV 4:2:2), packed",
++ .fourcc = V4L2_PIX_FMT_YUYV,
++ .depth = 16,
++ },
++ {
++ .name = "UYVY, packed",
++ .fourcc = V4L2_PIX_FMT_UYVY,
++ .depth = 16,
++ },
++ {
++ .name = "RGB555, le",
++ .fourcc = V4L2_PIX_FMT_RGB555,
++ .depth = 16,
++ },
++ {
++ .name = "RGB555, be",
++ .fourcc = V4L2_PIX_FMT_RGB555X,
++ .depth = 16,
++ },
++#endif
++};
++
++#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},
++};
++
++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},
++ {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},
++};
++
++static struct reg_value ov3640_setting_30fps_XGA_1024_768[] = {
++ {0x0, 0x0, 0}
++};
++
++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},
++};
++
++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},
++};
++
++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},
++};
++
++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},
++};
++
++static struct ov3640_mode_info ov3640_mode_info_data[2][ov3640_mode_MAX + 1] = {
++ {
++ {ov3640_mode_VGA_640_480, 640, 480,
++ ov3640_setting_15fps_VGA_640_480,
++ ARRAY_SIZE(ov3640_setting_15fps_VGA_640_480)},
++ {ov3640_mode_QVGA_320_240, 320, 240,
++ ov3640_setting_15fps_QVGA_320_240,
++ ARRAY_SIZE(ov3640_setting_15fps_QVGA_320_240)},
++ {ov3640_mode_XGA_1024_768, 1024, 768,
++ ov3640_setting_15fps_XGA_1024_768,
++ ARRAY_SIZE(ov3640_setting_15fps_XGA_1024_768)},
++ {ov3640_mode_QXGA_2048_1536, 2048, 1536,
++ ov3640_setting_15fps_QXGA_2048_1536,
++ ARRAY_SIZE(ov3640_setting_15fps_QXGA_2048_1536)},
++ },
++ {
++ {ov3640_mode_VGA_640_480, 640, 480,
++ ov3640_setting_30fps_VGA_640_480,
++ ARRAY_SIZE(ov3640_setting_30fps_VGA_640_480)},
++ {ov3640_mode_QVGA_320_240, 320, 240,
++ ov3640_setting_30fps_QVGA_320_240,
++ ARRAY_SIZE(ov3640_setting_30fps_QVGA_320_240)},
++ {ov3640_mode_XGA_1024_768, 1024, 768,
++ ov3640_setting_30fps_XGA_1024_768,
++ ARRAY_SIZE(ov3640_setting_30fps_XGA_1024_768)},
++ {ov3640_mode_QXGA_2048_1536, 0, 0, NULL, 0},
++ },
++};
++/*
++static struct regulator *io_regulator;
++static struct regulator *core_regulator;
++static struct regulator *analog_regulator;
++static struct regulator *gpo_regulator;
++
++static int ov3640_probe(struct i2c_client *adapter,
++ const struct i2c_device_id *device_id);
++static int ov3640_remove(struct i2c_client *client);
++
++extern void gpio_sensor_active(unsigned int csi_index);
++extern void gpio_sensor_inactive(unsigned int csi);
++*/
++
++/*
++ XXX Controls to check....
++
++ Miss that one:
++ case V4L2_CID_SATURATION:
++ case V4L2_CID_HUE:
++ case V4L2_CID_DO_WHITE_BALANCE:
++ case V4L2_CID_GAMMA:
++*/
++
++static struct vcontrol {
++ struct v4l2_queryctrl qc;
++ int current_value;
++} video_control[] = {
++#ifndef OV3640_RAW_MODE
++ {
++ {
++ .id = V4L2_CID_BRIGHTNESS,
++ .type = V4L2_CTRL_TYPE_INTEGER,
++ .name = "Brightness",
++ .minimum = OV3640_MIN_BRIGHT,
++ .maximum = OV3640_MAX_BRIGHT,
++ .step = OV3640_BRIGHT_STEP,
++ .default_value = OV3640_DEF_BRIGHT,
++ },
++ .current_value = OV3640_DEF_BRIGHT,
++ }, {
++ {
++ .id = V4L2_CID_CONTRAST,
++ .type = V4L2_CTRL_TYPE_INTEGER,
++ .name = "Contrast",
++ .minimum = OV3640_MIN_CONTRAST,
++ .maximum = OV3640_MAX_CONTRAST,
++ .step = OV3640_CONTRAST_STEP,
++ .default_value = OV3640_DEF_CONTRAST,
++ },
++ .current_value = OV3640_DEF_CONTRAST,
++ }, {
++ {
++ .id = V4L2_CID_PRIVATE_BASE,
++ .type = V4L2_CTRL_TYPE_INTEGER,
++ .name = "Color Effects",
++ .minimum = OV3640_MIN_COLOR,
++ .maximum = OV3640_MAX_COLOR,
++ .step = OV3640_COLOR_STEP,
++ .default_value = OV3640_DEF_COLOR,
++ },
++ .current_value = OV3640_DEF_COLOR,
++ },{
++ {
++ .id = V4L2_CID_GAIN,
++ .type = V4L2_CTRL_TYPE_INTEGER,
++ .name = "Gain",
++ .minimum = 0,
++ .maximum = 63,
++ .step = 1,
++ .default_value = OV3640_DEF_GAIN,
++ },
++ .current_value = OV3640_DEF_GAIN,
++ }, {
++ {
++ .id = V4L2_CID_AUTOGAIN,
++ .type = V4L2_CTRL_TYPE_BOOLEAN,
++ .name = "Auto Gain",
++ .minimum = 0,
++ .maximum = 1,
++ .step = 0,
++ .default_value = OV3640_DEF_AUTOGAIN,
++ },
++ .current_value = OV3640_DEF_AUTOGAIN,
++ }, {
++ {
++ .id = V4L2_CID_EXPOSURE,
++ .type = V4L2_CTRL_TYPE_INTEGER,
++ .name = "Exposure",
++ .minimum = 0,
++ .maximum = 255,
++ .step = 1,
++ .default_value = OV3640_DEF_EXPOSURE,
++ },
++ .current_value = OV3640_DEF_EXPOSURE,
++ }, /* {
++ .id = V4L2_CID_AUTOEXPOSURE,
++ .type = V4L2_CTRL_TYPE_BOOLEAN,
++ .name = "Auto Exposure",
++ .minimum = 0,
++ .maximum = 1,
++ .step = 0,
++ .default_value = OV3640_DEF_AEC,
++ }, {
++ .id = V4L2_CID_FREEZE_AGCAEC,
++ .type = V4L2_CTRL_TYPE_BOOLEAN,
++ .name = "Freeze AGC/AEC",
++ .minimum = 0,
++ .maximum = 1,
++ .step = 0,
++ .default_value = OV3640_DEF_FREEZE_AGCAEC,
++ },*/ {
++ {
++ .id = V4L2_CID_RED_BALANCE,
++ .type = V4L2_CTRL_TYPE_INTEGER,
++ .name = "Red Balance",
++ .minimum = 0,
++ .maximum = 255,
++ .step = 1,
++ .default_value = OV3640_DEF_RED,
++ },
++ .current_value = OV3640_DEF_RED,
++ }, {
++ {
++ .id = V4L2_CID_BLUE_BALANCE,
++ .type = V4L2_CTRL_TYPE_INTEGER,
++ .name = "Blue Balance",
++ .minimum = 0,
++ .maximum = 255,
++ .step = 1,
++ .default_value = OV3640_DEF_BLUE,
++ },
++ .current_value = OV3640_DEF_BLUE,
++ }, {
++ {
++ .id = V4L2_CID_AUTO_WHITE_BALANCE,
++ .type = V4L2_CTRL_TYPE_BOOLEAN,
++ .name = "Auto White Balance",
++ .minimum = 0,
++ .maximum = 1,
++ .step = 0,
++ .default_value = OV3640_DEF_AWB,
++ },
++ .current_value = OV3640_DEF_AWB,
++ }, {
++ {
++ .id = V4L2_CID_HFLIP,
++ .type = V4L2_CTRL_TYPE_BOOLEAN,
++ .name = "Mirror Image",
++ .minimum = 0,
++ .maximum = 1,
++ .step = 0,
++ .default_value = OV3640_DEF_HFLIP,
++ },
++ .current_value = OV3640_DEF_HFLIP,
++ }, {
++ {
++ .id = V4L2_CID_VFLIP,
++ .type = V4L2_CTRL_TYPE_BOOLEAN,
++ .name = "Vertical Flip",
++ .minimum = 0,
++ .maximum = 1,
++ .step = 0,
++ .default_value = OV3640_DEF_VFLIP,
++ },
++ .current_value = OV3640_DEF_VFLIP,
++ },
++#endif
++};
++
++/* Returns the index of the requested ID from the control structure array */
++static int find_vctrl(int id)
++{
++ int i;
++
++ if (id < V4L2_CID_BASE)
++ return -EDOM;
++
++ for (i = (ARRAY_SIZE(video_control) - 1); i >= 0; i--)
++ if (video_control[i].qc.id == id)
++ break;
++ if (i < 0)
++ i = -EINVAL;
++ return i;
++}
++
++static struct v4l2_queryctrl ov3640_controls[ARRAY_SIZE(video_control)];
++
++/* extract V4L2 only controls from video_control[] (required by SoC) */
++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));
++ }
++}
++
++static int ov3640_write(struct i2c_client *client, u16 reg, u8 val)
++{
++ u8 au8Buf[3] = {0};
++
++ if (!client->adapter)
++ return -ENODEV;
++
++ au8Buf[0] = reg >> 8;
++ au8Buf[1] = reg & 0xff;
++ au8Buf[2] = val;
++
++ 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 0;
++}
++
++static int ov3640_read(struct i2c_client *client, u16 reg, u8 *val)
++{
++ u8 au8RegBuf[2] = {0};
++ u8 u8RdVal = 0;
++
++ if (!client->adapter)
++ return -ENODEV;
++
++ au8RegBuf[0] = reg >> 8;
++ au8RegBuf[1] = reg & 0xff;
++
++ if (2 != i2c_master_send(client, au8RegBuf, 2)) {
++ pr_err("%s:write reg error:reg=%x\n",
++ __func__, reg);
++ return -1;
++ }
++
++ 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;
++ }
++
++ *val = u8RdVal;
++
++ return u8RdVal;
++}
++
++/*static int ov3640_init_mode(struct i2c_client *client,
++ enum ov3640_frame_rate frame_rate,
++ enum ov3640_mode mode)*/
++
++static int ov3640_configure(struct soc_camera_device *icd)
++{
++ struct ov3640_sensor *ov3640 = container_of(icd, struct ov3640_sensor, icd);
++ struct v4l2_pix_format *pix = &ov3640->pix;
++// struct v4l2_fract *fper = &ov3640->timeperframe;
++ struct i2c_client *client = ov3640->i2c_client;
++
++ struct reg_value *pModeSetting = NULL;
++ s32 i = 0;
++ s32 iModeSettingArySize = 0;
++ register u32 Delay_ms = 0;
++ register u16 RegAddr = 0;
++ register u8 Mask = 0;
++ register u8 Val = 0;
++ u8 RegVal = 0;
++ int retval = 0;
++
++ /* 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"));
++
++ if (mode > ov3640_mode_MAX || mode < ov3640_mode_MIN) {
++ pr_err("Wrong ov3640 mode detected!\n");
++ return -1;
++ }
++
++ pModeSetting = ov3640_mode_info_data[frame_rate][mode].init_data_ptr;
++ iModeSettingArySize =
++ ov3640_mode_info_data[frame_rate][mode].init_data_size;
++
++ pix->width = ov3640_mode_info_data[frame_rate][mode].width;
++ pix->height = ov3640_mode_info_data[frame_rate][mode].height;
++
++ for (i = 0; i < iModeSettingArySize; ++i, ++pModeSetting) {
++ Delay_ms = pModeSetting->u32Delay_ms;
++ RegAddr = pModeSetting->u16RegAddr;
++ Val = pModeSetting->u8Val;
++ Mask = pModeSetting->u8Mask;
++
++ if (Mask) {
++ retval = ov3640_read(client, RegAddr, &RegVal);
++ if (retval < 0)
++ goto err;
++
++ RegVal &= ~(u8)Mask;
++ Val &= Mask;
++ Val |= RegVal;
++ }
++
++ retval = ov3640_write(client, RegAddr, Val);
++ if (retval < 0)
++ goto err;
++
++ if (Delay_ms)
++ msleep(Delay_ms);
++ }
++err:
++ CAMERA_TRACE(("CAMERA_DBG Exit: ov3640_init_mode\n"));
++
++ return retval;
++}
++
++/* --------------- IOCTL functions from v4l2_int_ioctl_desc --------------- */
++#if 0
++static int ioctl_g_ifparm(struct v4l2_int_device *s, struct v4l2_ifparm *p)
++{
++ CAMERA_TRACE(("In ov3640:ioctl_g_ifparm\n"));
++ if (s == NULL) {
++ pr_err(" ERROR!! no slave device set!\n");
++ return -1;
++ }
++
++ memset(p, 0, sizeof(*p));
++ p->u.bt656.clock_curr = ov3640_data.mclk;
++ pr_debug(" clock_curr=mclk=%d\n", ov3640_data.mclk);
++ p->if_type = V4L2_IF_TYPE_BT656;
++ p->u.bt656.mode = V4L2_IF_TYPE_BT656_MODE_NOBT_8BIT;
++ p->u.bt656.clock_min = OV3640_XCLK_MIN;
++ p->u.bt656.clock_max = OV3640_XCLK_MAX;
++ p->u.bt656.bt_sync_correct = 1; /* Indicate external vsync */
++
++ return 0;
++}
++
++static int ioctl_g_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a)
++{
++ struct sensor *sensor = s->priv;
++ struct v4l2_captureparm *cparm = &a->parm.capture;
++ int ret = 0;
++
++ CAMERA_TRACE(("In ov3640:ioctl_g_parm\n"));
++ switch (a->type) {
++ /* This is the only case currently handled. */
++ case V4L2_BUF_TYPE_VIDEO_CAPTURE:
++ CAMERA_TRACE((" type is V4L2_BUF_TYPE_VIDEO_CAPTURE\n"));
++ memset(a, 0, sizeof(*a));
++ a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
++ cparm->capability = sensor->streamcap.capability;
++ cparm->timeperframe = sensor->streamcap.timeperframe;
++ cparm->capturemode = sensor->streamcap.capturemode;
++ ret = 0;
++ break;
++
++ /* These are all the possible cases. */
++ case V4L2_BUF_TYPE_VIDEO_OUTPUT:
++ case V4L2_BUF_TYPE_VIDEO_OVERLAY:
++ case V4L2_BUF_TYPE_VBI_CAPTURE:
++ case V4L2_BUF_TYPE_VBI_OUTPUT:
++ case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
++ case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
++ CAMERA_TRACE((" type is not " \
++ "V4L2_BUF_TYPE_VIDEO_CAPTURE but %d\n",
++ a->type));
++ ret = -EINVAL;
++ break;
++
++ default:
++ pr_debug(" type is unknown - %d\n", a->type);
++ ret = -EINVAL;
++ break;
++ }
++
++ return ret;
++}
++#endif
++
++#if 0
++static int ioctl_s_parm(struct v4l2_int_device *s, struct v4l2_streamparm *a)
++{
++ struct sensor *sensor = s->priv;
++ struct v4l2_fract *timeperframe = &a->parm.capture.timeperframe;
++ u32 tgt_fps; /* target frames per secound */
++ enum ov3640_frame_rate frame_rate;
++ int ret = 0;
++
++ CAMERA_TRACE(("In ov3640:ioctl_s_parm\n"));
++ switch (a->type) {
++ /* This is the only case currently handled. */
++ case V4L2_BUF_TYPE_VIDEO_CAPTURE:
++ CAMERA_TRACE((" type is V4L2_BUF_TYPE_VIDEO_CAPTURE\n"));
++
++ /* Check that the new frame rate is allowed. */
++ if ((timeperframe->numerator == 0) ||
++ (timeperframe->denominator == 0)) {
++ timeperframe->denominator = DEFAULT_FPS;
++ timeperframe->numerator = 1;
++ }
++
++ tgt_fps = timeperframe->denominator /
++ timeperframe->numerator;
++
++ if (tgt_fps > MAX_FPS) {
++ timeperframe->denominator = MAX_FPS;
++ timeperframe->numerator = 1;
++ } else if (tgt_fps < MIN_FPS) {
++ timeperframe->denominator = MIN_FPS;
++ timeperframe->numerator = 1;
++ }
++
++ /* Actual frame rate we use */
++ tgt_fps = timeperframe->denominator /
++ timeperframe->numerator;
++
++ if (tgt_fps == 15)
++ frame_rate = ov3640_15_fps;
++ else if (tgt_fps == 30)
++ frame_rate = ov3640_30_fps;
++ else {
++ pr_err(" The camera frame rate is not supported!\n");
++ return -EINVAL;
++ }
++
++ sensor->streamcap.timeperframe = *timeperframe;
++ sensor->streamcap.capturemode =
++ (u32)a->parm.capture.capturemode;
++
++ ret = ov3640_init_mode(frame_rate,
++ sensor->streamcap.capturemode);
++ break;
++
++ /* These are all the possible cases. */
++ case V4L2_BUF_TYPE_VIDEO_OUTPUT:
++ case V4L2_BUF_TYPE_VIDEO_OVERLAY:
++ case V4L2_BUF_TYPE_VBI_CAPTURE:
++ case V4L2_BUF_TYPE_VBI_OUTPUT:
++ case V4L2_BUF_TYPE_SLICED_VBI_CAPTURE:
++ case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
++ pr_debug(" type is not " \
++ "V4L2_BUF_TYPE_VIDEO_CAPTURE but %d\n",
++ a->type);
++ ret = -EINVAL;
++ break;
++
++ default:
++ pr_debug(" type is unknown - %d\n", a->type);
++ ret = -EINVAL;
++ break;
++ }
++
++ return ret;
++}
++
++/*
++ case V4L2_CID_BRIGHTNESS:
++ vc->value = ov3640_data.brightness;
++ case V4L2_CID_HUE:
++ vc->value = ov3640_data.hue;
++ case V4L2_CID_CONTRAST:
++ vc->value = ov3640_data.contrast;
++ case V4L2_CID_SATURATION:
++ vc->value = ov3640_data.saturation;
++ case V4L2_CID_RED_BALANCE:
++ vc->value = ov3640_data.red;
++ case V4L2_CID_BLUE_BALANCE:
++ vc->value = ov3640_data.blue;
++ case V4L2_CID_EXPOSURE:
++ vc->value = ov3640_data.ae_mode;
++*/
++/*
++ case V4L2_CID_BRIGHTNESS:
++ case V4L2_CID_CONTRAST:
++ case V4L2_CID_SATURATION:
++ case V4L2_CID_HUE:
++ case V4L2_CID_AUTO_WHITE_BALANCE:
++ case V4L2_CID_DO_WHITE_BALANCE:
++ case V4L2_CID_RED_BALANCE:
++ case V4L2_CID_BLUE_BALANCE:
++ case V4L2_CID_GAMMA:
++ case V4L2_CID_EXPOSURE:
++ case V4L2_CID_AUTOGAIN:
++ case V4L2_CID_GAIN:
++ case V4L2_CID_HFLIP:
++ case V4L2_CID_VFLIP:
++*/
++#endif
++
++#if 0
++static int ioctl_dev_init(struct v4l2_int_device *s)
++{
++ struct sensor *sensor = s->priv;
++ u32 tgt_xclk; /* target xclk */
++ u32 tgt_fps; /* target frames per secound */
++ enum ov3640_frame_rate frame_rate;
++
++ CAMERA_TRACE(("In ov3640:ioctl_dev_init\n"));
++
++ gpio_sensor_active(ov3640_data.csi);
++ ov3640_data.on = true;
++
++ /* mclk */
++ tgt_xclk = ov3640_data.mclk;
++ tgt_xclk = min(tgt_xclk, (u32)OV3640_XCLK_MAX);
++ tgt_xclk = max(tgt_xclk, (u32)OV3640_XCLK_MIN);
++ ov3640_data.mclk = tgt_xclk;
++
++ pr_debug(" Setting mclk to %d MHz\n", tgt_xclk / 1000000);
++ set_mclk_rate(&ov3640_data.mclk, ov3640_data.csi);
++
++ /* Default camera frame rate is set in probe */
++ tgt_fps = sensor->streamcap.timeperframe.denominator /
++ sensor->streamcap.timeperframe.numerator;
++
++ if (tgt_fps == 15)
++ frame_rate = ov3640_15_fps;
++ else if (tgt_fps == 30)
++ frame_rate = ov3640_30_fps;
++ else
++ return -EINVAL; /* Only support 15fps or 30fps now. */
++
++ return ov3640_init_mode(frame_rate,
++ sensor->streamcap.capturemode);
++}
++#endif
++
++static int ov3640_detect(struct i2c_client *client)
++{
++ u8 pidh, pidl, sccb_id;
++
++ 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;
++
++ 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) ))
++ /*
++ * We didn't read the values we expected, so
++ * this must not be an OV3640.
++ */
++ return -ENODEV;
++
++ return pidl;
++}
++
++
++static int ov3640_get_control(struct soc_camera_device *icd,
++ struct v4l2_control *vctrl)
++{
++/* struct ov3640_sensor *sensor = container_of(icd, struct ov3640_sensor, icd);
++ struct i2c_client *client = sensor->i2c_client; */
++ int i/*, val*/;
++ struct vcontrol *lvc;
++
++ i = find_vctrl(vctrl->id);
++ if (i < 0)
++ return -EINVAL;
++
++ lvc = (struct vcontrol *)&video_control[i];
++/* XXX if (ov3640_read_reg_mask(client, lvc->reg, (u8 *)&val, lvc->mask))
++ return -EIO;
++
++ val = val >> lvc->start_bit;
++ if (val >= 0) {
++ vctrl->value = lvc->current_value = val;
++ return 0;
++ } else
++ return val; */
++
++ vctrl->value = lvc->current_value;
++ return 0;
++}
++
++static int ov3640_set_control(struct soc_camera_device *icd,
++ struct v4l2_control *ctrl)
++{
++/* struct ov3640_sensor *sensor = container_of(icd, struct ov3640_sensor, icd);
++ struct i2c_client *client = sensor->i2c_client; */
++ struct vcontrol *lvc;
++ int val = ctrl->value;
++ int i;
++
++ i = find_vctrl(ctrl->id);
++ if (i < 0)
++ return -EINVAL;
++
++ lvc = (struct vcontrol *)&video_control[i];
++/* XXX val = val << lvc->start_bit;
++ if (ov3640_write_reg_mask(client, lvc->reg, (u8 *)&val, (u8)lvc->mask))
++ return -EIO;
++
++ val = val >> lvc->start_bit;
++ if (val >= 0) {
++ lvc->current_value = val;
++ return 0;
++ } else
++ return val; */
++
++ lvc->current_value = val;
++ return 0;
++}
++
++static int ov3640_get_chip_id(struct soc_camera_device *icd,
++ struct v4l2_dbg_chip_ident *id)
++{
++ struct ov3640_sensor *ov3640 = container_of(icd, struct ov3640_sensor, icd);
++
++ if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)
++ return -EINVAL;
++
++ if (id->match.addr != ov3640->i2c_client->addr)
++ return -ENODEV;
++
++ id->ident = ov3640->model;
++ id->revision = 0;
++
++ return 0;
++}
++
++
++static int ov3640_try_fmt(struct soc_camera_device *icd, struct v4l2_format *fmt)
++{
++ printk("- %s\n", __func__);
++ return 0;
++}
++
++static int ov3640_release(struct soc_camera_device *icd)
++{
++ printk("- %s\n", __func__);
++ return 0;
++}
++
++static int ov3640_start_capture(struct soc_camera_device *icd)
++{
++ printk("- %s\n", __func__);
++ return 0;
++}
++
++static int ov3640_stop_capture(struct soc_camera_device *icd)
++{
++ printk("- %s\n", __func__);
++ return 0;
++}
++
++static int ov3640_set_bus_param(struct soc_camera_device *icd,
++ unsigned long flags)
++{
++ printk("- %s\n", __func__);
++ return 0;
++}
++
++static unsigned long ov3640_query_bus_param(struct soc_camera_device *icd)
++{
++ unsigned int width_flag = SOCAM_DATAWIDTH_10 | SOCAM_DATAWIDTH_8;
++
++ /* OV3640 has all capture_format parameters fixed */
++ return SOCAM_PCLK_SAMPLE_RISING |
++ SOCAM_HSYNC_ACTIVE_HIGH |
++ SOCAM_VSYNC_ACTIVE_HIGH |
++ SOCAM_MASTER |
++ width_flag;
++}
++
++static int ov3640_set_fmt(struct soc_camera_device *icd,
++ __u32 pixfmt,
++ struct v4l2_rect *rect)
++{
++ struct ov3640_sensor *ov3640 = container_of(icd, struct ov3640_sensor, icd);
++ int ret;
++ int i;
++
++ printk("%s %d 0x%08x\n", __func__, __LINE__, pixfmt);
++
++ for (i = 0; i < NUM_CAPTURE_FORMATS; i++) {
++ if (pixfmt == ov3640_formats[i].fourcc) {
++ ov3640->pix.pixelformat = ov3640_formats[i].fourcc;
++ icd->current_fmt = &ov3640_formats[i];
++ break;
++ }
++ }
++ if (i == NUM_CAPTURE_FORMATS)
++ return -EINVAL;
++
++ printk("%s %d 0x%08x\n", __func__, __LINE__, pixfmt);
++
++ ov3640->pix.width = rect->width;
++ ov3640->pix.height = rect->height;
++
++ ret = ov3640_configure(icd);
++
++ return ret;
++}
++
++static void ov3640_reset(struct i2c_client *client)
++{
++ /* XXX: tweak register 0x3104 */
++ msleep(1);
++}
++
++static int ov3640_init(struct soc_camera_device *icd)
++{
++ struct ov3640_sensor *ov3640 = container_of(icd, struct ov3640_sensor, icd);
++ struct soc_camera_link *icl = ov3640->i2c_client->dev.platform_data;
++ int ret;
++
++ if (icl->power) {
++ ret = icl->power(&ov3640->i2c_client->dev, 1);
++ if (ret < 0) {
++ dev_err(&ov3640->i2c_client->dev,
++ "Platform failed to power-on the camera.\n");
++ return ret;
++ }
++ }
++
++ return 0;
++}
++
++
++#ifdef CONFIG_VIDEO_ADV_DEBUG
++static int ov3640_get_register(struct soc_camera_device *icd,
++ struct v4l2_register *reg)
++{
++ struct ov3640_sensor *ov3640 = container_of(icd, struct ov3640_sensor, icd);
++ int ret;
++ u8 val;
++
++ if (reg->match_type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
++ return -EINVAL;
++
++ if (reg->match_chip != ov3640->i2c_client->addr)
++ return -ENODEV;
++
++ ret = ov3640_read(ov3640->i2c_client, (u8)reg->reg, &val);
++ if (ret)
++ return ret;
++
++ reg->val = val;
++
++ return 0;
++}
++
++static int ov3640_set_register(struct soc_camera_device *icd,
++ struct v4l2_register *reg)
++{
++ struct ov3640_sensor *ov3640 = container_of(icd, struct ov3640_sensor, icd);
++ int ret;
++
++ if (reg->match_type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
++ return -EINVAL;
++
++ if (reg->match_chip != ov3640->i2c_client->addr)
++ return -ENODEV;
++
++ ret = ov3640_write(ov3640->i2c_client, (u8)reg->reg, (u8)reg->val);
++ if (ret)
++ return ret;
++
++ return 0;
++}
++#endif /* CONFIG_VIDEO_ADV_DEBUG */
++
++static int ov3640_video_probe(struct soc_camera_device *icd)
++{
++ struct ov3640_sensor *ov3640 = container_of(icd, struct ov3640_sensor, icd);
++ struct soc_camera_link *icl = ov3640->i2c_client->dev.platform_data;
++ struct i2c_client *client = ov3640->i2c_client;
++ int version, ret;
++
++ if (icl->reset) {
++ ret = icl->reset(&ov3640->i2c_client->dev);
++ } else {
++ dev_info(&client->dev, "No hardware reset available,"
++ " using soft one\n");
++ ov3640_reset(client); /* soft reset */
++ }
++
++ version = ov3640_detect(client);
++ if (version < 0) {
++ dev_err(&client->dev, "Unable to detect " DRIVER_NAME " sensor\n");
++ return version;
++ }
++
++ dev_info(&icd->dev, "Detected an ov3640 sensor (rev %x)\n", version);
++ ov3640->model = V4L2_IDENT_OV3640;
++ icd->formats = ov3640_formats;
++ icd->num_formats = NUM_CAPTURE_FORMATS;
++
++ /* configure default image size and pixel format */
++/* ret = ov3640_write_regs(client, ov3640_reg_init[YUV][QVGA]);
++ if (ret)
++ goto err;
++*/
++ /* Now that we know the model, we can start video */
++ ret = soc_camera_video_start(icd);
++ if (ret)
++ goto err;
++
++ return 0;
++
++err:
++ return ret;
++}
++
++static void ov3640_video_remove(struct soc_camera_device *icd)
++{
++ struct ov3640_sensor *ov3640 = container_of(icd, struct ov3640_sensor, icd);
++
++ dev_dbg(&icd->dev, "Video %x removed: %p, %p\n", ov3640->i2c_client->addr,
++ ov3640->icd.dev.parent, ov3640->icd.vdev);
++ soc_camera_video_stop(icd);
++}
++
++static int ov3640_suspend(struct soc_camera_device *icd, pm_message_t state)
++{
++ struct ov3640_sensor *ov3640 = container_of(icd, struct ov3640_sensor, icd);
++ struct soc_camera_link *icl = ov3640->i2c_client->dev.platform_data;
++ int ret;
++
++ printk("--- %s %d\n", __func__, state.event);
++
++ if (icl->power) {
++ ret = icl->power(&ov3640->i2c_client->dev, 0);
++ if (ret < 0) {
++ dev_err(&icd->dev,
++ "Platform failed to powerdown the camera.\n");
++ return ret;
++ }
++ }
++
++ return 0;
++}
++
++static int ov3640_resume(struct soc_camera_device *icd)
++{
++ struct ov3640_sensor *ov3640 = container_of(icd, struct ov3640_sensor, icd);
++ struct soc_camera_link *icl = ov3640->i2c_client->dev.platform_data;
++ int ret;
++
++ printk("--- %s\n", __func__);
++
++ if (icl->power) {
++ ret = icl->power(&ov3640->i2c_client->dev, 1);
++ if (ret < 0) {
++ dev_err(&icd->dev,
++ "Platform failed to resume the camera.\n");
++ return ret;
++ }
++ }
++
++ return 0;
++}
++
++static struct soc_camera_ops ov3640_ops = {
++ .owner = THIS_MODULE,
++ .probe = ov3640_video_probe,
++ .remove = ov3640_video_remove,
++ .suspend = ov3640_suspend,
++ .resume = ov3640_resume,
++ .init = ov3640_init,
++ .release = ov3640_release,
++ .start_capture = ov3640_start_capture,
++ .stop_capture = ov3640_stop_capture,
++ .set_fmt = ov3640_set_fmt,
++ .try_fmt = ov3640_try_fmt,
++ .set_bus_param = ov3640_set_bus_param,
++ .query_bus_param = ov3640_query_bus_param,
++ .controls = ov3640_controls,
++ .num_controls = ARRAY_SIZE(ov3640_controls),
++ .get_control = ov3640_get_control,
++ .set_control = ov3640_set_control,
++ .get_chip_id = ov3640_get_chip_id,
++#ifdef CONFIG_VIDEO_ADV_DEBUG
++ .get_register = ov3640_get_register,
++ .set_register = ov3640_set_register,
++#endif
++};
++
++static int __init ov3640_probe(struct i2c_client *client,
++ const struct i2c_device_id *id)
++{
++ struct ov3640_sensor *ov3640;
++ struct soc_camera_device *icd;
++ struct soc_camera_link *icl = client->dev.platform_data;
++ int ret;
++
++ if (!icl) {
++ dev_err(&client->dev, DRIVER_NAME " driver needs platform data\n");
++ return -EINVAL;
++ }
++
++ if (i2c_get_clientdata(client))
++ return -EBUSY;
++
++ ov3640 = kzalloc(sizeof(struct ov3640_sensor), GFP_KERNEL);
++ if (!ov3640)
++ return -ENOMEM;
++
++ ov3640->i2c_client = client;
++ i2c_set_clientdata(client, ov3640);
++
++ /* Second stage probe - when a capture adapter is there */
++ icd = &(ov3640->icd);
++ ov3640_allocate_video_controls();
++ icd->ops = &ov3640_ops;
++ icd->control = &client->dev;
++ icd->x_min = 20; /* to check */
++ icd->y_min = 12; /* to check */
++ icd->x_current = 20; /* to check */
++ icd->y_current = 12; /* to check */
++ icd->width_min = 88; /* to check */
++ icd->width_max = 2048;
++ icd->height_min = 72; /* to check */
++ icd->height_max = 1536;
++ icd->y_skip_top = 1; /* to check */
++/* icd->iface = icl->bus_id; XXX */
++
++ ret = soc_camera_device_register(icd);
++ if (ret)
++ goto err;
++
++ return 0;
++
++err:
++ i2c_set_clientdata(client, NULL);
++ kfree(ov3640);
++ return ret;
++}
++
++static int ov3640_remove(struct i2c_client *client)
++{
++ struct ov3640_sensor *ov3640 = i2c_get_clientdata(client);
++
++ if (!client->adapter)
++ return -ENODEV; /* our client isn't attached */
++
++ soc_camera_device_unregister(&ov3640->icd);
++// ov3640_free_video_controls();
++ i2c_set_clientdata(client, NULL);
++ kfree(ov3640);
++
++ return 0;
++}
++
++static const struct i2c_device_id ov3640_id[] = {
++ {DRIVER_NAME, 0},
++ {},
++};
++
++MODULE_DEVICE_TABLE(i2c, ov3640_id);
++
++static struct i2c_driver ov3640_i2c_driver = {
++ .driver = {
++ .owner = THIS_MODULE,
++ .name = DRIVER_NAME,
++ },
++ .probe = ov3640_probe,
++ .remove = __exit_p(ov3640_remove),
++ .id_table = ov3640_id,
++};
++
++static __init int ov3640_mod_init(void)
++{
++ printk(KERN_NOTICE "OmniVision ov3640 sensor driver, at your service\n");
++ return i2c_add_driver(&ov3640_i2c_driver);
++}
++
++static void __exit ov3640_mod_exit(void)
++{
++ i2c_del_driver(&ov3640_i2c_driver);
++}
++
++module_init(ov3640_mod_init);
++module_exit(ov3640_mod_exit);
++
++MODULE_DESCRIPTION("SoC camera driver for OV3640");
++MODULE_AUTHOR("Julien Boibessot <jul...@ar...>");
++MODULE_LICENSE("GPL");
++MODULE_VERSION("0.1");
+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-19 11:00:29.000000000 +0200
+@@ -0,0 +1,596 @@
++/*
++ * drivers/media/video/ov3640_regs.h
++ *
++ * Register definitions for the OV3640 CameraChip.
++ *
++ * Contributors:
++ * Pallavi Kulkarni <p-k...@ti...>
++ * Sergio Aguirre <saa...@ti...>
++ *
++ * Copyright (C) 2009 Texas Instruments.
++ *
++ * This file is licens...
[truncated message content] |
|
From: Fabien M <fa...@us...> - 2010-07-19 08:23: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 3e91ca504f9dca1f5a964d732c0c4d6278bb3936 (commit)
from 83c117b0b082761d1433f71437866effc5c7c008 (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 3e91ca504f9dca1f5a964d732c0c4d6278bb3936
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jul 19 10:23:33 2010 +0200
[buildroot] fix little bug in strip command for joystick and pickit2 patches
-----------------------------------------------------------------------
Summary of changes:
...est-add_joystick_testing_programs_package.patch | 4 ++--
...ickit2-add_pickit2_programer_command_line.patch | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
index eeb1fb1..3b234cf 100644
--- a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
+++ b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
@@ -56,8 +56,8 @@ Index: buildroot/package/joysticktest/joysticktest.mk
+$(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY): $(JOYSTICKTEST_DIR)/$(JOYSTICKTEST_BINARY)
+ $(INSTALL) -D $(JOYSTICKTEST_DIR)/jstest $(TARGET_DIR)/usr/bin/
+ $(INSTALL) -D $(JOYSTICKTEST_DIR)/jscal $(TARGET_DIR)/usr/bin/
-+ $(STRIPCMD) $(STRIP_STRIPUNEEDED) $(TARGET_DIR)/usr/bin/jstest
-+ $(STRIPCMD) $(STRIP_STRIPUNEEDED) $(TARGET_DIR)/usr/bin/jscal
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/jstest
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/jscal
+
+joysticktest: uclibc $(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY)
+
diff --git a/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch b/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
index a95a9e1..339b209 100644
--- a/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
+++ b/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
@@ -58,7 +58,7 @@ Index: buildroot/package/pickit2/pickit2.mk
+$(TARGET_DIR)/$(PICKIT2_TARGET_BINARY): $(PICKIT2_DIR)/$(PICKIT2_BINARY)
+ $(INSTALL) -D $(PICKIT2_DIR)/PK2DeviceFile.dat $(TARGET_DIR)/usr/share/pk2/PK2DeviceFile.dat
+ $(INSTALL) -D $(PICKIT2_DIR)/pk2cmd $(TARGET_DIR)/usr/bin/pk2cmd
-+ $(STRIPCMD) $(STRIP_STRIPUNEEDED) $(TARGET_DIR)/usr/bin/pk2cmd
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/pk2cmd
+
+pickit2: libusb $(TARGET_DIR)/$(PICKIT2_TARGET_BINARY)
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-07-16 09:11:25
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 83c117b0b082761d1433f71437866effc5c7c008 (commit)
via f39d43def2ad4ec21efdc395dc7f7d4fac82eb2e (commit)
from bbb29f3b2a8527db32bac9971fa16b566d239678 (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 83c117b0b082761d1433f71437866effc5c7c008
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jul 16 11:10:34 2010 +0200
[BUILDROOT] Updates apf27 test config
commit f39d43def2ad4ec21efdc395dc7f7d4fac82eb2e
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 15 11:21:13 2010 +0200
[BUILDROOT] [2010.05] Add LBreakout2 and LTris games
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/apf27_test.config | 235 ++++++++++++++------
.../2010.05/130-lbreakout-add_package.patch | 81 +++++++
.../2010.05/131-ltetris-add_package.patch | 84 +++++++
patches/buildroot/2010.05/cleanup_buildroot.sh | 3 +
4 files changed, 340 insertions(+), 63 deletions(-)
create mode 100644 patches/buildroot/2010.05/130-lbreakout-add_package.patch
create mode 100644 patches/buildroot/2010.05/131-ltetris-add_package.patch
diff --git a/buildroot/local/apf27_test/apf27_test.config b/buildroot/local/apf27_test/apf27_test.config
index 190ba47..20ae4a1 100644
--- a/buildroot/local/apf27_test/apf27_test.config
+++ b/buildroot/local/apf27_test/apf27_test.config
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Jun 24 16:14:29 2010
+# Thu Jul 15 10:50:44 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -194,6 +194,7 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.29.6"
# BR2_UCLIBC_VERSION_0_9_28_3 is not set
BR2_UCLIBC_VERSION_0_9_29=y
# BR2_UCLIBC_VERSION_SNAPSHOT is not set
+BR2_UCLIBC_CONFIG=".//local/apf27_test/uclibc-0.9.29.config"
# BR2_ENABLE_LOCALE is not set
# BR2_PTHREADS_NONE is not set
# BR2_PTHREADS is not set
@@ -291,6 +292,7 @@ BR2_BUSYBOX_VERSION_1_12_X=y
# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
BR2_BUSYBOX_VERSION="1.12.1"
BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
+BR2_PACKAGE_BUSYBOX_CONFIG=".//local/apf27_test/busybox-1.12.1.config"
BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
# BR2_PACKAGE_BUSYBOX_SKELETON is not set
@@ -328,41 +330,6 @@ BR2_READLINE=y
# BR2_PACKAGE_PCRE is not set
#
-# Armadeus specific packages
-#
-# BR2_PACKAGE_UUCP is not set
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
-
-#
-# bluez-utils not available (need dbus)
-#
-# BR2_PACKAGE_MESALIB is not set
-BR2_PACKAGE_FBTEST=y
-# BR2_PACKAGE_IMXSSI is not set
-# BR2_PACKAGE_GPM is not set
-# BR2_PACKAGE_DUMMY is not set
-# BR2_PACKAGE_SNES9X is not set
-# BR2_PACKAGE_AS_DEVICES is not set
-
-#
-# Armadeus specific tools/utilities
-#
-BR2_PACKAGE_ARMADEUS_DEMOS=y
-
-#
-# Choose the demos to install
-#
-BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
-BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
-BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
-BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
-BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
-BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
-BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
-
-#
# Other stuff
#
# BR2_PACKAGE_AT is not set
@@ -401,7 +368,33 @@ BR2_PACKAGE_LTRACE=y
# BR2_PACKAGE_STARTUP_NOTIFICATION is not set
BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_SUDO is not set
-# BR2_PACKAGE_XENOMAI is not set
+
+#
+# Armadeus specific tools/utilities
+#
+BR2_PACKAGE_AD9889CTRL=y
+# BR2_PACKAGE_AS_DEVICES is not set
+# BR2_PACKAGE_CH7024CTRL is not set
+BR2_PACKAGE_ARMADEUS_DEMOS=y
+
+#
+# Choose the demos to install
+#
+BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
+BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
+BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
+BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE=y
+BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
+BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
+BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_IMXREGS=y
+# BR2_PACKAGE_IMXSSI is not set
+BR2_PACKAGE_MAX5821CTRL=y
+BR2_PACKAGE_ARMADEUS_TESTSUITE=y
# BR2_DATABASE_SUPPORT is not set
BR2_TEXTEDIT_SUPPORT=y
# BR2_PACKAGE_ED is not set
@@ -417,6 +410,11 @@ BR2_NETWORK_SUPPORT=y
# BR2_PACKAGE_AXEL is not set
BR2_PACKAGE_BOA=y
# BR2_PACKAGE_BIND is not set
+BR2_PACKAGE_BLUEZ_LIBS=y
+
+#
+# bluez-utils not available (need dbus)
+#
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_DNSMASQ is not set
BR2_PACKAGE_DROPBEAR=y
@@ -462,7 +460,9 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_OPENNTPD is not set
# BR2_PACKAGE_OPENOBEX is not set
# BR2_PACKAGE_OPENSSH is not set
-# BR2_PACKAGE_OPENSSL is not set
+BR2_PACKAGE_OPENSSL=y
+# BR2_PACKAGE_OPENSSL_BIN is not set
+# BR2_PACKAGE_OPENSSL_ENGINES is not set
# BR2_PACKAGE_OPENVPN is not set
# BR2_PACKAGE_OPENSWAN is not set
BR2_PACKAGE_PORTMAP=y
@@ -496,15 +496,19 @@ BR2_PACKAGE_TCPDUMP=y
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
# BR2_PACKAGE_USSP_PUSH is not set
+# BR2_PACKAGE_UUCP is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
# BR2_PACKAGE_WEBIF is not set
BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
+BR2_PACKAGE_WPA_SUPPLICANT_OPENSSL=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_BLOCKDEV_SUPPORT=y
-BR2_PACKAGE_ARMADEUS_TESTSUITE=y
-BR2_PACKAGE_AD9889CTRL=y
-# BR2_PACKAGE_CH7024CTRL is not set
+BR2_PACKAGE_CWIID=y
#
# dbus not available (need expat or libxml2)
@@ -515,23 +519,90 @@ BR2_PACKAGE_AD9889CTRL=y
# BR2_PACKAGE_E2FSPROGS is not set
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
+BR2_PACKAGE_FIRMWARE=y
+
+#
+# Video
+#
+
+#
+# WiFi chipsets
+#
+BR2_PACKAGE_FIRMWARE_88W8686=y
+BR2_PACKAGE_FIRMWARE_88W8686_SDIO=y
+# BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8 is not set
+BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9=y
+# BR2_PACKAGE_FIRMWARE_88W8686_GSPI is not set
+
+#
+# Others
+#
# BR2_PACKAGE_FIS is not set
-BR2_PACKAGE_FPGAREGS=y
# BR2_PACKAGE_LIBFUSE is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
+# BR2_PACKAGE_GPM is not set
+BR2_PACKAGE_GPSD=y
+
+#
+# devices/protocol support
+#
+BR2_PACKAGE_GPSD_ASHTECH=y
+BR2_PACKAGE_GPSD_AIVDM=y
+BR2_PACKAGE_GPSD_EARTHMATE=y
+BR2_PACKAGE_GPSD_EVERMORE=y
+BR2_PACKAGE_GPSD_FV18=y
+BR2_PACKAGE_GPSD_GARMIN=y
+# BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT is not set
+BR2_PACKAGE_GPSD_GPSLOCK=y
+BR2_PACKAGE_GPSD_ITRAX=y
+BR2_PACKAGE_GPSD_MTK3301=y
+BR2_PACKAGE_GPSD_NMEA=y
+BR2_PACKAGE_GPSD_NTRIP=y
+BR2_PACKAGE_GPSD_NAVCOM=y
+BR2_PACKAGE_GPSD_OCEANSERVER=y
+BR2_PACKAGE_GPSD_ONCORE=y
+BR2_PACKAGE_GPSD_RTCM104V2=y
+BR2_PACKAGE_GPSD_RTCM104V3=y
+BR2_PACKAGE_GPSD_SIRF=y
+BR2_PACKAGE_GPSD_SUPERSTAR2=y
+BR2_PACKAGE_GPSD_TRIMBLE_TSIP=y
+BR2_PACKAGE_GPSD_TRIPMATE=y
+# BR2_PACKAGE_GPSD_TRUE_NORTH is not set
+BR2_PACKAGE_GPSD_UBX=y
+BR2_PACKAGE_GPSD_DEVICES="/dev/ttyS1"
+
+#
+# gpsd features
+#
+BR2_PACKAGE_GPSD_TIMING=y
+BR2_PACKAGE_GPSD_CLIENT_DEBUG=y
+BR2_PACKAGE_GPSD_OLDSTYLE=y
+# BR2_PACKAGE_GPSD_PROFILING is not set
+BR2_PACKAGE_GPSD_NTP_SHM=y
+BR2_PACKAGE_GPSD_PPS=y
+# BR2_PACKAGE_GPSD_PPS_ON_CTS is not set
+# BR2_PACKAGE_GPSD_USER is not set
+# BR2_PACKAGE_GPSD_GROUP is not set
+# BR2_PACKAGE_GPSD_FIXED_PORT_SPEED is not set
+# BR2_PACKAGE_GPSD_MAX_CLIENT is not set
+# BR2_PACKAGE_GPSD_MAX_DEV is not set
+BR2_PACKAGE_GPSD_RECONFIGURE=y
+BR2_PACKAGE_GPSD_CONTROLSEND=y
+# BR2_PACKAGE_GPSD_RAW is not set
+BR2_PACKAGE_GPSD_CPP_BINDINGS=y
+# BR2_PACKAGE_GPSD_SQUELCH is not set
# BR2_PACKAGE_HAL is not set
# BR2_PACKAGE_HWDATA is not set
BR2_PACKAGE_I2C_TOOLS=y
# BR2_PACKAGE_INPUT_TOOLS is not set
-BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IOSTAT is not set
+# BR2_PACKAGE_PICKIT2 is not set
# BR2_PACKAGE_LCD4LINUX is not set
# BR2_PACKAGE_LIBAIO is not set
# BR2_PACKAGE_LIBRAW1394 is not set
BR2_PACKAGE_LIBUSB=y
# BR2_PACKAGE_LM_SENSORS is not set
# BR2_PACKAGE_LVM2 is not set
-BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTESTER is not set
# BR2_PACKAGE_MKDOSFS is not set
@@ -557,7 +628,6 @@ BR2_PACKAGE_MTD_FLASH_UNLOCK=y
# BR2_PACKAGE_MTD_FTL_FORMAT is not set
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
-# BR2_PACKAGE_MTD_MKFSJFFS is not set
BR2_PACKAGE_MTD_MTD_DEBUG=y
BR2_PACKAGE_MTD_NANDDUMP=y
BR2_PACKAGE_MTD_NANDTEST=y
@@ -582,6 +652,7 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_USBMOUNT is not set
# BR2_PACKAGE_USBUTILS is not set
# BR2_PACKAGE_WIPE is not set
+# BR2_PACKAGE_XENOMAI is not set
# BR2_PACKAGE_XFSPROGS is not set
BR2_AUDIO_SUPPORT=y
BR2_PACKAGE_ALSA_LIB=y
@@ -622,6 +693,7 @@ BR2_PACKAGE_MADPLAY_ALSA=y
BR2_PACKAGE_MPG123_ALSA=y
# BR2_PACKAGE_SPEEX is not set
# BR2_PACKAGE_FESTIVAL is not set
+BR2_PACKAGE_FLITE=y
BR2_GRAPHIC_SUPPORT=y
#
@@ -651,6 +723,7 @@ BR2_PACKAGE_JPEG=y
# BR2_PACKAGE_LIBART is not set
BR2_PACKAGE_LIBPNG=y
BR2_PACKAGE_LIBUNGIF=y
+# BR2_PACKAGE_MESALIB is not set
# BR2_PACKAGE_PIXMAN is not set
# BR2_PACKAGE_PYGAME is not set
BR2_PACKAGE_SDL=y
@@ -699,6 +772,7 @@ BR2_PACKAGE_SDL_WATER=y
#
BR2_PACKAGE_FBV=y
BR2_PACKAGE_FBSET=y
+BR2_PACKAGE_FBTEST=y
BR2_PACKAGE_FBGRAB=y
#
@@ -708,11 +782,38 @@ BR2_PACKAGE_QT=y
# BR2_PACKAGE_QT_DEBUG is not set
BR2_PACKAGE_QT_SHARED=y
# BR2_PACKAGE_QT_STATIC is not set
-BR2_PACKAGE_QT_LICENSE_TYPE_GPL=y
-# BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL is not set
-BR2_PACKAGE_QT_GPL_LICENSE_APPROVED=y
+BR2_PACKAGE_QT_LICENSE_APPROVED=y
# BR2_PACKAGE_QT_QT3SUPPORT is not set
-BR2_PACKAGE_QT_DEPTHS="-depths 24,16,8"
+BR2_PACKAGE_QT_GUI_MODULE=y
+
+#
+# Pixel depths
+#
+
+#
+# Deselecting each option leads to Qt's default (8,16,32)
+#
+# BR2_PACKAGE_QT_PIXEL_DEPTH_1 is not set
+# BR2_PACKAGE_QT_PIXEL_DEPTH_4 is not set
+BR2_PACKAGE_QT_PIXEL_DEPTH_8=y
+# BR2_PACKAGE_QT_PIXEL_DEPTH_12 is not set
+# BR2_PACKAGE_QT_PIXEL_DEPTH_15 is not set
+BR2_PACKAGE_QT_PIXEL_DEPTH_16=y
+# BR2_PACKAGE_QT_PIXEL_DEPTH_18 is not set
+# BR2_PACKAGE_QT_PIXEL_DEPTH_24 is not set
+BR2_PACKAGE_QT_PIXEL_DEPTH_32=y
+
+#
+# Fonts
+#
+BR2_PACKAGE_QT_FONT_MICRO=y
+BR2_PACKAGE_QT_FONT_FIXED=y
+BR2_PACKAGE_QT_FONT_HELVETICA=y
+# BR2_PACKAGE_QT_FONT_JAPANESE is not set
+# BR2_PACKAGE_QT_FONT_UNIFONT is not set
+BR2_PACKAGE_QT_NOFREETYPE=y
+# BR2_PACKAGE_QT_QTFREETYPE is not set
+# BR2_PACKAGE_QT_SYSTEMFREETYPE is not set
BR2_PACKAGE_QT_GIF=y
# BR2_PACKAGE_QT_LIBMNG is not set
# BR2_PACKAGE_QT_NOJPEG is not set
@@ -726,9 +827,6 @@ BR2_PACKAGE_QT_NOTIFF=y
# BR2_PACKAGE_QT_QTTIFF is not set
BR2_PACKAGE_QT_QTZLIB=y
# BR2_PACKAGE_QT_SYSTEMZLIB is not set
-BR2_PACKAGE_QT_NOFREETYPE=y
-# BR2_PACKAGE_QT_QTFREETYPE is not set
-# BR2_PACKAGE_QT_SYSTEMFREETYPE is not set
BR2_PACKAGE_QT_EMB_PLATFORM="arm"
# BR2_PACKAGE_QT_SQL_MODULE is not set
@@ -751,10 +849,25 @@ BR2_PACKAGE_QT_GFX_LINUXFB=y
# BR2_PACKAGE_QT_MOUSE_VR41XX is not set
BR2_PACKAGE_QT_MOUSE_TSLIB=y
# BR2_PACKAGE_QT_MOUSE_QVFB is not set
+
+#
+# Keyboard drivers
+#
+# BR2_PACKAGE_QT_KEYBOARD_TTY is not set
+# BR2_PACKAGE_QT_KEYBOARD_USB is not set
+# BR2_PACKAGE_QT_KEYBOARD_SL5000 is not set
+# BR2_PACKAGE_QT_KEYBOARD_YOPY is not set
+# BR2_PACKAGE_QT_KEYBOARD_VR41XX is not set
+# BR2_PACKAGE_QT_KEYBOARD_QVFB is not set
+BR2_PACKAGE_QT_XML=y
# BR2_PACKAGE_QT_XMLPATTERNS is not set
# BR2_PACKAGE_QT_SVG is not set
+BR2_PACKAGE_QT_NETWORK=y
# BR2_PACKAGE_QT_WEBKIT is not set
+# BR2_PACKAGE_QT_STL is not set
# BR2_PACKAGE_QT_OPENSSL is not set
+BR2_PACKAGE_QT_SCRIPT=y
+# BR2_PACKAGE_QT_SCRIPTTOOLS is not set
#
# X Window System server
@@ -859,9 +972,14 @@ BR2_PACKAGE_DOOM_WAD=y
# BR2_PACKAGE_GNUCHESS is not set
# BR2_PACKAGE_MAGICCUBE4D is not set
BR2_PACKAGE_PRBOOM=y
+BR2_PACKAGE_QUAKE_PAK=y
# BR2_PACKAGE_RUBIX is not set
+BR2_PACKAGE_SDLQUAKE=y
+# BR2_PACKAGE_SNES9X is not set
# BR2_PACKAGE_VICE is not set
+BR2_PACKAGE_WOLF4SDL=y
# BR2_PACKAGE_XBOARD is not set
+# BR2_PACKAGE_JOYSTICKTEST is not set
#
# Target filesystem options
@@ -892,13 +1010,6 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y
BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
# BR2_TARGET_ROOTFS_UBIFS is not set
-# BR2_TARGET_ROOTFS_UBIFS_RT_NONE is not set
-# BR2_TARGET_ROOTFS_UBIFS_RT_ZLIB is not set
-# BR2_TARGET_ROOTFS_UBIFS_RT_LZO is not set
-# BR2_TARGET_ROOTFS_UBIFS_NONE is not set
-# 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
@@ -916,6 +1027,7 @@ BR2_TARGET_ROOTFS_TAR_COPYTO=""
#
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE=".//local/apf27_test/u-boot/apf27.h"
BR2_TARGET_UBOOT_CUSTOM_PATCH=""
BR2_TARGET_UBOOT_SERVERIP=""
BR2_TARGET_UBOOT_IPADDR=""
@@ -935,6 +1047,7 @@ BR2_KERNEL_LINUX_ADVANCED=y
# BR2_KERNEL_LINUX is not set
# BR2_KERNEL_HURD is not set
BR2_PACKAGE_LINUX=y
+BR2_PACKAGE_LINUX_KCONFIG=".//local/apf27_test/linux-2.6.29.4.config"
BR2_PACKAGE_LINUX_FORMAT="uImage"
BR2_KERNEL_PATCH_LEVEL="$(BR2_KERNEL_MINORLEVEL)"
BR2_KERNEL_CURRENT_VERSION="2.6.26.3"
@@ -1007,7 +1120,3 @@ BR2_LINUX_BIN_UIMAGE=y
# BR2_LINUX_COPYTO_TFTPBOOT is not set
BR2_LINUX_COPYTO=""
# BR2_LINUX_COPY_CONFIGURATION is not set
-BR2_PACKAGE_LINUX_KCONFIG=".//local/apf27_test/linux-2.6.29.4.config"
-BR2_PACKAGE_BUSYBOX_CONFIG=".//local/apf27_test/busybox-1.12.1.config"
-BR2_UCLIBC_CONFIG=".//local/apf27_test/uclibc-0.9.29.config"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE=".//local/apf27_test/u-boot/apf27.h"
diff --git a/patches/buildroot/2010.05/130-lbreakout-add_package.patch b/patches/buildroot/2010.05/130-lbreakout-add_package.patch
new file mode 100644
index 0000000..0d5390c
--- /dev/null
+++ b/patches/buildroot/2010.05/130-lbreakout-add_package.patch
@@ -0,0 +1,81 @@
+Add LBreakout2 games to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-07-14 19:25:49.000000000 +0200
++++ buildroot/package/Config.in 2010-07-15 09:03:49.000000000 +0200
+@@ -81,6 +81,7 @@
+ source "package/games/doom-wad/Config.in"
+ source "package/e-uae/Config.in"
+ source "package/games/gnuchess/Config.in"
++source "package/lbreakout2/Config.in"
+ source "package/games/lxdoom/Config.in"
+ source "package/games/magiccube4d/Config.in"
+ source "package/opentyrian/Config.in"
+Index: buildroot/package/lbreakout2/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/lbreakout2/Config.in 2010-07-14 23:27:44.000000000 +0200
+@@ -0,0 +1,26 @@
++config BR2_PACKAGE_LBREAKOUT2
++ bool "LBreakout2"
++ select BR2_PACKAGE_SDL
++ help
++ LBreakout2 is the successor to LBreakout, a breakout-style arcade
++ game in the manner of Arkanoid.
++
++ http://lgames.sourceforge.net/index.php?project=LBreakout2
++
++if BR2_PACKAGE_LBREAKOUT2
++
++config BR2_PACKAGE_LBREAKOUT2_AUDIO
++ bool "audio support"
++ default y
++ select BR2_PACKAGE_SDL_MIXER
++ help
++ Activates audio support. Will add SDL_mixer.
++
++config BR2_PACKAGE_LBREAKOUT2_NET
++ bool "network support"
++ default y
++ select BR2_PACKAGE_SDL_NET
++ help
++ Activates network support. Will add SDL_net.
++
++endif
+Index: buildroot/package/lbreakout2/lbreakout2.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/lbreakout2/lbreakout2.mk 2010-07-15 09:04:51.000000000 +0200
+@@ -0,0 +1,29 @@
++#############################################################
++#
++# LBreakout2
++#
++#############################################################
++
++LBREAKOUT2_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lgames
++LBREAKOUT2_VERSION:=2.6.1
++LBREAKOUT2_SOURCE:=lbreakout2-$(LBREAKOUT2_VERSION).tar.gz
++LBREAKOUT2_CAT=$(ZCAT)
++
++LBREAKOUT2_DEPENDENCIES = sdl
++
++ifeq ($(BR2_PACKAGE_LBREAKOUT2_AUDIO),y)
++LBREAKOUT2_DEPENDENCIES += sdl_mixer
++else
++LBREAKOUT2_CONF_OPT += --disable-audio
++endif
++
++ifeq ($(BR2_PACKAGE_LBREAKOUT2_NET),y)
++LBREAKOUT2_DEPENDENCIES += sdl_net
++else
++LBREAKOUT2_CONF_OPT += --disable-network
++endif
++
++LBREAKOUT2_CONF_ENV = \
++ SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config"
++
++$(eval $(call AUTOTARGETS,package,lbreakout2))
diff --git a/patches/buildroot/2010.05/131-ltetris-add_package.patch b/patches/buildroot/2010.05/131-ltetris-add_package.patch
new file mode 100644
index 0000000..5547dcb
--- /dev/null
+++ b/patches/buildroot/2010.05/131-ltetris-add_package.patch
@@ -0,0 +1,84 @@
+Add LTris game to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-07-15 09:03:49.000000000 +0200
++++ buildroot/package/Config.in 2010-07-15 09:05:10.000000000 +0200
+@@ -82,6 +82,7 @@
+ source "package/e-uae/Config.in"
+ source "package/games/gnuchess/Config.in"
+ source "package/lbreakout2/Config.in"
++source "package/ltris/Config.in"
+ source "package/games/lxdoom/Config.in"
+ source "package/games/magiccube4d/Config.in"
+ source "package/opentyrian/Config.in"
+Index: buildroot/package/ltris/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/ltris/Config.in 2010-07-15 09:05:10.000000000 +0200
+@@ -0,0 +1,15 @@
++config BR2_PACKAGE_LTRIS
++ bool "LTris"
++ select BR2_PACKAGE_SDL
++ help
++ LTris as a tetris clone, using SDL.
++
++ http://lgames.sourceforge.net/index.php?project=LTris
++
++config BR2_PACKAGE_LTRIS_AUDIO
++ bool "audio support"
++ default y
++ depends on BR2_PACKAGE_LTRIS
++ select BR2_PACKAGE_SDL_MIXER
++ help
++ Activates audio support. Will add SDL_mixer.
+Index: buildroot/package/ltris/ltris.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/ltris/ltris.mk 2010-07-15 09:05:10.000000000 +0200
+@@ -0,0 +1,23 @@
++#############################################################
++#
++# LTris
++#
++#############################################################
++
++LTRIS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lgames
++LTRIS_VERSION:=1.0.14
++LTRIS_SOURCE:=ltris-$(LTRIS_VERSION).tar.gz
++LTRIS_CAT=$(ZCAT)
++
++LTRIS_DEPENDENCIES = sdl
++
++ifeq ($(BR2_PACKAGE_LTRIS_AUDIO),y)
++LTRIS_DEPENDENCIES += sdl_mixer
++else
++LTRIS_CONF_OPT += --disable-audio
++endif
++
++LTRIS_CONF_ENV = \
++ SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config"
++
++$(eval $(call AUTOTARGETS,package,ltris))
+Index: buildroot/package/ltris/ltris-force_screen_res.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/ltris/ltris-force_screen_res.patch 2010-07-15 10:20:24.000000000 +0200
+@@ -0,0 +1,15 @@
++Force 640x480x16 fullscreen mode.
++A cleaner way should exist...
++
++Index: ltris-1.0.14/src/sdl.c
++===================================================================
++--- ltris-1.0.14.orig/src/sdl.c 2010-07-15 10:18:10.000000000 +0200
+++++ ltris-1.0.14/src/sdl.c 2010-07-15 10:18:28.000000000 +0200
++@@ -733,6 +733,7 @@
++ printf( "Mode %s valid\n", modes[i].name );
++ }
++ }
+++ modes[1].ok = 1;
++ /* reset default video mode if none found exit */
++ if ( !def_mode->ok ) {
++ for ( i = 0; i < mode_count; i++ )
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index 7b23b5b..339312b 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -44,3 +44,6 @@ rm -rf buildroot/package/urg/
rm -rf buildroot/package/pywebradio/
rm -rf buildroot/package/e-uae/
rm -rf buildroot/package/opentyrian/
+rm -rf buildroot/package/ipsec-tools/
+rm -rf buildroot/package/lbreakout2/
+rm -rf buildroot/package/ltris/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-07-14 10:05:39
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via bbb29f3b2a8527db32bac9971fa16b566d239678 (commit)
from c0bd33059f1769bfec86e32806bd9d2031cb49cd (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 bbb29f3b2a8527db32bac9971fa16b566d239678
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jul 14 12:05:11 2010 +0200
Updates apf9328_defconfig
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf9328/apf9328_defconfig | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index 7673d03..19e08f6 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
+++ b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Jun 24 16:15:39 2010
+# Wed Jul 14 12:00:26 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -501,6 +501,7 @@ BR2_BLOCKDEV_SUPPORT=y
# BR2_PACKAGE_I2C_TOOLS is not set
# BR2_PACKAGE_INPUT_TOOLS is not set
# BR2_PACKAGE_IOSTAT is not set
+# BR2_PACKAGE_PICKIT2 is not set
# BR2_PACKAGE_LCD4LINUX is not set
# BR2_PACKAGE_LIBAIO is not set
# BR2_PACKAGE_LIBRAW1394 is not set
@@ -724,6 +725,7 @@ BR2_PACKAGE_ZLIB=y
# BR2_XML_SUPPORT is not set
# BR2_JAVA_SUPPORT is not set
# BR2_GAMES is not set
+# BR2_PACKAGE_JOYSTICKTEST is not set
#
# Target filesystem options
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-07-14 09:42:57
|
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 c0bd33059f1769bfec86e32806bd9d2031cb49cd (commit)
via 6f984fdf1f8f51802639a056e651406d5bf09ae6 (commit)
from be075ea9ca9833e2ed0825386cd6a78712980fb7 (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 c0bd33059f1769bfec86e32806bd9d2031cb49cd
Merge: 6f984fdf1f8f51802639a056e651406d5bf09ae6 be075ea9ca9833e2ed0825386cd6a78712980fb7
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jul 14 11:42:15 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 6f984fdf1f8f51802639a056e651406d5bf09ae6
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jul 14 11:41:40 2010 +0200
[BUILDROOT] [2010.05] Add series of patches from BR mainline to make ipsec-tools compiling better
-----------------------------------------------------------------------
Summary of changes:
...ols-bump_version_and_convert_to_autotools.patch | 273 ++++++++++++++++++++
...-sstrip-fix_section_length_corruption_bug.patch | 27 ++
.../2010.05/128-flex-bump_patch_version.patch | 28 ++
...3_legacy_functions_with_modern_equivalent.patch | 55 ++++
4 files changed, 383 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2010.05/126-ipsec-tools-bump_version_and_convert_to_autotools.patch
create mode 100644 patches/buildroot/2010.05/127-sstrip-fix_section_length_corruption_bug.patch
create mode 100644 patches/buildroot/2010.05/128-flex-bump_patch_version.patch
create mode 100644 patches/buildroot/2010.05/129-ipsec-tools-replaces_susv3_legacy_functions_with_modern_equivalent.patch
diff --git a/patches/buildroot/2010.05/126-ipsec-tools-bump_version_and_convert_to_autotools.patch b/patches/buildroot/2010.05/126-ipsec-tools-bump_version_and_convert_to_autotools.patch
new file mode 100644
index 0000000..4704278
--- /dev/null
+++ b/patches/buildroot/2010.05/126-ipsec-tools-bump_version_and_convert_to_autotools.patch
@@ -0,0 +1,273 @@
+From dff1d590b2a0fadf58b6eed60029b2ecbab7c710 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <ja...@su...>
+Date: Sun, 13 Jun 2010 12:24:48 +0000
+Subject: ipsec-tools: bump version, convert to autotools format and simplify Config.in
+
+Closes #2035
+
+- Remove -Werror from CFLAGS
+- Always enable ipv6 support if available in toolchain
+- Always install into staging
+
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
+index d29cb86..8a5f3d1 100644
+--- a/package/ipsec-tools/Config.in
++++ b/package/ipsec-tools/Config.in
+@@ -6,16 +6,16 @@ config BR2_PACKAGE_IPSEC_TOOLS
+ help
+ This package is required to support IPSec for Linux 2.6+
+
++if BR2_PACKAGE_IPSEC_TOOLS
++
+ config BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT
+ default y
+- depends on BR2_PACKAGE_IPSEC_TOOLS
+ bool "Enable racoonctl(8)."
+ help
+ Lets racoon to listen to racoon admin port, which is to
+ be contacted by racoonctl(8).
+
+ config BR2_PACKAGE_IPSEC_TOOLS_NATT
+- depends on BR2_PACKAGE_IPSEC_TOOLS
+ bool "Enable NAT-Traversal"
+ help
+ This needs kernel support, which is available on Linux. On
+@@ -27,9 +27,7 @@ config BR2_PACKAGE_IPSEC_TOOLS_NATT
+ live in a country where software patents are legal, using
+ NAT-Traversal might infringe a patent.
+
+-
+ config BR2_PACKAGE_IPSEC_TOOLS_FRAG
+- depends on BR2_PACKAGE_IPSEC_TOOLS
+ bool "Enable IKE fragmentation."
+ help
+ Enable IKE fragmentation, which is a workaround for
+@@ -37,32 +35,12 @@ config BR2_PACKAGE_IPSEC_TOOLS_FRAG
+
+ config BR2_PACKAGE_IPSEC_TOOLS_STATS
+ default y
+- depends on BR2_PACKAGE_IPSEC_TOOLS
+ bool "Enable statistics logging function."
+
+-config BR2_PACKAGE_IPSEC_TOOLS_IPV6
+- default y
+- depends on BR2_PACKAGE_IPSEC_TOOLS && BR2_INET_IPV6
+- bool "Enable IPv6 support"
+- help
+- This option has no effect if uClibc has been compiled without
+- IPv6 support.
+-
+ config BR2_PACKAGE_IPSEC_TOOLS_READLINE
+- depends on BR2_PACKAGE_IPSEC_TOOLS
+ select BR2_PACKAGE_READLINE
+ bool "Enable readline input support if available."
+
+-config BR2_PACKAGE_IPSEC_TOOLS_LIBS
+- bool "Install IPSec libraries under staging_dir/lib"
+- default y
+- depends on BR2_PACKAGE_IPSEC_TOOLS
+- help
+- Install libipsec.a and libracoon.a under staging_dir/lib for further
+- development on a host machine.
+-
+-if BR2_PACKAGE_IPSEC_TOOLS
+-
+ choice
+ prompt "Security context"
+ default BR2_PACKAGE_IPSEC_SECCTX_DISABLE
+diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
+index 911da7c..eddc7ce 100644
+--- a/package/ipsec-tools/ipsec-tools.mk
++++ b/package/ipsec-tools/ipsec-tools.mk
+@@ -4,158 +4,65 @@
+ #
+ #############################################################
+
+-IPSEC_TOOLS_VERSION:=0.7.2
+-IPSEC_TOOLS_SOURCE:=ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
+-IPSEC_TOOLS_CAT:=$(BZCAT)
+-IPSEC_TOOLS_DIR:=$(BUILD_DIR)/ipsec-tools-$(IPSEC_TOOLS_VERSION)
++IPSEC_TOOLS_VERSION = 0.7.3
++IPSEC_TOOLS_SOURCE = ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
++IPSEC_TOOLS_SITE = http://ftp.sunet.se/pub/NetBSD/misc/ipsec-tools/0.7/
++IPSEC_TOOLS_INSTALL_STAGING = YES
++IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex
+
+-IPSEC_TOOLS_BINARY_SETKEY:=src/setkey/setkey
+-IPSEC_TOOLS_BINARY_RACOON:=src/racoon/racoon
+-IPSEC_TOOLS_BINARY_RACOONCTL:=src/racoon/racoonctl
++# configure hardcodes -Werror, so override CFLAGS on make invocation
++IPSEC_TOOLS_MAKE_OPT = CFLAGS='$(TARGET_CFLAGS)'
+
+-IPSEC_TOOLS_TARGET_BINARY_SETKEY:=usr/sbin/setkey
+-IPSEC_TOOLS_TARGET_BINARY_RACOON:=usr/sbin/racoon
+-IPSEC_TOOLS_TARGET_BINARY_RACOONCTL:=usr/sbin/racoonctl
+-IPSEC_TOOLS_SITE=http://ftp.sunet.se/pub/NetBSD/misc/ipsec-tools/0.7/
++IPSEC_TOOLS_CONF_OPT = \
++ --disable-hybrid \
++ --without-libpam \
++ --disable-gssapi \
++ --with-kernel-headers=$(STAGING_DIR)/usr/include
+
+ ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-adminport
++IPSEC_TOOLS_CONF_OPT+= --enable-adminport
+ else
+-IPSEC_TOOLS_CONFIG_FLAGS+= --disable-adminport
++IPSEC_TOOLS_CONF_OPT+= --disable-adminport
+ endif
+
+ ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_NATT), y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-natt
++IPSEC_TOOLS_CONF_OPT+= --enable-natt
+ else
+-IPSEC_TOOLS_CONFIG_FLAGS+= --disable-natt
++IPSEC_TOOLS_CONF_OPT+= --disable-natt
+ endif
+
+ ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_FRAG), y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-frag
++IPSEC_TOOLS_CONF_OPT+= --enable-frag
+ else
+-IPSEC_TOOLS_CONFIG_FLAGS+= --disable-frag
++IPSEC_TOOLS_CONF_OPT+= --disable-frag
+ endif
+
+ ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_STATS), y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-stats
++IPSEC_TOOLS_CONF_OPT+= --enable-stats
+ else
+-IPSEC_TOOLS_CONFIG_FLAGS+= --disable-stats
++IPSEC_TOOLS_CONF_OPT+= --disable-stats
+ endif
+
+ ifeq ($(BR2_INET_IPV6),y)
+-
+-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_IPV6), y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-ipv6
++IPSEC_TOOLS_CONF_OPT+= --enable-ipv6
+ else
+-IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6)
+-endif
+-
+-else # ignore user's choice if it doesn't
+-IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6)
++IPSEC_TOOLS_CONF_OPT+= --disable-ipv6
+ endif
+
+ ifneq ($(BR2_PACKAGE_IPSEC_TOOLS_READLINE), y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --without-readline
++IPSEC_TOOLS_CONF_OPT+= --without-readline
++else
++IPSEC_DEPENDENCIES += readline
+ endif
+
+ ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_DISABLE),y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-security-context=no
++IPSEC_TOOLS_CONF_OPT+= --enable-security-context=no
+ endif
+ ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_ENABLE),y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-security-context=yes
++IPSEC_TOOLS_CONF_OPT+= --enable-security-context=yes
+ endif
+ ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_KERNEL),y)
+-IPSEC_TOOLS_CONFIG_FLAGS+= --enable-security-context=kernel
+-endif
+-
+-$(DL_DIR)/$(IPSEC_TOOLS_SOURCE):
+- $(call DOWNLOAD,$(IPSEC_TOOLS_SITE),$(IPSEC_TOOLS_SOURCE))
+-
+-$(IPSEC_TOOLS_DIR)/.patched: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE)
+- $(IPSEC_TOOLS_CAT) $(DL_DIR)/$(IPSEC_TOOLS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+- toolchain/patch-kernel.sh $(IPSEC_TOOLS_DIR) package/ipsec-tools ipsec-tools-$(IPSEC_TOOLS_VERSION)\*.patch
+- $(CONFIG_UPDATE) $(IPSEC_TOOLS_DIR)
+- touch $@
+-
+-$(IPSEC_TOOLS_DIR)/.configured: $(IPSEC_TOOLS_DIR)/.patched
+- ( cd $(IPSEC_TOOLS_DIR); rm -rf config.cache; \
+- $(TARGET_CONFIGURE_OPTS) \
+- $(TARGET_CONFIGURE_ARGS) \
+- ./configure $(QUIET) \
+- --target=$(GNU_TARGET_NAME) \
+- --host=$(GNU_TARGET_NAME) \
+- --build=$(GNU_HOST_NAME) \
+- --prefix=/usr \
+- --sysconfdir=/etc \
+- --disable-hybrid \
+- --without-libpam \
+- --disable-gssapi \
+- --with-kernel-headers=$(STAGING_DIR)/usr/include \
+- $(IPSEC_TOOLS_CONFIG_FLAGS) \
+- )
+- # simpler than patching that cruft..
+- (echo '#undef bzero'; \
+- echo '#define bzero(a, b) memset((a), 0, (b))'; \
+- echo '#undef bcopy'; \
+- echo '#define bcopy(src, dest, len) memmove(dest, src, len)'; \
+- echo '#undef index'; \
+- echo '#define index(a, b) strchr(a, b)'; \
+- ) >> $(IPSEC_TOOLS_DIR)/config.h
+- touch $@
+-
+-$(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_SETKEY) \
+-$(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOON) \
+-$(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOONCTL): \
+- $(IPSEC_TOOLS_DIR)/.configured
+- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(IPSEC_TOOLS_DIR)
+-
+-$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
+-$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \
+-$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL): \
+- $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_SETKEY) \
+- $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOON) \
+- $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOONCTL)
+- $(MAKE) -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) install
+- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(REMOVE_SECTION_COMMENT) \
+- $(REMOVE_SECTION_NOTE) \
+- $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
+- $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \
+- $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
+-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_LIBS), y)
+- install -D $(addprefix $(IPSEC_TOOLS_DIR)/src/, \
+- libipsec/.libs/libipsec.a libipsec/.libs/libipsec.la \
+- racoon/.libs/libracoon.a racoon/.libs/libracoon.la) \
+- $(STAGING_DIR)/lib
+-endif
+-ifneq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y)
+- rm -f $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
+-endif
+-
+-IPSEC_TOOLS_PROGS= $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
+- $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON)
+-
+-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT), y)
+-IPSEC_TOOLS_PROGS+= $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
++IPSEC_TOOLS_CONF_OPT+= --enable-security-context=kernel
+ endif
+
+-ipsec-tools: openssl flex host-flex $(IPSEC_TOOLS_PROGS)
+-
+-ipsec-tools-source: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE)
+-
+-ipsec-tools-uninstall:
+-
+-ipsec-tools-clean:
+- -$(MAKE) -C $(IPSEC_TOOLS_DIR) DESTDIR=$(TARGET_DIR) uninstall
+- -$(MAKE) -C $(IPSEC_TOOLS_DIR) clean
+-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_LIBS),y)
+- rm -f $(addprefix $(STAGING_DIR)/lib/, \
+- libipsec.a libipsec.la libracoon.a libracoon.la)
+-endif
+- rm -f $(IPSEC_TOOLS_DIR)/.configured
+-
+-ipsec-tools-dirclean:
+- rm -rf $(IPSEC_TOOLS_DIR)
+-
+-ifeq ($(BR2_PACKAGE_IPSEC_TOOLS), y)
+-TARGETS+=ipsec-tools
+-endif
++$(eval $(call AUTOTARGETS,package,ipsec-tools))
+--
+cgit v0.8.2.1
diff --git a/patches/buildroot/2010.05/127-sstrip-fix_section_length_corruption_bug.patch b/patches/buildroot/2010.05/127-sstrip-fix_section_length_corruption_bug.patch
new file mode 100644
index 0000000..1712ad7
--- /dev/null
+++ b/patches/buildroot/2010.05/127-sstrip-fix_section_length_corruption_bug.patch
@@ -0,0 +1,27 @@
+From c0e307b848d8de23e6f10a179c4f240c023c8b82 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <ja...@su...>
+Date: Tue, 13 Jul 2010 11:10:39 +0000
+Subject: sstrip: fix section length corruption bug
+
+Based on openwrt #6847:
+
+https://dev.openwrt.org/ticket/6847
+
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+diff --git a/toolchain/sstrip/sstrip.c b/toolchain/sstrip/sstrip.c
+index 1842f05..03adc0e 100644
+--- a/toolchain/sstrip/sstrip.c
++++ b/toolchain/sstrip/sstrip.c
+@@ -253,8 +253,7 @@ static int modifyheaders ## CLASS (Elf ## CLASS ## _Ehdr *ehdr, \
+ ESET(phdr->p_offset,newsize); \
+ ESET(phdr->p_filesz,0); \
+ } else if (EGET(phdr->p_offset) + EGET(phdr->p_filesz) > newsize) { \
+- newsize -= EGET(phdr->p_offset); \
+- ESET(phdr->p_filesz, newsize); \
++ ESET(phdr->p_filesz, newsize - EGET(phdr->p_offset)); \
+ } \
+ } \
+ \
+--
+cgit v0.8.2.1
diff --git a/patches/buildroot/2010.05/128-flex-bump_patch_version.patch b/patches/buildroot/2010.05/128-flex-bump_patch_version.patch
new file mode 100644
index 0000000..0418090
--- /dev/null
+++ b/patches/buildroot/2010.05/128-flex-bump_patch_version.patch
@@ -0,0 +1,28 @@
+From 60e3fab1d4da5babd80dd768b231def15aa5c70c Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Tue, 13 Jul 2010 14:08:49 +0200
+Subject: [PATCH] Bump Flex patch version.
+
+Version 9 is no more available on Debian FTP.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+---
+ package/flex/flex.mk | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/package/flex/flex.mk b/package/flex/flex.mk
+index 43e7d57..ad35548 100644
+--- a/package/flex/flex.mk
++++ b/package/flex/flex.mk
+@@ -4,7 +4,7 @@
+ #
+ #############################################################
+ FLEX_VERSION:=2.5.35
+-FLEX_PATCH_VERSION:=9
++FLEX_PATCH_VERSION:=9.1
+ FLEX_SOURCE:=flex_$(FLEX_VERSION).orig.tar.gz
+ FLEX_PATCH:=flex_$(FLEX_VERSION)-$(FLEX_PATCH_VERSION).diff.gz
+ FLEX_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/f/flex
+--
+1.6.0.4
+
diff --git a/patches/buildroot/2010.05/129-ipsec-tools-replaces_susv3_legacy_functions_with_modern_equivalent.patch b/patches/buildroot/2010.05/129-ipsec-tools-replaces_susv3_legacy_functions_with_modern_equivalent.patch
new file mode 100644
index 0000000..f6391ee
--- /dev/null
+++ b/patches/buildroot/2010.05/129-ipsec-tools-replaces_susv3_legacy_functions_with_modern_equivalent.patch
@@ -0,0 +1,55 @@
+From 01ef76485c75e933db853167fdc5c11f1aab952f Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Tue, 13 Jul 2010 17:32:18 +0200
+Subject: [PATCH] ipsec-tools: replaces susv3 legacy functions with modern equivalents.
+
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+---
+ package/ipsec-tools/ipsec-tools-susv3-legacy.patch | 34 ++++++++++++++++++++
+ 1 files changed, 34 insertions(+), 0 deletions(-)
+ create mode 100644 package/ipsec-tools/ipsec-tools-susv3-legacy.patch
+
+diff --git a/package/ipsec-tools/ipsec-tools-susv3-legacy.patch b/package/ipsec-tools/ipsec-tools-susv3-legacy.patch
+new file mode 100644
+index 0000000..1bc5047
+--- /dev/null
++++ b/package/ipsec-tools/ipsec-tools-susv3-legacy.patch
+@@ -0,0 +1,34 @@
++Replaces sysv3 legacy functions with modern equivalents.
++
++Index: ipsec-tools-0.7.3/src/racoon/pfkey.c
++===================================================================
++--- ipsec-tools-0.7.3.orig/src/racoon/pfkey.c 2010-07-12 14:46:52.000000000 +0200
+++++ ipsec-tools-0.7.3/src/racoon/pfkey.c 2010-07-12 15:01:39.000000000 +0200
++@@ -3008,12 +3008,12 @@
++ struct sockaddr *paddr;
++
++ paddr = (struct sockaddr *)(xisr + 1);
++- bcopy(paddr, &(*p_isr)->saidx.src,
+++ memmove(&(*p_isr)->saidx.src, paddr,
++ sysdep_sa_len(paddr));
++
++ paddr = (struct sockaddr *)((caddr_t)paddr
++ + sysdep_sa_len(paddr));
++- bcopy(paddr, &(*p_isr)->saidx.dst,
+++ memmove(&(*p_isr)->saidx.dst, paddr,
++ sysdep_sa_len(paddr));
++ }
++
++Index: ipsec-tools-0.7.3/src/racoon/racoonctl.c
++===================================================================
++--- ipsec-tools-0.7.3.orig/src/racoon/racoonctl.c 2010-07-12 14:49:51.000000000 +0200
+++++ ipsec-tools-0.7.3/src/racoon/racoonctl.c 2010-07-12 15:00:52.000000000 +0200
++@@ -785,7 +785,7 @@
++ errx(1, "cannot read source address");
++
++ /* We get "ip[port]" strip the port */
++- if ((idx = index(srcaddr, '[')) == NULL)
+++ if ((idx = strchr(srcaddr, '[')) == NULL)
++ errx(1, "unexpected source address format");
++ *idx = '\0';
++
+--
+1.6.0.4
+
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2010-07-13 13:50: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 492ab930f0f5aa4e665157db963e2a9170da1a9c (commit)
via 72996ea44cadb2c41cd7eedbad5396fa6c7c60f5 (commit)
from c54f9110f5d89d581855220a124fdc4af0cb64c2 (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 492ab930f0f5aa4e665157db963e2a9170da1a9c
Merge: 72996ea44cadb2c41cd7eedbad5396fa6c7c60f5 c54f9110f5d89d581855220a124fdc4af0cb64c2
Author: Jeremie SCHEER <jer...@ar...>
Date: Tue Jul 13 14:27:31 2010 +0200
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 72996ea44cadb2c41cd7eedbad5396fa6c7c60f5
Author: Jeremie SCHEER <jer...@ar...>
Date: Tue Jul 13 14:03:55 2010 +0200
Add a button Quit in ts_test to be able to terminate the application even when SIGINT is not handled.
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/126-tslib-test_add_quit_button.patch | 54 ++++++++++++++++++++
.../2010.05/126-tslib-test_add_quit_button.patch | 54 ++++++++++++++++++++
2 files changed, 108 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/126-tslib-test_add_quit_button.patch
create mode 100644 patches/buildroot/2010.05/126-tslib-test_add_quit_button.patch
diff --git a/patches/buildroot/126-tslib-test_add_quit_button.patch b/patches/buildroot/126-tslib-test_add_quit_button.patch
new file mode 100644
index 0000000..0988ff8
--- /dev/null
+++ b/patches/buildroot/126-tslib-test_add_quit_button.patch
@@ -0,0 +1,54 @@
+Create a patch in buildroot tslib package to add a button "Quit" in the program ts_test
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/tslib/tslib-add_quit_button_to_test.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/tslib/tslib-add_quit_button_to_test.patch 2010-07-07 17:23:42.000000000 +0200
+@@ -0,0 +1,45 @@
++--- tslib-1.0/tests/ts_test.c.orig 2010-07-07 17:02:50.000000000 +0200
+++++ tslib-1.0/tests/ts_test.c 2010-07-07 16:27:44.000000000 +0200
++@@ -44,7 +44,7 @@ static int button_palette [6] =
++ 1, 5, 0
++ };
++
++-#define NR_BUTTONS 2
+++#define NR_BUTTONS 3
++ static struct ts_button buttons [NR_BUTTONS];
++
++ static void sig(int sig)
++@@ -152,13 +152,15 @@ int main()
++
++ /* Initialize buttons */
++ memset (&buttons, 0, sizeof (buttons));
++- buttons [0].w = buttons [1].w = xres / 4;
++- buttons [0].h = buttons [1].h = 20;
++- buttons [0].x = xres / 4 - buttons [0].w / 2;
++- buttons [1].x = (3 * xres) / 4 - buttons [0].w / 2;
++- buttons [0].y = buttons [1].y = 10;
+++ buttons [0].w = buttons [1].w = buttons[2].w = xres / 4;
+++ buttons [0].h = buttons [1].h = buttons[2].h = 20;
+++ buttons [0].x = xres / 4 - 2 * (buttons [0].w / 3);
+++ buttons [1].x = xres / 2 - buttons [0].w / 2;
+++ buttons [2].x = 3 * (xres / 4) - buttons [0].w / 3;
+++ buttons [0].y = buttons [1].y = buttons [2].y = 10;
++ buttons [0].text = "Drag";
++ buttons [1].text = "Draw";
+++ buttons [2].text = "Quit";
++
++ refresh_screen ();
++
++@@ -196,6 +198,12 @@ int main()
++ mode = 1;
++ refresh_screen ();
++ break;
+++ case 2:
+++ close_framebuffer();
+++ fflush(stderr);
+++ fflush(stdout);
+++ exit(1);
+++ break;
++ }
++
++ printf("%ld.%06ld: %6d %6d %6d\n", samp.tv.tv_sec, samp.tv.tv_usec,
diff --git a/patches/buildroot/2010.05/126-tslib-test_add_quit_button.patch b/patches/buildroot/2010.05/126-tslib-test_add_quit_button.patch
new file mode 100644
index 0000000..0988ff8
--- /dev/null
+++ b/patches/buildroot/2010.05/126-tslib-test_add_quit_button.patch
@@ -0,0 +1,54 @@
+Create a patch in buildroot tslib package to add a button "Quit" in the program ts_test
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/tslib/tslib-add_quit_button_to_test.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/tslib/tslib-add_quit_button_to_test.patch 2010-07-07 17:23:42.000000000 +0200
+@@ -0,0 +1,45 @@
++--- tslib-1.0/tests/ts_test.c.orig 2010-07-07 17:02:50.000000000 +0200
+++++ tslib-1.0/tests/ts_test.c 2010-07-07 16:27:44.000000000 +0200
++@@ -44,7 +44,7 @@ static int button_palette [6] =
++ 1, 5, 0
++ };
++
++-#define NR_BUTTONS 2
+++#define NR_BUTTONS 3
++ static struct ts_button buttons [NR_BUTTONS];
++
++ static void sig(int sig)
++@@ -152,13 +152,15 @@ int main()
++
++ /* Initialize buttons */
++ memset (&buttons, 0, sizeof (buttons));
++- buttons [0].w = buttons [1].w = xres / 4;
++- buttons [0].h = buttons [1].h = 20;
++- buttons [0].x = xres / 4 - buttons [0].w / 2;
++- buttons [1].x = (3 * xres) / 4 - buttons [0].w / 2;
++- buttons [0].y = buttons [1].y = 10;
+++ buttons [0].w = buttons [1].w = buttons[2].w = xres / 4;
+++ buttons [0].h = buttons [1].h = buttons[2].h = 20;
+++ buttons [0].x = xres / 4 - 2 * (buttons [0].w / 3);
+++ buttons [1].x = xres / 2 - buttons [0].w / 2;
+++ buttons [2].x = 3 * (xres / 4) - buttons [0].w / 3;
+++ buttons [0].y = buttons [1].y = buttons [2].y = 10;
++ buttons [0].text = "Drag";
++ buttons [1].text = "Draw";
+++ buttons [2].text = "Quit";
++
++ refresh_screen ();
++
++@@ -196,6 +198,12 @@ int main()
++ mode = 1;
++ refresh_screen ();
++ break;
+++ case 2:
+++ close_framebuffer();
+++ fflush(stderr);
+++ fflush(stdout);
+++ exit(1);
+++ break;
++ }
++
++ printf("%ld.%06ld: %6d %6d %6d\n", samp.tv.tv_sec, samp.tv.tv_usec,
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-07-13 13:39:34
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via be075ea9ca9833e2ed0825386cd6a78712980fb7 (commit)
via 5a77e51201742516d1f0043423c92809a54658b0 (commit)
from 492ab930f0f5aa4e665157db963e2a9170da1a9c (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 be075ea9ca9833e2ed0825386cd6a78712980fb7
Merge: 5a77e51201742516d1f0043423c92809a54658b0 492ab930f0f5aa4e665157db963e2a9170da1a9c
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jul 13 15:39:04 2010 +0200
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 5a77e51201742516d1f0043423c92809a54658b0
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jul 13 15:38:30 2010 +0200
[buildroot] fix joysticktest package bugs
-----------------------------------------------------------------------
Summary of changes:
...est-add_joystick_testing_programs_package.patch | 54 +++++++++-----------
1 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
index 7327a76..eeb1fb1 100644
--- a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
+++ b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-07-13 11:16:25.000000000 +0200
-+++ buildroot/package/Config.in 2010-07-13 11:24:19.000000000 +0200
+--- buildroot.orig/package/Config.in 2010-07-13 15:27:37.000000000 +0200
++++ buildroot/package/Config.in 2010-07-13 15:36:09.000000000 +0200
@@ -499,5 +499,6 @@
# various games packages
@@ -16,7 +16,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/joysticktest/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/Config.in 2010-07-13 11:16:25.000000000 +0200
++++ buildroot/package/joysticktest/Config.in 2010-07-13 15:27:37.000000000 +0200
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_JOYSTICKTEST
+ bool "joysticktest"
@@ -25,7 +25,7 @@ Index: buildroot/package/joysticktest/Config.in
Index: buildroot/package/joysticktest/joysticktest.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/joysticktest.mk 2010-07-13 11:26:28.000000000 +0200
++++ buildroot/package/joysticktest/joysticktest.mk 2010-07-13 15:34:38.000000000 +0200
@@ -0,0 +1,51 @@
+#############################################################
+#
@@ -37,7 +37,7 @@ Index: buildroot/package/joysticktest/joysticktest.mk
+JOYSTICKTEST_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/joystick/
+JOYSTICKTEST_DIR:=$(BUILD_DIR)/joystick-$(JOYSTICKTEST_VERSION)
+JOYSTICKTEST_JSTEST_BINARY:=jstest
-+JOYSTICKTEST_TARGET_JSTEST_BINARY:=usr/bin/jstest
++JOYSTICKTEST_TARGET_BINARY:=/usr/bin/jstest
+
+$(DL_DIR)/$(JOYSTICKTEST_SOURCE):
+ $(call DOWNLOAD,$(JOYSTICKTEST_SITE),$(JOYSTICKTEST_SOURCE))
@@ -51,7 +51,7 @@ Index: buildroot/package/joysticktest/joysticktest.mk
+ touch $@
+
+$(JOYSTICKTEST_DIR)/$(JOYSTICKTEST_BINARY): $(JOYSTICKTEST_DIR)/.configured
-+ $(MAKE) CC=$(TARGET_CC) -C $(JOYSTICKTEST_DIR)
++ $(MAKE) CC=$(TARGET_CC) -C $(JOYSTICKTEST_DIR) CC=$(TARGET_CC) LDFLAGS=-L$(STAGING_DIR)/usr/lib/
+
+$(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY): $(JOYSTICKTEST_DIR)/$(JOYSTICKTEST_BINARY)
+ $(INSTALL) -D $(JOYSTICKTEST_DIR)/jstest $(TARGET_DIR)/usr/bin/
@@ -59,7 +59,7 @@ Index: buildroot/package/joysticktest/joysticktest.mk
+ $(STRIPCMD) $(STRIP_STRIPUNEEDED) $(TARGET_DIR)/usr/bin/jstest
+ $(STRIPCMD) $(STRIP_STRIPUNEEDED) $(TARGET_DIR)/usr/bin/jscal
+
-+joysticktest: $(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY)
++joysticktest: uclibc $(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY)
+
+joysticktest-source: $(DL_DIR)/$(JOYSTICKTEST_SOURCE)
+
@@ -81,30 +81,31 @@ Index: buildroot/package/joysticktest/joysticktest.mk
Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch 2010-07-13 11:16:25.000000000 +0200
-@@ -0,0 +1,204 @@
++++ buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch 2010-07-13 15:28:27.000000000 +0200
+@@ -0,0 +1,198 @@
+Index: joystick-1.2.15/Makefile
+===================================================================
-+--- joystick-1.2.15.orig/Makefile 2010-07-07 09:16:58.000000000 +0200
-++++ joystick-1.2.15/Makefile 2010-07-07 09:23:33.000000000 +0200
-+@@ -27,168 +27,28 @@
++--- joystick-1.2.15.orig/Makefile 2010-07-13 14:28:24.000000000 +0200
+++++ joystick-1.2.15/Makefile 2010-07-13 14:28:29.000000000 +0200
++@@ -27,168 +27,20 @@
+ # Edit the options below to suit your needs
+ #
+
+-CC = gcc
-++ifeq ($(ARMADEUS_BASE_DIR),)
-++ ARMADEUS_BASE_DIR=~/armadeus_trees/apf27_virgin/
-++endif
-++include $(ARMADEUS_BASE_DIR)/Makefile.in
+++CFLAGS=-Wall -g -O2 -lm
+++INCLUDE=
+++LIB=
+
+-CPPFLAGS = -I.# # for joystick.h
-++CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+++all: jscal jstest
+
+-CFLAGS = -O2 -Wall -pipe -m486 -fomit-frame-pointer# # i386
+-# CFLAGS = -O2 -Wall -pipe -m68020 -ffixed-a2# # m68k
+-# CFLAGS = -O2 -Wall -pipe -fomit-frame-pointer -ffixed-8# Alpha
+-# CFLAGS = -O2 -Wall -pipe# # Generic
-+-
+++jscal: jscal.c
+++ ${CC} ${CFLAGS} $< -o $@ ${LDFLAGS}
++
+-MODFLAGS = -D__KERNEL__ -DMODULE# # Normal modules
+-#MODFLAGS = -D__KERNEL__ -DMODULE -DMODVERSIONS\
+-# -include /usr/src/linux/include/linux/modversions.h # Versioned modules
@@ -116,19 +117,12 @@ Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_p
+- joy-spaceball.o joy-magellan.o joy-warrior.o\
+- joy-pci.o# # PC drivers
+-# DRIVERS = joy-amiga.o# # Amiga driver
-++CFLAGS=-Wall -g -O2 -lm
-++LDFLAGS=-L$(ARMADEUS_STAGING_DIR)/usr/lib/
-++INCLUDE=
-++LIB=
-+
++-
+-MODDIR = /lib/modules/preferred/misc# # RedHat location
+-# MODDIR = /lib/modules/current/misc# # For some others?
-++all: jscal jstest
-+
++-
+-PROGRAMS = jstest jscal jsattach
-++jscal: jscal.c
-++ ${CC} ${CFLAGS} $< -o $@ ${LDFLAGS}
-+
++-
+-#
+-# Nothing should need to be changed below this line
+-#
@@ -276,8 +270,8 @@ Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_p
++ rm jstest
+Index: joystick-1.2.15/jscal.c
+===================================================================
-+--- joystick-1.2.15.orig/jscal.c 2010-07-07 09:24:59.000000000 +0200
-++++ joystick-1.2.15/jscal.c 2010-07-07 09:25:48.000000000 +0200
++--- joystick-1.2.15.orig/jscal.c 2010-07-13 15:24:46.000000000 +0200
+++++ joystick-1.2.15/jscal.c 2010-07-13 15:25:02.000000000 +0200
+@@ -30,6 +30,8 @@
+ * Vojtech Pavlik, Ucitelska 1576, Prague 8, 182 00 Czech Republic
+ */
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-07-13 10:02:17
|
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 c54f9110f5d89d581855220a124fdc4af0cb64c2 (commit)
from f94626be319c380ffa70d6cad327fde1490de868 (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 c54f9110f5d89d581855220a124fdc4af0cb64c2
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jul 13 12:01:57 2010 +0200
[buildroot] Fix TARGET bug in joysticktest package
-----------------------------------------------------------------------
Summary of changes:
...est-add_joystick_testing_programs_package.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
index e9e4d21..7327a76 100644
--- a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
+++ b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
@@ -75,7 +75,7 @@ Index: buildroot/package/joysticktest/joysticktest.mk
+#
+############################################################
+ifeq ($(BR2_PACKAGE_JOYSTICKTEST),y)
-+ARGETS+=joysticktest
++TARGETS+=joysticktest
+endif
+
Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-07-13 09:35:39
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f94626be319c380ffa70d6cad327fde1490de868 (commit)
via d0b5d36f282fb87a769255718d0bdfbef712150e (commit)
from 5d7f48a9346eabf5bf67655a42e960c8055a731f (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 f94626be319c380ffa70d6cad327fde1490de868
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jul 13 11:35:01 2010 +0200
[buildroot] strip joysticktest commands
commit d0b5d36f282fb87a769255718d0bdfbef712150e
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jul 13 11:24:12 2010 +0200
[buildroot] sstrip pk2cmd
-----------------------------------------------------------------------
Summary of changes:
...est-add_joystick_testing_programs_package.patch | 20 ++++++++++----------
...ickit2-add_pickit2_programer_command_line.patch | 11 ++++++-----
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
index 84fda47..e9e4d21 100644
--- a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
+++ b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-07-07 11:52:54.000000000 +0200
-+++ buildroot/package/Config.in 2010-07-07 11:52:54.000000000 +0200
+--- buildroot.orig/package/Config.in 2010-07-13 11:16:25.000000000 +0200
++++ buildroot/package/Config.in 2010-07-13 11:24:19.000000000 +0200
@@ -499,5 +499,6 @@
# various games packages
@@ -16,7 +16,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/joysticktest/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/Config.in 2010-07-07 11:52:54.000000000 +0200
++++ buildroot/package/joysticktest/Config.in 2010-07-13 11:16:25.000000000 +0200
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_JOYSTICKTEST
+ bool "joysticktest"
@@ -25,7 +25,7 @@ Index: buildroot/package/joysticktest/Config.in
Index: buildroot/package/joysticktest/joysticktest.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/joysticktest.mk 2010-07-07 16:24:31.000000000 +0200
++++ buildroot/package/joysticktest/joysticktest.mk 2010-07-13 11:26:28.000000000 +0200
@@ -0,0 +1,51 @@
+#############################################################
+#
@@ -54,16 +54,16 @@ Index: buildroot/package/joysticktest/joysticktest.mk
+ $(MAKE) CC=$(TARGET_CC) -C $(JOYSTICKTEST_DIR)
+
+$(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY): $(JOYSTICKTEST_DIR)/$(JOYSTICKTEST_BINARY)
-+ install -D $(JOYSTICKTEST_DIR)/jstest $(TARGET_DIR)/usr/bin/
-+ install -D $(JOYSTICKTEST_DIR)/jscal $(TARGET_DIR)/usr/bin/
-+ rm -Rf $(TARGET_DIR)/usr/man
++ $(INSTALL) -D $(JOYSTICKTEST_DIR)/jstest $(TARGET_DIR)/usr/bin/
++ $(INSTALL) -D $(JOYSTICKTEST_DIR)/jscal $(TARGET_DIR)/usr/bin/
++ $(STRIPCMD) $(STRIP_STRIPUNEEDED) $(TARGET_DIR)/usr/bin/jstest
++ $(STRIPCMD) $(STRIP_STRIPUNEEDED) $(TARGET_DIR)/usr/bin/jscal
+
-+joysticktest: uclibc $(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY)
++joysticktest: $(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY)
+
+joysticktest-source: $(DL_DIR)/$(JOYSTICKTEST_SOURCE)
+
+joysticktest-clean:
-+ $(MAKE) prefix=$(TARGET_DIR)/usr -C $(JOYSTICKTEST_DIR) uninstall
+ -$(MAKE) -C $(JOYSTICKTEST_DIR) clean
+
+joysticktest-dirclean:
@@ -81,7 +81,7 @@ Index: buildroot/package/joysticktest/joysticktest.mk
Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch 2010-07-07 11:52:54.000000000 +0200
++++ buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch 2010-07-13 11:16:25.000000000 +0200
@@ -0,0 +1,204 @@
+Index: joystick-1.2.15/Makefile
+===================================================================
diff --git a/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch b/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
index bcad84c..a95a9e1 100644
--- a/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
+++ b/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
@@ -4,8 +4,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-07-13 10:10:50.000000000 +0200
-+++ buildroot/package/Config.in 2010-07-13 10:10:50.000000000 +0200
+--- buildroot.orig/package/Config.in 2010-07-13 11:16:25.000000000 +0200
++++ buildroot/package/Config.in 2010-07-13 11:16:25.000000000 +0200
@@ -268,6 +268,7 @@
source "package/i2c-tools/Config.in"
source "package/input-tools/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/pickit2/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pickit2/Config.in 2010-07-13 10:10:50.000000000 +0200
++++ buildroot/package/pickit2/Config.in 2010-07-13 11:16:25.000000000 +0200
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_PICKIT2
+ bool "pickit2"
@@ -27,8 +27,8 @@ Index: buildroot/package/pickit2/Config.in
Index: buildroot/package/pickit2/pickit2.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pickit2/pickit2.mk 2010-07-13 11:01:08.000000000 +0200
-@@ -0,0 +1,49 @@
++++ buildroot/package/pickit2/pickit2.mk 2010-07-13 11:22:52.000000000 +0200
+@@ -0,0 +1,50 @@
+#############################################################
+#
+# PICkit2
@@ -58,6 +58,7 @@ Index: buildroot/package/pickit2/pickit2.mk
+$(TARGET_DIR)/$(PICKIT2_TARGET_BINARY): $(PICKIT2_DIR)/$(PICKIT2_BINARY)
+ $(INSTALL) -D $(PICKIT2_DIR)/PK2DeviceFile.dat $(TARGET_DIR)/usr/share/pk2/PK2DeviceFile.dat
+ $(INSTALL) -D $(PICKIT2_DIR)/pk2cmd $(TARGET_DIR)/usr/bin/pk2cmd
++ $(STRIPCMD) $(STRIP_STRIPUNEEDED) $(TARGET_DIR)/usr/bin/pk2cmd
+
+pickit2: libusb $(TARGET_DIR)/$(PICKIT2_TARGET_BINARY)
+
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-07-13 09:13:51
|
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 5d7f48a9346eabf5bf67655a42e960c8055a731f (commit)
via 19b841c1ed40b1926b18af0cc77fb48adabe43a3 (commit)
from dfcdff1e9c7eb46a3b532cd3564ce21fb2f16db9 (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 5d7f48a9346eabf5bf67655a42e960c8055a731f
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jul 13 11:03:28 2010 +0200
[buildroot] Cleaning pickit2 package
commit 19b841c1ed40b1926b18af0cc77fb48adabe43a3
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jul 13 09:47:45 2010 +0200
[buildroot] patch 123 and 124 in the right order
-----------------------------------------------------------------------
Summary of changes:
...est-add_joystick_testing_programs_package.patch | 130 ++++++++++----------
...ickit2-add_pickit2_programer_command_line.patch | 65 +++--------
2 files changed, 80 insertions(+), 115 deletions(-)
diff --git a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
index e6b0a19..84fda47 100644
--- a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
+++ b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
@@ -2,15 +2,6 @@ Adding jstest and jscal joystick testing programs
Signed-off-by: Fabien Marteau <fab...@ar...>
-Index: buildroot/package/joysticktest/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/Config.in 2010-07-07 11:52:54.000000000 +0200
-@@ -0,0 +1,4 @@
-+config BR2_PACKAGE_JOYSTICKTEST
-+ bool "joysticktest"
-+ help
-+ jstest and jscal joystick testing programs.
Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2010-07-07 11:52:54.000000000 +0200
@@ -22,6 +13,71 @@ Index: buildroot/package/Config.in
+source "package/joysticktest/Config.in"
endmenu
+Index: buildroot/package/joysticktest/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/joysticktest/Config.in 2010-07-07 11:52:54.000000000 +0200
+@@ -0,0 +1,4 @@
++config BR2_PACKAGE_JOYSTICKTEST
++ bool "joysticktest"
++ help
++ jstest and jscal joystick testing programs.
+Index: buildroot/package/joysticktest/joysticktest.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/joysticktest/joysticktest.mk 2010-07-07 16:24:31.000000000 +0200
+@@ -0,0 +1,51 @@
++#############################################################
++#
++# Joysticktest
++#
++#############################################################
++JOYSTICKTEST_VERSION:=1.2.15
++JOYSTICKTEST_SOURCE:=joystick-$(JOYSTICKTEST_VERSION).tar.gz
++JOYSTICKTEST_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/joystick/
++JOYSTICKTEST_DIR:=$(BUILD_DIR)/joystick-$(JOYSTICKTEST_VERSION)
++JOYSTICKTEST_JSTEST_BINARY:=jstest
++JOYSTICKTEST_TARGET_JSTEST_BINARY:=usr/bin/jstest
++
++$(DL_DIR)/$(JOYSTICKTEST_SOURCE):
++ $(call DOWNLOAD,$(JOYSTICKTEST_SITE),$(JOYSTICKTEST_SOURCE))
++
++$(JOYSTICKTEST_DIR)/.source: $(DL_DIR)/$(JOYSTICKTEST_SOURCE)
++ $(ZCAT) $(DL_DIR)/$(JOYSTICKTEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ cd $(BUILD_DIR);patch -p0 < $(BASE_DIR)/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch
++ touch $@
++
++$(JOYSTICKTEST_DIR)/.configured: $(JOYSTICKTEST_DIR)/.source
++ touch $@
++
++$(JOYSTICKTEST_DIR)/$(JOYSTICKTEST_BINARY): $(JOYSTICKTEST_DIR)/.configured
++ $(MAKE) CC=$(TARGET_CC) -C $(JOYSTICKTEST_DIR)
++
++$(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY): $(JOYSTICKTEST_DIR)/$(JOYSTICKTEST_BINARY)
++ install -D $(JOYSTICKTEST_DIR)/jstest $(TARGET_DIR)/usr/bin/
++ install -D $(JOYSTICKTEST_DIR)/jscal $(TARGET_DIR)/usr/bin/
++ rm -Rf $(TARGET_DIR)/usr/man
++
++joysticktest: uclibc $(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY)
++
++joysticktest-source: $(DL_DIR)/$(JOYSTICKTEST_SOURCE)
++
++joysticktest-clean:
++ $(MAKE) prefix=$(TARGET_DIR)/usr -C $(JOYSTICKTEST_DIR) uninstall
++ -$(MAKE) -C $(JOYSTICKTEST_DIR) clean
++
++joysticktest-dirclean:
++ rm -rf $(JOYSTICKTEST_DIR)
++
++############################################################
++#
++# Toplevel Makefile options
++#
++############################################################
++ifeq ($(BR2_PACKAGE_JOYSTICKTEST),y)
++ARGETS+=joysticktest
++endif
++
Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -231,59 +287,3 @@ Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_p
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+ #include <fcntl.h>
-Index: buildroot/package/joysticktest/joysticktest.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/joysticktest.mk 2010-07-07 16:24:31.000000000 +0200
-@@ -0,0 +1,51 @@
-+#############################################################
-+#
-+# Joysticktest
-+#
-+#############################################################
-+JOYSTICKTEST_VERSION:=1.2.15
-+JOYSTICKTEST_SOURCE:=joystick-$(JOYSTICKTEST_VERSION).tar.gz
-+JOYSTICKTEST_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/joystick/
-+JOYSTICKTEST_DIR:=$(BUILD_DIR)/joystick-$(JOYSTICKTEST_VERSION)
-+JOYSTICKTEST_JSTEST_BINARY:=jstest
-+JOYSTICKTEST_TARGET_JSTEST_BINARY:=usr/bin/jstest
-+
-+$(DL_DIR)/$(JOYSTICKTEST_SOURCE):
-+ $(call DOWNLOAD,$(JOYSTICKTEST_SITE),$(JOYSTICKTEST_SOURCE))
-+
-+$(JOYSTICKTEST_DIR)/.source: $(DL_DIR)/$(JOYSTICKTEST_SOURCE)
-+ $(ZCAT) $(DL_DIR)/$(JOYSTICKTEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ cd $(BUILD_DIR);patch -p0 < $(BASE_DIR)/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch
-+ touch $@
-+
-+$(JOYSTICKTEST_DIR)/.configured: $(JOYSTICKTEST_DIR)/.source
-+ touch $@
-+
-+$(JOYSTICKTEST_DIR)/$(JOYSTICKTEST_BINARY): $(JOYSTICKTEST_DIR)/.configured
-+ $(MAKE) CC=$(TARGET_CC) -C $(JOYSTICKTEST_DIR)
-+
-+$(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY): $(JOYSTICKTEST_DIR)/$(JOYSTICKTEST_BINARY)
-+ install -D $(JOYSTICKTEST_DIR)/jstest $(TARGET_DIR)/usr/bin/
-+ install -D $(JOYSTICKTEST_DIR)/jscal $(TARGET_DIR)/usr/bin/
-+ rm -Rf $(TARGET_DIR)/usr/man
-+
-+joysticktest: uclibc $(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY)
-+
-+joysticktest-source: $(DL_DIR)/$(JOYSTICKTEST_SOURCE)
-+
-+joysticktest-clean:
-+ $(MAKE) prefix=$(TARGET_DIR)/usr -C $(JOYSTICKTEST_DIR) uninstall
-+ -$(MAKE) -C $(JOYSTICKTEST_DIR) clean
-+
-+joysticktest-dirclean:
-+ rm -rf $(JOYSTICKTEST_DIR)
-+
-+############################################################
-+#
-+# Toplevel Makefile options
-+#
-+############################################################
-+ifeq ($(BR2_PACKAGE_JOYSTICKTEST),y)
-+TARGETS+=joysticktest
-+endif
-+
diff --git a/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch b/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
index 359c4f9..bcad84c 100644
--- a/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
+++ b/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
@@ -1,41 +1,11 @@
-Index: buildroot/package/pickit2/pickit2-1.20-compile_it_for_armadeus.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pickit2/pickit2-1.20-compile_it_for_armadeus.patch 2010-07-12 18:17:35.000000000 +0200
-@@ -0,0 +1,29 @@
-+Index: pk2cmdv1.20LinuxMacSource/Makefile
-+===================================================================
-+--- pk2cmdv1.20LinuxMacSource.orig/Makefile 2010-07-12 17:33:48.000000000 +0200
-++++ pk2cmdv1.20LinuxMacSource/Makefile 2010-07-12 17:33:56.000000000 +0200
-+@@ -12,9 +12,13 @@
-+ # or
-+ # make mac
-+ #
-++ifeq ($(ARMADEUS_BASE_DIR),)
-++ ARMADEUS_BASE_DIR=../../../
-++endif
-++include $(ARMADEUS_BASE_DIR)/Makefile.in
-+
-+ APP=pk2cmd
-+-CC=g++
-++CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
-+ # Uncomment this for debugging with gdb
-+ #DBG=-ggdb -O0
-+ # Uncomment this for no debugging (default)
-+@@ -24,7 +28,8 @@
-+
-+ # Grab the version of libusb in /usr/local if possible:
-+ LIBUSB=/usr/local
-+-LDFLAGS=-L$(LIBUSB)/lib -lusb
-++LDFLAGS=-L$(ARMADEUS_STAGING_DIR)/usr/lib/ -lusb
-++#LDFLAGS=-L$(LIBUSB)/lib -lusb
-+
-+ # CHOOSE A TARGET BEFORE COMPILING
-+ #
+Adding PICKit 2 programmer command line
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-07-12 17:59:53.000000000 +0200
-+++ buildroot/package/Config.in 2010-07-12 18:17:35.000000000 +0200
+--- buildroot.orig/package/Config.in 2010-07-13 10:10:50.000000000 +0200
++++ buildroot/package/Config.in 2010-07-13 10:10:50.000000000 +0200
@@ -268,6 +268,7 @@
source "package/i2c-tools/Config.in"
source "package/input-tools/Config.in"
@@ -47,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/pickit2/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pickit2/Config.in 2010-07-12 18:17:35.000000000 +0200
++++ buildroot/package/pickit2/Config.in 2010-07-13 10:10:50.000000000 +0200
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_PICKIT2
+ bool "pickit2"
@@ -57,8 +27,8 @@ Index: buildroot/package/pickit2/Config.in
Index: buildroot/package/pickit2/pickit2.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pickit2/pickit2.mk 2010-07-12 18:48:52.000000000 +0200
-@@ -0,0 +1,54 @@
++++ buildroot/package/pickit2/pickit2.mk 2010-07-13 11:01:08.000000000 +0200
+@@ -0,0 +1,49 @@
+#############################################################
+#
+# PICkit2
@@ -67,8 +37,8 @@ Index: buildroot/package/pickit2/pickit2.mk
+PICKIT2_VERSION:=1.20
+PICKIT2_BINARY:=pk2cmd
+PICKIT2_SOURCE:=$(PICKIT2_BINARY)v$(PICKIT2_VERSION)LinuxMacSource.tar.gz
-+PICKIT2_SITE =http://ww1.microchip.com/downloads/en/DeviceDoc/
-+PICKIT2_DIR:=$(BUILD_DIR)/pickit2-$(PICKIT2_VERSION)
++PICKIT2_SITE:=http://ww1.microchip.com/downloads/en/DeviceDoc/
++PICKIT2_DIR:=$(BUILD_DIR)/pickit2-$(PICKIT2_VERSION)/
+PICKIT2_TARGET_BINARY:=usr/bin/pk2cmd
+
+$(DL_DIR)/$(PICKIT2_SOURCE):
@@ -76,7 +46,6 @@ Index: buildroot/package/pickit2/pickit2.mk
+
+$(PICKIT2_DIR)/.source: $(DL_DIR)/$(PICKIT2_SOURCE)
+ $(ZCAT) $(DL_DIR)/$(PICKIT2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-+ cd $(BUILD_DIR);patch -p0 < $(BASE_DIR)/package/pickit2/pickit2-1.20-compile_it_for_armadeus.patch
+ mv $(BUILD_DIR)/$(PICKIT2_BINARY)v$(PICKIT2_VERSION)LinuxMacSource $(PICKIT2_DIR)
+ touch $@
+
@@ -84,21 +53,17 @@ Index: buildroot/package/pickit2/pickit2.mk
+ touch $@
+
+$(PICKIT2_DIR)/$(PICKIT2_BINARY): $(PICKIT2_DIR)/.configured
-+ $(MAKE) -C $(PICKIT2_DIR) linux
++ $(MAKE) -C $(PICKIT2_DIR) CC=$(TARGET_CXX) LIBUSB=$(STAGING_DIR)/usr/lib/ TARGET=linux
+
+$(TARGET_DIR)/$(PICKIT2_TARGET_BINARY): $(PICKIT2_DIR)/$(PICKIT2_BINARY)
-+ install -D $(PICKIT2_DIR)/PK2DeviceFile.dat $(TARGET_DIR)/usr/share/pk2/PK2DeviceFile.dat
-+ install -D $(PICKIT2_DIR)/pk2cmd $(TARGET_DIR)/usr/bin/pk2cmd
-+ chmod 755 $(TARGET_DIR)/usr/bin/pk2cmd
-+ chmod 755 $(TARGET_DIR)/usr/share/pk2/PK2DeviceFile.dat
-+ rm -Rf $(TARGET_DIR)/usr/man
++ $(INSTALL) -D $(PICKIT2_DIR)/PK2DeviceFile.dat $(TARGET_DIR)/usr/share/pk2/PK2DeviceFile.dat
++ $(INSTALL) -D $(PICKIT2_DIR)/pk2cmd $(TARGET_DIR)/usr/bin/pk2cmd
+
-+pickit2: uclibc libusb $(TARGET_DIR)/$(PICKIT2_TARGET_BINARY)
++pickit2: libusb $(TARGET_DIR)/$(PICKIT2_TARGET_BINARY)
+
+pickit2-source: $(DL_DIR)/$(PICKIT2_SOURCE)
+
+pickit2-clean:
-+ $(MAKE) prefix=$(TARGET_DIR)/usr -C $(PICKIT2_DIR) uninstall
+ -$(MAKE) -C $(PICKIT2_DIR) clean
+
+pickit2-dirclean:
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-07-12 17:00:50
|
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 dfcdff1e9c7eb46a3b532cd3564ce21fb2f16db9 (commit)
from 7fe300fab41477e4463d4a079b3bc938a404d179 (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 dfcdff1e9c7eb46a3b532cd3564ce21fb2f16db9
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jul 12 19:00:24 2010 +0200
[buildroot] Adding pickit2 in default configuration (not set)
-----------------------------------------------------------------------
Summary of changes:
.../target/device/armadeus/apf27/apf27_defconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index 2151717..7f6cd0c 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -504,6 +504,7 @@ BR2_BLOCKDEV_SUPPORT=y
# BR2_PACKAGE_HWDATA is not set
BR2_PACKAGE_I2C_TOOLS=y
# BR2_PACKAGE_INPUT_TOOLS is not set
+# BR2_PACKAGE_PICKIT2 is not set
# BR2_PACKAGE_IOSTAT is not set
# BR2_PACKAGE_LCD4LINUX is not set
# BR2_PACKAGE_LIBAIO is not set
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-07-12 16:56:17
|
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 7fe300fab41477e4463d4a079b3bc938a404d179 (commit)
via 1308c361e5809715b034d72bcd2b28253541abd4 (commit)
via a036707b7dad75f66eb0323729f23fac87ec875a (commit)
via 4d5aff8026b88f83b551ef75dbb7de362c800512 (commit)
via b6ff58a50cf8c11fdb9b22a3b2572a5b8cc05bbe (commit)
from 1ca7190c2790f2d45f2a12e51646e8f8d0c50656 (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 7fe300fab41477e4463d4a079b3bc938a404d179
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jul 12 18:55:37 2010 +0200
[buildroot] Fix joysticktest package bug
commit 1308c361e5809715b034d72bcd2b28253541abd4
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jul 12 18:53:37 2010 +0200
[buildroot] Fix pickit2 package bugs
commit a036707b7dad75f66eb0323729f23fac87ec875a
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jul 12 18:15:01 2010 +0200
[buildroot] Add pickit2 programer command line program
commit 4d5aff8026b88f83b551ef75dbb7de362c800512
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jul 12 17:45:09 2010 +0200
[buildroot] adding joysticktest package in cleanup script
commit b6ff58a50cf8c11fdb9b22a3b2572a5b8cc05bbe
Author: Fabien Marteau <fab...@ar...>
Date: Thu Jul 8 10:44:40 2010 +0200
[linux][as5011] Do not try to free tabular pointer
-----------------------------------------------------------------------
Summary of changes:
...us-joystick-adding_as5011_joystick_driver.patch | 11 +-
...est-add_joystick_testing_programs_package.patch | 2 +-
...ickit2-add_pickit2_programer_command_line.patch | 115 ++++++++++++++++++++
patches/buildroot/cleanup_buildroot.sh | 2 +
4 files changed, 123 insertions(+), 7 deletions(-)
create mode 100644 patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
index 24292bf..63da72c 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
@@ -5,8 +5,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-07-01 14:26:46.000000000 +0200
-@@ -0,0 +1,429 @@
++++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-07-08 10:43:14.000000000 +0200
+@@ -0,0 +1,428 @@
+/*
+ * Copyright (c) 2010 Fabien Marteau <fab...@ar...>
+ *
@@ -388,7 +388,6 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+i2c_protocol_error:
+ destroy_workqueue(plat_dat->workqueue);
+workqueue_create_error:
-+ kfree(plat_dat->workqueue_name);
+workqueue_name_error:
+ return retval;
+}
@@ -439,7 +438,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
===================================================================
--- linux-2.6.29.6.orig/drivers/input/joystick/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/input/joystick/Kconfig 2010-06-28 09:20:47.000000000 +0200
++++ linux-2.6.29.6/drivers/input/joystick/Kconfig 2010-07-08 10:11:38.000000000 +0200
@@ -254,6 +254,15 @@
To compile this driver as a module, choose M here: the
module will be called amijoy.
@@ -459,7 +458,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
Index: linux-2.6.29.6/drivers/input/joystick/Makefile
===================================================================
--- linux-2.6.29.6.orig/drivers/input/joystick/Makefile 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/input/joystick/Makefile 2010-06-28 09:20:47.000000000 +0200
++++ linux-2.6.29.6/drivers/input/joystick/Makefile 2010-07-08 10:11:38.000000000 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_JOYSTICK_A3D) += a3d.o
obj-$(CONFIG_JOYSTICK_ADI) += adi.o
@@ -471,7 +470,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/Makefile
Index: linux-2.6.29.6/include/linux/as5011.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/include/linux/as5011.h 2010-07-01 11:11:11.000000000 +0200
++++ linux-2.6.29.6/include/linux/as5011.h 2010-07-08 10:11:38.000000000 +0200
@@ -0,0 +1,72 @@
+#ifndef _AS5011_H
+#define _AS5011_H
diff --git a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
index eed2817..e6b0a19 100644
--- a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
+++ b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
@@ -284,6 +284,6 @@ Index: buildroot/package/joysticktest/joysticktest.mk
+#
+############################################################
+ifeq ($(BR2_PACKAGE_JOYSTICKTEST),y)
-+ARGETS+=joysticktest
++TARGETS+=joysticktest
+endif
+
diff --git a/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch b/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
new file mode 100644
index 0000000..359c4f9
--- /dev/null
+++ b/patches/buildroot/124-pickit2-add_pickit2_programer_command_line.patch
@@ -0,0 +1,115 @@
+Index: buildroot/package/pickit2/pickit2-1.20-compile_it_for_armadeus.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/pickit2/pickit2-1.20-compile_it_for_armadeus.patch 2010-07-12 18:17:35.000000000 +0200
+@@ -0,0 +1,29 @@
++Index: pk2cmdv1.20LinuxMacSource/Makefile
++===================================================================
++--- pk2cmdv1.20LinuxMacSource.orig/Makefile 2010-07-12 17:33:48.000000000 +0200
+++++ pk2cmdv1.20LinuxMacSource/Makefile 2010-07-12 17:33:56.000000000 +0200
++@@ -12,9 +12,13 @@
++ # or
++ # make mac
++ #
+++ifeq ($(ARMADEUS_BASE_DIR),)
+++ ARMADEUS_BASE_DIR=../../../
+++endif
+++include $(ARMADEUS_BASE_DIR)/Makefile.in
++
++ APP=pk2cmd
++-CC=g++
+++CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
++ # Uncomment this for debugging with gdb
++ #DBG=-ggdb -O0
++ # Uncomment this for no debugging (default)
++@@ -24,7 +28,8 @@
++
++ # Grab the version of libusb in /usr/local if possible:
++ LIBUSB=/usr/local
++-LDFLAGS=-L$(LIBUSB)/lib -lusb
+++LDFLAGS=-L$(ARMADEUS_STAGING_DIR)/usr/lib/ -lusb
+++#LDFLAGS=-L$(LIBUSB)/lib -lusb
++
++ # CHOOSE A TARGET BEFORE COMPILING
++ #
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-07-12 17:59:53.000000000 +0200
++++ buildroot/package/Config.in 2010-07-12 18:17:35.000000000 +0200
+@@ -268,6 +268,7 @@
+ source "package/i2c-tools/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/iostat/Config.in"
++source "package/pickit2/Config.in"
+ source "package/lcd4linux/Config.in"
+ source "package/libaio/Config.in"
+ source "package/libraw1394/Config.in"
+Index: buildroot/package/pickit2/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/pickit2/Config.in 2010-07-12 18:17:35.000000000 +0200
+@@ -0,0 +1,5 @@
++config BR2_PACKAGE_PICKIT2
++ bool "pickit2"
++ select BR2_PACKAGE_LIBUSB
++ help
++ Use microchip programmer adapt PICkit 2
+Index: buildroot/package/pickit2/pickit2.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/pickit2/pickit2.mk 2010-07-12 18:48:52.000000000 +0200
+@@ -0,0 +1,54 @@
++#############################################################
++#
++# PICkit2
++#
++#############################################################
++PICKIT2_VERSION:=1.20
++PICKIT2_BINARY:=pk2cmd
++PICKIT2_SOURCE:=$(PICKIT2_BINARY)v$(PICKIT2_VERSION)LinuxMacSource.tar.gz
++PICKIT2_SITE =http://ww1.microchip.com/downloads/en/DeviceDoc/
++PICKIT2_DIR:=$(BUILD_DIR)/pickit2-$(PICKIT2_VERSION)
++PICKIT2_TARGET_BINARY:=usr/bin/pk2cmd
++
++$(DL_DIR)/$(PICKIT2_SOURCE):
++ $(call DOWNLOAD,$(PICKIT2_SITE),$(PICKIT2_SOURCE))
++
++$(PICKIT2_DIR)/.source: $(DL_DIR)/$(PICKIT2_SOURCE)
++ $(ZCAT) $(DL_DIR)/$(PICKIT2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ cd $(BUILD_DIR);patch -p0 < $(BASE_DIR)/package/pickit2/pickit2-1.20-compile_it_for_armadeus.patch
++ mv $(BUILD_DIR)/$(PICKIT2_BINARY)v$(PICKIT2_VERSION)LinuxMacSource $(PICKIT2_DIR)
++ touch $@
++
++$(PICKIT2_DIR)/.configured: $(PICKIT2_DIR)/.source
++ touch $@
++
++$(PICKIT2_DIR)/$(PICKIT2_BINARY): $(PICKIT2_DIR)/.configured
++ $(MAKE) -C $(PICKIT2_DIR) linux
++
++$(TARGET_DIR)/$(PICKIT2_TARGET_BINARY): $(PICKIT2_DIR)/$(PICKIT2_BINARY)
++ install -D $(PICKIT2_DIR)/PK2DeviceFile.dat $(TARGET_DIR)/usr/share/pk2/PK2DeviceFile.dat
++ install -D $(PICKIT2_DIR)/pk2cmd $(TARGET_DIR)/usr/bin/pk2cmd
++ chmod 755 $(TARGET_DIR)/usr/bin/pk2cmd
++ chmod 755 $(TARGET_DIR)/usr/share/pk2/PK2DeviceFile.dat
++ rm -Rf $(TARGET_DIR)/usr/man
++
++pickit2: uclibc libusb $(TARGET_DIR)/$(PICKIT2_TARGET_BINARY)
++
++pickit2-source: $(DL_DIR)/$(PICKIT2_SOURCE)
++
++pickit2-clean:
++ $(MAKE) prefix=$(TARGET_DIR)/usr -C $(PICKIT2_DIR) uninstall
++ -$(MAKE) -C $(PICKIT2_DIR) clean
++
++pickit2-dirclean:
++ rm -rf $(PICKIT2_DIR)
++
++############################################################
++#
++# Toplevel Makefile options
++#
++############################################################
++ifeq ($(BR2_PACKAGE_PICKIT2),y)
++TARGETS+=pickit2
++endif
++
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 75d5faa..556f19a 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -45,3 +45,5 @@ rm -rf buildroot/package/fbtest/
rm -rf buildroot/package/xenomai/
rm -rf buildroot/package/cwiid/
rm -rf buildroot/package/urg/
+rm -rf buildroot/package/joysticktest/
+rm -rf buildroot/package/pickit2/
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-07-08 07:06:53
|
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 1ca7190c2790f2d45f2a12e51646e8f8d0c50656 (commit)
from e721753edf82bc833207bd6314e0dd7ea1ebaa6c (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 1ca7190c2790f2d45f2a12e51646e8f8d0c50656
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jul 7 17:08:37 2010 +0200
[buildroot] unselect joysticktest package in config file
-----------------------------------------------------------------------
Summary of changes:
.../target/device/armadeus/apf27/apf27_defconfig | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index ece2063..2151717 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Jun 24 16:14:29 2010
+# Wed Jul 7 17:06:28 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -728,6 +728,7 @@ BR2_PACKAGE_ZLIB=y
# BR2_XML_SUPPORT is not set
# BR2_JAVA_SUPPORT is not set
# BR2_GAMES is not set
+# BR2_PACKAGE_JOYSTICKTEST is not set
#
# Target filesystem options
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-07-07 14:27: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 e721753edf82bc833207bd6314e0dd7ea1ebaa6c (commit)
from cfcd5af421528a5af9cc0f26c9737ddd48a5927a (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 e721753edf82bc833207bd6314e0dd7ea1ebaa6c
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jul 7 16:27:04 2010 +0200
[package][joysticktest] armadeus buildroot is too old for GENTARGETS makefile, use manual makefile instead
-----------------------------------------------------------------------
Summary of changes:
...est-add_joystick_testing_programs_package.patch | 71 +++++++++++++------
1 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
index 68f5fe0..eed2817 100644
--- a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
+++ b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
@@ -5,7 +5,7 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/joysticktest/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/Config.in 2010-07-07 09:46:38.000000000 +0200
++++ buildroot/package/joysticktest/Config.in 2010-07-07 11:52:54.000000000 +0200
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_JOYSTICKTEST
+ bool "joysticktest"
@@ -13,8 +13,8 @@ Index: buildroot/package/joysticktest/Config.in
+ jstest and jscal joystick testing programs.
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-07-07 09:42:49.000000000 +0200
-+++ buildroot/package/Config.in 2010-07-07 09:57:48.000000000 +0200
+--- buildroot.orig/package/Config.in 2010-07-07 11:52:54.000000000 +0200
++++ buildroot/package/Config.in 2010-07-07 11:52:54.000000000 +0200
@@ -499,5 +499,6 @@
# various games packages
@@ -25,7 +25,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch 2010-07-07 09:26:04.000000000 +0200
++++ buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch 2010-07-07 11:52:54.000000000 +0200
@@ -0,0 +1,204 @@
+Index: joystick-1.2.15/Makefile
+===================================================================
@@ -234,31 +234,56 @@ Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_p
Index: buildroot/package/joysticktest/joysticktest.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/joysticktest.mk 2010-07-07 10:14:49.000000000 +0200
-@@ -0,0 +1,26 @@
-+############################################################
++++ buildroot/package/joysticktest/joysticktest.mk 2010-07-07 16:24:31.000000000 +0200
+@@ -0,0 +1,51 @@
++#############################################################
+#
+# Joysticktest
+#
-+############################################################
++#############################################################
+JOYSTICKTEST_VERSION:=1.2.15
+JOYSTICKTEST_SOURCE:=joystick-$(JOYSTICKTEST_VERSION).tar.gz
-+JOYSTICKTEST_SITE:=ftp://atrey.karlin.mff.cuni.cz/pub/linux/joystick/
-+JOYSTICKTEST_INSTALL_STAGING=YES
-+JOYSTICKTEST_DEPENDENCIES =
++JOYSTICKTEST_SITE = ftp://atrey.karlin.mff.cuni.cz/pub/linux/joystick/
++JOYSTICKTEST_DIR:=$(BUILD_DIR)/joystick-$(JOYSTICKTEST_VERSION)
++JOYSTICKTEST_JSTEST_BINARY:=jstest
++JOYSTICKTEST_TARGET_JSTEST_BINARY:=usr/bin/jstest
++
++$(DL_DIR)/$(JOYSTICKTEST_SOURCE):
++ $(call DOWNLOAD,$(JOYSTICKTEST_SITE),$(JOYSTICKTEST_SOURCE))
++
++$(JOYSTICKTEST_DIR)/.source: $(DL_DIR)/$(JOYSTICKTEST_SOURCE)
++ $(ZCAT) $(DL_DIR)/$(JOYSTICKTEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ cd $(BUILD_DIR);patch -p0 < $(BASE_DIR)/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch
++ touch $@
++
++$(JOYSTICKTEST_DIR)/.configured: $(JOYSTICKTEST_DIR)/.source
++ touch $@
++
++$(JOYSTICKTEST_DIR)/$(JOYSTICKTEST_BINARY): $(JOYSTICKTEST_DIR)/.configured
++ $(MAKE) CC=$(TARGET_CC) -C $(JOYSTICKTEST_DIR)
++
++$(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY): $(JOYSTICKTEST_DIR)/$(JOYSTICKTEST_BINARY)
++ install -D $(JOYSTICKTEST_DIR)/jstest $(TARGET_DIR)/usr/bin/
++ install -D $(JOYSTICKTEST_DIR)/jscal $(TARGET_DIR)/usr/bin/
++ rm -Rf $(TARGET_DIR)/usr/man
+
-+define JOYSTICKTEST_BUILD_CMDS
-+ $(MAKE) CC=$(TARGET_CC) LD=$(TARGET_LD) -C $(@D) all
-+endef
++joysticktest: uclibc $(TARGET_DIR)/$(JOYSTICKTEST_TARGET_BINARY)
+
-+define JOYSTICKTEST_INSTALL_STAGING_CMDS
-+ $(INSTALL) -D $(@D)/jstest $(STAGING_DIR)/usr/bin/jstest
-+ $(INSTALL) -D $(@D)/jscal $(STAGING_DIR)/usr/bin/jscal
-+endef
++joysticktest-source: $(DL_DIR)/$(JOYSTICKTEST_SOURCE)
+
-+define JOYSTICKTEST_INSTALL_TARGET_CMDS
-+ cp -dpf $(@D)/jstest $(TARGET_DIR)/usr/bin/jstest
-+ cp -dpf $(@D)/jscal $(TARGET_DIR)/usr/bin/jscal
-+endef
++joysticktest-clean:
++ $(MAKE) prefix=$(TARGET_DIR)/usr -C $(JOYSTICKTEST_DIR) uninstall
++ -$(MAKE) -C $(JOYSTICKTEST_DIR) clean
++
++joysticktest-dirclean:
++ rm -rf $(JOYSTICKTEST_DIR)
++
++############################################################
++#
++# Toplevel Makefile options
++#
++############################################################
++ifeq ($(BR2_PACKAGE_JOYSTICKTEST),y)
++ARGETS+=joysticktest
++endif
+
-+$(eval $(call GENTARGETS,package,joysticktest,target))
hooks/post-receive
--
armadeus
|
