diff options
| author | Simon Glass <sjg@chromium.org> | 2014-10-10 08:21:56 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-10-28 20:43:58 -0600 |
| commit | 76539383ea0288985dc6216a92e3d7961df958b3 (patch) | |
| tree | 20972aa414b45af84a56fcc4d7ec3965df57d705 /arch/x86/include | |
| parent | 200182a748afd430da97b707dc5dff53c3147b5f (diff) | |
| download | blackbird-obmc-uboot-76539383ea0288985dc6216a92e3d7961df958b3.tar.gz blackbird-obmc-uboot-76539383ea0288985dc6216a92e3d7961df958b3.zip | |
x86: Move kernel boot function to arch/x86/lib/bootm.c
The boot_zimage() function is badly named it can also boot a raw kernel.
Rename it, and try to avoid pointers for memory addresses as it involves
lots of casting.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/bootm.h | 16 | ||||
| -rw-r--r-- | arch/x86/include/asm/zimage.h | 4 |
2 files changed, 17 insertions, 3 deletions
diff --git a/arch/x86/include/asm/bootm.h b/arch/x86/include/asm/bootm.h index 033ab79516..f6a64ce2c9 100644 --- a/arch/x86/include/asm/bootm.h +++ b/arch/x86/include/asm/bootm.h @@ -9,4 +9,20 @@ void bootm_announce_and_cleanup(void); +/** + * boot_linux_kernel() - boot a linux kernel + * + * This boots a kernel image, either 32-bit or 64-bit. It will also work with + * a self-extracting kernel, if you set @image_64bit to false. + * + * @setup_base: Pointer to the setup.bin information for the kernel + * @load_address: Pointer to the start of the kernel image + * @image_64bit: true if the image is a raw 64-bit kernel, false if it + * is raw 32-bit or any type of self-extracting kernel + * such as a bzImage. + * @return -ve error code. This function does not return if the kernel was + * booted successfully. + */ +int boot_linux_kernel(ulong setup_base, ulong load_address, bool image_64bit); + #endif diff --git a/arch/x86/include/asm/zimage.h b/arch/x86/include/asm/zimage.h index 0f36662688..8e7dd424ca 100644 --- a/arch/x86/include/asm/zimage.h +++ b/arch/x86/include/asm/zimage.h @@ -35,10 +35,8 @@ unsigned install_e820_map(unsigned max_entries, struct e820entry *); struct boot_params *load_zimage(char *image, unsigned long kernel_size, - void **load_address); + ulong *load_addressp); int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot, unsigned long initrd_addr, unsigned long initrd_size); -void boot_zimage(void *setup_base, void *load_address); - #endif |
