diff options
| author | David Müller <d.mueller@elsoft.ch> | 2011-12-22 13:38:21 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2012-01-09 09:25:01 +0100 |
| commit | 39441b35c65c110118998116e6a9bb1dfb534eaf (patch) | |
| tree | 46edae45a25ff6c9643dc8d5fa76d00adaf3557c /board/mpl | |
| parent | 21be309bb729bde0c46435fdd7166326ac8b8cc3 (diff) | |
| download | u-boot-imx-39441b35c65c110118998116e6a9bb1dfb534eaf.zip u-boot-imx-39441b35c65c110118998116e6a9bb1dfb534eaf.tar.gz u-boot-imx-39441b35c65c110118998116e6a9bb1dfb534eaf.tar.bz2 | |
board/mpl/mip405: use the CFI driver for the MIP405/MIP405T board
Signed-off-by: David Mueller <d.mueller@elsoft.ch>
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board/mpl')
| -rw-r--r-- | board/mpl/mip405/Makefile | 6 | ||||
| -rw-r--r-- | board/mpl/mip405/mip405.c | 22 |
2 files changed, 25 insertions, 3 deletions
diff --git a/board/mpl/mip405/Makefile b/board/mpl/mip405/Makefile index 5dd0b2f..9921545 100644 --- a/board/mpl/mip405/Makefile +++ b/board/mpl/mip405/Makefile @@ -28,8 +28,10 @@ endif LIB = $(obj)lib$(BOARD).o -COBJS = $(BOARD).o ../common/flash.o cmd_mip405.o ../common/pci.o \ - ../common/usb_uhci.o ../common/common_util.o +COBJS = $(BOARD).o cmd_mip405.o \ + ../common/pci.o \ + ../common/usb_uhci.o \ + ../common/common_util.o SOBJS = init.o diff --git a/board/mpl/mip405/mip405.c b/board/mpl/mip405/mip405.c index 9d0db64..56a84e9 100644 --- a/board/mpl/mip405/mip405.c +++ b/board/mpl/mip405/mip405.c @@ -498,6 +498,27 @@ int board_early_init_f (void) 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; +} /* * Get some PLD Registers @@ -671,7 +692,6 @@ static int test_dram (unsigned long ramsize) /* used to check if the time in RTC is valid */ static unsigned long start; static struct rtc_time tm; -extern flash_info_t flash_info[]; /* info for FLASH chips */ int misc_init_r (void) { |