[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-333-g44db53e
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-333-g44db53e
|
From: jorasse <jo...@us...> - 2014-07-14 15:04:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 44db53ece9662c7f1cc59aea0f99a57d284187d2 (commit)
from 011dd42738c3f937d14934842de457f6075e4dc2 (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 44db53ece9662c7f1cc59aea0f99a57d284187d2
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jul 14 17:03:50 2014 +0200
[UBOOT] 2014.07: update patchwork (preliminary)
-----------------------------------------------------------------------
Summary of changes:
...-restore-command-env-param-compatitbility.patch | 2 +-
.../040-i2c-mxc-fix-mx51-i2c-declaration.patch} | 4 ++--
.../u-boot/{2013.04 => 2014.07}/102-mx1-i2c.patch | 0
.../u-boot/{2014.04 => 2014.07}/103-apf9328.patch | 6 +++---
.../104-apf9328-makefile.patch | 12 ++++++------
.../{2014.04 => 2014.07}/106-mx1-pllclk.patch | 0
.../107-mx1-pllclk-debug.patch | 0
.../u-boot/{2014.04 => 2014.07}/108-DM9000.patch | 0
.../{2014.04 => 2014.07}/111-mx1-timer.patch | 0
.../300-imx27-fix_dcache_boot_issue.patch | 2 +-
.../302-apf27-support-boot-from-RAM.patch | 0
.../311-imx-nand-lock-unlock.patch | 0
.../u-boot/{2014.04 => 2014.07}/320-spartan.patch | 6 +++---
.../340-apf27-misc-commands.patch | 0
.../350-nand_large_file_download.patch | 0
...60-arm-support-continuous-mmu-mem-mapping.patch | 0
.../u-boot/{2014.04 => 2014.07}/400-imx51.patch | 0
.../u-boot/{2014.04 => 2014.07}/401-apf51.patch | 18 +++++++++---------
.../u-boot/{2014.04 => 2014.07}/410-imx-iim.patch | 4 ++--
.../420-apf51-nand-spl-NG.patch | 2 +-
.../501-imx28-update-and-fix.patch | 2 +-
.../{2014.04 => 2014.07}/502-add-apf28.patch | 14 +++++++-------
22 files changed, 36 insertions(+), 36 deletions(-)
copy patches/u-boot/{2013.04 => 2014.07}/001-restore-command-env-param-compatitbility.patch (87%)
copy patches/u-boot/{2014.04/0040-i2c-mxc-fix-mx51-i2c-declaration.patch => 2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch} (91%)
copy patches/u-boot/{2013.04 => 2014.07}/102-mx1-i2c.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/103-apf9328.patch (99%)
copy patches/u-boot/{2014.04 => 2014.07}/104-apf9328-makefile.patch (59%)
copy patches/u-boot/{2014.04 => 2014.07}/106-mx1-pllclk.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/107-mx1-pllclk-debug.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/108-DM9000.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/111-mx1-timer.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/300-imx27-fix_dcache_boot_issue.patch (94%)
copy patches/u-boot/{2014.04 => 2014.07}/302-apf27-support-boot-from-RAM.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/311-imx-nand-lock-unlock.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/320-spartan.patch (91%)
copy patches/u-boot/{2014.04 => 2014.07}/340-apf27-misc-commands.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/350-nand_large_file_download.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/360-arm-support-continuous-mmu-mem-mapping.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/400-imx51.patch (100%)
copy patches/u-boot/{2014.04 => 2014.07}/401-apf51.patch (95%)
copy patches/u-boot/{2014.04 => 2014.07}/410-imx-iim.patch (99%)
copy patches/u-boot/{2014.04 => 2014.07}/420-apf51-nand-spl-NG.patch (99%)
copy patches/u-boot/{2014.04 => 2014.07}/501-imx28-update-and-fix.patch (99%)
copy patches/u-boot/{2014.04 => 2014.07}/502-add-apf28.patch (96%)
diff --git a/patches/u-boot/2013.04/001-restore-command-env-param-compatitbility.patch b/patches/u-boot/2014.07/001-restore-command-env-param-compatitbility.patch
similarity index 87%
copy from patches/u-boot/2013.04/001-restore-command-env-param-compatitbility.patch
copy to patches/u-boot/2014.07/001-restore-command-env-param-compatitbility.patch
index 6aee8c0..d1700d0 100644
--- a/patches/u-boot/2013.04/001-restore-command-env-param-compatitbility.patch
+++ b/patches/u-boot/2014.07/001-restore-command-env-param-compatitbility.patch
@@ -4,7 +4,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
---
--- uboot-custom/common/cmd_nvedit.c
+++ uboot-custom/common/cmd_nvedit.c
-@@ -724,7 +724,7 @@ static int do_env_default(cmd_tbl_t *cmd
+@@ -749,7 +749,7 @@ static int do_env_default(cmd_tbl_t *cmd
}
}
debug("Final value for argc=%d\n", argc);
diff --git a/patches/u-boot/2014.04/0040-i2c-mxc-fix-mx51-i2c-declaration.patch b/patches/u-boot/2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch
similarity index 91%
copy from patches/u-boot/2014.04/0040-i2c-mxc-fix-mx51-i2c-declaration.patch
copy to patches/u-boot/2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch
index ab992ec..56f9472 100644
--- a/patches/u-boot/2014.04/0040-i2c-mxc-fix-mx51-i2c-declaration.patch
+++ b/patches/u-boot/2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch
@@ -13,7 +13,7 @@ diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 595019b..a4280b4 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
-@@ -425,8 +425,11 @@ static void * const i2c_bases[] = {
+@@ -421,8 +421,11 @@ static void * const i2c_bases[] = {
#elif defined(CONFIG_MX27)
(void *)IMX_I2C1_BASE,
(void *)IMX_I2C2_BASE
@@ -26,7 +26,7 @@ index 595019b..a4280b4 100644
defined(CONFIG_MX6)
(void *)I2C1_BASE_ADDR,
(void *)I2C2_BASE_ADDR,
-@@ -541,8 +544,7 @@ U_BOOT_I2C_ADAP_COMPLETE(mxc1, mxc_i2c_init, mxc_i2c_probe,
+@@ -539,8 +542,7 @@ U_BOOT_I2C_ADAP_COMPLETE(mxc1, mxc_i2c_init, mxc_i2c_probe,
CONFIG_SYS_MXC_I2C2_SPEED,
CONFIG_SYS_MXC_I2C2_SLAVE, 1)
#if defined(CONFIG_MX31) || defined(CONFIG_MX35) ||\
diff --git a/patches/u-boot/2013.04/102-mx1-i2c.patch b/patches/u-boot/2014.07/102-mx1-i2c.patch
similarity index 100%
copy from patches/u-boot/2013.04/102-mx1-i2c.patch
copy to patches/u-boot/2014.07/102-mx1-i2c.patch
diff --git a/patches/u-boot/2014.04/103-apf9328.patch b/patches/u-boot/2014.07/103-apf9328.patch
similarity index 99%
copy from patches/u-boot/2014.04/103-apf9328.patch
copy to patches/u-boot/2014.07/103-apf9328.patch
index d26ca65..fd7fc54 100644
--- a/patches/u-boot/2014.04/103-apf9328.patch
+++ b/patches/u-boot/2014.07/103-apf9328.patch
@@ -143,7 +143,7 @@ index 0000000..9782115
+ * Spartan3 code is used to download our Spartan 3 :) code is compatible.
+ * Just take care about the file size
+*/
-+Xilinx_Spartan3_Slave_Serial_fns fpga_fns = {
++xilinx_spartan3_slave_serial_fns fpga_fns = {
+ fpga_pre_fn,
+ fpga_pgm_fn,
+ fpga_clk_fn,
@@ -155,8 +155,8 @@ index 0000000..9782115
+ fpga_abort_fn,
+};
+
-+Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
-+ {Xilinx_Spartan3,
++xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
++ {xilinx_spartan3,
+ slave_serial,
+ XILINX_XC3S400_SIZE,
+ (void *)&fpga_fns,
diff --git a/patches/u-boot/2014.04/104-apf9328-makefile.patch b/patches/u-boot/2014.07/104-apf9328-makefile.patch
similarity index 59%
copy from patches/u-boot/2014.04/104-apf9328-makefile.patch
copy to patches/u-boot/2014.07/104-apf9328-makefile.patch
index 0fd4a25..4623f49 100644
--- a/patches/u-boot/2014.04/104-apf9328-makefile.patch
+++ b/patches/u-boot/2014.07/104-apf9328-makefile.patch
@@ -13,10 +13,10 @@ index 7c1fc74..8a40643 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -70,6 +70,7 @@ Active arm arm920t at91
- Active arm arm920t at91 eukrea cpuat91 cpuat91 - Eric Benard <er...@eu...>
- Active arm arm920t at91 eukrea cpuat91 cpuat91_ram cpuat91:RAMBOOT Eric Benard <er...@eu...>
- Active arm arm920t imx - - scb9328 - Torsten Koschorrek <kos...@sy...>
+ Active arm arm920t at91 eukrea cpuat91 cpuat91 - Eric Benard <er...@eu...>
+ Active arm arm920t at91 eukrea cpuat91 cpuat91_ram cpuat91:RAMBOOT Eric Benard <er...@eu...>
+ Active arm arm920t imx - - scb9328 - Torsten Koschorrek <kos...@sy...>
+Active arm arm920t imx armadeus apf9328 apf9328 - Eric Jarrige <eri...@ar...>
- Active arm arm920t ks8695 - - cm4008 - Greg Ungerer <gre...@op...>
- Active arm arm920t ks8695 - - cm41xx - -
- Active arm arm920t s3c24x0 mpl vcma9 VCMA9 - David Müller <d.m...@el...>
+ Active arm arm920t ks8695 - - cm4008 - Greg Ungerer <gre...@op...>
+ Active arm arm920t ks8695 - - cm41xx - -
+ Active arm arm920t s3c24x0 mpl vcma9 VCMA9 - David Müller <d.m...@el...>
diff --git a/patches/u-boot/2014.04/106-mx1-pllclk.patch b/patches/u-boot/2014.07/106-mx1-pllclk.patch
similarity index 100%
copy from patches/u-boot/2014.04/106-mx1-pllclk.patch
copy to patches/u-boot/2014.07/106-mx1-pllclk.patch
diff --git a/patches/u-boot/2014.04/107-mx1-pllclk-debug.patch b/patches/u-boot/2014.07/107-mx1-pllclk-debug.patch
similarity index 100%
copy from patches/u-boot/2014.04/107-mx1-pllclk-debug.patch
copy to patches/u-boot/2014.07/107-mx1-pllclk-debug.patch
diff --git a/patches/u-boot/2014.04/108-DM9000.patch b/patches/u-boot/2014.07/108-DM9000.patch
similarity index 100%
copy from patches/u-boot/2014.04/108-DM9000.patch
copy to patches/u-boot/2014.07/108-DM9000.patch
diff --git a/patches/u-boot/2014.04/111-mx1-timer.patch b/patches/u-boot/2014.07/111-mx1-timer.patch
similarity index 100%
copy from patches/u-boot/2014.04/111-mx1-timer.patch
copy to patches/u-boot/2014.07/111-mx1-timer.patch
diff --git a/patches/u-boot/2014.04/300-imx27-fix_dcache_boot_issue.patch b/patches/u-boot/2014.07/300-imx27-fix_dcache_boot_issue.patch
similarity index 94%
copy from patches/u-boot/2014.04/300-imx27-fix_dcache_boot_issue.patch
copy to patches/u-boot/2014.07/300-imx27-fix_dcache_boot_issue.patch
index 4556f6f..058b2b3 100644
--- a/patches/u-boot/2014.04/300-imx27-fix_dcache_boot_issue.patch
+++ b/patches/u-boot/2014.07/300-imx27-fix_dcache_boot_issue.patch
@@ -6,7 +6,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
---
--- uboot-custom/arch/arm/cpu/arm926ejs/start.S
+++ uboot-custom/arch/arm/cpu/arm926ejs/start.S
-@@ -166,11 +166,12 @@ cpu_init_crit:
+@@ -78,11 +78,12 @@ cpu_init_crit:
*/
mov r0, #0
flush_dcache:
diff --git a/patches/u-boot/2014.04/302-apf27-support-boot-from-RAM.patch b/patches/u-boot/2014.07/302-apf27-support-boot-from-RAM.patch
similarity index 100%
copy from patches/u-boot/2014.04/302-apf27-support-boot-from-RAM.patch
copy to patches/u-boot/2014.07/302-apf27-support-boot-from-RAM.patch
diff --git a/patches/u-boot/2014.04/311-imx-nand-lock-unlock.patch b/patches/u-boot/2014.07/311-imx-nand-lock-unlock.patch
similarity index 100%
copy from patches/u-boot/2014.04/311-imx-nand-lock-unlock.patch
copy to patches/u-boot/2014.07/311-imx-nand-lock-unlock.patch
diff --git a/patches/u-boot/2014.04/320-spartan.patch b/patches/u-boot/2014.07/320-spartan.patch
similarity index 91%
copy from patches/u-boot/2014.04/320-spartan.patch
copy to patches/u-boot/2014.07/320-spartan.patch
index f8cc590..50909a2 100644
--- a/patches/u-boot/2014.04/320-spartan.patch
+++ b/patches/u-boot/2014.07/320-spartan.patch
@@ -11,7 +11,7 @@ diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
index 1633a70..9ca0522 100644
--- a/drivers/fpga/spartan3.c
+++ b/drivers/fpga/spartan3.c
-@@ -171,8 +171,14 @@ static int Spartan3_sp_load(Xilinx_desc
+@@ -172,8 +172,14 @@ static int Spartan3_sp_load(Xilinx_desc
(*fn->clk) (true, true, cookie); /* Assert the clock pin */
/* Load the data */
@@ -28,7 +28,7 @@ index 1633a70..9ca0522 100644
/* XXX - Check the error bit? */
(*fn->wdata) (data[bytecount++], true, cookie); /* write the data */
-@@ -271,7 +277,12 @@ static int Spartan3_sp_dump(Xilinx_desc
+@@ -272,7 +278,12 @@ static int Spartan3_sp_dump(Xilinx_desc
/* dump the data */
while (bytecount < bsize) {
@@ -42,7 +42,7 @@ index 1633a70..9ca0522 100644
(*fn->clk) (false, true, cookie); /* Deassert the clock pin */
(*fn->clk) (true, true, cookie); /* Assert the clock pin */
-@@ -375,6 +386,12 @@ static int Spartan3_ss_load(Xilinx_desc
+@@ -376,6 +387,12 @@ static int Spartan3_ss_load(Xilinx_desc
(*fn->bwr) (data, bsize, true, cookie);
else {
while (bytecount < bsize) {
diff --git a/patches/u-boot/2014.04/340-apf27-misc-commands.patch b/patches/u-boot/2014.07/340-apf27-misc-commands.patch
similarity index 100%
copy from patches/u-boot/2014.04/340-apf27-misc-commands.patch
copy to patches/u-boot/2014.07/340-apf27-misc-commands.patch
diff --git a/patches/u-boot/2014.04/350-nand_large_file_download.patch b/patches/u-boot/2014.07/350-nand_large_file_download.patch
similarity index 100%
copy from patches/u-boot/2014.04/350-nand_large_file_download.patch
copy to patches/u-boot/2014.07/350-nand_large_file_download.patch
diff --git a/patches/u-boot/2014.04/360-arm-support-continuous-mmu-mem-mapping.patch b/patches/u-boot/2014.07/360-arm-support-continuous-mmu-mem-mapping.patch
similarity index 100%
copy from patches/u-boot/2014.04/360-arm-support-continuous-mmu-mem-mapping.patch
copy to patches/u-boot/2014.07/360-arm-support-continuous-mmu-mem-mapping.patch
diff --git a/patches/u-boot/2014.04/400-imx51.patch b/patches/u-boot/2014.07/400-imx51.patch
similarity index 100%
copy from patches/u-boot/2014.04/400-imx51.patch
copy to patches/u-boot/2014.07/400-imx51.patch
diff --git a/patches/u-boot/2014.04/401-apf51.patch b/patches/u-boot/2014.07/401-apf51.patch
similarity index 95%
copy from patches/u-boot/2014.04/401-apf51.patch
copy to patches/u-boot/2014.07/401-apf51.patch
index 0aaf17f..f82c571 100644
--- a/patches/u-boot/2014.04/401-apf51.patch
+++ b/patches/u-boot/2014.07/401-apf51.patch
@@ -757,7 +757,7 @@ index 0000000..665928e
+ * Spartan2 code is used to download our Spartan 6 :) code is compatible.
+ * Just take care about the file size
+*/
-+Xilinx_Spartan3_Slave_Parallel_fns fpga_fns = {
++xilinx_spartan3_slave_parallel_fns fpga_fns = {
+ fpga_pre_fn,
+ fpga_pgm_fn,
+ fpga_init_fn,
@@ -773,8 +773,8 @@ index 0000000..665928e
+ fpga_post_fn,
+};
+
-+Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
-+ {Xilinx_Spartan3,
++xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
++ {xilinx_spartan3,
+ slave_parallel,
+ 3713568l / 8,
+ (void *)&fpga_fns,
@@ -990,12 +990,12 @@ index 9df6212..1aa7e95 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -295,6 +295,7 @@ Active arm armv7 exyno
- Active arm armv7 exynos samsung trats2 trats2 - Piotr Wilczek <p.w...@sa...>
- Active arm armv7 exynos samsung universal_c210 s5pc210_universal - Przemyslaw Marczak <p.m...@sa...>
- Active arm armv7 highbank - highbank highbank - Rob Herring <rob...@ca...>
+ Active arm armv7 exynos samsung universal_c210 s5pc210_universal - Przemyslaw Marczak <p.m...@sa...>
+ Active arm armv7 highbank - highbank highbank - Rob Herring <ro...@ke...>
+ Active arm armv7 keystone ti k2hk_evm k2hk_evm - Vitaly Andrianov <vi...@ti...>
+Active arm armv7 mx5 armadeus apf51 apf51 apf51:IMX_CONFIG=board/armadeus/apf51/imximage.cfg Eric Jarrige <eri...@ar...>
- Active arm armv7 mx5 denx m53evk m53evk m53evk:IMX_CONFIG=board/denx/m53evk/imximage.cfg Marek Vasut <mar...@gm...>
- Active arm armv7 mx5 esg ima3-mx53 ima3-mx53 ima3-mx53:IMX_CONFIG=board/esg/ima3-mx53/imximage.cfg -
- Active arm armv7 mx5 freescale mx51evk mx51evk mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg Stefano Babic <sb...@de...>
+ Active arm armv7 mx5 denx m53evk m53evk m53evk:IMX_CONFIG=board/denx/m53evk/imximage.cfg Marek Vasut <mar...@gm...>
+ Active arm armv7 mx5 esg ima3-mx53 ima3-mx53 ima3-mx53:IMX_CONFIG=board/esg/ima3-mx53/imximage.cfg -
+ Active arm armv7 mx5 freescale mx51evk mx51evk mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg Stefano Babic <sb...@de...>
1.7.2.5
diff --git a/patches/u-boot/2014.04/410-imx-iim.patch b/patches/u-boot/2014.07/410-imx-iim.patch
similarity index 99%
copy from patches/u-boot/2014.04/410-imx-iim.patch
copy to patches/u-boot/2014.07/410-imx-iim.patch
index 0c3a15d..13b5c1e 100644
--- a/patches/u-boot/2014.04/410-imx-iim.patch
+++ b/patches/u-boot/2014.07/410-imx-iim.patch
@@ -69,14 +69,14 @@ diff --git a/common/Makefile b/common/Makefile
index 973f05a..f368b24 100644
--- a/common/Makefile
+++ b/common/Makefile
-@@ -94,6 +94,7 @@ ifdef CONFIG_FPGA
+@@ -113,6 +113,7 @@ ifdef CONFIG_FPGA
obj-$(CONFIG_CMD_FUSE) += cmd_fuse.o
obj-$(CONFIG_CMD_GETTIME) += cmd_gettime.o
obj-$(CONFIG_CMD_GPIO) += cmd_gpio.o
+obj-$(CONFIG_CMD_IIM) += cmd_iim.o
obj-$(CONFIG_CMD_I2C) += cmd_i2c.o
+ obj-$(CONFIG_CMD_IOTRACE) += cmd_iotrace.o
obj-$(CONFIG_CMD_HASH) += cmd_hash.o
- obj-$(CONFIG_CMD_IDE) += cmd_ide.o
diff --git a/common/cmd_iim.c b/common/cmd_iim.c
new file mode 100644
index 0000000..d47ccf5
diff --git a/patches/u-boot/2014.04/420-apf51-nand-spl-NG.patch b/patches/u-boot/2014.07/420-apf51-nand-spl-NG.patch
similarity index 99%
copy from patches/u-boot/2014.04/420-apf51-nand-spl-NG.patch
copy to patches/u-boot/2014.07/420-apf51-nand-spl-NG.patch
index d6b45a8..2799da4 100644
--- a/patches/u-boot/2014.04/420-apf51-nand-spl-NG.patch
+++ b/patches/u-boot/2014.07/420-apf51-nand-spl-NG.patch
@@ -12,7 +12,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
--- a/arch/arm/imx-common/Makefile
+++ b/arch/arm/imx-common/Makefile
-@@ -75,7 +75,7 @@ u-boot-with-nand-spl.imx: spl/u-boot-nan
+@@ -72,7 +72,7 @@ u-boot-with-nand-spl.imx: spl/u-boot-nan
$(call if_changed,pad_cat)
quiet_cmd_u-boot-nand-spl_imx = GEN $@
diff --git a/patches/u-boot/2014.04/501-imx28-update-and-fix.patch b/patches/u-boot/2014.07/501-imx28-update-and-fix.patch
similarity index 99%
copy from patches/u-boot/2014.04/501-imx28-update-and-fix.patch
copy to patches/u-boot/2014.07/501-imx28-update-and-fix.patch
index aaae42b..4cd72c8 100644
--- a/patches/u-boot/2014.04/501-imx28-update-and-fix.patch
+++ b/patches/u-boot/2014.07/501-imx28-update-and-fix.patch
@@ -32,7 +32,7 @@ index c60615a..f533ad0 100644
CALL HAB 0x8000 0x0
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
-@@ -88,7 +88,9 @@
+@@ -89,7 +89,9 @@
* As for the SPL, we must avoid the first 4 KiB as well, but we load the
* IVT and CST to 0x8000, so we don't need to waste the subsequent 4 KiB.
*/
diff --git a/patches/u-boot/2014.04/502-add-apf28.patch b/patches/u-boot/2014.07/502-add-apf28.patch
similarity index 96%
copy from patches/u-boot/2014.04/502-add-apf28.patch
copy to patches/u-boot/2014.07/502-add-apf28.patch
index 912b16d..3e77dd1 100644
--- a/patches/u-boot/2014.04/502-add-apf28.patch
+++ b/patches/u-boot/2014.07/502-add-apf28.patch
@@ -1174,13 +1174,13 @@ diff --git a/boards.cfg b/boards.cfg
index 1aa7e95..f3c8b40 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -210,6 +210,7 @@ Active arm arm926ejs mx27
- Active arm arm926ejs mx27 logicpd imx27lite magnesium - Heiko Schocher <hs...@de...>
- Active arm arm926ejs mxs bluegiga apx4devkit apx4devkit - Lauri Hintsala <lau...@bl...>
- Active arm arm926ejs mxs creative xfi3 xfi3 - Marek Vasut <mar...@gm...>
+@@ -205,6 +205,7 @@ Active arm arm926ejs mx27
+ Active arm arm926ejs mx27 logicpd imx27lite magnesium - Heiko Schocher <hs...@de...>
+ Active arm arm926ejs mxs bluegiga apx4devkit apx4devkit - Lauri Hintsala <lau...@bl...>
+ Active arm arm926ejs mxs creative xfi3 xfi3 - Marek Vasut <mar...@gm...>
+Active arm arm926ejs mxs armadeus apf28 apf28 - Eric Jarrige <eri...@ar...>
- Active arm arm926ejs mxs denx m28evk m28evk - Marek Vasut <mar...@gm...>
- Active arm arm926ejs mxs freescale mx23evk mx23evk - Otavio Salvador <ot...@os...>
- Active arm arm926ejs mxs freescale mx28evk mx28evk mx28evk:ENV_IS_IN_MMC Fabio Estevam <fab...@fr...>
+ Active arm arm926ejs mxs denx m28evk m28evk - Marek Vasut <mar...@gm...>
+ Active arm arm926ejs mxs freescale mx23evk mx23evk - Otavio Salvador <ot...@os...>
+ Active arm arm926ejs mxs freescale mx28evk mx28evk mx28evk:ENV_IS_IN_MMC Fabio Estevam <fab...@fr...>
1.7.2.5
hooks/post-receive
--
armadeus
|