Merge branch 'master' of git://git.denx.de/u-boot

[karo-tx-uboot.git] / include / configs / p3mx.h

diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index 8b5ef8fa852fdcf7699715ab98f0f2c3ccae8764..a210e293a9becb6ae79f168809067cbc8feab615 100644 (file)
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -5,23 +5,7 @@
  * Based on original work by
  *      Roel Loeffen, (C) Copyright 2006 Prodrive B.V.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /************************************************************************
@@ -98,9 +82,8 @@
 */
 #undef CONFIG_SYS_INIT_RAM_LOCK
 #define CONFIG_SYS_INIT_RAM_ADDR       0x42000000
-#define CONFIG_SYS_INIT_RAM_END        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_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 
 /*-----------------------------------------------------------------------
@@ -118,7 +101,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 */
@@ -212,7 +194,7 @@
        "flash_self=run ramargs addip addtty;"                          \
                "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
        "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"     \
-               "bootm\0"                                               \
+               "bootm\0"                                               \
        "rootpath=/opt/eldk/ppc_6xx\0"                                  \
        "u-boot=p3mx/u-boot/u-boot.bin\0"                               \
        "load=tftp 100000 ${u-boot}\0"                                  \
@@ -285,10 +267,8 @@
  * 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       */
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE              1024    /* Console I/O Buffer Size      */
 #else
@@ -303,8 +283,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x08000000      /* default load address */
 
-#define CONFIG_SYS_HZ                  1000    /* decrementer freq: 1 ms ticks */
-
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history     */
 #define CONFIG_LOOPW            1       /* enable loopw command         */
 #define CONFIG_MX_CYCLIC        1       /* enable mdc/mwc commands      */
@@ -449,4 +427,8 @@
 
 #define L2_ENABLE      (L2_INIT | L2CR_L2E)
 
+#ifndef __ASSEMBLY__
+#include <../board/Marvell/include/core.h>
+#endif
+
 #endif /* __CONFIG_H */