diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-06-14 21:41:12 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-06-14 21:41:12 +0200 |
| commit | 22b80a23fcee4c7a1b88f2fd5cf017d96c515b92 (patch) | |
| tree | 1785a4099a6c2b3b2e981307cc734562f42e1818 /target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch | |
| parent | f4b7efe504a028035dd121e38caff2c781183ef9 (diff) | |
| parent | fa2a311b7756fc458ae55b5aa90ac865cef6c498 (diff) | |
| download | buildroot-novena-22b80a23fcee4c7a1b88f2fd5cf017d96c515b92.tar.gz buildroot-novena-22b80a23fcee4c7a1b88f2fd5cf017d96c515b92.zip | |
Merge branch 'bootloaders-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch')
| -rw-r--r-- | target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch b/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch deleted file mode 100644 index 81ab7c6e6..000000000 --- a/target/device/Atmel/arch-arm/u-boot/2009.01/u-boot-2009.01-006-drivers-net-macb.c.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -urN u-boot-2008.10-0rig/drivers/net/macb.c u-boot-2008.10/drivers/net/macb.c ---- u-boot-2008.10-0rig/drivers/net/macb.c 2008-10-18 21:30:31.000000000 +0200 -+++ u-boot-2008.10/drivers/net/macb.c 2008-12-28 23:44:11.000000000 +0100 -@@ -415,18 +415,16 @@ - - /* choose RMII or MII mode. This depends on the board */ - #ifdef CONFIG_RMII --#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ -- defined(CONFIG_AT91SAM9263) -- macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN)); --#else -+#if defined(CONFIG_AVR32) - macb_writel(macb, USRIO, 0); --#endif - #else --#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ -- defined(CONFIG_AT91SAM9263) -- macb_writel(macb, USRIO, MACB_BIT(CLKEN)); -+ macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN)); -+#endif - #else -+#if defined(CONFIG_AVR32) - macb_writel(macb, USRIO, MACB_BIT(MII)); -+#else -+ macb_writel(macb, USRIO, MACB_BIT(CLKEN)); - #endif - #endif /* CONFIG_RMII */ - |