This fixes the build of the two sh boards shmin and r7780mp and qemu-mips which currently fail to build due to dropped pre-CONFIG_NET_MULTI code. This v2 patch minimizes the number of lines in the diff for easy review and to eliminate any possible accidential changes resulting from moving lines of code in the file. This also makes the register function very easy. Any cleanups and improvements are intentionally deferred to follow-up patches to keep this patch as simple and as easy to review as possible. A new driver register function, ne2k_register() calls the existing one-time setup part of the old init function and calls eth_register(). Changes to shmin, r7780mp and qemu-mips: - Call the new ne2k_register() from board_eth_init() of the boards. - Tested using qemu-mips board, - Tested the two renesas / sh boards r7780mp and shmin to compile again, and should work. checkpatch-clean when "--ignore VOLATILE" is added to .checkpatch.conf, and no warnings introduced in none of the three boards using this driver. Signed-off-by: Bernhard Kaindl <bernhard.kaindl@gmx.net>
96 lines
2 KiB
C
96 lines
2 KiB
C
/*
|
|
* (C) Copyright 2007
|
|
* Vlad Lungu vlad.lungu@windriver.com
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <asm/mipsregs.h>
|
|
#include <asm/io.h>
|
|
#include <netdev.h>
|
|
|
|
phys_size_t initdram(int board_type)
|
|
{
|
|
/* Sdram is setup by assembler code */
|
|
/* If memory could be changed, we should return the true value here */
|
|
return MEM_SIZE*1024*1024;
|
|
}
|
|
|
|
int checkboard(void)
|
|
{
|
|
u32 proc_id;
|
|
u32 config1;
|
|
|
|
proc_id = read_c0_prid();
|
|
printf("Board: Qemu -M mips CPU: ");
|
|
switch (proc_id) {
|
|
case 0x00018000:
|
|
printf("4Kc");
|
|
break;
|
|
case 0x00018400:
|
|
printf("4KEcR1");
|
|
break;
|
|
case 0x00019000:
|
|
printf("4KEc");
|
|
break;
|
|
case 0x00019300:
|
|
config1 = read_c0_config1();
|
|
if (config1 & 1)
|
|
printf("24Kf");
|
|
else
|
|
printf("24Kc");
|
|
break;
|
|
case 0x00019500:
|
|
printf("34Kf");
|
|
break;
|
|
case 0x00000400:
|
|
printf("R4000");
|
|
break;
|
|
case 0x00018100:
|
|
config1 = read_c0_config1();
|
|
if (config1 & 1)
|
|
printf("5Kf");
|
|
else
|
|
printf("5Kc");
|
|
break;
|
|
case 0x000182a0:
|
|
printf("20Kc");
|
|
break;
|
|
|
|
default:
|
|
printf("unknown");
|
|
}
|
|
printf(" proc_id=0x%x\n", proc_id);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int misc_init_r(void)
|
|
{
|
|
set_io_port_base(0);
|
|
return 0;
|
|
}
|
|
|
|
int board_eth_init(bd_t *bis)
|
|
{
|
|
return ne2k_register();
|
|
}
|