Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

malta: use unmapped flash base address

Browse source 
The physical base address of the NOR flash is 0x1e000000
on the Malta boards. The hardware also maps the first 4MiB
of the flash into the 0x1fc00000-0x1fffffff range.

Currently, U-Boot uses the mapped address to access the
flash, which does not work in recent qemu versions.

Since commit a427338b222b43197c2776cbc996936df0302f51
(mips_malta: correct reading MIPS revision at 0x1fc00010)
writing to the mapped address space causes a CPU exception.
Due to the exception, U-Boot hangs during boot when it tries
to detect the CFI flash chip.

Use the correct physical address for the MALTA_FLASH_BASE
constant to fix the problem. In order to avoid relocation
problems, also update the CONFIG_SYS_{TEXT,MONITOR}_BASE
constants.

The change makes it possible to start U-Boot on a Malta
board emulated with Qemu 1.6.1 and 1.7.0-rc0. It also
works on older versions (tested with 1.1.1, 1.2.2, 1.4.2,
1.5.3).

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Paul Burton <paul.burton@imgtec.com>
This commit is contained in:
Gabor Juhos 2013-11-12 16:47:32 +01:00 committed by Daniel Schwierzeck
parent 63c4f17b2f
commit 10473d0490
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/mips/include/asm/malta.h
View file

@ -44,7 +44,7 @@
#define MALTA_RESET_BASE 0x1f000500 #define MALTA_RESET_BASE 0x1f000500
#define GORESET 0x42 #define GORESET 0x42
#define MALTA_FLASH_BASE 0x1fc00000 #define MALTA_FLASH_BASE 0x1e000000
#define MALTA_REVISION 0x1fc00010 #define MALTA_REVISION 0x1fc00010
#define MALTA_REVISION_CORID_SHF 10 #define MALTA_REVISION_CORID_SHF 10

4
include/configs/malta.h
View file

@ -40,8 +40,8 @@
/* /*
* Memory map * Memory map
*/ */
#define CONFIG_SYS_TEXT_BASE 0xbfc00000 /* Rom version */ #define CONFIG_SYS_TEXT_BASE 0xbe000000 /* Rom version */
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
#define CONFIG_SYS_SDRAM_BASE 0x80000000 /* Cached addr */ #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* Cached addr */
#define CONFIG_SYS_MEM_SIZE (256 * 1024 * 1024) #define CONFIG_SYS_MEM_SIZE (256 * 1024 * 1024)