random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-04 14:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

ixp: remove the option to include the Microcode

Browse Source 
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 <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2009-01-31 09:53:39 +01:00
parent 1b017baf20
commit b4e2f89dfc
7 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README
View File

@ -3021,8 +3021,7 @@ Some configuration options can be set using Environment Variables:
Useful on scripts which control the retry operation Useful on scripts which control the retry operation
themselves. themselves.
npe_ucode - see CONFIG_IXP4XX_NPE_EXT_UCOD npe_ucode - set load address for the NPE microcode
if set load address for the NPE microcode
tftpsrcport - If this is set, the value is used for TFTP's tftpsrcport - If this is set, the value is used for TFTP's
UDP source port. UDP source port.

17
cpu/ixp/npe/IxNpeDlImageMgr.c
View File

@ -133,20 +133,14 @@ typedef struct
*/ */
static IxNpeDlImageMgrStats ixNpeDlImageMgrStats; static IxNpeDlImageMgrStats ixNpeDlImageMgrStats;
/* default image */
#ifdef CONFIG_IXP4XX_NPE_EXT_UCODE_BASE
static UINT32 *IxNpeMicroCodeImageLibrary = (UINT32 *)CONFIG_IXP4XX_NPE_EXT_UCODE_BASE;
#else
static UINT32 *IxNpeMicroCodeImageLibrary = (UINT32 *)IxNpeMicrocode_array;
#endif
static UINT32* getIxNpeMicroCodeImageLibrary(void) static UINT32* getIxNpeMicroCodeImageLibrary(void)
{ {
char *s; char *s;
if ((s = getenv("npe_ucode")) != NULL) if ((s = getenv("npe_ucode")) != NULL)
return (UINT32*) simple_strtoul(s, NULL, 16); return (UINT32*) simple_strtoul(s, NULL, 16);
else else
return IxNpeMicroCodeImageLibrary; return NULL;
} }
/* /*
@ -422,7 +416,7 @@ ixNpeDlImageMgrSignatureCheck (UINT32 *microCodeImageLibrary)
(IxNpeDlImageMgrImageLibraryHeader *) microCodeImageLibrary; (IxNpeDlImageMgrImageLibraryHeader *) microCodeImageLibrary;
BOOL result = TRUE; BOOL result = TRUE;
if (header->signature != IX_NPEDL_IMAGEMGR_SIGNATURE) if (!header || header->signature != IX_NPEDL_IMAGEMGR_SIGNATURE)
{ {
result = FALSE; result = FALSE;
ixNpeDlImageMgrStats.invalidSignature++; ixNpeDlImageMgrStats.invalidSignature++;
@ -643,6 +637,11 @@ ixNpeDlImageMgrImageFind (
} }
#else #else
imageLibrary = getIxNpeMicroCodeImageLibrary(); imageLibrary = getIxNpeMicroCodeImageLibrary();
if (imageLibrary == NULL)
{
printf ("npe: ERROR, no Microcode found in memory\n");
return IX_FAIL;
}
#endif /* IX_NPEDL_READ_MICROCODE_FROM_FILE */ #endif /* IX_NPEDL_READ_MICROCODE_FROM_FILE */
} }

4
cpu/ixp/npe/Makefile
View File

@ -79,10 +79,6 @@ COBJS-$(CONFIG_IXP4XX_NPE) := npe.o \
IxNpeMhSolicitedCbMgr.o \ IxNpeMhSolicitedCbMgr.o \
IxNpeMhUnsolicitedCbMgr.o IxNpeMhUnsolicitedCbMgr.o
ifndef CONFIG_IXP4XX_NPE_EXT_UCODE_BASE
COBJS-$(CONFIG_IXP4XX_NPE) += IxNpeMicrocode.o
endif
SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS-y)) OBJS := $(addprefix $(obj),$(COBJS-y))
SOBJS := $(addprefix $(obj),$(SOBJS)) SOBJS := $(addprefix $(obj),$(SOBJS))

3
include/configs/actux1.h
View File

@ -172,8 +172,6 @@
/* include IXP4xx NPE support */ /* include IXP4xx NPE support */
#define CONFIG_IXP4XX_NPE 1 #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 #define CONFIG_NET_MULTI 1
/* NPE0 PHY address */ /* NPE0 PHY address */
#define CONFIG_PHY_ADDR 0 #define CONFIG_PHY_ADDR 0
@ -208,6 +206,7 @@
#define CONFIG_SYS_USE_PPCENV 1 #define CONFIG_SYS_USE_PPCENV 1
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"npe_ucode=50040000\0" \
"mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \ "mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \
"kerneladdr=50050000\0" \ "kerneladdr=50050000\0" \
"rootaddr=50170000\0" \ "rootaddr=50170000\0" \

3
include/configs/actux2.h
View File

@ -147,8 +147,6 @@
/* include IXP4xx NPE support */ /* include IXP4xx NPE support */
#define CONFIG_IXP4XX_NPE 1 #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 #define CONFIG_NET_MULTI 1
/* NPE0 PHY address */ /* NPE0 PHY address */
#define CONFIG_PHY_ADDR 0x00 #define CONFIG_PHY_ADDR 0x00
@ -185,6 +183,7 @@
#define CONFIG_SYS_USE_PPCENV 1 #define CONFIG_SYS_USE_PPCENV 1
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"npe_ucode=50040000\0" \
"mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \ "mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \
"kerneladdr=50050000\0" \ "kerneladdr=50050000\0" \
"rootaddr=50170000\0" \ "rootaddr=50170000\0" \

3
include/configs/actux3.h
View File

@ -146,8 +146,6 @@
/* include IXP4xx NPE support */ /* include IXP4xx NPE support */
#define CONFIG_IXP4XX_NPE 1 #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 #define CONFIG_NET_MULTI 1
/* NPE0 PHY address */ /* NPE0 PHY address */
@ -185,6 +183,7 @@
#define CONFIG_SYS_USE_PPCENV 1 #define CONFIG_SYS_USE_PPCENV 1
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"npe_ucode=50040000\0" \
"mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \ "mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \
"kerneladdr=50050000\0" \ "kerneladdr=50050000\0" \
"rootaddr=50170000\0" \ "rootaddr=50170000\0" \

3
include/configs/actux4.h
View File

@ -149,8 +149,6 @@
/* include IXP4xx NPE support */ /* include IXP4xx NPE support */
#define CONFIG_IXP4XX_NPE 1 #define CONFIG_IXP4XX_NPE 1
/* use separate flash sector with ucode images */
#define CONFIG_IXP4XX_NPE_EXT_UCODE_BASE 0x51000000
#define CONFIG_NET_MULTI 1 #define CONFIG_NET_MULTI 1
/* NPE0 PHY address */ /* NPE0 PHY address */
@ -181,6 +179,7 @@
#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x3f000) #define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x3f000)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"npe_ucode=51000000\0" \
"mtd=IXP4XX-Flash.0:252k(uboot),4k(uboot_env);" \ "mtd=IXP4XX-Flash.0:252k(uboot),4k(uboot_env);" \
"IXP4XX-Flash.1:128k(ucode),1280k(linux),-(root)\0" \ "IXP4XX-Flash.1:128k(ucode),1280k(linux),-(root)\0" \
"kerneladdr=51020000\0" \ "kerneladdr=51020000\0" \