summaryrefslogtreecommitdiff
path: root/common/env_onenand.c
diff options
context:
space:
mode:
authordirk.behme@googlemail.com <dirk.behme@googlemail.com>2008-08-10 17:56:36 +0200
committerWolfgang Denk <wd@denx.de>2008-08-10 22:45:04 +0200
commitaa5ffa16d7e4c461b7b77bf8e79d2ef5638cf754 (patch)
tree40f126ae48746bdb6b103b3b05fdece68e204f26 /common/env_onenand.c
parentc11528083ef6e55e76df742228c26e39d151813d (diff)
downloadu-boot-aa5ffa16d7e4c461b7b77bf8e79d2ef5638cf754.tar.gz
OneNAND: Remove base address offset usage
While locally preparing some U-Boot patches for ARM based OMAP3 boards, some using OneNAND and some using NAND, we found some differences in OneNAND and NAND command address handling. As this might confuse users (it already confused us), we like to align OneNAND and NAND address handling. The issue is that cmd_onenand.c subtracts the onenand base address from the addresses you type into the u-boot command line so, unlike nand, you can't use addresses relative to the start of the onenand part e.g. this won't work: onenand read 82000000 280000 400000 you have to use: onenand read 82000000 20280000 400000 Looking at recent git, the only board currently using OneNAND is Apollon, and for this the OneNAND base address is 0 (apollon.h) #define CFG_ONENAND_BASE 0x00000000 so patch below won't break any existing boards and will align OneNAND and NAND handling on boards where OneNAND base address is != 0. Signed-off-by: Steve Sakoman <sakoman@gmail.com> Signed-off-by: Manikandan Pillai <mani.pillai@ti.com> Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Diffstat (limited to 'common/env_onenand.c')
-rw-r--r--common/env_onenand.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/common/env_onenand.c b/common/env_onenand.c
index ad5b1d7aa9..dbd0883fa8 100644
--- a/common/env_onenand.c
+++ b/common/env_onenand.c
@@ -66,7 +66,6 @@ void env_relocate_spec(void)
size_t retlen;
env_addr = CFG_ENV_ADDR;
- env_addr -= (unsigned long) onenand_chip.base;
/* Check OneNAND exist */
if (onenand_mtd.oobblock)
@@ -101,7 +100,6 @@ int saveenv(void)
instr.len = CFG_ENV_SIZE;
instr.addr = env_addr;
- instr.addr -= (unsigned long)onenand_chip.base;
if (onenand_erase(&onenand_mtd, &instr)) {
printf("OneNAND: erase failed at 0x%08lx\n", env_addr);
return 1;
@@ -111,7 +109,6 @@ int saveenv(void)
env_ptr->crc =
crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd));
- env_addr -= (unsigned long)onenand_chip.base;
if (onenand_write(&onenand_mtd, env_addr, onenand_mtd.oobblock, &retlen,
(u_char *) env_ptr)) {
printf("OneNAND: write failed at 0x%08x\n", instr.addr);