diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-11-16 14:21:10 -0500 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-11-16 14:21:10 -0500 |
| commit | 9a2ab3f1fa01a146a395197153af0ae586e6a682 (patch) | |
| tree | 65c6ead4de0b1bd53e7a4715ecf9dc4bf209fe47 /arch/arm/kernel/debug.S | |
| parent | 2658ef15b27e0fb166f4b7b997b027a223cd0793 (diff) | |
| parent | e5c5f2adeb370559f4b221d57214db85858b786a (diff) | |
Merge remote-tracking branch 'korg_arm-soc/devel/debug_ll_init' into for-3.8/single-zimage
Diffstat (limited to 'arch/arm/kernel/debug.S')
| -rw-r--r-- | arch/arm/kernel/debug.S | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index 66f711b2e0e8..6809200c31fb 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S | |||
| @@ -100,6 +100,13 @@ ENTRY(printch) | |||
| 100 | b 1b | 100 | b 1b |
| 101 | ENDPROC(printch) | 101 | ENDPROC(printch) |
| 102 | 102 | ||
| 103 | ENTRY(debug_ll_addr) | ||
| 104 | addruart r2, r3, ip | ||
| 105 | str r2, [r0] | ||
| 106 | str r3, [r1] | ||
| 107 | mov pc, lr | ||
| 108 | ENDPROC(debug_ll_addr) | ||
| 109 | |||
| 103 | #else | 110 | #else |
| 104 | 111 | ||
| 105 | ENTRY(printascii) | 112 | ENTRY(printascii) |
| @@ -119,4 +126,11 @@ ENTRY(printch) | |||
| 119 | mov pc, lr | 126 | mov pc, lr |
| 120 | ENDPROC(printch) | 127 | ENDPROC(printch) |
| 121 | 128 | ||
| 129 | ENTRY(debug_ll_addr) | ||
| 130 | mov r2, #0 | ||
| 131 | str r2, [r0] | ||
| 132 | str r2, [r1] | ||
| 133 | mov pc, lr | ||
| 134 | ENDPROC(debug_ll_addr) | ||
| 135 | |||
| 122 | #endif | 136 | #endif |