imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / board / MAI / AmigaOneG3SE / AmigaOneG3SE.c

diff --git a/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c b/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c
index 40f41c78185dbf6de24cc6fe3822af5650029fcb..4d44001ffa412209d9b43466fad6d2f87afe2528 100755 (executable)
--- a/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c
+++ b/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c
@@ -14,7 +14,7 @@
  *
  * 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
+ * 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
@@ -26,53 +26,54 @@
 #include <common.h>
 #include <command.h>
 #include <pci.h>
+#include <netdev.h>
 #include "articiaS.h"
 #include "memio.h"
 #include "via686.h"
 
-__asm(" .globl send_kb                                      \n
-       send_kb:                                            \n
-               lis     r9, 0xfe00                          \n
-                                                           \n
-               li      r4, 0x10        # retries           \n
-               mtctr   r4                                  \n
-                                                           \n
-       idle:                                               \n
-               lbz     r4, 0x64(r9)                        \n
-               andi.   r4, r4, 0x02                        \n
-               bne     idle                                \n
-                                                           \n
-       ready:                                              \n
-               stb     r3, 0x60(r9)                        \n
-                                                           \n
-       check:                                              \n
-               lbz     r4, 0x64(r9)                        \n
-               andi.   r4, r4, 0x01                        \n
-               beq     check                               \n
-                                                           \n
-               lbz     r4, 0x60(r9)                        \n
-               cmpwi   r4, 0xfa                            \n
-               beq     done                                \n
-                                                           \n
-               bdnz    idle                                \n
-                                                           \n
-               li      r3, 0                               \n
-               blr                                         \n
-                                                           \n
-       done:                                               \n
-               li      r3, 1                               \n
-               blr                                         \n
-                                                           \n
-       .globl test_kb                                      \n
-       test_kb:                                            \n
-               mflr    r10                                 \n
-               li      r3, 0xed                            \n
-               bl      send_kb                             \n
-               li      r3, 0x01                            \n
-               bl      send_kb                             \n
-               mtlr    r10                                 \n
-               blr                                         \n
-");
+__asm__(" .globl send_kb                               \n "
+       "send_kb:                                       \n "
+       "       lis     r9, 0xfe00                      \n "
+       "                                               \n "
+       "       li      r4, 0x10        # retries       \n "
+       "       mtctr   r4                              \n "
+       "                                               \n "
+       "idle:                                          \n "
+       "       lbz     r4, 0x64(r9)                    \n "
+       "       andi.   r4, r4, 0x02                    \n "
+       "       bne     idle                            \n "
+
+       "ready:                                         \n "
+       "       stb     r3, 0x60(r9)                    \n "
+       "                                               \n "
+       "check:                                         \n "
+       "       lbz     r4, 0x64(r9)                    \n "
+       "       andi.   r4, r4, 0x01                    \n "
+       "       beq     check                           \n "
+       "                                               \n "
+       "       lbz     r4, 0x60(r9)                    \n "
+       "       cmpwi   r4, 0xfa                        \n "
+       "       beq     done                            \n "
+
+       "       bdnz    idle                            \n "
+
+       "       li      r3, 0                           \n "
+       "       blr                                     \n "
+
+       "done:                                          \n "
+       "       li      r3, 1                           \n "
+       "       blr                                     \n "
+
+       ".globl test_kb                                 \n "
+       "test_kb:                                       \n "
+       "       mflr    r10                             \n "
+       "       li      r3, 0xed                        \n "
+       "       bl      send_kb                         \n "
+       "       li      r3, 0x01                        \n "
+       "       bl      send_kb                         \n "
+       "       mtlr    r10                             \n "
+       "       blr                                     \n "
+);
 
 
 int checkboard (void)
@@ -81,7 +82,7 @@ int checkboard (void)
        return 0;
 }
 
-long initdram (int board_type)
+phys_size_t initdram (int board_type)
 {
        return articiaS_ram_init ();
 }
@@ -111,3 +112,11 @@ void pci_init_board (void)
        articiaS_pci_init ();
 #endif
 }
+
+int board_eth_init(bd_t *bis)
+{
+#if defined(CONFIG_3COM)
+       eth_3com_initialize(bis);
+#endif
+       return 0;
+}