diff options
| author | wdenk <wdenk> | 2003-10-15 23:53:47 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-10-15 23:53:47 +0000 |
| commit | 42d1f0394bef0624fc9664714d54bb137931d6a6 (patch) | |
| tree | 892a4130507484d25faf9a72e019cf88cfb3e3d9 /board/omap1610inn | |
| parent | 2d5b561e2bfdee8552a99b2cf93016cce2a74895 (diff) | |
| download | u-boot-42d1f0394bef0624fc9664714d54bb137931d6a6.tar.gz u-boot-42d1f0394bef0624fc9664714d54bb137931d6a6.tar.xz u-boot-42d1f0394bef0624fc9664714d54bb137931d6a6.zip | |
* Patches by Xianghua Xiao, 15 Oct 2003:LABEL_2003_10_16_0200
- Added Motorola CPU 8540/8560 support (cpu/85xx)
- Added Motorola MPC8540ADS board support (board/mpc8540ads)
- Added Motorola MPC8560ADS board support (board/mpc8560ads)
* Minor code cleanup
Diffstat (limited to 'board/omap1610inn')
| -rw-r--r-- | board/omap1610inn/flash.c | 7 | ||||
| -rw-r--r-- | board/omap1610inn/platform.S | 8 | ||||
| -rw-r--r-- | board/omap1610inn/u-boot.lds | 4 |
3 files changed, 6 insertions, 13 deletions
diff --git a/board/omap1610inn/flash.c b/board/omap1610inn/flash.c index 0108545d41..e7d65157f7 100644 --- a/board/omap1610inn/flash.c +++ b/board/omap1610inn/flash.c @@ -54,7 +54,6 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ #define mb() __asm__ __volatile__ ("" : : : "memory") - /* Flash Organization Structure */ typedef struct OrgDef { unsigned int sector_number; @@ -240,8 +239,6 @@ static ulong flash_get_size (FPW * addr, flash_info_t * info) } - - /* unprotects a sector for write and erase * on some intel parts, this unprotects the entire chip, but it * wont hurt to call this additional times per sector... @@ -298,8 +295,6 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) } - - start = get_timer (0); last = start; @@ -326,7 +321,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last) while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) { - if (get_timer_masked () > + if (get_timer_masked () > CFG_FLASH_ERASE_TOUT) { printf ("Timeout\n"); /* suspend erase */ diff --git a/board/omap1610inn/platform.S b/board/omap1610inn/platform.S index 9e3fc4f63d..cad152b7b2 100644 --- a/board/omap1610inn/platform.S +++ b/board/omap1610inn/platform.S @@ -132,8 +132,6 @@ watch2Wait: bne watch2Wait - - /* Set memory timings corresponding to the new clock speed */ /* Check execution location to determine current execution location @@ -275,7 +273,7 @@ REG_ARM_CKCTL: /* 16 bits */ REG_ARM_IDLECT3: /* 16 bits */ .word 0xfffece24 REG_ARM_IDLECT2: /* 16 bits */ - .word 0xfffece08 + .word 0xfffece08 REG_ARM_IDLECT1: /* 16 bits */ .word 0xfffece04 @@ -293,7 +291,7 @@ REG_WSPRDOG: .word 0xfffeb048 /* watchdog write pending */ REG_WWPSDOG: - .word 0xfffeb034 + .word 0xfffeb034 WSPRDOG_VAL1: .word 0x0000aaaa @@ -342,7 +340,7 @@ REG_WATCHDOG: /* 96 MHz Samsung Mobile DDR */ SDRAM_CONFIG_VAL: - .word 0x001200f4 + .word 0x001200f4 DLL_LRD_CONTROL_VAL: .word 0x00800002 diff --git a/board/omap1610inn/u-boot.lds b/board/omap1610inn/u-boot.lds index 0a4605412e..cab0080c65 100644 --- a/board/omap1610inn/u-boot.lds +++ b/board/omap1610inn/u-boot.lds @@ -39,11 +39,11 @@ SECTIONS .data : { *(.data) } . = ALIGN(4); .got : { *(.got) } - + __u_boot_cmd_start = .; .u_boot_cmd : { *(.u_boot_cmd) } __u_boot_cmd_end = .; - + armboot_end_data = .; . = ALIGN(4); .bss : { *(.bss) } |