| Message ID | 4F8C3246.30708@aribaud.net |
|---|---|
| State | Superseded |
| Delegated to: | Wolfgang Denk |
| Headers | show |
Dear Albert ARIBAUD, > Hi Wolfgang, > > The following changes since commit > 3f0675d1a532dbf1fd906103e4b61a6fb842c257: You're missing those two ARM926 cache patches I assigned to you in patchwork. Can you please check them and amend them to this pull rq ? Thanks! > > Merge branch 'marek.vasut@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://git.denx.de/u-boot-arm master > > Anatolij Gustschin (1): > ARM1136: add cache flush and invalidate operations > > Bernhard Walle (2): > tricorder: Add UBIFS > tricorder: Load kernel from ubifs > > 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 > > Igor Grinberg (1): > cm-t35: fix Ethernet reset timing > > Joel Fernandes (1): > BeagleBoard: Remove userbutton command and use gpio command instead > > 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 > > Tom Rini (2): > OMAP: Move omap1510inn to Unmaintained / Orphaned > hawkboard: Add CONFIG_SPL_LIBGENERIC_SUPPORT > > 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 > > MAINTAINERS | 7 +- > 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/cm_t35/cm_t35.c | 11 +- > 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 +- > board/ti/beagle/beagle.c | 55 ------- > 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/hawkboard.h | 1 + > 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 +- > include/configs/omap3_beagle.h | 11 +- > include/configs/tricorder.h | 15 ++- > 35 files changed, 522 insertions(+), 355 deletions(-) > create mode 100644 doc/README.mx28_common > create mode 100644 doc/README.mx28evk > > Amicalement,
Hi Marek, Le 16/04/2012 20:18, Marek Vasut a écrit : > Dear Albert ARIBAUD, > >> Hi Wolfgang, >> >> The following changes since commit >> 3f0675d1a532dbf1fd906103e4b61a6fb842c257: > > You're missing those two ARM926 cache patches I assigned to you in patchwork. > Can you please check them and amend them to this pull rq ? > > Thanks! All right. Wolfgang, hold on; I'll send out an amended request. Amicalement,
Le 16/04/2012 20:18, Marek Vasut a écrit : > Dear Albert ARIBAUD, > >> Hi Wolfgang, >> >> The following changes since commit >> 3f0675d1a532dbf1fd906103e4b61a6fb842c257: > > You're missing those two ARM926 cache patches I assigned to you in patchwork. > Can you please check them and amend them to this pull rq ? > > Thanks! Cc:ing Stefano... Stefano, didn't you want to submit a patch too? I haven't seen it in your pull req -- but I may have missed it. Amicalement,
On 16/04/2012 22:15, Albert ARIBAUD wrote: > Le 16/04/2012 20:18, Marek Vasut a écrit : >> Dear Albert ARIBAUD, >> Hi Albert, >>> Hi Wolfgang, >>> >>> The following changes since commit >>> 3f0675d1a532dbf1fd906103e4b61a6fb842c257: >> >> You're missing those two ARM926 cache patches I assigned to you in >> patchwork. >> Can you please check them and amend them to this pull rq ? >> >> Thanks! > > Cc:ing Stefano... > > Stefano, didn't you want to submit a patch too? I haven't seen it in > your pull req -- but I may have missed it. In the last pull request I merged the following patches regarding cache on i.MX: cc305ea2a60f44b i.MX6: arm2: Add AXI cache and Qos setting f2a747617be0b4 ARM1136: MX35: Make asm routines volatile in cache ops d363c599aa86d4 MX31: mx31pdk: drop enable_caches from board file 26adc4524fbcaa mx35: mx35pdk: fix when cache functions are linked 32c3fbf76f9807 mx35: flea3: fix when cache functions are linked bff563e41904c0 ARM: 926ejs: use debug() for misaligned addresses 86504bb17d277 ARM1136: add cache flush and invalidate operations I have still one patch as a fix I applied yesterday for a specific board. It will be not bad if you can merge it for the release. I have not other pending patches, if I have not missed anything ;-) For this patch I'll send a pull request. Thanks, Stefano
Hi Wolfgang, The following changes since commit 3f0675d1a532dbf1fd906103e4b61a6fb842c257: Merge branch 'marek.vasut@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://git.denx.de/u-boot-arm master Anatolij Gustschin (1): ARM1136: add cache flush and invalidate operations Bernhard Walle (2): tricorder: Add UBIFS tricorder: Load kernel from ubifs 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 Igor Grinberg (1): cm-t35: fix Ethernet reset timing Joel Fernandes (1): BeagleBoard: Remove userbutton command and use gpio command instead 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 Tom Rini (2): OMAP: Move omap1510inn to Unmaintained / Orphaned hawkboard: Add CONFIG_SPL_LIBGENERIC_SUPPORT 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 MAINTAINERS | 7 +- 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/cm_t35/cm_t35.c | 11 +- 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 +- board/ti/beagle/beagle.c | 55 ------- 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/hawkboard.h | 1 + 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 +- include/configs/omap3_beagle.h | 11 +- include/configs/tricorder.h | 15 ++- 35 files changed, 522 insertions(+), 355 deletions(-) create mode 100644 doc/README.mx28_common create mode 100644 doc/README.mx28evk Amicalement,