diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-02-01 21:24:38 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-02-01 21:24:38 +0100 |
| commit | f4b6f45dcba989f5a900edc07ececae80c79abdf (patch) | |
| tree | 85e623dc76eba877275c5978a6527f368975abb2 /include/configs/actux3.h | |
| parent | a87fb1b308a2a375cb9ca74ca0dd3e2c5793d3bf (diff) | |
| parent | 930590f3e49c8f32256edf2e5861e1535a329c6c (diff) | |
| download | u-boot-imx-f4b6f45dcba989f5a900edc07ececae80c79abdf.zip u-boot-imx-f4b6f45dcba989f5a900edc07ececae80c79abdf.tar.gz u-boot-imx-f4b6f45dcba989f5a900edc07ececae80c79abdf.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ixp
Diffstat (limited to 'include/configs/actux3.h')
| -rw-r--r-- | include/configs/actux3.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/actux3.h b/include/configs/actux3.h index 3f42ed4..694f522 100644 --- a/include/configs/actux3.h +++ b/include/configs/actux3.h @@ -32,6 +32,7 @@ #define CONFIG_DISPLAY_CPUINFO 1 #define CONFIG_DISPLAY_BOARDINFO 1 +#define CONFIG_IXP_SERIAL #define CONFIG_SYS_IXP425_CONSOLE IXP425_UART2 #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTDELAY 3 @@ -146,8 +147,6 @@ /* include IXP4xx NPE support */ #define CONFIG_IXP4XX_NPE 1 -/* use separate flash sector with ucode images */ -#define CONFIG_IXP4XX_NPE_EXT_UCODE_BASE 0x50040000 #define CONFIG_NET_MULTI 1 /* NPE0 PHY address */ @@ -185,6 +184,7 @@ #define CONFIG_SYS_USE_PPCENV 1 #define CONFIG_EXTRA_ENV_SETTINGS \ + "npe_ucode=50040000\0" \ "mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \ "kerneladdr=50050000\0" \ "rootaddr=50170000\0" \ |