diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-09-04 09:17:27 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-09-04 09:17:27 +0200 |
| commit | a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721 (patch) | |
| tree | 5fec0565eef6900dcf99c62e3b5e6fb108508ae6 /arch | |
| parent | 48efe65829102fe7936304c0ed96b3935800f40a (diff) | |
| parent | 6ed0e940713d417f24fbc67898cea6f6ece4a0e1 (diff) | |
| download | u-boot-imx-a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721.zip u-boot-imx-a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721.tar.gz u-boot-imx-a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721.tar.bz2 | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/avr32/config.mk | 2 | ||||
| -rw-r--r-- | arch/avr32/cpu/at32ap700x/portmux.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk index d8e7ebb..a751a3d 100644 --- 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 e3e38a2..7eb42de 100644 --- 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); |