diff options
Diffstat (limited to 'arch/arm/cpu/arm926ejs')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/at91/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/at91/at91sam9n12_devices.c | 177 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/at91/clock.c | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/davinci/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/davinci/da830_pinmux.c | 151 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 5 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds | 5 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/start.S | 81 | 
9 files changed, 336 insertions, 93 deletions
diff --git a/arch/arm/cpu/arm926ejs/at91/Makefile b/arch/arm/cpu/arm926ejs/at91/Makefile index 346e58fae..c4408f6c9 100644 --- a/arch/arm/cpu/arm926ejs/at91/Makefile +++ b/arch/arm/cpu/arm926ejs/at91/Makefile @@ -35,6 +35,7 @@ COBJS-$(CONFIG_AT91SAM9263)	+= at91sam9263_devices.o  COBJS-$(CONFIG_AT91SAM9RL)	+= at91sam9rl_devices.o  COBJS-$(CONFIG_AT91SAM9M10G45)	+= at91sam9m10g45_devices.o  COBJS-$(CONFIG_AT91SAM9G45)	+= at91sam9m10g45_devices.o +COBJS-$(CONFIG_AT91SAM9N12)	+= at91sam9n12_devices.o  COBJS-$(CONFIG_AT91SAM9X5)	+= at91sam9x5_devices.o  COBJS-$(CONFIG_AT91_EFLASH)	+= eflash.o  COBJS-$(CONFIG_AT91_LED)	+= led.o diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c index 19ec615c7..5e995e1d0 100644 --- a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c +++ b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c @@ -203,6 +203,10 @@ void at91_macb_hw_init(void)  #if defined(CONFIG_GENERIC_ATMEL_MCI)  void at91_mci_hw_init(void)  { +	/* Enable mci clock */ +	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; +	writel(1 << ATMEL_ID_MCI, &pmc->pcer); +  	at91_set_a_periph(AT91_PIO_PORTA, 8, 1);	/* MCCK */  #if defined(CONFIG_ATMEL_MCI_PORTB)  	at91_set_b_periph(AT91_PIO_PORTA, 1, 1);	/* MCCDB */ diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9n12_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9n12_devices.c new file mode 100644 index 000000000..6eaeac0fc --- /dev/null +++ b/arch/arm/cpu/arm926ejs/at91/at91sam9n12_devices.c @@ -0,0 +1,177 @@ +/* + * (C) Copyright 2013 Atmel Corporation + * Josh Wu <josh.wu@atmel.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/at91_common.h> +#include <asm/arch/at91_pmc.h> +#include <asm/arch/at91_pio.h> + +unsigned int has_lcdc() +{ +	return 1; +} + +void at91_serial0_hw_init(void) +{ +	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + +	at91_set_a_periph(AT91_PIO_PORTA, 0, 1);		/* TXD0 */ +	at91_set_a_periph(AT91_PIO_PORTA, 1, 0);		/* RXD0 */ +	writel(1 << ATMEL_ID_USART0, &pmc->pcer); +} + +void at91_serial1_hw_init(void) +{ +	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + +	at91_set_a_periph(AT91_PIO_PORTA, 5, 1);		/* TXD1 */ +	at91_set_a_periph(AT91_PIO_PORTA, 6, 0);		/* RXD1 */ +	writel(1 << ATMEL_ID_USART1, &pmc->pcer); +} + +void at91_serial2_hw_init(void) +{ +	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + +	at91_set_a_periph(AT91_PIO_PORTA, 7, 1);		/* TXD2 */ +	at91_set_a_periph(AT91_PIO_PORTA, 8, 0);		/* RXD2 */ +	writel(1 << ATMEL_ID_USART2, &pmc->pcer); +} + +void at91_serial3_hw_init(void) +{ +	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + +	at91_set_b_periph(AT91_PIO_PORTC, 22, 1);		/* TXD3 */ +	at91_set_b_periph(AT91_PIO_PORTC, 23, 0);		/* RXD3 */ +	writel(1 << ATMEL_ID_USART3, &pmc->pcer); +} + +void at91_seriald_hw_init(void) +{ +	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + +	at91_set_a_periph(AT91_PIO_PORTA, 10, 1);		/* DTXD */ +	at91_set_a_periph(AT91_PIO_PORTA, 9, 0);		/* DRXD */ +	writel(1 << ATMEL_ID_SYS, &pmc->pcer); +} + +#ifdef CONFIG_ATMEL_SPI +void at91_spi0_hw_init(unsigned long cs_mask) +{ +	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + +	at91_set_a_periph(AT91_PIO_PORTA, 11, 0);	/* SPI0_MISO */ +	at91_set_a_periph(AT91_PIO_PORTA, 12, 0);	/* SPI0_MOSI */ +	at91_set_a_periph(AT91_PIO_PORTA, 13, 0);	/* SPI0_SPCK */ + +	/* Enable clock */ +	writel(1 << ATMEL_ID_SPI0, &pmc->pcer); + +	if (cs_mask & (1 << 0)) +		at91_set_pio_output(AT91_PIO_PORTA, 14, 1); +	if (cs_mask & (1 << 1)) +		at91_set_pio_output(AT91_PIO_PORTA, 7, 1); +	if (cs_mask & (1 << 2)) +		at91_set_pio_output(AT91_PIO_PORTA, 1, 1); +	if (cs_mask & (1 << 3)) +		at91_set_pio_output(AT91_PIO_PORTB, 3, 1); +} + +void at91_spi1_hw_init(unsigned long cs_mask) +{ +	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + +	at91_set_b_periph(AT91_PIO_PORTA, 21, 0);	/* SPI1_MISO */ +	at91_set_b_periph(AT91_PIO_PORTA, 22, 0);	/* SPI1_MOSI */ +	at91_set_b_periph(AT91_PIO_PORTA, 23, 0);	/* SPI1_SPCK */ + +	/* Enable clock */ +	writel(1 << ATMEL_ID_SPI1, &pmc->pcer); + +	if (cs_mask & (1 << 0)) +		at91_set_pio_output(AT91_PIO_PORTA, 8, 1); +	if (cs_mask & (1 << 1)) +		at91_set_pio_output(AT91_PIO_PORTA, 0, 1); +	if (cs_mask & (1 << 2)) +		at91_set_pio_output(AT91_PIO_PORTA, 31, 1); +	if (cs_mask & (1 << 3)) +		at91_set_pio_output(AT91_PIO_PORTA, 30, 1); +} +#endif + +void at91_mci_hw_init(void) +{ +	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + +	at91_set_a_periph(AT91_PIO_PORTA, 17, 0);	/* MCCK */ +	at91_set_a_periph(AT91_PIO_PORTA, 16, 0);	/* MCCDA */ +	at91_set_a_periph(AT91_PIO_PORTA, 15, 0);	/* MCDA0 */ +	at91_set_a_periph(AT91_PIO_PORTA, 18, 0);	/* MCDA1 */ +	at91_set_a_periph(AT91_PIO_PORTA, 19, 0);	/* MCDA2 */ +	at91_set_a_periph(AT91_PIO_PORTA, 20, 0);	/* MCDA3 */ + +	writel(1 << ATMEL_ID_HSMCI0, &pmc->pcer); +} + +#ifdef CONFIG_LCD +void at91_lcd_hw_init(void) +{ +	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + +	at91_set_a_periph(AT91_PIO_PORTC, 24, 0);	/* LCDDPWR */ +	at91_set_a_periph(AT91_PIO_PORTC, 26, 0);	/* LCDVSYNC */ +	at91_set_a_periph(AT91_PIO_PORTC, 27, 0);	/* LCDHSYNC */ +	at91_set_a_periph(AT91_PIO_PORTC, 28, 0);	/* LCDDOTCK */ +	at91_set_a_periph(AT91_PIO_PORTC, 29, 0);	/* LCDDEN */ +	at91_set_a_periph(AT91_PIO_PORTC, 30, 0);	/* LCDDOTCK */ + +	at91_set_a_periph(AT91_PIO_PORTC, 0, 0);	/* LCDD0 */ +	at91_set_a_periph(AT91_PIO_PORTC, 1, 0);	/* LCDD1 */ +	at91_set_a_periph(AT91_PIO_PORTC, 2, 0);	/* LCDD2 */ +	at91_set_a_periph(AT91_PIO_PORTC, 3, 0);	/* LCDD3 */ +	at91_set_a_periph(AT91_PIO_PORTC, 4, 0);	/* LCDD4 */ +	at91_set_a_periph(AT91_PIO_PORTC, 5, 0);	/* LCDD5 */ +	at91_set_a_periph(AT91_PIO_PORTC, 6, 0);	/* LCDD6 */ +	at91_set_a_periph(AT91_PIO_PORTC, 7, 0);	/* LCDD7 */ +	at91_set_a_periph(AT91_PIO_PORTC, 8, 0);	/* LCDD8 */ +	at91_set_a_periph(AT91_PIO_PORTC, 9, 0);	/* LCDD9 */ +	at91_set_a_periph(AT91_PIO_PORTC, 10, 0);	/* LCDD10 */ +	at91_set_a_periph(AT91_PIO_PORTC, 11, 0);	/* LCDD11 */ +	at91_set_a_periph(AT91_PIO_PORTC, 12, 0);	/* LCDD12 */ +	at91_set_a_periph(AT91_PIO_PORTC, 13, 0);	/* LCDD13 */ +	at91_set_a_periph(AT91_PIO_PORTC, 14, 0);	/* LCDD14 */ +	at91_set_a_periph(AT91_PIO_PORTC, 15, 0);	/* LCDD15 */ +	at91_set_a_periph(AT91_PIO_PORTC, 16, 0);	/* LCDD16 */ +	at91_set_a_periph(AT91_PIO_PORTC, 17, 0);	/* LCDD17 */ +	at91_set_a_periph(AT91_PIO_PORTC, 18, 0);	/* LCDD18 */ +	at91_set_a_periph(AT91_PIO_PORTC, 19, 0);	/* LCDD19 */ +	at91_set_a_periph(AT91_PIO_PORTC, 20, 0);	/* LCDD20 */ +	at91_set_a_periph(AT91_PIO_PORTC, 21, 0);	/* LCDD21 */ +	at91_set_a_periph(AT91_PIO_PORTC, 22, 0);	/* LCDD22 */ +	at91_set_a_periph(AT91_PIO_PORTC, 23, 0);	/* LCDD23 */ + +	writel(1 << ATMEL_ID_LCDC, &pmc->pcer); +} +#endif diff --git a/arch/arm/cpu/arm926ejs/at91/clock.c b/arch/arm/cpu/arm926ejs/at91/clock.c index f825388ae..5b4923f3b 100644 --- a/arch/arm/cpu/arm926ejs/at91/clock.c +++ b/arch/arm/cpu/arm926ejs/at91/clock.c @@ -156,7 +156,7 @@ int at91_clock_init(unsigned long main_clock)  	 */  	mckr = readl(&pmc->mckr);  #if defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) \ -		|| defined(CONFIG_AT91SAM9X5) +		|| defined(CONFIG_AT91SAM9N12) || defined(CONFIG_AT91SAM9X5)  	/* plla divisor by 2 */  	gd->arch.plla_rate_hz /= (1 << ((mckr & 1 << 12) >> 12));  #endif @@ -171,7 +171,7 @@ int at91_clock_init(unsigned long main_clock)  	if (mckr & AT91_PMC_MCKR_MDIV_MASK)  		freq /= 2;			/* processor clock division */  #elif defined(CONFIG_AT91SAM9G45) || defined(CONFIG_AT91SAM9M10G45) \ -		|| defined(CONFIG_AT91SAM9X5) +		|| defined(CONFIG_AT91SAM9N12) || defined(CONFIG_AT91SAM9X5)  	/* mdiv <==> divisor  	 *  0   <==>   1  	 *  1   <==>   2 diff --git a/arch/arm/cpu/arm926ejs/davinci/Makefile b/arch/arm/cpu/arm926ejs/davinci/Makefile index dec7bfbfa..bba4671f7 100644 --- a/arch/arm/cpu/arm926ejs/davinci/Makefile +++ b/arch/arm/cpu/arm926ejs/davinci/Makefile @@ -33,6 +33,7 @@ COBJS-$(CONFIG_SOC_DM355)	+= dm355.o  COBJS-$(CONFIG_SOC_DM365)	+= dm365.o  COBJS-$(CONFIG_SOC_DM644X)	+= dm644x.o  COBJS-$(CONFIG_SOC_DM646X)	+= dm646x.o +COBJS-$(CONFIG_SOC_DA830)	+= da830_pinmux.o  COBJS-$(CONFIG_SOC_DA850)	+= da850_pinmux.o  COBJS-$(CONFIG_DRIVER_TI_EMAC)	+= lxt972.o dp83848.o et1011c.o ksz8873.o diff --git a/arch/arm/cpu/arm926ejs/davinci/da830_pinmux.c b/arch/arm/cpu/arm926ejs/davinci/da830_pinmux.c new file mode 100644 index 000000000..d0c964a34 --- /dev/null +++ b/arch/arm/cpu/arm926ejs/davinci/da830_pinmux.c @@ -0,0 +1,151 @@ +/* + * Pinmux configurations for the DA830 SoCs + * + * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/ + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <common.h> +#include <asm/arch/davinci_misc.h> +#include <asm/arch/hardware.h> +#include <asm/arch/pinmux_defs.h> + +/* SPI0 pin muxer settings */ +const struct pinmux_config spi0_pins_base[] = { +	{ pinmux(7), 1, 3 },  /* SPI0_SOMI */ +	{ pinmux(7), 1, 4 },  /* SPI0_SIMO */ +	{ pinmux(7), 1, 6 }   /* SPI0_CLK */ +}; + +const struct pinmux_config spi0_pins_scs0[] = { +	{ pinmux(7), 1, 7 }   /* SPI0_SCS[0] */ +}; + +const struct pinmux_config spi0_pins_ena[] = { +	{ pinmux(7), 1, 5 }   /* SPI0_ENA */ +}; + +/* NAND pin muxer settings */ +const struct pinmux_config emifa_pins_cs0[] = { +	{ pinmux(18), 1, 2 }   /* EMA_CS[0] */ +}; + +const struct pinmux_config emifa_pins_cs2[] = { +	{ pinmux(18), 1, 3 }   /* EMA_CS[2] */ +}; + +const struct pinmux_config emifa_pins_cs3[] = { +	{ pinmux(18), 1, 4 }   /* EMA_CS[3] */ +}; + +#ifdef CONFIG_USE_NAND +const struct pinmux_config emifa_pins[] = { +	{ pinmux(13), 1, 6 },  /* EMA_D[0] */ +	{ pinmux(13), 1, 7 },  /* EMA_D[1] */ +	{ pinmux(14), 1, 0 },  /* EMA_D[2] */ +	{ pinmux(14), 1, 1 },  /* EMA_D[3] */ +	{ pinmux(14), 1, 2 },  /* EMA_D[4] */ +	{ pinmux(14), 1, 3 },  /* EMA_D[5] */ +	{ pinmux(14), 1, 4 },  /* EMA_D[6] */ +	{ pinmux(14), 1, 5 },  /* EMA_D[7] */ +	{ pinmux(14), 1, 6 },  /* EMA_D[8] */ +	{ pinmux(14), 1, 7 },  /* EMA_D[9] */ +	{ pinmux(15), 1, 0 },  /* EMA_D[10] */ +	{ pinmux(15), 1, 1 },  /* EMA_D[11] */ +	{ pinmux(15), 1, 2 },  /* EMA_D[12] */ +	{ pinmux(15), 1, 3 },  /* EMA_D[13] */ +	{ pinmux(15), 1, 4 },  /* EMA_D[14] */ +	{ pinmux(15), 1, 5 },  /* EMA_D[15] */ +	{ pinmux(15), 1, 6 },  /* EMA_A[0] */ +	{ pinmux(15), 1, 7 },  /* EMA_A[1] */ +	{ pinmux(16), 1, 0 },  /* EMA_A[2] */ +	{ pinmux(16), 1, 1 },  /* EMA_A[3] */ +	{ pinmux(16), 1, 2 },  /* EMA_A[4] */ +	{ pinmux(16), 1, 3 },  /* EMA_A[5] */ +	{ pinmux(16), 1, 4 },  /* EMA_A[6] */ +	{ pinmux(16), 1, 5 },  /* EMA_A[7] */ +	{ pinmux(16), 1, 6 },  /* EMA_A[8] */ +	{ pinmux(16), 1, 7 },  /* EMA_A[9] */ +	{ pinmux(17), 1, 0 },  /* EMA_A[10] */ +	{ pinmux(17), 1, 1 },  /* EMA_A[11] */ +	{ pinmux(17), 1, 2 },  /* EMA_A[12] */ +	{ pinmux(17), 1, 3 },  /* EMA_BA[1] */ +	{ pinmux(17), 1, 4 },  /* EMA_BA[0] */ +	{ pinmux(17), 1, 5 },  /* EMA_CLK */ +	{ pinmux(17), 1, 6 },  /* EMA_SDCKE */ +	{ pinmux(17), 1, 7 },  /* EMA_CAS */ +	{ pinmux(18), 1, 0 },  /* EMA_CAS */ +	{ pinmux(18), 1, 1 },  /* EMA_WE */ +	{ pinmux(18), 1, 5 },  /* EMA_OE */ +	{ pinmux(18), 1, 6 },  /* EMA_WE_DQM[1] */ +	{ pinmux(18), 1, 7 },  /* EMA_WE_DQM[0] */ +	{ pinmux(10), 1, 0 }   /* Tristate */ +}; +#endif + +/* EMAC PHY interface pins */ +const struct pinmux_config emac_pins_rmii[] = { +	{ pinmux(10), 2, 1 },  /* RMII_TXD[0] */ +	{ pinmux(10), 2, 2 },  /* RMII_TXD[1] */ +	{ pinmux(10), 2, 3 },  /* RMII_TXEN */ +	{ pinmux(10), 2, 4 },  /* RMII_CRS_DV */ +	{ pinmux(10), 2, 5 },  /* RMII_RXD[0] */ +	{ pinmux(10), 2, 6 },  /* RMII_RXD[1] */ +	{ pinmux(10), 2, 7 }   /* RMII_RXER */ +}; + +const struct pinmux_config emac_pins_mdio[] = { +	{ pinmux(11), 2, 0 },  /* MDIO_CLK */ +	{ pinmux(11), 2, 1 }   /* MDIO_D */ +}; + +const struct pinmux_config emac_pins_rmii_clk_source[] = { +	{ pinmux(9), 0, 5 }    /* ref.clk from external source */ +}; + +/* UART2 pin muxer settings */ +const struct pinmux_config uart2_pins_txrx[] = { +	{ pinmux(8), 2, 7 },   /* UART2_RXD */ +	{ pinmux(9), 2, 0 }    /* UART2_TXD */ +}; + +/* I2C0 pin muxer settings */ +const struct pinmux_config i2c0_pins[] = { +	{ pinmux(8), 2, 3 },   /* I2C0_SDA */ +	{ pinmux(8), 2, 4 }    /* I2C0_SCL */ +}; + +/* USB0_DRVVBUS pin muxer settings */ +const struct pinmux_config usb_pins[] = { +	{ pinmux(9), 1, 1 }    /* USB0_DRVVBUS */ +}; + +#ifdef CONFIG_DAVINCI_MMC +/* MMC0 pin muxer settings */ +const struct pinmux_config mmc0_pins_8bit[] = { +	{ pinmux(15), 2, 7 },  /* MMCSD0_CLK */ +	{ pinmux(16), 2, 0 },  /* MMCSD0_CMD */ +	{ pinmux(13), 2, 6 },  /* MMCSD0_DAT_0 */ +	{ pinmux(13), 2, 7 },  /* MMCSD0_DAT_1 */ +	{ pinmux(14), 2, 0 },  /* MMCSD0_DAT_2 */ +	{ pinmux(14), 2, 1 },  /* MMCSD0_DAT_3 */ +	{ pinmux(14), 2, 2 },  /* MMCSD0_DAT_4 */ +	{ pinmux(14), 2, 3 },  /* MMCSD0_DAT_5 */ +	{ pinmux(14), 2, 4 },  /* MMCSD0_DAT_6 */ +	{ pinmux(14), 2, 5 }   /* MMCSD0_DAT_7 */ +	/* DA830 supports 8-bit mode */ +}; +#endif diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds index 673c725ab..f4e7525f1 100644 --- a/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds +++ b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds @@ -57,11 +57,6 @@ SECTIONS  		__rel_dyn_end = .;  	} -	.dynsym : { -		__dynsym_start = .; -		*(.dynsym) -	} -  	.bss : {  		. = ALIGN(4);  		__bss_start = .; diff --git a/arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds b/arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds index 967a135b3..446d09501 100644 --- a/arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds +++ b/arch/arm/cpu/arm926ejs/spear/u-boot-spl.lds @@ -57,11 +57,6 @@ SECTIONS  		__rel_dyn_end = .;  	} -	.dynsym : { -		__dynsym_start = .; -		*(.dynsym) -	} -  	.bss : {  		. = ALIGN(4);  		__bss_start = .; diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S index 4c5671109..5fc8e0459 100644 --- a/arch/arm/cpu/arm926ejs/start.S +++ b/arch/arm/cpu/arm926ejs/start.S @@ -136,10 +136,6 @@ _TEXT_BASE:  _bss_start_ofs:  	.word __bss_start - _start -.globl _image_copy_end_ofs -_image_copy_end_ofs: -	.word __image_copy_end - _start -  .globl _bss_end_ofs  _bss_end_ofs:  	.word __bss_end - _start @@ -190,83 +186,6 @@ reset:  /*------------------------------------------------------------------------------*/ -/* - * void relocate_code(addr_moni) - * - * This function relocates the monitor code. - */ -	.globl	relocate_code -relocate_code: -	mov	r6, r0	/* save addr of destination */ - -	adr	r0, _start -	subs	r9, r6, r0		/* r9 <- relocation offset */ -	beq	relocate_done		/* skip relocation */ -	mov	r1, r6			/* r1 <- scratch for copy loop */ -	ldr	r3, _image_copy_end_ofs -	add	r2, r0, r3		/* r2 <- source end address	    */ - -copy_loop: -	ldmia	r0!, {r10-r11}		/* copy from source address [r0]    */ -	stmia	r1!, {r10-r11}		/* copy to   target address [r1]    */ -	cmp	r0, r2			/* until source end address [r2]    */ -	blo	copy_loop - -#ifndef CONFIG_SPL_BUILD -	/* -	 * fix .rel.dyn relocations -	 */ -	ldr	r0, _TEXT_BASE		/* r0 <- Text base */ -	ldr	r10, _dynsym_start_ofs	/* r10 <- sym table ofs */ -	add	r10, r10, r0		/* r10 <- sym table in FLASH */ -	ldr	r2, _rel_dyn_start_ofs	/* r2 <- rel dyn start ofs */ -	add	r2, r2, r0		/* r2 <- rel dyn start in FLASH */ -	ldr	r3, _rel_dyn_end_ofs	/* r3 <- rel dyn end ofs */ -	add	r3, r3, r0		/* r3 <- rel dyn end in FLASH */ -fixloop: -	ldr	r0, [r2]		/* r0 <- location to fix up, IN FLASH! */ -	add	r0, r0, r9		/* r0 <- location to fix up in RAM */ -	ldr	r1, [r2, #4] -	and	r7, r1, #0xff -	cmp	r7, #23			/* relative fixup? */ -	beq	fixrel -	cmp	r7, #2			/* absolute fixup? */ -	beq	fixabs -	/* ignore unknown type of fixup */ -	b	fixnext -fixabs: -	/* absolute fix: set location to (offset) symbol value */ -	mov	r1, r1, LSR #4		/* r1 <- symbol index in .dynsym */ -	add	r1, r10, r1		/* r1 <- address of symbol in table */ -	ldr	r1, [r1, #4]		/* r1 <- symbol value */ -	add	r1, r1, r9		/* r1 <- relocated sym addr */ -	b	fixnext -fixrel: -	/* relative fix: increase location by offset */ -	ldr	r1, [r0] -	add	r1, r1, r9 -fixnext: -	str	r1, [r0] -	add	r2, r2, #8		/* each rel.dyn entry is 8 bytes */ -	cmp	r2, r3 -	blo	fixloop -#endif - -relocate_done: - -	bx	lr - -#ifndef CONFIG_SPL_BUILD - -_rel_dyn_start_ofs: -	.word __rel_dyn_start - _start -_rel_dyn_end_ofs: -	.word __rel_dyn_end - _start -_dynsym_start_ofs: -	.word __dynsym_start - _start - -#endif -  	.globl	c_runtime_cpu_setup  c_runtime_cpu_setup:  |