Merge branch 'master' of git://git.denx.de/u-boot-avr32

* 'master' of git://git.denx.de/u-boot-avr32:
  net:macb: add line break
  avr32:portmux: fix setup for macb1
  avr32: Remove redundant LDSCRIPT definition

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk
index d8e7ebb0be3f0c72c8dbe7e627262fecf5274c01..a751a3d7874318917d83c1473ca5a6a8693f9909 100644 (file)
--- a/arch/avr32/config.mk
+++ b/arch/avr32/config.mk
@@ -29,5 +29,3 @@ PLATFORM_RELFLAGS     += -ffixed-r5 -fPIC -mno-init-got -mrelax
 PLATFORM_RELFLAGS      += -ffunction-sections -fdata-sections
 
 LDFLAGS_u-boot         = --gc-sections --relax
-
-LDSCRIPT                       = $(SRCTREE)/$(CPUDIR)/u-boot.lds

diff --git a/arch/avr32/cpu/at32ap700x/portmux.c b/arch/avr32/cpu/at32ap700x/portmux.c
index e3e38a2a75726a348a3d9f9861e43803319873c8..7eb42de06194c5ca45ca378a5264b5b642f7ba72 100644 (file)
--- a/arch/avr32/cpu/at32ap700x/portmux.c
+++ b/arch/avr32/cpu/at32ap700x/portmux.c
@@ -122,7 +122,7 @@ void portmux_enable_macb1(unsigned long flags, unsigned long drive_strength)
                portd_mask |= (1 << 15);/* SPD  */
 
        /* REVISIT: Some pins are probably pure outputs */
-       portmux_select_peripheral(PORTMUX_PORT_D, portc_mask,
+       portmux_select_peripheral(PORTMUX_PORT_D, portd_mask,
                        PORTMUX_FUNC_B, PORTMUX_BUSKEEPER);
        portmux_select_peripheral(PORTMUX_PORT_C, portc_mask,
                        PORTMUX_FUNC_B, PORTMUX_BUSKEEPER);

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 8f55cdc05f5443c5231e79eecfa104d647952045..0e1ced71c507441d1d2101b3b35e979bba6a4414 100644 (file)
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -364,7 +364,7 @@ static int macb_phy_find(struct macb_device *macb)
        }
 
        /* PHY isn't up to snuff */
-       printf("%s: PHY not found", macb->netdev.name);
+       printf("%s: PHY not found\n", macb->netdev.name);
 
        return 0;
 }