diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 23:23:19 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 23:23:19 +0200 |
| commit | 0a637bcc3c66c647f52970ddd1dbae2d749dc969 (patch) | |
| tree | 55ccc56a785cac9a3b990130f70316869ee77b47 /include | |
| parent | dd9f6d08a2736bf8ddc0004779c563a4c3a77cef (diff) | |
| parent | c6ef15b3879607a9e31964fc8942f95c253122f9 (diff) | |
| download | barebox-0a637bcc3c66c647f52970ddd1dbae2d749dc969.tar.gz barebox-0a637bcc3c66c647f52970ddd1dbae2d749dc969.tar.xz | |
Merge branch 'for-next/zynq'
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/barebox.lds.h | 3 | ||||
| -rw-r--r-- | include/platform_data/macb.h | 30 |
2 files changed, 32 insertions, 1 deletions
diff --git a/include/asm-generic/barebox.lds.h b/include/asm-generic/barebox.lds.h index a77ef8f6f1..4754779005 100644 --- a/include/asm-generic/barebox.lds.h +++ b/include/asm-generic/barebox.lds.h @@ -12,7 +12,8 @@ defined CONFIG_ARCH_IMX53 || \ defined CONFIG_ARCH_IMX6 || \ defined CONFIG_X86 || \ - defined CONFIG_ARCH_EP93XX + defined CONFIG_ARCH_EP93XX || \ + defined CONFIG_ARCH_ZYNQ #include <mach/barebox.lds.h> #endif diff --git a/include/platform_data/macb.h b/include/platform_data/macb.h new file mode 100644 index 0000000000..9d718630a2 --- /dev/null +++ b/include/platform_data/macb.h @@ -0,0 +1,30 @@ +/* + * [origin Linux: arch/arm/mach-at91/include/mach/board.h] + * + * Copyright (C) 2005 HP Labs + * + * 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. + * + */ +#ifndef __MACB_H +#define __MACB_H + +#include <linux/phy.h> + +struct macb_platform_data { + unsigned int phy_flags; + unsigned int flags; + int phy_addr; + phy_interface_t phy_interface; + int (*get_ethaddr)(struct eth_device*, unsigned char *adr); +}; + +#endif |