Hardware watchdog support for AT91SAM9260 CPU

PATCH New Sergey Lapin 3 participants 7 messages Aug 14, 2008 – Oct 24, 2008

Subsystems (3)

Networking Kbuild Arm/Microchip (AT91) SoC support

lore

Share & tools

lore

Sergey Lapin

author

2008-08-14 22:29 UTC #0 lore raw

PATCH 1/1 Hardware watchdog support for AT91SAM9260 CPU

Signed-off-by Sergey Lapin <[email protected]>

---
 cpu/arm926ejs/at91/Makefile   |    1 +
 cpu/arm926ejs/at91/watchdog.c |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 0 deletions(-)
 create mode 100644 cpu/arm926ejs/at91/watchdog.c

cpu/arm926ejs/at91/Makefile +1 -0

index 44cde1a..7befcd7 100644
@@ -29,6 +29,7 @@ COBJS-y	+= ether.o
 COBJS-y	+= timer.o
 COBJS-$(CONFIG_HAS_DATAFLASH) +=spi.o
 COBJS-y	+= usb.o
+COBJS-$(CONFIG_HW_WATCHDOG) +=watchdog.o
 SOBJS	= lowlevel_init.o
 
 SRCS    := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)

cpu/arm926ejs/at91/watchdog.c new file +35 -0

new file mode 100644
index 0000000..da15268
@@ -0,0 +1,35 @@
+/*
+ * watchdog.c - driver for at91sam9260 watchdog
+ *
+ * Copyright (c) 2007-2008 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <common.h>
+#include <watchdog.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/io.h>
+
+#ifdef CONFIG_HW_WATCHDOG
+#define AT91_WDT_CR		(AT91_WDT+0x00)
+#define AT91_WDT_MR		(AT91_WDT+0x04)
+#define AT91_WDT_SR		(AT91_WDT+0x08)
+
+void hw_watchdog_reset(void)
+{
+	at91_sys_write(AT91_WDT_CR, 0xa5000001);
+}
+
+void hw_watchdog_init(void)
+{
+	/* 16 seconds timer, resets enabled */
+	at91_sys_write(AT91_WDT_MR, 0x3FFF2FFF);
+}
+
+void hw_watchdog_disable(void)
+{
+	/* Can't reenable per documentation */
+	at91_sys_write(AT91_WDT_MR, 0x8000);
+}
+#endif

Signature · 1 line

1.5.4.1

Sergey Lapin

author

2008-08-14 22:29 UTC #1 lore raw

PATCH 1/1 Custom AFEB9260 board support

This patch provides support for AFEB9260 board, a product of OpenSource hardware and software. Some commertial projects are made with this design. A board is basically AT91SAM9260-EK with some modifications and different peripherals and different parts used. Main purpose of this project is to gain experience in hardware design.
More info: http://groups.google.com/group/arm9fpga-evolution-board
(In Russian only, sorry).
Subversion repository: svn://194.85.238.22/home/users/george/svn/arm9eb

Signed-off-by Sergey Lapin <[email protected]>

---
 Makefile                   |    3 +
 board/afeb9260/Makefile    |   57 +++++++++++
 board/afeb9260/afeb9260.c  |  230 ++++++++++++++++++++++++++++++++++++++++++++
 board/afeb9260/config.mk   |    1 +
 board/afeb9260/ether.c     |   37 +++++++
 board/afeb9260/nand.c      |   78 +++++++++++++++
 board/afeb9260/partition.c |   36 +++++++
 include/configs/afeb9260.h |  171 ++++++++++++++++++++++++++++++++
 net/eth.c                  |    8 +-
 9 files changed, 619 insertions(+), 2 deletions(-)
 create mode 100644 board/afeb9260/Makefile
 create mode 100644 board/afeb9260/afeb9260.c
 create mode 100644 board/afeb9260/config.mk
 create mode 100644 board/afeb9260/ether.c
 create mode 100644 board/afeb9260/nand.c
 create mode 100644 board/afeb9260/partition.c
 create mode 100644 include/configs/afeb9260.h

Makefile +3 -0

index a384d16..8b80c35 100644
@@ -2410,6 +2410,9 @@ at91cap9adk_config	:	unconfig
 at91sam9260ek_config	:	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91
 
+afeb9260_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm arm926ejs afeb9260 NULL at91
+
 ########################################################################
 ## ARM Integrator boards - see doc/README-integrator for more info.
 integratorap_config	\

board/afeb9260/Makefile new file +57 -0

57 lines not on this page · raw message

board/afeb9260/afeb9260.c new file +230 -0

230 lines not on this page · raw message

board/afeb9260/config.mk new file +1 -0

new file mode 100644
index 0000000..9ce161e
@@ -0,0 +1 @@
+TEXT_BASE = 0x21f00000

board/afeb9260/ether.c new file +37 -0

new file mode 100644
index 0000000..a1f71db
@@ -0,0 +1,37 @@
+/*
+ *
+ * (C) Copyright 2008 Sergey Lapin <[email protected]>
+ * AFEB9260 Ethernet support.
+ * Based on Atmel AT91SAM9260-EK ethernet support
+ *
+ * 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);
+
+#if defined(CONFIG_MACB) && defined(CONFIG_CMD_NET)
+void afeb9260_eth_initialize(bd_t *bi)
+{
+	macb_eth_initialize(0, (void *)AT91_BASE_EMAC, 0x01);
+}
+#endif
+

board/afeb9260/nand.c new file +78 -0

78 lines not on this page · raw message

board/afeb9260/partition.c new file +36 -0

new file mode 100644
index 0000000..2b99c9b
@@ -0,0 +1,36 @@
+/*
+ *
+ * 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>
+#include <asm/hardware.h>
+#include <dataflash.h>
+
+AT91S_DATAFLASH_INFO dataflash_info[CFG_MAX_DATAFLASH_BANKS];
+
+struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
+	{CFG_DATAFLASH_LOGIC_ADDR_CS0, 0},	/* Logical adress, CS */
+	{CFG_DATAFLASH_LOGIC_ADDR_CS1, 1}
+};
+
+/*define the area offsets*/
+dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+	{0x00000000, 0x000041FF, FLAG_PROTECT_CLEAR,   0, "Bootstrap"},
+	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+	{0x00008400, 0x00041FFF, FLAG_PROTECT_CLEAR,   0, "U-Boot"},
+};

include/configs/afeb9260.h new file +171 -0

171 lines not on this page · raw message

net/eth.c +6 -2

index 38979aa..3e5204c 100644
@@ -75,6 +75,7 @@ extern int atngw100_eth_initialize(bd_t *);
 extern int mcffec_initialize(bd_t*);
 extern int mcdmafec_initialize(bd_t*);
 extern int at91sam9_eth_initialize(bd_t *);
+extern int afeb9260_eth_initialize(bd_t *);
 
 #ifdef CONFIG_API
 extern void (*push_packet)(volatile void *, int);

@@ -286,10 +287,13 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_FSLDMAFEC)
 	mcdmafec_initialize(bis);
 #endif
-#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
-    defined(CONFIG_AT91SAM9263)
+#if !defined(CONFIG_AFEB9260) && (defined(CONFIG_AT91CAP9) || \
+	defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9263))
 	at91sam9_eth_initialize(bis);
 #endif
+#if defined(CONFIG_AFEB9260)
+	afeb9260_eth_initialize(bis);
+#endif
 
 	if (!eth_devices) {
 		puts ("No ethernet found.\n");

Signature · 1 line

1.5.4.1

Wolfgang Denk

2008-10-12 22:07 UTC #2 lore raw

PATCH 1/1 Custom AFEB9260 board support

Dear Sergey Lapin,

In message <[email protected]> Sergey

Quoted 21 lines · Lapin

This patch provides support for AFEB9260 board, a product of OpenSource hardware and software. Some commertial projects are made with this design. A board is basically AT91SAM9260-EK with some modifications and different peripherals and different parts used. Main purpose of this project is to gain experience in hardware design.
More info: http://groups.google.com/group/arm9fpga-evolution-board
(In Russian only, sorry).
Subversion repository: svn://194.85.238.22/home/users/george/svn/arm9eb
Signed-off-by Sergey Lapin <[email protected]>
---
 Makefile                   |    3 +
 board/afeb9260/Makefile    |   57 +++++++++++
 board/afeb9260/afeb9260.c  |  230 ++++++++++++++++++++++++++++++++++++++++++++
 board/afeb9260/config.mk   |    1 +
 board/afeb9260/ether.c     |   37 +++++++
 board/afeb9260/nand.c      |   78 +++++++++++++++
 board/afeb9260/partition.c |   36 +++++++
 include/configs/afeb9260.h |  171 ++++++++++++++++++++++++++++++++
 net/eth.c                  |    8 +-

Quoted 8 lines

 9 files changed, 619 insertions(+), 2 deletions(-)
 create mode 100644 board/afeb9260/Makefile
 create mode 100644 board/afeb9260/afeb9260.c
 create mode 100644 board/afeb9260/config.mk
 create mode 100644 board/afeb9260/ether.c
 create mode 100644 board/afeb9260/nand.c
 create mode 100644 board/afeb9260/partition.c
 create mode 100644 include/configs/afeb9260.h

This patch was sumbitted while the merge window was open.

Is there any special reason it was not added, and the submitter received no feedback?

Best regards,

Wolfgang Denk

Signature · 5 lines

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
If something is different, it's either better or worse,  and  usually
both.                                                    - Larry Wall

Jean-Christophe PLAGNIOL-VILLARD

2008-10-24 07:44 UTC #3 lore raw

PATCH 1/1 Custom AFEB9260 board support

In reply to Sergey Lapin

Quoted 35 lines · Sergey Lapin

This patch provides support for AFEB9260 board, a product of OpenSource hardware and software. Some commertial projects are made with this design. A board is basically AT91SAM9260-EK with some modifications and different peripherals and different parts used. Main purpose of this project is to gain experience in hardware design.
More info: http://groups.google.com/group/arm9fpga-evolution-board
(In Russian only, sorry).
Subversion repository: svn://194.85.238.22/home/users/george/svn/arm9eb
Signed-off-by Sergey Lapin <[email protected]>
---
 Makefile                   |    3 +
 board/afeb9260/Makefile    |   57 +++++++++++
 board/afeb9260/afeb9260.c  |  230 ++++++++++++++++++++++++++++++++++++++++++++
 board/afeb9260/config.mk   |    1 +
 board/afeb9260/ether.c     |   37 +++++++
 board/afeb9260/nand.c      |   78 +++++++++++++++
 board/afeb9260/partition.c |   36 +++++++
 include/configs/afeb9260.h |  171 ++++++++++++++++++++++++++++++++
 net/eth.c                  |    8 +-
 9 files changed, 619 insertions(+), 2 deletions(-)
 create mode 100644 board/afeb9260/Makefile
 create mode 100644 board/afeb9260/afeb9260.c
 create mode 100644 board/afeb9260/config.mk
 create mode 100644 board/afeb9260/ether.c
 create mode 100644 board/afeb9260/nand.c
 create mode 100644 board/afeb9260/partition.c
 create mode 100644 include/configs/afeb9260.h
Makefile +0 -0
index a384d16..8b80c35 100644

Makefile at91cap9adk_config : unconfig · line 2415

Quoted 6 lines

Makefile +3 -0

@@ -2410,6 +2410,9 @@ at91cap9adk_config	:	unconfig
 at91sam9260ek_config	:	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91
 
+afeb9260_config	:	unconfig
+	@$(MKCONFIG) $(@:_config=) arm arm926ejs afeb9260 NULL at91
+

please keep sorted

Quoted 35 lines

Makefile +0 -0

 ########################################################################
 ## ARM Integrator boards - see doc/README-integrator for more info.
 integratorap_config	\

board/afeb9260/Makefile +31 -0

+	writel(pin_to_mask(AT91_PIN_PA14) |
+	       pin_to_mask(AT91_PIN_PA15) |
+	       pin_to_mask(AT91_PIN_PA17) |
+	       pin_to_mask(AT91_PIN_PA25) |
+	       pin_to_mask(AT91_PIN_PA26) |
+	       pin_to_mask(AT91_PIN_PA28),
+	       pin_to_controller(AT91_PIN_PA0) + PIO_PUER);
+
+	at91_set_A_periph(AT91_PIN_PA19, 0);	/* ETXCK_EREFCK */
+	at91_set_A_periph(AT91_PIN_PA17, 0);	/* ERXDV */
+	at91_set_A_periph(AT91_PIN_PA14, 0);	/* ERX0 */
+	at91_set_A_periph(AT91_PIN_PA15, 0);	/* ERX1 */
+	at91_set_A_periph(AT91_PIN_PA18, 0);	/* ERXER */
+	at91_set_A_periph(AT91_PIN_PA16, 0);	/* ETXEN */
+	at91_set_A_periph(AT91_PIN_PA12, 0);	/* ETX0 */
+	at91_set_A_periph(AT91_PIN_PA13, 0);	/* ETX1 */
+	at91_set_A_periph(AT91_PIN_PA21, 0);	/* EMDIO */
+	at91_set_A_periph(AT91_PIN_PA20, 0);	/* EMDC */
+
+#ifndef CONFIG_RMII
+	at91_set_B_periph(AT91_PIN_PA28, 0);	/* ECRS */
+	at91_set_B_periph(AT91_PIN_PA29, 0);	/* ECOL */
+	at91_set_B_periph(AT91_PIN_PA25, 0);	/* ERX2 */
+	at91_set_B_periph(AT91_PIN_PA26, 0);	/* ERX3 */
+	at91_set_B_periph(AT91_PIN_PA27, 0);	/* ERXCK */
+	at91_set_B_periph(AT91_PIN_PA10, 0);	/* ETX2 */
+	at91_set_B_periph(AT91_PIN_PA11, 0);	/* ETX3 */
+	at91_set_B_periph(AT91_PIN_PA22, 0);	/* ETXER */
+#endif
+
+}

board/afeb9260/Makefile

Quoted 10 lines

board/afeb9260/Makefile +10 -0

+#endif
+
+int board_init(void)
+{
+	/* Enable Ctrlc */
+	console_init_f();
+
+	/* arch number of AT91SAM9260EK-Board */
+	// gd->bd->bi_arch_number = CONFIG_MACH_AFEB9260
+	gd->bd->bi_arch_number = 1859;

please use the CONFIG and no c++ comment

Quoted 32 lines

board/afeb9260/Makefile +32 -0

+	/* adress of boot parameters */
+	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
+
+	afeb9260_serial_hw_init();
+#ifdef CONFIG_CMD_NAND
+	afeb9260_nand_hw_init();
+#endif
+	afeb9260_spi_hw_init();
+#ifdef CONFIG_MACB
+	afeb9260_macb_hw_init();
+#endif
+
+	return 0;
+}
+
+int dram_init(void)
+{
+	gd->bd->bi_dram[0].start = PHYS_SDRAM;
+	gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE;
+	return 0;
+}
+
+#ifdef CONFIG_RESET_PHY_R
+void reset_phy(void)
+{
+#ifdef CONFIG_MACB
+	/*
+	 * Initialize ethernet HW addr prior to starting Linux,
+	 * needed for nfsroot
+	 */
+	eth_init(gd->bd);
+#endif

board/afeb9260/Makefile

Quoted 10 lines

board/afeb9260/Makefile +10 -0

+}
+#endif
+
+#include <common.h>
+
+#include <asm/arch/memory-map.h>
+
+extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
+
+#if defined(CONFIG_MACB) && defined(CONFIG_CMD_NET)

pleaase move this to Makefile

Quoted 35 lines

board/afeb9260/Makefile +6 -0

+void afeb9260_eth_initialize(bd_t *bi)
+{
+	macb_eth_initialize(0, (void *)AT91_BASE_EMAC, 0x01);
+}
+#endif
+

board/afeb9260/partition.c new file +23 -0

new file mode 100644
index 0000000..2b99c9b
@@ -0,0 +1,36 @@
+/*
+ *
+ * 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>
+#include <asm/hardware.h>
+#include <dataflash.h>
+

board/afeb9260/partition.c line 33

Quoted 10 lines

board/afeb9260/partition.c new file +10 -0

+AT91S_DATAFLASH_INFO dataflash_info[CFG_MAX_DATAFLASH_BANKS];
+
+struct dataflash_addr cs[CFG_MAX_DATAFLASH_BANKS] = {
+	{CFG_DATAFLASH_LOGIC_ADDR_CS0, 0},	/* Logical adress, CS */
+	{CFG_DATAFLASH_LOGIC_ADDR_CS1, 1}
+};
+
+/*define the area offsets*/
+dataflash_protect_t area_list[NB_DATAFLASH_AREA] = {
+	{0x00000000, 0x000041FF, FLAG_PROTECT_CLEAR,   0, "Bootstrap"},

^^^

please use tab or remove

board/afeb9260/partition.c line 35

Quoted 2 lines

board/afeb9260/partition.c new file +2 -0

+	{0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
+	{0x00008400, 0x00041FFF, FLAG_PROTECT_CLEAR,   0, "U-Boot"},

^^^

please use tab or remove

Quoted 87 lines

board/afeb9260/partition.c new file +1 -0

+};

include/configs/afeb9260.h new file +80 -0

new file mode 100644
index 0000000..d009a04
@@ -0,0 +1,171 @@
+/*
+ * (C) Copyright 2008 Sergey Lapin
+ *
+ * Configuation settings for the AFEB9260 board.
+ * Based on configuration for AT91SAM9260-EK
+ *
+ * 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
+
+/* ARM asynchronous clock */
+#define AT91_MAIN_CLOCK		18429952	/* from 18.432 MHz crystal */
+#define AT91_MASTER_CLOCK	89999598	/* peripheral = main / 2 */
+#define CFG_HZ			1000000		/* 1us resolution */
+
+#define AT91_SLOW_CLOCK		32768	/* slow clock */
+
+#define CONFIG_AT91SAM9260	1	/* It's an Atmel AT91SAM9260 SoC*/
+#define CONFIG_AFEB9260		1	/* on an AFEB9260 Board	*/
+#undef CONFIG_USE_IRQ			/* we don't need IRQ/FIQ stuff	*/
+
+#define CONFIG_CMDLINE_TAG	1	/* enable passing of ATAGs	*/
+#define CONFIG_SETUP_MEMORY_TAGS 1
+#define CONFIG_INITRD_TAG	1
+
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_SKIP_RELOCATE_UBOOT
+
+/*
+ * Hardware drivers
+ */
+#define CONFIG_ATMEL_USART	1
+#undef CONFIG_USART0
+#undef CONFIG_USART1
+#undef CONFIG_USART2
+#define CONFIG_USART3		1	/* USART 3 is DBGU */
+
+#define CONFIG_BOOTDELAY	3
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE	1
+#define CONFIG_BOOTP_BOOTPATH		1
+#define CONFIG_BOOTP_GATEWAY		1
+#define CONFIG_BOOTP_HOSTNAME		1
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+#undef CONFIG_CMD_BDI
+#undef CONFIG_CMD_IMI
+#undef CONFIG_CMD_AUTOSCRIPT
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_IMLS
+
+#define CONFIG_CMD_PING		1
+#define CONFIG_CMD_DHCP		1
+
+#define CONFIG_CMD_NAND		1

include/configs/afeb9260.h line 90

Quoted 10 lines

include/configs/afeb9260.h new file +10 -0

+#define CONFIG_CMD_USB		1
+
+/* SDRAM */
+#define CONFIG_NR_DRAM_BANKS		1
+#define PHYS_SDRAM			0x20000000
+#define PHYS_SDRAM_SIZE			0x04000000	/* 64 megs */
+
+/* DataFlash */
+#define CONFIG_HAS_DATAFLASH		1
+#define CFG_SPI_WRITE_TOUT		(5*CFG_HZ)

please add space between "*"

Quoted 59 lines

include/configs/afeb9260.h new file +59 -0

+#define CFG_MAX_DATAFLASH_BANKS		2
+#define CFG_DATAFLASH_LOGIC_ADDR_CS0	0xC0000000	/* CS0 */
+#define CFG_DATAFLASH_LOGIC_ADDR_CS1	0xD0000000	/* CS1 */
+#define AT91_SPI_CLK			15000000
+#define DATAFLASH_TCSS			(0x1a << 16)
+#define DATAFLASH_TCHS			(0x1 << 24)
+
+/* NAND flash */
+#define NAND_MAX_CHIPS			1
+#define CFG_MAX_NAND_DEVICE		1
+#define CFG_NAND_BASE			0x40000000
+#define CFG_NAND_DBW_8			1
+
+/* NOR flash - no real flash on this board */
+#define CFG_NO_FLASH			1
+
+/* Ethernet */
+#define CONFIG_MACB			1
+#undef CONFIG_RMII			/* We have full MII there */
+#define CONFIG_RESET_PHY_R		1
+
+#define CONFIG_NET_MULTI		1
+#define CONFIG_NET_RETRY_COUNT		20
+
+/* USB */
+#define CONFIG_USB_OHCI_NEW		1
+#define LITTLEENDIAN			1
+#define CONFIG_DOS_PARTITION		1
+#define CFG_USB_OHCI_CPU_INIT		1
+#define CFG_USB_OHCI_REGS_BASE		0x00500000	/* AT91SAM9260_UHP_BASE */
+#define CFG_USB_OHCI_SLOT_NAME		"at91sam9260"
+#define CFG_USB_OHCI_MAX_ROOT_PORTS	1
+#define CONFIG_USB_STORAGE		1
+
+#define CFG_LOAD_ADDR			0x21000000	/* load address */
+
+#define CFG_MEMTEST_START		PHYS_SDRAM
+#define CFG_MEMTEST_END			0x21e00000
+
+#undef CFG_USE_DATAFLASH_CS0
+#define CFG_USE_DATAFLASH_CS1		1
+#undef CFG_USE_NANDFLASH
+
+/* bootstrap + u-boot + env + linux in dataflash on CS1 */
+#define CFG_ENV_IS_IN_DATAFLASH	1
+#define CFG_MONITOR_BASE	(CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
+#define CFG_ENV_OFFSET		0x4200
+#define CFG_ENV_ADDR		(CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET)
+#define CFG_ENV_SIZE		0x4200
+#define CONFIG_BOOTCOMMAND	"nand read 0x21000000 0xa0000 0x200000; bootm"
+#define CONFIG_BOOTARGS		"console=ttyS0,115200 "			\
+				"root=/dev/mtdblock2 "			\
+				"rw rootfstype=jffs2 panic=20"
+
+#define CONFIG_BAUDRATE		115200
+#define CFG_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
+
+#define CFG_PROMPT		"U-Boot> "
+#define CFG_CBSIZE		256

include/configs/afeb9260.h line 159

Quoted 10 lines

include/configs/afeb9260.h new file +10 -0

+#define CFG_MAXARGS		16
+#define CFG_PBSIZE		(CFG_CBSIZE + sizeof(CFG_PROMPT) + 16)
+#define CFG_LONGHELP		1
+#define CONFIG_CMDLINE_EDITING	1
+
+#define ROUND(A, B)		(((A) + (B)) & ~((B) - 1))
+/*
+ * Size of malloc() pool
+ */
+#define CFG_MALLOC_LEN		ROUND(3 * CFG_ENV_SIZE + 128*1024, 0x1000)

please add space between "*"

include/configs/afeb9260.h line 162

Quoted 3 lines

include/configs/afeb9260.h new file +3 -0

+#define CFG_GBL_DATA_SIZE	128	/* 128 bytes for initial data */
+
+#define CONFIG_STACKSIZE	(32*1024)	/* regular stack */

please add space between "*"

Quoted 27 lines

include/configs/afeb9260.h new file +9 -0

+
+#ifdef CONFIG_USE_IRQ
+#error CONFIG_USE_IRQ not supported
+#endif
+
+#define CONFIG_HW_WATCHDOG	1
+
+#endif
+

net/eth.c +1 -2

index 38979aa..3e5204c 100644
@@ -75,6 +75,7 @@ extern int atngw100_eth_initialize(bd_t *);
 extern int mcffec_initialize(bd_t*);
 extern int mcdmafec_initialize(bd_t*);
 extern int at91sam9_eth_initialize(bd_t *);
+extern int afeb9260_eth_initialize(bd_t *);
 
 #ifdef CONFIG_API
 extern void (*push_packet)(volatile void *, int);

@@ -286,10 +287,13 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_FSLDMAFEC)
 	mcdmafec_initialize(bis);
 #endif
-#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
-    defined(CONFIG_AT91SAM9263)

net/eth.c int eth_initialize(bd_t *bis) · line 299

Quoted 10 lines

net/eth.c +5 -0

+#if !defined(CONFIG_AFEB9260) && (defined(CONFIG_AT91CAP9) || \
+	defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9263))
 	at91sam9_eth_initialize(bis);
 #endif
+#if defined(CONFIG_AFEB9260)
+	afeb9260_eth_initialize(bis);
+#endif
 
 	if (!eth_devices) {
 		puts ("No ethernet found.\n");

please update to the new network initialisation scheme.

Please rebase it also against the u-boot-arm/master

Note That just after the apply of your a common code will be create it will be nice it you can plan to retest it

Best Regards,
J.

Sergey Lapin

author

2008-08-14 22:32 UTC #4 lore raw

PATCH 1/1 Hardware watchdog support for AT91SAM9260 CPU

In reply to Sergey Lapin

Quoted 15 lines · Sergey Lapin

Signed-off-by Sergey Lapin <[email protected]>
---
 cpu/arm926ejs/at91/Makefile   |    1 +
 cpu/arm926ejs/at91/watchdog.c |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 0 deletions(-)
 create mode 100644 cpu/arm926ejs/at91/watchdog.c
SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
cpu/arm926ejs/at91/watchdog.c new file +0 -0
new file mode 100644
index 0000000..da15268

cpu/arm926ejs/at91/watchdog.c line 4

Quoted 4 lines

cpu/arm926ejs/at91/watchdog.c new file +4 -0

@@ -0,0 +1,35 @@
+/*
+ * watchdog.c - driver for at91sam9260 watchdog
+ *
+ * Copyright (c) 2007-2008 Analog Devices Inc.

Oops, this is wrong (cut-paste error),
will resubmit

Jean-Christophe PLAGNIOL-VILLARD

2008-10-22 21:49 UTC #5 lore raw

PATCH 1/1 Hardware watchdog support for AT91SAM9260 CPU

In reply to Sergey Lapin

Quoted 26 lines · Sergey Lapin

Signed-off-by Sergey Lapin <[email protected]>

---
 cpu/arm926ejs/at91/Makefile   |    1 +
 cpu/arm926ejs/at91/watchdog.c |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 0 deletions(-)
 create mode 100644 cpu/arm926ejs/at91/watchdog.c

cpu/arm926ejs/at91/Makefile +1 -0

index 44cde1a..7befcd7 100644
@@ -29,6 +29,7 @@ COBJS-y	+= ether.o
 COBJS-y	+= timer.o
 COBJS-$(CONFIG_HAS_DATAFLASH) +=spi.o
 COBJS-y	+= usb.o
+COBJS-$(CONFIG_HW_WATCHDOG) +=watchdog.o
 SOBJS	= lowlevel_init.o
 
 SRCS    := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)

cpu/arm926ejs/at91/watchdog.c new file +0 -0

new file mode 100644
index 0000000..da15268

cpu/arm926ejs/at91/watchdog.c line 3

Quoted 3 lines

cpu/arm926ejs/at91/watchdog.c new file +3 -0
@@ -0,0 +1,35 @@
+/*
+ * watchdog.c - driver for at91sam9260 watchdog
+ *

This drivers can be used on all at91sam9

cpu/arm926ejs/at91/watchdog.c line 4

Quoted 1 line

cpu/arm926ejs/at91/watchdog.c new file +1 -0
+ * Copyright (c) 2007-2008 Analog Devices Inc.

Are you from ADI?

cpu/arm926ejs/at91/watchdog.c line 14

Quoted 10 lines

cpu/arm926ejs/at91/watchdog.c new file +10 -0

+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <common.h>
+#include <watchdog.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/io.h>
+
+#ifdef CONFIG_HW_WATCHDOG

no need please remove

cpu/arm926ejs/at91/watchdog.c line 15

Quoted 1 line

cpu/arm926ejs/at91/watchdog.c new file +1 -0
+#define AT91_WDT_CR		(AT91_WDT+0x00)

please add space arround '+'

cpu/arm926ejs/at91/watchdog.c line 21

Quoted 6 lines

cpu/arm926ejs/at91/watchdog.c new file +6 -0

+#define AT91_WDT_MR		(AT91_WDT+0x04)
+#define AT91_WDT_SR		(AT91_WDT+0x08)
+
+void hw_watchdog_reset(void)
+{
+	at91_sys_write(AT91_WDT_CR, 0xa5000001);

					^^^^
					please use macro you can import them
					from Linux

cpu/arm926ejs/at91/watchdog.c line 27

Quoted 6 lines

cpu/arm926ejs/at91/watchdog.c new file +6 -0

+}
+
+void hw_watchdog_init(void)
+{
+	/* 16 seconds timer, resets enabled */
+	at91_sys_write(AT91_WDT_MR, 0x3FFF2FFF);

Ditto

cpu/arm926ejs/at91/watchdog.c line 33

Quoted 6 lines

cpu/arm926ejs/at91/watchdog.c new file +6 -0

+}
+
+void hw_watchdog_disable(void)
+{
+	/* Can't reenable per documentation */
+	at91_sys_write(AT91_WDT_MR, 0x8000);

Ditto

cpu/arm926ejs/at91/watchdog.c line 35

Quoted 2 lines

cpu/arm926ejs/at91/watchdog.c new file +2 -0
+}
+#endif

Best Regargds,
J.

Sergey Lapin

author

2008-10-22 23:22 UTC #6 lore raw

PATCH 1/1 Hardware watchdog support for AT91SAM9260 CPU

Quoted 1 line · Jean-Christophe PLAGNIOL-VILLARD

On 02:29 Fri 15 Aug , Sergey Lapin wrote:

Dear Jean-Christophe,
thanks a lot for your review.

Quoted 2 lines

Quoted 1 line
Are you from ADI?

No, but this file structure is a lot based on blackfin watchdog and I have too little code to make it int full intellectual property, IMHO.

Quoted 11 lines

cpu/arm926ejs/at91/watchdog.c line 14
Quoted 10 lines
+ *
+ * Licensed under the GPL-2 or later.
+ */
cpu/arm926ejs/at91/watchdog.c new file +7 -0
+
+#include <common.h>
+#include <watchdog.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/io.h>
+
+#ifdef CONFIG_HW_WATCHDOG
no need please remove

Ok,

Quoted 3 lines

Quoted 1 line
+#define AT91_WDT_CR (AT91_WDT+0x00)
				        ^
please add space arround '+'

Ok.

Quoted 9 lines

cpu/arm926ejs/at91/watchdog.c line 21

Quoted 6 lines

cpu/arm926ejs/at91/watchdog.c new file +6 -0

+#define AT91_WDT_MR		(AT91_WDT+0x04)
+#define AT91_WDT_SR		(AT91_WDT+0x08)
+
+void hw_watchdog_reset(void)
+{
+	at91_sys_write(AT91_WDT_CR, 0xa5000001);

					^^^^
					please use macro you can import them
					from Linux

Is this kind of watchdog supported in Linux already? When I submitted this file it was not yet.

All the best,
S.