Add support for variable flash memory sizes on 83xx systems
PATCH 1/1 Add support for variable flash memory sizes on 83xx systems
From: Timur Tabi <[email protected]>
CHANGELOG:
* On 83xx systems, use the CFG_FLASH_SIZE macro to program the LBC local access window registers, instead of using a hard-coded value of 8MB.
--- cpu/mpc83xx/start.S | 41 +++++++++++++++++++++++++++++++++-------- 1 files changed, 33 insertions(+), 8 deletions(-)
cpu/mpc83xx/start.S +33 -8
@@ -2,7 +2,7 @@ * Copyright (C) 1998 Dan Malek <[email protected]> * Copyright (C) 1999 Magnus Damm <kieraypc01.p.y.kie.era.ericsson.se> * Copyright (C) 2000, 2001,2002 Wolfgang Denk <[email protected]> - * Copyright 2004 Freescale Semiconductor, Inc. + * Copyright (C) 2004-2006 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project.
@@ -1214,8 +1214,15 @@ map_flash_by_law1: lis r4, (CFG_FLASH_BASE)@h ori r4, r4, (CFG_FLASH_BASE)@l stw r4, LBLAWBAR1(r3) /* LBLAWBAR1 <= CFG_FLASH_BASE */ - lis r4, (0x80000016)@h - ori r4, r4, (0x80000016)@l + + /* Store 0x80000012 + log2(CFG_FLASH_SIZE) into LBLAWAR1 */ + lis r4, (0x80000012)@h + ori r4, r4, (0x80000012)@l + li r5, CFG_FLASH_SIZE +1: srawi. r5, r5, 1 /* r5 = r5 >> 1 */ + addi r4, r4, 1 + bne 1b + stw r4, LBLAWAR1(r3) /* LBLAWAR1 <= 8MB Flash Size */ blr
@@ -1224,6 +1231,19 @@ map_flash_by_law1: * window 0 and bank 0 correctly at here. */ remap_flash_by_law0: + +#ifdef CONFIG_MPC8349ITX +/* MPC8349ITX : CS1 */ + /* Initialize the BR1 with the vsc7385 starting address. */ + lis r5, 0xf8000801 at h + ori r5, r5, 0xf8000801 at l + stw r5, BR1(r3) /* r5 <= (CFG_FLASH_BASE & 0xFFFF8000) | (BR1 & 0x00007FFF) */ + + lis r5, 0xfffe09ff at h + ori r5, r5, 0xfffe09ff@l + stw r5, OR1(r3) +#endif + /* Initialize the BR0 with the boot ROM starting address. */ lwz r4, BR0(r3) li r5, 0x7FFF
@@ -1234,17 +1254,22 @@ remap_flash_by_law0: stw r5, BR0(r3) /* r5 <= (CFG_FLASH_BASE & 0xFFFF8000) | (BR0 & 0x00007FFF) */ lwz r4, OR0(r3) - lis r5, 0xFF80 /* 8M */ + lis r5, ~((CFG_FLASH_SIZE << 4) - 1) or r4, r4, r5 - stw r4, OR0(r3) /* OR0 <= OR0 | 0xFF800000 */ + stw r4, OR0(r3) lis r4, (CFG_FLASH_BASE)@h ori r4, r4, (CFG_FLASH_BASE)@l stw r4, LBLAWBAR0(r3) /* LBLAWBAR0 <= CFG_FLASH_BASE */ - lis r4, (0x80000016)@h - ori r4, r4, (0x80000016)@l - stw r4, LBLAWAR0(r3) /* LBLAWAR0 <= 8MB Flash Size */ + /* Store 0x80000012 + log2(CFG_FLASH_SIZE) into LBLAWAR0 */ + lis r4, (0x80000012)@h + ori r4, r4, (0x80000012)@l + li r5, CFG_FLASH_SIZE +1: srawi. r5, r5, 1 /* r5 = r5 >> 1 */ + addi r4, r4, 1 + bne 1b + stw r4, LBLAWAR0(r3) /* LBLAWAR0 <= Flash Size */ xor r4, r4, r4 stw r4, LBLAWBAR1(r3)
Signature · 1 line
1.4.2
PATCH 1/1 Add support for variable flash memory sizes on 83xx systems
Quoted 3 lines · In message <[email protected]> you wrote:
* On 83xx systems, use the
CFG_FLASH_SIZEmacro to program the LBC local access window registers, instead of using a hard-coded value of 8MB.
THis part of the patch is OK, but please...
cpu/mpc83xx/start.S map_flash_by_law1: · line 1245
Quoted 11 lines
cpu/mpc83xx/start.S +11
-0+#ifdef CONFIG_MPC8349ITX +/* MPC8349ITX : CS1 */ + /* Initialize the BR1 with the vsc7385 starting address. */ + lis r5, 0xf8000801 at h + ori r5, r5, 0xf8000801 at l + stw r5, BR1(r3) /* r5 <= (CFG_FLASH_BASE & 0xFFFF8000) | (BR1 & 0x00007FFF) */ + + lis r5, 0xfffe09ff at h + ori r5, r5, 0xfffe09ff at l + stw r5, OR1(r3) +#endif
... don't mix in board-specific patches here, especially not for boards that are not supported in U-Boot yet.
Please clean up and resubmit.
Best regards,
Wolfgang Denk
Signature · 6 lines
Software Engineering: Embedded and Realtime Systems, Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Misquotation is, in fact, the pride and privilege of the learned. A
widely-read man never quotes accurately, for the rather obvious
reason that he has read too widely.
- Hesketh Pearson _Common Misquotations_ introductionPATCH 1/1 Add support for variable flash memory sizes on 83xx systems
Quoted 6 lines · Wolfgang Denk
Quoted 6 lines
cpu/mpc83xx/start.S +6
-0+#ifdef CONFIG_MPC8349ITX +/* MPC8349ITX : CS1 */ + /* Initialize the BR1 with the vsc7385 starting address. */ + lis r5, 0xf8000801 at h + ori r5, r5, 0xf8000801 at l + stw r5, BR1(r3) /* r5 <= (CFG_FLASH_BASE & 0xFFFF8000) | (BR1 & 0x00007FFF) */
Quoted 8 lines
cpu/mpc83xx/start.S map_flash_by_law1: · line 1245
Quoted 5 lines
cpu/mpc83xx/start.S +5
-0+ + lis r5, 0xfffe09ff at h + ori r5, r5, 0xfffe09ff at l + stw r5, OR1(r3) +#endif... don't mix in board-specific patches here, especially not for boards that are not supported in U-Boot yet.
So sorry ... that wasn't my intention at all.
New patch resubmitted.
Signature · 2 lines
Timur Tabi Linux Kernel Developer @ Freescale