Coding Style cleanup: remove trailing white space

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

diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index 71eb78495f2613d074601a3cfc03d7e0a81f1f1d..d94e9c60eafa12a0b04dc37959084300d9a8b193 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+
  */
 
 /************************************************************************
@@ -117,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 */
@@ -284,7 +267,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       */
@@ -448,4 +430,8 @@
 
 #define L2_ENABLE      (L2_INIT | L2CR_L2E)
 
+#ifndef __ASSEMBLY__
+#include <../board/Marvell/include/core.h>
+#endif
+
 #endif /* __CONFIG_H */