armadeus-commitlog Mailing List for armadeus (Page 39)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Sébastien S. <ss...@us...> - 2015-01-19 13:17: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 805805ea1f7e79f08b40aabd89cc69db3b45ffe5 (commit)
via 8392c583286d4ee88b7e14aaa2b41a9adc88e139 (commit)
via 3c095210b45d84d0672be9cc81caf865181520e5 (commit)
from 8ac276be25cd2f5da8a4355718e8bbd66b52ae68 (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 805805ea1f7e79f08b40aabd89cc69db3b45ffe5
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jan 19 14:18:14 2015 +0100
[SCRIPT] quiltify.sh: do not try to delete or remove target dir if it does
not exist.
commit 8392c583286d4ee88b7e14aaa2b41a9adc88e139
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jan 19 14:17:46 2015 +0100
[LINUX] 3.18: move to 3.18.3
commit 3c095210b45d84d0672be9cc81caf865181520e5
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jan 19 14:06:50 2015 +0100
[LINUX] 3.19: move to 3.19-rc5
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
buildroot/configs/apf6_defconfig | 2 +-
...nux-3.18.2.config => apf27-linux-3.18.3.config} | 0
...3.19-rc4.config => apf27-linux-3.19-rc5.config} | 0
...nux-3.18.2.config => apf28-linux-3.18.3.config} | 0
...3.19-rc4.config => apf28-linux-3.19-rc5.config} | 0
...nux-3.18.2.config => apf51-linux-3.18.3.config} | 0
...3.19-rc4.config => apf51-linux-3.19-rc5.config} | 0
...inux-3.18.2.config => apf6-linux-3.18.3.config} | 0
...-3.19-rc4.config => apf6-linux-3.19-rc5.config} | 0
patches/linux/{3.18.2 => 3.18.3} | 0
patches/linux/{3.19-rc4 => 3.19-rc5} | 0
scripts/quiltify.sh | 2 +-
15 files changed, 8 insertions(+), 8 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.18.2.config => apf27-linux-3.18.3.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.19-rc4.config => apf27-linux-3.19-rc5.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.18.2.config => apf28-linux-3.18.3.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.19-rc4.config => apf28-linux-3.19-rc5.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.18.2.config => apf51-linux-3.18.3.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.19-rc4.config => apf51-linux-3.19-rc5.config} (100%)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.18.2.config => apf6-linux-3.18.3.config} (100%)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.19-rc4.config => apf6-linux-3.19-rc5.config} (100%)
rename patches/linux/{3.18.2 => 3.18.3} (100%)
rename patches/linux/{3.19-rc4 => 3.19-rc5} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 5e8e340..2dd879a 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.2"
+BR2_DEFAULT_KERNEL_VERSION="3.18.3"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -34,7 +34,7 @@ BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.3"
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 d8b54fd..9fb8586 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.2"
+BR2_DEFAULT_KERNEL_VERSION="3.18.3"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -35,7 +35,7 @@ BR2_CPU_NAME="imx28"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.3"
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 e600d7d..844d547 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -7,7 +7,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.2"
+BR2_DEFAULT_KERNEL_VERSION="3.18.3"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -97,7 +97,7 @@ BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.3"
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/apf6_defconfig b/buildroot/configs/apf6_defconfig
index d7712dd..7eb4867 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -23,7 +23,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19-rc4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19-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.2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.18.2.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.18.3.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc4.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc5.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.18.2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18.3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.18.2.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.18.3.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc4.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc4.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc5.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.18.2.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.18.3.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc4.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc4.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc5.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.2.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.18.2.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.18.3.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc4.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc4.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc5.config
diff --git a/patches/linux/3.18.2 b/patches/linux/3.18.3
similarity index 100%
rename from patches/linux/3.18.2
rename to patches/linux/3.18.3
diff --git a/patches/linux/3.19-rc4 b/patches/linux/3.19-rc5
similarity index 100%
rename from patches/linux/3.19-rc4
rename to patches/linux/3.19-rc5
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 92528b6..aab7b69 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -143,7 +143,7 @@ if [ "$answer" == "y" ] || [ "$answer" == "yes" ]; then
fi
# Move or delete current XXX dir
-if [ "$QUILT_TARGET_NAME" != "Buildroot" ]; then
+if [ "$QUILT_TARGET_NAME" != "Buildroot" ] && [ -e "$QUILT_TARGET_DIR" ]; then
ask_user "Rename or delete the current $QUILT_TARGET_NAME directory: $QUILT_TARGET_DIR \n?? (R/d)"
EXT=`date +%Y_%m_%d_%Hh%M`
if [ "$answer" == "d" ]; then
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2015-01-16 15:10: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 8ac276be25cd2f5da8a4355718e8bbd66b52ae68 (commit)
from 00a5e3936ff3f33b08e570c5af8d8cf87c15b33b (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 8ac276be25cd2f5da8a4355718e8bbd66b52ae68
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jan 16 16:14:14 2015 +0100
[LINUX] 3.1{8,9}: apf28: dts: enable UART0
-----------------------------------------------------------------------
Summary of changes:
.../3.18/0420-armadeus-Improve-apf28dev-dts.patch | 20 +++++++++++++++++---
.../3.19/0420-armadeus-Improve-apf28dev-dts.patch | 20 +++++++++++++++++---
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch b/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
index 48f5367..72a4e0c 100644
--- a/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
+++ b/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
@@ -35,7 +35,21 @@ Index: linux-3.18.2/arch/arm/boot/dts/imx28-apf28dev.dts
};
apbx@80040000 {
-@@ -143,7 +159,8 @@
+@@ -130,6 +146,13 @@
+ status = "okay";
+ };
+
++ auart0: serial@8006a000 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&auart0_pins_a>;
++ fsl,uart-has-rtscts;
++ status = "okay";
++ };
++
+ usbphy0: usbphy@8007c000 {
+ status = "okay";
+ };
+@@ -143,7 +166,8 @@
ahb@80080000 {
usb0: usb@80080000 {
pinctrl-names = "default";
@@ -45,7 +59,7 @@ Index: linux-3.18.2/arch/arm/boot/dts/imx28-apf28dev.dts
vbus-supply = <®_usb0_vbus>;
status = "okay";
};
-@@ -175,6 +192,14 @@
+@@ -175,6 +199,14 @@
gpio = <&gpio1 23 1>;
enable-active-high;
};
@@ -60,7 +74,7 @@ Index: linux-3.18.2/arch/arm/boot/dts/imx28-apf28dev.dts
};
leds {
-@@ -202,6 +227,7 @@
+@@ -202,6 +234,7 @@
label = "User button";
gpios = <&gpio0 17 0>;
linux,code = <0x100>;
diff --git a/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch b/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch
index 48f5367..72a4e0c 100644
--- a/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch
+++ b/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch
@@ -35,7 +35,21 @@ Index: linux-3.18.2/arch/arm/boot/dts/imx28-apf28dev.dts
};
apbx@80040000 {
-@@ -143,7 +159,8 @@
+@@ -130,6 +146,13 @@
+ status = "okay";
+ };
+
++ auart0: serial@8006a000 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&auart0_pins_a>;
++ fsl,uart-has-rtscts;
++ status = "okay";
++ };
++
+ usbphy0: usbphy@8007c000 {
+ status = "okay";
+ };
+@@ -143,7 +166,8 @@
ahb@80080000 {
usb0: usb@80080000 {
pinctrl-names = "default";
@@ -45,7 +59,7 @@ Index: linux-3.18.2/arch/arm/boot/dts/imx28-apf28dev.dts
vbus-supply = <®_usb0_vbus>;
status = "okay";
};
-@@ -175,6 +192,14 @@
+@@ -175,6 +199,14 @@
gpio = <&gpio1 23 1>;
enable-active-high;
};
@@ -60,7 +74,7 @@ Index: linux-3.18.2/arch/arm/boot/dts/imx28-apf28dev.dts
};
leds {
-@@ -202,6 +227,7 @@
+@@ -202,6 +234,7 @@
label = "User button";
gpios = <&gpio0 17 0>;
linux,code = <0x100>;
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2015-01-16 12:51:41
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 00a5e3936ff3f33b08e570c5af8d8cf87c15b33b (commit)
from f40d72a89117147441e33f65de106c9b09aead1b (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 00a5e3936ff3f33b08e570c5af8d8cf87c15b33b
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jan 16 13:52:20 2015 +0100
[LINUX] 3.1{8,9}: apf28: dts: add CAN support
-----------------------------------------------------------------------
Summary of changes:
.../3.18/0420-armadeus-Improve-apf28dev-dts.patch | 39 +++++++++++++++++---
.../3.19/0420-armadeus-Improve-apf28dev-dts.patch | 39 +++++++++++++++++---
2 files changed, 68 insertions(+), 10 deletions(-)
diff --git a/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch b/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
index a331255..48f5367 100644
--- a/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
+++ b/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
@@ -1,10 +1,10 @@
Remaining Armadeus tweaks for APF28Dev device tree.
---
-Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
+Index: linux-3.18.2/arch/arm/boot/dts/imx28-apf28dev.dts
===================================================================
---- linux-3.15.5.orig/arch/arm/boot/dts/imx28-apf28dev.dts
-+++ linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
+--- linux-3.18.2.orig/arch/arm/boot/dts/imx28-apf28dev.dts
++++ linux-3.18.2/arch/arm/boot/dts/imx28-apf28dev.dts
@@ -77,6 +77,15 @@
fsl,voltage = <MXS_VOLTAGE_HIGH>;
fsl,pull-up = <MXS_PULL_DISABLE>;
@@ -21,7 +21,21 @@ Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
};
lcdif@80030000 {
-@@ -143,7 +152,8 @@
+@@ -110,6 +119,13 @@
+ };
+ };
+ };
++
++ can0: can@80032000 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&can0_pins_a>;
++ xceiver-supply = <®_can0_vcc>;
++ status = "okay";
++ };
+ };
+
+ apbx@80040000 {
+@@ -143,7 +159,8 @@
ahb@80080000 {
usb0: usb@80080000 {
pinctrl-names = "default";
@@ -31,7 +45,22 @@ Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
vbus-supply = <®_usb0_vbus>;
status = "okay";
};
-@@ -202,6 +212,7 @@
+@@ -175,6 +192,14 @@
+ gpio = <&gpio1 23 1>;
+ enable-active-high;
+ };
++
++ reg_can0_vcc: regulator@1 {
++ compatible = "regulator-fixed";
++ reg = <1>;
++ regulator-name = "can0_vcc";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ };
+ };
+
+ leds {
+@@ -202,6 +227,7 @@
label = "User button";
gpios = <&gpio0 17 0>;
linux,code = <0x100>;
diff --git a/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch b/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch
index a331255..48f5367 100644
--- a/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch
+++ b/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch
@@ -1,10 +1,10 @@
Remaining Armadeus tweaks for APF28Dev device tree.
---
-Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
+Index: linux-3.18.2/arch/arm/boot/dts/imx28-apf28dev.dts
===================================================================
---- linux-3.15.5.orig/arch/arm/boot/dts/imx28-apf28dev.dts
-+++ linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
+--- linux-3.18.2.orig/arch/arm/boot/dts/imx28-apf28dev.dts
++++ linux-3.18.2/arch/arm/boot/dts/imx28-apf28dev.dts
@@ -77,6 +77,15 @@
fsl,voltage = <MXS_VOLTAGE_HIGH>;
fsl,pull-up = <MXS_PULL_DISABLE>;
@@ -21,7 +21,21 @@ Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
};
lcdif@80030000 {
-@@ -143,7 +152,8 @@
+@@ -110,6 +119,13 @@
+ };
+ };
+ };
++
++ can0: can@80032000 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&can0_pins_a>;
++ xceiver-supply = <®_can0_vcc>;
++ status = "okay";
++ };
+ };
+
+ apbx@80040000 {
+@@ -143,7 +159,8 @@
ahb@80080000 {
usb0: usb@80080000 {
pinctrl-names = "default";
@@ -31,7 +45,22 @@ Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
vbus-supply = <®_usb0_vbus>;
status = "okay";
};
-@@ -202,6 +212,7 @@
+@@ -175,6 +192,14 @@
+ gpio = <&gpio1 23 1>;
+ enable-active-high;
+ };
++
++ reg_can0_vcc: regulator@1 {
++ compatible = "regulator-fixed";
++ reg = <1>;
++ regulator-name = "can0_vcc";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ };
+ };
+
+ leds {
+@@ -202,6 +227,7 @@
label = "User button";
gpios = <&gpio0 17 0>;
linux,code = <0x100>;
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2015-01-15 16:11: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 f40d72a89117147441e33f65de106c9b09aead1b (commit)
from 3eda3ca1a7d6440c5ca59c940fdb45a36aad79e3 (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 f40d72a89117147441e33f65de106c9b09aead1b
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jan 15 17:15:29 2015 +0100
[LINUX] 3.18: move to 3.18.2
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...nux-3.18.1.config => apf27-linux-3.18.2.config} | 0
...nux-3.18.1.config => apf28-linux-3.18.2.config} | 0
...nux-3.18.1.config => apf51-linux-3.18.2.config} | 0
...inux-3.18.1.config => apf6-linux-3.18.2.config} | 0
patches/linux/{3.18.1 => 3.18.2} | 0
8 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.18.1.config => apf27-linux-3.18.2.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.18.1.config => apf28-linux-3.18.2.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.18.1.config => apf51-linux-3.18.2.config} (100%)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.18.1.config => apf6-linux-3.18.2.config} (100%)
rename patches/linux/{3.18.1 => 3.18.2} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 4605124..5e8e340 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.1"
+BR2_DEFAULT_KERNEL_VERSION="3.18.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.18.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.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 e5cbf02..d8b54fd 100644
--- a/buildroot/configs/apf28mainline_defconfig
+++ b/buildroot/configs/apf28mainline_defconfig
@@ -6,7 +6,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.1"
+BR2_DEFAULT_KERNEL_VERSION="3.18.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.18.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.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 cb62482..e600d7d 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -7,7 +7,7 @@ BR2_CCACHE=y
BR2_CCACHE_DIR="$(TOPDIR)/.$(BR2_BOARD_NAME)-buildroot-ccache"
BR2_STRIP_sstrip=y
BR2_KERNEL_HEADERS_VERSION=y
-BR2_DEFAULT_KERNEL_VERSION="3.18.1"
+BR2_DEFAULT_KERNEL_VERSION="3.18.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.18.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.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.18.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.18.1.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.18.2.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.18.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.18.1.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.18.2.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.18.1.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.18.2.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.1.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.18.1.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.18.2.config
diff --git a/patches/linux/3.18.1 b/patches/linux/3.18.2
similarity index 100%
rename from patches/linux/3.18.1
rename to patches/linux/3.18.2
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2015-01-15 13:05:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3eda3ca1a7d6440c5ca59c940fdb45a36aad79e3 (commit)
via cb6d54e1569c560eecfea4522f920580d26cbe31 (commit)
from e2858fae2090650fee618d52317c492482ec79dd (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 3eda3ca1a7d6440c5ca59c940fdb45a36aad79e3
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jan 15 14:10:10 2015 +0100
[LINUX] 2.6.38: apf51: add pm_power_off function
commit cb6d54e1569c560eecfea4522f920580d26cbe31
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jan 15 14:09:28 2015 +0100
[LINUX] 2.6.38: apf51v2: add button of PMIC MC13892 support
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf51/apf51-linux-2.6.38.config | 1 +
.../455-armadeus-add_mc13892_button_support.patch | 401 ++++++++++++++++++++
.../456-armadeus-add_poweroff_function.patch | 34 ++
3 files changed, 436 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/2.6.38/455-armadeus-add_mc13892_button_support.patch
create mode 100644 patches/linux/2.6.38/456-armadeus-add_poweroff_function.patch
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 7155247..6643bc3 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
@@ -123,6 +123,7 @@ CONFIG_KEYBOARD_IMX=m
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_WM831X=y
CONFIG_INPUT_MISC=y
+CONFIG_INPUT_MC13892_PWRBUTTON=m
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_WM831X_ON=y
CONFIG_SERIAL_8250=m
diff --git a/patches/linux/2.6.38/455-armadeus-add_mc13892_button_support.patch b/patches/linux/2.6.38/455-armadeus-add_mc13892_button_support.patch
new file mode 100644
index 0000000..dae9717
--- /dev/null
+++ b/patches/linux/2.6.38/455-armadeus-add_mc13892_button_support.patch
@@ -0,0 +1,401 @@
+Index: linux-2.6.38.8/drivers/input/misc/Kconfig
+===================================================================
+--- linux-2.6.38.8.orig/drivers/input/misc/Kconfig
++++ linux-2.6.38.8/drivers/input/misc/Kconfig
+@@ -100,6 +100,16 @@ config INPUT_MAX8925_ONKEY
+ To compile this driver as a module, choose M here: the module
+ will be called max8925_onkey.
+
++config INPUT_MC13892_PWRBUTTON
++ tristate "MC13892 ON buttons"
++ depends on MFD_MC13XXX
++ help
++ Support the ON buttons of MC13892 PMIC as an input device
++ reporting power button status.
++
++ To compile this driver as a module, choose M here: the module
++ will be called mc13892-pwrbutton.
++
+ config INPUT_APANEL
+ tristate "Fujitsu Lifebook Application Panel buttons"
+ depends on X86 && I2C && LEDS_CLASS
+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
+@@ -696,6 +696,11 @@ static int mc13xxx_probe(struct i2c_clie
+ if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+ return -EINVAL;
+
++ if (!pdata) {
++ dev_err(&i2c->dev, "invalid platform data\n");
++ return -EINVAL;
++ }
++
+ mc13xxx = kzalloc(sizeof(*mc13xxx), GFP_KERNEL);
+ if (!mc13xxx)
+ return -ENOMEM;
+@@ -775,6 +780,10 @@ err_revision:
+ if (pdata->flags & MC13XXX_USE_GPO)
+ mc13xxx_add_subdevice(mc13xxx, "%s-gpio");
+
++ if (pdata->buttons)
++ mc13xxx_add_subdevice_pdata(mc13xxx, "%s-pwrbutton",
++ pdata->buttons, sizeof(*pdata->buttons));
++
+ return 0;
+ }
+
+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
+@@ -54,6 +54,9 @@ int mc13xxx_adc_do_conversion(struct mc1
+ #define MC13XXX_IRQ_LOBATH 14
+ #define MC13XXX_IRQ_1HZ 24
+ #define MC13XXX_IRQ_TODA 25
++#define MC13XXX_IRQ_PWR0N3 26
++#define MC13XXX_IRQ_PWR0N1 27
++#define MC13XXX_IRQ_PWR0N2 28
+ #define MC13XXX_IRQ_SYSRST 30
+ #define MC13XXX_IRQ_RTCRST 31
+ #define MC13XXX_IRQ_PC 32
+@@ -153,6 +156,21 @@ struct mc13xxx_ts_platform_data {
+ bool atox;
+ };
+
++struct mc13xxx_buttons_platform_data {
++#define MC13XXX_BUTTON_DBNC_0MS 0
++#define MC13XXX_BUTTON_DBNC_30MS 1
++#define MC13XXX_BUTTON_DBNC_150MS 2
++#define MC13XXX_BUTTON_DBNC_750MS 3
++#define MC13XXX_BUTTON_ENABLE (1 << 2)
++#define MC13XXX_BUTTON_POL_INVERT (1 << 3)
++ int b1on_flags;
++ unsigned short b1on_key;
++ int b2on_flags;
++ unsigned short b2on_key;
++ int b3on_flags;
++ unsigned short b3on_key;
++};
++
+ struct mc13xxx_platform_data {
+ #define MC13XXX_USE_TOUCHSCREEN (1 << 0)
+ #define MC13XXX_USE_CODEC (1 << 1)
+@@ -167,6 +185,7 @@ struct mc13xxx_platform_data {
+ struct mc13xxx_regulator_init_data *regulators;
+ struct mc13xxx_leds_platform_data *leds;
+ struct mc13xxx_ts_platform_data touch;
++ struct mc13xxx_buttons_platform_data *buttons;
+ };
+
+ #define MC13XXX_ADC_MODE_TS 1
+Index: linux-2.6.38.8/drivers/input/misc/Makefile
+===================================================================
+--- linux-2.6.38.8.orig/drivers/input/misc/Makefile
++++ linux-2.6.38.8/drivers/input/misc/Makefile
+@@ -27,6 +27,7 @@ obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp
+ obj-$(CONFIG_INPUT_KEYSPAN_REMOTE) += keyspan_remote.o
+ obj-$(CONFIG_INPUT_M68K_BEEP) += m68kspkr.o
+ obj-$(CONFIG_INPUT_MAX8925_ONKEY) += max8925_onkey.o
++obj-$(CONFIG_INPUT_MC13892_PWRBUTTON) += mc13892-pwrbutton.o
+ obj-$(CONFIG_INPUT_PCAP) += pcap_keys.o
+ obj-$(CONFIG_INPUT_PCF50633_PMU) += pcf50633-input.o
+ obj-$(CONFIG_INPUT_PCF8574) += pcf8574_keypad.o
+Index: linux-2.6.38.8/drivers/input/misc/mc13892-pwrbutton.c
+===================================================================
+--- /dev/null
++++ linux-2.6.38.8/drivers/input/misc/mc13892-pwrbutton.c
+@@ -0,0 +1,273 @@
++/**
++ * Copyright (C) 2015 Sébastien Szymanski
++ *
++ * Based on mc13783-pwrbutton.c driver by:
++ * Philippe Rétornaz
++ *
++ * Based on twl4030-pwrbutton driver by:
++ * Peter De Schrijver <pet...@no...>
++ * Felipe Balbi <fel...@no...>
++ *
++ * This file is subject to the terms and conditions of the GNU General
++ * Public License. See the file "COPYING" in the main directory of this
++ * archive for more details.
++ *
++ * 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., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
++ */
++
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/errno.h>
++#include <linux/input.h>
++#include <linux/interrupt.h>
++#include <linux/platform_device.h>
++#include <linux/mfd/mc13783.h>
++#include <linux/sched.h>
++#include <linux/slab.h>
++
++struct mc13892_pwrb {
++ struct input_dev *pwr;
++ struct mc13xxx *mc13xxx;
++#define MC13892_PWRB_B1_POL_INVERT (1 << 0)
++#define MC13892_PWRB_B2_POL_INVERT (1 << 1)
++#define MC13892_PWRB_B3_POL_INVERT (1 << 2)
++ int flags;
++ unsigned short keymap[3];
++};
++
++#define MC13892_REG_INTERRUPT_SENSE_1 5
++#define MC13892_IRQSENSE1_PWRON3S (1 << 2)
++#define MC13892_IRQSENSE1_PWRON1S (1 << 3)
++#define MC13892_IRQSENSE1_PWRON2S (1 << 4)
++
++#define MC13892_REG_POWER_CONTROL_2 15
++#define MC13892_POWER_CONTROL_2_ON1BDBNC 4
++#define MC13892_POWER_CONTROL_2_ON2BDBNC 6
++#define MC13892_POWER_CONTROL_2_ON3BDBNC 8
++
++static irqreturn_t button_irq(int irq, void *_priv)
++{
++ struct mc13892_pwrb *priv = _priv;
++ int val;
++
++ mc13xxx_irq_ack(priv->mc13xxx, irq);
++ mc13xxx_reg_read(priv->mc13xxx, MC13892_REG_INTERRUPT_SENSE_1, &val);
++
++ switch (irq) {
++ case MC13XXX_IRQ_PWR0N1:
++ val = val & MC13892_IRQSENSE1_PWRON1S ? 1 : 0;
++ if (priv->flags & MC13892_PWRB_B1_POL_INVERT)
++ val ^= 1;
++ input_report_key(priv->pwr, priv->keymap[0], val);
++ break;
++
++ case MC13XXX_IRQ_PWR0N2:
++ val = val & MC13892_IRQSENSE1_PWRON2S ? 1 : 0;
++ if (priv->flags & MC13892_PWRB_B2_POL_INVERT)
++ val ^= 1;
++ input_report_key(priv->pwr, priv->keymap[1], val);
++ break;
++
++ case MC13XXX_IRQ_PWR0N3:
++ val = val & MC13892_IRQSENSE1_PWRON3S ? 1 : 0;
++ if (priv->flags & MC13892_PWRB_B3_POL_INVERT)
++ val ^= 1;
++ input_report_key(priv->pwr, priv->keymap[2], val);
++ break;
++ }
++
++ input_sync(priv->pwr);
++
++ return IRQ_HANDLED;
++}
++
++static int __devinit mc13892_pwrbutton_probe(struct platform_device *pdev)
++{
++ const struct mc13xxx_buttons_platform_data *pdata;
++ struct mc13xxx *mc13xxx = dev_get_drvdata(pdev->dev.parent);
++ struct input_dev *pwr;
++ struct mc13892_pwrb *priv;
++ int err = 0;
++ int reg = 0;
++
++ pdata = dev_get_platdata(&pdev->dev);
++ if (!pdata) {
++ dev_err(&pdev->dev, "missing platform data\n");
++ return -ENODEV;
++ }
++
++ pwr = input_allocate_device();
++ if (!pwr) {
++ dev_dbg(&pdev->dev, "Can't allocate power button\n");
++ return -ENOMEM;
++ }
++
++ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
++ if (!priv) {
++ err = -ENOMEM;
++ dev_dbg(&pdev->dev, "Can't allocate power button\n");
++ goto free_input_dev;
++ }
++
++ reg |= (pdata->b1on_flags & 0x3) << MC13892_POWER_CONTROL_2_ON1BDBNC;
++ reg |= (pdata->b2on_flags & 0x3) << MC13892_POWER_CONTROL_2_ON2BDBNC;
++ reg |= (pdata->b3on_flags & 0x3) << MC13892_POWER_CONTROL_2_ON3BDBNC;
++
++ priv->pwr = pwr;
++ priv->mc13xxx = mc13xxx;
++
++ mc13xxx_lock(mc13xxx);
++
++ if (pdata->b1on_flags & MC13XXX_BUTTON_ENABLE) {
++ priv->keymap[0] = pdata->b1on_key;
++ if (pdata->b1on_key != KEY_RESERVED)
++ __set_bit(pdata->b1on_key, pwr->keybit);
++
++ if (pdata->b1on_flags & MC13XXX_BUTTON_POL_INVERT)
++ priv->flags |= MC13892_PWRB_B1_POL_INVERT;
++
++ err = mc13xxx_irq_request(mc13xxx, MC13XXX_IRQ_PWR0N1,
++ button_irq, "b1on", priv);
++ if (err) {
++ dev_dbg(&pdev->dev, "Can't request irq\n");
++ goto free_priv;
++ }
++ }
++
++ if (pdata->b2on_flags & MC13XXX_BUTTON_ENABLE) {
++ priv->keymap[1] = pdata->b2on_key;
++ if (pdata->b2on_key != KEY_RESERVED)
++ __set_bit(pdata->b2on_key, pwr->keybit);
++
++ if (pdata->b2on_flags & MC13XXX_BUTTON_POL_INVERT)
++ priv->flags |= MC13892_PWRB_B2_POL_INVERT;
++
++ err = mc13xxx_irq_request(mc13xxx, MC13XXX_IRQ_PWR0N2,
++ button_irq, "b2on", priv);
++ if (err) {
++ dev_dbg(&pdev->dev, "Can't request irq\n");
++ goto free_irq_b1;
++ }
++ }
++
++ if (pdata->b3on_flags & MC13XXX_BUTTON_ENABLE) {
++ priv->keymap[2] = pdata->b3on_key;
++ if (pdata->b3on_key != KEY_RESERVED)
++ __set_bit(pdata->b3on_key, pwr->keybit);
++
++ if (pdata->b3on_flags & MC13XXX_BUTTON_POL_INVERT)
++ priv->flags |= MC13892_PWRB_B3_POL_INVERT;
++
++ err = mc13xxx_irq_request(mc13xxx, MC13XXX_IRQ_PWR0N3,
++ button_irq, "b3on", priv);
++ if (err) {
++ dev_dbg(&pdev->dev, "Can't request irq: %d\n", err);
++ goto free_irq_b2;
++ }
++ }
++
++ mc13xxx_reg_rmw(mc13xxx, MC13892_REG_POWER_CONTROL_2, 0x3F0, reg);
++
++ mc13xxx_unlock(mc13xxx);
++
++ pwr->name = "mc13892_pwrbutton";
++ pwr->phys = "mc13892_pwrbutton/input0";
++ pwr->dev.parent = &pdev->dev;
++
++ pwr->keycode = priv->keymap;
++ pwr->keycodemax = ARRAY_SIZE(priv->keymap);
++ pwr->keycodesize = sizeof(priv->keymap[0]);
++ __set_bit(EV_KEY, pwr->evbit);
++
++ err = input_register_device(pwr);
++ if (err) {
++ dev_dbg(&pdev->dev, "Can't register power button: %d\n", err);
++ goto free_irq;
++ }
++
++ platform_set_drvdata(pdev, priv);
++
++ return 0;
++
++free_irq:
++ mc13xxx_lock(mc13xxx);
++
++ if (pdata->b3on_flags & MC13XXX_BUTTON_ENABLE)
++ mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_PWR0N3, priv);
++
++free_irq_b2:
++ if (pdata->b2on_flags & MC13XXX_BUTTON_ENABLE)
++ mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_PWR0N2, priv);
++
++free_irq_b1:
++ if (pdata->b1on_flags & MC13XXX_BUTTON_ENABLE)
++ mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_PWR0N1, priv);
++
++free_priv:
++ mc13xxx_unlock(mc13xxx);
++ kfree(priv);
++
++free_input_dev:
++ input_free_device(pwr);
++
++ return err;
++}
++
++static int __devexit mc13892_pwrbutton_remove(struct platform_device *pdev)
++{
++ struct mc13892_pwrb *priv = platform_get_drvdata(pdev);
++ const struct mc13xxx_buttons_platform_data *pdata;
++
++ pdata = dev_get_platdata(&pdev->dev);
++
++ mc13xxx_lock(priv->mc13xxx);
++
++ if (pdata->b3on_flags & MC13XXX_BUTTON_ENABLE)
++ mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_PWR0N3, priv);
++ if (pdata->b2on_flags & MC13XXX_BUTTON_ENABLE)
++ mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_PWR0N2, priv);
++ if (pdata->b1on_flags & MC13XXX_BUTTON_ENABLE)
++ mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_PWR0N1, priv);
++
++ mc13xxx_unlock(priv->mc13xxx);
++
++ input_unregister_device(priv->pwr);
++ kfree(priv);
++ platform_set_drvdata(pdev, NULL);
++
++ return 0;
++}
++
++struct platform_driver mc13892_pwrbutton_driver = {
++ .probe = mc13892_pwrbutton_probe,
++ .remove = __devexit_p(mc13892_pwrbutton_remove),
++ .driver = {
++ .name = "mc13892-pwrbutton",
++ .owner = THIS_MODULE,
++ },
++};
++
++static int __init mc13892_pwrbutton_init(void)
++{
++ return platform_driver_register(&mc13892_pwrbutton_driver);
++}
++module_init(mc13892_pwrbutton_init);
++
++static void __exit mc13892_pwrbutton_exit(void)
++{
++ platform_driver_unregister(&mc13892_pwrbutton_driver);
++}
++module_exit(mc13892_pwrbutton_exit);
++
++MODULE_ALIAS("platform:mc13892-pwrbutton");
++MODULE_DESCRIPTION("MC13892 Power Button");
++MODULE_LICENSE("GPL v2");
++MODULE_AUTHOR("Sébastien Szymanski");
+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
+@@ -400,8 +400,14 @@ static struct i2c_board_info apf51_i2c1_
+ },
+ };
+
++static struct mc13xxx_buttons_platform_data mc13xxx_buttons_pdata = {
++ .b3on_flags = MC13XXX_BUTTON_ENABLE | MC13XXX_BUTTON_POL_INVERT,
++ .b3on_key = 116, /* KEY_POWER */
++};
++
+ static struct mc13xxx_platform_data apf51_mc13xxx_pdata = {
+ .flags = MC13XXX_USE_RTC | MC13XXX_USE_GPO | MC13XXX_USE_ADC,
++ .buttons = &mc13xxx_buttons_pdata,
+ };
+
+ static struct i2c_board_info apf51v2_i2c1_devices[] __initdata = {
diff --git a/patches/linux/2.6.38/456-armadeus-add_poweroff_function.patch b/patches/linux/2.6.38/456-armadeus-add_poweroff_function.patch
new file mode 100644
index 0000000..41a2ced
--- /dev/null
+++ b/patches/linux/2.6.38/456-armadeus-add_poweroff_function.patch
@@ -0,0 +1,34 @@
+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
+@@ -132,6 +132,8 @@ static iomux_v3_cfg_t apf51_pads[] = {
+ MX51_PAD_CSI2_D13__GPIO4_10, /* CONFIG_SYS_FPGA_DONE */
+ MX51_PAD_DISPB2_SER_DIO__GPIO3_6, /* CONFIG_SYS_FPGA_SUSPEND */
+ (_MX51_PAD_GPIO1_5__GPIO1_5 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)), /* CLK0 as gpio */
++
++ MX51_PAD_DISPB2_SER_RS__GPIO3_8, /* PMIC OFF */
+ };
+
+
+@@ -458,12 +460,20 @@ static int apf51_fpga_init(void)
+ }
+
+ #define APF51_VERSION_GPIO (2*32 + 12) /* GPIO3_12 */
++#define APF51_PMIC_OFF_GPIO (2*32 + 8) /* GPIO3_8 */
++
++static void apf51_power_off(void) {
++ gpio_request(APF51_PMIC_OFF_GPIO, "apf51-pmic-off-gpio");
++ gpio_direction_output(APF51_PMIC_OFF_GPIO, 0);
++}
+
+ /*
+ * Board specific initialization.
+ */
+ static void __init apf51_board_init(void)
+ {
++ pm_power_off = apf51_power_off;
++
+ #if defined(CONFIG_CPU_FREQ_IMX)
+ get_cpu_op = mx51_get_cpu_op;
+ #endif
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2015-01-15 09:13:02
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via e2858fae2090650fee618d52317c492482ec79dd (commit)
from e47b8b607e18a32400d8745a7fd70d1251bcc294 (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 e2858fae2090650fee618d52317c492482ec79dd
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jan 15 10:16:18 2015 +0100
[LINUX] 2.6.38: apf51v2: add ADC of MC13892 PMIC support
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf51/apf51-linux-2.6.38.config | 1 +
.../454-armadeus-add-mc13892_adc_support.patch | 987 ++++++++++++++++++++
2 files changed, 988 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/2.6.38/454-armadeus-add-mc13892_adc_support.patch
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 08f87b7..7155247 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
@@ -145,6 +145,7 @@ CONFIG_WM831X_POWER=m
CONFIG_HWMON=m
CONFIG_SENSORS_AS1531=m
CONFIG_SENSORS_WM831X=m
+CONFIG_SENSORS_MC13783_ADC=m
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_WM831X_WATCHDOG=m
diff --git a/patches/linux/2.6.38/454-armadeus-add-mc13892_adc_support.patch b/patches/linux/2.6.38/454-armadeus-add-mc13892_adc_support.patch
new file mode 100644
index 0000000..d8f56ec
--- /dev/null
+++ b/patches/linux/2.6.38/454-armadeus-add-mc13892_adc_support.patch
@@ -0,0 +1,987 @@
+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
+@@ -33,20 +33,10 @@ struct mc13xxx {
+
+ irq_handler_t irqhandler[MC13XXX_NUM_IRQ];
+ void *irqdata[MC13XXX_NUM_IRQ];
+-};
+-
+-struct mc13783 {
+- struct mc13xxx mc13xxx;
+
+ int adcflags;
+ };
+
+-struct mc13xxx *mc13783_to_mc13xxx(struct mc13783 *mc13783)
+-{
+- return &mc13783->mc13xxx;
+-}
+-EXPORT_SYMBOL(mc13783_to_mc13xxx);
+-
+ #define MC13XXX_IRQSTAT0 0
+ #define MC13XXX_IRQSTAT0_ADCDONEI (1 << 0)
+ #define MC13XXX_IRQSTAT0_ADCBISDONEI (1 << 1)
+@@ -146,14 +136,14 @@ EXPORT_SYMBOL(mc13783_to_mc13xxx);
+ #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 MC13XXX_ADC1 44
++#define MC13XXX_ADC1_ADEN (1 << 0)
++#define MC13XXX_ADC1_RAND (1 << 1)
++#define MC13XXX_ADC1_ADSEL (1 << 3)
++#define MC13XXX_ADC1_ASC (1 << 20)
++#define MC13XXX_ADC1_ADTRIGIGN (1 << 21)
+
+-#define MC13783_ADC2 45
++#define MC13XXX_ADC2 45
+
+ #define MC13XXX_ADC3 46
+
+@@ -468,7 +458,7 @@ static irqreturn_t mc13xxx_irq_thread(in
+ return IRQ_RETVAL(handled);
+ }
+
+-const char *mc13xxx_chipname[] = {
++static const char *mc13xxx_chipname[] = {
+ [MC13XXX_ID_MC13783] = "mc13783",
+ [MC13XXX_ID_MC13892] = "mc13892",
+ };
+@@ -533,8 +523,6 @@ static const char *mc13xxx_get_chipname(
+ return mc13xxx_chipname[devid];
+ }
+
+-#include <linux/mfd/mc13783.h>
+-
+ int mc13xxx_get_flags(struct mc13xxx *mc13xxx)
+ {
+ struct mc13xxx_platform_data *pdata =
+@@ -544,15 +532,17 @@ int mc13xxx_get_flags(struct mc13xxx *mc
+ }
+ EXPORT_SYMBOL(mc13xxx_get_flags);
+
+-#define MC13783_ADC1_CHAN0_SHIFT 5
+-#define MC13783_ADC1_CHAN1_SHIFT 8
++#define MC13XXX_ADC1_CHAN0_SHIFT 5
++#define MC13XXX_ADC1_CHAN1_SHIFT 8
++#define MC13783_ADC1_ATO_SHIFT 11
++#define MC13783_ADC1_ATOX (1 << 19)
+
+ struct mc13xxx_adcdone_data {
+ struct mc13xxx *mc13xxx;
+ struct completion done;
+ };
+
+-static irqreturn_t mc13783_handler_adcdone(int irq, void *data)
++static irqreturn_t mc13xxx_handler_adcdone(int irq, void *data)
+ {
+ struct mc13xxx_adcdone_data *adcdone_data = data;
+
+@@ -563,12 +553,12 @@ static irqreturn_t mc13783_handler_adcdo
+ return IRQ_HANDLED;
+ }
+
+-#define MC13783_ADC_WORKING (1 << 0)
++#define MC13XXX_ADC_WORKING (1 << 0)
+
+-int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
+- unsigned int channel, unsigned int *sample)
++int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode,
++ unsigned int channel, u8 ato, bool atox,
++ unsigned int *sample)
+ {
+- struct mc13xxx *mc13xxx = &mc13783->mc13xxx;
+ u32 adc0, adc1, old_adc0;
+ int i, ret;
+ struct mc13xxx_adcdone_data adcdone_data = {
+@@ -580,51 +570,55 @@ int mc13783_adc_do_conversion(struct mc1
+
+ mc13xxx_lock(mc13xxx);
+
+- if (mc13783->adcflags & MC13783_ADC_WORKING) {
++ if (mc13xxx->adcflags & MC13XXX_ADC_WORKING) {
+ ret = -EBUSY;
+ goto out;
+ }
+
+- mc13783->adcflags |= MC13783_ADC_WORKING;
++ mc13xxx->adcflags |= MC13XXX_ADC_WORKING;
+
+- mc13xxx_reg_read(mc13xxx, MC13783_ADC0, &old_adc0);
++ mc13xxx_reg_read(mc13xxx, MC13XXX_ADC0, &old_adc0);
+
+- adc0 = MC13783_ADC0_ADINC1 | MC13783_ADC0_ADINC2;
+- adc1 = MC13783_ADC1_ADEN | MC13783_ADC1_ADTRIGIGN | MC13783_ADC1_ASC;
++ adc0 = MC13XXX_ADC0_ADINC1 | MC13XXX_ADC0_ADINC2;
++ adc1 = MC13XXX_ADC1_ADEN | MC13XXX_ADC1_ADTRIGIGN | MC13XXX_ADC1_ASC;
+
+ if (channel > 7)
+- adc1 |= MC13783_ADC1_ADSEL;
++ adc1 |= MC13XXX_ADC1_ADSEL;
+
+ switch (mode) {
+- case MC13783_ADC_MODE_TS:
+- adc0 |= MC13783_ADC0_ADREFEN | MC13783_ADC0_TSMOD0 |
+- MC13783_ADC0_TSMOD1;
+- adc1 |= 4 << MC13783_ADC1_CHAN1_SHIFT;
++ case MC13XXX_ADC_MODE_TS:
++ adc0 |= MC13XXX_ADC0_ADREFEN | MC13XXX_ADC0_TSMOD0 |
++ MC13XXX_ADC0_TSMOD1;
++ adc1 |= 4 << MC13XXX_ADC1_CHAN1_SHIFT;
+ break;
+
+- case MC13783_ADC_MODE_SINGLE_CHAN:
+- adc0 |= old_adc0 & MC13783_ADC0_TSMOD_MASK;
+- adc1 |= (channel & 0x7) << MC13783_ADC1_CHAN0_SHIFT;
+- adc1 |= MC13783_ADC1_RAND;
++ case MC13XXX_ADC_MODE_SINGLE_CHAN:
++ adc0 |= old_adc0 & MC13XXX_ADC0_CONFIG_MASK;
++ adc1 |= (channel & 0x7) << MC13XXX_ADC1_CHAN0_SHIFT;
++ adc1 |= MC13XXX_ADC1_RAND;
+ break;
+
+- case MC13783_ADC_MODE_MULT_CHAN:
+- adc0 |= old_adc0 & MC13783_ADC0_TSMOD_MASK;
+- adc1 |= 4 << MC13783_ADC1_CHAN1_SHIFT;
++ case MC13XXX_ADC_MODE_MULT_CHAN:
++ adc0 |= old_adc0 & MC13XXX_ADC0_CONFIG_MASK;
++ adc1 |= 4 << MC13XXX_ADC1_CHAN1_SHIFT;
+ break;
+
+ default:
+- mc13783_unlock(mc13783);
++ mc13xxx_unlock(mc13xxx);
+ return -EINVAL;
+ }
+
+- 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);
++ adc1 |= ato << MC13783_ADC1_ATO_SHIFT;
++ if (atox)
++ adc1 |= MC13783_ADC1_ATOX;
++
++ dev_dbg(&mc13xxx->client->dev, "%s: request irq\n", __func__);
++ mc13xxx_irq_request(mc13xxx, MC13XXX_IRQ_ADCDONE,
++ mc13xxx_handler_adcdone, __func__, &adcdone_data);
++ mc13xxx_irq_ack(mc13xxx, MC13XXX_IRQ_ADCDONE);
+
+- mc13xxx_reg_write(mc13xxx, MC13783_ADC0, adc0);
+- mc13xxx_reg_write(mc13xxx, MC13783_ADC1, adc1);
++ mc13xxx_reg_write(mc13xxx, MC13XXX_ADC0, adc0);
++ mc13xxx_reg_write(mc13xxx, MC13XXX_ADC1, adc1);
+
+ mc13xxx_unlock(mc13xxx);
+
+@@ -635,27 +629,35 @@ int mc13783_adc_do_conversion(struct mc1
+
+ mc13xxx_lock(mc13xxx);
+
+- mc13xxx_irq_free(mc13xxx, MC13783_IRQ_ADCDONE, &adcdone_data);
++ mc13xxx_irq_free(mc13xxx, MC13XXX_IRQ_ADCDONE, &adcdone_data);
++
++ if (ret > 0) {
++ if (mode == MC13XXX_ADC_MODE_SINGLE_CHAN) {
++ mc13xxx_reg_read(mc13xxx, MC13XXX_ADC1, &adc1);
++ adc1 &= 0xFFFF1F;
++ adc1 |= (4 << MC13XXX_ADC1_CHAN1_SHIFT);
++ mc13xxx_reg_write(mc13xxx, MC13XXX_ADC1, adc1);
++ }
+
+- if (ret > 0)
+ for (i = 0; i < 4; ++i) {
+ ret = mc13xxx_reg_read(mc13xxx,
+- MC13783_ADC2, &sample[i]);
++ MC13XXX_ADC2, &sample[i]);
+ if (ret)
+ break;
+ }
++ }
+
+- if (mode == MC13783_ADC_MODE_TS)
++ if (mode == MC13XXX_ADC_MODE_TS)
+ /* restore TSMOD */
+- mc13xxx_reg_write(mc13xxx, MC13783_ADC0, old_adc0);
++ mc13xxx_reg_write(mc13xxx, MC13XXX_ADC0, old_adc0);
+
+- mc13783->adcflags &= ~MC13783_ADC_WORKING;
++ mc13xxx->adcflags &= ~MC13XXX_ADC_WORKING;
+ out:
+ mc13xxx_unlock(mc13xxx);
+
+ return ret;
+ }
+-EXPORT_SYMBOL_GPL(mc13783_adc_do_conversion);
++EXPORT_SYMBOL_GPL(mc13xxx_adc_do_conversion);
+
+ static int mc13xxx_add_subdevice_pdata(struct mc13xxx *mc13xxx,
+ const char *format, void *pdata, size_t pdata_size)
+@@ -762,7 +764,8 @@ err_revision:
+ mc13xxx_add_subdevice(mc13xxx, "%s-rtc");
+
+ if (pdata->flags & MC13XXX_USE_TOUCHSCREEN)
+- mc13xxx_add_subdevice(mc13xxx, "%s-ts");
++ mc13xxx_add_subdevice_pdata(mc13xxx, "%s-ts",
++ &pdata->touch, sizeof(pdata->touch));
+
+ if (pdata->flags & MC13XXX_USE_LED) {
+ mc13xxx_add_subdevice_pdata(mc13xxx, "%s-led",
+Index: linux-2.6.38.8/include/linux/mfd/mc13783.h
+===================================================================
+--- linux-2.6.38.8.orig/include/linux/mfd/mc13783.h
++++ linux-2.6.38.8/include/linux/mfd/mc13783.h
+@@ -12,117 +12,6 @@
+
+ #include <linux/mfd/mc13xxx.h>
+
+-struct mc13783;
+-
+-struct mc13xxx *mc13783_to_mc13xxx(struct mc13783 *mc13783);
+-
+-static inline void mc13783_lock(struct mc13783 *mc13783)
+-{
+- mc13xxx_lock(mc13783_to_mc13xxx(mc13783));
+-}
+-
+-static inline void mc13783_unlock(struct mc13783 *mc13783)
+-{
+- mc13xxx_unlock(mc13783_to_mc13xxx(mc13783));
+-}
+-
+-static inline int mc13783_reg_read(struct mc13783 *mc13783,
+- unsigned int offset, u32 *val)
+-{
+- return mc13xxx_reg_read(mc13783_to_mc13xxx(mc13783), offset, val);
+-}
+-
+-static inline int mc13783_reg_write(struct mc13783 *mc13783,
+- unsigned int offset, u32 val)
+-{
+- return mc13xxx_reg_write(mc13783_to_mc13xxx(mc13783), offset, val);
+-}
+-
+-static inline int mc13783_reg_rmw(struct mc13783 *mc13783,
+- unsigned int offset, u32 mask, u32 val)
+-{
+- return mc13xxx_reg_rmw(mc13783_to_mc13xxx(mc13783), offset, mask, val);
+-}
+-
+-static inline int mc13783_get_flags(struct mc13783 *mc13783)
+-{
+- return mc13xxx_get_flags(mc13783_to_mc13xxx(mc13783));
+-}
+-
+-static inline int mc13783_irq_request(struct mc13783 *mc13783, int irq,
+- irq_handler_t handler, const char *name, void *dev)
+-{
+- return mc13xxx_irq_request(mc13783_to_mc13xxx(mc13783), irq,
+- handler, name, dev);
+-}
+-
+-static inline int mc13783_irq_request_nounmask(struct mc13783 *mc13783, int irq,
+- irq_handler_t handler, const char *name, void *dev)
+-{
+- return mc13xxx_irq_request_nounmask(mc13783_to_mc13xxx(mc13783), irq,
+- handler, name, dev);
+-}
+-
+-static inline int mc13783_irq_free(struct mc13783 *mc13783, int irq, void *dev)
+-{
+- return mc13xxx_irq_free(mc13783_to_mc13xxx(mc13783), irq, dev);
+-}
+-
+-static inline int mc13783_irq_mask(struct mc13783 *mc13783, int irq)
+-{
+- return mc13xxx_irq_mask(mc13783_to_mc13xxx(mc13783), irq);
+-}
+-
+-static inline int mc13783_irq_unmask(struct mc13783 *mc13783, int irq)
+-{
+- return mc13xxx_irq_unmask(mc13783_to_mc13xxx(mc13783), irq);
+-}
+-static inline int mc13783_irq_status(struct mc13783 *mc13783, int irq,
+- int *enabled, int *pending)
+-{
+- return mc13xxx_irq_status(mc13783_to_mc13xxx(mc13783),
+- irq, enabled, pending);
+-}
+-
+-static inline int mc13783_irq_ack(struct mc13783 *mc13783, int irq)
+-{
+- return mc13xxx_irq_ack(mc13783_to_mc13xxx(mc13783), irq);
+-}
+-
+-#define MC13783_ADC0 43
+-#define MC13783_ADC0_ADREFEN (1 << 10)
+-#define MC13783_ADC0_ADREFMODE (1 << 11)
+-#define MC13783_ADC0_TSMOD0 (1 << 12)
+-#define MC13783_ADC0_TSMOD1 (1 << 13)
+-#define MC13783_ADC0_TSMOD2 (1 << 14)
+-#define MC13783_ADC0_ADINC1 (1 << 16)
+-#define MC13783_ADC0_ADINC2 (1 << 17)
+-
+-#define MC13783_ADC0_TSMOD_MASK (MC13783_ADC0_TSMOD0 | \
+- MC13783_ADC0_TSMOD1 | \
+- MC13783_ADC0_TSMOD2)
+-
+-#define mc13783_regulator_init_data mc13xxx_regulator_init_data
+-#define mc13783_regulator_platform_data mc13xxx_regulator_platform_data
+-#define mc13783_led_platform_data mc13xxx_led_platform_data
+-#define mc13783_leds_platform_data mc13xxx_leds_platform_data
+-
+-#define mc13783_platform_data mc13xxx_platform_data
+-#define MC13783_USE_TOUCHSCREEN MC13XXX_USE_TOUCHSCREEN
+-#define MC13783_USE_CODEC MC13XXX_USE_CODEC
+-#define MC13783_USE_ADC MC13XXX_USE_ADC
+-#define MC13783_USE_RTC MC13XXX_USE_RTC
+-#define MC13783_USE_REGULATOR MC13XXX_USE_REGULATOR
+-#define MC13783_USE_LED MC13XXX_USE_LED
+-
+-#define MC13783_ADC_MODE_TS 1
+-#define MC13783_ADC_MODE_SINGLE_CHAN 2
+-#define MC13783_ADC_MODE_MULT_CHAN 3
+-
+-int mc13783_adc_do_conversion(struct mc13783 *mc13783, unsigned int mode,
+- unsigned int channel, unsigned int *sample);
+-
+-
+ #define MC13783_REG_SW1A 0
+ #define MC13783_REG_SW1B 1
+ #define MC13783_REG_SW2A 2
+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
+@@ -37,6 +37,10 @@ int mc13xxx_irq_ack(struct mc13xxx *mc13
+
+ int mc13xxx_get_flags(struct mc13xxx *mc13xxx);
+
++int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx,
++ unsigned int mode, unsigned int channel,
++ u8 ato, bool atox, unsigned int *sample);
++
+ #define MC13XXX_IRQ_ADCDONE 0
+ #define MC13XXX_IRQ_ADCBISDONE 1
+ #define MC13XXX_IRQ_TS 2
+@@ -137,6 +141,18 @@ struct mc13xxx_leds_platform_data {
+ char tc3_period;
+ };
+
++struct mc13xxx_ts_platform_data {
++ /* Delay between Touchscreen polarization and ADC Conversion.
++ * Given in clock ticks of a 32 kHz clock which gives a granularity of
++ * about 30.5ms */
++ u8 ato;
++
++#define MC13783_TS_ATO_FIRST false
++#define MC13783_TS_ATO_EACH true
++ /* Use the ATO delay only for the first conversion or for each one */
++ bool atox;
++};
++
+ struct mc13xxx_platform_data {
+ #define MC13XXX_USE_TOUCHSCREEN (1 << 0)
+ #define MC13XXX_USE_CODEC (1 << 1)
+@@ -150,6 +166,31 @@ struct mc13xxx_platform_data {
+ int num_regulators;
+ struct mc13xxx_regulator_init_data *regulators;
+ struct mc13xxx_leds_platform_data *leds;
++ struct mc13xxx_ts_platform_data touch;
+ };
+
++#define MC13XXX_ADC_MODE_TS 1
++#define MC13XXX_ADC_MODE_SINGLE_CHAN 2
++#define MC13XXX_ADC_MODE_MULT_CHAN 3
++
++#define MC13XXX_ADC0 43
++#define MC13XXX_ADC0_LICELLCON (1 << 0)
++#define MC13XXX_ADC0_CHRGICON (1 << 1)
++#define MC13XXX_ADC0_BATICON (1 << 2)
++#define MC13XXX_ADC0_ADREFEN (1 << 10)
++#define MC13XXX_ADC0_TSMOD0 (1 << 12)
++#define MC13XXX_ADC0_TSMOD1 (1 << 13)
++#define MC13XXX_ADC0_TSMOD2 (1 << 14)
++#define MC13XXX_ADC0_ADINC1 (1 << 16)
++#define MC13XXX_ADC0_ADINC2 (1 << 17)
++
++#define MC13XXX_ADC0_TSMOD_MASK (MC13XXX_ADC0_TSMOD0 | \
++ MC13XXX_ADC0_TSMOD1 | \
++ MC13XXX_ADC0_TSMOD2)
++
++#define MC13XXX_ADC0_CONFIG_MASK (MC13XXX_ADC0_TSMOD_MASK | \
++ MC13XXX_ADC0_LICELLCON | \
++ MC13XXX_ADC0_CHRGICON | \
++ MC13XXX_ADC0_BATICON)
++
+ #endif /* ifndef __LINUX_MFD_MC13XXX_H */
+Index: linux-2.6.38.8/drivers/input/touchscreen/mc13783_ts.c
+===================================================================
+--- linux-2.6.38.8.orig/drivers/input/touchscreen/mc13783_ts.c
++++ linux-2.6.38.8/drivers/input/touchscreen/mc13783_ts.c
+@@ -35,17 +35,18 @@ MODULE_PARM_DESC(sample_tolerance,
+
+ struct mc13783_ts_priv {
+ struct input_dev *idev;
+- struct mc13783 *mc13783;
++ struct mc13xxx *mc13xxx;
+ struct delayed_work work;
+ struct workqueue_struct *workq;
+ unsigned int sample[4];
++ struct mc13xxx_ts_platform_data *touch;
+ };
+
+ static irqreturn_t mc13783_ts_handler(int irq, void *data)
+ {
+ struct mc13783_ts_priv *priv = data;
+
+- mc13783_irq_ack(priv->mc13783, irq);
++ mc13xxx_irq_ack(priv->mc13xxx, irq);
+
+ /*
+ * Kick off reading coordinates. Note that if work happens already
+@@ -121,11 +122,13 @@ static void mc13783_ts_work(struct work_
+ {
+ struct mc13783_ts_priv *priv =
+ container_of(work, struct mc13783_ts_priv, work.work);
+- unsigned int mode = MC13783_ADC_MODE_TS;
++ unsigned int mode = MC13XXX_ADC_MODE_TS;
+ unsigned int channel = 12;
+
+- if (mc13783_adc_do_conversion(priv->mc13783,
+- mode, channel, priv->sample) == 0)
++ if (mc13xxx_adc_do_conversion(priv->mc13xxx,
++ mode, channel,
++ priv->touch->ato, priv->touch->atox,
++ priv->sample) == 0)
+ mc13783_ts_report_sample(priv);
+ }
+
+@@ -134,21 +137,21 @@ static int mc13783_ts_open(struct input_
+ struct mc13783_ts_priv *priv = input_get_drvdata(dev);
+ int ret;
+
+- mc13783_lock(priv->mc13783);
++ mc13xxx_lock(priv->mc13xxx);
+
+- mc13783_irq_ack(priv->mc13783, MC13783_IRQ_TS);
++ mc13xxx_irq_ack(priv->mc13xxx, MC13XXX_IRQ_TS);
+
+- ret = mc13783_irq_request(priv->mc13783, MC13783_IRQ_TS,
++ ret = mc13xxx_irq_request(priv->mc13xxx, MC13XXX_IRQ_TS,
+ mc13783_ts_handler, MC13783_TS_NAME, priv);
+ if (ret)
+ goto out;
+
+- ret = mc13783_reg_rmw(priv->mc13783, MC13783_ADC0,
+- MC13783_ADC0_TSMOD_MASK, MC13783_ADC0_TSMOD0);
++ ret = mc13xxx_reg_rmw(priv->mc13xxx, MC13XXX_ADC0,
++ MC13XXX_ADC0_TSMOD_MASK, MC13XXX_ADC0_TSMOD0);
+ if (ret)
+- mc13783_irq_free(priv->mc13783, MC13783_IRQ_TS, priv);
++ mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TS, priv);
+ out:
+- mc13783_unlock(priv->mc13783);
++ mc13xxx_unlock(priv->mc13xxx);
+ return ret;
+ }
+
+@@ -156,11 +159,11 @@ static void mc13783_ts_close(struct inpu
+ {
+ struct mc13783_ts_priv *priv = input_get_drvdata(dev);
+
+- mc13783_lock(priv->mc13783);
+- mc13783_reg_rmw(priv->mc13783, MC13783_ADC0,
+- MC13783_ADC0_TSMOD_MASK, 0);
+- mc13783_irq_free(priv->mc13783, MC13783_IRQ_TS, priv);
+- mc13783_unlock(priv->mc13783);
++ mc13xxx_lock(priv->mc13xxx);
++ mc13xxx_reg_rmw(priv->mc13xxx, MC13XXX_ADC0,
++ MC13XXX_ADC0_TSMOD_MASK, 0);
++ mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TS, priv);
++ mc13xxx_unlock(priv->mc13xxx);
+
+ cancel_delayed_work_sync(&priv->work);
+ }
+@@ -177,8 +180,14 @@ static int __init mc13783_ts_probe(struc
+ goto err_free_mem;
+
+ INIT_DELAYED_WORK(&priv->work, mc13783_ts_work);
+- priv->mc13783 = dev_get_drvdata(pdev->dev.parent);
++ priv->mc13xxx = dev_get_drvdata(pdev->dev.parent);
+ priv->idev = idev;
++ priv->touch = dev_get_platdata(&pdev->dev);
++ if (!priv->touch) {
++ dev_err(&pdev->dev, "missing platform data\n");
++ ret = -ENODEV;
++ goto err_free_mem;
++ }
+
+ /*
+ * We need separate workqueue because mc13783_adc_do_conversion
+Index: linux-2.6.38.8/drivers/hwmon/mc13783-adc.c
+===================================================================
+--- linux-2.6.38.8.orig/drivers/hwmon/mc13783-adc.c
++++ linux-2.6.38.8/drivers/hwmon/mc13783-adc.c
+@@ -1,5 +1,5 @@
+ /*
+- * Driver for the Freescale Semiconductor MC13783 adc.
++ * Driver for the ADC on Freescale Semiconductor MC13783 and MC13892 PMICs.
+ *
+ * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2009 Sascha Hauer, Pengutronix
+@@ -18,7 +18,7 @@
+ * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+-#include <linux/mfd/mc13783.h>
++#include <linux/mfd/mc13xxx.h>
+ #include <linux/platform_device.h>
+ #include <linux/hwmon-sysfs.h>
+ #include <linux/kernel.h>
+@@ -28,38 +28,48 @@
+ #include <linux/init.h>
+ #include <linux/err.h>
+
+-#define MC13783_ADC_NAME "mc13783-adc"
++#define DRIVER_NAME "mc13783-adc"
++
++/* platform device id driver data */
++#define MC13783_ADC_16CHANS 1
++#define MC13783_ADC_BPDIV2 2
+
+ struct mc13783_adc_priv {
+- struct mc13783 *mc13783;
++ struct mc13xxx *mc13xxx;
+ struct device *hwmon_dev;
++ char name[10];
+ };
+
+ static ssize_t mc13783_adc_show_name(struct device *dev, struct device_attribute
+ *devattr, char *buf)
+ {
+- return sprintf(buf, "mc13783_adc\n");
++ struct mc13783_adc_priv *priv = dev_get_drvdata(dev);
++
++ return sprintf(buf, "%s\n", priv->name);
+ }
+
+ static int mc13783_adc_read(struct device *dev,
+ struct device_attribute *devattr, unsigned int *val)
+ {
+- struct platform_device *pdev = to_platform_device(dev);
+- struct mc13783_adc_priv *priv = platform_get_drvdata(pdev);
++ struct mc13783_adc_priv *priv = dev_get_drvdata(dev);
+ struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
+ unsigned int channel = attr->index;
+ unsigned int sample[4];
+- int ret;
++ unsigned int sum;
++ int ret, i;
+
+- ret = mc13783_adc_do_conversion(priv->mc13783,
+- MC13783_ADC_MODE_MULT_CHAN,
+- channel, sample);
++ ret = mc13xxx_adc_do_conversion(priv->mc13xxx,
++ MC13XXX_ADC_MODE_SINGLE_CHAN,
++ channel, 0, 0, sample);
+ if (ret)
+ return ret;
++ sum = 0;
++ for (i = 0; i<4; ++i) {
++ sum += ((sample[i] >> 2) & 0x3ff);
++ sum += ((sample[i] >> 14) & 0x3ff);
++ }
+
+- channel &= 0x7;
+-
+- *val = (sample[channel % 4] >> (channel > 3 ? 14 : 2)) & 0x3ff;
++ *val = DIV_ROUND_CLOSEST(sum, 8);
+
+ return 0;
+ }
+@@ -68,16 +78,21 @@ static ssize_t mc13783_adc_read_bp(struc
+ struct device_attribute *devattr, char *buf)
+ {
+ unsigned val;
++ struct platform_device *pdev = to_platform_device(dev);
++ kernel_ulong_t driver_data = platform_get_device_id(pdev)->driver_data;
+ int ret = mc13783_adc_read(dev, devattr, &val);
+
+ if (ret)
+ return ret;
+
+- /*
+- * BP (channel 2) reports with offset 2.4V to the actual value to fit
+- * the input range of the ADC. unit = 2.25mV = 9/4 mV.
+- */
+- val = DIV_ROUND_CLOSEST(val * 9, 4) + 2400;
++ if (driver_data & MC13783_ADC_BPDIV2)
++ val = DIV_ROUND_CLOSEST(val * 9, 2);
++ else
++ /*
++ * BP (channel 2) reports with offset 2.4V to the actual value
++ * to fit the input range of the ADC. unit = 2.25mV = 9/4 mV.
++ */
++ val = DIV_ROUND_CLOSEST(val * 9, 4) + 2400;
+
+ return sprintf(buf, "%u\n", val);
+ }
+@@ -114,12 +129,21 @@ static SENSOR_DEVICE_ATTR(in13_input, S_
+ static SENSOR_DEVICE_ATTR(in14_input, S_IRUGO, mc13783_adc_read_gp, NULL, 14);
+ static SENSOR_DEVICE_ATTR(in15_input, S_IRUGO, mc13783_adc_read_gp, NULL, 15);
+
+-static struct attribute *mc13783_attr[] = {
++static struct attribute *mc13783_attr_base[] = {
+ &dev_attr_name.attr,
+ &sensor_dev_attr_in2_input.dev_attr.attr,
+ &sensor_dev_attr_in5_input.dev_attr.attr,
+ &sensor_dev_attr_in6_input.dev_attr.attr,
+ &sensor_dev_attr_in7_input.dev_attr.attr,
++ NULL
++};
++
++static const struct attribute_group mc13783_group_base = {
++ .attrs = mc13783_attr_base,
++};
++
++/* these are only used if MC13783_ADC_16CHANS is provided in driver data */
++static struct attribute *mc13783_attr_16chans[] = {
+ &sensor_dev_attr_in8_input.dev_attr.attr,
+ &sensor_dev_attr_in9_input.dev_attr.attr,
+ &sensor_dev_attr_in10_input.dev_attr.attr,
+@@ -127,8 +151,8 @@ static struct attribute *mc13783_attr[]
+ NULL
+ };
+
+-static const struct attribute_group mc13783_group = {
+- .attrs = mc13783_attr,
++static const struct attribute_group mc13783_group_16chans = {
++ .attrs = mc13783_attr_16chans,
+ };
+
+ /* last four channels may be occupied by the touchscreen */
+@@ -147,33 +171,46 @@ static const struct attribute_group mc13
+ static int mc13783_adc_use_touchscreen(struct platform_device *pdev)
+ {
+ struct mc13783_adc_priv *priv = platform_get_drvdata(pdev);
+- unsigned flags = mc13783_get_flags(priv->mc13783);
++ unsigned flags = mc13xxx_get_flags(priv->mc13xxx);
+
+- return flags & MC13783_USE_TOUCHSCREEN;
++ return flags & MC13XXX_USE_TOUCHSCREEN;
+ }
+
+ static int __init mc13783_adc_probe(struct platform_device *pdev)
+ {
+ struct mc13783_adc_priv *priv;
+ int ret;
++ const struct platform_device_id *id = platform_get_device_id(pdev);
++ char *dash;
+
+ priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
+
+- priv->mc13783 = dev_get_drvdata(pdev->dev.parent);
++ priv->mc13xxx = dev_get_drvdata(pdev->dev.parent);
++ snprintf(priv->name, ARRAY_SIZE(priv->name), "%s", id->name);
++ dash = strchr(priv->name, '-');
++ if (dash)
++ *dash = '\0';
+
+ platform_set_drvdata(pdev, priv);
+
+ /* Register sysfs hooks */
+- ret = sysfs_create_group(&pdev->dev.kobj, &mc13783_group);
++ ret = sysfs_create_group(&pdev->dev.kobj, &mc13783_group_base);
+ if (ret)
+- goto out_err_create1;
++ goto out_err_create_base;
++
++ if (id->driver_data & MC13783_ADC_16CHANS) {
++ ret = sysfs_create_group(&pdev->dev.kobj,
++ &mc13783_group_16chans);
++ if (ret)
++ goto out_err_create_16chans;
++ }
+
+ if (!mc13783_adc_use_touchscreen(pdev)) {
+ ret = sysfs_create_group(&pdev->dev.kobj, &mc13783_group_ts);
+ if (ret)
+- goto out_err_create2;
++ goto out_err_create_ts;
+ }
+
+ priv->hwmon_dev = hwmon_device_register(&pdev->dev);
+@@ -184,17 +221,20 @@ static int __init mc13783_adc_probe(stru
+ goto out_err_register;
+ }
+
+-
+ return 0;
+
+ out_err_register:
+
+ if (!mc13783_adc_use_touchscreen(pdev))
+ sysfs_remove_group(&pdev->dev.kobj, &mc13783_group_ts);
+-out_err_create2:
++out_err_create_ts:
++
++ if (id->driver_data & MC13783_ADC_16CHANS)
++ sysfs_remove_group(&pdev->dev.kobj, &mc13783_group_16chans);
++out_err_create_16chans:
+
+- sysfs_remove_group(&pdev->dev.kobj, &mc13783_group);
+-out_err_create1:
++ sysfs_remove_group(&pdev->dev.kobj, &mc13783_group_base);
++out_err_create_base:
+
+ platform_set_drvdata(pdev, NULL);
+ kfree(priv);
+@@ -205,13 +245,17 @@ out_err_create1:
+ static int __devexit mc13783_adc_remove(struct platform_device *pdev)
+ {
+ struct mc13783_adc_priv *priv = platform_get_drvdata(pdev);
++ kernel_ulong_t driver_data = platform_get_device_id(pdev)->driver_data;
+
+ hwmon_device_unregister(priv->hwmon_dev);
+
+ if (!mc13783_adc_use_touchscreen(pdev))
+ sysfs_remove_group(&pdev->dev.kobj, &mc13783_group_ts);
+
+- sysfs_remove_group(&pdev->dev.kobj, &mc13783_group);
++ if (driver_data & MC13783_ADC_16CHANS)
++ sysfs_remove_group(&pdev->dev.kobj, &mc13783_group_16chans);
++
++ sysfs_remove_group(&pdev->dev.kobj, &mc13783_group_base);
+
+ platform_set_drvdata(pdev, NULL);
+ kfree(priv);
+@@ -219,12 +263,26 @@ static int __devexit mc13783_adc_remove(
+ return 0;
+ }
+
++static const struct platform_device_id mc13783_adc_idtable[] = {
++ {
++ .name = "mc13783-adc",
++ .driver_data = MC13783_ADC_16CHANS,
++ }, {
++ .name = "mc13892-adc",
++ .driver_data = MC13783_ADC_BPDIV2,
++ }, {
++ /* sentinel */
++ }
++};
++MODULE_DEVICE_TABLE(platform, mc13783_adc_idtable);
++
+ static struct platform_driver mc13783_adc_driver = {
+ .remove = __devexit_p(mc13783_adc_remove),
+ .driver = {
+ .owner = THIS_MODULE,
+- .name = MC13783_ADC_NAME,
++ .name = DRIVER_NAME,
+ },
++ .id_table = mc13783_adc_idtable,
+ };
+
+ static int __init mc13783_adc_init(void)
+@@ -243,4 +301,3 @@ module_exit(mc13783_adc_exit);
+ MODULE_DESCRIPTION("MC13783 ADC driver");
+ MODULE_AUTHOR("Luotao Fu <l....@pe...>");
+ MODULE_LICENSE("GPL");
+-MODULE_ALIAS("platform:" MC13783_ADC_NAME);
+Index: linux-2.6.38.8/drivers/leds/leds-mc13783.c
+===================================================================
+--- linux-2.6.38.8.orig/drivers/leds/leds-mc13783.c
++++ linux-2.6.38.8/drivers/leds/leds-mc13783.c
+@@ -21,13 +21,13 @@
+ #include <linux/platform_device.h>
+ #include <linux/leds.h>
+ #include <linux/workqueue.h>
+-#include <linux/mfd/mc13783.h>
++#include <linux/mfd/mc13xxx.h>
+ #include <linux/slab.h>
+
+ struct mc13783_led {
+ struct led_classdev cdev;
+ struct work_struct work;
+- struct mc13783 *master;
++ struct mc13xxx *master;
+ enum led_brightness new_brightness;
+ int id;
+ };
+@@ -111,11 +111,11 @@ static void mc13783_led_work(struct work
+ break;
+ }
+
+- mc13783_lock(led->master);
++ mc13xxx_lock(led->master);
+
+- mc13783_reg_rmw(led->master, reg, mask, value);
++ mc13xxx_reg_rmw(led->master, reg, mask, value);
+
+- mc13783_unlock(led->master);
++ mc13xxx_unlock(led->master);
+ }
+
+ static void mc13783_led_set(struct led_classdev *led_cdev,
+@@ -172,23 +172,23 @@ static int __devinit mc13783_led_setup(s
+ break;
+ }
+
+- mc13783_lock(led->master);
++ mc13xxx_lock(led->master);
+
+- ret = mc13783_reg_rmw(led->master, reg, mask << shift,
++ ret = mc13xxx_reg_rmw(led->master, reg, mask << shift,
+ value << shift);
+
+- mc13783_unlock(led->master);
++ mc13xxx_unlock(led->master);
+ return ret;
+ }
+
+ static int __devinit mc13783_leds_prepare(struct platform_device *pdev)
+ {
+ struct mc13783_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
+- struct mc13783 *dev = dev_get_drvdata(pdev->dev.parent);
++ struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
+ int ret = 0;
+ int reg = 0;
+
+- mc13783_lock(dev);
++ mc13xxx_lock(dev);
+
+ if (pdata->flags & MC13783_LED_TC1HALF)
+ reg |= MC13783_LED_C1_TC1HALF_BIT;
+@@ -196,7 +196,7 @@ static int __devinit mc13783_leds_prepar
+ if (pdata->flags & MC13783_LED_SLEWLIMTC)
+ reg |= MC13783_LED_Cx_SLEWLIM_BIT;
+
+- ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_1, reg);
++ ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_1, reg);
+ if (ret)
+ goto out;
+
+@@ -206,7 +206,7 @@ static int __devinit mc13783_leds_prepar
+ if (pdata->flags & MC13783_LED_SLEWLIMBL)
+ reg |= MC13783_LED_Cx_SLEWLIM_BIT;
+
+- ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_2, reg);
++ ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_2, reg);
+ if (ret)
+ goto out;
+
+@@ -216,7 +216,7 @@ static int __devinit mc13783_leds_prepar
+ if (pdata->flags & MC13783_LED_TRIODE_TC1)
+ reg |= MC13783_LED_Cx_TRIODE_TC_BIT;
+
+- ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_3, reg);
++ ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_3, reg);
+ if (ret)
+ goto out;
+
+@@ -226,7 +226,7 @@ static int __devinit mc13783_leds_prepar
+ if (pdata->flags & MC13783_LED_TRIODE_TC2)
+ reg |= MC13783_LED_Cx_TRIODE_TC_BIT;
+
+- ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_4, reg);
++ ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_4, reg);
+ if (ret)
+ goto out;
+
+@@ -236,7 +236,7 @@ static int __devinit mc13783_leds_prepar
+ if (pdata->flags & MC13783_LED_TRIODE_TC3)
+ reg |= MC13783_LED_Cx_TRIODE_TC_BIT;;
+
+- ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg);
++ ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_5, reg);
+ if (ret)
+ goto out;
+
+@@ -255,10 +255,10 @@ static int __devinit mc13783_leds_prepar
+ reg |= (pdata->abref & MC13783_LED_C0_ABREF_MASK) <<
+ MC13783_LED_C0_ABREF;
+
+- ret = mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_0, reg);
++ ret = mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_0, reg);
+
+ out:
+- mc13783_unlock(dev);
++ mc13xxx_unlock(dev);
+ return ret;
+ }
+
+@@ -353,7 +353,7 @@ static int __devexit mc13783_led_remove(
+ {
+ struct mc13783_leds_platform_data *pdata = dev_get_platdata(&pdev->dev);
+ struct mc13783_led *led = platform_get_drvdata(pdev);
+- struct mc13783 *dev = dev_get_drvdata(pdev->dev.parent);
++ struct mc13xxx *dev = dev_get_drvdata(pdev->dev.parent);
+ int i;
+
+ for (i = 0; i < pdata->num_leds; i++) {
+@@ -361,16 +361,16 @@ static int __devexit mc13783_led_remove(
+ cancel_work_sync(&led[i].work);
+ }
+
+- mc13783_lock(dev);
++ mc13xxx_lock(dev);
+
+- mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_0, 0);
+- mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_1, 0);
+- mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_2, 0);
+- mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_3, 0);
+- mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_4, 0);
+- mc13783_reg_write(dev, MC13783_REG_LED_CONTROL_5, 0);
++ mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_0, 0);
++ mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_1, 0);
++ mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_2, 0);
++ mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_3, 0);
++ mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_4, 0);
++ mc13xxx_reg_write(dev, MC13783_REG_LED_CONTROL_5, 0);
+
+- mc13783_unlock(dev);
++ mc13xxx_unlock(dev);
+
+ kfree(led);
+ return 0;
+Index: linux-2.6.38.8/drivers/hwmon/Kconfig
+===================================================================
+--- linux-2.6.38.8.orig/drivers/hwmon/Kconfig
++++ linux-2.6.38.8/drivers/hwmon/Kconfig
+@@ -1195,10 +1195,10 @@ config SENSORS_APPLESMC
+ the awesome power of applesmc.
+
+ config SENSORS_MC13783_ADC
+- tristate "Freescale MC13783 ADC"
+- depends on MFD_MC13783
++ tristate "Freescale MC13783/MC13892 ADC"
++ depends on MFD_MC13XXX
+ help
+- Support for the A/D converter on MC13783 PMIC.
++ Support for the A/D converter on MC13783 and MC13892 PMIC.
+
+ if ACPI
+
+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
+@@ -401,7 +401,7 @@ static struct i2c_board_info apf51_i2c1_
+ };
+
+ static struct mc13xxx_platform_data apf51_mc13xxx_pdata = {
+- .flags = MC13XXX_USE_RTC | MC13XXX_USE_GPO,
++ .flags = MC13XXX_USE_RTC | MC13XXX_USE_GPO | MC13XXX_USE_ADC,
+ };
+
+ static struct i2c_board_info apf51v2_i2c1_devices[] __initdata = {
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2015-01-06 09:47: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 5a86dfa470425462a123df2ec2657d7e68ba6ceb (commit)
from f9626a5012b7a05fdebcf836880eb3ca28ca9b8a (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 5a86dfa470425462a123df2ec2657d7e68ba6ceb
Author: Sébastien Szymanski <seb...@ar...>
Date: Tue Jan 6 10:51:54 2015 +0100
[LINUX] 3.19: move to 3.19-rc3
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
...3.19-rc2.config => apf27-linux-3.19-rc3.config} | 0
...3.19-rc2.config => apf28-linux-3.19-rc3.config} | 0
...3.19-rc2.config => apf51-linux-3.19-rc3.config} | 0
...-3.19-rc2.config => apf6-linux-3.19-rc3.config} | 0
patches/linux/{3.19-rc2 => 3.19-rc3} | 0
6 files changed, 1 insertions(+), 1 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.19-rc2.config => apf27-linux-3.19-rc3.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.19-rc2.config => apf28-linux-3.19-rc3.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.19-rc2.config => apf51-linux-3.19-rc3.config} (100%)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.19-rc2.config => apf6-linux-3.19-rc3.config} (100%)
rename patches/linux/{3.19-rc2 => 3.19-rc3} (100%)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index c4c187e..6b701fe 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.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.19-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/apf27/apf27-linux-3.19-rc2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc2.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc3.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc2.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc3.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc2.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc3.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc2.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc2.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc3.config
diff --git a/patches/linux/3.19-rc2 b/patches/linux/3.19-rc3
similarity index 100%
rename from patches/linux/3.19-rc2
rename to patches/linux/3.19-rc3
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2015-01-04 17:51:24
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f9626a5012b7a05fdebcf836880eb3ca28ca9b8a (commit)
via 365be9f8e85c592314a893b141266366f30aa7bb (commit)
from a5e0e012491db252bf5e8c066f2be80df49e0efd (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 f9626a5012b7a05fdebcf836880eb3ca28ca9b8a
Author: Julien Boibessot <jul...@ar...>
Date: Sun Jan 4 18:50:12 2015 +0100
[U-BOOT] 2014.07: apf6: Add a method to update rootfs directly from U-Boot prompt like on others armadeus boards (run update_rootfs)
commit 365be9f8e85c592314a893b141266366f30aa7bb
Author: Julien Boibessot <jul...@ar...>
Date: Sat Jan 3 18:27:48 2015 +0100
[BUILDROOT] rootfs: also creates apf6-rootfs.ext4 symlink after images generation
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 11 +++++++++++
.../device/armadeus/rootfs/post_image_creation.sh | 5 +++--
2 files changed, 14 insertions(+), 2 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 463aa75..2fbd45c 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
@@ -238,6 +238,17 @@
"else echo Flashing of dtb failed; " \
"fi;\0" \
"update_dtb=run download_dtb flash_dtb\0" \
+ "download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ext4\0" \
+ "flash_rootfs=" \
+ "if mmc dev 0 0; then " \
+ "setexpr nbblocks ${filesize} / 0x200; " \
+ "setexpr nbblocks ${nbblocks} + 1; " \
+ "if mmc write ${loadaddr} 0x18800 ${nbblocks}; then " \
+ "echo Flashing of rootfs image succeed; " \
+ "else echo Flashing of rootfs image failed; " \
+ "fi; " \
+ "fi;\0" \
+ "update_rootfs=run download_rootfs flash_rootfs\0" \
"update_all=run update_kernel update_dtb update_uboot\0" \
"loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${board_name}-linux.bin\0" \
"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${fdt_file}\0" \
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
index 265d044..361a081 100755
--- a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -17,7 +17,8 @@ symlink_image()
fi
}
-# images symbolic links according to board name, for compatibility with older armadeus versions:
+# Create images symbolic links according to board name,
+# for compatibility with older armadeus versions:
if [ "$2" != "" ]; then
# New BR
@@ -27,7 +28,7 @@ if [ "$2" != "" ]; then
rm -f $1/$2.dtb
# rootfs
- for rootfstype in ubi ubifs tar jffs2; do
+ for rootfstype in ubi ubifs tar jffs2 ext4; do
symlink_image $1 rootfs.$rootfstype $2-rootfs.$rootfstype
done
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2015-01-02 14:21: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 a5e0e012491db252bf5e8c066f2be80df49e0efd (commit)
from 66e06fa23ae694907cc39335e1c55f7ece383f13 (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 a5e0e012491db252bf5e8c066f2be80df49e0efd
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 2 15:21:02 2015 +0100
[BUILDROOT] apf6: add e4defrag & resize2fs tools to rootfs
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 ++
buildroot/configs/apf6failsafe_defconfig | 2 ++
buildroot/configs/apf6legacy_defconfig | 2 ++
buildroot/configs/apf6xenomai_defconfig | 2 ++
4 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 2a1d966..c4c187e 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -38,6 +38,8 @@ BR2_PACKAGE_ALSA_UTILS_APLAY=y
BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
BR2_PACKAGE_GZIP=y
BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
+BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_JPEG is not set
diff --git a/buildroot/configs/apf6failsafe_defconfig b/buildroot/configs/apf6failsafe_defconfig
index ceddcca..bd13c00 100644
--- a/buildroot/configs/apf6failsafe_defconfig
+++ b/buildroot/configs/apf6failsafe_defconfig
@@ -19,6 +19,8 @@ BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev"
BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
+BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_MMC_UTILS=y
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_FSCK=y
diff --git a/buildroot/configs/apf6legacy_defconfig b/buildroot/configs/apf6legacy_defconfig
index f4eec56..6c32fcc 100644
--- a/buildroot/configs/apf6legacy_defconfig
+++ b/buildroot/configs/apf6legacy_defconfig
@@ -41,6 +41,8 @@ BR2_PACKAGE_LTRACE=y
BR2_PACKAGE_RAMSMP=y
BR2_PACKAGE_STRACE=y
BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
+BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_FBGRAB=y
BR2_PACKAGE_FBV=y
# BR2_PACKAGE_FBV_JPEG is not set
diff --git a/buildroot/configs/apf6xenomai_defconfig b/buildroot/configs/apf6xenomai_defconfig
index 019da2e..c524689 100644
--- a/buildroot/configs/apf6xenomai_defconfig
+++ b/buildroot/configs/apf6xenomai_defconfig
@@ -22,6 +22,8 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_LINUX_KERNEL_EXT_XENOMAI=y
BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="http://download.gna.org/adeos/patches/v3.x/arm/ipipe-core-3.10.18-arm-1.patch"
BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_E2FSPROGS_E4DEFRAG=y
+BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
BR2_PACKAGE_MMC_UTILS=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-12-31 10:07: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 66e06fa23ae694907cc39335e1c55f7ece383f13 (commit)
via e601a22cd8dfd8726fb0be5bb7cb86619220553c (commit)
from a23d3d7447a54f957b5feab1da6957e5ba1d491b (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 66e06fa23ae694907cc39335e1c55f7ece383f13
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 31 10:56:52 2014 +0100
[LINUX] apf6: move to kernel 3.18.1
commit e601a22cd8dfd8726fb0be5bb7cb86619220553c
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 31 10:44:44 2014 +0100
[LINUX] apf6: fixes build of kernel 3.19-rc2
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
.../device/armadeus/apf6/apf6-linux-3.18.1.config | 1 +
.../armadeus/apf6/apf6-linux-3.19-rc2.config | 1 +
...c-core-Update-ext_csd-if-touched-by-ioctl.patch | 56 +++---
...00-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch | 125 +++++++-------
...Add-new-camera-interface-driver-for-i.MX6.patch | 141 +++++++--------
...ia-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch | 41 ++---
...edia-imx6-Add-support-for-Parallel-OV5642.patch | 37 ++--
...mx6-Add-support-for-ADV7180-Video-Decoder.patch | 35 ++--
...imx6-camera-Add-VDIC-deinterlacing-subdev.patch | 187 ++++++++++----------
...v7_defconfig-Enable-staging-video4linux-d.patch | 20 +--
11 files changed, 309 insertions(+), 337 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf6/apf6-linux-3.18.1.config
create mode 120000 buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc2.config
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 4ec3d30..2a1d966 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"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.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/apf6/apf6-linux-3.18.1.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.1.config
new file mode 120000
index 0000000..f26aa9b
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.1.config
@@ -0,0 +1 @@
+apf6-linux-3.18.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc2.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc2.config
new file mode 120000
index 0000000..a5203ff
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.19-rc2.config
@@ -0,0 +1 @@
+apf6-linux-3.19.config
\ No newline at end of file
diff --git a/patches/linux/3.19/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch b/patches/linux/3.19/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
index 6ceeb97..511e363 100644
--- a/patches/linux/3.19/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
+++ b/patches/linux/3.19/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
@@ -55,11 +55,11 @@ How can this be done better/cleaner?
drivers/mmc/core/mmc.c | 26 ++++++++++++++++++++++----
2 files changed, 36 insertions(+), 4 deletions(-)
-diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
-index 1a3163f..0a4bd62 100644
---- a/drivers/mmc/card/block.c
-+++ b/drivers/mmc/card/block.c
-@@ -132,6 +132,8 @@ enum {
+Index: linux-3.19-rc2/drivers/mmc/card/block.c
+===================================================================
+--- linux-3.19-rc2.orig/drivers/mmc/card/block.c 2014-12-30 15:49:05.976292142 +0100
++++ linux-3.19-rc2/drivers/mmc/card/block.c 2014-12-30 16:08:59.000000000 +0100
+@@ -135,6 +135,8 @@
module_param(perdev_minors, int, 0444);
MODULE_PARM_DESC(perdev_minors, "Minors numbers to allocate per device");
@@ -68,7 +68,7 @@ index 1a3163f..0a4bd62 100644
static inline int mmc_blk_part_switch(struct mmc_card *card,
struct mmc_blk_data *md);
static int get_card_status(struct mmc_card *card, u32 *status, int retries);
-@@ -600,6 +602,18 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
+@@ -602,6 +604,18 @@
__func__, status, err);
}
@@ -87,20 +87,20 @@ index 1a3163f..0a4bd62 100644
cmd_rel_host:
mmc_put_card(card);
-diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
-index 6d02012..5db9d8c 100644
---- a/drivers/mmc/core/mmc.c
-+++ b/drivers/mmc/core/mmc.c
-@@ -269,7 +269,7 @@ static void mmc_select_card_type(struct mmc_card *card)
+Index: linux-3.19-rc2/drivers/mmc/core/mmc.c
+===================================================================
+--- linux-3.19-rc2.orig/drivers/mmc/core/mmc.c 2014-12-30 15:49:05.976292142 +0100
++++ linux-3.19-rc2/drivers/mmc/core/mmc.c 2014-12-30 16:10:22.536332697 +0100
+@@ -332,7 +332,7 @@
/*
* Decode extended CSD.
*/
--static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
-+static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd, int update)
+-static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd)
++static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd, int update)
{
int err = 0, idx;
unsigned int part_size;
-@@ -348,7 +348,8 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
+@@ -404,7 +404,8 @@
* There are two boot regions of equal size, defined in
* multiples of 128K.
*/
@@ -110,7 +110,7 @@ index 6d02012..5db9d8c 100644
for (idx = 0; idx < MMC_NUM_BOOT_PARTITION; idx++) {
part_size = ext_csd[EXT_CSD_BOOT_MULT] << 17;
mmc_part_add(card, part_size,
-@@ -519,7 +520,8 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
+@@ -513,7 +514,8 @@
* RPMB regions are defined in multiples of 128K.
*/
card->ext_csd.raw_rpmb_size_mult = ext_csd[EXT_CSD_RPMB_MULT];
@@ -120,17 +120,17 @@ index 6d02012..5db9d8c 100644
mmc_part_add(card, ext_csd[EXT_CSD_RPMB_MULT] << 17,
EXT_CSD_PART_CONFIG_ACC_RPMB,
"rpmb", 0, false,
-@@ -983,7 +985,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
- err = mmc_get_ext_csd(card, &ext_csd);
- if (err)
- goto free_card;
-- err = mmc_read_ext_csd(card, ext_csd);
-+ err = mmc_read_ext_csd(card, ext_csd, 0);
- if (err)
- goto free_card;
+@@ -609,7 +611,7 @@
+ return err;
+ }
-@@ -1634,6 +1636,22 @@ static void mmc_attach_bus_ops(struct mmc_host *host)
- mmc_attach_bus(host, bus_ops);
+- err = mmc_decode_ext_csd(card, ext_csd);
++ err = mmc_decode_ext_csd(card, ext_csd, 0);
+ kfree(ext_csd);
+ return err;
+ }
+@@ -1625,6 +1627,22 @@
+ return mmc_send_status(host->card, NULL);
}
+int mmc_update_ext_csd(struct mmc_card *card)
@@ -142,13 +142,13 @@ index 6d02012..5db9d8c 100644
+ if (err || new_ext_csd == NULL)
+ goto out;
+
-+ err = mmc_read_ext_csd(card, new_ext_csd, 1);
++ err = mmc_decode_ext_csd(card, new_ext_csd, 1);
+
+out:
-+ mmc_free_ext_csd(new_ext_csd);
++ kfree(new_ext_csd);
+ return err;
+}
+
/*
- * Starting point for MMC card init.
+ * Card detection callback from host.
*/
diff --git a/patches/linux/3.19/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch b/patches/linux/3.19/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
index ad4c298..8073e6a 100644
--- a/patches/linux/3.19/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
+++ b/patches/linux/3.19/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
@@ -15,24 +15,24 @@ Signed-off-by: Steve Longerbeam <ste...@me...>
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
+Index: linux-3.19-rc2/drivers/gpu/ipu-v3/Makefile
+===================================================================
+--- linux-3.19-rc2.orig/drivers/gpu/ipu-v3/Makefile 2014-12-30 16:10:29.956332933 +0100
++++ linux-3.19-rc2/drivers/gpu/ipu-v3/Makefile 2014-12-30 16:10:29.952332933 +0100
@@ -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;
- }
-
+Index: linux-3.19-rc2/drivers/gpu/ipu-v3/ipu-common.c
+===================================================================
+--- linux-3.19-rc2.orig/drivers/gpu/ipu-v3/ipu-common.c 2014-12-30 16:10:29.956332933 +0100
++++ linux-3.19-rc2/drivers/gpu/ipu-v3/ipu-common.c 2014-12-30 18:58:27.000000000 +0100
+@@ -827,6 +827,14 @@
+ 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);
@@ -41,62 +41,61 @@ index f707d25..95fd9af 100644
+ 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:
+ 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_di_1:
- ipu_di_exit(ipu, 0);
+ ipu_di_exit(ipu, 0);
err_di_0:
+ ipu_vdi_exit(ipu);
+err_vdi:
- ipu_ic_exit(ipu);
+ 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_csi_exit(ipu, 1);
+@@ -965,6 +975,7 @@
+ 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;
+ ipu_ic_exit(ipu);
+ ipu_csi_exit(ipu, 1);
+ ipu_csi_exit(ipu, 0);
+Index: linux-3.19-rc2/drivers/gpu/ipu-v3/ipu-prv.h
+===================================================================
+--- linux-3.19-rc2.orig/drivers/gpu/ipu-v3/ipu-prv.h 2014-12-30 16:10:29.956332933 +0100
++++ linux-3.19-rc2/drivers/gpu/ipu-v3/ipu-prv.h 2014-12-30 18:58:27.000000000 +0100
+@@ -138,6 +138,7 @@
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;
+@@ -169,6 +170,7 @@
+ 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;
+ 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);
+
+@@ -199,6 +201,10 @@
+ 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);
+ 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
+Index: linux-3.19-rc2/drivers/gpu/ipu-v3/ipu-vdi.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/drivers/gpu/ipu-v3/ipu-vdi.c 2014-12-30 18:59:41.480655440 +0100
@@ -0,0 +1,266 @@
+/*
+ * Copyright (C) 2012 Mentor Graphics Inc.
@@ -225,10 +224,10 @@ index 0000000..3d20f42
+ * 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)
++ if (code == MEDIA_BUS_FMT_UYVY8_2X8 ||
++ code == MEDIA_BUS_FMT_UYVY8_1X16 ||
++ code == MEDIA_BUS_FMT_YUYV8_2X8 ||
++ code == MEDIA_BUS_FMT_YUYV8_1X16)
+ pixel_fmt = VDI_C_CH_422;
+ else
+ pixel_fmt = VDI_C_CH_420;
@@ -364,14 +363,14 @@ index 0000000..3d20f42
+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,
+Index: linux-3.19-rc2/include/video/imx-ipu-v3.h
+===================================================================
+--- linux-3.19-rc2.orig/include/video/imx-ipu-v3.h 2014-12-30 16:10:29.956332933 +0100
++++ linux-3.19-rc2/include/video/imx-ipu-v3.h 2014-12-30 18:58:27.000000000 +0100
+@@ -91,6 +91,16 @@
+ IPUV3_COLORSPACE_UNKNOWN,
};
-
+
+/*
+ * Enumeration of VDI MOTION select
+ */
@@ -383,11 +382,11 @@ index c74bf4a..b3f09726 100644
+};
+
struct ipuv3_channel;
-
+
enum ipu_channel_irq {
-@@ -329,6 +339,23 @@ void ipu_ic_put(struct ipu_ic *ic);
+@@ -329,6 +339,23 @@
void ipu_ic_dump(struct ipu_ic *ic);
-
+
/*
+ * IPU Video De-Interlacer (vdi) functions
+ */
@@ -409,5 +408,3 @@ index c74bf4a..b3f09726 100644
* 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.19/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch b/patches/linux/3.19/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
index ad9f3c0..c406b97 100644
--- a/patches/linux/3.19/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
+++ b/patches/linux/3.19/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
@@ -37,11 +37,10 @@ Signed-off-by: Vladimir Zapolskiy <vla...@me...>
create mode 100644 drivers/staging/media/imx6/capture/mx6-preview.c
create mode 100644 include/media/imx6.h
-diff --git a/Documentation/video4linux/mx6_camera.txt b/Documentation/video4linux/mx6_camera.txt
-new file mode 100644
-index 0000000..bcfcd94
---- /dev/null
-+++ b/Documentation/video4linux/mx6_camera.txt
+Index: linux-3.19-rc2/Documentation/video4linux/mx6_camera.txt
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/Documentation/video4linux/mx6_camera.txt 2014-12-30 18:59:56.228655909 +0100
@@ -0,0 +1,187 @@
+ i.MX6 Video Capture Driver
+ ==========================
@@ -230,23 +229,23 @@ index 0000000..bcfcd94
+Vladimir Zapolskiy <vla...@me...>
+
+Copyright (C) 2012-2014 Mentor Graphics Inc.
-diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
-index 655cf50..4929219 100644
---- a/drivers/staging/media/Kconfig
-+++ b/drivers/staging/media/Kconfig
-@@ -27,6 +27,8 @@ source "drivers/staging/media/davinci_vpfe/Kconfig"
-
+Index: linux-3.19-rc2/drivers/staging/media/Kconfig
+===================================================================
+--- linux-3.19-rc2.orig/drivers/staging/media/Kconfig 2014-12-30 18:59:56.232655909 +0100
++++ linux-3.19-rc2/drivers/staging/media/Kconfig 2014-12-30 18:59:56.228655909 +0100
+@@ -27,6 +27,8 @@
+
source "drivers/staging/media/dt3155v4l/Kconfig"
-
+
+source "drivers/staging/media/imx6/Kconfig"
+
- source "drivers/staging/media/omap24xx/Kconfig"
-
- source "drivers/staging/media/omap4iss/Kconfig"
-diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
-index 6dbe578..92dad22 100644
---- a/drivers/staging/media/Makefile
-+++ b/drivers/staging/media/Makefile
+ source "drivers/staging/media/tlg2300/Kconfig"
+
+ source "drivers/staging/media/mn88472/Kconfig"
+Index: linux-3.19-rc2/drivers/staging/media/Makefile
+===================================================================
+--- linux-3.19-rc2.orig/drivers/staging/media/Makefile 2014-12-30 18:59:56.232655909 +0100
++++ linux-3.19-rc2/drivers/staging/media/Makefile 2014-12-30 18:59:56.228655909 +0100
@@ -1,5 +1,6 @@
obj-$(CONFIG_I2C_BCM2048) += bcm2048/
obj-$(CONFIG_DVB_CXD2099) += cxd2099/
@@ -254,11 +253,10 @@ index 6dbe578..92dad22 100644
obj-$(CONFIG_LIRC_STAGING) += lirc/
obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/
obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/
-diff --git a/drivers/staging/media/imx6/Kconfig b/drivers/staging/media/imx6/Kconfig
-new file mode 100644
-index 0000000..512a659
---- /dev/null
-+++ b/drivers/staging/media/imx6/Kconfig
+Index: linux-3.19-rc2/drivers/staging/media/imx6/Kconfig
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/drivers/staging/media/imx6/Kconfig 2014-12-30 18:59:56.228655909 +0100
@@ -0,0 +1,25 @@
+config VIDEO_IMX6
+ tristate "i.MX6 V4L2 devices"
@@ -285,18 +283,16 @@ index 0000000..512a659
+if VIDEO_IMX6_CAMERA
+source "drivers/staging/media/imx6/capture/Kconfig"
+endif
-diff --git a/drivers/staging/media/imx6/Makefile b/drivers/staging/media/imx6/Makefile
-new file mode 100644
-index 0000000..e0ed058
---- /dev/null
-+++ b/drivers/staging/media/imx6/Makefile
+Index: linux-3.19-rc2/drivers/staging/media/imx6/Makefile
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/drivers/staging/media/imx6/Makefile 2014-12-30 18:59:56.228655909 +0100
@@ -0,0 +1 @@
+obj-$(CONFIG_VIDEO_IMX6_CAMERA) += capture/
-diff --git a/drivers/staging/media/imx6/capture/Kconfig b/drivers/staging/media/imx6/capture/Kconfig
-new file mode 100644
-index 0000000..ee4f017
---- /dev/null
-+++ b/drivers/staging/media/imx6/capture/Kconfig
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/Kconfig
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/Kconfig 2014-12-30 18:59:56.228655909 +0100
@@ -0,0 +1,11 @@
+menu "i.MX6 Camera Sensors"
+
@@ -309,21 +305,19 @@ index 0000000..ee4f017
+ for sensor drivers with a MIPI CSI2 interface.
+
+endmenu
-diff --git a/drivers/staging/media/imx6/capture/Makefile b/drivers/staging/media/imx6/capture/Makefile
-new file mode 100644
-index 0000000..832d75d
---- /dev/null
-+++ b/drivers/staging/media/imx6/capture/Makefile
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/Makefile
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/Makefile 2014-12-30 18:59:56.228655909 +0100
@@ -0,0 +1,4 @@
+mx6-camera-objs := mx6-camif.o mx6-encode.o mx6-preview.o
+
+obj-$(CONFIG_VIDEO_IMX6_CAMERA) += mx6-camera.o
+obj-$(CONFIG_IMX6_MIPI_CSI2) += mipi-csi2.o
-diff --git a/drivers/staging/media/imx6/capture/mipi-csi2.c b/drivers/staging/media/imx6/capture/mipi-csi2.c
-new file mode 100644
-index 0000000..1eaccbd
---- /dev/null
-+++ b/drivers/staging/media/imx6/capture/mipi-csi2.c
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/mipi-csi2.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/mipi-csi2.c 2014-12-30 18:59:56.228655909 +0100
@@ -0,0 +1,322 @@
+/*
+ * MIPI CSI-2 Receiver Subdev for Freescale i.MX6 SOC.
@@ -647,11 +641,10 @@ index 0000000..1eaccbd
+MODULE_AUTHOR("Mentor Graphics Inc.");
+MODULE_LICENSE("GPL");
+
-diff --git a/drivers/staging/media/imx6/capture/mx6-camif.c b/drivers/staging/media/imx6/capture/mx6-camif.c
-new file mode 100644
-index 0000000..05f0381
---- /dev/null
-+++ b/drivers/staging/media/imx6/capture/mx6-camif.c
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/mx6-camif.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/mx6-camif.c 2014-12-30 19:00:54.212657751 +0100
@@ -0,0 +1,2259 @@
+/*
+ * Video Camera Capture driver for Freescale i.MX6 SOC
@@ -731,13 +724,13 @@ index 0000000..05f0381
+ {
+ .name = "RGB565",
+ .fourcc = V4L2_PIX_FMT_RGB565,
-+ .codes = {V4L2_MBUS_FMT_RGB565_2X8_LE},
++ .codes = {MEDIA_BUS_FMT_RGB565_2X8_LE},
+ .depth = 16,
+ }, {
+ .name = "RGB24",
+ .fourcc = V4L2_PIX_FMT_RGB24,
-+ .codes = {V4L2_MBUS_FMT_RGB888_1X24,
-+ V4L2_MBUS_FMT_RGB888_2X12_LE},
++ .codes = {MEDIA_BUS_FMT_RGB888_1X24,
++ MEDIA_BUS_FMT_RGB888_2X12_LE},
+ .depth = 24,
+ }, {
+ .name = "BGR24",
@@ -746,7 +739,7 @@ index 0000000..05f0381
+ }, {
+ .name = "RGB32",
+ .fourcc = V4L2_PIX_FMT_RGB32,
-+ .codes = {V4L2_MBUS_FMT_ARGB8888_1X32},
++ .codes = {MEDIA_BUS_FMT_ARGB8888_1X32},
+ .depth = 32,
+ }, {
+ .name = "BGR32",
@@ -755,12 +748,12 @@ index 0000000..05f0381
+ }, {
+ .name = "4:2:2 packed, YUYV",
+ .fourcc = V4L2_PIX_FMT_YUYV,
-+ .codes = {V4L2_MBUS_FMT_YUYV8_2X8, V4L2_MBUS_FMT_YUYV8_1X16},
++ .codes = {MEDIA_BUS_FMT_YUYV8_2X8, MEDIA_BUS_FMT_YUYV8_1X16},
+ .depth = 16,
+ }, {
+ .name = "4:2:2 packed, UYVY",
+ .fourcc = V4L2_PIX_FMT_UYVY,
-+ .codes = {V4L2_MBUS_FMT_UYVY8_2X8, V4L2_MBUS_FMT_UYVY8_1X16},
++ .codes = {MEDIA_BUS_FMT_UYVY8_2X8, MEDIA_BUS_FMT_UYVY8_1X16},
+ .depth = 16,
+ }, {
+ .name = "4:2:0 planar, YUV",
@@ -2912,11 +2905,10 @@ index 0000000..05f0381
+MODULE_DESCRIPTION("i.MX6 v4l2 capture driver");
+MODULE_AUTHOR("Mentor Graphics Inc.");
+MODULE_LICENSE("GPL");
-diff --git a/drivers/staging/media/imx6/capture/mx6-camif.h b/drivers/staging/media/imx6/capture/mx6-camif.h
-new file mode 100644
-index 0000000..b3d9828
---- /dev/null
-+++ b/drivers/staging/media/imx6/capture/mx6-camif.h
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/mx6-camif.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/mx6-camif.h 2014-12-30 18:59:56.228655909 +0100
@@ -0,0 +1,201 @@
+/*
+ * Video Capture driver for Freescale i.MX6 SOC
@@ -3119,11 +3111,10 @@ index 0000000..b3d9828
+struct v4l2_subdev *mx6cam_preview_init(struct mx6cam_dev *dev);
+
+#endif /* _MX6_CAMIF_H */
-diff --git a/drivers/staging/media/imx6/capture/mx6-encode.c b/drivers/staging/media/imx6/capture/mx6-encode.c
-new file mode 100644
-index 0000000..f422be3
---- /dev/null
-+++ b/drivers/staging/media/imx6/capture/mx6-encode.c
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/mx6-encode.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/mx6-encode.c 2014-12-30 18:59:56.228655909 +0100
@@ -0,0 +1,757 @@
+/*
+ * V4L2 Capture Encoder Subdev for Freescale i.MX6 SOC
@@ -3882,11 +3873,10 @@ index 0000000..f422be3
+ priv->dev = dev;
+ return &priv->sd;
+}
-diff --git a/drivers/staging/media/imx6/capture/mx6-preview.c b/drivers/staging/media/imx6/capture/mx6-preview.c
-new file mode 100644
-index 0000000..517fa50
---- /dev/null
-+++ b/drivers/staging/media/imx6/capture/mx6-preview.c
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/mx6-preview.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/mx6-preview.c 2014-12-30 18:59:56.228655909 +0100
@@ -0,0 +1,792 @@
+/*
+ * V4L2 Preview Subdev for Freescale i.MX6 SOC
@@ -4680,11 +4670,10 @@ index 0000000..517fa50
+ priv->dev = dev;
+ return &priv->sd;
+}
-diff --git a/include/media/imx6.h b/include/media/imx6.h
-new file mode 100644
-index 0000000..232378b
---- /dev/null
-+++ b/include/media/imx6.h
+Index: linux-3.19-rc2/include/media/imx6.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/include/media/imx6.h 2014-12-30 18:59:56.228655909 +0100
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2014 Mentor Graphics Inc.
@@ -4704,5 +4693,3 @@ index 0000000..232378b
+#define DECODER_STATUS_CHANGE_NOTIFY _IO('7', 0)
+
+#endif
---
-1.8.5.5
diff --git a/patches/linux/3.19/0620-media-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch b/patches/linux/3.19/0620-media-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch
index c0c3d5e..87f5702 100644
--- a/patches/linux/3.19/0620-media-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch
+++ b/patches/linux/3.19/0620-media-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch
@@ -15,14 +15,14 @@ Signed-off-by: Steve Longerbeam <ste...@me...>
3 files changed, 2288 insertions(+)
create mode 100644 drivers/staging/media/imx6/capture/ov5640-mipi.c
-diff --git a/drivers/staging/media/imx6/capture/Kconfig b/drivers/staging/media/imx6/capture/Kconfig
-index ee4f017..6d81e3f 100644
---- a/drivers/staging/media/imx6/capture/Kconfig
-+++ b/drivers/staging/media/imx6/capture/Kconfig
-@@ -8,4 +8,12 @@ config IMX6_MIPI_CSI2
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/Kconfig
+===================================================================
+--- linux-3.19-rc2.orig/drivers/staging/media/imx6/capture/Kconfig 2014-12-30 19:09:25.616673998 +0100
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/Kconfig 2014-12-31 10:02:23.000000000 +0100
+@@ -8,4 +8,12 @@
MIPI CSI-2 Receiver driver support. This driver is required
- for sensor drivers with a MIPI CSI2 interface.
-
+ for sensor drivers with a MIPI CSI2 interface.
+
+config IMX6_CAMERA_OV5640_MIPI
+ tristate "OmniVision OV5640 MIPI CSI-2 camera support"
+ depends on VIDEO_IMX6_CAMERA
@@ -32,20 +32,19 @@ index ee4f017..6d81e3f 100644
+ MIPI CSI-2 OV5640 Camera support.
+
endmenu
-diff --git a/drivers/staging/media/imx6/capture/Makefile b/drivers/staging/media/imx6/capture/Makefile
-index 832d75d..6aaa4cc 100644
---- a/drivers/staging/media/imx6/capture/Makefile
-+++ b/drivers/staging/media/imx6/capture/Makefile
-@@ -2,3 +2,4 @@ mx6-camera-objs := mx6-camif.o mx6-encode.o mx6-preview.o
-
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/Makefile
+===================================================================
+--- linux-3.19-rc2.orig/drivers/staging/media/imx6/capture/Makefile 2014-12-30 19:09:25.616673998 +0100
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/Makefile 2014-12-31 10:02:23.000000000 +0100
+@@ -2,3 +2,4 @@
+
obj-$(CONFIG_VIDEO_IMX6_CAMERA) += mx6-camera.o
obj-$(CONFIG_IMX6_MIPI_CSI2) += mipi-csi2.o
+obj-$(CONFIG_IMX6_CAMERA_OV5640_MIPI) += ov5640-mipi.o
-diff --git a/drivers/staging/media/imx6/capture/ov5640-mipi.c b/drivers/staging/media/imx6/capture/ov5640-mipi.c
-new file mode 100644
-index 0000000..65ba227
---- /dev/null
-+++ b/drivers/staging/media/imx6/capture/ov5640-mipi.c
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/ov5640-mipi.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/ov5640-mipi.c 2014-12-31 10:13:45.442397797 +0100
@@ -0,0 +1,2279 @@
+/*
+ * Copyright (c) 2014 Mentor Graphics Inc.
@@ -2019,7 +2018,7 @@ index 0000000..65ba227
+}
+
+static int ov5640_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index,
-+ enum v4l2_mbus_pixelcode *code)
++ u32 *code)
+{
+ struct ov5640_dev *sensor = to_ov5640_dev(sd);
+
@@ -2170,7 +2169,7 @@ index 0000000..65ba227
+
+ sensor->i2c_client = client;
+ sensor->dev = dev;
-+ sensor->fmt.code = V4L2_MBUS_FMT_UYVY8_2X8;
++ sensor->fmt.code = MEDIA_BUS_FMT_UYVY8_2X8;
+ sensor->fmt.width = 640;
+ sensor->fmt.height = 480;
+ sensor->streamcap.capability = V4L2_MODE_HIGHQUALITY |
@@ -2326,5 +2325,3 @@ index 0000000..65ba227
+MODULE_DESCRIPTION("OV5640 MIPI Camera Subdev Driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
---
-1.8.5.5
diff --git a/patches/linux/3.19/0621-media-imx6-Add-support-for-Parallel-OV5642.patch b/patches/linux/3.19/0621-media-imx6-Add-support-for-Parallel-OV5642.patch
index 4754ab1..4add716 100644
--- a/patches/linux/3.19/0621-media-imx6-Add-support-for-Parallel-OV5642.patch
+++ b/patches/linux/3.19/0621-media-imx6-Add-support-for-Parallel-OV5642.patch
@@ -15,14 +15,14 @@ Signed-off-by: Steve Longerbeam <ste...@me...>
3 files changed, 4313 insertions(+)
create mode 100644 drivers/staging/media/imx6/capture/ov5642.c
-diff --git a/drivers/staging/media/imx6/capture/Kconfig b/drivers/staging/media/imx6/capture/Kconfig
-index 6d81e3f..5e6a610 100644
---- a/drivers/staging/media/imx6/capture/Kconfig
-+++ b/drivers/staging/media/imx6/capture/Kconfig
-@@ -8,6 +8,13 @@ config IMX6_MIPI_CSI2
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/Kconfig
+===================================================================
+--- linux-3.19-rc2.orig/drivers/staging/media/imx6/capture/Kconfig 2014-12-30 19:01:51.248659563 +0100
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/Kconfig 2014-12-30 19:01:51.240659562 +0100
+@@ -8,6 +8,13 @@
MIPI CSI-2 Receiver driver support. This driver is required
- for sensor drivers with a MIPI CSI2 interface.
-
+ for sensor drivers with a MIPI CSI2 interface.
+
+config IMX6_CAMERA_OV5642
+ tristate "OmniVision OV5642 Parallel camera support"
+ depends on VIDEO_IMX6_CAMERA
@@ -33,20 +33,19 @@ index 6d81e3f..5e6a610 100644
config IMX6_CAMERA_OV5640_MIPI
tristate "OmniVision OV5640 MIPI CSI-2 camera support"
depends on VIDEO_IMX6_CAMERA
-diff --git a/drivers/staging/media/imx6/capture/Makefile b/drivers/staging/media/imx6/capture/Makefile
-index 6aaa4cc..bcb2c16 100644
---- a/drivers/staging/media/imx6/capture/Makefile
-+++ b/drivers/staging/media/imx6/capture/Makefile
-@@ -3,3 +3,4 @@ mx6-camera-objs := mx6-camif.o mx6-encode.o mx6-preview.o
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/Makefile
+===================================================================
+--- linux-3.19-rc2.orig/drivers/staging/media/imx6/capture/Makefile 2014-12-30 19:01:51.248659563 +0100
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/Makefile 2014-12-30 19:01:51.240659562 +0100
+@@ -3,3 +3,4 @@
obj-$(CONFIG_VIDEO_IMX6_CAMERA) += mx6-camera.o
obj-$(CONFIG_IMX6_MIPI_CSI2) += mipi-csi2.o
obj-$(CONFIG_IMX6_CAMERA_OV5640_MIPI) += ov5640-mipi.o
+obj-$(CONFIG_IMX6_CAMERA_OV5642) += ov5642.o
-diff --git a/drivers/staging/media/imx6/capture/ov5642.c b/drivers/staging/media/imx6/capture/ov5642.c
-new file mode 100644
-index 0000000..7abf02b
---- /dev/null
-+++ b/drivers/staging/media/imx6/capture/ov5642.c
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/ov5642.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/ov5642.c 2014-12-30 19:02:15.524660334 +0100
@@ -0,0 +1,4305 @@
+/*
+ * Copyright (c) 2012-2014 Mentor Graphics Inc.
@@ -4182,7 +4181,7 @@ index 0000000..7abf02b
+
+ sensor->i2c_client = client;
+ sensor->dev = dev;
-+ sensor->fmt.code = V4L2_MBUS_FMT_YUYV8_2X8;
++ sensor->fmt.code = MEDIA_BUS_FMT_YUYV8_2X8;
+ sensor->fmt.width = 640;
+ sensor->fmt.height = 480;
+ sensor->fmt.field = V4L2_FIELD_NONE;
@@ -4353,5 +4352,3 @@ index 0000000..7abf02b
+MODULE_DESCRIPTION("OV5642 Camera Subdev Driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION("1.0");
---
-1.8.5.5
diff --git a/patches/linux/3.19/0622-media-imx6-Add-support-for-ADV7180-Video-Decoder.patch b/patches/linux/3.19/0622-media-imx6-Add-support-for-ADV7180-Video-Decoder.patch
index c3c044a..b114d73 100644
--- a/patches/linux/3.19/0622-media-imx6-Add-support-for-ADV7180-Video-Decoder.patch
+++ b/patches/linux/3.19/0622-media-imx6-Add-support-for-ADV7180-Video-Decoder.patch
@@ -15,14 +15,14 @@ Signed-off-by: Steve Longerbeam <ste...@me...>
3 files changed, 1364 insertions(+)
create mode 100644 drivers/staging/media/imx6/capture/adv7180.c
-diff --git a/drivers/staging/media/imx6/capture/Kconfig b/drivers/staging/media/imx6/capture/Kconfig
-index 5e6a610..ee4ed8a 100644
---- a/drivers/staging/media/imx6/capture/Kconfig
-+++ b/drivers/staging/media/imx6/capture/Kconfig
-@@ -23,4 +23,11 @@ config IMX6_CAMERA_OV5640_MIPI
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/Kconfig
+===================================================================
+--- linux-3.19-rc2.orig/drivers/staging/media/imx6/capture/Kconfig 2014-12-30 19:02:22.468660555 +0100
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/Kconfig 2014-12-30 19:02:22.464660554 +0100
+@@ -23,4 +23,11 @@
---help---
MIPI CSI-2 OV5640 Camera support.
-
+
+config IMX6_CAMERA_ADV7180
+ tristate "Analog Devices ADV7180 Video Decoder support"
+ depends on VIDEO_IMX6_CAMERA
@@ -31,20 +31,19 @@ index 5e6a610..ee4ed8a 100644
+ Analog Devices ADV7180 Video Decoder support.
+
endmenu
-diff --git a/drivers/staging/media/imx6/capture/Makefile b/drivers/staging/media/imx6/capture/Makefile
-index bcb2c16..d6b456c 100644
---- a/drivers/staging/media/imx6/capture/Makefile
-+++ b/drivers/staging/media/imx6/capture/Makefile
-@@ -4,3 +4,4 @@ obj-$(CONFIG_VIDEO_IMX6_CAMERA) += mx6-camera.o
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/Makefile
+===================================================================
+--- linux-3.19-rc2.orig/drivers/staging/media/imx6/capture/Makefile 2014-12-30 19:02:22.468660555 +0100
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/Makefile 2014-12-30 19:02:22.464660554 +0100
+@@ -4,3 +4,4 @@
obj-$(CONFIG_IMX6_MIPI_CSI2) += mipi-csi2.o
obj-$(CONFIG_IMX6_CAMERA_OV5640_MIPI) += ov5640-mipi.o
obj-$(CONFIG_IMX6_CAMERA_OV5642) += ov5642.o
+obj-$(CONFIG_IMX6_CAMERA_ADV7180) += adv7180.o
-diff --git a/drivers/staging/media/imx6/capture/adv7180.c b/drivers/staging/media/imx6/capture/adv7180.c
-new file mode 100644
-index 0000000..84891dc
---- /dev/null
-+++ b/drivers/staging/media/imx6/capture/adv7180.c
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/adv7180.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/adv7180.c 2014-12-30 19:02:50.076661432 +0100
@@ -0,0 +1,1356 @@
+/*
+ * Analog Device ADV7180 video decoder driver
@@ -1252,7 +1251,7 @@ index 0000000..84891dc
+ sensor->streamcap.timeperframe.numerator = 1;
+ sensor->fmt.width = video_fmts[sensor->video_idx].raw.width;
+ sensor->fmt.height = video_fmts[sensor->video_idx].raw.height;
-+ sensor->fmt.code = V4L2_MBUS_FMT_UYVY8_2X8;
++ sensor->fmt.code = MEDIA_BUS_FMT_UYVY8_2X8;
+ sensor->fmt.field = V4L2_FIELD_SEQ_BT;
+
+ mutex_init(&sensor->mutex);
@@ -1402,5 +1401,3 @@ index 0000000..84891dc
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
+MODULE_DESCRIPTION("Analog Devices ADV7180 Subdev driver");
+MODULE_LICENSE("GPL");
---
-1.8.5.5
diff --git a/patches/linux/3.19/0624-media-imx6-camera-Add-VDIC-deinterlacing-subdev.patch b/patches/linux/3.19/0624-media-imx6-camera-Add-VDIC-deinterlacing-subdev.patch
index f40be0e..1dac599 100644
--- a/patches/linux/3.19/0624-media-imx6-camera-Add-VDIC-deinterlacing-subdev.patch
+++ b/patches/linux/3.19/0624-media-imx6-camera-Add-VDIC-deinterlacing-subdev.patch
@@ -45,32 +45,32 @@ Signed-off-by: Steve Longerbeam <ste...@me...>
4 files changed, 1080 insertions(+), 6 deletions(-)
create mode 100644 drivers/staging/media/imx6/capture/mx6-vdic.c
-diff --git a/drivers/staging/media/imx6/capture/Makefile b/drivers/staging/media/imx6/capture/Makefile
-index d6b456c..13b9862 100644
---- a/drivers/staging/media/imx6/capture/Makefile
-+++ b/drivers/staging/media/imx6/capture/Makefile
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/Makefile
+===================================================================
+--- linux-3.19-rc2.orig/drivers/staging/media/imx6/capture/Makefile 2014-12-30 19:02:59.380661727 +0100
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/Makefile 2014-12-30 19:02:59.376661727 +0100
@@ -1,4 +1,4 @@
-mx6-camera-objs := mx6-camif.o mx6-encode.o mx6-preview.o
+mx6-camera-objs := mx6-camif.o mx6-encode.o mx6-preview.o mx6-vdic.o
-
+
obj-$(CONFIG_VIDEO_IMX6_CAMERA) += mx6-camera.o
obj-$(CONFIG_IMX6_MIPI_CSI2) += mipi-csi2.o
-diff --git a/drivers/staging/media/imx6/capture/mx6-camif.c b/drivers/staging/media/imx6/capture/mx6-camif.c
-index 85c7757..3fae8b6 100644
---- a/drivers/staging/media/imx6/capture/mx6-camif.c
-+++ b/drivers/staging/media/imx6/capture/mx6-camif.c
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/mx6-camif.c
+===================================================================
+--- linux-3.19-rc2.orig/drivers/staging/media/imx6/capture/mx6-camif.c 2014-12-30 19:02:59.380661727 +0100
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/mx6-camif.c 2014-12-30 19:03:42.780663106 +0100
@@ -39,6 +39,8 @@
#define MAX_H 4096
#define MAX_W_IC 1024
#define MAX_H_IC 1024
+#define MAX_W_VDIC 968
+#define MAX_H_VDIC 2048
-
+
#define H_ALIGN 1 /* multiple of 2 */
#define S_ALIGN 1 /* multiple of 2 */
-@@ -204,6 +206,34 @@ static bool update_signal_lock_status(struct mx6cam_dev *dev)
+@@ -204,6 +206,34 @@
}
-
+
/*
+ * Return true if the VDIC deinterlacer is needed. We need the VDIC
+ * if the sensor is transmitting fields, and userland is requesting
@@ -93,70 +93,70 @@ index 85c7757..3fae8b6 100644
+{
+ return sf->width <= MAX_W_VDIC &&
+ sf->height <= MAX_H_VDIC &&
-+ (sf->code == V4L2_MBUS_FMT_UYVY8_2X8 ||
-+ sf->code == V4L2_MBUS_FMT_UYVY8_1X16 ||
-+ sf->code == V4L2_MBUS_FMT_YUYV8_2X8 ||
-+ sf->code == V4L2_MBUS_FMT_YUYV8_1X16);
++ (sf->code == MEDIA_BUS_FMT_UYVY8_2X8 ||
++ sf->code == MEDIA_BUS_FMT_UYVY8_1X16 ||
++ sf->code == MEDIA_BUS_FMT_YUYV8_2X8 ||
++ sf->code == MEDIA_BUS_FMT_YUYV8_1X16);
+}
+
+/*
* Return true if the current capture parameters require the use of
* the Image Converter. We need the IC for scaling, colorspace conversion,
* preview, and rotation.
-@@ -409,6 +439,7 @@ static int sensor_set_stream(struct mx6cam_dev *dev, int on)
+@@ -409,6 +439,7 @@
*/
static int start_encoder(struct mx6cam_dev *dev)
{
+ struct v4l2_subdev *streaming_sd;
- int ret;
-
- if (dev->encoder_on)
-@@ -421,8 +452,10 @@ static int start_encoder(struct mx6cam_dev *dev)
- return ret;
- }
-
+ int ret;
+
+ if (dev->encoder_on)
+@@ -421,8 +452,10 @@
+ return ret;
+ }
+
- /* encoder stream on */
- ret = v4l2_subdev_call(dev->encoder_sd, video, s_stream, 1);
+ /* encoder/vdic stream on */
+ streaming_sd = dev->using_vdic ? dev->vdic_sd : dev->encoder_sd;
+
+ ret = v4l2_subdev_call(streaming_sd, video, s_stream, 1);
- if (ret) {
- v4l2_err(&dev->v4l2_dev, "encoder stream on failed\n");
- return ret;
-@@ -437,13 +470,16 @@ static int start_encoder(struct mx6cam_dev *dev)
+ if (ret) {
+ v4l2_err(&dev->v4l2_dev, "encoder stream on failed\n");
+ return ret;
+@@ -437,13 +470,16 @@
*/
static int stop_encoder(struct mx6cam_dev *dev)
{
+ struct v4l2_subdev *streaming_sd;
- int ret;
-
- if (!dev->encoder_on)
- return 0;
-
+ int ret;
+
+ if (!dev->encoder_on)
+ return 0;
+
- /* encoder off */
- ret = v4l2_subdev_call(dev->encoder_sd, video, s_stream, 0);
+ streaming_sd = dev->using_vdic ? dev->vdic_sd : dev->encoder_sd;
+
+ /* encoder/vdic off */
+ ret = v4l2_subdev_call(streaming_sd, video, s_stream, 0);
- if (ret)
- v4l2_err(&dev->v4l2_dev, "encoder stream off failed\n");
-
-@@ -539,6 +575,9 @@ static int set_stream(struct mx6cam_ctx *ctx, bool on)
- &dev->crop) &&
- can_use_ic(dev, &dev->sensor_fmt, &dev->user_fmt));
-
+ if (ret)
+ v4l2_err(&dev->v4l2_dev, "encoder stream off failed\n");
+
+@@ -539,6 +575,9 @@
+ &dev->crop) &&
+ can_use_ic(dev, &dev->sensor_fmt, &dev->user_fmt));
+
+ dev->using_vdic = need_vdic(dev, &dev->sensor_fmt) &&
+ can_use_vdic(dev, &dev->sensor_fmt);
+
- if (dev->preview_on)
- stop_preview(dev);
-
-@@ -685,6 +724,13 @@ static int mx6cam_set_motion(struct mx6cam_dev *dev,
- "Preview is on, cannot enable deinterlace\n");
- return -EBUSY;
- }
+ if (dev->preview_on)
+ stop_preview(dev);
+
+@@ -685,6 +724,13 @@
+ "Preview is on, cannot enable deinterlace\n");
+ return -EBUSY;
+ }
+
+ if (motion != MOTION_NONE &&
+ !can_use_vdic(dev, &dev->sensor_fmt)) {
@@ -164,36 +164,36 @@ index 85c7757..3fae8b6 100644
+ "sensor format does not allow deinterlace\n");
+ return -EINVAL;
+ }
- }
-
- dev->motion = motion;
-@@ -2071,6 +2117,9 @@ static void mx6cam_unregister_subdevs(struct mx6cam_dev *dev)
- if (!IS_ERR_OR_NULL(dev->preview_sd))
- v4l2_device_unregister_subdev(dev->preview_sd);
-
+ }
+
+ dev->motion = motion;
+@@ -2071,6 +2117,9 @@
+ if (!IS_ERR_OR_NULL(dev->preview_sd))
+ v4l2_device_unregister_subdev(dev->preview_sd);
+
+ if (!IS_ERR_OR_NULL(dev->vdic_sd))
+ v4l2_device_unregister_subdev(dev->vdic_sd);
+
- if (!IS_ERR_OR_NULL(dev->csi2_sd))
- v4l2_device_unregister_subdev(dev->csi2_sd);
-
-@@ -2229,6 +2278,12 @@ static int mx6cam_probe(struct platform_device *pdev)
- goto unreg_subdevs;
- }
-
+ if (!IS_ERR_OR_NULL(dev->csi2_sd))
+ v4l2_device_unregister_subdev(dev->csi2_sd);
+
+@@ -2229,6 +2278,12 @@
+ goto unreg_subdevs;
+ }
+
+ dev->vdic_sd = mx6cam_vdic_init(dev);
+ if (IS_ERR(dev->vdic_sd)) {
+ ret = PTR_ERR(dev->vdic_sd);
+ goto unreg_subdevs;
+ }
+
- ret = v4l2_device_register_subdev(&dev->v4l2_dev, dev->encoder_sd);
- if (ret < 0) {
- v4l2_err(&dev->v4l2_dev,
-@@ -2247,6 +2302,15 @@ static int mx6cam_probe(struct platform_device *pdev)
- v4l2_info(&dev->v4l2_dev, "Registered subdev %s\n",
- dev->preview_sd->name);
-
+ ret = v4l2_device_register_subdev(&dev->v4l2_dev, dev->encoder_sd);
+ if (ret < 0) {
+ v4l2_err(&dev->v4l2_dev,
+@@ -2247,6 +2302,15 @@
+ v4l2_info(&dev->v4l2_dev, "Registered subdev %s\n",
+ dev->preview_sd->name);
+
+ ret = v4l2_device_register_subdev(&dev->v4l2_dev, dev->vdic_sd);
+ if (ret < 0) {
+ v4l2_err(&dev->v4l2_dev,
@@ -203,39 +203,38 @@ index 85c7757..3fae8b6 100644
+ v4l2_info(&dev->v4l2_dev, "Registered subdev %s\n",
+ dev->vdic_sd->name);
+
- ret = v4l2_device_register_subdev_nodes(&dev->v4l2_dev);
- if (ret)
- goto unreg_subdevs;
-diff --git a/drivers/staging/media/imx6/capture/mx6-camif.h b/drivers/staging/media/imx6/capture/mx6-camif.h
-index 051932c..4573084 100644
---- a/drivers/staging/media/imx6/capture/mx6-camif.h
-+++ b/drivers/staging/media/imx6/capture/mx6-camif.h
-@@ -159,10 +159,12 @@ struct mx6cam_dev {
- bool encoder_on; /* encode is on */
- bool preview_on; /* preview is on */
- bool using_ic; /* IC is being used for encode */
+ ret = v4l2_device_register_subdev_nodes(&dev->v4l2_dev);
+ if (ret)
+ goto unreg_subdevs;
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/mx6-camif.h
+===================================================================
+--- linux-3.19-rc2.orig/drivers/staging/media/imx6/capture/mx6-camif.h 2014-12-30 19:02:59.380661727 +0100
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/mx6-camif.h 2014-12-30 19:02:59.376661727 +0100
+@@ -159,10 +159,12 @@
+ bool encoder_on; /* encode is on */
+ bool preview_on; /* preview is on */
+ bool using_ic; /* IC is being used for encode */
+ bool using_vdic; /* VDIC is used for encode */
-
+
- /* encoder, preview, and mipi csi2 subdevices */
+ /* encoder, preview, vdic, and mipi csi2 subdevices */
- struct v4l2_subdev *encoder_sd;
- struct v4l2_subdev *preview_sd;
+ struct v4l2_subdev *encoder_sd;
+ struct v4l2_subdev *preview_sd;
+ struct v4l2_subdev *vdic_sd;
- struct v4l2_subdev *csi2_sd;
-
- /* sensor endpoints */
-@@ -199,5 +201,6 @@ struct mx6cam_ctx {
-
+ struct v4l2_subdev *csi2_sd;
+
+ /* sensor endpoints */
+@@ -199,5 +201,6 @@
+
struct v4l2_subdev *mx6cam_encoder_init(struct mx6cam_dev *dev);
struct v4l2_subdev *mx6cam_preview_init(struct mx6cam_dev *dev);
+struct v4l2_subdev *mx6cam_vdic_init(struct mx6cam_dev *dev);
-
+
#endif /* _MX6_CAMIF_H */
-diff --git a/drivers/staging/media/imx6/capture/mx6-vdic.c b/drivers/staging/media/imx6/capture/mx6-vdic.c
-new file mode 100644
-index 0000000..744b6f8
---- /dev/null
-+++ b/drivers/staging/media/imx6/capture/mx6-vdic.c
+Index: linux-3.19-rc2/drivers/staging/media/imx6/capture/mx6-vdic.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.19-rc2/drivers/staging/media/imx6/capture/mx6-vdic.c 2014-12-30 19:02:59.376661727 +0100
@@ -0,0 +1,1007 @@
+/*
+ * V4L2 Capture Deinterlacer Subdev for Freescale i.MX6 SOC
@@ -1244,5 +1243,3 @@ index 0000000..744b6f8
+ priv->dev = dev;
+ return &priv->sd;
+}
---
-1.8.5.5
diff --git a/patches/linux/3.19/0625-ARM-imx_v6_v7_defconfig-Enable-staging-video4linux-d.patch b/patches/linux/3.19/0625-ARM-imx_v6_v7_defconfig-Enable-staging-video4linux-d.patch
index d53ceaa..2480490 100644
--- a/patches/linux/3.19/0625-ARM-imx_v6_v7_defconfig-Enable-staging-video4linux-d.patch
+++ b/patches/linux/3.19/0625-ARM-imx_v6_v7_defconfig-Enable-staging-video4linux-d.patch
@@ -13,11 +13,11 @@ Signed-off-by: Steve Longerbeam <ste...@me...>
arch/arm/configs/imx_v6_v7_defconfig | 4 ++++
1 file changed, 4 insertions(+)
-diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
-index 8fca6e2..8c83af9 100644
---- a/arch/arm/configs/imx_v6_v7_defconfig
-+++ b/arch/arm/configs/imx_v6_v7_defconfig
-@@ -154,6 +154,7 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
+Index: linux-3.19-rc2/arch/arm/configs/imx_v6_v7_defconfig
+===================================================================
+--- linux-3.19-rc2.orig/arch/arm/configs/imx_v6_v7_defconfig 2014-12-30 19:03:56.048663528 +0100
++++ linux-3.19-rc2/arch/arm/configs/imx_v6_v7_defconfig 2014-12-30 19:03:56.044663527 +0100
+@@ -154,6 +154,7 @@
CONFIG_HW_RANDOM=y
# CONFIG_I2C_COMPAT is not set
CONFIG_I2C_CHARDEV=y
@@ -25,15 +25,15 @@ index 8fca6e2..8c83af9 100644
# CONFIG_I2C_HELPER_AUTO is not set
CONFIG_I2C_ALGOPCF=m
CONFIG_I2C_ALGOPCA=m
-@@ -161,6 +162,7 @@ CONFIG_I2C_IMX=y
+@@ -162,6 +163,7 @@
CONFIG_SPI_IMX=y
CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_MC9S08DZ60=y
+CONFIG_GPIO_PCA953X=m
CONFIG_GPIO_STMPE=y
- # CONFIG_HWMON is not set
- CONFIG_WATCHDOG=y
-@@ -248,6 +250,8 @@ CONFIG_IMX_SDMA=y
+ CONFIG_SENSORS_GPIO_FAN=y
+ CONFIG_THERMAL=y
+@@ -257,6 +259,8 @@
CONFIG_MXS_DMA=y
CONFIG_FSL_EDMA=y
CONFIG_STAGING=y
@@ -42,5 +42,3 @@ index 8fca6e2..8c83af9 100644
CONFIG_DRM_IMX=y
CONFIG_DRM_IMX_FB_HELPER=y
CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
---
-1.8.5.5
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-12-30 14:23: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 a23d3d7447a54f957b5feab1da6957e5ba1d491b (commit)
via 4749c779208cc5ae89aee55a7a5fea31ebcceb2f (commit)
from 536024a45c3f8653f273b16af2e5c67603017d18 (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 a23d3d7447a54f957b5feab1da6957e5ba1d491b
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 30 15:22:52 2014 +0100
[BUILDROOT] all boards: add Linux configs to support 3.19-rc2 (copy of 3.18 ones)
commit 4749c779208cc5ae89aee55a7a5fea31ebcceb2f
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 30 15:12:10 2014 +0100
[LINUX] all boards: add patches to support 3.19-rc2 (copy of 3.18 one)
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-3.19-rc2.config | 1 +
...7-linux-3.18.config => apf27-linux-3.19.config} | 0
.../armadeus/apf28/apf28-linux-3.19-rc2.config | 1 +
...8-linux-3.14.config => apf28-linux-3.19.config} | 0
.../armadeus/apf51/apf51-linux-3.19-rc2.config | 1 +
...1-linux-3.17.config => apf51-linux-3.19.config} | 0
...f6-linux-3.18.config => apf6-linux-3.19.config} | 0
patches/linux/3.19-rc2 | 1 +
...15-armadeus-logo-add_armadeus-project_tux.patch | 0
.../{3.10 => 3.19}/0021-armadeus-apf9328.patch | 0
...s-apf9328-add_board_to_linux_build_system.patch | 0
.../0029-armadeus-add_csi_and_spi_registers.patch | 0
...029b-armadeus-add_csi_registers.patch.dontapply | 0
...rmadeus-devices-imx1-add_udc_registration.patch | 0
...-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix | 0
...50-armadeus-add_custom_drivers_to_kconfig.patch | 0
.../{3.15 => 3.19}/0073-armadeus-tsc2102.patch | 0
...02_integrate_driver_to_linux_build_system.patch | 0
...chscreen-add_driver_to_linux_build_system.patch | 0
.../0074-armadeus-tsc2102-touchscreen.patch | 0
.../0075-armadeus-spi2-reg-defines.patch | 0
...Add-device-tree-support-to-tsc210x-driver.patch | 0
...eus-clock_correct_mxc_decode_pll_for_imx1.tofix | 0
...ng-as-module-a-driver-registering-a-clock.tofix | 0
...210x-device-tree-declaration-for-apf27dev.patch | 0
...deus-dts-apf27dev-fixes-user-led-polarity.patch | 0
...1-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch | 0
...dts-apf27dev-add_gpio_key_wakeup_behavior.patch | 0
...s-dts-imx27-apf27dev-set-pwmr-accordingly.patch | 0
...clk-imx27-fixes-vpu-spll-clock-dependency.patch | 0
.../0322-armadeus-add_mach_fpga_h.patch | 0
...-imx51_dts-add_usbphy_for_host1_and_host2.patch | 0
...51-chipidea-usbmisc_imx-add_imx51_support.patch | 0
...adeus-chipidea-add_node_to_select_clk_phy.patch | 0
...us-apf51-add_apf51_v1-and_v2_device_trees.patch | 0
...eus-apf51-add_mc13982_touchscreen_support.patch | 0
.../0420-armadeus-Improve-apf28dev-dts.patch | 0
...ot_link_otg_phy_clock_directly_to_osc_ref.patch | 0
..._star_completion_for_source_in_menuconfig.patch | 0
...low_to_use_the_wakeupalarm_functionnality.patch | 0
...4-armadeus-usb-chipidea-add-imx27-support.patch | 0
...44-armadeus-usb-enable_usb_div_by_default.patch | 0
...5-armadeus-add-apf27-apf27dev-dts-for-USB.patch | 0
...46-armadeus-mxs-add-pm_power_off-function.patch | 0
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 0
...-armadeus-add-watchdog-bootstatus-logging.patch | 0
...c-core-Update-ext_csd-if-touched-by-ioctl.patch | 0
...6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch | 0
...-remove-pwr_in_suspend-from-platform-data.patch | 0
...-instead-of-enumerations-for-pdata-clocks.patch | 0
...al-device-tree-support-to-the-sdio-module.patch | 0
...-8-wlcore-sdio-add-wilink-clock-providers.patch | 0
...8-wlcore-sdio-get-clocks-from-device-tree.patch | 0
...heck-if-we-got-correct-clock-data-from-DT.patch | 0
...cumentation-dt-bindings-TI-WiLink-modules.patch | 0
...04-armadeus-add_sx8674_touchscreen_driver.patch | 0
.../0505-armadeus-add_mcp7940x_rtc_driver.patch | 0
.../0506-armadeus-change_mmc_numbering.patch | 0
...o-stabilize-after-ref_en.patch.applied-3.18-rc3 | 0
...-dereference-if-ptp_cloc.patch.applied-3.18-rc3 | 0
...ideomode-add-pos-neg-pixel-clock-polarity.patch | 0
...v3-crtc-Use-DRM-mode-flags-to-configure-p.patch | 10 +++++-----
...00-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch | 0
...gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch | 0
.../0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch | 0
.../0603-gpu-ipu-v3-Add-ipu_get_num.patch | 0
...u-ipu-v3-Add-IDMA-channel-linking-support.patch | 0
.../0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch | 0
...6-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch | 0
.../0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch | 0
.../0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch | 0
...pu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch | 0
...imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch | 0
.../0611-ARM-imx6q-clk-Add-video-27m-clock.patch | 0
...-sabrelite-add-video-capture-ports-and-en.patch | 0
...6-sabresd-add-video-capture-ports-and-end.patch | 0
...6-sabreauto-add-video-capture-ports-and-e.patch | 0
...imx6dl-Add-iomux-field-defines-for-imx6dl.patch | 0
...-imx-Add-imx6-video-capture-platform_data.patch | 0
...617-gpio-pca953x-Add-reset-gpios-property.patch | 0
...mx6-Add-device-tree-binding-documentation.patch | 0
...Add-new-camera-interface-driver-for-i.MX6.patch | 0
...ia-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch | 0
...edia-imx6-Add-support-for-Parallel-OV5642.patch | 0
...mx6-Add-support-for-ADV7180-Video-Decoder.patch | 0
...mx6-camera-Add-deinterlace-motion-control.patch | 0
...imx6-camera-Add-VDIC-deinterlacing-subdev.patch | 0
...v7_defconfig-Enable-staging-video4linux-d.patch | 0
88 files changed, 9 insertions(+), 5 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc2.config
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.18.config => apf27-linux-3.19.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc2.config
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.config => apf28-linux-3.19.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc2.config
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.17.config => apf51-linux-3.19.config} (100%)
copy buildroot/target/device/armadeus/apf6/{apf6-linux-3.18.config => apf6-linux-3.19.config} (100%)
create mode 120000 patches/linux/3.19-rc2
copy patches/linux/{3.12 => 3.19}/0015-armadeus-logo-add_armadeus-project_tux.patch (100%)
copy patches/linux/{3.10 => 3.19}/0021-armadeus-apf9328.patch (100%)
copy patches/linux/{3.18 => 3.19}/0024-armadeus-apf9328-add_board_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.19}/0029-armadeus-add_csi_and_spi_registers.patch (100%)
copy patches/linux/{3.17 => 3.19}/0029b-armadeus-add_csi_registers.patch.dontapply (100%)
copy patches/linux/{3.10 => 3.19}/0030-armadeus-devices-imx1-add_udc_registration.patch (100%)
copy patches/linux/{3.18 => 3.19}/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix (100%)
copy patches/linux/{3.10 => 3.19}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
copy patches/linux/{3.15 => 3.19}/0073-armadeus-tsc2102.patch (100%)
copy patches/linux/{3.10 => 3.19}/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.19}/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.19}/0074-armadeus-tsc2102-touchscreen.patch (100%)
copy patches/linux/{3.10 => 3.19}/0075-armadeus-spi2-reg-defines.patch (100%)
copy patches/linux/{3.18 => 3.19}/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch (100%)
copy patches/linux/{3.10 => 3.19}/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix (100%)
copy patches/linux/{3.18 => 3.19}/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix (100%)
copy patches/linux/{3.18 => 3.19}/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch (100%)
copy patches/linux/{3.15 => 3.19}/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch (100%)
copy patches/linux/{3.15 => 3.19}/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch (100%)
copy patches/linux/{3.13 => 3.19}/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch (100%)
copy patches/linux/{3.15 => 3.19}/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch (100%)
copy patches/linux/{3.18 => 3.19}/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch (100%)
copy patches/linux/{3.10 => 3.19}/0322-armadeus-add_mach_fpga_h.patch (100%)
copy patches/linux/{3.14 => 3.19}/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch (100%)
copy patches/linux/{3.18 => 3.19}/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch (100%)
copy patches/linux/{3.12 => 3.19}/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch (100%)
copy patches/linux/{3.18 => 3.19}/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch (100%)
copy patches/linux/{3.16 => 3.19}/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch (100%)
copy patches/linux/{3.18 => 3.19}/0420-armadeus-Improve-apf28dev-dts.patch (100%)
copy patches/linux/{3.14 => 3.19}/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch (100%)
copy patches/linux/{3.12 => 3.19}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (100%)
copy patches/linux/{3.10 => 3.19}/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch (100%)
copy patches/linux/{3.18 => 3.19}/0444-armadeus-usb-chipidea-add-imx27-support.patch (100%)
copy patches/linux/{3.17 => 3.19}/0444-armadeus-usb-enable_usb_div_by_default.patch (100%)
copy patches/linux/{3.16 => 3.19}/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch (100%)
copy patches/linux/{3.18 => 3.19}/0446-armadeus-mxs-add-pm_power_off-function.patch (100%)
copy patches/linux/{3.18 => 3.19}/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch (100%)
copy patches/linux/{3.16 => 3.19}/0460-armadeus-add-watchdog-bootstatus-logging.patch (100%)
copy patches/linux/{3.12 => 3.19}/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch (100%)
copy patches/linux/{3.13 => 3.19}/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch (100%)
copy patches/linux/{3.16 => 3.19}/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch (100%)
copy patches/linux/{3.15 => 3.19}/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch (100%)
copy patches/linux/{3.16 => 3.19}/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch (100%)
copy patches/linux/{3.13 => 3.19}/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch (100%)
copy patches/linux/{3.15 => 3.19}/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch (100%)
copy patches/linux/{3.15 => 3.19}/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch (100%)
copy patches/linux/{3.15 => 3.19}/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch (100%)
copy patches/linux/{3.15 => 3.19}/0504-armadeus-add_sx8674_touchscreen_driver.patch (100%)
copy patches/linux/{3.15 => 3.19}/0505-armadeus-add_mcp7940x_rtc_driver.patch (100%)
copy patches/linux/{3.16 => 3.19}/0506-armadeus-change_mmc_numbering.patch (100%)
copy patches/linux/{3.18 => 3.19}/0509-v5-3-9-PCI-imx6-wait-the-clocks-to-stabilize-after-ref_en.patch.applied-3.18-rc3 (100%)
copy patches/linux/{3.18 => 3.19}/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch.applied-3.18-rc3 (100%)
copy patches/linux/{3.17 => 3.19}/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch (100%)
copy patches/linux/{3.18 => 3.19}/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch (77%)
copy patches/linux/{3.18 => 3.19}/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch (100%)
copy patches/linux/{3.18 => 3.19}/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch (100%)
copy patches/linux/{3.18 => 3.19}/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch (100%)
copy patches/linux/{3.18 => 3.19}/0603-gpu-ipu-v3-Add-ipu_get_num.patch (100%)
copy patches/linux/{3.18 => 3.19}/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch (100%)
copy patches/linux/{3.18 => 3.19}/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch (100%)
copy patches/linux/{3.18 => 3.19}/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch (100%)
copy patches/linux/{3.18 => 3.19}/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch (100%)
copy patches/linux/{3.18 => 3.19}/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch (100%)
copy patches/linux/{3.18 => 3.19}/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch (100%)
copy patches/linux/{3.18 => 3.19}/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch (100%)
copy patches/linux/{3.18 => 3.19}/0611-ARM-imx6q-clk-Add-video-27m-clock.patch (100%)
copy patches/linux/{3.18 => 3.19}/0612-ARM-dts-imx-sabrelite-add-video-capture-ports-and-en.patch (100%)
copy patches/linux/{3.18 => 3.19}/0613-ARM-dts-imx6-sabresd-add-video-capture-ports-and-end.patch (100%)
copy patches/linux/{3.18 => 3.19}/0614-ARM-dts-imx6-sabreauto-add-video-capture-ports-and-e.patch (100%)
copy patches/linux/{3.18 => 3.19}/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch (100%)
copy patches/linux/{3.18 => 3.19}/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch (100%)
copy patches/linux/{3.18 => 3.19}/0617-gpio-pca953x-Add-reset-gpios-property.patch (100%)
copy patches/linux/{3.18 => 3.19}/0618-media-imx6-Add-device-tree-binding-documentation.patch (100%)
copy patches/linux/{3.18 => 3.19}/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch (100%)
copy patches/linux/{3.18 => 3.19}/0620-media-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch (100%)
copy patches/linux/{3.18 => 3.19}/0621-media-imx6-Add-support-for-Parallel-OV5642.patch (100%)
copy patches/linux/{3.18 => 3.19}/0622-media-imx6-Add-support-for-ADV7180-Video-Decoder.patch (100%)
copy patches/linux/{3.18 => 3.19}/0623-media-imx6-camera-Add-deinterlace-motion-control.patch (100%)
copy patches/linux/{3.18 => 3.19}/0624-media-imx6-camera-Add-VDIC-deinterlacing-subdev.patch (100%)
copy patches/linux/{3.18 => 3.19}/0625-ARM-imx_v6_v7_defconfig-Enable-staging-video4linux-d.patch (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc2.config
new file mode 120000
index 0000000..449c4aa
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.19-rc2.config
@@ -0,0 +1 @@
+apf27-linux-3.19.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.19.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.18.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.19.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc2.config
new file mode 120000
index 0000000..05a3db3
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.19-rc2.config
@@ -0,0 +1 @@
+apf28-linux-3.19.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.19.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.19.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc2.config
new file mode 120000
index 0000000..90d7f8f
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.19-rc2.config
@@ -0,0 +1 @@
+apf51-linux-3.19.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.19.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.17.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-3.19.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf6/apf6-linux-3.18.config
copy to buildroot/target/device/armadeus/apf6/apf6-linux-3.19.config
diff --git a/patches/linux/3.19-rc2 b/patches/linux/3.19-rc2
new file mode 120000
index 0000000..318956c
--- /dev/null
+++ b/patches/linux/3.19-rc2
@@ -0,0 +1 @@
+3.19
\ No newline at end of file
diff --git a/patches/linux/3.12/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/3.19/0015-armadeus-logo-add_armadeus-project_tux.patch
similarity index 100%
copy from patches/linux/3.12/0015-armadeus-logo-add_armadeus-project_tux.patch
copy to patches/linux/3.19/0015-armadeus-logo-add_armadeus-project_tux.patch
diff --git a/patches/linux/3.10/0021-armadeus-apf9328.patch b/patches/linux/3.19/0021-armadeus-apf9328.patch
similarity index 100%
copy from patches/linux/3.10/0021-armadeus-apf9328.patch
copy to patches/linux/3.19/0021-armadeus-apf9328.patch
diff --git a/patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/3.19/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
copy to patches/linux/3.19/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/3.19/0029-armadeus-add_csi_and_spi_registers.patch
similarity index 100%
copy from patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch
copy to patches/linux/3.19/0029-armadeus-add_csi_and_spi_registers.patch
diff --git a/patches/linux/3.17/0029b-armadeus-add_csi_registers.patch.dontapply b/patches/linux/3.19/0029b-armadeus-add_csi_registers.patch.dontapply
similarity index 100%
copy from patches/linux/3.17/0029b-armadeus-add_csi_registers.patch.dontapply
copy to patches/linux/3.19/0029b-armadeus-add_csi_registers.patch.dontapply
diff --git a/patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/3.19/0030-armadeus-devices-imx1-add_udc_registration.patch
similarity index 100%
copy from patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch
copy to patches/linux/3.19/0030-armadeus-devices-imx1-add_udc_registration.patch
diff --git a/patches/linux/3.18/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix b/patches/linux/3.19/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix
similarity index 100%
copy from patches/linux/3.18/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix
copy to patches/linux/3.19/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix
diff --git a/patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/3.19/0050-armadeus-add_custom_drivers_to_kconfig.patch
similarity index 100%
copy from patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch
copy to patches/linux/3.19/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/3.15/0073-armadeus-tsc2102.patch b/patches/linux/3.19/0073-armadeus-tsc2102.patch
similarity index 100%
copy from patches/linux/3.15/0073-armadeus-tsc2102.patch
copy to patches/linux/3.19/0073-armadeus-tsc2102.patch
diff --git a/patches/linux/3.10/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch b/patches/linux/3.19/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.10/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
copy to patches/linux/3.19/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch b/patches/linux/3.19/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.10/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
copy to patches/linux/3.19/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch b/patches/linux/3.19/0074-armadeus-tsc2102-touchscreen.patch
similarity index 100%
copy from patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch
copy to patches/linux/3.19/0074-armadeus-tsc2102-touchscreen.patch
diff --git a/patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch b/patches/linux/3.19/0075-armadeus-spi2-reg-defines.patch
similarity index 100%
copy from patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch
copy to patches/linux/3.19/0075-armadeus-spi2-reg-defines.patch
diff --git a/patches/linux/3.18/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch b/patches/linux/3.19/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch
similarity index 100%
copy from patches/linux/3.18/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch
copy to patches/linux/3.19/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch
diff --git a/patches/linux/3.10/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix b/patches/linux/3.19/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
similarity index 100%
copy from patches/linux/3.10/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
copy to patches/linux/3.19/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
diff --git a/patches/linux/3.18/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix b/patches/linux/3.19/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
similarity index 100%
copy from patches/linux/3.18/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
copy to patches/linux/3.19/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
diff --git a/patches/linux/3.18/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch b/patches/linux/3.19/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch
similarity index 100%
copy from patches/linux/3.18/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch
copy to patches/linux/3.19/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch
diff --git a/patches/linux/3.15/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch b/patches/linux/3.19/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
similarity index 100%
copy from patches/linux/3.15/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
copy to patches/linux/3.19/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
diff --git a/patches/linux/3.15/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch b/patches/linux/3.19/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
similarity index 100%
copy from patches/linux/3.15/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
copy to patches/linux/3.19/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
diff --git a/patches/linux/3.13/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.19/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
similarity index 100%
copy from patches/linux/3.13/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
copy to patches/linux/3.19/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
diff --git a/patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch b/patches/linux/3.19/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
similarity index 100%
copy from patches/linux/3.15/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
copy to patches/linux/3.19/0223-armadeus-dts-imx27-apf27dev-set-pwmr-accordingly.patch
diff --git a/patches/linux/3.18/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch b/patches/linux/3.19/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch
similarity index 100%
copy from patches/linux/3.18/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch
copy to patches/linux/3.19/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch
diff --git a/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.19/0322-armadeus-add_mach_fpga_h.patch
similarity index 100%
copy from patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch
copy to patches/linux/3.19/0322-armadeus-add_mach_fpga_h.patch
diff --git a/patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch b/patches/linux/3.19/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
similarity index 100%
copy from patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
copy to patches/linux/3.19/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
diff --git a/patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch b/patches/linux/3.19/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
similarity index 100%
copy from patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
copy to patches/linux/3.19/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
diff --git a/patches/linux/3.12/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch b/patches/linux/3.19/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
similarity index 100%
copy from patches/linux/3.12/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
copy to patches/linux/3.19/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
diff --git a/patches/linux/3.18/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch b/patches/linux/3.19/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
similarity index 100%
copy from patches/linux/3.18/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
copy to patches/linux/3.19/0415-armadeus-apf51-add_apf51_v1-and_v2_device_trees.patch
diff --git a/patches/linux/3.16/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch b/patches/linux/3.19/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
similarity index 100%
copy from patches/linux/3.16/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
copy to patches/linux/3.19/0416-armadeus-apf51-add_mc13982_touchscreen_support.patch
diff --git a/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch b/patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch
similarity index 100%
copy from patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
copy to patches/linux/3.19/0420-armadeus-Improve-apf28dev-dts.patch
diff --git a/patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch b/patches/linux/3.19/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
similarity index 100%
copy from patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
copy to patches/linux/3.19/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
diff --git a/patches/linux/3.12/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.19/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
similarity index 100%
copy from patches/linux/3.12/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
copy to patches/linux/3.19/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch
diff --git a/patches/linux/3.10/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch b/patches/linux/3.19/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
similarity index 100%
copy from patches/linux/3.10/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
copy to patches/linux/3.19/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
diff --git a/patches/linux/3.18/0444-armadeus-usb-chipidea-add-imx27-support.patch b/patches/linux/3.19/0444-armadeus-usb-chipidea-add-imx27-support.patch
similarity index 100%
copy from patches/linux/3.18/0444-armadeus-usb-chipidea-add-imx27-support.patch
copy to patches/linux/3.19/0444-armadeus-usb-chipidea-add-imx27-support.patch
diff --git a/patches/linux/3.17/0444-armadeus-usb-enable_usb_div_by_default.patch b/patches/linux/3.19/0444-armadeus-usb-enable_usb_div_by_default.patch
similarity index 100%
copy from patches/linux/3.17/0444-armadeus-usb-enable_usb_div_by_default.patch
copy to patches/linux/3.19/0444-armadeus-usb-enable_usb_div_by_default.patch
diff --git a/patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/3.19/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
similarity index 100%
copy from patches/linux/3.16/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
copy to patches/linux/3.19/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
diff --git a/patches/linux/3.18/0446-armadeus-mxs-add-pm_power_off-function.patch b/patches/linux/3.19/0446-armadeus-mxs-add-pm_power_off-function.patch
similarity index 100%
copy from patches/linux/3.18/0446-armadeus-mxs-add-pm_power_off-function.patch
copy to patches/linux/3.19/0446-armadeus-mxs-add-pm_power_off-function.patch
diff --git a/patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.19/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
similarity index 100%
copy from patches/linux/3.18/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
copy to patches/linux/3.19/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
diff --git a/patches/linux/3.16/0460-armadeus-add-watchdog-bootstatus-logging.patch b/patches/linux/3.19/0460-armadeus-add-watchdog-bootstatus-logging.patch
similarity index 100%
copy from patches/linux/3.16/0460-armadeus-add-watchdog-bootstatus-logging.patch
copy to patches/linux/3.19/0460-armadeus-add-watchdog-bootstatus-logging.patch
diff --git a/patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch b/patches/linux/3.19/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
similarity index 100%
copy from patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
copy to patches/linux/3.19/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch
diff --git a/patches/linux/3.13/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch b/patches/linux/3.19/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
similarity index 100%
copy from patches/linux/3.13/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
copy to patches/linux/3.19/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
diff --git a/patches/linux/3.16/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch b/patches/linux/3.19/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
similarity index 100%
copy from patches/linux/3.16/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
copy to patches/linux/3.19/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
diff --git a/patches/linux/3.15/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch b/patches/linux/3.19/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
similarity index 100%
copy from patches/linux/3.15/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
copy to patches/linux/3.19/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
diff --git a/patches/linux/3.16/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch b/patches/linux/3.19/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
similarity index 100%
copy from patches/linux/3.16/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
copy to patches/linux/3.19/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
diff --git a/patches/linux/3.13/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch b/patches/linux/3.19/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
similarity index 100%
copy from patches/linux/3.13/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
copy to patches/linux/3.19/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
diff --git a/patches/linux/3.15/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch b/patches/linux/3.19/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
similarity index 100%
copy from patches/linux/3.15/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
copy to patches/linux/3.19/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
diff --git a/patches/linux/3.15/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch b/patches/linux/3.19/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
similarity index 100%
copy from patches/linux/3.15/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
copy to patches/linux/3.19/0496-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
diff --git a/patches/linux/3.15/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch b/patches/linux/3.19/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
similarity index 100%
copy from patches/linux/3.15/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
copy to patches/linux/3.19/0497-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
diff --git a/patches/linux/3.15/0504-armadeus-add_sx8674_touchscreen_driver.patch b/patches/linux/3.19/0504-armadeus-add_sx8674_touchscreen_driver.patch
similarity index 100%
copy from patches/linux/3.15/0504-armadeus-add_sx8674_touchscreen_driver.patch
copy to patches/linux/3.19/0504-armadeus-add_sx8674_touchscreen_driver.patch
diff --git a/patches/linux/3.15/0505-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/3.19/0505-armadeus-add_mcp7940x_rtc_driver.patch
similarity index 100%
copy from patches/linux/3.15/0505-armadeus-add_mcp7940x_rtc_driver.patch
copy to patches/linux/3.19/0505-armadeus-add_mcp7940x_rtc_driver.patch
diff --git a/patches/linux/3.16/0506-armadeus-change_mmc_numbering.patch b/patches/linux/3.19/0506-armadeus-change_mmc_numbering.patch
similarity index 100%
copy from patches/linux/3.16/0506-armadeus-change_mmc_numbering.patch
copy to patches/linux/3.19/0506-armadeus-change_mmc_numbering.patch
diff --git a/patches/linux/3.18/0509-v5-3-9-PCI-imx6-wait-the-clocks-to-stabilize-after-ref_en.patch.applied-3.18-rc3 b/patches/linux/3.19/0509-v5-3-9-PCI-imx6-wait-the-clocks-to-stabilize-after-ref_en.patch.applied-3.18-rc3
similarity index 100%
copy from patches/linux/3.18/0509-v5-3-9-PCI-imx6-wait-the-clocks-to-stabilize-after-ref_en.patch.applied-3.18-rc3
copy to patches/linux/3.19/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.applied-3.18-rc3 b/patches/linux/3.19/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch.applied-3.18-rc3
similarity index 100%
copy from patches/linux/3.18/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch.applied-3.18-rc3
copy to patches/linux/3.19/0510-net-fec-ptp-fix-NULL-pointer-dereference-if-ptp_cloc.patch.applied-3.18-rc3
diff --git a/patches/linux/3.17/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch b/patches/linux/3.19/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
similarity index 100%
copy from patches/linux/3.17/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
copy to patches/linux/3.19/0511-drm_modes-videomode-add-pos-neg-pixel-clock-polarity.patch
diff --git a/patches/linux/3.18/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch b/patches/linux/3.19/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
similarity index 77%
copy from patches/linux/3.18/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
copy to patches/linux/3.19/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
index e856278..1ae79d4 100644
--- a/patches/linux/3.18/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
+++ b/patches/linux/3.19/0512-imx-drm-ipuv3-crtc-Use-DRM-mode-flags-to-configure-p.patch
@@ -11,14 +11,14 @@ 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 ++-
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-Index: linux-3.18-rc5/drivers/staging/imx-drm/ipuv3-crtc.c
+Index: linux-3.18-rc5/drivers/gpu/drm/imx/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_
+--- linux-3.18-rc5.orig/drivers/gpu/drm/imx/ipuv3-crtc.c
++++ linux-3.18-rc5/drivers/gpu/drm/imx/ipuv3-crtc.c
+@@ -159,9 +159,10 @@ static int ipu_crtc_mode_set(struct drm_
sig_cfg.Hsync_pol = 1;
if (mode->flags & DRM_MODE_FLAG_PVSYNC)
sig_cfg.Vsync_pol = 1;
diff --git a/patches/linux/3.18/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch b/patches/linux/3.19/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
similarity index 100%
copy from patches/linux/3.18/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
copy to patches/linux/3.19/0600-gpu-ipu-v3-Add-Video-Deinterlacer-unit.patch
diff --git a/patches/linux/3.18/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch b/patches/linux/3.19/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch
similarity index 100%
copy from patches/linux/3.18/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch
copy to patches/linux/3.19/0601-gpu-ipu-cpmem-Add-ipu_cpmem_set_uv_offset.patch
diff --git a/patches/linux/3.18/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch b/patches/linux/3.19/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch
similarity index 100%
copy from patches/linux/3.18/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch
copy to patches/linux/3.19/0602-ARM-dts-imx6qdl-Add-ipu-aliases.patch
diff --git a/patches/linux/3.18/0603-gpu-ipu-v3-Add-ipu_get_num.patch b/patches/linux/3.19/0603-gpu-ipu-v3-Add-ipu_get_num.patch
similarity index 100%
copy from patches/linux/3.18/0603-gpu-ipu-v3-Add-ipu_get_num.patch
copy to patches/linux/3.19/0603-gpu-ipu-v3-Add-ipu_get_num.patch
diff --git a/patches/linux/3.18/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch b/patches/linux/3.19/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch
similarity index 100%
copy from patches/linux/3.18/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch
copy to patches/linux/3.19/0604-gpu-ipu-v3-Add-IDMA-channel-linking-support.patch
diff --git a/patches/linux/3.18/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch b/patches/linux/3.19/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch
similarity index 100%
copy from patches/linux/3.18/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch
copy to patches/linux/3.19/0605-gpu-ipu-v3-Add-ipu_set_vdi_src_mux.patch
diff --git a/patches/linux/3.18/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch b/patches/linux/3.19/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch
similarity index 100%
copy from patches/linux/3.18/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch
copy to patches/linux/3.19/0606-gpu-ipu-v3-Add-VDI-input-IDMAC-channels.patch
diff --git a/patches/linux/3.18/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch b/patches/linux/3.19/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch
similarity index 100%
copy from patches/linux/3.18/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch
copy to patches/linux/3.19/0607-gpu-ipu-v3-Add-ipu_csi_set_src.patch
diff --git a/patches/linux/3.18/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch b/patches/linux/3.19/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch
similarity index 100%
copy from patches/linux/3.18/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch
copy to patches/linux/3.19/0608-gpu-ipu-v3-Add-ipu_ic_set_src.patch
diff --git a/patches/linux/3.18/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch b/patches/linux/3.19/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch
similarity index 100%
copy from patches/linux/3.18/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch
copy to patches/linux/3.19/0609-gpu-ipu-v3-Fix-PAL-NTSC-frame-format-check.patch
diff --git a/patches/linux/3.18/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch b/patches/linux/3.19/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch
similarity index 100%
copy from patches/linux/3.18/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch
copy to patches/linux/3.19/0610-ARM-dts-imx6qdl-Flesh-out-MIPI-CSI2-receiver-node.patch
diff --git a/patches/linux/3.18/0611-ARM-imx6q-clk-Add-video-27m-clock.patch b/patches/linux/3.19/0611-ARM-imx6q-clk-Add-video-27m-clock.patch
similarity index 100%
copy from patches/linux/3.18/0611-ARM-imx6q-clk-Add-video-27m-clock.patch
copy to patches/linux/3.19/0611-ARM-imx6q-clk-Add-video-27m-clock.patch
diff --git a/patches/linux/3.18/0612-ARM-dts-imx-sabrelite-add-video-capture-ports-and-en.patch b/patches/linux/3.19/0612-ARM-dts-imx-sabrelite-add-video-capture-ports-and-en.patch
similarity index 100%
copy from patches/linux/3.18/0612-ARM-dts-imx-sabrelite-add-video-capture-ports-and-en.patch
copy to patches/linux/3.19/0612-ARM-dts-imx-sabrelite-add-video-capture-ports-and-en.patch
diff --git a/patches/linux/3.18/0613-ARM-dts-imx6-sabresd-add-video-capture-ports-and-end.patch b/patches/linux/3.19/0613-ARM-dts-imx6-sabresd-add-video-capture-ports-and-end.patch
similarity index 100%
copy from patches/linux/3.18/0613-ARM-dts-imx6-sabresd-add-video-capture-ports-and-end.patch
copy to patches/linux/3.19/0613-ARM-dts-imx6-sabresd-add-video-capture-ports-and-end.patch
diff --git a/patches/linux/3.18/0614-ARM-dts-imx6-sabreauto-add-video-capture-ports-and-e.patch b/patches/linux/3.19/0614-ARM-dts-imx6-sabreauto-add-video-capture-ports-and-e.patch
similarity index 100%
copy from patches/linux/3.18/0614-ARM-dts-imx6-sabreauto-add-video-capture-ports-and-e.patch
copy to patches/linux/3.19/0614-ARM-dts-imx6-sabreauto-add-video-capture-ports-and-e.patch
diff --git a/patches/linux/3.18/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch b/patches/linux/3.19/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch
similarity index 100%
copy from patches/linux/3.18/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch
copy to patches/linux/3.19/0615-ARM-imx6dl-Add-iomux-field-defines-for-imx6dl.patch
diff --git a/patches/linux/3.18/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch b/patches/linux/3.19/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch
similarity index 100%
copy from patches/linux/3.18/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch
copy to patches/linux/3.19/0616-ARM-imx-Add-imx6-video-capture-platform_data.patch
diff --git a/patches/linux/3.18/0617-gpio-pca953x-Add-reset-gpios-property.patch b/patches/linux/3.19/0617-gpio-pca953x-Add-reset-gpios-property.patch
similarity index 100%
copy from patches/linux/3.18/0617-gpio-pca953x-Add-reset-gpios-property.patch
copy to patches/linux/3.19/0617-gpio-pca953x-Add-reset-gpios-property.patch
diff --git a/patches/linux/3.18/0618-media-imx6-Add-device-tree-binding-documentation.patch b/patches/linux/3.19/0618-media-imx6-Add-device-tree-binding-documentation.patch
similarity index 100%
copy from patches/linux/3.18/0618-media-imx6-Add-device-tree-binding-documentation.patch
copy to patches/linux/3.19/0618-media-imx6-Add-device-tree-binding-documentation.patch
diff --git a/patches/linux/3.18/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch b/patches/linux/3.19/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
similarity index 100%
copy from patches/linux/3.18/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
copy to patches/linux/3.19/0619-media-Add-new-camera-interface-driver-for-i.MX6.patch
diff --git a/patches/linux/3.18/0620-media-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch b/patches/linux/3.19/0620-media-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch
similarity index 100%
copy from patches/linux/3.18/0620-media-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch
copy to patches/linux/3.19/0620-media-imx6-Add-support-for-MIPI-CSI-2-OV5640.patch
diff --git a/patches/linux/3.18/0621-media-imx6-Add-support-for-Parallel-OV5642.patch b/patches/linux/3.19/0621-media-imx6-Add-support-for-Parallel-OV5642.patch
similarity index 100%
copy from patches/linux/3.18/0621-media-imx6-Add-support-for-Parallel-OV5642.patch
copy to patches/linux/3.19/0621-media-imx6-Add-support-for-Parallel-OV5642.patch
diff --git a/patches/linux/3.18/0622-media-imx6-Add-support-for-ADV7180-Video-Decoder.patch b/patches/linux/3.19/0622-media-imx6-Add-support-for-ADV7180-Video-Decoder.patch
similarity index 100%
copy from patches/linux/3.18/0622-media-imx6-Add-support-for-ADV7180-Video-Decoder.patch
copy to patches/linux/3.19/0622-media-imx6-Add-support-for-ADV7180-Video-Decoder.patch
diff --git a/patches/linux/3.18/0623-media-imx6-camera-Add-deinterlace-motion-control.patch b/patches/linux/3.19/0623-media-imx6-camera-Add-deinterlace-motion-control.patch
similarity index 100%
copy from patches/linux/3.18/0623-media-imx6-camera-Add-deinterlace-motion-control.patch
copy to patches/linux/3.19/0623-media-imx6-camera-Add-deinterlace-motion-control.patch
diff --git a/patches/linux/3.18/0624-media-imx6-camera-Add-VDIC-deinterlacing-subdev.patch b/patches/linux/3.19/0624-media-imx6-camera-Add-VDIC-deinterlacing-subdev.patch
similarity index 100%
copy from patches/linux/3.18/0624-media-imx6-camera-Add-VDIC-deinterlacing-subdev.patch
copy to patches/linux/3.19/0624-media-imx6-camera-Add-VDIC-deinterlacing-subdev.patch
diff --git a/patches/linux/3.18/0625-ARM-imx_v6_v7_defconfig-Enable-staging-video4linux-d.patch b/patches/linux/3.19/0625-ARM-imx_v6_v7_defconfig-Enable-staging-video4linux-d.patch
similarity index 100%
copy from patches/linux/3.18/0625-ARM-imx_v6_v7_defconfig-Enable-staging-video4linux-d.patch
copy to patches/linux/3.19/0625-ARM-imx_v6_v7_defconfig-Enable-staging-video4linux-d.patch
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-12-29 17:49:22
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 536024a45c3f8653f273b16af2e5c67603017d18 (commit)
via d21e8563f541d660b6e5bc318c3d5b2543b99441 (commit)
via 5c6517e3de603e52592de396f408889967a4354f (commit)
via fad8fae2f33ea4521fbff755966d8025a45632cd (commit)
via 70882a6289cbeabb58baf7f9c5f2bf63c7a6c07b (commit)
via 867be4e8fa810c9e7aff33bc773627096921198b (commit)
from eec9ddb124b46f9bd6e795ab1c353b5c6737f003 (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 536024a45c3f8653f273b16af2e5c67603017d18
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 29 18:47:55 2014 +0100
[BUILDROOT] apf6: moves Linux 3.14 support to 3.14.27
commit d21e8563f541d660b6e5bc318c3d5b2543b99441
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 29 18:43:59 2014 +0100
[BUILDROOT] apf28: moves Linux 3.4 support to 3.4.105
commit 5c6517e3de603e52592de396f408889967a4354f
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 29 18:40:15 2014 +0100
[BUILDROOT] all boards: remove some no more needed Linux config symlinks
commit fad8fae2f33ea4521fbff755966d8025a45632cd
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 29 18:30:02 2014 +0100
[LINUX] 3.18: renames patches 0035, 0076, 0101, 0219, 0230, 0420, 0444 & 0446 (for better understanding)
commit 70882a6289cbeabb58baf7f9c5f2bf63c7a6c07b
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 29 15:33:50 2014 +0100
[LINUX] 3.18: add comments for 0446-armadeus_add_pm_power_off_function.patch
commit 867be4e8fa810c9e7aff33bc773627096921198b
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 29 15:16:55 2014 +0100
[LINUX] 3.18: update comments of 0420-armadeus-Add-apf28dev-dts.patch
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6failsafe_defconfig | 2 +-
.../armadeus/apf27/apf27-linux-3.9-rc4.config | 1 -
...ux-3.4.48.config => apf28-linux-3.4.105.config} | 0
.../device/armadeus/apf28/apf28-linux-3.4.6.config | 1 -
.../armadeus/apf51/apf51-linux-3.14-rc4.config | 1 -
...nux-3.14.8.config => apf6-linux-3.14.27.config} | 0
.../apf6/apf6failsafe-linux-3.14-rc4.config | 1 -
...add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix} | 0
...dd-device-tree-support-to-tsc210x-driver.patch} | 0
...g-as-module-a-driver-registering-a-clock.tofix} | 1 +
...madeus-clock-imx1_avoid_crash_with_module.tofix | 12 ------
...10x-device-tree-declaration-for-apf27dev.patch} | 0
...lk-imx27-fixes-vpu-spll-clock-dependency.patch} | 0
...ch => 0420-armadeus-Improve-apf28dev-dts.patch} | 6 +---
...-armadeus-usb-chipidea-add-imx27-support.patch} | 0
...6-armadeus-mxs-add-pm_power_off-function.patch} | 10 +++++
.../0446-armadeus_add_pm_power_off_function.patch | 39 --------------------
patches/linux/{3.4.48 => 3.4.105} | 0
18 files changed, 13 insertions(+), 61 deletions(-)
delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.9-rc4.config
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.4.48.config => apf28-linux-3.4.105.config} (100%)
delete mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.4.6.config
delete mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc4.config
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.14.8.config => apf6-linux-3.14.27.config} (100%)
delete mode 120000 buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14-rc4.config
rename patches/linux/3.18/{0035-armadeus-re_add_pwm_and_correct_driver.tofix => 0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix} (100%)
rename patches/linux/3.18/{0076-Add-tsc210x-device-tree-support.patch => 0076-roch-Add-device-tree-support-to-tsc210x-driver.patch} (100%)
copy patches/linux/{3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix => 3.18/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix} (99%)
delete mode 100644 patches/linux/3.18/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
rename patches/linux/3.18/{0219-Add-tsc210x-device-tree-support-for-apf27dev.patch => 0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch} (100%)
rename patches/linux/3.18/{0230-armadeus-fixes-vpu-spll-clock-dependency.patch => 0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch} (100%)
rename patches/linux/3.18/{0420-armadeus-Add-apf28dev-dts.patch => 0420-armadeus-Improve-apf28dev-dts.patch} (80%)
rename patches/linux/3.18/{0444-armadeus-imx27-add-usb.patch => 0444-armadeus-usb-chipidea-add-imx27-support.patch} (100%)
copy patches/linux/{3.15/0446-armadeus_add_pm_power_off_function.patch => 3.18/0446-armadeus-mxs-add-pm_power_off-function.patch} (76%)
delete mode 100644 patches/linux/3.18/0446-armadeus_add_pm_power_off_function.patch
copy patches/linux/{3.4.48 => 3.4.105} (100%)
diff --git a/buildroot/configs/apf6failsafe_defconfig b/buildroot/configs/apf6failsafe_defconfig
index 8b0aa35..ceddcca 100644
--- a/buildroot/configs/apf6failsafe_defconfig
+++ b/buildroot/configs/apf6failsafe_defconfig
@@ -11,7 +11,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.14-rc4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.27"
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)failsafe-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.9-rc4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.9-rc4.config
deleted file mode 120000
index 9e93e0d..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.9-rc4.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.9.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.48.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.105.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.4.48.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.4.105.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.6.config
deleted file mode 120000
index ba0c3a3..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.4.6.config
+++ /dev/null
@@ -1 +0,0 @@
-apf28-linux-3.4.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc4.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc4.config
deleted file mode 120000
index a6a73f6..0000000
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14-rc4.config
+++ /dev/null
@@ -1 +0,0 @@
-apf51-linux-3.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.8.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.27.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.14.8.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.14.27.config
diff --git a/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14-rc4.config b/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14-rc4.config
deleted file mode 120000
index b23fbcc..0000000
--- a/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14-rc4.config
+++ /dev/null
@@ -1 +0,0 @@
-apf6failsafe-linux-3.14.config
\ No newline at end of file
diff --git a/patches/linux/3.18/0035-armadeus-re_add_pwm_and_correct_driver.tofix b/patches/linux/3.18/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix
similarity index 100%
rename from patches/linux/3.18/0035-armadeus-re_add_pwm_and_correct_driver.tofix
rename to patches/linux/3.18/0035-armadeus-re-add-pwm-for-mx1-and-fixes-mxc-pwm-driver.tofix
diff --git a/patches/linux/3.18/0076-Add-tsc210x-device-tree-support.patch b/patches/linux/3.18/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch
similarity index 100%
rename from patches/linux/3.18/0076-Add-tsc210x-device-tree-support.patch
rename to patches/linux/3.18/0076-roch-Add-device-tree-support-to-tsc210x-driver.patch
diff --git a/patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix b/patches/linux/3.18/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
similarity index 99%
copy from patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
copy to patches/linux/3.18/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
index d6a1205..4edc265 100644
--- a/patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
+++ b/patches/linux/3.18/0101-armadeus-clock-imx1-avoid-crash-when-loading-as-module-a-driver-registering-a-clock.tofix
@@ -1,4 +1,5 @@
This patch suppress kernel oops when a driver, compiled as module, get a clock.
+
--- a/arch/arm/mach-imx/clock-imx1.c 2011-01-09 16:11:35.000000000 +0100
+++ b/arch/arm/mach-imx/clock-imx1.c 2011-01-09 16:11:47.000000000 +0100
@@ -582,7 +582,7 @@
diff --git a/patches/linux/3.18/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix b/patches/linux/3.18/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
deleted file mode 100644
index d6a1205..0000000
--- a/patches/linux/3.18/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
+++ /dev/null
@@ -1,12 +0,0 @@
-This patch suppress kernel oops when a driver, compiled as module, get a clock.
---- a/arch/arm/mach-imx/clock-imx1.c 2011-01-09 16:11:35.000000000 +0100
-+++ b/arch/arm/mach-imx/clock-imx1.c 2011-01-09 16:11:47.000000000 +0100
-@@ -582,7 +582,7 @@
- .con_id = n, \
- .clk = &c, \
- },
--static struct clk_lookup lookups[] __initdata = {
-+static struct clk_lookup lookups[] = {
- _REGISTER_CLOCK(NULL, "dma", dma_clk)
- _REGISTER_CLOCK("mx1-camera.0", NULL, csi_clk)
- _REGISTER_CLOCK(NULL, "mma", mma_clk)
diff --git a/patches/linux/3.18/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch b/patches/linux/3.18/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch
similarity index 100%
rename from patches/linux/3.18/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
rename to patches/linux/3.18/0219-roch-dts-Add-tsc210x-device-tree-declaration-for-apf27dev.patch
diff --git a/patches/linux/3.18/0230-armadeus-fixes-vpu-spll-clock-dependency.patch b/patches/linux/3.18/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch
similarity index 100%
rename from patches/linux/3.18/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
rename to patches/linux/3.18/0230-armadeus-clk-imx27-fixes-vpu-spll-clock-dependency.patch
diff --git a/patches/linux/3.18/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
similarity index 80%
rename from patches/linux/3.18/0420-armadeus-Add-apf28dev-dts.patch
rename to patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
index 8639882..a331255 100644
--- a/patches/linux/3.18/0420-armadeus-Add-apf28dev-dts.patch
+++ b/patches/linux/3.18/0420-armadeus-Improve-apf28dev-dts.patch
@@ -1,9 +1,5 @@
-From 8262b3cd32259533556e6dd8d1cd0a4c77c6acfe Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Mon, 15 Jul 2013 15:26:14 +0200
-Subject: [PATCH] Fix spidev
+Remaining Armadeus tweaks for APF28Dev device tree.
-Signed-off-by: Julien Boibessot <jul...@ar...>
---
Index: linux-3.15.5/arch/arm/boot/dts/imx28-apf28dev.dts
===================================================================
diff --git a/patches/linux/3.18/0444-armadeus-imx27-add-usb.patch b/patches/linux/3.18/0444-armadeus-usb-chipidea-add-imx27-support.patch
similarity index 100%
rename from patches/linux/3.18/0444-armadeus-imx27-add-usb.patch
rename to patches/linux/3.18/0444-armadeus-usb-chipidea-add-imx27-support.patch
diff --git a/patches/linux/3.15/0446-armadeus_add_pm_power_off_function.patch b/patches/linux/3.18/0446-armadeus-mxs-add-pm_power_off-function.patch
similarity index 76%
copy from patches/linux/3.15/0446-armadeus_add_pm_power_off_function.patch
copy to patches/linux/3.18/0446-armadeus-mxs-add-pm_power_off-function.patch
index ce4a7df..98eace1 100644
--- a/patches/linux/3.15/0446-armadeus_add_pm_power_off_function.patch
+++ b/patches/linux/3.18/0446-armadeus-mxs-add-pm_power_off-function.patch
@@ -1,3 +1,13 @@
+apf28: add pm_power_off function
+
+When shutting down the board with the poweroff command, an halt is
+actually performed because there is no pm_power_off function defined.
+The SoC is then stuck in an infinite loop.
+
+This patch adds a pm_power_off function to shut down the SoC.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+
Index: linux-3.14-rc7/arch/arm/mach-mxs/mach-mxs.c
===================================================================
--- linux-3.14-rc7.orig/arch/arm/mach-mxs/mach-mxs.c
diff --git a/patches/linux/3.18/0446-armadeus_add_pm_power_off_function.patch b/patches/linux/3.18/0446-armadeus_add_pm_power_off_function.patch
deleted file mode 100644
index ce4a7df..0000000
--- a/patches/linux/3.18/0446-armadeus_add_pm_power_off_function.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: linux-3.14-rc7/arch/arm/mach-mxs/mach-mxs.c
-===================================================================
---- linux-3.14-rc7.orig/arch/arm/mach-mxs/mach-mxs.c
-+++ linux-3.14-rc7/arch/arm/mach-mxs/mach-mxs.c
-@@ -242,9 +242,34 @@ static void __init imx28_evk_init(void)
- mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0);
- }
-
-+#define BM_POWER_RESET_UNLOCK 0xFFFF0000
-+#define BV_POWER_RESET_UNLOCK__KEY 0x3E77
-+#define BM_POWER_RESET_PWD 0x00000001
-+#define HW_POWER_RESET 0x00000100
-+#define BF_POWER_RESET_UNLOCK(v) \
-+ (((v) << 16) & BM_POWER_RESET_UNLOCK)
-+
-+static void apf28_power_off(void)
-+{
-+ struct device_node *np;
-+ void __iomem *power_base;
-+
-+ np = of_find_node_by_name(NULL, "power");
-+ if (!np)
-+ return;
-+
-+ power_base = of_iomap(np, 0);
-+ if (!power_base)
-+ return;
-+
-+ __mxs_setl(BF_POWER_RESET_UNLOCK(BV_POWER_RESET_UNLOCK__KEY) |
-+ BM_POWER_RESET_PWD, power_base + HW_POWER_RESET);
-+}
-+
- static void __init imx28_apf28_init(void)
- {
- update_fec_mac_prop(OUI_ARMADEUS);
-+ pm_power_off = apf28_power_off;
- }
-
- static int apx4devkit_phy_fixup(struct phy_device *phy)
diff --git a/patches/linux/3.4.48 b/patches/linux/3.4.105
similarity index 100%
copy from patches/linux/3.4.48
copy to patches/linux/3.4.105
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-12-24 13:38:29
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via eec9ddb124b46f9bd6e795ab1c353b5c6737f003 (commit)
from a03c2795a572b873dc3b3c155cc3e00857f1987b (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 eec9ddb124b46f9bd6e795ab1c353b5c6737f003
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 24 14:35:52 2014 +0100
[TOOLS] apf6_recover: improve user experience with colors and better description :-)
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf6_recovery.py | 40 +++++++++++++++++--------------
software/uboot_recover/helpers.py | 9 +++++++
2 files changed, 31 insertions(+), 18 deletions(-)
create mode 100644 software/uboot_recover/helpers.py
diff --git a/software/uboot_recover/apf6_recovery.py b/software/uboot_recover/apf6_recovery.py
index 606e82f..4db47fc 100644
--- a/software/uboot_recover/apf6_recovery.py
+++ b/software/uboot_recover/apf6_recovery.py
@@ -28,6 +28,8 @@ import subprocess
import sys
import time
+from helpers import color
+
class UBoot:
def __init__(self, serial):
@@ -85,39 +87,41 @@ if __name__ == "__main__":
U_BOOT_IMG = "apf6-u-boot.img"
SPEED = 115200
- print "\n--- APF6 Bootstrap Tool ---\n"
+ print color.BOLD + "\n--- APF6 Bootstrap Tool ---\n"
print "Procedure to follow:"
- print "1] Power off your board, close all serial terminal sessions, remove all USB cables"
- print "2] Take jumper off BOOT0 pin and put it on BOOT1 pin."
- print "3] Power on your board"
- print "4] Connect a USB cable from your PC to the APF6Dev OTG miniUSB connector"
- print "5] Connect a USB cable from your PC to the APF6Dev console miniUSB connector"
- print "6] Be sure to have built the APF6 BSP: make apf6_defconfig; make"
- print "7] Have launched this script as root (sudo)"
- print "8] Have sb installed (On Ubuntu: sudo apt-get install lrzsz)\n"
- port = raw_input('--- Enter serial port number or device name to use for console (/dev/ttyUSB0 under Linux (default) or COMx under Window$): ')
+ print "1] Be sure to:"
+ print " * have built the APF6 BSP (make apf6_defconfig; make),"
+ print " * have \"sb\" tool installed (On Ubuntu: sudo apt-get install lrzsz),"
+ print " * have launched this script as root (sudo)."
+ print "2] Power off your board, close all serial terminal sessions, remove all USB cables"
+ print "3] Take jumper off BOOT0 pin and put it on BOOT1 pin."
+ print "4] Power on your board"
+ print "5] Connect a USB cable from your PC to the APF6Dev OTG miniUSB connector"
+ print "6] Connect a USB cable from your PC to the APF6Dev console miniUSB connector"
+ print ""
+ port = raw_input('--- Then, enter serial port number or device name to use for console (/dev/ttyUSB0 under Linux (default) or COMx under Window$): ' + color.END)
if port == '':
port = '/dev/ttyUSB0'
if not os.path.exists(USB_DOWNLOAD_APP):
- print "Error: imx_usb is not present. Please compile Armadeus BSP first: make apf6_defconfig; make"
+ print color.RED + "Error: imx_usb is not present. Please compile Armadeus BSP first: make apf6_defconfig; make" + color.END
sys.exit(1)
if not os.path.exists(U_BOOT_SPL) or not os.path.exists(U_BOOT_IMG):
- print "Error: U-Boot binaries don't exist !"
+ print color.RED + "Error: U-Boot binaries don't exist !" + color.END
sys.exit(1)
try:
subprocess.call([SERIAL_DOWNLOAD_APP, "--version"])
except OSError:
- print "Error: " + SERIAL_DOWNLOAD_APP + " not found. Did you install lrzsz package on your system ?"
+ print color.RED + "Error: " + SERIAL_DOWNLOAD_APP + " not found. Did you install lrzsz package on your system ?" + color.END
sys.exit(1)
try:
subprocess.check_call([USB_DOWNLOAD_APP, "-c", BR_HOST_PATH + "/usr/share/imx_usb_loader/", U_BOOT_SPL])
subprocess.check_call(SERIAL_DOWNLOAD_APP + " -k " + U_BOOT_IMG + " > " + port + " < " + port, shell=True)
except subprocess.CalledProcessError:
- print "Error: Loading U-Boot binaries failed !"
+ print color.RED + "Error: Loading U-Boot binaries failed !" + color.END
sys.exit(1)
try:
@@ -141,7 +145,7 @@ if __name__ == "__main__":
uboot.waitForPrompt()
uboot.flash_img()
- eraseAll = raw_input('\n--- Would you like to erase the environment variables ? y/N: ')
+ eraseAll = raw_input(color.BOLD + '\n--- Would you like to erase the environment variables ? y/N: ' + color.END)
if eraseAll == 'y':
uboot.resetEnv()
except serial.SerialException:
@@ -152,9 +156,9 @@ if __name__ == "__main__":
ser.close()
sys.exit(1)
except subprocess.CalledProcessError:
- print "Error: Loading U-Boot binaries on serial port failed !"
+ print color.RED + "Error: Loading U-Boot binaries on serial port failed !" + color.END
ser.close()
sys.exit(1)
else:
- print "\n--- U-Boot successfully recovered !"
- print "--- Now you can remove miniUSB OTG cable and put the jumper back on BOOT0 pin. Your board is running..."
+ print color.GREEN + "\n--- U-Boot successfully recovered !" + color.END
+ print color.BOLD + "--- Now you can remove miniUSB OTG cable and put the jumper back on BOOT0 pin. Your board is running..." + color.END
diff --git a/software/uboot_recover/helpers.py b/software/uboot_recover/helpers.py
new file mode 100644
index 0000000..c26a40c
--- /dev/null
+++ b/software/uboot_recover/helpers.py
@@ -0,0 +1,9 @@
+
+class color:
+ BLUE = '\033[94m'
+ GREEN = '\033[92m'
+ YELLOW = '\033[93m'
+ RED = '\033[91m'
+ BOLD = '\033[1m'
+ UNDERLINE = '\033[4m'
+ END = '\033[0m'
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-12-23 14:10:41
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via a03c2795a572b873dc3b3c155cc3e00857f1987b (commit)
via f3d8536b5c7b66dd2ca375df757439ea19db7364 (commit)
from 4150a6f5c09aac18a6b86361fb3e5795a086d800 (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 a03c2795a572b873dc3b3c155cc3e00857f1987b
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Dec 23 15:12:34 2014 +0100
[UBOOT] 2014.07: apf6: enable hdmi, netconsole and fix OTG pin ID
muxing
commit f3d8536b5c7b66dd2ca375df757439ea19db7364
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Dec 16 14:03:08 2014 +0100
[U-BOOT] 2014.07: use mmcpart and mmcdev vars in flash_kernel and
flash_dtb commands.
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 39 +++--
patches/u-boot/2014.07/503-add-apf6.patch | 173 ++++++++++---------
2 files changed, 113 insertions(+), 99 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 1008b64..463aa75 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
@@ -16,7 +16,7 @@
#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 2
+#define CONFIG_ENV_VERSION 4
#define CONFIG_BOARD_NAME apf6
/* SPL */
@@ -68,6 +68,7 @@
#define CONFIG_CMD_EXT4_WRITE
#define CONFIG_CMD_FAT
#define CONFIG_CMD_FS_GENERIC
+#define CONFIG_CMD_HDMIDETECT
#define CONFIG_CMD_MII
#define CONFIG_CMD_MMC
#define CONFIG_CMD_NET
@@ -102,36 +103,35 @@
#define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_ETHPRIME "FEC"
#define CONFIG_FEC_MXC_PHYADDR 1
+#define CONFIG_NETCONSOLE
#define CONFIG_PHYLIB
#define CONFIG_PHY_ATHEROS
/* Framebuffer */
-#define CONFIG_VIDEO
-#define CONFIG_VIDEO_IPUV3
+#define CONFIG_BMP_16BPP
#define CONFIG_CFB_CONSOLE
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
-#define CONFIG_VIDEO_BMP_RLE8
+#define CONFIG_IMX_HDMI
+#define CONFIG_IMX_VIDEO_SKIP
+#define CONFIG_IPUV3_CLK 260000000
#define CONFIG_SPLASH_SCREEN
#define CONFIG_SPLASH_SCREEN_ALIGN
-#define CONFIG_BMP_16BPP
+#define CONFIG_VGA_AS_SINGLE_DEVICE
+#define CONFIG_VIDEO
+#define CONFIG_VIDEO_BMP_RLE8
+#define CONFIG_VIDEO_IPUV3
#define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_BMP_LOGO
-#define CONFIG_IPUV3_CLK 260000000
-#define CONFIG_IMX_HDMI
/* USB Configs */
#define CONFIG_USB_DEVICE
#define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_MX6
#define CONFIG_USB_STORAGE
-#define CONFIG_USB_KEYBOARD
#define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
#define CONFIG_USB_HOST_ETHER
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
+#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
/* Gadget part */
#define CONFIG_CI_UDC
#define CONFIG_USB_GADGET
@@ -141,7 +141,7 @@
#define CONFIG_USBDOWNLOAD_GADGET
#define CONFIG_G_DNL_VENDOR_NUM 0x0525
#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5
-#define CONFIG_G_DNL_MANUFACTURER "ARMadeus Systems"
+#define CONFIG_G_DNL_MANUFACTURER "Armadeus Systems"
/* PCIE */
#define CONFIG_PCI
@@ -184,6 +184,9 @@
"initrd_high=0xffffffff\0" \
"fdt_addr=0x18000000\0" \
"ip_dyn=yes\0" \
+ "stdin=serial\0" \
+ "stout=serial\0" \
+ "sterr=serial\0" \
"mmcdev=0\0" \
"mmcpart=1\0" \
"mmcroot=/dev/mmcblk2p2 ro\0" \
@@ -201,7 +204,7 @@
"echo Flash environment variables erased!\0" \
"download_uboot_spl=tftpboot ${loadaddr} ${board_name}-u-boot.spl\0" \
"flash_uboot_spl=" \
- "if mmc dev ${mmcdev} 1; then " \
+ "if mmc dev 0 1; then " \
"setexpr sz ${filesize} / 0x200; " \
"setexpr sz ${sz} + 1; " \
"if mmc write ${loadaddr} 0x2 ${sz}; then " \
@@ -211,7 +214,7 @@
"fi;\0" \
"download_uboot_img=tftpboot ${loadaddr} ${board_name}-u-boot.img\0" \
"flash_uboot_img=" \
- "if mmc dev ${mmcdev} 1; then " \
+ "if mmc dev 0 1; then " \
"setexpr sz ${filesize} / 0x200; " \
"setexpr sz ${sz} + 1; " \
"if mmc write ${loadaddr} 0x8a ${sz}; then " \
@@ -223,14 +226,14 @@
"download_uboot_img flash_uboot_img\0" \
"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
"flash_kernel=" \
- "if ext4write mmc 0:1 ${loadaddr} /${board_name}-linux.bin ${filesize}; then " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /${board_name}-linux.bin ${filesize}; then " \
"echo Flashing of kernel succeed; " \
"else echo Flashing of kernel failed; " \
"fi;\0" \
"update_kernel=run download_kernel flash_kernel\0" \
"download_dtb=tftpboot ${loadaddr} ${fdt_file}\0" \
"flash_dtb=" \
- "if ext4write mmc 0:1 ${loadaddr} /dtbs/${fdt_file} ${filesize}; then " \
+ "if ext4write mmc ${mmcdev}:${mmcpart} ${loadaddr} /dtbs/${fdt_file} ${filesize}; then " \
"echo Flashing of dtb succeed; " \
"else echo Flashing of dtb failed; " \
"fi;\0" \
@@ -256,7 +259,9 @@
/* Miscellaneous configurable options */
#define CONFIG_AUTO_COMPLETE
#define CONFIG_CMDLINE_EDITING
+#define CONFIG_CONSOLE_MUX
#define CONFIG_SYS_CBSIZE 256
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
#define CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PROMPT "BIOS> "
diff --git a/patches/u-boot/2014.07/503-add-apf6.patch b/patches/u-boot/2014.07/503-add-apf6.patch
index 62acd21..06a069d 100644
--- a/patches/u-boot/2014.07/503-add-apf6.patch
+++ b/patches/u-boot/2014.07/503-add-apf6.patch
@@ -1,8 +1,8 @@
Index: uboot-2014.07/boards.cfg
===================================================================
---- uboot-2014.07.orig/boards.cfg 2014-09-15 15:29:00.526533554 +0200
-+++ uboot-2014.07/boards.cfg 2014-09-15 15:29:00.534533691 +0200
-@@ -318,6 +318,7 @@
+--- uboot-2014.07.orig/boards.cfg
++++ uboot-2014.07/boards.cfg
+@@ -318,6 +318,7 @@ Active arm armv7 mx6
Active arm armv7 mx6 - wandboard wandboard_dl wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024 Fabio Estevam <fab...@fr...>
Active arm armv7 mx6 - wandboard wandboard_quad wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048 Fabio Estevam <fab...@fr...>
Active arm armv7 mx6 - wandboard wandboard_solo wandboard:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512 Fabio Estevam <fab...@fr...>
@@ -12,8 +12,8 @@ Index: uboot-2014.07/boards.cfg
Active arm armv7 mx6 boundary nitrogen6x nitrogen6dl nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024 Eric Nelson <eri...@bo...>
Index: uboot-2014.07/board/armadeus/apf6/Makefile
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ uboot-2014.07/board/armadeus/apf6/Makefile 2014-09-15 15:29:00.538533761 +0200
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/Makefile
@@ -0,0 +1,8 @@
+#
+# Copyright (C) 2014, ARMadeus Systems <su...@ar...>
@@ -25,9 +25,9 @@ Index: uboot-2014.07/board/armadeus/apf6/Makefile
+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,377 @@
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/apf6.c
+@@ -0,0 +1,386 @@
+/*
+ * Copyright (C) 2013 Armadeus systems.
+ *
@@ -36,30 +36,23 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
-+#include <common.h>
-+#include <asm/io.h>
+#include <asm/arch/clock.h>
++#include <asm/arch/crm_regs.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/iomux.h>
+#include <asm/arch/mx6-pins.h>
-+#include <asm/arch/crm_regs.h>
++#include <asm/arch/mxc_hdmi.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/gpio.h>
-+#include <asm/imx-common/iomux-v3.h>
-+#include <asm/imx-common/mxc_i2c.h>
+#include <asm/imx-common/boot_mode.h>
-+#include <hwconfig.h>
-+#include <linux/ctype.h>
-+#include <fdt_support.h>
++#include <asm/imx-common/video.h>
++#include <asm/io.h>
++#include <common.h>
+#include <fsl_esdhc.h>
++#include <linux/ctype.h>
+#include <miiphy.h>
+#include <mmc.h>
-+#include <mtd_node.h>
+#include <netdev.h>
-+#include <fdt_support.h>
-+#include <ipu_pixfmt.h>
-+#include <mmc.h>
-+#include <linux/fb.h>
+#include "fpga.h"
+
+DECLARE_GLOBAL_DATA_PTR;
@@ -78,6 +71,12 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+#define ENET_PAD_CTRL2 (PAD_CTL_PUS_22K_UP | \
+ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
+
++#define FPGA_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
++ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS)
++
++#define USB_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_47K_UP | \
++ PAD_CTL_PUE)
++
+#define USDHC2_CD_GPIO IMX_GPIO_NR(1, 2)
+#define ETH_PHY_RESET IMX_GPIO_NR(1, 24)
+
@@ -131,6 +130,27 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ IOMUX_PADS(PAD_ENET_TX_EN__GPIO1_IO28 | MUX_PAD_CTRL(NO_PAD_CTRL)),
+};
+
++static iomux_v3_cfg_t const fpga_pads[] = {
++ /* FPGA AS_DATA enet_txd1*/
++ 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)),
++};
++
++static iomux_v3_cfg_t const usb_pads[] = {
++ IOMUX_PADS(PAD_GPIO_1__USB_OTG_ID | MUX_PAD_CTRL(USB_PAD_CTRL)),
++};
++
+static void setup_iomux_uart(void)
+{
+ SETUP_IOMUX_PADS(uart4_pads);
@@ -146,6 +166,11 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ gpio_set_value(ETH_PHY_RESET, 1);
+}
+
++static void setup_fpga(void)
++{
++ SETUP_IOMUX_PADS(fpga_pads);
++}
++
+static struct fsl_esdhc_cfg usdhc_cfg[2] = {
+ {USDHC3_BASE_ADDR},
+ {USDHC2_BASE_ADDR},
@@ -258,28 +283,41 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ .vmode = FB_VMODE_NONINTERLACED
+};
+
-+int board_video_skip(void)
++static void do_enable_hdmi(struct display_info_t const *dev)
+{
-+ int ret;
-+
-+ ret = ipuv3_fb_init(&hdmi, 0, IPU_PIX_FMT_RGB24);
-+
-+ if (ret)
-+ printf("HDMI cannot be configured: %d\n", ret);
-+
-+
-+// imx_enable_hdmi_phy();
-+
-+ return ret;
++ imx_enable_hdmi_phy();
+}
+
++struct display_info_t const displays[] = {{
++ .bus = -1,
++ .addr = 0,
++ .pixfmt = IPU_PIX_FMT_RGB24,
++ .detect = detect_hdmi,
++ .enable = do_enable_hdmi,
++ .mode = {
++ .name = "HDMI",
++ .refresh = 60,
++ .xres = 1024,
++ .yres = 768,
++ .pixclock = 15385,
++ .left_margin = 220,
++ .right_margin = 40,
++ .upper_margin = 21,
++ .lower_margin = 7,
++ .hsync_len = 60,
++ .vsync_len = 10,
++ .sync = FB_SYNC_EXT,
++ .vmode = FB_VMODE_NONINTERLACED
++} } };
++size_t display_count = ARRAY_SIZE(displays);
++
+static void setup_display(void)
+{
+ struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR;
+ int reg;
+
+ enable_ipu_clock();
-+ //imx_setup_hdmi();
++ imx_setup_hdmi();
+
+ reg = readl(&mxc_ccm->chsccdr);
+ reg |= (CHSCCDR_CLK_SEL_LDB_DI0
@@ -301,34 +339,6 @@ 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();
@@ -342,21 +352,14 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ return 0;
+}
+
-+/*
-+ * Do not overwrite the console
-+ * Use always serial for U-Boot console
-+ */
-+int overwrite_console(void)
-+{
-+ return 1;
-+}
-+
+int board_late_init(void)
+{
+ u_char *firmware_buffer =
+ (u_char *) (CONFIG_SYS_LOAD_ADDR + CONFIG_SYS_MONITOR_LEN);
+ size_t size = 0;
+
++ SETUP_IOMUX_PADS(usb_pads);
++
+ 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))
@@ -380,7 +383,6 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+ APF6_init_fpga(firmware_buffer, size);
+#endif
+
-+
+ return 0;
+}
+
@@ -393,6 +395,13 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+
+int board_init(void)
+{
++ struct iomuxc_base_regs *const iomuxc_regs
++ = (struct iomuxc_base_regs *)IOMUXC_BASE_ADDR;
++
++ clrsetbits_le32(&iomuxc_regs->gpr[1],
++ IOMUXC_GPR1_OTG_ID_MASK,
++ IOMUXC_GPR1_OTG_ID_GPIO1);
++
+ /* address of boot parameters */
+ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
+
@@ -407,8 +416,8 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.c
+}
Index: uboot-2014.07/board/armadeus/apf6/apf6.cfg
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ uboot-2014.07/board/armadeus/apf6/apf6.cfg 2014-09-15 15:29:00.538533761 +0200
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/apf6.cfg
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2014 ARMadeus Systems <su...@ar...>
@@ -433,8 +442,8 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6.cfg
+#include "clocks.cfg"
Index: uboot-2014.07/board/armadeus/apf6/apf6_spl.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ uboot-2014.07/board/armadeus/apf6/apf6_spl.c 2014-09-15 15:29:00.538533761 +0200
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/apf6_spl.c
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2014 ARMadeus systems <su...@ar...>
@@ -689,8 +698,8 @@ Index: uboot-2014.07/board/armadeus/apf6/apf6_spl.c
+}
Index: uboot-2014.07/board/armadeus/apf6/clocks.cfg
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ uboot-2014.07/board/armadeus/apf6/clocks.cfg 2014-09-15 15:29:00.538533761 +0200
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/clocks.cfg
@@ -0,0 +1,25 @@
+/* set the default clock gate to save power */
+DATA 4, CCM_CCGR0, 0x00C03F3F
@@ -719,8 +728,8 @@ Index: uboot-2014.07/board/armadeus/apf6/clocks.cfg
+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
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/fpga.c
@@ -0,0 +1,173 @@
+/*
+ * (C) Copyright 2002-2014
@@ -897,8 +906,8 @@ Index: uboot-2014.07/board/armadeus/apf6/fpga.c
+#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
+--- /dev/null
++++ uboot-2014.07/board/armadeus/apf6/fpga.h
@@ -0,0 +1,34 @@
+/*
+ * (C) Copyright 2002-2010
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-12-23 09:57:05
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4150a6f5c09aac18a6b86361fb3e5795a086d800 (commit)
from accbfac067cd907eda248e2e991e84c5f1b3e7b0 (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 4150a6f5c09aac18a6b86361fb3e5795a086d800
Author: Julien Boibessot <jul...@ar...>
Date: Tue Dec 23 10:50:42 2014 +0100
[DEMOS] Makes oscillo runs on every LCD resolution
-----------------------------------------------------------------------
Summary of changes:
target/demos/oscillo/lcd.c | 15 ++++++++++++++-
target/demos/oscillo/lcd.h | 4 +++-
target/demos/oscillo/main.c | 19 +++++++++++--------
3 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/target/demos/oscillo/lcd.c b/target/demos/oscillo/lcd.c
index cb5ea5d..f6ee35a 100644
--- a/target/demos/oscillo/lcd.c
+++ b/target/demos/oscillo/lcd.c
@@ -39,6 +39,8 @@ char *fbp = 0;
struct fb_var_screeninfo vinfo;
struct fb_fix_screeninfo finfo;
long int screensize = 0;
+unsigned long xres = 0;
+unsigned long yres = 0;
int init_lcd()
{
@@ -68,6 +70,8 @@ int init_lcd()
/* Figure out the size of the screen in bytes */
screensize = vinfo.xres * vinfo.yres * vinfo.bits_per_pixel / 8;
+ xres = vinfo.xres;
+ yres = vinfo.yres;
/* Map the device to memory */
fbp = (char *)mmap(0, screensize, PROT_READ | PROT_WRITE, MAP_SHARED,
@@ -87,6 +91,15 @@ void close_lcd(int fbfd)
close(fbfd);
}
+unsigned long lcd_get_xres(void)
+{
+ return xres;
+}
+
+unsigned long lcd_get_yres(void)
+{
+ return yres;
+}
void draw_pixel(unsigned int x, unsigned int y, struct color rgb)
{
@@ -97,7 +110,7 @@ void draw_pixel(unsigned int x, unsigned int y, struct color rgb)
if (x >= vinfo.xres)
x = vinfo.xres-1;
if (y >= vinfo.yres)
- x = vinfo.yres-1;
+ y = vinfo.yres-1;
}
location = (x+vinfo.xoffset) * (vinfo.bits_per_pixel/8) +
(y+vinfo.yoffset) * finfo.line_length;
diff --git a/target/demos/oscillo/lcd.h b/target/demos/oscillo/lcd.h
index d2d2fbc..10d99ec 100644
--- a/target/demos/oscillo/lcd.h
+++ b/target/demos/oscillo/lcd.h
@@ -7,7 +7,9 @@ struct color {
int b;
};
-int init_lcd ();
+int init_lcd(void);
+unsigned long lcd_get_xres(void);
+unsigned long lcd_get_yres(void);
void close_lcd(int fbfd);
void draw_pixel(unsigned int x, unsigned int y, struct color rgb);
void clear_vline(unsigned int x);
diff --git a/target/demos/oscillo/main.c b/target/demos/oscillo/main.c
index 452452d..3ea1f2d 100644
--- a/target/demos/oscillo/main.c
+++ b/target/demos/oscillo/main.c
@@ -47,7 +47,7 @@ int main(void /*int argc, char **argv*/)
/*int x[MAX_CHANNELS] = {0, 10, 20, 30, 40, 50, 60, 70};*/
int y[MAX_CHANNELS];
int time = 0, i;
- int nb_channels;
+ int nb_channels, xres, yres;
double rad;
struct color colours[MAX_CHANNELS] = {{120,120,120},{0,150,150},{160,0,160},{170,170,0}};
@@ -58,19 +58,22 @@ int main(void /*int argc, char **argv*/)
return EXIT_FAILURE;
nb_channels = 3;
+ xres = lcd_get_xres();
+ yres = lcd_get_yres();
+
while(1) {
- time += 1;
- if (time >= 479) {
- time = 0;
- }
for (i=0; i<nb_channels; i++) {
rad += 0.01745f;
- y[i] = (unsigned int)(sin(rad)*100 + 136 + 5*i);
+ y[i] = (unsigned int)(sin(rad)*100 + (yres/2) + 5*i);
//printf("%d: %d %d\n", i, time, y[i]);
draw_pixel(time, y[i], colours[i]);
}
- clear_vline(time+1);
- usleep(50000);
+ time += 1;
+ if (time >= xres) {
+ time = 0;
+ }
+ clear_vline(time);
+ usleep(20000);
}
return EXIT_SUCCESS;
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-12-21 12:02:05
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via accbfac067cd907eda248e2e991e84c5f1b3e7b0 (commit)
via 479ed7ed4cec5064a2055055799296f9d3252eda (commit)
via 9d87b752201867019d58a7fc6adaa060f3f66a72 (commit)
via f1ad89806be0449537089e147fb16ab44c2cbbe9 (commit)
from 4671a0ad4c78b3730d61789d4f2160a61284a07e (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 accbfac067cd907eda248e2e991e84c5f1b3e7b0
Author: Philippe Reynes <tr...@gm...>
Date: Sat Dec 20 12:21:59 2014 +0100
[LINUX] 3.18: move to 3.18.1
commit 479ed7ed4cec5064a2055055799296f9d3252eda
Author: Philippe Reynes <tr...@gm...>
Date: Sat Dec 20 12:21:58 2014 +0100
[LINUX] 3.17: move to 3.17.7
commit 9d87b752201867019d58a7fc6adaa060f3f66a72
Author: Philippe Reynes <tr...@gm...>
Date: Sat Dec 20 12:21:57 2014 +0100
[LINUX] 3.14: move to 3.14.27
commit f1ad89806be0449537089e147fb16ab44c2cbbe9
Author: Philippe Reynes <tr...@gm...>
Date: Sat Dec 20 12:21:56 2014 +0100
[LINUX] 3.10: move to 3.10.63
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.62.config => apf27-linux-3.10.63.config} | 0
...x-3.14.26.config => apf27-linux-3.14.27.config} | 0
...nux-3.17.6.config => apf27-linux-3.17.7.config} | 0
.../armadeus/apf27/apf27-linux-3.18.1.config | 1 +
...x-3.10.62.config => apf28-linux-3.10.63.config} | 0
...x-3.14.26.config => apf28-linux-3.14.27.config} | 0
...nux-3.17.6.config => apf28-linux-3.17.7.config} | 0
.../armadeus/apf28/apf28-linux-3.18.1.config | 1 +
...x-3.10.62.config => apf51-linux-3.10.63.config} | 0
...x-3.14.26.config => apf51-linux-3.14.27.config} | 0
...nux-3.17.6.config => apf51-linux-3.17.7.config} | 0
.../armadeus/apf51/apf51-linux-3.18.1.config | 1 +
patches/linux/{3.10.62 => 3.10.63} | 0
patches/linux/{3.14.26 => 3.14.27} | 0
patches/linux/{3.17.6 => 3.17.7} | 0
patches/linux/3.18.1 | 1 +
19 files changed, 10 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.62.config => apf27-linux-3.10.63.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.26.config => apf27-linux-3.14.27.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.17.6.config => apf27-linux-3.17.7.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.18.1.config
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.62.config => apf28-linux-3.10.63.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.26.config => apf28-linux-3.14.27.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.17.6.config => apf28-linux-3.17.7.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.18.1.config
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.62.config => apf51-linux-3.10.63.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.26.config => apf51-linux-3.14.27.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.17.6.config => apf51-linux-3.17.7.config} (100%)
create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.18.1.config
rename patches/linux/{3.10.62 => 3.10.63} (100%)
rename patches/linux/{3.14.26 => 3.14.27} (100%)
rename patches/linux/{3.17.6 => 3.17.7} (100%)
create mode 120000 patches/linux/3.18.1
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 8e5ed03..4605124 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.6"
+BR2_DEFAULT_KERNEL_VERSION="3.18.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.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.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 ed6e298..e5cbf02 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.6"
+BR2_DEFAULT_KERNEL_VERSION="3.18.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.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.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 d4d9f06..cb62482 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.6"
+BR2_DEFAULT_KERNEL_VERSION="3.18.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.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.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.62.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.63.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.62.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.63.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.26.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.27.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.26.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.27.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.6.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.17.6.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.17.7.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.1.config
new file mode 120000
index 0000000..305faef
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18.1.config
@@ -0,0 +1 @@
+apf27-linux-3.18.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.62.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.63.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.62.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.63.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.26.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.27.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.26.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.27.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.17.6.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.17.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.17.6.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.17.7.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.18.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18.1.config
new file mode 120000
index 0000000..f82b65f
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18.1.config
@@ -0,0 +1 @@
+apf28-linux-3.18.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.62.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.63.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.62.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.63.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.26.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.27.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.26.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.27.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.6.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.7.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.17.6.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.17.7.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.1.config
new file mode 120000
index 0000000..4a20752
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18.1.config
@@ -0,0 +1 @@
+apf51-linux-3.18.config
\ No newline at end of file
diff --git a/patches/linux/3.10.62 b/patches/linux/3.10.63
similarity index 100%
rename from patches/linux/3.10.62
rename to patches/linux/3.10.63
diff --git a/patches/linux/3.14.26 b/patches/linux/3.14.27
similarity index 100%
rename from patches/linux/3.14.26
rename to patches/linux/3.14.27
diff --git a/patches/linux/3.17.6 b/patches/linux/3.17.7
similarity index 100%
rename from patches/linux/3.17.6
rename to patches/linux/3.17.7
diff --git a/patches/linux/3.18.1 b/patches/linux/3.18.1
new file mode 120000
index 0000000..55b698c
--- /dev/null
+++ b/patches/linux/3.18.1
@@ -0,0 +1 @@
+3.18
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2014-12-18 21:06:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 4671a0ad4c78b3730d61789d4f2160a61284a07e (commit)
via 3ab72345a084c44ff1d1fef7c01c3083dba191de (commit)
via 2ea524dcf045b86cf51f75fbe0c6e7d46bfaab12 (commit)
from 51412cac06a55681b05be6ffa7ae2db930e0fb9d (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 4671a0ad4c78b3730d61789d4f2160a61284a07e
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Thu Dec 18 22:06:48 2014 +0100
[LINUX] add 3.14.17 support for xenomai
commit 3ab72345a084c44ff1d1fef7c01c3083dba191de
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Thu Dec 18 22:06:17 2014 +0100
[LINUX] apf27xenomai: move to 3.14.17
commit 2ea524dcf045b86cf51f75fbe0c6e7d46bfaab12
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Thu Dec 18 22:05:34 2014 +0100
[BUILDROOT] apf27xenomaimainline: move xenomai to 2.6.4 and ipipe to 3.14.17
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27xenomaimainline_defconfig | 10 +++++-----
.../apf27/apf27-linux-3.10.32-xenomai.config | 1 -
...omai.config => apf27-linux-3.14-xenomai.config} | 12 +++++++-----
.../apf27/apf27-linux-3.14.17-xenomai.config | 1 +
patches/linux/{3.14.26 => 3.14.17} | 0
5 files changed, 13 insertions(+), 11 deletions(-)
delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.10.32-xenomai.config
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10-xenomai.config => apf27-linux-3.14-xenomai.config} (98%)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.14.17-xenomai.config
copy patches/linux/{3.14.26 => 3.14.17} (100%)
diff --git a/buildroot/configs/apf27xenomaimainline_defconfig b/buildroot/configs/apf27xenomaimainline_defconfig
index ac440f4..e5340f2 100644
--- a/buildroot/configs/apf27xenomaimainline_defconfig
+++ b/buildroot/configs/apf27xenomaimainline_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.10.32"
+BR2_DEFAULT_KERNEL_VERSION="3.14.17"
BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
@@ -33,7 +33,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.10.32"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14.17"
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)-xenomai.config"
@@ -41,7 +41,7 @@ BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx27-apf27dev"
BR2_LINUX_KERNEL_EXT_XENOMAI=y
-BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="http://download.gna.org/adeos/patches/v3.x/arm/ipipe-core-3.10.32-arm-2.patch"
+BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL="http://download.gna.org/adeos/patches/v3.x/arm/ipipe-core-3.14.17-arm-4.patch"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
@@ -75,7 +75,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
-BR2_PACKAGE_XENOMAI_VERSION="2.6.3"
+BR2_PACKAGE_XENOMAI_VERSION="2.6.4"
BR2_PACKAGE_XENOMAI_TESTSUITE=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_JFFS2=y
@@ -90,7 +90,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2014.04.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2014.04"
BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.04.h"
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2014.04.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin"
BR2_TARGET_UBOOT_NETWORK=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.32-xenomai.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.32-xenomai.config
deleted file mode 120000
index 1ee3ec7..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.32-xenomai.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.10-xenomai.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10-xenomai.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14-xenomai.config
similarity index 98%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10-xenomai.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14-xenomai.config
index 2f3f4c8..5d8a303 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10-xenomai.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14-xenomai.config
@@ -146,14 +146,12 @@ CONFIG_VIDEO_MX2=m
# CONFIG_DVB_TUNER_DIB0070 is not set
# CONFIG_DVB_TUNER_DIB0090 is not set
CONFIG_FB=y
-# CONFIG_FB_MX3 is not set
+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_FONTS=y
-CONFIG_FONT_8x8=y
CONFIG_LOGO=y
CONFIG_SOUND=m
CONFIG_SND=m
@@ -205,10 +203,12 @@ CONFIG_IMX_SDMA=y
CONFIG_IMX_DMA=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_IIO=m
+CONFIG_PWM=y
+CONFIG_PWM_IMX=y
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=y
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
@@ -228,11 +228,13 @@ CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_15=m
CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_FS=y
# CONFIG_SCHED_DEBUG is not set
# CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO=y
# CONFIG_FTRACE is not set
CONFIG_DEBUG_LL=y
CONFIG_EARLY_PRINTK=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.17-xenomai.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.17-xenomai.config
new file mode 120000
index 0000000..61515ac
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.17-xenomai.config
@@ -0,0 +1 @@
+apf27-linux-3.14-xenomai.config
\ No newline at end of file
diff --git a/patches/linux/3.14.26 b/patches/linux/3.14.17
similarity index 100%
copy from patches/linux/3.14.26
copy to patches/linux/3.14.17
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-12-17 18:20: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 51412cac06a55681b05be6ffa7ae2db930e0fb9d (commit)
via f53e7ff8f53288d8ee033b6bd3a7d411a38b5c45 (commit)
via d6129abfe6131515a3471af2f543644575eef64f (commit)
via b9b4ed3c8a8f314f9821d203e2f0d0f66db6c4e8 (commit)
via bdc1c6d0d65667a3e2b98fa3939b2b6ce71118c5 (commit)
from 73f1aed88f2493a1b0385364afa81fc5c2578cb0 (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 51412cac06a55681b05be6ffa7ae2db930e0fb9d
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 17 19:08:57 2014 +0100
[AS_DEVICES] as_spi_msg: add comment to explain internals
commit f53e7ff8f53288d8ee033b6bd3a7d411a38b5c45
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 17 19:05:02 2014 +0100
[AS_DEVICES] AsSpi: get rid of buggy error detection and remove cut'n pasted stuff
commit d6129abfe6131515a3471af2f543644575eef64f
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 17 19:01:49 2014 +0100
[AS_DEVICES] AsSpi: public methods should be defined explicitly with recent GCC
commit b9b4ed3c8a8f314f9821d203e2f0d0f66db6c4e8
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 17 18:26:51 2014 +0100
[AS_DEVICES] as_spi: print error on stderr when spidev device is not valid
commit bdc1c6d0d65667a3e2b98fa3939b2b6ce71118c5
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 17 18:23:35 2014 +0100
[LINUX] APF9328: 2.6.29: Use PA4 (CSI_D0) as spidev CS (instead of PB18, conflicting with FPGA)
-----------------------------------------------------------------------
Summary of changes:
patches/linux/2.6.29/021-armadeus-apf9328.patch | 24 +++---
target/packages/as_devices/c/as_spi.c | 4 +-
target/packages/as_devices/cpp/as_spi.cpp | 113 ++++++-----------------
target/packages/as_devices/cpp/as_spi.hpp | 1 +
4 files changed, 45 insertions(+), 97 deletions(-)
diff --git a/patches/linux/2.6.29/021-armadeus-apf9328.patch b/patches/linux/2.6.29/021-armadeus-apf9328.patch
index 70aadd7..4cd17b9 100644
--- a/patches/linux/2.6.29/021-armadeus-apf9328.patch
+++ b/patches/linux/2.6.29/021-armadeus-apf9328.patch
@@ -4,7 +4,7 @@ DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-imx/apf9328.c 2011-06-15 12:16:40.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-imx/apf9328.c 2014-12-17 18:10:02.048877453 +0100
@@ -0,0 +1,602 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
@@ -611,7 +611,7 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328_lcd_config.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-imx/apf9328_lcd_config.h 2011-06-15 11:57:47.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-imx/apf9328_lcd_config.h 2014-12-17 18:10:02.048877453 +0100
@@ -0,0 +1,301 @@
+/*
+ *
@@ -917,7 +917,7 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328_lcd_config.h
Index: linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h 2011-06-15 14:09:58.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h 2014-12-17 18:10:02.048877453 +0100
@@ -0,0 +1,59 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
@@ -981,7 +981,7 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h
Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c 2011-06-15 11:57:47.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c 2014-12-17 18:19:49.904896128 +0100
@@ -0,0 +1,338 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328-dev.c
@@ -1199,7 +1199,7 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
+ * APF9328 CONFIG SPIDEV
+ */
+#ifdef CONFIG_SPI_SPIDEV
-+#define SPIDEV_CS_GPIOB 18
++#define SPIDEV_CS_GPIOA 4 /* CSI_D0 !! */
+
+static int spidev_init_gpio(void)
+{
@@ -1208,9 +1208,9 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
+ imx_gpio_mode(PC16_PF_SPI1_MISO);
+ imx_gpio_mode(PC17_PF_SPI1_MOSI);
+
-+ /* PortB 18 is used as chip select (in GPIO mode) */
-+ DR(1) |= 1 << SPIDEV_CS_GPIOB; /* Initializes it High */
-+ imx_gpio_mode(GPIO_PORTB | SPIDEV_CS_GPIOB | GPIO_OUT | GPIO_GIUS | GPIO_DR);
++ /* PortA 4 (CSI_D0) is used as chip select (in GPIO mode) */
++ DR(0) |= 1 << SPIDEV_CS_GPIOA; /* Initializes it High */
++ imx_gpio_mode(GPIO_PORTA | SPIDEV_CS_GPIOA | GPIO_OUT | GPIO_GIUS | GPIO_DR);
+
+ return 0;
+}
@@ -1218,11 +1218,11 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
+/* Chip select command for spidev */
+static void spidev_cs(u32 command)
+{
-+ /* PortB 18 is used as chip select */
++ /* PortA 4 (CSI_D0) is used as chip select */
+ if (command == SPI_CS_DEASSERT)
-+ DR(1) |= 1<< SPIDEV_CS_GPIOB;
++ DR(0) |= 1<< SPIDEV_CS_GPIOA;
+ else
-+ DR(1) &= ~(1<< SPIDEV_CS_GPIOB);
++ DR(0) &= ~(1<< SPIDEV_CS_GPIOA);
+}
+
+static struct spi_imx_chip spidev_hw = {
@@ -1268,7 +1268,7 @@ Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
+ .max_speed_hz = 8000000, /* 8MHz */
+ .bus_num = 1, /* SPI1 */
+ .mode = SPI_MODE_0,
-+ .chip_select = 1,
++ .chip_select = 1,
+ .platform_data = &apf9328_spidev_config,
+},
+#endif /* CONFIG_SPI_SPIDEV */
diff --git a/target/packages/as_devices/c/as_spi.c b/target/packages/as_devices/c/as_spi.c
index 268a15c..b141ed2 100644
--- a/target/packages/as_devices/c/as_spi.c
+++ b/target/packages/as_devices/c/as_spi.c
@@ -48,7 +48,7 @@ int as_spi_open(const unsigned char *aSpidev_name)
fd = open((char *)aSpidev_name, O_RDWR);
if (fd < 0) {
- ERROR("spi open.");
+ fprintf(stderr, "%s: can't open %s\n", __func__, aSpidev_name);
return -1;
}
@@ -183,6 +183,8 @@ unsigned long long as_spi_msg(int aFd,
len = sizeof(buf) - 1;
}
+ /* This way of doing (bits -> bytes) allows greater flexibility
+ in SPI messages format (dixit Fabm) */
for (i = len; i > 0; i--) {
buf[i - 1] = msg & 0x01;
msg = msg >> 1;
diff --git a/target/packages/as_devices/cpp/as_spi.cpp b/target/packages/as_devices/cpp/as_spi.cpp
index 31404d8..1a31236 100644
--- a/target/packages/as_devices/cpp/as_spi.cpp
+++ b/target/packages/as_devices/cpp/as_spi.cpp
@@ -20,9 +20,17 @@
**
*/
-#include "as_spi.hpp"
#include <iostream>
+#include "as_spi.hpp"
+
+#define CHECK_INIT \
+ if (mFd <= 0)\
+ {\
+ std::cerr << "AsSpi class not instantianted successfully" << std::endl;\
+ return -1;\
+ }
+
AsSpi::AsSpi(const unsigned char *aSpidev_name)
{
mFd = as_spi_open(aSpidev_name);
@@ -30,129 +38,66 @@ AsSpi::AsSpi(const unsigned char *aSpidev_name)
AsSpi::~AsSpi()
{
- if (mFd != 0)
+ if (mFd > 0)
{
as_spi_close(mFd);
}
else
{
- std::cerr<<"AsSpi file descriptor not initialized"<<std::endl;
+ std::cerr << "AsSpi class not instantianted successfully" << std::endl;
}
}
int AsSpi::setLsb(unsigned char aLsb)
{
- if (mFd != 0)
- {
- return as_spi_set_lsb(mFd, aLsb);
- }
- else
- {
- std::cerr<<"AsSpi file descriptor not initialized"<<std::endl;
- return -1;
- }
+ CHECK_INIT
+ return as_spi_set_lsb(mFd, aLsb);
}
int AsSpi::getLsb() const
{
- if (mFd != 0)
- {
- return as_spi_get_lsb(mFd);
- }
- else
- {
- std::cerr<<"AsSpi file descriptor not initialized"<<std::endl;
- return -1;
- }
+ CHECK_INIT
+ return as_spi_get_lsb(mFd);
}
int AsSpi::setMode(unsigned char aMode)
{
- if (mFd != 0)
- {
- return as_spi_set_mode(mFd, aMode);
- }
- else
- {
- std::cerr<<"AsSpi file descriptor not initialized"<<std::endl;
- return -1;
- }
+ CHECK_INIT
+ return as_spi_set_mode(mFd, aMode);
}
int AsSpi::getMode() const
{
- if (mFd != 0)
- {
- return as_spi_get_mode(mFd);
- }
- else
- {
- std::cerr<<"AsSpi file descriptor not initialized"<<std::endl;
- return -1;
- }
+ CHECK_INIT
+ return as_spi_get_mode(mFd);
}
int AsSpi::setSpeed(unsigned char aSpeed)
{
- if (mFd != 0)
- {
- return as_spi_set_speed(mFd, aSpeed);
- }
- else
- {
- std::cerr<<"AsSpi file descriptor not initialized"<<std::endl;
- return -1;
- }
+ CHECK_INIT
+ return as_spi_set_speed(mFd, aSpeed);
}
int AsSpi::getSpeed() const
{
- if (mFd != 0)
- {
- return as_spi_get_speed(mFd);
- }
- else
- {
- std::cerr<<"AsSpi file descriptor not initialized"<<std::endl;
- return -1;
- }
+ CHECK_INIT
+ return as_spi_get_speed(mFd);
}
int AsSpi::getBitsPerWord() const
{
- if (mFd != 0)
- {
- return as_spi_get_bits_per_word(mFd);
- }
- else
- {
- std::cerr<<"AsSpi file descriptor not initialized"<<std::endl;
- return -1;
- }
+ CHECK_INIT
+ return as_spi_get_bits_per_word(mFd);
}
int AsSpi::setBitsPerWord(unsigned char aBits)
{
- if (mFd != 0)
- {
- return as_spi_set_bits_per_word(mFd, aBits);
- }
- else
- {
- std::cerr<<"AsSpi file descriptor not initialized"<<std::endl;
- return -1;
- }
+ CHECK_INIT
+ return as_spi_set_bits_per_word(mFd, aBits);
}
unsigned long long AsSpi::msg(unsigned long long aMsg, size_t aLen, unsigned long aSpeed)
{
- if (mFd != 0)
- {
- return as_spi_msg(mFd, aMsg, aLen, aSpeed);
- }
- else
- {
- std::cerr<<"AsSpi file descriptor not initialized"<<std::endl;
- return -1;
- }
+ CHECK_INIT
+ return as_spi_msg(mFd, aMsg, aLen, aSpeed);
}
diff --git a/target/packages/as_devices/cpp/as_spi.hpp b/target/packages/as_devices/cpp/as_spi.hpp
index ca53145..3014d64 100644
--- a/target/packages/as_devices/cpp/as_spi.hpp
+++ b/target/packages/as_devices/cpp/as_spi.hpp
@@ -40,6 +40,7 @@
*/
class AsSpi
{
+public:
/** @brief Constructor: Open a SPI bus.
*
* @param aSpidev_name path name
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-12-16 09:22:11
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 73f1aed88f2493a1b0385364afa81fc5c2578cb0 (commit)
from b1982bfa150181c6a2a5e5a7f81f9ee39fd3ec21 (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 73f1aed88f2493a1b0385364afa81fc5c2578cb0
Author: Sébastien Szymanski <ss...@us...>
Date: Tue Dec 16 10:25:26 2014 +0100
[BUILDROOT] 201{3,4}.11: fix imx-usb-loader build
-----------------------------------------------------------------------
Summary of changes:
.../221-v2-3-3-imx-usb-loader-new-package.patch | 26 ++++++++++----------
.../221-v2-3-3-imx-usb-loader-new-package.patch | 26 ++++++++++----------
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch b/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
index ae63fef..f25017f 100644
--- a/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
+++ b/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
@@ -150,32 +150,32 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
+@@ -416,9 +415,9 @@ int main(int argc, char * const argv[])
+ char const *base_path = get_base_path(argv[0]);
+ char const *conf_path = "/etc/imx-loader.d/";
-+
++
+- err = parse_opts(argc, argv, &conf_path, &verify, &cmd_head);
+- if (err < 0)
+- return -1;
++ ret = parse_opts(argc, argv, &conf_path, &verify, &cmd_head);
++ if (ret < 0)
++ return ret;
-+
++
+ // Get list of machines...
+ conf = conf_file_name("imx_usb.conf", base_path, conf_path);
+@@ -429,20 +428,20 @@ int main(int argc, char * const argv[])
+ if (!list)
+ return -1;
-+
++
+- r = libusb_init(NULL);
+- if (r < 0)
++ ret = libusb_init(NULL);
++ if (ret != 0)
+ goto out;
-+
++
+- cnt = libusb_get_device_list(NULL, &devs);
+- if (cnt < 0)
++ ret = libusb_get_device_list(NULL, &devs);
++ if (ret < 0)
+ goto out;
-+
++
+ // print_devs(devs);
+ dev = find_imx_dev(devs, &mach, list);
+ if (dev) {
@@ -187,9 +187,9 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
++ printf("%s:Could not open device vid=0x%x pid=0x%x err=%d\n", __func__, mach->vid, mach->pid, ret);
+ }
+ libusb_free_device_list(devs, 1);
-+
++
+@@ -451,12 +450,16 @@ int main(int argc, char * const argv[])
-+
++
+ // Get machine specific configuration file..
+ conf = conf_file_name(mach->file_name, base_path, conf_path);
+- if (conf == NULL)
@@ -197,20 +197,20 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
++ ret = -1;
+ goto out;
++ }
-+
++
+ p_id = parse_conf(conf);
+- if (!p_id)
++ if (!p_id) {
++ ret = -1;
+ goto out;
++ }
-+
++
+ if (p_id->mode == MODE_HID)
+ p_id->transfer = &transfer_hid;
+@@ -473,14 +476,14 @@ int main(int argc, char * const argv[])
+ if (libusb_kernel_driver_active(h, 0))
+ libusb_detach_kernel_driver(h, 0);
-+
++
+- err = libusb_claim_interface(h, 0);
+- if (err) {
++ ret = libusb_claim_interface(h, 0);
@@ -227,13 +227,13 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
+ goto out;
+ }
+@@ -493,6 +496,7 @@ int main(int argc, char * const argv[])
-+
++
+ if (curr == NULL) {
-+ printf("no job found\n");
++ printf("no job found\n");
++ ret = -1;
+ goto out;
+ }
-+
++
+@@ -501,17 +505,17 @@ int main(int argc, char * const argv[])
+ perform_mem_work(p_id, curr->mem);
+ // printf("jump_mode %x\n", curr->jump_mode);
diff --git a/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch b/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
index 3c4f3a7..98f4e77 100644
--- a/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
+++ b/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
@@ -162,32 +162,32 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
+@@ -416,9 +415,9 @@ int main(int argc, char * const argv[])
+ char const *base_path = get_base_path(argv[0]);
+ char const *conf_path = "/etc/imx-loader.d/";
-+
++
+- err = parse_opts(argc, argv, &conf_path, &verify, &cmd_head);
+- if (err < 0)
+- return -1;
++ ret = parse_opts(argc, argv, &conf_path, &verify, &cmd_head);
++ if (ret < 0)
++ return ret;
-+
++
+ // Get list of machines...
+ conf = conf_file_name("imx_usb.conf", base_path, conf_path);
+@@ -429,20 +428,20 @@ int main(int argc, char * const argv[])
+ if (!list)
+ return -1;
-+
++
+- r = libusb_init(NULL);
+- if (r < 0)
++ ret = libusb_init(NULL);
++ if (ret != 0)
+ goto out;
-+
++
+- cnt = libusb_get_device_list(NULL, &devs);
+- if (cnt < 0)
++ ret = libusb_get_device_list(NULL, &devs);
++ if (ret < 0)
+ goto out;
-+
++
+ // print_devs(devs);
+ dev = find_imx_dev(devs, &mach, list);
+ if (dev) {
@@ -199,9 +199,9 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
++ printf("%s:Could not open device vid=0x%x pid=0x%x err=%d\n", __func__, mach->vid, mach->pid, ret);
+ }
+ libusb_free_device_list(devs, 1);
-+
++
+@@ -451,12 +450,16 @@ int main(int argc, char * const argv[])
-+
++
+ // Get machine specific configuration file..
+ conf = conf_file_name(mach->file_name, base_path, conf_path);
+- if (conf == NULL)
@@ -209,20 +209,20 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
++ ret = -1;
+ goto out;
++ }
-+
++
+ p_id = parse_conf(conf);
+- if (!p_id)
++ if (!p_id) {
++ ret = -1;
+ goto out;
++ }
-+
++
+ if (p_id->mode == MODE_HID)
+ p_id->transfer = &transfer_hid;
+@@ -473,14 +476,14 @@ int main(int argc, char * const argv[])
+ if (libusb_kernel_driver_active(h, 0))
+ libusb_detach_kernel_driver(h, 0);
-+
++
+- err = libusb_claim_interface(h, 0);
+- if (err) {
++ ret = libusb_claim_interface(h, 0);
@@ -239,13 +239,13 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.pat
+ goto out;
+ }
+@@ -493,6 +496,7 @@ int main(int argc, char * const argv[])
-+
++
+ if (curr == NULL) {
-+ printf("no job found\n");
++ printf("no job found\n");
++ ret = -1;
+ goto out;
+ }
-+
++
+@@ -501,17 +505,17 @@ int main(int argc, char * const argv[])
+ perform_mem_work(p_id, curr->mem);
+ // printf("jump_mode %x\n", curr->jump_mode);
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-12-15 11:07:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b1982bfa150181c6a2a5e5a7f81f9ee39fd3ec21 (commit)
via 6e63462f46da06828bc0ef65fc2b852aea65dace (commit)
from 97e712c7db270df83b3bfbed7380f4539d4c8ad4 (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 b1982bfa150181c6a2a5e5a7f81f9ee39fd3ec21
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Dec 15 12:11:13 2014 +0100
[LINUX] 3.18: move to 3.18
commit 6e63462f46da06828bc0ef65fc2b852aea65dace
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Dec 15 11:37:55 2014 +0100
[SOFTWARE] apf6: add uboot recovery script
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
.../armadeus/apf27/apf27-linux-3.18-rc7.config | 1 -
.../armadeus/apf28/apf28-linux-3.18-rc7.config | 1 -
.../armadeus/apf51/apf51-linux-3.18-rc7.config | 1 -
.../armadeus/apf6/apf6-linux-3.18-rc7.config | 1 -
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 1 +
.../221-v2-3-3-imx-usb-loader-new-package.patch | 173 ++++++++++++++++++--
patches/buildroot/2013.11/cleanup_buildroot.sh | 1 +
.../221-v2-3-3-imx-usb-loader-new-package.patch | 149 +++++++++++++++++
patches/buildroot/2014.11/cleanup_buildroot.sh | 1 +
patches/linux/3.18-rc7 | 1 -
..._bootstrap_get_uboot_image_on_serial_port.patch | 16 ++
software/uboot_recover/apf6-u-boot.img | Bin 0 -> 372844 bytes
software/uboot_recover/apf6-u-boot.spl | Bin 0 -> 39936 bytes
software/uboot_recover/apf6_recovery.py | 160 ++++++++++++++++++
15 files changed, 490 insertions(+), 18 deletions(-)
delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc7.config
delete mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc7.config
delete mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc7.config
delete mode 120000 buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc7.config
delete mode 120000 patches/linux/3.18-rc7
create mode 100644 patches/u-boot/2014.07/505-apf6-in_bootstrap_get_uboot_image_on_serial_port.patch
create mode 100644 software/uboot_recover/apf6-u-boot.img
create mode 100644 software/uboot_recover/apf6-u-boot.spl
create mode 100644 software/uboot_recover/apf6_recovery.py
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index a3ba048..4ec3d30 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-rc7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18"
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-rc7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc7.config
deleted file mode 120000
index 305faef..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.18-rc7.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.18.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc7.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc7.config
deleted file mode 120000
index f82b65f..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.18-rc7.config
+++ /dev/null
@@ -1 +0,0 @@
-apf28-linux-3.18.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc7.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc7.config
deleted file mode 120000
index 4a20752..0000000
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.18-rc7.config
+++ /dev/null
@@ -1 +0,0 @@
-apf51-linux-3.18.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc7.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc7.config
deleted file mode 120000
index f26aa9b..0000000
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.18-rc7.config
+++ /dev/null
@@ -1 +0,0 @@
-apf6-linux-3.18.config
\ No newline at end of file
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 d568fcb..1008b64 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
@@ -21,6 +21,7 @@
/* SPL */
#define CONFIG_SPL_MMC_SUPPORT
+#define CONFIG_SPL_YMODEM_SUPPORT
#include "imx6_spl.h"
#include "mx6_common.h"
diff --git a/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch b/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
index 1cf5780..ae63fef 100644
--- a/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
+++ b/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
@@ -109,18 +109,6 @@ Index: buildroot/package/imx-usb-loader/Config.in
+ The utility support USB and UART as serial link.
+
+ https://github.com/boundarydevices/imx_usb_loader
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in
-+++ buildroot/package/Config.in
-@@ -316,6 +316,7 @@ endif
- source "package/hwdata/Config.in"
- source "package/i2c-tools/Config.in"
- source "package/imx-test/Config.in"
-+source "package/imx-usb-loader/Config.in"
- source "package/input-event-daemon/Config.in"
- source "package/input-tools/Config.in"
- source "package/iostat/Config.in"
Index: buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
===================================================================
--- /dev/null
@@ -140,3 +128,164 @@ Index: buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+ #file:dcd,plug,load nnn,jump [nnn/header/header2]
+ #jump nnn - header is after last downloaded word
+ # entire file is loaded before jump, needs load nnn as well
+Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.patch
+@@ -0,0 +1,144 @@
++diff --git a/imx_usb.c b/imx_usb.c
++index 41f3369..78d575b 100644
++--- a/imx_usb.c
+++++ b/imx_usb.c
++@@ -404,8 +404,7 @@ int main(int argc, char * const argv[])
++ struct mach_id *mach;
++ libusb_device **devs;
++ libusb_device *dev;
++- int r;
++- int err;
+++ int ret;
++ ssize_t cnt;
++ libusb_device_handle *h = NULL;
++ int config = 0;
++@@ -416,9 +415,9 @@ int main(int argc, char * const argv[])
++ char const *base_path = get_base_path(argv[0]);
++ char const *conf_path = "/etc/imx-loader.d/";
++
++- err = parse_opts(argc, argv, &conf_path, &verify, &cmd_head);
++- if (err < 0)
++- return -1;
+++ ret = parse_opts(argc, argv, &conf_path, &verify, &cmd_head);
+++ if (ret < 0)
+++ return ret;
++
++ // Get list of machines...
++ conf = conf_file_name("imx_usb.conf", base_path, conf_path);
++@@ -429,20 +428,20 @@ int main(int argc, char * const argv[])
++ if (!list)
++ return -1;
++
++- r = libusb_init(NULL);
++- if (r < 0)
+++ ret = libusb_init(NULL);
+++ if (ret != 0)
++ goto out;
++
++- cnt = libusb_get_device_list(NULL, &devs);
++- if (cnt < 0)
+++ ret = libusb_get_device_list(NULL, &devs);
+++ if (ret < 0)
++ goto out;
++
++ // print_devs(devs);
++ dev = find_imx_dev(devs, &mach, list);
++ if (dev) {
++- err = libusb_open(dev, &h);
++- if (err)
++- printf("%s:Could not open device vid=0x%x pid=0x%x err=%d\n", __func__, mach->vid, mach->pid, err);
+++ ret = libusb_open(dev, &h);
+++ if (ret)
+++ printf("%s:Could not open device vid=0x%x pid=0x%x err=%d\n", __func__, mach->vid, mach->pid, ret);
++ }
++ libusb_free_device_list(devs, 1);
++
++@@ -451,12 +450,16 @@ int main(int argc, char * const argv[])
++
++ // Get machine specific configuration file..
++ conf = conf_file_name(mach->file_name, base_path, conf_path);
++- if (conf == NULL)
+++ if (conf == NULL) {
+++ ret = -1;
++ goto out;
+++ }
++
++ p_id = parse_conf(conf);
++- if (!p_id)
+++ if (!p_id) {
+++ ret = -1;
++ goto out;
+++ }
++
++ if (p_id->mode == MODE_HID)
++ p_id->transfer = &transfer_hid;
++@@ -473,14 +476,14 @@ int main(int argc, char * const argv[])
++ if (libusb_kernel_driver_active(h, 0))
++ libusb_detach_kernel_driver(h, 0);
++
++- err = libusb_claim_interface(h, 0);
++- if (err) {
+++ ret = libusb_claim_interface(h, 0);
+++ if (ret) {
++ printf("Claim failed\n");
++ goto out;
++ }
++ printf("Interface 0 claimed\n");
++- err = do_status(p_id);
++- if (err) {
+++ ret = do_status(p_id);
+++ if (ret) {
++ printf("status failed\n");
++ goto out;
++ }
++@@ -493,6 +496,7 @@ int main(int argc, char * const argv[])
++
++ if (curr == NULL) {
++ printf("no job found\n");
+++ ret = -1;
++ goto out;
++ }
++
++@@ -501,17 +505,17 @@ int main(int argc, char * const argv[])
++ perform_mem_work(p_id, curr->mem);
++ // printf("jump_mode %x\n", curr->jump_mode);
++ if (curr->filename[0]) {
++- err = DoIRomDownload(p_id, curr, verify);
+++ ret = DoIRomDownload(p_id, curr, verify);
++ }
++- if (err) {
++- err = do_status(p_id);
+++ if (ret) {
+++ ret = do_status(p_id);
++ break;
++ }
++ if (!curr->next && (!curr->plug || curr != cmd_head))
++ break;
++- err = do_status(p_id);
++- printf("jump_mode %x plug=%i err=%i\n", curr->jump_mode, curr->plug, err);
++- if (err) {
+++ ret = do_status(p_id);
+++ printf("jump_mode %x plug=%i err=%i\n", curr->jump_mode, curr->plug, ret);
+++ if (ret) {
++ int retry;
++ /* Rediscovers device */
++ libusb_release_interface(h, 0);
++@@ -525,8 +529,10 @@ int main(int argc, char * const argv[])
++ if (h)
++ break;
++ }
++- if (!h)
+++ if (!h) {
+++ ret = -1;
++ goto out;
+++ }
++ }
++ if (curr == cmd_head && curr->plug) {
++ curr->plug = 0;
++@@ -541,5 +547,5 @@ out:
++ if (h)
++ libusb_close(h);
++ libusb_exit(NULL);
++- return 0;
+++ return ret;
++ }
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -316,6 +316,7 @@ endif
+ source "package/hwdata/Config.in"
+ source "package/i2c-tools/Config.in"
+ source "package/imx-test/Config.in"
++source "package/imx-usb-loader/Config.in"
+ source "package/input-event-daemon/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/iostat/Config.in"
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index 3a5d008..b5743f7 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -78,6 +78,7 @@ rm -rf buildroot/package/imx-test/imx-test.mk
rm -rf buildroot/package/imx-usb-loader/Config.in
rm -rf buildroot/package/imx-usb-loader/Config.in.host
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.patch
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/joe/Config.in
rm -rf buildroot/package/joe/joe-3.7-disable-j0-j1-y0-y1-math-functions.patch
diff --git a/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch b/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
index 8035d79..3c4f3a7 100644
--- a/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
+++ b/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
@@ -140,3 +140,152 @@ Index: buildroot/package/Config.in
source "package/input-event-daemon/Config.in"
source "package/input-tools/Config.in"
source "package/intel-microcode/Config.in"
+Index: buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.patch
+@@ -0,0 +1,144 @@
++diff --git a/imx_usb.c b/imx_usb.c
++index 41f3369..78d575b 100644
++--- a/imx_usb.c
+++++ b/imx_usb.c
++@@ -404,8 +404,7 @@ int main(int argc, char * const argv[])
++ struct mach_id *mach;
++ libusb_device **devs;
++ libusb_device *dev;
++- int r;
++- int err;
+++ int ret;
++ ssize_t cnt;
++ libusb_device_handle *h = NULL;
++ int config = 0;
++@@ -416,9 +415,9 @@ int main(int argc, char * const argv[])
++ char const *base_path = get_base_path(argv[0]);
++ char const *conf_path = "/etc/imx-loader.d/";
++
++- err = parse_opts(argc, argv, &conf_path, &verify, &cmd_head);
++- if (err < 0)
++- return -1;
+++ ret = parse_opts(argc, argv, &conf_path, &verify, &cmd_head);
+++ if (ret < 0)
+++ return ret;
++
++ // Get list of machines...
++ conf = conf_file_name("imx_usb.conf", base_path, conf_path);
++@@ -429,20 +428,20 @@ int main(int argc, char * const argv[])
++ if (!list)
++ return -1;
++
++- r = libusb_init(NULL);
++- if (r < 0)
+++ ret = libusb_init(NULL);
+++ if (ret != 0)
++ goto out;
++
++- cnt = libusb_get_device_list(NULL, &devs);
++- if (cnt < 0)
+++ ret = libusb_get_device_list(NULL, &devs);
+++ if (ret < 0)
++ goto out;
++
++ // print_devs(devs);
++ dev = find_imx_dev(devs, &mach, list);
++ if (dev) {
++- err = libusb_open(dev, &h);
++- if (err)
++- printf("%s:Could not open device vid=0x%x pid=0x%x err=%d\n", __func__, mach->vid, mach->pid, err);
+++ ret = libusb_open(dev, &h);
+++ if (ret)
+++ printf("%s:Could not open device vid=0x%x pid=0x%x err=%d\n", __func__, mach->vid, mach->pid, ret);
++ }
++ libusb_free_device_list(devs, 1);
++
++@@ -451,12 +450,16 @@ int main(int argc, char * const argv[])
++
++ // Get machine specific configuration file..
++ conf = conf_file_name(mach->file_name, base_path, conf_path);
++- if (conf == NULL)
+++ if (conf == NULL) {
+++ ret = -1;
++ goto out;
+++ }
++
++ p_id = parse_conf(conf);
++- if (!p_id)
+++ if (!p_id) {
+++ ret = -1;
++ goto out;
+++ }
++
++ if (p_id->mode == MODE_HID)
++ p_id->transfer = &transfer_hid;
++@@ -473,14 +476,14 @@ int main(int argc, char * const argv[])
++ if (libusb_kernel_driver_active(h, 0))
++ libusb_detach_kernel_driver(h, 0);
++
++- err = libusb_claim_interface(h, 0);
++- if (err) {
+++ ret = libusb_claim_interface(h, 0);
+++ if (ret) {
++ printf("Claim failed\n");
++ goto out;
++ }
++ printf("Interface 0 claimed\n");
++- err = do_status(p_id);
++- if (err) {
+++ ret = do_status(p_id);
+++ if (ret) {
++ printf("status failed\n");
++ goto out;
++ }
++@@ -493,6 +496,7 @@ int main(int argc, char * const argv[])
++
++ if (curr == NULL) {
++ printf("no job found\n");
+++ ret = -1;
++ goto out;
++ }
++
++@@ -501,17 +505,17 @@ int main(int argc, char * const argv[])
++ perform_mem_work(p_id, curr->mem);
++ // printf("jump_mode %x\n", curr->jump_mode);
++ if (curr->filename[0]) {
++- err = DoIRomDownload(p_id, curr, verify);
+++ ret = DoIRomDownload(p_id, curr, verify);
++ }
++- if (err) {
++- err = do_status(p_id);
+++ if (ret) {
+++ ret = do_status(p_id);
++ break;
++ }
++ if (!curr->next && (!curr->plug || curr != cmd_head))
++ break;
++- err = do_status(p_id);
++- printf("jump_mode %x plug=%i err=%i\n", curr->jump_mode, curr->plug, err);
++- if (err) {
+++ ret = do_status(p_id);
+++ printf("jump_mode %x plug=%i err=%i\n", curr->jump_mode, curr->plug, ret);
+++ if (ret) {
++ int retry;
++ /* Rediscovers device */
++ libusb_release_interface(h, 0);
++@@ -525,8 +529,10 @@ int main(int argc, char * const argv[])
++ if (h)
++ break;
++ }
++- if (!h)
+++ if (!h) {
+++ ret = -1;
++ goto out;
+++ }
++ }
++ if (curr == cmd_head && curr->plug) {
++ curr->plug = 0;
++@@ -541,5 +547,5 @@ out:
++ if (h)
++ libusb_close(h);
++ libusb_exit(NULL);
++- return 0;
+++ return ret;
++ }
diff --git a/patches/buildroot/2014.11/cleanup_buildroot.sh b/patches/buildroot/2014.11/cleanup_buildroot.sh
index 3d1e485..4867272 100755
--- a/patches/buildroot/2014.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2014.11/cleanup_buildroot.sh
@@ -55,6 +55,7 @@ rm -rf buildroot/package/imx-test/imx-test.mk
rm -rf buildroot/package/imx-usb-loader/Config.in
rm -rf buildroot/package/imx-usb-loader/Config.in.host
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0002-fix-return-codes.patch
rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/marble/Config.in
rm -rf buildroot/package/marble/marble.mk
diff --git a/patches/linux/3.18-rc7 b/patches/linux/3.18-rc7
deleted file mode 120000
index 55b698c..0000000
--- a/patches/linux/3.18-rc7
+++ /dev/null
@@ -1 +0,0 @@
-3.18
\ No newline at end of file
diff --git a/patches/u-boot/2014.07/505-apf6-in_bootstrap_get_uboot_image_on_serial_port.patch b/patches/u-boot/2014.07/505-apf6-in_bootstrap_get_uboot_image_on_serial_port.patch
new file mode 100644
index 0000000..ca4e6ce
--- /dev/null
+++ b/patches/u-boot/2014.07/505-apf6-in_bootstrap_get_uboot_image_on_serial_port.patch
@@ -0,0 +1,16 @@
+Index: uboot-2014.07/arch/arm/imx-common/spl.c
+===================================================================
+--- uboot-2014.07.orig/arch/arm/imx-common/spl.c
++++ uboot-2014.07/arch/arm/imx-common/spl.c
+@@ -19,6 +19,11 @@ u32 spl_boot_device(void)
+ {
+ struct src *psrc = (struct src *)SRC_BASE_ADDR;
+ unsigned reg = readl(&psrc->sbmr1);
++ unsigned reg2 = readl(&psrc->sbmr2);
++
++ /* In bootstrap get U-Boot on the serial port */
++ if (((reg2 & 0x3000000) >> 24) == 0x1)
++ return BOOT_DEVICE_UART;
+
+ /* BOOT_CFG1[7:4] - see IMX6DQRM Table 8-8 */
+ switch ((reg & 0x000000FF) >> 4) {
diff --git a/software/uboot_recover/apf6-u-boot.img b/software/uboot_recover/apf6-u-boot.img
new file mode 100644
index 0000000..a1fd604
Binary files /dev/null and b/software/uboot_recover/apf6-u-boot.img differ
diff --git a/software/uboot_recover/apf6-u-boot.spl b/software/uboot_recover/apf6-u-boot.spl
new file mode 100644
index 0000000..4a72baf
Binary files /dev/null and b/software/uboot_recover/apf6-u-boot.spl differ
diff --git a/software/uboot_recover/apf6_recovery.py b/software/uboot_recover/apf6_recovery.py
new file mode 100644
index 0000000..606e82f
--- /dev/null
+++ b/software/uboot_recover/apf6_recovery.py
@@ -0,0 +1,160 @@
+#
+# APF6 bootloader recovering tool
+#
+# Copyright (C) 2014 Armadeus Project
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# 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.
+#
+# authors: seb...@ar...
+#
+#
+
+import os
+import re
+import serial
+import subprocess
+import sys
+import time
+
+class UBoot:
+
+ def __init__(self, serial):
+ self.serial = serial
+
+ def __getOutput(self, pattern=r'BIOS>'):
+ response = ""
+ while not re.search(pattern, response):
+ char = self.serial.read(1)
+ if char == '':
+ raise IOError
+ response = response + char
+ print response
+ return response
+
+ def startYModem(self):
+ self.serial.write("loady\n")
+ return self.__getOutput(r'C')
+
+ def resetEnv(self, save=True):
+ if save == False:
+ self.serial.write("env default -f -a\n")
+ else:
+ self.serial.write("run flash_reset_env\n")
+ return self.__getOutput()
+
+ def waitForPrompt(self):
+ self.serial.write("\n")
+ ret = self.__getOutput()
+ self.serial.flushInput()
+ return ret
+
+ def flash_spl(self):
+ self.serial.flushInput()
+ self.serial.write("run flash_uboot_spl\n")
+ return self.__getOutput()
+
+ def flash_img(self):
+ self.serial.flushInput()
+ self.serial.write("run flash_uboot_img\n")
+ return self.__getOutput()
+
+ def reset(self):
+ self.serial.flushInput()
+ self.serial.write("reset\n")
+
+
+if __name__ == "__main__":
+
+ BR_HOST_PATH = "../../buildroot/output/host"
+ BR_IMAGES_PATH = "../../buildroot/output/images"
+ USB_DOWNLOAD_APP = BR_HOST_PATH + "/usr/bin/imx_usb"
+ SERIAL_DOWNLOAD_APP = "sb"
+ U_BOOT_SPL = "apf6-u-boot.spl"
+ U_BOOT_IMG = "apf6-u-boot.img"
+ SPEED = 115200
+
+ print "\n--- APF6 Bootstrap Tool ---\n"
+ print "Procedure to follow:"
+ print "1] Power off your board, close all serial terminal sessions, remove all USB cables"
+ print "2] Take jumper off BOOT0 pin and put it on BOOT1 pin."
+ print "3] Power on your board"
+ print "4] Connect a USB cable from your PC to the APF6Dev OTG miniUSB connector"
+ print "5] Connect a USB cable from your PC to the APF6Dev console miniUSB connector"
+ print "6] Be sure to have built the APF6 BSP: make apf6_defconfig; make"
+ print "7] Have launched this script as root (sudo)"
+ print "8] Have sb installed (On Ubuntu: sudo apt-get install lrzsz)\n"
+ port = raw_input('--- Enter serial port number or device name to use for console (/dev/ttyUSB0 under Linux (default) or COMx under Window$): ')
+ if port == '':
+ port = '/dev/ttyUSB0'
+
+ if not os.path.exists(USB_DOWNLOAD_APP):
+ print "Error: imx_usb is not present. Please compile Armadeus BSP first: make apf6_defconfig; make"
+ sys.exit(1)
+
+ if not os.path.exists(U_BOOT_SPL) or not os.path.exists(U_BOOT_IMG):
+ print "Error: U-Boot binaries don't exist !"
+ sys.exit(1)
+
+ try:
+ subprocess.call([SERIAL_DOWNLOAD_APP, "--version"])
+ except OSError:
+ print "Error: " + SERIAL_DOWNLOAD_APP + " not found. Did you install lrzsz package on your system ?"
+ sys.exit(1)
+
+ try:
+ subprocess.check_call([USB_DOWNLOAD_APP, "-c", BR_HOST_PATH + "/usr/share/imx_usb_loader/", U_BOOT_SPL])
+ subprocess.check_call(SERIAL_DOWNLOAD_APP + " -k " + U_BOOT_IMG + " > " + port + " < " + port, shell=True)
+ except subprocess.CalledProcessError:
+ print "Error: Loading U-Boot binaries failed !"
+ sys.exit(1)
+
+ try:
+ print "Opening serial port %s..." % port
+ ser = serial.Serial(port, SPEED, timeout=5)
+ ser.flush()
+ uboot = UBoot(ser)
+ time.sleep(1)
+
+ uboot.waitForPrompt()
+
+ uboot.resetEnv(False)
+
+ uboot.startYModem()
+ subprocess.check_call(SERIAL_DOWNLOAD_APP + " -k " + U_BOOT_SPL + " > " + port + " < " + port, shell=True)
+ uboot.waitForPrompt()
+ uboot.flash_spl()
+
+ uboot.startYModem()
+ subprocess.check_call(SERIAL_DOWNLOAD_APP + " -k " + U_BOOT_IMG + " > " + port + " < " + port, shell=True)
+ uboot.waitForPrompt()
+ uboot.flash_img()
+
+ eraseAll = raw_input('\n--- Would you like to erase the environment variables ? y/N: ')
+ if eraseAll == 'y':
+ uboot.resetEnv()
+ except serial.SerialException:
+ print "Error: Opening serial port %s failed !" % port
+ sys.exit(1)
+ except IOError:
+ print "IOError on serial port %s" % port
+ ser.close()
+ sys.exit(1)
+ except subprocess.CalledProcessError:
+ print "Error: Loading U-Boot binaries on serial port failed !"
+ ser.close()
+ sys.exit(1)
+ else:
+ print "\n--- U-Boot successfully recovered !"
+ print "--- Now you can remove miniUSB OTG cable and put the jumper back on BOOT0 pin. Your board is running..."
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-12-14 23:45: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 97e712c7db270df83b3bfbed7380f4539d4c8ad4 (commit)
via 2e557c4caef4947de9f96e19dcd0b09473cd18dc (commit)
via 96609ad0c788820c0779801f707c4aadff1798ef (commit)
via 47ab0410b6934f3af3b7927574899b817687588b (commit)
from d5a9f6ce6bcbbf9ccd11060a5232aadffe34a326 (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 97e712c7db270df83b3bfbed7380f4539d4c8ad4
Author: Philippe Reynes <tr...@gm...>
Date: Sat Dec 13 12:32:46 2014 +0100
[LINUX] 3.17: move to 3.17.6
commit 2e557c4caef4947de9f96e19dcd0b09473cd18dc
Author: Philippe Reynes <tr...@gm...>
Date: Sat Dec 13 12:32:45 2014 +0100
[LINUX] 3.14: move to 3.14.26
commit 96609ad0c788820c0779801f707c4aadff1798ef
Author: Philippe Reynes <tr...@gm...>
Date: Sat Dec 13 12:32:44 2014 +0100
[LINUX] 3.12: move to 3.12.35
commit 47ab0410b6934f3af3b7927574899b817687588b
Author: Philippe Reynes <tr...@gm...>
Date: Sat Dec 13 12:32:43 2014 +0100
[LINUX] 3.10: move to 3.10.62
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.61.config => apf27-linux-3.10.62.config} | 0
...x-3.12.33.config => apf27-linux-3.12.35.config} | 0
...x-3.14.25.config => apf27-linux-3.14.26.config} | 0
...nux-3.17.4.config => apf27-linux-3.17.6.config} | 0
...x-3.10.61.config => apf28-linux-3.10.62.config} | 0
...x-3.12.33.config => apf28-linux-3.12.35.config} | 0
...x-3.14.25.config => apf28-linux-3.14.26.config} | 0
...nux-3.17.4.config => apf28-linux-3.17.6.config} | 0
...x-3.10.61.config => apf51-linux-3.10.62.config} | 0
...x-3.12.33.config => apf51-linux-3.12.35.config} | 0
...x-3.14.25.config => apf51-linux-3.14.26.config} | 0
...nux-3.17.4.config => apf51-linux-3.17.6.config} | 0
patches/linux/{3.10.61 => 3.10.62} | 0
patches/linux/{3.12.33 => 3.12.35} | 0
patches/linux/{3.14.25 => 3.14.26} | 0
patches/linux/{3.17.4 => 3.17.6} | 0
19 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.61.config => apf27-linux-3.10.62.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.33.config => apf27-linux-3.12.35.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.25.config => apf27-linux-3.14.26.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.17.4.config => apf27-linux-3.17.6.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.61.config => apf28-linux-3.10.62.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.33.config => apf28-linux-3.12.35.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.25.config => apf28-linux-3.14.26.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.17.4.config => apf28-linux-3.17.6.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.61.config => apf51-linux-3.10.62.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.33.config => apf51-linux-3.12.35.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.25.config => apf51-linux-3.14.26.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.17.4.config => apf51-linux-3.17.6.config} (100%)
rename patches/linux/{3.10.61 => 3.10.62} (100%)
rename patches/linux/{3.12.33 => 3.12.35} (100%)
rename patches/linux/{3.14.25 => 3.14.26} (100%)
rename patches/linux/{3.17.4 => 3.17.6} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 993f4b2..8e5ed03 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.4"
+BR2_DEFAULT_KERNEL_VERSION="3.17.6"
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.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.6"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf28mainline_defconfig b/buildroot/configs/apf28mainline_defconfig
index 1d54279..ed6e298 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.4"
+BR2_DEFAULT_KERNEL_VERSION="3.17.6"
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.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.6"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index 6f6befc..d4d9f06 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.4"
+BR2_DEFAULT_KERNEL_VERSION="3.17.6"
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.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.6"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.61.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.62.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.61.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.62.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.33.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.35.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.33.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.35.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.25.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.26.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.25.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.26.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.17.4.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.17.6.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.61.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.62.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.61.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.62.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.33.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.35.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.33.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.35.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.25.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.26.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.25.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.26.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.17.4.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.17.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.17.4.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.17.6.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.61.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.62.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.61.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.62.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.33.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.35.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.33.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.35.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.25.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.26.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.25.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.26.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.4.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.17.4.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.17.6.config
diff --git a/patches/linux/3.10.61 b/patches/linux/3.10.62
similarity index 100%
rename from patches/linux/3.10.61
rename to patches/linux/3.10.62
diff --git a/patches/linux/3.12.33 b/patches/linux/3.12.35
similarity index 100%
rename from patches/linux/3.12.33
rename to patches/linux/3.12.35
diff --git a/patches/linux/3.14.25 b/patches/linux/3.14.26
similarity index 100%
rename from patches/linux/3.14.25
rename to patches/linux/3.14.26
diff --git a/patches/linux/3.17.4 b/patches/linux/3.17.6
similarity index 100%
rename from patches/linux/3.17.4
rename to patches/linux/3.17.6
hooks/post-receive
--
armadeus
|
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2014-12-12 11:03:55
|
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 d5a9f6ce6bcbbf9ccd11060a5232aadffe34a326 (commit)
from 7c70b91863f01e1f9a553cbfdbcb6dfd29242c12 (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 d5a9f6ce6bcbbf9ccd11060a5232aadffe34a326
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Fri Dec 12 12:04:40 2014 +0100
[LINUX] apf27: 3.14: backport and adapt patch 0232 from 3.16
-----------------------------------------------------------------------
Summary of changes:
.../0232-armadeus-net-phy-fix_smsc_reset.patch | 116 ++++++++++++++++++++
1 files changed, 116 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/3.14/0232-armadeus-net-phy-fix_smsc_reset.patch
diff --git a/patches/linux/3.14/0232-armadeus-net-phy-fix_smsc_reset.patch b/patches/linux/3.14/0232-armadeus-net-phy-fix_smsc_reset.patch
new file mode 100644
index 0000000..ef0e5d8
--- /dev/null
+++ b/patches/linux/3.14/0232-armadeus-net-phy-fix_smsc_reset.patch
@@ -0,0 +1,116 @@
+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...>
+---
+Index: linux-3.14.17/drivers/net/phy/phy_device.c
+===================================================================
+--- linux-3.14.17.orig/drivers/net/phy/phy_device.c
++++ linux-3.14.17/drivers/net/phy/phy_device.c
+@@ -539,17 +539,20 @@ int phy_init_hw(struct phy_device *phyde
+ if (!phydev->drv || !phydev->drv->config_init)
+ return 0;
+
+- ret = phy_write(phydev, MII_BMCR, BMCR_RESET);
+- if (ret < 0)
+- return ret;
++ if (!phydev->drv->soft_reset) {
++ ret = phy_write(phydev, MII_BMCR, BMCR_RESET);
++ if (ret < 0)
++ return ret;
+
+- ret = phy_poll_reset(phydev);
+- if (ret < 0)
+- return ret;
++ ret = phy_poll_reset(phydev);
++ if (ret < 0)
++ return ret;
+
+- ret = phy_scan_fixups(phydev);
+- if (ret < 0)
+- return ret;
++ ret = phy_scan_fixups(phydev);
++ if (ret < 0)
++ return ret;
++ } else
++ phydev->drv->soft_reset(phydev);
+
+ return phydev->drv->config_init(phydev);
+ }
+Index: linux-3.14.17/drivers/net/phy/smsc.c
+===================================================================
+--- linux-3.14.17.orig/drivers/net/phy/smsc.c
++++ linux-3.14.17/drivers/net/phy/smsc.c
+@@ -41,7 +41,8 @@ static int smsc_phy_ack_interrupt(struct
+ return rc < 0 ? rc : 0;
+ }
+
+-static int smsc_phy_config_init(struct phy_device *phydev)
++
++static int smsc_phy_reset(struct phy_device *phydev)
+ {
+ int rc = phy_read(phydev, MII_LAN83C185_SPECIAL_MODES);
+ if (rc < 0)
+@@ -67,7 +68,13 @@ static int smsc_phy_config_init(struct p
+ } while (rc & BMCR_RESET);
+ }
+
+- rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
++ return 0;
++}
++
++static int smsc_phy_config_init(struct phy_device *phydev)
++{
++
++ int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
+ if (rc < 0)
+ return rc;
+
+@@ -142,6 +149,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 +172,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 +195,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 +240,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,
+Index: linux-3.14.17/include/linux/phy.h
+===================================================================
+--- linux-3.14.17.orig/include/linux/phy.h
++++ linux-3.14.17/include/linux/phy.h
+@@ -399,6 +399,10 @@ struct phy_driver {
+ */
+ int (*config_init)(struct phy_device *phydev);
+
++ /* specific reset */
++ int (*soft_reset)(struct phy_device *dev);
++
++
+ /*
+ * Called during discovery. Used to set
+ * up device-specific structures, if any
hooks/post-receive
--
armadeus
|
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2014-12-11 20:15:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 7c70b91863f01e1f9a553cbfdbcb6dfd29242c12 (commit)
via 506dd82f8739c7ffd2380ad48a15b2bbfe66d8e3 (commit)
from 7dd62cb34d2a8b02ecea698f1b46e1fb2a5c1b37 (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 7c70b91863f01e1f9a553cbfdbcb6dfd29242c12
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Thu Dec 11 21:15:47 2014 +0100
[BUILDROOT] apf27mainline : use uboot config for mainline kernel
commit 506dd82f8739c7ffd2380ad48a15b2bbfe66d8e3
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Thu Dec 11 21:14:54 2014 +0100
[UBOOT] apf27: add uboot config dedicated for mainline kernel (ie console and dtb)
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 2 +-
...ot-2014.04.h => apf27mainline-u-boot-2014.04.h} | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
copy buildroot/target/device/armadeus/apf27/{apf27-u-boot-2014.04.h => apf27mainline-u-boot-2014.04.h} (99%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index d6f8df1..993f4b2 100644
--- a/buildroot/configs/apf27mainline_defconfig
+++ b/buildroot/configs/apf27mainline_defconfig
@@ -88,7 +88,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2014.04.tar.bz2"
BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2014.04"
BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2014.04.h"
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)mainline-u-boot-2014.04.h"
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-with-spl.bin"
BR2_TARGET_UBOOT_NETWORK=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2014.04.h b/buildroot/target/device/armadeus/apf27/apf27mainline-u-boot-2014.04.h
similarity index 99%
copy from buildroot/target/device/armadeus/apf27/apf27-u-boot-2014.04.h
copy to buildroot/target/device/armadeus/apf27/apf27mainline-u-boot-2014.04.h
index 913fce3..3b915c1 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2014.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27mainline-u-boot-2014.04.h
@@ -178,7 +178,7 @@
__stringify(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
" ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
-#define ACFG_CONSOLE_DEV ttySMX0
+#define ACFG_CONSOLE_DEV ttymxc0
#define CONFIG_BOOTCOMMAND "run ubifsboot"
#define CONFIG_SYS_AUTOLOAD "no"
/*
@@ -202,6 +202,7 @@
"kernel_addr=" __stringify(CONFIG_KERNEL_OFFSET) "\0" \
"rootfs_addr=" __stringify(CONFIG_ROOTFS_OFFSET) "\0" \
"board_name=" __stringify(CONFIG_BOARD_NAME) "\0" \
+ "fdt_addr_r=A1000000\0" \
"kernel_addr_r=A0000000\0" \
"check_env=if test -n ${flash_env_version}; " \
"then env default env_version; " \
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-12-10 17:13: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 7dd62cb34d2a8b02ecea698f1b46e1fb2a5c1b37 (commit)
from d3f2d831df92f35b47457a02e11ebf2b81b22d54 (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 7dd62cb34d2a8b02ecea698f1b46e1fb2a5c1b37
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Dec 10 18:14:35 2014 +0100
[BUILDROOT] move imx-usb-loader in buildroot package directory
While at it, add host-imx-usb-loader in apf6_deconfig.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 1 +
buildroot/package/armadeus/Config.in | 1 -
.../package/armadeus/imx_usb_loader/Config.in | 13 --
.../armadeus/imx_usb_loader/imx_usb_loader.mk | 42 ------
.../221-v2-3-3-imx-usb-loader-new-package.patch | 142 ++++++++++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 4 +
.../221-v2-3-3-imx-usb-loader-new-package.patch | 142 ++++++++++++++++++++
patches/buildroot/2014.11/cleanup_buildroot.sh | 4 +
8 files changed, 293 insertions(+), 56 deletions(-)
delete mode 100644 buildroot/package/armadeus/imx_usb_loader/Config.in
delete mode 100644 buildroot/package/armadeus/imx_usb_loader/imx_usb_loader.mk
create mode 100644 patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
create mode 100644 patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index ca208d3..a3ba048 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -75,3 +75,4 @@ BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-
BR2_TARGET_UBOOT_FORMAT_IMG=y
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_PACKAGE_HOST_IMX_USB_LOADER=y
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index 6ba7f6f..2dedd75 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -5,7 +5,6 @@ source package/armadeus/as_devices/Config.in
source package/armadeus/demos/Config.in
source package/armadeus/fpgaregs/Config.in
source package/armadeus/fpga_firmware/Config.in
-source package/armadeus/imx_usb_loader/Config.in
source package/armadeus/imx28-usb-downloader/Config.in
source package/armadeus/imxregs/Config.in
source package/armadeus/imxssi/Config.in
diff --git a/buildroot/package/armadeus/imx_usb_loader/Config.in b/buildroot/package/armadeus/imx_usb_loader/Config.in
deleted file mode 100644
index 7e98bca..0000000
--- a/buildroot/package/armadeus/imx_usb_loader/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config BR2_PACKAGE_IMX_USB_LOADER
- bool "imx_usb_loader (target)"
- depends on BR2_PACKAGE_LIBUSB_COMPAT
- help
- Target tool to download i.MX51, i.MX53 and i.MX6 binary through USB and
- serial.
-
-config BR2_PACKAGE_HOST_IMX_USB_LOADER
- bool "imx_usb_loader (host)"
- depends on BR2_PACKAGE_LIBUSB_COMPAT
- help
- Target tool to download i.MX51, i.MX53 and i.MX6 binary through USB and
- serial.
diff --git a/buildroot/package/armadeus/imx_usb_loader/imx_usb_loader.mk b/buildroot/package/armadeus/imx_usb_loader/imx_usb_loader.mk
deleted file mode 100644
index 02c7042..0000000
--- a/buildroot/package/armadeus/imx_usb_loader/imx_usb_loader.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-################################################################################
-#
-# imx_usb_loader from github
-#
-################################################################################
-
-IMX_USB_LOADER_VERSION = 18d858d3c62dde9bd67580a740f07d07930c9b4f
-IMX_USB_LOADER_SITE = https://github.com/boundarydevices/imx_usb_loader.git
-IMX_USB_LOADER_SITE_METHOD = git
-IMX_USB_LOADER_DEPENDENCIES = libusb-compat libusb
-
-IMX_USB_LOADER_BIN_NAME = imx_usb
-IMX_UART_LOADER_BIN_NAME = imx_uart
-
-define IMX_USB_LOADER_BUILD_CMDS
- $(MAKE) CC="$(TARGET_CC)" -C $(@D) imx_usb
- $(MAKE) CC="$(TARGET_CC)" -C $(@D) imx_uart
-endef
-
-define HOST_IMX_USB_LOADER_BUILD_CMDS
- $(MAKE) CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" USBCFLAGS="-lusb" USBLDFLAGS="-lusb" -C $(@D) imx_usb
- $(MAKE) CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D) imx_uart
-endef
-
-define IMX_USB_LOADER_INSTALL_TARGET_CMDS
- $(INSTALL) -m 0755 $(@D)/$(IMX_USB_LOADER_BIN_NAME) \
- $(TARGET_DIR)/usr/bin/$(IMX_USB_LOADER_BIN_NAME)
- $(INSTALL) -m 0755 $(@D)/$(IMX_UART_LOADER_BIN_NAME) \
- $(TARGET_DIR)/usr/bin/$(IMX_UART_LOADER_BIN_NAME)
- $(INSTALL) -m 644 $(@D)/*.conf \
- $(TARGET_DIR)/usr/share/
-endef
-
-define HOST_IMX_USB_LOADER_INSTALL_CMDS
- $(INSTALL) -D -m 0755 $(@D)/$(IMX_USB_LOADER_BIN_NAME) \
- $(HOST_DIR)/usr/bin/$(IMX_USB_LOADER_BIN_NAME)
- $(INSTALL) -m 0755 $(@D)/$(IMX_UART_LOADER_BIN_NAME) \
- $(HOST_DIR)/usr/bin/$(IMX_UART_LOADER_BIN_NAME)
-endef
-
-$(eval $(generic-package))
-$(eval $(host-generic-package))
diff --git a/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch b/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
new file mode 100644
index 0000000..1cf5780
--- /dev/null
+++ b/patches/buildroot/2013.11/221-v2-3-3-imx-usb-loader-new-package.patch
@@ -0,0 +1,142 @@
+From patchwork Wed Oct 1 15:03:46 2014
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v2,3/3] imx-usb-loader: new package
+From: Luca Ceresoli <lu...@lu...>
+X-Patchwork-Id: 395569
+Message-Id: <141...@lu...>
+To: bui...@uc...
+Cc: Luca Ceresoli <lu...@lu...>
+Date: Wed, 1 Oct 2014 17:03:46 +0200
+
+Signed-off-by: Luca Ceresoli <lu...@lu...>
+---
+ package/Config.in.host | 1 +
+ package/imx-usb-loader/Config.in.host | 14 ++++++++++++++
+ package/imx-usb-loader/imx-usb-loader.mk | 22 ++++++++++++++++++++++
+ 3 files changed, 37 insertions(+)
+ create mode 100644 package/imx-usb-loader/Config.in.host
+ create mode 100644 package/imx-usb-loader/imx-usb-loader.mk
+
+Index: buildroot/package/Config.in.host
+===================================================================
+--- buildroot.orig/package/Config.in.host
++++ buildroot/package/Config.in.host
+@@ -6,6 +6,7 @@ source "package/e2fsprogs/Config.in.host
+ source "package/genext2fs/Config.in.host"
+ source "package/genimage/Config.in.host"
+ source "package/genpart/Config.in.host"
++source "package/imx-usb-loader/Config.in.host"
+ source "package/lpc3250loader/Config.in.host"
+ source "package/mtools/Config.in.host"
+ source "package/omap-u-boot-utils/Config.in.host"
+Index: buildroot/package/imx-usb-loader/Config.in.host
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/Config.in.host
+@@ -0,0 +1,13 @@
++config BR2_PACKAGE_HOST_IMX_USB_LOADER
++ bool "host imx-usb-loader"
++ depends on BR2_arm || BR2_armeb
++ help
++ This utility allows to download and execute code on Freescale
++ i.MX5/i.MX6 and Vybrid SoCs through the Serial Download Protocol
++ (SDP). Depending on the board, there is usually some kind of recovery
++ button to bring the SoC into serial download boot mode, check
++ documentation of your hardware.
++
++ The utility support USB and UART as serial link.
++
++ https://github.com/boundarydevices/imx_usb_loader
+Index: buildroot/package/imx-usb-loader/imx-usb-loader.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/imx-usb-loader.mk
+@@ -0,0 +1,36 @@
++################################################################################
++#
++# imx-usb-loader
++#
++################################################################################
++
++IMX_USB_LOADER_VERSION = f96aee286ea17c832b7ec922dd76842deb5ce299
++IMX_USB_LOADER_SITE = https://github.com/boundarydevices/imx_usb_loader.git
++IMX_USB_LOADER_SITE_METHOD = git
++IMX_USB_LOADER_DEPENDENCIES = libusb
++HOST_IMX_USB_LOADER_DEPENDENCIES = host-libusb
++
++define IMX_USB_LOADER_BUILD_CMDS
++ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
++endef
++
++define IMX_USB_LOADER_INSTALL_TARGET_CMDS
++ $(INSTALL) -D -m 0755 $(@D)/imx_usb $(TARGET_DIR)/usr/bin/imx_usb
++ $(INSTALL) -D -m 0755 $(@D)/imx_uart $(TARGET_DIR)/usr/bin/imx_uart
++ mkdir -p $(TARGET_DIR)/usr/share/imx_usb_loader
++ $(INSTALL) -D -m 0644 $(@D)/*.conf $(TARGET_DIR)/usr/share/imx_usb_loader
++endef
++
++define HOST_IMX_USB_LOADER_BUILD_CMDS
++ $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)
++endef
++
++define HOST_IMX_USB_LOADER_INSTALL_CMDS
++ $(INSTALL) -D -m 0755 $(@D)/imx_usb $(HOST_DIR)/usr/bin/imx_usb
++ $(INSTALL) -D -m 0755 $(@D)/imx_uart $(HOST_DIR)/usr/bin/imx_uart
++ mkdir -p $(HOST_DIR)/usr/share/imx_usb_loader
++ $(INSTALL) -D -m 0644 $(@D)/*.conf $(HOST_DIR)/usr/share/imx_usb_loader
++endef
++
++$(eval $(generic-package))
++$(eval $(host-generic-package))
+Index: buildroot/package/imx-usb-loader/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/Config.in
+@@ -0,0 +1,14 @@
++config BR2_PACKAGE_IMX_USB_LOADER
++ bool "imx-usb-loader"
++ depends on BR2_arm || BR2_armeb
++ select BR2_PACKAGE_LIBUSB
++ help
++ This utility allows to download and execute code on Freescale
++ i.MX5/i.MX6 and Vybrid SoCs through the Serial Download Protocol
++ (SDP). Depending on the board, there is usually some kind of recovery
++ button to bring the SoC into serial download boot mode, check
++ documentation of your hardware.
++
++ The utility support USB and UART as serial link.
++
++ https://github.com/boundarydevices/imx_usb_loader
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -316,6 +316,7 @@ endif
+ source "package/hwdata/Config.in"
+ source "package/i2c-tools/Config.in"
+ source "package/imx-test/Config.in"
++source "package/imx-usb-loader/Config.in"
+ source "package/input-event-daemon/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/iostat/Config.in"
+Index: buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+@@ -0,0 +1,14 @@
++diff --git a/mx6_usb_work.conf b/mx6_usb_work.conf
++index b484c51..fa952e2 100644
++--- a/mx6_usb_work.conf
+++++ b/mx6_usb_work.conf
++@@ -1,6 +1,7 @@
++-mx6_qsb
+++apf6qdl
++ #hid/bulk,[old_header,]max packet size, {ram start, ram size}(repeat valid ram areas)
++-hid,1024,0x10000000,1G,0x00907000,0x31000
+++#IMX6 quad and dual have 196KB OCRAM Free Area but IMX6 dual light and solo have only 68KB.
+++hid,1024,0x00907000,0x11000
++ #file:dcd,plug,load nnn,jump [nnn/header/header2]
++ #jump nnn - header is after last downloaded word
++ # entire file is loaded before jump, needs load nnn as well
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index 4957742..3a5d008 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -75,6 +75,10 @@ rm -rf buildroot/package/imx-test/Config.in
rm -rf buildroot/package/imx-test/imx-test-01_fixes.patch
rm -rf buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
rm -rf buildroot/package/imx-test/imx-test.mk
+rm -rf buildroot/package/imx-usb-loader/Config.in
+rm -rf buildroot/package/imx-usb-loader/Config.in.host
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.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
diff --git a/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch b/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
new file mode 100644
index 0000000..8035d79
--- /dev/null
+++ b/patches/buildroot/2014.11/221-v2-3-3-imx-usb-loader-new-package.patch
@@ -0,0 +1,142 @@
+From patchwork Wed Oct 1 15:03:46 2014
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v2,3/3] imx-usb-loader: new package
+From: Luca Ceresoli <lu...@lu...>
+X-Patchwork-Id: 395569
+Message-Id: <141...@lu...>
+To: bui...@uc...
+Cc: Luca Ceresoli <lu...@lu...>
+Date: Wed, 1 Oct 2014 17:03:46 +0200
+
+Signed-off-by: Luca Ceresoli <lu...@lu...>
+---
+ package/Config.in.host | 1 +
+ package/imx-usb-loader/Config.in.host | 14 ++++++++++++++
+ package/imx-usb-loader/imx-usb-loader.mk | 22 ++++++++++++++++++++++
+ 3 files changed, 37 insertions(+)
+ create mode 100644 package/imx-usb-loader/Config.in.host
+ create mode 100644 package/imx-usb-loader/imx-usb-loader.mk
+
+Index: buildroot/package/Config.in.host
+===================================================================
+--- buildroot.orig/package/Config.in.host
++++ buildroot/package/Config.in.host
+@@ -9,6 +9,7 @@ menu "Host utilities"
+ source "package/genext2fs/Config.in.host"
+ source "package/genimage/Config.in.host"
+ source "package/genpart/Config.in.host"
++ source "package/imx-usb-loader/Config.in.host"
+ source "package/lpc3250loader/Config.in.host"
+ source "package/mtd/Config.in.host"
+ source "package/mtools/Config.in.host"
+Index: buildroot/package/imx-usb-loader/Config.in.host
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/Config.in.host
+@@ -0,0 +1,13 @@
++config BR2_PACKAGE_HOST_IMX_USB_LOADER
++ bool "host imx-usb-loader"
++ depends on BR2_arm || BR2_armeb
++ help
++ This utility allows to download and execute code on Freescale
++ i.MX5/i.MX6 and Vybrid SoCs through the Serial Download Protocol
++ (SDP). Depending on the board, there is usually some kind of recovery
++ button to bring the SoC into serial download boot mode, check
++ documentation of your hardware.
++
++ The utility support USB and UART as serial link.
++
++ https://github.com/boundarydevices/imx_usb_loader
+Index: buildroot/package/imx-usb-loader/imx-usb-loader.mk
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/imx-usb-loader.mk
+@@ -0,0 +1,36 @@
++################################################################################
++#
++# imx-usb-loader
++#
++################################################################################
++
++IMX_USB_LOADER_VERSION = f96aee286ea17c832b7ec922dd76842deb5ce299
++IMX_USB_LOADER_SITE = https://github.com/boundarydevices/imx_usb_loader.git
++IMX_USB_LOADER_SITE_METHOD = git
++IMX_USB_LOADER_DEPENDENCIES = libusb
++HOST_IMX_USB_LOADER_DEPENDENCIES = host-libusb
++
++define IMX_USB_LOADER_BUILD_CMDS
++ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
++endef
++
++define IMX_USB_LOADER_INSTALL_TARGET_CMDS
++ $(INSTALL) -D -m 0755 $(@D)/imx_usb $(TARGET_DIR)/usr/bin/imx_usb
++ $(INSTALL) -D -m 0755 $(@D)/imx_uart $(TARGET_DIR)/usr/bin/imx_uart
++ mkdir -p $(TARGET_DIR)/usr/share/imx_usb_loader
++ $(INSTALL) -D -m 0644 $(@D)/*.conf $(TARGET_DIR)/usr/share/imx_usb_loader
++endef
++
++define HOST_IMX_USB_LOADER_BUILD_CMDS
++ $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)
++endef
++
++define HOST_IMX_USB_LOADER_INSTALL_CMDS
++ $(INSTALL) -D -m 0755 $(@D)/imx_usb $(HOST_DIR)/usr/bin/imx_usb
++ $(INSTALL) -D -m 0755 $(@D)/imx_uart $(HOST_DIR)/usr/bin/imx_uart
++ mkdir -p $(HOST_DIR)/usr/share/imx_usb_loader
++ $(INSTALL) -D -m 0644 $(@D)/*.conf $(HOST_DIR)/usr/share/imx_usb_loader
++endef
++
++$(eval $(generic-package))
++$(eval $(host-generic-package))
+Index: buildroot/package/imx-usb-loader/Config.in
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/Config.in
+@@ -0,0 +1,14 @@
++config BR2_PACKAGE_IMX_USB_LOADER
++ bool "imx-usb-loader"
++ depends on BR2_arm || BR2_armeb
++ select BR2_PACKAGE_LIBUSB
++ help
++ This utility allows to download and execute code on Freescale
++ i.MX5/i.MX6 and Vybrid SoCs through the Serial Download Protocol
++ (SDP). Depending on the board, there is usually some kind of recovery
++ button to bring the SoC into serial download boot mode, check
++ documentation of your hardware.
++
++ The utility support USB and UART as serial link.
++
++ https://github.com/boundarydevices/imx_usb_loader
+Index: buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+===================================================================
+--- /dev/null
++++ buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+@@ -0,0 +1,14 @@
++diff --git a/mx6_usb_work.conf b/mx6_usb_work.conf
++index b484c51..fa952e2 100644
++--- a/mx6_usb_work.conf
+++++ b/mx6_usb_work.conf
++@@ -1,6 +1,7 @@
++-mx6_qsb
+++apf6qdl
++ #hid/bulk,[old_header,]max packet size, {ram start, ram size}(repeat valid ram areas)
++-hid,1024,0x10000000,1G,0x00907000,0x31000
+++#IMX6 quad and dual have 196KB OCRAM Free Area but IMX6 dual light and solo have only 68KB.
+++hid,1024,0x00907000,0x11000
++ #file:dcd,plug,load nnn,jump [nnn/header/header2]
++ #jump nnn - header is after last downloaded word
++ # entire file is loaded before jump, needs load nnn as well
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in
++++ buildroot/package/Config.in
+@@ -344,6 +344,7 @@ endif
+ source "package/hwdata/Config.in"
+ source "package/i2c-tools/Config.in"
+ source "package/imx-test/Config.in"
++ source "package/imx-usb-loader/Config.in"
+ source "package/input-event-daemon/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/intel-microcode/Config.in"
diff --git a/patches/buildroot/2014.11/cleanup_buildroot.sh b/patches/buildroot/2014.11/cleanup_buildroot.sh
index 43e0cd6..3d1e485 100755
--- a/patches/buildroot/2014.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2014.11/cleanup_buildroot.sh
@@ -52,6 +52,10 @@ rm -rf buildroot/package/imx-test/Config.in
rm -rf buildroot/package/imx-test/imx-test-01_fixes.patch
rm -rf buildroot/package/imx-test/imx-test-02-mxc_vpu_test_v4l2_fixes.patch
rm -rf buildroot/package/imx-test/imx-test.mk
+rm -rf buildroot/package/imx-usb-loader/Config.in
+rm -rf buildroot/package/imx-usb-loader/Config.in.host
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader-0001-fix-ram-size.patch
+rm -rf buildroot/package/imx-usb-loader/imx-usb-loader.mk
rm -rf buildroot/package/marble/Config.in
rm -rf buildroot/package/marble/marble.mk
rm -rf buildroot/package/matiec/Config.in
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-12-10 07:20:24
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d3f2d831df92f35b47457a02e11ebf2b81b22d54 (commit)
via 3ca7494ce9678a29f94ffd8730863ee122991c40 (commit)
via 25f82ff9ce8718b994b7ecc6c06bc078357c053a (commit)
via 98849d6998b1c046db099ffbd170cfa5d5d7536d (commit)
via 3e59e122d8f65b6549017ae413777def12ce5ae6 (commit)
via e1afc4c2869a95e09a6c9fe41ee3ff75dc666ce4 (commit)
via 0dbaa8cf714f445834e0eb7f1994306cff48d9ba (commit)
via 19fa9c1f07bb8077be8f40c4f8bb6124e0f8f8a5 (commit)
from 9732e015cf3ce308070831aede2c134258d8b032 (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 d3f2d831df92f35b47457a02e11ebf2b81b22d54
Author: Philippe Reynes <tr...@gm...>
Date: Sat Nov 22 20:40:58 2014 +0100
[LINUX] 3.17: move to 3.17.4
commit 3ca7494ce9678a29f94ffd8730863ee122991c40
Author: Philippe Reynes <tr...@gm...>
Date: Sat Nov 22 20:40:57 2014 +0100
[LINUX] 3.14: move to 3.14.25
commit 25f82ff9ce8718b994b7ecc6c06bc078357c053a
Author: Philippe Reynes <tr...@gm...>
Date: Sat Nov 22 20:40:56 2014 +0100
[LINUX] 3.12: move to 3.12.33
commit 98849d6998b1c046db099ffbd170cfa5d5d7536d
Author: Philippe Reynes <tr...@gm...>
Date: Sat Nov 22 20:40:55 2014 +0100
[LINUX] 3.10: move to 3.10.61
commit 3e59e122d8f65b6549017ae413777def12ce5ae6
Author: Philippe Reynes <tr...@gm...>
Date: Sat Nov 22 20:40:53 2014 +0100
[LINUX] 3.17: update to 3.17.3
commit e1afc4c2869a95e09a6c9fe41ee3ff75dc666ce4
Author: Philippe Reynes <tr...@gm...>
Date: Sat Nov 22 20:40:52 2014 +0100
[LINUX] 3.14: move to 3.14.24
commit 0dbaa8cf714f445834e0eb7f1994306cff48d9ba
Author: Philippe Reynes <tr...@gm...>
Date: Sat Nov 22 20:40:51 2014 +0100
[LINUX] 3.12: move to 3.12.32
commit 19fa9c1f07bb8077be8f40c4f8bb6124e0f8f8a5
Author: Philippe Reynes <tr...@gm...>
Date: Sat Nov 22 20:40:50 2014 +0100
[LINUX] 3.10: move to 3.10.60
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.59.config => apf27-linux-3.10.61.config} | 0
...x-3.12.31.config => apf27-linux-3.12.33.config} | 0
...x-3.14.23.config => apf27-linux-3.14.25.config} | 0
...nux-3.17.2.config => apf27-linux-3.17.4.config} | 0
...x-3.10.59.config => apf28-linux-3.10.61.config} | 0
...x-3.12.31.config => apf28-linux-3.12.33.config} | 0
...x-3.14.23.config => apf28-linux-3.14.25.config} | 0
...nux-3.17.2.config => apf28-linux-3.17.4.config} | 0
...x-3.10.59.config => apf51-linux-3.10.61.config} | 0
...x-3.12.31.config => apf51-linux-3.12.33.config} | 0
...x-3.14.23.config => apf51-linux-3.14.25.config} | 0
...nux-3.17.2.config => apf51-linux-3.17.4.config} | 0
patches/linux/{3.10.59 => 3.10.61} | 0
patches/linux/{3.12.31 => 3.12.33} | 0
patches/linux/{3.14.23 => 3.14.25} | 0
patches/linux/{3.17.2 => 3.17.4} | 0
19 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.59.config => apf27-linux-3.10.61.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.31.config => apf27-linux-3.12.33.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14.23.config => apf27-linux-3.14.25.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.17.2.config => apf27-linux-3.17.4.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.59.config => apf28-linux-3.10.61.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.31.config => apf28-linux-3.12.33.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14.23.config => apf28-linux-3.14.25.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.17.2.config => apf28-linux-3.17.4.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.59.config => apf51-linux-3.10.61.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.31.config => apf51-linux-3.12.33.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.14.23.config => apf51-linux-3.14.25.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.17.2.config => apf51-linux-3.17.4.config} (100%)
rename patches/linux/{3.10.59 => 3.10.61} (100%)
rename patches/linux/{3.12.31 => 3.12.33} (100%)
rename patches/linux/{3.14.23 => 3.14.25} (100%)
rename patches/linux/{3.17.2 => 3.17.4} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index bbeb4f4..d6f8df1 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.2"
+BR2_DEFAULT_KERNEL_VERSION="3.17.4"
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.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.4"
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 e425162..1d54279 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.2"
+BR2_DEFAULT_KERNEL_VERSION="3.17.4"
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.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.4"
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 f7d9287..6f6befc 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.2"
+BR2_DEFAULT_KERNEL_VERSION="3.17.4"
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.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.4"
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.59.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.61.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.59.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.61.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.31.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.33.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.31.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.33.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.23.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.25.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14.23.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.25.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.17.4.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.17.2.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.17.4.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.59.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.61.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.59.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.61.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.31.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.33.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.31.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.33.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.23.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.25.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14.23.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.25.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.17.2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.17.4.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.17.2.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.17.4.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.59.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.61.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.59.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.61.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.31.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.33.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.31.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.33.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.23.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.14.25.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.14.23.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.14.25.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.17.4.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.17.2.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.17.4.config
diff --git a/patches/linux/3.10.59 b/patches/linux/3.10.61
similarity index 100%
rename from patches/linux/3.10.59
rename to patches/linux/3.10.61
diff --git a/patches/linux/3.12.31 b/patches/linux/3.12.33
similarity index 100%
rename from patches/linux/3.12.31
rename to patches/linux/3.12.33
diff --git a/patches/linux/3.14.23 b/patches/linux/3.14.25
similarity index 100%
rename from patches/linux/3.14.23
rename to patches/linux/3.14.25
diff --git a/patches/linux/3.17.2 b/patches/linux/3.17.4
similarity index 100%
rename from patches/linux/3.17.2
rename to patches/linux/3.17.4
hooks/post-receive
--
armadeus
|
