summaryrefslogtreecommitdiff
path: root/board/earthlcd
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-09-08 00:48:27 +0200
committerWolfgang Denk <wd@denx.de>2010-09-08 00:48:27 +0200
commitf8736c2125f5bbbe7507e59c7b2c44ec17196aa3 (patch)
tree5c8fd133791edae0cd61f7ee1b1b042697251a27 /board/earthlcd
parentcf64fda38e3d71e9077e11c673bd9be449c680da (diff)
parent1f36f73fe70560a2bd286a7abc8530fdc93af9ae (diff)
downloadu-boot-imx-f8736c2125f5bbbe7507e59c7b2c44ec17196aa3.zip
u-boot-imx-f8736c2125f5bbbe7507e59c7b2c44ec17196aa3.tar.gz
u-boot-imx-f8736c2125f5bbbe7507e59c7b2c44ec17196aa3.tar.bz2
Merge branch 'avr32' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'board/earthlcd')
-rw-r--r--board/earthlcd/favr-32-ezkit/favr-32-ezkit.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/board/earthlcd/favr-32-ezkit/favr-32-ezkit.c b/board/earthlcd/favr-32-ezkit/favr-32-ezkit.c
index 8af680f..b0eca93 100644
--- a/board/earthlcd/favr-32-ezkit/favr-32-ezkit.c
+++ b/board/earthlcd/favr-32-ezkit/favr-32-ezkit.c
@@ -24,10 +24,25 @@
#include <asm/sdram.h>
#include <asm/arch/clk.h>
#include <asm/arch/hmatrix.h>
+#include <asm/arch/mmu.h>
#include <asm/arch/portmux.h>
DECLARE_GLOBAL_DATA_PTR;
+struct mmu_vm_range mmu_vmr_table[CONFIG_SYS_NR_VM_REGIONS] = {
+ {
+ .virt_pgno = CONFIG_SYS_FLASH_BASE >> PAGE_SHIFT,
+ .nr_pages = CONFIG_SYS_FLASH_SIZE >> PAGE_SHIFT,
+ .phys = (CONFIG_SYS_FLASH_BASE >> PAGE_SHIFT)
+ | MMU_VMR_CACHE_NONE,
+ }, {
+ .virt_pgno = CONFIG_SYS_SDRAM_BASE >> PAGE_SHIFT,
+ .nr_pages = EBI_SDRAM_SIZE >> PAGE_SHIFT,
+ .phys = (CONFIG_SYS_SDRAM_BASE >> PAGE_SHIFT)
+ | MMU_VMR_CACHE_WRBACK,
+ },
+};
+
static const struct sdram_config sdram_config = {
/* MT48LC4M32B2P-6 (16 MB) */
.data_bits = SDRAM_DATA_32BIT,
@@ -68,13 +83,11 @@ phys_size_t initdram(int board_type)
unsigned long actual_size;
void *sdram_base;
- sdram_base = map_physmem(EBI_SDRAM_BASE, EBI_SDRAM_SIZE, MAP_NOCACHE);
+ sdram_base = uncached(EBI_SDRAM_BASE);
expected_size = sdram_init(sdram_base, &sdram_config);
actual_size = get_ram_size(sdram_base, expected_size);
- unmap_physmem(sdram_base, EBI_SDRAM_SIZE);
-
if (expected_size != actual_size)
printf("Warning: Only %lu of %lu MiB SDRAM is working\n",
actual_size >> 20, expected_size >> 20);