Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
u-boot-2015.04
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vesta
u-boot-2015.04
Commits
ecead84d
Commit
ecead84d
authored
15 years ago
by
Kumar Gala
Browse files
Options
Downloads
Patches
Plain Diff
85xx: Cleanup whitespace in mpc8536ds.c
Signed-off-by:
Kumar Gala
<
galak@kernel.crashing.org
>
parent
ad19e7a5
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
board/freescale/mpc8536ds/mpc8536ds.c
+5
-11
5 additions, 11 deletions
board/freescale/mpc8536ds/mpc8536ds.c
with
5 additions
and
11 deletions
board/freescale/mpc8536ds/mpc8536ds.c
+
5
−
11
View file @
ecead84d
...
@@ -256,14 +256,13 @@ pci_init_board(void)
...
@@ -256,14 +256,13 @@ pci_init_board(void)
}
else
{
}
else
{
printf
(
" PCIE3: disabled
\n
"
);
printf
(
" PCIE3: disabled
\n
"
);
}
}
}
}
#else
#else
gur
->
devdisr
|=
MPC85xx_DEVDISR_PCIE3
;
/* disable */
gur
->
devdisr
|=
MPC85xx_DEVDISR_PCIE3
;
/* disable */
#endif
#endif
#ifdef CONFIG_PCIE1
#ifdef CONFIG_PCIE1
{
{
volatile
ccsr_fsl_pci_t
*
pci
=
(
ccsr_fsl_pci_t
*
)
CONFIG_SYS_PCIE1_ADDR
;
volatile
ccsr_fsl_pci_t
*
pci
=
(
ccsr_fsl_pci_t
*
)
CONFIG_SYS_PCIE1_ADDR
;
struct
pci_controller
*
hose
=
&
pcie1_hose
;
struct
pci_controller
*
hose
=
&
pcie1_hose
;
int
pcie_ep
=
(
host_agent
==
5
);
int
pcie_ep
=
(
host_agent
==
5
);
...
@@ -315,14 +314,13 @@ pci_init_board(void)
...
@@ -315,14 +314,13 @@ pci_init_board(void)
}
else
{
}
else
{
printf
(
" PCIE1: disabled
\n
"
);
printf
(
" PCIE1: disabled
\n
"
);
}
}
}
}
#else
#else
gur
->
devdisr
|=
MPC85xx_DEVDISR_PCIE
;
/* disable */
gur
->
devdisr
|=
MPC85xx_DEVDISR_PCIE
;
/* disable */
#endif
#endif
#ifdef CONFIG_PCIE2
#ifdef CONFIG_PCIE2
{
{
volatile
ccsr_fsl_pci_t
*
pci
=
(
ccsr_fsl_pci_t
*
)
CONFIG_SYS_PCIE2_ADDR
;
volatile
ccsr_fsl_pci_t
*
pci
=
(
ccsr_fsl_pci_t
*
)
CONFIG_SYS_PCIE2_ADDR
;
struct
pci_controller
*
hose
=
&
pcie2_hose
;
struct
pci_controller
*
hose
=
&
pcie2_hose
;
int
pcie_ep
=
(
host_agent
==
3
);
int
pcie_ep
=
(
host_agent
==
3
);
...
@@ -372,13 +370,11 @@ pci_init_board(void)
...
@@ -372,13 +370,11 @@ pci_init_board(void)
}
else
{
}
else
{
printf
(
" PCIE2: disabled
\n
"
);
printf
(
" PCIE2: disabled
\n
"
);
}
}
}
}
#else
#else
gur
->
devdisr
|=
MPC85xx_DEVDISR_PCIE2
;
/* disable */
gur
->
devdisr
|=
MPC85xx_DEVDISR_PCIE2
;
/* disable */
#endif
#endif
#ifdef CONFIG_PCI1
#ifdef CONFIG_PCI1
{
{
volatile
ccsr_fsl_pci_t
*
pci
=
(
ccsr_fsl_pci_t
*
)
CONFIG_SYS_PCI1_ADDR
;
volatile
ccsr_fsl_pci_t
*
pci
=
(
ccsr_fsl_pci_t
*
)
CONFIG_SYS_PCI1_ADDR
;
...
@@ -391,7 +387,6 @@ pci_init_board(void)
...
@@ -391,7 +387,6 @@ pci_init_board(void)
uint
pci_arb
=
gur
->
pordevsr
&
MPC85xx_PORDEVSR_PCI1_ARB
;
/* PORDEVSR[14] */
uint
pci_arb
=
gur
->
pordevsr
&
MPC85xx_PORDEVSR_PCI1_ARB
;
/* PORDEVSR[14] */
uint
pci_clk_sel
=
gur
->
porpllsr
&
MPC85xx_PORDEVSR_PCI1_SPD
;
/* PORPLLSR[16] */
uint
pci_clk_sel
=
gur
->
porpllsr
&
MPC85xx_PORDEVSR_PCI1_SPD
;
/* PORPLLSR[16] */
if
(
!
(
devdisr
&
MPC85xx_DEVDISR_PCI1
))
{
if
(
!
(
devdisr
&
MPC85xx_DEVDISR_PCI1
))
{
printf
(
"
\n
PCI: %d bit, %s MHz, %s, %s, %s (base address %x)
\n
"
,
printf
(
"
\n
PCI: %d bit, %s MHz, %s, %s, %s (base address %x)
\n
"
,
(
pci_32
)
?
32
:
64
,
(
pci_32
)
?
32
:
64
,
...
@@ -441,7 +436,6 @@ pci_init_board(void)
...
@@ -441,7 +436,6 @@ pci_init_board(void)
#endif
#endif
}
}
int
board_early_init_r
(
void
)
int
board_early_init_r
(
void
)
{
{
const
unsigned
int
flashbase
=
CONFIG_SYS_FLASH_BASE
;
const
unsigned
int
flashbase
=
CONFIG_SYS_FLASH_BASE
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment