RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

bsp/mpc55xxevb: Fix flash settings for MPC5510

Browse Source
This commit is contained in:
Sebastian Huber
2014-10-30 14:29:09 +01:00
parent 7ae1c30cc8
commit e08b0b917c
2 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-flash.S
View File

@@ -7,7 +7,7 @@
*/ */
/* /*
* Copyright (c) 2008-2011 embedded brains GmbH. All rights reserved. * Copyright (c) 2008-2014 embedded brains GmbH. All rights reserved.
* *
* embedded brains GmbH * embedded brains GmbH
* Obere Lagerstr. 30 * Obere Lagerstr. 30
@@ -25,12 +25,33 @@
.section ".bsp_start_text", "ax" .section ".bsp_start_text", "ax"
/* Optimized flash configurations (Table 13-15 [MPC5567 Microcontroller Reference Manual]) */
.equ FLASH_SETTINGS_RESET, 0xff00 .equ FLASH_SETTINGS_RESET, 0xff00
.equ FLASH_SETTINGS_82, FLASH_BUICR_CPU_PREFTCH | FLASH_BUICR_APC_1 | FLASH_BUICR_RWSC_1 | FLASH_BUICR_WWSC_1 | FLASH_BUICR_DPFEN_3 | FLASH_BUICR_IPFEN_3 | FLASH_BUICR_PFLIM_6 | FLASH_BUICR_BFEN
.equ FLASH_SETTINGS_102, FLASH_BUICR_CPU_PREFTCH | FLASH_BUICR_APC_1 | FLASH_BUICR_RWSC_2 | FLASH_BUICR_WWSC_1 | FLASH_BUICR_DPFEN_3 | FLASH_BUICR_IPFEN_3 | FLASH_BUICR_PFLIM_6 | FLASH_BUICR_BFEN #if MPC55XX_CHIP_FAMILY == 551
.equ FLASH_SETTINGS_132, FLASH_BUICR_CPU_PREFTCH | FLASH_BUICR_APC_2 | FLASH_BUICR_RWSC_3 | FLASH_BUICR_WWSC_1 | FLASH_BUICR_DPFEN_3 | FLASH_BUICR_IPFEN_3 | FLASH_BUICR_PFLIM_6 | FLASH_BUICR_BFEN
.equ FLASH_SETTINGS_264, 0x01716B15 /* MPC5510 Microcontroller Family Data Sheet, Rev. 3, Table 16, Num 7 */
.equ FLASH_CLOCK_0, 25
.equ FLASH_CLOCK_1, 50
.equ FLASH_CLOCK_2, 80
.equ FLASH_CLOCK_3, FLASH_CLOCK_2
.equ FLASH_SETTINGS_0, FLASH_BUICR_CPU_PREFTCH | FLASH_BUICR_APC_0 | FLASH_BUICR_RWSC_0 | FLASH_BUICR_WWSC_1 | FLASH_BUICR_DPFEN_1 | FLASH_BUICR_IPFEN_1 | FLASH_BUICR_PFLIM_2 | FLASH_BUICR_BFEN
.equ FLASH_SETTINGS_1, FLASH_BUICR_CPU_PREFTCH | FLASH_BUICR_APC_1 | FLASH_BUICR_RWSC_1 | FLASH_BUICR_WWSC_1 | FLASH_BUICR_DPFEN_1 | FLASH_BUICR_IPFEN_1 | FLASH_BUICR_PFLIM_2 | FLASH_BUICR_BFEN
.equ FLASH_SETTINGS_2, FLASH_BUICR_CPU_PREFTCH | FLASH_BUICR_APC_2 | FLASH_BUICR_RWSC_2 | FLASH_BUICR_WWSC_1 | FLASH_BUICR_DPFEN_1 | FLASH_BUICR_IPFEN_1 | FLASH_BUICR_PFLIM_2 | FLASH_BUICR_BFEN
.equ FLASH_SETTINGS_3, FLASH_SETTINGS_2
#else
/* Optimized flash configurations (Table 13-15 [MPC5567 Microcontroller Reference Manual]) */
.equ FLASH_CLOCK_0, 82
.equ FLASH_CLOCK_1, 102
.equ FLASH_CLOCK_2, 132
.equ FLASH_CLOCK_3, 264
.equ FLASH_SETTINGS_0, FLASH_BUICR_CPU_PREFTCH | FLASH_BUICR_APC_1 | FLASH_BUICR_RWSC_1 | FLASH_BUICR_WWSC_1 | FLASH_BUICR_DPFEN_3 | FLASH_BUICR_IPFEN_3 | FLASH_BUICR_PFLIM_6 | FLASH_BUICR_BFEN
.equ FLASH_SETTINGS_1, FLASH_BUICR_CPU_PREFTCH | FLASH_BUICR_APC_1 | FLASH_BUICR_RWSC_2 | FLASH_BUICR_WWSC_1 | FLASH_BUICR_DPFEN_3 | FLASH_BUICR_IPFEN_3 | FLASH_BUICR_PFLIM_6 | FLASH_BUICR_BFEN
.equ FLASH_SETTINGS_2, FLASH_BUICR_CPU_PREFTCH | FLASH_BUICR_APC_2 | FLASH_BUICR_RWSC_3 | FLASH_BUICR_WWSC_1 | FLASH_BUICR_DPFEN_3 | FLASH_BUICR_IPFEN_3 | FLASH_BUICR_PFLIM_6 | FLASH_BUICR_BFEN
.equ FLASH_SETTINGS_3, 0x01716B15
#endif
/** /**
* @fn void mpc55xx_start_flash() * @fn void mpc55xx_start_flash()
@@ -53,31 +74,31 @@ GLOBAL_FUNCTION mpc55xx_start_flash
/* Flash settings dependent on system clock */ /* Flash settings dependent on system clock */
bl mpc55xx_get_system_clock bl mpc55xx_get_system_clock
LWI r4, 82000000 LWI r4, FLASH_CLOCK_0
cmpw r3, r4 cmpw r3, r4
ble clock_82 ble clock_0
LWI r4, 102000000 LWI r4, FLASH_CLOCK_1
cmpw r3, r4 cmpw r3, r4
ble clock_102 ble clock_1
LWI r4, 132000000 LWI r4, FLASH_CLOCK_2
cmpw r3, r4 cmpw r3, r4
ble clock_132 ble clock_2
LWI r4, 264000000 LWI r4, FLASH_CLOCK_3
cmpw r3, r4 cmpw r3, r4
ble clock_264 ble clock_3
LWI r3, FLASH_SETTINGS_RESET LWI r3, FLASH_SETTINGS_RESET
b settings_done b settings_done
clock_82: clock_0:
LWI r3, FLASH_SETTINGS_82 LWI r3, FLASH_SETTINGS_0
b settings_done b settings_done
clock_102: clock_1:
LWI r3, FLASH_SETTINGS_102 LWI r3, FLASH_SETTINGS_1
b settings_done b settings_done
clock_132: clock_2:
LWI r3, FLASH_SETTINGS_132 LWI r3, FLASH_SETTINGS_2
b settings_done b settings_done
clock_264: clock_3:
LWI r3, FLASH_SETTINGS_264 LWI r3, FLASH_SETTINGS_3
b settings_done b settings_done
settings_done: settings_done:

3
c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h
View File

@@ -7,7 +7,7 @@
*/ */
/* /*
* Copyright (c) 2008-2011 embedded brains GmbH. All rights reserved. * Copyright (c) 2008-2014 embedded brains GmbH. All rights reserved.
* *
* embedded brains GmbH * embedded brains GmbH
* Obere Lagerstr. 30 * Obere Lagerstr. 30
@@ -51,6 +51,7 @@
#define FLASH_BUICR_CPU_PREFTCH 0x00010000 #define FLASH_BUICR_CPU_PREFTCH 0x00010000
/* Fields for APC (access pipelining control bits [16:18]) */ /* Fields for APC (access pipelining control bits [16:18]) */
#define FLASH_BUICR_APC_0 0x00000000
#define FLASH_BUICR_APC_1 0x00002000 #define FLASH_BUICR_APC_1 0x00002000
#define FLASH_BUICR_APC_2 0x00004000 #define FLASH_BUICR_APC_2 0x00004000
#define FLASH_BUICR_APC_3 0x00006000 #define FLASH_BUICR_APC_3 0x00006000