Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / board / actux2 / actux2_hw.h

diff --git a/board/actux2/actux2_hw.h b/board/actux2/actux2_hw.h
index 8ffb82a813b378c7bc64ace3b907e289f5dda444..57c6fa7076e893920c4c2d01fb8c0e6539255500 100644 (file)
--- a/board/actux2/actux2_hw.h
+++ b/board/actux2/actux2_hw.h
@@ -4,23 +4,7 @@
  *
  * hardware register definitions 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 _ACTUX2_HW_H
@@ -39,21 +23,21 @@
 /*
  * GPIO settings
  */
-#define CFG_GPIO_DBGINT                        0
-#define CFG_GPIO_ETHINT                        1
-#define CFG_GPIO_ETHRST                        2       /* Out */
-#define CFG_GPIO_LED5_GN               3       /* Out */
-#define CFG_GPIO_UNUSED4               4
-#define CFG_GPIO_UNUSED5               5
-#define CFG_GPIO_DSR                   6       /* Out */
-#define CFG_GPIO_DCD                   7       /* Out */
-#define CFG_GPIO_IPAC_INT              8
-#define CFG_GPIO_DBGJUMPER             9
-#define CFG_GPIO_BUTTON1               10
-#define CFG_GPIO_DBGSENSE              11
-#define CFG_GPIO_DTR                   12
-#define CFG_GPIO_IORST                 13      /* Out */
-#define CFG_GPIO_PCI_CLK               14      /* Out */
-#define CFG_GPIO_EXTBUS_CLK            15      /* Out */
+#define CONFIG_SYS_GPIO_DBGINT                 0
+#define CONFIG_SYS_GPIO_ETHINT                 1
+#define CONFIG_SYS_GPIO_ETHRST                 2       /* Out */
+#define CONFIG_SYS_GPIO_LED5_GN                3       /* Out */
+#define CONFIG_SYS_GPIO_UNUSED4                4
+#define CONFIG_SYS_GPIO_UNUSED5                5
+#define CONFIG_SYS_GPIO_DSR                    6       /* Out */
+#define CONFIG_SYS_GPIO_DCD                    7       /* Out */
+#define CONFIG_SYS_GPIO_IPAC_INT               8
+#define CONFIG_SYS_GPIO_DBGJUMPER              9
+#define CONFIG_SYS_GPIO_BUTTON1                10
+#define CONFIG_SYS_GPIO_DBGSENSE               11
+#define CONFIG_SYS_GPIO_DTR                    12
+#define CONFIG_SYS_GPIO_IORST                  13      /* Out */
+#define CONFIG_SYS_GPIO_PCI_CLK                14      /* Out */
+#define CONFIG_SYS_GPIO_EXTBUS_CLK             15      /* Out */
 
 #endif