bootvx: Exit if bootline address is not specified

[u-boot] / cmd / elf.c

diff --git a/cmd/elf.c b/cmd/elf.c
index decfd45326c52846dc267c0dced3e57297e14909..7e710c931702e90c3c97a205120cc48cf5c5affd 100644 (file)
--- a/cmd/elf.c
+++ b/cmd/elf.c
@@ -20,6 +20,7 @@
 #include <net.h>
 #include <vxworks.h>
 #ifdef CONFIG_X86
+#include <vbe.h>
 #include <asm/e820.h>
 #include <linux/linkage.h>
 #endif
@@ -254,6 +255,8 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        ulong base;
        struct e820_info *info;
        struct e820_entry *data;
+       struct efi_gop_info *gop;
+       struct vesa_mode_info *vesa = &mode_info.vesa;
 #endif
 
        /*
@@ -301,81 +304,73 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        tmp = env_get("bootaddr");
        if (!tmp) {
                printf("## VxWorks bootline address not specified\n");
-       } else {
-               bootaddr = simple_strtoul(tmp, NULL, 16);
+               return 1;
+       }
 
-               /*
-                * Check to see if the bootline is defined in the 'bootargs'
-                * parameter. If it is not defined, we may be able to
-                * construct the info.
-                */
-               bootline = env_get("bootargs");
-               if (bootline) {
-                       memcpy((void *)bootaddr, bootline,
-                              max(strlen(bootline), (size_t)255));
-                       flush_cache(bootaddr, max(strlen(bootline),
-                                                 (size_t)255));
+       bootaddr = simple_strtoul(tmp, NULL, 16);
+
+       /*
+        * Check to see if the bootline is defined in the 'bootargs' parameter.
+        * If it is not defined, we may be able to construct the info.
+        */
+       bootline = env_get("bootargs");
+       if (!bootline) {
+               tmp = env_get("bootdev");
+               if (tmp) {
+                       strcpy(build_buf, tmp);
+                       ptr = strlen(tmp);
                } else {
-                       tmp = env_get("bootdev");
-                       if (tmp) {
-                               strcpy(build_buf, tmp);
-                               ptr = strlen(tmp);
-                       } else
-                               printf("## VxWorks boot device not specified\n");
+                       printf("## VxWorks boot device not specified\n");
+               }
 
-                       tmp = env_get("bootfile");
-                       if (tmp)
-                               ptr += sprintf(build_buf + ptr,
-                                              "host:%s ", tmp);
-                       else
-                               ptr += sprintf(build_buf + ptr,
-                                              "host:vxWorks ");
+               tmp = env_get("bootfile");
+               if (tmp)
+                       ptr += sprintf(build_buf + ptr, "host:%s ", tmp);
+               else
+                       ptr += sprintf(build_buf + ptr, "host:vxWorks ");
 
-                       /*
-                        * The following parameters are only needed if 'bootdev'
-                        * is an ethernet device, otherwise they are optional.
-                        */
-                       tmp = env_get("ipaddr");
+               /*
+                * The following parameters are only needed if 'bootdev'
+                * is an ethernet device, otherwise they are optional.
+                */
+               tmp = env_get("ipaddr");
+               if (tmp) {
+                       ptr += sprintf(build_buf + ptr, "e=%s", tmp);
+                       tmp = env_get("netmask");
                        if (tmp) {
-                               ptr += sprintf(build_buf + ptr, "e=%s", tmp);
-                               tmp = env_get("netmask");
-                               if (tmp) {
-                                       u32 mask = env_get_ip("netmask").s_addr;
-                                       ptr += sprintf(build_buf + ptr,
-                                                      ":%08x ", ntohl(mask));
-                               } else {
-                                       ptr += sprintf(build_buf + ptr, " ");
-                               }
+                               u32 mask = env_get_ip("netmask").s_addr;
+                               ptr += sprintf(build_buf + ptr,
+                                              ":%08x ", ntohl(mask));
+                       } else {
+                               ptr += sprintf(build_buf + ptr, " ");
                        }
+               }
 
-                       tmp = env_get("serverip");
-                       if (tmp)
-                               ptr += sprintf(build_buf + ptr, "h=%s ", tmp);
-
-                       tmp = env_get("gatewayip");
-                       if (tmp)
-                               ptr += sprintf(build_buf + ptr, "g=%s ", tmp);
+               tmp = env_get("serverip");
+               if (tmp)
+                       ptr += sprintf(build_buf + ptr, "h=%s ", tmp);
 
-                       tmp = env_get("hostname");
-                       if (tmp)
-                               ptr += sprintf(build_buf + ptr, "tn=%s ", tmp);
+               tmp = env_get("gatewayip");
+               if (tmp)
+                       ptr += sprintf(build_buf + ptr, "g=%s ", tmp);
 
-                       tmp = env_get("othbootargs");
-                       if (tmp) {
-                               strcpy(build_buf + ptr, tmp);
-                               ptr += strlen(tmp);
-                       }
+               tmp = env_get("hostname");
+               if (tmp)
+                       ptr += sprintf(build_buf + ptr, "tn=%s ", tmp);
 
-                       memcpy((void *)bootaddr, build_buf,
-                              max(strlen(build_buf), (size_t)255));
-                       flush_cache(bootaddr, max(strlen(build_buf),
-                                                 (size_t)255));
+               tmp = env_get("othbootargs");
+               if (tmp) {
+                       strcpy(build_buf + ptr, tmp);
+                       ptr += strlen(tmp);
                }
 
-               printf("## Using bootline (@ 0x%lx): %s\n", bootaddr,
-                      (char *)bootaddr);
+               bootline = build_buf;
        }
 
+       memcpy((void *)bootaddr, bootline, max(strlen(bootline), (size_t)255));
+       flush_cache(bootaddr, max(strlen(bootline), (size_t)255));
+       printf("## Using bootline (@ 0x%lx): %s\n", bootaddr, (char *)bootaddr);
+
 #ifdef CONFIG_X86
        /*
         * Get VxWorks's physical memory base address from environment,
@@ -397,6 +392,22 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
         * available memory size for the kernel is insane.
         */
        *(u32 *)(base + BOOT_IMAGE_SIZE_OFFSET) = 0;
+
+       /*
+        * Prepare compatible framebuffer information block.
+        * The VESA mode has to be 32-bit RGBA.
+        */
+       if (vesa->x_resolution && vesa->y_resolution) {
+               gop = (struct efi_gop_info *)(base + EFI_GOP_INFO_OFFSET);
+               gop->magic = EFI_GOP_INFO_MAGIC;
+               gop->info.version = 0;
+               gop->info.width = vesa->x_resolution;
+               gop->info.height = vesa->y_resolution;
+               gop->info.pixel_format = EFI_GOT_RGBA8;
+               gop->info.pixels_per_scanline = vesa->bytes_per_scanline / 4;
+               gop->fb_base = vesa->phys_base_ptr;
+               gop->fb_size = vesa->bytes_per_scanline * vesa->y_resolution;
+       }
 #endif
 
        /*