diff options
| author | angelo@sysam.it <angelo@sysam.it> | 2015-03-28 11:34:52 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-28 12:07:46 -0400 |
| commit | 944ab340b6d98faf5f1e30d223d52d6d24c2f858 (patch) | |
| tree | 4569c6efb07d2bbff1bd490da5bae9c0df7e7840 | |
| parent | 5bcd19aa299bf6832e943e3531400c1499f2c04d (diff) | |
| download | u-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>
| -rw-r--r-- | board/freescale/m53017evb/u-boot.lds | 2 | ||||
| -rw-r--r-- | common/board_f.c | 4 | ||||
| -rw-r--r-- | include/configs/M53017EVB.h | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/board/freescale/m53017evb/u-boot.lds b/board/freescale/m53017evb/u-boot.lds index de8d09b..b1cae59 100644 --- a/board/freescale/m53017evb/u-boot.lds +++ b/board/freescale/m53017evb/u-boot.lds @@ -13,8 +13,6 @@ SECTIONS .text : { arch/m68k/cpu/mcf532x/start.o (.text*) - arch/m68k/cpu/mcf532x/built-in.o (.text*) - arch/m68k/lib/built-in.o (.text*) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.text*) 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) diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 83ac70f..e3fa856 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -200,7 +200,7 @@ /* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash */ -#define CONFIG_ENV_OFFSET 0x8000 +#define CONFIG_ENV_OFFSET (CONFIG_SYS_FLASH_BASE + 0x40000) #define CONFIG_ENV_SIZE 0x1000 #define CONFIG_ENV_SECT_SIZE 0x8000 #define CONFIG_ENV_IS_IN_FLASH 1 |