[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-161-ged1cbc0
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-161-ged1cbc0
|
From: jorasse <jo...@us...> - 2013-02-12 15:32:50
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ed1cbc07c49904537e921c3faaf17c069704f724 (commit)
from 7a2303918bec16737a0e035d2ea80dea0b8c1080 (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 ed1cbc07c49904537e921c3faaf17c069704f724
Author: Eric Jarrige <eri...@ar...>
Date: Tue Feb 12 16:36:14 2013 +0100
[UBOOT] initial bump to U-Boot 2013.01.01
-----------------------------------------------------------------------
Summary of changes:
...-u-boot-2012.10.h => apf27-u-boot-2013.01.01.h} | 22 +++---
.../100-SPL-Add-u-boot-nand-build-option.patch | 2 +-
.../{2012.10 => 2013.01.01}/102-mx1-i2c.patch | 0
.../{2012.10 => 2013.01.01}/103-apf9328.patch | 0
.../104-apf9328-makefile.patch | 4 +-
.../{2012.10 => 2013.01.01}/106-mx1-pllclk.patch | 0
.../107-mx1-pllclk-debug.patch | 0
.../{2012.10 => 2013.01.01}/108-DM9000.patch | 0
.../{2012.10 => 2013.01.01}/111-mx1-timer.patch | 0
...stant-to-support-the-armadeus-APF27-board.patch | 0
...-add-support-for-the-armadeus-APF27-board.patch | 6 +-
.../303-apf27-Add-spl-support-for-the-apf27.patch | 0
...pf27-Add-FPGA-support-for-the-apf27-board.patch | 0
.../311-imx-nand-lock-unlock.patch | 0
.../{2012.10 => 2013.01.01}/320-spartan.patch | 0
.../{2012.10 => 2013.01.01}/321-add_spartan6.patch | 2 +-
.../340-apf27-misc-commands.patch | 0
.../350-nand_large_file_download.patch | 20 +++---
...60-arm-support-continuous-mmu-mem-mapping.patch | 76 ++++++++++++++++++++
.../370-imx27-add-i2c-driver.patch | 4 +-
.../u-boot/{2012.10 => 2013.01.01}/400-imx51.patch | 59 +++++++--------
.../u-boot/{2012.10 => 2013.01.01}/401-apf51.patch | 2 +-
.../{2012.10 => 2013.01.01}/403-apf51-wdog.patch | 2 +-
.../{2012.10 => 2013.01.01}/407-imx51-nand.patch | 2 +-
.../409-apf51-nand-spl.patch | 0
.../{2012.10 => 2013.01.01}/410-imx-iim.patch | 10 ++--
.../2013.01.01/501-imx28-update-and-fix.patch | 37 ++++++++++
.../{2012.10 => 2013.01.01}/502-add-apf28.patch | 6 +-
28 files changed, 182 insertions(+), 72 deletions(-)
copy buildroot/target/device/armadeus/apf27/{apf27-u-boot-2012.10.h => apf27-u-boot-2013.01.01.h} (95%)
copy patches/u-boot/{2012.10 => 2013.01.01}/100-SPL-Add-u-boot-nand-build-option.patch (94%)
copy patches/u-boot/{2012.10 => 2013.01.01}/102-mx1-i2c.patch (100%)
copy patches/u-boot/{2012.10 => 2013.01.01}/103-apf9328.patch (100%)
copy patches/u-boot/{2012.10 => 2013.01.01}/104-apf9328-makefile.patch (92%)
copy patches/u-boot/{2012.10 => 2013.01.01}/106-mx1-pllclk.patch (100%)
copy patches/u-boot/{2012.10 => 2013.01.01}/107-mx1-pllclk-debug.patch (100%)
copy patches/u-boot/{2012.10 => 2013.01.01}/108-DM9000.patch (100%)
copy patches/u-boot/{2012.10 => 2013.01.01}/111-mx1-timer.patch (100%)
copy patches/u-boot/{2012.10 => 2013.01.01}/301-imx27-Add-missing-constant-to-support-the-armadeus-APF27-board.patch (100%)
copy patches/u-boot/{2012.10 => 2013.01.01}/302-apf27-add-support-for-the-armadeus-APF27-board.patch (99%)
copy patches/u-boot/{2012.10 => 2013.01.01}/303-apf27-Add-spl-support-for-the-apf27.patch (100%)
copy patches/u-boot/{2012.10 => 2013.01.01}/304-apf27-Add-FPGA-support-for-the-apf27-board.patch (100%)
copy patches/u-boot/{2012.10 => 2013.01.01}/311-imx-nand-lock-unlock.patch (100%)
copy patches/u-boot/{2012.10 => 2013.01.01}/320-spartan.patch (100%)
copy patches/u-boot/{2012.10 => 2013.01.01}/321-add_spartan6.patch (99%)
copy patches/u-boot/{2012.10 => 2013.01.01}/340-apf27-misc-commands.patch (100%)
copy patches/u-boot/{2012.10 => 2013.01.01}/350-nand_large_file_download.patch (91%)
create mode 100644 patches/u-boot/2013.01.01/360-arm-support-continuous-mmu-mem-mapping.patch
copy patches/u-boot/{2012.10 => 2013.01.01}/370-imx27-add-i2c-driver.patch (95%)
copy patches/u-boot/{2012.10 => 2013.01.01}/400-imx51.patch (95%)
copy patches/u-boot/{2012.10 => 2013.01.01}/401-apf51.patch (99%)
copy patches/u-boot/{2012.10 => 2013.01.01}/403-apf51-wdog.patch (93%)
copy patches/u-boot/{2012.10 => 2013.01.01}/407-imx51-nand.patch (99%)
copy patches/u-boot/{2012.10 => 2013.01.01}/409-apf51-nand-spl.patch (100%)
copy patches/u-boot/{2012.10 => 2013.01.01}/410-imx-iim.patch (98%)
create mode 100644 patches/u-boot/2013.01.01/501-imx28-update-and-fix.patch
copy patches/u-boot/{2012.10 => 2013.01.01}/502-add-apf28.patch (99%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.01.01.h
similarity index 95%
copy from buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
copy to buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.01.01.h
index 4839d5b..0de0e29 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.10.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.01.01.h
@@ -82,7 +82,7 @@
#define CONFIG_BOOTP_DNS2
#define CONFIG_HOSTNAME CONFIG_BOARD_NAME
-#define CONFIG_ROOTPATH "/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
+#define CONFIG_ROOTPATH "/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root"
/*
* U-Boot Commands
@@ -188,9 +188,9 @@
#define CONFIG_BOOTDELAY 5
#define CONFIG_ZERO_BOOTDELAY_CHECK
-#define CONFIG_BOOTFILE MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
-#define CONFIG_BOOTARGS "console=" MK_STR(ACFG_CONSOLE_DEV) "," \
- MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
+#define CONFIG_BOOTFILE __stringify(CONFIG_BOARD_NAME) "-linux.bin"
+#define CONFIG_BOOTARGS "console=" __stringify(ACFG_CONSOLE_DEV) "," \
+ __stringify(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
" ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
#define ACFG_CONSOLE_DEV ttySMX0
@@ -207,15 +207,15 @@
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
"env_version=" CONFIG_ENV_VERSION "\0" \
- "consoledev=" MK_STR(ACFG_CONSOLE_DEV) "\0" \
+ "consoledev=" __stringify(ACFG_CONSOLE_DEV) "\0" \
"mtdparts=" MTDPARTS_DEFAULT "\0" \
"partition=nand0,6\0" \
- "u-boot_addr=" MK_STR(ACFG_MONITOR_OFFSET) "\0" \
- "env_addr=" MK_STR(CONFIG_ENV_OFFSET) "\0" \
- "firmware_addr=" MK_STR(CONFIG_FIRMWARE_OFFSET) "\0" \
- "kernel_addr=" MK_STR(CONFIG_KERNEL_OFFSET) "\0" \
- "rootfs_addr=" MK_STR(CONFIG_ROOTFS_OFFSET) "\0" \
- "board_name=" MK_STR(CONFIG_BOARD_NAME) "\0" \
+ "u-boot_addr=" __stringify(ACFG_MONITOR_OFFSET) "\0" \
+ "env_addr=" __stringify(CONFIG_ENV_OFFSET) "\0" \
+ "firmware_addr=" __stringify(CONFIG_FIRMWARE_OFFSET) "\0" \
+ "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" \
"addnfsargs=setenv bootargs ${bootargs} " \
"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
diff --git a/patches/u-boot/2012.10/100-SPL-Add-u-boot-nand-build-option.patch b/patches/u-boot/2013.01.01/100-SPL-Add-u-boot-nand-build-option.patch
similarity index 94%
copy from patches/u-boot/2012.10/100-SPL-Add-u-boot-nand-build-option.patch
copy to patches/u-boot/2013.01.01/100-SPL-Add-u-boot-nand-build-option.patch
index 21e74fb..f6c3cc8 100644
--- a/patches/u-boot/2012.10/100-SPL-Add-u-boot-nand-build-option.patch
+++ b/patches/u-boot/2013.01.01/100-SPL-Add-u-boot-nand-build-option.patch
@@ -10,7 +10,7 @@ diff --git a/Makefile b/Makefile
index 08eecbb..00c9422 100644
--- a/Makefile
+++ b/Makefile
-@@ -554,8 +554,14 @@ $(obj)u-boot.lds: $(LDSCRIPT)
+@@ -601,8 +601,14 @@ $(obj)u-boot.lds: $(LDSCRIPT)
nand_spl: $(TIMESTAMP_FILE) $(VERSION_FILE) depend
$(MAKE) -C nand_spl/board/$(BOARDDIR) all
diff --git a/patches/u-boot/2012.10/102-mx1-i2c.patch b/patches/u-boot/2013.01.01/102-mx1-i2c.patch
similarity index 100%
copy from patches/u-boot/2012.10/102-mx1-i2c.patch
copy to patches/u-boot/2013.01.01/102-mx1-i2c.patch
diff --git a/patches/u-boot/2012.10/103-apf9328.patch b/patches/u-boot/2013.01.01/103-apf9328.patch
similarity index 100%
copy from patches/u-boot/2012.10/103-apf9328.patch
copy to patches/u-boot/2013.01.01/103-apf9328.patch
diff --git a/patches/u-boot/2012.10/104-apf9328-makefile.patch b/patches/u-boot/2013.01.01/104-apf9328-makefile.patch
similarity index 92%
copy from patches/u-boot/2012.10/104-apf9328-makefile.patch
copy to patches/u-boot/2013.01.01/104-apf9328-makefile.patch
index fc15410..b2f8406 100644
--- a/patches/u-boot/2012.10/104-apf9328-makefile.patch
+++ b/patches/u-boot/2013.01.01/104-apf9328-makefile.patch
@@ -13,7 +13,7 @@ diff --git a/MAINTAINERS b/MAINTAINERS
index b571400..18ac7d3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -255,6 +255,10 @@ Gabriel Huau <co...@hu...>
+@@ -250,6 +250,10 @@ Gabriel Huau <co...@hu...>
mini2440 s3c2440
@@ -28,7 +28,7 @@ diff --git a/boards.cfg b/boards.cfg
index 7c1fc74..8a40643 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -57,6 +57,7 @@ integratorap_cm720t arm arm720t integrator armltd
+@@ -59,6 +59,7 @@ integratorap_cm720t arm arm720t integrator armltd
integratorap_cm920t arm arm920t integrator armltd - integratorap:CM920T
integratorcp_cm920t arm arm920t integrator armltd - integratorcp:CM920T
a320evb arm arm920t - faraday a320
diff --git a/patches/u-boot/2012.10/106-mx1-pllclk.patch b/patches/u-boot/2013.01.01/106-mx1-pllclk.patch
similarity index 100%
copy from patches/u-boot/2012.10/106-mx1-pllclk.patch
copy to patches/u-boot/2013.01.01/106-mx1-pllclk.patch
diff --git a/patches/u-boot/2012.10/107-mx1-pllclk-debug.patch b/patches/u-boot/2013.01.01/107-mx1-pllclk-debug.patch
similarity index 100%
copy from patches/u-boot/2012.10/107-mx1-pllclk-debug.patch
copy to patches/u-boot/2013.01.01/107-mx1-pllclk-debug.patch
diff --git a/patches/u-boot/2012.10/108-DM9000.patch b/patches/u-boot/2013.01.01/108-DM9000.patch
similarity index 100%
copy from patches/u-boot/2012.10/108-DM9000.patch
copy to patches/u-boot/2013.01.01/108-DM9000.patch
diff --git a/patches/u-boot/2012.10/111-mx1-timer.patch b/patches/u-boot/2013.01.01/111-mx1-timer.patch
similarity index 100%
copy from patches/u-boot/2012.10/111-mx1-timer.patch
copy to patches/u-boot/2013.01.01/111-mx1-timer.patch
diff --git a/patches/u-boot/2012.10/301-imx27-Add-missing-constant-to-support-the-armadeus-APF27-board.patch b/patches/u-boot/2013.01.01/301-imx27-Add-missing-constant-to-support-the-armadeus-APF27-board.patch
similarity index 100%
copy from patches/u-boot/2012.10/301-imx27-Add-missing-constant-to-support-the-armadeus-APF27-board.patch
copy to patches/u-boot/2013.01.01/301-imx27-Add-missing-constant-to-support-the-armadeus-APF27-board.patch
diff --git a/patches/u-boot/2012.10/302-apf27-add-support-for-the-armadeus-APF27-board.patch b/patches/u-boot/2013.01.01/302-apf27-add-support-for-the-armadeus-APF27-board.patch
similarity index 99%
copy from patches/u-boot/2012.10/302-apf27-add-support-for-the-armadeus-APF27-board.patch
copy to patches/u-boot/2013.01.01/302-apf27-add-support-for-the-armadeus-APF27-board.patch
index 228d747..f4df5bf 100644
--- a/patches/u-boot/2012.10/302-apf27-add-support-for-the-armadeus-APF27-board.patch
+++ b/patches/u-boot/2013.01.01/302-apf27-add-support-for-the-armadeus-APF27-board.patch
@@ -13,9 +13,9 @@ diff --git a/MAINTAINERS b/MAINTAINERS
index 1b2da94..297467a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -1011,6 +1011,11 @@ Nobuhiro Iwamatsu <nob...@re...>
+@@ -1028,6 +1028,11 @@ Nobuhiro Iwamatsu <nob...@re...>
- armadillo-800eva R8A7740 (RMOBILE SoC)
+ nokia_rx51 ARM ARMV7 (OMAP34xx SoC)
+Eric Jarrige <eri...@ar...>
+Philippe Reynes <tr...@ya...>
@@ -992,7 +992,7 @@ diff --git a/boards.cfg b/boards.cfg
index 4c63789..72c49df 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -184,6 +184,7 @@ jadecpu arm arm926ejs jadecpu syteco
+@@ -190,6 +190,7 @@ jadecpu arm arm926ejs jadecpu syteco
mx25pdk arm arm926ejs mx25pdk freescale mx25 mx25pdk:IMX_CONFIG=board/freescale/mx25pdk/imximage.cfg
tx25 arm arm926ejs tx25 karo mx25
zmx25 arm arm926ejs zmx25 syteco mx25
diff --git a/patches/u-boot/2012.10/303-apf27-Add-spl-support-for-the-apf27.patch b/patches/u-boot/2013.01.01/303-apf27-Add-spl-support-for-the-apf27.patch
similarity index 100%
copy from patches/u-boot/2012.10/303-apf27-Add-spl-support-for-the-apf27.patch
copy to patches/u-boot/2013.01.01/303-apf27-Add-spl-support-for-the-apf27.patch
diff --git a/patches/u-boot/2012.10/304-apf27-Add-FPGA-support-for-the-apf27-board.patch b/patches/u-boot/2013.01.01/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
similarity index 100%
copy from patches/u-boot/2012.10/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
copy to patches/u-boot/2013.01.01/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
diff --git a/patches/u-boot/2012.10/311-imx-nand-lock-unlock.patch b/patches/u-boot/2013.01.01/311-imx-nand-lock-unlock.patch
similarity index 100%
copy from patches/u-boot/2012.10/311-imx-nand-lock-unlock.patch
copy to patches/u-boot/2013.01.01/311-imx-nand-lock-unlock.patch
diff --git a/patches/u-boot/2012.10/320-spartan.patch b/patches/u-boot/2013.01.01/320-spartan.patch
similarity index 100%
copy from patches/u-boot/2012.10/320-spartan.patch
copy to patches/u-boot/2013.01.01/320-spartan.patch
diff --git a/patches/u-boot/2012.10/321-add_spartan6.patch b/patches/u-boot/2013.01.01/321-add_spartan6.patch
similarity index 99%
copy from patches/u-boot/2012.10/321-add_spartan6.patch
copy to patches/u-boot/2013.01.01/321-add_spartan6.patch
index b7e10a6..689db28 100644
--- a/patches/u-boot/2012.10/321-add_spartan6.patch
+++ b/patches/u-boot/2013.01.01/321-add_spartan6.patch
@@ -18,7 +18,7 @@ diff --git a/README b/README
index dd250a0..d97bc04 100644
--- a/README
+++ b/README
-@@ -2059,7 +2059,7 @@ The following options need to be configured:
+@@ -2134,7 +2134,7 @@ The following options need to be configured:
CONFIG_FPGA_<family>
Enables support for FPGA family.
diff --git a/patches/u-boot/2012.10/340-apf27-misc-commands.patch b/patches/u-boot/2013.01.01/340-apf27-misc-commands.patch
similarity index 100%
copy from patches/u-boot/2012.10/340-apf27-misc-commands.patch
copy to patches/u-boot/2013.01.01/340-apf27-misc-commands.patch
diff --git a/patches/u-boot/2012.10/350-nand_large_file_download.patch b/patches/u-boot/2013.01.01/350-nand_large_file_download.patch
similarity index 91%
copy from patches/u-boot/2012.10/350-nand_large_file_download.patch
copy to patches/u-boot/2013.01.01/350-nand_large_file_download.patch
index 03c5c7d..439da74 100644
--- a/patches/u-boot/2012.10/350-nand_large_file_download.patch
+++ b/patches/u-boot/2013.01.01/350-nand_large_file_download.patch
@@ -22,7 +22,7 @@ index a9ade8b..fc1ce05 100644
+
static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
- int do_bootp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+ static int do_bootp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
@@ -51,11 +55,19 @@ int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return ret;
}
@@ -88,9 +88,9 @@ index 59a8ebb..727e746 100644
/* Well known TFTP port # */
#define WELL_KNOWN_PORT 69
/* Millisecs to timeout for lost pkt */
-@@ -41,6 +46,11 @@
- static ulong TftpTimeoutMSecs = TIMEOUT;
- static int TftpTimeoutCountMax = TIMEOUT_COUNT;
+@@ -28,6 +33,11 @@
+ /* Number of "loading" hashes per line (for checking the image size) */
+ #define HASHES_PER_LINE 65
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_SYS_DIRECT_FLASH_TFTP)
+static int temp_buf_offset = 0;
@@ -98,9 +98,9 @@ index 59a8ebb..727e746 100644
+#endif
+
/*
- * These globals govern the timeout behavior when attempting a connection to a
- * TFTP server. TftpRRQTimeoutMSecs specifies the number of milliseconds to
-@@ -155,12 +165,96 @@ mcast_cleanup(void)
+ * TFTP operations.
+ */
+@@ -156,12 +166,96 @@ mcast_cleanup(void)
#endif /* CONFIG_MCAST_TFTP */
@@ -197,7 +197,7 @@ index 59a8ebb..727e746 100644
int i, rc = 0;
for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
-@@ -181,6 +275,13 @@ store_block(int block, uchar *src, unsigned len)
+@@ -182,6 +276,13 @@ store_block(int block, uchar *src, unsigned len)
return;
}
} else
@@ -211,7 +211,7 @@ index 59a8ebb..727e746 100644
#endif /* CONFIG_SYS_DIRECT_FLASH_TFTP */
{
(void)memcpy((void *)(load_addr + offset), src, len);
-@@ -203,6 +304,10 @@ static void new_transfer(void)
+@@ -204,6 +305,10 @@ static void new_transfer(void)
#ifdef CONFIG_CMD_TFTPPUT
TftpFinalBlock = 0;
#endif
@@ -222,7 +222,7 @@ index 59a8ebb..727e746 100644
}
#ifdef CONFIG_CMD_TFTPPUT
-@@ -292,6 +397,13 @@ static void update_block_number(void)
+@@ -293,6 +398,13 @@ static void update_block_number(void)
/* The TFTP get or put is complete */
static void tftp_complete(void)
{
diff --git a/patches/u-boot/2013.01.01/360-arm-support-continuous-mmu-mem-mapping.patch b/patches/u-boot/2013.01.01/360-arm-support-continuous-mmu-mem-mapping.patch
new file mode 100644
index 0000000..4286714
--- /dev/null
+++ b/patches/u-boot/2013.01.01/360-arm-support-continuous-mmu-mem-mapping.patch
@@ -0,0 +1,76 @@
+ARM: support continuous MMU memory mapping beside the regular identity mapping.
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+---
+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
+@@ -44,14 +44,14 @@ static void cp_delay (void)
+ asm volatile("" : : : "memory");
+ }
+
+-void set_section_dcache(int section, enum dcache_option option)
++void set_section_dcache(int section, int section_index, enum dcache_option option)
+ {
+ u32 *page_table = (u32 *)gd->tlb_addr;
+ u32 value;
+
+ value = (section << MMU_SECTION_SHIFT) | (3 << 10);
+ value |= option;
+- page_table[section] = value;
++ page_table[section_index] = value;
+ }
+
+ void __mmu_page_table_flush(unsigned long start, unsigned long stop)
+@@ -73,11 +73,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++)
+- set_section_dcache(upto, option);
++ set_section_dcache(upto, upto, option);
+ mmu_page_table_flush((u32)&page_table[start], (u32)&page_table[end]);
+ }
+
+-static inline void dram_bank_mmu_setup(int bank)
++static inline void dram_bank_mmu_setup(int bank, int page_offset)
+ {
+ bd_t *bd = gd->bd;
+ int i;
+@@ -87,9 +87,9 @@ static inline void dram_bank_mmu_setup(i
+ i < (bd->bi_dram[bank].start + bd->bi_dram[bank].size) >> 20;
+ i++) {
+ #if defined(CONFIG_SYS_ARM_CACHE_WRITETHROUGH)
+- set_section_dcache(i, DCACHE_WRITETHROUGH);
++ set_section_dcache(i, page_offset++, DCACHE_WRITETHROUGH);
+ #else
+- set_section_dcache(i, DCACHE_WRITEBACK);
++ set_section_dcache(i, page_offset++, DCACHE_WRITEBACK);
+ #endif
+ }
+ }
+@@ -99,14 +99,22 @@ static inline void mmu_setup(void)
+ {
+ int i;
+ u32 reg;
++ bd_t *bd = gd->bd;
++ int page_offset, continuity_offset;
+
+ arm_init_before_mmu();
+ /* Set up an identity-mapping for all 4GB, rw for everyone */
+ for (i = 0; i < 4096; i++)
+- set_section_dcache(i, DCACHE_OFF);
++ set_section_dcache(i, i, DCACHE_OFF);
+
++ continuity_offset = bd->bi_dram[0].start >> 20;
+ for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+- dram_bank_mmu_setup(i);
++ page_offset = (bd->bi_dram[i].start) >> 20;
++ /* direct identity mapping */
++ dram_bank_mmu_setup(i, page_offset);
++ /* secondary mapping to build a continous memory space */
++ dram_bank_mmu_setup(i, continuity_offset);
++ continuity_offset = (bd->bi_dram[i].start + bd->bi_dram[i].size) >> 20;
+ }
+
+ /* Copy the page table address to cp15 */
diff --git a/patches/u-boot/2012.10/370-imx27-add-i2c-driver.patch b/patches/u-boot/2013.01.01/370-imx27-add-i2c-driver.patch
similarity index 95%
copy from patches/u-boot/2012.10/370-imx27-add-i2c-driver.patch
copy to patches/u-boot/2013.01.01/370-imx27-add-i2c-driver.patch
index 913d98e..6149983 100644
--- a/patches/u-boot/2012.10/370-imx27-add-i2c-driver.patch
+++ b/patches/u-boot/2013.01.01/370-imx27-add-i2c-driver.patch
@@ -7,7 +7,7 @@ diff -purN uboot/arch/arm/cpu/arm926ejs/mx27/generic.c uboot/arch/arm/cpu/arm926
switch (clk) {
case MXC_ARM_CLK:
return imx_get_armclk();
-+ case MXC_IPG_PERCLK:
++ case MXC_I2C_CLK:
+ return imx_get_ahbclk()/2;
case MXC_UART_CLK:
return imx_get_perclk1();
@@ -19,7 +19,7 @@ diff -purN uboot/arch/arm/include/asm/arch-mx27/clock.h uboot/arch/arm/include/a
enum mxc_clock {
MXC_ARM_CLK,
-+ MXC_IPG_PERCLK,
++ MXC_I2C_CLK,
MXC_UART_CLK,
MXC_ESDHC_CLK,
MXC_FEC_CLK,
diff --git a/patches/u-boot/2012.10/400-imx51.patch b/patches/u-boot/2013.01.01/400-imx51.patch
similarity index 95%
copy from patches/u-boot/2012.10/400-imx51.patch
copy to patches/u-boot/2013.01.01/400-imx51.patch
index 5038033..fde3599 100644
--- a/patches/u-boot/2012.10/400-imx51.patch
+++ b/patches/u-boot/2013.01.01/400-imx51.patch
@@ -224,19 +224,19 @@ index a40b84f..1ca9b22 100644
+#define CONFIG_SYS_CLKTL_CBCMR1 0xA5A2A020
+#endif
+
- /*
- * L2CC Cache setup/invalidation/disable
- */
-@@ -98,7 +126,7 @@
+ .section ".text.init", "x"
- .macro setup_pll pll, freq
- ldr r0, =\pll
+ .macro init_arm_erratum
+@@ -114,7 +142,7 @@
+ #define W_DP_MFN 8
+
+ setup_pll_func:
- ldr r1, =0x00001232
+ ldr r1, =CONFIG_SYS_PLL_DP_CTL
str r1, [r0, #PLL_DP_CTL] /* Set DPLL ON (set UPEN bit): BRMO=1 */
mov r1, #0x2
str r1, [r0, #PLL_DP_CONFIG] /* Enable auto-restart AREN bit */
-@@ -115,7 +143,7 @@
+@@ -131,7 +159,7 @@
str r1, [r0, #PLL_DP_MFN]
str r1, [r0, #PLL_DP_HFS_MFN]
@@ -245,19 +245,19 @@ index a40b84f..1ca9b22 100644
str r1, [r0, #PLL_DP_CTL]
1: ldr r1, [r0, #PLL_DP_CTL]
ands r1, r1, #0x1
-@@ -126,7 +154,7 @@
+@@ -143,7 +171,7 @@
+ .macro setup_pll_errata pll, freq
ldr r2, =\pll
- mov r1, #0x0
- str r1, [r2, #PLL_DP_CONFIG] /* Disable auto-restart AREN bit */
+ str r4, [r2, #PLL_DP_CONFIG] /* Disable auto-restart AREN bit */
- ldr r1, =0x00001236
+ ldr r1, =CONFIG_SYS_PLL_DP_CTL | 0x04
str r1, [r2, #PLL_DP_CTL] /* Restart PLL with PLM=1 */
1: ldr r1, [r2, #PLL_DP_CTL] /* Wait for lock */
ands r1, r1, #0x1
-@@ -155,6 +183,16 @@
+@@ -172,6 +200,16 @@
+ #if defined (CONFIG_MX51)
ldr r0, =CCM_BASE_ADDR
- #if defined(CONFIG_MX51)
+#ifdef CONFIG_SYS_CLKCTL_CCMR
+ ldr r1, =CONFIG_SYS_CLKCTL_CCMR
+ str r1, [r0, #CLKCTL_CCMR]
@@ -272,7 +272,7 @@ index a40b84f..1ca9b22 100644
ldr r1, =0x3FFFFFFF
str r1, [r0, #CLKCTL_CCGR0]
@@ -199,7 +237,7 @@
- #endif
+ bne 1b
/* Switch ARM to step clock */
- mov r1, #0x4
@@ -280,30 +280,28 @@ index a40b84f..1ca9b22 100644
str r1, [r0, #CLKCTL_CCSR]
#if defined(CONFIG_MX51_PLL_ERRATA)
-@@ -251,16 +289,16 @@
+@@ -244,13 +282,14 @@
str r1, [r0, #CLKCTL_CACRR]
/* Switch ARM back to PLL 1 */
-- mov r1, #0
+ mov r1, #CONFIG_SYS_CLKCTL_CCSR
- str r1, [r0, #CLKCTL_CCSR]
+- str r4, [r0, #CLKCTL_CCSR]
++ str r1, [r0, #CLKCTL_CCSR]
- #if defined(CONFIG_MX51)
/* setup the rest */
- /* Use lp_apm (24MHz) source for perclk */
-- ldr r1, =0x000020C2
+- ldr r1, =0x000020C2 | CONFIG_SYS_DDR_CLKSEL
+ /* select source for perclk */
-+ ldr r1, =CONFIG_SYS_CLKTL_CBCMR
- orr r1,r1,#CONFIG_SYS_DDR_CLKSEL
++ ldr r1, =CONFIG_SYS_CLKTL_CBCMR | CONFIG_SYS_DDR_CLKSEL
str r1, [r0, #CLKCTL_CBCMR]
- /* ddr clock from PLL 1, all perclk dividers are 1 since using 24MHz */
+ /* ddr clock from PLL 1 */
ldr r1, =CONFIG_SYS_CLKTL_CBCDR
str r1, [r0, #CLKCTL_CBCDR]
- #endif
-@@ -280,9 +318,9 @@
- #if defined(CONFIG_MX51)
+@@ -265,9 +304,9 @@
+ str r1, [r0, #CLKCTL_CCGR6]
+
/* Use PLL 2 for UART's, get 66.5MHz from it */
- ldr r1, =0xA5A2A020
+ ldr r1, =CONFIG_SYS_CLKTL_CBCMR1
@@ -311,13 +309,12 @@ index a40b84f..1ca9b22 100644
- ldr r1, =0x00C30321
+ ldr r1, =CONFIG_SYS_CLKTL_CSCDR1
str r1, [r0, #CLKCTL_CSCDR1]
- #elif defined(CONFIG_MX53)
- /* Switch peripheral to PLL2 */
-@@ -346,9 +384,34 @@ ENTRY(lowlevel_init)
+ /* make sure divider effective */
+ 1: ldr r1, [r0, #CLKCTL_CDHIPR]
+@@ -416,8 +455,34 @@ ENTRY(lowlevel_init)
init_clock
-- /* r12 saved upper lr*/
+/* make U-Boot runnable form "almost" anywhere */
+/* but SYS_TEXT_BASE should be in RAM */
+copy2ram: /* populate _TEXT_BASE with U-Boot from load addr */
@@ -339,7 +336,7 @@ index a40b84f..1ca9b22 100644
+ blo copy_loop
+
+end_of_copy2ram:
- mov pc,lr
+ mov pc, r10
ENDPROC(lowlevel_init)
+_copy2ram:
+ .word copy2ram
@@ -348,12 +345,12 @@ index a40b84f..1ca9b22 100644
+
/* Board level setting value */
- W_DP_OP_864: .word DP_OP_864
+ #if defined(CONFIG_MX51_PLL_ERRATA)
diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h
index 46017f4..520bf98 100644
--- a/arch/arm/include/asm/arch-mx5/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx5/imx-regs.h
-@@ -277,6 +277,7 @@
+@@ -267,6 +267,7 @@
#define M4IF_FBPM0 0x40
#define M4IF_FIDBP 0x48
@@ -361,7 +358,7 @@ index 46017f4..520bf98 100644
/* Assuming 24MHz input clock with doubler ON */
/* MFI PDF */
#define DP_OP_864 ((8 << 4) + ((1 - 1) << 0))
-@@ -311,6 +312,7 @@
+@@ -305,6 +306,7 @@
#define DP_OP_216 ((6 << 4) + ((3 - 1) << 0))
#define DP_MFD_216 (4 - 1)
#define DP_MFN_216 3
diff --git a/patches/u-boot/2012.10/401-apf51.patch b/patches/u-boot/2013.01.01/401-apf51.patch
similarity index 99%
copy from patches/u-boot/2012.10/401-apf51.patch
copy to patches/u-boot/2013.01.01/401-apf51.patch
index 290fc6a..373e009 100644
--- a/patches/u-boot/2012.10/401-apf51.patch
+++ b/patches/u-boot/2013.01.01/401-apf51.patch
@@ -1588,7 +1588,7 @@ diff --git a/boards.cfg b/boards.cfg
index 9df6212..1aa7e95 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -231,6 +231,7 @@ am335x_evm arm armv7 am335x ti
+@@ -241,6 +241,7 @@ am335x_evm arm armv7 am335x ti
highbank arm armv7 highbank - highbank
mx51_efikamx arm armv7 mx51_efikamx genesi mx5 mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg
mx51_efikasb arm armv7 mx51_efikamx genesi mx5 mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_sb.cfg
diff --git a/patches/u-boot/2012.10/403-apf51-wdog.patch b/patches/u-boot/2013.01.01/403-apf51-wdog.patch
similarity index 93%
copy from patches/u-boot/2012.10/403-apf51-wdog.patch
copy to patches/u-boot/2013.01.01/403-apf51-wdog.patch
index b47edc1..6c33620 100644
--- a/patches/u-boot/2012.10/403-apf51-wdog.patch
+++ b/patches/u-boot/2013.01.01/403-apf51-wdog.patch
@@ -8,7 +8,7 @@ diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arc
index 520bf98..063979e 100644
--- a/arch/arm/include/asm/arch-mx5/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx5/imx-regs.h
-@@ -529,6 +529,15 @@ struct fuse_bank1_regs {
+@@ -523,6 +523,15 @@ struct fuse_bank1_regs {
u32 fuse15_31[0x11];
};
diff --git a/patches/u-boot/2012.10/407-imx51-nand.patch b/patches/u-boot/2013.01.01/407-imx51-nand.patch
similarity index 99%
copy from patches/u-boot/2012.10/407-imx51-nand.patch
copy to patches/u-boot/2013.01.01/407-imx51-nand.patch
index 00d30f3..4bc9f86 100644
--- a/patches/u-boot/2012.10/407-imx51-nand.patch
+++ b/patches/u-boot/2013.01.01/407-imx51-nand.patch
@@ -387,7 +387,7 @@ diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index beb99ca..3af02c6 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
-@@ -56,6 +56,7 @@ COBJS-$(CONFIG_NAND_KIRKWOOD) += kirkwood_nand.o
+@@ -69,6 +69,7 @@ COBJS-$(CONFIG_NAND_KIRKWOOD) += kirkwood_nand.o
COBJS-$(CONFIG_NAND_KMETER1) += kmeter1_nand.o
COBJS-$(CONFIG_NAND_MPC5121_NFC) += mpc5121_nfc.o
COBJS-$(CONFIG_NAND_MXC) += mxc_nand.o
diff --git a/patches/u-boot/2012.10/409-apf51-nand-spl.patch b/patches/u-boot/2013.01.01/409-apf51-nand-spl.patch
similarity index 100%
copy from patches/u-boot/2012.10/409-apf51-nand-spl.patch
copy to patches/u-boot/2013.01.01/409-apf51-nand-spl.patch
diff --git a/patches/u-boot/2012.10/410-imx-iim.patch b/patches/u-boot/2013.01.01/410-imx-iim.patch
similarity index 98%
copy from patches/u-boot/2012.10/410-imx-iim.patch
copy to patches/u-boot/2013.01.01/410-imx-iim.patch
index 16c5f30..65cb4b6 100644
--- a/patches/u-boot/2012.10/410-imx-iim.patch
+++ b/patches/u-boot/2013.01.01/410-imx-iim.patch
@@ -82,14 +82,14 @@ diff --git a/common/Makefile b/common/Makefile
index 973f05a..f368b24 100644
--- a/common/Makefile
+++ b/common/Makefile
-@@ -104,6 +104,7 @@ ifdef CONFIG_FPGA
- COBJS-$(CONFIG_CMD_FPGA) += cmd_fpga.o
- endif
+@@ -107,6 +107,7 @@ ifdef CONFIG_FPGA
+ COBJS-$(CONFIG_CMD_FS_GENERIC) += cmd_fs.o
+ COBJS-$(CONFIG_CMD_GETTIME) += cmd_gettime.o
COBJS-$(CONFIG_CMD_GPIO) += cmd_gpio.o
+COBJS-$(CONFIG_CMD_IIM) += cmd_iim.o
COBJS-$(CONFIG_CMD_I2C) += cmd_i2c.o
+ COBJS-$(CONFIG_CMD_HASH) += cmd_hash.o
COBJS-$(CONFIG_CMD_IDE) += cmd_ide.o
- COBJS-$(CONFIG_CMD_IMMAP) += cmd_immap.o
diff --git a/common/cmd_iim.c b/common/cmd_iim.c
new file mode 100644
index 0000000..d47ccf5
@@ -197,7 +197,7 @@ index 271463c..9a444bc 100644
+++ b/drivers/misc/Makefile
@@ -29,6 +29,7 @@ COBJS-$(CONFIG_ALI152X) += ali512x.o
COBJS-$(CONFIG_DS4510) += ds4510.o
- COBJS-$(CONFIG_FSL_LAW) += fsl_law.o
+ COBJS-$(CONFIG_CBMEM_CONSOLE) += cbmem_console.o
COBJS-$(CONFIG_GPIO_LED) += gpio_led.o
+COBJS-$(CONFIG_IMX_IIM) += imx_iim.o
COBJS-$(CONFIG_FSL_MC9SDZ60) += mc9sdz60.o
diff --git a/patches/u-boot/2013.01.01/501-imx28-update-and-fix.patch b/patches/u-boot/2013.01.01/501-imx28-update-and-fix.patch
new file mode 100644
index 0000000..20cc144
--- /dev/null
+++ b/patches/u-boot/2013.01.01/501-imx28-update-and-fix.patch
@@ -0,0 +1,37 @@
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Philippe Reynes <tr...@ya...>
+---
+ arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd | 4 ++--
+ common/memsize.c | 2 ++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd b/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
+index c60615a..f533ad0 100644
+--- a/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
++++ b/arch/arm/cpu/arm926ejs/mxs/u-boot-imx28.bd
+@@ -8,7 +8,7 @@ section (0) {
+ load ivt (entry = 0x0014) > 0x8000;
+ hab call 0x8000;
+
+- load u_boot > 0x40000100;
+- load ivt (entry = 0x40000100) > 0x8000;
++ load u_boot > 0x40000000;
++ load ivt (entry = 0x40000000) > 0x8000;
+ hab call 0x8000;
+ }
+diff --git a/common/memsize.c b/common/memsize.c
+index 963e4f3..a9f76bc 100644
+--- a/common/memsize.c
++++ b/common/memsize.c
+@@ -74,6 +74,8 @@ long get_ram_size(long *base, long maxsize)
+ return (0);
+ }
+
++ sync();
++ *addr = save[i];
+ for (cnt = 1; cnt < maxsize / sizeof (long); cnt <<= 1) {
+ addr = base + cnt; /* pointer arith! */
+ val = *addr;
+--
+1.7.2.5
+
diff --git a/patches/u-boot/2012.10/502-add-apf28.patch b/patches/u-boot/2013.01.01/502-add-apf28.patch
similarity index 99%
copy from patches/u-boot/2012.10/502-add-apf28.patch
copy to patches/u-boot/2013.01.01/502-add-apf28.patch
index ca83365..7e63b70 100644
--- a/patches/u-boot/2012.10/502-add-apf28.patch
+++ b/patches/u-boot/2013.01.01/502-add-apf28.patch
@@ -1300,12 +1300,12 @@ index 0000000..9854cda
+ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff
+};
+
-+void init_mx28_200mhz_ddr2(void)
++void mxs_adjust_memory_params(uint32_t *dram_vals)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(apf28_dram_vals); i++)
-+ writel(apf28_dram_vals[i], MXS_DRAM_BASE + (4 * i));
++ *dram_vals++ = apf28_dram_vals[i];
+}
+
+void board_init_ll(void)
@@ -1325,7 +1325,7 @@ diff --git a/boards.cfg b/boards.cfg
index 1aa7e95..f3c8b40 100644
--- a/boards.cfg
+++ b/boards.cfg
-@@ -189,6 +189,7 @@ zmx25 arm arm926ejs zmx25 syteco
+@@ -194,6 +194,7 @@ zmx25 arm arm926ejs zmx25 syteco
imx27lite arm arm926ejs imx27lite logicpd mx27
magnesium arm arm926ejs imx27lite logicpd mx27
apx4devkit arm arm926ejs apx4devkit bluegiga mxs apx4devkit
hooks/post-receive
--
armadeus
|
