[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-200-gec29327
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-200-gec29327
|
From: jorasse <jo...@us...> - 2014-03-27 23:53:29
|
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 ec293273e1f3be6a16c1111b119a748340346cf8 (commit)
from 672a28ca12ce698a36cd0e2b0ed7ffa48baabd48 (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 ec293273e1f3be6a16c1111b119a748340346cf8
Author: Eric Jarrige <eri...@ar...>
Date: Fri Mar 28 00:53:04 2014 +0100
[UBOOT] 2014.04: add apf27 patchwork
-----------------------------------------------------------------------
Summary of changes:
.../300-imx27-fix_dcache_boot_issue.patch | 2 +-
.../311-imx-nand-lock-unlock.patch | 13 +++++---
.../u-boot/{2013.04 => 2014.04}/320-spartan.patch | 8 ++--
.../340-apf27-misc-commands.patch | 31 +++++++++-----------
.../350-nand_large_file_download.patch | 12 ++++----
...60-arm-support-continuous-mmu-mem-mapping.patch | 16 +++++-----
6 files changed, 41 insertions(+), 41 deletions(-)
copy patches/u-boot/{2013.04 => 2014.04}/300-imx27-fix_dcache_boot_issue.patch (94%)
copy patches/u-boot/{2013.04 => 2014.04}/311-imx-nand-lock-unlock.patch (87%)
copy patches/u-boot/{2013.04 => 2014.04}/320-spartan.patch (90%)
copy patches/u-boot/{2013.04 => 2014.04}/340-apf27-misc-commands.patch (95%)
copy patches/u-boot/{2013.04 => 2014.04}/350-nand_large_file_download.patch (95%)
copy patches/u-boot/{2013.04 => 2014.04}/360-arm-support-continuous-mmu-mem-mapping.patch (86%)
diff --git a/patches/u-boot/2013.04/300-imx27-fix_dcache_boot_issue.patch b/patches/u-boot/2014.04/300-imx27-fix_dcache_boot_issue.patch
similarity index 94%
copy from patches/u-boot/2013.04/300-imx27-fix_dcache_boot_issue.patch
copy to patches/u-boot/2014.04/300-imx27-fix_dcache_boot_issue.patch
index 32f2db4..4556f6f 100644
--- a/patches/u-boot/2013.04/300-imx27-fix_dcache_boot_issue.patch
+++ b/patches/u-boot/2014.04/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
-@@ -289,11 +289,12 @@ cpu_init_crit:
+@@ -166,11 +166,12 @@ cpu_init_crit:
*/
mov r0, #0
flush_dcache:
diff --git a/patches/u-boot/2013.04/311-imx-nand-lock-unlock.patch b/patches/u-boot/2014.04/311-imx-nand-lock-unlock.patch
similarity index 87%
copy from patches/u-boot/2013.04/311-imx-nand-lock-unlock.patch
copy to patches/u-boot/2014.04/311-imx-nand-lock-unlock.patch
index 4457d68..ef92d80 100644
--- a/patches/u-boot/2013.04/311-imx-nand-lock-unlock.patch
+++ b/patches/u-boot/2014.04/311-imx-nand-lock-unlock.patch
@@ -10,7 +10,7 @@ diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index d0ded48..2bbc1fd 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
-@@ -57,6 +57,28 @@ static struct mxc_nand_host *host = &mxc_host;
+@@ -47,6 +47,28 @@ static struct mxc_nand_host *host = &mxc_host;
#define MAIN_SINGLEBIT_ERROR 0x4
#define SPARE_SINGLEBIT_ERROR 0x1
@@ -39,7 +39,7 @@ index d0ded48..2bbc1fd 100644
/* OOB placement block for use with hardware ecc generation */
#if defined(MXC_NFC_V1)
#ifndef CONFIG_SYS_NAND_LARGEPAGE
-@@ -1069,6 +1091,50 @@ void mxc_nand_command(struct mtd_info *mtd, unsigned command,
+@@ -1079,6 +1091,53 @@ void mxc_nand_command(struct mtd_info *mtd, unsigned command,
}
break;
@@ -79,11 +79,14 @@ index d0ded48..2bbc1fd 100644
+ && !(readw(&host->regs->nf_wrprst) & NFC_WRPR_LTS)
+ && ((readw(&host->regs->unlockend_blkaddr) >= page_addr>>6)
+ && (readw(&host->regs->unlockstart_blkaddr) <= page_addr>>6))) {
-+ writew(NFC_WRPR_US, &host->regs->main_area[0][0]);
++ void __iomem *main_buf = host->regs->main_area[0];
++ writew(NFC_WRPR_US, main_buf);
+ } else if (readw(&host->regs->nf_wrprst) & NFC_WRPR_LTS) {
-+ writew(readw(&host->regs->nf_wrprst), &host->regs->main_area[0][0]);
++ void __iomem *main_buf = host->regs->main_area[0];
++ writew(readw(&host->regs->nf_wrprst), main_buf);
+ } else {
-+ writew(readw(&host->regs->nf_wrprst) & ~NFC_WRPR_US, &host->regs->main_area[0][0]);
++ void __iomem *main_buf = host->regs->main_area[0];
++ writew(readw(&host->regs->nf_wrprst) & ~NFC_WRPR_US, main_buf);
+ }
+ return;
+#endif
diff --git a/patches/u-boot/2013.04/320-spartan.patch b/patches/u-boot/2014.04/320-spartan.patch
similarity index 90%
copy from patches/u-boot/2013.04/320-spartan.patch
copy to patches/u-boot/2014.04/320-spartan.patch
index 5a58b73..f8cc590 100644
--- a/patches/u-boot/2013.04/320-spartan.patch
+++ b/patches/u-boot/2014.04/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
-@@ -188,8 +188,14 @@ static int Spartan3_sp_load(Xilinx_desc
+@@ -171,8 +171,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 */
-@@ -288,7 +294,12 @@ static int Spartan3_sp_dump(Xilinx_desc
+@@ -271,7 +277,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 */
-@@ -392,6 +403,12 @@ static int Spartan3_ss_load(Xilinx_desc
+@@ -375,6 +386,12 @@ static int Spartan3_ss_load(Xilinx_desc
(*fn->bwr) (data, bsize, true, cookie);
else {
while (bytecount < bsize) {
@@ -57,7 +57,7 @@ index 1633a70..9ca0522 100644
while DONE is low (inactive) */
--- uboot-custom/include/fpga.h
+++ uboot-custom/include/fpga.h
-@@ -43,7 +43,7 @@
+@@ -16,7 +16,7 @@
/* fpga_xxxx function return value definitions */
#define FPGA_SUCCESS 0
diff --git a/patches/u-boot/2013.04/340-apf27-misc-commands.patch b/patches/u-boot/2014.04/340-apf27-misc-commands.patch
similarity index 95%
copy from patches/u-boot/2013.04/340-apf27-misc-commands.patch
copy to patches/u-boot/2014.04/340-apf27-misc-commands.patch
index addecd5..7af55df 100644
--- a/patches/u-boot/2013.04/340-apf27-misc-commands.patch
+++ b/patches/u-boot/2014.04/340-apf27-misc-commands.patch
@@ -4,39 +4,36 @@ Signed-off-by: Philippe Reynes <tr...@ya...>
Signed-off-by: Eric Jarrige <eri...@ar...>
---
arch/arm/include/asm/arch-mx27/imx-regs.h | 4 +
- board/armadeus/apf27/Makefile | 2 +-
+ board/armadeus/apf27/Makefile | 1 +-
board/armadeus/apf27/cmd_imxfuse.c | 331 +++++++++++++++++++++++++++++
- 3 files changed, 336 insertions(+), 1 deletions(-)
+ 3 files changed, 335 insertions(+), 1 deletions(-)
create mode 100644 board/armadeus/apf27/cmd_imxfuse.c
diff --git a/arch/arm/include/asm/arch-mx27/imx-regs.h b/arch/arm/include/asm/arch-mx27/imx-regs.h
index d3a14e1..c100b72 100644
--- a/arch/arm/include/asm/arch-mx27/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx27/imx-regs.h
-@@ -511,6 +511,10 @@ struct fuse_bank0_regs {
- #define IIM_ERR_SNSE (1 << 2)
- #define IIM_ERR_PARITYE (1 << 1)
+@@ -138,6 +138,10 @@ struct fuse_bank0_regs {
+ u32 gpt_tstat;
+ };
+/* IIM Control Registers */
+#define IIM_BANK_AREA IMX_IIM_BASE + 0x800
+#define IIM_BANK_REG(x,y) (IIM_BANK_AREA + 0x400 * x + (y<<2))
+
/*
- * Memory areas of the NFC
+ * GPIO Module and I/O Multiplexer
*/
diff --git a/board/armadeus/apf27/Makefile b/board/armadeus/apf27/Makefile
index 7a39426..484268e 100644
--- a/board/armadeus/apf27/Makefile
+++ b/board/armadeus/apf27/Makefile
-@@ -28,7 +28,7 @@ include $(TOPDIR)/config.mk
- LIB = $(obj)lib$(BOARD).o
+@@ -9,4 +9,5 @@
- ifndef CONFIG_SPL_BUILD
--COBJS := apf27.o
-+COBJS := apf27.o cmd_imxfuse.o
- ifdef CONFIG_FPGA
- COBJS += fpga.o
- endif
+ obj-y := apf27.o
+ obj-y += lowlevel_init.o
++obj-y += cmd_imxfuse.o
+ obj-$(CONFIG_FPGA) += fpga.o
diff --git a/board/armadeus/apf27/cmd_imxfuse.c b/board/armadeus/apf27/cmd_imxfuse.c
new file mode 100644
index 0000000..cd2078a
@@ -143,7 +140,7 @@ index 0000000..cd2078a
+ imx_fuse_op_start();
+
+ /* Enable IIM Program Protect */
-+ writel(0x0,&iim->iim_prog_p);
++ writel(0x0,&iim->iim_prg_p);
+
+ addr = ((bank << 11) | (row << 3) | (bit & 0x7));
+ /* Set IIM Program Upper Address */
@@ -180,7 +177,7 @@ index 0000000..cd2078a
+ imx_fuse_op_start();
+
+ /* Disable IIM Program Protect */
-+ writel(0xAA, &iim->iim_prog_p);
++ writel(0xAA, &iim->iim_prg_p);
+
+ addr = ((bank << 11) | (row << 3) | (bit & 0x7));
+ /* Set IIM Program Upper Address */
@@ -201,7 +198,7 @@ index 0000000..cd2078a
+ }
+
+ /* Enable IIM Program Protect */
-+ writel(0x0, &iim->iim_prog_p);
++ writel(0x0, &iim->iim_prg_p);
+ return ret;
+}
+
diff --git a/patches/u-boot/2013.04/350-nand_large_file_download.patch b/patches/u-boot/2014.04/350-nand_large_file_download.patch
similarity index 95%
copy from patches/u-boot/2013.04/350-nand_large_file_download.patch
copy to patches/u-boot/2014.04/350-nand_large_file_download.patch
index 439da74..c6ed8e2 100644
--- a/patches/u-boot/2013.04/350-nand_large_file_download.patch
+++ b/patches/u-boot/2014.04/350-nand_large_file_download.patch
@@ -12,7 +12,7 @@ diff --git a/common/cmd_net.c b/common/cmd_net.c
index a9ade8b..fc1ce05 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
-@@ -28,6 +28,10 @@
+@@ -12,6 +12,10 @@
#include <command.h>
#include <net.h>
@@ -23,7 +23,7 @@ index a9ade8b..fc1ce05 100644
static int netboot_common(enum proto_t, cmd_tbl_t *, int, char * const []);
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[])
+@@ -35,11 +39,19 @@ int do_tftpb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return ret;
}
@@ -43,7 +43,7 @@ index a9ade8b..fc1ce05 100644
#ifdef CONFIG_CMD_TFTPPUT
int do_tftpput(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-@@ -201,6 +213,10 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
+@@ -185,6 +197,10 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
int size;
ulong addr;
@@ -54,7 +54,7 @@ index a9ade8b..fc1ce05 100644
/* pre-set load_addr */
if ((s = getenv("loadaddr")) != NULL) {
load_addr = simple_strtoul(s, NULL, 16);
-@@ -228,8 +244,16 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
+@@ -212,8 +228,16 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
break;
@@ -107,7 +107,7 @@ index 59a8ebb..727e746 100644
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_SYS_DIRECT_FLASH_TFTP)
+static int tftp_nand_write(nand_info_t *meminfo, uchar *src, unsigned long *offset, size_t *length )
+{
-+ size_t written ;
++/* size_t written ;*/
+ int ret = 0;
+ loff_t offs;
+ int blockstart = -1;
@@ -116,7 +116,7 @@ index 59a8ebb..727e746 100644
+ do {
+ blockstart = (*offset) & (~meminfo->erasesize+1);
+ offs = blockstart;
-+ ret = meminfo->block_isbad(meminfo, offs);
++ ret = meminfo->_block_isbad(meminfo, offs);
+
+ if (ret < 0) {
+ printf("Bad block check failed\n");
diff --git a/patches/u-boot/2013.04/360-arm-support-continuous-mmu-mem-mapping.patch b/patches/u-boot/2014.04/360-arm-support-continuous-mmu-mem-mapping.patch
similarity index 86%
copy from patches/u-boot/2013.04/360-arm-support-continuous-mmu-mem-mapping.patch
copy to patches/u-boot/2014.04/360-arm-support-continuous-mmu-mem-mapping.patch
index 736e7a8..aa6389b 100644
--- a/patches/u-boot/2013.04/360-arm-support-continuous-mmu-mem-mapping.patch
+++ b/patches/u-boot/2014.04/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
-@@ -50,14 +50,14 @@ static void cp_delay (void)
+@@ -34,14 +34,14 @@ static void cp_delay (void)
asm volatile("" : : : "memory");
}
@@ -23,7 +23,7 @@ index 939de10..25f0ff1 100644
}
void __mmu_page_table_flush(unsigned long start, unsigned long stop)
-@@ -79,11 +79,11 @@ void mmu_set_region_dcache_behaviour(u32
+@@ -63,11 +63,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;
-@@ -93,9 +93,9 @@ __weak void dram_bank_mmu_setup(int bank
+@@ -77,9 +77,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
}
}
-@@ -105,14 +105,22 @@ static inline void mmu_setup(void)
+@@ -89,14 +89,22 @@ static inline void mmu_setup(void)
{
int i;
u32 reg;
@@ -77,7 +77,7 @@ 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
-@@ -41,9 +41,9 @@ static inline void invalidate_l2_cache(v
+@@ -27,9 +27,9 @@ static inline void invalidate_l2_cache(v
void l2_cache_enable(void);
void l2_cache_disable(void);
@@ -86,6 +86,6 @@ diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
-void dram_bank_mmu_setup(int bank);
+void dram_bank_mmu_setup(int bank, int page_offset);
- /*
- * The current upper bound for ARM L1 data cache line sizes is 64 bytes. We
- * use that value for aligning DMA buffers unless the board config has specified
+
+ #endif
+
hooks/post-receive
--
armadeus
|
