aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa/boot/boot-redboot
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2012-09-16 21:44:50 -0400
committerChris Zankel <chris@zankel.net>2012-10-03 18:13:09 -0400
commit9ad79b58510b2845e5ffa77654596d7184a827ab (patch)
tree77286849c1f91a94cff1f352772c53920950c17a /arch/xtensa/boot/boot-redboot
parentb973b4c91be8f7de0531cf8ca2df41021d8f39b3 (diff)
xtensa: drop CONFIG_EMBEDDED_RAMDISK
Remove Kconfig entries, boot subdirectory, dependencies from other boot-* Makefiles, and sections from ld scripts. Remove stale redboot code that used to pass initrd addresses in a3 and a4 to _start. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa/boot/boot-redboot')
-rw-r--r--arch/xtensa/boot/boot-redboot/boot.ld7
-rw-r--r--arch/xtensa/boot/boot-redboot/bootstrap.S10
2 files changed, 0 insertions, 17 deletions
diff --git a/arch/xtensa/boot/boot-redboot/boot.ld b/arch/xtensa/boot/boot-redboot/boot.ld
index 774db20d11f7..5bbcaf9e830d 100644
--- a/arch/xtensa/boot/boot-redboot/boot.ld
+++ b/arch/xtensa/boot/boot-redboot/boot.ld
@@ -31,13 +31,6 @@ SECTIONS
31 31
32 __reloc_end = . ; 32 __reloc_end = . ;
33 33
34 .initrd ALIGN(0x10) :
35 {
36 boot_initrd_start = . ;
37 *(.initrd)
38 boot_initrd_end = .;
39 }
40
41 . = ALIGN(0x10); 34 . = ALIGN(0x10);
42 __image_load = . ; 35 __image_load = . ;
43 .image 0xd0001000: AT(__image_load) 36 .image 0xd0001000: AT(__image_load)
diff --git a/arch/xtensa/boot/boot-redboot/bootstrap.S b/arch/xtensa/boot/boot-redboot/bootstrap.S
index 5582e8cfac8f..4c316cd28a54 100644
--- a/arch/xtensa/boot/boot-redboot/bootstrap.S
+++ b/arch/xtensa/boot/boot-redboot/bootstrap.S
@@ -226,17 +226,7 @@ _reloc:
226 226
227 isync 227 isync
228 228
229 movi a5, __start
230 movi a3, boot_initrd_start
231 movi a4, boot_initrd_end
232 sub a3, a3, a5
233 sub a4, a4, a5
234 add a3, a0, a3
235 add a4, a0, a4
236
237 # a2 Boot parameter list 229 # a2 Boot parameter list
238 # a3 initrd_start (virtual load address)
239 # a4 initrd_end (virtual load address)
240 230
241 movi a0, _image_start 231 movi a0, _image_start
242 jx a0 232 jx a0