armadeus-commitlog Mailing List for armadeus (Page 37)
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: Sébastien S. <ss...@us...> - 2015-03-11 11:23:01
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ed8e268d9d3f20bf4aa20c533e3f0629f101e16a (commit)
from 5e40107346b9f1247bd5b80919d797d787fe5045 (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 ed8e268d9d3f20bf4aa20c533e3f0629f101e16a
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Mar 11 12:22:37 2015 +0100
[BUILDROOT] 2013.11: fix can-utils repository url
-----------------------------------------------------------------------
Summary of changes:
.../224-armadeus-fix_can_utils_repo_url.patch | 13 +++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 1 +
2 files changed, 14 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2013.11/224-armadeus-fix_can_utils_repo_url.patch
diff --git a/patches/buildroot/2013.11/224-armadeus-fix_can_utils_repo_url.patch b/patches/buildroot/2013.11/224-armadeus-fix_can_utils_repo_url.patch
new file mode 100644
index 0000000..a72a1b0
--- /dev/null
+++ b/patches/buildroot/2013.11/224-armadeus-fix_can_utils_repo_url.patch
@@ -0,0 +1,13 @@
+Index: buildroot/package/can-utils/can-utils.mk
+===================================================================
+--- buildroot.orig/package/can-utils/can-utils.mk
++++ buildroot/package/can-utils/can-utils.mk
+@@ -5,7 +5,7 @@
+ ################################################################################
+
+ CAN_UTILS_VERSION = 16c970d40e6c19dde705bad4751bab1a3a4f3a0d
+-CAN_UTILS_SITE = git://gitorious.org/linux-can/can-utils.git
++CAN_UTILS_SITE = http://github.com/linux-can/can-utils/tarball/$(CAN_UTILS_VERSION)
+ CAN_UTILS_AUTORECONF = YES
+
+ $(eval $(autotools-package))
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index abaac2b..3dc3e6c 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -47,6 +47,7 @@ rm -rf buildroot/package/busybox/Config.in
rm -rf buildroot/package/busybox/busybox-1.23.x.config
rm -rf buildroot/package/busybox/busybox.mk
rm -rf buildroot/package/busybox/snapshot/busybox-stty_add_rs485_config.patch
+rm -rf buildroot/package/can-utils/can-utils.mk
rm -rf buildroot/package/cunit/Config.in
rm -rf buildroot/package/cunit/cunit.mk
rm -rf buildroot/package/cwiid/Config.in
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2015-03-09 16:38:03
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5e40107346b9f1247bd5b80919d797d787fe5045 (commit)
via 39f2444e5fe99377a6479afe52193e203aaa1862 (commit)
via 3060fd6c9af2274b17af73f6ffb88b9e6c683384 (commit)
from 2a5824887a771bcccec6ae4c8d3e257960477308 (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 5e40107346b9f1247bd5b80919d797d787fe5045
Author: Julien Boibessot <jul...@ar...>
Date: Mon Mar 9 17:37:10 2015 +0100
[BUILDROOT] 2015.02: updates cleanup_buildroot.sh
commit 39f2444e5fe99377a6479afe52193e203aaa1862
Author: Julien Boibessot <jul...@ar...>
Date: Mon Mar 9 17:35:50 2015 +0100
[BUILDROOT] 2015.02: APF27: strace 4.9: fixes build with old kernels
commit 3060fd6c9af2274b17af73f6ffb88b9e6c683384
Author: Julien Boibessot <jul...@ar...>
Date: Mon Mar 9 17:30:28 2015 +0100
[BUILDROOT] 2015.02: fixes can-utils build
-----------------------------------------------------------------------
Summary of changes:
.../022-mainline-bump-can-utils-version.patch | 20 ++++++
...eus-fixes-strace-4.9-build-on-old-kernels.patch | 68 ++++++++++++++++++++
patches/buildroot/2015.02/cleanup_buildroot.sh | 38 +++++++----
3 files changed, 111 insertions(+), 15 deletions(-)
create mode 100644 patches/buildroot/2015.02/022-mainline-bump-can-utils-version.patch
create mode 100644 patches/buildroot/2015.02/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch
diff --git a/patches/buildroot/2015.02/022-mainline-bump-can-utils-version.patch b/patches/buildroot/2015.02/022-mainline-bump-can-utils-version.patch
new file mode 100644
index 0000000..55b8fa3
--- /dev/null
+++ b/patches/buildroot/2015.02/022-mainline-bump-can-utils-version.patch
@@ -0,0 +1,20 @@
+Backport from BR mainline for SITE. (Can be removed when switching to BR 2015.05.)
+VERSION is taken frome BR 2013.11 as newer can-utils fails to build on old kernels. TO FIX !
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/can-utils/can-utils.mk
+===================================================================
+--- buildroot.orig/package/can-utils/can-utils.mk 2015-03-01 22:26:12.000000000 +0100
++++ buildroot/package/can-utils/can-utils.mk 2015-03-09 15:28:02.176007201 +0100
+@@ -4,8 +4,8 @@
+ #
+ ################################################################################
+
+-CAN_UTILS_VERSION = 111f8d3acf6f6b30bf208fd9c98399c5fb9d29de
+-CAN_UTILS_SITE = git://gitorious.org/linux-can/can-utils.git
++CAN_UTILS_VERSION = 16c970d40e6c19dde705bad4751bab1a3a4f3a0d
++CAN_UTILS_SITE = $(call github,linux-can,can-utils,$(CAN_UTILS_VERSION))
+ CAN_UTILS_AUTORECONF = YES
+
+ $(eval $(autotools-package))
diff --git a/patches/buildroot/2015.02/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch b/patches/buildroot/2015.02/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch
new file mode 100644
index 0000000..1e9dc87
--- /dev/null
+++ b/patches/buildroot/2015.02/023-armadeus-fixes-strace-4.9-build-on-old-kernels.patch
@@ -0,0 +1,68 @@
+Backport from recent Linux kernels. (See also patches/linux/2.6.29/368-xxx
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch 2015-03-09 16:39:45.716159156 +0100
+@@ -0,0 +1,59 @@
++From 79b5dc0c64d88cda3da23b2e22a5cec0964372ac Mon Sep 17 00:00:00 2001
++From: Eric Paris <ep...@re...>
++Date: Fri, 15 Oct 2010 14:34:14 -0700
++Subject: types.h: define __aligned_u64 and expose to userspace
++
++We currently have a kernel internal type called aligned_u64 which aligns
++__u64's on 8 bytes boundaries even on systems which would normally align
++them on 4 byte boundaries. This patch creates a new type __aligned_u64
++which does the same thing but which is exposed to userspace rather than
++being kernel internal.
++
++[akpm: merge early as both the net and audit trees want this]
++
++[ak...@li...: enhance the comment describing the reasons for using aligned_u64. Via Andreas and Andi.]
++Based-on-patch-by: Andreas Gruenbacher <ag...@su...>
++Signed-off-by: Eric Paris <ep...@re...>
++Cc: Jan Engelhardt <je...@me...>
++Cc: David Miller <da...@da...>
++Cc: Andi Kleen <an...@fi...>
++Cc: Arnd Bergmann <ar...@ar...>
++Signed-off-by: Andrew Morton <ak...@li...>
++Signed-off-by: Linus Torvalds <tor...@li...>
++
++diff --git a/include/linux/types.h b/include/linux/types.h
++index 01a082f..357dbc1 100644
++--- a/include/linux/types.h
+++++ b/include/linux/types.h
++@@ -121,7 +121,15 @@ typedef __u64 u_int64_t;
++ typedef __s64 int64_t;
++ #endif
++
++-/* this is a special 64bit data type that is 8-byte aligned */
+++/*
+++ * aligned_u64 should be used in defining kernel<->userspace ABIs to avoid
+++ * common 32/64-bit compat problems.
+++ * 64-bit values align to 4-byte boundaries on x86_32 (and possibly other
+++ * architectures) and to 8-byte boundaries on 64-bit architetures. The new
+++ * aligned_64 type enforces 8-byte alignment so that structs containing
+++ * aligned_64 values have the same alignment on 32-bit and 64-bit architectures.
+++ * No conversions are necessary between 32-bit user-space and a 64-bit kernel.
+++ */
++ #define aligned_u64 __u64 __attribute__((aligned(8)))
++ #define aligned_be64 __be64 __attribute__((aligned(8)))
++ #define aligned_le64 __le64 __attribute__((aligned(8)))
++@@ -178,6 +186,11 @@ typedef __u64 __bitwise __be64;
++ typedef __u16 __bitwise __sum16;
++ typedef __u32 __bitwise __wsum;
++
+++/* this is a special 64bit data type that is 8-byte aligned */
+++#define __aligned_u64 __u64 __attribute__((aligned(8)))
+++#define __aligned_be64 __be64 __attribute__((aligned(8)))
+++#define __aligned_le64 __le64 __attribute__((aligned(8)))
+++
++ #ifdef __KERNEL__
++ typedef unsigned __bitwise__ gfp_t;
++ typedef unsigned __bitwise__ fmode_t;
++--
++cgit v0.10.2
++
diff --git a/patches/buildroot/2015.02/cleanup_buildroot.sh b/patches/buildroot/2015.02/cleanup_buildroot.sh
index cab2e20..8685fbc 100755
--- a/patches/buildroot/2015.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2015.02/cleanup_buildroot.sh
@@ -9,44 +9,51 @@
# #
####################################################
-rm -rf buildroot/Makefile
rm -rf buildroot/arch/Config.in.arm
rm -rf buildroot/boot/uboot/Config.in
rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/linux/Config.ext.in
rm -rf buildroot/linux/linux-ext-xenomai.mk
-rm -rf buildroot/package/Config.in
-rm -rf buildroot/package/Config.in.host
-rm -rf buildroot/package/agg/Config.in
+rm -rf buildroot/Makefile
rm -rf buildroot/package/agg/agg.mk
+rm -rf buildroot/package/agg/Config.in
rm -rf buildroot/package/alsa-utils/alsa-utils.mk
-rm -rf buildroot/package/beremiz/Config.in
rm -rf buildroot/package/beremiz/beremiz.mk
+rm -rf buildroot/package/beremiz/Config.in
rm -rf buildroot/package/beremiz/host-beremiz-fix_compare_and_swap_problem_to_be_removed_with_kernel_3.1.patch
-rm -rf buildroot/package/bluez3-libs/Config.in
-rm -rf buildroot/package/bluez3-libs/bluez3-libs.mk
-rm -rf buildroot/package/bluez3-utils/Config.in
-rm -rf buildroot/package/bluez3-utils/bluez3-utils.mk
rm -rf buildroot/package/bluez3/bluetooth.default
rm -rf buildroot/package/bluez3/bluez-pand-devup.sh
rm -rf buildroot/package/bluez3/bluez-utils-bluepin.sh
rm -rf buildroot/package/bluez3/hcid.conf
-rm -rf buildroot/package/bluez3/rfcomm-getty
+rm -rf buildroot/package/bluez3-libs/bluez3-libs.mk
+rm -rf buildroot/package/bluez3-libs/Config.in
rm -rf buildroot/package/bluez3/rfcomm.conf
+rm -rf buildroot/package/bluez3/rfcomm-getty
+rm -rf buildroot/package/bluez3-utils/bluez3-utils.mk
+rm -rf buildroot/package/bluez3-utils/Config.in
rm -rf buildroot/package/busybox/busybox-0007-stty_add_rs485_config.patch
rm -rf buildroot/package/busybox/busybox.mk
+rm -rf buildroot/package/can-utils/can-utils.mk
+rm -rf buildroot/package/Config.in
+rm -rf buildroot/package/Config.in.host
rm -rf buildroot/package/cunit/Config.in
rm -rf buildroot/package/cunit/cunit.mk
rm -rf buildroot/package/dbus/dbus.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
+rm -rf buildroot/package/freescale-imx/Config.in
+rm -rf buildroot/package/freescale-imx/freescale-imx.mk
+rm -rf buildroot/package/freescale-imx/imx-vpu/0001-vpu-io-fix-IOSystemInit-failure.patch
+rm -rf buildroot/package/freescale-imx/imx-vpu/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch
+rm -rf buildroot/package/freescale-imx/imx-vpu/3.10.17-1.0.0/0001-vpu-io-fix-IOSystemInit-failure.patch
+rm -rf buildroot/package/freescale-imx/imx-vpu/3.10.17-1.0.0/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch
rm -rf buildroot/package/gnash/Config.in
rm -rf buildroot/package/gnash/gnash.mk
rm -rf buildroot/package/gnokii/Config.in
rm -rf buildroot/package/gnokii/gnokii.mk
rm -rf buildroot/package/gpsd/Config.in
-rm -rf buildroot/package/gpsd/S50gpsd
rm -rf buildroot/package/gpsd/gpsd.mk
+rm -rf buildroot/package/gpsd/S50gpsd
rm -rf buildroot/package/gsmmux/Config.in
rm -rf buildroot/package/gsmmux/gsmmux.mk
rm -rf buildroot/package/imx-test/Config.in
@@ -58,6 +65,7 @@ rm -rf buildroot/package/imx-usb-loader/Config.in.host
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.patch
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
+rm -rf buildroot/package/linux-headers/2.6.29.6/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
rm -rf buildroot/package/marble/Config.in
rm -rf buildroot/package/marble/marble.mk
rm -rf buildroot/package/matiec/Config.in
@@ -70,12 +78,12 @@ rm -rf buildroot/package/owfs/Config.in
rm -rf buildroot/package/owfs/owfs.mk
rm -rf buildroot/package/pci_debug/Config.in
rm -rf buildroot/package/pci_debug/pci_debug.mk
+rm -rf buildroot/package/python/Config.in
rm -rf buildroot/package/python-pygame/Config.in
+rm -rf buildroot/package/python/python.mk
rm -rf buildroot/package/python-wx/Config.in
rm -rf buildroot/package/python-wx/python-wx-001-fix_wxconfig.patch
rm -rf buildroot/package/python-wx/python-wx.mk
-rm -rf buildroot/package/python/Config.in
-rm -rf buildroot/package/python/python.mk
rm -rf buildroot/package/pywebradio/Config.in
rm -rf buildroot/package/pywebradio/pywebradio.mk
rm -rf buildroot/package/qtcreator/Config.in.host
@@ -93,11 +101,11 @@ rm -rf buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
rm -rf buildroot/package/rxtx/rxtx.mk
rm -rf buildroot/package/sam7-pgm-ng/Config.in
rm -rf buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
-rm -rf buildroot/package/sdl_water/Config.in
-rm -rf buildroot/package/sdl_water/sdl_water.mk
rm -rf buildroot/package/sdlquake/Config.in
rm -rf buildroot/package/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
rm -rf buildroot/package/sdlquake/sdlquake.mk
+rm -rf buildroot/package/sdl_water/Config.in
+rm -rf buildroot/package/sdl_water/sdl_water.mk
rm -rf buildroot/package/shiboken/Config.in
rm -rf buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch
rm -rf buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2015-03-09 13:35:02
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 2a5824887a771bcccec6ae4c8d3e257960477308 (commit)
from e72b5f2b2828b25fabeb10d3ad4f63913d72b1fd (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 2a5824887a771bcccec6ae4c8d3e257960477308
Author: Julien Boibessot <jul...@ar...>
Date: Mon Mar 9 14:34:26 2015 +0100
[BUILDROOT] APF27: strace 4.9: fixes build with old kernels
-----------------------------------------------------------------------
Summary of changes:
...ine-__aligned_u64-and-expose-to-userspace.patch | 59 ++++++++++++++++++++
1 files changed, 59 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/2.6.29/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
diff --git a/patches/linux/2.6.29/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch b/patches/linux/2.6.29/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
new file mode 100644
index 0000000..27506d9
--- /dev/null
+++ b/patches/linux/2.6.29/368-redhat-types_h-define-__aligned_u64-and-expose-to-userspace.patch
@@ -0,0 +1,59 @@
+From 79b5dc0c64d88cda3da23b2e22a5cec0964372ac Mon Sep 17 00:00:00 2001
+From: Eric Paris <ep...@re...>
+Date: Fri, 15 Oct 2010 14:34:14 -0700
+Subject: types.h: define __aligned_u64 and expose to userspace
+
+We currently have a kernel internal type called aligned_u64 which aligns
+__u64's on 8 bytes boundaries even on systems which would normally align
+them on 4 byte boundaries. This patch creates a new type __aligned_u64
+which does the same thing but which is exposed to userspace rather than
+being kernel internal.
+
+[akpm: merge early as both the net and audit trees want this]
+
+[ak...@li...: enhance the comment describing the reasons for using aligned_u64. Via Andreas and Andi.]
+Based-on-patch-by: Andreas Gruenbacher <ag...@su...>
+Signed-off-by: Eric Paris <ep...@re...>
+Cc: Jan Engelhardt <je...@me...>
+Cc: David Miller <da...@da...>
+Cc: Andi Kleen <an...@fi...>
+Cc: Arnd Bergmann <ar...@ar...>
+Signed-off-by: Andrew Morton <ak...@li...>
+Signed-off-by: Linus Torvalds <tor...@li...>
+
+diff --git a/include/linux/types.h b/include/linux/types.h
+index 01a082f..357dbc1 100644
+--- a/include/linux/types.h
++++ b/include/linux/types.h
+@@ -121,7 +121,15 @@ typedef __u64 u_int64_t;
+ typedef __s64 int64_t;
+ #endif
+
+-/* this is a special 64bit data type that is 8-byte aligned */
++/*
++ * aligned_u64 should be used in defining kernel<->userspace ABIs to avoid
++ * common 32/64-bit compat problems.
++ * 64-bit values align to 4-byte boundaries on x86_32 (and possibly other
++ * architectures) and to 8-byte boundaries on 64-bit architetures. The new
++ * aligned_64 type enforces 8-byte alignment so that structs containing
++ * aligned_64 values have the same alignment on 32-bit and 64-bit architectures.
++ * No conversions are necessary between 32-bit user-space and a 64-bit kernel.
++ */
+ #define aligned_u64 __u64 __attribute__((aligned(8)))
+ #define aligned_be64 __be64 __attribute__((aligned(8)))
+ #define aligned_le64 __le64 __attribute__((aligned(8)))
+@@ -178,6 +186,11 @@ typedef __u64 __bitwise __be64;
+ typedef __u16 __bitwise __sum16;
+ typedef __u32 __bitwise __wsum;
+
++/* this is a special 64bit data type that is 8-byte aligned */
++#define __aligned_u64 __u64 __attribute__((aligned(8)))
++#define __aligned_be64 __be64 __attribute__((aligned(8)))
++#define __aligned_le64 __le64 __attribute__((aligned(8)))
++
+ #ifdef __KERNEL__
+ typedef unsigned __bitwise__ gfp_t;
+ typedef unsigned __bitwise__ fmode_t;
+--
+cgit v0.10.2
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2015-03-05 15:11:01
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via e72b5f2b2828b25fabeb10d3ad4f63913d72b1fd (commit)
from 0e81b13389ec09fca00f522c73fba81e1d88f4a0 (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 e72b5f2b2828b25fabeb10d3ad4f63913d72b1fd
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 5 16:08:44 2015 +0100
[BUILDROOT] convert fpga_firmware package to BR state of the art
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 6 +-
buildroot/configs/apf27mainline_defconfig | 6 +-
buildroot/configs/apf27test_defconfig | 6 +-
buildroot/configs/apf27xenomai_defconfig | 6 +-
buildroot/configs/apf27xenomaimainline_defconfig | 6 +-
buildroot/configs/apf51_defconfig | 6 +-
buildroot/configs/apf51mainline_defconfig | 6 +-
buildroot/configs/apf51test_defconfig | 6 +-
buildroot/configs/apf9328_defconfig | 6 +-
buildroot/configs/apf9328test_defconfig | 6 +-
buildroot/configs/apf9328xenomai_defconfig | 6 +-
buildroot/configs/pps51_defconfig | 4 +-
buildroot/package/armadeus/fpga_firmware/Config.in | 18 ++++----
.../armadeus/fpga_firmware/fpga_firmware.mk | 49 ++++++++------------
14 files changed, 63 insertions(+), 74 deletions(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index b87824e..20fabd6 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -40,9 +40,9 @@ 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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_AD9889CTRL=y
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 495e57d..7e0289b 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -43,9 +43,9 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_AD9889CTRL=y
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 48bf6c9..d4e0d53 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -57,9 +57,9 @@ 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=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_TESTSUITE=y
diff --git a/buildroot/configs/apf27xenomai_defconfig b/buildroot/configs/apf27xenomai_defconfig
index 701092a..8db8920 100644
--- a/buildroot/configs/apf27xenomai_defconfig
+++ b/buildroot/configs/apf27xenomai_defconfig
@@ -42,9 +42,9 @@ BR2_LINUX_KERNEL_EXT_XENOMAI=y
BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="ftp://ftp2.armadeus.com/armadeusw/adeos-ipipe-2.6.29-arm-1.13-05.patch"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_AD9889CTRL=y
diff --git a/buildroot/configs/apf27xenomaimainline_defconfig b/buildroot/configs/apf27xenomaimainline_defconfig
index 0121ab6..8525bdc 100644
--- a/buildroot/configs/apf27xenomaimainline_defconfig
+++ b/buildroot/configs/apf27xenomaimainline_defconfig
@@ -44,9 +44,9 @@ BR2_LINUX_KERNEL_EXT_XENOMAI=y
BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="http://download.gna.org/adeos/patches/v3.x/arm/ipipe-core-3.14.17-arm-4.patch"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_AD9889CTRL=y
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index a8de5e5..85baf45 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -42,9 +42,9 @@ 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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_APF51_DUAL_UART=y
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_TFP410CTRL=y
BR2_PACKAGE_ALSA_UTILS=y
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index 3e43ca1..1cf78cb 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -36,9 +36,9 @@ BR2_CPU_NAME="imx51"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_APF51_DUAL_UART=y
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_TFP410CTRL=y
BR2_PACKAGE_ALSA_UTILS=y
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 8d7b923..60778e0 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -58,9 +58,9 @@ 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=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_APF51_DUAL_UART=y
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_TFP410CTRL=y
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index f01f70c..af6931f 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -42,9 +42,9 @@ 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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_CH7024CTRL=y
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 89f0d74..1a6be7e 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -58,9 +58,9 @@ 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=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_TESTSUITE=y
diff --git a/buildroot/configs/apf9328xenomai_defconfig b/buildroot/configs/apf9328xenomai_defconfig
index d97fd9d..25ab662 100644
--- a/buildroot/configs/apf9328xenomai_defconfig
+++ b/buildroot/configs/apf9328xenomai_defconfig
@@ -43,9 +43,9 @@ BR2_LINUX_KERNEL_EXT_XENOMAI=y
BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="ftp://ftp2.armadeus.com/armadeusw/adeos-ipipe-2.6.29-arm-1.13-05.patch"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
-BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
+BR2_PACKAGE_FPGA_FIRMWARE_EXPORT=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
BR2_PACKAGE_CH7024CTRL=y
diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index 4f3761f..5a3ebb8 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -43,8 +43,8 @@ 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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
-BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
+BR2_PACKAGE_FPGA_FIRMWARE=y
+BR2_PACKAGE_FPGA_FIRMWARE_APF51_DUAL_UART=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_PPS=y
diff --git a/buildroot/package/armadeus/fpga_firmware/Config.in b/buildroot/package/armadeus/fpga_firmware/Config.in
index c519a06..6ad29ab 100644
--- a/buildroot/package/armadeus/fpga_firmware/Config.in
+++ b/buildroot/package/armadeus/fpga_firmware/Config.in
@@ -1,20 +1,20 @@
-config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
+config BR2_PACKAGE_FPGA_FIRMWARE
bool "FPGA Firmware"
help
Install some FPGA firmwares.
-if BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
+if BR2_PACKAGE_FPGA_FIRMWARE
choice
prompt "Firmware(s) to install"
- default BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
+ default BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM
-config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART
+config BR2_PACKAGE_FPGA_FIRMWARE_APF51_DUAL_UART
bool "APF51 dual UARTs (GSM/GPS)"
help
Required if your want to use GSM or GPS on the APF51Dev. Firmware
will be named /lib/firmware/fpga/apf51_gsm_gps_firmware.bin.
-config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
+config BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM
bool "Custom list"
help
Use one or more custom FPGA binary files. The FPGA binary files will
@@ -22,13 +22,13 @@ config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
endchoice
-config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE
+config BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE
string "Firmware(s) path list"
- depends on BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
+ depends on BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM
help
Path list to your custom FPGA binary files to install.
-config BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE
+config BR2_PACKAGE_FPGA_FIRMWARE_EXPORT
bool "Export the FPGA firmware to Buildroot output/images/ folder"
help
Build a link from Buildroot output/images/ folder to the FPGA
@@ -36,4 +36,4 @@ config BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE
This link will be named $(BOARD_NAME)-firmware.bin (default name
looked by U-Boot when asking for firmware update).
-endif # BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
+endif # BR2_PACKAGE_FPGA_FIRMWARE
diff --git a/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
index b34f72e..b1c991a 100644
--- a/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
+++ b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
@@ -4,47 +4,36 @@
#
#############################################################
-ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART)),y)
-FPGA_FIRMWARE = $(BASE_DIR)/../../firmware/pod_scripts/apf51_gsm_gps_firmware.bin
+FPGA_FIRMWARE_VERSION = 6.0
+FPGA_FIRMWARE_SITE = $(TOPDIR)/../firmware
+FPGA_FIRMWARE_SITE_METHOD = local
+
+ifeq ($(strip $(BR2_PACKAGE_FPGA_FIRMWARE_APF51_DUAL_UART)),y)
+FPGA_FIRMWARE = $(TOPDIR)/../firmware/pod_scripts/apf51_gsm_gps_firmware.bin
endif
-ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM)),y)
-FPGA_FIRMWARE = $(call qstrip,$(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE))
+ifeq ($(strip $(BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM)),y)
+FPGA_FIRMWARE = $(call qstrip,$(BR2_PACKAGE_FPGA_FIRMWARE_CUSTOM_FILE))
endif
FIRMWARES += $(FPGA_FIRMWARE)
-FPGA_FIRMWARE_TARGET_DIR:=/lib/firmware/fpga/
+FPGA_FIRMWARE_TARGET_DIR = $(TARGET_DIR)/lib/firmware/fpga/
-$(STAMP_DIR)/.fpga_firmware_installed:
- @$(call MESSAGE,"Installing some FPGA firmwares")
- mkdir -p $(TARGET_DIR)/$(FPGA_FIRMWARE_TARGET_DIR)
- for firmware in $(FIRMWARES); do \
- $(INSTALL) -m 0755 $$firmware $(TARGET_DIR)/$(FPGA_FIRMWARE_TARGET_DIR) ; \
- done
-ifeq ($(BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE),y)
+ifeq ($(BR2_PACKAGE_FPGA_FIRMWARE_EXPORT),y)
+define FPGA_FIRMWARE_EXPORT
# Only last file in previous list will remain as symlink
for firmware in $(FIRMWARES); do \
ln -sf $$firmware $(BINARIES_DIR)/$(BOARD_NAME)-firmware.bin ; \
done
+endef
endif
- touch $@
-
-fpga-firmware: $(STAMP_DIR)/.fpga_firmware_installed
-fpga-firmware-clean:
- @$(call MESSAGE,"Cleaning FPGA firmwares")
+define FPGA_FIRMWARE_INSTALL_TARGET_CMDS
+ @$(call MESSAGE,"Installing some FPGA firmwares")
+ mkdir -p $(FPGA_FIRMWARE_TARGET_DIR)
for firmware in $(FIRMWARES); do \
- firmname=`basename $$firmware` ; \
- rm -f $(TARGET_DIR)/$(FPGA_FIRMWARE_TARGET_DIR)/$$firmname ; \
+ $(INSTALL) -m 0755 $$firmware $(FPGA_FIRMWARE_TARGET_DIR) ; \
done
- rm -f $(STAMP_DIR)/.fpga_firmware_installed
-ifeq ($(BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE),y)
- rm -f $(BINARIES_DIR)/$(BOARD_NAME)-firmware.bin
-endif
-
-fpga-firmware-dirclean: fpga-firmware-clean
+ $(FPGA_FIRMWARE_EXPORT)
+endef
-fpga-firmware-rebuild: fpga-firmware-clean fpga-firmware
-
-ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE)),y)
-TARGETS+=fpga-firmware
-endif
+$(eval $(generic-package))
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2015-03-05 11:25: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 0e81b13389ec09fca00f522c73fba81e1d88f4a0 (commit)
from 235669301472ab056ada40b52bb136bea10979a5 (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 0e81b13389ec09fca00f522c73fba81e1d88f4a0
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 5 12:24:40 2015 +0100
[BUILDROOT] 2015.02: apf6legacy: use 3.10.31_1.1.0_beta2 version of i.MX Libraries by default
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6legacy_defconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 96e825b..bf0c75d 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -69,6 +69,7 @@ BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
BR2_PACKAGE_EVTEST=y
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
+BR2_PACKAGE_FREESCALE_IMX_VERSION_3_10_31=y
BR2_PACKAGE_GPU_VIV_BIN_MX6Q=y
BR2_PACKAGE_I2C_TOOLS=y
BR2_PACKAGE_TI_UTILS=y
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2015-03-04 20:46: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 235669301472ab056ada40b52bb136bea10979a5 (commit)
via 6ee128275ba1eb96557867a51d6c16de3301beb7 (commit)
from c04fd17d157a15d98c787efd3ac32ee208f2cdda (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 235669301472ab056ada40b52bb136bea10979a5
Author: Philippe Reynes <tr...@gm...>
Date: Thu Feb 26 18:44:30 2015 +0100
[LINUX] 3.14: move to 3.14.33
commit 6ee128275ba1eb96557867a51d6c16de3301beb7
Author: Philippe Reynes <tr...@gm...>
Date: Thu Feb 26 18:44:29 2015 +0100
[LINUX] 3.10: move to 3.10.69
-----------------------------------------------------------------------
Summary of changes:
...x-3.10.67.config => apf27-linux-3.10.69.config} | 0
...x-3.14.31.config => apf27-linux-3.14.33.config} | 0
...x-3.10.67.config => apf28-linux-3.10.69.config} | 0
...x-3.14.31.config => apf28-linux-3.14.33.config} | 0
...x-3.10.67.config => apf51-linux-3.10.69.config} | 0
...x-3.14.31.config => apf51-linux-3.14.33.config} | 0
patches/linux/{3.10.67 => 3.10.69} | 0
patches/linux/{3.14.31 => 3.14.33} | 0
8 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.67.config => apf27-linux-3.10.69.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.31.config => apf27-linux-3.14.33.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.67.config => apf28-linux-3.10.69.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.31.config => apf28-linux-3.14.33.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.67.config => apf51-linux-3.10.69.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.31.config => apf51-linux-3.14.33.config} (100%)
rename patches/linux/{3.10.67 => 3.10.69} (100%)
rename patches/linux/{3.14.31 => 3.14.33} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.67.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.69.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.67.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.69.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.31.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.33.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.31.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.33.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.67.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.69.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.67.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.69.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.31.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.33.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.31.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.33.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.67.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.69.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.67.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.69.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.31.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.33.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.31.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.33.config
diff --git a/patches/linux/3.10.67 b/patches/linux/3.10.69
similarity index 100%
rename from patches/linux/3.10.67
rename to patches/linux/3.10.69
diff --git a/patches/linux/3.14.31 b/patches/linux/3.14.33
similarity index 100%
rename from patches/linux/3.14.31
rename to patches/linux/3.14.33
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2015-03-04 15:48:03
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via c04fd17d157a15d98c787efd3ac32ee208f2cdda (commit)
from ceb960aa194661f818015511a402a2797e8d18c1 (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 c04fd17d157a15d98c787efd3ac32ee208f2cdda
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Mar 4 16:51:09 2015 +0100
[BUILDROOT] apf6legacy_defconfig: add host imx-usb-loader package
It is needed to run apf6_recover.py script
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6legacy_defconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 152ca3e..96e825b 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -96,3 +96,4 @@ BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_PACKAGE_HOST_IMX_USB_LOADER=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2015-03-03 20:39:31
|
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 ceb960aa194661f818015511a402a2797e8d18c1 (commit)
from b2f5b0ee88a1bd4001f97bf70652a6fdf9e24f73 (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 ceb960aa194661f818015511a402a2797e8d18c1
Author: Julien Boibessot <jul...@ar...>
Date: Tue Mar 3 21:37:07 2015 +0100
[LINUX] APF6: 3.10 legacy: Add CPU thermal monitoring support
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf6/apf6legacy-linux-3.10.config | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
index dceab50..c8868a3 100644
--- a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
+++ b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
@@ -161,6 +161,9 @@ CONFIG_SPI=y
CONFIG_SPI_IMX=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HWMON is not set
+CONFIG_THERMAL=y
+CONFIG_CPU_THERMAL=y
+CONFIG_IMX_THERMAL=y
CONFIG_WATCHDOG=y
CONFIG_IMX2_WDT=y
CONFIG_MFD_DA9052_I2C=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2015-03-02 16:34:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b2f5b0ee88a1bd4001f97bf70652a6fdf9e24f73 (commit)
via 71ce737c7b05d83d9ec0bc3ca09123189b50c0f5 (commit)
from bf63223603be598a499b0c5b472f2692fd60d29f (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 b2f5b0ee88a1bd4001f97bf70652a6fdf9e24f73
Author: Julien Boibessot <jul...@ar...>
Date: Mon Mar 2 17:32:45 2015 +0100
[LINUX] APF6: 3.10 legacy: add LED heartbeat support
commit 71ce737c7b05d83d9ec0bc3ca09123189b50c0f5
Author: Julien Boibessot <jul...@ar...>
Date: Mon Mar 2 17:30:55 2015 +0100
[BUILDROOT] 2015.02: Add the possibilty to choose i.MX Librairies version to avoid incompatibility with some kernels
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf6/apf6legacy-linux-3.10.config | 6 ++
...sibility-to-choose-i.MX-Libraries-version.patch | 76 ++++++++++++++++++++
2 files changed, 82 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2015.02/019-armadeus-Add-the-possibility-to-choose-i.MX-Libraries-version.patch
diff --git a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
index 2abc708..dceab50 100644
--- a/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
+++ b/buildroot/target/device/armadeus/apf6/apf6legacy-linux-3.10.config
@@ -250,6 +250,12 @@ CONFIG_MXC_MIPI_CSI2=y
CONFIG_MXC_MLB150=m
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PWM=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
CONFIG_RTC_DRV_MC13XXX=y
diff --git a/patches/buildroot/2015.02/019-armadeus-Add-the-possibility-to-choose-i.MX-Libraries-version.patch b/patches/buildroot/2015.02/019-armadeus-Add-the-possibility-to-choose-i.MX-Libraries-version.patch
new file mode 100644
index 0000000..9c7faac
--- /dev/null
+++ b/patches/buildroot/2015.02/019-armadeus-Add-the-possibility-to-choose-i.MX-Libraries-version.patch
@@ -0,0 +1,76 @@
+From 8d3a9e4482c7e349f22fb29bb9676d599d88435a Mon Sep 17 00:00:00 2001
+From: Julien Boibessot <jul...@ar...>
+Date: Mon, 2 Mar 2015 16:46:07 +0100
+Subject: [PATCH 1/1] Add the possibility to choose i.MX Libraries version
+
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+---
+ package/freescale-imx/Config.in | 25 ++++++++++++++++++++
+ package/freescale-imx/freescale-imx.mk | 2 +-
+ .../0001-vpu-io-fix-IOSystemInit-failure.patch | 0
+ ...-lib-fix-IOGetVirtMem-return-value-checks.patch | 0
+ 4 files changed, 26 insertions(+), 1 deletion(-)
+ rename package/freescale-imx/imx-vpu/{ => 3.10.17-1.0.0}/0001-vpu-io-fix-IOSystemInit-failure.patch (100%)
+ rename package/freescale-imx/imx-vpu/{ => 3.10.17-1.0.0}/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch (100%)
+
+diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in
+index 72d3c59..c2629b3 100644
+--- a/package/freescale-imx/Config.in
++++ b/package/freescale-imx/Config.in
+@@ -42,6 +42,31 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
+ default "IMX53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
+ default "IMX6Q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
+
++choice
++ prompt "Version"
++ help
++ Freescale libraries are tidly binded with Linux kernel and so one
++ must choose the right librairies version for the right kernel.
++ For ex: rel_imx_3.10.17_1.0.0_ga kernel works only with 3.10.17-1.0.0
++ libraires.
++
++config BR2_PACKAGE_FREESCALE_IMX_VERSION_3_10_17
++ bool "3.10.17-1.0.0"
++
++config BR2_PACKAGE_FREESCALE_IMX_VERSION_3_10_31
++ bool "3.10.31-1.1.0-beta"
++
++config BR2_PACKAGE_FREESCALE_IMX_VERSION_3_10_53
++ bool "3.10.53-1.0.0"
++
++endchoice
++
++config BR2_PACKAGE_FREESCALE_IMX_VERSION
++ string
++ default "3.10.17-1.0.0" if BR2_PACKAGE_FREESCALE_IMX_VERSION_3_10_17
++ default "3.10.31-1.1.0-beta" if BR2_PACKAGE_FREESCALE_IMX_VERSION_3_10_31
++ default "3.10.53-1.0.0" if BR2_PACKAGE_FREESCALE_IMX_VERSION_3_10_53
++
+ source "package/freescale-imx/imx-lib/Config.in"
+ source "package/freescale-imx/imx-vpu/Config.in"
+ source "package/freescale-imx/firmware-imx/Config.in"
+diff --git a/package/freescale-imx/freescale-imx.mk b/package/freescale-imx/freescale-imx.mk
+index 64f3b6b..e34205a 100644
+--- a/package/freescale-imx/freescale-imx.mk
++++ b/package/freescale-imx/freescale-imx.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-FREESCALE_IMX_VERSION = 3.10.17-1.0.0
++FREESCALE_IMX_VERSION = $(call qstrip,$(BR2_PACKAGE_FREESCALE_IMX_VERSION))
+ FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO
+
+ # Helper for self-extracting binaries distributed by Freescale.
+diff --git a/package/freescale-imx/imx-vpu/0001-vpu-io-fix-IOSystemInit-failure.patch b/package/freescale-imx/imx-vpu/3.10.17-1.0.0/0001-vpu-io-fix-IOSystemInit-failure.patch
+similarity index 100%
+rename from package/freescale-imx/imx-vpu/0001-vpu-io-fix-IOSystemInit-failure.patch
+rename to package/freescale-imx/imx-vpu/3.10.17-1.0.0/0001-vpu-io-fix-IOSystemInit-failure.patch
+diff --git a/package/freescale-imx/imx-vpu/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch b/package/freescale-imx/imx-vpu/3.10.17-1.0.0/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch
+similarity index 100%
+rename from package/freescale-imx/imx-vpu/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch
+rename to package/freescale-imx/imx-vpu/3.10.17-1.0.0/0002-vpu-lib-fix-IOGetVirtMem-return-value-checks.patch
+--
+1.7.9.5
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2015-03-02 11:33:44
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via bf63223603be598a499b0c5b472f2692fd60d29f (commit)
via 99fa150c8b9f74eaf26c53f9fdbeebb0e0074de1 (commit)
via 87e2bfe1e2a2e95aaf781d57ebf71d826db4754d (commit)
from c16f7b8175216cced43ee30ed06a48b5085a049a (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 bf63223603be598a499b0c5b472f2692fd60d29f
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Mar 2 12:38:39 2015 +0100
[BUILDROOT] apf6legacy_defconfig: set i.MX6 as default platform for
BR2_PACKAGE_FREESCALE_IMX + cleanup
commit 99fa150c8b9f74eaf26c53f9fdbeebb0e0074de1
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Mar 2 10:12:52 2015 +0100
[BUILDROOT] Remove 2014.11 patches
commit 87e2bfe1e2a2e95aaf781d57ebf71d826db4754d
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Mar 2 10:10:04 2015 +0100
[BUILDROOT] 2015.02: add 2015.02 support
Patch 223 has been merged by upstream.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6legacy_defconfig | 13 +-
.../2014.11/001-add_armadeus_device.patch | 25 -
.../002-add_armadeus_specific_packages.patch | 16 -
...us-gpsd-add-options-setting-in-menuconfig.patch | 48 -
.../2014.11/006-armadeus-add-owfs-package.patch | 55 --
.../2014.11/007-armadeus-add-agg-package.patch | 74 --
.../2014.11/008-armadeus-add-gnash-package.patch | 155 ---
.../009-armadeus-xc3sprog-new-package.patch | 108 ---
.../010-armadeus-sam7-pgm-ng-new-package.patch | 50 -
.../2014.11/011-armadeus-add-tk-package.patch | 72 --
...12-armadeus-add-tkinter-support-to-python.patch | 50 -
.../014-armadeus-python-wx-add-package.patch | 115 ---
...rmadeus-gpu-vivante-sdk-new-package.patch.tofix | 134 ---
.../016-armadeus-add-gnuboy-package.tocheck | 80 --
.../021-armadeus-add-sdl_water-package.patch | 59 --
.../034-armadeus-add-slideshow-package.patch | 170 ----
...add_support_for_custom_configuration_file.patch | 46 -
...072-armadeus-xenomai-download-adeos-patch.patch | 59 --
.../buildroot/2014.11/072-xenomai-package.tofix | 222 -----
...ai-add-configure-options-for-old-versions.patch | 37 -
...dependecy-evaluated-before-patching.patch.tofix | 23 -
.../buildroot/2014.11/081-adds_quake_package.patch | 159 ---
.../2014.11/083-pygame-armadeus_addons.patch | 43 -
...for_pld_asm_instruction_on_non_armv5_arch.patch | 22 -
.../107-armadeus-games-add-wolf4sdl-package.patch | 74 --
.../buildroot/2014.11/110-bluez3-add_package.patch | 118 ---
patches/buildroot/2014.11/111-bluez3-hacks.patch | 198 ----
.../2014.11/118-armadeus-snes9x-add-package.patch | 390 --------
.../2014.11/121-target-arm926t_is_arm926ej-s.patch | 18 -
.../123-armadeus-pywebradio-add-package.patch | 48 -
.../buildroot/2014.11/124-e-uae-add_package.patch | 54 --
...42-ncurses-fix_compilation_with_old_hosts.patch | 25 -
...-disable_ip_busybox_if_iproute2_buildroot.patch | 36 -
...fix_installation_bug_on_some_host_systems.patch | 19 -
...lection_even_when_custom_rootfs_is_chosen.patch | 48 -
.../buildroot/2014.11/172-gsmmux-add_package.patch | 88 --
.../2014.11/176-imx-test-add_package.patch | 148 ---
...ag_build_against_old_kernel_headers.patch.tofix | 81 --
.../2014.11/181-qtcreator-add_package.patch | 1002 --------------------
.../182-uclibc-add_accept4_declaration_fix.patch | 76 --
...penwrt-uclibc-add-kernel_long-declaration.patch | 374 --------
.../2014.11/184-fsl-mm-codeclib-add_package.patch | 30 -
...nore-env_sectors-on-NOR-and-SPI-dataflash.patch | 81 --
.../buildroot/2014.11/188-marble-add_package.patch | 358 -------
.../2014.11/189-dbus-fix_installation.patch | 22 -
.../buildroot/2014.11/197-cunit-add_package.patch | 49 -
.../2014.11/201-armadeus-add_gnokii.patch | 55 --
.../204-wpa-supplicant-add-option-ieee80211w.patch | 34 -
...x-coreutils-stty-add-rs485-config-options.patch | 356 -------
.../2014.11/208-armadeus-add_beremiz.patch | 108 ---
.../2014.11/209-armadeus-add_matiec.patch | 73 --
.../2014.11/210-poppler-qt_compiling.patch | 23 -
.../214-mplayer-fix-compilation.patch.tofix | 13 -
.../2014.11/219-shiboken-add_package.patch | 266 ------
.../221-v2-3-3-imx-usb-loader-new-package.patch | 291 ------
patches/buildroot/2014.11/cleanup_buildroot.sh | 127 ---
patches/buildroot/2015.02-rc3 | 1 -
.../223-linux-add-support-for-4.x-versions.patch | 21 -
patches/buildroot/2015.02/cleanup_buildroot.sh | 1 -
59 files changed, 5 insertions(+), 6536 deletions(-)
delete mode 100644 patches/buildroot/2014.11/001-add_armadeus_device.patch
delete mode 100644 patches/buildroot/2014.11/002-add_armadeus_specific_packages.patch
delete mode 100644 patches/buildroot/2014.11/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
delete mode 100644 patches/buildroot/2014.11/006-armadeus-add-owfs-package.patch
delete mode 100644 patches/buildroot/2014.11/007-armadeus-add-agg-package.patch
delete mode 100644 patches/buildroot/2014.11/008-armadeus-add-gnash-package.patch
delete mode 100644 patches/buildroot/2014.11/009-armadeus-xc3sprog-new-package.patch
delete mode 100644 patches/buildroot/2014.11/010-armadeus-sam7-pgm-ng-new-package.patch
delete mode 100644 patches/buildroot/2014.11/011-armadeus-add-tk-package.patch
delete mode 100644 patches/buildroot/2014.11/012-armadeus-add-tkinter-support-to-python.patch
delete mode 100644 patches/buildroot/2014.11/014-armadeus-python-wx-add-package.patch
delete mode 100644 patches/buildroot/2014.11/015-armadeus-gpu-vivante-sdk-new-package.patch.tofix
delete mode 100644 patches/buildroot/2014.11/016-armadeus-add-gnuboy-package.tocheck
delete mode 100644 patches/buildroot/2014.11/021-armadeus-add-sdl_water-package.patch
delete mode 100644 patches/buildroot/2014.11/034-armadeus-add-slideshow-package.patch
delete mode 100644 patches/buildroot/2014.11/050-U-Boot-add_support_for_custom_configuration_file.patch
delete mode 100644 patches/buildroot/2014.11/072-armadeus-xenomai-download-adeos-patch.patch
delete mode 100644 patches/buildroot/2014.11/072-xenomai-package.tofix
delete mode 100644 patches/buildroot/2014.11/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
delete mode 100644 patches/buildroot/2014.11/075-armadeus-pkg-generic-makes-dependecy-evaluated-before-patching.patch.tofix
delete mode 100644 patches/buildroot/2014.11/081-adds_quake_package.patch
delete mode 100644 patches/buildroot/2014.11/083-pygame-armadeus_addons.patch
delete mode 100644 patches/buildroot/2014.11/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
delete mode 100644 patches/buildroot/2014.11/107-armadeus-games-add-wolf4sdl-package.patch
delete mode 100644 patches/buildroot/2014.11/110-bluez3-add_package.patch
delete mode 100644 patches/buildroot/2014.11/111-bluez3-hacks.patch
delete mode 100644 patches/buildroot/2014.11/118-armadeus-snes9x-add-package.patch
delete mode 100644 patches/buildroot/2014.11/121-target-arm926t_is_arm926ej-s.patch
delete mode 100644 patches/buildroot/2014.11/123-armadeus-pywebradio-add-package.patch
delete mode 100644 patches/buildroot/2014.11/124-e-uae-add_package.patch
delete mode 100644 patches/buildroot/2014.11/142-ncurses-fix_compilation_with_old_hosts.patch
delete mode 100644 patches/buildroot/2014.11/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
delete mode 100644 patches/buildroot/2014.11/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
delete mode 100644 patches/buildroot/2014.11/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch
delete mode 100644 patches/buildroot/2014.11/172-gsmmux-add_package.patch
delete mode 100644 patches/buildroot/2014.11/176-imx-test-add_package.patch
delete mode 100644 patches/buildroot/2014.11/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch.tofix
delete mode 100644 patches/buildroot/2014.11/181-qtcreator-add_package.patch
delete mode 100644 patches/buildroot/2014.11/182-uclibc-add_accept4_declaration_fix.patch
delete mode 100644 patches/buildroot/2014.11/183-openwrt-uclibc-add-kernel_long-declaration.patch
delete mode 100644 patches/buildroot/2014.11/184-fsl-mm-codeclib-add_package.patch
delete mode 100644 patches/buildroot/2014.11/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
delete mode 100644 patches/buildroot/2014.11/188-marble-add_package.patch
delete mode 100644 patches/buildroot/2014.11/189-dbus-fix_installation.patch
delete mode 100644 patches/buildroot/2014.11/197-cunit-add_package.patch
delete mode 100644 patches/buildroot/2014.11/201-armadeus-add_gnokii.patch
delete mode 100644 patches/buildroot/2014.11/204-wpa-supplicant-add-option-ieee80211w.patch
delete mode 100644 patches/buildroot/2014.11/205-busybox-coreutils-stty-add-rs485-config-options.patch
delete mode 100644 patches/buildroot/2014.11/208-armadeus-add_beremiz.patch
delete mode 100644 patches/buildroot/2014.11/209-armadeus-add_matiec.patch
delete mode 100644 patches/buildroot/2014.11/210-poppler-qt_compiling.patch
delete mode 100644 patches/buildroot/2014.11/214-mplayer-fix-compilation.patch.tofix
delete mode 100644 patches/buildroot/2014.11/219-shiboken-add_package.patch
delete mode 100644 patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
delete mode 100755 patches/buildroot/2014.11/cleanup_buildroot.sh
delete mode 120000 patches/buildroot/2015.02-rc3
delete mode 100644 patches/buildroot/2015.02/223-linux-add-support-for-4.x-versions.patch
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 6306941..152ca3e 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -1,4 +1,3 @@
-# To build APF6 BSP with Freescale's kernel/libs
BR2_arm=y
BR2_cortex_a9=y
BR2_ARM_EABIHF=y
@@ -36,7 +35,6 @@ BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
-BR2_PACKAGE_GDB=y
BR2_PACKAGE_GSTREAMER=y
BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA=y
@@ -44,9 +42,9 @@ BR2_PACKAGE_GST_PLUGINS_GOOD=y
BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4=y
BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIFILE=y
BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIPART=y
-BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2=y
BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX=y
BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOCROP=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2=y
BR2_PACKAGE_GST_PLUGINS_BAD=y
BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN=y
BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
@@ -54,26 +52,25 @@ BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE=y
BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE=y
BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV=y
BR2_PACKAGE_GST_FSL_PLUGINS=y
+BR2_PACKAGE_GDB=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_RAMSMP=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_FBGRAB=y
+BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_JPEG is not set
# BR2_PACKAGE_FBV_GIF is not set
-BR2_PACKAGE_FB_TEST_APP=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
BR2_PACKAGE_EVTEST=y
-BR2_PACKAGE_IMX_LIB=y
-BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q=y
+BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
BR2_PACKAGE_GPU_VIV_BIN_MX6Q=y
-BR2_PACKAGE_VIVANTE_GPU_SDK=y
BR2_PACKAGE_I2C_TOOLS=y
-BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_TI_UTILS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_BLUEZ_UTILS=y
diff --git a/patches/buildroot/2014.11/001-add_armadeus_device.patch b/patches/buildroot/2014.11/001-add_armadeus_device.patch
deleted file mode 100644
index 8fca19d..0000000
--- a/patches/buildroot/2014.11/001-add_armadeus_device.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Add armadeus target specific menu to BR.
-
-Index: buildroot/Makefile
-===================================================================
---- buildroot.orig/Makefile
-+++ buildroot/Makefile
-@@ -386,6 +386,8 @@ ifneq ($(PACKAGE_OVERRIDE_FILE),)
- -include $(PACKAGE_OVERRIDE_FILE)
- endif
-
-+include target/device/armadeus/Makefile.in
-+
- include $(sort $(wildcard package/*/*.mk))
-
- include boot/common.mk
-Index: buildroot/system/Config.in
-===================================================================
---- buildroot.orig/system/Config.in
-+++ buildroot/system/Config.in
-@@ -433,4 +433,5 @@ config BR2_ROOTFS_POST_SCRIPT_ARGS
- directory / images directory. The arguments in this option will be
- passed *after* those.
-
-+source "target/device/armadeus/Config.in"
- endmenu
diff --git a/patches/buildroot/2014.11/002-add_armadeus_specific_packages.patch b/patches/buildroot/2014.11/002-add_armadeus_specific_packages.patch
deleted file mode 100644
index 1f85d5e..0000000
--- a/patches/buildroot/2014.11/002-add_armadeus_specific_packages.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Add armadeus specific packages menu to BR.
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in 2012-02-21 16:43:29.000000000 +0100
-+++ buildroot/package/Config.in 2012-02-21 16:43:56.000000000 +0100
-@@ -2,6 +2,9 @@
-
- source "package/busybox/Config.in"
-
-+# Armadeus specific
-+source "package/armadeus/Config.in"
-+
- menu "Audio and video applications"
- source "package/alsa-utils/Config.in"
- source "package/aumix/Config.in"
diff --git a/patches/buildroot/2014.11/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch b/patches/buildroot/2014.11/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
deleted file mode 100644
index b8d330e..0000000
--- a/patches/buildroot/2014.11/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/gpsd/Config.in
-===================================================================
---- buildroot.orig/package/gpsd/Config.in 2013-07-21 21:14:36.234513938 +0200
-+++ buildroot/package/gpsd/Config.in 2013-07-21 21:15:57.658917706 +0200
-@@ -21,6 +21,11 @@
- default "/dev/ttyS1"
- depends on BR2_PACKAGE_GPSD
-
-+config BR2_PACKAGE_GPSD_OPTIONS
-+ string "Daemon options"
-+ default ""
-+ depends on BR2_PACKAGE_GPSD
-+
- menu "Features"
- depends on BR2_PACKAGE_GPSD
-
-Index: buildroot/package/gpsd/gpsd.mk
-===================================================================
---- buildroot.orig/package/gpsd/gpsd.mk 2013-07-21 21:16:10.402980889 +0200
-+++ buildroot/package/gpsd/gpsd.mk 2013-07-21 21:19:50.036069999 +0200
-@@ -210,6 +210,7 @@
- if [ ! -f $(TARGET_DIR)/etc/init.d/S50gpsd ]; then \
- $(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd; \
- $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd; \
-+ $(SED) 's,^OTHER_OPTIONS=.*,OTHER_OPTIONS=$(BR2_PACKAGE_GPSD_OPTIONS),' $(TARGET_DIR)/etc/init.d/S50gpsd; \
- fi
- endef
-
-Index: buildroot/package/gpsd/S50gpsd
-===================================================================
---- buildroot.orig/package/gpsd/S50gpsd 2013-07-21 21:23:50.417261978 +0200
-+++ buildroot/package/gpsd/S50gpsd 2013-07-21 21:24:03.445326591 +0200
-@@ -7,10 +7,12 @@
- DAEMON=/usr/sbin/$NAME
- DEVICES=/dev/ttyS1
- PIDFILE=/var/run/$NAME.pid
-+OTHER_OPTIONS=
-+DAEMON_OPTIONS="-P $PIDFILE $DEVICES $OTHER_OPTIONS"
-
- start() {
- echo -n "Starting $NAME: "
-- start-stop-daemon -S -q -p $PIDFILE --exec $DAEMON -- -P $PIDFILE $DEVICES && echo "OK" || echo "Failed"
-+ start-stop-daemon -S -q -p $PIDFILE --exec $DAEMON -- $DAEMON_OPTIONS && echo "OK" || echo "Failed"
- }
- stop() {
- echo -n "Stopping $NAME: "
diff --git a/patches/buildroot/2014.11/006-armadeus-add-owfs-package.patch b/patches/buildroot/2014.11/006-armadeus-add-owfs-package.patch
deleted file mode 100644
index ab08167..0000000
--- a/patches/buildroot/2014.11/006-armadeus-add-owfs-package.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/owfs/Config.in
-===================================================================
---- /dev/null
-+++ buildroot/package/owfs/Config.in
-@@ -0,0 +1,11 @@
-+config BR2_PACKAGE_OWFS
-+ bool "owfs"
-+ select BR2_PACKAGE_LIBFUSE
-+ help
-+ OWFS is an easy way to use the powerful 1-wire system of
-+ Dallas/Maxim.
-+ OWFS is a simple and flexible program to monitor and control the
-+ physical environment. You can write scripts to read temperature,
-+ flash lights, write to an LCD, log and graph, ...
-+
-+ http://owfs.org/
-Index: buildroot/package/owfs/owfs.mk
-===================================================================
---- /dev/null
-+++ buildroot/package/owfs/owfs.mk
-@@ -0,0 +1,20 @@
-+###############################################################################
-+#
-+# owfs
-+#
-+###############################################################################
-+
-+OWFS_SITE = http://downloads.sourceforge.net/owfs/
-+OWFS_VERSION = 2.9p2
-+OWFS_DEPENDENCIES = libfuse
-+OWFS_CONF_OPTS += --disable-owhttpd --disable-owftpd --disable-swig
-+OWFS_INSTALL_STAGING = YES
-+
-+ifeq ($(BR2_PACKAGE_LIBUSB),y)
-+OWFS_DEPENDENCIES += libusb
-+OWFS_CONF_OPTS += --enable-usb
-+else
-+OWFS_CONF_OPTS += --disable-usb
-+endif
-+
-+$(eval $(autotools-package))
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in
-+++ buildroot/package/Config.in
-@@ -353,6 +353,7 @@ endif
- source "package/open2300/Config.in"
- source "package/openocd/Config.in"
- source "package/openpowerlink/Config.in"
-+ source "package/owfs/Config.in"
- source "package/owl-linux/Config.in"
- source "package/parted/Config.in"
- source "package/pciutils/Config.in"
diff --git a/patches/buildroot/2014.11/007-armadeus-add-agg-package.patch b/patches/buildroot/2014.11/007-armadeus-add-agg-package.patch
deleted file mode 100644
index 6cfaca8..0000000
--- a/patches/buildroot/2014.11/007-armadeus-add-agg-package.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Needed by Gnash.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/agg/Config.in
-===================================================================
---- /dev/null
-+++ buildroot/package/agg/Config.in
-@@ -0,0 +1,8 @@
-+config BR2_PACKAGE_AGG
-+ bool "agg"
-+ help
-+ The Anti-Grain Geometry project. A High Quality 2D Graphics Rendering
-+ Engine for C++.
-+ We use the SDL backend by default.
-+
-+ http://www.antigrain.com/index.html
-Index: buildroot/package/agg/agg.mk
-===================================================================
---- /dev/null
-+++ buildroot/package/agg/agg.mk
-@@ -0,0 +1,40 @@
-+###############################################################################
-+#
-+# agg
-+#
-+###############################################################################
-+
-+AGG_VERSION = 2.5
-+AGG_SITE = http://www.antigrain.com/
-+AGG_LICENSE = GPLv3+
-+AGG_LICENSE_FILES = COPYING
-+AGG_INSTALL_STAGING = YES
-+AGG_AUTORECONF = YES
-+
-+AGG_DEPENDENCIES = sdl
-+
-+AGG_CONF_OPTS = \
-+ --with-sdl-prefix=$(STAGING_DIR)/usr \
-+ --disable-sdltest
-+
-+ifeq ($(BR2_PACKAGE_SDL_X11),)
-+AGG_CONF_OPTS += \
-+ --with-x=NO \
-+ --disable-examples # examples require X11
-+endif
-+
-+ifeq ($(BR2_PACKAGE_FREETYPE),y)
-+AGG_DEPENDENCIES += freetype
-+AGG_CONF_OPTS += --enable-freetype
-+else
-+AGG_CONF_OPTS += --disable-freetype
-+endif
-+
-+define AGG_CREATE_MISSING_FILES
-+ touch $(@D)/NEWS $(@D)/AUTHORS $(@D)/README
-+# Fixes reconfiguring with recent automake:
-+ $(SED) 's/AM_C_PROTOTYPES//' $(@D)/configure.in
-+endef
-+AGG_POST_EXTRACT_HOOKS += AGG_CREATE_MISSING_FILES
-+
-+$(eval $(autotools-package))
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in
-+++ buildroot/package/Config.in
-@@ -627,6 +627,7 @@ endmenu
-
- menu "Graphics"
- source "package/adwaita-icon-theme/Config.in"
-+ source "package/agg/Config.in"
- source "package/atk/Config.in"
- source "package/cairo/Config.in"
- source "package/fltk/Config.in"
diff --git a/patches/buildroot/2014.11/008-armadeus-add-gnash-package.patch b/patches/buildroot/2014.11/008-armadeus-add-gnash-package.patch
deleted file mode 100644
index f3fcdf9..0000000
--- a/patches/buildroot/2014.11/008-armadeus-add-gnash-package.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-WIP.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/gnash/Config.in
-===================================================================
---- /dev/null
-+++ buildroot/package/gnash/Config.in
-@@ -0,0 +1,11 @@
-+config BR2_PACKAGE_GNASH
-+ bool "gnash"
-+ select BR2_PACKAGE_BOOST
-+ select BR2_PACKAGE_BOOST_IOSTREAMS
-+ select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
-+ select BR2_PACKAGE_BOOST_THREAD
-+
-+ help
-+ GNU Gnash is the GNU Flash movie player.
-+
-+ http://www.gnu.org/software/gnash/
-Index: buildroot/package/gnash/gnash.mk
-===================================================================
---- /dev/null
-+++ buildroot/package/gnash/gnash.mk
-@@ -0,0 +1,118 @@
-+###############################################################################
-+#
-+# gnash
-+#
-+###############################################################################
-+
-+# inspired from LFS
-+
-+GNASH_VERSION = 0.8.10
-+GNASH_SOURCE = gnash-$(GNASH_VERSION).tar.bz2
-+GNASH_SITE = http://ftp.gnu.org/pub/gnu/gnash/$(GNASH_VERSION)/
-+GNASH_LICENSE = LGPLv2.1+
-+GNASH_LICENSE_FILES = COPYING
-+
-+GNASH_CONF_OPTS = --without-gconf --disable-extensions --disable-jemalloc --disable-cygnal
-+GNASH_CONF_OPTS += --disable-nls # To fix
-+GNASH_DEPENDENCIES += gettext # even if NLS disabled...
-+
-+GNASH_CONF_OPTS += --with-ltdl-incl=$(STAGING_DIR)/usr/include/ --with-ltdl-lib=$(STAGING_DIR)/usr/lib
-+GNASH_DEPENDENCIES += libtool
-+
-+define GNASH_FIXES_BOOST_LINK
-+ $(SED) '/^LIBS/s/\(.*\)/\1 -lboost_system/' \
-+ $(@D)/gui/Makefile.in $(@D)/utilities/Makefile.in
-+endef
-+GNASH_POST_CONFIGURE_HOOKS += GNASH_FIXES_BOOST_LINK
-+
-+ifeq ($(BR2_PACKAGE_GNASH_SHOW_PROPERTIES),y)
-+# to check
-+GNASH_DEPENDENCIES += pango
-+GNASH_CONF_OPTS += --with-pango-incl=$(STAGING_DIR)/usr/include/pango --with-pango-lib=$(STAGING_DIR)/usr/lib \
-+else
-+GNASH_CONF_OPTS += --disable-swftree
-+endif
-+
-+ifeq ($(BR2_PACKAGE_QT),)
-+#(accept: gtk|kde3|qt4|fltk|sdl|aqua|fb|qtopia3|qtopia4|dump|aos4|haiku)
-+#GNASH_CONF_OPT += --disable-gui ??
-+GNASH_CONF_OPTS += --enable-gui=sdl
-+GNASH_CONF_OPTS += --with-sdl-incl=$(STAGING_DIR)/usr/include/SDL --with-sdl-lib=$(STAGING_DIR)/usr/lib
-+GNASH_DEPENDENCIES += sdl
-+else
-+GNASH_CONF_OPTS += --enable-gui=qt4
-+GNASH_DEPENDENCIES += qt
-+endif
-+
-+GNASH_CONF_OPTS += --enable-media=none
-+
-+GNASH_CONF_OPTS += --enable-sound=none
-+
-+GNASH_CONF_OPTS += --enable-renderer=agg
-+GNASH_CONF_OPTS += --with-agg-incl=$(STAGING_DIR)/usr/include/agg2 --with-agg-lib=$(STAGING_DIR)/usr/lib
-+GNASH_DEPENDENCIES += agg
-+
-+GNASH_CONF_OPTS += --with-curl-incl=$(STAGING_DIR)/usr/include
-+GNASH_DEPENDENCIES += libcurl
-+
-+GNASH_CONF_OPTS += --with-boost-incl=$(STAGING_DIR)/usr/include/boost --with-boost-lib=$(STAGING_DIR)/usr/lib
-+GNASH_DEPENDENCIES += boost
-+
-+# What for ?
-+GNASH_CONF_OPTS += --with-jpeg-incl=$(STAGING_DIR)/usr/include --with-jpeg-lib=$(STAGING_DIR)/usr/lib
-+GNASH_DEPENDENCIES += libjpeg
-+
-+# What for ?
-+GNASH_CONF_OPTS += --with-ungif-incl=$(STAGING_DIR)/usr/include --with-ungif-lib=$(STAGING_DIR)/usr/lib
-+GNASH_DEPENDENCIES += libungif
-+
-+# Needed otherwise utilities/ fails to build
-+GNASH_CONF_OPTS += --with-png-incl=$(STAGING_DIR)/usr/include --with-png-lib=$(STAGING_DIR)/usr/lib
-+GNASH_DEPENDENCIES += libpng
-+
-+# Otherwise build fails in FreetypeGlyphsProvider.cpp
-+GNASH_DEPENDENCIES += freetype
-+GNASH_CONF_OPTS += --with-freetype-incl=$(STAGING_DIR)/usr/include/freetype2 --with-freetype-lib=$(STAGING_DIR)/usr/lib
-+
-+# --enable-sound=sdl|ahi|mkit
-+# Use the specified sound handler (default=sdl)
-+# --enable-media=handler Enable media handling support using the specified
-+# handler: gst, ffmpeg or none (no sound) [gst]
-+# --enable-input Enable support for the specified input devices for
-+# the framebuffer GUI
-+# (default=ps2mouse|ps2keyboard|events|touchscreen)
-+# --enable-renderer Enable support for the specified renderers
-+# (agg|cairo|opengl|openvg|all, default=all)
-+
-+
-+$(eval $(autotools-package))
-+
-+# RECOMMENDED: No PNG library development package installed!
-+# Gnash will be built without support for dynamic loading of
-+# PNG files.
-+# Install it from http://www.libpng.org
-+# or .deb users: apt-get install libpng12-dev
-+# or .rpm users: yum install libpng-devel
-+# RECOMMENDED: If you install the CURL library, Gnash will be able to
-+# display remote content (streaming from URLs) using CURL.
-+# Install libcurl from http://curl.haxx.se/libcurl
-+# or .deb users: apt-get install libcurl4-gnutls-dev
-+# or maybe : apt-get install libcurl-dev
-+# or .rpm users: yum install curl-devel
-+# RECOMMENDED: If you install the Speex library, Gnash will be able to
-+# decoded Speex encoded audio in FLV files.
-+# Install libspeex from http://speex.org
-+# or .deb users: apt-get install libspeex-dev
-+# or .rpm users: yum install speex-devel
-+# RECOMMENDED: If you install the Speex DSP library, Gnash will be able to
-+# resample Speex encoded audio in FLV files.
-+# Install libspeexdsp from http://speex.org
-+# or .deb users: apt-get install libspeexdsp-dev
-+# or .rpm users: yum install speex-devel
-+# RECOMMENDED: You need to have the fontconfig development packages
-+# installed to use device fonts.
-+# Install it from http://fontconfig.org
-+# or .deb users: apt-get install libfontconfig1-dev
-+# or .rpm users: yum install fontconfig-devel
-+# It may still be possible to configure without fontconfig.
-+
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in
-+++ buildroot/package/Config.in
-@@ -14,6 +14,7 @@ menu "Audio and video applications"
- source "package/ffmpeg/Config.in"
- source "package/flac/Config.in"
- source "package/flite/Config.in"
-+ source "package/gnash/Config.in"
- source "package/gstreamer/Config.in"
- source "package/gstreamer1/Config.in"
- source "package/jack2/Config.in"
diff --git a/patches/buildroot/2014.11/009-armadeus-xc3sprog-new-package.patch b/patches/buildroot/2014.11/009-armadeus-xc3sprog-new-package.patch
deleted file mode 100644
index 2c5d059..0000000
--- a/patches/buildroot/2014.11/009-armadeus-xc3sprog-new-package.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in
-+++ buildroot/package/Config.in
-@@ -391,6 +391,7 @@ endif
- source "package/usbutils/Config.in"
- source "package/w_scan/Config.in"
- source "package/wipe/Config.in"
-+ source "package/xc3sprog/Config.in"
- endmenu
-
- menu "Interpreter languages and scripting"
-Index: buildroot/package/xc3sprog/Config.in
-===================================================================
---- /dev/null
-+++ buildroot/package/xc3sprog/Config.in
-@@ -0,0 +1,13 @@
-+config BR2_PACKAGE_XC3SPROG
-+ bool "xc3sprog"
-+ depends on BR2_INSTALL_LIBSTDCPP
-+ depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi
-+ select BR2_PACKAGE_LIBFTDI
-+ help
-+ xc3sprog is a suite of utilities for programming Xilinx FPGAs, CPLDs,
-+ and EEPROMs with the Xilinx Parallel Cable and other JTAG adapters.
-+
-+ http://xc3sprog.sourceforge.net/
-+
-+comment "xc3sprog needs a toolchain w/ C++, threads"
-+ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
-Index: buildroot/package/xc3sprog/xc3sprog.mk
-===================================================================
---- /dev/null
-+++ buildroot/package/xc3sprog/xc3sprog.mk
-@@ -0,0 +1,19 @@
-+################################################################################
-+#
-+# xc3sprog
-+#
-+################################################################################
-+
-+XC3SPROG_VERSION = 760
-+XC3SPROG_SITE = https://svn.code.sf.net/p/xc3sprog/code/trunk
-+XC3SPROG_SITE_METHOD = svn
-+X3CSPROG_LICENSE = GPLv2+
-+X3CSPROG_LICENSE_FILES = COPYING
-+X3CSPROG_DEPENDENCIES = libftdi
-+
-+XC3SPROG_CONF_OPTS += \
-+ -DVERSION_STRING=0.0-svn$(XC3SPROG_VERSION) \
-+ -DCMAKE_EXE_LINKER_FLAGS=-lpthread
-+
-+$(eval $(cmake-package))
-+$(eval $(host-cmake-package))
-Index: buildroot/package/xc3sprog/xc3sprog-fixes-version-detection.patch
-===================================================================
---- /dev/null
-+++ buildroot/package/xc3sprog/xc3sprog-fixes-version-detection.patch
-@@ -0,0 +1,30 @@
-+Do not launch 'svn info' if sources directory is not a svn checkout.
-+This prevents cmake to fail at configuration stage when building package in BR.
-+
-+Signed-off-by: Julien Boibessot <jul...@ar...>
-+
-+--- xc3sprog-760.org/CMakeLists.txt 2013-12-09 16:42:37.000000000 +0100
-++++ xc3sprog-760/CMakeLists.txt 2014-04-28 11:45:20.899827274 +0200
-+@@ -35,13 +35,15 @@
-+ if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
-+ set(VERSION_STRING "${xc3sprog_VERSION_MAJOR}.${xc3sprog_VERSION_MINOR}-git")
-+ else(EXISTS ${PROJECT_SOURCE_DIR}/.git)
-+- FIND_PACKAGE(Subversion)
-+- IF(Subversion_FOUND)
-+- Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
-+- set(VERSION_STRING "${xc3sprog_VERSION_MAJOR}.${xc3sprog_VERSION_MINOR}-svn${Project_WC_REVISION}")
-+- ELSE(Subversion_FOUND)
-+- set(VERSION_STRING "unknown")
-+- ENDIF(Subversion_FOUND)
-++ IF(EXISTS ${PROJECT_SOURCE_DIR}/.svn)
-++ FIND_PACKAGE(Subversion)
-++ IF(Subversion_FOUND)
-++ Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
-++ set(VERSION_STRING "${xc3sprog_VERSION_MAJOR}.${xc3sprog_VERSION_MINOR}-svn${Project_WC_REVISION}")
-++ ELSE(Subversion_FOUND)
-++ set(VERSION_STRING "unknown")
-++ ENDIF(Subversion_FOUND)
-++ ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/.svn)
-+ endif(EXISTS ${PROJECT_SOURCE_DIR}/.git)
-+
-+ # Create suffix to eventually install inlib64
-Index: buildroot/package/xc3sprog/xc3sprog-fixes-xc2c32a_qf32-jtag-id.patch
-===================================================================
---- /dev/null
-+++ buildroot/package/xc3sprog/xc3sprog-fixes-xc2c32a_qf32-jtag-id.patch
-@@ -0,0 +1,14 @@
-+Specific for Armadeus.
-+
-+Signed-off-by: Fabien Marteau <fab...@ar...>
-+
-+--- xc3sprog-760.org/devlist.txt 2013-12-09 16:42:42.000000000 +0100
-++++ xc3sprog-760/devlist.txt 2014-04-28 17:36:03.780173296 +0200
-+@@ -167,6 +167,7 @@
-+ 06c1d093 8 0x1 XC2C32_PC44/64
-+ 06c1b093 8 0x1 XC2C32A_QF32
-+ 06d1d093 8 0x1 XC2C32A_PC44
-++06e19093 8 0x1 XC2C32A_QF32
-+ 06e1b093 8 0x1 XC2C32A_CP56
-+ 06e1c093 8 0x1 XC2C32A_VQ44
-+ 06e1d093 8 0x1 XC2C32A_PC44/64
diff --git a/patches/buildroot/2014.11/010-armadeus-sam7-pgm-ng-new-package.patch b/patches/buildroot/2014.11/010-armadeus-sam7-pgm-ng-new-package.patch
deleted file mode 100644
index a86634e..0000000
--- a/patches/buildroot/2014.11/010-armadeus-sam7-pgm-ng-new-package.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in
-+++ buildroot/package/Config.in
-@@ -365,6 +365,7 @@ endif
- source "package/rng-tools/Config.in"
- source "package/rpi-userland/Config.in"
- source "package/sane-backends/Config.in"
-+ source "package/sam7-pgm-ng/Config.in"
- source "package/sdparm/Config.in"
- source "package/setserial/Config.in"
- source "package/sg3_utils/Config.in"
-Index: buildroot/package/sam7-pgm-ng/Config.in
-===================================================================
---- /dev/null
-+++ buildroot/package/sam7-pgm-ng/Config.in
-@@ -0,0 +1,7 @@
-+config BR2_PACKAGE_SAM7_PGM_NG
-+ bool "sam7_pgm-ng"
-+ help
-+ Armadeus fork of SAM7_PGM (with some cleanup).
-+
-+ https://github.com/Martoni/SAM7_PGM-NG
-+ http://www.pjrc.com/arm/sam7_pgm/
-Index: buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
-===================================================================
---- /dev/null
-+++ buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
-@@ -0,0 +1,21 @@
-+################################################################################
-+#
-+# sam7-pgm-ng
-+#
-+################################################################################
-+
-+SAM7_PGM_NG_VERSION = 3a837382ae2deda6796aedd594be18503ad8ad96
-+SAM7_PGM_NG_SITE = https://github.com/Martoni/SAM7_PGM-NG
-+SAM7_PGM_NG_SITE_METHOD = git
-+SAM7_PGM_NG_LICENSE = GPLv2+
-+SAM7_PGM_NG_LICENSE_FILES = COPYING
-+
-+define SAM7_PGM_NG_BUILD_CMDS
-+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
-+endef
-+
-+define SAM7_PGM_NG_INSTALL_TARGET_CMDS
-+ $(INSTALL) -D -m 0755 $(@D)/sam7_pgm $(TARGET_DIR)/usr/bin/sam7_pgm
-+endef
-+
-+$(eval $(generic-package))
diff --git a/patches/buildroot/2014.11/011-armadeus-add-tk-package.patch b/patches/buildroot/2014.11/011-armadeus-add-tk-package.patch
deleted file mode 100644
index 595c04b..0000000
--- a/patches/buildroot/2014.11/011-armadeus-add-tk-package.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in
-+++ buildroot/package/Config.in
-@@ -538,6 +538,7 @@ if BR2_PACKAGE_TCL
- menu "tcl libraries/modules"
- source "package/expect/Config.in"
- source "package/tcllib/Config.in"
-+ source "package/tk/Config.in"
- endmenu
- endif
- endmenu
-Index: buildroot/package/tk/Config.in
-===================================================================
---- /dev/null
-+++ buildroot/package/tk/Config.in
-@@ -0,0 +1,18 @@
-+config BR2_PACKAGE_TK
-+ bool "tk"
-+ depends on BR2_PACKAGE_TCL
-+ depends on BR2_PACKAGE_XORG7
-+ help
-+ Tk is a GUI toolkit for Tcl
-+
-+ http://www.tcl.tk/
-+
-+config BR2_PACKAGE_TK_NO_DEMOS
-+ bool "remove demos"
-+ default y
-+ depends on BR2_PACKAGE_TK
-+ help
-+ Remove Tk demo files from target rootfs
-+
-+comment "Tk needs X.org, Tcl"
-+ depends on !BR2_PACKAGE_TCL || !BR2_PACKAGE_XORG7
-Index: buildroot/package/tk/tk.mk
-===================================================================
---- /dev/null
-+++ buildroot/package/tk/tk.mk
-@@ -0,0 +1,30 @@
-+################################################################################
-+#
-+# tk
-+#
-+################################################################################
-+
-+TK_VERSION_MAJOR = 8.4
-+TK_VERSION = $(TK_VERSION_MAJOR).20
-+TK_SOURCE = tk$(TK_VERSION)-src.tar.gz
-+TK_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TK_VERSION)
-+TK_LICENSE = tcl license
-+TK_LICENSE_FILES = license.terms
-+TK_SUBDIR = unix
-+TK_INSTALL_STAGING = YES
-+TK_DEPENDENCIES = tcl xlib_libX11
-+
-+# shouldn't be $(STAGING_DIR) ?
-+TK_CONF_OPTS = \
-+ --with-tcl=$(TARGET_DIR)/usr/lib \
-+ --with-x \
-+ --x-includes=$(STAGING_DIR)/usr/include/X11
-+
-+ifeq ($(BR2_PACKAGE_TK_NO_DEMOS),y)
-+define TCL_REMOVE_DEMOS
-+ rm -rf $(TARGET_DIR)/usr/lib/tk$(TK_VERSION_MAJOR)/demos
-+endef
-+TK_POST_INSTALL_TARGET_HOOKS += TK_REMOVE_DEMOS
-+endif
-+
-+$(eval $(autotools-package))
diff --git a/patches/buildroot/2014.11/012-armadeus-add-tkinter-support-to-python.patch b/patches/buildroot/2014.11/012-armadeus-add-tkinter-support-to-python.patch
deleted file mode 100644
index 08b59cb..0000000
--- a/patches/buildroot/2014.11/012-armadeus-add-tkinter-support-to-python.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/python/Config.in
-===================================================================
---- buildroot.orig/package/python/Config.in
-+++ buildroot/package/python/Config.in
-@@ -79,6 +79,18 @@ config BR2_PACKAGE_PYTHON_SSL
- help
- _ssl module for Python (required for https in urllib etc).
-
-+config BR2_PACKAGE_PYTHON_TKINTER
-+ depends on BR2_PACKAGE_XORG7
-+ depends on BR2_PACKAGE_TCL
-+ select BR2_PACKAGE_TK
-+ bool "tkinter"
-+ help
-+ Tkinter module for Python.
-+
-+comment "tkinter needs a X server and tcl"
-+ depends on !BR2_PACKAGE_XORG7
-+ depends on !BR2_PACKAGE_TCL
-+
- config BR2_PACKAGE_PYTHON_UNICODEDATA
- bool "unicodedata module"
- default y
-Index: buildroot/package/python/python.mk
-===================================================================
---- buildroot.orig/package/python/python.mk
-+++ buildroot/package/python/python.mk
-@@ -118,6 +118,12 @@ ifeq ($(BR2_PACKAGE_PYTHON_HASHLIB),y)
- PYTHON_DEPENDENCIES += openssl
- endif
-
-+ifeq ($(BR2_PACKAGE_PYTHON_TKINTER),y)
-+PYTHON_DEPENDENCIES += tk
-+else
-+PYTHON_CONF_OPTS += --disable-tk
-+endif
-+
- PYTHON_CONF_ENV += \
- ac_cv_have_long_long_format=yes \
- ac_cv_file__dev_ptmx=yes \
-@@ -132,7 +138,6 @@ PYTHON_CONF_OPTS += \
- --disable-test-modules \
- --disable-lib2to3 \
- --disable-gdbm \
-- --disable-tk \
- --disable-nis \
- --disable-dbm \
- --disable-pyo-build
diff --git a/patches/buildroot/2014.11/014-armadeus-python-wx-add-package.patch b/patches/buildroot/2014.11/014-armadeus-python-wx-add-package.patch
deleted file mode 100644
index 5cd8f8e..0000000
--- a/patches/buildroot/2014.11/014-armadeus-python-wx-add-package.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Author: Edouard Tisserant
-Slightly modified by JB
-
-Index: buildroot/package/python-wx/Config.in
-===================================================================
---- /dev/null
-+++ buildroot/package/python-wx/Config.in
-@@ -0,0 +1,14 @@
-+config BR2_PACKAGE_PYTHON_WX
-+ bool "wxPython"
-+ depends on BR2_PACKAGE_PYTHON
-+ depends on BR2_PACKAGE_LIBGTK2
-+
-+ help
-+ The wxPython module is a blending of the wxWidgets C++ class library
-+ with the Python programming language.
-+ By default GTK backend is used (requires X.org).
-+
-+ http://wxpython.org/
-+
-+comment "wxPython needs python, GTK"
-+ depends on !BR2_PACKAGE_PYTHON || !BR2_PACKAGE_LIBGTK2
-Index: buildroot/package/python-wx/python-wx.mk
-===================================================================
---- /dev/null
-+++ buildroot/package/python-wx/python-wx.mk
-@@ -0,0 +1,59 @@
-+################################################################################
-+#
-+# python-wx
-+#
-+################################################################################
-+
-+# 2.8 is the most used version (BR will prefer latest one)
-+PYTHON_WX_VERSION = 2.8.12.1
-+PYTHON_WX_SOURCE = wxPython-src-$(PYTHON_WX_VERSION).tar.bz2
-+PYTHON_WX_SITE = http://downloads.sourceforge.net/project/wxpython/wxPython/$(PYTHON_WX_VERSION)
-+PYTHON_WX_LICENSE = LGPL
-+PYTHON_WX_LICENSE_FILES = docs/licence.txt
-+PYTHON_WX_INSTALL_STAGING = YES
-+PYTHON_WX_DEPENDENCIES = python libgtk2
-+# Why ? ->
-+PYTHON_WX_CONF_OPTS = --enable-monolithic
-+
-+# Autotools are used to build wxGTK embedded in wxPython sources, and then we use
-+# HOOKS to install Python wrappers.
-+# However wxWidget/GTK has a lot of configure options not proposed here...
-+
-+define PYTHON_WX_PYSETUP
-+ (cd $(@D)/wxPython; \
-+ CC="$(TARGET_CC)" \
-+ CFLAGS="$(TARGET_CFLAGS)" \
-+ LDSHARED="$(TARGET_CROSS)gcc -shared" \
-+ CROSS_COMPILING=yes \
-+ _python_sysroot=$(STAGING_DIR) \
-+ _python_srcdir=$(BUILD_DIR)/python$(PYTHON_VERSION) \
-+ _python_prefix=/usr \
-+ _python_exec_prefix=/usr \
-+ $(HOST_DIR)/usr/bin/python setup.py build \
-+ WX_CONFIG="$(STAGING_DIR)/usr/bin/wx-config \
-+ --prefix=$(STAGING_DIR)/usr" \
-+ BUILD_GLCANVAS=0 \
-+ BUILD_STC=0 \
-+ BUILD_GIZMOS=0 \
-+ )
-+endef
-+PYTHON_WX_POST_INSTALL_STAGING_HOOKS += PYTHON_WX_PYSETUP
-+
-+# Useful ? ->
-+define PYTHON_WX_PYTHON_WRAPPER_STAGING_INSTALL
-+ (cd $(@D)/wxPython; \
-+ $(HOST_DIR)/usr/bin/python setup.py install \
-+ --prefix=$(STAGING_DIR)/usr)
-+endef
-+
-+PYTHON_WX_POST_INSTALL_STAGING_HOOKS += PYTHON_WX_PYTHON_WRAPPER_STAGING_INSTALL
-+
-+define PYTHON_WX_PYTHON_WRAPPER_TARGET_INSTALL
-+ (cd $(@D)/wxPython; \
-+ $(HOST_DIR)/usr/bin/python setup.py install \
-+ --prefix=$(TARGET_DIR)/usr)
-+endef
-+
-+PYTHON_WX_POST_INSTALL_TARGET_HOOKS += PYTHON_WX_PYTHON_WRAPPER_TARGET_INSTALL
-+
-+$(eval $(autotools-package))
-Index: buildroot/package/python-wx/python-wx-001-fix_wxconfig.patch
-===================================================================
---- /dev/null
-+++ buildroot/package/python-wx/python-wx-001-fix_wxconfig.patch
-@@ -0,0 +1,12 @@
-+diff -purN python-wxgtk-2.8.12.1.orig/Makefile.in python-wxgtk-2.8.12.1/Makefile.in
-+--- python-wxgtk-2.8.12.1.orig/Makefile.in 2011-03-28 21:48:29.000000000 +0200
-++++ python-wxgtk-2.8.12.1/Makefile.in 2014-07-25 22:45:27.710057682 +0200
-+@@ -12455,7 +12455,7 @@ install-wxconfig:
-+ $(INSTALL_DIR) $(DESTDIR)$(bindir)
-+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
-+ $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
-+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
-++ (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(CP_P) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
-+
-+ locale_install:
-+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in
-+++ buildroot/package/Config.in
-@@ -226,6 +226,7 @@ endif
-
- comment "Other GUIs"
- source "package/efl/Config.in"
-+ source "package/python-wx/Config.in"
- source "package/qt/Config.in"
- source "package/qt5/Config.in"
- if BR2_PACKAGE_QT || BR2_PACKAGE_QT5
diff --git a/patches/buildroot/2014.11/015-armadeus-gpu-vivante-sdk-new-package.patch.tofix b/patches/buildroot/2014.11/015-armadeus-gpu-vivante-sdk-new-package.patch.tofix
deleted file mode 100644
index 85f03c9..0000000
--- a/patches/buildroot/2014.11/015-armadeus-gpu-vivante-sdk-new-package.patch.tofix
+++ /dev/null
@@ -1,134 +0,0 @@
-X11 stuff hasn't been tested yet, only fb is validated.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/freescale-imx/vivante-gpu-sdk/vivante-gpu-sdk.mk
-===================================================================
---- /dev/null
-+++ buildroot/package/freescale-imx/vivante-gpu-sdk/vivante-gpu-sdk.mk
-@@ -0,0 +1,99 @@
-+################################################################################
-+#
-+# vivante-gpu-sdk
-+#
-+################################################################################
-+
-+VIVANTE_GPU_SDK_VERSION = 1.00
-+VIVANTE_GPU_SDK_SITE = $(FREESCALE_IMX_MIRROR_SITE)
-+VIVANTE_GPU_SDK_SOURCE = vivante-gpu-sdk-$(VIVANTE_GPU_SDK_VERSION).bin
-+VIVANTE_GPU_SDK_LICENSE = Freescale Semiconductor Software License Agreement
-+VIVANTE_GPU_SDK_LICENSE += mix of OpenSource licenses
-+VIVANTE_GPU_SDK_LICENSE_FILE = COPYING
-+
-+# The archive is a shell-self-extractor of a bzipped tar. It happens
-+# to extract in the correct directory (vivante-gpu-sdk-x.y)
-+# The --force makes sure it doesn't fail if the source dir already exists.
-+# The --auto-accept skips the license check - not needed for us
-+# because we have legal-info.
-+define VIVANTE_GPU_SDK_EXTRACT_CMDS
-+ (cd $(BUILD_DIR); \
-+ sh $(DL_DIR)/$(VIVANTE_GPU_SDK_SOURCE) --force --auto-accept)
-+endef
-+
-+ifeq ($(BR2_PACKAGE_XORG7),y)
-+VIVANTE_GPU_SDK_MAKEFILE = Makefile.x11
-+else
-+VIVANTE_GPU_SDK_MAKEFILE = Makefile.fbdev
-+endif
-+
-+# Examples 18 and 19 are listed in main Makefile but not present in sources
-+define VIVANTE_GPU_SDK_BUILD_GLES_V1_1
-+ (cd $(@D)/Samples/GLES1.1/; \
-+ $(SED) 's/18_VertexBufferObjects//' $(VIVANTE_GPU_SDK_MAKEFILE); \
-+ $(SED) 's/19_Beizer//' $(VIVANTE_GPU_SDK_MAKEFILE); \
-+ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
-+ CFLAGS="$(TARGET_CFLAGS)" \
-+ ROOTFS="$(STAGING_DIR)" \
-+ -f $(VIVANTE_GPU_SDK_MAKEFILE))
-+endef
-+
-+define VIVANTE_GPU_SDK_BUILD_GLES_V2_0
-+ (cd $(@D)/Samples/GLES2.0/; \
-+ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
-+ CFLAGS="$(TARGET_CFLAGS)" \
-+ ROOTFS="$(STAGING_DIR)" \
-+ -f $(VIVANTE_GPU_SDK_MAKEFILE))
-+endef
-+
-+# OpenVG examples seem only buildable against framebuffer API
-+define VIVANTE_GPU_SDK_BUILD_OPENVG
-+ (cd $(@D)/Samples/OpenVG/; \
-+ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
-+ CFLAGS="$(TARGET_CFLAGS)" \
-+ ROOTFS="$(STAGING_DIR)" \
-+ -f Makefile.fbdev)
-+endef
-+
-+define VIVANTE_GPU_SDK_BUILD_CMDS
-+ $(VIVANTE_GPU_SDK_BUILD_GLES_V1_1)
-+ $(VIVANTE_GPU_SDK_BUILD_GLES_V2_0)
-+ $(VIVANTE_GPU_SDK_BUILD_OPENVG)
-+endef
-+
-+ifeq ($(BR2_PACKAGE_VIVANTE_GPU_SDK_EXAMPLES),y)
-+define VIVANTE_GPU_SDK_INSTALL_EXAMPLES
-+ mkdir -p $(TARGET_DIR)/usr/share/examples/
-+ cp -r $(@D)/opt/* $(TARGET_DIR)/usr/share/examples/
-+endef
-+endif
-+
-+define VIVANTE_GPU_SDK_INSTALL_TARGET_GLES_V1_1
-+ (cd $(@D)/Samples/GLES1.1/; \
-+ $(MAKE) install \
-+ DESTDIR="$(TARGET_DIR)/opt/gpu-sdk-1.1" \
-+ -f $(VIVANTE_GPU_SDK_MAKEFILE))
-+endef
-+
-+define VIVANTE_GPU_SDK_INSTALL_TARGET_GLES_V2_0
-+ $(VIVANTE_GPU_SDK_INSTALL_EXAMPLES)
-+ (cd $(@D)/Samples/GLES2.0/; \
-+ $(MAKE) install \
-+ DESTDIR="$(TARGET_DIR)/opt/gpu-sdk-2.0" \
-+ -f $(VIVANTE_GPU_SDK_MAKEFILE))
-+endef
-+
-+define VIVANTE_GPU_SDK_INSTALL_TARGET_OPENVG
-+ (cd $(@D)/Samples/OpenVG/; \
-+ $(MAKE) install \
-+ DESTDIR="$(TARGET_DIR)/opt/gpu-sdk-openvg" \
-+ -f Makefile.fbdev)
-+endef
-+
-+define VIVANTE_GPU_SDK_INSTALL_TARGET_CMDS
-+ $(VIVANTE_GPU_SDK_INSTALL_TARGET_GLES_V1_1)
-+ $(VIVANTE_GPU_SDK_INSTALL_TARGET_GLES_V2_0)
-+ $(VIVANTE_GPU_SDK_INSTALL_TARGET_OPENVG)
-+endef
-+
-+$(eval $(generic-package))
-Index: buildroot/package/freescale-imx/vivante-gpu-sdk/Config.in
-===================================================================
---- /dev/null
-+++ buildroot/package/freescale-imx/vivante-gpu-sdk/Config.in
-@@ -0,0 +1,9 @@
-+config BR2_PACKAGE_VIVANTE_GPU_SDK
-+ bool "vivante-gpu-sdk"
-+ depends on BR2_PACKAGE_GPU_VIV_BIN_MX6Q
-+ help
-+ Freescale examples on how to use GLES, OpenCL, and
-+ OpenVG libraries for i.MX6 processors.
-+
-+ These examples are provided by Freescale as-is and doesn't have
-+ an upstream.
-Index: buildroot/package/freescale-imx/Config.in
-===================================================================
---- buildroot.orig/package/freescale-imx/Config.in
-+++ buildroot/package/freescale-imx/Config.in
-@@ -47,6 +47,7 @@ source "package/freescale-imx/imx-vpu/Co
- source "package/freescale-imx/firmware-imx/Config.in"
- if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
- source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in"
-+source "package/freescale-imx/vivante-gpu-sdk/Config.in"
- endif
-
- endif
diff --git a/patches/buildroot/2014.11/016-armadeus-add-gnuboy-package.tocheck b/patches/buildroot/2014.11/016-armadeus-add-gnuboy-package.tocheck
deleted file mode 100644
index b35fccf..0000000
--- a/patches/buildroot/2014.11/016-armadeus-add-gnuboy-package.tocheck
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in 2015-02-17 10:36:30.371633079 +0100
-+++ buildroot/package/Config.in 2015-02-17 12:43:19.369364057 +0100
-@@ -166,6 +166,7 @@
- menu "Games"
- source "package/e-uae/Config.in"
- source "package/doom-wad/Config.in"
-+source "package/gnuboy/Config.in"
- source "package/gnuchess/Config.in"
- source "package/lbreakout2/Config.in"
- source "package/ltris/Config.in"
-Index: buildroot/package/gnuboy/Config.in
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gnuboy/Config.in 2015-02-17 12:11:19.047841714 +0100
-@@ -0,0 +1,12 @@
-+config BR2_PACKAGE_GNUBOY
-+ bool "gnuboy"
-+ help
-+ gnuboy is a portable Gameboy emulator.
-+
-+ By default it uses Framebuffer backend but if SDL is selected it will
-+ detect it.
-+
-+ Executable is named accordingly to chosen backend, ex: fbgnuboy or
-+ sdlgnuboy.
-+
-+ http://code.google.com/p/gnuboy/
-Index: buildroot/package/gnuboy/gnuboy.mk
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gnuboy/gnuboy.mk 2015-02-17 12:15:09.672981702 +0100
-@@ -0,0 +1,46 @@
-+################################################################################
-+#
-+# gnuboy
-+#
-+################################################################################
-+
-+GNUBOY_SITE = http://gnuboy.googlecode.com/svn/trunk/
-+GNUBOY_SITE_METHOD = svn
-+GNUBOY_VERSION = 201
-+GNUBOY_LICENSE = GPLv2+
-+GNUBOY_LICENSE_FILES = COPYING
-+
-+GNUBOY_CONF_OPT += \
-+ --enable-arch=$(ARCH) \
-+ --disable-asm \
-+ --with-fb
-+
-+GNUBOY_CFLAGS = $(TARGET_CFLAGS)
-+
-+ifeq ($(BR2_PACKAGE_SDL),y)
-+GNUBOY_CONF_OPT += --with-sdl
-+GNUBOY_DEPENDENCIES += sdl
-+else
-+GNUBOY_CONF_OPT += --without-sdl
-+GNUBOY_CFLAGS += -DGNUBOY_NO_SCREENSHOT
-+endif
-+
-+GNUBOY_CONF_ENV += \
-+ CFLAGS="$(GNUBOY_CFLAGS)"
-+
-+define GNUBOY_FIX_CONFIGURE
-+ chmod a+x $(@D)/configure
-+endef
-+
-+GNUBOY_POST_EXTRACT_HOOKS += GNUBOY_FIX_CONFIGURE
-+
-+# While the configuration system uses autoconf, the Makefiles are
-+# hand-written ???????? and do not use automake. Therefore, we have to hack
-+# around their deficiencies by passing installation paths.
-+GNUBOY_INSTALL_TARGET_OPT = \
-+ INSTALL="$(INSTALL)" \
-+ prefix=$(TARGET_DIR)/usr \
-+ exec_prefix=$(TARGET_DIR)/usr \
-+ install
-+
-+$(eval $(autotools-package))
diff --git a/patches/buildroot/2014.11/021-armadeus-add-sdl_water-package.patch b/patches/buildroot/2014.11/021-armadeus-add-sdl_water-package.patch
deleted file mode 100644
index a090215..0000000
--- a/patches/buildroot/2014.11/021-armadeus-add-sdl_water-package.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Add sdlwater package to BR.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in
-+++ buildroot/package/Config.in
-@@ -223,6 +223,8 @@ endif
- source "package/sdl_net/Config.in"
- source "package/sdl_sound/Config.in"
- source "package/sdl_ttf/Config.in"
-+comment "Demos"
-+source "package/sdl_water/Config.in"
-
- comment "Other GUIs"
- source "package/efl/Config.in"
-Index: buildroot/package/sdl_water/Config.in
-===================================================================
---- /dev/null
-+++ buildroot/package/sdl_water/Config.in
-@@ -0,0 +1,7 @@
-+config BR2_PACKAGE_SDL_WATER
-+ bool "SDL_water"
-+ select BR2_PACKAGE_SDL
-+ help
-+ Water effect demo coded with SDL
-+
-+ http://www.libsdl.org/projects/SDL_water/
-Index: buildroot/package/sdl_water/sdl_water.mk
-===================================================================
---- /dev/null
-+++ buildroot/package/sdl_water/sdl_water.mk
-@@ -0,0 +1,25 @@
-+#############################################################
-+#
-+# SDL Water Demo
-+#
-+#############################################################
-+
-+SDL_WATER_VERSION = 1.0
-+SDL_WATER_SOURCE = water-$(SDL_WATER_VERSION).tar.gz
-+SDL_WATER_SITE = http://www.libsdl.org/projects/water/src/
-+SDL_WATER_TARGET_DATA_DIR = $(TARGET_DIR)/usr/share/images/
-+
-+SDL_WATER_CONF_OPTS = --with-sdl-prefix=$(STAGING_DIR)/usr \
-+ --with-sdl-exec-prefix=$(STAGING_DIR)/usr
-+
-+SDL_WATER_DEPENDENCIES = sdl
-+
-+SDL_WATER_MAKE_OPTS = LDFLAGS="$(TARGET_LDFLAGS) -lm"
-+
-+define SDL_WATER_INSTALL_BMP
-+ install -D -m 0644 $(@D)/water320.bmp $(SDL_WATER_TARGET_DATA_DIR)/water320.bmp
-+endef
-+
-+SDL_WATER_POST_INSTALL_TARGET_HOOKS += SDL_WATER_INSTALL_BMP
-+
-+$(eval $(autotools-package))
diff --git a/patches/buildroot/2014.11/034-armadeus-add-slideshow-package.patch b/patches/buildroot/2014.11/034-armadeus-add-slideshow-package.patch
deleted file mode 100644
index 1c1c72f..0000000
--- a/patches/buildroot/2014.11/034-armadeus-add-slideshow-package.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-Add slideshow package to BR.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in
-+++ buildroot/package/Config.in
-@@ -195,6 +195,7 @@ comment "Graphic applications"
- source "package/jhead/Config.in"
- source "package/mesa3d-demos/Config.in"
- source "package/rrdtool/Config.in"
-+ source "package/slideshow/Config.in"
-
- comment "Graphic libraries"
- source "package/cegui06/Config.in"
-Index: buildroot/package/slideshow/Config.in
-===================================================================
---- /dev/null
-+++ buildroot/package/slideshow/Config.in
-@@ -0,0 +1,8 @@
-+config BR2_PACKAGE_SLIDESHOW
-+ bool "Slideshow"
-+ depends on BR2_PACKAGE_SDL && BR2_PACKAGE_SDL_IMAGE
-+ help
-+ Perigee Slideshow is a command line program that searches a directory
-+ for supported graphic files and displays them in a slideshow.
-+
-+ http://www.xmission.com/~jstanley/slideshow.html
-Index: buildroot/package/slideshow/slideshow.mk
-===================================================================
---- /dev/null
-+++ buildroot/package/slideshow/slideshow.mk
-@@ -0,0 +1,39 @@
-+#############################################################
-+#
-+# slideshow
-+#
-+#############################################################
-+
-+SLIDESHOW_VERSION:=1.1
-+SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
-+SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
-+
-+SLIDESHOW_DEPENDENCIES += sdl sdl_image
-+
-+define SLIDESHOW_BUILD_CMDS
-+ $(MAKE) CC="$(TARGET_CXX)" CFLAGS="$(TARGET_CFLAGS) `sh $(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
-+ LFLAGS="`sh $(STAGING_DIR)/usr/bin/sdl-config --libs` -lSDL_image" \
-+ -C $(SLIDESHOW_DIR)
-+endef
-+
-+define SLIDESHOW_INSTALL_TARGET_CMDS
-+ cp -dpf $(SLIDESHOW_DIR)/slideshow $(TARGET_DIR)/usr/bin
-+endef
-+
-+define SLIDESHOW_CLEAN_CMDS
-+ $(MAKE) clean -C $(SLIDESHOW_DIR)
-+endef
-+
-+define SLIDESHOW_UNINSTALL_TARGET_CMDS
-+ rm -f $(TARGET_DIR)/usr/bin/slideshow
-+endef
-+
-+$(eval $(generic-package))
-+
-+# BR currently doesn't support .zip archive, so do extraction manually:
-+$(SLIDESHOW_TARGET_EXTRACT): $(SLIDESHOW_TARGET_SOURCE)
-+ $(call MESSAGE,"Extracting")
-+ unzip $(DL_DIR)/$($(PKG)_SOURCE) -d $(BUILD_DIR)
-+ mv $(BUILD_DIR)/slideshow/* $(BUILD_DIR)/slideshow-$(SLIDESHOW_VERSION)/
-+ rm -rf $(BUILD_DIR)/slideshow
-+ touch $@
-Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
-===================================================================
---- /dev/null
-+++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch
-@@ -0,0 +1,19 @@
-+Signed-off-by: Julien Boibessot <jul...@ar...>
-+
-+diff -urN slideshow-1.1/slideshow.cpp slideshow-1.1.mod/slideshow.cpp
-+--- slideshow-1.1/slideshow.cpp 2013-08-31 11:35:19.932650303 +0200
-++++ slideshow-1.1.mod/slideshow.cpp 2013-08-31 11:34:48.396493925 +0200
-+@@ -228,9 +228,10 @@
-+ break;
-+ }
-+
-+- // stop the auto-advance when the last picture is about to be shown
-+- if ( m_image_index == m_file_list->count() - 1 )
-+- stop_timer();
-++ // Restart from beginning when the last picture is shown
-++ if ( m_image_index == m_file_list->count() )
-++ m_image_index = 0;
-++ m_prev_image_index = -1;
-+ }
-+
-+ return true;
-Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
-===================================================================
---- /dev/null
-+++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
-@@ -0,0 +1,13 @@
-+--- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
-++++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
-+@@ -84,8 +84,8 @@
-+
-+ Uint8 *pixloc = (Uint8 *)pDisplay->pixels + dpitch * y + Bpp * x;
-+ Uint8 *pChar, *pScreen;
-+- char c;
-+- int i, j;
-++ //char c;
-++ int i, j, c;
-+
-+ for(const char *p = text; *p != '\0'; p++)
-+ {
-Index: buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
-===================================================================
---- /dev/null
-+++ buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
-@@ -0,0 +1,28 @@
-+On recent gcc some includes are needed to have string stuff defined.
-+
-+Signed-off-by: Julien Boibessot <jul...@ar...>
-+
-+Index: slideshow-1.1/file_list.cpp
-+===================================================================
-+--- slideshow-1.1.orig/file_list.cpp 2011-07-01 18:58:49.000000000 +0200
-++++ slideshow-1.1/file_list.cpp 2011-07-01 18:59:10.000000000 +0200
-+@@ -8,6 +8,7 @@
-+ #include <fstream>
-+ #include <stdlib.h>
-+ #include <ctype.h>
-++#include <string.h>
-+
-+ #ifdef WIN32
-+ #include <io.h>
-+Index: slideshow-1.1/slideshow.h
-+===================================================================
-+--- slideshow-1.1.orig/slideshow.h 2011-07-01 18:59:56.000000000 +0200
-++++ slideshow-1.1/slideshow.h 2011-07-01 19:00:02.000000000 +0200
-+@@ -9,6 +9,7 @@
-+ #pragma once
-+ #endif // _MSC_VER > 1000
-+
-++#include <iostream>
-+ #include "SDL.h"
-+ #include "cache.h"
-+
-Index: buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
-===================================================================
---- /dev/null
-+++ buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
-@@ -0,0 +1,17 @@
-+Otherwise crashes on APF27.
-+
-+Signed-off-by: Julien Boibessot <jul...@ar...>
-+
-+Index: slideshow-1.1/slideshow.cpp
-+===================================================================
-+--- slideshow-1.1.orig/slideshow.cpp 2011-07-02 13:19:00.000000000 +0200
-++++ slideshow-1.1/slideshow.cpp 2011-07-02 13:19:17.000000000 +0200
-+@@ -411,7 +411,7 @@
-+ else
-+ flags |= SDL_FULLSCREEN;
-+
-+- m_sdl = SDL_SetVideoMode(m_options->width, m_options->height, 32, flags);
-++ m_sdl = SDL_SetVideoMode(m_options->width, m_options->height, 16 /*32*/, flags);
-+
-+ if ( !m_sdl )
-+ {
diff --git a/patches/buildroot/2014.11/050-U-Boot-add_support_for_custom_configuration_file.patch b/patches/buildroot/2014.11/050-U-Boot-add_support_for_custom_configuration_file.patch
deleted file mode 100644
index 5791481..0000000
--- a/patches/buildroot/2014.11/050-U-Boot-add_support_for_custom_configuration_file.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-U-Boot: add option to use a custom config file as it can be done within
- Linux kernel, Busybox, uClibc and some other tools.
-
-Signed-off-by: Eric Jarrige <eri...@ar...>
----
---- buildroot/boot/uboot/Config.in
-+++ buildroot/boot/uboot/Config.in
-@@ -71,6 +71,26 @@ config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSI
- endif
-
- choice
-+ prompt "U-Boot configuration"
-+ default BR2_TARGET_UBOOT_USE_DEFCONFIG
-+
-+config BR2_TARGET_UBOOT_USE_DEFCONFIG
-+ bool "Using default configuration"
-+ help
-+ Using the default configuration selected by U-Boot boa...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2015-02-27 08:21: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 c16f7b8175216cced43ee30ed06a48b5085a049a (commit)
from f0cc3df28433f4542e2d8d968fcf1812eceae2b6 (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 c16f7b8175216cced43ee30ed06a48b5085a049a
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 27 09:21:38 2015 +0100
[BUILDROOT] Fixes testsuite installation on all APFs (again, sorry :-( )
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/testsuite/testsuite.mk | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/buildroot/package/armadeus/testsuite/testsuite.mk b/buildroot/package/armadeus/testsuite/testsuite.mk
index 14c41b8..a061dd6 100644
--- a/buildroot/package/armadeus/testsuite/testsuite.mk
+++ b/buildroot/package/armadeus/testsuite/testsuite.mk
@@ -9,6 +9,7 @@ TESTSUITE_SITE = $(TOPDIR)/../target/test/
TESTSUITE_SITE_METHOD = local
ARMADEUS_TESTSUITE_WISHBONE_BUTTON_SRCDIR = $(TOPDIR)/../target/linux/modules/fpga/virtual_components/button/
+ARMADEUS_TESTSUITE_TARGET_DIR = $(TARGET_DIR)/usr/bin/testsuite/
define TESTSUITE_COPY_FPGA_SYMLINKS
rm -f $(@D)/data/fpga/*
@@ -22,8 +23,9 @@ define TESTSUITE_BUILD_CMDS
endef
define TESTSUITE_INSTALL_TARGET_CMDS
- $(@D)/install.sh $(TARGET_DIR)/usr/bin/testsuite/ $(BR2_BOARD_NAME)
- $(INSTALL) -D $(ARMADEUS_TESTSUITE_WISHBONE_BUTTON_SRCDIR)/testbutton $(TARGET_DIR)/usr/bin/testsuite/
+ mkdir -p $(ARMADEUS_TESTSUITE_TARGET_DIR)
+ $(@D)/install.sh $(ARMADEUS_TESTSUITE_TARGET_DIR) $(BR2_BOARD_NAME)
+ $(INSTALL) -D $(ARMADEUS_TESTSUITE_WISHBONE_BUTTON_SRCDIR)/testbutton $(ARMADEUS_TESTSUITE_TARGET_DIR)
endef
$(eval $(generic-package))
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2015-02-26 17:03: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 f0cc3df28433f4542e2d8d968fcf1812eceae2b6 (commit)
via 939079d8e7cd1425928393a720e972b8211feafe (commit)
from babecf2c1fc7ac6dc60d02a7b9045bf8fa1e2c6f (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 f0cc3df28433f4542e2d8d968fcf1812eceae2b6
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 26 17:58:47 2015 +0100
[BUILDROOT] apf6legacy_defconfig: add gstreamer + some useful plugins
commit 939079d8e7cd1425928393a720e972b8211feafe
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 26 17:12:14 2015 +0100
[U-BOOT] APF6: 2014.07, 2015.01: increase console I/O buffer size to avoid hang when printing big envt variables
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6legacy_defconfig | 17 +++++++++++++++++
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 2 +-
.../device/armadeus/apf6/apf6-u-boot-2015.01.h | 2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 0709645..6306941 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -37,6 +37,23 @@ BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_GDB=y
+BR2_PACKAGE_GSTREAMER=y
+BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC=y
+BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA=y
+BR2_PACKAGE_GST_PLUGINS_GOOD=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIFILE=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIPART=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX=y
+BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOCROP=y
+BR2_PACKAGE_GST_PLUGINS_BAD=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE=y
+BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV=y
+BR2_PACKAGE_GST_FSL_PLUGINS=y
BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_RAMSMP=y
BR2_PACKAGE_STRACE=y
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
index 73dafb9..aad1221 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
@@ -277,7 +277,7 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CBSIZE 256
+#define CONFIG_SYS_CBSIZE 384 /* Console I/O Buffer Size */
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_LONGHELP
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
index 73dafb9..aad1221 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
@@ -277,7 +277,7 @@
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
#define CONFIG_CONSOLE_MUX
-#define CONFIG_SYS_CBSIZE 256
+#define CONFIG_SYS_CBSIZE 384 /* Console I/O Buffer Size */
#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_LONGHELP
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2015-02-26 15:03:33
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via babecf2c1fc7ac6dc60d02a7b9045bf8fa1e2c6f (commit)
via a073e8b1318345be536932d3d1934f1351c78d7e (commit)
via 63ee1da2c2cd487cc0bbb01b3b1864ed3df72bbf (commit)
via 12cc57109184125c8e8c8ebb0cd476f59a8e7d0c (commit)
via e9ed4023868aa1caf2259abb0273559525c5a180 (commit)
from 6cb5ee231427c2136361dba9ff6974a1098beba9 (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 babecf2c1fc7ac6dc60d02a7b9045bf8fa1e2c6f
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 26 16:03:17 2015 +0100
[U-BOOT] APF6: merge apf6-u-boot-2015.01.h & apf6-u-boot-2014.07.h again together
commit a073e8b1318345be536932d3d1934f1351c78d7e
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 26 15:51:29 2015 +0100
[U-BOOT] APF6: 2014.07, 2015.01: add mmcboot script and factorize with emmcboot
commit 63ee1da2c2cd487cc0bbb01b3b1864ed3df72bbf
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 26 13:26:52 2015 +0100
[BUILDROOT] Fixes testsuite installation on all APFs
commit 12cc57109184125c8e8c8ebb0cd476f59a8e7d0c
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 26 13:00:22 2015 +0100
[BUILDROOT] Fixes testsuite installation on APF28
commit e9ed4023868aa1caf2259abb0273559525c5a180
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 20 15:28:50 2015 +0100
[BUILD] Fixes TOPDIR warning when generating armadeus_env.sh
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 2 +-
buildroot/configs/apf27test_defconfig | 2 +-
buildroot/configs/apf28test_defconfig | 5 +++-
buildroot/configs/apf51test_defconfig | 2 +-
buildroot/configs/apf9328test_defconfig | 2 +-
buildroot/configs/pps51_defconfig | 2 +-
buildroot/package/armadeus/testsuite/Config.in | 8 ++----
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 16 ++++++++----
.../device/armadeus/apf6/apf6-u-boot-2015.01.h | 25 ++++++++++++--------
target/test/install.sh | 6 +++-
10 files changed, 41 insertions(+), 29 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 56389b6..c4bcbb3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@ else
ifneq ($(BR2_DL_DIR),)
ARMADEUS_DL_DIR := $(BR2_DL_DIR)
else
- ARMADEUS_DL_DIR := $(shell grep "BR2_DL_DIR=" $(BUILDROOT_DIR)/.config 2>/dev/null | cut -d = -f 2 | sed 's;$$(BASE_DIR);$(BUILDROOT_DIR);')
+ ARMADEUS_DL_DIR := $(shell grep "BR2_DL_DIR=" $(BUILDROOT_DIR)/.config 2>/dev/null | cut -d = -f 2 | sed 's;$$(TOPDIR);$(BUILDROOT_DIR);')
endif
endif
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index c7b7b3c..48bf6c9 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -62,7 +62,7 @@ BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blink
BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_AD9889CTRL=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index d7ba973..bd0664b 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -49,12 +49,13 @@ BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
+BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE=y
BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
@@ -80,6 +81,8 @@ BR2_PACKAGE_STRACE=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_SUMTOOL=y
+BR2_PACKAGE_LBREAKOUT2=y
+BR2_PACKAGE_OPENTYRIAN=y
BR2_PACKAGE_DOOM_WAD=y
BR2_PACKAGE_PRBOOM=y
BR2_PACKAGE_SLIDESHOW=y
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index cb8cb46..8d7b923 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -62,7 +62,7 @@ BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_TFP410CTRL=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index c610061..89f0d74 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -63,7 +63,7 @@ BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blink
BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
-BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_CH7024CTRL=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index dd4aadc..4f3761f 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -46,7 +46,7 @@ BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
BR2_PACKAGE_IMXREGS=y
-BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+BR2_PACKAGE_TESTSUITE=y
BR2_PACKAGE_PPS=y
BR2_PACKAGE_PPS_TEST_SCRIPTS=y
BR2_PACKAGE_TFP410CTRL=y
diff --git a/buildroot/package/armadeus/testsuite/Config.in b/buildroot/package/armadeus/testsuite/Config.in
index 1f0c929..ca2a58f 100644
--- a/buildroot/package/armadeus/testsuite/Config.in
+++ b/buildroot/package/armadeus/testsuite/Config.in
@@ -1,7 +1,5 @@
-config BR2_PACKAGE_ARMADEUS_TESTSUITE
+config BR2_PACKAGE_TESTSUITE
bool "Armadeus Test Suite"
- default n
help
- Install Armadeus "Test Suite" to allow automatic release validation.
- Test scripts will be installed on the APF in /usr/bin/test/ .
-
+ Install Armadeus "Test Suite" (used for BSP release validation).
+ Test scripts will be installed on the APF in /usr/bin/test/.
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
index 065d991..73dafb9 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
@@ -235,7 +235,7 @@
"update_kernel=run download_kernel flash_kernel\0" \
"download_dtb=tftpboot ${loadaddr} ${cpu_type}-${fdt_name}.dtb\0" \
"flash_dtb=" \
- "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /dtbs/${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /dtbs/${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
"echo Flashing of dtb succeed; " \
"else echo Flashing of dtb failed; " \
"fi;\0" \
@@ -252,21 +252,25 @@
"fi;\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
"update_all=run update_kernel update_rootfs update_dtb update_uboot\0" \
- "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${board_name}-linux.bin\0" \
- "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${cpu_type}-${fdt_name}.dtb\0" \
+ "mmcloadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${mmcdir}/${board_name}-linux.bin\0" \
+ "mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${mmcdir}/dtbs/${cpu_type}-${fdt_name}.dtb\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"addmmcargs=setenv bootargs ${bootargs} root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
- "emmcboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
+ "genmmcboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
"run addmmcargs; " \
- "run loadzimage && run loadfdt && bootz ${loadaddr} - ${fdt_addr};\0" \
+ "run mmcloadzimage && run mmcloadfdt && bootz ${loadaddr} - ${fdt_addr};\0" \
+ "mmcboot=setenv mmcdev 1; setenv mmcpart 1; setenv mmcdir /boot; setenv mmcroot /dev/mmcblk1p1 ro; " \
+ "run genmmcboot;\0" \
+ "emmcboot=setenv mmcdev 0; setenv mmcpart 1; setenv mmcdir; setenv mmcroot /dev/mmcblk2p2 ro; " \
+ "run genmmcboot;\0" \
"addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath}\0" \
"nfsboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
"run addnfsargs addipargs; " \
"nfs ${loadaddr} ${serverip}:${rootpath}/boot/${board_name}-linux.bin && " \
- "nfs ${fdt_addr} ${serverip}:${rootpath}/boot/dtbs/${cpu_type}-${fdt_name}.dtb && " \
+ "nfs ${fdt_addr} ${serverip}:${rootpath}/boot/dtbs/${cpu_type}-${fdt_name}.dtb && " \
"bootz ${loadaddr} - ${fdt_addr};\0"
/* Miscellaneous configurable options */
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
index ed7629c..73dafb9 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
@@ -16,7 +16,7 @@
#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 5
+#define CONFIG_ENV_VERSION 6
#define CONFIG_BOARD_NAME apf6
/* SPL */
@@ -181,9 +181,10 @@
"env_version=" __stringify(CONFIG_ENV_VERSION) "\0" \
"consoledev=" __stringify(ACFG_CONSOLE_DEV) "\0" \
"board_name=" __stringify(CONFIG_BOARD_NAME) "\0" \
+ "fdt_addr=0x18000000\0" \
"fdt_high=0xffffffff\0" \
+ "fdt_name=" __stringify(CONFIG_BOARD_NAME) "dev\0" \
"initrd_high=0xffffffff\0" \
- "fdt_addr=0x18000000\0" \
"ip_dyn=yes\0" \
"stdin=serial\0" \
"stout=serial\0" \
@@ -232,9 +233,9 @@
"else echo Flashing of kernel failed; " \
"fi;\0" \
"update_kernel=run download_kernel flash_kernel\0" \
- "download_dtb=tftpboot ${loadaddr} ${fdt_file}\0" \
+ "download_dtb=tftpboot ${loadaddr} ${cpu_type}-${fdt_name}.dtb\0" \
"flash_dtb=" \
- "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /dtbs/${fdt_file} ${filesize}; then " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /dtbs/${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
"echo Flashing of dtb succeed; " \
"else echo Flashing of dtb failed; " \
"fi;\0" \
@@ -250,22 +251,26 @@
"fi; " \
"fi;\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
- "update_all=run update_kernel update_rootfs update_dtb update_uboot\0" \
- "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${board_name}-linux.bin\0" \
- "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${fdt_file}\0" \
+ "update_all=run update_kernel update_rootfs update_dtb update_uboot\0" \
+ "mmcloadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${mmcdir}/${board_name}-linux.bin\0" \
+ "mmcloadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${mmcdir}/dtbs/${cpu_type}-${fdt_name}.dtb\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"addmmcargs=setenv bootargs ${bootargs} root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
- "emmcboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
+ "genmmcboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
"run addmmcargs; " \
- "run loadzimage && run loadfdt && bootz ${loadaddr} - ${fdt_addr};\0" \
+ "run mmcloadzimage && run mmcloadfdt && bootz ${loadaddr} - ${fdt_addr};\0" \
+ "mmcboot=setenv mmcdev 1; setenv mmcpart 1; setenv mmcdir /boot; setenv mmcroot /dev/mmcblk1p1 ro; " \
+ "run genmmcboot;\0" \
+ "emmcboot=setenv mmcdev 0; setenv mmcpart 1; setenv mmcdir; setenv mmcroot /dev/mmcblk2p2 ro; " \
+ "run genmmcboot;\0" \
"addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw " \
"nfsroot=${serverip}:${rootpath}\0" \
"nfsboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
"run addnfsargs addipargs; " \
"nfs ${loadaddr} ${serverip}:${rootpath}/boot/${board_name}-linux.bin && " \
- "nfs ${fdt_addr} ${serverip}:${rootpath}/boot/dtbs/${fdt_file} && " \
+ "nfs ${fdt_addr} ${serverip}:${rootpath}/boot/dtbs/${cpu_type}-${fdt_name}.dtb && " \
"bootz ${loadaddr} - ${fdt_addr};\0"
/* Miscellaneous configurable options */
diff --git a/target/test/install.sh b/target/test/install.sh
index 2a898e4..0f17239 100755
--- a/target/test/install.sh
+++ b/target/test/install.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ "$1" == "" ]; then
+if [ ! -d "$1" ]; then
echo "Please provides the directory where to install the Test Suite"
echo "(optionnaly you can provide the board for which to install the"
echo "Test Suite and some not used data won't be installed)"
@@ -25,7 +25,9 @@ install $THIS_DIR/mmc/*.sh $TESTSUITE_TARGET_DIR/
cp -d $THIS_DIR/packages/*.sh $TESTSUITE_TARGET_DIR/packages
#
if [ "$2" != "" ]; then
- cp $THIS_DIR/data/fpga/*$2* $TESTSUITE_TARGET_DIR/data/fpga/
+ if [ "$2" != "apf28" ]; then
+ cp $THIS_DIR/data/fpga/*$2* $TESTSUITE_TARGET_DIR/data/fpga/
+ fi
else
cp $THIS_DIR/data/fpga/* $TESTSUITE_TARGET_DIR/data/fpga/
fi
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2015-02-25 13:39:16
|
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 6cb5ee231427c2136361dba9ff6974a1098beba9 (commit)
via c3a2aeb556e435a5f06bd6bdcc37b46e95f6d2a0 (commit)
from 065e5fa46fae5b23a9fcc8634a9f35eab6d2d80a (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 6cb5ee231427c2136361dba9ff6974a1098beba9
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Feb 25 14:41:36 2015 +0100
[LINUX] apf6: add linux 4.0-rc1 support
commit c3a2aeb556e435a5f06bd6bdcc37b46e95f6d2a0
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Feb 25 14:33:00 2015 +0100
[BUILDROOT] 2013.11/2015.02: linux: add support for 4.x versions
This patch has been sent to upstream.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
.../armadeus/apf27/apf27-linux-4.0-rc1.config | 1 +
...27-linux-3.18.config => apf27-linux-4.0.config} | 0
.../armadeus/apf28/apf28-linux-4.0-rc1.config | 1 +
...28-linux-3.14.config => apf28-linux-4.0.config} | 0
.../armadeus/apf51/apf51-linux-4.0-rc1.config | 1 +
...51-linux-3.17.config => apf51-linux-4.0.config} | 0
.../device/armadeus/apf6/apf6-linux-4.0-rc1.config | 1 +
...pf6-linux-3.18.config => apf6-linux-4.0.config} | 0
.../223-linux-add-support-for-4.x-versions.patch | 21 +++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 1 +
.../223-linux-add-support-for-4.x-versions.patch | 21 +++++
patches/buildroot/2015.02/cleanup_buildroot.sh | 1 +
patches/linux/4.0-rc1 | 1 +
...15-armadeus-logo-add_armadeus-project_tux.patch | 0
.../{3.10 => 4.0}/0021-armadeus-apf9328.patch | 0
...s-apf9328-add_board_to_linux_build_system.patch | 0
.../0029-armadeus-add_csi_and_spi_registers.patch | 0
...029b-armadeus-add_csi_registers.patch.dontapply | 0
...rmadeus-devices-imx1-add_udc_registration.patch | 0
...-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix | 0
...50-armadeus-add_custom_drivers_to_kconfig.patch | 0
.../{3.15 => 4.0}/0073-armadeus-tsc2102.patch | 0
...02_integrate_driver_to_linux_build_system.patch | 0
...chscreen-add_driver_to_linux_build_system.patch | 0
.../0074-armadeus-tsc2102-touchscreen.patch | 0
.../0075-armadeus-spi2-reg-defines.patch | 0
...Add-device-tree-support-to-tsc210x-driver.patch | 0
...eus-clock_correct_mxc_decode_pll_for_imx1.tofix | 0
...ng-as-module-a-driver-registering-a-clock.tofix | 0
...210x-device-tree-declaration-for-apf27dev.patch | 0
...deus-dts-apf27dev-fixes-user-led-polarity.patch | 0
...1-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch | 0
...dts-apf27dev-add_gpio_key_wakeup_behavior.patch | 0
...s-dts-imx27-apf27dev-set-pwmr-accordingly.patch | 0
...clk-imx27-fixes-vpu-spll-clock-dependency.patch | 0
.../0322-armadeus-add_mach_fpga_h.patch | 0
...-imx51_dts-add_usbphy_for_host1_and_host2.patch | 0
...51-chipidea-usbmisc_imx-add_imx51_support.patch | 0
...adeus-chipidea-add_node_to_select_clk_phy.patch | 0
...us-apf51-add_apf51_v1-and_v2_device_trees.patch | 86 +++++++++++++-------
...eus-apf51-add_mc13982_touchscreen_support.patch | 0
.../0420-armadeus-Improve-apf28dev-dts.patch | 0
...ot_link_otg_phy_clock_directly_to_osc_ref.patch | 0
..._star_completion_for_source_in_menuconfig.patch | 0
...low_to_use_the_wakeupalarm_functionnality.patch | 0
...4-armadeus-usb-chipidea-add-imx27-support.patch | 0
...44-armadeus-usb-enable_usb_div_by_default.patch | 0
...5-armadeus-add-apf27-apf27dev-dts-for-USB.patch | 0
...46-armadeus-mxs-add-pm_power_off-function.patch | 0
...g-pwm-mxs-fixes-bug-in-period-computation.patch | 0
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 0
...-armadeus-add-watchdog-bootstatus-logging.patch | 0
...c-core-Update-ext_csd-if-touched-by-ioctl.patch | 0
...6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch | 0
...-remove-pwr_in_suspend-from-platform-data.patch | 0
...-instead-of-enumerations-for-pdata-clocks.patch | 0
...al-device-tree-support-to-the-sdio-module.patch | 0
...-8-wlcore-sdio-add-wilink-clock-providers.patch | 0
...8-wlcore-sdio-get-clocks-from-device-tree.patch | 0
...heck-if-we-got-correct-clock-data-from-DT.patch | 0
...cumentation-dt-bindings-TI-WiLink-modules.patch | 0
...04-armadeus-add_sx8674_touchscreen_driver.patch | 0
.../0505-armadeus-add_mcp7940x_rtc_driver.patch | 0
.../4.0/0506-armadeus-change_mmc_numbering.patch | 21 +++++
...ideomode-add-pos-neg-pixel-clock-polarity.patch | 53 ++++++++++++
...v3-crtc-Use-DRM-mode-flags-to-configure-p.patch | 25 +++---
...00-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch | 0
...gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch | 0
.../0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch | 0
.../0603-gpu-ipu-v3-Add-ipu_get_num.patch | 0
...u-ipu-v3-Add-IDMA-channel-linking-support.patch | 0
.../0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch | 0
...6-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch | 0
.../0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch | 0
.../0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch | 0
...pu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch | 0
...imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch | 0
.../0611-ARM-imx6q-clk-Add-video-27m-clock.patch | 0
...imx6dl-Add-iomux-field-defines-for-imx6dl.patch | 0
...-imx-Add-imx6-video-capture-platform_data.patch | 0
...mx6-Add-device-tree-binding-documentation.patch | 0
...Add-new-camera-interface-driver-for-i.MX6.patch | 84 ++++++++++----------
...ia-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch | 0
...edia-imx6-Add-support-for-Parallel-OV5642.patch | 0
...mx6-Add-support-for-ADV7180-Video-Decoder.patch | 0
...mx6-camera-Add-deinterlace-motion-control.patch | 0
...imx6-camera-Add-VDIC-deinterlacing-subdev.patch | 0
...v7_defconfig-Enable-staging-video4linux-d.patch | 0
89 files changed, 234 insertions(+), 86 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-4.0-rc1.config
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.18.config => apf27-linux-4.0.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-4.0-rc1.config
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.config => apf28-linux-4.0.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-4.0-rc1.config
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.17.config => apf51-linux-4.0.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf6/apf6-linux-4.0-rc1.config
copy buildroot/target/device/armadeus/apf6/{apf6-linux-3.18.config => apf6-linux-4.0.config} (100%)
create mode 100644 patches/buildroot/2013.11/223-linux-add-support-for-4.x-versions.patch
create mode 100644 patches/buildroot/2015.02/223-linux-add-support-for-4.x-versions.patch
create mode 120000 patches/linux/4.0-rc1
copy patches/linux/{3.12 => 4.0}/0015-armadeus-logo-add_armadeus-project_tux.patch (100%)
copy patches/linux/{3.10 => 4.0}/0021-armadeus-apf9328.patch (100%)
copy patches/linux/{3.18 => 4.0}/0024-armadeus-apf9328-add_board_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 4.0}/0029-armadeus-add_csi_and_spi_registers.patch (100%)
copy patches/linux/{3.17 => 4.0}/0029b-armadeus-add_csi_registers.patch.dontapply (100%)
copy patches/linux/{3.10 => 4.0}/0030-armadeus-devices-imx1-add_udc_registration.patch (100%)
copy patches/linux/{3.18 => 4.0}/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix (100%)
copy patches/linux/{3.10 => 4.0}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
copy patches/linux/{3.15 => 4.0}/0073-armadeus-tsc2102.patch (100%)
copy patches/linux/{3.10 => 4.0}/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 4.0}/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 4.0}/0074-armadeus-tsc2102-touchscreen.patch (100%)
copy patches/linux/{3.10 => 4.0}/0075-armadeus-spi2-reg-defines.patch (100%)
copy patches/linux/{3.18 => 4.0}/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch (100%)
copy patches/linux/{3.10 => 4.0}/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix (100%)
copy patches/linux/{3.18 => 4.0}/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix (100%)
copy patches/linux/{3.18 => 4.0}/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch (100%)
copy patches/linux/{3.15 => 4.0}/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch (100%)
copy patches/linux/{3.15 => 4.0}/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch (100%)
copy patches/linux/{3.13 => 4.0}/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch (100%)
copy patches/linux/{3.15 => 4.0}/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch (100%)
copy patches/linux/{3.18 => 4.0}/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch (100%)
copy patches/linux/{3.10 => 4.0}/0322-armadeus-add_mach_fpga_h.patch (100%)
copy patches/linux/{3.14 => 4.0}/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch (100%)
copy patches/linux/{3.18 => 4.0}/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch (100%)
copy patches/linux/{3.12 => 4.0}/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch (100%)
copy patches/linux/{3.19 => 4.0}/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch (92%)
copy patches/linux/{3.16 => 4.0}/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch (100%)
copy patches/linux/{3.18 => 4.0}/0420-armadeus-Improve-apf28dev-dts.patch (100%)
copy patches/linux/{3.14 => 4.0}/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch (100%)
copy patches/linux/{3.12 => 4.0}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (100%)
copy patches/linux/{3.10 => 4.0}/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch (100%)
copy patches/linux/{3.18 => 4.0}/0444-armadeus-usb-chipidea-add-imx27-support.patch (100%)
copy patches/linux/{3.17 => 4.0}/0444-armadeus-usb-enable_usb_div_by_default.patch (100%)
copy patches/linux/{3.16 => 4.0}/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch (100%)
copy patches/linux/{3.18 => 4.0}/0446-armadeus-mxs-add-pm_power_off-function.patch (100%)
copy patches/linux/{3.18 => 4.0}/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch (100%)
copy patches/linux/{3.18 => 4.0}/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch (100%)
copy patches/linux/{3.16 => 4.0}/0460-armadeus-add-watchdog-bootstatus-logging.patch (100%)
copy patches/linux/{3.19 => 4.0}/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch (100%)
copy patches/linux/{3.13 => 4.0}/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch (100%)
copy patches/linux/{3.16 => 4.0}/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch (100%)
copy patches/linux/{3.15 => 4.0}/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch (100%)
copy patches/linux/{3.16 => 4.0}/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch (100%)
copy patches/linux/{3.13 => 4.0}/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch (100%)
copy patches/linux/{3.15 => 4.0}/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch (100%)
copy patches/linux/{3.15 => 4.0}/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch (100%)
copy patches/linux/{3.15 => 4.0}/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch (100%)
copy patches/linux/{3.15 => 4.0}/0504-armadeus-add_sx8674_touchscreen_driver.patch (100%)
copy patches/linux/{3.15 => 4.0}/0505-armadeus-add_mcp7940x_rtc_driver.patch (100%)
create mode 100644 patches/linux/4.0/0506-armadeus-change_mmc_numbering.patch
create mode 100644 patches/linux/4.0/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
copy patches/linux/{3.19 => 4.0}/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch (58%)
copy patches/linux/{3.19 => 4.0}/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch (100%)
copy patches/linux/{3.18 => 4.0}/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch (100%)
copy patches/linux/{3.18 => 4.0}/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch (100%)
copy patches/linux/{3.18 => 4.0}/0603-gpu-ipu-v3-Add-ipu_get_num.patch (100%)
copy patches/linux/{3.18 => 4.0}/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch (100%)
copy patches/linux/{3.18 => 4.0}/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch (100%)
copy patches/linux/{3.18 => 4.0}/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch (100%)
copy patches/linux/{3.18 => 4.0}/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch (100%)
copy patches/linux/{3.18 => 4.0}/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch (100%)
copy patches/linux/{3.18 => 4.0}/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch (100%)
copy patches/linux/{3.18 => 4.0}/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch (100%)
copy patches/linux/{3.18 => 4.0}/0611-ARM-imx6q-clk-Add-video-27m-clock.patch (100%)
copy patches/linux/{3.18 => 4.0}/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch (100%)
copy patches/linux/{3.18 => 4.0}/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch (100%)
copy patches/linux/{3.18 => 4.0}/0618-media-imx6-Add-device-tree-binding-documentation.patch (100%)
copy patches/linux/{3.19 => 4.0}/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch (97%)
copy patches/linux/{3.19 => 4.0}/0620-media-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch (100%)
copy patches/linux/{3.19 => 4.0}/0621-media-imx6-Add-support-for-Parallel-OV5642.patch (100%)
copy patches/linux/{3.19 => 4.0}/0622-media-imx6-Add-support-for-ADV7180-Video-Decoder.patch (100%)
copy patches/linux/{3.18 => 4.0}/0623-media-imx6-camera-Add-deinterlace-motion-control.patch (100%)
copy patches/linux/{3.19 => 4.0}/0624-media-imx6-camera-Add-VDIC-deinterlacing-subdev.patch (100%)
copy patches/linux/{3.19 => 4.0}/0625-ARM-imx_v6_v7_defconfig-Enable-staging-video4linux-d.patch (100%)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index bded6b0..fc0971f 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -23,7 +23,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.0-rc1"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-4.0-rc1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-4.0-rc1.config
new file mode 120000
index 0000000..c6e49c2
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-4.0-rc1.config
@@ -0,0 +1 @@
+apf27-linux-4.0.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.config b/buildroot/target/device/armadeus/apf27/apf27-linux-4.0.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.18.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-4.0.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-4.0-rc1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-4.0-rc1.config
new file mode 120000
index 0000000..390a441
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-4.0-rc1.config
@@ -0,0 +1 @@
+apf28-linux-4.0.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.config b/buildroot/target/device/armadeus/apf28/apf28-linux-4.0.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-4.0.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-4.0-rc1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-4.0-rc1.config
new file mode 120000
index 0000000..0752a6d
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-4.0-rc1.config
@@ -0,0 +1 @@
+apf51-linux-4.0.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config b/buildroot/target/device/armadeus/apf51/apf51-linux-4.0.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-4.0.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-4.0-rc1.config b/buildroot/target/device/armadeus/apf6/apf6-linux-4.0-rc1.config
new file mode 120000
index 0000000..c7dce85
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-4.0-rc1.config
@@ -0,0 +1 @@
+apf6-linux-4.0.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config b/buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
copy to buildroot/target/device/armadeus/apf6/apf6-linux-4.0.config
diff --git a/patches/buildroot/2013.11/223-linux-add-support-for-4.x-versions.patch b/patches/buildroot/2013.11/223-linux-add-support-for-4.x-versions.patch
new file mode 100644
index 0000000..fb70de8
--- /dev/null
+++ b/patches/buildroot/2013.11/223-linux-add-support-for-4.x-versions.patch
@@ -0,0 +1,21 @@
+Index: buildroot/linux/linux.mk
+===================================================================
+--- buildroot.orig/linux/linux.mk
++++ buildroot/linux/linux.mk
+@@ -22,12 +22,14 @@ LINUX_SITE_METHOD = hg
+ else
+ LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz
+ # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
+-# to use the $(word) function. We support versions such as 3.1,
++# to use the $(word) function. We support versions such as 4.0, 3.1,
+ # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
+ ifeq ($(findstring x2.6.,x$(LINUX_VERSION)),x2.6.)
+ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6/
+-else
++else ifeq ($(findstring x3.,x$(LINUX_VERSION)),x3.)
+ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x/
++else ifeq ($(findstring x4.,x$(LINUX_VERSION)),x4.)
++LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x/
+ endif
+ # release candidates are in testing/ subdir
+ ifneq ($(findstring -rc,$(LINUX_VERSION)),)
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index 9de2329..abaac2b 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -15,6 +15,7 @@ rm -rf buildroot/boot/uboot/Config.in
rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/linux/Config.ext.in
rm -rf buildroot/linux/linux-ext-xenomai.mk
+rm -rf buildroot/linux/linux.mk
rm -rf buildroot/package/Config.in
rm -rf buildroot/package/Config.in.host
rm -rf buildroot/package/agg/Config.in
diff --git a/patches/buildroot/2015.02/223-linux-add-support-for-4.x-versions.patch b/patches/buildroot/2015.02/223-linux-add-support-for-4.x-versions.patch
new file mode 100644
index 0000000..ff72452
--- /dev/null
+++ b/patches/buildroot/2015.02/223-linux-add-support-for-4.x-versions.patch
@@ -0,0 +1,21 @@
+diff --git a/linux/linux.mk b/linux/linux.mk
+index 29f59e8..0b8c912 100644
+--- a/linux/linux.mk
++++ b/linux/linux.mk
+@@ -25,12 +25,14 @@ LINUX_SITE_METHOD = hg
+ else
+ LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz
+ # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
+-# to use the $(word) function. We support versions such as 3.1,
++# to use the $(word) function. We support versions such as 4.0, 3.1,
+ # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
+ ifeq ($(findstring x2.6.,x$(LINUX_VERSION)),x2.6.)
+ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6
+-else
++else ifeq ($(findstring x3.,x$(LINUX_VERSION)),x3.)
+ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x
++else ifeq ($(findstring x4.,x$(LINUX_VERSION)),x4.)
++LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
+ endif
+ # release candidates are in testing/ subdir
+ ifneq ($(findstring -rc,$(LINUX_VERSION)),)
diff --git a/patches/buildroot/2015.02/cleanup_buildroot.sh b/patches/buildroot/2015.02/cleanup_buildroot.sh
index cab2e20..1bf1aea 100755
--- a/patches/buildroot/2015.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2015.02/cleanup_buildroot.sh
@@ -15,6 +15,7 @@ rm -rf buildroot/boot/uboot/Config.in
rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/linux/Config.ext.in
rm -rf buildroot/linux/linux-ext-xenomai.mk
+rm -rf buildroot/linux/linux.mk
rm -rf buildroot/package/Config.in
rm -rf buildroot/package/Config.in.host
rm -rf buildroot/package/agg/Config.in
diff --git a/patches/linux/4.0-rc1 b/patches/linux/4.0-rc1
new file mode 120000
index 0000000..389f774
--- /dev/null
+++ b/patches/linux/4.0-rc1
@@ -0,0 +1 @@
+4.0
\ No newline at end of file
diff --git a/patches/linux/3.12/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/4.0/0015-armadeus-logo-add_armadeus-project_tux.patch
similarity index 100%
copy from patches/linux/3.12/0015-armadeus-logo-add_armadeus-project_tux.patch
copy to patches/linux/4.0/0015-armadeus-logo-add_armadeus-project_tux.patch
diff --git a/patches/linux/3.10/0021-armadeus-apf9328.patch b/patches/linux/4.0/0021-armadeus-apf9328.patch
similarity index 100%
copy from patches/linux/3.10/0021-armadeus-apf9328.patch
copy to patches/linux/4.0/0021-armadeus-apf9328.patch
diff --git a/patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/4.0/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
copy to patches/linux/4.0/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/4.0/0029-armadeus-add_csi_and_spi_registers.patch
similarity index 100%
copy from patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch
copy to patches/linux/4.0/0029-armadeus-add_csi_and_spi_registers.patch
diff --git a/patches/linux/3.17/0029b-armadeus-add_csi_registers.patch.dontapply b/patches/linux/4.0/0029b-armadeus-add_csi_registers.patch.dontapply
similarity index 100%
copy from patches/linux/3.17/0029b-armadeus-add_csi_registers.patch.dontapply
copy to patches/linux/4.0/0029b-armadeus-add_csi_registers.patch.dontapply
diff --git a/patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/4.0/0030-armadeus-devices-imx1-add_udc_registration.patch
similarity index 100%
copy from patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch
copy to patches/linux/4.0/0030-armadeus-devices-imx1-add_udc_registration.patch
diff --git a/patches/linux/3.18/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix b/patches/linux/4.0/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix
similarity index 100%
copy from patches/linux/3.18/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix
copy to patches/linux/4.0/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix
diff --git a/patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/4.0/0050-armadeus-add_custom_drivers_to_kconfig.patch
similarity index 100%
copy from patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch
copy to patches/linux/4.0/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/3.15/0073-armadeus-tsc2102.patch b/patches/linux/4.0/0073-armadeus-tsc2102.patch
similarity index 100%
copy from patches/linux/3.15/0073-armadeus-tsc2102.patch
copy to patches/linux/4.0/0073-armadeus-tsc2102.patch
diff --git a/patches/linux/3.10/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch b/patches/linux/4.0/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.10/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
copy to patches/linux/4.0/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch b/patches/linux/4.0/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.10/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
copy to patches/linux/4.0/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch b/patches/linux/4.0/0074-armadeus-tsc2102-touchscreen.patch
similarity index 100%
copy from patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch
copy to patches/linux/4.0/0074-armadeus-tsc2102-touchscreen.patch
diff --git a/patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch b/patches/linux/4.0/0075-armadeus-spi2-reg-defines.patch
similarity index 100%
copy from patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch
copy to patches/linux/4.0/0075-armadeus-spi2-reg-defines.patch
diff --git a/patches/linux/3.18/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch b/patches/linux/4.0/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch
similarity index 100%
copy from patches/linux/3.18/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch
copy to patches/linux/4.0/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch
diff --git a/patches/linux/3.10/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix b/patches/linux/4.0/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
similarity index 100%
copy from patches/linux/3.10/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
copy to patches/linux/4.0/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
diff --git a/patches/linux/3.18/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix b/patches/linux/4.0/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
similarity index 100%
copy from patches/linux/3.18/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
copy to patches/linux/4.0/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
diff --git a/patches/linux/3.18/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch b/patches/linux/4.0/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch
similarity index 100%
copy from patches/linux/3.18/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch
copy to patches/linux/4.0/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch
diff --git a/patches/linux/3.15/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch b/patches/linux/4.0/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
similarity index 100%
copy from patches/linux/3.15/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
copy to patches/linux/4.0/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
diff --git a/patches/linux/3.15/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch b/patches/linux/4.0/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
similarity index 100%
copy from patches/linux/3.15/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
copy to patches/linux/4.0/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
diff --git a/patches/linux/3.13/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch b/patches/linux/4.0/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
similarity index 100%
copy from patches/linux/3.13/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
copy to patches/linux/4.0/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
diff --git a/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch b/patches/linux/4.0/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
similarity index 100%
copy from patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
copy to patches/linux/4.0/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
diff --git a/patches/linux/3.18/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch b/patches/linux/4.0/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch
similarity index 100%
copy from patches/linux/3.18/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch
copy to patches/linux/4.0/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch
diff --git a/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/4.0/0322-armadeus-add_mach_fpga_h.patch
similarity index 100%
copy from patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch
copy to patches/linux/4.0/0322-armadeus-add_mach_fpga_h.patch
diff --git a/patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch b/patches/linux/4.0/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
similarity index 100%
copy from patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
copy to patches/linux/4.0/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
diff --git a/patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch b/patches/linux/4.0/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
similarity index 100%
copy from patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
copy to patches/linux/4.0/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
diff --git a/patches/linux/3.12/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch b/patches/linux/4.0/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
similarity index 100%
copy from patches/linux/3.12/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
copy to patches/linux/4.0/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
diff --git a/patches/linux/3.19/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch b/patches/linux/4.0/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
similarity index 92%
copy from patches/linux/3.19/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
copy to patches/linux/4.0/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
index 5d755d5..22df1f0 100644
--- a/patches/linux/3.19/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
+++ b/patches/linux/4.0/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51.dtsi
+Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51.dtsi
===================================================================
--- /dev/null
-+++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51.dtsi
++++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51.dtsi
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
@@ -185,10 +185,10 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51.dtsi
+ };
+ };
+};
-Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51-v1.dtsi
+Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51-v1.dtsi
===================================================================
--- /dev/null
-+++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51-v1.dtsi
++++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51-v1.dtsi
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
@@ -212,10 +212,10 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51-v1.dtsi
+ model = "Armadeus Systems APF51 V1 module";
+ compatible = "armadeus,imx51-apf51", "fsl,imx51";
+};
-Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51-v2.dtsi
+Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51-v2.dtsi
===================================================================
--- /dev/null
-+++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51-v2.dtsi
++++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51-v2.dtsi
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
@@ -286,10 +286,10 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51-v2.dtsi
+ };
+ };
+};
-Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev-v2.dts
+Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev-v2.dts
===================================================================
--- /dev/null
-+++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev-v2.dts
++++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev-v2.dts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
@@ -310,11 +310,11 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev-v2.dts
+ model = "Armadeus Systems APF51Dev docking/development board with APF51 V2 SOM";
+ compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
+};
-Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dtsi
+Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dtsi
-@@ -0,0 +1,238 @@
++++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dtsi
+@@ -0,0 +1,252 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
+ *
@@ -327,6 +327,14 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dtsi
+ */
+
+/ {
++ backlight@bl1{
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_backlight>;
++ compatible = "gpio-backlight";
++ gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
++ default-on;
++ };
++
+ display@di1 {
+ compatible = "fsl,imx-parallel-display";
+ interface-pix-fmt = "bgr666";
@@ -445,6 +453,12 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dtsi
+
+&iomuxc {
+ imx51-apf51dev {
++ pinctrl_backlight: bl1grp {
++ fsl,pins = <
++ MX51_PAD_DI1_D1_CS__GPIO3_4 0x1F5
++ >;
++ };
++
+ pinctrl_bluetooth: bluetoothgrp {
+ fsl,pins = <
+ MX51_PAD_EIM_CS3__GPIO2_28 0x0c5
@@ -553,23 +567,23 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dtsi
+ };
+ };
+};
-Index: linux-3.18-rc5/arch/arm/boot/dts/Makefile
+Index: linux-4.0-rc1/arch/arm/boot/dts/Makefile
===================================================================
---- linux-3.18-rc5.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.18-rc5/arch/arm/boot/dts/Makefile
-@@ -184,8 +184,8 @@ dtb-$(CONFIG_ARCH_MXC) += \
- imx35-eukrea-mbimxsd35-baseboard.dtb \
- imx35-pdk.dtb \
- imx50-evk.dtb \
+--- linux-4.0-rc1.orig/arch/arm/boot/dts/Makefile
++++ linux-4.0-rc1/arch/arm/boot/dts/Makefile
+@@ -230,8 +230,8 @@ dtb-$(CONFIG_SOC_IMX35) += \
+ dtb-$(CONFIG_SOC_IMX50) += \
+ imx50-evk.dtb
+ dtb-$(CONFIG_SOC_IMX51) += \
- imx51-apf51.dtb \
- imx51-apf51dev.dtb \
+ imx51-apf51dev.dtb \
+ imx51-apf51dev-v2.dtb \
imx51-babbage.dtb \
imx51-digi-connectcore-jsk.dtb \
- imx51-eukrea-mbimxsd51-baseboard.dtb \
-Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51.dts
+ imx51-eukrea-mbimxsd51-baseboard.dtb
+Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51.dts
===================================================================
---- linux-3.18-rc5.orig/arch/arm/boot/dts/imx51-apf51.dts
+--- linux-4.0-rc1.orig/arch/arm/boot/dts/imx51-apf51.dts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
@@ -661,10 +675,10 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51.dts
- pinctrl-0 = <&pinctrl_uart3>;
- status = "okay";
-};
-Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dts
+Index: linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
---- linux-3.18-rc5.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dts
+--- linux-4.0-rc1.orig/arch/arm/boot/dts/imx51-apf51dev.dts
++++ linux-4.0-rc1/arch/arm/boot/dts/imx51-apf51dev.dts
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 Armadeus Systems - <su...@ar...>
@@ -672,20 +686,28 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dts
*
* The code contained herein is licensed under the GNU General Public
* License. You may obtain a copy of the GNU General Public License
-@@ -9,203 +9,11 @@
+@@ -9,217 +9,11 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-
+
-/* APF51Dev is a docking board for the APF51 SOM */
-#include "imx51-apf51.dts"
+/dts-v1/;
+#include "imx51-apf51-v1.dtsi"
+#include "imx51-apf51dev.dtsi"
-
+
/ {
- model = "Armadeus Systems APF51Dev docking/development board";
+ model = "Armadeus Systems APF51Dev docking/development board with APF51 V1 SOM";
- compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
+ compatible = "armadeus,imx51-apf51dev", "armadeus,imx51-apf51", "fsl,imx51";
+-
+- backlight@bl1{
+- pinctrl-names = "default";
+- pinctrl-0 = <&pinctrl_backlight>;
+- compatible = "gpio-backlight";
+- gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
+- default-on;
+- };
-
- display@di1 {
- compatible = "fsl,imx-parallel-display";
@@ -785,6 +807,12 @@ Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dts
- pinctrl-0 = <&pinctrl_hog>;
-
- imx51-apf51dev {
+- pinctrl_backlight: bl1grp {
+- fsl,pins = <
+- MX51_PAD_DI1_D1_CS__GPIO3_4 0x1F5
+- >;
+- };
+-
- pinctrl_hog: hoggrp {
- fsl,pins = <
- MX51_PAD_EIM_EB2__GPIO2_22 0x0C5
diff --git a/patches/linux/3.16/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch b/patches/linux/4.0/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
similarity index 100%
copy from patches/linux/3.16/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
copy to patches/linux/4.0/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
diff --git a/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch b/patches/linux/4.0/0420-armadeus-Improve-apf28dev-dts.patch
similarity index 100%
copy from patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
copy to patches/linux/4.0/0420-armadeus-Improve-apf28dev-dts.patch
diff --git a/patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch b/patches/linux/4.0/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
similarity index 100%
copy from patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
copy to patches/linux/4.0/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
diff --git a/patches/linux/3.12/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/4.0/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
similarity index 100%
copy from patches/linux/3.12/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
copy to patches/linux/4.0/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
diff --git a/patches/linux/3.10/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch b/patches/linux/4.0/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
similarity index 100%
copy from patches/linux/3.10/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
copy to patches/linux/4.0/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
diff --git a/patches/linux/3.18/0444-armadeus-usb-chipidea-add-imx27-support.patch b/patches/linux/4.0/0444-armadeus-usb-chipidea-add-imx27-support.patch
similarity index 100%
copy from patches/linux/3.18/0444-armadeus-usb-chipidea-add-imx27-support.patch
copy to patches/linux/4.0/0444-armadeus-usb-chipidea-add-imx27-support.patch
diff --git a/patches/linux/3.17/0444-armadeus-usb-enable_usb_div_by_default.patch b/patches/linux/4.0/0444-armadeus-usb-enable_usb_div_by_default.patch
similarity index 100%
copy from patches/linux/3.17/0444-armadeus-usb-enable_usb_div_by_default.patch
copy to patches/linux/4.0/0444-armadeus-usb-enable_usb_div_by_default.patch
diff --git a/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/4.0/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
similarity index 100%
copy from patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
copy to patches/linux/4.0/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
diff --git a/patches/linux/3.18/0446-armadeus-mxs-add-pm_power_off-function.patch b/patches/linux/4.0/0446-armadeus-mxs-add-pm_power_off-function.patch
similarity index 100%
copy from patches/linux/3.18/0446-armadeus-mxs-add-pm_power_off-function.patch
copy to patches/linux/4.0/0446-armadeus-mxs-add-pm_power_off-function.patch
diff --git a/patches/linux/3.18/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch b/patches/linux/4.0/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch
similarity index 100%
copy from patches/linux/3.18/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch
copy to patches/linux/4.0/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch
diff --git a/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/4.0/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
similarity index 100%
copy from patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
copy to patches/linux/4.0/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
diff --git a/patches/linux/3.16/0460-armadeus-add-watchdog-bootstatus-logging.patch b/patches/linux/4.0/0460-armadeus-add-watchdog-bootstatus-logging.patch
similarity index 100%
copy from patches/linux/3.16/0460-armadeus-add-watchdog-bootstatus-logging.patch
copy to patches/linux/4.0/0460-armadeus-add-watchdog-bootstatus-logging.patch
diff --git a/patches/linux/3.19/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch b/patches/linux/4.0/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
similarity index 100%
copy from patches/linux/3.19/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
copy to patches/linux/4.0/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
diff --git a/patches/linux/3.13/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch b/patches/linux/4.0/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
similarity index 100%
copy from patches/linux/3.13/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
copy to patches/linux/4.0/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
diff --git a/patches/linux/3.16/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch b/patches/linux/4.0/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
similarity index 100%
copy from patches/linux/3.16/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
copy to patches/linux/4.0/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
diff --git a/patches/linux/3.15/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch b/patches/linux/4.0/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
similarity index 100%
copy from patches/linux/3.15/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
copy to patches/linux/4.0/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
diff --git a/patches/linux/3.16/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch b/patches/linux/4.0/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
similarity index 100%
copy from patches/linux/3.16/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
copy to patches/linux/4.0/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
diff --git a/patches/linux/3.13/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch b/patches/linux/4.0/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
similarity index 100%
copy from patches/linux/3.13/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
copy to patches/linux/4.0/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
diff --git a/patches/linux/3.15/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch b/patches/linux/4.0/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
similarity index 100%
copy from patches/linux/3.15/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
copy to patches/linux/4.0/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
diff --git a/patches/linux/3.15/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch b/patches/linux/4.0/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
similarity index 100%
copy from patches/linux/3.15/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
copy to patches/linux/4.0/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
diff --git a/patches/linux/3.15/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch b/patches/linux/4.0/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
similarity index 100%
copy from patches/linux/3.15/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
copy to patches/linux/4.0/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
diff --git a/patches/linux/3.15/0504-armadeus-add_sx8674_touchscreen_driver.patch b/patches/linux/4.0/0504-armadeus-add_sx8674_touchscreen_driver.patch
similarity index 100%
copy from patches/linux/3.15/0504-armadeus-add_sx8674_touchscreen_driver.patch
copy to patches/linux/4.0/0504-armadeus-add_sx8674_touchscreen_driver.patch
diff --git a/patches/linux/3.15/0505-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/4.0/0505-armadeus-add_mcp7940x_rtc_driver.patch
similarity index 100%
copy from patches/linux/3.15/0505-armadeus-add_mcp7940x_rtc_driver.patch
copy to patches/linux/4.0/0505-armadeus-add_mcp7940x_rtc_driver.patch
diff --git a/patches/linux/4.0/0506-armadeus-change_mmc_numbering.patch b/patches/linux/4.0/0506-armadeus-change_mmc_numbering.patch
new file mode 100644
index 0000000..9068222
--- /dev/null
+++ b/patches/linux/4.0/0506-armadeus-change_mmc_numbering.patch
@@ -0,0 +1,21 @@
+Fix SD slot numbering.
+
+eMMC -> mmcblk2
+microSD -> mmcblk1
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
+---
+Index: linux-4.0-rc1/drivers/mmc/card/block.c
+===================================================================
+--- linux-4.0-rc1.orig/drivers/mmc/card/block.c
++++ linux-4.0-rc1/drivers/mmc/card/block.c
+@@ -2161,7 +2161,7 @@ static struct mmc_blk_data *mmc_blk_allo
+ */
+
+ snprintf(md->disk->disk_name, sizeof(md->disk->disk_name),
+- "mmcblk%u%s", md->name_idx, subname ? subname : "");
++ "mmcblk%u%s", card->host->index, subname ? subname : "");
+
+ if (mmc_card_mmc(card))
+ blk_queue_logical_block_size(md->queue.queue,
diff --git a/patches/linux/4.0/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch b/patches/linux/4.0/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
new file mode 100644
index 0000000..bc81f96
--- /dev/null
+++ b/patches/linux/4.0/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
@@ -0,0 +1,53 @@
+From 20008681bca50b680be33e390065e44fd28a8c23 Mon Sep 17 00:00:00 2001
+From: Steve Longerbeam <ste...@me...>
+Date: Tue, 1 Apr 2014 18:08:40 -0700
+Subject: [PATCH 1/2] drm_modes: videomode: add pos/neg pixel clock polarity
+ flag
+
+Signed-off-by: Steve Longerbeam <ste...@me...>
+---
+ drivers/gpu/drm/drm_modes.c | 4 ++++
+ include/uapi/drm/drm_mode.h | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+Index: linux-4.0-rc1/drivers/gpu/drm/drm_modes.c
+===================================================================
+--- linux-4.0-rc1.orig/drivers/gpu/drm/drm_modes.c
++++ linux-4.0-rc1/drivers/gpu/drm/drm_modes.c
+@@ -611,6 +611,10 @@ void drm_display_mode_from_videomode(con
+ dmode->flags |= DRM_MODE_FLAG_DBLSCAN;
+ if (vm->flags & DISPLAY_FLAGS_DOUBLECLK)
+ dmode->flags |= DRM_MODE_FLAG_DBLCLK;
++ if (vm->flags & DISPLAY_FLAGS_PIXDATA_POSEDGE)
++ dmode->flags |= DRM_MODE_FLAG_PCLK;
++ else if (vm->flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
++ dmode->flags |= DRM_MODE_FLAG_NCLK;
+ drm_mode_set_name(dmode);
+ }
+ EXPORT_SYMBOL_GPL(drm_display_mode_from_videomode);
+@@ -652,6 +656,10 @@ void drm_display_mode_to_videomode(const
+ vm->flags |= DISPLAY_FLAGS_DOUBLESCAN;
+ if (dmode->flags & DRM_MODE_FLAG_DBLCLK)
+ vm->flags |= DISPLAY_FLAGS_DOUBLECLK;
++ if (dmode->flags & DRM_MODE_FLAG_PCLK)
++ vm->flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE;
++ else if (dmode->flags & DRM_MODE_FLAG_NCLK)
++ vm->flags |= DISPLAY_FLAGS_PIXDATA_NEGEDGE;
+ }
+ EXPORT_SYMBOL_GPL(drm_display_mode_to_videomode);
+
+Index: linux-4.0-rc1/include/uapi/drm/drm_mode.h
+===================================================================
+--- linux-4.0-rc1.orig/include/uapi/drm/drm_mode.h
++++ linux-4.0-rc1/include/uapi/drm/drm_mode.h
+@@ -72,6 +72,10 @@
+ #define DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH (6<<14)
+ #define DRM_MODE_FLAG_3D_TOP_AND_BOTTOM (7<<14)
+ #define DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF (8<<14)
++/* drive data on rising pixclk edge */
++#define DRM_MODE_FLAG_PCLK (1<<19)
++/* drive data on falling pixclk edge */
++#define DRM_MODE_FLAG_NCLK (1<<20)
+
+
+ /* DPMS flags */
diff --git a/patches/linux/3.19/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch b/patches/linux/4.0/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
similarity index 58%
copy from patches/linux/3.19/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
copy to patches/linux/4.0/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
index 1ae79d4..59f26c1 100644
--- a/patches/linux/3.19/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
+++ b/patches/linux/4.0/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
@@ -14,19 +14,16 @@ Signed-off-by: Steve Longerbeam <ste...@me...>
drivers/gpu/drm/imx/ipuv3-crtc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-Index: linux-3.18-rc5/drivers/gpu/drm/imx/ipuv3-crtc.c
+Index: linux-4.0-rc1/drivers/gpu/drm/imx/ipuv3-crtc.c
===================================================================
---- linux-3.18-rc5.orig/drivers/gpu/drm/imx/ipuv3-crtc.c
-+++ linux-3.18-rc5/drivers/gpu/drm/imx/ipuv3-crtc.c
-@@ -159,9 +159,10 @@ static int ipu_crtc_mode_set(struct drm_
- sig_cfg.Hsync_pol = 1;
- if (mode->flags & DRM_MODE_FLAG_PVSYNC)
- sig_cfg.Vsync_pol = 1;
-+ if (mode->flags & DRM_MODE_FLAG_PCLK)
-+ sig_cfg.clk_pol = 1;
-
- sig_cfg.enable_pol = 1;
+--- linux-4.0-rc1.orig/drivers/gpu/drm/imx/ipuv3-crtc.c
++++ linux-4.0-rc1/drivers/gpu/drm/imx/ipuv3-crtc.c
+@@ -174,7 +174,7 @@ static int ipu_crtc_mode_set(struct drm_
+ out_pixel_fmt = ipu_crtc->interface_pix_fmt;
+
+ sig_cfg.enable_pol = 1;
- sig_cfg.clk_pol = 0;
- sig_cfg.width = mode->hdisplay;
- sig_cfg.height = mode->vdisplay;
- sig_cfg.pixel_fmt = out_pixel_fmt;
++ sig_cfg.clk_pol = (mode->flags & DRM_MODE_FLAG_PCLK) ? 1 : 0;
+ sig_cfg.pixel_fmt = out_pixel_fmt;
+ sig_cfg.v_to_h_sync = 0;
+ sig_cfg.hsync_pin = ipu_crtc->di_hsync_pin;
diff --git a/patches/linux/3.19/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch b/patches/linux/4.0/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
similarity index 100%
copy from patches/linux/3.19/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
copy to patches/linux/4.0/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
diff --git a/patches/linux/3.18/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch b/patches/linux/4.0/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch
similarity index 100%
copy from patches/linux/3.18/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch
copy to patches/linux/4.0/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch
diff --git a/patches/linux/3.18/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch b/patches/linux/4.0/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch
similarity index 100%
copy from patches/linux/3.18/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch
copy to patches/linux/4.0/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch
diff --git a/patches/linux/3.18/0603-gpu-ipu-v3-Add-ipu_get_num.patch b/patches/linux/4.0/0603-gpu-ipu-v3-Add-ipu_get_num.patch
similarity index 100%
copy from patches/linux/3.18/0603-gpu-ipu-v3-Add-ipu_get_num.patch
copy to patches/linux/4.0/0603-gpu-ipu-v3-Add-ipu_get_num.patch
diff --git a/patches/linux/3.18/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch b/patches/linux/4.0/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch
similarity index 100%
copy from patches/linux/3.18/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch
copy to patches/linux/4.0/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch
diff --git a/patches/linux/3.18/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch b/patches/linux/4.0/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch
similarity index 100%
copy from patches/linux/3.18/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch
copy to patches/linux/4.0/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch
diff --git a/patches/linux/3.18/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch b/patches/linux/4.0/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch
similarity index 100%
copy from patches/linux/3.18/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch
copy to patches/linux/4.0/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch
diff --git a/patches/linux/3.18/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch b/patches/linux/4.0/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch
similarity index 100%
copy from patches/linux/3.18/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch
copy to patches/linux/4.0/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch
diff --git a/patches/linux/3.18/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch b/patches/linux/4.0/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch
similarity index 100%
copy from patches/linux/3.18/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch
copy to patches/linux/4.0/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch
diff --git a/patches/linux/3.18/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch b/patches/linux/4.0/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch
similarity index 100%
copy from patches/linux/3.18/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch
copy to patches/linux/4.0/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch
diff --git a/patches/linux/3.18/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch b/patches/linux/4.0/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch
similarity index 100%
copy from patches/linux/3.18/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch
copy to patches/linux/4.0/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch
diff --git a/patches/linux/3.18/0611-ARM-imx6q-clk-Add-video-27m-clock.patch b/patches/linux/4.0/0611-ARM-imx6q-clk-Add-video-27m-clock.patch
similarity index 100%
copy from patches/linux/3.18/0611-ARM-imx6q-clk-Add-video-27m-clock.patch
copy to patches/linux/4.0/0611-ARM-imx6q-clk-Add-video-27m-clock.patch
diff --git a/patches/linux/3.18/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch b/patches/linux/4.0/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch
similarity index 100%
copy from patches/linux/3.18/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch
copy to patches/linux/4.0/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch
diff --git a/patches/linux/3.18/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch b/patches/linux/4.0/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch
similarity index 100%
copy from patches/linux/3.18/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch
copy to patches/linux/4.0/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch
diff --git a/patches/linux/3.18/0618-media-imx6-Add-device-tree-binding-documentation.patch b/patches/linux/4.0/0618-media-imx6-Add-device-tree-binding-documentation.patch
similarity index 100%
copy from patches/linux/3.18/0618-media-imx6-Add-device-tree-binding-documentation.patch
copy to patches/linux/4.0/0618-media-imx6-Add-device-tree-binding-documentation.patch
diff --git a/patches/linux/3.19/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch b/patches/linux/4.0/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
similarity index 97%
copy from patches/linux/3.19/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
copy to patches/linux/4.0/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
index c406b97..b9e36bd 100644
--- a/patches/linux/3.19/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
+++ b/patches/linux/4.0/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
@@ -37,10 +37,10 @@ Signed-off-by: Vladimir Zapolskiy <vla...@me...>
create mode 100644 drivers/staging/media/imx6/capture/mx6-preview.c
create mode 100644 include/media/imx6.h
-Index: linux-3.19-rc2/Documentation/video4linux/mx6_camera.txt
+Index: linux-4.0-rc1/Documentation/video4linux/mx6_camera.txt
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.19-rc2/Documentation/video4linux/mx6_camera.txt 2014-12-30 18:59:56.228655909 +0100
+--- /dev/null
++++ linux-4.0-rc1/Documentation/video4linux/mx6_camera.txt
@@ -0,0 +1,187 @@
+ i.MX6 Video Capture Driver
+ ==========================
@@ -229,23 +229,23 @@ Index: linux-3.19-rc2/Documentation/video4linux/mx6_camera.txt
+Vladimir Zapolskiy <vla...@me...>
+
+Copyright (C) 2012-2014 Mentor Graphics Inc.
-Index: linux-3.19-rc2/drivers/staging/media/Kconfig
+Index: linux-4.0-rc1/drivers/staging/media/Kconfig
===================================================================
---- linux-3.19-rc2.orig/drivers/staging/media/Kconfig 2014-12-30 18:59:56.232655909 +0100
-+++ linux-3.19-rc2/drivers/staging/media/Kconfig 2014-12-30 18:59:56.228655909 +0100
-@@ -27,6 +27,8 @@
+--- linux-4.0-rc1.orig/drivers/staging/media/Kconfig
++++ linux-4.0-rc1/drivers/staging/media/Kconfig
+@@ -27,6 +27,8 @@ source "drivers/staging/media/davinci_vp
source "drivers/staging/media/dt3155v4l/Kconfig"
+source "drivers/staging/media/imx6/Kconfig"
+
- source "drivers/staging/media/tlg2300/Kconfig"
-
source "drivers/staging/media/mn88472/Kconfig"
-Index: linux-3.19-rc2/drivers/staging/media/Makefile
+
+ source "drivers/staging/media/mn88473/Kconfig"
+Index: linux-4.0-rc1/drivers/staging/media/Makefile
===================================================================
---- linux-3.19-rc2.orig/drivers/staging/media/Makefile 2014-12-30 18:59:56.232655909 +0100
-+++ linux-3.19-rc2/drivers/staging/media/Makefile 2014-12-30 18:59:56.228655909 +0100
+--- linux-4.0-rc1.orig/drivers/staging/media/Makefile
++++ linux-4.0-rc1/drivers/staging/media/Makefile
@@ -1,5 +1,6 @@
obj-$(CONFIG_I2C_BCM2048) += bcm2048/
obj-$(CONFIG_DVB_CXD2099) += cxd2099/
@@ -253,10 +253,10 @@ Index: linux-3.19-rc2/drivers/staging/media/Makefile
obj-$(CONFIG_LIRC_STAGING) += lirc/
obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/
obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
-Index: linux-3.19-rc2/drivers/staging/media/imx6/Kconfig
+Index: linux-4.0-rc1/drivers/staging/media/imx6/Kconfig
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.19-rc2/drivers/staging/media/imx6/Kconfig 2014-12-30 18:59:56.228655909 +0100
+--- /dev/null
++++ linux-4.0-rc1/drivers/staging/media/imx6/Kconfig
@@ -0,0 +1,25 @@
+config VIDEO_IMX6
+ tristate "i.MX6 V4L2 devices"
@@ -283,16 +283,16 @@ Index: linux-3.19-rc2/drivers/staging/media/imx6/Kconfig
+if VIDEO_IMX6_CAMERA
+source "drivers/staging/media/imx6/capture/Kconfig"
+endif
-Index: linux-3.19-rc2/drivers/staging/media/imx6/Makefile
+Index: linux-4.0-rc1/drivers/staging/media/imx6/Makefile
=========================...
[truncated message content] |
|
From: Sébastien S. <ss...@us...> - 2015-02-24 09:56:29
|
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 065e5fa46fae5b23a9fcc8634a9f35eab6d2d80a (commit)
via f2aca930cff071aaf451f71e1d0f2567bd88522d (commit)
via 518dd8cf0da0e2154c2e2a3b6956426c33454dd2 (commit)
from d0ba2a1bca30510947a50b1ed4b2c7f7b846eb7c (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 065e5fa46fae5b23a9fcc8634a9f35eab6d2d80a
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Feb 24 11:00:28 2015 +0100
[BUILDROOT] 2015.02: move to 2015.02-rc3
commit f2aca930cff071aaf451f71e1d0f2567bd88522d
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Feb 24 10:56:42 2015 +0100
[U-BOOT] 2014.07: rework dtb handling
This makes possible to have custom dtb name.
commit 518dd8cf0da0e2154c2e2a3b6956426c33454dd2
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Feb 24 10:17:13 2015 +0100
[BUILDROOT] 2013.11: bump busybox to 1.23.1
To make easier BR 2013.11 -> BR 2015.02 transition.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 2 +-
buildroot/configs/apf27_webradio_defconfig | 2 +-
buildroot/configs/apf27mainline_defconfig | 2 +-
buildroot/configs/apf27test_defconfig | 2 +-
buildroot/configs/apf27xenomai_defconfig | 2 +-
buildroot/configs/apf27xenomaimainline_defconfig | 2 +-
buildroot/configs/apf28_defconfig | 2 +-
buildroot/configs/apf28mainline_defconfig | 2 +-
buildroot/configs/apf28test_defconfig | 2 +-
buildroot/configs/apf51_defconfig | 2 +-
buildroot/configs/apf51mainline_defconfig | 2 +-
buildroot/configs/apf51test_defconfig | 2 +-
buildroot/configs/apf6_defconfig | 2 +-
buildroot/configs/apf6legacy_defconfig | 2 +-
buildroot/configs/apf9328_defconfig | 2 +-
buildroot/configs/apf9328test_defconfig | 2 +-
buildroot/configs/apf9328xenomai_defconfig | 2 +-
buildroot/configs/pps51_defconfig | 2 +-
buildroot/configs/pps_defconfig | 2 +-
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 15 +-
.../target/device/armadeus/busybox-1.23.1.config | 1 +
.../{busybox-1.21.config => busybox-1.23.config} | 0
buildroot/target/device/armadeus/busybox.config | 2 +-
...22-buildroot-busybox-bump-to-version-1.23.patch | 1688 ++++++++++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 46 +-
patches/buildroot/{2015.02-rc2 => 2015.02-rc3} | 0
patches/u-boot/2014.07/503-add-apf6.patch | 4 +-
27 files changed, 1745 insertions(+), 49 deletions(-)
create mode 120000 buildroot/target/device/armadeus/busybox-1.23.1.config
copy buildroot/target/device/armadeus/{busybox-1.21.config => busybox-1.23.config} (100%)
create mode 100644 patches/buildroot/2013.11/222-buildroot-busybox-bump-to-version-1.23.patch
rename patches/buildroot/{2015.02-rc2 => 2015.02-rc3} (100%)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 5c512fa..b87824e 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -38,7 +38,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 0f16c96..1f6b6d8 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -38,7 +38,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_MAX5821CTRL=y
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 3f9f215..495e57d 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -41,7 +41,7 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index e3ab26b..c7b7b3c 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -38,7 +38,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_AS_DEVICES=y
BR2_PACKAGE_AS_DEVICES_TESTS=y
diff --git a/buildroot/configs/apf27xenomai_defconfig b/buildroot/configs/apf27xenomai_defconfig
index 3672723..701092a 100644
--- a/buildroot/configs/apf27xenomai_defconfig
+++ b/buildroot/configs/apf27xenomai_defconfig
@@ -40,7 +40,7 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-2.6.29-xenomai.config"
BR2_LINUX_KERNEL_EXT_XENOMAI=y
BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="ftp://ftp2.armadeus.com/armadeusw/adeos-ipipe-2.6.29-arm-1.13-05.patch"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
diff --git a/buildroot/configs/apf27xenomaimainline_defconfig b/buildroot/configs/apf27xenomaimainline_defconfig
index 19c7e3a..0121ab6 100644
--- a/buildroot/configs/apf27xenomaimainline_defconfig
+++ b/buildroot/configs/apf27xenomaimainline_defconfig
@@ -42,7 +42,7 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
BR2_LINUX_KERNEL_EXT_XENOMAI=y
BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="http://download.gna.org/adeos/patches/v3.x/arm/ipipe-core-3.14.17-arm-4.patch"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index c426250..c966b00 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -39,7 +39,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35.3"
BR2_LINUX_KERNEL_PATCH="ftp://ftp2.armadeus.com/armadeusw/linux-2.6.35.3-imx_10.12.01.patch.tar.gz ftp://ftp2.armadeus.com/armadeusw/patches_for_L2.6.35_MX28_SDK_10.12_SOURCE.tar.gz ftp://ftp2.armadeus.com/armadeusw/L2.6.35_10.12_EMI_FREQ_PATCH_UP.tar.gz ftp://ftp2.armadeus.com/armadeusw/MX28-FEC-PROBLEM-PATCH.tar.gz ftp://ftp2.armadeus.com/armadeusw/linux-2.6.35.3-imx_11.09.01.patch.tar.gz ../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_GDB=y
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index 177b113..86f0625 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -42,7 +42,7 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="40008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-apf28dev"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_HOST_IMX28_USB_DOWNLOADER=y
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_GDB=y
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index e898a31..d7ba973 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -39,7 +39,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35.3"
BR2_LINUX_KERNEL_PATCH="ftp://ftp2.armadeus.com/armadeusw/linux-2.6.35.3-imx_10.12.01.patch.tar.gz ftp://ftp2.armadeus.com/armadeusw/patches_for_L2.6.35_MX28_SDK_10.12_SOURCE.tar.gz ftp://ftp2.armadeus.com/armadeusw/L2.6.35_10.12_EMI_FREQ_PATCH_UP.tar.gz ftp://ftp2.armadeus.com/armadeusw/MX28-FEC-PROBLEM-PATCH.tar.gz ftp://ftp2.armadeus.com/armadeusw/linux-2.6.35.3-imx_11.09.01.patch.tar.gz ../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_AS_DEVICES=y
BR2_PACKAGE_AS_DEVICES_TESTS=y
BR2_PACKAGE_AS_DEVICES_CPP=y
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index cb684b0..a8de5e5 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -40,7 +40,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index 223901b..3e43ca1 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -34,7 +34,7 @@ BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf51"
BR2_CPU_NAME="imx51"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index a76ff8f..cb8cb46 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -40,7 +40,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_AS_DEVICES=y
BR2_PACKAGE_AS_DEVICES_TESTS=y
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 55dc02a..bded6b0 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -30,7 +30,7 @@ BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$
BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index 55bb54d..0709645 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -31,7 +31,7 @@ BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev imx6q-wandboard imx6dl-wandboard"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_ALSA_UTILS_AMIXER=y
BR2_PACKAGE_ALSA_UTILS_APLAY=y
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index 631aaf4..f01f70c 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -40,7 +40,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 1d458fc..c610061 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -40,7 +40,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_AS_DEVICES=y
BR2_PACKAGE_AS_DEVICES_TESTS=y
diff --git a/buildroot/configs/apf9328xenomai_defconfig b/buildroot/configs/apf9328xenomai_defconfig
index 9ab95bc..d97fd9d 100644
--- a/buildroot/configs/apf9328xenomai_defconfig
+++ b/buildroot/configs/apf9328xenomai_defconfig
@@ -41,7 +41,7 @@ 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_EXT_XENOMAI=y
BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="ftp://ftp2.armadeus.com/armadeusw/adeos-ipipe-2.6.29-arm-1.13-05.patch"
-BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index 38d23fe..dd4aadc 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -41,7 +41,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index ab02021..c8b08b0 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -38,7 +38,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
+BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_IMXREGS=y
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
index ed7629c..065d991 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
@@ -16,7 +16,7 @@
#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 5
+#define CONFIG_ENV_VERSION 6
#define CONFIG_BOARD_NAME apf6
/* SPL */
@@ -181,9 +181,10 @@
"env_version=" __stringify(CONFIG_ENV_VERSION) "\0" \
"consoledev=" __stringify(ACFG_CONSOLE_DEV) "\0" \
"board_name=" __stringify(CONFIG_BOARD_NAME) "\0" \
+ "fdt_addr=0x18000000\0" \
"fdt_high=0xffffffff\0" \
+ "fdt_name=" __stringify(CONFIG_BOARD_NAME) "dev\0" \
"initrd_high=0xffffffff\0" \
- "fdt_addr=0x18000000\0" \
"ip_dyn=yes\0" \
"stdin=serial\0" \
"stout=serial\0" \
@@ -232,9 +233,9 @@
"else echo Flashing of kernel failed; " \
"fi;\0" \
"update_kernel=run download_kernel flash_kernel\0" \
- "download_dtb=tftpboot ${loadaddr} ${fdt_file}\0" \
+ "download_dtb=tftpboot ${loadaddr} ${cpu_type}-${fdt_name}.dtb\0" \
"flash_dtb=" \
- "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /dtbs/${fdt_file} ${filesize}; then " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /dtbs/${cpu_type}-${fdt_name}.dtb ${filesize}; then " \
"echo Flashing of dtb succeed; " \
"else echo Flashing of dtb failed; " \
"fi;\0" \
@@ -250,9 +251,9 @@
"fi; " \
"fi;\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
- "update_all=run update_kernel update_rootfs update_dtb update_uboot\0" \
+ "update_all=run update_kernel update_rootfs update_dtb update_uboot\0" \
"loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${board_name}-linux.bin\0" \
- "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${fdt_file}\0" \
+ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${cpu_type}-${fdt_name}.dtb\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
"${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
"addmmcargs=setenv bootargs ${bootargs} root=${mmcroot} " \
@@ -265,7 +266,7 @@
"nfsboot=setenv bootargs console=${consoledev},${baudrate} ${extrabootargs}; " \
"run addnfsargs addipargs; " \
"nfs ${loadaddr} ${serverip}:${rootpath}/boot/${board_name}-linux.bin && " \
- "nfs ${fdt_addr} ${serverip}:${rootpath}/boot/dtbs/${fdt_file} && " \
+ "nfs ${fdt_addr} ${serverip}:${rootpath}/boot/dtbs/${cpu_type}-${fdt_name}.dtb && " \
"bootz ${loadaddr} - ${fdt_addr};\0"
/* Miscellaneous configurable options */
diff --git a/buildroot/target/device/armadeus/busybox-1.23.1.config b/buildroot/target/device/armadeus/busybox-1.23.1.config
new file mode 120000
index 0000000..ad3a616
--- /dev/null
+++ b/buildroot/target/device/armadeus/busybox-1.23.1.config
@@ -0,0 +1 @@
+busybox-1.23.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/busybox-1.21.config b/buildroot/target/device/armadeus/busybox-1.23.config
similarity index 100%
copy from buildroot/target/device/armadeus/busybox-1.21.config
copy to buildroot/target/device/armadeus/busybox-1.23.config
diff --git a/buildroot/target/device/armadeus/busybox.config b/buildroot/target/device/armadeus/busybox.config
index 02e61fc..a71f4cf 120000
--- a/buildroot/target/device/armadeus/busybox.config
+++ b/buildroot/target/device/armadeus/busybox.config
@@ -1 +1 @@
-busybox-1.21.config
\ No newline at end of file
+busybox-1.23.1.config
\ No newline at end of file
diff --git a/patches/buildroot/2013.11/222-buildroot-busybox-bump-to-version-1.23.patch b/patches/buildroot/2013.11/222-buildroot-busybox-bump-to-version-1.23.patch
new file mode 100644
index 0000000..f68918e
--- /dev/null
+++ b/patches/buildroot/2013.11/222-buildroot-busybox-bump-to-version-1.23.patch
@@ -0,0 +1,1688 @@
+Index: buildroot/package/busybox/Config.in
+===================================================================
+--- buildroot.orig/package/busybox/Config.in
++++ buildroot/package/busybox/Config.in
+@@ -13,7 +13,7 @@ if BR2_PACKAGE_BUSYBOX
+
+ choice
+ prompt "BusyBox Version"
+- default BR2_BUSYBOX_VERSION_1_21_X
++ default BR2_BUSYBOX_VERSION_1_23_X
+ help
+ Select the version of BusyBox you wish to use.
+
+@@ -26,6 +26,9 @@ choice
+ config BR2_BUSYBOX_VERSION_1_21_X
+ bool "BusyBox 1.21.x"
+
++ config BR2_BUSYBOX_VERSION_1_23_X
++ bool "BusyBox 1.23.x"
++
+ config BR2_PACKAGE_BUSYBOX_SNAPSHOT
+ bool "daily snapshot"
+
+@@ -37,6 +40,7 @@ config BR2_BUSYBOX_VERSION
+ default "1.19.4" if BR2_BUSYBOX_VERSION_1_19_X
+ default "1.20.2" if BR2_BUSYBOX_VERSION_1_20_X
+ default "1.21.1" if BR2_BUSYBOX_VERSION_1_21_X
++ default "1.23.1" if BR2_BUSYBOX_VERSION_1_23_X
+
+ config BR2_PACKAGE_BUSYBOX_CONFIG
+ string "BusyBox configuration file to use?"
+@@ -44,6 +48,7 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
+ default "package/busybox/busybox-1.19.x.config" if BR2_BUSYBOX_VERSION_1_19_X
+ default "package/busybox/busybox-1.20.x.config" if BR2_BUSYBOX_VERSION_1_20_X
+ default "package/busybox/busybox-1.21.x.config" if BR2_BUSYBOX_VERSION_1_21_X
++ default "package/busybox/busybox-1.23.x.config" if BR2_BUSYBOX_VERSION_1_23_X
+ help
+ Some people may wish to use their own modified BusyBox configuration
+ file, and will specify their config file location with this option.
+Index: buildroot/package/busybox/busybox-1.23.x.config
+===================================================================
+--- /dev/null
++++ buildroot/package/busybox/busybox-1.23.x.config
+@@ -0,0 +1,1054 @@
++#
++# Automatically generated make config: don't edit
++# Busybox version: 1.23.0
++# Sun Dec 28 21:14:57 2014
++#
++CONFIG_HAVE_DOT_CONFIG=y
++
++#
++# Busybox Settings
++#
++
++#
++# General Configuration
++#
++CONFIG_DESKTOP=y
++# CONFIG_EXTRA_COMPAT is not set
++CONFIG_INCLUDE_SUSv2=y
++# CONFIG_USE_PORTABLE_CODE is not set
++CONFIG_PLATFORM_LINUX=y
++CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
++# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
++# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
++CONFIG_SHOW_USAGE=y
++CONFIG_FEATURE_VERBOSE_USAGE=y
++# CONFIG_FEATURE_COMPRESS_USAGE is not set
++CONFIG_FEATURE_INSTALLER=y
++# CONFIG_INSTALL_NO_USR is not set
++# CONFIG_LOCALE_SUPPORT is not set
++# CONFIG_UNICODE_SUPPORT is not set
++# CONFIG_UNICODE_USING_LOCALE is not set
++# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
++CONFIG_SUBST_WCHAR=0
++CONFIG_LAST_SUPPORTED_WCHAR=0
++# CONFIG_UNICODE_COMBINING_WCHARS is not set
++# CONFIG_UNICODE_WIDE_WCHARS is not set
++# CONFIG_UNICODE_BIDI_SUPPORT is not set
++# CONFIG_UNICODE_NEUTRAL_TABLE is not set
++# CONFIG_UNICODE_PRESERVE_BROKEN is not set
++# CONFIG_PAM is not set
++CONFIG_FEATURE_USE_SENDFILE=y
++CONFIG_LONG_OPTS=y
++CONFIG_FEATURE_DEVPTS=y
++CONFIG_FEATURE_CLEAN_UP=y
++CONFIG_FEATURE_UTMP=y
++CONFIG_FEATURE_WTMP=y
++# CONFIG_FEATURE_PIDFILE is not set
++CONFIG_PID_FILE_PATH=""
++CONFIG_FEATURE_SUID=y
++# CONFIG_FEATURE_SUID_CONFIG is not set
++# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
++# CONFIG_SELINUX is not set
++# CONFIG_FEATURE_PREFER_APPLETS is not set
++CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
++CONFIG_FEATURE_SYSLOG=y
++# CONFIG_FEATURE_HAVE_RPC is not set
++
++#
++# Build Options
++#
++# CONFIG_STATIC is not set
++# CONFIG_PIE is not set
++# CONFIG_NOMMU is not set
++# CONFIG_BUILD_LIBBUSYBOX is not set
++# CONFIG_FEATURE_INDIVIDUAL is not set
++# CONFIG_FEATURE_SHARED_BUSYBOX is not set
++# CONFIG_LFS is not set
++CONFIG_CROSS_COMPILER_PREFIX=""
++CONFIG_SYSROOT=""
++CONFIG_EXTRA_CFLAGS=""
++CONFIG_EXTRA_LDFLAGS=""
++CONFIG_EXTRA_LDLIBS=""
++
++#
++# Debugging Options
++#
++# CONFIG_DEBUG is not set
++# CONFIG_DEBUG_PESSIMIZE is not set
++# CONFIG_UNIT_TEST is not set
++# CONFIG_WERROR is not set
++CONFIG_NO_DEBUG_LIB=y
++# CONFIG_DMALLOC is not set
++# CONFIG_EFENCE is not set
++
++#
++# Installation Options ("make install" behavior)
++#
++CONFIG_INSTALL_APPLET_SYMLINKS=y
++# CONFIG_INSTALL_APPLET_HARDLINKS is not set
++# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
++# CONFIG_INSTALL_APPLET_DONT is not set
++# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
++# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
++# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
++CONFIG_PREFIX="./_install"
++
++#
++# Busybox Library Tuning
++#
++# CONFIG_FEATURE_SYSTEMD is not set
++CONFIG_FEATURE_RTMINMAX=y
++CONFIG_PASSWORD_MINLEN=6
++CONFIG_MD5_SMALL=1
++CONFIG_SHA3_SMALL=1
++# CONFIG_FEATURE_FAST_TOP is not set
++# CONFIG_FEATURE_ETC_NETWORKS is not set
++CONFIG_FEATURE_USE_TERMIOS=y
++CONFIG_FEATURE_EDITING=y
++CONFIG_FEATURE_EDITING_MAX_LEN=1024
++CONFIG_FEATURE_EDITING_VI=y
++CONFIG_FEATURE_EDITING_HISTORY=999
++CONFIG_FEATURE_EDITING_SAVEHISTORY=y
++# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
++CONFIG_FEATURE_REVERSE_SEARCH=y
++CONFIG_FEATURE_TAB_COMPLETION=y
++# CONFIG_FEATURE_USERNAME_COMPLETION is not set
++CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
++# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
++CONFIG_FEATURE_NON_POSIX_CP=y
++# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
++CONFIG_FEATURE_COPYBUF_KB=4
++CONFIG_FEATURE_SKIP_ROOTFS=y
++CONFIG_MONOTONIC_SYSCALL=y
++CONFIG_IOCTL_HEX2STR_ERROR=y
++CONFIG_FEATURE_HWIB=y
++
++#
++# Applets
++#
++
++#
++# Archival Utilities
++#
++# CONFIG_FEATURE_SEAMLESS_XZ is not set
++# CONFIG_FEATURE_SEAMLESS_LZMA is not set
++# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
++# CONFIG_FEATURE_SEAMLESS_GZ is not set
++# CONFIG_FEATURE_SEAMLESS_Z is not set
++CONFIG_AR=y
++# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
++CONFIG_FEATURE_AR_CREATE=y
++# CONFIG_UNCOMPRESS is not set
++CONFIG_GUNZIP=y
++CONFIG_BUNZIP2=y
++CONFIG_UNLZMA=y
++# CONFIG_FEATURE_LZMA_FAST is not set
++CONFIG_LZMA=y
++CONFIG_UNXZ=y
++CONFIG_XZ=y
++# CONFIG_BZIP2 is not set
++CONFIG_CPIO=y
++# CONFIG_FEATURE_CPIO_O is not set
++# CONFIG_FEATURE_CPIO_P is not set
++# CONFIG_DPKG is not set
++# CONFIG_DPKG_DEB is not set
++# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
++CONFIG_GZIP=y
++# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
++CONFIG_GZIP_FAST=0
++# CONFIG_LZOP is not set
++# CONFIG_LZOP_COMPR_HIGH is not set
++# CONFIG_RPM2CPIO is not set
++# CONFIG_RPM is not set
++CONFIG_TAR=y
++CONFIG_FEATURE_TAR_CREATE=y
++# CONFIG_FEATURE_TAR_AUTODETECT is not set
++CONFIG_FEATURE_TAR_FROM=y
++# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
++# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
++CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
++CONFIG_FEATURE_TAR_LONG_OPTIONS=y
++CONFIG_FEATURE_TAR_TO_COMMAND=y
++# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
++# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
++# CONFIG_FEATURE_TAR_SELINUX is not set
++CONFIG_UNZIP=y
++
++#
++# Coreutils
++#
++CONFIG_BASENAME=y
++CONFIG_CAT=y
++CONFIG_DATE=y
++CONFIG_FEATURE_DATE_ISOFMT=y
++# CONFIG_FEATURE_DATE_NANO is not set
++CONFIG_FEATURE_DATE_COMPAT=y
++CONFIG_HOSTID=y
++CONFIG_ID=y
++# CONFIG_GROUPS is not set
++# CONFIG_SHUF is not set
++CONFIG_TEST=y
++CONFIG_FEATURE_TEST_64=y
++CONFIG_TOUCH=y
++# CONFIG_FEATURE_TOUCH_NODEREF is not set
++CONFIG_FEATURE_TOUCH_SUSV3=y
++CONFIG_TR=y
++CONFIG_FEATURE_TR_CLASSES=y
++CONFIG_FEATURE_TR_EQUIV=y
++CONFIG_UNLINK=y
++# CONFIG_BASE64 is not set
++CONFIG_WHO=y
++# CONFIG_USERS is not set
++# CONFIG_CAL is not set
++CONFIG_CATV=y
++CONFIG_CHGRP=y
++CONFIG_CHMOD=y
++CONFIG_CHOWN=y
++# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
++CONFIG_CHROOT=y
++CONFIG_CKSUM=y
++# CONFIG_COMM is not set
++CONFIG_CP=y
++# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
++CONFIG_CUT=y
++CONFIG_DD=y
++CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
++# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
++CONFIG_FEATURE_DD_IBS_OBS=y
++CONFIG_DF=y
++# CONFIG_FEATURE_DF_FANCY is not set
++CONFIG_DIRNAME=y
++CONFIG_DOS2UNIX=y
++CONFIG_UNIX2DOS=y
++CONFIG_DU=y
++CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
++CONFIG_ECHO=y
++CONFIG_FEATURE_FANCY_ECHO=y
++CONFIG_ENV=y
++# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
++# CONFIG_EXPAND is not set
++# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
++CONFIG_EXPR=y
++CONFIG_EXPR_MATH_SUPPORT_64=y
++CONFIG_FALSE=y
++CONFIG_FOLD=y
++# CONFIG_FSYNC is not set
++CONFIG_HEAD=y
++CONFIG_FEATURE_FANCY_HEAD=y
++CONFIG_INSTALL=y
++CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
++CONFIG_LN=y
++CONFIG_LOGNAME=y
++CONFIG_LS=y
++CONFIG_FEATURE_LS_FILETYPES=y
++CONFIG_FEATURE_LS_FOLLOWLINKS=y
++CONFIG_FEATURE_LS_RECURSIVE=y
++CONFIG_FEATURE_LS_SORTFILES=y
++CONFIG_FEATURE_LS_TIMESTAMPS=y
++CONFIG_FEATURE_LS_USERNAME=y
++CONFIG_FEATURE_LS_COLOR=y
++CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
++CONFIG_MD5SUM=y
++CONFIG_MKDIR=y
++CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
++CONFIG_MKFIFO=y
++CONFIG_MKNOD=y
++CONFIG_MV=y
++CONFIG_FEATURE_MV_LONG_OPTIONS=y
++CONFIG_NICE=y
++CONFIG_NOHUP=y
++CONFIG_OD=y
++CONFIG_PRINTENV=y
++CONFIG_PRINTF=y
++CONFIG_PWD=y
++CONFIG_READLINK=y
++CONFIG_FEATURE_READLINK_FOLLOW=y
++CONFIG_REALPATH=y
++CONFIG_RM=y
++CONFIG_RMDIR=y
++# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
++CONFIG_SEQ=y
++CONFIG_SHA1SUM=y
++CONFIG_SHA256SUM=y
++CONFIG_SHA512SUM=y
++CONFIG_SHA3SUM=y
++CONFIG_SLEEP=y
++# CONFIG_FEATURE_FANCY_SLEEP is not set
++# CONFIG_FEATURE_FLOAT_SLEEP is not set
++CONFIG_SORT=y
++CONFIG_FEATURE_SORT_BIG=y
++# CONFIG_SPLIT is not set
++# CONFIG_FEATURE_SPLIT_FANCY is not set
++# CONFIG_STAT is not set
++# CONFIG_FEATURE_STAT_FORMAT is not set
++CONFIG_STTY=y
++# CONFIG_SUM is not set
++CONFIG_SYNC=y
++# CONFIG_TAC is not set
++CONFIG_TAIL=y
++CONFIG_FEATURE_FANCY_TAIL=y
++CONFIG_TEE=y
++CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
++CONFIG_TRUE=y
++CONFIG_TTY=y
++CONFIG_UNAME=y
++# CONFIG_UNEXPAND is not set
++# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
++CONFIG_UNIQ=y
++CONFIG_USLEEP=y
++CONFIG_UUDECODE=y
++CONFIG_UUENCODE=y
++CONFIG_WC=y
++# CONFIG_FEATURE_WC_LARGE is not set
++CONFIG_WHOAMI=y
++CONFIG_YES=y
++
++#
++# Common options
++#
++CONFIG_FEATURE_VERBOSE=y
++
++#
++# Common options for cp and mv
++#
++CONFIG_FEATURE_PRESERVE_HARDLINKS=y
++
++#
++# Common options for ls, more and telnet
++#
++CONFIG_FEATURE_AUTOWIDTH=y
++
++#
++# Common options for df, du, ls
++#
++CONFIG_FEATURE_HUMAN_READABLE=y
++
++#
++# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
++#
++CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
++
++#
++# Console Utilities
++#
++CONFIG_CHVT=y
++# CONFIG_FGCONSOLE is not set
++CONFIG_CLEAR=y
++CONFIG_DEALLOCVT=y
++CONFIG_DUMPKMAP=y
++# CONFIG_KBD_MODE is not set
++CONFIG_LOADFONT=y
++CONFIG_LOADKMAP=y
++CONFIG_OPENVT=y
++CONFIG_RESET=y
++CONFIG_RESIZE=y
++CONFIG_FEATURE_RESIZE_PRINT=y
++CONFIG_SETCONSOLE=y
++# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
++# CONFIG_SETFONT is not set
++# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
++CONFIG_DEFAULT_SETFONT_DIR=""
++CONFIG_SETKEYCODES=y
++CONFIG_SETLOGCONS=y
++# CONFIG_SHOWKEY is not set
++
++#
++# Common options for loadfont and setfont
++#
++CONFIG_FEATURE_LOADFONT_PSF2=y
++CONFIG_FEATURE_LOADFONT_RAW=y
++
++#
++# Debian Utilities
++#
++CONFIG_MKTEMP=y
++CONFIG_PIPE_PROGRESS=y
++CONFIG_RUN_PARTS=y
++CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
++# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
++CONFIG_START_STOP_DAEMON=y
++CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
++CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
++CONFIG_WHICH=y
++
++#
++# Editors
++#
++CONFIG_AWK=y
++# CONFIG_FEATURE_AWK_LIBM is not set
++CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
++CONFIG_CMP=y
++CONFIG_DIFF=y
++# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
++CONFIG_FEATURE_DIFF_DIR=y
++# CONFIG_ED is not set
++CONFIG_PATCH=y
++CONFIG_SED=y
++CONFIG_VI=y
++CONFIG_FEATURE_VI_MAX_LEN=4096
++CONFIG_FEATURE_VI_8BIT=y
++CONFIG_FEATURE_VI_COLON=y
++CONFIG_FEATURE_VI_YANKMARK=y
++CONFIG_FEATURE_VI_SEARCH=y
++# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
++CONFIG_FEATURE_VI_USE_SIGNALS=y
++CONFIG_FEATURE_VI_DOT_CMD=y
++CONFIG_FEATURE_VI_READONLY=y
++CONFIG_FEATURE_VI_SETOPTS=y
++CONFIG_FEATURE_VI_SET=y
++CONFIG_FEATURE_VI_WIN_RESIZE=y
++CONFIG_FEATURE_VI_ASK_TERMINAL=y
++CONFIG_FEATURE_VI_UNDO=y
++CONFIG_FEATURE_VI_UNDO_QUEUE=y
++CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
++CONFIG_FEATURE_ALLOW_EXEC=y
++
++#
++# Finding Utilities
++#
++CONFIG_FIND=y
++CONFIG_FEATURE_FIND_PRINT0=y
++CONFIG_FEATURE_FIND_MTIME=y
++CONFIG_FEATURE_FIND_MMIN=y
++CONFIG_FEATURE_FIND_PERM=y
++CONFIG_FEATURE_FIND_TYPE=y
++CONFIG_FEATURE_FIND_XDEV=y
++CONFIG_FEATURE_FIND_MAXDEPTH=y
++CONFIG_FEATURE_FIND_NEWER=y
++# CONFIG_FEATURE_FIND_INUM is not set
++CONFIG_FEATURE_FIND_EXEC=y
++CONFIG_FEATURE_FIND_EXEC_PLUS=y
++CONFIG_FEATURE_FIND_USER=y
++CONFIG_FEATURE_FIND_GROUP=y
++CONFIG_FEATURE_FIND_NOT=y
++CONFIG_FEATURE_FIND_DEPTH=y
++CONFIG_FEATURE_FIND_PAREN=y
++CONFIG_FEATURE_FIND_SIZE=y
++CONFIG_FEATURE_FIND_PRUNE=y
++# CONFIG_FEATURE_FIND_DELETE is not set
++CONFIG_FEATURE_FIND_PATH=y
++CONFIG_FEATURE_FIND_REGEX=y
++# CONFIG_FEATURE_FIND_CONTEXT is not set
++# CONFIG_FEATURE_FIND_LINKS is not set
++CONFIG_GREP=y
++CONFIG_FEATURE_GREP_EGREP_ALIAS=y
++CONFIG_FEATURE_GREP_FGREP_ALIAS=y
++CONFIG_FEATURE_GREP_CONTEXT=y
++CONFIG_XARGS=y
++# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
++CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
++CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
++CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
++CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
++
++#
++# Init Utilities
++#
++# CONFIG_BOOTCHARTD is not set
++# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
++# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
++CONFIG_HALT=y
++# CONFIG_FEATURE_CALL_TELINIT is not set
++CONFIG_TELINIT_PATH=""
++CONFIG_INIT=y
++CONFIG_FEATURE_USE_INITTAB=y
++CONFIG_FEATURE_KILL_REMOVED=y
++CONFIG_FEATURE_KILL_DELAY=0
++CONFIG_FEATURE_INIT_SCTTY=y
++CONFIG_FEATURE_INIT_SYSLOG=y
++CONFIG_FEATURE_EXTRA_QUIET=y
++# CONFIG_FEATURE_INIT_COREDUMPS is not set
++CONFIG_FEATURE_INITRD=y
++CONFIG_INIT_TERMINAL_TYPE="linux"
++CONFIG_MESG=y
++CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
++
++#
++# Login/Password Management Utilities
++#
++# CONFIG_ADD_SHELL is not set
++# CONFIG_REMOVE_SHELL is not set
++CONFIG_FEATURE_SHADOWPASSWDS=y
++# CONFIG_USE_BB_PWD_GRP is not set
++# CONFIG_USE_BB_SHADOW is not set
++CONFIG_USE_BB_CRYPT=y
++# CONFIG_USE_BB_CRYPT_SHA is not set
++CONFIG_ADDUSER=y
++# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
++# CONFIG_FEATURE_CHECK_NAMES is not set
++CONFIG_LAST_ID=60000
++CONFIG_FIRST_SYSTEM_ID=100
++CONFIG_LAST_SYSTEM_ID=999
++CONFIG_ADDGROUP=y
++# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
++# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
++CONFIG_DELUSER=y
++CONFIG_DELGROUP=y
++# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
++CONFIG_GETTY=y
++CONFIG_LOGIN=y
++# CONFIG_LOGIN_SESSION_AS_CHILD is not set
++# CONFIG_LOGIN_SCRIPTS is not set
++CONFIG_FEATURE_NOLOGIN=y
++CONFIG_FEATURE_SECURETTY=y
++CONFIG_PASSWD=y
++CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
++# CONFIG_CRYPTPW is not set
++# CONFIG_CHPASSWD is not set
++CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des"
++CONFIG_SU=y
++CONFIG_FEATURE_SU_SYSLOG=y
++CONFIG_FEATURE_SU_CHECKS_SHELLS=y
++CONFIG_SULOGIN=y
++CONFIG_VLOCK=y
++
++#
++# Linux Ext2 FS Progs
++#
++CONFIG_CHATTR=y
++CONFIG_FSCK=y
++CONFIG_LSATTR=y
++# CONFIG_TUNE2FS is not set
++
++#
++# Linux Module Utilities
++#
++# CONFIG_MODINFO is not set
++# CONFIG_MODPROBE_SMALL is not set
++# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
++# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
++CONFIG_INSMOD=y
++CONFIG_RMMOD=y
++CONFIG_LSMOD=y
++CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
++CONFIG_MODPROBE=y
++# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
++# CONFIG_DEPMOD is not set
++
++#
++# Options common to multiple modutils
++#
++# CONFIG_FEATURE_2_4_MODULES is not set
++# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
++# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
++# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
++# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
++# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
++# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
++CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
++CONFIG_FEATURE_MODUTILS_ALIAS=y
++CONFIG_FEATURE_MODUTILS_SYMBOLS=y
++CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
++CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
++
++#
++# Linux System Utilities
++#
++# CONFIG_BLOCKDEV is not set
++# CONFIG_FATATTR is not set
++CONFIG_FSTRIM=y
++CONFIG_MDEV=y
++CONFIG_FEATURE_MDEV_CONF=y
++CONFIG_FEATURE_MDEV_RENAME=y
++# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
++CONFIG_FEATURE_MDEV_EXEC=y
++# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
++# CONFIG_REV is not set
++# CONFIG_ACPID is not set
++# CONFIG_FEATURE_ACPID_COMPAT is not set
++CONFIG_BLKID=y
++# CONFIG_FEATURE_BLKID_TYPE is not set
++CONFIG_DMESG=y
++CONFIG_FEATURE_DMESG_PRETTY=y
++CONFIG_FBSET=y
++CONFIG_FEATURE_FBSET_FANCY=y
++CONFIG_FEATURE_FBSET_READMODE=y
++CONFIG_FDFLUSH=y
++CONFIG_FDFORMAT=y
++CONFIG_FDISK=y
++CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
++CONFIG_FEATURE_FDISK_WRITABLE=y
++# CONFIG_FEATURE_AIX_LABEL is not set
++# CONFIG_FEATURE_SGI_LABEL is not set
++# CONFIG_FEATURE_SUN_LABEL is not set
++# CONFIG_FEATURE_OSF_LABEL is not set
++CONFIG_FEATURE_GPT_LABEL=y
++CONFIG_FEATURE_FDISK_ADVANCED=y
++# CONFIG_FINDFS is not set
++# CONFIG_FLOCK is not set
++CONFIG_FREERAMDISK=y
++# CONFIG_FSCK_MINIX is not set
++# CONFIG_MKFS_EXT2 is not set
++# CONFIG_MKFS_MINIX is not set
++# CONFIG_FEATURE_MINIX2 is not set
++# CONFIG_MKFS_REISER is not set
++# CONFIG_MKFS_VFAT is not set
++CONFIG_GETOPT=y
++CONFIG_FEATURE_GETOPT_LONG=y
++CONFIG_HEXDUMP=y
++# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
++# CONFIG_HD is not set
++CONFIG_HWCLOCK=y
++CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
++CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
++CONFIG_IPCRM=y
++CONFIG_IPCS=y
++CONFIG_LOSETUP=y
++CONFIG_LSPCI=y
++CONFIG_LSUSB=y
++CONFIG_MKSWAP=y
++# CONFIG_FEATURE_MKSWAP_UUID is not set
++CONFIG_MORE=y
++CONFIG_MOUNT=y
++# CONFIG_FEATURE_MOUNT_FAKE is not set
++# CONFIG_FEATURE_MOUNT_VERBOSE is not set
++# CONFIG_FEATURE_MOUNT_HELPERS is not set
++# CONFIG_FEATURE_MOUNT_LABEL is not set
++# CONFIG_FEATURE_MOUNT_NFS is not set
++CONFIG_FEATURE_MOUNT_CIFS=y
++CONFIG_FEATURE_MOUNT_FLAGS=y
++CONFIG_FEATURE_MOUNT_FSTAB=y
++CONFIG_PIVOT_ROOT=y
++CONFIG_RDATE=y
++# CONFIG_RDEV is not set
++CONFIG_READPROFILE=y
++# CONFIG_RTCWAKE is not set
++# CONFIG_SCRIPT is not set
++# CONFIG_SCRIPTREPLAY is not set
++CONFIG_SETARCH=y
++CONFIG_SWAPONOFF=y
++# CONFIG_FEATURE_SWAPON_DISCARD is not set
++# CONFIG_FEATURE_SWAPON_PRI is not set
++CONFIG_SWITCH_ROOT=y
++CONFIG_UMOUNT=y
++CONFIG_FEATURE_UMOUNT_ALL=y
++
++#
++# Common options for mount/umount
++#
++CONFIG_FEATURE_MOUNT_LOOP=y
++CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
++# CONFIG_FEATURE_MTAB_SUPPORT is not set
++CONFIG_VOLUMEID=y
++
++#
++# Filesystem/Volume identification
++#
++# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
++# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
++CONFIG_FEATURE_VOLUMEID_EXFAT=y
++CONFIG_FEATURE_VOLUMEID_EXT=y
++CONFIG_FEATURE_VOLUMEID_F2FS=y
++CONFIG_FEATURE_VOLUMEID_FAT=y
++# CONFIG_FEATURE_VOLUMEID_HFS is not set
++# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
++# CONFIG_FEATURE_VOLUMEID_JFS is not set
++# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
++# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
++# CONFIG_FEATURE_VOLUMEID_LUKS is not set
++# CONFIG_FEATURE_VOLUMEID_NILFS is not set
++# CONFIG_FEATURE_VOLUMEID_NTFS is not set
++# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
++# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
++# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
++# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
++# CONFIG_FEATURE_VOLUMEID_SYSV is not set
++# CONFIG_FEATURE_VOLUMEID_UDF is not set
++# CONFIG_FEATURE_VOLUMEID_XFS is not set
++
++#
++# Miscellaneous Utilities
++#
++# CONFIG_CONSPY is not set
++CONFIG_CROND=y
++# CONFIG_FEATURE_CROND_D is not set
++# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
++CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
++CONFIG_LESS=y
++CONFIG_FEATURE_LESS_MAXLINES=9999999
++CONFIG_FEATURE_LESS_BRACKETS=y
++CONFIG_FEATURE_LESS_FLAGS=y
++# CONFIG_FEATURE_LESS_MARKS is not set
++CONFIG_FEATURE_LESS_REGEXP=y
++# CONFIG_FEATURE_LESS_WINCH is not set
++# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
++# CONFIG_FEATURE_LESS_DASHCMD is not set
++# CONFIG_FEATURE_LESS_LINENUMS is not set
++# CONFIG_NANDWRITE is not set
++# CONFIG_NANDDUMP is not set
++# CONFIG_RFKILL is not set
++CONFIG_SETSERIAL=y
++# CONFIG_TASKSET is not set
++# CONFIG_FEATURE_TASKSET_FANCY is not set
++# CONFIG_UBIATTACH is not set
++# CONFIG_UBIDETACH is not set
++# CONFIG_UBIMKVOL is not set
++# CONFIG_UBIRMVOL is not set
++# CONFIG_UBIRSVOL is not set
++# CONFIG_UBIUPDATEVOL is not set
++# CONFIG_WALL is not set
++# CONFIG_ADJTIMEX is not set
++# CONFIG_BBCONFIG is not set
++# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
++# CONFIG_BEEP is not set
++CONFIG_FEATURE_BEEP_FREQ=0
++CONFIG_FEATURE_BEEP_LENGTH_MS=0
++# CONFIG_CHAT is not set
++# CONFIG_FEATURE_CHAT_NOFAIL is not set
++# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
++# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
++# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
++# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
++# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
++# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
++CONFIG_CHRT=y
++CONFIG_CRONTAB=y
++CONFIG_DC=y
++# CONFIG_FEATURE_DC_LIBM is not set
++# CONFIG_DEVFSD is not set
++# CONFIG_DEVFSD_MODLOAD is not set
++# CONFIG_DEVFSD_FG_NP is not set
++# CONFIG_DEVFSD_VERBOSE is not set
++# CONFIG_FEATURE_DEVFS is not set
++CONFIG_DEVMEM=y
++CONFIG_EJECT=y
++# CONFIG_FEATURE_EJECT_SCSI is not set
++# CONFIG_FBSPLASH is not set
++# CONFIG_FLASHCP is not set
++# CONFIG_FLASH_LOCK is not set
++# CONFIG_FLASH_UNLOCK is not set
++# CONFIG_FLASH_ERASEALL is not set
++# CONFIG_IONICE is not set
++# CONFIG_INOTIFYD is not set
++CONFIG_LAST=y
++CONFIG_FEATURE_LAST_SMALL=y
++# CONFIG_FEATURE_LAST_FANCY is not set
++CONFIG_HDPARM=y
++CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
++# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
++# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
++# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
++# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
++# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
++CONFIG_MAKEDEVS=y
++# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
++CONFIG_FEATURE_MAKEDEVS_TABLE=y
++# CONFIG_MAN is not set
++CONFIG_MICROCOM=y
++CONFIG_MOUNTPOINT=y
++CONFIG_MT=y
++# CONFIG_RAIDAUTORUN is not set
++# CONFIG_READAHEAD is not set
++CONFIG_RUNLEVEL=y
++# CONFIG_RX is not set
++CONFIG_SETSID=y
++CONFIG_STRINGS=y
++CONFIG_TIME=y
++# CONFIG_TIMEOUT is not set
++# CONFIG_TTYSIZE is not set
++# CONFIG_VOLNAME is not set
++CONFIG_WATCHDOG=y
++
++#
++# Networking Utilities
++#
++CONFIG_NAMEIF=y
++# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
++# CONFIG_NBDCLIENT is not set
++# CONFIG_NC is not set
++# CONFIG_NC_SERVER is not set
++# CONFIG_NC_EXTRA is not set
++# CONFIG_NC_110_COMPAT is not set
++CONFIG_PING=y
++# CONFIG_PING6 is not set
++CONFIG_FEATURE_FANCY_PING=y
++# CONFIG_WHOIS is not set
++# CONFIG_FEATURE_IPV6 is not set
++# CONFIG_FEATURE_UNIX_LOCAL is not set
++# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
++# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
++# CONFIG_ARP is not set
++CONFIG_ARPING=y
++# CONFIG_BRCTL is not set
++# CONFIG_FEATURE_BRCTL_FANCY is not set
++# CONFIG_FEATURE_BRCTL_SHOW is not set
++CONFIG_DNSD=y
++CONFIG_ETHER_WAKE=y
++# CONFIG_FAKEIDENTD is not set
++# CONFIG_FTPD is not set
++# CONFIG_FEATURE_FTP_WRITE is not set
++# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
++# CONFIG_FEATURE_FTP_AUTHENTICATION is not set
++# CONFIG_FTPGET is not set
++# CONFIG_FTPPUT is not set
++# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
++CONFIG_HOSTNAME=y
++# CONFIG_HTTPD is not set
++# CONFIG_FEATURE_HTTPD_RANGES is not set
++# CONFIG_FEATURE_HTTPD_SETUID is not set
++# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
++# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
++# CONFIG_FEATURE_HTTPD_CGI is not set
++# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
++# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
++# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
++# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
++# CONFIG_FEATURE_HTTPD_PROXY is not set
++# CONFIG_FEATURE_HTTPD_GZIP is not set
++CONFIG_IFCONFIG=y
++CONFIG_FEATURE_IFCONFIG_STATUS=y
++CONFIG_FEATURE_IFCONFIG_SLIP=y
++CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
++CONFIG_FEATURE_IFCONFIG_HW=y
++# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
++# CONFIG_IFENSLAVE is not set
++# CONFIG_IFPLUGD is not set
++CONFIG_IFUPDOWN=y
++CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
++CONFIG_FEATURE_IFUPDOWN_IP=y
++# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
++# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
++CONFIG_FEATURE_IFUPDOWN_IPV4=y
++# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
++CONFIG_FEATURE_IFUPDOWN_MAPPING=y
++# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
++CONFIG_INETD=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
++CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
++# CONFIG_FEATURE_INETD_RPC is not set
++CONFIG_IP=y
++CONFIG_FEATURE_IP_ADDRESS=y
++CONFIG_FEATURE_IP_LINK=y
++CONFIG_FEATURE_IP_ROUTE=y
++CONFIG_FEATURE_IP_TUNNEL=y
++CONFIG_FEATURE_IP_RULE=y
++CONFIG_FEATURE_IP_SHORT_FORMS=y
++# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
++CONFIG_IPADDR=y
++CONFIG_IPLINK=y
++CONFIG_IPROUTE=y
++CONFIG_IPTUNNEL=y
++CONFIG_IPRULE=y
++# CONFIG_IPCALC is not set
++# CONFIG_FEATURE_IPCALC_FANCY is not set
++# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
++CONFIG_NETSTAT=y
++# CONFIG_FEATURE_NETSTAT_WIDE is not set
++# CONFIG_FEATURE_NETSTAT_PRG is not set
++CONFIG_NSLOOKUP=y
++# CONFIG_NTPD is not set
++# CONFIG_FEATURE_NTPD_SERVER is not set
++# CONFIG_FEATURE_NTPD_CONF is not set
++# CONFIG_PSCAN is not set
++CONFIG_ROUTE=y
++# CONFIG_SLATTACH is not set
++# CONFIG_TCPSVD is not set
++CONFIG_TELNET=y
++CONFIG_FEATURE_TELNET_TTYPE=y
++CONFIG_FEATURE_TELNET_AUTOLOGIN=y
++# CONFIG_TELNETD is not set
++# CONFIG_FEATURE_TELNETD_STANDALONE is not set
++# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
++CONFIG_TFTP=y
++# CONFIG_TFTPD is not set
++
++#
++# Common options for tftp/tftpd
++#
++CONFIG_FEATURE_TFTP_GET=y
++CONFIG_FEATURE_TFTP_PUT=y
++CONFIG_FEATURE_TFTP_BLOCKSIZE=y
++# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
++# CONFIG_TFTP_DEBUG is not set
++CONFIG_TRACEROUTE=y
++# CONFIG_TRACEROUTE6 is not set
++# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
++# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
++# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
++# CONFIG_TUNCTL is not set
++# CONFIG_FEATURE_TUNCTL_UG is not set
++# CONFIG_UDHCPC6 is not set
++# CONFIG_UDHCPD is not set
++# CONFIG_DHCPRELAY is not set
++# CONFIG_DUMPLEASES is not set
++# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
++# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
++CONFIG_DHCPD_LEASES_FILE=""
++CONFIG_UDHCPC=y
++CONFIG_FEATURE_UDHCPC_ARPING=y
++CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
++# CONFIG_FEATURE_UDHCP_PORT is not set
++CONFIG_UDHCP_DEBUG=0
++# CONFIG_FEATURE_UDHCP_RFC3397 is not set
++CONFIG_FEATURE_UDHCP_8021Q=y
++CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
++CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
++CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
++# CONFIG_UDPSVD is not set
++CONFIG_VCONFIG=y
++CONFIG_WGET=y
++CONFIG_FEATURE_WGET_STATUSBAR=y
++CONFIG_FEATURE_WGET_AUTHENTICATION=y
++CONFIG_FEATURE_WGET_LONG_OPTIONS=y
++CONFIG_FEATURE_WGET_TIMEOUT=y
++# CONFIG_ZCIP is not set
++
++#
++# Print Utilities
++#
++# CONFIG_LPD is not set
++# CONFIG_LPR is not set
++# CONFIG_LPQ is not set
++
++#
++# Mail Utilities
++#
++# CONFIG_MAKEMIME is not set
++CONFIG_FEATURE_MIME_CHARSET=""
++# CONFIG_POPMAILDIR is not set
++# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
++# CONFIG_REFORMIME is not set
++# CONFIG_FEATURE_REFORMIME_COMPAT is not set
++# CONFIG_SENDMAIL is not set
++
++#
++# Process Utilities
++#
++# CONFIG_IOSTAT is not set
++CONFIG_LSOF=y
++# CONFIG_MPSTAT is not set
++# CONFIG_NMETER is not set
++# CONFIG_PMAP is not set
++# CONFIG_POWERTOP is not set
++# CONFIG_PSTREE is not set
++# CONFIG_PWDX is not set
++# CONFIG_SMEMCAP is not set
++CONFIG_TOP=y
++CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
++CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
++# CONFIG_FEATURE_TOP_SMP_CPU is not set
++# CONFIG_FEATURE_TOP_DECIMALS is not set
++# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
++# CONFIG_FEATURE_TOPMEM is not set
++CONFIG_UPTIME=y
++# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
++CONFIG_FREE=y
++CONFIG_FUSER=y
++CONFIG_KILL=y
++CONFIG_KILLALL=y
++CONFIG_KILLALL5=y
++# CONFIG_PGREP is not set
++CONFIG_PIDOF=y
++CONFIG_FEATURE_PIDOF_SINGLE=y
++CONFIG_FEATURE_PIDOF_OMIT=y
++# CONFIG_PKILL is not set
++CONFIG_PS=y
++# CONFIG_FEATURE_PS_WIDE is not set
++# CONFIG_FEATURE_PS_LONG is not set
++# CONFIG_FEATURE_PS_TIME is not set
++# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
++# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
++CONFIG_RENICE=y
++CONFIG_BB_SYSCTL=y
++# CONFIG_FEATURE_SHOW_THREADS is not set
++CONFIG_WATCH=y
++
++#
++# Runit Utilities
++#
++# CONFIG_RUNSV is not set
++# CONFIG_RUNSVDIR is not set
++# CONFIG_FEATURE_RUNSVDIR_LOG is not set
++# CONFIG_SV is not set
++CONFIG_SV_DEFAULT_SERVICE_DIR=""
++# CONFIG_SVLOGD is not set
++# CONFIG_CHPST is not set
++# CONFIG_SETUIDGID is not set
++# CONFIG_ENVUIDGID is not set
++# CONFIG_ENVDIR is not set
++# CONFIG_SOFTLIMIT is not set
++# CONFIG_CHCON is not set
++# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
++# CONFIG_GETENFORCE is not set
++# CONFIG_GETSEBOOL is not set
++# CONFIG_LOAD_POLICY is not set
++# CONFIG_MATCHPATHCON is not set
++# CONFIG_RESTORECON is not set
++# CONFIG_RUNCON is not set
++# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
++# CONFIG_SELINUXENABLED is not set
++# CONFIG_SETENFORCE is not set
++# CONFIG_SETFILES is not set
++# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
++# CONFIG_SETSEBOOL is not set
++# CONFIG_SESTATUS is not set
++
++#
++# Shells
++#
++CONFIG_ASH=y
++CONFIG_ASH_BASH_COMPAT=y
++CONFIG_ASH_IDLE_TIMEOUT=y
++CONFIG_ASH_JOB_CONTROL=y
++CONFIG_ASH_ALIAS=y
++CONFIG_ASH_GETOPTS=y
++CONFIG_ASH_BUILTIN_ECHO=y
++CONFIG_ASH_BUILTIN_PRINTF=y
++CONFIG_ASH_BUILTIN_TEST=y
++CONFIG_ASH_HELP=y
++CONFIG_ASH_CMDCMD=y
++# CONFIG_ASH_MAIL is not set
++CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
++CONFIG_ASH_RANDOM_SUPPORT=y
++CONFIG_ASH_EXPAND_PRMT=y
++# CONFIG_CTTYHACK is not set
++# CONFIG_HUSH is not set
++# CONFIG_HUSH_BASH_COMPAT is not set
++# CONFIG_HUSH_BRACE_EXPANSION is not set
++# CONFIG_HUSH_HELP is not set
++# CONFIG_HUSH_INTERACTIVE is not set
++# CONFIG_HUSH_SAVEHISTORY is not set
++# CONFIG_HUSH_JOB is not set
++# CONFIG_HUSH_TICK is not set
++# CONFIG_HUSH_IF is not set
++# CONFIG_HUSH_LOOPS is not set
++# CONFIG_HUSH_CASE is not set
++# CONFIG_HUSH_FUNCTIONS is not set
++# CONFIG_HUSH_LOCAL is not set
++# CONFIG_HUSH_RANDOM_SUPPORT is not set
++# CONFIG_HUSH_EXPORT_N is not set
++# CONFIG_HUSH_MODE_X is not set
++# CONFIG_MSH is not set
++CONFIG_FEATURE_SH_IS_ASH=y
++# CONFIG_FEATURE_SH_IS_HUSH is not set
++# CONFIG_FEATURE_SH_IS_NONE is not set
++# CONFIG_FEATURE_BASH_IS_ASH is not set
++# CONFIG_FEATURE_BASH_IS_HUSH is not set
++CONFIG_FEATURE_BASH_IS_NONE=y
++CONFIG_SH_MATH_SUPPORT=y
++# CONFIG_SH_MATH_SUPPORT_64 is not set
++CONFIG_FEATURE_SH_EXTRA_QUIET=y
++# CONFIG_FEATURE_SH_STANDALONE is not set
++# CONFIG_FEATURE_SH_NOFORK is not set
++# CONFIG_FEATURE_SH_HISTFILESIZE is not set
++
++#
++# System Logging Utilities
++#
++CONFIG_SYSLOGD=y
++CONFIG_FEATURE_ROTATE_LOGFILE=y
++CONFIG_FEATURE_REMOTE_LOG=y
++# CONFIG_FEATURE_SYSLOGD_DUP is not set
++# CONFIG_FEATURE_SYSLOGD_CFG is not set
++CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
++# CONFIG_FEATURE_IPC_SYSLOG is not set
++CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
++# CONFIG_LOGREAD is not set
++# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
++# CONFIG_FEATURE_KMSG_SYSLOG is not set
++CONFIG_KLOGD=y
++CONFIG_FEATURE_KLOGD_KLOGCTL=y
++CONFIG_LOGGER=y
+Index: buildroot/package/busybox/1.23.1/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/busybox/1.23.1/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch
+@@ -0,0 +1,29 @@
++From d4fec31889ad660a58dab633c511221feb66e817 Mon Sep 17 00:00:00 2001
++From: Thomas Petazzoni <tho...@fr...>
++Date: Sat, 5 Oct 2013 15:55:06 +0200
++Subject: [PATCH] networking/libiproute: use <linux/if_packet.h> instead of
++ <net/if_packet.h>
++
++The musl C library doesn't provide the <net/if_packet.h> since the
++corresponding kernel headers <linux/if_packet.h> already provides the
++necessary definitions. Replacing <net/if_packet.h> by
++<linux/if_packet.h> also removes the need to include
++<netpacket/packet.h>
++
++This commit fixes the build of iplink with the musl C library.
++
++Signed-off-by: Thomas Petazzoni <tho...@fr...>
++[Gustavo: update for busybox 1.22.0]
++
++diff -Nura busybox-1.22.0.orig/networking/libiproute/iplink.c busybox-1.22.0/networking/libiproute/iplink.c
++--- busybox-1.22.0.orig/networking/libiproute/iplink.c 2014-01-01 09:42:40.301137882 -0300
+++++ busybox-1.22.0/networking/libiproute/iplink.c 2014-01-01 09:43:01.282827700 -0300
++@@ -7,7 +7,7 @@
++ */
++ #include <net/if.h>
++ /*#include <net/if_packet.h> - not needed? */
++-#include <netpacket/packet.h>
+++#include <linux/if_packet.h>
++ #include <netinet/if_ether.h>
++
++ #include <linux/if_vlan.h>
+Index: buildroot/package/busybox/1.23.1/0002-modprobe-small.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/busybox/1.23.1/0002-modprobe-small.patch
+@@ -0,0 +1,171 @@
++Patch to fix busybox MODPROBE_SMALL from upstream:
++http://busybox.net/downloads/fixes-1.23.1/busybox-1.23.1-modprobe-small.patch
++
++Signed-off-by: Gustavo Zacarias <gu...@za...>
++
++--- busybox-1.23.1/modutils/modprobe-small.c
+++++ busybox-1.23.1-modprobe-small/modutils/modprobe-small.c
++@@ -552,9 +552,23 @@ static int already_loaded(const char *na
++ return ret;
++ }
++ #else
++-#define already_loaded(name) is_rmmod
+++#define already_loaded(name) 0
++ #endif
++
+++static int rmmod(const char *filename)
+++{
+++ int r;
+++ char modname[MODULE_NAME_LEN];
+++
+++ filename2modname(filename, modname);
+++ r = delete_module(modname, O_NONBLOCK | O_EXCL);
+++ dbg1_error_msg("delete_module('%s', O_NONBLOCK | O_EXCL):%d", modname, r);
+++ if (r != 0 && !(option_mask32 & OPT_q)) {
+++ bb_perror_msg("remove '%s'", modname);
+++ }
+++ return r;
+++}
+++
++ /*
++ * Given modules definition and module name (or alias, or symbol)
++ * load/remove the module respecting dependencies.
++@@ -571,26 +585,36 @@ static void process_module(char *name, c
++ module_info **infovec;
++ module_info *info;
++ int infoidx;
++- int is_rmmod = (option_mask32 & OPT_r) != 0;
+++ int is_remove = (option_mask32 & OPT_r) != 0;
++
++ dbg1_error_msg("process_module('%s','%s')", name, cmdline_options);
++
++ replace(name, '-', '_');
++
++- dbg1_error_msg("already_loaded:%d is_rmmod:%d", already_loaded(name), is_rmmod);
+++ dbg1_error_msg("already_loaded:%d is_remove:%d", already_loaded(name), is_remove);
+++
+++ if (applet_name[0] == 'r') {
+++ /* rmmod.
+++ * Does not remove dependencies, no need to scan, just remove.
+++ * (compat note: this allows and strips .ko suffix)
+++ */
+++ rmmod(name);
+++ return;
+++ }
+++
++ /*
++- * We used to have "is_rmmod != already_loaded(name)" check here, but
+++ * We used to have "is_remove != already_loaded(name)" check here, but
++ * modprobe -r pci:v00008086d00007010sv00000000sd00000000bc01sc01i80
++ * won't unload modules (there are more than one)
++ * which have this alias.
++ */
++- if (!is_rmmod && already_loaded(name)) {
+++ if (!is_remove && already_loaded(name)) {
++ dbg1_error_msg("nothing to do for '%s'", name);
++ return;
++ }
++
++ options = NULL;
++- if (!is_rmmod) {
+++ if (!is_remove) {
++ char *opt_filename = xasprintf("/etc/modules/%s", name);
++ options = xmalloc_open_read_close(opt_filename, NULL);
++ if (options)
++@@ -624,7 +648,7 @@ static void process_module(char *name, c
++ 0 /* depth */
++ );
++ dbg1_error_msg("dirscan complete");
++- /* Module was not found, or load failed, or is_rmmod */
+++ /* Module was not found, or load failed, or is_remove */
++ if (module_found_idx >= 0) { /* module was found */
++ infovec = xzalloc(2 * sizeof(infovec[0]));
++ infovec[0] = &modinfo[module_found_idx];
++@@ -637,7 +661,7 @@ static void process_module(char *name, c
++
++ if (!infovec) {
++ /* both dirscan and find_alias found nothing */
++- if (!is_rmmod && applet_name[0] != 'd') /* it wasn't rmmod or depmod */
+++ if (!is_remove && applet_name[0] != 'd') /* it wasn't rmmod or depmod */
++ bb_error_msg("module '%s' not found", name);
++ //TODO: _and_die()? or should we continue (un)loading modules listed on cmdline?
++ goto ret;
++@@ -651,29 +675,15 @@ static void process_module(char *name, c
++ * a *list* of modinfo pointers from find_alias().
++ */
++
++- /* rmmod or modprobe -r? unload module(s) */
++- if (is_rmmod) {
+++ /* modprobe -r? unload module(s) */
+++ if (is_remove) {
++ infoidx = 0;
++ while ((info = infovec[infoidx++]) != NULL) {
++- int r;
++- char modname[MODULE_NAME_LEN];
++-
++- filename2modname(
++- bb_get_last_path_component_nostrip(info->pathname), modname);
++- r = delete_module(modname, O_NONBLOCK | O_EXCL);
++- dbg1_error_msg("delete_module('%s', O_NONBLOCK | O_EXCL):%d", modname, r);
+++ int r = rmmod(bb_get_last_path_component_nostrip(info->pathname));
++ if (r != 0) {
++- if (!(opti...
[truncated message content] |
|
From: Sébastien S. <ss...@us...> - 2015-02-20 15:31: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 d0ba2a1bca30510947a50b1ed4b2c7f7b846eb7c (commit)
via faf91ec6ca32c82f818f772d05c1692dd1b28e71 (commit)
from b8a4621a225d44cbc94708c0c5e8a1b8be6f535b (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 d0ba2a1bca30510947a50b1ed4b2c7f7b846eb7c
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Feb 20 16:36:32 2015 +0100
[BUILDROOT] 2015.02: fix patch 221
commit faf91ec6ca32c82f818f772d05c1692dd1b28e71
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Feb 20 15:53:43 2015 +0100
[BUILDROOT] add lib and usr/lib dirs to rootfs skeleton.
Without these two dirs apf6 toolchain fails to build on BR 2015.02
-----------------------------------------------------------------------
Summary of changes:
.../{root/.bash_history => lib/.empty} | 0
.../{root/.bash_history => usr/lib/.empty} | 0
.../221-v2-3-3-imx-usb-loader-new-package.patch | 54 ++++++++++----------
3 files changed, 27 insertions(+), 27 deletions(-)
copy buildroot/target/device/armadeus/rootfs/target_skeleton/{root/.bash_history => lib/.empty} (100%)
copy buildroot/target/device/armadeus/rootfs/target_skeleton/{root/.bash_history => usr/lib/.empty} (100%)
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/root/.bash_history b/buildroot/target/device/armadeus/rootfs/target_skeleton/lib/.empty
similarity index 100%
copy from buildroot/target/device/armadeus/rootfs/target_skeleton/root/.bash_history
copy to buildroot/target/device/armadeus/rootfs/target_skeleton/lib/.empty
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/root/.bash_history b/buildroot/target/device/armadeus/rootfs/target_skeleton/usr/lib/.empty
similarity index 100%
copy from buildroot/target/device/armadeus/rootfs/target_skeleton/root/.bash_history
copy to buildroot/target/device/armadeus/rootfs/target_skeleton/usr/lib/.empty
diff --git a/patches/buildroot/2015.02/221-v2-3-3-imx-usb-loader-new-package.patch b/patches/buildroot/2015.02/221-v2-3-3-imx-usb-loader-new-package.patch
index 9bd56f4..b377d03 100644
--- a/patches/buildroot/2015.02/221-v2-3-3-imx-usb-loader-new-package.patch
+++ b/patches/buildroot/2015.02/221-v2-3-3-imx-usb-loader-new-package.patch
@@ -23,14 +23,14 @@ Index: buildroot/package/Config.in.host
===================================================================
--- buildroot.orig/package/Config.in.host
+++ buildroot/package/Config.in.host
-@@ -9,6 +9,7 @@ menu "Host utilities"
- source "package/genext2fs/Config.in.host"
- source "package/genimage/Config.in.host"
- source "package/genpart/Config.in.host"
+@@ -10,6 +10,7 @@ menu "Host utilities"
+ source "package/genext2fs/Config.in.host"
+ source "package/genimage/Config.in.host"
+ source "package/genpart/Config.in.host"
+ source "package/imx-usb-loader/Config.in.host"
- source "package/lpc3250loader/Config.in.host"
- source "package/mtd/Config.in.host"
- source "package/mtools/Config.in.host"
+ source "package/lpc3250loader/Config.in.host"
+ source "package/mke2img/Config.in.host"
+ source "package/mtd/Config.in.host"
Index: buildroot/package/imx-usb-loader/Config.in.host
===================================================================
--- /dev/null
@@ -132,14 +132,14 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in
+++ buildroot/package/Config.in
-@@ -344,6 +344,7 @@ endif
- source "package/hwdata/Config.in"
- source "package/i2c-tools/Config.in"
- source "package/imx-test/Config.in"
+@@ -347,6 +347,7 @@ endif
+ source "package/hwdata/Config.in"
+ source "package/i2c-tools/Config.in"
+ source "package/imx-test/Config.in"
+ source "package/imx-usb-loader/Config.in"
- source "package/input-event-daemon/Config.in"
- source "package/input-tools/Config.in"
- source "package/intel-microcode/Config.in"
+ source "package/input-event-daemon/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/intel-microcode/Config.in"
Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.patch
===================================================================
--- /dev/null
@@ -162,32 +162,32 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
+@@ -416,9 +415,9 @@ int main(int argc, char * const argv[])
+ char const *base_path = get_base_path(argv[0]);
+ char const *conf_path = "/etc/imx-loader.d/";
-+
++
+- err = parse_opts(argc, argv, &conf_path, &verify, &cmd_head);
+- if (err < 0)
+- return -1;
++ ret = parse_opts(argc, argv, &conf_path, &verify, &cmd_head);
++ if (ret < 0)
++ return ret;
-+
++
+ // Get list of machines...
+ conf = conf_file_name("imx_usb.conf", base_path, conf_path);
+@@ -429,20 +428,20 @@ int main(int argc, char * const argv[])
+ if (!list)
+ return -1;
-+
++
+- r = libusb_init(NULL);
+- if (r < 0)
++ ret = libusb_init(NULL);
++ if (ret != 0)
+ goto out;
-+
++
+- cnt = libusb_get_device_list(NULL, &devs);
+- if (cnt < 0)
++ ret = libusb_get_device_list(NULL, &devs);
++ if (ret < 0)
+ goto out;
-+
++
+ // print_devs(devs);
+ dev = find_imx_dev(devs, &mach, list);
+ if (dev) {
@@ -199,9 +199,9 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
++ printf("%s:Could not open device vid=0x%x pid=0x%x err=%d\n", __func__, mach->vid, mach->pid, ret);
+ }
+ libusb_free_device_list(devs, 1);
-+
++
+@@ -451,12 +450,16 @@ int main(int argc, char * const argv[])
-+
++
+ // Get machine specific configuration file..
+ conf = conf_file_name(mach->file_name, base_path, conf_path);
+- if (conf == NULL)
@@ -209,20 +209,20 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
++ ret = -1;
+ goto out;
++ }
-+
++
+ p_id = parse_conf(conf);
+- if (!p_id)
++ if (!p_id) {
++ ret = -1;
+ goto out;
++ }
-+
++
+ if (p_id->mode == MODE_HID)
+ p_id->transfer = &transfer_hid;
+@@ -473,14 +476,14 @@ int main(int argc, char * const argv[])
+ if (libusb_kernel_driver_active(h, 0))
+ libusb_detach_kernel_driver(h, 0);
-+
++
+- err = libusb_claim_interface(h, 0);
+- if (err) {
++ ret = libusb_claim_interface(h, 0);
@@ -239,13 +239,13 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
+ goto out;
+ }
+@@ -493,6 +496,7 @@ int main(int argc, char * const argv[])
-+
++
+ if (curr == NULL) {
-+ printf("no job found\n");
++ printf("no job found\n");
++ ret = -1;
+ goto out;
+ }
-+
++
+@@ -501,17 +505,17 @@ int main(int argc, char * const argv[])
+ perform_mem_work(p_id, curr->mem);
+ // printf("jump_mode %x\n", curr->jump_mode);
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2015-02-19 16:16:48
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b8a4621a225d44cbc94708c0c5e8a1b8be6f535b (commit)
via 1cfbdf5f25d8fd972947327c78add9aab2b3c04d (commit)
via a416a04ccc56df524b4436158bd0aad220267c53 (commit)
from dffc5c7fdd62e1412cadfb6060beb7b595047340 (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 b8a4621a225d44cbc94708c0c5e8a1b8be6f535b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 19 17:16:00 2015 +0100
[U-BOOT] apf6: 2014.07 & 2015.01: add USB keyboard support (not all keyboards seem supported git status)
commit 1cfbdf5f25d8fd972947327c78add9aab2b3c04d
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 19 12:09:54 2015 +0100
[BUILD] improve Makefile.in to get ARMADEUS_BUSYBOX_VERSION with every BR version
commit a416a04ccc56df524b4436158bd0aad220267c53
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 18 16:04:02 2015 +0100
[BUILDROOT] 2013.11: Make fw_printenv command work on APF6
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 10 ++-
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 1 +
.../device/armadeus/apf6/apf6-u-boot-2015.01.h | 1 +
.../rootfs/target_skeleton/etc/fw_env_apf6.config | 7 ++
...2013.10-to-fix-bug-in-fw_printenv-on-apf6.patch | 85 ++++++++++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 1 +
6 files changed, 101 insertions(+), 4 deletions(-)
create mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/etc/fw_env_apf6.config
create mode 100644 patches/buildroot/2013.11/019-armadeus-uboot-tools-use-a-2014.07-patch-on-2013.10-to-fix-bug-in-fw_printenv-on-apf6.patch
diff --git a/Makefile.in b/Makefile.in
index 061fab9..56389b6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,11 +42,13 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
ARMADEUS_LIBC_NAME=glibc
endif
-# Comment the following line with BR 2015.02
+ifneq ($(BR2_BUSYBOX_VERSION),)
+# pre 2014.11 BR
ARMADEUS_BUSYBOX_VERSION:=$(shell echo $(BR2_BUSYBOX_VERSION))
-
-# Uncomment the following line with BR 2015.02
-#ARMADEUS_BUSYBOX_VERSION:=$(shell egrep "BUSYBOX_VERSION =" $(BUILDROOT_DIR)/package/busybox/busybox.mk 2>/dev/null | cut -d ' ' -f 3)
+else
+# post 2014.11 BR
+ARMADEUS_BUSYBOX_VERSION:=$(shell egrep "BUSYBOX_VERSION =" $(BUILDROOT_DIR)/package/busybox/busybox.mk 2>/dev/null | cut -d ' ' -f 3)
+endif
ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
ARMADEUS_U_BOOT_BOARD_NAME:=$(shell echo $(BR2_TARGET_UBOOT_BOARDNAME))
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
index 4d0aabc..ed7629c 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
@@ -133,6 +133,7 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
+#define CONFIG_USB_KEYBOARD
/* Gadget part */
#define CONFIG_CI_UDC
#define CONFIG_USB_GADGET
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
index 4d0aabc..ed7629c 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
@@ -133,6 +133,7 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
+#define CONFIG_USB_KEYBOARD
/* Gadget part */
#define CONFIG_CI_UDC
#define CONFIG_USB_GADGET
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/fw_env_apf6.config b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/fw_env_apf6.config
new file mode 100644
index 0000000..57bc4ec
--- /dev/null
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/fw_env_apf6.config
@@ -0,0 +1,7 @@
+# Configuration file for fw_(printenv/saveenv) utility on >>> APF6 <<<.
+# Up to two entries are valid, in this case the redundant environment sector is
+# assumed present.
+
+# Block device name Device offset Env. size
+/dev/mmcblk2boot0 0x100000 0x2800
+/dev/mmcblk2boot0 0x180000 0x2800
diff --git a/patches/buildroot/2013.11/019-armadeus-uboot-tools-use-a-2014.07-patch-on-2013.10-to-fix-bug-in-fw_printenv-on-apf6.patch b/patches/buildroot/2013.11/019-armadeus-uboot-tools-use-a-2014.07-patch-on-2013.10-to-fix-bug-in-fw_printenv-on-apf6.patch
new file mode 100644
index 0000000..be17875
--- /dev/null
+++ b/patches/buildroot/2013.11/019-armadeus-uboot-tools-use-a-2014.07-patch-on-2013.10-to-fix-bug-in-fw_printenv-on-apf6.patch
@@ -0,0 +1,85 @@
+Allow /dev/mmcblk2boot0 usage in /etc/fw_env.config
+
+Integrated since uboot-tools 2014.07.
+
+Index: buildroot/package/uboot-tools/uboot-tools-2013.10-fw_env-switch-get-config-to-use-ms-in-sscanf.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/uboot-tools/uboot-tools-2013.10-fw_env-switch-get-config-to-use-ms-in-sscanf.patch 2015-01-29 12:28:55.676698363 +0100
+@@ -0,0 +1,76 @@
++From: Tom Rini <tr...@ti...>
++Date: Fri, 28 Mar 2014 16:03:33 +0000 (-0400)
++Subject: fw_env.c: Switch get_config to use '%ms' in sscanf
++X-Git-Tag: v2014.07-rc1~2^2~3^2~42
++X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=229695fee97abc7f4adad92eb8e036792c144bc6
++
++fw_env.c: Switch get_config to use '%ms' in sscanf
++
++We currently limit ourself to 16 characters for the device name to read
++the environment from. This is insufficient for /dev/mmcblk0boot1 to
++work for example. Switch to '%ms' which gives us a dynamically
++allocated buffer instead. We're short lived enough to not bother
++free()ing the buffer.
++
++Signed-off-by: Tom Rini <tr...@ti...>
++---
++
++diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
++index d228cc3..f5cd521 100644
++--- a/tools/env/fw_env.c
+++++ b/tools/env/fw_env.c
++@@ -40,7 +40,7 @@
++ _min1 < _min2 ? _min1 : _min2; })
++
++ struct envdev_s {
++- char devname[16]; /* Device name */
+++ const char *devname; /* Device name */
++ ulong devoff; /* Device offset */
++ ulong env_size; /* environment size */
++ ulong erase_size; /* device erase size */
++@@ -1243,7 +1243,7 @@ static int parse_config ()
++ return -1;
++ }
++ #else
++- strcpy (DEVNAME (0), DEVICE1_NAME);
+++ DEVNAME (0) = DEVICE1_NAME;
++ DEVOFFSET (0) = DEVICE1_OFFSET;
++ ENVSIZE (0) = ENV1_SIZE;
++ /* Default values are: erase-size=env-size */
++@@ -1258,7 +1258,7 @@ static int parse_config ()
++ #endif
++
++ #ifdef HAVE_REDUND
++- strcpy (DEVNAME (1), DEVICE2_NAME);
+++ DEVNAME (1) = DEVICE2_NAME;
++ DEVOFFSET (1) = DEVICE2_OFFSET;
++ ENVSIZE (1) = ENV2_SIZE;
++ /* Default values are: erase-size=env-size */
++@@ -1297,6 +1297,7 @@ static int get_config (char *fname)
++ int i = 0;
++ int rc;
++ char dump[128];
+++ char *devname;
++
++ fp = fopen (fname, "r");
++ if (fp == NULL)
++@@ -1307,8 +1308,8 @@ static int get_config (char *fname)
++ if (dump[0] == '#')
++ continue;
++
++- rc = sscanf (dump, "%s %lx %lx %lx %lx",
++- DEVNAME (i),
+++ rc = sscanf (dump, "%ms %lx %lx %lx %lx",
+++ &devname,
++ &DEVOFFSET (i),
++ &ENVSIZE (i),
++ &DEVESIZE (i),
++@@ -1317,6 +1318,8 @@ static int get_config (char *fname)
++ if (rc < 3)
++ continue;
++
+++ DEVNAME(i) = devname;
+++
++ if (rc < 4)
++ /* Assume the erase size is the same as the env-size */
++ DEVESIZE(i) = ENVSIZE(i);
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index f8ada55..20d3bd1 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -168,6 +168,7 @@ rm -rf buildroot/package/snes9x/snes9x.mk
rm -rf buildroot/package/tk/Config.in
rm -rf buildroot/package/tk/tk.mk
rm -rf buildroot/package/uboot-tools/2013.01/uboot-tools-2013.01-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
+rm -rf buildroot/package/uboot-tools/uboot-tools-2013.10-fw_env-switch-get-config-to-use-ms-in-sscanf.patch
rm -rf buildroot/package/uboot-tools/uboot-tools-2013.10-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0055-accept4-declaration-fix.patch
rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0056-assume-accept4-in-recent-arm-kernels.patch
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2015-02-19 11:23:41
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via dffc5c7fdd62e1412cadfb6060beb7b595047340 (commit)
from d8d223316c87e9b195bae8f4c448f0c4cbed497e (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 dffc5c7fdd62e1412cadfb6060beb7b595047340
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 19 12:28:36 2015 +0100
[BUILDROOT] 2015.02: fix patches 017 and 018
-----------------------------------------------------------------------
Summary of changes:
.../2015.02/017-armadeus-add-rxtx-package.patch | 36 ++++++++++----------
.../018-armadeus-add-pcidebug-package.patch | 28 ++++++++--------
patches/buildroot/2015.02/cleanup_buildroot.sh | 3 +-
3 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/patches/buildroot/2015.02/017-armadeus-add-rxtx-package.patch b/patches/buildroot/2015.02/017-armadeus-add-rxtx-package.patch
index 06c7e0e..15a74b3 100644
--- a/patches/buildroot/2015.02/017-armadeus-add-rxtx-package.patch
+++ b/patches/buildroot/2015.02/017-armadeus-add-rxtx-package.patch
@@ -1,19 +1,19 @@
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2015-02-17 22:28:58.031607275 +0100
-+++ buildroot/package/Config.in 2015-02-18 08:48:22.331606200 +0100
-@@ -349,6 +349,7 @@
- source "package/read-edid/Config.in"
- source "package/rng-tools/Config.in"
- source "package/rpi-userland/Config.in"
-+source "package/rxtx/Config.in"
- source "package/sane-backends/Config.in"
- source "package/sam7-pgm-ng/Config.in"
- source "package/sdparm/Config.in"
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -369,6 +369,7 @@ endif
+ source "package/read-edid/Config.in"
+ source "package/rng-tools/Config.in"
+ source "package/rpi-userland/Config.in"
++ source "package/rxtx/Config.in"
+ source "package/sane-backends/Config.in"
+ source "package/sam7-pgm-ng/Config.in"
+ source "package/sdparm/Config.in"
Index: buildroot/package/rxtx/Config.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/rxtx/Config.in 2015-02-18 09:06:45.577077357 +0100
+--- /dev/null
++++ buildroot/package/rxtx/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_RXTX
+ bool "rxtx"
@@ -29,8 +29,8 @@ Index: buildroot/package/rxtx/Config.in
+ depends on !BR2_PACKAGE_RXTX
Index: buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch 2015-02-18 08:49:35.103967048 +0100
+--- /dev/null
++++ buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
@@ -0,0 +1,90 @@
+--- rxtx-2.1-7r2/src/I2CImp.c.orig 2004-10-17 16:23:02.000000000 +0200
++++ rxtx-2.1-7r2/src/I2CImp.c 2006-10-26 21:25:32.000000000 +0200
@@ -124,8 +124,8 @@ Index: buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
+ #endif /* WIN32 */
Index: buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch 2015-02-18 08:49:35.103967048 +0100
+--- /dev/null
++++ buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
@@ -0,0 +1,38 @@
+--- rxtx-2.1-7r2/configure.ori 2006-01-30 05:37:40.000000000 +0100
++++ rxtx-2.1-7r2/configure 2011-02-27 00:15:04.000000000 +0100
@@ -167,8 +167,8 @@ Index: buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
+ 1.1*)
Index: buildroot/package/rxtx/rxtx.mk
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/rxtx/rxtx.mk 2015-02-18 08:59:46.274997681 +0100
+--- /dev/null
++++ buildroot/package/rxtx/rxtx.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
diff --git a/patches/buildroot/2015.02/018-armadeus-add-pcidebug-package.patch b/patches/buildroot/2015.02/018-armadeus-add-pcidebug-package.patch
index 88e1ef2..8a8b11e 100644
--- a/patches/buildroot/2015.02/018-armadeus-add-pcidebug-package.patch
+++ b/patches/buildroot/2015.02/018-armadeus-add-pcidebug-package.patch
@@ -1,19 +1,19 @@
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2015-02-18 09:14:28.467372230 +0100
-+++ buildroot/package/Config.in 2015-02-18 09:36:09.873825541 +0100
-@@ -344,6 +344,7 @@
- source "package/owfs/Config.in"
- source "package/owl-linux/Config.in"
- source "package/parted/Config.in"
-+source "package/pci_debug/Config.in"
- source "package/pciutils/Config.in"
- source "package/picocom/Config.in"
- source "package/read-edid/Config.in"
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -362,6 +362,7 @@ endif
+ source "package/owfs/Config.in"
+ source "package/owl-linux/Config.in"
+ source "package/parted/Config.in"
++ source "package/pci_debug/Config.in"
+ source "package/pciutils/Config.in"
+ source "package/picocom/Config.in"
+ source "package/pifmrds/Config.in"
Index: buildroot/package/pci_debug/Config.in
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pci_debug/Config.in 2015-02-18 09:43:45.860087739 +0100
+--- /dev/null
++++ buildroot/package/pci_debug/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_PCI_DEBUG
+ bool "pcidebug"
@@ -31,8 +31,8 @@ Index: buildroot/package/pci_debug/Config.in
+ http://www.ovro.caltech.edu/%7Edwh/correlator/pdf/altera_pcie.zip
Index: buildroot/package/pci_debug/pci_debug.mk
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pci_debug/pci_debug.mk 2015-02-18 10:01:50.657466829 +0100
+--- /dev/null
++++ buildroot/package/pci_debug/pci_debug.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
diff --git a/patches/buildroot/2015.02/cleanup_buildroot.sh b/patches/buildroot/2015.02/cleanup_buildroot.sh
index 93c8826..cab2e20 100755
--- a/patches/buildroot/2015.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2015.02/cleanup_buildroot.sh
@@ -4,7 +4,8 @@
# #
# Removes files added or modified through patches. #
# #
-# This file has been automatically generated. #
+# This file has been automatically generated by: #
+# scripts/quiltify.sh export #
# #
####################################################
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2015-02-18 12:43:42
|
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 d8d223316c87e9b195bae8f4c448f0c4cbed497e (commit)
via 4a1fa651f2717415c08f18a339ce7d2b8ee872ce (commit)
via 4650238be2f2a393c177fa1fd0196a2a55b820b6 (commit)
via 1f45f63d631f3397dace09e11a7742a5c46c3574 (commit)
via c317c9edd5e298eae776fcc3f8c23a9d14082bc4 (commit)
via b7a4529b53956fd64d0f4e0105c445ad5ffc500c (commit)
via e2c8b3372a472ad53d9e138f334ae6ce998d5916 (commit)
via 8731d5a4eef26338e00f93d36a28c8024877183a (commit)
via 95a1767f58fdc1361bd4da4458e5388222868ea2 (commit)
from 284dabfa6fd4e4f98346b78a4f8b0ef15f163e90 (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 d8d223316c87e9b195bae8f4c448f0c4cbed497e
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 18 13:43:11 2015 +0100
[FIRMWARE] Rename top_wishbone_example51_lx9.bin to top_wishbone_example_apf51_lx9.bin, to ease firmware non-installation on non-APF51 boards
commit 4a1fa651f2717415c08f18a339ce7d2b8ee872ce
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 18 12:46:43 2015 +0100
[BUILDROOT] Updates armadeus testsuite package definition to BR's state of the art
commit 4650238be2f2a393c177fa1fd0196a2a55b820b6
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 18 12:08:49 2015 +0100
[BUILDROOT] Updates imxssi armadeus package definition to BR's state of the art
commit 1f45f63d631f3397dace09e11a7742a5c46c3574
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 18 11:34:15 2015 +0100
[BUILDROOT] Updates max5821ctrl package definition to BR's state of the art
commit c317c9edd5e298eae776fcc3f8c23a9d14082bc4
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 18 11:25:47 2015 +0100
[BUILDROOT] Updates ch7024ctrl package definition to BR's state of the art
commit b7a4529b53956fd64d0f4e0105c445ad5ffc500c
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 18 11:11:00 2015 +0100
[BUILDROOT] Updates ad9889ctrl package definition to BR's state of the art
commit e2c8b3372a472ad53d9e138f334ae6ce998d5916
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 18 11:00:41 2015 +0100
[BUILDROOT] Updates tfp410ctrl package definition to BR's state of the art
commit 8731d5a4eef26338e00f93d36a28c8024877183a
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 18 10:11:01 2015 +0100
[BUILDROOT] Transform pci_debug armadeus specific package into BR patch
commit 95a1767f58fdc1361bd4da4458e5388222868ea2
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 18 09:17:54 2015 +0100
[BUILDROOT] Transform rxtx armadeus specific package into BR patch
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/Config.in | 2 -
buildroot/package/armadeus/ad9889ctrl/Config.in | 4 +-
buildroot/package/armadeus/ad9889ctrl/ad9889.mk | 50 +-
.../package/armadeus/ch7024ctrl/ch70241ctrl.mk | 57 +-
buildroot/package/armadeus/imxssi/imxssi.mk | 67 +--
buildroot/package/armadeus/max5821ctrl/Config.in | 3 +-
.../package/armadeus/max5821ctrl/max5821ctrl.mk | 51 +-
buildroot/package/armadeus/pci_debug/Config.in | 9 -
buildroot/package/armadeus/pci_debug/pci_debug.mk | 23 -
buildroot/package/armadeus/rxtx/Config.in | 12 -
.../rxtx/rxtx-2.1-7r2-001-remove-warning.patch | 90 ---
.../armadeus/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch | 38 -
buildroot/package/armadeus/rxtx/rxtx.mk | 22 -
buildroot/package/armadeus/testsuite/testsuite.mk | 51 +-
buildroot/package/armadeus/tfp410ctrl/tfp410.mk | 50 +-
..._lx9.bin => top_wishbone_example_apf51_lx9.bin} | Bin 340604 -> 340604 bytes
.../2013.11/017-armadeus-add-rxtx-package.patch | 186 +++++
.../018-armadeus-add-pcidebug-package.patch | 61 ++
patches/buildroot/2013.11/cleanup_buildroot.sh | 6 +
.../2015.02/017-armadeus-add-rxtx-package.patch | 186 +++++
.../018-armadeus-add-pcidebug-package.patch | 61 ++
patches/buildroot/2015.02/cleanup_buildroot.sh | 6 +
target/linux/debug/imxssi/imx51regs.h | 2 +-
target/linux/debug/pci_debug/Makefile | 12 -
target/linux/debug/pci_debug/pci_debug.c | 752 --------------------
target/packages/ch7024ctrl/Makefile | 6 +-
.../test/data/fpga/top_wishbone_example51_lx9.bin | 1 -
.../data/fpga/top_wishbone_example_apf51_lx9.bin | 1 +
target/test/install.sh | 11 +-
target/test/packages/test_fpgaregs.sh | 2 +-
target/test/test_fpga.sh | 4 +-
31 files changed, 622 insertions(+), 1204 deletions(-)
delete mode 100644 buildroot/package/armadeus/pci_debug/Config.in
delete mode 100644 buildroot/package/armadeus/pci_debug/pci_debug.mk
delete mode 100644 buildroot/package/armadeus/rxtx/Config.in
delete mode 100644 buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
delete mode 100644 buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
delete mode 100644 buildroot/package/armadeus/rxtx/rxtx.mk
rename firmware/wishbone_example/wishbone_example51/binaries/{top_wishbone_example51_lx9.bin => top_wishbone_example_apf51_lx9.bin} (100%)
create mode 100644 patches/buildroot/2013.11/017-armadeus-add-rxtx-package.patch
create mode 100644 patches/buildroot/2013.11/018-armadeus-add-pcidebug-package.patch
create mode 100644 patches/buildroot/2015.02/017-armadeus-add-rxtx-package.patch
create mode 100644 patches/buildroot/2015.02/018-armadeus-add-pcidebug-package.patch
delete mode 100644 target/linux/debug/pci_debug/Makefile
delete mode 100644 target/linux/debug/pci_debug/pci_debug.c
delete mode 120000 target/test/data/fpga/top_wishbone_example51_lx9.bin
create mode 120000 target/test/data/fpga/top_wishbone_example_apf51_lx9.bin
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index 6bb0638..2b90cdd 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -4,13 +4,11 @@ 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
-source package/armadeus/pci_debug/Config.in
source package/armadeus/fpga_firmware/Config.in
source package/armadeus/imx28-usb-downloader/Config.in
source package/armadeus/imxregs/Config.in
source package/armadeus/imxssi/Config.in
source package/armadeus/max5821ctrl/Config.in
-source package/armadeus/rxtx/Config.in
source package/armadeus/straton/Config.in
source package/armadeus/straton_ios/Config.in
source package/armadeus/testsuite/Config.in
diff --git a/buildroot/package/armadeus/ad9889ctrl/Config.in b/buildroot/package/armadeus/ad9889ctrl/Config.in
index e00cef6..54ea83c 100644
--- a/buildroot/package/armadeus/ad9889ctrl/Config.in
+++ b/buildroot/package/armadeus/ad9889ctrl/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_AD9889CTRL
- bool "ad9889 control"
+ bool "ad9889ctrl"
depends on BR2_TARGET_ARMADEUS
help
- Build "ad9889" control tool. It allows you to configure the HDMI/DVI
+ Build "ad9889ctrl" tool. It allows you to configure the HDMI/DVI
output of the APF27DevFull directly from Linux userspace.
diff --git a/buildroot/package/armadeus/ad9889ctrl/ad9889.mk b/buildroot/package/armadeus/ad9889ctrl/ad9889.mk
index 1342c38..da56b6a 100644
--- a/buildroot/package/armadeus/ad9889ctrl/ad9889.mk
+++ b/buildroot/package/armadeus/ad9889ctrl/ad9889.mk
@@ -1,41 +1,21 @@
-#############################################################
+################################################################################
#
-# ad9889 control tool
+# ad9889ctrl
#
-#############################################################
+################################################################################
-AD9889CTRL_VER:=1.0
-AD9889CTRL_SOURCE:=$(TOPDIR)/../target/packages/ad9889ctrl
-AD9889CTRL_DIR:=$(BUILD_DIR)/ad9889ctrl-$(AD9889CTRL_VER)
-AD9889CTRL_CAT:=zcat
-AD9889CTRL_BINARY:=ad9889ctrl
-AD9889CTRL_TARGET_BINARY:=usr/bin/ad9889ctrl
+AD9889CTRL_VERSION = 1.0
+AD9889CTRL_SITE = $(TOPDIR)/../target/packages/ad9889ctrl
+AD9889CTRL_SITE_METHOD = local
+AD9889CTRL_LICENCE = GPLv2+
+AD9889CTRL_LICENCE_FILES = ad9889ctrl.c
-$(AD9889CTRL_DIR)/ad9889ctrl.c:
- mkdir -p $(AD9889CTRL_DIR)/
- cp $(AD9889CTRL_SOURCE)/* $(AD9889CTRL_DIR)/
+define AD9889CTRL_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" -C $(@D)
+endef
-$(AD9889CTRL_DIR)/$(AD9889CTRL_BINARY): $(AD9889CTRL_DIR)/ad9889ctrl.c $(AD9889CTRL_DIR)/ad9889ctrl.h
- $(MAKE) CC="$(TARGET_CC)" -C $(AD9889CTRL_DIR)
+define AD9889CTRL_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 755 $(@D)/ad9889ctrl $(TARGET_DIR)/usr/sbin/
+endef
-$(TARGET_DIR)/$(AD9889CTRL_TARGET_BINARY): $(AD9889CTRL_DIR)/$(AD9889CTRL_BINARY)
- install -D $< $@
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(AD9889CTRL_TARGET_BINARY)
-
-ad9889ctrl: $(TARGET_DIR)/$(AD9889CTRL_TARGET_BINARY)
-
-ad9889ctrl-clean:
- rm -f $(TARGET_DIR)/$(AD9889CTRL_TARGET_BINARY)
- -$(MAKE) -C $(AD9889CTRL_DIR) clean
-
-ad9889ctrl-dirclean:
- rm -rf $(AD9889CTRL_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_AD9889CTRL)),y)
-TARGETS+=ad9889ctrl
-endif
+$(eval $(generic-package))
diff --git a/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk b/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk
index b102663..322cb7d 100644
--- a/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk
+++ b/buildroot/package/armadeus/ch7024ctrl/ch70241ctrl.mk
@@ -1,46 +1,23 @@
-#############################################################
+################################################################################
#
-# ch7024 tool
+# ch7024ctrl
#
-#############################################################
+################################################################################
-CH7024CTRL_VER:=1.0
-CH7024CTRL_SOURCE:=$(TOPDIR)/../target/packages/ch7024ctrl
-CH7024CTRL_DIR:=$(BUILD_DIR)/ch7024ctrl-$(CH7024CTRL_VER)
-CH7024CTRL_CAT:=zcat
-CH7024CTRL_BINARY:=ch7024
-CH7024CTRL_TARGET_DIR:=usr/bin
-CH7024CTRL_TARGET_BINARY:=$(CH7024CTRL_TARGET_DIR)/$(CH7024CTRL_BINARY)
-CH7024CTRL_CONF_FILES:=ch*x*.conf
+CH7024CTRL_VERSION = 1.01
+CH7024CTRL_SITE = $(TOPDIR)/../target/packages/ch7024ctrl
+CH7024CTRL_SITE_METHOD = local
+CH7024CTRL_LICENSE = GPLv2+
+CH7024CTRL_LICENSE_FILES = ch7024.c
+CH7024CTRL_CONF_FILES = ch*x*.conf
-$(CH7024CTRL_DIR)/ch7024.c:
- set
- mkdir -p $(CH7024CTRL_DIR)/
- cp $(CH7024CTRL_SOURCE)/* $(CH7024CTRL_DIR)/
+define CH7024CTRL_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" -C $(@D)
+endef
-$(CH7024CTRL_DIR)/$(CH7024CTRL_BINARY): $(CH7024CTRL_DIR)/ch7024.c $(CH7024CTRL_DIR)/ch7024.h
- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" -C $(CH7024CTRL_DIR)
+define CH7024CTRL_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 755 $(@D)/ch7024ctrl $(TARGET_DIR)/usr/sbin/
+ $(INSTALL) -m 644 $(@D)/$(CH7024CTRL_CONF_FILES) $(TARGET_DIR)/usr/sbin/
+endef
-$(TARGET_DIR)/$(CH7024CTRL_TARGET_BINARY): $(CH7024CTRL_DIR)/$(CH7024CTRL_BINARY)
- install -D $< $@
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(CH7024CTRL_TARGET_BINARY)
- cp $(CH7024CTRL_DIR)/$(CH7024CTRL_CONF_FILES) $(TARGET_DIR)/$(CH7024CTRL_TARGET_DIR)
-
-ch7024ctrl: $(TARGET_DIR)/$(CH7024CTRL_TARGET_BINARY)
-
-ch7024ctrl-clean:
- rm -f $(TARGET_DIR)/$(CH7024CTRL_TARGET_DIR)/$(CH7024CTRL_CONF_FILES)
- rm -f $(TARGET_DIR)/$(CH7024CTRL_TARGET_BINARY)
- -$(MAKE) -C $(CH7024CTRL_DIR) clean
-
-ch7024ctrl-dirclean:
- rm -rf $(CH7024CTRL_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_CH7024CTRL)),y)
-TARGETS+=ch7024ctrl
-endif
+$(eval $(generic-package))
diff --git a/buildroot/package/armadeus/imxssi/imxssi.mk b/buildroot/package/armadeus/imxssi/imxssi.mk
index 0005d8d..13605a9 100644
--- a/buildroot/package/armadeus/imxssi/imxssi.mk
+++ b/buildroot/package/armadeus/imxssi/imxssi.mk
@@ -1,58 +1,23 @@
-#############################################################
+################################################################################
#
-# imxssi debug tool
+# imxssi
#
-#############################################################
+################################################################################
-IMXSSI_VER:=1.0
-IMXSSI_SOURCE:=$(TOPDIR)/../target/linux/debug/imxssi/
-IMXSSI_DIR:=$(BUILD_DIR)/imxssi-$(IMXSSI_VER)
-IMXSSI_CAT:=zcat
-IMXSSI_BINARY:=imxssi
-IMXSSI_TARGET_BINARY:=usr/bin/imxssi
+IMXSSI_VERSION = 1.01
+IMXSSI_SITE = $(TOPDIR)/../target/linux/debug/imxssi/
+IMXSSI_SITE_METHOD = local
+IMXSSI_LICENSE = GPLv2+
+IMXSSI_LICENSE_FILES = COPYING
-IMXSSI_DEFINES:=-D$(shell echo $(BR2_CPU_NAME) | tr '[:lower:]' '[:upper:]')
+IMXSSI_DEFINES = -D$(shell echo $(BR2_CPU_NAME) | tr '[:lower:]' '[:upper:]')
+IMXSSI_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(IMXSSI_DEFINES)"
-$(IMXSSI_DIR)/imxssi.c:
- mkdir -p $(IMXSSI_DIR)/
- cp -Lr $(IMXSSI_SOURCE)/* $(IMXSSI_DIR)/
+define IMXSSI_COPY_IMXREGS_SYMLINKS
+ rm -f $(@D)/imx*reg* $(@D)/definitions.h
+ cp -Lr $(IMXSSI_SITE)/imx*reg* $(IMXSSI_SITE)/definitions.h $(@D)/
+endef
-$(IMXSSI_DIR)/.configured: $(IMXSSI_DIR)/imxssi.c
- (cd $(IMXSSI_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_ARGS) \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS) $(IMXSSI_DEFINES)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
- )
- touch $@
+IMXSSI_PRE_CONFIGURE_HOOKS += IMXSSI_COPY_IMXREGS_SYMLINKS
-$(IMXSSI_DIR)/$(IMXSSI_BINARY): $(IMXSSI_DIR)/.configured
- $(MAKE) -C $(IMXSSI_DIR)
-
-$(TARGET_DIR)/$(IMXSSI_TARGET_BINARY): $(IMXSSI_DIR)/$(IMXSSI_BINARY)
- install -D $< $@
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(IMXSSI_TARGET_BINARY)
-
-imxssi: uclibc $(TARGET_DIR)/$(IMXSSI_TARGET_BINARY)
-
-imxssi-clean:
- rm -f $(TARGET_DIR)/$(IMXSSI_TARGET_BINARY)
- -$(MAKE) -C $(IMXSSI_DIR) clean
-
-imxssi-dirclean:
- rm -rf $(IMXSSI_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_IMXSSI)),y)
-TARGETS+=imxssi
-endif
+$(eval $(autotools-package))
diff --git a/buildroot/package/armadeus/max5821ctrl/Config.in b/buildroot/package/armadeus/max5821ctrl/Config.in
index 370db92..095cec2 100644
--- a/buildroot/package/armadeus/max5821ctrl/Config.in
+++ b/buildroot/package/armadeus/max5821ctrl/Config.in
@@ -2,5 +2,4 @@ config BR2_PACKAGE_MAX5821CTRL
bool "max5821 control (setDAC)"
help
This tool allows you to configure the MAX5821 I2C DAC directly
- from Linux userspace ("setDAC" command) on your APF9328DevFull or
- on your APF27DevFull.
+ from Linux userspace ("setDAC" command) on your APF9328/APF27DevFull.
diff --git a/buildroot/package/armadeus/max5821ctrl/max5821ctrl.mk b/buildroot/package/armadeus/max5821ctrl/max5821ctrl.mk
index a4b67a8..f6d5107 100644
--- a/buildroot/package/armadeus/max5821ctrl/max5821ctrl.mk
+++ b/buildroot/package/armadeus/max5821ctrl/max5821ctrl.mk
@@ -1,42 +1,21 @@
-#############################################################
+################################################################################
#
-# imxregs debug tool
+# max5821ctrl
#
-#############################################################
+################################################################################
-MAX5821CTRL_VER:=1.0
-MAX5821CTRL_SOURCE:=$(TOPDIR)/../target/packages/max5821ctrl
-MAX5821CTRL_DIR:=$(BUILD_DIR)/max5821ctrl-$(MAX5821CTRL_VER)
-MAX5821CTRL_CAT:=zcat
-MAX5821CTRL_BINARY:=setDAC
-MAX5821CTRL_TARGET_BINARY:=usr/bin/setDAC
+MAX5821CTRL_VERSION = 1.0
+MAX5821CTRL_SITE = $(TOPDIR)/../target/packages/max5821ctrl
+MAX5821CTRL_SITE_METHOD = local
+MAX5821CTRL_LICENSE = GPLv2+
+MAX5821CTRL_LICENSE_FILES = setDAC.c
-$(MAX5821CTRL_DIR)/setDAC.c:
- set
- mkdir -p $(MAX5821CTRL_DIR)/
- cp $(MAX5821CTRL_SOURCE)/* $(MAX5821CTRL_DIR)/
+define MAX5821CTRL_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" -C $(@D)
+endef
-$(MAX5821CTRL_DIR)/$(MAX5821CTRL_BINARY): $(MAX5821CTRL_DIR)/setDAC.c $(MAX5821CTRL_DIR)/max5821.h
- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" -C $(MAX5821CTRL_DIR)
+define MAX5821CTRL_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 755 $(@D)/setDAC $(TARGET_DIR)/usr/bin/
+endef
-$(TARGET_DIR)/$(MAX5821CTRL_TARGET_BINARY): $(MAX5821CTRL_DIR)/$(MAX5821CTRL_BINARY)
- install -D $< $@
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(MAX5821CTRL_TARGET_BINARY)
-
-max5821ctrl: $(TARGET_DIR)/$(MAX5821CTRL_TARGET_BINARY)
-
-max5821ctrl-clean:
- rm -f $(TARGET_DIR)/$(MAX5821CTRL_TARGET_BINARY)
- -$(MAKE) -C $(MAX5821CTRL_DIR) clean
-
-max5821ctrl-dirclean:
- rm -rf $(MAX5821CTRL_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_MAX5821CTRL)),y)
-TARGETS+=max5821ctrl
-endif
+$(eval $(generic-package))
diff --git a/buildroot/package/armadeus/pci_debug/Config.in b/buildroot/package/armadeus/pci_debug/Config.in
deleted file mode 100644
index 310a0ca..0000000
--- a/buildroot/package/armadeus/pci_debug/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_PCI_DEBUG
- bool "pcidebug"
- depends on BR2_PACKAGE_READLINE
- default n
- help
- This debug tool allows you to access the PCIe BARx registers
- directly from Linux userspace.
- Wrote by D. W. Hawkins :
- http://www.ovro.caltech.edu/%7Edwh/correlator/pdf/altera_pcie.zip
diff --git a/buildroot/package/armadeus/pci_debug/pci_debug.mk b/buildroot/package/armadeus/pci_debug/pci_debug.mk
deleted file mode 100644
index 5eca129..0000000
--- a/buildroot/package/armadeus/pci_debug/pci_debug.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#############################################################
-#
-# pci_debug debug tool
-#
-#############################################################
-
-PCI_DEBUG_VERSION = 2015.02
-PCI_DEBUG_SITE = $(TOPDIR)/../target/linux/debug/pci_debug/
-PCI_DEBUG_SITE_METHOD = local
-PCI_DEBUG_LICENSE = GPLv2+
-
-PCI_DEBUG_BINARY=pci_debug
-PCI_DEBUG_TARGET_BINARY:=usr/bin/$(PCI_DEBUG_BINARY)
-
-define PCI_DEBUG_BUILD_CMDS
- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" -C $(@D)
-endef
-
-define PCI_DEBUG_INSTALL_TARGET_CMDS
- $(INSTALL) -m 755 $(@D)/$(PCI_DEBUG_BINARY) $(TARGET_DIR)/$(PCI_DEBUG_TARGET_BINARY)
-endef
-
-$(eval $(generic-package))
diff --git a/buildroot/package/armadeus/rxtx/Config.in b/buildroot/package/armadeus/rxtx/Config.in
deleted file mode 100644
index 78f4369..0000000
--- a/buildroot/package/armadeus/rxtx/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-config BR2_PACKAGE_RXTX
- bool "rxtx"
- depends on BR2_PACKAGE_CLASSPATH
- help
- RXTX is a Java library, providing serial and parallel communication.
-
- RXTX is a Java library, using a native implementation (via JNI),
- providing serial and parallel communication for the Java Development
- Toolkit (JDK).
-
-
- http://rxtx.qbang.org
diff --git a/buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-001-remove-warning.patch b/buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
deleted file mode 100644
index bd8afb5..0000000
--- a/buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- rxtx-2.1-7r2/src/I2CImp.c.orig 2004-10-17 16:23:02.000000000 +0200
-+++ rxtx-2.1-7r2/src/I2CImp.c 2006-10-26 21:25:32.000000000 +0200
-@@ -87,6 +87,7 @@
- if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
- #endif /* !__FreeBSD__ */
- #if defined(__linux__)
-+#if 0
- /* Lets let people who upgraded kernels know they may have problems */
- if (uname (&name) == -1)
- {
-@@ -98,6 +99,7 @@
- fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
- getchar();
- }
-+#endif
- #endif /* __linux__ */
- #endif /* WIN32 */
- }
---- rxtx-2.1-7r2/src/RawImp.c.orig 2004-10-16 18:20:35.000000000 +0200
-+++ rxtx-2.1-7r2/src/RawImp.c 2006-10-26 21:25:59.000000000 +0200
-@@ -231,6 +231,7 @@
- if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
- #endif /* !__FreeBSD__ */
- #if defined(__linux__)
-+#if 0
- /* Lets let people who upgraded kernels know they may have problems */
- if (uname (&name) == -1)
- {
-@@ -242,6 +243,7 @@
- fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
- getchar();
- }
-+#endif
- #endif /* __linux__ */
- #endif /* WIN32 */
- }
---- rxtx-2.1-7r2/src/RS485Imp.c.orig 2004-10-16 18:20:35.000000000 +0200
-+++ rxtx-2.1-7r2/src/RS485Imp.c 2006-10-26 21:26:23.000000000 +0200
-@@ -87,6 +87,7 @@
- if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
- #endif /* !__FreeBSD__ */
- #if defined(__linux__)
-+#if 0
- /* Lets let people who upgraded kernels know they may have problems */
- if (uname (&name) == -1)
- {
-@@ -98,6 +99,7 @@
- fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
- getchar();
- }
-+#endif
- #endif /* __linux__ */
- #endif /* WIN32 */
- }
---- rxtx-2.1-7r2/src/SerialImp.c.orig 2006-01-29 23:19:04.000000000 +0100
-+++ rxtx-2.1-7r2/src/SerialImp.c 2006-10-26 21:26:59.000000000 +0200
-@@ -280,6 +280,7 @@
- gettimeofday(&seloop, NULL);
- #endif /* DEBUG_TIMING */
- #if defined(DEBUG) && defined(__linux__)
-+#if 0
- /* Lets let people who upgraded kernels know they may have problems */
- if (uname (&name) == -1)
- {
-@@ -295,6 +296,7 @@
- getchar();
- }
- LEAVE( "RXTXPort:Initialize" );
-+#endif
- #endif /* DEBUG && __linux__ */
- }
-
---- rxtx-2.1-7r2/src/SerialImp.cpp.orig 2004-10-12 10:59:27.000000000 +0200
-+++ rxtx-2.1-7r2/src/SerialImp.cpp 2006-10-26 21:27:44.000000000 +0200
-@@ -102,6 +102,7 @@
- if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
- #endif /* !__FreeBSD__ */
- #ifdef DEBUG
-+#if 0
- /* Lets let people who upgraded kernels know they may have problems */
- if (uname (&name) == -1)
- {
-@@ -114,6 +115,7 @@
- name.release);
- getchar();
- }
-+#endif
- #endif /* DEBUG */
- #endif /* __BEOS__ */
- #endif /* WIN32 */
diff --git a/buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch b/buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
deleted file mode 100644
index 49c12cb..0000000
--- a/buildroot/package/armadeus/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- rxtx-2.1-7r2/configure.ori 2006-01-30 05:37:40.000000000 +0100
-+++ rxtx-2.1-7r2/configure 2011-02-27 00:15:04.000000000 +0100
-@@ -21541,7 +21541,7 @@ Linux)
- CFLAGS=$CFLAGS" -D__need_timespec"
- case $JAVA_VERSION in
-
-- 1.2*|1.3*|1.4*|1.5*)
-+ 1.2*|1.3*|1.4*|1.5*|1.6*)
- #fix_parameters $JPATH/jre/lib/javax.comm.properties
- CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
- JHOME=$JPATH"/jre/lib/ext"
-@@ -21611,7 +21611,7 @@ Linux)
- TARGETLIB="\$(target_triplet)/librxtxSerial.la \
- \$(target_triplet)/librxtxParallel.la"
- case $JAVA_VERSION in
-- 1.2*|1.3*|1.4*|1.5*)
-+ 1.2*|1.3*|1.4*|1.5*|1.6*)
- #fix_parameters $JPATH/jre/lib/javax.comm.properties
- CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
-@@ -21747,7 +21747,7 @@ BeOS)
-
- WIN32)
- case $JAVA_VERSION in
-- 1.2*|1.3*|1.4*|1.5*)
-+ 1.2*|1.3*|1.4*|1.5*|1.6*)
- CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
- JHOME=$JPATH"/jre/lib/ext"
- ;;
-@@ -21799,7 +21799,7 @@ Solaris*)
- CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
-
- case $JAVA_VERSION in
-- 1.2*|1.3*|1.4*|1.5*)
-+ 1.2*|1.3*|1.4*|1.5*|1.6*)
- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
- ;;
- 1.1*)
diff --git a/buildroot/package/armadeus/rxtx/rxtx.mk b/buildroot/package/armadeus/rxtx/rxtx.mk
deleted file mode 100644
index ab4c104..0000000
--- a/buildroot/package/armadeus/rxtx/rxtx.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-#############################################################
-#
-# rxtx lib for java
-#
-#############################################################
-RXTX_VERSION = 2.1-7r2
-RXTX_SOURCE = rxtx-$(RXTX_VERSION).tgz
-RXTX_SITE = http://rxtx.qbang.org/pub/rxtx/
-RXTX_DEPENDENCIES = classpath
-
-# Comment the following line with BR 2015.02
-RXTX_INSTALL_TARGET_OPT = RXTX_PATH=$(TARGET_DIR)/usr/lib/classpath JHOME=$(TARGET_DIR)/usr/lib install
-
-# Uncomment the following line with BR 2015.02
-#RXTX_INSTALL_TARGET_OPTS = RXTX_PATH=$(TARGET_DIR)/usr/lib/classpath JHOME=$(TARGET_DIR)/usr/lib install
-
-ifeq ($(autotools-package), )
-$(eval $(call AUTOTARGETS))
-else
-$(eval $(autotools-package))
-endif
-
diff --git a/buildroot/package/armadeus/testsuite/testsuite.mk b/buildroot/package/armadeus/testsuite/testsuite.mk
index 8426150..14c41b8 100644
--- a/buildroot/package/armadeus/testsuite/testsuite.mk
+++ b/buildroot/package/armadeus/testsuite/testsuite.mk
@@ -1,42 +1,29 @@
-#############################################################
+################################################################################
#
# Armadeus Test Suite
#
-#############################################################
+################################################################################
-ARMADEUS-TESTSUITE_VER:=1.1
-ARMADEUS-TESTSUITE_SOURCE:=$(TOPDIR)/../target/test/
-ARMADEUS-TESTSUITE_DIR:=$(BUILD_DIR)/armadeus-testsuite-$(ARMADEUS-TESTSUITE_VER)
-ARMADEUS-TESTSUITE_CAT:=zcat
-ARMADEUS-TESTSUITE_BINARY:=test_env.sh
-ARMADEUS-TESTSUITE_TARGET_DIR:=$(TARGET_DIR)/usr/bin/testsuite
-ARMADEUS-TESTSUITE_TARGET_BINARY:=$(ARMADEUS-TESTSUITE_TARGET_DIR)/$(ARMADEUS-TESTSUITE_BINARY)
-ARMADEUS-TESTSUITE_WISHBONE_BUTTON_DIR:=$(TOPDIR)/../target/linux/modules/fpga/virtual_components/button/
+TESTSUITE_VERSION = 1.11
+TESTSUITE_SITE = $(TOPDIR)/../target/test/
+TESTSUITE_SITE_METHOD = local
-$(ARMADEUS-TESTSUITE_DIR)/.unpacked:
- mkdir -p $(ARMADEUS-TESTSUITE_DIR)/
- cd $(ARMADEUS-TESTSUITE_SOURCE); tar ch --exclude=.svn --exclude=.git . | tar x -C $(ARMADEUS-TESTSUITE_DIR)/
- touch $@
+ARMADEUS_TESTSUITE_WISHBONE_BUTTON_SRCDIR = $(TOPDIR)/../target/linux/modules/fpga/virtual_components/button/
-$(ARMADEUS-TESTSUITE_TARGET_BINARY): $(ARMADEUS-TESTSUITE_DIR)/.unpacked
- $(ARMADEUS-TESTSUITE_SOURCE)/install.sh $(ARMADEUS-TESTSUITE_TARGET_DIR)
- make -C $(ARMADEUS-TESTSUITE_WISHBONE_BUTTON_DIR) CC="$(TARGET_CC)" test
- install -D $(ARMADEUS-TESTSUITE_WISHBONE_BUTTON_DIR)/testbutton $(ARMADEUS-TESTSUITE_TARGET_DIR)
- touch $@
+define TESTSUITE_COPY_FPGA_SYMLINKS
+ rm -f $(@D)/data/fpga/*
+ cp -Lr $(TESTSUITE_SITE)/data/fpga/* $(@D)/data/fpga/
+endef
-armadeus-testsuite: $(ARMADEUS-TESTSUITE_TARGET_BINARY)
+TESTSUITE_POST_RSYNC_HOOKS += TESTSUITE_COPY_FPGA_SYMLINKS
-armadeus-testsuite-clean:
- rm -rf $(ARMADEUS-TESTSUITE_TARGET_DIR)
+define TESTSUITE_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" -C $(ARMADEUS_TESTSUITE_WISHBONE_BUTTON_SRCDIR) test
+endef
-armadeus-testsuite-dirclean:
- rm -rf $(ARMADEUS-TESTSUITE_DIR)
+define TESTSUITE_INSTALL_TARGET_CMDS
+ $(@D)/install.sh $(TARGET_DIR)/usr/bin/testsuite/ $(BR2_BOARD_NAME)
+ $(INSTALL) -D $(ARMADEUS_TESTSUITE_WISHBONE_BUTTON_SRCDIR)/testbutton $(TARGET_DIR)/usr/bin/testsuite/
+endef
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_TESTSUITE)),y)
-TARGETS+=armadeus-testsuite
-endif
+$(eval $(generic-package))
diff --git a/buildroot/package/armadeus/tfp410ctrl/tfp410.mk b/buildroot/package/armadeus/tfp410ctrl/tfp410.mk
index 0dee387..61d1da8 100644
--- a/buildroot/package/armadeus/tfp410ctrl/tfp410.mk
+++ b/buildroot/package/armadeus/tfp410ctrl/tfp410.mk
@@ -1,41 +1,21 @@
-#############################################################
+################################################################################
#
-# tfp410 control tool
+# tfp410ctrl
#
-#############################################################
+################################################################################
-TFP410CTRL_VER:=1.0
-TFP410CTRL_SOURCE:=$(TOPDIR)/../target/packages/tfp410ctrl
-TFP410CTRL_DIR:=$(BUILD_DIR)/tfp410ctrl-$(TFP410CTRL_VER)
-TFP410CTRL_CAT:=zcat
-TFP410CTRL_BINARY:=tfp410ctrl
-TFP410CTRL_TARGET_BINARY:=usr/bin/tfp410ctrl
+TFP410CTRL_VERSION = 1.0
+TFP410CTRL_SITE = $(TOPDIR)/../target/packages/tfp410ctrl
+TFP410CTRL_SITE_METHOD = local
+TFP410CTRL_LICENCE = GPLv2+
+TFP410CTRL_LICENCE_FILES = tfp410ctrl.c parse-edid.c
-$(TFP410CTRL_DIR)/tfp410ctrl.c:
- mkdir -p $(TFP410CTRL_DIR)/
- cp $(TFP410CTRL_SOURCE)/* $(TFP410CTRL_DIR)/
+define TFP410CTRL_BUILD_CMDS
+ $(MAKE) CC="$(TARGET_CC)" -C $(@D)
+endef
-$(TFP410CTRL_DIR)/$(TFP410CTRL_BINARY): $(TFP410CTRL_DIR)/tfp410ctrl.c $(TFP410CTRL_DIR)/tfp410ctrl.h
- $(MAKE) CC="$(TARGET_CC)" -C $(TFP410CTRL_DIR)
+define TFP410CTRL_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 755 $(@D)/tfp410ctrl $(TARGET_DIR)/usr/sbin/
+endef
-$(TARGET_DIR)/$(TFP410CTRL_TARGET_BINARY): $(TFP410CTRL_DIR)/$(TFP410CTRL_BINARY)
- install -D $< $@
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(TFP410CTRL_TARGET_BINARY)
-
-tfp410ctrl: $(TARGET_DIR)/$(TFP410CTRL_TARGET_BINARY)
-
-tfp410ctrl-clean:
- rm -f $(TARGET_DIR)/$(TFP410CTRL_TARGET_BINARY)
- -$(MAKE) -C $(TFP410CTRL_DIR) clean
-
-tfp410ctrl-dirclean:
- rm -rf $(TFP410CTRL_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_TFP410CTRL)),y)
-TARGETS+=tfp410ctrl
-endif
+$(eval $(generic-package))
diff --git a/patches/buildroot/2013.11/017-armadeus-add-rxtx-package.patch b/patches/buildroot/2013.11/017-armadeus-add-rxtx-package.patch
new file mode 100644
index 0000000..9d5247e
--- /dev/null
+++ b/patches/buildroot/2013.11/017-armadeus-add-rxtx-package.patch
@@ -0,0 +1,186 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2015-02-17 22:28:58.031607275 +0100
++++ buildroot/package/Config.in 2015-02-18 08:48:22.331606200 +0100
+@@ -349,6 +349,7 @@
+ source "package/read-edid/Config.in"
+ source "package/rng-tools/Config.in"
+ source "package/rpi-userland/Config.in"
++source "package/rxtx/Config.in"
+ source "package/sane-backends/Config.in"
+ source "package/sam7-pgm-ng/Config.in"
+ source "package/sdparm/Config.in"
+Index: buildroot/package/rxtx/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/rxtx/Config.in 2015-02-18 09:06:45.577077357 +0100
+@@ -0,0 +1,12 @@
++config BR2_PACKAGE_RXTX
++ bool "rxtx"
++ depends on BR2_PACKAGE_CLASSPATH
++ help
++ RXTX is a Java library, using a native implementation (via JNI),
++ providing serial and parallel communication for the Java Development
++ Toolkit (JDK).
++
++ http://rxtx.qbang.org
++
++comment "rxtx needs classpath"
++ depends on !BR2_PACKAGE_RXTX
+Index: buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch 2015-02-18 08:49:35.103967048 +0100
+@@ -0,0 +1,90 @@
++--- rxtx-2.1-7r2/src/I2CImp.c.orig 2004-10-17 16:23:02.000000000 +0200
+++++ rxtx-2.1-7r2/src/I2CImp.c 2006-10-26 21:25:32.000000000 +0200
++@@ -87,6 +87,7 @@
++ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
++ #endif /* !__FreeBSD__ */
++ #if defined(__linux__)
+++#if 0
++ /* Lets let people who upgraded kernels know they may have problems */
++ if (uname (&name) == -1)
++ {
++@@ -98,6 +99,7 @@
++ fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
++ getchar();
++ }
+++#endif
++ #endif /* __linux__ */
++ #endif /* WIN32 */
++ }
++--- rxtx-2.1-7r2/src/RawImp.c.orig 2004-10-16 18:20:35.000000000 +0200
+++++ rxtx-2.1-7r2/src/RawImp.c 2006-10-26 21:25:59.000000000 +0200
++@@ -231,6 +231,7 @@
++ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
++ #endif /* !__FreeBSD__ */
++ #if defined(__linux__)
+++#if 0
++ /* Lets let people who upgraded kernels know they may have problems */
++ if (uname (&name) == -1)
++ {
++@@ -242,6 +243,7 @@
++ fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
++ getchar();
++ }
+++#endif
++ #endif /* __linux__ */
++ #endif /* WIN32 */
++ }
++--- rxtx-2.1-7r2/src/RS485Imp.c.orig 2004-10-16 18:20:35.000000000 +0200
+++++ rxtx-2.1-7r2/src/RS485Imp.c 2006-10-26 21:26:23.000000000 +0200
++@@ -87,6 +87,7 @@
++ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
++ #endif /* !__FreeBSD__ */
++ #if defined(__linux__)
+++#if 0
++ /* Lets let people who upgraded kernels know they may have problems */
++ if (uname (&name) == -1)
++ {
++@@ -98,6 +99,7 @@
++ fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
++ getchar();
++ }
+++#endif
++ #endif /* __linux__ */
++ #endif /* WIN32 */
++ }
++--- rxtx-2.1-7r2/src/SerialImp.c.orig 2006-01-29 23:19:04.000000000 +0100
+++++ rxtx-2.1-7r2/src/SerialImp.c 2006-10-26 21:26:59.000000000 +0200
++@@ -280,6 +280,7 @@
++ gettimeofday(&seloop, NULL);
++ #endif /* DEBUG_TIMING */
++ #if defined(DEBUG) && defined(__linux__)
+++#if 0
++ /* Lets let people who upgraded kernels know they may have problems */
++ if (uname (&name) == -1)
++ {
++@@ -295,6 +296,7 @@
++ getchar();
++ }
++ LEAVE( "RXTXPort:Initialize" );
+++#endif
++ #endif /* DEBUG && __linux__ */
++ }
++
++--- rxtx-2.1-7r2/src/SerialImp.cpp.orig 2004-10-12 10:59:27.000000000 +0200
+++++ rxtx-2.1-7r2/src/SerialImp.cpp 2006-10-26 21:27:44.000000000 +0200
++@@ -102,6 +102,7 @@
++ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
++ #endif /* !__FreeBSD__ */
++ #ifdef DEBUG
+++#if 0
++ /* Lets let people who upgraded kernels know they may have problems */
++ if (uname (&name) == -1)
++ {
++@@ -114,6 +115,7 @@
++ name.release);
++ getchar();
++ }
+++#endif
++ #endif /* DEBUG */
++ #endif /* __BEOS__ */
++ #endif /* WIN32 */
+Index: buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch 2015-02-18 08:49:35.103967048 +0100
+@@ -0,0 +1,38 @@
++--- rxtx-2.1-7r2/configure.ori 2006-01-30 05:37:40.000000000 +0100
+++++ rxtx-2.1-7r2/configure 2011-02-27 00:15:04.000000000 +0100
++@@ -21541,7 +21541,7 @@ Linux)
++ CFLAGS=$CFLAGS" -D__need_timespec"
++ case $JAVA_VERSION in
++
++- 1.2*|1.3*|1.4*|1.5*)
+++ 1.2*|1.3*|1.4*|1.5*|1.6*)
++ #fix_parameters $JPATH/jre/lib/javax.comm.properties
++ CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
++ JHOME=$JPATH"/jre/lib/ext"
++@@ -21611,7 +21611,7 @@ Linux)
++ TARGETLIB="\$(target_triplet)/librxtxSerial.la \
++ \$(target_triplet)/librxtxParallel.la"
++ case $JAVA_VERSION in
++- 1.2*|1.3*|1.4*|1.5*)
+++ 1.2*|1.3*|1.4*|1.5*|1.6*)
++ #fix_parameters $JPATH/jre/lib/javax.comm.properties
++ CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
++ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
++@@ -21747,7 +21747,7 @@ BeOS)
++
++ WIN32)
++ case $JAVA_VERSION in
++- 1.2*|1.3*|1.4*|1.5*)
+++ 1.2*|1.3*|1.4*|1.5*|1.6*)
++ CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
++ JHOME=$JPATH"/jre/lib/ext"
++ ;;
++@@ -21799,7 +21799,7 @@ Solaris*)
++ CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
++
++ case $JAVA_VERSION in
++- 1.2*|1.3*|1.4*|1.5*)
+++ 1.2*|1.3*|1.4*|1.5*|1.6*)
++ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
++ ;;
++ 1.1*)
+Index: buildroot/package/rxtx/rxtx.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/rxtx/rxtx.mk 2015-02-18 08:59:46.274997681 +0100
+@@ -0,0 +1,14 @@
++################################################################################
++#
++# rxtx
++#
++################################################################################
++
++RXTX_VERSION = 2.1-7r2
++RXTX_SITE = http://rxtx.qbang.org/pub/rxtx/
++RXTX_SOURCE = rxtx-$(RXTX_VERSION).tgz
++RXTX_DEPENDENCIES = classpath
++
++RXTX_INSTALL_TARGET_OPT = RXTX_PATH=$(TARGET_DIR)/usr/lib/classpath JHOME=$(TARGET_DIR)/usr/lib install
++
++$(eval $(autotools-package))
diff --git a/patches/buildroot/2013.11/018-armadeus-add-pcidebug-package.patch b/patches/buildroot/2013.11/018-armadeus-add-pcidebug-package.patch
new file mode 100644
index 0000000..88e1ef2
--- /dev/null
+++ b/patches/buildroot/2013.11/018-armadeus-add-pcidebug-package.patch
@@ -0,0 +1,61 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2015-02-18 09:14:28.467372230 +0100
++++ buildroot/package/Config.in 2015-02-18 09:36:09.873825541 +0100
+@@ -344,6 +344,7 @@
+ source "package/owfs/Config.in"
+ source "package/owl-linux/Config.in"
+ source "package/parted/Config.in"
++source "package/pci_debug/Config.in"
+ source "package/pciutils/Config.in"
+ source "package/picocom/Config.in"
+ source "package/read-edid/Config.in"
+Index: buildroot/package/pci_debug/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/pci_debug/Config.in 2015-02-18 09:43:45.860087739 +0100
+@@ -0,0 +1,14 @@
++config BR2_PACKAGE_PCI_DEBUG
++ bool "pcidebug"
++ select BR2_PACKAGE_READLINE
++ help
++ PCI debug registers interface.
++
++ This tool provides a debug interface for reading and writing to PCI
++ registers via the device base address registers (BARs). The tool uses
++ the PCI resource nodes automatically created by recent Linux kernels.
++
++ This tool uses readline (and ncurses) so it will autoselect it.
++
++ Written by D. W. Hawkins :
++ http://www.ovro.caltech.edu/%7Edwh/correlator/pdf/altera_pcie.zip
+Index: buildroot/package/pci_debug/pci_debug.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/pci_debug/pci_debug.mk 2015-02-18 10:01:50.657466829 +0100
+@@ -0,0 +1,25 @@
++################################################################################
++#
++# pci_debug
++#
++################################################################################
++
++PCI_DEBUG_VERSION = 2012.03
++PCI_DEBUG_SITE = http://www.ovro.caltech.edu/%7Edwh/correlator/pdf/
++PCI_DEBUG_SOURCE = altera_pcie.zip
++#PCI_DEBUG_LICENSE = ????
++PCI_DEBUG_DEPENDENCIES = readline
++
++define PCI_DEBUG_EXTRACT_CMDS
++ unzip $(DL_DIR)/$(PCI_DEBUG_SOURCE) -d $(@D)
++endef
++
++define PCI_DEBUG_BUILD_CMDS
++ $(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" -C $(@D)/code/pci_debug/
++endef
++
++define PCI_DEBUG_INSTALL_TARGET_CMDS
++ $(INSTALL) -m 755 $(@D)/code/pci_debug/pci_debug $(TARGET_DIR)/usr/sbin/
++endef
++
++$(eval $(generic-package))
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index 0c58531..f8ada55 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -114,6 +114,8 @@ rm -rf buildroot/package/opentyrian/Config.in
rm -rf buildroot/package/opentyrian/opentyrian.mk
rm -rf buildroot/package/owfs/Config.in
rm -rf buildroot/package/owfs/owfs.mk
+rm -rf buildroot/package/pci_debug/Config.in
+rm -rf buildroot/package/pci_debug/pci_debug.mk
rm -rf buildroot/package/pkg-generic.mk
rm -rf buildroot/package/poppler/poppler.mk
rm -rf buildroot/package/python/Config.in
@@ -135,6 +137,10 @@ rm -rf buildroot/package/qtcreator/qtcreator.mk
rm -rf buildroot/package/qt/qt.mk
rm -rf buildroot/package/quake-pak/Config.in
rm -rf buildroot/package/quake-pak/quake-pak.mk
+rm -rf buildroot/package/rxtx/Config.in
+rm -rf buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
+rm -rf buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
+rm -rf buildroot/package/rxtx/rxtx.mk
rm -rf buildroot/package/sam7-pgm-ng/Config.in
rm -rf buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
rm -rf buildroot/package/sdlquake/Config.in
diff --git a/patches/buildroot/2015.02/017-armadeus-add-rxtx-package.patch b/patches/buildroot/2015.02/017-armadeus-add-rxtx-package.patch
new file mode 100644
index 0000000..06c7e0e
--- /dev/null
+++ b/patches/buildroot/2015.02/017-armadeus-add-rxtx-package.patch
@@ -0,0 +1,186 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2015-02-17 22:28:58.031607275 +0100
++++ buildroot/package/Config.in 2015-02-18 08:48:22.331606200 +0100
+@@ -349,6 +349,7 @@
+ source "package/read-edid/Config.in"
+ source "package/rng-tools/Config.in"
+ source "package/rpi-userland/Config.in"
++source "package/rxtx/Config.in"
+ source "package/sane-backends/Config.in"
+ source "package/sam7-pgm-ng/Config.in"
+ source "package/sdparm/Config.in"
+Index: buildroot/package/rxtx/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/rxtx/Config.in 2015-02-18 09:06:45.577077357 +0100
+@@ -0,0 +1,12 @@
++config BR2_PACKAGE_RXTX
++ bool "rxtx"
++ depends on BR2_PACKAGE_CLASSPATH
++ help
++ RXTX is a Java library, using a native implementation (via JNI),
++ providing serial and parallel communication for the Java Development
++ Toolkit (JDK).
++
++ http://rxtx.qbang.org
++
++comment "rxtx needs classpath"
++ depends on !BR2_PACKAGE_RXTX
+Index: buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch 2015-02-18 08:49:35.103967048 +0100
+@@ -0,0 +1,90 @@
++--- rxtx-2.1-7r2/src/I2CImp.c.orig 2004-10-17 16:23:02.000000000 +0200
+++++ rxtx-2.1-7r2/src/I2CImp.c 2006-10-26 21:25:32.000000000 +0200
++@@ -87,6 +87,7 @@
++ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
++ #endif /* !__FreeBSD__ */
++ #if defined(__linux__)
+++#if 0
++ /* Lets let people who upgraded kernels know they may have problems */
++ if (uname (&name) == -1)
++ {
++@@ -98,6 +99,7 @@
++ fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
++ getchar();
++ }
+++#endif
++ #endif /* __linux__ */
++ #endif /* WIN32 */
++ }
++--- rxtx-2.1-7r2/src/RawImp.c.orig 2004-10-16 18:20:35.000000000 +0200
+++++ rxtx-2.1-7r2/src/RawImp.c 2006-10-26 21:25:59.000000000 +0200
++@@ -231,6 +231,7 @@
++ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
++ #endif /* !__FreeBSD__ */
++ #if defined(__linux__)
+++#if 0
++ /* Lets let people who upgraded kernels know they may have problems */
++ if (uname (&name) == -1)
++ {
++@@ -242,6 +243,7 @@
++ fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
++ getchar();
++ }
+++#endif
++ #endif /* __linux__ */
++ #endif /* WIN32 */
++ }
++--- rxtx-2.1-7r2/src/RS485Imp.c.orig 2004-10-16 18:20:35.000000000 +0200
+++++ rxtx-2.1-7r2/src/RS485Imp.c 2006-10-26 21:26:23.000000000 +0200
++@@ -87,6 +87,7 @@
++ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
++ #endif /* !__FreeBSD__ */
++ #if defined(__linux__)
+++#if 0
++ /* Lets let people who upgraded kernels know they may have problems */
++ if (uname (&name) == -1)
++ {
++@@ -98,6 +99,7 @@
++ fprintf(stderr, "\n\n\nRXTX WARNING: This library was compiled to run with OS release %s and you are currently running OS release %s. In some cases this can be a problem. Try recompiling RXTX if you notice strange behavior. If you just compiled RXTX make sure /usr/include/linux is a symbolic link to the include files that came with the kernel source and not an older copy.\n\n\npress enter to continue\n",UTS_RELEASE,name.release);
++ getchar();
++ }
+++#endif
++ #endif /* __linux__ */
++ #endif /* WIN32 */
++ }
++--- rxtx-2.1-7r2/src/SerialImp.c.orig 2006-01-29 23:19:04.000000000 +0100
+++++ rxtx-2.1-7r2/src/SerialImp.c 2006-10-26 21:26:59.000000000 +0200
++@@ -280,6 +280,7 @@
++ gettimeofday(&seloop, NULL);
++ #endif /* DEBUG_TIMING */
++ #if defined(DEBUG) && defined(__linux__)
+++#if 0
++ /* Lets let people who upgraded kernels know they may have problems */
++ if (uname (&name) == -1)
++ {
++@@ -295,6 +296,7 @@
++ getchar();
++ }
++ LEAVE( "RXTXPort:Initialize" );
+++#endif
++ #endif /* DEBUG && __linux__ */
++ }
++
++--- rxtx-2.1-7r2/src/SerialImp.cpp.orig 2004-10-12 10:59:27.000000000 +0200
+++++ rxtx-2.1-7r2/src/SerialImp.cpp 2006-10-26 21:27:44.000000000 +0200
++@@ -102,6 +102,7 @@
++ if( !handler.sa_handler ) signal( SIGIO, SIG_IGN );
++ #endif /* !__FreeBSD__ */
++ #ifdef DEBUG
+++#if 0
++ /* Lets let people who upgraded kernels know they may have problems */
++ if (uname (&name) == -1)
++ {
++@@ -114,6 +115,7 @@
++ name.release);
++ getchar();
++ }
+++#endif
++ #endif /* DEBUG */
++ #endif /* __BEOS__ */
++ #endif /* WIN32 */
+Index: buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch 2015-02-18 08:49:35.103967048 +0100
+@@ -0,0 +1,38 @@
++--- rxtx-2.1-7r2/configure.ori 2006-01-30 05:37:40.000000000 +0100
+++++ rxtx-2.1-7r2/configure 2011-02-27 00:15:04.000000000 +0100
++@@ -21541,7 +21541,7 @@ Linux)
++ CFLAGS=$CFLAGS" -D__need_timespec"
++ case $JAVA_VERSION in
++
++- 1.2*|1.3*|1.4*|1.5*)
+++ 1.2*|1.3*|1.4*|1.5*|1.6*)
++ #fix_parameters $JPATH/jre/lib/javax.comm.properties
++ CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
++ JHOME=$JPATH"/jre/lib/ext"
++@@ -21611,7 +21611,7 @@ Linux)
++ TARGETLIB="\$(target_triplet)/librxtxSerial.la \
++ \$(target_triplet)/librxtxParallel.la"
++ case $JAVA_VERSION in
++- 1.2*|1.3*|1.4*|1.5*)
+++ 1.2*|1.3*|1.4*|1.5*|1.6*)
++ #fix_parameters $JPATH/jre/lib/javax.comm.properties
++ CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
++ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
++@@ -21747,7 +21747,7 @@ BeOS)
++
++ WIN32)
++ case $JAVA_VERSION in
++- 1.2*|1.3*|1.4*|1.5*)
+++ 1.2*|1.3*|1.4*|1.5*|1.6*)
++ CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
++ JHOME=$JPATH"/jre/lib/ext"
++ ;;
++@@ -21799,7 +21799,7 @@ Solaris*)
++ CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
++
++ case $JAVA_VERSION in
++- 1.2*|1.3*|1.4*|1.5*)
+++ 1.2*|1.3*|1.4*|1.5*|1.6*)
++ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
++ ;;
++ 1.1*)
+Index: buildroot/package/rxtx/rxtx.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/rxtx/rxtx.mk 2015-02-18 08:59:46.274997681 +0100
+@@ -0,0 +1,14 @@
++################################################################################
++#
++# rxtx
++#
++################################################################################
++
++RXTX_VERSION = 2.1-7r2
++RXTX_SITE = http://rxtx.qbang.org/pub/rxtx/
++RXTX_SOURCE = rxtx-$(RXTX_VERSION).tgz
++RXTX_DEPENDENCIES = classpath
++
++RXTX_INSTALL_TARGET_OPTS = RXTX_PATH=$(TARGET_DIR)/usr/lib/classpath JHOME=$(TARGET_DIR)/usr/lib install
++
++$(eval $(autotools-package))
diff --git a/patches/buildroot/2015.02/018-armadeus-add-pcidebug-package.patch b/patches/buildroot/2015.02/018-armadeus-add-pcidebug-package.patch
new file mode 100644
index 0000000..88e1ef2
--- /dev/null
+++ b/patches/buildroot/2015.02/018-armadeus-add-pcidebug-package.patch
@@ -0,0 +1,61 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2015-02-18 09:14:28.467372230 +0100
++++ buildroot/package/Config.in 2015-02-18 09:36:09.873825541 +0100
+@@ -344,6 +344,7 @@
+ source "package/owfs/Config.in"
+ source "package/owl-linux/Config.in"
+ source "package/parted/Config.in"
++source "package/pci_debug/Config.in"
+ source "package/pciutils/Config.in"
+ source "package/picocom/Config.in"
+ source "package/read-edid/Config.in"
+Index: buildroot/package/pci_debug/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/pci_debug/Config.in 2015-02-18 09:43:45.860087739 +0100
+@@ -0,0 +1,14 @@
++config BR2_PACKAGE_PCI_DEBUG
++ bool "pcidebug"
++ select BR2_PACKAGE_READLINE
++ help
++ PCI debug registers interface.
++
++ This tool provides a debug interface for reading and writing to PCI
++ registers via the device base address registers (BARs). The tool uses
++ the PCI resource nodes automatically created by recent Linux kernels.
++
++ This tool uses readline (and ncurses) so it will autoselect it.
++
++ Written by D. W. Hawkins :
++ http://www.ovro.caltech.edu/%7Edwh/correlator/pdf/altera_pcie.zip
+Index: buildroot/package/pci_debug/pci_debug.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/pci_debug/pci_debug.mk 2015-02-18 10:01:50.657466829 +0100
+@@ -0,0 +1,25 @@
++################################################################################
++#
++# pci_debug
++#
++################################################################################
++
++PCI_DEBUG_VERSION = 2012.03
++PCI_DEBUG_SITE = http://www.ovro.caltech.edu/%7Edwh/correlator/pdf/
++PCI_DEBUG_SOURCE = altera_pcie.zip
++#PCI_DEBUG_LICENSE = ????
++PCI_DEBUG_DEPENDENCIES = readline
++
++define PCI_DEBUG_EXTRACT_CMDS
++ unzip $(DL_DIR)/$(PCI_DEBUG_SOURCE) -d $(@D)
++endef
++
++define PCI_DEBUG_BUILD_CMDS
++ $(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" -C $(@D)/code/pci_debug/
++endef
++
++define PCI_DEBUG_INSTALL_TARGET_CMDS
++ $(INSTALL) -m 755 $(@D)/code/pci_debug/pci_debug $(TARGET_DIR)/usr/sbin/
++endef
++
++$(eval $(generic-package))
diff --git a/patches/buildroot/2015.02/cleanup_buildroot.sh b/patches/buildroot/2015.02/cleanup_buildroot.sh
index 035822d..93c8826 100755
--- a/patches/buildroot/2015.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2015.02/cleanup_buildroot.sh
@@ -67,6 +67,8 @@ rm -rf buildroot/package/multimedia/fsl-mm-codeclib/fsl-mm-codeclib.mk
rm -rf buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
rm -rf buildroot/package/owfs/Config.in
rm -rf buildroot/package/owfs/owfs.mk
+rm -rf buildroot/package/pci_debug/Config.in
+rm -rf buildroot/package/pci_debug/pci_debug.mk
rm -rf buildroot/package/python-pygame/Config.in
rm -rf buildroot/package/python-wx/Config.in
rm -rf buildroot/package/python-wx/python-wx-001-fix_wxconfig.patch
@@ -84,6 +86,10 @@ rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-set_user_settings_path.patch
rm -rf buildroot/package/qtcreator/qtcreator.mk
rm -rf buildroot/package/quake-pak/Config.in
rm -rf buildroot/package/quake-pak/quake-pak.mk
+rm -rf buildroot/package/rxtx/Config.in
+rm -rf buildroot/package/rxtx/rxtx-2.1-7r2-001-remove-warning.patch
+rm -rf buildroot/package/rxtx/rxtx-2.1-7r2-fix-java-1.6.patch
+rm -rf buildroot/package/rxtx/rxtx.mk
rm -rf buildroot/package/sam7-pgm-ng/Config.in
rm -rf buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
rm -rf buildroot/package/sdl_water/Config.in
diff --git a/target/linux/debug/imxssi/imx51regs.h b/target/linux/debug/imxssi/imx51regs.h
index bf67e4f..b6790dc 120000
--- a/target/linux/debug/imxssi/imx51regs.h
+++ b/target/linux/debug/imxssi/imx51regs.h
@@ -1 +1 @@
-../imxregs/imx51regs.h
\ No newline at end of file
+../imxregs/imx5regs.h
\ No newline at end of file
diff --git a/target/linux/debug/pci_debug/Makefile b/target/linux/debug/pci_debug/Makefile
deleted file mode 100644
index b8db211..0000000
--- a/target/linux/debug/pci_debug/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-ARMADEUS_BASE_DIR=../../../..
--include $(ARMADEUS_BASE_DIR)/Makefile.in
-
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
-CFLAGS = -Wall
-LDFLAGS += -lreadline -lcurses
-INSTALL_DIR = $(ARMADEUS_ROOTFS_DIR)/usr/bin/
-
-default: pci_debug
-
-pci_debug: pci_debug.c
-
diff --git a/target/linux/debug/pci_debug/pci_debug.c b/target/linux/debug/pci_debug/pci_debug.c
deleted file mode 100644
index f746840..0000000
--- a/target/linux/debug/pci_debug/pci_debug.c
+++ /dev/null
@@ -1,752 +0,0 @@
-/* pci_debug.c
- *
- * 6/21/2010 D. W. Hawkins
- *
- * PCI debug registers interface.
- *
- * This tool provides a debug interface for reading and writing
- * to PCI registers via the device base address registers (BARs).
- * The tool uses the PCI resource nodes automatically created
- * by recently Linux kernels.
- *
- * The readline library is used for the command line interface
- * so that up-arrow command recall works. Command-line history
- * is not implemented. Use -lreadline -lcurses when building.
- *
- * ----------------------------------------------------------------
- */
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <signal.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <byteswap.h>
-
-/* Readline support */
-#include <readline/readline.h>
-#include <readline/history.h>
-
-/* PCI device */
-typedef struct {
- /* Base address region */
- unsigned int bar;
-
- /* Slot info */
- unsigned int domain;
- unsigned int bus;
- unsigned int slot;
- unsigned int function;
-
- /* Resource filename */
- char filename[100];
-
- /* File descriptor of the resource */
- int fd;
-
- /* Memory mapped resource */
- unsigned char *maddr;
- unsigned int size;
- unsigned int offset;
-
- /* PCI physical address */
- unsigned int phys;
-
- /* Address to pass to read/write (includes offset) */
- unsigned char *addr;
-} device_t;
-
-void display_help(device_t *dev);
-void parse_command(device_t *dev);
-int process_command(device_t *dev, char *cmd);
-int change_mem(device_t *dev, char *cmd);
-int fill_mem(device_t *dev, char *cmd);
-int display_mem(device_t *dev, char *cmd);
-int change_endian(device_t *dev, char *cmd);
-
-/* Endian read/write mode */
-static int big_endian = 0;
-
-/* Low-level access functions */
-static void
-write_8(
- device_t *dev,
- unsigned int addr,
- unsigned char data);
-
-static unsigned char
-read_8(
- device_t *dev,
- unsigned int addr);
-
-static void
-write_le16(
- device_t *dev,
- unsigned int addr,
- unsigned short int data);
-
-static unsigned short int
-read_le16(
- device_t *dev,
- unsigned int addr);
-
-static void
-write_be16(
- device_t *dev,
- unsigned int addr,
- unsigned short int data);
-
-static unsigned short int
-read_be16(
- device_t *dev,
- unsigned int addr);
-
-static void
-write_le32(
- device_t *dev,
- unsigned int addr,
- unsigned int data);
-
-static unsigned int
-read_le32(
- device_t *dev,
- unsigned int addr);
-
-static void
-write_be32(
- device_t *dev,
- unsigned int addr,
- unsigned int data);
-
-static unsigned int
-read_be32(
- device_t *dev,
- unsigned int addr);
-
-/* Usage */
-static void show_usage()
-{
- printf("\nUsage: pci_debug -s <device>\n"\
- " -h Help (this message)\n"\
- " -s <device> Slot/device (as per lspci)\n" \
- " -b <BAR> Base address region (BAR) to access, eg. 0 for BAR0\n\n");
-}
-
-int main(int argc, char *argv[])
-{
- int opt;
- char *slot = 0;
- int status;
- struct stat statbuf;
- device_t device;
- device_t *dev = &device;
-
- /* Clear the structure fields */
- memset(dev, 0, sizeof(device_t));
-
- while ((opt = getopt(argc, argv, "b:hs:")) != -1) {
- switch (opt) {
- case 'b':
- /* Defaults to BAR0 if not provided */
- dev->bar = atoi(optarg);
- break;
- case 'h':
- show_usage();
- return -1;
- case 's':
- slot = optarg;
- break;
- default:
- show_usage();
- return -1;
- }
- }
- if (slot == 0) {
- show_usage();
- return -1;
- }
-
- /* ------------------------------------------------------------
- * Open and map the PCI region
- * -----------------------------------------------...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2015-02-17 18:49:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 284dabfa6fd4e4f98346b78a4f8b0ef15f163e90 (commit)
via b7a40eeb8bb42e07121b21f88fadbad501f15fa5 (commit)
from feca58933b2ffe4936d3bc18fe91545f06b03c74 (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 284dabfa6fd4e4f98346b78a4f8b0ef15f163e90
Author: Gaetan Hug <gh...@in...>
Date: Tue Feb 17 17:46:28 2015 +0100
[LINUX] 3.18+: APF28: fixes bug in PWM period computation
commit b7a40eeb8bb42e07121b21f88fadbad501f15fa5
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 17 16:56:24 2015 +0100
[LINUX] all board: move 3.18 support to 3.18.7
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 +-
buildroot/configs/apf28mainline_defconfig | 4 +-
buildroot/configs/apf51mainline_defconfig | 4 +-
...nux-3.18.5.config => apf27-linux-3.18.7.config} | 0
...nux-3.18.5.config => apf28-linux-3.18.7.config} | 0
...nux-3.18.5.config => apf51-linux-3.18.7.config} | 0
...inux-3.18.3.config => apf6-linux-3.18.7.config} | 0
patches/linux/{3.18.5 => 3.18.7} | 0
...g-pwm-mxs-fixes-bug-in-period-computation.patch | 56 ++++++++++++++++++++
...g-pwm-mxs-fixes-bug-in-period-computation.patch | 56 ++++++++++++++++++++
10 files changed, 118 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.18.5.config => apf27-linux-3.18.7.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.18.5.config => apf28-linux-3.18.7.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.18.5.config => apf51-linux-3.18.7.config} (100%)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.18.3.config => apf6-linux-3.18.7.config} (100%)
rename patches/linux/{3.18.5 => 3.18.7} (100%)
create mode 100644 patches/linux/3.18/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch
create mode 100644 patches/linux/3.19/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 1e42fde..3f9f215 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.5"
+BR2_DEFAULT_KERNEL_VERSION="3.18.7"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -34,7 +34,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.7"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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"
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index b116a53..177b113 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.5"
+BR2_DEFAULT_KERNEL_VERSION="3.18.7"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -35,7 +35,7 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.7"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index b2c3f31..223901b 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -7,7 +7,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.5"
+BR2_DEFAULT_KERNEL_VERSION="3.18.7"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -97,7 +97,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.7"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.5.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.18.5.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.18.7.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.18.5.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.18.5.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.18.7.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.5.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.18.5.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.18.7.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.3.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.18.3.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.18.7.config
diff --git a/patches/linux/3.18.5 b/patches/linux/3.18.7
similarity index 100%
rename from patches/linux/3.18.5
rename to patches/linux/3.18.7
diff --git a/patches/linux/3.18/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch b/patches/linux/3.18/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch
new file mode 100644
index 0000000..453edad
--- /dev/null
+++ b/patches/linux/3.18/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch
@@ -0,0 +1,56 @@
+Date: Tue, 27 Jan 2015 14:37:42 +0100
+From: Gaetan Hug <gh...@in...>
+To: Armadeus Forum ML <arm...@li...>,
+ <lin...@vg...>
+Subject: [Armadeus-forum] Found bug in pwm-mxs.c
+
+Hello folks,
+
+ I found a bug in the pwm-mxs.c driver for the i.MX28 platform.
+
+ The driver computes from the desired period which clock divider it
+should be using. This computation assumes that the link between the
+register value and the actual divider value is raising 2 to the power of
+the registry value.
+
+ div = 1 << regvalue
+
+ This is true only for the first 5 values out of 8. Next values are
+64, 256 and, 1024.
+ This affects only the user only if he requests a period > 0.04369s.
+ I solved this by replacing the computation of the divider value with
+a lookup table.
+
+ If I should provide it in a different manner for it to be included in
+the kernel, please let me know.
+
+Best regards
+
+Gaetan Hug
+
+------
+
+Index: linux-3.18.5/drivers/pwm/pwm-mxs.c
+===================================================================
+--- linux-3.18.5.orig/drivers/pwm/pwm-mxs.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-3.18.5/drivers/pwm/pwm-mxs.c 2015-02-17 17:14:54.082954410 +0100
+@@ -51,16 +51,17 @@
+ unsigned int period_cycles, duty_cycles;
+ unsigned long rate;
+ unsigned long long c;
++ unsigned const int cdiv[PERIOD_CDIV_MAX] = {1, 2, 4, 8, 16, 64, 256, 1024};
+
+ rate = clk_get_rate(mxs->clk);
+ while (1) {
+- c = rate / (1 << div);
++ c = rate / cdiv[div];
+ c = c * period_ns;
+ do_div(c, 1000000000);
+ if (c < PERIOD_PERIOD_MAX)
+ break;
+ div++;
+- if (div > PERIOD_CDIV_MAX)
++ if (div >= PERIOD_CDIV_MAX)
+ return -EINVAL;
+ }
+
diff --git a/patches/linux/3.19/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch b/patches/linux/3.19/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch
new file mode 100644
index 0000000..453edad
--- /dev/null
+++ b/patches/linux/3.19/0447-induct-hug-pwm-mxs-fixes-bug-in-period-computation.patch
@@ -0,0 +1,56 @@
+Date: Tue, 27 Jan 2015 14:37:42 +0100
+From: Gaetan Hug <gh...@in...>
+To: Armadeus Forum ML <arm...@li...>,
+ <lin...@vg...>
+Subject: [Armadeus-forum] Found bug in pwm-mxs.c
+
+Hello folks,
+
+ I found a bug in the pwm-mxs.c driver for the i.MX28 platform.
+
+ The driver computes from the desired period which clock divider it
+should be using. This computation assumes that the link between the
+register value and the actual divider value is raising 2 to the power of
+the registry value.
+
+ div = 1 << regvalue
+
+ This is true only for the first 5 values out of 8. Next values are
+64, 256 and, 1024.
+ This affects only the user only if he requests a period > 0.04369s.
+ I solved this by replacing the computation of the divider value with
+a lookup table.
+
+ If I should provide it in a different manner for it to be included in
+the kernel, please let me know.
+
+Best regards
+
+Gaetan Hug
+
+------
+
+Index: linux-3.18.5/drivers/pwm/pwm-mxs.c
+===================================================================
+--- linux-3.18.5.orig/drivers/pwm/pwm-mxs.c 2015-01-30 02:41:03.000000000 +0100
++++ linux-3.18.5/drivers/pwm/pwm-mxs.c 2015-02-17 17:14:54.082954410 +0100
+@@ -51,16 +51,17 @@
+ unsigned int period_cycles, duty_cycles;
+ unsigned long rate;
+ unsigned long long c;
++ unsigned const int cdiv[PERIOD_CDIV_MAX] = {1, 2, 4, 8, 16, 64, 256, 1024};
+
+ rate = clk_get_rate(mxs->clk);
+ while (1) {
+- c = rate / (1 << div);
++ c = rate / cdiv[div];
+ c = c * period_ns;
+ do_div(c, 1000000000);
+ if (c < PERIOD_PERIOD_MAX)
+ break;
+ div++;
+- if (div > PERIOD_CDIV_MAX)
++ if (div >= PERIOD_CDIV_MAX)
+ return -EINVAL;
+ }
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2015-02-17 12:02: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 feca58933b2ffe4936d3bc18fe91545f06b03c74 (commit)
from d676e0fd7dca8d76a8a660b3236d92f71afd4283 (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 feca58933b2ffe4936d3bc18fe91545f06b03c74
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 17 13:02:25 2015 +0100
[BUILDROOT] Fixes patches/buildroot/2013.11/cleanup_buildroot.sh
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2013.11/cleanup_buildroot.sh | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index cb0d861..0c58531 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -4,7 +4,8 @@
# #
# Removes files added or modified through patches. #
# #
-# This file has been automatically generated. #
+# This file has been automatically generated by: #
+# scripts/quiltify.sh export #
# #
####################################################
@@ -56,7 +57,6 @@ rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib-fixes_build_on_imx27.patc
rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib.mk
rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
rm -rf buildroot/package/freescale-imx/vivante-gpu-sdk/Config.in
-rm -rf buildroot/package/freescale-imx/vivante-gpu-sdk/vivante-gpu-sdk
rm -rf buildroot/package/freescale-imx/vivante-gpu-sdk/vivante-gpu-sdk.mk
rm -rf buildroot/package/gnash/Config.in
rm -rf buildroot/package/gnash/gnash.mk
@@ -78,6 +78,11 @@ rm -rf buildroot/package/imx-test/Config.in
rm -rf buildroot/package/imx-test/imx-test-01_fixes.patch
rm -rf buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
rm -rf buildroot/package/imx-test/imx-test.mk
+rm -rf buildroot/package/imx-usb-loader/Config.in
+rm -rf buildroot/package/imx-usb-loader/Config.in.host
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.patch
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/joe/Config.in
rm -rf buildroot/package/joe/joe-3.7-disable-j0-j1-y0-y1-math-functions.patch
rm -rf buildroot/package/joe/joe.mk
@@ -130,8 +135,6 @@ rm -rf buildroot/package/qtcreator/qtcreator.mk
rm -rf buildroot/package/qt/qt.mk
rm -rf buildroot/package/quake-pak/Config.in
rm -rf buildroot/package/quake-pak/quake-pak.mk
-rm -rf buildroot/package/rtnet/Config.in
-rm -rf buildroot/package/rtnet/rtnet.mk
rm -rf buildroot/package/sam7-pgm-ng/Config.in
rm -rf buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
rm -rf buildroot/package/sdlquake/Config.in
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2015-02-17 11:57:42
|
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 d676e0fd7dca8d76a8a660b3236d92f71afd4283 (commit)
via a19318da6b57bcbebb247eb85b50308f763e201c (commit)
from 42af699433cf6a0e63dd50139f78f84352a621ee (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 d676e0fd7dca8d76a8a660b3236d92f71afd4283
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 17 12:56:52 2015 +0100
[TOOLS] scripts/quiltify.sh: add more info when creating cleanup_buildroot.sh
commit a19318da6b57bcbebb247eb85b50308f763e201c
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 17 12:55:20 2015 +0100
[BUILDROOT] 2013.11+: add gnuboy package
-----------------------------------------------------------------------
Summary of changes:
.../2013.11/016-armadeus-add-gnuboy-package.patch | 80 ++++++++++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 48 ++++++------
.../016-armadeus-add-gnuboy-package.tocheck | 80 ++++++++++++++++++++
.../016-armadeus-add-gnuboy-package.tocheck | 80 ++++++++++++++++++++
scripts/quiltify.sh | 3 +-
5 files changed, 266 insertions(+), 25 deletions(-)
create mode 100644 patches/buildroot/2013.11/016-armadeus-add-gnuboy-package.patch
create mode 100644 patches/buildroot/2014.11/016-armadeus-add-gnuboy-package.tocheck
create mode 100644 patches/buildroot/2015.02/016-armadeus-add-gnuboy-package.tocheck
diff --git a/patches/buildroot/2013.11/016-armadeus-add-gnuboy-package.patch b/patches/buildroot/2013.11/016-armadeus-add-gnuboy-package.patch
new file mode 100644
index 0000000..b35fccf
--- /dev/null
+++ b/patches/buildroot/2013.11/016-armadeus-add-gnuboy-package.patch
@@ -0,0 +1,80 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2015-02-17 10:36:30.371633079 +0100
++++ buildroot/package/Config.in 2015-02-17 12:43:19.369364057 +0100
+@@ -166,6 +166,7 @@
+ menu "Games"
+ source "package/e-uae/Config.in"
+ source "package/doom-wad/Config.in"
++source "package/gnuboy/Config.in"
+ source "package/gnuchess/Config.in"
+ source "package/lbreakout2/Config.in"
+ source "package/ltris/Config.in"
+Index: buildroot/package/gnuboy/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gnuboy/Config.in 2015-02-17 12:11:19.047841714 +0100
+@@ -0,0 +1,12 @@
++config BR2_PACKAGE_GNUBOY
++ bool "gnuboy"
++ help
++ gnuboy is a portable Gameboy emulator.
++
++ By default it uses Framebuffer backend but if SDL is selected it will
++ detect it.
++
++ Executable is named accordingly to chosen backend, ex: fbgnuboy or
++ sdlgnuboy.
++
++ http://code.google.com/p/gnuboy/
+Index: buildroot/package/gnuboy/gnuboy.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gnuboy/gnuboy.mk 2015-02-17 12:15:09.672981702 +0100
+@@ -0,0 +1,46 @@
++################################################################################
++#
++# gnuboy
++#
++################################################################################
++
++GNUBOY_SITE = http://gnuboy.googlecode.com/svn/trunk/
++GNUBOY_SITE_METHOD = svn
++GNUBOY_VERSION = 201
++GNUBOY_LICENSE = GPLv2+
++GNUBOY_LICENSE_FILES = COPYING
++
++GNUBOY_CONF_OPT += \
++ --enable-arch=$(ARCH) \
++ --disable-asm \
++ --with-fb
++
++GNUBOY_CFLAGS = $(TARGET_CFLAGS)
++
++ifeq ($(BR2_PACKAGE_SDL),y)
++GNUBOY_CONF_OPT += --with-sdl
++GNUBOY_DEPENDENCIES += sdl
++else
++GNUBOY_CONF_OPT += --without-sdl
++GNUBOY_CFLAGS += -DGNUBOY_NO_SCREENSHOT
++endif
++
++GNUBOY_CONF_ENV += \
++ CFLAGS="$(GNUBOY_CFLAGS)"
++
++define GNUBOY_FIX_CONFIGURE
++ chmod a+x $(@D)/configure
++endef
++
++GNUBOY_POST_EXTRACT_HOOKS += GNUBOY_FIX_CONFIGURE
++
++# While the configuration system uses autoconf, the Makefiles are
++# hand-written ???????? and do not use automake. Therefore, we have to hack
++# around their deficiencies by passing installation paths.
++GNUBOY_INSTALL_TARGET_OPT = \
++ INSTALL="$(INSTALL)" \
++ prefix=$(TARGET_DIR)/usr \
++ exec_prefix=$(TARGET_DIR)/usr \
++ install
++
++$(eval $(autotools-package))
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index b5743f7..cb0d861 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -8,37 +8,37 @@
# #
####################################################
-rm -rf buildroot/Makefile
rm -rf buildroot/arch/Config.in.arm
rm -rf buildroot/boot/uboot/Config.in
rm -rf buildroot/boot/uboot/uboot.mk
rm -rf buildroot/linux/Config.ext.in
rm -rf buildroot/linux/linux-ext-xenomai.mk
-rm -rf buildroot/package/Config.in
-rm -rf buildroot/package/Config.in.host
-rm -rf buildroot/package/agg/Config.in
+rm -rf buildroot/Makefile
rm -rf buildroot/package/agg/agg.mk
+rm -rf buildroot/package/agg/Config.in
rm -rf buildroot/package/alsa-utils/alsa-utils.mk
-rm -rf buildroot/package/beremiz/Config.in
rm -rf buildroot/package/beremiz/beremiz.mk
+rm -rf buildroot/package/beremiz/Config.in
rm -rf buildroot/package/beremiz/host-beremiz-fix_compare_and_swap_problem_to_be_removed_with_kernel_3.1.patch
-rm -rf buildroot/package/bluez3-libs/Config.in
-rm -rf buildroot/package/bluez3-libs/bluez3-libs.mk
-rm -rf buildroot/package/bluez3-utils/Config.in
-rm -rf buildroot/package/bluez3-utils/bluez3-utils.mk
rm -rf buildroot/package/bluez3/bluetooth.default
rm -rf buildroot/package/bluez3/bluez-pand-devup.sh
rm -rf buildroot/package/bluez3/bluez-utils-bluepin.sh
rm -rf buildroot/package/bluez3/hcid.conf
-rm -rf buildroot/package/bluez3/rfcomm-getty
+rm -rf buildroot/package/bluez3-libs/bluez3-libs.mk
+rm -rf buildroot/package/bluez3-libs/Config.in
rm -rf buildroot/package/bluez3/rfcomm.conf
+rm -rf buildroot/package/bluez3/rfcomm-getty
+rm -rf buildroot/package/bluez3-utils/bluez3-utils.mk
+rm -rf buildroot/package/bluez3-utils/Config.in
rm -rf buildroot/package/busybox/1.19.4/busybox-1.19.4-stty_add_rs485_config.patch
rm -rf buildroot/package/busybox/1.20.2/busybox-1.20.2-stty_add_rs485_config.patch
rm -rf buildroot/package/busybox/1.21.0/busybox-1.21.0-ifplugd-netlink-buffer.patch
rm -rf buildroot/package/busybox/1.21.0/busybox-1.21.0-stty_add_rs485_config.patch
-rm -rf buildroot/package/busybox/Config.in
rm -rf buildroot/package/busybox/busybox.mk
+rm -rf buildroot/package/busybox/Config.in
rm -rf buildroot/package/busybox/snapshot/busybox-stty_add_rs485_config.patch
+rm -rf buildroot/package/Config.in
+rm -rf buildroot/package/Config.in.host
rm -rf buildroot/package/cunit/Config.in
rm -rf buildroot/package/cunit/cunit.mk
rm -rf buildroot/package/cwiid/Config.in
@@ -46,28 +46,31 @@ rm -rf buildroot/package/cwiid/cwiid-0.6.00-configure_ac_remove_gtk_dependancy.p
rm -rf buildroot/package/cwiid/cwiid-0.6.00-makefile_in-remove_wmgui.patch
rm -rf buildroot/package/cwiid/cwiid.mk
rm -rf buildroot/package/dbus/dbus.mk
+rm -rf buildroot/package/e2fsprogs/e2fsprogs-allow-e4defrag-build-against-old-kernel-headers.patch
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
-rm -rf buildroot/package/e2fsprogs/e2fsprogs-allow-e4defrag-build-against-old-kernel-headers.patch
rm -rf buildroot/package/flite/Config.in
rm -rf buildroot/package/flite/flite.mk
rm -rf buildroot/package/freescale-imx/Config.in
rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib-fixes_build_on_imx27.patch
-rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib.mk
+rm -rf buildroot/package/freescale-imx/imx-lib/imx-lib-mxc_ipu_hl_li_v4l2_fixes.patch
rm -rf buildroot/package/freescale-imx/vivante-gpu-sdk/Config.in
+rm -rf buildroot/package/freescale-imx/vivante-gpu-sdk/vivante-gpu-sdk
rm -rf buildroot/package/freescale-imx/vivante-gpu-sdk/vivante-gpu-sdk.mk
rm -rf buildroot/package/gnash/Config.in
rm -rf buildroot/package/gnash/gnash.mk
rm -rf buildroot/package/gnokii/Config.in
rm -rf buildroot/package/gnokii/gnokii.mk
+rm -rf buildroot/package/gnuboy/Config.in
+rm -rf buildroot/package/gnuboy/gnuboy.mk
rm -rf buildroot/package/gpm/Config.in
rm -rf buildroot/package/gpm/gpm-1.20.7-removes_obsolete_functions.patch
rm -rf buildroot/package/gpm/gpm-1.20.7-removes_strip_from_install.patch
rm -rf buildroot/package/gpm/gpm.mk
rm -rf buildroot/package/gpsd/Config.in
-rm -rf buildroot/package/gpsd/S50gpsd
rm -rf buildroot/package/gpsd/gpsd.mk
+rm -rf buildroot/package/gpsd/S50gpsd
rm -rf buildroot/package/gsmmux/Config.in
rm -rf buildroot/package/gsmmux/gsmmux.mk
rm -rf buildroot/package/imagemagick/imagemagick.mk
@@ -75,11 +78,6 @@ rm -rf buildroot/package/imx-test/Config.in
rm -rf buildroot/package/imx-test/imx-test-01_fixes.patch
rm -rf buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
rm -rf buildroot/package/imx-test/imx-test.mk
-rm -rf buildroot/package/imx-usb-loader/Config.in
-rm -rf buildroot/package/imx-usb-loader/Config.in.host
-rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
-rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.patch
-rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/joe/Config.in
rm -rf buildroot/package/joe/joe-3.7-disable-j0-j1-y0-y1-math-functions.patch
rm -rf buildroot/package/joe/joe.mk
@@ -113,16 +111,15 @@ rm -rf buildroot/package/owfs/Config.in
rm -rf buildroot/package/owfs/owfs.mk
rm -rf buildroot/package/pkg-generic.mk
rm -rf buildroot/package/poppler/poppler.mk
+rm -rf buildroot/package/python/Config.in
rm -rf buildroot/package/python-pygame/Config.in
+rm -rf buildroot/package/python/python.mk
rm -rf buildroot/package/python-wx/Config.in
rm -rf buildroot/package/python-wx/python-wx-001-fix_wxconfig.patch
rm -rf buildroot/package/python-wx/python-wx.mk
-rm -rf buildroot/package/python/Config.in
-rm -rf buildroot/package/python/python.mk
rm -rf buildroot/package/pywebradio/Config.in
rm -rf buildroot/package/pywebradio/pywebradio.mk
rm -rf buildroot/package/qt/Config.in
-rm -rf buildroot/package/qt/qt.mk
rm -rf buildroot/package/qtcreator/Config.in.host
rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-create_gdb_server_script.patch
rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-create_remote_console_open_menu.patch
@@ -130,15 +127,18 @@ rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-create_toolchains_file.patch
rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-create_user_settings_file.patch
rm -rf buildroot/package/qtcreator/qtcreator-2.2.1-set_user_settings_path.patch
rm -rf buildroot/package/qtcreator/qtcreator.mk
+rm -rf buildroot/package/qt/qt.mk
rm -rf buildroot/package/quake-pak/Config.in
rm -rf buildroot/package/quake-pak/quake-pak.mk
+rm -rf buildroot/package/rtnet/Config.in
+rm -rf buildroot/package/rtnet/rtnet.mk
rm -rf buildroot/package/sam7-pgm-ng/Config.in
rm -rf buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
-rm -rf buildroot/package/sdl_water/Config.in
-rm -rf buildroot/package/sdl_water/sdl_water.mk
rm -rf buildroot/package/sdlquake/Config.in
rm -rf buildroot/package/sdlquake/sdlquake-1.0.9-no-x86-asm.patch.arm
rm -rf buildroot/package/sdlquake/sdlquake.mk
+rm -rf buildroot/package/sdl_water/Config.in
+rm -rf buildroot/package/sdl_water/sdl_water.mk
rm -rf buildroot/package/shiboken/Config.in
rm -rf buildroot/package/shiboken/shiboken-1.2.2-compile_module_with_host_shiboken_generator.patch
rm -rf buildroot/package/shiboken/shiboken-1.2.2-fix_pthread_cancel_compile.patch
diff --git a/patches/buildroot/2014.11/016-armadeus-add-gnuboy-package.tocheck b/patches/buildroot/2014.11/016-armadeus-add-gnuboy-package.tocheck
new file mode 100644
index 0000000..b35fccf
--- /dev/null
+++ b/patches/buildroot/2014.11/016-armadeus-add-gnuboy-package.tocheck
@@ -0,0 +1,80 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2015-02-17 10:36:30.371633079 +0100
++++ buildroot/package/Config.in 2015-02-17 12:43:19.369364057 +0100
+@@ -166,6 +166,7 @@
+ menu "Games"
+ source "package/e-uae/Config.in"
+ source "package/doom-wad/Config.in"
++source "package/gnuboy/Config.in"
+ source "package/gnuchess/Config.in"
+ source "package/lbreakout2/Config.in"
+ source "package/ltris/Config.in"
+Index: buildroot/package/gnuboy/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gnuboy/Config.in 2015-02-17 12:11:19.047841714 +0100
+@@ -0,0 +1,12 @@
++config BR2_PACKAGE_GNUBOY
++ bool "gnuboy"
++ help
++ gnuboy is a portable Gameboy emulator.
++
++ By default it uses Framebuffer backend but if SDL is selected it will
++ detect it.
++
++ Executable is named accordingly to chosen backend, ex: fbgnuboy or
++ sdlgnuboy.
++
++ http://code.google.com/p/gnuboy/
+Index: buildroot/package/gnuboy/gnuboy.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gnuboy/gnuboy.mk 2015-02-17 12:15:09.672981702 +0100
+@@ -0,0 +1,46 @@
++################################################################################
++#
++# gnuboy
++#
++################################################################################
++
++GNUBOY_SITE = http://gnuboy.googlecode.com/svn/trunk/
++GNUBOY_SITE_METHOD = svn
++GNUBOY_VERSION = 201
++GNUBOY_LICENSE = GPLv2+
++GNUBOY_LICENSE_FILES = COPYING
++
++GNUBOY_CONF_OPT += \
++ --enable-arch=$(ARCH) \
++ --disable-asm \
++ --with-fb
++
++GNUBOY_CFLAGS = $(TARGET_CFLAGS)
++
++ifeq ($(BR2_PACKAGE_SDL),y)
++GNUBOY_CONF_OPT += --with-sdl
++GNUBOY_DEPENDENCIES += sdl
++else
++GNUBOY_CONF_OPT += --without-sdl
++GNUBOY_CFLAGS += -DGNUBOY_NO_SCREENSHOT
++endif
++
++GNUBOY_CONF_ENV += \
++ CFLAGS="$(GNUBOY_CFLAGS)"
++
++define GNUBOY_FIX_CONFIGURE
++ chmod a+x $(@D)/configure
++endef
++
++GNUBOY_POST_EXTRACT_HOOKS += GNUBOY_FIX_CONFIGURE
++
++# While the configuration system uses autoconf, the Makefiles are
++# hand-written ???????? and do not use automake. Therefore, we have to hack
++# around their deficiencies by passing installation paths.
++GNUBOY_INSTALL_TARGET_OPT = \
++ INSTALL="$(INSTALL)" \
++ prefix=$(TARGET_DIR)/usr \
++ exec_prefix=$(TARGET_DIR)/usr \
++ install
++
++$(eval $(autotools-package))
diff --git a/patches/buildroot/2015.02/016-armadeus-add-gnuboy-package.tocheck b/patches/buildroot/2015.02/016-armadeus-add-gnuboy-package.tocheck
new file mode 100644
index 0000000..b35fccf
--- /dev/null
+++ b/patches/buildroot/2015.02/016-armadeus-add-gnuboy-package.tocheck
@@ -0,0 +1,80 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2015-02-17 10:36:30.371633079 +0100
++++ buildroot/package/Config.in 2015-02-17 12:43:19.369364057 +0100
+@@ -166,6 +166,7 @@
+ menu "Games"
+ source "package/e-uae/Config.in"
+ source "package/doom-wad/Config.in"
++source "package/gnuboy/Config.in"
+ source "package/gnuchess/Config.in"
+ source "package/lbreakout2/Config.in"
+ source "package/ltris/Config.in"
+Index: buildroot/package/gnuboy/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gnuboy/Config.in 2015-02-17 12:11:19.047841714 +0100
+@@ -0,0 +1,12 @@
++config BR2_PACKAGE_GNUBOY
++ bool "gnuboy"
++ help
++ gnuboy is a portable Gameboy emulator.
++
++ By default it uses Framebuffer backend but if SDL is selected it will
++ detect it.
++
++ Executable is named accordingly to chosen backend, ex: fbgnuboy or
++ sdlgnuboy.
++
++ http://code.google.com/p/gnuboy/
+Index: buildroot/package/gnuboy/gnuboy.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gnuboy/gnuboy.mk 2015-02-17 12:15:09.672981702 +0100
+@@ -0,0 +1,46 @@
++################################################################################
++#
++# gnuboy
++#
++################################################################################
++
++GNUBOY_SITE = http://gnuboy.googlecode.com/svn/trunk/
++GNUBOY_SITE_METHOD = svn
++GNUBOY_VERSION = 201
++GNUBOY_LICENSE = GPLv2+
++GNUBOY_LICENSE_FILES = COPYING
++
++GNUBOY_CONF_OPT += \
++ --enable-arch=$(ARCH) \
++ --disable-asm \
++ --with-fb
++
++GNUBOY_CFLAGS = $(TARGET_CFLAGS)
++
++ifeq ($(BR2_PACKAGE_SDL),y)
++GNUBOY_CONF_OPT += --with-sdl
++GNUBOY_DEPENDENCIES += sdl
++else
++GNUBOY_CONF_OPT += --without-sdl
++GNUBOY_CFLAGS += -DGNUBOY_NO_SCREENSHOT
++endif
++
++GNUBOY_CONF_ENV += \
++ CFLAGS="$(GNUBOY_CFLAGS)"
++
++define GNUBOY_FIX_CONFIGURE
++ chmod a+x $(@D)/configure
++endef
++
++GNUBOY_POST_EXTRACT_HOOKS += GNUBOY_FIX_CONFIGURE
++
++# While the configuration system uses autoconf, the Makefiles are
++# hand-written ???????? and do not use automake. Therefore, we have to hack
++# around their deficiencies by passing installation paths.
++GNUBOY_INSTALL_TARGET_OPT = \
++ INSTALL="$(INSTALL)" \
++ prefix=$(TARGET_DIR)/usr \
++ exec_prefix=$(TARGET_DIR)/usr \
++ install
++
++$(eval $(autotools-package))
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 5329d1f..28ebccf 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -116,7 +116,8 @@ if [ "$1" == "export" ]; then
# #
# Removes files added or modified through patches. #
# #
- # This file has been automatically generated. #
+ # This file has been automatically generated by: #
+ # scripts/quiltify.sh export #
# #
####################################################
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2015-02-16 09:16:49
|
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 42af699433cf6a0e63dd50139f78f84352a621ee (commit)
from 948a3991cc1e6901d19a98c805a57ae71c305177 (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 42af699433cf6a0e63dd50139f78f84352a621ee
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Feb 16 10:16:32 2015 +0100
[BUILDROOT] Update buildroot patches for BR 2015.02
This has only been tested with an APF6.
To try BR 2015.02:
* change BR version in Makefile
* edit ARMADEUS_BUSYBOX_VERSION in Makefile.in (see the comments)
* edit RXTX_INSTALL_TARGET_OPTS in buildroot/package/armadeus/rxtx/rxtx.mk (see the comments)
* in BR menuconfig change
** BR2_PACKAGE_BUSYBOX_CONFIG to: $(ARMADEUS_PATH)/busybox.config
** root fs skeleton to default BR root fs skeleton
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
Makefile.in | 4 +-
buildroot/package/armadeus/rxtx/rxtx.mk | 4 +-
patches/buildroot/2015.02-rc2 | 1 +
.../2015.02/001-add_armadeus_device.patch | 25 +
.../002-add_armadeus_specific_packages.patch | 16 +
...us-gpsd-add-options-setting-in-menuconfig.patch | 48 +
.../2015.02/006-armadeus-add-owfs-package.patch | 55 ++
.../2015.02/007-armadeus-add-agg-package.patch | 74 ++
.../2015.02/008-armadeus-add-gnash-package.patch | 155 +++
.../009-armadeus-xc3sprog-new-package.patch | 108 +++
.../010-armadeus-sam7-pgm-ng-new-package.patch | 50 +
.../2015.02/011-armadeus-add-tk-package.patch | 72 ++
...12-armadeus-add-tkinter-support-to-python.patch | 50 +
.../014-armadeus-python-wx-add-package.patch | 115 +++
...rmadeus-gpu-vivante-sdk-new-package.patch.tofix | 134 +++
.../021-armadeus-add-sdl_water-package.patch | 59 ++
.../034-armadeus-add-slideshow-package.patch | 170 ++++
...add_support_for_custom_configuration_file.patch | 50 +
...072-armadeus-xenomai-download-adeos-patch.patch | 59 ++
.../buildroot/2015.02/072-xenomai-package.tofix | 222 +++++
...ai-add-configure-options-for-old-versions.patch | 37 +
...dependecy-evaluated-before-patching.patch.tofix | 23 +
.../buildroot/2015.02/081-adds_quake_package.patch | 159 +++
.../2015.02/083-pygame-armadeus_addons.patch | 43 +
...for_pld_asm_instruction_on_non_armv5_arch.patch | 22 +
.../107-armadeus-games-add-wolf4sdl-package.patch | 74 ++
.../buildroot/2015.02/110-bluez3-add_package.patch | 118 +++
patches/buildroot/2015.02/111-bluez3-hacks.patch | 198 ++++
.../2015.02/118-armadeus-snes9x-add-package.patch | 390 ++++++++
.../2015.02/121-target-arm926t_is_arm926ej-s.patch | 18 +
.../123-armadeus-pywebradio-add-package.patch | 48 +
.../buildroot/2015.02/124-e-uae-add_package.patch | 54 ++
...42-ncurses-fix_compilation_with_old_hosts.patch | 25 +
...-disable_ip_busybox_if_iproute2_buildroot.patch | 36 +
...fix_installation_bug_on_some_host_systems.patch | 18 +
...lection_even_when_custom_rootfs_is_chosen.patch | 49 +
.../buildroot/2015.02/172-gsmmux-add_package.patch | 88 ++
.../2015.02/176-imx-test-add_package.patch | 148 +++
...ag_build_against_old_kernel_headers.patch.tofix | 81 ++
.../2015.02/181-qtcreator-add_package.patch | 1002 ++++++++++++++++++++
.../182-uclibc-add_accept4_declaration_fix.patch | 0
...penwrt-uclibc-add-kernel_long-declaration.patch | 374 ++++++++
.../184-fsl-mm-codeclib-add_package.patch | 0
...nore-env_sectors-on-NOR-and-SPI-dataflash.patch | 81 ++
.../buildroot/2015.02/188-marble-add_package.patch | 358 +++++++
.../2015.02/189-dbus-fix_installation.patch | 22 +
.../buildroot/2015.02/197-cunit-add_package.patch | 49 +
.../2015.02/201-armadeus-add_gnokii.patch | 55 ++
.../204-wpa-supplicant-add-option-ieee80211w.patch | 34 +
...x-coreutils-stty-add-rs485-config-options.patch | 356 +++++++
.../2015.02/208-armadeus-add_beremiz.patch | 108 +++
.../2015.02/209-armadeus-add_matiec.patch | 73 ++
.../214-mplayer-fix-compilation.patch.tofix | 13 +
.../2015.02/219-shiboken-add_package.patch | 266 ++++++
.../221-v2-3-3-imx-usb-loader-new-package.patch | 291 ++++++
patches/buildroot/2015.02/cleanup_buildroot.sh | 126 +++
57 files changed, 6305 insertions(+), 5 deletions(-)
create mode 120000 patches/buildroot/2015.02-rc2
create mode 100644 patches/buildroot/2015.02/001-add_armadeus_device.patch
create mode 100644 patches/buildroot/2015.02/002-add_armadeus_specific_packages.patch
create mode 100644 patches/buildroot/2015.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
create mode 100644 patches/buildroot/2015.02/006-armadeus-add-owfs-package.patch
create mode 100644 patches/buildroot/2015.02/007-armadeus-add-agg-package.patch
create mode 100644 patches/buildroot/2015.02/008-armadeus-add-gnash-package.patch
create mode 100644 patches/buildroot/2015.02/009-armadeus-xc3sprog-new-package.patch
create mode 100644 patches/buildroot/2015.02/010-armadeus-sam7-pgm-ng-new-package.patch
create mode 100644 patches/buildroot/2015.02/011-armadeus-add-tk-package.patch
create mode 100644 patches/buildroot/2015.02/012-armadeus-add-tkinter-support-to-python.patch
create mode 100644 patches/buildroot/2015.02/014-armadeus-python-wx-add-package.patch
create mode 100644 patches/buildroot/2015.02/015-armadeus-gpu-vivante-sdk-new-package.patch.tofix
create mode 100644 patches/buildroot/2015.02/021-armadeus-add-sdl_water-package.patch
create mode 100644 patches/buildroot/2015.02/034-armadeus-add-slideshow-package.patch
create mode 100644 patches/buildroot/2015.02/050-U-Boot-add_support_for_custom_configuration_file.patch
create mode 100644 patches/buildroot/2015.02/072-armadeus-xenomai-download-adeos-patch.patch
create mode 100644 patches/buildroot/2015.02/072-xenomai-package.tofix
create mode 100644 patches/buildroot/2015.02/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
create mode 100644 patches/buildroot/2015.02/075-armadeus-pkg-generic-makes-dependecy-evaluated-before-patching.patch.tofix
create mode 100644 patches/buildroot/2015.02/081-adds_quake_package.patch
create mode 100644 patches/buildroot/2015.02/083-pygame-armadeus_addons.patch
create mode 100644 patches/buildroot/2015.02/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch
create mode 100644 patches/buildroot/2015.02/107-armadeus-games-add-wolf4sdl-package.patch
create mode 100644 patches/buildroot/2015.02/110-bluez3-add_package.patch
create mode 100644 patches/buildroot/2015.02/111-bluez3-hacks.patch
create mode 100644 patches/buildroot/2015.02/118-armadeus-snes9x-add-package.patch
create mode 100644 patches/buildroot/2015.02/121-target-arm926t_is_arm926ej-s.patch
create mode 100644 patches/buildroot/2015.02/123-armadeus-pywebradio-add-package.patch
create mode 100644 patches/buildroot/2015.02/124-e-uae-add_package.patch
create mode 100644 patches/buildroot/2015.02/142-ncurses-fix_compilation_with_old_hosts.patch
create mode 100644 patches/buildroot/2015.02/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
create mode 100644 patches/buildroot/2015.02/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch
create mode 100644 patches/buildroot/2015.02/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch
create mode 100644 patches/buildroot/2015.02/172-gsmmux-add_package.patch
create mode 100644 patches/buildroot/2015.02/176-imx-test-add_package.patch
create mode 100644 patches/buildroot/2015.02/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch.tofix
create mode 100644 patches/buildroot/2015.02/181-qtcreator-add_package.patch
copy patches/buildroot/{2013.11 => 2015.02}/182-uclibc-add_accept4_declaration_fix.patch (100%)
create mode 100644 patches/buildroot/2015.02/183-openwrt-uclibc-add-kernel_long-declaration.patch
copy patches/buildroot/{2013.05 => 2015.02}/184-fsl-mm-codeclib-add_package.patch (100%)
create mode 100644 patches/buildroot/2015.02/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
create mode 100644 patches/buildroot/2015.02/188-marble-add_package.patch
create mode 100644 patches/buildroot/2015.02/189-dbus-fix_installation.patch
create mode 100644 patches/buildroot/2015.02/197-cunit-add_package.patch
create mode 100644 patches/buildroot/2015.02/201-armadeus-add_gnokii.patch
create mode 100644 patches/buildroot/2015.02/204-wpa-supplicant-add-option-ieee80211w.patch
create mode 100644 patches/buildroot/2015.02/205-busybox-coreutils-stty-add-rs485-config-options.patch
create mode 100644 patches/buildroot/2015.02/208-armadeus-add_beremiz.patch
create mode 100644 patches/buildroot/2015.02/209-armadeus-add_matiec.patch
create mode 100644 patches/buildroot/2015.02/214-mplayer-fix-compilation.patch.tofix
create mode 100644 patches/buildroot/2015.02/219-shiboken-add_package.patch
create mode 100644 patches/buildroot/2015.02/221-v2-3-3-imx-usb-loader-new-package.patch
create mode 100755 patches/buildroot/2015.02/cleanup_buildroot.sh
diff --git a/Makefile b/Makefile
index 7caa775..655f659 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
#--- User configurable stuff:
-#BUILDROOT_VERSION:=2014.11
+#BUILDROOT_VERSION:=2015.02-rc2
BUILDROOT_VERSION:=2013.11
include ./Makefile.in
BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
diff --git a/Makefile.in b/Makefile.in
index 9bfc5d3..061fab9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,10 +42,10 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
ARMADEUS_LIBC_NAME=glibc
endif
-# Comment the following line with BR 2014.11
+# Comment the following line with BR 2015.02
ARMADEUS_BUSYBOX_VERSION:=$(shell echo $(BR2_BUSYBOX_VERSION))
-# Uncomment the following line with BR 2014.11
+# Uncomment the following line with BR 2015.02
#ARMADEUS_BUSYBOX_VERSION:=$(shell egrep "BUSYBOX_VERSION =" $(BUILDROOT_DIR)/package/busybox/busybox.mk 2>/dev/null | cut -d ' ' -f 3)
ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
diff --git a/buildroot/package/armadeus/rxtx/rxtx.mk b/buildroot/package/armadeus/rxtx/rxtx.mk
index 80656ea..ab4c104 100644
--- a/buildroot/package/armadeus/rxtx/rxtx.mk
+++ b/buildroot/package/armadeus/rxtx/rxtx.mk
@@ -8,10 +8,10 @@ RXTX_SOURCE = rxtx-$(RXTX_VERSION).tgz
RXTX_SITE = http://rxtx.qbang.org/pub/rxtx/
RXTX_DEPENDENCIES = classpath
-# Comment the following line with BR 2014.11
+# Comment the following line with BR 2015.02
RXTX_INSTALL_TARGET_OPT = RXTX_PATH=$(TARGET_DIR)/usr/lib/classpath JHOME=$(TARGET_DIR)/usr/lib install
-# Uncomment the following line with BR 2014.11
+# Uncomment the following line with BR 2015.02
#RXTX_INSTALL_TARGET_OPTS = RXTX_PATH=$(TARGET_DIR)/usr/lib/classpath JHOME=$(TARGET_DIR)/usr/lib install
ifeq ($(autotools-package), )
diff --git a/patches/buildroot/2015.02-rc2 b/patches/buildroot/2015.02-rc2
new file mode 120000
index 0000000..c5107b9
--- /dev/null
+++ b/patches/buildroot/2015.02-rc2
@@ -0,0 +1 @@
+2015.02
\ No newline at end of file
diff --git a/patches/buildroot/2015.02/001-add_armadeus_device.patch b/patches/buildroot/2015.02/001-add_armadeus_device.patch
new file mode 100644
index 0000000..eb373e6
--- /dev/null
+++ b/patches/buildroot/2015.02/001-add_armadeus_device.patch
@@ -0,0 +1,25 @@
+Add armadeus target specific menu to BR.
+
+Index: buildroot/Makefile
+===================================================================
+--- buildroot.orig/Makefile
++++ buildroot/Makefile
+@@ -386,6 +386,8 @@ ifneq ($(PACKAGE_OVERRIDE_FILE),)
+ -include $(PACKAGE_OVERRIDE_FILE)
+ endif
+
++include target/device/armadeus/Makefile.in
++
+ include $(sort $(wildcard package/*/*.mk))
+
+ include boot/common.mk
+Index: buildroot/system/Config.in
+===================================================================
+--- buildroot.orig/system/Config.in
++++ buildroot/system/Config.in
+@@ -433,4 +433,5 @@ config BR2_ROOTFS_POST_SCRIPT_ARGS
+ directory / images directory. The arguments in this option will be
+ passed *after* those.
+
++source "target/device/armadeus/Config.in"
+ endmenu
diff --git a/patches/buildroot/2015.02/002-add_armadeus_specific_packages.patch b/patches/buildroot/2015.02/002-add_armadeus_specific_packages.patch
new file mode 100644
index 0000000..49c7c8e
--- /dev/null
+++ b/patches/buildroot/2015.02/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 2012-02-21 16:43:29.000000000 +0100
++++ buildroot/package/Config.in 2012-02-21 16:43:56.000000000 +0100
+@@ -2,6 +2,9 @@
+
+ source "package/busybox/Config.in"
+
++# Armadeus specific
++source "package/armadeus/Config.in"
++
+ menu "Audio and video applications"
+ source "package/alsa-utils/Config.in"
+ source "package/aumix/Config.in"
diff --git a/patches/buildroot/2015.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch b/patches/buildroot/2015.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
new file mode 100644
index 0000000..a3cb160
--- /dev/null
+++ b/patches/buildroot/2015.02/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
@@ -0,0 +1,48 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/gpsd/Config.in
+===================================================================
+--- buildroot.orig/package/gpsd/Config.in
++++ buildroot/package/gpsd/Config.in
+@@ -26,6 +26,11 @@ config BR2_PACKAGE_GPSD_DEVICES
+ string "Where to look for GPSes"
+ default "/dev/ttyS1"
+
++config BR2_PACKAGE_GPSD_OPTIONS
++ string "Daemon options"
++ default ""
++ depends on BR2_PACKAGE_GPSD
++
+ menu "Features"
+
+ config BR2_PACKAGE_GPSD_CLIENT_DEBUG
+Index: buildroot/package/gpsd/gpsd.mk
+===================================================================
+--- buildroot.orig/package/gpsd/gpsd.mk
++++ buildroot/package/gpsd/gpsd.mk
+@@ -211,6 +211,7 @@ endef
+ define GPSD_INSTALL_INIT_SYSV
+ $(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd
+ $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd
++ $(SED) 's,^OTHER_OPTIONS=.*,OTHER_OPTIONS=$(BR2_PACKAGE_GPSD_OPTIONS),' $(TARGET_DIR)/etc/init.d/S50gpsd
+ endef
+
+ define GPSD_INSTALL_STAGING_CMDS
+Index: buildroot/package/gpsd/S50gpsd
+===================================================================
+--- buildroot.orig/package/gpsd/S50gpsd
++++ buildroot/package/gpsd/S50gpsd
+@@ -7,10 +7,12 @@ NAME=gpsd
+ DAEMON=/usr/sbin/$NAME
+ DEVICES=/dev/ttyS1
+ PIDFILE=/var/run/$NAME.pid
++OTHER_OPTIONS=
++DAEMON_OPTIONS="-P $PIDFILE $DEVICES $OTHER_OPTIONS"
+
+ start() {
+ echo -n "Starting $NAME: "
+- start-stop-daemon -S -q -p $PIDFILE --exec $DAEMON -- -P $PIDFILE $DEVICES && echo "OK" || echo "Failed"
++ start-stop-daemon -S -q -p $PIDFILE --exec $DAEMON -- $DAEMON_OPTIONS && echo "OK" || echo "Failed"
+ }
+ stop() {
+ echo -n "Stopping $NAME: "
diff --git a/patches/buildroot/2015.02/006-armadeus-add-owfs-package.patch b/patches/buildroot/2015.02/006-armadeus-add-owfs-package.patch
new file mode 100644
index 0000000..09209ee
--- /dev/null
+++ b/patches/buildroot/2015.02/006-armadeus-add-owfs-package.patch
@@ -0,0 +1,55 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/owfs/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/owfs/Config.in
+@@ -0,0 +1,11 @@
++config BR2_PACKAGE_OWFS
++ bool "owfs"
++ select BR2_PACKAGE_LIBFUSE
++ help
++ OWFS is an easy way to use the powerful 1-wire system of
++ Dallas/Maxim.
++ OWFS is a simple and flexible program to monitor and control the
++ physical environment. You can write scripts to read temperature,
++ flash lights, write to an LCD, log and graph, ...
++
++ http://owfs.org/
+Index: buildroot/package/owfs/owfs.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/owfs/owfs.mk
+@@ -0,0 +1,20 @@
++###############################################################################
++#
++# owfs
++#
++###############################################################################
++
++OWFS_SITE = http://downloads.sourceforge.net/owfs/
++OWFS_VERSION = 2.9p2
++OWFS_DEPENDENCIES = libfuse
++OWFS_CONF_OPTS += --disable-owhttpd --disable-owftpd --disable-swig
++OWFS_INSTALL_STAGING = YES
++
++ifeq ($(BR2_PACKAGE_LIBUSB),y)
++OWFS_DEPENDENCIES += libusb
++OWFS_CONF_OPTS += --enable-usb
++else
++OWFS_CONF_OPTS += --disable-usb
++endif
++
++$(eval $(autotools-package))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -353,6 +353,7 @@ endif
+ source "package/open2300/Config.in"
+ source "package/openocd/Config.in"
+ source "package/openpowerlink/Config.in"
++ source "package/owfs/Config.in"
+ source "package/owl-linux/Config.in"
+ source "package/parted/Config.in"
+ source "package/pciutils/Config.in"
diff --git a/patches/buildroot/2015.02/007-armadeus-add-agg-package.patch b/patches/buildroot/2015.02/007-armadeus-add-agg-package.patch
new file mode 100644
index 0000000..90ea886
--- /dev/null
+++ b/patches/buildroot/2015.02/007-armadeus-add-agg-package.patch
@@ -0,0 +1,74 @@
+Needed by Gnash.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/agg/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/agg/Config.in
+@@ -0,0 +1,8 @@
++config BR2_PACKAGE_AGG
++ bool "agg"
++ help
++ The Anti-Grain Geometry project. A High Quality 2D Graphics Rendering
++ Engine for C++.
++ We use the SDL backend by default.
++
++ http://www.antigrain.com/index.html
+Index: buildroot/package/agg/agg.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/agg/agg.mk
+@@ -0,0 +1,40 @@
++###############################################################################
++#
++# agg
++#
++###############################################################################
++
++AGG_VERSION = 2.5
++AGG_SITE = http://www.antigrain.com/
++AGG_LICENSE = GPLv3+
++AGG_LICENSE_FILES = COPYING
++AGG_INSTALL_STAGING = YES
++AGG_AUTORECONF = YES
++
++AGG_DEPENDENCIES = sdl
++
++AGG_CONF_OPTS = \
++ --with-sdl-prefix=$(STAGING_DIR)/usr \
++ --disable-sdltest
++
++ifeq ($(BR2_PACKAGE_SDL_X11),)
++AGG_CONF_OPTS += \
++ --with-x=NO \
++ --disable-examples # examples require X11
++endif
++
++ifeq ($(BR2_PACKAGE_FREETYPE),y)
++AGG_DEPENDENCIES += freetype
++AGG_CONF_OPTS += --enable-freetype
++else
++AGG_CONF_OPTS += --disable-freetype
++endif
++
++define AGG_CREATE_MISSING_FILES
++ touch $(@D)/NEWS $(@D)/AUTHORS $(@D)/README
++# Fixes reconfiguring with recent automake:
++ $(SED) 's/AM_C_PROTOTYPES//' $(@D)/configure.in
++endef
++AGG_POST_EXTRACT_HOOKS += AGG_CREATE_MISSING_FILES
++
++$(eval $(autotools-package))
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -627,6 +627,7 @@ endmenu
+
+ menu "Graphics"
+ source "package/adwaita-icon-theme/Config.in"
++ source "package/agg/Config.in"
+ source "package/atk/Config.in"
+ source "package/cairo/Config.in"
+ source "package/fltk/Config.in"
diff --git a/patches/buildroot/2015.02/008-armadeus-add-gnash-package.patch b/patches/buildroot/2015.02/008-armadeus-add-gnash-package.patch
new file mode 100644
index 0000000..89a7b14
--- /dev/null
+++ b/patches/buildroot/2015.02/008-armadeus-add-gnash-package.patch
@@ -0,0 +1,155 @@
+WIP.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/gnash/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/gnash/Config.in
+@@ -0,0 +1,11 @@
++config BR2_PACKAGE_GNASH
++ bool "gnash"
++ select BR2_PACKAGE_BOOST
++ select BR2_PACKAGE_BOOST_IOSTREAMS
++ select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
++ select BR2_PACKAGE_BOOST_THREAD
++
++ help
++ GNU Gnash is the GNU Flash movie player.
++
++ http://www.gnu.org/software/gnash/
+Index: buildroot/package/gnash/gnash.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/gnash/gnash.mk
+@@ -0,0 +1,118 @@
++###############################################################################
++#
++# gnash
++#
++###############################################################################
++
++# inspired from LFS
++
++GNASH_VERSION = 0.8.10
++GNASH_SOURCE = gnash-$(GNASH_VERSION).tar.bz2
++GNASH_SITE = http://ftp.gnu.org/pub/gnu/gnash/$(GNASH_VERSION)/
++GNASH_LICENSE = LGPLv2.1+
++GNASH_LICENSE_FILES = COPYING
++
++GNASH_CONF_OPTS = --without-gconf --disable-extensions --disable-jemalloc --disable-cygnal
++GNASH_CONF_OPTS += --disable-nls # To fix
++GNASH_DEPENDENCIES += gettext # even if NLS disabled...
++
++GNASH_CONF_OPTS += --with-ltdl-incl=$(STAGING_DIR)/usr/include/ --with-ltdl-lib=$(STAGING_DIR)/usr/lib
++GNASH_DEPENDENCIES += libtool
++
++define GNASH_FIXES_BOOST_LINK
++ $(SED) '/^LIBS/s/\(.*\)/\1 -lboost_system/' \
++ $(@D)/gui/Makefile.in $(@D)/utilities/Makefile.in
++endef
++GNASH_POST_CONFIGURE_HOOKS += GNASH_FIXES_BOOST_LINK
++
++ifeq ($(BR2_PACKAGE_GNASH_SHOW_PROPERTIES),y)
++# to check
++GNASH_DEPENDENCIES += pango
++GNASH_CONF_OPTS += --with-pango-incl=$(STAGING_DIR)/usr/include/pango --with-pango-lib=$(STAGING_DIR)/usr/lib \
++else
++GNASH_CONF_OPTS += --disable-swftree
++endif
++
++ifeq ($(BR2_PACKAGE_QT),)
++#(accept: gtk|kde3|qt4|fltk|sdl|aqua|fb|qtopia3|qtopia4|dump|aos4|haiku)
++#GNASH_CONF_OPT += --disable-gui ??
++GNASH_CONF_OPTS += --enable-gui=sdl
++GNASH_CONF_OPTS += --with-sdl-incl=$(STAGING_DIR)/usr/include/SDL --with-sdl-lib=$(STAGING_DIR)/usr/lib
++GNASH_DEPENDENCIES += sdl
++else
++GNASH_CONF_OPTS += --enable-gui=qt4
++GNASH_DEPENDENCIES += qt
++endif
++
++GNASH_CONF_OPTS += --enable-media=none
++
++GNASH_CONF_OPTS += --enable-sound=none
++
++GNASH_CONF_OPTS += --enable-renderer=agg
++GNASH_CONF_OPTS += --with-agg-incl=$(STAGING_DIR)/usr/include/agg2 --with-agg-lib=$(STAGING_DIR)/usr/lib
++GNASH_DEPENDENCIES += agg
++
++GNASH_CONF_OPTS += --with-curl-incl=$(STAGING_DIR)/usr/include
++GNASH_DEPENDENCIES += libcurl
++
++GNASH_CONF_OPTS += --with-boost-incl=$(STAGING_DIR)/usr/include/boost --with-boost-lib=$(STAGING_DIR)/usr/lib
++GNASH_DEPENDENCIES += boost
++
++# What for ?
++GNASH_CONF_OPTS += --with-jpeg-incl=$(STAGING_DIR)/usr/include --with-jpeg-lib=$(STAGING_DIR)/usr/lib
++GNASH_DEPENDENCIES += libjpeg
++
++# What for ?
++GNASH_CONF_OPTS += --with-ungif-incl=$(STAGING_DIR)/usr/include --with-ungif-lib=$(STAGING_DIR)/usr/lib
++GNASH_DEPENDENCIES += libungif
++
++# Needed otherwise utilities/ fails to build
++GNASH_CONF_OPTS += --with-png-incl=$(STAGING_DIR)/usr/include --with-png-lib=$(STAGING_DIR)/usr/lib
++GNASH_DEPENDENCIES += libpng
++
++# Otherwise build fails in FreetypeGlyphsProvider.cpp
++GNASH_DEPENDENCIES += freetype
++GNASH_CONF_OPTS += --with-freetype-incl=$(STAGING_DIR)/usr/include/freetype2 --with-freetype-lib=$(STAGING_DIR)/usr/lib
++
++# --enable-sound=sdl|ahi|mkit
++# Use the specified sound handler (default=sdl)
++# --enable-media=handler Enable media handling support using the specified
++# handler: gst, ffmpeg or none (no sound) [gst]
++# --enable-input Enable support for the specified input devices for
++# the framebuffer GUI
++# (default=ps2mouse|ps2keyboard|events|touchscreen)
++# --enable-renderer Enable support for the specified renderers
++# (agg|cairo|opengl|openvg|all, default=all)
++
++
++$(eval $(autotools-package))
++
++# RECOMMENDED: No PNG library development package installed!
++# Gnash will be built without support for dynamic loading of
++# PNG files.
++# Install it from http://www.libpng.org
++# or .deb users: apt-get install libpng12-dev
++# or .rpm users: yum install libpng-devel
++# RECOMMENDED: If you install the CURL library, Gnash will be able to
++# display remote content (streaming from URLs) using CURL.
++# Install libcurl from http://curl.haxx.se/libcurl
++# or .deb users: apt-get install libcurl4-gnutls-dev
++# or maybe : apt-get install libcurl-dev
++# or .rpm users: yum install curl-devel
++# RECOMMENDED: If you install the Speex library, Gnash will be able to
++# decoded Speex encoded audio in FLV files.
++# Install libspeex from http://speex.org
++# or .deb users: apt-get install libspeex-dev
++# or .rpm users: yum install speex-devel
++# RECOMMENDED: If you install the Speex DSP library, Gnash will be able to
++# resample Speex encoded audio in FLV files.
++# Install libspeexdsp from http://speex.org
++# or .deb users: apt-get install libspeexdsp-dev
++# or .rpm users: yum install speex-devel
++# RECOMMENDED: You need to have the fontconfig development packages
++# installed to use device fonts.
++# Install it from http://fontconfig.org
++# or .deb users: apt-get install libfontconfig1-dev
++# or .rpm users: yum install fontconfig-devel
++# It may still be possible to configure without fontconfig.
++
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -14,6 +14,7 @@ menu "Audio and video applications"
+ source "package/ffmpeg/Config.in"
+ source "package/flac/Config.in"
+ source "package/flite/Config.in"
++ source "package/gnash/Config.in"
+ source "package/gstreamer/Config.in"
+ source "package/gstreamer1/Config.in"
+ source "package/jack2/Config.in"
diff --git a/patches/buildroot/2015.02/009-armadeus-xc3sprog-new-package.patch b/patches/buildroot/2015.02/009-armadeus-xc3sprog-new-package.patch
new file mode 100644
index 0000000..0dc11db
--- /dev/null
+++ b/patches/buildroot/2015.02/009-armadeus-xc3sprog-new-package.patch
@@ -0,0 +1,108 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -397,6 +397,7 @@ endif
+ source "package/usbutils/Config.in"
+ source "package/w_scan/Config.in"
+ source "package/wipe/Config.in"
++ source "package/xc3sprog/Config.in"
+ source "package/xorriso/Config.in"
+ endmenu
+
+Index: buildroot/package/xc3sprog/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/xc3sprog/Config.in
+@@ -0,0 +1,13 @@
++config BR2_PACKAGE_XC3SPROG
++ bool "xc3sprog"
++ depends on BR2_INSTALL_LIBSTDCPP
++ depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi
++ select BR2_PACKAGE_LIBFTDI
++ help
++ xc3sprog is a suite of utilities for programming Xilinx FPGAs, CPLDs,
++ and EEPROMs with the Xilinx Parallel Cable and other JTAG adapters.
++
++ http://xc3sprog.sourceforge.net/
++
++comment "xc3sprog needs a toolchain w/ C++, threads"
++ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
+Index: buildroot/package/xc3sprog/xc3sprog.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/xc3sprog/xc3sprog.mk
+@@ -0,0 +1,19 @@
++################################################################################
++#
++# xc3sprog
++#
++################################################################################
++
++XC3SPROG_VERSION = 760
++XC3SPROG_SITE = https://svn.code.sf.net/p/xc3sprog/code/trunk
++XC3SPROG_SITE_METHOD = svn
++X3CSPROG_LICENSE = GPLv2+
++X3CSPROG_LICENSE_FILES = COPYING
++X3CSPROG_DEPENDENCIES = libftdi
++
++XC3SPROG_CONF_OPTS += \
++ -DVERSION_STRING=0.0-svn$(XC3SPROG_VERSION) \
++ -DCMAKE_EXE_LINKER_FLAGS=-lpthread
++
++$(eval $(cmake-package))
++$(eval $(host-cmake-package))
+Index: buildroot/package/xc3sprog/xc3sprog-fixes-version-detection.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/xc3sprog/xc3sprog-fixes-version-detection.patch
+@@ -0,0 +1,30 @@
++Do not launch 'svn info' if sources directory is not a svn checkout.
++This prevents cmake to fail at configuration stage when building package in BR.
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++--- xc3sprog-760.org/CMakeLists.txt 2013-12-09 16:42:37.000000000 +0100
+++++ xc3sprog-760/CMakeLists.txt 2014-04-28 11:45:20.899827274 +0200
++@@ -35,13 +35,15 @@
++ if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
++ set(VERSION_STRING "${xc3sprog_VERSION_MAJOR}.${xc3sprog_VERSION_MINOR}-git")
++ else(EXISTS ${PROJECT_SOURCE_DIR}/.git)
++- FIND_PACKAGE(Subversion)
++- IF(Subversion_FOUND)
++- Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
++- set(VERSION_STRING "${xc3sprog_VERSION_MAJOR}.${xc3sprog_VERSION_MINOR}-svn${Project_WC_REVISION}")
++- ELSE(Subversion_FOUND)
++- set(VERSION_STRING "unknown")
++- ENDIF(Subversion_FOUND)
+++ IF(EXISTS ${PROJECT_SOURCE_DIR}/.svn)
+++ FIND_PACKAGE(Subversion)
+++ IF(Subversion_FOUND)
+++ Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)
+++ set(VERSION_STRING "${xc3sprog_VERSION_MAJOR}.${xc3sprog_VERSION_MINOR}-svn${Project_WC_REVISION}")
+++ ELSE(Subversion_FOUND)
+++ set(VERSION_STRING "unknown")
+++ ENDIF(Subversion_FOUND)
+++ ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/.svn)
++ endif(EXISTS ${PROJECT_SOURCE_DIR}/.git)
++
++ # Create suffix to eventually install inlib64
+Index: buildroot/package/xc3sprog/xc3sprog-fixes-xc2c32a_qf32-jtag-id.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/xc3sprog/xc3sprog-fixes-xc2c32a_qf32-jtag-id.patch
+@@ -0,0 +1,14 @@
++Specific for Armadeus.
++
++Signed-off-by: Fabien Marteau <fab...@ar...>
++
++--- xc3sprog-760.org/devlist.txt 2013-12-09 16:42:42.000000000 +0100
+++++ xc3sprog-760/devlist.txt 2014-04-28 17:36:03.780173296 +0200
++@@ -167,6 +167,7 @@
++ 06c1d093 8 0x1 XC2C32_PC44/64
++ 06c1b093 8 0x1 XC2C32A_QF32
++ 06d1d093 8 0x1 XC2C32A_PC44
+++06e19093 8 0x1 XC2C32A_QF32
++ 06e1b093 8 0x1 XC2C32A_CP56
++ 06e1c093 8 0x1 XC2C32A_VQ44
++ 06e1d093 8 0x1 XC2C32A_PC44/64
diff --git a/patches/buildroot/2015.02/010-armadeus-sam7-pgm-ng-new-package.patch b/patches/buildroot/2015.02/010-armadeus-sam7-pgm-ng-new-package.patch
new file mode 100644
index 0000000..b9aa169
--- /dev/null
+++ b/patches/buildroot/2015.02/010-armadeus-sam7-pgm-ng-new-package.patch
@@ -0,0 +1,50 @@
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -365,6 +365,7 @@ endif
+ source "package/rng-tools/Config.in"
+ source "package/rpi-userland/Config.in"
+ source "package/sane-backends/Config.in"
++ source "package/sam7-pgm-ng/Config.in"
+ source "package/sdparm/Config.in"
+ source "package/setserial/Config.in"
+ source "package/sg3_utils/Config.in"
+Index: buildroot/package/sam7-pgm-ng/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/sam7-pgm-ng/Config.in
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_SAM7_PGM_NG
++ bool "sam7_pgm-ng"
++ help
++ Armadeus fork of SAM7_PGM (with some cleanup).
++
++ https://github.com/Martoni/SAM7_PGM-NG
++ http://www.pjrc.com/arm/sam7_pgm/
+Index: buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
+@@ -0,0 +1,21 @@
++################################################################################
++#
++# sam7-pgm-ng
++#
++################################################################################
++
++SAM7_PGM_NG_VERSION = 3a837382ae2deda6796aedd594be18503ad8ad96
++SAM7_PGM_NG_SITE = https://github.com/Martoni/SAM7_PGM-NG
++SAM7_PGM_NG_SITE_METHOD = git
++SAM7_PGM_NG_LICENSE = GPLv2+
++SAM7_PGM_NG_LICENSE_FILES = COPYING
++
++define SAM7_PGM_NG_BUILD_CMDS
++ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
++endef
++
++define SAM7_PGM_NG_INSTALL_TARGET_CMDS
++ $(INSTALL) -D -m 0755 $(@D)/sam7_pgm $(TARGET_DIR)/usr/bin/sam7_pgm
++endef
++
++$(eval $(generic-package))
diff --git a/patches/buildroot/2015.02/011-armadeus-add-tk-package.patch b/patches/buildroot/2015.02/011-armadeus-add-tk-package.patch
new file mode 100644
index 0000000..1595f3d
--- /dev/null
+++ b/patches/buildroot/2015.02/011-armadeus-add-tk-package.patch
@@ -0,0 +1,72 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -538,6 +538,7 @@ if BR2_PACKAGE_TCL
+ menu "tcl libraries/modules"
+ source "package/expect/Config.in"
+ source "package/tcllib/Config.in"
++ source "package/tk/Config.in"
+ endmenu
+ endif
+ endmenu
+Index: buildroot/package/tk/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/tk/Config.in
+@@ -0,0 +1,18 @@
++config BR2_PACKAGE_TK
++ bool "tk"
++ depends on BR2_PACKAGE_TCL
++ depends on BR2_PACKAGE_XORG7
++ help
++ Tk is a GUI toolkit for Tcl
++
++ http://www.tcl.tk/
++
++config BR2_PACKAGE_TK_NO_DEMOS
++ bool "remove demos"
++ default y
++ depends on BR2_PACKAGE_TK
++ help
++ Remove Tk demo files from target rootfs
++
++comment "Tk needs X.org, Tcl"
++ depends on !BR2_PACKAGE_TCL || !BR2_PACKAGE_XORG7
+Index: buildroot/package/tk/tk.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/tk/tk.mk
+@@ -0,0 +1,30 @@
++################################################################################
++#
++# tk
++#
++################################################################################
++
++TK_VERSION_MAJOR = 8.4
++TK_VERSION = $(TK_VERSION_MAJOR).20
++TK_SOURCE = tk$(TK_VERSION)-src.tar.gz
++TK_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TK_VERSION)
++TK_LICENSE = tcl license
++TK_LICENSE_FILES = license.terms
++TK_SUBDIR = unix
++TK_INSTALL_STAGING = YES
++TK_DEPENDENCIES = tcl xlib_libX11
++
++# shouldn't be $(STAGING_DIR) ?
++TK_CONF_OPTS = \
++ --with-tcl=$(TARGET_DIR)/usr/lib \
++ --with-x \
++ --x-includes=$(STAGING_DIR)/usr/include/X11
++
++ifeq ($(BR2_PACKAGE_TK_NO_DEMOS),y)
++define TCL_REMOVE_DEMOS
++ rm -rf $(TARGET_DIR)/usr/lib/tk$(TK_VERSION_MAJOR)/demos
++endef
++TK_POST_INSTALL_TARGET_HOOKS += TK_REMOVE_DEMOS
++endif
++
++$(eval $(autotools-package))
diff --git a/patches/buildroot/2015.02/012-armadeus-add-tkinter-support-to-python.patch b/patches/buildroot/2015.02/012-armadeus-add-tkinter-support-to-python.patch
new file mode 100644
index 0000000..ec8856a
--- /dev/null
+++ b/patches/buildroot/2015.02/012-armadeus-add-tkinter-support-to-python.patch
@@ -0,0 +1,50 @@
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/python/Config.in
+===================================================================
+--- buildroot.orig/package/python/Config.in
++++ buildroot/package/python/Config.in
+@@ -79,6 +79,18 @@ config BR2_PACKAGE_PYTHON_SSL
+ help
+ _ssl module for Python (required for https in urllib etc).
+
++config BR2_PACKAGE_PYTHON_TKINTER
++ depends on BR2_PACKAGE_XORG7
++ depends on BR2_PACKAGE_TCL
++ select BR2_PACKAGE_TK
++ bool "tkinter"
++ help
++ Tkinter module for Python.
++
++comment "tkinter needs a X server and tcl"
++ depends on !BR2_PACKAGE_XORG7
++ depends on !BR2_PACKAGE_TCL
++
+ config BR2_PACKAGE_PYTHON_UNICODEDATA
+ bool "unicodedata module"
+ default y
+Index: buildroot/package/python/python.mk
+===================================================================
+--- buildroot.orig/package/python/python.mk
++++ buildroot/package/python/python.mk
+@@ -118,6 +118,12 @@ ifeq ($(BR2_PACKAGE_PYTHON_HASHLIB),y)
+ PYTHON_DEPENDENCIES += openssl
+ endif
+
++ifeq ($(BR2_PACKAGE_PYTHON_TKINTER),y)
++PYTHON_DEPENDENCIES += tk
++else
++PYTHON_CONF_OPTS += --disable-tk
++endif
++
+ PYTHON_CONF_ENV += \
+ ac_cv_have_long_long_format=yes \
+ ac_cv_file__dev_ptmx=yes \
+@@ -132,7 +138,6 @@ PYTHON_CONF_OPTS += \
+ --disable-test-modules \
+ --disable-lib2to3 \
+ --disable-gdbm \
+- --disable-tk \
+ --disable-nis \
+ --disable-dbm \
+ --disable-pyo-build
diff --git a/patches/buildroot/2015.02/014-armadeus-python-wx-add-package.patch b/patches/buildroot/2015.02/014-armadeus-python-wx-add-package.patch
new file mode 100644
index 0000000..72696e3
--- /dev/null
+++ b/patches/buildroot/2015.02/014-armadeus-python-wx-add-package.patch
@@ -0,0 +1,115 @@
+Author: Edouard Tisserant
+Slightly modified by JB
+
+Index: buildroot/package/python-wx/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/python-wx/Config.in
+@@ -0,0 +1,14 @@
++config BR2_PACKAGE_PYTHON_WX
++ bool "wxPython"
++ depends on BR2_PACKAGE_PYTHON
++ depends on BR2_PACKAGE_LIBGTK2
++
++ help
++ The wxPython module is a blending of the wxWidgets C++ class library
++ with the Python programming language.
++ By default GTK backend is used (requires X.org).
++
++ http://wxpython.org/
++
++comment "wxPython needs python, GTK"
++ depends on !BR2_PACKAGE_PYTHON || !BR2_PACKAGE_LIBGTK2
+Index: buildroot/package/python-wx/python-wx.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/python-wx/python-wx.mk
+@@ -0,0 +1,59 @@
++################################################################################
++#
++# python-wx
++#
++################################################################################
++
++# 2.8 is the most used version (BR will prefer latest one)
++PYTHON_WX_VERSION = 2.8.12.1
++PYTHON_WX_SOURCE = wxPython-src-$(PYTHON_WX_VERSION).tar.bz2
++PYTHON_WX_SITE = http://downloads.sourceforge.net/project/wxpython/wxPython/$(PYTHON_WX_VERSION)
++PYTHON_WX_LICENSE = LGPL
++PYTHON_WX_LICENSE_FILES = docs/licence.txt
++PYTHON_WX_INSTALL_STAGING = YES
++PYTHON_WX_DEPENDENCIES = python libgtk2
++# Why ? ->
++PYTHON_WX_CONF_OPTS = --enable-monolithic
++
++# Autotools are used to build wxGTK embedded in wxPython sources, and then we use
++# HOOKS to install Python wrappers.
++# However wxWidget/GTK has a lot of configure options not proposed here...
++
++define PYTHON_WX_PYSETUP
++ (cd $(@D)/wxPython; \
++ CC="$(TARGET_CC)" \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ LDSHARED="$(TARGET_CROSS)gcc -shared" \
++ CROSS_COMPILING=yes \
++ _python_sysroot=$(STAGING_DIR) \
++ _python_srcdir=$(BUILD_DIR)/python$(PYTHON_VERSION) \
++ _python_prefix=/usr \
++ _python_exec_prefix=/usr \
++ $(HOST_DIR)/usr/bin/python setup.py build \
++ WX_CONFIG="$(STAGING_DIR)/usr/bin/wx-config \
++ --prefix=$(STAGING_DIR)/usr" \
++ BUILD_GLCANVAS=0 \
++ BUILD_STC=0 \
++ BUILD_GIZMOS=0 \
++ )
++endef
++PYTHON_WX_POST_INSTALL_STAGING_HOOKS += PYTHON_WX_PYSETUP
++
++# Useful ? ->
++define PYTHON_WX_PYTHON_WRAPPER_STAGING_INSTALL
++ (cd $(@D)/wxPython; \
++ $(HOST_DIR)/usr/bin/python setup.py install \
++ --prefix=$(STAGING_DIR)/usr)
++endef
++
++PYTHON_WX_POST_INSTALL_STAGING_HOOKS += PYTHON_WX_PYTHON_WRAPPER_STAGING_INSTALL
++
++define PYTHON_WX_PYTHON_WRAPPER_TARGET_INSTALL
++ (cd $(@D)/wxPython; \
++ $(HOST_DIR)/usr/bin/python setup.py install \
++ --prefix=$(TARGET_DIR)/usr)
++endef
++
++PYTHON_WX_POST_INSTALL_TARGET_HOOKS += PYTHON_WX_PYTHON_WRAPPER_TARGET_INSTALL
++
++$(eval $(autotools-package))
+Index: buildroot/package/python-wx/python-wx-001-fix_wxconfig.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/python-wx/python-wx-001-fix_wxconfig.patch
+@@ -0,0 +1,12 @@
++diff -purN python-wxgtk-2.8.12.1.orig/Makefile.in python-wxgtk-2.8.12.1/Makefile.in
++--- python-wxgtk-2.8.12.1.orig/Makefile.in 2011-03-28 21:48:29.000000000 +0200
+++++ python-wxgtk-2.8.12.1/Makefile.in 2014-07-25 22:45:27.710057682 +0200
++@@ -12455,7 +12455,7 @@ install-wxconfig:
++ $(INSTALL_DIR) $(DESTDIR)$(bindir)
++ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
++ $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
++- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+++ (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(CP_P) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++
++ locale_install:
++ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -226,6 +226,7 @@ endif
+
+ comment "Other GUIs"
+ source "package/efl/Config.in"
++ source "package/python-wx/Config.in"
+ source "package/qt/Config.in"
+ source "package/qt5/Config.in"
+ if BR2_PACKAGE_QT || BR2_PACKAGE_QT5
diff --git a/patches/buildroot/2015.02/015-armadeus-gpu-vivante-sdk-new-package.patch.tofix b/patches/buildroot/2015.02/015-armadeus-gpu-vivante-sdk-new-package.patch.tofix
new file mode 100644
index 0000000..2ea265c
--- /dev/null
+++ b/patches/buildroot/2015.02/015-armadeus-gpu-vivante-sdk-new-package.patch.tofix
@@ -0,0 +1,134 @@
+X11 stuff hasn't been tested yet, only fb is validated.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/freescale-imx/vivante-gpu-sdk/vivante-gpu-sdk.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/freescale-imx/vivante-gpu-sdk/vivante-gpu-sdk.mk
+@@ -0,0 +1,99 @@
++################################################################################
++#
++# vivante-gpu-sdk
++#
++################################################################################
++
++VIVANTE_GPU_SDK_VERSION = 1.00
++VIVANTE_GPU_SDK_SITE = $(FREESCALE_IMX_MIRROR_SITE)
++VIVANTE_GPU_SDK_SOURCE = vivante-gpu-sdk-$(VIVANTE_GPU_SDK_VERSION).bin
++VIVANTE_GPU_SDK_LICENSE = Freescale Semiconductor Software License Agreement
++VIVANTE_GPU_SDK_LICENSE += mix of OpenSource licenses
++VIVANTE_GPU_SDK_LICENSE_FILE = COPYING
++
++# The archive is a shell-self-extractor of a bzipped tar. It happens
++# to extract in the correct directory (vivante-gpu-sdk-x.y)
++# The --force makes sure it doesn't fail if the source dir already exists.
++# The --auto-accept skips the license check - not needed for us
++# because we have legal-info.
++define VIVANTE_GPU_SDK_EXTRACT_CMDS
++ (cd $(BUILD_DIR); \
++ sh $(DL_DIR)/$(VIVANTE_GPU_SDK_SOURCE) --force --auto-accept)
++endef
++
++ifeq ($(BR2_PACKAGE_XORG7),y)
++VIVANTE_GPU_SDK_MAKEFILE = Makefile.x11
++else
++VIVANTE_GPU_SDK_MAKEFILE = Makefile.fbdev
++endif
++
++# Examples 18 and 19 are listed in main Makefile but not present in sources
++define VIVANTE_GPU_SDK_BUILD_GLES_V1_1
++ (cd $(@D)/Samples/GLES1.1/; \
++ $(SED) 's/18_VertexBufferObjects//' $(VIVANTE_GPU_SDK_MAKEFILE); \
++ $(SED) 's/19_Beizer//' $(VIVANTE_GPU_SDK_MAKEFILE); \
++ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ ROOTFS="$(STAGING_DIR)" \
++ -f $(VIVANTE_GPU_SDK_MAKEFILE))
++endef
++
++define VIVANTE_GPU_SDK_BUILD_GLES_V2_0
++ (cd $(@D)/Samples/GLES2.0/; \
++ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ ROOTFS="$(STAGING_DIR)" \
++ -f $(VIVANTE_GPU_SDK_MAKEFILE))
++endef
++
++# OpenVG examples seem only buildable against framebuffer API
++define VIVANTE_GPU_SDK_BUILD_OPENVG
++ (cd $(@D)/Samples/OpenVG/; \
++ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
++ CFLAGS="$(TARGET_CFLAGS)" \
++ ROOTFS="$(STAGING_DIR)" \
++ -f Makefile.fbdev)
++endef
++
++define VIVANTE_GPU_SDK_BUILD_CMDS
++ $(VIVANTE_GPU_SDK_BUILD_GLES_V1_1)
++ $(VIVANTE_GPU_SDK_BUILD_GLES_V2_0)
++ $(VIVANTE_GPU_SDK_BUILD_OPENVG)
++endef
++
++ifeq ($(BR2_PACKAGE_VIVANTE_GPU_SDK_EXAMPLES),y)
++define VIVANTE_GPU_SDK_INSTALL_EXAMPLES
++ mkdir -p $(TARGET_DIR)/usr/share/examples/
++ cp -r $(@D)/opt/* $(TARGET_DIR)/usr/share/examples/
++endef
++endif
++
++define VIVANTE_GPU_SDK_INSTALL_TARGET_GLES_V1_1
++ (cd $(@D)/Samples/GLES1.1/; \
++ $(MAKE) install \
++ DESTDIR="$(TARGET_DIR)/opt/gpu-sdk-1.1" \
++ -f $(VIVANTE_GPU_SDK_MAKEFILE))
++endef
++
++define VIVANTE_GPU_SDK_INSTALL_TARGET_GLES_V2_0
++ $(VIVANTE_GPU_SDK_INSTALL_EXAMPLES)
++ (cd $(@D)/Samples/GLES2.0/; \
++ $(MAKE) install \
++ DESTDIR="$(TARGET_DIR)/opt/gpu-sdk-2.0" \
++ -f $(VIVANTE_GPU_SDK_MAKEFILE))
++endef
++
++define VIVANTE_GPU_SDK_INSTALL_TARGET_OPENVG
++ (cd $(@D)/Samples/OpenVG/; \
++ $(MAKE) install \
++ DESTDIR="$(TARGET_DIR)/opt/gpu-sdk-openvg" \
++ -f Makefile.fbdev)
++endef
++
++define VIVANTE_GPU_SDK_INSTALL_TARGET_CMDS
++ $(VIVANTE_GPU_SDK_INSTALL_TARGET_GLES_V1_1)
++ $(VIVANTE_GPU_SDK_INSTALL_TARGET_GLES_V2_0)
++ $(VIVANTE_GPU_SDK_INSTALL_TARGET_OPENVG)
++endef
++
++$(eval $(generic-package))
+Index: buildroot/package/freescale-imx/vivante-gpu-sdk/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/freescale-imx/vivante-gpu-sdk/Config.in
+@@ -0,0 +1,9 @@
++config BR2_PACKAGE_VIVANTE_GPU_SDK
++ bool "vivante-gpu-sdk"
++ depends on BR2_PACKAGE_GPU_VIV_BIN_MX6Q
++ help
++ Freescale examples on how to use GLES, OpenCL, and
++ OpenVG libraries for i.MX6 processors.
++
++ These examples are provided by Freescale as-is and doesn't have
++ an upstream.
+Index: buildroot/package/freescale-imx/Config.in
+===================================================================
+--- buildroot.orig/package/freescale-imx/Config.in
++++ buildroot/package/freescale-imx/Config.in
+@@ -47,6 +47,7 @@ source "package/freescale-imx/imx-vpu/Co
+ source "package/freescale-imx/firmware-imx/Config.in"
+ if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
+ source "package/freescale-imx/gpu-viv-bin-mx6q/Config.in"
++source "package/freescale-imx/vivante-gpu-sdk/Config.in"
+ endif
+
+ endif
diff --git a/patches/buildroot/2015.02/021-armadeus-add-sdl_water-package.patch b/patches/buildroot/2015.02/021-armadeus-add-sdl_water-package.patch
new file mode 100644
index 0000000..0847562
--- /dev/null
+++ b/patches/buildroot/2015.02/021-armadeus-add-sdl_water-package.patch
@@ -0,0 +1,59 @@
+Add sdlwater package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -223,6 +223,8 @@ endif
+ source "package/sdl_net/Config.in"
+ source "package/sdl_sound/Config.in"
+ source "package/sdl_ttf/Config.in"
++comment "Demos"
++source "package/sdl_water/Config.in"
+
+ comment "Other GUIs"
+ source "package/efl/Config.in"
+Index: buildroot/package/sdl_water/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/sdl_water/Config.in
+@@ -0,0 +1,7 @@
++config BR2_PACKAGE_SDL_WATER
++ bool "SDL_water"
++ select BR2_PACKAGE_SDL
++ help
++ Water effect demo coded with SDL
++
++ http://www.libsdl.org/projects/SDL_water/
+Index: buildroot/package/sdl_water/sdl_water.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/sdl_water/sdl_water.mk
+@@ -0,0 +1,25 @@
++#############################################################
++#
++# SDL Water Demo
++#
++#############################################################
++
++SDL_WATER_VERSION = 1.0
++SDL_WATER_SOURCE = water-$(SDL_WATER_VERSION).tar.gz
++SDL_WATER_SITE = http://www.libsdl.org/projects/water/src/
++SDL_WATER_TARGET_DATA_DIR = $(TARGET_DIR)/usr/share/images/
++
++SDL_WATER_CONF_OPTS = --with-sdl-prefix=$(STAGING_DIR)/usr \
++ --with-sdl-exec-prefix=$(STAGING_DIR)/usr
++
++SDL_WATER_DEPENDENCIES = sdl
++
++SDL_WATER_MAKE_OPTS = LDFLAGS="$(TARGET_LDFLAGS) -lm"
++
++define SDL_WATER_INSTALL_BMP
++ install -D -m 0644 $(@D)/water320.bmp $(SDL_WATER_TARGET_DATA_DIR)/water320.bmp
++endef
++
++SDL_WATER_POST_INSTALL_TARGET_HOOKS += SDL_WATER_INSTALL_BMP
++
++$(eval $(autotools-package))
diff --git a/patches/buildroot/2015.02/034-armadeus-add-slideshow-package.patch b/patches/buildroot/2015.02/034-armadeus-add-slideshow-package.patch
new file mode 100644
index 0000000..0e48ee8
--- /dev/null
+++ b/patches/buildroot/2015.02/034-armadeus-add-slideshow-package.patch
@@ -0,0 +1,170 @@
+Add slideshow package to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -195,6 +195,7 @@ comment "Graphic applications"
+ source "package/jhead/Config.in"
+ source "package/mesa3d-demos/Config.in"
+ source "package/rrdtool/Config.in"
++ source "package/slideshow/Config.in"
+
+ comment "Graphic libraries"
+ source "package/cegui06/Config.in"
+Index: buildroot/package/slideshow/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/slideshow/Config.in
+@@ -0,0 +1,8 @@
++config BR2_PACKAGE_SLIDESHOW
++ bool "Slideshow"
++ depends on BR2_PACKAGE_SDL && BR2_PACKAGE_SDL_IMAGE
++ help
++ Perigee Slideshow is a command line program that searches a directory
++ for supported graphic files and displays them in a slideshow.
++
++ http://www.xmission.com/~jstanley/slideshow.html
+Index: buildroot/package/slideshow/slideshow.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/slideshow/slideshow.mk
+@@ -0,0 +1,39 @@
++#############################################################
++#
++# slideshow
++#
++#############################################################
++
++SLIDESHOW_VERSION:=1.1
++SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
++SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
++
++SLIDESHOW_DEPENDENCIES += sdl sdl_image
++
++define SLIDESHOW_BUILD_CMDS
++ $(MAKE) CC="$(TARGET_CXX)" CFLAGS="$(TARGET_CFLAGS) `sh $(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
++ LFLAGS="`sh $(STAGING_DIR)/usr/bin/sdl-config --libs` -lSDL_image" \
++ -C $(SLIDESHOW_DIR)
++endef
++
++define SLIDESHOW_INSTALL_TARGET_CMDS
++ cp -dpf $(SLIDESHOW_DIR)/slideshow $(TARGET_DIR)/usr/bin
++endef
++
++define SLIDESHOW_CLEAN_CMDS
++ $(MAKE) clean -C $(SLIDESHOW_DIR)
++endef
++
++define SLIDESHOW_UNINSTALL_TARGET_CMDS
++ rm -f $(TARGET_DIR)/usr/bin/slideshow
++endef
++
++$(eval $(generic-package))
++
++# BR currently doesn't support .zip archive, so do extraction manually:
++$(SLIDESHOW_TARGET_EXTRACT): $(SLIDESHOW_TARGET_SOURCE)
++ $(call MESSAGE,"Extracting")
++ unzip $(DL_DIR)/$($(PKG)_SOURCE) -d $(BUILD_DIR)
++ mv $(BUILD_DIR)/slideshow/* $(BUILD_DIR)/slideshow-$(SLIDESHOW_VERSION)/
++ rm -rf $(BUILD_DIR)/slideshow
++ touch $@
+Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch
+@@ -0,0 +1,19 @@
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff -urN slideshow-1.1/slideshow.cpp slideshow-1.1.mod/slideshow.cpp
++--- slideshow-1.1/slideshow.cpp 2013-08-31 11:35:19.932650303 +0200
+++++ slideshow-1.1.mod/slideshow.cpp 2013-08-31 11:34:48.396493925 +0200
++@@ -228,9 +228,10 @@
++ break;
++ }
++
++- // stop the auto-advance when the last picture is about to be shown
++- if ( m_image_index == m_file_list->count() - 1 )
++- stop_timer();
+++ // Restart from beginning when the last picture is shown
+++ if ( m_image_index == m_file_list->count() )
+++ m_image_index = 0;
+++ m_prev_image_index = -1;
++ }
++
++ return true;
+Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
+@@ -0,0 +1,13 @@
++--- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
+++++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
++@@ -84,8 +84,8 @@
++
++ Uint8 *pixloc = (Uint8 *)pDisplay->pixels + dpitch * y + Bpp * x;
++ Uint8 *pChar, *pScreen;
++- char c;
++- int i, j;
+++ //char c;
+++ int i, j, c;
++
++ for(const char *p = text; *p != '\0'; p++)
++ {
+Index: buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
+@@ -0,0 +1,28 @@
++On recent gcc some includes are needed to have string stuff defined.
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++Index: slideshow-1.1/file_list.cpp
++===================================================================
++--- slideshow-1.1.orig/file_list.cpp 2011-07-01 18:58:49.000000000 +0200
+++++ slideshow-1.1/file_list.cpp 2011-07-01 18:59:10.000000000 +0200
++@@ -8,6 +8,7 @@
++ #include <fstream>
++ #include <stdlib.h>
++ #include <ctype.h>
+++#include <string.h>
++
++ #ifdef WIN32
++ #include <io.h>
++Index: slideshow-1.1/slideshow.h
++===================================================================
++--- slideshow-1.1.orig/slideshow.h 2011-07-01 18:59:56.000000000 +0200
+++++ slideshow-1.1/slideshow.h 2011-07-01 19:00:02.000000000 +0200
++@@ -9,6 +9,7 @@
++ #pragma once
++ #endif // _MSC_VER > 1000
++
+++#include <iostream>
++ #include "SDL.h"
++ #include "cache.h"
++
+Index: buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
+@@ -0,0 +1,17 @@
++Otherwise crashes on APF27.
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++Index: slideshow-1.1/slideshow.cpp
++===================================================================
++--- slideshow-1.1.orig/slideshow.cpp 2011-07-02 13:19:00.000000000 +0200
+++++ slideshow-1.1/slideshow.cpp 2011-07-02 13:19:17.000000000 +0200
++@@ -411,7 +411,7 @@
++ else
++ flags |= SDL_FULLSCREEN;
++
++- m_sdl = SDL_SetVideoMode(m_options->width, m_options->height, 32, flags);
+++ m_sdl = SDL_SetVideoMode(m_options->width, m_options->height, 16 /*32*/, flags);
++
++ if ( !m_sdl )
++ {
diff --git a/patches/buildroot/2015.02/050-U-Boot-add_support_for_custom_configuration_file.patch b/patches/buildroot/2015.02/050-U-Boot-add_support_for_custom_configuration_file.patch
new file mode 100644
index 0000000..0f39420
--- /dev/null
+++ b/patches/buildroot/2015.02/050-U-Boot-add_support_for_custom_configuration_file.patch
@@ -0,0 +1,50 @@
+U-Boot: add option to use a custom config file as it can be done within
+ Linux kernel, Busybox, uClibc and some other tools.
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+Index: buildroot/boot/uboot/Config.in
+===================================================================
+--- buildroot.orig/boot/uboot/Config.in
++++ buildroot/boot/uboot/Config.in
+@@ -80,6 +80,26 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
+ Most users may leave this empty
+
+ choice
++ prompt "U-Boot configuration"
++ default BR2_TARGET_UBOOT_USE_DEFCONFIG
++
++config BR2_TARGET_UBOOT_USE_DEFCONFIG
++ bool "Using default configuration"
++ help
++ Using the default configuration selected by U-Boot board name.
++
++config BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG
++ bool "Using a custom config file"
++
++endchoice
++
++config BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE
++ string "Configuration file path"
++ depends on BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG
++ help
++ Path to the custimized U-Boot configuration file
++
++choice
+ prompt "U-Boot binary format"
+ default BR2_TARGET_UBOOT_FORMAT_BIN
+
+Index: buildroot/boot/uboot/uboot.mk
+===================================================================
+--- buildroot.orig/boot/uboot/uboot.mk
++++ buildroot/boot/uboot/uboot.mk
+@@ -94,6 +94,9 @@ UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_CU
+ endif
+
+ define UBOOT_CONFIGURE_CMDS
++ $(if $(BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG),
++ cp -pf $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE)) \
++ $(@D)/include/configs/$(UBOOT_BOARD_NAME).h)
+ $(TARGET_CONFIGURE_OPTS) \
+ $(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) \
+ $(UBOOT_BOARD_NAME)_config
diff --git a/patches/buildroot/2015.02/072-armadeus-xenomai-download-adeos-patch.patch b/patches/buildroot/2015.02/072-armadeus-xenomai-download-adeos-patch.patch
new file mode 100644
index 0000000..2a394fe
--- /dev/null
+++ b/patches/buildroot/2015.02/072-armadeus-xenomai-download-adeos-patch.patch
@@ -0,0 +1,59 @@
+Allows downloading of adeos patch if not present locally
+
+TODO: mark BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH as deprecated in BR before
+submitting mainline.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+
+Index: buildroot/linux/linux-ext-xenomai.mk
+===================================================================
+--- buildroot.orig/linux/linux-ext-xenomai.mk
++++ buildroot/linux/linux-ext-xenomai.mk
+@@ -9,11 +9,20 @@ ifeq ($(BR2_LINUX_KERNEL_EXT_XENOMAI),y)
+ LINUX_DEPENDENCIES += xenomai
+
+ # Adeos patch version
+-XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
++XENOMAI_ADEOS_PATCH_URL = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL))
++XENOMAI_ADEOS_PATCH = $(shell basename $(XENOMAI_ADEOS_PATCH_URL))
++ifneq ($(XENOMAI_ADEOS_PATCH_URL),)
++define XENOMAI_ADEOS_DOWNLOAD_PATCH
++ @$(call MESSAGE,"Download adeos patch")
++ $(call DOWNLOAD,$(XENOMAI_ADEOS_PATCH_URL))
++endef
++LINUX_POST_DOWNLOAD_HOOKS += XENOMAI_ADEOS_DOWNLOAD_PATCH
++endif
++
+ ifeq ($(XENOMAI_ADEOS_PATCH),)
+ XENOMAI_ADEOS_OPTS = --default
+ else
+-XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH)
++XENOMAI_ADEOS_OPTS = --adeos=$(DL_DIR)/$(XENOMAI_ADEOS_PATCH)
+ endif
+
+ # Prepare kernel patch
+Index: buildroot/linux/Config.ext.in
+===================================================================
+--- buildroot.orig/linux/Config.ext.in
++++ buildroot/linux/Config.ext.in
+@@ -21,13 +21,14 @@ comment "xenomai needs a toolchain w/ th
+ BR2_bfin || BR2_powerpc || BR2_sh4
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+-config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
++config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL
+ depends on BR2_LINUX_KERNEL_EXT_XENOMAI
+- string "Path for Adeos patch file"
++ string "Path/url for Adeos patch file"
+ help
+- Optionally, explicitly specify the Adeos patch to use.
+- Download it at http://download.gna.org/adeos/patches/v2.6/$(ARCH)/
+- and verify that your kernel version in buildroot matches.
++ Optionally, explicitly specify where to find the Adeos patch to use.
++ Examples http://download.gna.org/adeos/patches/v2.6/arm/adeos-ipipe-2.6.38.8-arm-1.18-09.patch
++ or file:///home/foo/adeos-ipipe-2.6.38.8-arm-1.18-09.patch
++ Please verify that your ker...
[truncated message content] |
|
From: jorasse <jo...@us...> - 2015-02-16 08:57:51
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 948a3991cc1e6901d19a98c805a57ae71c305177 (commit)
via 2919cdd57dbf0ef8ab16b8e384d9cad975300cf9 (commit)
via f6021cebd1330b333107bb5cb704f96f251cb242 (commit)
via 53a746c4d269a06de73b3748ea232a7ac3ac3815 (commit)
via e194c3d50ebb4128e2388103f9502809c850c0fb (commit)
from 420fea6d72ba9af7e1ffdc5848a04956a8d1d44c (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 948a3991cc1e6901d19a98c805a57ae71c305177
Author: Philippe Reynes <tr...@gm...>
Date: Sun Feb 1 19:55:36 2015 +0100
[LINUX] 3.12: move to 3.12.37
commit 2919cdd57dbf0ef8ab16b8e384d9cad975300cf9
Author: Philippe Reynes <tr...@gm...>
Date: Sun Feb 1 19:55:35 2015 +0100
[LINUX] 3.10: move to 3.10.67
commit f6021cebd1330b333107bb5cb704f96f251cb242
Author: Philippe Reynes <tr...@gm...>
Date: Fri Jan 30 21:37:33 2015 +0100
[LINUX] 3.18: move to 3.18.5
commit 53a746c4d269a06de73b3748ea232a7ac3ac3815
Author: Philippe Reynes <tr...@gm...>
Date: Fri Jan 30 21:37:32 2015 +0100
[LINUX] 3.14: move to 3.14.31
commit e194c3d50ebb4128e2388103f9502809c850c0fb
Author: Philippe Reynes <tr...@gm...>
Date: Fri Jan 30 21:37:31 2015 +0100
[LINUX] 3.10: move to 3.10.66
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.65.config => apf27-linux-3.10.67.config} | 0
...x-3.12.36.config => apf27-linux-3.12.37.config} | 0
...x-3.14.29.config => apf27-linux-3.14.31.config} | 0
...nux-3.18.3.config => apf27-linux-3.18.5.config} | 0
...x-3.10.65.config => apf28-linux-3.10.67.config} | 0
...x-3.12.36.config => apf28-linux-3.12.37.config} | 0
...x-3.14.29.config => apf28-linux-3.14.31.config} | 0
...nux-3.18.3.config => apf28-linux-3.18.5.config} | 0
...x-3.10.65.config => apf51-linux-3.10.67.config} | 0
...x-3.12.36.config => apf51-linux-3.12.37.config} | 0
...x-3.14.29.config => apf51-linux-3.14.31.config} | 0
...nux-3.18.3.config => apf51-linux-3.18.5.config} | 0
patches/linux/{3.10.65 => 3.10.67} | 0
patches/linux/{3.12.36 => 3.12.37} | 0
patches/linux/{3.14.29 => 3.14.31} | 0
patches/linux/{3.18.3 => 3.18.5} | 0
19 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.65.config => apf27-linux-3.10.67.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.36.config => apf27-linux-3.12.37.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.29.config => apf27-linux-3.14.31.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.18.3.config => apf27-linux-3.18.5.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.65.config => apf28-linux-3.10.67.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.36.config => apf28-linux-3.12.37.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.29.config => apf28-linux-3.14.31.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.18.3.config => apf28-linux-3.18.5.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.65.config => apf51-linux-3.10.67.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.36.config => apf51-linux-3.12.37.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.29.config => apf51-linux-3.14.31.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.18.3.config => apf51-linux-3.18.5.config} (100%)
rename patches/linux/{3.10.65 => 3.10.67} (100%)
rename patches/linux/{3.12.36 => 3.12.37} (100%)
rename patches/linux/{3.14.29 => 3.14.31} (100%)
rename patches/linux/{3.18.3 => 3.18.5} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 6d59d00..1e42fde 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.3"
+BR2_DEFAULT_KERNEL_VERSION="3.18.5"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -34,7 +34,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.5"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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"
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index d7cf4f1..b116a53 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.3"
+BR2_DEFAULT_KERNEL_VERSION="3.18.5"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -35,7 +35,7 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.5"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index ed6ef38..b2c3f31 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -7,7 +7,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.3"
+BR2_DEFAULT_KERNEL_VERSION="3.18.5"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -97,7 +97,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.5"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
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"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.65.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.67.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.65.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.67.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.36.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.37.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.36.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.37.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.31.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.29.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.31.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.3.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.18.3.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.18.5.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.65.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.67.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.65.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.67.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.36.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.37.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.36.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.37.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.29.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.31.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.29.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.31.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.18.3.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18.5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.18.3.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.18.5.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.65.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.67.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.65.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.67.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.36.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.37.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.36.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.37.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.29.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.31.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.29.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.31.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.3.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.18.3.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.18.5.config
diff --git a/patches/linux/3.10.65 b/patches/linux/3.10.67
similarity index 100%
rename from patches/linux/3.10.65
rename to patches/linux/3.10.67
diff --git a/patches/linux/3.12.36 b/patches/linux/3.12.37
similarity index 100%
rename from patches/linux/3.12.36
rename to patches/linux/3.12.37
diff --git a/patches/linux/3.14.29 b/patches/linux/3.14.31
similarity index 100%
rename from patches/linux/3.14.29
rename to patches/linux/3.14.31
diff --git a/patches/linux/3.18.3 b/patches/linux/3.18.5
similarity index 100%
rename from patches/linux/3.18.3
rename to patches/linux/3.18.5
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2015-02-14 16:28: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 420fea6d72ba9af7e1ffdc5848a04956a8d1d44c (commit)
via 6bea31cb6280b41bcd9050dd1e4d14353383e7fb (commit)
from 0311ec9e797a27e47cf21134db4030d574951dec (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 420fea6d72ba9af7e1ffdc5848a04956a8d1d44c
Merge: 6bea31c 0311ec9
Author: Eric Jarrige <eri...@ar...>
Date: Sat Feb 14 17:27:55 2015 +0100
Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code
commit 6bea31cb6280b41bcd9050dd1e4d14353383e7fb
Author: Eric Jarrige <eri...@ar...>
Date: Sat Feb 14 17:27:37 2015 +0100
[UBOOT] 2015.01: update apf6 U-Boot config and fix compilation
-----------------------------------------------------------------------
Summary of changes:
...apf6-u-boot-2014.07.h => apf6-u-boot-2015.01.h} | 0
patches/u-boot/2015.01/600-add-apf6.patch | 90 ++++++++++----------
2 files changed, 45 insertions(+), 45 deletions(-)
copy buildroot/target/device/armadeus/apf6/{apf6-u-boot-2014.07.h => apf6-u-boot-2015.01.h} (100%)
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
similarity index 100%
copy from buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
copy to buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
diff --git a/patches/u-boot/2015.01/600-add-apf6.patch b/patches/u-boot/2015.01/600-add-apf6.patch
index 569a1ba..a153901 100644
--- a/patches/u-boot/2015.01/600-add-apf6.patch
+++ b/patches/u-boot/2015.01/600-add-apf6.patch
@@ -28,7 +28,7 @@ Index: uboot-2015.01/configs/apf6_defconfig
+++ uboot-2015.01/configs/apf6_defconfig
@@ -0,0 +1,4 @@
+CONFIG_SPL=y
-+CONFIG_SYS_EXTRA_OPTIONS="SPL,MX6DL"
++CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
++S:CONFIG_ARM=y
++S:CONFIG_TARGET_APF6=y
Index: uboot-2015.01/board/armadeus/apf6/Kconfig
@@ -122,74 +122,74 @@ Index: uboot-2015.01/board/armadeus/apf6/apf6.c
+#define ETH_PHY_RESET IMX_GPIO_NR(1, 24)
+
+static iomux_v3_cfg_t const uart4_pads[] = {
-+ MX6_PAD_CSI0_DAT12__UART4_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
-+ MX6_PAD_CSI0_DAT13__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL),
++ IOMUX_PADS(PAD_CSI0_DAT12__UART4_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
++ IOMUX_PADS(PAD_CSI0_DAT13__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)),
+};
+
+static iomux_v3_cfg_t const usdhc2_pads[] = {
-+ MX6_PAD_SD2_CLK__SD2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_SD2_CMD__SD2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_SD2_DAT0__SD2_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_SD2_DAT1__SD2_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_SD2_DAT2__SD2_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_SD2_DAT3__SD2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_GPIO_2__GPIO1_IO02 | MUX_PAD_CTRL(NO_PAD_CTRL),
++ IOMUX_PADS(PAD_SD2_CLK__SD2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD2_CMD__SD2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD2_DAT0__SD2_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD2_DAT1__SD2_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD2_DAT2__SD2_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD2_DAT3__SD2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_GPIO_2__GPIO1_IO02 | MUX_PAD_CTRL(NO_PAD_CTRL)),
+};
+
+static iomux_v3_cfg_t const usdhc3_pads[] = {
-+ MX6_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_SD3_DAT0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_SD3_DAT1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_SD3_DAT2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_SD3_DAT3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_SD3_DAT4__SD3_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_SD3_DAT5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_SD3_DAT6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-+ MX6_PAD_SD3_DAT7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
++ IOMUX_PADS(PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT4__SD3_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
++ IOMUX_PADS(PAD_SD3_DAT7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL)),
+};
+
+static iomux_v3_cfg_t const enet_pads[] = {
-+ MX6_PAD_ENET_MDIO__ENET_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL),
-+ MX6_PAD_ENET_MDC__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL),
-+ MX6_PAD_RGMII_TXC__RGMII_TXC | MUX_PAD_CTRL(ENET_PAD_CTRL),
-+ MX6_PAD_RGMII_TD0__RGMII_TD0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-+ MX6_PAD_RGMII_TD1__RGMII_TD1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-+ MX6_PAD_RGMII_TD2__RGMII_TD2 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-+ MX6_PAD_RGMII_TD3__RGMII_TD3 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-+ MX6_PAD_RGMII_TX_CTL__RGMII_TX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL),
-+ MX6_PAD_ENET_REF_CLK__ENET_TX_CLK | MUX_PAD_CTRL(ENET_PAD_CTRL),
-+ MX6_PAD_RGMII_RXC__RGMII_RXC | MUX_PAD_CTRL(ENET_PAD_CTRL),
-+ MX6_PAD_RGMII_RD0__RGMII_RD0 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-+ MX6_PAD_RGMII_RD1__RGMII_RD1 | MUX_PAD_CTRL(ENET_PAD_CTRL),
-+ MX6_PAD_RGMII_RD2__RGMII_RD2 | MUX_PAD_CTRL(ENET_PAD_CTRL2),
-+ MX6_PAD_RGMII_RD3__RGMII_RD3 | MUX_PAD_CTRL(ENET_PAD_CTRL2),
-+ MX6_PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL),
++ IOMUX_PADS(PAD_ENET_MDIO__ENET_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_ENET_MDC__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_TXC__RGMII_TXC | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_TD0__RGMII_TD0 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_TD1__RGMII_TD1 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_TD2__RGMII_TD2 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_TD3__RGMII_TD3 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_TX_CTL__RGMII_TX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_ENET_REF_CLK__ENET_TX_CLK | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_RXC__RGMII_RXC | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_RD0__RGMII_RD0 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_RD1__RGMII_RD1 | MUX_PAD_CTRL(ENET_PAD_CTRL)),
++ IOMUX_PADS(PAD_RGMII_RD2__RGMII_RD2 | MUX_PAD_CTRL(ENET_PAD_CTRL2)),
++ IOMUX_PADS(PAD_RGMII_RD3__RGMII_RD3 | MUX_PAD_CTRL(ENET_PAD_CTRL2)),
++ IOMUX_PADS(PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL)),
+ /* AR8035 PHY Reset */
-+ MX6_PAD_ENET_RX_ER__GPIO1_IO24 | MUX_PAD_CTRL(NO_PAD_CTRL),
++ IOMUX_PADS(PAD_ENET_RX_ER__GPIO1_IO24 | MUX_PAD_CTRL(NO_PAD_CTRL)),
+ /* AR8035 INT */
-+ MX6_PAD_ENET_TX_EN__GPIO1_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL),
++ IOMUX_PADS(PAD_ENET_TX_EN__GPIO1_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL)),
+};
+
+static iomux_v3_cfg_t const fpga_pads[] = {
+ /* FPGA AS_DATA enet_txd1*/
-+ MX6_PAD_ENET_TXD1__GPIO1_IO29 | MUX_PAD_CTRL(FPGA_PAD_CTRL),
++ IOMUX_PADS(PAD_ENET_TXD1__GPIO1_IO29 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
+ /* FPGA DCLK enet_rxd0*/
-+ MX6_PAD_ENET_RXD0__GPIO1_IO27 | MUX_PAD_CTRL(FPGA_PAD_CTRL),
++ IOMUX_PADS(PAD_ENET_RXD0__GPIO1_IO27 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
+ /* FPGA CONF_DONE enet_rxd1*/
-+ MX6_PAD_ENET_RXD1__GPIO1_IO26 | MUX_PAD_CTRL(FPGA_PAD_CTRL),
++ IOMUX_PADS(PAD_ENET_RXD1__GPIO1_IO26 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
+ /* FPGA NCONFIG EIM_D26*/
-+ MX6_PAD_EIM_D26__GPIO3_IO26 | MUX_PAD_CTRL(FPGA_PAD_CTRL),
++ IOMUX_PADS(PAD_EIM_D26__GPIO3_IO26 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
+ /* FPGA NSTATUS EIM_D27*/
-+ MX6_PAD_EIM_D27__GPIO3_IO27 | MUX_PAD_CTRL(FPGA_PAD_CTRL),
++ IOMUX_PADS(PAD_EIM_D27__GPIO3_IO27 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
+ /* FPGA CVP_CONFDONE EIM_D22*/
-+ MX6_PAD_EIM_D22__GPIO3_IO22 | MUX_PAD_CTRL(FPGA_PAD_CTRL),
++ IOMUX_PADS(PAD_EIM_D22__GPIO3_IO22 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
+ /* FPGA PERSTL0# EIM_D18*/
-+ MX6_PAD_EIM_D18__GPIO3_IO18 | MUX_PAD_CTRL(FPGA_PAD_CTRL),
++ IOMUX_PADS(PAD_EIM_D18__GPIO3_IO18 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
+};
+
+static iomux_v3_cfg_t const usb_pads[] = {
-+ MX6_PAD_GPIO_1__USB_OTG_ID | MUX_PAD_CTRL(USB_PAD_CTRL),
++ IOMUX_PADS(PAD_GPIO_1__USB_OTG_ID | MUX_PAD_CTRL(USB_PAD_CTRL)),
+};
+
+static void setup_iomux_uart(void)
hooks/post-receive
--
armadeus
|