: mpc7448hpc2 board [...]
PATCH v3 10/10 : mpc7448hpc2 board [...]
Hello list,
inside the automatic U-Boot patch tracking system a new ticket [DNX#2006110242000127] was created:
<snip>
Quoted 90 lines
This patch comes from Yuli's posted patch on 8/8/2006 titled "CFI Driver Little-Endian write Issue".
http://sourceforge.net/mailarchive/message.php?msg_id=36311999
If that patch applied, please discard this one.
Until now , I do not see his patch is applied. So please apply this one.
Signed-off-by Yuli Barcohen <[email protected]>Signed-off-by Roy Zang <[email protected]>--- drivers/cfi_flash.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-)drivers/cfi_flash.c +8
-2@@ -2,9 +2,12 @@* (C) Copyright 2002-2004 * Brad Kemp, Seranoa Networks, Brad.Kemp at seranoa.com * -* Copyright (C) 2003 Arabella Software Ltd. +* Copyright (C) 2003, 2006 Arabella Software Ltd. * Yuli Barcohen <[email protected]> * Modified to work with AMD flashes +* Added support for byte lanes swap +* Added support for 32-bit chips consisting of two 16-bit devices +* (for example, S70GL256M00) * * Copyright (C) 2004 * Ed Okerson @@ -45,10 +48,13 @@/* #define DEBUG */ #include <common.h> + +#ifdef CFG_FLASH_CFI_DRIVER + +#include <watchdog.h> #include <asm/processor.h> #include <asm/byteorder.h> #include <environment.h> -#ifdef CFG_FLASH_CFI_DRIVER /* * This file implements a Common Flash Interface (CFI) driver for U-Boot.
drivers/cfi_flash.c +7
-3@@ -71,6 +77,10 @@ #ifdef CFG_FLASH_CFI_DRIVER* Verify erase and program timeouts. */ +#if defined(__LITTLE_ENDIAN) && !defined(CFG_FLASH_CFI_SWAP ) +#define CFG_FLASH_CFI_SWAP +#endif +#ifndef CFG_FLASH_BANKS_LIST #define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE }#endif @@ -268,7 +278,7 @@ inline uchar flash_read_uchar (flash_infuchar *cp; cp =flash_make_addr (info,0 , offset); -#if defined(__LITTLE_ENDIAN) +#if defined(CFG_FLASH_CFI_SWAP )return (cp[0 ]);#else return (cp[info->portwidth -1 ]);@@ -295,7 +305,7 @@ #ifdef DEBUGdebug ("addr[%x] = 0x%x\n" , x, addr[x]); }#endif -#if defined(__LITTLE_ENDIAN) +#if defined(CFG_FLASH_CFI_SWAP ) retval = ((addr[(info->portwidth)] <<8 ) | addr[0 ]);#else retval = ((addr[(2 * info->portwidth) - 1] << 8) |@@ -327,7 +337,7 @@ #ifdef DEBUG debug ("addr[%x] = 0x%x\n", x, addr[x]); }#endif -#if defined(__LITTLE_ENDIAN) +#if defined(CFG_FLASH_CFI_SWAP ) retval = (addr[0 ] <<16 ) | (addr[(info->portwidth)] <<24 ) | (addr[(2 * info->portwidth)]) | (addr[(3 * info->portwidth)] <<8 );#else @@ -892,12 +902,22 @@ static void flash_make_cmd (flash_info_tint i;uchar *cp = (uchar *) cmdbuf;
drivers/cfi_flash.c static void flash_make_cmd (flash_info_t · line 912
Quoted 10 lines
drivers/cfi_flash.c +3
-1-#if defined(__LITTLE_ENDIAN) +#if defined(CFG_FLASH_CFI_SWAP )for (i = info->portwidth; i >0 ; i--) #elsefor (i =1 ; i <= info->portwidth; i++) #endif *cp++ = (i & (info->chipwidth -1 )) ?'\0' : cmd; +#ifdef CFG_FLASH_CFI_2x16 + if ((info->portwidth == FLASH_CFI_32BIT) && (info->chipwidth ==
</snip>
Your U-Boot support team