git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
xtensa: make bootparam parsing optional
[sfrench/cifs-2.6.git]
/
arch
/
xtensa
/
boot
/
boot-elf
/
bootstrap.S
diff --git
a/arch/xtensa/boot/boot-elf/bootstrap.S
b/arch/xtensa/boot/boot-elf/bootstrap.S
index b6aa85328ac0ccc05936bcf9b477499e7bbbbfe7..718c99dcfe7a9557c2814a1ef499dad2dc737ac8 100644
(file)
--- a/
arch/xtensa/boot/boot-elf/bootstrap.S
+++ b/
arch/xtensa/boot/boot-elf/bootstrap.S
@@
-42,7
+42,10
@@
RomInitAddr:
.word KERNELOFFSET
#endif
RomBootParam:
- .word _bootparam
+#ifndef CONFIG_PARSE_BOOTPARAM
+ .word 0
+#else
+ .word _bootparam
_bootparam:
.short BP_TAG_FIRST
.short 4
@@
-50,6
+53,7
@@
_bootparam:
.short BP_TAG_LAST
.short 0
.long 0
+#endif
.align 4
_SetupMMU: