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. Signed-off-by: Kim Phillips <kim.phill...@freescale.com> --- include/configs/MPC837XERDB.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 807a534..9132718 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -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 */ /* -- 1.6.3.3 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot