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

[u-boot] / board / actux1 / actux1_hw.h

diff --git a/board/actux1/actux1_hw.h b/board/actux1/actux1_hw.h
index bb3b7f953b0debd36ba7b08789533c51871f9531..5627f247960f92f97d87f2a318aa23eaf35b8cab 100644 (file)
--- a/board/actux1/actux1_hw.h
+++ b/board/actux1/actux1_hw.h
@@ -4,23 +4,7 @@
  *
  * hardware register definitions for the AcTux-1 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 _ACTUX1_HW_H
@@ -42,16 +26,16 @@
 #define ACTUX1_BOARDREL        (readb(IXP425_EXP_BUS_CS6_BASE_PHYS) & 0x0F)
 
 /* GPIO settings */
-#define CFG_GPIO_PCI1_INTA             2
-#define CFG_GPIO_PCI2_INTA             3
-#define CFG_GPIO_I2C_SDA               4
-#define CFG_GPIO_I2C_SCL               5
-#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_PCI1_INTA              2
+#define CONFIG_SYS_GPIO_PCI2_INTA              3
+#define CONFIG_SYS_GPIO_I2C_SDA                4
+#define CONFIG_SYS_GPIO_I2C_SCL                5
+#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