[U-Boot-Users] [PATCH 0/2] AVR32 patches for next merge window

[U-Boot-Users] [PATCH 0/2] AVR32 patches for next merge window

[Haavard Skinnemoen]

Hi all,

I'm planning to merge the next two patches before the merge window
closes. This includes support for the ATNGW100 board (long overdue;
it's been waiting for the CFI flash changes that were merged
recently) and a bug fix that somehow got left out in the previous
merge request.

Please review. If nothing comes up, I'll send a merge request early
next week.

Also, please let me know if I've missed any patches.

Haavard Skinnemoen (2):
      AVR32: Initialize ipaddr, loadaddr and bootfile at startup
      AVR32: ATNGW100 board support

 MAINTAINERS                     |   11 ++-
 MAKEALL                         |    1 +
 Makefile                        |    3 +
 board/atmel/atngw100/Makefile   |   40 +++++++++
 board/atmel/atngw100/atngw100.c |   73 ++++++++++++++++
 board/atmel/atngw100/config.mk  |    3 +
 board/atmel/atngw100/eth.c      |   36 ++++++++
 board/atmel/atngw100/u-boot.lds |   80 +++++++++++++++++
 include/configs/atngw100.h      |  182 +++++++++++++++++++++++++++++++++++++++
 lib_avr32/board.c               |   10 ++
 net/eth.c                       |    4 +
 11 files changed, 438 insertions(+), 5 deletions(-)
 create mode 100644 board/atmel/atngw100/Makefile
 create mode 100644 board/atmel/atngw100/atngw100.c
 create mode 100644 board/atmel/atngw100/config.mk
 create mode 100644 board/atmel/atngw100/eth.c
 create mode 100644 board/atmel/atngw100/u-boot.lds
 create mode 100644 include/configs/atngw100.h

[U-Boot-Users] [PATCH 1/2] AVR32: Initialize ipaddr, loadaddr and bootfile at startup

[Haavard Skinnemoen]

I don't know why the relevant layers can't do this by itself, but this
is what ppc does.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
---
 lib_avr32/board.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/lib_avr32/board.c b/lib_avr32/board.c
index 809ee3b..d6423d4 100644
--- a/lib_avr32/board.c
+++ b/lib_avr32/board.c
@@ -264,6 +264,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
 #ifndef CFG_ENV_IS_NOWHERE
 	extern char * env_name_spec;
 #endif
+	char *s;
 	cmd_tbl_t *cmdtp;
 	bd_t *bd;
 
@@ -336,11 +337,20 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
 	/* initialize environment */
 	env_relocate();
 
+	bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
+
 	devices_init();
 	jumptable_init();
 	console_init_r();
 
+	s = getenv("loadaddr");
+	if (s)
+		load_addr = simple_strtoul(s, NULL, 16);
+
 #if defined(CONFIG_CMD_NET)
+	s = getenv("bootfile");
+	if (s)
+		copy_filename(BootFile, s, sizeof(BootFile));
 #if defined(CONFIG_NET_MULTI)
 	puts("Net:   ");
 #endif
-- 
1.5.3.6

[U-Boot-Users] [PATCH 2/2] AVR32: ATNGW100 board support

[Haavard Skinnemoen]

Add support for the ATNGW100 Network Gateway reference design,
including flash, ethernet and MMC support.

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
---
 MAINTAINERS                     |   11 ++-
 MAKEALL                         |    1 +
 Makefile                        |    3 +
 board/atmel/atngw100/Makefile   |   40 +++++++++
 board/atmel/atngw100/atngw100.c |   73 ++++++++++++++++
 board/atmel/atngw100/config.mk  |    3 +
 board/atmel/atngw100/eth.c      |   36 ++++++++
 board/atmel/atngw100/u-boot.lds |   80 +++++++++++++++++
 include/configs/atngw100.h      |  182 +++++++++++++++++++++++++++++++++++++++
 net/eth.c                       |    4 +
 10 files changed, 428 insertions(+), 5 deletions(-)
 create mode 100644 board/atmel/atngw100/Makefile
 create mode 100644 board/atmel/atngw100/atngw100.c
 create mode 100644 board/atmel/atngw100/config.mk
 create mode 100644 board/atmel/atngw100/eth.c
 create mode 100644 board/atmel/atngw100/u-boot.lds
 create mode 100644 include/configs/atngw100.h

diff --git a/MAINTAINERS b/MAINTAINERS
index 2ef2f5c..d435e57 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -58,7 +58,7 @@ Conn Clark <clark@esteem.com>
 
 	ESTEEM192E		MPC8xx
 
-K?ri Dav??sson <kd@flaga.is>
+K???ri Dav??????sson <kd@flaga.is>
 
 	FLAGADM			MPC823
 
@@ -446,7 +446,7 @@ Peter Figuli <peposh@etc.sk>
 
 	wepep250		xscale
 
-Marius Gr?ger <mag@sysgo.de>
+Marius Gr???ger <mag@sysgo.de>
 
 	impa7			ARM720T (EP7211)
 	ep7312			ARM720T (EP7312)
@@ -484,7 +484,7 @@ Prakash Kumar <prakash@embedx.com>
 
 	cerf250			xscale
 
-David M?ller <d.mueller@elsoft.ch>
+David M???ller <d.mueller@elsoft.ch>
 
 	smdk2410		ARM920T
 	VCMA9			ARM920T
@@ -531,7 +531,7 @@ Richard Woodruff <r-woodruff2@ti.com>
 
 	omap2420h4		ARM1136EJS
 
-Alex Z?pke <azu@sysgo.de>
+Alex Z???pke <azu@sysgo.de>
 
 	lart			SA1100
 	dnp1110			SA1110
@@ -543,7 +543,7 @@ Alex Z?pke <azu@sysgo.de>
 #	Board			CPU					#
 #########################################################################
 
-Daniel Engstr?m <daniel@omicron.se>
+Daniel Engstr???m <daniel@omicron.se>
 
 	sc520_cdp		x86
 
@@ -648,6 +648,7 @@ Haavard Skinnemoen <hskinnemoen@atmel.com>
 	ATSTK1002		AT32AP7000
 	ATSTK1003		AT32AP7001
 	ATSTK1004		AT32AP7002
+	ATNGW100		AT32AP7000
 
 #########################################################################
 # SuperH Systems:							#
diff --git a/MAKEALL b/MAKEALL
index ebc5a22..6acdaf4 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -655,6 +655,7 @@ LIST_avr32="		\
 	atstk1002	\
 	atstk1003	\
 	atstk1004	\
+	atngw100	\
 "
 
 #########################################################################
diff --git a/Makefile b/Makefile
index 1983ca0..01f92ad 100644
--- a/Makefile
+++ b/Makefile
@@ -2716,6 +2716,9 @@ atstk1003_config	:	unconfig
 atstk1004_config	:	unconfig
 	@$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
 
+atngw100_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) avr32 at32ap atngw100 atmel at32ap700x
+
 #########################################################################
 #########################################################################
 #########################################################################
diff --git a/board/atmel/atngw100/Makefile b/board/atmel/atngw100/Makefile
new file mode 100644
index 0000000..1b5c635
--- /dev/null
+++ b/board/atmel/atngw100/Makefile
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2005-2006 Atmel Corporation
+#
+# 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 eth.o
+
+SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
+
+$(LIB): $(obj).depend $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/atmel/atngw100/atngw100.c b/board/atmel/atngw100/atngw100.c
new file mode 100644
index 0000000..bd4b6b4
--- /dev/null
+++ b/board/atmel/atngw100/atngw100.c
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2006 Atmel Corporation
+ *
+ * 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 <asm/io.h>
+#include <asm/sdram.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/hmatrix2.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static const struct sdram_info sdram = {
+	.phys_addr	= CFG_SDRAM_BASE,
+	.row_bits	= 13,
+	.col_bits	= 9,
+	.bank_bits	= 2,
+	.cas		= 3,
+	.twr		= 2,
+	.trc		= 7,
+	.trp		= 2,
+	.trcd		= 2,
+	.tras		= 5,
+	.txsr		= 5,
+};
+
+int board_early_init_f(void)
+{
+	/* Set the SDRAM_ENABLE bit in the HEBI SFR */
+	hmatrix2_writel(SFR4, 1 << 1);
+
+	gpio_enable_ebi();
+	gpio_enable_usart1();
+
+#if defined(CONFIG_MACB)
+	gpio_enable_macb0();
+	gpio_enable_macb1();
+#endif
+#if defined(CONFIG_MMC)
+	gpio_enable_mmci();
+#endif
+
+	return 0;
+}
+
+long int initdram(int board_type)
+{
+	return sdram_init(&sdram);
+}
+
+void board_init_info(void)
+{
+	gd->bd->bi_phy_id[0] = 0x01;
+	gd->bd->bi_phy_id[1] = 0x03;
+}
diff --git a/board/atmel/atngw100/config.mk b/board/atmel/atngw100/config.mk
new file mode 100644
index 0000000..9a794e5
--- /dev/null
+++ b/board/atmel/atngw100/config.mk
@@ -0,0 +1,3 @@
+TEXT_BASE		= 0x00000000
+PLATFORM_RELFLAGS	+= -ffunction-sections -fdata-sections
+PLATFORM_LDFLAGS	+= --gc-sections
diff --git a/board/atmel/atngw100/eth.c b/board/atmel/atngw100/eth.c
new file mode 100644
index 0000000..d1d57bb
--- /dev/null
+++ b/board/atmel/atngw100/eth.c
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2006 Atmel Corporation
+ *
+ * Ethernet initialization for the AVR32 Network Gateway
+ *
+ * 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 <asm/arch/memory-map.h>
+
+extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
+
+#ifdef CONFIG_CMD_NET
+void atngw100_eth_initialize(bd_t *bi)
+{
+	macb_eth_initialize(0, (void *)MACB0_BASE, bi->bi_phy_id[0]);
+	macb_eth_initialize(1, (void *)MACB1_BASE, bi->bi_phy_id[1]);
+}
+#endif
diff --git a/board/atmel/atngw100/u-boot.lds b/board/atmel/atngw100/u-boot.lds
new file mode 100644
index 0000000..34e347a
--- /dev/null
+++ b/board/atmel/atngw100/u-boot.lds
@@ -0,0 +1,80 @@
+/* -*- Fundamental -*-
+ *
+ * Copyright (C) 2005-2006 Atmel Corporation
+ *
+ * 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_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32")
+OUTPUT_ARCH(avr32)
+ENTRY(_start)
+
+SECTIONS
+{
+	. = 0;
+	_text = .;
+	.text : {
+		*(.text)
+		*(.text.*)
+	}
+
+	. = ALIGN(32);
+	__flashprog_start = .;
+	.flashprog : {
+		*(.flashprog)
+	}
+	. = ALIGN(32);
+	__flashprog_end = .;
+	_etext = .;
+
+	.rodata : {
+		*(.rodata)
+		*(.rodata.*)
+	}
+
+	. = ALIGN(8);
+	_data = .;
+	.data : {
+		*(.data)
+		*(.data.*)
+	}
+
+	. = ALIGN(4);
+	__u_boot_cmd_start = .;
+	.u_boot_cmd : {
+		KEEP(*(.u_boot_cmd))
+	}
+	__u_boot_cmd_end = .;
+
+	. = ALIGN(4);
+	_got = .;
+	.got : {
+		*(.got)
+	}
+	_egot = .;
+
+	. = ALIGN(8);
+	_edata = .;
+
+	.bss : {
+		*(.bss)
+		*(.bss.*)
+	}
+	. = ALIGN(8);
+	_end = .;
+}
diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h
new file mode 100644
index 0000000..b38c813
--- /dev/null
+++ b/include/configs/atngw100.h
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2006 Atmel Corporation
+ *
+ * Configuration settings for the AVR32 Network Gateway
+ *
+ * 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
+ */
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define CONFIG_AVR32			1
+#define CONFIG_AT32AP			1
+#define CONFIG_AT32AP7000		1
+#define CONFIG_ATNGW100			1
+
+#define CFG_HZ				1000
+
+/*
+ * Set up the PLL to run at 140 MHz, the CPU to run at the PLL
+ * frequency, the HSB and PBB busses to run at 1/2 the PLL frequency
+ * and the PBA bus to run at 1/4 the PLL frequency.
+ */
+#define CONFIG_PLL			1
+#define CFG_POWER_MANAGER		1
+#define CFG_OSC0_HZ			20000000
+#define CFG_PLL0_DIV			1
+#define CFG_PLL0_MUL			7
+#define CFG_PLL0_SUPPRESS_CYCLES	16
+#define CFG_CLKDIV_CPU			0
+#define CFG_CLKDIV_HSB			1
+#define CFG_CLKDIV_PBA			2
+#define CFG_CLKDIV_PBB			1
+
+/*
+ * The PLLOPT register controls the PLL like this:
+ *   icp = PLLOPT<2>
+ *   ivco = PLLOPT<1:0>
+ *
+ * We want icp=1 (default) and ivco=0 (80-160 MHz) or ivco=2 (150-240MHz).
+ */
+#define CFG_PLL0_OPT			0x04
+
+#define CONFIG_USART1			1
+
+/* User serviceable stuff */
+#define CONFIG_DOS_PARTITION		1
+
+#define CONFIG_CMDLINE_TAG		1
+#define CONFIG_SETUP_MEMORY_TAGS	1
+#define CONFIG_INITRD_TAG		1
+
+#define CONFIG_STACKSIZE		(2048)
+
+#define CONFIG_BAUDRATE			115200
+#define CONFIG_BOOTARGS							\
+	"console=ttyS0 root=/dev/mtdblock1 rootfstype=jffs2"
+#define CONFIG_BOOTCOMMAND						\
+	"fsload; bootm"
+
+/*
+ * Only interrupt autoboot if <space> is pressed. Otherwise, garbage
+ * data on the serial line may interrupt the boot sequence.
+ */
+#define CONFIG_BOOTDELAY		1
+#define CONFIG_AUTOBOOT			1
+#define CONFIG_AUTOBOOT_KEYED		1
+#define CONFIG_AUTOBOOT_PROMPT				\
+        "Press SPACE to abort autoboot in %d seconds\n"
+#define CONFIG_AUTOBOOT_DELAY_STR	"d"
+#define CONFIG_AUTOBOOT_STOP_STR	" "
+
+/*
+ * After booting the board for the first time, new ethernet addresses
+ * should be generated and assigned to the environment variables
+ * "ethaddr" and "eth1addr". This is normally done during production.
+ */
+#define CONFIG_OVERWRITE_ETHADDR_ONCE	1
+#define CONFIG_NET_MULTI		1
+
+/*
+ * BOOTP/DHCP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+
+#define CONFIG_DOS_PARTITION		1
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_JFFS2
+#define CONFIG_CMD_MMC
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_SETGETDCR
+
+#define CONFIG_ATMEL_USART		1
+#define CONFIG_MACB			1
+#define CONFIG_PIO2			1
+#define CFG_NR_PIOS			5
+#define CFG_HSDRAMC			1
+#define CONFIG_MMC			1
+
+#define CFG_DCACHE_LINESZ		32
+#define CFG_ICACHE_LINESZ		32
+
+#define CONFIG_NR_DRAM_BANKS		1
+
+#define CFG_FLASH_CFI			1
+#define CFG_FLASH_CFI_DRIVER		1
+
+#define CFG_FLASH_BASE			0x00000000
+#define CFG_FLASH_SIZE			0x800000
+#define CFG_MAX_FLASH_BANKS		1
+#define CFG_MAX_FLASH_SECT		135
+
+#define CFG_MONITOR_BASE		CFG_FLASH_BASE
+
+#define CFG_INTRAM_BASE			0x24000000
+#define CFG_INTRAM_SIZE			0x8000
+
+#define CFG_SDRAM_BASE			0x10000000
+#define CFG_SDRAM_16BIT			1
+
+#define CFG_ENV_IS_IN_FLASH		1
+#define CFG_ENV_SIZE			65536
+#define CFG_ENV_ADDR			(CFG_FLASH_BASE + CFG_FLASH_SIZE - CFG_ENV_SIZE)
+
+#define CFG_INIT_SP_ADDR		(CFG_INTRAM_BASE + CFG_INTRAM_SIZE)
+
+#define CFG_MALLOC_LEN			(256*1024)
+#define CFG_MALLOC_END							\
+	({								\
+		DECLARE_GLOBAL_DATA_PTR;				\
+		CFG_SDRAM_BASE + gd->sdram_size;			\
+	})
+#define CFG_MALLOC_START		(CFG_MALLOC_END - CFG_MALLOC_LEN)
+
+#define CFG_DMA_ALLOC_LEN		(16384)
+
+/* Allow 4MB for the kernel run-time image */
+#define CFG_LOAD_ADDR			(CFG_SDRAM_BASE + 0x00400000)
+#define CFG_BOOTPARAMS_LEN		(16 * 1024)
+
+/* Other configuration settings that shouldn't have to change all that often */
+#define CFG_PROMPT			"Uboot> "
+#define CFG_CBSIZE			256
+#define CFG_MAXARGS			16
+#define CFG_PBSIZE			(CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
+#define CFG_LONGHELP			1
+
+#define CFG_MEMTEST_START						\
+	({ DECLARE_GLOBAL_DATA_PTR; gd->bd->bi_dram[0].start; })
+#define CFG_MEMTEST_END							\
+	({								\
+		DECLARE_GLOBAL_DATA_PTR;				\
+		gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size;	\
+	})
+#define CFG_BAUDRATE_TABLE { 115200, 38400, 19200, 9600, 2400 }
+
+#endif /* __CONFIG_H */
diff --git a/net/eth.c b/net/eth.c
index 5d9e9c1..f707971 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -60,6 +60,7 @@ extern int npe_initialize(bd_t *);
 extern int uec_initialize(int);
 extern int bfin_EMAC_initialize(bd_t *);
 extern int atstk1000_eth_initialize(bd_t *);
+extern int atngw100_eth_initialize(bd_t *);
 extern int mcffec_initialize(bd_t*);
 
 #ifdef CONFIG_API
@@ -269,6 +270,9 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_ATSTK1000)
 	atstk1000_eth_initialize(bis);
 #endif
+#if defined(CONFIG_ATNGW100)
+	atngw100_eth_initialize(bis);
+#endif
 #if defined(CONFIG_MCFFEC)
 	mcffec_initialize(bis);
 #endif
-- 
1.5.3.6

[U-Boot-Users] [PATCH 2/2] AVR32: ATNGW100 board support

[Haavard Skinnemoen]

On Thu, 10 Jan 2008 09:24:57 +0100
Haavard Skinnemoen <hskinnemoen@atmel.com> wrote:

> -K?ri Dav??sson <kd@flaga.is>
> +K???ri Dav??????sson <kd@flaga.is>

Doh! WTF happened here?

I'll kill those hunks from my tree...and I should probably double-check
before I send the merge request.

If the final diffstat for MAINTAINERS says more than one line changed,
please feel free to flame me ;-)

Haavard

[U-Boot-Users] [PATCH 2/2] AVR32: ATNGW100 board support

[Ben Warren]

Haavard Skinnemoen wrote:
> Add support for the ATNGW100 Network Gateway reference design,
> including flash, ethernet and MMC support.
>
> Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
> ---
>  MAINTAINERS                     |   11 ++-
>  MAKEALL                         |    1 +
>  Makefile                        |    3 +
>  board/atmel/atngw100/Makefile   |   40 +++++++++
>  board/atmel/atngw100/atngw100.c |   73 ++++++++++++++++
>  board/atmel/atngw100/config.mk  |    3 +
>  board/atmel/atngw100/eth.c      |   36 ++++++++
>  board/atmel/atngw100/u-boot.lds |   80 +++++++++++++++++
>  include/configs/atngw100.h      |  182 +++++++++++++++++++++++++++++++++++++++
>  net/eth.c                       |    4 +
>  10 files changed, 428 insertions(+), 5 deletions(-)
>  create mode 100644 board/atmel/atngw100/Makefile
>  create mode 100644 board/atmel/atngw100/atngw100.c
>  create mode 100644 board/atmel/atngw100/config.mk
>  create mode 100644 board/atmel/atngw100/eth.c
>  create mode 100644 board/atmel/atngw100/u-boot.lds
>  create mode 100644 include/configs/atngw100.h
>
>   
<snip>
> diff --git a/net/eth.c b/net/eth.c
> index 5d9e9c1..f707971 100644
> --- a/net/eth.c
> +++ b/net/eth.c
> @@ -60,6 +60,7 @@ extern int npe_initialize(bd_t *);
>  extern int uec_initialize(int);
>  extern int bfin_EMAC_initialize(bd_t *);
>  extern int atstk1000_eth_initialize(bd_t *);
> +extern int atngw100_eth_initialize(bd_t *);
>  extern int mcffec_initialize(bd_t*);
>  
>  #ifdef CONFIG_API
> @@ -269,6 +270,9 @@ int eth_initialize(bd_t *bis)
>  #if defined(CONFIG_ATSTK1000)
>  	atstk1000_eth_initialize(bis);
>  #endif
> +#if defined(CONFIG_ATNGW100)
> +	atngw100_eth_initialize(bis);
> +#endif
>  #if defined(CONFIG_MCFFEC)
>  	mcffec_initialize(bis);
>  #endif
>   
>   
I'm not crazy about /net/eth.c calling board-specific ethernet 
initialization routines - it should be calling the driver 
initialization.  This file is enough of a mess as it is, and adding a 
new entry for each board only makes it worse.  Since there's precedent, 
though, consider this

Acked-by:  Ben Warren <biggerbadderben@gmail.com>


In the next release (not the one finishing in a week), what do you think 
about this:

#if defined(CONFIG_BOARD_ETH_INIT)
	board_eth_initialize(bis)
#endif


Moving Ethernet initialization in general to the board (not just Atmel 
boards) would go a long way towards cleaning up the current mess and 
would provide more scalability and flexibility.

Thoughts?

regards,
Ben

[U-Boot-Users] [PATCH 2/2] AVR32: ATNGW100 board support

[Stefan Roese]

On Thursday 10 January 2008, Ben Warren wrote:
> I'm not crazy about /net/eth.c calling board-specific ethernet
> initialization routines - it should be calling the driver
> initialization.  This file is enough of a mess as it is, and adding a
> new entry for each board only makes it worse.  Since there's precedent,
> though, consider this
>
> Acked-by:  Ben Warren <biggerbadderben@gmail.com>
>
>
> In the next release (not the one finishing in a week), what do you think
> about this:
>
> #if defined(CONFIG_BOARD_ETH_INIT)
> 	board_eth_initialize(bis)
> #endif

Or even better, using an empty baord_eth_initialize() function with the weak 
attribute. We get rid of this #ifdef this way.

> Moving Ethernet initialization in general to the board (not just Atmel
> boards) would go a long way towards cleaning up the current mess and
> would provide more scalability and flexibility.
>
> Thoughts?

How about if the board/platform code could add eth_init functions to a 
function-list. eth.c could then just call all functions in the list.

Comments?

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 2/2] AVR32: ATNGW100 board support

[Haavard Skinnemoen]

On Thu, 10 Jan 2008 11:53:26 -0500
Ben Warren <biggerbadderben@gmail.com> wrote:

> I'm not crazy about /net/eth.c calling board-specific ethernet 
> initialization routines - it should be calling the driver 
> initialization.  This file is enough of a mess as it is, and adding a 
> new entry for each board only makes it worse.  Since there's
> precedent, though, consider this

Yeah...the problem is that there are two ethernet controllers on the
AP7000 and only the board knows which one(s) to initialize. I don't
want the driver to know about such things.

> Acked-by:  Ben Warren <biggerbadderben@gmail.com>

Thanks.

> In the next release (not the one finishing in a week), what do you
> think about this:
> 
> #if defined(CONFIG_BOARD_ETH_INIT)
> 	board_eth_initialize(bis)
> #endif

I like it, but Stefan's suggestion about providing an empty, weak
function would be even better.

> Moving Ethernet initialization in general to the board (not just
> Atmel boards) would go a long way towards cleaning up the current
> mess and would provide more scalability and flexibility.

Yes, I think moving the "top-level" ethernet initialization function to
the board code would be the right thing to do. The board could then
register all the controllers, apply PHY quirks, etc. before handing
things over to the networking layer.

Haavard

[U-Boot-Users] [PATCH 2/2] AVR32: ATNGW100 board support

[Ben Warren]

Stefan Roese wrote:
> On Thursday 10 January 2008, Ben Warren wrote:
>   
>> I'm not crazy about /net/eth.c calling board-specific ethernet
>> initialization routines - it should be calling the driver
>> initialization.  This file is enough of a mess as it is, and adding a
>> new entry for each board only makes it worse.  Since there's precedent,
>> though, consider this
>>
>> Acked-by:  Ben Warren <biggerbadderben@gmail.com>
>>
>>
>> In the next release (not the one finishing in a week), what do you think
>> about this:
>>
>> #if defined(CONFIG_BOARD_ETH_INIT)
>> 	board_eth_initialize(bis)
>> #endif
>>     
>
> Or even better, using an empty baord_eth_initialize() function with the weak 
> attribute. We get rid of this #ifdef this way.
>
>   
>> Moving Ethernet initialization in general to the board (not just Atmel
>> boards) would go a long way towards cleaning up the current mess and
>> would provide more scalability and flexibility.
>>
>> Thoughts?
>>     
>
> How about if the board/platform code could add eth_init functions to a 
> function-list. eth.c could then just call all functions in the list.
>   
I was initially thinking about each board defining an array of Ethernet 
device structures, including device indices, PHY addresses, PHY info 
etc. that init code would step through.  Something like this (made-up 
pseudo-code):

eth_devices eth_dev[] = {
	{

        	.type = TSEC;
		.index = 0;
		.phy = {
			.type = PHY_AUTO_DETECT;
			.address = 0x2
		}
	},
	{
		.type = TSEC;
		.index = 1;
		.phy = {
			.type = PHY_FIXED_1000_FULL;
		}
	},
	{
		.type = ULI526x; /* PCI device */
	},
	NULL_DEVICE
};

	

but a function list might be better.  Something to think about for the 
next release.

regards,
Ben

[U-Boot-Users] [PATCH 2/2] AVR32: ATNGW100 board support

[Wolfgang Denk]

In message <1199953497-777-3-git-send-email-hskinnemoen@atmel.com> you wrote:
> --===============0956556399==
> 
> Add support for the ATNGW100 Network Gateway reference design,
> including flash, ethernet and MMC support.
> 
> Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
> ...
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -58,7 +58,7 @@ Conn Clark <clark@esteem.com>
>  
>  	ESTEEM192E		MPC8xx
>  
> -K?ri Dav??sson <kd@flaga.is>
> +K???ri Dav??????sson <kd@flaga.is>
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>  
>  	FLAGADM			MPC823
>  
> @@ -446,7 +446,7 @@ Peter Figuli <peposh@etc.sk>
>  
>  	wepep250		xscale
>  
> -Marius Gr?ger <mag@sysgo.de>
> +Marius Gr???ger <mag@sysgo.de>
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> 
> Looks as if there were encoding issues here...
> 
> 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
> The evolution of the human race will not be accomplished in  the  ten
> thousand  years  of  tame  animals,  but in the million years of wild
> animals, because man is and will always be a wild animal.
>                                               - Charles Galton Darwin

[U-Boot-Users] [PATCH 2/2] AVR32: ATNGW100 board support

[Haavard Skinnemoen]

On Thu, 10 Jan 2008 23:41:31 +0100
Wolfgang Denk <wd@denx.de> wrote:

> > -Marius Gr?ger <mag@sysgo.de>
> > +Marius Gr???ger <mag@sysgo.de>
> > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> > 
> > Looks as if there were encoding issues here...

Yes...the patch isn't supposed to touch those entries at all. I've
fixed it in my tree. You can verify the final merge by looking at the
diffstat; there should be only a single line added to MAINTAINERS:

 MAINTAINERS                     |    1 +

Haavard