Skip to contentSkip to conversation

mpc83xx: fix duplicate MONITOR_LEN definition caused by merge foo

PATCH New Kim Phillips 2 participants 2 messages Jul 17, 2009 – Jul 18, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mpc83xx: fix duplicate MONITOR_LEN definition caused by merge foo

commits 4a9932a4364b548773bc131bf85e24a2ec15f2b0 and c9646ed758804fa1fa6c1425369a4eee5d618b1d merged and generated this build error:

Configuring for MPC837XERDB board...
In file included from /home/r1aaha/git/u-boot/include/config.h:3,
from include/common.h:35:
/home/r1aaha/git/u-boot/include/configs/MPC837XERDB.h:233:1: warning: "CONFIG_SYS_MONITOR_LEN" redefined /home/r1aaha/git/u-boot/include/configs/MPC837XERDB.h:232:1: warning: this is the location of the previous definition

take the larger value of the two, to allow for -mmultiple-broken compilers, such as gcc 4.4.

---
 include/configs/MPC837XERDB.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
include/configs/MPC837XERDB.h +0 -1
index 807a534..9132718 100644
@@ -230,7 +230,6 @@
 #endif
 
 #define CONFIG_SYS_MONITOR_LEN		(384 * 1024) /* Reserve 384 kB for Mon */
-#define CONFIG_SYS_MONITOR_LEN		(320 * 1024) /* Reserve 320 kB for Mon */
 #define CONFIG_SYS_MALLOC_LEN		(512 * 1024) /* Reserved for malloc */
 
 /*
Signature · 1 line
1.6.3.3
#1 lore raw

PATCH 1/1 mpc83xx: fix duplicate MONITOR_LEN definition caused by merge foo

Dear Kim Phillips,

Quoted 10 lines · In message <[email protected]> you wrote:

commits 4a9932a4364b548773bc131bf85e24a2ec15f2b0 and c9646ed758804fa1fa6c1425369a4eee5d618b1d merged and generated this build error:

Configuring for MPC837XERDB board...
In file included from /home/r1aaha/git/u-boot/include/config.h:3,
from include/common.h:35:
/home/r1aaha/git/u-boot/include/configs/MPC837XERDB.h:233:1: warning: "CONFIG_SYS_MONITOR_LEN" redefined /home/r1aaha/git/u-boot/include/configs/MPC837XERDB.h:232:1: warning: this is the location of the previous definition

Quoted 4 lines

take the larger value of the two, to allow for -mmultiple-broken compilers, such as gcc 4.4.

Sorry, I ran over this and fixed it before running over your patch.

Hope this is OK with you.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
God may be subtle, but He isn't plain mean.         - Albert Einstein