cleanup: introduce CONFIG_MPC830x

[oweals/u-boot.git] / include / configs / p3mx.h

diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index 97703d6b720cdbffaee705ae9bb40dbf24bd3d5c..8c459cb46ef6a88b22f6e4b54f3fa11fcb281897 100644 (file)
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -99,8 +99,7 @@
 #undef CONFIG_SYS_INIT_RAM_LOCK
 #define CONFIG_SYS_INIT_RAM_ADDR       0x42000000
 #define CONFIG_SYS_INIT_RAM_SIZE       0x1000
-#define CONFIG_SYS_GBL_DATA_SIZE       128  /* size in bytes reserved for init data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 
 /*-----------------------------------------------------------------------
@@ -118,7 +117,6 @@
  *----------------------------------------------------------------------*/
 /* Change the default ethernet port, use this define (options: 0, 1, 2) */
 #define CONFIG_SYS_ETH_PORT            ETH_0
-#define CONFIG_NET_MULTI
 #define MV_ETH_DEVS            2
 #define CONFIG_PHY_RESET        1      /* reset phy upon startup         */
 #define CONFIG_PHY_GIGE                1       /* Include GbE speed/duplex detection */
@@ -285,7 +283,6 @@
  * Miscellaneous configurable options
  *----------------------------------------------------------------------*/
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory         */
 #define CONFIG_SYS_PROMPT              "=> "   /* Monitor Command Prompt       */
@@ -449,4 +446,8 @@
 
 #define L2_ENABLE      (L2_INIT | L2CR_L2E)
 
+#ifndef __ASSEMBLY__
+#include <../board/Marvell/include/core.h>
+#endif
+
 #endif /* __CONFIG_H */