[U-Boot] [PATCH v2] [ARM] at91: Add support for taskit AT91SAM9G20 boards

[Tom <Tom.Rix@windriver.com>]

Achim Ehrlich wrote:
> This adds support for the AT91SAM9G20 boards by taskit GmbH.
> Both boards, Stamp9G20 and PortuxG20, are integrated in one file.
> PortuxG20 is basically a SBC built around Stamp9G20.
> 
> Signed-off-by: Achim Ehrlich <aehrlich@taskit.de>
> ---
>  MAINTAINERS                        |    5 +
>  MAKEALL                            |    1 +
>  Makefile                           |    4 +
>  board/taskit/stamp9G20/Makefile    |   50 +++++++++
>  board/taskit/stamp9G20/config.mk   |    1 +
>  board/taskit/stamp9G20/stamp9G20.c |  203 ++++++++++++++++++++++++++++++++++++
>  include/configs/stamp9G20.h        |  180 ++++++++++++++++++++++++++++++++
>  7 files changed, 444 insertions(+), 0 deletions(-)
>  create mode 100644 board/taskit/stamp9G20/Makefile
>  create mode 100644 board/taskit/stamp9G20/config.mk
>  create mode 100644 board/taskit/stamp9G20/stamp9G20.c
>  create mode 100644 include/configs/stamp9G20.h
> 

Are more taskit based boards expected?
If not taskit/stamp9G20 could be reduced to just taskit


> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7f40ebd..c4259a0 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -138,6 +138,11 @@ Jon Diekema <jon.diekema@smiths-aerospace.com>
>  
>  	sbc8260		MPC8260
>  
> +Achim Ehrlich <aehrlich@taskit.de>
> +
> +	Stamp9G20	AT91SAM9G20
> +	PortuxG20	AT91SAM9G20
> +
>  Dirk Eibach <eibach@gdsys.de>
>  
>  	devconcenter	PPC460EX
> diff --git a/MAKEALL b/MAKEALL
> index 1949985..51aaaa6 100755
> --- a/MAKEALL
> +++ b/MAKEALL
> @@ -675,6 +675,7 @@ LIST_at91="			\
>  	pm9261			\
>  	pm9263			\
>  	SBC35_A9G20		\
> +	stamp9G20		\

This is ok becasue the portuxg20 is a trival change

>  	TNY_A9260		\
>  	TNY_A9G20		\
>  "
> diff --git a/Makefile b/Makefile
> index ce77e10..ed9ae00 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2903,6 +2903,10 @@ TNY_A9260_config	:	unconfig
>  	@echo "#define CONFIG_$(@:_config=) 1" >$(obj)include/config.h
>  	@$(MKCONFIG) -a tny_a9260 arm arm926ejs tny_a9260 calao at91
>  
> +portuxG20_config \
> +stamp9G20_config	:	unconfig
> +	@$(MKCONFIG) -t $(@:_config=) stamp9G20 arm arm926ejs stamp9G20 taskit at91
> +
>  ########################################################################
>  ## ARM Integrator boards - see doc/README-integrator for more info.
>  integratorap_config	\
> diff --git a/board/taskit/stamp9G20/Makefile b/board/taskit/stamp9G20/Makefile
> new file mode 100644
> index 0000000..191fb8e
> --- /dev/null
> +++ b/board/taskit/stamp9G20/Makefile
> @@ -0,0 +1,50 @@
> +#
> +# (C) Copyright 2010
> +# Achim Ehrlich, taskit GmbH, aehrlich at taskit.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-y	+= stamp9G20.o
> +
> +SRCS	:= $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
> +OBJS	:= $(addprefix $(obj),$(COBJS-y))
> +SOBJS	:= $(addprefix $(obj),$(SOBJS))
> +
> +$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
> +	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
> +
> +clean:
> +	rm -f $(SOBJS) $(OBJS)
> +
> +distclean:	clean
> +	rm -f $(LIB) core *.bak $(obj).depend
> +
> +#########################################################################
> +
> +# defines $(obj).depend target
> +include $(SRCTREE)/rules.mk
> +
> +sinclude $(obj).depend
> +
> +#########################################################################
> diff --git a/board/taskit/stamp9G20/config.mk b/board/taskit/stamp9G20/config.mk
> new file mode 100644
> index 0000000..ff2cfd1
> --- /dev/null
> +++ b/board/taskit/stamp9G20/config.mk
> @@ -0,0 +1 @@
> +TEXT_BASE = 0x23f00000
> diff --git a/board/taskit/stamp9G20/stamp9G20.c b/board/taskit/stamp9G20/stamp9G20.c
> new file mode 100644
> index 0000000..b543b0a
> --- /dev/null
> +++ b/board/taskit/stamp9G20/stamp9G20.c
> @@ -0,0 +1,203 @@
> +/*
> + * (C) Copyright 2007-2008
> + * Stelian Pop <stelian.pop@leadtechdesign.com>
> + * Lead Tech Design <www.leadtechdesign.com>
> + *
> + * (C) Copyright 2010
> + * Achim Ehrlich <aehrlich@taskit.de>
> + * taskit GmbH <www.taskit.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 <asm/arch/at91sam9260.h>
> +#include <asm/arch/at91_matrix.h>
> +#include <asm/arch/at91sam9_smc.h>
> +#include <asm/arch/at91_common.h>
> +#include <asm/arch/at91_pmc.h>
> +#include <asm/arch/at91_rstc.h>
> +#include <asm/arch/at91_pio.h>
> +#include <asm/arch/io.h>
> +#include <asm/arch/hardware.h>
> +#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
> +#include <net.h>
> +#endif
> +#include <netdev.h>
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +/* ------------------------------------------------------------------------- */
> +/*
> + * Miscelaneous platform dependent initialisations
> + */
> +
> +#ifdef CONFIG_CMD_NAND
> +static void stamp9G20_nand_hw_init(void)
> +{
> +	unsigned long csa;
> +	at91_smc_t 	*smc 	= (at91_smc_t *) AT91_SMC_BASE;
> +	at91_matrix_t 	*matrix = (at91_matrix_t *) AT91_MATRIX_BASE;
> +	at91_pmc_t	*pmc	= (at91_pmc_t *) AT91_PMC_BASE;
> +
> +	/* Enable CS3 */
> +	csa = readl(&matrix->csa) | AT91_MATRIX_CSA_EBI_CS3A;
> +	writel(csa, &matrix->csa);
> +
> +	/* Configure SMC CS3 for NAND/SmartMedia */
> +	writel(AT91_SMC_SETUP_NWE(1) | AT91_SMC_SETUP_NCS_WR(0) |
> +		AT91_SMC_SETUP_NRD(1) | AT91_SMC_SETUP_NCS_RD(0),
> +		&smc->cs[3].setup);
> +
> +	writel(AT91_SMC_PULSE_NWE(3) | AT91_SMC_PULSE_NCS_WR(3) |
> +		AT91_SMC_PULSE_NRD(3) | AT91_SMC_PULSE_NCS_RD(3),
> +		&smc->cs[3].pulse);
> +
> +	writel(AT91_SMC_CYCLE_NWE(5) | AT91_SMC_CYCLE_NRD(5),
> +		&smc->cs[3].cycle);
> +	writel(AT91_SMC_MODE_RM_NRD | AT91_SMC_MODE_WM_NWE |
> +		AT91_SMC_MODE_EXNW_DISABLE |
> +#ifdef CONFIG_SYS_NAND_DBW_16
> +		       AT91_SMC_MODE_DBW_16 |
> +#else /* CONFIG_SYS_NAND_DBW_8 */
> +		       AT91_SMC_MODE_DBW_8 |
> +#endif

CONFIG_SYS_NAND_DBW_16 is unused.
The if-def should be removed

> +		       AT91_SMC_MODE_TDF_CYCLE(2),
> +		&smc->cs[3].mode);
> +
> +	writel(1 << AT91SAM9260_ID_PIOC, &pmc->pcer);
> +
> +	/* Configure RDY/BSY */
> +	at91_set_pio_input(CONFIG_SYS_NAND_READY_PIN, 1);
> +
> +	/* Enable NandFlash */
> +	at91_set_pio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1);
> +}
> +#endif
> +
> +#ifdef CONFIG_MACB
> +static void stamp9G20_macb_hw_init(void)
> +{
> +	unsigned long 	erstl;
> +	at91_pmc_t	*pmc	= (at91_pmc_t *) AT91_PMC_BASE;
> +	at91_pio_t	*pio	= (at91_pio_t *) AT91_PIO_BASE;
> +	at91_rstc_t	*rstc	= (at91_rstc_t *) AT91_RSTC_BASE;
> +
> +	/* Enable MACB Chip, this is the enable PIN on Stamp Adaptor*/
> +	at91_set_pio_output(AT91_PIO_PORTA, 26, 0);
> +
> +	/* Enable clock */
> +	writel(1 << AT91SAM9260_ID_EMAC, &pmc->pcer);
> +
> +	/*
> +	 * Disable pull-up on:
> +	 *	RXDV (PA17) => PHY normal mode (not Test mode)
> +	 *	ERX0 (PA14) => PHY ADDR0
> +	 *	ERX1 (PA15) => PHY ADDR1
> +	 *	ERX2 (PA25) => PHY ADDR2
> +	 *	ERX3 (PA26) => PHY ADDR3
> +	 *	ECRS (PA28) => PHY ADDR4  => PHYADDR = 0x0
> +	 *
> +	 * PHY has internal pull-down
> +	 */
> +	writel((1 << 14) | (1 << 15) | (1 << 17) |
> +			(1 << 25), &pio->pioa.pudr);
> +
> +	erstl = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK;
> +
> +	/* Need to reset PHY -> 500ms reset */
> +	writel(AT91_RSTC_KEY | AT91_RSTC_MR_ERSTL(0x0D) |
> +		AT91_RSTC_MR_URSTEN, &rstc->mr);
> +
> +	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr);
> +	/* Wait for end hardware reset */
> +	while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL))
> +		;
> +
> +	/* Restore NRST value */
> +	writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN, &rstc->mr);
> +
> +	/* Re-enable pull-up */
> +	writel((1 << 14) | (1 << 15) | (1 << 17) |
> +			(1 << 25), &pio->pioa.puer);
> +
> +	at91_macb_hw_init();
> +}
> +#endif
> +
> +int board_init(void)
> +{
> +	/* Enable Ctrlc */
> +	console_init_f();
> +
> +#ifdef CONFIG_MK_portuxG20
> +	gd->bd->bi_arch_number = MACH_TYPE_PORTUXG20;
> +#else
> +	gd->bd->bi_arch_number = MACH_TYPE_STAMP9G20;
> +#endif
> +
> +	/* adress of boot parameters */
> +	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
> +
> +	at91_set_pio_output(AT91_PIO_PORTC, 9, 1);
> +	at91_set_pio_output(AT91_PIO_PORTC, 5, 1);

Change immediates to logical #defines

> +
> +	at91_serial_hw_init();
> +#ifdef CONFIG_CMD_NAND
> +	stamp9G20_nand_hw_init();
> +#endif
> +#ifdef CONFIG_HAS_DATAFLASH
> +	at91_spi0_hw_init((1 << 0) || (1 << 1));
> +#endif
> +#ifdef CONFIG_MACB
> +	stamp9G20_macb_hw_init();
> +#endif
> +
> +	return 0;
> +}
> +
> +int dram_init(void)
> +{
> +	gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
> +	gd->bd->bi_dram[0].size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE
> +			, CONFIG_SYS_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
> +}
> +#endif
> +
> +int board_eth_init(bd_t *bis)
> +{
> +	int rc = 0;
> +#ifdef CONFIG_MACB
> +	rc = macb_eth_initialize(0, (void *)AT91_EMAC_BASE, 0x00);
> +#endif
> +	return rc;
> +}
> diff --git a/include/configs/stamp9G20.h b/include/configs/stamp9G20.h
> new file mode 100644
> index 0000000..7a8fb87
> --- /dev/null
> +++ b/include/configs/stamp9G20.h
> @@ -0,0 +1,180 @@
> +/*
> + * (C) 2010 Achim Ehrlich <aehrlich@taskit.de>
> + * taskit GmbH <www.taskit.de>
> + *
> + * Configuation settings for the Stamp9G20 CPU module.
> + *
> + * 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_AT91_GPIO
> +
> +/* ARM asynchronous clock */
> +/* 18.432 MHz crystal */
> +#define CONFIG_SYS_AT91_MAIN_CLOCK	18432000
> +/* 1ms resolution */
> +#define CONFIG_SYS_HZ		1000
> +

Move these #defines below the cpu/soc/board

> +#define CONFIG_ARM926EJS	1
> +#define CONFIG_AT91SAM9G20	1
> +#define CONFIG_ARCH_CPU_INIT
> +#undef CONFIG_USE_IRQ
> +/* enable passing of ATAGs */
> +#define CONFIG_CMDLINE_TAG	1
> +#define CONFIG_SETUP_MEMORY_TAGS 1
> +#define CONFIG_INITRD_TAG	1
> +
> +#define CONFIG_SKIP_LOWLEVEL_INIT
> +#define CONFIG_SKIP_RELOCATE_UBOOT
> +
> +/* pad the watchdog */
> +
> +#define CONFIG_AT91SAM9_WATCHDOG
> +#define CONFIG_HW_WATCHDOG
> +
> +/*
> + * Hardware drivers
> + */
> +#define CONFIG_ATMEL_USART	1
> +
> +/* USART 3 is DBGU */
> +#define CONFIG_USART3		1
> +
> +#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_IMI
> +#undef CONFIG_CMD_IMLS
> +
> +#define CONFIG_CMD_PING		1
> +#define CONFIG_CMD_DHCP		1
> +#define CONFIG_CMD_NAND		1
> +#define CONFIG_CMD_USB		1
> +
> +/* SDRAM */
> +#define CONFIG_NR_DRAM_BANKS		1
> +#define CONFIG_SYS_SDRAM_BASE		0x20000000
> +#define CONFIG_SYS_SDRAM_SIZE		0x08000000
> +
> +/* DataFlash */
> +#undef CONFIG_ATMEL_DATAFLASH_SPI
> +#undef CONFIG_HAS_DATAFLASH
> +
> +/* NAND flash */
> +#ifdef CONFIG_CMD_NAND
> +#define CONFIG_NAND_ATMEL
> +#define CONFIG_SYS_MAX_NAND_DEVICE		1
> +#define CONFIG_SYS_NAND_BASE			0x40000000
> +#define CONFIG_SYS_NAND_DBW_8			1
> +/* our ALE is AD21 */
> +#define CONFIG_SYS_NAND_MASK_ALE		(1 << 21)
> +/* our CLE is AD22 */
> +#define CONFIG_SYS_NAND_MASK_CLE		(1 << 22)
> +#define CONFIG_SYS_NAND_ENABLE_PIN		AT91_PIO_PORTC, 14
> +#define CONFIG_SYS_NAND_READY_PIN		AT91_PIO_PORTC, 13
> +/* needed for nand_util.c */
> +#define CONFIG_SYS_64BIT_VSPRINTF
> +#endif
> +
> +/* NOR flash - no real flash on this board */
> +#define CONFIG_SYS_NO_FLASH		1
> +
> +/* Ethernet */
> +#define CONFIG_MACB			1
> +#define CONFIG_RMII			1
> +#define CONFIG_NET_MULTI		1
> +#define CONFIG_NET_RETRY_COUNT		20
> +#define CONFIG_RESET_PHY_R		1
> +
> +/* USB */
> +#define CONFIG_USB_ATMEL
> +#define CONFIG_USB_OHCI_NEW		1
> +#define CONFIG_DOS_PARTITION		1
> +#define CONFIG_SYS_USB_OHCI_CPU_INIT	1
> +#define CONFIG_SYS_USB_OHCI_REGS_BASE	0x00500000
> +#define CONFIG_SYS_USB_OHCI_SLOT_NAME	"at91sam9260"
> +#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS	2
> +#define CONFIG_USB_STORAGE		1
> +#define CONFIG_CMD_FAT			1
> +
> +#define CONFIG_SYS_LOAD_ADDR		0x22000000
> +
> +#define CONFIG_SYS_MEMTEST_START        CONFIG_SYS_SDRAM_BASE

convert spaces to tabs

> +#define CONFIG_SYS_MEMTEST_END		0x23e00000
> +
> +/* bootstrap + u-boot + env + linux in nandflash */
> +#define CONFIG_ENV_IS_IN_NAND	1
> +#define CONFIG_ENV_OFFSET		0x60000
> +#define CONFIG_ENV_OFFSET_REDUND	0x80000
> +#define CONFIG_ENV_SIZE		0x20000		/* 1 sector = 128 kB */
> +#define CONFIG_BOOTCOMMAND	"run sdboot"
> +#define	CONFIG_EXTRA_ENV_SETTINGS					\
> +	"mtdparts=mtdparts=atmel_nand:128k(bootstrap)ro,"		\
> +				"256k(uboot)ro,128k(env1)ro,"		\
> +				"128k(env2)ro,2M(linux),-(root)rw\0" 	\
> +	"sdboot=setenv bootargs ${basicargs} mem=${ramsize} "		\
> +		"${mtdparts} root=/dev/mmcblk0p1 rootdelay=1; "		\
> +		"nand read 0x22000000 0xA0000 0x200000; "		\
> +		"bootm 22000000\0"					\
> +	"flashboot=setenv bootargs ${basicargs} ${mtdparts} "		\
> +		"root=/dev/mtdblock5 rootfstype=jffs2; "		\
> +		"nand read 0x22000000 0xA0000 0x200000; "		\
> +		"bootm 22000000\0"					\
> +	"ramsize=64M\0"							\
> +	"basicargs=console=ttyS0,115200\0"				\
> +	""
> +
> +#define CONFIG_BAUDRATE		115200
> +#define CONFIG_SYS_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 }
> +
> +#define CONFIG_SYS_PROMPT	"U-Boot> "
> +#define CONFIG_SYS_CBSIZE	256
> +#define CONFIG_SYS_MAXARGS	16
> +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
> +#define CONFIG_SYS_LONGHELP	1
> +#define CONFIG_CMDLINE_EDITING	1
> +
> +/*
> + * Size of malloc() pool
> + */
> +#define CONFIG_SYS_MALLOC_LEN	ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
> +#define CONFIG_SYS_GBL_DATA_SIZE 128	/* 128 bytes for initial data */
> +
> +#define CONFIG_STACKSIZE	(32*1024)	/* regular stack */
> +
> +#ifdef CONFIG_USE_IRQ
> +#error CONFIG_USE_IRQ not supported
> +#endif
> +
> +#endif


Tom