29593fd5a8
Commit dc4d7b37 (MIPS: ZBOOT: gather string functions into string.c)
moved the string related functions into a separate file, which might
cause the following build error, depending on the configuration:
| CC arch/mips/boot/compressed/decompress.o
| In file included from linux/arch/mips/boot/compressed/../../../../lib/decompress_unxz.c:234:0,
| from linux/arch/mips/boot/compressed/decompress.c:67:
| linux/arch/mips/boot/compressed/../../../../lib/xz/xz_dec_stream.c: In function 'fill_temp':
| linux/arch/mips/boot/compressed/../../../../lib/xz/xz_dec_stream.c:162:2: error: implicit declaration of function 'memcpy' [-Werror=implicit-function-declaration]
| cc1: some warnings being treated as errors
| linux/scripts/Makefile.build:308: recipe for target 'arch/mips/boot/compressed/decompress.o' failed
| make[6]: *** [arch/mips/boot/compressed/decompress.o] Error 1
| linux/arch/mips/Makefile:308: recipe for target 'vmlinuz' failed
It does not fail with the standard configuration, as when
CONFIG_DYNAMIC_DEBUG is not enabled <linux/string.h> gets included in
include/linux/dynamic_debug.h. There might be other ways for it to
get indirectly included.
We can't add the include directly in xz_dec_stream.c as some
architectures might want to use a different version for the boot/
directory (see for example arch/x86/boot/string.h).
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Cc: stable@vger.kernel.org
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7420/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
115 lines
2.6 KiB
C
115 lines
2.6 KiB
C
/*
|
|
* Copyright 2001 MontaVista Software Inc.
|
|
* Author: Matt Porter <mporter@mvista.com>
|
|
*
|
|
* Copyright (C) 2009 Lemote, Inc.
|
|
* Author: Wu Zhangjin <wuzhangjin@gmail.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/string.h>
|
|
|
|
#include <asm/addrspace.h>
|
|
|
|
/*
|
|
* These two variables specify the free mem region
|
|
* that can be used for temporary malloc area
|
|
*/
|
|
unsigned long free_mem_ptr;
|
|
unsigned long free_mem_end_ptr;
|
|
|
|
/* The linker tells us where the image is. */
|
|
extern unsigned char __image_begin, __image_end;
|
|
|
|
/* debug interfaces */
|
|
extern void puts(const char *s);
|
|
extern void puthex(unsigned long long val);
|
|
|
|
void error(char *x)
|
|
{
|
|
puts("\n\n");
|
|
puts(x);
|
|
puts("\n\n -- System halted");
|
|
|
|
while (1)
|
|
; /* Halt */
|
|
}
|
|
|
|
/* activate the code for pre-boot environment */
|
|
#define STATIC static
|
|
|
|
#ifdef CONFIG_KERNEL_GZIP
|
|
#include "../../../../lib/decompress_inflate.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_BZIP2
|
|
#include "../../../../lib/decompress_bunzip2.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_LZ4
|
|
#include "../../../../lib/decompress_unlz4.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_LZMA
|
|
#include "../../../../lib/decompress_unlzma.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_LZO
|
|
#include "../../../../lib/decompress_unlzo.c"
|
|
#endif
|
|
|
|
#ifdef CONFIG_KERNEL_XZ
|
|
#include "../../../../lib/decompress_unxz.c"
|
|
#endif
|
|
|
|
unsigned long __stack_chk_guard;
|
|
|
|
void __stack_chk_guard_setup(void)
|
|
{
|
|
__stack_chk_guard = 0x000a0dff;
|
|
}
|
|
|
|
void __stack_chk_fail(void)
|
|
{
|
|
error("stack-protector: Kernel stack is corrupted\n");
|
|
}
|
|
|
|
void decompress_kernel(unsigned long boot_heap_start)
|
|
{
|
|
unsigned long zimage_start, zimage_size;
|
|
|
|
__stack_chk_guard_setup();
|
|
|
|
zimage_start = (unsigned long)(&__image_begin);
|
|
zimage_size = (unsigned long)(&__image_end) -
|
|
(unsigned long)(&__image_begin);
|
|
|
|
puts("zimage at: ");
|
|
puthex(zimage_start);
|
|
puts(" ");
|
|
puthex(zimage_size + zimage_start);
|
|
puts("\n");
|
|
|
|
/* This area are prepared for mallocing when decompressing */
|
|
free_mem_ptr = boot_heap_start;
|
|
free_mem_end_ptr = boot_heap_start + BOOT_HEAP_SIZE;
|
|
|
|
/* Display standard Linux/MIPS boot prompt */
|
|
puts("Uncompressing Linux at load address ");
|
|
puthex(VMLINUX_LOAD_ADDRESS_ULL);
|
|
puts("\n");
|
|
|
|
/* Decompress the kernel with according algorithm */
|
|
decompress((char *)zimage_start, zimage_size, 0, 0,
|
|
(void *)VMLINUX_LOAD_ADDRESS_ULL, 0, error);
|
|
|
|
/* FIXME: should we flush cache here? */
|
|
puts("Now, booting the kernel...\n");
|
|
}
|