Merge remote-tracking branch 'u-boot-imx/master'

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

diff --git a/include/configs/ELPT860.h b/include/configs/ELPT860.h
index 0f56302003beb947371833689feecd152cf2a5ee..a9d62c880f805ef3a7630f1799586f740dbf3a9d 100644 (file)
--- a/include/configs/ELPT860.h
+++ b/include/configs/ELPT860.h
@@ -12,20 +12,7 @@
 **
 **=====================================================================
 **
-** 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+
 **
 **=====================================================================
 */
@@ -47,6 +34,8 @@
 #define CONFIG_MPC860T         1
 #define CONFIG_ELPT860         1       /* ...on a LEOX's ELPT860 CPU board */
 
+#define CONFIG_SYS_TEXT_BASE   0x02000000
+
 #define CONFIG_8xx_CONS_SMC1   1       /* Console is on SMC1               */
 #undef   CONFIG_8xx_CONS_SMC2
 #undef   CONFIG_8xx_CONS_NONE
@@ -131,8 +120,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR           0x00100000      /* default load address */
 
-#define CONFIG_SYS_HZ          1000            /* decrementer freq: 1 ms ticks */
-
 /*
  * Environment Variables and Storages
  */
@@ -143,7 +130,6 @@
 #define CONFIG_ENV_IS_IN_FLASH 1      /* Environment is in FLASH       */
 
 #define CONFIG_BAUDRATE                9600   /* console baudrate = 9600 bps   */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_ETHADDR         00:01:77:00:60:40
 #define CONFIG_IPADDR          192.168.0.30
@@ -167,9 +153,8 @@
  * Definitions for initial stack pointer and data area (in DPRAM)
  */
 #define CONFIG_SYS_INIT_RAM_ADDR       CONFIG_SYS_IMMR
-#define CONFIG_SYS_INIT_RAM_END        0x2F00  /* End of used area in DPRAM    */
-#define CONFIG_SYS_GBL_DATA_SIZE       64  /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET    (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE       0x2F00  /* Size of used area in DPRAM   */
+#define CONFIG_SYS_GBL_DATA_OFFSET    (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 /*-----------------------------------------------------------------------
@@ -386,17 +371,4 @@
                         MAMR_AMA_TYPE_1 | MAMR_DSA_1_CYCL | MAMR_G0CLA_A10 | \
                         MAMR_RLFA_1X    | MAMR_WLFA_1X    | MAMR_TLFA_4X)
 
-/*-----------------------------------------------------------------------
- * Internal Definitions
- *-----------------------------------------------------------------------
- *
- */
-
-/*
- * Boot Flags
- */
-#define BOOTFLAG_COLD  0x01             /* Normal Power-On: Boot from FLASH */
-#define BOOTFLAG_WARM  0x02             /* Software reboot                  */
-
-
 #endif /* __CONFIG_H */