Merge branch 'master' of git://git.denx.de/u-boot-microblaze

diff --git a/arch/microblaze/cpu/cache.c b/arch/microblaze/cpu/cache.c
index 3b7c4d4f7f9a61b79a0dc1cde5b778e5aab12b3d..d258a6938228e499c508845d3a985e0ed6e2f99e 100644 (file)
--- a/arch/microblaze/cpu/cache.c
+++ b/arch/microblaze/cpu/cache.c
@@ -50,6 +50,8 @@ void  icache_enable (void) {
 }
 
 void   icache_disable(void) {
+       /* we are not generate ICACHE size -> flush whole cache */
+       flush_cache(0, 32768);
        MSRCLR(0x20);
 }
 
@@ -58,5 +60,31 @@ void dcache_enable (void) {
 }
 
 void   dcache_disable(void) {
+#ifdef XILINX_USE_DCACHE
+#ifdef XILINX_DCACHE_BYTE_SIZE
+       flush_cache(0, XILINX_DCACHE_BYTE_SIZE);
+#else
+#warning please rebuild BSPs and update configuration
+       flush_cache(0, 32768);
+#endif
+#endif
        MSRCLR(0x80);
 }
+
+void flush_cache (ulong addr, ulong size)
+{
+       int i;
+       for (i = 0; i < size; i += 4)
+               asm volatile (
+#ifdef CONFIG_ICACHE
+                               "wic    %0, r0;"
+#endif
+                               "nop;"
+#ifdef CONFIG_DCACHE
+                               "wdc.flush      %0, r0;"
+#endif
+                               "nop;"
+                               :
+                               : "r" (addr + i)
+                               : "memory");
+}

diff --git a/arch/microblaze/cpu/interrupts.c b/arch/microblaze/cpu/interrupts.c
index a6021c99c3b2ab6a563fdfb1acc14b2ce6ed3d30..7a9d022eeeffff2b45bd4af664bf3b9f61f69d68 100644 (file)
--- a/arch/microblaze/cpu/interrupts.c
+++ b/arch/microblaze/cpu/interrupts.c
@@ -46,13 +46,6 @@ int disable_interrupts (void)
 }
 
 #ifdef CONFIG_SYS_INTC_0
-#ifdef CONFIG_SYS_TIMER_0
-extern void timer_init (void);
-#endif
-#ifdef CONFIG_SYS_FSL_2
-extern void fsl_init2 (void);
-#endif
-
 
 static struct irq_action vecs[CONFIG_SYS_INTC_0_NUM];
 
@@ -142,20 +135,14 @@ int interrupts_init (void)
        }
        /* initialize intc controller */
        intc_init ();
-#ifdef CONFIG_SYS_TIMER_0
-       timer_init ();
-#endif
-#ifdef CONFIG_SYS_FSL_2
-       fsl_init2 ();
-#endif
        enable_interrupts ();
        return 0;
 }
 
 void interrupt_handler (void)
 {
-       int irqs = (intc->isr & intc->ier);     /* find active interrupt */
-       int i = 1;
+       int irqs = intc->ivr;   /* find active interrupt */
+       int mask = 1;
 #ifdef DEBUG_INT
        int value;
        printf ("INTC isr %x, ier %x, iar %x, mer %x\n", intc->isr, intc->ier,
@@ -163,23 +150,17 @@ void interrupt_handler (void)
        R14(value);
        printf ("Interrupt handler on %x line, r14 %x\n", irqs, value);
 #endif
-       struct irq_action *act = vecs;
-       while (irqs) {
-               if (irqs & 1) {
+       struct irq_action *act = vecs + irqs;
+
+       intc->iar = mask << irqs;
+
 #ifdef DEBUG_INT
-                       printf
-                           ("Jumping to interrupt handler rutine addr %x,count %x,arg %x\n",
-                            act->handler, act->count, act->arg);
+       printf
+           ("Jumping to interrupt handler rutine addr %x,count %x,arg %x\n",
+            act->handler, act->count, act->arg);
 #endif
-                       act->handler (act->arg);
-                       act->count++;
-                       intc->iar = i;
-                       return;
-               }
-               irqs >>= 1;
-               act++;
-               i <<= 1;
-       }
+       act->handler (act->arg);
+       act->count++;
 
 #ifdef DEBUG_INT
        printf ("Dump INTC reg, isr %x, ier %x, iar %x, mer %x\n", intc->isr,

diff --git a/arch/microblaze/cpu/irq.S b/arch/microblaze/cpu/irq.S
index e1fc19046c721ee98e0c332c76506f7431ccef35..47bba36f21f61095a8ff6a9d0d7eef91f4e25b84 100644 (file)
--- a/arch/microblaze/cpu/irq.S
+++ b/arch/microblaze/cpu/irq.S
@@ -27,129 +27,71 @@
        .text
        .global _interrupt_handler
 _interrupt_handler:
-       addi    r1, r1, -4
-       swi     r2, r1, 0
-       addi    r1, r1, -4
-       swi     r3, r1, 0
-       addi    r1, r1, -4
-       swi     r4, r1, 0
-       addi    r1, r1, -4
-       swi     r5, r1, 0
-       addi    r1, r1, -4
-       swi     r6, r1, 0
-       addi    r1, r1, -4
-       swi     r7, r1, 0
-       addi    r1, r1, -4
-       swi     r8, r1, 0
-       addi    r1, r1, -4
-       swi     r9, r1, 0
-       addi    r1, r1, -4
-       swi     r10, r1, 0
-       addi    r1, r1, -4
-       swi     r11, r1, 0
-       addi    r1, r1, -4
-       swi     r12, r1, 0
-       addi    r1, r1, -4
-       swi     r13, r1, 0
-       addi    r1, r1, -4
-       swi     r14, r1, 0
-       addi    r1, r1, -4
-       swi     r15, r1, 0
-       addi    r1, r1, -4
-       swi     r16, r1, 0
-       addi    r1, r1, -4
-       swi     r17, r1, 0
-       addi    r1, r1, -4
-       swi     r18, r1, 0
-       addi    r1, r1, -4
-       swi     r19, r1, 0
-       addi    r1, r1, -4
-       swi     r20, r1, 0
-       addi    r1, r1, -4
-       swi     r21, r1, 0
-       addi    r1, r1, -4
-       swi     r22, r1, 0
-       addi    r1, r1, -4
-       swi     r23, r1, 0
-       addi    r1, r1, -4
-       swi     r24, r1, 0
-       addi    r1, r1, -4
-       swi     r25, r1, 0
-       addi    r1, r1, -4
-       swi     r26, r1, 0
-       addi    r1, r1, -4
-       swi     r27, r1, 0
-       addi    r1, r1, -4
-       swi     r28, r1, 0
-       addi    r1, r1, -4
-       swi     r29, r1, 0
-       addi    r1, r1, -4
-       swi     r30, r1, 0
-       addi    r1, r1, -4
-       swi     r31, r1, 0
+       swi     r2, r1, -4
+       swi     r3, r1, -8
+       swi     r4, r1, -12
+       swi     r5, r1, -16
+       swi     r6, r1, -20
+       swi     r7, r1, -24
+       swi     r8, r1, -28
+       swi     r9, r1, -32
+       swi     r10, r1, -36
+       swi     r11, r1, -40
+       swi     r12, r1, -44
+       swi     r13, r1, -48
+       swi     r14, r1, -52
+       swi     r15, r1, -56
+       swi     r16, r1, -60
+       swi     r17, r1, -64
+       swi     r18, r1, -68
+       swi     r19, r1, -72
+       swi     r20, r1, -76
+       swi     r21, r1, -80
+       swi     r22, r1, -84
+       swi     r23, r1, -88
+       swi     r24, r1, -92
+       swi     r25, r1, -96
+       swi     r26, r1, -100
+       swi     r27, r1, -104
+       swi     r28, r1, -108
+       swi     r29, r1, -112
+       swi     r30, r1, -116
+       swi     r31, r1, -120
+       addik   r1, r1, -124
        brlid   r15, interrupt_handler
        nop
        nop
-       lwi     r31, r1, 0
-       addi    r1, r1, 4
-       lwi     r30, r1, 0
-       addi    r1, r1, 4
-       lwi     r29, r1, 0
-       addi    r1, r1, 4
-       lwi     r28, r1, 0
-       addi    r1, r1, 4
-       lwi     r27, r1, 0
-       addi    r1, r1, 4
-       lwi     r26, r1, 0
-       addi    r1, r1, 4
-       lwi     r25, r1, 0
-       addi    r1, r1, 4
-       lwi     r24, r1, 0
-       addi    r1, r1, 4
-       lwi     r23, r1, 0
-       addi    r1, r1, 4
-       lwi     r22, r1, 0
-       addi    r1, r1, 4
-       lwi     r21, r1, 0
-       addi    r1, r1, 4
-       lwi     r20, r1, 0
-       addi    r1, r1, 4
-       lwi     r19, r1, 0
-       addi    r1, r1, 4
-       lwi     r18, r1, 0
-       addi    r1, r1, 4
-       lwi     r17, r1, 0
-       addi    r1, r1, 4
-       lwi     r16, r1, 0
-       addi    r1, r1, 4
-       lwi     r15, r1, 0
-       addi    r1, r1, 4
-       lwi     r14, r1, 0
-       addi    r1, r1, 4
-       lwi     r13, r1, 0
-       addi    r1, r1, 4
-       lwi     r12, r1, 0
-       addi    r1, r1, 4
-       lwi     r11, r1, 0
-       addi    r1, r1, 4
-       lwi     r10, r1, 0
-       addi    r1, r1, 4
-       lwi     r9, r1, 0
-       addi    r1, r1, 4
-       lwi     r8, r1, 0
-       addi    r1, r1, 4
-       lwi     r7, r1, 0
-       addi    r1, r1, 4
-       lwi     r6, r1, 0
-       addi    r1, r1, 4
-       lwi     r5, r1, 0
-       addi    r1, r1, 4
-       lwi     r4, r1, 0
-       addi    r1, r1, 4
-       lwi     r3, r1, 0
-       addi    r1, r1, 4
-       lwi     r2, r1, 0
-       addi    r1, r1, 4
+       addik   r1, r1, 124
+       lwi     r31, r1, -120
+       lwi     r30, r1, -116
+       lwi     r29, r1, -112
+       lwi     r28, r1, -108
+       lwi     r27, r1, -104
+       lwi     r26, r1, -100
+       lwi     r25, r1, -96
+       lwi     r24, r1, -92
+       lwi     r23, r1, -88
+       lwi     r22, r1, -84
+       lwi     r21, r1, -80
+       lwi     r20, r1, -76
+       lwi     r19, r1, -72
+       lwi     r18, r1, -68
+       lwi     r17, r1, -64
+       lwi     r16, r1, -60
+       lwi     r15, r1, -56
+       lwi     r14, r1, -52
+       lwi     r13, r1, -48
+       lwi     r12, r1, -44
+       lwi     r11, r1, -40
+       lwi     r10, r1, -36
+       lwi     r9, r1, -32
+       lwi     r8, r1, -28
+       lwi     r7, r1, -24
+       lwi     r6, r1, -20
+       lwi     r5, r1, -16
+       lwi     r4, r1, -12
+       lwi     r3, r1, -8
+       lwi     r2, r1, -4
 
        /* enable_interrupt */
 #ifdef XILINX_USE_MSR_INSTR

diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index a91eabc64280a84f5219f14b11fae9f6b0bcdf53..4936c628abe06a8e00759020b797a80cf8100dd6 100644 (file)
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -60,7 +60,7 @@ void timer_isr (void *arg)
        tmr->control = tmr->control | TIMER_INTERRUPT;
 }
 
-void timer_init (void)
+int timer_init (void)
 {
        tmr->loadreg = CONFIG_SYS_TIMER_0_PRELOAD;
        tmr->control = TIMER_INTERRUPT | TIMER_RESET;
@@ -68,6 +68,7 @@ void timer_init (void)
            TIMER_ENABLE | TIMER_ENABLE_INTR | TIMER_RELOAD | TIMER_DOWN_COUNT;
        reset_timer ();
        install_interrupt_handler (CONFIG_SYS_TIMER_0_IRQ, timer_isr, (void *)tmr);
+       return 0;
 }
 #endif
 #endif

diff --git a/arch/microblaze/lib/Makefile b/arch/microblaze/lib/Makefile
index 9b0f296e3fda0f2adf2b5d99a924298aa5e9e023..817643795e49af55e117dd2a33b9a5dbb0784715 100644 (file)
--- a/arch/microblaze/lib/Makefile
+++ b/arch/microblaze/lib/Makefile
@@ -29,7 +29,6 @@ SOBJS-y       +=
 
 COBJS-y        += board.o
 COBJS-y        += bootm.o
-COBJS-y        += cache.o
 COBJS-y        += time.o
 
 SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)

diff --git a/arch/microblaze/lib/board.c b/arch/microblaze/lib/board.c
index d4baea930af8a058538369a529696b62320096e4..3ff5c17d244c6e04f2db06a11e50a3a3c8d4dc41 100644 (file)
--- a/arch/microblaze/lib/board.c
+++ b/arch/microblaze/lib/board.c
@@ -30,6 +30,7 @@
 #include <timestamp.h>
 #include <version.h>
 #include <watchdog.h>
+#include <stdio_dev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -44,6 +45,12 @@ extern int interrupts_init (void);
 #if defined(CONFIG_CMD_NET)
 extern int eth_init (bd_t * bis);
 #endif
+#ifdef CONFIG_SYS_TIMER_0
+extern int timer_init (void);
+#endif
+#ifdef CONFIG_SYS_FSL_2
+extern void fsl_init2 (void);
+#endif
 
 /*
  * All attempts to come up with a "common" initialization sequence
@@ -67,6 +74,12 @@ init_fnc_t *init_sequence[] = {
 #endif
 #ifdef CONFIG_SYS_INTC_0
        interrupts_init,
+#endif
+#ifdef CONFIG_SYS_TIMER_0
+       timer_init,
+#endif
+#ifdef CONFIG_SYS_FSL_2
+       fsl_init2,
 #endif
        NULL,
 };
@@ -76,6 +89,7 @@ void board_init (void)
        bd_t *bd;
        init_fnc_t **init_fnc_ptr;
        gd = (gd_t *) CONFIG_SYS_GBL_DATA_OFFSET;
+       char *s;
 #if defined(CONFIG_CMD_FLASH)
        ulong flash_size = 0;
 #endif
@@ -104,8 +118,8 @@ void board_init (void)
        }
 
        puts ("SDRAM :\n");
-       printf ("\t\tIcache:%s\n", icache_status() ? "OK" : "FAIL");
-       printf ("\t\tDcache:%s\n", dcache_status() ? "OK" : "FAIL");
+       printf ("\t\tIcache:%s\n", icache_status() ? "ON" : "OFF");
+       printf ("\t\tDcache:%s\n", dcache_status() ? "ON" : "OFF");
        printf ("\tU-Boot Start:0x%08x\n", TEXT_BASE);
 
 #if defined(CONFIG_CMD_FLASH)
@@ -139,15 +153,22 @@ void board_init (void)
        }
 #endif
 
+       /* relocate environment function pointers etc. */
+       env_relocate ();
+
+       /* Initialize stdio devices */
+       stdio_init ();
+
+       if ((s = getenv ("loadaddr")) != NULL) {
+               load_addr = simple_strtoul (s, NULL, 16);
+       }
+
 #if defined(CONFIG_CMD_NET)
        /* IP Address */
        bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
        eth_init (bd);
 #endif
 
-       /* relocate environment function pointers etc. */
-       env_relocate ();
-
        /* main_loop */
        for (;;) {
                WATCHDOG_RESET ();

diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c
index bce4774fe37502aa9e47d413072efc820055d3d8..2227a81bb0c3baaf109651659eb0446f5c2f4f9f 100644 (file)
--- a/arch/microblaze/lib/bootm.c
+++ b/arch/microblaze/lib/bootm.c
@@ -35,22 +35,59 @@ DECLARE_GLOBAL_DATA_PTR;
 int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 {
        /* First parameter is mapped to $r5 for kernel boot args */
-       void    (*theKernel) (char *);
+       void    (*theKernel) (char *, ulong, ulong);
        char    *commandline = getenv ("bootargs");
+       ulong   rd_data_start, rd_data_end;
 
        if ((flag != 0) && (flag != BOOTM_STATE_OS_GO))
                return 1;
 
-       theKernel = (void (*)(char *))images->ep;
+       int     ret;
+
+       char    *of_flat_tree = NULL;
+#if defined(CONFIG_OF_LIBFDT)
+       ulong   of_size = 0;
+
+       /* find flattened device tree */
+       ret = boot_get_fdt (flag, argc, argv, images, &of_flat_tree, &of_size);
+       if (ret)
+               return 1;
+#endif
+
+       theKernel = (void (*)(char *, ulong, ulong))images->ep;
+
+       /* find ramdisk */
+       ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_MICROBLAZE,
+                       &rd_data_start, &rd_data_end);
+       if (ret)
+               return 1;
 
        show_boot_progress (15);
 
+       if (!(ulong) of_flat_tree)
+               of_flat_tree = (char *)simple_strtoul (argv[3], NULL, 16);
+
 #ifdef DEBUG
-       printf ("## Transferring control to Linux (at address %08lx) ...\n",
-               (ulong) theKernel);
+       printf ("## Transferring control to Linux (at address 0x%08lx) " \
+                               "ramdisk 0x%08lx, FDT 0x%08lx...\n",
+               (ulong) theKernel, rd_data_start, (ulong) of_flat_tree);
 #endif
 
-       theKernel (commandline);
+#ifdef XILINX_USE_DCACHE
+#ifdef XILINX_DCACHE_BYTE_SIZE
+       flush_cache(0, XILINX_DCACHE_BYTE_SIZE);
+#else
+#warning please rebuild BSPs and update configuration
+       flush_cache(0, 32768);
+#endif
+#endif
+       /*
+        * Linux Kernel Parameters (passing device tree):
+        * r5: pointer to command line
+        * r6: pointer to ramdisk
+        * r7: pointer to the fdt, followed by the board info data
+        */
+       theKernel (commandline, rd_data_start, (ulong) of_flat_tree);
        /* does not return */
 
        return 1;

diff --git a/arch/microblaze/lib/cache.c b/arch/microblaze/lib/cache.c
deleted file mode 100644 (file)
index 4b2e8e3..0000000
--- a/arch/microblaze/lib/cache.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * (C) Copyright 2004 Atmark Techno, Inc.
- *
- * Yasushi SHOJI <yashi@atmark-techno.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <common.h>
-
-void flush_cache (ulong addr, ulong size)
-{
-       int i;
-       for (i = 0; i < size; i += 4)
-               asm volatile (
-#ifdef CONFIG_ICACHE
-                               "wic    %0, r0;"
-#endif
-                               "nop;"
-#ifdef CONFIG_DCACHE
-                               "wdc    %0, r0;"
-#endif
-                               "nop;"
-                               :
-                               : "r" (addr + i)
-                               : "memory");
-}

diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c
index f388b775c2e2d85dd85df4068e67f2709367eed8..838f1315b3fd5d905997499c5bb5cabf0ac39f1f 100644 (file)
--- a/board/xilinx/microblaze-generic/microblaze-generic.c
+++ b/board/xilinx/microblaze-generic/microblaze-generic.c
@@ -60,10 +60,9 @@ void fsl_isr2 (void *arg) {
        puts("*");
 }
 
-void fsl_init2 (void) {
+int fsl_init2 (void) {
        puts("fsl_init2\n");
-       install_interrupt_handler (FSL_INTR_2,\
- fsl_isr2,\
- NULL);
+       install_interrupt_handler (FSL_INTR_2, fsl_isr2, NULL);
+       return 0;
 }
 #endif