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

[J-u-boot.git] / include / configs / ISPAN.h

diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index 49c65107032cc65bf68ee8dd9b66a895ed3c505e..a2fdfd3274ff727f76699396b86aa55abe569ef8 100644 (file)
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -8,28 +8,11 @@
  * Derived from iSPAN 4539 port (iphase4539) by
  * Wolfgang Grandegger <[email protected]>
  *
- * 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+
  */
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MPC8260                 /* This is an MPC8260 CPU               */
 #define CONFIG_ISPAN                   /* ...on one of Interphase iSPAN boards */
 #define CONFIG_CPM2            1       /* Has a CPM2 */
 
@@ -72,8 +55,8 @@
 #if CONFIG_ETHER_INDEX == 3
 
 #define CONFIG_SYS_PHY_ADDR            0
-#define CONFIG_SYS_CMXFCR_VALUE        (CMXFCR_RF3CS_CLK14 | CMXFCR_TF3CS_CLK16)
-#define CONFIG_SYS_CMXFCR_MASK         (CMXFCR_FC3 | CMXFCR_RF3CS_MSK | CMXFCR_TF3CS_MSK)
+#define CONFIG_SYS_CMXFCR_VALUE3       (CMXFCR_RF3CS_CLK14 | CMXFCR_TF3CS_CLK16)
+#define CONFIG_SYS_CMXFCR_MASK3                (CMXFCR_FC3 | CMXFCR_RF3CS_MSK | CMXFCR_TF3CS_MSK)
 
 #endif /* CONFIG_ETHER_INDEX == 3 */
 
@@ -144,9 +127,7 @@
 /*-----------------------------------------------------------------------
  * Miscellaneous configurable options
  */
-#define CONFIG_SYS_PROMPT              "=> "           /* Monitor Command Prompt       */
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_SYS_LONGHELP                            /* #undef to save memory        */
 #define CONFIG_SYS_CBSIZE              256             /* Console I/O Buffer Size      */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)  /* Print Buffer Size */
@@ -158,10 +139,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x100000        /* Default load address         */
 
-#define CONFIG_SYS_HZ                  1000            /* Decrementer freq: 1 ms ticks */
-
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 #define CONFIG_SYS_RESET_ADDRESS       0x09900000
 
 #define CONFIG_MISC_INIT_R                     /* We need misc_init_r()        */