Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
e5af6791
Unverified
Commit
e5af6791
authored
Sep 28, 2018
by
Dimitris Papastamos
Committed by
GitHub
Sep 28, 2018
Browse files
Merge pull request #1592 from shawnguo2/fix-recovery-build
poplar: fix build error with POPLAR_RECOVERY=1
parents
b0928733
d5ed2946
Changes
2
Show whitespace changes
Inline
Side-by-side
plat/hisilicon/poplar/bl1_plat_setup.c
View file @
e5af6791
...
@@ -92,8 +92,8 @@ void bl1_plat_arch_setup(void)
...
@@ -92,8 +92,8 @@ void bl1_plat_arch_setup(void)
void
bl1_platform_setup
(
void
)
void
bl1_platform_setup
(
void
)
{
{
int
i
;
int
i
;
struct
mmc_device_info
info
;
#if !POPLAR_RECOVERY
#if !POPLAR_RECOVERY
struct
mmc_device_info
info
;
dw_mmc_params_t
params
=
EMMC_INIT_PARAMS
(
POPLAR_EMMC_DESC_BASE
);
dw_mmc_params_t
params
=
EMMC_INIT_PARAMS
(
POPLAR_EMMC_DESC_BASE
);
#endif
#endif
...
...
plat/hisilicon/poplar/bl2_plat_setup.c
View file @
e5af6791
...
@@ -333,9 +333,9 @@ void bl2_plat_get_bl33_meminfo(meminfo_t *bl33_meminfo)
...
@@ -333,9 +333,9 @@ void bl2_plat_get_bl33_meminfo(meminfo_t *bl33_meminfo)
void
bl2_early_platform_setup
(
meminfo_t
*
mem_layout
)
void
bl2_early_platform_setup
(
meminfo_t
*
mem_layout
)
{
{
#if !POPLAR_RECOVERY
struct
mmc_device_info
info
;
struct
mmc_device_info
info
;
#if !POPLAR_RECOVERY
dw_mmc_params_t
params
=
EMMC_INIT_PARAMS
(
POPLAR_EMMC_DESC_BASE
);
dw_mmc_params_t
params
=
EMMC_INIT_PARAMS
(
POPLAR_EMMC_DESC_BASE
);
#endif
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment