[U-Boot] Timeout in tftp.c

Achim Ehrlich

12 May 2009 12 May '09

2:22 p.m.

Hello,

The timeout for lost packages in tftp.c is defined to 5000 msecs. But when setting the timeout get_timer(0) is called in NetSetTimeout in net.c. But on AT91 the timer code returns usecs and not msecs resulting in a timeout of 5 ms instead of 5 secs, which is kind of short. I looked in the timer code of other ARM-based platforms and they seem to use usec-based timers as well. Of course I can change the defined timeout in tftp.c to one second or so, but that doesn't seem to be the right way to solve this issue.

Any suggestions or ideas or do I miss something here?

Kind regards

Achim

Show replies by date

Jean-Christophe PLAGNIOL-VILLARD

12 May 12 May

8:40 p.m.

On 14:22 Tue 12 May , Achim Ehrlich wrote:

...

Hello,

The timeout for lost packages in tftp.c is defined to 5000 msecs. But when setting the timeout get_timer(0) is called in NetSetTimeout in net.c. But on AT91 the timer code returns usecs and not msecs resulting in a timeout of 5 ms instead of 5 secs, which is kind of short. I looked in the timer code of other ARM-based platforms and they seem to use usec-based timers as well. Of course I can change the defined timeout in tftp.c to one second or so, but that doesn't seem to be the right way to solve this issue.

Any suggestions or ideas or do I miss something here?

could you be more precise against which version your test was done?

Best Regards, J.

Wolfgang Denk

8:48 p.m.

Dear Achim Ehrlich,

In message 4A0969FC.2060504@taskit.de you wrote:

...

The timeout for lost packages in tftp.c is defined to 5000 msecs. But when setting the timeout get_timer(0) is called in NetSetTimeout in net.c. But on AT91 the timer code returns usecs and not msecs resulting in a timeout of 5 ms instead of 5 secs, which is kind of short. I looked in the timer code of other ARM-based platforms and they seem to use usec-based timers as well. Of course I can change the defined timeout in tftp.c to one second or so, but that doesn't seem to be the right way to solve this issue.

Any suggestions or ideas or do I miss something here?

Any chance that you are using an old version of U-Boot?

Best regards,

Wolfgang Denk

-- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de Comparing information and knowledge is like asking whether the fatness of a pig is more or less green than the designated hitter rule." - David Guaspari

Jens Gehrlein

13 May 13 May

6:59 a.m.

Wolfgang Denk schrieb:

...

Dear Achim Ehrlich,

In message 4A0969FC.2060504@taskit.de you wrote:

...
The timeout for lost packages in tftp.c is defined to 5000 msecs. But when setting the timeout get_timer(0) is called in NetSetTimeout in net.c. But on AT91 the timer code returns usecs and not msecs resulting in a timeout of 5 ms instead of 5 secs, which is kind of short. I looked in the timer code of other ARM-based platforms and they seem to use usec-based timers as well. Of course I can change the defined timeout in tftp.c to one second or so, but that doesn't seem to be the right way to solve this issue.

Any suggestions or ideas or do I miss something here?

Any chance that you are using an old version of U-Boot?

Hi Achim,

I'm interested in this, too. I observed timeouts on ARM11 (MX31), but couldn't do any investigation due to other projects.

Kind regards, Jens

Achim Ehrlich

1:37 p.m.

Jens Gehrlein schrieb:

...

Wolfgang Denk schrieb:

...
Dear Achim Ehrlich,

In message 4A0969FC.2060504@taskit.de you wrote:

...
The timeout for lost packages in tftp.c is defined to 5000 msecs. But when setting the timeout get_timer(0) is called in NetSetTimeout in net.c. But on AT91 the timer code returns usecs and not msecs resulting in a timeout of 5 ms instead of 5 secs, which is kind of short. I looked in the timer code of other ARM-based platforms and they seem to use usec-based timers as well. Of course I can change the defined timeout in tftp.c to one second or so, but that doesn't seem to be the right way to solve this issue.

Any suggestions or ideas or do I miss something here?

Any chance that you are using an old version of U-Boot?

Hi Achim,

I'm interested in this, too. I observed timeouts on ARM11 (MX31), but couldn't do any investigation due to other projects.

I'm working on a custom developed board with AT91Sam9G20 and on the current at91-tree of u-boot, so all new. I will do further work this afternoon on this issue.

Kind regards

Achim

Jean-Christophe PLAGNIOL-VILLARD

1:39 p.m.

On 13:37 Wed 13 May , Achim Ehrlich wrote:

...

Jens Gehrlein schrieb:

...
Wolfgang Denk schrieb:

...
Dear Achim Ehrlich,

In message 4A0969FC.2060504@taskit.de you wrote:

...
The timeout for lost packages in tftp.c is defined to 5000 msecs. But when setting the timeout get_timer(0) is called in NetSetTimeout in net.c. But on AT91 the timer code returns usecs and not msecs resulting in a timeout of 5 ms instead of 5 secs, which is kind of short. I looked in the timer code of other ARM-based platforms and they seem to use usec-based timers as well. Of course I can change the defined timeout in tftp.c to one second or so, but that doesn't seem to be the right way to solve this issue.

Any suggestions or ideas or do I miss something here?

Any chance that you are using an old version of U-Boot?

Hi Achim,

I'm interested in this, too. I observed timeouts on ARM11 (MX31), but couldn't do any investigation due to other projects.

I'm working on a custom developed board with AT91Sam9G20 and on the current at91-tree of u-boot, so all new. I will do further work this afternoon on this issue.

which value do you put in the CONFIG_SYS_HZ?

if you can send patch we could take a look on this

Best Regards, J.

Achim Ehrlich

14 May 14 May

5:17 p.m.

Jean-Christophe PLAGNIOL-VILLARD schrieb:

...

On 13:37 Wed 13 May , Achim Ehrlich wrote:

...
Jens Gehrlein schrieb:

...
Wolfgang Denk schrieb:

...
Dear Achim Ehrlich,

In message 4A0969FC.2060504@taskit.de you wrote:

...
The timeout for lost packages in tftp.c is defined to 5000 msecs. But when setting the timeout get_timer(0) is called in NetSetTimeout in net.c. But on AT91 the timer code returns usecs and not msecs resulting in a timeout of 5 ms instead of 5 secs, which is kind of short. I looked in the timer code of other ARM-based platforms and they seem to use usec-based timers as well. Of course I can change the defined timeout in tftp.c to one second or so, but that doesn't seem to be the right way to solve this issue.

Any suggestions or ideas or do I miss something here?

Any chance that you are using an old version of U-Boot?

Hi Achim,

I'm interested in this, too. I observed timeouts on ARM11 (MX31), but couldn't do any investigation due to other projects.

I'm working on a custom developed board with AT91Sam9G20 and on the current at91-tree of u-boot, so all new. I will do further work this afternoon on this issue.

which value do you put in the CONFIG_SYS_HZ?

if you can send patch we could take a look on this

Best Regards, J.

My value was at 1000000. Switching back to 1000 didn't solve my problem, but instead causes erase and write operations on nand flash to timeout as well. My u-boot was built on commit 03bab0091948196b9558248684c04f60943ca4b5 of the at-91 tree. Rebasing it to the current version with the changed timer code caused u-boot to not boot at all on my hardware. I just made a simple board port and didn't change much, but I add my diff against u-boot-at91 anyway. It should work on the Atmel Board as well, but I don't own any. Thank you for your help

Achim

-- product manager email:aehrlich@taskit.de Tel.: ++49 30 611295-25 Fax: ++49 30 611295-11 -- taskit GmbH Seelenbinderstr. 33 | D-12555 Berlin web:http://www.taskit.de Amtsgericht Charlottenburg: 93HRB39014 Managing director: Thorsten Raulfs -- diff --git a/Makefile b/Makefile index c52894c..a2cf333 100644 --- a/Makefile +++ b/Makefile @@ -2752,6 +2752,9 @@ at91sam9rlek_config : unconfig pm9263_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs pm9263 ronetix at91 +stamp9G20_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs stamp9G20 NULL at91 + ######################################################################## ## ARM Integrator boards - see doc/README-integrator for more info. integratorap_config \ diff --git a/board/stamp9G20/Makefile b/board/stamp9G20/Makefile new file mode 100644 index 0000000..ef82428 --- /dev/null +++ b/board/stamp9G20/Makefile @@ -0,0 +1,56 @@ +# +# (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 += stamp9G20.o +COBJS-y += led.o +COBJS-$(CONFIG_HAS_DATAFLASH) += partition.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/stamp9G20/config.mk b/board/stamp9G20/config.mk new file mode 100644 index 0000000..ff2cfd1 --- /dev/null +++ b/board/stamp9G20/config.mk @@ -0,0 +1 @@ +TEXT_BASE = 0x23f00000 diff --git a/board/stamp9G20/led.c b/board/stamp9G20/led.c new file mode 100644 index 0000000..2424d27 --- /dev/null +++ b/board/stamp9G20/led.c @@ -0,0 +1,41 @@ +/* + * (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> + +void coloured_LED_init(void) +{ + /* Enable clock */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOA); + + at91_set_gpio_output(CONFIG_RED_LED, 1); + at91_set_gpio_output(CONFIG_GREEN_LED, 1); + + at91_set_gpio_value(CONFIG_RED_LED, 0); + at91_set_gpio_value(CONFIG_GREEN_LED, 1); +} diff --git a/board/stamp9G20/partition.c b/board/stamp9G20/partition.c new file mode 100644 index 0000000..2629c67 --- /dev/null +++ b/board/stamp9G20/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[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"}, +}; diff --git a/board/stamp9G20/stamp9G20.c b/board/stamp9G20/stamp9G20.c new file mode 100644 index 0000000..3bdd1a7 --- /dev/null +++ b/board/stamp9G20/stamp9G20.c @@ -0,0 +1,202 @@ +/* + * (C) Copyright 2007-2008 + * Stelian Pop stelian.pop@leadtechdesign.com + * Lead Tech Design <www.leadtechdesign.com> + * + * 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/at91sam9260_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/gpio.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; + + /* 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_(1) | AT91_SMC_NCS_WRSETUP_(0) | + AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0)); + at91_sys_write(AT91_SMC_PULSE(3), + AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) | + AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3)); + at91_sys_write(AT91_SMC_CYCLE(3), + AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5)); + 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_(2)); + + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_PIOC); + + /* Configure RDY/BSY */ + at91_set_gpio_input(CONFIG_SYS_NAND_READY_PIN, 1); + + /* Enable NandFlash */ + at91_set_gpio_output(CONFIG_SYS_NAND_ENABLE_PIN, 1); +} +#endif + +#ifdef CONFIG_MACB +static void stamp9G20_macb_hw_init(void) +{ + + /* Enable MACB Chip*/ + at91_set_gpio_output(AT91_PIN_PA29,0); + + /* 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_macb_hw_init(); +} +#endif + +int board_init(void) +{ + /* Enable Ctrlc */ + console_init_f(); + +#ifdef CONFIG_AT91SAM9G20EK + /* arch number of AT91SAM9260EK-Board */ + gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK; +#else + /* arch number of AT91SAM9260EK-Board */ + gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9260EK; +#endif + /* adress of boot parameters */ + gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; + + 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 = 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 + +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; +} diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h index 2c1e69b..91fc62f 100644 --- a/include/asm-arm/mach-types.h +++ b/include/asm-arm/mach-types.h @@ -1807,7 +1807,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_JADE 1821 #define MACH_TYPE_KS8695_SOFTPLC 1822 #define MACH_TYPE_GPRISC3 1823 -#define MACH_TYPE_STAMP9260 1824 +#define MACH_TYPE_STAMP9G20 1824 #define MACH_TYPE_SMDK6430 1825 #define MACH_TYPE_SMDKC100 1826 #define MACH_TYPE_TAVOREVB 1827 @@ -23531,16 +23531,16 @@ extern unsigned int __machine_arch_type; # define machine_is_gprisc3() (0) #endif -#ifdef CONFIG_MACH_STAMP9260 +#ifdef CONFIG_MACH_STAMP9G20 # ifdef machine_arch_type # undef machine_arch_type # define machine_arch_type __machine_arch_type # else -# define machine_arch_type MACH_TYPE_STAMP9260 +# define machine_arch_type MACH_TYPE_STAMP9G20 # endif -# define machine_is_stamp9260() (machine_arch_type == MACH_TYPE_STAMP9260) +# define machine_is_stamp9g20() (machine_arch_type == MACH_TYPE_STAMP9G20) #else -# define machine_is_stamp9260() (0) +# define machine_is_stamp9g20() (0) #endif #ifdef CONFIG_MACH_SMDK6430 diff --git a/include/configs/stamp9G20.h b/include/configs/stamp9G20.h new file mode 100644 index 0000000..6c4a1b5 --- /dev/null +++ b/include/configs/stamp9G20.h @@ -0,0 +1,183 @@ +/* + * (C) Copyright 2007-2008 + * Stelian Pop stelian.pop@leadtechdesign.com + * Lead Tech Design <www.leadtechdesign.com> + * (C) 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 + +/* ARM asynchronous clock */ +#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */ +#define CONFIG_SYS_AT91_PLLB 0x10193f05 /* PLLB settings for USB */ +#define CONFIG_SYS_HZ 1000 /* 1ms resolution */ + +#define AT91_SLOW_CLOCK 32768 /* slow clock */ + +#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */ +#define AT91_CPU_NAME "AT91SAM9G20" +//#define AT91_MASTER_CLOCK 132000000 /* peripheral */ +//#define AT91_CPU_CLOCK 396000000 /* cpu */ +#define CONFIG_AT91SAM9G20 1 /* It's an Atmel AT91SAM9G20 SoC*/ + +#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 */ + +/* LED */ +#undef CONFIG_AT91_LED +#define CONFIG_RED_LED AT91_PIN_PA9 /* this is the power led */ +#define CONFIG_GREEN_LED AT91_PIN_PA6 /* this is the user led */ + +#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_FPGA +#undef CONFIG_CMD_IMI +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_SOURCE + +#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 */ +#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_PIN_PC14 +#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC13 +#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 /* AT91SAM9260_UHP_BASE */ +#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 /* load address */ + +#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM +#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 "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" + + +#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

Jean-Christophe PLAGNIOL-VILLARD

5:48 p.m.

...

My value was at 1000000. Switching back to 1000 didn't solve my problem, but instead causes erase and write operations on nand flash to timeout as well. My u-boot was built on commit 03bab0091948196b9558248684c04f60943ca4b5 of the at-91 tree.

this revision does not integrate the timer fix

...

Rebasing it to the current version with the changed timer code caused u-boot to not boot at all on my hardware. I just made a simple board port and didn't change much, but I add my diff against u-boot-at91 anyway. It should work on the Atmel Board as well, but I don't own any.

normaly yes but you need to update a few your config to have it working see comment on your patch

...

Thank you for your help

Achim

...

+#ifdef CONFIG_AT91SAM9G20EK

/* arch number of AT91SAM9260EK-Board */

gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK;

+#else

/* arch number of AT91SAM9260EK-Board */

gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9260EK;

+#endif

sure?

...

/* adress of boot parameters */

gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;

at91_serial_hw_init();

+#ifdef CONFIG_CMD_NAND

stamp9G20_nand_hw_init();

+#endif

...

diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h index 2c1e69b..91fc62f 100644 --- a/include/asm-arm/mach-types.h +++ b/include/asm-arm/mach-types.h

when you will send your final please send a sync request

...

diff --git a/include/configs/stamp9G20.h b/include/configs/stamp9G20.h new file mode 100644 index 0000000..6c4a1b5 --- /dev/null +++ b/include/configs/stamp9G20.h @@ -0,0 +1,183 @@ +/*

(C) Copyright 2007-2008

Stelian Pop stelian.pop@leadtechdesign.com

Lead Tech Design <www.leadtechdesign.com>

(C) 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

+/* ARM asynchronous clock */ +#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */ +#define CONFIG_SYS_AT91_PLLB 0x10193f05 /* PLLB settings for USB */

please remove

...

+#define CONFIG_SYS_HZ 1000 /* 1ms resolution */

+#define AT91_SLOW_CLOCK 32768 /* slow clock */

please remove

...

+#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */ +#define AT91_CPU_NAME "AT91SAM9G20" +//#define AT91_MASTER_CLOCK 132000000 /* peripheral */ +//#define AT91_CPU_CLOCK 396000000 /* cpu */ +#define CONFIG_AT91SAM9G20 1 /* It's an Atmel AT91SAM9G20 SoC*/

please add #define CONFIG_ARCH_CPU_INIT

...

please note I've sync the at91 with u-boot general tree they are the same now but for dev please base your code against u-boot-arm/next

Best Regards, J.

Achim Ehrlich

18 May 18 May

11:46 a.m.

Jean-Christophe PLAGNIOL-VILLARD schrieb:

...

...
My value was at 1000000. Switching back to 1000 didn't solve my problem, but instead causes erase and write operations on nand flash to timeout as well. My u-boot was built on commit 03bab0091948196b9558248684c04f60943ca4b5 of the at-91 tree.

this revision does not integrate the timer fix

...
Rebasing it to the current version with the changed timer code caused u-boot to not boot at all on my hardware. I just made a simple board port and didn't change much, but I add my diff against u-boot-at91 anyway. It should work on the Atmel Board as well, but I don't own any.

normaly yes but you need to update a few your config to have it working see comment on your patch

...
Thank you for your help

Achim

...
+#ifdef CONFIG_AT91SAM9G20EK

/* arch number of AT91SAM9260EK-Board */

gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK;

+#else

/* arch number of AT91SAM9260EK-Board */

gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9260EK;

+#endif

sure?

...

/* adress of boot parameters */

gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;

at91_serial_hw_init();

+#ifdef CONFIG_CMD_NAND

stamp9G20_nand_hw_init();

+#endif

...
diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h index 2c1e69b..91fc62f 100644 --- a/include/asm-arm/mach-types.h +++ b/include/asm-arm/mach-types.h

when you will send your final please send a sync request

...
diff --git a/include/configs/stamp9G20.h b/include/configs/stamp9G20.h new file mode 100644 index 0000000..6c4a1b5 --- /dev/null +++ b/include/configs/stamp9G20.h @@ -0,0 +1,183 @@ +/*

(C) Copyright 2007-2008

Stelian Pop stelian.pop@leadtechdesign.com

Lead Tech Design <www.leadtechdesign.com>

(C) 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

+/* ARM asynchronous clock */ +#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */ +#define CONFIG_SYS_AT91_PLLB 0x10193f05 /* PLLB settings for USB */

please remove

...
+#define CONFIG_SYS_HZ 1000 /* 1ms resolution */

+#define AT91_SLOW_CLOCK 32768 /* slow clock */

please remove

...

+#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */ +#define AT91_CPU_NAME "AT91SAM9G20" +//#define AT91_MASTER_CLOCK 132000000 /* peripheral */ +//#define AT91_CPU_CLOCK 396000000 /* cpu */ +#define CONFIG_AT91SAM9G20 1 /* It's an Atmel AT91SAM9G20 SoC*/

please add #define CONFIG_ARCH_CPU_INIT

...

please note I've sync the at91 with u-boot general tree they are the same now but for dev please base your code against u-boot-arm/next

Best Regards, J.

Thank you, these changes made it work fine. The tftpboot timeout is now correct as well.

Kind regards

Achim

5835

Age (days ago)

5841

Last active (days ago)

List overview

Download

8 comments

4 participants

tags (0)

participants (4)

Achim Ehrlich
Jean-Christophe PLAGNIOL-VILLARD
Jens Gehrlein
Wolfgang Denk