Skip to contentSkip to conversation

XPedite1K updates

PATCH New Peter Tyser 2 participants 16 messages Jul 18, 2009 – Jul 20, 2009 Kbuild

lore
Share & tools
lore
#0 lore raw

cover XPedite1K updates

The XPedite1000 is a 440gx-based PMC made by X-ES. Support was added for XPedite100 to U-Boot > 5 years ago by Travis Sawyer (travis.sawyer at sandburst.com) independent of X-ES. Sandburst was bought out by Broadcom some time ago. I attempted to contact Travis at both his old Sandburst and Broadcom email addresses but neither account still exist.

We never sold any XPedite1000's to Sandburst, so I'm not quite sure how Travis initially got his hands on one (ebay?). In any case, now that other X-ES products are supported by U-Boot I thought it would make sense to sync up the XPedite1000 with other X-ES boards. In my opinion, these changes add some functionality and are generally an improvement. No one is currently using U-Boot on the XPedite1000 that I'm aware of so I hope the changes don't affect others in a negative way.

In any case, I was hoping to take over maintainership for the board, but was never able to get the OK from Travis. I hope this is OK...

Peter Tyser (14):
xpedite1k: Use standard CFI flash driver
xpedite1k: Remove CONFIG_SYS_DRAM_TEST support
xpedite1k: Remove support for fixed SDRAM configuration
xpedite1k: Remove support for reading MACs from EEPROM
xpedite1k: Cleanup coding style
xpedite1k: Add support for optional flashes
xpedite1k: Add support for additional GPIO pins
xpedite1k: Store environment in flash
xpedite1k: Disable unused ethernet port 1
xpedite1k: Sync up commands and environment with other X-ES boards
xpedite1k: Sync organization of board config with other X-ES boards
xpedite1k: Sync up board config options with other X-ES boards
xpedite1k: Sync checkboard() with other X-ES boards
xpedite1k: Move to X-ES vendor directory

 MAINTAINERS                                        |    2 +-
 MAKEALL                                            |    2 +-
 Makefile                                           |    4 +-
 board/{xpedite1k => xes/xpedite1000}/Makefile      |    2 +-
 board/{xpedite1k => xes/xpedite1000}/config.mk     |    0
 board/{xpedite1k => xes/xpedite1000}/init.S        |   67 +--
 board/{xpedite1k => xes/xpedite1000}/u-boot.lds    |    5 +-
 .../xpedite1000}/u-boot.lds.debug                  |    2 +-
 board/xes/xpedite1000/xpedite1000.c                |  244 ++++++++
 board/xpedite1k/flash.c                            |  607 --------------------
 board/xpedite1k/xpedite1k.c                        |  393 -------------
 include/configs/XPEDITE1000.h                      |  356 ++++++++++++
 include/configs/XPEDITE1K.h                        |  274 ---------
 13 files changed, 639 insertions(+), 1319 deletions(-)
 rename board/{xpedite1k => xes/xpedite1000}/Makefile (98%)
 rename board/{xpedite1k => xes/xpedite1000}/config.mk (100%)
 rename board/{xpedite1k => xes/xpedite1000}/init.S (61%)
 rename board/{xpedite1k => xes/xpedite1000}/u-boot.lds (97%)
 rename board/{xpedite1k => xes/xpedite1000}/u-boot.lds.debug (98%)
 create mode 100644 board/xes/xpedite1000/xpedite1000.c
 delete mode 100644 board/xpedite1k/flash.c
 delete mode 100644 board/xpedite1k/xpedite1k.c
 create mode 100644 include/configs/XPEDITE1000.h
 delete mode 100644 include/configs/XPEDITE1K.h
#1 lore raw

PATCH 1/14 xpedite1k: Use standard CFI flash driver

Using the CFI flash driver will allow write access to the 16MB Intel StrataFlash present on the XPedite1000. The 512KB socketed (non CFI-compliant flash) will no longer be writable.

The mapping of the 16MB Strata flash was moved to 0xff000000 and the 512KB AMD socketed flash was moved to 0xfe000000.

---
 board/xpedite1k/Makefile    |    2 +-
 board/xpedite1k/flash.c     |  607 -------------------------------------------
 board/xpedite1k/xpedite1k.c |   10 +-
 include/configs/XPEDITE1K.h |   10 +-
 4 files changed, 12 insertions(+), 617 deletions(-)
 delete mode 100644 board/xpedite1k/flash.c
board/xpedite1k/Makefile +1 -1
index 6ab1a26..b93f2c3 100644
@@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).a
 
-COBJS	= $(BOARD).o flash.o
+COBJS	= $(BOARD).o
 SOBJS	= init.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
board/xpedite1k/flash.c deleted +0 -607

607 lines not on this page · raw message

board/xpedite1k/xpedite1k.c +4 -6
index 044aeb9..bbbcdb1 100644
@@ -50,12 +50,10 @@ int board_early_init_f(void)
 	/*--------------------------------------------------------------------
 	 * Setup the external bus controller/chip selects
 	 *-------------------------------------------------------------------*/
-
-	/* set the bus controller */
-	mtebc (pb0ap, 0x04055200);	/* FLASH/SRAM */
-	mtebc (pb0cr, 0xfff18000);	/* BAS=0xfff 1MB R/W 8-bit */
-	mtebc (pb1ap, 0x04055200);	/* FLASH/SRAM */
-	mtebc (pb1cr, 0xfe098000);	/* BAS=0xff8 16MB R/W 8-bit */
+	mtebc (pb0ap, 0x04055200);	/* 16MB Strata FLASH */
+	mtebc (pb0cr, 0xff098000);	/* BAS=0xff0 16MB R/W 8-bit */
+	mtebc (pb1ap, 0x04055200);	/* 512KB Socketed AMD FLASH */
+	mtebc (pb1cr, 0xfe018000);	/* BAS=0xfe0 1MB R/W 8-bit */
 
 	/*--------------------------------------------------------------------
 	 * Setup the interrupt controller polarities, triggers, etc.
include/configs/XPEDITE1K.h +7 -3
index 74e55c9..1eb638b 100644
@@ -52,9 +52,9 @@
  * actual resources get mapped (not physical addresses)
  *----------------------------------------------------------------------*/
 #define CONFIG_SYS_SDRAM_BASE	    0x00000000		/* _must_ be 0		*/
-#define CONFIG_SYS_FLASH_BASE	    0xfff80000		/* start of FLASH	*/
+#define CONFIG_SYS_FLASH_BASE	    0xff000000		/* start of FLASH	*/
 
-#define CONFIG_SYS_MONITOR_BASE    CONFIG_SYS_FLASH_BASE	/* start of monitor	*/
+#define CONFIG_SYS_MONITOR_BASE	    TEXT_BASE		/* start of monitor	*/
 #define CONFIG_SYS_PCI_MEMBASE	    0x80000000		/* mapped pci memory	*/
 #define CONFIG_SYS_PERIPHERAL_BASE 0xe0000000		/* internal peripherals */
 #define CONFIG_SYS_ISRAM_BASE	    0xc0000000		/* internal SRAM	*/
@@ -128,7 +128,11 @@ extern void out32(unsigned int, unsigned long);
  * FLASH related
  *----------------------------------------------------------------------*/
 #define CONFIG_SYS_MAX_FLASH_BANKS	1		    /* number of banks	    */
-#define CONFIG_SYS_MAX_FLASH_SECT	8		    /* sectors per device   */
+#define CONFIG_SYS_FLASH_BANKS_LIST	{CONFIG_SYS_FLASH_BASE}
+#define CONFIG_SYS_MAX_FLASH_SECT	128		    /* sectors per device   */
+#define CONFIG_FLASH_CFI_DRIVER
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 
 #undef	CONFIG_SYS_FLASH_CHECKSUM
 #define CONFIG_SYS_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms)	*/
Signature · 1 line
1.6.2.1
#2 lore raw

PATCH 2/14 xpedite1k: Remove CONFIG_SYS_DRAM_TEST support

In reply to Peter Tyser

POST or command line tests provide similar functionality

---
 board/xpedite1k/xpedite1k.c |   31 -------------------------------
 include/configs/XPEDITE1K.h |    1 -
 2 files changed, 0 insertions(+), 32 deletions(-)
board/xpedite1k/xpedite1k.c +0 -31
index bbbcdb1..9abb83f 100644
@@ -127,37 +127,6 @@ phys_size_t initdram (int board_type)
 	return dram_size;
 }
 
-
-#if defined(CONFIG_SYS_DRAM_TEST)
-int testdram (void)
-{
-	uint *pstart = (uint *) 0x00000000;
-	uint *pend = (uint *) 0x08000000;
-	uint *p;
-
-	for (p = pstart; p < pend; p++)
-		*p = 0xaaaaaaaa;
-
-	for (p = pstart; p < pend; p++) {
-		if (*p != 0xaaaaaaaa) {
-			printf ("SDRAM test fails at: %08x\n", (uint) p);
-			return 1;
-		}
-	}
-
-	for (p = pstart; p < pend; p++)
-		*p = 0x55555555;
-
-	for (p = pstart; p < pend; p++) {
-		if (*p != 0x55555555) {
-			printf ("SDRAM test fails at: %08x\n", (uint) p);
-			return 1;
-		}
-	}
-	return 0;
-}
-#endif
-
 #if !defined(CONFIG_SPD_EEPROM)
 /*************************************************************************
  *  fixed sdram init -- doesn't use serial presence detect.
include/configs/XPEDITE1K.h +0 -1
index 1eb638b..57878a2 100644
@@ -39,7 +39,6 @@
 #define CONFIG_440GX		1		/* 440 GX */
 #define CONFIG_BOARD_EARLY_INIT_F 1		/* Call board_pre_init	*/
 #define CONFIG_MISC_INIT_R
-#undef	CONFIG_SYS_DRAM_TEST				/* Disable-takes long time! */
 #define CONFIG_SYS_CLK_FREQ	33333333	/* external freq to pll */
 
 
Signature · 1 line
1.6.2.1
#3 lore raw

PATCH 3/14 xpedite1k: Remove support for fixed SDRAM configuration

In reply to Peter Tyser

All XPedite1000's have SPD EEPROMs present and no fixed configuration parameters are currently defined or used

---
 board/xpedite1k/xpedite1k.c |   64 +------------------------------------------
 1 files changed, 1 insertions(+), 63 deletions(-)
board/xpedite1k/xpedite1k.c +1 -63
index 9abb83f..8a4e76c 100644
@@ -29,12 +29,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define BOOT_SMALL_FLASH	32	/* 00100000 */
-#define FLASH_ONBD_N		2	/* 00000010 */
-#define FLASH_SRAM_SEL		1	/* 00000001 */
-
-long int fixed_sdram (void);
-
 int board_early_init_f(void)
 {
 	unsigned long sdrreg;
@@ -117,64 +111,8 @@ int checkboard (void)
 
 phys_size_t initdram (int board_type)
 {
-	long dram_size = 0;
-
-#if defined(CONFIG_SPD_EEPROM)
-	dram_size = spd_sdram ();
-#else
-	dram_size = fixed_sdram ();
-#endif
-	return dram_size;
-}
-
-#if !defined(CONFIG_SPD_EEPROM)
-/*************************************************************************
- *  fixed sdram init -- doesn't use serial presence detect.
- *
- *  Assumes:	128 MB, non-ECC, non-registered
- *		PLB @ 133 MHz
- *
- ************************************************************************/
-long int fixed_sdram (void)
-{
-	uint reg;
-
-	/*--------------------------------------------------------------------
-	 * Setup some default
-	 *------------------------------------------------------------------*/
-	mtsdram (mem_uabba, 0x00000000);	/* ubba=0 (default)		*/
-	mtsdram (mem_slio, 0x00000000);		/* rdre=0 wrre=0 rarw=0		*/
-	mtsdram (mem_devopt, 0x00000000);	/* dll=0 ds=0 (normal)		*/
-	mtsdram (mem_wddctr, 0x00000000);	/* wrcp=0 dcd=0			*/
-	mtsdram (mem_clktr, 0x40000000);	/* clkp=1 (90 deg wr) dcdt=0	*/
-
-	/*--------------------------------------------------------------------
-	 * Setup for board-specific specific mem
-	 *------------------------------------------------------------------*/
-	/*
-	 * Following for CAS Latency = 2.5 @ 133 MHz PLB
-	 */
-	mtsdram (mem_b0cr, 0x000a4001); /* SDBA=0x000 128MB, Mode 3, enabled */
-	mtsdram (mem_tr0, 0x410a4012);	/* WR=2	 WD=1 CL=2.5 PA=3 CP=4 LD=2 */
-	/* RA=10 RD=3			    */
-	mtsdram (mem_tr1, 0x8080082f);	/* SS=T2 SL=STAGE 3 CD=1 CT=0x02f   */
-	mtsdram (mem_rtr, 0x08200000);	/* Rate 15.625 ns @ 133 MHz PLB	    */
-	mtsdram (mem_cfg1, 0x00000000); /* Self-refresh exit, disable PM    */
-	udelay (400);			/* Delay 200 usecs (min)	    */
-
-	/*--------------------------------------------------------------------
-	 * Enable the controller, then wait for DCEN to complete
-	 *------------------------------------------------------------------*/
-	mtsdram (mem_cfg0, 0x86000000); /* DCEN=1, PMUD=1, 64-bit	    */
-	for (;;) {
-		mfsdram (mem_mcsts, reg);
-		if (reg & 0x80000000)
-			break;
-	}
-
-	return (128 * 1024 * 1024);	/* 128 MB			    */
+	return spd_sdram();
 }
-#endif	/* !defined(CONFIG_SPD_EEPROM) */
 
 
 /*************************************************************************
Signature · 1 line
1.6.2.1
#4 lore raw

PATCH 4/14 xpedite1k: Remove support for reading MACs from EEPROM

In reply to Peter Tyser

By default, the XPedite1000 comes installed with xMon, a proprietary bootloader. xMon stores its MAC address in an onboard EEPROM. Rather than requiring a non-standard location in the EEPROM to be reserved for MAC addresses, store the MAC addresses in U-Boot's standard environment. A U-Boot application or OS application can be used to migrate xMon MAC addresses to U-Boot's environment if necessary.

---
 board/xpedite1k/xpedite1k.c |   62 +------------------------------------------
 include/configs/XPEDITE1K.h |    1 -
 2 files changed, 1 insertions(+), 62 deletions(-)
board/xpedite1k/xpedite1k.c +1 -61
index 8a4e76c..36a133f 100644
@@ -235,64 +235,4 @@ ulong post_word_load (void)
 
 	return *save_addr;
 }
-#endif
-
-/*-----------------------------------------------------------------------------
- * board_get_enetaddr -- Read the MAC Addresses in the I2C EEPROM
- *-----------------------------------------------------------------------------
- */
-static int read_i2c;
-static void board_get_enetaddr(uchar *enet)
-{
-	int i;
-	unsigned char buff[0x100], *cp;
-
-	if (read_i2c)
-		return;
-
-	/* Initialize I2C					*/
-	i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
-
-	/* Read 256 bytes in EEPROM				*/
-	i2c_read (0x50, 0, 1, buff, 0x100);
-
-	cp = &buff[0xF4];
-	for (i = 0; i < 6; i++,cp++)
-		enet[i] = *cp;
-
-	printf("MAC address = %pM\n", enet);
-	read_i2c = 1;
-}
-
-int misc_init_r(void)
-{
-	uchar enetaddr[6], i2c_enetaddr[6];
-
-	if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
-		board_get_enetaddr(i2c_enetaddr);
-		eth_setenv_enetaddr("ethaddr", i2c_enetaddr);
-	}
-
-#ifdef CONFIG_HAS_ETH1
-	if (!eth_getenv_enetaddr("eth1addr", enetaddr)) {
-		board_get_enetaddr(i2c_enetaddr);
-		eth_setenv_enetaddr("eth1addr", i2c_enetaddr);
-	}
-#endif
-
-#ifdef CONFIG_HAS_ETH2
-	if (!eth_getenv_enetaddr("eth2addr", enetaddr)) {
-		board_get_enetaddr(i2c_enetaddr);
-		eth_setenv_enetaddr("eth2addr", i2c_enetaddr);
-	}
-#endif
-
-#ifdef CONFIG_HAS_ETH3
-	if (!eth_getenv_enetaddr("eth3addr", enetaddr)) {
-		board_get_enetaddr(i2c_enetaddr);
-		eth_setenv_enetaddr("eth3addr", i2c_enetaddr);
-	}
-#endif
-
-	return 0;
-}
+#endif
\ No newline@end of file
include/configs/XPEDITE1K.h +0 -1
index 57878a2..93c4b0a 100644
@@ -38,7 +38,6 @@
 #define CONFIG_440		1
 #define CONFIG_440GX		1		/* 440 GX */
 #define CONFIG_BOARD_EARLY_INIT_F 1		/* Call board_pre_init	*/
-#define CONFIG_MISC_INIT_R
 #define CONFIG_SYS_CLK_FREQ	33333333	/* external freq to pll */
 
 
Signature · 1 line
1.6.2.1
#5 lore raw

PATCH 5/14 xpedite1k: Cleanup coding style

In reply to Peter Tyser
---
 board/xpedite1k/init.S      |   67 +++++++-------
 board/xpedite1k/u-boot.lds  |    3 -
 board/xpedite1k/xpedite1k.c |  210 +++++++++++++++++++-----------------------
 include/configs/XPEDITE1K.h |  216 ++++++++++++++++++-------------------------
 4 files changed, 218 insertions(+), 278 deletions(-)
board/xpedite1k/init.S +32 -35
index 8a04f4f..54371e2 100644
@@ -1,5 +1,5 @@
 /*
-*  Copyright (C) 2002 Scott McNutt <[email protected]>
+* Copyright (C) 2002 Scott McNutt <[email protected]>
 *
 * See file CREDITS for list of people who contributed to this
 * project.
@@ -24,62 +24,59 @@
 #include <config.h>
 
 /* General */
-#define TLB_VALID   0x00000200
+#define TLB_VALID	0x00000200
 
 /* Supported page sizes */
-
-#define SZ_1K	    0x00000000
-#define SZ_4K	    0x00000010
-#define SZ_16K	    0x00000020
-#define SZ_64K	    0x00000030
-#define SZ_256K	    0x00000040
-#define SZ_1M	    0x00000050
-#define SZ_16M	    0x00000070
-#define SZ_256M	    0x00000090
+#define SZ_1K		0x00000000
+#define SZ_4K		0x00000010
+#define SZ_16K		0x00000020
+#define SZ_64K		0x00000030
+#define SZ_256K		0x00000040
+#define SZ_1M		0x00000050
+#define SZ_16M		0x00000070
+#define SZ_256M		0x00000090
 
 /* Storage attributes */
-#define SA_W	    0x00000800	    /* Write-through */
-#define SA_I	    0x00000400	    /* Caching inhibited */
-#define SA_M	    0x00000200	    /* Memory coherence */
-#define SA_G	    0x00000100	    /* Guarded */
-#define SA_E	    0x00000080	    /* Endian */
+#define SA_W		0x00000800	/* Write-through */
+#define SA_I		0x00000400	/* Caching inhibited */
+#define SA_M		0x00000200	/* Memory coherence */
+#define SA_G		0x00000100	/* Guarded */
+#define SA_E		0x00000080	/* Endian */
 
 /* Access control */
-#define AC_X	    0x00000024	    /* Execute */
-#define AC_W	    0x00000012	    /* Write */
-#define AC_R	    0x00000009	    /* Read */
+#define AC_X		0x00000024	/* Execute */
+#define AC_W		0x00000012	/* Write */
+#define AC_R		0x00000009	/* Read */
 
 /* Some handy macros */
-
 #define EPN(e)		((e) & 0xfffffc00)
-#define TLB0(epn,sz)	( (EPN((epn)) | (sz) | TLB_VALID ) )
-#define TLB1(rpn,erpn)	( ((rpn)&0xfffffc00) | (erpn) )
-#define TLB2(a)		( (a)&0x00000fbf )
+#define TLB0(epn,sz)	((EPN((epn)) | (sz) | TLB_VALID ))
+#define TLB1(rpn,erpn)	(((rpn)&0xfffffc00) | (erpn))
+#define TLB2(a)		((a)&0x00000fbf)
 
-#define tlbtab_start\
-	mflr    r1  ;\
-	bl 0f	    ;
+#define tlbtab_start	\
+	mflr	r1;	\
+	bl 0f;
 
-#define tlbtab_end\
-	.long 0, 0, 0	;   \
-0:	mflr    r0	;   \
-	mtlr    r1	;   \
-	blr		;
+#define tlbtab_end	\
+	.long 0, 0, 0;	\
+0:	mflr	r0;	\
+	mtlr	r1;	\
+	blr;
 
 #define tlbentry(epn,sz,rpn,erpn,attr)\
 	.long TLB0(epn,sz),TLB1(rpn,erpn),TLB2(attr)
 
 
-/**************************************************************************
+/*
  * TLB TABLE
  *
  * This table is used by the cpu boot code to setup the initial tlb
  * entries. Rather than make broad assumptions in the cpu source tree,
  * this table lets each board set things up however they like.
  *
- *  Pointer to the table is returned in r1
- *
- *************************************************************************/
+ * Pointer to the table is returned in r1
+ */
 
 	.section .bootpg,"ax"
 	.globl tlbtab
board/xpedite1k/u-boot.lds +0 -3
index c8f9646..fc001b2 100644
@@ -78,9 +78,6 @@ SECTIONS
     lib_ppc/extable.o	(.text)
     lib_generic/zlib.o		(.text)
 
-/*    . = env_offset;*/
-/*    common/env_embedded.o(.text)*/
-
     *(.text)
     *(.fixup)
     *(.got1)
board/xpedite1k/xpedite1k.c +95 -115

306 lines not on this page · raw message

include/configs/XPEDITE1K.h +91 -125

321 lines not on this page · raw message

Signature · 1 line
1.6.2.1
#6 lore raw

PATCH 6/14 xpedite1k: Add support for optional flashes

In reply to Peter Tyser

The XPedite1000 can be built with 4 total flashes:
- 512KB AMD socketed
- 16MB Intel soldered
- 2 x 32MB AMD MirrorBit flashes

Add support for the optional 2 32MB CFI-compliant AMD flashes

---
 board/xpedite1k/xpedite1k.c |    4 ++++
 include/configs/XPEDITE1K.h |    7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
board/xpedite1k/xpedite1k.c +4 -0
index dbe0bb6..55b1f31 100644
@@ -46,6 +46,10 @@ int board_early_init_f(void)
 	mtebc(pb0cr, 0xff098000);	/* BAS=0xff0 16MB R/W 8-bit */
 	mtebc(pb1ap, 0x04055200);	/* 512KB Socketed AMD FLASH */
 	mtebc(pb1cr, 0xfe018000);	/* BAS=0xfe0 1MB R/W 8-bit */
+	mtebc(pb6ap, 0x05006400);	/* 32-64MB AMD MirrorBit FLASH */
+	mtebc(pb6cr, 0xf00da000);	/* BAS=0xf00 64MB R/W i6-bit */
+	mtebc(pb7ap, 0x05006400);	/* 32-64MB AMD MirrorBit FLASH */
+	mtebc(pb7cr, 0xf40da000);	/* BAS=0xf40 64MB R/W 16-bit */
 
 	/*
 	 * Setup the interrupt controller polarities, triggers, etc.
include/configs/XPEDITE1K.h +4 -3
index f141398..0aebe27 100644
@@ -106,12 +106,13 @@ extern void out32(unsigned int, unsigned long);
 /*
  * FLASH related
  */
-#define CONFIG_SYS_MAX_FLASH_BANKS	1		    /* number of banks	    */
-#define CONFIG_SYS_FLASH_BANKS_LIST	{CONFIG_SYS_FLASH_BASE}
-#define CONFIG_SYS_MAX_FLASH_SECT	128		    /* sectors per device   */
+#define CONFIG_SYS_MAX_FLASH_BANKS	3
+#define CONFIG_SYS_FLASH_BANKS_LIST	{CONFIG_SYS_FLASH_BASE, 0xf0000000, 0xf4000000 }
+#define CONFIG_SYS_MAX_FLASH_SECT	512	/* sectors per device */
 #define CONFIG_FLASH_CFI_DRIVER
 #define CONFIG_SYS_FLASH_CFI
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
+#define CONFIG_SYS_FLASH_QUIET_TEST		/* MirrorBit flashes are optional */
 
 #undef	CONFIG_SYS_FLASH_CHECKSUM
 #define CONFIG_SYS_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms) */
Signature · 1 line
1.6.2.1
#7 lore raw

PATCH 7/14 xpedite1k: Add support for additional GPIO pins

In reply to Peter Tyser

Enable GPIO pins for an I2C EEPROM write protect, a system reset pin, and a PMC #MONARCH pin. These pins are not currently used in U-Boot, but are used in OSes and may be used in U-Boot in the future.

---
 board/xpedite1k/xpedite1k.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
board/xpedite1k/xpedite1k.c +11 -2
index 55b1f31..33d4ac8 100644
@@ -32,9 +32,18 @@ int board_early_init_f(void)
 {
 	unsigned long sdrreg;
 
-	/* TBS: Setup the GPIO access for the user LEDs */
+	/*
+	 * Enable GPIO for pins 18 - 24
+	 * 18 = SEEPROM_WP
+	 * 19 = #M_RST
+	 * 20 = #MONARCH
+	 * 21 = #LED_ALARM
+	 * 22 = #LED_ACT
+	 * 23 = #LED_STATUS1
+	 * 24 = #LED_STATUS2
+	 */
 	mfsdr(sdr_pfc0, sdrreg);
-	mtsdr(sdr_pfc0, (sdrreg & ~0x00000100) | 0x00000E00);
+	mtsdr(sdr_pfc0, (sdrreg & ~SDR0_PFC0_TRE_ENABLE) | 0x00003e00);
 	out32(CONFIG_SYS_GPIO_BASE + 0x018, (USR_LED0 | USR_LED1 | USR_LED2 | USR_LED3));
 	LED0_OFF();
 	LED1_OFF();
Signature · 1 line
1.6.2.1
#8 lore raw

PATCH 8/14 xpedite1k: Store environment in flash

In reply to Peter Tyser

Previously an I2C EEPROM was used. The EEPROM had size, reliability, and access issues which are resolved by storing the environment in flash.

---
 include/configs/XPEDITE1K.h |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
include/configs/XPEDITE1K.h +9 -4
index 0aebe27..df02d7b 100644
@@ -129,10 +129,15 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_SYS_I2C_SLAVE		0x7f
 #define CONFIG_SYS_I2C_NOPROBES	{0x55,0x56,0x57,0x58,0x59,0x5a,0x5b,0x5c,0x69}
 
-/* Environment */
-#define CONFIG_ENV_IS_IN_EEPROM		1
-#define CONFIG_ENV_SIZE			0x100	/* Size of Environment vars */
-#define CONFIG_ENV_OFFSET		0x100
+/*
+ * Environment Configuration
+ */
+#define CONFIG_ENV_IS_IN_FLASH	1
+#define CONFIG_ENV_SECT_SIZE	0x20000 /* 128k (one sector) for env */
+#define CONFIG_ENV_SIZE		0x8000
+#define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE - (256 * 1024))
+
+/* EEPROM */
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN		1
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
Signature · 1 line
1.6.2.1
#9 lore raw

PATCH 9/14 xpedite1k: Disable unused ethernet port 1

In reply to Peter Tyser

The XPedite1000 only has 2 available ethernet ports:
ppc_4xx_eth2 (EMAC2) and ppc_4xx_eth3 (EMAC3)

---
 include/configs/XPEDITE1K.h |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
include/configs/XPEDITE1K.h +1 -3
index df02d7b..d8eccd8 100644
@@ -153,8 +153,7 @@ extern void out32(unsigned int, unsigned long);
 
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII		1	/* MII PHY management */
-#define CONFIG_PHY_ADDR		0	/* PHY address phy0 not populated */
-#define CONFIG_PHY1_ADDR	1	/* PHY address phy1 not populated */
+#define CONFIG_PHY_ADDR		4	/* PHY address phy0 not populated */
 #define CONFIG_PHY2_ADDR	4	/* PHY address phy2 */
 #define CONFIG_PHY3_ADDR	8	/* PHY address phy3 */
 #define CONFIG_NET_MULTI	1
@@ -162,7 +161,6 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_PHY_RESET	1	/* reset phy upon startup */
 #define CONFIG_SYS_RX_ETH_BUFFER 32	/* Number of ethernet rx buffers & descriptors */
 
-#define CONFIG_HAS_ETH1		1	/* add support for "eth1addr" */
 #define CONFIG_HAS_ETH2		1	/* add support for "eth2addr" */
 #define CONFIG_HAS_ETH3		1	/* add support for "eth3addr" */
 
Signature · 1 line
1.6.2.1
#10 lore raw

PATCH 10/14 xpedite1k: Sync up commands and environment with other X-ES boards

In reply to Peter Tyser
---
 include/configs/XPEDITE1K.h |  122 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 110 insertions(+), 12 deletions(-)
include/configs/XPEDITE1K.h +110 -12
index d8eccd8..c67350a 100644
@@ -143,11 +143,6 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10
 
-#define CONFIG_BOOTARGS		"root=/dev/hda1 "
-#define CONFIG_BOOTCOMMAND	"bootm ffc00000"	/* autoboot command */
-#define CONFIG_BOOTDELAY	5			/* disable autoboot */
-#define CONFIG_BAUDRATE		9600
-
 #define CONFIG_LOADS_ECHO	1		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change */
 
@@ -175,17 +170,21 @@ extern void out32(unsigned int, unsigned long);
  */
 #include <config_cmd_default.h>
 
-#define CONFIG_CMD_PCI
-#define CONFIG_CMD_IRQ
-#define CONFIG_CMD_I2C
+#define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_DATE
-#define CONFIG_CMD_BEDBUG
+#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
-#define CONFIG_CMD_PING
 #define CONFIG_CMD_ELF
+#define CONFIG_CMD_SAVEENV
+#define CONFIG_CMD_FLASH
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IRQ
+#define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MII
-#define CONFIG_CMD_DIAG
-#define CONFIG_CMD_FAT
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_SNTP
 
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
@@ -243,4 +242,103 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_KGDB_BAUDRATE	230400	/* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX	2	/* which serial port to use */
 #endif
+
+/*
+ * Flash memory map:
+ * fff80000 - ffffffff	U-Boot (512 KB)
+ * fff40000 - fff7ffff	U-Boot Environment (256 KB)
+ * fff00000 - fff3ffff	FDT (256KB)
+ * ffc00000 - ffefffff	OS image (3MB)
+ * ff000000 - ffbfffff	OS Use/Filesystem (12MB)
+ */
+
+#define CONFIG_UBOOT_ENV_ADDR	MK_STR(TEXT_BASE)
+#define CONFIG_FDT_ENV_ADDR	MK_STR(0xfff00000)
+#define CONFIG_OS_ENV_ADDR	MK_STR(0xffc00000)
+
+#define CONFIG_PROG_UBOOT						\
+	"$download_cmd $loadaddr $ubootfile; "				\
+	"if test $? -eq 0; then "					\
+		"protect off "CONFIG_UBOOT_ENV_ADDR" +80000; "		\
+		"erase "CONFIG_UBOOT_ENV_ADDR" +80000; "		\
+		"cp.w $loadaddr "CONFIG_UBOOT_ENV_ADDR" 40000; "	\
+		"protect on "CONFIG_UBOOT_ENV_ADDR" +80000; "		\
+		"cmp.b $loadaddr "CONFIG_UBOOT_ENV_ADDR" 80000; "	\
+		"if test $? -ne 0; then "				\
+			"echo PROGRAM FAILED; "				\
+		"else; "						\
+			"echo PROGRAM SUCCEEDED; "			\
+		"fi; "							\
+	"else; "							\
+		"echo DOWNLOAD FAILED; "				\
+	"fi;"
+
+#define CONFIG_BOOT_OS_NET						\
+	"$download_cmd $osaddr $osfile; "				\
+	"if test $? -eq 0; then "					\
+		"if test -n $fdtaddr; then "				\
+			"$download_cmd $fdtaddr $fdtfile; "		\
+			"if test $? -eq 0; then "			\
+				"bootm $osaddr - $fdtaddr; "		\
+			"else; "					\
+				"echo FDT DOWNLOAD FAILED; "		\
+			"fi; "						\
+		"else; "						\
+			"bootm $osaddr; "				\
+		"fi; "							\
+	"else; "							\
+		"echo OS DOWNLOAD FAILED; "				\
+	"fi;"
+
+#define CONFIG_PROG_OS							\
+	"$download_cmd $osaddr $osfile; "				\
+	"if test $? -eq 0; then "					\
+		"erase "CONFIG_OS_ENV_ADDR" +$filesize; "		\
+		"cp.b $osaddr "CONFIG_OS_ENV_ADDR" $filesize; "		\
+		"cmp.b $osaddr "CONFIG_OS_ENV_ADDR" $filesize; "	\
+		"if test $? -ne 0; then "				\
+			"echo OS PROGRAM FAILED; "			\
+		"else; "						\
+			"echo OS PROGRAM SUCCEEDED; "			\
+		"fi; "							\
+	"else; "							\
+		"echo OS DOWNLOAD FAILED; "				\
+	"fi;"
+
+#define CONFIG_PROG_FDT							\
+	"$download_cmd $fdtaddr $fdtfile; "				\
+	"if test $? -eq 0; then "					\
+		"erase "CONFIG_FDT_ENV_ADDR" +$filesize;"		\
+		"cp.b $fdtaddr "CONFIG_FDT_ENV_ADDR" $filesize; "	\
+		"cmp.b $fdtaddr "CONFIG_FDT_ENV_ADDR" $filesize; "	\
+		"if test $? -ne 0; then "				\
+			"echo FDT PROGRAM FAILED; "			\
+		"else; "						\
+			"echo FDT PROGRAM SUCCEEDED; "			\
+		"fi; "							\
+	"else; "							\
+		"echo FDT DOWNLOAD FAILED; "				\
+	"fi;"
+
+#define	CONFIG_EXTRA_ENV_SETTINGS					\
+	"autoload=yes\0"						\
+	"download_cmd=tftp\0"						\
+	"console_args=console=ttyS0,115200\0"				\
+	"root_args=root=/dev/nfs rw\0"					\
+	"misc_args=ip=on\0"						\
+	"set_bootargs=setenv bootargs ${console_args} ${root_args} ${misc_args}\0" \
+	"bootfile=/home/user/file\0"					\
+	"osfile=/home/user/uImage-XPedite1000\0"			\
+	"fdtfile=/home/user/xpedite1000.dtb\0"				\
+	"ubootfile=/home/user/u-boot.bin\0"				\
+	"fdtaddr=c00000\0"						\
+	"osaddr=0x1000000\0"						\
+	"loadaddr=0x1000000\0"						\
+	"prog_uboot="CONFIG_PROG_UBOOT"\0"				\
+	"prog_os="CONFIG_PROG_OS"\0"					\
+	"prog_fdt="CONFIG_PROG_FDT"\0"					\
+	"bootcmd_net=run set_bootargs; "CONFIG_BOOT_OS_NET"\0"		\
+	"bootcmd_flash=run set_bootargs; "				\
+		"bootm "CONFIG_OS_ENV_ADDR" - "CONFIG_FDT_ENV_ADDR"\0"	\
+	"bootcmd=run bootcmd_flash\0"
 #endif	/* __CONFIG_H */
Signature · 1 line
1.6.2.1
#11 lore raw

PATCH 11/14 xpedite1k: Sync organization of board config with other X-ES boards

In reply to Peter Tyser

This change should have no functional effect

---
 include/configs/XPEDITE1K.h |  159 +++++++++++++++++++++++--------------------
 1 files changed, 85 insertions(+), 74 deletions(-)
include/configs/XPEDITE1K.h +85 -74
index c67350a..391d041 100644
@@ -38,26 +38,40 @@
 #define CONFIG_BOARD_EARLY_INIT_F 1		/* Call board_pre_init	*/
 #define CONFIG_SYS_CLK_FREQ	33333333	/* external freq to pll */
 
-/* POST support */
-#define CONFIG_POST		(CONFIG_SYS_POST_RTC	| \
-				 CONFIG_SYS_POST_I2C)
+/*
+ * DDR config
+ */
+#define CONFIG_SPD_EEPROM		/* Use SPD EEPROM for setup */
+#define SPD_EEPROM_ADDRESS	{0x54}	/* SPD i2c spd addresses */
+#define CONFIG_VERY_BIG_RAM	1
 
 /*
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  */
-#define CONFIG_SYS_SDRAM_BASE		0x00000000		/* _must_ be 0 */
-#define CONFIG_SYS_FLASH_BASE		0xff000000		/* start of FLASH */
-
-#define CONFIG_SYS_MONITOR_BASE		TEXT_BASE		/* start of monitor */
-#define CONFIG_SYS_PCI_MEMBASE		0x80000000		/* mapped pci memory */
-#define CONFIG_SYS_PERIPHERAL_BASE	0xe0000000		/* internal peripherals */
-#define CONFIG_SYS_ISRAM_BASE		0xc0000000		/* internal SRAM */
-#define CONFIG_SYS_PCI_BASE		0xd0000000		/* internal PCI regs */
-
+#define CONFIG_SYS_SDRAM_BASE		0x00000000
+#define CONFIG_SYS_FLASH_BASE		0xff000000	/* start of FLASH */
+#define CONFIG_SYS_MONITOR_BASE		TEXT_BASE	/* start of monitor */
+#define CONFIG_SYS_PCI_MEMBASE		0x80000000	/* mapped pci memory */
+#define CONFIG_SYS_PERIPHERAL_BASE	0xe0000000	/* internal peripherals */
+#define CONFIG_SYS_ISRAM_BASE		0xc0000000	/* internal SRAM */
+#define CONFIG_SYS_PCI_BASE		0xd0000000	/* internal PCI regs */
 #define CONFIG_SYS_NVRAM_BASE_ADDR	(CONFIG_SYS_PERIPHERAL_BASE + 0x08000000)
 #define CONFIG_SYS_GPIO_BASE		(CONFIG_SYS_PERIPHERAL_BASE + 0x00000700)
 
+/*
+ * Diagnostics
+ */
+#define CONFIG_SYS_MEMTEST_START	0x0400000
+#define CONFIG_SYS_MEMTEST_END		0x0C00000
+
+/* POST support */
+#define CONFIG_POST		(CONFIG_SYS_POST_RTC	| \
+				 CONFIG_SYS_POST_I2C)
+
+/*
+ * LED support
+ */
 #define USR_LED0	0x00000080
 #define USR_LED1	0x00000100
 #define USR_LED2	0x00000200
@@ -78,13 +92,14 @@ extern void out32(unsigned int, unsigned long);
 #define LED3_OFF() out32(CONFIG_SYS_GPIO_BASE, (in32(CONFIG_SYS_GPIO_BASE) | USR_LED3))
 #endif
 
-/* Initial RAM & stack pointer (placed in internal SRAM) */
+/*
+ * Use internal SRAM for initial stack
+ */
 #define CONFIG_SYS_TEMP_STACK_OCM	1
 #define CONFIG_SYS_OCM_DATA_ADDR	CONFIG_SYS_ISRAM_BASE
 #define CONFIG_SYS_INIT_RAM_ADDR	CONFIG_SYS_ISRAM_BASE	/* Initial RAM address */
 #define CONFIG_SYS_INIT_RAM_END		0x2000	/* End of used area in RAM */
 #define CONFIG_SYS_GBL_DATA_SIZE	128	/* num bytes initial data */
-
 #define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
 #define CONFIG_SYS_POST_WORD_ADDR	(CONFIG_SYS_GBL_DATA_OFFSET - 0x4)
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_POST_WORD_ADDR
@@ -92,19 +107,17 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_SYS_MONITOR_LEN	(256 * 1024)	/* Reserve 256 kB for Mon */
 #define CONFIG_SYS_MALLOC_LEN	(128 * 1024)	/* Reserve 128 kB for malloc */
 
-/* Serial Port */
-#undef	CONFIG_SERIAL_SOFTWARE_FIFO
-#define CONFIG_BAUDRATE		9600
+/*
+ * Serial Port
+ */
 #define CONFIG_SYS_BAUDRATE_TABLE \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400}
-
-/* RTC: STMicro M41T00 */
-#define CONFIG_RTC_M41T11		1
-#define CONFIG_SYS_I2C_RTC_ADDR		0x68
-#define CONFIG_SYS_M41T11_BASE_YEAR	2000
+#define CONFIG_BAUDRATE			9600
+#define CONFIG_LOADS_ECHO		1	/* echo on for serial download */
+#define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change */
 
 /*
- * FLASH related
+ * NOR flash configuration
  */
 #define CONFIG_SYS_MAX_FLASH_BANKS	3
 #define CONFIG_SYS_FLASH_BANKS_LIST	{CONFIG_SYS_FLASH_BASE, 0xf0000000, 0xf4000000 }
@@ -118,45 +131,54 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_SYS_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms) */
 
-/* DDR SDRAM */
-#define CONFIG_SPD_EEPROM		/* Use SPD EEPROM for setup */
-#define SPD_EEPROM_ADDRESS	{0x54}	/* SPD i2c spd addresses */
-#define CONFIG_VERY_BIG_RAM	1
-
-/* I2C */
+/*
+ * I2C
+ */
 #define CONFIG_HARD_I2C			1	/* I2C with hardware support */
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7f
 #define CONFIG_SYS_I2C_NOPROBES	{0x55,0x56,0x57,0x58,0x59,0x5a,0x5b,0x5c,0x69}
 
-/*
- * Environment Configuration
- */
-#define CONFIG_ENV_IS_IN_FLASH	1
-#define CONFIG_ENV_SECT_SIZE	0x20000 /* 128k (one sector) for env */
-#define CONFIG_ENV_SIZE		0x8000
-#define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE - (256 * 1024))
-
-/* EEPROM */
-#define CONFIG_SYS_I2C_EEPROM_ADDR	0x50
+/* I2C EEPROM */
+#define CONFIG_SYS_I2C_EEPROM_ADDR		0x50
 #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN		1
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	3
 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	10
 
-#define CONFIG_LOADS_ECHO	1		/* echo on for serial download */
-#define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change */
+/* I2C RTC: STMicro M41T00 */
+#define CONFIG_RTC_M41T11		1
+#define CONFIG_SYS_I2C_RTC_ADDR		0x68
+#define CONFIG_SYS_M41T11_BASE_YEAR	2000
+
+/*
+ * PCI
+ */
+/* General PCI */
+#define CONFIG_PCI				/* include pci support */
+#define CONFIG_PCI_PNP				/* do pci plug-and-play */
+#define CONFIG_PCI_SCAN_SHOW			/* show pci devices on startup */
+#define CONFIG_SYS_PCI_TARGBASE	0x80000000	/* PCIaddr mapped to CONFIG_SYS_PCI_MEMBASE */
+
+/* Board-specific PCI */
+#define CONFIG_SYS_PCI_TARGET_INIT		/* let board init pci target */
+#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1014	/* IBM */
+#define CONFIG_SYS_PCI_SUBSYS_DEVICEID 0xcafe	/* Whatever */
+#define CONFIG_SYS_PCI_FORCE_PCI_CONV		/* Force PCI Conventional Mode */
 
+/*
+ * Networking options
+ */
 #define CONFIG_PPC4xx_EMAC
-#define CONFIG_MII		1	/* MII PHY management */
-#define CONFIG_PHY_ADDR		4	/* PHY address phy0 not populated */
-#define CONFIG_PHY2_ADDR	4	/* PHY address phy2 */
-#define CONFIG_PHY3_ADDR	8	/* PHY address phy3 */
-#define CONFIG_NET_MULTI	1
 #define CONFIG_PHY_GIGE		1	/* Include GbE speed/duplex detection */
+#define CONFIG_NET_MULTI	1
+#define CONFIG_MII		1	/* MII PHY management */
 #define CONFIG_PHY_RESET	1	/* reset phy upon startup */
 #define CONFIG_SYS_RX_ETH_BUFFER 32	/* Number of ethernet rx buffers & descriptors */
-
+#define CONFIG_ETHPRIME		"ppc_4xx_eth2"
+#define CONFIG_PHY_ADDR		4	/* PHY address phy0 not populated */
+#define CONFIG_PHY2_ADDR	4	/* PHY address phy2 */
 #define CONFIG_HAS_ETH2		1	/* add support for "eth2addr" */
+#define CONFIG_PHY3_ADDR	8	/* PHY address phy3 */
 #define CONFIG_HAS_ETH3		1	/* add support for "eth3addr" */
 
 /* BOOTP options */
@@ -166,7 +188,7 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_BOOTP_HOSTNAME
 
 /*
- * Command line configuration
+ * Command configuration
  */
 #include <config_cmd_default.h>
 
@@ -175,7 +197,6 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_EEPROM
 #define CONFIG_CMD_ELF
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IRQ
@@ -184,14 +205,14 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_SNTP
 
-#undef CONFIG_WATCHDOG			/* watchdog disabled */
-
 /*
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
+#define CONFIG_SYS_LOAD_ADDR	0x100000	/* default load address */
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt */
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
@@ -201,29 +222,8 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
-
-#define CONFIG_SYS_MEMTEST_START	0x0400000	/* memtest works on */
-#define CONFIG_SYS_MEMTEST_END		0x0C00000	/* 4 ... 12 MB in DRAM */
-
-#define CONFIG_SYS_LOAD_ADDR		0x100000	/* default load address */
-#define CONFIG_SYS_EXTBDINFO		1	/* To use extended board_into (bd_t) */
-
 #define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */
-
-/*
- * PCI
- */
-/* General PCI */
-#define CONFIG_PCI				/* include pci support */
-#define CONFIG_PCI_PNP				/* do pci plug-and-play */
-#define CONFIG_PCI_SCAN_SHOW			/* show pci devices on startup */
-#define CONFIG_SYS_PCI_TARGBASE	0x80000000	/* PCIaddr mapped to CONFIG_SYS_PCI_MEMBASE */
-
-/* Board-specific PCI */
-#define CONFIG_SYS_PCI_TARGET_INIT		/* let board init pci target */
-#define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1014	/* IBM */
-#define CONFIG_SYS_PCI_SUBSYS_DEVICEID 0xcafe	/* Whatever */
-#define CONFIG_SYS_PCI_FORCE_PCI_CONV		/* Force PCI Conventional Mode */
+#define CONFIG_SYS_EXTBDINFO		1	/* To use extended board_into (bd_t) */
 
 /*
  * For booting Linux, the board info and command line data
@@ -233,17 +233,28 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_SYS_BOOTMAPSZ		(8 << 20)	/* Initial Memory map for Linux */
 
 /*
- * Internal Definitions
+ * Boot Flags
  */
 #define BOOTFLAG_COLD	0x01		/* Normal Power-On: Boot from FLASH */
 #define BOOTFLAG_WARM	0x02		/* Software reboot */
 
+/*
+ * KGDB configuration
+ */
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE	230400	/* speed to run kgdb serial port */
 #define CONFIG_KGDB_SER_INDEX	2	/* which serial port to use */
 #endif
 
 /*
+ * Environment Configuration
+ */
+#define CONFIG_ENV_IS_IN_FLASH	1
+#define CONFIG_ENV_SECT_SIZE	0x20000 /* 128k (one sector) for env */
+#define CONFIG_ENV_SIZE		0x8000
+#define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE - (256 * 1024))
+
+/*
  * Flash memory map:
  * fff80000 - ffffffff	U-Boot (512 KB)
  * fff40000 - fff7ffff	U-Boot Environment (256 KB)
Signature · 1 line
1.6.2.1
#12 lore raw

PATCH 12/14 xpedite1k: Sync up board config options with other X-ES boards

In reply to Peter Tyser
---
 include/configs/XPEDITE1K.h |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)
include/configs/XPEDITE1K.h +19 -19
index 391d041..016fa8a 100644
@@ -62,6 +62,7 @@
 /*
  * Diagnostics
  */
+#define CONFIG_SYS_ALT_MEMTEST
 #define CONFIG_SYS_MEMTEST_START	0x0400000
 #define CONFIG_SYS_MEMTEST_END		0x0C00000
 
@@ -104,19 +105,25 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_SYS_POST_WORD_ADDR	(CONFIG_SYS_GBL_DATA_OFFSET - 0x4)
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_POST_WORD_ADDR
 
-#define CONFIG_SYS_MONITOR_LEN	(256 * 1024)	/* Reserve 256 kB for Mon */
-#define CONFIG_SYS_MALLOC_LEN	(128 * 1024)	/* Reserve 128 kB for malloc */
+#define CONFIG_SYS_MONITOR_LEN	(512 * 1024)	/* Reserve 512 KB for Mon */
+#define CONFIG_SYS_MALLOC_LEN	(1024 * 1024)	/* Reserved for malloc */
 
 /*
  * Serial Port
  */
 #define CONFIG_SYS_BAUDRATE_TABLE \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400}
-#define CONFIG_BAUDRATE			9600
+#define CONFIG_BAUDRATE			115200
 #define CONFIG_LOADS_ECHO		1	/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change */
 
 /*
+ * Use the HUSH parser
+ */
+#define CONFIG_SYS_HUSH_PARSER
+#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
+
+/*
  * NOR flash configuration
  */
 #define CONFIG_SYS_MAX_FLASH_BANKS	3
@@ -126,8 +133,6 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_SYS_FLASH_CFI
 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
 #define CONFIG_SYS_FLASH_QUIET_TEST		/* MirrorBit flashes are optional */
-
-#undef	CONFIG_SYS_FLASH_CHECKSUM
 #define CONFIG_SYS_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms) */
 #define CONFIG_SYS_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms) */
 
@@ -137,7 +142,7 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_HARD_I2C			1	/* I2C with hardware support */
 #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */
 #define CONFIG_SYS_I2C_SLAVE		0x7f
-#define CONFIG_SYS_I2C_NOPROBES	{0x55,0x56,0x57,0x58,0x59,0x5a,0x5b,0x5c,0x69}
+#define CONFIG_I2C_MULTI_BUS
 
 /* I2C EEPROM */
 #define CONFIG_SYS_I2C_EEPROM_ADDR		0x50
@@ -214,16 +219,19 @@ extern void out32(unsigned int, unsigned long);
 #define CONFIG_SYS_LONGHELP			/* undef to save memory */
 #define CONFIG_SYS_LOAD_ADDR	0x100000	/* default load address */
 #define CONFIG_SYS_PROMPT	"=> "		/* Monitor Command Prompt */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_SYS_CBSIZE	1024		/* Console I/O Buffer Size */
-#else
 #define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#endif
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
 #define CONFIG_SYS_MAXARGS	16		/* max number of command args */
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE	/* Boot Argument Buffer Size */
 #define CONFIG_SYS_HZ		1000		/* decrementer freq: 1 ms ticks */
-#define CONFIG_SYS_EXTBDINFO		1	/* To use extended board_into (bd_t) */
+#define CONFIG_CMDLINE_EDITING	1		/* Command-line editing */
+#define CONFIG_BOOTDELAY	3		/* -1 disables auto-boot */
+#define CONFIG_PANIC_HANG			/* do not reset board on panic */
+#define CONFIG_PREBOOT				/* enable preboot variable */
+#define CONFIG_FIT		1
+#define CONFIG_FIT_VERBOSE	1
+#define CONFIG_INTEGRITY			/* support booting INTEGRITY OS */
+#define CONFIG_SYS_EXTBDINFO	1		/* To use extended board_into (bd_t) */
 
 /*
  * For booting Linux, the board info and command line data
@@ -239,14 +247,6 @@ extern void out32(unsigned int, unsigned long);
 #define BOOTFLAG_WARM	0x02		/* Software reboot */
 
 /*
- * KGDB configuration
- */
-#if defined(CONFIG_CMD_KGDB)
-#define CONFIG_KGDB_BAUDRATE	230400	/* speed to run kgdb serial port */
-#define CONFIG_KGDB_SER_INDEX	2	/* which serial port to use */
-#endif
-
-/*
  * Environment Configuration
  */
 #define CONFIG_ENV_IS_IN_FLASH	1
Signature · 1 line
1.6.2.1
#13 lore raw

PATCH 13/14 xpedite1k: Sync checkboard() with other X-ES boards

In reply to Peter Tyser
---
 board/xpedite1k/xpedite1k.c |   15 ++++++++++++++-
 include/configs/XPEDITE1K.h |    1 +
 2 files changed, 15 insertions(+), 1 deletions(-)
board/xpedite1k/xpedite1k.c +14 -1
index 33d4ac8..6926c1c 100644
@@ -112,7 +112,20 @@ int board_early_init_f(void)
 
 int checkboard(void)
 {
-	printf("Board: XES XPedite1000 440GX\n");
+	char *s;
+
+	printf("Board: X-ES %s PMC SBC\n", CONFIG_SYS_BOARD_NAME);
+	printf("       ");
+	s = getenv("board_rev");
+	if (s)
+		printf("Rev %s, ", s);
+	s = getenv("serial#");
+	if (s)
+		printf("Serial# %s, ", s);
+	s = getenv("board_cfg");
+	if (s)
+		printf("Cfg %s", s);
+	printf("\n");
 
 	return 0;
 }
include/configs/XPEDITE1K.h +1 -0
index 016fa8a..bb6208c 100644
@@ -32,6 +32,7 @@
 
 /* High Level Configuration Options */
 #define CONFIG_XPEDITE1K	1		/* Board is XPedite 1000 */
+#define CONFIG_SYS_BOARD_NAME	"XPedite1000"
 #define CONFIG_4xx		1		/* ... PPC4xx family */
 #define CONFIG_440		1
 #define CONFIG_440GX		1		/* 440 GX */
Signature · 1 line
1.6.2.1
#14 lore raw

PATCH 14/14 xpedite1k: Move to X-ES vendor directory

In reply to Peter Tyser

The XPedite1000 is an X-ES product thus it can be put in board/xes along with other X-ES boards. Along with the move, the board was renamed to XPedite1000 from XPedite1K to fit X-ES's standard naming convention. Maintainership was also transfered to Peter Tyser.

---
 MAINTAINERS                                        |    2 +-
 MAKEALL                                            |    2 +-
 Makefile                                           |    4 ++--
 board/{xpedite1k => xes/xpedite1000}/Makefile      |    0
 board/{xpedite1k => xes/xpedite1000}/config.mk     |    0
 board/{xpedite1k => xes/xpedite1000}/init.S        |    0
 board/{xpedite1k => xes/xpedite1000}/u-boot.lds    |    2 +-
 .../xpedite1000}/u-boot.lds.debug                  |    2 +-
 .../xpedite1k.c => xes/xpedite1000/xpedite1000.c}  |    0
 include/configs/{XPEDITE1K.h => XPEDITE1000.h}     |    2 +-
 10 files changed, 7 insertions(+), 7 deletions(-)
 rename board/{xpedite1k => xes/xpedite1000}/Makefile (100%)
 rename board/{xpedite1k => xes/xpedite1000}/config.mk (100%)
 rename board/{xpedite1k => xes/xpedite1000}/init.S (100%)
 rename board/{xpedite1k => xes/xpedite1000}/u-boot.lds (98%)
 rename board/{xpedite1k => xes/xpedite1000}/u-boot.lds.debug (98%)
 rename board/{xpedite1k/xpedite1k.c => xes/xpedite1000/xpedite1000.c} (100%)
 rename include/configs/{XPEDITE1K.h => XPEDITE1000.h} (99%)
MAINTAINERS +1 -1
index 575a7ec..12a3e5d 100644
@@ -381,7 +381,6 @@ Travis Sawyer (travis.sawyer at sandburst.com>
 
 	KAREF		PPC440GX
 	METROBOX	PPC440GX
-	XPEDITE1K	PPC440GX
 
 Georg Schardt <[email protected]>
 
@@ -436,6 +435,7 @@ Rune Torgersen <[email protected]>
 
 Peter Tyser <[email protected]>
 
+	XPEDITE1000	PPC440GX
 	XPEDITE5170	MPC8640
 	XPEDITE5200	MPC8548
 	XPEDITE5370	MPC8572
MAKEALL +1 -1
index 020ff73..65a891f 100755
@@ -258,7 +258,7 @@ LIST_4xx="		\
 	WUH405		\
 	xilinx-ppc440-generic \
 	xilinx-ppc440-generic_flash \
-	XPEDITE1K	\
+	XPEDITE1000	\
 	yellowstone	\
 	yosemite	\
 	yucca		\
Makefile +2 -2
index 090e645..9b8554f 100644
@@ -1640,8 +1640,8 @@ xilinx-ppc440-generic_config: unconfig
 		>> $(obj)board/xilinx/ppc440-generic/config.tmp
 	@$(MKCONFIG) xilinx-ppc440-generic ppc ppc4xx ppc440-generic xilinx
 
-XPEDITE1K_config:	unconfig
-	@$(MKCONFIG) $(@:_config=) ppc ppc4xx xpedite1k
+XPEDITE1000_config:	unconfig
+	@$(MKCONFIG) $(@:_config=) ppc ppc4xx xpedite1000 xes
 
 yosemite_config \
 yellowstone_config: unconfig
board/xes/xpedite1000/Makefile renamed from board/xpedite1k/Makefile +0 -0
similarity index 100%
rename from board/xpedite1k/Makefile
rename to board/xes/xpedite1000/Makefile
board/xes/xpedite1000/config.mk renamed from board/xpedite1k/config.mk +0 -0
similarity index 100%
rename from board/xpedite1k/config.mk
rename to board/xes/xpedite1000/config.mk
board/xes/xpedite1000/init.S renamed from board/xpedite1k/init.S +0 -0
similarity index 100%
rename from board/xpedite1k/init.S
rename to board/xes/xpedite1000/init.S
board/xes/xpedite1000/u-boot.lds renamed from board/xpedite1k/u-boot.lds +1 -1
similarity index 98%
rename from board/xpedite1k/u-boot.lds
rename to board/xes/xpedite1000/u-boot.lds
index fc001b2..46b52fc 100644
@@ -66,7 +66,7 @@ SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
     cpu/ppc4xx/start.o	(.text)
-    board/xpedite1k/init.o	(.text)
+    board/xes/xpedite1000/init.o	(.text)
     cpu/ppc4xx/kgdb.o	(.text)
     cpu/ppc4xx/traps.o	(.text)
     cpu/ppc4xx/interrupts.o	(.text)
board/xes/xpedite1000/u-boot.lds.debug renamed from board/xpedite1k/u-boot.lds.debug +1 -1
similarity index 98%
rename from board/xpedite1k/u-boot.lds.debug
rename to board/xes/xpedite1000/u-boot.lds.debug
index 5824cd9..68cd72d 100644
@@ -56,7 +56,7 @@ SECTIONS
     /* the sector layout of our flash chips!	XXX FIXME XXX	*/
 
     cpu/ppc4xx/start.o	(.text)
-    board/xpedite1k/init.o (.text)
+    board/xes/xpedite1000/init.o (.text)
     cpu/ppc4xx/kgdb.o	(.text)
     cpu/ppc4xx/traps.o	(.text)
     cpu/ppc4xx/interrupts.o	(.text)
board/xes/xpedite1000/xpedite1000.c renamed from board/xpedite1k/xpedite1k.c +0 -0
similarity index 100%
rename from board/xpedite1k/xpedite1k.c
rename to board/xes/xpedite1000/xpedite1000.c
include/configs/XPEDITE1000.h renamed from include/configs/XPEDITE1K.h +1 -1
similarity index 99%
rename from include/configs/XPEDITE1K.h
rename to include/configs/XPEDITE1000.h
index bb6208c..658e947 100644
@@ -31,7 +31,7 @@
 #define __CONFIG_H
 
 /* High Level Configuration Options */
-#define CONFIG_XPEDITE1K	1		/* Board is XPedite 1000 */
+#define CONFIG_XPEDITE1000	1
 #define CONFIG_SYS_BOARD_NAME	"XPedite1000"
 #define CONFIG_4xx		1		/* ... PPC4xx family */
 #define CONFIG_440		1
Signature · 1 line
1.6.2.1
#15 lore raw

cover XPedite1K updates

In reply to Peter Tyser
Quoted 16 lines · On Saturday 18 July 2009 02:01:02 Peter Tyser wrote:

The XPedite1000 is a 440gx-based PMC made by X-ES. Support was added for XPedite100 to U-Boot > 5 years ago by Travis Sawyer (travis.sawyer at sandburst.com) independent of X-ES. Sandburst was bought out by Broadcom some time ago. I attempted to contact Travis at both his old Sandburst and Broadcom email addresses but neither account still exist.

We never sold any XPedite1000's to Sandburst, so I'm not quite sure how Travis initially got his hands on one (ebay?). In any case, now that other X-ES products are supported by U-Boot I thought it would make sense to sync up the XPedite1000 with other X-ES boards. In my opinion, these changes add some functionality and are generally an improvement. No one is currently using U-Boot on the XPedite1000 that I'm aware of so I hope the changes don't affect others in a negative way.

Quoted 2 lines

In any case, I was hoping to take over maintainership for the board, but was never able to get the OK from Travis. I hope this is OK...

It's ok with me.

Quoted 7 lines

Peter Tyser (14):
xpedite1k: Use standard CFI flash driver
xpedite1k: Remove CONFIG_SYS_DRAM_TEST support
xpedite1k: Remove support for fixed SDRAM configuration
xpedite1k: Remove support for reading MACs from EEPROM
xpedite1k: Cleanup coding style
xpedite1k: Add support for optional flashes

Quoted 8 lines

xpedite1k: Add support for additional GPIO pins
xpedite1k: Store environment in flash
xpedite1k: Disable unused ethernet port 1
xpedite1k: Sync up commands and environment with other X-ES boards
xpedite1k: Sync organization of board config with other X-ES boards
xpedite1k: Sync up board config options with other X-ES boards
xpedite1k: Sync checkboard() with other X-ES boards
xpedite1k: Move to X-ES vendor directory

All 14 patches applied to ppc4xx. Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================