From edf567a0cdca955a2be875df348b939a2d5b5b58 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 14 May 2014 15:01:02 +0200 Subject: [PATCH] bios: fix boot for or1k --- software/bios/boot-helper-lm32.S | 6 ------ software/bios/boot-helper-or1k.S | 8 +------- software/bios/boot.c | 1 + 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/software/bios/boot-helper-lm32.S b/software/bios/boot-helper-lm32.S index d668f70f0..bf3765c0d 100644 --- 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 ce775e8b1..bb37749e2 100644 --- 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 5ba3de79d..80cefdb7a 100644 --- 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); }