* [U-Boot-Users] [PATCH 1/1] Re-Submit: Add support for ATMEL AT91SAM9G20EK board.
2008-07-29 2:17 [U-Boot-Users] [PATCH 1/1] Re-Submit: Add support for ATMEL AT91SAM9G20EK board Hong Xu
@ 2008-07-29 2:23 ` Hong Xu
2008-07-29 4:57 ` Ben Warren
1 sibling, 0 replies; 14+ messages in thread
From: Hong Xu @ 2008-07-29 2:23 UTC (permalink / raw)
To: u-boot
On Tue, Jul 29, 2008 at 10:17, Hong Xu <hongxu.cn@gmail.com> wrote:
> From 8e7f74804f86c25639f4009ba14fd6c1affe5ee6 Mon Sep 17 00:00:00 2001
> From: Hong Xu <hong.xu@atmel.com>
> Date: Tue, 29 Jul 2008 09:23:47 +0800
> Subject: [PATCH 1/1] Add support for ATMEL AT91SAM9G20EK board.
>
> This patch add support for ATMEL AT91SAM9G20EK board.
> - Per J's request, this patch's based on branch "for-1.3.5"
> - Per *'s suggestion, remove the *big* #ifdef
Thanks to Haavard, modifications in driver/net/macb.c are actually from Haavard.
> - Per Ben's suggestion, don't touch net/eth.c, move code to board init part.
>
> Thanks
> BR,
> Eric
>
> Signed-off-by: Hong Xu <hong.xu@atmel.com>
> ---
> Makefile | 2 +
> board/atmel/at91sam9g20ek/Makefile | 57 +++++++
> board/atmel/at91sam9g20ek/at91sam9g20ek.c | 257 +++++++++++++++++++++++++++++
> board/atmel/at91sam9g20ek/config.mk | 1 +
> board/atmel/at91sam9g20ek/led.c | 64 +++++++
> board/atmel/at91sam9g20ek/nand.c | 79 +++++++++
> board/atmel/at91sam9g20ek/partition.c | 40 +++++
> drivers/net/macb.c | 14 +-
> include/asm-arm/arch-at91/hardware.h | 2 +-
> include/configs/at91sam9g20ek.h | 202 ++++++++++++++++++++++
> 10 files changed, 709 insertions(+), 9 deletions(-)
> create mode 100644 board/atmel/at91sam9g20ek/Makefile
> create mode 100644 board/atmel/at91sam9g20ek/at91sam9g20ek.c
> create mode 100644 board/atmel/at91sam9g20ek/config.mk
> create mode 100644 board/atmel/at91sam9g20ek/led.c
> create mode 100644 board/atmel/at91sam9g20ek/nand.c
> create mode 100644 board/atmel/at91sam9g20ek/partition.c
> create mode 100644 include/configs/at91sam9g20ek.h
>
> diff --git a/Makefile b/Makefile
> index 7f74e2a..7f519ef 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -2378,6 +2378,8 @@ at91cap9adk_config : unconfig
> at91sam9260ek_config : unconfig
> @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9260ek atmel at91
>
> +at91sam9g20ek_config : unconfig
> + @$(MKCONFIG) $(@:_config=) arm arm926ejs at91sam9g20ek atmel at91
> ########################################################################
> ## ARM Integrator boards - see doc/README-integrator for more info.
> integratorap_config \
> diff --git a/board/atmel/at91sam9g20ek/Makefile
> b/board/atmel/at91sam9g20ek/Makefile
> new file mode 100644
> index 0000000..cdf5d34
> --- /dev/null
> +++ b/board/atmel/at91sam9g20ek/Makefile
> @@ -0,0 +1,57 @@
> +#
> +# (C) Copyright 2003-2008
> +# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
> +#
> +# (C) Copyright 2008
> +# Stelian Pop <stelian.pop@leadtechdesign.com>
> +# Lead Tech Design <www.leadtechdesign.com>
> +#
> +# 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 += at91sam9g20ek.o
> +COBJS-y += led.o
> +COBJS-y += partition.o
> +COBJS-$(CONFIG_CMD_NAND) += nand.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/atmel/at91sam9g20ek/at91sam9g20ek.c
> b/board/atmel/at91sam9g20ek/at91sam9g20ek.c
> new file mode 100644
> index 0000000..c8b36bd
> --- /dev/null
> +++ b/board/atmel/at91sam9g20ek/at91sam9g20ek.c
> @@ -0,0 +1,257 @@
> +/*
> + * (C) Copyright 2007-2008
> + * Stelian Pop <stelian.pop@leadtechdesign.com>
> + * Lead Tech Design <www.leadtechdesign.com>
> + *
> + * 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/at91sam9260_matrix.h>
> +#include <asm/arch/at91sam9_smc.h>
> +#include <asm/arch/at91_pmc.h>
> +#include <asm/arch/at91_rstc.h>
> +#include <asm/arch/gpio.h>
> +#include <asm/arch/io.h>
> +#if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
> +#include <net.h>
> +#endif
> +
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +/* ------------------------------------------------------------------------- */
> +/*
> + * Miscelaneous platform dependent initialisations
> + */
> +
> +static void at91sam9g20ek_serial_hw_init(void)
> +{
> +#ifdef CONFIG_USART0
> + at91_set_A_periph(AT91_PIN_PB4, 1); /* TXD0 */
> + at91_set_A_periph(AT91_PIN_PB5, 0); /* RXD0 */
> + at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US0);
> +#endif
> +
> +#ifdef CONFIG_USART1
> + at91_set_A_periph(AT91_PIN_PB6, 1); /* TXD1 */
> + at91_set_A_periph(AT91_PIN_PB7, 0); /* RXD1 */
> + at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US1);
> +#endif
> +
> +#ifdef CONFIG_USART2
> + at91_set_A_periph(AT91_PIN_PB8, 1); /* TXD2 */
> + at91_set_A_periph(AT91_PIN_PB9, 0); /* RXD2 */
> + at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US2);
> +#endif
> +
> +#ifdef CONFIG_USART3 /* DBGU */
> + at91_set_A_periph(AT91_PIN_PB14, 0); /* DRXD */
> + at91_set_A_periph(AT91_PIN_PB15, 1); /* DTXD */
> + at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_SYS);
> +#endif
> +}
> +
> +#ifdef CONFIG_CMD_NAND
> +static void at91sam9g20ek_nand_hw_init(void)
> +{
> + unsigned long csa;
> +
> + /* Enable CS3 */
> + csa = at91_sys_read(AT91_MATRIX_EBICSA);
> + at91_sys_write(AT91_MATRIX_EBICSA,
> + csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);
> +
> + /* Configure SMC CS3 for NAND/SmartMedia */
> + at91_sys_write(AT91_SMC_SETUP(3),
> + AT91_SMC_NWESETUP_(2) | AT91_SMC_NCS_WRSETUP_(0) |
> + AT91_SMC_NRDSETUP_(2) | AT91_SMC_NCS_RDSETUP_(0));
> + at91_sys_write(AT91_SMC_PULSE(3),
> + AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(3) |
> + AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(3));
> + at91_sys_write(AT91_SMC_CYCLE(3),
> + AT91_SMC_NWECYCLE_(7) | AT91_SMC_NRDCYCLE_(7));
> + at91_sys_write(AT91_SMC_MODE(3),
> + AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
> + AT91_SMC_EXNWMODE_DISABLE |
> +#ifdef CFG_NAND_DBW_16
> + AT91_SMC_DBW_16 |
> +#else /* CFG_NAND_DBW_8 */
> + AT91_SMC_DBW_8 |
> +#endif
> + AT91_SMC_TDF_(3));
> +
> + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOC);
> +
> + /* Configure RDY/BSY */
> + at91_set_gpio_input(AT91_PIN_PC13, 1);
> +
> + /* Enable NandFlash */
> + at91_set_gpio_output(AT91_PIN_PC14, 1);
> +}
> +#endif
> +
> +#ifdef CONFIG_HAS_DATAFLASH
> +static void at91sam9g20ek_spi_hw_init(void)
> +{
> + at91_set_A_periph(AT91_PIN_PA3, 0); /* SPI0_NPCS0 */
> + at91_set_B_periph(AT91_PIN_PC11, 0); /* SPI0_NPCS1 */
> +
> + at91_set_A_periph(AT91_PIN_PA0, 0); /* SPI0_MISO */
> + at91_set_A_periph(AT91_PIN_PA1, 0); /* SPI0_MOSI */
> + at91_set_A_periph(AT91_PIN_PA2, 0); /* SPI0_SPCK */
> +
> + /* Enable clock */
> + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_SPI0);
> +}
> +#endif
> +
> +#ifdef CONFIG_MACB
> +static void at91sam9g20ek_macb_hw_init(void)
> +{
> + /* Enable clock */
> + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_EMAC);
> +
> + /*
> + * 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(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_PUDR);
> +
> + /* Need to reset PHY -> 500ms reset */
> + at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY |
> + (AT91_RSTC_ERSTL & (0x0D << 8)) |
> + AT91_RSTC_URSTEN);
> +
> + at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_EXTRST);
> +
> + /* Wait for end hardware reset */
> + while (!(at91_sys_read(AT91_RSTC_SR) & AT91_RSTC_NRSTL));
> +
> + /* Restore NRST value */
> + at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY |
> + (AT91_RSTC_ERSTL & (0x0 << 8)) |
> + AT91_RSTC_URSTEN);
> +
> + /* Re-enable pull-up */
> + 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 */
> +#if defined(CONFIG_AT91SAM9G20EK)
> + /*
> + * use PA10, PA11 for ETX2, ETX3.
> + * PA23 and PA24 are for TWI EEPROM
> + */
> + at91_set_B_periph(AT91_PIN_PA10, 0); /* ETX2 */
> + at91_set_B_periph(AT91_PIN_PA11, 0); /* ETX3 */
> +#else
> + at91_set_B_periph(AT91_PIN_PA23, 0); /* ETX2 */
> + at91_set_B_periph(AT91_PIN_PA24, 0); /* ETX3 */
> +#endif
> + at91_set_B_periph(AT91_PIN_PA22, 0); /* ETXER */
> +#endif
> +
> +}
> +#endif
> +
> +int board_init(void)
> +{
> + /* Enable Ctrlc */
> + console_init_f();
> +
> + /* arch number of AT91SAM9G20EK-Board */
> + gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK;
> + /* adress of boot parameters */
> + gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
> +
> + at91sam9g20ek_serial_hw_init();
> +#ifdef CONFIG_CMD_NAND
> + at91sam9g20ek_nand_hw_init();
> +#endif
> +#ifdef CONFIG_HAS_DATAFLASH
> + at91sam9g20ek_spi_hw_init();
> +#endif
> +#ifdef CONFIG_MACB
> + at91sam9g20ek_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
> +}
> +#endif
> +
> +#if defined(CONFIG_CMD_NET)
> +int board_eth_init(bd_t *bis)
> +{
> + return at91sam9_eth_initialize(bis);
> +}
> +#endif
> diff --git a/board/atmel/at91sam9g20ek/config.mk
> b/board/atmel/at91sam9g20ek/config.mk
> new file mode 100644
> index 0000000..ff2cfd1
> --- /dev/null
> +++ b/board/atmel/at91sam9g20ek/config.mk
> @@ -0,0 +1 @@
> +TEXT_BASE = 0x23f00000
> diff --git a/board/atmel/at91sam9g20ek/led.c b/board/atmel/at91sam9g20ek/led.c
> new file mode 100644
> index 0000000..ddc375f
> --- /dev/null
> +++ b/board/atmel/at91sam9g20ek/led.c
> @@ -0,0 +1,64 @@
> +/*
> + * (C) Copyright 2007-2008
> + * Stelian Pop <stelian.pop@leadtechdesign.com>
> + * Lead Tech Design <www.leadtechdesign.com>
> + *
> + * 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_pmc.h>
> +#include <asm/arch/gpio.h>
> +#include <asm/arch/io.h>
> +
> +#define RED_LED AT91_PIN_PA9 /* this is the power led */
> +#define GREEN_LED AT91_PIN_PA6 /* this is the user led */
> +
> +void red_LED_on(void)
> +{
> + at91_set_gpio_value(RED_LED, 1);
> +}
> +
> +void red_LED_off(void)
> +{
> + at91_set_gpio_value(RED_LED, 0);
> +}
> +
> +void green_LED_on(void)
> +{
> + at91_set_gpio_value(GREEN_LED, 0);
> +}
> +
> +void green_LED_off(void)
> +{
> + at91_set_gpio_value(GREEN_LED, 1);
> +}
> +
> +void coloured_LED_init(void)
> +{
> + /* Enable clock */
> + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOA);
> +
> + at91_set_gpio_output(RED_LED, 1);
> + at91_set_gpio_output(GREEN_LED, 1);
> +
> + at91_set_gpio_value(RED_LED, 0);
> + at91_set_gpio_value(GREEN_LED, 1);
> +}
> diff --git a/board/atmel/at91sam9g20ek/nand.c b/board/atmel/at91sam9g20ek/nand.c
> new file mode 100644
> index 0000000..25d3277
> --- /dev/null
> +++ b/board/atmel/at91sam9g20ek/nand.c
> @@ -0,0 +1,79 @@
> +/*
> + * (C) Copyright 2007-2008
> + * Stelian Pop <stelian.pop@leadtechdesign.com>
> + * Lead Tech Design <www.leadtechdesign.com>
> + *
> + * (C) Copyright 2006 ATMEL Rousset, Lacressonniere Nicolas
> + *
> + * 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/gpio.h>
> +#include <asm/arch/at91_pio.h>
> +
> +#include <nand.h>
> +
> +/*
> + * hardware specific access to control-lines
> + */
> +#define MASK_ALE (1 << 21) /* our ALE is AD21 */
> +#define MASK_CLE (1 << 22) /* our CLE is AD22 */
> +
> +static void at91sam9g20ek_nand_hwcontrol(struct mtd_info *mtd, int cmd)
> +{
> + struct nand_chip *this = mtd->priv;
> + ulong IO_ADDR_W = (ulong) this->IO_ADDR_W;
> +
> + IO_ADDR_W &= ~(MASK_ALE|MASK_CLE);
> + switch (cmd) {
> + case NAND_CTL_SETCLE:
> + IO_ADDR_W |= MASK_CLE;
> + break;
> + case NAND_CTL_SETALE:
> + IO_ADDR_W |= MASK_ALE;
> + break;
> + case NAND_CTL_CLRNCE:
> + at91_set_gpio_value(AT91_PIN_PC14, 1);
> + break;
> + case NAND_CTL_SETNCE:
> + at91_set_gpio_value(AT91_PIN_PC14, 0);
> + break;
> + }
> + this->IO_ADDR_W = (void *) IO_ADDR_W;
> +}
> +
> +static int at91sam9g20ek_nand_ready(struct mtd_info *mtd)
> +{
> + return at91_get_gpio_value(AT91_PIN_PC13);
> +}
> +
> +int board_nand_init(struct nand_chip *nand)
> +{
> + nand->eccmode = NAND_ECC_SOFT;
> +#ifdef CFG_NAND_DBW_16
> + nand->options = NAND_BUSWIDTH_16;
> +#endif
> + nand->hwcontrol = at91sam9g20ek_nand_hwcontrol;
> + nand->dev_ready = at91sam9g20ek_nand_ready;
> + nand->chip_delay = 20;
> +
> + return 0;
> +}
> diff --git a/board/atmel/at91sam9g20ek/partition.c
> b/board/atmel/at91sam9g20ek/partition.c
> new file mode 100644
> index 0000000..557d695
> --- /dev/null
> +++ b/board/atmel/at91sam9g20ek/partition.c
> @@ -0,0 +1,40 @@
> +/*
> + * (C) Copyright 2008
> + * Ulf Samuelsson <ulf@atmel.com>
> + *
> + * 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_SET, 0, "Bootstrap"},
> + {0x00004200, 0x000083FF, FLAG_PROTECT_CLEAR, 0, "Environment"},
> + {0x00008400, 0x00041FFF, FLAG_PROTECT_SET, 0, "U-Boot"},
> + {0x00042000, 0x00251FFF, FLAG_PROTECT_CLEAR, 0, "Kernel"},
> + {0x00252000, 0xFFFFFFFF, FLAG_PROTECT_CLEAR, 0, "FS"},
> +};
> diff --git a/drivers/net/macb.c b/drivers/net/macb.c
> index aa39284..49e81d9 100644
> --- a/drivers/net/macb.c
> +++ b/drivers/net/macb.c
> @@ -414,18 +414,16 @@ static int macb_init(struct eth_device *netdev, bd_t *bd)
>
> /* choose RMII or MII mode. This depends on the board */
> #ifdef CONFIG_RMII
> -#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
> - defined(CONFIG_AT91SAM9263)
> - macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
> -#else
> +#ifdef CONFIG_AVR32
> macb_writel(macb, USRIO, 0);
> -#endif
> #else
> -#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
> - defined(CONFIG_AT91SAM9263)
> - macb_writel(macb, USRIO, MACB_BIT(CLKEN));
> + macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
> +#endif
> #else
> +#ifdef CONFIG_AVR32
> macb_writel(macb, USRIO, MACB_BIT(MII));
> +#else
> + macb_writel(macb, USRIO, MACB_BIT(CLKEN));
> #endif
> #endif /* CONFIG_RMII */
>
> diff --git a/include/asm-arm/arch-at91/hardware.h
> b/include/asm-arm/arch-at91/hardware.h
> index f312419..76b4f0e 100644
> --- a/include/asm-arm/arch-at91/hardware.h
> +++ b/include/asm-arm/arch-at91/hardware.h
> @@ -18,7 +18,7 @@
>
> #if defined(CONFIG_AT91RM9200)
> #include <asm/arch/at91rm9200.h>
> -#elif defined(CONFIG_AT91SAM9260)
> +#elif defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20)
> #include <asm/arch/at91sam9260.h>
> #define AT91_BASE_EMAC AT91SAM9260_BASE_EMAC
> #define AT91_BASE_SPI AT91SAM9260_BASE_SPI0
> diff --git a/include/configs/at91sam9g20ek.h b/include/configs/at91sam9g20ek.h
> new file mode 100644
> index 0000000..ed64895
> --- /dev/null
> +++ b/include/configs/at91sam9g20ek.h
> @@ -0,0 +1,202 @@
> +/*
> + * (C) Copyright 2007-2008
> + * Stelian Pop <stelian.pop@leadtechdesign.com>
> + * Lead Tech Design <www.leadtechdesign.com>
> + *
> + * Configuation settings for the AT91SAM9G20EK board.
> + *
> + * 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 396288000 /* from 18.432 MHz crystal */
> +#define AT91_MASTER_CLOCK 132096000 /* peripheral = main / 3 */
> +#define CFG_HZ 1000000 /* 1us resolution */
> +
> +#define AT91_SLOW_CLOCK 32768 /* slow clock */
> +
> +#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */
> +#define CONFIG_AT91SAM9G20 1 /* It's an Atmel AT91SAM9G20 SoC*/
> +#define CONFIG_AT91SAM9G20EK 1 /* on an AT91SAM9G20EK 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
> +#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)
> +#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 (0x22 << 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
> +#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_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 /* AT91SAM9G20_UHP_BASE */
> +#define CFG_USB_OHCI_SLOT_NAME "at91sam9g20"
> +#define CFG_USB_OHCI_MAX_ROOT_PORTS 2
> +#define CONFIG_USB_STORAGE 1
> +
> +#define CFG_LOAD_ADDR 0x22000000 /* load address */
> +
> +#define CFG_MEMTEST_START PHYS_SDRAM
> +#define CFG_MEMTEST_END 0x23e00000
> +
> +#undef CFG_USE_DATAFLASH_CS0
> +#define CFG_USE_DATAFLASH_CS1 1
> +#undef CFG_USE_NANDFLASH
> +
> +#ifdef CFG_USE_DATAFLASH_CS0
> +
> +/* bootstrap + u-boot + env + linux in dataflash on CS0 */
> +#define CFG_ENV_IS_IN_DATAFLASH 1
> +#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
> +#define CFG_ENV_OFFSET 0x4200
> +#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
> +#define CFG_ENV_SIZE 0x4200
> +#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
> +#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
> + "root=/dev/mtdblock0 " \
> + "mtdparts=at91_nand:-(root) " \
> + "rw rootfstype=jffs2"
> +
> +#elif CFG_USE_DATAFLASH_CS1
> +
> +/* 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 "cp.b 0xD0042000 0x22000000 0x210000; bootm"
> +#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
> + "root=/dev/mtdblock0 " \
> + "mtdparts=at91_nand:-(root) " \
> + "rw rootfstype=jffs2"
> +
> +#else /* CFG_USE_NANDFLASH */
> +
> +/* bootstrap + u-boot + env + linux in nandflash */
> +#define CFG_ENV_IS_IN_NAND 1
> +#define CFG_ENV_OFFSET 0x60000
> +#define CFG_ENV_OFFSET_REDUND 0x80000
> +#define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
> +#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
> +#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
> + "root=/dev/mtdblock5 " \
> + "mtdparts=at91_nand:128k(bootstrap)ro," \
> + "256k(uboot)ro,128k(env1)ro," \
> + "128k(env2)ro,2M(linux),-(root) " \
> + "rw rootfstype=jffs2"
> +
> +#endif
> +
> +#define CONFIG_BAUDRATE 115200
> +#define CFG_BAUDRATE_TABLE {115200 , 19200, 38400, 57600, 9600 }
> +
> +#define CFG_PROMPT "U-Boot> "
> +#define CFG_CBSIZE 256
> +#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)
> +#define CFG_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
> --
> 1.5.0.6
>
^ permalink raw reply [flat|nested] 14+ messages in thread