bios: fix boot for or1k

diff --git a/software/bios/boot-helper-lm32.S b/software/bios/boot-helper-lm32.S
index d668f70f0c1f535d52871e4bd540822fa1dc28fd..bf3765c0d2d41023007592d145d92d2ae2375757 100644 (file)
--- a/software/bios/boot-helper-lm32.S
+++ b/software/bios/boot-helper-lm32.S
@@ -1,10 +1,4 @@
 .section    .text, "ax", @progbits
 .global     boot_helper
 boot_helper:
-       /* Invalidate instruction cache */
-       wcsr ICC, r0
-       nop
-       nop
-       nop
-       nop
        call r4

diff --git a/software/bios/boot-helper-or1k.S b/software/bios/boot-helper-or1k.S
index ce775e8b1ada896e921a15cc8fb2627eb9a5e576..bb37749e22f335befe6a7c29543435714057b72b 100644 (file)
--- a/software/bios/boot-helper-or1k.S
+++ b/software/bios/boot-helper-or1k.S
@@ -1,10 +1,4 @@
 .section    .text, "ax", @progbits
 .global     boot_helper
 boot_helper:
-       /* Invalidate instruction cache */
-       /* FIXME: wcsr ICC, r0 */
-       l.nop
-       l.nop
-       l.nop
-       l.nop
-       l.jr r7
+       l.jr r6

diff --git a/software/bios/boot.c b/software/bios/boot.c
index 5ba3de79d22f5ddfa9fee1062360d2ef6ccb3ef7..80cefdb7ab623e33c984880cafb2cafb407c46d4 100644 (file)
--- a/software/bios/boot.c
+++ b/software/bios/boot.c
@@ -22,6 +22,7 @@ static void __attribute__((noreturn)) boot(unsigned int r1, unsigned int r2, uns
        uart_sync();
        irq_setmask(0);
        irq_setie(0);
+       flush_cpu_icache();
        boot_helper(r1, r2, r3, addr);
        while(1);
 }