[U-Boot] Pull request: u-boot-arm/master to u-boot/master

Albert ARIBAUD
2012-10-12T05:36:20Z

Hi Tom,

On Thu, 11 Oct 2012 11:45:35 -0700, Tom Rini <trini@ti.com> wrote:

> On Thu, Oct 11, 2012 at 06:51:30PM +0200, Albert ARIBAUD wrote:
>
> > Hi Tom,
> >
> > The following changes since commit
> > 28e5ac2d974547bde0c72aa0c1d66fd22c6ef3ad:
> >
> > arm: armv7: temporarily set -mno-unaligned-access (2012-10-05
> > 21:24:22 +0200)
> >
> > are available in the git repository at:
> >
> > git://git.denx.de/u-boot-arm master
> >
> > for you to fetch changes up to 9b5dba537473578153961ee96ed23e37e1fde3f7:
> >
> > exynos4: universal_C210: use software SPI (2012-10-10 20:37:39 +0900)
> >
> > ----------------------------------------------------------------
> > Chander Kashyap (1):
> > Exynos5250: Enable PXE Support
> >
> > Piotr Wilczek (9):
> > arm:exynos4:trats: Correct SDRAM configuration for trats
> > arm:exynos4:trats: Fix SDRAM size
> > arm:exynos4:pinmux: Modify the gpio function for mmc
> > arm:exynos4:trats: Use pinmux for mmc configuration
> > arm:exynos4:universal: Use pinmux for mmc configuration
> > arm:exynos4:universal: Eliminated low level init
> > arm: trats: Power down core 1
> > drivers: spi: modify soft spi driver
> > exynos4: universal_C210: use software SPI
> >
> > ??ukasz Majewski (1):
> > gpio:fix: Proper handling of GPIO subsystem parts at Samsung
> > devices
> >
> > arch/arm/cpu/armv7/exynos/pinmux.c | 58 ++++
> > arch/arm/include/asm/arch-exynos/gpio.h | 19 ++
> > arch/arm/include/asm/arch-exynos/periph.h | 1 +
> > arch/arm/include/asm/arch-s5pc1xx/gpio.h | 7 +-
> > board/samsung/trats/trats.c | 80 ++----
> > board/samsung/universal_c210/Makefile | 1 -
> > board/samsung/universal_c210/lowlevel_init.S | 395
> > --------------------------
> > board/samsung/universal_c210/universal.c | 116 ++++----
> > drivers/gpio/s5p_gpio.c | 6 +-
> > drivers/spi/soft_spi.c | 3 +
> > include/configs/s5pc210_universal.h | 21 ++
> > include/configs/smdk5250.h | 6 +
> > include/configs/trats.h | 17 +- 13 files
> > changed, 209 insertions(+), 521 deletions(-) delete mode 100644
> > board/samsung/universal_c210/lowlevel_init.S
>
> NAK, sorry. We have a two problems now:
> - On PowerPC we have <asm/gpio.h> which takes <asm/arch/gpio.h> but
> boards which do use soft_spi.c and now fail (taihu sacsng)
> - zipitz2 has the same problem (cc'ing Marek)

Now that's very weird. I *know* I had issues with zipitz2 among others
when I git am'd the commits while the git server was down; then when
I could fetch u-boot/samsung I re-tested u-boot-samsung/master in
itself then merged into u-boot-arm/master, and I *know* those ran
fine... And now they don't. Something's fishy in my git repo. :(

In any case: NAK fully understood and agreed upon, in my capacity as a
custodian, back-ported into ARM repo, i.e. I've rolled back ARM master
to where it was before the (ff) merge.

Also, actually CC:ing Marek, as well as Minkyu.

Amicalement,
--
Albert.