summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorangelo@sysam.it <angelo@sysam.it>2015-03-28 11:34:52 +0100
committerTom Rini <trini@konsulko.com>2015-03-28 12:07:46 -0400
commit944ab340b6d98faf5f1e30d223d52d6d24c2f858 (patch)
tree4569c6efb07d2bbff1bd490da5bae9c0df7e7840 /common
parent5bcd19aa299bf6832e943e3531400c1499f2c04d (diff)
downloadu-boot-imx-944ab340b6d98faf5f1e30d223d52d6d24c2f858.zip
u-boot-imx-944ab340b6d98faf5f1e30d223d52d6d24c2f858.tar.gz
u-boot-imx-944ab340b6d98faf5f1e30d223d52d6d24c2f858.tar.bz2
m68k: fix 3 broken boards
Fix eb_cpu5282 and eb_cpu5282_internal unresolved external error. These boards have video but don't need any ppc related video_setmem(). Fix M53017EVB moving away embedded env to a different offset, as in M52277EVB. Signed-off-by: Angelo Dureghello <angelo@sysam.it>
Diffstat (limited to 'common')
-rw-r--r--common/board_f.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/board_f.c b/common/board_f.c
index e537cd1..f7ffa54 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -494,7 +494,7 @@ static int reserve_trace(void)
#if defined(CONFIG_VIDEO) && (!defined(CONFIG_PPC) || defined(CONFIG_8xx)) && \
!defined(CONFIG_ARM) && !defined(CONFIG_X86) && \
- !defined(CONFIG_BLACKFIN)
+ !defined(CONFIG_BLACKFIN) && !defined(CONFIG_M68K)
static int reserve_video(void)
{
/* reserve memory for video display (always full pages) */
@@ -968,7 +968,7 @@ static init_fnc_t init_sequence_f[] = {
/* TODO: Why the dependency on CONFIG_8xx? */
#if defined(CONFIG_VIDEO) && (!defined(CONFIG_PPC) || defined(CONFIG_8xx)) && \
!defined(CONFIG_ARM) && !defined(CONFIG_X86) && \
- !defined(CONFIG_BLACKFIN)
+ !defined(CONFIG_BLACKFIN) && !defined(CONFIG_M68K)
reserve_video,
#endif
#if !defined(CONFIG_BLACKFIN) && !defined(CONFIG_NIOS2)