November 2010 - U-Boot

[U-Boot] [PATCH] [MPC837x v2] Make it work again with USB.
by Andre Schwarz 05 Apr '11

05 Apr '11

USB register range IMMR+0x00-0xff is reserved and hangs the CPU. Signed-off-by: Andre Schwarz <andre.schwarz(a)matrix-vision.de> --- arch/powerpc/cpu/mpc83xx/cpu_init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c index 7a1cae7..cfead18 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c @@ -327,7 +327,7 @@ void cpu_init_f (volatile immap_t * im) im->gpio[1].dir = CONFIG_SYS_GPIO2_DIR; #endif #ifdef CONFIG_USB_EHCI_FSL -#ifndef CONFIG_MPC834x +#if !defined(CONFIG_MPC834x) && !defined(CONFIG_MPC837x) uint32_t temp; struct usb_ehci *ehci = (struct usb_ehci *)CONFIG_SYS_FSL_USB_ADDR; -- 1.7.0.4

3 9

[U-Boot] git merge summary
by Alexander Holler 11 Mar '11

11 Mar '11

Hello, may I ask if there is reason why merge commits don't have a summary? I find those summaries (enabled with git config [--global] merge.summary true) very hand to see what was changed with the merge commit. Regards, Alexander

5 11

[U-Boot] errno confusion for fw_env?
by Detlev Zundel 10 Mar '11

10 Mar '11

Hi, with current master I tried to cross-compile a fw_env tool for the da850evm configuration. So I tried the "standard scheme" (means it worked a few years ago) make distclean make da850evm_config make env Doing this I noticed that commit abd315a1357ab05e82f0d61ebad666bc0d5378c3 disabled cross-compilation. So I reverted the commit locally on my tree to enable cross-compilation again, but now I get: [dzu@pollux u-boot-testing (master)]$ make env make -C tools/env all MTD_VERSION= make[1]: Entering directory `/work/dzu/git/u-boot-testing/tools/env' arm-linux-gcc -Wall -DUSE_HOSTCC -I/work/dzu/git/u-boot-testing/include crc32.c fw_env.c fw_env_main.c -o fw_printenv /opt/eldk-4.2-2008-11-24/usr/bin/../lib/gcc/arm-linux-gnueabi/4.2.2/../../../../arm-linux-gnueabi/bin/ld: errno: TLS definition in /opt/eldk-4.2-2008-11-24/usr/../arm/lib/libc.so.6 section .tbss mismatches non-TLS reference in /tmp/cc45c402.o /opt/eldk-4.2-2008-11-24/usr/../arm/lib/libc.so.6: could not read symbols: Bad value collect2: ld returned 1 exit status make[1]: *** [fw_printenv] Error 1 make[1]: Leaving directory `/work/dzu/git/u-boot-testing/tools/env' make: *** [env] Error 2 The cross-compilation and the "-DUSE_HOSTCC" doesn't look right somehow. And moreover we now pull in the "U-Boot errno" stuff for a regular user-space tool through "-I$(SRCTREE)/include". The latter comes from this commit: commit f3b6d528e4dd719640a4bfcd954f4e4c7f5db0d6 Author: Grant Erickson <gerickson(a)nuovations.com> Date: Tue May 6 16:18:00 2008 -0700 Fix Compilation Errors with 'tools/env/fw_printenv' In the current top-of-tree, 1.3.3.-rc2, the optional tool 'tools/env/fw_printenv' fails to compile for two reasons: 1) The header watchdog.h cannot be found. 2) The header zlib.h is picked up from the tool chain rather than the project causing a prototype conflict for crc32. This patch addresses both of these issues. Platforms Tested On: - AMCC "Kilauea" Signed-off-by: Grant Erickson <gerickson(a)nuovations.com> It was probably not anticipated that this now picks up errno.h from the project as well. Does anybody have a good idea on how to tackle this? Thanks Detlev -- These days, even the most pure and abstract mathematics is in danger to be applied. -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu(a)denx.de

2 1

[U-Boot] [PATCH] net: ne2000: Add spport RTL-8019AS
by Nobuhiro Iwamatsu 15 Feb '11

15 Feb '11

Add infomation of RTL-8016AS to hw_info. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> CC: Ben Warren <biggerbadderben(a)gmail.com> --- drivers/net/ne2000.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/ne2000.c b/drivers/net/ne2000.c index ab5eec7..7a85314 100644 --- a/drivers/net/ne2000.c +++ b/drivers/net/ne2000.c @@ -164,7 +164,8 @@ static hw_info_t hw_info[] = { { /* Volktek NPL-402CT */ 0x0060, 0x00, 0x40, 0x05, 0 }, { /* NEC PC-9801N-J12 */ 0x0ff0, 0x00, 0x00, 0x4c, 0 }, { /* PCMCIA Technology OEM */ 0x01c8, 0x00, 0xa0, 0x0c, 0 }, - { /* Qemu */ 0x0, 0x52, 0x54, 0x00, 0 } + { /* Qemu */ 0x0, 0x52, 0x54, 0x00, 0 }, + { /* RTL8019AS */ 0x0, 0x0, 0x18, 0x5f, 0 } }; #define NR_INFO (sizeof(hw_info)/sizeof(hw_info_t)) -- 1.7.2.3

2 2

[U-Boot] Atmel AT91 USB DFU and USB device port driver
by Krishna Pattabiraman 12 Feb '11

12 Feb '11

Hi All, I am currently developing a USB DFU feature for at91sam9263 board. I have to develop the driver for USB device port. I looked the uboot-usb git cdc branch it has a at91_udc.c driver it doesnt contain the udc_* api implementations. I found a earlier post where it was discussed. http://www.mail-archive.com/u-boot@lists.denx.de/msg08709.html Can any point give me a pointer to implement it or the implementations if exist. Bye, Krishna.

3 4

[U-Boot] [PATCH] BLOCK: Fixup iMX51 ATA driver
by Marek Vasut 01 Feb '11

01 Feb '11

Signed-off-by: Marek Vasut <marek.vasut(a)gmail.com> --- NOTE: Wolfgang, is this what you meant ? If so, I'll merge this with the old driver and send a v2 patch. Otherwise, can you point me in a right direction? NOTE2: I haven't tested this, I'll do so in the evening. drivers/block/mxc_ata.c | 131 +++++++++++++++++++++++++--------------------- 1 files changed, 71 insertions(+), 60 deletions(-) diff --git a/drivers/block/mxc_ata.c b/drivers/block/mxc_ata.c index 6f19e6f..e65cfa7 100644 --- a/drivers/block/mxc_ata.c +++ b/drivers/block/mxc_ata.c @@ -37,49 +37,53 @@ #include <asm/arch/clock.h> /* MXC ATA register offsets */ -enum { - MXC_ATA_TIME_OFF = 0x00, - MXC_ATA_TIME_ON = 0x01, - MXC_ATA_TIME_1 = 0x02, - MXC_ATA_TIME_2W = 0x03, - MXC_ATA_TIME_2R = 0x04, - MXC_ATA_TIME_AX = 0x05, - MXC_ATA_TIME_PIO_RDX = 0x06, - MXC_ATA_TIME_4 = 0x07, - MXC_ATA_TIME_9 = 0x08, - MXC_ATA_TIME_M = 0x09, - MXC_ATA_TIME_JN = 0x0a, - MXC_ATA_TIME_D = 0x0b, - MXC_ATA_TIME_K = 0x0c, - MXC_ATA_TIME_ACK = 0x0d, - MXC_ATA_TIME_ENV = 0x0e, - MXC_ATA_TIME_UDMA_RDX = 0x0f, - MXC_ATA_TIME_ZAH = 0x10, - MXC_ATA_TIME_MLIX = 0x11, - MXC_ATA_TIME_DVH = 0x12, - MXC_ATA_TIME_DZFS = 0x13, - MXC_ATA_TIME_DVS = 0x14, - MXC_ATA_TIME_CVH = 0x15, - MXC_ATA_TIME_SS = 0x16, - MXC_ATA_TIME_CYC = 0x17, - MXC_ATA_FIFO_DATA_16 = 0x1c, - MXC_ATA_FIFO_DATA_32 = 0x18, - MXC_ATA_FIFO_FILL = 0x20, - MXC_ATA_ATA_CONTROL = 0x24, - MXC_ATA_INTERRUPT_PENDING = 0x28, - MXC_ATA_INTERRUPT_ENABLE = 0x2c, - MXC_ATA_INTERRUPT_CLEAR = 0x30, - MXC_ATA_FIFO_ALARM = 0x34, - MXC_ATA_DRIVE_DATA = 0xa0, - MXC_ATA_DRIVE_FEATURES = 0xa4, - MXC_ATA_DRIVE_SECTOR_COUNT = 0xa8, - MXC_ATA_DRIVE_SECTOR_NUM = 0xac, - MXC_ATA_DRIVE_CYL_LOW = 0xb0, - MXC_ATA_DRIVE_CYL_HIGH = 0xb4, - MXC_ATA_DRIVE_DEV_HEAD = 0xb8, - MXC_ATA_COMMAND = 0xbc, - MXC_ATA_STATUS = 0xbc, - MXC_ATA_ALT_STATUS = 0xd8, +struct mxc_ata_config_regs { + u8 time_off; /* 0x00 */ + u8 time_on; + u8 time_1; + u8 time_2w; + u8 time_2r; + u8 time_ax; + u8 time_pio_rdx; + u8 time_4; + u8 time_9; + u8 time_m; + u8 time_jn; + u8 time_d; + u8 time_k; + u8 time_ack; + u8 time_env; + u8 time_udma_rdx; + u8 time_zah; /* 0x10 */ + u8 time_mlix; + u8 time_dvh; + u8 time_dzfs; + u8 time_dvs; + u8 time_cvh; + u8 time_ss; + u8 time_cyc; + u32 hole; + u32 fifo_data_16; + u32 fifo_data_32; + u32 fifo_fill; + u32 ata_control; + u32 interrupt_pending; + u32 interrupt_enable; + u32 interrupt_clear; + u32 fifo_alarm; +}; + +struct mxc_data_hdd_regs { + u32 drive_data; /* 0xa0 */ + u32 drive_features; + u32 drive_sector_count; + u32 drive_sector_num; + u32 drive_cyl_low; + u32 drive_cyl_high; + u32 drive_dev_head; + u32 command; + u32 status; + u32 alt_status; }; /* PIO timing table */ @@ -93,47 +97,54 @@ uint16_t pio_t4[NR_PIO_SPECS] = { 30, 20, 15, 10, 10 }; uint16_t pio_t9[NR_PIO_SPECS] = { 20, 15, 10, 10, 10 }; uint16_t pio_tA[NR_PIO_SPECS] = { 50, 50, 50, 50, 50 }; -#define REG_TO_OFFSET(reg) ((reg & 0x3) * 8) +#define REG2OFF(reg) ((((uint32_t)reg) & 0x3) * 8) static void set_ata_bus_timing(unsigned char mode) { uint32_t val; uint32_t T = 1000000000 / mxc_get_clock(MXC_IPG_CLK); + struct mxc_ata_config_regs *ata_cfg_regs; + ata_cfg_regs = (struct mxc_ata_config_regs *)CONFIG_SYS_ATA_BASE_ADDR; + if (mode >= NR_PIO_SPECS) return; /* Write TIME_OFF/ON/1/2W */ - val = (3 << REG_TO_OFFSET(MXC_ATA_TIME_OFF)) | - (3 << REG_TO_OFFSET(MXC_ATA_TIME_ON)) | - (((pio_t1[mode] + T) / T) << REG_TO_OFFSET(MXC_ATA_TIME_1)) | - (((pio_t2_8[mode] + T) / T) << REG_TO_OFFSET(MXC_ATA_TIME_2W)); - writel(val, MXC_ATA_TIME_OFF + CONFIG_SYS_ATA_BASE_ADDR); + val = (3 << REG2OFF(&ata_cfg_regs->time_off)) | + (3 << REG2OFF(&ata_cfg_regs->time_on)) | + (((pio_t1[mode] + T) / T) << REG2OFF(&ata_cfg_regs->time_1)) | + (((pio_t2_8[mode] + T) / T) << REG2OFF(&ata_cfg_regs->time_2w)); + writeb(val, &ata_cfg_regs->time_off); /* Write TIME_2R/AX/RDX/4 */ - val = (((pio_t2_8[mode] + T) / T) << REG_TO_OFFSET(MXC_ATA_TIME_2R)) | - (((pio_tA[mode] + T) / T + 2) << REG_TO_OFFSET(MXC_ATA_TIME_AX)) | - (1 << REG_TO_OFFSET(MXC_ATA_TIME_PIO_RDX)) | - (((pio_t4[mode] + T) / T) << REG_TO_OFFSET(MXC_ATA_TIME_4)); - writel(val, MXC_ATA_TIME_2R + CONFIG_SYS_ATA_BASE_ADDR); + val = (((pio_t2_8[mode] + T) / T) << REG2OFF(&ata_cfg_regs->time_2r)) | + (((pio_tA[mode] + T) / T + 2) << REG2OFF(&ata_cfg_regs->time_ax)) | + (1 << REG2OFF(&ata_cfg_regs->time_pio_rdx)) | + (((pio_t4[mode] + T) / T) << REG2OFF(&ata_cfg_regs->time_4)); + writel(val, &ata_cfg_regs->time_2r); /* Write TIME_9 ; the rest of timing registers is irrelevant for PIO */ - val = (((pio_t9[mode] + T) / T) << REG_TO_OFFSET(MXC_ATA_TIME_9)); - writel(val, MXC_ATA_TIME_9 + CONFIG_SYS_ATA_BASE_ADDR); + val = (((pio_t9[mode] + T) / T) << REG2OFF(&ata_cfg_regs->time_9)); + writel(val, &ata_cfg_regs->time_9); } int ide_preinit(void) { - uint32_t ata_control = CONFIG_SYS_ATA_BASE_ADDR + MXC_ATA_ATA_CONTROL; + struct mxc_ata_config_regs *ata_cfg_regs; + ata_cfg_regs = (struct mxc_ata_config_regs *)CONFIG_SYS_ATA_BASE_ADDR; /* 46.3.3.4 @ FSL iMX51 manual */ - writel(0x80, ata_control); /* FIFO normal op., drive reset */ - writel(0xc0, ata_control); /* FIFO normal op., drive not reset */ + /* FIFO normal op., drive reset */ + writel(0x80, ata_cfg_regs->ata_control); + /* FIFO normal op., drive not reset */ + writel(0xc0, ata_cfg_regs->ata_control); /* Configure the PIO timing */ set_ata_bus_timing(CONFIG_MXC_ATA_PIO_MODE); /* 46.3.3.4 @ FSL iMX51 manual */ - writel(0x41, ata_control); /* Drive not reset, IORDY handshake */ + /* Drive not reset, IORDY handshake */ + writel(0x41, ata_cfg_regs->ata_control); return 0; } -- 1.7.2.3

2 2

[U-Boot] [PATCH] Switch from archive libraries to partial linking
by Sebastien Carlier 26 Jan '11

26 Jan '11

13 78

[U-Boot] [PATCH 2/2] arm: a320evb: fixes for relocation support
by ratbert.chuang＠gmail.com 24 Jan '11

24 Jan '11

From: Po-Yu Chuang <ratbert(a)faraday-tech.com> - add CONFIG_SYS_SDRAM_BASE and CONFIG_SYS_INIT_SP_ADDR - do not update gd->bd in dram_init() because bd is unavailable then Signed-off-by: Po-Yu Chuang <ratbert(a)faraday-tech.com> --- board/faraday/a320evb/a320evb.c | 3 +-- include/configs/a320evb.h | 10 +++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/board/faraday/a320evb/a320evb.c b/board/faraday/a320evb/a320evb.c index 85b11b9..b9343e4 100644 --- a/board/faraday/a320evb/a320evb.c +++ b/board/faraday/a320evb/a320evb.c @@ -46,8 +46,7 @@ int dram_init(void) actual_size = get_ram_size((void *)sdram_base, expected_size); - gd->bd->bi_dram[0].start = sdram_base; - gd->bd->bi_dram[0].size = actual_size; + gd->ram_size = actual_size; if (expected_size != actual_size) printf("Warning: Only %lu of %lu MiB SDRAM is working\n", diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h index 0284d40..97bf8b9 100644 --- a/include/configs/a320evb.h +++ b/include/configs/a320evb.h @@ -138,15 +138,19 @@ #define PHYS_SDRAM_1 0x10000000 /* SDRAM Bank #1 */ #define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */ +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - \ + GENERATED_GBL_DATA_SIZE) + /* * Load address and memory test area should agree with * board/faraday/a320/config.mk. Be careful not to overwrite U-boot itself. */ -#define CONFIG_SYS_LOAD_ADDR 0x12000000 +#define CONFIG_SYS_LOAD_ADDR (PHYS_SDRAM_1 + 0x2000000) /* memtest works on 63 MB in DRAM */ -#define CONFIG_SYS_MEMTEST_START 0x10000000 -#define CONFIG_SYS_MEMTEST_END 0x13F00000 +#define CONFIG_SYS_MEMTEST_START PHYS_SDRAM_1 +#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 0x3F00000) #define CONFIG_SYS_TEXT_BASE 0 -- 1.6.3.3

3 2

[U-Boot] [PATCH 1/2] arm: a320 timer: move static data to global_data struct
by ratbert.chuang＠gmail.com 24 Jan '11

24 Jan '11

From: Po-Yu Chuang <ratbert(a)faraday-tech.com> timer.c used static data and are called before relocation. Move all static variables into global_data structure. Also cleanup timer.c from unused stubs and make it truly use 64 bit tick values. Based on Reinhard Meyer <u-boot(a)emk-elektronik.de>'s patch 5dca710a3d7703e41da0e9894f2d71f9e25bea6b Signed-off-by: Po-Yu Chuang <ratbert(a)faraday-tech.com> --- arch/arm/cpu/arm920t/a320/timer.c | 137 ++++++++++++++---------------------- arch/arm/include/asm/global_data.h | 5 ++ board/faraday/a320evb/config.mk | 35 --------- include/configs/a320evb.h | 2 + 4 files changed, 59 insertions(+), 120 deletions(-) delete mode 100644 board/faraday/a320evb/config.mk diff --git a/arch/arm/cpu/arm920t/a320/timer.c b/arch/arm/cpu/arm920t/a320/timer.c index d2e316f..ac48328 100644 --- a/arch/arm/cpu/arm920t/a320/timer.c +++ b/arch/arm/cpu/arm920t/a320/timer.c @@ -18,10 +18,13 @@ */ #include <common.h> +#include <div64.h> #include <asm/io.h> #include <asm/arch/ftpmu010.h> #include <asm/arch/fttmr010.h> +DECLARE_GLOBAL_DATA_PTR; + static ulong timestamp; static ulong lastdec; @@ -31,6 +34,22 @@ static struct ftpmu010 *pmu = (struct ftpmu010 *)CONFIG_FTPMU010_BASE; #define TIMER_CLOCK 32768 #define TIMER_LOAD_VAL 0xffffffff +static inline unsigned long long tick_to_time(unsigned long long tick) +{ + tick *= CONFIG_SYS_HZ; + do_div(tick, TIMER_CLOCK); + + return tick; +} + +static inline unsigned long long usec_to_tick(unsigned long long usec) +{ + usec *= TIMER_CLOCK; + do_div(usec, 1000000); + + return TIMER_LOAD_VAL - usec; +} + int timer_init(void) { unsigned int oscc; @@ -76,115 +95,63 @@ int timer_init(void) cr |= FTTMR010_TM3_ENABLE; writel(cr, &tmr->cr); - /* init the timestamp and lastdec value */ - reset_timer_masked(); + gd->tbu = gd->tbl = 0; return 0; } /* - * timer without interrupts - */ - -/* - * reset time + * Get the current 64 bit timer tick count */ -void reset_timer_masked(void) +unsigned long long get_ticks(void) { - /* capure current decrementer value time */ - lastdec = readl(&tmr->timer3_counter) / (TIMER_CLOCK / CONFIG_SYS_HZ); - timestamp = 0; /* start "advancing" time stamp from 0 */ - - debug("%s(): lastdec = %lx\n", __func__, lastdec); -} + ulong now = TIMER_LOAD_VAL - readl(&tmr->timer3_counter); -void reset_timer(void) -{ debug("%s()\n", __func__); - reset_timer_masked(); -} -/* - * return timer ticks - */ -ulong get_timer_masked(void) -{ - /* current tick value */ - ulong now = readl(&tmr->timer3_counter) / (TIMER_CLOCK / CONFIG_SYS_HZ); - - debug("%s(): now = %lx, lastdec = %lx\n", __func__, now, lastdec); - - if (lastdec >= now) { - /* - * normal mode (non roll) - * move stamp fordward with absoulte diff ticks - */ - timestamp += lastdec - now; - } else { - /* - * we have overflow of the count down timer - * - * nts = ts + ld + (TLV - now) - * ts=old stamp, ld=time that passed before passing through -1 - * (TLV-now) amount of time after passing though -1 - * nts = new "advancing time stamp"...it could also roll and - * cause problems. - */ - timestamp += lastdec + TIMER_LOAD_VAL - now; - } - - lastdec = now; - - debug("%s() returns %lx\n", __func__, timestamp); - - return timestamp; -} - -/* - * return difference between timer ticks and base - */ -ulong get_timer(ulong base) -{ - debug("%s(%lx)\n", __func__, base); - return get_timer_masked() - base; -} - -void set_timer(ulong t) -{ - debug("%s(%lx)\n", __func__, t); - timestamp = t; + /* increment tbu if tbl has rolled over */ + if (now < gd->tbl) + gd->tbu++; + gd->tbl = now; + return (((unsigned long long)gd->tbu) << 32) | gd->tbl; } /* delay x useconds AND preserve advance timestamp value */ void __udelay(unsigned long usec) { - long tmo = usec * (TIMER_CLOCK / 1000) / 1000; - unsigned long now, last = readl(&tmr->timer3_counter); - - debug("%s(%lu)\n", __func__, usec); - while (tmo > 0) { - now = readl(&tmr->timer3_counter); - if (now > last) /* count down timer overflow */ - tmo -= TIMER_LOAD_VAL + last - now; - else - tmo -= last - now; - last = now; - } + unsigned long long tmp; + ulong tmo; + + tmo = usec_to_tick(usec); + tmp = get_ticks() + tmo; /* get current timestamp */ + + while (get_ticks() < tmp) /* loop till event */ + ; } /* - * This function is derived from PowerPC code (read timebase as long long). - * On ARM it just returns the timer value. + * reset_timer() and get_timer(base) are a pair of functions that are used by + * some timeout/sleep mechanisms in u-boot. + * + * reset_timer() marks the current time as epoch and + * get_timer(base) works relative to that epoch. + * + * The time is used in CONFIG_SYS_HZ units! */ -unsigned long long get_ticks(void) +void reset_timer(void) { debug("%s()\n", __func__); - return get_timer(0); + gd->timer_reset_value = get_ticks(); +} + +ulong get_timer(ulong base) +{ + debug("%s(%lx)\n", __func__, base); + return tick_to_time(get_ticks() - gd->timer_reset_value) - base; } /* - * This function is derived from PowerPC code (timebase clock frequency). - * On ARM it returns the number of timer ticks per second. + * Return the number of timer ticks per second. */ ulong get_tbclk(void) { diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index ada3fbb..04c1564 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -61,6 +61,11 @@ typedef struct global_data { unsigned long tbu; unsigned long long timer_reset_value; #endif +#ifdef CONFIG_FTTMR010_BASE + unsigned long tbl; + unsigned long tbu; + unsigned long long timer_reset_value; +#endif unsigned long relocaddr; /* Start address of U-Boot in RAM */ phys_size_t ram_size; /* RAM size */ unsigned long mon_len; /* monitor len */ diff --git a/board/faraday/a320evb/config.mk b/board/faraday/a320evb/config.mk deleted file mode 100644 index b751d0d..0000000 --- a/board/faraday/a320evb/config.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -# (C) Copyright 2009 Faraday Technology -# Po-Yu Chuang <ratbert(a)faraday-tech.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 -# - -# Faraday A320 board with FA526/FA626TE/ARM926EJ-S cpus -# -# see http://www.faraday-tech.com/ for more information - -# A320 has 1 bank of 64 MB DRAM -# -# 1000'0000 to 1400'0000 -# -# Linux-Kernel is expected to be at 1000'8000, entry 1000'8000 -# -# we load ourself to 13f8'0000 -# -# download area is 1200'0000 - -CONFIG_SYS_TEXT_BASE = 0x13f80000 diff --git a/include/configs/a320evb.h b/include/configs/a320evb.h index f67cf06..0284d40 100644 --- a/include/configs/a320evb.h +++ b/include/configs/a320evb.h @@ -148,6 +148,8 @@ #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END 0x13F00000 +#define CONFIG_SYS_TEXT_BASE 0 + /*----------------------------------------------------------------------- * Static memory controller configuration */ -- 1.6.3.3

5 7

[U-Boot] [PATCH V3] bugfix: image header pointer change.
by Baidu Boy 18 Jan '11

18 Jan '11

This patch is to avoid potential issue when we still use the pointer images->legacy_hdr_os after the kernel un-compressed. in function boot_get_kernel(): we should let the images->legacy_hdr_os point to the new copied image header, not the original image header in uImage which may be over-written in the kernel un-compressed process. This is a potential problem. Signed-off-by: Baidu Boy <liucai.lfn(a)gmail.com> --- changes for V2: - Avoid unrelated syntax changes changes for V3: - Add some description for this patch. common/cmd_bootm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 1a024f1..8f9e5f1 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -896,7 +896,7 @@ static void *boot_get_kernel (cmd_tbl_t *cmdtp, int flag, int argc, char * const memmove (&images->legacy_hdr_os_copy, hdr, sizeof(image_header_t)); /* save pointer to image header */ - images->legacy_hdr_os = hdr; + images->legacy_hdr_os = &images->legacy_hdr_os_copy; images->legacy_hdr_valid = 1; show_boot_progress (6); -- 1.7.3.1.msysgit.0

2 2