armadeus-commitlog Mailing List for armadeus (Page 49)
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: Nicolas <th...@us...> - 2014-02-17 16:57: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 fec9ccc3f7d53063735a1cc09eb16b55c804afdb (commit)
via 9b6d5b2102fbf7dc6f47b4852cd025162176c586 (commit)
from 2945ddf2933e84cec0ae0296b1b42f157638a015 (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 fec9ccc3f7d53063735a1cc09eb16b55c804afdb
Merge: 9b6d5b2 2945ddf
Author: Nicolas Colombain <nic...@ar...>
Date: Mon Feb 17 17:53:11 2014 +0100
Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code
commit 9b6d5b2102fbf7dc6f47b4852cd025162176c586
Author: Nicolas Colombain <nic...@ar...>
Date: Mon Feb 17 17:52:54 2014 +0100
[UBOOT] fix apf51 random crashes during startup
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf51/apf51-u-boot-2010.03.h | 50 +++++++++---------
.../device/armadeus/apf51/apf51-u-boot-2012.04.h | 52 +++++++++---------
.../device/armadeus/apf51/apf51-u-boot-2013.04.h | 54 ++++++++++----------
3 files changed, 78 insertions(+), 78 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
index 78fb140..eeaea21 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
@@ -29,7 +29,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "0.5"
-#define CONFIG_IDENT_STRING " apf51 patch 0.7"
+#define CONFIG_IDENT_STRING " apf51 patch 0.8"
//#define APF51_PROTO
//#define APF51_RECOVER
@@ -870,36 +870,36 @@
#define CONFIG_SYS_SDRAM_ESDCDLY5_REGISTER_VAL 0x00F48000
/* SDRAM IO Muxing */
-#define CONFIG_IOMUX_PAD_DRAM_RAS PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
-#define CONFIG_IOMUX_PAD_DRAM_CAS PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+#define CONFIG_IOMUX_PAD_DRAM_RAS PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
+#define CONFIG_IOMUX_PAD_DRAM_CAS PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_SDWE PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_SDCKE0 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_SDCKE1 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_SDCLK PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_MAX+PAD_CTL_SRE_FAST
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_SDQS0 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_SDQS1 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_SDQS2 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_SDQS3 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_CS0 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_CS1 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_DQM0 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_DQM1 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_DQM2 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_DQM3 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_EIM_SDBA2 PAD_CTL_DRV_VOT_LOW+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
+PAD_CTL_100K_PU
@@ -909,11 +909,11 @@
+PAD_CTL_100K_PD+PAD_CTL_DRV_LOW+PAD_CTL_SRE_FAST
#define CONFIG_IOMUX_GRP_DDRPKS PAD_CTL_PUE_PULL /* imx default */
-#define CONFIG_IOMUX_GRP_DRAM_B4 PAD_CTL_DRV_HIGH /* imx default */
+#define CONFIG_IOMUX_GRP_DRAM_B4 PAD_CTL_DRV_MAX
#define CONFIG_IOMUX_GRP_INDDR PAD_CTL_DDR_INPUT_CMOS /* imx default */
#define CONFIG_IOMUX_GRP_PKEDDR PAD_CTL_PKE_ENABLE /* imx default */
-#define CONFIG_IOMUX_GRP_DDR_A0 PAD_CTL_DRV_HIGH /* imx default */
-#define CONFIG_IOMUX_GRP_DDR_A1 PAD_CTL_DRV_MEDIUM /* imx default */
+#define CONFIG_IOMUX_GRP_DDR_A0 PAD_CTL_DRV_MAX
+#define CONFIG_IOMUX_GRP_DDR_A1 PAD_CTL_DRV_MAX
#define CONFIG_IOMUX_GRP_DDRAPUS PAD_CTL_100K_PU /* imx default */
#define CONFIG_IOMUX_GRP_HYSDDR0 PAD_CTL_HYS_NONE /* imx default */
#define CONFIG_IOMUX_GRP_HYSDDR1 PAD_CTL_HYS_NONE /* imx default */
@@ -930,14 +930,14 @@
#define CONFIG_IOMUX_GRP_DRAM_SR_B4 PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_GRP_INMODE1 PAD_CTL_DDR_INPUT_CMOS /* imx default */
-#define CONFIG_IOMUX_GRP_DRAM_B0 PAD_CTL_DRV_HIGH /* imx default */
-#define CONFIG_IOMUX_GRP_DRAM_B1 PAD_CTL_DRV_HIGH /* imx default */
+#define CONFIG_IOMUX_GRP_DRAM_B0 PAD_CTL_DRV_MAX
+#define CONFIG_IOMUX_GRP_DRAM_B1 PAD_CTL_DRV_MAX
-#define CONFIG_IOMUX_GRP_DDR_SR_A0 PAD_CTL_SRE_FAST /* imx default */
+#define CONFIG_IOMUX_GRP_DDR_SR_A0 PAD_CTL_SRE_SLOW
-#define CONFIG_IOMUX_GRP_DRAM_B2 PAD_CTL_DRV_HIGH /* imx default */
+#define CONFIG_IOMUX_GRP_DRAM_B2 PAD_CTL_DRV_MAX
-#define CONFIG_IOMUX_GRP_DDR_SR_A1 PAD_CTL_SRE_FAST /* imx default */
+#define CONFIG_IOMUX_GRP_DDR_SR_A1 PAD_CTL_SRE_SLOW
/* end of SDRAM IO Muxing */
#else /* use DDR2 */
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
index 4d441da..bb23f78 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
@@ -25,7 +25,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "1.2"
-#define CONFIG_IDENT_STRING " apf51 patch 1.8"
+#define CONFIG_IDENT_STRING " apf51 patch 1.9"
#define CONFIG_BOARD_NAME apf51
/*
@@ -620,50 +620,50 @@
#define ACFG_SDRAM_ESDCDLY5_REGISTER_VAL 0x00F48000
/* SDRAM IO Muxing */
-#define ACFG_IOMUX_PAD_DRAM_RAS PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* default */
-#define ACFG_IOMUX_PAD_DRAM_CAS PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* default */
+#define ACFG_IOMUX_PAD_DRAM_RAS PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
+#define ACFG_IOMUX_PAD_DRAM_CAS PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDWE \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDCKE0 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDCKE1 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDCLK \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_MAX+PAD_CTL_SRE_FAST
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDQS0 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDQS1 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDQS2 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDQS3 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_CS0 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_CS1 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_DQM0 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_DQM1 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_DQM2 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_DQM3 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_EIM_SDBA2 \
PAD_CTL_DRV_VOT_LOW+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
@@ -676,11 +676,11 @@
+PAD_CTL_100K_PD+PAD_CTL_DRV_LOW+PAD_CTL_SRE_FAST
#define ACFG_IOMUX_GRP_DDRPKS PAD_CTL_PUE_PULL /* imx default */
-#define ACFG_IOMUX_GRP_DRAM_B4 PAD_CTL_DRV_HIGH /* imx default */
+#define ACFG_IOMUX_GRP_DRAM_B4 PAD_CTL_DRV_MAX
#define ACFG_IOMUX_GRP_INDDR PAD_CTL_DDR_INPUT_CMOS /* imx default */
#define ACFG_IOMUX_GRP_PKEDDR PAD_CTL_PKE_ENABLE /* imx default */
-#define ACFG_IOMUX_GRP_DDR_A0 PAD_CTL_DRV_HIGH /* imx default */
-#define ACFG_IOMUX_GRP_DDR_A1 PAD_CTL_DRV_MEDIUM /* imx default */
+#define ACFG_IOMUX_GRP_DDR_A0 PAD_CTL_DRV_MAX
+#define ACFG_IOMUX_GRP_DDR_A1 PAD_CTL_DRV_MAX
#define ACFG_IOMUX_GRP_DDRAPUS PAD_CTL_100K_PU /* imx default */
#define ACFG_IOMUX_GRP_HYSDDR0 PAD_CTL_HYS_NONE /* imx default */
#define ACFG_IOMUX_GRP_HYSDDR1 PAD_CTL_HYS_NONE /* imx default */
@@ -697,14 +697,14 @@
#define ACFG_IOMUX_GRP_DDR_SR_B4 PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_GRP_INMODE1 PAD_CTL_DDR_INPUT_CMOS /* imx default */
-#define ACFG_IOMUX_GRP_DRAM_B0 PAD_CTL_DRV_HIGH /* imx default */
-#define ACFG_IOMUX_GRP_DRAM_B1 PAD_CTL_DRV_HIGH /* imx default */
+#define ACFG_IOMUX_GRP_DRAM_B0 PAD_CTL_DRV_MAX
+#define ACFG_IOMUX_GRP_DRAM_B1 PAD_CTL_DRV_MAX
-#define ACFG_IOMUX_GRP_DDR_SR_A0 PAD_CTL_SRE_FAST/* imx default */
+#define ACFG_IOMUX_GRP_DDR_SR_A0 PAD_CTL_SRE_SLOW
-#define ACFG_IOMUX_GRP_DRAM_B2 PAD_CTL_DRV_HIGH /* imx default */
+#define ACFG_IOMUX_GRP_DRAM_B2 PAD_CTL_DRV_MAX
-#define ACFG_IOMUX_GRP_DDR_SR_A1 PAD_CTL_SRE_FAST/* imx default */
+#define ACFG_IOMUX_GRP_DDR_SR_A1 PAD_CTL_SRE_SLOW
/* end of SDRAM IO Muxing */
/* CCM Configuration */
@@ -754,7 +754,7 @@
/* clock cycle time with x2 for a 0.5ns accuracy */
#define CONFIG_SYS_2XDDRCLK_LGTH (2000/APF_DDR_CLK) /* ns */
-#define ACFG_SDRAM_ESDMISC_REGISTER_VAL 0x000a5680
+#define ACFG_SDRAM_ESDMISC_REGISTER_VAL 0x000a5080
#if ((2*ACFG_SDRAM_RC_DELAY) > (16*CONFIG_SYS_2XDDRCLK_LGTH))
#define REG_FIELD_RC_VAL 0
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
index ee6fa7c..456fc2a 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
@@ -9,7 +9,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION 11
-#define CONFIG_IDENT_STRING " apf51 patch 2.2"
+#define CONFIG_IDENT_STRING " apf51 patch 2.3"
#define CONFIG_BOARD_NAME apf51
/*
@@ -102,7 +102,7 @@
/*
* Memory configurations
*/
-#define CONFIG_NR_DRAM_POPULATED 1
+#define CONFIG_NR_DRAM_POPULATED 1
#define CONFIG_NR_DRAM_BANKS 2
#define CONFIG_SYS_SDRAM_BASE CSD0_BASE_ADDR /* SDRAM bank #1 */
#define PHYS_SDRAM_SIZE 256
@@ -671,50 +671,50 @@
#define ACFG_SDRAM_ESDCDLY5_REGISTER_VAL 0x00F48000
/* SDRAM IO Muxing */
-#define ACFG_IOMUX_PAD_DRAM_RAS PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* default */
-#define ACFG_IOMUX_PAD_DRAM_CAS PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* default */
+#define ACFG_IOMUX_PAD_DRAM_RAS PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
+#define ACFG_IOMUX_PAD_DRAM_CAS PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDWE \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDCKE0 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDCKE1 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDCLK \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_MAX+PAD_CTL_SRE_FAST
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDQS0 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDQS1 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDQS2 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_SDQS3 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PD \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_CS0 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_CS1 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH /* imx default */
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_DQM0 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_DQM1 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_DQM2 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_DRAM_DQM3 \
PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
- +PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
+ +PAD_CTL_DRV_MAX+PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_PAD_EIM_SDBA2 \
PAD_CTL_DRV_VOT_LOW+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
@@ -727,11 +727,11 @@
+PAD_CTL_100K_PD+PAD_CTL_DRV_LOW+PAD_CTL_SRE_FAST
#define ACFG_IOMUX_GRP_DDRPKS PAD_CTL_PUE_PULL /* imx default */
-#define ACFG_IOMUX_GRP_DRAM_B4 PAD_CTL_DRV_HIGH /* imx default */
+#define ACFG_IOMUX_GRP_DRAM_B4 PAD_CTL_DRV_MAX
#define ACFG_IOMUX_GRP_INDDR PAD_CTL_DDR_INPUT_CMOS /* imx default */
#define ACFG_IOMUX_GRP_PKEDDR PAD_CTL_PKE_ENABLE /* imx default */
-#define ACFG_IOMUX_GRP_DDR_A0 PAD_CTL_DRV_HIGH /* imx default */
-#define ACFG_IOMUX_GRP_DDR_A1 PAD_CTL_DRV_MEDIUM /* imx default */
+#define ACFG_IOMUX_GRP_DDR_A0 PAD_CTL_DRV_MAX
+#define ACFG_IOMUX_GRP_DDR_A1 PAD_CTL_DRV_MAX
#define ACFG_IOMUX_GRP_DDRAPUS PAD_CTL_100K_PU /* imx default */
#define ACFG_IOMUX_GRP_HYSDDR0 PAD_CTL_HYS_NONE /* imx default */
#define ACFG_IOMUX_GRP_HYSDDR1 PAD_CTL_HYS_NONE /* imx default */
@@ -748,14 +748,14 @@
#define ACFG_IOMUX_GRP_DDR_SR_B4 PAD_CTL_SRE_SLOW
#define ACFG_IOMUX_GRP_INMODE1 PAD_CTL_DDR_INPUT_CMOS /* imx default */
-#define ACFG_IOMUX_GRP_DRAM_B0 PAD_CTL_DRV_HIGH /* imx default */
-#define ACFG_IOMUX_GRP_DRAM_B1 PAD_CTL_DRV_HIGH /* imx default */
+#define ACFG_IOMUX_GRP_DRAM_B0 PAD_CTL_DRV_MAX
+#define ACFG_IOMUX_GRP_DRAM_B1 PAD_CTL_DRV_MAX
-#define ACFG_IOMUX_GRP_DDR_SR_A0 PAD_CTL_SRE_FAST/* imx default */
+#define ACFG_IOMUX_GRP_DDR_SR_A0 PAD_CTL_SRE_SLOW
-#define ACFG_IOMUX_GRP_DRAM_B2 PAD_CTL_DRV_HIGH /* imx default */
+#define ACFG_IOMUX_GRP_DRAM_B2 PAD_CTL_DRV_MAX
-#define ACFG_IOMUX_GRP_DDR_SR_A1 PAD_CTL_SRE_FAST/* imx default */
+#define ACFG_IOMUX_GRP_DDR_SR_A1 PAD_CTL_SRE_SLOW
/* end of SDRAM IO Muxing */
/* CCM Configuration */
@@ -805,7 +805,7 @@
/* clock cycle time with x2 for a 0.5ns accuracy */
#define CONFIG_SYS_2XDDRCLK_LGTH (2000/APF_DDR_CLK) /* ns */
-#define ACFG_SDRAM_ESDMISC_REGISTER_VAL 0x000a5680
+#define ACFG_SDRAM_ESDMISC_REGISTER_VAL 0x000a5080
#if ((2*ACFG_SDRAM_RC_DELAY) > (16*CONFIG_SYS_2XDDRCLK_LGTH))
#define REG_FIELD_RC_VAL 0
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2014-02-17 16:05: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 2945ddf2933e84cec0ae0296b1b42f157638a015 (commit)
from d904df43a4654c45275c26a57b263c438f43428c (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 2945ddf2933e84cec0ae0296b1b42f157638a015
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Feb 17 16:54:39 2014 +0100
[BUILDROOT] Fix application of uclibc patches for accept4 kernel function.
-----------------------------------------------------------------------
Summary of changes:
.../182-uclibc-add_accept4_declaration_fix.patch | 80 +------------------
patches/buildroot/2013.11/cleanup_buildroot.sh | 2 +
2 files changed, 7 insertions(+), 75 deletions(-)
diff --git a/patches/buildroot/2013.11/182-uclibc-add_accept4_declaration_fix.patch b/patches/buildroot/2013.11/182-uclibc-add_accept4_declaration_fix.patch
index 2422cd2..ee4be78 100644
--- a/patches/buildroot/2013.11/182-uclibc-add_accept4_declaration_fix.patch
+++ b/patches/buildroot/2013.11/182-uclibc-add_accept4_declaration_fix.patch
@@ -1,11 +1,12 @@
Fix accept4 declaration in uClibc when not available in Linux Kernel.
+This patch is useful to make new Qt versions (>= 4.8) compile with old Linux kernel (< 2.6.38).
Signed-off-by: Jérémie Scheer <jer...@ar...>
-Index: buildroot/toolchain/uClibc/uClibc-0.9.33.2-accept4-declaration-fix.patch
+Index: buildroot/package/uclibc/0.9.33.2/uclibc-0055-accept4-declaration-fix.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/toolchain/uClibc/uClibc-0.9.33.2-accept4-declaration-fix.patch 2012-03-26 16:34:32.000000000 +0200
++++ buildroot/package/uclibc/0.9.33.2/uclibc-0055-accept4-declaration-fix.patch 2014-02-17 16:13:26.000000000 +0100
@@ -0,0 +1,33 @@
+From db6b038ff049a5b6e11b03d2cdb66248002eafff Mon Sep 17 00:00:00 2001
+From: Guillaume Emont <gui...@ig...>
@@ -40,81 +41,10 @@ Index: buildroot/toolchain/uClibc/uClibc-0.9.33.2-accept4-declaration-fix.patch
+--
+1.7.4.1
+
-Index: buildroot/toolchain/uClibc/uClibc-0.9.33.2-assume-accept4-in-recent-arm-kernels.patch
+Index: buildroot/package/uclibc/0.9.33.2/uclibc-0056-assume-accept4-in-recent-arm-kernels.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/toolchain/uClibc/uClibc-0.9.33.2-assume-accept4-in-recent-arm-kernels.patch 2012-03-26 17:04:36.000000000 +0200
-@@ -0,0 +1,28 @@
-+From c526492ee2284b6ae61040b2eac5b03120fb3185 Mon Sep 17 00:00:00 2001
-+From: Guillaume Emont <gui...@ig...>
-+Date: Thu, 15 Sep 2011 20:19:57 +0200
-+Subject: [PATCH 2/2] define __ASSUME_ACCEPT4 for arm for kernels >= 2.6.36
-+
-+---
-+ libc/sysdeps/linux/common/bits/kernel-features.h | 5 +++++
-+ 1 files changed, 5 insertions(+), 0 deletions(-)
-+
-+diff --git a/libc/sysdeps/linux/common/bits/kernel-features.h b/libc/sysdeps/linux/common/bits/kernel-features.h
-+index 6bf5544..be92f90 100644
-+--- a/libc/sysdeps/linux/common/bits/kernel-features.h
-++++ b/libc/sysdeps/linux/common/bits/kernel-features.h
-+@@ -479,6 +479,11 @@
-+ # define __ASSUME_ACCEPT4 1
-+ #endif
-+
-++/* Correct support for the accept4 syscall for arm was added in 2.6.36. */
-++#if __LINUX_KERNEL_VERSION >= 0x020624 && defined __arm__
-++# define __ASSUME_ACCEPT4 1
-++#endif
-++
-+ /* Support for the FUTEX_CLOCK_REALTIME flag was added in 2.6.29. */
-+ #if __LINUX_KERNEL_VERSION >= 0x02061d
-+ # define __ASSUME_FUTEX_CLOCK_REALTIME 1
-+--
-+1.7.4.1
-+
-Index: buildroot/toolchain/uClibc/uClibc-0.9.33-accept4-declaration-fix.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/toolchain/uClibc/uClibc-0.9.33-accept4-declaration-fix.patch 2012-03-26 16:34:32.000000000 +0200
-@@ -0,0 +1,33 @@
-+From db6b038ff049a5b6e11b03d2cdb66248002eafff Mon Sep 17 00:00:00 2001
-+From: Guillaume Emont <gui...@ig...>
-+Date: Thu, 15 Sep 2011 20:19:19 +0200
-+Subject: [PATCH 1/2] Only expose accept4 in headers if it is available
-+
-+---
-+ include/sys/socket.h | 3 ++-
-+ 1 files changed, 2 insertions(+), 1 deletions(-)
-+
-+diff --git a/include/sys/socket.h b/include/sys/socket.h
-+index 6037f92..53b56ea 100644
-+--- a/include/sys/socket.h
-++++ b/include/sys/socket.h
-+@@ -22,6 +22,7 @@
-+ #define _SYS_SOCKET_H 1
-+
-+ #include <features.h>
-++#include <bits/kernel-features.h>
-+
-+ __BEGIN_DECLS
-+
-+@@ -227,7 +228,7 @@ extern int accept (int __fd, __SOCKADDR_ARG __addr,
-+ socklen_t *__restrict __addr_len);
-+ libc_hidden_proto(accept)
-+
-+-#if defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU
-++#if defined __UCLIBC_LINUX_SPECIFIC__ && defined __USE_GNU && defined __ASSUME_ACCEPT4
-+ /* Similar to 'accept' but takes an additional parameter to specify flags.
-+
-+ This function is a cancellation point and therefore not marked with
-+--
-+1.7.4.1
-+
-Index: buildroot/toolchain/uClibc/uClibc-0.9.33-assume-accept4-in-recent-arm-kernels.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/toolchain/uClibc/uClibc-0.9.33-assume-accept4-in-recent-arm-kernels.patch 2012-03-26 17:04:36.000000000 +0200
++++ buildroot/package/uclibc/0.9.33.2/uclibc-0056-assume-accept4-in-recent-arm-kernels.patch 2014-02-17 16:13:41.000000000 +0100
@@ -0,0 +1,28 @@
+From c526492ee2284b6ae61040b2eac5b03120fb3185 Mon Sep 17 00:00:00 2001
+From: Guillaume Emont <gui...@ig...>
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index c8e16cc..89a6f4e 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -80,3 +80,5 @@ rm -rf buildroot/linux/
rm -rf buildroot/package/freescale-imx/imx-lib/*.patch
rm -rf buildroot/package/libpng/
rm -rf buildroot/package/mmc-utils/
+rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0055-accept4-declaration-fix.patch
+rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0056-assume-accept4-in-recent-arm-kernels.patch
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-02-17 14:09:54
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via d904df43a4654c45275c26a57b263c438f43428c (commit)
from 2a4ba83105c82a9d76397f1020ab6ec1b2b41b86 (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 d904df43a4654c45275c26a57b263c438f43428c
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Feb 17 15:10:28 2014 +0100
[LINUX] 3.14-rc3: apf6: move fec node from apf6dev device tree to apf6
device tree
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 34 ++++++++++----------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/patches/linux/3.14-rc3/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.14-rc3/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index e197828..be62fc1 100644
--- a/patches/linux/3.14-rc3/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.14-rc3/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.14-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.14-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.14-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.14-rc3/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -31,11 +31,11 @@ Index: linux-3.14-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -0,0 +1,80 @@
++++ linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -0,0 +1,87 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -95,6 +95,13 @@ Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+};
+
++&fec {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_enet_1>;
++ phy-mode = "rgmii";
++ status = "okay";
++};
++
+/* Bluetooth */
+&uart2 {
+ pinctrl-names = "default";
@@ -116,11 +123,11 @@ Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,162 @@
++++ linux-3.14-rc3/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+@@ -0,0 +1,155 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -225,13 +232,6 @@ Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ };
+};
+
-+&fec {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_enet_1>;
-+ phy-mode = "rgmii";
-+ status = "okay";
-+};
-+
+&pcie {
+ reset-gpio = <&gpio6 2 0>;
+ status = "okay";
@@ -283,10 +283,10 @@ Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ cd-gpios = <&gpio1 2 0>;
+ status = "okay";
+};
-Index: linux-3.14-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.14-rc3/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.14-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.14-rc3/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-02-17 13:46:47
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 2a4ba83105c82a9d76397f1020ab6ec1b2b41b86 (commit)
from 476bd0d7e08a4f8f50fa5a5d7a77ba1c8e2fa2f9 (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 2a4ba83105c82a9d76397f1020ab6ec1b2b41b86
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 17 14:46:18 2014 +0100
[BUILDROOT] APF6: Add a config for building xenomai for the APF6 (kernel 3.10.18)
-----------------------------------------------------------------------
Summary of changes:
.../{apf6_defconfig => apf6xenomai_defconfig} | 10 ++-
...072-armadeus-xenomai-download-adeos-patch.patch | 59 ++++++++++++++++++++
2 files changed, 65 insertions(+), 4 deletions(-)
copy buildroot/configs/{apf6_defconfig => apf6xenomai_defconfig} (71%)
create mode 100644 patches/buildroot/2013.11/072-armadeus-xenomai-download-adeos-patch.patch
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6xenomai_defconfig
similarity index 71%
copy from buildroot/configs/apf6_defconfig
copy to buildroot/configs/apf6xenomai_defconfig
index a1c8478..019da2e 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6xenomai_defconfig
@@ -1,7 +1,6 @@
BR2_arm=y
BR2_cortex_a9=y
BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
@@ -12,14 +11,16 @@ 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-rc3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.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"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/apf6xenomai-linux-$(BR2_LINUX_KERNEL_VERSION).config"
BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-wandboard imx6dl-apf6dev imx6q-apf6dev"
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_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
@@ -33,6 +34,7 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+BR2_PACKAGE_XENOMAI_VERSION="2.6.3"
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_TARGET_ROOTFS_EXT2=y
diff --git a/patches/buildroot/2013.11/072-armadeus-xenomai-download-adeos-patch.patch b/patches/buildroot/2013.11/072-armadeus-xenomai-download-adeos-patch.patch
new file mode 100644
index 0000000..96737ed
--- /dev/null
+++ b/patches/buildroot/2013.11/072-armadeus-xenomai-download-adeos-patch.patch
@@ -0,0 +1,59 @@
+Allows downloading of adeos patch if not present locally
+
+TODO: mark BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH as deprecated in BR before
+submitting mainline.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+
+Index: buildroot/linux/linux-ext-xenomai.mk
+===================================================================
+--- buildroot.orig/linux/linux-ext-xenomai.mk 2014-02-12 17:58:11.097907920 +0100
++++ buildroot/linux/linux-ext-xenomai.mk 2014-02-14 16:42:59.698419136 +0100
+@@ -9,11 +9,20 @@
+ LINUX_DEPENDENCIES += xenomai
+
+ # Adeos patch version
+-XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
++XENOMAI_ADEOS_PATCH_URL = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL))
++XENOMAI_ADEOS_PATCH = $(shell basename $(XENOMAI_ADEOS_PATCH_URL))
++ifneq ($(XENOMAI_ADEOS_PATCH_URL),)
++define XENOMAI_ADEOS_DOWNLOAD_PATCH
++ @$(call MESSAGE,"Download adeos patch")
++ $(call DOWNLOAD,$(XENOMAI_ADEOS_PATCH_URL))
++endef
++LINUX_POST_DOWNLOAD_HOOKS += XENOMAI_ADEOS_DOWNLOAD_PATCH
++endif
++
+ ifeq ($(XENOMAI_ADEOS_PATCH),)
+ XENOMAI_ADEOS_OPT = --default
+ else
+-XENOMAI_ADEOS_OPT = --adeos=$(XENOMAI_ADEOS_PATCH)
++XENOMAI_ADEOS_OPT = --adeos=$(DL_DIR)/$(XENOMAI_ADEOS_PATCH)
+ endif
+
+ # Prepare kernel patch
+Index: buildroot/linux/Config.ext.in
+===================================================================
+--- buildroot.orig/linux/Config.ext.in 2014-02-14 16:44:35.518894282 +0100
++++ buildroot/linux/Config.ext.in 2014-02-14 16:49:25.292331195 +0100
+@@ -21,13 +21,14 @@
+ BR2_bfin || BR2_powerpc || BR2_sh4
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+-config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
++config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH_URL
+ depends on BR2_LINUX_KERNEL_EXT_XENOMAI
+- string "Path for Adeos patch file"
++ string "Path/url for Adeos patch file"
+ help
+- Optionally, explicitly specify the Adeos patch to use.
+- Download it at http://download.gna.org/adeos/patches/v2.6/$(ARCH)/
+- and verify that your kernel version in buildroot matches.
++ Optionally, explicitly specify where to find the Adeos patch to use.
++ Examples http://download.gna.org/adeos/patches/v2.6/arm/adeos-ipipe-2.6.38.8-arm-1.18-09.patch
++ or file:///home/foo/adeos-ipipe-2.6.38.8-arm-1.18-09.patch
++ Please verify that your kernel version in Buildroot matches.
+
+ # RTAI
+ config BR2_LINUX_KERNEL_EXT_RTAI
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-02-17 13:43:40
|
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 476bd0d7e08a4f8f50fa5a5d7a77ba1c8e2fa2f9 (commit)
from db7421a851967db16a5d7c9ddd6a11b50e321d77 (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 476bd0d7e08a4f8f50fa5a5d7a77ba1c8e2fa2f9
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 17 14:42:33 2014 +0100
[LINUX] APF6: Add support for Linux 3.10.18 (for Xenomai)
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf6/apf6xenomai-linux-3.10.18.config | 1 +
...x-3.14.config => apf6xenomai-linux-3.10.config} | 68 ++---
patches/linux/{3.10.30 => 3.10.18} | 0
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 306 ++++++++++++++------
4 files changed, 242 insertions(+), 133 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf6/apf6xenomai-linux-3.10.18.config
copy buildroot/target/device/armadeus/apf6/{apf6failsafe-linux-3.14.config => apf6xenomai-linux-3.10.config} (86%)
copy patches/linux/{3.10.30 => 3.10.18} (100%)
copy patches/linux/{3.13 => 3.10}/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch (50%)
diff --git a/buildroot/target/device/armadeus/apf6/apf6xenomai-linux-3.10.18.config b/buildroot/target/device/armadeus/apf6/apf6xenomai-linux-3.10.18.config
new file mode 120000
index 0000000..2ea7785
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6/apf6xenomai-linux-3.10.18.config
@@ -0,0 +1 @@
+apf6xenomai-linux-3.10.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14.config b/buildroot/target/device/armadeus/apf6/apf6xenomai-linux-3.10.config
similarity index 86%
copy from buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14.config
copy to buildroot/target/device/armadeus/apf6/apf6xenomai-linux-3.10.config
index f330375..0aa96f1 100644
--- a/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14.config
+++ b/buildroot/target/device/armadeus/apf6/apf6xenomai-linux-3.10.config
@@ -16,6 +16,8 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
# CONFIG_BLK_DEV_BSG is not set
+CONFIG_XENO_DRIVERS_CAN=m
+CONFIG_XENO_DRIVERS_CAN_FLEXCAN=m
CONFIG_ARCH_MULTI_V6=y
CONFIG_ARCH_MXC=y
CONFIG_MACH_MX31LILLY=y
@@ -35,17 +37,15 @@ CONFIG_MACH_IMX51_DT=y
CONFIG_MACH_EUKREA_CPUIMX51SD=y
CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_SOC_VF610=y
CONFIG_SMP=y
CONFIG_VMSPLIT_2G=y
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_AEABI=y
-CONFIG_CMDLINE="noinitrd console=ttymxc3,115200"
+# CONFIG_OABI_COMPAT is not set
+CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_BINFMT_MISC=m
-CONFIG_PM_RUNTIME=y
CONFIG_PM_DEBUG=y
CONFIG_PM_TEST_SUSPEND=y
CONFIG_NET=y
@@ -61,12 +61,9 @@ CONFIG_IP_PNP_DHCP=y
CONFIG_IPV6=y
CONFIG_NETFILTER=y
# CONFIG_WIRELESS is not set
-CONFIG_RFKILL=y
-CONFIG_RFKILL_INPUT=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
-CONFIG_IMX_WEIM=y
CONFIG_CONNECTOR=y
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
@@ -76,7 +73,6 @@ CONFIG_MTD_JEDECPROBE=y
CONFIG_MTD_CFI_INTELEXT=y
CONFIG_MTD_CFI_AMDSTD=y
CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_PHYSMAP_OF=y
CONFIG_MTD_DATAFLASH=y
CONFIG_MTD_M25P80=y
CONFIG_MTD_SST25L=y
@@ -97,8 +93,6 @@ CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_SCAN_ASYNC=y
# CONFIG_SCSI_LOWLEVEL is not set
CONFIG_ATA=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_AHCI_IMX=y
CONFIG_PATA_IMX=y
CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_BROADCOM is not set
@@ -124,17 +118,15 @@ CONFIG_KEYBOARD_IMX=y
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ELANTECH=y
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_EGALAX=y
CONFIG_TOUCHSCREEN_MC13783=y
CONFIG_INPUT_MISC=y
CONFIG_INPUT_MMA8450=y
CONFIG_SERIO_SERPORT=m
+CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_LEGACY_PTYS is not set
# CONFIG_DEVKMEM is not set
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_SERIAL_FSL_LPUART=y
-CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_MXC_RNGA=y
# CONFIG_I2C_COMPAT is not set
@@ -149,52 +141,55 @@ CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_MC9S08DZ60=y
# CONFIG_HWMON is not set
CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_IMX2_WDT=y
CONFIG_MFD_DA9052_I2C=y
CONFIG_MFD_MC13XXX_SPI=y
CONFIG_MFD_MC13XXX_I2C=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_ANATOP=y
CONFIG_REGULATOR_DA9052=y
+CONFIG_REGULATOR_ANATOP=y
CONFIG_REGULATOR_MC13783=y
CONFIG_REGULATOR_MC13892=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=y
+CONFIG_VIDEO_MX3=y
+CONFIG_SOC_CAMERA_OV2640=y
CONFIG_DRM=y
-CONFIG_FB=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_L4F00242T03=y
CONFIG_LCD_PLATFORM=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
CONFIG_LOGO=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_IMX_SOC=y
+CONFIG_SND_SOC_PHYCORE_AC97=y
+CONFIG_SND_SOC_EUKREA_TLV320=y
+CONFIG_SND_SOC_IMX_SGTL5000=y
+CONFIG_SND_SOC_IMX_MC13783=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_MXC=y
CONFIG_USB_STORAGE=y
CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_PHY=y
CONFIG_USB_MXS_PHY=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ETH=m
-CONFIG_USB_MASS_STORAGE=m
CONFIG_MMC=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_ESDHC_IMX=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_GPIO=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_INTF_DEV_UIE_EMUL=y
CONFIG_RTC_DRV_MC13XXX=y
@@ -203,6 +198,11 @@ CONFIG_RTC_DRV_SNVS=y
CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y
CONFIG_MXS_DMA=y
+CONFIG_STAGING=y
+CONFIG_DRM_IMX=y
+CONFIG_DRM_IMX_IPUV3_CORE=y
+CONFIG_DRM_IMX_IPUV3=y
+CONFIG_COMMON_CLK_DEBUG=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
@@ -226,6 +226,7 @@ CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
+CONFIG_CONFIGFS_FS=m
CONFIG_JFFS2_FS=y
CONFIG_UBIFS_FS=y
CONFIG_NFS_FS=y
@@ -240,22 +241,13 @@ CONFIG_NLS_ISO8859_15=m
CONFIG_NLS_UTF8=y
CONFIG_MAGIC_SYSRQ=y
# CONFIG_SCHED_DEBUG is not set
-CONFIG_PROVE_LOCKING=y
# CONFIG_DEBUG_BUGVERBOSE is not set
# CONFIG_FTRACE is not set
# CONFIG_ARM_UNWIND is not set
CONFIG_SECURITYFS=y
-CONFIG_CRYPTO_CCM=y
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_ARC4=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
# CONFIG_CRYPTO_HW is not set
CONFIG_CRC_CCITT=m
CONFIG_CRC_T10DIF=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
-CONFIG_AVERAGE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
diff --git a/patches/linux/3.10.30 b/patches/linux/3.10.18
similarity index 100%
copy from patches/linux/3.10.30
copy to patches/linux/3.10.18
diff --git a/patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.10/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
similarity index 50%
copy from patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
copy to patches/linux/3.10/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 97b773f..3b3b057 100644
--- a/patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.10/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,24 +1,8 @@
-Index: linux-3.13/arch/arm/boot/dts/Makefile
+Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
---- linux-3.13.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.13/arch/arm/boot/dts/Makefile
-@@ -136,9 +136,11 @@ dtb-$(CONFIG_ARCH_MXC) += \
- imx53-mba53.dtb \
- imx53-qsb.dtb \
- imx53-smd.dtb \
-+ imx6dl-apf6dev.dtb \
- imx6dl-sabreauto.dtb \
- imx6dl-sabresd.dtb \
- imx6dl-wandboard.dtb \
-+ imx6q-apf6dev.dtb \
- imx6q-arm2.dtb \
- imx6q-phytec-pbab01.dtb \
- imx6q-sabreauto.dtb \
-Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
-===================================================================
---- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
-@@ -0,0 +1,28 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dts 2014-02-17 11:22:26.647139601 +0100
+@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -32,11 +16,11 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+
+/dts-v1/;
+#include "imx6q.dtsi"
-+#include "imx6qdl-apf6.dtsi"
-+#include "imx6qdl-apf6dev.dtsi"
++#include "imx6q-apf6.dtsi"
++#include "imx6q-apf6dev.dtsi"
+
+/ {
-+ model = "Armadeus APF6Dev i.MX6 Quad / Dual Board";
++ model = "Armadeus APF6 i.MX6 Quad / Dual Module on APF6Dev Board";
+ compatible = "armadeus,imx6q-apf6dev", "armadeus,imx6q-apf6", "fsl,imx6q";
+
+ memory {
@@ -44,14 +28,16 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+ };
+};
+
++/*
+&sata {
+ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++*/
+Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
---- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -0,0 +1,76 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6.dtsi 2014-02-17 11:42:29.341103441 +0100
+@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -85,28 +71,6 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ };
+};
+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ hog {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
-+ >;
-+ };
-+
-+ pinctrl_uart2_3: uart2grp-3 {
-+ fsl,pins = <
-+ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
-+ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
-+ >;
-+ };
-+ };
-+};
-+
+/* Bluetooth */
+&uart2 {
+ pinctrl-names = "default";
@@ -115,11 +79,13 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+};
+
+/* Wi-Fi */
++/*
+&usdhc1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc1_2>;
+ status = "okay";
+};
++*/
+
+/* eMMC */
+&usdhc3 {
@@ -128,11 +94,11 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
---- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
-@@ -0,0 +1,162 @@
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi 2014-02-17 11:45:51.374105275 +0100
+@@ -0,0 +1,138 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -187,11 +153,13 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ };
+};
+
++/*
+&hdmi {
+ ddc = <&i2c1>;
+ status = "okay";
+};
-+
++*/
++/*
+&i2c1 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default";
@@ -205,56 +173,26 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ pinctrl-0 = <&pinctrl_i2c2_2>;
+ status = "okay";
+};
-+
-+&iomuxc {
-+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_hog>;
-+
-+ hog {
-+ pinctrl_hog: hoggrp {
-+ fsl,pins = <
-+ MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000
-+ MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
-+ MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
-+ >;
-+ };
-+
-+ pinctrl_uart3_3: uart3grp-3 {
-+ fsl,pins = <
-+ MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
-+ MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
-+ MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
-+ >;
-+ };
-+
-+ pinctrl_uart4_2: uart4grp-2 {
-+ fsl,pins = <
-+ MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
-+ MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
-+ >;
-+ };
-+ };
-+};
-+
++*/
+&fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_enet_1>;
+ phy-mode = "rgmii";
+ status = "okay";
+};
-+
++/*
+&pcie {
+ reset-gpio = <&gpio6 2 0>;
+ status = "okay";
+};
-+
++*/
++/*
+&pwm3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm3_1>;
+ status = "okay";
+};
-+
++*/
+/* GPS */
+&uart1 {
+ pinctrl-names = "default";
@@ -280,6 +218,7 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ status = "okay";
+};
+
++/*
+&usbotg {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbotg_1>;
@@ -287,18 +226,21 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ dr_mode = "otg";
+ status = "okay";
+};
++*/
+
+/* microSD */
++/*
+&usdhc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc2_2>;
+ cd-gpios = <&gpio1 2 0>;
+ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/imx6dl-apf6dev.dts
++*/
+Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
---- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6dl-apf6dev.dts
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dts 2014-02-17 10:58:09.335913198 +0100
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -313,14 +255,188 @@ Index: linux-3.13/arch/arm/boot/dts/imx6dl-apf6dev.dts
+
+/dts-v1/;
+#include "imx6dl.dtsi"
-+#include "imx6qdl-apf6.dtsi"
-+#include "imx6qdl-apf6dev.dtsi"
++#include "imx6dl-apf6.dtsi"
++#include "imx6dl-apf6dev.dtsi"
+
+/ {
-+ model = "Armadeus APF6Dev i.MX6 Dual Light Board";
++ model = "Armadeus APF6 i.MX6 Dual Lite Module on APF6Dev Board";
+ compatible = "armadeus,imx6dl-apf6dev", "armadeus,imx6dl-apf6", "fsl,imx6dl";
+
+ memory {
+ reg = <0x10000000 0x40000000>;
+ };
+};
+Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6.dtsi
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6.dtsi 2014-02-17 10:57:17.391655619 +0100
+@@ -0,0 +1,34 @@
++/*
++ * Copyright 2014 Armadeus Systems
++ *
++ * Author: Armadeus Systems <su...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ */
++
++#include "imx6qdl-apf6.dtsi"
++
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog>;
++
++ hog {
++ pinctrl_hog: hoggrp {
++ fsl,pins = <
++ MX6DL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
++ >;
++ };
++
++ pinctrl_uart2_3: uart2grp-3 {
++ fsl,pins = <
++ MX6DL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
++ MX6DL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
++ MX6DL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
++ MX6DL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
++ >;
++ };
++ };
++};
+Index: linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dtsi
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6dl-apf6dev.dtsi 2014-02-17 11:00:14.108531917 +0100
+@@ -0,0 +1,43 @@
++/*
++ * Copyright 2014 Armadeus Systems
++ *
++ * Author: Armadeus Systems <su...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ */
++
++#include "imx6qdl-apf6dev.dtsi"
++
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog>;
++
++ hog {
++ pinctrl_hog: hoggrp {
++ fsl,pins = <
++ MX6DL_PAD_GPIO_9__GPIO1_IO09 0x80000000
++ MX6DL_PAD_GPIO_17__GPIO7_IO12 0x80000000
++ MX6DL_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
++ >;
++ };
++
++ pinctrl_uart3_3: uart3grp-3 {
++ fsl,pins = <
++ MX6DL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
++ MX6DL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
++ MX6DL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
++ MX6DL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
++ >;
++ };
++
++ pinctrl_uart4_2: uart4grp-2 {
++ fsl,pins = <
++ MX6DL_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
++ MX6DL_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
++ >;
++ };
++ };
++};
+Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6.dtsi
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6q-apf6.dtsi 2014-02-17 11:25:55.484175170 +0100
+@@ -0,0 +1,34 @@
++/*
++ * Copyright 2014 Armadeus Systems
++ *
++ * Author: Armadeus Systems <su...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ */
++
++#include "imx6qdl-apf6.dtsi"
++
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog>;
++
++ hog {
++ pinctrl_hog: hoggrp {
++ fsl,pins = <
++ MX6Q_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
++ >;
++ };
++
++ pinctrl_uart2_3: uart2grp-3 {
++ fsl,pins = <
++ MX6Q_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
++ MX6Q_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1
++ MX6Q_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1
++ MX6Q_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
++ >;
++ };
++ };
++};
+Index: linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dtsi
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.10.18/arch/arm/boot/dts/imx6q-apf6dev.dtsi 2014-02-17 11:33:41.270484892 +0100
+@@ -0,0 +1,43 @@
++/*
++ * Copyright 2014 Armadeus Systems
++ *
++ * Author: Armadeus Systems <su...@ar...>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ */
++
++#include "imx6qdl-apf6dev.dtsi"
++
++&iomuxc {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_hog>;
++
++ hog {
++ pinctrl_hog: hoggrp {
++ fsl,pins = <
++ MX6Q_PAD_GPIO_9__GPIO1_IO09 0x80000000
++ MX6Q_PAD_GPIO_17__GPIO7_IO12 0x80000000
++ MX6Q_PAD_CSI0_DAT16__GPIO6_IO02 0x80000000
++ >;
++ };
++
++ pinctrl_uart3_3: uart3grp-3 {
++ fsl,pins = <
++ MX6Q_PAD_EIM_D23__UART3_CTS_B 0x1b0b1
++ MX6Q_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
++ MX6Q_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
++ MX6Q_PAD_EIM_D31__UART3_RTS_B 0x1b0b1
++ >;
++ };
++
++ pinctrl_uart4_2: uart4grp-2 {
++ fsl,pins = <
++ MX6Q_PAD_CSI0_DAT13__UART4_TX_DATA 0x1b0b1
++ MX6Q_PAD_CSI0_DAT13__UART4_RX_DATA 0x1b0b1
++ >;
++ };
++ };
++};
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-02-17 13:02:26
|
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 db7421a851967db16a5d7c9ddd6a11b50e321d77 (commit)
from 891eb88a333ba5ece9d617612402bb07e2b61e05 (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 db7421a851967db16a5d7c9ddd6a11b50e321d77
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Feb 17 14:01:10 2014 +0100
[BUILD] Fix Qt version detection to set ARMADEUS_QT_VERSION variable.
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 0aad68b..85b440c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,7 +59,8 @@ endif
ifeq ($(BR2_PACKAGE_QT),y)
ARMADEUS_QT_MAKEFILE:=package/qt/qt.mk
-ARMADEUS_QT_VERSION:=$(shell grep "QT_VERSION =" $(BUILDROOT_DIR)/$(ARMADEUS_QT_MAKEFILE) 2>/dev/null | cut -d = -f 2)
+ARMADEUS_QT_VERSION_MAJOR:=$(shell grep "QT_VERSION_MAJOR =" $(BUILDROOT_DIR)/$(ARMADEUS_QT_MAKEFILE) 2>/dev/null | cut -d ' ' -f 3)
+ARMADEUS_QT_VERSION:=$(ARMADEUS_QT_VERSION_MAJOR)"."$(shell grep "QT_VERSION =" $(BUILDROOT_DIR)/$(ARMADEUS_QT_MAKEFILE) 2>/dev/null | cut -d '.' -f 2)
ARMADEUS_QT_VERSION:=$(strip $(ARMADEUS_QT_VERSION))
else
ARMADEUS_QT_VERSION:=QT_NOT_INSTALLED
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-02-17 09:55: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 891eb88a333ba5ece9d617612402bb07e2b61e05 (commit)
from 6fee49d9ecc7cc2d50a0d1e91b2fbb26d278920c (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 891eb88a333ba5ece9d617612402bb07e2b61e05
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Feb 17 10:56:01 2014 +0100
[BUILDROOT] apf6: move to linux 3.14-rc3
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
...-3.14-rc2.config => apf6-linux-3.14-rc3.config} | 0
...15-armadeus-logo-add_armadeus-project_tux.patch | 0
.../{3.10 => 3.14-rc3}/0021-armadeus-apf9328.patch | 0
...s-apf9328-add_board_to_linux_build_system.patch | 0
.../0025-armadeus-imx-correct_dma_shift.patch | 0
.../0029-armadeus-add_csi_and_spi_registers.patch | 0
.../0029b-armadeus-add_csi_registers.patch | 0
...rmadeus-devices-imx1-add_udc_registration.patch | 0
...35-armadeus-re_add_pwm_and_correct_driver.tofix | 0
...50-armadeus-add_custom_drivers_to_kconfig.patch | 0
.../{3.10 => 3.14-rc3}/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
.../0076-Add-tsc210x-device-tree-support.patch | 0
...eus-clock_correct_mxc_decode_pll_for_imx1.tofix | 0
...madeus-clock-imx1_avoid_crash_with_module.tofix | 0
.../0206-c-imx-dts-pin_functions.patch | 0
.../0206-d-linaro-dts-imx27-pinctrl.patch | 0
.../0206-e-linaro-imx27-enable_pinctrl.patch | 0
.../0207-armadeus-apf27dev-add_hog_pinctrl.patch | 0
...madeus-imx27_dtsi-add_framebuffer_pinctrl.patch | 0
...armadeus-imx27-apf27dev-add_imxfb_support.patch | 0
...etup_PWM_Contrast_Control_Register.patch.tofix} | 0
.../0213-armadeus-add_cspi_pinctrl.patch | 0
.../0214-armadeus-add_cspi_and_sdhc_pinctrl.patch | 0
...-imx27-apf27dev-add_pinctrl_for_cspi_node.patch | 0
...-armadeus-imx27-apf27dev-add_sdhc_support.patch | 0
...us-apf27-apf27dev-dts-peripherals_pinctrl.patch | 0
...deus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch | 0
...-tsc210x-device-tree-support-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
...-armadeus-fixes-vpu-spll-clock-dependency.patch | 0
.../0322-armadeus-add_mach_fpga_h.patch | 0
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 0
.../0400-Add-apf51-basic-dt-support.patch | 0
.../0401-armadeus-add_apf51dev_baseboard.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-imx51-dts-add-pin-definition-for-uart1.patch | 0
...imx-drm-fix_clk_polarity_for_apf51_screen.patch | 0
...dts-apf51dev-add_gpio_key_wakeup_behavior.patch | 0
.../0420-armadeus-Add-apf28dev-dts.patch | 0
...k_otg_phy_clock_directly_to_osc_ref.patch.tofix | 0
..._star_completion_for_source_in_menuconfig.patch | 0
...low_to_use_the_wakeupalarm_functionnality.patch | 0
...0443-armadeus-apf28-fix_mac_address_issue.patch | 0
.../0444-armadeus-imx27-add-usb.patch.tofix | 0
...deus-add-apf27-apf27dev-dts-for-USB.patch.tofix | 0
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 0
...around-fec-tx-queue-timeouts-when-SATA-SD.patch | 0
...inux-0003-ARM-dts-mx6qdl-Add-HDMI-support.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
...i-add-platfrom-get_max_timeout_count-hook.patch | 0
...mx-fix-incorrect-max_discard_to-for-uSDHC.patch | 0
...5-mmc-sdhci-add-platform-set_timeout-hook.patch | 0
...t-the-correct-max-timeout-value-for-uSDHC.patch | 0
...y-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch | 0
71 files changed, 1 insertions(+), 1 deletions(-)
copy buildroot/target/device/armadeus/apf6/{apf6-linux-3.14-rc2.config => apf6-linux-3.14-rc3.config} (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0015-armadeus-logo-add_armadeus-project_tux.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0021-armadeus-apf9328.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0024-armadeus-apf9328-add_board_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0025-armadeus-imx-correct_dma_shift.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0029-armadeus-add_csi_and_spi_registers.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0029b-armadeus-add_csi_registers.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0030-armadeus-devices-imx1-add_udc_registration.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0035-armadeus-re_add_pwm_and_correct_driver.tofix (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0073-armadeus-tsc2102.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0074-armadeus-tsc2102-touchscreen.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0075-armadeus-spi2-reg-defines.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0076-Add-tsc210x-device-tree-support.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0206-c-imx-dts-pin_functions.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0206-d-linaro-dts-imx27-pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0206-e-linaro-imx27-enable_pinctrl.patch (100%)
copy patches/linux/{3.11 => 3.14-rc3}/0207-armadeus-apf27dev-add_hog_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch (100%)
copy patches/linux/{3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch => 3.14-rc3/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch.tofix} (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0213-armadeus-add_cspi_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0230-armadeus-fixes-vpu-spll-clock-dependency.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0322-armadeus-add_mach_fpga_h.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0400-Add-apf51-basic-dt-support.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0401-armadeus-add_apf51dev_baseboard.patch (100%)
copy patches/linux/{3.11 => 3.14-rc3}/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0420-armadeus-Add-apf28dev-dts.patch (100%)
copy patches/linux/{3.14 => 3.14-rc3}/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (100%)
copy patches/linux/{3.10 => 3.14-rc3}/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0443-armadeus-apf28-fix_mac_address_issue.patch (100%)
copy patches/linux/{3.14 => 3.14-rc3}/0444-armadeus-imx27-add-usb.patch.tofix (100%)
copy patches/linux/{3.14 => 3.14-rc3}/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix (100%)
copy patches/linux/{3.14 => 3.14-rc3}/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch (100%)
copy patches/linux/{3.12 => 3.14-rc3}/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch (100%)
copy patches/linux/{3.13 => 3.14-rc3}/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch (100%)
copy patches/linux/{3.14 => 3.14-rc3}/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch (100%)
copy patches/linux/{3.14 => 3.14-rc3}/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch (100%)
copy patches/linux/{3.14 => 3.14-rc3}/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch (100%)
copy patches/linux/{3.14 => 3.14-rc3}/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch (100%)
copy patches/linux/{3.14 => 3.14-rc3}/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch (100%)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index f289b14..a1c8478 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -12,7 +12,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-rc2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14-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/apf6/apf6-linux-3.14-rc2.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc3.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc2.config
copy to buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc3.config
diff --git a/patches/linux/3.12/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/3.14-rc3/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.14-rc3/0015-armadeus-logo-add_armadeus-project_tux.patch
diff --git a/patches/linux/3.10/0021-armadeus-apf9328.patch b/patches/linux/3.14-rc3/0021-armadeus-apf9328.patch
similarity index 100%
copy from patches/linux/3.10/0021-armadeus-apf9328.patch
copy to patches/linux/3.14-rc3/0021-armadeus-apf9328.patch
diff --git a/patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/3.14-rc3/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
copy to patches/linux/3.14-rc3/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0025-armadeus-imx-correct_dma_shift.patch b/patches/linux/3.14-rc3/0025-armadeus-imx-correct_dma_shift.patch
similarity index 100%
copy from patches/linux/3.10/0025-armadeus-imx-correct_dma_shift.patch
copy to patches/linux/3.14-rc3/0025-armadeus-imx-correct_dma_shift.patch
diff --git a/patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/3.14-rc3/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.14-rc3/0029-armadeus-add_csi_and_spi_registers.patch
diff --git a/patches/linux/3.10/0029b-armadeus-add_csi_registers.patch b/patches/linux/3.14-rc3/0029b-armadeus-add_csi_registers.patch
similarity index 100%
copy from patches/linux/3.10/0029b-armadeus-add_csi_registers.patch
copy to patches/linux/3.14-rc3/0029b-armadeus-add_csi_registers.patch
diff --git a/patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/3.14-rc3/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.14-rc3/0030-armadeus-devices-imx1-add_udc_registration.patch
diff --git a/patches/linux/3.10/0035-armadeus-re_add_pwm_and_correct_driver.tofix b/patches/linux/3.14-rc3/0035-armadeus-re_add_pwm_and_correct_driver.tofix
similarity index 100%
copy from patches/linux/3.10/0035-armadeus-re_add_pwm_and_correct_driver.tofix
copy to patches/linux/3.14-rc3/0035-armadeus-re_add_pwm_and_correct_driver.tofix
diff --git a/patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/3.14-rc3/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.14-rc3/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/3.10/0073-armadeus-tsc2102.patch b/patches/linux/3.14-rc3/0073-armadeus-tsc2102.patch
similarity index 100%
copy from patches/linux/3.10/0073-armadeus-tsc2102.patch
copy to patches/linux/3.14-rc3/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.14-rc3/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.14-rc3/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.14-rc3/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.14-rc3/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.14-rc3/0074-armadeus-tsc2102-touchscreen.patch
similarity index 100%
copy from patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch
copy to patches/linux/3.14-rc3/0074-armadeus-tsc2102-touchscreen.patch
diff --git a/patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch b/patches/linux/3.14-rc3/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.14-rc3/0075-armadeus-spi2-reg-defines.patch
diff --git a/patches/linux/3.12/0076-Add-tsc210x-device-tree-support.patch b/patches/linux/3.14-rc3/0076-Add-tsc210x-device-tree-support.patch
similarity index 100%
copy from patches/linux/3.12/0076-Add-tsc210x-device-tree-support.patch
copy to patches/linux/3.14-rc3/0076-Add-tsc210x-device-tree-support.patch
diff --git a/patches/linux/3.10/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix b/patches/linux/3.14-rc3/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.14-rc3/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
diff --git a/patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix b/patches/linux/3.14-rc3/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
similarity index 100%
copy from patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
copy to patches/linux/3.14-rc3/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
diff --git a/patches/linux/3.12/0206-c-imx-dts-pin_functions.patch b/patches/linux/3.14-rc3/0206-c-imx-dts-pin_functions.patch
similarity index 100%
copy from patches/linux/3.12/0206-c-imx-dts-pin_functions.patch
copy to patches/linux/3.14-rc3/0206-c-imx-dts-pin_functions.patch
diff --git a/patches/linux/3.12/0206-d-linaro-dts-imx27-pinctrl.patch b/patches/linux/3.14-rc3/0206-d-linaro-dts-imx27-pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0206-d-linaro-dts-imx27-pinctrl.patch
copy to patches/linux/3.14-rc3/0206-d-linaro-dts-imx27-pinctrl.patch
diff --git a/patches/linux/3.12/0206-e-linaro-imx27-enable_pinctrl.patch b/patches/linux/3.14-rc3/0206-e-linaro-imx27-enable_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0206-e-linaro-imx27-enable_pinctrl.patch
copy to patches/linux/3.14-rc3/0206-e-linaro-imx27-enable_pinctrl.patch
diff --git a/patches/linux/3.11/0207-armadeus-apf27dev-add_hog_pinctrl.patch b/patches/linux/3.14-rc3/0207-armadeus-apf27dev-add_hog_pinctrl.patch
similarity index 100%
copy from patches/linux/3.11/0207-armadeus-apf27dev-add_hog_pinctrl.patch
copy to patches/linux/3.14-rc3/0207-armadeus-apf27dev-add_hog_pinctrl.patch
diff --git a/patches/linux/3.12/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch b/patches/linux/3.14-rc3/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
copy to patches/linux/3.14-rc3/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
diff --git a/patches/linux/3.13/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch b/patches/linux/3.14-rc3/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
similarity index 100%
copy from patches/linux/3.13/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
copy to patches/linux/3.14-rc3/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
diff --git a/patches/linux/3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch b/patches/linux/3.14-rc3/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch.tofix
similarity index 100%
copy from patches/linux/3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
copy to patches/linux/3.14-rc3/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch.tofix
diff --git a/patches/linux/3.12/0213-armadeus-add_cspi_pinctrl.patch b/patches/linux/3.14-rc3/0213-armadeus-add_cspi_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0213-armadeus-add_cspi_pinctrl.patch
copy to patches/linux/3.14-rc3/0213-armadeus-add_cspi_pinctrl.patch
diff --git a/patches/linux/3.12/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch b/patches/linux/3.14-rc3/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch
copy to patches/linux/3.14-rc3/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch
diff --git a/patches/linux/3.12/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch b/patches/linux/3.14-rc3/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
similarity index 100%
copy from patches/linux/3.12/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
copy to patches/linux/3.14-rc3/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
diff --git a/patches/linux/3.12/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch b/patches/linux/3.14-rc3/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
similarity index 100%
copy from patches/linux/3.12/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
copy to patches/linux/3.14-rc3/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
diff --git a/patches/linux/3.12/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch b/patches/linux/3.14-rc3/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch
copy to patches/linux/3.14-rc3/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch
diff --git a/patches/linux/3.12/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch b/patches/linux/3.14-rc3/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch
copy to patches/linux/3.14-rc3/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch
diff --git a/patches/linux/3.12/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch b/patches/linux/3.14-rc3/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
similarity index 100%
copy from patches/linux/3.12/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
copy to patches/linux/3.14-rc3/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
diff --git a/patches/linux/3.13/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch b/patches/linux/3.14-rc3/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
similarity index 100%
copy from patches/linux/3.13/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
copy to patches/linux/3.14-rc3/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
diff --git a/patches/linux/3.13/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch b/patches/linux/3.14-rc3/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
similarity index 100%
copy from patches/linux/3.13/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
copy to patches/linux/3.14-rc3/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.14-rc3/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.14-rc3/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
diff --git a/patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch b/patches/linux/3.14-rc3/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
similarity index 100%
copy from patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
copy to patches/linux/3.14-rc3/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
diff --git a/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.14-rc3/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.14-rc3/0322-armadeus-add_mach_fpga_h.patch
diff --git a/patches/linux/3.10/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.14-rc3/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
similarity index 100%
copy from patches/linux/3.10/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
copy to patches/linux/3.14-rc3/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
diff --git a/patches/linux/3.13/0400-Add-apf51-basic-dt-support.patch b/patches/linux/3.14-rc3/0400-Add-apf51-basic-dt-support.patch
similarity index 100%
copy from patches/linux/3.13/0400-Add-apf51-basic-dt-support.patch
copy to patches/linux/3.14-rc3/0400-Add-apf51-basic-dt-support.patch
diff --git a/patches/linux/3.13/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.14-rc3/0401-armadeus-add_apf51dev_baseboard.patch
similarity index 100%
copy from patches/linux/3.13/0401-armadeus-add_apf51dev_baseboard.patch
copy to patches/linux/3.14-rc3/0401-armadeus-add_apf51dev_baseboard.patch
diff --git a/patches/linux/3.11/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch b/patches/linux/3.14-rc3/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
similarity index 100%
copy from patches/linux/3.11/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
copy to patches/linux/3.14-rc3/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
diff --git a/patches/linux/3.12/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch b/patches/linux/3.14-rc3/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
similarity index 100%
copy from patches/linux/3.12/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
copy to patches/linux/3.14-rc3/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.14-rc3/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.14-rc3/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
diff --git a/patches/linux/3.12/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch b/patches/linux/3.14-rc3/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
similarity index 100%
copy from patches/linux/3.12/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
copy to patches/linux/3.14-rc3/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
diff --git a/patches/linux/3.13/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch b/patches/linux/3.14-rc3/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch
similarity index 100%
copy from patches/linux/3.13/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch
copy to patches/linux/3.14-rc3/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch
diff --git a/patches/linux/3.13/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.14-rc3/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
similarity index 100%
copy from patches/linux/3.13/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
copy to patches/linux/3.14-rc3/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
diff --git a/patches/linux/3.13/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.14-rc3/0420-armadeus-Add-apf28dev-dts.patch
similarity index 100%
copy from patches/linux/3.13/0420-armadeus-Add-apf28dev-dts.patch
copy to patches/linux/3.14-rc3/0420-armadeus-Add-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.tofix b/patches/linux/3.14-rc3/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix
similarity index 100%
copy from patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix
copy to patches/linux/3.14-rc3/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix
diff --git a/patches/linux/3.12/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.14-rc3/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.14-rc3/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.14-rc3/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.14-rc3/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
diff --git a/patches/linux/3.12/0443-armadeus-apf28-fix_mac_address_issue.patch b/patches/linux/3.14-rc3/0443-armadeus-apf28-fix_mac_address_issue.patch
similarity index 100%
copy from patches/linux/3.12/0443-armadeus-apf28-fix_mac_address_issue.patch
copy to patches/linux/3.14-rc3/0443-armadeus-apf28-fix_mac_address_issue.patch
diff --git a/patches/linux/3.14/0444-armadeus-imx27-add-usb.patch.tofix b/patches/linux/3.14-rc3/0444-armadeus-imx27-add-usb.patch.tofix
similarity index 100%
copy from patches/linux/3.14/0444-armadeus-imx27-add-usb.patch.tofix
copy to patches/linux/3.14-rc3/0444-armadeus-imx27-add-usb.patch.tofix
diff --git a/patches/linux/3.14/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix b/patches/linux/3.14-rc3/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
similarity index 100%
copy from patches/linux/3.14/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
copy to patches/linux/3.14-rc3/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
diff --git a/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.14-rc3/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
similarity index 100%
copy from patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
copy to patches/linux/3.14-rc3/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
diff --git a/patches/linux/3.12/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch b/patches/linux/3.14-rc3/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
similarity index 100%
copy from patches/linux/3.12/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
copy to patches/linux/3.14-rc3/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
diff --git a/patches/linux/3.12/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch b/patches/linux/3.14-rc3/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
similarity index 100%
copy from patches/linux/3.12/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
copy to patches/linux/3.14-rc3/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
diff --git a/patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch b/patches/linux/3.14-rc3/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.14-rc3/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.14-rc3/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.14-rc3/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
diff --git a/patches/linux/3.13/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch b/patches/linux/3.14-rc3/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
similarity index 100%
copy from patches/linux/3.13/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
copy to patches/linux/3.14-rc3/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
diff --git a/patches/linux/3.13/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch b/patches/linux/3.14-rc3/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
similarity index 100%
copy from patches/linux/3.13/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
copy to patches/linux/3.14-rc3/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
diff --git a/patches/linux/3.13/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch b/patches/linux/3.14-rc3/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
similarity index 100%
copy from patches/linux/3.13/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
copy to patches/linux/3.14-rc3/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.14-rc3/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.14-rc3/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
diff --git a/patches/linux/3.13/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch b/patches/linux/3.14-rc3/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
similarity index 100%
copy from patches/linux/3.13/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
copy to patches/linux/3.14-rc3/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
diff --git a/patches/linux/3.13/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch b/patches/linux/3.14-rc3/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
similarity index 100%
copy from patches/linux/3.13/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
copy to patches/linux/3.14-rc3/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
diff --git a/patches/linux/3.13/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch b/patches/linux/3.14-rc3/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
similarity index 100%
copy from patches/linux/3.13/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
copy to patches/linux/3.14-rc3/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
diff --git a/patches/linux/3.14/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch b/patches/linux/3.14-rc3/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch
similarity index 100%
copy from patches/linux/3.14/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch
copy to patches/linux/3.14-rc3/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch
diff --git a/patches/linux/3.14/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch b/patches/linux/3.14-rc3/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch
similarity index 100%
copy from patches/linux/3.14/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch
copy to patches/linux/3.14-rc3/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch
diff --git a/patches/linux/3.14/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch b/patches/linux/3.14-rc3/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch
similarity index 100%
copy from patches/linux/3.14/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch
copy to patches/linux/3.14-rc3/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch
diff --git a/patches/linux/3.14/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch b/patches/linux/3.14-rc3/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch
similarity index 100%
copy from patches/linux/3.14/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch
copy to patches/linux/3.14-rc3/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch
diff --git a/patches/linux/3.14/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch b/patches/linux/3.14-rc3/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch
similarity index 100%
copy from patches/linux/3.14/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch
copy to patches/linux/3.14-rc3/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-02-17 09:26: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 6fee49d9ecc7cc2d50a0d1e91b2fbb26d278920c (commit)
from 17efd236389445ce86eda5b53b1dc26aebfe9125 (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 6fee49d9ecc7cc2d50a0d1e91b2fbb26d278920c
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 17 10:24:07 2014 +0100
[LINUX] APF6: 3.14: Fixes boards name in dtsi
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index f76a657..e197828 100644
--- a/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -20,7 +20,7 @@ Index: linux-3.14-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
+#include "imx6qdl-apf6dev.dtsi"
+
+/ {
-+ model = "Armadeus APF6Dev i.MX6 Quad / Dual Board";
++ model = "Armadeus APF6 i.MX6 Quad / Dual Module on APF6Dev Board";
+ compatible = "armadeus,imx6q-apf6dev", "armadeus,imx6q-apf6", "fsl,imx6q";
+
+ memory {
@@ -305,7 +305,7 @@ Index: linux-3.14-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
+#include "imx6qdl-apf6dev.dtsi"
+
+/ {
-+ model = "Armadeus APF6Dev i.MX6 Dual Light Board";
++ model = "Armadeus APF6 i.MX6 Dual Lite Module on APF6Dev Board";
+ compatible = "armadeus,imx6dl-apf6dev", "armadeus,imx6dl-apf6", "fsl,imx6dl";
+
+ memory {
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-02-17 09:12: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 17efd236389445ce86eda5b53b1dc26aebfe9125 (commit)
from 74a31dd148e0472e02dd0489ac68ae9eef8f07f8 (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 17efd236389445ce86eda5b53b1dc26aebfe9125
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Feb 17 09:16:50 2014 +0100
[BUILDROOT] 2013.11: qt: move to version 4.8.5
-----------------------------------------------------------------------
Summary of changes:
...-qt-full_integration_with_cross_compiling.patch | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/patches/buildroot/2013.11/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2013.11/132-qt-full_integration_with_cross_compiling.patch
index 8f13f31..afe0268 100644
--- a/patches/buildroot/2013.11/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2013.11/132-qt-full_integration_with_cross_compiling.patch
@@ -4,9 +4,9 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/qt/Config.in
===================================================================
---- buildroot.orig/package/qt/Config.in 2013-05-31 22:29:04.000000000 +0200
-+++ buildroot/package/qt/Config.in 2013-08-22 14:59:25.000000000 +0200
-@@ -18,7 +18,13 @@
+--- buildroot.orig/package/qt/Config.in
++++ buildroot/package/qt/Config.in
+@@ -21,7 +21,13 @@ config BR2_PACKAGE_QT_DEBUG
If unsure, say N.
config BR2_PACKAGE_QT_DEMOS
@@ -23,22 +23,22 @@ Index: buildroot/package/qt/Config.in
If unsure, say N.
Index: buildroot/package/qt/qt.mk
===================================================================
---- buildroot.orig/package/qt/qt.mk 2013-05-31 22:29:04.000000000 +0200
-+++ buildroot/package/qt/qt.mk 2013-08-22 15:03:52.000000000 +0200
+--- buildroot.orig/package/qt/qt.mk
++++ buildroot/package/qt/qt.mk
@@ -11,9 +11,10 @@
#
- ######################################################################
+ ################################################################################
-QT_VERSION = 4.8.5
+QT_VERSION_MAJOR = 4.8
-+QT_VERSION = $(QT_VERSION_MAJOR).4
++QT_VERSION = $(QT_VERSION_MAJOR).5
QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
-QT_SITE = http://download.qt-project.org/official_releases/qt/4.8/$(QT_VERSION)
-+QT_SITE = http://download.qt-project.org/archive/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
++QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
QT_DEPENDENCIES = host-pkgconf
QT_INSTALL_STAGING = YES
-@@ -57,9 +58,14 @@
+@@ -58,9 +59,14 @@ QT_CONFIGURE_OPTS += -no-qt3support
endif
ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-02-14 21:17: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 74a31dd148e0472e02dd0489ac68ae9eef8f07f8 (commit)
via 4f3356dd216fc53aa5bff9b7daeb3f7f7e3e6bc4 (commit)
via 183a0c96658a9ef3a383e2cb23de316d90762ec3 (commit)
from 0b88d179db84c455940a079b0c0912cd4014d958 (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 74a31dd148e0472e02dd0489ac68ae9eef8f07f8
Author: Philippe Reynes <tr...@ya...>
Date: Fri Feb 14 19:45:45 2014 +0100
[LINUX] 3.13: move to 3.13.3
commit 4f3356dd216fc53aa5bff9b7daeb3f7f7e3e6bc4
Author: Philippe Reynes <tr...@ya...>
Date: Fri Feb 14 19:45:44 2014 +0100
[LINUX] 3.12: move to 3.12.11
commit 183a0c96658a9ef3a383e2cb23de316d90762ec3
Author: Philippe Reynes <tr...@ya...>
Date: Fri Feb 14 19:45:43 2014 +0100
[LINUX] 3.10: move to 3.10.30
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 ++--
buildroot/configs/apf28mainline_defconfig | 4 ++--
buildroot/configs/apf51mainline_defconfig | 4 ++--
...x-3.10.29.config => apf27-linux-3.10.30.config} | 0
...x-3.12.10.config => apf27-linux-3.12.11.config} | 0
...nux-3.13.2.config => apf27-linux-3.13.3.config} | 0
...x-3.10.29.config => apf28-linux-3.10.30.config} | 0
...x-3.12.10.config => apf28-linux-3.12.11.config} | 0
...nux-3.13.2.config => apf28-linux-3.13.3.config} | 0
...x-3.10.29.config => apf51-linux-3.10.30.config} | 0
...x-3.12.10.config => apf51-linux-3.12.11.config} | 0
...nux-3.13.2.config => apf51-linux-3.13.3.config} | 0
patches/linux/{3.10.29 => 3.10.30} | 0
patches/linux/{3.12.10 => 3.12.11} | 0
patches/linux/{3.13.2 => 3.13.3} | 0
15 files changed, 6 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.29.config => apf27-linux-3.10.30.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.10.config => apf27-linux-3.12.11.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.13.2.config => apf27-linux-3.13.3.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.29.config => apf28-linux-3.10.30.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.10.config => apf28-linux-3.12.11.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.13.2.config => apf28-linux-3.13.3.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.29.config => apf51-linux-3.10.30.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.10.config => apf51-linux-3.12.11.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.13.2.config => apf51-linux-3.13.3.config} (100%)
rename patches/linux/{3.10.29 => 3.10.30} (100%)
rename patches/linux/{3.12.10 => 3.12.11} (100%)
rename patches/linux/{3.13.2 => 3.13.3} (100%)
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index 1be9092..9257ddf 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.13.2"
+BR2_DEFAULT_KERNEL_VERSION="3.13.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.13.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.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 ced8abd..6ef4487 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.13.2"
+BR2_DEFAULT_KERNEL_VERSION="3.13.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.13.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.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 ec377ca..e70af26 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.13.2"
+BR2_DEFAULT_KERNEL_VERSION="3.13.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.13.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.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/target/device/armadeus/apf27/apf27-linux-3.10.29.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.30.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.29.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.30.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.10.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.11.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.10.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.11.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.13.2.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.13.3.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.29.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.30.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.29.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.30.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.10.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.11.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.10.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.11.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.13.2.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.13.3.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.29.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.30.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.29.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.30.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.10.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.11.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.10.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.11.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.13.2.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.13.3.config
diff --git a/patches/linux/3.10.29 b/patches/linux/3.10.30
similarity index 100%
rename from patches/linux/3.10.29
rename to patches/linux/3.10.30
diff --git a/patches/linux/3.12.10 b/patches/linux/3.12.11
similarity index 100%
rename from patches/linux/3.12.10
rename to patches/linux/3.12.11
diff --git a/patches/linux/3.13.2 b/patches/linux/3.13.3
similarity index 100%
rename from patches/linux/3.13.2
rename to patches/linux/3.13.3
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2014-02-14 12:49:12
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0b88d179db84c455940a079b0c0912cd4014d958 (commit)
from 5e82adf82a96143984fa47010ed535f4038f77ef (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 0b88d179db84c455940a079b0c0912cd4014d958
Author: Nicolas Colombain <nic...@ar...>
Date: Fri Feb 14 13:48:27 2014 +0100
[LINUX] fix micron nand support for apf28i
-----------------------------------------------------------------------
Summary of changes:
.../2.6.35/466-armadeus-micron_nand_fix.patch | 57 ++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/2.6.35/466-armadeus-micron_nand_fix.patch
diff --git a/patches/linux/2.6.35/466-armadeus-micron_nand_fix.patch b/patches/linux/2.6.35/466-armadeus-micron_nand_fix.patch
new file mode 100644
index 0000000..5afe6e9
--- /dev/null
+++ b/patches/linux/2.6.35/466-armadeus-micron_nand_fix.patch
@@ -0,0 +1,57 @@
+Index: linux-2.6.35.3/drivers/mtd/nand/nand_device_info.c
+===================================================================
+--- linux-2.6.35.3/drivers/mtd/nand/nand_device_info.c 2013-01-31 18:15:38.000000000 +0100
++++ linux-2.6.35.3/drivers/mtd/nand/nand_device_info.c 2013-01-31 18:15:38.000000000 +0100
+@@ -174,25 +174,6 @@ static struct nand_device_info nand_devi
+ },
+ {
+ .end_of_table = false,
+- .manufacturer_code = 0x2c,
+- .device_code = 0xda,
+- .cell_technology = NAND_DEVICE_CELL_TECH_SLC,
+- .chip_size_in_bytes = 256LL*SZ_1M,
+- .block_size_in_pages = 64,
+- .page_total_size_in_bytes = 2*SZ_1K + 64,
+- .ecc_strength_in_bits = 4,
+- .ecc_size_in_bytes = 512,
+- .data_setup_in_ns = 20,
+- .data_hold_in_ns = 10,
+- .address_setup_in_ns = 10,
+- .gpmi_sample_delay_in_ns = 6,
+- .tREA_in_ns = -1,
+- .tRLOH_in_ns = -1,
+- .tRHOH_in_ns = -1,
+- "MT29F2G08",
+- },
+- {
+- .end_of_table = false,
+ .manufacturer_code = 0xec,
+ .device_code = 0xda,
+ .cell_technology = NAND_DEVICE_CELL_TECH_SLC,
+@@ -1046,6 +1027,26 @@ static struct nand_device_info nand_devi
+ .tRHOH_in_ns = -1,
+ "K9F1F08",
+ },
++ {
++ .end_of_table = false,
++ .manufacturer_code = 0x2c,
++ .device_code = 0xda,
++ .cell_technology = NAND_DEVICE_CELL_TECH_SLC,
++ .chip_size_in_bytes = 256LL*SZ_1M,
++ .block_size_in_pages = 64,
++ .page_total_size_in_bytes = 2*SZ_1K + 64,
++ .ecc_strength_in_bits = 4,
++ .ecc_size_in_bytes = 512,
++ .data_setup_in_ns = 20,
++ .data_hold_in_ns = 10,
++ .address_setup_in_ns = 10,
++ .gpmi_sample_delay_in_ns = 6,
++ .tREA_in_ns = -1,
++ .tRLOH_in_ns = -1,
++ .tRHOH_in_ns = -1,
++ "MT29F2G08",
++ },
++
+ {true}
+ };
+
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-02-13 08:21: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 5e82adf82a96143984fa47010ed535f4038f77ef (commit)
from 92141dbb6c8dbcca2295da1eed25cbfeb23c7d1e (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 5e82adf82a96143984fa47010ed535f4038f77ef
Author: Sébastien Szymanski <ss...@us...>
Date: Thu Feb 13 09:20:04 2014 +0100
[LINUX] 3.14: apf6: add WL_EN and BT_EN muxing to device tree
While at it, use IRQ_TYPE_LEVEL_HIGH macro instead of hardcode value.
-----------------------------------------------------------------------
Summary of changes:
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 24 +++++++++++--------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 0568d50..f76a657 100644
--- a/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,7 +1,7 @@
-Index: linux-3.14-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.14-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.14-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.14-rc2/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -31,11 +31,11 @@ Index: linux-3.14-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
-@@ -0,0 +1,76 @@
++++ linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+@@ -0,0 +1,80 @@
+/*
+ * Copyright 2014 Armadeus Systems
+ *
@@ -47,11 +47,13 @@ Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ *
+ */
+
++#include <dt-bindings/interrupt-controller/irq.h>
++
+/ {
+ wlan {
+ compatible = "ti,wilink6";
+ interrupt-parent = <&gpio2>;
-+ interrupts = <10 0x4>; /* gpio line 43, high level triggered */
++ interrupts = <10 IRQ_TYPE_LEVEL_HIGH>; /* gpio line 42, high level triggered */
+ clocks = <&refclock>, <&tcxoclock>;
+ clock-names = "refclock", "tcxoclock";
+
@@ -76,7 +78,9 @@ Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ hog {
+ pinctrl_hog: hoggrp {
+ fsl,pins = <
++ MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 /* WL_EN */
+ MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x80000000 /* WL_IRQ */
++ MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 /* BT_EN */
+ >;
+ };
+
@@ -112,10 +116,10 @@ Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++++ linux-3.14-rc2/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -279,10 +283,10 @@ Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ cd-gpios = <&gpio1 2 0>;
+ status = "okay";
+};
-Index: linux-3.14-rc1/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.14-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.14-rc1/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.14-rc2/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-02-12 10:46: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 92141dbb6c8dbcca2295da1eed25cbfeb23c7d1e (commit)
via 4d0e97cefca41f71cc69f041e41708cb30dec637 (commit)
via 9df038bc50b9673d63175baff6c0f91ea349674a (commit)
from 36e7f11158f76025d90f70ec386339f76859357a (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 92141dbb6c8dbcca2295da1eed25cbfeb23c7d1e
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Feb 12 11:46:31 2014 +0100
[BUILDROOT] apf6: add apf6failsafe_defconfig
commit 4d0e97cefca41f71cc69f041e41708cb30dec637
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Feb 12 11:40:28 2014 +0100
[LINUX] 3.14: mmc: sdhci: a few fixes on timeout and max_discard_to
These patches are from Dong Aisheng, see [1].
[1] http://comments.gmane.org/gmane.linux.kernel.mmc/24182
commit 9df038bc50b9673d63175baff6c0f91ea349674a
Author: Sébastien Szymanski <ss...@us...>
Date: Wed Feb 12 11:12:37 2014 +0100
[BUILDROOT] apf6: Fix CONFIG_CMDLINE default value.
-----------------------------------------------------------------------
Summary of changes:
.../{apf6_defconfig => apf6failsafe_defconfig} | 18 +---
.../device/armadeus/apf6/apf6-linux-3.14.config | 2 +-
.../apf6/apf6failsafe-linux-3.14-rc2.config | 1 +
...-3.14.config => apf6failsafe-linux-3.14.config} | 62 ++--------
...i-add-platfrom-get_max_timeout_count-hook.patch | 59 ++++++++++
...mx-fix-incorrect-max_discard_to-for-uSDHC.patch | 54 +++++++++
...5-mmc-sdhci-add-platform-set_timeout-hook.patch | 84 +++++++++++++
...t-the-correct-max-timeout-value-for-uSDHC.patch | 62 ++++++++++
...y-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch | 123 ++++++++++++++++++++
9 files changed, 398 insertions(+), 67 deletions(-)
copy buildroot/configs/{apf6_defconfig => apf6failsafe_defconfig} (66%)
create mode 120000 buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14-rc2.config
copy buildroot/target/device/armadeus/apf6/{apf6-linux-3.14.config => apf6failsafe-linux-3.14.config} (83%)
create mode 100644 patches/linux/3.14/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch
create mode 100644 patches/linux/3.14/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch
create mode 100644 patches/linux/3.14/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch
create mode 100644 patches/linux/3.14/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch
create mode 100644 patches/linux/3.14/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6failsafe_defconfig
similarity index 66%
copy from buildroot/configs/apf6_defconfig
copy to buildroot/configs/apf6failsafe_defconfig
index f289b14..f01081a 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6failsafe_defconfig
@@ -1,7 +1,6 @@
BR2_arm=y
BR2_cortex_a9=y
BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305=y
BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
@@ -15,25 +14,16 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14-rc2"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)failsafe-linux-$(BR2_LINUX_KERNEL_VERSION).config"
BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_LINUX_FIRMWARE=y
-BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
BR2_PACKAGE_MMC_UTILS=y
-BR2_PACKAGE_TI_UTILS=y
-BR2_PACKAGE_TSLIB=y
-BR2_PACKAGE_BLUEZ_UTILS=y
-BR2_PACKAGE_DROPBEAR=y
-BR2_PACKAGE_IW=y
-BR2_PACKAGE_WIRELESS_TOOLS=y
-BR2_PACKAGE_WPA_SUPPLICANT=y
-BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
-BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_PACKAGE_UTIL_LINUX_BINARIES=y
BR2_PACKAGE_UTIL_LINUX_FSCK=y
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_CPIO_GZIP=y
+BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
index eea7d0a..10b243d 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
@@ -43,7 +43,7 @@ CONFIG_SMP=y
CONFIG_VMSPLIT_2G=y
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_AEABI=y
-CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
+CONFIG_CMDLINE="noinitrd console=ttymxc3,115200"
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_BINFMT_MISC=m
diff --git a/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14-rc2.config b/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14-rc2.config
new file mode 120000
index 0000000..b23fbcc
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14-rc2.config
@@ -0,0 +1 @@
+apf6failsafe-linux-3.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config b/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14.config
similarity index 83%
copy from buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
copy to buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14.config
index eea7d0a..f330375 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
+++ b/buildroot/target/device/armadeus/apf6/apf6failsafe-linux-3.14.config
@@ -37,13 +37,11 @@ CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y
CONFIG_SOC_VF610=y
-CONFIG_PCI=y
-CONFIG_PCI_IMX6=y
CONFIG_SMP=y
CONFIG_VMSPLIT_2G=y
CONFIG_PREEMPT_VOLUNTARY=y
CONFIG_AEABI=y
-CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
+CONFIG_CMDLINE="noinitrd console=ttymxc3,115200"
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_BINFMT_MISC=m
@@ -62,20 +60,7 @@ CONFIG_IP_PNP_DHCP=y
# CONFIG_INET_LRO is not set
CONFIG_IPV6=y
CONFIG_NETFILTER=y
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_CFG80211=y
-CONFIG_NL80211_TESTMODE=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_MAC80211=y
+# CONFIG_WIRELESS is not set
CONFIG_RFKILL=y
CONFIG_RFKILL_INPUT=y
CONFIG_DEVTMPFS=y
@@ -130,10 +115,7 @@ CONFIG_SMC91X=y
CONFIG_SMC911X=y
CONFIG_SMSC911X=y
# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_RTL_CARDS is not set
-CONFIG_WL_TI=y
-CONFIG_WL12XX=m
-CONFIG_WLCORE_SDIO=m
+# CONFIG_WLAN is not set
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_EVBUG=m
@@ -178,33 +160,16 @@ CONFIG_REGULATOR_ANATOP=y
CONFIG_REGULATOR_DA9052=y
CONFIG_REGULATOR_MC13783=y
CONFIG_REGULATOR_MC13892=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_SOC_CAMERA=y
-CONFIG_VIDEO_MX3=y
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_CODA=y
-CONFIG_SOC_CAMERA_OV2640=y
CONFIG_DRM=y
+CONFIG_FB=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_L4F00242T03=y
CONFIG_LCD_PLATFORM=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_PWM=y
CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
CONFIG_LOGO=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-CONFIG_SND_IMX_SOC=y
-CONFIG_SND_SOC_PHYCORE_AC97=y
-CONFIG_SND_SOC_EUKREA_TLV320=y
-CONFIG_SND_SOC_IMX_WM8962=y
-CONFIG_SND_SOC_IMX_SGTL5000=y
-CONFIG_SND_SOC_IMX_SPDIF=y
-CONFIG_SND_SOC_IMX_MC13783=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_MXC=y
@@ -238,18 +203,7 @@ CONFIG_RTC_DRV_SNVS=y
CONFIG_DMADEVICES=y
CONFIG_IMX_SDMA=y
CONFIG_MXS_DMA=y
-CONFIG_STAGING=y
-CONFIG_DRM_IMX=y
-CONFIG_DRM_IMX_FB_HELPER=y
-CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
-CONFIG_DRM_IMX_TVE=y
-CONFIG_DRM_IMX_LDB=y
-CONFIG_DRM_IMX_IPUV3_CORE=y
-CONFIG_DRM_IMX_IPUV3=y
-CONFIG_DRM_IMX_HDMI=y
# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_PWM=y
-CONFIG_PWM_IMX=y
CONFIG_EXT2_FS=y
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
@@ -291,13 +245,17 @@ CONFIG_PROVE_LOCKING=y
# CONFIG_FTRACE is not set
# CONFIG_ARM_UNWIND is not set
CONFIG_SECURITYFS=y
+CONFIG_CRYPTO_CCM=y
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_ARC4=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
# CONFIG_CRYPTO_HW is not set
CONFIG_CRC_CCITT=m
CONFIG_CRC_T10DIF=y
CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
+CONFIG_AVERAGE=y
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
-
diff --git a/patches/linux/3.14/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch b/patches/linux/3.14/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch
new file mode 100644
index 0000000..f72b70a
--- /dev/null
+++ b/patches/linux/3.14/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch
@@ -0,0 +1,59 @@
+From patchwork Tue Dec 17 08:16:27 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v2,1/5] mmc: sdhci: add platfrom get_max_timeout_count hook
+From: Aisheng Dong <b2...@fr...>
+X-Patchwork-Id: 3359651
+Message-Id: <138...@fr...>
+To: <lin...@vg...>
+Cc: ulf...@li..., sha...@li...,
+ ed....@al...,
+ s....@pe..., adr...@in...,
+ vla...@me..., cj...@la..., b2...@fr...,
+ lin...@li...
+Date: Tue, 17 Dec 2013 16:16:27 +0800
+
+Currently the max_discard_to is simply got by (1 << 27) / host->timeout_clk
+which is assumed to be the maximum timeout value, however, some platforms
+maximum timeout counter may not be 1 << 27, e.g. i.MX uSDHC is 1 << 28.
+Thus 1 << 27 may not be correct for such platforms.
+
+It is also possible that other platforms may have different problems.
+To be flexible, we add a get_max_timeout_count hook to get the correct
+maximum timeout value for these platforms.
+
+Signed-off-by: Dong Aisheng <b2...@fr...>
+
+---
+drivers/mmc/host/sdhci.c | 4 +++-
+ drivers/mmc/host/sdhci.h | 1 +
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
+index cc00bed..7fef3bb 100644
+--- a/drivers/mmc/host/sdhci.c
++++ b/drivers/mmc/host/sdhci.c
+@@ -2942,7 +2942,9 @@ int sdhci_add_host(struct sdhci_host *host)
+ if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)
+ host->timeout_clk = mmc->f_max / 1000;
+
+- mmc->max_discard_to = (1 << 27) / host->timeout_clk;
++ mmc->max_discard_to = host->ops->get_max_timeout_count ?
++ host->ops->get_max_timeout_count(host) : 1 << 27;
++ mmc->max_discard_to /= host->timeout_clk;
+
+ mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23;
+
+diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
+index 0a3ed01..acba9a7 100644
+--- a/drivers/mmc/host/sdhci.h
++++ b/drivers/mmc/host/sdhci.h
+@@ -281,6 +281,7 @@ struct sdhci_ops {
+ unsigned int (*get_max_clock)(struct sdhci_host *host);
+ unsigned int (*get_min_clock)(struct sdhci_host *host);
+ unsigned int (*get_timeout_clock)(struct sdhci_host *host);
++ unsigned int (*get_max_timeout_count)(struct sdhci_host *host);
+ int (*platform_bus_width)(struct sdhci_host *host,
+ int width);
+ void (*platform_send_init_74_clocks)(struct sdhci_host *host,
diff --git a/patches/linux/3.14/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch b/patches/linux/3.14/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch
new file mode 100644
index 0000000..b04b849
--- /dev/null
+++ b/patches/linux/3.14/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch
@@ -0,0 +1,54 @@
+From patchwork Tue Dec 17 08:16:28 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v2, 2/5] mmc: sdhci-esdhc-imx: fix incorrect max_discard_to for uSDHC
+From: Aisheng Dong <b2...@fr...>
+X-Patchwork-Id: 3359661
+Message-Id: <138...@fr...>
+To: <lin...@vg...>
+Cc: ulf...@li..., sha...@li...,
+ ed....@al...,
+ s....@pe..., adr...@in...,
+ vla...@me..., cj...@la..., b2...@fr...,
+ lin...@li...
+Date: Tue, 17 Dec 2013 16:16:28 +0800
+
+The default sdhci code use the 1 << 27 as the max timeout counter to
+to calculate the max_discard_to, however it's not correct for uSDHC
+since its the max counter is 1 << 28.
+Implement esdhc_get_max_timeout to handle it correctly.
+
+Signed-off-by: Dong Aisheng <b2...@fr...>
+
+---
+drivers/mmc/host/sdhci-esdhc-imx.c | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
+index de2655e..5d9b56d 100644
+--- a/drivers/mmc/host/sdhci-esdhc-imx.c
++++ b/drivers/mmc/host/sdhci-esdhc-imx.c
+@@ -880,6 +880,14 @@ static int esdhc_set_uhs_signaling(struct sdhci_host *host, unsigned int uhs)
+ return esdhc_change_pinstate(host, uhs);
+ }
+
++static unsigned int esdhc_get_max_timeout_count(struct sdhci_host *host)
++{
++ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
++ struct pltfm_imx_data *imx_data = pltfm_host->priv;
++
++ return esdhc_is_usdhc(imx_data) ? 1 << 28 : 1 << 27;
++}
++
+ static struct sdhci_ops sdhci_esdhc_ops = {
+ .read_l = esdhc_readl_le,
+ .read_w = esdhc_readw_le,
+@@ -892,6 +900,7 @@ static struct sdhci_ops sdhci_esdhc_ops = {
+ .get_ro = esdhc_pltfm_get_ro,
+ .platform_bus_width = esdhc_pltfm_bus_width,
+ .set_uhs_signaling = esdhc_set_uhs_signaling,
++ .get_max_timeout_count = esdhc_get_max_timeout_count,
+ };
+
+ static const struct sdhci_pltfm_data sdhci_esdhc_imx_pdata = {
diff --git a/patches/linux/3.14/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch b/patches/linux/3.14/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch
new file mode 100644
index 0000000..916f8af
--- /dev/null
+++ b/patches/linux/3.14/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch
@@ -0,0 +1,84 @@
+From patchwork Tue Dec 17 08:16:29 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v2,3/5] mmc: sdhci: add platform set_timeout hook
+From: Aisheng Dong <b2...@fr...>
+X-Patchwork-Id: 3359671
+Message-Id: <138...@fr...>
+To: <lin...@vg...>
+Cc: ulf...@li..., sha...@li...,
+ ed....@al...,
+ s....@pe..., adr...@in...,
+ vla...@me..., cj...@la..., b2...@fr...,
+ lin...@li...
+Date: Tue, 17 Dec 2013 16:16:29 +0800
+
+Currently the common code assume 0xE is the maximum timeout counter
+value and use it to write into the timeout counter register.
+However, it's fairly possible that some other SoCs may have different
+max timeout register value. That means 0xE may be incorrect and
+becomes meaningless.
+
+It's also possible that other platforms has different timeout
+calculation algorithm. To be flexible, this patch provides a .set_timeout
+hook for those platforms to set the timeout on their way if they need.
+
+Signed-off-by: Dong Aisheng <b2...@fr...>
+
+---
+drivers/mmc/host/sdhci.c | 19 ++++++++++++++-----
+ drivers/mmc/host/sdhci.h | 2 ++
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
+index 7fef3bb..47ecf50 100644
+--- a/drivers/mmc/host/sdhci.c
++++ b/drivers/mmc/host/sdhci.c
+@@ -726,19 +726,28 @@ static void sdhci_set_transfer_irqs(struct sdhci_host *host)
+ sdhci_clear_set_irqs(host, dma_irqs, pio_irqs);
+ }
+
+-static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
++static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
+ {
+ u8 count;
++
++ if (host->ops->set_timeout) {
++ host->ops->set_timeout(host, cmd);
++ } else {
++ count = sdhci_calc_timeout(host, cmd);
++ sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
++ }
++}
++
++static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
++{
+ u8 ctrl;
+ struct mmc_data *data = cmd->data;
+ int ret;
+
+ WARN_ON(host->data);
+
+- if (data || (cmd->flags & MMC_RSP_BUSY)) {
+- count = sdhci_calc_timeout(host, cmd);
+- sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
+- }
++ if (data || (cmd->flags & MMC_RSP_BUSY))
++ sdhci_set_timeout(host, cmd);
+
+ if (!data)
+ return;
+diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
+index acba9a7..25c1572 100644
+--- a/drivers/mmc/host/sdhci.h
++++ b/drivers/mmc/host/sdhci.h
+@@ -282,6 +282,8 @@ struct sdhci_ops {
+ unsigned int (*get_min_clock)(struct sdhci_host *host);
+ unsigned int (*get_timeout_clock)(struct sdhci_host *host);
+ unsigned int (*get_max_timeout_count)(struct sdhci_host *host);
++ void (*set_timeout)(struct sdhci_host *host,
++ struct mmc_command *cmd);
+ int (*platform_bus_width)(struct sdhci_host *host,
+ int width);
+ void (*platform_send_init_74_clocks)(struct sdhci_host *host,
diff --git a/patches/linux/3.14/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch b/patches/linux/3.14/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch
new file mode 100644
index 0000000..464e1c8
--- /dev/null
+++ b/patches/linux/3.14/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch
@@ -0,0 +1,62 @@
+From patchwork Tue Dec 17 08:16:30 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v2, 4/5] mmc: sdhci-esdhc-imx: set the correct max timeout value for
+ uSDHC
+From: Aisheng Dong <b2...@fr...>
+X-Patchwork-Id: 3359681
+Message-Id: <138...@fr...>
+To: <lin...@vg...>
+Cc: ulf...@li..., sha...@li...,
+ ed....@al...,
+ s....@pe..., adr...@in...,
+ vla...@me..., cj...@la..., b2...@fr...,
+ lin...@li...
+Date: Tue, 17 Dec 2013 16:16:30 +0800
+
+The default sdhci driver write 0xE into timeout counter register to
+set the maximum timeout. The value is not correct for uSDHC since the
+max counter value for uSDHC is 0xF.
+Instead of using common timeout code in sdhci, we implement esdhc_set_timeout
+to handle the difference between eSDHC and uSDHC.
+
+Currently we simply set the max timeout value as before.
+But in the future, we probably may implement IMX specific timeout
+setting algorithm and use suitable timeout for different CMDs.
+
+Signed-off-by: Dong Aisheng <b2...@fr...>
+
+---
+drivers/mmc/host/sdhci-esdhc-imx.c | 11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
+index 5d9b56d..2a04847 100644
+--- a/drivers/mmc/host/sdhci-esdhc-imx.c
++++ b/drivers/mmc/host/sdhci-esdhc-imx.c
+@@ -888,6 +888,16 @@ static unsigned int esdhc_get_max_timeout_count(struct sdhci_host *host)
+ return esdhc_is_usdhc(imx_data) ? 1 << 28 : 1 << 27;
+ }
+
++static void esdhc_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
++{
++ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
++ struct pltfm_imx_data *imx_data = pltfm_host->priv;
++
++ /* use maximum timeout counter */
++ sdhci_writeb(host, esdhc_is_usdhc(imx_data) ? 0xF : 0xE,
++ SDHCI_TIMEOUT_CONTROL);
++}
++
+ static struct sdhci_ops sdhci_esdhc_ops = {
+ .read_l = esdhc_readl_le,
+ .read_w = esdhc_readw_le,
+@@ -901,6 +911,7 @@ static struct sdhci_ops sdhci_esdhc_ops = {
+ .platform_bus_width = esdhc_pltfm_bus_width,
+ .set_uhs_signaling = esdhc_set_uhs_signaling,
+ .get_max_timeout_count = esdhc_get_max_timeout_count,
++ .set_timeout = esdhc_set_timeout,
+ };
+
+ static const struct sdhci_pltfm_data sdhci_esdhc_imx_pdata = {
diff --git a/patches/linux/3.14/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch b/patches/linux/3.14/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch
new file mode 100644
index 0000000..020dfc4
--- /dev/null
+++ b/patches/linux/3.14/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch
@@ -0,0 +1,123 @@
+From patchwork Tue Dec 17 08:16:31 2013
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v2, 5/5] mmc: sdhci: calculate max_discard_to dynamically for
+ SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK
+From: Aisheng Dong <b2...@fr...>
+X-Patchwork-Id: 3359691
+Message-Id: <138...@fr...>
+To: <lin...@vg...>
+Cc: ulf...@li..., sha...@li...,
+ ed....@al...,
+ s....@pe..., adr...@in...,
+ vla...@me..., cj...@la..., b2...@fr...,
+ lin...@li...
+Date: Tue, 17 Dec 2013 16:16:31 +0800
+
+For host controllers using SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK, since the card
+clock is changed dynamically for different cards, it does not make sense
+to use the maximum host clock to calculate max_discard_to which may lead
+the max_discard_to to be much smaller than its capbility and affect the card
+discard performance a lot.
+e.g. the host clock is 200Mhz, but the card is working on 50Mhz. Then the
+max_discard_to is only 1/4 of its real capbility.
+
+In this patch, it uses the actual_clock to calculate the max_discard_to
+dynamically as long as a new clock speed is set.
+
+Tested with a high speed SDHC card shows:
+Originally:
+mmc1: new high speed SDHC card at address aaaa
+mmc1: calculated max. discard sectors 49152 for timeout 1355 ms
+Now:
+mmc1: new high speed SDHC card at address aaaa
+mmc1: calculated max. discard sectors 712704 for timeout 5422 ms
+The max_discard_sectors will increase a lot which will also improve discard
+performance a lot.
+
+The one known limitation of this approach is that it does not cover the special
+case for user changes the clock via sysfs, since the max_discard_to is only
+initialised for one time during the mmc queue init.
+
+Signed-off-by: Dong Aisheng <b2...@fr...>
+
+---
+drivers/mmc/host/sdhci.c | 47 +++++++++++++++++++++++++++------------------
+ 1 files changed, 28 insertions(+), 19 deletions(-)
+
+diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
+index 47ecf50..a104bb1 100644
+--- a/drivers/mmc/host/sdhci.c
++++ b/drivers/mmc/host/sdhci.c
+@@ -1155,7 +1155,7 @@ static void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
+ if (host->ops->set_clock) {
+ host->ops->set_clock(host, clock);
+ if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK)
+- return;
++ goto out;
+ }
+
+ sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
+@@ -1254,6 +1254,16 @@ clock_set:
+
+ out:
+ host->clock = clock;
++
++ /* update timeout_clk and max_discard_to once the SDCLK is changed */
++ if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK && clock) {
++ host->timeout_clk = host->mmc->actual_clock ?
++ host->mmc->actual_clock / 1000 :
++ host->clock / 1000;
++ host->mmc->max_discard_to = host->ops->get_max_timeout_count ?
++ host->ops->get_max_timeout_count(host) : 1 << 27;
++ host->mmc->max_discard_to /= host->timeout_clk;
++ }
+ }
+
+ static inline void sdhci_update_clock(struct sdhci_host *host)
+@@ -2933,27 +2943,26 @@ int sdhci_add_host(struct sdhci_host *host)
+ } else
+ mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_200;
+
+- host->timeout_clk =
+- (caps[0] & SDHCI_TIMEOUT_CLK_MASK) >> SDHCI_TIMEOUT_CLK_SHIFT;
+- if (host->timeout_clk == 0) {
+- if (host->ops->get_timeout_clock) {
+- host->timeout_clk = host->ops->get_timeout_clock(host);
+- } else if (!(host->quirks &
+- SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) {
+- pr_err("%s: Hardware doesn't specify timeout clock "
+- "frequency.\n", mmc_hostname(mmc));
+- return -ENODEV;
++ if (!(host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) {
++ host->timeout_clk = (caps[0] & SDHCI_TIMEOUT_CLK_MASK) >>
++ SDHCI_TIMEOUT_CLK_SHIFT;
++ if (host->timeout_clk == 0) {
++ if (host->ops->get_timeout_clock) {
++ host->timeout_clk =
++ host->ops->get_timeout_clock(host);
++ } else {
++ pr_err("%s: Hardware doesn't specify timeout"
++ "clock frequency.\n", mmc_hostname(mmc));
++ return -ENODEV;
++ }
+ }
+- }
+- if (caps[0] & SDHCI_TIMEOUT_CLK_UNIT)
+- host->timeout_clk *= 1000;
+-
+- if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)
+- host->timeout_clk = mmc->f_max / 1000;
++ if (caps[0] & SDHCI_TIMEOUT_CLK_UNIT)
++ host->timeout_clk *= 1000;
+
+- mmc->max_discard_to = host->ops->get_max_timeout_count ?
++ mmc->max_discard_to = host->ops->get_max_timeout_count ?
+ host->ops->get_max_timeout_count(host) : 1 << 27;
+- mmc->max_discard_to /= host->timeout_clk;
++ mmc->max_discard_to /= host->timeout_clk;
++ }
+
+ mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23;
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-02-11 12:18:31
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 36e7f11158f76025d90f70ec386339f76859357a (commit)
from 050ee0089799d7dc926805edf0f1bbdc7acd673f (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 36e7f11158f76025d90f70ec386339f76859357a
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 11 13:17:40 2014 +0100
[BUILD] Fixes quiltify when used with customs BR2_DL_DIR
-----------------------------------------------------------------------
Summary of changes:
Makefile | 3 +--
Makefile.in | 12 ++++++++++++
scripts/quiltify.sh | 4 ++--
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index b7019bd..23307b9 100644
--- a/Makefile
+++ b/Makefile
@@ -221,8 +221,7 @@ shell_env:
@echo ARMADEUS_BSP_VERSION=$(ARMADEUS_BSP_VERSION) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_BOARD_NAME=$(ARMADEUS_BOARD_NAME) >> $(ARMADEUS_ENV_FILE)
@echo ARMADEUS_U_BOOT_BOARD_NAME=$(ARMADEUS_U_BOOT_BOARD_NAME) >> $(ARMADEUS_ENV_FILE)
- @echo ARMADEUS_DL_DIR=$(BR2_DL_DIR) >> $(ARMADEUS_ENV_FILE)
-
+ @echo ARMADEUS_DL_DIR=$(ARMADEUS_DL_DIR) >> $(ARMADEUS_ENV_FILE)
PHONY_TARGETS+=dummy all linux linux-clean buildroot-clean buildroot-dirclean
PHONY_TARGETS+=menuconfig $(BUILDROOT_DIR)/.config shell_env buildroot-sources buildroot-unpacked
diff --git a/Makefile.in b/Makefile.in
index 1eebf88..0aad68b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,6 +9,18 @@ ARMADEUS_BASE_DIR:=$(shell pwd)
endif
BUILDROOT_DIR:=$(ARMADEUS_BASE_DIR)/buildroot
+
+ifneq ($(BUILDROOT_DL_DIR),)
+# To be removed with BR 2014.02
+ARMADEUS_DL_DIR := $(BUILDROOT_DL_DIR)
+else
+ ifneq ($(BR2_DL_DIR),)
+ ARMADEUS_DL_DIR := $(BR2_DL_DIR)
+ else
+ ARMADEUS_DL_DIR := $(shell grep "BR2_DL_DIR=" $(BUILDROOT_DIR)/.config 2>/dev/null | cut -d = -f 2 | sed 's;$$(BASE_DIR);$(BUILDROOT_DIR);')
+ endif
+endif
+
-include $(BUILDROOT_DIR)/.config
ARMADEUS_LINUX_VERSION:=$(shell echo $(BR2_LINUX_KERNEL_VERSION))
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 59c210c..9d4c6bc 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -172,9 +172,9 @@ if [ "$QUILT_TARGET_NAME" == "Linux kernel" ]; then
# Revert list order:
LINUX_PATCHES=`echo $LINUX_PATCHES | tac -s' '`
for patch_source in $LINUX_PATCHES; do
- patch_source=`echo $patch_source | cut -d / -f 5`
+ patch_source=`echo $patch_source | sed 's#ftp://ftp2.armadeus.com/armadeusw/##g'`
if [ -f "$ARMADEUS_DL_DIR/$patch_source" ]; then
- echo "--- $patch_source is an archive"
+ echo "--- $ARMADEUS_DL_DIR/$patch_source is an archive"
quilt import $ARMADEUS_DL_DIR/$patch_source
fi
done
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2014-02-11 07:15:59
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 050ee0089799d7dc926805edf0f1bbdc7acd673f (commit)
from 43cdc0afad144242719df3ad249cf506063e2a84 (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 050ee0089799d7dc926805edf0f1bbdc7acd673f
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 11 08:13:06 2014 +0100
[BUILDROOT] Fixes CUnit repository address
-----------------------------------------------------------------------
Summary of changes:
.../buildroot/2013.11/197-cunit-add_package.patch | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/patches/buildroot/2013.11/197-cunit-add_package.patch b/patches/buildroot/2013.11/197-cunit-add_package.patch
index 3307a7e..9399527 100644
--- a/patches/buildroot/2013.11/197-cunit-add_package.patch
+++ b/patches/buildroot/2013.11/197-cunit-add_package.patch
@@ -24,8 +24,8 @@ Index: buildroot/package/cunit/cunit.mk
+#############################################################
+
+CUNIT_VERSION = 156
-+CUNIT_SITE = https://cunit.svn.sourceforge.net/svnroot/cunit
-+CUNIT_SITE_METHOD = svn
++CUNIT_SITE = svn://svn.code.sf.net/p/cunit/code/trunk
++#CUNIT_SITE_METHOD = svn
+CUNIT_INSTALL_STAGING = YES
+
+define CUNIT_BOOTSTRAP_CMD
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-02-11 04:32: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 43cdc0afad144242719df3ad249cf506063e2a84 (commit)
from b2e670f1f1824c8541418079ac08fd30d29428de (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 43cdc0afad144242719df3ad249cf506063e2a84
Author: Philippe Reynes <tr...@ya...>
Date: Mon Feb 10 19:16:44 2014 +0100
[LINUX] 3.14: move to 3.14-rc2
-----------------------------------------------------------------------
Summary of changes:
...3.14-rc1.config => apf27-linux-3.14-rc2.config} | 0
...3.14-rc1.config => apf28-linux-3.14-rc2.config} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.14-rc1.config => apf27-linux-3.14-rc2.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.14-rc1.config => apf28-linux-3.14-rc2.config} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14-rc1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14-rc2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.14-rc1.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.14-rc2.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc1.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc2.config
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-02-10 17:24:09
|
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 b2e670f1f1824c8541418079ac08fd30d29428de (commit)
via 33e3328ce8fdf343ee246d53a9c051b6e55449f8 (commit)
via 02155b364547253d65d2299087a5d068b10a212e (commit)
from 0193cf00ba751bbece9320042599225f391874a0 (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 b2e670f1f1824c8541418079ac08fd30d29428de
Author: Philippe Reynes <tr...@ya...>
Date: Sun Feb 9 17:30:16 2014 +0100
[LINUX] 3.12: move to 3.12.10
commit 33e3328ce8fdf343ee246d53a9c051b6e55449f8
Author: Philippe Reynes <tr...@ya...>
Date: Sun Feb 9 17:30:15 2014 +0100
[LINUX] 3.11: move to 3.11.10 (EOL)
commit 02155b364547253d65d2299087a5d068b10a212e
Author: Philippe Reynes <tr...@ya...>
Date: Sun Feb 9 17:30:14 2014 +0100
[LINUX] 3.10: move to 3.10.29
-----------------------------------------------------------------------
Summary of changes:
...x-3.10.28.config => apf27-linux-3.10.29.config} | 0
...ux-3.11.8.config => apf27-linux-3.11.10.config} | 0
...ux-3.12.9.config => apf27-linux-3.12.10.config} | 0
...x-3.10.28.config => apf28-linux-3.10.29.config} | 0
...ux-3.11.8.config => apf28-linux-3.11.10.config} | 0
...ux-3.12.9.config => apf28-linux-3.12.10.config} | 0
...x-3.10.28.config => apf51-linux-3.10.29.config} | 0
...ux-3.11.8.config => apf51-linux-3.11.10.config} | 0
...ux-3.12.9.config => apf51-linux-3.12.10.config} | 0
patches/linux/{3.10.28 => 3.10.29} | 0
patches/linux/{3.11.8 => 3.11.10} | 0
patches/linux/{3.12.9 => 3.12.10} | 0
12 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.28.config => apf27-linux-3.10.29.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.11.8.config => apf27-linux-3.11.10.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.12.9.config => apf27-linux-3.12.10.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.28.config => apf28-linux-3.10.29.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.11.8.config => apf28-linux-3.11.10.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.12.9.config => apf28-linux-3.12.10.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.28.config => apf51-linux-3.10.29.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.11.8.config => apf51-linux-3.11.10.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.12.9.config => apf51-linux-3.12.10.config} (100%)
rename patches/linux/{3.10.28 => 3.10.29} (100%)
rename patches/linux/{3.11.8 => 3.11.10} (100%)
rename patches/linux/{3.12.9 => 3.12.10} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.28.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.29.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.28.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.29.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.8.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.10.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.11.8.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.11.10.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.9.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.10.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.12.9.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.12.10.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.28.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.29.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.28.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.29.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.8.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.10.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.11.8.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.11.10.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.9.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.10.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.12.9.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.10.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.28.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.29.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.28.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.29.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.11.8.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.11.10.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.11.8.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.11.10.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.9.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.10.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.12.9.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.12.10.config
diff --git a/patches/linux/3.10.28 b/patches/linux/3.10.29
similarity index 100%
rename from patches/linux/3.10.28
rename to patches/linux/3.10.29
diff --git a/patches/linux/3.11.8 b/patches/linux/3.11.10
similarity index 100%
rename from patches/linux/3.11.8
rename to patches/linux/3.11.10
diff --git a/patches/linux/3.12.9 b/patches/linux/3.12.10
similarity index 100%
rename from patches/linux/3.12.9
rename to patches/linux/3.12.10
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-02-10 09: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 0193cf00ba751bbece9320042599225f391874a0 (commit)
from cc5ff53ff45daaee108c83c8ae956ad78927d03d (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 0193cf00ba751bbece9320042599225f391874a0
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Feb 10 10:14:02 2014 +0100
[BUILDROOT] apf6: move to linux 3.14-rc2
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
...-3.14-rc1.config => apf6-linux-3.14-rc2.config} | 0
patches/linux/{3.14-rc1 => 3.14-rc2} | 0
3 files changed, 1 insertions(+), 1 deletions(-)
rename buildroot/target/device/armadeus/apf6/{apf6-linux-3.14-rc1.config => apf6-linux-3.14-rc2.config} (100%)
rename patches/linux/{3.14-rc1 => 3.14-rc2} (100%)
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index b86bd78..f289b14 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -12,7 +12,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-rc1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14-rc2"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc1.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc1.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc2.config
diff --git a/patches/linux/3.14-rc1 b/patches/linux/3.14-rc2
similarity index 100%
rename from patches/linux/3.14-rc1
rename to patches/linux/3.14-rc2
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-02-09 11:12: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 cc5ff53ff45daaee108c83c8ae956ad78927d03d (commit)
via cb43a756169a8a6a6616ef2f42958b2f33cd22a8 (commit)
from 909500338eef668d3c357f5398fa201d40867c4c (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 cc5ff53ff45daaee108c83c8ae956ad78927d03d
Author: Philippe Reynes <tr...@ya...>
Date: Sun Feb 9 11:31:13 2014 +0100
[LINUX] 3.12: remove support of 3.12.1 and 3.12.2
commit cb43a756169a8a6a6616ef2f42958b2f33cd22a8
Author: Philippe Reynes <tr...@ya...>
Date: Sun Feb 9 11:31:12 2014 +0100
[LINUX] 3.11: remove support of 3.11.2, 3.11.3 and 3.11.7
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-3.12.1.config | 1 -
.../armadeus/apf28/apf28-linux-3.12.2.config | 1 -
.../armadeus/apf51/apf51-linux-3.12.1.config | 1 -
patches/linux/3.11.2 | 1 -
patches/linux/3.11.3 | 1 -
patches/linux/3.11.7 | 1 -
patches/linux/3.12.2 | 1 -
7 files changed, 0 insertions(+), 7 deletions(-)
delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.12.1.config
delete mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.12.2.config
delete mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.12.1.config
delete mode 120000 patches/linux/3.11.2
delete mode 120000 patches/linux/3.11.3
delete mode 120000 patches/linux/3.11.7
delete mode 120000 patches/linux/3.12.2
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.1.config
deleted file mode 120000
index d94fc19..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.1.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.12.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.2.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.2.config
deleted file mode 120000
index 233cc21..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.2.config
+++ /dev/null
@@ -1 +0,0 @@
-apf28-linux-3.12.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.1.config
deleted file mode 120000
index f5f41cd..0000000
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.12.1.config
+++ /dev/null
@@ -1 +0,0 @@
-apf51-linux-3.12.config
\ No newline at end of file
diff --git a/patches/linux/3.11.2 b/patches/linux/3.11.2
deleted file mode 120000
index 902b2c9..0000000
--- a/patches/linux/3.11.2
+++ /dev/null
@@ -1 +0,0 @@
-3.11
\ No newline at end of file
diff --git a/patches/linux/3.11.3 b/patches/linux/3.11.3
deleted file mode 120000
index 902b2c9..0000000
--- a/patches/linux/3.11.3
+++ /dev/null
@@ -1 +0,0 @@
-3.11
\ No newline at end of file
diff --git a/patches/linux/3.11.7 b/patches/linux/3.11.7
deleted file mode 120000
index 902b2c9..0000000
--- a/patches/linux/3.11.7
+++ /dev/null
@@ -1 +0,0 @@
-3.11
\ No newline at end of file
diff --git a/patches/linux/3.12.2 b/patches/linux/3.12.2
deleted file mode 120000
index fdcfcfd..0000000
--- a/patches/linux/3.12.2
+++ /dev/null
@@ -1 +0,0 @@
-3.12
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-02-09 11:10:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 909500338eef668d3c357f5398fa201d40867c4c (commit)
from b45ea2bb02ed71e95ecbb450f464db9b16811b0e (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 909500338eef668d3c357f5398fa201d40867c4c
Author: Philippe Reynes <tr...@ya...>
Date: Fri Feb 7 21:33:43 2014 +0100
[LINUX] 3.13: move to 3.13.2
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27mainline_defconfig | 4 +-
buildroot/configs/apf28mainline_defconfig | 4 +-
buildroot/configs/apf51mainline_defconfig | 4 +-
.../armadeus/apf27/apf27-linux-3.13.1.config | 1 -
...linux-3.13.config => apf27-linux-3.13.2.config} | 0
.../armadeus/apf28/apf28-linux-3.13.1.config | 1 -
...linux-3.13.config => apf28-linux-3.13.2.config} | 0
.../armadeus/apf51/apf51-linux-3.13.1.config | 1 -
...linux-3.13.config => apf51-linux-3.13.2.config} | 0
patches/linux/{3.13.1 => 3.13.2} | 0
...ess-hardirq-unsafe-lock-in-atomic-context.patch | 381 --------------------
11 files changed, 6 insertions(+), 390 deletions(-)
delete mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.13.1.config
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.13.config => apf27-linux-3.13.2.config} (100%)
delete mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.13.1.config
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.13.config => apf28-linux-3.13.2.config} (100%)
delete mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.13.1.config
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.13.config => apf51-linux-3.13.2.config} (100%)
rename patches/linux/{3.13.1 => 3.13.2} (100%)
delete mode 100644 patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch
diff --git a/buildroot/configs/apf27mainline_defconfig b/buildroot/configs/apf27mainline_defconfig
index a3affc9..1be9092 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.13.1"
+BR2_DEFAULT_KERNEL_VERSION="3.13.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.13.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.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 64c4f8c..ced8abd 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.13.1"
+BR2_DEFAULT_KERNEL_VERSION="3.13.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.13.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.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 5b85b41..ec377ca 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.13.1"
+BR2_DEFAULT_KERNEL_VERSION="3.13.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.13.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.13.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.13.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.1.config
deleted file mode 120000
index 556e9d4..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.1.config
+++ /dev/null
@@ -1 +0,0 @@
-apf27-linux-3.13.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.13.2.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.1.config
deleted file mode 120000
index fad58f6..0000000
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.1.config
+++ /dev/null
@@ -1 +0,0 @@
-apf28-linux-3.13.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.13.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.13.2.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.1.config
deleted file mode 120000
index 90856dc..0000000
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.1.config
+++ /dev/null
@@ -1 +0,0 @@
-apf51-linux-3.13.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.13.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.13.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.13.2.config
diff --git a/patches/linux/3.13.1 b/patches/linux/3.13.2
similarity index 100%
rename from patches/linux/3.13.1
rename to patches/linux/3.13.2
diff --git a/patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch b/patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch
deleted file mode 100644
index 9ae9e82..0000000
--- a/patches/linux/3.13/0481-V2-1-2-mmc-sdhci-esdhc-imx-fix-access-hardirq-unsafe-lock-in-atomic-context.patch
+++ /dev/null
@@ -1,381 +0,0 @@
-From patchwork Thu Dec 26 07:23:53 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [V2,
- 1/2] mmc: sdhci-esdhc-imx: fix access hardirq-unsafe lock in atomic
- context
-From: Aisheng Dong <b2...@fr...>
-X-Patchwork-Id: 3406131
-Message-Id: <138...@fr...>
-To: <lin...@vg...>
-Cc: <lin...@li...>, <cj...@la...>,
- <sha...@li...>, <s....@pe...>, <b2...@fr...>
-Date: Thu, 26 Dec 2013 15:23:53 +0800
-
-Sometimes we may meet the following lockdep issue.
-The root cause is .set_clock callback is executed with spin_lock_irqsave
-in sdhci_do_set_ios. However, the IMX set_clock callback will try to access
-clk_get_rate which is using a mutex lock.
-
-The fix avoids access mutex in .set_clock callback by initializing the
-pltfm_host->clock at probe time and use it later instead of calling
-clk_get_rate again in atomic context.
-
-[ INFO: HARDIRQ-safe -> HARDIRQ-unsafe lock order detected ]
-3.13.0-rc1+ #285 Not tainted
-------------------------------------------------------
-kworker/u8:1/29 [HC0[0]:SC0[0]:HE0:SE1] is trying to acquire:
- (prepare_lock){+.+...}, at: [<80480b08>] clk_prepare_lock+0x44/0xe4
-
-and this task is already holding:
- (&(&host->lock)->rlock#2){-.-...}, at: [<804611f4>] sdhci_do_set_ios+0x20/0x720
-which would create a new lock dependency:
- (&(&host->lock)->rlock#2){-.-...} -> (prepare_lock){+.+...}
-
-but this new dependency connects a HARDIRQ-irq-safe lock:
- (&(&host->lock)->rlock#2){-.-...}
-... which became HARDIRQ-irq-safe at:
- [<8005f030>] mark_lock+0x140/0x6ac
- [<80060760>] __lock_acquire+0xb30/0x1cbc
- [<800620d0>] lock_acquire+0x70/0x84
- [<8061d2f0>] _raw_spin_lock+0x30/0x40
- [<80460668>] sdhci_irq+0x24/0xa68
- [<8006b1d4>] handle_irq_event_percpu+0x54/0x18c
- [<8006b350>] handle_irq_event+0x44/0x64
- [<8006e50c>] handle_fasteoi_irq+0xa0/0x170
- [<8006a8f0>] generic_handle_irq+0x30/0x44
- [<8000f238>] handle_IRQ+0x54/0xbc
- [<8000864c>] gic_handle_irq+0x30/0x64
- [<80013024>] __irq_svc+0x44/0x5c
- [<80614c58>] printk+0x38/0x40
- [<804622a8>] sdhci_add_host+0x844/0xbcc
- [<80464948>] sdhci_esdhc_imx_probe+0x378/0x67c
- [<8032ee88>] platform_drv_probe+0x20/0x50
- [<8032d48c>] driver_probe_device+0x118/0x234
- [<8032d690>] __driver_attach+0x9c/0xa0
- [<8032b89c>] bus_for_each_dev+0x68/0x9c
- [<8032cf44>] driver_attach+0x20/0x28
- [<8032cbc8>] bus_add_driver+0x148/0x1f4
- [<8032dce0>] driver_register+0x80/0x100
- [<8032ee54>] __platform_driver_register+0x50/0x64
- [<8084b094>] sdhci_esdhc_imx_driver_init+0x18/0x20
- [<80008980>] do_one_initcall+0x108/0x16c
- [<8081cca4>] kernel_init_freeable+0x10c/0x1d0
- [<80611c50>] kernel_init+0x10/0x120
- [<8000e9c8>] ret_from_fork+0x14/0x2c
-
-to a HARDIRQ-irq-unsafe lock:
- (prepare_lock){+.+...}
-... which became HARDIRQ-irq-unsafe at:
-... [<8005f030>] mark_lock+0x140/0x6ac
- [<8005f604>] mark_held_locks+0x68/0x12c
- [<8005f780>] trace_hardirqs_on_caller+0xb8/0x1d8
- [<8005f8b4>] trace_hardirqs_on+0x14/0x18
- [<8061a130>] mutex_trylock+0x180/0x20c
- [<80480ad8>] clk_prepare_lock+0x14/0xe4
- [<804816a4>] clk_notifier_register+0x28/0xf0
- [<80015120>] twd_clk_init+0x50/0x68
- [<80008980>] do_one_initcall+0x108/0x16c
- [<8081cca4>] kernel_init_freeable+0x10c/0x1d0
- [<80611c50>] kernel_init+0x10/0x120
- [<8000e9c8>] ret_from_fork+0x14/0x2c
-
-other info that might help us debug this:
-
- Possible interrupt unsafe locking scenario:
-
- CPU0 CPU1
- ---- ----
- lock(prepare_lock);
- local_irq_disable();
- lock(&(&host->lock)->rlock#2);
- lock(prepare_lock);
- <Interrupt>
- lock(&(&host->lock)->rlock#2);
-
- *** DEADLOCK ***
-
-3 locks held by kworker/u8:1/29:
- #0: (kmmcd){.+.+.+}, at: [<8003db18>] process_one_work+0x128/0x468
- #1: ((&(&host->detect)->work)){+.+.+.}, at: [<8003db18>] process_one_work+0x128/0x468
- #2: (&(&host->lock)->rlock#2){-.-...}, at: [<804611f4>] sdhci_do_set_ios+0x20/0x720
-
-the dependencies between HARDIRQ-irq-safe lock and the holding lock:
--> (&(&host->lock)->rlock#2){-.-...} ops: 330 {
- IN-HARDIRQ-W at:
- [<8005f030>] mark_lock+0x140/0x6ac
- [<80060760>] __lock_acquire+0xb30/0x1cbc
- [<800620d0>] lock_acquire+0x70/0x84
- [<8061d2f0>] _raw_spin_lock+0x30/0x40
- [<80460668>] sdhci_irq+0x24/0xa68
- [<8006b1d4>] handle_irq_event_percpu+0x54/0x18c
- [<8006b350>] handle_irq_event+0x44/0x64
- [<8006e50c>] handle_fasteoi_irq+0xa0/0x170
- [<8006a8f0>] generic_handle_irq+0x30/0x44
- [<8000f238>] handle_IRQ+0x54/0xbc
- [<8000864c>] gic_handle_irq+0x30/0x64
- [<80013024>] __irq_svc+0x44/0x5c
- [<80614c58>] printk+0x38/0x40
- [<804622a8>] sdhci_add_host+0x844/0xbcc
- [<80464948>] sdhci_esdhc_imx_probe+0x378/0x67c
- [<8032ee88>] platform_drv_probe+0x20/0x50
- [<8032d48c>] driver_probe_device+0x118/0x234
- [<8032d690>] __driver_attach+0x9c/0xa0
- [<8032b89c>] bus_for_each_dev+0x68/0x9c
- [<8032cf44>] driver_attach+0x20/0x28
- [<8032cbc8>] bus_add_driver+0x148/0x1f4
- [<8032dce0>] driver_register+0x80/0x100
- [<8032ee54>] __platform_driver_register+0x50/0x64
- [<8084b094>] sdhci_esdhc_imx_driver_init+0x18/0x20
- [<80008980>] do_one_initcall+0x108/0x16c
- [<8081cca4>] kernel_init_freeable+0x10c/0x1d0
- [<80611c50>] kernel_init+0x10/0x120
- [<8000e9c8>] ret_from_fork+0x14/0x2c
- IN-SOFTIRQ-W at:
- [<8005f030>] mark_lock+0x140/0x6ac
- [<80060204>] __lock_acquire+0x5d4/0x1cbc
- [<800620d0>] lock_acquire+0x70/0x84
- [<8061d40c>] _raw_spin_lock_irqsave+0x40/0x54
- [<8045e4a4>] sdhci_tasklet_finish+0x1c/0x120
- [<8002b538>] tasklet_action+0xa0/0x15c
- [<8002b778>] __do_softirq+0x118/0x290
- [<8002bcf4>] irq_exit+0xb4/0x10c
- [<8000f240>] handle_IRQ+0x5c/0xbc
- [<8000864c>] gic_handle_irq+0x30/0x64
- [<80013024>] __irq_svc+0x44/0x5c
- [<80614c58>] printk+0x38/0x40
- [<804622a8>] sdhci_add_host+0x844/0xbcc
- [<80464948>] sdhci_esdhc_imx_probe+0x378/0x67c
- [<8032ee88>] platform_drv_probe+0x20/0x50
- [<8032d48c>] driver_probe_device+0x118/0x234
- [<8032d690>] __driver_attach+0x9c/0xa0
- [<8032b89c>] bus_for_each_dev+0x68/0x9c
- [<8032cf44>] driver_attach+0x20/0x28
- [<8032cbc8>] bus_add_driver+0x148/0x1f4
- [<8032dce0>] driver_register+0x80/0x100
- [<8032ee54>] __platform_driver_register+0x50/0x64
- [<8084b094>] sdhci_esdhc_imx_driver_init+0x18/0x20
- [<80008980>] do_one_initcall+0x108/0x16c
- [<8081cca4>] kernel_init_freeable+0x10c/0x1d0
- [<80611c50>] kernel_init+0x10/0x120
- [<8000e9c8>] ret_from_fork+0x14/0x2c
- INITIAL USE at:
- [<8005f030>] mark_lock+0x140/0x6ac
- [<8005ff0c>] __lock_acquire+0x2dc/0x1cbc
- [<800620d0>] lock_acquire+0x70/0x84
- [<8061d40c>] _raw_spin_lock_irqsave+0x40/0x54
- [<804611f4>] sdhci_do_set_ios+0x20/0x720
- [<80461924>] sdhci_set_ios+0x30/0x3c
- [<8044cea0>] mmc_power_up+0x6c/0xd0
- [<8044dac4>] mmc_start_host+0x60/0x70
- [<8044eb3c>] mmc_add_host+0x60/0x88
- [<8046225c>] sdhci_add_host+0x7f8/0xbcc
- [<80464948>] sdhci_esdhc_imx_probe+0x378/0x67c
- [<8032ee88>] platform_drv_probe+0x20/0x50
- [<8032d48c>] driver_probe_device+0x118/0x234
- [<8032d690>] __driver_attach+0x9c/0xa0
- [<8032b89c>] bus_for_each_dev+0x68/0x9c
- [<8032cf44>] driver_attach+0x20/0x28
- [<8032cbc8>] bus_add_driver+0x148/0x1f4
- [<8032dce0>] driver_register+0x80/0x100
- [<8032ee54>] __platform_driver_register+0x50/0x64
- [<8084b094>] sdhci_esdhc_imx_driver_init+0x18/0x20
- [<80008980>] do_one_initcall+0x108/0x16c
- [<8081cca4>] kernel_init_freeable+0x10c/0x1d0
- [<80611c50>] kernel_init+0x10/0x120
- [<8000e9c8>] ret_from_fork+0x14/0x2c
- }
- ... key at: [<80e040e8>] __key.26952+0x0/0x8
- ... acquired at:
- [<8005eb60>] check_usage+0x3d0/0x5c0
- [<8005edac>] check_irq_usage+0x5c/0xb8
- [<80060d38>] __lock_acquire+0x1108/0x1cbc
- [<800620d0>] lock_acquire+0x70/0x84
- [<8061a210>] mutex_lock_nested+0x54/0x3c0
- [<80480b08>] clk_prepare_lock+0x44/0xe4
- [<8048188c>] clk_get_rate+0x14/0x64
- [<8046374c>] esdhc_pltfm_set_clock+0x20/0x2a4
- [<8045d70c>] sdhci_set_clock+0x4c/0x498
- [<80461518>] sdhci_do_set_ios+0x344/0x720
- [<80461924>] sdhci_set_ios+0x30/0x3c
- [<8044c390>] __mmc_set_clock+0x44/0x60
- [<8044cd4c>] mmc_set_clock+0x10/0x14
- [<8044f8f4>] mmc_init_card+0x1b4/0x1520
- [<80450f00>] mmc_attach_mmc+0xb4/0x194
- [<8044da08>] mmc_rescan+0x294/0x2f0
- [<8003db94>] process_one_work+0x1a4/0x468
- [<8003e850>] worker_thread+0x118/0x3e0
- [<80044de0>] kthread+0xd4/0xf0
- [<8000e9c8>] ret_from_fork+0x14/0x2c
-
-the dependencies between the lock to be acquired and HARDIRQ-irq-unsafe lock:
--> (prepare_lock){+.+...} ops: 395 {
- HARDIRQ-ON-W at:
- [<8005f030>] mark_lock+0x140/0x6ac
- [<8005f604>] mark_held_locks+0x68/0x12c
- [<8005f780>] trace_hardirqs_on_caller+0xb8/0x1d8
- [<8005f8b4>] trace_hardirqs_on+0x14/0x18
- [<8061a130>] mutex_trylock+0x180/0x20c
- [<80480ad8>] clk_prepare_lock+0x14/0xe4
- [<804816a4>] clk_notifier_register+0x28/0xf0
- [<80015120>] twd_clk_init+0x50/0x68
- [<80008980>] do_one_initcall+0x108/0x16c
- [<8081cca4>] kernel_init_freeable+0x10c/0x1d0
- [<80611c50>] kernel_init+0x10/0x120
- [<8000e9c8>] ret_from_fork+0x14/0x2c
- SOFTIRQ-ON-W at:
- [<8005f030>] mark_lock+0x140/0x6ac
- [<8005f604>] mark_held_locks+0x68/0x12c
- [<8005f7c8>] trace_hardirqs_on_caller+0x100/0x1d8
- [<8005f8b4>] trace_hardirqs_on+0x14/0x18
- [<8061a130>] mutex_trylock+0x180/0x20c
- [<80480ad8>] clk_prepare_lock+0x14/0xe4
- [<804816a4>] clk_notifier_register+0x28/0xf0
- [<80015120>] twd_clk_init+0x50/0x68
- [<80008980>] do_one_initcall+0x108/0x16c
- [<8081cca4>] kernel_init_freeable+0x10c/0x1d0
- [<80611c50>] kernel_init+0x10/0x120
- [<8000e9c8>] ret_from_fork+0x14/0x2c
- INITIAL USE at:
- [<8005f030>] mark_lock+0x140/0x6ac
- [<8005ff0c>] __lock_acquire+0x2dc/0x1cbc
- [<800620d0>] lock_acquire+0x70/0x84
- [<8061a0c8>] mutex_trylock+0x118/0x20c
- [<80480ad8>] clk_prepare_lock+0x14/0xe4
- [<80482af8>] __clk_init+0x1c/0x45c
- [<8048306c>] _clk_register+0xd0/0x170
- [<80483148>] clk_register+0x3c/0x7c
- [<80483b4c>] clk_register_fixed_rate+0x88/0xd8
- [<80483c04>] of_fixed_clk_setup+0x68/0x94
- [<8084c6fc>] of_clk_init+0x44/0x68
- [<808202b0>] time_init+0x2c/0x38
- [<8081ca14>] start_kernel+0x1e4/0x368
- [<10008074>] 0x10008074
- }
- ... key at: [<808afebc>] prepare_lock+0x38/0x48
- ... acquired at:
- [<8005eb94>] check_usage+0x404/0x5c0
- [<8005edac>] check_irq_usage+0x5c/0xb8
- [<80060d38>] __lock_acquire+0x1108/0x1cbc
- [<800620d0>] lock_acquire+0x70/0x84
- [<8061a210>] mutex_lock_nested+0x54/0x3c0
- [<80480b08>] clk_prepare_lock+0x44/0xe4
- [<8048188c>] clk_get_rate+0x14/0x64
- [<8046374c>] esdhc_pltfm_set_clock+0x20/0x2a4
- [<8045d70c>] sdhci_set_clock+0x4c/0x498
- [<80461518>] sdhci_do_set_ios+0x344/0x720
- [<80461924>] sdhci_set_ios+0x30/0x3c
- [<8044c390>] __mmc_set_clock+0x44/0x60
- [<8044cd4c>] mmc_set_clock+0x10/0x14
- [<8044f8f4>] mmc_init_card+0x1b4/0x1520
- [<80450f00>] mmc_attach_mmc+0xb4/0x194
- [<8044da08>] mmc_rescan+0x294/0x2f0
- [<8003db94>] process_one_work+0x1a4/0x468
- [<8003e850>] worker_thread+0x118/0x3e0
- [<80044de0>] kthread+0xd4/0xf0
- [<8000e9c8>] ret_from_fork+0x14/0x2c
-
-stack backtrace:
-CPU: 2 PID: 29 Comm: kworker/u8:1 Not tainted 3.13.0-rc1+ #285
-Workqueue: kmmcd mmc_rescan
-Backtrace:
-[<80012160>] (dump_backtrace+0x0/0x10c) from [<80012438>] (show_stack+0x18/0x1c)
- r6:00000000 r5:00000000 r4:8088ecc8 r3:bfa11200
-[<80012420>] (show_stack+0x0/0x1c) from [<80616b14>] (dump_stack+0x84/0x9c)
-[<80616a90>] (dump_stack+0x0/0x9c) from [<8005ebb4>] (check_usage+0x424/0x5c0)
- r5:80979940 r4:bfa29b44
-[<8005e790>] (check_usage+0x0/0x5c0) from [<8005edac>] (check_irq_usage+0x5c/0xb8)
-[<8005ed50>] (check_irq_usage+0x0/0xb8) from [<80060d38>] (__lock_acquire+0x1108/0x1cbc)
- r8:bfa115e8 r7:80df9884 r6:80dafa9c r5:00000003 r4:bfa115d0
-[<8005fc30>] (__lock_acquire+0x0/0x1cbc) from [<800620d0>] (lock_acquire+0x70/0x84)
-[<80062060>] (lock_acquire+0x0/0x84) from [<8061a210>] (mutex_lock_nested+0x54/0x3c0)
- r7:bfa11200 r6:80dafa9c r5:00000000 r4:80480b08
-[<8061a1bc>] (mutex_lock_nested+0x0/0x3c0) from [<80480b08>] (clk_prepare_lock+0x44/0xe4)
-[<80480ac4>] (clk_prepare_lock+0x0/0xe4) from [<8048188c>] (clk_get_rate+0x14/0x64)
- r6:03197500 r5:bf0e9aa8 r4:bf827400 r3:808ae128
-[<80481878>] (clk_get_rate+0x0/0x64) from [<8046374c>] (esdhc_pltfm_set_clock+0x20/0x2a4)
- r5:bf0e9aa8 r4:bf0e9c40
-[<8046372c>] (esdhc_pltfm_set_clock+0x0/0x2a4) from [<8045d70c>] (sdhci_set_clock+0x4c/0x498)
-[<8045d6c0>] (sdhci_set_clock+0x0/0x498) from [<80461518>] (sdhci_do_set_ios+0x344/0x720)
- r8:0000003b r7:20000113 r6:bf0e9d68 r5:bf0e9aa8 r4:bf0e9c40
-r3:00000000
-[<804611d4>] (sdhci_do_set_ios+0x0/0x720) from [<80461924>] (sdhci_set_ios+0x30/0x3c)
- r9:00000004 r8:bf131000 r7:bf131048 r6:00000000 r5:bf0e9aa8
-r4:bf0e9800
-[<804618f4>] (sdhci_set_ios+0x0/0x3c) from [<8044c390>] (__mmc_set_clock+0x44/0x60)
- r5:03197500 r4:bf0e9800
-[<8044c34c>] (__mmc_set_clock+0x0/0x60) from [<8044cd4c>] (mmc_set_clock+0x10/0x14)
- r5:00000000 r4:bf0e9800
-[<8044cd3c>] (mmc_set_clock+0x0/0x14) from [<8044f8f4>] (mmc_init_card+0x1b4/0x1520)
-[<8044f740>] (mmc_init_card+0x0/0x1520) from [<80450f00>] (mmc_attach_mmc+0xb4/0x194)
-[<80450e4c>] (mmc_attach_mmc+0x0/0x194) from [<8044da08>] (mmc_rescan+0x294/0x2f0)
- r5:8065f358 r4:bf0e9af8
-[<8044d774>] (mmc_rescan+0x0/0x2f0) from [<8003db94>] (process_one_work+0x1a4/0x468)
- r8:00000000 r7:bfa29eb0 r6:bf80dc00 r5:bf0e9af8 r4:bf9e3f00
-r3:8044d774
-[<8003d9f0>] (process_one_work+0x0/0x468) from [<8003e850>] (worker_thread+0x118/0x3e0)
-[<8003e738>] (worker_thread+0x0/0x3e0) from [<80044de0>] (kthread+0xd4/0xf0)
-[<80044d0c>] (kthread+0x0/0xf0) from [<8000e9c8>] (ret_from_fork+0x14/0x2c)
- r7:00000000 r6:00000000 r5:80044d0c r4:bf9e7f00
-
-Cc: Chris Ball <cj...@la...>
-Cc: Fabio Estevam <fab...@fr...>
-Cc: Shawn Guo <sha...@li...>
-Fixes: 0ddf03c mmc: esdhc-imx: parse max-frequency from devicetree
-Signed-off-by: Dong Aisheng <b2...@fr...>
-Acked-by: Shawn Guo <sha...@li...>
-Tested-by: Philippe De Muyter <ph...@ma...>
-
----
-ChangeLog:
-no changes
----
- drivers/mmc/host/sdhci-esdhc-imx.c | 12 +++++-------
- 1 files changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
-index 2a04847..745ee1e 100644
---- a/drivers/mmc/host/sdhci-esdhc-imx.c
-+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
-@@ -576,19 +576,17 @@ static unsigned int esdhc_pltfm_get_max_clock(struct sdhci_host *host)
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
- struct esdhc_platform_data *boarddata = &imx_data->boarddata;
-
-- u32 f_host = clk_get_rate(pltfm_host->clk);
--
-- if (boarddata->f_max && (boarddata->f_max < f_host))
-+ if (boarddata->f_max && (boarddata->f_max < pltfm_host->clock))
- return boarddata->f_max;
- else
-- return f_host;
-+ return pltfm_host->clock;
- }
-
- static unsigned int esdhc_pltfm_get_min_clock(struct sdhci_host *host)
- {
- struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-
-- return clk_get_rate(pltfm_host->clk) / 256 / 16;
-+ return pltfm_host->clock / 256 / 16;
- }
-
- static inline void esdhc_pltfm_set_clock(struct sdhci_host *host,
-@@ -596,7 +594,7 @@ static inline void esdhc_pltfm_set_clock(struct sdhci_host *host,
- {
- struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
- struct pltfm_imx_data *imx_data = pltfm_host->priv;
-- unsigned int host_clock = clk_get_rate(pltfm_host->clk);
-+ unsigned int host_clock = pltfm_host->clock;
- int pre_div = 2;
- int div = 1;
- u32 temp, val;
-@@ -1017,7 +1015,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
- }
-
- pltfm_host->clk = imx_data->clk_per;
--
-+ pltfm_host->clock = clk_get_rate(pltfm_host->clk);
- clk_prepare_enable(imx_data->clk_per);
- clk_prepare_enable(imx_data->clk_ipg);
- clk_prepare_enable(imx_data->clk_ahb);
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-02-05 13:06: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 b45ea2bb02ed71e95ecbb450f464db9b16811b0e (commit)
from 7c5bd0b138dbfc137c81243908cd84925dea0d67 (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 b45ea2bb02ed71e95ecbb450f464db9b16811b0e
Author: Eric Jarrige <eri...@ar...>
Date: Wed Feb 5 14:06:01 2014 +0100
[LINUX] 3.14-rc1: apf28: add kernel config
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf28/apf28-linux-3.14-rc1.config | 1 +
...8-linux-3.13.config => apf28-linux-3.14.config} | 1 -
2 files changed, 1 insertions(+), 1 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc1.config
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.13.config => apf28-linux-3.14.config} (99%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc1.config
new file mode 120000
index 0000000..18126c3
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14-rc1.config
@@ -0,0 +1 @@
+apf28-linux-3.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.config
similarity index 99%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.13.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.14.config
index 46bc4bf..4d19500 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.13.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.14.config
@@ -36,7 +36,6 @@ CONFIG_IP_PNP=y
CONFIG_IPV6=y
CONFIG_CAN=m
CONFIG_CAN_VCAN=m
-CONFIG_CAN_FLEXCAN=m
CONFIG_BT=m
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-02-04 18:36:30
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 7c5bd0b138dbfc137c81243908cd84925dea0d67 (commit)
from 7415fa86a19921a29773561df682e619bd530bb7 (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 7c5bd0b138dbfc137c81243908cd84925dea0d67
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 4 19:36:16 2014 +0100
[LINUX] 3.14: afp27: add config and fix patch for 3.14-rc1
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-3.14-rc1.config | 1 +
...7-linux-3.13.config => apf27-linux-3.14.config} | 0
...eus-add-apf27-apf27dev-dts-for-USB.patch.tofix} | 0
3 files changed, 1 insertions(+), 0 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.14-rc1.config
copy buildroot/target/device/armadeus/apf27/{apf27-linux-3.13.config => apf27-linux-3.14.config} (100%)
rename patches/linux/3.14/{0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch => 0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14-rc1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14-rc1.config
new file mode 120000
index 0000000..22d6c37
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14-rc1.config
@@ -0,0 +1 @@
+apf27-linux-3.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.14.config
diff --git a/patches/linux/3.14/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/3.14/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
similarity index 100%
rename from patches/linux/3.14/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
rename to patches/linux/3.14/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch.tofix
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-02-03 16:39: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 7415fa86a19921a29773561df682e619bd530bb7 (commit)
from 60d9d6586bf51c049ebc983432b116c649d71cc5 (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 7415fa86a19921a29773561df682e619bd530bb7
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Feb 3 17:34:05 2014 +0100
[BUILDROOT] apf6: make buildroot and linux default config files common
for both apf6dl and apf6q boards.
-----------------------------------------------------------------------
Summary of changes:
.../configs/{apf6q_defconfig => apf6_defconfig} | 16 +-
.../armadeus/apf6/apf6-linux-3.14-rc1.config | 1 +
.../apf6-linux-3.14.config} | 0
.../device/armadeus/apf6q/apf6q-linux-3.13.config | 304 --------------------
.../armadeus/apf6q/apf6q-linux-3.14-rc1.config | 1 -
5 files changed, 12 insertions(+), 310 deletions(-)
rename buildroot/configs/{apf6q_defconfig => apf6_defconfig} (73%)
create mode 120000 buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc1.config
rename buildroot/target/device/armadeus/{apf6q/apf6q-linux-3.14.config => apf6/apf6-linux-3.14.config} (100%)
delete mode 100644 buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
delete mode 120000 buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14-rc1.config
diff --git a/buildroot/configs/apf6q_defconfig b/buildroot/configs/apf6_defconfig
similarity index 73%
rename from buildroot/configs/apf6q_defconfig
rename to buildroot/configs/apf6_defconfig
index badc0a1..b86bd78 100644
--- a/buildroot/configs/apf6q_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -1,14 +1,13 @@
-# BR 2013.11+
BR2_arm=y
BR2_cortex_a9=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201305=y
-BR2_TARGET_GENERIC_HOSTNAME="apf6q"
+BR2_TARGET_GENERIC_HOSTNAME="apf6"
BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
BR2_TARGET_ARMADEUS=y
-BR2_BOARD_NAME="apf6q"
-BR2_CPU_NAME="imx6q"
+BR2_BOARD_NAME="apf6"
+BR2_CPU_NAME="i.MX6"
BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
@@ -19,15 +18,22 @@ BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
BR2_LINUX_KERNEL_ZIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apf6dev imx6dl-apf6dev"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_LINUX_FIRMWARE=y
BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X=y
+BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_TI_UTILS=y
BR2_PACKAGE_TSLIB=y
BR2_PACKAGE_BLUEZ_UTILS=y
BR2_PACKAGE_DROPBEAR=y
BR2_PACKAGE_IW=y
+BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+BR2_PACKAGE_UTIL_LINUX_BINARIES=y
+BR2_PACKAGE_UTIL_LINUX_FSCK=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
diff --git a/buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc1.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc1.config
new file mode 120000
index 0000000..26da497
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14-rc1.config
@@ -0,0 +1 @@
+apf6-linux-3.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14.config b/buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14.config
rename to buildroot/target/device/armadeus/apf6/apf6-linux-3.14.config
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
deleted file mode 100644
index 5fbf6b1..0000000
--- a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
+++ /dev/null
@@ -1,304 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_KERNEL_LZO=y
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=18
-CONFIG_CGROUPS=y
-CONFIG_RELAY=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
-CONFIG_PERF_EVENTS=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_MULTI_V6=y
-CONFIG_ARCH_MXC=y
-CONFIG_MACH_MX31LILLY=y
-CONFIG_MACH_MX31LITE=y
-CONFIG_MACH_PCM037=y
-CONFIG_MACH_PCM037_EET=y
-CONFIG_MACH_MX31_3DS=y
-CONFIG_MACH_MX31MOBOARD=y
-CONFIG_MACH_QONG=y
-CONFIG_MACH_ARMADILLO5X0=y
-CONFIG_MACH_KZM_ARM11_01=y
-CONFIG_MACH_IMX31_DT=y
-CONFIG_MACH_PCM043=y
-CONFIG_MACH_MX35_3DS=y
-CONFIG_MACH_VPR200=y
-CONFIG_MACH_IMX51_DT=y
-CONFIG_MACH_EUKREA_CPUIMX51SD=y
-CONFIG_SOC_IMX53=y
-CONFIG_SOC_IMX6Q=y
-CONFIG_SOC_IMX6SL=y
-CONFIG_SOC_VF610=y
-CONFIG_PCI=y
-CONFIG_PCI_IMX6=y
-CONFIG_SMP=y
-CONFIG_VMSPLIT_2G=y
-CONFIG_PREEMPT_VOLUNTARY=y
-CONFIG_AEABI=y
-CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_BINFMT_MISC=m
-CONFIG_PM_RUNTIME=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_TEST_SUSPEND=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-CONFIG_IPV6=y
-CONFIG_NETFILTER=y
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_CFG80211=y
-CONFIG_NL80211_TESTMODE=y
-CONFIG_CFG80211_WEXT=y
-CONFIG_MAC80211=y
-CONFIG_RFKILL=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_STANDALONE is not set
-CONFIG_IMX_WEIM=y
-CONFIG_CONNECTOR=y
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_PHYSMAP_OF=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_SST25L=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_GPMI_NAND=y
-CONFIG_MTD_NAND_MXC=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_ATA=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_AHCI_IMX=y
-CONFIG_PATA_IMX=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_VENDOR_BROADCOM is not set
-CONFIG_CS89x0=y
-CONFIG_CS89x0_PLATFORM=y
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-CONFIG_SMC91X=y
-CONFIG_SMC911X=y
-CONFIG_SMSC911X=y
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_RTL_CARDS is not set
-CONFIG_WL_TI=y
-CONFIG_WL12XX=m
-CONFIG_WLCORE_SDIO=m
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_EVBUG=m
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_IMX=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_EGALAX=y
-CONFIG_TOUCHSCREEN_MC13783=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_MMA8450=y
-CONFIG_SERIO_SERPORT=m
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-CONFIG_SERIAL_FSL_LPUART=y
-CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_MXC_RNGA=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_CHARDEV=y
-# CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_IMX=y
-CONFIG_SPI=y
-CONFIG_SPI_IMX=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_MC9S08DZ60=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_NOWAYOUT=y
-CONFIG_IMX2_WDT=y
-CONFIG_MFD_DA9052_I2C=y
-CONFIG_MFD_MC13XXX_SPI=y
-CONFIG_MFD_MC13XXX_I2C=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_ANATOP=y
-CONFIG_REGULATOR_DA9052=y
-CONFIG_REGULATOR_MC13783=y
-CONFIG_REGULATOR_MC13892=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_SOC_CAMERA=y
-CONFIG_VIDEO_MX3=y
-CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_CODA=y
-CONFIG_SOC_CAMERA_OV2640=y
-CONFIG_DRM=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_L4F00242T03=y
-CONFIG_LCD_PLATFORM=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_PWM=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_LOGO=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-CONFIG_SND_IMX_SOC=y
-CONFIG_SND_SOC_PHYCORE_AC97=y
-CONFIG_SND_SOC_EUKREA_TLV320=y
-CONFIG_SND_SOC_IMX_WM8962=y
-CONFIG_SND_SOC_IMX_SGTL5000=y
-CONFIG_SND_SOC_IMX_SPDIF=y
-CONFIG_SND_SOC_IMX_MC13783=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_MXS_PHY=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ETH=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_MMC=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_ESDHC_IMX=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_MC13XXX=y
-CONFIG_RTC_DRV_MXC=y
-CONFIG_RTC_DRV_SNVS=y
-CONFIG_DMADEVICES=y
-CONFIG_IMX_SDMA=y
-CONFIG_MXS_DMA=y
-CONFIG_STAGING=y
-CONFIG_DRM_IMX=y
-CONFIG_DRM_IMX_FB_HELPER=y
-CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
-CONFIG_DRM_IMX_TVE=y
-CONFIG_DRM_IMX_LDB=y
-CONFIG_DRM_IMX_IPUV3_CORE=y
-CONFIG_DRM_IMX_IPUV3=y
-CONFIG_DRM_IMX_HDMI=y
-CONFIG_COMMON_CLK_DEBUG=y
-# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_PWM=y
-CONFIG_PWM_IMX=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=y
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_DEFAULT="cp437"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_UTF8=y
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_SCHED_DEBUG is not set
-CONFIG_PROVE_LOCKING=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_FTRACE is not set
-# CONFIG_ARM_UNWIND is not set
-CONFIG_SECURITYFS=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
-CONFIG_CRC_CCITT=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14-rc1.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14-rc1.config
deleted file mode 120000
index 991c9a7..0000000
--- a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14-rc1.config
+++ /dev/null
@@ -1 +0,0 @@
-apf6q-linux-3.14.config
\ No newline at end of file
hooks/post-receive
--
armadeus
|
|
From: Sébastien S. <ss...@us...> - 2014-02-03 12:54:13
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 60d9d6586bf51c049ebc983432b116c649d71cc5 (commit)
from d08f8d7ada96a645819cedab20bdce965dea67b8 (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 60d9d6586bf51c049ebc983432b116c649d71cc5
Author: Sébastien Szymanski <ss...@us...>
Date: Mon Feb 3 13:54:35 2014 +0100
[LINUX]: apf6q: move to 3.14-rc1
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6q_defconfig | 2 +-
.../armadeus/apf6q/apf6q-linux-3.14-rc1.config | 1 +
...q-linux-3.13.config => apf6q-linux-3.14.config} | 1 -
patches/linux/3.14-rc1 | 1 +
...15-armadeus-logo-add_armadeus-project_tux.patch | 0
.../{3.10 => 3.14}/0021-armadeus-apf9328.patch | 0
...s-apf9328-add_board_to_linux_build_system.patch | 0
.../0025-armadeus-imx-correct_dma_shift.patch | 0
.../0029-armadeus-add_csi_and_spi_registers.patch | 0
.../0029b-armadeus-add_csi_registers.patch | 0
...rmadeus-devices-imx1-add_udc_registration.patch | 0
...35-armadeus-re_add_pwm_and_correct_driver.tofix | 0
...50-armadeus-add_custom_drivers_to_kconfig.patch | 0
.../{3.10 => 3.14}/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
.../0076-Add-tsc210x-device-tree-support.patch | 0
...eus-clock_correct_mxc_decode_pll_for_imx1.tofix | 0
...madeus-clock-imx1_avoid_crash_with_module.tofix | 0
.../0206-c-imx-dts-pin_functions.patch | 0
.../0206-d-linaro-dts-imx27-pinctrl.patch | 0
.../0206-e-linaro-imx27-enable_pinctrl.patch | 0
.../0207-armadeus-apf27dev-add_hog_pinctrl.patch | 0
...madeus-imx27_dtsi-add_framebuffer_pinctrl.patch | 0
...armadeus-imx27-apf27dev-add_imxfb_support.patch | 0
...re_to_setup_PWM_Contrast_Control_Register.patch | 0
.../0213-armadeus-add_cspi_pinctrl.patch | 0
.../0214-armadeus-add_cspi_and_sdhc_pinctrl.patch | 0
...-imx27-apf27dev-add_pinctrl_for_cspi_node.patch | 0
...-armadeus-imx27-apf27dev-add_sdhc_support.patch | 0
...us-apf27-apf27dev-dts-peripherals_pinctrl.patch | 0
...deus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch | 0
...-tsc210x-device-tree-support-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
...-armadeus-fixes-vpu-spll-clock-dependency.patch | 0
.../0322-armadeus-add_mach_fpga_h.patch | 0
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 0
.../0400-Add-apf51-basic-dt-support.patch | 0
.../0401-armadeus-add_apf51dev_baseboard.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-imx51-dts-add-pin-definition-for-uart1.patch | 0
...imx-drm-fix_clk_polarity_for_apf51_screen.patch | 0
...dts-apf51dev-add_gpio_key_wakeup_behavior.patch | 0
.../0420-armadeus-Add-apf28dev-dts.patch | 0
..._otg_phy_clock_directly_to_osc_ref.patch.tofix} | 0
..._star_completion_for_source_in_menuconfig.patch | 0
...low_to_use_the_wakeupalarm_functionnality.patch | 0
...0443-armadeus-apf28-fix_mac_address_issue.patch | 0
.../0444-armadeus-imx27-add-usb.patch.tofix} | 0
...5-armadeus-add-apf27-apf27dev-dts-for-USB.patch | 0
...rmadeus-add-apf6q-and-apf6dl-device-trees.patch | 32 ++-----
...around-fec-tx-queue-timeouts-when-SATA-SD.patch | 0
...inux-0003-ARM-dts-mx6qdl-Add-HDMI-support.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
.../3.14/0497-fix-compilation-of-imx-hdmi.patch | 90 ++++++++++++++++++++
69 files changed, 101 insertions(+), 26 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14-rc1.config
copy buildroot/target/device/armadeus/apf6q/{apf6q-linux-3.13.config => apf6q-linux-3.14.config} (99%)
create mode 120000 patches/linux/3.14-rc1
copy patches/linux/{3.12 => 3.14}/0015-armadeus-logo-add_armadeus-project_tux.patch (100%)
copy patches/linux/{3.10 => 3.14}/0021-armadeus-apf9328.patch (100%)
copy patches/linux/{3.10 => 3.14}/0024-armadeus-apf9328-add_board_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.14}/0025-armadeus-imx-correct_dma_shift.patch (100%)
copy patches/linux/{3.10 => 3.14}/0029-armadeus-add_csi_and_spi_registers.patch (100%)
copy patches/linux/{3.10 => 3.14}/0029b-armadeus-add_csi_registers.patch (100%)
copy patches/linux/{3.10 => 3.14}/0030-armadeus-devices-imx1-add_udc_registration.patch (100%)
copy patches/linux/{3.10 => 3.14}/0035-armadeus-re_add_pwm_and_correct_driver.tofix (100%)
copy patches/linux/{3.10 => 3.14}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
copy patches/linux/{3.10 => 3.14}/0073-armadeus-tsc2102.patch (100%)
copy patches/linux/{3.10 => 3.14}/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.14}/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.14}/0074-armadeus-tsc2102-touchscreen.patch (100%)
copy patches/linux/{3.10 => 3.14}/0075-armadeus-spi2-reg-defines.patch (100%)
copy patches/linux/{3.12 => 3.14}/0076-Add-tsc210x-device-tree-support.patch (100%)
copy patches/linux/{3.10 => 3.14}/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix (100%)
copy patches/linux/{3.10 => 3.14}/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix (100%)
copy patches/linux/{3.12 => 3.14}/0206-c-imx-dts-pin_functions.patch (100%)
copy patches/linux/{3.12 => 3.14}/0206-d-linaro-dts-imx27-pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14}/0206-e-linaro-imx27-enable_pinctrl.patch (100%)
copy patches/linux/{3.11 => 3.14}/0207-armadeus-apf27dev-add_hog_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14}/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch (100%)
copy patches/linux/{3.13 => 3.14}/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch (100%)
copy patches/linux/{3.11 => 3.14}/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch (100%)
copy patches/linux/{3.12 => 3.14}/0213-armadeus-add_cspi_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14}/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14}/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch (100%)
copy patches/linux/{3.12 => 3.14}/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch (100%)
copy patches/linux/{3.12 => 3.14}/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14}/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch (100%)
copy patches/linux/{3.12 => 3.14}/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch (100%)
copy patches/linux/{3.13 => 3.14}/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch (100%)
copy patches/linux/{3.13 => 3.14}/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch (100%)
copy patches/linux/{3.13 => 3.14}/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch (100%)
copy patches/linux/{3.13 => 3.14}/0230-armadeus-fixes-vpu-spll-clock-dependency.patch (100%)
copy patches/linux/{3.10 => 3.14}/0322-armadeus-add_mach_fpga_h.patch (100%)
copy patches/linux/{3.10 => 3.14}/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch (100%)
copy patches/linux/{3.13 => 3.14}/0400-Add-apf51-basic-dt-support.patch (100%)
copy patches/linux/{3.13 => 3.14}/0401-armadeus-add_apf51dev_baseboard.patch (100%)
copy patches/linux/{3.11 => 3.14}/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch (100%)
copy patches/linux/{3.12 => 3.14}/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch (100%)
copy patches/linux/{3.12 => 3.14}/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch (100%)
copy patches/linux/{3.12 => 3.14}/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch (100%)
copy patches/linux/{3.13 => 3.14}/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch (100%)
copy patches/linux/{3.13 => 3.14}/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch (100%)
copy patches/linux/{3.13 => 3.14}/0420-armadeus-Add-apf28dev-dts.patch (100%)
copy patches/linux/{3.11/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch => 3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix} (100%)
copy patches/linux/{3.12 => 3.14}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (100%)
copy patches/linux/{3.10 => 3.14}/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch (100%)
copy patches/linux/{3.12 => 3.14}/0443-armadeus-apf28-fix_mac_address_issue.patch (100%)
copy patches/linux/{3.13/0444-armadeus-imx27-add-usb.patch => 3.14/0444-armadeus-imx27-add-usb.patch.tofix} (100%)
copy patches/linux/{3.13 => 3.14}/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch (100%)
copy patches/linux/{3.13 => 3.14}/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch (87%)
copy patches/linux/{3.12 => 3.14}/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch (100%)
copy patches/linux/{3.12 => 3.14}/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch (100%)
copy patches/linux/{3.12 => 3.14}/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch (100%)
copy patches/linux/{3.13 => 3.14}/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch (100%)
copy patches/linux/{3.13 => 3.14}/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch (100%)
copy patches/linux/{3.13 => 3.14}/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch (100%)
copy patches/linux/{3.13 => 3.14}/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch (100%)
copy patches/linux/{3.13 => 3.14}/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch (100%)
copy patches/linux/{3.13 => 3.14}/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch (100%)
copy patches/linux/{3.13 => 3.14}/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch (100%)
copy patches/linux/{3.13 => 3.14}/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch (100%)
create mode 100644 patches/linux/3.14/0497-fix-compilation-of-imx-hdmi.patch
diff --git a/buildroot/configs/apf6q_defconfig b/buildroot/configs/apf6q_defconfig
index 1556959..badc0a1 100644
--- a/buildroot/configs/apf6q_defconfig
+++ b/buildroot/configs/apf6q_defconfig
@@ -13,7 +13,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.13"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.14-rc1"
BR2_LINUX_KERNEL_PATCH="../patches/linux/$(BR2_LINUX_KERNEL_VERSION)"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14-rc1.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14-rc1.config
new file mode 120000
index 0000000..991c9a7
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14-rc1.config
@@ -0,0 +1 @@
+apf6q-linux-3.14.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14.config
similarity index 99%
copy from buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
copy to buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14.config
index 5fbf6b1..eea7d0a 100644
--- a/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.13.config
+++ b/buildroot/target/device/armadeus/apf6q/apf6q-linux-3.14.config
@@ -247,7 +247,6 @@ CONFIG_DRM_IMX_LDB=y
CONFIG_DRM_IMX_IPUV3_CORE=y
CONFIG_DRM_IMX_IPUV3=y
CONFIG_DRM_IMX_HDMI=y
-CONFIG_COMMON_CLK_DEBUG=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_PWM=y
CONFIG_PWM_IMX=y
diff --git a/patches/linux/3.14-rc1 b/patches/linux/3.14-rc1
new file mode 120000
index 0000000..3767b4b
--- /dev/null
+++ b/patches/linux/3.14-rc1
@@ -0,0 +1 @@
+3.14
\ 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.14/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.14/0015-armadeus-logo-add_armadeus-project_tux.patch
diff --git a/patches/linux/3.10/0021-armadeus-apf9328.patch b/patches/linux/3.14/0021-armadeus-apf9328.patch
similarity index 100%
copy from patches/linux/3.10/0021-armadeus-apf9328.patch
copy to patches/linux/3.14/0021-armadeus-apf9328.patch
diff --git a/patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch b/patches/linux/3.14/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
similarity index 100%
copy from patches/linux/3.10/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
copy to patches/linux/3.14/0024-armadeus-apf9328-add_board_to_linux_build_system.patch
diff --git a/patches/linux/3.10/0025-armadeus-imx-correct_dma_shift.patch b/patches/linux/3.14/0025-armadeus-imx-correct_dma_shift.patch
similarity index 100%
copy from patches/linux/3.10/0025-armadeus-imx-correct_dma_shift.patch
copy to patches/linux/3.14/0025-armadeus-imx-correct_dma_shift.patch
diff --git a/patches/linux/3.10/0029-armadeus-add_csi_and_spi_registers.patch b/patches/linux/3.14/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.14/0029-armadeus-add_csi_and_spi_registers.patch
diff --git a/patches/linux/3.10/0029b-armadeus-add_csi_registers.patch b/patches/linux/3.14/0029b-armadeus-add_csi_registers.patch
similarity index 100%
copy from patches/linux/3.10/0029b-armadeus-add_csi_registers.patch
copy to patches/linux/3.14/0029b-armadeus-add_csi_registers.patch
diff --git a/patches/linux/3.10/0030-armadeus-devices-imx1-add_udc_registration.patch b/patches/linux/3.14/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.14/0030-armadeus-devices-imx1-add_udc_registration.patch
diff --git a/patches/linux/3.10/0035-armadeus-re_add_pwm_and_correct_driver.tofix b/patches/linux/3.14/0035-armadeus-re_add_pwm_and_correct_driver.tofix
similarity index 100%
copy from patches/linux/3.10/0035-armadeus-re_add_pwm_and_correct_driver.tofix
copy to patches/linux/3.14/0035-armadeus-re_add_pwm_and_correct_driver.tofix
diff --git a/patches/linux/3.10/0050-armadeus-add_custom_drivers_to_kconfig.patch b/patches/linux/3.14/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.14/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/3.10/0073-armadeus-tsc2102.patch b/patches/linux/3.14/0073-armadeus-tsc2102.patch
similarity index 100%
copy from patches/linux/3.10/0073-armadeus-tsc2102.patch
copy to patches/linux/3.14/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.14/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.14/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.14/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.14/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.14/0074-armadeus-tsc2102-touchscreen.patch
similarity index 100%
copy from patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch
copy to patches/linux/3.14/0074-armadeus-tsc2102-touchscreen.patch
diff --git a/patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch b/patches/linux/3.14/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.14/0075-armadeus-spi2-reg-defines.patch
diff --git a/patches/linux/3.12/0076-Add-tsc210x-device-tree-support.patch b/patches/linux/3.14/0076-Add-tsc210x-device-tree-support.patch
similarity index 100%
copy from patches/linux/3.12/0076-Add-tsc210x-device-tree-support.patch
copy to patches/linux/3.14/0076-Add-tsc210x-device-tree-support.patch
diff --git a/patches/linux/3.10/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix b/patches/linux/3.14/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.14/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix
diff --git a/patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix b/patches/linux/3.14/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
similarity index 100%
copy from patches/linux/3.10/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
copy to patches/linux/3.14/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
diff --git a/patches/linux/3.12/0206-c-imx-dts-pin_functions.patch b/patches/linux/3.14/0206-c-imx-dts-pin_functions.patch
similarity index 100%
copy from patches/linux/3.12/0206-c-imx-dts-pin_functions.patch
copy to patches/linux/3.14/0206-c-imx-dts-pin_functions.patch
diff --git a/patches/linux/3.12/0206-d-linaro-dts-imx27-pinctrl.patch b/patches/linux/3.14/0206-d-linaro-dts-imx27-pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0206-d-linaro-dts-imx27-pinctrl.patch
copy to patches/linux/3.14/0206-d-linaro-dts-imx27-pinctrl.patch
diff --git a/patches/linux/3.12/0206-e-linaro-imx27-enable_pinctrl.patch b/patches/linux/3.14/0206-e-linaro-imx27-enable_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0206-e-linaro-imx27-enable_pinctrl.patch
copy to patches/linux/3.14/0206-e-linaro-imx27-enable_pinctrl.patch
diff --git a/patches/linux/3.11/0207-armadeus-apf27dev-add_hog_pinctrl.patch b/patches/linux/3.14/0207-armadeus-apf27dev-add_hog_pinctrl.patch
similarity index 100%
copy from patches/linux/3.11/0207-armadeus-apf27dev-add_hog_pinctrl.patch
copy to patches/linux/3.14/0207-armadeus-apf27dev-add_hog_pinctrl.patch
diff --git a/patches/linux/3.12/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch b/patches/linux/3.14/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
copy to patches/linux/3.14/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
diff --git a/patches/linux/3.13/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch b/patches/linux/3.14/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
similarity index 100%
copy from patches/linux/3.13/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
copy to patches/linux/3.14/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
diff --git a/patches/linux/3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch b/patches/linux/3.14/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
similarity index 100%
copy from patches/linux/3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
copy to patches/linux/3.14/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
diff --git a/patches/linux/3.12/0213-armadeus-add_cspi_pinctrl.patch b/patches/linux/3.14/0213-armadeus-add_cspi_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0213-armadeus-add_cspi_pinctrl.patch
copy to patches/linux/3.14/0213-armadeus-add_cspi_pinctrl.patch
diff --git a/patches/linux/3.12/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch b/patches/linux/3.14/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch
copy to patches/linux/3.14/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch
diff --git a/patches/linux/3.12/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch b/patches/linux/3.14/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
similarity index 100%
copy from patches/linux/3.12/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
copy to patches/linux/3.14/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
diff --git a/patches/linux/3.12/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch b/patches/linux/3.14/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
similarity index 100%
copy from patches/linux/3.12/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
copy to patches/linux/3.14/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
diff --git a/patches/linux/3.12/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch b/patches/linux/3.14/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch
copy to patches/linux/3.14/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch
diff --git a/patches/linux/3.12/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch b/patches/linux/3.14/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch
similarity index 100%
copy from patches/linux/3.12/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch
copy to patches/linux/3.14/0218-armadeus-apf27dev-add_pwm0_pin_to_hog_pinctrl.patch
diff --git a/patches/linux/3.12/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch b/patches/linux/3.14/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
similarity index 100%
copy from patches/linux/3.12/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
copy to patches/linux/3.14/0219-Add-tsc210x-device-tree-support-for-apf27dev.patch
diff --git a/patches/linux/3.13/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch b/patches/linux/3.14/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
similarity index 100%
copy from patches/linux/3.13/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
copy to patches/linux/3.14/0220-armadeus-dts-apf27dev-fixes-user-led-polarity.patch
diff --git a/patches/linux/3.13/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch b/patches/linux/3.14/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
similarity index 100%
copy from patches/linux/3.13/0221-armadeus-dts-apf27-add_i2c_eeprom_24c02.patch
copy to patches/linux/3.14/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.14/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.14/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
diff --git a/patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch b/patches/linux/3.14/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
similarity index 100%
copy from patches/linux/3.13/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
copy to patches/linux/3.14/0230-armadeus-fixes-vpu-spll-clock-dependency.patch
diff --git a/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.14/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.14/0322-armadeus-add_mach_fpga_h.patch
diff --git a/patches/linux/3.10/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.14/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
similarity index 100%
copy from patches/linux/3.10/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
copy to patches/linux/3.14/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
diff --git a/patches/linux/3.13/0400-Add-apf51-basic-dt-support.patch b/patches/linux/3.14/0400-Add-apf51-basic-dt-support.patch
similarity index 100%
copy from patches/linux/3.13/0400-Add-apf51-basic-dt-support.patch
copy to patches/linux/3.14/0400-Add-apf51-basic-dt-support.patch
diff --git a/patches/linux/3.13/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.14/0401-armadeus-add_apf51dev_baseboard.patch
similarity index 100%
copy from patches/linux/3.13/0401-armadeus-add_apf51dev_baseboard.patch
copy to patches/linux/3.14/0401-armadeus-add_apf51dev_baseboard.patch
diff --git a/patches/linux/3.11/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch b/patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
similarity index 100%
copy from patches/linux/3.11/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
copy to patches/linux/3.14/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch
diff --git a/patches/linux/3.12/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch b/patches/linux/3.14/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
similarity index 100%
copy from patches/linux/3.12/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch
copy to patches/linux/3.14/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.14/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.14/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
diff --git a/patches/linux/3.12/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch b/patches/linux/3.14/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
similarity index 100%
copy from patches/linux/3.12/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
copy to patches/linux/3.14/0412-armadeus-imx51-dts-add-pin-definition-for-uart1.patch
diff --git a/patches/linux/3.13/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch b/patches/linux/3.14/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch
similarity index 100%
copy from patches/linux/3.13/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch
copy to patches/linux/3.14/0413-armadeus-imx-drm-fix_clk_polarity_for_apf51_screen.patch
diff --git a/patches/linux/3.13/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.14/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
similarity index 100%
copy from patches/linux/3.13/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
copy to patches/linux/3.14/0414-armadeus-dts-apf51dev-add_gpio_key_wakeup_behavior.patch
diff --git a/patches/linux/3.13/0420-armadeus-Add-apf28dev-dts.patch b/patches/linux/3.14/0420-armadeus-Add-apf28dev-dts.patch
similarity index 100%
copy from patches/linux/3.13/0420-armadeus-Add-apf28dev-dts.patch
copy to patches/linux/3.14/0420-armadeus-Add-apf28dev-dts.patch
diff --git a/patches/linux/3.11/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch b/patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix
similarity index 100%
copy from patches/linux/3.11/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch
copy to patches/linux/3.14/0431-armadeus-clock-mx51-do_not_link_otg_phy_clock_directly_to_osc_ref.patch.tofix
diff --git a/patches/linux/3.12/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch b/patches/linux/3.14/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.14/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.14/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.14/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
diff --git a/patches/linux/3.12/0443-armadeus-apf28-fix_mac_address_issue.patch b/patches/linux/3.14/0443-armadeus-apf28-fix_mac_address_issue.patch
similarity index 100%
copy from patches/linux/3.12/0443-armadeus-apf28-fix_mac_address_issue.patch
copy to patches/linux/3.14/0443-armadeus-apf28-fix_mac_address_issue.patch
diff --git a/patches/linux/3.13/0444-armadeus-imx27-add-usb.patch b/patches/linux/3.14/0444-armadeus-imx27-add-usb.patch.tofix
similarity index 100%
copy from patches/linux/3.13/0444-armadeus-imx27-add-usb.patch
copy to patches/linux/3.14/0444-armadeus-imx27-add-usb.patch.tofix
diff --git a/patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch b/patches/linux/3.14/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
similarity index 100%
copy from patches/linux/3.13/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
copy to patches/linux/3.14/0445-armadeus-add-apf27-apf27dev-dts-for-USB.patch
diff --git a/patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch b/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
similarity index 87%
copy from patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
copy to patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
index 97b773f..0568d50 100644
--- a/patches/linux/3.13/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
+++ b/patches/linux/3.14/0450-armadeus-add-apf6q-and-apf6dl-device-trees.patch
@@ -1,23 +1,7 @@
-Index: linux-3.13/arch/arm/boot/dts/Makefile
-===================================================================
---- linux-3.13.orig/arch/arm/boot/dts/Makefile
-+++ linux-3.13/arch/arm/boot/dts/Makefile
-@@ -136,9 +136,11 @@ dtb-$(CONFIG_ARCH_MXC) += \
- imx53-mba53.dtb \
- imx53-qsb.dtb \
- imx53-smd.dtb \
-+ imx6dl-apf6dev.dtb \
- imx6dl-sabreauto.dtb \
- imx6dl-sabresd.dtb \
- imx6dl-wandboard.dtb \
-+ imx6q-apf6dev.dtb \
- imx6q-arm2.dtb \
- imx6q-phytec-pbab01.dtb \
- imx6q-sabreauto.dtb \
-Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+Index: linux-3.14-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
++++ linux-3.14-rc1/arch/arm/boot/dts/imx6q-apf6dev.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -47,10 +31,10 @@ Index: linux-3.13/arch/arm/boot/dts/imx6q-apf6dev.dts
+&sata {
+ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
===================================================================
--- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
++++ linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6.dtsi
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -128,10 +112,10 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6.dtsi
+ //non-removable;
+ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+Index: linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
===================================================================
--- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
++++ linux-3.14-rc1/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2014 Armadeus Systems
@@ -295,10 +279,10 @@ Index: linux-3.13/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+ cd-gpios = <&gpio1 2 0>;
+ status = "okay";
+};
-Index: linux-3.13/arch/arm/boot/dts/imx6dl-apf6dev.dts
+Index: linux-3.14-rc1/arch/arm/boot/dts/imx6dl-apf6dev.dts
===================================================================
--- /dev/null
-+++ linux-3.13/arch/arm/boot/dts/imx6dl-apf6dev.dts
++++ linux-3.14-rc1/arch/arm/boot/dts/imx6dl-apf6dev.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 Armadeus Systems
diff --git a/patches/linux/3.12/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch b/patches/linux/3.14/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
similarity index 100%
copy from patches/linux/3.12/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
copy to patches/linux/3.14/0453-linux-0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch
diff --git a/patches/linux/3.12/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch b/patches/linux/3.14/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
similarity index 100%
copy from patches/linux/3.12/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
copy to patches/linux/3.14/0455-linux-0003-ARM-dts-mx6qdl-Add-HDMI-support.patch
diff --git a/patches/linux/3.12/0480-RFC-mmc-core-Update-ext_csd-if-touched-by-ioctl.patch b/patches/linux/3.14/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.14/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.14/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.14/0490-imx6qdl-wlcore_remove_quirk_to_hide_irq_flag.patch
diff --git a/patches/linux/3.13/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch b/patches/linux/3.14/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
similarity index 100%
copy from patches/linux/3.13/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
copy to patches/linux/3.14/0491-v4-3-8-wlcore-remove-pwr_in_suspend-from-platform-data.patch
diff --git a/patches/linux/3.13/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch b/patches/linux/3.14/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
similarity index 100%
copy from patches/linux/3.13/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
copy to patches/linux/3.14/0492-v4-4-8-wl12xx-use-frequency-instead-of-enumerations-for-pdata-clocks.patch
diff --git a/patches/linux/3.13/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch b/patches/linux/3.14/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
similarity index 100%
copy from patches/linux/3.13/0493-v4-5-8-wlcore-add-initial-device-tree-support-to-the-sdio-module.patch
copy to patches/linux/3.14/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.14/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.14/0494-v4-6-8-wlcore-sdio-add-wilink-clock-providers.patch
diff --git a/patches/linux/3.13/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch b/patches/linux/3.14/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
similarity index 100%
copy from patches/linux/3.13/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
copy to patches/linux/3.14/0495-v4-7-8-wlcore-sdio-get-clocks-from-device-tree.patch
diff --git a/patches/linux/3.13/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch b/patches/linux/3.14/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
similarity index 100%
copy from patches/linux/3.13/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
copy to patches/linux/3.14/0495-v4-8-8-wlcore-wl12xx-check-if-we-got-correct-clock-data-from-DT.patch
diff --git a/patches/linux/3.13/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch b/patches/linux/3.14/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
similarity index 100%
copy from patches/linux/3.13/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
copy to patches/linux/3.14/0496-v3-Documentation-dt-bindings-TI-WiLink-modules.patch
diff --git a/patches/linux/3.14/0497-fix-compilation-of-imx-hdmi.patch b/patches/linux/3.14/0497-fix-compilation-of-imx-hdmi.patch
new file mode 100644
index 0000000..fc379a9
--- /dev/null
+++ b/patches/linux/3.14/0497-fix-compilation-of-imx-hdmi.patch
@@ -0,0 +1,90 @@
+From patchwork Thu Jan 30 16:13:47 2014
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: fix compilation of imx-hdmi
+From: Russell King - ARM Linux <li...@ar...>
+X-Patchwork-Id: 3558181
+Message-Id: <201...@n2...>
+To: Fabio Estevam <fab...@fr...>, sha...@li...
+Cc: David Airlie <ai...@li...>, Daniel Vetter <dan...@ff...>,
+ lin...@li..., dri...@li...
+Date: Thu, 30 Jan 2014 16:13:47 +0000
+
+imx-hdmi creates a hdmi_colorimetry enum. This is also defined by
+include/linux/hdmi.h, which gets included now via DRM headers since
+985e5dc207e133 (drm/edid: Populate picture aspect ratio for CEA modes).
+This leads to the compiler complaining:
+
+drivers/staging/imx-drm/imx-hdmi.c:58:6: error: nested redefinition of 'enum hdmi_colorimetry'
+drivers/staging/imx-drm/imx-hdmi.c:58:6: error: redeclaration of 'enum hdmi_colorimetry'
+include/linux/hdmi.h:48:6: note: originally defined here
+
+Fix it by using the one in linux/hdmi.h
+
+Signed-off-by: Russell King <rmk...@ar...>
+
+---
+drivers/staging/imx-drm/imx-hdmi.c | 17 ++++++-----------
+ 1 file changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/staging/imx-drm/imx-hdmi.c b/drivers/staging/imx-drm/imx-hdmi.c
+index d358d89e11c4..74d635fcb3d5 100644
+--- a/drivers/staging/imx-drm/imx-hdmi.c
++++ b/drivers/staging/imx-drm/imx-hdmi.c
+@@ -55,11 +55,6 @@ enum hdmi_datamap {
+ YCbCr422_12B = 0x12,
+ };
+
+-enum hdmi_colorimetry {
+- ITU601,
+- ITU709,
+-};
+-
+ enum imx_hdmi_devtype {
+ IMX6Q_HDMI,
+ IMX6DL_HDMI,
+@@ -475,12 +470,12 @@ static void imx_hdmi_update_csc_coeffs(struct imx_hdmi *hdmi)
+
+ if (is_color_space_conversion(hdmi)) {
+ if (hdmi->hdmi_data.enc_out_format == RGB) {
+- if (hdmi->hdmi_data.colorimetry == ITU601)
++ if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601)
+ csc_coeff = &csc_coeff_rgb_out_eitu601;
+ else
+ csc_coeff = &csc_coeff_rgb_out_eitu709;
+ } else if (hdmi->hdmi_data.enc_in_format == RGB) {
+- if (hdmi->hdmi_data.colorimetry == ITU601)
++ if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601)
+ csc_coeff = &csc_coeff_rgb_in_eitu601;
+ else
+ csc_coeff = &csc_coeff_rgb_in_eitu709;
+@@ -1009,14 +1004,14 @@ static void hdmi_config_AVI(struct imx_hdmi *hdmi)
+ /* Set up colorimetry */
+ if (hdmi->hdmi_data.enc_out_format == XVYCC444) {
+ colorimetry = HDMI_FC_AVICONF1_COLORIMETRY_EXTENDED_INFO;
+- if (hdmi->hdmi_data.colorimetry == ITU601)
++ if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601)
+ ext_colorimetry =
+ HDMI_FC_AVICONF2_EXT_COLORIMETRY_XVYCC601;
+ else /* hdmi->hdmi_data.colorimetry == ITU709 */
+ ext_colorimetry =
+ HDMI_FC_AVICONF2_EXT_COLORIMETRY_XVYCC709;
+ } else if (hdmi->hdmi_data.enc_out_format != RGB) {
+- if (hdmi->hdmi_data.colorimetry == ITU601)
++ if (hdmi->hdmi_data.colorimetry == HDMI_COLORIMETRY_ITU_601)
+ colorimetry = HDMI_FC_AVICONF1_COLORIMETRY_SMPTE;
+ else /* hdmi->hdmi_data.colorimetry == ITU709 */
+ colorimetry = HDMI_FC_AVICONF1_COLORIMETRY_ITUR;
+@@ -1247,9 +1242,9 @@ static int imx_hdmi_setup(struct imx_hdmi *hdmi, struct drm_display_mode *mode)
+ (hdmi->vic == 21) || (hdmi->vic == 22) ||
+ (hdmi->vic == 2) || (hdmi->vic == 3) ||
+ (hdmi->vic == 17) || (hdmi->vic == 18))
+- hdmi->hdmi_data.colorimetry = ITU601;
++ hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_601;
+ else
+- hdmi->hdmi_data.colorimetry = ITU709;
++ hdmi->hdmi_data.colorimetry = HDMI_COLORIMETRY_ITU_709;
+
+ if ((hdmi->vic == 10) || (hdmi->vic == 11) ||
+ (hdmi->vic == 12) || (hdmi->vic == 13) ||
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2014-02-01 00:11: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 d08f8d7ada96a645819cedab20bdce965dea67b8 (commit)
from d28349106bbffebe8afdf1aa0fc459a7f48ef0ab (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 d08f8d7ada96a645819cedab20bdce965dea67b8
Author: Eric Jarrige <eri...@ar...>
Date: Sat Feb 1 01:11:09 2014 +0100
[LINUX] 3.13: apf27dev: change apf27 to apf27dev in patch description
-----------------------------------------------------------------------
Summary of changes:
...ts-apf27dev-add_gpio_key_wakeup_behavior.patch} | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
rename patches/linux/3.13/{0222-armadeus-dts-apf27-add_gpio_key_wakeup_behavior.patch => 0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch} (89%)
diff --git a/patches/linux/3.13/0222-armadeus-dts-apf27-add_gpio_key_wakeup_behavior.patch b/patches/linux/3.13/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
similarity index 89%
rename from patches/linux/3.13/0222-armadeus-dts-apf27-add_gpio_key_wakeup_behavior.patch
rename to patches/linux/3.13/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
index 000e58c..b030473 100644
--- a/patches/linux/3.13/0222-armadeus-dts-apf27-add_gpio_key_wakeup_behavior.patch
+++ b/patches/linux/3.13/0222-armadeus-dts-apf27dev-add_gpio_key_wakeup_behavior.patch
@@ -1,4 +1,4 @@
-add wakeup capabilities to the apf27 user button
+add wakeup capabilities to the apf27dev user button
Signed-off-by: Eric Jarrige <eri...@ar...>
hooks/post-receive
--
armadeus
|
