From b4e2f89dfcb206a22d34fa6b34878d85b498b39f Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Sat, 31 Jan 2009 09:53:39 +0100 Subject: ixp: remove the option to include the Microcode instead the board will have to load it from flash or ram which will be specified by npe_ucode env var Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- include/configs/actux3.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/configs/actux3.h') diff --git a/include/configs/actux3.h b/include/configs/actux3.h index 3f42ed4..a7bb38c 100644 --- a/include/configs/actux3.h +++ b/include/configs/actux3.h @@ -146,8 +146,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 +183,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" \ -- cgit v1.1 From 930590f3e49c8f32256edf2e5861e1535a329c6c Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Sat, 31 Jan 2009 09:10:48 +0100 Subject: ixp: move serial to drivers/serial Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- include/configs/actux3.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/configs/actux3.h') diff --git a/include/configs/actux3.h b/include/configs/actux3.h index a7bb38c..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 -- cgit v1.1