summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/zimage.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-10-21 20:47:40 -0400
committerTom Rini <trini@konsulko.com>2015-10-21 20:47:40 -0400
commit858dbdf8412cefb6dbc4eed63dc3de9744578455 (patch)
tree7cca9f60b3d677b338defa3f4af74a1fff017071 /arch/x86/include/asm/zimage.h
parent89b5c81b75658b7ff66dea6c38a51dfecc9dd508 (diff)
parente0ae64880b61fdeaf261fddd747efa80fa53d386 (diff)
downloadtalos-obmc-uboot-858dbdf8412cefb6dbc4eed63dc3de9744578455.tar.gz
talos-obmc-uboot-858dbdf8412cefb6dbc4eed63dc3de9744578455.zip
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/include/asm/zimage.h')
-rw-r--r--arch/x86/include/asm/zimage.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/include/asm/zimage.h b/arch/x86/include/asm/zimage.h
index bf351ed3b6..94fa2a713f 100644
--- a/arch/x86/include/asm/zimage.h
+++ b/arch/x86/include/asm/zimage.h
@@ -31,9 +31,6 @@
#define BZIMAGE_LOAD_ADDR 0x100000
#define ZIMAGE_LOAD_ADDR 0x10000
-/* Implementation defined function to install an e820 map. */
-unsigned install_e820_map(unsigned max_entries, struct e820entry *);
-
struct boot_params *load_zimage(char *image, unsigned long kernel_size,
ulong *load_addressp);
int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
OpenPOWER on IntegriCloud