armadeus-commitlog Mailing List for armadeus (Page 55)
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: Julien B a. A. <ar...@us...> - 2013-10-05 08:28: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 79bc36f0e3213c18042230acf6ad9bd056d53063 (commit)
from 0ec08aed9aa80594b175b7a0ee3aa1f972ffbcc2 (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 79bc36f0e3213c18042230acf6ad9bd056d53063
Author: Julien Boibessot <jul...@ar...>
Date: Sat Oct 5 10:28:21 2013 +0200
[LINUX] Add possibility to use 3.11.3 kernels on APF51
-----------------------------------------------------------------------
Summary of changes:
...nux-3.11.2.config => apf51-linux-3.11.3.config} | 0
patches/linux/{3.11.2 => 3.11.3} | 0
2 files changed, 0 insertions(+), 0 deletions(-)
copy buildroot/target/device/armadeus/apf51/{apf51-linux-3.11.2.config => apf51-linux-3.11.3.config} (100%)
copy patches/linux/{3.11.2 => 3.11.3} (100%)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.11.2.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.11.3.config
similarity index 100%
copy from buildroot/target/device/armadeus/apf51/apf51-linux-3.11.2.config
copy to buildroot/target/device/armadeus/apf51/apf51-linux-3.11.3.config
diff --git a/patches/linux/3.11.2 b/patches/linux/3.11.3
similarity index 100%
copy from patches/linux/3.11.2
copy to patches/linux/3.11.3
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-10-05 08:16: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 0ec08aed9aa80594b175b7a0ee3aa1f972ffbcc2 (commit)
via 80c039ecab5c8c51e6156f12d878b473c99e7d91 (commit)
from 7edacdb643835d4a88ee5884747e7f8909286090 (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 0ec08aed9aa80594b175b7a0ee3aa1f972ffbcc2
Author: Julien Boibessot <jul...@ar...>
Date: Sat Oct 5 10:16:18 2013 +0200
[LINUX] 3.11: Add support for mcp7940x RTC
commit 80c039ecab5c8c51e6156f12d878b473c99e7d91
Author: Julien Boibessot <jul...@ar...>
Date: Sat Oct 5 10:10:54 2013 +0200
[LINUX] Common: Makes mcp7940x RTC driver also works on recent kernels
-----------------------------------------------------------------------
Summary of changes:
.../0450-armadeus-add_mcp7940x_rtc_driver.patch} | 0
.../0450b-armadeus-add_mcp7940x_rtc_driver.patch} | 20 +++++-----
.../000-armadeus-add_mcp7940x_rtc_driver.patch | 42 ++++++++++++-------
3 files changed, 36 insertions(+), 26 deletions(-)
copy patches/linux/{2.6.35/464-armadeus-add_mcp7940x_rtc_driver.patch => 3.11/0450-armadeus-add_mcp7940x_rtc_driver.patch} (100%)
copy patches/linux/{2.6.38/450b-armadeus-add_mcp7940x_rtc_driver.patch => 3.11/0450b-armadeus-add_mcp7940x_rtc_driver.patch} (65%)
diff --git a/patches/linux/2.6.35/464-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/3.11/0450-armadeus-add_mcp7940x_rtc_driver.patch
similarity index 100%
copy from patches/linux/2.6.35/464-armadeus-add_mcp7940x_rtc_driver.patch
copy to patches/linux/3.11/0450-armadeus-add_mcp7940x_rtc_driver.patch
diff --git a/patches/linux/2.6.38/450b-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/3.11/0450b-armadeus-add_mcp7940x_rtc_driver.patch
similarity index 65%
copy from patches/linux/2.6.38/450b-armadeus-add_mcp7940x_rtc_driver.patch
copy to patches/linux/3.11/0450b-armadeus-add_mcp7940x_rtc_driver.patch
index 047d916..c52861a 100644
--- a/patches/linux/2.6.38/450b-armadeus-add_mcp7940x_rtc_driver.patch
+++ b/patches/linux/3.11/0450b-armadeus-add_mcp7940x_rtc_driver.patch
@@ -1,14 +1,14 @@
-Add mcp79400 Linux driver for kernel 2.6.38
+Add mcp79400 Linux driver for 3.11 kernel
Signed-off-by: Fabien Marteau <fab...@ar...>
---
-Index: linux-2.6.38.8/drivers/rtc/Kconfig
+Index: linux/drivers/rtc/Kconfig
===================================================================
---- linux-2.6.38.8.orig/drivers/rtc/Kconfig 2012-11-16 17:52:01.000000000 +0100
-+++ linux-2.6.38.8/drivers/rtc/Kconfig 2012-11-16 17:54:51.000000000 +0100
-@@ -282,6 +282,17 @@
+--- linux.orig/drivers/rtc/Kconfig 2012-11-16 17:52:01.000000000 +0100
++++ linux/drivers/rtc/Kconfig 2012-11-16 17:54:51.000000000 +0100
+@@ -371,6 +371,17 @@
If you say Y here you will get support for the
watchdog timer in the ST M41T60 and M41T80 RTC chips series.
@@ -26,13 +26,13 @@ Index: linux-2.6.38.8/drivers/rtc/Kconfig
config RTC_DRV_BQ32K
tristate "TI BQ32000"
help
-Index: linux-2.6.38.8/drivers/rtc/Makefile
+Index: linux/drivers/rtc/Makefile
===================================================================
---- linux-2.6.38.8.orig/drivers/rtc/Makefile 2012-11-16 17:51:56.000000000 +0100
-+++ linux-2.6.38.8/drivers/rtc/Makefile 2012-11-16 17:52:28.000000000 +0100
-@@ -64,6 +64,7 @@
- obj-$(CONFIG_RTC_DRV_MAX8998) += rtc-max8998.o
+--- linux.orig/drivers/rtc/Makefile 2012-11-16 17:51:56.000000000 +0100
++++ linux/drivers/rtc/Makefile 2012-11-16 17:52:28.000000000 +0100
+@@ -76,6 +76,7 @@
obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-max6902.o
+ obj-$(CONFIG_RTC_DRV_MAX77686) += rtc-max77686.o
obj-$(CONFIG_RTC_DRV_MC13XXX) += rtc-mc13xxx.o
+obj-$(CONFIG_RTC_DRV_MCP7940X) += rtc-mcp7940x.o
obj-$(CONFIG_RTC_DRV_MSM6242) += rtc-msm6242.o
diff --git a/patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch
index ed929ad..fef2f0b 100644
--- a/patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch
+++ b/patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch
@@ -3,11 +3,11 @@ Add mcp79400 Linux driver
Signed-off-by: Fabien Marteau <fab...@ar...>
---
-Index: linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c
+Index: linux-3.11.1/drivers/rtc/rtc-mcp7940x.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c 2013-07-22 14:48:37.045061568 +0200
-@@ -0,0 +1,501 @@
++++ linux-3.11.1/drivers/rtc/rtc-mcp7940x.c 2013-10-05 09:29:52.179513345 +0200
+@@ -0,0 +1,511 @@
+/*
+ * RTC client/driver for the Microchip MCP7940x Real-Time Clock over I2C
+ *
@@ -34,6 +34,7 @@ Index: linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c
+#include <linux/rtc.h>
+#include <linux/bcd.h>
+#include <linux/slab.h>
++#include <linux/version.h> /* LINUX_VERSION_CODE */
+
+/* Time of Day */
+#define MCP7940X_REG_TD_SECONDS 0x00
@@ -102,6 +103,7 @@ Index: linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c
+
+static struct i2c_driver mcp7940x_driver;
+
++#if 0
+static void mcp7940x_reg_dump(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
@@ -137,6 +139,7 @@ Index: linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c
+ printk(" MCP7940X_REG_TS1_DATE (0x%02X) -> 0x%02X\n", MCP7940X_REG_TS1_DATE ,i2c_smbus_read_byte_data(client,MCP7940X_REG_TS1_DATE));
+ printk(" MCP7940X_REG_TS1_MONTH (0x%02X) -> 0x%02X\n", MCP7940X_REG_TS1_MONTH ,i2c_smbus_read_byte_data(client,MCP7940X_REG_TS1_MONTH));
+}
++#endif
+
+static int mcp7940x_read_time(struct device *dev, struct rtc_time *time)
+{
@@ -367,28 +370,26 @@ Index: linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c
+ return 0;
+}
+
-+
+/* TODO: see rtc-ds1511.c */
+static int mcp79400_alarm_irq_enable(struct device *dev, unsigned int enabled)
+{
+ return 0;
+}
+
-+static int mcp79400_update_irq_enable(struct device *dev, unsigned int enabled)
-+{
-+ return 0;
-+}
-+
-+
+static const struct rtc_class_ops mcp7940x_rtc_ops = {
-+ .read_time = mcp7940x_read_time,
-+ .set_time = mcp7940x_set_time,
-+ .read_alarm = mcp79400_read_alarm, /* Use ALARM0 only */
-+ .set_alarm = mcp79400_set_alarm,
-+ .alarm_irq_enable= mcp79400_alarm_irq_enable,
-+ .update_irq_enable=mcp79400_update_irq_enable,
++ .read_time = mcp7940x_read_time,
++ .set_time = mcp7940x_set_time,
++ .read_alarm = mcp79400_read_alarm, /* Use ALARM0 only */
++ .set_alarm = mcp79400_set_alarm,
++ .alarm_irq_enable = mcp79400_alarm_irq_enable,
+};
+
++static const struct of_device_id mcp7940x_rtc_dt_match[] = {
++ { .compatible = "microchip,mcp7940x-rtc", },
++ { /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(of, mcp7940x_rtc_dt_match);
++
+static int mcp7940x_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+{
@@ -457,7 +458,11 @@ Index: linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c
+ return ret;
+}
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)
+static int __devexit mcp7940x_remove(struct i2c_client *client)
++#else
++static int __exit mcp7940x_remove(struct i2c_client *client)
++#endif
+{
+ struct mcp7940x *mcp7940x = i2c_get_clientdata(client);
+
@@ -485,11 +490,16 @@ Index: linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c
+ .driver = {
+ .name = "rtc-mcp7940x",
+ .owner = THIS_MODULE,
++ .of_match_table = mcp7940x_rtc_dt_match,
+ },
+ .probe = mcp7940x_probe,
+ .suspend = mcp7940x_suspend,
+ .resume = mcp7940x_resume,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)
+ .remove = __devexit_p(mcp7940x_remove),
++#else
++ .remove = __exit_p(mcp7940x_remove),
++#endif
+ .id_table = mcp7940x_id,
+};
+
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2013-10-02 16:42:46
|
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 7edacdb643835d4a88ee5884747e7f8909286090 (commit)
from 53de875f7e20be1fcbb1e2a824c89e803331c261 (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 7edacdb643835d4a88ee5884747e7f8909286090
Author: Cedric Grimault <ced...@eo...>
Date: Wed Oct 2 18:41:58 2013 +0200
arm/imx/gpio: add spinlock protection
Signed-off-by: Fabien Marteau <fab...@ar...>
-----------------------------------------------------------------------
Summary of changes:
...367-armadeus-gpio-add_spinlock_protection.patch | 71 ++++++++++++++++++++
1 files changed, 71 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/2.6.29/367-armadeus-gpio-add_spinlock_protection.patch
diff --git a/patches/linux/2.6.29/367-armadeus-gpio-add_spinlock_protection.patch b/patches/linux/2.6.29/367-armadeus-gpio-add_spinlock_protection.patch
new file mode 100644
index 0000000..4f882db
--- /dev/null
+++ b/patches/linux/2.6.29/367-armadeus-gpio-add_spinlock_protection.patch
@@ -0,0 +1,71 @@
+arm/imx/gpio: add spinlock protection
+
+The GPIO registers need protection from concurrent access for operations that
+are not atomic.
+
+Signed-off-by: Cedric Grimault <ced...@eo...>
+---
+Index: linux-2.6.29.6/arch/arm/plat-mxc/gpio.c
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/plat-mxc/gpio.c 2013-10-02 18:17:01.677641997 +0200
++++ linux-2.6.29.6/arch/arm/plat-mxc/gpio.c 2013-10-02 18:33:30.973612766 +0200
+@@ -216,13 +216,16 @@
+ struct mxc_gpio_port *port =
+ container_of(chip, struct mxc_gpio_port, chip);
+ u32 l;
++ unsigned long flags;
+
++ spin_lock_irqsave(port->lock, flags);
+ l = __raw_readl(port->base + GPIO_GDIR);
+ if (dir)
+ l |= 1 << offset;
+ else
+ l &= ~(1 << offset);
+ __raw_writel(l, port->base + GPIO_GDIR);
++ spin_unlock_irqrestore(port->lock, flags);
+ }
+
+ static void mxc_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
+@@ -231,9 +234,12 @@
+ container_of(chip, struct mxc_gpio_port, chip);
+ void __iomem *reg = port->base + GPIO_DR;
+ u32 l;
++ unsigned long flags;
+
++ spin_lock_irqsave(port->lock, flags);
+ l = (__raw_readl(reg) & (~(1 << offset))) | ((value?1:0) << offset);
+ __raw_writel(l, reg);
++ spin_unlock_irqrestore(port->lock, flags);
+ }
+
+ static int mxc_gpio_get(struct gpio_chip *chip, unsigned offset)
+@@ -311,6 +317,9 @@
+ port[i].chip.base = i * 32;
+ port[i].chip.ngpio = 32;
+
++ /* Init the port lock */
++ spin_lock_init(&port[i].lock);
++
+ /* its a serious configuration bug when it fails */
+ BUG_ON( gpiochip_add(&port[i].chip) < 0 );
+
+Index: linux-2.6.29.6/arch/arm/plat-mxc/include/mach/gpio.h
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/plat-mxc/include/mach/gpio.h 2013-10-02 18:17:00.829642022 +0200
++++ linux-2.6.29.6/arch/arm/plat-mxc/include/mach/gpio.h 2013-10-02 18:34:28.109611079 +0200
+@@ -21,6 +21,7 @@
+
+ #include <mach/hardware.h>
+ #include <asm-generic/gpio.h>
++#include <linux/spinlock.h>
+
+ /* use gpiolib dispatchers */
+ #define gpio_get_value __gpio_get_value
+@@ -36,6 +37,7 @@
+ int virtual_irq_start;
+ struct gpio_chip chip;
+ u32 both_edges;
++ spinlock_t lock;
+ };
+
+ int mxc_gpio_init(struct mxc_gpio_port*, int);
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-10-02 12:03:27
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 53de875f7e20be1fcbb1e2a824c89e803331c261 (commit)
via 1427fe5a0b62fa5f803c8b6702ada7d380ed57d5 (commit)
from 20203901d65cb89087d64815beb983853a1214dd (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 53de875f7e20be1fcbb1e2a824c89e803331c261
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 2 14:15:42 2013 +0200
[TOOLS] apf51: Fix U-Boot recover tool capabilities to reset env variables - enhance to download U-Boot binary image from our server
commit 1427fe5a0b62fa5f803c8b6702ada7d380ed57d5
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 2 14:13:44 2013 +0200
[UBOOT] apf51: 2013.04: make it compatible with recover tool
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch | 2 +-
software/uboot_recover/apf51_recover.py | 30 ++++++++++++++-----
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch b/patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch
index db96176..691d359 100644
--- a/patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch
+++ b/patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch
@@ -17,7 +17,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
$(OBJTREE)/u-boot-with-nand-spl.imx: $(OBJTREE)/SPL $(OBJTREE)/u-boot.bin
- (echo -ne '\x00\x00\x00\x00\x46\x43\x42\x20\x01' && \
-+ (echo -ne '\xFE\x0F\x00\xEA\x46\x43\x42\x20\x01' && \
++ (echo -ne '\xFE\x0F\x00\xEA\xFD\x0F\x00\xEA\x01' && \
dd bs=1015 count=1 if=/dev/zero 2>/dev/null) | \
cat - $< > $(OBJTREE)/spl/u-boot-nand-spl.imx
$(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SPL_PAD_TO) \
diff --git a/software/uboot_recover/apf51_recover.py b/software/uboot_recover/apf51_recover.py
index f56430d..fb7e7b5 100644
--- a/software/uboot_recover/apf51_recover.py
+++ b/software/uboot_recover/apf51_recover.py
@@ -428,7 +428,7 @@ class UBoot:
def resetEnv(self):
self.serial.flushInput()
- self.serial.write("run flash_reset_env\n")
+ self.serial.write("env default -f && saveenv && echo Flash environment variables erased!\n")
return self.__getOutput()
def waitForPrompt(self):
@@ -523,9 +523,23 @@ if __name__ == "__main__":
apfBootloader.get("9000001C", "4", "l")
apfBootloader.get("90000024", "4", "l")
+ RECOVERY_URL = "http://sourceforge.net/projects/armadeus/files/armadeus/"
+ RECOVERY_VERSION = "armadeus-5.2"
+ RECOVERY_BOARD_PATH = "binaries/apf51/"
+ UBOOT_IMAGE_BIN = "apf51-u-boot-nand.bin"
+ UBOOT_RECOVERY_PATH = RECOVERY_URL+RECOVERY_VERSION+"/"+RECOVERY_BOARD_PATH+UBOOT_IMAGE_BIN+"/download"
+ if not os.path.exists(UBOOT_IMAGE_BIN):
+ try:
+ print "Downloading " + UBOOT_IMAGE_BIN + ".."
+ os.system("wget -O "+ UBOOT_IMAGE_BIN + " " +UBOOT_RECOVERY_PATH)
+ except Exception, msg:
+ print "Failed to download U-Boot image file from server!"
+ print msg
+ print "Server may be unavailable for the momenet. please try later."
+ os.remove(UBOOT_IMAGE_BIN);
+ sys.exit()
SPEED = 115200
- BINARY = "apf51-u-boot-nand.bin"
print "\n--- APF51 Bootstrap Tool ---\n"
print "Procedure to follow:"
@@ -534,7 +548,7 @@ if __name__ == "__main__":
print "3] Power on your board"
print "4] Connect a USB cable from your PC to the APF51Dev OTG miniUSB connector"
print "5] Connect a USB cable from your PC to the APF51Dev console miniUSB connector"
- print "(be sure to have a %s image in current dir too)\n" % BINARY
+ print "(be sure to have a %s image in current dir too)\n" % UBOOT_IMAGE_BIN
port = raw_input('--- Enter serial port number or name to use for console (/dev/ttyACM0 under Linux (default) or COMx under Window$): ')
if port is '':
port = '/dev/ttyACM0'
@@ -567,11 +581,11 @@ if __name__ == "__main__":
#testRAM()
print "--- Successfully initialized APF51, now loading U-Boot"
- if not os.path.exists(BINARY):
- raise Error("file "+BINARY+" doesn't exit",0)
- fsize = "%08x" % os.path.getsize(BINARY) #os.stat(filesize)[6]
- print "Loading %s, size = %d bytes" % (BINARY, os.path.getsize(BINARY))
- apfBootloader.download("90000000", BINARY, fsize, "AA")
+ if not os.path.exists(UBOOT_IMAGE_BIN):
+ raise Error("file "+UBOOT_IMAGE_BIN+" doesn't exit",0)
+ fsize = "%08x" % os.path.getsize(UBOOT_IMAGE_BIN) #os.stat(filesize)[6]
+ print "Loading %s, size = %d bytes" % (UBOOT_IMAGE_BIN, os.path.getsize(UBOOT_IMAGE_BIN))
+ apfBootloader.download("90000000", UBOOT_IMAGE_BIN, fsize, "AA")
# execute loaded code:
apfBootloader.put("90000000", "90000004", "l")
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-30 23:27:06
|
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 20203901d65cb89087d64815beb983853a1214dd (commit)
from 9342cd115182537bc8bc634e4c3c6701158f64a8 (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 20203901d65cb89087d64815beb983853a1214dd
Author: Eric Jarrige <eri...@ar...>
Date: Tue Oct 1 01:39:18 2013 +0200
[BUILDROOT] apf9328: Fix test config
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf9328test_defconfig | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 8044716..1edc54d 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -100,7 +100,6 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPD is not set
BR2_PACKAGE_NTP_NTPDATE=y
BR2_PACKAGE_PORTMAP=y
-BR2_PACKAGE_TCPDUMP=y
BR2_PACKAGE_NANO=y
BR2_TARGET_ROOTFS_JFFS2=y
BR2_TARGET_ROOTFS_JFFS2_PAD=y
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-30 20:43: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 9342cd115182537bc8bc634e4c3c6701158f64a8 (commit)
from c58ee8252d4b2c5ec4f50c4aa455a022489ebd9f (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 9342cd115182537bc8bc634e4c3c6701158f64a8
Author: Eric Jarrige <eri...@ar...>
Date: Mon Sep 30 22:43:01 2013 +0200
[LINUX] 3.x: update apf28 & apf51 to 3.10.12 3.11.2
-----------------------------------------------------------------------
Summary of changes:
...x-3.10.11.config => apf28-linux-3.10.12.config} | 0
...nux-3.11.1.config => apf28-linux-3.11.2.config} | 0
...x-3.10.11.config => apf51-linux-3.10.12.config} | 0
...nux-3.11.1.config => apf51-linux-3.11.2.config} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.10.11.config => apf28-linux-3.10.12.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.11.1.config => apf28-linux-3.11.2.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.10.11.config => apf51-linux-3.10.12.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.11.1.config => apf51-linux-3.11.2.config} (100%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.11.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.10.12.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.10.11.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.10.12.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.11.1.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.11.2.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.11.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.10.12.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.10.11.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.10.12.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.11.1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.11.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.11.1.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.11.2.config
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-09-30 19:33:44
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via c58ee8252d4b2c5ec4f50c4aa455a022489ebd9f (commit)
from 43ca45411a3e80492df631e2ef8f505a2874c1d1 (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 c58ee8252d4b2c5ec4f50c4aa455a022489ebd9f
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 30 21:32:31 2013 +0200
[BUILDROOT] 2013.05: busybox: fixes an ifplugd problem with recent Linux kernels
-----------------------------------------------------------------------
Summary of changes:
.../147-busybox-ifplugd-fixes-netlink-buffer.patch | 62 ++++++++++++++++++++
patches/buildroot/2013.05/cleanup_buildroot.sh | 5 +-
2 files changed, 63 insertions(+), 4 deletions(-)
create mode 100644 patches/buildroot/2013.05/147-busybox-ifplugd-fixes-netlink-buffer.patch
diff --git a/patches/buildroot/2013.05/147-busybox-ifplugd-fixes-netlink-buffer.patch b/patches/buildroot/2013.05/147-busybox-ifplugd-fixes-netlink-buffer.patch
new file mode 100644
index 0000000..4b226f0
--- /dev/null
+++ b/patches/buildroot/2013.05/147-busybox-ifplugd-fixes-netlink-buffer.patch
@@ -0,0 +1,62 @@
+Index: buildroot/package/busybox/1.21.0/busybox-1.21.0-ifplugd-netlink-buffer.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/busybox/1.21.0/busybox-1.21.0-ifplugd-netlink-buffer.patch 2013-09-30 16:56:15.151579379 +0200
+@@ -0,0 +1,57 @@
++From da331d779c19d7d5d4ef05152ee467d617913a01 Mon Sep 17 00:00:00 2001
++From: Tito Ragusa <far...@ti...>
++Date: Sun, 04 Aug 2013 16:08:40 +0000
++Subject: ifplugd: use a larger netlink buffer
++
++function old new delta
++check_existence_through_netlink 310 321 +11
++
++Signed-off-by: Tito Ragusa <far...@ti...>
++Signed-off-by: Denys Vlasenko <vda...@go...>
++---
++(limited to 'networking/ifplugd.c')
++
++diff --git a/networking/ifplugd.c b/networking/ifplugd.c
++index 3cdc2c9..b578f4c 100644
++--- a/networking/ifplugd.c
+++++ b/networking/ifplugd.c
++@@ -451,20 +451,24 @@ static smallint detect_link(void)
++ static NOINLINE int check_existence_through_netlink(void)
++ {
++ int iface_len;
++- char replybuf[1024];
+++ /* Buffer was 1K, but on linux-3.9.9 it was reported to be too small.
+++ * netlink.h: "limit to 8K to avoid MSG_TRUNC when PAGE_SIZE is very large".
+++ * Note: on error returns (-1) we exit, no need to free replybuf.
+++ */
+++ enum { BUF_SIZE = 8 * 1024 };
+++ char *replybuf = xmalloc(BUF_SIZE);
++
++ iface_len = strlen(G.iface);
++ while (1) {
++ struct nlmsghdr *mhdr;
++ ssize_t bytes;
++
++- bytes = recv(netlink_fd, &replybuf, sizeof(replybuf), MSG_DONTWAIT);
+++ bytes = recv(netlink_fd, replybuf, BUF_SIZE, MSG_DONTWAIT);
++ if (bytes < 0) {
++ if (errno == EAGAIN)
++- return G.iface_exists;
+++ goto ret;
++ if (errno == EINTR)
++ continue;
++-
++ bb_perror_msg("netlink: recv");
++ return -1;
++ }
++@@ -507,6 +511,8 @@ static NOINLINE int check_existence_through_netlink(void)
++ }
++ }
++
+++ ret:
+++ free(replybuf);
++ return G.iface_exists;
++ }
++
++--
++cgit v0.9.1
diff --git a/patches/buildroot/2013.05/cleanup_buildroot.sh b/patches/buildroot/2013.05/cleanup_buildroot.sh
index 4e8d879..e8998e9 100755
--- a/patches/buildroot/2013.05/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.05/cleanup_buildroot.sh
@@ -73,10 +73,7 @@ rm -rf buildroot/package/cunit/
rm -rf buildroot/package/gnokii/
rm -rf buildroot/package/smstools3/
rm -rf buildroot/package/wpa_supplicant/
-rm -f buildroot/package/busybox/1.19.4/busybox-1.19.4-stty_add_rs485_config.patch
-rm -f buildroot/package/busybox/1.20.2/busybox-1.20.2-stty_add_rs485_config.patch
-rm -f buildroot/package/busybox/1.21.0/busybox-1.21.0-stty_add_rs485_config.patch
-rm -f buildroot/package/busybox/snapshot/busybox-stty_add_rs485_config.patch
+rm -rf buildroot/package/busybox/
rm -rf buildroot/package/joe/
rm -rf buildroot/package/gpsd/
rm -rf buildroot/linux/
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-30 18:52:32
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 43ca45411a3e80492df631e2ef8f505a2874c1d1 (commit)
via 49d260ff5bd96a21450ff42b10bf2f801666ca89 (commit)
from 18964a5324a3f2b4aa4c30522dc6bf889a8d1b99 (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 43ca45411a3e80492df631e2ef8f505a2874c1d1
Author: Philippe Reynes <tr...@ya...>
Date: Fri Sep 27 21:25:23 2013 +0200
[LINUX] 3.11: move to 3.11.2
Signed-off-by: Philippe Reynes <tr...@ya...>
commit 49d260ff5bd96a21450ff42b10bf2f801666ca89
Author: Philippe Reynes <tr...@ya...>
Date: Fri Sep 20 21:07:50 2013 +0200
[LINUX] 3.10: move to 3.10.12
Signed-off-by: Philippe Reynes <tr...@ya...>
-----------------------------------------------------------------------
Summary of changes:
...x-3.10.11.config => apf27-linux-3.10.12.config} | 0
...nux-3.11.1.config => apf27-linux-3.11.2.config} | 0
patches/linux/{3.10.11 => 3.10.12} | 0
patches/linux/{3.11.1 => 3.11.2} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.11.config => apf27-linux-3.10.12.config} (100%)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.11.1.config => apf27-linux-3.11.2.config} (100%)
rename patches/linux/{3.10.11 => 3.10.12} (100%)
rename patches/linux/{3.11.1 => 3.11.2} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.11.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.12.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.11.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.12.config
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.1.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.11.1.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.11.2.config
diff --git a/patches/linux/3.10.11 b/patches/linux/3.10.12
similarity index 100%
rename from patches/linux/3.10.11
rename to patches/linux/3.10.12
diff --git a/patches/linux/3.11.1 b/patches/linux/3.11.2
similarity index 100%
rename from patches/linux/3.11.1
rename to patches/linux/3.11.2
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-30 15:12:00
|
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 18964a5324a3f2b4aa4c30522dc6bf889a8d1b99 (commit)
via 3e6b47d54ddfa5328f7dcfb55e9c342c5e828d98 (commit)
from b93ab00c3e8d6babed0d78a5fe1d0e5f29f53004 (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 18964a5324a3f2b4aa4c30522dc6bf889a8d1b99
Author: Eric Jarrige <eri...@ar...>
Date: Mon Sep 30 17:24:12 2013 +0200
[TOOLS] apf27: Fix U-Boot recover tool capabilities to reset env variables - enhance to download U-Boot binary image from our server
commit 3e6b47d54ddfa5328f7dcfb55e9c342c5e828d98
Author: Eric Jarrige <eri...@ar...>
Date: Mon Sep 30 17:23:18 2013 +0200
[TOOLS] apf9328: use defined u-boot binary finename
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf27_recover.py | 32 +++++++++++++++++++++-------
software/uboot_recover/apf9328_recover.py | 2 +-
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/software/uboot_recover/apf27_recover.py b/software/uboot_recover/apf27_recover.py
index aa039a2..df05c6b 100644
--- a/software/uboot_recover/apf27_recover.py
+++ b/software/uboot_recover/apf27_recover.py
@@ -290,9 +290,10 @@ class apf27Bootloader:
class UBoot:
"""
"""
- def __init__(self, bootstrap, serial):
+ def __init__(self, bootstrap, serial, binary):
self.bootstrap = bootstrap
self.serial = serial
+ self.binary = binary
def __getOutput(self,error_msg=None):
""" This function waits for U-Boot response and return response"""
@@ -312,15 +313,14 @@ class UBoot:
return response
def load(self):
- BINARY = "apf27-u-boot-nand.bin"
- if not os.path.exists(BINARY):
- raise Error("file "+BINARY+" doesn't exit",0)
- self.fsize = "%08x" % os.path.getsize(BINARY) #os.stat(filesize)[6]
- self.bootstrap.download("A0000000", BINARY, self.fsize)
+ if not os.path.exists(self.binary):
+ raise Error("file "+self.binary+" doesn't exit",0)
+ self.fsize = "%08x" % os.path.getsize(self.binary) #os.stat(filesize)[6]
+ self.bootstrap.download("A0000000", self.binary, self.fsize)
def resetenv(self):
self.serial.flushInput()
- self.serial.write("run flash_reset_env\n")
+ self.serial.write("env default -f && saveenv && echo Flash environment variables erased!\n")
return self.__getOutput()
def waitForPrompt(self):
@@ -346,6 +346,22 @@ class UBoot:
if __name__ == "__main__":
+ RECOVERY_URL = "http://sourceforge.net/projects/armadeus/files/armadeus/"
+ RECOVERY_VERSION = "armadeus-5.2"
+ RECOVERY_BOARD_PATH = "binaries/apf27/"
+ UBOOT_IMAGE_BIN = "apf27-u-boot-nand.bin"
+ UBOOT_RECOVERY_PATH = RECOVERY_URL+RECOVERY_VERSION+"/"+RECOVERY_BOARD_PATH+UBOOT_IMAGE_BIN+"/download"
+ if not os.path.exists(UBOOT_IMAGE_BIN):
+ try:
+ print "Downloading " + UBOOT_IMAGE_BIN + ".."
+ os.system("wget -O "+ UBOOT_IMAGE_BIN + " " +UBOOT_RECOVERY_PATH)
+ except Exception, msg:
+ print "Failed to download U-Boot image file from server!"
+ print msg
+ print "Server may be unavailable for the momenet. please try later."
+ os.remove(UBOOT_IMAGE_BIN);
+ sys.exit()
+
SPEED = 115200
print "\nAPF27 Bootstrap Tool\n"
@@ -362,7 +378,7 @@ if __name__ == "__main__":
ser.flush()
apfBootloader = apf27Bootloader(ser)
- uboot = UBoot(apfBootloader, ser)
+ uboot = UBoot(apfBootloader, ser, UBOOT_IMAGE_BIN)
apfBootloader.getstatus()
apfBootloader.initSDRAM1()
diff --git a/software/uboot_recover/apf9328_recover.py b/software/uboot_recover/apf9328_recover.py
index aa6eb45..a590842 100644
--- a/software/uboot_recover/apf9328_recover.py
+++ b/software/uboot_recover/apf9328_recover.py
@@ -62,7 +62,7 @@ if __name__ == "__main__":
apfBootloader = imxlBootloader(ser, ramSize)
apfBootloader.sync()
eraseAll = raw_input('Would you like to erase the environment variables? y/n: ')
- apfBootloader.loadFlashbin("apf9328-u-boot.bin", "10000000", eraseAll)
+ apfBootloader.loadFlashbin(UBOOT_IMAGE_BIN, "10000000", eraseAll)
print "uBoot successfully recovered !"
del ser
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-30 14:37: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 b93ab00c3e8d6babed0d78a5fe1d0e5f29f53004 (commit)
from 8a1b6efda089db36b60a909e77e5c1f9c2a941ee (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 b93ab00c3e8d6babed0d78a5fe1d0e5f29f53004
Author: Eric Jarrige <eri...@ar...>
Date: Mon Sep 30 16:49:55 2013 +0200
[TOOLS] apf9328: Fix U-Boot recover tool capabilities to reset env variables - enhance to download U-Boot binary image from our server
-----------------------------------------------------------------------
Summary of changes:
software/uboot_recover/apf9328_recover.py | 30 ++++++++++++++++++++------
software/uboot_recover/bootloader.py | 32 +++++++++++++++-------------
2 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/software/uboot_recover/apf9328_recover.py b/software/uboot_recover/apf9328_recover.py
index 1d5535b..aa6eb45 100644
--- a/software/uboot_recover/apf9328_recover.py
+++ b/software/uboot_recover/apf9328_recover.py
@@ -27,6 +27,22 @@ import serial
ser = 0 #serial port
if __name__ == "__main__":
+ RECOVERY_URL = "http://sourceforge.net/projects/armadeus/files/armadeus/"
+ RECOVERY_VERSION = "armadeus-5.2"
+ RECOVERY_BOARD_PATH = "binaries/apf9328/"
+ UBOOT_IMAGE_BIN = "apf9328-u-boot.bin"
+ UBOOT_RECOVERY_PATH = RECOVERY_URL+RECOVERY_VERSION+"/"+RECOVERY_BOARD_PATH+UBOOT_IMAGE_BIN+"/download"
+ if not os.path.exists(UBOOT_IMAGE_BIN):
+ try:
+ print "Downloading " + UBOOT_IMAGE_BIN + ".."
+ os.system("wget -O "+ UBOOT_IMAGE_BIN + " " +UBOOT_RECOVERY_PATH)
+ except Exception, msg:
+ print "Failed to download U-Boot image file from server!"
+ print msg
+ print "Server may be unavailable for the momenet. please try later."
+ os.remove(UBOOT_IMAGE_BIN);
+ sys.exit()
+
SPEED = 38400
ramSize = 16
print "APF Recover Tool"
@@ -43,10 +59,10 @@ if __name__ == "__main__":
print msg
sys.exit()
ser.flush()
- apfBootloader = imxlBootloader(ser, ramSize)
- apfBootloader.sync()
- eraseAll = raw_input('Would you like to erase the environment variables? y/n: ')
- apfBootloader.loadFlashbin("apf9328-u-boot.bin", "10000000", eraseAll)
- print "uBoot successfully recovered !"
- del ser
-
+ apfBootloader = imxlBootloader(ser, ramSize)
+ apfBootloader.sync()
+ eraseAll = raw_input('Would you like to erase the environment variables? y/n: ')
+ apfBootloader.loadFlashbin("apf9328-u-boot.bin", "10000000", eraseAll)
+ print "uBoot successfully recovered !"
+ del ser
+
diff --git a/software/uboot_recover/bootloader.py b/software/uboot_recover/bootloader.py
index 15d0d5e..f7bd214 100644
--- a/software/uboot_recover/bootloader.py
+++ b/software/uboot_recover/bootloader.py
@@ -70,21 +70,21 @@ class imxlBootloader:
self.put("221000","B10A9267","l")
self.get("8023000", "4","b")
self.put("221000","810A9267","l")
- elif self.ramSize == 32:
- self.put("221000","911A9267","l")
- self.get("8400000", "4","b")
- self.put("221000","A11A9267","l")
- self.get("8000000", "4","b")
- self.get("8000000", "4","b")
- self.get("8000000", "4","b")
- self.get("8000000", "4","b")
- self.get("8000000", "4","b")
- self.get("8000000", "4","b")
- self.get("8000000", "4","b")
- self.get("8000000", "4","b")
- self.put("221000","B11A9267","l")
- self.get("8446000", "4","b")
- self.put("221000","811A9267","l")
+ elif self.ramSize == 32:
+ self.put("221000","911A9267","l")
+ self.get("8400000", "4","b")
+ self.put("221000","A11A9267","l")
+ self.get("8000000", "4","b")
+ self.get("8000000", "4","b")
+ self.get("8000000", "4","b")
+ self.get("8000000", "4","b")
+ self.get("8000000", "4","b")
+ self.get("8000000", "4","b")
+ self.get("8000000", "4","b")
+ self.get("8000000", "4","b")
+ self.put("221000","B11A9267","l")
+ self.get("8446000", "4","b")
+ self.put("221000","811A9267","l")
else:
print "Warning ramSize %d not supported" % self.ramSize
#--------------------------------------------------------------
@@ -175,7 +175,9 @@ class imxlBootloader:
self.eraseFlashBlock("10020000")
if eraseAll == 'y':
self.eraseFlashBlock("10040000")
+ self.eraseFlashBlock("10060000")
self.eraseFlashBlock("10080000")
+ self.eraseFlashBlock("100A0000")
self.eraseFlashBlock("10100000")
self.eraseFlashBlock("10200000")
self.eraseFlashBlock("10400000")
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-30 11:36:21
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 8a1b6efda089db36b60a909e77e5c1f9c2a941ee (commit)
from 2633d550a86b78bfc79fd65d8c8424db01d4da84 (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 8a1b6efda089db36b60a909e77e5c1f9c2a941ee
Author: Eric Jarrige <eri...@ar...>
Date: Mon Sep 30 13:45:08 2013 +0200
[UBOOT] apf9328: Fix double boot
-----------------------------------------------------------------------
Summary of changes:
patches/u-boot/2013.04/103-apf9328.patch | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/patches/u-boot/2013.04/103-apf9328.patch b/patches/u-boot/2013.04/103-apf9328.patch
index 7f1b021..e7323a9 100644
--- a/patches/u-boot/2013.04/103-apf9328.patch
+++ b/patches/u-boot/2013.04/103-apf9328.patch
@@ -844,7 +844,7 @@ new file mode 100644
index 0000000..f080423
--- /dev/null
+++ b/board/armadeus/apf9328/lowlevel_init.S
-@@ -0,0 +1,469 @@
+@@ -0,0 +1,472 @@
+/*
+ * (C) Copyright 2005-2011 ej Armadeus Project <eri...@ar...>
+ * Copyright (C) 2004 Sascha Hauer, Synertronixx GmbH
@@ -1306,6 +1306,9 @@ index 0000000..f080423
+ stmia r1!, {r9-r10} /* copy to target address [r1] */
+ cmp r0, r2 /* until source end address [r2] */
+ blo copy_loop
++ ldr pc, =CONFIG_SYS_TEXT_BASE /* reboot from RAM */
++ nop
++ nop
+
+end_of_copy2ram:
+ mov pc,lr
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-09-30 08:16:06
|
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 2633d550a86b78bfc79fd65d8c8424db01d4da84 (commit)
from 4212b778a704a44d0a41e8700879aecfc6449de8 (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 2633d550a86b78bfc79fd65d8c8424db01d4da84
Author: Julien Boibessot <jul...@ar...>
Date: Mon Sep 30 10:15:39 2013 +0200
[U-BOOT] 2012.04: fixes comment when flashing dtb
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2012.04.h | 4 ++--
.../device/armadeus/apf28/apf28-u-boot-2012.04.h | 4 ++--
.../device/armadeus/apf51/apf51-u-boot-2012.04.h | 4 ++--
.../device/armadeus/pps/pps-u-boot-2012.04.h | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
index a62c410..224e332 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
@@ -266,8 +266,8 @@
"fi\0" \
"flash_dtb=nand erase.part dtb;" \
"if nand write.trimffs ${fileaddr} dtb ${filesize};" \
- "then echo Flashing of rootfs succeed;" \
- "else echo Flashing of rootfs failed;" \
+ "then echo Flashing of dtb succeed;" \
+ "else echo Flashing of dtb failed;" \
"fi\0" \
"flash_reset_env=env default -f; saveenv;" \
"echo Flash environment variables erased!\0" \
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
index e03fad7..f660fca 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
@@ -288,8 +288,8 @@
"fi\0" \
"flash_dtb=nand erase.part dtb;" \
"if nand write.trimffs ${fileaddr} dtb ${filesize};" \
- "then echo Flashing of rootfs succeed;" \
- "else echo Flashing of rootfs failed;" \
+ "then echo Flashing of dtb succeed;" \
+ "else echo Flashing of dtb failed;" \
"fi\0" \
"flash_reset_env=env default -f; saveenv;" \
"echo Flash environment variables erased!\0" \
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 50320e1..4d441da 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
@@ -271,8 +271,8 @@
"fi\0" \
"flash_dtb=nand erase.part dtb;" \
"if nand write.trimffs ${fileaddr} dtb ${filesize};" \
- "then echo Flashing of rootfs succeed;" \
- "else echo Flashing of rootfs failed;" \
+ "then echo Flashing of dtb succeed;" \
+ "else echo Flashing of dtb failed;" \
"fi\0" \
"flash_reset_env=env default -f; saveenv;" \
"echo Flash environment variables erased!\0" \
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
index 64e39af..50e184d 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
@@ -267,8 +267,8 @@
"fi\0" \
"flash_dtb=nand erase.part dtb;" \
"if nand write.trimffs ${fileaddr} dtb ${filesize};" \
- "then echo Flashing of rootfs succeed;" \
- "else echo Flashing of rootfs failed;" \
+ "then echo Flashing of dtb succeed;" \
+ "else echo Flashing of dtb failed;" \
"fi\0" \
"flash_reset_env=env default -f; saveenv;" \
"echo Flash environment variables erased!\0" \
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-27 12:23: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 4212b778a704a44d0a41e8700879aecfc6449de8 (commit)
from 3990f54ed608ab6394ff56c92c784eef1642b06f (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 4212b778a704a44d0a41e8700879aecfc6449de8
Author: Eric Jarrige <eri...@ar...>
Date: Fri Sep 27 14:35:17 2013 +0200
[UBOOT] keep external environment file as an exemple of customization
-----------------------------------------------------------------------
Summary of changes:
.../apf9328/apf9328-u-boot-env-2013.04.txt | 36 ++-----------------
.../target/device/armadeus/u-boot-env-2013.04.txt | 38 ++------------------
2 files changed, 6 insertions(+), 68 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt
index 780b806..51c23bf 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt
@@ -1,34 +1,4 @@
-# U-Boot / environment variable management scripts
-# FPGA
-download_firmware=tftpboot ${loadaddr} ${board_name}-firmware.bin
-flash_firmware=echo Erasing FLASH;era nor0,3;if cp.b ${fileaddr} ${firmware_addr} ${filesize} ;then echo Flashing of Firmware succeed;else echo Flashing of Firmware failed;fi
-update_firmware=run download_firmware flash_firmware
-load_firmware=fpga loadb 0 ${firmware_addr} ${firmware_size} || fpga load 0 ${firmware_addr} ${firmware_size}; if test $? -eq 0; then echo Firmware successfully loaded; else echo Loading firmware failed!; fi;
-checknload_firmware=if test -n ${firmware_autoload}; then run load_firmware; fi;
-
-# DTB
-
-# kernel
-download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin
-flash_kernel=echo Erasing FLASH;era nor0,4;if cp.b ${fileaddr} ${kernel_addr} ${filesize} ;then echo Flashing of kernel succeed;else echo Flashing of kernel failed;fi
-update_kernel=run download_kernel flash_kernel
-
-# rootfs
-download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.jffs2
-flash_rootfs=echo Erasing FLASH;era nor0,5;if cp.b ${fileaddr} ${rootfs_addr} ${filesize};then echo Flashing of rootfs succeed;else echo Flashing of rootfs failed;fi
-update_rootfs=run download_rootfs flash_rootfs
-
-# update
-update_all=run update_kernel update_rootfs update_uboot
-
-# boot
-addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off
-addmmcargs=setenv bootargs ${bootargs} root=/dev/mmcblk0p1 rootfstype=ext2
-mmcboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addmmcargs addipargs; bootm ${kernel_addr}
-addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw nfsroot=${serverip}:${rootpath}
-nfsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addnfsargs addipargs; nfs ${loadaddr} ${serverip}:${rootpath}/boot/${board_name}-linux.bin;bootm ${loadaddr}
-addjffsargs=setenv bootargs ${bootargs} root=/dev/mtdblock5 rootfstype=jffs2
-jffsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addjffsargs addipargs; bootm ${kernel_addr}
-
-preboot=run check_flash checknload_firmware check_env ;
+# User defined U-Boot / environment variable
+# Add your own variables
+welcome= echo Welcome to the Armadeus development environment.
diff --git a/buildroot/target/device/armadeus/u-boot-env-2013.04.txt b/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
index f5f9d48..51c23bf 100644
--- a/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
+++ b/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
@@ -1,36 +1,4 @@
-# U-Boot / environment variable management scripts
-# FPGA
-download_firmware=tftpboot ${loadaddr} ${board_name}-firmware.bin
-flash_firmware=nand erase.part firmware;if nand write.trimffs ${fileaddr} ${firmware_addr} ${filesize};then echo Flashing of Firmware succeed;else echo Flashing of Firmware failed;fi
-update_firmware=run download_firmware flash_firmware
-load_firmware=nand read ${loadaddr} firmware && fpga loadb 0 ${loadaddr} ${firmware_size} || fpga load 0 ${loadaddr} ${firmware_size}; if test $? -eq 0; then echo Firmware successfully loaded; else echo Loading firmware failed!; fi;
-checknload_firmware=if test -n ${firmware_autoload}; then run load_firmware; else exit; fi;
-
-# DTB
-download_dtb=tftpboot ${loadaddr} ${board_name}.dtb
-flash_dtb=nand erase.part dtb;if nand write.trimffs ${fileaddr} dtb ${filesize};then echo Flashing dtb succeed;else echo Flashing dtb failed;fi
-update_dtb=run download_dtb flash_dtb
-
-# kernel
-download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin
-flash_kernel=nand erase.part kernel;if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};then echo Flashing of kernel succeed;else echo Flashing of kernel failed;fi
-update_kernel=run download_kernel flash_kernel
-
-# rootfs
-download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi
-flash_rootfs=nand erase.part rootfs;if nand write.trimffs ${fileaddr} ${rootfs_addr} ${filesize};then echo Flashing of rootfs succeed;else echo Flashing of rootfs failed;fi
-update_rootfs=run download_rootfs flash_rootfs
-
-# update
-update_all=run update_kernel update_rootfs update_uboot
-
-# boot
-addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off
-addmmcargs=setenv bootargs ${bootargs} root=/dev/mmcblk0p1 rootfstype=ext2
-mmcboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addmmcargs addipargs;if test -n ${fdt_addr_r} ; then nand read ${fdt_addr_r} dtb; else echo no fdt_addr_r; fi;mmc dev 0; ext2load mmc 0 ${kernel_addr_r} /boot/${board_name}-linux.bin;bootm ${kernel_addr_r} - ${fdt_addr_r}
-addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw nfsroot=${serverip}:${rootpath}
-nfsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addnfsargs addipargs;nfs ${kernel_addr_r} ${serverip}:${rootpath}/boot/${board_name}-linux.bin;if test -n ${fdt_addr_r} ; then nand read ${fdt_addr_r} dtb; else echo no fdt_addr_r; fi;bootm ${kernel_addr_r} - ${fdt_addr_r}
-addubifsargs=setenv bootargs ${bootargs} ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs
-ubifsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs};run addubifsargs addipargs;if test -n ${fdt_addr_r} ; then nand read ${fdt_addr_r} dtb; else echo no fdt_addr_r; fi;nboot ${kernel_addr_r} kernel;bootm ${kernel_addr_r} - ${fdt_addr_r}
-preboot=run check_flash checknload_firmware check_env ;
+# User defined U-Boot / environment variable
+# Add your own variables
+welcome= echo Welcome to the Armadeus development environment.
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-27 09:03:32
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3990f54ed608ab6394ff56c92c784eef1642b06f (commit)
from f78accd77bace39944a33fd5b832a2924c2736a4 (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 3990f54ed608ab6394ff56c92c784eef1642b06f
Author: Eric Jarrige <eri...@ar...>
Date: Fri Sep 27 11:15:42 2013 +0200
[UBOOT] 2013.04: move back all the env. variables to U-Boot default configuration
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2013.04.h | 117 ++++++++++++++---
.../device/armadeus/apf28/apf28-u-boot-2013.04.h | 80 ++++++++++--
.../device/armadeus/apf51/apf51-u-boot-2013.04.h | 105 +++++++++++++--
.../armadeus/apf9328/apf9328-u-boot-2013.04.h | 68 ++++++++--
.../device/armadeus/pps/pps-u-boot-2013.04.h | 144 ++++++++++++++++----
5 files changed, 436 insertions(+), 78 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
index 7d146bd..4096012 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
@@ -8,7 +8,7 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 10
+#define CONFIG_ENV_VERSION 11
#define CONFIG_IDENT_STRING " apf27 patch 3.10"
#define CONFIG_BOARD_NAME apf27
@@ -162,7 +162,8 @@
#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
#define CONFIG_ENV_VARS_UBOOT_CONFIG
-#define CONFIG_PREBOOT "run check_flash check_env;"
+#define CONFIG_PREBOOT "run check_flash checknload_firmware " \
+ "check_env ;"
/*
@@ -205,34 +206,116 @@
"kernel_addr=" __stringify(CONFIG_KERNEL_OFFSET) "\0" \
"rootfs_addr=" __stringify(CONFIG_ROOTFS_OFFSET) "\0" \
"board_name=" __stringify(CONFIG_BOARD_NAME) "\0" \
- "kernel_addr_r=A0000000\0" \
+ "kernel_addr_r=A0000000\0" \
"check_env=if test -n ${flash_env_version}; " \
"then env default env_version; " \
"else env set flash_env_version ${env_version}; env save; "\
"fi; " \
- "if itest ${flash_env_version} < ${env_version}; then " \
+ "if itest ${flash_env_version} != ${env_version}; then " \
"echo \"*** Warning - Environment version" \
" change suggests: run flash_reset_env; reset\"; "\
- "env default flash_reset_env; "\
- "fi; \0" \
- "check_flash=nand lock; nand unlock ${env_addr}; \0" \
- "flash_reset_env=env default -f -a; saveenv; run update_env;" \
+ "env default flash_reset_env; " \
+ "else exit; fi; \0" \
+ "check_flash=nand lock; nand unlock ${env_addr}; \0" \
+ "flash_reset_env=env default -f -a && saveenv &&" \
"echo Flash environment variables erased!\0" \
"download_uboot=tftpboot ${loadaddr} ${board_name}" \
- "-u-boot-nand.bin\0" \
+ "-u-boot-nand.bin\0" \
"flash_uboot=nand unlock ${u-boot_addr} ;" \
- "nand erase.part u-boot;" \
- "if nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};"\
- "then nand lock; nand unlock ${env_addr};" \
- "echo Flashing of uboot succeed;" \
- "else echo Flashing of uboot failed;" \
+ "nand erase.part u-boot;" \
+ "if nand write.trimffs ${fileaddr} ${u-boot_addr} " \
+ "${filesize};" \
+ "then nand lock; nand unlock ${env_addr};" \
+ "echo Flashing of uboot succeed;" \
+ "else echo Flashing of uboot failed;" \
"fi; \0" \
"update_uboot=run download_uboot flash_uboot\0" \
"download_env=tftpboot ${loadaddr} ${board_name}" \
- "-u-boot-env.txt\0" \
- "flash_env=env import -t ${loadaddr}; env save; \0" \
+ "-u-boot-env.txt\0" \
+ "flash_env=env import -t ${loadaddr} && env save; \0" \
"update_env=run download_env flash_env\0" \
- "update_all=run update_env update_uboot\0" \
+ "download_firmware=tftpboot ${loadaddr} ${board_name}-firmware.bin\0"\
+ "flash_firmware=nand erase.part firmware;" \
+ "if nand write.trimffs ${fileaddr} ${firmware_addr} " \
+ "${filesize};" \
+ "then echo Flashing of Firmware succeed;" \
+ "else echo Flashing of Firmware failed;" \
+ "fi\0" \
+ "update_firmware=run download_firmware flash_firmware\0" \
+ "load_firmware=nand read ${loadaddr} firmware && " \
+ "fpga loadb 0 ${loadaddr} ${firmware_size} || " \
+ "fpga load 0 ${loadaddr} ${firmware_size}; " \
+ "if test $? -eq 0; " \
+ "then echo Firmware successfully loaded;" \
+ "else echo Loading firmware failed!;" \
+ "fi;\0" \
+ "checknload_firmware=if test -n ${firmware_autoload};" \
+ "then run load_firmware; else exit; fi;\0"\
+ "download_dtb=tftpboot ${loadaddr} ${board_name}.dtb\0" \
+ "flash_dtb=nand erase.part dtb;" \
+ "if nand write.trimffs ${fileaddr} dtb ${filesize};" \
+ "then echo Flashing dtb succeed;" \
+ "else echo Flashing dtb failed;" \
+ "fi;\0" \
+ "update_dtb=run download_dtb flash_dtb\0" \
+ "download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0"\
+ "flash_kernel=nand erase.part kernel;" \
+ "if nand write.trimffs ${fileaddr} ${kernel_addr} " \
+ "${filesize};" \
+ "then echo Flashing of kernel succeed;" \
+ "else echo Flashing of kernel failed;" \
+ "fi\0" \
+ "update_kernel=run download_kernel flash_kernel\0" \
+ "download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0"\
+ "flash_rootfs=nand erase.part rootfs;" \
+ "if nand write.trimffs ${fileaddr} ${rootfs_addr} " \
+ "${filesize};" \
+ "then echo Flashing of rootfs succeed;" \
+ "else echo Flashing of rootfs failed;" \
+ "fi\0" \
+ "update_rootfs=run download_rootfs flash_rootfs\0" \
+ "update_all=run update_kernel update_rootfs update_uboot &&" \
+ "if test -n ${fdt_addr_r};" \
+ "then run update_dtb; else exit; fi &&" \
+ "if test -n ${firmware_autoload};" \
+ "then run update_firmware; else exit; fi;\0" \
+ "addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:"\
+ "${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
+ "addmmcargs=setenv bootargs ${bootargs} root=/dev/mmcblk0p1 " \
+ "rootfstype=ext2\0" \
+ "mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
+ "mmc dev 0 &&" \
+ "if test -n ${fdt_addr_r} ;" \
+ "then ext2load mmc 0 ${fdt_addr_r} " \
+ "/boot/${board_name}.dtb;" \
+ "else echo no fdt_addr_r;" \
+ "fi &&" \
+ "ext2load mmc 0 ${kernel_addr_r} " \
+ "/boot/${board_name}-linux.bin &&" \
+ "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw " \
+ "nfsroot=${serverip}:${rootpath}\0" \
+ "nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
+ "nfs ${kernel_addr_r} ${serverip}:${rootpath}/boot/" \
+ "${board_name}-linux.bin &&" \
+ "if test -n ${fdt_addr_r};" \
+ "then nfs ${fdt_addr_r} ${serverip}:${rootpath}/boot/" \
+ "${board_name}.dtb;" \
+ "else echo no fdt_addr_r;" \
+ "fi &&" \
+ "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "addubifsargs=setenv bootargs ${bootargs} ubi.mtd=rootfs " \
+ "root=ubi0:rootfs rootfstype=ubifs\0" \
+ "ubifsboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
+ "if test -n ${fdt_addr_r};" \
+ "then nand read ${fdt_addr_r} dtb;" \
+ "else echo no fdt_addr_r;" \
+ "fi &&" \
+ "nboot ${kernel_addr_r} kernel;bootm ${kernel_addr_r} - "\
+ "${fdt_addr_r}\0" \
"unlock_regs=mw 10000008 0; mw 10020008 0\0" \
/*
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
index 4a89175..7ec72c5 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
@@ -8,7 +8,7 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 10
+#define CONFIG_ENV_VERSION 11
#define CONFIG_IDENT_STRING " apf28 patch 1.4"
#define CONFIG_BOARD_NAME apf28
@@ -220,18 +220,18 @@
"kernel_addr=" __stringify(CONFIG_KERNEL_OFFSET) "\0"\
"rootfs_addr=" __stringify(CONFIG_ROOTFS_OFFSET) "\0"\
"board_name=" __stringify(CONFIG_BOARD_NAME) "\0"\
- "kernel_addr_r=40000000\0" \
+ "kernel_addr_r=40000000\0" \
"check_env=if test -n ${flash_env_version}; " \
"then env default env_version; " \
"else env set flash_env_version ${env_version}; env save; "\
"fi; " \
- "if itest ${flash_env_version} < ${env_version}; then " \
+ "if itest ${flash_env_version} != ${env_version}; then " \
"echo \"*** Warning - Environment version" \
" change suggests: run flash_reset_env; reset\"; "\
- "env default flash_reset_env; "\
- "fi; \0" \
+ "env default flash_reset_env; " \
+ "else exit; fi; \0" \
"check_flash= exit\0" \
- "flash_reset_env=env default -f -a; saveenv; run update_env;" \
+ "flash_reset_env=env default -f -a && saveenv &&" \
"echo Flash environment variables erased!\0" \
"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.sb\0" \
"flash_uboot=if bcb nand.write ; then " \
@@ -247,10 +247,72 @@
"fi; \0" \
"update_uboot=run download_uboot flash_uboot\0" \
"download_env=tftpboot ${loadaddr} ${board_name}" \
- "-u-boot-env.txt\0" \
- "flash_env=env import -t ${loadaddr}; env save; \0" \
+ "-u-boot-env.txt\0" \
+ "flash_env=env import -t ${loadaddr} && env save; \0" \
"update_env=run download_env flash_env\0" \
- "update_all=run update_env update_uboot\0" \
+ "download_dtb=tftpboot ${loadaddr} ${board_name}.dtb\0" \
+ "flash_dtb=nand erase.part dtb;" \
+ "if nand write.trimffs ${fileaddr} dtb ${filesize};" \
+ "then echo Flashing dtb succeed;" \
+ "else echo Flashing dtb failed;" \
+ "fi;\0" \
+ "update_dtb=run download_dtb flash_dtb\0" \
+ "download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0"\
+ "flash_kernel=nand erase.part kernel;" \
+ "if nand write.trimffs ${fileaddr} ${kernel_addr} " \
+ "${filesize};" \
+ "then echo Flashing of kernel succeed;" \
+ "else echo Flashing of kernel failed;" \
+ "fi\0" \
+ "update_kernel=run download_kernel flash_kernel\0" \
+ "download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0"\
+ "flash_rootfs=nand erase.part rootfs;" \
+ "if nand write.trimffs ${fileaddr} ${rootfs_addr} " \
+ "${filesize};" \
+ "then echo Flashing of rootfs succeed;" \
+ "else echo Flashing of rootfs failed;" \
+ "fi\0" \
+ "update_rootfs=run download_rootfs flash_rootfs\0" \
+ "update_all=run update_kernel update_rootfs update_uboot &&" \
+ "if test -n ${fdt_addr_r};" \
+ "then run update_dtb; else exit; fi;\0" \
+ "addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:"\
+ "${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
+ "addmmcargs=setenv bootargs ${bootargs} root=/dev/mmcblk0p1 " \
+ "rootfstype=ext2\0" \
+ "mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
+ "mmc dev 0 &&" \
+ "if test -n ${fdt_addr_r} ;" \
+ "then ext2load mmc 0 ${fdt_addr_r} " \
+ "/boot/${board_name}.dtb;" \
+ "else echo no fdt_addr_r;" \
+ "fi &&" \
+ "ext2load mmc 0 ${kernel_addr_r} " \
+ "/boot/${board_name}-linux.bin &&" \
+ "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw " \
+ "nfsroot=${serverip}:${rootpath}\0" \
+ "nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
+ "nfs ${kernel_addr_r} ${serverip}:${rootpath}/boot/" \
+ "${board_name}-linux.bin &&" \
+ "if test -n ${fdt_addr_r};" \
+ "then nfs ${fdt_addr_r} ${serverip}:${rootpath}/boot/" \
+ "${board_name}.dtb;" \
+ "else echo no fdt_addr_r;" \
+ "fi &&" \
+ "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "addubifsargs=setenv bootargs ${bootargs} ubi.mtd=rootfs " \
+ "root=ubi0:rootfs rootfstype=ubifs\0" \
+ "ubifsboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
+ "if test -n ${fdt_addr_r};" \
+ "then nand read ${fdt_addr_r} dtb;" \
+ "else echo no fdt_addr_r;" \
+ "fi &&" \
+ "nboot ${kernel_addr_r} kernel;bootm ${kernel_addr_r} - "\
+ "${fdt_addr_r}\0" \
"unlock_regs=echo unlock_reg not needed anymore\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 3edf1ce..ee6fa7c 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
@@ -8,7 +8,7 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 10
+#define CONFIG_ENV_VERSION 11
#define CONFIG_IDENT_STRING " apf51 patch 2.2"
#define CONFIG_BOARD_NAME apf51
@@ -169,7 +169,8 @@
#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
#define CONFIG_ENV_VARS_UBOOT_CONFIG
-#define CONFIG_PREBOOT "run check_flash check_env;"
+#define CONFIG_PREBOOT "run check_flash checknload_firmware " \
+ "check_env ;"
/*
* Boot Linux
@@ -212,19 +213,18 @@
"kernel_addr=" __stringify(CONFIG_KERNEL_OFFSET) "\0" \
"rootfs_addr=" __stringify(CONFIG_ROOTFS_OFFSET) "\0" \
"board_name=" __stringify(CONFIG_BOARD_NAME) "\0" \
- "kernel_addr_r=90800000\0" \
- "preboot=run check_flash check_env; \0" \
+ "kernel_addr_r=90800000\0" \
"check_env=if test -n ${flash_env_version}; " \
"then env default env_version; " \
"else env set flash_env_version ${env_version}; env save; "\
"fi; " \
- "if itest ${flash_env_version} < ${env_version}; then " \
+ "if itest ${flash_env_version} != ${env_version}; then " \
"echo \"*** Warning - Environment version" \
" change suggests: run flash_reset_env; reset\"; "\
- "env default flash_reset_env; "\
- "fi; \0" \
- "check_flash=nand lock; nand unlock ${env_addr}; \0" \
- "flash_reset_env=env default -f -a; saveenv; run update_env;" \
+ "env default flash_reset_env; " \
+ "else exit; fi; \0" \
+ "check_flash=nand lock; nand unlock ${env_addr}; \0" \
+ "flash_reset_env=env default -f -a && saveenv &&" \
"echo Flash environment variables erased!\0" \
"download_uboot=tftpboot ${loadaddr} ${board_name}" \
"-u-boot-with-nand-spl.imx\0" \
@@ -237,10 +237,91 @@
"fi; \0" \
"update_uboot=run download_uboot flash_uboot\0" \
"download_env=tftpboot ${loadaddr} ${board_name}" \
- "-u-boot-env.txt\0" \
- "flash_env=env import -t ${loadaddr}; env save; \0" \
+ "-u-boot-env.txt\0" \
+ "flash_env=env import -t ${loadaddr} && env save; \0" \
"update_env=run download_env flash_env\0" \
- "update_all=run update_env update_uboot\0" \
+ "download_firmware=tftpboot ${loadaddr} ${board_name}-firmware.bin\0"\
+ "flash_firmware=nand erase.part firmware;" \
+ "if nand write.trimffs ${fileaddr} ${firmware_addr} " \
+ "${filesize};" \
+ "then echo Flashing of Firmware succeed;" \
+ "else echo Flashing of Firmware failed;" \
+ "fi\0" \
+ "update_firmware=run download_firmware flash_firmware\0" \
+ "load_firmware=nand read ${loadaddr} firmware && " \
+ "fpga loadb 0 ${loadaddr} ${firmware_size} || " \
+ "fpga load 0 ${loadaddr} ${firmware_size}; " \
+ "if test $? -eq 0; " \
+ "then echo Firmware successfully loaded;" \
+ "else echo Loading firmware failed!;" \
+ "fi;\0" \
+ "checknload_firmware=if test -n ${firmware_autoload};" \
+ "then run load_firmware; else exit; fi;\0"\
+ "download_dtb=tftpboot ${loadaddr} ${board_name}.dtb\0" \
+ "flash_dtb=nand erase.part dtb;" \
+ "if nand write.trimffs ${fileaddr} dtb ${filesize};" \
+ "then echo Flashing dtb succeed;" \
+ "else echo Flashing dtb failed;" \
+ "fi;\0" \
+ "update_dtb=run download_dtb flash_dtb\0" \
+ "download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0"\
+ "flash_kernel=nand erase.part kernel;" \
+ "if nand write.trimffs ${fileaddr} ${kernel_addr} " \
+ "${filesize};" \
+ "then echo Flashing of kernel succeed;" \
+ "else echo Flashing of kernel failed;" \
+ "fi\0" \
+ "update_kernel=run download_kernel flash_kernel\0" \
+ "download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0"\
+ "flash_rootfs=nand erase.part rootfs;" \
+ "if nand write.trimffs ${fileaddr} ${rootfs_addr} " \
+ "${filesize};" \
+ "then echo Flashing of rootfs succeed;" \
+ "else echo Flashing of rootfs failed;" \
+ "fi\0" \
+ "update_rootfs=run download_rootfs flash_rootfs\0" \
+ "update_all=run update_kernel update_rootfs update_uboot &&" \
+ "if test -n ${fdt_addr_r};" \
+ "then run update_dtb; else exit; fi &&" \
+ "if test -n ${firmware_autoload};" \
+ "then run update_firmware; else exit; fi;\0" \
+ "addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:"\
+ "${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
+ "addmmcargs=setenv bootargs ${bootargs} root=/dev/mmcblk0p1 " \
+ "rootfstype=ext2\0" \
+ "mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
+ "mmc dev 0 &&" \
+ "if test -n ${fdt_addr_r} ;" \
+ "then ext2load mmc 0 ${fdt_addr_r} " \
+ "/boot/${board_name}.dtb;" \
+ "else echo no fdt_addr_r;" \
+ "fi &&" \
+ "ext2load mmc 0 ${kernel_addr_r} " \
+ "/boot/${board_name}-linux.bin &&" \
+ "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw " \
+ "nfsroot=${serverip}:${rootpath}\0" \
+ "nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
+ "nfs ${kernel_addr_r} ${serverip}:${rootpath}/boot/" \
+ "${board_name}-linux.bin &&" \
+ "if test -n ${fdt_addr_r};" \
+ "then nfs ${fdt_addr_r} ${serverip}:${rootpath}/boot/" \
+ "${board_name}.dtb;" \
+ "else echo no fdt_addr_r;" \
+ "fi &&" \
+ "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "addubifsargs=setenv bootargs ${bootargs} ubi.mtd=rootfs " \
+ "root=ubi0:rootfs rootfstype=ubifs\0" \
+ "ubifsboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
+ "if test -n ${fdt_addr_r};" \
+ "then nand read ${fdt_addr_r} dtb;" \
+ "else echo no fdt_addr_r;" \
+ "fi &&" \
+ "nboot ${kernel_addr_r} kernel;bootm ${kernel_addr_r} - "\
+ "${fdt_addr_r}\0" \
"unlock_regs=echo unlock_reg not needed anymore\0"
/*
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
index 7115cc5..0c9f211 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
@@ -8,7 +8,7 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 10
+#define CONFIG_ENV_VERSION 11
#define CONFIG_IDENT_STRING " apf9328 patch 5.9"
#define CONFIG_BOARD_NAME apf9328
@@ -139,7 +139,8 @@
#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
#define CONFIG_ENV_VARS_UBOOT_CONFIG
-#define CONFIG_PREBOOT "run check_flash check_env;"
+#define CONFIG_PREBOOT "run check_flash checknload_firmware " \
+ "check_env;"
/*
* Boot Linux
@@ -186,29 +187,74 @@
"then env default env_version; " \
"else env set flash_env_version ${env_version}; env save; "\
"fi; " \
- "if itest ${flash_env_version} < ${env_version}; then " \
+ "if itest ${flash_env_version} != ${env_version}; then " \
"echo \"*** Warning - Environment version" \
" change suggests: run flash_reset_env; reset\"; "\
"env default flash_reset_env; " \
- "fi; \0" \
- "check_flash=protect on nor0,0;\0" \
- "flash_reset_env=env default -f -a; saveenv; run update_env;" \
+ "else exit; fi; \0" \
+ "check_flash=protect on nor0,0;\0" \
+ "flash_reset_env=env default -f -a && saveenv &&" \
"echo Flash environment variables erased!\0" \
"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.bin\0"\
"flash_uboot=protect off nor0,0;" \
"echo Erasing FLASH;" \
"era nor0,0;" \
"if cp.b ${fileaddr} ${uboot_addr} ${filesize};" \
- "then protect on nor0,0;" \
- "echo Flashing of uboot succeed;" \
- "else echo Flashing of uboot failed;" \
+ "then protect on nor0,0;" \
+ "echo Flashing of uboot succeed;" \
+ "else echo Flashing of uboot failed;" \
"fi; \0" \
"update_uboot=run download_uboot flash_uboot\0" \
"download_env=tftpboot ${loadaddr} ${board_name}" \
"-u-boot-env.txt\0" \
- "flash_env=env import -t ${loadaddr}; env save; \0" \
+ "flash_env=env import -t ${loadaddr} && env save; \0" \
"update_env=run download_env flash_env\0" \
- "update_all=run update_env update_uboot\0" \
+ "download_firmware=tftpboot ${loadaddr} ${board_name}-firmware.bin\0"\
+ "flash_firmware=echo Erasing FLASH;era nor0,3;" \
+ "if cp.b ${fileaddr} ${firmware_addr} ${filesize} ;" \
+ "then echo Flashing of Firmware succeed;" \
+ "else echo Flashing of Firmware failed;fi\0" \
+ "update_firmware=run download_firmware flash_firmware\0" \
+ "load_firmware=fpga loadb 0 ${firmware_addr} ${firmware_size} || "\
+ "fpga load 0 ${firmware_addr} ${firmware_size};" \
+ "if test $? -eq 0;" \
+ "then echo Firmware successfully loaded;" \
+ "else echo Loading firmware failed!; fi;\0" \
+ "checknload_firmware=if test -n ${firmware_autoload};" \
+ "then run load_firmware; else exit; fi;\0" \
+ "download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0"\
+ "flash_kernel=echo Erasing FLASH;era nor0,4;" \
+ "if cp.b ${fileaddr} ${kernel_addr} ${filesize} ;" \
+ "then echo Flashing of kernel succeed;" \
+ "else echo Flashing of kernel failed;fi\0" \
+ "update_kernel=run download_kernel flash_kernel\0" \
+ "download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.jffs2\0" \
+ "flash_rootfs=echo Erasing FLASH;era nor0,5;" \
+ "if cp.b ${fileaddr} ${rootfs_addr} ${filesize};" \
+ "then echo Flashing of rootfs succeed;" \
+ "else echo Flashing of rootfs failed;fi\0" \
+ "update_rootfs=run download_rootfs flash_rootfs\0" \
+ "update_all=run update_kernel update_rootfs update_uboot &&" \
+ "if test -n ${firmware_autoload};" \
+ "then run update_firmware; else exit; fi;\0" \
+ "addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}"\
+ ":${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
+ "addmmcargs=setenv bootargs ${bootargs} root=/dev/mmcblk0p1 " \
+ "rootfstype=ext2\0" \
+ "mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
+ "bootm ${kernel_addr}\0" \
+ "addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw " \
+ "nfsroot=${serverip}:${rootpath}\0" \
+ "nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
+ "nfs ${loadaddr} ${serverip}:${rootpath}/boot/${board_name}-"\
+ "linux.bin && bootm ${loadaddr}\0" \
+ "addjffsargs=setenv bootargs ${bootargs} root=/dev/mtdblock5 " \
+ "rootfstype=jffs2\0" \
+ "jffsboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs}; run addjffsargs addipargs;"\
+ "bootm ${kernel_addr}\0" \
"unlock_regs=mw 00200008 0; mw 00210008 0\0" \
/*
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2013.04.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2013.04.h
index 37a248a..efae309 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2013.04.h
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2008-2013 Eric Jarrige <eri...@ar...>
+ *
* SPDX-License-Identifier:Â Â Â Â Â GPL-2.0+
*/
@@ -22,9 +23,11 @@
* Enable the call to miscellaneous platform dependent initialization.
*/
#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h> */
+#define CONFIG_BOARD_EARLY_INIT_F
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SKIP_LOWLEVEL_INIT
#endif
+
/*
* Board display option
*/
@@ -34,7 +37,6 @@
/*
* SPL
*/
-#define CONFIG_NAND_U_BOOT
/* Copy SPL+U-Boot here */
#define CONFIG_SYS_NAND_U_BOOT_DST (CONFIG_SYS_TEXT_BASE - 0x800)
/* Size is the partion size */
@@ -74,14 +76,14 @@
#define CONFIG_CMD_ASKENV /* ask for env variable */
#define CONFIG_CMD_BSP /* Board Specific functions */
#define CONFIG_CMD_CACHE /* icache, dcache */
-#define CONFIG_CMD_DATE /* support for RTC, date/time...*/
+#define CONFIG_CMD_DATE
#define CONFIG_CMD_DHCP /* DHCP Support */
#define CONFIG_CMD_DNS
-#define CONFIG_CMD_EEPROM /* EEPROM read/write support */
-/*#define CONFIG_CMD_EXT2*/
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT /* FAT support */
-#define CONFIG_CMD_I2C /* I2C serial bus support */
-#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */
+#define CONFIG_CMD_IMX_FUSE /* imx iim fuse */
+#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII /* MII support */
/*#define CONFIG_CMD_MMC*/
#define CONFIG_CMD_MTDPARTS /* MTD partition support */
@@ -105,7 +107,7 @@
#define PHYS_SDRAM_1 0xA0000000
#define PHYS_SDRAM_2 0xB0000000
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (512<<10))
+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (2 * 1024 * 1024))
#define CONFIG_SYS_MEMTEST_START 0xA0000000 /* memtest test area */
#define CONFIG_SYS_MEMTEST_END 0xA0300000 /* 3 MiB RAM test */
@@ -117,8 +119,7 @@
/*
* FLASH organization
*/
-/*#define CONFIG_SYS_MONITOR_BASE 0xAFF00000*/
-#define CONFIG_SYS_MONITOR_OFFSET 0x00000000
+#define ACFG_MONITOR_OFFSET 0x00000000
#define CONFIG_SYS_MONITOR_LEN 0x00100000 /* 1MiB */
#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OVERWRITE
@@ -161,7 +162,9 @@
#define CONFIG_SYS_HUSH_PARSER /* enable the "hush" shell */
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
#define CONFIG_ENV_VARS_UBOOT_CONFIG
-#define CONFIG_PREBOOT "run check_flash check_env;"
+#define CONFIG_PREBOOT "run check_flash checknload_firmware " \
+ "check_env ;"
+
/*
* Boot Linux
@@ -196,7 +199,7 @@
"consoledev=" __stringify(ACFG_CONSOLE_DEV) "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"partition=nand0,6\0" \
- "u-boot_addr=" __stringify(CONFIG_SYS_MONITOR_OFFSET) "\0" \
+ "u-boot_addr=" __stringify(ACFG_MONITOR_OFFSET) "\0" \
"env_addr=" __stringify(CONFIG_ENV_OFFSET) "\0" \
"firmware_addr=" __stringify(CONFIG_FIRMWARE_OFFSET) "\0" \
"firmware_size=" __stringify(CONFIG_FIRMWARE_SIZE) "\0" \
@@ -209,29 +212,111 @@
"then env default env_version; " \
"else env set flash_env_version ${env_version}; env save; "\
"fi; " \
- "if itest ${flash_env_version} < ${env_version}; then " \
+ "if itest ${flash_env_version} != ${env_version}; then " \
"echo \"*** Warning - Environment version" \
" change suggests: run flash_reset_env; reset\"; "\
- "env default flash_reset_env; "\
- "fi; \0" \
- "check_flash=nand lock; nand unlock ${env_addr}; \0" \
- "flash_reset_env=env default -f -a; saveenv; run update_env;" \
+ "env default flash_reset_env; " \
+ "else exit; fi; \0" \
+ "check_flash=nand lock; nand unlock ${env_addr}; \0" \
+ "flash_reset_env=env default -f -a && saveenv &&" \
"echo Flash environment variables erased!\0" \
"download_uboot=tftpboot ${loadaddr} ${board_name}" \
- "-u-boot-nand.bin\0" \
+ "-u-boot-nand.bin\0" \
"flash_uboot=nand unlock ${u-boot_addr} ;" \
- "nand erase.part u-boot;" \
- "if nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};"\
- "then nand lock; nand unlock ${env_addr};" \
- "echo Flashing of uboot succeed;" \
- "else echo Flashing of uboot failed;" \
+ "nand erase.part u-boot;" \
+ "if nand write.trimffs ${fileaddr} ${u-boot_addr} " \
+ "${filesize};" \
+ "then nand lock; nand unlock ${env_addr};" \
+ "echo Flashing of uboot succeed;" \
+ "else echo Flashing of uboot failed;" \
"fi; \0" \
"update_uboot=run download_uboot flash_uboot\0" \
"download_env=tftpboot ${loadaddr} ${board_name}" \
- "-u-boot-env.txt\0" \
- "flash_env=env import -t ${loadaddr}; env save; \0" \
+ "-u-boot-env.txt\0" \
+ "flash_env=env import -t ${loadaddr} && env save; \0" \
"update_env=run download_env flash_env\0" \
- "update_all=run update_env update_uboot\0" \
+ "download_firmware=tftpboot ${loadaddr} ${board_name}-firmware.bin\0"\
+ "flash_firmware=nand erase.part firmware;" \
+ "if nand write.trimffs ${fileaddr} ${firmware_addr} " \
+ "${filesize};" \
+ "then echo Flashing of Firmware succeed;" \
+ "else echo Flashing of Firmware failed;" \
+ "fi\0" \
+ "update_firmware=run download_firmware flash_firmware\0" \
+ "load_firmware=nand read ${loadaddr} firmware && " \
+ "fpga loadb 0 ${loadaddr} ${firmware_size} || " \
+ "fpga load 0 ${loadaddr} ${firmware_size}; " \
+ "if test $? -eq 0; " \
+ "then echo Firmware successfully loaded;" \
+ "else echo Loading firmware failed!;" \
+ "fi;\0" \
+ "checknload_firmware=if test -n ${firmware_autoload};" \
+ "then run load_firmware; else exit; fi;\0"\
+ "download_dtb=tftpboot ${loadaddr} ${board_name}.dtb\0" \
+ "flash_dtb=nand erase.part dtb;" \
+ "if nand write.trimffs ${fileaddr} dtb ${filesize};" \
+ "then echo Flashing dtb succeed;" \
+ "else echo Flashing dtb failed;" \
+ "fi;\0" \
+ "update_dtb=run download_dtb flash_dtb\0" \
+ "download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0"\
+ "flash_kernel=nand erase.part kernel;" \
+ "if nand write.trimffs ${fileaddr} ${kernel_addr} " \
+ "${filesize};" \
+ "then echo Flashing of kernel succeed;" \
+ "else echo Flashing of kernel failed;" \
+ "fi\0" \
+ "update_kernel=run download_kernel flash_kernel\0" \
+ "download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0"\
+ "flash_rootfs=nand erase.part rootfs;" \
+ "if nand write.trimffs ${fileaddr} ${rootfs_addr} " \
+ "${filesize};" \
+ "then echo Flashing of rootfs succeed;" \
+ "else echo Flashing of rootfs failed;" \
+ "fi\0" \
+ "update_rootfs=run download_rootfs flash_rootfs\0" \
+ "update_all=run update_kernel update_rootfs update_uboot &&" \
+ "if test -n ${fdt_addr_r};" \
+ "then run update_dtb; else exit; fi &&" \
+ "if test -n ${firmware_autoload};" \
+ "then run update_firmware; else exit; fi;\0" \
+ "addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:"\
+ "${gatewayip}:${netmask}:${hostname}:eth0:off\0" \
+ "addmmcargs=setenv bootargs ${bootargs} root=/dev/mmcblk0p1 " \
+ "rootfstype=ext2\0" \
+ "mmcboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
+ "mmc dev 0 &&" \
+ "if test -n ${fdt_addr_r} ;" \
+ "then ext2load mmc 0 ${fdt_addr_r} " \
+ "/boot/${board_name}.dtb;" \
+ "else echo no fdt_addr_r;" \
+ "fi &&" \
+ "ext2load mmc 0 ${kernel_addr_r} " \
+ "/boot/${board_name}-linux.bin &&" \
+ "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw " \
+ "nfsroot=${serverip}:${rootpath}\0" \
+ "nfsboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
+ "nfs ${kernel_addr_r} ${serverip}:${rootpath}/boot/" \
+ "${board_name}-linux.bin &&" \
+ "if test -n ${fdt_addr_r};" \
+ "then nfs ${fdt_addr_r} ${serverip}:${rootpath}/boot/" \
+ "${board_name}.dtb;" \
+ "else echo no fdt_addr_r;" \
+ "fi &&" \
+ "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \
+ "addubifsargs=setenv bootargs ${bootargs} ubi.mtd=rootfs " \
+ "root=ubi0:rootfs rootfstype=ubifs\0" \
+ "ubifsboot=setenv bootargs console=${consoledev},${baudrate} " \
+ "${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
+ "if test -n ${fdt_addr_r};" \
+ "then nand read ${fdt_addr_r} dtb;" \
+ "else echo no fdt_addr_r;" \
+ "fi &&" \
+ "nboot ${kernel_addr_r} kernel;bootm ${kernel_addr_r} - "\
+ "${fdt_addr_r}\0" \
"unlock_regs=mw 10000008 0; mw 10020008 0\0" \
/*
@@ -239,7 +324,7 @@
*/
#define CONFIG_MXC_UART
#define CONFIG_CONS_INDEX 1
-#define CONFIG_BAUDRATE 115200
+#define CONFIG_BAUDRATE 115200
#define CONFIG_MXC_UART_BASE UART1_BASE
/*
@@ -262,9 +347,11 @@
#define CONFIG_MXC_NAND_HWECC
#define CONFIG_SYS_NAND_LARGEPAGE
+#define CONFIG_SYS_NAND_USE_FLASH_BBT
#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
#define NAND_MAX_CHIPS 1
+
#define CONFIG_SYS_DIRECT_FLASH_TFTP
#define CONFIG_FLASH_SHOW_PROGRESS 45
#define CONFIG_SYS_NAND_QUIET 1
@@ -289,7 +376,6 @@
* Ethernet (on SOC imx FEC)
*/
#define CONFIG_FEC_MXC
-
/*#define CONFIG_PHYLIB
#define CONFIG_PHY_SMSC*/
#define CONFIG_FEC_MXC_PHYADDR 0x1f
@@ -302,7 +388,7 @@
#define CONFIG_FPGA_COUNT 1
#define CONFIG_FPGA_XILINX
#define CONFIG_FPGA_SPARTAN3
-#define CONFIG_SYS_FPGA_WAIT 250 /* 250 ms */
+#define CONFIG_SYS_FPGA_WAIT 250 /* 250ms */
#define CONFIG_SYS_FPGA_PROG_FEEDBACK
#define CONFIG_SYS_FPGA_CHECK_CTRLC
#define CONFIG_SYS_FPGA_CHECK_ERROR
@@ -336,7 +422,7 @@
*/
#ifdef CONFIG_CMD_I2C
-#define CONFIG_HARD_I2C
+#define CONFIG_HARD_I2C
#define CONFIG_I2C_MXC
#define CONFIG_I2C_MULTI_BUS
#define CONFIG_SYS_I2C_BASE IMX_I2C1_BASE
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-26 10:02:49
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f78accd77bace39944a33fd5b832a2924c2736a4 (commit)
from 5cf727fc4d43f535f822fa5e36068e8f17c3c263 (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 f78accd77bace39944a33fd5b832a2924c2736a4
Author: Eric Jarrige <eri...@ar...>
Date: Thu Sep 26 12:14:53 2013 +0200
[LINUX] 2.6.38: patch cleanup
-----------------------------------------------------------------------
Summary of changes:
...27-armadeus-fixe-bugs-drivers_mxc_nand.c.as_ref | 160 --------------------
1 files changed, 0 insertions(+), 160 deletions(-)
delete mode 100644 patches/linux/2.6.38/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.as_ref
diff --git a/patches/linux/2.6.38/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.as_ref b/patches/linux/2.6.38/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.as_ref
deleted file mode 100644
index 971f9c0..0000000
--- a/patches/linux/2.6.38/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.as_ref
+++ /dev/null
@@ -1,160 +0,0 @@
-Index: linux-2.6.29/drivers/mtd/nand/mxc_nand.c
-===================================================================
---- linux-2.6.29.orig/drivers/mtd/nand/mxc_nand.c 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29/drivers/mtd/nand/mxc_nand.c 2009-03-31 10:18:28.000000000 +0200
-@@ -130,17 +130,42 @@
-
- /* OOB placement block for use with hardware ecc generation */
- static struct nand_ecclayout nand_hw_eccoob_8 = {
-- .eccbytes = 5,
-- .eccpos = {6, 7, 8, 9, 10},
-- .oobfree = {{0, 5}, {11, 5}, }
-+ .eccbytes = 24,
-+ .eccpos = {6, 7, 8, 9, 10, 5, 22, 23, 24, 25, 26, 21, 38, 39, 40, 41, 42, 37, 54, 55, 56, 57, 58, 53},
-+ .oobfree = {{11, 10}, {27, 10}, {43, 10}, {59, 5}}
- };
-
- static struct nand_ecclayout nand_hw_eccoob_16 = {
-- .eccbytes = 5,
-- .eccpos = {6, 7, 8, 9, 10},
-- .oobfree = {{0, 6}, {12, 4}, }
-+ .eccbytes = 24,
-+ .eccpos = {6, 7, 8, 9, 10, 11, 22, 23, 24, 25, 26, 27, 38, 39, 40, 41, 42, 43, 54, 55, 56, 57, 58, 59},
-+ .oobfree = {{12, 10}, {28, 10}, {44, 10}, {60, 4}}
- };
-
-+static uint8_t bbt_pattern[] = {'B', 'b', 't', '0' };
-+static uint8_t mirror_pattern[] = {'1', 't', 'b', 'B' };
-+
-+static struct nand_bbt_descr mxcnd_bbt_main_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 12,
-+ .len = 4,
-+ .veroffs = 4,
-+ .maxblocks = 4,
-+ .pattern = bbt_pattern
-+};
-+
-+static struct nand_bbt_descr mxcnd_bbt_mirror_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 12,
-+ .len = 4,
-+ .veroffs = 4,
-+ .maxblocks = 4,
-+ .pattern = mirror_pattern
-+};
-+
-+static u_char nand_verify_buf[2048];
-+
- #ifdef CONFIG_MTD_PARTITIONS
- static const char *part_probes[] = { "RedBoot", "cmdlinepart", NULL };
- #endif
-@@ -283,6 +308,7 @@
- struct nand_chip *this = &host->nand;
- uint16_t tmp;
-
-+ DEBUG(MTD_DEBUG_LEVEL3, "send_read_id \n");
- /* NANDFC buffer 0 is used for device ID output */
- writew(0x0, host->regs + NFC_BUF_ADDR);
-
-@@ -299,11 +325,9 @@
- if (this->options & NAND_BUSWIDTH_16) {
- void __iomem *main_buf = host->regs + MAIN_AREA0;
- /* compress the ID info */
-- writeb(readb(main_buf + 2), main_buf + 1);
-- writeb(readb(main_buf + 4), main_buf + 2);
-- writeb(readb(main_buf + 6), main_buf + 3);
-- writeb(readb(main_buf + 8), main_buf + 4);
-- writeb(readb(main_buf + 10), main_buf + 5);
-+ writew((readw(main_buf + 0) & 0xff) | ((readw(main_buf + 2)& 0xff) << 8), main_buf + 0);
-+ writew((readw(main_buf + 4) & 0xff) | ((readw(main_buf + 6)& 0xff) << 8), main_buf + 2);
-+ writew((readw(main_buf + 8) & 0xff) | ((readw(main_buf + 10)& 0xff) << 8), main_buf + 4);
- }
- }
-
-@@ -637,7 +661,22 @@
- static int mxc_nand_verify_buf(struct mtd_info *mtd,
- const u_char *buf, int len)
- {
-- return -EFAULT;
-+ struct nand_chip *nand_chip = mtd->priv;
-+ struct mxc_nand_host *host = nand_chip->priv;
-+
-+ DEBUG(MTD_DEBUG_LEVEL3,
-+ "mxc_nand_verify_buf(col = %d, len = %d)\n", host->col_addr,
-+ len);
-+
-+ mxc_nand_read_buf(mtd, (u_char *)&nand_verify_buf[0], len);
-+
-+ if (!memcmp(buf, &nand_verify_buf[0], len)) {
-+ DEBUG(MTD_DEBUG_LEVEL3,"verify_buf: the buffer is OK\n");
-+ return 0;
-+ } else {
-+ DEBUG(MTD_DEBUG_LEVEL0,"verify_buf: the buffer is wrong\n");
-+ return -EFAULT;
-+ }
- }
-
- /* This function is used by upper layer for select and
-@@ -700,6 +739,7 @@
-
- /* Reset command state information */
- host->status_request = false;
-+ host->pagesize_2k = (mtd->writesize >= 2048)?1:0;
-
- /* Command pre-processing step */
- switch (command) {
-@@ -723,6 +763,10 @@
- command = NAND_CMD_READ0; /* only READ0 is valid */
- break;
-
-+ case NAND_CMD_READID:
-+ host->col_addr = column;
-+ break;
-+
- case NAND_CMD_SEQIN:
- if (column >= mtd->writesize) {
- /*
-@@ -796,8 +840,8 @@
-
- if (host->pagesize_2k) {
- send_addr(host, (page_addr >> 8) & 0xFF, false);
-- if (mtd->size >= 0x40000000)
-- send_addr(host, (page_addr >> 16) & 0xff, true);
-+ if (mtd->size >= 0x10000000)
-+ send_addr(host, (page_addr >> 16) & 0xff, true);
- } else {
- /* One more address cycle for higher density devices */
- if (mtd->size >= 0x4000000) {
-@@ -866,6 +910,7 @@
- mtd = &host->mtd;
- mtd->priv = this;
- mtd->owner = THIS_MODULE;
-+ mtd->name = pdev->dev.bus_id;
-
- /* 50 us command delay time */
- this->chip_delay = 5;
-@@ -880,6 +925,9 @@
- this->read_buf = mxc_nand_read_buf;
- this->verify_buf = mxc_nand_verify_buf;
-
-+ this->bbt_td = &mxcnd_bbt_main_descr;
-+ this->bbt_md = &mxcnd_bbt_mirror_descr;
-+
- host->clk = clk_get(&pdev->dev, "nfc_clk");
- if (IS_ERR(host->clk))
- goto eclk;
-@@ -948,8 +996,10 @@
-
- /* NAND bus width determines access funtions used by upper layer */
- if (pdata->width == 2) {
-- this->options |= NAND_BUSWIDTH_16;
-+ this->options |= NAND_BUSWIDTH_16 | NAND_USE_FLASH_BBT;
- this->ecc.layout = &nand_hw_eccoob_16;
-+ } else {
-+ this->options |= NAND_USE_FLASH_BBT;
- }
-
- host->pagesize_2k = 0;
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-26 08:24:39
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5cf727fc4d43f535f822fa5e36068e8f17c3c263 (commit)
from f304afb94f5d54cdac0cc40d19832c0ddce6aee8 (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 5cf727fc4d43f535f822fa5e36068e8f17c3c263
Author: Eric Jarrige <eri...@ar...>
Date: Thu Sep 26 10:36:38 2013 +0200
[LINUX] apf51, apf27: align NAND BBT description to the linux/UBoot mainline
-----------------------------------------------------------------------
Summary of changes:
...f27-armadeus-fixe-bugs-drivers_mxc_nand.c.patch | 4 +-
.../2.6.36/404-armadeus-fix_nand_ecc_oob.patch | 89 --------------------
.../2.6.38/240-armadeus-mxc_nand-fixes_bbt.patch | 18 ----
.../2.6.38/404-armadeus-fix_nand_ecc_oob.patch | 81 ------------------
.../linux/3.0/404-armadeus-fix_nand_ecc_oob.patch | 81 ------------------
.../3.10/0404-armadeus-fix_nand_ecc_oob.patch | 81 ------------------
.../3.11/0404-armadeus-fix_nand_ecc_oob.patch | 81 ------------------
.../3.12/0404-armadeus-fix_nand_ecc_oob.patch | 77 -----------------
.../linux/3.8/0404-armadeus-fix_nand_ecc_oob.patch | 81 ------------------
.../linux/3.9/0404-armadeus-fix_nand_ecc_oob.patch | 81 ------------------
10 files changed, 2 insertions(+), 672 deletions(-)
delete mode 100644 patches/linux/2.6.36/404-armadeus-fix_nand_ecc_oob.patch
delete mode 100644 patches/linux/2.6.38/404-armadeus-fix_nand_ecc_oob.patch
delete mode 100644 patches/linux/3.0/404-armadeus-fix_nand_ecc_oob.patch
delete mode 100644 patches/linux/3.10/0404-armadeus-fix_nand_ecc_oob.patch
delete mode 100644 patches/linux/3.11/0404-armadeus-fix_nand_ecc_oob.patch
delete mode 100644 patches/linux/3.12/0404-armadeus-fix_nand_ecc_oob.patch
delete mode 100644 patches/linux/3.8/0404-armadeus-fix_nand_ecc_oob.patch
delete mode 100644 patches/linux/3.9/0404-armadeus-fix_nand_ecc_oob.patch
diff --git a/patches/linux/2.6.29/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.patch b/patches/linux/2.6.29/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.patch
index 971f9c0..c6f923e 100644
--- a/patches/linux/2.6.29/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.patch
+++ b/patches/linux/2.6.29/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.patch
@@ -29,7 +29,7 @@ Index: linux-2.6.29/drivers/mtd/nand/mxc_nand.c
+static struct nand_bbt_descr mxcnd_bbt_main_descr = {
+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
+ | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 12,
++ .offs = 0,
+ .len = 4,
+ .veroffs = 4,
+ .maxblocks = 4,
@@ -39,7 +39,7 @@ Index: linux-2.6.29/drivers/mtd/nand/mxc_nand.c
+static struct nand_bbt_descr mxcnd_bbt_mirror_descr = {
+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
+ | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 12,
++ .offs = 0,
+ .len = 4,
+ .veroffs = 4,
+ .maxblocks = 4,
diff --git a/patches/linux/2.6.36/404-armadeus-fix_nand_ecc_oob.patch b/patches/linux/2.6.36/404-armadeus-fix_nand_ecc_oob.patch
deleted file mode 100644
index e0d2bcd..0000000
--- a/patches/linux/2.6.36/404-armadeus-fix_nand_ecc_oob.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Add OOB and bad block table management to the V3 mxc_nand driver
-
-Signed-off-by: Nicolas Colombain <nic...@ar...>
-
-Index: linux-2.6.36/drivers/mtd/nand/mxc_nand.c
-===================================================================
---- linux-2.6.36.orig/drivers/mtd/nand/mxc_nand.c 2010-11-14 12:33:43.000000000 +0100
-+++ linux-2.6.36/drivers/mtd/mxc_nand.c 2010-11-14 12:16:17.000000000 +0100
-@@ -211,6 +211,18 @@ static struct nand_ecclayout nandv2_hw_e
- }
- };
-
-+/* OOB description for V3 and 2048 byte pages with 64 byte OOB */
-+static struct nand_ecclayout nandv3_hw_eccoob_largepage = {
-+ .eccbytes = 8,
-+ .eccpos = {
-+ 8, 9, 10, 11, 12, 13, 14, 15,
-+ },
-+ .oobfree = {
-+ {2, 5},
-+ {16, 48}
-+ },
-+};
-+
- static u_char nand_verify_buf[2048];
-
- #ifdef CONFIG_MTD_PARTITIONS
-@@ -1013,6 +1025,28 @@ static struct nand_bbt_descr bbt_mirror_
- .pattern = mirror_pattern,
- };
-
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_main_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = bbt_pattern
-+};
-+
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_mirror_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = bbt_pattern
-+};
-+
- static int __init mxcnd_probe(struct platform_device *pdev)
- {
- struct nand_chip *this;
-@@ -1029,6 +1063,7 @@ static int __init mxcnd_probe(struct pla
- if (!host)
- return -ENOMEM;
-
-+
- host->data_buf = (uint8_t *)(host + 1);
-
- host->dev = &pdev->dev;
-@@ -1128,7 +1163,7 @@ static int __init mxcnd_probe(struct pla
- host->get_dev_status = get_dev_status_v3;
- host->irq_control = irq_control_v3;
- oob_smallpage = &nandv2_hw_eccoob_smallpage;
-- oob_largepage = &nandv2_hw_eccoob_largepage;
-+ oob_largepage = &nandv3_hw_eccoob_largepage;
- } else
- BUG();
-
-@@ -1152,8 +1187,13 @@ static int __init mxcnd_probe(struct pla
- this->options |= NAND_BUSWIDTH_16;
-
- if (pdata->flash_bbt) {
-- this->bbt_td = &bbt_main_descr;
-- this->bbt_md = &bbt_mirror_descr;
-+ if (nfc_is_v3_2()) {
-+ this->bbt_td = &v3bbt_main_descr;
-+ this->bbt_md = &v3bbt_mirror_descr;
-+ } else {
-+ this->bbt_td = &bbt_main_descr;
-+ this->bbt_md = &bbt_mirror_descr;
-+ }
- /* update flash based bbt */
- this->options |= NAND_USE_FLASH_BBT;
- }
diff --git a/patches/linux/2.6.38/240-armadeus-mxc_nand-fixes_bbt.patch b/patches/linux/2.6.38/240-armadeus-mxc_nand-fixes_bbt.patch
index a018702..0dabfb8 100644
--- a/patches/linux/2.6.38/240-armadeus-mxc_nand-fixes_bbt.patch
+++ b/patches/linux/2.6.38/240-armadeus-mxc_nand-fixes_bbt.patch
@@ -36,21 +36,3 @@ Index: linux-2.6.36/drivers/mtd/nand/mxc_nand.c
}
/* This function is used by upper layer for select and
-@@ -985,7 +996,7 @@
- static struct nand_bbt_descr bbt_main_descr = {
- .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
- | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-- .offs = 0,
-+ .offs = 12,
- .len = 4,
- .veroffs = 4,
- .maxblocks = 4,
-@@ -995,7 +1006,7 @@
- static struct nand_bbt_descr bbt_mirror_descr = {
- .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
- | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-- .offs = 0,
-+ .offs = 12,
- .len = 4,
- .veroffs = 4,
- .maxblocks = 4,
diff --git a/patches/linux/2.6.38/404-armadeus-fix_nand_ecc_oob.patch b/patches/linux/2.6.38/404-armadeus-fix_nand_ecc_oob.patch
deleted file mode 100644
index 47353a4..0000000
--- a/patches/linux/2.6.38/404-armadeus-fix_nand_ecc_oob.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Add OOB and bad block table management to the V3 mxc_nand driver
-
-Signed-off-by: Nicolas Colombain <nic...@ar...>
-
-Index: linux-2.6.38-alpha/drivers/mtd/nand/mxc_nand.c
-===================================================================
---- linux-2.6.38-alpha.orig/drivers/mtd/nand/mxc_nand.c 2010-12-29 10:33:52.000000000 +0100
-+++ linux-2.6.38-alpha/drivers/mtd/nand/mxc_nand.c 2010-12-29 10:35:26.000000000 +0100
-@@ -211,6 +211,18 @@
- }
- };
-
-+/* OOB description for V3 and 2048 byte pages with 64 byte OOB */
-+static struct nand_ecclayout nandv3_hw_eccoob_largepage = {
-+ .eccbytes = 4 * 8,
-+ .eccpos = {
-+ 8, 9, 10, 11, 12, 13, 14, 15,
-+ 72, 73, 74, 75, 76, 77, 78, 79,
-+ 136, 137, 138, 139, 140, 141, 142, 143,
-+ 200, 201, 202, 203, 204, 205, 206, 207
-+ },
-+ .oobfree = { {2, 4}, {16, 56}, {80, 56}, {144, 56}, {208, 48} },
-+};
-+
- #ifdef CONFIG_MTD_PARTITIONS
- static const char *part_probes[] = { "RedBoot", "cmdlinepart", NULL };
- #endif
-@@ -1002,6 +1014,28 @@
- .pattern = mirror_pattern,
- };
-
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_main_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = bbt_pattern
-+};
-+
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_mirror_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = mirror_pattern
-+};
-+
- static int __init mxcnd_probe(struct platform_device *pdev)
- {
- struct nand_chip *this;
-@@ -1117,7 +1151,7 @@
- host->get_dev_status = get_dev_status_v3;
- host->irq_control = irq_control_v3;
- oob_smallpage = &nandv2_hw_eccoob_smallpage;
-- oob_largepage = &nandv2_hw_eccoob_largepage;
-+ oob_largepage = &nandv3_hw_eccoob_largepage;
- } else
- BUG();
-
-@@ -1141,8 +1175,13 @@
- this->options |= NAND_BUSWIDTH_16;
-
- if (pdata->flash_bbt) {
-- this->bbt_td = &bbt_main_descr;
-- this->bbt_md = &bbt_mirror_descr;
-+ if (nfc_is_v3_2()) {
-+ this->bbt_td = &v3bbt_main_descr;
-+ this->bbt_md = &v3bbt_mirror_descr;
-+ } else {
-+ this->bbt_td = &bbt_main_descr;
-+ this->bbt_md = &bbt_mirror_descr;
-+ }
- /* update flash based bbt */
- this->options |= NAND_USE_FLASH_BBT;
- }
diff --git a/patches/linux/3.0/404-armadeus-fix_nand_ecc_oob.patch b/patches/linux/3.0/404-armadeus-fix_nand_ecc_oob.patch
deleted file mode 100644
index 8cace4c..0000000
--- a/patches/linux/3.0/404-armadeus-fix_nand_ecc_oob.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Add OOB and bad block table management to the V3 mxc_nand driver
-
-Signed-off-by: Nicolas Colombain <nic...@ar...>
-
-Index: linux-3.0.10/drivers/mtd/nand/mxc_nand.c
-===================================================================
---- linux-3.0.10.orig/drivers/mtd/nand/mxc_nand.c 2011-11-21 23:37:44.000000000 +0100
-+++ linux-3.0.10/drivers/mtd/nand/mxc_nand.c 2011-11-30 17:18:02.000000000 +0100
-@@ -243,6 +243,18 @@
- }
- };
-
-+/* OOB description for V3 and 2048 byte pages with 64 byte OOB */
-+static struct nand_ecclayout nandv3_hw_eccoob_largepage = {
-+ .eccbytes = 4 * 8,
-+ .eccpos = {
-+ 8, 9, 10, 11, 12, 13, 14, 15,
-+ 72, 73, 74, 75, 76, 77, 78, 79,
-+ 136, 137, 138, 139, 140, 141, 142, 143,
-+ 200, 201, 202, 203, 204, 205, 206, 207
-+ },
-+ .oobfree = { {2, 4}, {16, 56}, {80, 56}, {144, 56}, {208, 48} },
-+};
-+
- static const char *part_probes[] = { "RedBoot", "cmdlinepart", NULL };
-
- static irqreturn_t mxc_nfc_irq(int irq, void *dev_id)
-@@ -1037,6 +1049,28 @@
- .pattern = mirror_pattern,
- };
-
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_main_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = bbt_pattern
-+};
-+
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_mirror_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = mirror_pattern
-+};
-+
- static int __init mxcnd_probe(struct platform_device *pdev)
- {
- struct nand_chip *this;
-@@ -1152,7 +1186,7 @@
- host->get_dev_status = get_dev_status_v3;
- host->irq_control = irq_control_v3;
- oob_smallpage = &nandv2_hw_eccoob_smallpage;
-- oob_largepage = &nandv2_hw_eccoob_largepage;
-+ oob_largepage = &nandv3_hw_eccoob_largepage;
- } else
- BUG();
-
-@@ -1176,8 +1210,13 @@
- this->options |= NAND_BUSWIDTH_16;
-
- if (pdata->flash_bbt) {
-- this->bbt_td = &bbt_main_descr;
-- this->bbt_md = &bbt_mirror_descr;
-+ if (nfc_is_v3_2()) {
-+ this->bbt_td = &v3bbt_main_descr;
-+ this->bbt_md = &v3bbt_mirror_descr;
-+ } else {
-+ this->bbt_td = &bbt_main_descr;
-+ this->bbt_md = &bbt_mirror_descr;
-+ }
- /* update flash based bbt */
- this->options |= NAND_USE_FLASH_BBT;
- }
diff --git a/patches/linux/3.10/0404-armadeus-fix_nand_ecc_oob.patch b/patches/linux/3.10/0404-armadeus-fix_nand_ecc_oob.patch
deleted file mode 100644
index 8e7912a..0000000
--- a/patches/linux/3.10/0404-armadeus-fix_nand_ecc_oob.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Add OOB and bad block table management to the V3 mxc_nand driver
-
-Signed-off-by: Nicolas Colombain <nic...@ar...>
-
-Index: linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c
-===================================================================
---- linux-3.8-rc1.orig/drivers/mtd/nand/mxc_nand.c 2012-12-22 02:19:00.000000000 +0100
-+++ linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c 2013-01-04 15:03:40.000000000 +0100
-@@ -266,6 +266,18 @@
- }
- };
-
-+/* OOB description for V3 and 2048 byte pages with 64 byte OOB */
-+static struct nand_ecclayout nandv3_hw_eccoob_largepage = {
-+ .eccbytes = 4 * 8,
-+ .eccpos = {
-+ 8, 9, 10, 11, 12, 13, 14, 15,
-+ 72, 73, 74, 75, 76, 77, 78, 79,
-+ 136, 137, 138, 139, 140, 141, 142, 143,
-+ 200, 201, 202, 203, 204, 205, 206, 207
-+ },
-+ .oobfree = { {2, 4}, {16, 56}, {80, 56}, {144, 56}, {208, 48} },
-+};
-+
- static const char const *part_probes[] = {
- "cmdlinepart", "RedBoot", "ofpart", NULL };
-
-@@ -1147,6 +1159,28 @@
- .pattern = mirror_pattern,
- };
-
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_main_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = bbt_pattern
-+};
-+
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_mirror_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = mirror_pattern
-+};
-+
- /* v1 + irqpending_quirk: i.MX21 */
- static const struct mxc_nand_devtype_data imx21_nand_devtype_data = {
- .preset = preset_v1,
-@@ -1236,7 +1270,7 @@
- .irq_control = irq_control_v3,
- .get_ecc_status = get_ecc_status_v3,
- .ecclayout_512 = &nandv2_hw_eccoob_smallpage,
-- .ecclayout_2k = &nandv2_hw_eccoob_largepage,
-+ .ecclayout_2k = &nandv3_hw_eccoob_largepage,
- .ecclayout_4k = &nandv2_hw_eccoob_smallpage, /* XXX: needs fix */
- .select_chip = mxc_nand_select_chip_v1_v3,
- .correct_data = mxc_nand_correct_data_v2_v3,
-@@ -1482,8 +1516,13 @@
- this->options |= NAND_BUSWIDTH_16;
-
- if (host->pdata.flash_bbt) {
-- this->bbt_td = &bbt_main_descr;
-- this->bbt_md = &bbt_mirror_descr;
-+ if (is_imx51_nfc(host)) {
-+ this->bbt_td = &v3bbt_main_descr;
-+ this->bbt_md = &v3bbt_mirror_descr;
-+ } else {
-+ this->bbt_td = &bbt_main_descr;
-+ this->bbt_md = &bbt_mirror_descr;
-+ }
- /* update flash based bbt */
- this->bbt_options |= NAND_BBT_USE_FLASH;
- }
diff --git a/patches/linux/3.11/0404-armadeus-fix_nand_ecc_oob.patch b/patches/linux/3.11/0404-armadeus-fix_nand_ecc_oob.patch
deleted file mode 100644
index 8e7912a..0000000
--- a/patches/linux/3.11/0404-armadeus-fix_nand_ecc_oob.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Add OOB and bad block table management to the V3 mxc_nand driver
-
-Signed-off-by: Nicolas Colombain <nic...@ar...>
-
-Index: linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c
-===================================================================
---- linux-3.8-rc1.orig/drivers/mtd/nand/mxc_nand.c 2012-12-22 02:19:00.000000000 +0100
-+++ linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c 2013-01-04 15:03:40.000000000 +0100
-@@ -266,6 +266,18 @@
- }
- };
-
-+/* OOB description for V3 and 2048 byte pages with 64 byte OOB */
-+static struct nand_ecclayout nandv3_hw_eccoob_largepage = {
-+ .eccbytes = 4 * 8,
-+ .eccpos = {
-+ 8, 9, 10, 11, 12, 13, 14, 15,
-+ 72, 73, 74, 75, 76, 77, 78, 79,
-+ 136, 137, 138, 139, 140, 141, 142, 143,
-+ 200, 201, 202, 203, 204, 205, 206, 207
-+ },
-+ .oobfree = { {2, 4}, {16, 56}, {80, 56}, {144, 56}, {208, 48} },
-+};
-+
- static const char const *part_probes[] = {
- "cmdlinepart", "RedBoot", "ofpart", NULL };
-
-@@ -1147,6 +1159,28 @@
- .pattern = mirror_pattern,
- };
-
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_main_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = bbt_pattern
-+};
-+
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_mirror_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = mirror_pattern
-+};
-+
- /* v1 + irqpending_quirk: i.MX21 */
- static const struct mxc_nand_devtype_data imx21_nand_devtype_data = {
- .preset = preset_v1,
-@@ -1236,7 +1270,7 @@
- .irq_control = irq_control_v3,
- .get_ecc_status = get_ecc_status_v3,
- .ecclayout_512 = &nandv2_hw_eccoob_smallpage,
-- .ecclayout_2k = &nandv2_hw_eccoob_largepage,
-+ .ecclayout_2k = &nandv3_hw_eccoob_largepage,
- .ecclayout_4k = &nandv2_hw_eccoob_smallpage, /* XXX: needs fix */
- .select_chip = mxc_nand_select_chip_v1_v3,
- .correct_data = mxc_nand_correct_data_v2_v3,
-@@ -1482,8 +1516,13 @@
- this->options |= NAND_BUSWIDTH_16;
-
- if (host->pdata.flash_bbt) {
-- this->bbt_td = &bbt_main_descr;
-- this->bbt_md = &bbt_mirror_descr;
-+ if (is_imx51_nfc(host)) {
-+ this->bbt_td = &v3bbt_main_descr;
-+ this->bbt_md = &v3bbt_mirror_descr;
-+ } else {
-+ this->bbt_td = &bbt_main_descr;
-+ this->bbt_md = &bbt_mirror_descr;
-+ }
- /* update flash based bbt */
- this->bbt_options |= NAND_BBT_USE_FLASH;
- }
diff --git a/patches/linux/3.12/0404-armadeus-fix_nand_ecc_oob.patch b/patches/linux/3.12/0404-armadeus-fix_nand_ecc_oob.patch
deleted file mode 100644
index e88a820..0000000
--- a/patches/linux/3.12/0404-armadeus-fix_nand_ecc_oob.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: linux-3.12-rc1/drivers/mtd/nand/mxc_nand.c
-===================================================================
---- linux-3.12-rc1.orig/drivers/mtd/nand/mxc_nand.c
-+++ linux-3.12-rc1/drivers/mtd/nand/mxc_nand.c
-@@ -266,6 +266,18 @@ static struct nand_ecclayout nandv2_hw_e
- }
- };
-
-+/* OOB description for V3 and 2048 byte pages with 64 byte OOB */
-+static struct nand_ecclayout nandv3_hw_eccoob_largepage = {
-+ .eccbytes = 4 * 8,
-+ .eccpos = {
-+ 8, 9, 10, 11, 12, 13, 14, 15,
-+ 72, 73, 74, 75, 76, 77, 78, 79,
-+ 136, 137, 138, 139, 140, 141, 142, 143,
-+ 200, 201, 202, 203, 204, 205, 206, 207
-+ },
-+ .oobfree = { {2, 4}, {16, 56}, {80, 56}, {144, 56}, {208, 48} },
-+};
-+
- static const char * const part_probes[] = {
- "cmdlinepart", "RedBoot", "ofpart", NULL };
-
-@@ -1158,6 +1170,28 @@ static struct nand_bbt_descr bbt_mirror_
- .pattern = mirror_pattern,
- };
-
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_main_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = bbt_pattern
-+};
-+
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_mirror_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = mirror_pattern
-+};
-+
- /* v1 + irqpending_quirk: i.MX21 */
- static const struct mxc_nand_devtype_data imx21_nand_devtype_data = {
- .preset = preset_v1,
-@@ -1247,7 +1281,7 @@ static const struct mxc_nand_devtype_dat
- .irq_control = irq_control_v3,
- .get_ecc_status = get_ecc_status_v3,
- .ecclayout_512 = &nandv2_hw_eccoob_smallpage,
-- .ecclayout_2k = &nandv2_hw_eccoob_largepage,
-+ .ecclayout_2k = &nandv3_hw_eccoob_largepage,
- .ecclayout_4k = &nandv2_hw_eccoob_smallpage, /* XXX: needs fix */
- .select_chip = mxc_nand_select_chip_v1_v3,
- .correct_data = mxc_nand_correct_data_v2_v3,
-@@ -1489,8 +1523,13 @@ static int mxcnd_probe(struct platform_d
- this->options |= NAND_BUSWIDTH_16;
-
- if (host->pdata.flash_bbt) {
-- this->bbt_td = &bbt_main_descr;
-- this->bbt_md = &bbt_mirror_descr;
-+ if (is_imx51_nfc(host)) {
-+ this->bbt_td = &v3bbt_main_descr;
-+ this->bbt_md = &v3bbt_mirror_descr;
-+ } else {
-+ this->bbt_td = &bbt_main_descr;
-+ this->bbt_md = &bbt_mirror_descr;
-+ }
- /* update flash based bbt */
- this->bbt_options |= NAND_BBT_USE_FLASH;
- }
diff --git a/patches/linux/3.8/0404-armadeus-fix_nand_ecc_oob.patch b/patches/linux/3.8/0404-armadeus-fix_nand_ecc_oob.patch
deleted file mode 100644
index 8e7912a..0000000
--- a/patches/linux/3.8/0404-armadeus-fix_nand_ecc_oob.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Add OOB and bad block table management to the V3 mxc_nand driver
-
-Signed-off-by: Nicolas Colombain <nic...@ar...>
-
-Index: linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c
-===================================================================
---- linux-3.8-rc1.orig/drivers/mtd/nand/mxc_nand.c 2012-12-22 02:19:00.000000000 +0100
-+++ linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c 2013-01-04 15:03:40.000000000 +0100
-@@ -266,6 +266,18 @@
- }
- };
-
-+/* OOB description for V3 and 2048 byte pages with 64 byte OOB */
-+static struct nand_ecclayout nandv3_hw_eccoob_largepage = {
-+ .eccbytes = 4 * 8,
-+ .eccpos = {
-+ 8, 9, 10, 11, 12, 13, 14, 15,
-+ 72, 73, 74, 75, 76, 77, 78, 79,
-+ 136, 137, 138, 139, 140, 141, 142, 143,
-+ 200, 201, 202, 203, 204, 205, 206, 207
-+ },
-+ .oobfree = { {2, 4}, {16, 56}, {80, 56}, {144, 56}, {208, 48} },
-+};
-+
- static const char const *part_probes[] = {
- "cmdlinepart", "RedBoot", "ofpart", NULL };
-
-@@ -1147,6 +1159,28 @@
- .pattern = mirror_pattern,
- };
-
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_main_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = bbt_pattern
-+};
-+
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_mirror_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = mirror_pattern
-+};
-+
- /* v1 + irqpending_quirk: i.MX21 */
- static const struct mxc_nand_devtype_data imx21_nand_devtype_data = {
- .preset = preset_v1,
-@@ -1236,7 +1270,7 @@
- .irq_control = irq_control_v3,
- .get_ecc_status = get_ecc_status_v3,
- .ecclayout_512 = &nandv2_hw_eccoob_smallpage,
-- .ecclayout_2k = &nandv2_hw_eccoob_largepage,
-+ .ecclayout_2k = &nandv3_hw_eccoob_largepage,
- .ecclayout_4k = &nandv2_hw_eccoob_smallpage, /* XXX: needs fix */
- .select_chip = mxc_nand_select_chip_v1_v3,
- .correct_data = mxc_nand_correct_data_v2_v3,
-@@ -1482,8 +1516,13 @@
- this->options |= NAND_BUSWIDTH_16;
-
- if (host->pdata.flash_bbt) {
-- this->bbt_td = &bbt_main_descr;
-- this->bbt_md = &bbt_mirror_descr;
-+ if (is_imx51_nfc(host)) {
-+ this->bbt_td = &v3bbt_main_descr;
-+ this->bbt_md = &v3bbt_mirror_descr;
-+ } else {
-+ this->bbt_td = &bbt_main_descr;
-+ this->bbt_md = &bbt_mirror_descr;
-+ }
- /* update flash based bbt */
- this->bbt_options |= NAND_BBT_USE_FLASH;
- }
diff --git a/patches/linux/3.9/0404-armadeus-fix_nand_ecc_oob.patch b/patches/linux/3.9/0404-armadeus-fix_nand_ecc_oob.patch
deleted file mode 100644
index 8e7912a..0000000
--- a/patches/linux/3.9/0404-armadeus-fix_nand_ecc_oob.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Add OOB and bad block table management to the V3 mxc_nand driver
-
-Signed-off-by: Nicolas Colombain <nic...@ar...>
-
-Index: linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c
-===================================================================
---- linux-3.8-rc1.orig/drivers/mtd/nand/mxc_nand.c 2012-12-22 02:19:00.000000000 +0100
-+++ linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c 2013-01-04 15:03:40.000000000 +0100
-@@ -266,6 +266,18 @@
- }
- };
-
-+/* OOB description for V3 and 2048 byte pages with 64 byte OOB */
-+static struct nand_ecclayout nandv3_hw_eccoob_largepage = {
-+ .eccbytes = 4 * 8,
-+ .eccpos = {
-+ 8, 9, 10, 11, 12, 13, 14, 15,
-+ 72, 73, 74, 75, 76, 77, 78, 79,
-+ 136, 137, 138, 139, 140, 141, 142, 143,
-+ 200, 201, 202, 203, 204, 205, 206, 207
-+ },
-+ .oobfree = { {2, 4}, {16, 56}, {80, 56}, {144, 56}, {208, 48} },
-+};
-+
- static const char const *part_probes[] = {
- "cmdlinepart", "RedBoot", "ofpart", NULL };
-
-@@ -1147,6 +1159,28 @@
- .pattern = mirror_pattern,
- };
-
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_main_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = bbt_pattern
-+};
-+
-+/* V3 BBT, use 4bit ECC */
-+static struct nand_bbt_descr v3bbt_mirror_descr = {
-+ .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
-+ | NAND_BBT_4BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
-+ .offs = 2,
-+ .len = 4,
-+ .veroffs = 6,
-+ .maxblocks = 4,
-+ .pattern = mirror_pattern
-+};
-+
- /* v1 + irqpending_quirk: i.MX21 */
- static const struct mxc_nand_devtype_data imx21_nand_devtype_data = {
- .preset = preset_v1,
-@@ -1236,7 +1270,7 @@
- .irq_control = irq_control_v3,
- .get_ecc_status = get_ecc_status_v3,
- .ecclayout_512 = &nandv2_hw_eccoob_smallpage,
-- .ecclayout_2k = &nandv2_hw_eccoob_largepage,
-+ .ecclayout_2k = &nandv3_hw_eccoob_largepage,
- .ecclayout_4k = &nandv2_hw_eccoob_smallpage, /* XXX: needs fix */
- .select_chip = mxc_nand_select_chip_v1_v3,
- .correct_data = mxc_nand_correct_data_v2_v3,
-@@ -1482,8 +1516,13 @@
- this->options |= NAND_BUSWIDTH_16;
-
- if (host->pdata.flash_bbt) {
-- this->bbt_td = &bbt_main_descr;
-- this->bbt_md = &bbt_mirror_descr;
-+ if (is_imx51_nfc(host)) {
-+ this->bbt_td = &v3bbt_main_descr;
-+ this->bbt_md = &v3bbt_mirror_descr;
-+ } else {
-+ this->bbt_td = &bbt_main_descr;
-+ this->bbt_md = &bbt_mirror_descr;
-+ }
- /* update flash based bbt */
- this->bbt_options |= NAND_BBT_USE_FLASH;
- }
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-26 08:17:23
|
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 f304afb94f5d54cdac0cc40d19832c0ddce6aee8 (commit)
from b71a641ac4aff3b370b9c36a9414bd87c9537198 (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 f304afb94f5d54cdac0cc40d19832c0ddce6aee8
Author: Eric Jarrige <eri...@ar...>
Date: Thu Sep 26 10:29:21 2013 +0200
[UBOOT] apf51: cleanup
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf51/apf51-u-boot-2013.04.h | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
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 8028d90..3edf1ce 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
@@ -278,13 +278,9 @@
#define CONFIG_SYS_NAND_5_ADDR_CYCLE
#define CONFIG_SYS_NAND_PAGE_COUNT 64
#define CONFIG_SYS_NAND_PAGE_SIZE 2048
-#define CONFIG_SYS_NAND_OOBSIZE 64
#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024)
-#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS
-#define CONFIG_SYS_NAND_ECCPOS {2, 3, 4, 5, 6, 7, 8, 9,\
- 10, 11, 12, 13}
-#define CONFIG_SYS_NAND_ECCSIZE 512
-#define CONFIG_SYS_NAND_ECCBYTES 3
+#define CONFIG_SYS_NAND_BAD_BLOCK_POS 0
+#define CONFIG_SYS_NAND_OOBSIZE 64
#define CONFIG_SYS_DIRECT_FLASH_TFTP
#define CONFIG_FLASH_SHOW_PROGRESS 45
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-26 08:16:27
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b71a641ac4aff3b370b9c36a9414bd87c9537198 (commit)
from 9b5ce6a56f19d55af28d18cf449ef141bf7b3ef4 (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 b71a641ac4aff3b370b9c36a9414bd87c9537198
Author: Eric Jarrige <eri...@ar...>
Date: Thu Sep 26 10:28:32 2013 +0200
[UBOOT] apf27: Fix ubifsmount command
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2013.04.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
index 42e96ab..7d146bd 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
@@ -107,7 +107,7 @@
#define PHYS_SDRAM_1 0xA0000000
#define PHYS_SDRAM_2 0xB0000000
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
-#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (512<<10))
+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (2 * 1024 * 1024))
#define CONFIG_SYS_MEMTEST_START 0xA0000000 /* memtest test area */
#define CONFIG_SYS_MEMTEST_END 0xA0300000 /* 3 MiB RAM test */
@@ -263,6 +263,7 @@
#define CONFIG_MXC_NAND_HWECC
#define CONFIG_SYS_NAND_LARGEPAGE
+#define CONFIG_SYS_NAND_USE_FLASH_BBT
#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
#define NAND_MAX_CHIPS 1
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2013-09-26 08:14:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 9b5ce6a56f19d55af28d18cf449ef141bf7b3ef4 (commit)
from ddca74369c6ff3ac216070da1e963db1fbb3b73e (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 9b5ce6a56f19d55af28d18cf449ef141bf7b3ef4
Author: Eric Jarrige <eri...@ar...>
Date: Thu Sep 26 10:26:21 2013 +0200
[BUILDROOT] Fix rootfs name for the apf boards
-----------------------------------------------------------------------
Summary of changes:
buildroot/target/device/armadeus/Makefile.in | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 786646c..c4c8711 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -95,4 +95,11 @@ endef
LINUX_POST_INSTALL_TARGET_HOOKS += LINUX_POST_INSTALL_TARGET_ACTION
+$(BINARIES_DIR)/$(BOARD_NAME)-rootfs.%: $(BINARIES_DIR)/rootfs.%
+ mv -f $< $@
+
+ROOTFS_JFFS2_POST_TARGETS += $(BINARIES_DIR)/$(BOARD_NAME)-rootfs.jffs2
+ROOTFS_UBI_POST_TARGETS += $(BINARIES_DIR)/$(BOARD_NAME)-rootfs.ubi
+ROOTFS_TAR_POST_TARGETS += $(BINARIES_DIR)/$(BOARD_NAME)-rootfs.tar
+
endif
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2013-09-25 08:22:14
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ddca74369c6ff3ac216070da1e963db1fbb3b73e (commit)
from 37c02d2c14843d32b5ec58fedd82b80341bc830c (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 ddca74369c6ff3ac216070da1e963db1fbb3b73e
Author: Fabien Marteau <fab...@ar...>
Date: Wed Sep 25 10:21:40 2013 +0200
as_devices: fix as_gpio.h comments
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/c/as_gpio.h | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/target/packages/as_devices/c/as_gpio.h b/target/packages/as_devices/c/as_gpio.h
index e6d251f..f390020 100644
--- a/target/packages/as_devices/c/as_gpio.h
+++ b/target/packages/as_devices/c/as_gpio.h
@@ -94,7 +94,9 @@ int32_t as_gpio_get_pin_value(struct as_gpio_device *aDev);
* @param aDev as_gpio_device pointer structure
* @param aDelay_ms timeout in milliseconds
*
- * @return pin value if positive or null, read error if -1, timeout if -10
+ * @return pin value if positive or null,
+ * read error if -1,
+ * timeout if -ETIMEDOUT
*/
int32_t as_gpio_wait_event(struct as_gpio_device *aDev, int aDelay_ms);
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2013-09-22 19:04:14
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 37c02d2c14843d32b5ec58fedd82b80341bc830c (commit)
from ae629479371fb96350c7f8d46d21a79e7653666e (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 37c02d2c14843d32b5ec58fedd82b80341bc830c
Author: Julien Boibessot <jul...@ar...>
Date: Sun Sep 22 21:03:49 2013 +0200
[BUILDROOT][2013.05] Remove hacks to rename rootfs images and use BR normal way of doing it
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 1 +
buildroot/configs/apf27_webradio_defconfig | 1 +
buildroot/configs/apf27test_defconfig | 1 +
buildroot/configs/apf28_defconfig | 1 +
buildroot/configs/apf28test_defconfig | 1 +
buildroot/configs/apf51_defconfig | 1 +
buildroot/configs/apf51mainline_defconfig | 1 +
buildroot/configs/apf51test_defconfig | 1 +
buildroot/configs/apf9328_defconfig | 1 +
buildroot/configs/apf9328test_defconfig | 1 +
buildroot/configs/pps51_defconfig | 1 +
buildroot/configs/pps_defconfig | 1 +
.../device/armadeus/rootfs/post_image_creation.sh | 16 ++++++++++
...linux-add-board-name-to-initrd-image-name.patch | 18 ------------
...ffs2-add_board_name_to_binary_rootfs_name.patch | 30 --------------------
15 files changed, 28 insertions(+), 48 deletions(-)
create mode 100755 buildroot/target/device/armadeus/rootfs/post_image_creation.sh
delete mode 100644 patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch
delete mode 100644 patches/buildroot/2013.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 0c60dbe..7859c87 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -28,6 +28,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 2f63a7c..6bade92 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -29,6 +29,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index 60acf9c..edb9230 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -28,6 +28,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf27"
BR2_CPU_NAME="imx27"
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index e0ce2c3..235c7eb 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -28,6 +28,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttyAM0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf28"
BR2_CPU_NAME="imx28"
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 192032a..c7dbc27 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -28,6 +28,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttyAM0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf28"
BR2_CPU_NAME="imx28"
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 440ee1f..c03bf9e 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -31,6 +31,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf51"
BR2_CPU_NAME="imx51"
diff --git a/buildroot/configs/apf51mainline_defconfig b/buildroot/configs/apf51mainline_defconfig
index 93f139f..79e197a 100644
--- a/buildroot/configs/apf51mainline_defconfig
+++ b/buildroot/configs/apf51mainline_defconfig
@@ -28,6 +28,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf51"
BR2_CPU_NAME="imx51"
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index 3c29091..c5a310f 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -30,6 +30,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf51"
BR2_CPU_NAME="imx51"
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index 3b3e243..29f9c09 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -29,6 +29,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf9328"
BR2_CPU_NAME="imxl"
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 89fc550..8044716 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -29,6 +29,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf9328"
BR2_CPU_NAME="imxl"
diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index 8f49ab1..11135ff 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -32,6 +32,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="pps51"
BR2_CPU_NAME="imx51"
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 51ae4de..d09f62b 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -26,6 +26,7 @@ BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="$(ARMADEUS_PATH)/rootfs/target_skeleton"
BR2_TARGET_GENERIC_GETTY_PORT="ttySMX0"
BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_image_creation.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="pps"
BR2_CPU_NAME="imx27"
diff --git a/buildroot/target/device/armadeus/rootfs/post_image_creation.sh b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
new file mode 100755
index 0000000..0659532
--- /dev/null
+++ b/buildroot/target/device/armadeus/rootfs/post_image_creation.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# Create custom directories and links of Armadeus rootfs
+#
+
+if [ ! -d "$1" ]; then
+ echo "Target directory ($1) not valid !"
+ exit 1
+fi
+
+BOARD_NAME=`grep 'BR2_BOARD_NAME=' $BUILDROOT_CONFIG | cut -d = -f 2 | sed s/\"//g`
+if [ "$BOARD_NAME" != "" ]; then
+ mv -u $1/rootfs.ubi $1/$BOARD_NAME-rootfs.ubi
+fi
+
+exit 0
diff --git a/patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch b/patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch
deleted file mode 100644
index 5bdc59a..0000000
--- a/patches/buildroot/2013.05/073-armadeus-linux-add-board-name-to-initrd-image-name.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-We rename images in binaries/ directory, so take that into account when Linux
-needs to find cpio image to generate initrd.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/linux/linux.mk
-===================================================================
---- buildroot.orig/linux/linux.mk 2013-09-20 17:00:19.172366934 +0200
-+++ buildroot/linux/linux.mk 2013-09-20 17:00:53.184535598 +0200
-@@ -185,7 +185,7 @@
- $(if $(BR2_TARGET_ROOTFS_INITRAMFS),
- touch $(BINARIES_DIR)/rootfs.cpio
- $(call KCONFIG_ENABLE_OPT,CONFIG_BLK_DEV_INITRD,$(@D)/.config)
-- $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/rootfs.cpio\",$(@D)/.config)
-+ $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,\"$(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.cpio\",$(@D)/.config)
- $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)
- $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_GID,0,$(@D)/.config)
- $(call KCONFIG_DISABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_NONE,$(@D)/.config)
diff --git a/patches/buildroot/2013.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch b/patches/buildroot/2013.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch
deleted file mode 100644
index 86319ea..0000000
--- a/patches/buildroot/2013.05/134-jffs2-add_board_name_to_binary_rootfs_name.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Add "BR2_BOARD_NAME" prefix to the rootfs binary filename.
-
-Specific for Armadeus.
-
-Signed-off-by: Jérémie Scheer <jer...@ar...>
-
-Index: buildroot/fs/common.mk
-===================================================================
---- buildroot.orig/fs/common.mk 2012-02-21 16:43:25.000000000 +0100
-+++ buildroot/fs/common.mk 2012-02-21 16:45:54.000000000 +0100
-@@ -42,8 +42,8 @@
- # extra deps
- ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs $$(if $$(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma) $$(if $$(BR2_TARGET_ROOTFS_$(2)_LZO),host-lzop) $$(if $$(BR2_TARGET_ROOTFS_$(2)_XZ),host-xz)
-
--$$(BINARIES_DIR)/rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES)
-- @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
-+$$(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.$(1): $$(ROOTFS_$(2)_DEPENDENCIES)
-+ @$$(call MESSAGE,"Generating root filesystem image $(BR2_BOARD_NAME)-rootfs.$(1)")
- $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep))
- rm -f $$(FAKEROOT_SCRIPT)
- rm -f $$(TARGET_DIR_WARNING_FILE)
-@@ -83,7 +83,7 @@
- rootfs-$(1)-show-depends:
- @echo $$(ROOTFS_$(2)_DEPENDENCIES)
-
--rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1) $$(ROOTFS_$(2)_POST_TARGETS)
-+rootfs-$(1): $$(BINARIES_DIR)/$(BR2_BOARD_NAME)-rootfs.$(1) $$(ROOTFS_$(2)_POST_TARGETS)
-
- ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)
- TARGETS += rootfs-$(1)
hooks/post-receive
--
armadeus
|
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2013-09-22 11:05: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 ae629479371fb96350c7f8d46d21a79e7653666e (commit)
from 08e0cdb7828c27b5fca456d6ecf6fa8def1e94f3 (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 ae629479371fb96350c7f8d46d21a79e7653666e
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Sun Sep 22 13:05:19 2013 +0200
[LINUX][3.12] apf27 & apf27dev: dts: Add pinctrl for peripherals
-----------------------------------------------------------------------
Summary of changes:
...us-apf27-apf27dev-dts-peripherals_pinctrl.patch | 44 ++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
create mode 100644 patches/linux/3.12/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch
diff --git a/patches/linux/3.12/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch b/patches/linux/3.12/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch
new file mode 100644
index 0000000..ab137d5
--- /dev/null
+++ b/patches/linux/3.12/0217-armadeus-apf27-apf27dev-dts-peripherals_pinctrl.patch
@@ -0,0 +1,44 @@
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+Index: linux-3.12-rc1/arch/arm/boot/dts/imx27-apf27.dts
+===================================================================
+--- linux-3.12-rc1.orig/arch/arm/boot/dts/imx27-apf27.dts
++++ linux-3.12-rc1/arch/arm/boot/dts/imx27-apf27.dts
+@@ -35,10 +35,14 @@
+ };
+
+ &uart1 {
++ pinctrl-0 = <&pinctrl_uart1_1>;
++ pinctrl-names = "default";
+ status = "okay";
+ };
+
+ &fec {
++ pinctrl-0 = <&pinctrl_fec1_1>;
++ pinctrl-names = "default";
+ status = "okay";
+ };
+
+Index: linux-3.12-rc1/arch/arm/boot/dts/imx27-apf27dev.dts
+===================================================================
+--- linux-3.12-rc1.orig/arch/arm/boot/dts/imx27-apf27dev.dts
++++ linux-3.12-rc1/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -76,6 +76,8 @@
+
+ &i2c1 {
+ clock-frequency = <400000>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c1_1>;
+ status = "okay";
+
+ rtc@68 {
+@@ -85,6 +87,8 @@
+ };
+
+ &i2c2 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_i2c2_1>;
+ status = "okay";
+ };
+
hooks/post-receive
--
armadeus
|
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2013-09-22 11:02: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 08e0cdb7828c27b5fca456d6ecf6fa8def1e94f3 (commit)
from bdf0372f96463a88977efc7a5bb7a786e9a05c23 (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 08e0cdb7828c27b5fca456d6ecf6fa8def1e94f3
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Sun Sep 22 13:03:00 2013 +0200
[LINUX][3.12] apf27 & apf27dev: dts: Add pinctrl for peripherals
-----------------------------------------------------------------------
Summary of changes:
...armadeus-imx27-apf27dev-add_imxfb_support.patch | 2 +-
...-imx27-apf27dev-add_pinctrl_for_cspi_node.patch | 4 ++--
...-armadeus-imx27-apf27dev-add_sdhc_support.patch | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/patches/linux/3.12/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch b/patches/linux/3.12/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
index 1a94c96..c1126c6 100644
--- a/patches/linux/3.12/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
+++ b/patches/linux/3.12/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
@@ -41,7 +41,7 @@ Index: linux-3.11-rc3/arch/arm/boot/dts/imx27-apf27dev.dts
+ fsl,pwmr = <0x00a903ff>;
+ fsl,dmacr = <0x00020010>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_imxfb>;
++ pinctrl-0 = <&pinctrl_imxfb1_1>;
+ status = "okay";
+};
+
diff --git a/patches/linux/3.12/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch b/patches/linux/3.12/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
index 997c37b..1fec092 100644
--- a/patches/linux/3.12/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
+++ b/patches/linux/3.12/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
@@ -10,7 +10,7 @@ Index: linux-3.11-rc4/arch/arm/boot/dts/imx27-apf27dev.dts
fsl,spi-num-chipselects = <1>;
cs-gpios = <&gpio4 28 1>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_cspi1>;
++ pinctrl-0 = <&pinctrl_cspi1_1>;
status = "okay";
};
@@ -19,7 +19,7 @@ Index: linux-3.11-rc4/arch/arm/boot/dts/imx27-apf27dev.dts
cs-gpios = <&gpio4 21 1>, <&gpio4 27 1>,
<&gpio2 17 1>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_cspi2>;
++ pinctrl-0 = <&pinctrl_cspi2_1>;
status = "okay";
};
diff --git a/patches/linux/3.12/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch b/patches/linux/3.12/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
index 115962e..cce0992 100644
--- a/patches/linux/3.12/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
+++ b/patches/linux/3.12/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
@@ -19,6 +19,6 @@ Index: linux-3.12-rc1/arch/arm/boot/dts/imx27-apf27dev.dts
+ bus-width = <4>;
+ cd-gpios = <&gpio3 14 0>;
+ pinctrl-names = "default";
-+ pinctrl-0 = <&pinctrl_sdhc2>;
++ pinctrl-0 = <&pinctrl_sdhc2_1>;
+ status = "okay";
+};
hooks/post-receive
--
armadeus
|
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2013-09-22 10:09:57
|
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 bdf0372f96463a88977efc7a5bb7a786e9a05c23 (commit)
from 85ec268dd7c6cf30f2a23fae96f15ba32b846ff7 (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 bdf0372f96463a88977efc7a5bb7a786e9a05c23
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Sun Sep 22 12:10:14 2013 +0200
[LINUX][3.12] Add APF28 config for 3.12(-rc1)
-----------------------------------------------------------------------
Summary of changes:
...nux-3.11.config => apf28-linux-3.12-rc1.config} | 3 +++
...8-linux-3.11.config => apf28-linux-3.12.config} | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.11.config => apf28-linux-3.12-rc1.config} (98%)
copy buildroot/target/device/armadeus/apf28/{apf28-linux-3.11.config => apf28-linux-3.12.config} (98%)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12-rc1.config
similarity index 98%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.11.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.12-rc1.config
index 2393a05..cb875e4 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12-rc1.config
@@ -130,6 +130,9 @@ CONFIG_USB_ACM=y
CONFIG_USB_PRINTER=y
CONFIG_USB_WDM=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_MXS_PHY=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DEBUG_FILES=y
CONFIG_USB_ETH=m
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.config
similarity index 98%
copy from buildroot/target/device/armadeus/apf28/apf28-linux-3.11.config
copy to buildroot/target/device/armadeus/apf28/apf28-linux-3.12.config
index 2393a05..cb875e4 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-3.11.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-3.12.config
@@ -130,6 +130,9 @@ CONFIG_USB_ACM=y
CONFIG_USB_PRINTER=y
CONFIG_USB_WDM=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_MXS_PHY=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DEBUG_FILES=y
CONFIG_USB_ETH=m
hooks/post-receive
--
armadeus
|
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2013-09-22 10:07:49
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 85ec268dd7c6cf30f2a23fae96f15ba32b846ff7 (commit)
via dfe6067f010dc43ff103b114caecb51f0c0fd24b (commit)
via 8c2805ba6391e3b5dac307287d738aed9fe007ed (commit)
from f136d1e302a1b3bcc3412cd11b0406d0e4c42a58 (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 85ec268dd7c6cf30f2a23fae96f15ba32b846ff7
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Sun Sep 22 12:07:53 2013 +0200
[LINUX][3.12] adapt patches 0209, 0213, 0214, 0404, 0408, 0409, 0441, 0443 from 3.11
commit dfe6067f010dc43ff103b114caecb51f0c0fd24b
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Sun Sep 22 12:06:20 2013 +0200
[LINUX][3.12] imx27: Update patches 0206* with latest version provided
commit 8c2805ba6391e3b5dac307287d738aed9fe007ed
Author: Gwenhael Goavec-Merou <gwe...@tr...>
Date: Sun Sep 22 12:05:52 2013 +0200
[LINUX][3.12] Add support for 3.12(-rc1)
-----------------------------------------------------------------------
Summary of changes:
patches/linux/3.12-rc1 | 1 +
...15-armadeus-logo-add_armadeus-project_tux.patch | 0
.../{3.10 => 3.12}/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.12}/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
...eus-clock_correct_mxc_decode_pll_for_imx1.tofix | 0
...madeus-clock-imx1_avoid_crash_with_module.tofix | 0
.../0200-armadeus-add_apf27_module.patch | 0
.../0201-armadeus-add_apf27dev_baseboard.patch | 0
...armadeus-mx27-ehci-mxc-add_per_clk_enable.patch | 0
...rmadeus-mx27-imxfb-fix_pwm_contrast_issue.patch | 0
.../0206-a-linaro-imx-imx1_core_driver.patch} | 390 +++++++++++---------
...6-b-linaro-imx27-imx27_pincontrol_driver.patch} | 60 ++--
.../0206-c-imx-dts-pin_functions.patch} | 18 +-
.../3.12/0206-d-linaro-dts-imx27-pinctrl.patch | 141 +++++++
.../0206-e-linaro-imx27-enable_pinctrl.patch} | 2 +-
.../0207-armadeus-apf27dev-add_hog_pinctrl.patch | 0
...madeus-imx27_dtsi-add_framebuffer_pinctrl.patch | 48 +++
...armadeus-imx27-apf27dev-add_imxfb_support.patch | 0
...re_to_setup_PWM_Contrast_Control_Register.patch | 0
.../0212-armadeus-imx27-fix_cspi_per_clk_id.patch | 0
.../3.12/0213-armadeus-add_cspi_pinctrl.patch | 40 ++
.../0214-armadeus-add_cspi_and_sdhc_pinctrl.patch | 27 ++
...-imx27-apf27dev-add_pinctrl_for_cspi_node.patch | 0
...-armadeus-imx27-apf27dev-add_sdhc_support.patch | 14 +-
.../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
.../0404-armadeus-fix_nand_ecc_oob.patch | 20 +-
..._possibility_to_deactivate_SDIO_interrupt.patch | 0
...-imx51_dts-add_usbphy_for_host1_and_host2.patch | 0
...51-chipidea-usbmisc_imx-add_imx51_support.patch | 50 ++--
...adeus-chipidea-add_node_to_select_clk_phy.patch | 29 ++
.../0420-armadeus-Add-apf28dev-dts.patch | 0
..._star_completion_for_source_in_menuconfig.patch | 21 +-
...low_to_use_the_wakeupalarm_functionnality.patch | 0
...0443-armadeus-apf28-fix_mac_address_issue.patch | 24 +-
48 files changed, 601 insertions(+), 284 deletions(-)
create mode 120000 patches/linux/3.12-rc1
copy patches/linux/{common => 3.12}/0015-armadeus-logo-add_armadeus-project_tux.patch (100%)
copy patches/linux/{3.10 => 3.12}/0021-armadeus-apf9328.patch (100%)
copy patches/linux/{3.10 => 3.12}/0024-armadeus-apf9328-add_board_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.12}/0025-armadeus-imx-correct_dma_shift.patch (100%)
copy patches/linux/{3.10 => 3.12}/0029-armadeus-add_csi_and_spi_registers.patch (100%)
copy patches/linux/{3.10 => 3.12}/0029b-armadeus-add_csi_registers.patch (100%)
copy patches/linux/{3.10 => 3.12}/0030-armadeus-devices-imx1-add_udc_registration.patch (100%)
copy patches/linux/{3.10 => 3.12}/0035-armadeus-re_add_pwm_and_correct_driver.tofix (100%)
copy patches/linux/{3.10 => 3.12}/0050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
copy patches/linux/{3.10 => 3.12}/0073-armadeus-tsc2102.patch (100%)
copy patches/linux/{3.10 => 3.12}/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.12}/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch (100%)
copy patches/linux/{3.10 => 3.12}/0074-armadeus-tsc2102-touchscreen.patch (100%)
copy patches/linux/{3.10 => 3.12}/0075-armadeus-spi2-reg-defines.patch (100%)
copy patches/linux/{3.10 => 3.12}/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix (100%)
copy patches/linux/{3.10 => 3.12}/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix (100%)
copy patches/linux/{3.10 => 3.12}/0200-armadeus-add_apf27_module.patch (100%)
copy patches/linux/{3.10 => 3.12}/0201-armadeus-add_apf27dev_baseboard.patch (100%)
copy patches/linux/{3.10 => 3.12}/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch (100%)
copy patches/linux/{3.11 => 3.12}/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch (100%)
copy patches/linux/{3.11/0206-c-linaro-imx1-pinctrl-core-driver.patch => 3.12/0206-a-linaro-imx-imx1_core_driver.patch} (65%)
copy patches/linux/{3.11/0206-d-linaro-imx27-pinctrl-imx27_pincontrol_driver.patch => 3.12/0206-b-linaro-imx27-imx27_pincontrol_driver.patch} (94%)
copy patches/linux/{3.11/0206-e-linaro-imx27-dts-pin_functions.patch => 3.12/0206-c-imx-dts-pin_functions.patch} (98%)
create mode 100644 patches/linux/3.12/0206-d-linaro-dts-imx27-pinctrl.patch
copy patches/linux/{3.11/0206-g-linaro-imx27-enable_pinctrl.patch => 3.12/0206-e-linaro-imx27-enable_pinctrl.patch} (98%)
copy patches/linux/{3.11 => 3.12}/0207-armadeus-apf27dev-add_hog_pinctrl.patch (100%)
create mode 100644 patches/linux/3.12/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
copy patches/linux/{3.11 => 3.12}/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch (100%)
copy patches/linux/{3.11 => 3.12}/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch (100%)
copy patches/linux/{3.11 => 3.12}/0212-armadeus-imx27-fix_cspi_per_clk_id.patch (100%)
create mode 100644 patches/linux/3.12/0213-armadeus-add_cspi_pinctrl.patch
create mode 100644 patches/linux/3.12/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch
copy patches/linux/{3.11 => 3.12}/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch (100%)
copy patches/linux/{3.11 => 3.12}/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch (54%)
copy patches/linux/{3.10 => 3.12}/0322-armadeus-add_mach_fpga_h.patch (100%)
copy patches/linux/{3.10 => 3.12}/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch (100%)
copy patches/linux/{3.11 => 3.12}/0400-Add-apf51-basic-dt-support.patch (100%)
copy patches/linux/{3.11 => 3.12}/0401-armadeus-add_apf51dev_baseboard.patch (100%)
copy patches/linux/{3.10 => 3.12}/0404-armadeus-fix_nand_ecc_oob.patch (81%)
copy patches/linux/{3.10 => 3.12}/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch (100%)
copy patches/linux/{3.11 => 3.12}/0407-armadeus-imx51_dts-add_usbphy_for_host1_and_host2.patch (100%)
copy patches/linux/{3.11 => 3.12}/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch (75%)
create mode 100644 patches/linux/3.12/0409-armadeus-chipidea-add_node_to_select_clk_phy.patch
copy patches/linux/{3.11 => 3.12}/0420-armadeus-Add-apf28dev-dts.patch (100%)
copy patches/linux/{3.7 => 3.12}/0441-armadeus-adding_star_completion_for_source_in_menuconfig.patch (79%)
copy patches/linux/{3.10 => 3.12}/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch (100%)
copy patches/linux/{3.11 => 3.12}/0443-armadeus-apf28-fix_mac_address_issue.patch (58%)
diff --git a/patches/linux/3.12-rc1 b/patches/linux/3.12-rc1
new file mode 120000
index 0000000..fdcfcfd
--- /dev/null
+++ b/patches/linux/3.12-rc1
@@ -0,0 +1 @@
+3.12
\ No newline at end of file
diff --git a/patches/linux/common/0015-armadeus-logo-add_armadeus-project_tux.patch b/patches/linux/3.12/0015-armadeus-logo-add_armadeus-project_tux.patch
similarity index 100%
copy from patches/linux/common/0015-armadeus-logo-add_armadeus-project_tux.patch
copy to patches/linux/3.12/0015-armadeus-logo-add_armadeus-project_tux.patch
diff --git a/patches/linux/3.10/0021-armadeus-apf9328.patch b/patches/linux/3.12/0021-armadeus-apf9328.patch
similarity index 100%
copy from patches/linux/3.10/0021-armadeus-apf9328.patch
copy to patches/linux/3.12/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.12/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.12/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.12/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.12/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.12/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.12/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.12/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.12/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.12/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.12/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.12/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.12/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.12/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.12/0050-armadeus-add_custom_drivers_to_kconfig.patch
diff --git a/patches/linux/3.10/0073-armadeus-tsc2102.patch b/patches/linux/3.12/0073-armadeus-tsc2102.patch
similarity index 100%
copy from patches/linux/3.10/0073-armadeus-tsc2102.patch
copy to patches/linux/3.12/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.12/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.12/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.12/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.12/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.12/0074-armadeus-tsc2102-touchscreen.patch
similarity index 100%
copy from patches/linux/3.10/0074-armadeus-tsc2102-touchscreen.patch
copy to patches/linux/3.12/0074-armadeus-tsc2102-touchscreen.patch
diff --git a/patches/linux/3.10/0075-armadeus-spi2-reg-defines.patch b/patches/linux/3.12/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.12/0075-armadeus-spi2-reg-defines.patch
diff --git a/patches/linux/3.10/0100-armadeus-clock_correct_mxc_decode_pll_for_imx1.tofix b/patches/linux/3.12/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.12/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.12/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.12/0101-armadeus-clock-imx1_avoid_crash_with_module.tofix
diff --git a/patches/linux/3.10/0200-armadeus-add_apf27_module.patch b/patches/linux/3.12/0200-armadeus-add_apf27_module.patch
similarity index 100%
copy from patches/linux/3.10/0200-armadeus-add_apf27_module.patch
copy to patches/linux/3.12/0200-armadeus-add_apf27_module.patch
diff --git a/patches/linux/3.10/0201-armadeus-add_apf27dev_baseboard.patch b/patches/linux/3.12/0201-armadeus-add_apf27dev_baseboard.patch
similarity index 100%
copy from patches/linux/3.10/0201-armadeus-add_apf27dev_baseboard.patch
copy to patches/linux/3.12/0201-armadeus-add_apf27dev_baseboard.patch
diff --git a/patches/linux/3.10/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch b/patches/linux/3.12/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
similarity index 100%
copy from patches/linux/3.10/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
copy to patches/linux/3.12/0203-armadeus-mx27-ehci-mxc-add_per_clk_enable.patch
diff --git a/patches/linux/3.11/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch b/patches/linux/3.12/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
similarity index 100%
copy from patches/linux/3.11/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
copy to patches/linux/3.12/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
diff --git a/patches/linux/3.11/0206-c-linaro-imx1-pinctrl-core-driver.patch b/patches/linux/3.12/0206-a-linaro-imx-imx1_core_driver.patch
similarity index 65%
copy from patches/linux/3.11/0206-c-linaro-imx1-pinctrl-core-driver.patch
copy to patches/linux/3.12/0206-a-linaro-imx-imx1_core_driver.patch
index 547106f..42bb1c0 100644
--- a/patches/linux/3.11/0206-c-linaro-imx1-pinctrl-core-driver.patch
+++ b/patches/linux/3.12/0206-a-linaro-imx-imx1_core_driver.patch
@@ -1,11 +1,17 @@
+Core driver for register formats of imx1/imx21/imx27 processors.
+
+The pins of those processors are grouped into ports. Each port has 32
+pins. The pins mux configuration is controlled by registers with 1 or 2
+bit per pin, depending on the specific control register.
+
Signed-off-by: Markus Pargmann <mp...@pe...>
---
drivers/pinctrl/Kconfig | 5 +
drivers/pinctrl/Makefile | 1 +
- drivers/pinctrl/pinctrl-imx1-core.c | 667 ++++++++++++++++++++++++++++++++++++
- drivers/pinctrl/pinctrl-imx1.h | 23 ++
- 4 files changed, 696 insertions(+)
+ drivers/pinctrl/pinctrl-imx1-core.c | 649 ++++++++++++++++++++++++++++++++++++
+ drivers/pinctrl/pinctrl-imx1.h | 73 ++++
+ 4 files changed, 728 insertions(+)
create mode 100644 drivers/pinctrl/pinctrl-imx1-core.c
create mode 100644 drivers/pinctrl/pinctrl-imx1.h
@@ -39,10 +45,10 @@ index d64563bf..43bb05e 100644
obj-$(CONFIG_PINCTRL_IMX53) += pinctrl-imx53.o
diff --git a/drivers/pinctrl/pinctrl-imx1-core.c b/drivers/pinctrl/pinctrl-imx1-core.c
new file mode 100644
-index 0000000..318b976
+index 0000000..276fea9
--- /dev/null
+++ b/drivers/pinctrl/pinctrl-imx1-core.c
-@@ -0,0 +1,667 @@
+@@ -0,0 +1,649 @@
+/*
+ * Core driver for the imx pin controller in imx1/21/27
+ *
@@ -60,6 +66,7 @@ index 0000000..318b976
+ * (at your option) any later version.
+ */
+
++#include <linux/bitops.h>
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/io.h>
@@ -70,7 +77,6 @@ index 0000000..318b976
+#include <linux/pinctrl/pinconf.h>
+#include <linux/pinctrl/pinctrl.h>
+#include <linux/pinctrl/pinmux.h>
-+#include <linux/platform_data/gpio-mxc.h>
+#include <linux/slab.h>
+
+#include "core.h"
@@ -80,14 +86,9 @@ index 0000000..318b976
+ struct device *dev;
+ struct pinctrl_dev *pctl;
+ void __iomem *base;
-+ const struct imx_pinctrl_soc_info *info;
-+
-+ int num_gpio_childs;
-+ struct platform_device **gpio_dev;
-+ struct mxc_gpio_platform_data *gpio_pdata;
++ const struct imx1_pinctrl_soc_info *info;
+};
+
-+
+/*
+ * MX1 register offsets
+ */
@@ -100,13 +101,38 @@ index 0000000..318b976
+#define MX1_GPR 0x38
+#define MX1_PUEN 0x40
+
++#define MX1_PORT_STRIDE 0x100
++
++
++/*
++ * MUX_ID format defines
++ */
++#define MX1_MUX_FUNCTION(val) (BIT(0) & val)
++#define MX1_MUX_GPIO(val) ((BIT(1) & val) >> 1)
++#define MX1_MUX_DIR(val) ((BIT(2) & val) >> 2)
++#define MX1_MUX_OCONF(val) (((BIT(4) | BIT(5)) & val) >> 4)
++#define MX1_MUX_ICONFA(val) (((BIT(8) | BIT(9)) & val) >> 8)
++#define MX1_MUX_ICONFB(val) (((BIT(10) | BIT(11)) & val) >> 10)
++
++
++/*
++ * IMX1 IOMUXC manages the pins based on ports. Each port has 32 pins. IOMUX
++ * control register are seperated into function, output configuration, input
++ * configuration A, input configuration B, GPIO in use and data direction.
++ *
++ * Those controls that are represented by 1 bit have a direct mapping between
++ * bit position and pin id. If they are represented by 2 bit, the lower 16 pins
++ * are in the first register and the upper 16 pins in the second (next)
++ * register. pin_id is stored in bit (pin_id%16)*2 and the bit above.
++ */
++
+/*
+ * Calculates the register offset from a pin_id
+ */
+static void __iomem *imx1_mem(struct imx1_pinctrl *ipctl, unsigned int pin_id)
+{
+ unsigned int port = pin_id / 32;
-+ return ipctl->base + port * 0x100;
++ return ipctl->base + port * MX1_PORT_STRIDE;
+}
+
+/*
@@ -117,51 +143,76 @@ index 0000000..318b976
+ u32 value, u32 reg_offset)
+{
+ void __iomem *reg = imx1_mem(ipctl, pin_id) + reg_offset;
-+ int shift = (pin_id % 16) * 2;
-+ int mask = ~(0x3 << shift);
-+ u32 old_value;
++ int offset = (pin_id % 16) * 2; /* offset, regardless of register used */
++ int mask = ~(0x3 << offset); /* Mask for 2 bits at offset */
++ u32 old_val;
++ u32 new_val;
+
-+ dev_dbg(ipctl->dev, "write: register 0x%p shift %d value 0x%x\n",
-+ reg, shift, value);
++ dev_dbg(ipctl->dev, "write: register 0x%p offset %d value 0x%x\n",
++ reg, offset, value);
+
++ /* Use the next register if the pin's port pin number is >=16 */
+ if (pin_id % 32 >= 16)
+ reg += 0x04;
+
-+ value = (value & 0x3) << shift;
-+ old_value = readl(reg) & mask;
-+ writel(value | old_value, reg);
++ /* Get current state of pins */
++ old_val = readl(reg);
++ old_val &= mask;
++
++ new_val = value & 0x3; /* Make sure value is really 2 bit */
++ new_val <<= offset;
++ new_val |= old_val;/* Set new state for pin_id */
++
++ writel(new_val, reg);
+}
+
+static void imx1_write_bit(struct imx1_pinctrl *ipctl, unsigned int pin_id,
+ u32 value, u32 reg_offset)
+{
+ void __iomem *reg = imx1_mem(ipctl, pin_id) + reg_offset;
-+ int shift = pin_id % 32;
-+ int mask = ~(0x1 << shift);
-+ u32 old_value;
++ int offset = pin_id % 32;
++ int mask = ~BIT_MASK(offset);
++ u32 old_val;
++ u32 new_val;
++
++ /* Get current state of pins */
++ old_val = readl(reg);
++ old_val &= mask;
++
++ new_val = value & 0x1; /* Make sure value is really 1 bit */
++ new_val <<= offset;
++ new_val |= old_val;/* Set new state for pin_id */
++
++ writel(new_val, reg);
++}
++
++static int imx1_read_2bit(struct imx1_pinctrl *ipctl, unsigned int pin_id,
++ u32 reg_offset)
++{
++ void __iomem *reg = imx1_mem(ipctl, pin_id) + reg_offset;
++ int offset = pin_id % 16;
+
-+ dev_dbg(ipctl->dev, "write: register 0x%p shift %d value 0x%x\n",
-+ reg, shift, value);
++ /* Use the next register if the pin's port pin number is >=16 */
++ if (pin_id % 32 >= 16)
++ reg += 0x04;
+
-+ value = (value & 0x1) << shift;
-+ old_value = readl(reg) & mask;
-+ writel(value | old_value, reg);
++ return (readl(reg) & (BIT(offset) | BIT(offset+1))) >> offset;
+}
+
+static int imx1_read_bit(struct imx1_pinctrl *ipctl, unsigned int pin_id,
+ u32 reg_offset)
+{
+ void __iomem *reg = imx1_mem(ipctl, pin_id) + reg_offset;
-+ int shift = pin_id % 32;
++ int offset = pin_id % 32;
+
-+ return (readl(reg) >> shift) & 0x1;
++ return !!(readl(reg) & BIT(offset));
+}
+
-+static const inline struct imx_pin_group *imx1_pinctrl_find_group_by_name(
-+ const struct imx_pinctrl_soc_info *info,
++static const inline struct imx1_pin_group *imx1_pinctrl_find_group_by_name(
++ const struct imx1_pinctrl_soc_info *info,
+ const char *name)
+{
-+ const struct imx_pin_group *grp = NULL;
++ const struct imx1_pin_group *grp = NULL;
+ int i;
+
+ for (i = 0; i < info->ngroups; i++) {
@@ -177,7 +228,7 @@ index 0000000..318b976
+static int imx1_get_groups_count(struct pinctrl_dev *pctldev)
+{
+ struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
-+ const struct imx_pinctrl_soc_info *info = ipctl->info;
++ const struct imx1_pinctrl_soc_info *info = ipctl->info;
+
+ return info->ngroups;
+}
@@ -186,22 +237,22 @@ index 0000000..318b976
+ unsigned selector)
+{
+ struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
-+ const struct imx_pinctrl_soc_info *info = ipctl->info;
++ const struct imx1_pinctrl_soc_info *info = ipctl->info;
+
+ return info->groups[selector].name;
+}
+
+static int imx1_get_group_pins(struct pinctrl_dev *pctldev, unsigned selector,
-+ const unsigned **pins,
++ const unsigned int **pins,
+ unsigned *npins)
+{
+ struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
-+ const struct imx_pinctrl_soc_info *info = ipctl->info;
++ const struct imx1_pinctrl_soc_info *info = ipctl->info;
+
+ if (selector >= info->ngroups)
+ return -EINVAL;
+
-+ *pins = info->groups[selector].pins;
++ *pins = info->groups[selector].pin_ids;
+ *npins = info->groups[selector].npins;
+
+ return 0;
@@ -210,7 +261,15 @@ index 0000000..318b976
+static void imx1_pin_dbg_show(struct pinctrl_dev *pctldev, struct seq_file *s,
+ unsigned offset)
+{
-+ seq_printf(s, "%s", dev_name(pctldev->dev));
++ struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
++
++ seq_printf(s, "GPIO %d, function %d, direction %d, oconf %d, iconfa %d, iconfb %d",
++ imx1_read_bit(ipctl, offset, MX1_GIUS),
++ imx1_read_bit(ipctl, offset, MX1_GPR),
++ imx1_read_bit(ipctl, offset, MX1_DDIR),
++ imx1_read_2bit(ipctl, offset, MX1_OCR),
++ imx1_read_2bit(ipctl, offset, MX1_ICONFA),
++ imx1_read_2bit(ipctl, offset, MX1_ICONFB));
+}
+
+static int imx1_dt_node_to_map(struct pinctrl_dev *pctldev,
@@ -218,8 +277,8 @@ index 0000000..318b976
+ struct pinctrl_map **map, unsigned *num_maps)
+{
+ struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
-+ const struct imx_pinctrl_soc_info *info = ipctl->info;
-+ const struct imx_pin_group *grp;
++ const struct imx1_pinctrl_soc_info *info = ipctl->info;
++ const struct imx1_pin_group *grp;
+ struct pinctrl_map *new_map;
+ struct device_node *parent;
+ int map_num = 1;
@@ -262,8 +321,8 @@ index 0000000..318b976
+ for (i = j = 0; i < grp->npins; i++) {
+ new_map[j].type = PIN_MAP_TYPE_CONFIGS_PIN;
+ new_map[j].data.configs.group_or_pin =
-+ pin_get_name(pctldev, grp->pins[i]);
-+ new_map[j].data.configs.configs = &grp->configs[i];
++ pin_get_name(pctldev, grp->pins[i].pin_id);
++ new_map[j].data.configs.configs = &grp->pins[i].config;
+ new_map[j].data.configs.num_configs = 1;
+ j++;
+ }
@@ -294,8 +353,8 @@ index 0000000..318b976
+ unsigned group)
+{
+ struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
-+ const struct imx_pinctrl_soc_info *info = ipctl->info;
-+ const unsigned *pins, *mux;
++ const struct imx1_pinctrl_soc_info *info = ipctl->info;
++ const struct imx1_pin *pins;
+ unsigned int npins;
+ int i;
+
@@ -305,21 +364,21 @@ index 0000000..318b976
+ */
+ pins = info->groups[group].pins;
+ npins = info->groups[group].npins;
-+ mux = info->groups[group].mux_mode;
+
-+ WARN_ON(!pins || !npins || !mux);
++ WARN_ON(!pins || !npins);
+
+ dev_dbg(ipctl->dev, "enable function %s group %s\n",
+ info->functions[selector].name, info->groups[group].name);
+
+ for (i = 0; i < npins; i++) {
-+ unsigned int pin_id = pins[i];
-+ unsigned int afunction = 0x001 & mux[i];
-+ unsigned int gpio_in_use = (0x002 & mux[i]) >> 1;
-+ unsigned int direction = (0x004 & mux[i]) >> 2;
-+ unsigned int gpio_oconf = (0x030 & mux[i]) >> 4;
-+ unsigned int gpio_iconfa = (0x300 & mux[i]) >> 8;
-+ unsigned int gpio_iconfb = (0xc00 & mux[i]) >> 10;
++ unsigned int mux = pins[i].mux_id;
++ unsigned int pin_id = pins[i].pin_id;
++ unsigned int afunction = MX1_MUX_FUNCTION(mux);
++ unsigned int gpio_in_use = MX1_MUX_GPIO(mux);
++ unsigned int direction = MX1_MUX_DIR(mux);
++ unsigned int gpio_oconf = MX1_MUX_OCONF(mux);
++ unsigned int gpio_iconfa = MX1_MUX_ICONFA(mux);
++ unsigned int gpio_iconfb = MX1_MUX_ICONFB(mux);
+
+ dev_dbg(pctldev->dev, "%s, pin 0x%x, function %d, gpio %d, direction %d, oconf %d, iconfa %d, iconfb %d\n",
+ __func__, pin_id, afunction, gpio_in_use,
@@ -346,7 +405,7 @@ index 0000000..318b976
+static int imx1_pmx_get_funcs_count(struct pinctrl_dev *pctldev)
+{
+ struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
-+ const struct imx_pinctrl_soc_info *info = ipctl->info;
++ const struct imx1_pinctrl_soc_info *info = ipctl->info;
+
+ return info->nfunctions;
+}
@@ -355,7 +414,7 @@ index 0000000..318b976
+ unsigned selector)
+{
+ struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
-+ const struct imx_pinctrl_soc_info *info = ipctl->info;
++ const struct imx1_pinctrl_soc_info *info = ipctl->info;
+
+ return info->functions[selector].name;
+}
@@ -365,7 +424,7 @@ index 0000000..318b976
+ unsigned * const num_groups)
+{
+ struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
-+ const struct imx_pinctrl_soc_info *info = ipctl->info;
++ const struct imx1_pinctrl_soc_info *info = ipctl->info;
+
+ *groups = info->functions[selector].groups;
+ *num_groups = info->functions[selector].num_groups;
@@ -394,7 +453,7 @@ index 0000000..318b976
+ unsigned pin_id, unsigned long config)
+{
+ struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
-+ const struct imx_pinctrl_soc_info *info = ipctl->info;
++ const struct imx1_pinctrl_soc_info *info = ipctl->info;
+
+ imx1_write_bit(ipctl, pin_id, config & 0x01, MX1_PUEN);
+
@@ -407,17 +466,9 @@ index 0000000..318b976
+static void imx1_pinconf_dbg_show(struct pinctrl_dev *pctldev,
+ struct seq_file *s, unsigned pin_id)
+{
-+ struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
-+ const struct imx_pinctrl_soc_info *info = ipctl->info;
-+ const struct imx_pin_reg *pin_reg = &info->pin_regs[pin_id];
+ unsigned long config;
+
-+ if (!pin_reg || !pin_reg->conf_reg) {
-+ seq_puts(s, "N/A");
-+ return;
-+ }
-+
-+ config = readl(ipctl->base + pin_reg->conf_reg);
++ imx1_pinconf_get(pctldev, pin_id, &config);
+ seq_printf(s, "0x%lx", config);
+}
+
@@ -425,8 +476,8 @@ index 0000000..318b976
+ struct seq_file *s, unsigned group)
+{
+ struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
-+ const struct imx_pinctrl_soc_info *info = ipctl->info;
-+ struct imx_pin_group *grp;
++ const struct imx1_pinctrl_soc_info *info = ipctl->info;
++ struct imx1_pin_group *grp;
+ unsigned long config;
+ const char *name;
+ int i, ret;
@@ -437,8 +488,8 @@ index 0000000..318b976
+ seq_puts(s, "\n");
+ grp = &info->groups[group];
+ for (i = 0; i < grp->npins; i++) {
-+ name = pin_get_name(pctldev, grp->pins[i]);
-+ ret = imx1_pinconf_get(pctldev, grp->pins[i], &config);
++ name = pin_get_name(pctldev, grp->pins[i].pin_id);
++ ret = imx1_pinconf_get(pctldev, grp->pins[i].pin_id, &config);
+ if (ret)
+ return;
+ seq_printf(s, "%s: 0x%lx", name, config);
@@ -460,14 +511,13 @@ index 0000000..318b976
+};
+
+static int imx1_pinctrl_parse_groups(struct device_node *np,
-+ struct imx_pin_group *grp,
-+ struct imx_pinctrl_soc_info *info,
++ struct imx1_pin_group *grp,
++ struct imx1_pinctrl_soc_info *info,
+ u32 index)
+{
+ int size;
+ const __be32 *list;
+ int i;
-+ u32 config;
+
+ dev_dbg(info->dev, "group(%d): %s\n", index, np->name);
+
@@ -475,8 +525,7 @@ index 0000000..318b976
+ grp->name = np->name;
+
+ /*
-+ * the binding format is fsl,pins = <PIN_FUNC_ID CONFIG ...>,
-+ * do sanity check and calculate pins number
++ * the binding format is fsl,pins = <PIN MUX_ID CONFIG>
+ */
+ list = of_get_property(np, "fsl,pins", &size);
+ /* we do not check return since it's safe node passed down */
@@ -487,30 +536,32 @@ index 0000000..318b976
+ }
+
+ grp->npins = size / 12;
-+ grp->pins = devm_kzalloc(info->dev, grp->npins * sizeof(unsigned int),
-+ GFP_KERNEL);
-+ grp->mux_mode = devm_kzalloc(info->dev,
-+ grp->npins * sizeof(unsigned int), GFP_KERNEL);
-+ grp->configs = devm_kzalloc(info->dev,
-+ grp->npins * sizeof(unsigned long), GFP_KERNEL);
++ grp->pins = devm_kzalloc(info->dev,
++ grp->npins * sizeof(struct imx1_pin), GFP_KERNEL);
++ grp->pin_ids = devm_kzalloc(info->dev,
++ grp->npins * sizeof(unsigned int), GFP_KERNEL);
++
++ if (!grp->pins || !grp->pin_ids)
++ return -ENOMEM;
++
+ for (i = 0; i < grp->npins; i++) {
-+ grp->pins[i] = be32_to_cpu(*list++);
-+ grp->mux_mode[i] = be32_to_cpu(*list++);
++ grp->pins[i].pin_id = be32_to_cpu(*list++);
++ grp->pins[i].mux_id = be32_to_cpu(*list++);
++ grp->pins[i].config = be32_to_cpu(*list++);
+
-+ config = be32_to_cpu(*list++);
-+ grp->configs[i] = config;
++ grp->pin_ids[i] = grp->pins[i].pin_id;
+ }
+
+ return 0;
+}
+
+static int imx1_pinctrl_parse_functions(struct device_node *np,
-+ struct imx_pinctrl_soc_info *info,
++ struct imx1_pinctrl_soc_info *info,
+ u32 index)
+{
+ struct device_node *child;
-+ struct imx_pmx_func *func;
-+ struct imx_pin_group *grp;
++ struct imx1_pmx_func *func;
++ struct imx1_pin_group *grp;
+ int ret;
+ static u32 grp_index;
+ u32 i = 0;
@@ -528,121 +579,66 @@ index 0000000..318b976
+ func->groups = devm_kzalloc(info->dev,
+ func->num_groups * sizeof(char *), GFP_KERNEL);
+
++ if (!func->groups)
++ return -ENOMEM;
++
+ for_each_child_of_node(np, child) {
+ func->groups[i] = child->name;
+ grp = &info->groups[grp_index++];
+ ret = imx1_pinctrl_parse_groups(child, grp, info, i++);
-+ if (ret)
++ if (ret == -ENOMEM)
+ return ret;
+ }
+
+ return 0;
+}
+
-+static int imx1_pinctrl_parse_gpio(struct platform_device *pdev,
-+ struct imx1_pinctrl *pctl, struct device_node *np, int i,
-+ u32 base)
-+{
-+ int ret;
-+ u32 memoffset;
-+
-+ ret = of_property_read_u32(np, "reg", &memoffset);
-+ if (ret)
-+ return ret;
-+
-+ memoffset -= base;
-+ pctl->gpio_pdata[i].base = pctl->base + memoffset;
-+
-+ pctl->gpio_dev[i] = of_device_alloc(np, NULL, &pdev->dev);
-+ pctl->gpio_dev[i]->dev.platform_data = &pctl->gpio_pdata[i];
-+ pctl->gpio_dev[i]->dev.bus = &platform_bus_type;
-+
-+ ret = of_device_add(pctl->gpio_dev[i]);
-+ if (ret) {
-+ dev_err(&pdev->dev,
-+ "Failed to add child gpio device\n");
-+ return ret;
-+ }
-+ return 0;
-+}
-+
+static int imx1_pinctrl_parse_dt(struct platform_device *pdev,
-+ struct imx1_pinctrl *pctl, struct imx_pinctrl_soc_info *info)
++ struct imx1_pinctrl *pctl, struct imx1_pinctrl_soc_info *info)
+{
+ struct device_node *np = pdev->dev.of_node;
+ struct device_node *child;
+ int ret;
+ u32 nfuncs = 0;
-+ u32 ngpios = 0;
+ u32 ngroups = 0;
+ u32 ifunc = 0;
-+ u32 igpio = 0;
-+ u32 base_addr;
+
+ if (!np)
+ return -ENODEV;
+
-+ ret = of_property_read_u32(np, "reg", &base_addr);
-+ if (ret)
-+ return ret;
-+
+ for_each_child_of_node(np, child) {
-+ if (!of_device_is_compatible(child, "fsl,imx21-gpio") &&
-+ !of_device_is_compatible(child, "fsl,imx1-gpio")) {
-+ ++nfuncs;
-+ ngroups += of_get_child_count(child);
-+ } else if (of_device_is_available(child)) {
-+ ++ngpios;
-+ }
++ ++nfuncs;
++ ngroups += of_get_child_count(child);
+ }
+
-+ if (!nfuncs && !ngpios) {
-+ dev_err(&pdev->dev, "No pin functions or gpio subdevices defined\n");
++ if (!nfuncs) {
++ dev_err(&pdev->dev, "No pin functions defined\n");
+ return -EINVAL;
+ }
+
+ info->nfunctions = nfuncs;
+ info->functions = devm_kzalloc(&pdev->dev,
-+ nfuncs * sizeof(struct imx_pmx_func), GFP_KERNEL);
++ nfuncs * sizeof(struct imx1_pmx_func), GFP_KERNEL);
+
+ info->ngroups = ngroups;
+ info->groups = devm_kzalloc(&pdev->dev,
-+ ngroups * sizeof(struct imx_pin_group), GFP_KERNEL);
++ ngroups * sizeof(struct imx1_pin_group), GFP_KERNEL);
+
-+ pctl->num_gpio_childs = ngpios;
-+ pctl->gpio_dev = devm_kzalloc(&pdev->dev,
-+ sizeof(*pctl->gpio_dev) * ngpios, GFP_KERNEL);
-+ pctl->gpio_pdata = devm_kzalloc(&pdev->dev,
-+ sizeof(*pctl->gpio_pdata) * ngpios, GFP_KERNEL);
+
-+ if (!info->functions || !info->groups || !pctl->gpio_dev ||
-+ !pctl->gpio_pdata)
++ if (!info->functions || !info->groups)
+ return -ENOMEM;
+
+ for_each_child_of_node(np, child) {
-+ if (!of_device_is_compatible(child, "fsl,imx21-gpio") &&
-+ !of_device_is_compatible(child, "fsl,imx1-gpio")) {
-+ ret = imx1_pinctrl_parse_functions(child, info,
-+ ifunc++);
-+ if (ret)
-+ goto child_err;
-+ } else if (of_device_is_available(child)) {
-+ ret = imx1_pinctrl_parse_gpio(pdev, pctl, child,
-+ igpio++, base_addr);
-+ if (ret)
-+ goto child_err;
-+ }
++ ret = imx1_pinctrl_parse_functions(child, info, ifunc++);
++ if (ret == -ENOMEM)
++ return -ENOMEM;
+ }
+
+ return 0;
-+child_err:
-+ while (igpio--)
-+ put_device(&pctl->gpio_dev[igpio]->dev);
-+ return ret;
+}
+
+int imx1_pinctrl_core_probe(struct platform_device *pdev,
-+ struct imx_pinctrl_soc_info *info)
++ struct imx1_pinctrl_soc_info *info)
+{
+ struct imx1_pinctrl *ipctl;
+ struct resource *res;
@@ -660,16 +656,12 @@ index 0000000..318b976
+ if (!ipctl)
+ return -ENOMEM;
+
-+ info->pin_regs = devm_kzalloc(&pdev->dev, sizeof(*info->pin_regs) *
-+ info->npins, GFP_KERNEL);
-+ if (!info->pin_regs)
-+ return -ENOMEM;
-+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -ENOENT;
+
-+ ipctl->base = devm_ioremap_resource(&pdev->dev, res);
++ ipctl->base = devm_ioremap_nocache(&pdev->dev, res->start,
++ resource_size(res));
+ if (IS_ERR(ipctl->base))
+ return PTR_ERR(ipctl->base);
+
@@ -701,10 +693,6 @@ index 0000000..318b976
+int imx1_pinctrl_core_remove(struct platform_device *pdev)
+{
+ struct imx1_pinctrl *ipctl = platform_get_drvdata(pdev);
-+ int i;
-+
-+ for (i = 0; i != ipctl->num_gpio_childs; ++i)
-+ put_device(&ipctl->gpio_dev[i]->dev);
+
+ pinctrl_unregister(ipctl->pctl);
+
@@ -712,10 +700,10 @@ index 0000000..318b976
+}
diff --git a/drivers/pinctrl/pinctrl-imx1.h b/drivers/pinctrl/pinctrl-imx1.h
new file mode 100644
-index 0000000..63161f1
+index 0000000..692a54c
--- /dev/null
+++ b/drivers/pinctrl/pinctrl-imx1.h
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,73 @@
+/*
+ * IMX pinmux core definitions
+ *
@@ -733,14 +721,64 @@ index 0000000..63161f1
+#ifndef __DRIVERS_PINCTRL_IMX1_H
+#define __DRIVERS_PINCTRL_IMX1_H
+
-+#include "pinctrl-imx.h"
++struct platform_device;
++
++/**
++ * struct imx1_pin - describes an IMX1/21/27 pin.
++ * @pin_id: ID of the described pin.
++ * @mux_id: ID of the mux setup.
++ * @config: Configuration of the pin (currently only pullup-enable).
++ */
++struct imx1_pin {
++ unsigned int pin_id;
++ unsigned int mux_id;
++ unsigned long config;
++};
++
++/**
++ * struct imx1_pin_group - describes an IMX pin group
++ * @name: the name of this specific pin group
++ * @pins: an array of imx1_pin structs used in this group
++ * @npins: the number of pins in this group array, i.e. the number of
++ * elements in .pins so we can iterate over that array
++ */
++struct imx1_pin_group {
++ const char *name;
++ unsigned int *pin_ids;
++ struct imx1_pin *pins;
++ unsigned npins;
++};
++
++/**
++ * struct imx1_pmx_func - describes IMX pinmux functions
++ * @name: the name of this specific function
++ * @groups: corresponding pin groups
++ * @num_groups: the number of groups
++ */
++struct imx1_pmx_func {
++ const char *name;
++ const char **groups;
++ unsigned num_groups;
++};
++
++struct imx1_pinctrl_soc_info {
++ struct device *dev;
++ const struct pinctrl_pin_desc *pins;
++ unsigned int npins;
++ struct imx1_pin_group *groups;
++ unsigned int ngroups;
++ struct imx1_pmx_func *functions;
++ unsigned int nfunctions;
++};
++
++#define IMX_PINCTRL_PIN(pin) PINCTRL_PIN(pin, #pin)
+
+int imx1_pinctrl_core_probe(struct platform_device *pdev,
-+ struct imx_pinctrl_soc_info *info);
++ struct imx1_pinctrl_soc_info *info);
+int imx1_pinctrl_core_remove(struct platform_device *pdev);
+#endif /* __DRIVERS_PINCTRL_IMX1_H */
--
-1.8.3.2
+1.8.4.rc3
_______________________________________________
diff --git a/patches/linux/3.11/0206-d-linaro-imx27-pinctrl-imx27_pincontrol_driver.patch b/patches/linux/3.12/0206-b-linaro-imx27-imx27_pincontrol_driver.patch
similarity index 94%
copy from patches/linux/3.11/0206-d-linaro-imx27-pinctrl-imx27_pincontrol_driver.patch
copy to patches/linux/3.12/0206-b-linaro-imx27-imx27_pincontrol_driver.patch
index 4c110c1..daa7dde 100644
--- a/patches/linux/3.11/0206-d-linaro-imx27-pinctrl-imx27_pincontrol_driver.patch
+++ b/patches/linux/3.12/0206-b-linaro-imx27-imx27_pincontrol_driver.patch
@@ -1,60 +1,60 @@
+imx27 pincontrol driver using the imx1 core driver. The DT bindings are
+similar to other imx pincontrol drivers.
+
Signed-off-by: Markus Pargmann <mp...@pe...>
---
- .../bindings/pinctrl/fsl,imx27-pinctrl.txt | 53 +++
+ .../bindings/pinctrl/fsl,imx27-pinctrl.txt | 50 +++
drivers/pinctrl/Kconfig | 8 +
drivers/pinctrl/Makefile | 1 +
drivers/pinctrl/pinctrl-imx27.c | 477 +++++++++++++++++++++
- 4 files changed, 539 insertions(+)
+ 4 files changed, 536 insertions(+)
create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt
create mode 100644 drivers/pinctrl/pinctrl-imx27.c
diff --git a/Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt
new file mode 100644
-index 0000000..3352d94
+index 0000000..6619968
--- /dev/null
+++ b/Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,50 @@
+* Freescale IMX27 IOMUX Controller
+
-+Please refer to fsl,imx-pinctrl.txt in this directory for common binding part
-+and usage.
-+
-+The iomuxc driver node can have pin configuration and gpio subnodes. gpio
-+nodes defined as childs will share the registers with the iomuxc driver.
-+Please have a look into
-+Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt for information about
-+the gpio properties.
-+
+Required properties:
+- compatible: "fsl,imx27-iomuxc"
+
++The iomuxc driver node should define subnodes containing of pinctrl configuration subnodes.
++
+Required properties for pin configuration node:
+- fsl,pins: three integers array, represents a group of pins mux and config
+ setting. The format is fsl,pins = <PIN MUX_ID CONFIG>. PIN and MUX_ID are
+ defined as macros in arch/arm/boot/dts/imx27-pinfunc.h. CONFIG can be 0 or
+ 1, meaning Pullup disable/enable.
++ PIN is a integer between 0 and 0xbf. imx27 has 6 ports with 32 configurable
++ configurable pins each. PIN is PORT * 32 + PORT_PIN, PORT_PIN is the pin
++ number on the specific port (between 0 and 31).
++ MUX_ID is
++ function + (direction << 2) + (gpio_oconf << 4) + (gpio_iconfa << 8) + (gpio_iconfb << 10)
++ function: 0 - Primary function
++ 1 - Alternate function
++ 2 - GPIO
++ direction: 0 - Input
++ 1 - Output
++ gpio_oconf: 0 - A_IN
++ 1 - B_IN
++ 2 - C_IN
++ 3 - Data Register
++ gpio_iconfa/b: 0 - GPIO_IN
++ 1 - Interrupt Status Register
++ 2 - 0
++ 3 - 1
+
+Example:
+
+iomuxc: iomuxc@10015000 {
+ compatible = "fsl,imx27-iomuxc";
-+ #address-cells = <1>;
-+ #size-cells = <0>;
+ reg = <0x10015000 0x600>;
+
-+ gpio1: gpio@10015000 {
-+ compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
-+ reg = <0x10015000>;
-+ interrupts = <8>;
-+ gpio-controller;
-+ #gpio-cells = <2>;
-+ interrupt-controller;
-+ #interrupt-cells = <2>;
-+ };
-+
-+ ...
-+
+ uart {
+ pinctrl_uart1: uart-1 {
+ fsl,pins = <
@@ -101,7 +101,7 @@ index 43bb05e..d08bf87 100644
obj-$(CONFIG_PINCTRL_IMX53) += pinctrl-imx53.o
diff --git a/drivers/pinctrl/pinctrl-imx27.c b/drivers/pinctrl/pinctrl-imx27.c
new file mode 100644
-index 0000000..aede821
+index 0000000..417c992
--- /dev/null
+++ b/drivers/pinctrl/pinctrl-imx27.c
@@ -0,0 +1,477 @@
@@ -537,7 +537,7 @@ index 0000000..aede821
+ IMX_PINCTRL_PIN(MX27_PAD_UNUSED22),
+};
+
-+static struct imx_pinctrl_soc_info imx27_pinctrl_info = {
++static struct imx1_pinctrl_soc_info imx27_pinctrl_info = {
+ .pins = imx27_pinctrl_pads,
+ .npins = ARRAY_SIZE(imx27_pinctrl_pads),
+};
@@ -583,7 +583,7 @@ index 0000000..aede821
+MODULE_DESCRIPTION("Freescale IMX27 pinctrl driver");
+MODULE_LICENSE("GPL v2");
--
-1.8.3.2
+1.8.4.rc3
_______________________________________________
diff --git a/patches/linux/3.11/0206-e-linaro-imx27-dts-pin_functions.patch b/patches/linux/3.12/0206-c-imx-dts-pin_functions.patch
similarity index 98%
copy from patches/linux/3.11/0206-e-linaro-imx27-dts-pin_functions.patch
copy to patches/linux/3.12/0206-c-imx-dts-pin_functions.patch
index 9ba7d1a..b371257 100644
--- a/patches/linux/3.11/0206-e-linaro-imx27-dts-pin_functions.patch
+++ b/patches/linux/3.12/0206-c-imx-dts-pin_functions.patch
@@ -1,16 +1,16 @@
Signed-off-by: Markus Pargmann <mp...@pe...>
---
- arch/arm/boot/dts/imx27-pinfunc.h | 520 ++++++++++++++++++++++++++++++++++++++
- 1 file changed, 520 insertions(+)
+ arch/arm/boot/dts/imx27-pinfunc.h | 524 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 524 insertions(+)
create mode 100644 arch/arm/boot/dts/imx27-pinfunc.h
diff --git a/arch/arm/boot/dts/imx27-pinfunc.h b/arch/arm/boot/dts/imx27-pinfunc.h
new file mode 100644
-index 0000000..f3b4c55
+index 0000000..32bfcc2
--- /dev/null
+++ b/arch/arm/boot/dts/imx27-pinfunc.h
-@@ -0,0 +1,520 @@
+@@ -0,0 +1,524 @@
+/*
+ * Copyright 2013 Freescale Semiconductor, Inc.
+ *
@@ -25,8 +25,8 @@ index 0000000..f3b4c55
+
+/*
+ * The pin function ID is a tuple of
-+ * <pin mux_config>
-+ * mux_config consists of
++ * <pin mux_id>
++ * mux_id consists of
+ * function + (direction << 2) + (gpio_oconf << 4) + (gpio_iconfa << 8) + (gpio_iconfb << 10)
+ *
+ * function: 0 - Primary function
@@ -42,6 +42,10 @@ index 0000000..f3b4c55
+ * 1 - Interrupt Status Register
+ * 2 - 0
+ * 3 - 1
++ *
++ * 'pin' is an integer between 0 and 0xbf. imx27 has 6 ports with 32 configurable
++ * configurable pins each. 'pin' is PORT * 32 + PORT_PIN, PORT_PIN is the pin
++ * number on the specific port (between 0 and 31).
+ */
+
+#define MX27_PAD_USBH2_CLK__USBH2_CLK 0x00 0x000
@@ -532,7 +536,7 @@ index 0000000..f3b4c55
+
+#endif /* __DTS_IMX27_PINFUNC_H */
--
-1.8.3.2
+1.8.4.rc3
_______________________________________________
diff --git a/patches/linux/3.12/0206-d-linaro-dts-imx27-pinctrl.patch b/patches/linux/3.12/0206-d-linaro-dts-imx27-pinctrl.patch
new file mode 100644
index 0000000..4bd2eea
--- /dev/null
+++ b/patches/linux/3.12/0206-d-linaro-dts-imx27-pinctrl.patch
@@ -0,0 +1,141 @@
+
+Pinctrl driver node and pin group definitions for other driver nodes.
+
+Signed-off-by: Markus Pargmann <mp...@pe...>
+---
+ arch/arm/boot/dts/imx27.dtsi | 102 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 102 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
+index 76cd89f..863640b 100644
+--- a/arch/arm/boot/dts/imx27.dtsi
++++ b/arch/arm/boot/dts/imx27.dtsi
+@@ -10,6 +10,7 @@
+ */
+
+ #include "skeleton.dtsi"
++#include "imx27-pinfunc.h"
+
+ / {
+ aliases {
+@@ -235,6 +236,12 @@
+ status = "disabled";
+ };
+
++ iomuxc: iomuxc@10015000 {
++ compatible = "fsl,imx27-iomuxc";
++ reg = <0x10015000 0x600>;
++
++ };
++
+ gpio1: gpio@10015000 {
+ compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
+ reg = <0x10015000 0x100>;
+@@ -466,3 +473,98 @@
+ };
+ };
+ };
++
++&iomuxc {
++ fec {
++ pinctrl_fec1_1: fec1-1 {
++ fsl,pins = <
++ MX27_PAD_SD3_CMD__FEC_TXD0 0x0
++ MX27_PAD_SD3_CLK__FEC_TXD1 0x0
++ MX27_PAD_ATA_DATA0__FEC_TXD2 0x0
++ MX27_PAD_ATA_DATA1__FEC_TXD3 0x0
++ MX27_PAD_ATA_DATA2__FEC_RX_ER 0x0
++ MX27_PAD_ATA_DATA3__FEC_RXD1 0x0
++ MX27_PAD_ATA_DATA4__FEC_RXD2 0x0
++ MX27_PAD_ATA_DATA5__FEC_RXD3 0x0
++ MX27_PAD_ATA_DATA6__FEC_MDIO 0x0
++ MX27_PAD_ATA_DATA7__FEC_MDC 0x0
++ MX27_PAD_ATA_DATA8__FEC_CRS 0x0
++ MX27_PAD_ATA_DATA9__FEC_TX_CLK 0x0
++ MX27_PAD_ATA_DATA10__FEC_RXD0 0x0
++ MX27_PAD_ATA_DATA11__FEC_RX_DV 0x0
++ MX27_PAD_ATA_DATA12__FEC_RX_CLK 0x0
++ MX27_PAD_ATA_DATA13__FEC_COL 0x0
++ MX27_PAD_ATA_DATA14__FEC_TX_ER 0x0
++ MX27_PAD_ATA_DATA15__FEC_TX_EN 0x0
++ >;
++ };
++ };
++
++ i2c {
++ pinctrl_i2c1_1: i2c1-1 {
++ fsl,pins = <
++ MX27_PAD_I2C_DATA__I2C_DATA 0x0
++ MX27_PAD_I2C_CLK__I2C_CLK 0x0
++ >;
++ };
++
++ pinctrl_i2c2_1: i2c2-1 {
++ fsl,pins = <
++ MX27_PAD_I2C2_SDA__I2C2_SDA 0x0
++ MX27_PAD_I2C2_SCL__I2C2_SCL 0x0
++ >;
++ };
++ };
++
++ owire {
++ pinctrl_owire1_1: owire1-1 {
++ fsl,pins = <
++ MX27_PAD_RTCK__OWIRE 0x0
++ >;
++ };
++ };
++
++ uart {
++ pinctrl_uart1_1: uart1-1 {
++ fsl,pins = <
++ MX27_PAD_UART1_TXD__UART1_TXD 0x0
++ MX27_PAD_UART1_RXD__UART1_RXD 0x0
++ >;
++ };
++
++ pinctrl_uart1_rtscts_1: uart1-rtscts-1 {
++ fsl,pins = <
++ MX27_PAD_UART1_CTS__UART1_CTS 0x0
++ MX27_PAD_UART1_RTS__UART1_RTS 0x0
++ >;
++ };
++
++ pinctrl_uart2_1: uart2-1 {
++ fsl,pins = <
++ MX27_PAD_UART2_TXD__UART2_TXD 0x0
++ MX27_PAD_UART2_RXD__UART2_RXD 0x0
++ >;
++ };
++
++ pinctrl_uart2_rtscts_1: uart2-rtscts-1 {
++ fsl,pins = <
++ MX27_PAD_UART2_CTS__UART2_CTS 0x0
++ MX27_PAD_UART2_RTS__UART2_RTS 0x0
++ >;
++ };
++
++ pinctrl_uart3_1: uart3-1 {
++ fsl,pins = <
++ MX27_PAD_UART3_TXD__UART3_TXD 0x0
++ MX27_PAD_UART3_RXD__UART3_RXD 0x0
++ >;
++ };
++
++ pinctrl_uart3_rtscts_1: uart3-rtscts-1 {
++ fsl,pins = <
++ MX27_PAD_UART3_CTS__UART3_CTS 0x0
++ MX27_PAD_UART3_RTS__UART3_RTS 0x0
++ >;
++ };
++ };
++};
+--
+1.8.4.rc3
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+lin...@li...
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+
diff --git a/patches/linux/3.11/0206-g-linaro-imx27-enable_pinctrl.patch b/patches/linux/3.12/0206-e-linaro-imx27-enable_pinctrl.patch
similarity index 98%
copy from patches/linux/3.11/0206-g-linaro-imx27-enable_pinctrl.patch
copy to patches/linux/3.12/0206-e-linaro-imx27-enable_pinctrl.patch
index fd7d079..3bdc0cb 100644
--- a/patches/linux/3.11/0206-g-linaro-imx27-enable_pinctrl.patch
+++ b/patches/linux/3.12/0206-e-linaro-imx27-enable_pinctrl.patch
@@ -18,7 +18,7 @@ index f7a5ad1..52c5e7e 100644
config SOC_IMX31
bool
--
-1.8.3.2
+1.8.4.rc3
_______________________________________________
diff --git a/patches/linux/3.11/0207-armadeus-apf27dev-add_hog_pinctrl.patch b/patches/linux/3.12/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.12/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.12/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
new file mode 100644
index 0000000..2742307
--- /dev/null
+++ b/patches/linux/3.12/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
@@ -0,0 +1,48 @@
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+Index: linux-3.12-rc1/arch/arm/boot/dts/imx27.dtsi
+===================================================================
+--- linux-3.12-rc1.orig/arch/arm/boot/dts/imx27.dtsi
++++ linux-3.12-rc1/arch/arm/boot/dts/imx27.dtsi
+@@ -526,6 +526,40 @@
+ };
+ };
+
++ imxfb {
++ pinctrl_imxfb1_1: imxfb1-1 {
++ fsl,pins = <
++ MX27_PAD_LSCLK__LSCLK 0x0
++ MX27_PAD_LD0__LD0 0x0
++ MX27_PAD_LD1__LD1 0x0
++ MX27_PAD_LD2__LD2 0x0
++ MX27_PAD_LD3__LD3 0x0
++ MX27_PAD_LD4__LD4 0x0
++ MX27_PAD_LD5__LD5 0x0
++ MX27_PAD_LD6__LD6 0x0
++ MX27_PAD_LD7__LD7 0x0
++ MX27_PAD_LD8__LD8 0x0
++ MX27_PAD_LD9__LD9 0x0
++ MX27_PAD_LD10__LD10 0x0
++ MX27_PAD_LD11__LD11 0x0
++ MX27_PAD_LD12__LD12 0x0
++ MX27_PAD_LD13__LD13 0x0
++ MX27_PAD_LD14__LD14 0x0
++ MX27_PAD_LD15__LD15 0x0
++ MX27_PAD_LD16__LD16 0x0
++ MX27_PAD_LD17__LD17 0x0
++ MX27_PAD_REV__REV 0x0
++ MX27_PAD_CLS__CLS 0x0
++ MX27_PAD_PS__PS 0x0
++ MX27_PAD_SPL_SPR__SPL_SPR 0x0
++ MX27_PAD_HSYNC__HSYNC 0x0
++ MX27_PAD_VSYNC__VSYNC 0x0
++ MX27_PAD_CONTRAST__CONTRAST 0x0
++ MX27_PAD_OE_ACD__OE_ACD 0x0
++ >;
++ };
++ };
++
+ owire {
+ pinctrl_owire1_1: owire1-1 {
+ fsl,pins = <
diff --git a/patches/linux/3.11/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch b/patches/linux/3.12/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
similarity index 100%
copy from patches/linux/3.11/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
copy to patches/linux/3.12/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.12/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.12/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
diff --git a/patches/linux/3.11/0212-armadeus-imx27-fix_cspi_per_clk_id.patch b/patches/linux/3.12/0212-armadeus-imx27-fix_cspi_per_clk_id.patch
similarity index 100%
copy from patches/linux/3.11/0212-armadeus-imx27-fix_cspi_per_clk_id.patch
copy to patches/linux/3.12/0212-armadeus-imx27-fix_cspi_per_clk_id.patch
diff --git a/patches/linux/3.12/0213-armadeus-add_cspi_pinctrl.patch b/patches/linux/3.12/0213-armadeus-add_cspi_pinctrl.patch
new file mode 100644
index 0000000..744c821
--- /dev/null
+++ b/patches/linux/3.12/0213-armadeus-add_cspi_pinctrl.patch
@@ -0,0 +1,40 @@
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+Index: linux-3.12-rc1/arch/arm/boot/dts/imx27.dtsi
+===================================================================
+--- linux-3.12-rc1.orig/arch/arm/boot/dts/imx27.dtsi
++++ linux-3.12-rc1/arch/arm/boot/dts/imx27.dtsi
+@@ -485,6 +485,32 @@
+ };
+
+ &iomuxc {
++ cspi {
++ pinctrl_cspi1_1: cspi1-1 {
++ fsl,pins = <
++ MX27_PAD_CSPI1_SCLK__CSPI1_SCLK 0x0
++ MX27_PAD_CSPI1_MISO__CSPI1_MISO 0x0
++ MX27_PAD_CSPI1_MOSI__CSPI1_MOSI 0x0
++ >;
++ };
++
++ pinctrl_cspi2_1: cspi2-1 {
++ fsl,pins = <
++ MX27_PAD_CSPI2_SCLK__CSPI2_SCLK 0x0
++ MX27_PAD_CSPI2_MISO__CSPI2_MISO 0x0
++ MX27_PAD_CSPI2_MOSI__CSPI2_MOSI 0x0
++ >;
++ };
++
++ pinctrl_cspi3_1: cspi3-1 {
++ fsl,pins = <
++ MX27_PAD_SD1_CLK__CSPI3_SCLK 0x0
++ MX27_PAD_SD1_D0__CSPI3_MISO 0x0
++ MX27_PAD_SD1_CMD__CSPI3_MOSI 0x0
++ >;
++ };
++ };
++
+ fec {
+ pinctrl_fec1_1: fec1-1 {
+ fsl,pins = <
diff --git a/patches/linux/3.12/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch b/patches/linux/3.12/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch
new file mode 100644
index 0000000..df6eb99
--- /dev/null
+++ b/patches/linux/3.12/0214-armadeus-add_cspi_and_sdhc_pinctrl.patch
@@ -0,0 +1,27 @@
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+Index: linux-3.12-rc1/arch/arm/boot/dts/imx27.dtsi
+===================================================================
+--- linux-3.12-rc1.orig/arch/arm/boot/dts/imx27.dtsi
++++ linux-3.12-rc1/arch/arm/boot/dts/imx27.dtsi
+@@ -594,6 +594,19 @@
+ };
+ };
+
++ sdhc {
++ pinctrl_sdhc2_1: sdhc2-1 {
++ fsl,pins = <
++ MX27_PAD_SD2_D0__SD2_D0 0x0
++ MX27_PAD_SD2_D1__SD2_D1 0x0
++ MX27_PAD_SD2_D2__SD2_D2 0x0
++ MX27_PAD_SD2_D3__SD2_D3 0x0
++ MX27_PAD_SD2_CMD__SD2_CMD 0x0
++ MX27_PAD_SD2_CLK__SD2_CLK 0x0
++ >;
++ };
++ };
++
+ uart {
+ pinctrl_uart1_1: uart1-1 {
+ fsl,pins = <
diff --git a/patches/linux/3.11/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch b/patches/linux/3.12/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
similarity index 100%
copy from patches/linux/3.11/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
copy to patches/linux/3.12/0215-armadeus-imx27-apf27dev-add_pinctrl_for_cspi_node.patch
diff --git a/patches/linux/3.11/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch b/patches/linux/3.12/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
similarity index 54%
copy from patches/linux/3.11/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
copy to patches/linux/3.12/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
index 3ec5dee..115962e 100644
--- a/patches/linux/3.11/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
+++ b/patches/linux/3.12/0216-armadeus-imx27-apf27dev-add_sdhc_support.patch
@@ -1,15 +1,15 @@
Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
---
-Index: linux-3.11-rc4/arch/arm/boot/dts/imx27-apf27dev.dts
+Index: linux-3.12-rc1/arch/arm/boot/dts/imx27-apf27dev.dts
===================================================================
---- linux-3.11-rc4.orig/arch/arm/boot/dts/imx27-apf27dev.dts
-+++ linux-3.11-rc4/arch/arm/boot/dts/imx27-apf27dev.dts
-@@ -108,7 +108,18 @@
+--- linux-3.12-rc1.orig/arch/arm/boot/dts/imx27-apf27dev.dts
++++ linux-3.12-rc1/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -108,7 +108,16 @@
MX27_PAD_CSPI2_SS0__GPIO4_21 0
MX27_PAD_CSPI2_SS1__GPIO4_20 0
MX27_PAD_CSI_D5__GPIO2_17 0
-+ MX27_PAD_CSI_MCLK__GPIO2_15 0
++ MX27_PAD_TOUT__GPIO3_14 0
>;
};
};
@@ -17,9 +17,7 @@ Index: linux-3.11-rc4/arch/arm/boot/dts/imx27-apf27dev.dts
+
+&sdhci2 {
+ bus-width = <4>;
-+ cd-gpios = <&gpio2 15 0>;
-+ /*wp-gpios = <&gpio3 28 0>;
-+ vmmc-supply = <&vmmc1_reg>;*/
++ cd-gpios = <&gpio3 14 0>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_sdhc2>;
+ status = "okay";
diff --git a/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.12/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.12/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.12/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.12/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
diff --git a/patches/linux/3.11/0400-Add-apf51-basic-dt-support.patch b/patches/linux/3.12/0400-Add-apf51-basic-dt-support.patch
similarity index 100%
copy from patches/linux/3.11/0400-Add-apf51-basic-dt-support.patch
copy to patches/linux/3.12/0400-Add-apf51-basic-dt-support.patch
diff --git a/patches/linux/3.11/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.12/0401-armadeus-add_apf51dev_baseboard.patch
similarity index 100%
copy from patches/linux/3.11/0401-armadeus-add_apf51dev_baseboard.patch
copy to patches/linux/3.12/0401-armadeus-add_apf51dev_baseboard.patch
diff --git a/patches/linux/3.10/0404-armadeus-fix_nand_ecc_oob.patch b/patches/linux/3.12/0404-armadeus-fix_nand_ecc_oob.patch
similarity index 81%
copy from patches/linux/3.10/0404-armadeus-fix_nand_ecc_oob.patch
copy to patches/linux/3.12/0404-armadeus-fix_nand_ecc_oob.patch
index 8e7912a..e88a820 100644
--- a/patches/linux/3.10/0404-armadeus-fix_nand_ecc_oob.patch
+++ b/patches/linux/3.12/0404-armadeus-fix_nand_ecc_oob.patch
@@ -1,12 +1,8 @@
-Add OOB and bad block table management to the V3 mxc_nand driver
-
-Signed-off-by: Nicolas Colombain <nic...@ar...>
-
-Index: linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c
+Index: linux-3.12-rc1/drivers/mtd/nand/mxc_nand.c
===================================================================
---- linux-3.8-rc1.orig/drivers/mtd/nand/mxc_nand.c 2012-12-22 02:19:00.000000000 +0100
-+++ linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c 2013-01-04 15:03:40.000000000 +0100
-@@ -266,6 +266,18 @@
+--- linux-3.12-rc1.orig/drivers/mtd/nand/mxc_nand.c
++++ linux-3.12-rc1/drivers/mtd/nand/mxc_nand.c
+@@ -266,6 +266,18 @@ static struct nand_ecclayout nandv2_hw_e
}
};
@@ -22,10 +18,10 @@ Index: linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c
+ .oobfree = { {2, 4}, {16, 56}, {80, 56}, {144, 56}, {208, 48} },
+};
+
- static const char const *part_probes[] = {
+ static const char * const part_probes[] = {
"cmdlinepart", "RedBoot", "ofpart", NULL };
-@@ -1147,6 +1159,28 @@
+@@ -1158,6 +1170,28 @@ static struct nand_bbt_descr bbt_mirror_
.pattern = mirror_pattern,
};
@@ -54,7 +50,7 @@ Index: linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c
/* v1 + irqpending_quirk: i.MX21 */
static const struct mxc_nand_devtype_data imx21_nand_devtype_data = {
.preset = preset_v1,
-@@ -1236,7 +1270,7 @@
+@@ -1247,7 +1281,7 @@ static const struct mxc_nand_devtype_dat
.irq_control = irq_control_v3,
.get_ecc_status = get_ecc_status_v3,
.ecclayout_512 = &nandv2_hw_eccoob_smallpage,
@@ -63,7 +59,7 @@ Index: linux-3.8-rc1/drivers/mtd/nand/mxc_nand.c
.ecclayout_4k = &nandv2_hw_eccoob_smallpage, /* XXX: needs fix */
.select_chip = mxc_nand_select_chip_v1_v3,
.correct_data = mxc_nand_correct_data_v2_v3,
-@@ -1482,8 +1516,13 @@
+@@ -1489,8 +1523,13 @@ static int mxcnd_probe(struct platform_d
this->options |= NAND_BUSWIDTH_16;
if (host->pdata.flash_bbt) {
diff --git a/patches/linux/3.10/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch b/patches/linux/3.12/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
similarity index 100%
copy from patches/linux/3.10/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
copy to patches/lin...
[truncated message content] |
