← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-linaro-u8500/precise

« back to all changes in this revision

Viewing changes to arch/arm/boot/compressed/head.S

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/boot/compressed/head.S
21
21
 
22
22
#if defined(CONFIG_DEBUG_ICEDCC)
23
23
 
24
 
#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K)
25
 
                .macro  loadsp, rb, tmp
26
 
                .endm
27
 
                .macro  writeb, ch, rb
28
 
                mcr     p14, 0, \ch, c0, c5, 0
29
 
                .endm
30
 
#elif defined(CONFIG_CPU_V7)
31
 
                .macro  loadsp, rb, tmp
32
 
                .endm
33
 
                .macro  writeb, ch, rb
34
 
wait:           mrc     p14, 0, pc, c0, c1, 0
35
 
                bcs     wait
 
24
#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7)
 
25
                .macro  loadsp, rb, tmp
 
26
                .endm
 
27
                .macro  writeb, ch, rb
36
28
                mcr     p14, 0, \ch, c0, c5, 0
37
29
                .endm
38
30
#elif defined(CONFIG_CPU_XSCALE)