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

Hi Wolfgang,
The following changes since commit 9623c158f6a5150a21c25026bfba79e7ff7912f5:
Merge branch 'master' of git://git.denx.de/u-boot-arm (2011-06-23 15:37:33 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-arm.git master
Aneesh V (9): arm: make default implementation of cache_flush() weakly linked armv7: cache maintenance operations for armv7 armv7: rename cache related CONFIG flags armv7: integrate cache maintenance support arm: minor fixes for cache and mmu handling armv7: add PL310 support to u-boot armv7: adapt omap4 to the new cache maintenance framework armv7: adapt omap3 to the new cache maintenance framework armv7: adapt s5pc1xx to the new cache maintenance framework
README | 11 + arch/arm/cpu/arm1136/start.S | 4 +- arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/cache_v7.c | 394 +++++++++++++++++++++++++ arch/arm/cpu/armv7/cpu.c | 50 ++-- arch/arm/cpu/armv7/omap3/Makefile | 1 - arch/arm/cpu/armv7/omap3/board.c | 136 ++++++++-- arch/arm/cpu/armv7/omap3/cache.S | 263 ----------------- arch/arm/cpu/armv7/omap3/lowlevel_init.S | 32 ++ arch/arm/cpu/armv7/omap4/board.c | 12 + arch/arm/cpu/armv7/omap4/lowlevel_init.S | 9 + arch/arm/cpu/armv7/s5pc1xx/cache.S | 88 +----- arch/arm/cpu/armv7/start.S | 18 +- arch/arm/include/asm/arch-omap3/omap3.h | 20 ++ arch/arm/include/asm/arch-omap3/sys_proto.h | 10 +- arch/arm/include/asm/arch-omap4/sys_proto.h | 2 +- arch/arm/include/asm/arch-s5pc1xx/sys_proto.h | 3 - arch/arm/include/asm/armv7.h | 67 +++++ arch/arm/include/asm/global_data.h | 2 +- arch/arm/include/asm/pl310.h | 73 +++++ arch/arm/include/asm/utils.h | 56 ++++ arch/arm/lib/Makefile | 3 +- arch/arm/lib/board.c | 8 +- arch/arm/lib/cache-cp15.c | 22 +- arch/arm/lib/cache-pl310.c | 115 +++++++ arch/arm/lib/cache.c | 20 +- board/armltd/integrator/split_by_variant.sh | 8 +- common/cmd_bdinfo.c | 2 +- include/common.h | 5 +- include/configs/B2.h | 3 +- include/configs/assabet.h | 2 +- include/configs/ca9x4_ct_vxp.h | 2 +- include/configs/cerf250.h | 2 +- include/configs/cradle.h | 2 +- include/configs/csb226.h | 2 +- include/configs/dnp1110.h | 2 +- include/configs/efikamx.h | 2 +- include/configs/evb4510.h | 3 +- include/configs/gcplus.h | 2 +- include/configs/innokom.h | 2 +- include/configs/jornada.h | 2 +- include/configs/lart.h | 2 +- include/configs/lubbock.h | 2 +- include/configs/mx51evk.h | 2 +- include/configs/mx53evk.h | 2 +- include/configs/omap4_panda.h | 8 +- include/configs/omap4_sdp4430.h | 8 +- include/configs/pleb2.h | 2 +- include/configs/pxa255_idp.h | 2 +- include/configs/s5pc210_universal.h | 2 +- include/configs/shannon.h | 2 +- include/configs/tegra2-common.h | 2 +- include/configs/trizepsiv.h | 2 +- include/configs/vision2.h | 2 +- include/configs/xaeniax.h | 2 +- include/configs/xm250.h | 2 +- include/configs/zylonite.h | 2 +- 57 files changed, 1048 insertions(+), 458 deletions(-) create mode 100644 arch/arm/cpu/armv7/cache_v7.c delete mode 100644 arch/arm/cpu/armv7/omap3/cache.S create mode 100644 arch/arm/include/asm/armv7.h create mode 100644 arch/arm/include/asm/pl310.h create mode 100644 arch/arm/include/asm/utils.h create mode 100644 arch/arm/lib/cache-pl310.c
Amicalement,

Hi Albert,
On 06/28/11 08:39, Albert ARIBAUD wrote:
Hi Wolfgang,
The following changes since commit 9623c158f6a5150a21c25026bfba79e7ff7912f5:
Merge branch 'master' of git://git.denx.de/u-boot-arm (2011-06-23 15:37:33 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-arm.git master
Aneesh V (9): arm: make default implementation of cache_flush() weakly linked armv7: cache maintenance operations for armv7 armv7: rename cache related CONFIG flags armv7: integrate cache maintenance support arm: minor fixes for cache and mmu handling armv7: add PL310 support to u-boot armv7: adapt omap4 to the new cache maintenance framework armv7: adapt omap3 to the new cache maintenance framework armv7: adapt s5pc1xx to the new cache maintenance framework
Can these two also be added for 2011.06:
OMAP[34]: fix broken timer: http://patchwork.ozlabs.org/patch/76803/
arm: omap2: apollon: fix broken build: http://patchwork.ozlabs.org/patch/101877/
?
Thanks

On 06/28/11 12:52, Igor Grinberg wrote:
Hi Albert,
On 06/28/11 08:39, Albert ARIBAUD wrote:
Hi Wolfgang,
The following changes since commit 9623c158f6a5150a21c25026bfba79e7ff7912f5:
Merge branch 'master' of git://git.denx.de/u-boot-arm (2011-06-23 15:37:33 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-arm.git master
Aneesh V (9): arm: make default implementation of cache_flush() weakly linked armv7: cache maintenance operations for armv7 armv7: rename cache related CONFIG flags armv7: integrate cache maintenance support arm: minor fixes for cache and mmu handling armv7: add PL310 support to u-boot armv7: adapt omap4 to the new cache maintenance framework armv7: adapt omap3 to the new cache maintenance framework armv7: adapt s5pc1xx to the new cache maintenance framework
Can these two also be added for 2011.06:
OMAP[34]: fix broken timer: http://patchwork.ozlabs.org/patch/76803/
arm: omap2: apollon: fix broken build: http://patchwork.ozlabs.org/patch/101877/
?
Errr, I've just seen 2011.06 already released a couple of hours ago... I guess it is too late now...
Still, I would be glad if those get into this merge window...
Thanks anyway

Hi Igor,
Le 28/06/2011 12:20, Igor Grinberg a écrit :
On 06/28/11 12:52, Igor Grinberg wrote:
Hi Albert,
On 06/28/11 08:39, Albert ARIBAUD wrote:
Hi Wolfgang,
The following changes since commit 9623c158f6a5150a21c25026bfba79e7ff7912f5:
Merge branch 'master' of git://git.denx.de/u-boot-arm (2011-06-23
15:37:33 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-arm.git master
Aneesh V (9): arm: make default implementation of cache_flush() weakly linked armv7: cache maintenance operations for armv7 armv7: rename cache related CONFIG flags armv7: integrate cache maintenance support arm: minor fixes for cache and mmu handling armv7: add PL310 support to u-boot armv7: adapt omap4 to the new cache maintenance framework armv7: adapt omap3 to the new cache maintenance framework armv7: adapt s5pc1xx to the new cache maintenance framework
Can these two also be added for 2011.06:
OMAP[34]: fix broken timer: http://patchwork.ozlabs.org/patch/76803/
arm: omap2: apollon: fix broken build: http://patchwork.ozlabs.org/patch/101877/
?
Errr, I've just seen 2011.06 already released a couple of hours ago... I guess it is too late now...
Still, I would be glad if those get into this merge window...
Of course I'll add them into u-boot-arm/master along with the current content of my 'next' branch.
Thanks anyway
Amicalement,

Dear Igor Grinberg,
In message 4E09A476.3010304@compulab.co.il you wrote:
Can these two also be added for 2011.06:
No, they cannot. v2011.06 was released yesterday, according to schedule. I just need to write the summary message...
Best regards,
Wolfgang Denk

Hi Wolfgang,
Le 28/06/2011 07:39, Albert ARIBAUD a écrit :
Hi Wolfgang,
The following changes since commit 9623c158f6a5150a21c25026bfba79e7ff7912f5:
Merge branch 'master' of git://git.denx.de/u-boot-arm (2011-06-23
15:37:33 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-arm.git master
Aneesh V (9):
Please disregard this pull request. As it came too late for 2011-06, I'll re-issue it after I have merged in my current 'next' branch and the patches Igor has mentioned, as soon as the merge window is announced.
Amicalement,

Dear Albert,
In message 4E0AC19D.9070606@aribaud.net you wrote:
Please disregard this pull request. As it came too late for 2011-06,
OK.
I'll re-issue it after I have merged in my current 'next' branch and the patches Igor has mentioned, as soon as the merge window is announced.
The merge window is open.
Best regards,
Wolfgang Denk
participants (3)
-
Albert ARIBAUD
-
Igor Grinberg
-
Wolfgang Denk