Merge branch 'master' of git://git.denx.de/u-boot-imx

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

diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index a1ec57e8d3ea478e1d75babac788f71eafd89e18..aafbeb01f907ea4d49a9f343085b6d3e9f491d1b 100644 (file)
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -42,32 +42,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define COMMAND_LINE_SIZE      2048
 
-/*
- * Install a default e820 table with 3 entries as follows:
- *
- *     0x000000-0x0a0000       Useable RAM
- *     0x0a0000-0x100000       Reserved for ISA
- *     0x100000-gd->ram_size   Useable RAM
- */
-__weak unsigned install_e820_map(unsigned max_entries,
-                                struct e820entry *entries)
-{
-       entries[0].addr = 0;
-       entries[0].size = ISA_START_ADDRESS;
-       entries[0].type = E820_RAM;
-       entries[1].addr = ISA_START_ADDRESS;
-       entries[1].size = ISA_END_ADDRESS - ISA_START_ADDRESS;
-       entries[1].type = E820_RESERVED;
-       entries[2].addr = ISA_END_ADDRESS;
-       entries[2].size = gd->ram_size - ISA_END_ADDRESS;
-       entries[2].type = E820_RAM;
-       entries[3].addr = CONFIG_PCIE_ECAM_BASE;
-       entries[3].size = CONFIG_PCIE_ECAM_SIZE;
-       entries[3].type = E820_RESERVED;
-
-       return 4;
-}
-
 static void build_command_line(char *command_line, int auto_boot)
 {
        char *env_command_line;
@@ -191,7 +165,7 @@ struct boot_params *load_zimage(char *image, unsigned long kernel_size,
                 * A very old kernel MUST have its real-mode code
                 * loaded at 0x90000
                 */
-               if ((u32)setup_base != 0x90000) {
+               if ((ulong)setup_base != 0x90000) {
                        /* Copy the real-mode kernel */
                        memmove((void *)0x90000, setup_base, setup_size);
 
@@ -272,6 +246,10 @@ 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);
        }