x86: Use the generic linker script initializing
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
This commit is contained in:
parent
6ef848c1f7
commit
1126f04e99
|
@ -19,7 +19,13 @@ all: $(KBUILD_IMAGE)
|
|||
|
||||
|
||||
|
||||
machdirs := $(patsubst %,arch/x86/mach-%/,$(machine-y))
|
||||
|
||||
ifeq ($(KBUILD_SRC),)
|
||||
CPPFLAGS += $(patsubst %,-I%include,$(machdirs))
|
||||
else
|
||||
CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs))
|
||||
endif
|
||||
|
||||
ifneq ($(board-y),)
|
||||
BOARD := arch/x86/boards/$(board-y)/
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
*/
|
||||
|
||||
#undef i386
|
||||
#include <asm/barebox.lds.h>
|
||||
#include <asm-generic/barebox.lds.h>
|
||||
|
||||
OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
|
||||
OUTPUT_ARCH(i386)
|
||||
|
|
|
@ -23,20 +23,6 @@
|
|||
* @brief Adapt linker script content in accordance to Kconfig settings
|
||||
*/
|
||||
|
||||
#define INITCALLS \
|
||||
KEEP(*(.initcall.0)) \
|
||||
KEEP(*(.initcall.1)) \
|
||||
KEEP(*(.initcall.2)) \
|
||||
KEEP(*(.initcall.3)) \
|
||||
KEEP(*(.initcall.4)) \
|
||||
KEEP(*(.initcall.5)) \
|
||||
KEEP(*(.initcall.6)) \
|
||||
KEEP(*(.initcall.7))
|
||||
|
||||
#define BAREBOX_CMDS KEEP(*(SORT_BY_NAME(.barebox_cmd*)))
|
||||
|
||||
#define BAREBOX_SYMS KEEP(*(__usymtab))
|
||||
|
||||
/**
|
||||
* Area in the MBR of the barebox basic boot code. This offset must be in
|
||||
* accordance to the 'indirect_sector_lba' label.
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
#if defined CONFIG_ARCH_IMX25 || defined CONFIG_ARCH_IMX35 || defined CONFIG_ARCH_IMX51
|
||||
#if defined CONFIG_ARCH_IMX25 || defined CONFIG_ARCH_IMX35 || defined CONFIG_ARCH_IMX51 || defined CONFIG_X86
|
||||
#include <mach/barebox.lds.h>
|
||||
#endif
|
||||
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
|
||||
/* include the info from this barebox release */
|
||||
#include "../../include/generated/utsrelease.h"
|
||||
#include "../../arch/x86/include/asm/barebox.lds.h"
|
||||
#include "../../arch/x86/mach-i386/include/mach/barebox.lds.h"
|
||||
|
||||
/** define to disable integrity tests and debug messages */
|
||||
#define NDEBUG
|
||||
|
|
Loading…
Reference in New Issue