diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:14:28 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:14:28 +0200 |
| commit | 225f0eaa745adfae05931848543d99942798756a (patch) | |
| tree | f5c2b1a7ddb5f2c64063b5ef3ccae0f5ded41fb8 /cpu | |
| parent | 6b8be3e58e9cc1badb7a709b0f3568d4d8eca4b7 (diff) | |
| parent | afbc526336447a7357e9c82852df0377d09a8089 (diff) | |
| download | u-boot-imx-225f0eaa745adfae05931848543d99942798756a.zip u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.gz u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc5xx/u-boot.lds | 2 | ||||
| -rw-r--r-- | cpu/mpc5xxx/u-boot-customlayout.lds | 2 | ||||
| -rw-r--r-- | cpu/mpc8xx/cpu_init.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cpu/mpc5xx/u-boot.lds b/cpu/mpc5xx/u-boot.lds index 7434e3f..c83f155 100644 --- a/cpu/mpc5xx/u-boot.lds +++ b/cpu/mpc5xx/u-boot.lds @@ -133,7 +133,7 @@ SECTIONS /* . = env_start; .ppcenv : { - common/environment.o (.ppcenv) + common/env_embedded.o (.ppcenv) } */ } diff --git a/cpu/mpc5xxx/u-boot-customlayout.lds b/cpu/mpc5xxx/u-boot-customlayout.lds index 3847860..df8eb7e 100644 --- a/cpu/mpc5xxx/u-boot-customlayout.lds +++ b/cpu/mpc5xxx/u-boot-customlayout.lds @@ -62,7 +62,7 @@ SECTIONS lib_ppc/time.o (.text) . = DEFINED(env_offset) ? env_offset : .; - common/environment.o (.ppcenv) + common/env_embedded.o (.ppcenv) *(.text) *(.fixup) diff --git a/cpu/mpc8xx/cpu_init.c b/cpu/mpc8xx/cpu_init.c index fb3414a..5c43eca 100644 --- a/cpu/mpc8xx/cpu_init.c +++ b/cpu/mpc8xx/cpu_init.c @@ -245,7 +245,7 @@ void cpu_init_f (volatile immap_t * immr) rpxclassic_init (); #endif -#if defined(CONFIG_RPXLITE) && defined(CFG_ENV_IS_IN_NVRAM) +#if defined(CONFIG_RPXLITE) && defined(CONFIG_ENV_IS_IN_NVRAM) rpxlite_init (); #endif |