gic: fixed compilation error in GICv2 wait for interrupt macro

[karo-tx-uboot.git] / board / emk / common / vpd.c

diff --git a/board/emk/common/vpd.c b/board/emk/common/vpd.c
index 8a3a12b047f99f1d635aef2a36e8d253852b3c73..d9af92a528bf0ab9304cc1a8942cb384f3630eb3 100644 (file)
--- a/board/emk/common/vpd.c
+++ b/board/emk/common/vpd.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2003
  * Reinhard Meyer, EMK Elektronik GmbH, r.meyer@emk-elektronik.de
  *
- * 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+
  */
 
 #include <common.h>
@@ -36,8 +20,8 @@ void read_factory_r (void)
        uint len;
 
        /* get length first */
-       addr = CFG_FACT_OFFSET;
-       if (eeprom_read (CFG_I2C_FACT_ADDR, addr, buf, 2)) {
+       addr = CONFIG_SYS_FACT_OFFSET;
+       if (eeprom_read (CONFIG_SYS_I2C_FACT_ADDR, addr, buf, 2)) {
          bailout:
                printf ("cannot read factory configuration\n");
                printf ("be sure to set ethaddr yourself!\n");
@@ -47,14 +31,14 @@ void read_factory_r (void)
        addr += 2;
 
        /* sanity check */
-       if (length < 20 || length > CFG_FACT_SIZE - 2)
+       if (length < 20 || length > CONFIG_SYS_FACT_SIZE - 2)
                goto bailout;
 
        /* read lines */
        while (length > 0) {
                /* read one line */
                len = length > 80 ? 80 : length;
-               if (eeprom_read (CFG_I2C_FACT_ADDR, addr, buf, len))
+               if (eeprom_read (CONFIG_SYS_I2C_FACT_ADDR, addr, buf, len))
                        goto bailout;
                /* mark end of buffer */
                buf[len] = 0;