V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

board/mpl/pip405: use the CFI driver for the PIP405 board 

Signed-off-by: David Mueller <d.mueller@elsoft.ch>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
David Müller 2011-12-22 13:38:20 +01:00 committed by Stefan Roese
parent 4b11dba975
commit 21be309bb7
3 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
board/mpl/pip405/Makefile
View File

@ -28,11 +28,12 @@ endif
LIB = $(obj)lib$(BOARD).o LIB = $(obj)lib$(BOARD).o
COBJS = $(BOARD).o \ COBJS = $(BOARD).o cmd_pip405.o \
../common/flash.o cmd_pip405.o ../common/pci.o \ ../common/pci.o \
../common/isa.o ../common/kbd.o \ ../common/isa.o \
../common/usb_uhci.o \ ../common/kbd.o \
../common/common_util.o ../common/usb_uhci.o \
../common/common_util.o
SOBJS = init.o SOBJS = init.o

23
board/mpl/pip405/pip405.c
View File

@ -566,7 +566,27 @@ int board_early_init_f (void)
return 0; return 0;
} }
int board_early_init_r(void)
{
int mode;
/*
* since we are relocated, we can finally enable i-cache
* and set up the flash CS correctly
*/
icache_enable();
setup_cs_reloc();
/* get and display boot mode */
mode = get_boot_mode();
if (mode & BOOT_PCI)
printf("PCI Boot %s Map\n", (mode & BOOT_MPS) ?
"MPS" : "Flash");
else
printf("%s Boot\n", (mode & BOOT_MPS) ?
"MPS" : "Flash");
return 0;
}
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* /*
@ -660,9 +680,6 @@ static int test_dram (unsigned long ramsize)
return (1); return (1);
} }
extern flash_info_t flash_info[]; /* info for FLASH chips */
int misc_init_r (void) int misc_init_r (void)
{ {
/* adjust flash start and size as well as the offset */ /* adjust flash start and size as well as the offset */

16
include/configs/PIP405.h
View File

@ -113,6 +113,8 @@
#define SPD_EEPROM_ADDRESS 0x50 #define SPD_EEPROM_ADDRESS 0x50
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOARD_EARLY_INIT_R
/************************************************************** /**************************************************************
* Environment definitions * Environment definitions
**************************************************************/ **************************************************************/
@ -230,11 +232,17 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* FLASH organization * FLASH organization
*/ */
#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CONFIG_SYS_UPDATE_FLASH_SIZE
#define CONFIG_SYS_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ #define CONFIG_SYS_FLASH_PROTECTION
#define CONFIG_SYS_FLASH_EMPTY_INFO
#define CONFIG_SYS_FLASH_ERASE_TOUT 120000 /* Timeout for Flash Erase (in ms) */ #define CONFIG_SYS_FLASH_CFI
#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Timeout for Flash Write (in ms) */ #define CONFIG_FLASH_CFI_DRIVER
#define CONFIG_FLASH_SHOW_PROGRESS 45
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_MAX_FLASH_SECT 256
/* /*
* Init Memory Controller: * Init Memory Controller: