armadeus-commitlog Mailing List for armadeus (Page 40)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Fabien M <fa...@us...> - 2014-12-09 08:46:30
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9732e015cf3ce308070831aede2c134258d8b032 (commit)
from 2b0b9b44cf310943ec79dbe574a79f0b4dc1ef6b (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 9732e015cf3ce308070831aede2c134258d8b032
Author: Fabien Marteau <fab...@ar...>
Date: Tue Dec 9 09:45:53 2014 +0100
[KERNEL] load altera fpgaloader module before creating node
-----------------------------------------------------------------------
Summary of changes:
.../linux/modules/fpga/dev_tools/loader/load_fpga | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/target/linux/modules/fpga/dev_tools/loader/load_fpga b/target/linux/modules/fpga/dev_tools/loader/load_fpga
index 26bc844..2f434f2 100755
--- a/target/linux/modules/fpga/dev_tools/loader/load_fpga
+++ b/target/linux/modules/fpga/dev_tools/loader/load_fpga
@@ -16,12 +16,12 @@ if [ ! -f "$1" ]; then
fi
if [ "$PLATFORM" == "APF6" ]; then
+ modprobe fpgaloader
DEVLOADER=/dev/altera_cvp
major=`grep -w altera_cvp /proc/devices | cut -f1 -d" "`
if [ ! -e /dev/altera_cvp ]; then
mknod /dev/altera_cvp c $major 0
fi
- modprobe fpgaloader
else
DEVLOADER=/dev/fpgaloader
fi
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2014-12-08 17:17:13
|
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 2b0b9b44cf310943ec79dbe574a79f0b4dc1ef6b (commit)
from accd0afc31f5cfdb8d9853f94921b0b9e048aabe (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 2b0b9b44cf310943ec79dbe574a79f0b4dc1ef6b
Author: Fabien Marteau <fab...@ar...>
Date: Mon Dec 8 18:16:35 2014 +0100
[KERNEL] adding fpga loading driver by default in menuconfig
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6/apf6-linux-3.18.config | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
index 96e706e..bf180c9 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
@@ -235,6 +235,9 @@ CONFIG_DRM_IMX_HDMI=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_PWM=y
CONFIG_PWM_IMX=y
+CONFIG_ARMADEUS_DRIVERS=y
+CONFIG_ARMADEUS_FPGA_DRIVERS=y
+CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-12-05 14:58:27
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via accd0afc31f5cfdb8d9853f94921b0b9e048aabe (commit)
from 5a4cb62b6453dd732ab87879c29694be24d014e8 (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 accd0afc31f5cfdb8d9853f94921b0b9e048aabe
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Dec 5 15:59:58 2014 +0100
[LINUX] 2.6.38: apf51v2: enable MC13892 PMIC
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf51/apf51-linux-2.6.38.config | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index ab62206..08f87b7 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -137,6 +137,7 @@ CONFIG_SPI=y
CONFIG_SPI_IMX=y
CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_MC13892=m
CONFIG_GPIO_WM831X=m
CONFIG_POWER_SUPPLY=m
CONFIG_WM831X_BACKUP=m
@@ -149,6 +150,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_WM831X_WATCHDOG=m
CONFIG_IMX2_WDT=y
CONFIG_MFD_WM831X_I2C=y
+CONFIG_MFD_MC13XXX=y
CONFIG_MFD_IMX_IPU_V3=y
CONFIG_MEDIA_SUPPORT=m
CONFIG_VIDEO_DEV=m
@@ -252,6 +254,7 @@ CONFIG_RTC_CLASS=y
# CONFIG_RTC_DRV_MCP7940X is not set
CONFIG_RTC_MXC=y
CONFIG_RTC_DRV_WM831X=y
+CONFIG_RTC_DRV_MC13XXX=y
CONFIG_STAGING=y
# CONFIG_STAGING_EXCLUDE_BUILD is not set
CONFIG_IIO=m
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-12-04 16:29: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 5a4cb62b6453dd732ab87879c29694be24d014e8 (commit)
from 9107334190ec8509f86fa7ea03c36977f317a752 (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 5a4cb62b6453dd732ab87879c29694be24d014e8
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Dec 4 17:33:00 2014 +0100
[LINUX] 3.18: move to 3.18-rc7
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
...3.18-rc5.config => apf27-linux-3.18-rc7.config} | 0
...3.18-rc4.config => apf28-linux-3.18-rc7.config} | 0
...3.18-rc5.config => apf51-linux-3.18-rc7.config} | 0
...-3.18-rc5.config => apf6-linux-3.18-rc7.config} | 0
patches/linux/{3.18-rc5 => 3.18-rc7} | 0
6 files changed, 1 insertions(+), 1 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.18-rc5.config => apf27-linux-3.18-rc7.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.18-rc4.config => apf28-linux-3.18-rc7.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.18-rc5.config => apf51-linux-3.18-rc7.config} (100%)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.18-rc5.config => apf6-linux-3.18-rc7.config} (100%)
rename patches/linux/{3.18-rc5 => 3.18-rc7} (100%)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index d181f1a..ca208d3 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.18-rc5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18-rc7"
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-rc5.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc5.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc7.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc4.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc4.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc7.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc5.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc5.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc7.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc5.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc5.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc7.config
diff --git a/patches/linux/3.18-rc5 b/patches/linux/3.18-rc7
similarity index 100%
rename from patches/linux/3.18-rc5
rename to patches/linux/3.18-rc7
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-12-04 14:02:25
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9107334190ec8509f86fa7ea03c36977f317a752 (commit)
from ee1ab920f42823e10a3595f1ec9deb1da2c40a12 (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 9107334190ec8509f86fa7ea03c36977f317a752
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Dec 4 15:01:14 2014 +0100
[BUILDROOT] Update buildroot patches for BR 2014.11
This has only been tested with an APF6.
To try BR 2014.11:
* 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
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
Makefile.in | 6 +
buildroot/package/armadeus/rxtx/rxtx.mk | 5 +
.../{busybox-1.21.0.config => busybox.config} | 0
.../2014.11/001-add_armadeus_device.patch | 25 +
.../002-add_armadeus_specific_packages.patch | 0
...us-gpsd-add-options-setting-in-menuconfig.patch | 0
.../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 +++
.../021-armadeus-add-sdl_water-package.patch | 59 ++
.../034-armadeus-add-slideshow-package.patch | 170 ++++
...add_support_for_custom_configuration_file.patch | 0
...072-armadeus-xenomai-download-adeos-patch.patch | 59 ++
.../{2013.11 => 2014.11}/072-xenomai-package.tofix | 0
...ai-add-configure-options-for-old-versions.patch | 37 +
...ependecy-evaluated-before-patching.patch.tofix} | 0
.../buildroot/2014.11/081-adds_quake_package.patch | 159 +++
.../083-pygame-armadeus_addons.patch | 0
...for_pld_asm_instruction_on_non_armv5_arch.patch | 0
.../107-armadeus-games-add-wolf4sdl-package.patch | 74 ++
.../buildroot/2014.11/110-bluez3-add_package.patch | 118 +++
.../{2013.05 => 2014.11}/111-bluez3-hacks.patch | 0
.../2014.11/118-armadeus-snes9x-add-package.patch | 390 ++++++++
.../121-target-arm926t_is_arm926ej-s.patch | 0
.../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 | 0
...-disable_ip_busybox_if_iproute2_buildroot.patch | 36 +
...fix_installation_bug_on_some_host_systems.patch | 0
...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 +++
...g_build_against_old_kernel_headers.patch.tofix} | 0
.../2014.11/181-qtcreator-add_package.patch | 1002 ++++++++++++++++++++
.../182-uclibc-add_accept4_declaration_fix.patch | 0
...penwrt-uclibc-add-kernel_long-declaration.patch | 0
.../184-fsl-mm-codeclib-add_package.patch | 0
...nore-env_sectors-on-NOR-and-SPI-dataflash.patch | 0
.../buildroot/2014.11/188-marble-add_package.patch | 358 +++++++
.../189-dbus-fix_installation.patch | 0
.../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} | 0
.../2014.11/219-shiboken-add_package.patch | 266 ++++++
patches/buildroot/2014.11/cleanup_buildroot.sh | 122 +++
57 files changed, 4784 insertions(+), 1 deletions(-)
copy buildroot/target/device/armadeus/{busybox-1.21.0.config => busybox.config} (100%)
create mode 100644 patches/buildroot/2014.11/001-add_armadeus_device.patch
copy patches/buildroot/{2013.11 => 2014.11}/002-add_armadeus_specific_packages.patch (100%)
copy patches/buildroot/{2013.05 => 2014.11}/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch (100%)
create mode 100644 patches/buildroot/2014.11/006-armadeus-add-owfs-package.patch
create mode 100644 patches/buildroot/2014.11/007-armadeus-add-agg-package.patch
create mode 100644 patches/buildroot/2014.11/008-armadeus-add-gnash-package.patch
create mode 100644 patches/buildroot/2014.11/009-armadeus-xc3sprog-new-package.patch
create mode 100644 patches/buildroot/2014.11/010-armadeus-sam7-pgm-ng-new-package.patch
create mode 100644 patches/buildroot/2014.11/011-armadeus-add-tk-package.patch
create mode 100644 patches/buildroot/2014.11/012-armadeus-add-tkinter-support-to-python.patch
create mode 100644 patches/buildroot/2014.11/014-armadeus-python-wx-add-package.patch
create mode 100644 patches/buildroot/2014.11/015-armadeus-gpu-vivante-sdk-new-package.patch.tofix
create mode 100644 patches/buildroot/2014.11/021-armadeus-add-sdl_water-package.patch
create mode 100644 patches/buildroot/2014.11/034-armadeus-add-slideshow-package.patch
copy patches/buildroot/{2013.05 => 2014.11}/050-U-Boot-add_support_for_custom_configuration_file.patch (100%)
create mode 100644 patches/buildroot/2014.11/072-armadeus-xenomai-download-adeos-patch.patch
copy patches/buildroot/{2013.11 => 2014.11}/072-xenomai-package.tofix (100%)
create mode 100644 patches/buildroot/2014.11/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
copy patches/buildroot/{2013.11/075-armadeus-pkg-generic-makes-dependecy-evaluated-before-patching.patch => 2014.11/075-armadeus-pkg-generic-makes-dependecy-evaluated-before-patching.patch.tofix} (100%)
create mode 100644 patches/buildroot/2014.11/081-adds_quake_package.patch
copy patches/buildroot/{2013.11 => 2014.11}/083-pygame-armadeus_addons.patch (100%)
copy patches/buildroot/{2013.11 => 2014.11}/099-mplayer-add_patch_for_pld_asm_instruction_on_non_armv5_arch.patch (100%)
create mode 100644 patches/buildroot/2014.11/107-armadeus-games-add-wolf4sdl-package.patch
create mode 100644 patches/buildroot/2014.11/110-bluez3-add_package.patch
copy patches/buildroot/{2013.05 => 2014.11}/111-bluez3-hacks.patch (100%)
create mode 100644 patches/buildroot/2014.11/118-armadeus-snes9x-add-package.patch
copy patches/buildroot/{2013.11 => 2014.11}/121-target-arm926t_is_arm926ej-s.patch (100%)
create mode 100644 patches/buildroot/2014.11/123-armadeus-pywebradio-add-package.patch
create mode 100644 patches/buildroot/2014.11/124-e-uae-add_package.patch
copy patches/buildroot/{2013.05 => 2014.11}/142-ncurses-fix_compilation_with_old_hosts.patch (100%)
create mode 100644 patches/buildroot/2014.11/146-busybox-disable_ip_busybox_if_iproute2_buildroot.patch
copy patches/buildroot/{2013.11 => 2014.11}/150-alsa-utils-fix_installation_bug_on_some_host_systems.patch (100%)
create mode 100644 patches/buildroot/2014.11/157-buildroot-allow_generic_device_selection_even_when_custom_rootfs_is_chosen.patch
create mode 100644 patches/buildroot/2014.11/172-gsmmux-add_package.patch
create mode 100644 patches/buildroot/2014.11/176-imx-test-add_package.patch
copy patches/buildroot/{2012.02/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch => 2014.11/179-e2fsprog-allow_e4defrag_build_against_old_kernel_headers.patch.tofix} (100%)
create mode 100644 patches/buildroot/2014.11/181-qtcreator-add_package.patch
copy patches/buildroot/{2013.11 => 2014.11}/182-uclibc-add_accept4_declaration_fix.patch (100%)
copy patches/buildroot/{2013.05 => 2014.11}/183-openwrt-uclibc-add-kernel_long-declaration.patch (100%)
copy patches/buildroot/{2013.05 => 2014.11}/184-fsl-mm-codeclib-add_package.patch (100%)
copy patches/buildroot/{2013.11 => 2014.11}/186-uboot-tools-2011.03-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch (100%)
create mode 100644 patches/buildroot/2014.11/188-marble-add_package.patch
copy patches/buildroot/{2013.11 => 2014.11}/189-dbus-fix_installation.patch (100%)
create mode 100644 patches/buildroot/2014.11/197-cunit-add_package.patch
create mode 100644 patches/buildroot/2014.11/201-armadeus-add_gnokii.patch
create mode 100644 patches/buildroot/2014.11/204-wpa-supplicant-add-option-ieee80211w.patch
create mode 100644 patches/buildroot/2014.11/205-busybox-coreutils-stty-add-rs485-config-options.patch
create mode 100644 patches/buildroot/2014.11/208-armadeus-add_beremiz.patch
create mode 100644 patches/buildroot/2014.11/209-armadeus-add_matiec.patch
create mode 100644 patches/buildroot/2014.11/210-poppler-qt_compiling.patch
copy patches/buildroot/{2013.11/214-mplayer-fix-compilation.patch => 2014.11/214-mplayer-fix-compilation.patch.tofix} (100%)
create mode 100644 patches/buildroot/2014.11/219-shiboken-add_package.patch
create mode 100755 patches/buildroot/2014.11/cleanup_buildroot.sh
diff --git a/Makefile b/Makefile
index 0fdf9b3..7caa775 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ ARMADEUS_TOPDIR:=$(shell pwd)
export ARMADEUS_TOPDIR
#--- User configurable stuff:
-#BUILDROOT_VERSION:=2013.05
+#BUILDROOT_VERSION:=2014.11
BUILDROOT_VERSION:=2013.11
include ./Makefile.in
BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
diff --git a/Makefile.in b/Makefile.in
index d33adfe..9bfc5d3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,7 +41,13 @@ endif
ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
ARMADEUS_LIBC_NAME=glibc
endif
+
+# Comment the following line with BR 2014.11
ARMADEUS_BUSYBOX_VERSION:=$(shell echo $(BR2_BUSYBOX_VERSION))
+
+# Uncomment the following line with BR 2014.11
+#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))
ARMADEUS_U_BOOT_BOARD_NAME:=$(shell echo $(BR2_TARGET_UBOOT_BOARDNAME))
ARMADEUS_TARGET_ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
diff --git a/buildroot/package/armadeus/rxtx/rxtx.mk b/buildroot/package/armadeus/rxtx/rxtx.mk
index 881cb32..80656ea 100644
--- a/buildroot/package/armadeus/rxtx/rxtx.mk
+++ b/buildroot/package/armadeus/rxtx/rxtx.mk
@@ -7,8 +7,13 @@ 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 2014.11
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
+#RXTX_INSTALL_TARGET_OPTS = RXTX_PATH=$(TARGET_DIR)/usr/lib/classpath JHOME=$(TARGET_DIR)/usr/lib install
+
ifeq ($(autotools-package), )
$(eval $(call AUTOTARGETS))
else
diff --git a/buildroot/target/device/armadeus/busybox-1.21.0.config b/buildroot/target/device/armadeus/busybox.config
similarity index 100%
copy from buildroot/target/device/armadeus/busybox-1.21.0.config
copy to buildroot/target/device/armadeus/busybox.config
diff --git a/patches/buildroot/2014.11/001-add_armadeus_device.patch b/patches/buildroot/2014.11/001-add_armadeus_device.patch
new file mode 100644
index 0000000..8fca19d
--- /dev/null
+++ b/patches/buildroot/2014.11/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/2013.11/002-add_armadeus_specific_packages.patch b/patches/buildroot/2014.11/002-add_armadeus_specific_packages.patch
similarity index 100%
copy from patches/buildroot/2013.11/002-add_armadeus_specific_packages.patch
copy to patches/buildroot/2014.11/002-add_armadeus_specific_packages.patch
diff --git a/patches/buildroot/2013.05/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch b/patches/buildroot/2014.11/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
similarity index 100%
copy from patches/buildroot/2013.05/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
copy to patches/buildroot/2014.11/005-armadeus-gpsd-add-options-setting-in-menuconfig.patch
diff --git a/patches/buildroot/2014.11/006-armadeus-add-owfs-package.patch b/patches/buildroot/2014.11/006-armadeus-add-owfs-package.patch
new file mode 100644
index 0000000..ab08167
--- /dev/null
+++ b/patches/buildroot/2014.11/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/2014.11/007-armadeus-add-agg-package.patch b/patches/buildroot/2014.11/007-armadeus-add-agg-package.patch
new file mode 100644
index 0000000..6cfaca8
--- /dev/null
+++ b/patches/buildroot/2014.11/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/2014.11/008-armadeus-add-gnash-package.patch b/patches/buildroot/2014.11/008-armadeus-add-gnash-package.patch
new file mode 100644
index 0000000..f3fcdf9
--- /dev/null
+++ b/patches/buildroot/2014.11/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/2014.11/009-armadeus-xc3sprog-new-package.patch b/patches/buildroot/2014.11/009-armadeus-xc3sprog-new-package.patch
new file mode 100644
index 0000000..2c5d059
--- /dev/null
+++ b/patches/buildroot/2014.11/009-armadeus-xc3sprog-new-package.patch
@@ -0,0 +1,108 @@
+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
new file mode 100644
index 0000000..a86634e
--- /dev/null
+++ b/patches/buildroot/2014.11/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/2014.11/011-armadeus-add-tk-package.patch b/patches/buildroot/2014.11/011-armadeus-add-tk-package.patch
new file mode 100644
index 0000000..595c04b
--- /dev/null
+++ b/patches/buildroot/2014.11/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/2014.11/012-armadeus-add-tkinter-support-to-python.patch b/patches/buildroot/2014.11/012-armadeus-add-tkinter-support-to-python.patch
new file mode 100644
index 0000000..08b59cb
--- /dev/null
+++ b/patches/buildroot/2014.11/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/2014.11/014-armadeus-python-wx-add-package.patch b/patches/buildroot/2014.11/014-armadeus-python-wx-add-package.patch
new file mode 100644
index 0000000..5cd8f8e
--- /dev/null
+++ b/patches/buildroot/2014.11/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/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
new file mode 100644
index 0000000..85f03c9
--- /dev/null
+++ b/patches/buildroot/2014.11/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/2014.11/021-armadeus-add-sdl_water-package.patch b/patches/buildroot/2014.11/021-armadeus-add-sdl_water-package.patch
new file mode 100644
index 0000000..a090215
--- /dev/null
+++ b/patches/buildroot/2014.11/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/2014.11/034-armadeus-add-slideshow-package.patch b/patches/buildroot/2014.11/034-armadeus-add-slideshow-package.patch
new file mode 100644
index 0000000..1c1c72f
--- /dev/null
+++ b/patches/buildroot/2014.11/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/2013.05/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
similarity index 100%
copy from patches/buildroot/2013.05/050-U-Boot-add_support_for_custom_configuration_file.patch
copy to patches/buildroot/2014.11/050-U-Boot-add_support_for_custom_configuration_file.patch
diff --git a/patches/buildroot/2014.11/072-armadeus-xenomai-download-adeos-patch.patch b/patches/buildroot/2014.11/072-armadeus-xenomai-download-adeos-patch.patch
new file mode 100644
index 0000000..fcf9ae3
--- /dev/null
+++ b/patches/buildroot/2014.11/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 kernel version in Buildroot matches.
+
+ # RTAI
+ config BR2_LINUX_KERNEL_EXT_RTAI
diff --git a/patches/buildroot/2013.11/072-xenomai-package.tofix b/patches/buildroot/2014.11/072-xenomai-package.tofix
similarity index 100%
copy from patches/buildroot/2013.11/072-xenomai-package.tofix
copy to patches/buildroot/2014.11/072-xenomai-package.tofix
diff --git a/patches/buildroot/2014.11/073-armadeus-xenomai-add-configure-options-for-old-versions.patch b/patches/buildroot/2014.11/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
new file mode 100644
index 0000000..ff76afe
--- /dev/null
+++ b/patches/buildroot/2014.11/073-armadeus-xenomai-add-configure-options-for-old-versions.patch
@@ -0,0 +1,37 @@
+Allows to have old xenomai userspace (2.4/2.5) with recent BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/xenomai/Config.in
+===================================================================
+--- buildroot.orig/package/xenomai/Config.in
++++ buildroot/package/xenomai/Config.in
+@@ -45,6 +45,13 @@ config BR2_PACKAGE_XENOMAI_VERSION
+ BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux
+ Kernel -> Linux Kernel Extensions menu.
+
++config BR2_PACKAGE_XENOMAI_CONF_OPT
++ string "Additionnal configuration options"
++ help
++ Additionnal options that will be passed to configure stage and that
++ can be used for example with old versions of xenomai.
++ For example: --enable-arm-mach=imx with xeno 2.4/2.5
++
+ config BR2_PACKAGE_XENOMAI_TESTSUITE
+ bool "Install testsuite"
+ help
+Index: buildroot/package/xenomai/xenomai.mk
+===================================================================
+--- buildroot.orig/package/xenomai/xenomai.mk
++++ buildroot/package/xenomai/xenomai.mk
+@@ -20,6 +20,10 @@ XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(
+ XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user
+
+ XENOMAI_CONF_OPTS += --includedir=/usr/include/xenomai/ --disable-doc-install
++XENOMAI_ADDITIONAL_CONF_OPT = $(call qstrip,$(BR2_PACKAGE_XENOMAI_CONF_OPTS))
++ifneq ($(XENOMAI_ADDITIONAL_CONF_OPT),)
++XENOMAI_CONF_OPTS += $(XENOMAI_ADDITIONAL_CONF_OPT)
++endif
+
+ define XENOMAI_REMOVE_DEVFILES
+ for i in xeno-config xeno-info wrap-link.sh ; do \
diff --git a/patches/buildroot/2013.11/075-armadeus-pkg-generic-makes-dependecy-evaluated-before-patching.patch b/patches/buildroot/2014.11/075-armadeus-pkg-generic-makes-dependecy-evaluated-before-patching.patch.tofix
similarity index 100%
copy from patches/buildroot/2013.11/075-armadeus-pkg-generic-makes-dependecy-evaluated-before-patching.patch
copy to patches/buildroot/2014.11/075-armadeus-pkg-generic-makes-dependecy-evaluated-before-patching.patch.tofix
diff --git a/patches/buildroot/2014.11/081-adds_quake_package.patch b/patches/buildroot/2014.11/081-adds_quake_package.patch
new file mode 100644
index 0000000..df2c4d8
--- /dev/null
+++ b/patches/buildroot/2014.11/081-adds_quake_package.patch
@@ -0,0 +1,159 @@
+
+This patch adds Quake packages to buildroot:
+* Quake engine itself (SDL port)
+* a shareware data file (PAK/WAD) to test the engine
+
+It is inspired of OpenEmbedded work.
+
+Still searching a way to apply sdlquake-1.0.9-no-x86-asm.patch on all arch
+EXCEPT x86.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/sdlquake/sdlquake.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/sdlquake/sdlquake.mk
+@@ -0,0 +1,22 @@
++##########...
[truncated message content] |
|
From: Sébastien S. <ss...@us...> - 2014-12-04 13:43:13
|
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 ee1ab920f42823e10a3595f1ec9deb1da2c40a12 (commit)
from 4422405411e7b20943d00db7d8a52e3164891285 (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 ee1ab920f42823e10a3595f1ec9deb1da2c40a12
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Dec 4 14:45:22 2014 +0100
[LINUX] 2.6.38: apf51v2: move mc13892's gpo lines in a gpio driver
-----------------------------------------------------------------------
Summary of changes:
.../453-armadeus-add_pmic_mc13892_support.patch | 415 +++++++++++++++++++-
1 files changed, 413 insertions(+), 2 deletions(-)
diff --git a/patches/linux/2.6.38/453-armadeus-add_pmic_mc13892_support.patch b/patches/linux/2.6.38/453-armadeus-add_pmic_mc13892_support.patch
index 878307f..7d8f0c3 100644
--- a/patches/linux/2.6.38/453-armadeus-add_pmic_mc13892_support.patch
+++ b/patches/linux/2.6.38/453-armadeus-add_pmic_mc13892_support.patch
@@ -421,7 +421,13 @@ Index: linux-2.6.38.8/drivers/mfd/mc13xxx-core.c
kfree(mc13xxx);
return ret;
}
-@@ -787,51 +772,51 @@ err_revision:
+@@ -784,54 +769,57 @@ err_revision:
+ pdata->leds, sizeof(*pdata->leds));
+ }
+
++ if (pdata->flags & MC13XXX_USE_GPO)
++ mc13xxx_add_subdevice(mc13xxx, "%s-gpio");
++
return 0;
}
@@ -554,7 +560,7 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
+};
+
+static struct mc13xxx_platform_data apf51_mc13xxx_pdata = {
-+ .flags = MC13XXX_USE_RTC,
++ .flags = MC13XXX_USE_RTC | MC13XXX_USE_GPO,
+};
+
+static struct i2c_board_info apf51v2_i2c1_devices[] __initdata = {
@@ -592,3 +598,408 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
/* APF51 has an Ethernet PHY connected on internal FEC */
imx51_add_fec(NULL);
+Index: linux-2.6.38.8/drivers/gpio/mc13892-gpio.c
+===================================================================
+--- /dev/null
++++ linux-2.6.38.8/drivers/gpio/mc13892-gpio.c
+@@ -0,0 +1,147 @@
++/*
++ * mc13892-gpio.c -- gpiolib support for Freescale MC13892 PMIC
++ *
++ * Copyright 2014 Armadeus Systems
++ *
++ * Author: Sébastien Szymanski <seb...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or (at your
++ * option) any later version.
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/module.h>
++#include <linux/gpio.h>
++#include <linux/mfd/core.h>
++#include <linux/mfd/mc13xxx.h>
++#include <linux/platform_device.h>
++#include <linux/seq_file.h>
++
++#define MC13892_POWERMISC 34
++#define MC13892_POWERMISC_GPO1EN (1 << 6)
++
++struct mc13892_gpio {
++ struct mc13xxx *mc13xxx;
++ struct gpio_chip gpio_chip;
++};
++
++static inline struct mc13892_gpio *to_mc13892_gpio(struct gpio_chip *chip)
++{
++ return container_of(chip, struct mc13892_gpio, gpio_chip);
++}
++
++static int mc13892_gpio_get(struct gpio_chip *chip, unsigned offset)
++{
++ struct mc13892_gpio *mc13892_gpio = to_mc13892_gpio(chip);
++ struct mc13xxx *mc13xxx = mc13892_gpio->mc13xxx;
++ u32 valread;
++ int ret;
++
++ mc13xxx_lock(mc13xxx);
++ ret = mc13xxx_reg_read(mc13xxx, MC13892_POWERMISC, &valread);
++ mc13xxx_unlock(mc13xxx);
++
++ if (ret < 0)
++ return ret;
++
++ if (valread & (MC13892_POWERMISC_GPO1EN << (offset << 1)))
++ return 1;
++
++ return 0;
++}
++
++static void mc13892_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
++{
++ struct mc13892_gpio *mc13892_gpio = to_mc13892_gpio(chip);
++ struct mc13xxx *mc13xxx = mc13892_gpio->mc13xxx;
++ u32 mask = (MC13892_POWERMISC_GPO1EN << (offset << 1));
++
++ mc13xxx_lock(mc13xxx);
++ mc13xxx_reg_rmw(mc13xxx, MC13892_POWERMISC, mask, value ? mask : 0);
++ mc13xxx_unlock(mc13xxx);
++}
++
++static int mc13892_gpio_direction_out(struct gpio_chip *chip,
++ unsigned offset, int value)
++{
++ return 0;
++}
++
++static struct gpio_chip template_chip = {
++ .label = "mc13892",
++ .owner = THIS_MODULE,
++ .direction_output = mc13892_gpio_direction_out,
++ .get = mc13892_gpio_get,
++ .set = mc13892_gpio_set,
++ .ngpio = 4,
++ .base = -1,
++};
++
++static int __devinit mc13892_gpio_probe(struct platform_device *pdev)
++{
++ struct mc13xxx *mc13xxx = dev_get_drvdata(pdev->dev.parent);
++ struct mc13892_gpio *mc13892_gpio;
++ int ret;
++
++ mc13892_gpio = kzalloc(sizeof(*mc13892_gpio), GFP_KERNEL);
++ if (mc13892_gpio == NULL)
++ return -ENOMEM;
++
++ mc13892_gpio->mc13xxx = mc13xxx;
++ mc13892_gpio->gpio_chip = template_chip;
++
++ ret = gpiochip_add(&mc13892_gpio->gpio_chip);
++ if (ret < 0) {
++ dev_err(&pdev->dev, "Could not register gpiochip, %d\n",
++ ret);
++ goto err;
++ }
++
++ platform_set_drvdata(pdev, mc13892_gpio);
++
++ return ret;
++
++err:
++ kfree(mc13892_gpio);
++ return ret;
++}
++
++static int __devexit mc13892_gpio_remove(struct platform_device *pdev)
++{
++ struct mc13892_gpio *mc13892_gpio = platform_get_drvdata(pdev);
++ int ret;
++
++ ret = gpiochip_remove(&mc13892_gpio->gpio_chip);
++ if (ret == 0)
++ kfree(mc13892_gpio);
++
++ return ret;
++}
++
++static struct platform_driver mc13892_gpio_driver = {
++ .driver.name = "mc13892-gpio",
++ .driver.owner = THIS_MODULE,
++ .probe = mc13892_gpio_probe,
++ .remove = __devexit_p(mc13892_gpio_remove),
++};
++
++static int __init mc13892_gpio_init(void)
++{
++ return platform_driver_register(&mc13892_gpio_driver);
++}
++subsys_initcall(mc13892_gpio_init);
++
++static void __exit mc13892_gpio_exit(void)
++{
++ platform_driver_unregister(&mc13892_gpio_driver);
++}
++module_exit(mc13892_gpio_exit);
++
++MODULE_AUTHOR("Sébastien Szymanski <seb...@ar...>");
++MODULE_DESCRIPTION("GPO interface for MC13892 PMIC");
++MODULE_LICENSE("GPL");
++MODULE_ALIAS("platform:mc13892-gpio");
+Index: linux-2.6.38.8/drivers/gpio/Kconfig
+===================================================================
+--- linux-2.6.38.8.orig/drivers/gpio/Kconfig
++++ linux-2.6.38.8/drivers/gpio/Kconfig
+@@ -163,6 +163,13 @@ config GPIO_MAX732X_IRQ
+ Say yes here to enable the max732x to be used as an interrupt
+ controller. It requires the driver to be built in the kernel.
+
++config GPIO_MC13892
++ tristate "MC13892 GPOs"
++ depends on MFD_MC13XXX
++ help
++ Say yes here to access the GPO signals of MC13892 power management
++ chip from Freescale.
++
+ config GPIO_PCA953X
+ tristate "PCA953x, PCA955x, TCA64xx, and MAX7310 I/O ports"
+ depends on I2C
+Index: linux-2.6.38.8/drivers/gpio/Makefile
+===================================================================
+--- linux-2.6.38.8.orig/drivers/gpio/Makefile
++++ linux-2.6.38.8/drivers/gpio/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_GPIO_MAX730X) += max730x.o
+ obj-$(CONFIG_GPIO_MAX7300) += max7300.o
+ obj-$(CONFIG_GPIO_MAX7301) += max7301.o
+ obj-$(CONFIG_GPIO_MAX732X) += max732x.o
++obj-$(CONFIG_GPIO_MC13892) += mc13892-gpio.o
+ obj-$(CONFIG_GPIO_MC33880) += mc33880.o
+ obj-$(CONFIG_GPIO_MCP23S08) += mcp23s08.o
+ obj-$(CONFIG_GPIO_74X164) += 74x164.o
+Index: linux-2.6.38.8/include/linux/mfd/mc13xxx.h
+===================================================================
+--- linux-2.6.38.8.orig/include/linux/mfd/mc13xxx.h
++++ linux-2.6.38.8/include/linux/mfd/mc13xxx.h
+@@ -144,6 +144,7 @@ struct mc13xxx_platform_data {
+ #define MC13XXX_USE_RTC (1 << 3)
+ #define MC13XXX_USE_REGULATOR (1 << 4)
+ #define MC13XXX_USE_LED (1 << 5)
++#define MC13XXX_USE_GPO (1 << 6)
+ unsigned int flags;
+
+ int num_regulators;
+Index: linux-2.6.38.8/include/linux/mfd/mc13892.h
+===================================================================
+--- linux-2.6.38.8.orig/include/linux/mfd/mc13892.h
++++ linux-2.6.38.8/include/linux/mfd/mc13892.h
+@@ -15,25 +15,21 @@
+ #define MC13892_SW2 1
+ #define MC13892_SW3 2
+ #define MC13892_SW4 3
+-#define MC13892_SWBST 4
+-#define MC13892_VIOHI 5
+-#define MC13892_VPLL 6
+-#define MC13892_VDIG 7
+-#define MC13892_VSD 8
+-#define MC13892_VUSB2 9
+-#define MC13892_VVIDEO 10
+-#define MC13892_VAUDIO 11
+-#define MC13892_VCAM 12
+-#define MC13892_VGEN1 13
+-#define MC13892_VGEN2 14
+-#define MC13892_VGEN3 15
+-#define MC13892_VUSB 16
+-#define MC13892_GPO1 17
+-#define MC13892_GPO2 18
+-#define MC13892_GPO3 19
+-#define MC13892_GPO4 20
+-#define MC13892_PWGT1SPI 21
+-#define MC13892_PWGT2SPI 22
+-#define MC13892_VCOINCELL 23
++#define MC13892_SWBST 4
++#define MC13892_VIOHI 5
++#define MC13892_VPLL 6
++#define MC13892_VDIG 7
++#define MC13892_VSD 8
++#define MC13892_VUSB2 9
++#define MC13892_VVIDEO 10
++#define MC13892_VAUDIO 11
++#define MC13892_VCAM 12
++#define MC13892_VGEN1 13
++#define MC13892_VGEN2 14
++#define MC13892_VGEN3 15
++#define MC13892_VUSB 16
++#define MC13892_PWGT1SPI 17
++#define MC13892_PWGT2SPI 18
++#define MC13892_VCOINCELL 19
+
+ #endif
+Index: linux-2.6.38.8/drivers/regulator/mc13892-regulator.c
+===================================================================
+--- linux-2.6.38.8.orig/drivers/regulator/mc13892-regulator.c
++++ linux-2.6.38.8/drivers/regulator/mc13892-regulator.c
+@@ -135,17 +135,6 @@
+ #define MC13892_REGULATORMODE1_VSDSTDBY (1<<19)
+ #define MC13892_REGULATORMODE1_VSDMODE (1<<20)
+
+-#define MC13892_POWERMISC 34
+-#define MC13892_POWERMISC_GPO1EN (1<<6)
+-#define MC13892_POWERMISC_GPO2EN (1<<8)
+-#define MC13892_POWERMISC_GPO3EN (1<<10)
+-#define MC13892_POWERMISC_GPO4EN (1<<12)
+-#define MC13892_POWERMISC_PWGT1SPIEN (1<<15)
+-#define MC13892_POWERMISC_PWGT2SPIEN (1<<16)
+-#define MC13892_POWERMISC_GPO4ADINEN (1<<21)
+-
+-#define MC13892_POWERMISC_PWGTSPI_M (3 << 15)
+-
+ #define MC13892_USB1 50
+ #define MC13892_USB1_VUSBEN (1<<3)
+
+@@ -229,15 +218,10 @@ static const int mc13892_vusb[] = {
+ 3300000,
+ };
+
+-static const int mc13892_gpo[] = {
+- 2750000,
+-};
+-
+ static const int mc13892_pwgtdrv[] = {
+ 5000000,
+ };
+
+-static struct regulator_ops mc13892_gpo_regulator_ops;
+ /* sw regulators need special care due to the "hi bit" */
+ static struct regulator_ops mc13892_sw_regulator_ops;
+
+@@ -246,10 +230,6 @@ static struct regulator_ops mc13892_sw_r
+ MC13xxx_FIXED_DEFINE(MC13892_, name, reg, voltages, \
+ mc13xxx_fixed_regulator_ops)
+
+-#define MC13892_GPO_DEFINE(name, reg, voltages) \
+- MC13xxx_GPO_DEFINE(MC13892_, name, reg, voltages, \
+- mc13892_gpo_regulator_ops)
+-
+ #define MC13892_SW_DEFINE(name, reg, vsel_reg, voltages) \
+ MC13xxx_DEFINE(MC13892_, name, reg, vsel_reg, voltages, \
+ mc13892_sw_regulator_ops)
+@@ -287,115 +267,6 @@ static struct mc13xxx_regulator mc13892_
+ MC13892_DEFINE_REGU(VGEN3, REGULATORMODE1, REGULATORSETTING0, \
+ mc13892_vgen3),
+ MC13892_FIXED_DEFINE(VUSB, USB1, mc13892_vusb),
+- MC13892_GPO_DEFINE(GPO1, POWERMISC, mc13892_gpo),
+- MC13892_GPO_DEFINE(GPO2, POWERMISC, mc13892_gpo),
+- MC13892_GPO_DEFINE(GPO3, POWERMISC, mc13892_gpo),
+- MC13892_GPO_DEFINE(GPO4, POWERMISC, mc13892_gpo),
+- MC13892_GPO_DEFINE(PWGT1SPI, POWERMISC, mc13892_pwgtdrv),
+- MC13892_GPO_DEFINE(PWGT2SPI, POWERMISC, mc13892_pwgtdrv),
+-};
+-
+-static int mc13892_powermisc_rmw(struct mc13xxx_regulator_priv *priv, u32 mask,
+- u32 val)
+-{
+- struct mc13xxx *mc13892 = priv->mc13xxx;
+- int ret;
+- u32 valread;
+-
+- BUG_ON(val & ~mask);
+-
+- ret = mc13xxx_reg_read(mc13892, MC13892_POWERMISC, &valread);
+- if (ret)
+- return ret;
+-
+- /* Update the stored state for Power Gates. */
+- priv->powermisc_pwgt_state =
+- (priv->powermisc_pwgt_state & ~mask) | val;
+- priv->powermisc_pwgt_state &= MC13892_POWERMISC_PWGTSPI_M;
+-
+- /* Construct the new register value */
+- valread = (valread & ~mask) | val;
+- /* Overwrite the PWGTxEN with the stored version */
+- valread = (valread & ~MC13892_POWERMISC_PWGTSPI_M) |
+- priv->powermisc_pwgt_state;
+-
+- return mc13xxx_reg_write(mc13892, MC13892_POWERMISC, valread);
+-}
+-
+-static int mc13892_gpo_regulator_enable(struct regulator_dev *rdev)
+-{
+- struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev);
+- int id = rdev_get_id(rdev);
+- int ret;
+- u32 en_val = mc13892_regulators[id].enable_bit;
+- u32 mask = mc13892_regulators[id].enable_bit;
+-
+- dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);
+-
+- /* Power Gate enable value is 0 */
+- if (id == MC13892_PWGT1SPI || id == MC13892_PWGT2SPI)
+- en_val = 0;
+-
+- if (id == MC13892_GPO4)
+- mask |= MC13892_POWERMISC_GPO4ADINEN;
+-
+- mc13xxx_lock(priv->mc13xxx);
+- ret = mc13892_powermisc_rmw(priv, mask, en_val);
+- mc13xxx_unlock(priv->mc13xxx);
+-
+- return ret;
+-}
+-
+-static int mc13892_gpo_regulator_disable(struct regulator_dev *rdev)
+-{
+- struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev);
+- int id = rdev_get_id(rdev);
+- int ret;
+- u32 dis_val = 0;
+-
+- dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);
+-
+- /* Power Gate disable value is 1 */
+- if (id == MC13892_PWGT1SPI || id == MC13892_PWGT2SPI)
+- dis_val = mc13892_regulators[id].enable_bit;
+-
+- mc13xxx_lock(priv->mc13xxx);
+- ret = mc13892_powermisc_rmw(priv, mc13892_regulators[id].enable_bit,
+- dis_val);
+- mc13xxx_unlock(priv->mc13xxx);
+-
+- return ret;
+-}
+-
+-static int mc13892_gpo_regulator_is_enabled(struct regulator_dev *rdev)
+-{
+- struct mc13xxx_regulator_priv *priv = rdev_get_drvdata(rdev);
+- int ret, id = rdev_get_id(rdev);
+- unsigned int val;
+-
+- mc13xxx_lock(priv->mc13xxx);
+- ret = mc13xxx_reg_read(priv->mc13xxx, mc13892_regulators[id].reg, &val);
+- mc13xxx_unlock(priv->mc13xxx);
+-
+- if (ret)
+- return ret;
+-
+- /* Power Gates state is stored in powermisc_pwgt_state
+- * where the meaning of bits is negated */
+- val = (val & ~MC13892_POWERMISC_PWGTSPI_M) |
+- (priv->powermisc_pwgt_state ^ MC13892_POWERMISC_PWGTSPI_M);
+-
+- return (val & mc13892_regulators[id].enable_bit) != 0;
+-}
+-
+-
+-static struct regulator_ops mc13892_gpo_regulator_ops = {
+- .enable = mc13892_gpo_regulator_enable,
+- .disable = mc13892_gpo_regulator_disable,
+- .is_enabled = mc13892_gpo_regulator_is_enabled,
+- .list_voltage = mc13xxx_regulator_list_voltage,
+- .set_voltage = mc13xxx_fixed_regulator_set_voltage,
+- .get_voltage = mc13xxx_fixed_regulator_get_voltage,
+ };
+
+ static int mc13892_sw_regulator_get_voltage(struct regulator_dev *rdev)
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-12-03 15:26:18
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4422405411e7b20943d00db7d8a52e3164891285 (commit)
from 18b2b3d03ad63d29c4f7de2175013744bda1453a (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 4422405411e7b20943d00db7d8a52e3164891285
Author: Sébastien Szymanski <seb...@ar...>
Date: Wed Dec 3 16:28:22 2014 +0100
[LINUX] 2.6.38: apf51v2: add MC13892 PMIC support
-----------------------------------------------------------------------
Summary of changes:
.../453-armadeus-add_pmic_mc13892_support.patch | 594 ++++++++++++++++++++
1 files changed, 594 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/2.6.38/453-armadeus-add_pmic_mc13892_support.patch
diff --git a/patches/linux/2.6.38/453-armadeus-add_pmic_mc13892_support.patch b/patches/linux/2.6.38/453-armadeus-add_pmic_mc13892_support.patch
new file mode 100644
index 0000000..878307f
--- /dev/null
+++ b/patches/linux/2.6.38/453-armadeus-add_pmic_mc13892_support.patch
@@ -0,0 +1,594 @@
+Index: linux-2.6.38.8/drivers/mfd/mc13xxx-core.c
+===================================================================
+--- linux-2.6.38.8.orig/drivers/mfd/mc13xxx-core.c
++++ linux-2.6.38.8/drivers/mfd/mc13xxx-core.c
+@@ -14,15 +14,22 @@
+ #include <linux/module.h>
+ #include <linux/platform_device.h>
+ #include <linux/mutex.h>
++#include <linux/i2c.h>
+ #include <linux/interrupt.h>
+-#include <linux/spi/spi.h>
+ #include <linux/mfd/core.h>
+ #include <linux/mfd/mc13xxx.h>
+
++enum mc13xxx_id {
++ MC13XXX_ID_MC13783,
++ MC13XXX_ID_MC13892,
++ MC13XXX_ID_INVALID,
++};
++
+ struct mc13xxx {
+- struct spi_device *spidev;
++ struct i2c_client *client;
+ struct mutex lock;
+ int irq;
++ enum mc13xxx_id id;
+
+ irq_handler_t irqhandler[MC13XXX_NUM_IRQ];
+ void *irqdata[MC13XXX_NUM_IRQ];
+@@ -40,7 +47,7 @@ struct mc13xxx *mc13783_to_mc13xxx(struc
+ }
+ EXPORT_SYMBOL(mc13783_to_mc13xxx);
+
+-#define MC13XXX_IRQSTAT0 0
++#define MC13XXX_IRQSTAT0 0
+ #define MC13XXX_IRQSTAT0_ADCDONEI (1 << 0)
+ #define MC13XXX_IRQSTAT0_ADCBISDONEI (1 << 1)
+ #define MC13XXX_IRQSTAT0_TSI (1 << 2)
+@@ -62,7 +69,7 @@ EXPORT_SYMBOL(mc13783_to_mc13xxx);
+ #define MC13783_IRQSTAT0_CKDETI (1 << 22)
+ #define MC13783_IRQSTAT0_UDMI (1 << 23)
+
+-#define MC13XXX_IRQMASK0 1
++#define MC13XXX_IRQMASK0 1
+ #define MC13XXX_IRQMASK0_ADCDONEM MC13XXX_IRQSTAT0_ADCDONEI
+ #define MC13XXX_IRQMASK0_ADCBISDONEM MC13XXX_IRQSTAT0_ADCBISDONEI
+ #define MC13XXX_IRQMASK0_TSM MC13XXX_IRQSTAT0_TSI
+@@ -84,7 +91,7 @@ EXPORT_SYMBOL(mc13783_to_mc13xxx);
+ #define MC13783_IRQMASK0_CKDETM MC13783_IRQSTAT0_CKDETI
+ #define MC13783_IRQMASK0_UDMM MC13783_IRQSTAT0_UDMI
+
+-#define MC13XXX_IRQSTAT1 3
++#define MC13XXX_IRQSTAT1 3
+ #define MC13XXX_IRQSTAT1_1HZI (1 << 0)
+ #define MC13XXX_IRQSTAT1_TODAI (1 << 1)
+ #define MC13783_IRQSTAT1_ONOFD1I (1 << 3)
+@@ -106,7 +113,7 @@ EXPORT_SYMBOL(mc13783_to_mc13xxx);
+ #define MC13783_IRQSTAT1_ALSPTHI (1 << 20)
+ #define MC13783_IRQSTAT1_AHSSHORTI (1 << 21)
+
+-#define MC13XXX_IRQMASK1 4
++#define MC13XXX_IRQMASK1 4
+ #define MC13XXX_IRQMASK1_1HZM MC13XXX_IRQSTAT1_1HZI
+ #define MC13XXX_IRQMASK1_TODAM MC13XXX_IRQSTAT1_TODAI
+ #define MC13783_IRQMASK1_ONOFD1M MC13783_IRQSTAT1_ONOFD1I
+@@ -128,7 +135,7 @@ EXPORT_SYMBOL(mc13783_to_mc13xxx);
+ #define MC13783_IRQMASK1_ALSPTHM MC13783_IRQSTAT1_ALSPTHI
+ #define MC13783_IRQMASK1_AHSSHORTM MC13783_IRQSTAT1_AHSSHORTI
+
+-#define MC13XXX_REVISION 7
++#define MC13XXX_REVISION 7
+ #define MC13XXX_REVISION_REVMETAL (0x07 << 0)
+ #define MC13XXX_REVISION_REVFULL (0x03 << 3)
+ #define MC13XXX_REVISION_ICID (0x07 << 6)
+@@ -136,43 +143,46 @@ EXPORT_SYMBOL(mc13783_to_mc13xxx);
+ #define MC13XXX_REVISION_FAB (0x03 << 11)
+ #define MC13XXX_REVISION_ICIDCODE (0x3f << 13)
+
+-#define MC13783_ADC1 44
++#define MC13XXX_PWRCTRL2 15
++#define MC13XXX_PWRCTRL2_PWRON3RSTEN (1 << 3)
++
++#define MC13783_ADC1 44
+ #define MC13783_ADC1_ADEN (1 << 0)
+ #define MC13783_ADC1_RAND (1 << 1)
+ #define MC13783_ADC1_ADSEL (1 << 3)
+ #define MC13783_ADC1_ASC (1 << 20)
+ #define MC13783_ADC1_ADTRIGIGN (1 << 21)
+
+-#define MC13783_ADC2 45
++#define MC13783_ADC2 45
++
++#define MC13XXX_ADC3 46
+
+-#define MC13XXX_NUMREGS 0x3f
++#define MC13XXX_NUMREGS 0x3f
+
+ void mc13xxx_lock(struct mc13xxx *mc13xxx)
+ {
+ if (!mutex_trylock(&mc13xxx->lock)) {
+- dev_dbg(&mc13xxx->spidev->dev, "wait for %s from %pf\n",
++ dev_dbg(&mc13xxx->client->dev, "wait for %s from %pf\n",
+ __func__, __builtin_return_address(0));
+
+ mutex_lock(&mc13xxx->lock);
+ }
+- dev_dbg(&mc13xxx->spidev->dev, "%s from %pf\n",
++ dev_dbg(&mc13xxx->client->dev, "%s from %pf\n",
+ __func__, __builtin_return_address(0));
+ }
+ EXPORT_SYMBOL(mc13xxx_lock);
+
+ void mc13xxx_unlock(struct mc13xxx *mc13xxx)
+ {
+- dev_dbg(&mc13xxx->spidev->dev, "%s from %pf\n",
++ dev_dbg(&mc13xxx->client->dev, "%s from %pf\n",
+ __func__, __builtin_return_address(0));
+ mutex_unlock(&mc13xxx->lock);
+ }
+ EXPORT_SYMBOL(mc13xxx_unlock);
+
+-#define MC13XXX_REGOFFSET_SHIFT 25
+ int mc13xxx_reg_read(struct mc13xxx *mc13xxx, unsigned int offset, u32 *val)
+ {
+- struct spi_transfer t;
+- struct spi_message m;
++ u8 buf[3];
+ int ret;
+
+ BUG_ON(!mutex_is_locked(&mc13xxx->lock));
+@@ -180,28 +190,15 @@ int mc13xxx_reg_read(struct mc13xxx *mc1
+ if (offset > MC13XXX_NUMREGS)
+ return -EINVAL;
+
+- *val = offset << MC13XXX_REGOFFSET_SHIFT;
+-
+- memset(&t, 0, sizeof(t));
+-
+- t.tx_buf = val;
+- t.rx_buf = val;
+- t.len = sizeof(u32);
+-
+- spi_message_init(&m);
+- spi_message_add_tail(&t, &m);
+-
+- ret = spi_sync(mc13xxx->spidev, &m);
+-
+- /* error in message.status implies error return from spi_sync */
+- BUG_ON(!ret && m.status);
+-
+- if (ret)
++ ret = i2c_smbus_read_i2c_block_data(mc13xxx->client, offset, 3, buf);
++ if (ret < 0) {
++ dev_dbg(&mc13xxx->client->dev, "failed reading at 0x%02x", offset);
+ return ret;
++ }
+
+- *val &= 0xffffff;
++ *val = ((buf[0] << 16) | (buf[1] << 8) | (buf[2]));
+
+- dev_vdbg(&mc13xxx->spidev->dev, "[0x%02x] -> 0x%06x\n", offset, *val);
++ dev_vdbg(&mc13xxx->client->dev, "[0x%02x] -> 0x%06x\n", offset, *val);
+
+ return 0;
+ }
+@@ -209,35 +206,25 @@ EXPORT_SYMBOL(mc13xxx_reg_read);
+
+ int mc13xxx_reg_write(struct mc13xxx *mc13xxx, unsigned int offset, u32 val)
+ {
+- u32 buf;
+- struct spi_transfer t;
+- struct spi_message m;
++ u8 buf[3];
+ int ret;
+
+ BUG_ON(!mutex_is_locked(&mc13xxx->lock));
+
+- dev_vdbg(&mc13xxx->spidev->dev, "[0x%02x] <- 0x%06x\n", offset, val);
++ dev_vdbg(&mc13xxx->client->dev, "[0x%02x] <- 0x%06x\n", offset, val);
+
+ if (offset > MC13XXX_NUMREGS || val > 0xffffff)
+ return -EINVAL;
+
+- buf = 1 << 31 | offset << MC13XXX_REGOFFSET_SHIFT | val;
+-
+- memset(&t, 0, sizeof(t));
+-
+- t.tx_buf = &buf;
+- t.rx_buf = &buf;
+- t.len = sizeof(u32);
+-
+- spi_message_init(&m);
+- spi_message_add_tail(&t, &m);
+-
+- ret = spi_sync(mc13xxx->spidev, &m);
+-
+- BUG_ON(!ret && m.status);
+-
+- if (ret)
++ buf[0] = (val >> 16) & 0xff;
++ buf[1] = (val >> 8) & 0xff;
++ buf[2] = val & 0xff;
++
++ ret = i2c_smbus_write_i2c_block_data(mc13xxx->client, offset, 3, buf);
++ if (ret < 0) {
++ dev_dbg(&mc13xxx->client->dev, "failed writing 0x%06x at 0x%02x", val, offset);
+ return ret;
++ }
+
+ return 0;
+ }
+@@ -445,7 +432,7 @@ static int mc13xxx_irq_handle(struct mc1
+ if (handled == IRQ_HANDLED)
+ num_handled++;
+ } else {
+- dev_err(&mc13xxx->spidev->dev,
++ dev_err(&mc13xxx->client->dev,
+ "BUG: irq %u but no handler\n",
+ baseirq + irq);
+
+@@ -481,26 +468,20 @@ static irqreturn_t mc13xxx_irq_thread(in
+ return IRQ_RETVAL(handled);
+ }
+
+-enum mc13xxx_id {
+- MC13XXX_ID_MC13783,
+- MC13XXX_ID_MC13892,
+- MC13XXX_ID_INVALID,
+-};
+-
+ const char *mc13xxx_chipname[] = {
+ [MC13XXX_ID_MC13783] = "mc13783",
+ [MC13XXX_ID_MC13892] = "mc13892",
+ };
+
+ #define maskval(reg, mask) (((reg) & (mask)) >> __ffs(mask))
+-static int mc13xxx_identify(struct mc13xxx *mc13xxx, enum mc13xxx_id *id)
++static int mc13xxx_identify(struct mc13xxx *mc13xxx)
+ {
+ u32 icid;
+ u32 revision;
+- const char *name;
++ enum mc13xxx_id id;
+ int ret;
+
+- ret = mc13xxx_reg_read(mc13xxx, 46, &icid);
++ ret = mc13xxx_reg_read(mc13xxx, MC13XXX_ADC3, &icid);
+ if (ret)
+ return ret;
+
+@@ -508,26 +489,24 @@ static int mc13xxx_identify(struct mc13x
+
+ switch (icid) {
+ case 2:
+- *id = MC13XXX_ID_MC13783;
+- name = "mc13783";
++ id = MC13XXX_ID_MC13783;
+ break;
+ case 7:
+- *id = MC13XXX_ID_MC13892;
+- name = "mc13892";
++ id = MC13XXX_ID_MC13892;
+ break;
+ default:
+- *id = MC13XXX_ID_INVALID;
++ id = MC13XXX_ID_INVALID;
+ break;
+ }
+
+- if (*id == MC13XXX_ID_MC13783 || *id == MC13XXX_ID_MC13892) {
++ if (id == MC13XXX_ID_MC13783 || id == MC13XXX_ID_MC13892) {
+ ret = mc13xxx_reg_read(mc13xxx, MC13XXX_REVISION, &revision);
+ if (ret)
+ return ret;
+
+- dev_info(&mc13xxx->spidev->dev, "%s: rev: %d.%d, "
++ dev_info(&mc13xxx->client->dev, "%s: rev: %d.%d, "
+ "fin: %d, fab: %d, icid: %d/%d\n",
+- mc13xxx_chipname[*id],
++ mc13xxx_chipname[id],
+ maskval(revision, MC13XXX_REVISION_REVFULL),
+ maskval(revision, MC13XXX_REVISION_REVMETAL),
+ maskval(revision, MC13XXX_REVISION_FIN),
+@@ -536,11 +515,11 @@ static int mc13xxx_identify(struct mc13x
+ maskval(revision, MC13XXX_REVISION_ICIDCODE));
+ }
+
+- if (*id != MC13XXX_ID_INVALID) {
+- const struct spi_device_id *devid =
+- spi_get_device_id(mc13xxx->spidev);
+- if (!devid || devid->driver_data != *id)
+- dev_warn(&mc13xxx->spidev->dev, "device id doesn't "
++ if (id != MC13XXX_ID_INVALID) {
++ enum mc13xxx_id devid = mc13xxx->id;
++
++ if (devid != id)
++ dev_warn(&mc13xxx->client->dev, "device id doesn't "
+ "match auto detection!\n");
+ }
+
+@@ -549,13 +528,9 @@ static int mc13xxx_identify(struct mc13x
+
+ static const char *mc13xxx_get_chipname(struct mc13xxx *mc13xxx)
+ {
+- const struct spi_device_id *devid =
+- spi_get_device_id(mc13xxx->spidev);
+-
+- if (!devid)
+- return NULL;
++ enum mc13xxx_id devid = mc13xxx->id;
+
+- return mc13xxx_chipname[devid->driver_data];
++ return mc13xxx_chipname[devid];
+ }
+
+ #include <linux/mfd/mc13783.h>
+@@ -563,7 +538,7 @@ static const char *mc13xxx_get_chipname(
+ int mc13xxx_get_flags(struct mc13xxx *mc13xxx)
+ {
+ struct mc13xxx_platform_data *pdata =
+- dev_get_platdata(&mc13xxx->spidev->dev);
++ dev_get_platdata(&mc13xxx->client->dev);
+
+ return pdata->flags;
+ }
+@@ -601,7 +576,7 @@ int mc13783_adc_do_conversion(struct mc1
+ };
+ init_completion(&adcdone_data.done);
+
+- dev_dbg(&mc13xxx->spidev->dev, "%s\n", __func__);
++ dev_dbg(&mc13xxx->client->dev, "%s\n", __func__);
+
+ mc13xxx_lock(mc13xxx);
+
+@@ -643,7 +618,7 @@ int mc13783_adc_do_conversion(struct mc1
+ return -EINVAL;
+ }
+
+- dev_dbg(&mc13783->mc13xxx.spidev->dev, "%s: request irq\n", __func__);
++ dev_dbg(&mc13783->mc13xxx.client->dev, "%s: request irq\n", __func__);
+ mc13xxx_irq_request(mc13xxx, MC13783_IRQ_ADCDONE,
+ mc13783_handler_adcdone, __func__, &adcdone_data);
+ mc13xxx_irq_ack(mc13xxx, MC13783_IRQ_ADCDONE);
+@@ -701,7 +676,7 @@ static int mc13xxx_add_subdevice_pdata(s
+ if (!cell.name)
+ return -ENOMEM;
+
+- return mfd_add_devices(&mc13xxx->spidev->dev, -1, &cell, 1, NULL, 0);
++ return mfd_add_devices(&mc13xxx->client->dev, -1, &cell, 1, NULL, 0);
+ }
+
+ static int mc13xxx_add_subdevice(struct mc13xxx *mc13xxx, const char *format)
+@@ -709,31 +684,41 @@ static int mc13xxx_add_subdevice(struct
+ return mc13xxx_add_subdevice_pdata(mc13xxx, format, NULL, 0);
+ }
+
+-static int mc13xxx_probe(struct spi_device *spi)
++static int mc13xxx_probe(struct i2c_client *i2c,
++ const struct i2c_device_id *i2c_id)
+ {
+ struct mc13xxx *mc13xxx;
+- struct mc13xxx_platform_data *pdata = dev_get_platdata(&spi->dev);
+- enum mc13xxx_id id;
++ struct mc13xxx_platform_data *pdata = dev_get_platdata(&i2c->dev);
+ int ret;
+
++ if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
++ return -EINVAL;
++
+ mc13xxx = kzalloc(sizeof(*mc13xxx), GFP_KERNEL);
+ if (!mc13xxx)
+ return -ENOMEM;
+
+- dev_set_drvdata(&spi->dev, mc13xxx);
+- spi->mode = SPI_MODE_0 | SPI_CS_HIGH;
+- spi->bits_per_word = 32;
+- spi_setup(spi);
+-
+- mc13xxx->spidev = spi;
+-
+ mutex_init(&mc13xxx->lock);
+ mc13xxx_lock(mc13xxx);
+
+- ret = mc13xxx_identify(mc13xxx, &id);
+- if (ret || id == MC13XXX_ID_INVALID)
++ dev_set_drvdata(&i2c->dev, mc13xxx);
++ mc13xxx->client = i2c;
++
++ if (!i2c_id)
++ return -EINVAL;
++
++ mc13xxx->id = i2c_id->driver_data;
++
++ ret = mc13xxx_identify(mc13xxx);
++ if (ret)
+ goto err_revision;
+
++ /* enable reset on PWRON3 pin */
++ ret = mc13xxx_reg_rmw(mc13xxx, MC13XXX_PWRCTRL2, MC13XXX_PWRCTRL2_PWRON3RSTEN,
++ MC13XXX_PWRCTRL2_PWRON3RSTEN);
++ if (ret)
++ goto err_mask;
++
+ /* mask all irqs */
+ ret = mc13xxx_reg_write(mc13xxx, MC13XXX_IRQMASK0, 0x00ffffff);
+ if (ret)
+@@ -743,14 +728,14 @@ static int mc13xxx_probe(struct spi_devi
+ if (ret)
+ goto err_mask;
+
+- ret = request_threaded_irq(spi->irq, NULL, mc13xxx_irq_thread,
++ ret = request_threaded_irq(i2c->irq, NULL, mc13xxx_irq_thread,
+ IRQF_ONESHOT | IRQF_TRIGGER_HIGH, "mc13xxx", mc13xxx);
+
+ if (ret) {
+ err_mask:
+ err_revision:
+ mc13xxx_unlock(mc13xxx);
+- dev_set_drvdata(&spi->dev, NULL);
++ dev_set_drvdata(&i2c->dev, NULL);
+ kfree(mc13xxx);
+ return ret;
+ }
+@@ -787,51 +772,51 @@ err_revision:
+ return 0;
+ }
+
+-static int __devexit mc13xxx_remove(struct spi_device *spi)
++static int __devexit mc13xxx_remove(struct i2c_client *i2c)
+ {
+- struct mc13xxx *mc13xxx = dev_get_drvdata(&spi->dev);
++ struct mc13xxx *mc13xxx = dev_get_drvdata(&i2c->dev);
+
+- free_irq(mc13xxx->spidev->irq, mc13xxx);
++ free_irq(mc13xxx->client->irq, mc13xxx);
+
+- mfd_remove_devices(&spi->dev);
++ mfd_remove_devices(&i2c->dev);
+
+ kfree(mc13xxx);
+
+ return 0;
+ }
+
+-static const struct spi_device_id mc13xxx_device_id[] = {
+- {
+- .name = "mc13783",
+- .driver_data = MC13XXX_ID_MC13783,
+- }, {
+- .name = "mc13892",
+- .driver_data = MC13XXX_ID_MC13892,
+- }, {
+- /* sentinel */
+- }
++static const struct i2c_device_id mc13xxx_device_id[] = {
++ { "mc13783", MC13XXX_ID_MC13783 },
++ { "mc13892", MC13XXX_ID_MC13892 },
++ { /* sentinel */ },
+ };
++MODULE_DEVICE_TABLE(i2c, mc13xxx_device_id);
+
+-static struct spi_driver mc13xxx_driver = {
+- .id_table = mc13xxx_device_id,
++static struct i2c_driver mc13xxx_driver = {
+ .driver = {
+ .name = "mc13xxx",
+- .bus = &spi_bus_type,
+ .owner = THIS_MODULE,
+ },
+ .probe = mc13xxx_probe,
+ .remove = __devexit_p(mc13xxx_remove),
++ .id_table = mc13xxx_device_id,
+ };
+
+ static int __init mc13xxx_init(void)
+ {
+- return spi_register_driver(&mc13xxx_driver);
++ int ret;
++
++ ret = i2c_add_driver(&mc13xxx_driver);
++ if (ret != 0)
++ pr_err("Failed to register mc13xxx I2C driver: %d\n", ret);
++
++ return ret;
+ }
+ subsys_initcall(mc13xxx_init);
+
+ static void __exit mc13xxx_exit(void)
+ {
+- spi_unregister_driver(&mc13xxx_driver);
++ i2c_del_driver(&mc13xxx_driver);
+ }
+ module_exit(mc13xxx_exit);
+
+Index: linux-2.6.38.8/drivers/mfd/Kconfig
+===================================================================
+--- linux-2.6.38.8.orig/drivers/mfd/Kconfig
++++ linux-2.6.38.8/drivers/mfd/Kconfig
+@@ -429,7 +429,7 @@ config MFD_MC13783
+
+ config MFD_MC13XXX
+ tristate "Support Freescale MC13783 and MC13892"
+- depends on SPI_MASTER
++ depends on I2C
+ select MFD_CORE
+ select MFD_MC13783
+ help
+Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
+===================================================================
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/board-apf51.c
++++ linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
+@@ -21,6 +21,7 @@
+ #include <linux/usb/otg.h>
+ #include <linux/fec.h>
+ #include <linux/i2c.h>
++#include <linux/mfd/mc13xxx.h>
+ #include <linux/mfd/wm831x/core.h>
+ #include <linux/mfd/wm831x/pdata.h>
+ #include <linux/irq.h>
+@@ -313,11 +314,12 @@ static inline void apf51_fec_reset(void)
+ #endif
+
+ /* APF51 has a Wolfson PMIC on I2C2 */
++/* APF51v2 has a Freescale MC13892 PMIC on I2C2 */
+ static const struct imxi2c_platform_data apf51_i2c_data __initconst = {
+ .bitrate = 400000,
+ };
+
+-#define APF51_WM8311_IRQ_GPIO (0*32 + 7) /* GPIO1_7 */
++#define APF51_PMIC_IRQ_GPIO (0*32 + 7) /* GPIO1_7 */
+ #define APF51_WM8311_TOUCH_DETECT_GPIO (0*32 + 4) /* GPIO1_4 */
+ #define APF51_WM8311_TOUCH_EOC_GPIO (0*32 + 6) /* GPIO1_6 */
+
+@@ -326,9 +328,9 @@ static int apf51_wm8311_pre_init(struct
+ int ret = 0;
+
+ /* PMIC_IRQ line */
+- gpio_request(APF51_WM8311_IRQ_GPIO, "wm8311_irq");
+- gpio_direction_input(APF51_WM8311_IRQ_GPIO);
+- set_irq_type(gpio_to_irq(APF51_WM8311_IRQ_GPIO), IRQF_TRIGGER_FALLING);
++ gpio_request(APF51_PMIC_IRQ_GPIO, "wm8311_irq");
++ gpio_direction_input(APF51_PMIC_IRQ_GPIO);
++ set_irq_type(gpio_to_irq(APF51_PMIC_IRQ_GPIO), IRQF_TRIGGER_FALLING);
+
+ /* TOUCH_DETECT line */
+ gpio_request(APF51_WM8311_TOUCH_DETECT_GPIO, "wm8311_touch_detect");
+@@ -394,7 +396,19 @@ static struct i2c_board_info apf51_i2c1_
+ I2C_BOARD_INFO("wm8311", 0x36),
+ #endif
+ .platform_data = &apf51_wm8311_pdata,
+- .irq = gpio_to_irq(APF51_WM8311_IRQ_GPIO),
++ .irq = gpio_to_irq(APF51_PMIC_IRQ_GPIO),
++ },
++};
++
++static struct mc13xxx_platform_data apf51_mc13xxx_pdata = {
++ .flags = MC13XXX_USE_RTC,
++};
++
++static struct i2c_board_info apf51v2_i2c1_devices[] __initdata = {
++ {
++ I2C_BOARD_INFO("mc13892", 0x09),
++ .platform_data = &apf51_mc13xxx_pdata,
++ .irq = gpio_to_irq(APF51_PMIC_IRQ_GPIO),
+ },
+ };
+
+@@ -437,6 +451,7 @@ static int apf51_fpga_init(void)
+ return 0;
+ }
+
++#define APF51_VERSION_GPIO (2*32 + 12) /* GPIO3_12 */
+
+ /*
+ * Board specific initialization.
+@@ -456,7 +471,17 @@ static void __init apf51_board_init(void
+ #endif
+
+ imx51_add_imx_i2c(1, &apf51_i2c_data);
+- i2c_register_board_info(1, apf51_i2c1_devices, ARRAY_SIZE(apf51_i2c1_devices));
++
++ gpio_request(APF51_VERSION_GPIO, "apf51-version");
++ gpio_direction_input(APF51_VERSION_GPIO);
++ if (gpio_get_value(APF51_VERSION_GPIO)) {
++ printk("APF51 v1 detected.\n");
++ i2c_register_board_info(1, apf51_i2c1_devices, ARRAY_SIZE(apf51_i2c1_devices));
++ }
++ else {
++ printk("APF51 v2 detected.\n");
++ i2c_register_board_info(1, apf51v2_i2c1_devices, ARRAY_SIZE(apf51v2_i2c1_devices));
++ }
+
+ /* APF51 has an Ethernet PHY connected on internal FEC */
+ imx51_add_fec(NULL);
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-11-28 17:00: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 18b2b3d03ad63d29c4f7de2175013744bda1453a (commit)
via 907d78549545034d2f06dc3bc5884a9882efc6c6 (commit)
from 957ad91c4e6741b478d150c8d3cdbcc4f22bb345 (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 18b2b3d03ad63d29c4f7de2175013744bda1453a
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Nov 28 18:02:13 2014 +0100
[BUILDROOT] Add ARMADEUS_TOOLCHAIN_PREFIX env var and make demos compile
locally again
commit 907d78549545034d2f06dc3bc5884a9882efc6c6
Author: Sébastien Szymanski <ss...@us...>
Date: Fri Nov 21 17:19:37 2014 +0100
[BUILDROOT] Remove unused ARMADEUS_SDL_DIR and ARMADEUS_XENOMAI_DIR
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 --
Makefile.in | 20 +++-----------------
target/demos/armanoid/Makefile | 4 ++--
target/demos/backlight_control/Makefile | 4 ++--
target/demos/camera/capture/Makefile | 5 ++---
target/demos/gpio/Makefile | 4 ++--
target/demos/gps/Makefile | 4 ++--
target/demos/input_test/Makefile | 4 ++--
target/demos/mcp25020_ctrl/Makefile | 4 ++--
target/demos/music_player/Makefile | 4 ++--
target/demos/oscillo/Makefile | 5 ++++-
target/demos/real_time/Makefile.in | 16 ++++++++--------
target/demos/real_time/fractal/Makefile | 5 ++++-
target/demos/shm/Makefile | 4 ++--
target/demos/show_image/Makefile | 5 ++---
target/demos/test_lcd/Makefile | 4 ++--
target/demos/toggle_gpio/Makefile | 11 +++++------
target/linux/debug/fpgaregs/Makefile | 5 ++++-
target/linux/debug/imx-fpga-test/Makefile | 4 ++--
target/linux/debug/imxregs/Makefile | 6 +++++-
target/linux/debug/imxregs/README | 2 +-
target/linux/modules/Makefile.in | 2 +-
.../fpga/board_designs/wishbone_example/Makefile | 2 +-
.../wishbone_example/wb_button/Makefile | 2 +-
.../board_designs/wishbone_example/wb_led/Makefile | 2 +-
target/linux/modules/fpga/others/i2ctest/Makefile | 2 +-
.../linux/modules/fpga/others/ps2keyboard/README | 2 +-
.../fpga/virtual_components/button/Makefile | 2 +-
.../modules/fpga/virtual_components/led/Makefile | 2 +-
target/linux/modules/pwm/test/Makefile | 7 +++++--
target/packages/anybus-tools/Makefile | 4 ++--
target/packages/as_devices/Makefile | 4 ++--
target/packages/as_devices/c/Makefile | 2 +-
target/packages/as_devices/cpp/Makefile | 5 +----
target/packages/as_devices/python/Makefile | 6 +++---
target/packages/tfp410ctrl/Makefile | 4 +++-
target/packages/tfp410ctrl/README | 2 +-
37 files changed, 84 insertions(+), 88 deletions(-)
diff --git a/Makefile b/Makefile
index 23307b9..0fdf9b3 100644
--- a/Makefile
+++ b/Makefile
@@ -211,9 +211,7 @@ shell_env:
@echo ARMADEUS_ROOTFS_TAR=$(ARMADEUS_ROOTFS_TAR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_STAGING_DIR=$(ARMADEUS_STAGING_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_TOOLCHAIN_PATH=$(ARMADEUS_TOOLCHAIN_PATH) >> $(ARMADEUS_ENV_FILE)
- @echo ARMADEUS_XENOMAI_DIR=$(ARMADEUS_XENOMAI_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_QT_DIR=$(ARMADEUS_QT_DIR) >> $(ARMADEUS_ENV_FILE)
- @echo ARMADEUS_SDL_DIR=$(ARMADEUS_SDL_DIR) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_GCC_VERSION=$(ARMADEUS_GCC_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LIBC_NAME=$(ARMADEUS_LIBC_NAME) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_LIBC_VERSION=$(ARMADEUS_LIBC_VERSION) >> $(ARMADEUS_ENV_FILE)
diff --git a/Makefile.in b/Makefile.in
index 2dc76fc..d33adfe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,18 +46,6 @@ ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
ARMADEUS_U_BOOT_BOARD_NAME:=$(shell echo $(BR2_TARGET_UBOOT_BOARDNAME))
ARMADEUS_TARGET_ARCH:=$(shell echo $(BR2_GCC_TARGET_ARCH))
-ifeq ($(BR2_PACKAGE_SDL),y)
-ARMADEUS_SDL_VERSION:=$(shell grep "SDL_VERSION:=" $(BUILDROOT_DIR)/package/sdl/sdl.mk 2>/dev/null | cut -d = -f 2)
-else
-ARMADEUS_SDL_VERSION:=SDL_NOT_INSTALLED
-endif
-
-ifeq ($(BR2_PACKAGE_XENOMAI),y)
-ARMADEUS_XENOMAI_VERSION:=$(shell grep "XENOMAI_VERSION:=" $(BUILDROOT_DIR)/package/xenomai/xenomai.mk 2>/dev/null | cut -d = -f 2)
-else
-ARMADEUS_XENOMAI_VERSION:=XENOMAI_NOT_INSTALLED
-endif
-
ifeq ($(BR2_PACKAGE_QT),y)
ARMADEUS_QT_MAKEFILE:=package/qt/qt.mk
ARMADEUS_QT_VERSION_MAJOR:=$(shell grep "QT_VERSION_MAJOR =" $(BUILDROOT_DIR)/$(ARMADEUS_QT_MAKEFILE) 2>/dev/null | cut -d ' ' -f 3)
@@ -95,13 +83,11 @@ ARMADEUS_U_BOOT_CONFIG:=$(BUILDROOT_DIR)/$(shell echo $(BR2_TARGET_UBOOT_CUSTOM_
ARMADEUS_STAGING_DIR:=$(BUILDROOT_OUTPUT_DIR)/staging
ARMADEUS_TOOLCHAIN_PATH:=$(BUILDROOT_HOST_DIR)/usr/bin
ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
-ARMADEUS_GCC_VERSION=$(shell $(ARMADEUS_TOOLCHAIN_PATH)/$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)-gcc -dumpversion)
+ARMADEUS_TOOLCHAIN_PREFIX=$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)-
else
-ARMADEUS_GCC_VERSION=$(shell $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc -dumpversion)
+ARMADEUS_TOOLCHAIN_PREFIX=arm-linux-
endif
+ARMADEUS_GCC_VERSION=$(shell $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc -dumpversion)
ARMADEUS_BUILD_DIR:=$(BUILDROOT_BUILD_DIR)
-ARMADEUS_SDL_DIR:=$(ARMADEUS_BUILD_DIR)/sdl-$(ARMADEUS_SDL_VERSION)
-ARMADEUS_XENOMAI_DIR:=$(ARMADEUS_BUILD_DIR)/xenomai-$(ARMADEUS_XENOMAI_VERSION)
ARMADEUS_QT_DIR:=$(ARMADEUS_BUILD_DIR)/qt-$(ARMADEUS_QT_VERSION)
-
diff --git a/target/demos/armanoid/Makefile b/target/demos/armanoid/Makefile
index 34b18ed..610aec8 100644
--- a/target/demos/armanoid/Makefile
+++ b/target/demos/armanoid/Makefile
@@ -6,8 +6,8 @@ STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
SDL_CONFIG:=$(STAGING_DIR)/usr/bin/sdl-config
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=TARGET
CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --cflags) -g
diff --git a/target/demos/backlight_control/Makefile b/target/demos/backlight_control/Makefile
index 5977fba..3ac0bb4 100644
--- a/target/demos/backlight_control/Makefile
+++ b/target/demos/backlight_control/Makefile
@@ -4,8 +4,8 @@ ARMADEUS_BASE_DIR=../../..
# Default values for local compiling:
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=-DTARGET
STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
SDL_CONFIG:=$(STAGING_DIR)/usr/bin/sdl-config
diff --git a/target/demos/camera/capture/Makefile b/target/demos/camera/capture/Makefile
index ea6152c..17b0efc 100644
--- a/target/demos/camera/capture/Makefile
+++ b/target/demos/camera/capture/Makefile
@@ -4,9 +4,8 @@ ARMADEUS_BASE_DIR=../../../..
# Default values for local compiling:
STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
-SDL_DIR:=$(ARMADEUS_SDL_DIR)
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(STAGING_DIR)/usr/bin/sdl-config --cflags)
#CFLAGS+=-Wall -g
diff --git a/target/demos/gpio/Makefile b/target/demos/gpio/Makefile
index 14a8723..4c4a702 100644
--- a/target/demos/gpio/Makefile
+++ b/target/demos/gpio/Makefile
@@ -3,8 +3,8 @@ ARMADEUS_BASE_DIR:=$(shell pwd)/../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
-CC=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+CC=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=-D$(ARMADEUS_BOARD_NAME)
diff --git a/target/demos/gps/Makefile b/target/demos/gps/Makefile
index 58223b4..7c3deca 100644
--- a/target/demos/gps/Makefile
+++ b/target/demos/gps/Makefile
@@ -1,8 +1,8 @@
ARMADEUS_BASE_DIR=../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
CFLAGS+=-Wall -g
diff --git a/target/demos/input_test/Makefile b/target/demos/input_test/Makefile
index a81c4f5..8895ea1 100644
--- a/target/demos/input_test/Makefile
+++ b/target/demos/input_test/Makefile
@@ -5,8 +5,8 @@ ARMADEUS_BASE_DIR=../../..
STAGING_DIR:=$(ARMADEUS_STAGING_DIR)/
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
SDL_CONFIG:=$(STAGING_DIR)/usr/bin/sdl-config
CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --cflags) -g
LIBS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --libs)
diff --git a/target/demos/mcp25020_ctrl/Makefile b/target/demos/mcp25020_ctrl/Makefile
index 1c35652..4884987 100644
--- a/target/demos/mcp25020_ctrl/Makefile
+++ b/target/demos/mcp25020_ctrl/Makefile
@@ -4,8 +4,8 @@ ARMADEUS_BASE_DIR=../../..
STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=TARGET
CFLAGS= -Wall
diff --git a/target/demos/music_player/Makefile b/target/demos/music_player/Makefile
index c008e0e..0247d53 100755
--- a/target/demos/music_player/Makefile
+++ b/target/demos/music_player/Makefile
@@ -5,8 +5,8 @@ ARMADEUS_BASE_DIR:=$(shell pwd)/../../..
# Default values
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
-CC=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+CC=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=-DAPF
STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(STAGING_DIR)/usr/bin/sdl-config --cflags) -g
diff --git a/target/demos/oscillo/Makefile b/target/demos/oscillo/Makefile
index 266fa0d..0adea6a 100644
--- a/target/demos/oscillo/Makefile
+++ b/target/demos/oscillo/Makefile
@@ -1,4 +1,7 @@
-CC=arm-linux-gcc
+ARMADEUS_BASE_DIR=../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
CFLAGS=-g -W -Wall
LDFLAGS=-lm
INSTALL_DIR=/tftpboot
diff --git a/target/demos/real_time/Makefile.in b/target/demos/real_time/Makefile.in
index 7f67bb7..e4e30a3 100644
--- a/target/demos/real_time/Makefile.in
+++ b/target/demos/real_time/Makefile.in
@@ -2,14 +2,14 @@
DEST_DIR=/tftpboot/local/bin
include $(ARMADEUS_BASE_DIR)/Makefile.in
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-LD:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-ld
-CXX:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
-AS:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-as
-NM:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-nm
-AR:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-ar
-SIZE:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-size
-OBJCOPY:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-objcopy
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+LD:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)ld
+CXX:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)g++
+AS:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)as
+NM:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)nm
+AR:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)ar
+SIZE:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)size
+OBJCOPY:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)objcopy
EXEC=$(APPLICATIONS)
diff --git a/target/demos/real_time/fractal/Makefile b/target/demos/real_time/fractal/Makefile
index e6c30d6..da27ce7 100644
--- a/target/demos/real_time/fractal/Makefile
+++ b/target/demos/real_time/fractal/Makefile
@@ -1,4 +1,7 @@
-CC=arm-linux-gcc
+ARMADEUS_BASE_DIR=../../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
CFLAGS=-g -W -Wall
LDFLAGS=
EXEC=newton
diff --git a/target/demos/shm/Makefile b/target/demos/shm/Makefile
index e4a54af..c658d33 100644
--- a/target/demos/shm/Makefile
+++ b/target/demos/shm/Makefile
@@ -2,8 +2,8 @@
ARMADEUS_BASE_DIR:=$(shell pwd)/../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-CC=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+CC=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=-D$(ARMADEUS_BOARD_NAME)
SHMWRITER = shmwriter
diff --git a/target/demos/show_image/Makefile b/target/demos/show_image/Makefile
index 012224d..6efd861 100644
--- a/target/demos/show_image/Makefile
+++ b/target/demos/show_image/Makefile
@@ -1,11 +1,10 @@
ARMADEUS_BASE_DIR=../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin/
-SDL_DIR:=$(ARMADEUS_SDL_DIR)
DEFINES=-DTARGET
CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(STAGING_DIR)/usr/bin/sdl-config --cflags) -g
diff --git a/target/demos/test_lcd/Makefile b/target/demos/test_lcd/Makefile
index 24cdb37..c1be032 100644
--- a/target/demos/test_lcd/Makefile
+++ b/target/demos/test_lcd/Makefile
@@ -4,8 +4,8 @@ ARMADEUS_BASE_DIR=../../..
# Default values for local compiling:
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
STAGING_DIR:=$(ARMADEUS_STAGING_DIR)
SDL_CONFIG:=$(STAGING_DIR)/usr/bin/sdl-config
CFLAGS=$(shell STAGING_DIR=$(STAGING_DIR) sh $(SDL_CONFIG) --cflags) -g
diff --git a/target/demos/toggle_gpio/Makefile b/target/demos/toggle_gpio/Makefile
index c869b07..79869c5 100644
--- a/target/demos/toggle_gpio/Makefile
+++ b/target/demos/toggle_gpio/Makefile
@@ -1,11 +1,10 @@
-HOST_DIR = ../../../buildroot/output/host/
-STAGING_DIR = ../../../buildroot/output/staging/
-TARGET_DIR = ../../../buildroot/output/target/
+ARMADEUS_BASE_DIR=../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
-CC = $(HOST_DIR)/usr/bin/arm-linux-gcc
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
CFLAGS = -Wall
-INCLUDE = -I$(STAGING_DIR)/usr/include/as_devices/
-INSTALL_DIR = $(TARGET_DIR)/usr/bin/
+INCLUDE = -I$(ARMADEUS_STAGING_DIR)/usr/include/as_devices/
+INSTALL_DIR = $(ARMADEUS_ROOTFS_DIR)/usr/bin/
EXEC = toggle_gpio
diff --git a/target/linux/debug/fpgaregs/Makefile b/target/linux/debug/fpgaregs/Makefile
index ecff1f4..3e836ea 100644
--- a/target/linux/debug/fpgaregs/Makefile
+++ b/target/linux/debug/fpgaregs/Makefile
@@ -1,5 +1,8 @@
+ARMADEUS_BASE_DIR=../../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
ifeq ($(CC),cc)
- CC=arm-linux-gcc
+ CC=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
endif
all: fpgaregs fpga27regs fpga51regs
diff --git a/target/linux/debug/imx-fpga-test/Makefile b/target/linux/debug/imx-fpga-test/Makefile
index 588d3a8..b52b50e 100644
--- a/target/linux/debug/imx-fpga-test/Makefile
+++ b/target/linux/debug/imx-fpga-test/Makefile
@@ -5,8 +5,8 @@ ARMADEUS_BASE_DIR=../../../..
STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/local/bin
INSTALL_DATA_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/share
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=TARGET
CFLAGS=-Wall -g -O0
diff --git a/target/linux/debug/imxregs/Makefile b/target/linux/debug/imxregs/Makefile
index 1ffa7e7..7ddb6f0 100644
--- a/target/linux/debug/imxregs/Makefile
+++ b/target/linux/debug/imxregs/Makefile
@@ -1,4 +1,8 @@
-CC = arm-linux-gcc
+ARMADEUS_BASE_DIR=../../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+
+
+CC = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
EXECS = imxlregs imx27regs imx28regs imx51regs imx53regs
all: $(EXECS)
diff --git a/target/linux/debug/imxregs/README b/target/linux/debug/imxregs/README
index 9def549..b82269e 100644
--- a/target/linux/debug/imxregs/README
+++ b/target/linux/debug/imxregs/README
@@ -1,3 +1,3 @@
To compile:
- $ make CC=../../../../buildroot/build_arm/staging_dir/bin/arm-linux-gcc
+ $ make
diff --git a/target/linux/modules/Makefile.in b/target/linux/modules/Makefile.in
index 0403e3b..ae6e445 100755
--- a/target/linux/modules/Makefile.in
+++ b/target/linux/modules/Makefile.in
@@ -3,7 +3,7 @@
#
default:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) ARCH=arm CROSS_COMPILE=$(PWD)/$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux- modules
+ $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) ARCH=arm CROSS_COMPILE=$(PWD)/$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX) modules
clean:
$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
index fc0d58e..6217433 100644
--- a/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/Makefile
@@ -20,6 +20,6 @@ install:
$(MAKE) -C $(LINUX_DIR) SUBDIRS=$(PWD) INSTALL_MOD_PATH=$(TARGET_DIR) modules_install
test:
- $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc push-led.c -o push-led
+ $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc push-led.c -o push-led
endif
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
index 99f158c..80b9b16 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_button/Makefile
@@ -15,7 +15,7 @@ KDIR := $(ARMADEUS_LINUX_DIR)
PWD := $(shell pwd)
test:
- $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc testbutton.c -o testbutton
+ $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc testbutton.c -o testbutton
endif
diff --git a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
index 103956b..487dab0 100755
--- a/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
+++ b/target/linux/modules/fpga/board_designs/wishbone_example/wb_led/Makefile
@@ -16,7 +16,7 @@ KDIR := $(ARMADEUS_LINUX_DIR)
PWD := $(shell pwd)
test:
- $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc -Wall testled.c -o testled
+ $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc -Wall testled.c -o testled
chmod 755 testled
endif
diff --git a/target/linux/modules/fpga/others/i2ctest/Makefile b/target/linux/modules/fpga/others/i2ctest/Makefile
index a4e7343..0d92d25 100755
--- a/target/linux/modules/fpga/others/i2ctest/Makefile
+++ b/target/linux/modules/fpga/others/i2ctest/Makefile
@@ -23,7 +23,7 @@ PWD := $(shell pwd)
include ../../../Makefile.in
test:
- $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc testi2ctest.c -o testi2ctest
+ $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc testi2ctest.c -o testi2ctest
chmod 755 testi2ctest
cp testi2ctest /tftpboot/
diff --git a/target/linux/modules/fpga/others/ps2keyboard/README b/target/linux/modules/fpga/others/ps2keyboard/README
index 6ea8680..9012bcb 100644
--- a/target/linux/modules/fpga/others/ps2keyboard/README
+++ b/target/linux/modules/fpga/others/ps2keyboard/README
@@ -1,6 +1,6 @@
To compile this driver (example):
---------------------------------
- make ARCH=arm CROSS_COMPILE=/local/julien/Armadeus/Armadeus_SVN_test/armadeus/software/buildroot/build_arm_nofpu/staging_dir/bin/arm-linux-
+ make
To install this driver:
-----------------------
diff --git a/target/linux/modules/fpga/virtual_components/button/Makefile b/target/linux/modules/fpga/virtual_components/button/Makefile
index a01141b..50c1a63 100755
--- a/target/linux/modules/fpga/virtual_components/button/Makefile
+++ b/target/linux/modules/fpga/virtual_components/button/Makefile
@@ -15,7 +15,7 @@ else
ARMADEUS_BASE_DIR=../../../../../..
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-CC = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+CC = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
KDIR := $(ARMADEUS_LINUX_DIR)
PWD := $(shell pwd)
diff --git a/target/linux/modules/fpga/virtual_components/led/Makefile b/target/linux/modules/fpga/virtual_components/led/Makefile
index e8ac2e1..f2baf1f 100644
--- a/target/linux/modules/fpga/virtual_components/led/Makefile
+++ b/target/linux/modules/fpga/virtual_components/led/Makefile
@@ -12,7 +12,7 @@ KDIR := $(ARMADEUS_LINUX_DIR)
PWD := $(shell pwd)
test:
- $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc -Wall testled.c -o testled
+ $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc -Wall testled.c -o testled
chmod 755 testled
diff --git a/target/linux/modules/pwm/test/Makefile b/target/linux/modules/pwm/test/Makefile
index e88f037..3ac36f5 100755
--- a/target/linux/modules/pwm/test/Makefile
+++ b/target/linux/modules/pwm/test/Makefile
@@ -1,14 +1,17 @@
+ARMADEUS_BASE_DIR=../../../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
OUTPUT = .
all: testtonemode testplaymode
testtonemode: testtonemode.c PWM_def.h MX1_def.h
- arm-linux-gcc -o $@ $<
+ $(CC) -o $@ $<
testplaymode: testplaymode.c PWM_def.h MX1_def.h
- arm-linux-gcc -o $@ $<
+ $(CC) -o $@ $<
clean:
rm -f testtonemode testplaymode
diff --git a/target/packages/anybus-tools/Makefile b/target/packages/anybus-tools/Makefile
index 3a5cfb4..1c1dbeb 100644
--- a/target/packages/anybus-tools/Makefile
+++ b/target/packages/anybus-tools/Makefile
@@ -5,8 +5,8 @@ ARMADEUS_BASE_DIR=../../..
STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
INITD_DIR:=$(ARMADEUS_ROOTFS_DIR)/etc/init.d/
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+CC:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
DEFINES=TARGET
CFLAGS= -W -Wall -g
diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index 471744d..f4248d1 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -3,8 +3,8 @@ ARMADEUS_BASE_DIR = ../../../
-include $(ARMADEUS_BASE_DIR)/Makefile.in
CFLAGS = -Wall -g -O0
LDFLAGS=
-CC = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-CXX = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
+CC = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+CXX = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)g++
INSTALL_DIR = $(ARMADEUS_STAGING_DIR)
C_BINARY = test_cdevices
diff --git a/target/packages/as_devices/c/Makefile b/target/packages/as_devices/c/Makefile
index 989b7a5..2e373d3 100644
--- a/target/packages/as_devices/c/Makefile
+++ b/target/packages/as_devices/c/Makefile
@@ -3,7 +3,7 @@ ARMADEUS_BASE_DIR = ../../../../
-include $(ARMADEUS_BASE_DIR)/Makefile.in
CFLAGS ?= -Wall -g -O0
LDFLAGS =
-CC = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+CC = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
OBJ += as_pwm.o
OBJ += as_i2c.o
diff --git a/target/packages/as_devices/cpp/Makefile b/target/packages/as_devices/cpp/Makefile
index 59e2d4c..542918b 100644
--- a/target/packages/as_devices/cpp/Makefile
+++ b/target/packages/as_devices/cpp/Makefile
@@ -1,10 +1,7 @@
-# to compile for arm :
-# make CXX=../../../buildroot/build_armv5te/staging_dir/usr/bin/arm-linux-g++
-#
# Default values for local compiling:
ARMADEUS_BASE_DIR = ../../../../
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-CXX = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
+CXX = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)g++
CXXFLAGS =-Wall -g -O0
OBJS = as_i2c.o
diff --git a/target/packages/as_devices/python/Makefile b/target/packages/as_devices/python/Makefile
index ced0a44..1171e6b 100644
--- a/target/packages/as_devices/python/Makefile
+++ b/target/packages/as_devices/python/Makefile
@@ -5,9 +5,9 @@ ARMADEUS_BASE_DIR = ../../../../
CFLAGS = -Wall -g -O0
LDFLAGS =
-CC = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-CXX = $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
-STRIP = $(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
+CC = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
+CXX = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)g++
+STRIP = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)sstrip
INCLUDE_LIB = ../c/
diff --git a/target/packages/tfp410ctrl/Makefile b/target/packages/tfp410ctrl/Makefile
index b811fd5..3b814ec 100644
--- a/target/packages/tfp410ctrl/Makefile
+++ b/target/packages/tfp410ctrl/Makefile
@@ -1,8 +1,10 @@
#
# Makefile for the APF51 HDMI/DVI controler (TFP410) utility
#
+ARMADEUS_BASE_DIR=../../..
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
-CC = arm-linux-gcc
+CC = $(ARMADEUS_TOOLCHAIN_PATH)/$(ARMADEUS_TOOLCHAIN_PREFIX)gcc
CFLAGS = -Wall -O
INCLUDES =
diff --git a/target/packages/tfp410ctrl/README b/target/packages/tfp410ctrl/README
index 3d9604b..adfc196 100644
--- a/target/packages/tfp410ctrl/README
+++ b/target/packages/tfp410ctrl/README
@@ -1,4 +1,4 @@
* Compile parse_edid as standalone (PC):
$ make clean; make parse_edid CC=gcc CFLAGS=-DSTANDALONE
-* Cross-compile (ARM): be sure that arm-linux-gcc is in your PATH
+* Cross-compile (ARM):
$ make
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-11-20 10:44:30
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 957ad91c4e6741b478d150c8d3cdbcc4f22bb345 (commit)
from 38f996bd146eb83dfc5bd37197fd5b4258a071c1 (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 957ad91c4e6741b478d150c8d3cdbcc4f22bb345
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Nov 20 11:31:08 2014 +0100
[BUILDROOT] Update cleanup_buildroot.sh and update it automatically.
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2013.11/cleanup_buildroot.sh | 260 ++++++++++++++++--------
scripts/quiltify.sh | 24 ++-
2 files changed, 192 insertions(+), 92 deletions(-)
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index e7787ea..4957742 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -1,94 +1,174 @@
#!/bin/bash
-#
-# Things to do before patching Buildroot
-#
-# Removes packages/files added through patches:
-rm -rf buildroot/package/beremiz
-rm -rf buildroot/boot/uboot/
-rm -rf buildroot/package/quake-pak/
-rm -rf buildroot/package/sdlquake/
-rm -rf buildroot/package/gpm/
-rm -rf buildroot/package/python-pygame/
-rm -rf buildroot/package/python-pyro/
-rm -rf buildroot/package/uucp/
-rm -rf buildroot/package/matiec/
-rm -f buildroot/package/libsndfile/libsndfile-1.0.*-srconly.patch
-rm -rf buildroot/package/flite/
-rm -rf buildroot/package/libcurl/
-rm -f buildroot/package/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch
-rm -f buildroot/package/madplay/madplay-audio-alsa.patch
-rm -rf buildroot/package/wolf4sdl/
-rm -rf buildroot/package/lmbench/
-rm -rf buildroot/package/tslib/
-rm -rf buildroot/package/openssh/
-rm -rf buildroot/package/qtcreator
-rm -rf buildroot/package/sdl/
-rm -rf buildroot/package/sdl_water/
-rm -rf buildroot/package/slideshow/
-rm -rf buildroot/package/python-crc16/
-rm -rf buildroot/package/socketcan/
-rm -rf buildroot/package/lcd4linux/
-rm -rf buildroot/package/mesa/
-rm -rf buildroot/package/snes9x/
-rm -rf buildroot/package/allegro/
-rm -rf buildroot/package/fbgrab/
-rm -rf buildroot/package/fbtest/
-rm -rf buildroot/package/xenomai/
-rm -rf buildroot/package/cwiid/
-rm -rf buildroot/package/urg/
-rm -rf buildroot/package/pywebradio/
-rm -rf buildroot/package/e-uae/
-rm -rf buildroot/package/opentyrian/
-rm -rf buildroot/package/ipsec-tools/
-rm -rf buildroot/package/java/
-rm -rf buildroot/package/lbreakout2/
-rm -rf buildroot/package/ltris/
-rm -rf buildroot/package/qwt/
-rm -rf buildroot/fs/ubi/
-rm -f buildroot/package/flex/flex-2.5.35-undefine_rpl_malloc_and_realloc.patch
-rm -f buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
-rm -rf buildroot/package/mysql_client/
-rm -rf buildroot/package/portmap/
-rm -rf buildroot/package/bluez3*
-rm -rf buildroot/package/ngircd/
-rm -rf buildroot/package/can-utils/
-rm -f buildroot/toolchain/uClibc/*.patch
-rm -f buildroot/package/ntp/ntp-nano.patch
-rm -f buildroot/target/generic/Config.in
-rm -rf buildroot/package/rt-tests
-rm -rf buildroot/package/libcanfestival
-rm -rf buildroot/package/python
-rm -rf buildroot/package/gsmmux
-rm -rf buildroot/package/imx-lib/
-rm -rf buildroot/package/imx-test/
-rm -rf buildroot/package/e2fsprogs/
-rm -rf buildroot/package/firmware-imx/
-rm -rf buildroot/package/multimedia/fsl-mm-codeclib/
-rm -rf buildroot/package/linux-firmware/
-rm -rf buildroot/package/uboot-tools/
-rm -rf buildroot/package/qtcreator/
-rm -rf buildroot/package/marble/
-rm -rf buildroot/package/cunit/
-rm -rf buildroot/package/gnokii/
-rm -rf buildroot/package/smstools3/
-rm -rf buildroot/package/wpa_supplicant/
-rm -rf buildroot/package/busybox/
-rm -rf buildroot/package/joe/
-rm -rf buildroot/package/gpsd/
-rm -rf buildroot/linux/
-rm -rf buildroot/package/freescale-imx/imx-lib/*.patch
-rm -rf buildroot/package/libpng/
-rm -rf buildroot/package/mmc-utils/
+####################################################
+# #
+# Removes files added or modified through patches. #
+# #
+# This file has been automatically generated. #
+# #
+####################################################
+
+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/package/agg/agg.mk
+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/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/rfcomm.conf
+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/snapshot/busybox-stty_add_rs485_config.patch
+rm -rf buildroot/package/cunit/Config.in
+rm -rf buildroot/package/cunit/cunit.mk
+rm -rf buildroot/package/cwiid/Config.in
+rm -rf buildroot/package/cwiid/cwiid-0.6.00-configure_ac_remove_gtk_dependancy.patch
+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/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/vivante-gpu-sdk/Config.in
+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/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/gsmmux/Config.in
+rm -rf buildroot/package/gsmmux/gsmmux.mk
+rm -rf buildroot/package/imagemagick/imagemagick.mk
+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/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
+rm -rf buildroot/package/lbreakout2/Config.in
+rm -rf buildroot/package/lbreakout2/lbreakout2.mk
+rm -rf buildroot/package/libcanfestival/Config.in
+rm -rf buildroot/package/libcanfestival/libcanfestival-allow-to-set-DESTDIR.patch
+rm -rf buildroot/package/libcanfestival/libcanfestival.mk
+rm -rf buildroot/package/libhid/libhid.mk
+rm -rf buildroot/package/libpng/libpng.mk
+rm -rf buildroot/package/ltrace/ltrace.mk
+rm -rf buildroot/package/ltris/Config.in
+rm -rf buildroot/package/ltris/ltris-force_screen_res.patch
+rm -rf buildroot/package/ltris/ltris.mk
+rm -rf buildroot/package/madplay/madplay.mk
+rm -rf buildroot/package/marble/Config.in
+rm -rf buildroot/package/marble/marble.mk
+rm -rf buildroot/package/matiec/Config.in
+rm -rf buildroot/package/matiec/host-matiec-001-fix_bison_compilation_error.patch
+rm -rf buildroot/package/matiec/matiec.mk
+rm -rf buildroot/package/mmc-utils/Config.in
+rm -rf buildroot/package/mmc-utils/mmc-utils.mk
+rm -rf buildroot/package/mplayer/mplayer-1.0rc2-add_pld_asm_inst_for_non_armv5_arch.patch
+rm -rf buildroot/package/mplayer/mplayer.mk
+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/openssl/openssl.mk
+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/pkg-generic.mk
+rm -rf buildroot/package/poppler/poppler.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
+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
+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/quake-pak/Config.in
+rm -rf buildroot/package/quake-pak/quake-pak.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/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
+rm -rf buildroot/package/shiboken/shiboken-1.2.2-fix_shiboken_config_dir.patch
+rm -rf buildroot/package/shiboken/shiboken.mk
+rm -rf buildroot/package/slideshow/Config.in
+rm -rf buildroot/package/slideshow/slideshow-01-restart-after-end.patch
+rm -rf buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
+rm -rf buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
+rm -rf buildroot/package/slideshow/slideshow-04-fix_sdl_crash.patch
+rm -rf buildroot/package/slideshow/slideshow.mk
+rm -rf buildroot/package/smstools3/Config.in
+rm -rf buildroot/package/smstools3/S50smsd
+rm -rf buildroot/package/smstools3/smstools3.mk
+rm -rf buildroot/package/snes9x/Config.in
+rm -rf buildroot/package/snes9x/snes9x-1.39-compile.patch
+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-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
-rm -rf buildroot/package/owfs/
-rm -rf buildroot/package/agg/
-rm -rf buildroot/package/gnash/
-rm -rf buildroot/package/xc3sprog/
-rm -rf buildroot/package/sam7-pgm-ng/
-rm -rf buildroot/package/tk/
-rm -rf buildroot/package/libhid/
-rm -rf buildroot/package/shiboken/
-rm -rf buildroot/package/python-wx/
-rm -rf buildroot/package/freescale-imx/vivante-gpu-sdk/
+rm -rf buildroot/package/wolf4sdl/Config.in
+rm -rf buildroot/package/wolf4sdl/wolf4sdl.mk
+rm -rf buildroot/package/wpa_supplicant/Config.in
+rm -rf buildroot/package/wpa_supplicant/wpa_supplicant.mk
+rm -rf buildroot/package/xc3sprog/Config.in
+rm -rf buildroot/package/xc3sprog/xc3sprog-fixes-version-detection.patch
+rm -rf buildroot/package/xc3sprog/xc3sprog-fixes-xc2c32a_qf32-jtag-id.patch
+rm -rf buildroot/package/xc3sprog/xc3sprog.mk
+rm -rf buildroot/package/xenomai/Config.in
+rm -rf buildroot/package/xenomai/xenomai.mk
+rm -rf buildroot/system/Config.in
+rm -rf buildroot/system/system.mk
+rm -rf buildroot/toolchain/toolchain-external/Config.in
+rm -rf buildroot/toolchain/toolchain-external/toolchain-external.mk
+rm -rf buildroot/toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-add___kernel_long_and___kernel_ulong.patch
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index d949656..92528b6 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -107,7 +107,28 @@ if [ "$1" == "export" ]; then
else
echo "No VCS found"
fi
- echo -e "\n--- If you worked on Buildroot patches don't forget to eventually update patches/buildroot/$ARMADEUS_BUILDROOT_VERSION/cleanup_buildroot.sh !\n"
+
+ if [ "$QUILT_TARGET_NAME" == "Buildroot" ]; then
+ cat <<- EOF > $ARMADEUS_BUILDROOT_PATCH_DIR/cleanup_buildroot.sh
+ #!/bin/bash
+
+ ####################################################
+ # #
+ # Removes files added or modified through patches. #
+ # #
+ # This file has been automatically generated. #
+ # #
+ ####################################################
+
+ EOF
+
+ cd $ARMADEUS_BUILDROOT_DIR
+ quilt files -a | sort | uniq | sed 's/^/rm -rf buildroot\//' >> $ARMADEUS_BUILDROOT_PATCH_DIR/cleanup_buildroot.sh
+
+ echo -e "\n--- $ARMADEUS_BUILDROOT_PATCH_DIR/cleanup_buildroot.sh has been updated. Please check if it is correct before committing:\n"
+ git diff --exit-code $ARMADEUS_BUILDROOT_PATCH_DIR/cleanup_buildroot.sh
+ fi
+
exit 0
fi
@@ -210,4 +231,3 @@ echo -e "\n--- Your can now go to $QUILT_TARGET_DIR\nHappy hacking ! ;-)\n"
echo -e "__ Don't forget to do a \"$0 export\" after your modifications __\n"
exit 0
-
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-11-19 16:19:35
|
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 38f996bd146eb83dfc5bd37197fd5b4258a071c1 (commit)
via 05bf05fcd6636ccfe00b8fc08be44184bbc1b68c (commit)
via d7fb18fb55cc2d69e0ce74b7873ba36772b3abf1 (commit)
via b6cb44d92964becb2cbe9fc89688b6e031e5f64d (commit)
via 4ab55a0408c7414d0467cf3e35f20d8a4c0b80d7 (commit)
from fc1d5bcdc7eecd6e6f6ba4d96c7626ebd6fdc783 (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 38f996bd146eb83dfc5bd37197fd5b4258a071c1
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Nov 18 12:00:03 2014 +0100
[LINUX] 3.18: apf6: dts: set wifi chip as non-removable
commit 05bf05fcd6636ccfe00b8fc08be44184bbc1b68c
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Nov 18 11:44:38 2014 +0100
[LINUX] 3.18: apf6: add wandcam support.
The patches are from Steve Longerbeam's github [1].
[1] https://github.com/slongerbeam
commit d7fb18fb55cc2d69e0ce74b7873ba36772b3abf1
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Nov 18 11:35:28 2014 +0100
[LINUX] 3.1{7,8}: apf{51,6}: fix pixel clock polarity.
The patches are from Steve Longerbeam's github [1].
[1] https://github.com/slongerbeam
commit b6cb44d92964becb2cbe9fc89688b6e031e5f64d
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Nov 17 18:49:06 2014 +0100
[LINUX] 3.18: move to 3.18-rc5
commit 4ab55a0408c7414d0467cf3e35f20d8a4c0b80d7
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Nov 13 09:48:48 2014 +0100
[LINUX] 3.18: move to 3.18-rc4
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
...3.18-rc3.config => apf27-linux-3.18-rc5.config} | 0
...3.18-rc3.config => apf28-linux-3.18-rc4.config} | 0
...3.18-rc3.config => apf51-linux-3.18-rc5.config} | 0
...-3.18-rc3.config => apf6-linux-3.18-rc5.config} | 0
.../device/armadeus/apf6/apf6-linux-3.18.config | 4 +
...us-apf51-add_apf51_v1-and_v2_device_trees.patch | 40 +-
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 18 +-
...ideomode-add-pos-neg-pixel-clock-polarity.patch | 44 +
...v3-crtc-Use-DRM-mode-flags-to-configure-p.patch | 32 +
patches/linux/{3.18-rc3 => 3.18-rc5} | 0
...us-apf51-add_apf51_v1-and_v2_device_trees.patch | 40 +-
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 95 +-
...ideomode-add-pos-neg-pixel-clock-polarity.patch | 44 +
...v3-crtc-Use-DRM-mode-flags-to-configure-p.patch | 32 +
...00-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch | 413 ++
...gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch | 45 +
.../0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch | 39 +
.../3.18/0603-gpu-ipu-v3-Add-ipu_get_num.patch | 73 +
...u-ipu-v3-Add-IDMA-channel-linking-support.patch | 168 +
.../0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch | 58 +
...6-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch | 30 +
.../3.18/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch | 47 +
.../3.18/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch | 49 +
...pu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch | 39 +
...imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch | 33 +
.../0611-ARM-imx6q-clk-Add-video-27m-clock.patch | 41 +
...-sabrelite-add-video-capture-ports-and-en.patch | 199 +
...6-sabresd-add-video-capture-ports-and-end.patch | 213 +
...6-sabreauto-add-video-capture-ports-and-e.patch | 236 +
...imx6dl-Add-iomux-field-defines-for-imx6dl.patch | 31 +
...-imx-Add-imx6-video-capture-platform_data.patch | 128 +
...617-gpio-pca953x-Add-reset-gpios-property.patch | 68 +
...mx6-Add-device-tree-binding-documentation.patch | 439 ++
...Add-new-camera-interface-driver-for-i.MX6.patch | 4708 ++++++++++++++++++++
...ia-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch | 2330 ++++++++++
...edia-imx6-Add-support-for-Parallel-OV5642.patch | 4357 ++++++++++++++++++
...mx6-Add-support-for-ADV7180-Video-Decoder.patch | 1406 ++++++
...mx6-camera-Add-deinterlace-motion-control.patch | 142 +
...imx6-camera-Add-VDIC-deinterlacing-subdev.patch | 1248 ++++++
...v7_defconfig-Enable-staging-video4linux-d.patch | 46 +
41 files changed, 16874 insertions(+), 63 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.18-rc3.config => apf27-linux-3.18-rc5.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.18-rc3.config => apf28-linux-3.18-rc4.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.18-rc3.config => apf51-linux-3.18-rc5.config} (100%)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.18-rc3.config => apf6-linux-3.18-rc5.config} (100%)
create mode 100644 patches/linux/3.17/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
create mode 100644 patches/linux/3.17/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
rename patches/linux/{3.18-rc3 => 3.18-rc5} (100%)
create mode 100644 patches/linux/3.18/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
create mode 100644 patches/linux/3.18/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
create mode 100644 patches/linux/3.18/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
create mode 100644 patches/linux/3.18/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch
create mode 100644 patches/linux/3.18/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch
create mode 100644 patches/linux/3.18/0603-gpu-ipu-v3-Add-ipu_get_num.patch
create mode 100644 patches/linux/3.18/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch
create mode 100644 patches/linux/3.18/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch
create mode 100644 patches/linux/3.18/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch
create mode 100644 patches/linux/3.18/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch
create mode 100644 patches/linux/3.18/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch
create mode 100644 patches/linux/3.18/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch
create mode 100644 patches/linux/3.18/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch
create mode 100644 patches/linux/3.18/0611-ARM-imx6q-clk-Add-video-27m-clock.patch
create mode 100644 patches/linux/3.18/0612-ARM-dts-imx-sabrelite-add-video-capture-ports-and-en.patch
create mode 100644 patches/linux/3.18/0613-ARM-dts-imx6-sabresd-add-video-capture-ports-and-end.patch
create mode 100644 patches/linux/3.18/0614-ARM-dts-imx6-sabreauto-add-video-capture-ports-and-e.patch
create mode 100644 patches/linux/3.18/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch
create mode 100644 patches/linux/3.18/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch
create mode 100644 patches/linux/3.18/0617-gpio-pca953x-Add-reset-gpios-property.patch
create mode 100644 patches/linux/3.18/0618-media-imx6-Add-device-tree-binding-documentation.patch
create mode 100644 patches/linux/3.18/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
create mode 100644 patches/linux/3.18/0620-media-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch
create mode 100644 patches/linux/3.18/0621-media-imx6-Add-support-for-Parallel-OV5642.patch
create mode 100644 patches/linux/3.18/0622-media-imx6-Add-support-for-ADV7180-Video-Decoder.patch
create mode 100644 patches/linux/3.18/0623-media-imx6-camera-Add-deinterlace-motion-control.patch
create mode 100644 patches/linux/3.18/0624-media-imx6-camera-Add-VDIC-deinterlacing-subdev.patch
create mode 100644 patches/linux/3.18/0625-ARM-imx_v6_v7_defconfig-Enable-staging-video4linux-d.patch
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index c072a98..d181f1a 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.18-rc3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18-rc5"
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-rc3.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc3.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc5.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc3.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc4.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc3.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc4.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc3.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc3.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc5.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc3.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc3.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc5.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
index 8f324ef..96e706e 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
@@ -222,6 +222,10 @@ CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y
CONFIG_MXS_DMA=y
CONFIG_STAGING=y
+CONFIG_STAGING_MEDIA=y
+# CONFIG_IMX6_CAMERA_OV5642 is not set
+CONFIG_IMX6_CAMERA_OV5640_MIPI=m
+# CONFIG_IMX6_CAMERA_ADV7180 is not set
CONFIG_DRM_IMX=y
CONFIG_DRM_IMX_FB_HELPER=y
CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
diff --git a/patches/linux/3.17/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch b/patches/linux/3.17/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
index f122428..912b3de 100644
--- a/patches/linux/3.17/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
+++ b/patches/linux/3.17/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.16/arch/arm/boot/dts/imx51-apf51.dtsi
+Index: linux-3.17.2/arch/arm/boot/dts/imx51-apf51.dtsi
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx51-apf51.dtsi
++++ linux-3.17.2/arch/arm/boot/dts/imx51-apf51.dtsi
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
@@ -185,10 +185,10 @@ Index: linux-3.16/arch/arm/boot/dts/imx51-apf51.dtsi
+ };
+ };
+};
-Index: linux-3.16/arch/arm/boot/dts/imx51-apf51-v1.dtsi
+Index: linux-3.17.2/arch/arm/boot/dts/imx51-apf51-v1.dtsi
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx51-apf51-v1.dtsi
++++ linux-3.17.2/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.16/arch/arm/boot/dts/imx51-apf51-v1.dtsi
+ model = "Armadeus Systems APF51 V1 module";
+ compatible = "armadeus,imx51-apf51", "fsl,imx51";
+};
-Index: linux-3.16/arch/arm/boot/dts/imx51-apf51-v2.dtsi
+Index: linux-3.17.2/arch/arm/boot/dts/imx51-apf51-v2.dtsi
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx51-apf51-v2.dtsi
++++ linux-3.17.2/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.16/arch/arm/boot/dts/imx51-apf51-v2.dtsi
+ };
+ };
+};
-Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev-v2.dts
+Index: linux-3.17.2/arch/arm/boot/dts/imx51-apf51dev-v2.dts
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx51-apf51dev-v2.dts
++++ linux-3.17.2/arch/arm/boot/dts/imx51-apf51dev-v2.dts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
@@ -310,10 +310,10 @@ Index: linux-3.16/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.16/arch/arm/boot/dts/imx51-apf51dev.dtsi
+Index: linux-3.17.2/arch/arm/boot/dts/imx51-apf51dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dtsi
++++ linux-3.17.2/arch/arm/boot/dts/imx51-apf51dev.dtsi
@@ -0,0 +1,238 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
@@ -348,7 +348,7 @@ Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dtsi
+ hsync-active = <1>;
+ vsync-active = <1>;
+ de-active = <1>;
-+ pixelclk-active = <0>;
++ pixelclk-active = <1>;
+ };
+ };
+
@@ -553,11 +553,11 @@ Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dtsi
+ };
+ };
+};
-Index: linux-3.16/arch/arm/boot/dts/Makefile
+Index: linux-3.17.2/arch/arm/boot/dts/Makefile
===================================================================
---- linux-3.16.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.16/arch/arm/boot/dts/Makefile
-@@ -168,8 +168,8 @@ dtb-$(CONFIG_ARCH_MXC) += \
+--- linux-3.17.2.orig/arch/arm/boot/dts/Makefile
++++ linux-3.17.2/arch/arm/boot/dts/Makefile
+@@ -177,8 +177,8 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx35-eukrea-mbimxsd35-baseboard.dtb \
imx35-pdk.dtb \
imx50-evk.dtb \
@@ -567,9 +567,9 @@ Index: linux-3.16/arch/arm/boot/dts/Makefile
imx51-babbage.dtb \
imx51-digi-connectcore-jsk.dtb \
imx51-eukrea-mbimxsd51-baseboard.dtb \
-Index: linux-3.16/arch/arm/boot/dts/imx51-apf51.dts
+Index: linux-3.17.2/arch/arm/boot/dts/imx51-apf51.dts
===================================================================
---- linux-3.16.orig/arch/arm/boot/dts/imx51-apf51.dts
+--- linux-3.17.2.orig/arch/arm/boot/dts/imx51-apf51.dts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
@@ -661,10 +661,10 @@ Index: linux-3.16/arch/arm/boot/dts/imx51-apf51.dts
- pinctrl-0 = <&pinctrl_uart3>;
- status = "okay";
-};
-Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dts
+Index: linux-3.17.2/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
---- linux-3.16.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dts
+--- linux-3.17.2.orig/arch/arm/boot/dts/imx51-apf51dev.dts
++++ linux-3.17.2/arch/arm/boot/dts/imx51-apf51dev.dts
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 Armadeus Systems - <su...@ar...>
diff --git a/patches/linux/3.17/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.17/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index c744651..5cd7c56 100644
--- a/patches/linux/3.17/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.17/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.16/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.17.2/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.17.2/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -31,10 +31,10 @@ Index: linux-3.16/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.17.2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-3.17.2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -168,10 +168,10 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+ };
+};
-Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.17.2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++++ linux-3.17.2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
@@ -0,0 +1,451 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -208,7 +208,7 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ hsync-active = <1>;
+ vsync-active = <1>;
+ de-active = <1>;
-+ pixelclk-active = <0>;
++ pixelclk-active = <1>;
+ };
+ };
+
@@ -624,10 +624,10 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ };
+ };
+};
-Index: linux-3.16/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.17.2/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.17.2/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
diff --git a/patches/linux/3.17/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch b/patches/linux/3.17/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
new file mode 100644
index 0000000..55621be
--- /dev/null
+++ b/patches/linux/3.17/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
@@ -0,0 +1,44 @@
+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(+)
+
+diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
+index d1b7d20..5016099 100644
+--- a/drivers/gpu/drm/drm_modes.c
++++ b/drivers/gpu/drm/drm_modes.c
+@@ -611,6 +611,10 @@ void drm_display_mode_from_videomode(const struct videomode *vm,
+ 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);
+diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
+index 8d98cd0..d5d045c 100644
+--- a/include/uapi/drm/drm_mode.h
++++ b/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 */
+--
+1.8.5.5
diff --git a/patches/linux/3.17/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch b/patches/linux/3.17/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
new file mode 100644
index 0000000..e856278
--- /dev/null
+++ b/patches/linux/3.17/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
@@ -0,0 +1,32 @@
+From a921b974de6b9ae585787a7b46354e32a630145f Mon Sep 17 00:00:00 2001
+From: Steve Longerbeam <ste...@me...>
+Date: Fri, 17 Oct 2014 18:23:18 -0700
+Subject: [PATCH 2/2] imx-drm: ipuv3-crtc: Use DRM mode flags to configure
+ pixel clock polarity
+
+Previously, pixel clock polarity was hardcoded and wasn't configurable.
+This patch adds support to configure the pixel clock polarity from the
+DRM mode flags.
+
+Signed-off-by: Mohsin Kazmi <moh...@me...>
+Signed-off-by: Steve Longerbeam <ste...@me...>
+---
+ drivers/staging/imx-drm/ipuv3-crtc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: linux-3.18-rc5/drivers/staging/imx-drm/ipuv3-crtc.c
+===================================================================
+--- linux-3.18-rc5.orig/drivers/staging/imx-drm/ipuv3-crtc.c
++++ linux-3.18-rc5/drivers/staging/imx-drm/ipuv3-crtc.c
+@@ -164,9 +164,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;
+- sig_cfg.clk_pol = 0;
+ sig_cfg.width = mode->hdisplay;
+ sig_cfg.height = mode->vdisplay;
+ sig_cfg.pixel_fmt = out_pixel_fmt;
diff --git a/patches/linux/3.18-rc3 b/patches/linux/3.18-rc5
similarity index 100%
rename from patches/linux/3.18-rc3
rename to patches/linux/3.18-rc5
diff --git a/patches/linux/3.18/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch b/patches/linux/3.18/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
index f122428..5d755d5 100644
--- a/patches/linux/3.18/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
+++ b/patches/linux/3.18/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.16/arch/arm/boot/dts/imx51-apf51.dtsi
+Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51.dtsi
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx51-apf51.dtsi
++++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51.dtsi
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
@@ -185,10 +185,10 @@ Index: linux-3.16/arch/arm/boot/dts/imx51-apf51.dtsi
+ };
+ };
+};
-Index: linux-3.16/arch/arm/boot/dts/imx51-apf51-v1.dtsi
+Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51-v1.dtsi
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx51-apf51-v1.dtsi
++++ linux-3.18-rc5/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.16/arch/arm/boot/dts/imx51-apf51-v1.dtsi
+ model = "Armadeus Systems APF51 V1 module";
+ compatible = "armadeus,imx51-apf51", "fsl,imx51";
+};
-Index: linux-3.16/arch/arm/boot/dts/imx51-apf51-v2.dtsi
+Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51-v2.dtsi
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx51-apf51-v2.dtsi
++++ linux-3.18-rc5/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.16/arch/arm/boot/dts/imx51-apf51-v2.dtsi
+ };
+ };
+};
-Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev-v2.dts
+Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev-v2.dts
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx51-apf51dev-v2.dts
++++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev-v2.dts
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
@@ -310,10 +310,10 @@ Index: linux-3.16/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.16/arch/arm/boot/dts/imx51-apf51dev.dtsi
+Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dtsi
++++ linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dtsi
@@ -0,0 +1,238 @@
+/*
+ * Copyright 2014 Armadeus Systems - <su...@ar...>
@@ -348,7 +348,7 @@ Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dtsi
+ hsync-active = <1>;
+ vsync-active = <1>;
+ de-active = <1>;
-+ pixelclk-active = <0>;
++ pixelclk-active = <1>;
+ };
+ };
+
@@ -553,11 +553,11 @@ Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dtsi
+ };
+ };
+};
-Index: linux-3.16/arch/arm/boot/dts/Makefile
+Index: linux-3.18-rc5/arch/arm/boot/dts/Makefile
===================================================================
---- linux-3.16.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.16/arch/arm/boot/dts/Makefile
-@@ -168,8 +168,8 @@ dtb-$(CONFIG_ARCH_MXC) += \
+--- 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 \
@@ -567,9 +567,9 @@ Index: linux-3.16/arch/arm/boot/dts/Makefile
imx51-babbage.dtb \
imx51-digi-connectcore-jsk.dtb \
imx51-eukrea-mbimxsd51-baseboard.dtb \
-Index: linux-3.16/arch/arm/boot/dts/imx51-apf51.dts
+Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51.dts
===================================================================
---- linux-3.16.orig/arch/arm/boot/dts/imx51-apf51.dts
+--- linux-3.18-rc5.orig/arch/arm/boot/dts/imx51-apf51.dts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
@@ -661,10 +661,10 @@ Index: linux-3.16/arch/arm/boot/dts/imx51-apf51.dts
- pinctrl-0 = <&pinctrl_uart3>;
- status = "okay";
-};
-Index: linux-3.16/arch/arm/boot/dts/imx51-apf51dev.dts
+Index: linux-3.18-rc5/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
---- linux-3.16.orig/arch/arm/boot/dts/imx51-apf51dev.dts
-+++ linux-3.16/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
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 Armadeus Systems - <su...@ar...>
diff --git a/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 5249994..62b078a 100644
--- a/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.18-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.18-rc5/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.18-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.18-rc5/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -31,11 +31,11 @@ Index: linux-3.18-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.18-rc5/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -0,0 +1,132 @@
++++ linux-3.18-rc5/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -0,0 +1,133 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -92,6 +92,7 @@ Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+&usdhc1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc1>;
++ non-removable;
+ status = "okay";
+};
+
@@ -168,11 +169,11 @@ Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+ };
+};
-Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.18-rc5/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,453 @@
++++ linux-3.18-rc5/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+@@ -0,0 +1,521 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -209,7 +210,7 @@ Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ hsync-active = <1>;
+ vsync-active = <1>;
+ de-active = <1>;
-+ pixelclk-active = <0>;
++ pixelclk-active = <1>;
+ };
+ };
+
@@ -294,6 +295,29 @@ Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ spdif-controller = <&spdif>;
+ spdif-out;
+ };
++
++ v4l2-capture {
++ compatible = "fsl,imx6-v4l2-capture";
++ #address-cells = <1>;
++ #size-cells = <0>;
++ ipu = <&ipu1>;
++ status = "okay";
++
++ /* CSI0 */
++ port@0 {
++ #address-cells = <1>;
++ #size-cells = <0>;
++ reg = <1>;
++
++ /* MIPI CSI-2 virtual channel 0 */
++ csi1_vc0: endpoint@0 {
++ reg = <0>;
++ remote-endpoint = <&ov5640>;
++ data-lanes = <0 1>;
++ clock-lanes = <2>;
++ };
++ };
++ };
+};
+
+&audmux {
@@ -343,6 +367,30 @@ Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ min-y = <0>;
+ max-y = <480>;
+ };
++
++ mipi_camera: ov5640@3c {
++ compatible = "ovti,ov5640_mipi";
++ reg = <0x3c>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_camera_ov5640>;
++ clocks = <&clks 201>;
++ clock-names = "xclk";
++ xclk = <24000000>;
++ pwdn-gpios = <&gpio5 20 GPIO_ACTIVE_HIGH>;
++ reset-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>;
++
++ port {
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ ov5640: endpoint@1 {
++ reg = <1>;
++ remote-endpoint = <&csi1_vc0>;
++ data-lanes = <0 1>;
++ clock-lanes = <2>;
++ };
++ };
++ };
+};
+
+&i2c2 {
@@ -376,6 +424,21 @@ Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ remote-endpoint = <&display_in>;
+};
+
++&mipi_csi {
++ status = "okay";
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ /* Incoming port from sensor */
++ port {
++ mipi_csi2_0: endpoint {
++ remote-endpoint = <&ov5640>;
++ data-lanes = <0 1>;
++ clock-lanes = <2>;
++ };
++ };
++};
++
+&pcie {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pcie>;
@@ -461,6 +524,14 @@ Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ >;
+ };
+
++ pinctrl_camera_ov5640: cameragrp {
++ fsl,pins = <
++ MX6QDL_PAD_GPIO_3__XTALOSC_REF_CLK_24M 0x1b0b0 /* CSI_MCLK */
++ MX6QDL_PAD_CSI0_MCLK__GPIO5_IO19 0x80000000
++ MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x80000000
++ >;
++ };
++
+ pinctrl_ecspi1: ecspi1grp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL1__ECSPI1_MISO 0x100b1
@@ -499,8 +570,6 @@ Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16 0x80000000
+ MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x80000000
+ MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18 0x80000000
-+ MX6QDL_PAD_CSI0_MCLK__GPIO5_IO19 0x80000000
-+ MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20 0x80000000
+ MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21 0x80000000
+ >;
+ };
@@ -626,10 +695,10 @@ Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ };
+ };
+};
-Index: linux-3.18-rc3/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.18-rc5/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.18-rc3/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.18-rc5/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
diff --git a/patches/linux/3.18/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch b/patches/linux/3.18/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
new file mode 100644
index 0000000..55621be
--- /dev/null
+++ b/patches/linux/3.18/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
@@ -0,0 +1,44 @@
+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(+)
+
+diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
+index d1b7d20..5016099 100644
+--- a/drivers/gpu/drm/drm_modes.c
++++ b/drivers/gpu/drm/drm_modes.c
+@@ -611,6 +611,10 @@ void drm_display_mode_from_videomode(const struct videomode *vm,
+ 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);
+diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
+index 8d98cd0..d5d045c 100644
+--- a/include/uapi/drm/drm_mode.h
++++ b/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 */
+--
+1.8.5.5
diff --git a/patches/linux/3.18/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch b/patches/linux/3.18/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
new file mode 100644
index 0000000..e856278
--- /dev/null
+++ b/patches/linux/3.18/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
@@ -0,0 +1,32 @@
+From a921b974de6b9ae585787a7b46354e32a630145f Mon Sep 17 00:00:00 2001
+From: Steve Longerbeam <ste...@me...>
+Date: Fri, 17 Oct 2014 18:23:18 -0700
+Subject: [PATCH 2/2] imx-drm: ipuv3-crtc: Use DRM mode flags to configure
+ pixel clock polarity
+
+Previously, pixel clock polarity was hardcoded and wasn't configurable.
+This patch adds support to configure the pixel clock polarity from the
+DRM mode flags.
+
+Signed-off-by: Mohsin Kazmi <moh...@me...>
+Signed-off-by: Steve Longerbeam <ste...@me...>
+---
+ drivers/staging/imx-drm/ipuv3-crtc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: linux-3.18-rc5/drivers/staging/imx-drm/ipuv3-crtc.c
+===================================================================
+--- linux-3.18-rc5.orig/drivers/staging/imx-drm/ipuv3-crtc.c
++++ linux-3.18-rc5/drivers/staging/imx-drm/ipuv3-crtc.c
+@@ -164,9 +164,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;
+- sig_cfg.clk_pol = 0;
+ sig_cfg.width = mode->hdisplay;
+ sig_cfg.height = mode->vdisplay;
+ sig_cfg.pixel_fmt = out_pixel_fmt;
diff --git a/patches/linux/3.18/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch b/patches/linux/3.18/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
new file mode 100644
index 0000000..ad4c298
--- /dev/null
+++ b/patches/linux/3.18/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
@@ -0,0 +1,413 @@
+From c22b1ebf8b920eb930f99696ec404fbd0652bb6a Mon Sep 17 00:00:00 2001
+From: Steve Longerbeam <ste...@me...>
+Date: Wed, 27 Aug 2014 10:21:05 -0700
+Subject: [PATCH 600/625] gpu: ipu-v3: Add Video Deinterlacer unit
+
+Adds the Video Deinterlacer (VDIC) unit.
+
+Signed-off-by: Steve Longerbeam <ste...@me...>
+---
+ drivers/gpu/ipu-v3/Makefile | 2 +-
+ drivers/gpu/ipu-v3/ipu-common.c | 11 ++
+ drivers/gpu/ipu-v3/ipu-prv.h | 6 +
+ drivers/gpu/ipu-v3/ipu-vdi.c | 266 ++++++++++++++++++++++++++++++++++++++++
+ include/video/imx-ipu-v3.h | 27 ++++
+ 5 files changed, 311 insertions(+), 1 deletion(-)
+ create mode 100644 drivers/gpu/ipu-v3/ipu-vdi.c
+
+diff --git a/drivers/gpu/ipu-v3/Makefile b/drivers/gpu/ipu-v3/Makefile
+index 107ec23..aeba9dc 100644
+--- a/drivers/gpu/ipu-v3/Makefile
++++ b/drivers/gpu/ipu-v3/Makefile
+@@ -1,4 +1,4 @@
+ obj-$(CONFIG_IMX_IPUV3_CORE) += imx-ipu-v3.o
+
+ imx-ipu-v3-objs := ipu-common.o ipu-cpmem.o ipu-csi.o ipu-dc.o ipu-di.o \
+- ipu-dp.o ipu-dmfc.o ipu-ic.o ipu-smfc.o
++ ipu-dp.o ipu-dmfc.o ipu-ic.o ipu-smfc.o ipu-vdi.o
+diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
+index f707d25..95fd9af 100644
+--- a/drivers/gpu/ipu-v3/ipu-common.c
++++ b/drivers/gpu/ipu-v3/ipu-common.c
+@@ -827,6 +827,14 @@ static int ipu_submodules_init(struct ipu_soc *ipu,
+ goto err_ic;
+ }
+
++ ret = ipu_vdi_init(ipu, dev, ipu_base + devtype->vdi_ofs,
++ IPU_CONF_VDI_EN | IPU_CONF_ISP_EN |
++ IPU_CONF_IC_INPUT);
++ if (ret) {
++ unit = "vdi";
++ goto err_vdi;
++ }
++
+ ret = ipu_di_init(ipu, dev, 0, ipu_base + devtype->disp0_ofs,
+ IPU_CONF_DI0_EN, ipu_clk);
+ if (ret) {
+@@ -881,6 +889,8 @@ err_dc:
+ err_di_1:
+ ipu_di_exit(ipu, 0);
+ err_di_0:
++ ipu_vdi_exit(ipu);
++err_vdi:
+ ipu_ic_exit(ipu);
+ err_ic:
+ ipu_csi_exit(ipu, 1);
+@@ -965,6 +975,7 @@ static void ipu_submodules_exit(struct ipu_soc *ipu)
+ ipu_dc_exit(ipu);
+ ipu_di_exit(ipu, 1);
+ ipu_di_exit(ipu, 0);
++ ipu_vdi_exit(ipu);
+ ipu_ic_exit(ipu);
+ ipu_csi_exit(ipu, 1);
+ ipu_csi_exit(ipu, 0);
+diff --git a/drivers/gpu/ipu-v3/ipu-prv.h b/drivers/gpu/ipu-v3/ipu-prv.h
+index bfb1e8a..845f64c 100644
+--- a/drivers/gpu/ipu-v3/ipu-prv.h
++++ b/drivers/gpu/ipu-v3/ipu-prv.h
+@@ -138,6 +138,7 @@ struct ipu_dc_priv;
+ struct ipu_dmfc_priv;
+ struct ipu_di;
+ struct ipu_ic_priv;
++struct ipu_vdi;
+ struct ipu_smfc_priv;
+
+ struct ipu_devtype;
+@@ -169,6 +170,7 @@ struct ipu_soc {
+ struct ipu_di *di_priv[2];
+ struct ipu_csi *csi_priv[2];
+ struct ipu_ic_priv *ic_priv;
++ struct ipu_vdi *vdi_priv;
+ struct ipu_smfc_priv *smfc_priv;
+ };
+
+@@ -199,6 +201,10 @@ int ipu_ic_init(struct ipu_soc *ipu, struct device *dev,
+ unsigned long base, unsigned long tpmem_base);
+ void ipu_ic_exit(struct ipu_soc *ipu);
+
++int ipu_vdi_init(struct ipu_soc *ipu, struct device *dev,
++ unsigned long base, u32 module);
++void ipu_vdi_exit(struct ipu_soc *ipu);
++
+ int ipu_di_init(struct ipu_soc *ipu, struct device *dev, int id,
+ unsigned long base, u32 module, struct clk *ipu_clk);
+ void ipu_di_exit(struct ipu_soc *ipu, int id);
+diff --git a/drivers/gpu/ipu-v3/ipu-vdi.c b/drivers/gpu/ipu-v3/ipu-vdi.c
+new file mode 100644
+index 0000000..3d20f42
+--- /dev/null
++++ b/drivers/gpu/ipu-v3/ipu-vdi.c
+@@ -0,0 +1,266 @@
++/*
++ * Copyright (C) 2012 Mentor Graphics Inc.
++ * Copyright (C) 2005-2009 Freescale Semiconductor, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2 of the License, or (at your
++ * option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * for more details.
++ */
++#include <linux/export.h>
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/errno.h>
++#include <linux/delay.h>
++#include <linux/io.h>
++#include <linux/err.h>
++#include <linux/platform_device.h>
++#include <linux/clk.h>
++#include <linux/clk-provider.h>
++#include <linux/clkdev.h>
++#include <uapi/linux/v4l2-mediabus.h>
++
++#include "ipu-prv.h"
++
++struct ipu_vdi {
++ void __iomem *base;
++ u32 module;
++ spinlock_t lock;
++ int use_count;
++ struct ipu_soc *ipu;
++};
++
++
++/* VDI Register Offsets */
++#define VDI_FSIZE 0x0000
++#define VDI_C 0x0004
++
++/* VDI Register Fields */
++#define VDI_C_CH_420 (0 << 1)
++#define VDI_C_CH_422 (1 << 1)
++#define VDI_C_MOT_SEL_MASK (0x3 << 2)
++#define VDI_C_MOT_SEL_FULL (2 << 2)
++#define VDI_C_MOT_SEL_LOW (1 << 2)
++#define VDI_C_MOT_SEL_MED (0 << 2)
++#define VDI_C_BURST_SIZE1_4 (3 << 4)
++#define VDI_C_BURST_SIZE2_4 (3 << 8)
++#define VDI_C_BURST_SIZE3_4 (3 << 12)
++#define VDI_C_BURST_SIZE_MASK 0xF
++#define VDI_C_BURST_SIZE1_OFFSET 4
++#define VDI_C_BURST_SIZE2_OFFSET 8
++#define VDI_C_BURST_SIZE3_OFFSET 12
++#define VDI_C_VWM1_SET_1 (0 << 16)
++#define VDI_C_VWM1_SET_2 (1 << 16)
++#define VDI_C_VWM1_CLR_2 (1 << 19)
++#define VDI_C_VWM3_SET_1 (0 << 22)
++#define VDI_C_VWM3_SET_2 (1 << 22)
++#define VDI_C_VWM3_CLR_2 (1 << 25)
++#define VDI_C_TOP_FIELD_MAN_1 (1 << 30)
++#define VDI_C_TOP_FIELD_AUTO_1 (1 << 31)
++
++static inline u32 ipu_vdi_read(struct ipu_vdi *vdi, unsigned offset)
++{
++ return readl(vdi->base + offset);
++}
++
++static inline void ipu_vdi_write(struct ipu_vdi *vdi, u32 value,
++ unsigned offset)
++{
++ writel(value, vdi->base + offset);
++}
++
++static void __ipu_vdi_set_top_field_man(struct ipu_vdi *vdi, bool top_field_0)
++{
++ u32 reg;
++
++ reg = ipu_vdi_read(vdi, VDI_C);
++ if (top_field_0)
++ reg &= ~VDI_C_TOP_FIELD_MAN_1;
++ else
++ reg |= VDI_C_TOP_FIELD_MAN_1;
++ ipu_vdi_write(vdi, reg, VDI_C);
++}
++
++static void __ipu_vdi_set_motion(struct ipu_vdi *vdi,
++ enum ipu_motion_sel motion_sel)
++{
++ u32 reg;
++
++ reg = ipu_vdi_read(vdi, VDI_C);
++
++ reg &= ~VDI_C_MOT_SEL_MASK;
++
++ switch (motion_sel) {
++ case MED_MOTION:
++ reg |= VDI_C_MOT_SEL_MED;
++ break;
++ case HIGH_MOTION:
++ reg |= VDI_C_MOT_SEL_FULL;
++ break;
++ default:
++ reg |= VDI_C_MOT_SEL_LOW;
++ break;
++ }
++
++ ipu_vdi_write(vdi, reg, VDI_C);
++}
++
++void ipu_vdi_setup(struct ipu_vdi *vdi, u32 code, int xres, int yres,
++ u32 field, enum ipu_motion_sel motion_sel)
++{
++ unsigned long flags;
++ u32 pixel_fmt, reg;
++
++ spin_lock_irqsave(&vdi->lock, flags);
++
++ reg = ((yres - 1) << 16) | (xres - 1);
++ ipu_vdi_write(vdi, reg, VDI_FSIZE);
++
++ /*
++ * Full motion, only vertical filter is used.
++ * Burst size is 4 accesses
++ */
++ if (code == V4L2_MBUS_FMT_UYVY8_2X8 ||
++ code == V4L2_MBUS_FMT_UYVY8_1X16 ||
++ code == V4L2_MBUS_FMT_YUYV8_2X8 ||
++ code == V4L2_MBUS_FMT_YUYV8_1X16)
++ pixel_fmt = VDI_C_CH_422;
++ else
++ pixel_fmt = VDI_C_CH_420;
++
++ reg = ipu_vdi_read(vdi, VDI_C);
++ reg |= pixel_fmt;
++ reg |= VDI_C_BURST_SIZE2_4;
++ reg |= VDI_C_BURST_SIZE1_4 | VDI_C_VWM1_CLR_2;
++ reg |= VDI_C_BURST_SIZE3_4 | VDI_C_VWM3_CLR_2;
++ ipu_vdi_write(vdi, reg, VDI_C);
++
++ if (field == V4L2_FIELD_INTERLACED_TB)
++ __ipu_vdi_set_top_field_man(vdi, false);
++ else if (field == V4L2_FIELD_INTERLACED_BT)
++ __ipu_vdi_set_top_field_man(vdi, true);
++
++ __ipu_vdi_set_motion(vdi, motion_sel);
++
++ spin_unlock_irqrestore(&vdi->lock, flags);
++}
++EXPORT_SYMBOL_GPL(ipu_vdi_setup);
++
++void ipu_vdi_unsetup(struct ipu_vdi *vdi)
++{
++ unsigned long flags;
++
++ spin_lock_irqsave(&vdi->lock, flags);
++ ipu_vdi_write(vdi, 0, VDI_FSIZE);
++ ipu_vdi_write(vdi, 0, VDI_C);
++ spin_unlock_irqrestore(&vdi->lock, flags);
++}
++EXPORT_SYMBOL_GPL(ipu_vdi_unsetup);
++
++void ipu_vdi_toggle_top_field_man(struct ipu_vdi *vdi)
++{
++ unsigned long flags;
++ u32 reg;
++ u32 mask_reg;
++
++ spin_lock_irqsave(&vdi->lock, flags);
++
++ reg = ipu_vdi_read(vdi, VDI_C);
++ mask_reg = reg & VDI_C_TOP_FIELD_MAN_1;
++ if (mask_reg == VDI_C_TOP_FIELD_MAN_1)
++ reg &= ~VDI_C_TOP_FIELD_MAN_1;
++ else
++ reg |= VDI_C_TOP_FIELD_MAN_1;
++
++ ipu_vdi_write(vdi, reg, VDI_C);
++
++ spin_unlock_irqrestore(&vdi->lock, flags);
++}
++EXPORT_SYMBOL_GPL(ipu_vdi_toggle_top_field_man);
++
++int ipu_vdi_set_src(struct ipu_vdi *vdi, bool csi)
++{
++ ipu_set_vdi_src_mux(vdi->ipu, csi);
++ return 0;
++}
++EXPORT_SYMBOL_GPL(ipu_vdi_set_src);
++
++int ipu_vdi_enable(struct ipu_vdi *vdi)
++{
++ unsigned long flags;
++
++ spin_lock_irqsave(&vdi->lock, flags);
++
++ if (!vdi->use_count)
++ ipu_module_enable(vdi->ipu, vdi->module);
++
++ vdi->use_count++;
++
++ spin_unlock_irqrestore(&vdi->lock, flags);
++
++ return 0;
++}
++EXPORT_SYMBOL_GPL(ipu_vdi_enable);
++
++int ipu_vdi_disable(struct ipu_vdi *vdi)
++{
++ unsigned long flags;
++
++ spin_lock_irqsave(&vdi->lock, flags);
++
++ vdi->use_count--;
++
++ if (!vdi->use_count)
++ ipu_module_disable(vdi->ipu, vdi->module);
++
++ if (vdi->use_count < 0)
++ vdi->use_count = 0;
++
++ spin_unlock_irqrestore(&vdi->lock, flags);
++
++ return 0;
++}
++EXPORT_SYMBOL_GPL(ipu_vdi_disable);
++
++struct ipu_vdi *ipu_vdi_get(struct ipu_soc *ipu)
++{
++ return ipu->vdi_priv;
++}
++EXPORT_SYMBOL_GPL(ipu_vdi_get);
++
++void ipu_vdi_put(struct ipu_vdi *vdi)
++{
++}
++EXPORT_SYMBOL_GPL(ipu_vdi_put);
++
++int ipu_vdi_init(struct ipu_soc *ipu, struct device *dev,
++ unsigned long base, u32 module)
++{
++ struct ipu_vdi *vdi;
++
++ vdi = devm_kzalloc(dev, sizeof(*vdi), GFP_KERNEL);
++ if (!vdi)
++ return -ENOMEM;
++
++ ipu->vdi_priv = vdi;
++
++ spin_lock_init(&vdi->lock);
++ vdi->module = module;
++ vdi->base = devm_ioremap(dev, base, PAGE_SIZE);
++ if (!vdi->base)
++ return -ENOMEM;
++
++ dev_dbg(dev, "VDI base: 0x%08lx remapped to %p\n", base, vdi->base);
++ vdi->ipu = ipu;
++
++ return 0;
++}
++
++void ipu_vdi_exit(struct ipu_soc *ipu)
++{
++}
+diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
+index c74bf4a..b3f09726 100644
+--- a/include/video/imx-ipu-v3.h
++++ b/include/video/imx-ipu-v3.h
+@@ -91,6 +91,16 @@ enum ipu_color_space {
+ IPUV3_COLORSPACE_UNKNOWN,
+ };
+
++/*
++ * Enumeration of VDI MOTION select
++ */
++enum ipu_motion_sel {
++ MOTION_NONE = 0,
++ LOW_MOTION,
++ MED_MOTION,
++ HIGH_MOTION,
++};
++
+ struct ipuv3_channel;
+
+ enum ipu_channel_irq {
+@@ -329,6 +339,23 @@ void ipu_ic_put(struct ipu_ic *ic);
+ void ipu_ic_dump(struct ipu_ic *ic);
+
+ /*
++ * IPU Video De-Interlacer (vdi) functions
++ */
++struct ipu_vdi;
++void ipu_vdi_set_top_field_man(struct ipu_vdi *vdi, bool top_field_0);
++void ipu_vdi_set_motion(struct ipu_vdi *vdi, enum ipu_motion_sel motion_sel);
++void ipu_vdi_setup(struct ipu_vdi *vdi,
++ u32 code, int xres, int yres, u32 field,
++ enum ipu_motion_sel motion_sel);
++void ipu_vdi_unsetup(struct ipu_vdi *vdi);
++void ipu_vdi_toggle_top_field_man(struct ipu_vdi *vdi);
++int ipu_vdi_set_src(struct ipu_vdi *vdi, bool csi);
++int ipu_vdi_enable(struct ipu_vdi *vdi);
++int ipu_vdi_disable(struct ipu_vdi *vdi);
++struct ipu_vdi *ipu_vdi_get(struct ipu_soc *ipu);
++void ipu_vdi_put(struct ipu_vdi *vdi);
++
++/*
+ * IPU Sensor Multiple FIFO Controller (SMFC) functions
+ */
+ struct ipu_smfc *ipu_smfc_get(struct ipu_soc *ipu, unsigned int chno);
+--
+1.8.5.5
diff --git a/patches/linux/3.18/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch b/patches/linux/3.18/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch
new file mode 100644
index 0000000..d8287fc
--- /dev/null
+++ b/patches/linux/3.18/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch
@@ -0,0 +1,45 @@
+From b5ad5d840669c1586c67809f2e5aa538ed4c029b Mon Sep 17 00:00:00 2001
+From: Steve Longerbeam <ste...@me...>
+Date: Sun, 31 Aug 2014 16:21:37 -0700
+Subject: [PATCH 601/625] gpu: ipu-cpmem: Add ipu_cpmem_set_uv_offset()
+
+Adds ipu_cpmem_set_uv_offset(), to set planar U/V offsets.
+
+Signed-off-by: Steve Longerbeam <ste...@me...>
+---
+ drivers/gpu/ipu-v3/ipu-cpmem.c | 7 +++++++
+ include/video/imx-ipu-v3.h | 1 +
+ 2 files changed, 8 insertions(+)
+
+diff --git a/drivers/gpu/ipu-v3/ipu-cpmem.c b/drivers/gpu/ipu-v3/ipu-cpmem.c
+index 3bf05bc..2c93e9c 100644
+--- a/drivers/gpu/ipu-v3/ipu-cpmem.c
++++ b/drivers/gpu/ipu-v3/ipu-cpmem.c
+@@ -253,6 +253,13 @@ void ipu_cpmem_set_buffer(struct ipuv3_channel *ch, int bufnum, dma_addr_t buf)
+ }
+ EXPORT_SYMBOL_GPL(ipu_cpmem_set_buffer);
+
++void ipu_cpmem_set_uv_offset(struct ipuv3_channel *ch, u32 u_off, u32 v_off)
++{
++ ipu_ch_param_write_field(ch, IPU_FIELD_UBO, u_off / 8);
++ ipu_ch_param_write_field(ch, IPU_FIELD_VBO, v_off / 8);
++}
++EXPORT_SYMBOL_GPL(ipu_cpmem_set_uv_offset);
++
+ void ipu_cpmem_interlaced_scan(struct ipuv3_channel *ch, int stride)
+ {
+ ipu_ch_param_write_field(ch, IPU_FIELD_SO, 1);
+diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
+index b3f09726..c7517d3 100644
+--- a/include/video/imx-ipu-v3.h
++++ b/include/video/imx-ipu-v3.h
+@@ -205,6 +205,7 @@ void ipu_cpmem_set_resolution(struct ipuv3_channel *ch, int xres, int yres);
+ void ipu_cpmem_set_stride(struct ipuv3_channel *ch, int stride);
+ void ipu_cpmem_set_high_priority(struct ipuv3_channel *ch);
+ void ipu_cpmem_set_buffer(struct ipuv3_channel *ch, int bufnum, dma_addr_t buf);
++void ipu_cpmem_set_uv_offset(struct ipuv3_channel *ch, u32 u_off, u32 v_off);
+ void ipu_cpmem_interlaced_scan(struct ipuv3_channel *ch, int stride);
+ void ipu_cpmem_set_axi_id(struct ipuv3_channel *ch, u32 id);
+ void ipu_cpmem_set_burstsize(struct ipuv3_channel *ch, int burstsize);
+--
+1.8.5.5
diff --git a/patches/linux/3.18/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch b/patches/linux/3.18/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch
new file mode 100644
index 0000000..19bbe6a
--- /dev/null
+++ b/patches/linux/3.18/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch
@@ -0,0 +1,39 @@
+From 77e0aa9b059b4896875f12044e756dddfb685122 Mon Sep 17 00:00:00 2001
+From: Steve Longerbeam <ste...@me...>
+Date: Tue, 26 Aug 2014 10:02:49 -0700
+Subject: [PATCH 602/625] ARM: dts: imx6qdl: Add ipu aliases
+
+Add ipu0 (and ipu1 for quad) aliases to ipu1/ipu2 nodes respectively.
+
+Signed-off-by: Steve Longerbeam <ste...@me...>
+---
+ arch/arm/boot/dts/imx6q.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl.dtsi | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
+index e9f3646..585a541 100644
+--- a/arch/arm/boot/dts/imx6q.dtsi
++++ b/arch/arm/boot/dts/imx6q.dtsi
+@@ -14,6 +14,7 @@
+
+ / {
+ aliases {
++ ipu1 = &ipu2;
+ spi4 = &ecspi5;
+ };
+
+diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
+index 9596ed5..c9b8613 100644
+--- a/arch/arm/boot/dts/imx6qdl.dtsi
++++ b/arch/arm/boot/dts/imx6qdl.dtsi
+@@ -30,6 +30,7 @@
+ i2c0 = &i2c1;
+ i2c1 = &i2c2;
+ i2c2 = &i2c3;
++ ipu0 = &ipu1;
+ mmc0 = &usdhc1;
+ mmc1 = &usdhc2;
+ mmc2 = &usdhc3;
+--
+1.8.5.5
diff --git a/patches/linux/3.18/0603-gpu-ipu-v3-Add-ipu_get_num.patch b/patches/linux/3.18/0603-gpu-ipu-v3-Add-ipu_get_num.patch
new file mode 100644
index 0000000..d61387f
--- /dev/null
+++ b/patches/linux/3.18/0603-gpu-ipu-v3-Add-ipu_get_num.patch
@@ -0,0 +1,73 @@
+From 30274ff35742415d8771043755f396662bb32ec4 Mon Sep 17 00:00:00 2001
+From: Steve Longerbeam <ste...@me...>
+Date: Thu, 1 May 2014 10:47:32 -0700
+Subject: [PATCH 603/625] gpu: ipu-v3: Add ipu_get_num()
+
+Adds of-alias id to ipu_soc and retrieve with ipu_get_num().
+
+Signed-off-by: Steve Longerbeam <ste...@me...>
+---
+ drivers/gpu/ipu-v3/ipu-common.c | 8 ++++++++
+ drivers/gpu/ipu-v3/ipu-prv.h | 1 +
+ include/video/imx-ipu-v3.h | 1 +
+ 3 files changed, 10 insertions(+)
+
+diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
+index 95fd9af..5c8cfa3 100644
+--- a/drivers/gpu/ipu-v3/ipu-common.c
++++ b/drivers/gpu/ipu-v3/ipu-common.c
+@@ -44,6 +44,12 @@ static inline void ipu_cm_write(struct ipu_soc *ipu, u32 value, unsigned offset)
+ writel(value, ipu->cm_reg + offset);
+ }
+
++int ipu_get_num(struct ipu_soc *ipu)
++{
++ return ipu->id;
++}
++EXPORT_SYMBOL_GPL(ipu_get_num);
++
+ void ipu_srm_dp_sync_update(struct ipu_soc *ipu)
+ {
+ u32 val;
+@@ -1200,6 +1206,7 @@ static int ipu_probe(struct platform_device *pdev)
+ {
+ const struct of_device_id *of_id =
+ of_match_device(imx_ipu_dt_ids, &pdev->dev);
++ struct device_node *np = pdev->dev.of_node;
+ struct ipu_soc *ipu;
+ struct resource *res;
+ unsigned long ipu_base;
+@@ -1228,6 +1235,7 @@ static int ipu_probe(struct platform_device *pdev)
+ ipu->channel[i].ipu = ipu;
+ ipu->devtype = devtype;
+ ipu->ipu_type = devtype->type;
++ ipu->id = of_alias_get_id(np, "ipu");
+
+ spin_lock_init(&ipu->lock);
+ mutex_init(&ipu->channel_lock);
+diff --git a/drivers/gpu/ipu-v3/ipu-prv.h b/drivers/gpu/ipu-v3/ipu-prv.h
+index 845f64c..02057d8 100644
+--- a/drivers/gpu/ipu-v3/ipu-prv.h
++++ b/drivers/gpu/ipu-v3/ipu-prv.h
+@@ -153,6 +153,7 @@ struct ipu_soc {
+ void __iomem *cm_reg;
+ void __iomem *idmac_reg;
+
++ int id;
+ int usecount;
+
+ struct clk *clk;
+diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
+index c7517d3..51e4103 100644
+--- a/include/video/imx-ipu-v3.h
++++ b/include/video/imx-ipu-v3.h
+@@ -159,6 +159,7 @@ int ipu_idmac_channel_irq(struct ipu_soc *ipu, struct ipuv3_channel *channel,
+ /*
+ * IPU Common functions
+ */
++int ipu_get_num(struct ipu_soc *ipu);
+ void ipu_set_csi_src_mux(struct ipu_soc *ipu, int csi_id, bool mipi_csi2);
+ void ipu_set_ic_src_mux(struct ipu_soc *ipu, int csi_id, bool vdi);
+ void ipu_dump(struct ipu_soc *ipu);
+--
+1.8.5.5
diff --git a/patches/linux/3.18/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch b/patches/linux/3.18/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch
new file mode 100644
index 0000000..f9cad92
--- /dev/null
+++ b/patches/linux/3.18/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch
@@ -0,0 +1,168 @@
+From ed334e6417c2e3a8afb5befb6be429a2cc3184e1 Mon Sep 17 00:00:00 2001
+From: Steve Longerbeam <ste...@me...>
+Date: Tue, 26 Aug 2014 18:07:49 -0700
+Subject: [PATCH 604/625] gpu: ipu-v3: Add IDMA channel linking support
+
+Adds functions to link and unlink IDMAC source channels to sink
+channels.
+
+So far the following links are supported:
+
+IPUV3_CHANNEL_IC_PRP_ENC_MEM -> IPUV3_CHANNEL_MEM_ROT_ENC
+PUV3_CHANNEL_IC_PRP_VF_MEM -> IPUV3_CHANNEL_MEM_ROT_VF
+IPUV3_CHANNEL_IC_PP_MEM -> IPUV3_CHANNEL_MEM_ROT_PP
+
+More links can be added to the idmac_link_info[] array.
+
+Signed-off-by: Steve Longerbeam <ste...@me...>
+---
+ drivers/gpu/ipu-v3/ipu-common.c | 112 ++++++++++++++++++++++++++++++++++++++++
+ include/video/imx-ipu-v3.h | 3 ++
+ 2 files changed, 115 insertions(+)
+
+diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
+index 5c8cfa3..85ca6d0 100644
+--- a/drivers/gpu/ipu-v3/ipu-common.c
++++ b/drivers/gpu/ipu-v3/ipu-common.c
+@@ -724,6 +724,118 @@ void ipu_set_ic_src_mux(struct ipu_soc *ipu, int csi_id, bool vdi)
+ }
+ EXPORT_SYMBOL_GPL(ipu_set_ic_src_mux);
+
++
++/* IDMAC Channel Linking */
++
++struct idmac_link_reg_info {
++ int chno;
++ u32 reg;
++ int shift;
++ int bits;
++ u32 sel;
++};
++
++struct idmac_link_info {
++ struct idmac_link_reg_info src;
++ struct idmac_link_reg_info sink;
++};
++
++static const struct idmac_link_info idmac_link_info[] = {
++ {
++ .src = { 20, IPU_FS_PROC_FLOW1, 0, 4, 7 },
++ .sink = { 45, IPU_FS_PROC_FLOW2, 0, 4, 1 },
++ }, {
++ .src = { 21, IPU_FS_PROC_FLOW1, 8, 4, 8 },
++ .sink = { 46, IPU_FS_PROC_FLOW2, 4, 4, 1 },
++ }, {
++ .src = { 22, IPU_FS_PROC_FLOW1, 16, 4, 5 },
++ .sink = { 47, IPU_FS_PROC_FLOW2, 12, 4, 3 },
++ },
++};
++
++static const struct idmac_link_info *find_idmac_link_info(
++ struct ipuv3_channel *src, struct ipuv3_channel *sink)
++{
++ int i;
++
++ for (i = 0; i < ARRAY_SIZE(idmac_link_info); i++) {
++ if (src->num == idmac_link_info[i].src.chno &&
++ sink->num == idmac_link_info[i].sink.chno)
++ return &idmac_link_info[i];
++ }
++
++ return NULL;
++}
++
++/*
++ * Links an IDMAC source channel to a sink channel.
++ */
++int ipu_idmac_link(struct ipuv3_channel *src, struct ipuv3_channel *sink)
++{
++ struct ipu_soc *ipu = src->ipu;
++ const struct idmac_link_info *link;
++ u32 src_reg, sink_reg, src_mask, sink_mask;
++ unsigned long flags;
++
++ link = find_idmac_link_info(src, sink);
++ if (!link)
++ return -EINVAL;
++
++ src_mask = ((1 << link->src.bits) - 1) << link->src.shift;
++ sink_mask = ((1 << link->sink.bits) - 1) << link->sink.shift;
++
++ spin_lock_irqsave(&ipu->lock, flags);
++
++ src_reg = ipu_cm_read(ipu, link->src.reg);
++ sink_reg = ipu_cm_read(ipu, link->sink.reg);
++
++ src_reg &= ~src_mask;
++ src_reg |= (link->src.sel << link->src.shift);
++
++ sink_reg &= ~sink_mask;
++ sink_reg |= (link->sink.sel << link->sink.shift);
++
++ ipu_cm_write(ipu, src_reg, link->src.reg);
++ ipu_cm_write(ipu, sink_reg, link->sink.reg);
++
++ spin_unlock_irqrestore(&ipu->lock, flags);
++ return 0;
++}
++EXPORT_SYMBOL_GPL(ipu_idmac_link);
++
++/*
++ * Unlinks IDMAC source and sink channels.
++ */
++int ipu_idmac_unlink(struct ipuv3_channel *src, struct ipuv3_channel *sink)
++{
++ struct ipu_soc *ipu = src->ipu;
++ const struct idmac_link_info *link;
++ u32 src_reg, sink_reg, src_mask, sink_mask;
++ unsigned long flags;
++
++ link = find_idmac_link_info(src, sink);
++ if (!link)
++ return -EINVAL;
++
++ src_mask = ((1 << link->src.bits) - 1) << link->src.shift;
++ sink_mask = ((1 << link->sink.bits) - 1) << link->sink.shift;
++
++ spin_lock_irqsave(&ipu->lock, flags);
++
++ src_reg = ipu_cm_read(ipu, link->src.reg);
++ sink_reg = ipu_cm_read(ipu, link->sink.reg);
++
++ src_reg &= ~src_mask;
++ sink_reg &= ~sink_mask;
++
++ ipu_cm_write(ipu, src_reg, link->src.reg);
++ ipu_cm_write(ipu, sink_reg, link->sink.reg);
++
++ spin_unlock_irqrestore(&ipu->lock, flags);
++ return 0;
++}
++EXPORT_SYMBOL_GPL(ipu_idmac_unlink);
++
+ struct ipu_devtype {
+ const char *name;
+ unsigned long cm_ofs;
+diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h
+index 51e4103..2af3f2d 100644
+--- a/include/video/imx-ipu-v3.h
++++ b/include/video/imx-ipu-v3.h
+@@ -139,6 +139,7 @@ enum ipu_channel_irq {
+ #define IPUV3_CHANNEL_ROT_VF_MEM 49
+ #define IPUV3_CHANNEL_ROT_PP_MEM 50
+ #define IPUV3_CHANNEL_MEM_BG_SYNC_ALPHA 51
++#define IPUV3_NUM_CHANNELS 64
+
+ int ipu_map_irq(struct ipu_soc *ipu, int irq);
+ int ipu_idmac_channel_irq(struct ipu_soc *ipu, struct ipuv3_channel *channel,
+@@ -182,6 +183,8 @@ int ipu_idmac_get_current_buffer(struct ipuv3_channel *channel);
+ bool ipu_idmac_buffer_is_ready(struct ipuv3_channel *channel, u32 buf_num);
+ void ipu_idmac_select_buffer(struct ipuv3_channel *channel, u32 buf_num);
+ void ipu_idmac_clear_buffer(struct ipuv3_channel *channel, u32 buf_num);
++int ipu_idmac_link(struct ipuv3_channel *src, struct ipuv3_channel *sink);
++int ipu_idmac_unlink(struct ipuv3_channel *src, struct ipuv3_channel *sink);
+
+ /*
+ * IPU Channel Parameter Memory (cpmem) functions
+--
+1.8.5.5
diff --git a/patches/linux/3.18/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch b/patches/linux/3.18/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch
new file mode 100644
index 0000000..87973db
--- /dev/null
+++ b/patches/linux/3.18/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch
@@ -0,0 +1,58 @@
+From 3dbe259299680942036963db649e930120b43665 Mon Sep 17 00:00:00 2001
+From: Steve Longerbeam <ste...@me...>
+Date: Wed, 27 Aug 2014 09:58:21 -0700
+Subject: [PATCH 605/625] gpu: ipu-v3: Add ipu_set_vdi_src_mux()
+
+Adds ipu_set_vdi_src_mux() that selects the VDIC input (from CSI or memory).
+
+Signed-off-by: Steve Longerbeam <ste...@me...>
+---
+ drivers/gpu/ipu-v3/ipu-common.c | 20 ++++++++++++++++++++
+ include/video/imx-ipu-v3.h | 1 +
+ 2 files changed, 21 insertions(+)
+
+diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
+index 85ca6d0..b2550b4 100644
+--- a/drivers/gpu/ipu-v3/ipu-common.c
++++ b/drivers/gpu/ipu-v3/ipu-common.c
+@@ -724,6 +724,26 @@ void ipu_set_ic_src_mux(struct ipu_soc *ipu, int csi_id, bool vdi)
+ }
+ EXPORT_SYMBOL_GPL(ipu_set_ic_src_mux);
+
++/*
++ * Set the source for the VDIC. Selects either from CSI[01] or memory.
++ */
++void ipu_set_vdi_src_mux(struct ipu_soc *ipu, bool csi)
++{
++ unsigned long flags;
++ u32 val;
++
++ spin_lock_irqsave(&ipu->lock, flags);
++
++ val = ipu_cm_read(ipu, IPU_FS_PROC_FLOW1);
++ val &= ~(0x3 << 28);
++ if (csi)
++ val |= (0x01 << 28);
++ ipu_cm_write(ipu, val, IPU_FS_PROC_FLOW1);
...
[truncated message content] |
|
From: Nicolas <th...@us...> - 2014-11-18 12:55: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 fc1d5bcdc7eecd6e6f6ba4d96c7626ebd6fdc783 (commit)
from ad95ac1866cc55a170e834bde1f86901dc3f4fc8 (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 fc1d5bcdc7eecd6e6f6ba4d96c7626ebd6fdc783
Author: Nicolas Colombain <nic...@ar...>
Date: Tue Nov 18 13:55:08 2014 +0100
[UBOOT] fix error in 128MB DDR parameters
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-1.3.4.h | 4 ++--
.../device/armadeus/apf27/apf27-u-boot-2010.03.h | 4 ++--
.../device/armadeus/apf27/apf27-u-boot-2012.04.h | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
index 8b5caa1..f822e15 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
@@ -471,8 +471,8 @@
#define CFG_SDRAM_1_SIZE 0x08000000 /* 128 MB */
#define CFG_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
#define CFG_SDRAM_2_SIZE 0x08000000 /* 128 MB */
-#define CFG_SDRAM_NUM_COL 9 /* 8, 9, 10 or 11 column address bits */
-#define CFG_SDRAM_NUM_ROW 14 /* 11, 12 or 13 row address bits */
+#define CFG_SDRAM_NUM_COL 10 /* 8, 9, 10 or 11 column address bits */
+#define CFG_SDRAM_NUM_ROW 13 /* 11, 12 or 13 row address bits */
#define CFG_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
#define CFG_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
#define CFG_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h
index c5a9e1d..ce71264 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h
@@ -467,8 +467,8 @@
#define CONFIG_SYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */
#define CONFIG_SYS_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
#define CONFIG_SYS_SDRAM_2_SIZE 0x08000000 /* 128 MB */
-#define CONFIG_SYS_SDRAM_NUM_COL 9 /* 8, 9, 10 or 11 column address bits */
-#define CONFIG_SYS_SDRAM_NUM_ROW 14 /* 11, 12 or 13 row address bits */
+#define CONFIG_SYS_SDRAM_NUM_COL 10 /* 8, 9, 10 or 11 column address bits */
+#define CONFIG_SYS_SDRAM_NUM_ROW 13 /* 11, 12 or 13 row address bits */
#define CONFIG_SYS_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
#define CONFIG_SYS_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
#define CONFIG_SYS_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
index 224e332..8769db0 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
@@ -538,8 +538,8 @@
/* micron 128MB */
#define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */
#define PHYS_SDRAM_2_SIZE 0x08000000 /* 128 MB */
-#define CONFIG_SYS_SDRAM_NUM_COL 9 /* 8, 9, 10 or 11 column address bits */
-#define CONFIG_SYS_SDRAM_NUM_ROW 14 /* 11, 12 or 13 row address bits */
+#define CONFIG_SYS_SDRAM_NUM_COL 10 /* 8, 9, 10 or 11 column address bits */
+#define CONFIG_SYS_SDRAM_NUM_ROW 13 /* 11, 12 or 13 row address bits */
#define CONFIG_SYS_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
#define CONFIG_SYS_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
#define CONFIG_SYS_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2014-11-06 10:57: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 ad95ac1866cc55a170e834bde1f86901dc3f4fc8 (commit)
from 604ae41797e8371d575cd3fcffa9e8f7ad29d01b (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 ad95ac1866cc55a170e834bde1f86901dc3f4fc8
Author: Nicolas Colombain <nic...@ar...>
Date: Thu Nov 6 11:55:53 2014 +0100
[LINUX] add apf6SP support to load_fpga
-----------------------------------------------------------------------
Summary of changes:
.../linux/modules/fpga/dev_tools/loader/load_fpga | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/target/linux/modules/fpga/dev_tools/loader/load_fpga b/target/linux/modules/fpga/dev_tools/loader/load_fpga
index 379ca63..26bc844 100755
--- a/target/linux/modules/fpga/dev_tools/loader/load_fpga
+++ b/target/linux/modules/fpga/dev_tools/loader/load_fpga
@@ -15,6 +15,17 @@ if [ ! -f "$1" ]; then
exit 1
fi
+if [ "$PLATFORM" == "APF6" ]; then
+ DEVLOADER=/dev/altera_cvp
+ major=`grep -w altera_cvp /proc/devices | cut -f1 -d" "`
+ if [ ! -e /dev/altera_cvp ]; then
+ mknod /dev/altera_cvp c $major 0
+ fi
+ modprobe fpgaloader
+else
+ DEVLOADER=/dev/fpgaloader
+fi
+
if [ "$PLATFORM" == "APF51" ]; then
filename="$1"
ext=${filename/*./}
@@ -24,7 +35,7 @@ if [ "$PLATFORM" == "APF51" ]; then
fi
fi
-if [ ! -c /dev/fpgaloader ]; then
+if [ ! -c $DEVLOADER ]; then
modprobe fpgaloader
if [ "$?" != 0 ]; then
echo "Failed to modprobe FPGA loader driver. Please check your config !"
@@ -33,7 +44,7 @@ if [ ! -c /dev/fpgaloader ]; then
fi
timeout=0
-while [ ! -c /dev/fpgaloader ]; do
+while [ ! -c $DEVLOADER ]; do
usleep 1000
let timeout=timeout+1
if [ $timeout -gt 100 ]; then
@@ -56,7 +67,7 @@ else
BITFILE=$1
fi
-dd if=$BITFILE of=/dev/fpgaloader
+dd if=$BITFILE of=$DEVLOADER
RES=$?
if [ "$PLATFORM" == "APF51" ]; then
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2014-11-05 16:56: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 604ae41797e8371d575cd3fcffa9e8f7ad29d01b (commit)
via f44fc0d14e5126ae3974b2091f4e85332280a6f4 (commit)
from 0772dddd7ca2d9bf65c935a18be81432f8115141 (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 604ae41797e8371d575cd3fcffa9e8f7ad29d01b
Merge: f44fc0d 0772ddd
Author: Nicolas Colombain <nic...@ar...>
Date: Wed Nov 5 17:55:24 2014 +0100
Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code
commit f44fc0d14e5126ae3974b2091f4e85332280a6f4
Author: Nicolas Colombain <nic...@ar...>
Date: Wed Nov 5 17:55:06 2014 +0100
[LINUX] add APF6 fpgaloader first version
-----------------------------------------------------------------------
Summary of changes:
.../linux/modules/fpga/dev_tools/loader/Makefile | 8 +
.../modules/fpga/dev_tools/loader/altera_cvp.c | 533 ++++++++++++++++++++
.../modules/fpga/dev_tools/loader/altera_cvp.h | 106 ++++
3 files changed, 647 insertions(+), 0 deletions(-)
create mode 100644 target/linux/modules/fpga/dev_tools/loader/altera_cvp.c
create mode 100644 target/linux/modules/fpga/dev_tools/loader/altera_cvp.h
diff --git a/target/linux/modules/fpga/dev_tools/loader/Makefile b/target/linux/modules/fpga/dev_tools/loader/Makefile
index 3872580..aab32b7 100644
--- a/target/linux/modules/fpga/dev_tools/loader/Makefile
+++ b/target/linux/modules/fpga/dev_tools/loader/Makefile
@@ -5,7 +5,15 @@
ifneq ($(KERNELRELEASE)$(KERNELVERSION),)
obj-$(CONFIG_ARMADEUS_FPGA_LOADER_DRIVER) += fpgaloader.o
+ifneq ($(CONFIG_SOC_IMX6Q),)
+fpgaloader-objs := altera_cvp.o
+else
+ifneq ($(CONFIG_SOC_IMX6SOLO),)
+fpgaloader-objs := altera_cvp.o
+else
fpgaloader-objs := xilinx-fpga-loader.o fpga-loader.o
+endif
+endif
ifneq ($(CONFIG_DTC),)
ifneq ($(CONFIG_MACH_MX27),)
obj-y += apf27-fpga-loader.o
diff --git a/target/linux/modules/fpga/dev_tools/loader/altera_cvp.c b/target/linux/modules/fpga/dev_tools/loader/altera_cvp.c
new file mode 100644
index 0000000..5b0f207
--- /dev/null
+++ b/target/linux/modules/fpga/dev_tools/loader/altera_cvp.c
@@ -0,0 +1,533 @@
+/*
+ * altera_cvp.c -- driver for configuring Altera FPGAs via CvP
+ *
+ * Written by: Andres Cassinelli <aca...@al...>
+ * Altera Corporation
+ *
+ * Copyright (C) 2012 Altera Corporation. All Rights Reserved.
+ *
+ * This file is provided under a dual BSD/GPLv2 license. When using or
+ * redistributing this file, you may do so under either license. The text of
+ * the BSD license is provided below.
+ *
+ * BSD License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * Alternatively, provided that this notice is retained in full, this software
+ * may be distributed under the terms of the GNU General Public License ("GPL")
+ * version 2, in which case the provisions of the GPL apply INSTEAD OF those
+ * given above. A copy of the GPL may be found in the file GPLv2.txt provided
+ * with this distribution in the same directory as this file.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ALTERA CORPORATION "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/device.h> /* dev_err(), etc. */
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/cdev.h>
+#include <asm/uaccess.h> /* copy_to/from_user */
+#include <linux/slab.h> /* kmalloc */
+#include <linux/file.h>
+#include <linux/fs.h>
+#include "altera_cvp.h"
+
+/* PCIe Vendor & Device IDs are parameters passed to the module when it's loaded */
+static unsigned short vid = 0x1172; /* default to Altera's Vendor ID */
+static unsigned short did = 0xE001; /* default to PCIe Reference Design Device ID */
+module_param(vid, ushort, S_IRUGO);
+module_param(did, ushort, S_IRUGO);
+
+struct altera_cvp_dev cvp_dev; /* contents initialized in altera_cvp_init() */
+static unsigned int altera_cvp_major; /* major number to use */
+
+/* CvP helper functions */
+
+static int altera_cvp_get_offset_and_mask(int bit, int *byte_offset, u8 *mask)
+{
+ switch (bit) {
+ case DATA_ENCRYPTED:
+ *byte_offset = OFFSET_VSEC + OFFSET_CVP_STATUS;
+ *mask = MASK_DATA_ENCRYPTED;
+ break;
+ case DATA_COMPRESSED:
+ *byte_offset = OFFSET_VSEC + OFFSET_CVP_STATUS;
+ *mask = MASK_DATA_COMPRESSED;
+ break;
+ case CVP_CONFIG_READY:
+ *byte_offset = OFFSET_VSEC + OFFSET_CVP_STATUS;
+ *mask = MASK_CVP_CONFIG_READY;
+ break;
+ case CVP_CONFIG_ERROR:
+ *byte_offset = OFFSET_VSEC + OFFSET_CVP_STATUS;
+ *mask = MASK_CVP_CONFIG_ERROR;
+ break;
+ case CVP_EN:
+ *byte_offset = OFFSET_VSEC + OFFSET_CVP_STATUS;
+ *mask = MASK_CVP_EN;
+ break;
+ case USER_MODE:
+ *byte_offset = OFFSET_VSEC + OFFSET_CVP_STATUS;
+ *mask = MASK_USER_MODE;
+ break;
+ case PLD_CLK_IN_USE:
+ *byte_offset = OFFSET_VSEC + OFFSET_CVP_STATUS + 1;
+ *mask = MASK_PLD_CLK_IN_USE;
+ break;
+ case CVP_MODE:
+ *byte_offset = OFFSET_VSEC + OFFSET_CVP_MODE_CTRL;
+ *mask = MASK_CVP_MODE;
+ break;
+ case HIP_CLK_SEL:
+ *byte_offset = OFFSET_VSEC + OFFSET_CVP_MODE_CTRL;
+ *mask = MASK_HIP_CLK_SEL;
+ break;
+ case CVP_CONFIG:
+ *byte_offset = OFFSET_VSEC + OFFSET_CVP_PROG_CTRL;
+ *mask = MASK_CVP_CONFIG;
+ break;
+ case START_XFER:
+ *byte_offset = OFFSET_VSEC + OFFSET_CVP_PROG_CTRL;
+ *mask = MASK_START_XFER;
+ break;
+ case CVP_CFG_ERR_LATCH:
+ *byte_offset = OFFSET_VSEC + OFFSET_UNC_IE_STATUS;
+ *mask = MASK_CVP_CFG_ERR_LATCH;
+ break;
+ default:
+ return -EINVAL;
+ }
+ return 0;
+}
+
+static int altera_cvp_read_bit(int bit, u8 *value)
+{
+ int byte_offset;
+ u8 byte_val, byte_mask;
+ if (altera_cvp_get_offset_and_mask(bit, &byte_offset, &byte_mask))
+ return -EINVAL;
+ if (pci_read_config_byte(cvp_dev.pci_dev, byte_offset, &byte_val))
+ return -EAGAIN;
+ *value = (byte_val & byte_mask) ? 1 : 0;
+ return 0;
+}
+
+static int altera_cvp_write_bit(int bit, u8 value)
+{
+ int byte_offset;
+ u8 byte_val, byte_mask;
+
+ switch (bit) {
+ case CVP_MODE:
+ case HIP_CLK_SEL:
+ case CVP_CONFIG:
+ case START_XFER:
+ case CVP_CFG_ERR_LATCH:
+ altera_cvp_get_offset_and_mask(bit, &byte_offset, &byte_mask);
+ pci_read_config_byte(cvp_dev.pci_dev, byte_offset, &byte_val);
+ byte_val = value ? (byte_val | byte_mask) : (byte_val & ~byte_mask);
+ pci_write_config_byte(cvp_dev.pci_dev, byte_offset, byte_val);
+ return 0;
+ default:
+ return -EINVAL; /* only the bits above are writeable */
+ }
+}
+
+static int altera_cvp_set_num_clks(int num_clks)
+{
+ if (num_clks < 1 || num_clks > 64)
+ return -EINVAL;
+ if (num_clks == 64)
+ num_clks = 0x00;
+ return (pci_write_config_byte(cvp_dev.pci_dev,
+ OFFSET_VSEC+OFFSET_CVP_NUMCLKS,
+ num_clks));
+}
+
+#define NUM_REG_WRITES 244
+#define DUMMY_VALUE 0x00000000
+/**
+ * altera_cvp_switch_clk() - switch between CvP clock and internal clock
+ *
+ * Issues dummy memory writes to the PCIe HIP, allowing the Control Block to
+ * switch between the HIP's CvP clock and the internal clock.
+ */
+static int altera_cvp_switch_clk(void)
+{
+ int i;
+ altera_cvp_set_num_clks(1);
+ for (i = 0; i < NUM_REG_WRITES; i++) {
+ iowrite32(DUMMY_VALUE, cvp_dev.wr_addr);
+ }
+ return 0;
+}
+
+static int altera_cvp_set_data_type(void)
+{
+ int error, num_clks;
+ u8 compr, encr;
+
+ if ((error = altera_cvp_read_bit(DATA_COMPRESSED, &compr)) ||
+ (error = altera_cvp_read_bit(DATA_ENCRYPTED, &encr)))
+ return error;
+
+ if (compr)
+ num_clks = 8;
+ else if (encr)
+ num_clks = 4;
+ else
+ num_clks = 1;
+
+ return (altera_cvp_set_num_clks(num_clks));
+}
+
+static int altera_cvp_send_data(u32 *data, unsigned long num_words)
+{
+#ifdef DEBUG
+ u8 bit_val;
+ unsigned int i;
+ for (i = 0; i < num_words; i++) {
+ iowrite32(data[i], cvp_dev.wr_addr);
+ if (i + 1 % ERR_CHK_INTERVAL == 0) {
+ altera_cvp_read_bit(CVP_CONFIG_ERROR, &bit_val);
+ if (bit_val) {
+ dev_err(&cvp_dev.pci_dev->dev, "CB detected a CRC error "
+ "between words %d and %d\n",
+ i + 1 - ERR_CHK_INTERVAL,
+ i + 1);
+ return -EAGAIN;
+ }
+ }
+ }
+ dev_info(&cvp_dev.pci_dev->dev, "A total of %ld 32-bit words were "
+ "sent to the FPGA\n", num_words);
+#else
+ iowrite32_rep(cvp_dev.wr_addr, data, num_words);
+#endif /* DEBUG */
+ return 0;
+}
+
+/* Polls the requested bit until it has the specified value (or until timeout) */
+/* Returns 0 once the bit has that value, error code on timeout */
+static int altera_cvp_wait_for_bit(int bit, u8 value)
+{
+ u8 bit_val;
+ static DECLARE_WAIT_QUEUE_HEAD(cvp_wq);
+
+ altera_cvp_read_bit(bit, &bit_val);
+ if (bit_val != value) {
+ wait_event_timeout(cvp_wq, 0, MAX_WAIT);
+ altera_cvp_read_bit(bit, &bit_val);
+ if (bit_val != value) {
+ dev_info(&cvp_dev.pci_dev->dev, "Timed out while "
+ "polling bit %d\n", bit);
+ return -EAGAIN;
+ }
+ }
+ return 0;
+}
+
+static int altera_cvp_setup(void)
+{
+ altera_cvp_write_bit(HIP_CLK_SEL, 1);
+ altera_cvp_write_bit(CVP_MODE, 1);
+ altera_cvp_switch_clk(); /* allow CB to sense if system reset is issued */
+ altera_cvp_write_bit(CVP_CONFIG, 1); /* request CB to begin CvP transfer */
+
+ if (altera_cvp_wait_for_bit(CVP_CONFIG_READY, 1)) /* wait until CB is ready */
+ return -EAGAIN;
+
+ altera_cvp_switch_clk();
+ altera_cvp_write_bit(START_XFER, 1);
+ altera_cvp_set_data_type();
+ dev_info(&cvp_dev.pci_dev->dev, "Now starting CvP...\n");
+ return 0; /* success */
+}
+
+static int altera_cvp_teardown(void)
+{
+ u8 bit_val;
+
+ /* if necessary, flush remainder buffer */
+ if (cvp_dev.remain_size > 0) {
+ u32 last_word = 0;
+ memcpy(&last_word, cvp_dev.remain, cvp_dev.remain_size);
+ altera_cvp_send_data(&last_word, cvp_dev.remain_size);
+ }
+
+ altera_cvp_write_bit(START_XFER, 0);
+ altera_cvp_write_bit(CVP_CONFIG, 0); /* request CB to end CvP transfer */
+ altera_cvp_switch_clk();
+
+ if (altera_cvp_wait_for_bit(CVP_CONFIG_READY, 0)) /* wait until CB is ready */
+ return -EAGAIN;
+
+ altera_cvp_read_bit(CVP_CFG_ERR_LATCH, &bit_val);
+ if (bit_val) {
+ dev_err(&cvp_dev.pci_dev->dev, "Configuration error detected, "
+ "CvP has failed\n");
+ altera_cvp_write_bit(CVP_CFG_ERR_LATCH, 1); /* clear error bit */
+ }
+
+ altera_cvp_write_bit(CVP_MODE, 0);
+ altera_cvp_write_bit(HIP_CLK_SEL, 0);
+
+ if (!bit_val) { /* wait for application layer to be ready */
+ altera_cvp_wait_for_bit(PLD_CLK_IN_USE, 1);
+ altera_cvp_wait_for_bit(USER_MODE, 1);
+ dev_info(&cvp_dev.pci_dev->dev, "CvP successful, application "
+ "layer now ready\n");
+ }
+
+ return 0; /* success */
+}
+
+/* Open and close */
+
+int altera_cvp_open(struct inode *inode, struct file *filp)
+{
+ /* enforce single-open */
+ if (!atomic_dec_and_test(&cvp_dev.is_available)) {
+ atomic_inc(&cvp_dev.is_available);
+ return -EBUSY;
+ }
+
+ if ((filp->f_flags & O_ACCMODE) != O_RDONLY) {
+ u8 cvp_enabled = 0;
+ if (altera_cvp_read_bit(CVP_EN, &cvp_enabled))
+ return -EAGAIN;
+ if (cvp_enabled) {
+ return altera_cvp_setup();
+ } else {
+ dev_err(&cvp_dev.pci_dev->dev, "CvP is not enabled in "
+ "the design on this "
+ "FPGA\n");
+ return -EOPNOTSUPP;
+ }
+ }
+ return 0; /* success */
+}
+
+int altera_cvp_release(struct inode *inode, struct file *filp)
+{
+ atomic_inc(&cvp_dev.is_available); /* release the device */
+ if ((filp->f_flags & O_ACCMODE) != O_RDONLY) {
+ return altera_cvp_teardown();
+ }
+ return 0; /* success */
+}
+
+/* Read and write */
+
+ssize_t altera_cvp_read(struct file *filp, char __user *buf, size_t count, loff_t *f_pos)
+{
+ int dev_size = NUM_VSEC_REGS * BYTES_IN_REG;
+ int i, byte_offset;
+ u8 *out_buf;
+ ssize_t ret_val; /* number of bytes successfully read */
+
+ if (*f_pos >= dev_size)
+ return 0; /* we're at EOF already */
+ if (*f_pos + count > dev_size)
+ count = dev_size - *f_pos; /* we can only read until EOF */
+
+ out_buf = kmalloc(count, GFP_KERNEL);
+
+ for (i = 0; i < count; i++) {
+ byte_offset = OFFSET_VSEC + *f_pos + i;
+ pci_read_config_byte(cvp_dev.pci_dev, byte_offset, &out_buf[i]);
+ }
+
+ if (copy_to_user(buf, out_buf, count)) {
+ ret_val = -EFAULT;
+ } else {
+ *f_pos += count;
+ ret_val = count;
+ }
+
+ kfree(out_buf);
+ return ret_val;
+}
+
+ssize_t altera_cvp_write(struct file * filp, const char __user *buf, size_t count, loff_t *f_pos)
+{
+ ssize_t ret_val; /* number of bytes successfully transferred */
+ u8 *send_buf;
+ size_t send_buf_size;
+
+ send_buf_size = count + cvp_dev.remain_size;
+ send_buf = kmalloc(send_buf_size, GFP_KERNEL);
+
+ if (cvp_dev.remain_size > 0)
+ memcpy(send_buf, cvp_dev.remain, cvp_dev.remain_size);
+
+ if (copy_from_user(send_buf + cvp_dev.remain_size, buf, count)) {
+ ret_val = -EFAULT;
+ goto exit;
+ }
+
+ /* calculate new remainder */
+ cvp_dev.remain_size = send_buf_size % 4;
+
+ /* save bytes in new remainder in cvp_dev */
+ if (cvp_dev.remain_size > 0)
+ memcpy(cvp_dev.remain,
+ send_buf + (send_buf_size - cvp_dev.remain_size),
+ cvp_dev.remain_size);
+
+ if (altera_cvp_send_data((u32 *)send_buf, send_buf_size / 4)) {
+ ret_val = -EAGAIN;
+ goto exit;
+ }
+
+ *f_pos += count;
+ ret_val = count;
+exit:
+ kfree (send_buf);
+ return ret_val;
+}
+
+struct file_operations altera_cvp_fops = {
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .read = altera_cvp_read,
+ .write = altera_cvp_write,
+ .open = altera_cvp_open,
+ .release = altera_cvp_release,
+};
+
+/* PCI functions */
+
+static int altera_cvp_probe(struct pci_dev *dev, const struct pci_device_id *id)
+{
+ int rc = 0;
+
+ if((dev->vendor == vid) && (dev->device == did)) {
+ rc = pci_enable_device(dev);
+ if (rc) {
+ dev_err(&dev->dev, "pci_enable device() failed\n");
+ return rc;
+ }
+ dev_info(&dev->dev, "Found and enabled PCI device with "
+ "VID 0x%04X, DID 0x%04X\n", vid, did);
+
+ rc = pci_request_regions(dev, ALTERA_CVP_DRIVER_NAME);
+ if (rc) {
+ dev_err(&dev->dev, "pci_request_regions() failed\n");
+ return rc;
+ }
+
+ cvp_dev.wr_addr = pci_iomap(dev, 0, 0);
+
+ cvp_dev.pci_dev = dev; /* store pointer for PCI API calls */
+ return 0;
+ } else {
+ dev_err(&dev->dev, "This PCI device does not match "
+ "VID 0x%04X, DID 0x%04X\n", vid, did);
+ return -ENODEV;
+ }
+}
+
+static void altera_cvp_remove(struct pci_dev *dev)
+{
+ pci_iounmap(dev, cvp_dev.wr_addr);
+ pci_disable_device(dev);
+ pci_release_regions(dev);
+}
+
+/* PCIe HIP on FPGA can have any combination of IDs based on design settings */
+static struct pci_device_id pci_ids[] = {
+ { PCI_DEVICE(PCI_ANY_ID, PCI_ANY_ID), },
+ { 0, }
+};
+MODULE_DEVICE_TABLE(pci, pci_ids);
+
+static struct pci_driver cvp_driver = {
+ .name = ALTERA_CVP_DRIVER_NAME,
+ .id_table = pci_ids,
+ .probe = altera_cvp_probe,
+ .remove = altera_cvp_remove,
+};
+
+/* Module functions */
+
+static int __init altera_cvp_init(void)
+{
+ int rc = 0;
+ dev_t dev;
+
+ rc = alloc_chrdev_region(&dev, 0, 1, ALTERA_CVP_DEVFILE);
+ if (rc) {
+ printk(KERN_ERR "%s: Allocation of char device numbers "
+ "failed\n", ALTERA_CVP_DRIVER_NAME);
+ goto exit;
+ }
+
+ cvp_dev.dev = dev; /* store major and minor numbers for char device */
+ altera_cvp_major = MAJOR(dev);
+
+ rc = pci_register_driver(&cvp_driver);
+ if (rc) {
+ printk(KERN_ERR "%s: PCI driver registration failed\n",
+ ALTERA_CVP_DRIVER_NAME);
+ unregister_chrdev_region(MKDEV(altera_cvp_major, 0), 1);
+ goto exit;
+ }
+
+ cdev_init(&cvp_dev.cdev, &altera_cvp_fops);
+ cvp_dev.cdev.owner = THIS_MODULE;
+ rc = cdev_add(&cvp_dev.cdev, dev, 1);
+ if (rc) {
+ printk(KERN_ERR "%s: Unable to add char device to the "
+ "system\n", ALTERA_CVP_DRIVER_NAME);
+ pci_unregister_driver(&cvp_driver);
+ goto exit;
+ }
+
+ cvp_dev.remain_size = 0;
+ atomic_set(&cvp_dev.is_available, 1);
+ printk("successfully init Altera CVP with major %d\n", altera_cvp_major);
+exit:
+ return rc;
+}
+
+static void __exit altera_cvp_exit(void)
+{
+ cdev_del(&cvp_dev.cdev);
+ unregister_chrdev_region(MKDEV(altera_cvp_major, 0), 1);
+ pci_unregister_driver(&cvp_driver);
+}
+
+module_init(altera_cvp_init);
+module_exit(altera_cvp_exit);
+
+MODULE_AUTHOR("Andres Cassinelli <aca...@al...>");
+MODULE_DESCRIPTION("Configuration driver for Altera CvP-capable FPGAs");
+MODULE_VERSION(ALTERA_CVP_DRIVER_VERSION);
+MODULE_LICENSE("Dual BSD/GPL");
+
diff --git a/target/linux/modules/fpga/dev_tools/loader/altera_cvp.h b/target/linux/modules/fpga/dev_tools/loader/altera_cvp.h
new file mode 100644
index 0000000..8f7acbf
--- /dev/null
+++ b/target/linux/modules/fpga/dev_tools/loader/altera_cvp.h
@@ -0,0 +1,106 @@
+/*
+ * altera_cvp.h -- Altera CvP driver header file
+ *
+ * Written by: Andres Cassinelli <aca...@al...>
+ * Altera Corporation
+ *
+ * Copyright (C) 2012 Altera Corporation. All Rights Reserved.
+ *
+ * This file is provided under a dual BSD/GPLv2 license. When using or
+ * redistributing this file, you may do so under either license. The text of
+ * the BSD license is provided below.
+ *
+ * BSD License
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * Alternatively, provided that this notice is retained in full, this software
+ * may be distributed under the terms of the GNU General Public License ("GPL")
+ * version 2, in which case the provisions of the GPL apply INSTEAD OF those
+ * given above. A copy of the GPL may be found in the file GPLv2.txt provided
+ * with this distribution in the same directory as this file.
+ *
+ * THIS SOFTWARE IS PROVIDED BY ALTERA CORPORATION "AS IS" AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef _ALTERA_CVP_H
+#define _ALTERA_CVP_H
+
+#define ALTERA_CVP_DRIVER_NAME "Altera CvP"
+#define ALTERA_CVP_DEVFILE "altera_cvp"
+#define ALTERA_CVP_DRIVER_VERSION "1.0"
+
+#define NUM_VSEC_REGS 17 /* number of VSEC registers for CvP */
+#define BYTES_IN_REG 4 /* number of bytes in each VSEC register */
+
+#define ERR_CHK_INTERVAL 1024 /* only check for CRC errors every this many 32-bit words */
+#define MAX_WAIT 2 /* number of jiffies to wait for a bit value before timeout */
+
+#define OFFSET_VSEC 0x200 /* byte offset of VSEC register block for CvP */
+#define OFFSET_CVP_STATUS 0x1E /* byte offsets of registers within VSEC */
+#define OFFSET_CVP_MODE_CTRL 0x20
+#define OFFSET_CVP_NUMCLKS 0X21
+#define OFFSET_CVP_DATA 0x28
+#define OFFSET_CVP_PROG_CTRL 0x2C
+#define OFFSET_UNC_IE_STATUS 0x34
+
+#define MASK_DATA_ENCRYPTED 0x01 /* bit 0 of CVP_STATUS */
+#define MASK_DATA_COMPRESSED 0x02 /* bit 1 of CVP_STATUS */
+#define MASK_CVP_CONFIG_READY 0x04 /* bit 2 of CVP_STATUS */
+#define MASK_CVP_CONFIG_ERROR 0x08 /* bit 3 of CVP_STATUS */
+#define MASK_CVP_EN 0x10 /* bit 4 of CVP_STATUS */
+#define MASK_USER_MODE 0x20 /* bit 5 of CVP_STATUS */
+#define MASK_PLD_CLK_IN_USE 0x01 /* bit 8 of CVP_STATUS (bit 0 of byte @ CVP_STATUS+1) */
+#define MASK_CVP_MODE 0x01 /* bit 0 of CVP_MODE_CTRL */
+#define MASK_HIP_CLK_SEL 0X02 /* bit 1 of CVP_MODE_CTRL */
+#define MASK_CVP_CONFIG 0x01 /* bit 0 of CVP_PROG_CTRL */
+#define MASK_START_XFER 0x02 /* bit 1 of CVP_PROG_CTRL */
+#define MASK_CVP_CFG_ERR_LATCH 0x20 /* bit 5 of UNC_IE_STATUS */
+
+struct altera_cvp_dev {
+ struct cdev cdev; /* Char device structure */
+ struct pci_dev *pci_dev; /* PCI device structure handle */
+ void __iomem *wr_addr; /* Address to use for PCI memory writes */
+ dev_t dev; /* Major and minor numbers for char device */
+ u8 remain[3]; /* Byte remainder from last write operation */
+ char remain_size; /* Number of bytes currently in remainder */
+ atomic_t is_available; /* Flag to enforce single-open */
+};
+
+/* CvP bits */
+enum { DATA_ENCRYPTED = 0,
+ DATA_COMPRESSED,
+ CVP_CONFIG_READY,
+ CVP_CONFIG_ERROR,
+ CVP_EN,
+ USER_MODE,
+ PLD_CLK_IN_USE,
+ CVP_MODE,
+ HIP_CLK_SEL,
+ CVP_CONFIG,
+ START_XFER,
+ CVP_CFG_ERR_LATCH
+};
+
+#endif /* _ALTERA_CVP_H */
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-11-05 15:49:35
|
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 0772dddd7ca2d9bf65c935a18be81432f8115141 (commit)
via 99aa97c118898cfe14c9bd0a39cd6ca4e2a3902c (commit)
from c045a38c469e00aa18ff0d19503593657ed35238 (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 0772dddd7ca2d9bf65c935a18be81432f8115141
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Nov 5 16:52:06 2014 +0100
[LINUX] 3.18: apf6: config file minor updates
commit 99aa97c118898cfe14c9bd0a39cd6ca4e2a3902c
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Nov 5 16:50:38 2014 +0100
[LINUX] 3.18: apf6: fix user key definition in dts
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6/apf6-linux-3.18.config | 18 +++++------
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 30 ++++++++++---------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
index 5ba387e..8f324ef 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
@@ -113,11 +113,14 @@ CONFIG_INPUT_EVBUG=m
CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_IMX=y
CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ELANTECH=y
+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_CYPRESS is not set
+# CONFIG_MOUSE_PS2_TRACKPOINT is not set
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_SX8674=y
CONFIG_INPUT_MISC=y
-CONFIG_INPUT_MMA8450=y
CONFIG_SERIO_SERPORT=m
# CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set
@@ -238,15 +241,11 @@ CONFIG_EXT3_FS_SECURITY=y
CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
CONFIG_AUTOFS4_FS=y
CONFIG_FUSE_FS=y
-CONFIG_ISO9660_FS=m
+CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
@@ -255,11 +254,10 @@ CONFIG_NFS_FS=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
CONFIG_ROOT_NFS=y
-CONFIG_NLS_DEFAULT="cp437"
CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=y
+CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_ISO8859_15=y
CONFIG_NLS_UTF8=y
CONFIG_MAGIC_SYSRQ=y
# CONFIG_SCHED_DEBUG is not set
diff --git a/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index c744651..5249994 100644
--- a/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.16/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.18-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.18-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -31,10 +31,10 @@ Index: linux-3.16/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -168,11 +168,11 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+ };
+};
-Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,451 @@
++++ linux-3.18-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+@@ -0,0 +1,453 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -184,8 +184,9 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ *
+ */
+
-+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++#include <dt-bindings/interrupt-controller/irq.h>
+
+/ {
+ display@di0 {
@@ -219,15 +220,16 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ };
+ };
+
-+ keys {
++ gpio-keys {
+ compatible = "gpio-keys";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpio_keys>;
+
+ user-button {
+ label = "User button";
-+ gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
-+ linux,code = <100>;
++ gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
++ linux,code = <BTN_MISC>;
++ gpio-key,wakeup;
+ };
+ };
+
@@ -479,7 +481,7 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+
+ pinctrl_gpio_keys: gpiokeysgrp {
+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
++ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x1b0b0
+ >;
+ };
+ pinctrl_gpio_leds: gpioledsgrp {
@@ -624,10 +626,10 @@ Index: linux-3.16/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ };
+ };
+};
-Index: linux-3.16/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.18-rc3/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.16/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.18-rc3/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-11-04 12:40:27
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via c045a38c469e00aa18ff0d19503593657ed35238 (commit)
via 581f65c6899493a8790421977aef6cf8b6e37b7c (commit)
via 0ecc6ef943d417ddc2173ec89dbc6a47f6127dcd (commit)
via 970d8e74b09652c49e57fd5891694ba295267510 (commit)
via e40c1a6bdd504acd36ef3e440fabeb59a93e8c17 (commit)
from d6ad5595e425bd878cec0fd32aeee00863f1d455 (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 c045a38c469e00aa18ff0d19503593657ed35238
Author: Philippe Reynes <tr...@gm...>
Date: Sun Nov 2 13:22:40 2014 +0100
[LINUX] 3.17: move to 3.17.2
commit 581f65c6899493a8790421977aef6cf8b6e37b7c
Author: Philippe Reynes <tr...@gm...>
Date: Sun Nov 2 13:22:39 2014 +0100
[LINUX] 3.16: move to 3.16.7
commit 0ecc6ef943d417ddc2173ec89dbc6a47f6127dcd
Author: Philippe Reynes <tr...@gm...>
Date: Sun Nov 2 13:22:38 2014 +0100
[LINUX] 3.14: move to 3.14.23
commit 970d8e74b09652c49e57fd5891694ba295267510
Author: Philippe Reynes <tr...@gm...>
Date: Sun Nov 2 13:22:37 2014 +0100
[LINUX] 3.12: move to 3.12.31
commit e40c1a6bdd504acd36ef3e440fabeb59a93e8c17
Author: Philippe Reynes <tr...@gm...>
Date: Sun Nov 2 13:22:36 2014 +0100
[LINUX] 3.10: move to 3.10.59
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.58.config => apf27-linux-3.10.59.config} | 0
...x-3.12.30.config => apf27-linux-3.12.31.config} | 0
...x-3.14.22.config => apf27-linux-3.14.23.config} | 0
...nux-3.16.6.config => apf27-linux-3.16.7.config} | 0
...nux-3.17.1.config => apf27-linux-3.17.2.config} | 0
...x-3.10.58.config => apf28-linux-3.10.59.config} | 0
...x-3.12.30.config => apf28-linux-3.12.31.config} | 0
...x-3.14.22.config => apf28-linux-3.14.23.config} | 0
...nux-3.16.6.config => apf28-linux-3.16.7.config} | 0
...nux-3.17.1.config => apf28-linux-3.17.2.config} | 0
...x-3.10.58.config => apf51-linux-3.10.59.config} | 0
...x-3.12.30.config => apf51-linux-3.12.31.config} | 0
...x-3.14.22.config => apf51-linux-3.14.23.config} | 0
...nux-3.16.6.config => apf51-linux-3.16.7.config} | 0
...nux-3.17.1.config => apf51-linux-3.17.2.config} | 0
patches/linux/{3.10.58 => 3.10.59} | 0
patches/linux/{3.12.30 => 3.12.31} | 0
patches/linux/{3.14.22 => 3.14.23} | 0
patches/linux/{3.16.6 => 3.16.7} | 0
patches/linux/{3.17.1 => 3.17.2} | 0
23 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.58.config => apf27-linux-3.10.59.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.30.config => apf27-linux-3.12.31.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.22.config => apf27-linux-3.14.23.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.16.6.config => apf27-linux-3.16.7.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.17.1.config => apf27-linux-3.17.2.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.58.config => apf28-linux-3.10.59.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.30.config => apf28-linux-3.12.31.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.22.config => apf28-linux-3.14.23.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.16.6.config => apf28-linux-3.16.7.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.17.1.config => apf28-linux-3.17.2.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.58.config => apf51-linux-3.10.59.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.30.config => apf51-linux-3.12.31.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.22.config => apf51-linux-3.14.23.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.16.6.config => apf51-linux-3.16.7.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.17.1.config => apf51-linux-3.17.2.config} (100%)
rename patches/linux/{3.10.58 => 3.10.59} (100%)
rename patches/linux/{3.12.30 => 3.12.31} (100%)
rename patches/linux/{3.14.22 => 3.14.23} (100%)
rename patches/linux/{3.16.6 => 3.16.7} (100%)
rename patches/linux/{3.17.1 => 3.17.2} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 5cbb6f3..bbeb4f4 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.17.1"
+BR2_DEFAULT_KERNEL_VERSION="3.17.2"
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.17.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.2"
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 2cf8805..e425162 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.17.1"
+BR2_DEFAULT_KERNEL_VERSION="3.17.2"
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.17.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.2"
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 29a991f..f7d9287 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.17.1"
+BR2_DEFAULT_KERNEL_VERSION="3.17.2"
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.17.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.2"
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.58.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.59.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.58.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.59.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.30.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.31.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.30.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.31.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.22.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.23.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.22.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.23.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.16.6.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.16.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.16.6.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.16.7.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.17.1.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.17.2.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.58.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.59.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.58.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.59.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.30.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.31.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.30.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.31.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.22.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.23.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.22.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.23.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.16.6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.16.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.16.6.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.16.7.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.17.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.17.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.17.1.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.17.2.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.58.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.59.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.58.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.59.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.30.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.31.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.30.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.31.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.22.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.23.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.22.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.23.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.6.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.16.6.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.16.7.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.17.1.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.17.2.config
diff --git a/patches/linux/3.10.58 b/patches/linux/3.10.59
similarity index 100%
rename from patches/linux/3.10.58
rename to patches/linux/3.10.59
diff --git a/patches/linux/3.12.30 b/patches/linux/3.12.31
similarity index 100%
rename from patches/linux/3.12.30
rename to patches/linux/3.12.31
diff --git a/patches/linux/3.14.22 b/patches/linux/3.14.23
similarity index 100%
rename from patches/linux/3.14.22
rename to patches/linux/3.14.23
diff --git a/patches/linux/3.16.6 b/patches/linux/3.16.7
similarity index 100%
rename from patches/linux/3.16.6
rename to patches/linux/3.16.7
diff --git a/patches/linux/3.17.1 b/patches/linux/3.17.2
similarity index 100%
rename from patches/linux/3.17.1
rename to patches/linux/3.17.2
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-11-04 09:18:45
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d6ad5595e425bd878cec0fd32aeee00863f1d455 (commit)
via 73680b1cc7d95aea524b54ac8fefdbb697b79f5d (commit)
via ea584651310ac3ef3dc6401deedebad8597e28d6 (commit)
from 8077633e2503b5663f44a449f4015fff5b62b3ae (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 d6ad5595e425bd878cec0fd32aeee00863f1d455
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Nov 4 10:19:11 2014 +0100
[LINUX] apf51: fix linux 3.1{6,7,8} config files
For 3.17 and 3.18, CONFIG_MACH_IMX51_DT has been renamed SOC_IMX51.
For the three kernel, CONFIG_POWER_SUPPLY is now a boolean.
commit 73680b1cc7d95aea524b54ac8fefdbb697b79f5d
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Nov 4 09:55:22 2014 +0100
[LINUX] 3.18: apf6: move to 3.18-rc3
commit ea584651310ac3ef3dc6401deedebad8597e28d6
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Nov 3 10:48:48 2014 +0100
[BUILDROOT] apf6: Create apf6-u-boot.img symlink to u-boot.img image
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
.../device/armadeus/apf51/apf51-linux-3.16.config | 2 +-
.../device/armadeus/apf51/apf51-linux-3.17.config | 4 ++--
.../device/armadeus/apf51/apf51-linux-3.18.config | 4 ++--
.../device/armadeus/rootfs/post_image_creation.sh | 1 +
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 0a638af..c072a98 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.18-rc2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18-rc3"
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/apf51/apf51-linux-3.16.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config
index bdf1419..b33ee57 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config
@@ -129,7 +129,7 @@ CONFIG_SPI_IMX=y
CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_WM831X=m
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
CONFIG_WM831X_BACKUP=m
CONFIG_WM831X_POWER=m
CONFIG_HWMON=m
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config
index bdf1419..f0a64f0 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config
@@ -20,7 +20,7 @@ CONFIG_BSD_DISKLABEL=y
# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_MXC=y
CONFIG_MXC_IRQ_PRIOR=y
-CONFIG_MACH_IMX51_DT=y
+CONFIG_SOC_IMX51=y
CONFIG_ARM_THUMBEE=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
@@ -129,7 +129,7 @@ CONFIG_SPI_IMX=y
CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_WM831X=m
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
CONFIG_WM831X_BACKUP=m
CONFIG_WM831X_POWER=m
CONFIG_HWMON=m
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.config
index bdf1419..f0a64f0 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.config
@@ -20,7 +20,7 @@ CONFIG_BSD_DISKLABEL=y
# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_MXC=y
CONFIG_MXC_IRQ_PRIOR=y
-CONFIG_MACH_IMX51_DT=y
+CONFIG_SOC_IMX51=y
CONFIG_ARM_THUMBEE=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
@@ -129,7 +129,7 @@ CONFIG_SPI_IMX=y
CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_WM831X=m
-CONFIG_POWER_SUPPLY=m
+CONFIG_POWER_SUPPLY=y
CONFIG_WM831X_BACKUP=m
CONFIG_WM831X_POWER=m
CONFIG_HWMON=m
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index b7195f2..265d044 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -38,6 +38,7 @@ if [ "$2" != "" ]; then
# APF6
symlink_image $1 SPL $2-u-boot.spl
+ symlink_image $1 u-boot.img $2-u-boot.img
else
# Old BR compat
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-11-03 09:31:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 8077633e2503b5663f44a449f4015fff5b62b3ae (commit)
from 07db983346d95439043c00d58b068ed98776fbba (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 8077633e2503b5663f44a449f4015fff5b62b3ae
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Nov 3 10:34:33 2014 +0100
[LINUX] 3.18: move to 3.18-rc3
-----------------------------------------------------------------------
Summary of changes:
...3.18-rc2.config => apf27-linux-3.18-rc3.config} | 0
...3.18-rc2.config => apf28-linux-3.18-rc3.config} | 0
...3.18-rc2.config => apf51-linux-3.18-rc3.config} | 0
...-3.18-rc2.config => apf6-linux-3.18-rc3.config} | 0
patches/linux/{3.18-rc2 => 3.18-rc3} | 0
...-stabilize-after-ref_en.patch.applied-3.18-rc3} | 0
...dereference-if-ptp_cloc.patch.applied-3.18-rc3} | 0
7 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.18-rc2.config => apf27-linux-3.18-rc3.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.18-rc2.config => apf28-linux-3.18-rc3.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.18-rc2.config => apf51-linux-3.18-rc3.config} (100%)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.18-rc2.config => apf6-linux-3.18-rc3.config} (100%)
rename patches/linux/{3.18-rc2 => 3.18-rc3} (100%)
rename patches/linux/3.18/{0509-v5-3-9-PCI-imx6-wait-the-clocks-to-stabilize-after-ref_en.patch => 0509-v5-3-9-PCI-imx6-wait-the-clocks-to-stabilize-after-ref_en.patch.applied-3.18-rc3} (100%)
rename patches/linux/3.18/{0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch => 0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch.applied-3.18-rc3} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc2.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc3.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc2.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc3.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc2.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc3.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc2.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc2.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc3.config
diff --git a/patches/linux/3.18-rc2 b/patches/linux/3.18-rc3
similarity index 100%
rename from patches/linux/3.18-rc2
rename to patches/linux/3.18-rc3
diff --git a/patches/linux/3.18/0509-v5-3-9-PCI-imx6-wait-the-clocks-to-stabilize-after-ref_en.patch b/patches/linux/3.18/0509-v5-3-9-PCI-imx6-wait-the-clocks-to-stabilize-after-ref_en.patch.applied-3.18-rc3
similarity index 100%
rename from patches/linux/3.18/0509-v5-3-9-PCI-imx6-wait-the-clocks-to-stabilize-after-ref_en.patch
rename to patches/linux/3.18/0509-v5-3-9-PCI-imx6-wait-the-clocks-to-stabilize-after-ref_en.patch.applied-3.18-rc3
diff --git a/patches/linux/3.18/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch b/patches/linux/3.18/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch.applied-3.18-rc3
similarity index 100%
rename from patches/linux/3.18/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch
rename to patches/linux/3.18/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch.applied-3.18-rc3
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-10-30 14:29: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 07db983346d95439043c00d58b068ed98776fbba (commit)
via 52d3427c53ba03325153305c348fb568883cb879 (commit)
from 7a78cea47f77b75b8aba64ada816940eb9d05780 (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 07db983346d95439043c00d58b068ed98776fbba
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Oct 30 15:31:47 2014 +0100
[BUILDROOT] apf6: Use BR2_CPU_NAME to disable U-BOOT hooks
commit 52d3427c53ba03325153305c348fb568883cb879
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Oct 30 15:29:54 2014 +0100
[BUILDROOT] Create /etc/machine file in post_build.sh
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/Makefile.in | 2 +-
.../target/device/armadeus/rootfs/post_build.sh | 3 +++
.../target_skeleton/etc/init.d/S00machine_name | 11 -----------
3 files changed, 4 insertions(+), 12 deletions(-)
delete mode 100755 buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S00machine_name
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index dcb59d9..57aaf1f 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -16,7 +16,7 @@ define UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
endef
UBOOT_POST_PATCH_HOOKS += UBOOT_ARMADEUS_SPECIFIC_PATCH_HOOK
-ifneq ($(BR2_BOARD_NAME), "apf6")
+ifneq ($(BR2_CPU_NAME), "imx6")
define UBOOT_UPDATE_CONFIG_HEADER
$(SED) "s,^#define CONFIG_BOARD_NAME.*,#define CONFIG_BOARD_NAME $(BOARD_NAME),g;"\
$(@D)/include/configs/$(UBOOT_BOARD_NAME).h
diff --git a/buildroot/target/device/armadeus/rootfs/post_build.sh b/buildroot/target/device/armadeus/rootfs/post_build.sh
index 2939f40..04c053d 100755
--- a/buildroot/target/device/armadeus/rootfs/post_build.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_build.sh
@@ -50,4 +50,7 @@ ln -sf /tmp $1/var/tmp
# /boot
mkdir -p $1/boot
+# Not using $2 because it can be changed for customers' BSP
+echo "APF"${3//[!0-9]/} > $1/etc/machine
+
exit 0
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S00machine_name b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S00machine_name
deleted file mode 100755
index 43ab260..0000000
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S00machine_name
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-FILE=/etc/machine
-
-if [ ! -f "$FILE" ]; then
- MACHINE=`cat /proc/cpuinfo | grep Hardware`
- echo ${MACHINE:20} > $FILE
-fi
-
-exit 0
-
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2014-10-30 11:14: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 7a78cea47f77b75b8aba64ada816940eb9d05780 (commit)
via bae44b5187fc14f0e1006ac9af2902726e467be2 (commit)
from 18af2eaab184f182adb35a87c42e1c48ea3c1ea5 (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 7a78cea47f77b75b8aba64ada816940eb9d05780
Merge: bae44b5 18af2ea
Author: Nicolas Colombain <nic...@ar...>
Date: Thu Oct 30 12:14:21 2014 +0100
Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code
commit bae44b5187fc14f0e1006ac9af2902726e467be2
Author: Nicolas Colombain <nic...@ar...>
Date: Thu Oct 30 12:14:05 2014 +0100
[UBOOT] add apf6 fpga initial support
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2014.07/503-add-apf6.patch | 277 ++++++++++++++++++++++++++++-
1 files changed, 275 insertions(+), 2 deletions(-)
diff --git a/patches/u-boot/2014.07/503-add-apf6.patch b/patches/u-boot/2014.07/503-add-apf6.patch
index 4cac376..62acd21 100644
--- a/patches/u-boot/2014.07/503-add-apf6.patch
+++ b/patches/u-boot/2014.07/503-add-apf6.patch
@@ -21,13 +21,13 @@ Index: uboot-2014.07/board/armadeus/apf6/Makefile
+# SPDX-License-Identifier: GPL-2.0+
+#
+
-+obj-y := apf6.o
++obj-y := apf6.o fpga.o
+obj-$(CONFIG_SPL_BUILD) += apf6_spl.o
Index: uboot-2014.07/board/armadeus/apf6/apf6.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ uboot-2014.07/board/armadeus/apf6/apf6.c 2014-09-15 15:29:36.671153456 +0200
-@@ -0,0 +1,321 @@
+@@ -0,0 +1,377 @@
+/*
+ * Copyright (C) 2013 Armadeus systems.
+ *
@@ -60,6 +60,7 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+#include <ipu_pixfmt.h>
+#include <mmc.h>
+#include <linux/fb.h>
++#include "fpga.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
@@ -300,12 +301,44 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ return 0;
+}
+
++#define FPGA_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
++ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
++
++
++static iomux_v3_cfg_t const fpga_pads[] = {
++ /* FPGA AS_DATA enet_txd1*/
++ IOMUX_PADS(PAD_ENET_TXD1__GPIO1_IO29 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
++ /* FPGA DCLK enet_rxd0*/
++ IOMUX_PADS(PAD_ENET_RXD0__GPIO1_IO27 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
++ /* FPGA CONF_DONE enet_rxd1*/
++ IOMUX_PADS(PAD_ENET_RXD1__GPIO1_IO26 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
++ /* FPGA NCONFIG EIM_D26*/
++ IOMUX_PADS(PAD_EIM_D26__GPIO3_IO26 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
++ /* FPGA NSTATUS EIM_D27*/
++ IOMUX_PADS(PAD_EIM_D27__GPIO3_IO27 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
++ /* FPGA CVP_CONFDONE EIM_D22*/
++ IOMUX_PADS(PAD_EIM_D22__GPIO3_IO22 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
++ /* FPGA PERSTL0# EIM_D18*/
++ IOMUX_PADS(PAD_EIM_D18__GPIO3_IO18 | MUX_PAD_CTRL(FPGA_PAD_CTRL)),
++};
++
++
++void setup_fpga(void)
++{
++ SETUP_IOMUX_PADS(fpga_pads);
++}
++
++
+int board_early_init_f(void)
+{
+ setup_iomux_uart();
+#if defined(CONFIG_VIDEO_IPUV3)
+ setup_display();
+#endif
++#ifdef CONFIG_FPGA
++ setup_fpga();
++#endif
++
+ return 0;
+}
+
@@ -320,11 +353,34 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+
+int board_late_init(void)
+{
++ u_char *firmware_buffer =
++ (u_char *) (CONFIG_SYS_LOAD_ADDR + CONFIG_SYS_MONITOR_LEN);
++ size_t size = 0;
++
+ if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D))
+ setenv("fdt_file", "imx6q-apf6dev.dtb");
+ else if (is_cpu_type(MXC_CPU_MX6DL) || is_cpu_type(MXC_CPU_MX6SOLO))
+ setenv("fdt_file", "imx6dl-apf6dev.dtb");
+
++#if defined(CONFIG_FPGA)
++ /* init and download fpga */
++/* if ((autoload) && (0 == strcmp(autoload, "1"))) {
++ if ((mtdparts_init() == 0) && (find_dev_and_part("firmware",
++ &dev, &pnum, &part) == 0)) {
++ size = part->size;
++ if (nand_read_skip_bad(&nand_info[0], part->offset,
++ &size, firmware_buffer))
++ size = 0;
++ }
++ if (ctrlc()) {
++ printf("Firmware download stopped!\n");
++ size = 0;
++ }
++ }*/
++ APF6_init_fpga(firmware_buffer, size);
++#endif
++
++
+ return 0;
+}
+
@@ -661,3 +717,220 @@ Index: uboot-2014.07/board/armadeus/apf6/clocks.cfg
+ * This sets CKO1 at ahb_clk_root/8 = 132/8 = 16.5 MHz
+ */
+DATA 4, CCM_CCOSR, 0x000000fb
+Index: uboot-2014.07/board/armadeus/apf6/fpga.c
+===================================================================
+--- /dev/null 1970-01-01 01:00:00.000000000 +0100
++++ uboot-2014.07/board/armadeus/apf6/fpga.c 2014-10-22 15:38:38.421753366 +0200
+@@ -0,0 +1,173 @@
++/*
++ * (C) Copyright 2002-2014
++ * Nicolas Colombain <nic...@ar...>
++ * Rich Ireland, Enterasys Networks, rir...@en....
++ * Keith Outwater, kei...@mv....
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ */
++#include <common.h>
++
++#if defined(CONFIG_FPGA)
++
++#include <asm/gpio.h>
++#include <asm/io.h>
++#include <command.h>
++#include <asm/arch/iomux.h>
++#include "fpga.h"
++#include <fpga.h>
++#include <ACEX1K.h>
++
++#ifdef FPGA_DEBUG
++#define PRINTF(fmt, args...) printf(fmt , ##args)
++#else
++#define PRINTF(fmt, args...)
++#endif
++
++#define FPGA_AS_DATA IMX_GPIO_NR(1, 29)
++#define FPGA_DCLK IMX_GPIO_NR(1, 27)
++#define FPGA_CONF_DONE IMX_GPIO_NR(1, 26)
++#define FPGA_NCONFIG IMX_GPIO_NR(3, 26)
++#define FPGA_NSTATUS IMX_GPIO_NR(3, 27)
++#define FPGA_CVP_CONFDONE IMX_GPIO_NR(3, 22)
++#define FPGA_PERSTL0 IMX_GPIO_NR(3, 18)
++
++
++Altera_CYC2_Passive_Serial_fns altera_fns = {
++ fpga_null_fn,
++ fpga_config_fn,
++ fpga_status_fn,
++ fpga_done_fn,
++ fpga_wr_fn,
++ fpga_null_fn,
++ fpga_null_fn,
++};
++
++Altera_desc fpga = {
++ Altera_CYC2,
++ passive_serial,
++ 320280l / 8, /* C3 IOSCR*/
++ (void *) &altera_fns,
++ NULL,
++ 0
++};
++
++
++int fpga_null_fn(int cookie)
++{
++ return 0;
++}
++
++int fpga_config_fn(int assert, int flush, int cookie)
++{
++ gpio_set_value(FPGA_NCONFIG, assert);
++ return assert;
++}
++
++int fpga_done_fn(int cookie)
++{
++ int result = 0;
++ udelay(10);
++ PRINTF("CONF_DONE check ... ");
++ if (gpio_get_value(FPGA_CONF_DONE) & 1) {
++ PRINTF("high\n");
++ result = 1;
++ } else
++ PRINTF("low\n");
++
++ return result;
++}
++
++int fpga_status_fn(int cookie)
++{
++ int result = 0;
++ PRINTF("STATUS check ... ");
++ if (gpio_get_value(FPGA_NSTATUS) & 1) {
++ PRINTF("high\n");
++ result = 1;
++ } else
++ PRINTF("low\n");
++
++ return result;
++}
++
++int fpga_clk_fn(int assert_clk, int flush, int cookie)
++{
++ PRINTF("CLOCK %s\n", assert_clk ? "high" : "low");
++ gpio_set_value(FPGA_DCLK, assert_clk);
++
++ return assert_clk;
++}
++
++static inline int _write_fpga(u8 val, int dump)
++{
++ int i=0;
++ if (dump)
++ PRINTF(" %02x -> ", val);
++ for (i = 0; i < 8; i++) {
++ gpio_set_value(FPGA_DCLK,0);
++ gpio_set_value(FPGA_AS_DATA,val & 1);
++ gpio_set_value(FPGA_DCLK,1);
++ val >>= 1;
++ }
++ if (dump)
++ PRINTF("\n");
++
++ return 0;
++}
++
++int fpga_wr_fn(const void *buf, size_t len, int flush, int cookie)
++{
++ unsigned char *data = (unsigned char *) buf;
++ int i;
++
++ PRINTF("fpga_wr: buf %p / size %d\n", buf, len);
++ for (i = 0; i < len; i++)
++ _write_fpga(data[i], 0);
++ PRINTF("\n");
++
++ return FPGA_SUCCESS;
++}
++
++int APF6_init_fpga(u_char *buffer, size_t size)
++{
++ PRINTF("Initialize FPGA interface\n");
++
++ gpio_direction_output(FPGA_AS_DATA, 0);
++ gpio_direction_output(FPGA_DCLK, 0);
++ gpio_direction_output(FPGA_NCONFIG, 0);
++
++ fpga_init();
++ fpga_add(fpga_altera, &fpga);
++
++ if ((size >= fpga.size)) {
++ printf("Loading FPGA...");
++ if (FPGA_SUCCESS != fpga_load(0, (void *)buffer, size, BIT_FULL)) {
++ printf("firmware download failed!\n");
++ } else {
++ printf("firmware successfully programmed\n");
++ }
++ }
++
++ return 1;
++}
++
++
++#endif /* CONFIG_FPGA */
+Index: uboot-2014.07/board/armadeus/apf6/fpga.h
+===================================================================
+--- /dev/null 1970-01-01 01:00:00.000000000 +0100
++++ uboot-2014.07/board/armadeus/apf6/fpga.h 2014-10-22 15:38:49.145753388 +0200
+@@ -0,0 +1,34 @@
++/*
++ * (C) Copyright 2002-2010
++ * Eric Jarrige <eri...@ar...>
++ * Rich Ireland, Enterasys Networks, rir...@en....
++ * Keith Outwater, kei...@mv....
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of
++ * the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ */
++extern int APF6_init_fpga(u_char *buffer, size_t size);
++
++extern int fpga_pgm_fn(int assert_pgm, int flush, int cookie);
++extern int fpga_status_fn(int cookie);
++extern int fpga_config_fn(int assert, int flush, int cookie);
++extern int fpga_done_fn(int cookie);
++extern int fpga_clk_fn(int assert_clk, int flush, int cookie);
++extern int fpga_wr_fn(const void *buf, size_t len, int flush, int cookie);
++extern int fpga_null_fn(int cookie);
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-10-30 11:04: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 18af2eaab184f182adb35a87c42e1c48ea3c1ea5 (commit)
via dd193edc1d6b6e12b72e1e7fc5561a7d28f825d6 (commit)
from 1019dba75a4bd7efb06f3135d3db74c0b1316553 (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 18af2eaab184f182adb35a87c42e1c48ea3c1ea5
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Oct 30 12:06:15 2014 +0100
[TESTS] Update a few tests to make them work on APF6
commit dd193edc1d6b6e12b72e1e7fc5561a7d28f825d6
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Oct 28 09:20:38 2014 +0100
[BUILDROOT] apf6: use Armadeus skeleton
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 ++
target/test/test_audio.sh | 11 +++++++++--
target/test/test_gps.sh | 36 ++++++++++++++++++++++++++----------
target/test/test_gsm.sh | 28 ++++++++++++++++++++--------
target/test/test_helpers.sh | 4 +++-
target/test/test_touchscreen.sh | 4 ++++
6 files changed, 64 insertions(+), 21 deletions(-)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 5a339c5..0a638af 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -10,6 +10,8 @@ BR2_TOOLCHAIN_EXTERNAL=y
BR2_ENABLE_LOCALE_PURGE=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
diff --git a/target/test/test_audio.sh b/target/test/test_audio.sh
index f5347da..fee54c2 100755
--- a/target/test/test_audio.sh
+++ b/target/test/test_audio.sh
@@ -30,6 +30,9 @@ test_init()
amixer cset numid=37 on
amixer cset numid=6 on,on # Headphone Playback ZC Switch
amixer cset numid=5 116,116 # Headphone Playback Volume
+ elif [ "$1" == "APF6" ]; then
+ # drivers are built-in on APF6
+ true
else
echo "Platform not supported by this test"
exit 0
@@ -45,6 +48,8 @@ end_of_test_for_apf9328_and_continue_for_others()
true
elif [ "$1" == "APF51" ]; then
true
+ elif [ "$1" == "APF6" ]; then
+ true
else
echo "Platform not supported by this test"
fi
@@ -60,6 +65,8 @@ test_audio_in_init()
amixer cset numid=44 on
amixer cset numid=50 on
amixer cset numid=3 on,on
+ elif [ "$1" == "APF6" ]; then
+ amixer cset numid=2 8,8
else
echo "Platform not supported by this test"
fi
@@ -81,7 +88,7 @@ test_audio()
exit_failed
fi
- ask_user "Please connect an earphone to the Audio Out connector (top one on APF27). Then press ENTER."
+ ask_user "Please connect an earphone to the Audio Out connector (top one on APF27 and APF6). Then press ENTER."
aplay /usr/share/sounds/alsa/Side_Left.wav
if [ "$?" == 0 ]; then
ask_user "Did you hear something ? (y/N)"
@@ -92,7 +99,7 @@ test_audio()
execute_for_target end_of_test_for_apf9328_and_continue_for_others
- ask_user "Please connect a microphone to the Audio In connector (bottom one on APF27). Then press ENTER."
+ ask_user "Please connect a microphone to the Audio In connector (bottom one on APF27 and APF6). Then press ENTER."
execute_for_target test_audio_in_init
ask_user "You will now have to speak in the MIC. The sampled sound will then be played back. Press ENTER when ready to speak."
# Stereo 16bits @ 16KHz
diff --git a/target/test/test_gps.sh b/target/test/test_gps.sh
index c156cbb..652282c 100755
--- a/target/test/test_gps.sh
+++ b/target/test/test_gps.sh
@@ -13,23 +13,40 @@
source ./test_helpers.sh
-GPS_DEVICE=/dev/ttySMX4
+GPS_DEVICE=""
-test_gps()
+setup_port()
{
- show_test_banner "GPS (APW)"
-
- ask_user "Do you have an APF27 with an APW wireless extension board and the corresponding Linux kernel ? (Y/n)"
- if [ "$response" == "n" ] || [ "$response" == "no" ]; then
- echo "Only the APW is supported by this test yet !!"
+ if [ "$1" == "APF27" ]; then
+ GPS_DEVICE=/dev/ttySMX4
+ elif [ "$1" == "APF6" ]; then
+ GPS_DEVICE=/dev/ttymxc0
+ else
+ echo "$1 platform not supported by this test"
exit_failed
fi
- stty -F /dev/ttySMX4 raw -echo -echoe -echok 38400
+ stty -F $GPS_DEVICE raw -echo -echoe -echok 38400
+
if [ "$?" != 0 ]; then
echo "Failed to setup serial port ($GPS_DEVICE) !!"
exit_failed
fi
+}
+
+test_gps()
+{
+ show_test_banner "GPS"
+
+ if [ "$1" != "-y" ]; then
+ ask_user "Do you have an APF27 with an APW wireless extension board or an APF6Dev with optional GPS chip ? (Y/n)"
+ if [ "$response" == "n" ] || [ "$response" == "no" ]; then
+ echo "Only the APW or APF6Dev with optional GPS chip are supported by this test yet !!"
+ exit_failed
+ fi
+ fi
+
+ execute_for_target setup_port
cat $GPS_DEVICE &
sleep 3
@@ -44,5 +61,4 @@ test_gps()
exit 0
}
-test_gps
-
+test_gps $1
diff --git a/target/test/test_gsm.sh b/target/test/test_gsm.sh
index f10a4ee..b7e5279 100755
--- a/target/test/test_gsm.sh
+++ b/target/test/test_gsm.sh
@@ -52,6 +52,17 @@ prepare_gsm()
ls -al /dev/ttyS*
GSM_DEVICE=/dev/ttyS0
GSM_SPEED=115200
+ elif [ "$1" == "APF6" ]; then
+ echo 205 > /sys/class/gpio/export
+ echo out > /sys/class/gpio/gpio205/direction
+ echo 1 > /sys/class/gpio/gpio205/value
+ echo 4 > /sys/class/gpio/export
+ echo out > /sys/class/gpio/gpio4/direction
+ echo 1 > /sys/class/gpio/gpio4/value
+ sleep 2
+ echo 0 > /sys/class/gpio/gpio4/value
+ GSM_DEVICE=/dev/ttymxc2
+ GSM_SPEED=115200
else
echo "Platform not supported by this test"
fi
@@ -59,12 +70,14 @@ prepare_gsm()
test_gsm()
{
- show_test_banner "GSM (APW)"
+ show_test_banner "GSM"
- ask_user "Do you have an APF27Dev with an APW wireless extension board or an APF51Dev with a GSM/3G modem and the corresponding Linux kernel ? (Y/n)"
- if [ "$response" == "n" ] || [ "$response" == "no" ]; then
- echo "Only APF27+APW or APF51Dev are supported by this test yet !!"
- exit_failed
+ if [ "$1" != "-y" ]; then
+ ask_user "Do you have an APF27Dev with an APW wireless extension board or an APF51Dev or APF6Dev with a GSM/3G modem and the corresponding Linux kernel ? (Y/n)"
+ if [ "$response" == "n" ] || [ "$response" == "no" ]; then
+ echo "Only APF27+APW or APF51Dev or APF6Dev are supported by this test yet !!"
+ exit_failed
+ fi
fi
execute_for_target prepare_gsm
@@ -122,7 +135,7 @@ test_gsm()
fi
killall cat
/usr/sbin/chat ABORT 'NO CARRIER' ECHO ON '' AT OK ATD"$PHONE_NUMBER"\; OK > $GSM_DEVICE < $GSM_DEVICE
- sleep 6
+ sleep 10
send_at_cmd ATH
ask_user "Did you ear it ring ? (Y/n)"
if [ "$response" == "n" ] || [ "$response" == "no" ]; then
@@ -135,5 +148,4 @@ test_gsm()
exit 0
}
-test_gsm
-
+test_gsm $1
diff --git a/target/test/test_helpers.sh b/target/test/test_helpers.sh
index 8065d77..b31c5b8 100755
--- a/target/test/test_helpers.sh
+++ b/target/test/test_helpers.sh
@@ -170,7 +170,9 @@ execute_for_target()
$1 $BOARD
elif [ "$BOARD" == "APF51" ]; then
$1 $BOARD
- fi
+ elif [ "$BOARD" == "APF6" ]; then
+ $1 $BOARD
+ fi
fi
}
diff --git a/target/test/test_touchscreen.sh b/target/test/test_touchscreen.sh
index a4b7e9f..a22d6c9 100755
--- a/target/test/test_touchscreen.sh
+++ b/target/test/test_touchscreen.sh
@@ -29,6 +29,10 @@ load_driver()
# driver is in-kernel/static
dmesg | grep "MXS touch"
RES="$?"
+ elif [ "$1" == "APF6" ]; then
+ # driver is in-kernel/static
+ grep "SX8674 Touchscreen" $(echo /sys/class/input/event*/device/name)
+ RES="$?"
else
echo "$1 platform not supported by this test"
fi
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2014-10-30 08:48:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 1019dba75a4bd7efb06f3135d3db74c0b1316553 (commit)
from 3f3c3c6030eb6eb64e10015c0c1beadacd0032c0 (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 1019dba75a4bd7efb06f3135d3db74c0b1316553
Author: Nicolas Colombain <nic...@ar...>
Date: Thu Oct 30 09:47:54 2014 +0100
[UBOOT] add apf6 fpga initial support
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
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 9b4b89e..d568fcb 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
@@ -148,6 +148,12 @@
#define CONFIG_PCIE_IMX
#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(6, 2)
+/* FPGA */
+#define CONFIG_FPGA_COUNT 1
+#define CONFIG_FPGA
+#define CONFIG_FPGA_ALTERA
+#define CONFIG_FPGA_CYCLON2
+
/*
* BOOTP options
*/
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-10-29 19:04:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3f3c3c6030eb6eb64e10015c0c1beadacd0032c0 (commit)
from cdb5c302f4a670a7e430467adb4d59a61ce4e82a (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 3f3c3c6030eb6eb64e10015c0c1beadacd0032c0
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 29 20:02:42 2014 +0100
[LINUX] 3.18: clean up patchwork
-----------------------------------------------------------------------
Summary of changes:
...dd_board_to_linux_build_system.patch.dont_apply | 60 --------
...s-net-phy-fix_smsc_reset.patch.applied-3.17-rc2 | 83 -----------
...-usbmisc_imx-add_imx51_support.patch.dont_build | 143 --------------------
...platfrom-get_max_timeout_count-hook.patch.tofix | 60 --------
...-incorrect-max_discard_to-for-uSDHC.patch.tofix | 54 --------
...sdhci-add-platform-set_timeout-hook.patch.tofix | 84 ------------
...correct-max-timeout-value-for-uSDHC.patch.tofix | 62 ---------
...SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix | 124 -----------------
...-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3 | 96 -------------
...fig-space-as-platform-resource.patch.dont_apply | 30 ----
...x6-fix-occasional-link-failure.patch.dont_apply | 29 ----
11 files changed, 0 insertions(+), 825 deletions(-)
delete mode 100644 patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch.dont_apply
delete mode 100644 patches/linux/3.18/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2
delete mode 100644 patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch.dont_build
delete mode 100644 patches/linux/3.18/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
delete mode 100644 patches/linux/3.18/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
delete mode 100644 patches/linux/3.18/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
delete mode 100644 patches/linux/3.18/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
delete mode 100644 patches/linux/3.18/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
delete mode 100644 patches/linux/3.18/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3
delete mode 100644 patches/linux/3.18/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch.dont_apply
delete mode 100644 patches/linux/3.18/0508-PCI-imx6-fix-occasional-link-failure.patch.dont_apply
diff --git a/patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch.dont_apply b/patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch.dont_apply
deleted file mode 100644
index 7dfaa54..0000000
--- a/patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch.dont_apply
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
-===================================================================
---- linux-3.8-rc1.orig/arch/arm/mach-imx/Kconfig 2012-12-22 02:19:00.000000000 +0100
-+++ linux-3.8-rc1/arch/arm/mach-imx/Kconfig 2013-01-01 21:22:49.000000000 +0100
-@@ -202,10 +202,43 @@
- bool "APF9328"
- select IMX_HAVE_PLATFORM_IMX_I2C
- select IMX_HAVE_PLATFORM_IMX_UART
-+ select IMX_HAVE_PLATFORM_SPI_IMX
-+ select IMX_HAVE_PLATFORM_IMX_FB
-+ select IMX_HAVE_PLATFORM_MXC_PWM
-+ select IMX_HAVE_PLATFORM_IMX_UDC
-+ select SERIAL_IMX_UART1
- select SOC_IMX1
- help
- Say Yes here if you are using the Armadeus APF9328 development board
-
-+choice
-+ prompt "Flash available on board"
-+ depends on MACH_APF9328
-+ default IMX_APF9328_FLASH_16MB
-+
-+config IMX_APF9328_FLASH_8MB
-+ bool "8MB"
-+
-+config IMX_APF9328_FLASH_16MB
-+ bool "16MB"
-+
-+endchoice
-+
-+choice
-+ prompt "Baseboard"
-+ depends on MACH_APF9328
-+ default MACH_APF9328_DEV
-+
-+config MACH_APF9328_DEV
-+ prompt "DevLight/DevFull"
-+ bool
-+ help
-+ This selects the APF9328_DevLight/DevFull as baseboard. You have
-+ to manually activates the devices you want to use if you have a
-+ DevFull.
-+
-+endchoice
-+
- endif
-
- if ARCH_MULTI_V5
-Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
-===================================================================
---- linux-3.8-rc1.orig/arch/arm/mach-imx/Makefile 2012-12-22 02:19:00.000000000 +0100
-+++ linux-3.8-rc1/arch/arm/mach-imx/Makefile 2013-01-01 21:22:49.000000000 +0100
-@@ -42,6 +42,7 @@
- obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o
- obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
- obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o
-+obj-$(CONFIG_MACH_APF9328_DEV) += apf9328-dev.o
-
- # i.MX21 based machines
- obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
diff --git a/patches/linux/3.18/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2 b/patches/linux/3.18/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2
deleted file mode 100644
index c946277..0000000
--- a/patches/linux/3.18/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2
+++ /dev/null
@@ -1,83 +0,0 @@
-LAN87xx needs to be wake up before reset. By default, smsc driver does not
-provides soft_reset function and it's the default reset function is used. Due
-to that, the phy initialization fails.
-
-Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
----
---- linux-3.16/drivers/net/phy/smsc.c
-+++ linux-3.16/drivers/net/phy/smsc.c
-@@ -43,6 +43,22 @@ static int smsc_phy_ack_interrupt(struct
-
- static int smsc_phy_config_init(struct phy_device *phydev)
- {
-+ int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
-+
-+ if (rc < 0)
-+ return rc;
-+
-+ /* Enable energy detect mode for this SMSC Transceivers */
-+ rc = phy_write(phydev, MII_LAN83C185_CTRL_STATUS,
-+ rc | MII_LAN83C185_EDPWRDOWN);
-+ if (rc < 0)
-+ return rc;
-+
-+ return smsc_phy_ack_interrupt(phydev);
-+}
-+
-+static int smsc_phy_reset(struct phy_device *phydev)
-+{
- int rc = phy_read(phydev, MII_LAN83C185_SPECIAL_MODES);
- if (rc < 0)
- return rc;
-@@ -66,18 +82,7 @@ static int smsc_phy_config_init(struct p
- rc = phy_read(phydev, MII_BMCR);
- } while (rc & BMCR_RESET);
- }
--
-- rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
-- if (rc < 0)
-- return rc;
--
-- /* Enable energy detect mode for this SMSC Transceivers */
-- rc = phy_write(phydev, MII_LAN83C185_CTRL_STATUS,
-- rc | MII_LAN83C185_EDPWRDOWN);
-- if (rc < 0)
-- return rc;
--
-- return smsc_phy_ack_interrupt (phydev);
-+ return 0;
- }
-
- static int lan911x_config_init(struct phy_device *phydev)
-@@ -142,6 +147,7 @@ static struct phy_driver smsc_phy_driver
- .config_aneg = genphy_config_aneg,
- .read_status = genphy_read_status,
- .config_init = smsc_phy_config_init,
-+ .soft_reset = smsc_phy_reset,
-
- /* IRQ related */
- .ack_interrupt = smsc_phy_ack_interrupt,
-@@ -164,6 +170,7 @@ static struct phy_driver smsc_phy_driver
- .config_aneg = genphy_config_aneg,
- .read_status = genphy_read_status,
- .config_init = smsc_phy_config_init,
-+ .soft_reset = smsc_phy_reset,
-
- /* IRQ related */
- .ack_interrupt = smsc_phy_ack_interrupt,
-@@ -186,6 +193,7 @@ static struct phy_driver smsc_phy_driver
- .config_aneg = genphy_config_aneg,
- .read_status = genphy_read_status,
- .config_init = smsc_phy_config_init,
-+ .soft_reset = smsc_phy_reset,
-
- /* IRQ related */
- .ack_interrupt = smsc_phy_ack_interrupt,
-@@ -230,6 +238,7 @@ static struct phy_driver smsc_phy_driver
- .config_aneg = genphy_config_aneg,
- .read_status = lan87xx_read_status,
- .config_init = smsc_phy_config_init,
-+ .soft_reset = smsc_phy_reset,
-
- /* IRQ related */
- .ack_interrupt = smsc_phy_ack_interrupt,
diff --git a/patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch.dont_build b/patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch.dont_build
deleted file mode 100644
index 76a8fd5..0000000
--- a/patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch.dont_build
+++ /dev/null
@@ -1,143 +0,0 @@
-Index: linux-3.12-rc1/drivers/usb/chipidea/usbmisc_imx.c
-===================================================================
---- linux-3.12-rc1.orig/drivers/usb/chipidea/usbmisc_imx.c
-+++ linux-3.12-rc1/drivers/usb/chipidea/usbmisc_imx.c
-@@ -21,6 +21,23 @@
- #define MX25_USB_PHY_CTRL_OFFSET 0x08
- #define MX25_BM_EXTERNAL_VBUS_DIVIDER BIT(23)
-
-+#define MX51_USB_OTG_PHY_CTRL_OFFSET 0x00
-+#define MX51_USB_OTG_PHY_CTRL_0_OFFSET 0x08
-+#define MX51_USB_OTG_PHY_CTRL_1_OFFSET 0x0c
-+#define MX51_USB_CTRL_1_OFFSET 0x10
-+#define MX51_USB_UH2_CTRL_OFFSET 0x14
-+#define MX51_USB_UH3_CTRL_OFFSET 0x18
-+#define MX51_USB_CTRL_OTG_EXT_CLK_EN (1 << 25)
-+#define MX51_USB_CTRL_UH1_EXT_CLK_EN (1 << 25)
-+#define MX51_USB_CTRL_UH2_EXT_CLK_EN (1 << 26)
-+#define MX51_USB_CTRL_UH3_EXT_CLK_EN (1 << 26)
-+#define MX51_USB_UTMI_PHYCTRL1_PLLDIV_MASK 0x3
-+#define MX51_USB_PLL_DIV_19_2_MHZ 0x01
-+#define MX51_BM_OVER_CUR_DIS_H2 BIT(4)
-+#define MX51_BM_OVER_CUR_DIS_H1 BIT(8)
-+#define MX51_BM_OVER_CUR_DIS_OTG BIT(24)
-+#define MX51_BM_OVER_CUR_DIS_UHx BIT(30)
-+
- #define MX53_USB_OTG_PHY_CTRL_0_OFFSET 0x08
- #define MX53_USB_UH2_CTRL_OFFSET 0x14
- #define MX53_USB_UH3_CTRL_OFFSET 0x18
-@@ -68,6 +85,91 @@ static int usbmisc_imx25_post(struct imx
- return 0;
- }
-
-+static int usbmisc_imx51_init(struct imx_usbmisc_data *data)
-+{
-+ void __iomem *reg = NULL;
-+ unsigned long flags;
-+ u32 val = 0;
-+
-+ if (data->index > 3)
-+ return -EINVAL;
-+
-+ if (data->index == 0) {
-+ spin_lock_irqsave(&usbmisc->lock, flags);
-+ reg = usbmisc->base + MX51_USB_OTG_PHY_CTRL_1_OFFSET;
-+ val = readl(reg) & ~MX51_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
-+ val |= MX51_USB_PLL_DIV_19_2_MHZ;
-+ writel(val, reg);
-+ spin_unlock_irqrestore(&usbmisc->lock, flags);
-+ }
-+
-+ if (data->disable_oc) {
-+ spin_lock_irqsave(&usbmisc->lock, flags);
-+ switch (data->index) {
-+ case 0:
-+ reg = usbmisc->base + MX51_USB_OTG_PHY_CTRL_OFFSET;
-+ val = readl(reg) | MX51_BM_OVER_CUR_DIS_OTG;
-+ break;
-+ case 1:
-+ reg = usbmisc->base + MX51_USB_OTG_PHY_CTRL_0_OFFSET;
-+ val = readl(reg) | MX51_BM_OVER_CUR_DIS_H1;
-+ break;
-+ case 2:
-+ reg = usbmisc->base + MX51_USB_UH2_CTRL_OFFSET;
-+ val = readl(reg) | MX51_BM_OVER_CUR_DIS_H2;
-+ break;
-+ }
-+ writel(val, reg);
-+ spin_unlock_irqrestore(&usbmisc->lock, flags);
-+ }
-+
-+ if (data->index == 1) {
-+ reg = ioremap(0x73f80000+0x200+0x140, SZ_4K);
-+ val = readl(reg) & (~(0xff<<16));
-+ writel(val, reg);
-+ iounmap(reg);
-+ }
-+
-+ return 0;
-+}
-+
-+static int usbmisc_imx51_post(struct imx_usbmisc_data *data)
-+{
-+ void __iomem *reg = NULL;
-+ unsigned long flags;
-+ u32 val = 0;
-+
-+ if (data->index > 3)
-+ return -EINVAL;
-+
-+ if (data->ext_clk_en) {
-+ spin_lock_irqsave(&usbmisc->lock, flags);
-+ switch (data->index) {
-+ case 0:
-+ reg = usbmisc->base + MX51_USB_CTRL_1_OFFSET;
-+ val = readl(reg) | MX51_USB_CTRL_OTG_EXT_CLK_EN;
-+ break;
-+ case 1:
-+ reg = usbmisc->base + MX51_USB_CTRL_1_OFFSET;
-+ val = readl(reg) | MX51_USB_CTRL_UH1_EXT_CLK_EN;
-+ break;
-+ case 2:
-+ reg = usbmisc->base + MX51_USB_CTRL_1_OFFSET;
-+ val = readl(reg) | MX51_USB_CTRL_UH2_EXT_CLK_EN;
-+ break;
-+ case 3:
-+ reg = usbmisc->base + MX51_USB_CTRL_1_OFFSET;
-+ val = readl(reg) | MX51_USB_CTRL_UH3_EXT_CLK_EN;
-+ break;
-+ }
-+ if (reg && val)
-+ writel(val, reg);
-+ spin_unlock_irqrestore(&usbmisc->lock, flags);
-+ }
-+
-+ return 0;
-+}
-+
- static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
- {
- void __iomem *reg = NULL;
-@@ -128,6 +230,11 @@ static const struct usbmisc_ops imx25_us
- .post = usbmisc_imx25_post,
- };
-
-+static const struct usbmisc_ops imx51_usbmisc_ops = {
-+ .init = usbmisc_imx51_init,
-+ .post = usbmisc_imx51_post,
-+};
-+
- static const struct usbmisc_ops imx53_usbmisc_ops = {
- .init = usbmisc_imx53_init,
- };
-@@ -162,6 +269,10 @@ static const struct of_device_id usbmisc
- .data = &imx25_usbmisc_ops,
- },
- {
-+ .compatible = "fsl,imx51-usbmisc",
-+ .data = &imx51_usbmisc_ops,
-+ },
-+ {
- .compatible = "fsl,imx53-usbmisc",
- .data = &imx53_usbmisc_ops,
- },
diff --git a/patches/linux/3.18/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix b/patches/linux/3.18/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
deleted file mode 100644
index ad2553c..0000000
--- a/patches/linux/3.18/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
+++ /dev/null
@@ -1,60 +0,0 @@
-From patchwork Tue Dec 17 08:16:27 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v2,1/5] mmc: sdhci: add platfrom get_max_timeout_count hook
-From: Aisheng Dong <b2...@fr...>
-X-Patchwork-Id: 3359651
-Message-Id: <138...@fr...>
-To: <lin...@vg...>
-Cc: ulf...@li..., sha...@li...,
- ed....@al...,
- s....@pe..., adr...@in...,
- vla...@me..., cj...@la..., b2...@fr...,
- lin...@li...
-Date: Tue, 17 Dec 2013 16:16:27 +0800
-
-Currently the max_discard_to is simply got by (1 << 27) / host->timeout_clk
-which is assumed to be the maximum timeout value, however, some platforms
-maximum timeout counter may not be 1 << 27, e.g. i.MX uSDHC is 1 << 28.
-Thus 1 << 27 may not be correct for such platforms.
-
-It is also possible that other platforms may have different problems.
-To be flexible, we add a get_max_timeout_count hook to get the correct
-maximum timeout value for these platforms.
-
-Signed-off-by: Dong Aisheng <b2...@fr...>
-
----
-drivers/mmc/host/sdhci.c | 4 +++-
- drivers/mmc/host/sdhci.h | 1 +
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-Index: linux-3.15-rc1/drivers/mmc/host/sdhci.c
-===================================================================
---- linux-3.15-rc1.orig/drivers/mmc/host/sdhci.c
-+++ linux-3.15-rc1/drivers/mmc/host/sdhci.c
-@@ -2938,8 +2938,9 @@ int sdhci_add_host(struct sdhci_host *ho
- if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)
- host->timeout_clk = mmc->f_max / 1000;
-
-- mmc->max_busy_timeout = (1 << 27) / host->timeout_clk;
--
-+ mmc->max_busy_timeout = host->ops->get_max_timeout_count ?
-+ host->ops->get_max_timeout_count(host) : 1 << 27;
-+ mmc->max_busy_timeout /= host->timeout_clk;
- mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23;
-
- if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12)
-Index: linux-3.15-rc1/drivers/mmc/host/sdhci.h
-===================================================================
---- linux-3.15-rc1.orig/drivers/mmc/host/sdhci.h
-+++ linux-3.15-rc1/drivers/mmc/host/sdhci.h
-@@ -281,6 +281,7 @@ struct sdhci_ops {
- unsigned int (*get_max_clock)(struct sdhci_host *host);
- unsigned int (*get_min_clock)(struct sdhci_host *host);
- unsigned int (*get_timeout_clock)(struct sdhci_host *host);
-+ unsigned int (*get_max_timeout_count)(struct sdhci_host *host);
- int (*platform_bus_width)(struct sdhci_host *host,
- int width);
- void (*platform_send_init_74_clocks)(struct sdhci_host *host,
diff --git a/patches/linux/3.18/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix b/patches/linux/3.18/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
deleted file mode 100644
index 36593ae..0000000
--- a/patches/linux/3.18/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
+++ /dev/null
@@ -1,54 +0,0 @@
-From patchwork Tue Dec 17 08:16:28 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v2, 2/5] mmc: sdhci-esdhc-imx: fix incorrect max_discard_to for uSDHC
-From: Aisheng Dong <b2...@fr...>
-X-Patchwork-Id: 3359661
-Message-Id: <138...@fr...>
-To: <lin...@vg...>
-Cc: ulf...@li..., sha...@li...,
- ed....@al...,
- s....@pe..., adr...@in...,
- vla...@me..., cj...@la..., b2...@fr...,
- lin...@li...
-Date: Tue, 17 Dec 2013 16:16:28 +0800
-
-The default sdhci code use the 1 << 27 as the max timeout counter to
-to calculate the max_discard_to, however it's not correct for uSDHC
-since its the max counter is 1 << 28.
-Implement esdhc_get_max_timeout to handle it correctly.
-
-Signed-off-by: Dong Aisheng <b2...@fr...>
-
----
-drivers/mmc/host/sdhci-esdhc-imx.c | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
-index de2655e..5d9b56d 100644
---- a/drivers/mmc/host/sdhci-esdhc-imx.c
-+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
-@@ -880,6 +880,14 @@ static int esdhc_set_uhs_signaling(struct sdhci_host *host, unsigned int uhs)
- return esdhc_change_pinstate(host, uhs);
- }
-
-+static unsigned int esdhc_get_max_timeout_count(struct sdhci_host *host)
-+{
-+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-+ struct pltfm_imx_data *imx_data = pltfm_host->priv;
-+
-+ return esdhc_is_usdhc(imx_data) ? 1 << 28 : 1 << 27;
-+}
-+
- static struct sdhci_ops sdhci_esdhc_ops = {
- .read_l = esdhc_readl_le,
- .read_w = esdhc_readw_le,
-@@ -892,6 +900,7 @@ static struct sdhci_ops sdhci_esdhc_ops = {
- .get_ro = esdhc_pltfm_get_ro,
- .platform_bus_width = esdhc_pltfm_bus_width,
- .set_uhs_signaling = esdhc_set_uhs_signaling,
-+ .get_max_timeout_count = esdhc_get_max_timeout_count,
- };
-
- static const struct sdhci_pltfm_data sdhci_esdhc_imx_pdata = {
diff --git a/patches/linux/3.18/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix b/patches/linux/3.18/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
deleted file mode 100644
index 368ac34..0000000
--- a/patches/linux/3.18/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
+++ /dev/null
@@ -1,84 +0,0 @@
-From patchwork Tue Dec 17 08:16:29 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v2,3/5] mmc: sdhci: add platform set_timeout hook
-From: Aisheng Dong <b2...@fr...>
-X-Patchwork-Id: 3359671
-Message-Id: <138...@fr...>
-To: <lin...@vg...>
-Cc: ulf...@li..., sha...@li...,
- ed....@al...,
- s....@pe..., adr...@in...,
- vla...@me..., cj...@la..., b2...@fr...,
- lin...@li...
-Date: Tue, 17 Dec 2013 16:16:29 +0800
-
-Currently the common code assume 0xE is the maximum timeout counter
-value and use it to write into the timeout counter register.
-However, it's fairly possible that some other SoCs may have different
-max timeout register value. That means 0xE may be incorrect and
-becomes meaningless.
-
-It's also possible that other platforms has different timeout
-calculation algorithm. To be flexible, this patch provides a .set_timeout
-hook for those platforms to set the timeout on their way if they need.
-
-Signed-off-by: Dong Aisheng <b2...@fr...>
-
----
-drivers/mmc/host/sdhci.c | 19 ++++++++++++++-----
- drivers/mmc/host/sdhci.h | 2 ++
- 2 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
-index 7fef3bb..47ecf50 100644
---- a/drivers/mmc/host/sdhci.c
-+++ b/drivers/mmc/host/sdhci.c
-@@ -726,19 +726,28 @@ static void sdhci_set_transfer_irqs(struct sdhci_host *host)
- sdhci_clear_set_irqs(host, dma_irqs, pio_irqs);
- }
-
--static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
-+static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
- {
- u8 count;
-+
-+ if (host->ops->set_timeout) {
-+ host->ops->set_timeout(host, cmd);
-+ } else {
-+ count = sdhci_calc_timeout(host, cmd);
-+ sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
-+ }
-+}
-+
-+static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
-+{
- u8 ctrl;
- struct mmc_data *data = cmd->data;
- int ret;
-
- WARN_ON(host->data);
-
-- if (data || (cmd->flags & MMC_RSP_BUSY)) {
-- count = sdhci_calc_timeout(host, cmd);
-- sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
-- }
-+ if (data || (cmd->flags & MMC_RSP_BUSY))
-+ sdhci_set_timeout(host, cmd);
-
- if (!data)
- return;
-diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
-index acba9a7..25c1572 100644
---- a/drivers/mmc/host/sdhci.h
-+++ b/drivers/mmc/host/sdhci.h
-@@ -282,6 +282,8 @@ struct sdhci_ops {
- unsigned int (*get_min_clock)(struct sdhci_host *host);
- unsigned int (*get_timeout_clock)(struct sdhci_host *host);
- unsigned int (*get_max_timeout_count)(struct sdhci_host *host);
-+ void (*set_timeout)(struct sdhci_host *host,
-+ struct mmc_command *cmd);
- int (*platform_bus_width)(struct sdhci_host *host,
- int width);
- void (*platform_send_init_74_clocks)(struct sdhci_host *host,
diff --git a/patches/linux/3.18/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix b/patches/linux/3.18/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
deleted file mode 100644
index 05a5823..0000000
--- a/patches/linux/3.18/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
+++ /dev/null
@@ -1,62 +0,0 @@
-From patchwork Tue Dec 17 08:16:30 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v2, 4/5] mmc: sdhci-esdhc-imx: set the correct max timeout value for
- uSDHC
-From: Aisheng Dong <b2...@fr...>
-X-Patchwork-Id: 3359681
-Message-Id: <138...@fr...>
-To: <lin...@vg...>
-Cc: ulf...@li..., sha...@li...,
- ed....@al...,
- s....@pe..., adr...@in...,
- vla...@me..., cj...@la..., b2...@fr...,
- lin...@li...
-Date: Tue, 17 Dec 2013 16:16:30 +0800
-
-The default sdhci driver write 0xE into timeout counter register to
-set the maximum timeout. The value is not correct for uSDHC since the
-max counter value for uSDHC is 0xF.
-Instead of using common timeout code in sdhci, we implement esdhc_set_timeout
-to handle the difference between eSDHC and uSDHC.
-
-Currently we simply set the max timeout value as before.
-But in the future, we probably may implement IMX specific timeout
-setting algorithm and use suitable timeout for different CMDs.
-
-Signed-off-by: Dong Aisheng <b2...@fr...>
-
----
-drivers/mmc/host/sdhci-esdhc-imx.c | 11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
-index 5d9b56d..2a04847 100644
---- a/drivers/mmc/host/sdhci-esdhc-imx.c
-+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
-@@ -888,6 +888,16 @@ static unsigned int esdhc_get_max_timeout_count(struct sdhci_host *host)
- return esdhc_is_usdhc(imx_data) ? 1 << 28 : 1 << 27;
- }
-
-+static void esdhc_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
-+{
-+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-+ struct pltfm_imx_data *imx_data = pltfm_host->priv;
-+
-+ /* use maximum timeout counter */
-+ sdhci_writeb(host, esdhc_is_usdhc(imx_data) ? 0xF : 0xE,
-+ SDHCI_TIMEOUT_CONTROL);
-+}
-+
- static struct sdhci_ops sdhci_esdhc_ops = {
- .read_l = esdhc_readl_le,
- .read_w = esdhc_readw_le,
-@@ -901,6 +911,7 @@ static struct sdhci_ops sdhci_esdhc_ops = {
- .platform_bus_width = esdhc_pltfm_bus_width,
- .set_uhs_signaling = esdhc_set_uhs_signaling,
- .get_max_timeout_count = esdhc_get_max_timeout_count,
-+ .set_timeout = esdhc_set_timeout,
- };
-
- static const struct sdhci_pltfm_data sdhci_esdhc_imx_pdata = {
diff --git a/patches/linux/3.18/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix b/patches/linux/3.18/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
deleted file mode 100644
index 9eeb6be..0000000
--- a/patches/linux/3.18/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
+++ /dev/null
@@ -1,124 +0,0 @@
-From patchwork Tue Dec 17 08:16:31 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v2, 5/5] mmc: sdhci: calculate max_discard_to dynamically for
- SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK
-From: Aisheng Dong <b2...@fr...>
-X-Patchwork-Id: 3359691
-Message-Id: <138...@fr...>
-To: <lin...@vg...>
-Cc: ulf...@li..., sha...@li...,
- ed....@al...,
- s....@pe..., adr...@in...,
- vla...@me..., cj...@la..., b2...@fr...,
- lin...@li...
-Date: Tue, 17 Dec 2013 16:16:31 +0800
-
-For host controllers using SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK, since the card
-clock is changed dynamically for different cards, it does not make sense
-to use the maximum host clock to calculate max_discard_to which may lead
-the max_discard_to to be much smaller than its capbility and affect the card
-discard performance a lot.
-e.g. the host clock is 200Mhz, but the card is working on 50Mhz. Then the
-max_discard_to is only 1/4 of its real capbility.
-
-In this patch, it uses the actual_clock to calculate the max_discard_to
-dynamically as long as a new clock speed is set.
-
-Tested with a high speed SDHC card shows:
-Originally:
-mmc1: new high speed SDHC card at address aaaa
-mmc1: calculated max. discard sectors 49152 for timeout 1355 ms
-Now:
-mmc1: new high speed SDHC card at address aaaa
-mmc1: calculated max. discard sectors 712704 for timeout 5422 ms
-The max_discard_sectors will increase a lot which will also improve discard
-performance a lot.
-
-The one known limitation of this approach is that it does not cover the special
-case for user changes the clock via sysfs, since the max_discard_to is only
-initialised for one time during the mmc queue init.
-
-Signed-off-by: Dong Aisheng <b2...@fr...>
-
----
-drivers/mmc/host/sdhci.c | 47 +++++++++++++++++++++++++++------------------
- 1 files changed, 28 insertions(+), 19 deletions(-)
-
-Index: linux-3.15-rc1/drivers/mmc/host/sdhci.c
-===================================================================
---- linux-3.15-rc1.orig/drivers/mmc/host/sdhci.c
-+++ linux-3.15-rc1/drivers/mmc/host/sdhci.c
-@@ -1160,7 +1160,7 @@ static void sdhci_set_clock(struct sdhci
- if (host->ops->set_clock) {
- host->ops->set_clock(host, clock);
- if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK)
-- return;
-+ goto out;
- }
-
- sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
-@@ -1259,6 +1259,16 @@ clock_set:
-
- out:
- host->clock = clock;
-+
-+ /* update timeout_clk and max_busy_timeout once the SDCLK is changed */
-+ if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK && clock) {
-+ host->timeout_clk = host->mmc->actual_clock ?
-+ host->mmc->actual_clock / 1000 :
-+ host->clock / 1000;
-+ host->mmc->max_busy_timeout = host->ops->get_max_timeout_count ?
-+ host->ops->get_max_timeout_count(host) : 1 << 27;
-+ host->mmc->max_busy_timeout /= host->timeout_clk;
-+ }
- }
-
- static inline void sdhci_update_clock(struct sdhci_host *host)
-@@ -2929,27 +2939,27 @@ int sdhci_add_host(struct sdhci_host *ho
- } else
- mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_200;
-
-- host->timeout_clk =
-- (caps[0] & SDHCI_TIMEOUT_CLK_MASK) >> SDHCI_TIMEOUT_CLK_SHIFT;
-- if (host->timeout_clk == 0) {
-- if (host->ops->get_timeout_clock) {
-- host->timeout_clk = host->ops->get_timeout_clock(host);
-- } else if (!(host->quirks &
-- SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) {
-- pr_err("%s: Hardware doesn't specify timeout clock "
-- "frequency.\n", mmc_hostname(mmc));
-- return -ENODEV;
-+ if (!(host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) {
-+ host->timeout_clk = (caps[0] & SDHCI_TIMEOUT_CLK_MASK) >>
-+ SDHCI_TIMEOUT_CLK_SHIFT;
-+ if (host->timeout_clk == 0) {
-+ if (host->ops->get_timeout_clock) {
-+ host->timeout_clk =
-+ host->ops->get_timeout_clock(host);
-+ } else {
-+ pr_err("%s: Hardware doesn't specify timeout"
-+ "clock frequency.\n", mmc_hostname(mmc));
-+ return -ENODEV;
-+ }
- }
-- }
-- if (caps[0] & SDHCI_TIMEOUT_CLK_UNIT)
-- host->timeout_clk *= 1000;
-+ if (caps[0] & SDHCI_TIMEOUT_CLK_UNIT)
-+ host->timeout_clk *= 1000;
-
-- if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)
-- host->timeout_clk = mmc->f_max / 1000;
-+ mmc->max_busy_timeout = host->ops->get_max_timeout_count ?
-+ host->ops->get_max_timeout_count(host) : 1 << 27;
-+ mmc->max_busy_timeout /= host->timeout_clk;
-+ }
-
-- mmc->max_busy_timeout = host->ops->get_max_timeout_count ?
-- host->ops->get_max_timeout_count(host) : 1 << 27;
-- mmc->max_busy_timeout /= host->timeout_clk;
- mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23;
-
- if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12)
diff --git a/patches/linux/3.18/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3 b/patches/linux/3.18/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3
deleted file mode 100644
index 23a02fa..0000000
--- a/patches/linux/3.18/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3
+++ /dev/null
@@ -1,96 +0,0 @@
-From 33cf4516f3e77a07bff59abdf8e74588573a2fd8 Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@gm...>
-Date: Sun, 17 Aug 2014 23:04:39 +0200
-Subject: [PATCH] usb: gadget: remove $(PWD) in ccflags-y
-
-The variable $(PWD) is useless, and it may break the compilation.
-For example, it breaks the kernel compilation when it's done with
-buildroot :
-
- /home/trem/Codes/armadeus/armadeus/buildroot/output/host/usr/bin/ccache
-/home/trem/Codes/armadeus/armadeus/buildroot/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc
--Wp,-MD,drivers/usb/gadget/legacy/.hid.o.d -nostdinc -isystem
-/home/trem/Codes/armadeus/armadeus/buildroot/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.7.3/include
--I./arch/arm/include -Iarch/arm/include/generated -Iinclude
--I./arch/arm/include/uapi -Iarch/arm/include/generated/uapi
--I./include/uapi -Iinclude/generated/uapi -include
-./include/linux/kconfig.h -D__KERNEL__ -mlittle-endian -Wall -Wundef
--Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common
--Werror-implicit-function-declaration -Wno-format-security
--fno-dwarf2-cfi-asm -mabi=aapcs-linux -mno-thumb-interwork -mfpu=vfp
--funwind-tables -marm -D__LINUX_ARM_ARCH__=5 -march=armv5te
--mtune=arm9tdmi -msoft-float -Uarm -fno-delete-null-pointer-checks -O2
---param=allow-store-data-races=0 -Wframe-larger-than=1024
--fno-stack-protector -Wno-unused-but-set-variable -fomit-frame-pointer
--fno-var-tracking-assignments -g -Wdeclaration-after-statement
--Wno-pointer-sign -fno-strict-overflow -fconserve-stack
--Werror=implicit-int -Werror=strict-prototypes -DCC_HAVE_ASM_GOTO
--I/home/trem/Codes/armadeus/armadeus/buildroot/drivers/usb/gadget/
--I/home/trem/Codes/armadeus/armadeus/buildroot/drivers/usb/gadget/udc/
--I/home/trem/Codes/armadeus/armadeus/buildroot/drivers/usb/gadget/function/
--DMODULE -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(hid)"
--D"KBUILD_MODNAME=KBUILD_STR(g_hid)" -c -o
-drivers/usb/gadget/legacy/hid.o drivers/usb/gadget/legacy/hid.c
-drivers/usb/gadget/epautoconf.c:23:26: erreur fatale: gadget_chips.h :
-Aucun fichier ou dossier de ce type
-
-This compilation line include :
-..../buildroot/driver/usb/gadget
-but the real path is :
-..../buildroot/output/build/linux-3.17-rc1/driver/usb/gadget
-
-Signed-off-by: Philippe Reynes <tr...@gm...>
----
- drivers/usb/gadget/Makefile | 2 +-
- drivers/usb/gadget/function/Makefile | 4 ++--
- drivers/usb/gadget/legacy/Makefile | 6 +++---
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
-index a186afe..9add915 100644
---- a/drivers/usb/gadget/Makefile
-+++ b/drivers/usb/gadget/Makefile
-@@ -3,7 +3,7 @@
- #
- subdir-ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG
- subdir-ccflags-$(CONFIG_USB_GADGET_VERBOSE) += -DVERBOSE_DEBUG
--ccflags-y += -I$(PWD)/drivers/usb/gadget/udc
-+ccflags-y += -Idrivers/usb/gadget/udc
-
- obj-$(CONFIG_USB_LIBCOMPOSITE) += libcomposite.o
- libcomposite-y := usbstring.o config.o epautoconf.o
-diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile
-index 6d91f21..83ae106 100644
---- a/drivers/usb/gadget/function/Makefile
-+++ b/drivers/usb/gadget/function/Makefile
-@@ -2,8 +2,8 @@
- # USB peripheral controller drivers
- #
-
--ccflags-y := -I$(PWD)/drivers/usb/gadget/
--ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/
-+ccflags-y := -Idrivers/usb/gadget/
-+ccflags-y += -Idrivers/usb/gadget/udc/
-
- # USB Functions
- usb_f_acm-y := f_acm.o
-diff --git a/drivers/usb/gadget/legacy/Makefile b/drivers/usb/gadget/legacy/Makefile
-index a11aad5..edba2d1 100644
---- a/drivers/usb/gadget/legacy/Makefile
-+++ b/drivers/usb/gadget/legacy/Makefile
-@@ -2,9 +2,9 @@
- # USB gadget drivers
- #
-
--ccflags-y := -I$(PWD)/drivers/usb/gadget/
--ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/
--ccflags-y += -I$(PWD)/drivers/usb/gadget/function/
-+ccflags-y := -Idrivers/usb/gadget/
-+ccflags-y += -Idrivers/usb/gadget/udc/
-+ccflags-y += -Idrivers/usb/gadget/function/
-
- g_zero-y := zero.o
- g_audio-y := audio.o
---
-1.7.4.4
-
diff --git a/patches/linux/3.18/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch.dont_apply b/patches/linux/3.18/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch.dont_apply
deleted file mode 100644
index 90ce2f8..0000000
--- a/patches/linux/3.18/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch.dont_apply
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
-index 9455fd0ec830..6fbba53a309b 100644
---- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
-+++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
-@@ -17,7 +17,9 @@ Example:
-
- pcie@0x01000000 {
- compatible = "fsl,imx6q-pcie", "snps,dw-pcie";
-- reg = <0x01ffc000 0x4000>;
-+ reg = <0x01ffc000 0x04000>,
-+ <0x01f00000 0x80000>;
-+ reg-names = "dbi", "config";
- #address-cells = <3>;
- #size-cells = <2>;
- device_type = "pci";
-diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
-index ce0599134a69..6b5da2a98aaf 100644
---- a/arch/arm/boot/dts/imx6qdl.dtsi
-+++ b/arch/arm/boot/dts/imx6qdl.dtsi
-@@ -133,7 +133,9 @@
-
- pcie: pcie@0x01000000 {
- compatible = "fsl,imx6q-pcie", "snps,dw-pcie";
-- reg = <0x01ffc000 0x4000>; /* DBI */
-+ reg = <0x01ffc000 0x04000>,
-+ <0x01f00000 0x80000>;
-+ reg-names = "dbi", "config";
- #address-cells = <3>;
- #size-cells = <2>;
- device_type = "pci";
diff --git a/patches/linux/3.18/0508-PCI-imx6-fix-occasional-link-failure.patch.dont_apply b/patches/linux/3.18/0508-PCI-imx6-fix-occasional-link-failure.patch.dont_apply
deleted file mode 100644
index 2cec0e3..0000000
--- a/patches/linux/3.18/0508-PCI-imx6-fix-occasional-link-failure.patch.dont_apply
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
-index 1be6073..9b6bab9 100644
---- a/drivers/pci/host/pci-imx6.c
-+++ b/drivers/pci/host/pci-imx6.c
-@@ -256,11 +256,6 @@ static int imx6_pcie_deassert_core_reset(struct pcie_port *pp)
- struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp);
- int ret;
-
-- regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
-- IMX6Q_GPR1_PCIE_TEST_PD, 0 << 18);
-- regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
-- IMX6Q_GPR1_PCIE_REF_CLK_EN, 1 << 16);
--
- ret = clk_prepare_enable(imx6_pcie->pcie_phy);
- if (ret) {
- dev_err(pp->dev, "unable to enable pcie_phy clock\n");
-@@ -282,6 +277,12 @@ static int imx6_pcie_deassert_core_reset(struct pcie_port *pp)
- /* allow the clocks to stabilize */
- usleep_range(200, 500);
-
-+ /* power up core phy and enable ref clock */
-+ regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
-+ IMX6Q_GPR1_PCIE_TEST_PD, 0 << 18);
-+ regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
-+ IMX6Q_GPR1_PCIE_REF_CLK_EN, 1 << 16);
-+
- /* Some boards don't have PCIe reset GPIO. */
- if (gpio_is_valid(imx6_pcie->reset_gpio)) {
- gpio_set_value(imx6_pcie->reset_gpio, 0);
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-10-28 14:52:13
|
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 cdb5c302f4a670a7e430467adb4d59a61ce4e82a (commit)
via 6113fcace02ffdb5678bfbcd522a6536b1ea40db (commit)
from 4e45eab750693e2945aff0b22c99ca3481cb3236 (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 cdb5c302f4a670a7e430467adb4d59a61ce4e82a
Author: Eric Jarrige <eri...@ar...>
Date: Tue Oct 28 15:51:31 2014 +0100
[LINUX] 3.18: move to 3.18-rc2
commit 6113fcace02ffdb5678bfbcd522a6536b1ea40db
Author: Philippe Reynes <tr...@gm...>
Date: Sat Oct 25 23:02:01 2014 +0200
[LINUX] 3.18: add initial support of 3.18-rc1
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-3.18-rc2.config | 1 +
...7-linux-3.17.config => apf27-linux-3.18.config} | 17 +--------
.../armadeus/apf28/apf28-linux-3.18-rc2.config | 1 +
...8-linux-3.14.config => apf28-linux-3.18.config} | 0
.../armadeus/apf51/apf51-linux-3.18-rc2.config | 1 +
...1-linux-3.16.config => apf51-linux-3.18.config} | 0
...d_board_to_linux_build_system.patch.dont_apply} | 0
...s-net-phy-fix_smsc_reset.patch.applied-3.17-rc2 | 0
...usbmisc_imx-add_imx51_support.patch.dont_build} | 0
...platfrom-get_max_timeout_count-hook.patch.tofix | 0
...-incorrect-max_discard_to-for-uSDHC.patch.tofix | 0
...sdhci-add-platform-set_timeout-hook.patch.tofix | 0
...correct-max-timeout-value-for-uSDHC.patch.tofix | 0
...SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix | 0
...-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3 | 0
...ig-space-as-platform-resource.patch.dont_apply} | 0
...6-fix-occasional-link-failure.patch.dont_apply} | 0
...-fix-NULL-pointer-dereference-if-ptp_cloc.patch | 38 ++++++++++++++++++++
18 files changed, 43 insertions(+), 15 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc2.config
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.17.config => apf27-linux-3.18.config} (94%)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc2.config
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.config => apf28-linux-3.18.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc2.config
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.16.config => apf51-linux-3.18.config} (100%)
copy patches/linux/{3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch => 3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch.dont_apply} (100%)
copy patches/linux/{3.17 => 3.18}/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2 (100%)
copy patches/linux/{3.12/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch => 3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch.dont_build} (100%)
copy patches/linux/{3.16 => 3.18}/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix (100%)
copy patches/linux/{3.16 => 3.18}/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix (100%)
copy patches/linux/{3.16 => 3.18}/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix (100%)
copy patches/linux/{3.16 => 3.18}/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix (100%)
copy patches/linux/{3.16 => 3.18}/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix (100%)
copy patches/linux/{3.17 => 3.18}/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3 (100%)
copy patches/linux/{3.17/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch => 3.18/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch.dont_apply} (100%)
copy patches/linux/{3.17/0508-PCI-imx6-fix-occasional-link-failure.patch => 3.18/0508-PCI-imx6-fix-occasional-link-failure.patch.dont_apply} (100%)
create mode 100644 patches/linux/3.18/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc2.config
new file mode 120000
index 0000000..305faef
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc2.config
@@ -0,0 +1 @@
+apf27-linux-3.18.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.config
similarity index 94%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.17.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.18.config
index e05962f..feb448f 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.config
@@ -1,4 +1,3 @@
-CONFIG_EXPERIMENTAL=y
# CONFIG_SWAP is not set
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
@@ -18,14 +17,11 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_IOSCHED_CFQ is not set
# CONFIG_ARCH_MULTI_V7 is not set
CONFIG_ARCH_MXC=y
-CONFIG_MXC_IRQ_PRIOR=y
CONFIG_MACH_IMX27_DT=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_FPE_NWFPE=y
-CONFIG_FPE_NWFPE_XP=y
CONFIG_PM_DEBUG=y
CONFIG_NET=y
CONFIG_PACKET=y
@@ -41,8 +37,6 @@ CONFIG_IP_PNP_DHCP=y
# CONFIG_INET_DIAG is not set
CONFIG_IPV6=y
CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
CONFIG_CAN_VCAN=m
CONFIG_CAN_MCP251X=m
CONFIG_BT=m
@@ -61,7 +55,6 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CFI=y
CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -73,8 +66,6 @@ CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_MXC=y
CONFIG_MTD_UBI=y
-CONFIG_PROC_DEVICETREE=y
-CONFIG_SRAM=y
CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_AT25=y
CONFIG_SCSI=y
@@ -82,11 +73,9 @@ CONFIG_BLK_DEV_SD=y
CONFIG_BLK_DEV_SR=y
CONFIG_CHR_DEV_SG=y
CONFIG_CHR_DEV_SCH=y
-CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_NETDEVICES=y
-CONFIG_MII=y
# CONFIG_NET_VENDOR_BROADCOM is not set
# CONFIG_NET_VENDOR_CIRRUS is not set
# CONFIG_NET_VENDOR_FARADAY is not set
@@ -153,10 +142,7 @@ CONFIG_SOC_CAMERA_MT9M111=m
# CONFIG_DVB_TUNER_DIB0090 is not set
CONFIG_FB=y
CONFIG_FB_IMX=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_L4F00242T03=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_LOGO=y
CONFIG_SOUND=m
@@ -211,7 +197,8 @@ CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y
CONFIG_IMX_DMA=y
# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_IIO=m
+CONFIG_IIO=y
+CONFIG_MAX1027=y
CONFIG_PWM=y
CONFIG_PWM_IMX=y
CONFIG_ARMADEUS_DRIVERS=y
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc2.config
new file mode 120000
index 0000000..f82b65f
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc2.config
@@ -0,0 +1 @@
+apf28-linux-3.18.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-3.18.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-3.18.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc2.config
new file mode 120000
index 0000000..4a20752
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc2.config
@@ -0,0 +1 @@
+apf51-linux-3.18.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.16.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-3.18.config
diff --git a/patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch.dont_apply
similarity index 100%
copy from patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
copy to patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch.dont_apply
diff --git a/patches/linux/3.17/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2 b/patches/linux/3.18/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2
similarity index 100%
copy from patches/linux/3.17/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2
copy to patches/linux/3.18/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2
diff --git a/patches/linux/3.12/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch b/patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch.dont_build
similarity index 100%
copy from patches/linux/3.12/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
copy to patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch.dont_build
diff --git a/patches/linux/3.16/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix b/patches/linux/3.18/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
copy to patches/linux/3.18/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
diff --git a/patches/linux/3.16/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix b/patches/linux/3.18/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
copy to patches/linux/3.18/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
diff --git a/patches/linux/3.16/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix b/patches/linux/3.18/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
copy to patches/linux/3.18/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
diff --git a/patches/linux/3.16/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix b/patches/linux/3.18/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
copy to patches/linux/3.18/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
diff --git a/patches/linux/3.16/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix b/patches/linux/3.18/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
similarity index 100%
copy from patches/linux/3.16/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
copy to patches/linux/3.18/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
diff --git a/patches/linux/3.17/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3 b/patches/linux/3.18/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3
similarity index 100%
copy from patches/linux/3.17/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3
copy to patches/linux/3.18/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3
diff --git a/patches/linux/3.17/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch b/patches/linux/3.18/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch.dont_apply
similarity index 100%
copy from patches/linux/3.17/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch
copy to patches/linux/3.18/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch.dont_apply
diff --git a/patches/linux/3.17/0508-PCI-imx6-fix-occasional-link-failure.patch b/patches/linux/3.18/0508-PCI-imx6-fix-occasional-link-failure.patch.dont_apply
similarity index 100%
copy from patches/linux/3.17/0508-PCI-imx6-fix-occasional-link-failure.patch
copy to patches/linux/3.18/0508-PCI-imx6-fix-occasional-link-failure.patch.dont_apply
diff --git a/patches/linux/3.18/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch b/patches/linux/3.18/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch
new file mode 100644
index 0000000..3e45b22
--- /dev/null
+++ b/patches/linux/3.18/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch
@@ -0,0 +1,38 @@
+From 81f35ffde0e95ee18de83646bbf93dda55d9cc8b Mon Sep 17 00:00:00 2001
+From: Philipp Zabel <p....@pe...>
+Date: Wed, 22 Oct 2014 16:34:35 +0200
+Subject: [PATCH] net: fec: ptp: fix NULL pointer dereference if ptp_clock is
+ not set
+
+Since commit 278d24047891 (net: fec: ptp: Enable PPS output based on ptp clock)
+fec_enet_interrupt calls fec_ptp_check_pps_event unconditionally, which calls
+into ptp_clock_event. If fep->ptp_clock is NULL, ptp_clock_event tries to
+dereference the NULL pointer.
+Since on i.MX53 fep->bufdesc_ex is not set, fec_ptp_init is never called,
+and fep->ptp_clock is NULL, which reliably causes a kernel panic.
+
+This patch adds a check for fep->ptp_clock == NULL in fec_enet_interrupt.
+
+Signed-off-by: Philipp Zabel <p....@pe...>
+Signed-off-by: David S. Miller <da...@da...>
+---
+ drivers/net/ethernet/freescale/fec_main.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
+index 81b96cf..50a851d 100644
+--- a/drivers/net/ethernet/freescale/fec_main.c
++++ b/drivers/net/ethernet/freescale/fec_main.c
+@@ -1581,7 +1581,8 @@ fec_enet_interrupt(int irq, void *dev_id)
+ complete(&fep->mdio_done);
+ }
+
+- fec_ptp_check_pps_event(fep);
++ if (fep->ptp_clock)
++ fec_ptp_check_pps_event(fep);
+
+ return ret;
+ }
+--
+1.7.4.4
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-10-28 07:49:32
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4e45eab750693e2945aff0b22c99ca3481cb3236 (commit)
via 9095fff1cff2b4deeca4b115af717cff3e7a7847 (commit)
via 41a851099beb004063ee73c82e489af19ac0fa24 (commit)
via e154e5c2f78a05fb6c5bad4c59cddbd5fce15f37 (commit)
from 630386f0b69aa1334c049f83492deb2ecc564e9e (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 4e45eab750693e2945aff0b22c99ca3481cb3236
Author: Philippe Reynes <tr...@gm...>
Date: Sat Oct 18 17:25:57 2014 +0200
[LINUX] 3.10: move to 3.10.58
commit 9095fff1cff2b4deeca4b115af717cff3e7a7847
Author: Philippe Reynes <tr...@gm...>
Date: Sat Oct 18 17:25:56 2014 +0200
[LINUX] 3.14: move to 3.14.22
commit 41a851099beb004063ee73c82e489af19ac0fa24
Author: Philippe Reynes <tr...@gm...>
Date: Sat Oct 18 17:25:55 2014 +0200
[LINUX] 3.16: move to 3.16.6
commit e154e5c2f78a05fb6c5bad4c59cddbd5fce15f37
Author: Philippe Reynes <tr...@gm...>
Date: Sat Oct 18 17:25:54 2014 +0200
[LINUX] 3.17: move to 3.17.1
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.57.config => apf27-linux-3.10.58.config} | 0
...x-3.14.21.config => apf27-linux-3.14.22.config} | 0
...nux-3.16.5.config => apf27-linux-3.16.6.config} | 0
.../armadeus/apf27/apf27-linux-3.17.1.config | 1 +
...x-3.10.57.config => apf28-linux-3.10.58.config} | 0
...x-3.14.21.config => apf28-linux-3.14.22.config} | 0
...nux-3.16.5.config => apf28-linux-3.16.6.config} | 0
.../armadeus/apf28/apf28-linux-3.17.1.config | 1 +
...x-3.10.57.config => apf51-linux-3.10.58.config} | 0
...x-3.14.21.config => apf51-linux-3.14.22.config} | 0
...nux-3.16.5.config => apf51-linux-3.16.6.config} | 0
.../armadeus/apf51/apf51-linux-3.17.1.config | 1 +
patches/linux/{3.10.57 => 3.10.58} | 0
patches/linux/{3.14.21 => 3.14.22} | 0
patches/linux/{3.16.5 => 3.16.6} | 0
...us-net-phy-fix_smsc_reset.patch.applied-3.16.6} | 0
patches/linux/3.17.1 | 1 +
20 files changed, 10 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.57.config => apf27-linux-3.10.58.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.21.config => apf27-linux-3.14.22.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.16.5.config => apf27-linux-3.16.6.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.17.1.config
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.57.config => apf28-linux-3.10.58.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.21.config => apf28-linux-3.14.22.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.16.5.config => apf28-linux-3.16.6.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.17.1.config
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.57.config => apf51-linux-3.10.58.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.21.config => apf51-linux-3.14.22.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.16.5.config => apf51-linux-3.16.6.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.17.1.config
rename patches/linux/{3.10.57 => 3.10.58} (100%)
rename patches/linux/{3.14.21 => 3.14.22} (100%)
rename patches/linux/{3.16.5 => 3.16.6} (100%)
rename patches/linux/3.16/{0232-armadeus-net-phy-fix_smsc_reset.patch => 0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.16.6} (100%)
create mode 120000 patches/linux/3.17.1
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 71bd2fd..5cbb6f3 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.17"
+BR2_DEFAULT_KERNEL_VERSION="3.17.1"
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.17"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.1"
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 ce51620..2cf8805 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.17"
+BR2_DEFAULT_KERNEL_VERSION="3.17.1"
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.17"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.1"
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 e87805b..29a991f 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.17"
+BR2_DEFAULT_KERNEL_VERSION="3.17.1"
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.17"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.1"
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.57.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.58.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.57.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.58.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.21.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.22.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.21.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.22.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.16.5.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.16.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.16.5.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.16.6.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.1.config
new file mode 120000
index 0000000..f353627
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.1.config
@@ -0,0 +1 @@
+apf27-linux-3.17.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.57.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.58.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.57.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.58.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.21.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.22.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.21.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.22.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.16.5.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.16.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.16.5.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.16.6.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.17.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.17.1.config
new file mode 120000
index 0000000..866bd25
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.17.1.config
@@ -0,0 +1 @@
+apf28-linux-3.17.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.57.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.58.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.57.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.58.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.21.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.22.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.21.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.22.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.5.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.16.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.16.5.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.16.6.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.1.config
new file mode 120000
index 0000000..f370504
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.1.config
@@ -0,0 +1 @@
+apf51-linux-3.17.config
\ No newline at end of file
diff --git a/patches/linux/3.10.57 b/patches/linux/3.10.58
similarity index 100%
rename from patches/linux/3.10.57
rename to patches/linux/3.10.58
diff --git a/patches/linux/3.14.21 b/patches/linux/3.14.22
similarity index 100%
rename from patches/linux/3.14.21
rename to patches/linux/3.14.22
diff --git a/patches/linux/3.16.5 b/patches/linux/3.16.6
similarity index 100%
rename from patches/linux/3.16.5
rename to patches/linux/3.16.6
diff --git a/patches/linux/3.16/0232-armadeus-net-phy-fix_smsc_reset.patch b/patches/linux/3.16/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.16.6
similarity index 100%
rename from patches/linux/3.16/0232-armadeus-net-phy-fix_smsc_reset.patch
rename to patches/linux/3.16/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.16.6
diff --git a/patches/linux/3.17.1 b/patches/linux/3.17.1
new file mode 120000
index 0000000..459f037
--- /dev/null
+++ b/patches/linux/3.17.1
@@ -0,0 +1 @@
+3.17
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-10-27 09:10:04
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 630386f0b69aa1334c049f83492deb2ecc564e9e (commit)
from f56993e3ded336136fb0cef3a69ab6b4ffd0dcc8 (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 630386f0b69aa1334c049f83492deb2ecc564e9e
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Oct 27 10:11:44 2014 +0100
[LINUX] 3.18: apf6: move to 3.18-rc2
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
...-3.18-rc1.config => apf6-linux-3.18-rc2.config} | 0
patches/linux/{3.18-rc1 => 3.18-rc2} | 0
3 files changed, 1 insertions(+), 1 deletions(-)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.18-rc1.config => apf6-linux-3.18-rc2.config} (100%)
rename patches/linux/{3.18-rc1 => 3.18-rc2} (100%)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index be04f5a..5a339c5 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -21,7 +21,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.18-rc1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18-rc2"
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/apf6/apf6-linux-3.18-rc1.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc1.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc2.config
diff --git a/patches/linux/3.18-rc1 b/patches/linux/3.18-rc2
similarity index 100%
rename from patches/linux/3.18-rc1
rename to patches/linux/3.18-rc2
hooks/post-receive
--
armadeus
|
