From a079494853cc2bfeddb26673219db0b4b2b31566 Mon Sep 17 00:00:00 2001 From: Niklaus Giger Date: Mon, 25 Feb 2008 18:37:01 +0100 Subject: [PATCH] ppc4xx: HCU4/5. Use FLASH_CFI_LEGACY Cleanup: Remove custom flash driver for 8 bit boot-eprom and replace it with the FLASH_CFI_LEGACY et al. config options. Signed-off-by: Niklaus Giger --- board/netstal/hcu4/Makefile | 2 +- board/netstal/hcu4/hcu4.c | 16 ++++++++++++++++ board/netstal/hcu5/Makefile | 2 +- board/netstal/hcu5/hcu5.c | 16 ++++++++++++++++ include/configs/hcu4.h | 18 ++++++++++++------ include/configs/hcu5.h | 14 +++++++++++--- 6 files changed, 57 insertions(+), 11 deletions(-) diff --git a/board/netstal/hcu4/Makefile b/board/netstal/hcu4/Makefile index 3d1d65d35e..53df61edbb 100644 --- a/board/netstal/hcu4/Makefile +++ b/board/netstal/hcu4/Makefile @@ -23,7 +23,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a # NOBJS : Netstal common objects -NOBJS = fixed_sdram.o hcu_flash.o nm_bsp.o +NOBJS = fixed_sdram.o nm_bsp.o COBJS = $(BOARD).o SOBJS = diff --git a/board/netstal/hcu4/hcu4.c b/board/netstal/hcu4/hcu4.c index bb610e2d53..12c2c2be1e 100644 --- a/board/netstal/hcu4/hcu4.c +++ b/board/netstal/hcu4/hcu4.c @@ -201,3 +201,19 @@ void ft_board_setup(void *blob, bd_t *bd) } #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */ + +/* + * Hardcoded flash setup: + * Flash 0 is a non-CFI AMD AM29F040 flash, 8 bit flash / 8 bit bus. + */ +ulong board_flash_get_legacy (ulong base, int banknum, flash_info_t * info) +{ + if (banknum == 0) { /* non-CFI boot flash */ + info->portwidth = 1; + info->chipwidth = 1; + info->interface = FLASH_CFI_X8; + return 1; + } else + return 0; +} + diff --git a/board/netstal/hcu5/Makefile b/board/netstal/hcu5/Makefile index 349c653e7f..5ffae65ea1 100644 --- a/board/netstal/hcu5/Makefile +++ b/board/netstal/hcu5/Makefile @@ -24,7 +24,7 @@ LIB = $(obj)lib$(BOARD).a # NOBJS : Netstal common objects -NOBJS = hcu_flash.o nm_bsp.o +NOBJS = nm_bsp.o COBJS = $(BOARD).o sdram.o SOBJS = init.o diff --git a/board/netstal/hcu5/hcu5.c b/board/netstal/hcu5/hcu5.c index c494e93ada..8cf8c362f7 100644 --- a/board/netstal/hcu5/hcu5.c +++ b/board/netstal/hcu5/hcu5.c @@ -499,3 +499,19 @@ void ft_board_setup(void *blob, bd_t *bd) } #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */ + +/* + * Hardcoded flash setup: + * Flash 0 is a non-CFI AMD AM29F040 flash, 8 bit flash / 8 bit bus. + */ +ulong board_flash_get_legacy (ulong base, int banknum, flash_info_t * info) +{ + if (banknum == 0) { /* non-CFI boot flash */ + info->portwidth = 1; + info->chipwidth = 1; + info->interface = FLASH_CFI_X8; + return 1; + } else + return 0; +} + diff --git a/include/configs/hcu4.h b/include/configs/hcu4.h index 5a85feb853..4ecaf90abc 100644 --- a/include/configs/hcu4.h +++ b/include/configs/hcu4.h @@ -1,5 +1,5 @@ /* - *(C) Copyright 2005-2007 Netstal Maschinen AG + *(C) Copyright 2005-2008 Netstal Maschinen AG * Niklaus Giger (Niklaus.Giger@netstal.com) * * See file CREDITS for list of people who contributed to this @@ -103,13 +103,19 @@ * Flash *----------------------------------------------------------------------*/ -#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ -#define CFG_MAX_FLASH_SECT 8 /* max number of sectors on one chip */ +/* Use common CFI driver */ +#define CFG_FLASH_CFI +#define CFG_FLASH_CFI_DRIVER +/* board provides its own flash_init code */ +#define CONFIG_FLASH_CFI_LEGACY 1 +#define CFG_FLASH_CFI_WIDTH FLASH_CFI_8BIT +#define CFG_FLASH_LEGACY_512Kx8 1 -#define CFG_FLASH_EMPTY_INFO /* print 'E' for empty sector on flinfo */ +/* print 'E' for empty sector on flinfo */ +#define CFG_FLASH_EMPTY_INFO -#define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ -#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ +#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ +#define CFG_MAX_FLASH_SECT 8 /* max number of sectors on one chip */ /*----------------------------------------------------------------------- * Environment diff --git a/include/configs/hcu5.h b/include/configs/hcu5.h index 2ed8530b6d..f5f11978da 100644 --- a/include/configs/hcu5.h +++ b/include/configs/hcu5.h @@ -349,12 +349,20 @@ * Flash *----------------------------------------------------------------------*/ +/* Use common CFI driver */ +#define CFG_FLASH_CFI +#define CFG_FLASH_CFI_DRIVER +/* board provides its own flash_init code */ +#define CONFIG_FLASH_CFI_LEGACY 1 +#define CFG_FLASH_CFI_WIDTH FLASH_CFI_8BIT +#define CFG_FLASH_LEGACY_512Kx8 1 + +/* print 'E' for empty sector on flinfo */ +#define CFG_FLASH_EMPTY_INFO + #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CFG_MAX_FLASH_SECT 8 /* max number of sectors on one chip */ -#define CFG_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ -#define CFG_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ - /*----------------------------------------------------------------------- * External Bus Controller (EBC) Setup *----------------------------------------------------------------------*/ -- 2.39.5