diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-08 00:48:27 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-08 00:48:27 +0200 |
| commit | f8736c2125f5bbbe7507e59c7b2c44ec17196aa3 (patch) | |
| tree | 5c8fd133791edae0cd61f7ee1b1b042697251a27 /board/atmel/atstk1000/atstk1000.c | |
| parent | cf64fda38e3d71e9077e11c673bd9be449c680da (diff) | |
| parent | 1f36f73fe70560a2bd286a7abc8530fdc93af9ae (diff) | |
| download | u-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/atmel/atstk1000/atstk1000.c')
| -rw-r--r-- | board/atmel/atstk1000/atstk1000.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/board/atmel/atstk1000/atstk1000.c b/board/atmel/atstk1000/atstk1000.c index c36cb57..8b1e1b5 100644 --- a/board/atmel/atstk1000/atstk1000.c +++ b/board/atmel/atstk1000/atstk1000.c @@ -25,11 +25,26 @@ #include <asm/sdram.h> #include <asm/arch/clk.h> #include <asm/arch/hmatrix.h> +#include <asm/arch/mmu.h> #include <asm/arch/portmux.h> #include <netdev.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 = { #if defined(CONFIG_ATSTK1006) /* Dual MT48LC16M16A2-7E (64 MB) on daughterboard */ @@ -97,13 +112,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); |