Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

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

diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h
index 6243afee0a919abf4cc1619fef4d1e1b0c5e0a19..1ceef113d643fccc0dd63b793fcd9157a76e3236 100644 (file)
--- a/include/configs/VoVPN-GW.h
+++ b/include/configs/VoVPN-GW.h
@@ -4,20 +4,7 @@
  *
  * Support for the Elmeg VoVPN Gateway Module
  *
- * 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
@@ -86,9 +73,6 @@
 /* don't allow baudrate change */
 #undef CONFIG_SYS_LOADS_BAUD_CHANGE
 
-/* supported baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE              { 9600, 19200, 38400, 57600, 115200 }
-
 /*
  * select ethernet configuration
  *
@@ -219,7 +203,6 @@
 #define        CONFIG_SYS_LONGHELP
 
 /* monitor command prompt */
-#define        CONFIG_SYS_PROMPT                       "=> "
 
 /* console i/o buffer size */
 #if defined(CONFIG_CMD_KGDB)
@@ -248,7 +231,6 @@
 #define        CONFIG_SYS_LOAD_ADDR                    0x00100000
 
 /* decrementer freq: 1 ms ticks        */
-#define        CONFIG_SYS_HZ                           1000
 
 /* configure flash */
 #define CONFIG_SYS_FLASH_BASE                  0xff800000
@@ -298,9 +280,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                0x2000
-#define CONFIG_SYS_GBL_DATA_SIZE               128
-#define CONFIG_SYS_GBL_DATA_OFFSET             (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE               0x2000
+#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
 
 /*