Merge branch 'master' of git://git.denx.de/u-boot-microblaze
* 'master' of git://git.denx.de/u-boot-microblaze: microblaze: Fix strict-aliasing rules for in_be32 microblaze: Wire up axi_ethernet driver initialization
This commit is contained in:
commit
606a76f8ef
@ -25,7 +25,7 @@
|
|||||||
#define readw(addr) \
|
#define readw(addr) \
|
||||||
({ unsigned short __v = (*(volatile unsigned short *) (addr)); __v; })
|
({ unsigned short __v = (*(volatile unsigned short *) (addr)); __v; })
|
||||||
#define readl(addr) \
|
#define readl(addr) \
|
||||||
({ unsigned long __v = (*(volatile unsigned long *) (addr)); __v; })
|
({ unsigned int __v = (*(volatile unsigned int *) (addr)); __v; })
|
||||||
|
|
||||||
#define writeb(b, addr) \
|
#define writeb(b, addr) \
|
||||||
(void)((*(volatile unsigned char *) (addr)) = (b))
|
(void)((*(volatile unsigned char *) (addr)) = (b))
|
||||||
|
@ -72,6 +72,12 @@ int fsl_init2 (void) {
|
|||||||
int board_eth_init(bd_t *bis)
|
int board_eth_init(bd_t *bis)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
#ifdef CONFIG_XILINX_AXIEMAC
|
||||||
|
ret |= xilinx_axiemac_initialize(bis, XILINX_AXIEMAC_BASEADDR,
|
||||||
|
XILINX_AXIDMA_BASEADDR);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_XILINX_EMACLITE
|
#ifdef CONFIG_XILINX_EMACLITE
|
||||||
u32 txpp = 0;
|
u32 txpp = 0;
|
||||||
u32 rxpp = 0;
|
u32 rxpp = 0;
|
||||||
|
@ -68,6 +68,10 @@
|
|||||||
# define CONFIG_XILINX_LL_TEMAC 1
|
# define CONFIG_XILINX_LL_TEMAC 1
|
||||||
# define CONFIG_SYS_ENET
|
# define CONFIG_SYS_ENET
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(XILINX_AXIEMAC_BASEADDR)
|
||||||
|
# define CONFIG_XILINX_AXIEMAC 1
|
||||||
|
# define CONFIG_SYS_ENET
|
||||||
|
#endif
|
||||||
|
|
||||||
#undef ET_DEBUG
|
#undef ET_DEBUG
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user