mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-13 06:36:16 +09:00
Merge branch 'eth-cleanup' of git://git.denx.de/u-boot-avr32
This commit is contained in:
commit
b8ec9fb736
|
@ -22,7 +22,7 @@ include $(TOPDIR)/config.mk
|
||||||
|
|
||||||
LIB := $(obj)lib$(BOARD).a
|
LIB := $(obj)lib$(BOARD).a
|
||||||
|
|
||||||
COBJS := $(BOARD).o eth.o
|
COBJS := $(BOARD).o
|
||||||
|
|
||||||
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
||||||
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
|
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
|
||||||
|
|
|
@ -93,6 +93,17 @@ void board_init_info(void)
|
||||||
gd->bd->bi_phy_id[1] = 0x03;
|
gd->bd->bi_phy_id[1] = 0x03;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
|
||||||
|
|
||||||
|
#ifdef CONFIG_CMD_NET
|
||||||
|
int board_eth_init(bd_t *bi)
|
||||||
|
{
|
||||||
|
macb_eth_initialize(0, (void *)MACB0_BASE, bi->bi_phy_id[0]);
|
||||||
|
macb_eth_initialize(1, (void *)MACB1_BASE, bi->bi_phy_id[1]);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* SPI chip select control */
|
/* SPI chip select control */
|
||||||
#ifdef CONFIG_ATMEL_SPI
|
#ifdef CONFIG_ATMEL_SPI
|
||||||
#include <spi.h>
|
#include <spi.h>
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2006 Atmel Corporation
|
|
||||||
*
|
|
||||||
* Ethernet initialization for the AVR32 Network Gateway
|
|
||||||
*
|
|
||||||
* 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 <asm/arch/memory-map.h>
|
|
||||||
|
|
||||||
extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
|
|
||||||
|
|
||||||
#ifdef CONFIG_CMD_NET
|
|
||||||
void atngw100_eth_initialize(bd_t *bi)
|
|
||||||
{
|
|
||||||
macb_eth_initialize(0, (void *)MACB0_BASE, bi->bi_phy_id[0]);
|
|
||||||
macb_eth_initialize(1, (void *)MACB1_BASE, bi->bi_phy_id[1]);
|
|
||||||
}
|
|
||||||
#endif
|
|
|
@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
|
||||||
|
|
||||||
LIB := $(obj)lib$(BOARD).a
|
LIB := $(obj)lib$(BOARD).a
|
||||||
|
|
||||||
COBJS := $(BOARD).o flash.o eth.o
|
COBJS := $(BOARD).o flash.o
|
||||||
|
|
||||||
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
||||||
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
|
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
|
||||||
|
|
|
@ -115,3 +115,14 @@ void board_init_info(void)
|
||||||
gd->bd->bi_phy_id[0] = 0x10;
|
gd->bd->bi_phy_id[0] = 0x10;
|
||||||
gd->bd->bi_phy_id[1] = 0x11;
|
gd->bd->bi_phy_id[1] = 0x11;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
|
||||||
|
|
||||||
|
#ifdef CONFIG_CMD_NET
|
||||||
|
int board_eth_init(bd_t *bi)
|
||||||
|
{
|
||||||
|
macb_eth_initialize(0, (void *)MACB0_BASE, bi->bi_phy_id[0]);
|
||||||
|
macb_eth_initialize(1, (void *)MACB1_BASE, bi->bi_phy_id[1]);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2005-2006 Atmel Corporation
|
|
||||||
*
|
|
||||||
* Ethernet initialization for the ATSTK1000 starterkit
|
|
||||||
*
|
|
||||||
* 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 <asm/arch/memory-map.h>
|
|
||||||
|
|
||||||
extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
|
|
||||||
|
|
||||||
#if defined(CONFIG_MACB) && defined(CONFIG_CMD_NET)
|
|
||||||
void atstk1000_eth_initialize(bd_t *bi)
|
|
||||||
{
|
|
||||||
int id = 0;
|
|
||||||
|
|
||||||
macb_eth_initialize(id++, (void *)MACB0_BASE, bi->bi_phy_id[0]);
|
|
||||||
macb_eth_initialize(id++, (void *)MACB1_BASE, bi->bi_phy_id[1]);
|
|
||||||
}
|
|
||||||
#endif
|
|
|
@ -69,9 +69,7 @@ extern int uli526x_initialize(bd_t *);
|
||||||
extern int npe_initialize(bd_t *);
|
extern int npe_initialize(bd_t *);
|
||||||
extern int uec_initialize(int);
|
extern int uec_initialize(int);
|
||||||
extern int bfin_EMAC_initialize(bd_t *);
|
extern int bfin_EMAC_initialize(bd_t *);
|
||||||
extern int atstk1000_eth_initialize(bd_t *);
|
|
||||||
extern int greth_initialize(bd_t *);
|
extern int greth_initialize(bd_t *);
|
||||||
extern int atngw100_eth_initialize(bd_t *);
|
|
||||||
extern int mcffec_initialize(bd_t*);
|
extern int mcffec_initialize(bd_t*);
|
||||||
extern int mcdmafec_initialize(bd_t*);
|
extern int mcdmafec_initialize(bd_t*);
|
||||||
extern int at91sam9_eth_initialize(bd_t *);
|
extern int at91sam9_eth_initialize(bd_t *);
|
||||||
|
@ -271,15 +269,9 @@ int eth_initialize(bd_t *bis)
|
||||||
#if defined(CONFIG_BF537)
|
#if defined(CONFIG_BF537)
|
||||||
bfin_EMAC_initialize(bis);
|
bfin_EMAC_initialize(bis);
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_ATSTK1000)
|
|
||||||
atstk1000_eth_initialize(bis);
|
|
||||||
#endif
|
|
||||||
#if defined(CONFIG_GRETH)
|
#if defined(CONFIG_GRETH)
|
||||||
greth_initialize(bis);
|
greth_initialize(bis);
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_ATNGW100)
|
|
||||||
atngw100_eth_initialize(bis);
|
|
||||||
#endif
|
|
||||||
#if defined(CONFIG_MCFFEC)
|
#if defined(CONFIG_MCFFEC)
|
||||||
mcffec_initialize(bis);
|
mcffec_initialize(bis);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user