m68k: fix 3 broken boards

PATCH In review Angelo Dureghello 2 participants 2 messages Mar 28, 2015

Share & tools

Angelo Dureghello

author

2015-03-28 10:34 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 board/freescale/m53017evb/u-boot.lds | 2 --
 common/board_f.c                     | 4 ++--
 include/configs/M53017EVB.h          | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

board/freescale/m53017evb/u-boot.lds +0 -2

index de8d09b..b1cae59 100644
@@ -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*)

common/board_f.c +2 -2

index 55ede07..8ea3a33 100644
@@ -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)

include/configs/M53017EVB.h +1 -1

index a100d9f..6d7c5f9 100644
@@ -202,7 +202,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

Signature · 1 line

2.1.4

Tom Rini

2015-03-28 18:10 UTC #1 lore raw

Quoted 8 lines · angelo at sysam.it

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 <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150328/549dcbf4/attachment.sig>