[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-334-gcea7ad9
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-334-gcea7ad9
|
From: jorasse <jo...@us...> - 2014-07-16 10:09:52
|
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 cea7ad94611ad79dbd4407517ec2ff861da03afa (commit)
from 44db53ece9662c7f1cc59aea0f99a57d284187d2 (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 cea7ad94611ad79dbd4407517ec2ff861da03afa
Author: Eric Jarrige <eri...@ar...>
Date: Wed Jul 16 12:09:33 2014 +0200
[UBOOT] 2014.07: update after release 2014.07
-----------------------------------------------------------------------
Summary of changes:
.../040-i2c-mxc-fix-mx51-i2c-declaration.patch | 2 +-
patches/u-boot/2014.07/104-apf9328-makefile.patch | 10 +++++-----
...60-arm-support-continuous-mmu-mem-mapping.patch | 15 +++++++++------
patches/u-boot/2014.07/401-apf51.patch | 2 +-
patches/u-boot/2014.07/420-apf51-nand-spl-NG.patch | 11 +----------
patches/u-boot/2014.07/502-add-apf28.patch | 2 +-
6 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/patches/u-boot/2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch b/patches/u-boot/2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch
index 56f9472..50fcc7a 100644
--- a/patches/u-boot/2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch
+++ b/patches/u-boot/2014.07/040-i2c-mxc-fix-mx51-i2c-declaration.patch
@@ -26,7 +26,7 @@ index 595019b..a4280b4 100644
defined(CONFIG_MX6)
(void *)I2C1_BASE_ADDR,
(void *)I2C2_BASE_ADDR,
-@@ -539,8 +542,7 @@ U_BOOT_I2C_ADAP_COMPLETE(mxc1, mxc_i2c_init, mxc_i2c_probe,
+@@ -544,8 +547,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/2014.07/104-apf9328-makefile.patch b/patches/u-boot/2014.07/104-apf9328-makefile.patch
index 4623f49..895c4a7 100644
--- a/patches/u-boot/2014.07/104-apf9328-makefile.patch
+++ b/patches/u-boot/2014.07/104-apf9328-makefile.patch
@@ -12,11 +12,11 @@ diff --git a/boards.cfg b/boards.cfg
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...>
+@@ -75,6 +75,7 @@ Active arm arm920t at91
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 ep93xx cirrus edb93xx edb9315a edb93xx:MK_edb9315a Sergey Kostanbaev <ser...@fa...>
+ Active arm arm920t imx - scb9328 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 ks8695 - cm4008 cm4008 - Greg Ungerer <gre...@op...>
+ Active arm arm920t ks8695 - cm41xx cm41xx - -
Active arm arm920t s3c24x0 mpl vcma9 VCMA9 - David Müller <d.m...@el...>
diff --git a/patches/u-boot/2014.07/360-arm-support-continuous-mmu-mem-mapping.patch b/patches/u-boot/2014.07/360-arm-support-continuous-mmu-mem-mapping.patch
index aa6389b..f06e82e 100644
--- a/patches/u-boot/2014.07/360-arm-support-continuous-mmu-mem-mapping.patch
+++ b/patches/u-boot/2014.07/360-arm-support-continuous-mmu-mem-mapping.patch
@@ -6,7 +6,7 @@ diff --git a/arch/arm/lib/cache-cp15.c b/arch/arm/lib/cache-cp15.c
index 939de10..25f0ff1 100644
--- a/arch/arm/lib/cache-cp15.c
+++ b/arch/arm/lib/cache-cp15.c
-@@ -34,14 +34,14 @@ static void cp_delay (void)
+@@ -32,14 +32,14 @@ static void cp_delay (void)
asm volatile("" : : : "memory");
}
@@ -22,8 +22,8 @@ index 939de10..25f0ff1 100644
+ page_table[section_index] = value;
}
- void __mmu_page_table_flush(unsigned long start, unsigned long stop)
-@@ -63,11 +63,11 @@ void mmu_set_region_dcache_behaviour(u32
+ __weak void mmu_page_table_flush(unsigned long start, unsigned long stop)
+@@ -58,11 +58,11 @@ void mmu_set_region_dcache_behaviour(u32
debug("%s: start=%x, size=%x, option=%d\n", __func__, start, size,
option);
for (upto = start; upto < end; upto++)
@@ -37,7 +37,7 @@ index 939de10..25f0ff1 100644
{
bd_t *bd = gd->bd;
int i;
-@@ -77,9 +77,9 @@ __weak void dram_bank_mmu_setup(int bank
+@@ -72,9 +72,9 @@ __weak void dram_bank_mmu_setup(int bank
i < (bd->bi_dram[bank].start + bd->bi_dram[bank].size) >> 20;
i++) {
#if defined(CONFIG_SYS_ARM_CACHE_WRITETHROUGH)
@@ -49,7 +49,7 @@ index 939de10..25f0ff1 100644
#endif
}
}
-@@ -89,14 +89,22 @@ static inline void mmu_setup(void)
+@@ -84,14 +84,22 @@ static inline void mmu_setup(void)
{
int i;
u32 reg;
@@ -77,13 +77,16 @@ index 939de10..25f0ff1 100644
diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
--- a/arch/arm/include/asm/cache.h
+++ b/arch/arm/include/asm/cache.h
-@@ -27,9 +27,9 @@ static inline void invalidate_l2_cache(v
+@@ -27,12 +27,12 @@ static inline void invalidate_l2_cache(v
void l2_cache_enable(void);
void l2_cache_disable(void);
-void set_section_dcache(int section, enum dcache_option option);
+void set_section_dcache(int section, int section_index, enum dcache_option option);
+ void arm_init_before_mmu(void);
+ void arm_init_domains(void);
+ void cpu_cache_initialization(void);
-void dram_bank_mmu_setup(int bank);
+void dram_bank_mmu_setup(int bank, int page_offset);
diff --git a/patches/u-boot/2014.07/401-apf51.patch b/patches/u-boot/2014.07/401-apf51.patch
index f82c571..b6201ea 100644
--- a/patches/u-boot/2014.07/401-apf51.patch
+++ b/patches/u-boot/2014.07/401-apf51.patch
@@ -989,7 +989,7 @@ diff --git a/boards.cfg b/boards.cfg
index 9df6212..1aa7e95 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -295,6 +295,7 @@ Active arm armv7 exyno
+@@ -302,6 +302,7 @@ Active arm armv7 exyno
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...>
diff --git a/patches/u-boot/2014.07/420-apf51-nand-spl-NG.patch b/patches/u-boot/2014.07/420-apf51-nand-spl-NG.patch
index 2799da4..a9c4aa2 100644
--- a/patches/u-boot/2014.07/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
-@@ -72,7 +72,7 @@ u-boot-with-nand-spl.imx: spl/u-boot-nan
+@@ -73,7 +73,7 @@ u-boot-with-nand-spl.imx: spl/u-boot-nan
$(call if_changed,pad_cat)
quiet_cmd_u-boot-nand-spl_imx = GEN $@
@@ -359,12 +359,3 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
#define NFC_V3_IPC_INT (1 << 31)
#if defined(MXC_NFC_V1) || defined(MXC_NFC_V2_1)
---- a/arch/arm/include/asm/arch-mx5/spl.h
-+++ b/arch/arm/include/asm/arch-mx5/spl.h
-@@ -9,5 +9,6 @@
-
- #define BOOT_DEVICE_NONE 0
- #define BOOT_DEVICE_NAND 1
-+#define BOOT_DEVICE_RAM 2
-
- #endif /* __ASM_ARCH_SPL_H__ */
diff --git a/patches/u-boot/2014.07/502-add-apf28.patch b/patches/u-boot/2014.07/502-add-apf28.patch
index 3e77dd1..74da664 100644
--- a/patches/u-boot/2014.07/502-add-apf28.patch
+++ b/patches/u-boot/2014.07/502-add-apf28.patch
@@ -1174,7 +1174,7 @@ diff --git a/boards.cfg b/boards.cfg
index 1aa7e95..f3c8b40 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -205,6 +205,7 @@ Active arm arm926ejs mx27
+@@ -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...>
hooks/post-receive
--
armadeus
|