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

[karo-tx-uboot.git] / board / kup / common / load_sernum_ethaddr.c

diff --git a/board/kup/common/load_sernum_ethaddr.c b/board/kup/common/load_sernum_ethaddr.c
index b7b74998578f3a992781e8c8be45f7f2ec39c917..20fe799cdca38096ade435a777c08650bb379984 100644 (file)
--- a/board/kup/common/load_sernum_ethaddr.c
+++ b/board/kup/common/load_sernum_ethaddr.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2000-2004
  * Wolfgang Denk, DENX Software Engineering, wd@denx.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>
@@ -33,8 +17,8 @@
  * The KUP Hardware Information Block is defined as
  * follows:
  * - located in first flash bank
- * - starts at offset CFG_HWINFO_OFFSET
- * - size CFG_HWINFO_SIZE
+ * - starts at offset CONFIG_SYS_HWINFO_OFFSET
+ * - size CONFIG_SYS_HWINFO_SIZE
  *
  * Internal structure:
  * - sequence of ASCII character lines
@@ -55,15 +39,15 @@ void load_sernum_ethaddr (void)
 {
        unsigned char *hwi;
        char *var;
-       unsigned char hwi_stack[CFG_HWINFO_SIZE];
+       unsigned char hwi_stack[CONFIG_SYS_HWINFO_SIZE];
        char *p;
 
-       hwi = (unsigned char *) (CFG_FLASH_BASE + CFG_HWINFO_OFFSET);
-       if (*((unsigned long *) hwi) != (unsigned long) CFG_HWINFO_MAGIC) {
+       hwi = (unsigned char *) (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_HWINFO_OFFSET);
+       if (*((unsigned long *) hwi) != (unsigned long) CONFIG_SYS_HWINFO_MAGIC) {
                printf ("HardwareInfo not found!\n");
                return;
        }
-       memcpy (hwi_stack, hwi, CFG_HWINFO_SIZE);
+       memcpy (hwi_stack, hwi, CONFIG_SYS_HWINFO_SIZE);
 
        /*
         ** ethaddr
@@ -72,7 +56,7 @@ void load_sernum_ethaddr (void)
        if (var) {
                var += sizeof (ETHADDR_TOKEN) - 1;
                p = strchr (var, '\r');
-               if ((unsigned char *)p < hwi + CFG_HWINFO_SIZE) {
+               if ((unsigned char *)p < hwi + CONFIG_SYS_HWINFO_SIZE) {
                        *p = '\0';
                        setenv ("ethaddr", var);
                        *p = '\r';
@@ -85,7 +69,7 @@ void load_sernum_ethaddr (void)
        if (var) {
                var += sizeof (LCD_TOKEN) - 1;
                p = strchr (var, '\r');
-               if ((unsigned char *)p < hwi + CFG_HWINFO_SIZE) {
+               if ((unsigned char *)p < hwi + CONFIG_SYS_HWINFO_SIZE) {
                        *p = '\0';
                        setenv ("lcd", var);
                        *p = '\r';