June 2010 - U-Boot

[U-Boot] [PATCH] get_ram_size: memory content of base address was not restored
by ratbert.chuang＠gmail.com 09 Aug '10

09 Aug '10

From: Po-Yu Chuang <ratbert(a)faraday-tech.com> Signed-off-by: Po-Yu Chuang <ratbert(a)faraday-tech.com> --- common/memsize.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/common/memsize.c b/common/memsize.c index 6c275c9..99469ab 100644 --- a/common/memsize.c +++ b/common/memsize.c @@ -74,6 +74,7 @@ long get_ram_size(volatile long *base, long maxsize) return (0); } + *addr = save[i]; for (cnt = 1; cnt < maxsize / sizeof (long); cnt <<= 1) { addr = base + cnt; /* pointer arith! */ val = *addr; -- 1.6.0.4

3 2

[U-Boot] [PATCH] fdt relocate: have more attention to use a bootmap or not
by Stephan Linz 08 Aug '10

08 Aug '10

Platforms with flat device tree support can use a bootmap to relocate the fdt_blob. This is not a must. That's why the relocation function boot_relocate_fdt() should be use only if CONFIG_OF_LIBFDT was defined together with CONFIG_SYS_BOOTMAPSZ (see common/cmd_bootm.c). On MicroBlaze platforms there is no need to use a bootmap to relocate a fdt blob. So we need a more precise focus on the compilation and usage of boot_relocate_fdt(). In general it is valid to exclude the function boot_relocate_fdt() if the bootmap size CONFIG_SYS_BOOTMAPSZ is not defined. Signed-off-by: Stephan Linz <linz(a)li-pro.net> --- arch/powerpc/lib/bootm.c | 4 ++-- common/image.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 6702df5..0efd66c 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -253,7 +253,7 @@ static int boot_body_linux(bootm_headers_t *images) if (ret) return ret; -#if defined(CONFIG_OF_LIBFDT) +#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_SYS_BOOTMAPSZ) ret = boot_relocate_fdt(lmb, bootmap_base, of_flat_tree, &of_size); if (ret) return ret; @@ -292,7 +292,7 @@ static int boot_body_linux(bootm_headers_t *images) if (*initrd_start && *initrd_end) fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1); } -#endif /* CONFIG_OF_LIBFDT */ +#endif /* CONFIG_OF_LIBFDT && CONFIG_SYS_BOOTMAPSZ */ return 0; } diff --git a/common/image.c b/common/image.c index 2b6007e..b23b6a8 100644 --- a/common/image.c +++ b/common/image.c @@ -1178,6 +1178,7 @@ static int fit_check_fdt (const void *fit, int fdt_noffset, int verify) * 0 - success * 1 - failure */ +#if defined(CONFIG_SYS_BOOTMAPSZ) int boot_relocate_fdt (struct lmb *lmb, ulong bootmap_base, char **of_flat_tree, ulong *of_size) { @@ -1257,6 +1258,7 @@ int boot_relocate_fdt (struct lmb *lmb, ulong bootmap_base, error: return 1; } +#endif /* CONFIG_SYS_BOOTMAPSZ */ /** * boot_get_fdt - main fdt handling routine -- 1.6.0.4

2 1

[U-Boot] [U-BOOT][PATCH]mmc: modify setting tran_speed and change csd's instead of response value
by Jaehoon Chung 08 Aug '10

08 Aug '10

This patch do the following 1. we need not use cmd.response, because we assinged cmd.response value to mmc->csd. 2. mmc_set_clock() is hard setting, that is not good solution and if mmc is not MMC_MODE_HS, mmc will set card's tran_speed. Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> --- drivers/mmc/mmc.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index cf4ea16..fd80a27 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -666,7 +666,7 @@ int mmc_startup(struct mmc *mmc) mmc->csd[3] = cmd.response[3]; if (mmc->version == MMC_VERSION_UNKNOWN) { - int version = (cmd.response[0] >> 26) & 0xf; + int version = (mmc->csd[0] >> 26) & 0xf; switch (version) { case 0: @@ -691,17 +691,17 @@ int mmc_startup(struct mmc *mmc) } /* divide frequency by 10, since the mults are 10x bigger */ - freq = fbase[(cmd.response[0] & 0x7)]; - mult = multipliers[((cmd.response[0] >> 3) & 0xf)]; + freq = fbase[(mmc->csd[0] & 0x7)]; + mult = multipliers[((mmc->csd[0] >> 3) & 0xf)]; mmc->tran_speed = freq * mult; - mmc->read_bl_len = 1 << ((cmd.response[1] >> 16) & 0xf); + mmc->read_bl_len = 1 << ((mmc->csd[1] >> 16) & 0xf); if (IS_SD(mmc)) mmc->write_bl_len = mmc->read_bl_len; else - mmc->write_bl_len = 1 << ((cmd.response[3] >> 22) & 0xf); + mmc->write_bl_len = 1 << ((mmc->csd[3] >> 22) & 0xf); if (mmc->high_capacity) { csize = (mmc->csd[1] & 0x3f) << 16 @@ -794,11 +794,12 @@ int mmc_startup(struct mmc *mmc) if (mmc->card_caps & MMC_MODE_HS) { if (mmc->card_caps & MMC_MODE_HS_52MHz) - mmc_set_clock(mmc, 52000000); + mmc->tran_speed = 52000000; else - mmc_set_clock(mmc, 26000000); - } else - mmc_set_clock(mmc, 20000000); + mmc->tran_speed = 26000000; + } + + mmc_set_clock(mmc, mmc->tran_speed); } /* fill in device description */ -- 1.6.0.4

3 3

[U-Boot] [PATCH v2] Add mkimage manpage
by Nobuhiro Iwamatsu 08 Aug '10

08 Aug '10

As for some distribution, a mkimage command is made a package. However, there was not manual of mkimage. This provides manual of mkimage. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- tools/mkimage.1 | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 tools/mkimage.1 diff --git a/tools/mkimage.1 b/tools/mkimage.1 new file mode 100644 index 0000000..d8079bb --- /dev/null +++ b/tools/mkimage.1 @@ -0,0 +1,65 @@ +.TH MKIMAGE 1 "2010-05-16" + +.SH NAME +mkimage \- Generate image for U-Boot +.SH SYNOPSIS +.B mkimage +.RB [\fIoptions\fP] +.SH "DESCRIPTION" +.B mkimage +can also be used to create images for use with U-Boot, either +separated from the Linux kernel image, or combined into one file. +mkimage encapsulates the images with header containing information +about target architecture, operating system, image type, compression method, +entry points, time stamp, checksums, etc. + +.SH "OPTIONS" + +.TP +.BI "\-l [" "uimage file name" "]" +mkimage lists the information contained in the header of an existing U-Boot image. + +.TP +.BI "\-A [" "architecture" "]" +Set architecture. Pass -h as the architecture to see the list of supported architectures. + +.TP +.BI "\-O [" "os" "]" +Set operating system. bootm command of u-boot changes boot method by os type. +Pass -h as the OS to see the list of supported OS. + +.TP +.BI "\-T [" "image type" "]" +Set image type. +Pass -h as the image to see the list of supported image type. + +.TP +.BI "\-C [" "compression type" "]" +Set compression type. +Pass -h as the compression to see the list of supported compression type. + +.TP +.BI "\-a [" "load addess" "]" +Set load address with a hex number. + +.TP +.BI "\-e [" "entry point" "]" +Set entry point with a hex number. + +.TP +.BI "\-n [" "image name" "]" +Set image name to 'image name'. + +.TP +.BI "\-d [" "image data file" "]" +Use image data from 'image data file'. + +.TP +.BI "\-x" +Set XIP (execute in place) flag. + +.SH HOMEPAGE +http://www.denx.de/wiki/U-Boot/WebHome +.PP +.SH AUTHOR +This manual page was written by Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> -- 1.7.1

3 2

[U-Boot] Bug in IP/UDP defragment?
by Fillod Stephane 08 Aug '10

08 Aug '10

Hi, I'm encountering a problem when tftp'ing a file of size 1747851 bytes with CONFIG_IP_DEFRAG defined and CONFIG_TFTP_BLOCKSIZE set to 4096. U-Boot's tftp times out on the last chunk. Undefining CONFIG_IP_DEFRAG/CONFIG_TFTP_BLOCKSIZE or downloading with a Linux tftp client are all well, so it does not look like a server problem. In fact, a file size between 1747845 and 1747851 bytes (incl.) makes the tftp client to timeout. File sizes slightly below or higher than the before mentioned range are fine. tcpdump trace of the last chunk yielding a timeout: 16:58:32.289427 IP 10.12.48.32.3285 > 10.12.48.10.33088: UDP, length 4 16:58:32.289449 IP 10.12.48.10.33088 > 10.12.48.32.3285: UDP, length 4100 16:58:32.289452 IP 10.12.48.10 > 10.12.48.32: udp 16:58:32.289454 IP 10.12.48.10 > 10.12.48.32: udp 16:58:32.290386 IP 10.12.48.32.3285 > 10.12.48.10.33088: UDP, length 4 16:58:32.290407 IP 10.12.48.10.33088 > 10.12.48.32.3285: UDP, length 2959 16:58:32.290410 IP 10.12.48.10 > 10.12.48.32: udp 16:58:32.290412 IP 10.12.48.10 > 10.12.48.32: udp The patch below appears to solve my problem. WARNING: since I haven't rolled my mind yet around the NetDefragment IP/UDP stack, I don't know yet what are the side effects of my patch. --- a/net/net.c 31 Mar 2010 21:54:39 +++ b/net/net.c 4 Jun 2010 15:09:08 @@ -1201,7 +1201,7 @@ static IP_t *__NetDefragment(IP_t *ip, i h = payload + h->next_hole; } - if (offset8 + (len / 8) <= h - payload) { + if (offset8 + (len / 8) < h - payload) { /* no overlap with holes (dup fragment?) */ return NULL; } The same problem should exist for NFS fragments. The arch is powerpc, U-Boot version 2010.03 (no fix seen in 2010.06-rc). Best Regards -- Stephane

3 4

[U-Boot] cannot load file from ext2 partition on OMAP3 evm
by Mickael LANOE 08 Aug '10

08 Aug '10

Hi, The command ext2load does not work on the OMAP3 EVM. The command line is: # ext2load mmc 0:2 0x82000000 /boot/uImage The error is: ext2fs_devread() read error - block After reading the u-boot source code, I see that the function mmc_bread() in file drivers/mmc/omap3_mmc.c does not return the good value. So I apply this small patch to fix the problem Best regards, Mickael LANOE diff --git a/drivers/mmc/omap3_mmc.c b/drivers/mmc/omap3_mmc.c index 96c0e65..b555c73 100644 --- a/drivers/mmc/omap3_mmc.c +++ b/drivers/mmc/omap3_mmc.c @@ -507,9 +507,10 @@ unsigned char configure_mmc(mmc_card_data *mmc_card_cur) unsigned long mmc_bread(int dev_num, unsigned long blknr, lbaint_t blkcnt, void *dst) { - omap_mmc_read_sect(blknr, (blkcnt * MMCSD_SECTOR_SIZE), &cur_card_data, - (unsigned long *) dst); - return 1; + if(omap_mmc_read_sect(blknr, (blkcnt * MMCSD_SECTOR_SIZE), &cur_card_data, + (unsigned long *) dst) != 1) + return 0; + return blkcnt; } int mmc_legacy_init(int verbose)

2 1

[U-Boot] [PATCH] fix bug in get_ram_size()
by ratbert.chuang＠gmail.com 07 Aug '10

07 Aug '10

From: Po-Yu Chuang <ratbert(a)faraday-tech.com> memory content of base address was not restored Signed-off-by: Po-Yu Chuang <ratbert(a)faraday-tech.com> --- common/memsize.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/common/memsize.c b/common/memsize.c index 6c275c9..99469ab 100644 --- a/common/memsize.c +++ b/common/memsize.c @@ -74,6 +74,7 @@ long get_ram_size(volatile long *base, long maxsize) return (0); } + *addr = save[i]; for (cnt = 1; cnt < maxsize / sizeof (long); cnt <<= 1) { addr = base + cnt; /* pointer arith! */ val = *addr; -- 1.6.3.3

3 2

[U-Boot] [GIT PULL] u-boot-mpc83xx fix
by Kim Phillips 07 Aug '10

07 Aug '10

Wolfgang Denk, Please pull a fix for the mpc8313 usb setting: The following changes since commit 9bb3b3d4406c1e388a99f6fb189147d6a06cc2cf: Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx (2010-05-30 21:44:07 +0200) are available in the git repository at: git://git.denx.de/u-boot-mpc83xx.git master Ron Madrid (1): Update SICRL_USBDR to reflect 4 different settings include/configs/MPC8313ERDB.h | 2 +- include/configs/SIMPC8313.h | 2 +- include/mpc83xx.h | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) Also, I've noticed main CHANGELOG updates are still being performed: commit c4976807cbbabd281f45466ac5e47e5639bcc9cb Author: Wolfgang Denk <wd(a)denx.de> Date: Wed May 26 23:51:22 2010 +0200 Coding style cleanup, update CHANGELOG. Signed-off-by: Wolfgang Denk <wd(a)denx.de> Any news wrt implementing a gitattributes based solution instead?: http://lists.denx.de/pipermail/u-boot/2010-May/071118.html Kim

2 6

[U-Boot] [PATCH] AT91 Fix: return value of get_tbclk
by Jens Scharsig 07 Aug '10

07 Aug '10

* Fix: return value of get_tbclk * this fixes issue with prematurely restart/retry, if BOOT_RETRY_TIMEOUT is used Signed-off-by: Jens Scharsig <js_at_ng(a)scharsoft.de> --- cpu/arm926ejs/at91/timer.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/cpu/arm926ejs/at91/timer.c b/cpu/arm926ejs/at91/timer.c index d21eebf..8efc34b 100644 --- a/cpu/arm926ejs/at91/timer.c +++ b/cpu/arm926ejs/at91/timer.c @@ -138,8 +138,5 @@ ulong get_timer(ulong base) */ ulong get_tbclk(void) { - ulong tbclk; - - tbclk = CONFIG_SYS_HZ; - return tbclk; + return timer_freq; } -- 1.6.0.2

1 2

[U-Boot] [PATCH] Add support for NetusG20
by Claudio Mignanti 04 Aug '10

04 Aug '10

Add support for the NetusG20 board by Acmesystems srl. This board is based on AT91SAM9G20 SoC. Signed-off-by: Claudio Mignanti <c.mignanti(a)gmail.com> --- MAKEALL | 1 + Makefile | 3 + arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c | 5 + board/acmesystems/netusg20/Makefile | 56 +++++++ board/acmesystems/netusg20/config.mk | 1 + board/acmesystems/netusg20/led.c | 40 +++++ board/acmesystems/netusg20/netusg20.c | 152 +++++++++++++++++ board/acmesystems/netusg20/partition.c | 39 +++++ include/configs/netusg20.h | 181 +++++++++++++++++++++ 9 files changed, 478 insertions(+), 0 deletions(-) create mode 100644 board/acmesystems/netusg20/Makefile create mode 100644 board/acmesystems/netusg20/config.mk create mode 100644 board/acmesystems/netusg20/led.c create mode 100644 board/acmesystems/netusg20/netusg20.c create mode 100644 board/acmesystems/netusg20/partition.c create mode 100644 include/configs/netusg20.h diff --git a/MAKEALL b/MAKEALL index d6d5f5b..60e36e1 100755 --- a/MAKEALL +++ b/MAKEALL @@ -684,6 +684,7 @@ LIST_at91=" \ meesc \ mp2usb \ m501sk \ + netusg20 \ otc570 \ pm9261 \ pm9263 \ diff --git a/Makefile b/Makefile index 87d5214..b73659f 100644 --- a/Makefile +++ b/Makefile @@ -2867,6 +2867,9 @@ at91sam9g45ekes_config : unconfig fi; @$(MKCONFIG) -a at91sam9m10g45ek arm arm926ejs at91sam9m10g45ek atmel at91 +netusg20_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs netusg20 acmesystems at91 + otc570_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs otc570 esd at91 diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c index 77d49ab..87ec531 100644 --- a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c +++ b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c @@ -59,7 +59,12 @@ void at91_serial3_hw_init(void) { at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; +#ifdef CONFIG_NETUSG20 + /* pull-up active on DRXD*/ + at91_set_a_periph(AT91_PIO_PORTB, 14, 1); +#else at91_set_a_periph(AT91_PIO_PORTB, 14, 0); /* DRXD */ +#endif at91_set_a_periph(AT91_PIO_PORTB, 15, 1); /* DTXD */ writel(1 << AT91_ID_SYS, &pmc->pcer); } diff --git a/board/acmesystems/netusg20/Makefile b/board/acmesystems/netusg20/Makefile new file mode 100644 index 0000000..31589fd --- /dev/null +++ b/board/acmesystems/netusg20/Makefile @@ -0,0 +1,56 @@ +# +# (C) Copyright 2003-2008 +# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +# +# (C) Copyright 2008 +# Stelian Pop <stelian.pop(a)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 += netusg20.o +COBJS-y += led.o +COBJS-y += 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/acmesystems/netusg20/config.mk b/board/acmesystems/netusg20/config.mk new file mode 100644 index 0000000..ff2cfd1 --- /dev/null +++ b/board/acmesystems/netusg20/config.mk @@ -0,0 +1 @@ +TEXT_BASE = 0x23f00000 diff --git a/board/acmesystems/netusg20/led.c b/board/acmesystems/netusg20/led.c new file mode 100644 index 0000000..1016b98 --- /dev/null +++ b/board/acmesystems/netusg20/led.c @@ -0,0 +1,40 @@ +/* + * (C) Copyright 2007-2008 + * Stelian Pop <stelian.pop(a)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_value(CONFIG_RED_LED, 1); +} diff --git a/board/acmesystems/netusg20/netusg20.c b/board/acmesystems/netusg20/netusg20.c new file mode 100644 index 0000000..94b4d4c --- /dev/null +++ b/board/acmesystems/netusg20/netusg20.c @@ -0,0 +1,152 @@ +/* + * (C) Copyright 2007-2008 + * Stelian Pop <stelian.pop(a)leadtechdesign.com> + * Lead Tech Design <www.leadtechdesign.com> + * + * (C) Copyright 2010 + * Claudio Mignanti <c.mignanti(a)gmail.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_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_MACB +static void at91sam9260ek_macb_hw_init(void) +{ + unsigned long rstc; + + /* 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); + + rstc = at91_sys_read(AT91_RSTC_MR) & AT91_RSTC_ERSTL; + + 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 | + (rstc) | + 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(); + + gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9G20EK; + + /* adress of boot parameters */ + gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; + + at91_serial_hw_init(); +#ifdef CONFIG_HAS_DATAFLASH + at91_spi0_hw_init((1 << 0) | (1 << 1)); +#endif +#ifdef CONFIG_MACB + at91sam9260ek_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; +} + +void show_boot_progress (int val){} diff --git a/board/acmesystems/netusg20/partition.c b/board/acmesystems/netusg20/partition.c new file mode 100644 index 0000000..7d79e53 --- /dev/null +++ b/board/acmesystems/netusg20/partition.c @@ -0,0 +1,39 @@ +/* + * (C) Copyright 2008 + * Ulf Samuelsson <ulf(a)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_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/include/configs/netusg20.h b/include/configs/netusg20.h new file mode 100644 index 0000000..99b4f12 --- /dev/null +++ b/include/configs/netusg20.h @@ -0,0 +1,181 @@ +/* + * (C) Copyright 2007-2008 + * Stelian Pop <stelian.pop(a)leadtechdesign.com> + * Lead Tech Design <www.leadtechdesign.com> + * + * Configuation settings for the NetusG20 boards. + * + * 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_LEGACY + +/* ARM asynchronous clock */ +#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */ +#define CONFIG_SYS_HZ 1000 + +#define CONFIG_DISPLAY_CPUINFO + +#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */ +#define CONFIG_AT91SAM9G20 1 /* It's an Atmel AT91SAM9G20 SoC*/ +#define CONFIG_NETUSG20 1 + +#define CONFIG_ARCH_CPU_INIT +#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_AT91_GPIO 1 +#define CONFIG_ATMEL_USART 1 +#undef CONFIG_USART0 +#undef CONFIG_USART1 +#undef CONFIG_USART2 +#define CONFIG_USART3 1 /* USART 3 is DBGU */ + +/* LED */ +#define 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_LOADS +#undef CONFIG_CMD_SOURCE + +#define CONFIG_CMD_PING 1 +#define CONFIG_CMD_DHCP 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_ATMEL_DATAFLASH_SPI +#define CONFIG_HAS_DATAFLASH 1 +#define CONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS_HZ) +#define CONFIG_SYS_MAX_DATAFLASH_BANKS 1 +#define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 0xD0000000 /* CS1 */ +#define AT91_SPI_CLK 15000000 + +#define DATAFLASH_TCSS (0x22 << 16) +#define DATAFLASH_TCHS (0x1 << 24) + +/* no NAND flash on this board*/ +#define CONFIG_SYS_NO_FLASH + +/* 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 + +/* MMC */ +#define CONFIG_MMC +#define CONFIG_CMD_MMC +#define CONFIG_ATMEL_MCI +#define CONFIG_CMD_AUTOSCRIPT +#define CONFIG_CMD_IMI +#define CONFIG_CMD_SOURCE + +#define MMCI_BASE 0xFFFA8000 + +/* 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_SYS_LOAD_ADDR 0x22000000 /* load address */ + +#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM +#define CONFIG_SYS_MEMTEST_END 0x23e00000 + +/* Filesystem */ +#define CONFIG_CMD_FAT 1 +#define CONFIG_CMD_EXT2 1 + +/* 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 "mmc init; sleep 1; " \ + "ext2load mmc 0 0x23000000 uImage; " \ + "source 0x23000000" +#define CONFIG_BOOTARGS "mem=64M console=ttyS0,115200 " \ + "root=/dev/mmcblk0p1 rootwait" + +#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 -- 1.7.0.4

2 2