diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-09-17 23:28:31 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-09-17 23:28:31 +0200 |
| commit | 3dc5e00454a58499d4f4c790b38036b0e873747e (patch) | |
| tree | 05fc9c05594e299052b09b7e6f391014f26577a5 /include | |
| parent | 0413cfecea350000eab5e591a0965c3e3ee0ff00 (diff) | |
| parent | e67af44d0167d8237dd2c2ddf8e301d19ca12914 (diff) | |
| download | u-boot-imx-3dc5e00454a58499d4f4c790b38036b0e873747e.zip u-boot-imx-3dc5e00454a58499d4f4c790b38036b0e873747e.tar.gz u-boot-imx-3dc5e00454a58499d4f4c790b38036b0e873747e.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/acadia.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/acadia.h b/include/configs/acadia.h index b710107..2fb48b6 100644 --- a/include/configs/acadia.h +++ b/include/configs/acadia.h @@ -225,7 +225,8 @@ */ #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_AMCC_DEF_ENV \ - CONFIG_AMCC_DEF_ENV_PPC \ + CONFIG_AMCC_DEF_ENV_POWERPC \ + CONFIG_AMCC_DEF_ENV_PPC_OLD \ CONFIG_AMCC_DEF_ENV_NOR_UPD \ CONFIG_AMCC_DEF_ENV_NAND_UPD \ "kernel_addr=fff10000\0" \ |