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

[u-boot] / include / configs / actux2.h

diff --git a/include/configs/actux2.h b/include/configs/actux2.h
index cb97434c3ef6de8147be3cb0e663576cd107942a..533f46976a09bc5aadea4eef007756e1543dcb1f 100644 (file)
--- a/include/configs/actux2.h
+++ b/include/configs/actux2.h
@@ -4,23 +4,7 @@
  *
  * Configuration settings for the AcTux-2 board.
  *
- * 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
@@ -29,6 +13,8 @@
 #define CONFIG_IXP425                  1
 #define CONFIG_ACTUX2                  1
 
+#define        CONFIG_MACH_TYPE                1480
+
 #define CONFIG_DISPLAY_CPUINFO         1
 #define CONFIG_DISPLAY_BOARDINFO       1
 
@@ -96,12 +82,6 @@
                                          115200, 230400 }
 #define CONFIG_SERIAL_RTS_ACTIVE       1
 
-/*
- * Stack sizes
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE               (128*1024)      /* regular stack */
-
 /* Expansion bus settings */
 #define CONFIG_SYS_EXP_CS0                     0xbd113042