Remove unnecessary instances of DECLARE_GLOBAL_DATA_PTR

[u-boot] / arch / x86 / lib / zimage.c

diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 00172dc7c130180fbd5062a791975f9419c23adb..9932ee69a0c42a1672acb8ce955bc5543428ba10 100644 (file)
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -14,6 +14,8 @@
  */
 
 #include <common.h>
+#include <malloc.h>
+#include <asm/acpi_table.h>
 #include <asm/io.h>
 #include <asm/ptrace.h>
 #include <asm/zimage.h>
@@ -24,8 +26,7 @@
 #include <asm/arch/timestamp.h>
 #endif
 #include <linux/compiler.h>
-
-DECLARE_GLOBAL_DATA_PTR;
+#include <linux/libfdt.h>
 
 /*
  * Memory lay-out:
@@ -94,6 +95,38 @@ static int get_boot_protocol(struct setup_header *hdr)
        }
 }
 
+static int setup_device_tree(struct setup_header *hdr, const void *fdt_blob)
+{
+       int bootproto = get_boot_protocol(hdr);
+       struct setup_data *sd;
+       int size;
+
+       if (bootproto < 0x0209)
+               return -ENOTSUPP;
+
+       if (!fdt_blob)
+               return 0;
+
+       size = fdt_totalsize(fdt_blob);
+       if (size < 0)
+               return -EINVAL;
+
+       size += sizeof(struct setup_data);
+       sd = (struct setup_data *)malloc(size);
+       if (!sd) {
+               printf("Not enough memory for DTB setup data\n");
+               return -ENOMEM;
+       }
+
+       sd->next = hdr->setup_data;
+       sd->type = SETUP_DTB;
+       sd->len = fdt_totalsize(fdt_blob);
+       memcpy(sd->data, fdt_blob, sd->len);
+       hdr->setup_data = (unsigned long)sd;
+
+       return 0;
+}
+
 struct boot_params *load_zimage(char *image, unsigned long kernel_size,
                                ulong *load_addressp)
 {
@@ -246,14 +279,21 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
                        hdr->setup_move_size = 0x9100;
                }
 
-#if defined(CONFIG_INTEL_MID)
-               hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
-#endif
-
                /* build command line at COMMAND_LINE_OFFSET */
                build_command_line(cmd_line, auto_boot);
        }
 
+#ifdef CONFIG_INTEL_MID
+       if (bootproto >= 0x0207)
+               hdr->hardware_subarch = X86_SUBARCH_INTEL_MID;
+#endif
+
+#ifdef CONFIG_GENERATE_ACPI_TABLE
+       if (bootproto >= 0x020e)
+               hdr->acpi_rsdp_addr = acpi_get_rsdp_addr();
+#endif
+
+       setup_device_tree(hdr, (const void *)env_get_hex("fdtaddr", 0));
        setup_video(&setup_base->screen_info);
 
        return 0;