diff options
Diffstat (limited to 'board/freescale/mx35_3stack')
| -rw-r--r-- | board/freescale/mx35_3stack/board-mx35_3stack.h | 2 | ||||
| -rw-r--r-- | board/freescale/mx35_3stack/lowlevel_init.S | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/board/freescale/mx35_3stack/board-mx35_3stack.h b/board/freescale/mx35_3stack/board-mx35_3stack.h index f9c3074..82667ac 100644 --- a/board/freescale/mx35_3stack/board-mx35_3stack.h +++ b/board/freescale/mx35_3stack/board-mx35_3stack.h @@ -63,7 +63,7 @@ #define DBG_CSCR_A_CONFIG 0x22220A00 #define CCM_CCMR_CONFIG 0x003F4208 -#define CCM_PDR0_CONFIG 0x00821000 +#define CCM_PDR0_CONFIG 0x00801000 #define PLL_BRM_OFFSET 31 #define PLL_PD_OFFSET 26 diff --git a/board/freescale/mx35_3stack/lowlevel_init.S b/board/freescale/mx35_3stack/lowlevel_init.S index c255e98..c4454fa 100644 --- a/board/freescale/mx35_3stack/lowlevel_init.S +++ b/board/freescale/mx35_3stack/lowlevel_init.S @@ -204,9 +204,8 @@ check_soc_version r1, r2 cmp r1, #CHIP_REV_2_0 - ldrhs r3, =CCM_MPLL_399_HZ - bhs 1f - ldr r2, [r0, #CLKCTL_PDR0] + movhs r2, #CLKMODE_CONSUMER + ldrlo r2, [r0, #CLKCTL_PDR0] tst r2, #CLKMODE_CONSUMER ldrne r3, =CCM_MPLL_532_HZ /* consumer path*/ ldreq r3, =CCM_MPLL_399_HZ /* auto path*/ @@ -224,7 +223,7 @@ str r1, [r0, #CLKCTL_PDR0] ldr r1, [r0, #CLKCTL_CGR0] - orr r1, r1, #0x00300000 + orr r1, r1, #0x0C300000 str r1, [r0, #CLKCTL_CGR0] ldr r1, [r0, #CLKCTL_CGR1] @@ -322,14 +321,15 @@ lowlevel_init: init_drive_strength + init_clock + init_debug_board + cmp pc, #PHYS_SDRAM_1 - blo init_clock_start + blo init_sdram_start cmp pc, #(PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE) blo skip_sdram_setup -init_clock_start: - init_clock - init_debug_board +init_sdram_start: /*init_sdram*/ setup_sdram skip_sdram_setup: |