armadeus-commitlog Mailing List for armadeus (Page 89)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Fabien M <fa...@us...> - 2011-08-08 14:39:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d39ccd9f317c3e0749a5585af28ddf98776248db (commit)
from ac48e5426ddcc6df8fc10c66727157a4aa26289d (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 d39ccd9f317c3e0749a5585af28ddf98776248db
Author: Fabien Marteau <fab...@ar...>
Date: Mon Aug 8 16:38:18 2011 +0200
[linux] update configuration for apf51 and apf27 to match new fpga drivers
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.29.config | 9 +++++++--
.../armadeus/apf51/apf51-linux-2.6.38.config | 15 ++++++++-------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
index b94afec..532ad54 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Tue Jul 5 19:00:29 2011
+# Mon Aug 8 16:23:15 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1456,8 +1456,13 @@ CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
#
# CONFIG_ARMADEUS_I2C_OCORE_IRQMNG is not set
# CONFIG_ARMADEUS_PS2KBD_DRIVER is not set
-# CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS is not set
+
+#
+# Specific designs
+#
+# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
# CONFIG_POD_DRIVERS is not set
+# CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS is not set
#
# Handheld related
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index 787f232..d67b0ad 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 2.6.38.8 Kernel Configuration
-# Mon Aug 8 14:20:18 2011
+# Linux/arm 2.6.38.1 Kernel Configuration
+# Mon Aug 8 16:31:49 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1742,12 +1742,13 @@ CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
#
# CONFIG_ARMADEUS_I2C_OCORE_IRQMNG is not set
# CONFIG_ARMADEUS_PS2KBD_DRIVER is not set
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS=y
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_BUTTON_DRIVER=m
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_LED_DRIVER=m
-CONFIG_ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER=m
-CONFIG_ARMADEUS_WISHBONE_TWIN_UART=m
+
+#
+# Specific designs
+#
+# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
# CONFIG_POD_DRIVERS is not set
+# CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS is not set
#
# Handheld related
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-08-08 12:52:10
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ac48e5426ddcc6df8fc10c66727157a4aa26289d (commit)
from 8301e9d72c0dd88251e968040cec5cdea9e1891b (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 ac48e5426ddcc6df8fc10c66727157a4aa26289d
Author: Julien Boibessot <jul...@ar...>
Date: Mon Aug 8 14:51:17 2011 +0200
[LINUX] APF51: bump default Linux version to 2.6.38.8
-----------------------------------------------------------------------
Summary of changes:
...2.6.38.1.config => apf51-linux-2.6.38.8.config} | 0
.../armadeus/apf51/apf51-linux-2.6.38.config | 6 ++++--
.../device/armadeus/linux/kernel-patches/2.6.38.1 | 1 -
.../linux/kernel-patches/{2.6.38-rc3 => 2.6.38.8} | 0
4 files changed, 4 insertions(+), 3 deletions(-)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-2.6.38.1.config => apf51-linux-2.6.38.8.config} (100%)
delete mode 120000 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38.1
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.38-rc3 => 2.6.38.8} (100%)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.8.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.1.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.8.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index b093560..787f232 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 2.6.38.1 Kernel Configuration
-# Thu Jul 7 16:54:59 2011
+# Linux/arm 2.6.38.8 Kernel Configuration
+# Mon Aug 8 14:20:18 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -959,6 +959,7 @@ CONFIG_SLHC=m
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ANYBUS_INTERFACE is not set
# CONFIG_ISDN is not set
# CONFIG_PHONE is not set
@@ -2256,6 +2257,7 @@ CONFIG_TRACING_SUPPORT=y
# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_TEST_KSTRTOX is not set
# CONFIG_STRICT_DEVMEM is not set
CONFIG_ARM_UNWIND=y
# CONFIG_DEBUG_USER is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38.1 b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38.1
deleted file mode 120000
index b7e1c10..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38.1
+++ /dev/null
@@ -1 +0,0 @@
-2.6.38
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38-rc3 b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38.8
similarity index 100%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.38-rc3
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38.8
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-08-08 10:22:52
|
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 8301e9d72c0dd88251e968040cec5cdea9e1891b (commit)
via a038916ed663bf8b1186a050ebc6a598ee18676b (commit)
via 508db544d9bb2b7ec68ebf88e26694b02d05d54a (commit)
via 809fbcab69710bb5efcb5766646de5f3df96b821 (commit)
from 70c1869bbc50976b9a1d5f52a6b7677b3e2876c7 (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 8301e9d72c0dd88251e968040cec5cdea9e1891b
Author: Julien Boibessot <jul...@ar...>
Date: Mon Aug 8 12:21:59 2011 +0200
[BUILDROOT] [2011.05] Remove warnings when applying patches and add 156-u.boot-remove-u-boot-patch-prefix.patch
commit a038916ed663bf8b1186a050ebc6a598ee18676b
Merge: 508db544d9bb2b7ec68ebf88e26694b02d05d54a 70c1869bbc50976b9a1d5f52a6b7677b3e2876c7
Author: Julien Boibessot <jul...@ar...>
Date: Mon Aug 8 12:05:17 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 508db544d9bb2b7ec68ebf88e26694b02d05d54a
Author: Julien Boibessot <jul...@ar...>
Date: Mon Aug 8 12:03:14 2011 +0200
[BUILDROOT] Display build time when build is successful
commit 809fbcab69710bb5efcb5766646de5f3df96b821
Author: Julien Boibessot <jul...@ar...>
Date: Mon Aug 8 12:02:35 2011 +0200
[BUILDROOT] Continue work on BR 2011.05 support
-----------------------------------------------------------------------
Summary of changes:
Makefile | 6 ++-
.../2011.05/001-add_armadeus_device.patch | 6 +-
patches/buildroot/2011.05/006-lcd4linux.patch | 16 +++---
patches/buildroot/2011.05/018-allegro.patch | 10 ++--
.../buildroot/2011.05/021-sdl-water-config.patch | 10 ++--
patches/buildroot/2011.05/034-slideshow.patch | 18 ++++----
.../2011.05/038-fakeroot-bump_version.patch | 8 ++--
patches/buildroot/2011.05/040-linux-makefile.patch | 26 +++++-----
.../buildroot/2011.05/043-mesa-add_packages.patch | 12 +++---
.../051a-u-boot-add_copy_to_functionnality.patch | 12 +++---
...1b-u-boot-change_board_name_default_value.patch | 4 +-
...51c-u-boot-makes_u-boot-clean_target_work.patch | 6 +-
...d_possibility_to_choose_board_header_file.patch | 14 +++---
...u-boot-add_1.3.4_version_specific_support.patch | 10 ++--
...madeus_specific_options_for_config_header.patch | 6 +-
.../051g-u-boot-add_u-boot-unpacked_target.patch | 6 +-
...boot-support_config_sys_naming_convention.patch | 6 +-
...x-adds_linux26-patched_target_to_Makefile.patch | 8 ++--
.../2011.05/055-pyserial-add_package.patch | 10 ++--
.../2011.05/057-pymysql-add_package.patch | 14 +++---
...x_in_a_standalone_way_after_configuration.patch | 10 ++--
...-linux-change_board_specific_patches_name.patch | 13 +++++
.../buildroot/2011.05/072-xenomai-package.patch | 48 ++++++++++----------
.../buildroot/2011.05/081-adds_quake_package.patch | 18 ++++----
.../2011.05/083-adds_pygame_package.patch | 12 +++---
.../buildroot/2011.05/085-adds_gpm_package.patch | 16 +++---
.../buildroot/2011.05/095-uucp-add_packages.patch | 10 ++--
.../buildroot/2011.05/097-adds_flite_package.patch | 12 +++---
...e-add_infrastructure_to_install_firmwares.patch | 12 +++---
.../buildroot/2011.05/107-games-add_wolf4sdl.patch | 10 ++--
.../buildroot/2011.05/110-bluez-add_package.patch | 14 +++---
patches/buildroot/2011.05/111-bluez-hacks.patch | 16 +++---
.../2011.05/116-openobex-add_package.patch | 14 +++---
.../2011.05/117-ussp-push-add_package.patch | 10 ++--
.../buildroot/2011.05/118-snes9x-add_package.patch | 12 +++---
.../buildroot/2011.05/119-fbtest-add_package.patch | 20 ++++----
.../buildroot/2011.05/120-cwiid-add_package.patch | 14 +++---
.../2011.05/121-target-arm926t_is_arm926ej-s.patch | 6 +-
.../buildroot/2011.05/122-urg-add_package.patch | 10 ++--
.../buildroot/2011.05/124-e-uae-add_package.patch | 10 ++--
.../2011.05/125-opentyrian-add_package.patch | 10 ++--
.../2011.05/130-lbreakout-add_package.patch | 10 ++--
.../2011.05/131-ltetris-add_package.patch | 12 +++---
...-qt-full_integration_with_cross_compiling.patch | 10 ++--
.../buildroot/2011.05/133-qwt-add_package.patch | 12 +++---
...ffs2-add_board_name_to_binary_rootfs_name.patch | 8 ++--
.../135-linux-add_linux26-clean_target.patch | 6 +-
...-disable_ip_busybox_if_iproute2_buildroot.patch | 10 ++--
...fix_installation_bug_on_some_host_systems.patch | 8 ++--
...buildroot-Adding_copy_method_for_download.patch | 14 +++---
...ackage_selection_even_if_marked_as_broken.patch | 8 ++--
.../154-packages-fix_DL_VERSION_usage.patch | 5 --
.../156-u.boot-remove-u-boot-patch-prefix.patch | 8 ++-
53 files changed, 315 insertions(+), 301 deletions(-)
create mode 100644 patches/buildroot/2011.05/071-linux-change_board_specific_patches_name.patch
copy patches/buildroot/{2010.11 => 2011.05}/156-u.boot-remove-u-boot-patch-prefix.patch (68%)
diff --git a/Makefile b/Makefile
index a73849a..6d5c7eb 100644
--- a/Makefile
+++ b/Makefile
@@ -172,9 +172,13 @@ endif
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
+ @ls -al /bin/sh | grep bash
+ @echo -n `date +%s` > before.txt
@$(MAKE) -C $(BUILDROOT_DIR) $@
@$(ECHO_BUILD_IS_OK)
+ @echo -n `date +%s` > after.txt
+ @BEFORE=`cat before.txt`; AFTER=`cat after.txt`; BUILD_TIME_IN_SEC=`expr $$AFTER - $$BEFORE`; echo -e "\033[1mBuild time: $$BUILD_TIME_IN_SEC seconds\033[0m"
+ @rm before.txt after.txt
menuconfig: $(BUILDROOT_DIR)/.configured
@$(MAKE) -C $(BUILDROOT_DIR) $@
diff --git a/patches/buildroot/2011.05/001-add_armadeus_device.patch b/patches/buildroot/2011.05/001-add_armadeus_device.patch
index e33dd01..f629dd3 100644
--- a/patches/buildroot/2011.05/001-add_armadeus_device.patch
+++ b/patches/buildroot/2011.05/001-add_armadeus_device.patch
@@ -2,9 +2,9 @@ Add armadeus target specific menu to BR.
Index: buildroot/target/generic/Config.in
===================================================================
---- buildroot.orig/target/generic/Config.in 2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/target/generic/Config.in 2010-06-23 14:05:46.000000000 +0200
-@@ -2,6 +2,7 @@
+--- buildroot.orig/target/generic/Config.in 2011-08-08 12:12:01.000000000 +0200
++++ buildroot/target/generic/Config.in 2011-08-08 12:12:06.000000000 +0200
+@@ -126,4 +126,5 @@
only argument. Make sure the exit code of that script is 0,
otherwise make will stop after calling it.
diff --git a/patches/buildroot/2011.05/006-lcd4linux.patch b/patches/buildroot/2011.05/006-lcd4linux.patch
index 18a8c70..13b94a1 100644
--- a/patches/buildroot/2011.05/006-lcd4linux.patch
+++ b/patches/buildroot/2011.05/006-lcd4linux.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:09:19.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:09:53.000000000 +0200
-@@ -182,6 +182,7 @@
+--- buildroot.orig/package/Config.in 2011-08-08 12:12:14.000000000 +0200
++++ buildroot/package/Config.in 2011-08-08 12:12:19.000000000 +0200
+@@ -185,6 +185,7 @@
source "package/irda-utils/Config.in"
source "package/kbd/Config.in"
source "package/libv4l/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/lcd4linux/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/Config.in 2010-06-23 14:09:53.000000000 +0200
++++ buildroot/package/lcd4linux/Config.in 2011-08-08 12:12:19.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LCD4LINUX
+ bool "LCD4Linux daemon"
@@ -29,7 +29,7 @@ Index: buildroot/package/lcd4linux/Config.in
Index: buildroot/package/lcd4linux/lcd4linux.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/lcd4linux.mk 2010-06-23 14:09:53.000000000 +0200
++++ buildroot/package/lcd4linux/lcd4linux.mk 2011-08-08 12:12:19.000000000 +0200
@@ -0,0 +1,66 @@
+#############################################################
+#
@@ -100,7 +100,7 @@ Index: buildroot/package/lcd4linux/lcd4linux.mk
Index: buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch 2010-06-23 14:09:53.000000000 +0200
++++ buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch 2011-08-08 12:12:19.000000000 +0200
@@ -0,0 +1,13 @@
+This plugin doesn't compile yet (/anymore?)
+
@@ -118,7 +118,7 @@ Index: buildroot/package/lcd4linux/lcd4linux-remove-wireless.patch
Index: buildroot/package/lcd4linux/lcd4linux-armadeus.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/lcd4linux-armadeus.patch 2010-06-23 14:09:53.000000000 +0200
++++ buildroot/package/lcd4linux/lcd4linux-armadeus.patch 2011-08-08 12:12:19.000000000 +0200
@@ -0,0 +1,181 @@
+diff -uprN lcd4linux-0.10.0/configure lcd4linux-0.10.0.armadeus/configure
+--- lcd4linux-0.10.0/configure 2005-06-10 13:21:49.000000000 +0200
@@ -304,7 +304,7 @@ Index: buildroot/package/lcd4linux/lcd4linux-armadeus.patch
Index: buildroot/package/lcd4linux/lcd4linux_armadeus.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lcd4linux/lcd4linux_armadeus.conf 2010-06-23 14:09:53.000000000 +0200
++++ buildroot/package/lcd4linux/lcd4linux_armadeus.conf 2011-08-08 12:12:19.000000000 +0200
@@ -0,0 +1,445 @@
+
+# Armadeus HD44780 display (Nico wiring ;-))
diff --git a/patches/buildroot/2011.05/018-allegro.patch b/patches/buildroot/2011.05/018-allegro.patch
index 130ed2f..3be1aab 100644
--- a/patches/buildroot/2011.05/018-allegro.patch
+++ b/patches/buildroot/2011.05/018-allegro.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-01-27 15:23:09.000000000 +0100
-+++ buildroot/package/Config.in 2011-01-27 15:23:42.000000000 +0100
-@@ -93,6 +93,7 @@
+--- buildroot.orig/package/Config.in 2011-08-08 12:12:19.000000000 +0200
++++ buildroot/package/Config.in 2011-08-08 12:12:26.000000000 +0200
+@@ -97,6 +97,7 @@
source "package/rrdtool/Config.in"
comment "graphic libraries"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/allegro/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/allegro/Config.in 2011-01-27 15:23:42.000000000 +0100
++++ buildroot/package/allegro/Config.in 2011-08-08 12:12:26.000000000 +0200
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_ALLEGRO
+ bool "Allegro"
@@ -35,7 +35,7 @@ Index: buildroot/package/allegro/Config.in
Index: buildroot/package/allegro/allegro.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/allegro/allegro.mk 2011-01-27 15:23:42.000000000 +0100
++++ buildroot/package/allegro/allegro.mk 2011-08-08 12:12:26.000000000 +0200
@@ -0,0 +1,75 @@
+#############################################################
+#
diff --git a/patches/buildroot/2011.05/021-sdl-water-config.patch b/patches/buildroot/2011.05/021-sdl-water-config.patch
index eae81c6..380ccd9 100644
--- a/patches/buildroot/2011.05/021-sdl-water-config.patch
+++ b/patches/buildroot/2011.05/021-sdl-water-config.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-01-27 15:23:42.000000000 +0100
-+++ buildroot/package/Config.in 2011-01-27 15:23:50.000000000 +0100
-@@ -113,6 +113,8 @@
+--- buildroot.orig/package/Config.in 2011-08-08 12:12:26.000000000 +0200
++++ buildroot/package/Config.in 2011-08-08 12:12:30.000000000 +0200
+@@ -118,6 +118,8 @@
source "package/sdl_net/Config.in"
source "package/sdl_ttf/Config.in"
source "package/sdl_gfx/Config.in"
@@ -18,7 +18,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/sdlwater/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdlwater/Config.in 2011-01-27 15:23:50.000000000 +0100
++++ buildroot/package/sdlwater/Config.in 2011-08-08 12:12:30.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_SDL_WATER
+ bool "SDL_water"
@@ -30,7 +30,7 @@ Index: buildroot/package/sdlwater/Config.in
Index: buildroot/package/sdlwater/sdlwater.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdlwater/sdlwater.mk 2011-01-27 15:23:50.000000000 +0100
++++ buildroot/package/sdlwater/sdlwater.mk 2011-08-08 12:12:30.000000000 +0200
@@ -0,0 +1,65 @@
+#############################################################
+#
diff --git a/patches/buildroot/2011.05/034-slideshow.patch b/patches/buildroot/2011.05/034-slideshow.patch
index 5b074ed..f23fe7f 100644
--- a/patches/buildroot/2011.05/034-slideshow.patch
+++ b/patches/buildroot/2011.05/034-slideshow.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-07-01 17:40:50.000000000 +0200
-+++ buildroot/package/Config.in 2011-07-02 13:22:14.000000000 +0200
-@@ -113,6 +113,7 @@
+--- buildroot.orig/package/Config.in 2011-08-08 12:12:30.000000000 +0200
++++ buildroot/package/Config.in 2011-08-08 12:12:34.000000000 +0200
+@@ -118,6 +118,7 @@
source "package/sdl_net/Config.in"
source "package/sdl_ttf/Config.in"
source "package/sdl_gfx/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/slideshow/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/Config.in 2011-07-01 21:35:15.000000000 +0200
++++ buildroot/package/slideshow/Config.in 2011-08-08 12:12:34.000000000 +0200
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_SLIDESHOW
+ bool "Slideshow"
@@ -30,7 +30,7 @@ Index: buildroot/package/slideshow/Config.in
Index: buildroot/package/slideshow/slideshow.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow.mk 2011-07-02 11:49:00.000000000 +0200
++++ buildroot/package/slideshow/slideshow.mk 2011-08-08 12:12:34.000000000 +0200
@@ -0,0 +1,39 @@
+#############################################################
+#
@@ -74,7 +74,7 @@ Index: buildroot/package/slideshow/slideshow.mk
Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2011-07-01 17:40:50.000000000 +0200
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2011-08-08 12:12:34.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
@@ -152,7 +152,7 @@ Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2011-07-01 17:40:50.000000000 +0200
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2011-08-08 12:12:34.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
@@ -170,7 +170,7 @@ Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
Index: buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch 2011-07-02 13:29:28.000000000 +0200
++++ buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch 2011-08-08 12:12:34.000000000 +0200
@@ -0,0 +1,28 @@
+On recent gcc some includes are needed to have string stuff defined.
+
@@ -203,7 +203,7 @@ Index: buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_rece
Index: buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch 2011-07-02 13:24:02.000000000 +0200
++++ buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch 2011-08-08 12:12:34.000000000 +0200
@@ -0,0 +1,17 @@
+Otherwise crashes on APF27.
+
diff --git a/patches/buildroot/2011.05/038-fakeroot-bump_version.patch b/patches/buildroot/2011.05/038-fakeroot-bump_version.patch
index 7505ca0..c477c53 100644
--- a/patches/buildroot/2011.05/038-fakeroot-bump_version.patch
+++ b/patches/buildroot/2011.05/038-fakeroot-bump_version.patch
@@ -1,7 +1,7 @@
Index: buildroot/package/fakeroot/fakeroot.mk
===================================================================
---- buildroot.orig/package/fakeroot/fakeroot.mk 2010-06-17 16:45:13.000000000 +0200
-+++ buildroot/package/fakeroot/fakeroot.mk 2010-06-17 16:46:25.000000000 +0200
+--- buildroot.orig/package/fakeroot/fakeroot.mk 2011-08-08 12:12:00.000000000 +0200
++++ buildroot/package/fakeroot/fakeroot.mk 2011-08-08 12:12:45.000000000 +0200
@@ -3,7 +3,7 @@
# fakeroot
#
@@ -9,5 +9,5 @@ Index: buildroot/package/fakeroot/fakeroot.mk
-FAKEROOT_VERSION:=1.9.5
+FAKEROOT_VERSION:=1.11
FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
- FAKEROOT_SITE:=http://snapshot.debian.net/archive/2008/04/27/debian/pool/main/f/fakeroot/
- FAKEROOT_LIBTOOL_PATCH=NO
+ FAKEROOT_SITE:=http://snapshot.debian.org/archive/debian/20080427T000000Z/pool/main/f/fakeroot/
+ FAKEROOT_CONF_OPT = --program-prefix=''
diff --git a/patches/buildroot/2011.05/040-linux-makefile.patch b/patches/buildroot/2011.05/040-linux-makefile.patch
index ca29a96..2793578 100644
--- a/patches/buildroot/2011.05/040-linux-makefile.patch
+++ b/patches/buildroot/2011.05/040-linux-makefile.patch
@@ -1,8 +1,8 @@
Index: buildroot/linux/linux.mk
===================================================================
---- buildroot.orig/linux/linux.mk 2010-10-14 21:40:47.000000000 +0200
-+++ buildroot/linux/linux.mk 2010-10-20 21:26:50.000000000 +0200
-@@ -29,7 +29,8 @@
+--- buildroot.orig/linux/linux.mk 2011-05-27 16:18:21.000000000 +0200
++++ buildroot/linux/linux.mk 2011-08-04 19:26:22.000000000 +0200
+@@ -28,7 +28,8 @@
# Get the real Linux version, which tells us where kernel modules are
# going to be installed in the target filesystem.
@@ -10,19 +10,19 @@ Index: buildroot/linux/linux.mk
+LINUX26_VERSION_PROBED = $(LINUX26_VERSION)
+#LINUX26_VERSION_PROBED = $(shell $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) --no-print-directory -s kernelrelease)
- ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y)
- LINUX26_IMAGE_NAME=uImage
+ ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
+ LINUX26_IMAGE_NAME=$(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
@@ -109,6 +110,9 @@
- $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.initramfs\",$(@D)/.config)
- $(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config)
- endif
+ # Configuration
+ $(LINUX26_DIR)/.stamp_configured: $(LINUX26_DIR)/.stamp_patched
+ @$(call MESSAGE,"Configuring kernel")
+ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
+ (ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(LINUX26_DIR)/drivers/armadeus)
+endif
- $(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig
- $(Q)touch $@
-
-@@ -125,7 +129,7 @@
+ ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
+ $(TARGET_MAKE_ENV) $(MAKE1) $(LINUX26_MAKE_FLAGS) -C $(@D) $(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG))_defconfig
+ else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)
+@@ -157,7 +161,7 @@
# Installation
$(LINUX26_DIR)/.stamp_installed: $(LINUX26_DIR)/.stamp_compiled
@$(call MESSAGE,"Installing kernel")
@@ -31,7 +31,7 @@ Index: buildroot/linux/linux.mk
# Install modules and remove symbolic links pointing to build
# directories, not relevant on the target
@if [ $(shell grep -c "CONFIG_MODULES=y" $(LINUX26_DIR)/.config) != 0 ] ; then \
-@@ -151,7 +155,7 @@
+@@ -184,7 +188,7 @@
# Build the kernel.
$(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) $(LINUX26_IMAGE_NAME)
# Copy the kernel image to its final destination
diff --git a/patches/buildroot/2011.05/043-mesa-add_packages.patch b/patches/buildroot/2011.05/043-mesa-add_packages.patch
index 1ba737b..3950ad8 100644
--- a/patches/buildroot/2011.05/043-mesa-add_packages.patch
+++ b/patches/buildroot/2011.05/043-mesa-add_packages.patch
@@ -1,8 +1,8 @@
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-07-06 18:56:33.000000000 +0200
-+++ buildroot/package/Config.in 2011-07-06 18:57:54.000000000 +0200
-@@ -283,6 +283,7 @@
+--- buildroot.orig/package/Config.in 2011-08-08 12:12:34.000000000 +0200
++++ buildroot/package/Config.in 2011-08-08 12:13:12.000000000 +0200
+@@ -294,6 +294,7 @@
source "package/librsvg/Config.in"
source "package/libsvgtiny/Config.in"
source "package/libungif/Config.in"
@@ -13,7 +13,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/mesa/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/mesa/Config.in 2011-07-06 18:56:34.000000000 +0200
++++ buildroot/package/mesa/Config.in 2011-08-08 12:13:12.000000000 +0200
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_MESALIB
+ bool "Mesa library"
@@ -24,7 +24,7 @@ Index: buildroot/package/mesa/Config.in
Index: buildroot/package/mesa/mesa.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/mesa/mesa.mk 2011-07-06 19:10:31.000000000 +0200
++++ buildroot/package/mesa/mesa.mk 2011-08-08 12:13:12.000000000 +0200
@@ -0,0 +1,66 @@
+#############################################################
+#
@@ -95,7 +95,7 @@ Index: buildroot/package/mesa/mesa.mk
Index: buildroot/package/mesa/mesa.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/mesa/mesa.patch 2011-07-06 18:56:34.000000000 +0200
++++ buildroot/package/mesa/mesa.patch 2011-08-08 12:13:12.000000000 +0200
@@ -0,0 +1,188 @@
+diff -bruN Mesa-7.0.orig/configs/arm-linux-osmesa Mesa-7.0/configs/arm-linux-osmesa
+--- Mesa-7.0.orig/configs/arm-linux-osmesa 1970-01-01 01:00:00.000000000 +0100
diff --git a/patches/buildroot/2011.05/051a-u-boot-add_copy_to_functionnality.patch b/patches/buildroot/2011.05/051a-u-boot-add_copy_to_functionnality.patch
index 0ed575a..bfea988 100644
--- a/patches/buildroot/2011.05/051a-u-boot-add_copy_to_functionnality.patch
+++ b/patches/buildroot/2011.05/051a-u-boot-add_copy_to_functionnality.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/boot/u-boot/Config.in
===================================================================
---- buildroot.orig/boot/u-boot/Config.in 2010-06-17 16:45:13.000000000 +0200
-+++ buildroot/boot/u-boot/Config.in 2010-06-17 16:46:45.000000000 +0200
-@@ -79,6 +79,12 @@
+--- buildroot.orig/boot/u-boot/Config.in 2011-08-08 12:12:00.000000000 +0200
++++ buildroot/boot/u-boot/Config.in 2011-08-08 12:13:33.000000000 +0200
+@@ -87,6 +87,12 @@
help
Install fw_printenv / fw_setenv tools in target.
@@ -21,9 +21,9 @@ Index: buildroot/boot/u-boot/Config.in
default y
Index: buildroot/boot/u-boot/u-boot.mk
===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk 2010-06-17 16:45:13.000000000 +0200
-+++ buildroot/target/u-boot/u-boot.mk 2010-06-17 16:46:45.000000000 +0200
-@@ -54,6 +54,11 @@
+--- buildroot.orig/boot/u-boot/u-boot.mk 2011-08-08 12:12:00.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk 2011-08-08 12:13:33.000000000 +0200
+@@ -56,6 +56,11 @@
U_BOOT_TARGETS+=$(TARGET_DIR)/usr/sbin/fw_printenv
endif
diff --git a/patches/buildroot/2011.05/051b-u-boot-change_board_name_default_value.patch b/patches/buildroot/2011.05/051b-u-boot-change_board_name_default_value.patch
index a2ff049..71330ea 100644
--- a/patches/buildroot/2011.05/051b-u-boot-change_board_name_default_value.patch
+++ b/patches/buildroot/2011.05/051b-u-boot-change_board_name_default_value.patch
@@ -2,8 +2,8 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: buildroot/boot/u-boot/Config.in
===================================================================
---- buildroot.orig/boot/u-boot/Config.in 2010-06-17 16:46:45.000000000 +0200
-+++ buildroot/boot/u-boot/Config.in 2010-06-17 16:46:48.000000000 +0200
+--- buildroot.orig/boot/u-boot/Config.in 2011-08-08 12:13:33.000000000 +0200
++++ buildroot/boot/u-boot/Config.in 2011-08-08 12:13:36.000000000 +0200
@@ -6,6 +6,7 @@
if BR2_TARGET_UBOOT
config BR2_TARGET_UBOOT_BOARDNAME
diff --git a/patches/buildroot/2011.05/051c-u-boot-makes_u-boot-clean_target_work.patch b/patches/buildroot/2011.05/051c-u-boot-makes_u-boot-clean_target_work.patch
index 094f511..c8f73ab 100644
--- a/patches/buildroot/2011.05/051c-u-boot-makes_u-boot-clean_target_work.patch
+++ b/patches/buildroot/2011.05/051c-u-boot-makes_u-boot-clean_target_work.patch
@@ -5,9 +5,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: buildroot/boot/u-boot/u-boot.mk
===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk 2010-06-17 16:46:45.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk 2010-06-17 16:46:50.000000000 +0200
-@@ -184,7 +184,8 @@
+--- buildroot.orig/boot/u-boot/u-boot.mk 2011-08-08 12:13:33.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk 2011-08-08 12:13:40.000000000 +0200
+@@ -180,7 +180,8 @@
u-boot: $(U_BOOT_TARGETS)
u-boot-clean:
diff --git a/patches/buildroot/2011.05/051d-u-boot-add_possibility_to_choose_board_header_file.patch b/patches/buildroot/2011.05/051d-u-boot-add_possibility_to_choose_board_header_file.patch
index 076c98b..d32b7c1 100644
--- a/patches/buildroot/2011.05/051d-u-boot-add_possibility_to_choose_board_header_file.patch
+++ b/patches/buildroot/2011.05/051d-u-boot-add_possibility_to_choose_board_header_file.patch
@@ -7,8 +7,8 @@ So this patch reverts the removing + refines it.
Index: buildroot/boot/u-boot/Config.in
===================================================================
---- buildroot.orig/boot/u-boot/Config.in 2010-11-25 10:14:04.000000000 +0100
-+++ buildroot/boot/u-boot/Config.in 2010-11-25 10:15:53.000000000 +0100
+--- buildroot.orig/boot/u-boot/Config.in 2011-08-08 12:13:36.000000000 +0200
++++ buildroot/boot/u-boot/Config.in 2011-08-08 12:13:43.000000000 +0200
@@ -11,6 +11,14 @@
One of U-Boot supported boards to be built.
This will be suffixed with _config to meet U-Boot standard naming.
@@ -23,12 +23,12 @@ Index: buildroot/boot/u-boot/Config.in
+
choice
prompt "U-Boot Version"
- default BR2_TARGET_UBOOT_2010_06
+ default BR2_TARGET_UBOOT_2011_03
Index: buildroot/boot/u-boot/u-boot.mk
===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk 2010-11-25 10:14:04.000000000 +0100
-+++ buildroot/boot/u-boot/u-boot.mk 2010-11-25 10:17:02.000000000 +0100
-@@ -45,7 +45,11 @@
+--- buildroot.orig/boot/u-boot/u-boot.mk 2011-08-08 12:13:40.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk 2011-08-08 12:13:43.000000000 +0200
+@@ -47,7 +47,11 @@
U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
endif
@@ -40,7 +40,7 @@ Index: buildroot/boot/u-boot/u-boot.mk
ifeq ($(BR2_TARGET_UBOOT_TOOL_MKIMAGE),y)
U_BOOT_TARGETS+=$(TARGET_DIR)/usr/bin/mkimage
-@@ -87,7 +91,13 @@
+@@ -89,7 +93,13 @@
endif
touch $@
diff --git a/patches/buildroot/2011.05/051e-u-boot-add_1.3.4_version_specific_support.patch b/patches/buildroot/2011.05/051e-u-boot-add_1.3.4_version_specific_support.patch
index 4388d42..14bfdfc 100644
--- a/patches/buildroot/2011.05/051e-u-boot-add_1.3.4_version_specific_support.patch
+++ b/patches/buildroot/2011.05/051e-u-boot-add_1.3.4_version_specific_support.patch
@@ -2,8 +2,8 @@ Specific for Armadeus boards.
Index: buildroot/boot/u-boot/Config.in
===================================================================
---- buildroot.orig/boot/u-boot/Config.in 2010-10-20 12:03:30.000000000 +0200
-+++ buildroot/boot/u-boot/Config.in 2010-10-20 13:42:06.000000000 +0200
+--- buildroot.orig/boot/u-boot/Config.in 2011-08-08 12:13:43.000000000 +0200
++++ buildroot/boot/u-boot/Config.in 2011-08-08 12:13:56.000000000 +0200
@@ -25,6 +25,9 @@
help
Select the specific U-Boot version you want to use
@@ -14,7 +14,7 @@ Index: buildroot/boot/u-boot/Config.in
config BR2_TARGET_UBOOT_2011_03
bool "2011.03"
-@@ -51,6 +54,7 @@
+@@ -54,6 +57,7 @@
config BR2_TARGET_UBOOT_VERSION
string
@@ -24,8 +24,8 @@ Index: buildroot/boot/u-boot/Config.in
default "2010.09" if BR2_TARGET_UBOOT_2010_09
Index: buildroot/boot/u-boot/u-boot.mk
===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk 2010-10-20 12:09:50.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk 2010-10-20 13:42:06.000000000 +0200
+--- buildroot.orig/boot/u-boot/u-boot.mk 2011-08-08 12:13:43.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk 2011-08-08 12:13:56.000000000 +0200
@@ -171,6 +171,11 @@
# Build manually mkimage for the target
$(TARGET_DIR)/usr/bin/mkimage: $(U_BOOT_DIR)/.configured
diff --git a/patches/buildroot/2011.05/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch b/patches/buildroot/2011.05/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
index 3556a8c..df84a30 100644
--- a/patches/buildroot/2011.05/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
+++ b/patches/buildroot/2011.05/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
@@ -2,9 +2,9 @@ Armadeus APF modules require some special U-Boot config variables to be set.
Index: buildroot/boot/u-boot/u-boot.mk
===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk 2010-10-20 13:42:06.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk 2010-10-20 13:42:14.000000000 +0200
-@@ -137,6 +137,17 @@
+--- buildroot.orig/boot/u-boot/u-boot.mk 2011-08-08 12:13:56.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk 2011-08-08 12:14:20.000000000 +0200
+@@ -139,6 +139,17 @@
endif
@echo "#endif /* __BR2_ADDED_CONFIG_H */" >> $(U_BOOT_INC_CONF_FILE)
endif # BR2_TARGET_UBOOT_NETWORK
diff --git a/patches/buildroot/2011.05/051g-u-boot-add_u-boot-unpacked_target.patch b/patches/buildroot/2011.05/051g-u-boot-add_u-boot-unpacked_target.patch
index d075b7f..789451e 100644
--- a/patches/buildroot/2011.05/051g-u-boot-add_u-boot-unpacked_target.patch
+++ b/patches/buildroot/2011.05/051g-u-boot-add_u-boot-unpacked_target.patch
@@ -2,9 +2,9 @@ Specific for Armadeus (needed by quiltify.sh script).
Index: buildroot/boot/u-boot/u-boot.mk
===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk 2010-10-20 13:42:14.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk 2010-10-20 13:42:17.000000000 +0200
-@@ -82,6 +82,8 @@
+--- buildroot.orig/boot/u-boot/u-boot.mk 2011-08-08 12:14:20.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk 2011-08-08 12:14:23.000000000 +0200
+@@ -84,6 +84,8 @@
| tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
touch $@
diff --git a/patches/buildroot/2011.05/051i-u-boot-support_config_sys_naming_convention.patch b/patches/buildroot/2011.05/051i-u-boot-support_config_sys_naming_convention.patch
index 51c0052..2713c4b 100644
--- a/patches/buildroot/2011.05/051i-u-boot-support_config_sys_naming_convention.patch
+++ b/patches/buildroot/2011.05/051i-u-boot-support_config_sys_naming_convention.patch
@@ -5,9 +5,9 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: buildroot/boot/u-boot/u-boot.mk
===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk 2011-01-20 23:21:24.000000000 +0100
-+++ buildroot/boot/u-boot/u-boot.mk 2011-01-25 22:41:46.000000000 +0100
-@@ -151,10 +151,14 @@ endif
+--- buildroot.orig/boot/u-boot/u-boot.mk 2011-08-08 12:14:23.000000000 +0200
++++ buildroot/boot/u-boot/u-boot.mk 2011-08-08 12:14:25.000000000 +0200
+@@ -147,10 +147,14 @@
ifneq ($(BR2_TARGET_ARMADEUS_SDRAM_SIZE),)
$(SED) "s,^#define CFG_SDRAM_MBYTE_SYZE.*,#define CFG_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
$(U_BOOT_INC_CONF_FILE)
diff --git a/patches/buildroot/2011.05/052-linux-adds_linux26-patched_target_to_Makefile.patch b/patches/buildroot/2011.05/052-linux-adds_linux26-patched_target_to_Makefile.patch
index 303a947..e5a13dc 100644
--- a/patches/buildroot/2011.05/052-linux-adds_linux26-patched_target_to_Makefile.patch
+++ b/patches/buildroot/2011.05/052-linux-adds_linux26-patched_target_to_Makefile.patch
@@ -2,10 +2,10 @@ Specific for Armadeus (needed by script/quiltify.sh)
Index: buildroot/linux/linux.mk
===================================================================
---- buildroot.orig/linux/linux.mk 2010-10-19 15:51:03.000000000 +0200
-+++ buildroot/linux/linux.mk 2010-10-19 15:55:06.000000000 +0200
-@@ -81,6 +81,8 @@
- endif
+--- buildroot.orig/linux/linux.mk 2011-08-08 12:12:49.000000000 +0200
++++ buildroot/linux/linux.mk 2011-08-08 12:14:28.000000000 +0200
+@@ -106,6 +106,8 @@
+ done
$(Q)touch $@
+linux26-patched: $(LINUX26_DIR)/.stamp_extracted
diff --git a/patches/buildroot/2011.05/055-pyserial-add_package.patch b/patches/buildroot/2011.05/055-pyserial-add_package.patch
index b88161e..3b0ddbc 100644
--- a/patches/buildroot/2011.05/055-pyserial-add_package.patch
+++ b/patches/buildroot/2011.05/055-pyserial-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-01-27 15:24:02.000000000 +0100
-+++ buildroot/package/Config.in 2011-01-27 15:24:29.000000000 +0100
-@@ -230,6 +230,7 @@
+--- buildroot.orig/package/Config.in 2011-08-08 12:13:12.000000000 +0200
++++ buildroot/package/Config.in 2011-08-08 12:14:30.000000000 +0200
+@@ -239,6 +239,7 @@
source "package/microperl/Config.in"
source "package/php/Config.in"
source "package/python/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/pyserial/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pyserial/Config.in 2011-01-27 15:24:29.000000000 +0100
++++ buildroot/package/pyserial/Config.in 2011-08-08 12:14:30.000000000 +0200
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_PYSERIAL
+ bool "pyserial"
@@ -27,7 +27,7 @@ Index: buildroot/package/pyserial/Config.in
Index: buildroot/package/pyserial/pyserial.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pyserial/pyserial.mk 2011-01-27 15:24:29.000000000 +0100
++++ buildroot/package/pyserial/pyserial.mk 2011-08-08 12:14:30.000000000 +0200
@@ -0,0 +1,33 @@
+PYSERIAL_VERSION=2.2
+PYSERIAL_SOURCE=pyserial-$(PYSERIAL_VERSION).zip
diff --git a/patches/buildroot/2011.05/057-pymysql-add_package.patch b/patches/buildroot/2011.05/057-pymysql-add_package.patch
index 72a1fd1..5d42d7d 100644
--- a/patches/buildroot/2011.05/057-pymysql-add_package.patch
+++ b/patches/buildroot/2011.05/057-pymysql-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-01-27 15:24:29.000000000 +0100
-+++ buildroot/package/Config.in 2011-01-27 15:24:30.000000000 +0100
-@@ -231,6 +231,7 @@
+--- buildroot.orig/package/Config.in 2011-08-08 12:14:30.000000000 +0200
++++ buildroot/package/Config.in 2011-08-08 12:14:33.000000000 +0200
+@@ -240,6 +240,7 @@
source "package/php/Config.in"
source "package/python/Config.in"
source "package/pyserial/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/pymysql/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pymysql/Config.in 2011-01-27 15:24:30.000000000 +0100
++++ buildroot/package/pymysql/Config.in 2011-08-08 12:14:33.000000000 +0200
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYMYSQL
+ depends on BR2_PACKAGE_PYTHON
@@ -31,7 +31,7 @@ Index: buildroot/package/pymysql/Config.in
Index: buildroot/package/pymysql/pymysql.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pymysql/pymysql.mk 2011-01-27 15:24:30.000000000 +0100
++++ buildroot/package/pymysql/pymysql.mk 2011-08-08 12:14:33.000000000 +0200
@@ -0,0 +1,76 @@
+#############################################################
+#
@@ -112,7 +112,7 @@ Index: buildroot/package/pymysql/pymysql.mk
Index: buildroot/package/pymysql/pymysql-000-setup.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pymysql/pymysql-000-setup.patch 2011-01-27 15:24:30.000000000 +0100
++++ buildroot/package/pymysql/pymysql-000-setup.patch 2011-08-08 12:14:33.000000000 +0200
@@ -0,0 +1,12 @@
+--- MySQL-python-1.2.2/setup.py 2007-02-25 04:37:12.000000000 +0100
++++ MySQL-python-1.2.2/setup.py 2007-08-15 12:23:18.000000000 +0200
@@ -129,7 +129,7 @@ Index: buildroot/package/pymysql/pymysql-000-setup.patch
Index: buildroot/package/pymysql/pymysql-010-threadsafe.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pymysql/pymysql-010-threadsafe.patch 2011-01-27 15:24:30.000000000 +0100
++++ buildroot/package/pymysql/pymysql-010-threadsafe.patch 2011-08-08 12:14:33.000000000 +0200
@@ -0,0 +1,11 @@
+--- MySQL-python-1.2.2/site_orig.cfg 2007-08-15 12:58:40.000000000 +0200
++++ MySQL-python-1.2.2/site.cfg 2007-08-15 12:58:49.000000000 +0200
diff --git a/patches/buildroot/2011.05/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch b/patches/buildroot/2011.05/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
index d8f20b4..3036afb 100644
--- a/patches/buildroot/2011.05/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
+++ b/patches/buildroot/2011.05/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
@@ -1,13 +1,13 @@
Index: buildroot/linux/linux.mk
===================================================================
---- buildroot.orig/linux/linux.mk 2011-01-27 15:24:26.000000000 +0100
-+++ buildroot/linux/linux.mk 2011-01-27 15:24:32.000000000 +0100
+--- buildroot.orig/linux/linux.mk 2011-08-08 12:14:28.000000000 +0200
++++ buildroot/linux/linux.mk 2011-08-08 12:14:37.000000000 +0200
@@ -113,6 +113,8 @@
- $(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config)
- endif
+ $(LINUX26_DIR)/.stamp_configured: $(LINUX26_DIR)/.stamp_patched
+ @$(call MESSAGE,"Configuring kernel")
ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
+ $(SED) "s,^ARCH.*,ARCH=$(KERNEL_ARCH),g;" $(LINUX26_DIR)/Makefile
+ $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX26_DIR)/Makefile
(ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(LINUX26_DIR)/drivers/armadeus)
endif
- $(TARGET_MAKE_ENV) $(MAKE) $(LINUX26_MAKE_FLAGS) -C $(@D) oldconfig
+ ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)
diff --git a/patches/buildroot/2011.05/071-linux-change_board_specific_patches_name.patch b/patches/buildroot/2011.05/071-linux-change_board_specific_patches_name.patch
new file mode 100644
index 0000000..fb0f3eb
--- /dev/null
+++ b/patches/buildroot/2011.05/071-linux-change_board_specific_patches_name.patch
@@ -0,0 +1,13 @@
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk 2011-08-04 18:30:49.000000000 +0200
++++ buildroot/linux/linux.mk 2011-08-04 18:32:09.000000000 +0200
+@@ -99,7 +99,7 @@
+ if echo $$p | grep -q -E "^ftp://|^http://" ; then \
+ toolchain/patch-kernel.sh $(@D) $(DL_DIR) `basename $$p` ; \
+ elif test -d $$p ; then \
+- toolchain/patch-kernel.sh $(@D) $$p linux-\*.patch ; \
++ toolchain/patch-kernel.sh $(@D) $$p \*.patch ; \
+ else \
+ toolchain/patch-kernel.sh $(@D) `dirname $$p` `basename $$p` ; \
+ fi \
diff --git a/patches/buildroot/2011.05/072-xenomai-package.patch b/patches/buildroot/2011.05/072-xenomai-package.patch
index d1ec084..36c844f 100644
--- a/patches/buildroot/2011.05/072-xenomai-package.patch
+++ b/patches/buildroot/2011.05/072-xenomai-package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in
-+++ buildroot/package/Config.in
-@@ -208,6 +208,7 @@ source "package/usb_modeswitch/Config.in
+--- buildroot.orig/package/Config.in 2011-08-08 12:14:33.000000000 +0200
++++ buildroot/package/Config.in 2011-08-08 12:14:41.000000000 +0200
+@@ -217,6 +217,7 @@
source "package/usbmount/Config.in"
source "package/usbutils/Config.in"
source "package/wipe/Config.in"
@@ -16,11 +16,11 @@ Index: buildroot/package/Config.in
Index: buildroot/linux/linux.mk
===================================================================
---- buildroot.orig/linux/linux.mk
-+++ buildroot/linux/linux.mk
-@@ -117,6 +117,9 @@ ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
- $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX26_DIR)/Makefile
- (ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(LINUX26_DIR)/drivers/armadeus)
+--- buildroot.orig/linux/linux.mk 2011-08-08 12:14:40.000000000 +0200
++++ buildroot/linux/linux.mk 2011-08-08 12:14:41.000000000 +0200
+@@ -149,6 +149,9 @@
+ ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
+ $(call KCONFIG_SET_OPT,CONFIG_UEVENT_HELPER_PATH,\"/sbin/mdev\",$(@D)/.config)
endif
+ifeq ($(BR2_PACKAGE_XENOMAI),y)
+ make -C ../buildroot xenomai-patch-kernel
@@ -30,8 +30,8 @@ Index: buildroot/linux/linux.mk
Index: buildroot/package/xenomai/Config.in
===================================================================
---- /dev/null
-+++ buildroot/package/xenomai/Config.in
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xenomai/Config.in 2011-08-08 12:14:41.000000000 +0200
@@ -0,0 +1,44 @@
+config BR2_PACKAGE_XENOMAI
+ bool "Xenomai"
@@ -79,8 +79,8 @@ Index: buildroot/package/xenomai/Config.in
+endif # BR2_PACKAGE_XENOMAI
Index: buildroot/package/xenomai/xenomai.mk
===================================================================
---- /dev/null
-+++ buildroot/package/xenomai/xenomai.mk
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xenomai/xenomai.mk 2011-08-08 12:14:41.000000000 +0200
@@ -0,0 +1,121 @@
+#############################################################
+#
@@ -205,8 +205,8 @@ Index: buildroot/package/xenomai/xenomai.mk
+endif
Index: buildroot/package/xenomai/xeno-kernel.config
===================================================================
---- /dev/null
-+++ buildroot/package/xenomai/xeno-kernel.config
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xenomai/xeno-kernel.config 2011-08-08 12:14:41.000000000 +0200
@@ -0,0 +1,69 @@
+CONFIG_XENOMAI=y
+CONFIG_XENO_OPT_NUCLEUS=y
@@ -279,8 +279,8 @@ Index: buildroot/package/xenomai/xeno-kernel.config
+# CONFIG_IPIPE_DEBUG is not set
Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
===================================================================
---- /dev/null
-+++ 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 2011-08-08 12:14:41.000000000 +0200
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-imx/include/mach/imxfb.h
++++ b/arch/arm/mach-imx/include/mach/imxfb.h
@@ -294,8 +294,8 @@ Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.pat
+ #define PCR_LPPOL (1 << 22)
Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
===================================================================
---- /dev/null
-+++ 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 2011-08-08 12:14:41.000000000 +0200
@@ -0,0 +1,23 @@
+Corrects Freeze problem with MX2 when Adeos is active and
+application/driver uses interruption on GPIO
@@ -322,8 +322,8 @@ Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_wit
+
Index: buildroot/package/xenomai/02-xenomai-makes_cond_torture_test_compiles_again.patch
===================================================================
---- /dev/null
-+++ buildroot/package/xenomai/02-xenomai-makes_cond_torture_test_compiles_again.patch
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/xenomai/02-xenomai-makes_cond_torture_test_compiles_again.patch 2011-08-08 12:14:41.000000000 +0200
@@ -0,0 +1,18 @@
+--- a/src/testsuite/unit/cond-torture.c
++++ b/src/testsuite/unit/cond-torture.c
@@ -345,8 +345,8 @@ Index: buildroot/package/xenomai/02-xenomai-makes_cond_torture_test_compiles_aga
+ }
Index: buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch
===================================================================
---- /dev/null
-+++ buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-08-08 12:14:41.000000000 +0200
@@ -0,0 +1,21 @@
+Spinlocks are not implemented in uClibc when using old pthread API.
+Xenomai (clock_test) uses this flag to enable or not spinlocking and so, if
@@ -371,8 +371,8 @@ Index: buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_wit
+ #define _POSIX_SPAWN 200112L
Index: buildroot/toolchain/uClibc/uClibc-0.9.30.3-spin_locks_are_not_supported_with_old_pthread_api.patch
===================================================================
---- /dev/null
-+++ buildroot/toolchain/uClibc/uClibc-0.9.30.3-spin_locks_are_not_supported_with_old_pthread_api.patch
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/toolchain/uClibc/uClibc-0.9.30.3-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-08-08 12:14:41.000000000 +0200
@@ -0,0 +1,22 @@
+Spinlocks are not implemented in uClibc when using old pthread API.
+Xenomai (clock_test) uses this flag to enable or not spinlocking and so, if
diff --git a/patches/buildroot/2011.05/081-adds_quake_package.patch b/patches/buildroot/2011.05/081-adds_quake_package.patch
index c90bf77..7dfb11e 100644
--- a/patches/buildroot/2011.05/081-adds_quake_package.patch
+++ b/patches/buildroot/2011.05/081-adds_quake_package.patch
@@ -16,7 +16,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/games/sdlquake/sdlquake.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake.mk 2010-12-14 08:48:47.000000000 +0100
++++ buildroot/package/games/sdlquake/sdlquake.mk 2011-08-08 12:14:46.000000000 +0200
@@ -0,0 +1,36 @@
+#############################################################
+#
@@ -57,7 +57,7 @@ Index: buildroot/package/games/sdlquake/sdlquake.mk
Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2010-12-14 08:27:38.000000000 +0100
++++ buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm 2011-08-08 12:14:46.000000000 +0200
@@ -0,0 +1,35 @@
+--- /tmp/Makefile.am 2008-08-11 20:31:09.000000000 +0200
++++ sdlquake-1.0.9/Makefile.am 2008-08-11 20:55:00.263198000 +0200
@@ -97,7 +97,7 @@ Index: buildroot/package/games/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
Index: buildroot/package/games/sdlquake/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/sdlquake/Config.in 2010-12-14 08:27:38.000000000 +0100
++++ buildroot/package/games/sdlquake/Config.in 2011-08-08 12:14:46.000000000 +0200
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_SDLQUAKE
+ bool "sdlquake"
@@ -112,7 +112,7 @@ Index: buildroot/package/games/sdlquake/Config.in
Index: buildroot/package/games/quake-pak/quake-pak.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/quake-pak/quake-pak.mk 2010-12-14 08:27:38.000000000 +0100
++++ buildroot/package/games/quake-pak/quake-pak.mk 2011-08-08 12:14:46.000000000 +0200
@@ -0,0 +1,34 @@
+#############################################################
+#
@@ -151,7 +151,7 @@ Index: buildroot/package/games/quake-pak/quake-pak.mk
Index: buildroot/package/games/quake-pak/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/quake-pak/Config.in 2010-12-14 08:27:38.000000000 +0100
++++ buildroot/package/games/quake-pak/Config.in 2011-08-08 12:14:46.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_QUAKE_PAK
+ bool "shareware Quake PAK/WAD file"
@@ -162,11 +162,11 @@ Index: buildroot/package/games/quake-pak/Config.in
+ The file will be placed in the /usr/share/games/quake/ directory.
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-12-14 08:27:38.000000000 +0100
-+++ buildroot/package/Config.in 2010-12-14 08:55:59.000000000 +0100
-@@ -83,8 +83,10 @@
+--- buildroot.orig/package/Config.in 2011-08-08 12:14:41.000000000 +0200
++++ buildroot/package/Config.in 2011-08-08 12:14:46.000000000 +0200
+@@ -87,8 +87,10 @@
+ menu "Games"
source "package/games/gnuchess/Config.in"
- source "package/games/magiccube4d/Config.in"
source "package/games/prboom/Config.in"
+source "package/games/quake-pak/Config.in"
source "package/games/doom-wad/Config.in"
diff --git a/patches/buildroot/2011.05/083-adds_pygame_package.patch b/patches/buildroot/2011.05/083-adds_pygame_package.patch
index c6f5d7b..79544fe 100644
--- a/patches/buildroot/2011.05/083-adds_pygame_package.patch
+++ b/patches/buildroot/2011.05/083-adds_pygame_package.patch
@@ -13,7 +13,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/pygame/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/Config.in 2011-01-27 15:24:42.000000000 +0100
++++ buildroot/package/pygame/Config.in 2011-08-08 12:14:50.000000000 +0200
@@ -0,0 +1,92 @@
+config BR2_PACKAGE_PYGAME
+ bool "pygame"
@@ -110,7 +110,7 @@ Index: buildroot/package/pygame/Config.in
Index: buildroot/package/pygame/pygame.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/pygame.mk 2011-01-27 15:24:42.000000000 +0100
++++ buildroot/package/pygame/pygame.mk 2011-08-08 12:14:50.000000000 +0200
@@ -0,0 +1,100 @@
+#
+# Pygame
@@ -214,9 +214,9 @@ Index: buildroot/package/pygame/pygame.mk
+endif
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-01-27 15:24:39.000000000 +0100
-+++ buildroot/package/Config.in 2011-01-27 15:24:42.000000000 +0100
-@@ -108,6 +108,7 @@
+--- buildroot.orig/package/Config.in 2011-08-08 12:14:46.000000000 +0200
++++ buildroot/package/Config.in 2011-08-08 12:14:50.000000000 +0200
+@@ -112,6 +112,7 @@
source "package/imagemagick/Config.in"
source "package/linux-fusion/Config.in"
source "package/lite/Config.in"
@@ -227,7 +227,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/pygame/Setup
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/Setup 2011-01-27 15:24:42.000000000 +0100
++++ buildroot/package/pygame/Setup 2011-08-08 12:14:50.000000000 +0200
@@ -0,0 +1,64 @@
+#This Setup file is used by the setup.py script to configure the
+#python extensions. You will likely use the "config.py" which will
diff --git a/patches/buildroot/2011.05/085-adds_gpm_package.patch b/patches/buildroot/2011.05/085-adds_gpm_package.patch
index bbc9469..89f009e 100644
--- a/patches/buildroot/2011.05/085-adds_gpm_package.patch
+++ b/patches/buildroot/2011.05/085-adds_gpm_package.patch
@@ -5,7 +5,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/gpm/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/Config.in 2011-01-27 15:24:45.000000000 +0100
++++ buildroot/package/gpm/Config.in 2011-08-08 12:14:55.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_GPM
+ bool "gpm mouse server"
@@ -17,7 +17,7 @@ Index: buildroot/package/gpm/Config.in
Index: buildroot/package/gpm/gpm.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm.mk 2011-01-27 15:24:45.000000000 +0100
++++ buildroot/package/gpm/gpm.mk 2011-08-08 12:14:55.000000000 +0200
@@ -0,0 +1,18 @@
+#############################################################
+#
@@ -40,7 +40,7 @@ Index: buildroot/package/gpm/gpm.mk
Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch 2011-01-27 15:24:45.000000000 +0100
++++ buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch 2011-08-08 12:14:55.000000000 +0200
@@ -0,0 +1,77 @@
+
+Replaces all "obsolete" functions (at least to compile for uClibc).
@@ -121,10 +121,10 @@ Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
+ gpm_report (GPM_PR_WARN,"Flag value (%s) for parameter %s is invalid",
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-01-27 15:24:42.000000000 +0100
-+++ buildroot/package/Config.in 2011-01-27 15:24:45.000000000 +0100
-@@ -173,6 +173,7 @@
- source "package/gadgetfs-test/Config.in"
+--- buildroot.orig/package/Config.in 2011-08-08 12:14:50.000000000 +0200
++++ buildroot/package/Config.in 2011-08-08 12:14:55.000000000 +0200
+@@ -178,6 +178,7 @@
+ source "package/gdisk/Config.in"
source "package/genext2fs/Config.in"
source "package/genromfs/Config.in"
+source "package/gpm/Config.in"
@@ -134,7 +134,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch 2011-01-27 15:24:45.000000000 +0100
++++ buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch 2011-08-08 12:14:55.000000000 +0200
@@ -0,0 +1,30 @@
+GPM asks "install" to strip the executables while installing it.
+This doesn't seems cross-compiling friendly, so remove the option (-s) and let
diff --git a/patches/buildroot/2011.05/095-uucp-add_packages.patch b/patches/buildroot/2011.05/095-uucp-add_packages.patch
index b426ca8..bfe74c0 100644
--- a/patches/buildroot/2011.05/095-uucp-add_packages.patch
+++ b/patches/buildroot/2011.05/095-uucp-add_packages.patch
@@ -6,9 +6,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-05-27 15:32:05.000000000 +0200
-+++ buildroot/package/Config.in 2011-05-27 16:47:49.000000000 +0200
-@@ -448,6 +448,7 @@
+--- buildroot.orig/package/Config.in 2011-08-08 12:14:55.000000000 +0200
++++ buildroot/package/Config.in 2011-08-08 12:14:59.000000000 +0200
+@@ -463,6 +463,7 @@
source "package/tn5250/Config.in"
source "package/ttcp/Config.in"
source "package/udpcast/Config.in"
@@ -19,7 +19,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/uucp/uucp.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/uucp/uucp.mk 2011-05-27 16:47:39.000000000 +0200
++++ buildroot/package/uucp/uucp.mk 2011-08-08 12:14:59.000000000 +0200
@@ -0,0 +1,23 @@
+#############################################################
+#
@@ -47,7 +47,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 2011-05-27 16:25:57.000000000 +0200
++++ buildroot/package/uucp/Config.in 2011-08-08 12:14:59.000000000 +0200
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_UUCP
+ bool "uucp"
diff --git a/patches/buildroot/2011.05/097-adds_flite_package.patch b/patches/buildroot/2011.05/097-adds_flite_package.patch
index 4e8b1ab..43dff14 100644
--- a/patches/buildroot/2011.05/097-adds_flite_package.patch
+...
[truncated message content] |
|
From: jorasse <jo...@us...> - 2011-08-07 18:23:22
|
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 70c1869bbc50976b9a1d5f52a6b7677b3e2876c7 (commit)
from d2c7479be55e0123152aabb2a4481f44473595c3 (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 70c1869bbc50976b9a1d5f52a6b7677b3e2876c7
Author: Eric Jarrige <eri...@ar...>
Date: Sun Aug 7 20:29:06 2011 +0200
[BUILROOT] split patch 155 into 2 patch files
-----------------------------------------------------------------------
Summary of changes:
.../155-u.boot-support_for_release_2011_06.patch | 12 +-----------
.../156-u.boot-remove-u-boot-patch-prefix.patch | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 11 deletions(-)
create mode 100644 patches/buildroot/2010.11/156-u.boot-remove-u-boot-patch-prefix.patch
diff --git a/patches/buildroot/2010.11/155-u.boot-support_for_release_2011_06.patch b/patches/buildroot/2010.11/155-u.boot-support_for_release_2011_06.patch
index 336f5c9..c9b41f0 100644
--- a/patches/buildroot/2010.11/155-u.boot-support_for_release_2011_06.patch
+++ b/patches/buildroot/2010.11/155-u.boot-support_for_release_2011_06.patch
@@ -25,14 +25,4 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
default "2010.06" if BR2_TARGET_UBOOT_2010_06
default "2010.03" if BR2_TARGET_UBOOT_2010_03
default "2009.11" if BR2_TARGET_UBOOT_2009_11
---- a/boot/u-boot/u-boot.mk
-+++ b/boot/u-boot/u-boot.mk
-@@ -95,7 +95,7 @@ $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.u
- u-boot-$(U_BOOT_VERSION)-\*.patch \
- u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH)
- ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
-- toolchain/patch-kernel.sh $(U_BOOT_DIR) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) u-boot-$(U_BOOT_VERSION)-\*.patch
-+ toolchain/patch-kernel.sh $(U_BOOT_DIR) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) *.patch
- endif
- touch $@
-
+
diff --git a/patches/buildroot/2010.11/156-u.boot-remove-u-boot-patch-prefix.patch b/patches/buildroot/2010.11/156-u.boot-remove-u-boot-patch-prefix.patch
new file mode 100644
index 0000000..5094029
--- /dev/null
+++ b/patches/buildroot/2010.11/156-u.boot-remove-u-boot-patch-prefix.patch
@@ -0,0 +1,19 @@
+U-Boot: Remove u-boot patch prefix from filename
+
+Remove expected u-boot prefix from U-Boot patches in order to manage patches
+with patch mangement tools such as quilt or stgit
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+
+--- a/boot/u-boot/u-boot.mk
++++ b/boot/u-boot/u-boot.mk
+@@ -95,7 +95,7 @@ $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.u
+ u-boot-$(U_BOOT_VERSION)-\*.patch \
+ u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH)
+ ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
+- toolchain/patch-kernel.sh $(U_BOOT_DIR) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) u-boot-$(U_BOOT_VERSION)-\*.patch
++ toolchain/patch-kernel.sh $(U_BOOT_DIR) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) *.patch
+ endif
+ touch $@
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2011-08-06 21:08:28
|
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 d2c7479be55e0123152aabb2a4481f44473595c3 (commit)
from 2b159105d548b8fd0be1229920c322501cf3e474 (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 d2c7479be55e0123152aabb2a4481f44473595c3
Author: Eric Jarrige <eri...@ar...>
Date: Sat Aug 6 23:02:25 2011 +0200
[UBOOT][2011.06] workaround to have U-Boot runnable from either Flash or RAM
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf9328/apf9328-u-boot-2011.06.h | 2 +-
patches/u-boot/2011.06/02-apf9328.patch | 50 ++++++++++++++------
patches/u-boot/2011.06/03-apf9328-makefile.patch | 19 ++++----
patches/u-boot/2011.06/04-apf9328-config.patch | 4 +-
patches/u-boot/2011.06/07-mx1-relocation.patch | 2 +-
patches/u-boot/2011.06/series | 2 +-
6 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
index c004b29..b5b5794 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
@@ -407,7 +407,7 @@
#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_SDRAM_1_BASE
#ifndef CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_TEXT_BASE 0x10000000
+#define CONFIG_SYS_TEXT_BASE 0x08E00000
#endif
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x0f00000)
diff --git a/patches/u-boot/2011.06/02-apf9328.patch b/patches/u-boot/2011.06/02-apf9328.patch
index c99880f..a2b8433 100644
--- a/patches/u-boot/2011.06/02-apf9328.patch
+++ b/patches/u-boot/2011.06/02-apf9328.patch
@@ -5,16 +5,16 @@ Add Armadeus Project board APF9328
Signed-off-by: Eric Jarrige <eri...@ar...>
Signed-off-by: Nicolas Colombain <nic...@ar...>
---
- board/armadeus/apf9328/Makefile | 51 ++++
- board/armadeus/apf9328/apf9328.c | 91 +++++++
+ board/armadeus/apf9328/Makefile | 51 +++
+ board/armadeus/apf9328/apf9328.c | 91 ++++++
board/armadeus/apf9328/apf9328fpga.c | 89 ++++++
board/armadeus/apf9328/apf9328fpga.h | 31 ++
board/armadeus/apf9328/eeprom.c | 88 ++++++
- board/armadeus/apf9328/fpga.c | 121 +++++++++
+ board/armadeus/apf9328/fpga.c | 121 ++++++++
board/armadeus/apf9328/fpga.h | 30 ++
- board/armadeus/apf9328/i2c.c | 276 ++++++++++++++++++++
- board/armadeus/apf9328/lowlevel_init.S | 448 ++++++++++++++++++++++++++++++++
- 9 files changed, 1225 insertions(+), 0 deletions(-)
+ board/armadeus/apf9328/i2c.c | 276 +++++++++++++++++++
+ board/armadeus/apf9328/lowlevel_init.S | 470 ++++++++++++++++++++++++++++++++
+ 9 files changed, 1247 insertions(+), 0 deletions(-)
create mode 100644 board/armadeus/apf9328/Makefile
create mode 100644 board/armadeus/apf9328/apf9328.c
create mode 100644 board/armadeus/apf9328/apf9328fpga.c
@@ -852,10 +852,10 @@ index 0000000..0ba0a8d
+#endif /* CONFIG_HARD_I2C */
diff --git a/board/armadeus/apf9328/lowlevel_init.S b/board/armadeus/apf9328/lowlevel_init.S
new file mode 100644
-index 0000000..55955b7
+index 0000000..f17bcf9
--- /dev/null
+++ b/board/armadeus/apf9328/lowlevel_init.S
-@@ -0,0 +1,448 @@
+@@ -0,0 +1,470 @@
+/*
+ * (C) Copyright 2005-2011 ej Armadeus Project <eri...@ar...>
+ * Copyright (C) 2004 Sascha Hauer, Synertronixx GmbH
@@ -883,9 +883,6 @@ index 0000000..55955b7
+
+.globl lowlevel_init
+lowlevel_init:
-+
-+ mov r10, lr
-+
+/* Change PERCLK1DIV to 14 ie 14+1 */
+ ldr r0, =PCDR
+ ldr r1, =CONFIG_SYS_PCDR_VAL
@@ -1267,7 +1264,7 @@ index 0000000..55955b7
+ /* test if we run from flash or RAM */
+ ldr r1, =CONFIG_SYS_FLASH_BASE
+ cmp r0, r1 /* don't reloc during debug */
-+ bmi endofmemsetup
++ bmi copy2ram
+
+/* SDRAM Setup */
+sdramsetup:
@@ -1301,6 +1298,31 @@ index 0000000..55955b7
+
+ ldr r1, =CONFIG_SYS_NORMAL_RW_CMD
+ str r1, [r0]
++/* make U-Boot runnable form "almost" anywhere */
++/* but SYS_TEXT_BASE should be in RAM */
++copy2ram: /* populate _TEXT_BASE with U-Boot from load addr */
++ ldr r0, _start_adr
++ ldr r1, _copy2ram
++ sub r1, r1, r0
++ adr r0, copy2ram
++ sub r0, r0, r1
++ ldr r1, =CONFIG_SYS_TEXT_BASE
++ cmp r0, r1
++ beq end_of_copy2ram /* skip U-Boot copy */
++ ldr r2, =CONFIG_SYS_MONITOR_LEN
++ add r2, r2, r0 /* r2 <- source end address */
++
++copy_loop:
++ ldmia r0!, {r9-r10} /* copy from source address [r0] */
++ stmia r1!, {r9-r10} /* copy to target address [r1] */
++ cmp r0, r2 /* until source end address [r2] */
++ blo copy_loop
++
++end_of_copy2ram:
++ mov pc,lr
++
++_copy2ram:
++ .word copy2ram
++_start_adr:
++ .word _start
+
-+endofmemsetup:
-+ mov pc,r10
diff --git a/patches/u-boot/2011.06/03-apf9328-makefile.patch b/patches/u-boot/2011.06/03-apf9328-makefile.patch
index a15fd2e..72cbf14 100644
--- a/patches/u-boot/2011.06/03-apf9328-makefile.patch
+++ b/patches/u-boot/2011.06/03-apf9328-makefile.patch
@@ -6,14 +6,14 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
---
MAINTAINERS | 4 ++++
MAKEALL | 1 +
- boards.cfg | 2 ++
- 3 files changed, 7 insertions(+), 0 deletions(-)
+ boards.cfg | 1 +
+ 3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
-index 6e6affa..c81a2e1 100644
+index f8d8559..7b8d537 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -683,6 +683,10 @@ Grazvydas Ignotas <no...@gm...>
+@@ -681,6 +681,10 @@ Grazvydas Ignotas <no...@gm...>
omap3_pandora ARM ARMV7 (OMAP3xx SoC)
@@ -25,10 +25,10 @@ index 6e6affa..c81a2e1 100644
smdk2400 ARM920T
diff --git a/MAKEALL b/MAKEALL
-index 4adaeb8..5ac6ecc 100755
+index 266e231..0f460bf 100755
--- a/MAKEALL
+++ b/MAKEALL
-@@ -322,6 +322,7 @@ LIST_ARM7=" \
+@@ -320,6 +320,7 @@ LIST_ARM7=" \
LIST_ARM9=" \
a320evb \
@@ -37,15 +37,14 @@ index 4adaeb8..5ac6ecc 100755
ap922_XA10 \
ap926ejs \
diff --git a/boards.cfg b/boards.cfg
-index 5cfaa78..b5309ab 100644
+index 3e79c82..43860ce 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -49,6 +49,8 @@ lpc2292sodimm arm arm720t - -
+@@ -49,6 +49,7 @@ lpc2292sodimm arm arm720t - -
SMN42 arm arm720t - siemens lpc2292
evb4510 arm arm720t - - s3c4510b
a320evb arm arm920t - faraday a320
-+apf9328 arm arm920t apf9328 armadeus imx apf9328:SYS_TEXT_BASE=0x00000000
-+apf9328_ram arm arm920t apf9328 armadeus imx apf9328:SYS_TEXT_BASE=0x08000000
++apf9328 arm arm920t apf9328 armadeus imx
at91rm9200ek arm arm920t at91rm9200ek atmel at91 at91rm9200ek
at91rm9200ek_ram arm arm920t at91rm9200ek atmel at91 at91rm9200ek:RAMBOOT
eb_cpux9k2 arm arm920t - BuS at91
diff --git a/patches/u-boot/2011.06/04-apf9328-config.patch b/patches/u-boot/2011.06/04-apf9328-config.patch
index 1374431..3b472e7 100644
--- a/patches/u-boot/2011.06/04-apf9328-config.patch
+++ b/patches/u-boot/2011.06/04-apf9328-config.patch
@@ -10,7 +10,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
diff --git a/include/configs/apf9328.h b/include/configs/apf9328.h
new file mode 100644
-index 0000000..c004b29
+index 0000000..b5b5794
--- /dev/null
+++ b/include/configs/apf9328.h
@@ -0,0 +1,1030 @@
@@ -423,7 +423,7 @@ index 0000000..c004b29
+
+#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_SDRAM_1_BASE
+#ifndef CONFIG_SYS_TEXT_BASE
-+#define CONFIG_SYS_TEXT_BASE 0x10000000
++#define CONFIG_SYS_TEXT_BASE 0x08E00000
+#endif
+
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x0f00000)
diff --git a/patches/u-boot/2011.06/07-mx1-relocation.patch b/patches/u-boot/2011.06/07-mx1-relocation.patch
index 19a48a0..cc01a26 100644
--- a/patches/u-boot/2011.06/07-mx1-relocation.patch
+++ b/patches/u-boot/2011.06/07-mx1-relocation.patch
@@ -9,7 +9,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S
-index a7476b0..3fee99f 100644
+index 0090f89..46c201a 100644
--- a/arch/arm/cpu/arm920t/start.S
+++ b/arch/arm/cpu/arm920t/start.S
@@ -292,9 +292,7 @@ _nand_boot_ofs:
diff --git a/patches/u-boot/2011.06/series b/patches/u-boot/2011.06/series
index 8c7b2de..d084963 100644
--- a/patches/u-boot/2011.06/series
+++ b/patches/u-boot/2011.06/series
@@ -1,4 +1,4 @@
-# This series applies on GIT commit 53232d507051884f12d3ead53144ee972fe8d627
+# This series applies on GIT commit 03d4ce814d094a148344c663b05bc802abc63a64
01-mx1-i2c.patch
02-apf9328.patch
03-apf9328-makefile.patch
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-08-05 15:12:05
|
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 2b159105d548b8fd0be1229920c322501cf3e474 (commit)
via 91a5a58223fdac8f8e7ec480877d9833d91d697e (commit)
from 52b05d53aad1f2a1d3770fd98fc8a858f99a7a44 (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 2b159105d548b8fd0be1229920c322501cf3e474
Author: Fabien Marteau <fab...@ar...>
Date: Fri Aug 5 17:10:37 2011 +0200
[linux][fpga] Little bug in probe error management for irq_manager
commit 91a5a58223fdac8f8e7ec480877d9833d91d697e
Author: Fabien Marteau <fab...@ar...>
Date: Fri Aug 5 16:27:59 2011 +0200
[linux][fpga] Include armadeus Makefile.in ignoring errors
-----------------------------------------------------------------------
Summary of changes:
.../fpga/virtual_components/button/Makefile | 2 +-
.../fpga/virtual_components/irq_mngr/main.c | 2 ++
.../modules/fpga/virtual_components/led/Makefile | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/target/linux/modules/fpga/virtual_components/button/Makefile b/target/linux/modules/fpga/virtual_components/button/Makefile
index d4bde09..2df8d7f 100755
--- a/target/linux/modules/fpga/virtual_components/button/Makefile
+++ b/target/linux/modules/fpga/virtual_components/button/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON) += button_ocore.o
button_ocore-objs := gbutton.o
ARMADEUS_BASE_DIR=../../../../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
KDIR := $(ARMADEUS_LINUX_DIR)
PWD := $(shell pwd)
diff --git a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
index 9b2f430..dcaf256 100644
--- a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
+++ b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
@@ -276,7 +276,9 @@ request_irq_error:
out_iounmap:
iounmap(mng->membase);
out_dev_free:
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,36)
kfree(mng);
+#endif
out_release_mem:
release_mem_region(mem_res->start, resource_size(mem_res));
diff --git a/target/linux/modules/fpga/virtual_components/led/Makefile b/target/linux/modules/fpga/virtual_components/led/Makefile
index 06eb19b..e8ac2e1 100644
--- a/target/linux/modules/fpga/virtual_components/led/Makefile
+++ b/target/linux/modules/fpga/virtual_components/led/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED) := led_ocore.o
led_ocore-objs := g_led.o
ARMADEUS_BASE_DIR=../../../../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
KDIR := $(ARMADEUS_LINUX_DIR)
PWD := $(shell pwd)
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-08-05 12:14: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 52b05d53aad1f2a1d3770fd98fc8a858f99a7a44 (commit)
from 6d44a5042a2864677164d1f1cf7e4ea05d77deec (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 52b05d53aad1f2a1d3770fd98fc8a858f99a7a44
Author: Fabien Marteau <fab...@ar...>
Date: Fri Aug 5 14:13:55 2011 +0200
[linux][fpga] delete useless s_led.c driver code
-----------------------------------------------------------------------
Summary of changes:
.../modules/fpga/virtual_components/led/s_led.c | 69 --------------------
1 files changed, 0 insertions(+), 69 deletions(-)
delete mode 100644 target/linux/modules/fpga/virtual_components/led/s_led.c
diff --git a/target/linux/modules/fpga/virtual_components/led/s_led.c b/target/linux/modules/fpga/virtual_components/led/s_led.c
deleted file mode 100644
index 19c2e3f..0000000
--- a/target/linux/modules/fpga/virtual_components/led/s_led.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- ***********************************************************************
- *
- * (c) Copyright 2008 Armadeus project
- * Fabien Marteau <fab...@ar...>
- * Specific led driver for generic led driver
- *
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- **********************************************************************
- */
-
-#include <linux/version.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-
-#include"led.h"
-
-
-static struct plat_led_port plat_led_data[] = {
- {
- .name = "led0",
- .num = 0,
- .membase = 0x04
- },
- {
- .name = "led1",
- .num = 1,
- .membase = 0x06
- },
-};
-
-static struct platform_device plat_led_device = {
- .name = "led",
- .id = 0,
- .dev = {
- .platform_data = plat_led_data
- },
-};
-
-static int __init sled_init(void)
-{
- return platform_device_register(&plat_led_device);
-}
-
-static void __exit sled_exit(void)
-{
- platform_device_unregister(&plat_led_device);
-}
-
-module_init(sled_init);
-module_exit(sled_exit);
-
-MODULE_AUTHOR("Fabien Marteau <fab...@ar...>");
-MODULE_DESCRIPTION("Driver to blink blink some LEDs");
-MODULE_LICENSE("GPL");
-
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-08-05 09:59:39
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 6d44a5042a2864677164d1f1cf7e4ea05d77deec (commit)
via 3e9022f46383bc17ceac0227950b986ba5c2f2f4 (commit)
via 30eaa1570d3c5f1440381ba8ca2ce965c01cd38d (commit)
from 2d4dde646bd4b5b19c808b025242da5d558ff0d9 (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 6d44a5042a2864677164d1f1cf7e4ea05d77deec
Merge: 3e9022f46383bc17ceac0227950b986ba5c2f2f4 2d4dde646bd4b5b19c808b025242da5d558ff0d9
Author: Fabien Marteau <fab...@ar...>
Date: Fri Aug 5 11:59:03 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 3e9022f46383bc17ceac0227950b986ba5c2f2f4
Author: Fabien Marteau <fab...@ar...>
Date: Fri Aug 5 11:58:42 2011 +0200
[linux][fpga] fix somes bugs in virtual components
commit 30eaa1570d3c5f1440381ba8ca2ce965c01cd38d
Author: Fabien Marteau <fab...@ar...>
Date: Fri Aug 5 11:58:10 2011 +0200
[linux][fpga] Make wishbone example working
-----------------------------------------------------------------------
Summary of changes:
.../fpga/board_designs/wishbone_example/Makefile | 2 +-
.../wishbone_example/wb_button/Makefile | 4 ++--
.../wishbone_example/wb_button/board_buttons.c | 2 +-
.../wishbone_example/wb_irq_mngr/Makefile | 4 +++-
.../wishbone_example/wb_irq_mngr/board_irq_mng.c | 2 +-
.../board_designs/wishbone_example/wb_led/Makefile | 3 ++-
.../wishbone_example/wb_led/board_leds.c | 2 +-
.../fpga/virtual_components/button/Makefile | 18 ++++++++++++++++--
.../fpga/virtual_components/button/testbutton.c | 4 ++--
.../modules/fpga/virtual_components/led/Makefile | 15 +++++++++++++++
10 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
index 7ecb740..7300da2 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
@@ -8,7 +8,7 @@
ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
-obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS) += wb_button/ wb_irq_mngr/ wb_led/
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE) += wb_button/ wb_irq_mngr/ wb_led/
else
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
index cd2f2e0..3dae375 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
@@ -4,8 +4,8 @@
ifneq ($(KERNELRELEASE),)
-obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_BUTTON_DRIVER) += board_buttons.o gbutton.o
-
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_BUTTON_DRIVER) += wb_example_buttons.o
+wb_example_buttons-objs := board_buttons.o
else
ARMADEUS_BASE_DIR=../../../../../..
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/board_buttons.c b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/board_buttons.c
index 0b70a8b..4223932 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/board_buttons.c
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/board_buttons.c
@@ -32,7 +32,7 @@
# include <mach/fpga.h>
#endif
-#include "button.h"
+#include "../../../virtual_components/button/button.h"
#define BUTTON0_IRQ IRQ_FPGA(0)
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
index e7313e2..35693be 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
@@ -6,7 +6,9 @@ ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
-obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER) += board_irq_mng.o test.o
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER) += wb_example_irq_mngr.o
+wb_example_irq_mngr-objs := board_irq_mng.o
+
else
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c
index 039f190..0727225 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c
@@ -34,7 +34,7 @@
# include <mach/fpga.h>
#endif
-#include "irq_mng.h"
+#include "../../../virtual_components/irq_mngr/irq_mng.h"
static struct resource irq_mng0_resources[] = {
[0] = {
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
index 9653ff8..eae0571 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
@@ -4,7 +4,8 @@
ifneq ($(KERNELRELEASE),)
-obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_LED_DRIVER) += board_leds.o g_led.o
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_LED_DRIVER) += wb_example_led.o
+wb_example_led-objs := board_leds.o
else
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/board_leds.c b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/board_leds.c
index 1b106b9..c4c4384 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/board_leds.c
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/board_leds.c
@@ -31,7 +31,7 @@
# include <mach/fpga.h>
#endif
-#include "led.h"
+#include "../../../virtual_components/led/led.h"
static struct resource led0_resources[] = {
[0] = {
diff --git a/target/linux/modules/fpga/virtual_components/button/Makefile b/target/linux/modules/fpga/virtual_components/button/Makefile
index a36fde2..d4bde09 100755
--- a/target/linux/modules/fpga/virtual_components/button/Makefile
+++ b/target/linux/modules/fpga/virtual_components/button/Makefile
@@ -1,4 +1,18 @@
+#
+# Makefile for the Armadeus FPGA button driver
+#
+
+obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON) += button_ocore.o
+button_ocore-objs := gbutton.o
+
+ARMADEUS_BASE_DIR=../../../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR := $(ARMADEUS_LINUX_DIR)
+PWD := $(shell pwd)
+
+test:
+ $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc -Wall testbutton.c -o testbutton
+ chmod 755 testbutton
-obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_BUTTON_DRIVER) += button_ocore.o
-button_ocore-objs := gbutton.c
diff --git a/target/linux/modules/fpga/virtual_components/button/testbutton.c b/target/linux/modules/fpga/virtual_components/button/testbutton.c
index c7d8960..2a4ca7a 100644
--- a/target/linux/modules/fpga/virtual_components/button/testbutton.c
+++ b/target/linux/modules/fpga/virtual_components/button/testbutton.c
@@ -22,11 +22,11 @@
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <signal.h>
-
int fd_button;
void quit(int signal)
@@ -45,7 +45,7 @@ void usage(char *prog_name)
int main(int argc, char *argv[])
{
- unsigned short i, value=0;
+ unsigned short value=0;
int count=0, max_count=0;
/* quit when Ctrl-C is pressed */
diff --git a/target/linux/modules/fpga/virtual_components/led/Makefile b/target/linux/modules/fpga/virtual_components/led/Makefile
index be6e091..06eb19b 100644
--- a/target/linux/modules/fpga/virtual_components/led/Makefile
+++ b/target/linux/modules/fpga/virtual_components/led/Makefile
@@ -1,3 +1,18 @@
+#
+# Makefile for the Armadeus FPGA led driver
+#
obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED) := led_ocore.o
led_ocore-objs := g_led.o
+
+ARMADEUS_BASE_DIR=../../../../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+KDIR := $(ARMADEUS_LINUX_DIR)
+PWD := $(shell pwd)
+
+test:
+ $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc -Wall testled.c -o testled
+ chmod 755 testled
+
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-08-05 09:38: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 2d4dde646bd4b5b19c808b025242da5d558ff0d9 (commit)
from a0ec624dc0eb1b9c0df6da95fa8df1b03d26b01f (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 2d4dde646bd4b5b19c808b025242da5d558ff0d9
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 5 11:36:56 2011 +0200
[BUILD] Add some refinements when displaying successfull BSP build (show most important components version)
-----------------------------------------------------------------------
Summary of changes:
Makefile | 11 ++++++++---
Makefile.in | 4 +++-
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 98b9c4f..a73849a 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,12 @@ ECHO_CONFIGURATION_NOT_DEFINED:= echo -en "\033[1m"; \
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 "Your Armadeus BSP (version "$(ARMADEUS_BSP_VERSION)" for "$(ARMADEUS_BOARD_NAME)") was successfully built !"; \
+ echo " gcc: "$(ARMADEUS_GCC_VERSION)""; \
+ echo " uClibc: "$(ARMADEUS_UCLIBC_VERSION)""; \
+ echo " busybox: "$(ARMADEUS_BUSYBOX_VERSION)""; \
+ echo " U-Boot: "$(ARMADEUS_U_BOOT_VERSION)""; \
+ echo " Linux: "$(ARMADEUS_LINUX_VERSION)""; \
echo ""; \
echo -en "\033[0m";
@@ -99,14 +104,14 @@ help:
$(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE):
mkdir -p $(BUILDROOT_FILE_PATH)
- wget --passive-ftp -P $(BUILDROOT_FILE_PATH) $(BUILDROOT_SITE)/$(BUILDROOT_SOURCE)
+ wget --passive-ftp -P $(BUILDROOT_FILE_PATH) $(BUILDROOT_SITE)/$(BUILDROOT_SOURCE)
buildroot-sources: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE)
$(BUILDROOT_DIR)/.unpacked: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) $(BUILDROOT_PATCH_DIR)/*.patch
$(BUILDROOT_PATCH_DIR)/cleanup_buildroot.sh
bzcat $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) | \
- tar -C $(BUILDROOT_DIR) $(TAR_OPTIONS) -
+ tar -C $(BUILDROOT_DIR) $(TAR_OPTIONS) -
touch $@
buildroot-unpacked: $(BUILDROOT_DIR)/.unpacked
diff --git a/Makefile.in b/Makefile.in
index c589c85..fc0171a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,8 @@ BUILDROOT_DIR:=$(ARMADEUS_BASE_DIR)/buildroot
ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_LINUX_KERNEL_VERSION))
ARMADEUS_U_BOOT_VERSION:=$(shell echo $(BR2_TARGET_UBOOT_VERSION))
ARMADEUS_UCLIBC_VERSION:=$(shell echo $(BR2_UCLIBC_VERSION_STRING))
-ARMADEUS_QT_MAKEFILE:=package/qt/qt.mk
+ARMADEUS_GCC_VERSION:=$(shell echo $(BR2_GCC_VERSION))
+ARMADEUS_BUSYBOX_VERSION:=$(shell echo $(BR2_BUSYBOX_VERSION))
ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
ARMADEUS_TARGET_ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
@@ -25,6 +26,7 @@ endif
ARMADEUS_XENOMAI_VERSION:=$(shell grep "XENOMAI_VERSION:=" $(BUILDROOT_DIR)/package/xenomai/xenomai.mk 2>/dev/null | cut -d = -f 2)
+ARMADEUS_QT_MAKEFILE:=package/qt/qt.mk
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
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-08-05 09:08: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 a0ec624dc0eb1b9c0df6da95fa8df1b03d26b01f (commit)
via e67e92c5e8e1ad27a675dc7ee5376f966dc68520 (commit)
via 989f0294eca41fc9326e13a8ae828fc3f851d42f (commit)
from 986698c5425871df64ce049c4ff57e291feee81f (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 a0ec624dc0eb1b9c0df6da95fa8df1b03d26b01f
Merge: e67e92c5e8e1ad27a675dc7ee5376f966dc68520 986698c5425871df64ce049c4ff57e291feee81f
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 5 11:07:41 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit e67e92c5e8e1ad27a675dc7ee5376f966dc68520
Merge: 989f0294eca41fc9326e13a8ae828fc3f851d42f ef7bb8030f0429ad1a26c8bbfb03d67781207958
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 28 18:12:35 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 989f0294eca41fc9326e13a8ae828fc3f851d42f
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jul 28 18:12:11 2011 +0200
Updates after release files
-----------------------------------------------------------------------
Summary of changes:
.../rootfs/target_skeleton/etc/armadeus-version | 2 +-
scripts/release/changes.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
index 5186d07..6a7b8d9 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
@@ -1 +1 @@
-4.0
+4.1-alpha-git
diff --git a/scripts/release/changes.sh b/scripts/release/changes.sh
index 10e4cb9..253b6b7 100755
--- a/scripts/release/changes.sh
+++ b/scripts/release/changes.sh
@@ -15,7 +15,7 @@ CHANGES_TOOLS=$TEMP_DIR/tools.log
CHANGES_ASDEVICES=$TEMP_DIR/asdevices.log
CHANGES_OTHER=$TEMP_DIR/other.log
-LATEST_RELEASE_DATE="2011-03-03"
+LATEST_RELEASE_DATE="2011-07-09"
usage()
{
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-08-05 08:20: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 986698c5425871df64ce049c4ff57e291feee81f (commit)
via d9a80534b16ed3d7d91f5407387ea39bafb70df8 (commit)
from f44ab6f54b53111d6b29e9e50df85b7111c538a4 (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 986698c5425871df64ce049c4ff57e291feee81f
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 5 10:19:18 2011 +0200
[BUILDROOT] Set correct BR2_GIT variable in armadeus defconfigs
commit d9a80534b16ed3d7d91f5407387ea39bafb70df8
Author: Julien Boibessot <jul...@ar...>
Date: Fri Aug 5 10:06:53 2011 +0200
[BUILDROOT] Add preliminary support for BR 2011.05 (to be continued)
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 2 +-
buildroot/configs/apf27_webradio_defconfig | 2 +-
buildroot/configs/apf27test_defconfig | 2 +-
buildroot/configs/apf51_defconfig | 2 +-
buildroot/configs/apf51test_defconfig | 2 +-
buildroot/configs/apf9328_defconfig | 2 +-
buildroot/configs/apf9328test_defconfig | 2 +-
buildroot/configs/pps_defconfig | 2 +-
.../2011.05/001-add_armadeus_device.patch | 12 +++
.../002-add_armadeus_specific_packages.patch | 16 ++++
.../{2010.11 => 2011.05}/006-lcd4linux.patch | 8 +-
.../{2010.11 => 2011.05}/018-allegro.patch | 0
.../021-sdl-water-config.patch | 0
.../{2010.11 => 2011.05}/034-slideshow.patch | 0
.../038-fakeroot-bump_version.patch | 0
.../{2010.11 => 2011.05}/040-linux-makefile.patch | 0
.../043-mesa-add_packages.patch | 0
.../045-openssh-add_passwd_expire.patch | 0
.../{2010.11 => 2011.05}/047-uclibc-config.patch | 0
.../051a-u-boot-add_copy_to_functionnality.patch | 0
...1b-u-boot-change_board_name_default_value.patch | 0
...51c-u-boot-makes_u-boot-clean_target_work.patch | 0
...d_possibility_to_choose_board_header_file.patch | 0
...u-boot-add_1.3.4_version_specific_support.patch | 15 ++--
...madeus_specific_options_for_config_header.patch | 0
.../051g-u-boot-add_u-boot-unpacked_target.patch | 0
...t-makes_binary_targets_name_overloadable.tofix} | 0
...boot-support_config_sys_naming_convention.patch | 0
...x-adds_linux26-patched_target_to_Makefile.patch | 0
.../055-pyserial-add_package.patch | 0
.../057-pymysql-add_package.patch | 0
...x_in_a_standalone_way_after_configuration.patch | 0
.../{2010.11 => 2011.05}/072-xenomai-package.patch | 0
.../081-adds_quake_package.patch | 0
.../083-adds_pygame_package.patch | 0
.../085-adds_gpm_package.patch | 0
.../095-uucp-add_packages.patch | 0
.../097-adds_flite_package.patch | 0
...for_pld_asm_instruction_on_non_armv5_arch.patch | 0
...r-add_patch_for_recent_alsa_compatibility.patch | 0
...e-add_infrastructure_to_install_firmwares.patch | 0
.../107-games-add_wolf4sdl.patch | 0
.../110-bluez-add_package.patch | 0
.../{2010.11 => 2011.05}/111-bluez-hacks.patch | 0
...-linux_eabi_config_option_support_for_arm.patch | 0
.../116-openobex-add_package.patch | 0
.../117-ussp-push-add_package.patch | 0
.../118-snes9x-add_package.patch | 0
.../119-fbtest-add_package.patch | 0
.../120-cwiid-add_package.patch | 0
.../121-target-arm926t_is_arm926ej-s.patch | 0
.../{2010.11 => 2011.05}/122-urg-add_package.patch | 0
.../123-pywebradio-add_package.patch | 8 +-
.../124-e-uae-add_package.patch | 6 +-
.../125-opentyrian-add_package.patch | 2 +-
.../130-lbreakout-add_package.patch | 4 +-
.../131-ltetris-add_package.patch | 4 +-
...-qt-full_integration_with_cross_compiling.patch | 27 ++-----
.../{2010.11 => 2011.05}/133-qwt-add_package.patch | 0
...ffs2-add_board_name_to_binary_rootfs_name.patch | 0
.../135-linux-add_linux26-clean_target.patch | 0
.../137-flex-bump_version.patch | 0
.../138-ipsec-tools-bump_version.patch | 0
...42-ncurses-fix_compilation_with_old_hosts.patch | 0
.../143-tslib-enable_raw_module.patch | 0
...-disable_ip_busybox_if_iproute2_buildroot.patch | 0
...fix_installation_bug_on_some_host_systems.patch | 0
...buildroot-Adding_copy_method_for_download.patch | 4 +-
...ackage_selection_even_if_marked_as_broken.patch | 0
.../152-uclibc-add_times_syscall_patches.patch | 0
...153-busybox-fix_1.16_build_with_make_3.82.patch | 0
.../154-packages-fix_DL_VERSION_usage.patch | 28 +++++++
.../2011.05/155-alsa-force_1_0_23_version.patch | 75 ++++++++++++++++++++
.../{2010.11 => 2011.05}/cleanup_buildroot.sh | 0
74 files changed, 171 insertions(+), 54 deletions(-)
create mode 100644 patches/buildroot/2011.05/001-add_armadeus_device.patch
create mode 100644 patches/buildroot/2011.05/002-add_armadeus_specific_packages.patch
copy patches/buildroot/{2010.11 => 2011.05}/006-lcd4linux.patch (99%)
copy patches/buildroot/{2010.11 => 2011.05}/018-allegro.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/021-sdl-water-config.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/034-slideshow.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/038-fakeroot-bump_version.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/040-linux-makefile.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/043-mesa-add_packages.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/045-openssh-add_passwd_expire.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/047-uclibc-config.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/051a-u-boot-add_copy_to_functionnality.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/051b-u-boot-change_board_name_default_value.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/051c-u-boot-makes_u-boot-clean_target_work.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/051d-u-boot-add_possibility_to_choose_board_header_file.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/051e-u-boot-add_1.3.4_version_specific_support.patch (84%)
copy patches/buildroot/{2010.11 => 2011.05}/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/051g-u-boot-add_u-boot-unpacked_target.patch (100%)
copy patches/buildroot/{2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch => 2011.05/051h-u-boot-makes_binary_targets_name_overloadable.tofix} (100%)
copy patches/buildroot/{2010.11 => 2011.05}/051i-u-boot-support_config_sys_naming_convention.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/052-linux-adds_linux26-patched_target_to_Makefile.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/055-pyserial-add_package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/057-pymysql-add_package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/072-xenomai-package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/081-adds_quake_package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/083-adds_pygame_package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/085-adds_gpm_package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/095-uucp-add_packages.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/097-adds_flite_package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/101-mplayer-add_patch_for_recent_alsa_compatibility.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/106-firmware-add_infrastructure_to_install_firmwares.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/107-games-add_wolf4sdl.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/110-bluez-add_package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/111-bluez-hacks.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/112-gcc-4_2_x-add_aapcs-linux_eabi_config_option_support_for_arm.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/116-openobex-add_package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/117-ussp-push-add_package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/118-snes9x-add_package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/119-fbtest-add_package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/120-cwiid-add_package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/121-target-arm926t_is_arm926ej-s.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/122-urg-add_package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/123-pywebradio-add_package.patch (92%)
copy patches/buildroot/{2010.11 => 2011.05}/124-e-uae-add_package.patch (94%)
copy patches/buildroot/{2010.11 => 2011.05}/125-opentyrian-add_package.patch (98%)
copy patches/buildroot/{2010.11 => 2011.05}/130-lbreakout-add_package.patch (96%)
copy patches/buildroot/{2010.11 => 2011.05}/131-ltetris-add_package.patch (97%)
copy patches/buildroot/{2010.11 => 2011.05}/132-qt-full_integration_with_cross_compiling.patch (67%)
copy patches/buildroot/{2010.11 => 2011.05}/133-qwt-add_package.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/134-jffs2-add_board_name_to_binary_rootfs_name.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/135-linux-add_linux26-clean_target.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/137-flex-bump_version.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/138-ipsec-tools-bump_version.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/142-ncurses-fix_compilation_with_old_hosts.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/143-tslib-enable_raw_module.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/150-buildroot-Adding_copy_method_for_download.patch (98%)
copy patches/buildroot/{2010.11 => 2011.05}/151-java-allow_package_selection_even_if_marked_as_broken.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/152-uclibc-add_times_syscall_patches.patch (100%)
copy patches/buildroot/{2010.11 => 2011.05}/153-busybox-fix_1.16_build_with_make_3.82.patch (100%)
create mode 100644 patches/buildroot/2011.05/154-packages-fix_DL_VERSION_usage.patch
create mode 100644 patches/buildroot/2011.05/155-alsa-force_1_0_23_version.patch
copy patches/buildroot/{2010.11 => 2011.05}/cleanup_buildroot.sh (100%)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 7e60b7b..7f3a712 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -103,7 +103,7 @@ BR2_COPY="cp -R "
BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
-BR2_GIT="git clone"
+BR2_GIT="git"
BR2_ZCAT="gzip -d -c"
BR2_BZCAT="bzcat"
BR2_TAR_OPTIONS=""
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 6a457cd..4fb2020 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -77,7 +77,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
-BR2_GIT="git clone"
+BR2_GIT="git"
BR2_ZCAT="gzip -d -c"
BR2_BZCAT="bzcat"
BR2_TAR_OPTIONS=""
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 2e419fc..00f3de9 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -103,7 +103,7 @@ BR2_COPY="cp -R "
BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
-BR2_GIT="git clone"
+BR2_GIT="git"
BR2_ZCAT="gzip -d -c"
BR2_BZCAT="bzcat"
BR2_TAR_OPTIONS=""
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 132b9de..ea07e50 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -102,7 +102,7 @@ BR2_COPY="cp -R "
BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
-BR2_GIT="git clone"
+BR2_GIT="git"
BR2_ZCAT="gzip -d -c"
BR2_BZCAT="bzcat"
BR2_TAR_OPTIONS=""
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 5e4cebb..389f6fb 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -102,7 +102,7 @@ BR2_COPY="cp -R "
BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
-BR2_GIT="git clone"
+BR2_GIT="git"
BR2_ZCAT="gzip -d -c"
BR2_BZCAT="bzcat"
BR2_TAR_OPTIONS=""
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index 45289fb..456b21c 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -9,7 +9,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_TARGET_GENERIC_GETTY=y
BR2_TARGET_GENERIC_GETTY_TTYSMX0=y
BR2_WGET="wget --passive-ftp --tries=3"
-BR2_GIT="git clone"
+BR2_GIT="git"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 0988cf9..f719014 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -9,7 +9,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_TARGET_GENERIC_GETTY=y
BR2_TARGET_GENERIC_GETTY_TTYSMX0=y
BR2_WGET="wget --passive-ftp --tries=3"
-BR2_GIT="git clone"
+BR2_GIT="git"
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 6749727..8adf007 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -103,7 +103,7 @@ BR2_COPY="cp -R "
BR2_WGET="wget --passive-ftp --tries=3"
BR2_SVN="svn"
BR2_BZR="bzr"
-BR2_GIT="git clone"
+BR2_GIT="git"
BR2_ZCAT="gzip -d -c"
BR2_BZCAT="bzcat"
BR2_TAR_OPTIONS=""
diff --git a/patches/buildroot/2011.05/001-add_armadeus_device.patch b/patches/buildroot/2011.05/001-add_armadeus_device.patch
new file mode 100644
index 0000000..e33dd01
--- /dev/null
+++ b/patches/buildroot/2011.05/001-add_armadeus_device.patch
@@ -0,0 +1,12 @@
+Add armadeus target specific menu to BR.
+
+Index: buildroot/target/generic/Config.in
+===================================================================
+--- buildroot.orig/target/generic/Config.in 2010-05-30 22:24:10.000000000 +0200
++++ buildroot/target/generic/Config.in 2010-06-23 14:05:46.000000000 +0200
+@@ -2,6 +2,7 @@
+ only argument. Make sure the exit code of that script is 0,
+ otherwise make will stop after calling it.
+
++source "target/device/armadeus/Config.in"
+ endmenu
diff --git a/patches/buildroot/2011.05/002-add_armadeus_specific_packages.patch b/patches/buildroot/2011.05/002-add_armadeus_specific_packages.patch
new file mode 100644
index 0000000..863809e
--- /dev/null
+++ b/patches/buildroot/2011.05/002-add_armadeus_specific_packages.patch
@@ -0,0 +1,16 @@
+Add armadeus specific packages menu to BR.
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-23 14:06:51.000000000 +0200
++++ buildroot/package/Config.in 2010-06-23 14:09:19.000000000 +0200
+@@ -3,6 +3,9 @@
+ source "package/busybox/Config.in"
+ source "package/customize/Config.in"
+
++# Armadeus specific
++source "package/armadeus/Config.in"
++
+ # Audio and video applications
+ source "package/multimedia/Config.in"
+
diff --git a/patches/buildroot/2010.11/006-lcd4linux.patch b/patches/buildroot/2011.05/006-lcd4linux.patch
similarity index 99%
copy from patches/buildroot/2010.11/006-lcd4linux.patch
copy to patches/buildroot/2011.05/006-lcd4linux.patch
index ee85be7..18a8c70 100644
--- a/patches/buildroot/2010.11/006-lcd4linux.patch
+++ b/patches/buildroot/2011.05/006-lcd4linux.patch
@@ -6,14 +6,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2010-06-23 14:09:19.000000000 +0200
+++ buildroot/package/Config.in 2010-06-23 14:09:53.000000000 +0200
-@@ -177,6 +177,7 @@
- source "package/input-tools/Config.in"
- source "package/iostat/Config.in"
+@@ -182,6 +182,7 @@
+ source "package/irda-utils/Config.in"
source "package/kbd/Config.in"
+ source "package/libv4l/Config.in"
+source "package/lcd4linux/Config.in"
source "package/lm-sensors/Config.in"
+ source "package/lsuio/Config.in"
source "package/lvm2/Config.in"
- source "package/makedevs/Config.in"
Index: buildroot/package/lcd4linux/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2010.11/018-allegro.patch b/patches/buildroot/2011.05/018-allegro.patch
similarity index 100%
copy from patches/buildroot/2010.11/018-allegro.patch
copy to patches/buildroot/2011.05/018-allegro.patch
diff --git a/patches/buildroot/2010.11/021-sdl-water-config.patch b/patches/buildroot/2011.05/021-sdl-water-config.patch
similarity index 100%
copy from patches/buildroot/2010.11/021-sdl-water-config.patch
copy to patches/buildroot/2011.05/021-sdl-water-config.patch
diff --git a/patches/buildroot/2010.11/034-slideshow.patch b/patches/buildroot/2011.05/034-slideshow.patch
similarity index 100%
copy from patches/buildroot/2010.11/034-slideshow.patch
copy to patches/buildroot/2011.05/034-slideshow.patch
diff --git a/patches/buildroot/2010.11/038-fakeroot-bump_version.patch b/patches/buildroot/2011.05/038-fakeroot-bump_version.patch
similarity index 100%
copy from patches/buildroot/2010.11/038-fakeroot-bump_version.patch
copy to patches/buildroot/2011.05/038-fakeroot-bump_version.patch
diff --git a/patches/buildroot/2010.11/040-linux-makefile.patch b/patches/buildroot/2011.05/040-linux-makefile.patch
similarity index 100%
copy from patches/buildroot/2010.11/040-linux-makefile.patch
copy to patches/buildroot/2011.05/040-linux-makefile.patch
diff --git a/patches/buildroot/2010.11/043-mesa-add_packages.patch b/patches/buildroot/2011.05/043-mesa-add_packages.patch
similarity index 100%
copy from patches/buildroot/2010.11/043-mesa-add_packages.patch
copy to patches/buildroot/2011.05/043-mesa-add_packages.patch
diff --git a/patches/buildroot/2010.11/045-openssh-add_passwd_expire.patch b/patches/buildroot/2011.05/045-openssh-add_passwd_expire.patch
similarity index 100%
copy from patches/buildroot/2010.11/045-openssh-add_passwd_expire.patch
copy to patches/buildroot/2011.05/045-openssh-add_passwd_expire.patch
diff --git a/patches/buildroot/2010.11/047-uclibc-config.patch b/patches/buildroot/2011.05/047-uclibc-config.patch
similarity index 100%
copy from patches/buildroot/2010.11/047-uclibc-config.patch
copy to patches/buildroot/2011.05/047-uclibc-config.patch
diff --git a/patches/buildroot/2010.11/051a-u-boot-add_copy_to_functionnality.patch b/patches/buildroot/2011.05/051a-u-boot-add_copy_to_functionnality.patch
similarity index 100%
copy from patches/buildroot/2010.11/051a-u-boot-add_copy_to_functionnality.patch
copy to patches/buildroot/2011.05/051a-u-boot-add_copy_to_functionnality.patch
diff --git a/patches/buildroot/2010.11/051b-u-boot-change_board_name_default_value.patch b/patches/buildroot/2011.05/051b-u-boot-change_board_name_default_value.patch
similarity index 100%
copy from patches/buildroot/2010.11/051b-u-boot-change_board_name_default_value.patch
copy to patches/buildroot/2011.05/051b-u-boot-change_board_name_default_value.patch
diff --git a/patches/buildroot/2010.11/051c-u-boot-makes_u-boot-clean_target_work.patch b/patches/buildroot/2011.05/051c-u-boot-makes_u-boot-clean_target_work.patch
similarity index 100%
copy from patches/buildroot/2010.11/051c-u-boot-makes_u-boot-clean_target_work.patch
copy to patches/buildroot/2011.05/051c-u-boot-makes_u-boot-clean_target_work.patch
diff --git a/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch b/patches/buildroot/2011.05/051d-u-boot-add_possibility_to_choose_board_header_file.patch
similarity index 100%
copy from patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
copy to patches/buildroot/2011.05/051d-u-boot-add_possibility_to_choose_board_header_file.patch
diff --git a/patches/buildroot/2010.11/051e-u-boot-add_1.3.4_version_specific_support.patch b/patches/buildroot/2011.05/051e-u-boot-add_1.3.4_version_specific_support.patch
similarity index 84%
copy from patches/buildroot/2010.11/051e-u-boot-add_1.3.4_version_specific_support.patch
copy to patches/buildroot/2011.05/051e-u-boot-add_1.3.4_version_specific_support.patch
index 8b593ad..4388d42 100644
--- a/patches/buildroot/2010.11/051e-u-boot-add_1.3.4_version_specific_support.patch
+++ b/patches/buildroot/2011.05/051e-u-boot-add_1.3.4_version_specific_support.patch
@@ -11,17 +11,17 @@ Index: buildroot/boot/u-boot/Config.in
+config BR2_TARGET_UBOOT_1_3_4
+ bool "1.3.4"
+
- config BR2_TARGET_UBOOT_2010_06
- bool "2010.06"
+ config BR2_TARGET_UBOOT_2011_03
+ bool "2011.03"
@@ -51,6 +54,7 @@
config BR2_TARGET_UBOOT_VERSION
string
+ default "1.3.4" if BR2_TARGET_UBOOT_1_3_4
- default "2010.06" if BR2_TARGET_UBOOT_2010_06
- default "2010.03" if BR2_TARGET_UBOOT_2010_03
- default "2009.11" if BR2_TARGET_UBOOT_2009_11
+ default "2011.03" if BR2_TARGET_UBOOT_2011_03
+ default "2010.12" if BR2_TARGET_UBOOT_2010_12
+ default "2010.09" if BR2_TARGET_UBOOT_2010_09
Index: buildroot/boot/u-boot/u-boot.mk
===================================================================
--- buildroot.orig/boot/u-boot/u-boot.mk 2010-10-20 12:09:50.000000000 +0200
@@ -38,12 +38,11 @@ Index: buildroot/boot/u-boot/u-boot.mk
$(TARGET_CC) -I$(U_BOOT_DIR)/include -I$(U_BOOT_DIR)/tools \
-DUSE_HOSTCC -o $@ \
$(U_BOOT_DIR)/common/image.c \
-@@ -179,7 +184,7 @@
+@@ -179,6 +184,7 @@
$(addprefix $(U_BOOT_DIR)/lib*/,crc32.c md5.c sha1.c) \
$(U_BOOT_DIR)/tools/os_support.c \
$(wildcard $(U_BOOT_DIR)/libfdt/fdt*.c $(U_BOOT_DIR)/lib/libfdt/fdt*.c)
--
+endif
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
# Build manually fw_printenv for the target
+ $(TARGET_DIR)/usr/sbin/fw_printenv: $(U_BOOT_DIR)/.configured
diff --git a/patches/buildroot/2010.11/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch b/patches/buildroot/2011.05/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
similarity index 100%
copy from patches/buildroot/2010.11/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
copy to patches/buildroot/2011.05/051f-u-boot-handle_armadeus_specific_options_for_config_header.patch
diff --git a/patches/buildroot/2010.11/051g-u-boot-add_u-boot-unpacked_target.patch b/patches/buildroot/2011.05/051g-u-boot-add_u-boot-unpacked_target.patch
similarity index 100%
copy from patches/buildroot/2010.11/051g-u-boot-add_u-boot-unpacked_target.patch
copy to patches/buildroot/2011.05/051g-u-boot-add_u-boot-unpacked_target.patch
diff --git a/patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch b/patches/buildroot/2011.05/051h-u-boot-makes_binary_targets_name_overloadable.tofix
similarity index 100%
copy from patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch
copy to patches/buildroot/2011.05/051h-u-boot-makes_binary_targets_name_overloadable.tofix
diff --git a/patches/buildroot/2010.11/051i-u-boot-support_config_sys_naming_convention.patch b/patches/buildroot/2011.05/051i-u-boot-support_config_sys_naming_convention.patch
similarity index 100%
copy from patches/buildroot/2010.11/051i-u-boot-support_config_sys_naming_convention.patch
copy to patches/buildroot/2011.05/051i-u-boot-support_config_sys_naming_convention.patch
diff --git a/patches/buildroot/2010.11/052-linux-adds_linux26-patched_target_to_Makefile.patch b/patches/buildroot/2011.05/052-linux-adds_linux26-patched_target_to_Makefile.patch
similarity index 100%
copy from patches/buildroot/2010.11/052-linux-adds_linux26-patched_target_to_Makefile.patch
copy to patches/buildroot/2011.05/052-linux-adds_linux26-patched_target_to_Makefile.patch
diff --git a/patches/buildroot/2010.11/055-pyserial-add_package.patch b/patches/buildroot/2011.05/055-pyserial-add_package.patch
similarity index 100%
copy from patches/buildroot/2010.11/055-pyserial-add_package.patch
copy to patches/buildroot/2011.05/055-pyserial-add_package.patch
diff --git a/patches/buildroot/2010.11/057-pymysql-add_package.patch b/patches/buildroot/2011.05/057-pymysql-add_package.patch
similarity index 100%
copy from patches/buildroot/2010.11/057-pymysql-add_package.patch
copy to patches/buildroot/2011.05/057-pymysql-add_package.patch
diff --git a/patches/buildroot/2010.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch b/patches/buildroot/2011.05/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
similarity index 100%
copy from patches/buildroot/2010.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
copy to patches/buildroot/2011.05/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
diff --git a/patches/buildroot/2010.11/072-xenomai-package.patch b/patches/buildroot/2011.05/072-xenomai-package.patch
similarity index 100%
copy from patches/buildroot/2010.11/072-xenomai-package.patch
copy to patches/buildroot/2011.05/072-xenomai-package.patch
diff --git a/patches/buildroot/2010.11/081-adds_quake_package.patch b/patches/buildroot/2011.05/081-adds_quake_package.patch
similarity index 100%
copy from patches/buildroot/2010.11/081-adds_quake_package.patch
copy to patches/buildroot/2011.05/081-adds_quake_package.patch
diff --git a/patches/buildroot/2010.11/083-adds_pygame_package.patch b/patches/buildroot/2011.05/083-adds_pygame_package.patch
similarity index 100%
copy from patches/buildroot/2010.11/083-adds_pygame_package.patch
copy to patches/buildroot/2011.05/083-adds_pygame_package.patch
diff --git a/patches/buildroot/2010.11/085-adds_gpm_package.patch b/patches/buildroot/2011.05/085-adds_gpm_package.patch
similarity index 100%
copy from patches/buildroot/2010.11/085-adds_gpm_package.patch
copy to patches/buildroot/2011.05/085-adds_gpm_package.patch
diff --git a/patches/buildroot/2010.11/095-uucp-add_packages.patch b/patches/buildroot/2011.05/095-uucp-add_packages.patch
similarity index 100%
copy from patches/buildroot/2010.11/095-uucp-add_packages.patch
copy to patches/buildroot/2011.05/095-uucp-add_packages.patch
diff --git a/patches/buildroot/2010.11/097-adds_flite_package.patch b/patches/buildroot/2011.05/097-adds_flite_package.patch
similarity index 100%
copy from patches/buildroot/2010.11/097-adds_flite_package.patch
copy to patches/buildroot/2011.05/097-adds_flite_package.patch
diff --git a/patches/buildroot/2010.11/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch b/patches/buildroot/2011.05/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
similarity index 100%
copy from patches/buildroot/2010.11/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
copy to patches/buildroot/2011.05/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
diff --git a/patches/buildroot/2010.11/101-mplayer-add_patch_for_recent_alsa_compatibility.patch b/patches/buildroot/2011.05/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
similarity index 100%
copy from patches/buildroot/2010.11/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
copy to patches/buildroot/2011.05/101-mplayer-add_patch_for_recent_alsa_compatibility.patch
diff --git a/patches/buildroot/2010.11/106-firmware-add_infrastructure_to_install_firmwares.patch b/patches/buildroot/2011.05/106-firmware-add_infrastructure_to_install_firmwares.patch
similarity index 100%
copy from patches/buildroot/2010.11/106-firmware-add_infrastructure_to_install_firmwares.patch
copy to patches/buildroot/2011.05/106-firmware-add_infrastructure_to_install_firmwares.patch
diff --git a/patches/buildroot/2010.11/107-games-add_wolf4sdl.patch b/patches/buildroot/2011.05/107-games-add_wolf4sdl.patch
similarity index 100%
copy from patches/buildroot/2010.11/107-games-add_wolf4sdl.patch
copy to patches/buildroot/2011.05/107-games-add_wolf4sdl.patch
diff --git a/patches/buildroot/2010.11/110-bluez-add_package.patch b/patches/buildroot/2011.05/110-bluez-add_package.patch
similarity index 100%
copy from patches/buildroot/2010.11/110-bluez-add_package.patch
copy to patches/buildroot/2011.05/110-bluez-add_package.patch
diff --git a/patches/buildroot/2010.11/111-bluez-hacks.patch b/patches/buildroot/2011.05/111-bluez-hacks.patch
similarity index 100%
copy from patches/buildroot/2010.11/111-bluez-hacks.patch
copy to patches/buildroot/2011.05/111-bluez-hacks.patch
diff --git a/patches/buildroot/2010.11/112-gcc-4_2_x-add_aapcs-linux_eabi_config_option_support_for_arm.patch b/patches/buildroot/2011.05/112-gcc-4_2_x-add_aapcs-linux_eabi_config_option_support_for_arm.patch
similarity index 100%
copy from patches/buildroot/2010.11/112-gcc-4_2_x-add_aapcs-linux_eabi_config_option_support_for_arm.patch
copy to patches/buildroot/2011.05/112-gcc-4_2_x-add_aapcs-linux_eabi_config_option_support_for_arm.patch
diff --git a/patches/buildroot/2010.11/116-openobex-add_package.patch b/patches/buildroot/2011.05/116-openobex-add_package.patch
similarity index 100%
copy from patches/buildroot/2010.11/116-openobex-add_package.patch
copy to patches/buildroot/2011.05/116-openobex-add_package.patch
diff --git a/patches/buildroot/2010.11/117-ussp-push-add_package.patch b/patches/buildroot/2011.05/117-ussp-push-add_package.patch
similarity index 100%
copy from patches/buildroot/2010.11/117-ussp-push-add_package.patch
copy to patches/buildroot/2011.05/117-ussp-push-add_package.patch
diff --git a/patches/buildroot/2010.11/118-snes9x-add_package.patch b/patches/buildroot/2011.05/118-snes9x-add_package.patch
similarity index 100%
copy from patches/buildroot/2010.11/118-snes9x-add_package.patch
copy to patches/buildroot/2011.05/118-snes9x-add_package.patch
diff --git a/patches/buildroot/2010.11/119-fbtest-add_package.patch b/patches/buildroot/2011.05/119-fbtest-add_package.patch
similarity index 100%
copy from patches/buildroot/2010.11/119-fbtest-add_package.patch
copy to patches/buildroot/2011.05/119-fbtest-add_package.patch
diff --git a/patches/buildroot/2010.11/120-cwiid-add_package.patch b/patches/buildroot/2011.05/120-cwiid-add_package.patch
similarity index 100%
copy from patches/buildroot/2010.11/120-cwiid-add_package.patch
copy to patches/buildroot/2011.05/120-cwiid-add_package.patch
diff --git a/patches/buildroot/2010.11/121-target-arm926t_is_arm926ej-s.patch b/patches/buildroot/2011.05/121-target-arm926t_is_arm926ej-s.patch
similarity index 100%
copy from patches/buildroot/2010.11/121-target-arm926t_is_arm926ej-s.patch
copy to patches/buildroot/2011.05/121-target-arm926t_is_arm926ej-s.patch
diff --git a/patches/buildroot/2010.11/122-urg-add_package.patch b/patches/buildroot/2011.05/122-urg-add_package.patch
similarity index 100%
copy from patches/buildroot/2010.11/122-urg-add_package.patch
copy to patches/buildroot/2011.05/122-urg-add_package.patch
diff --git a/patches/buildroot/2010.11/123-pywebradio-add_package.patch b/patches/buildroot/2011.05/123-pywebradio-add_package.patch
similarity index 92%
copy from patches/buildroot/2010.11/123-pywebradio-add_package.patch
copy to patches/buildroot/2011.05/123-pywebradio-add_package.patch
index cf10904..34886f8 100644
--- a/patches/buildroot/2010.11/123-pywebradio-add_package.patch
+++ b/patches/buildroot/2011.05/123-pywebradio-add_package.patch
@@ -2,14 +2,14 @@ Index: buildroot/package/multimedia/Config.in
===================================================================
--- buildroot.orig/package/multimedia/Config.in 2011-01-27 15:24:49.000000000 +0100
+++ buildroot/package/multimedia/Config.in 2011-01-27 15:25:10.000000000 +0100
-@@ -26,6 +26,7 @@
- source "package/multimedia/madplay/Config.in"
+@@ -36,6 +36,7 @@
+ source "package/multimedia/mpd/Config.in"
source "package/multimedia/mpg123/Config.in"
source "package/multimedia/mplayer/Config.in"
+source "package/pywebradio/Config.in"
+ source "package/multimedia/musepack/Config.in"
+ source "package/multimedia/python-mad/Config.in"
source "package/multimedia/speex/Config.in"
- source "package/multimedia/swfdec/Config.in"
- source "package/multimedia/festival/Config.in"
Index: buildroot/package/pywebradio/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2010.11/124-e-uae-add_package.patch b/patches/buildroot/2011.05/124-e-uae-add_package.patch
similarity index 94%
copy from patches/buildroot/2010.11/124-e-uae-add_package.patch
copy to patches/buildroot/2011.05/124-e-uae-add_package.patch
index 990162c..f789612 100644
--- a/patches/buildroot/2010.11/124-e-uae-add_package.patch
+++ b/patches/buildroot/2011.05/124-e-uae-add_package.patch
@@ -2,14 +2,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2011-01-27 15:25:09.000000000 +0100
+++ buildroot/package/Config.in 2011-01-27 15:25:12.000000000 +0100
-@@ -80,6 +80,7 @@
+@@ -82,6 +82,7 @@
+ endmenu
menu "Games"
- source "package/games/ace_of_penguins/Config.in"
+source "package/e-uae/Config.in"
source "package/games/gnuchess/Config.in"
- source "package/games/magiccube4d/Config.in"
source "package/games/prboom/Config.in"
+ source "package/games/quake-pak/Config.in"
Index: buildroot/package/e-uae/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2010.11/125-opentyrian-add_package.patch b/patches/buildroot/2011.05/125-opentyrian-add_package.patch
similarity index 98%
copy from patches/buildroot/2010.11/125-opentyrian-add_package.patch
copy to patches/buildroot/2011.05/125-opentyrian-add_package.patch
index 55285f8..282db63 100644
--- a/patches/buildroot/2010.11/125-opentyrian-add_package.patch
+++ b/patches/buildroot/2011.05/125-opentyrian-add_package.patch
@@ -3,9 +3,9 @@ Index: buildroot/package/Config.in
--- buildroot.orig/package/Config.in 2010-12-14 08:27:39.000000000 +0100
+++ buildroot/package/Config.in 2010-12-14 08:55:39.000000000 +0100
@@ -83,6 +83,7 @@
+ menu "Games"
source "package/e-uae/Config.in"
source "package/games/gnuchess/Config.in"
- source "package/games/magiccube4d/Config.in"
+source "package/opentyrian/Config.in"
source "package/games/prboom/Config.in"
source "package/games/quake-pak/Config.in"
diff --git a/patches/buildroot/2010.11/130-lbreakout-add_package.patch b/patches/buildroot/2011.05/130-lbreakout-add_package.patch
similarity index 96%
copy from patches/buildroot/2010.11/130-lbreakout-add_package.patch
copy to patches/buildroot/2011.05/130-lbreakout-add_package.patch
index fed303b..bd5e00f 100644
--- a/patches/buildroot/2010.11/130-lbreakout-add_package.patch
+++ b/patches/buildroot/2011.05/130-lbreakout-add_package.patch
@@ -7,13 +7,13 @@ Index: buildroot/package/Config.in
--- buildroot.orig/package/Config.in 2011-07-01 10:37:54.000000000 +0200
+++ buildroot/package/Config.in 2011-07-01 10:38:58.000000000 +0200
@@ -82,6 +82,7 @@
- source "package/games/ace_of_penguins/Config.in"
+ menu "Games"
source "package/e-uae/Config.in"
source "package/games/gnuchess/Config.in"
+source "package/lbreakout2/Config.in"
- source "package/games/magiccube4d/Config.in"
source "package/opentyrian/Config.in"
source "package/games/prboom/Config.in"
+ source "package/games/quake-pak/Config.in"
Index: buildroot/package/lbreakout2/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2010.11/131-ltetris-add_package.patch b/patches/buildroot/2011.05/131-ltetris-add_package.patch
similarity index 97%
copy from patches/buildroot/2010.11/131-ltetris-add_package.patch
copy to patches/buildroot/2011.05/131-ltetris-add_package.patch
index ec1f53a..5bc2083 100644
--- a/patches/buildroot/2010.11/131-ltetris-add_package.patch
+++ b/patches/buildroot/2011.05/131-ltetris-add_package.patch
@@ -6,14 +6,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2011-01-27 15:25:16.000000000 +0100
+++ buildroot/package/Config.in 2011-01-27 15:25:18.000000000 +0100
-@@ -83,6 +83,7 @@
+@@ -85,6 +85,7 @@
source "package/e-uae/Config.in"
source "package/games/gnuchess/Config.in"
source "package/lbreakout2/Config.in"
+source "package/ltris/Config.in"
- source "package/games/magiccube4d/Config.in"
source "package/opentyrian/Config.in"
source "package/games/prboom/Config.in"
+ source "package/games/quake-pak/Config.in"
Index: buildroot/package/ltris/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2010.11/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2011.05/132-qt-full_integration_with_cross_compiling.patch
similarity index 67%
copy from patches/buildroot/2010.11/132-qt-full_integration_with_cross_compiling.patch
copy to patches/buildroot/2011.05/132-qt-full_integration_with_cross_compiling.patch
index 586b14e..f0beb27 100644
--- a/patches/buildroot/2010.11/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2011.05/132-qt-full_integration_with_cross_compiling.patch
@@ -38,33 +38,20 @@ Index: buildroot/package/qt/qt.mk
===================================================================
--- buildroot.orig/package/qt/qt.mk 2010-11-30 16:52:43.000000000 +0100
+++ buildroot/package/qt/qt.mk 2011-02-24 13:41:10.000000000 +0100
-@@ -49,11 +49,17 @@
+@@ -41,9 +41,14 @@
endif
ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
--QT_CONFIGURE+= -examplesdir $(TARGET_DIR)/usr/share/qt/examples -demosdir $(TARGET_DIR)/usr/share/qt/demos
-+QT_CONFIGURE+= -demosdir $(TARGET_DIR)/usr/share/qt/demos
+-QT_CONFIGURE_OPTS += -examplesdir $(TARGET_DIR)/usr/share/qt/examples -demosdir $(TARGET_DIR)/usr/share/qt/demos
++QT_CONFIGURE_OPTS += -demosdir $(TARGET_DIR)/usr/share/qt/demos
else
--QT_CONFIGURE+= -nomake examples -nomake demos
-+QT_CONFIGURE+= -nomake demos
+-QT_CONFIGURE_OPTS += -nomake examples -nomake demos
++QT_CONFIGURE_OPTS += -nomake demos
+endif
+ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
-+QT_CONFIGURE+= -examplesdir $(TARGET_DIR)/usr/share/qt/examples
++QT_CONFIGURE_OPTS += -examplesdir $(TARGET_DIR)/usr/share/qt/examples
+else
-+QT_CONFIGURE+= -nomake examples
++QT_CONFIGURE_OPTS += -nomake examples
endif
-+
# ensure glib is built first if enabled for Qt's glib support
- ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
- QT_DEP_LIBS+=libglib2
-@@ -244,6 +250,9 @@
- endif
- endif
-
-+ifneq ($(BR2_PACKAGE_QT_QWS_CURSOR),y)
-+QT_CONFIGURE+= -DQT_NO_QWS_CURSOR
-+endif
-
- QT_FONTS = $(addprefix $(STAGING_DIR)/usr/lib/fonts/, $(addsuffix *.qpf, \
- $(if $(BR2_PACKAGE_QT_FONT_MICRO),micro) \
diff --git a/patches/buildroot/2010.11/133-qwt-add_package.patch b/patches/buildroot/2011.05/133-qwt-add_package.patch
similarity index 100%
copy from patches/buildroot/2010.11/133-qwt-add_package.patch
copy to patches/buildroot/2011.05/133-qwt-add_package.patch
diff --git a/patches/buildroot/2010.11/134-jffs2-add_board_name_to_binary_rootfs_name.patch b/patches/buildroot/2011.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch
similarity index 100%
copy from patches/buildroot/2010.11/134-jffs2-add_board_name_to_binary_rootfs_name.patch
copy to patches/buildroot/2011.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch
diff --git a/patches/buildroot/2010.11/135-linux-add_linux26-clean_target.patch b/patches/buildroot/2011.05/135-linux-add_linux26-clean_target.patch
similarity index 100%
copy from patches/buildroot/2010.11/135-linux-add_linux26-clean_target.patch
copy to patches/buildroot/2011.05/135-linux-add_linux26-clean_target.patch
diff --git a/patches/buildroot/2010.11/137-flex-bump_version.patch b/patches/buildroot/2011.05/137-flex-bump_version.patch
similarity index 100%
copy from patches/buildroot/2010.11/137-flex-bump_version.patch
copy to patches/buildroot/2011.05/137-flex-bump_version.patch
diff --git a/patches/buildroot/2010.11/138-ipsec-tools-bump_version.patch b/patches/buildroot/2011.05/138-ipsec-tools-bump_version.patch
similarity index 100%
copy from patches/buildroot/2010.11/138-ipsec-tools-bump_version.patch
copy to patches/buildroot/2011.05/138-ipsec-tools-bump_version.patch
diff --git a/patches/buildroot/2010.11/142-ncurses-fix_compilation_with_old_hosts.patch b/patches/buildroot/2011.05/142-ncurses-fix_compilation_with_old_hosts.patch
similarity index 100%
copy from patches/buildroot/2010.11/142-ncurses-fix_compilation_with_old_hosts.patch
copy to patches/buildroot/2011.05/142-ncurses-fix_compilation_with_old_hosts.patch
diff --git a/patches/buildroot/2010.11/143-tslib-enable_raw_module.patch b/patches/buildroot/2011.05/143-tslib-enable_raw_module.patch
similarity index 100%
copy from patches/buildroot/2010.11/143-tslib-enable_raw_module.patch
copy to patches/buildroot/2011.05/143-tslib-enable_raw_module.patch
diff --git a/patches/buildroot/2010.11/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch b/patches/buildroot/2011.05/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
similarity index 100%
copy from patches/buildroot/2010.11/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
copy to patches/buildroot/2011.05/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
diff --git a/patches/buildroot/2010.11/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch b/patches/buildroot/2011.05/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
similarity index 100%
copy from patches/buildroot/2010.11/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
copy to patches/buildroot/2011.05/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
diff --git a/patches/buildroot/2010.11/150-buildroot-Adding_copy_method_for_download.patch b/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch
similarity index 98%
copy from patches/buildroot/2010.11/150-buildroot-Adding_copy_method_for_download.patch
copy to patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch
index 1f36eb4..6e38f19 100644
--- a/patches/buildroot/2010.11/150-buildroot-Adding_copy_method_for_download.patch
+++ b/patches/buildroot/2011.05/150-buildroot-Adding_copy_method_for_download.patch
@@ -35,6 +35,7 @@ Index: buildroot/package/Makefile.package.in
echo $(2)
endef
++
+define DOWNLOAD_COPY
+ pushd $(DL_DIR) > /dev/null && \
+ $(COPY) $($(PKG)_SITE) $($(PKG)_DL_DIR)/ && \
@@ -52,14 +53,13 @@ Index: buildroot/package/Makefile.package.in
+endef
+
+
-+
################################################################################
# DOWNLOAD -- Download helper. Will try to download source from:
# 1) BR2_PRIMARY_SITE if enabled
@@ -175,6 +194,7 @@
- case "$($(PKG)_SITE_METHOD)" in \
git) $($(DL_MODE)_GIT) && exit ;; \
svn) $($(DL_MODE)_SVN) && exit ;; \
+ bzr) $($(DL_MODE)_BZR) && exit ;; \
+ copy) $($(DL_MODE)_COPY) && exit ;; \
*) $(call $(DL_MODE)_WGET,$(1),$(2)) && exit ;; \
esac ; \
diff --git a/patches/buildroot/2010.11/151-java-allow_package_selection_even_if_marked_as_broken.patch b/patches/buildroot/2011.05/151-java-allow_package_selection_even_if_marked_as_broken.patch
similarity index 100%
copy from patches/buildroot/2010.11/151-java-allow_package_selection_even_if_marked_as_broken.patch
copy to patches/buildroot/2011.05/151-java-allow_package_selection_even_if_marked_as_broken.patch
diff --git a/patches/buildroot/2010.11/152-uclibc-add_times_syscall_patches.patch b/patches/buildroot/2011.05/152-uclibc-add_times_syscall_patches.patch
similarity index 100%
copy from patches/buildroot/2010.11/152-uclibc-add_times_syscall_patches.patch
copy to patches/buildroot/2011.05/152-uclibc-add_times_syscall_patches.patch
diff --git a/patches/buildroot/2010.11/153-busybox-fix_1.16_build_with_make_3.82.patch b/patches/buildroot/2011.05/153-busybox-fix_1.16_build_with_make_3.82.patch
similarity index 100%
copy from patches/buildroot/2010.11/153-busybox-fix_1.16_build_with_make_3.82.patch
copy to patches/buildroot/2011.05/153-busybox-fix_1.16_build_with_make_3.82.patch
diff --git a/patches/buildroot/2011.05/154-packages-fix_DL_VERSION_usage.patch b/patches/buildroot/2011.05/154-packages-fix_DL_VERSION_usage.patch
new file mode 100644
index 0000000..01b1f65
--- /dev/null
+++ b/patches/buildroot/2011.05/154-packages-fix_DL_VERSION_usage.patch
@@ -0,0 +1,28 @@
+Otherwise DOWNLOAD_SVN doesn't work for host packages (saw with host-sstrip and no
+download mirror).
+
+To be merged in mainline by Thomas Petazzoni...
+
+Index: buildroot/package/Makefile.package.in
+===================================================================
+--- buildroot.orig/package/Makefile.package.in 2011-08-04 10:09:45.000000000 +0200
++++ buildroot/package/Makefile.package.in 2011-08-04 11:16:13.000000000 +0200
+@@ -380,14 +380,16 @@
+ # sanitize the package version that is used in paths, directory and file names.
+ # Forward slashes may appear in the package's version when pointing to a
+ # version control system branch or tag, for example remotes/origin/1_10_stable.
+-$(2)_DL_VERSION = $($(2)_VERSION)
+ ifndef $(2)_VERSION
+ ifdef $(3)_VERSION
+- $(2)_VERSION = $($(3)_VERSION)
++ $(2)_DL_VERSION = $($(3)_VERSION)
++ $(2)_VERSION = $(subst /,_,$($(3)_VERSION))
+ else
++ $(2)_DL_VERSION = undefined
+ $(2)_VERSION = undefined
+ endif
+ else
++ $(2)_DL_VERSION = $($(2)_VERSION)
+ $(2)_VERSION = $(subst /,_,$($(2)_VERSION))
+ endif
+
diff --git a/patches/buildroot/2011.05/155-alsa-force_1_0_23_version.patch b/patches/buildroot/2011.05/155-alsa-force_1_0_23_version.patch
new file mode 100644
index 0000000..9eb9ee6
--- /dev/null
+++ b/patches/buildroot/2011.05/155-alsa-force_1_0_23_version.patch
@@ -0,0 +1,75 @@
+Otherwise got the following build error with uClibc 0.9.30:
+ parser.c: In function 'uc_mgr_scan_master_configs':
+ parser.c:1138: error: 'versionsort' undeclared (first use in this function)
+ parser.c:1138: error: (Each undeclared identifier is reported only once
+ parser.c:1138: error: for each function it appears in.)
+
+(should be fine with more recent uClibcs)
+
+As a consequence, alsa-utils are also downgraded and alsa-utils/alsa-utils-exp10-workaround.patch
+removed.
+
+Index: buildroot/package/multimedia/alsa-lib/alsa-lib.mk
+===================================================================
+--- buildroot.orig/package/multimedia/alsa-lib/alsa-lib.mk 2011-08-04 16:47:54.000000000 +0200
++++ buildroot/package/multimedia/alsa-lib/alsa-lib.mk 2011-08-04 16:48:14.000000000 +0200
+@@ -3,7 +3,7 @@
+ # alsa-lib
+ #
+ #############################################################
+-ALSA_LIB_VERSION = 1.0.24.1
++ALSA_LIB_VERSION = 1.0.23
+ ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
+ ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
+ ALSA_LIB_INSTALL_STAGING = YES
+Index: buildroot/package/multimedia/alsa-utils/alsa-utils.mk
+===================================================================
+--- buildroot.orig/package/multimedia/alsa-utils/alsa-utils.mk 2011-08-04 17:00:22.000000000 +0200
++++ buildroot/package/multimedia/alsa-utils/alsa-utils.mk 2011-08-04 17:00:33.000000000 +0200
+@@ -3,7 +3,7 @@
+ # alsa-utils
+ #
+ #############################################################
+-ALSA_UTILS_VERSION = 1.0.24.2
++ALSA_UTILS_VERSION = 1.0.23
+ ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
+ ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
+ ALSA_UTILS_INSTALL_STAGING = YES
+Index: buildroot/package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch
+===================================================================
+--- buildroot.orig/package/multimedia/alsa-utils/alsa-utils-exp10-workaround.patch 2011-08-04 17:09:37.000000000 +0200
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,33 +0,0 @@
+-From da14c5ab2a6e030c5c56c979b8eb3ca071890876 Mon Sep 17 00:00:00 2001
+-From: Peter Korsgaard <ja...@su...>
+-Date: Mon, 14 Mar 2011 09:19:18 +0100
+-Subject: [PATCH] alsamixer: fix build on uClibc
+-
+-exp10 is a glibc extension, which isn't supported on uClibc. Luckily,
+-exp10() is trivial to compute based on exp(), so add a wrapper for
+-the uClibc case.
+-
+-Signed-off-by: Peter Korsgaard <ja...@su...>
+----
+- alsamixer/volume_mapping.c | 5 +++++
+- 1 files changed, 5 insertions(+), 0 deletions(-)
+-
+-diff --git a/alsamixer/volume_mapping.c b/alsamixer/volume_mapping.c
+-index 9cacad8..1c0d7c4 100644
+---- a/alsamixer/volume_mapping.c
+-+++ b/alsamixer/volume_mapping.c
+-@@ -37,6 +37,11 @@
+- #include <stdbool.h>
+- #include "volume_mapping.h"
+-
+-+#ifdef __UCLIBC__
+-+/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
+-+#define exp10(x) (exp((x) * log(10)))
+-+#endif /* __UCLIBC__ */
+-+
+- #define MAX_LINEAR_DB_SCALE 24
+-
+- static inline bool use_linear_dB_scale(long dBmin, long dBmax)
+---
+-1.7.2.3
+-
diff --git a/patches/buildroot/2010.11/cleanup_buildroot.sh b/patches/buildroot/2011.05/cleanup_buildroot.sh
similarity index 100%
copy from patches/buildroot/2010.11/cleanup_buildroot.sh
copy to patches/buildroot/2011.05/cleanup_buildroot.sh
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-08-04 13:50:54
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f44ab6f54b53111d6b29e9e50df85b7111c538a4 (commit)
from 66571915d40dce235e02367e8f84bcdb7783d1d4 (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 f44ab6f54b53111d6b29e9e50df85b7111c538a4
Author: Fabien Marteau <fab...@ar...>
Date: Thu Aug 4 15:50:25 2011 +0200
[linux][kconfig] Adding star completion capability for kernel 2.6.29
-----------------------------------------------------------------------
Summary of changes:
..._star_completion_for_source_in_menuconfig.patch | 0
1 files changed, 0 insertions(+), 0 deletions(-)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.38 => 2.6.29}/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (100%)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
similarity index 100%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-08-04 13:23:37
|
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 66571915d40dce235e02367e8f84bcdb7783d1d4 (commit)
via d107d99916568bb157771f7861408b8160f792d4 (commit)
via d0dfa56faff7be676a18022fe971e1943557bbdf (commit)
from 333981e0726e7951c79a9e54bdb91bc039546e7d (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 66571915d40dce235e02367e8f84bcdb7783d1d4
Merge: d107d99916568bb157771f7861408b8160f792d4 333981e0726e7951c79a9e54bdb91bc039546e7d
Author: Fabien Marteau <fab...@ar...>
Date: Thu Aug 4 15:19:44 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d107d99916568bb157771f7861408b8160f792d4
Author: Fabien Marteau <fab...@ar...>
Date: Thu Aug 4 15:11:53 2011 +0200
[linux][fpga] change structure of fpga drivers directory, work for twin_uarts
commit d0dfa56faff7be676a18022fe971e1943557bbdf
Author: Fabien Marteau <fab...@ar...>
Date: Thu Aug 4 08:34:57 2011 +0200
[linux][kconfig] Adding star completion capability
-----------------------------------------------------------------------
Summary of changes:
..._star_completion_for_source_in_menuconfig.patch | 80 ++++++++++++++++++++
target/linux/modules/fpga/Kconfig | 11 ++-
target/linux/modules/fpga/Makefile | 2 +-
target/linux/modules/fpga/POD/Kconfig | 13 ++--
target/linux/modules/fpga/POD/void/Kconfig | 7 ++
target/linux/modules/fpga/board_designs/Kconfig | 13 +++
target/linux/modules/fpga/board_designs/Makefile | 3 +
.../modules/fpga/board_designs/twin_uart/Kconfig | 12 +++
.../modules/fpga/board_designs/twin_uart/Makefile | 3 +
.../fpga/board_designs/twin_uart/irq_mngr/Kconfig | 8 ++
.../fpga/board_designs/twin_uart/irq_mngr/Makefile | 2 +
.../twin_uart/irq_mngr/twin_uarts_irq_mng.c} | 2 +-
.../twin_uart/uarts}/16750.c | 0
.../fpga/board_designs/twin_uart/uarts/Kconfig | 11 +++
.../fpga/board_designs/twin_uart/uarts/Makefile | 4 +
.../fpga/board_designs/wishbone_example/Kconfig | 18 +++++
.../{ => board_designs}/wishbone_example/Makefile | 2 +-
.../wishbone_example/push-led.c | 0
.../wishbone_example/wb_button/.gitignore | 0
.../wishbone_example/wb_button/Kconfig | 9 ++
.../wishbone_example/wb_button/Makefile | 0
.../wishbone_example/wb_button/board_buttons.c | 0
.../wishbone_example/wb_irq_mngr/Kconfig | 14 ++++
.../wishbone_example/wb_irq_mngr/Makefile | 3 +-
.../wishbone_example/wb_irq_mngr/board_irq_mng.c | 0
.../board_designs/wishbone_example/wb_led/Kconfig | 8 ++
.../wishbone_example/wb_led/Makefile | 0
.../wishbone_example/wb_led/board_leds.c | 0
.../linux/modules/fpga/virtual_components/Kconfig | 11 +++
.../linux/modules/fpga/virtual_components/Makefile | 3 +
.../modules/fpga/virtual_components/button/Kconfig | 8 ++
.../fpga/virtual_components/button/Makefile | 4 +
.../button}/button.h | 0
.../button}/gbutton.c | 0
.../button}/testbutton.c | 0
.../fpga/virtual_components/irq_mngr/Kconfig | 8 ++
.../fpga/virtual_components/irq_mngr/Makefile | 4 +
.../irq_mngr}/irq_mng.h | 0
.../irq_mngr}/main.c | 0
.../irq_mngr}/test.c | 0
.../modules/fpga/virtual_components/led/Kconfig | 7 ++
.../modules/fpga/virtual_components/led/Makefile | 3 +
.../wb_led => virtual_components/led}/g_led.c | 0
.../wb_led => virtual_components/led}/led.h | 0
.../wb_led => virtual_components/led}/s_led.c | 0
.../wb_led => virtual_components/led}/testled.c | 0
target/linux/modules/fpga/wishbone_example/Kconfig | 18 -----
.../fpga/wishbone_example/wb_button/Kconfig | 8 --
.../fpga/wishbone_example/wb_irq_mngr/Kconfig | 14 ----
.../fpga/wishbone_example/wb_irq_mngr/README | 8 --
.../modules/fpga/wishbone_example/wb_led/Kconfig | 9 --
.../linux/modules/fpga/wishbone_twin_uart/Kconfig | 8 --
.../linux/modules/fpga/wishbone_twin_uart/Makefile | 24 ------
.../linux/modules/fpga/wishbone_twin_uart/README | 8 --
54 files changed, 257 insertions(+), 113 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
create mode 100644 target/linux/modules/fpga/POD/void/Kconfig
create mode 100644 target/linux/modules/fpga/board_designs/Kconfig
create mode 100644 target/linux/modules/fpga/board_designs/Makefile
create mode 100644 target/linux/modules/fpga/board_designs/twin_uart/Kconfig
create mode 100644 target/linux/modules/fpga/board_designs/twin_uart/Makefile
create mode 100644 target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Kconfig
create mode 100644 target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Makefile
copy target/linux/modules/fpga/{wishbone_example/wb_irq_mngr/board_irq_mng.c => board_designs/twin_uart/irq_mngr/twin_uarts_irq_mng.c} (97%)
rename target/linux/modules/fpga/{wishbone_twin_uart => board_designs/twin_uart/uarts}/16750.c (100%)
create mode 100644 target/linux/modules/fpga/board_designs/twin_uart/uarts/Kconfig
create mode 100644 target/linux/modules/fpga/board_designs/twin_uart/uarts/Makefile
create mode 100644 target/linux/modules/fpga/board_designs/wishbone_example/Kconfig
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/Makefile (99%)
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/push-led.c (100%)
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/wb_button/.gitignore (100%)
create mode 100644 target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Kconfig
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/wb_button/Makefile (100%)
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/wb_button/board_buttons.c (100%)
create mode 100644 target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/wb_irq_mngr/Makefile (76%)
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/wb_irq_mngr/board_irq_mng.c (100%)
create mode 100644 target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Kconfig
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/wb_led/Makefile (100%)
rename target/linux/modules/fpga/{ => board_designs}/wishbone_example/wb_led/board_leds.c (100%)
create mode 100644 target/linux/modules/fpga/virtual_components/Kconfig
create mode 100644 target/linux/modules/fpga/virtual_components/Makefile
create mode 100644 target/linux/modules/fpga/virtual_components/button/Kconfig
create mode 100755 target/linux/modules/fpga/virtual_components/button/Makefile
rename target/linux/modules/fpga/{wishbone_example/wb_button => virtual_components/button}/button.h (100%)
rename target/linux/modules/fpga/{wishbone_example/wb_button => virtual_components/button}/gbutton.c (100%)
rename target/linux/modules/fpga/{wishbone_example/wb_button => virtual_components/button}/testbutton.c (100%)
create mode 100644 target/linux/modules/fpga/virtual_components/irq_mngr/Kconfig
create mode 100644 target/linux/modules/fpga/virtual_components/irq_mngr/Makefile
rename target/linux/modules/fpga/{wishbone_example/wb_irq_mngr => virtual_components/irq_mngr}/irq_mng.h (100%)
rename target/linux/modules/fpga/{wishbone_example/wb_irq_mngr => virtual_components/irq_mngr}/main.c (100%)
rename target/linux/modules/fpga/{wishbone_example/wb_irq_mngr => virtual_components/irq_mngr}/test.c (100%)
create mode 100644 target/linux/modules/fpga/virtual_components/led/Kconfig
create mode 100644 target/linux/modules/fpga/virtual_components/led/Makefile
rename target/linux/modules/fpga/{wishbone_example/wb_led => virtual_components/led}/g_led.c (100%)
rename target/linux/modules/fpga/{wishbone_example/wb_led => virtual_components/led}/led.h (100%)
rename target/linux/modules/fpga/{wishbone_example/wb_led => virtual_components/led}/s_led.c (100%)
rename target/linux/modules/fpga/{wishbone_example/wb_led => virtual_components/led}/testled.c (100%)
delete mode 100644 target/linux/modules/fpga/wishbone_example/Kconfig
delete mode 100644 target/linux/modules/fpga/wishbone_example/wb_button/Kconfig
delete mode 100644 target/linux/modules/fpga/wishbone_example/wb_irq_mngr/Kconfig
delete mode 100644 target/linux/modules/fpga/wishbone_example/wb_irq_mngr/README
delete mode 100644 target/linux/modules/fpga/wishbone_example/wb_led/Kconfig
delete mode 100644 target/linux/modules/fpga/wishbone_twin_uart/Kconfig
delete mode 100644 target/linux/modules/fpga/wishbone_twin_uart/Makefile
delete mode 100644 target/linux/modules/fpga/wishbone_twin_uart/README
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
new file mode 100644
index 0000000..3bb971c
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
@@ -0,0 +1,80 @@
+Index: linux-2.6.38.1/scripts/kconfig/zconf.tab.c_shipped
+===================================================================
+--- linux-2.6.38.1.orig/scripts/kconfig/zconf.tab.c_shipped 2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/scripts/kconfig/zconf.tab.c_shipped 2011-08-04 09:13:16.000000000 +0200
+@@ -87,6 +87,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdbool.h>
++#include <dirent.h>
++#include <sys/stat.h>
+
+ #define LKC_DIRECT_LINK
+ #include "lkc.h"
+@@ -95,6 +97,7 @@
+
+ #define PRINTD 0x0001
+ #define DEBUG_PARSE 0x0002
++#define BUFF_SIZE 300
+
+ int cdebug = PRINTD;
+
+@@ -108,6 +111,26 @@
+
+ static struct menu *current_menu, *current_entry;
+
++
++int isDir(const char *fullpath, const char *dname) {
++ struct stat sbuf;
++
++ if (*dname == '.')
++ return 0;
++
++ if (lstat(fullpath, &sbuf) == -1) {
++ fprintf(stderr, "lstat() Failed.\n");
++ return 0;
++ }
++
++ if(S_ISDIR(sbuf.st_mode)) {
++ return 1;
++ }
++
++return 0;
++}
++
++
+ #define YYDEBUG 0
+ #if YYDEBUG
+ #define YYERROR_VERBOSE
+@@ -1897,8 +1920,30 @@
+ case 83:
+
+ {
++ char *name;
++ char *ptr;
++ char dirname[BUFF_SIZE];
++ char filename[BUFF_SIZE];
++ struct dirent *lecture;
++ DIR *rep;
++
+ printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
+- zconf_nextfile((yyvsp[(2) - (3)].string));
++ name = (yyvsp[(2) -(3)].string);
++ ptr = strchr(name, '*');
++ if(ptr != NULL) {
++ *ptr = '\0';
++ snprintf(dirname, BUFF_SIZE, "%s/%s", getenv(SRCTREE), name);
++ rep = opendir(dirname);
++ while ((lecture = readdir(rep))) {
++ snprintf(filename, BUFF_SIZE, "%s/%s/%s", getenv(SRCTREE), name, lecture->d_name);
++ if(isDir(filename, lecture->d_name)){
++ snprintf(filename, BUFF_SIZE, "%s/%s/%s/%s", getenv(SRCTREE), name, lecture->d_name, ptr+1);
++ zconf_nextfile(filename);
++ }
++ }
++ } else {
++ zconf_nextfile((yyvsp[(2) - (3)].string));
++ }
+ ;}
+ break;
+
diff --git a/target/linux/modules/fpga/Kconfig b/target/linux/modules/fpga/Kconfig
index fa1dca1..dcb8ecc 100644
--- a/target/linux/modules/fpga/Kconfig
+++ b/target/linux/modules/fpga/Kconfig
@@ -9,17 +9,18 @@ config ARMADEUS_FPGA_DRIVERS
boolean "Support FPGA specific drivers"
default n
---help---
- All drivers for FPGA components
-
+ All drivers for FPGA components
+
source "drivers/armadeus/fpga/dev_tools/Kconfig"
source "drivers/armadeus/fpga/others/Kconfig"
-source "drivers/armadeus/fpga/wishbone_example/Kconfig"
-
-source "drivers/armadeus/fpga/wishbone_twin_uart/Kconfig"
+comment "Specific designs"
+ depends on ARMADEUS_FPGA_DRIVERS
+source "drivers/armadeus/fpga/virtual_components/Kconfig"
source "drivers/armadeus/fpga/POD/Kconfig"
+source "drivers/armadeus/fpga/board_designs/Kconfig"
endmenu
diff --git a/target/linux/modules/fpga/Makefile b/target/linux/modules/fpga/Makefile
index 5a71fb7..6352c4e 100755
--- a/target/linux/modules/fpga/Makefile
+++ b/target/linux/modules/fpga/Makefile
@@ -8,7 +8,7 @@ ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
-obj-$(CONFIG_ARMADEUS_FPGA_DRIVERS) += dev_tools/ others/ POD/ wishbone_example/ wishbone_twin_uart/
+obj-$(CONFIG_ARMADEUS_FPGA_DRIVERS) += dev_tools/ others/ POD/ board_designs/ virtual_components/
else
diff --git a/target/linux/modules/fpga/POD/Kconfig b/target/linux/modules/fpga/POD/Kconfig
index cf2bfef..d06d0c5 100644
--- a/target/linux/modules/fpga/POD/Kconfig
+++ b/target/linux/modules/fpga/POD/Kconfig
@@ -3,12 +3,13 @@
# Armadeus custom drivers configuration
#
#
-
+
#
config POD_DRIVERS
- tristate "Drivers generated by POD"
- default n
- depends on ARMADEUS_FPGA_DRIVERS
- ---help---
- All drivers for FPGA components
+ boolean "Board driver generated by POD"
+ default n
+ depends on ARMADEUS_FPGA_DRIVERS
+ ---help---
+ All POD drivers
+source "drivers/armadeus/fpga/POD/*/Kconfig"
diff --git a/target/linux/modules/fpga/POD/void/Kconfig b/target/linux/modules/fpga/POD/void/Kconfig
new file mode 100644
index 0000000..c6dc402
--- /dev/null
+++ b/target/linux/modules/fpga/POD/void/Kconfig
@@ -0,0 +1,7 @@
+config ARMADEUS_FPGA_VOID_DRIVER
+ boolean "useless"
+ default n
+ depends on POD_DRIVERS
+ ---help---
+ useless
+
diff --git a/target/linux/modules/fpga/board_designs/Kconfig b/target/linux/modules/fpga/board_designs/Kconfig
new file mode 100644
index 0000000..bf7fa8b
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/Kconfig
@@ -0,0 +1,13 @@
+#
+# Armadeus custom drivers configuration
+#
+
+config ARMADEUS_FPGA_BOARD_DESIGNS
+ boolean "Board designs"
+ default n
+ depends on ARMADEUS_FPGA_DRIVERS
+ ---help---
+ Board support for fpga designs
+
+source "drivers/armadeus/fpga/board_designs/*/Kconfig"
+
diff --git a/target/linux/modules/fpga/board_designs/Makefile b/target/linux/modules/fpga/board_designs/Makefile
new file mode 100644
index 0000000..575dc2e
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/Makefile
@@ -0,0 +1,3 @@
+
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS) += twin_uart/ wishbone_example/
+
diff --git a/target/linux/modules/fpga/board_designs/twin_uart/Kconfig b/target/linux/modules/fpga/board_designs/twin_uart/Kconfig
new file mode 100644
index 0000000..dbf5ed3
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/twin_uart/Kconfig
@@ -0,0 +1,12 @@
+
+config ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS
+ boolean "board drivers for twin uarts design"
+ default n
+ depends on ARMADEUS_FPGA_BOARD_DESIGNS && MACH_APF51
+ select ARMADEUS_FPGA_VIRTUAL_COMPONENTS
+ ---help---
+ Board support for fpga designs twin uarts used
+ for gsm/gps on apf51Dev board.
+
+source "drivers/armadeus/fpga/board_designs/twin_uart/uarts/Kconfig"
+source "drivers/armadeus/fpga/board_designs/twin_uart/irq_mngr/Kconfig"
diff --git a/target/linux/modules/fpga/board_designs/twin_uart/Makefile b/target/linux/modules/fpga/board_designs/twin_uart/Makefile
new file mode 100644
index 0000000..dc6ce5d
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/twin_uart/Makefile
@@ -0,0 +1,3 @@
+
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS) += irq_mngr/ uarts/
+
diff --git a/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Kconfig b/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Kconfig
new file mode 100644
index 0000000..2bddbd1
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Kconfig
@@ -0,0 +1,8 @@
+
+config ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS_IRQ_MNGR
+ tristate "board irq manager"
+ default n
+ depends on ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS
+ select ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR
+ ---help---
+ irq manager board
diff --git a/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Makefile b/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Makefile
new file mode 100644
index 0000000..2de4e83
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/Makefile
@@ -0,0 +1,2 @@
+
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS_IRQ_MNGR) += twin_uarts_irq_mng.o
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c b/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/twin_uarts_irq_mng.c
similarity index 97%
copy from target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c
copy to target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/twin_uarts_irq_mng.c
index 039f190..0727225 100644
--- a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c
+++ b/target/linux/modules/fpga/board_designs/twin_uart/irq_mngr/twin_uarts_irq_mng.c
@@ -34,7 +34,7 @@
# include <mach/fpga.h>
#endif
-#include "irq_mng.h"
+#include "../../../virtual_components/irq_mngr/irq_mng.h"
static struct resource irq_mng0_resources[] = {
[0] = {
diff --git a/target/linux/modules/fpga/wishbone_twin_uart/16750.c b/target/linux/modules/fpga/board_designs/twin_uart/uarts/16750.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_twin_uart/16750.c
rename to target/linux/modules/fpga/board_designs/twin_uart/uarts/16750.c
diff --git a/target/linux/modules/fpga/board_designs/twin_uart/uarts/Kconfig b/target/linux/modules/fpga/board_designs/twin_uart/uarts/Kconfig
new file mode 100644
index 0000000..bf66376
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/twin_uart/uarts/Kconfig
@@ -0,0 +1,11 @@
+
+config ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS_UARTS
+ tristate "board twin uarts"
+ default n
+ depends on ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS
+ select SERIAL_8250
+ ---help---
+ Board support for fpga designs twin uarts used
+ for gsm/gps on apf51Dev board.
+ If selected as module, it will be named :
+ twin_uarts_16750
diff --git a/target/linux/modules/fpga/board_designs/twin_uart/uarts/Makefile b/target/linux/modules/fpga/board_designs/twin_uart/uarts/Makefile
new file mode 100644
index 0000000..8854d2e
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/twin_uart/uarts/Makefile
@@ -0,0 +1,4 @@
+
+obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_TWIN_UARTS_UARTS) += twin_uarts_16750.o
+twin_uarts_16750-objs := 16750.o
+
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/Kconfig b/target/linux/modules/fpga/board_designs/wishbone_example/Kconfig
new file mode 100644
index 0000000..515e136
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/Kconfig
@@ -0,0 +1,18 @@
+
+#
+# Armadeus custom drivers configuration
+
+#
+config ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE
+ boolean "board drivers for wishbone example"
+ default n
+ depends on ARMADEUS_FPGA_BOARD_DESIGNS
+ select ARMADEUS_FPGA_VIRTUAL_COMPONENTS
+ ---help---
+ Drivers used for wishbone example design that can be
+ found in firmware/wishbone_example/
+
+source "drivers/armadeus/fpga/board_designs/wishbone_example/wb_button/Kconfig"
+source "drivers/armadeus/fpga/board_designs/wishbone_example/wb_led/Kconfig"
+source "drivers/armadeus/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig"
+
diff --git a/target/linux/modules/fpga/wishbone_example/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
similarity index 99%
rename from target/linux/modules/fpga/wishbone_example/Makefile
rename to target/linux/modules/fpga/board_designs/wishbone_example/Makefile
index e127302..7ecb740 100644
--- a/target/linux/modules/fpga/wishbone_example/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
@@ -9,7 +9,7 @@ ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS) += wb_button/ wb_irq_mngr/ wb_led/
-
+
else
# Armadeus custom drivers common targets (default, clean, etc...)
diff --git a/target/linux/modules/fpga/wishbone_example/push-led.c b/target/linux/modules/fpga/board_designs/wishbone_example/push-led.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/push-led.c
rename to target/linux/modules/fpga/board_designs/wishbone_example/push-led.c
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/.gitignore b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/.gitignore
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_button/.gitignore
rename to target/linux/modules/fpga/board_designs/wishbone_example/wb_button/.gitignore
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Kconfig b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Kconfig
new file mode 100644
index 0000000..435a6cb
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Kconfig
@@ -0,0 +1,9 @@
+#
+#
+
+config ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_BUTTON_DRIVER
+ tristate "board Button"
+ default n
+ depends on ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE
+ select ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON
+ ---help---
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_button/Makefile
rename to target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/board_buttons.c b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/board_buttons.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_button/board_buttons.c
rename to target/linux/modules/fpga/board_designs/wishbone_example/wb_button/board_buttons.c
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig
new file mode 100644
index 0000000..71c0509
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Kconfig
@@ -0,0 +1,14 @@
+
+#
+# Armadeus custom drivers configuration
+#
+#
+
+#
+config ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER
+ tristate "board irq"
+ default n
+ depends on ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE
+ select ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR
+ ---help---
+
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
similarity index 76%
rename from target/linux/modules/fpga/wishbone_example/wb_irq_mngr/Makefile
rename to target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
index db8e79c..e7313e2 100755
--- a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/Makefile
@@ -6,8 +6,7 @@ ifneq ($(KERNELRELEASE),)
# Part executed when called from kernel build system:
-obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER) += irq_ocore.o board_irq_mng.o test.o
-irq_ocore-objs := main.o
+obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER) += board_irq_mng.o test.o
else
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c b/target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_irq_mngr/board_irq_mng.c
rename to target/linux/modules/fpga/board_designs/wishbone_example/wb_irq_mngr/board_irq_mng.c
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Kconfig b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Kconfig
new file mode 100644
index 0000000..328cd64
--- /dev/null
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Kconfig
@@ -0,0 +1,8 @@
+
+config ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE_LED_DRIVER
+ tristate "board Led"
+ default n
+ depends on ARMADEUS_FPGA_BOARD_DESIGNS_WISHBONE_EXAMPLE
+ select ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED
+ ---help---
+ blink a led
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_led/Makefile
rename to target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/board_leds.c b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/board_leds.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_led/board_leds.c
rename to target/linux/modules/fpga/board_designs/wishbone_example/wb_led/board_leds.c
diff --git a/target/linux/modules/fpga/virtual_components/Kconfig b/target/linux/modules/fpga/virtual_components/Kconfig
new file mode 100644
index 0000000..d83ee25
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/Kconfig
@@ -0,0 +1,11 @@
+config ARMADEUS_FPGA_VIRTUAL_COMPONENTS
+ boolean "virtual components"
+ default y
+ depends on ARMADEUS_FPGA_DRIVERS
+ ---help---
+ Armadeus driver specific for virtual components
+ under FPGA.
+
+source "drivers/armadeus/fpga/virtual_components/irq_mngr/Kconfig"
+source "drivers/armadeus/fpga/virtual_components/button/Kconfig"
+source "drivers/armadeus/fpga/virtual_components/led/Kconfig"
diff --git a/target/linux/modules/fpga/virtual_components/Makefile b/target/linux/modules/fpga/virtual_components/Makefile
new file mode 100644
index 0000000..481ea2a
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/Makefile
@@ -0,0 +1,3 @@
+
+obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS) += button/ irq_mngr/ led/
+
diff --git a/target/linux/modules/fpga/virtual_components/button/Kconfig b/target/linux/modules/fpga/virtual_components/button/Kconfig
new file mode 100644
index 0000000..e1728b8
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/button/Kconfig
@@ -0,0 +1,8 @@
+
+config ARMADEUS_FPGA_VIRTUAL_COMPONENTS_BUTTON
+ tristate "button"
+ default n
+ depends on ARMADEUS_FPGA_VIRTUAL_COMPONENTS
+ ---help---
+ Armadeus driver for virtual button component.
+
diff --git a/target/linux/modules/fpga/virtual_components/button/Makefile b/target/linux/modules/fpga/virtual_components/button/Makefile
new file mode 100755
index 0000000..a36fde2
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/button/Makefile
@@ -0,0 +1,4 @@
+
+obj-$(CONFIG_ARMADEUS_WISHBONE_EXAMPLE_BUTTON_DRIVER) += button_ocore.o
+button_ocore-objs := gbutton.c
+
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/button.h b/target/linux/modules/fpga/virtual_components/button/button.h
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_button/button.h
rename to target/linux/modules/fpga/virtual_components/button/button.h
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c b/target/linux/modules/fpga/virtual_components/button/gbutton.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_button/gbutton.c
rename to target/linux/modules/fpga/virtual_components/button/gbutton.c
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/testbutton.c b/target/linux/modules/fpga/virtual_components/button/testbutton.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_button/testbutton.c
rename to target/linux/modules/fpga/virtual_components/button/testbutton.c
diff --git a/target/linux/modules/fpga/virtual_components/irq_mngr/Kconfig b/target/linux/modules/fpga/virtual_components/irq_mngr/Kconfig
new file mode 100644
index 0000000..fea81f1
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/irq_mngr/Kconfig
@@ -0,0 +1,8 @@
+
+config ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR
+ tristate "irq manager"
+ default n
+ depends on ARMADEUS_FPGA_VIRTUAL_COMPONENTS
+ ---help---
+ Armadeus driver for virtual irq_mngr component
+
diff --git a/target/linux/modules/fpga/virtual_components/irq_mngr/Makefile b/target/linux/modules/fpga/virtual_components/irq_mngr/Makefile
new file mode 100644
index 0000000..95b5889
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/irq_mngr/Makefile
@@ -0,0 +1,4 @@
+
+obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_IRQ_MNGR) += irq_ocore.o
+irq_ocore-objs := main.o
+
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/irq_mng.h b/target/linux/modules/fpga/virtual_components/irq_mngr/irq_mng.h
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_irq_mngr/irq_mng.h
rename to target/linux/modules/fpga/virtual_components/irq_mngr/irq_mng.h
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/main.c b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_irq_mngr/main.c
rename to target/linux/modules/fpga/virtual_components/irq_mngr/main.c
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/test.c b/target/linux/modules/fpga/virtual_components/irq_mngr/test.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_irq_mngr/test.c
rename to target/linux/modules/fpga/virtual_components/irq_mngr/test.c
diff --git a/target/linux/modules/fpga/virtual_components/led/Kconfig b/target/linux/modules/fpga/virtual_components/led/Kconfig
new file mode 100644
index 0000000..da4b498
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/led/Kconfig
@@ -0,0 +1,7 @@
+
+config ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED
+ tristate "led"
+ default n
+ depends on ARMADEUS_FPGA_VIRTUAL_COMPONENTS
+ ---help---
+ Armadeus driver for virtual led component.
diff --git a/target/linux/modules/fpga/virtual_components/led/Makefile b/target/linux/modules/fpga/virtual_components/led/Makefile
new file mode 100644
index 0000000..be6e091
--- /dev/null
+++ b/target/linux/modules/fpga/virtual_components/led/Makefile
@@ -0,0 +1,3 @@
+
+obj-$(CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_LED) := led_ocore.o
+led_ocore-objs := g_led.o
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/g_led.c b/target/linux/modules/fpga/virtual_components/led/g_led.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_led/g_led.c
rename to target/linux/modules/fpga/virtual_components/led/g_led.c
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/led.h b/target/linux/modules/fpga/virtual_components/led/led.h
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_led/led.h
rename to target/linux/modules/fpga/virtual_components/led/led.h
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/s_led.c b/target/linux/modules/fpga/virtual_components/led/s_led.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_led/s_led.c
rename to target/linux/modules/fpga/virtual_components/led/s_led.c
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/testled.c b/target/linux/modules/fpga/virtual_components/led/testled.c
similarity index 100%
rename from target/linux/modules/fpga/wishbone_example/wb_led/testled.c
rename to target/linux/modules/fpga/virtual_components/led/testled.c
diff --git a/target/linux/modules/fpga/wishbone_example/Kconfig b/target/linux/modules/fpga/wishbone_example/Kconfig
deleted file mode 100644
index 7751bbe..0000000
--- a/target/linux/modules/fpga/wishbone_example/Kconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#
-# Armadeus custom drivers configuration
-#
-#
-
-#
-config ARMADEUS_WISHBONE_EXAMPLE_DRIVERS
- boolean "Drivers for wishbone example"
- default n
- depends on ARMADEUS_FPGA_DRIVERS
- ---help---
- Drivers used for wishbone example design that can be
- found in firmware/wishbone_example/
-
-source "drivers/armadeus/fpga/wishbone_example/wb_button/Kconfig"
-source "drivers/armadeus/fpga/wishbone_example/wb_led/Kconfig"
-source "drivers/armadeus/fpga/wishbone_example/wb_irq_mngr/Kconfig"
diff --git a/target/linux/modules/fpga/wishbone_example/wb_button/Kconfig b/target/linux/modules/fpga/wishbone_example/wb_button/Kconfig
deleted file mode 100644
index 092db23..0000000
--- a/target/linux/modules/fpga/wishbone_example/wb_button/Kconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#
-
-config ARMADEUS_WISHBONE_EXAMPLE_BUTTON_DRIVER
- tristate "Wishbone Button driver"
- default m
- depends on ARMADEUS_WISHBONE_EXAMPLE_DRIVERS
- ---help---
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/Kconfig b/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/Kconfig
deleted file mode 100644
index 5455114..0000000
--- a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/Kconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-
-#
-# Armadeus custom drivers configuration
-#
-#
-
-#
-config ARMADEUS_WISHBONE_EXAMPLE_IRQ_MNGR_DRIVER
- tristate "IRQ manager with wishbone interface"
- default m
- depends on ARMADEUS_WISHBONE_EXAMPLE_DRIVERS
- ---help---
-
-
diff --git a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/README b/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/README
deleted file mode 100644
index 5fe96a6..0000000
--- a/target/linux/modules/fpga/wishbone_example/wb_irq_mngr/README
+++ /dev/null
@@ -1,8 +0,0 @@
-To compile this driver from here:
----------------------------------
- make ARCH=arm CROSS_COMPILE=$PWD/../../../../../buildroot/build_arm/staging_dir/bin/arm-linux-
-
-To install this driver:
------------------------
-Copy resulting *.ko files on your target rootfs
-
diff --git a/target/linux/modules/fpga/wishbone_example/wb_led/Kconfig b/target/linux/modules/fpga/wishbone_example/wb_led/Kconfig
deleted file mode 100644
index 1233d7f..0000000
--- a/target/linux/modules/fpga/wishbone_example/wb_led/Kconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#
-
-config ARMADEUS_WISHBONE_EXAMPLE_LED_DRIVER
- tristate "Wishbone Led driver"
- default m
- depends on ARMADEUS_WISHBONE_EXAMPLE_DRIVERS
- ---help---
- blink a led
diff --git a/target/linux/modules/fpga/wishbone_twin_uart/Kconfig b/target/linux/modules/fpga/wishbone_twin_uart/Kconfig
deleted file mode 100644
index c727a34..0000000
--- a/target/linux/modules/fpga/wishbone_twin_uart/Kconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-config ARMADEUS_WISHBONE_TWIN_UART
- tristate "2x UARTS for APF51Dev (GSM/GPS specific)"
- default m
- depends on ARMADEUS_FPGA_DRIVERS && MACH_APF51
- ---help---
- Driver used as module to register GSM and GPS UARTs on APF51Dev.
-
- http://www.armadeus.com/wiki/index.php?title=GSM/GPRS
diff --git a/target/linux/modules/fpga/wishbone_twin_uart/Makefile b/target/linux/modules/fpga/wishbone_twin_uart/Makefile
deleted file mode 100644
index 5d319b9..0000000
--- a/target/linux/modules/fpga/wishbone_twin_uart/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Makefile for the Armadeus FPGA serial "driver" (compatible with 16750/8250 OpenCore IP)
-#
-
-ifneq ($(KERNELRELEASE),)
-
-# Part executed when called from kernel build system:
-
-obj-$(CONFIG_ARMADEUS_WISHBONE_TWIN_UART) += 16750_ocore.o
-16750_ocore-objs := 16750.o
-
-else
-
-ARMADEUS_BASE_DIR=../../../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-
-KDIR := $(ARMADEUS_LINUX_DIR)
-PWD := $(shell pwd)
-
-# Armadeus custom drivers common targets (default, clean, etc...)
-include ../../Makefile.in
-
-endif
-
diff --git a/target/linux/modules/fpga/wishbone_twin_uart/README b/target/linux/modules/fpga/wishbone_twin_uart/README
deleted file mode 100644
index 464187b..0000000
--- a/target/linux/modules/fpga/wishbone_twin_uart/README
+++ /dev/null
@@ -1,8 +0,0 @@
-To compile this driver from here:
----------------------------------
-$ make
-
-To install this driver:
------------------------
-Copy resulting *.ko files on your target rootfs
-
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2011-08-04 06:36:05
|
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 333981e0726e7951c79a9e54bdb91bc039546e7d (commit)
from da556bce4a8a7f1b11cf228ba7f0858801fd1e8a (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 333981e0726e7951c79a9e54bdb91bc039546e7d
Author: Nicolas Colombain <nic...@ar...>
Date: Thu Aug 4 08:34:24 2011 +0200
[LINUX]fix imx51 pwm clock source
-----------------------------------------------------------------------
Summary of changes:
target/linux/modules/pwm/pwm.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/target/linux/modules/pwm/pwm.c b/target/linux/modules/pwm/pwm.c
index 3f7870d..a7b87f3 100644
--- a/target/linux/modules/pwm/pwm.c
+++ b/target/linux/modules/pwm/pwm.c
@@ -60,7 +60,11 @@
#define PWM_IRQEN (1<<0)
#define PWM_SWR (1<<3)
#define PWM_CLKSRC_MASK (3<<16)
+#if defined(CONFIG_ARCH_MX2)
#define PWM_CLKSRC_IPG (2<<16)
+#else
+#define PWM_CLKSRC_IPG (1<<16)
+#endif
#define PWM_CLKSRC_32K (3<<16)
#define PWM_REPEAT_MASK (3<<1)
#define PWM_HCTR (1<<20)
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2011-08-04 04:51: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 da556bce4a8a7f1b11cf228ba7f0858801fd1e8a (commit)
via c7d6375791a9a5943f080bb5039d9b1069992ea6 (commit)
via ff3ffed0fb2cf03e368e430ddc5de509f572491d (commit)
via 0bf7db39d8fe1d9a933183f9c0cc5b0bab54dae4 (commit)
from 0dc6749a182bdc64708335bfacb0b84055772112 (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 da556bce4a8a7f1b11cf228ba7f0858801fd1e8a
Author: Eric Jarrige <eri...@ar...>
Date: Thu Aug 4 06:56:43 2011 +0200
[BUILDROOT] update test config for apf9328
commit c7d6375791a9a5943f080bb5039d9b1069992ea6
Author: Eric Jarrige <eri...@ar...>
Date: Thu Aug 4 06:49:52 2011 +0200
[U-BOOT] support new U-Boot release 2011.06
commit ff3ffed0fb2cf03e368e430ddc5de509f572491d
Author: Eric Jarrige <eri...@ar...>
Date: Wed Aug 3 23:46:40 2011 +0200
[BUILDROOT] set U-Boot 2011.06 the default version for the apf9328
commit 0bf7db39d8fe1d9a933183f9c0cc5b0bab54dae4
Author: Eric Jarrige <eri...@ar...>
Date: Wed Aug 3 23:31:08 2011 +0200
[U-BOOT] Update apf9328 to U-Boot release 2011.06
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf9328_defconfig | 817 +---------------
buildroot/configs/apf9328test_defconfig | 852 +----------------
...8-u-boot-2010.03.h => apf9328-u-boot-2011.06.h} | 520 +++++-----
.../155-u.boot-support_for_release_2011_06.patch | 38 +
patches/u-boot/2011.06/01-mx1-i2c.patch | 54 +
.../02-apf9328.patch} | 780 +++++++--------
patches/u-boot/2011.06/03-apf9328-makefile.patch | 51 +
patches/u-boot/2011.06/04-apf9328-config.patch | 1046 ++++++++++++++++++++
patches/u-boot/2011.06/05-mx1-pllclk.patch | 68 ++
patches/u-boot/2011.06/06-DM9000.patch | 45 +
patches/u-boot/2011.06/07-mx1-relocation.patch | 25 +
patches/u-boot/2011.06/series | 8 +
12 files changed, 1988 insertions(+), 2316 deletions(-)
copy buildroot/target/device/armadeus/apf9328/{apf9328-u-boot-2010.03.h => apf9328-u-boot-2011.06.h} (68%)
create mode 100644 patches/buildroot/2010.11/155-u.boot-support_for_release_2011_06.patch
create mode 100644 patches/u-boot/2011.06/01-mx1-i2c.patch
copy patches/u-boot/{2010.03/u-boot-2010.03-110-apf9328.patch => 2011.06/02-apf9328.patch} (68%)
create mode 100644 patches/u-boot/2011.06/03-apf9328-makefile.patch
create mode 100644 patches/u-boot/2011.06/04-apf9328-config.patch
create mode 100644 patches/u-boot/2011.06/05-mx1-pllclk.patch
create mode 100644 patches/u-boot/2011.06/06-DM9000.patch
create mode 100644 patches/u-boot/2011.06/07-mx1-relocation.patch
create mode 100644 patches/u-boot/2011.06/series
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index feb1bef..45289fb 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -1,890 +1,75 @@
-#
-# Automatically generated make config: don't edit
-# Buildroot version: 2010.11
-# Fri Jun 24 10:57:47 2011
-#
-BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
-# BR2_armeb is not set
-# BR2_avr32 is not set
-# BR2_i386 is not set
-# BR2_mips is not set
-# BR2_mipsel is not set
-# BR2_powerpc is not set
-# BR2_sh is not set
-# BR2_sh64 is not set
-# BR2_sparc is not set
-# BR2_x86_64 is not set
-# BR2_xtensa is not set
-# BR2_generic_arm is not set
-# BR2_arm7tdmi is not set
-# BR2_arm610 is not set
-# BR2_arm710 is not set
-# BR2_arm720t is not set
BR2_arm920t=y
-# BR2_arm922t is not set
-# BR2_arm926t is not set
-# BR2_arm10t is not set
-# BR2_arm1136jf_s is not set
-# BR2_arm1176jz_s is not set
-# BR2_arm1176jzf_s is not set
-
-#
-# cortex-A8/A9 needs gcc >= 4.4.x
-#
-# BR2_cortex_a8 is not set
-# BR2_cortex_a9 is not set
-# BR2_sa110 is not set
-# BR2_sa1100 is not set
-# BR2_xscale is not set
-# BR2_iwmmxt is not set
-BR2_ARM_TYPE="ARM920T"
-BR2_ARM_EABI=y
-# BR2_ARM_OABI is not set
-BR2_ARCH="arm"
-BR2_ENDIAN="LITTLE"
-BR2_GCC_TARGET_TUNE="arm920t"
-BR2_GCC_TARGET_ARCH="armv4t"
-BR2_GCC_TARGET_ABI="aapcs-linux"
-
-#
-# Target options
-#
-
-#
-# Preset Devices
-#
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf9328"
-BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imxl"
-BR2_TARGET_ARMADEUS_NR_SDRAM="1"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="16"
-# BR2_TARGET_ARMLTD is not set
-# BR2_TARGET_ATMEL is not set
-# BR2_TARGET_KWIKBYTE is not set
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_TARGET_GENERIC_GETTY=y
-# BR2_TARGET_GENERIC_GETTY_NONE is not set
-# BR2_TARGET_GENERIC_GETTY_TTYS0 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYS1 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYS2 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYS3 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYAMA0 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYAMA1 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYAMA2 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYAMA3 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYSAC0 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYSAC1 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYSAC2 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYSAC3 is not set
BR2_TARGET_GENERIC_GETTY_TTYSMX0=y
-# BR2_TARGET_GENERIC_GETTY_TTYMXC0 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYMXC1 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYMXC2 is not set
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
-# BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP is not set
-# BR2_TARGET_GENERIC_GETTY_BAUDRATE_9600 is not set
-# BR2_TARGET_GENERIC_GETTY_BAUDRATE_19200 is not set
-# BR2_TARGET_GENERIC_GETTY_BAUDRATE_38400 is not set
-# BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600 is not set
-BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
-BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
-
-#
-# Build options
-#
-
-#
-# Commands
-#
-BR2_COPY="cp -R "
BR2_WGET="wget --passive-ftp --tries=3"
-BR2_SVN="svn"
-BR2_BZR="bzr"
BR2_GIT="git clone"
-BR2_ZCAT="gzip -d -c"
-BR2_BZCAT="bzcat"
-BR2_TAR_OPTIONS=""
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-
-#
-# Mirrors and Download locations
-#
-BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_SOURCEFORGE_MIRROR="switch"
-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_JLEVEL=1
-# BR2_DEPRECATED is not set
-# BR2_ENABLE_DEBUG is not set
-# BR2_STRIP_strip is not set
BR2_STRIP_sstrip=y
-# BR2_STRIP_none is not set
-# BR2_OPTIMIZE_0 is not set
-# BR2_OPTIMIZE_1 is not set
-# BR2_OPTIMIZE_2 is not set
-# BR2_OPTIMIZE_3 is not set
-BR2_OPTIMIZE_S=y
-# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_DOCUMENTATION is not set
-# BR2_HAVE_DEVFILES is not set
-
-#
-# Advanced
-#
-BR2_CONFIG_CACHE=y
-
-#
-# Toolchain
-#
-BR2_TOOLCHAIN_BUILDROOT=y
-# BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_CTNG is not set
-
-#
-# Kernel Header Options
-#
-# BR2_KERNEL_HEADERS_2_6_34 is not set
-# BR2_KERNEL_HEADERS_2_6_35 is not set
-# BR2_KERNEL_HEADERS_2_6_36 is not set
BR2_KERNEL_HEADERS_VERSION=y
-# BR2_KERNEL_HEADERS_SNAP is not set
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_DEFAULT_KERNEL_HEADERS="2.6.29.6"
-
-#
-# uClibc Options
-#
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.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
-
-#
-# Binutils Options
-#
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=""
-
-#
-# GCC Options
-#
-# BR2_GCC_VERSION_4_2_4 is not set
-# BR2_GCC_VERSION_4_3_X is not set
BR2_GCC_VERSION_4_4_X=y
-# BR2_GCC_VERSION_4_5_X is not set
-# BR2_GCC_VERSION_SNAP is not set
-BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
-BR2_GCC_VERSION="4.4.5"
-BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-# BR2_GCC_CROSS_OBJC is not set
-# BR2_GCC_CROSS_FORTRAN is not set
-# BR2_INSTALL_OBJC is not set
-# BR2_INSTALL_FORTRAN is not set
-BR2_GCC_SHARED_LIBGCC=y
-
-#
-# Ccache Options
-#
BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"
-
-#
-# Gdb Options
-#
-# BR2_PACKAGE_GDB is not set
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
BR2_GDB_VERSION_6_7_1=y
-# 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"
-
-#
-# Common Toolchain Options
-#
BR2_LARGEFILE=y
BR2_INET_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_NEEDS_GETTEXT=y
-BR2_NEEDS_GETTEXT_IF_LOCALE=y
-BR2_USE_WCHAR=y
-BR2_PREFER_SOFT_FLOAT=y
-BR2_SOFT_FLOAT=y
-# BR2_USE_SSP is not set
-# BR2_PTHREADS_NONE is not set
-# BR2_PTHREADS is not set
-BR2_PTHREADS_OLD=y
BR2_PROGRAM_INVOCATION=y
-BR2_GCC_CROSS_CXX=y
BR2_INSTALL_LIBSTDCPP=y
BR2_TARGET_OPTIMIZATION="-Os -pipe"
-# BR2_ELF2FLT is not set
-# BR2_MKLIBS is not set
BR2_PACKAGE_SSTRIP_TARGET=y
-BR2_PACKAGE_SSTRIP_HOST=y
-BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
-
-#
-# Package Selection for the target
-#
-BR2_PACKAGE_BUSYBOX=y
-# BR2_BUSYBOX_VERSION_1_15_X is not set
BR2_BUSYBOX_VERSION_1_16_X=y
-# BR2_BUSYBOX_VERSION_1_17_X is not set
-# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.16.2"
-BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION).config"
-# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_CUSTOMIZE is not set
-
-#
-# Armadeus specific tools/utilities
-#
-# BR2_PACKAGE_ANYBUSD is not set
-# BR2_PACKAGE_AS_DEVICES is not set
-# BR2_PACKAGE_ARMADEUS_DEMOS is not set
BR2_PACKAGE_FPGAREGS=y
-# BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE is not set
BR2_PACKAGE_IMXREGS=y
-# BR2_PACKAGE_IMXSSI is not set
BR2_PACKAGE_MAX5821CTRL=y
-
-#
-# straton requires as_devices to be installed
-#
-# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
-
-#
-# APF27 specific:
-#
-# BR2_PACKAGE_AD9889CTRL is not set
-# BR2_PACKAGE_ARMADEUS_PPS_UTILITIES is not set
-
-#
-# APF51 specific:
-#
-# BR2_PACKAGE_TFP410CTRL is not set
-
-#
-# APF9328 specific:
-#
BR2_PACKAGE_CH7024CTRL=y
-
-#
-# Audio and video libraries and applications
-#
BR2_PACKAGE_ALSA_LIB=y
-
-#
-# ALSA lib selection
-#
-BR2_PACKAGE_ALSA_LIB_DEVDIR="/dev/snd"
-BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS="all"
-BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS="all"
-BR2_PACKAGE_ALSA_LIB_ALOAD=y
-BR2_PACKAGE_ALSA_LIB_MIXER=y
-BR2_PACKAGE_ALSA_LIB_PCM=y
-BR2_PACKAGE_ALSA_LIB_RAWMIDI=y
-BR2_PACKAGE_ALSA_LIB_HWDEP=y
-BR2_PACKAGE_ALSA_LIB_SEQ=y
-BR2_PACKAGE_ALSA_LIB_ALISP=y
-BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS=y
BR2_PACKAGE_ALSA_UTILS=y
-
-#
-# ALSA utils selection
-#
-# BR2_PACKAGE_ALSA_UTILS_ALSACONF is not set
-BR2_PACKAGE_ALSA_UTILS_ALSACTL=y
-BR2_PACKAGE_ALSA_UTILS_ALSAMIXER=y
-# BR2_PACKAGE_ALSA_UTILS_AMIDI is not set
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
-# BR2_PACKAGE_ALSA_UTILS_ARECORD 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_FFMPEG 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_LIBMPEG2 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_PYWEBRADIO 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_XZ 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_BSDIFF is not set
-# BR2_PACKAGE_CVS is not set
-# BR2_PACKAGE_DISTCC is not set
-# BR2_PACKAGE_FAKEROOT is not set
-# 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_MAKE is not set
-# BR2_PACKAGE_LIBMPC is not set
-# BR2_PACKAGE_LIBMPFR is not set
-# BR2_PACKAGE_LIBTOOL is not set
-# BR2_PACKAGE_M4 is not set
-# BR2_PACKAGE_PKG_CONFIG is not set
-
-#
-# Games
-#
-# BR2_PACKAGE_E_UAE is not set
-# BR2_PACKAGE_GNUCHESS is not set
-# BR2_PACKAGE_LBREAKOUT2 is not set
-# BR2_PACKAGE_LTRIS is not set
-# BR2_PACKAGE_OPENTYRIAN is not set
-# BR2_PACKAGE_PRBOOM is not set
-# BR2_PACKAGE_SDLQUAKE is not set
-# BR2_PACKAGE_SNES9X is not set
-# BR2_PACKAGE_WOLF4SDL is not set
-
-#
-# Graphic libraries and applications (graphic/text)
-#
-
-#
-# Graphic applications
-#
-# BR2_PACKAGE_RRDTOOL is not set
-
-#
-# graphic libraries
-#
-# BR2_PACKAGE_ALLEGRO is not set
-# BR2_PACKAGE_DIRECTFB is not set
-# BR2_PACKAGE_FBDUMP is not set
-# BR2_PACKAGE_FBGRAB is not set
-# BR2_PACKAGE_FBTEST is not set
-# BR2_PACKAGE_FBV is not set
-# BR2_PACKAGE_IMAGEMAGICK is not set
-# BR2_PACKAGE_LINUX_FUSION is not set
-# BR2_PACKAGE_SDL is not set
-
-#
-# Demos
-#
-# BR2_PACKAGE_SDL_WATER is not set
-
-#
-# other GUIs
-#
-# BR2_PACKAGE_QT is not set
-
-#
-# Qwt requires Qt to be installed
-#
-# BR2_PACKAGE_XORG7 is not set
-
-#
-# X libraries and helper libraries
-#
-# BR2_PACKAGE_LIBERATION is not set
-
-#
-# X Window managers
-#
-
-#
-# X applications
-#
-# BR2_PACKAGE_GOB2 is not set
-
-#
-# midori requires C++, WCHAR in toolchain and libgtk2
-#
-
-#
-# Hardware handling
-#
-# BR2_PACKAGE_CDRKIT is not set
-# BR2_PACKAGE_CRAMFS is not set
-# BR2_PACKAGE_CWIID is not set
-
-#
-# dbus not available (need expat or libxml2)
-#
-# BR2_PACKAGE_DMRAID is not set
-# BR2_PACKAGE_DOSFSTOOLS is not set
-# 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_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
-# BR2_PACKAGE_I2C_TOOLS is not set
-# BR2_PACKAGE_INPUT_TOOLS is not set
-# BR2_PACKAGE_IOSTAT is not set
-# BR2_PACKAGE_KBD is not set
-# BR2_PACKAGE_LCD4LINUX 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
-
-#
-# MTD tools selection
-#
-# BR2_PACKAGE_MTD_DOCFDISK is not set
-# BR2_PACKAGE_MTD_DOC_LOADBIOS is not set
-BR2_PACKAGE_MTD_FLASHCP=y
-BR2_PACKAGE_MTD_FLASH_ERASE=y
-BR2_PACKAGE_MTD_FLASH_ERASEALL=y
-BR2_PACKAGE_MTD_FLASH_INFO=y
-BR2_PACKAGE_MTD_FLASH_LOCK=y
-# BR2_PACKAGE_MTD_FLASH_OTP_DUMP is not set
-# BR2_PACKAGE_MTD_FLASH_OTP_INFO is not set
-BR2_PACKAGE_MTD_FLASH_UNLOCK=y
-# BR2_PACKAGE_MTD_FTL_CHECK is not set
-# BR2_PACKAGE_MTD_FTL_FORMAT is not set
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
-BR2_PACKAGE_MTD_MTD_DEBUG=y
-BR2_PACKAGE_MTD_NANDDUMP=y
-BR2_PACKAGE_MTD_NANDTEST=y
-BR2_PACKAGE_MTD_NANDWRITE=y
-# BR2_PACKAGE_MTD_NFTLDUMP is not set
-# BR2_PACKAGE_MTD_NFTL_FORMAT is not set
-# BR2_PACKAGE_MTD_RECV_IMAGE is not set
-# BR2_PACKAGE_MTD_RFDDUMP is not set
-# 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
-BR2_PACKAGE_MTD_UBIFORMAT=y
-BR2_PACKAGE_MTD_UBIMKVOL=y
-BR2_PACKAGE_MTD_UBINFO=y
-BR2_PACKAGE_MTD_UBINIZE=y
-BR2_PACKAGE_MTD_UBIRENAME=y
-BR2_PACKAGE_MTD_UBIRMVOL=y
-BR2_PACKAGE_MTD_UBIRSVOL=y
-BR2_PACKAGE_MTD_UBIUPDATEVOL=y
-# BR2_PACKAGE_NTFS_3G is not set
-# BR2_PACKAGE_NTFSPROGS is not set
-# BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_RNG_TOOLS is not set
-# BR2_PACKAGE_SETSERIAL is not set
-# BR2_PACKAGE_SMARTMONTOOLS is not set
-# BR2_PACKAGE_SQUASHFS is not set
-# BR2_PACKAGE_SYSSTAT is not set
-# BR2_PACKAGE_UDEV is not set
-# BR2_PACKAGE_URG is not set
-# BR2_PACKAGE_USB_MODESWITCH is not set
-# BR2_PACKAGE_USBMOUNT is not set
-# BR2_PACKAGE_USBUTILS is not set
-# BR2_PACKAGE_WIPE is not set
-# BR2_PACKAGE_XENOMAI is not set
-# BR2_PACKAGE_XFSPROGS is not set
-
-#
-# Interpreter languages and scripting
-#
-# 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
-
-#
-# Libraries
-#
-
-#
-# Compression and decompression
-#
-# BR2_PACKAGE_LIBARCHIVE is not set
-BR2_PACKAGE_LZO=y
-BR2_PACKAGE_ZLIB=y
-
-#
-# 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
-
-#
-# Database
-#
-# BR2_PACKAGE_BERKELEYDB is not set
-# BR2_PACKAGE_MYSQL_CLIENT is not set
-# BR2_PACKAGE_SQLITE is not set
-
-#
-# Filesystem
-#
-# 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
-
-#
-# Graphics
-#
-# 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_GDK_PIXBUF is not set
-# BR2_PACKAGE_LIBPNG is not set
-# BR2_PACKAGE_LIBSVGTINY is not set
-# BR2_PACKAGE_LIBUNGIF is not set
-# BR2_PACKAGE_MESALIB is not set
-# BR2_PACKAGE_PANGO is not set
-# BR2_PACKAGE_PIXMAN is not set
-# BR2_PACKAGE_TIFF is not set
-
-#
-# webkit requires C++, WCHAR in toolchain and libgtk2
-#
-
-#
-# Hardware handling
-#
-# BR2_PACKAGE_LIBAIO is not set
-# BR2_PACKAGE_LIBRAW1394 is not set
BR2_PACKAGE_TSLIB=y
-# BR2_PACKAGE_LIBUSB is not set
-
-#
-# Java
-#
-# BR2_PACKAGE_CLASSPATH is not set
-
-#
-# Networking
-#
-# 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
-#
-# BR2_PACKAGE_ARGP_STANDALONE 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_LIBGLIB2 is not set
-# BR2_PACKAGE_LIBOIL is not set
-
-#
-# Text and terminal handling
-#
-# BR2_PACKAGE_ENCHANT is not set
-# BR2_PACKAGE_ICU 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
-
-#
-# XML
-#
-# 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
-
-#
-# Miscellaneous
-#
-# BR2_PACKAGE_SHARED_MIME_INFO is not set
-
-#
-# Networking 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_BLUEZ3_LIBS is not set
-
-#
-# bluez-utils not available (need dbus)
-#
-# BR2_PACKAGE_BMON is not set
-# BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_CAN_UTILS 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_NGIRCD is not set
BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_SNTP is not set
-# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
# BR2_PACKAGE_NTP_NTPD is not set
-# BR2_PACKAGE_NTP_NTPDATE is not set
-# BR2_PACKAGE_NTP_NTPDC is not set
-# BR2_PACKAGE_NTP_NTPQ is not set
-# BR2_PACKAGE_NTP_TICKADJ is not set
-# BR2_PACKAGE_NUTTCP 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_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_SPAWN_FCGI is not set
-# BR2_PACKAGE_SQUID is not set
-# BR2_PACKAGE_TCPDUMP is not set
-# BR2_PACKAGE_DHCPDUMP is not set
-# BR2_PACKAGE_TCPREPLAY is not set
-# BR2_PACKAGE_TN5250 is not set
-# BR2_PACKAGE_TTCP is not set
-# BR2_PACKAGE_UDPCAST is not set
-# BR2_PACKAGE_USSP_PUSH is not set
-# BR2_PACKAGE_UUCP is not set
-# BR2_PACKAGE_VPNC is not set
-# BR2_PACKAGE_VSFTPD is not set
-# BR2_PACKAGE_VTUN is not set
-# BR2_PACKAGE_WEBIF is not set
-# BR2_PACKAGE_WIRELESS_TOOLS is not set
-# BR2_PACKAGE_WPA_SUPPLICANT is not set
-
-#
-# Package managers
-#
-# BR2_PACKAGE_IPKG is not set
-
-#
-# Shell and utilities
-#
-# 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
-
-#
-# System tools
-#
-
-#
-# Text editors and viewers
-#
-# BR2_PACKAGE_ED is not set
BR2_PACKAGE_NANO=y
-# BR2_PACKAGE_UEMACS is not set
-
-#
-# Target filesystem options
-#
-BR2_ROOTFS_POST_BUILD_SCRIPT=""
BR2_ROOTFS_DEVICE_TABLE="target/device/armadeus/rootfs/device_table.txt"
-BR2_ROOTFS_SKELETON_DEFAULT=y
-# BR2_ROOTFS_SKELETON_CUSTOM is not set
-# BR2_TARGET_ROOTFS_CRAMFS is not set
-# BR2_TARGET_ROOTFS_CLOOP is not set
# BR2_TARGET_ROOTFS_EXT2 is not set
BR2_TARGET_ROOTFS_JFFS2=y
-# BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set
-# BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
-# BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_512_16K is not set
-# BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K is not set
-BR2_TARGET_ROOTFS_JFFS2_FLASH_128=y
-# BR2_TARGET_ROOTFS_JFFS2_FLASH_64 is not set
-# BR2_TARGET_ROOTFS_JFFS2_CUSTOM is not set
-BR2_TARGET_ROOTFS_JFFS2_PAGESIZE=0x1000
-BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x20000
-# BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER is not set
-# BR2_JFFS2_TARGET_SREC is not set
BR2_TARGET_ROOTFS_JFFS2_PAD=y
-BR2_TARGET_ROOTFS_JFFS2_PADSIZE=0x0
-BR2_TARGET_ROOTFS_JFFS2_LE=y
-# BR2_TARGET_ROOTFS_JFFS2_BE is not set
-# BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-# BR2_TARGET_ROOTFS_UBIFS is not set
-# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
-BR2_TARGET_ROOTFS_TAR_NONE=y
-# BR2_TARGET_ROOTFS_TAR_GZIP is not set
-# BR2_TARGET_ROOTFS_TAR_BZIP2 is not set
-# BR2_TARGET_ROOTFS_TAR_LZMA is not set
-BR2_TARGET_ROOTFS_TAR_OPTIONS=""
-# BR2_TARGET_ROOTFS_CPIO is not set
-# BR2_TARGET_ROOTFS_INITRAMFS is not set
-# BR2_TARGET_ROOTFS_ROMFS is not set
-
-#
-# Bootloaders
-#
-# BR2_TARGET_BAREBOX is not set
BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_TARGET_UBOOT_VERSION).h"
-BR2_TARGET_UBOOT_1_3_4=y
-# BR2_TARGET_UBOOT_2010_06 is not set
-# BR2_TARGET_UBOOT_2010_03 is not set
-# BR2_TARGET_UBOOT_2009_11 is not set
-# BR2_TARGET_UBOOT_2009_08 is not set
-# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
-BR2_TARGET_UBOOT_VERSION="1.3.4"
+BR2_TARGET_UBOOT_2011_06=y
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/$(BR2_TARGET_UBOOT_VERSION)/"
-BR2_TARGET_UBOOT_FORMAT_BIN=y
-# BR2_TARGET_UBOOT_FORMAT_KWB is not set
-# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
BR2_TARGET_UBOOT_TOOL_ENV=y
-BR2_TARGET_UBOOT_COPYTO=""
# BR2_TARGET_UBOOT_NETWORK is not set
-# BR2_TARGET_AT91BOOTSTRAP is not set
-# BR2_TARGET_DATAFLASHBOOT is not set
-
-#
-# Kernel
-#
BR2_LINUX_KERNEL=y
-# BR2_LINUX_KERNEL_2_6_36 is not set
-# BR2_LINUX_KERNEL_SAME_AS_HEADERS is not set
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-# BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
-BR2_LINUX_KERNEL_VERSION="2.6.29.6"
BR2_LINUX_KERNEL_PATCH="$(LINUX26_PATCH_DIR)"
-# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-# BR2_LINUX_KERNEL_ZIMAGE is not set
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index bbbc85e..0988cf9 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -1,970 +1,120 @@
-#
-# Automatically generated make config: don't edit
-# Buildroot version: 2010.11
-# Tue Jul 5 11:12:47 2011
-#
-BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
-# BR2_armeb is not set
-# BR2_avr32 is not set
-# BR2_i386 is not set
-# BR2_mips is not set
-# BR2_mipsel is not set
-# BR2_powerpc is not set
-# BR2_sh is not set
-# BR2_sh64 is not set
-# BR2_sparc is not set
-# BR2_x86_64 is not set
-# BR2_xtensa is not set
-# BR2_generic_arm is not set
-# BR2_arm7tdmi is not set
-# BR2_arm610 is not set
-# BR2_arm710 is not set
-# BR2_arm720t is not set
BR2_arm920t=y
-# BR2_arm922t is not set
-# BR2_arm926t is not set
-# BR2_arm10t is not set
-# BR2_arm1136jf_s is not set
-# BR2_arm1176jz_s is not set
-# BR2_arm1176jzf_s is not set
-
-#
-# cortex-A8/A9 needs gcc >= 4.4.x
-#
-# BR2_cortex_a8 is not set
-# BR2_cortex_a9 is not set
-# BR2_sa110 is not set
-# BR2_sa1100 is not set
-# BR2_xscale is not set
-# BR2_iwmmxt is not set
-BR2_ARM_TYPE="ARM920T"
-BR2_ARM_EABI=y
-# BR2_ARM_OABI is not set
-BR2_ARCH="arm"
-BR2_ENDIAN="LITTLE"
-BR2_GCC_TARGET_TUNE="arm920t"
-BR2_GCC_TARGET_ARCH="armv4t"
-BR2_GCC_TARGET_ABI="aapcs-linux"
-
-#
-# Target options
-#
-
-#
-# Preset Devices
-#
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf9328"
-BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imxl"
-BR2_TARGET_ARMADEUS_NR_SDRAM="1"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="16"
-# BR2_TARGET_ARMLTD is not set
-# BR2_TARGET_ATMEL is not set
-# BR2_TARGET_KWIKBYTE is not set
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
BR2_TARGET_GENERIC_GETTY=y
-# BR2_TARGET_GENERIC_GETTY_NONE is not set
-# BR2_TARGET_GENERIC_GETTY_TTYS0 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYS1 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYS2 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYS3 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYAMA0 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYAMA1 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYAMA2 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYAMA3 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYSAC0 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYSAC1 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYSAC2 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYSAC3 is not set
BR2_TARGET_GENERIC_GETTY_TTYSMX0=y
-# BR2_TARGET_GENERIC_GETTY_TTYMXC0 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYMXC1 is not set
-# BR2_TARGET_GENERIC_GETTY_TTYMXC2 is not set
-BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
-# BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP is not set
-# BR2_TARGET_GENERIC_GETTY_BAUDRATE_9600 is not set
-# BR2_TARGET_GENERIC_GETTY_BAUDRATE_19200 is not set
-# BR2_TARGET_GENERIC_GETTY_BAUDRATE_38400 is not set
-# BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600 is not set
-BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
-BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
-
-#
-# Build options
-#
-
-#
-# Commands
-#
-BR2_COPY="cp -R "
BR2_WGET="wget --passive-ftp --tries=3"
-BR2_SVN="svn"
-BR2_BZR="bzr"
BR2_GIT="git clone"
-BR2_ZCAT="gzip -d -c"
-BR2_BZCAT="bzcat"
-BR2_TAR_OPTIONS=""
BR2_DL_DIR="$(BASE_DIR)/../downloads"
BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
-
-#
-# Mirrors and Download locations
-#
-BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
BR2_SOURCEFORGE_MIRROR="switch"
-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_JLEVEL=1
-# BR2_DEPRECATED is not set
-# BR2_ENABLE_DEBUG is not set
-# BR2_STRIP_strip is not set
BR2_STRIP_sstrip=y
-# BR2_STRIP_none is not set
-# BR2_OPTIMIZE_0 is not set
-# BR2_OPTIMIZE_1 is not set
-# BR2_OPTIMIZE_2 is not set
-# BR2_OPTIMIZE_3 is not set
-BR2_OPTIMIZE_S=y
-# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_DOCUMENTATION is not set
-# BR2_HAVE_DEVFILES is not set
-
-#
-# Toolchain
-#
-BR2_TOOLCHAIN_BUILDROOT=y
-# BR2_TOOLCHAIN_EXTERNAL is not set
-# BR2_TOOLCHAIN_CTNG is not set
-
-#
-# Kernel Header Options
-#
-# BR2_KERNEL_HEADERS_2_6_34 is not set
-# BR2_KERNEL_HEADERS_2_6_35 is not set
-# BR2_KERNEL_HEADERS_2_6_36 is not set
BR2_KERNEL_HEADERS_VERSION=y
-# BR2_KERNEL_HEADERS_SNAP is not set
BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
-BR2_DEFAULT_KERNEL_HEADERS="2.6.29.6"
-
-#
-# uClibc Options
-#
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.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
-
-#
-# Binutils Options
-#
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=""
-
-#
-# GCC Options
-#
-# BR2_GCC_VERSION_4_2_4 is not set
-# BR2_GCC_VERSION_4_3_X is not set
BR2_GCC_VERSION_4_4_X=y
-# BR2_GCC_VERSION_4_5_X is not set
-# BR2_GCC_VERSION_SNAP is not set
-BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
-BR2_GCC_VERSION="4.4.5"
-BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-# BR2_GCC_CROSS_OBJC is not set
-# BR2_GCC_CROSS_FORTRAN is not set
-# BR2_INSTALL_OBJC is not set
-# BR2_INSTALL_FORTRAN is not set
-BR2_GCC_SHARED_LIBGCC=y
-
-#
-# Ccache Options
-#
BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"
-
-#
-# Gdb Options
-#
BR2_PACKAGE_GDB=y
BR2_PACKAGE_GDB_SERVER=y
BR2_PACKAGE_GDB_HOST=y
BR2_GDB_VERSION_6_7_1=y
-# 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"
-
-#
-# Common Toolchain Options
-#
BR2_LARGEFILE=y
BR2_INET_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_ENABLE_LOCALE_WHITELIST="C en_US"
-BR2_NEEDS_GETTEXT=y
-BR2_NEEDS_GETTEXT_IF_LOCALE=y
-BR2_USE_WCHAR=y
-BR2_PREFER_SOFT_FLOAT=y
-BR2_SOFT_FLOAT=y
-# BR2_USE_SSP is not set
-# BR2_PTHREADS_NONE is not set
-# BR2_PTHREADS is not set
-BR2_PTHREADS_OLD=y
BR2_PROGRAM_INVOCATION=y
-BR2_GCC_CROSS_CXX=y
BR2_INSTALL_LIBSTDCPP=y
BR2_TARGET_OPTIMIZATION="-Os -pipe"
-# BR2_ELF2FLT is not set
-# BR2_MKLIBS is not set
BR2_PACKAGE_SSTRIP_TARGET=y
-BR2_PACKAGE_SSTRIP_HOST=y
-BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
-
-#
-# Package Selection for the target
-#
-BR2_PACKAGE_BUSYBOX=y
-# BR2_BUSYBOX_VERSION_1_15_X is not set
BR2_BUSYBOX_VERSION_1_16_X=y
-# BR2_BUSYBOX_VERSION_1_17_X is not set
-# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.16.2"
-BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION).config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
-# BR2_PACKAGE_CUSTOMIZE is not set
-
-#
-# Armadeus specific tools/utilities
-#
-# BR2_PACKAGE_ANYBUSD is not set
BR2_PACKAGE_AS_DEVICES=y
BR2_PACKAGE_AS_DEVICES_TESTS=y
BR2_PACKAGE_AS_DEVICES_CPP=y
BR2_PACKAGE_AS_DEVICES_TESTS_CPP=y
BR2_PACKAGE_ARMADEUS_DEMOS=y
-
-#
-# Choose the demos to install
-#
BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
-# BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE is not set
BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020=y
BR2_PACKAGE_FPGAREGS=y
-# BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE is not set
BR2_PACKAGE_IMXREGS=y
-# BR2_PACKAGE_IMXSSI is not set
BR2_PACKAGE_MAX5821CTRL=y
-# BR2_PACKAGE_STRATON is not set
BR2_PACKAGE_ARMADEUS_TESTSUITE=y
-
-#
-# APF27 specific:
-#
-# BR2_PACKAGE_AD9889CTRL is not set
-# BR2_PACKAGE_ARMADEUS_PPS_UTILITIES is not set
-
-#
-# APF51 specific:
-#
-# BR2_PACKAGE_TFP410CTRL is not set
-
-#
-# APF9328 specific:
-#
BR2_PACKAGE_CH7024CTRL=y
-
-#
-# Audio and video libraries and applications
-#
BR2_PACKAGE_ALSA_LIB=y
-
-#
-# ALSA lib selection
-#
-BR2_PACKAGE_ALSA_LIB_DEVDIR="/dev/snd"
-BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS="all"
-BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS="all"
-BR2_PACKAGE_ALSA_LIB_ALOAD=y
-BR2_PACKAGE_ALSA_LIB_MIXER=y
-BR2_PACKAGE_ALSA_LIB_PCM=y
-BR2_PACKAGE_ALSA_LIB_RAWMIDI=y
-BR2_PACKAGE_ALSA_LIB_HWDEP=y
-BR2_PACKAGE_ALSA_LIB_SEQ=y
-BR2_PACKAGE_ALSA_LIB_ALISP=y
-BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS=y
BR2_PACKAGE_ALSA_UTILS=y
-
-#
-# ALSA utils selection
-#
-# BR2_PACKAGE_ALSA_UTILS_ALSACONF is not set
-BR2_PACKAGE_ALSA_UTILS_ALSACTL=y
-BR2_PACKAGE_ALSA_UTILS_ALSAMIXER=y
-# BR2_PACKAGE_ALSA_UTILS_AMIDI is not set
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
-# BR2_PACKAGE_ALSA_UTILS_ARECORD 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_FFMPEG 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=y
-BR2_PACKAGE_LIBMAD=y
-# BR2_PACKAGE_LIBMMS is not set
-# BR2_PACKAGE_LIBMPD is not set
-# BR2_PACKAGE_LIBMPEG2 is not set
-# BR2_PACKAGE_LIBOGG is not set
-# BR2_PACKAGE_LIBSNDFILE is not set
-# BR2_PACKAGE_LIBTHEORA is not set
-# BR2_PACKAGE_LIBVORBIS is not set
BR2_PACKAGE_MADPLAY=y
-BR2_PACKAGE_MADPLAY_ALSA=y
-# BR2_PACKAGE_MPG123 is not set
BR2_PACKAGE_MPLAYER=y
-# BR2_PACKAGE_PYWEBRADIO 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_BZIP2 is not set
-# BR2_PACKAGE_GZIP is not set
-# BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_XZ 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=y
-# BR2_PACKAGE_MEMSTAT is not set
-# BR2_PACKAGE_NETPERF is not set
-# BR2_PACKAGE_OPROFILE is not set
BR2_PACKAGE_STRACE=y
-
-#
-# Development tools
-#
-# BR2_PACKAGE_AUTOCONF is not set
-# BR2_PACKAGE_AUTOMAKE is not set
-# BR2_PACKAGE_BISON is not set
-# BR2_PACKAGE_BSDIFF is not set
-# BR2_PACKAGE_COREUTILS is not set
-# BR2_PACKAGE_CVS is not set
-# BR2_PACKAGE_DIFFUTILS is not set
-# BR2_PACKAGE_DISTCC is not set
-# BR2_PACKAGE_FAKEROOT is not set
-# BR2_PACKAGE_FINDUTILS is not set
-# BR2_PACKAGE_FLEX is not set
-# BR2_PACKAGE_GAWK is not set
-
-#
-# native toolchain needs development files in target filesystem
-#
-# BR2_PACKAGE_GETTEXT is not set
BR2_PACKAGE_LIBINTL=y
-# BR2_PACKAGE_LIBGMP is not set
-# BR2_PACKAGE_GPERF is not set
-# BR2_PACKAGE_GREP is not set
-# BR2_PACKAGE_MAKE is not set
-# BR2_PACKAGE_LIBMPC is not set
-# BR2_PACKAGE_LIBMPFR is not set
-# BR2_PACKAGE_LIBTOOL is not set
-# BR2_PACKAGE_M4 is not set
-# BR2_PACKAGE_PATCH is not set
-# BR2_PACKAGE_PKG_CONFIG is not set
-# BR2_PACKAGE_SED is not set
-# BR2_PACKAGE_TAR is not set
-
-#
-# Games
-#
-# BR2_PACKAGE_E_UAE is not set
-# BR2_PACKAGE_GNUCHESS is not set
-# BR2_PACKAGE_LBREAKOUT2 is not set
-# BR2_PACKAGE_LTRIS is not set
-# BR2_PACKAGE_OPENTYRIAN is not set
-# BR2_PACKAGE_PRBOOM is not set
-# BR2_PACKAGE_SDLQUAKE is not set
-# BR2_PACKAGE_SNES9X is not set
-# BR2_PACKAGE_WOLF4SDL is not set
-
-#
-# Graphic libraries and applications (graphic/text)
-#
-
-#
-# Graphic applications
-#
-# BR2_PACKAGE_RRDTOOL is not set
-
-#
-# graphic libraries
-#
-# BR2_PACKAGE_ALLEGRO is not set
-# BR2_PACKAGE_DIRECTFB is not set
-# BR2_PACKAGE_FBDUMP is not set
BR2_PACKAGE_FBGRAB=y
-# BR2_PACKAGE_FBSET is not set
BR2_PACKAGE_FBTEST=y
BR2_PACKAGE_FBV=y
-# BR2_PACKAGE_IMAGEMAGICK is not set
-# BR2_PACKAGE_LINUX_FUSION is not set
-BR2_PACKAGE_SDL=y
-BR2_PACKAGE_SDL_FBCON=y
-BR2_PACKAGE_SDL_IMAGE=y
-
-#
-# SDL_image file format support
-#
-BR2_PACKAGE_SDL_IMAGE_BMP=y
BR2_PACKAGE_SDL_IMAGE_GIF=y
BR2_PACKAGE_SDL_IMAGE_JPEG=y
-# BR2_PACKAGE_SDL_IMAGE_LBM is not set
-# BR2_PACKAGE_SDL_IMAGE_PCX is not set
BR2_PACKAGE_SDL_IMAGE_PNG=y
-# BR2_PACKAGE_SDL_IMAGE_PNM is not set
-# BR2_PACKAGE_SDL_IMAGE_TARGA is not set
-# BR2_PACKAGE_SDL_IMAGE_TIFF is not set
-# BR2_PACKAGE_SDL_IMAGE_XCF is not set
-# BR2_PACKAGE_SDL_IMAGE_XPM is not set
-# BR2_PACKAGE_SDL_IMAGE_XV is not set
-BR2_PACKAGE_SDL_MIXER=y
-# BR2_PACKAGE_SDL_SOUND is not set
BR2_PACKAGE_SDL_NET=y
-BR2_PACKAGE_SDL_TTF=y
-# BR2_PACKAGE_SDL_GFX is not set
BR2_PACKAGE_SLIDESHOW=y
-
-#
-# Demos
-#
BR2_PACKAGE_SDL_WATER=y
-
-#
-# other GUIs
-#
-# BR2_PACKAGE_QT is not set
-
-#
-# Qwt requires Qt to be installed
-#
-# BR2_PACKAGE_XORG7 is not set
-
-#
-# X libraries and helper libraries
-#
-# BR2_PACKAGE_LIBERATION is not set
-
-#
-# X Window managers
-#
-
-#
-# X applications
-#
-# BR2_PACKAGE_GOB2 is not set
-
-#
-# midori requires C++, WCHAR in toolchain and libgtk2
-#
-
-#
-# Hardware handling
-#
-# BR2_PACKAGE_CDRKIT is not set
-# BR2_PACKAGE_CRAMFS is not set
-# BR2_PACKAGE_CWIID is not set
-
-#
-# dbus not available (need expat or libxml2)
-#
-# BR2_PACKAGE_DEVMEM2 is not set
-# BR2_PACKAGE_DMRAID is not set
-# BR2_PACKAGE_DOSFSTOOLS is not set
-# 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_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_HDPARM is not set
-# BR2_PACKAGE_HWDATA is not set
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_INPUT_TOOLS=y
-BR2_PACKAGE_INPUT_TOOLS_EVTEST=y
-BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH=y
-BR2_PACKAGE_INPUT_TOOLS_JSCAL=y
-BR2_PACKAGE_INPUT_TOOLS_JSTEST=y
-# BR2_PACKAGE_IOSTAT is not set
-# BR2_PACKAGE_KBD is not set
-# BR2_PACKAGE_LCD4LINUX 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
-
-#
-# MTD tools selection
-#
-# BR2_PACKAGE_MTD_DOCFDISK is not set
-# BR2_PACKAGE_MTD_DOC_LOADBIOS is not set
-BR2_PACKAGE_MTD_FLASHCP=y
-BR2_PACKAGE_MTD_FLASH_ERASE=y
-BR2_PACKAGE_MTD_FLASH_ERASEALL=y
-BR2_PACKAGE_MTD_FLASH_INFO=y
-BR2_PACKAGE_MTD_FLASH_LOCK=y
-# BR2_PACKAGE_MTD_FLASH_OTP_DUMP is not set
-# BR2_PACKAGE_MTD_FLASH_OTP_INFO is not set
-BR2_PACKAGE_MTD_FLASH_UNLOCK=y
-# BR2_PACKAGE_MTD_FTL_CHECK is not set
-# BR2_PACKAGE_MTD_FTL_FORMAT is not set
BR2_PACKAGE_MTD_JFFS2DUMP=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
-BR2_PACKAGE_MTD_MTD_DEBUG=y
-BR2_PACKAGE_MTD_NANDDUMP=y
-BR2_PACKAGE_MTD_NANDTEST=y
-BR2_PACKAGE_MTD_NANDWRITE=y
-# BR2_PACKAGE_MTD_NFTLDUMP is not set
-# BR2_PACKAGE_MTD_NFTL_FORMAT is not set
-# BR2_PACKAGE_MTD_RECV_IMAGE is not set
-# BR2_PACKAGE_MTD_RFDDUMP is not set
-# 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
-BR2_PACKAGE_MTD_UBIFORMAT=y
-BR2_PACKAGE_MTD_UBIMKVOL=y
-BR2_PACKAGE_MTD_UBINFO=y
-BR2_PACKAGE_MTD_UBINIZE=y
-BR2_PACKAGE_MTD_UBIRENAME=y
-BR2_PACKAGE_MTD_UBIRMVOL=y
-BR2_PACKAGE_MTD_UBIRSVOL=y
-BR2_PACKAGE_MTD_UBIUPDATEVOL=y
-# BR2_PACKAGE_NTFS_3G is not set
-# BR2_PACKAGE_NTFSPROGS is not set
-# BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_RNG_TOOLS is not set
-# BR2_PACKAGE_SETSERIAL is not set
-# BR2_PACKAGE_SMARTMONTOOLS is not set
-# BR2_PACKAGE_SQUASHFS is not set
-# BR2_PACKAGE_SYSSTAT is not set
-# BR2_PACKAGE_UDEV is not set
-# BR2_PACKAGE_URG is not set
-# BR2_PACKAGE_USB_MODESWITCH is not set
-# BR2_PACKAGE_USBMOUNT is not set
-# BR2_PACKAGE_USBUTILS is not set
-# BR2_PACKAGE_WIPE is not set
-# BR2_PACKAGE_XENOMAI is not set
-# BR2_PACKAGE_XFSPROGS is not set
-
-#
-# Interpreter languages and scripting
-#
-# 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
-
-#
-# Libraries
-#
-
-#
-# Compression and decompression
-#
-# BR2_PACKAGE_LIBARCHIVE is not set
-BR2_PACKAGE_LZO=y
-BR2_PACKAGE_ZLIB=y
-
-#
-# 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
-
-#
-# Database
-#
-# BR2_PACKAGE_BERKELEYDB is not set
-# BR2_PACKAGE_MYSQL_CLIENT is not set
-# BR2_PACKAGE_SQLITE is not set
-
-#
-# Filesystem
-#
-# 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
-
-#
-# Graphics
-#
-# BR2_PACKAGE_ATK is not set
-# BR2_PACKAGE_CAIRO is not set
-# BR2_PACKAGE_FONTCONFIG is not set
-BR2_PACKAGE_FREETYPE=y
-BR2_PACKAGE_JPEG=y
-# BR2_PACKAGE_LIBART is not set
-# BR2_PACKAGE_GDK_PIXBUF is not set
-BR2_PACKAGE_LIBPNG=y
-# BR2_PACKAGE_LIBSVGTINY is not set
-BR2_PACKAGE_LIBUNGIF=y
-# BR2_PACKAGE_MESALIB is not set
-# BR2_PACKAGE_PANGO is not set
-# BR2_PACKAGE_PIXMAN is not set
-# BR2_PACKAGE_TIFF is not set
-
-#
-# webkit requires C++, WCHAR in toolchain and libgtk2
-#
-
-#
-# Hardware handling
-#
-# BR2_PACKAGE_LIBAIO is not set
-# BR2_PACKAGE_LIBRAW1394 is not set
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_LIBUSB=y
-# BR2_PACKAGE_LIBUSB_COMPAT is not set
-
-#
-# Java
-#
-# BR2_PACKAGE_CLASSPATH is not set
-
-#
-# Networking
-#
-# 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=y
-# 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
-#
-# BR2_PACKAGE_ARGP_STANDALONE 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=y
-# BR2_PACKAGE_LIBEVENT is not set
-# BR2_PACKAGE_LIBGLIB2 is not set
-# BR2_PACKAGE_LIBOIL is not set
-
-#
-# Text and terminal handling
-#
-# BR2_PACKAGE_ENCHANT is not set
-# BR2_PACKAGE_ICU 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=y
-# BR2_PACKAGE_SLANG is not set
-
-#
-# XML
-#
-# 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
-
-#
-# Miscellaneous
-#
-# BR2_PACKAGE_SHARED_MIME_INFO is not set
-
-#
-# Networking applications
-#
-# BR2_PACKAGE_ARGUS is not set
-# BR2_PACKAGE_AVAHI is not set
-# BR2_PACKAGE_AXEL is not set
BR2_PACKAGE_BOA=y
-# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BLUEZ3_LIBS is not set
-
-#
-# bluez-utils not available (need dbus)
-#
-# BR2_PACKAGE_BMON is not set
-# BR2_PACKAGE_BRIDGE is not set
BR2_PACKAGE_CAN_UTILS=y
-# BR2_PACKAGE_CTORRENT is not set
-# BR2_PACKAGE_CUPS is not set
-# BR2_PACKAGE_DHCP is not set
-# BR2_PACKAGE_DNSMASQ is not set
BR2_PACKAGE_DROPBEAR=y
-# BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS is not set
BR2_PACKAGE_ETHTOOL=y
-# BR2_PACKAGE_HOSTAPD is not set
-# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPROUTE2=y
-# 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_LIGHTTPD is not set
BR2_PACKAGE_LINKS=y
-# 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_NETCAT is not set
-# BR2_PACKAGE_NETKITBASE is not set
-# BR2_PACKAGE_NETKITTELNET 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_NGIRCD is not set
BR2_PACKAGE_NTP=y
-# BR2_PACKAGE_NTP_SNTP is not set
-# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
# BR2_PACKAGE_NTP_NTPD is not set
BR2_PACKAGE_NTP_NTPDATE=y
-# BR2_PACKAGE_NTP_NTPDC is not set
-# BR2_PACKAGE_NTP_NTPQ is not set
-# BR2_PACKAGE_NTP_TICKADJ is not set
-# BR2_PACKAGE_NUTTCP 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_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_SPAWN_FCGI is not set
-# BR2_PACKAGE_SQUID is not set
BR2_PACKAGE_TCPDUMP=y
-# BR2_PACKAGE_TCPDUMP_SMB is not set
-# BR2_PACKAGE_DHCPDUMP is not set
-# BR2_PACKAGE_TCPREPLAY is not set
-# BR2_PACKAGE_TFTPD is not set
-# BR2_PACKAGE_THTTPD is not set
-# BR2_PACKAGE_TINYHTTPD is not set
-# BR2_PACKAGE_TN5250 is not set
-# BR2_PACKAGE_TTCP is not set
-# BR2_PACKAGE_UDPCAST is not set
-# BR2_PACKAGE_USSP_PUSH is not set
-# BR2_PACKAGE_UUCP is not set
-# BR2_PACKAGE_VPNC is not set
-# BR2_PACKAGE_VSFTPD is not set
-# BR2_PACKAGE_VTUN is not set
-# BR2_PACKAGE_WEBIF is not set
-# BR2_PACKAGE_WGET is not set
-# BR2_PACKAGE_WIRELESS_TOOLS is not set
-# BR2_PACKAGE_WPA_SUPPLICANT is not set
-
-#
-# Package managers
-#
-# BR2_PACKAGE_IPKG is not set
-
-#
-# rpm requires libneon with SSL, XML and ZLIB support
-#
-
-#
-# Shell and utilities
-#
-# BR2_PACKAGE_AT is not set
-# BR2_PACKAGE_BASH is not set
-# BR2_PACKAGE_DASH 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
-
-#
-# System tools
-#
-# BR2_PACKAGE_BOOTUTILS is not set
-# BR2_PACKAGE_MODULE_INIT_TOOLS is not set
-# BR2_PACKAGE_PROCPS is not set
-# BR2_PACKAGE_PSMISC is not set
-# BR2_PACKAGE_SYSKLOGD is not set
-# BR2_PACKAGE_SYSVINIT is not set
-# BR2_PACKAGE_UTIL-LINUX is not set
-
-#
-# Text editors and viewers
-#
-# BR2_PACKAGE_ED is not set
-# BR2_PACKAGE_LESS is not set
BR2_PACKAGE_NANO=y
-# BR2_PACKAGE_UEMACS is not set
-# BR2_PACKAGE_VIM is not set
-
-#
-# Target filesystem options
-#
-BR2_ROOTFS_POST_BUILD_SCRIPT=""
BR2_ROOTFS_DEVICE_TABLE="target/device/armadeus/rootfs/device_table.txt"
-BR2_ROOTFS_SKELETON_DEFAULT=y
-# BR2_ROOTFS_SKELETON_CUSTOM is not set
-# BR2_TARGET_ROOTFS_CRAMFS is not set
-# BR2_TARGET_ROOTFS_CLOOP is not set
# BR2_TARGET_ROOTFS_EXT2 is not set
BR2_TARGET_ROOTFS_JFFS2=y
-# BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set
-# BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
-# BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_512_16K is not set
-# BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K is not set
-BR2_TARGET_ROOTFS_JFFS2_FLASH_128=y
-# BR2_TARGET_ROOTFS_JFFS2_FLASH_64 is not set
-# BR2_TARGET_ROOTFS_JFFS2_CUSTOM is not set
-BR2_TARGET_ROOTFS_JFFS2_PAGESIZE=0x1000
-BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x20000
-# BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER is not set
-# BR2_JFFS2_TARGET_SREC is not set
BR2_TARGET_ROOTFS_JFFS2_PAD=y
-BR2_TARGET_ROOTFS_JFFS2_PADSIZE=0x0
-BR2_TARGET_ROOTFS_JFFS2_LE=y
-# BR2_TARGET_ROOTFS_JFFS2_BE is not set
-# BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
-# BR2_TARGET_ROOTFS_UBIFS is not set
-# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
-BR2_TARGET_ROOTFS_TAR_NONE=y
-# BR2_TARGET_ROOTFS_TAR_GZIP is not set
-# BR2_TARGET_ROOTFS_TAR_BZIP2 is not set
-# BR2_TARGET_ROOTFS_TAR_LZMA is not set
-BR2_TARGET_ROOTFS_TAR_OPTIONS=""
-# BR2_TARGET_ROOTFS_CPIO is not set
-# BR2_TARGET_ROOTFS_INITRAMFS is not set
-# BR2_TARGET_ROOTFS_ROMFS is not set
-
-#
-# Bootloaders
-#
-# BR2_TARGET_BAREBOX is not set
BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_TARGET_UBOOT_VERSION).h"
-BR2_TARGET_UBOOT_1_3_4=y
-# BR2_TARGET_UBOOT_2010_06 is not set
-# BR2_TARGET_UBOOT_2010_03 is not set
-# BR2_TARGET_UBOOT_2009_11 is not set
-# BR2_TARGET_UBOOT_2009_08 is not set
-# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
-BR2_TARGET_UBOOT_VERSION="1.3.4"
+BR2_TARGET_UBOOT_2011_06=y
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/$(BR2_TARGET_UBOOT_VERSION)/"
-BR2_TARGET_UBOOT_FORMAT_BIN=y
-# BR2_TARGET_UBOOT_FORMAT_KWB is not set
-# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
BR2_TARGET_UBOOT_TOOL_ENV=y
-BR2_TARGET_UBOOT_COPYTO=""
# BR2_TARGET_UBOOT_NETWORK is not set
-# BR2_TARGET_AT91BOOTSTRAP is not set
-# BR2_TARGET_DATAFLASHBOOT is not set
-
-#
-# Kernel
-#
BR2_LINUX_KERNEL=y
-# BR2_LINUX_KERNEL_2_6_36 is not set
-# BR2_LINUX_KERNEL_SAME_AS_HEADERS is not set
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-# BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
-BR2_LINUX_KERNEL_VERSION="2.6.29.6"
BR2_LINUX_KERNEL_PATCH="$(LINUX26_PATCH_DIR)"
-# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)test-linux-$(BR2_LINUX_KERNEL_VERSION).config"
-BR2_LINUX_KERNEL_UIMAGE=y
-# BR2_LINUX_KERNEL_ZIMAGE is not set
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
similarity index 68%
copy from buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2010.03.h
copy to buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
index af8cb69..c004b29 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
@@ -1,7 +1,7 @@
/*
- * Eric Jarrige <jo...@us...>
+ * (C) Copyright 2005-2011 ej Armadeus Project <eri...@ar...>
*
- * Configuration settings for the Armadeus Project motherboard 9328 board.
+ * Configuration settings for the Armadeus Project motherboard 9328.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -34,13 +34,13 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "3.7"
+#define CONFIG_ENV_VERSION "4.0"
#define CONFIG_IDENT_STRING " apf9328 patch 4.0"
#define CONFIG_ARM920T 1 /* this is an ARM920T CPU */
#define CONFIG_IMX 1 /* in a Motorola MC9328MXL Chip */
#define CONFIG_apf9328 1 /* on a Armadeus project board */
-#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
+#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
/*
* Enable the call to misc_init_r() for miscellaneous platform
@@ -66,7 +66,7 @@
*/
#define CONFIG_IMX_SERIAL
#define CONFIG_IMX_SERIAL1
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
+#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
#define CONFIG_BAUDRATE 115200
/*
@@ -80,19 +80,16 @@
#define CONFIG_CMD_ASKENV /* ask for env variable */
#define CONFIG_CMD_BSP /* Board Specific functions */
#define CONFIG_CMD_CACHE /* icache, dcache */
-#define CONFIG_CMD_CDP /* Cisco Discovery Protocol */
-#define CONFIG_CMD_DATE /* support for RTC, date/time...*/
+#define CONFIG_CMD_DATE /* support for RTC, date/time.. */
#define CONFIG_CMD_DHCP /* DHCP Support */
#define CONFIG_CMD_DIAG /* Diagnostics */
#define CONFIG_CMD_EEPROM /* EEPROM read/write support */
-//#define CONFIG_CMD_FAT /* FAT support */
#define CONFIG_CMD_FLASH /* flinfo, erase, protect */
#define CONFIG_CMD_I2C /* I2C serial bus support */
#define CONFIG_CMD_IMLS /* List all found images */
#define CONFIG_CMD_IMMAP /* IMMR dump support */
#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
-//#define CONFIG_CMD_MII /* MII support */
-#define CONFIG_CMD_MTDPARTS /* MTD partition support */
+#define CONFIG_CMD_MTDPARTS /* MTD partition support */
#define CONFIG_CMD_PING /* ping support */
#define CONFIG_CMD_SAVES /* save S record dump */
#define CONFIG_CMD_SETEXPR /* setexpr support */
@@ -110,7 +107,7 @@
/* commands using TAB */
#define CONFIG_SYS_HUSH_PARSER 1 /* enable the "hush" shell */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
-#define CONFIG_CMDLINE_EDITING 1
+#define CONFIG_CMDLINE_EDITING 1
#define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS
@@ -123,11 +120,11 @@
#define CONFIG_BOOTARGS \
CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
-#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)"n8"
-#define CONFIG_MTDMAP "physmap-flash.0"
+#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)"n8"
+#define CONFIG_MTDMAP "physmap-flash.0"
#define MTDIDS_DEFAULT "nor0=" CONFIG_MTDMAP
#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":256k(U-boot)ro," \
- "128k(U-boot_env),256k(firmware),2048k(kernel),-(rootfs)"
+ "128k(U-boot_env),256k(firmware),2048k(kernel),-(rootfs)"
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
@@ -135,7 +132,7 @@
"filesize=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
"console=" CONFIG_CONSOLE "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
- "partition=nor0,4\0" \
+ "partition= nor0,4\0" \
"uboot_addr=" MK_STR(CONFIG_SYS_MONITOR_BASE) "\0" \
"uboot_len=" MK_STR(CONFIG_SYS_MONITOR_LEN) "\0" \
"env_addr=" MK_STR(CONFIG_ENV_ADDR) "\0" \
@@ -145,22 +142,22 @@
"kernel_addr=" MK_STR(CONFIG_KERNEL_ADDR) "\0" \
"kernel_len=" MK_STR(CONFIG_KERNEL_LEN) "\0" \
"rootfs_addr=" MK_STR(CONFIG_ROOTFS_ADDR) "\0" \
- "rootfs_len=" MK_STR(CONFIG_ROOTFS_LEN) "\0" \
"board_name=" MK_STR(CONFIG_BOARD_NAME) "\0" \
"serverpath=" MK_STR(CONFIG_SRV_PATH) "\0" \
"ntpserverip=217.147.208.1\0" \
"mmcroot=/dev/mmcblk0p1\0" \
"mmcrootfstype=ext2\0" \
"addnfsargs=setenv bootargs ${bootargs} " \
- "root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
+ "root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
"addjffsargs=setenv bootargs ${bootargs} " \
- "root=/dev/mtdblock4 rootfstype=jffs2\0" \
+ "root=/dev/mtdblock4 rootfstype=jffs2\0" \
"addubifsargs=setenv bootargs ${bootargs} " \
- "ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \
+ "ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \
"addmmcargs=setenv bootargs ${bootargs} " \
- "root=${mmcroot} rootfstype=${mmcrootfstype}\0" \
+ "root=${mmcroot} rootfstype=${mmcrootfstype}\0" \
"addipargs=setenv bootargs ${bootargs} " \
- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off \0"\
+ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
+ "${hostname}::off \0" \
"nfsboot=setenv bootargs ${console} ${mtdparts};" \
"run addnfsargs addipargs; bootm ${kernel_addr}\0" \
"jffsboot=setenv bootargs ${console} ${mtdparts};" \
@@ -169,7 +166,7 @@
"run addubifsargs addipargs; bootm ${kernel_addr}\0" \
"mmcboot=setenv bootargs ${console} ${mtdparts};" \
"run addmmcargs addipargs; bootm ${kernel_addr}\0" \
- "firmware_autoload=0\0" \
+ "firmware_autoload=0\0" \
"flash_uboot=protect off ${uboot_addr} +${uboot_len};" \
"echo Erasing FLASH;" \
"era ${uboot_addr} +${uboot_len};" \
@@ -191,7 +188,7 @@
"else echo Flashing of kernel failed;" \
"fi\0" \
"flash_rootfs=echo Erasing FLASH;" \
- "era ${rootfs_addr} +${rootfs_len};" \
+ "era nor0,4;" \
"if cp.b ${fileaddr} ${rootfs_addr} ${filesize};" \
"then echo Flashing of rootfs succeed;" \
"else echo Flashing of rootfs failed;" \
@@ -204,7 +201,7 @@
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-rootfs.arm.jffs2\0" \
+ " ${serverpath}${board_name}-rootfs.jffs2\0" \
"update_uboot=run download_uboot flash_uboot\0" \
"update_kernel=run download_kernel flash_kernel\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
@@ -235,38 +232,36 @@
*/
#define CONFIG_SYS_LONGHELP
-#define CONFIG_SYS_PROMPT "BIOS> " /* prompt string */
+#define CONFIG_SYS_PROMPT "BIOS> " /* prompt string */
#define CONFIG_SYS_CBSIZE 256 /* console I/O buffer */
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* print buffer size */
-#define CONFIG_SYS_MAXARGS 16 /* max command args */
-#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* boot args buf size */
+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
+#define CONFIG_SYS_MAXARGS 16 /* max command args */
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* bootargs buf size*/
-#define...
[truncated message content] |
|
From: jorasse <jo...@us...> - 2011-07-31 22:51:56
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0dc6749a182bdc64708335bfacb0b84055772112 (commit)
from df0c944149e7b12460d172b4b59613a5cf305c6a (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 0dc6749a182bdc64708335bfacb0b84055772112
Author: Eric Jarrige <eri...@ar...>
Date: Mon Aug 1 00:56:53 2011 +0200
[BUILDROOT] Change patches organization for U-Boot and use subdirectory for each version of U-Boot
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 2 +-
buildroot/configs/apf27_webradio_defconfig | 2 +-
buildroot/configs/apf27test_defconfig | 2 +-
buildroot/configs/apf51_defconfig | 2 +-
buildroot/configs/apf51test_defconfig | 2 +-
buildroot/configs/apf9328_defconfig | 2 +-
buildroot/configs/apf9328test_defconfig | 2 +-
buildroot/configs/pps_defconfig | 2 +-
patches/u-boot | 1 -
.../u-boot/1.3.4}/u-boot-1.3.4-100-imx.patch | 0
.../u-boot/1.3.4}/u-boot-1.3.4-110-apf9328.patch | 0
.../1.3.4}/u-boot-1.3.4-111-apf9328-DM9000.patch | 0
.../1.3.4}/u-boot-1.3.4-112-apf9328-makefile.patch | 0
.../1.3.4}/u-boot-1.3.4-120-apf9328-tools.patch | 0
.../1.3.4}/u-boot-1.3.4-130-apf9328-example.patch | 0
.../u-boot/1.3.4}/u-boot-1.3.4-140-ds1374.patch | 0
.../u-boot/1.3.4}/u-boot-1.3.4-300-imx27.patch | 0
.../u-boot/1.3.4}/u-boot-1.3.4-301-nand.patch | 0
.../u-boot/1.3.4}/u-boot-1.3.4-310-apf27.patch | 0
.../u-boot/1.3.4}/u-boot-1.3.4-320-spartan.patch | 0
...v-fix_build_problems_with_old_MTD_VERSION.patch | 0
.../u-boot-1.3.4-331-fw_env-add_NAND_support.patch | 0
...u-boot-1.3.4-340-nand_large_file_download.patch | 0
..._symbols_inlined_compilation_with_gcc_4_4.patch | 0
...linking_problems_with_gcc_4_3_and_gcc_4_4.patch | 0
...apf9328-fixes_gcc_4_4_EABI_linking_issues.patch | 0
....3.4-403-apf9328-arm920t_is_a_armv4t_arch.patch | 0
.../u-boot/2010.03}/u-boot-2010.03-100-imx.patch | 0
.../2010.03}/u-boot-2010.03-110-apf9328.patch | 0
.../u-boot-2010.03-111-apf9328-DM9000.patch | 0
.../u-boot-2010.03-112-apf9328-makefile.patch | 0
.../u-boot-2010.03-120-apf9328-tools.patch | 0
.../2010.03}/u-boot-2010.03-140-ds1374.patch | 0
...apf9328-fixes_gcc_4_4_EABI_linking_issues.patch | 0
.../u-boot/2010.03}/u-boot-2010.03-300-imx27.patch | 0
.../u-boot/2010.03}/u-boot-2010.03-301-nand.patch | 0
.../u-boot/2010.03}/u-boot-2010.03-310-apf27.patch | 0
.../u-boot-2010.03-311-imx-nand-lock-unlock.patch | 0
...-boot-2010.03-312-imx-nand-write-any-size.patch | 0
.../2010.03}/u-boot-2010.03-320-spartan.patch | 0
.../2010.03}/u-boot-2010.03-321-add_spartan6.patch | 0
...oot-2010.03-322-fpga_second_load_operator.patch | 0
.../u-boot-2010.03-330-fix-nand-debug.patch | 0
.../u-boot-2010.03-340-fix-fecmxc-debug.patch | 0
.../u-boot-2010.03-350-fix-jffs2-warns.patch | 0
.../u-boot/2010.03}/u-boot-2010.03-400-imx51.patch | 0
.../u-boot/2010.03}/u-boot-2010.03-401-apf51.patch | 0
.../2010.03}/u-boot-2010.03-403-apf51-wdog.patch | 0
.../2010.03}/u-boot-2010.03-404-apf51-fec.patch | 0
.../2010.03}/u-boot-2010.03-407-imx51-nand.patch | 0
.../u-boot-2010.03-409-apf51-nand-spl.patch | 0
.../2010.03}/u-boot-2010.03-410-imx-iim.patch | 0
...boot-2010.03-411-Fix-high-voltage-nand-sd.patch | 0
...le-mxc_i2c-add_support_for_MX53_processor.patch | 0
...c_i2c-add_support_for_the_iMX35_processor.patch | 0
...3-422-denx-mxc_i2c-get_rid_of__REG_access.patch | 0
...c_i2c-address_failure_with_mx35_processor.patch | 0
...c_i2c-add_support_for_the_iMX51_processor.patch | 0
58 files changed, 8 insertions(+), 9 deletions(-)
delete mode 120000 patches/u-boot
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-100-imx.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-110-apf9328.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-111-apf9328-DM9000.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-112-apf9328-makefile.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-120-apf9328-tools.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-130-apf9328-example.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-140-ds1374.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-300-imx27.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-301-nand.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-310-apf27.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-320-spartan.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-330-fw_env-fix_build_problems_with_old_MTD_VERSION.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-331-fw_env-add_NAND_support.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-340-nand_large_file_download.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-400-fixes_weak_symbols_inlined_compilation_with_gcc_4_4.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-401-fixes_EABI_linking_problems_with_gcc_4_3_and_gcc_4_4.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-402-apf9328-fixes_gcc_4_4_EABI_linking_issues.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/1.3.4}/u-boot-1.3.4-403-apf9328-arm920t_is_a_armv4t_arch.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-100-imx.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-110-apf9328.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-111-apf9328-DM9000.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-112-apf9328-makefile.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-120-apf9328-tools.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-140-ds1374.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-150-apf9328-fixes_gcc_4_4_EABI_linking_issues.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-300-imx27.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-301-nand.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-310-apf27.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-311-imx-nand-lock-unlock.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-312-imx-nand-write-any-size.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-320-spartan.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-321-add_spartan6.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-322-fpga_second_load_operator.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-330-fix-nand-debug.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-340-fix-fecmxc-debug.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-350-fix-jffs2-warns.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-400-imx51.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-401-apf51.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-403-apf51-wdog.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-404-apf51-fec.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-407-imx51-nand.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-409-apf51-nand-spl.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-410-imx-iim.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-411-Fix-high-voltage-nand-sd.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-420-freescale-mxc_i2c-add_support_for_MX53_processor.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-421-denx-mxc_i2c-add_support_for_the_iMX35_processor.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-422-denx-mxc_i2c-get_rid_of__REG_access.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-423-denx-mxc_i2c-address_failure_with_mx35_processor.patch (100%)
rename {buildroot/target/u-boot => patches/u-boot/2010.03}/u-boot-2010.03-424-armadeus-mxc_i2c-add_support_for_the_iMX51_processor.patch (100%)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index abe9342..7e60b7b 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -871,7 +871,7 @@ BR2_TARGET_UBOOT_1_3_4=y
# BR2_TARGET_UBOOT_2009_08 is not set
# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
BR2_TARGET_UBOOT_VERSION="1.3.4"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/$(BR2_TARGET_UBOOT_VERSION)/"
BR2_TARGET_UBOOT_FORMAT_BIN=y
# BR2_TARGET_UBOOT_FORMAT_KWB is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index e1987b7..6a457cd 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -886,7 +886,7 @@ BR2_TARGET_UBOOT_1_3_4=y
# BR2_TARGET_UBOOT_2009_08 is not set
# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
BR2_TARGET_UBOOT_VERSION="1.3.4"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/$(BR2_TARGET_UBOOT_VERSION)/"
BR2_TARGET_UBOOT_FORMAT_BIN=y
# BR2_TARGET_UBOOT_FORMAT_KWB is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index e80fee7..2e419fc 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -1089,7 +1089,7 @@ BR2_TARGET_UBOOT_1_3_4=y
# BR2_TARGET_UBOOT_2009_08 is not set
# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
BR2_TARGET_UBOOT_VERSION="1.3.4"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/$(BR2_TARGET_UBOOT_VERSION)/"
BR2_TARGET_UBOOT_FORMAT_BIN=y
# BR2_TARGET_UBOOT_FORMAT_KWB is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index fa36d23..132b9de 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -895,7 +895,7 @@ BR2_TARGET_UBOOT_2010_03=y
# BR2_TARGET_UBOOT_2009_08 is not set
# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
BR2_TARGET_UBOOT_VERSION="2010.03"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/$(BR2_TARGET_UBOOT_VERSION)/"
BR2_TARGET_UBOOT_FORMAT_BIN=y
# BR2_TARGET_UBOOT_FORMAT_KWB is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 3db7497..5e4cebb 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -1095,7 +1095,7 @@ BR2_TARGET_UBOOT_2010_03=y
# BR2_TARGET_UBOOT_2009_08 is not set
# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
BR2_TARGET_UBOOT_VERSION="2010.03"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/$(BR2_TARGET_UBOOT_VERSION)/"
BR2_TARGET_UBOOT_FORMAT_BIN=y
# BR2_TARGET_UBOOT_FORMAT_KWB is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index 0e9b6ff..feb1bef 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -862,7 +862,7 @@ BR2_TARGET_UBOOT_1_3_4=y
# BR2_TARGET_UBOOT_2009_08 is not set
# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
BR2_TARGET_UBOOT_VERSION="1.3.4"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/$(BR2_TARGET_UBOOT_VERSION)/"
BR2_TARGET_UBOOT_FORMAT_BIN=y
# BR2_TARGET_UBOOT_FORMAT_KWB is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 29e8bef..bbbc85e 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -942,7 +942,7 @@ BR2_TARGET_UBOOT_1_3_4=y
# BR2_TARGET_UBOOT_2009_08 is not set
# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
BR2_TARGET_UBOOT_VERSION="1.3.4"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/$(BR2_TARGET_UBOOT_VERSION)/"
BR2_TARGET_UBOOT_FORMAT_BIN=y
# BR2_TARGET_UBOOT_FORMAT_KWB is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index f7a0361..6749727 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -918,7 +918,7 @@ BR2_TARGET_UBOOT_1_3_4=y
# BR2_TARGET_UBOOT_2009_08 is not set
# BR2_TARGET_UBOOT_CUSTOM_TARBALL is not set
BR2_TARGET_UBOOT_VERSION="1.3.4"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/$(BR2_TARGET_UBOOT_VERSION)/"
BR2_TARGET_UBOOT_FORMAT_BIN=y
# BR2_TARGET_UBOOT_FORMAT_KWB is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
diff --git a/patches/u-boot b/patches/u-boot
deleted file mode 120000
index e80cd2e..0000000
--- a/patches/u-boot
+++ /dev/null
@@ -1 +0,0 @@
-../buildroot/target/u-boot/
\ No newline at end of file
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-100-imx.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-100-imx.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-100-imx.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-100-imx.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-110-apf9328.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-110-apf9328.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-110-apf9328.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-110-apf9328.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-111-apf9328-DM9000.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-111-apf9328-DM9000.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-111-apf9328-DM9000.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-111-apf9328-DM9000.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-112-apf9328-makefile.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-112-apf9328-makefile.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-112-apf9328-makefile.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-112-apf9328-makefile.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-120-apf9328-tools.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-120-apf9328-tools.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-120-apf9328-tools.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-120-apf9328-tools.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-130-apf9328-example.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-130-apf9328-example.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-130-apf9328-example.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-130-apf9328-example.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-140-ds1374.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-140-ds1374.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-140-ds1374.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-140-ds1374.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-300-imx27.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-300-imx27.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-300-imx27.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-300-imx27.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-301-nand.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-301-nand.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-301-nand.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-301-nand.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-310-apf27.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-310-apf27.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-310-apf27.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-310-apf27.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-320-spartan.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-320-spartan.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-320-spartan.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-320-spartan.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-330-fw_env-fix_build_problems_with_old_MTD_VERSION.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-330-fw_env-fix_build_problems_with_old_MTD_VERSION.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-330-fw_env-fix_build_problems_with_old_MTD_VERSION.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-330-fw_env-fix_build_problems_with_old_MTD_VERSION.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-331-fw_env-add_NAND_support.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-331-fw_env-add_NAND_support.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-331-fw_env-add_NAND_support.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-331-fw_env-add_NAND_support.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-340-nand_large_file_download.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-340-nand_large_file_download.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-340-nand_large_file_download.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-340-nand_large_file_download.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-400-fixes_weak_symbols_inlined_compilation_with_gcc_4_4.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-400-fixes_weak_symbols_inlined_compilation_with_gcc_4_4.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-400-fixes_weak_symbols_inlined_compilation_with_gcc_4_4.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-400-fixes_weak_symbols_inlined_compilation_with_gcc_4_4.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-401-fixes_EABI_linking_problems_with_gcc_4_3_and_gcc_4_4.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-401-fixes_EABI_linking_problems_with_gcc_4_3_and_gcc_4_4.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-401-fixes_EABI_linking_problems_with_gcc_4_3_and_gcc_4_4.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-401-fixes_EABI_linking_problems_with_gcc_4_3_and_gcc_4_4.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-402-apf9328-fixes_gcc_4_4_EABI_linking_issues.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-402-apf9328-fixes_gcc_4_4_EABI_linking_issues.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-402-apf9328-fixes_gcc_4_4_EABI_linking_issues.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-402-apf9328-fixes_gcc_4_4_EABI_linking_issues.patch
diff --git a/buildroot/target/u-boot/u-boot-1.3.4-403-apf9328-arm920t_is_a_armv4t_arch.patch b/patches/u-boot/1.3.4/u-boot-1.3.4-403-apf9328-arm920t_is_a_armv4t_arch.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-1.3.4-403-apf9328-arm920t_is_a_armv4t_arch.patch
rename to patches/u-boot/1.3.4/u-boot-1.3.4-403-apf9328-arm920t_is_a_armv4t_arch.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-100-imx.patch b/patches/u-boot/2010.03/u-boot-2010.03-100-imx.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-100-imx.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-100-imx.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-110-apf9328.patch b/patches/u-boot/2010.03/u-boot-2010.03-110-apf9328.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-110-apf9328.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-110-apf9328.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-111-apf9328-DM9000.patch b/patches/u-boot/2010.03/u-boot-2010.03-111-apf9328-DM9000.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-111-apf9328-DM9000.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-111-apf9328-DM9000.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-112-apf9328-makefile.patch b/patches/u-boot/2010.03/u-boot-2010.03-112-apf9328-makefile.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-112-apf9328-makefile.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-112-apf9328-makefile.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-120-apf9328-tools.patch b/patches/u-boot/2010.03/u-boot-2010.03-120-apf9328-tools.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-120-apf9328-tools.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-120-apf9328-tools.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-140-ds1374.patch b/patches/u-boot/2010.03/u-boot-2010.03-140-ds1374.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-140-ds1374.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-140-ds1374.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-150-apf9328-fixes_gcc_4_4_EABI_linking_issues.patch b/patches/u-boot/2010.03/u-boot-2010.03-150-apf9328-fixes_gcc_4_4_EABI_linking_issues.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-150-apf9328-fixes_gcc_4_4_EABI_linking_issues.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-150-apf9328-fixes_gcc_4_4_EABI_linking_issues.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-300-imx27.patch b/patches/u-boot/2010.03/u-boot-2010.03-300-imx27.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-300-imx27.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-300-imx27.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-301-nand.patch b/patches/u-boot/2010.03/u-boot-2010.03-301-nand.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-301-nand.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-301-nand.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-310-apf27.patch b/patches/u-boot/2010.03/u-boot-2010.03-310-apf27.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-310-apf27.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-310-apf27.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-311-imx-nand-lock-unlock.patch b/patches/u-boot/2010.03/u-boot-2010.03-311-imx-nand-lock-unlock.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-311-imx-nand-lock-unlock.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-311-imx-nand-lock-unlock.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-312-imx-nand-write-any-size.patch b/patches/u-boot/2010.03/u-boot-2010.03-312-imx-nand-write-any-size.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-312-imx-nand-write-any-size.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-312-imx-nand-write-any-size.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-320-spartan.patch b/patches/u-boot/2010.03/u-boot-2010.03-320-spartan.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-320-spartan.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-320-spartan.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-321-add_spartan6.patch b/patches/u-boot/2010.03/u-boot-2010.03-321-add_spartan6.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-321-add_spartan6.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-321-add_spartan6.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-322-fpga_second_load_operator.patch b/patches/u-boot/2010.03/u-boot-2010.03-322-fpga_second_load_operator.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-322-fpga_second_load_operator.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-322-fpga_second_load_operator.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-330-fix-nand-debug.patch b/patches/u-boot/2010.03/u-boot-2010.03-330-fix-nand-debug.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-330-fix-nand-debug.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-330-fix-nand-debug.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-340-fix-fecmxc-debug.patch b/patches/u-boot/2010.03/u-boot-2010.03-340-fix-fecmxc-debug.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-340-fix-fecmxc-debug.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-340-fix-fecmxc-debug.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-350-fix-jffs2-warns.patch b/patches/u-boot/2010.03/u-boot-2010.03-350-fix-jffs2-warns.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-350-fix-jffs2-warns.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-350-fix-jffs2-warns.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-400-imx51.patch b/patches/u-boot/2010.03/u-boot-2010.03-400-imx51.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-400-imx51.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-400-imx51.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch b/patches/u-boot/2010.03/u-boot-2010.03-401-apf51.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-401-apf51.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-403-apf51-wdog.patch b/patches/u-boot/2010.03/u-boot-2010.03-403-apf51-wdog.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-403-apf51-wdog.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-403-apf51-wdog.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-404-apf51-fec.patch b/patches/u-boot/2010.03/u-boot-2010.03-404-apf51-fec.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-404-apf51-fec.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-404-apf51-fec.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-407-imx51-nand.patch b/patches/u-boot/2010.03/u-boot-2010.03-407-imx51-nand.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-407-imx51-nand.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-407-imx51-nand.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-409-apf51-nand-spl.patch b/patches/u-boot/2010.03/u-boot-2010.03-409-apf51-nand-spl.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-409-apf51-nand-spl.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-409-apf51-nand-spl.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-410-imx-iim.patch b/patches/u-boot/2010.03/u-boot-2010.03-410-imx-iim.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-410-imx-iim.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-410-imx-iim.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-411-Fix-high-voltage-nand-sd.patch b/patches/u-boot/2010.03/u-boot-2010.03-411-Fix-high-voltage-nand-sd.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-411-Fix-high-voltage-nand-sd.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-411-Fix-high-voltage-nand-sd.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-420-freescale-mxc_i2c-add_support_for_MX53_processor.patch b/patches/u-boot/2010.03/u-boot-2010.03-420-freescale-mxc_i2c-add_support_for_MX53_processor.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-420-freescale-mxc_i2c-add_support_for_MX53_processor.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-420-freescale-mxc_i2c-add_support_for_MX53_processor.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-421-denx-mxc_i2c-add_support_for_the_iMX35_processor.patch b/patches/u-boot/2010.03/u-boot-2010.03-421-denx-mxc_i2c-add_support_for_the_iMX35_processor.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-421-denx-mxc_i2c-add_support_for_the_iMX35_processor.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-421-denx-mxc_i2c-add_support_for_the_iMX35_processor.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-422-denx-mxc_i2c-get_rid_of__REG_access.patch b/patches/u-boot/2010.03/u-boot-2010.03-422-denx-mxc_i2c-get_rid_of__REG_access.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-422-denx-mxc_i2c-get_rid_of__REG_access.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-422-denx-mxc_i2c-get_rid_of__REG_access.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-423-denx-mxc_i2c-address_failure_with_mx35_processor.patch b/patches/u-boot/2010.03/u-boot-2010.03-423-denx-mxc_i2c-address_failure_with_mx35_processor.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-423-denx-mxc_i2c-address_failure_with_mx35_processor.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-423-denx-mxc_i2c-address_failure_with_mx35_processor.patch
diff --git a/buildroot/target/u-boot/u-boot-2010.03-424-armadeus-mxc_i2c-add_support_for_the_iMX51_processor.patch b/patches/u-boot/2010.03/u-boot-2010.03-424-armadeus-mxc_i2c-add_support_for_the_iMX51_processor.patch
similarity index 100%
rename from buildroot/target/u-boot/u-boot-2010.03-424-armadeus-mxc_i2c-add_support_for_the_iMX51_processor.patch
rename to patches/u-boot/2010.03/u-boot-2010.03-424-armadeus-mxc_i2c-add_support_for_the_iMX51_processor.patch
hooks/post-receive
--
armadeus
|
|
From: Gwenhael <gwe...@us...> - 2011-07-29 14:06:24
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via df0c944149e7b12460d172b4b59613a5cf305c6a (commit)
via 5adc155f56b59b709af4a8564b55e4f7adfd6b93 (commit)
from ef7bb8030f0429ad1a26c8bbfb03d67781207958 (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 df0c944149e7b12460d172b4b59613a5cf305c6a
Merge: 5adc155f56b59b709af4a8564b55e4f7adfd6b93 ef7bb8030f0429ad1a26c8bbfb03d67781207958
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Fri Jul 29 15:55:55 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 5adc155f56b59b709af4a8564b55e4f7adfd6b93
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Fri Jul 29 15:51:26 2011 +0200
[DEMO][REAL_TIME] Update all examples and Makefile according to the new Xenomai version
-----------------------------------------------------------------------
Summary of changes:
target/demos/real_time/Makefile.in | 13 ++++++++++---
target/demos/real_time/common.h | 7 ++++++-
target/demos/real_time/common_kernel.h | 13 ++++++++++---
.../xenomai/kernel/interrupt_xeno_kernel.c | 2 +-
.../xenomai/user_space/interrupt_xeno_userspace.c | 5 +++++
.../kernel/rt_timer/pulse_xeno_kernel_rt_timer.c | 1 -
.../pulse_sleep/pulse_xeno_userspace_sleep.c | 5 +++++
7 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/target/demos/real_time/Makefile.in b/target/demos/real_time/Makefile.in
index c4cf0de..7f67bb7 100644
--- a/target/demos/real_time/Makefile.in
+++ b/target/demos/real_time/Makefile.in
@@ -21,8 +21,13 @@ CFLAGS=-g -W -Wall -D_GNU_SOURCE -D_REENTRANT
LDFLAGS=-lpthread
ifeq ($(XENOMAI),y)
XENO=$(ARMADEUS_ROOTFS_DIR)/usr/xenomai
-CFLAGS+=-I$(XENO)/include -I$(XENO)/include/native -I$(XENO)/include/rtdm
-LDFLAGS+=-L$(XENO)/lib -Xlinker -rpath $(XENO)/lib -Xlinker $(XENO)/lib/libnative.a $(XENO)/lib/librtdm.a -lnative -lrtdm
+CFLAGS+=-I$(XENO)/include -I$(XENO)/include/native -I$(XENO)/include/rtdm -D__XENO__
+LDFLAGS+=-lnative -L$(XENO)/lib -lxenomai
+LDFLAGS+=-Xlinker -rpath -Xlinker $(XENO)/lib
+LDFLAGS+=-Xlinker $(XENO)/lib/libnative.a
+LDFLAGS+=-Xlinker $(XENO)/lib/libxenomai.a
+LDFLAGS+=-Xlinker $(XENO)/lib/librtdm.a -lrtdm
+
endif
$(EXEC) : $(OBJ)
@@ -54,9 +59,11 @@ obj-m := $(OBJ)
CLEAN_MOD= modules.order *.ko *.mod.c *.mod.o *.symvers $(CLEANMOD)
CLEAN_MOD+= .tmp_versions Module.markers
+export DEV_TOOLS =/home/toolchains/armadeus/armadeus_xeno/buildroot/output/build/staging_dir/usr/bin
+export PATH:=$(PATH):$(DEV_TOOLS)
$(EXEC): $(MODULES).c
- $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules
+ $(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules ARCH=arm CROSS_COMPILE=arm-unknown-linux-uclibcgnueabi-
install: $(EXEC)
cp $(EXEC) $(DEST_DIR)/$(EXEC)
diff --git a/target/demos/real_time/common.h b/target/demos/real_time/common.h
index dc537f9..af2b39c 100644
--- a/target/demos/real_time/common.h
+++ b/target/demos/real_time/common.h
@@ -2,12 +2,17 @@
#define COMMON_H
/* Common defines used in userspace applications */
+#ifdef CONFIG_ARCH_MX2
+#define INTERRUPT_OUTPUT_DEV "/dev/gpio/PB16"
+#define INTERRUPT_INPUT_DEV "/dev/gpio/PB15"
+#define PULSE_OUTPUT_DEV "/dev/gpio/PB16"
+#else
#define INTERRUPT_OUTPUT_DEV "/dev/gpio/PA9"
#define INTERRUPT_INPUT_DEV "/dev/gpio/PA6"
#define PULSE_OUTPUT_DEV "/dev/gpio/PA4"
-
+#endif
#define TIMESLEEP 10000
#define TASK_PRIO 99 /* Highest RT priority */
#define TASK_MODE 0 /* No flags */
diff --git a/target/demos/real_time/common_kernel.h b/target/demos/real_time/common_kernel.h
index b3fa34b..0847ba7 100644
--- a/target/demos/real_time/common_kernel.h
+++ b/target/demos/real_time/common_kernel.h
@@ -11,11 +11,18 @@
#include "common.h"
-#define INTERRUPT_OUTPUT_GPIO (GPIO_PORTA | 9)
+#ifdef CONFIG_ARCH_MX2
+// CSI PIXCLK
+#define PULSE_OUTPUT_GPIO (GPIO_PORTB | 16)
+#define INTERRUPT_OUTPUT_GPIO (GPIO_PORTB | 16)
+#define INTERRUPT_INPUT_NB IRQ_GPIOB(15)
+#define INTERRUPT_INPUT_GPIO (GPIO_PORTB | 15)
+#else
+#define PULSE_OUTPUT_GPIO (GPIO_PORTA | 4)
+#define INTERRUPT_OUTPUT_GPIO (GPIO_PORTA | 9)
#define INTERRUPT_INPUT_GPIO (GPIO_PORTA | 6)
#define INTERRUPT_INPUT_NB IRQ_GPIOA(6)
-
-#define PULSE_OUTPUT_GPIO (GPIO_PORTA | 4)
+#endif
#endif /* COMMON_KERNEL_H */
diff --git a/target/demos/real_time/interrupt/xenomai/kernel/interrupt_xeno_kernel.c b/target/demos/real_time/interrupt/xenomai/kernel/interrupt_xeno_kernel.c
index 368d6ae..bf05fff 100644
--- a/target/demos/real_time/interrupt/xenomai/kernel/interrupt_xeno_kernel.c
+++ b/target/demos/real_time/interrupt/xenomai/kernel/interrupt_xeno_kernel.c
@@ -57,7 +57,7 @@ static int __init irq_init(void)
}
err = rt_intr_enable(&intr_desc);
if (err == 0)
- printk("rt_intr_create : ok\n";
+ printk("rt_intr_create : ok\n");
return err;
}
diff --git a/target/demos/real_time/interrupt/xenomai/user_space/interrupt_xeno_userspace.c b/target/demos/real_time/interrupt/xenomai/user_space/interrupt_xeno_userspace.c
index 670e328..bf5798a 100644
--- a/target/demos/real_time/interrupt/xenomai/user_space/interrupt_xeno_userspace.c
+++ b/target/demos/real_time/interrupt/xenomai/user_space/interrupt_xeno_userspace.c
@@ -25,6 +25,11 @@
#include <native/task.h>
#include <native/intr.h>
#include "../../../common.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
RT_INTR intr_desc;
diff --git a/target/demos/real_time/pulse/xenomai/kernel/rt_timer/pulse_xeno_kernel_rt_timer.c b/target/demos/real_time/pulse/xenomai/kernel/rt_timer/pulse_xeno_kernel_rt_timer.c
index ea91d19..37e096a 100644
--- a/target/demos/real_time/pulse/xenomai/kernel/rt_timer/pulse_xeno_kernel_rt_timer.c
+++ b/target/demos/real_time/pulse/xenomai/kernel/rt_timer/pulse_xeno_kernel_rt_timer.c
@@ -83,7 +83,6 @@ static void __exit blink_exit(void)
end = 1;
printk(KERN_INFO "blink_exit\n");
rt_task_delete(&blink_task);
- rt_timer_stop();
gpio_free(PULSE_OUTPUT_GPIO);
}
diff --git a/target/demos/real_time/pulse/xenomai/user_space/pulse_sleep/pulse_xeno_userspace_sleep.c b/target/demos/real_time/pulse/xenomai/user_space/pulse_sleep/pulse_xeno_userspace_sleep.c
index 67acb84..3bb6e64 100644
--- a/target/demos/real_time/pulse/xenomai/user_space/pulse_sleep/pulse_xeno_userspace_sleep.c
+++ b/target/demos/real_time/pulse/xenomai/user_space/pulse_sleep/pulse_xeno_userspace_sleep.c
@@ -27,6 +27,11 @@
#include <native/timer.h>
#include <rtdm/rtdm.h>
#include "../../../../common.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
RT_TASK blink_task;
int write_fd = -1;
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-07-28 15:57:07
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ef7bb8030f0429ad1a26c8bbfb03d67781207958 (commit)
via 399dcdcb7df7446b78648c0ed0971f32123a5c85 (commit)
from 20825e320da906c7d5c3fadfdb0b0e4a0234d803 (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 ef7bb8030f0429ad1a26c8bbfb03d67781207958
Author: Kevin JOLY <jol...@gm...>
Date: Thu Jul 28 17:51:47 2011 +0200
[BUILDROOT]Add package anybus-tools
Signed-off-by: Kevin JOLY <jol...@gm...>
commit 399dcdcb7df7446b78648c0ed0971f32123a5c85
Author: Kevin JOLY <jol...@gm...>
Date: Thu Jul 28 17:51:46 2011 +0200
[BUILDROOT]Remove package anybusd
Signed-off-by: Kevin JOLY <jol...@gm...>
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/Config.in | 2 +-
buildroot/package/armadeus/anybus-tools/Config.in | 9 +
.../package/armadeus/anybus-tools/anybus-tools.mk | 21 ++
buildroot/package/armadeus/anybusd/Config.in | 4 -
buildroot/package/armadeus/anybusd/anybusd.mk | 21 --
target/packages/anybus-tools/Makefile | 53 +++
target/packages/anybus-tools/README | 9 +
target/packages/anybus-tools/about_help.c | 130 ++++++++
target/packages/anybus-tools/about_help.h | 12 +
target/packages/anybus-tools/anybus-tools.c | 250 ++++++++++++++
target/packages/anybus-tools/edit_input.c | 104 ++++++
target/packages/anybus-tools/edit_input.h | 15 +
target/packages/anybus-tools/mailbox.c | 349 ++++++++++++++++++++
target/packages/anybus-tools/mailbox.h | 17 +
target/packages/anybus-tools/map_output.c | 105 ++++++
target/packages/anybus-tools/map_output.h | 15 +
target/packages/anybus-tools/read_reg.c | 74 ++++
target/packages/anybus-tools/read_reg.h | 13 +
target/packages/anybus-tools/sel_iface.c | 137 ++++++++
target/packages/anybus-tools/sel_iface.h | 15 +
target/packages/anybus-tools/win.c | 158 +++++++++
target/packages/anybus-tools/win.h | 15 +
target/packages/anybusd/Makefile | 32 --
target/packages/anybusd/S60anybusd | 41 ---
target/packages/anybusd/anybusd.c | 201 -----------
25 files changed, 1502 insertions(+), 300 deletions(-)
create mode 100644 buildroot/package/armadeus/anybus-tools/Config.in
create mode 100644 buildroot/package/armadeus/anybus-tools/anybus-tools.mk
delete mode 100644 buildroot/package/armadeus/anybusd/Config.in
delete mode 100644 buildroot/package/armadeus/anybusd/anybusd.mk
create mode 100644 target/packages/anybus-tools/Makefile
create mode 100644 target/packages/anybus-tools/README
create mode 100644 target/packages/anybus-tools/about_help.c
create mode 100644 target/packages/anybus-tools/about_help.h
create mode 100644 target/packages/anybus-tools/anybus-tools.c
create mode 100644 target/packages/anybus-tools/edit_input.c
create mode 100644 target/packages/anybus-tools/edit_input.h
create mode 100644 target/packages/anybus-tools/mailbox.c
create mode 100644 target/packages/anybus-tools/mailbox.h
create mode 100644 target/packages/anybus-tools/map_output.c
create mode 100644 target/packages/anybus-tools/map_output.h
create mode 100644 target/packages/anybus-tools/read_reg.c
create mode 100644 target/packages/anybus-tools/read_reg.h
create mode 100644 target/packages/anybus-tools/sel_iface.c
create mode 100644 target/packages/anybus-tools/sel_iface.h
create mode 100644 target/packages/anybus-tools/win.c
create mode 100644 target/packages/anybus-tools/win.h
delete mode 100644 target/packages/anybusd/Makefile
delete mode 100755 target/packages/anybusd/S60anybusd
delete mode 100644 target/packages/anybusd/anybusd.c
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index 33c7659..e77a511 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -1,6 +1,6 @@
menu "Armadeus specific tools/utilities"
-source package/armadeus/anybusd/Config.in
+source package/armadeus/anybus-tools/Config.in
source package/armadeus/as_devices/Config.in
source package/armadeus/demos/Config.in
source package/armadeus/fpgaregs/Config.in
diff --git a/buildroot/package/armadeus/anybus-tools/Config.in b/buildroot/package/armadeus/anybus-tools/Config.in
new file mode 100644
index 0000000..c91a828
--- /dev/null
+++ b/buildroot/package/armadeus/anybus-tools/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_ANYBUS_TOOLS
+ bool "anybus-tools"
+ depends on BR2_PACKAGE_NCURSES
+ help
+ Tools for HMS module anybus.
+
+comment "anybus-tools requires package ncurses"
+ depends on !BR2_PACKAGE_NCURSES
+
diff --git a/buildroot/package/armadeus/anybus-tools/anybus-tools.mk b/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
new file mode 100644
index 0000000..301fe6f
--- /dev/null
+++ b/buildroot/package/armadeus/anybus-tools/anybus-tools.mk
@@ -0,0 +1,21 @@
+#############################################################
+#
+# anybus-tools
+#
+#############################################################
+ANYBUS_TOOLS_VERSION = 0.1
+ANYBUS_TOOLS_BIN_NAME = anybus-tools
+ANYBUS_TOOLS_SITE=$(TOPDIR)/../target/packages/anybus-tools/
+ANYBUS_TOOLS_SITE_METHOD=copy
+LINUX_DIR=$(BUILD_DIR)/linux-$(KERNEL_VERSION)/
+
+define ANYBUS_TOOLS_BUILD_CMDS
+ ln -sf "$(LINUX_DIR)/include/net/anybus_interface.h" "$(STAGING_DIR)/usr/include/net/anybus_interface.h"
+ $(MAKE) CC="$(TARGET_CC)" -C $(@D) all
+endef
+
+define ANYBUS_TOOLS_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 $(ANYBUS_TOOLS_DIR)/$(ANYBUS_TOOLS_BIN_NAME) $(TARGET_DIR)/usr/bin/$(ANYBUS_TOOLS_BIN_NAME)
+endef
+
+$(eval $(call GENTARGETS,package,anybus-tools))
diff --git a/buildroot/package/armadeus/anybusd/Config.in b/buildroot/package/armadeus/anybusd/Config.in
deleted file mode 100644
index e822ab1..0000000
--- a/buildroot/package/armadeus/anybusd/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_ANYBUSD
- bool "anybusd"
- help
- Socket daemon for anybus module
diff --git a/buildroot/package/armadeus/anybusd/anybusd.mk b/buildroot/package/armadeus/anybusd/anybusd.mk
deleted file mode 100644
index f5fbe28..0000000
--- a/buildroot/package/armadeus/anybusd/anybusd.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#############################################################
-#
-# anybusd
-#
-#############################################################
-ANYBUSD_VERSION = 0.1
-ANYBUSD_BIN_NAME = anybusd
-ANYBUSD_INIT_SCRIPT_NAME = S60anybusd
-ANYBUSD_SITE=$(TOPDIR)/../target/packages/anybusd/
-ANYBUSD_SITE_METHOD=copy
-
-define ANYBUSD_BUILD_CMDS
- $(MAKE) CC="$(TARGET_CC)" -C $(@D) all
-endef
-
-define ANYBUSD_INSTALL_TARGET_CMDS
- $(INSTALL) -m 0755 $(ANYBUSD_DIR)/$(ANYBUSD_BIN_NAME) $(TARGET_DIR)/usr/bin/$(ANYBUSD_BIN_NAME)
- $(INSTALL) -m 0755 $(ANYBUSD_DIR)/$(ANYBUSD_INIT_SCRIPT_NAME) $(TARGET_DIR)/etc/init.d/$(ANYBUSD_INIT_SCRIPT_NAME)
-endef
-
-$(eval $(call GENTARGETS,package,anybusd))
diff --git a/target/packages/anybus-tools/Makefile b/target/packages/anybus-tools/Makefile
new file mode 100644
index 0000000..3a5cfb4
--- /dev/null
+++ b/target/packages/anybus-tools/Makefile
@@ -0,0 +1,53 @@
+# Default values for local compiling:
+ARMADEUS_BASE_DIR=../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
+INITD_DIR:=$(ARMADEUS_ROOTFS_DIR)/etc/init.d/
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+
+DEFINES=TARGET
+CFLAGS= -W -Wall -g
+LIB= -lncurses
+
+EXEC=anybus-tools
+
+default: $(EXEC)
+
+all: $(EXEC)
+
+read_reg.o: read_reg.c
+ $(CC) $(CFLAGS) -c -o $@ $^
+
+about_help.o: about_help.c
+ $(CC) $(CFLAGS) -c -o $@ $^
+
+mailbox.o: mailbox.c
+ $(CC) $(CFLAGS) -c -o $@ $^
+
+edit_input.o: edit_input.c
+ $(CC) $(CFLAGS) -c -o $@ $^
+
+map_output.o: map_output.c
+ $(CC) $(CFLAGS) -c -o $@ $^
+
+sel_iface.o: sel_iface.c
+ $(CC) $(CFLAGS) -c -o $@ $^
+
+win.o: win.c
+ $(CC) $(CFLAGS) -c -o $@ $^
+
+anybus-tools.o: anybus-tools.c
+ $(CC) $(CFLAGS) -c -o $@ $^
+
+$(EXEC): read_reg.o about_help.o mailbox.o edit_input.o map_output.o sel_iface.o win.o anybus-tools.o
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIB)
+
+clean:
+ rm -rf anybus-tools
+ rm -rf *.o
+
+.PHONY: clean install uninstall
+
diff --git a/target/packages/anybus-tools/README b/target/packages/anybus-tools/README
new file mode 100644
index 0000000..306c3ad
--- /dev/null
+++ b/target/packages/anybus-tools/README
@@ -0,0 +1,9 @@
+Tools used with anybus_interface driver and HMS Anybus module.
+
+If you run it on an Armadeus board APF51-Dev, you can generate the design and
+copy the driver automatically with the script :
+your_armadeus_dir/firmware/pod_scripts/apf51_anybus_interface.pod
+A pre-designed FPGA design is also available in this directory.
+
+Have a look to this wiki page for further informations:
+http://www.armadeus.com/wiki/index.php?title=HMS_anybus_Linux
diff --git a/target/packages/anybus-tools/about_help.c b/target/packages/anybus-tools/about_help.c
new file mode 100644
index 0000000..b34996f
--- /dev/null
+++ b/target/packages/anybus-tools/about_help.c
@@ -0,0 +1,130 @@
+/*
+ * Display help and about windows in anybus-tools application.
+ *
+ * Copyright (C) 2011 Armadeus Systems
+ * Kevin JOLY <jol...@gm...>
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include "about_help.h"
+
+void about()
+{
+ int height = 13;
+ int width = 45;
+ int starty = 2;
+ int startx = (COLS -width) / 2;
+ int i;
+ WINDOW* win;
+
+ win = newwin(height, width, starty, startx);
+ box(win, 0, 0);
+
+ wattron(win, A_STANDOUT);
+ for (i = 1 ; i < width - 1; i++)
+ mvwprintw(win, 0, i, " ");
+
+ mvwprintw(win, 0, (width - strlen("About...")) / 2, "About...");
+ wattroff(win, A_STANDOUT);
+
+ mvwprintw(win, 2, 2, "Anybus tools is a set of tools used");
+ mvwprintw(win, 3, 2, "to communicate with the HMS Anybus module.");
+ mvwprintw(win, 5, 2, "(C) Copyright 2011 - Armadeus Systems");
+ mvwprintw(win, 6, 2, "<su...@ar...>");
+ mvwprintw(win, 7, 2, "Author: Kevin JOLY jol...@gm...");
+ mvwprintw(win, 9, 2, "HMS website : http://www.hms.se/");
+ wattroff(win, A_STANDOUT);
+
+ wattron(win, A_STANDOUT);
+ mvwprintw(win, height - 2, (width - strlen("< Ok >")) / 2, "< Ok >");
+ wattroff(win, A_STANDOUT);
+
+ wmove(win, height - 2, (width - strlen("< Ok >")) / 2);
+ wrefresh(win);
+ getch();
+ endwin();
+}
+
+void help()
+{
+ int height = 24;
+ int width = 78;
+ int starty = 0;
+ int startx = (COLS -width) / 2;
+ int i;
+ WINDOW* win;
+
+ win = newwin(height, width, starty, startx);
+ box(win, 0, 0);
+
+ wattron(win, A_STANDOUT);
+ for (i = 1 ; i < width - 1; i++)
+ mvwprintw(win, 0, i, " ");
+
+ mvwprintw(win, 0, (width - strlen("Help")) / 2, "Help");
+ wattroff(win, A_STANDOUT);
+
+ wattron(win, A_BOLD);
+ mvwprintw(win, 1, 2, "Edit input area");
+ wattroff(win, A_BOLD);
+ mvwprintw(win, 2, 2, "Send datas to the fieldbus through the HMS Anybus module.");
+ mvwprintw(win, 3, 2, "You can move the cursor in the Anybus's internal memory using arrow key.");
+ mvwprintw(win, 4, 2, "Use < Enter > to edit the selected field.");
+
+ wattron(win, A_BOLD);
+ mvwprintw(win, 5, 2, "Map output area");
+ wattroff(win, A_BOLD);
+ mvwprintw(win, 6, 2, "View datas on the fieldbus through the HMS Anybus module.");
+ mvwprintw(win, 7, 2, "You can move the cursor in the Anybus's internal memory using arrow key.");
+
+ wattron(win, A_BOLD);
+ mvwprintw(win, 8, 2, "Mailbox message");
+ wattroff(win, A_BOLD);
+ mvwprintw(win, 9, 2, "Send and receive Anybus mailbox messages.");
+ mvwprintw(win, 10, 2, "You can move the cursor on the differents fields using arrow key.");
+ mvwprintw(win, 11, 2, "Use < Enter > to edit the selected field. You can edit the mailbox datas");
+ mvwprintw(win, 12, 2, "as the Edit input area menu. Then, move to < Send > to send the mailbox.");
+ mvwprintw(win, 13, 2, "When a response occurs, the right window is automatically refreshed.");
+
+ wattron(win, A_BOLD);
+ mvwprintw(win, 14, 2, "Read register");
+ wattroff(win, A_BOLD);
+ mvwprintw(win, 15, 2, "Read an anybus register. Hit < Enter > to edit the address.");
+
+ wattron(win, A_BOLD);
+ mvwprintw(win, 16, 2, "change interface");
+ wattroff(win, A_BOLD);
+ mvwprintw(win, 17, 2, "Change the Anybus interface corresponding to the module.");
+
+ wattron(win, A_BOLD);
+ mvwprintw(win, 18, 2, "About...");
+ wattroff(win, A_BOLD);
+ mvwprintw(win, 19, 2, "Display the \"About\" message.");
+
+ wattron(win, A_BOLD);
+ mvwprintw(win, 20, 2, "Help");
+ wattroff(win, A_BOLD);
+ mvwprintw(win, 21, 2, "Display this help.");
+
+ wattron(win, A_STANDOUT);
+ mvwprintw(win, height - 2, (width - strlen("< Ok >")) / 2, "< Ok >");
+ wattroff(win, A_STANDOUT);
+
+ wmove(win, height - 2, (width - strlen("< Ok >")) / 2);
+ wrefresh(win);
+ getch();
+ endwin();
+}
diff --git a/target/packages/anybus-tools/about_help.h b/target/packages/anybus-tools/about_help.h
new file mode 100644
index 0000000..976d996
--- /dev/null
+++ b/target/packages/anybus-tools/about_help.h
@@ -0,0 +1,12 @@
+#ifndef ABOUT_HELP_HEADER
+#define ABOUT_HELP_HEADER
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ncurses.h>
+
+void about();
+void help();
+
+#endif
diff --git a/target/packages/anybus-tools/anybus-tools.c b/target/packages/anybus-tools/anybus-tools.c
new file mode 100644
index 0000000..58e1772
--- /dev/null
+++ b/target/packages/anybus-tools/anybus-tools.c
@@ -0,0 +1,250 @@
+/*
+ * anybus-tools is an application communicating with an HMS anybus module
+ * through the driver anybus_interface.
+ *
+ * Copyright (C) 2011 Armadeus Systems
+ * Kevin JOLY <jol...@gm...>
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ncurses.h>
+#include <signal.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/fcntl.h>
+#include <sys/ioctl.h>
+#include <linux/if_packet.h>
+#include <net/if.h>
+#include <netinet/in.h>
+
+#include "edit_input.h"
+#include "map_output.h"
+#include "sel_iface.h"
+#include "win.h"
+#include "mailbox.h"
+#include "read_reg.h"
+#include "about_help.h"
+
+void exit_curses()
+{
+ erase();
+ refresh();
+ curs_set(1);
+ endwin();
+ echo();
+}
+
+int init_file_ioctl(char *anybus_interface)
+{
+ char file_dev[256];
+
+ snprintf(file_dev, sizeof(file_dev), "/dev/%s_device", anybus_interface);
+
+ return open(file_dev, O_RDONLY);
+}
+
+int init_sock(char *anybus_interface)
+{
+ struct ifreq ifr;
+ struct sockaddr_ll addr;
+ int sk = 0;
+
+ addr.sll_family = AF_PACKET;
+ addr.sll_protocol = IPPROTO_UDP;
+ addr.sll_pkttype = PACKET_BROADCAST;
+
+ strncpy(ifr.ifr_name, anybus_interface, strlen(anybus_interface));
+
+ if ((sk = socket(PF_PACKET , SOCK_RAW, AF_PACKET)) < 0 ) {
+ exit_curses();
+ perror("socket");
+ return sk;
+ }
+
+ ioctl(sk, SIOCGIFINDEX, &ifr);
+ addr.sll_ifindex = ifr.ifr_ifindex;
+
+ if(bind(sk, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
+ exit_curses();
+ perror("bind");
+ return EXIT_FAILURE;
+ }
+
+return sk;
+}
+
+int print_menu(char *anybus_interface)
+{
+ char *choices[] = { "Edit input area", "Map output area", "Mailbox message", "Read register", "Change interface","About...", "Help" };
+ int startx, starty, width, height;
+ int ch = 0, selection = 0;
+ WINDOW *win_menu;
+
+ height = 12;
+ width = 40;
+ starty = 3;
+ startx = (COLS - width) / 2;
+
+ win_menu = create_new_win(height, width, starty, startx, "Anybus-tools");
+
+ mvwprintw(win_menu, height - 2, width - 11, "'q' : quit");
+ mvwprintw(win_menu, height - 2, 2, "interface: %s", anybus_interface);
+ refresh_menu(win_menu, selection, width, choices, 7);
+ wrefresh(win_menu);
+
+ while((ch != 'q') && (ch != 'Q') && (ch != 10))
+ {
+ ch = wgetch(win_menu);
+ switch(ch)
+ {
+ case 65:
+ if (selection > 0)
+ selection--;
+ break;
+ case 66:
+ if (selection < 6)
+ selection++;
+ break;
+ }
+
+ refresh_menu(win_menu, selection, width, choices, 7);
+ wrefresh(win_menu);
+ }
+
+ if ((ch == 'q') || (ch == 'Q'))
+ selection = -1;
+ endwin();
+
+ return selection;
+}
+
+void signal_handler(int sig)
+{
+ switch(sig) {
+ case SIGTERM:
+ exit_curses();
+ exit(0);
+ break;
+ default:
+ break;
+ }
+}
+
+int main()
+{
+ int ret = 0;
+ char anybus_interface[IFACE_NAME_LEN];
+ char *anybus_interface_ptr;
+ int sock, fd_device;
+
+ signal(SIGTERM, signal_handler);
+ initscr();
+ raw();
+ noecho();
+ curs_set(0);
+
+ if ((anybus_interface_ptr = sel_iface()) == NULL) {
+ exit_curses();
+ return EXIT_FAILURE;
+ }
+
+ strncpy(anybus_interface, anybus_interface_ptr, IFACE_NAME_LEN);
+
+ free(anybus_interface_ptr);
+
+ if ((sock = init_sock(anybus_interface)) < 0)
+ return EXIT_FAILURE;
+
+ if((fd_device = init_file_ioctl(anybus_interface)) < 0) {
+ close(sock);
+ exit_curses();
+ printf("Unable to find the device file of the anybus module\n");
+ return fd_device;
+ }
+
+ while (ret >= 0) {
+
+ erase();
+ refresh();
+
+ ret = print_menu(anybus_interface);
+
+ erase();
+ refresh();
+
+ switch(ret) {
+ case 0:
+ if (edit_input(sock, fd_device) < 0) {
+ exit_curses();
+ perror("edit_input");
+ close(fd_device);
+ close(sock);
+ return EXIT_FAILURE;
+ }
+ break;
+ case 1:
+ if (map_output(sock, fd_device) < 0) {
+ exit_curses();
+ perror("map_output");
+ close(fd_device);
+ close(sock);
+ return EXIT_FAILURE;
+ }
+ break;
+ case 2:
+ if (mailbox(fd_device) < 0) {
+ exit_curses();
+ perror("mailbox");
+ close(fd_device);
+ close(sock);
+ return EXIT_FAILURE;
+ }
+ break;
+ case 3:
+ if (read_register(fd_device) < 0) {
+ exit_curses();
+ perror("read_register");
+ close(fd_device);
+ close(sock);
+ return EXIT_FAILURE;
+ }
+ break;
+ case 4:
+ if ((anybus_interface_ptr = sel_iface()) != NULL) {
+ strcpy(anybus_interface, anybus_interface_ptr);
+ free(anybus_interface_ptr);
+ }
+ break;
+ case 5:
+ about();
+ break;
+ case 6:
+ help();
+ break;
+ }
+ }
+
+ close(fd_device);
+ close(sock);
+ exit_curses();
+ return EXIT_SUCCESS;
+}
diff --git a/target/packages/anybus-tools/edit_input.c b/target/packages/anybus-tools/edit_input.c
new file mode 100644
index 0000000..ba78bc2
--- /dev/null
+++ b/target/packages/anybus-tools/edit_input.c
@@ -0,0 +1,104 @@
+/*
+ * Edit the input data area of an HMS Anybus module to send data on fieldbus.
+ *
+ * Copyright (C) 2011 Armadeus Systems
+ * Kevin JOLY <jol...@gm...>
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include "edit_input.h"
+
+int edit_input(int sock, int fd_device)
+{
+ int i, line_offset, selection_line = 0, selection_col = 0, ret;
+ char ch = 0;
+ int value;
+ struct anybus_frame frame;
+
+ memset(frame.data, 0, sizeof(frame.data));
+
+ if ((ret = ioctl(fd_device, ANYBUS_MAP_INPUT, frame.data)) < 0)
+ return ret;
+
+ while ((ch != 'q') && (ch != 'Q'))
+ {
+
+ line_offset = 0;
+
+ for (i = 0 ; i < 0x100 ; i++) {
+
+ if ((i % 16 == 0) && (i != 0))
+ line_offset++;
+
+ mvprintw(line_offset, (i % 16) * 5 + 4, " ");
+
+ if ((selection_col == i % 16) && (selection_line == line_offset))
+ attron(A_STANDOUT);
+ mvprintw(line_offset, (i % 16) * 5, "%04X", frame.data[i]);
+ if ((selection_col == i % 16) && (selection_line == line_offset))
+ attroff(A_STANDOUT);
+ }
+
+ attron(A_STANDOUT);
+ for (i = 0 ; i < 80 ; i++) {
+ mvprintw(23, i, " ");
+ }
+ mvprintw(23, 1, "Anybus address: 0x%03X", (32 * selection_line + selection_col * 2));
+ mvprintw(23, 30, "Fieldbus address: 0x%02X", (16 * selection_line + selection_col));
+ mvprintw(23, 60, "q : quit this tool");
+ attroff(A_STANDOUT);
+
+ refresh();
+
+ move(selection_line, selection_col*5);
+
+ ch = getch();
+ switch(ch)
+ {
+ case 65: /* Up */
+ if (selection_line > 0)
+ selection_line--;
+ break;
+ case 66: /* Down */
+ if (selection_line < 15)
+ selection_line++;
+ break;
+ case 68: /* Left */
+ if (selection_col > 0)
+ selection_col--;
+ break;
+ case 67: /* Right */
+ if (selection_col < 15)
+ selection_col++;
+ break;
+ case 10: /* Validate */
+ mvprintw(selection_line, selection_col * 5, " ");
+ echo();
+ mvscanw(selection_line, selection_col * 5, "%4X", &value);
+ noecho();
+ frame.data[16 * selection_line + selection_col] = value;
+ frame.reg = 0;
+
+ frame.len = 256;
+ if ((ret = send(sock, (void *)&frame, sizeof(frame), 0)) < 0)
+ return ret;
+
+ break;
+ }
+ }
+
+ return 0;
+}
diff --git a/target/packages/anybus-tools/edit_input.h b/target/packages/anybus-tools/edit_input.h
new file mode 100644
index 0000000..6332b67
--- /dev/null
+++ b/target/packages/anybus-tools/edit_input.h
@@ -0,0 +1,15 @@
+#ifndef EDIT_INPUT_HEADER
+#define EDIT_INPUT_HEADER
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ncurses.h>
+#include <string.h>
+#include <net/anybus_interface.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+
+int edit_input(int sock, int fd_device);
+
+#endif
diff --git a/target/packages/anybus-tools/mailbox.c b/target/packages/anybus-tools/mailbox.c
new file mode 100644
index 0000000..0b2e566
--- /dev/null
+++ b/target/packages/anybus-tools/mailbox.c
@@ -0,0 +1,349 @@
+/*
+ * Send and receive mailbox message from the HMS Anybus module
+ *
+ * Copyright (C) 2011 Armadeus Systems
+ * Kevin JOLY <jol...@gm...>
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include "mailbox.h"
+
+int mailbox(int fd_device)
+{
+ int startx, starty, width, height, ycurpos, xcurpos;
+ WINDOW *win_send_mb, *win_recv_mb;
+ char focus = 0, ch;
+ int selection = 0, i, ret = 0;
+ struct mailbox_msg mail_to_send, received_mail;
+ unsigned short value;
+ fd_set fdlist;
+
+ memset(&mail_to_send, 0, sizeof(mail_to_send));
+ memset(&received_mail, 0, sizeof(received_mail));
+
+ height = 19;
+ width = 38;
+ starty = 1;
+ startx = 1;
+init_windows:
+ win_send_mb = create_new_win(height, width, starty, startx, "Mail to send");
+ win_recv_mb = create_new_win(height, width, starty, startx + 39, "Response mail");
+
+ attron(A_STANDOUT);
+ for (i = 0 ; i < 80 ; i++) {
+ mvprintw(23, i, " ");
+ }
+
+ mvprintw(23, 2, "<- or -> : switch window");
+ mvprintw(23, 60, "q : quit this tool");
+ attroff(A_STANDOUT);
+
+ refresh_form_mail_to_send(win_send_mb, selection, width, mail_to_send, focus ^ 1);
+ wrefresh(win_send_mb);
+ refresh_form_received_mail(win_recv_mb, selection, width, received_mail, focus);
+ wrefresh(win_recv_mb);
+ refresh();
+
+
+ while((ch != 'q') && (ch != 'Q')) {
+
+ FD_ZERO(&fdlist);
+ FD_SET(fd_device, &fdlist);
+ FD_SET(0, &fdlist);
+
+ if (selection == 13)
+ ycurpos = starty + selection + 3;
+ else
+ ycurpos = starty + selection + 2;
+
+ if (focus == 0) {
+ if (selection == 12)
+ xcurpos = startx + width - 7;
+ else if (selection == 13)
+ xcurpos = startx + width - 21;
+ else
+ xcurpos = startx + width - 5;
+ } else {
+ if (selection == 12)
+ xcurpos = startx + 39 + width - 7;
+ else
+ xcurpos = startx + 39 + width - 5;
+ }
+
+ move(ycurpos, xcurpos);
+ refresh();
+
+ if (select(fd_device + 1, &fdlist, NULL, NULL, NULL) < 0)
+ mvprintw(0, 0, "Error");
+
+ if (FD_ISSET(0, &fdlist)) {
+ ch = getch();
+ switch(ch) {
+ case 65: /* Up */
+ if (selection > 0)
+ selection--;
+ break;
+ case 66: /* Down */
+ if (((selection < 13) && (focus == 0)) || (selection < 12))
+ selection++;
+ break;
+ case 68: /* Left */
+ focus = 0;
+ selection = 0;
+ break;
+ case 67: /* Right */
+ focus = 1;
+ selection = 0;
+ break;
+ case 10:
+ if (focus == 0) {
+ if (selection < 12) {
+ mvwprintw(win_send_mb, selection + 2, width - 5, " ");
+ echo();
+ mvwscanw(win_send_mb, selection + 2, width - 5, "%4X", &value);
+ noecho();
+ }
+ switch (selection) {
+ case 0:
+ mail_to_send.id = value;
+ break;
+ case 1:
+ mail_to_send.msg_information = value;
+ break;
+ case 2:
+ mail_to_send.command_number = value;
+ break;
+ case 3:
+ if (value > ANYBUS_MAILBOX_DATA_LEN)
+ value = ANYBUS_MAILBOX_DATA_LEN;
+ mail_to_send.data_size = value;
+ break;
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ mail_to_send.extended_word[selection - 4] = value;
+ break;
+ case 12:
+ endwin();
+ edit_data_mailbox(mail_to_send.data, mail_to_send.data_size / 2);
+ goto init_windows;
+ break;
+ case 13:
+ if ((ret = ioctl(fd_device, ANYBUS_MB_WRITE, &mail_to_send)) < 0)
+ return ret;
+ break;
+ }
+ } else {
+ endwin();
+ if ((ch == 10) && (selection == 12))
+ map_data_mailbox(received_mail.data, received_mail.data_size / 2);
+ goto init_windows;
+ }
+ break;
+ }
+ }
+ if (FD_ISSET(fd_device, &fdlist)) {
+ if((ret = ioctl(fd_device, ANYBUS_MB_READ, &received_mail)) < 0)
+ return ret;
+ }
+
+ refresh_form_mail_to_send(win_send_mb, selection, width, mail_to_send, focus ^ 1);
+ wrefresh(win_send_mb);
+ refresh_form_received_mail(win_recv_mb, selection, width, received_mail, focus);
+ wrefresh(win_recv_mb);
+ }
+
+ endwin();
+
+ return 0;
+}
+
+int edit_data_mailbox(unsigned short data[ANYBUS_DATA_LEN], int data_len)
+{
+ int i, line_offset, selection_line = 0, selection_col = 0;
+ char ch = 0;
+ int value;
+
+ erase();
+ refresh();
+
+ if (data_len == 0) {
+ mvprintw(2, 2, "/!\\ No datas available in this mailbox message.");
+ mvprintw(3, 2, " Press any key to continue.");
+ getch();
+ erase();
+ refresh();
+ return -1;
+ }
+
+ while ((ch != 'q') && (ch != 'Q'))
+ {
+
+ line_offset = 0;
+
+ for (i = 0 ; i < data_len ; i++) {
+
+ if ((i % 16 == 0) && (i != 0))
+ line_offset++;
+
+ mvprintw(line_offset, (i % 16) * 5 + 4, " ");
+
+ if ((selection_col == i % 16) && (selection_line == line_offset))
+ attron(A_STANDOUT);
+
+ mvprintw(line_offset, (i % 16) * 5, "%04X", data[i]);
+
+ if ((selection_col == i % 16) && (selection_line == line_offset))
+ attroff(A_STANDOUT);
+ }
+
+ attron(A_STANDOUT);
+ for (i = 0 ; i < 80 ; i++) {
+ mvprintw(23, i, " ");
+ }
+
+ mvprintw(23, 1, "Address: 0x%03X", (32 * selection_line + selection_col * 2));
+ mvprintw(23, 60, "q : quit this tool");
+ attroff(A_STANDOUT);
+
+ refresh();
+
+ move(selection_line, selection_col*5);
+
+ ch = getch();
+ switch(ch)
+ {
+ case 65: /* Up */
+ if (selection_line > 0)
+ selection_line--;
+ break;
+ case 66: /* Down */
+ if (selection_line < ((data_len - 1)/ 16)) {
+ selection_line++;
+ if ((selection_line == ((data_len - 1)/ 16)) && (selection_col > (data_len - 1) % 16))
+ selection_col = (data_len - 1) % 16;
+ }
+ break;
+ case 68: /* Left */
+ if (selection_col > 0)
+ selection_col--;
+ break;
+ case 67: /* Right */
+ if (((selection_line != ((data_len - 1)/ 16)) && selection_col < 15) || (selection_col < ((data_len - 1) % 16)))
+ selection_col++;
+ break;
+ case 10: /* Validate */
+ mvprintw(selection_line, selection_col * 5, " ");
+ echo();
+ mvscanw(selection_line, selection_col * 5, "%4X", &value);
+ noecho();
+ data[16 * selection_line + selection_col] = value;
+ break;
+ }
+ }
+
+ erase();
+ refresh();
+
+ return 0;
+}
+
+int map_data_mailbox(unsigned short data[ANYBUS_DATA_LEN], int data_len)
+{
+ int i, line_offset, selection_line = 0, selection_col = 0;
+ char ch = 0;
+
+ erase();
+ refresh();
+
+ if (data_len == 0) {
+ mvprintw(2, 2, "/!\\ No datas available in this mailbox message.");
+ mvprintw(3, 2, " Press any key to continue.");
+ getch();
+ erase();
+ refresh();
+ return -1;
+ }
+
+ while ((ch != 'q') && (ch != 'Q'))
+ {
+
+ line_offset = 0;
+
+ for (i = 0 ; i < data_len ; i++) {
+
+ if ((i % 16 == 0) && (i != 0))
+ line_offset++;
+
+ mvprintw(line_offset, (i % 16) * 5 + 4, " ");
+
+ if ((selection_col == i % 16) && (selection_line == line_offset))
+ attron(A_STANDOUT);
+
+ mvprintw(line_offset, (i % 16) * 5, "%04X", data[i]);
+
+ if ((selection_col == i % 16) && (selection_line == line_offset))
+ attroff(A_STANDOUT);
+ }
+
+ attron(A_STANDOUT);
+ for (i = 0 ; i < 80 ; i++) {
+ mvprintw(23, i, " ");
+ }
+
+ mvprintw(23, 1, "Address: 0x%03X", (32 * selection_line + selection_col * 2));
+ mvprintw(23, 60, "q : quit this tool");
+ attroff(A_STANDOUT);
+
+ refresh();
+
+ move(selection_line, selection_col*5);
+
+ ch = getch();
+ switch(ch)
+ {
+ case 65: /* Up */
+ if (selection_line > 0)
+ selection_line--;
+ break;
+ case 66: /* Down */
+ if (selection_line < ((data_len - 1)/ 16)) {
+ selection_line++;
+ if ((selection_line == ((data_len - 1)/ 16)) && (selection_col > (data_len - 1) % 16))
+ selection_col = (data_len - 1) % 16;
+ }
+ break;
+ case 68: /* Left */
+ if (selection_col > 0)
+ selection_col--;
+ break;
+ case 67: /* Right */
+ if (((selection_line != ((data_len - 1)/ 16)) && selection_col < 15) || (selection_col < ((data_len - 1) % 16)))
+ selection_col++;
+ break;
+ }
+ }
+
+ erase();
+ refresh();
+
+ return 0;
+}
diff --git a/target/packages/anybus-tools/mailbox.h b/target/packages/anybus-tools/mailbox.h
new file mode 100644
index 0000000..f2b7cf1
--- /dev/null
+++ b/target/packages/anybus-tools/mailbox.h
@@ -0,0 +1,17 @@
+#ifndef MAILBOX_HEADER
+#define MAILBOX_HEADER
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ncurses.h>
+#include <net/anybus_interface.h>
+#include <sys/ioctl.h>
+
+#include "win.h"
+
+int mailbox(int fd_device);
+int edit_data_mailbox(unsigned short data[ANYBUS_DATA_LEN], int data_len);
+int map_data_mailbox(unsigned short data[ANYBUS_DATA_LEN], int data_len);
+
+#endif
diff --git a/target/packages/anybus-tools/map_output.c b/target/packages/anybus-tools/map_output.c
new file mode 100644
index 0000000..4658c85
--- /dev/null
+++ b/target/packages/anybus-tools/map_output.c
@@ -0,0 +1,105 @@
+/*
+ * Watch HMS Anybus output data area memory
+ *
+ * Copyright (C) 2011 Armadeus Systems
+ * Kevin JOLY <jol...@gm...>
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include "map_output.h"
+
+int map_output(int sock, int fd_device)
+{
+ int i, line_offset, selection_line = 0, selection_col = 0, ret;
+ char ch = 0;
+ struct anybus_frame frame;
+ fd_set readfs_list;
+
+ memset (frame.data, 0, sizeof(frame.data));
+
+ if ((ret = ioctl(fd_device, ANYBUS_MAP_OUTPUT, frame.data)) < 0) {
+ return ret;
+ }
+
+ while ((ch != 'q') && (ch != 'Q')) {
+
+ FD_ZERO(&readfs_list);
+ FD_SET(0, &readfs_list);
+ FD_SET(sock, &readfs_list);
+
+ line_offset = 0;
+
+ for (i = 0 ; i < 0x100 ; i++) {
+
+ if ((i % 16 == 0) && (i != 0))
+ line_offset++;
+
+ if ((selection_col == i % 16) && (selection_line == line_offset))
+ attron(A_STANDOUT);
+
+ mvprintw(line_offset, (i % 16) * 5, "%04X", frame.data[i]);
+ if ((selection_col == i % 16) && (selection_line == line_offset))
+ attroff(A_STANDOUT);
+ }
+
+ attron(A_STANDOUT);
+ for (i = 0 ; i < 80 ; i++) {
+ mvprintw(23, i, " ");
+ }
+ mvprintw(23, 1, "Anybus address: 0x%03X", (32 * selection_line + selection_col * 2));
+ mvprintw(23, 30, "Fieldbus address: 0x%02X", (16 * selection_line + selection_col));
+ mvprintw(23, 60, "q : quit this tool");
+ attroff(A_STANDOUT);
+
+ move(selection_line, selection_col*5);
+ refresh();
+
+ if((ret = select(sock + 1, &readfs_list, NULL, NULL, NULL)) < 0)
+ {
+ return ret;
+ }
+
+ if(FD_ISSET(sock, &readfs_list)) {
+ if((ret = recv(sock, (void *)&frame, sizeof(frame), 0)) < 0)
+ return ret;
+ }
+
+ if(FD_ISSET(0, &readfs_list)) {
+ ch = getch();
+ switch(ch) {
+ case 65: /* Up */
+ if (selection_line > 0)
+ selection_line--;
+ break;
+ case 66: /* Down */
+ if (selection_line < 15)
+ selection_line++;
+ break;
+ case 68: /* Left */
+ if (selection_col > 0)
+ selection_col--;
+ break;
+ case 67: /* Right */
+ if (selection_col < 15)
+ selection_col++;
+ break;
+ }
+ }
+
+ }
+
+ return 0;
+}
diff --git a/target/packages/anybus-tools/map_output.h b/target/packages/anybus-tools/map_output.h
new file mode 100644
index 0000000..a84ffec
--- /dev/null
+++ b/target/packages/anybus-tools/map_output.h
@@ -0,0 +1,15 @@
+#ifndef MAP_OUTPUT_HEADER
+#define MAP_OUTPUT_HEADER
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ncurses.h>
+#include <net/anybus_interface.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+
+int map_output(int sock, int fd_device);
+
+#endif
diff --git a/target/packages/anybus-tools/read_reg.c b/target/packages/anybus-tools/read_reg.c
new file mode 100644
index 0000000..a7e7565
--- /dev/null
+++ b/target/packages/anybus-tools/read_reg.c
@@ -0,0 +1,74 @@
+/*
+ * Read a specific in the HMS Anybus module.
+ *
+ * Copyright (C) 2011 Armadeus Systems
+ * Kevin JOLY <jol...@gm...>
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include "read_reg.h"
+
+int read_register(int fd_device)
+{
+ WINDOW *win;
+ struct anybus_register anybus_reg = {.address = 0, .value = 0 };
+ int i, ret = 0;
+ char ch;
+ int height = 8;
+ int width = 22;
+ int starty = 2;
+ int startx = (COLS -width) / 2;
+ unsigned short value;
+
+ win = newwin(height, width, starty, startx);
+ box(win, 0, 0);
+
+ wattron(win, A_STANDOUT);
+ for (i = 1 ; i < width - 1; i++)
+ mvwprintw(win, 0, i, " ");
+
+ mvwprintw(win, 0, (width - strlen("Read register")) / 2, "Read register");
+ wattroff(win, A_STANDOUT);
+
+ mvwprintw(win, 2, 2, "Address :");
+ mvwprintw(win, 3, 2, "Value :");
+ mvwprintw(win, height - 2, 1, "q : quit this tool");
+
+ while ((ch != 'q') && (ch != 'Q')) {
+ wattron(win, A_STANDOUT);
+ mvwprintw(win, 2, width - 4, "%03X", anybus_reg.address);
+ wattroff(win, A_STANDOUT);
+ mvwprintw(win, 3, width - 3, "%02X", anybus_reg.value);
+
+ wmove(win, 2, width-4);
+ wrefresh(win);
+ ch = getch();
+
+ if (ch == 10) {
+ mvwprintw(win, 2, width - 4, " ");
+ echo();
+ mvwscanw(win, 2, width - 4, "%3X", &value);
+ noecho();
+ anybus_reg.address = value;
+ if ((ret = ioctl(fd_device, ANYBUS_READ_REG, &anybus_reg)) < 0) {
+ return ret;
+ }
+ }
+ }
+
+ endwin();
+ return 0;
+}
diff --git a/target/packages/anybus-tools/read_reg.h b/target/packages/anybus-tools/read_reg.h
new file mode 100644
index 0000000..7c1c6e8
--- /dev/null
+++ b/target/packages/anybus-tools/read_reg.h
@@ -0,0 +1,13 @@
+#ifndef READ_REG_HEADER
+#define READ_REG_HEADER
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ncurses.h>
+#include <string.h>
+#include <net/anybus_interface.h>
+#include <sys/ioctl.h>
+
+int read_register(int fd_device);
+
+#endif
diff --git a/target/packages/anybus-tools/sel_iface.c b/target/packages/anybus-tools/sel_iface.c
new file mode 100644
index 0000000..afc9891
--- /dev/null
+++ b/target/packages/anybus-tools/sel_iface.c
@@ -0,0 +1,137 @@
+/*
+ * Select the anybus interface used for communicate with the HMS Anybus module
+ *
+ * Copyright (C) 2011 Armadeus Systems
+ * Kevin JOLY <jol...@gm...>
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include "sel_iface.h"
+
+int is_anybus(char *iface_name)
+{
+ char buffer[IFACE_NAME_LEN];
+
+ strncpy(buffer, iface_name, strlen(iface_name) - 1);
+
+ if(strcmp(buffer, "anybus")) /* False */
+ return 0;
+ else
+ return 1;
+}
+
+int print_menu_iface(char **ifaces_names,int n_ifaces)
+{
+ int startx, starty, width, height;
+ int ch = 0, selection = 0;
+ WINDOW *win_menu_iface;
+
+ if (n_ifaces < 1) {
+ mvprintw(2, 2, "/!\\ No anybus interface found.");
+ refresh();
+ return -1;
+ }
+
+ height = 12;
+ width = 40;
+ starty = 3;
+ startx = (COLS - width) / 2;
+
+ win_menu_iface = create_new_win(height, width, starty, startx, "Select anybus interface");
+
+ mvwprintw(win_menu_iface, height - 2, 2, "'q' : quit");
+ refresh_menu(win_menu_iface, selection, width, ifaces_names, n_ifaces);
+ wrefresh(win_menu_iface);
+
+ while((ch != 'q') && (ch != 'Q') && (ch != 10)) {
+ ch = wgetch(win_menu_iface);
+ switch(ch)
+ {
+ case 65:
+ if (selection > 0)
+ selection--;
+ break;
+ case 66:
+ if (selection < n_ifaces -1)
+ selection++;
+ break;
+ }
+
+ refresh_menu(win_menu_iface, selection, width, ifaces_names, n_ifaces);
+ wrefresh(win_menu_iface);
+ }
+
+ if ((ch == 'q') || (ch == 'Q'))
+ selection = -1;
+ endwin();
+
+ return selection;
+}
+
+char* sel_iface()
+{
+ FILE *f_net_dev;
+ char *ifaces_names[IFACE_NAME_LEN];
+ char buffer[IFACE_NAME_LEN];
+ int n_ifaces = 0;
+ int iface_char = 0;
+ char read_char = 0;
+ int i, selection;
+
+ f_net_dev = fopen("/proc/net/dev", "r");
+
+ if (f_net_dev == NULL) {
+ printf("Unable to open /proc/net/dev\n");
+ return NULL;
+ }
+
+ while(!feof(f_net_dev)) {
+ read_char = getc(f_net_dev);
+
+ if (read_char == '\n') {
+ iface_char = 0; /* Reset the interface name cursor */
+ } else if ((iface_char < IFACE_NAME_LEN)) { /* Prevent from buffer overflow */
+ if (read_char == ':') /* End of interface name */
+ read_char = '\0';
+ if (read_char != ' ') { /* Do not copy whitespace */
+ buffer[iface_char] = read_char;
+ iface_char++; /* Increment the interface name cursor */
+ }
+ if (read_char == '\0') {
+ if (is_anybus(buffer)) {
+ ifaces_names[n_ifaces] = (char*)malloc(IFACE_NAME_LEN);
+ strcpy(ifaces_names[n_ifaces], buffer);
+ n_ifaces++; /* Increment the interface cursor */
+ }
+ }
+ }
+ }
+
+ fclose(f_net_dev);
+
+ selection = print_menu_iface(ifaces_names, n_ifaces);
+
+ /* Free useless ifaces_names */
+ for(i = 0; i < n_ifaces; i++) {
+ if (i != selection)
+ free(ifaces_names[i]);
+ }
+
+ if (selection < 0)
+ return NULL;
+
+ return ifaces_names[selection];
+}
diff --git a/target/packages/anybus-tools/sel_iface.h b/target/packages/anybus-tools/sel_iface.h
new file mode 100644
index 0000000..220684e
--- /dev/null
+++ b/target/packages/anybus-tools/sel_iface.h
@@ -0,0 +1,15 @@
+#ifndef SEL_IFACE_HEADER
+#define SEL_IFACE_HEADER
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ncurses.h>
+
+#include "win.h"
+
+#define IFACE_NAME_LEN 10
+
+char* sel_iface();
+
+#endif
diff --git a/target/packages/anybus-tools/win.c b/target/packages/anybus-tools/win.c
new file mode 100644
index 0000000..b2f50ce
--- /dev/null
+++ b/target/packages/anybus-tools/win.c
@@ -0,0 +1,158 @@
+/*
+ * Some basics menu operations with ncurses...
+ *
+ * Copyright (C) 2011 Armadeus Systems
+ * Kevin JOLY <jol...@gm...>
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include "win.h"
+
+WINDOW *create_new_win(int height, int width, int starty, int startx, const char *title)
+{
+ WINDOW *win;
+ int i;
+
+ win = newwin(height, width, starty, startx);
+ box(win, 0, 0);
+
+ wattron(win, A_STANDOUT);
+
+ for (i = 1 ; i < width - 1; i++)
+ mvwprintw(win, 0, i, " ");
+
+ mvwprintw(win, 0, (width - strlen(title)) / 2, title);
+
+ wattroff(win, A_STANDOUT);
+
+ wrefresh(win);
+
+ return win;
+}
+
+void refresh_menu(WINDOW *win, int selection, int width, char **choices, int n_choices)
+{
+ int i;
+
+ for (i = 0; i < n_choices ; i++) {
+ if ( i == selection)
+ wattron(win, A_BOLD);
+ mvwprintw(win, 2 + i, ((width - strlen(choices[i])) / 2) - 2, " ");
+ mvwprintw(win, 2 + i, (width - strlen(choices[i])) / 2, choices[i]);
+ if ( i == selection)
+ wattroff(win, A_BOLD);
+ }
+
+ mvwprintw(win, 2 + selection, (width - strlen(choices[selection])) / 2 - 2, "*");
+ wmove(win, 2 + selection, ((width - strlen(choices[selection])) / 2) - 2);
+}
+
+void refresh_form_mail_to_send(WINDOW *win, int selection, int width, struct mailbox_msg mail, char focused)
+{
+ int i;
+ char *choices[] = { "Message ID", "Message information", "Command Number", "Data size","Extended Word 1", "Extended Word 2",
+ "Extended Word 3", "Extended Word 4", "Extended Word 5", "Extended Word 6", "Extended Word 7", "Extended Word 8", "Data"};
+
+ for (i = 0; i < 14 ; i++) {
+
+ if ( i < 13)
+ mvwprintw(win, 2 + i, 2, choices[i]);
+
+ if ((i == selection) && (focused == 1))
+ wattron(win, A_STANDOUT);
+
+ switch(i) {
+ case 0:
+ mvwprintw(win, 2 + i, width - 5, "%04X", mail.id);
+ break;
+ case 1:
+ mvwprintw(win, 2 + i, width - 5, "%04X", mail.msg_information);
+ break;
+ case 2:
+ mvwprintw(win, 2 + i, width - 5, "%04X", mail.command_number);
+ break;
+ case 3:
+ mvwprintw(win, 2 + i, width - 5, "%04X", mail.data_size);
+ break;
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ mvwprintw(win, 2 + i, width - 5, "%04X", mail.extended_word[i - 4]);
+ break;
+ case 12:
+ mvwprintw(win, 2 + i, width - 9, "< EDIT >");
+ break;
+ case 13:
+ mvwprintw(win, 3 + i, (width - strlen("< SEND >")) / 2, "< SEND >");
+ break;
+ }
+
+ if ((i == selection) && (focused == 1))
+ wattroff(win, A_STANDOUT);
+ }
+
+}
+
+void refresh_form_received_mail(WINDOW *win, int selection, int width, struct mailbox_msg mail, char focused)
+{
+ int i;
+ char *choices[] = { "Message ID", "Messages informations", "Command Number", "Data size","Extended Word 1", "Extended Word 2",
+ "Extended Word 3", "Extended Word 4", "Extended Word 5", "Extended Word 6", "Extended Word 7", "Extended Word 8", "Data"};
+
+ for (i = 0; i < 13 ; i++) {
+
+ mvwprintw(win, 2 + i, 2, choices[i]);
+
+ if ((i == selection) && (focused == 1))
+ wattron(win, A_STANDOUT);
+
+ switch(i) {
+ case 0:
+ mvwprintw(win, 2 + i, width - 5, "%04X", mail.id);
+ break;
+ case 1:
+ mvwprintw(win, 2 + i, width - 5, "%04X", mail.msg_information);
+ break;
+ case 2:
+ mvwprintw(win, 2 + i, width - 5, "%04X", mail.command_number);
+ break;
+ case 3:
+ mvwprintw(win, 2 + i, width - 5, "%04X", mail.data_size);
+ break;
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ mvwprintw(win, 2 + i, width - 5, "%04X", mail.extended_word[i - 4]);
+ break;
+ case 12:
+ mvwprintw(win, 2 + i, width - 9, "< VIEW >");
+ }
+
+ if ((i == selection) && (focused == 1))
+ wattroff(win, A_STANDOUT);
+ }
+
+}
diff --git a/target/packages/anybus-tools/win.h b/target/packages/anybus-tools/win.h
new file mode 100644
index 0000000..5cdeb56
--- /dev/null
+++ b/target/packages/anybus-tools/win.h
@@ -0,0 +1,15 @@
+#ifndef WIN_HEADER
+#define WIN_HEADER
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ncurses.h>
+#include <net/anybus_interface.h>
+
+WINDOW *create_new_win(int height, int width, int starty, int startx, const char *title);
+void refresh_menu(WINDOW *win, int selection, int width, char **choices, int n_choices);
+void refresh_form_mail_to_send(WINDOW *win, int selection, int width, struct mailbox_msg mail, char focused);
+void refresh_form_received_mail(WINDOW *win, int selection, int width, struct mailbox_msg mail, char focused);
+
+#endif
diff --git a/target/packages/anybusd/Makefile b/target/packages/anybusd/Makefile
deleted file mode 100644
index 1b7e984..0000000
--- a/target/packages/anybusd/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Default values for local compiling:
-ARMADEUS_BASE_DIR=../../..
--include $(ARMADEUS_BASE_DIR)/Makefile.in
-
-STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
-INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
-INITD_DIR:=$(ARMADEUS_ROOTFS_DIR)/etc/init.d/
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
-
-DEFINES=TARGET
-CFLAGS= -Wall
-
-EXEC=anybusd
-INIT_SCRIPT=S60anybusd
-
-default: $(EXEC)
-
-all: $(EXEC)
-
-anybusd.o: anybusd.c
- $(CC) $(CFLAGS) -c -o $@ $^
-
-$(EXEC): anybusd.o
- $(CC) $(LDFLAGS) -o $@ $^
-
-clean:
- rm -rf anybusd
- rm -rf *.o
-
-.PHONY: clean install uninstall
-
diff --git a/target/packages/anybusd/S60anybusd b/target/packages/anybusd/S60anybusd
deleted file mode 100755
index 9a169fd..0000000
--- a/target/packages/anybusd/S60anybusd
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-
-start() {
- modprobe anybus_interface_platform
- modprobe anybus_interface
- echo -n "Starting Anybusd: "
- anybusd
- echo "done"
-}
-
-stop() {
- rmmod anybus_interface
- rmmod anybus_interface_platform
- echo -n "Stopping Anybusd: "
- killall anybusd
- echo "done"
-}
-
-restart() {
- stop
- start
-}
-
-# See how we were called.
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart|reload)
- restart
- ;;
- *)
- echo "Usage: $0 {start|stop|reload|restart}"
- exit 1
-esac
-
-exit $?
-
diff --git a/target/packages/anybusd/anybusd.c b/target/packages/anybusd/anybusd.c
deleted file mode 100644
index 6ec51cb..0000000
--- a/target/packages/anybusd/anybusd.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Daemon for interface with HMS Anybus module through FPGA.
- * (Driver anybus_interface is required)
- *
- * Copyright (C) 2011 <jol...@gm...>
- * Armadeus Systems
- *
- * 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, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <signal.h>
-#include <arpa/inet.h>
-#include <errno.h>
-
-#define DAEMON_NAME "anybusd"
-#define PID_FILE "/var/run/anybusd.pid"
-
-/* ctrl_register on Wishbone bus */
-#define ANYBUS_TRANSMIT 0x0002
-#define ANYBUS_RECEIVE 0x0004
-#define ANYBUS_4_CLOCK_CYCLES 0x0020
-#define ANYBUS_TRANSMISSION_ERROR 0x0001
-
-/* FPGA registers*/
-#define CTRL_REG 0x0002
-#define ADDRESS_REG 0x0004
-#define DATA_REG 0x0006
-
-#define ACTION 0x10
-
-/* Indication register on AnyBus module */
-#define ANYBUS_SEND 0x80
-#define ANYBUS_ACK 0x40
-
-#define PORT 4037
-
-void signal_handler(int sig)
-{
- switch(sig) {
- case SIGTERM:
- exit(0);
- break;
- default:
- break;
- }
-}
-
-void write_fpga(unsigned short address, unsigned short value, void* fpga_mem)
-{
- *(unsigned short*)(fpga_mem+(address)) = value;
-}
-
-unsigned short read_fpga(unsigned short address, void* fpga_mem)
-{
- return *(unsigned short*)(fpga_mem+(address));
-}
-
-int write_anybus(unsigned short address, unsigned short value, void* fpga_mem)
-{
- int n;
- write_fpga(ADDRESS_REG, address, fpga_mem);
- write_fpga(DATA_REG, value, fpga_mem);
- write_fpga(CTRL_REG, ANYBUS_4_CLOCK_CYCLES | ANYBUS_TRANSMIT, fpga_mem);
-
- if ((n = read_fpga(CTRL_REG, fpga_mem)) & ANYBUS_TRANSMISSION_ERROR) {
- return -1;
- }
- return 0;
-}
-
-int read_anybus(unsigned short address, void* fpga_mem)
-{
- int n;
- write_fpga(ADDRESS_REG, address, fpga_mem);
- write_fpga(CTRL_REG, ANYBUS_4_CLOCK_CYCLES | ANYBUS_RECEIVE, fpga_mem);
-
- if ((n = read_fpga(CTRL_REG, fpga_mem)) & ANYBUS_TRANSMISSION_ERROR) {
- return -1;
- }
- return read_fpga(DATA_REG, fpga_mem);
-}
-
-int main(int argc, char *argv[])
-{
- int file_mem;
- socklen_t sinsize;
- int listen...
[truncated message content] |
|
From: Fabien M <fa...@us...> - 2011-07-28 15:43:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 20825e320da906c7d5c3fadfdb0b0e4a0234d803 (commit)
via e41009b1c5d408b1d71b6d892868985056415494 (commit)
via 615033d57c042c294a77e34fe518170f87ce7438 (commit)
from b8cc4c9250c03c6ec7a0ff7eea1c53f29fd88112 (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 20825e320da906c7d5c3fadfdb0b0e4a0234d803
Author: Kevin JOLY <jol...@gm...>
Date: Thu Jul 28 17:13:47 2011 +0200
[FIRMWARE] Add script and design for Anybus
Signed-off-by: Kevin JOLY <jol...@gm...>
commit e41009b1c5d408b1d71b6d892868985056415494
Author: Kevin JOLY <jol...@gm...>
Date: Thu Jul 28 16:47:58 2011 +0200
[LINUX] Update anybus_interface driver : add ioctl command, compatibility with select(), and more ...
Signed-off-by: Kevin JOLY <jol...@gm...>
commit 615033d57c042c294a77e34fe518170f87ce7438
Author: Kevin JOLY <jol...@gm...>
Date: Thu Jul 28 16:47:59 2011 +0200
[BUILDROOT][DEMOS] Remove init script for automatically configure can interface
Signed-off-by: Kevin JOLY <jol...@gm...>
-----------------------------------------------------------------------
Summary of changes:
.../440-armadeus-add-hms-anybus-driver.patch | 223 +++++++++++++++----
.../apf51_anybus_interface.bin} | Bin 340604 -> 340604 bytes
firmware/pod_scripts/apf51_anybus_interface.pod | 50 +++++
target/demos/mcp25020_ctrl/Makefile | 3 -
target/demos/mcp25020_ctrl/init_can.sh | 10 -
5 files changed, 226 insertions(+), 60 deletions(-)
copy firmware/{wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin => pod_scripts/apf51_anybus_interface.bin} (82%)
create mode 100644 firmware/pod_scripts/apf51_anybus_interface.pod
delete mode 100755 target/demos/mcp25020_ctrl/init_can.sh
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch
index 1ea1107..f3b7eb0 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch
@@ -6,7 +6,7 @@ Signed-off-by: Kevin JOLY <jol...@gm...>
Index: linux-2.6.38.1/drivers/net/Kconfig
===================================================================
--- linux-2.6.38.1.orig/drivers/net/Kconfig 2011-03-23 21:04:47.000000000 +0100
-+++ linux-2.6.38.1/drivers/net/Kconfig 2011-07-18 10:53:53.509814002 +0200
++++ linux-2.6.38.1/drivers/net/Kconfig 2011-07-27 17:57:17.822242001 +0200
@@ -3422,4 +3422,12 @@
To compile this driver as a module, choose M here: the
module will be called vmxnet3.
@@ -23,7 +23,7 @@ Index: linux-2.6.38.1/drivers/net/Kconfig
Index: linux-2.6.38.1/drivers/net/Makefile
===================================================================
--- linux-2.6.38.1.orig/drivers/net/Makefile 2011-03-23 21:04:47.000000000 +0100
-+++ linux-2.6.38.1/drivers/net/Makefile 2011-07-18 10:53:53.509814002 +0200
++++ linux-2.6.38.1/drivers/net/Makefile 2011-07-27 17:57:17.826242000 +0200
@@ -242,6 +242,7 @@
obj-$(CONFIG_R8169) += r8169.o
obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
@@ -35,8 +35,8 @@ Index: linux-2.6.38.1/drivers/net/Makefile
Index: linux-2.6.38.1/drivers/net/anybus_interface.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/drivers/net/anybus_interface.c 2011-07-18 14:59:25.049814001 +0200
-@@ -0,0 +1,1061 @@
++++ linux-2.6.38.1/drivers/net/anybus_interface.c 2011-07-27 18:25:21.902241997 +0200
+@@ -0,0 +1,1178 @@
+/*
+ * HMS Anybus module driver
+ *
@@ -68,6 +68,8 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+#include <linux/cdev.h>
+#include <linux/fs.h>
+#include <linux/string.h>
++#include <linux/poll.h>
++
+
+#include <net/anybus_interface.h>
+
@@ -88,6 +90,8 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+#define INPUT_AREA_END 0x1FF
+#define OUTPUT_AREA_START 0x200
+#define OUTPUT_AREA_END 0x3FF
++#define FBCTRL_AREA_START 0x640
++#define FBCTRL_AREA_END 0x7FD
+#define MB_IN_ID 0x400
+#define MB_IN_MSG_INFO 0x402
+#define MB_IN_COM 0x404
@@ -142,9 +146,12 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+#define EN_FBON 0x04
+#define EN_RST 0x08
+
++static DECLARE_WAIT_QUEUE_HEAD(anybus_read_wait_queue);
++
+unsigned short anybus_indication_reg_status;
+bool sending_mailbox_message;
+bool received_mailbox_message;
++bool module_initialized;
+bool anybus_available;
+
+struct platform_device *platform_dev;
@@ -265,7 +272,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ application_indication_register(anybus_priv,
+ area | access_type | ACTION_REQ);
+
-+ while (!(anybus_indication_reg_status & area))
++ while (!(anybus_indication_reg_status & area)) /* TODO : Timeout */
+ cpu_relax();
+
+ return;
@@ -352,7 +359,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ cpu_relax();
+ }
+
-+ skb = dev_alloc_skb(sizeof(frame));
++ skb = dev_alloc_skb(sizeof(frame) + 2);
+ if (!skb) {
+ dev_err(&platform_dev->dev, "Low memory space available.\n");
+ dev->stats.rx_dropped++;
@@ -362,7 +369,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+
+ skb->dev = dev;
+ skb->protocol = IPPROTO_UDP;
-+
++skb->pkt_type = PACKET_BROADCAST;
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+ dev->stats.rx_packets++;
@@ -409,6 +416,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ if ((anybus_indication_reg_status ^ application_indication_reg)
+ & AB_MOUT) {
+ received_mailbox_message = 1;
++ wake_up_interruptible(&anybus_read_wait_queue);
+ }
+
+ if ((anybus_indication_reg_status ^ application_indication_reg)
@@ -488,23 +496,26 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+{
+ int i;
+
++ if (message.data_size > ANYBUS_MAILBOX_DATA_LEN)
++ message.data_size = ANYBUS_MAILBOX_DATA_LEN;
++
+ sending_mailbox_message = 1;
+
-+ anybus_reg_write(anybus_priv, MB_IN_ID, message.id/256);
-+ anybus_reg_write(anybus_priv, MB_IN_ID + 1, message.id%256);
++ anybus_reg_write(anybus_priv, MB_IN_ID, message.id >> 8);
++ anybus_reg_write(anybus_priv, MB_IN_ID + 1, message.id & 0xFF);
+
+ anybus_reg_write(anybus_priv, MB_IN_MSG_INFO,
-+ message.msg_information/256);
++ message.msg_information >> 8);
+ anybus_reg_write(anybus_priv, MB_IN_MSG_INFO + 1,
-+ message.msg_information%256);
++ message.msg_information & 0xFF);
+
-+ anybus_reg_write(anybus_priv, MB_IN_COM, message.command_number/256);
++ anybus_reg_write(anybus_priv, MB_IN_COM, message.command_number >> 8);
+ anybus_reg_write(anybus_priv, MB_IN_COM + 1,
-+ message.command_number%256);
++ message.command_number & 0xFF);
+
-+ anybus_reg_write(anybus_priv, MB_IN_DATA_SIZE, message.data_size/256);
++ anybus_reg_write(anybus_priv, MB_IN_DATA_SIZE, message.data_size >> 8);
+ anybus_reg_write(anybus_priv, MB_IN_DATA_SIZE + 1,
-+ message.data_size%256);
++ message.data_size & 0xFF);
+
+ anybus_reg_write(anybus_priv, 0x0408, 0x00);
+ anybus_reg_write(anybus_priv, 0x0409, 0x01);
@@ -519,22 +530,22 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ anybus_reg_write(anybus_priv, 0x040f, 0x00);
+
+ for (i = 0 ; i < 8 ; i++) {
-+ anybus_reg_write(anybus_priv, MB_IN_EXTENDED + i,
-+ message.extended_word[i]/256);
-+ anybus_reg_write(anybus_priv, MB_IN_EXTENDED + 1 + i,
-+ message.extended_word[i]%256);
++ anybus_reg_write(anybus_priv, MB_IN_EXTENDED + i*2,
++ message.extended_word[i] >> 8);
++ anybus_reg_write(anybus_priv, MB_IN_EXTENDED + i*2 + 1,
++ message.extended_word[i] & 0xFF);
+ }
+
+ for (i = 0 ; i < message.data_size/2 ; i++) {
+ anybus_reg_write(anybus_priv, MB_IN_DATA + i*2,
-+ message.data[i]/256);
++ message.data[i] >> 8);
+ anybus_reg_write(anybus_priv, MB_IN_DATA + 1 + i*2,
-+ message.data[i]%256);
++ message.data[i] & 0xFF);
+ }
+
+ application_indication_register(anybus_priv, AP_MIN);
+
-+ while (sending_mailbox_message) {
++ while (sending_mailbox_message) { /* XXX */
+ msleep(100);
+ i++;
+ if (i > 10)
@@ -549,34 +560,34 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ int i;
+ struct mailbox_msg message;
+
-+ message.id = anybus_reg_read(anybus_priv, MB_OUT_ID) * 256;
++ message.id = anybus_reg_read(anybus_priv, MB_OUT_ID) << 8;
+ message.id = anybus_reg_read(anybus_priv, MB_OUT_ID + 1) + message.id;
+
+ message.msg_information = anybus_reg_read(anybus_priv,
-+ MB_OUT_MSG_INFO) * 256;
++ MB_OUT_MSG_INFO) << 8;
+ message.msg_information = anybus_reg_read(anybus_priv,
+ MB_OUT_MSG_INFO + 1) + message.msg_information;
+
+ message.command_number = anybus_reg_read(anybus_priv,
-+ MB_OUT_COM) * 256;
++ MB_OUT_COM) << 8;
+ message.command_number = anybus_reg_read(anybus_priv, MB_OUT_COM + 1)
+ + message.command_number;
+
+ message.data_size = anybus_reg_read(anybus_priv,
-+ MB_OUT_DATA_SIZE) * 256;
++ MB_OUT_DATA_SIZE) << 8;
+ message.data_size = anybus_reg_read(anybus_priv, MB_OUT_DATA_SIZE + 1)
+ + message.data_size;
+
+ for (i = 0 ; i < 8 ; i++) {
+ message.extended_word[i] = anybus_reg_read(anybus_priv,
-+ MB_OUT_EXTENDED + i) * 256;
++ MB_OUT_EXTENDED + i) << 8;
+ message.extended_word[i] = anybus_reg_read(anybus_priv,
+ MB_OUT_EXTENDED + 1 + i) + message.extended_word[i];
+ }
+
+ for (i = 0 ; i < message.data_size ; i++) {
+ message.data[i] = anybus_reg_read(anybus_priv,
-+ MB_OUT_DATA + i*2) * 256;
++ MB_OUT_DATA + i*2) << 8;
+ message.data[i] = anybus_reg_read(anybus_priv,
+ MB_OUT_DATA + 1 + i*2) + message.data[i];
+ }
@@ -592,6 +603,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+
+ free_irq(dev->irq, (void *)dev);
+ gpio_set_value(anybus_priv->gpio_reset, 1);
++ module_initialized = 0;
+
+ return 0;
+}
@@ -689,6 +701,13 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ sending_mailbox_message = 0;
+ anybus_available = 0;
+ received_mailbox_message = 0;
++ module_initialized = 0;
++
++if (!netif_carrier_ok(dev))
++ netif_carrier_on(dev);
++
++if (netif_queue_stopped(dev))
++ netif_wake_queue(dev);
+
+ if (request_irq(dev->irq, anybus_interrupt, anybus_priv->irq_flags,
+ dev->name, (void *)dev) < 0) {
@@ -707,7 +726,8 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ if (i > 50) {
+ i = 0;
+ anybus_stop(dev);
-+ dev_err(&platform_dev->dev, "The module is unavailable.\n");
++ dev_err(&platform_dev->dev,
++ "The module is unavailable.\n");
+ return -ETIMEDOUT;
+ }
+ }
@@ -825,6 +845,8 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ return -EAGAIN;
+ }
+
++ module_initialized = 1;
++
+ return set_mac_address(dev);
+}
+
@@ -845,15 +867,15 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ anybus_area_allocation(anybus_priv, AB_IN, LOCK);
+
+ for (i = 0 ; i < frame->len * 2; i += 2) {
-+ if (anybus_reg_write(anybus_priv,
-+ INPUT_AREA_START + i + frame->reg * 2, frame->data[i] >> 8)) {
++ if (anybus_reg_write(anybus_priv, INPUT_AREA_START + i +
++ frame->reg * 2, frame->data[i/2] >> 8)) {
+ dev->stats.tx_errors++;
+ dev->stats.tx_dropped++;
+ return -EAGAIN;
+ }
+ dev->stats.tx_bytes++;
+ if (anybus_reg_write(anybus_priv, INPUT_AREA_START + i +
-+ frame->reg * 2 + 1, frame->data[i] & 0xFF)) {
++ frame->reg * 2 + 1, frame->data[i/2] & 0xFF)) {
+ dev->stats.tx_errors++;
+ dev->stats.tx_dropped++;
+ return -EAGAIN;
@@ -864,49 +886,142 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ anybus_area_deallocation(anybus_priv, AB_IN, UNLOCK);
+
+ dev->stats.tx_packets++;
++ dev_kfree_skb(skb);
+
+ return 0;
+}
+
-+long anybus_ioctl(struct file *filp, unsigned int cmd, unsigned long ptr_mail)
++long anybus_ioctl(struct file *filp, unsigned int cmd, unsigned long ptr_data)
+{
+ struct net_device *dev = dev_get_drvdata(&platform_dev->dev);
+ struct anybus_private *anybus_priv = netdev_priv(dev);
+ struct mailbox_msg mail;
++ struct anybus_register *anybus_reg;
++ int i, ret;
++
++ if (cmd == ANYBUS_MB_READ) {
+
-+ memcpy(&mail, (struct mailbox_msg *)ptr_mail,
++ memcpy(&mail, (struct mailbox_msg *)ptr_data,
+ sizeof(struct mailbox_msg));
+
-+ if (cmd == MB_READ) {
+ if (received_mailbox_message) {
+ mail = read_mailbox_message(anybus_priv);
-+ memcpy((struct mailbox_msg *)ptr_mail,
++ memcpy((struct mailbox_msg *)ptr_data,
+ &mail,
+ sizeof(struct mailbox_msg));
++ received_mailbox_message = 0;
+ } else
+ return -EAGAIN;
-+ } else if (cmd == MB_WRITE) {
-+ memcpy(&mail, (struct mailbox_msg *)ptr_mail,
++ } else if (cmd == ANYBUS_MB_WRITE) {
++
++ memcpy(&mail, (struct mailbox_msg *)ptr_data,
+ sizeof(struct mailbox_msg));
+
+ if (write_mailbox_message(anybus_priv, mail))
+ return -EIO;
++ } else if (cmd == ANYBUS_MAP_INPUT) {
++
++ anybus_area_allocation(anybus_priv, AB_IN, LOCK);
++
++ for (i = 0 ; i <= (INPUT_AREA_END - INPUT_AREA_START) / 2;
++ i++) {
++ ret = anybus_reg_read(anybus_priv,
++ i * 2 + INPUT_AREA_START);
++ if (ret < 0)
++ return -EAGAIN;
++
++ ((unsigned short *)(ptr_data))[i] = ret << 8;
++
++ ret = anybus_reg_read(anybus_priv,
++ i * 2 + INPUT_AREA_START + 1);
++ if (ret < 0)
++ return -EAGAIN;
++ ((unsigned short *)(ptr_data))[i] |= ret;
++ }
++
++ anybus_area_deallocation(anybus_priv, AB_IN, UNLOCK);
++
++ } else if (cmd == ANYBUS_MAP_OUTPUT) {
++
++ anybus_area_allocation(anybus_priv, AB_OUT, LOCK);
++
++ for (i = 0 ; i <= (OUTPUT_AREA_END - OUTPUT_AREA_START) / 2;
++ i++) {
++ ret = anybus_reg_read(anybus_priv,
++ i * 2 + OUTPUT_AREA_START);
++ if (ret < 0)
++ return -EAGAIN;
++
++ ((unsigned short *)(ptr_data))[i] = ret << 8;
++
++ ret = anybus_reg_read(anybus_priv,
++ i * 2 + OUTPUT_AREA_START + 1);
++
++ if (ret < 0)
++ return -EAGAIN;
++ ((unsigned short *)(ptr_data))[i] |= ret;
++
++ }
++
++ anybus_area_deallocation(anybus_priv, AB_OUT, UNLOCK);
++ } else if (cmd == ANYBUS_READ_REG) {
++ anybus_reg = (struct anybus_register *)ptr_data;
++
++ if ((anybus_reg->address <= INPUT_AREA_END) &&
++ (anybus_reg->address >= INPUT_AREA_START))
++ anybus_area_allocation(anybus_priv, AB_IN, LOCK);
++ else if ((anybus_reg->address <= OUTPUT_AREA_END) &&
++ (anybus_reg->address >= OUTPUT_AREA_START))
++ anybus_area_allocation(anybus_priv, AB_OUT, LOCK);
++ else if ((anybus_reg->address <= FBCTRL_AREA_END) &&
++ (anybus_reg->address >= FBCTRL_AREA_START))
++ anybus_area_allocation(anybus_priv, AB_FBCTRL, LOCK);
++ else if (anybus_reg->address > ANYBUS_INDICATION_REG)
++ return -EINVAL;
++
++ ret = anybus_reg_read(anybus_priv, anybus_reg->address);
++ if (ret < 0)
++ return -EAGAIN;
++
++ anybus_reg->value = ret;
++
++ if ((anybus_reg->address <= INPUT_AREA_END) &&
++ (anybus_reg->address >= INPUT_AREA_START))
++ anybus_area_deallocation(anybus_priv, AB_IN, LOCK);
++ else if ((anybus_reg->address <= OUTPUT_AREA_END) &&
++ (anybus_reg->address >= OUTPUT_AREA_START))
++ anybus_area_deallocation(anybus_priv, AB_OUT, LOCK);
++ else if ((anybus_reg->address <= FBCTRL_AREA_END) &&
++ (anybus_reg->address >= FBCTRL_AREA_START))
++ anybus_area_deallocation(anybus_priv, AB_FBCTRL, LOCK);
+ }
+
+ return 0;
+}
+
++static unsigned int anybus_poll(struct file *filp, struct poll_table_struct *p)
++{
++ poll_wait(filp, &anybus_read_wait_queue, p);
++
++ if ((received_mailbox_message) && (module_initialized))
++ return POLLIN;
++ else
++ return 0;
++}
++
+static const struct file_operations anybus_fops = {
-+ .unlocked_ioctl = anybus_ioctl
++ .unlocked_ioctl = anybus_ioctl,
++.poll = anybus_poll
+};
+
+static void anybus_setup(struct net_device *dev)
+{
-+ dev->type = ARPHRD_VOID;
++ dev->type = ARPHRD_NONE;
+ dev->mtu = sizeof(struct anybus_frame);
+ dev->hard_header_len = 0;
+ dev->addr_len = 0;
+ dev->tx_queue_len = 10;
++dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
+
+ dev->flags = IFF_NOARP;
+ dev->features = NETIF_F_NO_CSUM;
@@ -929,6 +1044,8 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ int err = 0;
+ u16 id;
+
++ module_initialized = 0;
++
+ resource_memory = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ resource_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+ resource_reset = platform_get_resource(pdev, IORESOURCE_IO, 0);
@@ -1023,7 +1140,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ }
+
+ strcpy(dev_mailbox_name, dev->name);
-+ strcat(dev_mailbox_name, "_mailbox");
++ strcat(dev_mailbox_name, "_device");
+ if (device_create(anybus_priv->anybus_class, NULL,
+ anybus_priv->cdev->dev, NULL, dev_mailbox_name) == NULL) {
+ dev_err(&pdev->dev, "Unable to create device\n");
@@ -1101,8 +1218,8 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
Index: linux-2.6.38.1/include/net/anybus_interface.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/include/net/anybus_interface.h 2011-07-18 15:04:17.953813999 +0200
-@@ -0,0 +1,45 @@
++++ linux-2.6.38.1/include/net/anybus_interface.h 2011-07-26 18:03:35.000000000 +0200
+@@ -0,0 +1,57 @@
+/*
+ * Definitions for the module HMS anybus
+ *
@@ -1127,24 +1244,36 @@ Index: linux-2.6.38.1/include/net/anybus_interface.h
+#ifndef LINUX_ANYBUS_INTERFACE
+#define LINUX_ANYBUS_INTERFACE
+
-+#define MB_READ 0
-+#define MB_WRITE 1
++#define ANYBUS_MB_READ 10
++#define ANYBUS_MB_WRITE 11
++#define ANYBUS_MAP_INPUT 12
++#define ANYBUS_MAP_OUTPUT 13
++#define ANYBUS_READ_REG 14
++
++
++#define ANYBUS_DATA_LEN 256
++#define ANYBUS_MAILBOX_DATA_LEN 256
+
+#define ANYBUS_INTERFACE_DRIVER_NAME "anybus_interface"
+
+struct anybus_frame {
+ int reg;
-+ unsigned short data[256];
++ unsigned short data[ANYBUS_DATA_LEN];
+ int len;
+};
+
++struct anybus_register {
++ unsigned short address;
++ unsigned short value;
++};
++
+struct mailbox_msg {
+ unsigned short id;
+ unsigned short msg_information;
+ unsigned short command_number;
+ unsigned short data_size;
+ unsigned short extended_word[8];
-+ unsigned short data[256];
++ unsigned short data[ANYBUS_DATA_LEN];
+};
+
+#endif
diff --git a/firmware/wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin b/firmware/pod_scripts/apf51_anybus_interface.bin
similarity index 82%
copy from firmware/wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin
copy to firmware/pod_scripts/apf51_anybus_interface.bin
index 96c84f8..cff0df0 100644
Binary files a/firmware/wishbone_example/wishbone_example51/binaries/top_wishbone_example51_lx9.bin and b/firmware/pod_scripts/apf51_anybus_interface.bin differ
diff --git a/firmware/pod_scripts/apf51_anybus_interface.pod b/firmware/pod_scripts/apf51_anybus_interface.pod
new file mode 100644
index 0000000..6101634
--- /dev/null
+++ b/firmware/pod_scripts/apf51_anybus_interface.pod
@@ -0,0 +1,50 @@
+create anybus
+selectplatform standard.apf51
+addinstance components.anybus_interface
+addinstance components.pod_gpio
+connectpin irq_mngr00.irq.irqport.0 pod_gpio00.irq.interrupt
+setgeneric anybus_interface00.gpio_reset 240
+setgeneric anybus_interface00.gpio_irq 337
+connectpin anybus_interface00.anybus_interface.anybus_interface_addr.0 apf51.fpga.IO_L43P_GCLK5_M1DQ4_1
+connectpin anybus_interface00.anybus_interface.anybus_interface_addr.1 apf51.fpga.IO_L43N_GCLK4_M1DQ5_1
+connectpin anybus_interface00.anybus_interface.anybus_interface_addr.2 apf51.fpga.IO_L45P_A1_M1LDQS_1
+connectpin anybus_interface00.anybus_interface.anybus_interface_addr.3 apf51.fpga.IO_L45N_A0_M1LDQSN_1
+connectpin anybus_interface00.anybus_interface.anybus_interface_addr.4 apf51.fpga.IO_L30P_A21_M1RESET_1_NOTLX4
+connectpin anybus_interface00.anybus_interface.anybus_interface_addr.5 apf51.fpga.IO_L30N_A20_M1A11_1_NOTLX4
+connectpin anybus_interface00.anybus_interface.anybus_interface_addr.6 apf51.fpga.IO_L31P_A19_M1CKE_1_NOTLX4
+connectpin anybus_interface00.anybus_interface.anybus_interface_addr.7 apf51.fpga.IO_L31N_A18_M1A12_1_NOTLX4
+connectpin anybus_interface00.anybus_interface.anybus_interface_addr.8 apf51.fpga.IO_L32P_A17_M1A8_1_NOTLX4
+connectpin anybus_interface00.anybus_interface.anybus_interface_addr.9 apf51.fpga.IO_L32N_A16_M1A9_1_NOTLX4
+connectpin anybus_interface00.anybus_interface.anybus_interface_addr.10 apf51.fpga.IO_L83P_3
+connectpin anybus_interface00.anybus_interface.anybus_interface_addr.11 apf51.fpga.IO_L40N_M3DQ7_3
+connectpin anybus_interface00.anybus_interface.anybus_interface_data.0 apf51.fpga.IO_L34P_A13_M1WE_1_NOTLX4
+connectpin anybus_interface00.anybus_interface.anybus_interface_data.1 apf51.fpga.IO_L34N_A12_M1BA2_1_NOTLX4
+connectpin anybus_interface00.anybus_interface.anybus_interface_data.2 apf51.fpga.IO_L36P_A9_M1BA0_1
+connectpin anybus_interface00.anybus_interface.anybus_interface_data.3 apf51.fpga.IO_L36N_A8_M1BA1_1
+connectpin anybus_interface00.anybus_interface.anybus_interface_data.4 apf51.fpga.IO_L38P_A5_M1CLK_1
+connectpin anybus_interface00.anybus_interface.anybus_interface_data.5 apf51.fpga.IO_L38N_A4_M1CLKN_1
+connectpin anybus_interface00.anybus_interface.anybus_interface_data.6 apf51.fpga.IO_L40P_GCLK11_M1A5_1
+connectpin anybus_interface00.anybus_interface.anybus_interface_data.7 apf51.fpga.IO_L40N_GCLK10_M1A6_1
+connectpin anybus_interface00.anybus_interface.anybus_interface_ce apf51.fpga.IO_L53P_M3CKE_3
+connectpin anybus_interface00.anybus_interface.anybus_interface_oe apf51.fpga.IO_L40P_M3DQ6_3
+connectpin anybus_interface00.anybus_interface.anybus_interface_rw apf51.fpga.IO_L44N_GCLK20_M3A6_3
+connectpin anybus_interface00.anybus_interface.anybus_interface_busy apf51.fpga.IO_L46N_FOE_B_M1DQ3_1
+project.connectpin pod_gpio00.pod_gpio.gpio.0 apf51.fpga.IO_L42N_GCLK24_M3LDM_3
+connectpin pod_gpio00.pod_gpio.gpio.0 apf51.fpga.IO_L42N_GCLK24_M3LDM_3
+connectpin pod_gpio00.pod_gpio.gpio.1 apf51.fpga.IO_L46P_FCS_B_M1DQS2_1
+project.connectbus imx51_wb16_wrapper00.mwb16 anybus_interface00.swb16
+connectbus imx51_wb16_wrapper00.mwb16 anybus_interface00.swb16
+connectbus imx51_wb16_wrapper00.mwb16 pod_gpio00.swb16
+connectbus rstgen_syscon00.candroutput imx51_wb16_wrapper00.candrinput
+connectbus imx51_wb16_wrapper00.mwb16 irq_mngr00.swb16
+intercon imx51_wb16_wrapper00.mwb16
+intercon rstgen_syscon00.candroutput
+intercon imx51_wb16_wrapper00.mwb16
+top
+synthesis.selecttoolchain ise
+synthesis.generateproject
+driver.selecttoolchain armadeus
+driver.generateproject
+selectprojecttree your_armadeus_directory/target/linux/modules/fpga/POD
+driver.selectprojecttree your_armadeus_directory/target/linux/modules/fpga/POD
+driver.copydrivers
diff --git a/target/demos/mcp25020_ctrl/Makefile b/target/demos/mcp25020_ctrl/Makefile
index 10882e3..1c35652 100644
--- a/target/demos/mcp25020_ctrl/Makefile
+++ b/target/demos/mcp25020_ctrl/Makefile
@@ -4,7 +4,6 @@ ARMADEUS_BASE_DIR=../../..
STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
-INIT_DIR:=$(ARMADEUS_ROOTFS_DIR)/etc/init.d
CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
@@ -26,12 +25,10 @@ $(EXEC): mcp25020_ctrl.o
install: $(EXEC)
mkdir -p $(INSTALL_DIR)
cp $^ $(INSTALL_DIR)
- cp init_can.sh $(INIT_DIR)/S50init_can.sh
$(STRIP) $(INSTALL_DIR)/$^
uninstall:
rm -f $(INSTALL_DIR)/$(EXEC)
- rm -f $(INIT_DIR)/S50init_can.sh
clean:
rm -rf mcp25020_ctrl
diff --git a/target/demos/mcp25020_ctrl/init_can.sh b/target/demos/mcp25020_ctrl/init_can.sh
deleted file mode 100755
index 3365644..0000000
--- a/target/demos/mcp25020_ctrl/init_can.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-modprobe can
-modprobe can-dev
-modprobe can-raw
-modprobe mcp251x
-ip link set can0 up type can bitrate 125000
-ifconfig can0 up
-
-exit 0
hooks/post-receive
--
armadeus
|
|
From: Gwenhael <gwe...@us...> - 2011-07-27 17:15: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 b8cc4c9250c03c6ec7a0ff7eea1c53f29fd88112 (commit)
from 947357b0be407ffeae9abe5d2d8acf7b788e9850 (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 b8cc4c9250c03c6ec7a0ff7eea1c53f29fd88112
Author: gwenhael <gw...@tr...>
Date: Wed Jul 27 19:04:49 2011 +0200
[BUILDROOT] Update Xenomai version and adds patch to compile again
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2010.11/072-xenomai-package.patch | 82 ++++++++++++++------
1 files changed, 58 insertions(+), 24 deletions(-)
diff --git a/patches/buildroot/2010.11/072-xenomai-package.patch b/patches/buildroot/2010.11/072-xenomai-package.patch
index 4e78bd1..d1ec084 100644
--- a/patches/buildroot/2010.11/072-xenomai-package.patch
+++ b/patches/buildroot/2010.11/072-xenomai-package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-06-26 16:36:21.000000000 +0200
-+++ buildroot/package/Config.in 2011-06-26 16:42:59.000000000 +0200
-@@ -208,6 +208,7 @@
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -208,6 +208,7 @@ source "package/usb_modeswitch/Config.in
source "package/usbmount/Config.in"
source "package/usbutils/Config.in"
source "package/wipe/Config.in"
@@ -16,9 +16,9 @@ Index: buildroot/package/Config.in
Index: buildroot/linux/linux.mk
===================================================================
---- buildroot.orig/linux/linux.mk 2011-06-26 16:36:21.000000000 +0200
-+++ buildroot/linux/linux.mk 2011-06-26 16:42:57.000000000 +0200
-@@ -117,6 +117,9 @@
+--- buildroot.orig/linux/linux.mk
++++ buildroot/linux/linux.mk
+@@ -117,6 +117,9 @@ ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX26_DIR)/Makefile
(ln -sf $(ARMADEUS_TOPDIR)/target/linux/modules/ $(LINUX26_DIR)/drivers/armadeus)
endif
@@ -30,8 +30,8 @@ Index: buildroot/linux/linux.mk
Index: buildroot/package/xenomai/Config.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/Config.in 2011-06-26 17:03:04.000000000 +0200
+--- /dev/null
++++ buildroot/package/xenomai/Config.in
@@ -0,0 +1,44 @@
+config BR2_PACKAGE_XENOMAI
+ bool "Xenomai"
@@ -79,9 +79,9 @@ Index: buildroot/package/xenomai/Config.in
+endif # BR2_PACKAGE_XENOMAI
Index: buildroot/package/xenomai/xenomai.mk
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/xenomai.mk 2011-06-26 17:02:00.000000000 +0200
-@@ -0,0 +1,119 @@
+--- /dev/null
++++ buildroot/package/xenomai/xenomai.mk
+@@ -0,0 +1,121 @@
+#############################################################
+#
+# xenomai :
@@ -100,7 +100,7 @@ Index: buildroot/package/xenomai/xenomai.mk
+KERNEL_VERSION=$(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
+KERNEL_DIR:=$(BUILD_DIR)/linux-$(KERNEL_VERSION)
+
-+XENOMAI_VERSION:=2.4.8
++XENOMAI_VERSION:=2.5.2
+XENOMAI_SOURCE:=xenomai-$(XENOMAI_VERSION).tar.bz2
+XENOMAI_SITE:=http://download.gna.org/xenomai/stable
+XENOMAI_DIR:=$(BUILD_DIR)/xenomai-$(XENOMAI_VERSION)
@@ -150,6 +150,8 @@ Index: buildroot/package/xenomai/xenomai.mk
+ cat package/xenomai/xeno-kernel.config >> $(KERNEL_DIR)/.config
+ toolchain/patch-kernel.sh $(KERNEL_DIR) package/xenomai \
+ \*-after-adeos-\*.patch
++ toolchain/patch-kernel.sh $(XENOMAI_DIR) package/xenomai \
++ \*-xenomai-\*.patch
+ touch $@
+
+xenomai-patch-kernel: $(KERNEL_DIR)/.patched.xenomai
@@ -203,9 +205,9 @@ Index: buildroot/package/xenomai/xenomai.mk
+endif
Index: buildroot/package/xenomai/xeno-kernel.config
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/xenomai/xeno-kernel.config 2011-06-26 16:36:21.000000000 +0200
-@@ -0,0 +1,59 @@
+--- /dev/null
++++ buildroot/package/xenomai/xeno-kernel.config
+@@ -0,0 +1,69 @@
+CONFIG_XENOMAI=y
+CONFIG_XENO_OPT_NUCLEUS=y
+CONFIG_XENO_OPT_PERVASIVE=y
@@ -227,6 +229,8 @@ Index: buildroot/package/xenomai/xeno-kernel.config
+# CONFIG_XENO_OPT_TIMER_WHEEL is not set
+CONFIG_XENO_HW_FPU=y
+CONFIG_XENO_SKIN_NATIVE=y
++CONFIG_XENO_OPT_NATIVE_BUFFER=y
++# CONFIG_XENO_OPT_NOWARN_DEPRECATED is not set
+CONFIG_XENO_OPT_NATIVE_PERIOD=0
+CONFIG_XENO_OPT_NATIVE_PIPE=y
+CONFIG_XENO_OPT_NATIVE_PIPE_BUFSZ=1024
@@ -244,7 +248,12 @@ Index: buildroot/package/xenomai/xeno-kernel.config
+# 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_SCHED_CLASSES is not set
++CONFIG_XENO_OPT_SEM_HEAPSZ=12
++CONFIG_XENO_OPT_GLOBAL_SEM_HEAPSZ=12
+# CONFIG_XENO_OPT_DEBUG_POSIX is not set
++CONFIG_XENO_OPT_TIMING_VIRTICK=1000
++CONFIG_XENO_HW_UNLOCKED_SWITCH=y
+# CONFIG_XENO_SKIN_PSOS is not set
+# CONFIG_XENO_SKIN_UITRON is not set
+# CONFIG_XENO_SKIN_VRTX is not set
@@ -255,9 +264,12 @@ Index: buildroot/package/xenomai/xeno-kernel.config
+CONFIG_XENO_OPT_RTDM_FILDES=128
+CONFIG_XENO_OPT_RTDM_SELECT=y
+# CONFIG_XENO_DRIVERS_16550A is not set
++# CONFIG_XENO_DRIVERS_ANALOGY is not set
++# CONFIG_XENO_DRIVERS_RTIPC is not set
+CONFIG_XENO_DRIVERS_TIMERBENCH=m
+CONFIG_XENO_DRIVERS_KLATENCY=m
+CONFIG_XENO_DRIVERS_IRQBENCH=m
++# CONFIG_XENO_DRIVERS_SIGTEST is not set
+CONFIG_XENO_DRIVERS_SWITCHTEST=m
+# CONFIG_XENO_DRIVERS_CAN is not set
+# CONFIG_ARM_FCSE is not set
@@ -265,11 +277,10 @@ Index: buildroot/package/xenomai/xeno-kernel.config
+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 2011-06-26 16:36:21.000000000 +0200
+--- /dev/null
++++ buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.patch
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-imx/include/mach/imxfb.h
++++ b/arch/arm/mach-imx/include/mach/imxfb.h
@@ -283,8 +294,8 @@ Index: buildroot/package/xenomai/00-before-adeos-compatibility_with_armadeus.pat
+ #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 2011-06-26 16:36:21.000000000 +0200
+--- /dev/null
++++ buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_with_gpio_generated_interrupts.patch
@@ -0,0 +1,23 @@
+Corrects Freeze problem with MX2 when Adeos is active and
+application/driver uses interruption on GPIO
@@ -309,10 +320,33 @@ Index: buildroot/package/xenomai/01-after-adeos-prevent_system_freeze_on_mxc_wit
+
+ gpio_irq_no = port[i].virtual_irq_start;
+
+Index: buildroot/package/xenomai/02-xenomai-makes_cond_torture_test_compiles_again.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/xenomai/02-xenomai-makes_cond_torture_test_compiles_again.patch
+@@ -0,0 +1,18 @@
++--- a/src/testsuite/unit/cond-torture.c
+++++ b/src/testsuite/unit/cond-torture.c
++@@ -47,13 +47,13 @@
++
++ pthread_mutexattr_init(&mattr);
++ pthread_mutexattr_settype(&mattr, type);
++- if (pi != 0)
+++ if (pi != 0){
++ #ifdef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL
++ pthread_mutexattr_setprotocol(&mattr, PTHREAD_PRIO_INHERIT);
++
++ err = pthread_mutex_init(mutex, &mattr);
++ #else
++- else {
+++ } else {
++ err = ENOSYS;
++ goto out;
++ }
Index: buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-06-26 16:36:21.000000000 +0200
+--- /dev/null
++++ buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_with_old_pthread_api.patch
@@ -0,0 +1,21 @@
+Spinlocks are not implemented in uClibc when using old pthread API.
+Xenomai (clock_test) uses this flag to enable or not spinlocking and so, if
@@ -337,8 +371,8 @@ Index: buildroot/toolchain/uClibc/uClibc-0.9.29-spin_locks_are_not_supported_wit
+ #define _POSIX_SPAWN 200112L
Index: buildroot/toolchain/uClibc/uClibc-0.9.30.3-spin_locks_are_not_supported_with_old_pthread_api.patch
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/toolchain/uClibc/uClibc-0.9.30.3-spin_locks_are_not_supported_with_old_pthread_api.patch 2011-06-26 16:36:21.000000000 +0200
+--- /dev/null
++++ buildroot/toolchain/uClibc/uClibc-0.9.30.3-spin_locks_are_not_supported_with_old_pthread_api.patch
@@ -0,0 +1,22 @@
+Spinlocks are not implemented in uClibc when using old pthread API.
+Xenomai (clock_test) uses this flag to enable or not spinlocking and so, if
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2011-07-25 19:22:52
|
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 947357b0be407ffeae9abe5d2d8acf7b788e9850 (commit)
via b0ecd40b40d76eba922cad2dd58d7feb2134b77f (commit)
from b6f0502f2636609f5b4be76fcc87bde2d4248983 (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 947357b0be407ffeae9abe5d2d8acf7b788e9850
Author: Eric Jarrige <jo...@ar...>
Date: Mon Jul 25 21:27:22 2011 +0200
[BUILDROOT] Fix the exported variable ARMADEUS_ROOTFS_TAR since the naming rules changed with BUILDROOT-2010.11
commit b0ecd40b40d76eba922cad2dd58d7feb2134b77f
Author: Eric Jarrige <jo...@ar...>
Date: Mon Jul 25 21:23:18 2011 +0200
[BUILDROOT][APF9328] do not generate u-boot.brec file anymore - deprecated as u-boot recover script is now standard for all platforms
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 2 +-
.../target/device/armadeus/apf9328/Makefile.in | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 4ae61e9..c589c85 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,7 +36,7 @@ BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_DIR)/output/toolchain
BUILDROOT_BUILD_DIR:=$(BUILDROOT_DIR)/output/build
ARMADEUS_BINARIES:=$(BUILDROOT_DIR)/output/images
ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_DIR)/output/target
-ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.arm.tar
+ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.tar
ARMADEUS_LINUX_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/linux-$(ARMADEUS_LINUX_VERSION)
ARMADEUS_LINUX_PATCH_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/linux/kernel-patches/$(ARMADEUS_LINUX_VERSION)
diff --git a/buildroot/target/device/armadeus/apf9328/Makefile.in b/buildroot/target/device/armadeus/apf9328/Makefile.in
index f3f0eb4..ca82cd7 100644
--- a/buildroot/target/device/armadeus/apf9328/Makefile.in
+++ b/buildroot/target/device/armadeus/apf9328/Makefile.in
@@ -1,3 +1,2 @@
-TARGETS+=u-boot-brec
U_BOOT_BIN=u-boot.bin
U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-07-18 14:14: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 b6f0502f2636609f5b4be76fcc87bde2d4248983 (commit)
via 699ef41f7b0f2ff5ada7c8965a524e23367e6d8d (commit)
from 2403b93f95e677fbee6aeda72f447c42aef8c198 (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 b6f0502f2636609f5b4be76fcc87bde2d4248983
Author: Kevin JOLY <jol...@gm...>
Date: Mon Jul 18 16:05:20 2011 +0200
Update HMS Anybus driver: add some define to anybus_interface.h and make irq reachable by interruption number instead of GPIO number
Signed-off-by: Kevin JOLY <jol...@gm...>
commit 699ef41f7b0f2ff5ada7c8965a524e23367e6d8d
Author: Kevin JOLY <jol...@gm...>
Date: Mon Jul 18 16:05:19 2011 +0200
Increase number of IRQ on APF27 and APF51
Signed-off-by: Kevin JOLY <jol...@gm...>
-----------------------------------------------------------------------
Summary of changes:
...apf27-armadeus-increases_board_irq_number.patch | 10 ++++----
.../2.6.38/400-armadeus-add_apf51_module.patch | 22 ++++++++++----------
.../440-armadeus-add-hms-anybus-driver.patch | 13 ++++++++---
3 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/323-apf27-armadeus-increases_board_irq_number.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/323-apf27-armadeus-increases_board_irq_number.patch
index 99995aa..6b18fca 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/323-apf27-armadeus-increases_board_irq_number.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/323-apf27-armadeus-increases_board_irq_number.patch
@@ -2,16 +2,16 @@ Increases board reserved interrupts to 32. This is needed for the APF27 FPGA.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/irqs.h
+Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
---- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/irqs.h 2010-11-25 20:27:40.000000000 +0100
-+++ linux-2.6.36/arch/arm/plat-mxc/include/mach/irqs.h 2010-11-25 20:28:54.000000000 +0100
-@@ -47,6 +47,8 @@
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h 2011-07-18 15:16:49.921814000 +0200
+@@ -51,6 +51,8 @@
#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
#define MXC_BOARD_IRQS 80
+#elif defined CONFIG_MACH_APF27
-+#define MXC_BOARD_IRQS 32
++#define MXC_BOARD_IRQS 48
#else
#define MXC_BOARD_IRQS 16
#endif
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
index 8dd6ebc..e3c2c71 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-06-05 23:00:49.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-06-06 13:08:52.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-07-18 15:25:44.569814001 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-07-18 15:29:36.529814001 +0200
@@ -162,4 +162,16 @@
Include support for MX50 reference design platform (RDP) board. This
includes specific configurations for the board and its peripherals.
@@ -21,8 +21,8 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
endif
Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-03-23 21:04:47.000000000 +0100
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-06-06 13:08:52.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-07-18 15:25:44.553814000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-07-18 15:29:36.517814001 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
@@ -34,7 +34,7 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c 2011-06-06 12:08:57.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c 2011-07-18 15:26:44.681814002 +0200
@@ -0,0 +1,500 @@
+/*
+ * Support for APF51 System On Module
@@ -538,8 +538,8 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
+
Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-06-05 23:00:51.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-06-05 23:00:52.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-07-18 15:25:44.517814000 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-07-18 15:26:44.681814002 +0200
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
@@ -560,14 +560,14 @@ Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
}
Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
---- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-06-05 23:00:52.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h 2011-06-05 23:00:52.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-07-18 15:25:44.533814001 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h 2011-07-18 15:29:50.097814001 +0200
@@ -53,6 +53,8 @@
#define MXC_BOARD_IRQS 80
#elif defined CONFIG_MACH_APF27
- #define MXC_BOARD_IRQS 32
+ #define MXC_BOARD_IRQS 48
+#elif defined CONFIG_MACH_APF51
-+#define MXC_BOARD_IRQS 80 /* WM8311 needs 64 of them and FPGA 16 */
++#define MXC_BOARD_IRQS 96 /* WM8311 needs 64 of them and FPGA 16 */
#else
#define MXC_BOARD_IRQS 16
#endif
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch
index 6f9acf9..1ea1107 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch
@@ -35,7 +35,7 @@ Index: linux-2.6.38.1/drivers/net/Makefile
Index: linux-2.6.38.1/drivers/net/anybus_interface.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/drivers/net/anybus_interface.c 2011-07-18 11:39:19.637814000 +0200
++++ linux-2.6.38.1/drivers/net/anybus_interface.c 2011-07-18 14:59:25.049814001 +0200
@@ -0,0 +1,1061 @@
+/*
+ * HMS Anybus module driver
@@ -968,7 +968,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+
+ dev_set_drvdata(&pdev->dev, dev);
+
-+ dev->irq = gpio_to_irq(resource_irq->start);
++ dev->irq = resource_irq->start;
+
+ dev->netdev_ops = &anybus_netdev_ops;
+
@@ -1101,8 +1101,8 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
Index: linux-2.6.38.1/include/net/anybus_interface.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/include/net/anybus_interface.h 2011-07-18 11:42:44.385814001 +0200
-@@ -0,0 +1,40 @@
++++ linux-2.6.38.1/include/net/anybus_interface.h 2011-07-18 15:04:17.953813999 +0200
+@@ -0,0 +1,45 @@
+/*
+ * Definitions for the module HMS anybus
+ *
@@ -1127,6 +1127,11 @@ Index: linux-2.6.38.1/include/net/anybus_interface.h
+#ifndef LINUX_ANYBUS_INTERFACE
+#define LINUX_ANYBUS_INTERFACE
+
++#define MB_READ 0
++#define MB_WRITE 1
++
++#define ANYBUS_INTERFACE_DRIVER_NAME "anybus_interface"
++
+struct anybus_frame {
+ int reg;
+ unsigned short data[256];
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-07-18 11:30:59
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 2403b93f95e677fbee6aeda72f447c42aef8c198 (commit)
via de6259ba0fb4b02d500c1cccd928e8fd3bb2e425 (commit)
from d17ee90acbecc8ef1c6198c78ab42ca78f9fba46 (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 2403b93f95e677fbee6aeda72f447c42aef8c198
Author: Kevin JOLY <jol...@gm...>
Date: Mon Jul 18 11:45:17 2011 +0200
Add ioctl support in Anybus driver
Signed-off-by: Kevin JOLY <jol...@gm...>
commit de6259ba0fb4b02d500c1cccd928e8fd3bb2e425
Author: Kevin JOLY <jol...@gm...>
Date: Mon Jul 18 11:45:16 2011 +0200
Add extension .patch to the kernel patch 440-add-hms-anybus-driver
Signed-off-by: Kevin JOLY <jol...@gm...>
-----------------------------------------------------------------------
Summary of changes:
...er => 440-armadeus-add-hms-anybus-driver.patch} | 212 ++++++++++++++------
1 files changed, 147 insertions(+), 65 deletions(-)
rename buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/{440-add-hms-anybus-driver => 440-armadeus-add-hms-anybus-driver.patch} (83%)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-add-hms-anybus-driver b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch
similarity index 83%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-add-hms-anybus-driver
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch
index d812b1f..6f9acf9 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-add-hms-anybus-driver
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch
@@ -1,7 +1,12 @@
+Add HMS Anybus module support
+
+Signed-off-by: Kevin JOLY <jol...@gm...>
+---
+
Index: linux-2.6.38.1/drivers/net/Kconfig
===================================================================
---- linux-2.6.38.1.orig/drivers/net/Kconfig 2011-07-11 14:30:35.704127431 +0200
-+++ linux-2.6.38.1/drivers/net/Kconfig 2011-07-11 14:16:06.000000000 +0200
+--- linux-2.6.38.1.orig/drivers/net/Kconfig 2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/drivers/net/Kconfig 2011-07-18 10:53:53.509814002 +0200
@@ -3422,4 +3422,12 @@
To compile this driver as a module, choose M here: the
module will be called vmxnet3.
@@ -17,8 +22,8 @@ Index: linux-2.6.38.1/drivers/net/Kconfig
endif # NETDEVICES
Index: linux-2.6.38.1/drivers/net/Makefile
===================================================================
---- linux-2.6.38.1.orig/drivers/net/Makefile 2011-07-11 14:30:41.352127431 +0200
-+++ linux-2.6.38.1/drivers/net/Makefile 2011-07-11 14:16:57.000000000 +0200
+--- linux-2.6.38.1.orig/drivers/net/Makefile 2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/drivers/net/Makefile 2011-07-18 10:53:53.509814002 +0200
@@ -242,6 +242,7 @@
obj-$(CONFIG_R8169) += r8169.o
obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
@@ -30,8 +35,8 @@ Index: linux-2.6.38.1/drivers/net/Makefile
Index: linux-2.6.38.1/drivers/net/anybus_interface.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/drivers/net/anybus_interface.c 2011-07-11 13:58:03.000000000 +0200
-@@ -0,0 +1,993 @@
++++ linux-2.6.38.1/drivers/net/anybus_interface.c 2011-07-18 11:39:19.637814000 +0200
+@@ -0,0 +1,1061 @@
+/*
+ * HMS Anybus module driver
+ *
@@ -60,11 +65,12 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+#include <linux/delay.h>
+#include <linux/etherdevice.h>
+#include <linux/gpio.h>
++#include <linux/cdev.h>
++#include <linux/fs.h>
++#include <linux/string.h>
+
+#include <net/anybus_interface.h>
+
-+#define ANYBUS_INTERFACE_DRIVER_NAME "anybus_interface"
-+
+/* Interface registers */
+#define IFRG_ID 0x00
+#define IFRG_CTRL 0x02
@@ -141,20 +147,14 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+bool received_mailbox_message;
+bool anybus_available;
+
-+struct mailbox_msg {
-+ unsigned short id;
-+ unsigned short msg_information;
-+ unsigned short command_number;
-+ unsigned short data_size;
-+ unsigned short extended_word[8];
-+ unsigned short data[256];
-+};
++struct platform_device *platform_dev;
+
+struct anybus_private {
+ void __iomem *reg_base;
+ int gpio_reset;
+ int irq_flags;
-+ struct device *dev;
++ struct cdev *cdev;
++ struct class *anybus_class;
+};
+
+static u16 anybus_interface_read(struct anybus_private *anybus_priv, int reg)
@@ -215,7 +215,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, APPLICATION_INDICATION_REG);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev, "Unable to read on anybus module\n");
++ dev_err(&platform_dev->dev, "Unable to read on anybus module\n");
+ return -EIO;
+ }
+
@@ -250,7 +250,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+
+ if (anybus_reg_write(anybus_priv, APPLICATION_INDICATION_REG,
+ register_status) < 0) {
-+ dev_err(anybus_priv->dev,
++ dev_err(&platform_dev->dev,
+ "Unable to write on anybus module\n");
+ return -EIO;
+ }
@@ -302,7 +302,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, ANYBUS_INDICATION_REG);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev, "Communication error.\n");
++ dev_err(&platform_dev->dev, "Communication error.\n");
+ return -EIO;
+ }
+
@@ -344,7 +344,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, ANYBUS_INDICATION_REG);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev, "Communication error.\n");
++ dev_err(&platform_dev->dev, "Communication error.\n");
+ return -EIO;
+ }
+
@@ -354,7 +354,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+
+ skb = dev_alloc_skb(sizeof(frame));
+ if (!skb) {
-+ dev_err(anybus_priv->dev, "Low memory space available.\n");
++ dev_err(&platform_dev->dev, "Low memory space available.\n");
+ dev->stats.rx_dropped++;
+ }
+
@@ -384,7 +384,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, ANYBUS_INDICATION_REG);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev, "Communication error.\n");
++ dev_err(&platform_dev->dev, "Communication error.\n");
+ return IRQ_NONE;
+ }
+
@@ -395,7 +395,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, APPLICATION_INDICATION_REG);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev, "Communication error.\n");
++ dev_err(&platform_dev->dev, "Communication error.\n");
+ return IRQ_NONE;
+ }
+
@@ -423,7 +423,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ANYBUS_INDICATION_REG);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev,
++ dev_err(&platform_dev->dev,
+ "Communication error.\n");
+ return IRQ_NONE;
+ }
@@ -435,14 +435,14 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, EVENT_NOTIFICATION_CAUSE);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev,
++ dev_err(&platform_dev->dev,
+ "Unable to read in the Anybus module register\n");
+ return IRQ_NONE;
+ }
+
+ if (anybus_reg_write(anybus_priv, EVENT_NOTIFICATION_CAUSE,
+ 0x00) < 0) {
-+ dev_err(anybus_priv->dev,
++ dev_err(&platform_dev->dev,
+ "Unable to read in the Anybus module register\n");
+ return IRQ_NONE;
+ }
@@ -458,7 +458,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ANYBUS_INDICATION_REG);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev,
++ dev_err(&platform_dev->dev,
+ "Communication error.\n");
+ return IRQ_NONE;
+ }
@@ -470,12 +470,12 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, ANYBUS_INDICATION_REG);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev, "Communication error.\n");
++ dev_err(&platform_dev->dev, "Communication error.\n");
+ return IRQ_NONE;
+ }
+
+ if (application_indication_register(anybus_priv, AP_EVENT)) {
-+ dev_err(anybus_priv->dev, "Communication error.\n");
++ dev_err(&platform_dev->dev, "Communication error.\n");
+ return IRQ_NONE;
+ }
+ }
@@ -483,10 +483,10 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ return IRQ_HANDLED;
+}
+
-+int write_mailbox_message(struct net_device *dev, struct mailbox_msg message)
++int write_mailbox_message(struct anybus_private *anybus_priv,
++ struct mailbox_msg message)
+{
+ int i;
-+ struct anybus_private *anybus_priv = netdev_priv(dev);
+
+ sending_mailbox_message = 1;
+
@@ -606,7 +606,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, FIELDBUS_TYPE_MSB);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev, "Communication error.\n");
++ dev_err(&platform_dev->dev, "Communication error.\n");
+ return -EAGAIN;
+ }
+
@@ -615,7 +615,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, FIELDBUS_TYPE_LSB);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev, "Communication error.\n");
++ dev_err(&platform_dev->dev, "Communication error.\n");
+ return -EAGAIN;
+ }
+
@@ -624,7 +624,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, APPLICATION_VERSION_MSB);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev, "Communication error.\n");
++ dev_err(&platform_dev->dev, "Communication error.\n");
+ return -EAGAIN;
+ }
+
@@ -633,7 +633,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, APPLICATION_VERSION_LSB);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev, "Communication error.\n");
++ dev_err(&platform_dev->dev, "Communication error.\n");
+ return -EAGAIN;
+ }
+
@@ -642,7 +642,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, SERIAL_NUMBER0);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev, "Communication error.\n");
++ dev_err(&platform_dev->dev, "Communication error.\n");
+ return -EAGAIN;
+ }
+
@@ -651,7 +651,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, SERIAL_NUMBER1);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev, "Communication error.\n");
++ dev_err(&platform_dev->dev, "Communication error.\n");
+ return -EAGAIN;
+ }
+
@@ -660,7 +660,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, SERIAL_NUMBER2);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev, "Communication error.\n");
++ dev_err(&platform_dev->dev, "Communication error.\n");
+ return -EAGAIN;
+ }
+
@@ -669,7 +669,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ ret = anybus_reg_read(anybus_priv, SERIAL_NUMBER3);
+
+ if (ret < 0) {
-+ dev_err(anybus_priv->dev, "Communication error.\n");
++ dev_err(&platform_dev->dev, "Communication error.\n");
+ return -EAGAIN;
+ }
+
@@ -692,7 +692,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+
+ if (request_irq(dev->irq, anybus_interrupt, anybus_priv->irq_flags,
+ dev->name, (void *)dev) < 0) {
-+ dev_err(anybus_priv->dev,
++ dev_err(&platform_dev->dev,
+ "Unable to request irq n° %d (GPIO %d)\n",
+ dev->irq, irq_to_gpio(dev->irq));
+ return -EAGAIN;
@@ -704,9 +704,10 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ while (!anybus_available) {
+ msleep(100);
+ i++;
-+ if (i > 10) {
++ if (i > 50) {
+ i = 0;
+ anybus_stop(dev);
++ dev_err(&platform_dev->dev, "The module is unavailable.\n");
+ return -ETIMEDOUT;
+ }
+ }
@@ -718,8 +719,8 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ for (i = 0 ; i < 9 ; i++)
+ message.extended_word[i] = 0;
+
-+ if (write_mailbox_message(dev, message)) {
-+ dev_err(anybus_priv->dev,
++ if (write_mailbox_message(anybus_priv, message)) {
++ dev_err(&platform_dev->dev,
+ "Unable to write in the Anybus module mailbox register\n");
+ return -EIO;
+ }
@@ -728,9 +729,11 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ while (!received_mailbox_message) {
+ msleep(100);
+ i++;
-+ if (i > 10) {
++ if (i > 50) {
+ i = 0;
+ anybus_stop(dev);
++ dev_err(&platform_dev->dev,
++ "The module hasn't responded.\n");
+ return -ETIMEDOUT;
+ }
+ }
@@ -739,9 +742,9 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+
+ message = read_mailbox_message(anybus_priv);
+ if ((message.id != 0x0001) || (message.msg_information != 0x0001)) {
-+ dev_err(anybus_priv->dev,
++ dev_err(&platform_dev->dev,
+ "Error while checking response of start init\n");
-+ dev_err(anybus_priv->dev, "id: 0x%X msg info: 0x%X\n",
++ dev_err(&platform_dev->dev, "id: 0x%X msg info: 0x%X\n",
+ message.id, message.msg_information);
+ anybus_stop(dev);
+ return -EAGAIN;
@@ -757,8 +760,8 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ for (i = 0; i < message.data_size/2; i++)
+ message.data[i] = start_init_anybus_data_msg[i];
+
-+ if (write_mailbox_message(dev, message)) {
-+ dev_err(anybus_priv->dev,
++ if (write_mailbox_message(anybus_priv, message)) {
++ dev_err(&platform_dev->dev,
+ "Unable to write in the Anybus module mailbox register\n");
+ return -EIO;
+ }
@@ -767,7 +770,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ while (!received_mailbox_message) {
+ msleep(100);
+ i++;
-+ if (i > 10) {
++ if (i > 50) {
+ i = 0;
+ anybus_stop(dev);
+ return -ETIMEDOUT;
@@ -778,9 +781,9 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+
+ message = read_mailbox_message(anybus_priv);
+ if ((message.id != 0x0002) || (message.msg_information != 0x0001)) {
-+ dev_err(anybus_priv->dev,
++ dev_err(&platform_dev->dev,
+ "Error while checking response of init anybus\n");
-+ dev_err(anybus_priv->dev, "id: 0x%X msg info: 0x%X\n",
++ dev_err(&platform_dev->dev, "id: 0x%X msg info: 0x%X\n",
+ message.id, message.msg_information);
+ return -EAGAIN;
+ }
@@ -792,8 +795,8 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ for (i = 0 ; i < 9 ; i++)
+ message.extended_word[i] = 0;
+
-+ if (write_mailbox_message(dev, message)) {
-+ dev_err(anybus_priv->dev,
++ if (write_mailbox_message(anybus_priv, message)) {
++ dev_err(&platform_dev->dev,
+ "Unable to write in the Anybus module mailbox register\n");
+ return -EIO;
+ }
@@ -802,9 +805,11 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ while (!received_mailbox_message) {
+ msleep(100);
+ i++;
-+ if (i > 10) {
++ if (i > 50) {
+ i = 0;
+ anybus_stop(dev);
++ dev_err(&platform_dev->dev,
++ "The module hasn't responded.\n");
+ return -ETIMEDOUT;
+ }
+ }
@@ -813,9 +818,9 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+
+ message = read_mailbox_message(anybus_priv);
+ if ((message.id != 0x0003) || (message.msg_information != 0x0001)) {
-+ dev_err(anybus_priv->dev,
++ dev_err(&platform_dev->dev,
+ "Error while checking response of end init\n");
-+ dev_err(anybus_priv->dev, "id: 0x%X msg info: 0x%X\n",
++ dev_err(&platform_dev->dev, "id: 0x%X msg info: 0x%X\n",
+ message.id, message.msg_information);
+ return -EAGAIN;
+ }
@@ -830,7 +835,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ struct anybus_private *anybus_priv = netdev_priv(dev);
+
+ if ((frame->reg + frame->len) > (INPUT_AREA_END / 2) + 1) {
-+ dev_err(anybus_priv->dev,
++ dev_err(&platform_dev->dev,
+ "Overflow in the Anybus input data area.\n");
+ dev->stats.tx_errors++;
+ dev->stats.tx_dropped++;
@@ -863,6 +868,38 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ return 0;
+}
+
++long anybus_ioctl(struct file *filp, unsigned int cmd, unsigned long ptr_mail)
++{
++ struct net_device *dev = dev_get_drvdata(&platform_dev->dev);
++ struct anybus_private *anybus_priv = netdev_priv(dev);
++ struct mailbox_msg mail;
++
++ memcpy(&mail, (struct mailbox_msg *)ptr_mail,
++ sizeof(struct mailbox_msg));
++
++ if (cmd == MB_READ) {
++ if (received_mailbox_message) {
++ mail = read_mailbox_message(anybus_priv);
++ memcpy((struct mailbox_msg *)ptr_mail,
++ &mail,
++ sizeof(struct mailbox_msg));
++ } else
++ return -EAGAIN;
++ } else if (cmd == MB_WRITE) {
++ memcpy(&mail, (struct mailbox_msg *)ptr_mail,
++ sizeof(struct mailbox_msg));
++
++ if (write_mailbox_message(anybus_priv, mail))
++ return -EIO;
++ }
++
++ return 0;
++}
++
++static const struct file_operations anybus_fops = {
++ .unlocked_ioctl = anybus_ioctl
++};
++
+static void anybus_setup(struct net_device *dev)
+{
+ dev->type = ARPHRD_VOID;
@@ -887,11 +924,9 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ struct net_device *dev = alloc_netdev(sizeof(struct anybus_private),
+ "anybus%d", anybus_setup);
+ struct anybus_private *anybus_priv = netdev_priv(dev);
-+
++ char dev_mailbox_name[20];
+ void __iomem *mem;
-+
+ int err = 0;
-+
+ u16 id;
+
+ resource_memory = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -907,7 +942,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ anybus_priv->irq_flags = resource_irq->flags &
+ (IRQF_TRIGGER_MASK | IRQF_SHARED);
+ anybus_priv->gpio_reset = resource_reset->start;
-+ anybus_priv->dev = &pdev->dev;
++ platform_dev = pdev;
+
+ err = gpio_request_one(anybus_priv->gpio_reset,
+ GPIOF_OUT_INIT_HIGH, ANYBUS_INTERFACE_DRIVER_NAME);
@@ -963,10 +998,44 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+
+ gpio_set_value(anybus_priv->gpio_reset, 1);
+
-+ dev_err(&pdev->dev, "Anybus interface probed\n");
++ anybus_priv->cdev = cdev_alloc();
++ err = alloc_chrdev_region(&anybus_priv->cdev->dev, 1, 1,
++ ANYBUS_INTERFACE_DRIVER_NAME);
++ if (err) {
++ dev_err(&pdev->dev, "Unable to allocate device numbers\n");
++ goto exit_iounmap;
++ }
++
++ anybus_priv->cdev->owner = THIS_MODULE;
++ anybus_priv->cdev->ops = &anybus_fops;
++ err = cdev_add(anybus_priv->cdev, anybus_priv->cdev->dev, 256);
++ if (err) {
++ dev_err(&pdev->dev, "Unable to add cdev\n");
++ goto exit_unreg;
++ }
++
++ anybus_priv->anybus_class = class_create(THIS_MODULE,
++ ANYBUS_INTERFACE_DRIVER_NAME);
++ if (IS_ERR(anybus_priv->anybus_class)) {
++ dev_err(&pdev->dev, "Unable to create anybus class device\n");
++ err = PTR_ERR(anybus_priv->anybus_class);
++ goto exit_unreg;
++ }
++
++ strcpy(dev_mailbox_name, dev->name);
++ strcat(dev_mailbox_name, "_mailbox");
++ if (device_create(anybus_priv->anybus_class, NULL,
++ anybus_priv->cdev->dev, NULL, dev_mailbox_name) == NULL) {
++ dev_err(&pdev->dev, "Unable to create device\n");
++ goto exit_class_destroy;
++ }
+
+ return 0;
+
++exit_class_destroy:
++ class_destroy(anybus_priv->anybus_class);
++exit_unreg:
++ unregister_chrdev_region(anybus_priv->cdev->dev, 1);
+exit_iounmap:
+ iounmap(anybus_priv->reg_base);
+ release_mem_region(resource_memory->start,
@@ -984,6 +1053,10 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+ struct anybus_private *anybus_priv = netdev_priv(dev);
+ struct resource *resource_memory;
+
++ device_destroy(anybus_priv->anybus_class, anybus_priv->cdev->dev);
++ class_destroy(anybus_priv->anybus_class);
++ unregister_chrdev_region(anybus_priv->cdev->dev, 1);
++
+ unregister_netdev(dev);
+ dev_set_drvdata(&pdev->dev, NULL);
+
@@ -1028,8 +1101,8 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
Index: linux-2.6.38.1/include/net/anybus_interface.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/include/net/anybus_interface.h 2011-07-06 17:12:58.000000000 +0200
-@@ -0,0 +1,31 @@
++++ linux-2.6.38.1/include/net/anybus_interface.h 2011-07-18 11:42:44.385814001 +0200
+@@ -0,0 +1,40 @@
+/*
+ * Definitions for the module HMS anybus
+ *
@@ -1060,4 +1133,13 @@ Index: linux-2.6.38.1/include/net/anybus_interface.h
+ int len;
+};
+
++struct mailbox_msg {
++ unsigned short id;
++ unsigned short msg_information;
++ unsigned short command_number;
++ unsigned short data_size;
++ unsigned short extended_word[8];
++ unsigned short data[256];
++};
++
+#endif
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-07-12 07:35:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d17ee90acbecc8ef1c6198c78ab42ca78f9fba46 (commit)
from 8d18c73977a272a1abe0d4e7b66e8fae46412256 (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 d17ee90acbecc8ef1c6198c78ab42ca78f9fba46
Author: Kevin JOLY <jol...@gm...>
Date: Mon Jul 11 14:49:16 2011 +0200
Add HMS Anybus driver
Signed-off-by: Kevin JOLY <jol...@gm...>
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/440-add-hms-anybus-driver | 1063 ++++++++++++++++++++
1 files changed, 1063 insertions(+), 0 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-add-hms-anybus-driver
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-add-hms-anybus-driver b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-add-hms-anybus-driver
new file mode 100644
index 0000000..d812b1f
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-add-hms-anybus-driver
@@ -0,0 +1,1063 @@
+Index: linux-2.6.38.1/drivers/net/Kconfig
+===================================================================
+--- linux-2.6.38.1.orig/drivers/net/Kconfig 2011-07-11 14:30:35.704127431 +0200
++++ linux-2.6.38.1/drivers/net/Kconfig 2011-07-11 14:16:06.000000000 +0200
+@@ -3422,4 +3422,12 @@
+ To compile this driver as a module, choose M here: the
+ module will be called vmxnet3.
+
++config ANYBUS_INTERFACE
++ tristate "HMS Anybus driver"
++ help
++ Driver for the HMS Anybus module.
++
++ To compile this driver as a module, choose M here. The module
++ will be called anybus_interface.
++
+ endif # NETDEVICES
+Index: linux-2.6.38.1/drivers/net/Makefile
+===================================================================
+--- linux-2.6.38.1.orig/drivers/net/Makefile 2011-07-11 14:30:41.352127431 +0200
++++ linux-2.6.38.1/drivers/net/Makefile 2011-07-11 14:16:57.000000000 +0200
+@@ -242,6 +242,7 @@
+ obj-$(CONFIG_R8169) += r8169.o
+ obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
+ obj-$(CONFIG_IBMVETH) += ibmveth.o
++obj-$(CONFIG_ANYBUS_INTERFACE) += anybus_interface.o
+ obj-$(CONFIG_S2IO) += s2io.o
+ obj-$(CONFIG_VXGE) += vxge/
+ obj-$(CONFIG_MYRI10GE) += myri10ge/
+Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.1/drivers/net/anybus_interface.c 2011-07-11 13:58:03.000000000 +0200
+@@ -0,0 +1,993 @@
++/*
++ * HMS Anybus module driver
++ *
++ * (C) Copyright 2011 - Armadeus Systems <su...@ar...>
++ * Author: Kevin JOLY jol...@gm...
++ *
++ * 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, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/netdevice.h>
++#include <linux/if_arp.h>
++#include <linux/delay.h>
++#include <linux/etherdevice.h>
++#include <linux/gpio.h>
++
++#include <net/anybus_interface.h>
++
++#define ANYBUS_INTERFACE_DRIVER_NAME "anybus_interface"
++
++/* Interface registers */
++#define IFRG_ID 0x00
++#define IFRG_CTRL 0x02
++#define IFRG_ADDR 0x04
++#define IFRG_DATA 0x06
++
++/* Interface control register values */
++#define IFRG_CTRL_TRANSMIT 0x02
++#define IFRG_CTRL_RECEIVE 0x04
++#define IFRG_CTRL_CLOCK_CYCLES(x) (x << 3)
++#define IFRG_CTRL_TRANSMISSION_ERROR 0x01
++
++/* Anybus registers */
++#define INPUT_AREA_START 0x000
++#define INPUT_AREA_END 0x1FF
++#define OUTPUT_AREA_START 0x200
++#define OUTPUT_AREA_END 0x3FF
++#define MB_IN_ID 0x400
++#define MB_IN_MSG_INFO 0x402
++#define MB_IN_COM 0x404
++#define MB_IN_DATA_SIZE 0x406
++#define MB_IN_EXTENDED 0x410
++#define MB_IN_DATA 0x420
++#define MB_OUT_ID 0x520
++#define MB_OUT_MSG_INFO 0x522
++#define MB_OUT_COM 0x524
++#define MB_OUT_DATA_SIZE 0x526
++#define MB_OUT_EXTENDED 0x530
++#define MB_OUT_DATA 0x540
++#define APPLICATION_VERSION_MSB 0x7C2
++#define APPLICATION_VERSION_LSB 0x7C3
++#define SERIAL_NUMBER0 0x7C6
++#define SERIAL_NUMBER1 0x7C7
++#define SERIAL_NUMBER2 0x7C8
++#define SERIAL_NUMBER3 0x7C9
++#define FIELDBUS_TYPE_MSB 0x7CC
++#define FIELDBUS_TYPE_LSB 0x7CD
++#define EVENT_NOTIFICATION_CAUSE 0x7ED
++#define EVENT_NOTIFICATION_SOURCE 0x7EF
++#define APPLICATION_INDICATION_REG 0x7FE
++#define ANYBUS_INDICATION_REG 0x7FF
++
++/* Anybus indication register values */
++#define AB_MIN 0x80
++#define AB_MOUT 0x40
++#define AB_EVENT 0x20
++#define AB_INIT 0x10
++#define AB_IN 0x04
++#define AB_OUT 0x02
++#define AB_FBCTRL 0x01
++
++/* Application indication register values */
++#define AP_MIN 0x80
++#define AP_MOUT 0x40
++#define AP_EVENT 0x20
++#define ACTION_BIT 0x10
++#define LOCK_BIT 0x08
++#define AP_IN 0x04
++#define AP_OUT 0x02
++#define AP_FBCTRL 0x01
++#define ACTION_REQ 0x100
++#define ACTION_REL 0x200
++#define LOCK 0x400
++#define UNLOCK 0x800
++
++/* Event notification values */
++#define EN_DC 0x01
++#define EN_FBOF 0x02
++#define EN_FBON 0x04
++#define EN_RST 0x08
++
++unsigned short anybus_indication_reg_status;
++bool sending_mailbox_message;
++bool received_mailbox_message;
++bool anybus_available;
++
++struct mailbox_msg {
++ unsigned short id;
++ unsigned short msg_information;
++ unsigned short command_number;
++ unsigned short data_size;
++ unsigned short extended_word[8];
++ unsigned short data[256];
++};
++
++struct anybus_private {
++ void __iomem *reg_base;
++ int gpio_reset;
++ int irq_flags;
++ struct device *dev;
++};
++
++static u16 anybus_interface_read(struct anybus_private *anybus_priv, int reg)
++{
++ return ioread16(anybus_priv->reg_base + reg);
++}
++
++void anybus_interface_write(struct anybus_private *anybus_priv, u16 value,
++ int reg)
++{
++ iowrite16(value, anybus_priv->reg_base + reg);
++}
++
++static int anybus_reg_read(struct anybus_private *anybus_priv, int reg)
++{
++ int i;
++
++ for (i = 0 ; i < 3 ; i++) {
++ anybus_interface_write(anybus_priv, reg, IFRG_ADDR);
++ anybus_interface_write(anybus_priv,
++ IFRG_CTRL_CLOCK_CYCLES(4) | IFRG_CTRL_RECEIVE, IFRG_CTRL);
++
++ if (!(anybus_interface_read(anybus_priv,
++ IFRG_CTRL) & IFRG_CTRL_TRANSMISSION_ERROR)) {
++ return anybus_interface_read(anybus_priv, IFRG_DATA);
++ }
++ }
++
++ return -EIO;
++}
++
++static int anybus_reg_write(struct anybus_private *anybus_priv, int reg,
++ unsigned short value)
++{
++ int i;
++
++ for (i = 0 ; i < 3 ; i++) {
++ anybus_interface_write(anybus_priv, reg, IFRG_ADDR);
++ anybus_interface_write(anybus_priv, value, IFRG_DATA);
++ anybus_interface_write(anybus_priv,
++ IFRG_CTRL_CLOCK_CYCLES(4) | IFRG_CTRL_TRANSMIT, IFRG_CTRL);
++
++ if (!(anybus_interface_read(anybus_priv,
++ IFRG_CTRL) & IFRG_CTRL_TRANSMISSION_ERROR)) {
++ return 0;
++ }
++ }
++
++ return -EIO;
++}
++
++int application_indication_register(struct anybus_private *anybus_priv,
++ unsigned short value)
++{
++ unsigned short register_status;
++ int ret;
++
++ ret = anybus_reg_read(anybus_priv, APPLICATION_INDICATION_REG);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev, "Unable to read on anybus module\n");
++ return -EIO;
++ }
++
++ register_status = ret;
++
++ if (value & AP_MIN)
++ register_status ^= AP_MIN;
++ if (value & AP_MOUT)
++ register_status ^= AP_MOUT;
++ if (value & AP_EVENT)
++ register_status ^= AP_EVENT;
++ if (value & ACTION_REQ)
++ register_status |= ACTION_BIT;
++ if (value & ACTION_REL)
++ register_status &= ~ACTION_BIT;
++ if (value & LOCK)
++ register_status |= LOCK_BIT;
++ if (value & UNLOCK)
++ register_status &= ~LOCK_BIT;
++ if (value & AP_IN)
++ register_status |= AP_IN;
++ else
++ register_status &= ~AP_IN;
++ if (value & AP_OUT)
++ register_status |= AP_OUT;
++ else
++ register_status &= ~AP_OUT;
++ if (value & AP_FBCTRL)
++ register_status |= AP_FBCTRL;
++ else
++ register_status &= ~AP_FBCTRL;
++
++ if (anybus_reg_write(anybus_priv, APPLICATION_INDICATION_REG,
++ register_status) < 0) {
++ dev_err(anybus_priv->dev,
++ "Unable to write on anybus module\n");
++ return -EIO;
++ }
++
++ return 0;
++}
++
++void anybus_area_allocation(struct anybus_private *anybus_priv,
++ unsigned short area, unsigned short access_type)
++{
++
++ application_indication_register(anybus_priv,
++ area | access_type | ACTION_REQ);
++
++ while (!(anybus_indication_reg_status & area))
++ cpu_relax();
++
++ return;
++}
++
++void anybus_area_deallocation(struct anybus_private *anybus_priv,
++ unsigned short area, unsigned short access_type)
++{
++
++ application_indication_register(anybus_priv,
++ area | access_type | ACTION_REL);
++
++ while (anybus_indication_reg_status & area)
++ cpu_relax();
++
++ return;
++}
++
++int anybus_receive(struct net_device *dev)
++{
++ int i, ret;
++ struct anybus_frame frame;
++ struct anybus_private *anybus_priv = netdev_priv(dev);
++ struct sk_buff *skb;
++
++ frame.len = OUTPUT_AREA_END - OUTPUT_AREA_START;
++ frame.reg = 0;
++
++ application_indication_register(anybus_priv,
++ AB_OUT | LOCK | ACTION_REQ);
++
++ while (!(anybus_indication_reg_status & AB_OUT)) {
++
++ ret = anybus_reg_read(anybus_priv, ANYBUS_INDICATION_REG);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev, "Communication error.\n");
++ return -EIO;
++ }
++
++ anybus_indication_reg_status = ret;
++ cpu_relax();
++ }
++
++ for (i = 0 ; i <= (OUTPUT_AREA_END - OUTPUT_AREA_START) / 2; i++) {
++ ret = anybus_reg_read(anybus_priv,
++ i * 2 + OUTPUT_AREA_START);
++ if (ret < 0) {
++ dev->stats.rx_errors++;
++ dev->stats.rx_dropped++;
++ return -EAGAIN;
++ }
++
++ frame.data[i] = ret << 8;
++
++ dev->stats.rx_bytes++;
++
++ ret = anybus_reg_read(anybus_priv,
++ i * 2 + OUTPUT_AREA_START + 1);
++
++ if (ret < 0) {
++ dev->stats.rx_errors++;
++ dev->stats.rx_dropped++;
++ return -EAGAIN;
++ }
++ frame.data[i] |= ret;
++
++
++ dev->stats.rx_bytes++;
++ }
++
++ application_indication_register(anybus_priv,
++ AB_OUT | UNLOCK | ACTION_REL);
++ while (anybus_indication_reg_status & AB_OUT) {
++
++ ret = anybus_reg_read(anybus_priv, ANYBUS_INDICATION_REG);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev, "Communication error.\n");
++ return -EIO;
++ }
++
++ anybus_indication_reg_status = ret;
++ cpu_relax();
++ }
++
++ skb = dev_alloc_skb(sizeof(frame));
++ if (!skb) {
++ dev_err(anybus_priv->dev, "Low memory space available.\n");
++ dev->stats.rx_dropped++;
++ }
++
++ memcpy(skb_put(skb, sizeof(frame)), &frame, sizeof(frame));
++
++ skb->dev = dev;
++ skb->protocol = IPPROTO_UDP;
++
++ skb->ip_summed = CHECKSUM_UNNECESSARY;
++
++ dev->stats.rx_packets++;
++
++ if (netif_rx(skb))
++ dev->stats.rx_dropped++;
++ else
++ dev->stats.rx_packets++;
++
++ return 0;
++}
++
++irqreturn_t anybus_interrupt(int irq, void *dev_id)
++{
++ struct anybus_private *anybus_priv = netdev_priv(dev_id);
++ unsigned short application_indication_reg;
++ int ret;
++
++ ret = anybus_reg_read(anybus_priv, ANYBUS_INDICATION_REG);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev, "Communication error.\n");
++ return IRQ_NONE;
++ }
++
++ anybus_indication_reg_status = ret;
++
++ anybus_available = 1;
++
++ ret = anybus_reg_read(anybus_priv, APPLICATION_INDICATION_REG);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev, "Communication error.\n");
++ return IRQ_NONE;
++ }
++
++ application_indication_reg = ret;
++
++ if (!((anybus_indication_reg_status ^ application_indication_reg)
++ & AB_MIN)) {
++ sending_mailbox_message = 0;
++ }
++
++ if ((anybus_indication_reg_status ^ application_indication_reg)
++ & AB_MOUT) {
++ received_mailbox_message = 1;
++ }
++
++ if ((anybus_indication_reg_status ^ application_indication_reg)
++ & AB_EVENT) {
++
++ application_indication_register(anybus_priv,
++ AB_FBCTRL | LOCK | ACTION_REQ);
++
++ while (!(anybus_indication_reg_status & AB_FBCTRL)) {
++
++ ret = anybus_reg_read(anybus_priv,
++ ANYBUS_INDICATION_REG);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev,
++ "Communication error.\n");
++ return IRQ_NONE;
++ }
++
++ anybus_indication_reg_status = ret;
++ cpu_relax();
++ }
++
++ ret = anybus_reg_read(anybus_priv, EVENT_NOTIFICATION_CAUSE);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev,
++ "Unable to read in the Anybus module register\n");
++ return IRQ_NONE;
++ }
++
++ if (anybus_reg_write(anybus_priv, EVENT_NOTIFICATION_CAUSE,
++ 0x00) < 0) {
++ dev_err(anybus_priv->dev,
++ "Unable to read in the Anybus module register\n");
++ return IRQ_NONE;
++ }
++
++ if (ret & EN_DC)
++ anybus_receive((struct net_device *)dev_id);
++
++ application_indication_register(anybus_priv,
++ AB_FBCTRL | UNLOCK | ACTION_REL);
++ while (anybus_indication_reg_status & AB_FBCTRL) {
++
++ ret = anybus_reg_read(anybus_priv,
++ ANYBUS_INDICATION_REG);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev,
++ "Communication error.\n");
++ return IRQ_NONE;
++ }
++
++ anybus_indication_reg_status = ret;
++ cpu_relax();
++ }
++
++ ret = anybus_reg_read(anybus_priv, ANYBUS_INDICATION_REG);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev, "Communication error.\n");
++ return IRQ_NONE;
++ }
++
++ if (application_indication_register(anybus_priv, AP_EVENT)) {
++ dev_err(anybus_priv->dev, "Communication error.\n");
++ return IRQ_NONE;
++ }
++ }
++
++ return IRQ_HANDLED;
++}
++
++int write_mailbox_message(struct net_device *dev, struct mailbox_msg message)
++{
++ int i;
++ struct anybus_private *anybus_priv = netdev_priv(dev);
++
++ sending_mailbox_message = 1;
++
++ anybus_reg_write(anybus_priv, MB_IN_ID, message.id/256);
++ anybus_reg_write(anybus_priv, MB_IN_ID + 1, message.id%256);
++
++ anybus_reg_write(anybus_priv, MB_IN_MSG_INFO,
++ message.msg_information/256);
++ anybus_reg_write(anybus_priv, MB_IN_MSG_INFO + 1,
++ message.msg_information%256);
++
++ anybus_reg_write(anybus_priv, MB_IN_COM, message.command_number/256);
++ anybus_reg_write(anybus_priv, MB_IN_COM + 1,
++ message.command_number%256);
++
++ anybus_reg_write(anybus_priv, MB_IN_DATA_SIZE, message.data_size/256);
++ anybus_reg_write(anybus_priv, MB_IN_DATA_SIZE + 1,
++ message.data_size%256);
++
++ anybus_reg_write(anybus_priv, 0x0408, 0x00);
++ anybus_reg_write(anybus_priv, 0x0409, 0x01);
++
++ anybus_reg_write(anybus_priv, 0x040a, 0x00);
++ anybus_reg_write(anybus_priv, 0x040b, 0x01);
++
++ anybus_reg_write(anybus_priv, 0x040c, 0x00);
++ anybus_reg_write(anybus_priv, 0x040d, 0x00);
++
++ anybus_reg_write(anybus_priv, 0x040e, 0x00);
++ anybus_reg_write(anybus_priv, 0x040f, 0x00);
++
++ for (i = 0 ; i < 8 ; i++) {
++ anybus_reg_write(anybus_priv, MB_IN_EXTENDED + i,
++ message.extended_word[i]/256);
++ anybus_reg_write(anybus_priv, MB_IN_EXTENDED + 1 + i,
++ message.extended_word[i]%256);
++ }
++
++ for (i = 0 ; i < message.data_size/2 ; i++) {
++ anybus_reg_write(anybus_priv, MB_IN_DATA + i*2,
++ message.data[i]/256);
++ anybus_reg_write(anybus_priv, MB_IN_DATA + 1 + i*2,
++ message.data[i]%256);
++ }
++
++ application_indication_register(anybus_priv, AP_MIN);
++
++ while (sending_mailbox_message) {
++ msleep(100);
++ i++;
++ if (i > 10)
++ return -ETIMEDOUT;
++ }
++
++ return 0;
++}
++
++struct mailbox_msg read_mailbox_message(struct anybus_private *anybus_priv)
++{
++ int i;
++ struct mailbox_msg message;
++
++ message.id = anybus_reg_read(anybus_priv, MB_OUT_ID) * 256;
++ message.id = anybus_reg_read(anybus_priv, MB_OUT_ID + 1) + message.id;
++
++ message.msg_information = anybus_reg_read(anybus_priv,
++ MB_OUT_MSG_INFO) * 256;
++ message.msg_information = anybus_reg_read(anybus_priv,
++ MB_OUT_MSG_INFO + 1) + message.msg_information;
++
++ message.command_number = anybus_reg_read(anybus_priv,
++ MB_OUT_COM) * 256;
++ message.command_number = anybus_reg_read(anybus_priv, MB_OUT_COM + 1)
++ + message.command_number;
++
++ message.data_size = anybus_reg_read(anybus_priv,
++ MB_OUT_DATA_SIZE) * 256;
++ message.data_size = anybus_reg_read(anybus_priv, MB_OUT_DATA_SIZE + 1)
++ + message.data_size;
++
++ for (i = 0 ; i < 8 ; i++) {
++ message.extended_word[i] = anybus_reg_read(anybus_priv,
++ MB_OUT_EXTENDED + i) * 256;
++ message.extended_word[i] = anybus_reg_read(anybus_priv,
++ MB_OUT_EXTENDED + 1 + i) + message.extended_word[i];
++ }
++
++ for (i = 0 ; i < message.data_size ; i++) {
++ message.data[i] = anybus_reg_read(anybus_priv,
++ MB_OUT_DATA + i*2) * 256;
++ message.data[i] = anybus_reg_read(anybus_priv,
++ MB_OUT_DATA + 1 + i*2) + message.data[i];
++ }
++
++ application_indication_register(anybus_priv, AP_MOUT);
++
++ return message;
++}
++
++static int anybus_stop(struct net_device *dev)
++{
++ struct anybus_private *anybus_priv = netdev_priv(dev);
++
++ free_irq(dev->irq, (void *)dev);
++ gpio_set_value(anybus_priv->gpio_reset, 1);
++
++ return 0;
++}
++
++static int set_mac_address(struct net_device *dev)
++{
++ struct anybus_private *anybus_priv = netdev_priv(dev);
++ int ret;
++
++ dev->addr_len = 8;
++
++ ret = anybus_reg_read(anybus_priv, FIELDBUS_TYPE_MSB);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev, "Communication error.\n");
++ return -EAGAIN;
++ }
++
++ dev->dev_addr[0] = ret;
++
++ ret = anybus_reg_read(anybus_priv, FIELDBUS_TYPE_LSB);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev, "Communication error.\n");
++ return -EAGAIN;
++ }
++
++ dev->dev_addr[1] = ret;
++
++ ret = anybus_reg_read(anybus_priv, APPLICATION_VERSION_MSB);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev, "Communication error.\n");
++ return -EAGAIN;
++ }
++
++ dev->dev_addr[2] = ret;
++
++ ret = anybus_reg_read(anybus_priv, APPLICATION_VERSION_LSB);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev, "Communication error.\n");
++ return -EAGAIN;
++ }
++
++ dev->dev_addr[3] = ret;
++
++ ret = anybus_reg_read(anybus_priv, SERIAL_NUMBER0);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev, "Communication error.\n");
++ return -EAGAIN;
++ }
++
++ dev->dev_addr[4] = ret;
++
++ ret = anybus_reg_read(anybus_priv, SERIAL_NUMBER1);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev, "Communication error.\n");
++ return -EAGAIN;
++ }
++
++ dev->dev_addr[5] = ret;
++
++ ret = anybus_reg_read(anybus_priv, SERIAL_NUMBER2);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev, "Communication error.\n");
++ return -EAGAIN;
++ }
++
++ dev->dev_addr[6] = ret;
++
++ ret = anybus_reg_read(anybus_priv, SERIAL_NUMBER3);
++
++ if (ret < 0) {
++ dev_err(anybus_priv->dev, "Communication error.\n");
++ return -EAGAIN;
++ }
++
++ dev->dev_addr[7] = ret;
++
++ return 0;
++}
++
++static int anybus_open(struct net_device *dev)
++{
++ struct anybus_private *anybus_priv = netdev_priv(dev);
++ struct mailbox_msg message;
++ const unsigned short start_init_anybus_data_msg[] = {0x0200, 0x0200,
++ 0x0200, 0x0200, 0x0200, 0x0200, 0x0200, 0x0000 | EN_DC, 0x0000};
++ int i;
++
++ sending_mailbox_message = 0;
++ anybus_available = 0;
++ received_mailbox_message = 0;
++
++ if (request_irq(dev->irq, anybus_interrupt, anybus_priv->irq_flags,
++ dev->name, (void *)dev) < 0) {
++ dev_err(anybus_priv->dev,
++ "Unable to request irq n° %d (GPIO %d)\n",
++ dev->irq, irq_to_gpio(dev->irq));
++ return -EAGAIN;
++ }
++
++ gpio_set_value(anybus_priv->gpio_reset, 0);
++
++ i = 0;
++ while (!anybus_available) {
++ msleep(100);
++ i++;
++ if (i > 10) {
++ i = 0;
++ anybus_stop(dev);
++ return -ETIMEDOUT;
++ }
++ }
++
++ message.id = 0x0001;
++ message.msg_information = 0x4001;
++ message.command_number = 0x0001;
++ message.data_size = 0x0000;
++ for (i = 0 ; i < 9 ; i++)
++ message.extended_word[i] = 0;
++
++ if (write_mailbox_message(dev, message)) {
++ dev_err(anybus_priv->dev,
++ "Unable to write in the Anybus module mailbox register\n");
++ return -EIO;
++ }
++
++ i = 0;
++ while (!received_mailbox_message) {
++ msleep(100);
++ i++;
++ if (i > 10) {
++ i = 0;
++ anybus_stop(dev);
++ return -ETIMEDOUT;
++ }
++ }
++
++ received_mailbox_message = 0;
++
++ message = read_mailbox_message(anybus_priv);
++ if ((message.id != 0x0001) || (message.msg_information != 0x0001)) {
++ dev_err(anybus_priv->dev,
++ "Error while checking response of start init\n");
++ dev_err(anybus_priv->dev, "id: 0x%X msg info: 0x%X\n",
++ message.id, message.msg_information);
++ anybus_stop(dev);
++ return -EAGAIN;
++ }
++
++ message.id = 0x0002;
++ message.msg_information = 0x4001;
++ message.command_number = 0x0002;
++ message.data_size = 0x0012;
++ for (i = 0 ; i < 9 ; i++)
++ message.extended_word[i] = 0;
++
++ for (i = 0; i < message.data_size/2; i++)
++ message.data[i] = start_init_anybus_data_msg[i];
++
++ if (write_mailbox_message(dev, message)) {
++ dev_err(anybus_priv->dev,
++ "Unable to write in the Anybus module mailbox register\n");
++ return -EIO;
++ }
++
++ i = 0;
++ while (!received_mailbox_message) {
++ msleep(100);
++ i++;
++ if (i > 10) {
++ i = 0;
++ anybus_stop(dev);
++ return -ETIMEDOUT;
++ }
++ }
++
++ received_mailbox_message = 0;
++
++ message = read_mailbox_message(anybus_priv);
++ if ((message.id != 0x0002) || (message.msg_information != 0x0001)) {
++ dev_err(anybus_priv->dev,
++ "Error while checking response of init anybus\n");
++ dev_err(anybus_priv->dev, "id: 0x%X msg info: 0x%X\n",
++ message.id, message.msg_information);
++ return -EAGAIN;
++ }
++
++ message.id = 0x0003;
++ message.msg_information = 0x4001;
++ message.command_number = 0x0003;
++ message.data_size = 0x0000;
++ for (i = 0 ; i < 9 ; i++)
++ message.extended_word[i] = 0;
++
++ if (write_mailbox_message(dev, message)) {
++ dev_err(anybus_priv->dev,
++ "Unable to write in the Anybus module mailbox register\n");
++ return -EIO;
++ }
++
++ i = 0;
++ while (!received_mailbox_message) {
++ msleep(100);
++ i++;
++ if (i > 10) {
++ i = 0;
++ anybus_stop(dev);
++ return -ETIMEDOUT;
++ }
++ }
++
++ received_mailbox_message = 0;
++
++ message = read_mailbox_message(anybus_priv);
++ if ((message.id != 0x0003) || (message.msg_information != 0x0001)) {
++ dev_err(anybus_priv->dev,
++ "Error while checking response of end init\n");
++ dev_err(anybus_priv->dev, "id: 0x%X msg info: 0x%X\n",
++ message.id, message.msg_information);
++ return -EAGAIN;
++ }
++
++ return set_mac_address(dev);
++}
++
++netdev_tx_t anybus_start_xmit(struct sk_buff *skb, struct net_device *dev)
++{
++ int i;
++ struct anybus_frame *frame = (struct anybus_frame *)skb->data;
++ struct anybus_private *anybus_priv = netdev_priv(dev);
++
++ if ((frame->reg + frame->len) > (INPUT_AREA_END / 2) + 1) {
++ dev_err(anybus_priv->dev,
++ "Overflow in the Anybus input data area.\n");
++ dev->stats.tx_errors++;
++ dev->stats.tx_dropped++;
++ return -EINVAL;
++ }
++
++ anybus_area_allocation(anybus_priv, AB_IN, LOCK);
++
++ for (i = 0 ; i < frame->len * 2; i += 2) {
++ if (anybus_reg_write(anybus_priv,
++ INPUT_AREA_START + i + frame->reg * 2, frame->data[i] >> 8)) {
++ dev->stats.tx_errors++;
++ dev->stats.tx_dropped++;
++ return -EAGAIN;
++ }
++ dev->stats.tx_bytes++;
++ if (anybus_reg_write(anybus_priv, INPUT_AREA_START + i +
++ frame->reg * 2 + 1, frame->data[i] & 0xFF)) {
++ dev->stats.tx_errors++;
++ dev->stats.tx_dropped++;
++ return -EAGAIN;
++ }
++ dev->stats.tx_bytes++;
++ }
++
++ anybus_area_deallocation(anybus_priv, AB_IN, UNLOCK);
++
++ dev->stats.tx_packets++;
++
++ return 0;
++}
++
++static void anybus_setup(struct net_device *dev)
++{
++ dev->type = ARPHRD_VOID;
++ dev->mtu = sizeof(struct anybus_frame);
++ dev->hard_header_len = 0;
++ dev->addr_len = 0;
++ dev->tx_queue_len = 10;
++
++ dev->flags = IFF_NOARP;
++ dev->features = NETIF_F_NO_CSUM;
++}
++
++struct net_device_ops anybus_netdev_ops = {
++ .ndo_open = anybus_open,
++ .ndo_stop = anybus_stop,
++ .ndo_start_xmit = anybus_start_xmit,
++};
++
++static int anybus_interface_probe(struct platform_device *pdev)
++{
++ struct resource *resource_memory, *resource_irq, *resource_reset;
++ struct net_device *dev = alloc_netdev(sizeof(struct anybus_private),
++ "anybus%d", anybus_setup);
++ struct anybus_private *anybus_priv = netdev_priv(dev);
++
++ void __iomem *mem;
++
++ int err = 0;
++
++ u16 id;
++
++ resource_memory = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ resource_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
++ resource_reset = platform_get_resource(pdev, IORESOURCE_IO, 0);
++
++ if (!resource_memory || !resource_irq || !resource_reset) {
++ err = -ENODEV;
++ dev_err(&pdev->dev, "Device Anybus not found\n");
++ goto exit_free;
++ }
++
++ anybus_priv->irq_flags = resource_irq->flags &
++ (IRQF_TRIGGER_MASK | IRQF_SHARED);
++ anybus_priv->gpio_reset = resource_reset->start;
++ anybus_priv->dev = &pdev->dev;
++
++ err = gpio_request_one(anybus_priv->gpio_reset,
++ GPIOF_OUT_INIT_HIGH, ANYBUS_INTERFACE_DRIVER_NAME);
++
++ if (err) {
++ dev_err(&pdev->dev, "GPIO request fail\n");
++ goto exit_free;
++ }
++
++ if (!request_mem_region(resource_memory->start,
++ resource_size(resource_memory), ANYBUS_INTERFACE_DRIVER_NAME)) {
++ dev_err(&pdev->dev, "Can't request memory region %x to %x\n",
++ resource_memory->start, resource_memory->start +
++ resource_memory->end);
++ err = -ENOMEM;
++ goto exit_release_gpio;
++ }
++
++ mem = ioremap_nocache(resource_memory->start,
++ resource_size(resource_memory));
++
++ anybus_priv->reg_base = mem;
++
++ dev_set_drvdata(&pdev->dev, dev);
++
++ dev->irq = gpio_to_irq(resource_irq->start);
++
++ dev->netdev_ops = &anybus_netdev_ops;
++
++ /*Check if ID is correct*/
++ id = anybus_interface_read(anybus_priv, IFRG_ID);
++ if (pdev->id != id) {
++ dev_err(&pdev->dev,
++ "Driver id %d doesn't match with the device id %d\n",
++ pdev->id, id);
++ err = -ENODEV;
++ goto exit_iounmap;
++ }
++
++ err = register_netdev(dev);
++
++ if (err) {
++ dev_err(&pdev->dev, "Could not register netdevice\n");
++ goto exit_iounmap;
++ }
++
++ /* Clear interrupts */
++ err = anybus_reg_read(anybus_priv, ANYBUS_INDICATION_REG);
++ if (err < 0)
++ return err;
++
++ anybus_indication_reg_status = err;
++
++ gpio_set_value(anybus_priv->gpio_reset, 1);
++
++ dev_err(&pdev->dev, "Anybus interface probed\n");
++
++ return 0;
++
++exit_iounmap:
++ iounmap(anybus_priv->reg_base);
++ release_mem_region(resource_memory->start,
++ resource_size(resource_memory));
++exit_release_gpio:
++ gpio_free(anybus_priv->gpio_reset);
++exit_free:
++ free_netdev(dev);
++ return err;
++}
++
++static int anybus_interface_remove(struct platform_device *pdev)
++{
++ struct net_device *dev = dev_get_drvdata(&pdev->dev);
++ struct anybus_private *anybus_priv = netdev_priv(dev);
++ struct resource *resource_memory;
++
++ unregister_netdev(dev);
++ dev_set_drvdata(&pdev->dev, NULL);
++
++ resource_memory = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++ release_mem_region(resource_memory->start,
++ resource_size(resource_memory));
++
++ if (anybus_priv->reg_base)
++ iounmap(anybus_priv->reg_base);
++
++ gpio_free(anybus_priv->gpio_reset);
++
++ free_netdev(dev);
++
++ return 0;
++}
++
++static struct platform_driver anybus_interface_drv = {
++ .driver = {
++ .name = ANYBUS_INTERFACE_DRIVER_NAME,
++ .owner = THIS_MODULE,
++ },
++ .probe = anybus_interface_probe,
++ .remove = anybus_interface_remove
++};
++
++static int __init anybus_interface_init(void)
++{
++ return platform_driver_register(&anybus_interface_drv);
++}
++module_init(anybus_interface_init);
++
++static void __exit anybus_interface_exit(void)
++{
++ platform_driver_unregister(&anybus_interface_drv);
++}
++module_exit(anybus_interface_exit);
++
++MODULE_AUTHOR("Kevin Joly <jol...@gm...>");
++MODULE_DESCRIPTION("HMS Anybus module driver");
++MODULE_LICENSE("GPL");
+Index: linux-2.6.38.1/include/net/anybus_interface.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.38.1/include/net/anybus_interface.h 2011-07-06 17:12:58.000000000 +0200
+@@ -0,0 +1,31 @@
++/*
++ * Definitions for the module HMS anybus
++ *
++ * (C) Copyright 2011 - Armadeus Systems <su...@ar...>
++ * Author: Kevin JOLY jol...@gm...
++ *
++ * 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, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ */
++
++#ifndef LINUX_ANYBUS_INTERFACE
++#define LINUX_ANYBUS_INTERFACE
++
++struct anybus_frame {
++ int reg;
++ unsigned short data[256];
++ int len;
++};
++
++#endif
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2011-07-10 07:25: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 annotated tag, latestrelease has been deleted
was 3d839f0e7e7eb6845a8b94e79340d29385a6c89d
-----------------------------------------------------------------------
tag latestrelease
Armadeus latest release
1dc8abdaafd70f4e8d12958c0bc69b6390bb8eda Updates Chanelog for release 3.1
-----------------------------------------------------------------------
hooks/post-receive
--
armadeus
|
