August 2010 - U-Boot

[U-Boot] [PATCH] cmd_elf: CONFIG_ELF_SIMPLE_LOAD: load ELFs according to PHDRs
by Mike Frysinger 06 Oct '10

06 Oct '10

The current ELF loading function does a lot of work above and beyond a simple "loading". It ignores the real load addresses and loads things into their virtual (runtime) address. This is undesirable when we just want it to load an ELF and let the ELF do the actual C runtime init. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- common/cmd_elf.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/common/cmd_elf.c b/common/cmd_elf.c index 3ebb6d9..7b82749 100644 --- a/common/cmd_elf.c +++ b/common/cmd_elf.c @@ -276,6 +276,32 @@ int valid_elf_image (unsigned long addr) * A very simple elf loader, assumes the image is valid, returns the * entry point address. * ====================================================================== */ +#ifdef CONFIG_ELF_SIMPLE_LOAD +unsigned long load_elf_image (unsigned long addr) +{ + Elf32_Ehdr *ehdr; + Elf32_Phdr *phdr; + unsigned long entry; + size_t i; + + ehdr = (Elf32_Ehdr *) addr; + phdr = (Elf32_Phdr *) (addr + ehdr->e_phoff); + + entry = ehdr->e_entry; + + /* Load each program header */ + for (i = 0; i < ehdr->e_phnum; ++i) { + void *dst = (void *) phdr->p_paddr; + void *src = (void *) addr + phdr->p_offset; + printf ("Loading phdr %i to 0x%p (%i bytes)\n", + i, dst, phdr->p_filesz); + memcpy (dst, src, phdr->p_filesz); + ++phdr; + } + + return entry; +} +#else unsigned long load_elf_image (unsigned long addr) { Elf32_Ehdr *ehdr; /* Elf header structure pointer */ @@ -327,6 +353,7 @@ unsigned long load_elf_image (unsigned long addr) return ehdr->e_entry; } +#endif /* ====================================================================== */ U_BOOT_CMD( -- 1.6.0.3

2 5

[U-Boot] [PATCH] hmi1001, mucmc52, uc100, uc101: move boards to vendor directory
by Wolfgang Denk 04 Oct '10

04 Oct '10

Signed-off-by: Wolfgang Denk <wd(a)denx.de> Cc: Heiko Schocher <hs(a)denx.de> Cc: Stefan Roese <sr(a)denx.de> Cc: Roderik Wildenburg <roderik.wildenburg(a)manroland.com> --- board/{ => manroland}/hmi1001/Makefile | 0 board/{ => manroland}/hmi1001/config.mk | 0 board/{ => manroland}/hmi1001/hmi1001.c | 0 board/{ => manroland}/mucmc52/Makefile | 0 board/{ => manroland}/mucmc52/config.mk | 0 board/{ => manroland}/mucmc52/mucmc52.c | 0 board/{ => manroland}/uc100/Makefile | 0 board/{ => manroland}/uc100/config.mk | 0 board/{ => manroland}/uc100/pcmcia.c | 0 board/{ => manroland}/uc100/u-boot.lds | 0 board/{ => manroland}/uc100/u-boot.lds.debug | 0 board/{ => manroland}/uc100/uc100.c | 0 board/{ => manroland}/uc101/Makefile | 0 board/{ => manroland}/uc101/config.mk | 0 board/{ => manroland}/uc101/uc101.c | 0 boards.cfg | 8 ++++---- 16 files changed, 4 insertions(+), 4 deletions(-) rename board/{ => manroland}/hmi1001/Makefile (100%) rename board/{ => manroland}/hmi1001/config.mk (100%) rename board/{ => manroland}/hmi1001/hmi1001.c (100%) rename board/{ => manroland}/mucmc52/Makefile (100%) rename board/{ => manroland}/mucmc52/config.mk (100%) rename board/{ => manroland}/mucmc52/mucmc52.c (100%) rename board/{ => manroland}/uc100/Makefile (100%) rename board/{ => manroland}/uc100/config.mk (100%) rename board/{ => manroland}/uc100/pcmcia.c (100%) rename board/{ => manroland}/uc100/u-boot.lds (100%) rename board/{ => manroland}/uc100/u-boot.lds.debug (100%) rename board/{ => manroland}/uc100/uc100.c (100%) rename board/{ => manroland}/uc101/Makefile (100%) rename board/{ => manroland}/uc101/config.mk (100%) rename board/{ => manroland}/uc101/uc101.c (100%) diff --git a/board/hmi1001/Makefile b/board/manroland/hmi1001/Makefile similarity index 100% rename from board/hmi1001/Makefile rename to board/manroland/hmi1001/Makefile diff --git a/board/hmi1001/config.mk b/board/manroland/hmi1001/config.mk similarity index 100% rename from board/hmi1001/config.mk rename to board/manroland/hmi1001/config.mk diff --git a/board/hmi1001/hmi1001.c b/board/manroland/hmi1001/hmi1001.c similarity index 100% rename from board/hmi1001/hmi1001.c rename to board/manroland/hmi1001/hmi1001.c diff --git a/board/mucmc52/Makefile b/board/manroland/mucmc52/Makefile similarity index 100% rename from board/mucmc52/Makefile rename to board/manroland/mucmc52/Makefile diff --git a/board/mucmc52/config.mk b/board/manroland/mucmc52/config.mk similarity index 100% rename from board/mucmc52/config.mk rename to board/manroland/mucmc52/config.mk diff --git a/board/mucmc52/mucmc52.c b/board/manroland/mucmc52/mucmc52.c similarity index 100% rename from board/mucmc52/mucmc52.c rename to board/manroland/mucmc52/mucmc52.c diff --git a/board/uc100/Makefile b/board/manroland/uc100/Makefile similarity index 100% rename from board/uc100/Makefile rename to board/manroland/uc100/Makefile diff --git a/board/uc100/config.mk b/board/manroland/uc100/config.mk similarity index 100% rename from board/uc100/config.mk rename to board/manroland/uc100/config.mk diff --git a/board/uc100/pcmcia.c b/board/manroland/uc100/pcmcia.c similarity index 100% rename from board/uc100/pcmcia.c rename to board/manroland/uc100/pcmcia.c diff --git a/board/uc100/u-boot.lds b/board/manroland/uc100/u-boot.lds similarity index 100% rename from board/uc100/u-boot.lds rename to board/manroland/uc100/u-boot.lds diff --git a/board/uc100/u-boot.lds.debug b/board/manroland/uc100/u-boot.lds.debug similarity index 100% rename from board/uc100/u-boot.lds.debug rename to board/manroland/uc100/u-boot.lds.debug diff --git a/board/uc100/uc100.c b/board/manroland/uc100/uc100.c similarity index 100% rename from board/uc100/uc100.c rename to board/manroland/uc100/uc100.c diff --git a/board/uc101/Makefile b/board/manroland/uc101/Makefile similarity index 100% rename from board/uc101/Makefile rename to board/manroland/uc101/Makefile diff --git a/board/uc101/config.mk b/board/manroland/uc101/config.mk similarity index 100% rename from board/uc101/config.mk rename to board/manroland/uc101/config.mk diff --git a/board/uc101/uc101.c b/board/manroland/uc101/uc101.c similarity index 100% rename from board/uc101/uc101.c rename to board/manroland/uc101/uc101.c diff --git a/boards.cfg b/boards.cfg index 69c6897..8df801a 100644 --- a/boards.cfg +++ b/boards.cfg @@ -92,14 +92,14 @@ PATI powerpc mpc5xx pati mpl BC3450 powerpc mpc5xxx bc3450 canmb powerpc mpc5xxx cm5200 powerpc mpc5xxx -hmi1001 powerpc mpc5xxx +hmi1001 powerpc mpc5xxx - manroland inka4x0 powerpc mpc5xxx ipek01 powerpc mpc5xxx jupiter powerpc mpc5xxx -mucmc52 powerpc mpc5xxx +mucmc52 powerpc mpc5xxx - manroland munices powerpc mpc5xxx o2dnt powerpc mpc5xxx -uc101 powerpc mpc5xxx +uc101 powerpc mpc5xxx - manroland v38b powerpc mpc5xxx pf5200 powerpc mpc5xxx - esd aev powerpc mpc5xxx tqm5200 tqc @@ -154,7 +154,7 @@ RBC823 powerpc mpc8xx rbc823 rmu powerpc mpc8xx RPXlite powerpc mpc8xx spc1920 powerpc mpc8xx -uc100 powerpc mpc8xx +uc100 powerpc mpc8xx - manroland MHPC powerpc mpc8xx mhpc eltec TOP860 powerpc mpc8xx top860 emk kmsupx4 powerpc mpc8xx km8xx keymile -- 1.7.0.1

4 4

[U-Boot] [PATCH] fsl: verify writes to the MAC address EEPROM
by Timur Tabi 30 Sep '10

30 Sep '10

Update the code which writes to the on-board EEPROM so that it can detect if the write failed because the EEPROM is write-protected. Most of the 8xxx-class Freescale reference boards use an AT24C02 EEPROM to store MAC addresses and similar information. With this patch, if the EEPROM is protected, the "mac save" command will display an error message indicating that the write has not succeeded. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- board/freescale/common/sys_eeprom.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c index 5a8f4f5..c5f1c06 100644 --- a/board/freescale/common/sys_eeprom.c +++ b/board/freescale/common/sys_eeprom.c @@ -204,7 +204,7 @@ static void update_crc(void) */ static int prog_eeprom(void) { - int ret = 0; /* shut up gcc */ + int ret = 0; int i; void *p; #ifdef CONFIG_SYS_EEPROM_BUS_NUM @@ -225,6 +225,11 @@ static int prog_eeprom(void) i2c_set_bus_num(CONFIG_SYS_EEPROM_BUS_NUM); #endif + /* + * The AT24C02 datasheet says that data can only be written in page + * mode, which means 8 bytes at a time, and it takes up to 5ms to + * complete a given write. + */ for (i = 0, p = &e; i < sizeof(e); i += 8, p += 8) { ret = i2c_write(CONFIG_SYS_I2C_EEPROM_ADDR, i, CONFIG_SYS_I2C_EEPROM_ADDR_LEN, p, min((sizeof(e) - i), 8)); @@ -233,12 +238,23 @@ static int prog_eeprom(void) udelay(5000); /* 5ms write cycle timing */ } + if (!ret) { + /* Verify the write by reading back the EEPROM and comparing */ + struct eeprom e2; + + ret = i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0, + CONFIG_SYS_I2C_EEPROM_ADDR_LEN, (void *)&e2, sizeof(e2)); + if (!ret && memcmp(&e, &e2, sizeof(e))) + ret = -1; + } + #ifdef CONFIG_SYS_EEPROM_BUS_NUM i2c_set_bus_num(bus); #endif if (ret) { printf("Programming failed.\n"); + has_been_read = 0; return -1; } -- 1.7.0.1

3 7

[U-Boot] [PATCH] [v2] p1022ds: add audclk hwconfig setting enable codec reference clock
by Timur Tabi 30 Sep '10

30 Sep '10

The Freescale P1022DS can use either a 12.288MHz or a 11.2896MHz reference clock for the audio codec, but by default both are disabled. Add a 'audclk' hwconfig option that allows the user to choose which clock he wants. The 12.288MHz clock allows the codec to use sampling rates of 16, 24, 32, 48, 64, and 96KHz. The 11.2896 clock allows 14700, 22050, 29400, 44100, 58800, and 88200Hz. Also configure a pin muxing to select some SSI signals, which will disable I2C1. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- board/freescale/p1022ds/p1022ds.c | 67 ++++++++++++++++++++++++++++++++----- doc/README.fsl-hwconfig | 21 +++++++++++ include/configs/P1022DS.h | 1 + 3 files changed, 80 insertions(+), 9 deletions(-) create mode 100644 doc/README.fsl-hwconfig diff --git a/board/freescale/p1022ds/p1022ds.c b/board/freescale/p1022ds/p1022ds.c index be692cb..e75f864 100644 --- a/board/freescale/p1022ds/p1022ds.c +++ b/board/freescale/p1022ds/p1022ds.c @@ -27,6 +27,7 @@ #include <asm/mp.h> #include <netdev.h> #include <i2c.h> +#include <hwconfig.h> #include "../common/ngpixis.h" @@ -90,34 +91,58 @@ phys_size_t initdram(int board_type) #define CONFIG_TFP410_I2C_ADDR 0x38 +/* Masks for the SSI_TDM and AUDCLK bits of the ngPIXIS BRDCFG1 register. */ +#define CONFIG_PIXIS_BRDCFG1_SSI_TDM_MASK 0x0c +#define CONFIG_PIXIS_BRDCFG1_AUDCLK_MASK 0x03 + +/* Route the I2C1 pins to the SSI port instead. */ +#define CONFIG_PIXIS_BRDCFG1_SSI_TDM_SSI 0x08 + +/* Choose the 12.288Mhz codec reference clock */ +#define CONFIG_PIXIS_BRDCFG1_AUDCLK_12 0x02 + +/* Choose the 11.2896Mhz codec reference clock */ +#define CONFIG_PIXIS_BRDCFG1_AUDCLK_11 0x01 + int misc_init_r(void) { u8 temp; + const char *audclk; + size_t arglen; - /* Enable the TFP410 Encoder */ + /* For DVI, enable the TFP410 Encoder. */ temp = 0xBF; if (i2c_write(CONFIG_TFP410_I2C_ADDR, 0x08, 1, &temp, sizeof(temp)) < 0) return -1; - - /* Verify if enabled */ - temp = 0; if (i2c_read(CONFIG_TFP410_I2C_ADDR, 0x08, 1, &temp, sizeof(temp)) < 0) return -1; - debug("DVI Encoder Read: 0x%02x\n", temp); temp = 0x10; if (i2c_write(CONFIG_TFP410_I2C_ADDR, 0x0A, 1, &temp, sizeof(temp)) < 0) return -1; - - /* Verify if enabled */ - temp = 0; if (i2c_read(CONFIG_TFP410_I2C_ADDR, 0x0A, 1, &temp, sizeof(temp)) < 0) return -1; - debug("DVI Encoder Read: 0x%02x\n",temp); + /* + * Enable the reference clock for the WM8776 codec, and route the MUX + * pins for SSI. The default is the 12.288 MHz clock + */ + + temp = in_8(&pixis->brdcfg1) & ~(CONFIG_PIXIS_BRDCFG1_SSI_TDM_MASK | + CONFIG_PIXIS_BRDCFG1_AUDCLK_MASK); + temp |= CONFIG_PIXIS_BRDCFG1_SSI_TDM_SSI; + + audclk = hwconfig_arg("audclk", &arglen); + /* Check the first two chars only */ + if (audclk && (strncmp(audclk, "11", 2) == 0)) + temp |= CONFIG_PIXIS_BRDCFG1_AUDCLK_11; + else + temp |= CONFIG_PIXIS_BRDCFG1_AUDCLK_12; + out_8(&pixis->brdcfg1, temp); + return 0; } @@ -310,6 +335,27 @@ int board_eth_init(bd_t *bis) } #ifdef CONFIG_OF_BOARD_SETUP +/** + * ft_codec_setup - fix up the clock-frequency property of the codec node + * + * Update the clock-frequency property based on the value of the 'audclk' + * hwconfig option. If audclk is not specified, then default to 12.288MHz. + */ +static void ft_codec_setup(void *blob, const char *compatible) +{ + const char *audclk; + size_t arglen; + u32 freq; + + audclk = hwconfig_arg("audclk", &arglen); + if (audclk && (strncmp(audclk, "11", 2) == 0)) + freq = 11289600; + else + freq = 12288000; + + do_fixup_by_compat_u32(blob, compatible, "clock-frequency", freq, 1); +} + void ft_board_setup(void *blob, bd_t *bd) { phys_addr_t base; @@ -343,6 +389,9 @@ void ft_board_setup(void *blob, bd_t *bd) #ifdef CONFIG_FSL_SGMII_RISER fsl_sgmii_riser_fdt_fixup(blob); #endif + + /* Update the WM8776 node's clock frequency property */ + ft_codec_setup(blob, "wlf,wm8776"); } #endif diff --git a/doc/README.fsl-hwconfig b/doc/README.fsl-hwconfig new file mode 100644 index 0000000..03fea74 --- /dev/null +++ b/doc/README.fsl-hwconfig @@ -0,0 +1,21 @@ +Freescale-specific 'hwconfig' options. + +This file documents Freescale-specific key:value pairs for the 'hwconfig' +option. See README.hwconfig for general information about 'hwconfig'. + +audclk + Specific to the P1022DS reference board. + + This option specifies which of the two oscillator frequencies should be + routed to the Wolfson WM8776 codec. The ngPIXIS can be programmed to + route either a 11.2896MHz or a 12.288MHz clock. The default is + 12.288MHz. This option has two effects. First, the MUX on the board + will be programmed accordingly. Second, the clock-frequency property + in the codec node in the device tree will be updated to the correct + value. + + 'audclk:11' + Select the 11.2896MHz clock + + 'audclk:12' + Select the 12.288MHz clock diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index b42b5d0..0f7aca2 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -137,6 +137,7 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_R #define CONFIG_MISC_INIT_R +#define CONFIG_HWCONFIG #define CONFIG_FSL_NGPIXIS #define PIXIS_BASE 0xffdf0000 /* PIXIS registers */ -- 1.7.0.1

2 1

[U-Boot] [PATCH 0/7] patch set for P1021MDS support
by Haiying Wang 30 Sep '10

30 Sep '10

The patchset supports SRAM boot, P1021MDS NAND boot, P1021MDS QE/UEC, it is against the git://git.denx.de/u-boot-mpc85xx. Thanks. Haiying

3 4

[U-Boot] [PATCH v4 2/2] TI: DaVinci DA850 EVM: support passing maximum allowed cpu clock rate information to kernel
by Sekhar Nori 29 Sep '10

29 Sep '10

The TI DA850/OMAP-L138/AM18x EVM can be populated with devices having different maximum allowed CPU clock rating. The maximum clock the chip can support can only be determined from the label on the package (not software readable). Introduce a method to pass the maximum allowed clock rate information to kernel using ATAG_REVISION. The kernel uses this information to determine the maximum cpu clock rate reachable using cpufreq. Note that U-Boot itself does not set the CPU clock rate. The CPU clock is setup by a primary bootloader ("UBL"). The rate setup by UBL could be different from the maximum clock rate supported by the device. Signed-off-by: Sekhar Nori <nsekhar(a)ti.com> --- v4: updated README.davinci to included information regarding ATAG_REVISION. board/davinci/da8xxevm/da850evm.c | 33 +++++++++++++++++++++++++++++++++ doc/README.davinci | 14 ++++++++++++++ include/configs/da850evm.h | 1 + 3 files changed, 48 insertions(+), 0 deletions(-) diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index eeb456c..266c4d8 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -70,6 +70,39 @@ static const struct lpsc_resource lpsc[] = { { DAVINCI_LPSC_GPIO }, }; +#ifndef CONFIG_DA850_EVM_MAX_CPU_CLK +#define CONFIG_DA850_EVM_MAX_CPU_CLK 300000000 +#endif + +/* + * get_board_rev() - setup to pass kernel board revision information + * Returns: + * bit[0-3] Maximum cpu clock rate supported by onboard SoC + * 0000b - 300 MHz + * 0001b - 372 MHz + * 0010b - 408 MHz + * 0011b - 456 MHz + */ +u32 get_board_rev(void) +{ + char *s; + u32 maxcpuclk = CONFIG_DA850_EVM_MAX_CPU_CLK; + u32 rev = 0; + + s = getenv("maxcpuclk"); + if (s) + maxcpuclk = simple_strtoul(s, NULL, 10); + + if (maxcpuclk >= 456000000) + rev = 3; + else if (maxcpuclk >= 408000000) + rev = 2; + else if (maxcpuclk >= 372000000) + rev = 1; + + return rev; +} + int board_init(void) { #ifndef CONFIG_USE_IRQ diff --git a/doc/README.davinci b/doc/README.davinci index a2e96a5..0204372 100644 --- a/doc/README.davinci +++ b/doc/README.davinci @@ -95,6 +95,20 @@ into the RAM. The programmers and UBL are always released as part of any standard TI software release associated with an SOC. +Environment Variables +===================== + +The DA850 EVM allows the user to specify the maximum cpu clock allowed by the +silicon, in Hz, via an environment variable "maxcpuclk". + +The maximum clock rate allowed depends on the silicon populated on the EVM. +Please make sure you understand the restrictions placed on this clock in the +device specific datasheet before setting up this variable. This information is +passed to the Linux kernel using the ATAG_REVISION atag. + +If "maxcpuclk" is not defined, the configuration CONFIG_DA850_EVM_MAX_CPU_CLK +is used to obtain this information. + Links ===== diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 357715d..3ea9032 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -102,6 +102,7 @@ */ #define LINUX_BOOT_PARAM_ADDR (CONFIG_SYS_MEMTEST_START + 0x100) #define CONFIG_CMDLINE_TAG +#define CONFIG_REVISION_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTARGS \ "mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp" -- 1.6.2.4

3 3

[U-Boot-Users] how to u-boot in LPC2468 board using uClinux
by anand 28 Sep '10

28 Sep '10

do any one have u-boot.bin file for LPC2468 i downloaded u-boot-1.1.6 but i din't get the u-boot prombt in the terminal window its gets struck in the starting display itself anyone pls help thanks in advance

3 2

[U-Boot] [PATCH] atmel_lcd: Allow contrast polarity to be either positive or negative
by Alexander Stein 25 Sep '10

25 Sep '10

Signed-off-by: Alexander Stein <alexander.stein(a)systec-electronic.com> --- drivers/video/atmel_lcdfb.c | 3 ++- include/lcd.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index db86763..c02ffd8 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -143,8 +143,9 @@ void lcd_ctrl_init(void *lcdbase) /* Set contrast */ value = ATMEL_LCDC_PS_DIV8 | - ATMEL_LCDC_POL_POSITIVE | ATMEL_LCDC_ENA_PWMENABLE; + if (!panel_info.vl_cont_pol_low) + value |= ATMEL_LCDC_POL_POSITIVE; lcdc_writel(panel_info.mmio, ATMEL_LCDC_CONTRAST_CTR, value); lcdc_writel(panel_info.mmio, ATMEL_LCDC_CONTRAST_VAL, ATMEL_LCDC_CVAL_DEFAULT); diff --git a/include/lcd.h b/include/lcd.h index cd9d49d..0e098d9 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -167,6 +167,7 @@ typedef struct vidinfo { u_long vl_sync; /* Horizontal / vertical sync */ u_long vl_bpix; /* Bits per pixel, 0 = 1, 1 = 2, 2 = 4, 3 = 8, 4 = 16 */ u_long vl_tft; /* 0 = passive, 1 = TFT */ + u_long vl_cont_pol_low; /* contrast polarity is low */ /* Horizontal control register. */ u_long vl_hsync_len; /* Length of horizontal sync */ -- 1.7.1

2 1

[U-Boot] [PATCH] at91: Add arch_preboot_os which disables PIT in a faster way
by Alexander Stein 23 Sep '10

23 Sep '10

When disabled the PIT runs until it reaches the CPIV value. The Linux PIT driver stops the PIT and waits until it stopped. This can take over 100ms. Simply stopping in u-boot isn't sufficient as the PIT will still be running when Linux is waiting until it stopped. So, we stop it in u-boot by setting the compare value to a value slightly greater than the current running counter to make the PIT stopped in short time. Signed-off-by: Alexander Stein <alexander.stein(a)systec-electronic.com> --- arch/arm/cpu/arm926ejs/at91/cpu.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/at91/cpu.c b/arch/arm/cpu/arm926ejs/at91/cpu.c index 141a7d1..af86ee2 100644 --- a/arch/arm/cpu/arm926ejs/at91/cpu.c +++ b/arch/arm/cpu/arm926ejs/at91/cpu.c @@ -28,6 +28,7 @@ #include <asm/arch/hardware.h> #include <asm/arch/at91_pmc.h> +#include <asm/arch/at91_pit.h> #include <asm/arch/clk.h> #include <asm/arch/io.h> @@ -47,6 +48,20 @@ int arch_cpu_init(void) return at91_clock_init(CONFIG_SYS_AT91_MAIN_CLOCK); } +void arch_preboot_os(void) +{ + ulong cpiv; + at91_pit_t *pit = (at91_pit_t *) AT91_PIT_BASE; + + cpiv = AT91_PIT_MR_PIV_MASK(readl(&pit->piir)); + + /* Disble PITC + * Add 0x1000 to current counter to stop it faster + * without waiting for wrapping back to 0 + */ + writel(cpiv + 0x1000, &pit->mr); +} + #if defined(CONFIG_DISPLAY_CPUINFO) int print_cpuinfo(void) { -- 1.7.1

3 5

[U-Boot] [PATCH] at91_emac.h: fix typo in register definition
by Andreas Bießmann 23 Sep '10

23 Sep '10

Signed-off-by: Andreas Bießmann <andreas.devel(a)googlemail.com> --- arch/arm/include/asm/arch-at91/at91_emac.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/include/asm/arch-at91/at91_emac.h b/arch/arm/include/asm/arch-at91/at91_emac.h index 45ae333..0e2ff78 100644 --- a/arch/arm/include/asm/arch-at91/at91_emac.h +++ b/arch/arm/include/asm/arch-at91/at91_emac.h @@ -61,7 +61,7 @@ typedef struct at91_emac { u32 reserved2[3]; u32 hsh; u32 hsl; - u32 sh1l; + u32 sa1l; u32 sa1h; u32 sa2l; u32 sa2h; -- 1.7.2.2

3 7