armadeus-commitlog Mailing List for armadeus (Page 107)
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-06-20 21:20:45
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4f6bf597243a73cb67a6df1108f626e8d5d10c1d (commit)
via c44ef6769c11146a4bbb2c50eee40d19b708bc5b (commit)
via f5c921f7aa6fcfd6fa2663b0b9f04aba036a68ce (commit)
via 191a2033639fe8f62a5956bd7bfdf51df26692fa (commit)
from a7500842e8a1a108b2b07b3832be64639041efd9 (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 4f6bf597243a73cb67a6df1108f626e8d5d10c1d
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jun 20 23:19:59 2010 +0200
[BUILDROOT] Add Cwiid package (wiimote control). Thanks YaGeek!
commit c44ef6769c11146a4bbb2c50eee40d19b708bc5b
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jun 20 18:45:33 2010 +0200
[BUILDROOT] move xenomai package as patch against BR
commit f5c921f7aa6fcfd6fa2663b0b9f04aba036a68ce
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jun 20 18:17:52 2010 +0200
[BUILD] Add message when compiling of BSP is successful
commit 191a2033639fe8f62a5956bd7bfdf51df26692fa
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jun 20 16:01:34 2010 +0200
[BUILDROOT] Updates uucp & ussp-push packages patches
-----------------------------------------------------------------------
Summary of changes:
Makefile | 8 +
buildroot/package/.gitignore | 1 -
...-before-adeos-compatibility_with_armadeus.patch | 10 -
...eze_on_mxc_with_gpio_generated_interrupts.patch | 23 --
buildroot/package/xenomai/Config.in | 8 -
buildroot/package/xenomai/xeno-kernel.config | 59 -----
buildroot/package/xenomai/xenomai.mk | 100 --------
patches/buildroot/072-xenomai-package.patch | 259 ++++++++++++++++++--
patches/buildroot/095-uucp-add_packages.patch | 17 +-
patches/buildroot/117-ussp-push-add_package.patch | 10 +-
patches/buildroot/120-cwiid-add_package.patch | 106 ++++++++
.../buildroot/2010.05/072-xenomai-package.patch | 234 +++++++++++++++++-
.../buildroot/2010.05/095-uucp-add_packages.patch | 13 +-
patches/buildroot/2010.05/cleanup_buildroot.sh | 1 +
patches/buildroot/cleanup_buildroot.sh | 1 +
15 files changed, 622 insertions(+), 228 deletions(-)
delete mode 100644 buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
delete mode 100644 buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
delete mode 100644 buildroot/package/xenomai/Config.in
delete mode 100644 buildroot/package/xenomai/xeno-kernel.config
delete mode 100644 buildroot/package/xenomai/xenomai.mk
create mode 100644 patches/buildroot/120-cwiid-add_package.patch
diff --git a/Makefile b/Makefile
index a240958..138b4d1 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,13 @@ ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
echo " "; \
echo -en "\033[0m";
+ARMADEUS_BSP_VERSION=$(shell cat $(BUILDROOT_DIR)/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version)
+ECHO_BUILD_IS_OK:= echo -en "\033[1m"; \
+ echo ""; \
+ echo "Your Armadeus BSP (version "$(ARMADEUS_BSP_VERSION)") was successfully built !"; \
+ echo ""; \
+ echo -en "\033[0m";
+
default: all
help:
@@ -160,6 +167,7 @@ all: $(BUILDROOT_DIR)/.configured
@echo "If your /bin/sh link doesn't point to /bin/bash, please correct that."
@ls -al /bin/sh | grep bash
@$(MAKE) -C $(BUILDROOT_DIR) $@
+ @$(ECHO_BUILD_IS_OK)
menuconfig: $(BUILDROOT_DIR)/.configured
@$(MAKE) -C $(BUILDROOT_DIR) $@
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index d5fbcf6..31747f1 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -12,4 +12,3 @@
!/armadeus/
!/bluez/
!/mtd/
-!/xenomai/
diff --git a/buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch b/buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
deleted file mode 100644
index 36a0420..0000000
--- a/buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/arm/mach-imx/include/mach/imxfb.h
-+++ b/arch/arm/mach-imx/include/mach/imxfb.h
-@@ -14,7 +14,6 @@
- #define PCR_BPIX_8 (3 << 25)
- #define PCR_BPIX_12 (4 << 25)
- #define PCR_BPIX_16 (4 << 25)
--#define PCR_BPIX_MASK (7 << 25)
- #define PCR_PIXPOL (1 << 24)
- #define PCR_FLMPOL (1 << 23)
- #define PCR_LPPOL (1 << 22)
diff --git a/buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch b/buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
deleted file mode 100644
index 229aa1c..0000000
--- a/buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Corrects Freeze problem with MX2 when Adeos is active and
-application/driver uses interruption on GPIO
-
-Signed-off-by: Gwenhael GOAVEC-MEROU <gw...@tr...>
-
-Index: kernel/arch/arm/plat-mxc/gpio.c
-===================================================================
---- a/arch/arm/plat-mxc/gpio.c 2009-12-17 22:09:56.000000000 +0100
-+++ b/arch/arm/plat-mxc/gpio.c 2009-12-17 15:45:17.000000000 +0100
-@@ -241,11 +241,11 @@
- int i;
-
- for (i = 0; i < gpio_table_size; i++) {
-- irq_msk = __raw_readl(port->base + GPIO_IMR);
-+ irq_msk = __raw_readl(port[i].base + GPIO_IMR);
- if (!irq_msk)
- continue;
-
-- irq_stat = __raw_readl(port->base + GPIO_ISR) & irq_msk;
-+ irq_stat = __raw_readl(port[i].base + GPIO_ISR) & irq_msk;
-
- gpio_irq_no = port[i].virtual_irq_start;
-
diff --git a/buildroot/package/xenomai/Config.in b/buildroot/package/xenomai/Config.in
deleted file mode 100644
index 7fb8584..0000000
--- a/buildroot/package/xenomai/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_XENOMAI
- bool "Xenomai"
- depends on BR2_LINUX_2_6_29 || BR2_LINUX_2_6_27
- help
- Real-Time Framework for Linux
-
- http://xenomai.org
-
diff --git a/buildroot/package/xenomai/xeno-kernel.config b/buildroot/package/xenomai/xeno-kernel.config
deleted file mode 100644
index f727ef7..0000000
--- a/buildroot/package/xenomai/xeno-kernel.config
+++ /dev/null
@@ -1,59 +0,0 @@
-CONFIG_XENOMAI=y
-CONFIG_XENO_OPT_NUCLEUS=y
-CONFIG_XENO_OPT_PERVASIVE=y
-# CONFIG_XENO_OPT_ISHIELD is not set
-CONFIG_XENO_OPT_PRIOCPL=y
-CONFIG_XENO_OPT_PIPELINE_HEAD=y
-CONFIG_XENO_OPT_PIPE_NRDEV=32
-CONFIG_XENO_OPT_REGISTRY_NRSLOTS=512
-CONFIG_XENO_OPT_SYS_HEAPSZ=128
-CONFIG_XENO_OPT_SYS_STACKPOOLSZ=32
-CONFIG_XENO_OPT_STATS=y
-# CONFIG_XENO_OPT_DEBUG is not set
-# CONFIG_XENO_OPT_SHIRQ is not set
-CONFIG_XENO_OPT_TIMING_PERIODIC=y
-CONFIG_XENO_OPT_TIMING_SCHEDLAT=0
-# CONFIG_XENO_OPT_SCALABLE_SCHED is not set
-CONFIG_XENO_OPT_TIMER_LIST=y
-# CONFIG_XENO_OPT_TIMER_HEAP is not set
-# CONFIG_XENO_OPT_TIMER_WHEEL is not set
-CONFIG_XENO_HW_FPU=y
-CONFIG_XENO_SKIN_NATIVE=y
-CONFIG_XENO_OPT_NATIVE_PERIOD=0
-CONFIG_XENO_OPT_NATIVE_PIPE=y
-CONFIG_XENO_OPT_NATIVE_PIPE_BUFSZ=1024
-CONFIG_XENO_OPT_NATIVE_SEM=y
-CONFIG_XENO_OPT_NATIVE_EVENT=y
-CONFIG_XENO_OPT_NATIVE_MUTEX=y
-CONFIG_XENO_OPT_NATIVE_COND=y
-CONFIG_XENO_OPT_NATIVE_QUEUE=y
-CONFIG_XENO_OPT_NATIVE_HEAP=y
-CONFIG_XENO_OPT_NATIVE_ALARM=y
-CONFIG_XENO_OPT_NATIVE_MPS=y
-CONFIG_XENO_OPT_NATIVE_INTR=y
-CONFIG_XENO_SKIN_POSIX=y
-CONFIG_XENO_OPT_POSIX_PERIOD=0
-# CONFIG_XENO_OPT_POSIX_SHM is not set
-# CONFIG_XENO_OPT_POSIX_INTR is not set
-# CONFIG_XENO_OPT_POSIX_SELECT is not set
-# CONFIG_XENO_OPT_DEBUG_POSIX is not set
-# CONFIG_XENO_SKIN_PSOS is not set
-# CONFIG_XENO_SKIN_UITRON is not set
-# CONFIG_XENO_SKIN_VRTX is not set
-# CONFIG_XENO_SKIN_VXWORKS is not set
-# CONFIG_XENO_SKIN_RTAI is not set
-CONFIG_XENO_SKIN_RTDM=y
-CONFIG_XENO_OPT_RTDM_PERIOD=0
-CONFIG_XENO_OPT_RTDM_FILDES=128
-CONFIG_XENO_OPT_RTDM_SELECT=y
-# CONFIG_XENO_DRIVERS_16550A is not set
-CONFIG_XENO_DRIVERS_TIMERBENCH=m
-CONFIG_XENO_DRIVERS_KLATENCY=m
-CONFIG_XENO_DRIVERS_IRQBENCH=m
-CONFIG_XENO_DRIVERS_SWITCHTEST=m
-# CONFIG_XENO_DRIVERS_CAN is not set
-# CONFIG_ARM_FCSE is not set
-CONFIG_IPIPE=y
-CONFIG_IPIPE_DOMAINS=4
-CONFIG_IPIPE_COMPAT=y
-# CONFIG_IPIPE_DEBUG is not set
\ No newline at end of file
diff --git a/buildroot/package/xenomai/xenomai.mk b/buildroot/package/xenomai/xenomai.mk
deleted file mode 100644
index cf266a2..0000000
--- a/buildroot/package/xenomai/xenomai.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-#############################################################
-#
-# xenomai :
-# URL : http://xenomai.org
-# NOTE : Real-Time Framework for Linux
-#
-# adeos :
-# URL : http://home.gna.org/adeos/
-# NOTE : The purpose of Adeos is to provide a flexible
-# environment for sharing hardware resources among
-# multiple operating systems, or among multiple
-# instances of a single OS.
-#
-#############################################################
-
-KERN_DIR:=$(PROJECT_BUILD_DIR)/linux-$(shell echo $(BR2_LINUX26_VERSION))
-XENOMAI_ARCH:=$(shell echo $(BR2_ARCH))
-
-XENOMAI_VERSION:=2.4.8
-XENOMAI_SOURCE:=xenomai-$(XENOMAI_VERSION).tar.bz2
-XENOMAI_SITE:=http://download.gna.org/xenomai/stable
-XENOMAI_DIR:=$(BUILD_DIR)/xenomai-$(XENOMAI_VERSION)
-XENOMAI_CAT:=bzcat
-XENOMAI_BINARY:=xeno-load
-XENOMAI_TARGET_BINARY:=usr/xenomai/bin/$(XENOMAI_BINARY)
-
-ifeq ($(BR2_TARGET_ARMADEUS_APF27),y)
- CPU_TYPE:=mx2
-else
-ifeq ($(BR2_TARGET_ARMADEUS_APF9328),y)
- CPU_TYPE:=imx
-endif
-endif
-
-$(DL_DIR)/$(XENOMAI_SOURCE):
- $(WGET) -P $(DL_DIR) $(XENOMAI_SITE)/$(XENOMAI_SOURCE)
-
-xenomai-source: $(DL_DIR)/$(XENOMAI_SOURCE)
-
-$(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(XENOMAI_SOURCE)
- $(XENOMAI_CAT) $(DL_DIR)/$(XENOMAI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $@
-
-$(KERN_DIR)/.patched.xenomai: $(XENOMAI_DIR)/.unpacked
- toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
- \*-before-adeos-\*.patch
- $(XENOMAI_DIR)/scripts/prepare-kernel.sh \
- --linux=$(LINUX26_DIR) \
- --arch=$(BR2_ARCH) \
- --default
- cat package/xenomai/xeno-kernel.config >> $(LINUX26_DIR)/.config
- toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
- \*-after-adeos-\*.patch
- touch $@
-
-xenomai-patch-kernel: $(KERN_DIR)/.patched.xenomai
-
-$(XENOMAI_DIR)/.configured: $(KERN_DIR)/.patched.xenomai
- (cd $(XENOMAI_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
- ./configure \
- --enable-$(XENOMAI_ARCH)-mach=$(CPU_TYPE) \
- --enable-$(XENOMAI_ARCH)-eabi=$(if $(BR2_ARM_EABI),yes,no) \
- --host=$(XENOMAI_ARCH)-linux \
- --datarootdir=/xenodoc \
- )
- touch $@
-
-$(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY): $(XENOMAI_DIR)/.configured
- $(MAKE) -C $(XENOMAI_DIR) \
- CC="$(TARGET_CC)" LD="$(TARGET_LD)"
-
-$(TARGET_DIR)/$(XENOMAI_TARGET_BINARY): $(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY)
- echo $@
- $(STAGING_DIR)/usr/bin/fakeroot $(MAKE) -C $(XENOMAI_DIR) \
- CC=$(TARGET_CC) LD=$(TARGET_LD) \
- DESTDIR=$(TARGET_DIR) install
- rm -rf $(TARGET_DIR)/xenodoc
- echo "/usr/xenomai/lib" > $(TARGET_DIR)/etc/ld.so.conf
- echo -e 'export PATH=/usr/xenomai/bin:$${PATH}' >> $(TARGET_DIR)/etc/profile
-
-xenomai: uclibc host-fakeroot kernel-headers $(TARGET_DIR)/$(XENOMAI_TARGET_BINARY)
-
-xenomai-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) uninstall
- -$(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) clean
-
-xenomai-dirclean: xenomai-clean
- rm -rf $(XENOMAI_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_XENOMAI)),y)
-TARGETS+=xenomai
-endif
diff --git a/patches/buildroot/072-xenomai-package.patch b/patches/buildroot/072-xenomai-package.patch
index 20b5237..330c0d2 100644
--- a/patches/buildroot/072-xenomai-package.patch
+++ b/patches/buildroot/072-xenomai-package.patch
@@ -1,25 +1,254 @@
-diff -ruN buildroot/package/Config.in buildroot.new/package/Config.in
---- buildroot/package/Config.in 2009-03-09 16:57:56.000000000 +0100
-+++ buildroot.new/package/Config.in 2009-02-24 11:33:56.000000000 +0100
-@@ -121,6 +121,8 @@
- source "package/which/Config.in"
- endif
-
+Add xenomai package to BR.
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-20 18:22:31.000000000 +0200
++++ buildroot/package/Config.in 2010-06-20 18:28:35.000000000 +0200
+@@ -289,6 +289,7 @@
+ source "package/usbmount/Config.in"
+ source "package/usbutils/Config.in"
+ source "package/wipe/Config.in"
+source "package/xenomai/Config.in"
-+
- source "package/database/Config.in"
+ source "package/xfsprogs/Config.in"
+ endif
- if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-diff -urN buildroot/target/linux/Makefile.in.advanced buildroot.new/target/linux/Makefile.in.advanced
---- buildroot/target/linux/Makefile.in.advanced 2009-02-24 11:42:16.000000000 +0100
-+++ buildroot.new/target/linux/Makefile.in.advanced 2009-02-24 11:40:07.000000000 +0100
+Index: buildroot/target/linux/Makefile.in.advanced
+===================================================================
+--- buildroot.orig/target/linux/Makefile.in.advanced 2010-06-20 18:22:31.000000000 +0200
++++ buildroot/target/linux/Makefile.in.advanced 2010-06-20 18:26:32.000000000 +0200
@@ -382,6 +382,9 @@
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
(cd $(LINUX_DIR)/drivers; ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ armadeus)
endif
+ifeq ($(BR2_PACKAGE_XENOMAI),y)
-+ make -C ../buildroot xenomai-patch-kernel
++ make -C ../buildroot xenomai-patch-kernel
+endif
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig
touch $@
-
+
+Index: buildroot/package/xenomai/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xenomai/Config.in 2010-06-20 18:38:51.000000000 +0200
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_XENOMAI
++ bool "Xenomai"
++ depends on BR2_LINUX_2_6_29 || BR2_LINUX_2_6_27
++ help
++ Real-Time Framework for Linux
++
++ http://xenomai.org
+Index: buildroot/package/xenomai/xenomai.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xenomai/xenomai.mk 2010-06-20 18:35:44.000000000 +0200
+@@ -0,0 +1,99 @@
++#############################################################
++#
++# xenomai :
++# URL : http://xenomai.org
++# NOTE : Real-Time Framework for Linux
++#
++# adeos :
++# URL : http://home.gna.org/adeos/
++# NOTE : The purpose of Adeos is to provide a flexible
++# environment for sharing hardware resources among
++# multiple operating systems, or among multiple
++# instances of a single OS.
++#
++#############################################################
++
++KERN_DIR:=$(PROJECT_BUILD_DIR)/linux-$(shell echo $(BR2_LINUX26_VERSION))
++XENOMAI_ARCH:=$(shell echo $(BR2_ARCH))
++
++XENOMAI_VERSION:=2.4.8
++XENOMAI_SOURCE:=xenomai-$(XENOMAI_VERSION).tar.bz2
++XENOMAI_SITE:=http://download.gna.org/xenomai/stable
++XENOMAI_DIR:=$(BUILD_DIR)/xenomai-$(XENOMAI_VERSION)
++XENOMAI_CAT:=bzcat
++XENOMAI_BINARY:=xeno-load
++XENOMAI_TARGET_BINARY:=usr/xenomai/bin/$(XENOMAI_BINARY)
++
++ifeq ($(BR2_TARGET_ARMADEUS_APF27),y)
++ CPU_TYPE:=mx2
++else
++ifeq ($(BR2_TARGET_ARMADEUS_APF9328),y)
++ CPU_TYPE:=imx
++endif
++endif
++
++$(DL_DIR)/$(XENOMAI_SOURCE):
++ $(call DOWNLOAD,$(XENOMAI_SITE),$(XENOMAI_SOURCE))
++
++xenomai-source: $(DL_DIR)/$(XENOMAI_SOURCE)
++
++$(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(XENOMAI_SOURCE)
++ $(XENOMAI_CAT) $(DL_DIR)/$(XENOMAI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ touch $@
++
++$(KERN_DIR)/.patched.xenomai: $(XENOMAI_DIR)/.unpacked
++ toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
++ \*-before-adeos-\*.patch
++ $(XENOMAI_DIR)/scripts/prepare-kernel.sh \
++ --linux=$(LINUX26_DIR) \
++ --arch=$(BR2_ARCH) \
++ --default
++ cat package/xenomai/xeno-kernel.config >> $(LINUX26_DIR)/.config
++ toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
++ \*-after-adeos-\*.patch
++ touch $@
++
++xenomai-patch-kernel: $(KERN_DIR)/.patched.xenomai
++
++$(XENOMAI_DIR)/.configured: $(KERN_DIR)/.patched.xenomai
++ (cd $(XENOMAI_DIR); rm -rf config.cache; \
++ $(TARGET_CONFIGURE_OPTS) \
++ $(TARGET_CONFIGURE_ARGS) \
++ CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
++ ./configure \
++ --enable-$(XENOMAI_ARCH)-mach=$(CPU_TYPE) \
++ --enable-$(XENOMAI_ARCH)-eabi=$(if $(BR2_ARM_EABI),yes,no) \
++ --host=$(XENOMAI_ARCH)-linux \
++ --datarootdir=/xenodoc \
++ )
++ touch $@
++
++$(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY): $(XENOMAI_DIR)/.configured
++ $(MAKE) -C $(XENOMAI_DIR) CC="$(TARGET_CC)" LD="$(TARGET_LD)"
++
++$(TARGET_DIR)/$(XENOMAI_TARGET_BINARY): $(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY)
++ echo $@
++ $(STAGING_DIR)/usr/bin/fakeroot $(MAKE) -C $(XENOMAI_DIR) \
++ CC=$(TARGET_CC) LD=$(TARGET_LD) \
++ DESTDIR=$(TARGET_DIR) install
++ rm -rf $(TARGET_DIR)/xenodoc
++ echo "/usr/xenomai/lib" > $(TARGET_DIR)/etc/ld.so.conf
++ echo -e 'export PATH=/usr/xenomai/bin:$${PATH}' >> $(TARGET_DIR)/etc/profile
++
++xenomai: uclibc host-fakeroot kernel-headers $(TARGET_DIR)/$(XENOMAI_TARGET_BINARY)
++
++xenomai-clean:
++ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) uninstall
++ -$(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) clean
++
++xenomai-dirclean: xenomai-clean
++ rm -rf $(XENOMAI_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_XENOMAI)),y)
++TARGETS+=xenomai
++endif
+Index: buildroot/package/xenomai/xeno-kernel.config
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xenomai/xeno-kernel.config 2010-06-20 18:36:20.000000000 +0200
+@@ -0,0 +1,59 @@
++CONFIG_XENOMAI=y
++CONFIG_XENO_OPT_NUCLEUS=y
++CONFIG_XENO_OPT_PERVASIVE=y
++# CONFIG_XENO_OPT_ISHIELD is not set
++CONFIG_XENO_OPT_PRIOCPL=y
++CONFIG_XENO_OPT_PIPELINE_HEAD=y
++CONFIG_XENO_OPT_PIPE_NRDEV=32
++CONFIG_XENO_OPT_REGISTRY_NRSLOTS=512
++CONFIG_XENO_OPT_SYS_HEAPSZ=128
++CONFIG_XENO_OPT_SYS_STACKPOOLSZ=32
++CONFIG_XENO_OPT_STATS=y
++# CONFIG_XENO_OPT_DEBUG is not set
++# CONFIG_XENO_OPT_SHIRQ is not set
++CONFIG_XENO_OPT_TIMING_PERIODIC=y
++CONFIG_XENO_OPT_TIMING_SCHEDLAT=0
++# CONFIG_XENO_OPT_SCALABLE_SCHED is not set
++CONFIG_XENO_OPT_TIMER_LIST=y
++# CONFIG_XENO_OPT_TIMER_HEAP is not set
++# CONFIG_XENO_OPT_TIMER_WHEEL is not set
++CONFIG_XENO_HW_FPU=y
++CONFIG_XENO_SKIN_NATIVE=y
++CONFIG_XENO_OPT_NATIVE_PERIOD=0
++CONFIG_XENO_OPT_NATIVE_PIPE=y
++CONFIG_XENO_OPT_NATIVE_PIPE_BUFSZ=1024
++CONFIG_XENO_OPT_NATIVE_SEM=y
++CONFIG_XENO_OPT_NATIVE_EVENT=y
++CONFIG_XENO_OPT_NATIVE_MUTEX=y
++CONFIG_XENO_OPT_NATIVE_COND=y
++CONFIG_XENO_OPT_NATIVE_QUEUE=y
++CONFIG_XENO_OPT_NATIVE_HEAP=y
++CONFIG_XENO_OPT_NATIVE_ALARM=y
++CONFIG_XENO_OPT_NATIVE_MPS=y
++CONFIG_XENO_OPT_NATIVE_INTR=y
++CONFIG_XENO_SKIN_POSIX=y
++CONFIG_XENO_OPT_POSIX_PERIOD=0
++# CONFIG_XENO_OPT_POSIX_SHM is not set
++# CONFIG_XENO_OPT_POSIX_INTR is not set
++# CONFIG_XENO_OPT_POSIX_SELECT is not set
++# CONFIG_XENO_OPT_DEBUG_POSIX is not set
++# CONFIG_XENO_SKIN_PSOS is not set
++# CONFIG_XENO_SKIN_UITRON is not set
++# CONFIG_XENO_SKIN_VRTX is not set
++# CONFIG_XENO_SKIN_VXWORKS is not set
++# CONFIG_XENO_SKIN_RTAI is not set
++CONFIG_XENO_SKIN_RTDM=y
++CONFIG_XENO_OPT_RTDM_PERIOD=0
++CONFIG_XENO_OPT_RTDM_FILDES=128
++CONFIG_XENO_OPT_RTDM_SELECT=y
++# CONFIG_XENO_DRIVERS_16550A is not set
++CONFIG_XENO_DRIVERS_TIMERBENCH=m
++CONFIG_XENO_DRIVERS_KLATENCY=m
++CONFIG_XENO_DRIVERS_IRQBENCH=m
++CONFIG_XENO_DRIVERS_SWITCHTEST=m
++# CONFIG_XENO_DRIVERS_CAN is not set
++# CONFIG_ARM_FCSE is not set
++CONFIG_IPIPE=y
++CONFIG_IPIPE_DOMAINS=4
++CONFIG_IPIPE_COMPAT=y
++# CONFIG_IPIPE_DEBUG is not set
+\ No newline at end of file
+Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2010-06-20 18:36:48.000000000 +0200
+@@ -0,0 +1,10 @@
++--- a/arch/arm/mach-imx/include/mach/imxfb.h
+++++ b/arch/arm/mach-imx/include/mach/imxfb.h
++@@ -14,7 +14,6 @@
++ #define PCR_BPIX_8 (3 << 25)
++ #define PCR_BPIX_12 (4 << 25)
++ #define PCR_BPIX_16 (4 << 25)
++-#define PCR_BPIX_MASK (7 << 25)
++ #define PCR_PIXPOL (1 << 24)
++ #define PCR_FLMPOL (1 << 23)
++ #define PCR_LPPOL (1 << 22)
+Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2010-06-20 18:37:17.000000000 +0200
+@@ -0,0 +1,23 @@
++Corrects Freeze problem with MX2 when Adeos is active and
++application/driver uses interruption on GPIO
++
++Signed-off-by: Gwenhael GOAVEC-MEROU <gw...@tr...>
++
++Index: kernel/arch/arm/plat-mxc/gpio.c
++===================================================================
++--- a/arch/arm/plat-mxc/gpio.c 2009-12-17 22:09:56.000000000 +0100
+++++ b/arch/arm/plat-mxc/gpio.c 2009-12-17 15:45:17.000000000 +0100
++@@ -241,11 +241,11 @@
++ int i;
++
++ for (i = 0; i < gpio_table_size; i++) {
++- irq_msk = __raw_readl(port->base + GPIO_IMR);
+++ irq_msk = __raw_readl(port[i].base + GPIO_IMR);
++ if (!irq_msk)
++ continue;
++
++- irq_stat = __raw_readl(port->base + GPIO_ISR) & irq_msk;
+++ irq_stat = __raw_readl(port[i].base + GPIO_ISR) & irq_msk;
++
++ gpio_irq_no = port[i].virtual_irq_start;
++
diff --git a/patches/buildroot/095-uucp-add_packages.patch b/patches/buildroot/095-uucp-add_packages.patch
index 167dd37..376d2a9 100644
--- a/patches/buildroot/095-uucp-add_packages.patch
+++ b/patches/buildroot/095-uucp-add_packages.patch
@@ -4,11 +4,22 @@ Inspired by OpenWrt and Debian packages.
Signed-off-by: Julien Boibessot <jul...@ar...>
-
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-20 11:56:38.000000000 +0200
++++ buildroot/package/Config.in 2010-06-20 12:03:04.000000000 +0200
+@@ -219,6 +219,7 @@
+ #source "package/udhcp/Config.in"
+ #endif
+ source "package/udpcast/Config.in"
++source "package/uucp/Config.in"
+ source "package/vpnc/Config.in"
+ source "package/vsftpd/Config.in"
+ source "package/vtun/Config.in"
Index: buildroot/package/uucp/uucp.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/uucp/uucp.mk 2010-05-03 18:36:11.000000000 +0200
++++ buildroot/package/uucp/uucp.mk 2010-06-20 11:56:39.000000000 +0200
@@ -0,0 +1,17 @@
+#############################################################
+#
@@ -30,7 +41,7 @@ Index: buildroot/package/uucp/uucp.mk
Index: buildroot/package/uucp/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/uucp/Config.in 2010-05-05 23:13:43.000000000 +0200
++++ buildroot/package/uucp/Config.in 2010-06-20 12:03:48.000000000 +0200
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_UUCP
+ bool "uucp"
diff --git a/patches/buildroot/117-ussp-push-add_package.patch b/patches/buildroot/117-ussp-push-add_package.patch
index f971465..c6b330d 100644
--- a/patches/buildroot/117-ussp-push-add_package.patch
+++ b/patches/buildroot/117-ussp-push-add_package.patch
@@ -4,20 +4,20 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-16 14:31:45.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-16 14:37:34.000000000 +0200
+--- buildroot.orig/package/Config.in 2010-06-20 11:57:30.000000000 +0200
++++ buildroot/package/Config.in 2010-06-20 11:58:27.000000000 +0200
@@ -220,6 +220,7 @@
#source "package/udhcp/Config.in"
#endif
source "package/udpcast/Config.in"
+source "package/ussp-push/Config.in"
+ source "package/uucp/Config.in"
source "package/vpnc/Config.in"
source "package/vsftpd/Config.in"
- source "package/vtun/Config.in"
Index: buildroot/package/ussp-push/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ussp-push/Config.in 2010-06-16 16:31:42.000000000 +0200
++++ buildroot/package/ussp-push/Config.in 2010-06-20 11:57:35.000000000 +0200
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_USSP_PUSH
+ bool "ussp-push"
@@ -32,7 +32,7 @@ Index: buildroot/package/ussp-push/Config.in
Index: buildroot/package/ussp-push/ussp-push.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ussp-push/ussp-push.mk 2010-06-16 16:32:52.000000000 +0200
++++ buildroot/package/ussp-push/ussp-push.mk 2010-06-20 11:57:35.000000000 +0200
@@ -0,0 +1,12 @@
+#############################################################
+#
diff --git a/patches/buildroot/120-cwiid-add_package.patch b/patches/buildroot/120-cwiid-add_package.patch
new file mode 100644
index 0000000..087795a
--- /dev/null
+++ b/patches/buildroot/120-cwiid-add_package.patch
@@ -0,0 +1,106 @@
+Add cwiid package to BR.
+
+Signed-off-by: Yannick Heinrich <ya...@fr...>
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-20 19:58:08.000000000 +0200
++++ buildroot/package/Config.in 2010-06-20 20:45:06.000000000 +0200
+@@ -241,6 +241,7 @@
+
+ if BR2_BLOCKDEV_SUPPORT
+ source "package/acpid/Config.in"
++source "package/cwiid/Config.in"
+ source "package/dbus/Config.in"
+ source "package/dbus-glib/Config.in"
+ source "package/devmem2/Config.in"
+Index: buildroot/package/cwiid/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/cwiid/Config.in 2010-06-20 23:14:48.000000000 +0200
+@@ -0,0 +1,8 @@
++config BR2_PACKAGE_CWIID
++ bool "cwiid"
++ select BR2_PACKAGE_BLUEZ
++ help
++ A collection of Linux tools written in C for interfacing to the
++ Nintendo Wiimote.
++
++ http://abstrakraft.org/cwiid/
+Index: buildroot/package/cwiid/cwiid.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/cwiid/cwiid.mk 2010-06-20 23:03:30.000000000 +0200
+@@ -0,0 +1,28 @@
++#############################################################
++#
++# cwiid
++#
++#############################################################
++CWIID_VERSION:=0.6.00
++CWIID_SOURCE:=cwiid-$(CWIID_VERSION).tgz
++CWIID_SITE:=http://abstrakraft.org/cwiid/downloads
++CWIID_AUTORECONF:=YES
++CWIID_INSTALL_STAGING:=YES
++CWIID_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
++
++CWIID_CONF_OPT = --disable-ldconfig
++ifneq ($(BR2_PACKAGE_PYTHON26),y)
++ CWIID_CONF_OPT += --without-python
++endif
++
++CWIID_DEPENDENCIES = bluez-libs
++
++$(eval $(call AUTOTARGETS,package,cwiid))
++
++$(CWIID_HOOK_POST_INSTALL):
++ $(call MESSAGE,"Post-installing")
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/lswm
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/bin/wminput
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libcwiid.so.1
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/cwiid/plugins/*
++ touch $@
+Index: buildroot/package/cwiid/cwiid-0.6.00-configure_ac_remove_gtk_dependancy.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/cwiid/cwiid-0.6.00-configure_ac_remove_gtk_dependancy.patch 2010-06-20 21:07:24.000000000 +0200
+@@ -0,0 +1,22 @@
++--- cwiid-0.6.00.org/configure.ac 2007-08-27 02:27:58.000000000 +0200
+++++ cwiid-0.6.00/configure.ac 2010-03-01 17:28:00.425401362 +0100
++@@ -124,11 +124,6 @@ else
++ fi
++ AC_SUBST(LDCONFIG)
++
++-pkg_modules="gtk+-2.0 >= 2.0.0 gthread-2.0"
++-PKG_CHECK_MODULES([GTK], [$pkg_modules])
++-AC_SUBST(GTK_CFLAGS)
++-AC_SUBST(GTK_LIBS)
++-
++ AC_OUTPUT(
++ [Makefile]
++ [defs.mak]
++@@ -137,7 +132,6 @@ AC_OUTPUT(
++ [man/Makefile]
++ [libcwiid/Makefile]
++ [wmdemo/Makefile]
++- [wmgui/Makefile]
++ [wminput/Makefile]
++ [wminput/plugins/Makefile]
++ [wminput/plugins/ir_ptr/Makefile]
+Index: buildroot/package/cwiid/cwiid-0.6.00-makefile_in-remove_wmgui.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/cwiid/cwiid-0.6.00-makefile_in-remove_wmgui.patch 2010-06-20 21:13:26.000000000 +0200
+@@ -0,0 +1,11 @@
++--- cwiid-0.6.00.org/Makefile.in 2007-07-28 20:47:03.000000000 +0200
+++++ cwiid-0.6.00/Makefile.in 2010-03-01 17:28:08.337399709 +0100
++@@ -3,7 +3,7 @@
++ include @top_builddir@/defs.mak
++
++ LIB_DIRS = libcwiid
++-BIN_DIRS = wmgui wminput lswm
+++BIN_DIRS = wminput lswm
++ DOC_DIRS = man doc
++ ifdef PYTHON
++ BIND_DIRS = python
diff --git a/patches/buildroot/2010.05/072-xenomai-package.patch b/patches/buildroot/2010.05/072-xenomai-package.patch
index 451c625..d10eb97 100644
--- a/patches/buildroot/2010.05/072-xenomai-package.patch
+++ b/patches/buildroot/2010.05/072-xenomai-package.patch
@@ -1,3 +1,7 @@
+Add xenomai package to BR.
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+
Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2010-06-17 16:47:13.000000000 +0200
@@ -12,9 +16,9 @@ Index: buildroot/package/Config.in
Index: buildroot/target/linux/Makefile.in.advanced
===================================================================
---- buildroot.orig/target/linux/Makefile.in.advanced 2010-06-17 16:47:19.000000000 +0200
-+++ buildroot/target/linux/Makefile.in.advanced 2010-06-17 16:47:20.000000000 +0200
-@@ -373,6 +373,9 @@
+--- buildroot.orig/target/linux/Makefile.in.advanced 2010-06-20 18:22:31.000000000 +0200
++++ buildroot/target/linux/Makefile.in.advanced 2010-06-20 18:26:32.000000000 +0200
+@@ -382,6 +382,9 @@
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
(cd $(LINUX_DIR)/drivers; ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ armadeus)
endif
@@ -24,3 +28,227 @@ Index: buildroot/target/linux/Makefile.in.advanced
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) oldconfig
touch $@
+Index: buildroot/package/xenomai/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xenomai/Config.in 2010-06-20 18:38:51.000000000 +0200
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_XENOMAI
++ bool "Xenomai"
++ depends on BR2_LINUX_2_6_29 || BR2_LINUX_2_6_27
++ help
++ Real-Time Framework for Linux
++
++ http://xenomai.org
+Index: buildroot/package/xenomai/xenomai.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xenomai/xenomai.mk 2010-06-20 18:35:44.000000000 +0200
+@@ -0,0 +1,99 @@
++#############################################################
++#
++# xenomai :
++# URL : http://xenomai.org
++# NOTE : Real-Time Framework for Linux
++#
++# adeos :
++# URL : http://home.gna.org/adeos/
++# NOTE : The purpose of Adeos is to provide a flexible
++# environment for sharing hardware resources among
++# multiple operating systems, or among multiple
++# instances of a single OS.
++#
++#############################################################
++
++KERN_DIR:=$(PROJECT_BUILD_DIR)/linux-$(shell echo $(BR2_LINUX26_VERSION))
++XENOMAI_ARCH:=$(shell echo $(BR2_ARCH))
++
++XENOMAI_VERSION:=2.4.8
++XENOMAI_SOURCE:=xenomai-$(XENOMAI_VERSION).tar.bz2
++XENOMAI_SITE:=http://download.gna.org/xenomai/stable
++XENOMAI_DIR:=$(BUILD_DIR)/xenomai-$(XENOMAI_VERSION)
++XENOMAI_CAT:=bzcat
++XENOMAI_BINARY:=xeno-load
++XENOMAI_TARGET_BINARY:=usr/xenomai/bin/$(XENOMAI_BINARY)
++
++ifeq ($(BR2_TARGET_ARMADEUS_APF27),y)
++ CPU_TYPE:=mx2
++else
++ifeq ($(BR2_TARGET_ARMADEUS_APF9328),y)
++ CPU_TYPE:=imx
++endif
++endif
++
++$(DL_DIR)/$(XENOMAI_SOURCE):
++ $(call DOWNLOAD,$(XENOMAI_SITE),$(XENOMAI_SOURCE))
++
++xenomai-source: $(DL_DIR)/$(XENOMAI_SOURCE)
++
++$(XENOMAI_DIR)/.unpacked: $(DL_DIR)/$(XENOMAI_SOURCE)
++ $(XENOMAI_CAT) $(DL_DIR)/$(XENOMAI_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ touch $@
++
++$(KERN_DIR)/.patched.xenomai: $(XENOMAI_DIR)/.unpacked
++ toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
++ \*-before-adeos-\*.patch
++ $(XENOMAI_DIR)/scripts/prepare-kernel.sh \
++ --linux=$(LINUX26_DIR) \
++ --arch=$(BR2_ARCH) \
++ --default
++ cat package/xenomai/xeno-kernel.config >> $(LINUX26_DIR)/.config
++ toolchain/patch-kernel.sh $(LINUX26_DIR) package/xenomai \
++ \*-after-adeos-\*.patch
++ touch $@
++
++xenomai-patch-kernel: $(KERN_DIR)/.patched.xenomai
++
++$(XENOMAI_DIR)/.configured: $(KERN_DIR)/.patched.xenomai
++ (cd $(XENOMAI_DIR); rm -rf config.cache; \
++ $(TARGET_CONFIGURE_OPTS) \
++ $(TARGET_CONFIGURE_ARGS) \
++ CCFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
++ ./configure \
++ --enable-$(XENOMAI_ARCH)-mach=$(CPU_TYPE) \
++ --enable-$(XENOMAI_ARCH)-eabi=$(if $(BR2_ARM_EABI),yes,no) \
++ --host=$(XENOMAI_ARCH)-linux \
++ --datarootdir=/xenodoc \
++ )
++ touch $@
++
++$(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY): $(XENOMAI_DIR)/.configured
++ $(MAKE) -C $(XENOMAI_DIR) CC="$(TARGET_CC)" LD="$(TARGET_LD)"
++
++$(TARGET_DIR)/$(XENOMAI_TARGET_BINARY): $(XENOMAI_DIR)/scripts/$(XENOMAI_BINARY)
++ echo $@
++ $(STAGING_DIR)/usr/bin/fakeroot $(MAKE) -C $(XENOMAI_DIR) \
++ CC=$(TARGET_CC) LD=$(TARGET_LD) \
++ DESTDIR=$(TARGET_DIR) install
++ rm -rf $(TARGET_DIR)/xenodoc
++ echo "/usr/xenomai/lib" > $(TARGET_DIR)/etc/ld.so.conf
++ echo -e 'export PATH=/usr/xenomai/bin:$${PATH}' >> $(TARGET_DIR)/etc/profile
++
++xenomai: uclibc host-fakeroot kernel-headers $(TARGET_DIR)/$(XENOMAI_TARGET_BINARY)
++
++xenomai-clean:
++ $(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) uninstall
++ -$(MAKE) DESTDIR=$(TARGET_DIR) -C $(XENOMAI_DIR) clean
++
++xenomai-dirclean: xenomai-clean
++ rm -rf $(XENOMAI_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_XENOMAI)),y)
++TARGETS+=xenomai
++endif
+Index: buildroot/package/xenomai/xeno-kernel.config
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xenomai/xeno-kernel.config 2010-06-20 18:36:20.000000000 +0200
+@@ -0,0 +1,59 @@
++CONFIG_XENOMAI=y
++CONFIG_XENO_OPT_NUCLEUS=y
++CONFIG_XENO_OPT_PERVASIVE=y
++# CONFIG_XENO_OPT_ISHIELD is not set
++CONFIG_XENO_OPT_PRIOCPL=y
++CONFIG_XENO_OPT_PIPELINE_HEAD=y
++CONFIG_XENO_OPT_PIPE_NRDEV=32
++CONFIG_XENO_OPT_REGISTRY_NRSLOTS=512
++CONFIG_XENO_OPT_SYS_HEAPSZ=128
++CONFIG_XENO_OPT_SYS_STACKPOOLSZ=32
++CONFIG_XENO_OPT_STATS=y
++# CONFIG_XENO_OPT_DEBUG is not set
++# CONFIG_XENO_OPT_SHIRQ is not set
++CONFIG_XENO_OPT_TIMING_PERIODIC=y
++CONFIG_XENO_OPT_TIMING_SCHEDLAT=0
++# CONFIG_XENO_OPT_SCALABLE_SCHED is not set
++CONFIG_XENO_OPT_TIMER_LIST=y
++# CONFIG_XENO_OPT_TIMER_HEAP is not set
++# CONFIG_XENO_OPT_TIMER_WHEEL is not set
++CONFIG_XENO_HW_FPU=y
++CONFIG_XENO_SKIN_NATIVE=y
++CONFIG_XENO_OPT_NATIVE_PERIOD=0
++CONFIG_XENO_OPT_NATIVE_PIPE=y
++CONFIG_XENO_OPT_NATIVE_PIPE_BUFSZ=1024
++CONFIG_XENO_OPT_NATIVE_SEM=y
++CONFIG_XENO_OPT_NATIVE_EVENT=y
++CONFIG_XENO_OPT_NATIVE_MUTEX=y
++CONFIG_XENO_OPT_NATIVE_COND=y
++CONFIG_XENO_OPT_NATIVE_QUEUE=y
++CONFIG_XENO_OPT_NATIVE_HEAP=y
++CONFIG_XENO_OPT_NATIVE_ALARM=y
++CONFIG_XENO_OPT_NATIVE_MPS=y
++CONFIG_XENO_OPT_NATIVE_INTR=y
++CONFIG_XENO_SKIN_POSIX=y
++CONFIG_XENO_OPT_POSIX_PERIOD=0
++# CONFIG_XENO_OPT_POSIX_SHM is not set
++# CONFIG_XENO_OPT_POSIX_INTR is not set
++# CONFIG_XENO_OPT_POSIX_SELECT is not set
++# CONFIG_XENO_OPT_DEBUG_POSIX is not set
++# CONFIG_XENO_SKIN_PSOS is not set
++# CONFIG_XENO_SKIN_UITRON is not set
++# CONFIG_XENO_SKIN_VRTX is not set
++# CONFIG_XENO_SKIN_VXWORKS is not set
++# CONFIG_XENO_SKIN_RTAI is not set
++CONFIG_XENO_SKIN_RTDM=y
++CONFIG_XENO_OPT_RTDM_PERIOD=0
++CONFIG_XENO_OPT_RTDM_FILDES=128
++CONFIG_XENO_OPT_RTDM_SELECT=y
++# CONFIG_XENO_DRIVERS_16550A is not set
++CONFIG_XENO_DRIVERS_TIMERBENCH=m
++CONFIG_XENO_DRIVERS_KLATENCY=m
++CONFIG_XENO_DRIVERS_IRQBENCH=m
++CONFIG_XENO_DRIVERS_SWITCHTEST=m
++# CONFIG_XENO_DRIVERS_CAN is not set
++# CONFIG_ARM_FCSE is not set
++CONFIG_IPIPE=y
++CONFIG_IPIPE_DOMAINS=4
++CONFIG_IPIPE_COMPAT=y
++# CONFIG_IPIPE_DEBUG is not set
+\ No newline at end of file
+Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch 2010-06-20 18:36:48.000000000 +0200
+@@ -0,0 +1,10 @@
++--- a/arch/arm/mach-imx/include/mach/imxfb.h
+++++ b/arch/arm/mach-imx/include/mach/imxfb.h
++@@ -14,7 +14,6 @@
++ #define PCR_BPIX_8 (3 << 25)
++ #define PCR_BPIX_12 (4 << 25)
++ #define PCR_BPIX_16 (4 << 25)
++-#define PCR_BPIX_MASK (7 << 25)
++ #define PCR_PIXPOL (1 << 24)
++ #define PCR_FLMPOL (1 << 23)
++ #define PCR_LPPOL (1 << 22)
+Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch 2010-06-20 18:37:17.000000000 +0200
+@@ -0,0 +1,23 @@
++Corrects Freeze problem with MX2 when Adeos is active and
++application/driver uses interruption on GPIO
++
++Signed-off-by: Gwenhael GOAVEC-MEROU <gw...@tr...>
++
++Index: kernel/arch/arm/plat-mxc/gpio.c
++===================================================================
++--- a/arch/arm/plat-mxc/gpio.c 2009-12-17 22:09:56.000000000 +0100
+++++ b/arch/arm/plat-mxc/gpio.c 2009-12-17 15:45:17.000000000 +0100
++@@ -241,11 +241,11 @@
++ int i;
++
++ for (i = 0; i < gpio_table_size; i++) {
++- irq_msk = __raw_readl(port->base + GPIO_IMR);
+++ irq_msk = __raw_readl(port[i].base + GPIO_IMR);
++ if (!irq_msk)
++ continue;
++
++- irq_stat = __raw_readl(port->base + GPIO_ISR) & irq_msk;
+++ irq_stat = __raw_readl(port[i].base + GPIO_ISR) & irq_msk;
++
++ gpio_irq_no = port[i].virtual_irq_start;
++
diff --git a/patches/buildroot/2010.05/095-uucp-add_packages.patch b/patches/buildroot/2010.05/095-uucp-add_packages.patch
index c816acf..ce6dd00 100644
--- a/patches/buildroot/2010.05/095-uucp-add_packages.patch
+++ b/patches/buildroot/2010.05/095-uucp-add_packages.patch
@@ -4,7 +4,18 @@ Inspired by OpenWrt and Debian packages.
Signed-off-by: Julien Boibessot <jul...@ar...>
-
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-20 11:48:11.000000000 +0200
++++ buildroot/package/Config.in 2010-06-20 11:49:30.000000000 +0200
+@@ -219,6 +219,7 @@
+ #source "package/udhcp/Config.in"
+ #endif
+ source "package/udpcast/Config.in"
++source "package/uucp/Config.in"
+ source "package/vpnc/Config.in"
+ source "package/vsftpd/Config.in"
+ source "package/vtun/Config.in"
Index: buildroot/package/uucp/uucp.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index 02cd628..09a8a92 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -38,3 +38,4 @@ rm -rf buildroot/package/games/snes9x/
rm -rf buildroot/package/allegro/
rm -rf buildroot/package/fbgrab/
rm -rf buildroot/package/fbtest/
+rm -rf buildroot/package/xenomai/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 1508065..4a1a1ef 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -42,3 +42,4 @@ rm -rf buildroot/package/games/snes9x/
rm -rf buildroot/package/allegro/
rm -rf buildroot/package/fbgrab/
rm -rf buildroot/package/fbtest/
+rm -rf buildroot/package/xenomai/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-19 15:45:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via a7500842e8a1a108b2b07b3832be64639041efd9 (commit)
from ef58652cc9738a5bdea9f4dc3b4ef23a5749fd25 (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 a7500842e8a1a108b2b07b3832be64639041efd9
Author: Julien Boibessot <jul...@ar...>
Date: Sat Jun 19 17:44:52 2010 +0200
Correct small mistakes in recent packages moving
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/041-fbgrab.patch | 12 ++++++------
patches/buildroot/118-snes9x-add_package.patch | 12 ++++++------
patches/buildroot/2010.05/041-fbgrab.patch | 2 +-
.../buildroot/2010.05/118-snes9x-add_package.patch | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/patches/buildroot/041-fbgrab.patch b/patches/buildroot/041-fbgrab.patch
index ad04088..0ae2489 100644
--- a/patches/buildroot/041-fbgrab.patch
+++ b/patches/buildroot/041-fbgrab.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-18 22:47:05.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-18 23:09:39.000000000 +0200
+--- buildroot.orig/package/Config.in 2010-06-19 17:34:21.000000000 +0200
++++ buildroot/package/Config.in 2010-06-19 17:38:26.000000000 +0200
@@ -338,6 +338,7 @@
comment "--> May be broken in busybox"
source "package/fbv/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/fbgrab/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbgrab/Config.in 2010-06-18 23:13:05.000000000 +0200
++++ buildroot/package/fbgrab/Config.in 2010-06-19 17:38:39.000000000 +0200
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_FBGRAB
+ bool "fbgrab"
@@ -27,11 +27,11 @@ Index: buildroot/package/fbgrab/Config.in
+ FBGrab is a framebuffer screenshot program, capturing the Linux
+ framebuffer and converting it to a png-picture.
+
-+ http://hem.bredband.net/gmogmo/fbgrab/
++ http://hem.bredband.net/gmogmo/fbgrab/
Index: buildroot/package/fbgrab/fbgrab.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbgrab/fbgrab.mk 2010-06-18 23:02:49.000000000 +0200
++++ buildroot/package/fbgrab/fbgrab.mk 2010-06-19 17:34:21.000000000 +0200
@@ -0,0 +1,48 @@
+#############################################################
+#
@@ -84,7 +84,7 @@ Index: buildroot/package/fbgrab/fbgrab.mk
Index: buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch 2010-06-18 23:07:20.000000000 +0200
++++ buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch 2010-06-19 17:34:21.000000000 +0200
@@ -0,0 +1,14 @@
+diff -urN fbgrab-1.0/Makefile fbgrab-1.0.mod/Makefile
+--- fbgrab-1.0/Makefile 2002-03-20 20:49:06.000000000 +0100
diff --git a/patches/buildroot/118-snes9x-add_package.patch b/patches/buildroot/118-snes9x-add_package.patch
index 0e407d0..02ac013 100644
--- a/patches/buildroot/118-snes9x-add_package.patch
+++ b/patches/buildroot/118-snes9x-add_package.patch
@@ -1,19 +1,19 @@
Index: buildroot/package/games/Config.in
===================================================================
---- buildroot.orig/package/games/Config.in 2010-06-18 18:41:36.000000000 +0200
-+++ buildroot/package/games/Config.in 2010-06-18 18:42:27.000000000 +0200
+--- buildroot.orig/package/games/Config.in 2010-06-19 17:34:23.000000000 +0200
++++ buildroot/package/games/Config.in 2010-06-19 17:37:18.000000000 +0200
@@ -14,6 +14,7 @@
source "package/games/quake-pak/Config.in"
source "package/games/rubix/Config.in"
source "package/games/sdlquake/Config.in"
-+source "package/games/snes9x/config.in"
++source "package/games/snes9x/Config.in"
source "package/games/vice/Config.in"
source "package/games/wolf4sdl/Config.in"
source "package/games/xboard/Config.in"
Index: buildroot/package/games/snes9x/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/snes9x/Config.in 2010-06-18 18:43:27.000000000 +0200
++++ buildroot/package/games/snes9x/Config.in 2010-06-19 17:34:24.000000000 +0200
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_SNES9X
+ bool "Snes9X"
@@ -29,7 +29,7 @@ Index: buildroot/package/games/snes9x/Config.in
Index: buildroot/package/games/snes9x/snes9x.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/snes9x/snes9x.mk 2010-06-18 18:46:07.000000000 +0200
++++ buildroot/package/games/snes9x/snes9x.mk 2010-06-19 17:34:24.000000000 +0200
@@ -0,0 +1,80 @@
+#############################################################
+#
@@ -114,7 +114,7 @@ Index: buildroot/package/games/snes9x/snes9x.mk
Index: buildroot/package/games/snes9x/snes9x-1.39-compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/snes9x/snes9x-1.39-compile.patch 2010-06-18 18:44:21.000000000 +0200
++++ buildroot/package/games/snes9x/snes9x-1.39-compile.patch 2010-06-19 17:34:24.000000000 +0200
@@ -0,0 +1,295 @@
+
+#
diff --git a/patches/buildroot/2010.05/041-fbgrab.patch b/patches/buildroot/2010.05/041-fbgrab.patch
index bac886e..b04449d 100644
--- a/patches/buildroot/2010.05/041-fbgrab.patch
+++ b/patches/buildroot/2010.05/041-fbgrab.patch
@@ -27,7 +27,7 @@ Index: buildroot/package/fbgrab/Config.in
+ FBGrab is a framebuffer screenshot program, capturing the Linux
+ framebuffer and converting it to a png-picture.
+
-+ http://hem.bredband.net/gmogmo/fbgrab/
++ http://hem.bredband.net/gmogmo/fbgrab/
Index: buildroot/package/fbgrab/fbgrab.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2010.05/118-snes9x-add_package.patch b/patches/buildroot/2010.05/118-snes9x-add_package.patch
index 0e407d0..8c98d33 100644
--- a/patches/buildroot/2010.05/118-snes9x-add_package.patch
+++ b/patches/buildroot/2010.05/118-snes9x-add_package.patch
@@ -6,7 +6,7 @@ Index: buildroot/package/games/Config.in
source "package/games/quake-pak/Config.in"
source "package/games/rubix/Config.in"
source "package/games/sdlquake/Config.in"
-+source "package/games/snes9x/config.in"
++source "package/games/snes9x/Config.in"
source "package/games/vice/Config.in"
source "package/games/wolf4sdl/Config.in"
source "package/games/xboard/Config.in"
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-18 22:05: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 ef58652cc9738a5bdea9f4dc3b4ef23a5749fd25 (commit)
via 46c3155bdb7b3dde626a0f107b7d129a7f6c6bc0 (commit)
via 18be2dda99ca96fca68977cdd2107c674088396c (commit)
from b14d420100ab929d961751acea5f4366c227867f (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 ef58652cc9738a5bdea9f4dc3b4ef23a5749fd25
Author: Julien Boibessot <jul...@ar...>
Date: Sat Jun 19 00:05:20 2010 +0200
[BUILDROOT] move fbtest package as patch against BR
commit 46c3155bdb7b3dde626a0f107b7d129a7f6c6bc0
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 23:38:19 2010 +0200
[BUILDROOT] move fbgrab package as patch against BR
commit 18be2dda99ca96fca68977cdd2107c674088396c
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 21:43:00 2010 +0200
[BUILDROOT] move allegro package as patch against BR
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/.gitignore | 3 -
buildroot/package/allegro/Config.in | 15 --
buildroot/package/allegro/allegro.mk | 75 -----------
buildroot/package/fbgrab/Config.in | 10 --
buildroot/package/fbgrab/fbgrab-1.0.patch | 21 ---
buildroot/package/fbgrab/fbgrab.mk | 48 -------
buildroot/package/fbtest/Config.in | 7 -
buildroot/package/fbtest/fbtest.mk | 51 -------
.../fbtest-20041102-1-exe-target-name-change.patch | 11 --
.../patches/fbtest-20041102-1-page-mask.patch | 36 -----
.../fbtest-20041102-1-pnmtohex-libs-depends.patch | 11 --
patches/buildroot/018-allegro.patch | 106 ++++++++++++++-
patches/buildroot/041-fbgrab.patch | 94 +++++++++++++-
patches/buildroot/119-fbtest-add_package.patch | 141 ++++++++++++++++++++
patches/buildroot/2010.05/018-allegro.patch | 102 ++++++++++++++
patches/buildroot/2010.05/041-fbgrab.patch | 90 +++++++++++++
.../buildroot/2010.05/119-fbtest-add_package.patch | 141 ++++++++++++++++++++
patches/buildroot/2010.05/cleanup_buildroot.sh | 3 +
patches/buildroot/cleanup_buildroot.sh | 5 +-
19 files changed, 677 insertions(+), 293 deletions(-)
delete mode 100644 buildroot/package/allegro/Config.in
delete mode 100644 buildroot/package/allegro/allegro.mk
delete mode 100644 buildroot/package/fbgrab/Config.in
delete mode 100644 buildroot/package/fbgrab/fbgrab-1.0.patch
delete mode 100644 buildroot/package/fbgrab/fbgrab.mk
delete mode 100644 buildroot/package/fbtest/Config.in
delete mode 100644 buildroot/package/fbtest/fbtest.mk
delete mode 100644 buildroot/package/fbtest/patches/fbtest-20041102-1-exe-target-name-change.patch
delete mode 100644 buildroot/package/fbtest/patches/fbtest-20041102-1-page-mask.patch
delete mode 100644 buildroot/package/fbtest/patches/fbtest-20041102-1-pnmtohex-libs-depends.patch
create mode 100644 patches/buildroot/119-fbtest-add_package.patch
create mode 100644 patches/buildroot/2010.05/119-fbtest-add_package.patch
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index b60d8b2..d5fbcf6 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -9,10 +9,7 @@
/buildroot-libtool.patch
# except:
-!/allegro/
!/armadeus/
!/bluez/
-!/fbgrab/
-!/fbtest/
!/mtd/
!/xenomai/
diff --git a/buildroot/package/allegro/Config.in b/buildroot/package/allegro/Config.in
deleted file mode 100644
index 8791e44..0000000
--- a/buildroot/package/allegro/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config BR2_PACKAGE_ALLEGRO
- bool "Allegro"
- default n
- help
-
- Allegro is a game programming library for C/C++ developers
- distributed freely and supporting the following platforms:
- DOS, Unix (Linux, FreeBSD, Irix, Solaris, Darwin), Windows, QNX,
- BeOS and MacOS X.
- It provides many functions for graphics, sounds, player input
- (keyboard, mouse and joystick) and timers. It also provides fixed and
- floating point mathematical functions, 3d functions, file management
- functions, compressed datafile and a GUI.
-
- http://alleg.sourceforge.net/
diff --git a/buildroot/package/allegro/allegro.mk b/buildroot/package/allegro/allegro.mk
deleted file mode 100644
index 52e213f..0000000
--- a/buildroot/package/allegro/allegro.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#############################################################
-#
-# Allegro: a game programming library
-#
-#############################################################
-ALLEGRO_VERSION:=4.2.1
-ALLEGRO_SOURCE:=allegro-$(ALLEGRO_VERSION).tar.gz
-ALLEGRO_SITE:=http://downloads.sourceforge.net/alleg
-ALLEGRO_CAT:=zcat
-ALLEGRO_DIR:=$(BUILD_DIR)/allegro-$(ALLEGRO_VERSION)
-
-$(DL_DIR)/$(ALLEGRO_SOURCE):
- $(WGET) -P $(DL_DIR) $(ALLEGRO_SITE)/$(ALLEGRO_SOURCE)
-
-allegro-source: $(DL_DIR)/$(ALLEGRO_SOURCE)
-
-$(ALLEGRO_DIR)/.unpacked: $(DL_DIR)/$(ALLEGRO_SOURCE)
- $(ALLEGRO_CAT) $(DL_DIR)/$(ALLEGRO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $@
-
-$(ALLEGRO_DIR)/.configured: $(ALLEGRO_DIR)/.unpacked
- (cd $(ALLEGRO_DIR); \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- CROSSCOMPILE=1 \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --without-svgalib \
- --enable-modules=no \
- --enable-static=yes \
- --enable-shared=no \
- --disable-asm \
- --disable-mmx \
- --disable-sse \
- --disable-color24 \
- --disable-color32 \
- --without-x );
- touch $@
-# allegro doesn't seem to build as shared library
-# --disable-color24 \
-# --disable-color32 \
-
-$(ALLEGRO_DIR)/lib/unix/liballeg.a: $(ALLEGRO_DIR)/.configured
- $(MAKE) -C $(ALLEGRO_DIR) CROSSCOMPILE=1
- touch $@
-
-#$(STAGING_DIR)/usr/lib/liballeg.so: $(ALLEGRO_DIR)/lib/unix/liballeg.a
-# $(MAKE) -C $(ALLEGRO_DIR) install
-# touch -c $@
-#
-# $(TARGET_DIR)/usr/lib/liballeg.so.so: $(STAGING_DIR)/usr/lib/liballeg.so
-# cp -dpf $(STAGING_DIR)/usr/lib/liballeg*.so* $(TARGET_DIR)/usr/lib/
-# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/liballeg.so
-
-ALLEGRO allegro: $(ALLEGRO_DIR)/lib/unix/liballeg.a
-
-allegro-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(ALLEGRO_DIR) uninstall
- -$(MAKE) -C $(ALLEGRO_DIR) clean
-
-allegro-dirclean:
- rm -rf $(ALLEGRO_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_ALLEGRO)),y)
-TARGETS+=allegro
-endif
diff --git a/buildroot/package/fbgrab/Config.in b/buildroot/package/fbgrab/Config.in
deleted file mode 100644
index fec378d..0000000
--- a/buildroot/package/fbgrab/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_FBGRAB
- bool "fbgrab"
- default n
- help
- FBGrab is a framebuffer screenshot program,
- capturing the linux framebuffer and converting
- it to a png-picture.
-
- http://hem.bredband.net/gmogmo/fbgrab/
-
diff --git a/buildroot/package/fbgrab/fbgrab-1.0.patch b/buildroot/package/fbgrab/fbgrab-1.0.patch
deleted file mode 100644
index 9a80caa..0000000
--- a/buildroot/package/fbgrab/fbgrab-1.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN fbgrab-1.0/Makefile fbgrab-1.0.mod/Makefile
---- fbgrab-1.0/Makefile 2002-03-20 20:49:06.000000000 +0100
-+++ fbgrab-1.0.mod/Makefile 2008-06-06 21:42:56.000000000 +0200
-@@ -4,8 +4,8 @@
- ###
-
- fbgrab: fbgrab.c
-- splint +posixlib fbgrab.c
-- gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
-+ #splint +posixlib fbgrab.c
-+ $(CC) -Wall fbgrab.c -lpng -lz -o fbgrab
-
- install:
- strip fbgrab
-@@ -13,4 +13,4 @@
- install fbgrab.1.man /usr/man/man1/fbgrab.1
-
- clean:
-- rm -f fbgrab *~ \#*\#
-\ Pas de fin de ligne à la fin du fichier.
-+ rm -f fbgrab *~ \#*\#
diff --git a/buildroot/package/fbgrab/fbgrab.mk b/buildroot/package/fbgrab/fbgrab.mk
deleted file mode 100644
index dc520f5..0000000
--- a/buildroot/package/fbgrab/fbgrab.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#############################################################
-#
-# FBGRAB
-#
-#############################################################
-FBGRAB_VERSION:=1.0
-FBGRAB_SOURCE:=fbgrab-$(FBGRAB_VERSION).tar.gz
-FBGRAB_SITE:=http://hem.bredband.net/gmogmo/fbgrab/
-FBGRAB_DIR:=$(BUILD_DIR)/fbgrab-$(FBGRAB_VERSION)
-FBGRAB_CAT:=$(ZCAT)
-FBGRAB_BINARY:=fbgrab
-FBGRAB_TARGET_BINARY:=usr/bin/$(FBGRAB_BINARY)
-
-$(DL_DIR)/$(FBGRAB_SOURCE):
- $(WGET) -P $(DL_DIR) $(FBGRAB_SITE)/$(FBGRAB_SOURCE)
-
-$(FBGRAB_DIR)/.unpacked: $(DL_DIR)/$(FBGRAB_SOURCE)
- $(FBGRAB_CAT) $(DL_DIR)/$(FBGRAB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(FBGRAB_DIR) package/fbgrab/ fbgrab-$(FBGRAB_VERSION)\*.patch\*
- touch $@
-
-$(FBGRAB_DIR)/$(FBGRAB_BINARY): $(FBGRAB_DIR)/.unpacked
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(FBGRAB_DIR)
- touch -c $@
-
-$(TARGET_DIR)/$(FBGRAB_TARGET_BINARY): $(FBGRAB_DIR)/$(FBGRAB_BINARY)
- $(INSTALL) -m 755 $(FBGRAB_DIR)/$(FBGRAB_BINARY) $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
- touch -c $@
-
-fbgrab: libpng zlib $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
-
-fbgrab-clean:
- rm -f $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
- -$(MAKE) -C $(FBGRAB_DIR) clean
-
-fbgrab-dirclean:
- rm -rf $(FBGRAB_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_FBGRAB)),y)
-TARGETS+=fbgrab
-endif
-
diff --git a/buildroot/package/fbtest/Config.in b/buildroot/package/fbtest/Config.in
deleted file mode 100644
index 14dd671..0000000
--- a/buildroot/package/fbtest/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_FBTEST
- bool "fbtest"
- help
- Fbtest is a collection of tests for the frame buffer device.
- All tests are gathered inside the same executable.
-
- http://linux-fbdev.cvs.sourceforge.net/viewvc/linux-fbdev/fbtest/
diff --git a/buildroot/package/fbtest/fbtest.mk b/buildroot/package/fbtest/fbtest.mk
deleted file mode 100644
index 3b917a3..0000000
--- a/buildroot/package/fbtest/fbtest.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#############################################################
-#
-# fbtest
-#
-#############################################################
-FBTEST_VERSION:=20041102-1
-FBTEST_SOURCE:=fbtest-$(FBTEST_VERSION).tar.gz
-FBTEST_SITE:=http://www.pengutronix.de/software/ptxdist/temporary-src/
-FBTEST_DIR:=$(BUILD_DIR)/fbtest-$(FBTEST_VERSION)
-FBTEST_CAT:=$(ZCAT)
-FBTEST_BINARY:=fbtest
-FBTEST_TARGET_BINARY:=usr/bin/$(FBTEST_BINARY)
-
-$(DL_DIR)/$(FBTEST_SOURCE):
- $(WGET) -P $(DL_DIR) $(FBTEST_SITE)/$(FBTEST_SOURCE)
-
-$(FBTEST_DIR)/.unpacked: $(DL_DIR)/$(FBTEST_SOURCE)
- $(FBTEST_CAT) $(DL_DIR)/$(FBTEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(FBTEST_DIR) package/fbtest/patches/ \
- fbtest-$(FBTEST_VERSION)\*.patch \
- fbtest-$(FBTEST_VERSION)\*.patch.$(ARCH)
- touch $@
-
-$(FBTEST_DIR)/$(FBTEST_BINARY): $(FBTEST_DIR)/.unpacked
- $(MAKE1) ARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) -C $(FBTEST_DIR)
- touch -c $@
-
-$(TARGET_DIR)/$(FBTEST_TARGET_BINARY): $(FBTEST_DIR)/$(FBTEST_BINARY)
- $(INSTALL) -m 755 $(FBTEST_DIR)/$(FBTEST_BINARY) $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
- touch -c $@
-
-fbtest: uclibc $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
-
-fbtest-source: $(DL_DIR)/$(FBTEST_SOURCE)
-
-fbtest-clean:
- rm -f $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
- -$(MAKE) -C $(FBTEST_DIR) clean
-
-fbtest-dirclean:
- rm -rf $(FBTEST_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_FBTEST)),y)
-TARGETS+=fbtest
-endif
diff --git a/buildroot/package/fbtest/patches/fbtest-20041102-1-exe-target-name-change.patch b/buildroot/package/fbtest/patches/fbtest-20041102-1-exe-target-name-change.patch
deleted file mode 100644
index bd3fa50..0000000
--- a/buildroot/package/fbtest/patches/fbtest-20041102-1-exe-target-name-change.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fbtest-20041102-1.org/Makefile 2009-05-21 10:16:05.000000000 +0200
-+++ fbtest-20041102-1/Makefile 2009-05-21 10:17:47.000000000 +0200
-@@ -1,7 +1,7 @@
-
- TOPDIR = .
-
--TARGET = $(CROSS_COMPILE)fbtest
-+TARGET = fbtest
-
- OBJS += drawops/drawops.o fonts/fonts.o images/images.o visops/visops.o \
- tests/tests.o
diff --git a/buildroot/package/fbtest/patches/fbtest-20041102-1-page-mask.patch b/buildroot/package/fbtest/patches/fbtest-20041102-1-page-mask.patch
deleted file mode 100644
index 59c52fc..0000000
--- a/buildroot/package/fbtest/patches/fbtest-20041102-1-page-mask.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- fbtest-20041102-1.org/fb.c 2003-04-04 14:07:55.000000000 +0200
-+++ fbtest-20041102-1/fb.c 2009-05-20 10:32:32.000000000 +0200
-@@ -19,7 +19,6 @@
- #include <sys/stat.h>
- #include <unistd.h>
-
--#include <asm/page.h>
-
- #include "types.h"
- #include "fb.h"
-@@ -179,6 +179,7 @@
- void fb_map(void)
- {
- caddr_t addr;
-+ unsigned long PAGE_MASK = ~(sysconf(_SC_PAGE_SIZE)-1);
-
- Debug("fb_map()\n");
- fb_start = (unsigned long)fb_fix.smem_start & PAGE_MASK;
-@@ -189,7 +190,7 @@
- addr = mmap(NULL, fb_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb_fd, 0);
- if (addr == (caddr_t)-1)
- Fatal("mmap smem: %s\n", strerror(errno));
-- fb = addr+fb_offset;
-+ fb = (u8*)(addr+fb_offset);
- }
-
-
-@@ -199,6 +200,8 @@
-
- void fb_unmap(void)
- {
-+ unsigned long PAGE_MASK = ~(sysconf(_SC_PAGE_SIZE)-1);
-+
- Debug("fb_unmap()\n");
- if (munmap((caddr_t)((unsigned long)fb & PAGE_MASK), fb_len) == -1)
- Fatal("munmap smem: %s\n", strerror(errno));
diff --git a/buildroot/package/fbtest/patches/fbtest-20041102-1-pnmtohex-libs-depends.patch b/buildroot/package/fbtest/patches/fbtest-20041102-1-pnmtohex-libs-depends.patch
deleted file mode 100644
index 000b7d2..0000000
--- a/buildroot/package/fbtest/patches/fbtest-20041102-1-pnmtohex-libs-depends.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fbtest-20041102-1.org/pnmtohex/Makefile 2004-11-02 09:43:02.000000000 +0100
-+++ fbtest-20041102-1/pnmtohex/Makefile 2005-11-16 22:24:08.406157582 +0100
-@@ -3,7 +3,7 @@ TOPDIR = ..
-
- HOST_TARGET = pnmtohex
-
--LIBS += -lnetpnm -lnetpbm -lnetpgm -lnetppm
-+LIBS += -lnetpbm -lm
-
- include $(TOPDIR)/Rules.make
-
diff --git a/patches/buildroot/018-allegro.patch b/patches/buildroot/018-allegro.patch
index 0beb789..c2d4fd1 100644
--- a/patches/buildroot/018-allegro.patch
+++ b/patches/buildroot/018-allegro.patch
@@ -1,7 +1,11 @@
+Add allegro package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-01-25 10:04:00.000000000 +0100
-+++ buildroot/package/Config.in 2010-01-25 10:04:02.000000000 +0100
+--- buildroot.orig/package/Config.in 2010-06-18 21:05:19.000000000 +0200
++++ buildroot/package/Config.in 2010-06-18 21:12:09.000000000 +0200
@@ -311,6 +311,7 @@
source "package/dialog/Config.in"
@@ -10,3 +14,101 @@ Index: buildroot/package/Config.in
source "package/directfb/Config.in"
source "package/directfb-examples/Config.in"
source "package/fbdump/Config.in"
+Index: buildroot/package/allegro/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/allegro/Config.in 2010-06-18 21:14:34.000000000 +0200
+@@ -0,0 +1,13 @@
++config BR2_PACKAGE_ALLEGRO
++ bool "Allegro"
++ help
++ Allegro is a game programming library for C/C++ developers
++ distributed freely and supporting the following platforms:
++ DOS, Unix (Linux, FreeBSD, Irix, Solaris, Darwin), Windows, QNX,
++ BeOS and MacOS X.
++ It provides many functions for graphics, sounds, player input
++ (keyboard, mouse and joystick) and timers. It also provides fixed and
++ floating point mathematical functions, 3d functions, file management
++ functions, compressed datafile and a GUI.
++
++ http://alleg.sourceforge.net/
+Index: buildroot/package/allegro/allegro.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/allegro/allegro.mk 2010-06-18 21:28:35.000000000 +0200
+@@ -0,0 +1,75 @@
++#############################################################
++#
++# Allegro: a game programming library
++#
++#############################################################
++ALLEGRO_VERSION:=4.2.1
++ALLEGRO_SOURCE:=allegro-$(ALLEGRO_VERSION).tar.gz
++ALLEGRO_SITE:=http://downloads.sourceforge.net/alleg
++ALLEGRO_CAT:=zcat
++ALLEGRO_DIR:=$(BUILD_DIR)/allegro-$(ALLEGRO_VERSION)
++
++$(DL_DIR)/$(ALLEGRO_SOURCE):
++ $(call DOWNLOAD,$(ALLEGRO_SITE),$(ALLEGRO_SOURCE))
++
++allegro-source: $(DL_DIR)/$(ALLEGRO_SOURCE)
++
++$(ALLEGRO_DIR)/.unpacked: $(DL_DIR)/$(ALLEGRO_SOURCE)
++ $(ALLEGRO_CAT) $(DL_DIR)/$(ALLEGRO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ touch $@
++
++$(ALLEGRO_DIR)/.configured: $(ALLEGRO_DIR)/.unpacked
++ (cd $(ALLEGRO_DIR); \
++ $(TARGET_CONFIGURE_OPTS) \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ LDFLAGS="$(TARGET_LDFLAGS)" \
++ CROSSCOMPILE=1 \
++ ./configure \
++ --target=$(GNU_TARGET_NAME) \
++ --host=$(GNU_TARGET_NAME) \
++ --build=$(GNU_HOST_NAME) \
++ --prefix=/usr \
++ --without-svgalib \
++ --enable-modules=no \
++ --enable-static=yes \
++ --enable-shared=no \
++ --disable-asm \
++ --disable-mmx \
++ --disable-sse \
++ --disable-color24 \
++ --disable-color32 \
++ --without-x );
++ touch $@
++# allegro doesn't seem to build as shared library
++# --disable-color24 \
++# --disable-color32 \
++
++$(ALLEGRO_DIR)/lib/unix/liballeg.a: $(ALLEGRO_DIR)/.configured
++ $(MAKE) -C $(ALLEGRO_DIR) CROSSCOMPILE=1
++ touch $@
++
++#$(STAGING_DIR)/usr/lib/liballeg.so: $(ALLEGRO_DIR)/lib/unix/liballeg.a
++# $(MAKE) -C $(ALLEGRO_DIR) install
++# touch -c $@
++#
++# $(TARGET_DIR)/usr/lib/liballeg.so.so: $(STAGING_DIR)/usr/lib/liballeg.so
++# cp -dpf $(STAGING_DIR)/usr/lib/liballeg*.so* $(TARGET_DIR)/usr/lib/
++# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/liballeg.so
++
++ALLEGRO allegro: $(ALLEGRO_DIR)/lib/unix/liballeg.a
++
++allegro-clean:
++ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(ALLEGRO_DIR) uninstall
++ -$(MAKE) -C $(ALLEGRO_DIR) clean
++
++allegro-dirclean:
++ rm -rf $(ALLEGRO_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_ALLEGRO)),y)
++TARGETS+=allegro
++endif
diff --git a/patches/buildroot/041-fbgrab.patch b/patches/buildroot/041-fbgrab.patch
index 6f61b0b..ad04088 100644
--- a/patches/buildroot/041-fbgrab.patch
+++ b/patches/buildroot/041-fbgrab.patch
@@ -1,7 +1,11 @@
+Add fbgrab package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-01-25 10:04:25.000000000 +0100
-+++ buildroot/package/Config.in 2010-01-25 10:05:15.000000000 +0100
+--- buildroot.orig/package/Config.in 2010-06-18 22:47:05.000000000 +0200
++++ buildroot/package/Config.in 2010-06-18 23:09:39.000000000 +0200
@@ -338,6 +338,7 @@
comment "--> May be broken in busybox"
source "package/fbv/Config.in"
@@ -10,3 +14,89 @@ Index: buildroot/package/Config.in
comment "other GUIs"
source "package/qte/Config.in"
+Index: buildroot/package/fbgrab/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbgrab/Config.in 2010-06-18 23:13:05.000000000 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_FBGRAB
++ bool "fbgrab"
++ select BR2_PACKAGE_LIBPNG
++ select BR2_PACKAGE_ZLIB
++ help
++ FBGrab is a framebuffer screenshot program, capturing the Linux
++ framebuffer and converting it to a png-picture.
++
++ http://hem.bredband.net/gmogmo/fbgrab/
+Index: buildroot/package/fbgrab/fbgrab.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbgrab/fbgrab.mk 2010-06-18 23:02:49.000000000 +0200
+@@ -0,0 +1,48 @@
++#############################################################
++#
++# FBGRAB
++#
++#############################################################
++FBGRAB_VERSION:=1.0
++FBGRAB_SOURCE:=fbgrab-$(FBGRAB_VERSION).tar.gz
++FBGRAB_SITE:=http://hem.bredband.net/gmogmo/fbgrab/
++FBGRAB_DIR:=$(BUILD_DIR)/fbgrab-$(FBGRAB_VERSION)
++FBGRAB_CAT:=$(ZCAT)
++FBGRAB_BINARY:=fbgrab
++FBGRAB_TARGET_BINARY:=usr/bin/$(FBGRAB_BINARY)
++
++$(DL_DIR)/$(FBGRAB_SOURCE):
++ $(call DOWNLOAD,$(FBGRAB_SITE),$(FBGRAB_SOURCE))
++
++$(FBGRAB_DIR)/.unpacked: $(DL_DIR)/$(FBGRAB_SOURCE)
++ $(FBGRAB_CAT) $(DL_DIR)/$(FBGRAB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ toolchain/patch-kernel.sh $(FBGRAB_DIR) package/fbgrab/ fbgrab-$(FBGRAB_VERSION)\*.patch\*
++ touch $@
++
++$(FBGRAB_DIR)/$(FBGRAB_BINARY): $(FBGRAB_DIR)/.unpacked
++ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(FBGRAB_DIR)
++ touch -c $@
++
++$(TARGET_DIR)/$(FBGRAB_TARGET_BINARY): $(FBGRAB_DIR)/$(FBGRAB_BINARY)
++ $(INSTALL) -m 755 $(FBGRAB_DIR)/$(FBGRAB_BINARY) $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++ touch -c $@
++
++fbgrab: libpng zlib $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++
++fbgrab-clean:
++ rm -f $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++ -$(MAKE) -C $(FBGRAB_DIR) clean
++
++fbgrab-dirclean:
++ rm -rf $(FBGRAB_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_FBGRAB)),y)
++TARGETS+=fbgrab
++endif
++
+Index: buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch 2010-06-18 23:07:20.000000000 +0200
+@@ -0,0 +1,14 @@
++diff -urN fbgrab-1.0/Makefile fbgrab-1.0.mod/Makefile
++--- fbgrab-1.0/Makefile 2002-03-20 20:49:06.000000000 +0100
+++++ fbgrab-1.0.mod/Makefile 2008-06-06 21:42:56.000000000 +0200
++@@ -4,8 +4,8 @@
++ ###
++
++ fbgrab: fbgrab.c
++- splint +posixlib fbgrab.c
++- gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
+++ #splint +posixlib fbgrab.c
+++ $(CC) -Wall fbgrab.c -lpng -lz -o fbgrab
++
++ install:
++ strip fbgrab
diff --git a/patches/buildroot/119-fbtest-add_package.patch b/patches/buildroot/119-fbtest-add_package.patch
new file mode 100644
index 0000000..5ddfb1e
--- /dev/null
+++ b/patches/buildroot/119-fbtest-add_package.patch
@@ -0,0 +1,141 @@
+Add fbtest package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-18 23:44:05.000000000 +0200
++++ buildroot/package/Config.in 2010-06-18 23:49:19.000000000 +0200
+@@ -344,6 +344,7 @@
+ comment "--> May be broken in busybox"
+ source "package/fbv/Config.in"
+ source "package/fbset/Config.in"
++source "package/fbtest/Config.in"
+ source "package/fbgrab/Config.in"
+
+ comment "other GUIs"
+Index: buildroot/package/fbtest/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/Config.in 2010-06-18 23:51:27.000000000 +0200
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_FBTEST
++ bool "fbtest"
++ help
++ Fbtest is a collection of tests for the framebuffer device.
++ All tests are gathered inside the same executable.
++
++ http://linux-fbdev.cvs.sourceforge.net/viewvc/linux-fbdev/fbtest/
+Index: buildroot/package/fbtest/fbtest.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest.mk 2010-06-18 23:56:39.000000000 +0200
+@@ -0,0 +1,51 @@
++#############################################################
++#
++# fbtest
++#
++#############################################################
++FBTEST_VERSION:=20041102-1
++FBTEST_SOURCE:=fbtest-$(FBTEST_VERSION).tar.gz
++FBTEST_SITE:=http://www.pengutronix.de/software/ptxdist/temporary-src/
++FBTEST_DIR:=$(BUILD_DIR)/fbtest-$(FBTEST_VERSION)
++FBTEST_CAT:=$(ZCAT)
++FBTEST_BINARY:=fbtest
++FBTEST_TARGET_BINARY:=usr/bin/$(FBTEST_BINARY)
++
++$(DL_DIR)/$(FBTEST_SOURCE):
++ $(call DOWNLOAD,$(FBTEST_SITE),$(FBTEST_SOURCE))
++
++$(FBTEST_DIR)/.unpacked: $(DL_DIR)/$(FBTEST_SOURCE)
++ $(FBTEST_CAT) $(DL_DIR)/$(FBTEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ toolchain/patch-kernel.sh $(FBTEST_DIR) package/fbtest/ \
++ fbtest-$(FBTEST_VERSION)\*.patch \
++ fbtest-$(FBTEST_VERSION)\*.patch.$(ARCH)
++ touch $@
++
++$(FBTEST_DIR)/$(FBTEST_BINARY): $(FBTEST_DIR)/.unpacked
++ $(MAKE1) ARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) -C $(FBTEST_DIR)
++ touch -c $@
++
++$(TARGET_DIR)/$(FBTEST_TARGET_BINARY): $(FBTEST_DIR)/$(FBTEST_BINARY)
++ $(INSTALL) -m 755 $(FBTEST_DIR)/$(FBTEST_BINARY) $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++ touch -c $@
++
++fbtest: $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++
++fbtest-source: $(DL_DIR)/$(FBTEST_SOURCE)
++
++fbtest-clean:
++ rm -f $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++ -$(MAKE) -C $(FBTEST_DIR) clean
++
++fbtest-dirclean:
++ rm -rf $(FBTEST_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_FBTEST)),y)
++TARGETS+=fbtest
++endif
+Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch 2010-06-18 23:56:15.000000000 +0200
+@@ -0,0 +1,36 @@
++--- fbtest-20041102-1.org/fb.c 2003-04-04 14:07:55.000000000 +0200
+++++ fbtest-20041102-1/fb.c 2009-05-20 10:32:32.000000000 +0200
++@@ -19,7 +19,6 @@
++ #include <sys/stat.h>
++ #include <unistd.h>
++
++-#include <asm/page.h>
++
++ #include "types.h"
++ #include "fb.h"
++@@ -179,6 +179,7 @@
++ void fb_map(void)
++ {
++ caddr_t addr;
+++ unsigned long PAGE_MASK = ~(sysconf(_SC_PAGE_SIZE)-1);
++
++ Debug("fb_map()\n");
++ fb_start = (unsigned long)fb_fix.smem_start & PAGE_MASK;
++@@ -189,7 +190,7 @@
++ addr = mmap(NULL, fb_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb_fd, 0);
++ if (addr == (caddr_t)-1)
++ Fatal("mmap smem: %s\n", strerror(errno));
++- fb = addr+fb_offset;
+++ fb = (u8*)(addr+fb_offset);
++ }
++
++
++@@ -199,6 +200,8 @@
++
++ void fb_unmap(void)
++ {
+++ unsigned long PAGE_MASK = ~(sysconf(_SC_PAGE_SIZE)-1);
+++
++ Debug("fb_unmap()\n");
++ if (munmap((caddr_t)((unsigned long)fb & PAGE_MASK), fb_len) == -1)
++ Fatal("munmap smem: %s\n", strerror(errno));
+Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch 2010-06-19 00:01:03.000000000 +0200
+@@ -0,0 +1,11 @@
++--- fbtest-20041102-1.org/Makefile 2009-05-21 10:16:05.000000000 +0200
+++++ fbtest-20041102-1/Makefile 2009-05-21 10:17:47.000000000 +0200
++@@ -1,7 +1,7 @@
++
++ TOPDIR = .
++
++-TARGET = $(CROSS_COMPILE)fbtest
+++TARGET = fbtest
++
++ OBJS += drawops/drawops.o fonts/fonts.o images/images.o visops/visops.o \
++ tests/tests.o
diff --git a/patches/buildroot/2010.05/018-allegro.patch b/patches/buildroot/2010.05/018-allegro.patch
index 27462c5..2629af3 100644
--- a/patches/buildroot/2010.05/018-allegro.patch
+++ b/patches/buildroot/2010.05/018-allegro.patch
@@ -1,3 +1,7 @@
+Add allegro package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2010-06-17 16:45:46.000000000 +0200
@@ -10,3 +14,101 @@ Index: buildroot/package/Config.in
source "package/directfb/Config.in"
source "package/directfb-examples/Config.in"
source "package/divine/Config.in"
+Index: buildroot/package/allegro/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/allegro/Config.in 2010-06-18 21:14:34.000000000 +0200
+@@ -0,0 +1,13 @@
++config BR2_PACKAGE_ALLEGRO
++ bool "Allegro"
++ help
++ Allegro is a game programming library for C/C++ developers
++ distributed freely and supporting the following platforms:
++ DOS, Unix (Linux, FreeBSD, Irix, Solaris, Darwin), Windows, QNX,
++ BeOS and MacOS X.
++ It provides many functions for graphics, sounds, player input
++ (keyboard, mouse and joystick) and timers. It also provides fixed and
++ floating point mathematical functions, 3d functions, file management
++ functions, compressed datafile and a GUI.
++
++ http://alleg.sourceforge.net/
+Index: buildroot/package/allegro/allegro.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/allegro/allegro.mk 2010-06-18 21:28:35.000000000 +0200
+@@ -0,0 +1,75 @@
++#############################################################
++#
++# Allegro: a game programming library
++#
++#############################################################
++ALLEGRO_VERSION:=4.2.1
++ALLEGRO_SOURCE:=allegro-$(ALLEGRO_VERSION).tar.gz
++ALLEGRO_SITE:=http://downloads.sourceforge.net/alleg
++ALLEGRO_CAT:=zcat
++ALLEGRO_DIR:=$(BUILD_DIR)/allegro-$(ALLEGRO_VERSION)
++
++$(DL_DIR)/$(ALLEGRO_SOURCE):
++ $(call DOWNLOAD,$(ALLEGRO_SITE),$(ALLEGRO_SOURCE))
++
++allegro-source: $(DL_DIR)/$(ALLEGRO_SOURCE)
++
++$(ALLEGRO_DIR)/.unpacked: $(DL_DIR)/$(ALLEGRO_SOURCE)
++ $(ALLEGRO_CAT) $(DL_DIR)/$(ALLEGRO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ touch $@
++
++$(ALLEGRO_DIR)/.configured: $(ALLEGRO_DIR)/.unpacked
++ (cd $(ALLEGRO_DIR); \
++ $(TARGET_CONFIGURE_OPTS) \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ LDFLAGS="$(TARGET_LDFLAGS)" \
++ CROSSCOMPILE=1 \
++ ./configure \
++ --target=$(GNU_TARGET_NAME) \
++ --host=$(GNU_TARGET_NAME) \
++ --build=$(GNU_HOST_NAME) \
++ --prefix=/usr \
++ --without-svgalib \
++ --enable-modules=no \
++ --enable-static=yes \
++ --enable-shared=no \
++ --disable-asm \
++ --disable-mmx \
++ --disable-sse \
++ --disable-color24 \
++ --disable-color32 \
++ --without-x );
++ touch $@
++# allegro doesn't seem to build as shared library
++# --disable-color24 \
++# --disable-color32 \
++
++$(ALLEGRO_DIR)/lib/unix/liballeg.a: $(ALLEGRO_DIR)/.configured
++ $(MAKE) -C $(ALLEGRO_DIR) CROSSCOMPILE=1
++ touch $@
++
++#$(STAGING_DIR)/usr/lib/liballeg.so: $(ALLEGRO_DIR)/lib/unix/liballeg.a
++# $(MAKE) -C $(ALLEGRO_DIR) install
++# touch -c $@
++#
++# $(TARGET_DIR)/usr/lib/liballeg.so.so: $(STAGING_DIR)/usr/lib/liballeg.so
++# cp -dpf $(STAGING_DIR)/usr/lib/liballeg*.so* $(TARGET_DIR)/usr/lib/
++# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/liballeg.so
++
++ALLEGRO allegro: $(ALLEGRO_DIR)/lib/unix/liballeg.a
++
++allegro-clean:
++ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(ALLEGRO_DIR) uninstall
++ -$(MAKE) -C $(ALLEGRO_DIR) clean
++
++allegro-dirclean:
++ rm -rf $(ALLEGRO_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_ALLEGRO)),y)
++TARGETS+=allegro
++endif
diff --git a/patches/buildroot/2010.05/041-fbgrab.patch b/patches/buildroot/2010.05/041-fbgrab.patch
index dc4ccea..bac886e 100644
--- a/patches/buildroot/2010.05/041-fbgrab.patch
+++ b/patches/buildroot/2010.05/041-fbgrab.patch
@@ -1,3 +1,7 @@
+Add fbgrab package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2010-06-17 16:46:21.000000000 +0200
@@ -10,3 +14,89 @@ Index: buildroot/package/Config.in
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/fbset/Config.in"
endif
+Index: buildroot/package/fbgrab/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbgrab/Config.in 2010-06-18 23:13:05.000000000 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_FBGRAB
++ bool "fbgrab"
++ select BR2_PACKAGE_LIBPNG
++ select BR2_PACKAGE_ZLIB
++ help
++ FBGrab is a framebuffer screenshot program, capturing the Linux
++ framebuffer and converting it to a png-picture.
++
++ http://hem.bredband.net/gmogmo/fbgrab/
+Index: buildroot/package/fbgrab/fbgrab.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbgrab/fbgrab.mk 2010-06-18 23:02:49.000000000 +0200
+@@ -0,0 +1,48 @@
++#############################################################
++#
++# FBGRAB
++#
++#############################################################
++FBGRAB_VERSION:=1.0
++FBGRAB_SOURCE:=fbgrab-$(FBGRAB_VERSION).tar.gz
++FBGRAB_SITE:=http://hem.bredband.net/gmogmo/fbgrab/
++FBGRAB_DIR:=$(BUILD_DIR)/fbgrab-$(FBGRAB_VERSION)
++FBGRAB_CAT:=$(ZCAT)
++FBGRAB_BINARY:=fbgrab
++FBGRAB_TARGET_BINARY:=usr/bin/$(FBGRAB_BINARY)
++
++$(DL_DIR)/$(FBGRAB_SOURCE):
++ $(call DOWNLOAD,$(FBGRAB_SITE),$(FBGRAB_SOURCE))
++
++$(FBGRAB_DIR)/.unpacked: $(DL_DIR)/$(FBGRAB_SOURCE)
++ $(FBGRAB_CAT) $(DL_DIR)/$(FBGRAB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ toolchain/patch-kernel.sh $(FBGRAB_DIR) package/fbgrab/ fbgrab-$(FBGRAB_VERSION)\*.patch\*
++ touch $@
++
++$(FBGRAB_DIR)/$(FBGRAB_BINARY): $(FBGRAB_DIR)/.unpacked
++ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(FBGRAB_DIR)
++ touch -c $@
++
++$(TARGET_DIR)/$(FBGRAB_TARGET_BINARY): $(FBGRAB_DIR)/$(FBGRAB_BINARY)
++ $(INSTALL) -m 755 $(FBGRAB_DIR)/$(FBGRAB_BINARY) $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++ touch -c $@
++
++fbgrab: libpng zlib $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++
++fbgrab-clean:
++ rm -f $(TARGET_DIR)/$(FBGRAB_TARGET_BINARY)
++ -$(MAKE) -C $(FBGRAB_DIR) clean
++
++fbgrab-dirclean:
++ rm -rf $(FBGRAB_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_FBGRAB)),y)
++TARGETS+=fbgrab
++endif
++
+Index: buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch 2010-06-18 23:07:20.000000000 +0200
+@@ -0,0 +1,14 @@
++diff -urN fbgrab-1.0/Makefile fbgrab-1.0.mod/Makefile
++--- fbgrab-1.0/Makefile 2002-03-20 20:49:06.000000000 +0100
+++++ fbgrab-1.0.mod/Makefile 2008-06-06 21:42:56.000000000 +0200
++@@ -4,8 +4,8 @@
++ ###
++
++ fbgrab: fbgrab.c
++- splint +posixlib fbgrab.c
++- gcc -g -Wall fbgrab.c -lpng -lz -o fbgrab
+++ #splint +posixlib fbgrab.c
+++ $(CC) -Wall fbgrab.c -lpng -lz -o fbgrab
++
++ install:
++ strip fbgrab
diff --git a/patches/buildroot/2010.05/119-fbtest-add_package.patch b/patches/buildroot/2010.05/119-fbtest-add_package.patch
new file mode 100644
index 0000000..5ddfb1e
--- /dev/null
+++ b/patches/buildroot/2010.05/119-fbtest-add_package.patch
@@ -0,0 +1,141 @@
+Add fbtest package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-18 23:44:05.000000000 +0200
++++ buildroot/package/Config.in 2010-06-18 23:49:19.000000000 +0200
+@@ -344,6 +344,7 @@
+ comment "--> May be broken in busybox"
+ source "package/fbv/Config.in"
+ source "package/fbset/Config.in"
++source "package/fbtest/Config.in"
+ source "package/fbgrab/Config.in"
+
+ comment "other GUIs"
+Index: buildroot/package/fbtest/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/Config.in 2010-06-18 23:51:27.000000000 +0200
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_FBTEST
++ bool "fbtest"
++ help
++ Fbtest is a collection of tests for the framebuffer device.
++ All tests are gathered inside the same executable.
++
++ http://linux-fbdev.cvs.sourceforge.net/viewvc/linux-fbdev/fbtest/
+Index: buildroot/package/fbtest/fbtest.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest.mk 2010-06-18 23:56:39.000000000 +0200
+@@ -0,0 +1,51 @@
++#############################################################
++#
++# fbtest
++#
++#############################################################
++FBTEST_VERSION:=20041102-1
++FBTEST_SOURCE:=fbtest-$(FBTEST_VERSION).tar.gz
++FBTEST_SITE:=http://www.pengutronix.de/software/ptxdist/temporary-src/
++FBTEST_DIR:=$(BUILD_DIR)/fbtest-$(FBTEST_VERSION)
++FBTEST_CAT:=$(ZCAT)
++FBTEST_BINARY:=fbtest
++FBTEST_TARGET_BINARY:=usr/bin/$(FBTEST_BINARY)
++
++$(DL_DIR)/$(FBTEST_SOURCE):
++ $(call DOWNLOAD,$(FBTEST_SITE),$(FBTEST_SOURCE))
++
++$(FBTEST_DIR)/.unpacked: $(DL_DIR)/$(FBTEST_SOURCE)
++ $(FBTEST_CAT) $(DL_DIR)/$(FBTEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ toolchain/patch-kernel.sh $(FBTEST_DIR) package/fbtest/ \
++ fbtest-$(FBTEST_VERSION)\*.patch \
++ fbtest-$(FBTEST_VERSION)\*.patch.$(ARCH)
++ touch $@
++
++$(FBTEST_DIR)/$(FBTEST_BINARY): $(FBTEST_DIR)/.unpacked
++ $(MAKE1) ARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) -C $(FBTEST_DIR)
++ touch -c $@
++
++$(TARGET_DIR)/$(FBTEST_TARGET_BINARY): $(FBTEST_DIR)/$(FBTEST_BINARY)
++ $(INSTALL) -m 755 $(FBTEST_DIR)/$(FBTEST_BINARY) $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++ touch -c $@
++
++fbtest: $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++
++fbtest-source: $(DL_DIR)/$(FBTEST_SOURCE)
++
++fbtest-clean:
++ rm -f $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
++ -$(MAKE) -C $(FBTEST_DIR) clean
++
++fbtest-dirclean:
++ rm -rf $(FBTEST_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_FBTEST)),y)
++TARGETS+=fbtest
++endif
+Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch 2010-06-18 23:56:15.000000000 +0200
+@@ -0,0 +1,36 @@
++--- fbtest-20041102-1.org/fb.c 2003-04-04 14:07:55.000000000 +0200
+++++ fbtest-20041102-1/fb.c 2009-05-20 10:32:32.000000000 +0200
++@@ -19,7 +19,6 @@
++ #include <sys/stat.h>
++ #include <unistd.h>
++
++-#include <asm/page.h>
++
++ #include "types.h"
++ #include "fb.h"
++@@ -179,6 +179,7 @@
++ void fb_map(void)
++ {
++ caddr_t addr;
+++ unsigned long PAGE_MASK = ~(sysconf(_SC_PAGE_SIZE)-1);
++
++ Debug("fb_map()\n");
++ fb_start = (unsigned long)fb_fix.smem_start & PAGE_MASK;
++@@ -189,7 +190,7 @@
++ addr = mmap(NULL, fb_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb_fd, 0);
++ if (addr == (caddr_t)-1)
++ Fatal("mmap smem: %s\n", strerror(errno));
++- fb = addr+fb_offset;
+++ fb = (u8*)(addr+fb_offset);
++ }
++
++
++@@ -199,6 +200,8 @@
++
++ void fb_unmap(void)
++ {
+++ unsigned long PAGE_MASK = ~(sysconf(_SC_PAGE_SIZE)-1);
+++
++ Debug("fb_unmap()\n");
++ if (munmap((caddr_t)((unsigned long)fb & PAGE_MASK), fb_len) == -1)
++ Fatal("munmap smem: %s\n", strerror(errno));
+Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch 2010-06-19 00:01:03.000000000 +0200
+@@ -0,0 +1,11 @@
++--- fbtest-20041102-1.org/Makefile 2009-05-21 10:16:05.000000000 +0200
+++++ fbtest-20041102-1/Makefile 2009-05-21 10:17:47.000000000 +0200
++@@ -1,7 +1,7 @@
++
++ TOPDIR = .
++
++-TARGET = $(CROSS_COMPILE)fbtest
+++TARGET = fbtest
++
++ OBJS += drawops/drawops.o fonts/fonts.o images/images.o visops/visops.o \
++ tests/tests.o
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index cd13a2a..02cd628 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -35,3 +35,6 @@ rm -rf buildroot/package/socketcan/
rm -rf buildroot/package/lcd4linux/
rm -rf buildroot/package/mesa/
rm -rf buildroot/package/games/snes9x/
+rm -rf buildroot/package/allegro/
+rm -rf buildroot/package/fbgrab/
+rm -rf buildroot/package/fbtest/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 7ae130f..1508065 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -31,7 +31,7 @@ rm -rf buildroot/package/lmbench/
rm -rf buildroot/package/tslib/
rm -rf buildroot/package/openssh/
rm -rf buildroot/package/sdl/
-rm -rf buildroot/package/sdl-water/
+rm -rf buildroot/package/sdlwater/
rm -rf buildroot/package/slideshow/
rm -rf buildroot/package/pyserial/
rm -rf buildroot/package/pymysql/
@@ -39,3 +39,6 @@ rm -rf buildroot/package/socketcan/
rm -rf buildroot/package/lcd4linux/
rm -rf buildroot/package/mesa/
rm -rf buildroot/package/games/snes9x/
+rm -rf buildroot/package/allegro/
+rm -rf buildroot/package/fbgrab/
+rm -rf buildroot/package/fbtest/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-18 18:58: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 b14d420100ab929d961751acea5f4366c227867f (commit)
via 126a88992d91d37d9b24a657716f6f166c83b6aa (commit)
via c7fb35ea959a7bbed40418ebeea241cde7d4e23b (commit)
via 4b7ac544c5bc279deb23a3c41947df9656bd070d (commit)
via c1634b7ca950e290fdcfb71c96155feb83a274c7 (commit)
via 3f93739eff03ebfa91df6e7d9c245103bdfc5753 (commit)
via d2843dcb515b94ca7b7196604b6914d1f181b4fb (commit)
from 6e69039ec53b91304d1a2853fd4b5a24397094e5 (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 b14d420100ab929d961751acea5f4366c227867f
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 20:57:19 2010 +0200
[BUILDROOT] move sdlwater package as patch against BR
commit 126a88992d91d37d9b24a657716f6f166c83b6aa
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 19:00:44 2010 +0200
[BUILDROOT] move snes9x package as patch against BR
commit c7fb35ea959a7bbed40418ebeea241cde7d4e23b
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 18:32:53 2010 +0200
[BUILDROOT] move mesa package as patch against BR
commit 4b7ac544c5bc279deb23a3c41947df9656bd070d
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 18:05:03 2010 +0200
[BUILDROOT] move lcd4linux package as patch against BR
commit c1634b7ca950e290fdcfb71c96155feb83a274c7
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 17:12:29 2010 +0200
[BUILDROOT] move socketcan package as patch against BR
commit 3f93739eff03ebfa91df6e7d9c245103bdfc5753
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 16:41:53 2010 +0200
[BUILDROOT] move pymysql package as patch against BR
commit d2843dcb515b94ca7b7196604b6914d1f181b4fb
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 15:27:46 2010 +0200
[BUILDROOT] cleanup pyserial & move package as patch against BR
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/.gitignore | 8 -
buildroot/package/lcd4linux/Config.in | 8 -
.../lcd4linux/lcd4linux-remove-wireless.patch | 13 -
buildroot/package/lcd4linux/lcd4linux.mk | 64 --
.../package/lcd4linux/lcd4linux_armadeus.conf | 445 ------------
.../package/lcd4linux/lcd4linux_armadeus.patch | 181 -----
buildroot/package/mesa/Config.in | 7 -
buildroot/package/mesa/mesa.mk | 70 --
buildroot/package/mesa/mesa.patch | 188 -----
buildroot/package/pymysql/Config.in | 9 -
buildroot/package/pymysql/patches/000-setup.patch | 12 -
.../package/pymysql/patches/010-threadsafe.patch | 11 -
buildroot/package/pymysql/pymysql.mk | 76 --
buildroot/package/pyserial/Config.in | 6 -
buildroot/package/pyserial/pyserial.mk | 32 -
buildroot/package/sdlwater/Config.in | 10 -
buildroot/package/sdlwater/sdl_water.mk | 65 --
buildroot/package/snes9x/Config.in | 13 -
buildroot/package/snes9x/snes9x-1.39-compile.patch | 295 --------
buildroot/package/snes9x/snes9x.mk | 80 ---
buildroot/package/socketcan/Config.in | 22 -
.../socketcan-svn-rev810-cross-compile.patch | 33 -
.../socketcan-svn-rev874-cross-compile.patch | 63 --
buildroot/package/socketcan/socketcan.mk | 72 --
patches/buildroot/006-lcd4linux.patch | 745 +++++++++++++++++++-
patches/buildroot/021-sdl-water-config.patch | 90 +++-
patches/buildroot/042-socketcan.patch | 214 ++++++-
patches/buildroot/043-mesa-add_packages.patch | 287 ++++++++
patches/buildroot/055-pyserial-add_package.patch | 56 ++-
patches/buildroot/057-pymysql-add_package.patch | 136 ++++-
patches/buildroot/118-snes9x-add_package.patch | 413 +++++++++++
patches/buildroot/2010.05/006-lcd4linux.patch | 741 +++++++++++++++++++
.../buildroot/2010.05/021-sdl-water-config.patch | 88 +++-
patches/buildroot/2010.05/042-socketcan.patch | 210 ++++++
.../buildroot/2010.05/043-mesa-add_packages.patch | 287 ++++++++
.../2010.05/055-pyserial-add_package.patch | 52 ++
.../2010.05/057-pymysql-add_package.patch | 132 ++++
.../buildroot/2010.05/118-snes9x-add_package.patch | 413 +++++++++++
patches/buildroot/2010.05/cleanup_buildroot.sh | 7 +
patches/buildroot/cleanup_buildroot.sh | 7 +
40 files changed, 3867 insertions(+), 1794 deletions(-)
delete mode 100644 buildroot/package/lcd4linux/Config.in
delete mode 100644 buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch
delete mode 100644 buildroot/package/lcd4linux/lcd4linux.mk
delete mode 100644 buildroot/package/lcd4linux/lcd4linux_armadeus.conf
delete mode 100644 buildroot/package/lcd4linux/lcd4linux_armadeus.patch
delete mode 100644 buildroot/package/mesa/Config.in
delete mode 100644 buildroot/package/mesa/mesa.mk
delete mode 100644 buildroot/package/mesa/mesa.patch
delete mode 100644 buildroot/package/pymysql/Config.in
delete mode 100644 buildroot/package/pymysql/patches/000-setup.patch
delete mode 100644 buildroot/package/pymysql/patches/010-threadsafe.patch
delete mode 100644 buildroot/package/pymysql/pymysql.mk
delete mode 100644 buildroot/package/pyserial/Config.in
delete mode 100644 buildroot/package/pyserial/pyserial.mk
delete mode 100644 buildroot/package/sdlwater/Config.in
delete mode 100644 buildroot/package/sdlwater/sdl_water.mk
delete mode 100644 buildroot/package/snes9x/Config.in
delete mode 100644 buildroot/package/snes9x/snes9x-1.39-compile.patch
delete mode 100644 buildroot/package/snes9x/snes9x.mk
delete mode 100644 buildroot/package/socketcan/Config.in
delete mode 100644 buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch
delete mode 100644 buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch
delete mode 100644 buildroot/package/socketcan/socketcan.mk
create mode 100644 patches/buildroot/043-mesa-add_packages.patch
create mode 100644 patches/buildroot/118-snes9x-add_package.patch
create mode 100644 patches/buildroot/2010.05/043-mesa-add_packages.patch
create mode 100644 patches/buildroot/2010.05/118-snes9x-add_package.patch
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index 489f220..b60d8b2 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -14,13 +14,5 @@
!/bluez/
!/fbgrab/
!/fbtest/
-!/lcd4linux/
-!/mesa/
!/mtd/
-!/pymysql/
-!/pyserial/
-!/sdlwater/
-!/snes9x/
-!/socketcan/
!/xenomai/
-!/mesa/
diff --git a/buildroot/package/lcd4linux/Config.in b/buildroot/package/lcd4linux/Config.in
deleted file mode 100644
index bdce5b3..0000000
--- a/buildroot/package/lcd4linux/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_LCD4LINUX
- bool "LCD4Linux daemon"
- select BR2_PACKAGE_NCURSES
- default n
- help
- LCD4Linux allows you to show some system parameters on a textual LCD
- connected to your Armadeus board.
-
diff --git a/buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch b/buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch
deleted file mode 100644
index 7f1e342..0000000
--- a/buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This plugin doesn't compile yet (/anymore?)
-
---- lcd4linux-0.10.0/configure.org 2007-11-21 22:31:40.000000000 +0100
-+++ lcd4linux-0.10.0/configure 2007-11-21 22:32:04.000000000 +0100
-@@ -6366,7 +6366,7 @@
- PLUGIN_STATFS="yes"
- PLUGIN_UNAME="yes"
- PLUGIN_UPTIME="yes"
-- PLUGIN_WIRELESS="yes"
-+ PLUGIN_WIRELESS="no"
- PLUGIN_XMMS="yes"
- ;;
- apm)
diff --git a/buildroot/package/lcd4linux/lcd4linux.mk b/buildroot/package/lcd4linux/lcd4linux.mk
deleted file mode 100644
index 9a55c5c..0000000
--- a/buildroot/package/lcd4linux/lcd4linux.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#############################################################
-#
-# LCD4Linux daemon
-#
-#############################################################
-
-LCD4LINUX_VER:=0.10.1-RC2
-LCD4LINUX_SOURCE:=lcd4linux-$(LCD4LINUX_VER).tar.gz
-LCD4LINUX_SITE:=http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/
-LCD4LINUX_DIR:=$(BUILD_DIR)/lcd4linux-$(LCD4LINUX_VER)
-LCD4LINUX_CAT:=zcat
-LCD4LINUX_BINARY:=lcd4linux
-LCD4LINUX_TARGET_BINARY:=usr/bin/lcd4linux
-LCD4LINUX_PATCH:=lcd4linux_armadeus.patch
-LCD4LINUX_CONF:=lcd4linux_armadeus.conf
-LCD4LINUX_TARGET_CONF:=etc/lcd4linux.conf
-
-
-$(DL_DIR)/$(LCD4LINUX_SOURCE):
- $(WGET) -P $(DL_DIR) $(LCD4LINUX_SITE)/$(LCD4LINUX_SOURCE)
-
-$(LCD4LINUX_DIR)/.unpacked: $(DL_DIR)/$(LCD4LINUX_SOURCE)
- $(LCD4LINUX_CAT) $(DL_DIR)/$(LCD4LINUX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $@
-
-$(LCD4LINUX_DIR)/.patched: $(LCD4LINUX_DIR)/.unpacked
- toolchain/patch-kernel.sh $(LCD4LINUX_DIR) package/lcd4linux lcd4linux\*.patch
- (if [ -d $(BUILD_DIR)/linux-2.6.12/include/asm-generic ]; then ln -sf $(BUILD_DIR)/linux-2.6.12/include/asm-generic/ $(BUILD_DIR)/staging_dir/arm-linux-uclibc/sys-include/asm-generic; fi)
- touch $@
-
-$(LCD4LINUX_DIR)/.configured: $(LCD4LINUX_DIR)/.patched
- (cd $(LCD4LINUX_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) CC_FOR_BUILD=$(HOSTCC) \
- CFLAGS="$(TARGET_CFLAGS)" \
- ./configure \
- --host=$(GNU_TARGET_NAME) \
- );
- touch $@
-
-$(LCD4LINUX_DIR)/$(LCD4LINUX_BINARY): $(LCD4LINUX_DIR)/.configured
- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(LCD4LINUX_DIR)
-
-$(TARGET_DIR)/$(LCD4LINUX_TARGET_BINARY): $(LCD4LINUX_DIR)/$(LCD4LINUX_BINARY)
- #cp -f $< $@
- install -D $< $@
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
- cp package/lcd4linux/$(LCD4LINUX_CONF) $(TARGET_DIR)/$(LCD4LINUX_TARGET_CONF)
-
-lcd4linux: uclibc ncurses $(TARGET_DIR)/$(LCD4LINUX_TARGET_BINARY)
-
-lcd4linux-clean:
- rm -f $(TARGET_DIR)/$(LCD4LINUX_TARGET_BINARY)
- -$(MAKE) -C $(LCD4LINUX_DIR) clean
-
-lcd4linux-dirclean:
- rm -rf $(LCD4LINUX_DIR)
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_LCD4LINUX)),y)
-TARGETS+=lcd4linux
-endif
diff --git a/buildroot/package/lcd4linux/lcd4linux_armadeus.conf b/buildroot/package/lcd4linux/lcd4linux_armadeus.conf
deleted file mode 100644
index 3617344..0000000
--- a/buildroot/package/lcd4linux/lcd4linux_armadeus.conf
+++ /dev/null
@@ -1,445 +0,0 @@
-
-# Armadeus HD44780 display (Nico wiring ;-))
-Display HD44780-generic {
- Driver 'HD44780'
- Model 'generic'
- Port '/dev/parports/0'
- Size '40x2'
- asc255bug 0
- Bits 4
- Wire {
- RW 'DB4'
- RS 'DB5'
- ENABLE 'DB6'
- ENABLE2 'GND'
- GPO 'GND'
- }
-}
-
-Plugin Seti {
- Directory '/root/setiathome-3.08.i686-pc-linux-gnu'
-}
-
-
-Plugin MySQL {
- server 'gsmlandia.com' # if none, localhost assumed
- port 3306 # if none, MySQL default assumed
- user 'lcd4linux' # if none, lcd4linux unix owner assumed
- password 'lcd4linux' # if none, empty password assumed
- database 'lcd4linux' # MUST be specified
-}
-
-Plugin Pop3 {
- server1 'localhost'
- port1 110
- user1 'michael'
- password1 'secret'
-}
-
-
-Widget OS {
- class 'Text'
- expression '*** '.uname('sysname').' '.uname('release').' ***'
- width 20
- align 'M'
- speed 100
- update tick
-}
-
-Widget CPU {
- class 'Text'
- expression uname('machine')
- prefix 'CPU '
- width 9
- align 'L'
- update tick
-}
-
-
-Widget RAM {
- class 'Text'
- expression meminfo('MemTotal')/1024
- postfix ' MB RAM'
- width 11
- precision 0
- align 'R'
- update tick
-}
-
-Widget Busy {
- class 'Text'
- expression proc_stat::cpu('busy', 500)
- prefix 'Busy'
- postfix '%'
- width 8
- precision 1
- align 'R'
- update tick
-}
-
-Widget BusyBar {
- class 'Bar'
- expression proc_stat::cpu('busy', 500)
- expression2 proc_stat::cpu('system', 500)
- length 10
- direction 'E'
- update tack
-}
-
-Widget Load {
- class 'Text'
- expression loadavg(1)
- prefix 'Load'
- postfix loadavg(1)>1.0?'!':' '
- width 10
- precision 1
- align 'R'
- update tick
-}
-
-Widget LoadBar {
- class 'Bar'
- expression loadavg(1)
- max 2.0
- length 10
- direction 'E'
- update tack
-}
-
-
-Widget Disk {
- class 'Text'
- # disk.[rw]blk return blocks, we assume a blocksize of 512
- # to get the number in kB/s we would do blk*512/1024, which is blk/2
- # expression (proc_stat::disk('.*', 'rblk', 500)+proc_stat::disk('.*', 'wblk', 500))/2
- # with kernel 2.6, disk_io disappeared from /proc/stat but moved to /proc/diskstat
- # therefore you have to use another function called 'diskstats':
- expression diskstats('hd.', 'read_sectors', 500) + diskstats('hd.', 'write_sectors', 500)
- prefix 'disk'
- postfix ' '
- width 10
- precision 0
- align 'R'
- update tick
-}
-
-Widget DiskBar {
- class 'Bar'
- #expression proc_stat::disk('.*', 'rblk', 500)
- #expression2 proc_stat::disk('.*', 'wblk', 500)
- # for kernel 2.6:
- expression diskstats('hd.', 'read_sectors', 500)
- expression2 diskstats('hd.', 'write_sectors', 500)
- length 14
- direction 'E'
- update tack
-}
-
-Widget Eth0 {
- class 'Text'
- expression (netdev('eth0', 'Rx_bytes', 500)+netdev('eth0', 'Tx_bytes', 500))/1024
- prefix 'eth0'
- postfix ' '
- width 10
- precision 0
- align 'R'
- update tick
-}
-
-Widget Eth0Bar {
- class 'Bar'
- expression netdev('eth0', 'Rx_bytes', 500)
- expression2 netdev('eth0', 'Tx_bytes', 500)
- length 14
- direction 'E'
- update tack
-}
-
-Widget PPP {
- class 'Text'
- expression (ppp('Rx:0', 500)+ppp('Tx:0', 500))
- prefix 'PPP'
- width 9
- precision 0
- align 'R'
- update tick
-}
-
-Widget Temp {
- class 'Text'
- expression i2c_sensors('temp_input3')*1.0324-67
- prefix 'Temp'
- width 9
- precision 1
- align 'R'
- update tick
-}
-
-Widget TempBar {
- class 'Bar'
- expression i2c_sensors('temp_input3')*1.0324-67
- min 40
- max 80
- length 10
- direction 'E'
- update tack
-}
-
-Widget MySQLtest1 {
- class 'Text'
- expression MySQL::query('SELECT id FROM table1')
- width 20
- align 'R'
- prefix 'MySQL test:'
- update minute
-}
-
-Widget MySQLtest2 {
- class 'Text'
- expression MySQL::status()
- width 20
- align 'M'
- prefix 'Status: '
- update minute
-}
-
-Widget Uptime {
- class 'Text'
- expression uptime('%d days %H:%M:%S')
- width 20
- align 'R'
- prefix 'Up '
- update 1000
-}
-
-
-# debugging widgets
-
-Widget BarTest {
- class 'Bar'
- # test::bar(barno,maxval,startval,delta) - move a test value between 0 and max.
- # delta= step to change value by each time it's read.
- # barno - ten different test bar values can be set up, with barno=0..9
- # if delta=0, just returns the value of bar n instead of changing it.
- expression test::bar(0,30,25,1)
- expression2 test::bar(1,30,0,1)
- length 8
- # max 50
- direction 'E'
- update 10
-}
-
-Widget BarTestVal {
- class 'Text'
- expression test::bar(0,100,50,0)
- prefix 'Test '
- width 9
- update 200
-}
-
-Widget LightningTest {
- class 'icon'
- speed 500
- visible test::onoff(0)
- bitmap {
- row1 '...***'
- row2 '..***.'
- row3 '.***..'
- row4 '.****.'
- row5 '..**..'
- row6 '.**...'
- row7 '**....'
- row8 '*.....'
- }
-}
-
-
-# Icons
-
-Widget Heartbeat {
- class 'Icon'
- speed 800
- Bitmap {
- Row1 '.....|.....'
- Row2 '.*.*.|.*.*.'
- Row3 '*****|*.*.*'
- Row4 '*****|*...*'
- Row5 '.***.|.*.*.'
- Row6 '.***.|.*.*.'
- Row7 '..*..|..*..'
- Row8 '.....|.....'
- }
-}
-
-Widget EKG {
- class 'Icon'
- speed 50
- Bitmap {
- Row1 '.....|.....|.....|.....|.....|.....|.....|.....'
- Row2 '.....|....*|...*.|..*..|.*...|*....|.....|.....'
- Row3 '.....|....*|...*.|..*..|.*...|*....|.....|.....'
- Row4 '.....|....*|...**|..**.|.**..|**...|*....|.....'
- Row5 '.....|....*|...**|..**.|.**..|**...|*....|.....'
- Row6 '.....|....*|...*.|..*.*|.*.*.|*.*..|.*...|*....'
- Row7 '*****|*****|****.|***..|**..*|*..**|..***|.****'
- Row8 '.....|.....|.....|.....|.....|.....|.....|.....'
- }
-}
-Widget Karo {
- class 'Icon'
- speed 200
- Bitmap {
- Row1 '.....|.....|.....|.....|..*..|.....|.....|.....'
- Row2 '.....|.....|.....|..*..|.*.*.|..*..|.....|.....'
- Row3 '.....|.....|..*..|.*.*.|*...*|.*.*.|..*..|.....'
- Row4 '.....|..*..|.*.*.|*...*|.....|*...*|.*.*.|..*..'
- Row5 '.....|.....|..*..|.*.*.|*...*|.*.*.|..*..|.....'
- Row6 '.....|.....|.....|..*..|.*.*.|..*..|.....|.....'
- Row7 '.....|.....|.....|.....|..*..|.....|.....|.....'
- Row8 '.....|.....|.....|.....|.....|.....|.....|.....'
- }
-}
-Widget Heart {
- class 'Icon'
- speed 250
- Bitmap {
- Row1 '.....|.....|.....|.....|.....|.....'
- Row2 '.*.*.|.....|.*.*.|.....|.....|.....'
- Row3 '*****|.*.*.|*****|.*.*.|.*.*.|.*.*.'
- Row4 '*****|.***.|*****|.***.|.***.|.***.'
- Row5 '.***.|.***.|.***.|.***.|.***.|.***.'
- Row6 '.***.|..*..|.***.|..*..|..*..|..*..'
- Row7 '..*..|.....|..*..|.....|.....|.....'
- Row8 '.....|.....|.....|.....|.....|.....'
- }
-}
-Widget Blob {
- class 'Icon'
- speed 250
- Bitmap {
- Row1 '.....|.....|.....'
- Row2 '.....|.....|.***.'
- Row3 '.....|.***.|*...*'
- Row4 '..*..|.*.*.|*...*'
- Row5 '.....|.***.|*...*'
- Row6 '.....|.....|.***.'
- Row7 '.....|.....|.....'
- Row8 '.....|.....|.....'
- }
-}
-Widget Wave {
- class 'Icon'
- speed 100
- Bitmap {
- Row1 '..**.|.**..|**...|*....|.....|.....|.....|.....|....*|...**'
- Row2 '.*..*|*..*.|..*..|.*...|*....|.....|.....|....*|...*.|..*..'
- Row3 '*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...'
- Row4 '*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...'
- Row5 '*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...'
- Row6 '.....|.....|....*|...*.|..*..|.*..*|*..*.|..*..|.*...|*....'
- Row7 '.....|.....|.....|....*|...**|..**.|.**..|**...|*....|.....'
- Row8 '.....|.....|.....|.....|.....|.....|.....|.....|.....|.....'
- }
-}
-Widget Squirrel {
- class 'Icon'
- speed 100
- Bitmap {
- Row1 '.....|.....|.....|.....|.....|.....'
- Row2 '.....|.....|.....|.....|.....|.....'
- Row3 '.....|.....|.....|.....|.....|.....'
- Row4 '**...|.**..|..**.|...**|....*|.....'
- Row5 '*****|*****|*****|*****|*****|*****'
- Row6 '...**|..**.|.**..|**...|*....|.....'
- Row7 '.....|.....|.....|.....|.....|.....'
- Row8 '.....|.....|.....|.....|.....|.....'
- }
-}
-
-Widget Lightning {
- class 'icon'
- speed 100
- visible cpu('busy', 500)-50
- bitmap {
- row1 '...***'
- row2 '..***.'
- row3 '.***..'
- row4 '.****.'
- row5 '..**..'
- row6 '.**...'
- row7 '**....'
- row8 '*.....'
- }
-}
-
-Widget Rain {
- class 'icon'
- speed 200
- bitmap {
- row1 '...*.|.....|.....|.*...|....*|..*..|.....|*....'
- row2 '*....|...*.|.....|.....|.*...|....*|..*..|.....'
- row3 '.....|*....|...*.|.....|.....|.*...|....*|..*..'
- row4 '..*..|.....|*....|...*.|.....|.....|.*...|....*'
- row5 '....*|..*..|.....|*....|...*.|.....|.....|.*...'
- row6 '.*...|....*|..*..|.....|*....|...*.|.....|.....'
- row7 '.....|.*...|....*|..*..|.....|*....|...*.|.....'
- row8 '.....|.....|.*...|....*|..*..|.....|*....|...*.'
- }
-}
-
-Widget Test {
- class 'Text'
- expression '1234567890123456789012345678901234567890'
- #expression '|'
- width 40
-}
-
-Widget Armadeus {
- class 'Text'
- expression 'Armadeus Project'
- width 20
-}
-
-
-Layout L40x2 {
- Row1 {
- Col1 'Busy'
- Col10 'BusyBar'
- Col20 'Uptime'
- }
- Row2 {
- Col1 'Load'
- Col10 'LoadBar'
- Col21 'Armadeus
- }
-}
-
-Layout Test {
- Row01.Col1 'Test'
- Row02.Col1 'Test'
- Row03.Col1 'Test'
- Row04.Col1 'Test'
-}
-
-Layout testMySQL {
- Row1 {
- Col1 'MySQLtest1'
- }
- Row2 {
- Col1 'MySQLtest2'
- }
-}
-
-
-#
-# Specify here which diplay and layout should be used
-#
-Display 'HD44780-generic'
-Layout 'L40x2'
-
-
-Variables {
- tick 500
- tack 100
- minute 60000
-}
diff --git a/buildroot/package/lcd4linux/lcd4linux_armadeus.patch b/buildroot/package/lcd4linux/lcd4linux_armadeus.patch
deleted file mode 100644
index 4b103d3..0000000
--- a/buildroot/package/lcd4linux/lcd4linux_armadeus.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-diff -uprN lcd4linux-0.10.0/configure lcd4linux-0.10.0.armadeus/configure
---- lcd4linux-0.10.0/configure 2005-06-10 13:21:49.000000000 +0200
-+++ lcd4linux-0.10.0.armadeus/configure 2005-09-11 20:39:47.000000000 +0200
-@@ -7242,7 +7242,7 @@ for driver in $drivers; do
- picoLCD="yes"
- PNG="yes"
- PPM="yes"
-- ROUTERBOARD="yes"
-+ ROUTERBOARD="no"
- SAMPLE="yes"
- SERDISPLIB="yes"
- SIMPLELCD="yes"
-diff -uprN lcd4linux-0.10.0/drv_generic_parport.c lcd4linux-0.10.0.armadeus/drv_generic_parport.c
---- lcd4linux-0.10.0/drv_generic_parport.c 2005-05-08 06:32:44.000000000 +0200
-+++ lcd4linux-0.10.0.armadeus/drv_generic_parport.c 2005-09-11 20:46:27.000000000 +0200
-@@ -215,9 +215,8 @@ int drv_generic_parport_open(const char
- return -1;
- }
- } else
--#endif
--
- {
-+#else
- error("using raw port 0x%x (deprecated!)", Port);
- error("You *really* should change your setup and use ppdev!");
- if ((Port + 3) <= 0x3ff) {
-@@ -231,6 +230,7 @@ int drv_generic_parport_open(const char
- return -1;
- }
- }
-+#endif // WITH_PPDEV
- }
- return 0;
- }
-@@ -250,9 +250,9 @@ int drv_generic_parport_close(void)
- }
- free(PPdev);
- } else
--#endif
- {
- debug("closing raw port 0x%x", Port);
-+#else
- if ((Port + 3) <= 0x3ff) {
- if (ioperm(Port, 3, 0) != 0) {
- error("%s: ioperm(0x%x) failed: %s", Driver, Port, strerror(errno));
-@@ -264,6 +264,7 @@ int drv_generic_parport_close(void)
- return -1;
- }
- }
-+#endif // WITH_PPDEV
- }
-
- return 0;
-@@ -426,11 +427,12 @@ void drv_generic_parport_direction(const
- if (PPdev) {
- ioctl(PPfd, PPDATADIR, &direction);
- } else
--#endif
- {
-+#else
- /* code stolen from linux/parport_pc.h */
- ctr = (ctr & ~0x20) ^ (direction ? 0x20 : 0x00);
- outb(ctr, Port + 2);
-+#endif
- }
- }
-
-@@ -445,9 +447,10 @@ unsigned char drv_generic_parport_status
- if (PPdev) {
- ioctl(PPfd, PPRSTATUS, &data);
- } else
--#endif
- {
-+#else
- data = inb(Port + 1);
-+#endif
- }
-
- /* clear unused bits */
-@@ -476,11 +479,12 @@ void drv_generic_parport_control(const u
- frob.val = val;
- ioctl(PPfd, PPFCONTROL, &frob);
- } else
--#endif
- {
-+#else
- /* code stolen from linux/parport_pc.h */
- ctr = (ctr & ~mask) ^ val;
- outb(ctr, Port + 2);
-+#endif
- }
- }
-
-@@ -519,9 +523,10 @@ void drv_generic_parport_toggle(const un
- frob.val = value2;
- ioctl(PPfd, PPFCONTROL, &frob);
-
-- } else
--#endif
-+ }
-+ else
- {
-+#else
- /* rise */
- ctr = (ctr & ~bits) ^ value1;
- outb(ctr, Port + 2);
-@@ -532,6 +537,7 @@ void drv_generic_parport_toggle(const un
- /* lower */
- ctr = (ctr & ~bits) ^ value2;
- outb(ctr, Port + 2);
-+#endif
- }
- }
-
-@@ -541,11 +547,13 @@ void drv_generic_parport_data(const unsi
- #ifdef WITH_PPDEV
- if (PPdev) {
- ioctl(PPfd, PPWDATA, &data);
-- } else
--#endif
-+ }
-+#else
-+ else
- {
- outb(data, Port);
- }
-+#endif
- }
-
- unsigned char drv_generic_parport_read(void)
-@@ -555,11 +563,13 @@ unsigned char drv_generic_parport_read(v
- #ifdef WITH_PPDEV
- if (PPdev) {
- ioctl(PPfd, PPRDATA, &data);
-- } else
--#endif
-- {
-+ }
-+#else
-+ else {
- data = inb(Port);
- }
-+#endif // WITH_PPDEV
-+
- return data;
- }
-
-@@ -571,11 +581,12 @@ void drv_generic_parport_debug(void)
- #ifdef WITH_PPDEV
- if (PPdev) {
- ioctl(PPfd, PPRCONTROL, &control);
-- } else
--#endif
-- {
-+ }
-+#else
-+ else {
- control = ctr;
- }
-+#endif // WITH_PPDEV
-
- debug("%cSTROBE %cAUTOFD %cINIT %cSLCTIN",
- control & PARPORT_CONTROL_STROBE ? '-' : '+',
-diff -uprN lcd4linux-0.10.0/stamp-h lcd4linux-0.10.0.armadeus/stamp-h
---- lcd4linux-0.10.0/stamp-h 1970-01-01 01:00:00.000000000 +0100
-+++ lcd4linux-0.10.0.armadeus/stamp-h 2005-09-11 20:40:06.000000000 +0200
-@@ -0,0 +1 @@
-+timestamp
-diff -uprN lcd4linux-0.10.0/udelay.c lcd4linux-0.10.0.armadeus/udelay.c
---- lcd4linux-0.10.0/udelay.c 2005-05-08 06:32:45.000000000 +0200
-+++ lcd4linux-0.10.0.armadeus/udelay.c 2005-09-11 19:59:42.000000000 +0200
-@@ -133,6 +133,7 @@
- #include <stdlib.h>
- #include <stdio.h>
-
-+#undef USE_OLD_UDELAY // otherwise x86 asm code is used
-
- #ifdef USE_OLD_UDELAY
-
-
-
diff --git a/buildroot/package/mesa/Config.in b/buildroot/package/mesa/Config.in
deleted file mode 100644
index c200963..0000000
--- a/buildroot/package/mesa/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_MESALIB
- bool "Mesa library"
- default n
- select BR2_PACKAGE_GPM
- help
- Build MesaGL. It allows you to use OpenGL on your Armadeus board.
-
diff --git a/buildroot/package/mesa/mesa.mk b/buildroot/package/mesa/mesa.mk
deleted file mode 100644
index 9931f21..0000000
--- a/buildroot/package/mesa/mesa.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#############################################################
-#
-# Mesa
-#
-#############################################################
-
-MESALIB_VER:=7.0
-MESALIB_SOURCE:=MesaLib-$(MESALIB_VER).tar.bz2
-MESALIB_DEMOS:=MesaDemos-$(MESALIB_VER).tar.bz2
-MESAGLUT_SOURCE:=MesaGLUT-$(MESALIB_VER).tar.bz2
-MESALIB_SITE:=http://downloads.sourceforge.net/mesa3d
-MESALIB_DIR:=$(BUILD_DIR)/Mesa-$(MESALIB_VER)
-MESALIB_CAT:=bzcat
-MESALIB_PATCH:=mesa.patch
-
-
-$(DL_DIR)/$(MESALIB_SOURCE):
- $(WGET) -P $(DL_DIR) $(MESALIB_SITE)/$(MESALIB_SOURCE)
-
-$(DL_DIR)/$(MESALIB_DEMOS):
- $(WGET) -P $(DL_DIR) $(MESALIB_SITE)/$(MESALIB_DEMOS)
-
-$(DL_DIR)/$(MESAGLUT_SOURCE):
- $(WGET) -P $(DL_DIR) $(MESALIB_SITE)/$(MESAGLUT_SOURCE)
-
-mesa-source: $(DL_DIR)/$(MESALIB_SOURCE) $(DL_DIR)/$(MESALIB_DEMOS)
-
-$(MESALIB_DIR)/.unpacked: $(DL_DIR)/$(MESALIB_SOURCE) $(DL_DIR)/$(MESALIB_DEMOS) $(DL_DIR)/$(MESAGLUT_SOURCE)
- $(MESALIB_CAT) $(DL_DIR)/$(MESALIB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(MESALIB_CAT) $(DL_DIR)/$(MESALIB_DEMOS) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(MESALIB_CAT) $(DL_DIR)/$(MESAGLUT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $@
-
-$(MESALIB_DIR)/.patched: $(MESALIB_DIR)/.unpacked
- toolchain/patch-kernel.sh $(MESALIB_DIR) package/mesa $(MESALIB_PATCH)
- touch $@
-
-$(MESALIB_DIR)/.configured: $(MESALIB_DIR)/.patched
- touch $@
-
-$(MESALIB_DIR)/.compiled: $(MESALIB_DIR)/.configured
- (cd $(MESALIB_DIR); \
- $(MAKE) realclean; \
- $(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CXX) linux-fbdev \
- );
-#arm-linux-osmesa
- touch $@
-
-$(TARGET_DIR)/usr/lib/libGL.so.7.1.0: $(MESALIB_DIR)/.compiled
- mkdir -p $(TARGET_DIR)/usr/lib/
- cp -a $(MESALIB_DIR)/lib/* $(TARGET_DIR)/usr/lib/
- touch $@
-
-
-MESA mesa: gpm $(TARGET_DIR)/usr/lib/libGL.so.7.1.0
-
-mesa-clean:
- $(MAKE) CC=$(TARGET_CC) clean -C $(MESALIB_DIR)
-
-mesa-dirclean:
- rm -rf $(MESALIB_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_MESALIB)),y)
-TARGETS+=mesa
-endif
diff --git a/buildroot/package/mesa/mesa.patch b/buildroot/package/mesa/mesa.patch
deleted file mode 100644
index aea2fc8..0000000
--- a/buildroot/package/mesa/mesa.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-diff -bruN Mesa-7.0.orig/configs/arm-linux-osmesa Mesa-7.0/configs/arm-linux-osmesa
---- Mesa-7.0.orig/configs/arm-linux-osmesa 1970-01-01 01:00:00.000000000 +0100
-+++ Mesa-7.0/configs/arm-linux-osmesa 2007-06-26 23:00:52.000000000 +0200
-@@ -0,0 +1,25 @@
-+# Configuration for building only libOSMesa on Linux, no Xlib driver
-+# This doesn't really have any Linux dependencies, so it should be usable
-+# on other (gcc-based) systems.
-+
-+include $(TOP)/configs/default
-+
-+CONFIG_NAME = arm-linux-osmesa
-+
-+# Compiler and flags
-+CC = gcc
-+CXX = g++
-+CFLAGS = -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
-+CXXFLAGS = -O3 -ansi -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-+
-+
-+# Directories
-+SRC_DIRS = mesa
-+DRIVER_DIRS = osmesa
-+PROGRAM_DIRS = osdemos
-+
-+
-+# Dependencies
-+OSMESA_LIB_DEPS = -lm -lpthread
-+GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
-+APP_LIB_DEPS = -lOSMesa
-diff -bruN Mesa-7.0.orig/Makefile Mesa-7.0/Makefile
---- Mesa-7.0.orig/Makefile 2007-06-22 00:14:38.000000000 +0200
-+++ Mesa-7.0/Makefile 2007-06-26 22:31:34.000000000 +0200
-@@ -111,6 +111,7 @@
- linux-ia64-icc-static \
- linux-icc \
- linux-icc-static \
-+arm-linux-osmesa \
- linux-osmesa \
- linux-osmesa16 \
- linux-osmesa16-static \
-diff -bruN Mesa-7.0.orig/progs/osdemos/osdemo.c Mesa-7.0/progs/osdemos/osdemo.c
---- Mesa-7.0.orig/progs/osdemos/osdemo.c 2007-06-26 23:05:40.000000000 +0200
-+++ Mesa-7.0/progs/osdemos/osdemo.c 2007-06-26 22:44:58.000000000 +0200
-@@ -22,7 +22,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include "GL/osmesa.h"
--#include "GL/glu.h"
-+/*#include "GL/glu.h"*/
-
-
- #define SAVE_TARGA
-@@ -30,7 +30,7 @@
- static int Width = 400;
- static int Height = 400;
-
--
-+/*
- static void
- Sphere(float radius, int slices, int stacks)
- {
-@@ -50,7 +50,7 @@
- gluCylinder(q, base, 0.0, height, slices, stacks);
- gluDeleteQuadric(q);
- }
--
-+*/
-
- static void
- Torus(float innerRadius, float outerRadius, int sides, int rings)
-@@ -131,7 +131,7 @@
- Torus(0.275, 0.85, 20, 20);
- glPopMatrix();
-
-- glPushMatrix();
-+/* glPushMatrix();
- glTranslatef(-0.75, -0.5, 0.0);
- glRotatef(270.0, 1.0, 0.0, 0.0);
- glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, green_mat );
-@@ -143,7 +143,7 @@
- glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, blue_mat );
- Sphere(1.0, 20, 20);
- glPopMatrix();
--
-+*/
- glPopMatrix();
-
- /* This is very important!!!
-diff -bruN Mesa-7.0.orig/progs/osdemos/ostest1.c Mesa-7.0/progs/osdemos/ostest1.c
---- Mesa-7.0.orig/progs/osdemos/ostest1.c 2007-06-26 23:05:40.000000000 +0200
-+++ Mesa-7.0/progs/osdemos/ostest1.c 2007-06-26 22:47:58.000000000 +0200
-@@ -14,7 +14,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include "GL/osmesa.h"
--#include "GL/glu.h"
-+/*#include "GL/glu.h"*/
-
-
- #define WIDTH 600
-@@ -23,7 +23,7 @@
- static GLboolean WriteFiles = GL_FALSE;
- static GLboolean Gradient = GL_FALSE;
-
--
-+/*
- static void
- Sphere(float radius, int slices, int stacks)
- {
-@@ -43,7 +43,7 @@
- gluCylinder(q, base, 0.0, height, slices, stacks);
- gluDeleteQuadric(q);
- }
--
-+*/
-
- static void
- Torus(float innerRadius, float outerRadius, int sides, int rings)
-@@ -225,7 +225,7 @@
- glMaterialfv( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, red_mat );
- Torus(0.275, 0.85, 20, 20);
- glPopMatrix();
--
-+/*
- glPushMatrix();
- glTranslatef(-1.5, -0.5, 0.0);
- glRotatef(270.0, 1.0, 0.0, 0.0);
-@@ -241,7 +241,7 @@
- Sphere(1.2, 20, 20);
- glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
- glPopMatrix();
--
-+*/
- #if 0
- glPushMatrix();
- glTranslatef(0.75, 0.0, 1.3);
-diff -bruN Mesa-7.0.orig/src/mesa/Makefile Mesa-7.0/src/mesa/Makefile
---- Mesa-7.0.orig/src/mesa/Makefile 2007-06-22 00:10:54.000000000 +0200
-+++ Mesa-7.0/src/mesa/Makefile 2007-06-26 22:31:34.000000000 +0200
-@@ -107,7 +107,7 @@
-
- stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
-
--osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
-+osmesa-only: depend $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
-
- # Make the GL library
- $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
-@@ -139,13 +139,13 @@
- depend: $(ALL_SOURCES)
- @ echo "running $(MKDEP)"
- @ touch depend
-- @$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
-- > /dev/null 2>/dev/null
-+ @$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) #\
-+ #> /dev/null 2>/dev/null
-
-
--subdirs:
-- @ (cd x86 ; $(MAKE))
-- @ (cd x86-64 ; $(MAKE))
-+#subdirs:
-+# @ (cd x86 ; $(MAKE))
-+# @ (cd x86-64 ; $(MAKE))
-
-
- install: default
---- Mesa-7.0.org/configs/linux-fbdev 2007-06-22 00:10:53.000000000 +0200
-+++ Mesa-7.0/configs/linux-fbdev 2007-06-29 19:13:04.000000000 +0200
-@@ -4,13 +4,14 @@
-
- CONFIG_NAME = linux-fbdev
-
--CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER
-+CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER -I$(TOP)/../staging_dir/usr/include -I$(TOP)/../staging_dir/include
-
- SRC_DIRS = mesa glu glut/fbdev
- DRIVER_DIRS = fbdev osmesa
--PROGRAM_DIRS = fbdev demos redbook samples
-+PROGRAM_DIRS = fbdev demos osdemos redbook samples
-
- GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread
--OSMESA_LIB_DEPS = -lm -lpthread
--GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm
-+OSMESA_LIB_DEPS = -lm -lpthread -L$(TOP)/../staging_dir/usr/lib
-+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/../staging_dir/usr/lib -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm
-+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L$(TOP)/../staging_dir/usr/lib -l$(GLU_LIB) -l$(GL_LIB) -l$(GLUT_LIB) $(EXTRA_LIB_PATH) -lgpm -lm -lstdc++
-
diff --git a/buildroot/package/pymysql/Config.in b/buildroot/package/pymysql/Config.in
deleted file mode 100644
index 7d2f461..0000000
--- a/buildroot/package/pymysql/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_PYMYSQL
- depends on BR2_PACKAGE_PYTHON
- bool "MySQL support for Python"
- help
- MySQLdb is an thread-compatible interface to the popular MySQL
- database server that provides the Python database API.
-
- http://sourceforge.net/projects/mysql-python
-
diff --git a/buildroot/package/pymysql/patches/000-setup.patch b/buildroot/package/pymysql/patches/000-setup.patch
deleted file mode 100644
index e04e2f9..0000000
--- a/buildroot/package/pymysql/patches/000-setup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- MySQL-python-1.2.2/setup.py 2007-02-25 04:37:12.000000000 +0100
-+++ MySQL-python-1.2.2/setup.py 2007-08-15 12:23:18.000000000 +0200
-@@ -2,8 +2,7 @@
-
- import os
- import sys
--import ez_setup; ez_setup.use_setuptools()
--from setuptools import setup, Extension
-+from distutils.core import setup, Extension
-
- if sys.version_info < (2, 3):
- raise Error, "Python-2.3 or newer is required"
diff --git a/buildroot/package/pymysql/patches/010-threadsafe.patch b/buildroot/package/pymysql/patches/010-threadsafe.patch
deleted file mode 100644
index bcd9af8..0000000
--- a/buildroot/package/pymysql/patches/010-threadsafe.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- MySQL-python-1.2.2/site_orig.cfg 2007-08-15 12:58:40.000000000 +0200
-+++ MySQL-python-1.2.2/site.cfg 2007-08-15 12:58:49.000000000 +0200
-@@ -4,7 +4,7 @@
- # static: link against a static library (probably required for embedded)
-
- embedded = False
--threadsafe = True
-+threadsafe = False
- static = False
-
- # The path to mysql_config.
diff --git a/buildroot/package/pymysql/pymysql.mk b/buildroot/package/pymysql/pymysql.mk
deleted file mode 100644
index fa5ccd4..0000000
--- a/buildroot/package/pymysql/pymysql.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#############################################################
-#
-# python
-#
-#############################################################
-PYMYSQL_VERSION=1.2.2
-PYMYSQL_SOURCE:=MySQL-python-$(PYMYSQL_VERSION).tar.gz
-PYMYSQL_SITE:=http://python.org/ftp/python/$(PYMYSQL_VERSION)
-PYMYSQL_DIR:=$(BUILD_DIR)/MySQL-python-$(PYMYSQL_VERSION)
-PYMYSQL_CAT:=$(ZCAT)
-PYMYSQL_BINARY:=_mysql.so
-PYMYSQL_TARGET_BINARY:=usr/bin/python
-PYMYSQL_DEPS:=mysql_client
-TARGET_PYTHON_PACKAGE_DIR:=usr/lib/python2.4/site-packages
-PYMYSQL_SITE_PACKAGE_DIR=$(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)
-#HOST_PYTHON:=$(BUILD_DIR)/Python-2.4.5/hostpython
-HOST_PYTHON=python2.4
-
-
-$(DL_DIR)/$(PYMYSQL_SOURCE):
- $(WGET) -P $(DL_DIR) $(PYMYSQL_SITE)/$(PYMYSQL_SOURCE)
-
-pymysql-source: $(DL_DIR)/$(PYMYSQL_SOURCE)
-
-$(PYMYSQL_DIR)/.unpacked: $(DL_DIR)/$(PYMYSQL_SOURCE)
- $(PYMYSQL_CAT) $(DL_DIR)/$(PYMYSQL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $@
-
-$(PYMYSQL_DIR)/.patched: $(PYMYSQL_DIR)/.unpacked
- toolchain/patch-kernel.sh $(PYMYSQL_DIR) package/pymysql/patches/ \*.patch
- touch $@
-
-$(PYMYSQL_DIR)/.configured: $(PYMYSQL_DIR)/.patched
- (cd $(PYMYSQL_DIR); \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDSHARED="$(TARGET_CROSS)gcc -shared" \
- $(HOST_PYTHON) setup.py build );
- touch $@
-
-$(PYMYSQL_DIR)/.installed: $(PYMYSQL_DIR)/.configured
- mkdir -p $(STAGING_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)
- (cd $(PYMYSQL_DIR); \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- LDSHARED="$(TARGET_CROSS)gcc -shared" \
- $(HOST_PYTHON) setup.py install --prefix=$(STAGING_DIR)/usr );
- touch $@
-
-$(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/$(PYMYSQL_BINARY): $(PYMYSQL_DIR)/.installed
- mkdir -p $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)
- (cd $(STAGING_DIR)/$(TARGET_PYTHON_PACKAGE_DIR); \
- cp -f _mysql.so $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/; \
- cp -f _mysql_exceptions.py* $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/; \
- cp -Rdpf MySQLdb $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/ );
- touch $@
-
-pymysql: uclibc $(PYMYSQL_DEPS) $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/$(PYMYSQL_BINARY)
-
-pymysql-clean:
- -$(MAKE) -C $(PYMYSQL_DIR) distclean
- rm -rf $(PYMYSQL_DIR)/.configured $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/MySQLdb
- rm -f $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/_mysql.so
- rm -f $(TARGET_DIR)/$(TARGET_PYTHON_PACKAGE_DIR)/_mysql_exceptions.py
-
-pymysql-dirclean:
- rm -rf $(PYMYSQL_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_PYMYSQL)),y)
-TARGETS+=pymysql
-endif
diff --git a/buildroot/package/pyserial/Config.in b/buildroot/package/pyserial/Config.in
deleted file mode 100644
index 38ccfca..0000000
--- a/buildroot/package/pyserial/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_PYSERIAL
- bool "pyserial"
- depends on BR2_PACKAGE_PYTHON
- default n
- help
- Installs the python pyserial extension
diff --git a/buildroot/package/pyserial/pyserial.mk b/buildroot/package/pyserial/pyserial.mk
deleted file mode 100644
index 5c66284..0000000
--- a/buildroot/package/pyserial/pyserial.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-PYSERIAL_VERSION=2.2
-PYSERIAL_BINARY=pyserial
-PYSERIAL_SOURCE=$(PYSERIAL_BINARY)-$(PYSERIAL_VERSION).zip
-PYSERIAL_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/pyserial
-PYSERIAL_DIR=$(BUILD_DIR)/$(PYSERIAL_BINARY)-$(PYSERIAL_VERSION)
-PYSERIAL_SITE_PKG=$(TARGET_DIR)/usr/lib/python2.4/site-packages/serial
-
-$(DL_DIR)/$(PYSERIAL_SOURCE):
- $(WGET) -P $(DL_DIR) $(PYSERIAL_SITE)/$(PYSERIAL_SOURCE)
-
-$(PYSERIAL_DIR)/.source: $(DL_DIR)/$(PYSERIAL_SOURCE)
- unzip -o $(DL_DIR)/$(PYSERIAL_SOURCE) -d $(BUILD_DIR)
- touch $(PYSERIAL_DIR)/.source
-
-$(PYSERIAL_DIR)/.configured: $(PYSERIAL_DIR)/.source
- touch $(PYSERIAL_DIR)/.configured
-
-$(PYSERIAL_BINARY): python $(PYSERIAL_DIR)/.configured
- mkdir -p $(PYSERIAL_SITE_PKG)
- cp -R $(PYSERIAL_DIR)/serial/* $(PYSERIAL_SITE_PKG)
-
-$(PYSERIAL_BINARY)-source: $(DL_DIR)/$(PYSERIAL_SOURCE)
-
-$(PYSERIAL_BINARY)-clean:
- rm -rf $(PYSERIAL_SITE_PKG)
-
-$(PYSERIAL_BINARY)-dirclean:
- rm -rf $(PYSERIAL_DIR)
-
-ifeq ($(strip $(BR2_PACKAGE_PYSERIAL)),y)
-TARGETS+=$(PYSERIAL_BINARY)
-endif
diff --git a/buildroot/package/sdlwater/Config.in b/buildroot/package/sdlwater/Config.in
deleted file mode 100644
index cc2ffba..0000000
--- a/buildroot/package/sdlwater/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-
-config BR2_PACKAGE_SDL_WATER
- bool "SDL_water"
- select BR2_PACKAGE_SDL
- default n
- help
-
- Water effect demo coded with SDL
-
- http://www.libsdl.org/projects/SDL_water/
diff --git a/buildroot/package/sdlwater/sdl_water.mk b/buildroot/package/sdlwater/sdl_water.mk
deleted file mode 100644
index f09be22..0000000
--- a/buildroot/package/sdlwater/sdl_water.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#############################################################
-#
-# SDL Water Demo
-#
-#############################################################
-SDL_WATER_VERSION:=1.0
-SDL_WATER_SOURCE:=water-$(SDL_WATER_VERSION).tar.gz
-SDL_WATER_SITE:=http://www.libsdl.org/projects/water/src/
-SDL_WATER_CAT:=$(ZCAT)
-SDL_WATER_DIR:=$(BUILD_DIR)/water-$(SDL_WATER_VERSION)
-SDL_WATER_TARGET_DATA_DIR:=$(TARGET_DIR)/usr/share/images/
-
-$(DL_DIR)/$(SDL_WATER_SOURCE):
- $(WGET) -P $(DL_DIR) $(SDL_WATER_SITE)/$(SDL_WATER_SOURCE)
-
-sdl-water-source: $(DL_DIR)/$(SDL_WATER_SOURCE)
-
-$(SDL_WATER_DIR)/.unpacked: $(DL_DIR)/$(SDL_WATER_SOURCE)
- $(SDL_WATER_CAT) $(DL_DIR)/$(SDL_WATER_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $@
-
-$(SDL_WATER_DIR)/.configured: $(SDL_WATER_DIR)/.unpacked
- (cd $(SDL_WATER_DIR); \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS) " \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=$(STAGING_DIR)/usr \
- --with-sdl-exec-prefix=$(STAGING_DIR)/usr/ \
- --disable-video-x11 );
- touch $@
-
-$(SDL_WATER_DIR)/water: $(SDL_WATER_DIR)/.configured
- $(MAKE) -C $(SDL_WATER_DIR)
-
-$(STAGING_DIR)/usr/bin/water: $(SDL_WATER_DIR)/water
- $(MAKE) -C $(SDL_WATER_DIR) install
- touch -c $@
-
-$(TARGET_DIR)/usr/bin/water: $(STAGING_DIR)/usr/bin/water
- mkdir -p $(SDL_WATER_TARGET_DATA_DIR)
- cp -dpf $(SDL_WATER_DIR)/water320.bmp $(SDL_WATER_TARGET_DATA_DIR)/
- cp -dpf $< $(TARGET_DIR)/usr/bin/
- -$(STRIPCMD) $@
-
-SDL-WATER sdl-water: uclibc sdl $(TARGET_DIR)/usr/bin/water
-
-sdl-water-clean:
- $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SDL_WATER_DIR) uninstall
- rm $(SDL_WATER_TARGET_DATA_DIR)/water320.bmp
- -$(MAKE) -C $(SDL_WATER_DIR) clean
-
-sdl-water-dirclean:
- rm -rf $(SDL_WATER_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_SDL_WATER)),y)
-TARGETS+=sdl-water
-endif
diff --git a/buildroot/package/snes9x/Config.in b/buildroot/package/snes9x/Config.in
deleted file mode 100644
index 1d2bcd7..0000000
--- a/buildroot/package/snes9x/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config BR2_PACKAGE_SNES9X
- bool "Snes9X"
- select BR2_PACKAGE_SDL
- default n
- help
-
- Snes9x is a portable, freeware Super Nintendo Entertainment System
- (SNES) emulator. It basically allows you to play most games designed
- for the SNES and Super Famicom Nintendo game systems on your PC or
- Workstation; which includes some real gems that were only ever
- released in Japan.
-
- http://www.snes9x.com/
diff --git a/buildroot/package/snes9x/snes9x-1.39-compile.patch b/buildroot/package/snes9x/snes9x-1.39-compile.patch
deleted file mode 100644
index aa8dcd1..0000000
--- a/buildroot/package/snes9x/snes9x-1.39-compile.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- snes9x-sdl-1.39/unix/svga.cpp~compile
-+++ snes9x-sdl-1.39/unix/svga.cpp
-@@ -48,7 +48,7 @@
- #include <stdlib.h>
- #include <signal.h>
-
--#include "sdl.h"
-+#include <SDL.h>
-
- #include "snes9x.h"
- #include "memmap.h"
---- snes9x-sdl-1.39/unix/unix.cpp~compile
-+++ snes9x-sdl-1.39/unix/unix.cpp
-@@ -50,7 +50,7 @@
- #include <sys/types.h>
- #include <ctype.h>
- #include <dirent.h>
--#include <sdl.h>
-+#include <SDL.h>
- #include "keydef.h"
-
- #undef USE_THREADS
-@@ -189,8 +189,7 @@
- }
-
- /*#include "cheats.h"*/
--extern "C"
--int SDL_main (int argc, char **argv)
-+int main (int argc, char **argv)
- {
- if (argc < 2)
- S9xUsage ();
---- /dev/null
-+++ snes9x-sdl-1.39/unzip/unzipP.h
-@@ -0,0 +1,124 @@
-+#ifndef _UNZIPP_H_
-+#define _UNZIPP_H_
-+
-+#include "unzip.h"
-+
-+#ifndef local
-+#define local static
-+#endif
-+/* compile with -Dlocal if your debugger can't find static symbols */
-+
-+
-+
-+#if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES) && \
-+ !defined(CASESENSITIVITYDEFAULT_NO)
-+#define CASESENSITIVITYDEFAULT_NO
-+#endif
-+
-+
-+#ifndef UNZ_BUFSIZE
-+#define UNZ_BUFSIZE (16384)
-+#endif
-+
-+#ifndef UNZ_MAXFILENAMEINZIP
-+#define UNZ_MAXFILENAMEINZIP (256)
-+#endif
-+
-+#ifndef ALLOC
-+#define ALLOC(size) (malloc(size))
-+#endif
-+#ifndef TRYFREE
-+#define TRYFREE(p) {if (p) free(p);}
-+#endif
-+
-+#define SIZECENTRALDIRITEM (0x2e)
-+#define SIZEZIPLOCALHEADER (0x1e)
-+
-+
-+/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-+
-+#ifndef SEEK_CUR
-+#define SEEK_CUR 1
-+#endif
-+
-+#ifndef SEEK_END
-+#define SEEK_END 2
-+#endif
-+
-+#ifndef SEEK_SET
-+#define SEEK_SET 0
-+#endif
-+
-+/* unz_file_info_interntal contain internal info about a file in zipfile */
-+typedef struct unz_file_info_internal_s
-+{
-+ uLong offset_curfile; /* relative offset of local header 4
-+ * bytes */
-+} unz_file_info_internal;
-+
-+
-+/*
-+ * file_in_zip_read_info_s contain internal information about a file in
-+ * zipfile, when reading and decompress it
-+ */
-+typedef struct
-+{
-+ char *read_buffer;/* internal buffer for compressed data */
-+ z_stream stream; /* zLib stream structure for inflate */
-+
-+ uLong pos_in_zipfile; /* position in byte on the zipfile,
-+ * for fseek */
-+ uLong stream_initialised; /* flag set if stream structure is
-+ * initialised */
-+
-+ uLong offset_local_extrafield; /* offset of the local extra
-+ * field */
-+ uInt size_local_extrafield; /* size of the local extra
-+ * field */
-+ uLong pos_local_extrafield; /* position in the local
-+ * extra field in read */
-+
-+ uLong crc32; /* crc32 of all data uncompressed */
-+ uLong crc32_wait; /* crc32 we must obtain after decompress all */
-+ uLong rest_read_compressed; /* number of byte to be
-+ * decompressed */
-+ uLong rest_read_uncompressed; /* number of byte to be
-+ * obtained after decomp */
-+ FILE *file; /* io structore of the zipfile */
-+ uLong compression_method; /* compression method (0==store) */
-+ uLong byte_before_the_zipfile; /* byte before the zipfile,
-+ * (>0 for sfx) */
-+} file_in_zip_read_info_s;
-+
-+
-+/*
-+ * unz_s contain internal information about the zipfile
-+ */
-+typedef struct
-+{
-+ FILE *file; /* io structore of the zipfile */
-+ unz_global_info gi; /* public global information */
-+ uLong byte_before_the_zipfile; /* byte before the zipfile,
-+ * (>0 for sfx) */
-+ uLong num_file; /* number of the current file in the zipfile */
-+ uLong pos_in_central_dir; /* pos of the current file in the
-+ * central dir */
-+ uLong current_file_ok; /* flag about the usability of the
-+ * current file */
-+ uLong central_pos;/* position of the beginning of the central
-+ * dir */
-+
-+ uLong size_central_dir; /* size of the central directory */
-+ uLong offset_central_dir; /* offset of start of central
-+ * directory with respect to the
-+ * starting disk number */
-+
-+ unz_file_info cur_file_info; /* public info about the current file
-+ * in zip */
-+ unz_file_info_internal cur_file_info_internal; /* private info about it */
-+ file_in_zip_read_info_s *pfile_in_zip_read; /* structure about the
-+ * current file if we are
-+ * decompressing it */
-+} unz_s;
-+
-+#endif
---- snes9x-sdl-1.39/Makefile~compile
-+++ snes9x-sdl-1.39/Makefile
-@@ -53,12 +53,12 @@
-
- ifdef THREAD_SOUND
- CPUDEFINES += -DUSE_THREADS
--EXTRALIBS += -lpthread -L/usr/local/lib -lcygipc
-+EXTRALIBS += -lpthread -lcygipc
- endif
-
- ifdef GLIDE
- GLIDEOBJS = unix/glide.o
--GLIDEDEFINES = -DUSE_GLIDE -I/usr/include/glide
-+GLIDEDEFINES = -DUSE_GLIDE
- GLIDELIBS = -lglide2x
- GLIDEDEPENDS=use_glide
- GLIDENO_DEPENDS=no_glide
-@@ -82,14 +82,12 @@
- CC = gcc
- NASM = nasm
-
--INCLUDES=-I/usr/local/include
-+INCLUDES=
-
--OPTIMISE= -D_ZAURUS -Os -ffast-math -fstrict-aliasing -fomit-frame-pointer -mcpu=strongarm1100 -mtune=strongarm1100
-+OPTIMISE= -D_ZAURUS -Os -ffast-math -fstrict-aliasing -fomit-frame-pointer
- CCFLAGS = $(OPTIMISE) \
---I/opt/Qtopia/include/SDL \
- -I. \
- -Iunzip \
---Isdl \
- -D__linux \
- -DZLIB \
- -DVAR_CYCLES \
-@@ -114,7 +112,7 @@
-
- .SUFFIXES: .o .cpp .c .cc .h .m .i .S .asm .obj
-
--LDLIBS = -L/opt/Qtopia/sharp/lib
-+LDLIBS=
-
- ifdef GLIDE
- all: offsets gsnes9x
-@@ -146,7 +144,7 @@
- $(RM) $(OPENGLNO_DEPENDS)
-
- snes9x: $(OBJECTS)
-- $(CCC) $(INCLUDES) -o $@ $(OBJECTS) $(EXTRALIBS) -L/opt/QtPalmtop/lib/ -lSDL -lSDLmain $(LDLIBS) -lqpe -lqte -lpthread
-+ $(CC) $(INCLUDES) -o $@ $(OBJECTS) $(EXTRALIBS) $(LDLIBS) -lz -lpthread
-
- gsnes9x: $(OBJECTS) unix/x11.o unix/glide.o
- $(CCC) $(INCLUDES) -o $@ $(OBJECTS) unix/x11.o unix/glide.o $(LDLIBS) $(GLIDELIBS) -lXext -lX11 -lXxf86dga -lXxf86vm $(EXTRALIBS) -lz -lm
---- snes9x-sdl-1.39/snapshot.cpp~compile
-+++ snes9x-sdl-1.39/snapshot.cpp
-@@ -671,7 +671,7 @@
- fields [i].type);
- }
-
-- uint8 *block = new uint8 [len];
-+ uint8 *block = (uint8*) malloc(len);
- uint8 *ptr = block;
- uint16 word;
- uint32 dword;
-@@ -739,7 +739,7 @@
- }
-
- FreezeBlock (stream, name, block, len);
-- delete block;
-+ free(block);
- }
-
- void FreezeBlock (STREAM stream, char *name, uint8 *block, int size)
-@@ -767,7 +767,7 @@
- fields [i].type);
- }
-
-- uint8 *block = new uint8 [len];
-+ uint8 *block = (uint8*) malloc(len);
- uint8 *ptr = block;
- uint16 word;
- uint32 dword;
-@@ -776,7 +776,7 @@
-
- if ((result = UnfreezeBlock (stream, name, block, len)) != SUCCESS)
- {
-- delete block;
-+ free(block);
- return (result);
- }
-
-@@ -841,7 +841,7 @@
- }
- }
-
-- delete block;
-+ free(block);
- return (result);
- }
-
-@@ -865,9 +865,9 @@
-
- if (rem)
- {
-- char *junk = new char [rem];
-+ char *junk = (char*) malloc(rem);
- READ_STREAM (junk, rem, stream);
-- delete junk;
-+ free(junk);
- }
-
- return (SUCCESS);
---- snes9x-sdl-1.39/globals.cpp 2003-10-27 09:42:22.000000000 +0100
-+++ snes9x-sdl-1.39.mod/globals.cpp 2009-12-09 10:33:53.000000000 +0100
-@@ -54,6 +54,8 @@
- #include "sa1.h"
- //#include "netplay.h"
-
-+struct SDSP1 DSP1;
-+
- START_EXTERN_C
- char String[513];
-
-@@ -73,8 +75,6 @@
-
- struct SSettings Settings;
-
--struct SDSP1 DSP1;
--
- struct SRegisters SA1Registers;
- //struct SSA1Registers SA1Registers;
-
diff --git a/buildroot/package/snes9x/snes9x.mk b/buildroot/package/snes9x/snes9x.mk
deleted file mode 100644
index 5a1703d..0000000
--- a/buildroot/package/snes9x/snes9x.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#############################################################
-#
-# SNES9X SNES emulator
-#
-#############################################################
-SNES9X_VERSION:=1.39
-SNES9X_SOURCE:=snes9x-sdl-$(SNES9X_VERSION).tar.bz2
-SNES9X_SITE:=http://www.vanille.de/mirror/
-# roms: http://rtgamer.free.fr/index.php?pg=2&rub=sn
-SNES9X_CAT:=bzcat
-SNES9X_DIR:=$(BUILD_DIR)/snes9x-sdl-$(SNES9X_VERSION)
-SNES9X_TARGET_BIN:=/usr/local/bin/snes9x
-
-#SNES9X_VERSION:=1.43
-#SNES9X_SOURCE:=snes9x-$(SNES9X_VERSION)-src.tar.gz
-#SNES9X_SITE:=http://vincent.grigorieff.free.fr/snes9x/
-#SNES9X_CAT:=$(ZCAT)
-#SNES9X_DIR:=$(BUILD_DIR)/snes9x-$(SNES9X_VERSION)-src
-
-$(DL_DIR)/$(SNES9X_SOURCE):
- $(WGET) -P $(DL_DIR) $(SNES9X_SITE)/$(SNES9X_SOURCE)
-
-snes9x-source: $(DL_DIR)/$(SNES9X_SOURCE)
-
-$(SNES9X_DIR)/.unpacked: $(DL_DIR)/$(SNES9X_SOURCE)
- $(SNES9X_CAT) $(DL_DIR)/$(SNES9X_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $@
-
-$(SNES9X_DIR)/.patched: $(SNES9X_DIR)/.unpacked
- toolchain/patch-kernel.sh $(SNES9X_DIR) package/snes9x/ snes9x-$(SNES9X_VERSION)\*.patch
- touch $@
-
-$(SNES9X_DIR)/.configured: $(SNES9X_DIR)/.patched
-# For v1.49 only !!
-# (cd $(SNES9X_DIR)/snes9x; \
-# $(TARGET_CONFIGURE_OPTS) \
-# CFLAGS="$(TARGET_CFLAGS) " \
-# ./configure \
-# --target=$(GNU_TARGET_NAME) \
-# --host=$(GNU_TARGET_NAME) \
-# --build=$(GNU_HOST_NAME) \
-# --prefix=$(STAGING_DIR)/usr \
-# --with-sdl-prefix=$(STAGING_DIR)/usr \
-# --with-sdl-exec-prefix=$(STAGING_DIR)/usr \
-# --disable-sdltest \
-# --without-x \
-# --without-opengl \
-# --without-nasm \
-# --without-mmx );
- touch $@
-
-$(SNES9X_DIR)/snes9x: $(SNES9X_DIR)/.configured
-# $(MAKE) -C $(SNES9X_DIR)/snes9x
- $(MAKE) -C $(SNES9X_DIR) \
- CC=$(TARGET_CC) CCC="$(TARGET_CXX) -fno-rtti -fno-exceptions" \
- INCLUDES="-I$(STAGING_DIR)/usr/lib/include `$(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
- LDLIBS="`$(STAGING_DIR)/usr/bin/sdl-config --libs`"
- touch $@
-
-$(TARGET_DIR)/$(SNES9X_TARGET_BIN): $(SNES9X_DIR)/snes9x
- cp -f $(SNES9X_DIR)/snes9x $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
-
-SNES9X snes9x: sdl $(TARGET_DIR)/$(SNES9X_TARGET_BIN)
-
-snes9x-clean:
-# $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SNES9X_DIR) uninstall
- -$(MAKE) -C $(SNES9X_DIR) clean
-
-snes9x-dirclean:
- rm -rf $(SNES9X_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_SNES9X)),y)
-TARGETS+=snes9x
-endif
diff --git a/buildroot/package/socketcan/Config.in b/buildroot/package/socketcan/Config.in
deleted file mode 100644
index b3b001d..0000000
--- a/buildroot/package/socketcan/Config.in
+++ /dev/null
@@ -1,22 +0,0 @@
-config BR2_PACKAGE_SOCKETCAN
- bool "Socket CAN"
- default n
- help
- The socketcan package is an implementation of CAN protocols
- (Controller Area Network) for Linux. CAN is a networking technology
- which has wide-spread use in automation, embedded devices, and
- automotive fields.
-
- While there have been other CAN implementations for Linux based on
- character devices, Socket CAN uses the Berkeley socket API,
- the Linux network stack and implements the CAN device drivers as
- network interfaces. The CAN socket API has been designed as similar
- as possible to the TCP/IP protocols to allow programmers, familiar
- with network programming, to easily learn how to use CAN sockets.
-
-config BR2_PACKAGE_SOCKETCAN_TEST
- bool "install test tools"
- depends on BR2_PACKAGE_SOCKETCAN
- help
- Compile and install socketcan test tools too.
-
diff --git a/buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch b/buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch
deleted file mode 100644
index 3d1298e..0000000
--- a/buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN socketcan-svn-rev810.org/can-utils/Makefile socketcan-svn-rev810/can-utils/Makefile
---- socketcan-svn-rev810.org/can-utils/Makefile 2008-07-16 10:52:02.000000000 +0200
-+++ socketcan-svn-rev810/can-utils/Makefile 2008-07-16 11:19:21.000000000 +0200
-@@ -40,6 +40,10 @@
- #
- # Send feedback to <soc...@li...>
-
-+ifeq ($(INSTALL_DIR),)
-+ INSTALL_DIR=/usr/local/bin
-+endif
-+
- MAKEFLAGS = -k
-
- CFLAGS = -O2 -Wall -Wno-parentheses -I../kernel/2.6/include \
-@@ -52,11 +56,17 @@
-
- all: $(PROGRAMS)
-
-+strip: all
-+ $(STRIP_CMD) $(PROGRAMS)
-+
- clean:
- rm -f $(PROGRAMS) *.o
-
- install:
-- cp -f $(PROGRAMS) /usr/local/bin
-+ cp -f $(PROGRAMS) $(INSTALL_DIR)
-+
-+uninstall:
-+ cd $(INSTALL_DIR); rm -f $(PROGRAMS)
-
- distclean:
- rm -f $(PROGRAMS) *.o *~
diff --git a/buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch b/buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch
deleted file mode 100644
index 76a3b6b..0000000
--- a/buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -urN socketcan-svn-rev810.org/can-utils/Makefile socketcan-svn-rev810/can-utils/Makefile
---- socketcan-svn-rev874.org/can-utils/Makefile 2008-07-16 10:52:02.000000000 +0200
-+++ socketcan-svn-rev874/can-utils/Makefile 2008-07-16 11:19:21.000000000 +0200
-@@ -40,6 +40,10 @@
- #
- # Send feedback to <soc...@li...>
-
-+ifeq ($(INSTALL_DIR),)
-+ INSTALL_DIR=/usr/local/bin
-+endif
-+
- MAKEFLAGS = -k
-
- CFLAGS = -O2 -Wall -Wno-parentheses -I../kernel/2.6/include \
-@@ -52,11 +56,17 @@
-
- all: $(PROGRAMS)
-
-+strip: all
-+ $(STRIP_CMD) $(PROGRAMS)
-+
- clean:
- rm -f $(PROGRAMS) *.o
-
- install:
-- cp -f $(PROGRAMS) /usr/local/bin
-+ cp -f $(PROGRAMS) $(INSTALL_DIR)
-+
-+uninstall:
-+ cd $(INSTALL_DIR); rm -f $(PROGRAMS)
-
- distclean:
- rm -f $(PROGRAMS) *.o *~
---- socketcan-svn-rev874.org/test/Makefile 2008-12-06 22:22:28.000000000 +0100
-+++ socketcan-svn-rev874/test/Makefile 2008-12-06 22:33:10.000000000 +0100
-@@ -40,6 +40,10 @@
- #
- # Send feedback to <soc...@li...>
-
-+ifeq ($(INSTALL_DIR),)
-+ INSTALL_DIR=/usr/local/bin
-+endif
-+
- CFLAGS = -O2 -Wall -Wno-parentheses -I../kernel/2.6/include \
- -fno-strict-aliasing \
- -DPF_CAN=29 \
-@@ -64,11 +68,14 @@
-
- all: $(PROGRAMS)
-
-+strip: all
-+ $(STRIP_CMD) $(PROGRAMS)
-+
- install:
-- cp -f $(PROGRAMS) /usr/local/bin
-+ cp -f $(PROGRAMS) $(INSTALL_DIR)
-
- clean:
-- rm -f $(PROGRAMS)
-+ cd $(INSTALL_DIR); rm -f $(PROGRAMS)
-
- distclean:
- rm -f $(PROGRAMS) *~
diff --git a/buildroot/package/socketcan/socketcan.mk b/buildroot/package/socketcan/socketcan.mk
deleted file mode 100644
index 08a629f..0000000
--- a/buildroot/package/socketcan/socketcan.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#############################################################
-#
-# Socket CAN
-#
-#############################################################
-SOCKETCAN_TRUNK:=http://svn.berlios.de/svnroot/repos/socketcan/trunk
-SOCKETCAN_REVISION:=874
-SOCKETCAN_NAME:=socketcan-svn-rev$(SOCKETCAN_REVISION)
-SOCKETCAN_DIR:=$(BUILD_DIR)/$(SOCKETCAN_NAME)
-SOCKETCAN_SOURCE:=$(SOCKETCAN_NAME).tar.bz2
-SOCKETCAN_CAT=$(BZCAT)
-SOCKETCAN_EXE=candump
-
-$(DL_DIR)/$(SOCKETCAN_SOURCE):
- (cd $(BUILD_DIR); \
- $(SVN_CO) -r $(SOCKETCAN_REVISION) $(SOCKETCAN_TRUNK) $(SOCKETCAN_NAME); \
- tar -cvf $(SOCKETCAN_NAME).tar $(SOCKETCAN_NAME); \
- bzip2 $(SOCKETCAN_NAME).tar; \
- rm -rf $(SOCKETCAN_DIR); \
- mv $(SOCKETCAN_SOURCE) $(DL_DIR)/$(SOCKETCAN_SOURCE); \
- )
-
-$(SOCKETCAN_DIR)/.unpacked: $(DL_DIR)/$(SOCKETCAN_SOURCE)
- $(SOCKETCAN_CAT) $(DL_DIR)/$(SOCKETCAN_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(SOCKETCAN_DIR) package/socketcan $(SOCKETCAN_NAME)\*.patch
- touch $@
-
-$(SOCKETCAN_DIR)/.configured: $(SOCKETCAN_DIR)/.unpacked
- touch $@
-
-$(SOCKETCAN_DIR)/.compiled: $(SOCKETCAN_DIR)/.configured
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(SOCKETCAN_DIR)/can-utils
-ifeq ($(strip $(BR2_PACKAGE_SOCKETCAN_TEST)),y)
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(SOCKETCAN_DIR)/test
-endif
- touch $@
-
-$(TARGET_DIR)/usr/bin/$(SOCKETCAN_EXE): $(SOCKETCAN_DIR)/.compiled
- $(...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2010-06-18 10:06:03
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 6e69039ec53b91304d1a2853fd4b5a24397094e5 (commit)
via a1265e02b3919f4e11f818814a797a9a4dbae5b5 (commit)
via 0d93c6c895e1a110c9ed561e88b4f46b044cd569 (commit)
via 046c39d8543bd554f858d56238507f5aab3b21e2 (commit)
from 7fac98dbb4d0fab25ee668c0a4f667f913082d2b (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 6e69039ec53b91304d1a2853fd4b5a24397094e5
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 12:04:44 2010 +0200
[BUILDROOT] move package/slideshow as patch against BR
commit a1265e02b3919f4e11f818814a797a9a4dbae5b5
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 11:07:26 2010 +0200
[BUILDROOT] Put sdl modifications as patch against BR
commit 0d93c6c895e1a110c9ed561e88b4f46b044cd569
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 10:58:39 2010 +0200
[BUILDROOT] Put openssh modifications as patch against BR
commit 046c39d8543bd554f858d56238507f5aab3b21e2
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 18 10:42:32 2010 +0200
[BUILDROOT] unversion package/audio/
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/.gitignore | 4 -
buildroot/package/audio/.gitignore | 3 -
buildroot/package/openssh/.gitignore | 5 -
.../package/openssh/openssh.passwdexpire.patch | 13 --
buildroot/package/sdl/.gitignore | 2 -
.../sdl/sdl-1.2.11-z-sdl-config-paths.patch | 15 --
buildroot/package/slideshow/Config.in | 10 -
.../slideshow-01-add-arm-cross-compile.patch | 25 ---
.../slideshow/slideshow-02-restart-after-end.patch | 73 --------
.../slideshow-03-remove-compile-warning.patch | 13 --
buildroot/package/slideshow/slideshow.mk | 49 ------
patches/buildroot/034-slideshow.patch | 174 +++++++++++++++++++-
.../buildroot/045-openssh-add_passwd_expire.patch | 18 ++
...078-sdl-add_patch_for_paths_in_sdl_config.patch | 20 +++
patches/buildroot/2010.05/034-slideshow.patch | 170 +++++++++++++++++++
.../2010.05/045-openssh-add_passwd_expire.patch | 18 ++
...078-sdl-add_patch_for_paths_in_sdl_config.patch | 20 +++
patches/buildroot/2010.05/cleanup_buildroot.sh | 3 +
patches/buildroot/cleanup_buildroot.sh | 3 +
19 files changed, 424 insertions(+), 214 deletions(-)
delete mode 100644 buildroot/package/audio/.gitignore
delete mode 100644 buildroot/package/openssh/.gitignore
delete mode 100644 buildroot/package/openssh/openssh.passwdexpire.patch
delete mode 100644 buildroot/package/sdl/.gitignore
delete mode 100644 buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch
delete mode 100644 buildroot/package/slideshow/Config.in
delete mode 100644 buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch
delete mode 100644 buildroot/package/slideshow/slideshow-02-restart-after-end.patch
delete mode 100644 buildroot/package/slideshow/slideshow-03-remove-compile-warning.patch
delete mode 100644 buildroot/package/slideshow/slideshow.mk
create mode 100644 patches/buildroot/045-openssh-add_passwd_expire.patch
create mode 100644 patches/buildroot/078-sdl-add_patch_for_paths_in_sdl_config.patch
create mode 100644 patches/buildroot/2010.05/045-openssh-add_passwd_expire.patch
create mode 100644 patches/buildroot/2010.05/078-sdl-add_patch_for_paths_in_sdl_config.patch
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index 273ed3c..489f220 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -11,19 +11,15 @@
# except:
!/allegro/
!/armadeus/
-!/audio/
!/bluez/
!/fbgrab/
!/fbtest/
!/lcd4linux/
!/mesa/
!/mtd/
-!/openssh/
!/pymysql/
!/pyserial/
-!/sdl/
!/sdlwater/
-!/slideshow/
!/snes9x/
!/socketcan/
!/xenomai/
diff --git a/buildroot/package/audio/.gitignore b/buildroot/package/audio/.gitignore
deleted file mode 100644
index 764b172..0000000
--- a/buildroot/package/audio/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/*/
-/Config.in
-/audio.mk
diff --git a/buildroot/package/openssh/.gitignore b/buildroot/package/openssh/.gitignore
deleted file mode 100644
index cbd6fce..0000000
--- a/buildroot/package/openssh/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/Config.in
-/S50sshd
-/openssh.002-SUSv-legacy.patch
-/openssh.mk
-/openssh.patch
diff --git a/buildroot/package/openssh/openssh.passwdexpire.patch b/buildroot/package/openssh/openssh.passwdexpire.patch
deleted file mode 100644
index fbd5f53..0000000
--- a/buildroot/package/openssh/openssh.passwdexpire.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- openssh-4.6p1/configure.ac.org 2007-10-21 12:42:09.000000000 +0200
-+++ openssh-4.6p1/configure.ac 2007-10-21 13:11:50.000000000 +0200
-@@ -3437,8 +3437,8 @@ if test -z "$disable_shadow" ; then
-
- if test "x$sp_expire_available" = "xyes" ; then
- AC_MSG_RESULT(yes)
-- AC_DEFINE(HAS_SHADOW_EXPIRE, 1,
-- [Define if you want to use shadow password expire field])
-+// AC_DEFINE(HAS_SHADOW_EXPIRE, 1,
-+// [Define if you want to use shadow password expire field])
- else
- AC_MSG_RESULT(no)
- fi
diff --git a/buildroot/package/sdl/.gitignore b/buildroot/package/sdl/.gitignore
deleted file mode 100644
index 2d6cc8b..0000000
--- a/buildroot/package/sdl/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Config.in
-/sdl.mk
diff --git a/buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch b/buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch
deleted file mode 100644
index e7537ab..0000000
--- a/buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- SDL-1.2.11.org/sdl-config.in 2007-11-17 16:43:59.000000000 +0100
-+++ SDL-1.2.11/sdl-config.in 2007-11-17 16:45:31.000000000 +0100
-@@ -41,10 +41,10 @@
- echo @SDL_VERSION@
- ;;
- --cflags)
-- echo -I@includedir@/SDL @SDL_CFLAGS@
-+ echo -I$STAGING_DIR/include/SDL @SDL_CFLAGS@
- ;;
- @ENABLE_SHARED_TRUE@ --libs)
--@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@ echo -L$STAGING_DIR/lib @SDL_RLD_FLAGS@ @SDL_LIBS@
- @ENABLE_SHARED_TRUE@ ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
diff --git a/buildroot/package/slideshow/Config.in b/buildroot/package/slideshow/Config.in
deleted file mode 100644
index a3dfdab..0000000
--- a/buildroot/package/slideshow/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_SLIDESHOW
- bool "Slideshow"
- depends on BR2_PACKAGE_SDL && BR2_PACKAGE_SDL_IMAGE
- default n
- help
-
- Perigee Slideshow is a command line program that searches a directory
- for supported graphic files and displays them in a slideshow.
-
- http://www.xmission.com/~jstanley/slideshow.html
diff --git a/buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch b/buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch
deleted file mode 100644
index 9537bf3..0000000
--- a/buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- slideshow/Makefile 2003-11-29 21:08:54.000000000 +0100
-+++ slideshow.mod/Makefile 2007-09-05 12:08:56.000000000 +0200
-@@ -1,6 +1,11 @@
-+ifeq ($(ARCH), arm)
-+CFLAGS = -O2 `sh ../SDL-1.2.13/sdl-config --cflags`
-+LFLAGS = `sh ../SDL-1.2.13/sdl-config --libs` -lSDL_image
-+else
- CFLAGS = -O2 -march=i586 `sdl-config --cflags`
- LFLAGS = `sdl-config --libs` -lSDL_image
- CC = g++
-+endif
- EXE = slideshow
- OBJ = file_list.o fontdata.o main.o SDLFont.o slideshow.o
-
---- slideshow/SDLFont.h 2003-11-29 21:08:54.000000000 +0100
-+++ slideshow.mod/SDLFont.h 2007-09-05 12:11:17.000000000 +0200
-@@ -34,7 +34,7 @@
- // The value of the top-left pixel in the font bitmap will be
- // considered transparent. Anything else is opaque.
-
--#include <SDL/SDL.h>
-+#include "SDL.h"
-
- class SDLFont
- {
diff --git a/buildroot/package/slideshow/slideshow-02-restart-after-end.patch b/buildroot/package/slideshow/slideshow-02-restart-after-end.patch
deleted file mode 100644
index c5840a6..0000000
--- a/buildroot/package/slideshow/slideshow-02-restart-after-end.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- slideshow/slideshow.cpp 2003-12-08 22:17:38.000000000 +0100
-+++ slideshow.mod/slideshow.cpp 2007-09-08 19:05:10.000000000 +0200
-@@ -196,43 +196,48 @@
- SDL_FillRect(m_sdl, &rc, SDL_MapRGB(m_sdl->format, 0, 255, 0));
- SDL_UpdateRects(m_sdl, 1, &rc);
- }
--
-- user_command cmd = wait_for_command();
--
-+
-+ user_command cmd = wait_for_command();
-+
- switch(cmd)
-- {
-- case c_quit:
-- stop_timer();
-- return true;
-- case c_first_slide:
-+ {
-+ case c_quit:
-+ stop_timer();
-+ return true;
-+ case c_first_slide:
- stop_timer();
- m_image_index = 0;
- break;
- case c_last_slide:
-- stop_timer();
-+ stop_timer();
- m_image_index = m_file_list->count() - 1;
-- break;
-+ break;
- case c_prev_slide:
-- stop_timer();
-+ stop_timer();
- if ( m_image_index > 0 )
- m_image_index--;
- break;
- case c_next_slide:
-- stop_timer();
-- // fall through
-- case c_timer_advance:
-- if ( m_image_index < m_file_list->count() - 1 )
-+ stop_timer();
-+ // fall through
-+ case c_timer_advance:
-+ if ( m_image_index <= m_file_list->count() - 1 )
- m_image_index++;
-- break;
-- case c_redraw:
- break;
-- }
-+ case c_redraw:
-+ break;
-+ }
-
- // stop the auto-advance when the last picture is about to be shown
-- if ( m_image_index == m_file_list->count() - 1 )
-- stop_timer();
-- }
--
-+ if ( m_image_index == m_file_list->count() /*- 1*/ )
-+ {
-+ //stop_timer();
-+ m_image_index = 0;
-+ m_prev_image_index = -1;
-+ }
-+
-+ }
-+
- return true;
- }
-
diff --git a/buildroot/package/slideshow/slideshow-03-remove-compile-warning.patch b/buildroot/package/slideshow/slideshow-03-remove-compile-warning.patch
deleted file mode 100644
index 9de2625..0000000
--- a/buildroot/package/slideshow/slideshow-03-remove-compile-warning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
-+++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
-@@ -84,8 +84,8 @@
-
- Uint8 *pixloc = (Uint8 *)pDisplay->pixels + dpitch * y + Bpp * x;
- Uint8 *pChar, *pScreen;
-- char c;
-- int i, j;
-+ //char c;
-+ int i, j, c;
-
- for(const char *p = text; *p != '\0'; p++)
- {
diff --git a/buildroot/package/slideshow/slideshow.mk b/buildroot/package/slideshow/slideshow.mk
deleted file mode 100644
index bb5a5e4..0000000
--- a/buildroot/package/slideshow/slideshow.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#############################################################
-#
-# Slideshow
-#
-#############################################################
-SLIDESHOW_VERSION:=1.1
-SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
-SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
-SLIDESHOW_CAT:=zcat
-SLIDESHOW_DIR:=$(BUILD_DIR)/slideshow
-
-$(DL_DIR)/$(SLIDESHOW_SOURCE):
- $(WGET) -P $(DL_DIR) $(SLIDESHOW_SITE)/$(SLIDESHOW_SOURCE)
-
-slideshow-source: $(DL_DIR)/$(SLIDESHOW_SOURCE)
-
-$(SLIDESHOW_DIR)/.unpacked: $(DL_DIR)/$(SLIDESHOW_SOURCE)
- unzip $(DL_DIR)/$(SLIDESHOW_SOURCE) -d $(BUILD_DIR)
- touch $@
-
-$(SLIDESHOW_DIR)/.configured: $(SLIDESHOW_DIR)/.unpacked
- echo "Patching...."
- toolchain/patch-kernel.sh $(SLIDESHOW_DIR) package/slideshow/ slideshow-\*.patch
- touch $@
-
-$(SLIDESHOW_DIR)/slideshow: $(SLIDESHOW_DIR)/.configured
- export CC=$(TARGET_CXX); export STAGING_DIR=$(STAGING_DIR); $(MAKE) -C $(SLIDESHOW_DIR) ARCH=arm
-
-$(TARGET_DIR)/usr/bin/slideshow: $(SLIDESHOW_DIR)/slideshow
- cp -dpf $< $(TARGET_DIR)/usr/bin
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
-
-SLIDESHOW slideshow: sdl sdl_image $(TARGET_DIR)/usr/bin/slideshow
-
-slideshow-clean:
- rm -f $(TARGET_DIR)/usr/bin/slideshow
- -$(MAKE) -C $(SLIDESHOW_DIR) clean
-
-slideshow-dirclean:
- rm -rf $(SLIDESHOW_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_SLIDESHOW)),y)
-TARGETS+=slideshow
-endif
diff --git a/patches/buildroot/034-slideshow.patch b/patches/buildroot/034-slideshow.patch
index 1f01072..9124014 100644
--- a/patches/buildroot/034-slideshow.patch
+++ b/patches/buildroot/034-slideshow.patch
@@ -1,7 +1,11 @@
+Add slideshow package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-01-25 10:04:10.000000000 +0100
-+++ buildroot/package/Config.in 2010-01-25 10:04:25.000000000 +0100
+--- buildroot.orig/package/Config.in 2010-06-18 11:17:54.000000000 +0200
++++ buildroot/package/Config.in 2010-06-18 11:27:14.000000000 +0200
@@ -329,6 +329,7 @@
source "package/sdl_mixer/Config.in"
source "package/sdl_net/Config.in"
@@ -10,3 +14,169 @@ Index: buildroot/package/Config.in
source "package/tiff/Config.in"
comment "Demos"
source "package/sdlwater/Config.in"
+Index: buildroot/package/slideshow/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/Config.in 2010-06-18 11:33:25.000000000 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_SLIDESHOW
++ bool "Slideshow"
++ depends on BR2_PACKAGE_SDL && BR2_PACKAGE_SDL_IMAGE
++ help
++
++ Perigee Slideshow is a command line program that searches a directory
++ for supported graphic files and displays them in a slideshow.
++
++ http://www.xmission.com/~jstanley/slideshow.html
+Index: buildroot/package/slideshow/slideshow.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow.mk 2010-06-18 11:48:12.000000000 +0200
+@@ -0,0 +1,51 @@
++#############################################################
++#
++# slideshow
++#
++#############################################################
++SLIDESHOW_VERSION:=1.1
++SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
++SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
++SLIDESHOW_CAT:=zcat
++SLIDESHOW_DIR:=$(BUILD_DIR)/slideshow
++
++$(DL_DIR)/$(SLIDESHOW_SOURCE):
++ $(WGET) -P $(DL_DIR) $(SLIDESHOW_SITE)/$(SLIDESHOW_SOURCE)
++
++slideshow-source: $(DL_DIR)/$(SLIDESHOW_SOURCE)
++
++$(SLIDESHOW_DIR)/.unpacked: $(DL_DIR)/$(SLIDESHOW_SOURCE)
++ unzip $(DL_DIR)/$(SLIDESHOW_SOURCE) -d $(BUILD_DIR)
++ touch $@
++
++$(SLIDESHOW_DIR)/.configured: $(SLIDESHOW_DIR)/.unpacked
++ @echo "Patching slideshow..."
++ toolchain/patch-kernel.sh $(SLIDESHOW_DIR) package/slideshow/ slideshow-\*.patch
++ touch $@
++
++$(SLIDESHOW_DIR)/slideshow: $(SLIDESHOW_DIR)/.configured
++ $(MAKE) CC=$(TARGET_CXX) CFLAGS="$(TARGET_CFLAGS) `sh $(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
++ LFLAGS="`sh $(STAGING_DIR)/usr/bin/sdl-config --libs` -lSDL_image" \
++ -C $(SLIDESHOW_DIR)
++
++$(TARGET_DIR)/usr/bin/slideshow: $(SLIDESHOW_DIR)/slideshow
++ cp -dpf $< $(TARGET_DIR)/usr/bin
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
++
++SLIDESHOW slideshow: sdl sdl_image $(TARGET_DIR)/usr/bin/slideshow
++
++slideshow-clean:
++ rm -f $(TARGET_DIR)/usr/bin/slideshow
++ -$(MAKE) -C $(SLIDESHOW_DIR) clean
++
++slideshow-dirclean:
++ rm -rf $(SLIDESHOW_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_SLIDESHOW)),y)
++TARGETS+=slideshow
++endif
+Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2010-06-18 11:50:12.000000000 +0200
+@@ -0,0 +1,73 @@
++--- slideshow/slideshow.cpp 2003-12-08 22:17:38.000000000 +0100
+++++ slideshow.mod/slideshow.cpp 2007-09-08 19:05:10.000000000 +0200
++@@ -196,43 +196,48 @@
++ SDL_FillRect(m_sdl, &rc, SDL_MapRGB(m_sdl->format, 0, 255, 0));
++ SDL_UpdateRects(m_sdl, 1, &rc);
++ }
++-
++- user_command cmd = wait_for_command();
++-
+++
+++ user_command cmd = wait_for_command();
+++
++ switch(cmd)
++- {
++- case c_quit:
++- stop_timer();
++- return true;
++- case c_first_slide:
+++ {
+++ case c_quit:
+++ stop_timer();
+++ return true;
+++ case c_first_slide:
++ stop_timer();
++ m_image_index = 0;
++ break;
++ case c_last_slide:
++- stop_timer();
+++ stop_timer();
++ m_image_index = m_file_list->count() - 1;
++- break;
+++ break;
++ case c_prev_slide:
++- stop_timer();
+++ stop_timer();
++ if ( m_image_index > 0 )
++ m_image_index--;
++ break;
++ case c_next_slide:
++- stop_timer();
++- // fall through
++- case c_timer_advance:
++- if ( m_image_index < m_file_list->count() - 1 )
+++ stop_timer();
+++ // fall through
+++ case c_timer_advance:
+++ if ( m_image_index <= m_file_list->count() - 1 )
++ m_image_index++;
++- break;
++- case c_redraw:
++ break;
++- }
+++ case c_redraw:
+++ break;
+++ }
++
++ // stop the auto-advance when the last picture is about to be shown
++- if ( m_image_index == m_file_list->count() - 1 )
++- stop_timer();
++- }
++-
+++ if ( m_image_index == m_file_list->count() /*- 1*/ )
+++ {
+++ //stop_timer();
+++ m_image_index = 0;
+++ m_prev_image_index = -1;
+++ }
+++
+++ }
+++
++ return true;
++ }
++
+Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2010-06-18 11:50:59.000000000 +0200
+@@ -0,0 +1,13 @@
++--- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
+++++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
++@@ -84,8 +84,8 @@
++
++ Uint8 *pixloc = (Uint8 *)pDisplay->pixels + dpitch * y + Bpp * x;
++ Uint8 *pChar, *pScreen;
++- char c;
++- int i, j;
+++ //char c;
+++ int i, j, c;
++
++ for(const char *p = text; *p != '\0'; p++)
++ {
diff --git a/patches/buildroot/045-openssh-add_passwd_expire.patch b/patches/buildroot/045-openssh-add_passwd_expire.patch
new file mode 100644
index 0000000..b7908ca
--- /dev/null
+++ b/patches/buildroot/045-openssh-add_passwd_expire.patch
@@ -0,0 +1,18 @@
+Index: buildroot/package/openssh/openssh.passwdexpire.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/openssh/openssh.passwdexpire.patch 2010-06-18 10:54:52.000000000 +0200
+@@ -0,0 +1,13 @@
++--- openssh-4.6p1/configure.ac.org 2007-10-21 12:42:09.000000000 +0200
+++++ openssh-4.6p1/configure.ac 2007-10-21 13:11:50.000000000 +0200
++@@ -3437,8 +3437,8 @@ if test -z "$disable_shadow" ; then
++
++ if test "x$sp_expire_available" = "xyes" ; then
++ AC_MSG_RESULT(yes)
++- AC_DEFINE(HAS_SHADOW_EXPIRE, 1,
++- [Define if you want to use shadow password expire field])
+++// AC_DEFINE(HAS_SHADOW_EXPIRE, 1,
+++// [Define if you want to use shadow password expire field])
++ else
++ AC_MSG_RESULT(no)
++ fi
diff --git a/patches/buildroot/078-sdl-add_patch_for_paths_in_sdl_config.patch b/patches/buildroot/078-sdl-add_patch_for_paths_in_sdl_config.patch
new file mode 100644
index 0000000..33f8b66
--- /dev/null
+++ b/patches/buildroot/078-sdl-add_patch_for_paths_in_sdl_config.patch
@@ -0,0 +1,20 @@
+Index: buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch 2010-06-18 11:04:32.000000000 +0200
+@@ -0,0 +1,15 @@
++--- SDL-1.2.11.org/sdl-config.in 2007-11-17 16:43:59.000000000 +0100
+++++ SDL-1.2.11/sdl-config.in 2007-11-17 16:45:31.000000000 +0100
++@@ -41,10 +41,10 @@
++ echo @SDL_VERSION@
++ ;;
++ --cflags)
++- echo -I@includedir@/SDL @SDL_CFLAGS@
+++ echo -I$STAGING_DIR/include/SDL @SDL_CFLAGS@
++ ;;
++ @ENABLE_SHARED_TRUE@ --libs)
++-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+++@ENABLE_SHARED_TRUE@ echo -L$STAGING_DIR/lib @SDL_RLD_FLAGS@ @SDL_LIBS@
++ @ENABLE_SHARED_TRUE@ ;;
++ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
++ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
diff --git a/patches/buildroot/2010.05/034-slideshow.patch b/patches/buildroot/2010.05/034-slideshow.patch
index 9f69ddb..6031287 100644
--- a/patches/buildroot/2010.05/034-slideshow.patch
+++ b/patches/buildroot/2010.05/034-slideshow.patch
@@ -1,3 +1,7 @@
+Add slideshow package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2010-06-17 16:46:13.000000000 +0200
@@ -10,3 +14,169 @@ Index: buildroot/package/Config.in
comment "Demos"
source "package/sdlwater/Config.in"
+Index: buildroot/package/slideshow/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/Config.in 2010-06-18 11:33:25.000000000 +0200
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_SLIDESHOW
++ bool "Slideshow"
++ depends on BR2_PACKAGE_SDL && BR2_PACKAGE_SDL_IMAGE
++ help
++
++ Perigee Slideshow is a command line program that searches a directory
++ for supported graphic files and displays them in a slideshow.
++
++ http://www.xmission.com/~jstanley/slideshow.html
+Index: buildroot/package/slideshow/slideshow.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow.mk 2010-06-18 11:48:12.000000000 +0200
+@@ -0,0 +1,51 @@
++#############################################################
++#
++# slideshow
++#
++#############################################################
++SLIDESHOW_VERSION:=1.1
++SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
++SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
++SLIDESHOW_CAT:=zcat
++SLIDESHOW_DIR:=$(BUILD_DIR)/slideshow
++
++$(DL_DIR)/$(SLIDESHOW_SOURCE):
++ $(WGET) -P $(DL_DIR) $(SLIDESHOW_SITE)/$(SLIDESHOW_SOURCE)
++
++slideshow-source: $(DL_DIR)/$(SLIDESHOW_SOURCE)
++
++$(SLIDESHOW_DIR)/.unpacked: $(DL_DIR)/$(SLIDESHOW_SOURCE)
++ unzip $(DL_DIR)/$(SLIDESHOW_SOURCE) -d $(BUILD_DIR)
++ touch $@
++
++$(SLIDESHOW_DIR)/.configured: $(SLIDESHOW_DIR)/.unpacked
++ @echo "Patching slideshow..."
++ toolchain/patch-kernel.sh $(SLIDESHOW_DIR) package/slideshow/ slideshow-\*.patch
++ touch $@
++
++$(SLIDESHOW_DIR)/slideshow: $(SLIDESHOW_DIR)/.configured
++ $(MAKE) CC=$(TARGET_CXX) CFLAGS="$(TARGET_CFLAGS) `sh $(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
++ LFLAGS="`sh $(STAGING_DIR)/usr/bin/sdl-config --libs` -lSDL_image" \
++ -C $(SLIDESHOW_DIR)
++
++$(TARGET_DIR)/usr/bin/slideshow: $(SLIDESHOW_DIR)/slideshow
++ cp -dpf $< $(TARGET_DIR)/usr/bin
++ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
++
++SLIDESHOW slideshow: sdl sdl_image $(TARGET_DIR)/usr/bin/slideshow
++
++slideshow-clean:
++ rm -f $(TARGET_DIR)/usr/bin/slideshow
++ -$(MAKE) -C $(SLIDESHOW_DIR) clean
++
++slideshow-dirclean:
++ rm -rf $(SLIDESHOW_DIR)
++
++#############################################################
++#
++# Toplevel Makefile options
++#
++#############################################################
++ifeq ($(strip $(BR2_PACKAGE_SLIDESHOW)),y)
++TARGETS+=slideshow
++endif
+Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2010-06-18 11:50:12.000000000 +0200
+@@ -0,0 +1,73 @@
++--- slideshow/slideshow.cpp 2003-12-08 22:17:38.000000000 +0100
+++++ slideshow.mod/slideshow.cpp 2007-09-08 19:05:10.000000000 +0200
++@@ -196,43 +196,48 @@
++ SDL_FillRect(m_sdl, &rc, SDL_MapRGB(m_sdl->format, 0, 255, 0));
++ SDL_UpdateRects(m_sdl, 1, &rc);
++ }
++-
++- user_command cmd = wait_for_command();
++-
+++
+++ user_command cmd = wait_for_command();
+++
++ switch(cmd)
++- {
++- case c_quit:
++- stop_timer();
++- return true;
++- case c_first_slide:
+++ {
+++ case c_quit:
+++ stop_timer();
+++ return true;
+++ case c_first_slide:
++ stop_timer();
++ m_image_index = 0;
++ break;
++ case c_last_slide:
++- stop_timer();
+++ stop_timer();
++ m_image_index = m_file_list->count() - 1;
++- break;
+++ break;
++ case c_prev_slide:
++- stop_timer();
+++ stop_timer();
++ if ( m_image_index > 0 )
++ m_image_index--;
++ break;
++ case c_next_slide:
++- stop_timer();
++- // fall through
++- case c_timer_advance:
++- if ( m_image_index < m_file_list->count() - 1 )
+++ stop_timer();
+++ // fall through
+++ case c_timer_advance:
+++ if ( m_image_index <= m_file_list->count() - 1 )
++ m_image_index++;
++- break;
++- case c_redraw:
++ break;
++- }
+++ case c_redraw:
+++ break;
+++ }
++
++ // stop the auto-advance when the last picture is about to be shown
++- if ( m_image_index == m_file_list->count() - 1 )
++- stop_timer();
++- }
++-
+++ if ( m_image_index == m_file_list->count() /*- 1*/ )
+++ {
+++ //stop_timer();
+++ m_image_index = 0;
+++ m_prev_image_index = -1;
+++ }
+++
+++ }
+++
++ return true;
++ }
++
+Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2010-06-18 11:50:59.000000000 +0200
+@@ -0,0 +1,13 @@
++--- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
+++++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
++@@ -84,8 +84,8 @@
++
++ Uint8 *pixloc = (Uint8 *)pDisplay->pixels + dpitch * y + Bpp * x;
++ Uint8 *pChar, *pScreen;
++- char c;
++- int i, j;
+++ //char c;
+++ int i, j, c;
++
++ for(const char *p = text; *p != '\0'; p++)
++ {
diff --git a/patches/buildroot/2010.05/045-openssh-add_passwd_expire.patch b/patches/buildroot/2010.05/045-openssh-add_passwd_expire.patch
new file mode 100644
index 0000000..b7908ca
--- /dev/null
+++ b/patches/buildroot/2010.05/045-openssh-add_passwd_expire.patch
@@ -0,0 +1,18 @@
+Index: buildroot/package/openssh/openssh.passwdexpire.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/openssh/openssh.passwdexpire.patch 2010-06-18 10:54:52.000000000 +0200
+@@ -0,0 +1,13 @@
++--- openssh-4.6p1/configure.ac.org 2007-10-21 12:42:09.000000000 +0200
+++++ openssh-4.6p1/configure.ac 2007-10-21 13:11:50.000000000 +0200
++@@ -3437,8 +3437,8 @@ if test -z "$disable_shadow" ; then
++
++ if test "x$sp_expire_available" = "xyes" ; then
++ AC_MSG_RESULT(yes)
++- AC_DEFINE(HAS_SHADOW_EXPIRE, 1,
++- [Define if you want to use shadow password expire field])
+++// AC_DEFINE(HAS_SHADOW_EXPIRE, 1,
+++// [Define if you want to use shadow password expire field])
++ else
++ AC_MSG_RESULT(no)
++ fi
diff --git a/patches/buildroot/2010.05/078-sdl-add_patch_for_paths_in_sdl_config.patch b/patches/buildroot/2010.05/078-sdl-add_patch_for_paths_in_sdl_config.patch
new file mode 100644
index 0000000..33f8b66
--- /dev/null
+++ b/patches/buildroot/2010.05/078-sdl-add_patch_for_paths_in_sdl_config.patch
@@ -0,0 +1,20 @@
+Index: buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/sdl/sdl-1.2.11-z-sdl-config-paths.patch 2010-06-18 11:04:32.000000000 +0200
+@@ -0,0 +1,15 @@
++--- SDL-1.2.11.org/sdl-config.in 2007-11-17 16:43:59.000000000 +0100
+++++ SDL-1.2.11/sdl-config.in 2007-11-17 16:45:31.000000000 +0100
++@@ -41,10 +41,10 @@
++ echo @SDL_VERSION@
++ ;;
++ --cflags)
++- echo -I@includedir@/SDL @SDL_CFLAGS@
+++ echo -I$STAGING_DIR/include/SDL @SDL_CFLAGS@
++ ;;
++ @ENABLE_SHARED_TRUE@ --libs)
++-@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+++@ENABLE_SHARED_TRUE@ echo -L$STAGING_DIR/lib @SDL_RLD_FLAGS@ @SDL_LIBS@
++ @ENABLE_SHARED_TRUE@ ;;
++ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
++ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index b122322..3e7051f 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -25,3 +25,6 @@ rm -rf buildroot/package/openobex/
rm -rf buildroot/package/gpsd/
rm -rf buildroot/package/lmbench/
rm -rf buildroot/package/tslib/
+rm -rf buildroot/package/openssh/
+rm -rf buildroot/package/sdl/
+rm -rf buildroot/package/slideshow/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 1c02a92..63719ab 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -29,3 +29,6 @@ rm -rf buildroot/package/openobex/
rm -rf buildroot/package/gpsd/
rm -rf buildroot/package/lmbench/
rm -rf buildroot/package/tslib/
+rm -rf buildroot/package/openssh/
+rm -rf buildroot/package/sdl/
+rm -rf buildroot/package/slideshow/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-17 21:28: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 7fac98dbb4d0fab25ee668c0a4f667f913082d2b (commit)
via 2283d5e87dcdd21fd5fc59fd7b94eedc5e3b2025 (commit)
from a24f4dfd228f45c3553a39d7cb1bf10366a3735f (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 7fac98dbb4d0fab25ee668c0a4f667f913082d2b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 17 23:26:32 2010 +0200
Updates default BR configs
commit 2283d5e87dcdd21fd5fc59fd7b94eedc5e3b2025
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 17 23:24:24 2010 +0200
[BUILDROOT] End of lmbench cleanup
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/.gitignore | 1 -
.../target/device/armadeus/apf27/apf27_defconfig | 3 ++-
.../device/armadeus/apf9328/apf9328_defconfig | 3 ++-
...package.patch => 017-lmbench-add_package.patch} | 10 ++++++++++
patches/buildroot/017-lmbench.patch | 10 ----------
patches/buildroot/2010.05/cleanup_buildroot.sh | 2 ++
patches/buildroot/cleanup_buildroot.sh | 2 ++
7 files changed, 18 insertions(+), 13 deletions(-)
rename patches/buildroot/{043-lmbench-add_package.patch => 017-lmbench-add_package.patch} (89%)
delete mode 100644 patches/buildroot/017-lmbench.patch
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index 6336fc9..273ed3c 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -16,7 +16,6 @@
!/fbgrab/
!/fbtest/
!/lcd4linux/
-!/lmbench/
!/mesa/
!/mtd/
!/openssh/
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index 5181f78..849b58e 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Wed Jun 16 16:58:03 2010
+# Thu Jun 17 18:25:20 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -510,6 +510,7 @@ BR2_BLOCKDEV_SUPPORT=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
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index a2262ad..abb21e6 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
-# Wed Jun 16 16:58:03 2010
+# Thu Jun 17 18:25:20 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -504,6 +504,7 @@ BR2_BLOCKDEV_SUPPORT=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 is not set
diff --git a/patches/buildroot/043-lmbench-add_package.patch b/patches/buildroot/017-lmbench-add_package.patch
similarity index 89%
rename from patches/buildroot/043-lmbench-add_package.patch
rename to patches/buildroot/017-lmbench-add_package.patch
index d7d049c..5d8e24d 100644
--- a/patches/buildroot/043-lmbench-add_package.patch
+++ b/patches/buildroot/017-lmbench-add_package.patch
@@ -2,6 +2,16 @@ Adds lmbench package to BR.
No more needed with recent BR as lmbench was integrated.
+--- buildroot/package/Config.in.ref 2008-11-03 16:03:10.000000000 +0100
++++ buildroot/package/Config.in 2008-11-03 16:07:18.000000000 +0100
+@@ -88,6 +88,7 @@ source "package/libgpg-error/Config.in"
+ source "package/libiconv/Config.in"
+ source "package/liblockfile/Config.in"
+ source "package/libsysfs/Config.in"
++source "package/lmbench/Config.in"
+ source "package/lockfile-progs/Config.in"
+ source "package/logrotate/Config.in"
+ source "package/lsof/Config.in"
Index: buildroot/package/lmbench/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/017-lmbench.patch b/patches/buildroot/017-lmbench.patch
deleted file mode 100644
index 5cb81fc..0000000
--- a/patches/buildroot/017-lmbench.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- buildroot/package/Config.in.ref 2008-11-03 16:03:10.000000000 +0100
-+++ buildroot/package/Config.in 2008-11-03 16:07:18.000000000 +0100
-@@ -88,6 +88,7 @@ source "package/libgpg-error/Config.in"
- source "package/libiconv/Config.in"
- source "package/liblockfile/Config.in"
- source "package/libsysfs/Config.in"
-+source "package/lmbench/Config.in"
- source "package/lockfile-progs/Config.in"
- source "package/logrotate/Config.in"
- source "package/lsof/Config.in"
diff --git a/patches/buildroot/2010.05/cleanup_buildroot.sh b/patches/buildroot/2010.05/cleanup_buildroot.sh
index 1fd9286..b122322 100755
--- a/patches/buildroot/2010.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.05/cleanup_buildroot.sh
@@ -23,3 +23,5 @@ rm -rf buildroot/package/games/wolf4sdl/
rm -rf buildroot/package/ussp-push/
rm -rf buildroot/package/openobex/
rm -rf buildroot/package/gpsd/
+rm -rf buildroot/package/lmbench/
+rm -rf buildroot/package/tslib/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 833eca3..1c02a92 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -27,3 +27,5 @@ rm -rf buildroot/package/qtopia4/
rm -rf buildroot/package/ussp-push/
rm -rf buildroot/package/openobex/
rm -rf buildroot/package/gpsd/
+rm -rf buildroot/package/lmbench/
+rm -rf buildroot/package/tslib/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-17 16:16:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via a24f4dfd228f45c3553a39d7cb1bf10366a3735f (commit)
via 7c563886ea3fbfe858d233876971401c25fc25a1 (commit)
via cad102c6de0ad69a27854e595a11b6adca0694e0 (commit)
via e8dd00b32bbc51368af20c88e7699ba31c3a90d6 (commit)
via 2d1a7fde74864081c1601080915b2e03e0499155 (commit)
via ffcc6ca294d0cd7d202df486378c235224dca5a1 (commit)
from 86b22b16db96cb77dadc6f65ffb6bb6f54730fce (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 a24f4dfd228f45c3553a39d7cb1bf10366a3735f
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 17 18:06:52 2010 +0200
[BUILDROOT] Moves tslib modifications as patches against BR
commit 7c563886ea3fbfe858d233876971401c25fc25a1
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 17 17:52:35 2010 +0200
[BUILDROOT] Convert lmbench package as a patch
commit cad102c6de0ad69a27854e595a11b6adca0694e0
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 17 17:00:40 2010 +0200
[BUILDROOT] Upgrade new BR support from 2010.02 to 2010.05 (part IV: updates patches so that they don't generate warnings when applied)
commit e8dd00b32bbc51368af20c88e7699ba31c3a90d6
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 17 16:43:41 2010 +0200
[BUILDROOT] Upgrade new BR support from 2010.02 to 2010.05 (part III: updates apf9328 configs)
commit 2d1a7fde74864081c1601080915b2e03e0499155
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 17 12:10:51 2010 +0200
[BUILDROOT] Upgrade new BR support from 2010.02 to 2010.05 (part II: patches apply)
commit ffcc6ca294d0cd7d202df486378c235224dca5a1
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 16 19:05:26 2010 +0200
[BUILDROOT] Upgrade new BR support from 2010.02 to 2010.05 (part I)
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf9328_defconfig | 677 ++++++++-------
buildroot/package/.gitignore | 1 -
buildroot/package/lmbench/Config.in | 8 -
.../lmbench/lmbench.01.uclibc.comptat.patch | 12 -
buildroot/package/lmbench/lmbench.mk | 63 --
buildroot/package/tslib/.gitignore | 8 -
...ake_it_work_on_powerpc_and_recent_kernels.patch | 48 -
...slib-1.0-zzz-prevents_unresolved_symbols.to_fix | 38 -
.../armadeus/apf9328/uClibc-0.9.30.config.arm | 4 +-
.../target/device/armadeus/busybox-1.16.0.config | 920 --------------------
.../target/device/armadeus/busybox-1.16.1.config | 920 ++++++++++++++++++++
patches/buildroot/043-lmbench-add_package.patch | 102 +++
...dd_patch_for_recent_kernels_compatibility.patch | 53 ++
.../2010.02/001-add_armadeus_device.patch | 10 -
patches/buildroot/2010.02/006-lcd4linux.patch | 12 -
patches/buildroot/2010.02/017-lmbench.patch | 10 -
patches/buildroot/2010.02/018-allegro.patch | 12 -
.../buildroot/2010.02/021-sdl-water-config.patch | 13 -
patches/buildroot/2010.02/034-slideshow.patch | 12 -
.../2010.02/038-fakeroot-bump_version.patch | 11 -
patches/buildroot/2010.02/040-linux-makefile.patch | 44 -
patches/buildroot/2010.02/041-fbgrab.patch | 12 -
patches/buildroot/2010.02/042-socketcan.patch | 12 -
patches/buildroot/2010.02/047-uclibc-config.patch | 26 -
...ownload_minor_patches_from_kernel_org_too.patch | 34 -
...0-linux-remove_unsupported_kernel_version.patch | 54 --
...s_building_when_modules_compilation_fails.patch | 23 -
.../051a-u-boot-add_copy_to_functionnality.patch | 57 --
...1b-u-boot-change_board_name_default_value.patch | 15 -
...51c-u-boot-makes_u-boot-clean_target_work.patch | 19 -
...d_possibility_to_choose_board_header_file.patch | 53 --
...u-boot-add_1.3.4_version_specific_support.patch | 49 -
...madeus_specific_options_for_config_header.patch | 30 -
.../051g-u-boot-add_u-boot-unpacked_target.patch | 15 -
...ot-makes_binary_targets_name_overloadable.patch | 44 -
.../051i-u-boot-multi-version-support.patch | 40 -
...x-adds_linux26-patched_target_to_Makefile.patch | 13 -
.../2010.02/053-libusb-bump_version.patch | 21 -
.../054-ntp-allow_ntpd_selection_or_not.patch | 43 -
.../2010.02/055-pyserial-add_package.patch | 12 -
.../2010.02/057-pymysql-add_package.patch | 12 -
...x_in_a_standalone_way_after_configuration.patch | 11 -
...061-mysql_client-reduce_installation_size.patch | 45 -
...-linux-change_board_specific_patches_name.patch | 11 -
.../buildroot/2010.02/072-xenomai-package.patch | 25 -
.../buildroot/2010.02/075-dummy-fix-warning.patch | 9 -
patches/buildroot/2010.02/076-ubifs.patch | 71 --
.../078-sdl-correct_libdir_path_in_libSDL.la.patch | 19 -
.../buildroot/2010.02/081-adds_quake_package.patch | 171 ----
.../2010.02/082-mtd-utils_with_ubi-utils.patch | 65 --
.../2010.02/083-adds_pygame_package.patch | 295 -------
.../buildroot/2010.02/085-adds_gpm_package.patch | 168 ----
.../2010.02/086-bump_proftp_version.patch | 47 -
.../buildroot/2010.02/095-uucp-add_packages.patch | 45 -
.../buildroot/2010.02/097-adds_flite_package.patch | 81 --
...for_pld_asm_instruction_on_non_armv5_arch.patch | 23 -
...r-add_patch_for_recent_alsa_compatibility.patch | 187 ----
...busybox-add_support_for_B921600_tty_speed.patch | 40 -
...e-add_infrastructure_to_install_firmwares.patch | 147 ----
.../buildroot/2010.02/107-games-add_wolf4sdl.patch | 91 --
.../2010.02/109-aumix-update_website.patch | 27 -
...-linux_eabi_config_option_support_for_arm.patch | 51 --
.../buildroot/2010.02/113-gpsd-add_package.patch | 486 -----------
.../2010.02/116-openobex-add_package.patch | 146 ---
.../2010.02/117-ussp-push-add_package.patch | 48 -
.../2010.05/001-add_armadeus_device.patch | 12 +
patches/buildroot/2010.05/006-lcd4linux.patch | 12 +
patches/buildroot/2010.05/018-allegro.patch | 12 +
.../buildroot/2010.05/021-sdl-water-config.patch | 13 +
patches/buildroot/2010.05/034-slideshow.patch | 12 +
.../2010.05/038-fakeroot-bump_version.patch | 13 +
patches/buildroot/2010.05/040-linux-makefile.patch | 46 +
patches/buildroot/2010.05/041-fbgrab.patch | 12 +
patches/buildroot/2010.05/042-socketcan.patch | 12 +
...dd_patch_for_recent_kernels_compatibility.patch | 53 ++
patches/buildroot/2010.05/047-uclibc-config.patch | 28 +
...ownload_minor_patches_from_kernel_org_too.patch | 34 +
...0-linux-remove_unsupported_kernel_version.patch | 41 +
...s_building_when_modules_compilation_fails.patch | 23 +
.../051-u-boot.a_refaire_entierement | 0
.../051a-u-boot-add_copy_to_functionnality.patch | 57 ++
...1b-u-boot-change_board_name_default_value.patch | 15 +
...51c-u-boot-makes_u-boot-clean_target_work.patch | 19 +
...d_possibility_to_choose_board_header_file.patch | 53 ++
...u-boot-add_1.3.4_version_specific_support.patch | 49 +
...madeus_specific_options_for_config_header.patch | 30 +
.../051g-u-boot-add_u-boot-unpacked_target.patch | 15 +
...ot-makes_binary_targets_name_overloadable.patch | 44 +
.../051i-u-boot-multi-version-support.patch | 26 +
...x-adds_linux26-patched_target_to_Makefile.patch | 15 +
.../054-ntp-allow_ntpd_selection_or_not.patch | 47 +
.../2010.05/055-pyserial-add_package.patch | 12 +
.../2010.05/057-pymysql-add_package.patch | 12 +
...sa_work_with_eabi_and_large_file_options.to_fix | 0
...x_in_a_standalone_way_after_configuration.patch | 13 +
...061-mysql_client-reduce_installation_size.patch | 49 +
.../062-add-uboot-conf-to-saved-project.to_fix | 0
...-linux-change_board_specific_patches_name.patch | 13 +
.../buildroot/2010.05/072-xenomai-package.patch | 26 +
patches/buildroot/2010.05/076-ubifs.tofix | 66 ++
.../078-sdl-correct_libdir_path_in_libSDL.la.patch | 21 +
.../buildroot/2010.05/081-adds_quake_package.patch | 169 ++++
.../2010.05/082-mtd-utils_with_ubi-utils.tofix | 65 ++
.../2010.05/083-adds_pygame_package.patch | 295 +++++++
.../buildroot/2010.05/085-adds_gpm_package.patch | 168 ++++
.../2010.05/086-bump_proftp_version.patch | 47 +
.../buildroot/2010.05/095-uucp-add_packages.patch | 45 +
...-libsndfile-updates_makefile_to_autotool.to_fix | 0
.../buildroot/2010.05/097-adds_flite_package.patch | 81 ++
...for_pld_asm_instruction_on_non_armv5_arch.patch | 23 +
...r-add_patch_for_recent_alsa_compatibility.patch | 187 ++++
...busybox-add_support_for_B921600_tty_speed.patch | 40 +
...e-add_infrastructure_to_install_firmwares.patch | 147 ++++
.../buildroot/2010.05/107-games-add_wolf4sdl.patch | 90 ++
...-linux_eabi_config_option_support_for_arm.patch | 51 ++
.../buildroot/2010.05/113-gpsd-add_package.patch | 486 +++++++++++
.../2010.05/116-openobex-add_package.patch | 146 +++
.../2010.05/117-ussp-push-add_package.patch | 48 +
.../add_packages_config_entry.pl | 0
.../{2010.02 => 2010.05}/cleanup_buildroot.sh | 0
120 files changed, 4416 insertions(+), 4448 deletions(-)
delete mode 100644 buildroot/package/lmbench/Config.in
delete mode 100644 buildroot/package/lmbench/lmbench.01.uclibc.comptat.patch
delete mode 100644 buildroot/package/lmbench/lmbench.mk
delete mode 100644 buildroot/package/tslib/.gitignore
delete mode 100644 buildroot/package/tslib/tslib-1.0-zz-make_it_work_on_powerpc_and_recent_kernels.patch
delete mode 100644 buildroot/package/tslib/tslib-1.0-zzz-prevents_unresolved_symbols.to_fix
delete mode 100644 buildroot/target/device/armadeus/busybox-1.16.0.config
create mode 100644 buildroot/target/device/armadeus/busybox-1.16.1.config
create mode 100644 patches/buildroot/043-lmbench-add_package.patch
create mode 100644 patches/buildroot/044-tslib-add_patch_for_recent_kernels_compatibility.patch
delete mode 100644 patches/buildroot/2010.02/001-add_armadeus_device.patch
delete mode 100644 patches/buildroot/2010.02/006-lcd4linux.patch
delete mode 100644 patches/buildroot/2010.02/017-lmbench.patch
delete mode 100644 patches/buildroot/2010.02/018-allegro.patch
delete mode 100644 patches/buildroot/2010.02/021-sdl-water-config.patch
delete mode 100644 patches/buildroot/2010.02/034-slideshow.patch
delete mode 100644 patches/buildroot/2010.02/038-fakeroot-bump_version.patch
delete mode 100644 patches/buildroot/2010.02/040-linux-makefile.patch
delete mode 100644 patches/buildroot/2010.02/041-fbgrab.patch
delete mode 100644 patches/buildroot/2010.02/042-socketcan.patch
delete mode 100644 patches/buildroot/2010.02/047-uclibc-config.patch
delete mode 100644 patches/buildroot/2010.02/049-linux-download_minor_patches_from_kernel_org_too.patch
delete mode 100644 patches/buildroot/2010.02/050-linux-remove_unsupported_kernel_version.patch
delete mode 100644 patches/buildroot/2010.02/050-linux-stops_building_when_modules_compilation_fails.patch
delete mode 100644 patches/buildroot/2010.02/051a-u-boot-add_copy_to_functionnality.patch
delete mode 100644 patches/buildroot/2010.02/051b-u-boot-change_board_name_default_value.patch
delete mode 100644 patches/buildroot/2010.02/051c-u-boot-makes_u-boot-clean_target_work.patch
delete mode 100644 patches/buildroot/2010.02/051d-u-boot-add_possibility_to_choose_board_header_file.patch
delete mode 100644 patches/buildroot/2010.02/051e-u-boot-add_1.3.4_version_specific_support.patch
delete mode 100644 patches/buildroot/2010.02/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
delete mode 100644 patches/buildroot/2010.02/051g-u-boot-add_u-boot-unpacked_target.patch
delete mode 100644 patches/buildroot/2010.02/051h-u-boot-makes_binary_targets_name_overloadable.patch
delete mode 100644 patches/buildroot/2010.02/051i-u-boot-multi-version-support.patch
delete mode 100644 patches/buildroot/2010.02/052-linux-adds_linux26-patched_target_to_Makefile.patch
delete mode 100644 patches/buildroot/2010.02/053-libusb-bump_version.patch
delete mode 100644 patches/buildroot/2010.02/054-ntp-allow_ntpd_selection_or_not.patch
delete mode 100644 patches/buildroot/2010.02/055-pyserial-add_package.patch
delete mode 100644 patches/buildroot/2010.02/057-pymysql-add_package.patch
delete mode 100644 patches/buildroot/2010.02/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
delete mode 100644 patches/buildroot/2010.02/061-mysql_client-reduce_installation_size.patch
delete mode 100644 patches/buildroot/2010.02/071-linux-change_board_specific_patches_name.patch
delete mode 100644 patches/buildroot/2010.02/072-xenomai-package.patch
delete mode 100644 patches/buildroot/2010.02/075-dummy-fix-warning.patch
delete mode 100644 patches/buildroot/2010.02/076-ubifs.patch
delete mode 100644 patches/buildroot/2010.02/078-sdl-correct_libdir_path_in_libSDL.la.patch
delete mode 100644 patches/buildroot/2010.02/081-adds_quake_package.patch
delete mode 100644 patches/buildroot/2010.02/082-mtd-utils_with_ubi-utils.patch
delete mode 100644 patches/buildroot/2010.02/083-adds_pygame_package.patch
delete mode 100644 patches/buildroot/2010.02/085-adds_gpm_package.patch
delete mode 100644 patches/buildroot/2010.02/086-bump_proftp_version.patch
delete mode 100644 patches/buildroot/2010.02/095-uucp-add_packages.patch
delete mode 100644 patches/buildroot/2010.02/097-adds_flite_package.patch
delete mode 100644 patches/buildroot/2010.02/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
delete mode 100644 patches/buildroot/2010.02/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
delete mode 100644 patches/buildroot/2010.02/105-busybox-add_support_for_B921600_tty_speed.patch
delete mode 100644 patches/buildroot/2010.02/106-firmware-add_infrastructure_to_install_firmwares.patch
delete mode 100644 patches/buildroot/2010.02/107-games-add_wolf4sdl.patch
delete mode 100644 patches/buildroot/2010.02/109-aumix-update_website.patch
delete mode 100644 patches/buildroot/2010.02/112-gcc-4_2_x-add_aapcs-linux_eabi_config_option_support_for_arm.patch
delete mode 100644 patches/buildroot/2010.02/113-gpsd-add_package.patch
delete mode 100644 patches/buildroot/2010.02/116-openobex-add_package.patch
delete mode 100644 patches/buildroot/2010.02/117-ussp-push-add_package.patch
create mode 100644 patches/buildroot/2010.05/001-add_armadeus_device.patch
create mode 100644 patches/buildroot/2010.05/006-lcd4linux.patch
create mode 100644 patches/buildroot/2010.05/018-allegro.patch
create mode 100644 patches/buildroot/2010.05/021-sdl-water-config.patch
create mode 100644 patches/buildroot/2010.05/034-slideshow.patch
create mode 100644 patches/buildroot/2010.05/038-fakeroot-bump_version.patch
create mode 100644 patches/buildroot/2010.05/040-linux-makefile.patch
create mode 100644 patches/buildroot/2010.05/041-fbgrab.patch
create mode 100644 patches/buildroot/2010.05/042-socketcan.patch
create mode 100644 patches/buildroot/2010.05/044-tslib-add_patch_for_recent_kernels_compatibility.patch
create mode 100644 patches/buildroot/2010.05/047-uclibc-config.patch
create mode 100644 patches/buildroot/2010.05/049-linux-download_minor_patches_from_kernel_org_too.patch
create mode 100644 patches/buildroot/2010.05/050-linux-remove_unsupported_kernel_version.patch
create mode 100644 patches/buildroot/2010.05/050-linux-stops_building_when_modules_compilation_fails.patch
rename patches/buildroot/{2010.02 => 2010.05}/051-u-boot.a_refaire_entierement (100%)
create mode 100644 patches/buildroot/2010.05/051a-u-boot-add_copy_to_functionnality.patch
create mode 100644 patches/buildroot/2010.05/051b-u-boot-change_board_name_default_value.patch
create mode 100644 patches/buildroot/2010.05/051c-u-boot-makes_u-boot-clean_target_work.patch
create mode 100644 patches/buildroot/2010.05/051d-u-boot-add_possibility_to_choose_board_header_file.patch
create mode 100644 patches/buildroot/2010.05/051e-u-boot-add_1.3.4_version_specific_support.patch
create mode 100644 patches/buildroot/2010.05/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
create mode 100644 patches/buildroot/2010.05/051g-u-boot-add_u-boot-unpacked_target.patch
create mode 100644 patches/buildroot/2010.05/051h-u-boot-makes_binary_targets_name_overloadable.patch
create mode 100644 patches/buildroot/2010.05/051i-u-boot-multi-version-support.patch
create mode 100644 patches/buildroot/2010.05/052-linux-adds_linux26-patched_target_to_Makefile.patch
create mode 100644 patches/buildroot/2010.05/054-ntp-allow_ntpd_selection_or_not.patch
create mode 100644 patches/buildroot/2010.05/055-pyserial-add_package.patch
create mode 100644 patches/buildroot/2010.05/057-pymysql-add_package.patch
rename patches/buildroot/{2010.02 => 2010.05}/058-makes_alsa_work_with_eabi_and_large_file_options.to_fix (100%)
create mode 100644 patches/buildroot/2010.05/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
create mode 100644 patches/buildroot/2010.05/061-mysql_client-reduce_installation_size.patch
rename patches/buildroot/{2010.02 => 2010.05}/062-add-uboot-conf-to-saved-project.to_fix (100%)
create mode 100644 patches/buildroot/2010.05/071-linux-change_board_specific_patches_name.patch
create mode 100644 patches/buildroot/2010.05/072-xenomai-package.patch
create mode 100644 patches/buildroot/2010.05/076-ubifs.tofix
create mode 100644 patches/buildroot/2010.05/078-sdl-correct_libdir_path_in_libSDL.la.patch
create mode 100644 patches/buildroot/2010.05/081-adds_quake_package.patch
create mode 100644 patches/buildroot/2010.05/082-mtd-utils_with_ubi-utils.tofix
create mode 100644 patches/buildroot/2010.05/083-adds_pygame_package.patch
create mode 100644 patches/buildroot/2010.05/085-adds_gpm_package.patch
create mode 100644 patches/buildroot/2010.05/086-bump_proftp_version.patch
create mode 100644 patches/buildroot/2010.05/095-uucp-add_packages.patch
rename patches/buildroot/{2010.02 => 2010.05}/096-libsndfile-updates_makefile_to_autotool.to_fix (100%)
create mode 100644 patches/buildroot/2010.05/097-adds_flite_package.patch
create mode 100644 patches/buildroot/2010.05/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
create mode 100644 patches/buildroot/2010.05/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
create mode 100644 patches/buildroot/2010.05/105-busybox-add_support_for_B921600_tty_speed.patch
create mode 100644 patches/buildroot/2010.05/106-firmware-add_infrastructure_to_install_firmwares.patch
create mode 100644 patches/buildroot/2010.05/107-games-add_wolf4sdl.patch
create mode 100644 patches/buildroot/2010.05/112-gcc-4_2_x-add_aapcs-linux_eabi_config_option_support_for_arm.patch
create mode 100644 patches/buildroot/2010.05/113-gpsd-add_package.patch
create mode 100644 patches/buildroot/2010.05/116-openobex-add_package.patch
create mode 100644 patches/buildroot/2010.05/117-ussp-push-add_package.patch
rename patches/buildroot/{2010.02 => 2010.05}/add_packages_config_entry.pl (100%)
rename patches/buildroot/{2010.02 => 2010.05}/cleanup_buildroot.sh (100%)
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index 4c63edd..e9c28cc 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -1,9 +1,9 @@
#
# Automatically generated make config: don't edit
-# Tue Jun 1 17:51:37 2010
+# Thu Jun 17 15:34:40 2010
#
BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2010.02"
+BR2_VERSION="2010.05"
# BR2_alpha is not set
BR2_arm=y
# BR2_armeb is not set
@@ -14,7 +14,6 @@ BR2_arm=y
# BR2_m68k is not set
# BR2_mips is not set
# BR2_mipsel is not set
-# BR2_nios2 is not set
# BR2_powerpc is not set
# BR2_sh is not set
# BR2_sh64 is not set
@@ -80,6 +79,10 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
#
# Build options
#
+
+#
+# Commands
+#
BR2_WGET="wget --passive-ftp"
BR2_SVN_CO="svn co"
BR2_SVN_UP="svn up"
@@ -91,6 +94,7 @@ BR2_BZCAT="bzcat"
BR2_TAR_OPTIONS=""
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_COPYTO=""
+BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
#
# Mirrors and Download locations
@@ -101,14 +105,8 @@ BR2_SOURCEFORGE_MIRROR="easynews"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
-BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
-BR2_GNU_TARGET_SUFFIX="linux-uclibcgnueabi"
BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
-BR2_RECENT=y
-BR2_CONFIG_CACHE=y
# BR2_ENABLE_DEBUG is not set
# BR2_STRIP_strip is not set
BR2_STRIP_sstrip=y
@@ -119,11 +117,13 @@ BR2_STRIP_sstrip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
+
+#
+# Advanced
+#
+BR2_CONFIG_CACHE=y
#
# Toolchain
@@ -134,13 +134,13 @@ BR2_TOOLCHAIN_BUILDROOT=y
#
# Kernel Header Options
#
-# BR2_KERNEL_HEADERS_2_6_26 is not set
# BR2_KERNEL_HEADERS_2_6_27 is not set
# BR2_KERNEL_HEADERS_2_6_28 is not set
# BR2_KERNEL_HEADERS_2_6_29 is not set
# BR2_KERNEL_HEADERS_2_6_30 is not set
# BR2_KERNEL_HEADERS_2_6_31 is not set
# BR2_KERNEL_HEADERS_2_6_32 is not set
+# BR2_KERNEL_HEADERS_2_6_33 is not set
BR2_KERNEL_HEADERS_VERSION=y
# BR2_KERNEL_HEADERS_SNAP is not set
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
@@ -151,11 +151,10 @@ BR2_DEFAULT_KERNEL_HEADERS="2.6.29.6"
#
# BR2_UCLIBC_VERSION_0_9_28_3 is not set
# BR2_UCLIBC_VERSION_0_9_29 is not set
-# BR2_UCLIBC_VERSION_0_9_30 is not set
-# BR2_UCLIBC_VERSION_0_9_30_1 is not set
-BR2_UCLIBC_VERSION_0_9_30_2=y
+BR2_UCLIBC_VERSION_0_9_30=y
+# BR2_UCLIBC_VERSION_0_9_31 is not set
# BR2_UCLIBC_VERSION_SNAPSHOT is not set
-BR2_UCLIBC_VERSION_STRING="0.9.30.2"
+BR2_UCLIBC_VERSION_STRING="0.9.30.3"
BR2_UCLIBC_CONFIG="$(BR2_BOARD_PATH)/uClibc-0.9.30.config.arm"
# BR2_PTHREAD_DEBUG is not set
# BR2_UCLIBC_INSTALL_TEST_SUITE is not set
@@ -165,11 +164,11 @@ BR2_UCLIBC_CONFIG="$(BR2_BOARD_PATH)/uClibc-0.9.30.config.arm"
#
# BR2_BINUTILS_VERSION_2_17 is not set
# BR2_BINUTILS_VERSION_2_18 is not set
-# BR2_BINUTILS_VERSION_2_18_50_0_9 is not set
# BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1 is not set
# BR2_BINUTILS_VERSION_2_19 is not set
# BR2_BINUTILS_VERSION_2_19_1 is not set
BR2_BINUTILS_VERSION_2_20=y
+# BR2_BINUTILS_VERSION_2_20_1 is not set
BR2_BINUTILS_VERSION="2.20"
BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
@@ -189,7 +188,7 @@ BR2_GCC_VERSION_4_4_X=y
# BR2_GCC_VERSION_SNAP is not set
BR2_GCC_SUPPORTS_SYSROOT=y
BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
-BR2_GCC_VERSION="4.4.3"
+BR2_GCC_VERSION="4.4.4"
BR2_TOOLCHAIN_SYSROOT=y
# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
BR2_EXTRA_GCC_CONFIG_OPTIONS=""
@@ -209,14 +208,18 @@ BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"
# Gdb Options
#
# BR2_PACKAGE_GDB is not set
+
+#
+# Gdb debugger for the target needs WCHAR support in toolchain
+#
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
-# BR2_GDB_VERSION_6_4 is not set
-# BR2_GDB_VERSION_6_5 is not set
# BR2_GDB_VERSION_6_6 is not set
BR2_GDB_VERSION_6_7_1=y
# BR2_GDB_VERSION_6_7_1_AVR32_2_1_5 is not set
# BR2_GDB_VERSION_6_8 is not set
+# BR2_GDB_VERSION_7_0_1 is not set
+# BR2_GDB_VERSION_7_1 is not set
BR2_GDB_VERSION="6.7.1"
#
@@ -227,6 +230,7 @@ BR2_INET_IPV6=y
BR2_INET_RPC=y
# BR2_ENABLE_LOCALE is not set
# BR2_ENABLE_LOCALE_PURGE is not set
+BR2_NEEDS_GETTEXT=y
BR2_USE_WCHAR=y
BR2_PREFER_SOFT_FLOAT=y
BR2_SOFT_FLOAT=y
@@ -256,220 +260,172 @@ BR2_PACKAGE_BUSYBOX=y
# BR2_BUSYBOX_VERSION_1_15_X is not set
BR2_BUSYBOX_VERSION_1_16_X=y
# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.16.0"
+BR2_BUSYBOX_VERSION="1.16.1"
BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION).config"
# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
# BR2_PACKAGE_BUSYBOX_SKELETON is not set
+# BR2_PACKAGE_CUSTOMIZE is not set
#
-# The minimum needed to build a uClibc development system
+# Audio and video libraries and applications
#
-# BR2_PACKAGE_FLEX is not set
+BR2_PACKAGE_ALSA_LIB=y
#
-# native toolchain needs development files in target filesystem
+# ALSA lib selection
#
-# BR2_PACKAGE_MAKE is not set
+BR2_PACKAGE_ALSA_LIB_DEVDIR="/dev/snd"
+BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS="all"
+BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS="all"
+BR2_PACKAGE_ALSA_LIB_ALOAD=y
+BR2_PACKAGE_ALSA_LIB_MIXER=y
+BR2_PACKAGE_ALSA_LIB_PCM=y
+BR2_PACKAGE_ALSA_LIB_RAWMIDI=y
+BR2_PACKAGE_ALSA_LIB_HWDEP=y
+BR2_PACKAGE_ALSA_LIB_SEQ=y
+BR2_PACKAGE_ALSA_LIB_ALISP=y
+BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS=y
+BR2_PACKAGE_ALSA_UTILS=y
#
-# Other development stuff
+# ALSA utils selection
+#
+# BR2_PACKAGE_ALSA_UTILS_ALSACONF is not set
+BR2_PACKAGE_ALSA_UTILS_ALSACTL=y
+BR2_PACKAGE_ALSA_UTILS_ALSAMIXER=y
+# BR2_PACKAGE_ALSA_UTILS_AMIDI is not set
+BR2_PACKAGE_ALSA_UTILS_AMIXER=y
+BR2_PACKAGE_ALSA_UTILS_APLAY=y
+# BR2_PACKAGE_ALSA_UTILS_ARECORD is not set
+# BR2_PACKAGE_ALSA_UTILS_IECSET is not set
+# BR2_PACKAGE_ALSA_UTILS_ACONNECT is not set
+# BR2_PACKAGE_ALSA_UTILS_APLAYMIDI is not set
+# BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI is not set
+# BR2_PACKAGE_ALSA_UTILS_ASEQDUMP is not set
+# BR2_PACKAGE_ALSA_UTILS_ASEQNET is not set
+BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+# BR2_PACKAGE_AUMIX is not set
+# BR2_PACKAGE_FLAC is not set
+# BR2_PACKAGE_FLITE is not set
+# BR2_PACKAGE_GSTREAMER is not set
+# BR2_PACKAGE_LIBCDAUDIO is not set
+# BR2_PACKAGE_LIBDVDREAD is not set
+# BR2_PACKAGE_LIBDVDNAV is not set
+# BR2_PACKAGE_LIBID3TAG is not set
+# BR2_PACKAGE_LIBMAD is not set
+# BR2_PACKAGE_LIBMMS is not set
+# BR2_PACKAGE_LIBMPD is not set
+# BR2_PACKAGE_LIBOGG is not set
+# BR2_PACKAGE_LIBSNDFILE is not set
+# BR2_PACKAGE_LIBTHEORA is not set
+# BR2_PACKAGE_LIBVORBIS is not set
+# BR2_PACKAGE_MADPLAY is not set
+# BR2_PACKAGE_MPG123 is not set
+# BR2_PACKAGE_MPLAYER is not set
+# BR2_PACKAGE_SPEEX is not set
+# BR2_PACKAGE_SWFDEC is not set
+# BR2_PACKAGE_FESTIVAL is not set
+# BR2_PACKAGE_TAGLIB is not set
+# BR2_PACKAGE_TREMOR is not set
+
+#
+# Compressors and decompressors
+#
+# BR2_PACKAGE_LZOP is not set
+# BR2_PACKAGE_LZMA is not set
+
+#
+# Debugging, profiling and benchmark
+#
+# BR2_PACKAGE_DMALLOC is not set
+# BR2_PACKAGE_KEXEC is not set
+# BR2_PACKAGE_LMBENCH is not set
+# BR2_PACKAGE_LSOF is not set
+# BR2_PACKAGE_LTRACE is not set
+# BR2_PACKAGE_MEMSTAT is not set
+# BR2_PACKAGE_NETPERF is not set
+# BR2_PACKAGE_OPROFILE is not set
+# BR2_PACKAGE_STRACE is not set
+
+#
+# Development tools
#
# BR2_PACKAGE_AUTOCONF is not set
# BR2_PACKAGE_AUTOMAKE is not set
# BR2_PACKAGE_BISON is not set
-# BR2_PACKAGE_CCACHE_TARGET is not set
+# BR2_PACKAGE_BSDIFF is not set
# BR2_PACKAGE_CVS is not set
# BR2_PACKAGE_DISTCC is not set
-# BR2_PACKAGE_DMALLOC is not set
# BR2_PACKAGE_FAKEROOT is not set
-BR2_HOST_FAKEROOT=y
+# BR2_PACKAGE_FLEX is not set
+
+#
+# native toolchain needs development files in target filesystem
+#
# BR2_PACKAGE_GETTEXT is not set
# BR2_PACKAGE_LIBINTL is not set
# BR2_PACKAGE_LIBGMP is not set
# BR2_PACKAGE_GPERF is not set
+# BR2_PACKAGE_INTLTOOL is not set
+# BR2_PACKAGE_MAKE is not set
# BR2_PACKAGE_LIBMPFR is not set
# BR2_PACKAGE_LIBTOOL is not set
# BR2_PACKAGE_M4 is not set
-# BR2_PACKAGE_OPROFILE is not set
# BR2_PACKAGE_PKG_CONFIG is not set
-# BR2_PACKAGE_READLINE is not set
-# BR2_PACKAGE_PCRE is not set
-# BR2_PACKAGE_INTLTOOL is not set
#
-# Armadeus specific packages
+# Games
#
-# BR2_PACKAGE_UUCP is not set
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
+# BR2_PACKAGE_GNUCHESS is not set
+# BR2_PACKAGE_PRBOOM is not set
#
-# bluez-utils not available (need dbus)
+# Graphic libraries and applications (graphic/text)
#
-# BR2_PACKAGE_MESALIB is not set
-# BR2_PACKAGE_FBTEST is not set
#
-# Armadeus specific tools/utilities
+# graphic libraries
#
-# BR2_PACKAGE_AD9889CTRL is not set
-# BR2_PACKAGE_AS_DEVICES is not set
-BR2_PACKAGE_CH7024CTRL=y
-# BR2_PACKAGE_ARMADEUS_DEMOS is not set
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_IMXREGS=y
-# BR2_PACKAGE_IMXSSI is not set
-BR2_PACKAGE_MAX5821CTRL=y
-# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
-# BR2_PACKAGE_FIRMWARE is not set
-# BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8 is not set
-# BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9 is not set
-# BR2_PACKAGE_DUMMY is not set
-# BR2_PACKAGE_SNES9X is not set
+# BR2_PACKAGE_ALLEGRO is not set
+# BR2_PACKAGE_DIRECTFB is not set
+# BR2_PACKAGE_FBDUMP is not set
+# BR2_PACKAGE_FBGRAB is not set
+# BR2_PACKAGE_FBV is not set
+# BR2_PACKAGE_IMAGEMAGICK is not set
+# BR2_PACKAGE_LINUX_FUSION is not set
+# BR2_PACKAGE_SDL is not set
#
-# Other stuff
+# Demos
#
-# BR2_PACKAGE_AT is not set
-# BR2_PACKAGE_BEECRYPT is not set
-# BR2_PACKAGE_BERKELEYDB is not set
-# BR2_PACKAGE_BSDIFF is not set
-# BR2_PACKAGE_CUPS is not set
-# BR2_PACKAGE_CUSTOMIZE is not set
-# BR2_PACKAGE_ENCHANT is not set
-# BR2_PACKAGE_FILE is not set
-# BR2_PACKAGE_GAMIN is not set
-# BR2_PACKAGE_ICU is not set
-# BR2_PACKAGE_KEXEC is not set
-# BR2_PACKAGE_LIBCONFIG is not set
-# BR2_PACKAGE_LIBCONFUSE is not set
-# BR2_PACKAGE_LIBDAEMON is not set
-# BR2_PACKAGE_LIBELF is not set
-# BR2_PACKAGE_LIBEVENT is not set
-# BR2_PACKAGE_LIBGCRYPT is not set
-# BR2_PACKAGE_LIBGPG_ERROR is not set
-# BR2_PACKAGE_LIBICONV is not set
-# BR2_PACKAGE_LIBIDN is not set
-# BR2_PACKAGE_LIBLOCKFILE is not set
-# BR2_PACKAGE_LIBOIL is not set
-# BR2_PACKAGE_LIBSYSFS is not set
-# BR2_PACKAGE_LMBENCH is not set
-# BR2_PACKAGE_LOCKFILE_PROGS is not set
-# BR2_PACKAGE_LOGROTATE is not set
-# BR2_PACKAGE_LSOF is not set
-# BR2_PACKAGE_LTP-TESTSUITE is not set
-# BR2_PACKAGE_LTRACE is not set
-# BR2_PACKAGE_MEMSTAT is not set
-# BR2_PACKAGE_POPT is not set
-# BR2_PACKAGE_SCREEN is not set
-# BR2_PACKAGE_SHARED_MIME_INFO is not set
-# BR2_PACKAGE_STARTUP_NOTIFICATION is not set
-# BR2_PACKAGE_STRACE is not set
-# BR2_PACKAGE_SUDO is not set
-# BR2_PACKAGE_XENOMAI is not set
+# BR2_PACKAGE_SDL_WATER is not set
#
-# Database
+# other GUIs
#
-# BR2_PACKAGE_MYSQL_CLIENT is not set
-# BR2_PACKAGE_SQLITE is not set
+# BR2_PACKAGE_QT is not set
+# BR2_PACKAGE_XORG7 is not set
#
-# Text editors
+# X libraries and helper libraries
#
-# BR2_PACKAGE_ED is not set
-BR2_PACKAGE_NANO=y
-# BR2_PACKAGE_UEMACS is not set
+# BR2_PACKAGE_LIBERATION is not set
#
-# Networking
+# X Window managers
#
#
-# Networking applications
+# X applications
#
-# BR2_PACKAGE_ARGUS is not set
-# BR2_PACKAGE_AVAHI is not set
-# BR2_PACKAGE_AXEL is not set
-# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BMON is not set
-# BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_CTORRENT is not set
-# BR2_PACKAGE_DNSMASQ is not set
-# BR2_PACKAGE_DROPBEAR is not set
-# BR2_PACKAGE_ETHTOOL is not set
-# BR2_PACKAGE_HASERL is not set
-# BR2_PACKAGE_HOSTAPD is not set
-# BR2_PACKAGE_IFPLUGD is not set
-# BR2_PACKAGE_IPERF is not set
-# BR2_PACKAGE_IPROUTE2 is not set
-# BR2_PACKAGE_IPSEC_TOOLS is not set
-# BR2_PACKAGE_IPTABLES is not set
-# BR2_PACKAGE_IW is not set
-# BR2_PACKAGE_KISMET is not set
-# BR2_PACKAGE_L2TP is not set
-# BR2_PACKAGE_LIBCGI is not set
-# BR2_PACKAGE_LIBCGICC is not set
-# BR2_PACKAGE_LIBCURL is not set
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_LIBEXOSIP2 is not set
-# BR2_PACKAGE_LIBMICROHTTPD is not set
-# BR2_PACKAGE_LIBNL is not set
-# BR2_PACKAGE_LIBOSIP2 is not set
-# BR2_PACKAGE_LIBPCAP is not set
-# BR2_PACKAGE_LIBSOUP is not set
-# BR2_PACKAGE_LIBUPNP is not set
-# BR2_PACKAGE_LINKS is not set
-# BR2_PACKAGE_LRZSZ is not set
-# BR2_PACKAGE_MIIDIAG is not set
-# BR2_PACKAGE_MROUTED is not set
-# BR2_PACKAGE_MUTT is not set
-# BR2_PACKAGE_NBD is not set
-# BR2_PACKAGE_NCFTP is not set
-# BR2_PACKAGE_NEON is not set
-# BR2_PACKAGE_NETPLUG is not set
-# BR2_PACKAGE_NETSNMP is not set
-# BR2_PACKAGE_NETSTAT_NAT is not set
-# BR2_PACKAGE_NFS_UTILS is not set
-BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_NTPD is not set
-# BR2_PACKAGE_NTP_SNTP is not set
-# BR2_PACKAGE_OLSR is not set
-# BR2_PACKAGE_OPENNTPD is not set
-# BR2_PACKAGE_OPENSSH is not set
-# BR2_PACKAGE_OPENSSL is not set
-# BR2_PACKAGE_OPENVPN is not set
-BR2_PACKAGE_PORTMAP=y
-# BR2_PACKAGE_PPPD is not set
-# BR2_PACKAGE_RADVD is not set
-# BR2_PACKAGE_RP_PPPOE is not set
-# BR2_PACKAGE_PPTP_LINUX is not set
-# BR2_PACKAGE_PROFTPD is not set
-# BR2_PACKAGE_QUAGGA is not set
-# BR2_PACKAGE_RSYNC is not set
-# BR2_PACKAGE_SAMBA is not set
-# BR2_PACKAGE_SER2NET is not set
-# BR2_PACKAGE_SOCAT is not set
-# BR2_PACKAGE_SOCKETCAN is not set
-# BR2_PACKAGE_SPAWN_FCGI is not set
-# BR2_PACKAGE_STUNNEL is not set
-# BR2_PACKAGE_TCPDUMP is not set
-# BR2_PACKAGE_DHCPDUMP is not set
-# BR2_PACKAGE_TCPREPLAY is not set
-# BR2_PACKAGE_TN5250 is not set
-# BR2_PACKAGE_TTCP is not set
-# BR2_PACKAGE_UDPCAST is not set
-# BR2_PACKAGE_VPNC is not set
-# BR2_PACKAGE_VSFTPD is not set
-# BR2_PACKAGE_VTUN is not set
-# BR2_PACKAGE_WEBIF is not set
-# BR2_PACKAGE_WIRELESS_TOOLS is not set
-# BR2_PACKAGE_WPA_SUPPLICANT is not set
+# BR2_PACKAGE_GOB2 is not set
#
-# Hardware handling / blockdevices and filesystem maintenance
+# Hardware handling
#
+# BR2_PACKAGE_CDRKIT is not set
+# BR2_PACKAGE_CRAMFS is not set
#
# dbus not available (need expat or libxml2)
@@ -479,10 +435,13 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_E2FSPROGS is not set
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
+# BR2_PACKAGE_FIRMWARE is not set
# BR2_PACKAGE_FIS is not set
-# BR2_PACKAGE_LIBFUSE is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
+# BR2_PACKAGE_GENEXT2FS is not set
+# BR2_PACKAGE_GENROMFS is not set
# BR2_PACKAGE_GPM is not set
+# BR2_PACKAGE_GPSD is not set
# BR2_PACKAGE_GVFS is not set
# BR2_PACKAGE_HAL is not set
# BR2_PACKAGE_HWDATA is not set
@@ -490,11 +449,9 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_INPUT_TOOLS is not set
# BR2_PACKAGE_IOSTAT is not set
# BR2_PACKAGE_LCD4LINUX is not set
-# BR2_PACKAGE_LIBAIO is not set
-# BR2_PACKAGE_LIBRAW1394 is not set
-# BR2_PACKAGE_LIBUSB is not set
# BR2_PACKAGE_LM_SENSORS is not set
# BR2_PACKAGE_LVM2 is not set
+# BR2_PACKAGE_MAKEDEVS is not set
# BR2_PACKAGE_MDADM is not set
# BR2_PACKAGE_MEMTESTER is not set
BR2_PACKAGE_MTD=y
@@ -527,6 +484,7 @@ BR2_PACKAGE_MTD_NANDWRITE=y
# BR2_PACKAGE_MTD_RFDFORMAT is not set
# BR2_PACKAGE_MTD_SERVE_IMAGE is not set
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_MTD_MTDINFO=y
BR2_PACKAGE_MTD_UBIATTACH=y
BR2_PACKAGE_MTD_UBICRC32=y
BR2_PACKAGE_MTD_UBIDETACH=y
@@ -544,166 +502,221 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_PCMCIA is not set
# BR2_PACKAGE_SETSERIAL is not set
# BR2_PACKAGE_SMARTMONTOOLS is not set
+# BR2_PACKAGE_SQUASHFS is not set
# BR2_PACKAGE_SYSSTAT is not set
# BR2_PACKAGE_USB_MODESWITCH is not set
# BR2_PACKAGE_USBMOUNT is not set
# BR2_PACKAGE_USBUTILS is not set
# BR2_PACKAGE_WIPE is not set
+# BR2_PACKAGE_XENOMAI is not set
# BR2_PACKAGE_XFSPROGS is not set
#
-# Audio and video libraries and applications
+# Interpreter languages and scripting
#
-BR2_PACKAGE_ALSA_LIB=y
+# BR2_PACKAGE_HASERL is not set
+# BR2_PACKAGE_LUA is not set
+# BR2_PACKAGE_MICROPERL is not set
+# BR2_PACKAGE_PHP is not set
+# BR2_PACKAGE_PYTHON is not set
+# BR2_PACKAGE_RUBY is not set
+# BR2_PACKAGE_TCL is not set
#
-# ALSA lib selection
+# Libraries
#
-BR2_PACKAGE_ALSA_LIB_DEVDIR="/dev/snd"
-BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS="all"
-BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS="all"
-BR2_PACKAGE_ALSA_LIB_ALOAD=y
-BR2_PACKAGE_ALSA_LIB_MIXER=y
-BR2_PACKAGE_ALSA_LIB_PCM=y
-BR2_PACKAGE_ALSA_LIB_RAWMIDI=y
-BR2_PACKAGE_ALSA_LIB_HWDEP=y
-BR2_PACKAGE_ALSA_LIB_SEQ=y
-BR2_PACKAGE_ALSA_LIB_ALISP=y
-BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS=y
-BR2_PACKAGE_ALSA_UTILS=y
#
-# ALSA utils selection
+# Compression and decompression
#
-# BR2_PACKAGE_ALSA_UTILS_ALSACONF is not set
-BR2_PACKAGE_ALSA_UTILS_ALSACTL=y
-BR2_PACKAGE_ALSA_UTILS_ALSAMIXER=y
-# BR2_PACKAGE_ALSA_UTILS_AMIDI is not set
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-# BR2_PACKAGE_ALSA_UTILS_ARECORD is not set
-# BR2_PACKAGE_ALSA_UTILS_IECSET is not set
-# BR2_PACKAGE_ALSA_UTILS_ACONNECT is not set
-# BR2_PACKAGE_ALSA_UTILS_APLAYMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_ASEQDUMP is not set
-# BR2_PACKAGE_ALSA_UTILS_ASEQNET is not set
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-# BR2_PACKAGE_AUMIX is not set
-# BR2_PACKAGE_FLAC is not set
-# BR2_PACKAGE_GSTREAMER is not set
-# BR2_PACKAGE_LIBCDAUDIO is not set
-# BR2_PACKAGE_LIBDVDREAD is not set
-# BR2_PACKAGE_LIBDVDNAV is not set
-# BR2_PACKAGE_LIBID3TAG is not set
-# BR2_PACKAGE_LIBMAD is not set
-# BR2_PACKAGE_LIBMMS is not set
-# BR2_PACKAGE_LIBMPD is not set
-# BR2_PACKAGE_LIBOGG is not set
-# BR2_PACKAGE_LIBSNDFILE is not set
-# BR2_PACKAGE_LIBTHEORA is not set
-# BR2_PACKAGE_LIBVORBIS is not set
-# BR2_PACKAGE_MADPLAY is not set
-# BR2_PACKAGE_MPG123 is not set
-# BR2_PACKAGE_MPLAYER is not set
-# BR2_PACKAGE_SPEEX is not set
-# BR2_PACKAGE_SWFDEC is not set
-# BR2_PACKAGE_FESTIVAL is not set
-# BR2_PACKAGE_FLITE is not set
-# BR2_PACKAGE_TAGLIB is not set
-# BR2_PACKAGE_TREMOR is not set
-# BR2_PACKAGE_VLC is not set
+# BR2_PACKAGE_LIBARCHIVE is not set
+BR2_PACKAGE_LZO=y
+BR2_PACKAGE_ZLIB=y
#
-# Graphic libraries and applications (graphic/text)
+# Crypto
#
+# BR2_PACKAGE_BEECRYPT is not set
+# BR2_PACKAGE_LIBGCRYPT is not set
+# BR2_PACKAGE_LIBGPG_ERROR is not set
+# BR2_PACKAGE_OPENSSL is not set
#
-# text rendering libraries
+# Database
#
-BR2_PACKAGE_NCURSES=y
-BR2_PACKAGE_NCURSES_TARGET_PANEL=y
-BR2_PACKAGE_NCURSES_TARGET_FORM=y
-BR2_PACKAGE_NCURSES_TARGET_MENU=y
-# BR2_PACKAGE_NEWT is not set
-# BR2_PACKAGE_SLANG is not set
+# BR2_PACKAGE_BERKELEYDB is not set
+# BR2_PACKAGE_MYSQL_CLIENT is not set
+# BR2_PACKAGE_SQLITE is not set
#
-# text rendering applications
+# Filesystem
#
-# BR2_PACKAGE_DIALOG is not set
+# BR2_PACKAGE_GAMIN is not set
+# BR2_PACKAGE_LIBCONFIG is not set
+# BR2_PACKAGE_LIBCONFUSE is not set
+# BR2_PACKAGE_LIBFUSE is not set
+# BR2_PACKAGE_LIBLOCKFILE is not set
+# BR2_PACKAGE_LIBSYSFS is not set
#
-# graphic libraries
+# Graphics
#
-# BR2_PACKAGE_ALLEGRO is not set
-# BR2_PACKAGE_DIRECTFB is not set
-# BR2_PACKAGE_FBDUMP is not set
-# BR2_PACKAGE_IMAGEMAGICK is not set
+# BR2_PACKAGE_ATK is not set
+# BR2_PACKAGE_CAIRO is not set
+# BR2_PACKAGE_FONTCONFIG is not set
+# BR2_PACKAGE_FREETYPE is not set
# BR2_PACKAGE_JPEG is not set
# BR2_PACKAGE_LIBART is not set
# BR2_PACKAGE_LIBPNG is not set
# BR2_PACKAGE_LIBUNGIF is not set
-# BR2_PACKAGE_LINUX_FUSION is not set
+# BR2_PACKAGE_PANGO is not set
# BR2_PACKAGE_PIXMAN is not set
-# BR2_PACKAGE_SDL is not set
# BR2_PACKAGE_TIFF is not set
#
-# Demos
+# Hardware handling
#
-# BR2_PACKAGE_SDL_WATER is not set
+# BR2_PACKAGE_LIBAIO is not set
+# BR2_PACKAGE_LIBRAW1394 is not set
+BR2_PACKAGE_TSLIB=y
+# BR2_PACKAGE_LIBUSB is not set
#
-# busybox graphic applications
+# Java
#
+# BR2_PACKAGE_CLASSPATH is not set
#
-# --> May be broken in busybox
+# Networking
#
-# BR2_PACKAGE_FBV is not set
-# BR2_PACKAGE_FBSET is not set
-# BR2_PACKAGE_FBGRAB is not set
+# BR2_PACKAGE_LIBCGI is not set
+# BR2_PACKAGE_LIBCGICC is not set
+# BR2_PACKAGE_LIBCURL is not set
+# BR2_PACKAGE_LIBDNET is not set
+# BR2_PACKAGE_LIBEXOSIP2 is not set
+# BR2_PACKAGE_LIBIDN is not set
+# BR2_PACKAGE_LIBMICROHTTPD is not set
+# BR2_PACKAGE_NEON is not set
+# BR2_PACKAGE_LIBNL is not set
+# BR2_PACKAGE_LIBPCAP is not set
+# BR2_PACKAGE_LIBOSIP2 is not set
+# BR2_PACKAGE_LIBRSYNC is not set
+# BR2_PACKAGE_LIBSOUP is not set
+# BR2_PACKAGE_LIBUPNP is not set
#
-# other GUIs
+# Other
#
-# BR2_PACKAGE_QT is not set
-# BR2_PACKAGE_XORG7 is not set
+# BR2_PACKAGE_LIBATOMIC_OPS is not set
+# BR2_PACKAGE_LIBCAP is not set
+# BR2_PACKAGE_LIBDAEMON is not set
+# BR2_PACKAGE_LIBELF is not set
+# BR2_PACKAGE_LIBEVENT is not set
+# BR2_PACKAGE_LIBGLIB12 is not set
+# BR2_PACKAGE_LIBGLIB2 is not set
+# BR2_PACKAGE_LIBOIL is not set
#
-# X libraries and helper libraries
+# Text and terminal handling
#
-# BR2_PACKAGE_ATK is not set
-# BR2_PACKAGE_CAIRO is not set
-# BR2_PACKAGE_PANGO is not set
-# BR2_PACKAGE_LIBDRM is not set
-# BR2_PACKAGE_LIBERATION is not set
-# BR2_PACKAGE_LIBGLIB12 is not set
-# BR2_PACKAGE_LIBGLIB2 is not set
-# BR2_PACKAGE_FONTCONFIG is not set
-# BR2_PACKAGE_FREETYPE is not set
-BR2_PACKAGE_TSLIB=y
-# BR2_PACKAGE_WEBKIT is not set
+# BR2_PACKAGE_ENCHANT is not set
+# BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_LIBICONV is not set
+BR2_PACKAGE_NCURSES=y
+BR2_PACKAGE_NCURSES_TARGET_PANEL=y
+BR2_PACKAGE_NCURSES_TARGET_FORM=y
+BR2_PACKAGE_NCURSES_TARGET_MENU=y
+# BR2_PACKAGE_NEWT is not set
+# BR2_PACKAGE_PCRE is not set
+# BR2_PACKAGE_POPT is not set
+# BR2_PACKAGE_READLINE is not set
+# BR2_PACKAGE_SLANG is not set
#
-# X Window managers
+# XML
#
+# BR2_PACKAGE_EXPAT is not set
+# BR2_PACKAGE_EZXML is not set
+# BR2_PACKAGE_LIBXML_PARSER_PERL is not set
+# BR2_PACKAGE_LIBXML2 is not set
+# BR2_PACKAGE_LIBXSLT is not set
+# BR2_PACKAGE_XERCES is not set
#
-# X applications
+# Miscellaneous
#
-# BR2_PACKAGE_GOB2 is not set
-# BR2_PACKAGE_SYLPHEED is not set
+# BR2_PACKAGE_SHARED_MIME_INFO is not set
#
-# Compressors / decompressors
+# Networking applications
#
-# BR2_PACKAGE_LIBARCHIVE is not set
-BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_LZMA is not set
-BR2_PACKAGE_ZLIB=y
+# BR2_PACKAGE_ARGUS is not set
+# BR2_PACKAGE_AVAHI is not set
+# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BIND is not set
+# BR2_PACKAGE_BMON is not set
+# BR2_PACKAGE_BRIDGE is not set
+# BR2_PACKAGE_CTORRENT is not set
+# BR2_PACKAGE_CUPS is not set
+# BR2_PACKAGE_DNSMASQ is not set
+# BR2_PACKAGE_DROPBEAR is not set
+# BR2_PACKAGE_ETHTOOL is not set
+# BR2_PACKAGE_HOSTAPD is not set
+# BR2_PACKAGE_IFPLUGD is not set
+# BR2_PACKAGE_IPERF is not set
+# BR2_PACKAGE_IPROUTE2 is not set
+# BR2_PACKAGE_IPSEC_TOOLS is not set
+# BR2_PACKAGE_IPTABLES is not set
+# BR2_PACKAGE_IW is not set
+# BR2_PACKAGE_KISMET is not set
+# BR2_PACKAGE_L2TP is not set
+# BR2_PACKAGE_LINKS is not set
+# BR2_PACKAGE_LRZSZ is not set
+# BR2_PACKAGE_MIIDIAG is not set
+# BR2_PACKAGE_MROUTED is not set
+# BR2_PACKAGE_MUTT is not set
+# BR2_PACKAGE_NBD is not set
+# BR2_PACKAGE_NCFTP is not set
+# BR2_PACKAGE_NETPLUG is not set
+# BR2_PACKAGE_NETSNMP is not set
+# BR2_PACKAGE_NETSTAT_NAT is not set
+# BR2_PACKAGE_NFS_UTILS is not set
+BR2_PACKAGE_NTP=y
+# BR2_PACKAGE_NTP_NTPD is not set
+# BR2_PACKAGE_NTP_SNTP is not set
+# BR2_PACKAGE_OLSR is not set
+# BR2_PACKAGE_OPENNTPD is not set
+# BR2_PACKAGE_OPENOBEX is not set
+# BR2_PACKAGE_OPENSSH is not set
+# BR2_PACKAGE_OPENVPN is not set
+BR2_PACKAGE_PORTMAP=y
+# BR2_PACKAGE_PPPD is not set
+# BR2_PACKAGE_RADVD is not set
+# BR2_PACKAGE_RP_PPPOE is not set
+# BR2_PACKAGE_PPTP_LINUX is not set
+# BR2_PACKAGE_PROFTPD is not set
+# BR2_PACKAGE_QUAGGA is not set
+# BR2_PACKAGE_RSYNC is not set
+# BR2_PACKAGE_SAMBA is not set
+# BR2_PACKAGE_SER2NET is not set
+# BR2_PACKAGE_SOCAT is not set
+# BR2_PACKAGE_SOCKETCAN is not set
+# BR2_PACKAGE_SPAWN_FCGI is not set
+# BR2_PACKAGE_SQUID is not set
+# BR2_PACKAGE_STUNNEL is not set
+# BR2_PACKAGE_TCPDUMP is not set
+# BR2_PACKAGE_DHCPDUMP is not set
+# BR2_PACKAGE_TCPREPLAY is not set
+# BR2_PACKAGE_TN5250 is not set
+# BR2_PACKAGE_TTCP is not set
+# BR2_PACKAGE_UDPCAST is not set
+# BR2_PACKAGE_USSP_PUSH is not set
+# BR2_PACKAGE_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 is not set
+# BR2_PACKAGE_WPA_SUPPLICANT is not set
#
# Package managers
@@ -712,47 +725,59 @@ BR2_PACKAGE_ZLIB=y
# BR2_PACKAGE_PORTAGE is not set
#
-# Interpreter languages / Scripting
+# Shell and utilities
#
-# BR2_PACKAGE_LUA is not set
-# BR2_PACKAGE_MICROPERL is not set
-# BR2_PACKAGE_PYTHON is not set
-# BR2_PACKAGE_RUBY is not set
-# BR2_PACKAGE_TCL is not set
-# BR2_PACKAGE_PHP is not set
+# BR2_PACKAGE_AT is not set
+# BR2_PACKAGE_DIALOG is not set
+# BR2_PACKAGE_FILE is not set
+# BR2_PACKAGE_LOCKFILE_PROGS is not set
+# BR2_PACKAGE_LOGROTATE is not set
+# BR2_PACKAGE_SCREEN is not set
+# BR2_PACKAGE_SUDO is not set
+# BR2_PACKAGE_WHICH is not set
#
-# XML handling
+# System tools
#
-# BR2_PACKAGE_EXPAT is not set
-# BR2_PACKAGE_EZXML is not set
-# BR2_PACKAGE_LIBXML2 is not set
-# BR2_PACKAGE_LIBXSLT is not set
-# BR2_PACKAGE_XERCES is not set
-# BR2_PACKAGE_LIBXML_PARSER_PERL is not set
#
-# Java
+# Text editors and viewers
#
-# BR2_PACKAGE_CLASSPATH is not set
+# BR2_PACKAGE_ED is not set
+BR2_PACKAGE_NANO=y
+# BR2_PACKAGE_UEMACS is not set
#
-# Games
+# Armadeus specific packages
#
-# BR2_PACKAGE_GNUCHESS is not set
-# BR2_PACKAGE_PRBOOM is not set
-# BR2_PACKAGE_SDLQUAKE is not set
+# BR2_PACKAGE_UUCP is not set
+# BR2_PACKAGE_MESALIB is not set
#
-# Target filesystem options
+# Armadeus specific tools/utilities
#
-BR2_ROOTFS_PREFIX="$(BR2_BOARD_NAME)-rootfs"
-BR2_ROOTFS_SUFFIX=""
-BR2_ROOTFS_POST_BUILD_SCRIPT=""
+# BR2_PACKAGE_AD9889CTRL is not set
+# BR2_PACKAGE_AS_DEVICES is not set
+BR2_PACKAGE_CH7024CTRL=y
+# BR2_PACKAGE_ARMADEUS_DEMOS is not set
+BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_IMXREGS=y
+# BR2_PACKAGE_IMXSSI is not set
+BR2_PACKAGE_MAX5821CTRL=y
+# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
+# BR2_PACKAGE_BLUEZ_LIBS is not set
#
-# filesystem for target device
+# bluez-utils not available (need dbus)
+#
+# BR2_PACKAGE_FBTEST is not set
+# BR2_PACKAGE_SNES9X is not set
+
+#
+# Target filesystem options
#
+BR2_ROOTFS_POST_BUILD_SCRIPT=""
+BR2_ROOTFS_DEVICE_TABLE="target/device/armadeus/rootfs/device_table.txt"
# BR2_TARGET_ROOTFS_CRAMFS is not set
# BR2_TARGET_ROOTFS_CLOOP is not set
# BR2_TARGET_ROOTFS_EXT2 is not set
@@ -773,8 +798,7 @@ BR2_TARGET_ROOTFS_JFFS2_PADSIZE=0x0
BR2_TARGET_ROOTFS_JFFS2_LE=y
# BR2_TARGET_ROOTFS_JFFS2_BE is not set
# BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
-BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
+# BR2_TARGET_ROOTFS_UBIFS is not set
# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
BR2_TARGET_ROOTFS_TAR_NONE=y
@@ -782,13 +806,12 @@ BR2_TARGET_ROOTFS_TAR_NONE=y
# BR2_TARGET_ROOTFS_TAR_BZIP2 is not set
# BR2_TARGET_ROOTFS_TAR_LZMA is not set
BR2_TARGET_ROOTFS_TAR_OPTIONS=""
-BR2_TARGET_ROOTFS_TAR_COPYTO=""
# BR2_TARGET_ROOTFS_CPIO is not set
# BR2_TARGET_ROOTFS_INITRAMFS is not set
# BR2_TARGET_ROOTFS_ROMFS is not set
#
-# bootloader for target device
+# Bootloaders
#
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
@@ -821,33 +844,27 @@ BR2_KERNEL_LINUX_ADVANCED=y
BR2_PACKAGE_LINUX=y
BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
BR2_PACKAGE_LINUX_FORMAT="uImage"
-BR2_KERNEL_CURRENT_VERSION="2.6.32.9"
-BR2_KERNEL_LATEST_2_6_32="9"
-BR2_KERNEL_LATEST_2_6_31="12"
+BR2_KERNEL_CURRENT_VERSION="2.6.33.4"
+BR2_KERNEL_LATEST_2_6_33="4"
+BR2_KERNEL_LATEST_2_6_32="13"
+BR2_KERNEL_LATEST_2_6_31="13"
BR2_KERNEL_LATEST_2_6_30="10"
BR2_KERNEL_LATEST_2_6_29="6"
BR2_KERNEL_LATEST_2_6_28="10"
-BR2_KERNEL_LATEST_2_6_27="45"
-BR2_KERNEL_LATEST_2_6_26="8"
-BR2_KERNEL_LATEST_2_6_25="20"
-BR2_KERNEL_LATEST_2_6_24="7"
+BR2_KERNEL_LATEST_2_6_27="46"
BR2_KERNEL_PATCH_LEVEL="$(BR2_KERNEL_MINORLEVEL)"
BR2_KERNEL_NEXT_VERSION="2.6.30"
BR2_KERNEL_THIS_VERSION="2.6.29"
BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6"
-BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
-BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
BR2_KERNEL_PATCH_SITE="$(BR2_KERNEL_SITE)"
# BR2_LINUX_2_6_STABLE is not set
+# BR2_LINUX_2_6_33 is not set
# BR2_LINUX_2_6_32 is not set
# BR2_LINUX_2_6_31 is not set
# BR2_LINUX_2_6_30 is not set
BR2_LINUX_2_6_29=y
# BR2_LINUX_2_6_28 is not set
# BR2_LINUX_2_6_27 is not set
-# BR2_LINUX_2_6_26 is not set
-# BR2_LINUX_2_6_25 is not set
-# BR2_LINUX_2_6_24 is not set
# BR2_LINUX26_CUSTOM is not set
#
@@ -861,8 +878,6 @@ BR2_KERNEL_ADD_MINORPATCH=y
# BR2_KERNEL_ADD_RC_PATCH is not set
# BR2_KERNEL_ADD_LATEST_SNAPSHOT is not set
# BR2_KERNEL_ADD_SNAPSHOT is not set
-# BR2_KERNEL_ADD_LATEST_MM_PATCH is not set
-# BR2_KERNEL_ADD_MM_PATCH is not set
BR2_KERNEL_ADD_PATCH=y
BR2_KERNEL_MINORLEVEL="6"
# BR2_KERNEL_ARCH_PATCH_ENABLED is not set
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index 922667d..6336fc9 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -27,6 +27,5 @@
!/slideshow/
!/snes9x/
!/socketcan/
-!/tslib/
!/xenomai/
!/mesa/
diff --git a/buildroot/package/lmbench/Config.in b/buildroot/package/lmbench/Config.in
deleted file mode 100644
index ecc135e..0000000
--- a/buildroot/package/lmbench/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_LMBENCH
- bool "LMbench"
- select BR2_PACKAGE_MICROPERL
- default n
- help
- Tools for Performance Analysis. Suite of simple, portable benchmarks.
- http://www.bitmover.com/lmbench/
-
diff --git a/buildroot/package/lmbench/lmbench.01.uclibc.comptat.patch b/buildroot/package/lmbench/lmbench.01.uclibc.comptat.patch
deleted file mode 100644
index 60337b4..0000000
--- a/buildroot/package/lmbench/lmbench.01.uclibc.comptat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lmbench3.ori/src/disk.c 2005-08-23 02:19:54.000000000 +0200
-+++ lmbench3/src/disk.c 2007-11-23 18:46:25.000000000 +0100
-@@ -288,7 +288,8 @@
- int
- seekto(int fd, uint64 off)
- {
--#ifdef __linux__
-+/* #ifdef __linux__ */
-+#if FALSE
- extern loff_t llseek(int, loff_t, int);
-
- if (llseek(fd, (loff_t)off, SEEK_SET) == (loff_t)-1) {
diff --git a/buildroot/package/lmbench/lmbench.mk b/buildroot/package/lmbench/lmbench.mk
deleted file mode 100644
index 1df5a02..0000000
--- a/buildroot/package/lmbench/lmbench.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#############################################################
-#
-# LMBENCH, tools for performance analysis
-#
-#############################################################
-LMBENCH_VERSION:=3
-LMBENCH_SOURCE:=lmbench$(LMBENCH_VERSION).tar.gz
-LMBENCH_SITE:=http://www.bitmover.com/lmbench/
-LMBENCH_CAT:=$(ZCAT)
-LMBENCH_DIR:=$(BUILD_DIR)/lmbench$(LMBENCH_VERSION)
-LMBENCH_OS_NAME:=armv5tejl-linux-gnu
-
-$(DL_DIR)/$(LMBENCH_SOURCE):
- $(WGET) -P $(DL_DIR) $(LMBENCH_SITE)/$(LMBENCH_SOURCE)
-
-lmbench-source: $(DL_DIR)/$(LMBENCH_SOURCE)
-
-$(LMBENCH_DIR)/.unpacked: $(DL_DIR)/$(LMBENCH_SOURCE)
- $(LMBENCH_CAT) $(DL_DIR)/$(LMBENCH_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- chmod -R u+w $(LMBENCH_DIR)
- toolchain/patch-kernel.sh $(LMBENCH_DIR) package/lmbench/ lmbench\*.patch
- touch $(LMBENCH_DIR)/.unpacked
-
-$(LMBENCH_DIR)/.configured: $(LMBENCH_DIR)/.unpacked
- # Nothing to do yet
- mkdir -p $(LMBENCH_DIR)/SCCS
- touch $(LMBENCH_DIR)/SCCS/s.ChangeSet
- touch $(LMBENCH_DIR)/.configured
-
-$(LMBENCH_DIR)/.compiled: $(LMBENCH_DIR)/.configured
- $(MAKE) -C $(LMBENCH_DIR) OS=$(LMBENCH_OS_NAME) CC=$(TARGET_CROSS)gcc AR=$(TARGET_CROSS)ar
- touch $(LMBENCH_DIR)/.compiled
-
-$(STAGING_DIR)/usr/bin/lmbench/bin/$(LMBENCH_OS_NAME)/lmbench: $(LMBENCH_DIR)/.compiled
- mkdir -p $(STAGING_DIR)/usr/bin/lmbench/
- cp -r $(LMBENCH_DIR)/bin $(STAGING_DIR)/usr/bin/lmbench/
- cp -r $(LMBENCH_DIR)/scripts $(STAGING_DIR)/usr/bin/lmbench/
- cp -r $(LMBENCH_DIR)/results $(STAGING_DIR)/usr/bin/lmbench/
-
-$(TARGET_DIR)/usr/bin/lmbench/bin/$(LMBENCH_OS_NAME)/lmbench: $(STAGING_DIR)/usr/bin/lmbench/bin/$(LMBENCH_OS_NAME)/lmbench
- mkdir -p $(TARGET_DIR)/usr/bin/lmbench/
- cp -r $(STAGING_DIR)/usr/bin/lmbench/* $(TARGET_DIR)/usr/bin/lmbench/
-
-LMBENCH lmbench: uclibc $(TARGET_DIR)/usr/bin/lmbench/bin/$(LMBENCH_OS_NAME)/lmbench
-
-lmbench-clean:
- #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(LMBENCH_DIR) uninstall
- -$(MAKE) -C $(LMBENCH_DIR) clean
- rm -rf $(TARGET_DIR)/usr/bin/lmbench/
-
-lmbench-dirclean:
- rm -rf $(STAGING_DIR)/usr/bin/lmbench/
- rm -rf $(TARGET_DIR)/usr/bin/lmbench/
- rm -rf $(LMBENCH_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_LMBENCH)),y)
-TARGETS+=lmbench
-endif
diff --git a/buildroot/package/tslib/.gitignore b/buildroot/package/tslib/.gitignore
deleted file mode 100644
index 54b9a42..0000000
--- a/buildroot/package/tslib/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-/Config.in
-/ts.conf
-/tslib-1.0-absbit.patch
-/tslib-1.0-remove-bzero.patch
-/tslib-1.0-remove-return-on-error-from-check-df.patch
-/tslib.mk
-/tslib_add_finddef_and_inputattach_utils.patch
-
diff --git a/buildroot/package/tslib/tslib-1.0-zz-make_it_work_on_powerpc_and_recent_kernels.patch b/buildroot/package/tslib/tslib-1.0-zz-make_it_work_on_powerpc_and_recent_kernels.patch
deleted file mode 100644
index 508ef6e..0000000
--- a/buildroot/package/tslib/tslib-1.0-zz-make_it_work_on_powerpc_and_recent_kernels.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-The bit / absbit is defined the same way as in kernel. {EV|ABS}_CNT is
-only exported in recent kernels.
-
-Signed-off-by: Sebastian Siewior <seb...@br...>
-
-
---- tslib-1.0.org/plugins/input-raw.c 2008-11-18 11:38:02.000000000 +0100
-+++ tslib-1.0/plugins/input-raw.c 2008-11-18 11:44:10.000000000 +0100
-@@ -44,23 +44,31 @@
- int using_syn;
- };
-
-+#define BITS_PER_LONG (sizeof(long) * 8)
-+#ifndef EV_CNT
-+#define EV_CNT (EV_MAX+1)
-+#endif
-+#ifndef ABS_CNT
-+#define ABS_CNT (ABS_MAX+1)
-+#endif
-+
- static int check_fd(struct tslib_input *i)
- {
- struct tsdev *ts = i->module.dev;
- int version;
-- u_int32_t bit;
-- u_int32_t absbit;
-+ unsigned long bit[EV_CNT / BITS_PER_LONG + 1];
-+ unsigned long absbit[ABS_MAX / BITS_PER_LONG + 1];
-
- if (! ((ioctl(ts->fd, EVIOCGVERSION, &version) >= 0) &&
- (version == EV_VERSION) &&
-- (ioctl(ts->fd, EVIOCGBIT(0, sizeof(bit) * 8), &bit) >= 0) &&
-- (bit & (1 << EV_ABS)) &&
-- (ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit) * 8), &absbit) >= 0) &&
-- (absbit & (1 << ABS_X)) &&
-- (absbit & (1 << ABS_Y)) && (absbit & (1 << ABS_PRESSURE)))) {
-+ (ioctl(ts->fd, EVIOCGBIT(0, sizeof(bit)), bit) >= 0) &&
-+ (bit[0] & (1 << EV_ABS)) &&
-+ (ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) >= 0) &&
-+ (absbit[0] & (1 << ABS_X)) &&
-+ (absbit[0] & (1 << ABS_Y)) && (absbit[0] & (1 << ABS_PRESSURE)))) {
- }
-
-- if (bit & (1 << EV_SYN))
-+ if (bit[0] & (1 << EV_SYN))
- i->using_syn = 1;
-
- return 0;
diff --git a/buildroot/package/tslib/tslib-1.0-zzz-prevents_unresolved_symbols.to_fix b/buildroot/package/tslib/tslib-1.0-zzz-prevents_unresolved_symbols.to_fix
deleted file mode 100644
index 43c7bea..0000000
--- a/buildroot/package/tslib/tslib-1.0-zzz-prevents_unresolved_symbols.to_fix
+++ /dev/null
@@ -1,38 +0,0 @@
-
-Some plugins use tslib functions. Link those plugins against libts. Without
-this change, DirectFB/Pygame in unable to use tslib because symbols in the tslib
-plugins can't be resolved.
-
----
- plugins/Makefile.am | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-Index: tslib/plugins/Makefile.am
-===================================================================
---- tslib.orig/plugins/Makefile.am
-+++ tslib/plugins/Makefile.am
-@@ -107,15 +107,19 @@ pluginexec_LTLIBRARIES = \
-
- variance_la_SOURCES = variance.c
- variance_la_LDFLAGS = -module $(LTVSN)
-+variance_la_LIBADD = $(top_builddir)/src/libts.la
-
- dejitter_la_SOURCES = dejitter.c
- dejitter_la_LDFLAGS = -module $(LTVSN)
-+dejitter_la_LIBADD = $(top_builddir)/src/libts.la
-
- linear_la_SOURCES = linear.c
- linear_la_LDFLAGS = -module $(LTVSN)
-+linear_la_LIBADD = $(top_builddir)/src/libts.la
-
- pthres_la_SOURCES = pthres.c
- pthres_la_LDFLAGS = -module $(LTVSN)
-+pthres_la_LIBADD = $(top_builddir)/src/libts.la
-
- # hw access
- corgi_la_SOURCES = corgi-raw.c
-
---
-Ville Syrjälä
-sy...@sc...
-http://www.sci.fi/~syrjala/
diff --git a/buildroot/target/device/armadeus/apf9328/uClibc-0.9.30.config.arm b/buildroot/target/device/armadeus/apf9328/uClibc-0.9.30.config.arm
index 1ec58f3..9d7245d 100644
--- a/buildroot/target/device/armadeus/apf9328/uClibc-0.9.30.config.arm
+++ b/buildroot/target/device/armadeus/apf9328/uClibc-0.9.30.config.arm
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Version: 0.9.30.2
-# Sun Mar 21 13:27:47 2010
+# Version: 0.9.30.3
+# Thu Jun 17 13:34:43 2010
#
# TARGET_alpha is not set
TARGET_arm=y
diff --git a/buildroot/target/device/armadeus/busybox-1.16.0.config b/buildroot/target/device/armadeus/busybox-1.16.0.config
deleted file mode 100644
index c726db3..0000000
--- a/buildroot/target/device/armadeus/busybox-1.16.0.config
+++ /dev/null
@@ -1,920 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.16.0
-# Tue Feb 23 15:13:34 2010
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-CONFIG_DESKTOP=y
-# CONFIG_EXTRA_COMPAT is not set
-# CONFIG_INCLUDE_SUSv2 is not set
-# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-CONFIG_FEATURE_VERBOSE_USAGE=y
-CONFIG_FEATURE_COMPRESS_USAGE=y
-CONFIG_FEATURE_INSTALLER=y
-CONFIG_LOCALE_SUPPORT=y
-# CONFIG_FEATURE_ASSUME_UNICODE is not set
-# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
-CONFIG_LONG_OPTS=y
-CONFIG_FEATURE_DEVPTS=y
-CONFIG_FEATURE_CLEAN_UP=y
-# CONFIG_FEATURE_PIDFILE is not set
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
-CONFIG_FEATURE_SYSLOG=y
-CONFIG_FEATURE_HAVE_RPC=y
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_EXTRA_CFLAGS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-
-#
-# Installation Options
-#
-# CONFIG_INSTALL_NO_USR is not set
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="/home/julien/workspace/Armadeus_SF/armadeus-git-new-buildroot-build/buildroot/output/target"
-
-#
-# Busybox Library Tuning
-#
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SIZE_VS_SPEED=1
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-CONFIG_FEATURE_EDITING_VI=y
-CONFIG_FEATURE_EDITING_HISTORY=999
-CONFIG_FEATURE_EDITING_SAVEHISTORY=y
-CONFIG_FEATURE_TAB_COMPLETION=y
-# CONFIG_FEATURE_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
-CONFIG_FEATURE_COPYBUF_KB=4
-# CONFIG_MONOTONIC_SYSCALL is not set
-CONFIG_IOCTL_HEX2STR_ERROR=y
-CONFIG_FEATURE_HWIB=y
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-# CONFIG_FEATURE_SEAMLESS_LZMA is not set
-# CONFIG_FEATURE_SEAM...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2010-06-16 16:23:43
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 86b22b16db96cb77dadc6f65ffb6bb6f54730fce (commit)
from c9fef3b736e3a95492bb96ca6711b8d41aef48f6 (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 86b22b16db96cb77dadc6f65ffb6bb6f54730fce
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 16 18:23:13 2010 +0200
[BUILDROOT] Add gpsd package
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/113-gpsd-add_package.patch | 486 ++++++++++++++++++++
.../buildroot/2010.02/113-gpsd-add_package.patch | 486 ++++++++++++++++++++
patches/buildroot/2010.02/cleanup_buildroot.sh | 1 +
patches/buildroot/cleanup_buildroot.sh | 1 +
4 files changed, 974 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/113-gpsd-add_package.patch
create mode 100644 patches/buildroot/2010.02/113-gpsd-add_package.patch
diff --git a/patches/buildroot/113-gpsd-add_package.patch b/patches/buildroot/113-gpsd-add_package.patch
new file mode 100644
index 0000000..248a5b9
--- /dev/null
+++ b/patches/buildroot/113-gpsd-add_package.patch
@@ -0,0 +1,486 @@
+Adds gpsd package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-09 10:53:23.000000000 +0200
++++ buildroot/package/Config.in 2010-06-09 10:55:54.000000000 +0200
+@@ -253,6 +253,7 @@
+ source "package/fuse/Config.in"
+ source "package/gadgetfs-test/Config.in"
+ source "package/gpm/Config.in"
++source "package/gpsd/Config.in"
+ source "package/hal/Config.in"
+ if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+ source "package/hdparm/Config.in"
+Index: buildroot/package/gpsd/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gpsd/Config.in 2010-06-09 18:59:50.000000000 +0200
+@@ -0,0 +1,244 @@
++config BR2_PACKAGE_GPSD
++ bool "gpsd"
++ help
++ gpsd is a service daemon that monitors one or more GPSes or AIS
++ receivers attached to a host computer through serial or USB ports,
++ making all data on the location/course/velocity of the sensors
++ available to be queried on TCP port 2947 of the host computer.
++
++ http://gpsd.berlios.de/
++
++
++menu "devices/protocol support"
++ depends on BR2_PACKAGE_GPSD
++
++config BR2_PACKAGE_GPSD_ASHTECH
++ bool "Ashtech"
++ default y
++ help
++ Ashtech support
++
++config BR2_PACKAGE_GPSD_AIVDM
++ bool "Aivdm"
++ default y
++ help
++ Aivdm support
++
++config BR2_PACKAGE_GPSD_EARTHMATE
++ bool "Earthmate"
++ default y
++ help
++ DeLorme EarthMate Zodiac support
++
++config BR2_PACKAGE_GPSD_EVERMORE
++ bool "EverMore"
++ default y
++ help
++ EverMore binary support
++
++config BR2_PACKAGE_GPSD_FV18
++ bool "FV-18"
++ default y
++ help
++ San Jose Navigation FV-18 support
++
++config BR2_PACKAGE_GPSD_GARMIN
++ bool "Garmin (kernel)"
++ default y
++ help
++ Garmin kernel driver support
++
++config BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT
++ bool "Garmin (Simple Text)"
++ default n
++ help
++ Garmin Simple Text support
++
++config BR2_PACKAGE_GPSD_GPSLOCK
++ bool "GPSClock"
++ default y
++ help
++ GPSClock support
++
++config BR2_PACKAGE_GPSD_ITRAX
++ bool "iTrax"
++ default y
++ help
++ iTrax hardware support
++
++config BR2_PACKAGE_GPSD_MTK3301
++ bool "MTK-3301"
++ default y
++ help
++ MTK-3301 support
++
++config BR2_PACKAGE_GPSD_NMEA
++ bool "NMEA"
++ default y
++ help
++ NMEA support
++
++config BR2_PACKAGE_GPSD_NTRIP
++ bool "NTRIP"
++ default y
++ help
++ NTRIP support
++
++config BR2_PACKAGE_GPSD_NAVCOM
++ bool "Navcom"
++ default y
++ help
++ Navcom support
++
++config BR2_PACKAGE_GPSD_OCEANSERVER
++ bool "OceanServer"
++ default y
++ help
++ OceanServer support
++
++config BR2_PACKAGE_GPSD_ONCORE
++ bool "OnCore"
++ default y
++ help
++ Motorola OnCore chipset support
++
++config BR2_PACKAGE_GPSD_RTCM104V2
++ bool "RTCM104 v2"
++ default y
++ help
++ RTCM104 v2 support
++
++config BR2_PACKAGE_GPSD_RTCM104V3
++ bool "RTCM104 v3"
++ default y
++ help
++ RTCM104 v3 support
++
++config BR2_PACKAGE_GPSD_SIRF
++ bool "SiRF"
++ default y
++ help
++ SiRF chipset support
++
++config BR2_PACKAGE_GPSD_SUPERSTAR2
++ bool "SuperStarII"
++ default y
++ help
++ SuperStarII chipset support
++
++config BR2_PACKAGE_GPSD_TRIMBLE_TSIP
++ bool "Trimble TSIP"
++ default y
++ help
++ Trimble TSIP support
++
++config BR2_PACKAGE_GPSD_TRIPMATE
++ bool "TripMate"
++ default y
++ help
++ DeLorme TripMate support
++
++config BR2_PACKAGE_GPSD_TRUE_NORTH
++ bool "True North Technologies"
++ default n
++ help
++ True North Technologies support
++
++config BR2_PACKAGE_GPSD_UBX
++ bool "UBX"
++ default y
++ help
++ UBX protocol support
++
++endmenu
++
++config BR2_PACKAGE_GPSD_DEVICES
++ string "Where to look for GPSes"
++ default "/dev/ttyS1"
++ depends on BR2_PACKAGE_GPSD
++
++menu "gpsd features"
++ depends on BR2_PACKAGE_GPSD
++
++config BR2_PACKAGE_GPSD_TIMING
++ bool "latency timing support"
++ default y
++
++config BR2_PACKAGE_GPSD_CLIENT_DEBUG
++ bool "client debugging support"
++ default y
++
++config BR2_PACKAGE_GPSD_OLDSTYLE
++ bool "oldstyle (pre-JSON) protocol support"
++ default y
++
++config BR2_PACKAGE_GPSD_PROFILING
++ bool "profiling support"
++
++config BR2_PACKAGE_GPSD_NTP_SHM
++ bool "NTP time hinting support"
++ default y
++
++config BR2_PACKAGE_GPSD_PPS
++ bool "PPS time syncing support"
++ default y
++
++config BR2_PACKAGE_GPSD_PPS_ON_CTS
++ bool "PPS pulse on CTS rather than DCD"
++
++config BR2_PACKAGE_GPSD_USER
++ bool "GPSD privilege revocation user"
++config BR2_PACKAGE_GPSD_USER_VALUE
++ string ""
++ default "nobody"
++ depends on BR2_PACKAGE_GPSD_USER
++
++config BR2_PACKAGE_GPSD_GROUP
++ bool "GPSD privilege revocation group"
++config BR2_PACKAGE_GPSD_GROUP_VALUE
++ string ""
++ default "nobody"
++ depends on BR2_PACKAGE_GPSD_GROUP
++
++config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED
++ bool "compile with fixed serial port speed"
++config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE
++ string ""
++ default "9600"
++ depends on BR2_PACKAGE_GPSD_FIXED_PORT_SPEED
++
++config BR2_PACKAGE_GPSD_MAX_CLIENT
++ bool "compile with limited maximum clients"
++config BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE
++ string "compile with limited maximum clients"
++ default "10"
++ depends on BR2_PACKAGE_GPSD_MAX_CLIENT
++
++config BR2_PACKAGE_GPSD_MAX_DEV
++ bool "compile with maximum allowed devices"
++config BR2_PACKAGE_GPSD_MAX_DEV_VALUE
++ string "compile with maximum allowed devices"
++ default "2"
++ depends on BR2_PACKAGE_GPSD_MAX_DEV
++
++config BR2_PACKAGE_GPSD_RECONFIGURE
++ bool "allow gpsd to change device settings"
++ default y
++
++config BR2_PACKAGE_GPSD_CONTROLSEND
++ bool "allow gpsctl/gpsmon to change device settings"
++ default y
++
++config BR2_PACKAGE_GPSD_RAW
++ bool "enable raw measurement processing"
++
++config BR2_PACKAGE_GPSD_CPP_BINDINGS
++ bool "build C++ bindings"
++ default y
++ depends on BR2_INSTALL_LIBSTDCPP
++
++config BR2_PACKAGE_GPSD_SQUELCH
++ bool "squelch gpsd_report and gpsd_hexdump to save cpu"
++
++endmenu
++
+Index: buildroot/package/gpsd/gpsd.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gpsd/gpsd.mk 2010-06-09 19:29:23.000000000 +0200
+@@ -0,0 +1,169 @@
++#############################################################
++#
++# gpsd
++#
++#############################################################
++
++GPSD_VERSION = 2.94
++GPSD_SITE = http://download.berlios.de/gpsd
++GPSD_LIBTOOL_PATCH = NO
++GPSD_INSTALL_STAGING = YES
++GPSD_INSTALL_TARGET = YES
++
++GPSD_CONF_OPT += --without-x
++ifeq ($(BR2_PACKAGE_GPSD_CPP_BINDINGS),y)
++ GPSD_CONF_OPT += LDFLAGS="-L$(STAGING_DIR)/usr/lib -lstdc++"
++endif
++ifeq ($(BR2_PACKAGE_DBUS),y)
++ GPSD_CONF_OPT += --enable-dbus
++ GPSD_DEPENDENCIES += dbus
++endif
++ifneq ($(BR2_INET_IPV6),y)
++ GPSD_CONF_OPT += --disable-ipv6
++endif
++ifeq ($(BR2_PACKAGE_LIBUSB),y)
++ GPSD_DEPENDENCIES += libusb
++endif
++ifeq ($(BR2_PACKAGE_NCURSES),y)
++ GPSD_DEPENDENCIES += ncurses
++endif
++
++# Devices/protocols:
++ifneq ($(BR2_PACKAGE_GPSD_ASHTECH),y)
++ GPSD_CONF_OPT += --disable-ashtech
++endif
++ifneq ($(BR2_PACKAGE_GPSD_AIVDM),y)
++ GPSD_CONF_OPT += --disable-aivdm
++endif
++ifneq ($(BR2_PACKAGE_GPSD_EARTHMATE),y)
++ GPSD_CONF_OPT += --disable-earthmate
++endif
++ifneq ($(BR2_PACKAGE_GPSD_EVERMORE),y)
++ GPSD_CONF_OPT += --disable-evermore
++endif
++ifneq ($(BR2_PACKAGE_GPSD_FV18),y)
++ GPSD_CONF_OPT += --disable-fv18
++endif
++ifneq ($(BR2_PACKAGE_GPSD_GARMIN),y)
++ GPSD_CONF_OPT += --disable-garmin
++endif
++ifeq ($(BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT),y)
++ GPSD_CONF_OPT += --enable-garmintxt
++endif
++ifneq ($(BR2_PACKAGE_GPSD_GPSCLOCK),y)
++ GPSD_CONF_OPT += --disable-gpsclock
++endif
++ifneq ($(BR2_PACKAGE_GPSD_ITRAX),y)
++ GPSD_CONF_OPT += --disable-itrax
++endif
++ifneq ($(BR2_PACKAGE_GPSD_MTK3301),y)
++ GPSD_CONF_OPT += --disable-mtk3301
++endif
++ifneq ($(BR2_PACKAGE_GPSD_NMEA),y)
++ GPSD_CONF_OPT += --disable-nmea
++endif
++ifneq ($(BR2_PACKAGE_GPSD_NTRIP),y)
++ GPSD_CONF_OPT += --disable-ntrip
++endif
++ifneq ($(BR2_PACKAGE_GPSD_NAVCOM),y)
++ GPSD_CONF_OPT += --disable-navcom
++endif
++ifneq ($(BR2_PACKAGE_GPSD_OCEANSERVER),y)
++ GPSD_CONF_OPT += --disable-oceanserver
++endif
++ifneq ($(BR2_PACKAGE_GPSD_ONCORE),y)
++ GPSD_CONF_OPT += --disable-oncore
++endif
++ifneq ($(BR2_PACKAGE_GPSD_RTCM104V2),y)
++ GPSD_CONF_OPT += --disable-rtcm104v2
++endif
++ifneq ($(BR2_PACKAGE_GPSD_RTCM104V3),y)
++ GPSD_CONF_OPT += --disable-rtcm104v3
++endif
++ifneq ($(BR2_PACKAGE_GPSD_SIRF),y)
++ GPSD_CONF_OPT += --disable-sirf
++endif
++ifneq ($(BR2_PACKAGE_GPSD_SUPERSTAR2),y)
++ GPSD_CONF_OPT += --disable-superstar2
++endif
++ifneq ($(BR2_PACKAGE_GPSD_TRIMBLE_TSIP),y)
++ GPSD_CONF_OPT += --disable-tsip
++endif
++ifneq ($(BR2_PACKAGE_GPSD_TRIPMATE),y)
++ GPSD_CONF_OPT += --disable-tripmate
++endif
++ifneq ($(BR2_PACKAGE_GPSD_TRUE_NORTH),y)
++ GPSD_CONF_OPT += --enable-tnt
++endif
++ifneq ($(BR2_PACKAGE_GPSD_UBX),y)
++ GPSD_CONF_OPT += --disable-ubx
++endif
++
++# Features:
++ifneq ($(BR2_PACKAGE_GPSD_TIMING),y)
++ GPSD_CONF_OPT += --disable-timing
++endif
++ifneq ($(BR2_PACKAGE_GPSD_CLIENT_DEBUG),y)
++ GPSD_CONF_OPT += --disable-clientdebug
++endif
++ifneq ($(BR2_PACKAGE_GPSD_OLDSTYLE),y)
++ GPSD_CONF_OPT += --disable-oldstyle
++endif
++ifeq ($(BR2_PACKAGE_GPSD_PROFILING),y)
++ GPSD_CONF_OPT += --enable-profiling
++endif
++ifneq ($(BR2_PACKAGE_GPSD_NTP_SHM),y)
++ GPSD_CONF_OPT += --disable-ntpshm
++endif
++ifneq ($(BR2_PACKAGE_GPSD_PPS),y)
++ GPSD_CONF_OPT += --disable-pps
++endif
++ifeq ($(BR2_PACKAGE_GPSD_PPS_ON_CTS),y)
++ GPSD_CONF_OPT += --enable-pps-on-cts
++endif
++ifeq ($(BR2_PACKAGE_GPSD_SQUELCH),y)
++ GPSD_CONF_OPT += --enable-squelch
++endif
++ifneq ($(BR2_PACKAGE_GPSD_RECONFIGURE),y)
++ GPSD_CONF_OPT += --disable-reconfigure
++endif
++ifneq ($(BR2_PACKAGE_GPSD_CONTROLSEND),y)
++ GPSD_CONF_OPT += --disable-controlsend
++endif
++ifeq ($(BR2_PACKAGE_GPSD_RAW),y)
++ GPSD_CONF_OPT += --enable-raw
++endif
++ifeq ($(BR2_PACKAGE_GPSD_USER),y)
++ GPSD_CONF_OPT += --enable-gpsd-user=$(BR2_PACKAGE_GPSD_USER_VALUE)
++endif
++ifeq ($(BR2_PACKAGE_GPSD_GROUP),y)
++ GPSD_CONF_OPT += --enable-gpsd-group=$(BR2_PACKAGE_GPSD_GROUP_VALUE)
++endif
++ifeq ($(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED),y)
++ GPSD_CONF_OPT += --enable-fixed-port-speed=$(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE)
++endif
++ifeq ($(BR2_PACKAGE_GPSD_MAX_CLIENT),y)
++ GPSD_CONF_OPT += --enable-max-clients=$(BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE)
++endif
++ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y)
++ GPSD_CONF_OPT += --enable-max-devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE)
++endif
++
++$(eval $(call AUTOTARGETS,package,gpsd))
++
++$(GPSD_HOOK_POST_INSTALL): $(GPSD_TARGET_INSTALL_TARGET)
++ $(call MESSAGE,"Post-installing to target")
++ if [ ! -f $(TARGET_DIR)/etc/init.d/S50gpsd ]; then \
++ $(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd; \
++ $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd; \
++ fi
++ touch $@
++
++$(GPSD_TARGET_UNINSTALL):
++ $(call MESSAGE,"Uninstalling from target")
++ cd $(TARGET_DIR)/usr/bin && rm -f cgps gpsdecode gpsmon gpsctl gpspipe gpxlogger lcdgps
++ cd $(TARGET_DIR)/usr/sbin && rm -f gpsd
++ cd $(TARGET_DIR)/usr/lib && rm -f libgps*
++ rm -f $(TARGET_DIR)/etc/init.d/S50gpsd
++ rm -f $(GPSD_TARGET_INSTALL_TARGET) $(GPSD_HOOK_POST_INSTALL)
++
+Index: buildroot/package/gpsd/S50gpsd
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gpsd/S50gpsd 2010-06-09 18:53:01.000000000 +0200
+@@ -0,0 +1,42 @@
++#!/bin/sh
++#
++# Starts the gps daemon.
++#
++
++NAME=gpsd
++DAEMON=/usr/sbin/$NAME
++DEVICES=/dev/ttyS1
++PIDFILE=/var/run/$NAME.pid
++
++start() {
++ echo -n "Starting $NAME: "
++ start-stop-daemon -S -q -p $PIDFILE --exec $DAEMON -- -P $PIDFILE $DEVICES && echo "OK" || echo "Failed"
++}
++
++stop() {
++ echo -n "Stopping $NAME: "
++ start-stop-daemon -K -q -p $PIDFILE && echo "OK" || echo "Failed"
++ rm -f $PIDFILE
++}
++
++restart() {
++ stop
++ start
++}
++
++case "$1" in
++ start)
++ start
++ ;;
++ stop)
++ stop
++ ;;
++ restart|reload)
++ restart
++ ;;
++ *)
++ echo $"Usage: $0 {start|stop|restart}"
++ exit 1
++esac
++
++exit $?
diff --git a/patches/buildroot/2010.02/113-gpsd-add_package.patch b/patches/buildroot/2010.02/113-gpsd-add_package.patch
new file mode 100644
index 0000000..248a5b9
--- /dev/null
+++ b/patches/buildroot/2010.02/113-gpsd-add_package.patch
@@ -0,0 +1,486 @@
+Adds gpsd package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-09 10:53:23.000000000 +0200
++++ buildroot/package/Config.in 2010-06-09 10:55:54.000000000 +0200
+@@ -253,6 +253,7 @@
+ source "package/fuse/Config.in"
+ source "package/gadgetfs-test/Config.in"
+ source "package/gpm/Config.in"
++source "package/gpsd/Config.in"
+ source "package/hal/Config.in"
+ if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+ source "package/hdparm/Config.in"
+Index: buildroot/package/gpsd/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gpsd/Config.in 2010-06-09 18:59:50.000000000 +0200
+@@ -0,0 +1,244 @@
++config BR2_PACKAGE_GPSD
++ bool "gpsd"
++ help
++ gpsd is a service daemon that monitors one or more GPSes or AIS
++ receivers attached to a host computer through serial or USB ports,
++ making all data on the location/course/velocity of the sensors
++ available to be queried on TCP port 2947 of the host computer.
++
++ http://gpsd.berlios.de/
++
++
++menu "devices/protocol support"
++ depends on BR2_PACKAGE_GPSD
++
++config BR2_PACKAGE_GPSD_ASHTECH
++ bool "Ashtech"
++ default y
++ help
++ Ashtech support
++
++config BR2_PACKAGE_GPSD_AIVDM
++ bool "Aivdm"
++ default y
++ help
++ Aivdm support
++
++config BR2_PACKAGE_GPSD_EARTHMATE
++ bool "Earthmate"
++ default y
++ help
++ DeLorme EarthMate Zodiac support
++
++config BR2_PACKAGE_GPSD_EVERMORE
++ bool "EverMore"
++ default y
++ help
++ EverMore binary support
++
++config BR2_PACKAGE_GPSD_FV18
++ bool "FV-18"
++ default y
++ help
++ San Jose Navigation FV-18 support
++
++config BR2_PACKAGE_GPSD_GARMIN
++ bool "Garmin (kernel)"
++ default y
++ help
++ Garmin kernel driver support
++
++config BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT
++ bool "Garmin (Simple Text)"
++ default n
++ help
++ Garmin Simple Text support
++
++config BR2_PACKAGE_GPSD_GPSLOCK
++ bool "GPSClock"
++ default y
++ help
++ GPSClock support
++
++config BR2_PACKAGE_GPSD_ITRAX
++ bool "iTrax"
++ default y
++ help
++ iTrax hardware support
++
++config BR2_PACKAGE_GPSD_MTK3301
++ bool "MTK-3301"
++ default y
++ help
++ MTK-3301 support
++
++config BR2_PACKAGE_GPSD_NMEA
++ bool "NMEA"
++ default y
++ help
++ NMEA support
++
++config BR2_PACKAGE_GPSD_NTRIP
++ bool "NTRIP"
++ default y
++ help
++ NTRIP support
++
++config BR2_PACKAGE_GPSD_NAVCOM
++ bool "Navcom"
++ default y
++ help
++ Navcom support
++
++config BR2_PACKAGE_GPSD_OCEANSERVER
++ bool "OceanServer"
++ default y
++ help
++ OceanServer support
++
++config BR2_PACKAGE_GPSD_ONCORE
++ bool "OnCore"
++ default y
++ help
++ Motorola OnCore chipset support
++
++config BR2_PACKAGE_GPSD_RTCM104V2
++ bool "RTCM104 v2"
++ default y
++ help
++ RTCM104 v2 support
++
++config BR2_PACKAGE_GPSD_RTCM104V3
++ bool "RTCM104 v3"
++ default y
++ help
++ RTCM104 v3 support
++
++config BR2_PACKAGE_GPSD_SIRF
++ bool "SiRF"
++ default y
++ help
++ SiRF chipset support
++
++config BR2_PACKAGE_GPSD_SUPERSTAR2
++ bool "SuperStarII"
++ default y
++ help
++ SuperStarII chipset support
++
++config BR2_PACKAGE_GPSD_TRIMBLE_TSIP
++ bool "Trimble TSIP"
++ default y
++ help
++ Trimble TSIP support
++
++config BR2_PACKAGE_GPSD_TRIPMATE
++ bool "TripMate"
++ default y
++ help
++ DeLorme TripMate support
++
++config BR2_PACKAGE_GPSD_TRUE_NORTH
++ bool "True North Technologies"
++ default n
++ help
++ True North Technologies support
++
++config BR2_PACKAGE_GPSD_UBX
++ bool "UBX"
++ default y
++ help
++ UBX protocol support
++
++endmenu
++
++config BR2_PACKAGE_GPSD_DEVICES
++ string "Where to look for GPSes"
++ default "/dev/ttyS1"
++ depends on BR2_PACKAGE_GPSD
++
++menu "gpsd features"
++ depends on BR2_PACKAGE_GPSD
++
++config BR2_PACKAGE_GPSD_TIMING
++ bool "latency timing support"
++ default y
++
++config BR2_PACKAGE_GPSD_CLIENT_DEBUG
++ bool "client debugging support"
++ default y
++
++config BR2_PACKAGE_GPSD_OLDSTYLE
++ bool "oldstyle (pre-JSON) protocol support"
++ default y
++
++config BR2_PACKAGE_GPSD_PROFILING
++ bool "profiling support"
++
++config BR2_PACKAGE_GPSD_NTP_SHM
++ bool "NTP time hinting support"
++ default y
++
++config BR2_PACKAGE_GPSD_PPS
++ bool "PPS time syncing support"
++ default y
++
++config BR2_PACKAGE_GPSD_PPS_ON_CTS
++ bool "PPS pulse on CTS rather than DCD"
++
++config BR2_PACKAGE_GPSD_USER
++ bool "GPSD privilege revocation user"
++config BR2_PACKAGE_GPSD_USER_VALUE
++ string ""
++ default "nobody"
++ depends on BR2_PACKAGE_GPSD_USER
++
++config BR2_PACKAGE_GPSD_GROUP
++ bool "GPSD privilege revocation group"
++config BR2_PACKAGE_GPSD_GROUP_VALUE
++ string ""
++ default "nobody"
++ depends on BR2_PACKAGE_GPSD_GROUP
++
++config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED
++ bool "compile with fixed serial port speed"
++config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE
++ string ""
++ default "9600"
++ depends on BR2_PACKAGE_GPSD_FIXED_PORT_SPEED
++
++config BR2_PACKAGE_GPSD_MAX_CLIENT
++ bool "compile with limited maximum clients"
++config BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE
++ string "compile with limited maximum clients"
++ default "10"
++ depends on BR2_PACKAGE_GPSD_MAX_CLIENT
++
++config BR2_PACKAGE_GPSD_MAX_DEV
++ bool "compile with maximum allowed devices"
++config BR2_PACKAGE_GPSD_MAX_DEV_VALUE
++ string "compile with maximum allowed devices"
++ default "2"
++ depends on BR2_PACKAGE_GPSD_MAX_DEV
++
++config BR2_PACKAGE_GPSD_RECONFIGURE
++ bool "allow gpsd to change device settings"
++ default y
++
++config BR2_PACKAGE_GPSD_CONTROLSEND
++ bool "allow gpsctl/gpsmon to change device settings"
++ default y
++
++config BR2_PACKAGE_GPSD_RAW
++ bool "enable raw measurement processing"
++
++config BR2_PACKAGE_GPSD_CPP_BINDINGS
++ bool "build C++ bindings"
++ default y
++ depends on BR2_INSTALL_LIBSTDCPP
++
++config BR2_PACKAGE_GPSD_SQUELCH
++ bool "squelch gpsd_report and gpsd_hexdump to save cpu"
++
++endmenu
++
+Index: buildroot/package/gpsd/gpsd.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gpsd/gpsd.mk 2010-06-09 19:29:23.000000000 +0200
+@@ -0,0 +1,169 @@
++#############################################################
++#
++# gpsd
++#
++#############################################################
++
++GPSD_VERSION = 2.94
++GPSD_SITE = http://download.berlios.de/gpsd
++GPSD_LIBTOOL_PATCH = NO
++GPSD_INSTALL_STAGING = YES
++GPSD_INSTALL_TARGET = YES
++
++GPSD_CONF_OPT += --without-x
++ifeq ($(BR2_PACKAGE_GPSD_CPP_BINDINGS),y)
++ GPSD_CONF_OPT += LDFLAGS="-L$(STAGING_DIR)/usr/lib -lstdc++"
++endif
++ifeq ($(BR2_PACKAGE_DBUS),y)
++ GPSD_CONF_OPT += --enable-dbus
++ GPSD_DEPENDENCIES += dbus
++endif
++ifneq ($(BR2_INET_IPV6),y)
++ GPSD_CONF_OPT += --disable-ipv6
++endif
++ifeq ($(BR2_PACKAGE_LIBUSB),y)
++ GPSD_DEPENDENCIES += libusb
++endif
++ifeq ($(BR2_PACKAGE_NCURSES),y)
++ GPSD_DEPENDENCIES += ncurses
++endif
++
++# Devices/protocols:
++ifneq ($(BR2_PACKAGE_GPSD_ASHTECH),y)
++ GPSD_CONF_OPT += --disable-ashtech
++endif
++ifneq ($(BR2_PACKAGE_GPSD_AIVDM),y)
++ GPSD_CONF_OPT += --disable-aivdm
++endif
++ifneq ($(BR2_PACKAGE_GPSD_EARTHMATE),y)
++ GPSD_CONF_OPT += --disable-earthmate
++endif
++ifneq ($(BR2_PACKAGE_GPSD_EVERMORE),y)
++ GPSD_CONF_OPT += --disable-evermore
++endif
++ifneq ($(BR2_PACKAGE_GPSD_FV18),y)
++ GPSD_CONF_OPT += --disable-fv18
++endif
++ifneq ($(BR2_PACKAGE_GPSD_GARMIN),y)
++ GPSD_CONF_OPT += --disable-garmin
++endif
++ifeq ($(BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT),y)
++ GPSD_CONF_OPT += --enable-garmintxt
++endif
++ifneq ($(BR2_PACKAGE_GPSD_GPSCLOCK),y)
++ GPSD_CONF_OPT += --disable-gpsclock
++endif
++ifneq ($(BR2_PACKAGE_GPSD_ITRAX),y)
++ GPSD_CONF_OPT += --disable-itrax
++endif
++ifneq ($(BR2_PACKAGE_GPSD_MTK3301),y)
++ GPSD_CONF_OPT += --disable-mtk3301
++endif
++ifneq ($(BR2_PACKAGE_GPSD_NMEA),y)
++ GPSD_CONF_OPT += --disable-nmea
++endif
++ifneq ($(BR2_PACKAGE_GPSD_NTRIP),y)
++ GPSD_CONF_OPT += --disable-ntrip
++endif
++ifneq ($(BR2_PACKAGE_GPSD_NAVCOM),y)
++ GPSD_CONF_OPT += --disable-navcom
++endif
++ifneq ($(BR2_PACKAGE_GPSD_OCEANSERVER),y)
++ GPSD_CONF_OPT += --disable-oceanserver
++endif
++ifneq ($(BR2_PACKAGE_GPSD_ONCORE),y)
++ GPSD_CONF_OPT += --disable-oncore
++endif
++ifneq ($(BR2_PACKAGE_GPSD_RTCM104V2),y)
++ GPSD_CONF_OPT += --disable-rtcm104v2
++endif
++ifneq ($(BR2_PACKAGE_GPSD_RTCM104V3),y)
++ GPSD_CONF_OPT += --disable-rtcm104v3
++endif
++ifneq ($(BR2_PACKAGE_GPSD_SIRF),y)
++ GPSD_CONF_OPT += --disable-sirf
++endif
++ifneq ($(BR2_PACKAGE_GPSD_SUPERSTAR2),y)
++ GPSD_CONF_OPT += --disable-superstar2
++endif
++ifneq ($(BR2_PACKAGE_GPSD_TRIMBLE_TSIP),y)
++ GPSD_CONF_OPT += --disable-tsip
++endif
++ifneq ($(BR2_PACKAGE_GPSD_TRIPMATE),y)
++ GPSD_CONF_OPT += --disable-tripmate
++endif
++ifneq ($(BR2_PACKAGE_GPSD_TRUE_NORTH),y)
++ GPSD_CONF_OPT += --enable-tnt
++endif
++ifneq ($(BR2_PACKAGE_GPSD_UBX),y)
++ GPSD_CONF_OPT += --disable-ubx
++endif
++
++# Features:
++ifneq ($(BR2_PACKAGE_GPSD_TIMING),y)
++ GPSD_CONF_OPT += --disable-timing
++endif
++ifneq ($(BR2_PACKAGE_GPSD_CLIENT_DEBUG),y)
++ GPSD_CONF_OPT += --disable-clientdebug
++endif
++ifneq ($(BR2_PACKAGE_GPSD_OLDSTYLE),y)
++ GPSD_CONF_OPT += --disable-oldstyle
++endif
++ifeq ($(BR2_PACKAGE_GPSD_PROFILING),y)
++ GPSD_CONF_OPT += --enable-profiling
++endif
++ifneq ($(BR2_PACKAGE_GPSD_NTP_SHM),y)
++ GPSD_CONF_OPT += --disable-ntpshm
++endif
++ifneq ($(BR2_PACKAGE_GPSD_PPS),y)
++ GPSD_CONF_OPT += --disable-pps
++endif
++ifeq ($(BR2_PACKAGE_GPSD_PPS_ON_CTS),y)
++ GPSD_CONF_OPT += --enable-pps-on-cts
++endif
++ifeq ($(BR2_PACKAGE_GPSD_SQUELCH),y)
++ GPSD_CONF_OPT += --enable-squelch
++endif
++ifneq ($(BR2_PACKAGE_GPSD_RECONFIGURE),y)
++ GPSD_CONF_OPT += --disable-reconfigure
++endif
++ifneq ($(BR2_PACKAGE_GPSD_CONTROLSEND),y)
++ GPSD_CONF_OPT += --disable-controlsend
++endif
++ifeq ($(BR2_PACKAGE_GPSD_RAW),y)
++ GPSD_CONF_OPT += --enable-raw
++endif
++ifeq ($(BR2_PACKAGE_GPSD_USER),y)
++ GPSD_CONF_OPT += --enable-gpsd-user=$(BR2_PACKAGE_GPSD_USER_VALUE)
++endif
++ifeq ($(BR2_PACKAGE_GPSD_GROUP),y)
++ GPSD_CONF_OPT += --enable-gpsd-group=$(BR2_PACKAGE_GPSD_GROUP_VALUE)
++endif
++ifeq ($(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED),y)
++ GPSD_CONF_OPT += --enable-fixed-port-speed=$(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE)
++endif
++ifeq ($(BR2_PACKAGE_GPSD_MAX_CLIENT),y)
++ GPSD_CONF_OPT += --enable-max-clients=$(BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE)
++endif
++ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y)
++ GPSD_CONF_OPT += --enable-max-devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE)
++endif
++
++$(eval $(call AUTOTARGETS,package,gpsd))
++
++$(GPSD_HOOK_POST_INSTALL): $(GPSD_TARGET_INSTALL_TARGET)
++ $(call MESSAGE,"Post-installing to target")
++ if [ ! -f $(TARGET_DIR)/etc/init.d/S50gpsd ]; then \
++ $(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd; \
++ $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd; \
++ fi
++ touch $@
++
++$(GPSD_TARGET_UNINSTALL):
++ $(call MESSAGE,"Uninstalling from target")
++ cd $(TARGET_DIR)/usr/bin && rm -f cgps gpsdecode gpsmon gpsctl gpspipe gpxlogger lcdgps
++ cd $(TARGET_DIR)/usr/sbin && rm -f gpsd
++ cd $(TARGET_DIR)/usr/lib && rm -f libgps*
++ rm -f $(TARGET_DIR)/etc/init.d/S50gpsd
++ rm -f $(GPSD_TARGET_INSTALL_TARGET) $(GPSD_HOOK_POST_INSTALL)
++
+Index: buildroot/package/gpsd/S50gpsd
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gpsd/S50gpsd 2010-06-09 18:53:01.000000000 +0200
+@@ -0,0 +1,42 @@
++#!/bin/sh
++#
++# Starts the gps daemon.
++#
++
++NAME=gpsd
++DAEMON=/usr/sbin/$NAME
++DEVICES=/dev/ttyS1
++PIDFILE=/var/run/$NAME.pid
++
++start() {
++ echo -n "Starting $NAME: "
++ start-stop-daemon -S -q -p $PIDFILE --exec $DAEMON -- -P $PIDFILE $DEVICES && echo "OK" || echo "Failed"
++}
++
++stop() {
++ echo -n "Stopping $NAME: "
++ start-stop-daemon -K -q -p $PIDFILE && echo "OK" || echo "Failed"
++ rm -f $PIDFILE
++}
++
++restart() {
++ stop
++ start
++}
++
++case "$1" in
++ start)
++ start
++ ;;
++ stop)
++ stop
++ ;;
++ restart|reload)
++ restart
++ ;;
++ *)
++ echo $"Usage: $0 {start|stop|restart}"
++ exit 1
++esac
++
++exit $?
diff --git a/patches/buildroot/2010.02/cleanup_buildroot.sh b/patches/buildroot/2010.02/cleanup_buildroot.sh
index 92901b1..1fd9286 100755
--- a/patches/buildroot/2010.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.02/cleanup_buildroot.sh
@@ -22,3 +22,4 @@ 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/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 a3ac525..833eca3 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -26,3 +26,4 @@ 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/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-16 15:03:12
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via c9fef3b736e3a95492bb96ca6711b8d41aef48f6 (commit)
via 23bb550a1bc202b88e3a92d1285cd3a886f709b7 (commit)
via 8bed5b2c7e738fa033bfae1f884ca23f26826c52 (commit)
from 53f0205600f320ee9de1560d5b4bfa1e40b429b2 (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 c9fef3b736e3a95492bb96ca6711b8d41aef48f6
Merge: 23bb550a1bc202b88e3a92d1285cd3a886f709b7 53f0205600f320ee9de1560d5b4bfa1e40b429b2
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 16 17:02:11 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 23bb550a1bc202b88e3a92d1285cd3a886f709b7
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 16 17:01:50 2010 +0200
Updates default configs
commit 8bed5b2c7e738fa033bfae1f884ca23f26826c52
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 16 16:52:19 2010 +0200
[BUILDROOT] Add openobex and ussp-push packages
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/apf27_test.config | 2 +
buildroot/local/apf9328_test/apf9328_test.config | 4 +-
.../target/device/armadeus/apf27/apf27_defconfig | 4 +-
.../device/armadeus/apf9328/apf9328_defconfig | 4 +-
patches/buildroot/116-openobex-add_package.patch | 146 ++++++++++++++++++++
patches/buildroot/117-ussp-push-add_package.patch | 48 +++++++
.../2010.02/116-openobex-add_package.patch | 146 ++++++++++++++++++++
.../2010.02/117-ussp-push-add_package.patch | 48 +++++++
patches/buildroot/2010.02/cleanup_buildroot.sh | 2 +
patches/buildroot/cleanup_buildroot.sh | 2 +
10 files changed, 403 insertions(+), 3 deletions(-)
create mode 100644 patches/buildroot/116-openobex-add_package.patch
create mode 100644 patches/buildroot/117-ussp-push-add_package.patch
create mode 100644 patches/buildroot/2010.02/116-openobex-add_package.patch
create mode 100644 patches/buildroot/2010.02/117-ussp-push-add_package.patch
diff --git a/buildroot/local/apf27_test/apf27_test.config b/buildroot/local/apf27_test/apf27_test.config
index 7a9f4a4..23aac22 100644
--- a/buildroot/local/apf27_test/apf27_test.config
+++ b/buildroot/local/apf27_test/apf27_test.config
@@ -460,6 +460,7 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_SNTP is not set
# BR2_PACKAGE_OLSR is not set
# BR2_PACKAGE_OPENNTPD is not set
+# BR2_PACKAGE_OPENOBEX is not set
# BR2_PACKAGE_OPENSSH is not set
# BR2_PACKAGE_OPENSSL is not set
# BR2_PACKAGE_OPENVPN is not set
@@ -494,6 +495,7 @@ BR2_PACKAGE_TCPDUMP=y
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
+# BR2_PACKAGE_USSP_PUSH is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
diff --git a/buildroot/local/apf9328_test/apf9328_test.config b/buildroot/local/apf9328_test/apf9328_test.config
index bada6b3..4836b60 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
-# Tue Jun 15 18:24:10 2010
+# Wed Jun 16 16:58:03 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -457,6 +457,7 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_SNTP is not set
# BR2_PACKAGE_OLSR is not set
# BR2_PACKAGE_OPENNTPD is not set
+# BR2_PACKAGE_OPENOBEX is not set
# BR2_PACKAGE_OPENSSH is not set
# BR2_PACKAGE_OPENSSL is not set
# BR2_PACKAGE_OPENVPN is not set
@@ -490,6 +491,7 @@ BR2_PACKAGE_SOCKETCAN=y
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
+# BR2_PACKAGE_USSP_PUSH is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index e6a9ffe..5181f78 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Jun 15 18:24:10 2010
+# Wed Jun 16 16:58:03 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -455,6 +455,7 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_SNTP is not set
# BR2_PACKAGE_OLSR is not set
# BR2_PACKAGE_OPENNTPD is not set
+# BR2_PACKAGE_OPENOBEX is not set
# BR2_PACKAGE_OPENSSH is not set
# BR2_PACKAGE_OPENSSL is not set
# BR2_PACKAGE_OPENVPN is not set
@@ -487,6 +488,7 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
+# BR2_PACKAGE_USSP_PUSH is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index 15a0d10..a2262ad 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
+++ b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Jun 15 18:24:10 2010
+# Wed Jun 16 16:58:03 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -448,6 +448,7 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_SNTP is not set
# BR2_PACKAGE_OLSR is not set
# BR2_PACKAGE_OPENNTPD is not set
+# BR2_PACKAGE_OPENOBEX is not set
# BR2_PACKAGE_OPENSSH is not set
# BR2_PACKAGE_OPENSSL is not set
# BR2_PACKAGE_OPENVPN is not set
@@ -480,6 +481,7 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
+# BR2_PACKAGE_USSP_PUSH is not set
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
diff --git a/patches/buildroot/116-openobex-add_package.patch b/patches/buildroot/116-openobex-add_package.patch
new file mode 100644
index 0000000..bd8c9cf
--- /dev/null
+++ b/patches/buildroot/116-openobex-add_package.patch
@@ -0,0 +1,146 @@
+Adds OpenOBEX package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-16 10:21:22.000000000 +0200
++++ buildroot/package/Config.in 2010-06-16 16:33:02.000000000 +0200
+@@ -191,6 +191,7 @@
+ source "package/ntp/Config.in"
+ source "package/olsr/Config.in"
+ source "package/openntpd/Config.in"
++source "package/openobex/Config.in"
+ source "package/openssh/Config.in"
+ source "package/openssl/Config.in"
+ source "package/openvpn/Config.in"
+Index: buildroot/package/openobex/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/openobex/Config.in 2010-06-16 13:24:33.000000000 +0200
+@@ -0,0 +1,25 @@
++config BR2_PACKAGE_OPENOBEX
++ bool "openobex"
++ help
++ Free open source implementation of the Object Exchange (OBEX)
++ protocol.
++
++ http://www.openobex.org
++
++if BR2_PACKAGE_OPENOBEX
++
++config BR2_PACKAGE_OPENOBEX_APPS
++ bool "install test applications"
++ default n
++ help
++ Also install the openobex test applications on target.
++
++config BR2_PACKAGE_OPENOBEX_SYSLOG
++ bool "enable debugging to the system logger"
++ default n
++
++config BR2_PACKAGE_OPENOBEX_DUMP
++ bool "enable protocol dumping for debugging"
++ default n
++
++endif
+Index: buildroot/package/openobex/openobex.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/openobex/openobex.mk 2010-06-16 16:35:17.000000000 +0200
+@@ -0,0 +1,47 @@
++#############################################################
++#
++# openobex
++#
++#############################################################
++OPENOBEX_VERSION := 1.5
++OPENOBEX_SITE = http://www.kernel.org/pub/linux/bluetooth
++OPENOBEX_AUTORECONF = YES
++OPENOBEX_INSTALL_STAGING = YES
++OPENOBEX_INSTALL_TARGET = YES
++
++ifeq ($(strip $(BR2_PACKAGE_BLUEZ_LIBS)),y)
++WITH_BLUEZ=--with-bluez=$(STAGING_DIR)
++else
++WITH_BLUEZ=--disable-bluetooth
++endif
++
++ifeq ($(strip $(BR2_PACKAGE_LIBUSB)),y)
++WITH_USB=--with-usb=$(STAGING_DIR)
++else
++WITH_USB=--disable-usb
++endif
++
++WITH_APPS=
++ifeq ($(strip $(BR2_PACKAGE_OPENOBEX_APPS)),y)
++WITH_APPS=--enable-apps
++endif
++
++WITH_SYSLOG=
++ifeq ($(strip $(BR2_PACKAGE_OPENOBEX_SYSLOG)),y)
++WITH_SYSLOG=--enable-syslog
++endif
++
++WITH_DUMP=
++ifeq ($(strip $(BR2_PACKAGE_OPENOBEX_DUMP)),y)
++WITH_DUMP=--enable-dump
++endif
++
++OPENOBEX_CONF_OPT = \
++ $(WITH_APPS) \
++ $(WITH_BLUEZ) \
++ $(WITH_USB) \
++ $(WITH_DUMP) \
++ $(WITH_SYSLOG)
++
++$(eval $(call AUTOTARGETS,package,openobex))
++
+Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch 2010-06-16 13:20:42.000000000 +0200
+@@ -0,0 +1,13 @@
++Index: openobex-1.5/acinclude.m4
++===================================================================
++--- openobex-1.5.orig/acinclude.m4 2010-06-16 10:32:47.000000000 +0200
+++++ openobex-1.5/acinclude.m4 2010-06-16 10:35:33.000000000 +0200
++@@ -158,7 +158,7 @@
++ ;;
++ *)
++ PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
++- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
+++ REQUIRES="libusb"
++ ;;
++ esac
++ AC_SUBST(USB_CFLAGS)
+Index: buildroot/package/openobex/openobex-replace_deprecated_functions.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/openobex/openobex-replace_deprecated_functions.patch 2010-06-16 13:20:42.000000000 +0200
+@@ -0,0 +1,25 @@
++Index: openobex-1.5/apps/obex_test_cable.c
++===================================================================
++--- openobex-1.5.orig/apps/obex_test_cable.c 2009-02-08 19:30:22.000000000 +0100
+++++ openobex-1.5/apps/obex_test_cable.c 2010-06-16 11:11:05.000000000 +0200
++@@ -113,9 +113,9 @@
++ if(total == sizeof(tmpbuf))
++ return -1;
++
++- if( (answer = index(tmpbuf, '\n')) ) {
+++ if( (answer = strchr(tmpbuf, '\n')) ) {
++ // Remove first line (echo)
++- if( (answer_end = index(answer+1, '\n')) ) {
+++ if( (answer_end = strchr(answer+1, '\n')) ) {
++ // Found end of answer
++ done = 1;
++ }
++@@ -178,7 +178,7 @@
++ }
++
++ tcgetattr(gt->ttyfd, >->oldtio);
++- bzero(>->newtio, sizeof(struct termios));
+++ memset(>->newtio, 0, sizeof(struct termios));
++ gt->newtio.c_cflag = B115200 | CS8 | CREAD | CRTSCTS;
++ gt->newtio.c_iflag = IGNPAR;
++ gt->newtio.c_oflag = 0;
diff --git a/patches/buildroot/117-ussp-push-add_package.patch b/patches/buildroot/117-ussp-push-add_package.patch
new file mode 100644
index 0000000..f971465
--- /dev/null
+++ b/patches/buildroot/117-ussp-push-add_package.patch
@@ -0,0 +1,48 @@
+Adds ussp-push package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-16 14:31:45.000000000 +0200
++++ buildroot/package/Config.in 2010-06-16 14:37:34.000000000 +0200
+@@ -220,6 +220,7 @@
+ #source "package/udhcp/Config.in"
+ #endif
+ source "package/udpcast/Config.in"
++source "package/ussp-push/Config.in"
+ source "package/vpnc/Config.in"
+ source "package/vsftpd/Config.in"
+ source "package/vtun/Config.in"
+Index: buildroot/package/ussp-push/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/ussp-push/Config.in 2010-06-16 16:31:42.000000000 +0200
+@@ -0,0 +1,10 @@
++config BR2_PACKAGE_USSP_PUSH
++ bool "ussp-push"
++ select BR2_PACKAGE_OPENOBEX
++ select BR2_PACKAGE_BLUEZ_LIBS
++ help
++ ussp-push is an OBEX object pusher for Linux, using the BlueZ
++ BlueTooth stack.
++
++ http://www.xmailserver.org/ussp-push.html
++ http://freshmeat.net/projects/ussp-push/
+Index: buildroot/package/ussp-push/ussp-push.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/ussp-push/ussp-push.mk 2010-06-16 16:32:52.000000000 +0200
+@@ -0,0 +1,12 @@
++#############################################################
++#
++# ussp-push
++#
++#############################################################
++USSP_PUSH_VERSION := 0.11
++USSP_PUSH_SITE = http://www.xmailserver.org
++
++USSP_PUSH_DEPENDENCIES = bluez-libs openobex
++
++$(eval $(call AUTOTARGETS,package,ussp-push))
++
diff --git a/patches/buildroot/2010.02/116-openobex-add_package.patch b/patches/buildroot/2010.02/116-openobex-add_package.patch
new file mode 100644
index 0000000..bd8c9cf
--- /dev/null
+++ b/patches/buildroot/2010.02/116-openobex-add_package.patch
@@ -0,0 +1,146 @@
+Adds OpenOBEX package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-16 10:21:22.000000000 +0200
++++ buildroot/package/Config.in 2010-06-16 16:33:02.000000000 +0200
+@@ -191,6 +191,7 @@
+ source "package/ntp/Config.in"
+ source "package/olsr/Config.in"
+ source "package/openntpd/Config.in"
++source "package/openobex/Config.in"
+ source "package/openssh/Config.in"
+ source "package/openssl/Config.in"
+ source "package/openvpn/Config.in"
+Index: buildroot/package/openobex/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/openobex/Config.in 2010-06-16 13:24:33.000000000 +0200
+@@ -0,0 +1,25 @@
++config BR2_PACKAGE_OPENOBEX
++ bool "openobex"
++ help
++ Free open source implementation of the Object Exchange (OBEX)
++ protocol.
++
++ http://www.openobex.org
++
++if BR2_PACKAGE_OPENOBEX
++
++config BR2_PACKAGE_OPENOBEX_APPS
++ bool "install test applications"
++ default n
++ help
++ Also install the openobex test applications on target.
++
++config BR2_PACKAGE_OPENOBEX_SYSLOG
++ bool "enable debugging to the system logger"
++ default n
++
++config BR2_PACKAGE_OPENOBEX_DUMP
++ bool "enable protocol dumping for debugging"
++ default n
++
++endif
+Index: buildroot/package/openobex/openobex.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/openobex/openobex.mk 2010-06-16 16:35:17.000000000 +0200
+@@ -0,0 +1,47 @@
++#############################################################
++#
++# openobex
++#
++#############################################################
++OPENOBEX_VERSION := 1.5
++OPENOBEX_SITE = http://www.kernel.org/pub/linux/bluetooth
++OPENOBEX_AUTORECONF = YES
++OPENOBEX_INSTALL_STAGING = YES
++OPENOBEX_INSTALL_TARGET = YES
++
++ifeq ($(strip $(BR2_PACKAGE_BLUEZ_LIBS)),y)
++WITH_BLUEZ=--with-bluez=$(STAGING_DIR)
++else
++WITH_BLUEZ=--disable-bluetooth
++endif
++
++ifeq ($(strip $(BR2_PACKAGE_LIBUSB)),y)
++WITH_USB=--with-usb=$(STAGING_DIR)
++else
++WITH_USB=--disable-usb
++endif
++
++WITH_APPS=
++ifeq ($(strip $(BR2_PACKAGE_OPENOBEX_APPS)),y)
++WITH_APPS=--enable-apps
++endif
++
++WITH_SYSLOG=
++ifeq ($(strip $(BR2_PACKAGE_OPENOBEX_SYSLOG)),y)
++WITH_SYSLOG=--enable-syslog
++endif
++
++WITH_DUMP=
++ifeq ($(strip $(BR2_PACKAGE_OPENOBEX_DUMP)),y)
++WITH_DUMP=--enable-dump
++endif
++
++OPENOBEX_CONF_OPT = \
++ $(WITH_APPS) \
++ $(WITH_BLUEZ) \
++ $(WITH_USB) \
++ $(WITH_DUMP) \
++ $(WITH_SYSLOG)
++
++$(eval $(call AUTOTARGETS,package,openobex))
++
+Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch 2010-06-16 13:20:42.000000000 +0200
+@@ -0,0 +1,13 @@
++Index: openobex-1.5/acinclude.m4
++===================================================================
++--- openobex-1.5.orig/acinclude.m4 2010-06-16 10:32:47.000000000 +0200
+++++ openobex-1.5/acinclude.m4 2010-06-16 10:35:33.000000000 +0200
++@@ -158,7 +158,7 @@
++ ;;
++ *)
++ PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
++- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
+++ REQUIRES="libusb"
++ ;;
++ esac
++ AC_SUBST(USB_CFLAGS)
+Index: buildroot/package/openobex/openobex-replace_deprecated_functions.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/openobex/openobex-replace_deprecated_functions.patch 2010-06-16 13:20:42.000000000 +0200
+@@ -0,0 +1,25 @@
++Index: openobex-1.5/apps/obex_test_cable.c
++===================================================================
++--- openobex-1.5.orig/apps/obex_test_cable.c 2009-02-08 19:30:22.000000000 +0100
+++++ openobex-1.5/apps/obex_test_cable.c 2010-06-16 11:11:05.000000000 +0200
++@@ -113,9 +113,9 @@
++ if(total == sizeof(tmpbuf))
++ return -1;
++
++- if( (answer = index(tmpbuf, '\n')) ) {
+++ if( (answer = strchr(tmpbuf, '\n')) ) {
++ // Remove first line (echo)
++- if( (answer_end = index(answer+1, '\n')) ) {
+++ if( (answer_end = strchr(answer+1, '\n')) ) {
++ // Found end of answer
++ done = 1;
++ }
++@@ -178,7 +178,7 @@
++ }
++
++ tcgetattr(gt->ttyfd, >->oldtio);
++- bzero(>->newtio, sizeof(struct termios));
+++ memset(>->newtio, 0, sizeof(struct termios));
++ gt->newtio.c_cflag = B115200 | CS8 | CREAD | CRTSCTS;
++ gt->newtio.c_iflag = IGNPAR;
++ gt->newtio.c_oflag = 0;
diff --git a/patches/buildroot/2010.02/117-ussp-push-add_package.patch b/patches/buildroot/2010.02/117-ussp-push-add_package.patch
new file mode 100644
index 0000000..f971465
--- /dev/null
+++ b/patches/buildroot/2010.02/117-ussp-push-add_package.patch
@@ -0,0 +1,48 @@
+Adds ussp-push package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-16 14:31:45.000000000 +0200
++++ buildroot/package/Config.in 2010-06-16 14:37:34.000000000 +0200
+@@ -220,6 +220,7 @@
+ #source "package/udhcp/Config.in"
+ #endif
+ source "package/udpcast/Config.in"
++source "package/ussp-push/Config.in"
+ source "package/vpnc/Config.in"
+ source "package/vsftpd/Config.in"
+ source "package/vtun/Config.in"
+Index: buildroot/package/ussp-push/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/ussp-push/Config.in 2010-06-16 16:31:42.000000000 +0200
+@@ -0,0 +1,10 @@
++config BR2_PACKAGE_USSP_PUSH
++ bool "ussp-push"
++ select BR2_PACKAGE_OPENOBEX
++ select BR2_PACKAGE_BLUEZ_LIBS
++ help
++ ussp-push is an OBEX object pusher for Linux, using the BlueZ
++ BlueTooth stack.
++
++ http://www.xmailserver.org/ussp-push.html
++ http://freshmeat.net/projects/ussp-push/
+Index: buildroot/package/ussp-push/ussp-push.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/ussp-push/ussp-push.mk 2010-06-16 16:32:52.000000000 +0200
+@@ -0,0 +1,12 @@
++#############################################################
++#
++# ussp-push
++#
++#############################################################
++USSP_PUSH_VERSION := 0.11
++USSP_PUSH_SITE = http://www.xmailserver.org
++
++USSP_PUSH_DEPENDENCIES = bluez-libs openobex
++
++$(eval $(call AUTOTARGETS,package,ussp-push))
++
diff --git a/patches/buildroot/2010.02/cleanup_buildroot.sh b/patches/buildroot/2010.02/cleanup_buildroot.sh
index 659f014..92901b1 100755
--- a/patches/buildroot/2010.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.02/cleanup_buildroot.sh
@@ -20,3 +20,5 @@ 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/ussp-push/
+rm -rf buildroot/package/openobex/
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index f15711e..a3ac525 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -24,3 +24,5 @@ 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/
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-16 09:49: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 53f0205600f320ee9de1560d5b4bfa1e40b429b2 (commit)
from dafd031e95b5772fbf5c0297a43b8b555e4778d1 (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 53f0205600f320ee9de1560d5b4bfa1e40b429b2
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jun 16 11:49:15 2010 +0200
[as_devices] suppress -DAPFXX compilation option (bis)
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/Makefile | 8 +-------
target/packages/as_devices/python/Makefile | 8 +-------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index 1d72f81..7acc524 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -2,13 +2,7 @@
ARMADEUS_BASE_DIR=../../../
include $(ARMADEUS_BASE_DIR)/Makefile.in
-ifeq ($(ARMADEUS_BOARD_NAME),apf9328)
-CFLAGS=-Wall -g -O0 -DAPF9328
-else
-ifeq ($(ARMADEUS_BOARD_NAME),apf27)
-CFLAGS=-Wall -g -O0 -DAPF27
-endif
-endif
+CFLAGS=-Wall -g -O0
LDFLAGS=
CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
diff --git a/target/packages/as_devices/python/Makefile b/target/packages/as_devices/python/Makefile
index ecbfff3..07fc233 100644
--- a/target/packages/as_devices/python/Makefile
+++ b/target/packages/as_devices/python/Makefile
@@ -2,13 +2,7 @@
ARMADEUS_BASE_DIR=../../../../
include $(ARMADEUS_BASE_DIR)/Makefile.in
-ifeq ($(ARMADEUS_BOARD_NAME),apf9328)
-CFLAGS=-Wall -g -O0 -DAPF9328
-else
-ifeq ($(ARMADEUS_BOARD_NAME),apf27)
-CFLAGS=-Wall -g -O0 -DAPF27
-endif
-endif
+CFLAGS=-Wall -g -O0
LDFLAGS=
CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-16 09:19: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 dafd031e95b5772fbf5c0297a43b8b555e4778d1 (commit)
via fb94fbec8bdbb1c7d852f7d96cd2572f46c8b7ce (commit)
from c4a69b796052698fadd47c745640de426d9052f9 (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 dafd031e95b5772fbf5c0297a43b8b555e4778d1
Merge: fb94fbec8bdbb1c7d852f7d96cd2572f46c8b7ce c4a69b796052698fadd47c745640de426d9052f9
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jun 16 11:18:58 2010 +0200
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit fb94fbec8bdbb1c7d852f7d96cd2572f46c8b7ce
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jun 16 11:18:43 2010 +0200
[as_devices] suppress -DAPFXX compilation option
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/c/Makefile | 9 +--------
target/packages/as_devices/c/as_gpio.c | 15 ---------------
2 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/target/packages/as_devices/c/Makefile b/target/packages/as_devices/c/Makefile
index 0c25aa3..1fc7a5c 100644
--- a/target/packages/as_devices/c/Makefile
+++ b/target/packages/as_devices/c/Makefile
@@ -11,14 +11,7 @@ endif
LDFLAGS=
CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
-
-ifeq ($(ARMADEUS_BOARD_NAME),apf9328)
-CFLAGS+= -DAPF9328
-endif
-
-ifeq ($(ARMADEUS_BOARD_NAME),apf27)
-CFLAGS+= -DAPF27
-endif
+CFLAGS+=
OBJ=as_pwm.o
OBJ+= as_i2c.o
diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index b614b09..bab67c0 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -54,14 +54,6 @@
#define BUFF_SIZE (300)
-#ifdef APF9328
-# define NUMBER_OF_PORTS 4
-#elif defined(APF27)
-# define NUMBER_OF_PORTS 6
-#else
-#error Error no platform defined
-#endif
-
//#define DEBUG
#ifdef DEBUG
# define ERROR(fmt, ...) printf(fmt, ##__VA_ARGS__)
@@ -79,12 +71,6 @@ struct as_gpio_device *as_gpio_open(char aPortChar, int aPinNum)
int file;
int value;
- if (((aPortChar-'A') > (NUMBER_OF_PORTS-1)) || ((aPortChar-'A') < 0))
- {
- ERROR("No port named %c\n",aPortChar);
- goto letter_error;
- }
-
/* make gpio port string path */
ret = snprintf(gpio_file_path,50, "%s%c%d",
GPIO_BASE_PIN, aPortChar, aPinNum);
@@ -127,7 +113,6 @@ malloc_error:
close(file);
open_file_error:
path_error:
-letter_error:
return NULL;
}
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-15 19:25: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 c4a69b796052698fadd47c745640de426d9052f9 (commit)
from 04fd0e4216fa4e44c64c85bbd359966332a79d1a (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 c4a69b796052698fadd47c745640de426d9052f9
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 15 21:21:30 2010 +0200
[AS_DEVICES] Cleanup makefiles and makes install targets work
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/Makefile | 32 ++++++++++++++--------------
target/packages/as_devices/c/Makefile | 20 ++++++++--------
target/packages/as_devices/python/Makefile | 15 +++++++------
3 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index 3020fce..1d72f81 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -14,20 +14,20 @@ LDFLAGS=
CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
CXX:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+INSTALL_DIR:=$(ARMADEUS_STAGING_DIR)
C_BINARY=test_cdevices
-C_LIBNAME=as_devices
-C_LIB=c/lib$(C_LIBNAME).so
-C_INCLUDE=c/
+C_LIBNAME=libas_devices.so
+C_LIB=c/$(C_LIBNAME)
+C_INCLUDE=c
P_WRAPPER=.python_wrappers
CPP_BINARY=test_cppdevices
-CPP_LIBNAME=as_devices_cpp
-CPP_LIB=cpp/lib$(CPP_LIBNAME).so
-CPP_INCLUDE=cpp/
+CPP_LIBNAME=libas_devices_cpp.so
+CPP_LIB=cpp/$(CPP_LIBNAME)
+CPP_INCLUDE=cpp
-INSTALL_DIR=
.PHONY: all
@@ -51,17 +51,17 @@ $(P_WRAPPER):
touch $(P_WRAPPER)
install:
- install -D $(C_LIB) $(INSTALL_DIR)/usr/lib/
- install -D $(C_INCLUDE)/*.h $(INSTALL_DIR)/usr/include/as_devices/
+ install -D $(C_LIB) $(INSTALL_DIR)/usr/lib/$(C_LIBNAME)
+ mkdir -p $(INSTALL_DIR)/usr/include/as_devices/
+ cp $(C_INCLUDE)/*.h $(INSTALL_DIR)/usr/include/as_devices/
install-exe:
- mkdir -p $(INSTALL_DIR)/usr/lib
- cp $(C_LIB) $(INSTALL_DIR)/usr/lib/
- $(STRIP) $(INSTALL_DIR)/usr/lib/lib$(C_LIBNAME).so
+ install -D $(C_LIB) $(INSTALL_DIR)/usr/lib/$(C_LIBNAME)
+ $(STRIP) $(INSTALL_DIR)/usr/lib/$(C_LIBNAME)
clean:
- cd c; make clean ;
- -rm $(P_WRAPPER)
- cd python; make clean
- -rm $(C_BINARY) # $(CPP_BINARY)
+ make -C c/ clean
+ rm -f $(P_WRAPPER)
+ make -C python/ clean
+ rm -f $(C_BINARY) # $(CPP_BINARY)
diff --git a/target/packages/as_devices/c/Makefile b/target/packages/as_devices/c/Makefile
index e8c5e9d..0c25aa3 100644
--- a/target/packages/as_devices/c/Makefile
+++ b/target/packages/as_devices/c/Makefile
@@ -30,22 +30,22 @@ OBJ+= as_max5821.o
LIBRARY=as_devices
LIB_VERS=1
-STAT_LIB=${LIBRARY}.a
-SONAME=lib${LIBRARY}.so
-LIBNAME=${SONAME}.${LIB_VERS}
+STAT_LIB=$(LIBRARY).a
+SONAME=lib$(LIBRARY).so
+LIBNAME=$(SONAME).$(LIB_VERS)
ARCHIVE_CMD=ar
ARCHIVE_OPTS=-cvq
-${LIBNAME}: ${OBJ}
- ${CC} -shared -Wl,-soname,${SONAME} -o ${SONAME} ${OBJ} -lc
- ln -sf ${SONAME} ${LIBNAME}
+$(LIBNAME): $(OBJ)
+ $(CC) -shared -Wl,-soname,$(SONAME) -o $(SONAME) $(OBJ)
+ ln -sf $(SONAME) $(LIBNAME)
-${STAT_LIB}: ${OBJ}
- ${ARCHIVE_CMD} ${ARCHIVE_OPTS} ${STAT_LIB} ${OBJ}
+$(STAT_LIB): $(OBJ)
+ $(ARCHIVE_CMD) $(ARCHIVE_OPTS) $(STAT_LIB) $(OBJ)
%.o: %.c
- $(CC) -fPIC -o $@ -c $< ${CFLAGS}
+ $(CC) -fPIC -o $@ -c $< $(CFLAGS)
clean:
- -rm ${OBJ} ${BINARY} ${LIBNAME} ${SONAME}
+ rm -f $(OBJ) $(BINARY) $(LIBNAME) $(SONAME)
diff --git a/target/packages/as_devices/python/Makefile b/target/packages/as_devices/python/Makefile
index 2b5e0ba..ecbfff3 100644
--- a/target/packages/as_devices/python/Makefile
+++ b/target/packages/as_devices/python/Makefile
@@ -27,19 +27,20 @@ WRAPPER_DIR=src
PYTHON_VERS=2.4
PYTHON_SUBVERS=5
PYINC=/usr/include/python2.4
-PYLIB=../../../../buildroot/project_build_armv5te/apf27/root/usr/lib/python${PYTHON_VERS}
+PYLIB=../../../../buildroot/project_build_armv5te/apf27/root/usr/lib/python$(PYTHON_VERS)
.PHONY: all
-all: ${WRAPPER_LIBS}
+all: $(WRAPPER_LIBS)
%.so: %.o
- ${CC} -shared $< -o $@ -lc -L${PYLIB} ${AS_LIB}
- mv $@ ${LIBNAME}/wrappers
+ $(CC) -shared $< -o $@ -L$(PYLIB) $(AS_LIB)
+ mv $@ $(LIBNAME)/wrappers
rm $<
-%.o : ${WRAPPER_DIR}/%.c
- ${CC} -fpic -o $@ -c $< ${CFLAGS} -L${PYLIB} -I${PYINC} -I${INCLUDE_LIB}
+%.o : $(WRAPPER_DIR)/%.c
+ $(CC) -fpic -o $@ -c $< $(CFLAGS) -L$(PYLIB) -I$(PYINC) -I$(INCLUDE_LIB)
clean:
- -rm ${LIBNAME}/wrappers/*.so
+ rm -f $(LIBNAME)/wrappers/*.so
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-15 16:54:44
|
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 04fd0e4216fa4e44c64c85bbd359966332a79d1a (commit)
via d14b29eb27d72affba3a277d1848ef21138b0089 (commit)
from 730d043a78c26d65770df895026f3696038ca5b1 (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 04fd0e4216fa4e44c64c85bbd359966332a79d1a
Merge: d14b29eb27d72affba3a277d1848ef21138b0089 730d043a78c26d65770df895026f3696038ca5b1
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 15 18:45:56 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d14b29eb27d72affba3a277d1848ef21138b0089
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 15 18:31:48 2010 +0200
[BUILDROOT] Qt: bump version to 4.5.3
-----------------------------------------------------------------------
Summary of changes:
Makefile | 1 +
Makefile.in | 9 +
buildroot/local/apf27_test/apf27_test.config | 86 +-
buildroot/local/apf9328_test/apf9328_test.config | 4 +-
.../target/device/armadeus/apf27/apf27_defconfig | 4 +-
.../device/armadeus/apf9328/apf9328_defconfig | 4 +-
...define_variables_used_at_different_places.patch | 63 +
.../buildroot/115-qt-bump_version_to_4_5_3.patch | 1431 ++++++++++++++++++++
patches/buildroot/cleanup_buildroot.sh | 1 +
9 files changed, 1554 insertions(+), 49 deletions(-)
create mode 100644 patches/buildroot/114-Makefile-globally_define_variables_used_at_different_places.patch
create mode 100644 patches/buildroot/115-qt-bump_version_to_4_5_3.patch
diff --git a/Makefile b/Makefile
index b1fe77c..a240958 100644
--- a/Makefile
+++ b/Makefile
@@ -195,6 +195,7 @@ shell_env:
@echo ARMADEUS_STAGING_DIR=$(ARMADEUS_STAGING_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_TOOLCHAIN_PATH=$(ARMADEUS_TOOLCHAIN_PATH) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_XENOMAI_DIR=$(ARMADEUS_XENOMAI_DIR) >> $(ARMADEUS_ENV_FILE)
+ @echo ARMADEUS_QT_DIR=$(ARMADEUS_QT_DIR) >> $(ARMADEUS_ENV_FILE)
PHONY_TARGETS+=dummy all linux-menuconfig linux26 linux26-clean buildroot-clean buildroot-dirclean
diff --git a/Makefile.in b/Makefile.in
index dbcfa67..8934896 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,11 +17,13 @@ ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_LINUX26_VERSION))
ARMADEUS_U_BOOT_VERSION:=$(shell grep "U_BOOT_VERSION:=" $(BUILDROOT_DIR)/target/u-boot/Makefile.in 2>/dev/null | cut -d = -f 2)
ARMADEUS_PROJECT_NAME:=$(shell echo $(BR2_PROJECT))
ARMADEUS_UCLIBC_VERSION:=0.9.29
+ARMADEUS_QT_MAKEFILE:=package/qtopia4/qtopia4.mk
else
# New buildroot:
ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_DEFAULT_KERNEL_VERSION))
ARMADEUS_U_BOOT_VERSION:=$(shell echo $(BR2_UBOOT_VERSION))
ARMADEUS_UCLIBC_VERSION:=$(shell echo $(BR2_UCLIBC_VERSION_STRING))
+ARMADEUS_QT_MAKEFILE:=package/qt/qt.mk
endif
ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
ARMADEUS_TARGET_ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
@@ -30,8 +32,14 @@ ARMADEUS_SDL_VERSION:=$(shell grep "SDL_VERSION:=" $(BUILDROOT_DIR)/package/sdl/
ifeq ($(ARMADEUS_SDL_VERSION),)
ARMADEUS_SDL_VERSION:=SDL_NOT_INSTALLED
endif
+
ARMADEUS_XENOMAI_VERSION:=$(shell grep "XENOMAI_VERSION:=" $(BUILDROOT_DIR)/package/xenomai/xenomai.mk 2>/dev/null | cut -d = -f 2)
+ARMADEUS_QT_VERSION:=$(shell grep "QT_VERSION:=" $(BUILDROOT_DIR)/$(ARMADEUS_QT_MAKEFILE) 2>/dev/null | cut -d = -f 2)
+ifeq ($(ARMADEUS_QT_VERSION),)
+ARMADEUS_QT_VERSION:=QT_NOT_INSTALLED
+endif
+
ARMADEUS_PATCH_DIR=patches
ifeq ($(BR2_VERSION),"0.10.0-svn")
BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_DIR)/project_build_$(ARMADEUS_TARGET_ARCH)/$(ARMADEUS_PROJECT_NAME)
@@ -58,4 +66,5 @@ ARMADEUS_TOOLCHAIN_PATH:=$(ARMADEUS_STAGING_DIR)/usr/bin
ARMADEUS_BUILD_DIR:=$(BUILDROOT_BUILD_DIR)
ARMADEUS_SDL_DIR:=$(ARMADEUS_BUILD_DIR)/SDL-$(ARMADEUS_SDL_VERSION)
ARMADEUS_XENOMAI_DIR:=$(ARMADEUS_BUILD_DIR)/xenomai-$(ARMADEUS_XENOMAI_VERSION)
+ARMADEUS_QT_DIR:=$(ARMADEUS_BUILD_DIR)/qt-embedded-linux-opensource-src-$(ARMADEUS_QT_VERSION)
diff --git a/buildroot/local/apf27_test/apf27_test.config b/buildroot/local/apf27_test/apf27_test.config
index 3268f3f..7a9f4a4 100644
--- a/buildroot/local/apf27_test/apf27_test.config
+++ b/buildroot/local/apf27_test/apf27_test.config
@@ -701,57 +701,57 @@ BR2_PACKAGE_FBGRAB=y
#
# other GUIs
#
-BR2_PACKAGE_QTOPIA4=y
-# BR2_PACKAGE_QTOPIA4_DEBUG is not set
-BR2_PACKAGE_QTOPIA4_SHARED=y
-# BR2_PACKAGE_QTOPIA4_STATIC is not set
-BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL=y
-# BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL is not set
-BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED=y
-# BR2_PACKAGE_QTOPIA4_QT3SUPPORT is not set
-BR2_PACKAGE_QTOPIA4_DEPTHS="-depths 24,16,8"
-BR2_PACKAGE_QTOPIA4_GIF=y
-# BR2_PACKAGE_QTOPIA4_LIBMNG is not set
-# BR2_PACKAGE_QTOPIA4_NOJPEG is not set
-BR2_PACKAGE_QTOPIA4_SYSTEMJPEG=y
-# BR2_PACKAGE_QTOPIA4_QTJPEG is not set
-# BR2_PACKAGE_QTOPIA4_NOPNG is not set
-BR2_PACKAGE_QTOPIA4_SYSTEMPNG=y
-# BR2_PACKAGE_QTOPIA4_QTPNG is not set
-BR2_PACKAGE_QTOPIA4_NOTIFF=y
-# BR2_PACKAGE_QTOPIA4_SYSTEMTIFF is not set
-# BR2_PACKAGE_QTOPIA4_QTTIFF is not set
-BR2_PACKAGE_QTOPIA4_QTZLIB=y
-# BR2_PACKAGE_QTOPIA4_SYSTEMZLIB is not set
-BR2_PACKAGE_QTOPIA4_NOFREETYPE=y
-# BR2_PACKAGE_QTOPIA4_QTFREETYPE is not set
-# BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE is not set
-BR2_PACKAGE_QTOPIA4_EMB_PLATFORM="arm"
-# BR2_PACKAGE_QTOPIA4_SQL_MODULE is not set
+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_QT3SUPPORT is not set
+BR2_PACKAGE_QT_DEPTHS="-depths 24,16,8"
+BR2_PACKAGE_QT_GIF=y
+# BR2_PACKAGE_QT_LIBMNG is not set
+# BR2_PACKAGE_QT_NOJPEG is not set
+BR2_PACKAGE_QT_SYSTEMJPEG=y
+# BR2_PACKAGE_QT_QTJPEG is not set
+# BR2_PACKAGE_QT_NOPNG is not set
+BR2_PACKAGE_QT_SYSTEMPNG=y
+# BR2_PACKAGE_QT_QTPNG is not set
+BR2_PACKAGE_QT_NOTIFF=y
+# BR2_PACKAGE_QT_SYSTEMTIFF is not set
+# 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
#
# Graphics drivers
#
-BR2_PACKAGE_QTOPIA4_GFX_LINUXFB=y
-# BR2_PACKAGE_QTOPIA4_GFX_TRANSFORMED is not set
-# BR2_PACKAGE_QTOPIA4_GFX_QVFB is not set
-# BR2_PACKAGE_QTOPIA4_GFX_VNC is not set
-# BR2_PACKAGE_QTOPIA4_GFX_MULTISCREEN is not set
+BR2_PACKAGE_QT_GFX_LINUXFB=y
+# BR2_PACKAGE_QT_GFX_TRANSFORMED is not set
+# BR2_PACKAGE_QT_GFX_QVFB is not set
+# BR2_PACKAGE_QT_GFX_VNC is not set
+# BR2_PACKAGE_QT_GFX_MULTISCREEN is not set
#
# Mouse drivers
#
-# BR2_PACKAGE_QTOPIA4_MOUSE_PC is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_BUS is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_LINUXTP is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_YOPY is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX is not set
-BR2_PACKAGE_QTOPIA4_MOUSE_TSLIB=y
-# BR2_PACKAGE_QTOPIA4_MOUSE_QVFB is not set
-# BR2_PACKAGE_QTOPIA4_XMLPATTERNS is not set
-# BR2_PACKAGE_QTOPIA4_SVG is not set
-# BR2_PACKAGE_QTOPIA4_WEBKIT is not set
-# BR2_PACKAGE_QTOPIA4_OPENSSL is not set
+# BR2_PACKAGE_QT_MOUSE_PC is not set
+# BR2_PACKAGE_QT_MOUSE_BUS is not set
+# BR2_PACKAGE_QT_MOUSE_LINUXTP is not set
+# BR2_PACKAGE_QT_MOUSE_YOPY is not set
+# BR2_PACKAGE_QT_MOUSE_VR41XX is not set
+BR2_PACKAGE_QT_MOUSE_TSLIB=y
+# BR2_PACKAGE_QT_MOUSE_QVFB is not set
+# BR2_PACKAGE_QT_XMLPATTERNS is not set
+# BR2_PACKAGE_QT_SVG is not set
+# BR2_PACKAGE_QT_WEBKIT is not set
+# BR2_PACKAGE_QT_OPENSSL is not set
#
# X Window System server
diff --git a/buildroot/local/apf9328_test/apf9328_test.config b/buildroot/local/apf9328_test/apf9328_test.config
index c660a7c..bada6b3 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
-# Fri Jun 4 16:31:42 2010
+# Tue Jun 15 18:24:10 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -700,7 +700,7 @@ BR2_PACKAGE_FBGRAB=y
#
# other GUIs
#
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
#
# X Window System server
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index aecd419..e6a9ffe 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
-# Fri Jun 4 11:20:33 2010
+# Tue Jun 15 18:24:10 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -660,7 +660,7 @@ BR2_PACKAGE_NCURSES=y
#
# other GUIs
#
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
#
# X Window System server
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index 62d4c39..15a0d10 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
-# Fri Jun 4 16:31:42 2010
+# Tue Jun 15 18:24:10 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -654,7 +654,7 @@ BR2_PACKAGE_NCURSES=y
#
# other GUIs
#
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
#
# X Window System server
diff --git a/patches/buildroot/114-Makefile-globally_define_variables_used_at_different_places.patch b/patches/buildroot/114-Makefile-globally_define_variables_used_at_different_places.patch
new file mode 100644
index 0000000..8132bbc
--- /dev/null
+++ b/patches/buildroot/114-Makefile-globally_define_variables_used_at_different_places.patch
@@ -0,0 +1,63 @@
+From f85f2de174779aaf02cf2a858b2ba28c4cb6f843 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <ja...@su...>
+Date: Sun, 25 Jan 2009 20:19:01 +0000
+Subject: Makefile: globally define variables used at different places
+
+$(comma) and $(space) are used in packages and the toolchain.
+
+Signed-off-by: Markus Heidelberg <mar...@we...>
+---
+diff --git a/Makefile b/Makefile
+index 6b12c76..a55d9bb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -40,6 +40,11 @@ else
+ BR2_LOCAL:=$(TOPDIR)/local
+ endif
+
++# Variables for use in Make constructs
++comma:=,
++empty:=
++space:=$(empty) $(empty)
++
+ # $(shell find . -name *_defconfig |sed 's/.*\///')
+ # Pull in the user's configuration file
+ ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
+diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
+index cbf15bc..1aa38c7 100644
+--- a/package/directfb/directfb.mk
++++ b/package/directfb/directfb.mk
+@@ -52,9 +52,6 @@ endif
+ ifeq ($(DIRECTFB_GFX),)
+ DIRECTFB_GFX:=none
+ else
+-comma:=,
+-empty:=
+-space:=$(empty) $(empty)
+ DIRECTFB_GFX:=$(subst $(space),$(comma),$(strip $(DIRECTFB_GFX)))
+ endif
+
+@@ -75,9 +72,6 @@ endif
+ ifeq ($(DIRECTFB_INPUT),)
+ DIRECTFB_INPUT:=none
+ else
+-comma:=,
+-empty:=
+-space:=$(empty) $(empty)
+ DIRECTFB_INPUT:=$(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT)))
+ endif
+
+diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
+index fc59b6b..368ac8e 100644
+--- a/toolchain/gcc/gcc-uclibc-3.x.mk
++++ b/toolchain/gcc/gcc-uclibc-3.x.mk
+@@ -233,7 +233,6 @@ gcc_initial-dirclean:
+ # affect gcc-target. However, I haven't tested gcc-target yet so no
+ # guarantees. mjn3
+
+-comma:=,
+ GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final
+ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ)
+ mkdir -p $(GCC_BUILD_DIR2)
+--
+cgit v0.8.2.1
diff --git a/patches/buildroot/115-qt-bump_version_to_4_5_3.patch b/patches/buildroot/115-qt-bump_version_to_4_5_3.patch
new file mode 100644
index 0000000..31e5c8a
--- /dev/null
+++ b/patches/buildroot/115-qt-bump_version_to_4_5_3.patch
@@ -0,0 +1,1431 @@
+Apply BR 2010.02 changes
+
+Index: buildroot/package/qtopia4/Config.gfx.in
+===================================================================
+--- buildroot.orig/package/qtopia4/Config.gfx.in 2008-11-03 09:15:31.000000000 +0100
++++ buildroot/package/qtopia4/Config.gfx.in 2010-06-15 18:21:22.000000000 +0200
+@@ -1,19 +1,19 @@
+ menu "Graphics drivers"
+
+-config BR2_PACKAGE_QTOPIA4_GFX_LINUXFB
++config BR2_PACKAGE_QT_GFX_LINUXFB
+ bool "Linux Framebuffer"
+ default y
+
+-config BR2_PACKAGE_QTOPIA4_GFX_TRANSFORMED
++config BR2_PACKAGE_QT_GFX_TRANSFORMED
+ bool "Transformed"
+
+-config BR2_PACKAGE_QTOPIA4_GFX_QVFB
++config BR2_PACKAGE_QT_GFX_QVFB
+ bool "Qt Virtual Framebuffer"
+
+-config BR2_PACKAGE_QTOPIA4_GFX_VNC
++config BR2_PACKAGE_QT_GFX_VNC
+ bool "VNC"
+
+-config BR2_PACKAGE_QTOPIA4_GFX_MULTISCREEN
++config BR2_PACKAGE_QT_GFX_MULTISCREEN
+ bool "multiscreen"
+
+ endmenu
+Index: buildroot/package/qtopia4/Config.in
+===================================================================
+--- buildroot.orig/package/qtopia4/Config.in 2008-11-03 09:15:31.000000000 +0100
++++ buildroot/package/qtopia4/Config.in 2010-06-15 18:23:44.000000000 +0200
+@@ -1,33 +1,35 @@
+-config BR2_PACKAGE_QTOPIA4
+- bool "qtopia4"
+- select BR2_INSTALL_LIBSTDCPP
+- select BR2_PTHREADS_NATIVE
++comment "qt requires a toolchain with C++ support enabled"
++ depends on !BR2_INSTALL_LIBSTDCPP
++
++menuconfig BR2_PACKAGE_QT
++ bool "Qt"
++ depends on BR2_INSTALL_LIBSTDCPP
+ help
+- Qtopia core 4.
++ Qt for Embedded Linux.
+
+- http://www.trolltech.com/
++ http://www.qtsoftware.com/products/platform/qt-for-embedded-linux
+
+-if BR2_PACKAGE_QTOPIA4
++if BR2_PACKAGE_QT
+
+-config BR2_PACKAGE_QTOPIA4_DEBUG
++config BR2_PACKAGE_QT_DEBUG
+ bool "Compile with debug support"
+ help
+ If unsure, say N.
+
+ choice
+ prompt "Library type"
+- default BR2_PACKAGE_QTOPIA4_SHARED
++ default BR2_PACKAGE_QT_SHARED
+ help
+ Selects the library type: Shared or Static
+
+-config BR2_PACKAGE_QTOPIA4_SHARED
++config BR2_PACKAGE_QT_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_QTOPIA4_STATIC
++config BR2_PACKAGE_QT_STATIC
+ bool "Static Library"
+ help
+ Create and use static Qt libraries.
+@@ -37,90 +39,142 @@
+
+ endchoice
+
+-choice
+- prompt "Qtopia 4 Core license type"
+- default BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL
++config BR2_PACKAGE_QT_LICENSE_APPROVED
++ bool "Approve free license"
+ help
+- Selects the type of license you which to use for Qtopia 4 Core.
+-
+-config BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL
+- bool "GPL license"
++ 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.
+
+-config BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
+- bool "Commercial license"
++ LGPL v2.1: http://doc.trolltech.com/4.5/lgpl.html
++ GPL v3.0: http://doc.trolltech.com/4.5/gpl.html
+
+-endchoice
++config BR2_PACKAGE_QT_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_QTOPIA4_GPL_LICENSE_APPROVED
+- bool "Approve Qtopia Core 4 GPL licence"
+- depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL
++config BR2_PACKAGE_QT_GUI_MODULE
++ bool "Gui Module"
++ select BR2_PACKAGE_QT_NETWORK
++ default y
+ help
+- Select this if you approve the GNU GENERAL PUBLIC LICENSE Version 2
+- on the Qtopia Core 4 library. By doing this you will not be asked
+- while the library is compiled. Please read and understand the GPL
+- licence before approving this.
++ 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_GUI_MODULE
++menu "Pixel depths"
++comment "Deselecting each option leads to Qt's default (8,16,32)"
++
++config BR2_PACKAGE_QT_PIXEL_DEPTH_1
++ bool "1 bpp, black/white"
++
++config BR2_PACKAGE_QT_PIXEL_DEPTH_4
++ bool "4 bpp, grayscale"
++
++config BR2_PACKAGE_QT_PIXEL_DEPTH_8
++ bool "8 bpp, paletted"
++ default y
++
++config BR2_PACKAGE_QT_PIXEL_DEPTH_12
++ bool "12 bpp, rgb 4-4-4"
++
++config BR2_PACKAGE_QT_PIXEL_DEPTH_15
++ bool "15 bpp, rgb 5-5-5"
++
++config BR2_PACKAGE_QT_PIXEL_DEPTH_16
++ bool "16 bpp, rgb 5-6-5"
++ default y
++
++config BR2_PACKAGE_QT_PIXEL_DEPTH_18
++ bool "18 bpp, rgb 6-6-6"
++
++config BR2_PACKAGE_QT_PIXEL_DEPTH_24
++ bool "24 bpp, rgb 8-8-8"
++
++config BR2_PACKAGE_QT_PIXEL_DEPTH_32
++ bool "32 bpp, argb 8-8-8-8 and rgb 8-8-8"
++ default y
+
+- For full GPL version 2 see http://www.gnu.org/licenses/gpl.txt
++endmenu
+
++menu "Fonts"
+
+-config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME
+- string "Qtopia Core 4 Commercial License Username"
+- default ""
+- depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
++config BR2_PACKAGE_QT_FONT_MICRO
++ bool "micro"
++ default y
++
++config BR2_PACKAGE_QT_FONT_FIXED
++ bool "fixed"
++ default y
++
++config BR2_PACKAGE_QT_FONT_HELVETICA
++ bool "helvetica"
++ default y
++
++config BR2_PACKAGE_QT_FONT_JAPANESE
++ bool "japanese"
++
++config BR2_PACKAGE_QT_FONT_UNIFONT
++ bool "unicode"
++
++endmenu
++
++choice
++ prompt "freetype2 support"
++ default BR2_PACKAGE_QT_NOFREETYPE
+ help
+- Commercial users can download their source directly by
+- providing a username.
++ Select freetype2 support.
+
+-config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD
+- string "Qtopia Core 4 Commercial License Password"
+- default ""
+- depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
++config BR2_PACKAGE_QT_NOFREETYPE
++ bool "no freetype2 support"
+ help
+- Commercial users can download their source directly by
+- providing a password.
++ Do not compile in Freetype2 support.
+
+-config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
+- bool "Compatibility with Qt3"
++config BR2_PACKAGE_QT_QTFREETYPE
++ bool "Qt freetype2"
+ 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.
++ Use the libfreetype bundled with Qt.
+
+-config BR2_PACKAGE_QTOPIA4_DEPTHS
+- string "color depths to support"
+- default "-depths 24,16,8"
++config BR2_PACKAGE_QT_SYSTEMFREETYPE
++ bool "System freetype2"
++ select BR2_PACKAGE_FREETYPE
+ help
+- Which color depths to support for the library. Default is "-depths
+- 24,16,8". Different depths are specified by a comma separated list.
++ Use shared libfreetype from the target system.
++ See http://www.freetype.org/
++endchoice
+
+-config BR2_PACKAGE_QTOPIA4_GIF
++config BR2_PACKAGE_QT_GIF
+ bool "Enable GIF support"
+ help
+ This compiles and installs the plugin for GIF reading support.
+
+-config BR2_PACKAGE_QTOPIA4_LIBMNG
++config BR2_PACKAGE_QT_LIBMNG
+ bool "Enable libmng support"
+ help
+ This compiles and installs the plugin for MNG support.
+
+ choice
+ prompt "JPEG support"
+- default BR2_PACKAGE_QTOPIA4_NOJPEG
++ default BR2_PACKAGE_QT_NOJPEG
+ help
+ Select libjpeg support.
+
+-config BR2_PACKAGE_QTOPIA4_NOJPEG
++config BR2_PACKAGE_QT_NOJPEG
+ bool "No jpeg support"
+ help
+ Disable JPEG support
+
+-config BR2_PACKAGE_QTOPIA4_SYSTEMJPEG
++config BR2_PACKAGE_QT_SYSTEMJPEG
+ select BR2_PACKAGE_JPEG
+ bool "System libjpeg"
+ help
+ Link against system libjpeg
+
+-config BR2_PACKAGE_QTOPIA4_QTJPEG
++config BR2_PACKAGE_QT_QTJPEG
+ bool "Use Qt bundled libjpeg"
+ help
+ Link against libjpeg proveded with Qt
+@@ -128,83 +182,60 @@
+
+ choice
+ prompt "PNG support"
+- default BR2_PACKAGE_QTOPIA4_NOPNG
++ default BR2_PACKAGE_QT_NOPNG
+ help
+ Select which library to use if PNG support should be enabled.
+
+-config BR2_PACKAGE_QTOPIA4_NOPNG
++config BR2_PACKAGE_QT_NOPNG
+ bool "No PNG support"
+
+-config BR2_PACKAGE_QTOPIA4_SYSTEMPNG
++config BR2_PACKAGE_QT_SYSTEMPNG
+ bool "System libpng"
+ select BR2_PACKAGE_LIBPNG
+
+-config BR2_PACKAGE_QTOPIA4_QTPNG
++config BR2_PACKAGE_QT_QTPNG
+ bool "Use Qt bundled libpng"
+ endchoice
+
+ choice
+ prompt "TIFF support"
+- default BR2_PACKAGE_QTOPIA4_NOTIFF
++ default BR2_PACKAGE_QT_NOTIFF
+ help
+ Select which library to use if TIFF support should be enabled.
+
+-config BR2_PACKAGE_QTOPIA4_NOTIFF
++config BR2_PACKAGE_QT_NOTIFF
+ bool "No TIFF support"
+
+-config BR2_PACKAGE_QTOPIA4_SYSTEMTIFF
++config BR2_PACKAGE_QT_SYSTEMTIFF
+ bool "System libtiff"
+ select BR2_PACKAGE_TIFF
+
+-config BR2_PACKAGE_QTOPIA4_QTTIFF
++config BR2_PACKAGE_QT_QTTIFF
+ bool "Use Qt bundled libtiff"
+ endchoice
+
++endif # BR2_PACKAGE_QT_GUI_MODULE
++
+ choice
+ prompt "zlib support"
+- default BR2_PACKAGE_QTOPIA4_QTZLIB
++ default BR2_PACKAGE_QT_QTZLIB
+ help
+ Select zlib support.
+
+-config BR2_PACKAGE_QTOPIA4_QTZLIB
++config BR2_PACKAGE_QT_QTZLIB
+ bool "Qt zlib"
+ help
+ Use the zlib bundled with Qt.
+
+-config BR2_PACKAGE_QTOPIA4_SYSTEMZLIB
++config BR2_PACKAGE_QT_SYSTEMZLIB
+ bool "System zlib"
+ select BR2_PACKAGE_ZLIB
+ help
+ Use the shared zlib from the system.
+ endchoice
+
+-choice
+- prompt "freetype2 support"
+- default BR2_PACKAGE_QTOPIA4_NOFREETYPE
+- help
+- Select freetype2 support.
+-
+-config BR2_PACKAGE_QTOPIA4_NOFREETYPE
+- bool "no freetype2 support"
+- help
+- Do not compile in Freetype2 support.
+-
+-
+-config BR2_PACKAGE_QTOPIA4_QTFREETYPE
+- bool "Qt freetype2"
+- help
+- Use the libfreetype bundled with Qt.
+-
+-config BR2_PACKAGE_QTOPIA4_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_QTOPIA4_EMB_PLATFORM
+- string "The embedded platform we are making Qtopia4 for"
++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
+@@ -212,12 +243,12 @@
+ default "x86_64" if BR2_x86_64
+ default "mips" if BR2_mips
+ default "mips" if BR2_mipsel
++ default "ppc" 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_powerpc
+ default "generic" if BR2_sh
+ default "generic" if BR2_sh64
+ default "generic" if BR2_sparc
+@@ -225,29 +256,54 @@
+ The target platform.
+
+ 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"
++endif
++
++config BR2_PACKAGE_QT_XML
++ bool "XML Module"
++ default y
++ help
++ Build the XML module.
+
+-config BR2_PACKAGE_QTOPIA4_XMLPATTERNS
++config BR2_PACKAGE_QT_XMLPATTERNS
+ bool "XML Patterns Module"
++ depends on BR2_PACKAGE_QT_XML
+ help
+ Build QtXmlPatterns module.
+ If unsure, say n
+
+-config BR2_PACKAGE_QTOPIA4_SVG
++config BR2_PACKAGE_QT_SVG
+ bool "SVG Module"
+ help
+ Build the SVG module.
+ If unsure, say n
+
+-config BR2_PACKAGE_QTOPIA4_WEBKIT
++config BR2_PACKAGE_QT_NETWORK
++ bool "Network Module"
++ default y
++ help
++ Install the Network module.
++ if unsure, say y
++
++config BR2_PACKAGE_QT_WEBKIT
+ bool "WebKit Module"
++ depends on BR2_PACKAGE_QT_NETWORK
+ help
+ Build the WebKit module.
+ If unsure, say n.
+
+-config BR2_PACKAGE_QTOPIA4_OPENSSL
++config BR2_PACKAGE_QT_STL
++ bool "STL support"
++ help
++ Compile STL support.
++ If unsure, say n.
++
++config BR2_PACKAGE_QT_OPENSSL
+ bool "Enable OpenSSL support"
++ depends on BR2_PACKAGE_QT_NETWORK
+ select BR2_PACKAGE_OPENSSL
+ help
+ Enable support for the OpenSSL encryption library. If you use
+@@ -255,4 +311,18 @@
+ target.
+ If unsure, say n.
+
+-endif # BR2_PACKAGE_QTOPIA4
++config BR2_PACKAGE_QT_SCRIPT
++ bool "Script Module"
++ default y
++ help
++ Build the Qt Script module.
++ if unsure, say y.
++
++config BR2_PACKAGE_QT_SCRIPTTOOLS
++ bool "Script Tools Module"
++ depends on BR2_PACKAGE_QT_SCRIPT
++ help
++ Build the Qt Script Tools module.
++ if unsure, say n.
++
++endif # BR2_PACKAGE_QT
+Index: buildroot/package/qtopia4/Config.keyboard.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtopia4/Config.keyboard.in 2010-06-15 18:21:22.000000000 +0200
+@@ -0,0 +1,21 @@
++menu "Keyboard drivers"
++
++config BR2_PACKAGE_QT_KEYBOARD_TTY
++ bool "tty"
++
++config BR2_PACKAGE_QT_KEYBOARD_USB
++ bool "usb"
++
++config BR2_PACKAGE_QT_KEYBOARD_SL5000
++ bool "sl5000"
++
++config BR2_PACKAGE_QT_KEYBOARD_YOPY
++ bool "yopy"
++
++config BR2_PACKAGE_QT_KEYBOARD_VR41XX
++ bool "vr41xx"
++
++config BR2_PACKAGE_QT_KEYBOARD_QVFB
++ bool "qvfb"
++
++endmenu
+Index: buildroot/package/qtopia4/Config.mouse.in
+===================================================================
+--- buildroot.orig/package/qtopia4/Config.mouse.in 2008-11-03 09:15:31.000000000 +0100
++++ buildroot/package/qtopia4/Config.mouse.in 2010-06-15 18:21:22.000000000 +0200
+@@ -1,24 +1,24 @@
+ menu "Mouse drivers"
+
+-config BR2_PACKAGE_QTOPIA4_MOUSE_PC
++config BR2_PACKAGE_QT_MOUSE_PC
+ bool "pc"
+
+-config BR2_PACKAGE_QTOPIA4_MOUSE_BUS
++config BR2_PACKAGE_QT_MOUSE_BUS
+ bool "bus"
+
+-config BR2_PACKAGE_QTOPIA4_MOUSE_LINUXTP
++config BR2_PACKAGE_QT_MOUSE_LINUXTP
+ bool "linuxtp"
+
+-config BR2_PACKAGE_QTOPIA4_MOUSE_YOPY
++config BR2_PACKAGE_QT_MOUSE_YOPY
+ bool "yopy"
+
+-config BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX
++config BR2_PACKAGE_QT_MOUSE_VR41XX
+ bool "vr41xx"
+
+-config BR2_PACKAGE_QTOPIA4_MOUSE_TSLIB
++config BR2_PACKAGE_QT_MOUSE_TSLIB
+ bool "tslib"
+
+-config BR2_PACKAGE_QTOPIA4_MOUSE_QVFB
++config BR2_PACKAGE_QT_MOUSE_QVFB
+ bool "qvfb"
+
+ endmenu
+Index: buildroot/package/qtopia4/Config.sql.in
+===================================================================
+--- buildroot.orig/package/qtopia4/Config.sql.in 2008-11-03 09:15:31.000000000 +0100
++++ buildroot/package/qtopia4/Config.sql.in 2010-06-15 18:21:22.000000000 +0200
+@@ -1,40 +1,40 @@
+-menuconfig BR2_PACKAGE_QTOPIA4_SQL_MODULE
++menuconfig BR2_PACKAGE_QT_SQL_MODULE
+ bool "SQL Module"
+ help
+- Compile Qtopia SQL Module
++ Compile Qt SQL Module
+
+-if BR2_PACKAGE_QTOPIA4_SQL_MODULE
+-config BR2_PACKAGE_QTOPIA4_MYSQL
++if BR2_PACKAGE_QT_SQL_MODULE
++config BR2_PACKAGE_QT_MYSQL
+ bool "MySQL Driver"
+ help
+ Build MySQL driver
+ If unsure, say n.
+
+-config BR2_PACKAGE_QTOPIA4_IBASE
++config BR2_PACKAGE_QT_IBASE
+ bool "iBase Driver"
+ help
+ Build iBase driver
+ If unsure, say n.
+
+-config BR2_PACKAGE_QTOPIA4_ODBC
++config BR2_PACKAGE_QT_ODBC
+ bool "ODBC Driver"
+ help
+ Build ODBC driver
+ If unsure, say n.
+
+-config BR2_PACKAGE_QTOPIA4_PSQL
++config BR2_PACKAGE_QT_PSQL
+ bool "PostgreSQL Driver"
+ help
+ Build PostgreSQL driver
+ If unsure, say n.
+
+-config BR2_PACKAGE_QTOPIA4_SQLITE
++config BR2_PACKAGE_QT_SQLITE
+ bool "SQLite 3 Driver"
+ help
+ Build SQLite driver
+ If unsure, say n.
+
+-config BR2_PACKAGE_QTOPIA4_SQLITE2
++config BR2_PACKAGE_QT_SQLITE2
+ bool "SQLite 2 Driver"
+ help
+ Build SQLite 2 driver
+Index: buildroot/package/qtopia4/qt-4.5.3-fix-qt-zlib-build.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/qtopia4/qt-4.5.3-fix-qt-zlib-build.patch 2010-06-15 18:21:22.000000000 +0200
+@@ -0,0 +1,20 @@
++When QT is compiled in qt-zlib mode, compilation of
++src/gui/painting/qprintengine_pdf.cpp fails because zlib.h is not
++found. The following patch adds the internal QT zlib directory to the
++include path to fix this issue.
++
++---
++ src/gui/painting/painting.pri | 3 +++
++ 1 file changed, 3 insertions(+)
++
++Index: qt-embedded-linux-opensource-src-4.5.3/src/gui/painting/painting.pri
++===================================================================
++--- qt-embedded-linux-opensource-src-4.5.3.orig/src/gui/painting/painting.pri
+++++ qt-embedded-linux-opensource-src-4.5.3/src/gui/painting/painting.pri
++@@ -367,3 +367,6 @@
++ SOURCES += painting/qwindowsurface_d3d.cpp
++ }
++
+++contains(QT_CONFIG, zlib) {
+++ INCLUDEPATH += ../3rdparty/zlib
+++}
+Index: buildroot/package/qtopia4/qtopia4.mk
+===================================================================
+--- buildroot.orig/package/qtopia4/qtopia4.mk 2008-11-03 09:15:31.000000000 +0100
++++ buildroot/package/qtopia4/qtopia4.mk 2010-06-15 18:21:22.000000000 +0200
+@@ -1,9 +1,10 @@
+ ######################################################################
+ #
+-# qtopia4 (Qtopia Core 4)
+-# http://www.trolltech.com/
++# Qt Embedded for Linux 4.5
++# http://www.qtsoftware.com/
+ #
+-# This makefile composed by Thomas Lundquist <tho...@ze...>
++# 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
+@@ -11,327 +12,472 @@
+ #
+ ######################################################################
+
+-# BUG: In "OpenSuSE 10.2", dbus.h is at dbus-1.0/dbus/dbus.h
+-# instead of at "dbus/dbus.h"
+-# (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus)
+-# to fix
+-
+-QTOPIA4_VERSION:=4.4.3
+-QTOPIA4_CAT:=$(BZCAT)
+-
+-BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)))
+-#"))
+-BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD)))
+-#"))
+-
+-QTOPIA4_CONFIGURE:=#empty
+-
+-# What to download, free or commercial version.
+-ifneq ($(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME),)
+-QTOPIA4_SITE:=http://$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME):$(BR2_QTOPIA4_COMMERCIAL_PASSWORD)@dist.trolltech.com/$(BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME)
+-QTOPIA4_SOURCE:=qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION).tar.bz2
+-QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-commercial-src-$(QTOPIA4_VERSION)
+-QTOPIA4_CONFIGURE+= -no-sql-oci -no-sql-tds -no-sql-db2
+-else # Good, good, we are free:
+-QTOPIA4_SITE=ftp://ftp.trolltech.com/qt/source
+-QTOPIA4_SOURCE:=qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION).tar.bz2
+-QTOPIA4_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QTOPIA4_VERSION)
+-ifeq ($(BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED),y)
+-QTOPIA4_CONFIGURE+= -confirm-license
+-endif
++QT_VERSION:=4.5.3
++QT_SOURCE:=qt-embedded-linux-opensource-src-$(QT_VERSION).tar.gz
++QT_SITE:=http://get.qt.nokia.com/qt/source
++QT_CAT:=$(ZCAT)
++QT_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QT_VERSION)
++
++QT_CONFIGURE:=#empty
++
++ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
++QT_CONFIGURE += -opensource -confirm-license
+ endif
+
+ # If you want extra tweaking you can copy
+-# $(QTOPIA4_TARGET_DIR)/src/corelib/global/qconfig-myfile.h
+-# to the qtopia4 packages directory (where this .mk file is) and
++# $(QT_TARGET_DIR)/src/corelib/global/qconfig-myfile.h
++# to the qt packages directory (where this .mk file is) and
+ # remove the comment.
+-# QTOPIA4_QCONFIG_COMMAND:=-qconfig myfile
++# QT_QCONFIG_COMMAND:=-qconfig myfile
+ #
+ # For the options you can set in this file, look at
+-# $(QTOPIA4_TARGET_DIR)/src/corelib/global/qfeatures.txt
++# $(QT_TARGET_DIR)/src/corelib/global/qfeatures.txt
+ #
+-QTOPIA4_QCONFIG_FILE:=package/qtopia4/qconfig-myfile.h
+-QTOPIA4_QCONFIG_FILE_LOCATION:=/src/corelib/global/
++QT_QCONFIG_FILE:=package/qtopia4/qconfig-myfile.h
++QT_QCONFIG_FILE_LOCATION:=/src/corelib/global/
+
+ ifeq ($(BR2_LARGEFILE),y)
+-QTOPIA4_CONFIGURE+= -largefile
++QT_CONFIGURE+= -largefile
+ else
+-QTOPIA4_CONFIGURE+= -no-largefile
++QT_CONFIGURE+= -no-largefile
+ endif
+
+-ifeq ($(BR2_PACKAGE_QTOPIA4_QT3SUPPORT),y)
+-QTOPIA4_CONFIGURE+= -qt3support
++ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
++QT_CONFIGURE+= -qt3support
+ else
+-QTOPIA4_CONFIGURE+= -no-qt3support
++QT_CONFIGURE+= -no-qt3support
+ endif
+
++# ensure glib is built first if enabled for Qt's glib support
++ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
++QT_DEP_LIBS+=libglib2
++endif
++
++
++### Pixel depths
++QT_PIXEL_DEPTHS := # empty
++ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_1),y)
++QT_PIXEL_DEPTHS += 1
++endif
++ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_4),y)
++QT_PIXEL_DEPTHS += 4
++endif
++ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_8),y)
++QT_PIXEL_DEPTHS += 8
++endif
++ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_12),y)
++QT_PIXEL_DEPTHS += 12
++endif
++ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_15),y)
++QT_PIXEL_DEPTHS += 15
++endif
++ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_16),y)
++QT_PIXEL_DEPTHS += 16
++endif
++ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_18),y)
++QT_PIXEL_DEPTHS += 18
++endif
++ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_24),y)
++QT_PIXEL_DEPTHS += 24
++endif
++ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_32),y)
++QT_PIXEL_DEPTHS += 32
++endif
++ifneq ($(QT_PIXEL_DEPTHS),)
++QT_CONFIGURE += -depths $(subst $(space),$(comma),$(strip $(QT_PIXEL_DEPTHS)))
++endif
+
+ ### Display drivers
+-ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_LINUXFB),y)
+-QTOPIA4_CONFIGURE += -qt-gfx-linuxfb
++ifeq ($(BR2_PACKAGE_QT_GFX_LINUXFB),y)
++QT_CONFIGURE += -qt-gfx-linuxfb
+ else
+-QTOPIA4_CONFIGURE += -no-gfx-linuxfb
++QT_CONFIGURE += -no-gfx-linuxfb
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_TRANSFORMED),y)
+-QTOPIA4_CONFIGURE += -qt-gfx-transformed
++ifeq ($(BR2_PACKAGE_QT_GFX_TRANSFORMED),y)
++QT_CONFIGURE += -qt-gfx-transformed
+ else
+-QTOPIA4_CONFIGURE += -no-gfx-transformed
++QT_CONFIGURE += -no-gfx-transformed
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_QVFB),y)
+-QTOPIA4_CONFIGURE += -qt-gfx-qvfb
++ifeq ($(BR2_PACKAGE_QT_GFX_QVFB),y)
++QT_CONFIGURE += -qt-gfx-qvfb
+ else
+-QTOPIA4_CONFIGURE += -no-gfx-qvfb
++QT_CONFIGURE += -no-gfx-qvfb
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_VNC),y)
+-QTOPIA4_CONFIGURE += -qt-gfx-vnc
++ifeq ($(BR2_PACKAGE_QT_GFX_VNC),y)
++QT_CONFIGURE += -qt-gfx-vnc
+ else
+-QTOPIA4_CONFIGURE += -no-gfx-vnc
++QT_CONFIGURE += -no-gfx-vnc
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_GFX_MULTISCREEN),y)
+-QTOPIA4_CONFIGURE += -qt-gfx-multiscreen
++ifeq ($(BR2_PACKAGE_QT_GFX_MULTISCREEN),y)
++QT_CONFIGURE += -qt-gfx-multiscreen
+ else
+-QTOPIA4_CONFIGURE += -no-gfx-multiscreen
++QT_CONFIGURE += -no-gfx-multiscreen
+ endif
+
+ ### Mouse drivers
+-ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_PC),y)
+-QTOPIA4_CONFIGURE += -qt-mouse-pc
++ifeq ($(BR2_PACKAGE_QT_MOUSE_PC),y)
++QT_CONFIGURE += -qt-mouse-pc
+ else
+-QTOPIA4_CONFIGURE += -no-mouse-pc
++QT_CONFIGURE += -no-mouse-pc
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_BUS),y)
+-QTOPIA4_CONFIGURE += -qt-mouse-bus
++ifeq ($(BR2_PACKAGE_QT_MOUSE_BUS),y)
++QT_CONFIGURE += -qt-mouse-bus
+ else
+-QTOPIA4_CONFIGURE += -no-mouse-bus
++QT_CONFIGURE += -no-mouse-bus
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_LINUXTP),y)
+-QTOPIA4_CONFIGURE += -qt-mouse-linuxtp
++ifeq ($(BR2_PACKAGE_QT_MOUSE_LINUXTP),y)
++QT_CONFIGURE += -qt-mouse-linuxtp
+ else
+-QTOPIA4_CONFIGURE += -no-mouse-linuxtp
++QT_CONFIGURE += -no-mouse-linuxtp
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_YOPY),y)
+-QTOPIA4_CONFIGURE += -qt-mouse-yopy
++ifeq ($(BR2_PACKAGE_QT_MOUSE_YOPY),y)
++QT_CONFIGURE += -qt-mouse-yopy
+ else
+-QTOPIA4_CONFIGURE += -no-mouse-yopy
++QT_CONFIGURE += -no-mouse-yopy
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX),y)
+-QTOPIA4_CONFIGURE += -qt-mouse-vr41xx
++ifeq ($(BR2_PACKAGE_QT_MOUSE_VR41XX),y)
++QT_CONFIGURE += -qt-mouse-vr41xx
+ else
+-QTOPIA4_CONFIGURE += -no-mouse-vr41xx
++QT_CONFIGURE += -no-mouse-vr41xx
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_TSLIB),y)
+-QTOPIA4_CONFIGURE += -qt-mouse-tslib
+-QTOPIA4_DEP_LIBS+=tslib
+-QTOPIA4_TSLIB_DEB="-D TSLIBMOUSEHANDLER_DEBUG"
+-QTOPIA4_TSLIB_DEB:=$(strip $(subst ",, $(QTOPIA4_TSLIB_DEB)))
+-#"))
++ifeq ($(BR2_PACKAGE_QT_MOUSE_TSLIB),y)
++QT_CONFIGURE += -qt-mouse-tslib
++QT_DEP_LIBS+=tslib
+ else
+-QTOPIA4_CONFIGURE += -no-mouse-tslib
++QT_CONFIGURE += -no-mouse-tslib
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_MOUSE_QVFB),y)
+-QTOPIA4_CONFIGURE += -qt-mouse-qvfb
++ifeq ($(BR2_PACKAGE_QT_MOUSE_QVFB),y)
++QT_CONFIGURE += -qt-mouse-qvfb
+ else
+-QTOPIA4_CONFIGURE += -no-mouse-qvfb
++QT_CONFIGURE += -no-mouse-qvfb
+ endif
+
+-ifeq ($(BR2_PACKAGE_QTOPIA4_DEBUG),y)
+-QTOPIA4_CONFIGURE+= "-debug $(QTOPIA4_TSLIB_DEB)"
++### Keyboard drivers
++ifeq ($(BR2_PACKAGE_QT_KEYBOARD_TTY),y)
++QT_CONFIGURE += -qt-kbd-tty
++else
++QT_CONFIGURE += -no-kbd-tty
++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
++else
++QT_CONFIGURE += -no-kbd-sl5000
++endif
++ifeq ($(BR2_PACKAGE_QT_KEYBOARD_YOPY),y)
++QT_CONFIGURE += -qt-kbd-yopy
+ else
+-QTOPIA4_CONFIGURE+= -release
++QT_CONFIGURE += -no-kbd-yopy
++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
++else
++QT_CONFIGURE += -no-kbd-qvfb
+ endif
+
+-ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
+-QTOPIA4_CONFIGURE+= -shared
++ifeq ($(BR2_PACKAGE_QT_DEBUG),y)
++QT_CONFIGURE+= -debug
+ else
+-QTOPIA4_CONFIGURE+= -static
++QT_CONFIGURE+= -release
++endif
++
++ifeq ($(BR2_PACKAGE_QT_SHARED),y)
++QT_CONFIGURE+= -shared
++else
++QT_CONFIGURE+= -static
+ endif
+
+ ifeq ($(BR2_ENDIAN),"LITTLE")
+-QTOPIA4_CONFIGURE+= -little-endian
++QT_CONFIGURE+= -little-endian
+ else
+-QTOPIA4_CONFIGURE+= -big-endian
++QT_CONFIGURE+= -big-endian
+ endif
+
+-ifeq ($(BR2_PACKAGE_QTOPIA4_GIF),y)
+-QTOPIA4_CONFIGURE+= -qt-gif
++ifeq ($(BR2_PACKAGE_QT_GIF),y)
++QT_CONFIGURE+= -qt-gif
+ else
+-QTOPIA4_CONFIGURE+= -no-gif
++QT_CONFIGURE+= -no-gif
+ endif
+
+-ifeq ($(BR2_PACKAGE_QTOPIA4_LIBMNG),y)
+-QTOPIA4_CONFIGURE+= -qt-libmng
++ifeq ($(BR2_PACKAGE_QT_LIBMNG),y)
++QT_CONFIGURE+= -qt-libmng
+ else
+-QTOPIA4_CONFIGURE+= -no-libmng
++QT_CONFIGURE+= -no-libmng
+ endif
+
+-ifeq ($(BR2_PACKAGE_QTOPIA4_QTZLIB),y)
+-QTOPIA4_CONFIGURE+= -qt-zlib
++ifeq ($(BR2_PACKAGE_QT_QTZLIB),y)
++QT_CONFIGURE+= -qt-zlib
+ else
+-ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMZLIB),y)
+-QTOPIA4_CONFIGURE+= -system-zlib
+-QTOPIA4_DEP_LIBS+=zlib
++ifeq ($(BR2_PACKAGE_QT_SYSTEMZLIB),y)
++QT_CONFIGURE+= -system-zlib
++QT_DEP_LIBS+=zlib
+ endif
+ endif
+
+-ifeq ($(BR2_PACKAGE_QTOPIA4_QTJPEG),y)
+-QTOPIA4_CONFIGURE+= -qt-libjpeg
++ifeq ($(BR2_PACKAGE_QT_QTJPEG),y)
++QT_CONFIGURE+= -qt-libjpeg
+ else
+-ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMJPEG),y)
+-QTOPIA4_CONFIGURE+= -system-libjpeg
+-QTOPIA4_DEP_LIBS+=jpeg
++ifeq ($(BR2_PACKAGE_QT_SYSTEMJPEG),y)
++QT_CONFIGURE+= -system-libjpeg
++QT_DEP_LIBS+=jpeg
+ else
+-QTOPIA4_CONFIGURE+= -no-libjpeg
++QT_CONFIGURE+= -no-libjpeg
+ endif
+ endif
+
+-ifeq ($(BR2_PACKAGE_QTOPIA4_QTPNG),y)
+-QTOPIA4_CONFIGURE+= -qt-libpng
++ifeq ($(BR2_PACKAGE_QT_QTPNG),y)
++QT_CONFIGURE+= -qt-libpng
+ else
+-ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMPNG),y)
+-QTOPIA4_CONFIGURE+= -system-libpng
+-QTOPIA4_DEP_LIBS+=libpng
++ifeq ($(BR2_PACKAGE_QT_SYSTEMPNG),y)
++QT_CONFIGURE+= -system-libpng
++QT_DEP_LIBS+=libpng
+ else
+-QTOPIA4_CONFIGURE+= -no-libpng
++QT_CONFIGURE+= -no-libpng
+ endif
+ endif
+
+-ifeq ($(BR2_PACKAGE_QTOPIA4_QTTIFF),y)
+-QTOPIA4_CONFIGURE+= -qt-libtiff
++ifeq ($(BR2_PACKAGE_QT_QTTIFF),y)
++QT_CONFIGURE+= -qt-libtiff
+ else
+-ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMTIFF),y)
+-QTOPIA4_CONFIGURE+= -system-libtiff
+-QTOPIA4_DEP_LIBS+=tiff
++ifeq ($(BR2_PACKAGE_QT_SYSTEMTIFF),y)
++QT_CONFIGURE+= -system-libtiff
++QT_DEP_LIBS+=tiff
+ else
+-QTOPIA4_CONFIGURE+= -no-libtiff
++QT_CONFIGURE+= -no-libtiff
+ endif
+ endif
+
+
+-ifeq ($(BR2_PACKAGE_QTOPIA4_QTFREETYPE),y)
+-QTOPIA4_CONFIGURE+= -qt-freetype
++QT_FONTS = $(addprefix $(STAGING_DIR)/usr/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) \
++ $(if $(BR2_PACKAGE_QT_FONT_JAPANESE),japanese) \
++ $(if $(BR2_PACKAGE_QT_FONT_UNIFONT),unifont)))
++
++
++ifeq ($(BR2_PACKAGE_QT_QTFREETYPE),y)
++QT_CONFIGURE+= -qt-freetype
+ else
+-ifeq ($(BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE),y)
+-QTOPIA4_CONFIGURE+= -system-freetype
+-QTOPIA4_CONFIGURE+= -I $(FREETYPE_DIR)/include
+-QTOPIA4_DEP_LIBS+=freetype
++ifeq ($(BR2_PACKAGE_QT_SYSTEMFREETYPE),y)
++QT_CONFIGURE+= -system-freetype
++QT_CONFIGURE+= -I $(STAGING_DIR)/usr/include/freetype2/
++QT_DEP_LIBS+=freetype
+ else
+-QTOPIA4_CONFIGURE+= -no-freetype
++QT_CONFIGURE+= -no-freetype
+ endif
+ endif
+
+
+-ifeq ($(BR2_PACKAGE_QTOPIA4_OPENSSL),y)
+-QTOPIA4_CONFIGURE+= -openssl
+-QTOPIA4_DEP_LIBS+=openssl
++ifeq ($(BR2_PACKAGE_QT_OPENSSL),y)
++QT_CONFIGURE+= -openssl
++QT_DEP_LIBS+=openssl
+ else
+-QTOPIA4_CONFIGURE+= -no-openssl
++QT_CONFIGURE+= -no-openssl
+ endif
+
+ # Qt SQL Drivers
+-ifeq ($(BR2_PACKAGE_QTOPIA4_SQL_MODULE),y)
+-ifeq ($(BR2_PACKAGE_QTOPIA4_IBASE),y)
+-QTOPIA4_CONFIGURE+= -qt-sql-ibase
++ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
++ifeq ($(BR2_PACKAGE_QT_IBASE),y)
++QT_CONFIGURE+= -qt-sql-ibase
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_MYSQL),y)
+-QTOPIA4_CONFIGURE+= -qt-sql-mysql
++ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
++QT_CONFIGURE+= -qt-sql-mysql
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_ODBC),y)
+-QTOPIA4_CONFIGURE+= -qt-sql-odbc
++ifeq ($(BR2_PACKAGE_QT_ODBC),y)
++QT_CONFIGURE+= -qt-sql-odbc
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_PSQL),y)
+-QTOPIA4_CONFIGURE+= -qt-sql-psql
++ifeq ($(BR2_PACKAGE_QT_PSQL),y)
++QT_CONFIGURE+= -qt-sql-psql
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_SQLITE),y)
+-QTOPIA4_CONFIGURE+= -qt-sql-sqlite
++ifeq ($(BR2_PACKAGE_QT_SQLITE),y)
++QT_CONFIGURE+= -qt-sql-sqlite
+ else
+-QTOPIA4_CONFIGURE+= -no-sql-sqlite
++QT_CONFIGURE+= -no-sql-sqlite
+ endif
+-ifeq ($(BR2_PACKAGE_QTOPIA4_SQLITE2),y)
+-QTOPIA4_CONFIGURE+= -qt-sql-sqlite2
++ifeq ($(BR2_PACKAGE_QT_SQLITE2),y)
++QT_CONFIGURE+= -qt-sql-sqlite2
+ endif
+ else
+ # By default, no SQL driver is turned on by configure.
+ # but it seams sqlite isn't disabled despite what says
+ # configure --help
+-QTOPIA4_CONFIGURE+= -no-sql-sqlite
++QT_CONFIGURE+= -no-sql-sqlite
+ endif
+
+-ifeq ($(BR2_PACKAGE_QTOPIA4_XMLPATTERNS),y)
+-QTOPIA4_CONFIGURE+= -xmlpatterns
++ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
++QT_CONFIGURE+= -xmlpatterns -exceptions
+ else
+-QTOPIA4_CONFIGURE+= -no-xmlpatterns
++QT_CONFIGURE+= -no-xmlpatterns
+ endif
+
+-ifeq ($(BR2_PACKAGE_QTOPIA4_SVG),y)
+-QTOPIA4_CONFIGURE+= -svg
++ifeq ($(BR2_PACKAGE_QT_PHONON),y)
++QT_CONFIGURE+= -phonon
++QT_DEP_LIBS+=gstreamer gst-plugins-base
+ else
+-QTOPIA4_CONFIGURE+= -no-svg
++QT_CONFIGURE+= -no-phonon
+ endif
+
+-ifeq ($(BR2_PACKAGE_QTOPIA4_WEBKIT),y)
+-QTOPIA4_CONFIGURE+= -webkit
++ifeq ($(BR2_PACKAGE_QT_SVG),y)
++QT_CONFIGURE+= -svg
+ else
+-QTOPIA4_CONFIGURE+= -no-webkit
++QT_CONFIGURE+= -no-svg
+ endif
+
+-QTOPIA4_CONFIGURE:=$(strip $(subst ",, $(QTOPIA4_CONFIGURE)))
+-#"))
+-BR2_PACKAGE_QTOPIA4_EMB_PLATFORM:=$(strip $(subst ",, $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)))
+-#"))
++ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
++QT_CONFIGURE+= -webkit
++else
++QT_CONFIGURE+= -no-webkit
++endif
+
+-QTOPIA4_QMAKE_CONF:=$(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
++ifeq ($(BR2_PACKAGE_QT_STL),y)
++QT_CONFIGURE+= -stl
++else
++QT_CONFIGURE+= -no-stl
++endif
+
+-# Variable for other Qt applications to use
+-QTOPIA4_QMAKE:=$(STAGING_DIR)/usr/bin/qmake -spec qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++
++# ccache and precompiled headers don't play well together
++ifeq ($(BR2_CCACHE),y)
++QT_CONFIGURE += -no-pch
++endif
+
+-$(DL_DIR)/$(QTOPIA4_SOURCE):
+- $(WGET) -P $(DL_DIR) $(QTOPIA4_SITE)/$(QTOPIA4_SOURCE)
++BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
+
+-qtopia4-source: $(DL_DIR)/$(QTOPIA4_SOURCE)
++# 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++
++endif
++endif
++# End of workaround.
+
++# Figure out what libs to install in the target
++QT_LIBS=#empty
++ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
++QT_LIBS+= qt-gui
++endif
++ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
++QT_LIBS+= qt-sql
++endif
++ifeq ($(BR2_PACKAGE_QT_PHONON),y)
++QT_LIBS+= qt-phonon
++endif
++ifeq ($(BR2_PACKAGE_QT_SVG),y)
++QT_LIBS+= qt-svg
++endif
++ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
++QT_LIBS+= qt-network
++endif
++ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
++QT_LIBS+= qt-webkit
++endif
++ifeq ($(BR2_PACKAGE_QT_XML),y)
++QT_LIBS+= qt-xml
++endif
++ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
++QT_LIBS+= qt-xmlpatterns
++endif
++ifeq ($(BR2_PACKAGE_QT_SCRIPT),y)
++QT_LIBS+= qt-script
++endif
++ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
++QT_LIBS+= qt-scripttools
++endif
+
+-$(QTOPIA4_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QTOPIA4_SOURCE)
+- $(QTOPIA4_CAT) $(DL_DIR)/$(QTOPIA4_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+- toolchain/patch-kernel.sh $(QTOPIA4_TARGET_DIR) package/qtopia4/ \
+- qtopia-$(QTOPIA4_VERSION)-\*.patch \
+- qtopia-$(QTOPIA4_VERSION)-\*.patch.$(ARCH)
++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_SET -- helper macro to set QMAKE_<variable> = <value> in
++# QT_QMAKE_CONF. Will remove existing variable declaration if available.
++#
++# Argument 1 is the variable name (without QMAKE_)
++# Argument 2 is the value to set variable to
++#
++# E.G. use like this:
++# $(call QT_QMAKE_SET,variable,value)
++################################################################################
++define QT_QMAKE_SET
++ $(SED) '/QMAKE_$(1)/d' $(QT_QMAKE_CONF)
++ $(SED) '/include.*qws.conf/aQMAKE_$(1) = $(2)' $(QT_QMAKE_CONF)
++endef
++
++################################################################################
++# QT_INSTALL_PLUGINS -- helper macro to install Qt plugins to target and
++# strip them
++#
++# Argument 1 is the plugin folder
++#
++# E.G. use like this to install plugins/sqldrivers:
++# $(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)/*; \
++ fi
++endef
++
++$(DL_DIR)/$(QT_SOURCE):
++ $(call DOWNLOAD,$(QT_SITE),$(QT_SOURCE))
++
++qt-source: $(DL_DIR)/$(QT_SOURCE)
++
++
++$(QT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QT_SOURCE)
++ $(QT_CAT) $(DL_DIR)/$(QT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
++ toolchain/patch-kernel.sh $(QT_TARGET_DIR) package/qtopia4/ \
++ qt-$(QT_VERSION)-\*.patch \
++ qt-$(QT_VERSION)-\*.patch.$(ARCH)
+ touch $@
+
+-$(QTOPIA4_TARGET_DIR)/.configured: $(QTOPIA4_TARGET_DIR)/.unpacked
++$(QT_TARGET_DIR)/.configured: $(QT_TARGET_DIR)/.unpacked
++ -[ -f $(QT_TARGET_DIR)/Makefile ] && $(MAKE) -C $(QT_TARGET_DIR) confclean
+ ifneq ($(BR2_INET_IPV6),y)
+- $(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QTOPIA4_TARGET_DIR)/configure
+- $(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure
++ $(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QT_TARGET_DIR)/configure
++ $(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QT_TARGET_DIR)/configure
+ endif
+- $(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure
+- #$(SED) 's,-O2,$(TARGET_CFLAGS),' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf
+- # Fix compiler path
+- $(SED) '\,QMAKE_CC[ ]*=, c\QMAKE_CC = $(TARGET_CC)' $(QTOPIA4_QMAKE_CONF)
+- $(SED) '\,QMAKE_CXX[ ]*=, c\QMAKE_CXX = $(TARGET_CXX)' $(QTOPIA4_QMAKE_CONF)
+- $(SED) '\,QMAKE_LINK[ ]*=, c\QMAKE_LINK = $(TARGET_CXX)' $(QTOPIA4_QMAKE_CONF)
+- $(SED) '\,QMAKE_LINK_SHLIB[ ]*=, c\QMAKE_LINK_SHLIB = $(TARGET_CXX)' $(QTOPIA4_QMAKE_CONF)
+- $(SED) '\,QMAKE_AR[ ]*=, c\QMAKE_AR = $(TARGET_AR) cqs' $(QTOPIA4_QMAKE_CONF)
+- $(SED) '\,QMAKE_RANLIB[ ]*=, c\QMAKE_RANLIB = $(TARGET_RANLIB)' $(QTOPIA4_QMAKE_CONF)
+- $(SED) '\,QMAKE_STRIP[ ]*=, c\QMAKE_STRIP = $(TARGET_STRIP)' $(QTOPIA4_QMAKE_CONF)
+-
+- -[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
+- $(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION)
+-# Qt doesn't use PKG_CONFIG, it searches for pkg-config with 'which'.
+-# PKG_CONFIG_SYSROOT is only used to avoid a warning from Qt's configure system
+-# when cross compiling, Qt 4.4.3 is wrong here.
++ # Fix compiler path
++ $(call QT_QMAKE_SET,CC,$(TARGET_CC))
++ $(call QT_QMAKE_SET,CXX,$(TARGET_CXX))
++ $(call QT_QMAKE_SET,LINK,$(TARGET_CXX))
++ $(call QT_QMAKE_SET,LINK_SHLIB,$(TARGET_CXX))
++ $(call QT_QMAKE_SET,AR,$(TARGET_AR) cqs)
++ $(call QT_QMAKE_SET,OBJCOPY,$(TARGET_OBJCOPY))
++ $(call QT_QMAKE_SET,RANLIB,$(TARGET_RANLIB))
++ $(call QT_QMAKE_SET,STRIP,$(TARGET_STRIP))
++ $(call QT_QMAKE_SET,CFLAGS,$(TARGET_CFLAGS))
++ $(call QT_QMAKE_SET,CXXFLAGS,$(TARGET_CXXFLAGS))
++ $(call QT_QMAKE_SET,LFLAGS,$(TARGET_LDFLAGS))
++ -[ -f $(QT_QCONFIG_FILE) ] && cp $(QT_QCONFIG_FILE) \
++ $(QT_TARGET_DIR)/$(QT_QCONFIG_FILE_LOCATION)
+ # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
+-# instead of the host then.
+- (cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \
+- PATH=$(TARGET_PATH) \
++# instead of the host then. So set PKG_CONFIG* manually.
++ (cd $(QT_TARGET_DIR); \
+ PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
++ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
+- PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
+ ./configure \
+- -verbose \
++ $(if $(VERBOSE),-verbose,-silent) \
+ -force-pkg-config \
+- -embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \
+- $(QTOPIA4_QCONFIG_COMMAND) \
+- $(QTOPIA4_CONFIGURE) \
+- -no-stl \
++ -embedded $(BR2_PACKAGE_QT_EMB_PLATFORM) \
++ $(QT_QCONFIG_COMMAND) \
++ $(QT_CONFIGURE) \
++ -no-xinerama \
+ -no-cups \
+ -no-nis \
+ -no-accessibility \
+@@ -345,56 +491,101 @@
+ )
+ touch $@
+
+-$(QTOPIA4_TARGET_DIR)/.compiled: $(QTOPIA4_TARGET_DIR)/.configured
+- $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QTOPIA4_TARGET_DIR)
++$(QT_TARGET_DIR)/.compiled: $(QT_TARGET_DIR)/.configured
++ $(MAKE) -C $(QT_TARGET_DIR)
+ touch $@
+
+-$(STAGING_DIR)/usr/lib/libQtCore.la: $(QTOPIA4_TARGET_DIR)/.compiled
+- $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(QTOPIA4_TARGET_DIR) install
++$(STAGING_DIR)/usr/lib/libQtCore.la: $(QT_TARGET_DIR)/.compiled
++ $(MAKE) -C $(QT_TARGET_DIR) install
+
+-$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la
++qt-gui: $(STAGING_DIR)/usr/lib/libQtCore.la
+ mkdir -p $(TARGET_DIR)/usr/lib/fonts
+- touch $(TARGET_DIR)/usr/lib/fonts/fontdir
+- cp -dpf $(STAGING_DIR)/usr/lib/fonts/helvetica*.qpf $(TARGET_DIR)/usr/lib/fonts
+- cp -dpf $(STAGING_DIR)/usr/lib/fonts/fixed*.qpf $(TARGET_DIR)/usr/lib/fonts
+- cp -dpf $(STAGING_DIR)/usr/lib/fonts/micro*.qpf $(TARGET_DIR)/usr/lib/fonts
+-ifeq ($(BR2_PACKAGE_QTOPIA4_SHARED),y)
+- cp -dpf $(STAGING_DIR)/usr/lib/libQt*.so.* $(TARGET_DIR)/usr/lib/
+- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libQt*.so.*
++ifneq ($(QT_FONTS),)
++ cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts
++endif
++ifneq ($(BR2_PACKAGE_QT_NOFREETYPE),y)
++ cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
+ endif
+ # Install image plugins if they are built
+- if [ -d $(STAGING_DIR)/usr/plugins/imageformats ]; then \
+- mkdir -p $(TARGET_DIR)/usr/plugins; \
+- cp -dpfr $(STAGING_DIR)/usr/plugins/imageformats $(TARGET_DIR)/usr/plugins/; \
+- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/plugins/imageformats/*; \
+- fi
+-ifneq ($(BR2_PACKAGE_QTOPIA4_SQL_MODULE),y)
+- # Remove Sql libraries, not needed
+- -rm $(TARGET_DIR)/usr/lib/libQtSql*
+-endif
+-ifneq ($(BR2_PACKAGE_QTOPIA4_SVG),y)
+- # Remove Svg libraries, not needed
+- -rm $(TARGET_DIR)/usr/lib/libQtSvg*
+-endif
+-
+-qtopia4: uclibc zlib $(QTOPIA4_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4
+-
+-qtopia4-clean:
+- -$(MAKE) -C $(QTOPIA4_TARGET_DIR) clean
+-
+-qtopia4-dirclean:
+- rm -rf $(QTOPIA4_TARGET_DIR)
+-
+-qtopia4-status:
+- @echo "QTOPIA4_QMAKE: " $(QTOPIA4_QMAKE)
+- @echo "QTOPIA4_DEP_LIBS: " $(QTOPIA4_DEP_LIBS)
+- @echo "FREETYPE_DIR: " $(FREETYPE_DIR)
++ $(call QT_INSTALL_PLUGINS,imageformats)
++ifeq ($(BR2_PACKAGE_QT_SHARED),y)
++ cp -dpf $(STAGING_DIR)/usr/lib/libQtGui.so.* $(TARGET_DIR)/usr/lib/
++endif
++
++qt-sql: $(STAGING_DIR)/usr/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/
++endif
++
++qt-phonon: $(STAGING_DIR)/usr/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/
++endif
++
++qt-svg: $(STAGING_DIR)/usr/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/
++endif
++
++qt-network: $(STAGING_DIR)/usr/lib/libQtCore.la
++ifeq ($(BR2_PACKAGE_QT_SHARED),y)
++ cp -dpf $(STAGING_DIR)/usr/lib/libQtNetwork.so.* $(TARGET_DIR)/usr/lib/
++endif
++
++qt-webkit: $(STAGING_DIR)/usr/lib/libQtCore.la
++ifeq ($(BR2_PACKAGE_QT_SHARED),y)
++ cp -dpf $(STAGING_DIR)/usr/lib/libQtWebKit.so.* $(TARGET_DIR)/usr/lib/
++endif
++
++qt-xml: $(STAGING_DIR)/usr/lib/libQtCore.la
++ifeq ($(BR2_PACKAGE_QT_SHARED),y)
++ cp -dpf $(STAGING_DIR)/usr/lib/libQtXml.so.* $(TARGET_DIR)/usr/lib/
++endif
++
++qt-xmlpatterns: $(STAGING_DIR)/usr/lib/libQtCore.la
++ifeq ($(BR2_PACKAGE_QT_SHARED),y)
++ cp -dpf $(STAGING_DIR)/usr/lib/libQtXmlPatterns.so.* $(TARGET_DIR)/usr/lib/
++endif
++
++qt-script: $(STAGING_DIR)/usr/lib/libQtCore.la
++ifeq ($(BR2_PACKAGE_QT_SHARED),y)
++ cp -dpf $(STAGING_DIR)/usr/lib/libQtScript.so.* $(TARGET_DIR)/usr/lib/
++endif
++
++qt-scripttools: $(STAGING_DIR)/usr/lib/libQtCore.la
++ifeq ($(BR2_PACKAGE_QT_SHARED),y)
++ cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
++endif
++
++
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/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.*
++endif
++
++qt: $(QT_DEP_LIBS) $(TARGET_DIR)/usr/lib/libQtCore.so.4
++
++qt-clean:
++ -$(MAKE) -C $(QT_TARGET_DIR) clean
++ -rm -rf $(TARGET_DIR)/usr/lib/fonts
++ifeq ($(BR2_PACKAGE_QT_SHARED),y)
++ -rm $(TARGET_DIR)/usr/lib/libQt*.so.*
++ -rm $(TARGET_DIR)/usr/lib/libphonon.so.*
++endif
++
++qt-dirclean:
++ rm -rf $(QT_TARGET_DIR)
+
+ #############################################################
+ #
+ # Toplevel Makefile options
+ #
+ #############################################################
+-ifeq ($(strip $(BR2_PACKAGE_QTOPIA4)),y)
+-TARGETS+=qtopia4
++ifeq ($(BR2_PACKAGE_QT),y)
++TARGETS+=qt
+ endif
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 9d02929..f15711e 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -23,3 +23,4 @@ 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/
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-15 12:55:23
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 730d043a78c26d65770df895026f3696038ca5b1 (commit)
from 18af8b3b2294445303e8be26eab2ed8f86268c37 (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 730d043a78c26d65770df895026f3696038ca5b1
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jun 15 14:54:54 2010 +0200
[as_devices] {} replaced by () in Makefiles
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/as_devices/as_devices.mk | 2 +-
target/packages/as_devices/Makefile | 30 ++++++++++----------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index 10d7db1..1476a98 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -23,7 +23,7 @@ AS_DEVICES_CPP_TARGET_BINARY:=$(AS_DEVICES_CPP_TARGET_DIR)/$(AS_DEVICES_CPP_BINA
# Python wrapper variables
AS_DEVICES_PYTHON_BINARY:=AsGpio_wrap.so
AS_DEVICES_PYTHON_MODULE:=AsDevices
-AS_DEVICES_PYTHON_TARGET_DIR:=usr/lib/${PYTHON}/
+AS_DEVICES_PYTHON_TARGET_DIR:=usr/lib/$(PYTHON)/
AS_DEVICES_PYTHON_TARGET_BINARY:=$(AS_DEVICES_PYTHON_TARGET_DIR)/$(AS_DEVICES_PYTHON_MODULE)
AS_DEVICES_BINARIES=$(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY)
diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index 5a8cd78..3020fce 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -17,38 +17,38 @@ STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
C_BINARY=test_cdevices
C_LIBNAME=as_devices
-C_LIB=c/lib${C_LIBNAME}.so
+C_LIB=c/lib$(C_LIBNAME).so
C_INCLUDE=c/
P_WRAPPER=.python_wrappers
CPP_BINARY=test_cppdevices
CPP_LIBNAME=as_devices_cpp
-CPP_LIB=cpp/lib${CPP_LIBNAME}.so
+CPP_LIB=cpp/lib$(CPP_LIBNAME).so
CPP_INCLUDE=cpp/
INSTALL_DIR=
.PHONY: all
-all: ${C_BINARY} ${P_WRAPPER}
- #${CPP_BINARY}
+all: $(C_BINARY) $(P_WRAPPER)
+ #$(CPP_BINARY)
-${C_BINARY}: main.c test_c.h ${C_LIB}
- ${CC} ${CFLAGS} main.c ${C_LIB} -o ${C_BINARY} -I${C_INCLUDE} -lm
+$(C_BINARY): main.c test_c.h $(C_LIB)
+ $(CC) $(CFLAGS) main.c $(C_LIB) -o $(C_BINARY) -I$(C_INCLUDE) -lm
-#${CPP_BINARY}: main.c test_cpp.h ${CPP_LIB} ${C_LIB}
-# ${CXX} ${CFLAGS} main.c ${C_LIB} ${CPP_LIB} -I${C_INCLUDE} -I${CPP_INCLUDE} -o ${CPP_BINARY}
+#$(CPP_BINARY): main.c test_cpp.h $(CPP_LIB) $(C_LIB)
+# $(CXX) $(CFLAGS) main.c $(C_LIB) $(CPP_LIB) -I$(C_INCLUDE) -I$(CPP_INCLUDE) -o $(CPP_BINARY)
#
-#${CPP_LIB}: ${C_LIB}
-# cd cpp; make CXX=${CXX}
+#$(CPP_LIB): $(C_LIB)
+# cd cpp; make CXX=$(CXX)
-${C_LIB}:
+$(C_LIB):
make -C c/
-${P_WRAPPER}:
+$(P_WRAPPER):
make -C python/
- touch ${P_WRAPPER}
+ touch $(P_WRAPPER)
install:
install -D $(C_LIB) $(INSTALL_DIR)/usr/lib/
@@ -61,7 +61,7 @@ install-exe:
clean:
cd c; make clean ;
- -rm ${P_WRAPPER}
+ -rm $(P_WRAPPER)
cd python; make clean
- -rm ${C_BINARY} # ${CPP_BINARY}
+ -rm $(C_BINARY) # $(CPP_BINARY)
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-15 12:52: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 18af8b3b2294445303e8be26eab2ed8f86268c37 (commit)
from e7ece475f346e212439d12fe591bf3af25f531ce (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 18af8b3b2294445303e8be26eab2ed8f86268c37
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jun 15 14:51:12 2010 +0200
[as_devices] Makefile cleaning
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/as_devices/as_devices.mk | 9 ++++++---
target/packages/as_devices/Makefile | 19 +++++++++++++++----
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index 968b952..10d7db1 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -45,10 +45,13 @@ $(AS_DEVICES_DIR)/c/$(AS_DEVICES_BINARY): $(AS_DEVICES_DIR)/Makefile
#XXX: BR2_TARGET_UBOOT_BOARDNAME is wrong, to be fixed
$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(AS_DEVICES_DIR)/c ARMADEUS_BOARD_NAME=$(BR2_TARGET_UBOOT_BOARDNAME)
+# Install library on staging dir
+$(STAGING_DIR)/$(AS_DEVICES_TARGET_BINARY): $(AS_DEVICES_DIR)/c/$(AS_DEVICES_BINARY)
+ $(MAKE) INSTALL_DIR=$(STAGING_DIR) -C $(AS_DEVICES_DIR) install
+
# install library on target
-$(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY): $(AS_DEVICES_DIR)/c/$(AS_DEVICES_BINARY)
- install -D $< $@
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY)
+$(TARGET_DIR)/$(AS_DEVICES_TARGET_BINARY): $(STAGING_DIR)/$(AS_DEVICES_TARGET_BINARY)
+ $(MAKE) INSTALL_DIR=$(TARGET_DIR) STRIP="$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)" -C $(AS_DEVICES_DIR) install-exe
ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_CPP)),y)
$(TARGET_DIR)/$(AS_DEVICES_CPP_TARGET_BINARY): $(AS_DEVICES_DIR)/cpp/$(AS_DEVICES_CPP_BINARY)
diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index 2169913..5a8cd78 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -17,16 +17,18 @@ STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
C_BINARY=test_cdevices
C_LIBNAME=as_devices
-C_LIB=c/lib${C_LIBNAME}.so.1
+C_LIB=c/lib${C_LIBNAME}.so
C_INCLUDE=c/
P_WRAPPER=.python_wrappers
CPP_BINARY=test_cppdevices
CPP_LIBNAME=as_devices_cpp
-CPP_LIB=cpp/lib${CPP_LIBNAME}.so.1
+CPP_LIB=cpp/lib${CPP_LIBNAME}.so
CPP_INCLUDE=cpp/
+INSTALL_DIR=
+
.PHONY: all
all: ${C_BINARY} ${P_WRAPPER}
@@ -42,12 +44,21 @@ ${C_BINARY}: main.c test_c.h ${C_LIB}
# cd cpp; make CXX=${CXX}
${C_LIB}:
- cd c; make
+ make -C c/
${P_WRAPPER}:
- cd python; make
+ make -C python/
touch ${P_WRAPPER}
+install:
+ install -D $(C_LIB) $(INSTALL_DIR)/usr/lib/
+ install -D $(C_INCLUDE)/*.h $(INSTALL_DIR)/usr/include/as_devices/
+
+install-exe:
+ mkdir -p $(INSTALL_DIR)/usr/lib
+ cp $(C_LIB) $(INSTALL_DIR)/usr/lib/
+ $(STRIP) $(INSTALL_DIR)/usr/lib/lib$(C_LIBNAME).so
+
clean:
cd c; make clean ;
-rm ${P_WRAPPER}
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-14 17:06:44
|
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 e7ece475f346e212439d12fe591bf3af25f531ce (commit)
from 22516371a42b1d4458ab1b8b841ef36d7521c4fe (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 e7ece475f346e212439d12fe591bf3af25f531ce
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jun 14 19:05:35 2010 +0200
[linux] Fix bug in irq mode gpio configuration
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/gpio/core.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/linux/modules/gpio/core.c b/target/linux/modules/gpio/core.c
index 89b6b73..8e3faf8 100755
--- a/target/linux/modules/gpio/core.c
+++ b/target/linux/modules/gpio/core.c
@@ -388,9 +388,9 @@ static void set_gpio_irq(unsigned int gpio, int value)
((value & 0x03) << (pin_num * 2));
} else {
return_value = shadows_irq_h[port_num] &
- (~(0x03 << (2 * (pin_num - MAX_NUMBER_OF_PINS))));
+ (~(0x03 << (2 * (pin_num - (port_size/2)))));
shadows_irq_h[port_num] = return_value |
- ((value & 0x03) << (2 * (pin_num - MAX_NUMBER_OF_PINS)));
+ ((value & 0x03) << (2 * (pin_num - (port_size/2))));
}
}
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-14 14:23:27
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 22516371a42b1d4458ab1b8b841ef36d7521c4fe (commit)
from 7b2ee7e1d7d82fbf499b91227540fea4fbe06f7d (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 22516371a42b1d4458ab1b8b841ef36d7521c4fe
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jun 14 16:22:54 2010 +0200
[as_devices] ioctl changed
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/c/as_gpio.c | 30 ++++++++++++++----------------
target/packages/as_devices/c/as_gpio.h | 2 --
2 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index 261a9a7..b614b09 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -30,27 +30,25 @@
#include <sys/ioctl.h>
#include <linux/ppdev.h>
+/* IOCTL */
+/* direction: 1 output, 0 input */
+#define GPIORDDIRECTION _IOR(PP_IOCTL, 0xF0, int)
+#define GPIOWRDIRECTION _IOW(PP_IOCTL, 0xF1, int)
-#define GPIORDDIRECTION _IOR(PP_IOCTL, 0xF0, int)
-#define GPIOWRDIRECTION _IOW(PP_IOCTL, 0xF1, int)
-#define GPIORDDATA _IOR(PP_IOCTL, 0xF2, int)
-#define GPIOWRDATA _IOW(PP_IOCTL, 0xF3, int)
-#define GPIORDMODE _IOR(PP_IOCTL, 0xF4, int)
-#define GPIOWRMODE _IOW(PP_IOCTL, 0xF5, int)
+#define GPIORDDATA _IOR(PP_IOCTL, 0xF2, int)
+#define GPIOWRDATA _IOW(PP_IOCTL, 0xF3, int)
-#define GPIORDPULLUP _IOR(PP_IOCTL, 0xF6, int)
-#define GPIOWRPULLUP _IOW(PP_IOCTL, 0xF7, int)
+/* mode: 1 GPIO, 0 device function */
+#define GPIORDMODE _IOR(PP_IOCTL, 0xF4, int)
+#define GPIOWRMODE _IOW(PP_IOCTL, 0xF5, int)
-#define GPIORDIRQMODE_H _IOR(PP_IOCTL, 0xF8, int)
-#define GPIORDIRQMODE_L _IOR(PP_IOCTL, 0xF9, int)
-#define GPIOWRIRQMODE_H _IOW(PP_IOCTL, 0xFA, int)
-#define GPIOWRIRQMODE_L _IOW(PP_IOCTL, 0xFB, int)
+#define GPIORDPULLUP _IOR(PP_IOCTL, 0xF6, int)
+#define GPIOWRPULLUP _IOW(PP_IOCTL, 0xF7, int)
-#define GPIORDISR _IOR(PP_IOCTL, 0xFC, int)
-#define GPIOWRISR _IOW(PP_IOCTL, 0xFD, int)
+/* IRQ type: 0 none, 1 rising, 2 falling, 3 both */
+#define GPIORDIRQMODE _IOR(PP_IOCTL, 0xF8, int)
+#define GPIOWRIRQMODE _IOW(PP_IOCTL, 0xF9, int)
-#define GPIORDIRQMODE _IOR(PP_IOCTL, 0xFE, int)
-#define GPIOWRIRQMODE _IOW(PP_IOCTL, 0xFF, int)
#define GPIO_BASE_PIN ("/dev/gpio/P")
diff --git a/target/packages/as_devices/c/as_gpio.h b/target/packages/as_devices/c/as_gpio.h
index a6ce554..dd2d504 100644
--- a/target/packages/as_devices/c/as_gpio.h
+++ b/target/packages/as_devices/c/as_gpio.h
@@ -35,8 +35,6 @@ extern "C" {
#define PORT_SIZE (32)
-//TODO: Change structure to use pin instead of port.
-
/**
* Store gpio parameters
*/
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-14 11:51:14
|
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 7b2ee7e1d7d82fbf499b91227540fea4fbe06f7d (commit)
via 8c23bc8cf34e56e52dd80e4ee6a153cc86c07b63 (commit)
via 27975fb8b139d45e95e0c6c1360e21d96c5a337f (commit)
via bd64b8d11007c361cb1ec43644545e003e3b6bb0 (commit)
via a0b0bcc060244f61969efed4db05c3e991ac1f83 (commit)
from 96265c90b9ca61b59ed608a0c0868d54bcf616d8 (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 7b2ee7e1d7d82fbf499b91227540fea4fbe06f7d
Merge: 8c23bc8cf34e56e52dd80e4ee6a153cc86c07b63 96265c90b9ca61b59ed608a0c0868d54bcf616d8
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 14 13:49:22 2010 +0200
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 8c23bc8cf34e56e52dd80e4ee6a153cc86c07b63
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 14 13:48:30 2010 +0200
[LINUX] gpio: rename core.h in gpio-dev.h
commit 27975fb8b139d45e95e0c6c1360e21d96c5a337f
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 14 13:46:10 2010 +0200
[TESTS] gpio test doesn't need test_env.sh
commit bd64b8d11007c361cb1ec43644545e003e3b6bb0
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 14 13:43:55 2010 +0200
[LINUX] Simplify gpio driver by removing all unneeded features (mostly on full port access)
commit a0b0bcc060244f61969efed4db05c3e991ac1f83
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 14 10:46:08 2010 +0200
[BUILDROOT] Put correct as_devices version in package
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/as_devices/as_devices.mk | 2 +-
target/linux/modules/gpio/core.c | 353 ++++++++------------
target/linux/modules/gpio/{core.h => gpio-dev.h} | 15 +-
target/test/test_gpio.sh | 1 -
4 files changed, 149 insertions(+), 222 deletions(-)
rename target/linux/modules/gpio/{core.h => gpio-dev.h} (75%)
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index dee6775..968b952 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -6,7 +6,7 @@
PYTHON:=python2.4
-AS_DEVICES_VER:=1.0
+AS_DEVICES_VER:=0.14
AS_DEVICES_SOURCE:=$(TOPDIR)/../target/packages/as_devices
AS_DEVICES_DIR:=$(BUILD_DIR)/as_devices-$(AS_DEVICES_VER)
AS_DEVICES_CAT:=zcat
diff --git a/target/linux/modules/gpio/core.c b/target/linux/modules/gpio/core.c
index 46cadd0..89b6b73 100755
--- a/target/linux/modules/gpio/core.c
+++ b/target/linux/modules/gpio/core.c
@@ -44,10 +44,12 @@
#include "iomux-mx1.h"
#endif
-#include "core.h" /* for ioctl defs */
+#include "gpio-dev.h" /* for ioctl defs */
+
#define DRIVER_NAME "Armadeus GPIOs driver"
-#define DRIVER_VERSION "2.5"
+#define DRIVER_VERSION "2.6"
+
/* By default, we use dynamic allocation of major numbers -> MAJOR = 0 */
#define GPIO_MAJOR 0
#define GPIO_PROC_DIRNAME "driver/gpio"
@@ -237,39 +239,6 @@ static unsigned long fromString(char *buffer, int number_of_bits, int base)
return ret_val;
}
-/* Return the interrupt config for a pin */
-static unsigned char get_irq_from_pin(int num_pin, int num_port)
-{
- unsigned long shad;
- int portSize = number_of_pins[num_port];
-
- if (num_pin < (portSize / 2)) {
- shad = shadows_irq_l[num_port];
- } else {
- shad = shadows_irq_h[num_port];
- num_pin -= (portSize / 2);
- }
- return (shad >> (2 * num_pin)) & 0x03;
-}
-
-static void set_irq_for_pin(int pin_num, int port_num, int value)
-{
- int portSize = number_of_pins[port_num];
- int return_value;
-
- if (pin_num < (portSize / 2)) {
- return_value =
- shadows_irq_l[port_num] & (~(0x03 << (pin_num * 2)));
- shadows_irq_l[port_num] = return_value | ((value & 0x03) << (pin_num * 2));
- } else {
- return_value =
- shadows_irq_h[port_num] &
- (~(0x03 << (2 * (pin_num - MAX_NUMBER_OF_PINS))));
- shadows_irq_h[port_num] = return_value |
- ((value & 0x03) << (2 * (pin_num - MAX_NUMBER_OF_PINS)));
- }
-}
-
/*
* Low level functions
*/
@@ -384,6 +353,47 @@ static unsigned int read_from_port(unsigned int aPort)
return port_value;
}
+#define GPIO_TO_PORT(gpio) (gpio / MAX_NUMBER_OF_PINS)
+#define GPIO_TO_PIN(gpio) (gpio % MAX_NUMBER_OF_PINS)
+
+/* Return the interrupt config for a pin */
+static unsigned char get_gpio_irq(unsigned int gpio)
+{
+ unsigned int pin_num = GPIO_TO_PIN(gpio);
+ unsigned int port_num = GPIO_TO_PORT(gpio);
+ unsigned long shad;
+ int port_size = number_of_pins[port_num];
+
+ if (pin_num < (port_size / 2)) {
+ shad = shadows_irq_l[port_num];
+ } else {
+ shad = shadows_irq_h[port_num];
+ pin_num -= (port_size / 2);
+ }
+
+ return (shad >> (2 * pin_num)) & 0x03;
+}
+
+static void set_gpio_irq(unsigned int gpio, int value)
+{
+ unsigned int pin_num = GPIO_TO_PIN(gpio);
+ unsigned int port_num = GPIO_TO_PORT(gpio);
+ int port_size = number_of_pins[port_num];
+ int return_value;
+
+ if (pin_num < (port_size / 2)) {
+ return_value = shadows_irq_l[port_num] &
+ (~(0x03 << (pin_num * 2)));
+ shadows_irq_l[port_num] = return_value |
+ ((value & 0x03) << (pin_num * 2));
+ } else {
+ return_value = shadows_irq_h[port_num] &
+ (~(0x03 << (2 * (pin_num - MAX_NUMBER_OF_PINS))));
+ shadows_irq_h[port_num] = return_value |
+ ((value & 0x03) << (2 * (pin_num - MAX_NUMBER_OF_PINS)));
+ }
+}
+
static void set_port_mode(unsigned int aPort, unsigned int aModeMask)
{
int i;
@@ -408,16 +418,16 @@ static void set_port_mode(unsigned int aPort, unsigned int aModeMask)
__raw_writel(gius, VA_GPIO_BASE + MXC_GIUS(aPort));
}
-static unsigned int get_port_mode(unsigned int aPort)
+static unsigned int get_port_mode(unsigned int port)
{
int i;
int ocr1, ocr2, gius, value = 0;
- ocr1 = __raw_readl(VA_GPIO_BASE + MXC_OCR1(aPort));
- ocr2 = __raw_readl(VA_GPIO_BASE + MXC_OCR2(aPort));
- gius = __raw_readl(VA_GPIO_BASE + MXC_GIUS(aPort));
+ ocr1 = __raw_readl(VA_GPIO_BASE + MXC_OCR1(port));
+ ocr2 = __raw_readl(VA_GPIO_BASE + MXC_OCR2(port));
+ gius = __raw_readl(VA_GPIO_BASE + MXC_GIUS(port));
/* pin is a GPIO if OCR == 3 AND GIUS == 1 */
- for (i = 0; i < number_of_pins[aPort]; i++) {
+ for (i = 0; i < number_of_pins[port]; i++) {
if (i < 16) {
if (((ocr1 >> (i * 2)) & 3) == 3)
value = value | (1 << i);
@@ -431,29 +441,60 @@ static unsigned int get_port_mode(unsigned int aPort)
return value;
}
-static unsigned int get_port_isr(unsigned int aPort)
+static void set_gpio_mode(unsigned int gpio, unsigned int mode)
+{
+ unsigned int port_mode, port_num = GPIO_TO_PORT(gpio),
+ pin_num = GPIO_TO_PIN(gpio);
+
+ port_mode = get_port_mode(port_num);
+
+ if (mode)
+ set_port_mode(port_num, port_mode | (1 << pin_num));
+ else
+ set_port_mode(port_num, port_mode & (~(1 << pin_num)));
+}
+
+static unsigned int get_gpio_mode(unsigned int gpio)
{
- return __raw_readl(VA_GPIO_BASE + MXC_ISR(aPort));
+ unsigned int port_mode = get_port_mode(GPIO_TO_PORT(gpio));
+
+ return (((port_mode & (1 << GPIO_TO_PIN(gpio))) != 0) ? 1 : 0);
}
-static void set_port_isr(unsigned int aPort, unsigned int aIsr)
+static unsigned int get_port_pullup(unsigned int port)
{
- __raw_writel(aIsr & 0xffffffff, VA_GPIO_BASE + MXC_ISR(aPort));
+ return __raw_readl(VA_GPIO_BASE + MXC_PUEN(port));
}
-static unsigned int get_port_pull_up(unsigned int aPort)
+static void set_port_pullup(unsigned int port, unsigned int pullup_mask)
{
- return __raw_readl(VA_GPIO_BASE + MXC_PUEN(aPort));
+ __raw_writel(pullup_mask & 0xffffffff, VA_GPIO_BASE + MXC_PUEN(port));
}
-static void set_port_pullup(unsigned int aPort, unsigned int aPullMask)
+static unsigned int get_gpio_pullup(unsigned int gpio)
{
- __raw_writel(aPullMask & 0xffffffff, VA_GPIO_BASE + MXC_PUEN(aPort));
+ unsigned int port_num = GPIO_TO_PORT(gpio);
+ unsigned int pin_num = GPIO_TO_PIN(gpio);
+ unsigned int port_pullup = get_port_pullup(port_num);
+
+ return (((port_pullup & (1 << pin_num)) != 0) ? 1 : 0);
}
-static void set_port_dir(unsigned int aPort, unsigned int aDirMask)
+static void set_gpio_pullup(unsigned int gpio, unsigned int value)
{
- __raw_writel(aDirMask & 0xffffffff, VA_GPIO_BASE + MXC_DDIR(aPort));
+ unsigned int port_num = GPIO_TO_PORT(gpio);
+ unsigned int pin_num = GPIO_TO_PIN(gpio);
+ unsigned int port_pullup = get_port_pullup(port_num);
+
+ if (value != 0)
+ set_port_pullup(port_num, port_pullup | (1 << pin_num));
+ else
+ set_port_pullup(port_num, port_pullup & (~(1 << pin_num)));
+}
+
+static void set_port_dir(unsigned int port, unsigned int dir_mask)
+{
+ __raw_writel(dir_mask & 0xffffffff, VA_GPIO_BASE + MXC_DDIR(port));
}
static unsigned int get_port_dir(unsigned int aPort)
@@ -466,6 +507,28 @@ static unsigned int get_port_dir(unsigned int aPort)
return port_value;
}
+static void set_gpio_dir(unsigned int gpio, unsigned int dir)
+{
+ unsigned int port_dir, port_num = GPIO_TO_PORT(gpio),
+ pin_num = GPIO_TO_PIN(gpio);
+
+ port_dir = get_port_dir(port_num);
+ if (dir != 0)
+ set_port_dir(port_num, port_dir | (1 << pin_num));
+ else
+ set_port_dir(port_num, port_dir & (~(1 << pin_num)));
+}
+
+static unsigned int get_gpio_dir(unsigned int gpio)
+{
+ unsigned int port_dir;
+
+ port_dir = get_port_dir(GPIO_TO_PORT(gpio));
+
+ return (((port_dir & (1 << GPIO_TO_PIN(gpio))) != 0) ? 1 : 0);
+}
+
+
char *port_name[NB_PORTS] = { "portA", "portB", "portC", "portD",
#ifdef CONFIG_ARCH_MX2
"portE", "portF",
@@ -593,15 +656,17 @@ static int armadeus_gpio_dev_open(struct inode *inode, struct file *file)
char_dev); */
gpio = kzalloc(sizeof(struct gpio_item), GFP_KERNEL);
- if (!gpio)
+ if (!gpio) {
+ ret = -ENOMEM;
goto err_kzalloc;
+ }
file->private_data = gpio;
spin_lock_init(&gpio->lock);
init_waitqueue_head(&gpio->change_wq);
+ /* Access all port pins in one time */
switch (minor) {
- /* Write all port pins in one time */
case FULL_PORTA_MINOR:
case FULL_PORTB_MINOR:
case FULL_PORTC_MINOR:
@@ -623,7 +688,7 @@ static int armadeus_gpio_dev_open(struct inode *inode, struct file *file)
gpio->changed = 0;
if ((ret = gpio_request(minor, "gpio-dev"))) {
- printk("GPIO %i is already in use\n", minor);
+ printk(KERN_ERR "gpio: pin %i is already in use\n", minor);
goto err_gpio_request;
}
@@ -631,22 +696,23 @@ static int armadeus_gpio_dev_open(struct inode *inode, struct file *file)
gpio->number = minor & GPIO_PIN_MASK;
gpio->pin_state = 0;
- if (get_port_dir(gpio->port) & (1 << gpio->number)) {
- gpio_direction_output(minor, 0);
+ if (get_gpio_dir(minor)) {
+ gpio_direction_output(minor, gpio_get_value(minor));
} else {
gpio_direction_input(minor);
gpio->pin_state = gpio_get_value(minor);
}
- /* Request interrupt if pin was configured for */
- gpio->irq_value = get_irq_from_pin(gpio->number, gpio->port);
-
+ gpio->irq_value = get_gpio_irq(minor);
+ /* Request interrupt if pin was configured for: */
if (gpio->irq_value) {
irq = IRQ_GPIOA(minor); /* irq number are continuous */
- ret =
- request_irq(irq, armadeus_gpio_interrupt, 0, "gpio", gpio);
- if (ret)
+ ret = request_irq(irq, armadeus_gpio_interrupt, 0, "gpio",
+ gpio);
+ if (ret) {
+ printk(KERN_ERR "gpio: irq %d already reserved\n", irq);
goto err_irq;
+ }
switch (gpio->irq_value) {
case (IRQ_TYPE_EDGE_BOTH):
set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
@@ -670,7 +736,6 @@ success:
free_irq(irq, gpio);
err_irq:
- printk("%s error while requesting irq %d\n", __FUNCTION__, irq);
gpio_free(minor);
err_gpio_request:
kfree(gpio);
@@ -704,8 +769,6 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
unsigned int cmd, unsigned long arg)
{
int err = 0, ret = 0, value = 0;
- unsigned int return_value;
- unsigned int port_num, pin_num;
unsigned int minor;
unsigned int irq;
struct gpio_item *gpio = filp->private_data;
@@ -739,76 +802,49 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
#else
if (minor < FULL_PORTD_MINOR) {
#endif
- port_num = (unsigned int)(minor / MAX_NUMBER_OF_PINS);
- pin_num = (unsigned int)(minor % MAX_NUMBER_OF_PINS);
-
- /* ioctl for /dev/gpio/PXx */
+ /* ioctl for /dev/gpio/PXn */
switch (cmd) {
case GPIORDDIRECTION:
- value = get_port_dir(port_num);
- return_value =
- (((value & (1 << pin_num)) != 0) ? 1 : 0);
- ret = __put_user(return_value, (unsigned int *)arg);
+ ret = __put_user(get_gpio_dir(minor), (unsigned int *)arg);
break;
case GPIOWRDIRECTION:
ret = __get_user(value, (unsigned int *)arg);
- return_value = get_port_dir(port_num);
- if (value != 0)
- set_port_dir(port_num,
- return_value | (1 << pin_num));
- else
- set_port_dir(port_num,
- return_value & (~(1 << pin_num)));
+ set_gpio_dir(minor, value);
break;
case GPIORDDATA:
- value = read_from_port(port_num);
- return_value =
- (((value & (1 << pin_num)) != 0) ? 1 : 0);
- ret = __put_user(return_value, (unsigned int *)arg);
+ ret = __put_user(gpio_get_value(minor), (unsigned int *)arg);
break;
case GPIOWRDATA:
ret = __get_user(value, (unsigned int *)arg);
- return_value =
- __raw_readl(VA_GPIO_BASE + MXC_DR(port_num));
if (value != 0) {
- write_on_port(port_num,
- return_value | (1 << pin_num));
+ gpio_set_value(minor, 1);
} else {
- write_on_port(port_num,
- return_value & (~(1 << pin_num)));
+ gpio_set_value(minor, 0);
}
break;
case GPIORDMODE:
- value = get_port_mode(port_num);
- return_value =
- (((value & (1 << pin_num)) != 0) ? 1 : 0);
- ret = __put_user(return_value, (unsigned int *)arg);
+ ret = __put_user(get_gpio_mode(minor), (unsigned int *)arg);
break;
case GPIOWRMODE:
ret = __get_user(value, (unsigned int *)arg);
- return_value = get_port_mode(port_num);
- if (value != 0)
- set_port_mode(port_num,
- return_value | (1 << pin_num));
- else
- set_port_mode(port_num,
- return_value & (~(1 << pin_num)));
+ set_gpio_mode(minor, value);
break;
case GPIORDIRQMODE:
- ret = __put_user(get_irq_from_pin(pin_num, port_num),
+ ret = __put_user(get_gpio_irq(minor),
(unsigned int *)arg);
break;
+
case GPIOWRIRQMODE:
ret = __get_user(value, (unsigned int *)arg);
value &= 0x03;
if (ret == 0) {
- set_irq_for_pin(pin_num, port_num, value);
+ set_gpio_irq(minor, value);
}
irq = IRQ_GPIOA(minor); /* irq number are continuous */
if (value != IRQ_TYPE_NONE) {
@@ -845,41 +881,12 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
break;
case GPIORDPULLUP:
- value = get_port_pull_up(port_num);
- return_value =
- (((value & (1 << pin_num)) != 0) ? 1 : 0);
- ret = __put_user(return_value, (unsigned int *)arg);
+ ret = __put_user(get_gpio_pullup(minor), (unsigned int *)arg);
break;
case GPIOWRPULLUP:
ret = __get_user(value, (unsigned int *)arg);
- return_value = get_port_pull_up(port_num);
- if (value != 0)
- set_port_pullup(port_num,
- return_value | (1 << pin_num));
- else
- set_port_pullup(port_num,
- return_value &
- (~(1 << pin_num)));
- break;
-
- case GPIORDISR:
- value = get_port_isr(port_num);
- return_value =
- (((value & (1 << pin_num)) != 0) ? 1 : 0);
- ret = __put_user(return_value, (unsigned int *)arg);
- break;
-
- case GPIOWRISR:
- ret = __get_user(value, (unsigned int *)arg);
- return_value = get_port_isr(port_num);
- if (value != 0)
- set_port_isr(port_num,
- return_value | (1 << pin_num));
- else
- set_port_isr(port_num,
- return_value & (~(1 << pin_num)));
-
+ set_gpio_pullup(minor, value);
break;
default:
@@ -887,21 +894,9 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
ret = -ENOTTY;
break;
}
- } else
+ } else {
+ /* ioctls on /dev/gpio/portX */
switch (cmd) {
-
- case GPIORDDIRECTION:
- value = get_port_dir(MAX_MINOR - minor);
- ret = __put_user(value, (unsigned int *)arg);
- break;
-
- case GPIOWRDIRECTION:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- set_port_dir(MAX_MINOR - minor, value);
- }
- break;
-
case GPIORDDATA:
value = read_from_port(MAX_MINOR - minor);
ret = __put_user(value, (unsigned int *)arg);
@@ -914,72 +909,12 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
}
break;
- case GPIORDMODE:
- value = get_port_mode(MAX_MINOR - minor);
- ret = __put_user(value, (unsigned int *)arg);
- break;
-
- case GPIOWRMODE:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- set_port_mode(MAX_MINOR - minor, value);
- }
- break;
-
- case GPIORDIRQMODE_H:
- value = shadows_irq_h[MAX_MINOR - minor];
- ret = __put_user(value, (unsigned int *)arg);
- break;
-
- case GPIORDIRQMODE_L:
- value = shadows_irq_l[MAX_MINOR - minor];
- ret = __put_user(value, (unsigned int *)arg);
- break;
-
- case GPIOWRIRQMODE_H:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- shadows_irq_h[MAX_MINOR - minor] = value;
- }
- break;
-
- case GPIOWRIRQMODE_L:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- shadows_irq_l[MAX_MINOR - minor] = value;
- }
- break;
-
- case GPIORDPULLUP:
- value = get_port_pull_up(MAX_MINOR - minor);
- ret = __put_user(value, (unsigned int *)arg);
- break;
-
- case GPIOWRPULLUP:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- set_port_pullup(MAX_MINOR - minor, value);
- }
- break;
-
- case GPIORDISR:
- value = get_port_isr(MAX_MINOR - minor);
- ret = __put_user(value, (unsigned int *)arg);
- break;
-
- case GPIOWRISR:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- set_port_isr(MAX_MINOR - minor, value);
- }
- break;
-
default:
- printk("IOCTL not supported\n");
+ printk("IOCTL not supported on full port\n");
ret = -ENOTTY;
break;
}
-
+ }
/* Release exclusive access */
up(&gpio_sema);
diff --git a/target/linux/modules/gpio/core.h b/target/linux/modules/gpio/gpio-dev.h
similarity index 75%
rename from target/linux/modules/gpio/core.h
rename to target/linux/modules/gpio/gpio-dev.h
index d46bae2..018f578 100755
--- a/target/linux/modules/gpio/core.h
+++ b/target/linux/modules/gpio/gpio-dev.h
@@ -33,6 +33,7 @@
#define GPIORDDATA _IOR(PP_IOCTL, 0xF2, int)
#define GPIOWRDATA _IOW(PP_IOCTL, 0xF3, int)
+
/* mode: 1 GPIO, 0 device function */
#define GPIORDMODE _IOR(PP_IOCTL, 0xF4, int)
#define GPIOWRMODE _IOW(PP_IOCTL, 0xF5, int)
@@ -40,17 +41,9 @@
#define GPIORDPULLUP _IOR(PP_IOCTL, 0xF6, int)
#define GPIOWRPULLUP _IOW(PP_IOCTL, 0xF7, int)
-#define GPIORDIRQMODE_H _IOR(PP_IOCTL, 0xF8, int) /* only for /dev/gpio/gpioX */
-#define GPIORDIRQMODE_L _IOR(PP_IOCTL, 0xF9, int)
-#define GPIOWRIRQMODE_H _IOW(PP_IOCTL, 0xFA, int)
-#define GPIOWRIRQMODE_L _IOW(PP_IOCTL, 0xFB, int)
-/* 2bits per pin for IRQ mode: 0 none, 1 rising, 2 falling, 3 both */
-
-#define GPIORDISR _IOR(PP_IOCTL, 0xFC, int)
-#define GPIOWRISR _IOW(PP_IOCTL, 0xFD, int)
-
-#define GPIORDIRQMODE _IOR(PP_IOCTL, 0xFE, int) /* only for /dev/gpio/PXx */
-#define GPIOWRIRQMODE _IOW(PP_IOCTL, 0xFF, int)
+/* IRQ type: 0 none, 1 rising, 2 falling, 3 both */
+#define GPIORDIRQMODE _IOR(PP_IOCTL, 0xF8, int)
+#define GPIOWRIRQMODE _IOW(PP_IOCTL, 0xF9, int)
/* Pretend we're PPDEV for IOCTL */
#include <linux/ppdev.h>
diff --git a/target/test/test_gpio.sh b/target/test/test_gpio.sh
index e1c7be1..f7497c5 100755
--- a/target/test/test_gpio.sh
+++ b/target/test/test_gpio.sh
@@ -12,7 +12,6 @@
#
source ./test_helpers.sh
-source ./test_env.sh
source /usr/bin/gpio_helpers.sh
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-14 09:57:45
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 96265c90b9ca61b59ed608a0c0868d54bcf616d8 (commit)
via b45664a74d3d89da6cd34454916b5d42032974d0 (commit)
from 8d64245829682bacc4493ad4e501612ee6d0e32c (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 96265c90b9ca61b59ed608a0c0868d54bcf616d8
Merge: b45664a74d3d89da6cd34454916b5d42032974d0 8d64245829682bacc4493ad4e501612ee6d0e32c
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jun 14 11:57:12 2010 +0200
Merge branch 'master' of ssh://fabm@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit b45664a74d3d89da6cd34454916b5d42032974d0
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jun 14 11:56:54 2010 +0200
[as_devices] as_gpio: no code in header
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/c/as_gpio.c | 10 ++++++++++
target/packages/as_devices/c/as_gpio.h | 7 ++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index 8d6741d..261a9a7 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -340,6 +340,16 @@ int32_t as_gpio_set_irq_mode(struct as_gpio_device *aDev, int aMode)
/*------------------------------------------------------------------------------*/
+int32_t as_gpio_get_pin_num(struct as_gpio_device *aDev)
+{ return aDev->pin_num;}
+
+/*------------------------------------------------------------------------------*/
+
+int32_t as_gpio_get_port_letter(struct as_gpio_device *aDev)
+{ return aDev->port_letter;}
+
+/*------------------------------------------------------------------------------*/
+
int32_t as_gpio_close(struct as_gpio_device *aDev)
{
close(aDev->fpin);
diff --git a/target/packages/as_devices/c/as_gpio.h b/target/packages/as_devices/c/as_gpio.h
index af94b46..a6ce554 100644
--- a/target/packages/as_devices/c/as_gpio.h
+++ b/target/packages/as_devices/c/as_gpio.h
@@ -147,8 +147,7 @@ int32_t as_gpio_get_irq_mode(struct as_gpio_device *aDev);
*
* @return pin mode value if positive or null, error if negative
*/
-int32_t as_gpio_get_pin_num(struct as_gpio_device *aDev)
-{ return aDev->pin_num;}
+int32_t as_gpio_get_pin_num(struct as_gpio_device *aDev);
/** @brief Get port letter
*
@@ -156,9 +155,7 @@ int32_t as_gpio_get_pin_num(struct as_gpio_device *aDev)
*
* @return pin mode value if positive or null, error if negative
*/
-int32_t as_gpio_get_port_letter(struct as_gpio_device *aDev)
-{ return aDev->port_letter;}
-
+int32_t as_gpio_get_port_letter(struct as_gpio_device *aDev);
/** @brief Close port access
*
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-11 15:29:18
|
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 8d64245829682bacc4493ad4e501612ee6d0e32c (commit)
via 637e42bbb251313b8462f31200d2d59dad51599b (commit)
via e1460ff0cf9eca2c5d5ddb418b42f3ef00a4fc3f (commit)
via 31a23e1c817ac33f58a4286091c74a134386502a (commit)
via 7f2becca6ad6bd841032bdf30f03ec6b756a4932 (commit)
from 1aa2f760ada63840b959f98a0b0b92e05bc14600 (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 8d64245829682bacc4493ad4e501612ee6d0e32c
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 11 17:26:36 2010 +0200
[TESTS] Add test for GSM MoDem (APW)
commit 637e42bbb251313b8462f31200d2d59dad51599b
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 11 11:58:20 2010 +0200
[BUILDROOT] Busybox: add chat (Automated conversational script with a modem) to default configs
commit e1460ff0cf9eca2c5d5ddb418b42f3ef00a4fc3f
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 11 11:42:40 2010 +0200
[BUILDROOT] Add new mount point for FLASH partitions (/mnt/flash)
commit 31a23e1c817ac33f58a4286091c74a134386502a
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 11 11:41:13 2010 +0200
[BUILDROOT] Remove /mnt/mmc of target skeleton (use /media/mmc instead)
commit 7f2becca6ad6bd841032bdf30f03ec6b756a4932
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 10 16:05:00 2010 +0200
[TESTS] Add test for GPS (APW)
-----------------------------------------------------------------------
Summary of changes:
buildroot/local/apf27_test/busybox-1.12.1.config | 10 +-
buildroot/local/apf9328_test/busybox-1.12.1.config | 10 +-
.../target/device/armadeus/busybox-1.16.0.config | 8 +-
buildroot/target/device/armadeus/busybox.config | 10 +-
.../target_skeleton/mnt/{mmc => flash}/.empty | 0
target/test/test_gps.sh | 48 +++++++++
target/test/test_gsm.sh | 101 ++++++++++++++++++++
7 files changed, 168 insertions(+), 19 deletions(-)
rename buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/{mmc => flash}/.empty (100%)
create mode 100755 target/test/test_gps.sh
create mode 100755 target/test/test_gsm.sh
diff --git a/buildroot/local/apf27_test/busybox-1.12.1.config b/buildroot/local/apf27_test/busybox-1.12.1.config
index 50a8394..1fd679b 100644
--- a/buildroot/local/apf27_test/busybox-1.12.1.config
+++ b/buildroot/local/apf27_test/busybox-1.12.1.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.12.1
-# Tue Jun 2 13:28:40 2009
+# Fri Jun 11 11:24:10 2010
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -545,11 +545,11 @@ CONFIG_FEATURE_MOUNT_LOOP=y
#
CONFIG_ADJTIMEX=y
# CONFIG_BBCONFIG is not set
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
+CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y
# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
diff --git a/buildroot/local/apf9328_test/busybox-1.12.1.config b/buildroot/local/apf9328_test/busybox-1.12.1.config
index ec2a7b5..d36700d 100644
--- a/buildroot/local/apf9328_test/busybox-1.12.1.config
+++ b/buildroot/local/apf9328_test/busybox-1.12.1.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.12.1
-# Tue Jun 2 18:13:49 2009
+# Fri Jun 11 11:24:10 2010
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -545,11 +545,11 @@ CONFIG_FEATURE_MOUNT_LOOP=y
#
CONFIG_ADJTIMEX=y
# CONFIG_BBCONFIG is not set
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
+CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y
# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
diff --git a/buildroot/target/device/armadeus/busybox-1.16.0.config b/buildroot/target/device/armadeus/busybox-1.16.0.config
index cb0620f..c726db3 100644
--- a/buildroot/target/device/armadeus/busybox-1.16.0.config
+++ b/buildroot/target/device/armadeus/busybox-1.16.0.config
@@ -579,11 +579,11 @@ CONFIG_ADJTIMEX=y
# CONFIG_BEEP is not set
CONFIG_FEATURE_BEEP_FREQ=0
CONFIG_FEATURE_BEEP_LENGTH_MS=0
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
+CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y
# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
diff --git a/buildroot/target/device/armadeus/busybox.config b/buildroot/target/device/armadeus/busybox.config
index 274a644..fd40282 100644
--- a/buildroot/target/device/armadeus/busybox.config
+++ b/buildroot/target/device/armadeus/busybox.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.12.1
-# Sat Nov 22 17:06:44 2008
+# Fri Jun 11 11:24:10 2010
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -545,11 +545,11 @@ CONFIG_FEATURE_MOUNT_LOOP=y
#
CONFIG_ADJTIMEX=y
# CONFIG_BBCONFIG is not set
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
+CONFIG_CHAT=y
+CONFIG_FEATURE_CHAT_NOFAIL=y
# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+CONFIG_FEATURE_CHAT_IMPLICIT_CR=y
+CONFIG_FEATURE_CHAT_SWALLOW_OPTS=y
# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/mmc/.empty b/buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/flash/.empty
similarity index 100%
rename from buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/mmc/.empty
rename to buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/flash/.empty
diff --git a/target/test/test_gps.sh b/target/test/test_gps.sh
new file mode 100755
index 0000000..c156cbb
--- /dev/null
+++ b/target/test/test_gps.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+#
+# Script to test Armadeus Software release
+#
+# Copyright (C) 2010 The Armadeus Project
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+
+source ./test_helpers.sh
+
+GPS_DEVICE=/dev/ttySMX4
+
+test_gps()
+{
+ show_test_banner "GPS (APW)"
+
+ ask_user "Do you have an APF27 with an APW wireless extension board and the corresponding Linux kernel ? (Y/n)"
+ if [ "$response" == "n" ] || [ "$response" == "no" ]; then
+ echo "Only the APW is supported by this test yet !!"
+ exit_failed
+ fi
+
+ stty -F /dev/ttySMX4 raw -echo -echoe -echok 38400
+ if [ "$?" != 0 ]; then
+ echo "Failed to setup serial port ($GPS_DEVICE) !!"
+ exit_failed
+ fi
+
+ cat $GPS_DEVICE &
+ sleep 3
+ killall cat
+
+ ask_user "Did you see some NMEA frames ? (Y/n)"
+ if [ "$response" == "n" ] || [ "$response" == "no" ]; then
+ exit_failed
+ fi
+
+ echo_test_ok
+ exit 0
+}
+
+test_gps
+
diff --git a/target/test/test_gsm.sh b/target/test/test_gsm.sh
new file mode 100755
index 0000000..d7f0b29
--- /dev/null
+++ b/target/test/test_gsm.sh
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+#
+# Script to test Armadeus Software release
+#
+# Copyright (C) 2010 The Armadeus Project
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+
+source ./test_helpers.sh
+
+DEFAULT_PIN_CODE="0000"
+DEFAULT_PHONE_NUMBER="0954000000"
+GSM_DEVICE=/dev/ttySMX1
+
+send_at_cmd()
+{
+# echo "($1)"
+ echo -e -n "$1\015" > $GSM_DEVICE
+ sleep 1
+}
+
+exit_failed_gsm()
+{
+ killall cat 2>/dev/null
+ send_at_cmd ATE1 # ECHO ON
+ exit_failed
+}
+
+test_gsm()
+{
+ show_test_banner "GSM (APW)"
+
+ ask_user "Do you have APF27 with an APW wireless extension board with GSM modem and the corresponding Linux kernel ? (Y/n)"
+ if [ "$response" == "n" ] || [ "$response" == "no" ]; then
+ echo "Only the APW is supported by this test yet !!"
+ exit_failed
+ fi
+
+ stty -F $GSM_DEVICE raw -echo -echoe -echok
+ if [ "$?" != 0 ]; then
+ echo "Failed to setup serial port ($GSM_DEVICE)"
+ exit_failed
+ fi
+
+ send_at_cmd ATE0 # ECHO OFF
+ cat $GSM_DEVICE &
+ echo " --- Checking MoDem is responding:"
+ send_at_cmd ATI3
+ echo " --- Constructor:"
+ send_at_cmd AT+CGMI
+ echo " --- Model:"
+ send_at_cmd AT+CGMM
+
+ ask_user "Please enter your PIN code (ENTER to skip)"
+ if [ "$response" == "" ]; then
+ PIN_CODE=$DEFAULT_PIN_CODE
+ else
+ PIN_CODE=$response
+ DIGITS=`echo -n "$PIN_CODE" | wc -c`
+ if [ "$DIGITS" == 4 ]; then
+ echo -e -n "AT+CPIN=\"$PIN_CODE\"\015" > $GSM_DEVICE
+ sleep 2
+ send_at_cmd "AT+CPIN?"
+ else
+ echo "Bad PIN code ($PIN_CODE)"
+ exit_failed_gsm
+ fi
+ fi
+
+ ask_user "Please enter a phone number, I will make it ring (default=$DEFAULT_PHONE_NUMBER)"
+ if [ "$response" == "" ]; then
+ PHONE_NUMBER=$DEFAULT_PHONE_NUMBER
+ else
+ PHONE_NUMBER=$response
+ fi
+ DIGITS=`echo -n "$PHONE_NUMBER" | wc -c`
+ if [ "$DIGITS" != 10 ]; then
+ echo "Bad phone number format ($PHONE_NUMBER)"
+ exit_failed_gsm
+ fi
+ killall cat
+ /usr/sbin/chat ABORT 'NO CARRIER' ECHO ON '' AT OK ATD"$PHONE_NUMBER" OK > $GSM_DEVICE < $GSM_DEVICE
+ sleep 5
+ send_at_cmd ATH
+ ask_user "Did you ear it ring ? (Y/n)"
+ if [ "$response" == "n" ] || [ "$response" == "no" ]; then
+ echo "Probably no carrier ?"
+ exit_failed_gsm
+ fi
+
+ echo_test_ok
+ exit 0
+}
+
+test_gsm
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-10 12:05:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 1aa2f760ada63840b959f98a0b0b92e05bc14600 (commit)
from f01d6ce6a46509a9b8e97da7272a2ef1320462ed (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 1aa2f760ada63840b959f98a0b0b92e05bc14600
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jun 10 14:04:03 2010 +0200
[UBOOT] removes thumb interworking warning when compiling U-Boot for apf9328
-----------------------------------------------------------------------
Summary of changes:
....3.4-403-apf9328-arm920t_is_a_armv4t_arch.patch | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
create mode 100644 buildroot/target/u-boot/u-boot-1.3.4-403-apf9328-arm920t_is_a_armv4t_arch.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-403-apf9328-arm920t_is_a_armv4t_arch.patch b/buildroot/target/u-boot/u-boot-1.3.4-403-apf9328-arm920t_is_a_armv4t_arch.patch
new file mode 100644
index 0000000..b9ee3d5
--- /dev/null
+++ b/buildroot/target/u-boot/u-boot-1.3.4-403-apf9328-arm920t_is_a_armv4t_arch.patch
@@ -0,0 +1,19 @@
+Otherwise if gcc is compiled with --with-arch=armv4t, following warning
+occurs:
+ warning: target CPU does not support interworking
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: u-boot-1.3.4/cpu/arm920t/config.mk
+===================================================================
+--- u-boot-1.3.4.orig/cpu/arm920t/config.mk 2010-06-10 13:57:28.000000000 +0200
++++ u-boot-1.3.4/cpu/arm920t/config.mk 2010-06-10 13:57:39.000000000 +0200
+@@ -24,7 +24,7 @@
+ PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \
+ -msoft-float
+
+-PLATFORM_CPPFLAGS += -march=armv4
++PLATFORM_CPPFLAGS += -march=armv4t
+ # =========================================================================
+ #
+ # Supply options according to compiler version
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-06-09 20:28:08
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f01d6ce6a46509a9b8e97da7272a2ef1320462ed (commit)
from c500247fda49ccdd9f3603238615ee20950d2c76 (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 f01d6ce6a46509a9b8e97da7272a2ef1320462ed
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jun 9 22:27:39 2010 +0200
Indentation & code beautifying...
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/gpio/core.c | 121 ++++++++++++++++++--------------------
target/linux/modules/gpio/core.h | 10 ++--
2 files changed, 62 insertions(+), 69 deletions(-)
diff --git a/target/linux/modules/gpio/core.c b/target/linux/modules/gpio/core.c
index 6b89228..46cadd0 100755
--- a/target/linux/modules/gpio/core.c
+++ b/target/linux/modules/gpio/core.c
@@ -52,28 +52,28 @@
#define GPIO_MAJOR 0
#define GPIO_PROC_DIRNAME "driver/gpio"
-#define GPIO_PROC_FILE 1
-#define SETTINGS_PROC_FILE (1 << 3)
-#define SETTINGS_IRQ_PROC_FILE (1 << 4)
-#define SETTINGS_PULLUP_PROC_FILE (1 << 5)
-#define SETTINGS_MODE_PROC_FILE (1 << 6)
+#define GPIO_PROC_FILE_INIT (1 << 0)
+#define SETTINGS_PROC_FILE_INIT (1 << 3)
+#define SETTINGS_IRQ_PROC_FILE_INIT (1 << 4)
+#define SETTINGS_PULLUP_PROC_FILE_INIT (1 << 5)
+#define SETTINGS_MODE_PROC_FILE_INIT (1 << 6)
#define MAX_NUMBER_OF_PINS 32
-#define PORT_A (0)
-#define PORT_B (1)
-#define PORT_C (2)
-#define PORT_D (3)
+#define PORT_A 0
+#define PORT_B 1
+#define PORT_C 2
+#define PORT_D 3
#ifdef CONFIG_ARCH_IMX
-#define NB_PORTS (4)
+#define NB_PORTS 4
#endif
#ifdef CONFIG_ARCH_MX2
-#define PORT_E (4)
-#define PORT_F (5)
-#define NB_PORTS (6)
+#define PORT_E 4
+#define PORT_F 5
+#define NB_PORTS 6
#endif
-#define MAX_MINOR (255) /* Linux limitation */
+#define MAX_MINOR 255 /* Linux limitation */
#define FULL_PORTA_MINOR (MAX_MINOR - PORT_A)
#define FULL_PORTB_MINOR (MAX_MINOR - PORT_B)
@@ -327,22 +327,19 @@ static void initialize_port(int port, int *init_params)
__raw_writel(init_params[SWR_I], VA_GPIO_BASE + MXC_SWR(port));
}
if (init_params[GPR_I]) {
- lTemp =
- __raw_readl(VA_GPIO_BASE +
+ lTemp = __raw_readl(VA_GPIO_BASE +
MXC_GPR(port)) & (~PORT_MASK[port]);
__raw_writel(lTemp | (init_params[GPR_I] & PORT_MASK[port]),
VA_GPIO_BASE + MXC_GPR(port));
}
if (init_params[GIUS_I]) {
- lTemp =
- __raw_readl(VA_GPIO_BASE +
+ lTemp = __raw_readl(VA_GPIO_BASE +
MXC_GIUS(port)) & (~PORT_MASK[port]);
__raw_writel(lTemp | (init_params[GIUS_I] & PORT_MASK[port]),
VA_GPIO_BASE + MXC_GIUS(port));
}
if (init_params[PUEN_I]) {
- lTemp =
- __raw_readl(VA_GPIO_BASE +
+ lTemp = __raw_readl(VA_GPIO_BASE +
MXC_PUEN(port)) & (~PORT_MASK[port]);
__raw_writel(lTemp | (init_params[PUEN_I] & PORT_MASK[port]),
VA_GPIO_BASE + MXC_PUEN(port));
@@ -510,7 +507,7 @@ static ssize_t armadeus_gpio_dev_write(struct file *file, const char *data,
}
ret = count;
- out:
+out:
up(&gpio_sema);
return ret;
}
@@ -560,7 +557,7 @@ static ssize_t armadeus_gpio_dev_read(struct file *file, char *buf,
}
ret = count;
- out:
+out:
spin_unlock_irq(&gpio->lock);
return ret;
}
@@ -665,19 +662,19 @@ static int armadeus_gpio_dev_open(struct inode *inode, struct file *file)
}
}
- success:
+success:
pr_debug("Opening /dev node for %s pin %d\n", port_name[gpio->port],
gpio->number);
gpio->initialized = 1;
return 0;
free_irq(irq, gpio);
- err_irq:
+err_irq:
printk("%s error while requesting irq %d\n", __FUNCTION__, irq);
gpio_free(minor);
- err_gpio_request:
+err_gpio_request:
kfree(gpio);
- err_kzalloc:
+err_kzalloc:
/* what about spinlock & wait_queue ?? */
return ret;
}
@@ -804,9 +801,8 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
break;
case GPIORDIRQMODE:
- ret =
- __put_user(get_irq_from_pin(pin_num, port_num),
- (unsigned int *)arg);
+ ret = __put_user(get_irq_from_pin(pin_num, port_num),
+ (unsigned int *)arg);
break;
case GPIOWRIRQMODE:
ret = __get_user(value, (unsigned int *)arg);
@@ -817,8 +813,7 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
irq = IRQ_GPIOA(minor); /* irq number are continuous */
if (value != IRQ_TYPE_NONE) {
if (gpio->irq_value == IRQ_TYPE_NONE) {
- ret =
- request_irq(irq,
+ ret = request_irq(irq,
armadeus_gpio_interrupt,
0, "gpio", gpio);
if (ret) {
@@ -846,7 +841,7 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
}
gpio->irq_value = IRQ_TYPE_NONE;
}
- gpio->changed=0;
+ gpio->changed = 0;
break;
case GPIORDPULLUP:
@@ -1087,12 +1082,11 @@ static int armadeus_gpio_proc_read(char *buffer, char **start, off_t offset,
if (settings->type != INTERRUPT) {
len = toString(port_status, buffer, number_of_pins[port_ID], 1);
} else {
- len =
- toString(port_status, buffer, number_of_pins[port_ID] / 2,
- 2);
- len +=
- toString(port_status2, buffer + len - 1,
- number_of_pins[port_ID] / 2, 2);
+ len = toString(port_status, buffer,
+ number_of_pins[port_ID] / 2,
+ 2);
+ len += toString(port_status2, buffer + len - 1,
+ number_of_pins[port_ID] / 2, 2);
len -= 1;
}
@@ -1150,17 +1144,17 @@ static int armadeus_gpio_proc_write( __attribute__ ((unused))
if (strlen(new_gpio_state) > 0) {
/* Convert it from String to Int */
if (settings->type != INTERRUPT) {
- gpio_state =
- fromString(new_gpio_state, number_of_pins[port_ID],
- 1);
+ gpio_state = fromString(new_gpio_state,
+ number_of_pins[port_ID],
+ 1);
} else {
- gpio_state =
- fromString(new_gpio_state,
- number_of_pins[port_ID] / 2, 2);
- gpio_state2 =
- fromString(new_gpio_state +
- (number_of_pins[port_ID] / 2),
- (number_of_pins[port_ID] / 2), 2);
+ gpio_state = fromString(new_gpio_state,
+ number_of_pins[port_ID] / 2,
+ 2);
+ gpio_state2 = fromString(new_gpio_state +
+ (number_of_pins[port_ID] / 2),
+ (number_of_pins[port_ID] / 2),
+ 2);
}
switch (settings->type) {
@@ -1219,10 +1213,9 @@ static int initialize_proc_entry(struct proc_config_entry *config)
int i;
for (i = 0; i < NB_PORTS; i++) {
- config[i].entry =
- create_proc_entry(config[i].name,
- S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH,
- NULL);
+ config[i].entry = create_proc_entry(config[i].name,
+ S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH,
+ NULL);
if (config[i].entry == NULL) {
printk(KERN_ERR DRIVER_NAME
": Couldn't register %s. Terminating.\n",
@@ -1231,8 +1224,8 @@ static int initialize_proc_entry(struct proc_config_entry *config)
}
config[i].entry->read_proc = armadeus_gpio_proc_read;
config[i].entry->write_proc = armadeus_gpio_proc_write;
- config[i].entry->data =
- kmalloc(sizeof(struct gpio_settings), GFP_KERNEL);
+ config[i].entry->data = kmalloc(sizeof(struct gpio_settings),
+ GFP_KERNEL);
((struct gpio_settings *)config[i].entry->data)->port = i;
((struct gpio_settings *)config[i].entry->data)->type =
config[i].type;
@@ -1263,7 +1256,7 @@ static int create_proc_entries(void)
if ((ret = initialize_proc_entry(proc_config)))
return ret;
- init_map |= GPIO_PROC_FILE;
+ init_map |= GPIO_PROC_FILE_INIT;
/* Create proc file to handle GPIO mode */
for (i = 0; i < NB_PORTS; i++) {
@@ -1274,7 +1267,7 @@ static int create_proc_entries(void)
if ((ret = initialize_proc_entry(proc_config)))
return ret;
- init_map |= SETTINGS_MODE_PROC_FILE;
+ init_map |= SETTINGS_MODE_PROC_FILE_INIT;
/* Create proc file to handle GPIO direction settings */
for (i = 0; i < NB_PORTS; i++) {
@@ -1285,7 +1278,7 @@ static int create_proc_entries(void)
if ((ret = initialize_proc_entry(proc_config)))
return ret;
- init_map |= SETTINGS_PROC_FILE;
+ init_map |= SETTINGS_PROC_FILE_INIT;
/* Create proc file to handle GPIO interrupt settings */
for (i = 0; i < NB_PORTS; i++) {
@@ -1296,7 +1289,7 @@ static int create_proc_entries(void)
if ((ret = initialize_proc_entry(proc_config)))
return ret;
- init_map |= SETTINGS_IRQ_PROC_FILE;
+ init_map |= SETTINGS_IRQ_PROC_FILE_INIT;
/* Create proc file to handle GPIO pullup settings */
for (i = 0; i < NB_PORTS; i++) {
@@ -1307,7 +1300,7 @@ static int create_proc_entries(void)
if ((ret = initialize_proc_entry(proc_config)))
return ret;
- init_map |= SETTINGS_PULLUP_PROC_FILE;
+ init_map |= SETTINGS_PULLUP_PROC_FILE_INIT;
pr_debug("OK!\n");
@@ -1320,7 +1313,7 @@ static void remove_proc_entries(void)
int i;
/* Remove /proc entries */
- if (init_map & GPIO_PROC_FILE) {
+ if (init_map & GPIO_PROC_FILE_INIT) {
printk(DRIVER_NAME " removing /proc/.../portX\n");
for (i = 0; i < NB_PORTS; i++) {
sprintf(proc_name, "%s/%s", GPIO_PROC_DIRNAME,
@@ -1328,7 +1321,7 @@ static void remove_proc_entries(void)
remove_proc_entry(proc_name, NULL);
}
}
- if (init_map & SETTINGS_MODE_PROC_FILE) {
+ if (init_map & SETTINGS_MODE_PROC_FILE_INIT) {
printk(DRIVER_NAME " removing /proc/.../portXmode\n");
for (i = 0; i < NB_PORTS; i++) {
sprintf(proc_name, "%s/%smode", GPIO_PROC_DIRNAME,
@@ -1336,7 +1329,7 @@ static void remove_proc_entries(void)
remove_proc_entry(proc_name, NULL);
}
}
- if (init_map & SETTINGS_PROC_FILE) {
+ if (init_map & SETTINGS_PROC_FILE_INIT) {
printk(DRIVER_NAME " removing /proc/.../portXdir\n");
for (i = 0; i < NB_PORTS; i++) {
sprintf(proc_name, "%s/%sdir", GPIO_PROC_DIRNAME,
@@ -1344,7 +1337,7 @@ static void remove_proc_entries(void)
remove_proc_entry(proc_name, NULL);
}
}
- if (init_map & SETTINGS_IRQ_PROC_FILE) {
+ if (init_map & SETTINGS_IRQ_PROC_FILE_INIT) {
printk(DRIVER_NAME " removing /proc/.../portXirq\n");
for (i = 0; i < NB_PORTS; i++) {
sprintf(proc_name, "%s/%sirq", GPIO_PROC_DIRNAME,
@@ -1352,7 +1345,7 @@ static void remove_proc_entries(void)
remove_proc_entry(proc_name, NULL);
}
}
- if (init_map & SETTINGS_PULLUP_PROC_FILE) {
+ if (init_map & SETTINGS_PULLUP_PROC_FILE_INIT) {
printk(DRIVER_NAME " removing /proc/.../portXpullup\n");
for (i = 0; i < NB_PORTS; i++) {
sprintf(proc_name, "%s/%spullup", GPIO_PROC_DIRNAME,
diff --git a/target/linux/modules/gpio/core.h b/target/linux/modules/gpio/core.h
index 83f818e..d46bae2 100755
--- a/target/linux/modules/gpio/core.h
+++ b/target/linux/modules/gpio/core.h
@@ -1,5 +1,5 @@
/*
- * Armadeus i.MXL GPIO management driver
+ * Armadeus i.MXL/i.MX27 GPIO management driver
*
* Copyright (C) 2006-2010 Julien Boibessot <jul...@ar...>
* Nicolas Colombain <nic...@ar...>
@@ -41,16 +41,16 @@
#define GPIOWRPULLUP _IOW(PP_IOCTL, 0xF7, int)
#define GPIORDIRQMODE_H _IOR(PP_IOCTL, 0xF8, int) /* only for /dev/gpio/gpioX */
-#define GPIORDIRQMODE_L _IOR(PP_IOCTL, 0xF9, int) /* */
-#define GPIOWRIRQMODE_H _IOW(PP_IOCTL, 0xFA, int) /* */
-#define GPIOWRIRQMODE_L _IOW(PP_IOCTL, 0xFB, int) /* */
+#define GPIORDIRQMODE_L _IOR(PP_IOCTL, 0xF9, int)
+#define GPIOWRIRQMODE_H _IOW(PP_IOCTL, 0xFA, int)
+#define GPIOWRIRQMODE_L _IOW(PP_IOCTL, 0xFB, int)
/* 2bits per pin for IRQ mode: 0 none, 1 rising, 2 falling, 3 both */
#define GPIORDISR _IOR(PP_IOCTL, 0xFC, int)
#define GPIOWRISR _IOW(PP_IOCTL, 0xFD, int)
#define GPIORDIRQMODE _IOR(PP_IOCTL, 0xFE, int) /* only for /dev/gpio/PXx */
-#define GPIOWRIRQMODE _IOW(PP_IOCTL, 0xFF, int) /* */
+#define GPIOWRIRQMODE _IOW(PP_IOCTL, 0xFF, int)
/* Pretend we're PPDEV for IOCTL */
#include <linux/ppdev.h>
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-09 14:17: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 c500247fda49ccdd9f3603238615ee20950d2c76 (commit)
via a7fdbce5eabf24a93ac4df62094a957f5ce4e923 (commit)
from f273c2b6c25f79d74a42721205e8074057af5193 (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 c500247fda49ccdd9f3603238615ee20950d2c76
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jun 9 16:16:53 2010 +0200
[linux] suppress both edge management in interrupt function for gpio driver
commit a7fdbce5eabf24a93ac4df62094a957f5ce4e923
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jun 9 14:55:23 2010 +0200
[linux] change irq macro name for gpio driver
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/gpio/core.c | 61 +++++++++++++++-----------------------
1 files changed, 24 insertions(+), 37 deletions(-)
diff --git a/target/linux/modules/gpio/core.c b/target/linux/modules/gpio/core.c
index 9da02d5..6b89228 100755
--- a/target/linux/modules/gpio/core.c
+++ b/target/linux/modules/gpio/core.c
@@ -577,21 +577,11 @@ static irqreturn_t armadeus_gpio_interrupt(int irq, void *dev_id)
gpio_get_value((gpio->port << GPIO_PORT_SHIFT) | gpio->number);
gpio->pin_state = new_state;
- if ((gpio->irq_value != (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING))
- || new_state != old_state) {
- gpio->changed = 1;
- wake_up_interruptible(&gpio->change_wq);
-
- if (gpio->async_queue)
- kill_fasync(&gpio->async_queue, SIGIO, POLL_IN);
- if (gpio->irq_value ==
- (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) {
- set_irq_type(irq,
- ((gpio->
- pin_state) ? IRQF_TRIGGER_FALLING :
- IRQF_TRIGGER_RISING));
- }
- }
+ gpio->changed = 1;
+ wake_up_interruptible(&gpio->change_wq);
+
+ if (gpio->async_queue)
+ kill_fasync(&gpio->async_queue, SIGIO, POLL_IN);
return IRQ_HANDLED;
}
@@ -661,18 +651,16 @@ static int armadeus_gpio_dev_open(struct inode *inode, struct file *file)
if (ret)
goto err_irq;
switch (gpio->irq_value) {
- case (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING):
- set_irq_type(irq,
- IRQF_TRIGGER_RISING |
- IRQF_TRIGGER_FALLING);
+ case (IRQ_TYPE_EDGE_BOTH):
+ set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
break;
- case IRQF_TRIGGER_RISING:
- set_irq_type(irq, IRQF_TRIGGER_RISING);
+ case IRQ_TYPE_EDGE_RISING:
+ set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
break;
- case IRQF_TRIGGER_FALLING:
- set_irq_type(irq, IRQF_TRIGGER_FALLING);
+ case IRQ_TYPE_EDGE_FALLING:
+ set_irq_type(irq, IRQ_TYPE_EDGE_FALLING);
break;
- case IRQF_TRIGGER_NONE:
+ case IRQ_TYPE_NONE:
break;
}
}
@@ -827,8 +815,8 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
set_irq_for_pin(pin_num, port_num, value);
}
irq = IRQ_GPIOA(minor); /* irq number are continuous */
- if (value != IRQF_TRIGGER_NONE) {
- if (gpio->irq_value == IRQF_TRIGGER_NONE) {
+ if (value != IRQ_TYPE_NONE) {
+ if (gpio->irq_value == IRQ_TYPE_NONE) {
ret =
request_irq(irq,
armadeus_gpio_interrupt,
@@ -840,26 +828,25 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
}
gpio->irq_value = value;
switch (gpio->irq_value) {
- case (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING):
- set_irq_type(irq,
- IRQF_TRIGGER_RISING |
- IRQF_TRIGGER_FALLING);
+ case (IRQ_TYPE_EDGE_BOTH):
+ set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
break;
- case IRQF_TRIGGER_RISING:
- set_irq_type(irq, IRQF_TRIGGER_RISING);
+ case IRQ_TYPE_EDGE_RISING:
+ set_irq_type(irq, IRQ_TYPE_EDGE_RISING);
break;
- case IRQF_TRIGGER_FALLING:
- set_irq_type(irq, IRQF_TRIGGER_FALLING);
+ case IRQ_TYPE_EDGE_FALLING:
+ set_irq_type(irq, IRQ_TYPE_EDGE_FALLING);
break;
- case IRQF_TRIGGER_NONE:
+ case IRQ_TYPE_NONE:
break;
}
} else {
- if (gpio->irq_value != IRQF_TRIGGER_NONE) {
+ if (gpio->irq_value != IRQ_TYPE_NONE) {
free_irq(irq, gpio);
}
- gpio->irq_value = IRQF_TRIGGER_NONE;
+ gpio->irq_value = IRQ_TYPE_NONE;
}
+ gpio->changed=0;
break;
case GPIORDPULLUP:
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-09 08:32: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 f273c2b6c25f79d74a42721205e8074057af5193 (commit)
via bf71fed6d8740f444bb437210c85ca677833397f (commit)
from 982adb8874d8c9ecfdc332cea3f303166b8b4a6d (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 f273c2b6c25f79d74a42721205e8074057af5193
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jun 9 10:32:01 2010 +0200
[kernel] fix some bugs in gpio driver, change version
commit bf71fed6d8740f444bb437210c85ca677833397f
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jun 9 09:55:30 2010 +0200
indentation
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/gpio/core.c | 763 +++++++++++++++++++++-----------------
target/linux/modules/gpio/core.h | 14 +-
2 files changed, 432 insertions(+), 345 deletions(-)
diff --git a/target/linux/modules/gpio/core.c b/target/linux/modules/gpio/core.c
index bb5ab83..9da02d5 100755
--- a/target/linux/modules/gpio/core.c
+++ b/target/linux/modules/gpio/core.c
@@ -1,7 +1,7 @@
/*
* Armadeus i.MXL/27 GPIO management driver
*
- * Copyright (C) 2006-2008 Julien Boibessot <jul...@ar...>
+ * Copyright (C) 2006-2010 Julien Boibessot <jul...@ar...>
* Nicolas Colombain <nic...@ar...>
* Fabien Marteau <fab...@ar...>
* Armadeus Project / Armadeus Systems
@@ -40,15 +40,14 @@
#ifdef CONFIG_ARCH_MX2
#include <mach/iomux-mx1-mx2.h>
#endif
-#ifdef CONFIG_ARCH_IMX /* TO BE REMOVED WHEN MX1 PLATFORM EXIST */
+#ifdef CONFIG_ARCH_IMX /* TO BE REMOVED WHEN MX1 PLATFORM EXIST */
#include "iomux-mx1.h"
#endif
-#include "core.h" /* for ioctl defs */
-
+#include "core.h" /* for ioctl defs */
#define DRIVER_NAME "Armadeus GPIOs driver"
-#define DRIVER_VERSION "2.4"
+#define DRIVER_VERSION "2.5"
/* By default, we use dynamic allocation of major numbers -> MAJOR = 0 */
#define GPIO_MAJOR 0
#define GPIO_PROC_DIRNAME "driver/gpio"
@@ -74,7 +73,7 @@
#define NB_PORTS (6)
#endif
-#define MAX_MINOR (255) /* Linux limitation */
+#define MAX_MINOR (255) /* Linux limitation */
#define FULL_PORTA_MINOR (MAX_MINOR - PORT_A)
#define FULL_PORTB_MINOR (MAX_MINOR - PORT_B)
@@ -111,9 +110,9 @@ struct gpio_operations *driver_ops;
static int gpio_major = GPIO_MAJOR;
#ifdef CONFIG_ARCH_IMX
-static int number_of_pins[NB_PORTS] = {32, 32, 32, 32};
+static int number_of_pins[NB_PORTS] = { 32, 32, 32, 32 };
#else
-static int number_of_pins[NB_PORTS] = {32, 32, 32, 32, 32, 32};
+static int number_of_pins[NB_PORTS] = { 32, 32, 32, 32, 32, 32 };
#endif
static unsigned long init_map;
@@ -125,7 +124,7 @@ enum {
PULL_UP,
INTERRUPT,
MODE,
- NB_SETTINGS, /* nb of settings in this enum -> should always be the last ! */
+ NB_SETTINGS, /* nb of settings in this enum -> should always be the last ! */
};
struct gpio_settings {
@@ -135,25 +134,31 @@ struct gpio_settings {
/* Module parameters */
#define NB_CONFIG_REGS 16
-static int portA_init[NB_CONFIG_REGS] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+static int portA_init[NB_CONFIG_REGS] =
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
static int portA_init_nb = 0;
-module_param_array( portA_init, int, &portA_init_nb, 0000 );
-static int portB_init[NB_CONFIG_REGS] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+module_param_array(portA_init, int, &portA_init_nb, 0000);
+static int portB_init[NB_CONFIG_REGS] =
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
static int portB_init_nb = 0;
-module_param_array( portB_init, int, &portB_init_nb, 0000 );
-static int portC_init[NB_CONFIG_REGS] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+module_param_array(portB_init, int, &portB_init_nb, 0000);
+static int portC_init[NB_CONFIG_REGS] =
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
static int portC_init_nb = 0;
-module_param_array( portC_init, int, &portC_init_nb, 0000 );
-static int portD_init[NB_CONFIG_REGS] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+module_param_array(portC_init, int, &portC_init_nb, 0000);
+static int portD_init[NB_CONFIG_REGS] =
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
static int portD_init_nb = 0;
-module_param_array( portD_init, int, &portD_init_nb, 0000 );
+module_param_array(portD_init, int, &portD_init_nb, 0000);
#ifndef CONFIG_ARCH_IMX
-static int portE_init[NB_CONFIG_REGS] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+static int portE_init[NB_CONFIG_REGS] =
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
static int portE_init_nb = 0;
-module_param_array( portE_init, int, &portE_init_nb, 0000 );
-static int portF_init[NB_CONFIG_REGS] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+module_param_array(portE_init, int, &portE_init_nb, 0000);
+static int portF_init[NB_CONFIG_REGS] =
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
static int portF_init_nb = 0;
-module_param_array( portF_init, int, &portF_init_nb, 0000 );
+module_param_array(portF_init, int, &portF_init_nb, 0000);
#endif
struct gpio_item {
@@ -189,42 +194,43 @@ static unsigned int shadows_irq_h[NB_PORTS] = { 0, 0, 0, 0, 0, 0 };
static unsigned int shadows_irq_l[NB_PORTS] = { 0, 0, 0, 0, 0, 0 };
#endif
-
/* Static functions */
static void __exit armadeus_gpio_cleanup(void);
-static int toString(unsigned long value, char* buffer, int number_of_bits, int base)
+static int toString(unsigned long value, char *buffer, int number_of_bits,
+ int base)
{
- static int i,j;
- char mask = 0x01|base;
+ static int i, j;
+ char mask = 0x01 | base;
/* convert it into a string */
- for (j=(base*number_of_bits)-(base), i = number_of_bits; i > 0; i--,j-=base) {
- buffer[number_of_bits-i]=((value >> j)&mask)+'0';
+ for (j = (base * number_of_bits) - (base), i = number_of_bits; i > 0;
+ i--, j -= base) {
+ buffer[number_of_bits - i] = ((value >> j) & mask) + '0';
}
buffer[number_of_bits] = '\n';
- buffer[number_of_bits+1] = 0;
+ buffer[number_of_bits + 1] = 0;
- return number_of_bits+1;
+ return number_of_bits + 1;
}
/* Convert binary string ("010011") to int. Don't care of non '0' / '1' chars */
-static unsigned long fromString(char* buffer, int number_of_bits, int base)
+static unsigned long fromString(char *buffer, int number_of_bits, int base)
{
int i, j;
- unsigned long ret_val=0;
+ unsigned long ret_val = 0;
ret_val = 0;
/* Create WORD to write from the string */
- for (i=0, j=1; j<=number_of_bits; i++) {
+ for (i = 0, j = 1; j <= number_of_bits; i++) {
//printk("%x j=%d i=%d\n", buffer[i], j, i);
if (buffer[i] == '\0')
- break; /* EOC */
+ break; /* EOC */
ret_val <<= base;
- ret_val |= (buffer[i]-'0') & 0xff;
+ ret_val |= (buffer[i] - '0') & 0xff;
j++;
}
@@ -237,13 +243,13 @@ static unsigned char get_irq_from_pin(int num_pin, int num_port)
unsigned long shad;
int portSize = number_of_pins[num_port];
- if (num_pin < (portSize/2)) {
+ if (num_pin < (portSize / 2)) {
shad = shadows_irq_l[num_port];
} else {
shad = shadows_irq_h[num_port];
- num_pin -= (portSize/2);
+ num_pin -= (portSize / 2);
}
- return (shad >> (2*num_pin))&0x03;
+ return (shad >> (2 * num_pin)) & 0x03;
}
static void set_irq_for_pin(int pin_num, int port_num, int value)
@@ -251,29 +257,33 @@ static void set_irq_for_pin(int pin_num, int port_num, int value)
int portSize = number_of_pins[port_num];
int return_value;
- if (pin_num < (portSize/2)) {
- return_value = shadows_irq_l[port_num]&(~(0x03<<(pin_num*2)));
- shadows_irq_l[port_num] |= (value&0x03) << (pin_num*2);
+ if (pin_num < (portSize / 2)) {
+ return_value =
+ shadows_irq_l[port_num] & (~(0x03 << (pin_num * 2)));
+ shadows_irq_l[port_num] = return_value | ((value & 0x03) << (pin_num * 2));
} else {
return_value =
- shadows_irq_h[port_num]&(~(0x03 << (2*(pin_num - MAX_NUMBER_OF_PINS))));
- shadows_irq_h[port_num] |= (value&0x03) << (2*(pin_num - MAX_NUMBER_OF_PINS));
+ shadows_irq_h[port_num] &
+ (~(0x03 << (2 * (pin_num - MAX_NUMBER_OF_PINS))));
+ shadows_irq_h[port_num] = return_value |
+ ((value & 0x03) << (2 * (pin_num - MAX_NUMBER_OF_PINS)));
}
}
-
/*
* Low level functions
*/
/* These masks are for restricting user access to configuration of some
* criticals GPIO pins used by Armadeus and not configurable */
#ifdef CONFIG_ARCH_IMX
-static unsigned long PORT_MASK[]= { 0x0003FFFE, 0xF00FFF00, 0x0003E1F8, 0xFFFFFFFF };
+static unsigned long PORT_MASK[] =
+ { 0x0003FFFE, 0xF00FFF00, 0x0003E1F8, 0xFFFFFFFF };
#else
-static unsigned long PORT_MASK[]= { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFC000, 0xFFFE0000, 0x00FFCCF8, 0x00FFFF80 };
+static unsigned long PORT_MASK[] =
+ { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFC000, 0xFFFE0000, 0x00FFCCF8, 0x00FFFF80 };
#endif
-static void initialize_port(int port, int* init_params)
+static void initialize_port(int port, int *init_params)
{
u32 lTemp;
@@ -285,47 +295,65 @@ static void initialize_port(int port, int* init_params)
__raw_writel(init_params[SSR_I], VA_GPIO_BASE + MXC_SSR(port));
}
if (init_params[OCR1_I]) {
- __raw_writel(init_params[OCR1_I], VA_GPIO_BASE + MXC_OCR1(port));
+ __raw_writel(init_params[OCR1_I],
+ VA_GPIO_BASE + MXC_OCR1(port));
}
- /*else { default value are already set by iMX !!*/
+ /*else { default value are already set by iMX !! */
if (init_params[OCR2_I]) {
- __raw_writel(init_params[OCR2_I], VA_GPIO_BASE + MXC_OCR2(port));
+ __raw_writel(init_params[OCR2_I],
+ VA_GPIO_BASE + MXC_OCR2(port));
}
if (init_params[ICONFA1_I]) {
- __raw_writel(init_params[ICONFA1_I], VA_GPIO_BASE + MXC_ICONFA1(port));
+ __raw_writel(init_params[ICONFA1_I],
+ VA_GPIO_BASE + MXC_ICONFA1(port));
}
if (init_params[ICONFA2_I]) {
- __raw_writel(init_params[ICONFA2_I], VA_GPIO_BASE + MXC_ICONFA2(port));
+ __raw_writel(init_params[ICONFA2_I],
+ VA_GPIO_BASE + MXC_ICONFA2(port));
}
if (init_params[ICONFB1_I]) {
- __raw_writel(init_params[ICONFB1_I], VA_GPIO_BASE + MXC_ICONFB1(port));
+ __raw_writel(init_params[ICONFB1_I],
+ VA_GPIO_BASE + MXC_ICONFB1(port));
}
if (init_params[ICONFB2_I]) {
- __raw_writel(init_params[ICONFB2_I], VA_GPIO_BASE + MXC_ICONFB2(port));
+ __raw_writel(init_params[ICONFB2_I],
+ VA_GPIO_BASE + MXC_ICONFB2(port));
}
if (init_params[DDIR_I]) {
- __raw_writel(init_params[DDIR_I], VA_GPIO_BASE + MXC_DDIR(port));
+ __raw_writel(init_params[DDIR_I],
+ VA_GPIO_BASE + MXC_DDIR(port));
}
if (init_params[SWR_I]) {
__raw_writel(init_params[SWR_I], VA_GPIO_BASE + MXC_SWR(port));
}
if (init_params[GPR_I]) {
- lTemp = __raw_readl(VA_GPIO_BASE + MXC_GPR(port)) & (~PORT_MASK[port]);
- __raw_writel(lTemp | (init_params[GPR_I] & PORT_MASK[port]), VA_GPIO_BASE + MXC_GPR(port));
+ lTemp =
+ __raw_readl(VA_GPIO_BASE +
+ MXC_GPR(port)) & (~PORT_MASK[port]);
+ __raw_writel(lTemp | (init_params[GPR_I] & PORT_MASK[port]),
+ VA_GPIO_BASE + MXC_GPR(port));
}
if (init_params[GIUS_I]) {
- lTemp = __raw_readl(VA_GPIO_BASE + MXC_GIUS(port)) & (~PORT_MASK[port]);
- __raw_writel(lTemp | (init_params[GIUS_I] & PORT_MASK[port]), VA_GPIO_BASE + MXC_GIUS(port));
+ lTemp =
+ __raw_readl(VA_GPIO_BASE +
+ MXC_GIUS(port)) & (~PORT_MASK[port]);
+ __raw_writel(lTemp | (init_params[GIUS_I] & PORT_MASK[port]),
+ VA_GPIO_BASE + MXC_GIUS(port));
}
if (init_params[PUEN_I]) {
- lTemp = __raw_readl(VA_GPIO_BASE + MXC_PUEN(port)) & (~PORT_MASK[port]);
- __raw_writel(lTemp | (init_params[PUEN_I] & PORT_MASK[port]), VA_GPIO_BASE + MXC_PUEN(port));
+ lTemp =
+ __raw_readl(VA_GPIO_BASE +
+ MXC_PUEN(port)) & (~PORT_MASK[port]);
+ __raw_writel(lTemp | (init_params[PUEN_I] & PORT_MASK[port]),
+ VA_GPIO_BASE + MXC_PUEN(port));
}
if (init_params[ICR1_I]) {
- __raw_writel(init_params[ICR1_I], VA_GPIO_BASE + MXC_ICR1(port));
+ __raw_writel(init_params[ICR1_I],
+ VA_GPIO_BASE + MXC_ICR1(port));
}
if (init_params[ICR2_I]) {
- __raw_writel(init_params[ICR2_I], VA_GPIO_BASE + MXC_ICR2(port));
+ __raw_writel(init_params[ICR2_I],
+ VA_GPIO_BASE + MXC_ICR2(port));
}
if (init_params[IMR_I]) {
__raw_writel(init_params[IMR_I], VA_GPIO_BASE + MXC_IMR(port));
@@ -344,7 +372,6 @@ static void initialize_all_ports(void)
#endif
}
-
static void write_on_port(unsigned int aPort, unsigned int aValue)
{
__raw_writel(aValue & 0xFFFFFFFF, VA_GPIO_BASE + MXC_DR(aPort));
@@ -368,14 +395,14 @@ static void set_port_mode(unsigned int aPort, unsigned int aModeMask)
ocr1 = __raw_readl(VA_GPIO_BASE + MXC_OCR1(aPort));
ocr2 = __raw_readl(VA_GPIO_BASE + MXC_OCR2(aPort));
gius = __raw_readl(VA_GPIO_BASE + MXC_GIUS(aPort));
- aModeMask = aModeMask & PORT_MASK[aPort]; /* only sets the allowed pins */
- for (i=0; i < number_of_pins[aPort]; i++) {
+ aModeMask = aModeMask & PORT_MASK[aPort]; /* only sets the allowed pins */
+ for (i = 0; i < number_of_pins[aPort]; i++) {
if (i < 16) {
- if ((aModeMask>>i) & 1)
- ocr1 = ocr1 | (3<<(i*2));
+ if ((aModeMask >> i) & 1)
+ ocr1 = ocr1 | (3 << (i * 2));
} else {
- if ((aModeMask>>i) & 1)
- ocr2 = ocr2 | (3<<((i-16)*2));
+ if ((aModeMask >> i) & 1)
+ ocr2 = ocr2 | (3 << ((i - 16) * 2));
}
}
__raw_writel(ocr1, VA_GPIO_BASE + MXC_OCR1(aPort));
@@ -393,13 +420,13 @@ static unsigned int get_port_mode(unsigned int aPort)
ocr2 = __raw_readl(VA_GPIO_BASE + MXC_OCR2(aPort));
gius = __raw_readl(VA_GPIO_BASE + MXC_GIUS(aPort));
/* pin is a GPIO if OCR == 3 AND GIUS == 1 */
- for (i=0; i < number_of_pins[aPort]; i++) {
+ for (i = 0; i < number_of_pins[aPort]; i++) {
if (i < 16) {
- if (((ocr1>>(i*2)) & 3) == 3)
- value = value | (1<<i);
+ if (((ocr1 >> (i * 2)) & 3) == 3)
+ value = value | (1 << i);
} else {
- if (((ocr2>>((i-16)*2)) & 3) == 3)
- value = value | (1<<i);
+ if (((ocr2 >> ((i - 16) * 2)) & 3) == 3)
+ value = value | (1 << i);
}
}
value = value & gius;
@@ -407,7 +434,6 @@ static unsigned int get_port_mode(unsigned int aPort)
return value;
}
-
static unsigned int get_port_isr(unsigned int aPort)
{
return __raw_readl(VA_GPIO_BASE + MXC_ISR(aPort));
@@ -443,32 +469,32 @@ static unsigned int get_port_dir(unsigned int aPort)
return port_value;
}
-
-char* port_name[NB_PORTS] = { "portA", "portB", "portC", "portD",
+char *port_name[NB_PORTS] = { "portA", "portB", "portC", "portD",
#ifdef CONFIG_ARCH_MX2
- "portE", "portF",
+ "portE", "portF",
#endif
};
-char* port_setting_name[NB_SETTINGS] = { "Value", "Direction", "Pull-up", "Interrupt" , "Mode" };
-
+char *port_setting_name[NB_SETTINGS] =
+ { "Value", "Direction", "Pull-up", "Interrupt", "Mode" };
/* Handles write() done on /dev/gpioxx */
-static ssize_t armadeus_gpio_dev_write(struct file *file, const char *data, size_t count, loff_t *offset)
+static ssize_t armadeus_gpio_dev_write(struct file *file, const char *data,
+ size_t count, loff_t * offset)
{
- unsigned int minor=0;
- u32 value=0;
+ unsigned int minor = 0;
+ u32 value = 0;
ssize_t ret = 0;
struct gpio_item *gpio = file->private_data;
minor = MINOR(file->f_dentry->d_inode->i_rdev);
pr_debug("- %s %d byte(s) on minor %d -> %s pin %d\n", __FUNCTION__,
- count, minor, port_name[gpio->port], gpio->number);
+ count, minor, port_name[gpio->port], gpio->number);
- if (down_interruptible(&gpio_sema)) /* Usefull ?? */
+ if (down_interruptible(&gpio_sema)) /* Usefull ?? */
return -ERESTARTSYS;
- count = min(count, (size_t)4);
+ count = min(count, (size_t) 4);
if (copy_from_user(&value, data, count)) {
ret = -EFAULT;
goto out;
@@ -484,14 +510,14 @@ static ssize_t armadeus_gpio_dev_write(struct file *file, const char *data, size
}
ret = count;
-out:
+ out:
up(&gpio_sema);
return ret;
}
/* Handles read() done on /dev/gpioxx */
static ssize_t armadeus_gpio_dev_read(struct file *file, char *buf,
- size_t count, loff_t *ppos)
+ size_t count, loff_t * ppos)
{
unsigned minor = MINOR(file->f_dentry->d_inode->i_rdev);
u32 value = 0;
@@ -527,19 +553,18 @@ static ssize_t armadeus_gpio_dev_read(struct file *file, char *buf,
pr_debug("Single pin read: %d\n", value);
}
- count = min(count, (size_t)sizeof(u32));
+ count = min(count, (size_t) sizeof(u32));
if (copy_to_user(buf, &value, count)) {
ret = -EFAULT;
goto out;
}
ret = count;
-out:
+ out:
spin_unlock_irq(&gpio->lock);
return ret;
}
-
static irqreturn_t armadeus_gpio_interrupt(int irq, void *dev_id)
{
struct gpio_item *gpio = dev_id;
@@ -548,17 +573,23 @@ static irqreturn_t armadeus_gpio_interrupt(int irq, void *dev_id)
pr_debug("IT for pin %d %d\n", gpio->port, gpio->number);
old_state = gpio->pin_state;
- new_state = gpio_get_value((gpio->port << GPIO_PORT_SHIFT) | gpio->number);
+ new_state =
+ gpio_get_value((gpio->port << GPIO_PORT_SHIFT) | gpio->number);
gpio->pin_state = new_state;
- if ((gpio->irq_value != (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) || new_state != old_state) {
+ if ((gpio->irq_value != (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING))
+ || new_state != old_state) {
gpio->changed = 1;
wake_up_interruptible(&gpio->change_wq);
if (gpio->async_queue)
kill_fasync(&gpio->async_queue, SIGIO, POLL_IN);
- if (gpio->irq_value == (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) {
- set_irq_type(irq, ((gpio->pin_state) ? IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING));
+ if (gpio->irq_value ==
+ (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) {
+ set_irq_type(irq,
+ ((gpio->
+ pin_state) ? IRQF_TRIGGER_FALLING :
+ IRQF_TRIGGER_RISING));
}
}
@@ -568,11 +599,11 @@ static irqreturn_t armadeus_gpio_interrupt(int irq, void *dev_id)
static int armadeus_gpio_dev_open(struct inode *inode, struct file *file)
{
unsigned minor = MINOR(inode->i_rdev);
- /*unsigned int major = MAJOR(inode->i_rdev);*/
+ /*unsigned int major = MAJOR(inode->i_rdev); */
unsigned int irq;
int ret = 0;
- struct gpio_item *gpio;/* = container_of(inode->i_cdev, struct gpio_item,
- char_dev);*/
+ struct gpio_item *gpio; /* = container_of(inode->i_cdev, struct gpio_item,
+ char_dev); */
gpio = kzalloc(sizeof(struct gpio_item), GFP_KERNEL);
if (!gpio)
@@ -584,19 +615,19 @@ static int armadeus_gpio_dev_open(struct inode *inode, struct file *file)
switch (minor) {
/* Write all port pins in one time */
- case FULL_PORTA_MINOR:
- case FULL_PORTB_MINOR:
- case FULL_PORTC_MINOR:
- case FULL_PORTD_MINOR:
+ case FULL_PORTA_MINOR:
+ case FULL_PORTB_MINOR:
+ case FULL_PORTC_MINOR:
+ case FULL_PORTD_MINOR:
#ifndef CONFIG_ARCH_IMX
- case FULL_PORTE_MINOR:
- case FULL_PORTF_MINOR:
+ case FULL_PORTE_MINOR:
+ case FULL_PORTF_MINOR:
#endif
- gpio->nb_pins = 32;
- gpio->changed = 0;
- gpio->port = FULL_MINOR_TO_PORT(minor);
- pr_debug("Reserving full %s\n", port_name[gpio->port]);
- goto success;
+ gpio->nb_pins = 32;
+ gpio->changed = 0;
+ gpio->port = FULL_MINOR_TO_PORT(minor);
+ pr_debug("Reserving full %s\n", port_name[gpio->port]);
+ goto success;
break;
}
@@ -624,37 +655,41 @@ static int armadeus_gpio_dev_open(struct inode *inode, struct file *file)
gpio->irq_value = get_irq_from_pin(gpio->number, gpio->port);
if (gpio->irq_value) {
- irq = IRQ_GPIOA(minor); /* irq number are continuous */
- ret = request_irq(irq, armadeus_gpio_interrupt, 0, "gpio", gpio);
+ irq = IRQ_GPIOA(minor); /* irq number are continuous */
+ ret =
+ request_irq(irq, armadeus_gpio_interrupt, 0, "gpio", gpio);
if (ret)
goto err_irq;
switch (gpio->irq_value) {
- case (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING):
- set_irq_type(irq, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING);
- break ;
- case IRQF_TRIGGER_RISING:
- set_irq_type(irq, IRQF_TRIGGER_RISING);
- break;
- case IRQF_TRIGGER_FALLING:
- set_irq_type(irq, IRQF_TRIGGER_FALLING);
- break;
- case IRQF_TRIGGER_NONE:
- break;
+ case (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING):
+ set_irq_type(irq,
+ IRQF_TRIGGER_RISING |
+ IRQF_TRIGGER_FALLING);
+ break;
+ case IRQF_TRIGGER_RISING:
+ set_irq_type(irq, IRQF_TRIGGER_RISING);
+ break;
+ case IRQF_TRIGGER_FALLING:
+ set_irq_type(irq, IRQF_TRIGGER_FALLING);
+ break;
+ case IRQF_TRIGGER_NONE:
+ break;
}
}
-success:
- pr_debug("Opening /dev node for %s pin %d\n", port_name[gpio->port], gpio->number);
+ success:
+ pr_debug("Opening /dev node for %s pin %d\n", port_name[gpio->port],
+ gpio->number);
gpio->initialized = 1;
return 0;
free_irq(irq, gpio);
-err_irq:
+ err_irq:
printk("%s error while requesting irq %d\n", __FUNCTION__, irq);
gpio_free(minor);
-err_gpio_request:
+ err_gpio_request:
kfree(gpio);
-err_kzalloc:
+ err_kzalloc:
/* what about spinlock & wait_queue ?? */
return ret;
}
@@ -681,7 +716,7 @@ static int armadeus_gpio_dev_release(struct inode *inode, struct file *file)
/* Handling of IOCTL calls */
int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg)
+ unsigned int cmd, unsigned long arg)
{
int err = 0, ret = 0, value = 0;
unsigned int return_value;
@@ -719,15 +754,15 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
#else
if (minor < FULL_PORTD_MINOR) {
#endif
- port_num= (unsigned int)(minor/MAX_NUMBER_OF_PINS);
- pin_num = (unsigned int)(minor%MAX_NUMBER_OF_PINS);
+ port_num = (unsigned int)(minor / MAX_NUMBER_OF_PINS);
+ pin_num = (unsigned int)(minor % MAX_NUMBER_OF_PINS);
- /* ioctl for /dev/gpio/PXx */
- switch(cmd)
- {
+ /* ioctl for /dev/gpio/PXx */
+ switch (cmd) {
case GPIORDDIRECTION:
value = get_port_dir(port_num);
- return_value = (((value & (1<<pin_num))!=0)?1:0);
+ return_value =
+ (((value & (1 << pin_num)) != 0) ? 1 : 0);
ret = __put_user(return_value, (unsigned int *)arg);
break;
@@ -735,33 +770,37 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
ret = __get_user(value, (unsigned int *)arg);
return_value = get_port_dir(port_num);
if (value != 0)
- set_port_dir(port_num, return_value | (1<<pin_num));
+ set_port_dir(port_num,
+ return_value | (1 << pin_num));
else
- set_port_dir(port_num, return_value & (~(1<<pin_num)));
+ set_port_dir(port_num,
+ return_value & (~(1 << pin_num)));
break;
case GPIORDDATA:
value = read_from_port(port_num);
- return_value = (((value & (1<<pin_num))!=0)?1:0);
+ return_value =
+ (((value & (1 << pin_num)) != 0) ? 1 : 0);
ret = __put_user(return_value, (unsigned int *)arg);
break;
case GPIOWRDATA:
ret = __get_user(value, (unsigned int *)arg);
- return_value = __raw_readl(VA_GPIO_BASE + MXC_DR(port_num));
- if (value != 0)
- {
- write_on_port(port_num, return_value | (1<<pin_num));
- }
- else
- {
- write_on_port(port_num, return_value & (~(1<<pin_num)));
+ return_value =
+ __raw_readl(VA_GPIO_BASE + MXC_DR(port_num));
+ if (value != 0) {
+ write_on_port(port_num,
+ return_value | (1 << pin_num));
+ } else {
+ write_on_port(port_num,
+ return_value & (~(1 << pin_num)));
}
break;
case GPIORDMODE:
value = get_port_mode(port_num);
- return_value = (((value & (1<<pin_num))!=0)?1:0);
+ return_value =
+ (((value & (1 << pin_num)) != 0) ? 1 : 0);
ret = __put_user(return_value, (unsigned int *)arg);
break;
@@ -769,13 +808,17 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
ret = __get_user(value, (unsigned int *)arg);
return_value = get_port_mode(port_num);
if (value != 0)
- set_port_mode(port_num, return_value | (1<<pin_num));
+ set_port_mode(port_num,
+ return_value | (1 << pin_num));
else
- set_port_mode(port_num, return_value & (~(1<<pin_num)));
+ set_port_mode(port_num,
+ return_value & (~(1 << pin_num)));
break;
case GPIORDIRQMODE:
- ret = __put_user(get_irq_from_pin(pin_num, port_num), (unsigned int *)arg);
+ ret =
+ __put_user(get_irq_from_pin(pin_num, port_num),
+ (unsigned int *)arg);
break;
case GPIOWRIRQMODE:
ret = __get_user(value, (unsigned int *)arg);
@@ -783,32 +826,36 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
if (ret == 0) {
set_irq_for_pin(pin_num, port_num, value);
}
- irq = IRQ_GPIOA(minor); /* irq number are continuous */
+ irq = IRQ_GPIOA(minor); /* irq number are continuous */
if (value != IRQF_TRIGGER_NONE) {
- if (gpio->irq_value == IRQF_TRIGGER_NONE)
- {
- ret = request_irq(irq, armadeus_gpio_interrupt, 0, "gpio", gpio);
- if (ret)
- {
- printk(KERN_ERR "GPIO TODO: manage request_irq error\n");
+ if (gpio->irq_value == IRQF_TRIGGER_NONE) {
+ ret =
+ request_irq(irq,
+ armadeus_gpio_interrupt,
+ 0, "gpio", gpio);
+ if (ret) {
+ printk(KERN_ERR
+ "GPIO TODO: manage request_irq error\n");
}
}
gpio->irq_value = value;
switch (gpio->irq_value) {
- case (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING):
- set_irq_type(irq, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING);
- break ;
- case IRQF_TRIGGER_RISING:
- set_irq_type(irq, IRQF_TRIGGER_RISING);
- break;
- case IRQF_TRIGGER_FALLING:
- set_irq_type(irq, IRQF_TRIGGER_FALLING);
- break;
- case IRQF_TRIGGER_NONE:
- break;
+ case (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING):
+ set_irq_type(irq,
+ IRQF_TRIGGER_RISING |
+ IRQF_TRIGGER_FALLING);
+ break;
+ case IRQF_TRIGGER_RISING:
+ set_irq_type(irq, IRQF_TRIGGER_RISING);
+ break;
+ case IRQF_TRIGGER_FALLING:
+ set_irq_type(irq, IRQF_TRIGGER_FALLING);
+ break;
+ case IRQF_TRIGGER_NONE:
+ break;
}
} else {
- if (gpio->irq_value != IRQF_TRIGGER_NONE){
+ if (gpio->irq_value != IRQF_TRIGGER_NONE) {
free_irq(irq, gpio);
}
gpio->irq_value = IRQF_TRIGGER_NONE;
@@ -817,7 +864,8 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
case GPIORDPULLUP:
value = get_port_pull_up(port_num);
- return_value = (((value & (1<<pin_num))!=0)?1:0);
+ return_value =
+ (((value & (1 << pin_num)) != 0) ? 1 : 0);
ret = __put_user(return_value, (unsigned int *)arg);
break;
@@ -825,14 +873,18 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
ret = __get_user(value, (unsigned int *)arg);
return_value = get_port_pull_up(port_num);
if (value != 0)
- set_port_pullup(port_num, return_value | (1<<pin_num));
+ set_port_pullup(port_num,
+ return_value | (1 << pin_num));
else
- set_port_pullup(port_num, return_value & (~(1<<pin_num)));
+ set_port_pullup(port_num,
+ return_value &
+ (~(1 << pin_num)));
break;
case GPIORDISR:
value = get_port_isr(port_num);
- return_value = (((value & (1<<pin_num))!=0)?1:0);
+ return_value =
+ (((value & (1 << pin_num)) != 0) ? 1 : 0);
ret = __put_user(return_value, (unsigned int *)arg);
break;
@@ -840,9 +892,11 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
ret = __get_user(value, (unsigned int *)arg);
return_value = get_port_isr(port_num);
if (value != 0)
- set_port_isr(port_num, return_value | (1<<pin_num));
+ set_port_isr(port_num,
+ return_value | (1 << pin_num));
else
- set_port_isr(port_num, return_value & (~(1<<pin_num)));
+ set_port_isr(port_num,
+ return_value & (~(1 << pin_num)));
break;
@@ -851,112 +905,113 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
ret = -ENOTTY;
break;
}
- } else switch (cmd) {
+ } else
+ switch (cmd) {
- case GPIORDDIRECTION:
- value = get_port_dir(MAX_MINOR - minor);
- ret = __put_user(value, (unsigned int *)arg);
- break;
+ case GPIORDDIRECTION:
+ value = get_port_dir(MAX_MINOR - minor);
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
- case GPIOWRDIRECTION:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- set_port_dir(MAX_MINOR - minor, value);
- }
- break;
+ case GPIOWRDIRECTION:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ set_port_dir(MAX_MINOR - minor, value);
+ }
+ break;
- case GPIORDDATA:
- value = read_from_port(MAX_MINOR - minor);
- ret = __put_user(value, (unsigned int *)arg);
- break;
+ case GPIORDDATA:
+ value = read_from_port(MAX_MINOR - minor);
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
- case GPIOWRDATA:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- write_on_port(MAX_MINOR - minor, value);
- }
- break;
+ case GPIOWRDATA:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ write_on_port(MAX_MINOR - minor, value);
+ }
+ break;
- case GPIORDMODE:
- value = get_port_mode(MAX_MINOR - minor);
- ret = __put_user(value, (unsigned int *)arg);
- break;
+ case GPIORDMODE:
+ value = get_port_mode(MAX_MINOR - minor);
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
- case GPIOWRMODE:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- set_port_mode(MAX_MINOR - minor, value);
- }
- break;
-
- case GPIORDIRQMODE_H:
- value= shadows_irq_h[MAX_MINOR - minor];
- ret = __put_user(value, (unsigned int *)arg);
- break;
-
- case GPIORDIRQMODE_L:
- value = shadows_irq_l[MAX_MINOR - minor];
- ret = __put_user(value, (unsigned int *)arg);
- break;
-
- case GPIOWRIRQMODE_H:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- shadows_irq_h[MAX_MINOR - minor] = value;
- }
- break;
+ case GPIOWRMODE:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ set_port_mode(MAX_MINOR - minor, value);
+ }
+ break;
- case GPIOWRIRQMODE_L:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- shadows_irq_l[MAX_MINOR - minor] = value;
- }
- break;
+ case GPIORDIRQMODE_H:
+ value = shadows_irq_h[MAX_MINOR - minor];
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
- case GPIORDPULLUP:
- value = get_port_pull_up(MAX_MINOR - minor);
- ret = __put_user(value, (unsigned int *)arg);
- break;
+ case GPIORDIRQMODE_L:
+ value = shadows_irq_l[MAX_MINOR - minor];
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
- case GPIOWRPULLUP:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- set_port_pullup(MAX_MINOR - minor, value);
- }
- break;
+ case GPIOWRIRQMODE_H:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ shadows_irq_h[MAX_MINOR - minor] = value;
+ }
+ break;
- case GPIORDISR:
- value = get_port_isr(MAX_MINOR - minor);
- ret = __put_user(value, (unsigned int *)arg);
- break;
+ case GPIOWRIRQMODE_L:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ shadows_irq_l[MAX_MINOR - minor] = value;
+ }
+ break;
- case GPIOWRISR:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- set_port_isr(MAX_MINOR - minor, value);
- }
- break;
+ case GPIORDPULLUP:
+ value = get_port_pull_up(MAX_MINOR - minor);
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
- default:
- printk("IOCTL not supported\n");
- ret = -ENOTTY;
- break;
+ case GPIOWRPULLUP:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ set_port_pullup(MAX_MINOR - minor, value);
+ }
+ break;
+
+ case GPIORDISR:
+ value = get_port_isr(MAX_MINOR - minor);
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
+
+ case GPIOWRISR:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ set_port_isr(MAX_MINOR - minor, value);
+ }
+ break;
+
+ default:
+ printk("IOCTL not supported\n");
+ ret = -ENOTTY;
+ break;
}
- /* Release exclusive access */
- up(&gpio_sema);
+ /* Release exclusive access */
+ up(&gpio_sema);
- return ret;
+ return ret;
}
-static int armadeus_gpio_dev_fasync(int fd, struct file* filp, int on)
+static int armadeus_gpio_dev_fasync(int fd, struct file *filp, int on)
{
- struct gpio_item* gpio = filp->private_data;
+ struct gpio_item *gpio = filp->private_data;
return fasync_helper(fd, filp, on, &(gpio->async_queue));
}
-static unsigned int armadeus_gpio_dev_poll(struct file *filp, poll_table *wait)
+static unsigned int armadeus_gpio_dev_poll(struct file *filp, poll_table * wait)
{
struct gpio_item *gpio = filp->private_data;
unsigned int mask = 0;
@@ -964,8 +1019,7 @@ static unsigned int armadeus_gpio_dev_poll(struct file *filp, poll_table *wait)
spin_lock_irq(&gpio->lock);
poll_wait(filp, &gpio->change_wq, wait);
- if (gpio->changed)
- {
+ if (gpio->changed) {
mask |= (POLLIN | POLLRDNORM);
}
@@ -975,15 +1029,15 @@ static unsigned int armadeus_gpio_dev_poll(struct file *filp, poll_table *wait)
}
static struct file_operations gpio_fops = {
- .owner = THIS_MODULE,
- .llseek = no_llseek,
- .write = armadeus_gpio_dev_write,
- .read = armadeus_gpio_dev_read,
- .open = armadeus_gpio_dev_open,
- .release = armadeus_gpio_dev_release,
- .ioctl = armadeus_gpio_dev_ioctl,
- .fasync = armadeus_gpio_dev_fasync,
- .poll = armadeus_gpio_dev_poll,
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .write = armadeus_gpio_dev_write,
+ .read = armadeus_gpio_dev_read,
+ .open = armadeus_gpio_dev_open,
+ .release = armadeus_gpio_dev_release,
+ .ioctl = armadeus_gpio_dev_ioctl,
+ .fasync = armadeus_gpio_dev_fasync,
+ .poll = armadeus_gpio_dev_poll,
};
/*
@@ -991,12 +1045,14 @@ static struct file_operations gpio_fops = {
*/
static int armadeus_gpio_proc_read(char *buffer, char **start, off_t offset,
- int buffer_length, int *eof, __attribute__ ((unused)) void *data)
+ int buffer_length, int *eof,
+ __attribute__ ((unused))
+ void *data)
{
- int len = 0; /* The number of bytes actually used */
+ int len = 0; /* The number of bytes actually used */
unsigned int port_status = 0x66, port_status2 = 0x66;
unsigned int port_ID = 0;
- struct gpio_settings *settings = (struct gpio_settings *) data;
+ struct gpio_settings *settings = (struct gpio_settings *)data;
if (settings != NULL) {
port_ID = settings->port;
@@ -1007,45 +1063,49 @@ static int armadeus_gpio_proc_read(char *buffer, char **start, off_t offset,
* because the standard read function from the library would continue to
* issue the read system call until the kernel replies that it has no more
* information, or until its buffer is filled
- */
- if (offset > 0 || buffer_length < (number_of_pins[port_ID]+2))
+ */
+ if (offset > 0 || buffer_length < (number_of_pins[port_ID] + 2))
return 0;
if (down_interruptible(&gpio_sema))
return -ERESTARTSYS;
switch (settings->type) {
- case MODE:
- port_status = get_port_mode(port_ID);
+ case MODE:
+ port_status = get_port_mode(port_ID);
break;
- case VALUE:
- port_status = read_from_port(port_ID);
+ case VALUE:
+ port_status = read_from_port(port_ID);
break;
- case DIRECTION:
- port_status = get_port_dir(port_ID);
+ case DIRECTION:
+ port_status = get_port_dir(port_ID);
break;
- case PULL_UP:
- port_status = __raw_readl(VA_GPIO_BASE + MXC_PUEN(port_ID));
+ case PULL_UP:
+ port_status = __raw_readl(VA_GPIO_BASE + MXC_PUEN(port_ID));
break;
- case INTERRUPT:
- port_status = shadows_irq_h[port_ID];
- port_status2 = shadows_irq_l[port_ID];
+ case INTERRUPT:
+ port_status = shadows_irq_h[port_ID];
+ port_status2 = shadows_irq_l[port_ID];
break;
- default:
- printk("%s: unknown setting\n", __FUNCTION__);
+ default:
+ printk("%s: unknown setting\n", __FUNCTION__);
break;
}
/* Put result to given chr buffer */
if (settings->type != INTERRUPT) {
len = toString(port_status, buffer, number_of_pins[port_ID], 1);
} else {
- len = toString(port_status, buffer, number_of_pins[port_ID]/2, 2);
- len += toString(port_status2, buffer+len-1, number_of_pins[port_ID]/2, 2);
+ len =
+ toString(port_status, buffer, number_of_pins[port_ID] / 2,
+ 2);
+ len +=
+ toString(port_status2, buffer + len - 1,
+ number_of_pins[port_ID] / 2, 2);
len -= 1;
}
@@ -1060,14 +1120,18 @@ static int armadeus_gpio_proc_read(char *buffer, char **start, off_t offset,
return len;
}
-static char new_gpio_state[MAX_NUMBER_OF_PINS*2];
+static char new_gpio_state[MAX_NUMBER_OF_PINS * 2];
-static int armadeus_gpio_proc_write(__attribute__ ((unused)) struct file *file, const char *buf, unsigned long count, __attribute__ ((unused)) void* data)
+static int armadeus_gpio_proc_write( __attribute__ ((unused))
+ struct file *file, const char *buf,
+ unsigned long count,
+ __attribute__ ((unused))
+ void *data)
{
int len;
- unsigned int gpio_state=0, gpio_state2=0;
+ unsigned int gpio_state = 0, gpio_state2 = 0;
unsigned int port_ID = 0;
- struct gpio_settings *settings = (struct gpio_settings *) data;
+ struct gpio_settings *settings = (struct gpio_settings *)data;
if (settings != NULL) {
port_ID = settings->port;
@@ -1099,56 +1163,62 @@ static int armadeus_gpio_proc_write(__attribute__ ((unused)) struct file *file,
if (strlen(new_gpio_state) > 0) {
/* Convert it from String to Int */
if (settings->type != INTERRUPT) {
- gpio_state = fromString(new_gpio_state, number_of_pins[port_ID], 1);
+ gpio_state =
+ fromString(new_gpio_state, number_of_pins[port_ID],
+ 1);
} else {
- gpio_state = fromString(new_gpio_state, number_of_pins[port_ID]/2, 2);
- gpio_state2 = fromString(new_gpio_state+(number_of_pins[port_ID]/2), (number_of_pins[port_ID]/2), 2);
+ gpio_state =
+ fromString(new_gpio_state,
+ number_of_pins[port_ID] / 2, 2);
+ gpio_state2 =
+ fromString(new_gpio_state +
+ (number_of_pins[port_ID] / 2),
+ (number_of_pins[port_ID] / 2), 2);
}
- switch (settings->type)
- {
- case MODE:
- set_port_mode(port_ID, gpio_state);
+ switch (settings->type) {
+ case MODE:
+ set_port_mode(port_ID, gpio_state);
break;
- case VALUE:
- write_on_port(port_ID, gpio_state);
+ case VALUE:
+ write_on_port(port_ID, gpio_state);
break;
- case DIRECTION:
- set_port_dir(port_ID, gpio_state);
+ case DIRECTION:
+ set_port_dir(port_ID, gpio_state);
break;
- case PULL_UP:
- set_port_pullup(port_ID, gpio_state);
+ case PULL_UP:
+ set_port_pullup(port_ID, gpio_state);
break;
- case INTERRUPT:
- shadows_irq_h[port_ID] = gpio_state;
- shadows_irq_l[port_ID] = gpio_state2;
+ case INTERRUPT:
+ shadows_irq_h[port_ID] = gpio_state;
+ shadows_irq_l[port_ID] = gpio_state2;
break;
- default:
- printk("%s: unknown setting\n", __FUNCTION__);
+ default:
+ printk("%s: unknown setting\n", __FUNCTION__);
break;
}
if (settings->type != INTERRUPT) {
pr_debug("/proc wrote 0x%x", gpio_state);
} else {
- pr_debug("/proc wrote 0x%x 0x%x", gpio_state, gpio_state2);
+ pr_debug("/proc wrote 0x%x 0x%x", gpio_state,
+ gpio_state2);
}
pr_debug(" on %s %s register\n", port_name[port_ID],
- port_setting_name[settings->type]);
+ port_setting_name[settings->type]);
}
up(&gpio_sema);
/* Makes as if we take all the data sent even if we can't handle more
- than register size */
+ than register size */
return count;
}
-
/* /proc registering helpers */
struct proc_config_entry {
struct proc_dir_entry *entry;
@@ -1157,21 +1227,28 @@ struct proc_config_entry {
int type;
};
-static int initialize_proc_entry( struct proc_config_entry *config )
+static int initialize_proc_entry(struct proc_config_entry *config)
{
int i;
for (i = 0; i < NB_PORTS; i++) {
- config[i].entry = create_proc_entry(config[i].name, S_IWUSR |S_IRUSR | S_IRGRP | S_IROTH, NULL);
+ config[i].entry =
+ create_proc_entry(config[i].name,
+ S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH,
+ NULL);
if (config[i].entry == NULL) {
- printk(KERN_ERR DRIVER_NAME ": Couldn't register %s. Terminating.\n", config[i].name);
+ printk(KERN_ERR DRIVER_NAME
+ ": Couldn't register %s. Terminating.\n",
+ config[i].name);
return -ENOMEM;
}
- config[i].entry->read_proc = armadeus_gpio_proc_read;
- config[i].entry->write_proc = armadeus_gpio_proc_write;
- config[i].entry->data = kmalloc(sizeof(struct gpio_settings), GFP_KERNEL);
- ((struct gpio_settings*) config[i].entry->data)->port = i;
- ((struct gpio_settings*) config[i].entry->data)->type = config[i].type;
+ config[i].entry->read_proc = armadeus_gpio_proc_read;
+ config[i].entry->write_proc = armadeus_gpio_proc_write;
+ config[i].entry->data =
+ kmalloc(sizeof(struct gpio_settings), GFP_KERNEL);
+ ((struct gpio_settings *)config[i].entry->data)->port = i;
+ ((struct gpio_settings *)config[i].entry->data)->type =
+ config[i].type;
}
return 0;
@@ -1192,7 +1269,8 @@ static int create_proc_entries(void)
/* Create proc file to handle GPIO values */
for (i = 0; i < NB_PORTS; i++) {
- sprintf(proc_config[i].name, "%s/%s", GPIO_PROC_DIRNAME, port_name[i]);
+ sprintf(proc_config[i].name, "%s/%s", GPIO_PROC_DIRNAME,
+ port_name[i]);
proc_config[i].type = VALUE;
}
@@ -1202,7 +1280,8 @@ static int create_proc_entries(void)
/* Create proc file to handle GPIO mode */
for (i = 0; i < NB_PORTS; i++) {
- sprintf(proc_config[i].name, "%s/%smode", GPIO_PROC_DIRNAME, port_name[i]);
+ sprintf(proc_config[i].name, "%s/%smode", GPIO_PROC_DIRNAME,
+ port_name[i]);
proc_config[i].type = MODE;
}
@@ -1212,7 +1291,8 @@ static int create_proc_entries(void)
/* Create proc file to handle GPIO direction settings */
for (i = 0; i < NB_PORTS; i++) {
- sprintf(proc_config[i].name, "%s/%sdir", GPIO_PROC_DIRNAME, port_name[i]);
+ sprintf(proc_config[i].name, "%s/%sdir", GPIO_PROC_DIRNAME,
+ port_name[i]);
proc_config[i].type = DIRECTION;
}
@@ -1222,7 +1302,8 @@ static int create_proc_entries(void)
/* Create proc file to handle GPIO interrupt settings */
for (i = 0; i < NB_PORTS; i++) {
- sprintf(proc_config[i].name, "%s/%sirq", GPIO_PROC_DIRNAME, port_name[i]);
+ sprintf(proc_config[i].name, "%s/%sirq", GPIO_PROC_DIRNAME,
+ port_name[i]);
proc_config[i].type = INTERRUPT;
}
@@ -1232,7 +1313,8 @@ static int create_proc_entries(void)
/* Create proc file to handle GPIO pullup settings */
for (i = 0; i < NB_PORTS; i++) {
- sprintf(proc_config[i].name, "%s/%spullup", GPIO_PROC_DIRNAME, port_name[i]);
+ sprintf(proc_config[i].name, "%s/%spullup", GPIO_PROC_DIRNAME,
+ port_name[i]);
proc_config[i].type = PULL_UP;
}
@@ -1254,35 +1336,40 @@ static void remove_proc_entries(void)
if (init_map & GPIO_PROC_FILE) {
printk(DRIVER_NAME " removing /proc/.../portX\n");
for (i = 0; i < NB_PORTS; i++) {
- sprintf(proc_name, "%s/%s", GPIO_PROC_DIRNAME, port_name[i]);
+ sprintf(proc_name, "%s/%s", GPIO_PROC_DIRNAME,
+ port_name[i]);
remove_proc_entry(proc_name, NULL);
}
}
if (init_map & SETTINGS_MODE_PROC_FILE) {
printk(DRIVER_NAME " removing /proc/.../portXmode\n");
for (i = 0; i < NB_PORTS; i++) {
- sprintf(proc_name, "%s/%smode", GPIO_PROC_DIRNAME, port_name[i]);
+ sprintf(proc_name, "%s/%smode", GPIO_PROC_DIRNAME,
+ port_name[i]);
remove_proc_entry(proc_name, NULL);
}
}
if (init_map & SETTINGS_PROC_FILE) {
printk(DRIVER_NAME " removing /proc/.../portXdir\n");
for (i = 0; i < NB_PORTS; i++) {
- sprintf(proc_name, "%s/%sdir", GPIO_PROC_DIRNAME, port_name[i]);
+ sprintf(proc_name, "%s/%sdir", GPIO_PROC_DIRNAME,
+ port_name[i]);
remove_proc_entry(proc_name, NULL);
}
}
if (init_map & SETTINGS_IRQ_PROC_FILE) {
printk(DRIVER_NAME " removing /proc/.../portXirq\n");
for (i = 0; i < NB_PORTS; i++) {
- sprintf(proc_name, "%s/%sirq", GPIO_PROC_DIRNAME, port_name[i]);
+ sprintf(proc_name, "%s/%sirq", GPIO_PROC_DIRNAME,
+ port_name[i]);
remove_proc_entry(proc_name, NULL);
}
}
if (init_map & SETTINGS_PULLUP_PROC_FILE) {
printk(DRIVER_NAME " removing /proc/.../portXpullup\n");
for (i = 0; i < NB_PORTS; i++) {
- sprintf(proc_name, "%s/%spullup", GPIO_PROC_DIRNAME, port_name[i]);
+ sprintf(proc_name, "%s/%spullup", GPIO_PROC_DIRNAME,
+ port_name[i]);
remove_proc_entry(proc_name, NULL);
}
}
@@ -1290,7 +1377,7 @@ static void remove_proc_entries(void)
remove_proc_entry(GPIO_PROC_DIRNAME, NULL);
}
-static void print_port_params(int port, int nb, int* params)
+static void print_port_params(int port, int nb, int *params)
{
int i;
@@ -1323,10 +1410,12 @@ static int __init armadeus_gpio_init(void)
/* Register the driver as character device by getting a major number */
result = register_chrdev(gpio_major, DRIVER_NAME, &gpio_fops);
if (result < 0) {
- printk(KERN_WARNING DRIVER_NAME ": can't get major %d\n", gpio_major);
+ printk(KERN_WARNING DRIVER_NAME ": can't get major %d\n",
+ gpio_major);
return result;
}
- if (gpio_major == 0) gpio_major = result; /* dynamic Major allocation */
+ if (gpio_major == 0)
+ gpio_major = result; /* dynamic Major allocation */
/* Creates /proc entries */
if ((result = create_proc_entries())) {
@@ -1390,10 +1479,8 @@ EXPORT_SYMBOL(gpioReadFromPort);
EXPORT_SYMBOL(gpioSetPortDir);
EXPORT_SYMBOL(gpioGetPortDir);
-
module_init(armadeus_gpio_init);
module_exit(armadeus_gpio_cleanup);
MODULE_AUTHOR("Julien Boibessot / Nicolas Colombain / Fabien Marteau");
MODULE_DESCRIPTION("Armadeus GPIOs driver");
MODULE_LICENSE("GPL");
-
diff --git a/target/linux/modules/gpio/core.h b/target/linux/modules/gpio/core.h
index cac9bbb..83f818e 100755
--- a/target/linux/modules/gpio/core.h
+++ b/target/linux/modules/gpio/core.h
@@ -40,19 +40,19 @@
#define GPIORDPULLUP _IOR(PP_IOCTL, 0xF6, int)
#define GPIOWRPULLUP _IOW(PP_IOCTL, 0xF7, int)
-#define GPIORDIRQMODE_H _IOR(PP_IOCTL, 0xF8, int) /* only for /dev/gpio/gpioX */
-#define GPIORDIRQMODE_L _IOR(PP_IOCTL, 0xF9, int) /* */
-#define GPIOWRIRQMODE_H _IOW(PP_IOCTL, 0xFA, int) /* */
-#define GPIOWRIRQMODE_L _IOW(PP_IOCTL, 0xFB, int) /* */
+#define GPIORDIRQMODE_H _IOR(PP_IOCTL, 0xF8, int) /* only for /dev/gpio/gpioX */
+#define GPIORDIRQMODE_L _IOR(PP_IOCTL, 0xF9, int) /* */
+#define GPIOWRIRQMODE_H _IOW(PP_IOCTL, 0xFA, int) /* */
+#define GPIOWRIRQMODE_L _IOW(PP_IOCTL, 0xFB, int) /* */
/* 2bits per pin for IRQ mode: 0 none, 1 rising, 2 falling, 3 both */
#define GPIORDISR _IOR(PP_IOCTL, 0xFC, int)
#define GPIOWRISR _IOW(PP_IOCTL, 0xFD, int)
-#define GPIORDIRQMODE _IOR(PP_IOCTL, 0xFE, int) /* only for /dev/gpio/PXx */
-#define GPIOWRIRQMODE _IOW(PP_IOCTL, 0xFF, int) /* */
+#define GPIORDIRQMODE _IOR(PP_IOCTL, 0xFE, int) /* only for /dev/gpio/PXx */
+#define GPIOWRIRQMODE _IOW(PP_IOCTL, 0xFF, int) /* */
/* Pretend we're PPDEV for IOCTL */
#include <linux/ppdev.h>
-#endif /* __CORE_GPIO_H__ */
+#endif /* __CORE_GPIO_H__ */
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-06-09 06:57: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 982adb8874d8c9ecfdc332cea3f303166b8b4a6d (commit)
via d610361b8dea6456eb5a2918f24e7dd57d37bd45 (commit)
via 1b7699ace49a01efaa6107e5d9b84e2f43a02f09 (commit)
via 10f29f40e7ae42e99127a29b4ea78e3b1f518a7d (commit)
from 0aec528c8888f3c4d08844ec329e22e2492bc157 (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 982adb8874d8c9ecfdc332cea3f303166b8b4a6d
Merge: d610361b8dea6456eb5a2918f24e7dd57d37bd45 0aec528c8888f3c4d08844ec329e22e2492bc157
Author: Fabien Marteau <fab...@ar...>
Date: Wed Jun 9 08:56:20 2010 +0200
merge
commit d610361b8dea6456eb5a2918f24e7dd57d37bd45
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jun 8 19:25:46 2010 +0200
[linux] Add pin management full capability on gpio driver module
commit 1b7699ace49a01efaa6107e5d9b84e2f43a02f09
Author: Fabien Marteau <fab...@ar...>
Date: Tue Jun 8 19:20:39 2010 +0200
[as_devices] Modify as_gpio to manage gpio pin independantly
commit 10f29f40e7ae42e99127a29b4ea78e3b1f518a7d
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jun 4 15:03:26 2010 +0200
[as_devices] deleting a debug message
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/gpio/core.c | 433 +++++++++++++++++++---------
target/linux/modules/gpio/core.h | 13 +-
target/packages/as_devices/c/as_gpio.c | 304 ++++++--------------
target/packages/as_devices/c/as_gpio.h | 59 +++--
target/packages/as_devices/python/Makefile | 2 +-
target/packages/as_devices/test_c.h | 96 ++-----
6 files changed, 444 insertions(+), 463 deletions(-)
diff --git a/target/linux/modules/gpio/core.c b/target/linux/modules/gpio/core.c
index 418789e..bb5ab83 100755
--- a/target/linux/modules/gpio/core.c
+++ b/target/linux/modules/gpio/core.c
@@ -1,9 +1,10 @@
/*
* Armadeus i.MXL/27 GPIO management driver
*
- * Copyright (C) 2006-2010 Julien Boibessot <jul...@ar...>
- * Nicolas Colombain <nic...@ar...>
- * Armadeus Project / Armadeus Systems
+ * Copyright (C) 2006-2008 Julien Boibessot <jul...@ar...>
+ * Nicolas Colombain <nic...@ar...>
+ * Fabien Marteau <fab...@ar...>
+ * Armadeus Project / Armadeus Systems
*
* Inspired by a lot of other GPIO management systems...
*
@@ -14,7 +15,7 @@
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
@@ -29,10 +30,10 @@
#include <linux/proc_fs.h>
#include <asm/io.h>
#include <asm/uaccess.h>
-#include <linux/interrupt.h> /* request_irq */
-#include <linux/irq.h> /* set_irq_type */
-#include <asm/gpio.h> /* imx_gpio_... */
-#include <linux/cdev.h> /* struct cdev */
+#include <linux/interrupt.h> /* request_irq */
+#include <linux/irq.h> /* set_irq_type */
+#include <asm/gpio.h> /* imx_gpio_... */
+#include <linux/cdev.h> /* struct cdev */
#include <mach/hardware.h>
#include <asm/mach/map.h>
#include <linux/poll.h>
@@ -46,31 +47,31 @@
#include "core.h" /* for ioctl defs */
-#define DRIVER_NAME "Armadeus GPIOs driver"
+#define DRIVER_NAME "Armadeus GPIOs driver"
#define DRIVER_VERSION "2.4"
/* By default, we use dynamic allocation of major numbers -> MAJOR = 0 */
#define GPIO_MAJOR 0
-#define GPIO_PROC_DIRNAME "driver/gpio"
+#define GPIO_PROC_DIRNAME "driver/gpio"
#define GPIO_PROC_FILE 1
-#define SETTINGS_PROC_FILE (1 << 3)
-#define SETTINGS_IRQ_PROC_FILE (1 << 4)
-#define SETTINGS_PULLUP_PROC_FILE (1 << 5)
-#define SETTINGS_MODE_PROC_FILE (1 << 6)
+#define SETTINGS_PROC_FILE (1 << 3)
+#define SETTINGS_IRQ_PROC_FILE (1 << 4)
+#define SETTINGS_PULLUP_PROC_FILE (1 << 5)
+#define SETTINGS_MODE_PROC_FILE (1 << 6)
#define MAX_NUMBER_OF_PINS 32
-#define PORT_A 0
-#define PORT_B 1
-#define PORT_C 2
-#define PORT_D 3
+#define PORT_A (0)
+#define PORT_B (1)
+#define PORT_C (2)
+#define PORT_D (3)
#ifdef CONFIG_ARCH_IMX
-#define NB_PORTS 4
+#define NB_PORTS (4)
#endif
#ifdef CONFIG_ARCH_MX2
-#define PORT_E 4
-#define PORT_F 5
-#define NB_PORTS 6
+#define PORT_E (4)
+#define PORT_F (5)
+#define NB_PORTS (6)
#endif
#define MAX_MINOR (255) /* Linux limitation */
@@ -242,15 +243,30 @@ static unsigned char get_irq_from_pin(int num_pin, int num_port)
shad = shadows_irq_h[num_port];
num_pin -= (portSize/2);
}
+ return (shad >> (2*num_pin))&0x03;
+}
+
+static void set_irq_for_pin(int pin_num, int port_num, int value)
+{
+ int portSize = number_of_pins[port_num];
+ int return_value;
- return shad >> (/*portSize-2-*/(2*num_pin))& 3;
+ if (pin_num < (portSize/2)) {
+ return_value = shadows_irq_l[port_num]&(~(0x03<<(pin_num*2)));
+ shadows_irq_l[port_num] |= (value&0x03) << (pin_num*2);
+ } else {
+ return_value =
+ shadows_irq_h[port_num]&(~(0x03 << (2*(pin_num - MAX_NUMBER_OF_PINS))));
+ shadows_irq_h[port_num] |= (value&0x03) << (2*(pin_num - MAX_NUMBER_OF_PINS));
+ }
}
+
/*
* Low level functions
*/
/* These masks are for restricting user access to configuration of some
- criticals GPIO pins used by Armadeus and not configurable */
+ * criticals GPIO pins used by Armadeus and not configurable */
#ifdef CONFIG_ARCH_IMX
static unsigned long PORT_MASK[]= { 0x0003FFFE, 0xF00FFF00, 0x0003E1F8, 0xFFFFFFFF };
#else
@@ -331,7 +347,7 @@ static void initialize_all_ports(void)
static void write_on_port(unsigned int aPort, unsigned int aValue)
{
- __raw_writel(aValue, VA_GPIO_BASE + MXC_DR(aPort));
+ __raw_writel(aValue & 0xFFFFFFFF, VA_GPIO_BASE + MXC_DR(aPort));
}
static unsigned int read_from_port(unsigned int aPort)
@@ -373,18 +389,18 @@ static unsigned int get_port_mode(unsigned int aPort)
int i;
int ocr1, ocr2, gius, value = 0;
- ocr1 = __raw_readl(VA_GPIO_BASE + MXC_OCR1(aPort));
- ocr2 = __raw_readl(VA_GPIO_BASE + MXC_OCR2(aPort));
+ ocr1 = __raw_readl(VA_GPIO_BASE + MXC_OCR1(aPort));
+ ocr2 = __raw_readl(VA_GPIO_BASE + MXC_OCR2(aPort));
gius = __raw_readl(VA_GPIO_BASE + MXC_GIUS(aPort));
/* pin is a GPIO if OCR == 3 AND GIUS == 1 */
for (i=0; i < number_of_pins[aPort]; i++) {
if (i < 16) {
- if (((ocr1>>(i*2)) & 3) == 3)
- value = value | (1<<i);
- } else {
- if (((ocr2>>((i-16)*2)) & 3) == 3)
+ if (((ocr1>>(i*2)) & 3) == 3)
+ value = value | (1<<i);
+ } else {
+ if (((ocr2>>((i-16)*2)) & 3) == 3)
value = value | (1<<i);
- }
+ }
}
value = value & gius;
@@ -560,7 +576,7 @@ static int armadeus_gpio_dev_open(struct inode *inode, struct file *file)
gpio = kzalloc(sizeof(struct gpio_item), GFP_KERNEL);
if (!gpio)
- goto err_request;
+ goto err_kzalloc;
file->private_data = gpio;
spin_lock_init(&gpio->lock);
@@ -577,7 +593,7 @@ static int armadeus_gpio_dev_open(struct inode *inode, struct file *file)
case FULL_PORTF_MINOR:
#endif
gpio->nb_pins = 32;
- gpio->changed = 1;
+ gpio->changed = 0;
gpio->port = FULL_MINOR_TO_PORT(minor);
pr_debug("Reserving full %s\n", port_name[gpio->port]);
goto success;
@@ -586,11 +602,11 @@ static int armadeus_gpio_dev_open(struct inode *inode, struct file *file)
/* Pin by pin access */
gpio->nb_pins = 1;
- gpio->changed = 1;
+ gpio->changed = 0;
if ((ret = gpio_request(minor, "gpio-dev"))) {
printk("GPIO %i is already in use\n", minor);
- goto err_request;
+ goto err_gpio_request;
}
gpio->port = minor >> GPIO_PORT_SHIFT;
@@ -614,7 +630,8 @@ static int armadeus_gpio_dev_open(struct inode *inode, struct file *file)
goto err_irq;
switch (gpio->irq_value) {
case (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING):
- ;
+ set_irq_type(irq, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING);
+ break ;
case IRQF_TRIGGER_RISING:
set_irq_type(irq, IRQF_TRIGGER_RISING);
break;
@@ -631,11 +648,13 @@ success:
gpio->initialized = 1;
return 0;
+ free_irq(irq, gpio);
err_irq:
printk("%s error while requesting irq %d\n", __FUNCTION__, irq);
- free_irq(irq, gpio);
-err_request:
+ gpio_free(minor);
+err_gpio_request:
kfree(gpio);
+err_kzalloc:
/* what about spinlock & wait_queue ?? */
return ret;
}
@@ -662,21 +681,25 @@ static int armadeus_gpio_dev_release(struct inode *inode, struct file *file)
/* Handling of IOCTL calls */
int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg)
+ unsigned int cmd, unsigned long arg)
{
int err = 0, ret = 0, value = 0;
+ unsigned int return_value;
+ unsigned int port_num, pin_num;
unsigned int minor;
+ unsigned int irq;
+ struct gpio_item *gpio = filp->private_data;
pr_debug(DRIVER_NAME " ## IOCTL received: (0x%x) ##\n", cmd);
/* Extract the type and number bitfields, and don't decode wrong cmds:
- return ENOTTY (inappropriate ioctl) before access_ok() */
+ * return ENOTTY (inappropriate ioctl) before access_ok() */
if (_IOC_TYPE(cmd) != PP_IOCTL)
return -ENOTTY;
/* The direction is a bitmask, and VERIFY_WRITE catches R/W transfers.
- `Type' is user-oriented, while access_ok is kernel-oriented,
- so the concept of "read" and "write" is reversed */
+ * `Type' is user-oriented, while access_ok is kernel-oriented,
+ * so the concept of "read" and "write" is reversed */
if (_IOC_DIR(cmd) & _IOC_READ)
err = !access_ok(VERIFY_WRITE, (void *)arg, _IOC_SIZE(cmd));
else if (_IOC_DIR(cmd) & _IOC_WRITE)
@@ -696,106 +719,234 @@ int armadeus_gpio_dev_ioctl(struct inode *inode, struct file *filp,
#else
if (minor < FULL_PORTD_MINOR) {
#endif
- printk("IOCTLs are only available on 'full port' minors !\n");
- ret = -EFAULT;
- goto out;
- }
+ port_num= (unsigned int)(minor/MAX_NUMBER_OF_PINS);
+ pin_num = (unsigned int)(minor%MAX_NUMBER_OF_PINS);
- switch (cmd) {
+ /* ioctl for /dev/gpio/PXx */
+ switch(cmd)
+ {
case GPIORDDIRECTION:
- value = get_port_dir(MAX_MINOR - minor);
- ret = __put_user(value, (unsigned int *)arg);
- break;
+ value = get_port_dir(port_num);
+ return_value = (((value & (1<<pin_num))!=0)?1:0);
+ ret = __put_user(return_value, (unsigned int *)arg);
+ break;
case GPIOWRDIRECTION:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- set_port_dir(MAX_MINOR - minor, value);
- }
- break;
+ ret = __get_user(value, (unsigned int *)arg);
+ return_value = get_port_dir(port_num);
+ if (value != 0)
+ set_port_dir(port_num, return_value | (1<<pin_num));
+ else
+ set_port_dir(port_num, return_value & (~(1<<pin_num)));
+ break;
case GPIORDDATA:
- value = read_from_port(MAX_MINOR - minor);
- ret = __put_user(value, (unsigned int *)arg);
- break;
+ value = read_from_port(port_num);
+ return_value = (((value & (1<<pin_num))!=0)?1:0);
+ ret = __put_user(return_value, (unsigned int *)arg);
+ break;
case GPIOWRDATA:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- write_on_port(MAX_MINOR - minor, value);
- }
- break;
+ ret = __get_user(value, (unsigned int *)arg);
+ return_value = __raw_readl(VA_GPIO_BASE + MXC_DR(port_num));
+ if (value != 0)
+ {
+ write_on_port(port_num, return_value | (1<<pin_num));
+ }
+ else
+ {
+ write_on_port(port_num, return_value & (~(1<<pin_num)));
+ }
+ break;
case GPIORDMODE:
- value = get_port_mode(MAX_MINOR - minor);
- ret = __put_user(value, (unsigned int *)arg);
- break;
+ value = get_port_mode(port_num);
+ return_value = (((value & (1<<pin_num))!=0)?1:0);
+ ret = __put_user(return_value, (unsigned int *)arg);
+ break;
case GPIOWRMODE:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- set_port_mode(MAX_MINOR - minor, value);
- }
- break;
-
- case GPIORDIRQMODE_H:
- value = shadows_irq_h[MAX_MINOR - minor];
- ret = __put_user(value, (unsigned int *)arg);
- break;
-
- case GPIORDIRQMODE_L:
- value = shadows_irq_l[MAX_MINOR - minor];
- ret = __put_user(value, (unsigned int *)arg);
- break;
-
- case GPIOWRIRQMODE_H:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- shadows_irq_h[MAX_MINOR - minor] = value;
- }
- break;
+ ret = __get_user(value, (unsigned int *)arg);
+ return_value = get_port_mode(port_num);
+ if (value != 0)
+ set_port_mode(port_num, return_value | (1<<pin_num));
+ else
+ set_port_mode(port_num, return_value & (~(1<<pin_num)));
+ break;
- case GPIOWRIRQMODE_L:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- shadows_irq_l[MAX_MINOR - minor] = value;
- }
- break;
+ case GPIORDIRQMODE:
+ ret = __put_user(get_irq_from_pin(pin_num, port_num), (unsigned int *)arg);
+ break;
+ case GPIOWRIRQMODE:
+ ret = __get_user(value, (unsigned int *)arg);
+ value &= 0x03;
+ if (ret == 0) {
+ set_irq_for_pin(pin_num, port_num, value);
+ }
+ irq = IRQ_GPIOA(minor); /* irq number are continuous */
+ if (value != IRQF_TRIGGER_NONE) {
+ if (gpio->irq_value == IRQF_TRIGGER_NONE)
+ {
+ ret = request_irq(irq, armadeus_gpio_interrupt, 0, "gpio", gpio);
+ if (ret)
+ {
+ printk(KERN_ERR "GPIO TODO: manage request_irq error\n");
+ }
+ }
+ gpio->irq_value = value;
+ switch (gpio->irq_value) {
+ case (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING):
+ set_irq_type(irq, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING);
+ break ;
+ case IRQF_TRIGGER_RISING:
+ set_irq_type(irq, IRQF_TRIGGER_RISING);
+ break;
+ case IRQF_TRIGGER_FALLING:
+ set_irq_type(irq, IRQF_TRIGGER_FALLING);
+ break;
+ case IRQF_TRIGGER_NONE:
+ break;
+ }
+ } else {
+ if (gpio->irq_value != IRQF_TRIGGER_NONE){
+ free_irq(irq, gpio);
+ }
+ gpio->irq_value = IRQF_TRIGGER_NONE;
+ }
+ break;
case GPIORDPULLUP:
- value = get_port_pull_up(MAX_MINOR - minor);
- ret = __put_user(value, (unsigned int *)arg);
- break;
+ value = get_port_pull_up(port_num);
+ return_value = (((value & (1<<pin_num))!=0)?1:0);
+ ret = __put_user(return_value, (unsigned int *)arg);
+ break;
case GPIOWRPULLUP:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- set_port_pullup(MAX_MINOR - minor, value);
- }
- break;
+ ret = __get_user(value, (unsigned int *)arg);
+ return_value = get_port_pull_up(port_num);
+ if (value != 0)
+ set_port_pullup(port_num, return_value | (1<<pin_num));
+ else
+ set_port_pullup(port_num, return_value & (~(1<<pin_num)));
+ break;
case GPIORDISR:
- value = get_port_isr(MAX_MINOR - minor);
- ret = __put_user(value, (unsigned int *)arg);
- break;
+ value = get_port_isr(port_num);
+ return_value = (((value & (1<<pin_num))!=0)?1:0);
+ ret = __put_user(return_value, (unsigned int *)arg);
+ break;
case GPIOWRISR:
- ret = __get_user(value, (unsigned int *)arg);
- if (ret == 0) {
- set_port_isr(MAX_MINOR - minor, value);
- }
- break;
+ ret = __get_user(value, (unsigned int *)arg);
+ return_value = get_port_isr(port_num);
+ if (value != 0)
+ set_port_isr(port_num, return_value | (1<<pin_num));
+ else
+ set_port_isr(port_num, return_value & (~(1<<pin_num)));
+
+ break;
default:
- printk("IOCTL not supported\n");
- ret = -ENOTTY;
- break;
- }
-out:
- /* Release exclusive access */
- up(&gpio_sema);
+ printk("IOCTL not supported\n");
+ ret = -ENOTTY;
+ break;
+ }
+ } else switch (cmd) {
- return ret;
+ case GPIORDDIRECTION:
+ value = get_port_dir(MAX_MINOR - minor);
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
+
+ case GPIOWRDIRECTION:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ set_port_dir(MAX_MINOR - minor, value);
+ }
+ break;
+
+ case GPIORDDATA:
+ value = read_from_port(MAX_MINOR - minor);
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
+
+ case GPIOWRDATA:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ write_on_port(MAX_MINOR - minor, value);
+ }
+ break;
+
+ case GPIORDMODE:
+ value = get_port_mode(MAX_MINOR - minor);
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
+
+ case GPIOWRMODE:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ set_port_mode(MAX_MINOR - minor, value);
+ }
+ break;
+
+ case GPIORDIRQMODE_H:
+ value= shadows_irq_h[MAX_MINOR - minor];
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
+
+ case GPIORDIRQMODE_L:
+ value = shadows_irq_l[MAX_MINOR - minor];
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
+
+ case GPIOWRIRQMODE_H:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ shadows_irq_h[MAX_MINOR - minor] = value;
+ }
+ break;
+
+ case GPIOWRIRQMODE_L:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ shadows_irq_l[MAX_MINOR - minor] = value;
+ }
+ break;
+
+ case GPIORDPULLUP:
+ value = get_port_pull_up(MAX_MINOR - minor);
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
+
+ case GPIOWRPULLUP:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ set_port_pullup(MAX_MINOR - minor, value);
+ }
+ break;
+
+ case GPIORDISR:
+ value = get_port_isr(MAX_MINOR - minor);
+ ret = __put_user(value, (unsigned int *)arg);
+ break;
+
+ case GPIOWRISR:
+ ret = __get_user(value, (unsigned int *)arg);
+ if (ret == 0) {
+ set_port_isr(MAX_MINOR - minor, value);
+ }
+ break;
+
+ default:
+ printk("IOCTL not supported\n");
+ ret = -ENOTTY;
+ break;
+ }
+
+ /* Release exclusive access */
+ up(&gpio_sema);
+
+ return ret;
}
static int armadeus_gpio_dev_fasync(int fd, struct file* filp, int on)
@@ -813,7 +964,8 @@ static unsigned int armadeus_gpio_dev_poll(struct file *filp, poll_table *wait)
spin_lock_irq(&gpio->lock);
poll_wait(filp, &gpio->change_wq, wait);
- if (gpio->changed) {
+ if (gpio->changed)
+ {
mask |= (POLLIN | POLLRDNORM);
}
@@ -823,18 +975,17 @@ static unsigned int armadeus_gpio_dev_poll(struct file *filp, poll_table *wait)
}
static struct file_operations gpio_fops = {
- .owner = THIS_MODULE,
- .llseek = no_llseek,
- .write = armadeus_gpio_dev_write,
- .read = armadeus_gpio_dev_read,
- .open = armadeus_gpio_dev_open,
- .release = armadeus_gpio_dev_release,
- .ioctl = armadeus_gpio_dev_ioctl,
- .fasync = armadeus_gpio_dev_fasync,
- .poll = armadeus_gpio_dev_poll,
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .write = armadeus_gpio_dev_write,
+ .read = armadeus_gpio_dev_read,
+ .open = armadeus_gpio_dev_open,
+ .release = armadeus_gpio_dev_release,
+ .ioctl = armadeus_gpio_dev_ioctl,
+ .fasync = armadeus_gpio_dev_fasync,
+ .poll = armadeus_gpio_dev_poll,
};
-
/*
* PROC file functions
*/
@@ -852,10 +1003,10 @@ static int armadeus_gpio_proc_read(char *buffer, char **start, off_t offset,
}
/* We give all of our information in one go, so if the user asks us if we
- have more information the answer should always be no. This is important
- because the standard read function from the library would continue to
- issue the read system call until the kernel replies that it has no more
- information, or until its buffer is filled
+ * have more information the answer should always be no. This is important
+ * because the standard read function from the library would continue to
+ * issue the read system call until the kernel replies that it has no more
+ * information, or until its buffer is filled
*/
if (offset > 0 || buffer_length < (number_of_pins[port_ID]+2))
return 0;
@@ -914,7 +1065,7 @@ static char new_gpio_state[MAX_NUMBER_OF_PINS*2];
static int armadeus_gpio_proc_write(__attribute__ ((unused)) struct file *file, const char *buf, unsigned long count, __attribute__ ((unused)) void* data)
{
int len;
- unsigned int gpio_state=0, gpio_state2=0;
+ unsigned int gpio_state=0, gpio_state2=0;
unsigned int port_ID = 0;
struct gpio_settings *settings = (struct gpio_settings *) data;
@@ -950,7 +1101,7 @@ static int armadeus_gpio_proc_write(__attribute__ ((unused)) struct file *file,
if (settings->type != INTERRUPT) {
gpio_state = fromString(new_gpio_state, number_of_pins[port_ID], 1);
} else {
- gpio_state = fromString(new_gpio_state, number_of_pins[port_ID]/2, 2);
+ gpio_state = fromString(new_gpio_state, number_of_pins[port_ID]/2, 2);
gpio_state2 = fromString(new_gpio_state+(number_of_pins[port_ID]/2), (number_of_pins[port_ID]/2), 2);
}
@@ -1016,9 +1167,9 @@ static int initialize_proc_entry( struct proc_config_entry *config )
printk(KERN_ERR DRIVER_NAME ": Couldn't register %s. Terminating.\n", config[i].name);
return -ENOMEM;
}
- config[i].entry->read_proc = armadeus_gpio_proc_read;
- config[i].entry->write_proc = armadeus_gpio_proc_write;
- config[i].entry->data = kmalloc(sizeof(struct gpio_settings), GFP_KERNEL);
+ config[i].entry->read_proc = armadeus_gpio_proc_read;
+ config[i].entry->write_proc = armadeus_gpio_proc_write;
+ config[i].entry->data = kmalloc(sizeof(struct gpio_settings), GFP_KERNEL);
((struct gpio_settings*) config[i].entry->data)->port = i;
((struct gpio_settings*) config[i].entry->data)->type = config[i].type;
}
@@ -1143,7 +1294,7 @@ static void print_port_params(int port, int nb, int* params)
{
int i;
- printk(" %s Parameters (%i): ", port_name[port], nb);
+ printk(" %s Parameters (%i): ", port_name[port], nb);
for (i = 0; i < NB_CONFIG_REGS; i++) {
printk(" 0x%x", params[i]);
}
@@ -1242,7 +1393,7 @@ EXPORT_SYMBOL(gpioGetPortDir);
module_init(armadeus_gpio_init);
module_exit(armadeus_gpio_cleanup);
-MODULE_AUTHOR("Julien Boibessot / Nicolas Colombain");
+MODULE_AUTHOR("Julien Boibessot / Nicolas Colombain / Fabien Marteau");
MODULE_DESCRIPTION("Armadeus GPIOs driver");
MODULE_LICENSE("GPL");
diff --git a/target/linux/modules/gpio/core.h b/target/linux/modules/gpio/core.h
index d452f46..cac9bbb 100755
--- a/target/linux/modules/gpio/core.h
+++ b/target/linux/modules/gpio/core.h
@@ -26,7 +26,6 @@
#ifndef __CORE_GPIO_H__
#define __CORE_GPIO_H__
-
/* IOCTL */
/* direction: 1 output, 0 input */
#define GPIORDDIRECTION _IOR(PP_IOCTL, 0xF0, int)
@@ -40,15 +39,19 @@
#define GPIORDPULLUP _IOR(PP_IOCTL, 0xF6, int)
#define GPIOWRPULLUP _IOW(PP_IOCTL, 0xF7, int)
+
+#define GPIORDIRQMODE_H _IOR(PP_IOCTL, 0xF8, int) /* only for /dev/gpio/gpioX */
+#define GPIORDIRQMODE_L _IOR(PP_IOCTL, 0xF9, int) /* */
+#define GPIOWRIRQMODE_H _IOW(PP_IOCTL, 0xFA, int) /* */
+#define GPIOWRIRQMODE_L _IOW(PP_IOCTL, 0xFB, int) /* */
/* 2bits per pin for IRQ mode: 0 none, 1 rising, 2 falling, 3 both */
-#define GPIORDIRQMODE_H _IOR(PP_IOCTL, 0xF8, int)
-#define GPIORDIRQMODE_L _IOR(PP_IOCTL, 0xF9, int)
-#define GPIOWRIRQMODE_H _IOW(PP_IOCTL, 0xFA, int)
-#define GPIOWRIRQMODE_L _IOW(PP_IOCTL, 0xFB, int)
#define GPIORDISR _IOR(PP_IOCTL, 0xFC, int)
#define GPIOWRISR _IOW(PP_IOCTL, 0xFD, int)
+#define GPIORDIRQMODE _IOR(PP_IOCTL, 0xFE, int) /* only for /dev/gpio/PXx */
+#define GPIOWRIRQMODE _IOW(PP_IOCTL, 0xFF, int) /* */
+
/* Pretend we're PPDEV for IOCTL */
#include <linux/ppdev.h>
diff --git a/target/packages/as_devices/c/as_gpio.c b/target/packages/as_devices/c/as_gpio.c
index eef3f1e..8d6741d 100644
--- a/target/packages/as_devices/c/as_gpio.c
+++ b/target/packages/as_devices/c/as_gpio.c
@@ -49,7 +49,9 @@
#define GPIORDISR _IOR(PP_IOCTL, 0xFC, int)
#define GPIOWRISR _IOW(PP_IOCTL, 0xFD, int)
-#define GPIO_BASE_PORT ("/dev/gpio/port")
+#define GPIORDIRQMODE _IOR(PP_IOCTL, 0xFE, int)
+#define GPIOWRIRQMODE _IOW(PP_IOCTL, 0xFF, int)
+
#define GPIO_BASE_PIN ("/dev/gpio/P")
#define BUFF_SIZE (300)
@@ -71,118 +73,107 @@
/*------------------------------------------------------------------------------*/
-struct as_gpio_device *as_gpio_open(char aPortChar)
+struct as_gpio_device *as_gpio_open(char aPortChar, int aPinNum)
{
struct as_gpio_device *dev;
char gpio_file_path[50];
int ret=0;
- int i;
+ int file;
+ int value;
if (((aPortChar-'A') > (NUMBER_OF_PORTS-1)) || ((aPortChar-'A') < 0))
{
ERROR("No port named %c\n",aPortChar);
- return NULL;
+ goto letter_error;
}
/* make gpio port string path */
- ret = snprintf(gpio_file_path,50, "%s%c",
- GPIO_BASE_PORT, aPortChar);
+ ret = snprintf(gpio_file_path,50, "%s%c%d",
+ GPIO_BASE_PIN, aPortChar, aPinNum);
if (ret < 0) {
- ERROR("Can't forge gpio port path\n");
- return NULL;
+ ERROR("Can't forge gpio pin port path\n");
+ goto path_error;
}
/* opening gpio port */
- ret = open(gpio_file_path, O_RDWR);
- if (ret < 0) {
- ERROR("Can't open file port\n");
- return NULL;
+ file = open(gpio_file_path, O_RDWR);
+ if (file < 0) {
+ ERROR("Can't open file pin port\n");
+ goto open_file_error;
}
dev = (struct as_gpio_device *)malloc(sizeof(struct as_gpio_device));
if (dev == NULL)
{
ERROR("Can't allocate memory for gpio device structure\n");
- return NULL;
+ goto malloc_error;
}
dev->port_letter = aPortChar;
- dev->fdev = ret;
- for(i=0; i < PORT_SIZE; i++)
+ dev->fpin = file;
+ dev->pin_num = aPinNum;
+
+ value = 1;
+ ret = ioctl(dev->fpin, GPIOWRMODE, &value); /* set pin on gpio mode */
+ if (ret < 0)
{
- dev->fpin[i] = -1;
- dev->irq_mode[i] = GPIO_IRQ_MODE_NOINT;
+ ERROR("can't set pin in gpio mode.\n");
+ goto mode_error;
}
return dev;
+
+mode_error:
+ free(dev);
+malloc_error:
+ close(file);
+open_file_error:
+path_error:
+letter_error:
+ return NULL;
}
/*------------------------------------------------------------------------------*/
-int32_t as_gpio_set_pin_direction(struct as_gpio_device *aDev,
- int aPinNum,
- int aDirection)
+int32_t as_gpio_set_pin_direction(struct as_gpio_device *aDev, int aDirection)
{
int ret=0;
int portval;
- /* Set PIN as GPIO; read/modify/write */
- ret = ioctl(aDev->fdev, GPIORDMODE, &portval);
- if (ret < 0) {
- ERROR("Can't set gpio read mode\n");
- return ret;
- }
+ portval = (aDirection != 0)?1:0;
- portval |= (1 << aPinNum);
-
- ret = ioctl(aDev->fdev, GPIOWRMODE, &portval);
+ ret = ioctl(aDev->fpin, GPIOWRDIRECTION, &portval);
if (ret < 0) {
- ERROR("Can't set gpio write mode\n");
+ ERROR("Can't set gpio direction\n");
return ret;
}
+ return 0;
+}
- /* set direction */
- ret = ioctl(aDev->fdev, GPIORDDIRECTION, &portval);
- if (ret < 0) {
- ERROR("Can't get gpio direction\n");
- return ret;
- }
+/*------------------------------------------------------------------------------*/
- if (aDirection == 0) {
- portval &= ~(1 << aPinNum);
- } else {
- portval |= (1 << aPinNum);
- }
+int32_t as_gpio_get_pin_direction(struct as_gpio_device *aDev)
+{
+ int ret=0;
+ int portval;
- ret = ioctl(aDev->fdev, GPIOWRDIRECTION, &portval);
+ ret = ioctl(aDev->fpin, GPIORDDIRECTION, &portval);
if (ret < 0) {
ERROR("Can't get gpio direction\n");
return ret;
}
- return 0;
+ return ((portval !=0)?1:0);
}
/*------------------------------------------------------------------------------*/
-int32_t as_gpio_set_pin_value(struct as_gpio_device *aDev,
- int aPinNum,
- int aValue)
+int32_t as_gpio_set_pin_value(struct as_gpio_device *aDev, int aValue)
{
int ret=0;
int portval;
- ret = ioctl(aDev->fdev, GPIORDDATA, &portval);
- if (ret < 0) {
- ERROR("Can't read gpio data\n");
- return ret;
- }
-
- if (aValue == 0) {
- portval &= ~(1 << aPinNum);
- } else {
- portval |= (1 << aPinNum);
- }
- ret = ioctl(aDev->fdev, GPIOWRDATA, &portval);
+ portval = (aValue != 0)?1:0;
+ ret = ioctl(aDev->fpin, GPIOWRDATA, &portval);
if (ret < 0) {
ERROR("Can't write gpio data\n");
return ret;
@@ -193,19 +184,18 @@ int32_t as_gpio_set_pin_value(struct as_gpio_device *aDev,
/*------------------------------------------------------------------------------*/
-int32_t as_gpio_get_pin_value(struct as_gpio_device *aDev,
- int aPinNum)
+int32_t as_gpio_get_pin_value(struct as_gpio_device *aDev)
{
int ret=0;
int portval;
-
- ret = ioctl(aDev->fdev, GPIORDDATA, &portval);
+
+ ret = ioctl(aDev->fpin, GPIORDDATA, &portval);
if (ret < 0) {
ERROR("Can't read gpio data\n");
return ret;
}
- if ((portval & (1<<aPinNum)) != 0) {
+ if (portval != 0) {
return 1;
} else {
return 0;
@@ -215,7 +205,6 @@ int32_t as_gpio_get_pin_value(struct as_gpio_device *aDev,
/*------------------------------------------------------------------------------*/
int32_t as_gpio_blocking_get_pin_value(struct as_gpio_device *aDev,
- int aPinNum,
int aDelay_s,
int aDelay_us)
{
@@ -227,35 +216,23 @@ int32_t as_gpio_blocking_get_pin_value(struct as_gpio_device *aDev,
int retval;
- if (aPinNum >= PORT_SIZE )
- {
- ERROR("Pin num %d upper than port size (%d)\n", aPinNum, PORT_SIZE);
- return -1;
- }
- if (aPinNum < 0 )
- {
- ERROR("Wrong pin number %d\n",aPinNum);
- return -1;
- }
-
- if (aDev->fpin[aPinNum] == -1)
+ if (as_gpio_get_irq_mode(aDev) == GPIO_IRQ_MODE_NOINT)
{
ERROR("irq must be configured before\n");
return -1;
}
FD_ZERO(&rfds);
- FD_SET(aDev->fpin[aPinNum], &rfds);
+ FD_SET(aDev->fpin, &rfds);
tv.tv_sec = aDelay_s;
tv.tv_usec = aDelay_us;
/* flush the file */
- retval = select(aDev->fpin[aPinNum]+1, &rfds, NULL, NULL, &tv);
+ retval = select(aDev->fpin+1, &rfds, NULL, NULL, &tv);
if (retval > 0)
{
- printf("DEBUG: read value\n");
- ret = read(aDev->fpin[aPinNum], &value, 1);
+ ret = read(aDev->fpin, &value, 1);
if (ret < 0)
{
ERROR("Can't read pin value\n");
@@ -269,24 +246,22 @@ int32_t as_gpio_blocking_get_pin_value(struct as_gpio_device *aDev,
} else {
return -1;
}
-
}
/*------------------------------------------------------------------------------*/
-int32_t as_gpio_get_pullup_value(struct as_gpio_device *aDev,
- int aPinNum)
+int32_t as_gpio_get_pullup_value(struct as_gpio_device *aDev)
{
int ret=0;
int portval;
- ret = ioctl(aDev->fdev, GPIORDPULLUP, &portval);
+ ret = ioctl(aDev->fpin, GPIORDPULLUP, &portval);
if (ret < 0) {
ERROR("can't get pullup value\n");
return ret;
}
- if ((portval & (1<<aPinNum)) != 0) {
+ if (portval != 0) {
return 1;
} else {
return 0;
@@ -296,25 +271,14 @@ int32_t as_gpio_get_pullup_value(struct as_gpio_device *aDev,
/*------------------------------------------------------------------------------*/
-int32_t as_gpio_set_pullup_value(struct as_gpio_device *aDev,
- int aPinNum,
- int aValue)
+int32_t as_gpio_set_pullup_value(struct as_gpio_device *aDev, int aValue)
{
int ret=0;
int portval;
- ret = ioctl(aDev->fdev, GPIORDPULLUP, &portval);
- if (ret < 0) {
- ERROR("Can't get pullup value\n");
- return ret;
- }
+ portval = (aValue != 0)?1:0;
- if (aValue == 0) {
- portval &= ~(1 << aPinNum);
- } else {
- portval |= (1 << aPinNum);
- }
- ret = ioctl(aDev->fdev, GPIOWRPULLUP, &portval);
+ ret = ioctl(aDev->fpin, GPIOWRPULLUP, &portval);
if (ret < 0) {
ERROR("Can't set pullup value\n");
return ret;
@@ -325,49 +289,23 @@ int32_t as_gpio_set_pullup_value(struct as_gpio_device *aDev,
/*------------------------------------------------------------------------------*/
-int32_t as_gpio_get_irq_mode(struct as_gpio_device *aDev,
- int aPinNum)
+int32_t as_gpio_get_irq_mode(struct as_gpio_device *aDev)
{
int ret=0;
int portval;
- /* check pin num */
- if (aPinNum >= PORT_SIZE)
- {
- ERROR("Pin num %d upper than port size (%d)\n", aPinNum, PORT_SIZE);
- return -1;
+ ret = ioctl(aDev->fpin, GPIORDIRQMODE, &portval);
+ if (ret < 0) {
+ ERROR("Can't read irq mode\n");
+ return ret;
}
- if (aPinNum < PORT_SIZE/2)
- {
-
- ret = ioctl(aDev->fdev, GPIORDIRQMODE_L, &portval);
- if (ret < 0) {
- ERROR("Can't read irq mode L\n");
- return ret;
- }
-
- portval &= (3 << (aPinNum * 2));
- return portval >> (aPinNum * 2);
-
- } else {
-
- ret = ioctl(aDev->fdev, GPIORDIRQMODE_H, &portval);
- if (ret < 0) {
- ERROR("Can't read irq mode H\n");
- return ret;
- }
-
- portval &= (3 << ((aPinNum - (PORT_SIZE/2)) * 2));
- return portval >> ((aPinNum - (PORT_SIZE/2)) * 2);
- }
+ return portval;
}
/*------------------------------------------------------------------------------*/
-int32_t as_gpio_set_irq_mode(struct as_gpio_device *aDev,
- int aPinNum,
- int aMode)
+int32_t as_gpio_set_irq_mode(struct as_gpio_device *aDev, int aMode)
{
int ret=0;
int portval;
@@ -377,100 +315,26 @@ int32_t as_gpio_set_irq_mode(struct as_gpio_device *aDev,
struct timeval tv;
int retval;
+ portval = aMode;
- /* check mode value */
- if (aMode > 3)
- {
- ERROR("Wrong mode value %d\n",aMode);
- return -1;
- }
-
- /* check pin num */
- if (aPinNum >= PORT_SIZE)
- {
- ERROR("Pin num %d upper than port size (%d)\n", aPinNum, PORT_SIZE);
- return -2;
- }
-
- /* close fpin file */
- if (aDev->fpin[aPinNum] != -1)
- {
- close(aDev->fpin[aPinNum]);
- aDev->fpin[aPinNum] = -1;
- }
-
- if (aPinNum < PORT_SIZE/2)
- {
- ret = ioctl(aDev->fdev, GPIORDIRQMODE_L, &portval);
- if (ret < 0) {
- ERROR("Can't read irq mode L\n");
- return ret;
- }
-
- portval &= ~(3 << (aPinNum * 2));
- portval |= (aMode << (aPinNum * 2));
-
- ret = ioctl(aDev->fdev, GPIOWRIRQMODE_L, &portval);
- if (ret < 0) {
- ERROR("Can't write irq mode L\n");
- return ret;
- }
-
- } else {
-
- ret = ioctl(aDev->fdev, GPIORDIRQMODE_H, &portval);
- if (ret < 0) {
- ERROR("Can't read irq mode H\n");
- return ret;
- }
-
- portval &= ~(3 << ((aPinNum - (PORT_SIZE/2)) * 2));
- portval |= (aMode << ((aPinNum - (PORT_SIZE/2)) * 2));
-
- ret = ioctl(aDev->fdev, GPIOWRIRQMODE_H, &portval);
- if (ret < 0) {
- ERROR("Can't write irq mode H\n");
- return ret;
- }
- }
-
- if ((aMode != GPIO_IRQ_MODE_NOINT) && (aDev->fpin[aPinNum] == -1))
- {
- /* open fpin file */
- ret = snprintf(buffer, BUFF_SIZE, "%s%c%d",
- GPIO_BASE_PIN, aDev->port_letter, aPinNum);
- if (ret < 0)
- {
- ERROR("Can't forge fpin path\n");
- return ret;
- }
-
- ret = open(buffer, O_RDONLY);
- if (ret < 0)
- {
- ERROR("Can't open %s\n",buffer);
- return ret;
- }
- aDev->fpin[aPinNum] = ret;
-
+ ret = ioctl(aDev->fpin, GPIOWRIRQMODE, &portval);
+ if (ret < 0) {
+ ERROR("Can't write irq mode L\n");
+ return ret;
}
-
FD_ZERO(&rfds);
- FD_SET(aDev->fpin[aPinNum], &rfds);
+ FD_SET(aDev->fpin, &rfds);
tv.tv_sec = 0;
- tv.tv_usec = 1;
-
+ tv.tv_usec = 10;
/* flush the file */
- retval = select(aDev->fpin[aPinNum]+1, &rfds, NULL, NULL, &tv);
- if (retval)
+ retval = select(aDev->fpin, &rfds, NULL, NULL, &tv);
+ if (retval > 0)
{
- read(aDev->fpin[aPinNum], buffer, BUFF_SIZE);
+ read(aDev->fpin, buffer, BUFF_SIZE);
}
-
- aDev->irq_mode[aPinNum] = aMode;
return 0;
}
@@ -478,13 +342,7 @@ int32_t as_gpio_set_irq_mode(struct as_gpio_device *aDev,
int32_t as_gpio_close(struct as_gpio_device *aDev)
{
- int i;
- close(aDev->fdev);
- for (i=0; i < PORT_SIZE; i++)
- {
- if (aDev->fpin[i] != -1)
- close(aDev->fpin[i]);
- }
+ close(aDev->fpin);
free(aDev);
return 0;
}
diff --git a/target/packages/as_devices/c/as_gpio.h b/target/packages/as_devices/c/as_gpio.h
index d644511..af94b46 100644
--- a/target/packages/as_devices/c/as_gpio.h
+++ b/target/packages/as_devices/c/as_gpio.h
@@ -35,71 +35,72 @@ extern "C" {
#define PORT_SIZE (32)
-//TODO: test irq
+//TODO: Change structure to use pin instead of port.
/**
* Store gpio parameters
*/
struct as_gpio_device {
unsigned char port_letter;
- int fdev; /* port file */
- int fpin[PORT_SIZE]; /* pin file for blocking read */
- int irq_mode[PORT_SIZE];
+ int pin_num;
+ int fpin; /* pin file */
+ int irq_mode;
};
/** @brief Initialize port access
*
* @param aPortChar character port in UPPER case
+ * @param aPinNum int pin number
*
* @return error if negative value
*/
-struct as_gpio_device *as_gpio_open(char aPortChar);
+struct as_gpio_device *as_gpio_open(char aPortChar, int aPinNum);
/** @brief Set pin direction
*
* @param aDev as_gpio_device pointer structure
- * @param aPinNum pin number
* @param aDirection direction 0:input 1:output
*
* @return error if negative value
*/
int32_t as_gpio_set_pin_direction(struct as_gpio_device *aDev,
- int aPinNum,
int aDirection);
+/** @brief Get pin direction
+ *
+ * @param aDev as_gpio_device pointer structure
+ *
+ * @return error if negative value
+ */
+int32_t as_gpio_get_pin_direction(struct as_gpio_device *aDev);
+
/** @brief Set pin value
*
* @param aDev as_gpio_device pointer structure
- * @param aPinNum pin number
* @param aValue value of pin (1 or 0)
*
* @return error if negative
*/
int32_t as_gpio_set_pin_value(struct as_gpio_device *aDev,
- int aPinNum,
int aValue);
/** @brief Get pin value
*
* @param aDev as_gpio_device pointer structure
- * @param aPinNum pin number
*
* @return pin value if positive or null, error if negative
*/
-int32_t as_gpio_get_pin_value(struct as_gpio_device *aDev,
- int aPinNum);
+int32_t as_gpio_get_pin_value(struct as_gpio_device *aDev);
/** @brief Get pin value, blocking until interrupt occur
*
* @param aDev as_gpio_device pointer structure
- * @param aPinNum pin number
* @param aDelay_s waiting delay in seconds
* @param aDelay_us waiting delay in useconds (plus delay in seconds)
*
* @return pin value if positive or null, read error if -1, timeout if -10
*/
int32_t as_gpio_blocking_get_pin_value(struct as_gpio_device *aDev,
- int aPinNum,
int aDelay_s,
int aDelay_us);
@@ -110,42 +111,54 @@ int32_t as_gpio_blocking_get_pin_value(struct as_gpio_device *aDev,
*
* @return pin pull up value if positive or null, error if negative
*/
-int32_t as_gpio_get_pullup_value(struct as_gpio_device *aDev,
- int aPinNum);
+int32_t as_gpio_get_pullup_value(struct as_gpio_device *aDev);
/** @brief Set pin pull-up value
*
* @param aDev as_gpio_device pointer structure
- * @param aPinNum pin number
* @param aValue value of pin (1 or 0)
*
* @return error if negative
*/
int32_t as_gpio_set_pullup_value(struct as_gpio_device *aDev,
- int aPinNum,
int aValue);
/** @brief Set pin irq mode
*
* @param aDev as_gpio_device pointer structure
- * @param aPinNum pin number
* @param aMode irq mode
*
* @return error if negative
*/
int32_t as_gpio_set_irq_mode(struct as_gpio_device *aDev,
- int aPinNum,
int aMode);
/** @brief Get pin irq mode value
*
* @param aDev as_gpio_device pointer structure
- * @param aPinNum pin number
*
* @return pin mode value if positive or null, error if negative
*/
-int32_t as_gpio_get_irq_mode(struct as_gpio_device *aDev,
- int aPinNum);
+int32_t as_gpio_get_irq_mode(struct as_gpio_device *aDev);
+
+/** @brief Get pin number value
+ *
+ * @param aDev as_gpio_device pointer structure
+ *
+ * @return pin mode value if positive or null, error if negative
+ */
+int32_t as_gpio_get_pin_num(struct as_gpio_device *aDev)
+{ return aDev->pin_num;}
+
+/** @brief Get port letter
+ *
+ * @param aDev as_gpio_device pointer structure
+ *
+ * @return pin mode value if positive or null, error if negative
+ */
+int32_t as_gpio_get_port_letter(struct as_gpio_device *aDev)
+{ return aDev->port_letter;}
+
/** @brief Close port access
*
diff --git a/target/packages/as_devices/python/Makefile b/target/packages/as_devices/python/Makefile
index 232dcb8..2b5e0ba 100644
--- a/target/packages/as_devices/python/Makefile
+++ b/target/packages/as_devices/python/Makefile
@@ -21,7 +21,7 @@ AS_LIB=../c/libas_devices.so
LIBNAME=AsDevices
-WRAPPER_LIBS=AsGpio_wrap.so
+#WRAPPER_LIBS=AsGpio_wrap.so
WRAPPER_DIR=src
PYTHON_VERS=2.4
diff --git a/target/packages/as_devices/test_c.h b/target/packages/as_devices/test_c.h
index 04fa50c..e22d4c7 100644
--- a/target/packages/as_devices/test_c.h
+++ b/target/packages/as_devices/test_c.h
@@ -434,7 +434,6 @@ void test_gpio()
char buffer[50];
struct as_gpio_device *gpio_dev;
int32_t ret;
- char c_value;
int32_t value;
char port_letter = 'F';
int pin_num = 13;
@@ -442,15 +441,14 @@ void test_gpio()
int port_value = 1;
int pullup=1;
- gpio_dev = as_gpio_open(port_letter);
+ gpio_dev = as_gpio_open(port_letter, pin_num);
if (gpio_dev == NULL)
{
printf("Error can't open gpio %c\nHave you run loadgpio.sh ?\n", port_letter);
pressEnterToContinue();
return ;
}
- ret = as_gpio_get_pin_value(gpio_dev,
- pin_num);
+ ret = as_gpio_get_pin_value(gpio_dev);
if (ret < 0)
{
printf("Error, can't get pin value\n");
@@ -463,18 +461,17 @@ void test_gpio()
{
system("clear");
printf("**************************\n");
- printf(" Testing GPIO P%c%d \n", port_letter, pin_num);
+ printf(" Testing GPIO P%c%d \n", as_gpio_get_port_letter(gpio_dev),
+ as_gpio_get_pin_num(gpio_dev));
printf("**************************\n");
printf("Choose ('q' to quit):\n");
- printf(" 1) Change port letter (%c)\n", port_letter);
- printf(" 2) Change port num (%d)\n", pin_num);
- printf(" 3) Change direction (%d)\n", port_direction);
- printf(" 4) Change value (%d)\n", port_value);
+ printf(" 1) Change gpio (P%c%d)\n", as_gpio_get_port_letter(gpio_dev),
+ as_gpio_get_pin_num(gpio_dev));
+ printf(" 3) Change direction (%d)\n", as_gpio_get_pin_direction(gpio_dev));
+ printf(" 4) Change value (%d)\n", as_gpio_get_pin_value(gpio_dev));
printf(" 5) Read pin value\n");
- printf(" 6) Change Pull-Up (%d)\n", pullup);
- printf(" 7) Read Pull-Up\n");
- printf(" 8) Set irq mode\n");
- printf(" 9) get irq mode\n");
+ printf(" 6) Change Pull-Up (%d)\n", as_gpio_get_pullup_value(gpio_dev));
+ printf(" 8) Set irq mode (%d)\n", as_gpio_get_irq_mode(gpio_dev));
printf(" a) blocking read\n");
printf("> ");
@@ -489,35 +486,29 @@ void test_gpio()
ret = as_gpio_close(gpio_dev);
if(ret < 0)
{
- printf("Error, can't close Port%c\n", port_letter);
+ printf("Error, can't close gpio\n");
pressEnterToContinue();
break;
}
}
- gpio_dev = as_gpio_open(buffer[0]);
+ port_letter = buffer[0];
+
+ printf("Give pin number : ");
+ scanf("%d", &pin_num);
+
+ gpio_dev = as_gpio_open(port_letter,pin_num);
if(gpio_dev == NULL)
{
- printf("Error, can't open Port%c\n", c_value);
+ printf("Error, can't open P%c%d\n", port_letter, pin_num);
pressEnterToContinue();
break;
}
- port_letter = buffer[0];
- printf("Ok Port %c is set\n", port_letter);
- pressEnterToContinue();
- break;
- case '2' : printf("Give pin number : ");
- scanf("%d", &value);
- if ((value < 0) || (value > 31))
- printf("Error, wrong value\n");
- else
- pin_num = value;
+ printf("Ok P%c%d is open\n", port_letter, pin_num);
pressEnterToContinue();
break;
case '3' : printf("Give direction (0:in, 1:out) : ");
scanf("%d", &value);
- ret = as_gpio_set_pin_direction(gpio_dev,
- pin_num,
- value);
+ ret = as_gpio_set_pin_direction(gpio_dev, value);
if(ret < 0)
{
printf("Error, can't change direction\n");
@@ -530,37 +521,31 @@ void test_gpio()
break;
case '4' : printf("Give value : ");
scanf("%d", &value);
- ret = as_gpio_set_pin_value(gpio_dev,
- pin_num,
- value);
+ ret = as_gpio_set_pin_value(gpio_dev, value);
if(ret < 0)
{
printf("Error, can't change pin value\n");
pressEnterToContinue();
break;
}
- port_value = value;
printf("Ok value changed\n");
pressEnterToContinue();
break;
case '5' : printf("Get value \n");
- ret = as_gpio_get_pin_value(gpio_dev,
- pin_num);
+ ret = as_gpio_get_pin_value(gpio_dev);
if (ret < 0)
{
printf("Error, can't get pin value\n");
pressEnterToContinue();
break;
}
- printf("Value is %d\n",ret);
+ printf("Value is %d\n", ret);
port_value = ret;
pressEnterToContinue();
break;
case '6' : printf("Give value : ");
scanf("%d", &value);
- ret = as_gpio_set_pullup_value(gpio_dev,
- pin_num,
- value);
+ ret = as_gpio_set_pullup_value(gpio_dev, value);
if(ret < 0)
{
printf("Error, can't change pull up value\n");
@@ -571,19 +556,6 @@ void test_gpio()
printf("Ok value changed\n");
pressEnterToContinue();
break;
- case '7' : printf("Get value \n");
- ret = as_gpio_get_pullup_value(gpio_dev,
- pin_num);
- if (ret < 0)
- {
- printf("Error, can't get pull up value\n");
- pressEnterToContinue();
- break;
- }
- printf("Value is %d\n",ret);
- pullup = ret;
- pressEnterToContinue();
- break;
case '8' : printf("1) GPIO_IRQ_MODE_NOINT \n");
printf("2) GPIO_IRQ_MODE_RISING \n");
printf("3) GPIO_IRQ_MODE_FALLING\n");
@@ -594,9 +566,7 @@ void test_gpio()
if (value == 2)value = GPIO_IRQ_MODE_RISING ;
if (value == 3)value = GPIO_IRQ_MODE_FALLING;
if (value == 4)value = GPIO_IRQ_MODE_BOTH ;
- ret = as_gpio_set_irq_mode(gpio_dev,
- pin_num,
- value);
+ ret = as_gpio_set_irq_mode(gpio_dev, value);
if(ret < 0)
{
printf("Error, can't change irq value\n");
@@ -606,22 +576,8 @@ void test_gpio()
printf("Ok value changed\n");
pressEnterToContinue();
break;
- case '9' : printf("Get value \n");
- ret = as_gpio_get_irq_mode(gpio_dev, pin_num);
- if (ret < 0)
- {
- printf("Error, can't get pull up value\n");
- pressEnterToContinue();
- break;
- }
- if (ret==GPIO_IRQ_MODE_NOINT )printf("GPIO_IRQ_MODE_NOINT \n");
- if (ret==GPIO_IRQ_MODE_RISING )printf("GPIO_IRQ_MODE_RISING \n");
- if (ret==GPIO_IRQ_MODE_FALLING)printf("GPIO_IRQ_MODE_FALLING\n");
- if (ret==GPIO_IRQ_MODE_BOTH )printf("GPIO_IRQ_MODE_BOTH \n");
- pressEnterToContinue();
- break;
case 'a' : printf("Blocking read \n");
- ret = as_gpio_blocking_get_pin_value(gpio_dev, pin_num, 10, 0);
+ ret = as_gpio_blocking_get_pin_value(gpio_dev, 10, 0);
if (ret < 0)
{
printf("Error, can't read value\n");
hooks/post-receive
--
armadeus
|
