[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[Gary Jennejohn]

Handle Stefan's comments.  This has the added benefit of making the
patch considerably smaller.

Signed-off-by: Gary Jennejohn <garyj@denx.de>
---
 MAINTAINERS                 |    4 +
 MAKEALL                     |    1 +
 Makefile                    |    3 +
 board/quad100hd/Makefile    |   51 ++++++++
 board/quad100hd/config.mk   |   24 ++++
 board/quad100hd/nand.c      |   79 +++++++++++
 board/quad100hd/quad100hd.c |   93 +++++++++++++
 board/quad100hd/u-boot.lds  |  133 +++++++++++++++++++
 include/configs/quad100hd.h |  299 +++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 687 insertions(+), 0 deletions(-)
 create mode 100644 board/quad100hd/Makefile
 create mode 100644 board/quad100hd/config.mk
 create mode 100644 board/quad100hd/nand.c
 create mode 100644 board/quad100hd/quad100hd.c
 create mode 100644 board/quad100hd/u-boot.lds
 create mode 100644 include/configs/quad100hd.h

diff --git a/MAINTAINERS b/MAINTAINERS
index d1782b4..3af55a3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -204,6 +204,10 @@ Klaus Heydeck <heydeck@kieback-peter.de>
 	KUP4K			MPC855
 	KUP4X			MPC859
 
+Gary Jennejohn <garyj@denx.de>
+
+	quad100hd		PPC405EP
+
 Murray Jensen <Murray.Jensen@csiro.au>
 
 	cogent_mpc8xx		MPC8xx
diff --git a/MAKEALL b/MAKEALL
index 38911ed..471f6f7 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -218,6 +218,7 @@ LIST_4xx="		\
 	PMC405		\
 	PMC440		\
 	PPChameleonEVB	\
+	quad100hd	\
 	rainier		\
 	sbc405		\
 	sc3		\
diff --git a/Makefile b/Makefile
index 86e44d0..f49f114 100644
--- a/Makefile
+++ b/Makefile
@@ -1381,6 +1381,9 @@ PPChameleonEVB_HI_33_config:	unconfig
 		}
 	@$(MKCONFIG) -a $(call xtract_4xx,$@) ppc ppc4xx PPChameleonEVB dave
 
+quad100hd_config:	unconfig
+	@$(MKCONFIG) $(@:_config=) ppc ppc4xx quad100hd
+
 sbc405_config:	unconfig
 	@$(MKCONFIG) $(@:_config=) ppc ppc4xx sbc405
 
diff --git a/board/quad100hd/Makefile b/board/quad100hd/Makefile
new file mode 100644
index 0000000..252ad5a
--- /dev/null
+++ b/board/quad100hd/Makefile
@@ -0,0 +1,51 @@
+#
+# (C) Copyright 2007
+# Stefan Roese, DENX Software Engineering, sr at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).a
+
+COBJS	= $(BOARD).o nand.o
+SOBJS   =
+
+SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+SOBJS	:= $(addprefix $(obj),$(SOBJS))
+
+$(LIB):	$(OBJS) $(SOBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
+
+clean:
+	rm -f $(SOBJS) $(OBJS)
+
+distclean:	clean
+	rm -f $(LIB) core *.bak .depend
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/quad100hd/config.mk b/board/quad100hd/config.mk
new file mode 100644
index 0000000..71c0476
--- /dev/null
+++ b/board/quad100hd/config.mk
@@ -0,0 +1,24 @@
+#
+# (C) Copyright 2000
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+TEXT_BASE = 0xFFF80000
diff --git a/board/quad100hd/nand.c b/board/quad100hd/nand.c
new file mode 100644
index 0000000..86d5cc3
--- /dev/null
+++ b/board/quad100hd/nand.c
@@ -0,0 +1,79 @@
+/*
+ * (C) Copyright 2008
+ * Gary Jennejohn, DENX Software Engineering GmbH, garyj at denx.de
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <config.h>
+#if defined(CONFIG_CMD_NAND)
+#include <asm/gpio.h>
+#include <nand.h>
+
+/* 
+ *	hardware specific access to control-lines
+ */
+static void quad100hd_hwcontrol(struct mtd_info *mtd, int cmd)
+{
+	switch(cmd) {
+	case NAND_CTL_SETCLE:
+		gpio_write_bit(CFG_NAND_CLE, 1);
+		break;
+	case NAND_CTL_CLRCLE:
+		gpio_write_bit(CFG_NAND_CLE, 0);
+		break;
+
+	case NAND_CTL_SETALE:
+		gpio_write_bit(CFG_NAND_ALE, 1);
+		break;
+	case NAND_CTL_CLRALE:
+		gpio_write_bit(CFG_NAND_ALE, 0);
+		break;
+
+	case NAND_CTL_SETNCE:
+		gpio_write_bit(CFG_NAND_CE, 0);
+		break;
+	case NAND_CTL_CLRNCE:
+		gpio_write_bit(CFG_NAND_CE, 1);
+		break;
+	}
+}
+
+static int quad100hd_nand_ready(struct mtd_info *mtd)
+{
+	return gpio_read_in_bit(CFG_NAND_RDY);
+}
+
+/*
+ * Main initialization routine
+ */
+int board_nand_init(struct nand_chip *nand)
+{
+	/* Set address of hardware control function */
+	nand->hwcontrol = quad100hd_hwcontrol;
+	nand->dev_ready = quad100hd_nand_ready;
+	nand->eccmode = NAND_ECC_SOFT;
+	/* 15 us command delay time */
+	nand->chip_delay =  20;
+
+	/* Return happy */
+	return 0;
+}
+#endif /* CONFIG_CMD_NAND */
diff --git a/board/quad100hd/quad100hd.c b/board/quad100hd/quad100hd.c
new file mode 100644
index 0000000..52cceee
--- /dev/null
+++ b/board/quad100hd/quad100hd.c
@@ -0,0 +1,93 @@
+/*
+ * (C) Copyright 2008
+ * Gary Jennejohn, DENX Software Engineering GmbH, garyj at denx.de.
+ *
+ * Based in part on board/icecube/icecube.c from PPCBoot
+ * (C) Copyright 2003 Intrinsyc Software
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <command.h>
+#include <malloc.h>
+#include <environment.h>
+#include <logbuff.h>
+#include <post.h>
+
+#include <asm/processor.h>
+#include <asm/io.h>
+#include <asm/gpio.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int board_early_init_f(void)
+{
+	/* taken from PPCBoot */
+	mtdcr(uicsr, 0xFFFFFFFF);	/* clear all ints */
+	mtdcr(uicer, 0x00000000);	/* disable all ints */
+	mtdcr(uiccr, 0x00000000);
+	mtdcr(uicpr, 0xFFFF7FFE);	/* set int polarities */
+	mtdcr(uictr, 0x00000000);	/* set int trigger levels */
+	mtdcr(uicsr, 0xFFFFFFFF);	/* clear all ints */
+	mtdcr(uicvcr, 0x00000001);	/* set vect base=0,INT0 highest priority */
+
+    	mtdcr (CPC0_SRR, 0x00040000);   /* Hold PCI bridge in reset */
+
+	return 0;
+}
+
+/*
+ * Check Board Identity:
+ */
+int checkboard(void)
+{
+	char *s = getenv("serial#");
+#ifdef DISPLAY_BOARD_INFO
+	sys_info_t sysinfo;
+#endif
+
+	puts("Board: Quad100hd");
+
+	if (s != NULL) {
+		puts(", serial# ");
+		puts(s);
+	}
+	putc('\n');
+
+#ifdef DISPLAY_BOARD_INFO
+	/* taken from ppcboot */
+	get_sys_info (&sysinfo);
+
+	printf("\tVCO: %lu MHz\n", sysinfo.freqVCOMhz);
+	printf("\tCPU: %lu MHz\n", sysinfo.freqProcessor / 1000000);
+	printf("\tPLB: %lu MHz\n", sysinfo.freqPLB / 1000000);
+	printf("\tOPB: %lu MHz\n", sysinfo.freqOPB / 1000000);
+	printf("\tEPB: %lu MHz\n", sysinfo.freqPLB / (sysinfo.pllExtBusDiv *
+		1000000));
+	printf ("\tPCI: %lu MHz\n", sysinfo.freqPCI / 1000000);
+#endif
+
+	return (0);
+}
+
+long int initdram(int board_type)
+{
+	return (CFG_SDRAM_SIZE);
+}
diff --git a/board/quad100hd/u-boot.lds b/board/quad100hd/u-boot.lds
new file mode 100644
index 0000000..195d91b
--- /dev/null
+++ b/board/quad100hd/u-boot.lds
@@ -0,0 +1,133 @@
+/*
+ * (C) Copyright 2000
+ * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+OUTPUT_ARCH(powerpc)
+SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib);
+/* Do we need any of these for elf?
+   __DYNAMIC = 0;    */
+SECTIONS
+{
+  .resetvec 0xFFFFFFFC :
+  {
+    *(.resetvec)
+  } = 0xffff
+
+  /* Read-only sections, merged into text segment: */
+  . = + SIZEOF_HEADERS;
+  .interp : { *(.interp) }
+  .hash          : { *(.hash)		}
+  .dynsym        : { *(.dynsym)		}
+  .dynstr        : { *(.dynstr)		}
+  .rel.text      : { *(.rel.text)		}
+  .rela.text     : { *(.rela.text) 	}
+  .rel.data      : { *(.rel.data)		}
+  .rela.data     : { *(.rela.data) 	}
+  .rel.rodata    : { *(.rel.rodata) 	}
+  .rela.rodata   : { *(.rela.rodata) 	}
+  .rel.got       : { *(.rel.got)		}
+  .rela.got      : { *(.rela.got)		}
+  .rel.ctors     : { *(.rel.ctors)	}
+  .rela.ctors    : { *(.rela.ctors)	}
+  .rel.dtors     : { *(.rel.dtors)	}
+  .rela.dtors    : { *(.rela.dtors)	}
+  .rel.bss       : { *(.rel.bss)		}
+  .rela.bss      : { *(.rela.bss)		}
+  .rel.plt       : { *(.rel.plt)		}
+  .rela.plt      : { *(.rela.plt)		}
+  .init          : { *(.init)	}
+  .plt : { *(.plt) }
+  .text      :
+  {
+    cpu/ppc4xx/start.o	(.text)
+
+    *(.text)
+    *(.fixup)
+    *(.got1)
+  }
+  _etext = .;
+  PROVIDE (etext = .);
+  .rodata    :
+  {
+    *(.rodata)
+    *(.rodata1)
+    *(.rodata.str1.4)
+  }
+  .fini      : { *(.fini)    } =0
+  .ctors     : { *(.ctors)   }
+  .dtors     : { *(.dtors)   }
+
+  /* Read-write section, merged into data segment: */
+  . = (. + 0x00FF) & 0xFFFFFF00;
+  _erotext = .;
+  PROVIDE (erotext = .);
+  .reloc   :
+  {
+    *(.got)
+    _GOT2_TABLE_ = .;
+    *(.got2)
+    _FIXUP_TABLE_ = .;
+    *(.fixup)
+  }
+  __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2;
+  __fixup_entries = (. - _FIXUP_TABLE_)>>2;
+
+  .data    :
+  {
+    *(.data)
+    *(.data1)
+    *(.sdata)
+    *(.sdata2)
+    *(.dynamic)
+    CONSTRUCTORS
+  }
+  _edata  =  .;
+  PROVIDE (edata = .);
+
+  . = .;
+  __u_boot_cmd_start = .;
+  .u_boot_cmd : { *(.u_boot_cmd) }
+  __u_boot_cmd_end = .;
+
+  . = .;
+  __start___ex_table = .;
+  __ex_table : { *(__ex_table) }
+  __stop___ex_table = .;
+
+  . = ALIGN(256);
+  __init_begin = .;
+  .text.init : { *(.text.init) }
+  .data.init : { *(.data.init) }
+  . = ALIGN(256);
+  __init_end = .;
+
+  __bss_start = .;
+  .bss (NOLOAD)       :
+  {
+   *(.sbss) *(.scommon)
+   *(.dynbss)
+   *(.bss)
+   *(COMMON)
+  }
+  _end = . ;
+  PROVIDE (end = .);
+}
diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
new file mode 100644
index 0000000..89504fd
--- /dev/null
+++ b/include/configs/quad100hd.h
@@ -0,0 +1,299 @@
+/*
+ * (C) Copyright 2008
+ * Gary Jennejohn, DENX Software Engineering GmbH, garyj at denx.de.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/************************************************************************
+ * quad100hd.h - configuration for Quad100hd board
+ ***********************************************************************/
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+/*-----------------------------------------------------------------------
+ * High Level Configuration Options
+ *----------------------------------------------------------------------*/
+#define CONFIG_QUAD100HD	1		/* Board is Quad100hd	*/
+#define CONFIG_4xx		1		/* ... PPC4xx family	*/
+#define CONFIG_405EP		1		/* Specifc 405EP support*/
+
+#define CONFIG_SYS_CLK_FREQ     33333333 /* external frequency to pll   */
+
+#define CONFIG_BOARD_EARLY_INIT_F 1		/* Call board_early_init_f */
+
+#define PLLMR0_DEFAULT		PLLMR0_266_133_66 /* no PCI */
+#define PLLMR1_DEFAULT		PLLMR1_266_133_66 /* no PCI */
+
+#define CFG_ENV_IS_IN_EEPROM    1   /* use the EEPROM for environment vars */
+
+#define CONFIG_OVERWRITE_ETHADDR_ONCE	1
+
+#define CONFIG_NET_MULTI	1
+#define CONFIG_HAS_ETH1		1
+#define CONFIG_MII		1	/* MII PHY management		*/
+#define CONFIG_PHY_ADDR		0x01	/* PHY address			*/
+#define CFG_RX_ETH_BUFFER	16	/* Number of ethernet rx buffers & descriptors */
+#define CONFIG_PHY_RESET	1
+#define CONFIG_PHY_RESET_DELAY	300	/* PHY RESET recovery delay	*/
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#undef CONFIG_CMD_ASKENV
+#undef CONFIG_CMD_CACHE
+#define CONFIG_CMD_DHCP
+#undef CONFIG_CMD_DIAG
+#define CONFIG_CMD_EEPROM
+#undef CONFIG_CMD_ELF
+#define CONFIG_CMD_I2C
+#undef CONFIG_CMD_IRQ
+#define CONFIG_CMD_JFFS2
+#undef CONFIG_CMD_LOG
+#undef CONFIG_CMD_MII
+#define CONFIG_CMD_NAND
+#undef CONFIG_CMD_PING
+#define CONFIG_CMD_REGINFO
+
+#undef CONFIG_WATCHDOG			/* watchdog disabled		*/
+
+/*-----------------------------------------------------------------------
+ * SDRAM
+ *----------------------------------------------------------------------*/
+/*
+ * SDRAM configuration (please see cpu/ppc/sdram.[ch])
+ */
+#define CONFIG_SDRAM_BANK0  1
+#define CFG_SDRAM_SIZE      0x02000000      /* 32 MB */
+
+/* FIX! SDRAM timings used in datasheet */
+#define CFG_SDRAM_CL            3       /* CAS latency */
+#define CFG_SDRAM_tRP           20      /* PRECHARGE command period */
+#define CFG_SDRAM_tRC           66      /* ACTIVE-to-ACTIVE command period */
+#define CFG_SDRAM_tRCD          20      /* ACTIVE-to-READ delay */
+#define CFG_SDRAM_tRFC          66      /* Auto refresh period */
+
+/* 
+ * JFFS2
+ */
+#define CFG_JFFS2_FIRST_BANK    0
+#ifdef  CFG_KERNEL_IN_JFFS2
+#define CFG_JFFS2_FIRST_SECTOR  0   /* JFFS starts at block 0 */
+#else /* kernel not in JFFS */
+#define CFG_JFFS2_FIRST_SECTOR  8   /* block 0-7 is kernel (1MB = 8 sectors) */
+#endif
+#define CFG_JFFS2_NUM_BANKS     1
+
+/*-----------------------------------------------------------------------
+ * Serial Port
+ *----------------------------------------------------------------------*/
+#undef	CFG_EXT_SERIAL_CLOCK			/* external serial clock */
+#define CFG_BASE_BAUD		691200
+#define CONFIG_BAUDRATE		115200
+#define CONFIG_SERIAL_MULTI
+
+/* The following table includes the supported baudrates */
+#define CFG_BAUDRATE_TABLE	\
+	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
+
+/*-----------------------------------------------------------------------
+ * Miscellaneous configurable options
+ *----------------------------------------------------------------------*/
+#define CFG_LONGHELP			/* undef to save memory		*/
+#define CFG_PROMPT	        "=> "	/* Monitor Command Prompt	*/
+#if defined(CONFIG_CMD_KGDB)
+#define CFG_CBSIZE	        1024	/* Console I/O Buffer Size	*/
+#else
+#define CFG_CBSIZE	        256	/* Console I/O Buffer Size	*/
+#endif
+#define CFG_PBSIZE              (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
+#define CFG_MAXARGS	        16	/* max number of command args	*/
+#define CFG_BARGSIZE	        CFG_CBSIZE /* Boot Argument Buffer Size	*/
+
+#define CFG_MEMTEST_START	0x0400000 /* memtest works on		*/
+#define CFG_MEMTEST_END		0x0C00000 /* 4 ... 12 MB in DRAM	*/
+
+#define CFG_LOAD_ADDR		0x100000  /* default load address	*/
+#define CFG_EXTBDINFO		1	/* To use extended board_info (bd_t) */
+
+#define CFG_HZ		        1000	/* decrementer freq: 1 ms ticks	*/
+
+#define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/
+#define CFG_LOADS_BAUD_CHANGE	1	/* allow baudrate change	*/
+
+#define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
+#define CONFIG_LOOPW            1       /* enable loopw command         */
+#define CONFIG_MX_CYCLIC        1       /* enable mdc/mwc commands      */
+#define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0 */
+#define CONFIG_VERSION_VARIABLE 1	/* include version env variable */
+
+/*-----------------------------------------------------------------------
+ * I2C
+ *----------------------------------------------------------------------*/
+#define CONFIG_HARD_I2C		1		/* I2C with hardware support	*/
+#undef	CONFIG_SOFT_I2C				/* I2C bit-banged		*/
+#define CFG_I2C_SPEED		400000		/* I2C speed and slave address	*/
+#define CFG_I2C_SLAVE		0x7F
+
+#define CFG_I2C_EEPROM_ADDR	0x50		/* base address */
+#define CFG_I2C_EEPROM_ADDR_LEN	2		/* bytes of address */
+
+#define CFG_EEPROM_PAGE_WRITE_BITS	5	/* 8 byte write page size */
+#define CFG_EEPROM_PAGE_WRITE_DELAY_MS	10	/* and takes up to 10 msec */
+#define CFG_EEPROM_SIZE			0x2000	
+
+/*-----------------------------------------------------------------------
+ * Start addresses for the final memory configuration
+ * (Set up by the startup code)
+ * Please note that CFG_SDRAM_BASE _must_ start at 0
+ */
+#define CFG_SDRAM_BASE		0x00000000
+#define CFG_FLASH_BASE		0xFFC00000
+#define CFG_MONITOR_LEN		(256 * 1024)	/* Reserve 256 kB for Monitor	*/
+#define CFG_MALLOC_LEN		(128 * 1024)	/* Reserve 128 kB for malloc()	*/
+#define CFG_MONITOR_BASE	0xFFF80000
+
+/*
+ * For booting Linux, the board info and command line data
+ * have to be in the first 8 MB of memory, since this is
+ * the maximum mapped by the Linux kernel during initialization.
+ */
+#define CFG_BOOTMAPSZ		(8 << 20)	/* Initial Memory map for Linux */
+
+/*-----------------------------------------------------------------------
+ * FLASH organization
+ */
+#define CFG_FLASH_CFI			/* The flash is CFI compatible	*/
+#define	CFG_FLASH_CFI_DRIVER
+
+#define CFG_FLASH_BANKS_LIST	{ CFG_FLASH_BASE }
+
+#define CFG_MAX_FLASH_BANKS	1	/* max number of memory banks	*/
+#define CFG_MAX_FLASH_SECT	128	/* max number of sectors on one chip */
+#define CFG_FLASH_WORD_SIZE	unsigned short
+#define CFG_FLASH_ADDR0		0x0555
+#define CFG_FLASH_ADDR1		0x02aa
+#define FLASH_BASE0_PRELIM	CFG_FLASH_BASE	/* FLASH bank #0	*/
+
+#define CFG_FLASH_ERASE_TOUT	120000	/* Timeout for Flash Erase (in ms) */
+#define CFG_FLASH_WRITE_TOUT	500	/* Timeout for Flash Write (in ms) */
+
+#define CFG_FLASH_USE_BUFFER_WRITE 1	/* use buffered writes (20x faster) */
+#define CFG_FLASH_INCREMENT      0       /* there is only one bank         */
+
+#define CFG_FLASH_EMPTY_INFO		/* print 'E' for empty sector on flinfo */
+#define CFG_FLASH_QUIET_TEST	1	/* don't warn upon unknown flash */
+
+#ifdef CFG_ENV_IS_IN_FLASH
+#define CFG_ENV_SECT_SIZE	0x10000	/* size of one complete sector	*/
+#define	CFG_ENV_SIZE		0x10000	/* Total Size of Environment Sector */
+#define CFG_ENV_OFFSET		0x00050000 /* Offset of Environment Sector  */
+#define CFG_ENV_ADDR		(CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#endif
+
+#ifdef CFG_ENV_IS_IN_EEPROM
+#define CFG_ENV_SIZE		0x400		/* Size of Environment vars */
+#define CFG_ENV_OFFSET		0x00000000
+#define CFG_ENABLE_CRC_16	1       /* Intrinsyc formatting used crc16 */
+#endif
+
+/* partly from PPCBoot */
+/* NAND */
+#define CONFIG_NAND
+#ifdef CONFIG_NAND
+#define CFG_NAND_BASE   0x60000000
+#define CFG_NAND_CS	10   /* our CS is GPIO10 */
+#define CFG_NAND_RDY	23   /* our RDY is GPIO23 */
+#define CFG_NAND_CE	24   /* our CE is GPIO24  */
+#define CFG_NAND_CLE	31   /* our CLE is GPIO31 */
+#define CFG_NAND_ALE	30   /* our ALE is GPIO30 */
+#define NAND_MAX_CHIPS	1
+#define CFG_MAX_NAND_DEVICE	1
+#endif
+
+/*-----------------------------------------------------------------------
+ * Definitions for initial stack pointer and data area (in data cache)
+ */
+/* use on chip memory (OCM) for temperary stack until sdram is tested */
+/* see ./cpu/ppc4xx/start.S */
+#define CFG_TEMP_STACK_OCM	1
+
+/* On Chip Memory location */
+#define CFG_OCM_DATA_ADDR	0xF8000000
+#define CFG_OCM_DATA_SIZE	0x1000
+#define CFG_INIT_RAM_ADDR	CFG_OCM_DATA_ADDR /* inside of OCM		*/
+#define CFG_INIT_RAM_END	CFG_OCM_DATA_SIZE /* End of used area in RAM	*/
+
+#define CFG_GBL_DATA_SIZE	128  /* size in bytes reserved for initial data */
+#define CFG_GBL_DATA_OFFSET	(CFG_INIT_RAM_END - CFG_GBL_DATA_SIZE)
+#define CFG_INIT_SP_OFFSET      CFG_GBL_DATA_OFFSET
+
+/*-----------------------------------------------------------------------
+ * External Bus Controller (EBC) Setup
+ * Taken from PPCBoot board/icecube/icecube.h
+ */
+
+/* see ./cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/ndfc.c */
+#define CFG_EBC_PB0AP		0x04002480
+/* AMD NOR flash - this corresponds to FLASH_BASE so may be correct */
+#define CFG_EBC_PB0CR		0xFFC5A000
+#define CFG_EBC_PB1AP           0x04005480
+#define CFG_EBC_PB1CR           0x60018000
+#define CFG_EBC_PB2AP           0x00000000
+#define CFG_EBC_PB2CR           0x00000000
+#define CFG_EBC_PB3AP           0x00000000
+#define CFG_EBC_PB3CR           0x00000000
+#define CFG_EBC_PB4AP           0x00000000
+#define CFG_EBC_PB4CR           0x00000000
+
+/*-----------------------------------------------------------------------
+ * Definitions for GPIO setup (PPC405EP specific)
+ *
+ * Taken in part from PPCBoot board/icecube/icecube.h
+ */
+/* see ./cpu/ppc4xx/cpu_init.c ./cpu/ppc4xx/start.S */
+#define CFG_GPIO0_OSRH		0x55555550
+#define CFG_GPIO0_OSRL		0x00000110
+#define CFG_GPIO0_ISR1H		0x00000000
+#define CFG_GPIO0_ISR1L		0x15555445
+#define CFG_GPIO0_TSRH		0x00000000
+#define CFG_GPIO0_TSRL		0x00000000
+#define CFG_GPIO0_TCR		0xFFFF8097
+#define CFG_GPIO0_ODR		0x00000000
+
+#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 VARS */
+
+#define CONFIG_IPADDR		192.168.1.67
+#define CONFIG_SERVERIP		192.168.1.50
+#define CONFIG_GATEWAYIP	192.168.1.1
+#define CONFIG_NETMASK		255.255.255.0
+#define CONFIG_LOADADDR		300000
+#define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
+
+/* pass open firmware flat tree */
+#define CONFIG_OF_LIBFDT	1
+
+#endif	/* __CONFIG_H */
-- 
1.5.5


---
Gary Jennejohn
*********************************************************************
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@denx.de
*********************************************************************

[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[Stefan Roese]

Hi Gary,

On Friday 25 April 2008, Gary Jennejohn wrote:
> Handle Stefan's comments.  This has the added benefit of making the
> patch considerably smaller.

Looks much better now. Just some minor issues (nitpicking) left. See comments 
below.

> diff --git a/board/quad100hd/quad100hd.c b/board/quad100hd/quad100hd.c
> new file mode 100644
> index 0000000..52cceee
> --- /dev/null
> +++ b/board/quad100hd/quad100hd.c
> @@ -0,0 +1,93 @@
> +/*
> + * (C) Copyright 2008
> + * Gary Jennejohn, DENX Software Engineering GmbH, garyj at denx.de.
> + *
> + * Based in part on board/icecube/icecube.c from PPCBoot
> + * (C) Copyright 2003 Intrinsyc Software
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +#include <common.h>
> +#include <command.h>
> +#include <malloc.h>
> +#include <environment.h>
> +#include <logbuff.h>
> +#include <post.h>
> +
> +#include <asm/processor.h>
> +#include <asm/io.h>
> +#include <asm/gpio.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +int board_early_init_f(void)
> +{
> +	/* taken from PPCBoot */
> +	mtdcr(uicsr, 0xFFFFFFFF);	/* clear all ints */
> +	mtdcr(uicer, 0x00000000);	/* disable all ints */
> +	mtdcr(uiccr, 0x00000000);
> +	mtdcr(uicpr, 0xFFFF7FFE);	/* set int polarities */
> +	mtdcr(uictr, 0x00000000);	/* set int trigger levels */
> +	mtdcr(uicsr, 0xFFFFFFFF);	/* clear all ints */
> +	mtdcr(uicvcr, 0x00000001);	/* set vect base=0,INT0 highest priority */
> +
> +    	mtdcr (CPC0_SRR, 0x00040000);   /* Hold PCI bridge in reset */

Please use only one coding style in one file. So either:

	func();

or

	func ();

Since this file mostly consists of the func() style I suggest you switch to 
this one completely.

> +	return 0;
> +}
> +
> +/*
> + * Check Board Identity:
> + */
> +int checkboard(void)
> +{
> +	char *s = getenv("serial#");
> +#ifdef DISPLAY_BOARD_INFO
> +	sys_info_t sysinfo;
> +#endif
> +
> +	puts("Board: Quad100hd");
> +
> +	if (s != NULL) {
> +		puts(", serial# ");
> +		puts(s);
> +	}
> +	putc('\n');
> +
> +#ifdef DISPLAY_BOARD_INFO
> +	/* taken from ppcboot */
> +	get_sys_info (&sysinfo);

Again.

> +	printf("\tVCO: %lu MHz\n", sysinfo.freqVCOMhz);
> +	printf("\tCPU: %lu MHz\n", sysinfo.freqProcessor / 1000000);
> +	printf("\tPLB: %lu MHz\n", sysinfo.freqPLB / 1000000);
> +	printf("\tOPB: %lu MHz\n", sysinfo.freqOPB / 1000000);
> +	printf("\tEPB: %lu MHz\n", sysinfo.freqPLB / (sysinfo.pllExtBusDiv *
> +		1000000));
> +	printf ("\tPCI: %lu MHz\n", sysinfo.freqPCI / 1000000);

Again.

> +#endif
> +
> +	return (0);
> +}
> +
> +long int initdram(int board_type)
> +{
> +	return (CFG_SDRAM_SIZE);
> +}

<snip>

> diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h
> new file mode 100644
> index 0000000..89504fd
> --- /dev/null
> +++ b/include/configs/quad100hd.h
> @@ -0,0 +1,299 @@
> +/*
> + * (C) Copyright 2008
> + * Gary Jennejohn, DENX Software Engineering GmbH, garyj at denx.de.
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +/************************************************************************
> + * quad100hd.h - configuration for Quad100hd board
> + ***********************************************************************/
> +#ifndef __CONFIG_H
> +#define __CONFIG_H
> +
> +/*-----------------------------------------------------------------------
> + * High Level Configuration Options
> + *----------------------------------------------------------------------*/
> +#define CONFIG_QUAD100HD	1		/* Board is Quad100hd	*/
> +#define CONFIG_4xx		1		/* ... PPC4xx family	*/
> +#define CONFIG_405EP		1		/* Specifc 405EP support*/
> +
> +#define CONFIG_SYS_CLK_FREQ     33333333 /* external frequency to pll   */
> +
> +#define CONFIG_BOARD_EARLY_INIT_F 1		/* Call board_early_init_f */
> +
> +#define PLLMR0_DEFAULT		PLLMR0_266_133_66 /* no PCI */
> +#define PLLMR1_DEFAULT		PLLMR1_266_133_66 /* no PCI */
> +
> +#define CFG_ENV_IS_IN_EEPROM    1   /* use the EEPROM for environment vars
> */ +
> +#define CONFIG_OVERWRITE_ETHADDR_ONCE	1

After you removed the default MAC addresses, I suggest that you remove this 
define too.

> +#define CONFIG_NET_MULTI	1
> +#define CONFIG_HAS_ETH1		1
> +#define CONFIG_MII		1	/* MII PHY management		*/
> +#define CONFIG_PHY_ADDR		0x01	/* PHY address			*/
> +#define CFG_RX_ETH_BUFFER	16	/* Number of ethernet rx buffers &
> descriptors */ +#define CONFIG_PHY_RESET	1
> +#define CONFIG_PHY_RESET_DELAY	300	/* PHY RESET recovery delay	*/
> +
> +/*
> + * Command line configuration.
> + */
> +#include <config_cmd_default.h>
> +
> +#undef CONFIG_CMD_ASKENV
> +#undef CONFIG_CMD_CACHE
> +#define CONFIG_CMD_DHCP
> +#undef CONFIG_CMD_DIAG
> +#define CONFIG_CMD_EEPROM
> +#undef CONFIG_CMD_ELF
> +#define CONFIG_CMD_I2C
> +#undef CONFIG_CMD_IRQ
> +#define CONFIG_CMD_JFFS2
> +#undef CONFIG_CMD_LOG
> +#undef CONFIG_CMD_MII
> +#define CONFIG_CMD_NAND
> +#undef CONFIG_CMD_PING
> +#define CONFIG_CMD_REGINFO
> +
> +#undef CONFIG_WATCHDOG			/* watchdog disabled		*/
> +
> +/*-----------------------------------------------------------------------
> + * SDRAM
> + *----------------------------------------------------------------------*/
> +/*
> + * SDRAM configuration (please see cpu/ppc/sdram.[ch])
> + */
> +#define CONFIG_SDRAM_BANK0  1
> +#define CFG_SDRAM_SIZE      0x02000000      /* 32 MB */
> +
> +/* FIX! SDRAM timings used in datasheet */
> +#define CFG_SDRAM_CL            3       /* CAS latency */
> +#define CFG_SDRAM_tRP           20      /* PRECHARGE command period */
> +#define CFG_SDRAM_tRC           66      /* ACTIVE-to-ACTIVE command period
> */ +#define CFG_SDRAM_tRCD          20      /* ACTIVE-to-READ delay */
> +#define CFG_SDRAM_tRFC          66      /* Auto refresh period */ +
> +/*
> + * JFFS2
> + */
> +#define CFG_JFFS2_FIRST_BANK    0
> +#ifdef  CFG_KERNEL_IN_JFFS2
> +#define CFG_JFFS2_FIRST_SECTOR  0   /* JFFS starts at block 0 */
> +#else /* kernel not in JFFS */
> +#define CFG_JFFS2_FIRST_SECTOR  8   /* block 0-7 is kernel (1MB = 8
> sectors) */ +#endif
> +#define CFG_JFFS2_NUM_BANKS     1
> +
> +/*-----------------------------------------------------------------------
> + * Serial Port
> + *----------------------------------------------------------------------*/
> +#undef	CFG_EXT_SERIAL_CLOCK			/* external serial clock */
> +#define CFG_BASE_BAUD		691200
> +#define CONFIG_BAUDRATE		115200
> +#define CONFIG_SERIAL_MULTI
> +
> +/* The following table includes the supported baudrates */
> +#define CFG_BAUDRATE_TABLE	\
> +	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
> +
> +/*-----------------------------------------------------------------------
> + * Miscellaneous configurable options
> + *----------------------------------------------------------------------*/
> +#define CFG_LONGHELP			/* undef to save memory		*/
> +#define CFG_PROMPT	        "=> "	/* Monitor Command Prompt	*/
> +#if defined(CONFIG_CMD_KGDB)
> +#define CFG_CBSIZE	        1024	/* Console I/O Buffer Size	*/
> +#else
> +#define CFG_CBSIZE	        256	/* Console I/O Buffer Size	*/
> +#endif
> +#define CFG_PBSIZE              (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /*
> Print Buffer Size */ +#define CFG_MAXARGS	        16	/* max number of
> command args	*/
> +#define CFG_BARGSIZE	        CFG_CBSIZE /* Boot Argument Buffer Size	*/
> +
> +#define CFG_MEMTEST_START	0x0400000 /* memtest works on		*/
> +#define CFG_MEMTEST_END		0x0C00000 /* 4 ... 12 MB in DRAM	*/
> +
> +#define CFG_LOAD_ADDR		0x100000  /* default load address	*/
> +#define CFG_EXTBDINFO		1	/* To use extended board_info (bd_t) */
> +
> +#define CFG_HZ		        1000	/* decrementer freq: 1 ms ticks	*/
> +
> +#define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/
> +#define CFG_LOADS_BAUD_CHANGE	1	/* allow baudrate change	*/
> +
> +#define CONFIG_CMDLINE_EDITING	1	/* add command line history	*/
> +#define CONFIG_LOOPW            1       /* enable loopw command         */
> +#define CONFIG_MX_CYCLIC        1       /* enable mdc/mwc commands      */
> +#define CONFIG_ZERO_BOOTDELAY_CHECK	/* check for keypress on bootdelay==0
> */ +#define CONFIG_VERSION_VARIABLE 1	/* include version env variable */ +
> +/*-----------------------------------------------------------------------
> + * I2C
> + *----------------------------------------------------------------------*/
> +#define CONFIG_HARD_I2C		1		/* I2C with hardware support	*/
> +#undef	CONFIG_SOFT_I2C				/* I2C bit-banged		*/
> +#define CFG_I2C_SPEED		400000		/* I2C speed and slave address	*/
> +#define CFG_I2C_SLAVE		0x7F
> +
> +#define CFG_I2C_EEPROM_ADDR	0x50		/* base address */
> +#define CFG_I2C_EEPROM_ADDR_LEN	2		/* bytes of address */
> +
> +#define CFG_EEPROM_PAGE_WRITE_BITS	5	/* 8 byte write page size */
> +#define CFG_EEPROM_PAGE_WRITE_DELAY_MS	10	/* and takes up to 10 msec */
> +#define CFG_EEPROM_SIZE			0x2000
> +
> +/*-----------------------------------------------------------------------
> + * Start addresses for the final memory configuration
> + * (Set up by the startup code)
> + * Please note that CFG_SDRAM_BASE _must_ start at 0
> + */
> +#define CFG_SDRAM_BASE		0x00000000
> +#define CFG_FLASH_BASE		0xFFC00000
> +#define CFG_MONITOR_LEN		(256 * 1024)	/* Reserve 256 kB for Monitor	*/
> +#define CFG_MALLOC_LEN		(128 * 1024)	/* Reserve 128 kB for malloc()	*/
> +#define CFG_MONITOR_BASE	0xFFF80000

CFG_MONITOR_BASE at 0xfff80000 makes me think that the U-Boot image has a size 
of 512k. But CFG_MONITOR_LEN is 256k. Which one is correct? I would think 
that 256k should be enough for this image.

> +/*
> + * For booting Linux, the board info and command line data
> + * have to be in the first 8 MB of memory, since this is
> + * the maximum mapped by the Linux kernel during initialization.
> + */
> +#define CFG_BOOTMAPSZ		(8 << 20)	/* Initial Memory map for Linux */
> +
> +/*-----------------------------------------------------------------------
> + * FLASH organization
> + */
> +#define CFG_FLASH_CFI			/* The flash is CFI compatible	*/
> +#define	CFG_FLASH_CFI_DRIVER
> +
> +#define CFG_FLASH_BANKS_LIST	{ CFG_FLASH_BASE }
> +
> +#define CFG_MAX_FLASH_BANKS	1	/* max number of memory banks	*/
> +#define CFG_MAX_FLASH_SECT	128	/* max number of sectors on one chip */

Starting here

> +#define CFG_FLASH_WORD_SIZE	unsigned short
> +#define CFG_FLASH_ADDR0		0x0555
> +#define CFG_FLASH_ADDR1		0x02aa
> +#define FLASH_BASE0_PRELIM	CFG_FLASH_BASE	/* FLASH bank #0	*/

till here. These defines are most likely not needed for the CFI driver. Please 
remove them.

Please fix and resubmit. 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
=====================================================================

[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[Gary Jennejohn]

On Sat, 26 Apr 2008 08:22:02 +0200
Stefan Roese <sr@denx.de> wrote:

Hi Stefan,

> Looks much better now. Just some minor issues (nitpicking) left. See comments 
> below.
> 
> > +	/* taken from PPCBoot */
> > +	mtdcr(uicsr, 0xFFFFFFFF);	/* clear all ints */
> > +	mtdcr(uicer, 0x00000000);	/* disable all ints */
> > +	mtdcr(uiccr, 0x00000000);
> > +	mtdcr(uicpr, 0xFFFF7FFE);	/* set int polarities */
> > +	mtdcr(uictr, 0x00000000);	/* set int trigger levels */
> > +	mtdcr(uicsr, 0xFFFFFFFF);	/* clear all ints */
> > +	mtdcr(uicvcr, 0x00000001);	/* set vect base=0,INT0 highest priority */
> > +
> > +    	mtdcr (CPC0_SRR, 0x00040000);   /* Hold PCI bridge in reset */
> 
> Please use only one coding style in one file. So either:
> 
> 	func();
> 
> or
> 
> 	func ();
> 
> Since this file mostly consists of the func() style I suggest you switch to 
> this one completely.
> 

Ah yes.  I copied parts of this from PPCBoot and failed to notice the
different formatting in the various places.  Thanks!

> > +#define CFG_MONITOR_LEN		(256 * 1024)	/* Reserve 256 kB for Monitor	*/
> > +#define CFG_MALLOC_LEN		(128 * 1024)	/* Reserve 128 kB for malloc()	*/
> > +#define CFG_MONITOR_BASE	0xFFF80000
> 
> CFG_MONITOR_BASE at 0xfff80000 makes me think that the U-Boot image has a size 
> of 512k. But CFG_MONITOR_LEN is 256k. Which one is correct? I would think 
> that 256k should be enough for this image.
> 

That's a valid point.  Actually u-boot.bin is 512kB in length, but only
because there's a reset vector at 0xFFFFFFFC.  u-boot itself is really
only 256kB in size.

So now I wonder - what's correct?  If CFG_MONITOR_LEN applies to RAM,
which it seems to since it only really affects TOTAL_MALLOC_LEN, then
256kB is correct and no change is required.

> Starting here
> 
> > +#define CFG_FLASH_WORD_SIZE	unsigned short
> > +#define CFG_FLASH_ADDR0		0x0555
> > +#define CFG_FLASH_ADDR1		0x02aa
> > +#define FLASH_BASE0_PRELIM	CFG_FLASH_BASE	/* FLASH bank #0	*/
> 
> till here. These defines are most likely not needed for the CFI driver. Please 
> remove them.
> 

OK, I'll look into it.

---
Gary Jennejohn
*********************************************************************
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
*********************************************************************

[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[Wolfgang Grandegger]

Hi Stefan,

Stefan Roese wrote:
> Hi Gary,
> 
> Please use only one coding style in one file. So either:
> 
> 	func();
> 
> or
> 
> 	func ();
> 
> Since this file mostly consists of the func() style I suggest you switch to 
> this one completely.

Do we really have the choice?

Wolfgang.

[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[Stefan Roese]

On Saturday 26 April 2008, Gary Jennejohn wrote:
> > > +#define CFG_MONITOR_LEN		(256 * 1024)	/* Reserve 256 kB for Monitor	*/
> > > +#define CFG_MALLOC_LEN		(128 * 1024)	/* Reserve 128 kB for malloc()	*/
> > > +#define CFG_MONITOR_BASE	0xFFF80000
> >
> > CFG_MONITOR_BASE at 0xfff80000 makes me think that the U-Boot image has a
> > size of 512k. But CFG_MONITOR_LEN is 256k. Which one is correct? I would
> > think that 256k should be enough for this image.
>
> That's a valid point.  Actually u-boot.bin is 512kB in length, but only
> because there's a reset vector at 0xFFFFFFFC.  u-boot itself is really
> only 256kB in size.
>
> So now I wonder - what's correct?  If CFG_MONITOR_LEN applies to RAM,
> which it seems to since it only really affects TOTAL_MALLOC_LEN, then
> 256kB is correct and no change is required.

I would change the image size to 256k to safe some space in FLASH. For this 
you have to change TEXT_BASE (in config.mk in your board directory) to 
0xfffc0000. And CFG_MONITOR_BASE too. Or even better:

#define CFG_MONITOR_BASE        (TEXT_BASE)

> > Starting here
> >
> > > +#define CFG_FLASH_WORD_SIZE	unsigned short
> > > +#define CFG_FLASH_ADDR0		0x0555
> > > +#define CFG_FLASH_ADDR1		0x02aa
> > > +#define FLASH_BASE0_PRELIM	CFG_FLASH_BASE	/* FLASH bank #0	*/
> >
> > till here. These defines are most likely not needed for the CFI driver.
> > Please remove them.
>
> OK, I'll look into it.

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
=====================================================================

[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[Stefan Roese]

Hi Wolfgang,

On Saturday 26 April 2008, Wolfgang Grandegger wrote:
> > Please use only one coding style in one file. So either:
> >
> > 	func();
> >
> > or
> >
> > 	func ();
> >
> > Since this file mostly consists of the func() style I suggest you switch
> > to this one completely.
>
> Do we really have the choice?

I definitely think so. I am aware of the coding style rule set be Wolfgang to 
use the "func ()" style. But I never use this style in the files I write from 
scratch. This is because I am also doing a lot of Linux development, and here 
the "func()" style is required/preferred. And if you take a look at the code 
posted by other developers, most of it uses the "func()" style. It definitely 
seems to be more common nowadays. At least from my experience.

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
=====================================================================

[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[Wolfgang Denk]

In message <48132A16.9010707@grandegger.com> you wrote:
> 
> > Since this file mostly consists of the func() style I suggest you switch to 
> > this one completely.
> 
> Do we really have the choice?

The README says:

    All contributions to U-Boot should conform to the Linux kernel
    coding style; see the file "Documentation/CodingStyle" and the script
    "scripts/Lindent" in your Linux kernel source directory.  In sources
    originating from U-Boot a style corresponding to "Lindent -pcs" (adding
    spaces before parameters to function calls) is actually used.

    Source files originating from a different project (for example the
    MTD subsystem) are generally exempt from these guidelines and are not
    reformated to ease subsequent migration to newer versions of those
    sources.


Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Change is the essential process of all existence.
	-- Spock, "Let That Be Your Last Battlefield",
	   stardate 5730.2

[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[Wolfgang Denk]

In message <200804271407.39875.sr@denx.de> you wrote:
> 
> I definitely think so. I am aware of the coding style rule set be Wolfgang to 

You are definitely wrong.

> use the "func ()" style. But I never use this style in the files I write from 

You mean you intentionally ignore the rules?

That's not nice.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
miracle:  an  extremely  outstanding  or  unusual  event,  thing,  or
accomplishment.                                - Webster's Dictionary

[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[Gary Jennejohn]

On Sun, 27 Apr 2008 14:01:45 +0200
Stefan Roese <sr@denx.de> wrote:

> On Saturday 26 April 2008, Gary Jennejohn wrote:
> > > > +#define CFG_MONITOR_LEN		(256 * 1024)	/* Reserve 256 kB for Monitor	*/
> > > > +#define CFG_MALLOC_LEN		(128 * 1024)	/* Reserve 128 kB for malloc()	*/
> > > > +#define CFG_MONITOR_BASE	0xFFF80000
> > >
> > > CFG_MONITOR_BASE at 0xfff80000 makes me think that the U-Boot image has a
> > > size of 512k. But CFG_MONITOR_LEN is 256k. Which one is correct? I would
> > > think that 256k should be enough for this image.
> >
> > That's a valid point.  Actually u-boot.bin is 512kB in length, but only
> > because there's a reset vector at 0xFFFFFFFC.  u-boot itself is really
> > only 256kB in size.
> >
> > So now I wonder - what's correct?  If CFG_MONITOR_LEN applies to RAM,
> > which it seems to since it only really affects TOTAL_MALLOC_LEN, then
> > 256kB is correct and no change is required.
> 
> I would change the image size to 256k to safe some space in FLASH. For this 
> you have to change TEXT_BASE (in config.mk in your board directory) to 
> 0xfffc0000. And CFG_MONITOR_BASE too. Or even better:
> 
> #define CFG_MONITOR_BASE        (TEXT_BASE)
> 

Well, I took these values from PPCBoot, as used by the customer, and I
see no technical reason to change these values with which the customer
is obviously satisfied.

---
Gary Jennejohn
*********************************************************************
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
*********************************************************************

[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[Gary Jennejohn]

On Sun, 27 Apr 2008 14:07:39 +0200
Stefan Roese <sr@denx.de> wrote:

> On Saturday 26 April 2008, Wolfgang Grandegger wrote:
> > > Please use only one coding style in one file. So either:
> > >
> > > 	func();
> > >
> > > or
> > >
> > > 	func ();
> > >
> > > Since this file mostly consists of the func() style I suggest you switch
> > > to this one completely.
> >
> > Do we really have the choice?
> 
> I definitely think so. I am aware of the coding style rule set be Wolfgang to 
> use the "func ()" style. But I never use this style in the files I write from 
> scratch. This is because I am also doing a lot of Linux development, and here 
> the "func()" style is required/preferred. And if you take a look at the code 
> posted by other developers, most of it uses the "func()" style. It definitely 
> seems to be more common nowadays. At least from my experience.
> 

So now I'm totally confused!  As Wolfgang Denk wrote in his followup:

The README says:

    All contributions to U-Boot should conform to the Linux kernel
    coding style; see the file "Documentation/CodingStyle" and the script
    "scripts/Lindent" in your Linux kernel source directory.  In sources
    originating from U-Boot a style corresponding to "Lindent -pcs" (adding
    spaces before parameters to function calls) is actually used.

The Linux coding style, as you pointed out,  is to _not_ use spaces
between the function name and the first brace, i.e. "foo()" and not
"foo ()".

So WTF?

---
Gary Jennejohn
*********************************************************************
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
*********************************************************************

[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[Stefan Roese]

On Monday 28 April 2008, Gary Jennejohn wrote:
> > I would change the image size to 256k to safe some space in FLASH. For
> > this you have to change TEXT_BASE (in config.mk in your board directory)
> > to 0xfffc0000. And CFG_MONITOR_BASE too. Or even better:
> >
> > #define CFG_MONITOR_BASE        (TEXT_BASE)
>
> Well, I took these values from PPCBoot, as used by the customer, and I
> see no technical reason to change these values with which the customer
> is obviously satisfied.

The customer would "safe" 256k of FLASH memory this way. Perhaps the customer 
was/is not aware of this.

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
=====================================================================

[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[Stefan Roese]

On Sunday 27 April 2008, Wolfgang Denk wrote:
> In message <200804271407.39875.sr@denx.de> you wrote:
> > I definitely think so. I am aware of the coding style rule set be
> > Wolfgang to
>
> You are definitely wrong.
>
> > use the "func ()" style. But I never use this style in the files I write
> > from
>
> You mean you intentionally ignore the rules?

If you put it this way then yes, I have to admit that I am guilty. But it was 
my understanding that this was known to you. You must have noticed that 
_most_ U-Boot contributors (not only myself) are writing their code in the 
Linux style (func()). Probably since this is the most common style in the 
OpenSource community nowadays. At least from my experience.

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
=====================================================================

[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[Wolfgang Denk]

In message <20080428113229.6510c91c@peedub.jennejohn.org> you wrote:
> 
> > I would change the image size to 256k to safe some space in FLASH. For this 
> > you have to change TEXT_BASE (in config.mk in your board directory) to 
> > 0xfffc0000. And CFG_MONITOR_BASE too. Or even better:
> > 
> > #define CFG_MONITOR_BASE        (TEXT_BASE)
> > 
> 
> Well, I took these values from PPCBoot, as used by the customer, and I
> see no technical reason to change these values with which the customer
> is obviously satisfied.

The reason to change this is that it makes maintenance in the future
much easier.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
There is nothing in this world constant but inconstancy.      - Swift

[U-Boot-Users] [PATCH V2] Add the Harris QUAD100HD AMCC 405EP-based board.

[Gary Jennejohn]

On Mon, 28 Apr 2008 12:05:42 +0200
Wolfgang Denk <wd@denx.de> wrote:

> In message <20080428113229.6510c91c@peedub.jennejohn.org> you wrote:
> > 
> > > I would change the image size to 256k to safe some space in FLASH. For this 
> > > you have to change TEXT_BASE (in config.mk in your board directory) to 
> > > 0xfffc0000. And CFG_MONITOR_BASE too. Or even better:
> > > 
> > > #define CFG_MONITOR_BASE        (TEXT_BASE)
> > > 
> > 
> > Well, I took these values from PPCBoot, as used by the customer, and I
> > see no technical reason to change these values with which the customer
> > is obviously satisfied.
> 
> The reason to change this is that it makes maintenance in the future
> much easier.
> 

Well, OK.  If it makes everyone happy and I can _finally_ get these
patches into the tree then I'll do it.

---
Gary Jennejohn
*********************************************************************
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
*********************************************************************