tools: edimax_fw_header: fix suspicious memset usage

[15.05/openwrt.git] / target / linux / adm5120 / files / arch / mips / adm5120 / prom / myloader.c

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/prom/myloader.c b/target/linux/adm5120/files/arch/mips/adm5120/prom/myloader.c
index 8a44509..5357db5 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/prom/myloader.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/prom/myloader.c
@@ -1,29 +1,15 @@
 /*
- *  $Id$
- *
  *  Compex's MyLoader specific prom routines
  *
- *  Copyright (C) 2007 OpenWrt.org
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
- *
- *  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.
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
  *
- *  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.
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
  *
- *  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., 51 Franklin Street, Fifth Floor,
- *  Boston, MA  02110-1301, USA.
  */
 
 #include <linux/types.h>
-#include <linux/autoconf.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/string.h>
@@ -32,7 +18,7 @@
 #include <asm/addrspace.h>
 #include <asm/byteorder.h>
 
-#include <adm5120_defs.h>
+#include <asm/mach-adm5120/adm5120_defs.h>
 #include <prom/myloader.h>
 #include "prom_read.h"
 
@@ -40,7 +26,7 @@
 #define BOARD_PARAMS_ADDR      KSEG1ADDR(ADM5120_SRAM0_BASE+0x0F800)
 #define PART_TABLE_ADDR                KSEG1ADDR(ADM5120_SRAM0_BASE+0x10000)
 
-static int myloader_found = 0;
+static int myloader_found;
 
 struct myloader_info myloader_info;
 
@@ -49,6 +35,7 @@ int __init myloader_present(void)
        struct mylo_system_params *sysp;
        struct mylo_board_params *boardp;
        struct mylo_partition_table *parts;
+       int i;
 
        if (myloader_found)
                goto out;
@@ -68,6 +55,12 @@ int __init myloader_present(void)
        myloader_info.svid = le32_to_cpu(sysp->svid);
        myloader_info.sdid = le32_to_cpu(sysp->sdid);
 
+       for (i = 0; i < MYLO_ETHADDR_COUNT; i++) {
+               int j;
+               for (j = 0; j < 6; j++)
+                       myloader_info.macs[i][j] = boardp->addr[i].mac[j];
+       }
+
        myloader_found = 1;
 
 out: