summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Ungar <david.ungar@timesys.com>2010-10-11 14:35:01 -0400
committerDavid Ungar <david.ungar@timesys.com>2010-10-11 14:39:35 -0400
commitb403aefbce61b316535ab772b9eea613fea10c8f (patch)
tree1978b9669064f0f2e322f2f6a1295aacd266cf63
parentaa88bb00f7ebe0fe355276ffc1df08687c664057 (diff)
Adjust environment location in flash
-rw-r--r--common/cmd_bdinfo.c3
-rw-r--r--lib_arm/board.c7
2 files changed, 10 insertions, 0 deletions
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index 11c154731e3..0ba3a30c187 100644
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -324,6 +324,9 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
bd_t *bd = gd->bd;
print_num ("arch_number", bd->bi_arch_number);
+#ifdef CONFIG_OMAP3_LOGIC
+ print_num ("env offset", CONFIG_ENV_OFFSET);
+#endif
print_num ("env_t", (ulong)bd->bi_env);
print_num ("boot_params", (ulong)bd->bi_boot_params);
diff --git a/lib_arm/board.c b/lib_arm/board.c
index e9ccb9bec2e..433ac040994 100644
--- a/lib_arm/board.c
+++ b/lib_arm/board.c
@@ -370,6 +370,13 @@ void start_armboot (void)
} else {
omap_nand_switch_ecc(OMAP_ECC_HW); /* switch to HW ECC mode */
}
+ {
+ int size;
+ size = nand_info[0].size;
+
+ /* Set the u-boot environment offset to be at the end of NAND */
+ boot_flash_off = size - CONFIG_ENV_RANGE;
+ }
#endif
#endif