serial: arm: Implement CONFIG_SERIAL_MULTI into netarm serial driver

[J-u-boot.git] / common / lynxkdi.c

diff --git a/common/lynxkdi.c b/common/lynxkdi.c
index 797d8cc880d35594213ed55a8147eaee410e0c4d..22ad384ef66c29b73f57bb788f0d8338e834eae6 100644 (file)
--- a/common/lynxkdi.c
+++ b/common/lynxkdi.c
@@ -16,48 +16,51 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <image.h>
+#include <net.h>
 
-#if defined(CONFIG_LYNXKDI)
 #include <lynxkdi.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #if defined(CONFIG_MPC8260) || defined(CONFIG_440EP) || defined(CONFIG_440GR)
-void lynxkdi_boot ( image_header_t *hdr )
+void lynxkdi_boot(image_header_t *hdr)
 {
-       void (*lynxkdi)(void) = (void(*)(void))hdr->ih_ep;
+       void (*lynxkdi)(void) = (void(*)(void))image_get_ep(hdr);
        lynxos_bootparms_t *parms = (lynxos_bootparms_t *)0x0020;
        bd_t *kbd;
-       DECLARE_GLOBAL_DATA_PTR;
-       u32 *psz = (u32 *)(hdr->ih_load + 0x0204);
+       u32 *psz = (u32 *)(image_get_load(hdr) + 0x0204);
 
-       memset( parms, 0, sizeof(*parms));
+       memset(parms, 0, sizeof(*parms));
        kbd = gd->bd;
        parms->clock_ref = kbd->bi_busfreq;
        parms->dramsz = kbd->bi_memsize;
-       memcpy(parms->ethaddr, kbd->bi_enetaddr, 6);
+       eth_getenv_enetaddr("ethaddr", parms->ethaddr);
        mtspr(SPRN_SPRG2, 0x0020);
 
        /* Do a simple check for Bluecat so we can pass the
         * kernel command line parameters.
         */
-       if( le32_to_cpu(*psz) == hdr->ih_size ){
-           char *args;
-           char *cmdline = (char *)(hdr->ih_load + 0x020c);
-           int len;
+       /* FIXME: NOT SURE HERE ! */
+       if (le32_to_cpu(*psz) == image_get_data_size(hdr)) {
+               char *args;
+               char *cmdline = (char *)(image_get_load(hdr) + 0x020c);
+               int len;
 
-           printf("Booting Bluecat KDI ...\n");
-           udelay(200*1000); /* Allow serial port to flush */
-           if ((args = getenv("bootargs")) == NULL)
-                   args = "";
-           /* Prepend the cmdline */
-           len = strlen(args);
-           if( len && (len + strlen(cmdline) + 2 < (0x0400 - 0x020c))) {
-               memmove( cmdline + strlen(args) + 1, cmdline, strlen(cmdline) );
-               strcpy( cmdline, args );
-               cmdline[len] = ' ';
-           }
+               printf("Booting Bluecat KDI ...\n");
+               udelay(200*1000); /* Allow serial port to flush */
+               if ((args = getenv("bootargs")) == NULL)
+                       args = "";
+               /* Prepend the cmdline */
+               len = strlen(args);
+               if (len && (len + strlen(cmdline) + 2 < (0x0400 - 0x020c))) {
+                       memmove(cmdline + strlen(args) + 1, cmdline,
+                               strlen(cmdline));
+                       strcpy(cmdline, args);
+                       cmdline[len] = ' ';
+               }
        }
        else {
-           printf("Booting LynxOS KDI ...\n");
+               printf("Booting LynxOS KDI ...\n");
        }
 
        lynxkdi();
@@ -65,5 +68,3 @@ void lynxkdi_boot ( image_header_t *hdr )
 #else
 #error "Lynx KDI support not implemented for configured CPU"
 #endif
-
-#endif /* CONFIG_LYNXKDI */