diff options
Diffstat (limited to 'target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-005-at91sam9g20ek.patch')
| -rw-r--r-- | target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-005-at91sam9g20ek.patch | 801 |
1 files changed, 0 insertions, 801 deletions
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-005-at91sam9g20ek.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-005-at91sam9g20ek.patch deleted file mode 100644 index b87a655e6..000000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-005-at91sam9g20ek.patch +++ /dev/null @@ -1,801 +0,0 @@ -diff -urN u-boot-2008.10-0rig/Makefile u-boot-2008.10/Makefile ---- u-boot-2008.10-0rig/Makefile 2008-12-28 14:07:30.000000000 +0100 -+++ u-boot-2008.10/Makefile 2008-12-28 14:06:28.000000000 +0100 -@@ -2541,6 +2541,22 @@ - fi; - @$(MKCONFIG) -n at91sam9xeek -a at91sam9260ek arm arm926ejs at91sam9260ek atmel at91 - -+at91sam9g20ek_nandflash_config \ -+at91sam9g20ek_dataflash_cs0_config \ -+at91sam9g20ek_dataflash_cs1_config \ -+at91sam9g20ek_config : unconfig -+ @if [ "$(findstring _nandflash,$@)" ] ; then \ -+ echo "#define CONFIG_USE_NANDFLASH 1" >>$(obj)include/config.h ; \ -+ $(XECHO) "... with environment variable in NAND FLASH" ; \ -+ elif [ "$(findstring dataflash_cs0,$@)" ] ; then \ -+ echo "#define CONFIG_USE_DATAFLASH_CS0 1" >>$(obj)include/config.h ; \ -+ $(XECHO) "... with environment variable in SPI DATAFLASH CS0" ; \ -+ else \ -+ echo "#define CONFIG_USE_DATAFLASH_CS1 1" >>$(obj)include/config.h ; \ -+ $(XECHO) "... with environment variable in SPI DATAFLASH CS1" ; \ -+ fi; -+ @$(MKCONFIG) -a at91sam9g20ek arm arm926ejs at91sam9g20ek atmel at91 -+ - at91sam9261ek_nandflash_config \ - at91sam9261ek_dataflash_cs0_config \ - at91sam9261ek_dataflash_cs3_config \ -Index: include/configs/at91sam9g20ek.h -=================================================================== ---- a/include/configs/at91sam9g20ek.h (.../u-boot-1.3.4) (revision 0) -+++ b/include/configs/at91sam9g20ek.h (.../u-boot-1.3.4-exp) (revision 8417) -@@ -0,0 +1,198 @@ -+/* -+ * (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 CONFIG_SYS_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 -+#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 CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) -+#define CONFIG_SYS_MAX_DATAFLASH_BANKS 2 -+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 /* CS0 */ -+#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 0xD0000000 /* CS1 */ -+#define AT91_SPI_CLK 15000000 -+#define DATAFLASH_TCSS (0x22 << 16) -+#define DATAFLASH_TCHS (0x1 << 24) -+#define AT91SAM9260_BASE_SPI0 0xfffc8000 -+/* NAND flash */ -+#define NAND_MAX_CHIPS 1 -+#define CONFIG_SYS_MAX_NAND_DEVICE 1 -+#define CONFIG_SYS_NAND_BASE 0x40000000 -+#define CONFIG_SYS_NAND_DBW_8 1 -+ -+/* 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 -+#define AT91SAM9260_BASE_EMAC 0xfffc4000 -+/* USB */ -+#define CONFIG_USB_OHCI_NEW 1 -+#define LITTLEENDIAN 1 -+#define CONFIG_DOS_PARTITION 1 -+#define CONFIG_SYS_USB_OHCI_CPU_INIT 1 -+#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9G20_UHP_BASE */ -+#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9g20" -+#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -+#define CONFIG_USB_STORAGE 1 -+ -+#define CONFIG_SYS_LOAD_ADDR 0x22000000 /* load address */ -+ -+#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM -+#define CONFIG_SYS_MEMTEST_END 0x23e00000 -+ -+#ifdef CONFIG_USE_DATAFLASH_CS0 -+ -+/* bootstrap + u-boot + env + linux in dataflash on CS0 */ -+#define CONFIG_ENV_IS_IN_DATAFLASH 1 -+#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400) -+#define CONFIG_ENV_OFFSET 0x4200 -+#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) -+#define CONFIG_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 CONFIG_USE_DATAFLASH_CS1 -+ -+/* bootstrap + u-boot + env + linux in dataflash on CS1 */ -+#define CONFIG_ENV_IS_IN_DATAFLASH 1 -+#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400) -+#define CONFIG_ENV_OFFSET 0x4200 -+#define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET) -+#define CONFIG_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 /* CONFIG_USE_NANDFLASH */ -+ -+/* 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 "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 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 -+ -+#define ROUND(A, B) (((A) + (B)) & ~((B) - 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 -Index: board/atmel/at91sam9g20ek/nand.c -=================================================================== ---- a/board/atmel/at91sam9g20ek/nand.c (.../u-boot-1.3.4) (revision 0) -+++ b/board/atmel/at91sam9g20ek/nand.c (.../u-boot-1.3.4-exp) (revision 8417) -@@ -0,0 +1,78 @@ -+/* -+ * (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, unsigned int ctrl) -+{ -+ struct nand_chip *this = mtd->priv; -+ -+ if (ctrl & NAND_CTRL_CHANGE) { -+ ulong IO_ADDR_W = (ulong) this->IO_ADDR_W; -+ IO_ADDR_W &= ~(MASK_ALE | MASK_CLE); -+ -+ if (ctrl & NAND_CLE) -+ IO_ADDR_W |= MASK_CLE; -+ if (ctrl & NAND_ALE) -+ IO_ADDR_W |= MASK_ALE; -+ -+ at91_set_gpio_value(AT91_PIN_PC14, !(ctrl & NAND_NCE)); -+ this->IO_ADDR_W = (void *) IO_ADDR_W; -+ } -+ -+ if (cmd != NAND_CMD_NONE) -+ writeb(cmd, this->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->ecc.mode = NAND_ECC_SOFT; -+#ifdef CONFIG_SYS_NAND_DBW_16 -+ nand->options = NAND_BUSWIDTH_16; -+#endif -+ nand->cmd_ctrl = at91sam9g20ek_nand_hwcontrol; -+ nand->dev_ready = at91sam9g20ek_nand_ready; -+ nand->chip_delay = 20; -+ -+ return 0; -+} -Index: board/atmel/at91sam9g20ek/at91sam9g20ek.c -=================================================================== ---- a/board/atmel/at91sam9g20ek/at91sam9g20ek.c (.../u-boot-1.3.4) (revision 0) -+++ b/board/atmel/at91sam9g20ek/at91sam9g20ek.c (.../u-boot-1.3.4-exp) (revision 8417) -@@ -0,0 +1,250 @@ -+/* -+ * (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 -+#include <netdev.h> -+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 CONFIG_SYS_NAND_DBW_16 -+ AT91_SMC_DBW_16 | -+#else /* CONFIG_SYS_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 -Index: board/atmel/at91sam9g20ek/led.c -=================================================================== ---- a/board/atmel/at91sam9g20ek/led.c (.../u-boot-1.3.4) (revision 0) -+++ b/board/atmel/at91sam9g20ek/led.c (.../u-boot-1.3.4-exp) (revision 8417) -@@ -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); -+} -Index: board/atmel/at91sam9g20ek/partition.c -=================================================================== ---- a/board/atmel/at91sam9g20ek/partition.c (.../u-boot-1.3.4) (revision 0) -+++ b/board/atmel/at91sam9g20ek/partition.c (.../u-boot-1.3.4-exp) (revision 8417) -@@ -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[CONFIG_SYS_MAX_DATAFLASH_BANKS]; -+ -+struct dataflash_addr cs[CONFIG_SYS_MAX_DATAFLASH_BANKS] = { -+ {CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0, 0}, /* Logical adress, CS */ -+ {CONFIG_SYS_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"}, -+}; -Index: board/atmel/at91sam9g20ek/config.mk -=================================================================== ---- a/board/atmel/at91sam9g20ek/config.mk (.../u-boot-1.3.4) (revision 0) -+++ b/board/atmel/at91sam9g20ek/config.mk (.../u-boot-1.3.4-exp) (revision 8417) -@@ -0,0 +1 @@ -+TEXT_BASE = 0x23f00000 -Index: board/atmel/at91sam9g20ek/Makefile -=================================================================== ---- a/board/atmel/at91sam9g20ek/Makefile (.../u-boot-1.3.4) (revision 0) -+++ b/board/atmel/at91sam9g20ek/Makefile (.../u-boot-1.3.4-exp) (revision 8417) -@@ -0,0 +1,57 @@ -+# -+# (C) Copyright 2003-2008 -+# Wolfgang Denk, DENX Software Engineering, wd@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 -+ -+######################################################################### -Index: include/asm-arm/arch-at91/hardware.h -=================================================================== ---- a/include/asm-arm/arch-at91/hardware.h (.../u-boot-1.3.4) (revision 8417) -+++ b/include/asm-arm/arch-at91/hardware.h (.../u-boot-1.3.4-exp) (revision 8417) -@@ -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 -urN u-boot-2008.10-0rig/include/asm-arm/mach-types.h u-boot-2008.10/include/asm-arm/mach-types.h ---- u-boot-2008.10-0rig/include/asm-arm/mach-types.h 2008-10-18 21:30:31.000000000 +0200 -+++ u-boot-2008.10/include/asm-arm/mach-types.h 2008-12-28 23:40:55.000000000 +0100 -@@ -23998,6 +23998,18 @@ - # define machine_is_geneva() (0) - #endif - -+#ifdef CONFIG_MACH_AT91SAM9G20EK -+# ifdef machine_arch_type -+# undef machine_arch_type -+# define machine_arch_type __machine_arch_type -+# else -+# define machine_arch_type MACH_TYPE_AT91SAM9G20EK -+# endif -+# define machine_is_at91sam9g20ek() (machine_arch_type == MACH_TYPE_AT91SAM9G20EK) -+#else -+# define machine_is_at91sam9g20ek() (0) -+#endif -+ - /* - * These have not yet been registered - */ -diff -urN u-boot-2008.10-0rig/board/atmel/at91sam9g20ek/at91sam9g20ek.c u-boot-2008.10/board/atmel/at91sam9g20ek/at91sam9g20ek.c ---- u-boot-2008.10-0rig/board/atmel/at91sam9g20ek/at91sam9g20ek.c 2008-12-28 14:09:52.000000000 +0100 -+++ u-boot-2008.10/board/atmel/at91sam9g20ek/at91sam9g20ek.c 2008-12-28 23:56:09.000000000 +0100 -@@ -248,3 +248,13 @@ - #endif - } - #endif -+ -+int board_eth_init(bd_t *bis) -+{ -+ int rc = 0; -+#ifdef CONFIG_MACB -+ rc = macb_eth_initialize(0, (void *)AT91SAM9260_BASE_EMAC, 0x00); -+#endif -+ return rc; -+} -+ |