From 208f4794a2ed9fa61757392fe6ea62e14970a5a7 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 19 Jul 2012 09:05:46 +0200 Subject: bsp/mpc55xx: New EBI settings for MPC5674F boards --- .../mpc55xxevb/startup/start-config-ebi-cs-cal.c | 2 +- .../libbsp/powerpc/mpc55xxevb/startup/start-early.c | 20 +++++++++----------- .../lib/libcpu/powerpc/mpc55xx/include/fsl-mpc551x.h | 2 +- .../lib/libcpu/powerpc/mpc55xx/include/fsl-mpc555x.h | 2 +- .../lib/libcpu/powerpc/mpc55xx/include/fsl-mpc556x.h | 2 +- .../lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h | 2 +- 6 files changed, 14 insertions(+), 16 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs-cal.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs-cal.c index 6f34745b7c..4fa3632756 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs-cal.c +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs-cal.c @@ -118,7 +118,7 @@ BSP_START_TEXT_SECTION const struct EBI_CAL_CS_tag .OR = { .B = { .AM = 0xffff8000 >> 15, - .SCY = 0, + .SCY = 1, .BSCY = 0 } } diff --git a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-early.c b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-early.c index 1ace8ee2e0..db49778a94 100644 --- a/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-early.c +++ b/c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-early.c @@ -175,19 +175,17 @@ static BSP_START_TEXT_SECTION void mpc55xx_start_ebi(void) SIU.ECCR.B.EBDF = 3; /* use CLK/4 as bus clock */ #elif defined(MPC55XX_BOARD_MPC5674FEVB) || defined(MPC55XX_BOARD_MPC5674F_ECU508) - struct EBI_tag ebi = { - .MCR = { - .B = { - .ACGE = 0, - .MDIS = 0, - .D16_31 = 0, - .AD_MUX = 0, - .DBM = 0 - } - } + union EBI_MCR_tag mcr = { + .B = { + .ACGE = 0, + .MDIS = 0, + .D16_31 = 1, + .AD_MUX = 0, + .DBM = 0 + } }; - EBI.MCR.R = ebi.MCR.R; + EBI.MCR.R = mcr.R; #endif #endif } diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc551x.h b/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc551x.h index 48389d85eb..dec0b4cf73 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc551x.h +++ b/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc551x.h @@ -481,7 +481,7 @@ extern "C" { }; struct EBI_tag { - union { /* Module Configuration Register */ + union EBI_MCR_tag { /* Module Configuration Register */ uint32_t R; struct { uint32_t:16; diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc555x.h b/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc555x.h index 23066bdecc..0dea1957cf 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc555x.h +++ b/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc555x.h @@ -477,7 +477,7 @@ extern "C" { }; struct EBI_tag { - union { /* Module Configuration Register */ + union EBI_MCR_tag { /* Module Configuration Register */ uint32_t R; struct { uint32_t:5; diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc556x.h b/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc556x.h index 70d2536388..41ad83729a 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc556x.h +++ b/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc556x.h @@ -491,7 +491,7 @@ extern "C" { }; struct EBI_tag { - union { /* Module Configuration Register */ + union EBI_MCR_tag { /* Module Configuration Register */ uint32_t R; struct { uint32_t:5; diff --git a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h b/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h index f8174f3368..caee9c9017 100644 --- a/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h +++ b/c/src/lib/libcpu/powerpc/mpc55xx/include/fsl-mpc567x.h @@ -584,7 +584,7 @@ extern "C" { struct EBI_tag { - union { /* Module Configuration Register */ + union EBI_MCR_tag { /* Module Configuration Register */ uint32_t R; struct { uint32_t:16; -- cgit v1.2.3