Pull request: u-boot-imx
Hi Albert,
please pull from u-boot-imx. Note: I rebased on u-boot mainline, because I needed some patches for testing that were merged by Wolfgang, and I could not find in u-boot-arm. Let me know if this is a problem for you ;-)
The following changes since commit 3f0675d1a532dbf1fd906103e4b61a6fb842c257:
Merge branch 'marek.vasut at gmail.com' ofgit://git.denx.de/u-boot-staging (2012-04-09 21:34:27 +0200)
are available in the git repository at:
git://www.denx.de/git/u-boot-imx.git master
Anatolij Gustschin (1):
ARM1136: add cache flush and invalidate operations
Eric Nelson (3):
i.MX6: define CACHELINE_SIZE
i.MX6: implement enable_caches()
i.MX6: mx6qsabrelite: add cache commands if cache is enabled
Fabio Estevam (4):
mx28: Split the README into a common part and a m28 specific part
mx28evk: Add a README file
mx6qsabrelite: Add boot switch setting information into the README
mx6qsabrelite: Fix the serial console port
Marek Vasut (4):
i.MX28: Fix initial stack pointer position i.MX28: Allow coexistence of PIO and DMA mode for SD/MMC
DMA: Split the APBH DMA init into block and channel init
M28: Pull out CONFIG_APBH_DMA so it's always enabled
Stefano Babic (7):
ARM: 926ejs: use debug() for misaligned addresses
mx35: flea3: fix when cache functions are linked
mx35: mx35pdk: fix when cache functions are linked
MX31: mx31pdk: drop enable_caches from board file
ARM: add u-boot.imx as target for i.MX SOCs
ARM1136: MX35: Make asm routines volatile in cache ops
MX35: mx35pdk: wrong board revision
Troy Kisky (1):
MX53: DDR: Fix ZQHWCTRL field TZQ_CS
Vikram Narayanan (4):
imx: Remove unneeded/repititive definitions from imx headers
imx: Add GPIO_TO_PORT macro in the mxc_gpio driver
imx: Use GPIO_TO_PORT macro in the gpio driver instead of (gpio >> 5)
imx: Return gpio_set_value in gpio_direction_output
arch/arm/cpu/arm1136/cpu.c | 103 ++++++++++++- arch/arm/cpu/arm926ejs/cache.c | 2 +- arch/arm/cpu/arm926ejs/mx28/mx28.c | 6 + arch/arm/cpu/armv7/config.mk | 3 + arch/arm/cpu/armv7/mx6/soc.c | 8 + arch/arm/include/asm/arch-mx28/dma.h | 4 +- arch/arm/include/asm/arch-mx35/mx35_pins.h | 2 - arch/arm/include/asm/arch-mx5/mx5x_pins.h | 2 - arch/arm/include/asm/arch-mx6/imx-regs.h | 4 +- board/freescale/mx31pdk/mx31pdk.c | 8 - board/freescale/mx35pdk/mx35pdk.c | 11 -- board/freescale/mx53ard/imximage_dd3.cfg | 2 +- board/freescale/mx53evk/imximage.cfg | 2 +- board/freescale/mx53loco/imximage.cfg | 2 +- board/freescale/mx53smd/imximage.cfg | 2 +- doc/README.m28 | 219 +-------------------------- doc/README.mx28_common | 226 ++++++++++++++++++++++++++++ doc/README.mx28evk | 29 ++++ doc/README.mx6qsabrelite | 3 +- drivers/dma/apbh_dma.c | 38 ++--- drivers/gpio/mxc_gpio.c | 12 +- drivers/mmc/mxsmmc.c | 53 +++++++- drivers/mtd/nand/mxs_nand.c | 11 +- include/configs/flea3.h | 2 + include/configs/m28evk.h | 8 +- include/configs/mx28evk.h | 2 +- include/configs/mx35pdk.h | 3 +- include/configs/mx6qarm2.h | 2 + include/configs/mx6qsabrelite.h | 8 +- 29 files changed, 492 insertions(+), 285 deletions(-) create mode 100644 doc/README.mx28_common create mode 100644 doc/README.mx28evk
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
Hi Stefano,
Le 11/04/2012 16:22, Stefano Babic a ?crit :
Quoted 85 lines
Hi Albert,
please pull from u-boot-imx. Note: I rebased on u-boot mainline, because I needed some patches for testing that were merged by Wolfgang, and I could not find in u-boot-arm. Let me know if this is a problem for you ;-)
The following changes since commit
3f0675d1a532dbf1fd906103e4b61a6fb842c257:Merge branch 'marek.vasut at gmail.com' of
git://git.denx.de/u-boot-staging(2012-04-09 21:34:27 +0200)are available in the git repository at:
git://www.denx.de/git/u-boot-imx.gitmasterAnatolij Gustschin (1):
ARM1136: add cache flush and invalidate operationsEric Nelson (3):
i.MX6: defineCACHELINE_SIZE
i.MX6: implementenable_caches()
i.MX6: mx6qsabrelite: add cache commands if cache is enabledFabio Estevam (4):
mx28: Split the README into a common part and a m28 specific part
mx28evk: Add a README file
mx6qsabrelite: Add boot switch setting information into the README
mx6qsabrelite: Fix the serial console portMarek Vasut (4):
i.MX28: Fix initial stack pointer position i.MX28: Allow coexistence of PIO and DMA mode for SD/MMC
DMA: Split the APBH DMA init into block and channel init
M28: Pull outCONFIG_APBH_DMAso it's always enabledStefano Babic (7):
ARM: 926ejs: usedebug()for misaligned addresses
mx35: flea3: fix when cache functions are linked
mx35: mx35pdk: fix when cache functions are linked
MX31: mx31pdk: dropenable_cachesfrom board file
ARM: add u-boot.imx as target for i.MX SOCs
ARM1136: MX35: Make asm routines volatile in cache ops
MX35: mx35pdk: wrong board revisionTroy Kisky (1):
MX53: DDR: Fix ZQHWCTRL fieldTZQ_CSVikram Narayanan (4):
imx: Remove unneeded/repititive definitions from imx headers
imx: AddGPIO_TO_PORTmacro in themxc_gpiodriver
imx: UseGPIO_TO_PORTmacro in the gpio driver instead of (gpio>> 5)
imx: Returngpio_set_valueingpio_direction_outputarch/arm/cpu/arm1136/cpu.c | 103 ++++++++++++- arch/arm/cpu/arm926ejs/cache.c | 2 +- arch/arm/cpu/arm926ejs/mx28/mx28.c | 6 + arch/arm/cpu/armv7/config.mk | 3 + arch/arm/cpu/armv7/mx6/soc.c | 8 + arch/arm/include/asm/arch-mx28/dma.h | 4 +- arch/arm/include/asm/arch-mx35/mx35_pins.h | 2 - arch/arm/include/asm/arch-mx5/mx5x_pins.h | 2 - arch/arm/include/asm/arch-mx6/imx-regs.h | 4 +- board/freescale/mx31pdk/mx31pdk.c | 8 - board/freescale/mx35pdk/mx35pdk.c | 11 -- board/freescale/mx53ard/imximage_dd3.cfg | 2 +- board/freescale/mx53evk/imximage.cfg | 2 +- board/freescale/mx53loco/imximage.cfg | 2 +- board/freescale/mx53smd/imximage.cfg | 2 +- doc/README.m28 | 219 +-------------------------- doc/README.mx28_common | 226 ++++++++++++++++++++++++++++ doc/README.mx28evk | 29 ++++ doc/README.mx6qsabrelite | 3 +- drivers/dma/apbh_dma.c | 38 ++--- drivers/gpio/mxc_gpio.c | 12 +- drivers/mmc/mxsmmc.c | 53 +++++++- drivers/mtd/nand/mxs_nand.c | 11 +- include/configs/flea3.h | 2 + include/configs/m28evk.h | 8 +- include/configs/mx28evk.h | 2 +- include/configs/mx35pdk.h | 3 +- include/configs/mx6qarm2.h | 2 + include/configs/mx6qsabrelite.h | 8 +- 29 files changed, 492 insertions(+), 285 deletions(-)
Quoted 5 lines
create mode 100644 doc/README.mx28_common
create mode 100644 doc/README.mx28evkStefano
Applied to u-boot-arm/master, thanks!
Amicalement,
Signature · 1 line
Albert.