[U-Boot] Pull request: u-boot-arm

The following changes since commit bfc7bea6adc46e1db2f5a5e3464d7652ed67c864:
Merge branch 'master' of git://git.denx.de/u-boot-x86 (2010-10-11 10:00:34 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-arm.git master
Albert Aribaud (6): arm: bugfix: replace ble with blo in start.S files orion5x: fix relocation-incompatible code mvsata_ide: adjust port init sequence orion5x: optimize window size computation mvsata_ide: adjust port init sequence orion5x: optimize window size computation
Alexander Stein (1): at91: Add arch_preboot_os which disables PIT in a faster way
Andreas Bießmann (6): at91_emac.c: fix 'Warning: eth device name has a space!' at91_emac.c: poll for IDLE when writing PHY at91_emac.h: fix typo in register definition atmel_usart: change register access to C structure arch/arm/include/asm/sizes.h: cleanups board/armltd/integrator/split_by_variant.sh: fix 'echo -n'
Ben Gardiner (1): ARM: relocation: don't undef CONFIG_SYS_ARM_WITHOUT_RELOC
Heiko Schocher (1): ARM: relocation: fix typo in comment
Matt Waddel (2): ARMV7: Versatile Express Coretile CortexA9x4 support ARMV7: Fixed baudrate setting in pl01x driver
Prafulla Wadaskar (8): Kirkwood: print_cpuinfo fixed for valid devid revid Kirkwood: dram_init is moved to dram.c kirkwood: added common config file mv-common.h Kirkwood: Changes specific to ARM relocation support Kirkwood: print_cpuinfo fixed for valid devid revid Kirkwood: dram_init is moved to dram.c kirkwood: added common config file mv-common.h Kirkwood: Changes specific to ARM relocation support
Reinhard Meyer (1): AT91: convert cpu.c to struct SoC access
Stefano Babic (10): Use common function to set GPIOs for MX3 and MX5 ARM: Use syslib functions for all CORTEXA8 MX51: Added pins definition to set up pads MX51: add structure to access System Reset Controller MXC: Add watchdog support to serial driver MX51: Drop unused header file for mx51evk MXC: Correct SPI_CPOL setting in SPI driver MXC: Fix byte-ordering in SPI driver for i.MX31/i.MX51 MX51: Register definitions cannot be included in board config file MX51: Support for TTECH vision2 board
Wolfgang Denk (3): Merge branch 'master' of git://git.denx.de/u-boot-imx Merge branch 'at91' of git://git.denx.de/u-boot-atmel Merge branch 'master' of git://git.denx.de/u-boot-marvell
MAINTAINERS | 5 + MAKEALL | 1 + arch/arm/cpu/arm1136/start.S | 8 +- arch/arm/cpu/arm1176/start.S | 10 +- arch/arm/cpu/arm720t/start.S | 10 +- arch/arm/cpu/arm920t/start.S | 10 +- arch/arm/cpu/arm925t/start.S | 10 +- arch/arm/cpu/arm926ejs/at91/cpu.c | 48 +- arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 34 +- arch/arm/cpu/arm926ejs/kirkwood/dram.c | 38 + arch/arm/cpu/arm926ejs/orion5x/cpu.c | 112 ++-- arch/arm/cpu/arm926ejs/orion5x/timer.c | 6 +- arch/arm/cpu/arm926ejs/start.S | 10 +- arch/arm/cpu/arm946es/start.S | 8 +- arch/arm/cpu/arm_intcm/start.S | 10 +- arch/arm/cpu/armv7/Makefile | 3 +- arch/arm/cpu/armv7/omap-common/Makefile | 1 - arch/arm/cpu/armv7/start.S | 8 +- arch/arm/cpu/armv7/{omap-common => }/syslib.c | 0 arch/arm/cpu/ixp/start.S | 10 +- arch/arm/cpu/lh7a40x/start.S | 11 +- arch/arm/cpu/pxa/start.S | 8 +- arch/arm/cpu/s3c44b0/start.S | 12 +- arch/arm/cpu/sa1100/start.S | 10 +- arch/arm/include/asm/arch-arm925t/sizes.h | 50 -- arch/arm/include/asm/arch-arm926ejs/sizes.h | 51 -- arch/arm/include/asm/arch-armv7/sysctrl.h | 70 ++ .../arm/include/asm/arch-armv7/systimer.h | 54 +- .../arm/include/asm/arch-armv7/wdt.h | 57 +- arch/arm/include/asm/arch-at91/at91_emac.h | 2 +- arch/arm/include/asm/arch-kirkwood/cpu.h | 2 + arch/arm/include/asm/arch-mx31/mx31-regs.h | 14 +- arch/arm/include/asm/arch-mx31/mx31.h | 25 - arch/arm/include/asm/arch-mx51/imx-regs.h | 26 +- arch/arm/include/asm/arch-mx51/mx51_pins.h | 44 ++ arch/arm/include/asm/arch-mx51/sys_proto.h | 1 + arch/arm/include/asm/arch-omap/sizes.h | 52 -- arch/arm/include/asm/arch-omap24xx/omap2420.h | 2 +- arch/arm/include/asm/arch-omap24xx/sizes.h | 49 -- arch/arm/include/asm/arch-orion5x/cpu.h | 1 + arch/arm/include/asm/sizes.h | 5 +- board/Marvell/guruplug/guruplug.c | 11 - board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 11 - board/Marvell/openrd_base/openrd_base.c | 11 - board/Marvell/rd6281a/rd6281a.c | 11 - board/Marvell/sheevaplug/sheevaplug.c | 11 - board/armltd/integrator/split_by_variant.sh | 129 ++-- board/armltd/vexpress/Makefile | 49 ++ board/armltd/vexpress/ca9x4_ct_vxp.c | 220 ++++++ board/armltd/vexpress/config.mk | 23 + board/armltd/vexpress/u-boot.lds | 65 ++ board/davedenx/qong/qong.c | 29 +- board/freescale/mx51evk/mx51evk.c | 2 - board/ttcontrol/vision2/Makefile | 48 ++ board/ttcontrol/vision2/config.mk | 25 + board/ttcontrol/vision2/imximage_hynix.cfg | 209 ++++++ board/ttcontrol/vision2/vision2.c | 711 ++++++++++++++++++++ boards.cfg | 2 + drivers/block/mvsata_ide.c | 42 +- drivers/gpio/Makefile | 2 +- drivers/gpio/{mx31_gpio.c => mxc_gpio.c} | 47 +- drivers/misc/fsl_pmic.c | 10 +- drivers/net/at91_emac.c | 22 +- drivers/serial/atmel_usart.c | 36 +- drivers/serial/atmel_usart.h | 56 +- drivers/serial/serial_mxc.c | 7 +- drivers/serial/serial_pl01x.c | 93 +-- drivers/spi/mxc_spi.c | 168 ++++-- include/configs/ca9x4_ct_vxp.h | 196 ++++++ include/configs/da850evm.h | 1 - include/configs/guruplug.h | 103 +--- include/configs/h2_p2_dbg_board.h | 2 +- include/configs/imx27lite-common.h | 3 +- include/configs/imx31_litekit.h | 4 +- include/configs/imx31_phycore.h | 2 +- include/configs/keymile-common.h | 1 + include/configs/km_arm.h | 2 +- include/configs/mv-common.h | 230 +++++++ include/configs/mv88f6281gtw_ge.h | 120 +--- include/configs/mx31ads.h | 4 +- include/configs/mx31pdk.h | 4 +- include/configs/mx51evk.h | 2 +- include/configs/omap1510.h | 2 +- include/configs/omap3_beagle.h | 3 +- include/configs/omap730.h | 2 +- include/configs/openrd_base.h | 146 +---- include/configs/qong.h | 9 +- include/configs/rd6281a.h | 101 +--- include/configs/sheevaplug.h | 104 +--- include/configs/tx25.h | 3 +- include/configs/vision2.h | 214 ++++++ include/mc13892.h | 3 + .../mx51evk/mx51evk.h => include/mxc_gpio.h | 50 +- 93 files changed, 2904 insertions(+), 1345 deletions(-) rename arch/arm/cpu/armv7/{omap-common => }/syslib.c (100%) delete mode 100644 arch/arm/include/asm/arch-arm925t/sizes.h delete mode 100644 arch/arm/include/asm/arch-arm926ejs/sizes.h create mode 100644 arch/arm/include/asm/arch-armv7/sysctrl.h copy board/freescale/mx51evk/mx51evk.h => arch/arm/include/asm/arch-armv7/systimer.h (55%) copy board/freescale/mx51evk/mx51evk.h => arch/arm/include/asm/arch-armv7/wdt.h (55%) delete mode 100644 arch/arm/include/asm/arch-omap/sizes.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/sizes.h create mode 100644 board/armltd/vexpress/Makefile create mode 100644 board/armltd/vexpress/ca9x4_ct_vxp.c create mode 100644 board/armltd/vexpress/config.mk create mode 100644 board/armltd/vexpress/u-boot.lds create mode 100644 board/ttcontrol/vision2/Makefile create mode 100644 board/ttcontrol/vision2/config.mk create mode 100644 board/ttcontrol/vision2/imximage_hynix.cfg create mode 100644 board/ttcontrol/vision2/vision2.c rename drivers/gpio/{mx31_gpio.c => mxc_gpio.c} (63%) create mode 100644 include/configs/ca9x4_ct_vxp.h create mode 100644 include/configs/mv-common.h create mode 100644 include/configs/vision2.h rename board/freescale/mx51evk/mx51evk.h => include/mxc_gpio.h (54%)
Best regards,
Wolfgang Denk

In message 20101013184030.B935C1365CC@gemini.denx.de you wrote:
The following changes since commit bfc7bea6adc46e1db2f5a5e3464d7652ed67c864:
Merge branch 'master' of git://git.denx.de/u-boot-x86 (2010-10-11 10:00:34 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-arm.git master
Albert Aribaud (6): arm: bugfix: replace ble with blo in start.S files orion5x: fix relocation-incompatible code mvsata_ide: adjust port init sequence orion5x: optimize window size computation mvsata_ide: adjust port init sequence orion5x: optimize window size computation
Alexander Stein (1): at91: Add arch_preboot_os which disables PIT in a faster way
Andreas Bießmann (6): at91_emac.c: fix 'Warning: eth device name has a space!' at91_emac.c: poll for IDLE when writing PHY at91_emac.h: fix typo in register definition atmel_usart: change register access to C structure arch/arm/include/asm/sizes.h: cleanups board/armltd/integrator/split_by_variant.sh: fix 'echo -n'
Ben Gardiner (1): ARM: relocation: don't undef CONFIG_SYS_ARM_WITHOUT_RELOC
Heiko Schocher (1): ARM: relocation: fix typo in comment
Matt Waddel (2): ARMV7: Versatile Express Coretile CortexA9x4 support ARMV7: Fixed baudrate setting in pl01x driver
Prafulla Wadaskar (8): Kirkwood: print_cpuinfo fixed for valid devid revid Kirkwood: dram_init is moved to dram.c kirkwood: added common config file mv-common.h Kirkwood: Changes specific to ARM relocation support Kirkwood: print_cpuinfo fixed for valid devid revid Kirkwood: dram_init is moved to dram.c kirkwood: added common config file mv-common.h Kirkwood: Changes specific to ARM relocation support
Reinhard Meyer (1): AT91: convert cpu.c to struct SoC access
Stefano Babic (10): Use common function to set GPIOs for MX3 and MX5 ARM: Use syslib functions for all CORTEXA8 MX51: Added pins definition to set up pads MX51: add structure to access System Reset Controller MXC: Add watchdog support to serial driver MX51: Drop unused header file for mx51evk MXC: Correct SPI_CPOL setting in SPI driver MXC: Fix byte-ordering in SPI driver for i.MX31/i.MX51 MX51: Register definitions cannot be included in board config file MX51: Support for TTECH vision2 board
Wolfgang Denk (3): Merge branch 'master' of git://git.denx.de/u-boot-imx Merge branch 'at91' of git://git.denx.de/u-boot-atmel Merge branch 'master' of git://git.denx.de/u-boot-marvell
MAINTAINERS | 5 + MAKEALL | 1 + arch/arm/cpu/arm1136/start.S | 8 +- arch/arm/cpu/arm1176/start.S | 10 +- arch/arm/cpu/arm720t/start.S | 10 +- arch/arm/cpu/arm920t/start.S | 10 +- arch/arm/cpu/arm925t/start.S | 10 +- arch/arm/cpu/arm926ejs/at91/cpu.c | 48 +- arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 34 +- arch/arm/cpu/arm926ejs/kirkwood/dram.c | 38 + arch/arm/cpu/arm926ejs/orion5x/cpu.c | 112 ++-- arch/arm/cpu/arm926ejs/orion5x/timer.c | 6 +- arch/arm/cpu/arm926ejs/start.S | 10 +- arch/arm/cpu/arm946es/start.S | 8 +- arch/arm/cpu/arm_intcm/start.S | 10 +- arch/arm/cpu/armv7/Makefile | 3 +- arch/arm/cpu/armv7/omap-common/Makefile | 1 - arch/arm/cpu/armv7/start.S | 8 +- arch/arm/cpu/armv7/{omap-common => }/syslib.c | 0 arch/arm/cpu/ixp/start.S | 10 +- arch/arm/cpu/lh7a40x/start.S | 11 +- arch/arm/cpu/pxa/start.S | 8 +- arch/arm/cpu/s3c44b0/start.S | 12 +- arch/arm/cpu/sa1100/start.S | 10 +- arch/arm/include/asm/arch-arm925t/sizes.h | 50 -- arch/arm/include/asm/arch-arm926ejs/sizes.h | 51 -- arch/arm/include/asm/arch-armv7/sysctrl.h | 70 ++ .../arm/include/asm/arch-armv7/systimer.h | 54 +- .../arm/include/asm/arch-armv7/wdt.h | 57 +- arch/arm/include/asm/arch-at91/at91_emac.h | 2 +- arch/arm/include/asm/arch-kirkwood/cpu.h | 2 + arch/arm/include/asm/arch-mx31/mx31-regs.h | 14 +- arch/arm/include/asm/arch-mx31/mx31.h | 25 - arch/arm/include/asm/arch-mx51/imx-regs.h | 26 +- arch/arm/include/asm/arch-mx51/mx51_pins.h | 44 ++ arch/arm/include/asm/arch-mx51/sys_proto.h | 1 + arch/arm/include/asm/arch-omap/sizes.h | 52 -- arch/arm/include/asm/arch-omap24xx/omap2420.h | 2 +- arch/arm/include/asm/arch-omap24xx/sizes.h | 49 -- arch/arm/include/asm/arch-orion5x/cpu.h | 1 + arch/arm/include/asm/sizes.h | 5 +- board/Marvell/guruplug/guruplug.c | 11 - board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c | 11 - board/Marvell/openrd_base/openrd_base.c | 11 - board/Marvell/rd6281a/rd6281a.c | 11 - board/Marvell/sheevaplug/sheevaplug.c | 11 - board/armltd/integrator/split_by_variant.sh | 129 ++-- board/armltd/vexpress/Makefile | 49 ++ board/armltd/vexpress/ca9x4_ct_vxp.c | 220 ++++++ board/armltd/vexpress/config.mk | 23 + board/armltd/vexpress/u-boot.lds | 65 ++ board/davedenx/qong/qong.c | 29 +- board/freescale/mx51evk/mx51evk.c | 2 - board/ttcontrol/vision2/Makefile | 48 ++ board/ttcontrol/vision2/config.mk | 25 + board/ttcontrol/vision2/imximage_hynix.cfg | 209 ++++++ board/ttcontrol/vision2/vision2.c | 711 ++++++++++++++++> ++++ boards.cfg | 2 + drivers/block/mvsata_ide.c | 42 +- drivers/gpio/Makefile | 2 +- drivers/gpio/{mx31_gpio.c => mxc_gpio.c} | 47 +- drivers/misc/fsl_pmic.c | 10 +- drivers/net/at91_emac.c | 22 +- drivers/serial/atmel_usart.c | 36 +- drivers/serial/atmel_usart.h | 56 +- drivers/serial/serial_mxc.c | 7 +- drivers/serial/serial_pl01x.c | 93 +-- drivers/spi/mxc_spi.c | 168 ++++-- include/configs/ca9x4_ct_vxp.h | 196 ++++++ include/configs/da850evm.h | 1 - include/configs/guruplug.h | 103 +--- include/configs/h2_p2_dbg_board.h | 2 +- include/configs/imx27lite-common.h | 3 +- include/configs/imx31_litekit.h | 4 +- include/configs/imx31_phycore.h | 2 +- include/configs/keymile-common.h | 1 + include/configs/km_arm.h | 2 +- include/configs/mv-common.h | 230 +++++++ include/configs/mv88f6281gtw_ge.h | 120 +--- include/configs/mx31ads.h | 4 +- include/configs/mx31pdk.h | 4 +- include/configs/mx51evk.h | 2 +- include/configs/omap1510.h | 2 +- include/configs/omap3_beagle.h | 3 +- include/configs/omap730.h | 2 +- include/configs/openrd_base.h | 146 +---- include/configs/qong.h | 9 +- include/configs/rd6281a.h | 101 +--- include/configs/sheevaplug.h | 104 +--- include/configs/tx25.h | 3 +- include/configs/vision2.h | 214 ++++++ include/mc13892.h | 3 + .../mx51evk/mx51evk.h => include/mxc_gpio.h | 50 +- 93 files changed, 2904 insertions(+), 1345 deletions(-) rename arch/arm/cpu/armv7/{omap-common => }/syslib.c (100%) delete mode 100644 arch/arm/include/asm/arch-arm925t/sizes.h delete mode 100644 arch/arm/include/asm/arch-arm926ejs/sizes.h create mode 100644 arch/arm/include/asm/arch-armv7/sysctrl.h copy board/freescale/mx51evk/mx51evk.h => arch/arm/include/asm/arch-armv> 7/systimer.h (55%) copy board/freescale/mx51evk/mx51evk.h => arch/arm/include/asm/arch-armv> 7/wdt.h (55%) delete mode 100644 arch/arm/include/asm/arch-omap/sizes.h delete mode 100644 arch/arm/include/asm/arch-omap24xx/sizes.h create mode 100644 board/armltd/vexpress/Makefile create mode 100644 board/armltd/vexpress/ca9x4_ct_vxp.c create mode 100644 board/armltd/vexpress/config.mk create mode 100644 board/armltd/vexpress/u-boot.lds create mode 100644 board/ttcontrol/vision2/Makefile create mode 100644 board/ttcontrol/vision2/config.mk create mode 100644 board/ttcontrol/vision2/imximage_hynix.cfg create mode 100644 board/ttcontrol/vision2/vision2.c rename drivers/gpio/{mx31_gpio.c => mxc_gpio.c} (63%) create mode 100644 include/configs/ca9x4_ct_vxp.h create mode 100644 include/configs/mv-common.h create mode 100644 include/configs/vision2.h rename board/freescale/mx51evk/mx51evk.h => include/mxc_gpio.h (54%)
Applied.
Best regards,
Wolfgang Denk

Signed-off-by: Alexey Zaytsev alexey.zaytsev@gmail.com ---
Hi.
U-boot won't build for Versatile Express (ca9x4_ct_vxp) without this patch. I'm not sure why the syslib is made armv7-specific, as it looks quite generic to me, but I'll leave this to the original authors.
arch/arm/include/asm/arch-armv7/sys_proto.h | 31 +++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/arch/arm/include/asm/arch-armv7/sys_proto.h b/arch/arm/include/asm/arch-armv7/sys_proto.h index e69de29..d3a7b47 100644 --- a/arch/arm/include/asm/arch-armv7/sys_proto.h +++ b/arch/arm/include/asm/arch-armv7/sys_proto.h @@ -0,0 +1,31 @@ +/* + * (C) Copyright 2008 + * Texas Instruments, <www.ti.com> + * + * Richard Woodruff r-woodruff2@ti.com + * Syed Mohammed Khasim khasim@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., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef _SYS_PROTO_H_ +#define _SYS_PROTO_H_ + +void sr32(void *, u32, u32, u32); +u32 wait_on_value(u32, u32, void *, u32); +void sdelay(unsigned long); + +#endif

Dear Alexey Zaytsev,
In message 20101015233455.4049.16990.stgit@zaytsev.su you wrote:
Signed-off-by: Alexey Zaytsev alexey.zaytsev@gmail.com
Hi.
U-boot won't build for Versatile Express (ca9x4_ct_vxp) without this patch. I'm not sure why the syslib is made armv7-specific, as it looks quite generic to me, but I'll leave this to the original authors.
arch/arm/include/asm/arch-armv7/sys_proto.h | 31 +++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)
NAK. This needs better cleanup.
Instead of adding yet another header file just to fix this current issue, this should really be cleaned up.
We aleady have such prototype declarations in
arch/arm/include/asm/arch-omap24xx/sys_proto.h arch/arm/include/asm/arch-omap3/sys_proto.h and arch/arm/include/asm/arch-omap4/sys_proto.h
And we have implementations in
arch/arm/cpu/armv7/syslib.c board/apollon/sys_info.c and board/ti/omap2420h4/sys_info.c
All this needs to be moved to a single, common place.
Best regards,
Wolfgang Denk

On Sat, Oct 16, 2010 at 18:54, Wolfgang Denk wd@denx.de wrote:
Dear Alexey Zaytsev,
In message 20101015233455.4049.16990.stgit@zaytsev.su you wrote:
Signed-off-by: Alexey Zaytsev alexey.zaytsev@gmail.com
Hi.
U-boot won't build for Versatile Express (ca9x4_ct_vxp) without this patch. I'm not sure why the syslib is made armv7-specific, as it looks quite generic to me, but I'll leave this to the original authors.
arch/arm/include/asm/arch-armv7/sys_proto.h | 31 +++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)
NAK. This needs better cleanup.
Well, I'm just a simple user who wants his u-boot to build, don't know much about programmin' ;)
Instead of adding yet another header file just to fix this current issue, this should really be cleaned up.
I totally agree, but could you please rise the issue with the involved maintainers, and fix the vexpress build in the mean time? Or also break the build for the omap boards?

Dear Alexey Zaytsev,
In message AANLkTim6fAZCsUFanEv2OCSvmvtiygrERRv3CirrG3N9@mail.gmail.com you wrote:
U-boot won't build for Versatile Express (ca9x4_ct_vxp) without this patch. I'm not sure why the syslib is made armv7-specific, as it looks quite generic to me, but I'll leave this to the original authors.
arch/arm/include/asm/arch-armv7/sys_proto.h | 31 +++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)
NAK. This needs better cleanup.
Well, I'm just a simple user who wants his u-boot to build, don't know much about programmin' ;)
Instead of adding yet another header file just to fix this current issue, this should really be cleaned up.
I totally agree, but could you please rise the issue with the involved maintainers, and fix the vexpress build in the mean time? Or also break the build for the omap boards?
Sometimes poor code sneaks in unnoticed. It starts spreading, until it gets noticed. This time you got hit, sorry for that. But that's how it goes. Many of us have been in similar situations before.
We need to fix this. I will not have yet another such file added.
Dear Sandeep,
do you happen to have this on your to-do list?
For reference, here is what I complained about: http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/86504/focus=86664
Best regards,
Wolfgang Denk
participants (2)
-
Alexey Zaytsev
-
Wolfgang Denk