Changeset 4035

Timestamp:

02/10/08 08:57:55 (5 years ago)

Author:

werner

Message:

This patch introduces a new variable at a well-known address that can be
overwritten from the outsite to change the startup behaviour of u-boot. This
variable is at offset 0x40 (if preboot-override is not enabled) or 0x44 (if
it is), and it points to an alternate data block to be used as the default
environment.

This makes not-default-env.patch obsolete, because we just use this override
when booting from NOR.

env-override.patch:

• cpu/arm920t/start.S: new configuration variable CFG_ENV_OVERRIDE to enable environment overriding
• cpu/arm920t/start.S: added global variable "env_override" to specifiy an alternate initial environment
• common/env_common.c (default_env): if env_override is set, use that environment as the default

uboot-gta02.patch:

• include/configs/neo1973_gta02.h: set CFG_ENV_OVERRIDE

series:

• added env-override.patch
• backed out nor-default-env.patch, since env-override.patch provides the same functionality (in our context)

Location:

trunk/src/target/u-boot/patches

Files:

• env-override.patch (added)
• series (modified) (2 diffs)
• uboot-gta02.patch (modified) (2 diffs)

trunk/src/target/u-boot/patches/series

@@ -48 +48 @@
 # move these later, once the dust has settled
 default-env.patch
+env-override.patch
 console-ansi.patch
 boot-menu.patch
@@ -85 +86 @@
 
 # keep this here until we have time to bubble it into the stack
-nor-default-env.patch
+##nor-default-env.patch
 
 # let's see what upstream thinks about this

trunk/src/target/u-boot/patches/uboot-gta02.patch

@@ -610 +610 @@
 --- /dev/null
 +++ u-boot/include/configs/neo1973_gta02.h
-@@ -0,0 +1,286 @@
+@@ -0,0 +1,287 @@
 +/*
 + * (C) Copyright 2007 OpenMoko, Inc.
@@ -823 +823 @@
 +#define CFG_ENV_OFFSET_OOB     1       /* Location of ENV stored in block 0 OOB */
 +#define        CFG_PREBOOT_OVERRIDE    1       /* allow preboot from memory */
++#define CFG_ENV_OVERRIDE               /* allow pre-loading the environment */
 +
 +#define NAND_MAX_CHIPS         1