diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-22 17:21:24 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-22 17:21:24 +0200 |
| commit | 58c5376ba67767ee684069d43e7f747a5d9ae8ed (patch) | |
| tree | dfd19b2fb608c8ba238da53f3302c30d94a1e0ba /board/amcc | |
| parent | dc7746d86d2a3dfe01ab9a70cb427f92adc303c7 (diff) | |
| parent | 5d40d4430d9ebc8434c6f0798594836e1efa7a1e (diff) | |
| download | u-boot-imx-58c5376ba67767ee684069d43e7f747a5d9ae8ed.zip u-boot-imx-58c5376ba67767ee684069d43e7f747a5d9ae8ed.tar.gz u-boot-imx-58c5376ba67767ee684069d43e7f747a5d9ae8ed.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Diffstat (limited to 'board/amcc')
| -rw-r--r-- | board/amcc/canyonlands/bootstrap.c | 13 | ||||
| -rw-r--r-- | board/amcc/canyonlands/init.S | 1 | ||||
| -rw-r--r-- | board/amcc/canyonlands/u-boot-nand.lds | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/board/amcc/canyonlands/bootstrap.c b/board/amcc/canyonlands/bootstrap.c index 37fa1c9..1d125b6 100644 --- a/board/amcc/canyonlands/bootstrap.c +++ b/board/amcc/canyonlands/bootstrap.c @@ -63,9 +63,22 @@ static u8 boot_configs[][17] = { /* * Bytes 5,6,8,9,11 change for NAND boot */ +#if 0 +/* + * Values for 512 page size NAND chips, not used anymore, just + * keep them here for reference + */ static u8 nand_boot[] = { 0x90, 0x01, 0xa0, 0x68, 0x58 }; +#else +/* + * Values for 2k page size NAND chips + */ +static u8 nand_boot[] = { + 0x90, 0x01, 0xa0, 0xe8, 0x58 +}; +#endif static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { diff --git a/board/amcc/canyonlands/init.S b/board/amcc/canyonlands/init.S index bd4cab5..258fb5d 100644 --- a/board/amcc/canyonlands/init.S +++ b/board/amcc/canyonlands/init.S @@ -51,6 +51,7 @@ tlbtab: #else tlbentry(CFG_NAND_BOOT_SPL_SRC, SZ_4K, CFG_NAND_BOOT_SPL_SRC, 4, AC_R|AC_W|AC_X|SA_G) tlbentry(CFG_SDRAM_BASE, SZ_256M, CFG_SDRAM_BASE, 0, AC_R|AC_W|AC_X|SA_G|SA_I) + tlbentry(256 << 20, SZ_256M, 256 << 20, 0, AC_R|AC_W|AC_X|SA_G|SA_I) #endif /* diff --git a/board/amcc/canyonlands/u-boot-nand.lds b/board/amcc/canyonlands/u-boot-nand.lds index f0837d4..332e3aa 100644 --- a/board/amcc/canyonlands/u-boot-nand.lds +++ b/board/amcc/canyonlands/u-boot-nand.lds @@ -56,10 +56,10 @@ SECTIONS cpu/ppc4xx/start.o (.text) /* Align to next NAND block */ - . = ALIGN(0x4000); + . = ALIGN(0x20000); common/environment.o (.ppcenv) /* Keep some space here for redundant env and potential bad env blocks */ - . = ALIGN(0x10000); + . = ALIGN(0x80000); *(.text) *(.fixup) |