pxe: add support for label menu text

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

diff --git a/common/cmd_elf.c b/common/cmd_elf.c
index 63a5593e4343ae16964f4cb369b00cedbeaff6c4..8266bba0e6935063263e4db3bb8c983316be5731 100644 (file)
--- a/common/cmd_elf.c
+++ b/common/cmd_elf.c
@@ -18,55 +18,86 @@
 #include <linux/ctype.h>
 #include <net.h>
 #include <elf.h>
 #include <linux/ctype.h>
 #include <net.h>
 #include <elf.h>

+#include <vxworks.h>

 
 

-#if defined(CONFIG_WALNUT) || defined(CFG_VXWORKS_MAC_PTR)
+#if defined(CONFIG_WALNUT) || defined(CONFIG_SYS_VXWORKS_MAC_PTR)

 DECLARE_GLOBAL_DATA_PTR;
 #endif
 
 DECLARE_GLOBAL_DATA_PTR;
 #endif
 

-#if defined(CONFIG_CMD_ELF)
+int valid_elf_image (unsigned long addr);
+static unsigned long load_elf_image_phdr(unsigned long addr);
+static unsigned long load_elf_image_shdr(unsigned long addr);

 
 

-#ifndef MAX
-#define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
+/* Allow ports to override the default behavior */
+__attribute__((weak))
+unsigned long do_bootelf_exec (ulong (*entry)(int, char * const[]),
+                              int argc, char * const argv[])
+{
+       unsigned long ret;

 
 

-int valid_elf_image (unsigned long addr);
-unsigned long load_elf_image (unsigned long addr);
+       /*
+        * QNX images require the data cache is disabled.
+        * Data cache is already flushed, so just turn it off.
+        */
+       int dcache = dcache_status ();
+       if (dcache)
+               dcache_disable ();
+
+       /*
+        * pass address parameter as argv[0] (aka command name),
+        * and all remaining args
+        */
+       ret = entry (argc, argv);
+
+       if (dcache)
+               dcache_enable ();
+
+       return ret;
+}

 
 /* ======================================================================
  * Interpreter command to boot an arbitrary ELF image from memory.
  * ====================================================================== */
 
 /* ======================================================================
  * Interpreter command to boot an arbitrary ELF image from memory.
  * ====================================================================== */

-int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

 {
        unsigned long addr;             /* Address of the ELF image     */
        unsigned long rc;               /* Return value from user code  */
 {
        unsigned long addr;             /* Address of the ELF image     */
        unsigned long rc;               /* Return value from user code  */

+       char *sload, *saddr;

 
        /* -------------------------------------------------- */
        int rcode = 0;
 
 
        /* -------------------------------------------------- */
        int rcode = 0;
 

-       if (argc < 2)
-               addr = load_addr;
+       sload = saddr = NULL;
+       if (argc == 3) {
+               sload = argv[1];
+               saddr = argv[2];
+       } else if (argc == 2) {
+               if (argv[1][0] == '-')
+                       sload = argv[1];
+               else
+                       saddr = argv[1];
+       }
+
+       if (saddr)
+               addr = simple_strtoul(saddr, NULL, 16);

        else
        else

-               addr = simple_strtoul (argv[1], NULL, 16);
+               addr = load_addr;

 
        if (!valid_elf_image (addr))
                return 1;
 
 
        if (!valid_elf_image (addr))
                return 1;
 

-       addr = load_elf_image (addr);
+       if (sload && sload[1] == 'p')
+               addr = load_elf_image_phdr(addr);
+       else
+               addr = load_elf_image_shdr(addr);

 
        printf ("## Starting application at 0x%08lx ...\n", addr);
 
 
        printf ("## Starting application at 0x%08lx ...\n", addr);
 

-       /*
-        * QNX images require the data cache is disabled.
-        * Data cache is already flushed, so just turn it off.
-        */
-       if (dcache_status ())
-               dcache_disable ();
-

        /*
         * pass address parameter as argv[0] (aka command name),
         * and all remaining args
         */
        /*
         * pass address parameter as argv[0] (aka command name),
         * and all remaining args
         */

-       rc = ((ulong (*)(int, char *[])) addr) (--argc, &argv[1]);
+       rc = do_bootelf_exec ((void *)addr, argc - 1, argv + 1);

        if (rc != 0)
                rcode = 1;
 
        if (rc != 0)
                rcode = 1;
 


@@ -79,19 +110,16 @@ int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
  * be either an ELF image or a raw binary.  Will attempt to setup the
  * bootline and other parameters correctly.
  * ====================================================================== */
  * be either an ELF image or a raw binary.  Will attempt to setup the
  * bootline and other parameters correctly.
  * ====================================================================== */

-int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])

 {
        unsigned long addr;             /* Address of image            */
        unsigned long bootaddr;         /* Address to put the bootline */
        char *bootline;                 /* Text of the bootline        */
        char *tmp;                      /* Temporary char pointer      */
 {
        unsigned long addr;             /* Address of image            */
        unsigned long bootaddr;         /* Address to put the bootline */
        char *bootline;                 /* Text of the bootline        */
        char *tmp;                      /* Temporary char pointer      */

+       char build_buf[128];            /* Buffer for building the bootline */

 
 

-#if defined(CONFIG_4xx) || defined(CONFIG_IOP480)
-       char build_buf[80];             /* Buffer for building the bootline */
-#endif
-       /* -------------------------------------------------- */
-
-       /*
+       /* ---------------------------------------------------
+        *

         * Check the loadaddr variable.
         * If we don't know where the image is then we're done.
         */
         * Check the loadaddr variable.
         * If we don't know where the image is then we're done.
         */


@@ -105,9 +133,10 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        /* Check to see if we need to tftp the image ourselves before starting */
 
        if ((argc == 2) && (strcmp (argv[1], "tftp") == 0)) {
        /* Check to see if we need to tftp the image ourselves before starting */
 
        if ((argc == 2) && (strcmp (argv[1], "tftp") == 0)) {

-               if (NetLoop (TFTP) <= 0)
+               if (NetLoop(TFTPGET) <= 0)

                        return 1;
                        return 1;

-               printf ("Automatic boot of VxWorks image at address 0x%08lx ... \n", addr);
+               printf("Automatic boot of VxWorks image at address 0x%08lx "
+                       "...\n", addr);

        }
 #endif
 
        }
 #endif
 


@@ -118,11 +147,13 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         */
 
 #if defined(CONFIG_WALNUT)
         */
 
 #if defined(CONFIG_WALNUT)

-       tmp = (char *) CFG_NVRAM_BASE_ADDR + 0x500;
-       memcpy ((char *) tmp, (char *) &gd->bd->bi_enetaddr[3], 3);
-#elif defined(CFG_VXWORKS_MAC_PTR)
-       tmp = (char *) CFG_VXWORKS_MAC_PTR;
-       memcpy ((char *) tmp, (char *) &gd->bd->bi_enetaddr[0], 6);
+       tmp = (char *) CONFIG_SYS_NVRAM_BASE_ADDR + 0x500;
+       eth_getenv_enetaddr("ethaddr", (uchar *)build_buf);
+       memcpy(tmp, &build_buf[3], 3);
+#elif defined(CONFIG_SYS_VXWORKS_MAC_PTR)
+       tmp = (char *) CONFIG_SYS_VXWORKS_MAC_PTR;
+       eth_getenv_enetaddr("ethaddr", (uchar *)build_buf);
+       memcpy(tmp, build_buf, 6);

 #else
        puts ("## Ethernet MAC address not copied to NV RAM\n");
 #endif
 #else
        puts ("## Ethernet MAC address not copied to NV RAM\n");
 #endif


@@ -135,7 +166,7 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         */
 
        if ((tmp = getenv ("bootaddr")) == NULL)
         */
 
        if ((tmp = getenv ("bootaddr")) == NULL)

-               bootaddr = 0x4200;
+               bootaddr = CONFIG_SYS_VXWORKS_BOOT_ADDR;

        else
                bootaddr = simple_strtoul (tmp, NULL, 16);
 
        else
                bootaddr = simple_strtoul (tmp, NULL, 16);
 


@@ -146,54 +177,40 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         */
 
        if ((bootline = getenv ("bootargs")) != NULL) {
         */
 
        if ((bootline = getenv ("bootargs")) != NULL) {

-               memcpy ((void *) bootaddr, bootline, MAX(strlen(bootline), 255));
-               flush_cache (bootaddr, MAX(strlen(bootline), 255));
+               memcpy ((void *) bootaddr, bootline,
+                       max (strlen (bootline), 255));
+               flush_cache (bootaddr, max (strlen (bootline), 255));

        } else {
        } else {

-#if defined(CONFIG_4xx)
-               sprintf (build_buf, "ibmEmac(0,0)");

 
 

-               if ((tmp = getenv ("hostname")) != NULL) {
-                       sprintf (&build_buf[strlen (build_buf - 1)],
-                               "host:%s ", tmp);
+
+               sprintf (build_buf, CONFIG_SYS_VXWORKS_BOOT_DEVICE);
+               if ((tmp = getenv ("bootfile")) != NULL) {
+                       sprintf (&build_buf[strlen (build_buf)],
+                                "%s:%s ", CONFIG_SYS_VXWORKS_SERVERNAME, tmp);

                } else {
                } else {

-                       sprintf (&build_buf[strlen (build_buf - 1)],
-                               ": ");
+                       sprintf (&build_buf[strlen (build_buf)],
+                                "%s:file ", CONFIG_SYS_VXWORKS_SERVERNAME);

                }
 
                if ((tmp = getenv ("ipaddr")) != NULL) {
                }
 
                if ((tmp = getenv ("ipaddr")) != NULL) {

-                       sprintf (&build_buf[strlen (build_buf - 1)],
-                               "e=%s ", tmp);
+                       sprintf (&build_buf[strlen (build_buf)], "e=%s ", tmp);

                }
                }

-               memcpy ((void *)bootaddr, build_buf, MAX(strlen(build_buf), 255));
-               flush_cache (bootaddr, MAX(strlen(build_buf), 255));
-#elif defined(CONFIG_IOP480)
-               sprintf (build_buf, "dc(0,0)");

 
 

-               if ((tmp = getenv ("hostname")) != NULL) {
-                       sprintf (&build_buf[strlen (build_buf - 1)],
-                               "host:%s ", tmp);
-               } else {
-                       sprintf (&build_buf[strlen (build_buf - 1)],
-                               ": ");
+               if ((tmp = getenv ("serverip")) != NULL) {
+                       sprintf (&build_buf[strlen (build_buf)], "h=%s ", tmp);

                }
 
                }
 

-               if ((tmp = getenv ("ipaddr")) != NULL) {
-                       sprintf (&build_buf[strlen (build_buf - 1)],
-                               "e=%s ", tmp);
+               if ((tmp = getenv ("hostname")) != NULL) {
+                       sprintf (&build_buf[strlen (build_buf)], "tn=%s ", tmp);

                }
                }

-               memcpy ((void *) bootaddr, build_buf, MAX(strlen(build_buf), 255));
-               flush_cache (bootaddr, MAX(strlen(build_buf), 255));
-#else
-
-               /*
-                * I'm not sure what the device should be for other
-                * PPC flavors, the hostname and ipaddr should be ok
-                * to just copy
-                */
-
-               puts ("No bootargs defined\n");
-               return 1;
+#ifdef CONFIG_SYS_VXWORKS_ADD_PARAMS
+               sprintf (&build_buf[strlen (build_buf)],
+                        CONFIG_SYS_VXWORKS_ADD_PARAMS);

 #endif
 #endif

+
+               memcpy ((void *) bootaddr, build_buf,
+                       max (strlen (build_buf), 255));
+               flush_cache (bootaddr, max (strlen (build_buf), 255));

        }
 
        /*
        }
 
        /*


@@ -203,7 +220,7 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
         */
 
        if (valid_elf_image (addr)) {
         */
 
        if (valid_elf_image (addr)) {

-               addr = load_elf_image (addr);
+               addr = load_elf_image_shdr (addr);

        } else {
                puts ("## Not an ELF image, assuming binary\n");
                /* leave addr as load_addr */
        } else {
                puts ("## Not an ELF image, assuming binary\n");
                /* leave addr as load_addr */


@@ -213,7 +230,8 @@ int do_bootvx (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        (char *) bootaddr);
        printf ("## Starting vxWorks at 0x%08lx ...\n", addr);
 
                        (char *) bootaddr);
        printf ("## Starting vxWorks at 0x%08lx ...\n", addr);
 

-       ((void (*)(void)) addr) ();
+       dcache_disable();
+       ((void (*)(int)) addr) (0);

 
        puts ("## vxWorks terminated\n");
        return 1;
 
        puts ("## vxWorks terminated\n");
        return 1;


@@ -238,8 +256,7 @@ int valid_elf_image (unsigned long addr)
        }
 
        if (ehdr->e_type != ET_EXEC) {
        }
 
        if (ehdr->e_type != ET_EXEC) {

-               printf ("## Not a 32-bit elf image at address 0x%08lx\n",
-                       addr);
+               printf ("## Not a 32-bit elf image at address 0x%08lx\n", addr);

                return 0;
        }
 
                return 0;
        }
 


@@ -254,12 +271,37 @@ int valid_elf_image (unsigned long addr)
        return 1;
 }
 
        return 1;
 }
 

-

 /* ======================================================================
  * A very simple elf loader, assumes the image is valid, returns the
  * entry point address.
  * ====================================================================== */
 /* ======================================================================
  * A very simple elf loader, assumes the image is valid, returns the
  * entry point address.
  * ====================================================================== */

-unsigned long load_elf_image (unsigned long addr)
+static unsigned long load_elf_image_phdr(unsigned long addr)
+{
+       Elf32_Ehdr *ehdr;               /* Elf header structure pointer     */
+       Elf32_Phdr *phdr;               /* Program header structure pointer */
+       int i;
+
+       ehdr = (Elf32_Ehdr *) addr;
+       phdr = (Elf32_Phdr *) (addr + ehdr->e_phoff);
+
+       /* Load each program header */
+       for (i = 0; i < ehdr->e_phnum; ++i) {
+               void *dst = (void *) phdr->p_paddr;
+               void *src = (void *) addr + phdr->p_offset;
+               debug("Loading phdr %i to 0x%p (%i bytes)\n",
+                       i, dst, phdr->p_filesz);
+               if (phdr->p_filesz)
+                       memcpy(dst, src, phdr->p_filesz);
+               if (phdr->p_filesz != phdr->p_memsz)
+                       memset(dst + phdr->p_filesz, 0x00, phdr->p_memsz - phdr->p_filesz);
+               flush_cache((unsigned long)dst, phdr->p_filesz);
+               ++phdr;
+       }
+
+       return ehdr->e_entry;
+}
+
+static unsigned long load_elf_image_shdr(unsigned long addr)

 {
        Elf32_Ehdr *ehdr;               /* Elf header structure pointer     */
        Elf32_Shdr *shdr;               /* Section header structure pointer */
 {
        Elf32_Ehdr *ehdr;               /* Elf header structure pointer     */
        Elf32_Shdr *shdr;               /* Section header structure pointer */


@@ -289,7 +331,7 @@ unsigned long load_elf_image (unsigned long addr)
                }
 
                if (strtab) {
                }
 
                if (strtab) {

-                       printf ("%sing %s @ 0x%08lx (%ld bytes)\n",
+                       debug("%sing %s @ 0x%08lx (%ld bytes)\n",

                                (shdr->sh_type == SHT_NOBITS) ?
                                        "Clear" : "Load",
                                &strtab[shdr->sh_name],
                                (shdr->sh_type == SHT_NOBITS) ?
                                        "Clear" : "Load",
                                &strtab[shdr->sh_name],


@@ -313,15 +355,15 @@ unsigned long load_elf_image (unsigned long addr)
 
 /* ====================================================================== */
 U_BOOT_CMD(
 
 /* ====================================================================== */
 U_BOOT_CMD(

-       bootelf,      2,      0,      do_bootelf,
-       "bootelf - Boot from an ELF image in memory\n",
-       " [address] - load address of ELF image.\n"
+       bootelf,      3,      0,      do_bootelf,
+       "Boot from an ELF image in memory",
+       "[-p|-s] [address]\n"
+       "\t- load ELF image at [address] via program headers (-p)\n"
+       "\t  or via section headers (-s)"

 );
 
 U_BOOT_CMD(
        bootvx,      2,      0,      do_bootvx,
 );
 
 U_BOOT_CMD(
        bootvx,      2,      0,      do_bootvx,

-       "bootvx  - Boot vxWorks from an ELF image\n",
-       " [address] - load address of vxWorks ELF image.\n"
+       "Boot vxWorks from an ELF image",
+       " [address] - load address of vxWorks ELF image."

 );
 );

-
-#endif