Merge branch 'for-next/x86'

arch/x86/Makefile

@@ -5,7 +5,8 @@ machine-y := i386
 
 TEXT_BASE = $(CONFIG_TEXT_BASE)
 
-CPPFLAGS += -march=i386 -m32 -DTEXT_BASE=$(TEXT_BASE)
+CPPFLAGS += -march=i386 -m32 -DTEXT_BASE=$(TEXT_BASE) \
+	-fno-unwind-tables -fno-asynchronous-unwind-tables
 LDFLAGS += -m elf_i386
 
 ifndef CONFIG_MODULES

scripts/.gitignore

@@ -1,7 +1,9 @@
 bareboxenv
 bin2c
+fix_size
 gen_netx_image
 kallsyms
+kernel-install
 kwbimage
 kwboot
 mk-am35xx-spi-image

scripts/Makefile.lib

@@ -197,7 +197,7 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \
 # ---------------------------------------------------------------------------
 
 # Generate an assembly file to wrap the output of the device tree compiler
-quiet_cmd_dt_S_dtb= DTB    $@
+quiet_cmd_dt_S_dtb = DTB     $@
 cmd_dt_S_dtb=							\
 (								\
 	echo '\#include <asm-generic/barebox.lds.h>';		\

scripts/setupmbr/setupmbr.c

@@ -666,10 +666,10 @@ and populating the root filesystem for example) to make it useful.
 In the next step, @a barebox gets installed to this boot media:
 
 @verbatim
-[jb@host]~> scripts/setupmbr/setupmbr -s 32 -m ./barebox -d /dev/sda
+[jb@host]~> scripts/setupmbr/setupmbr -s 32 -m ./barebox.bin -d /dev/sda
 @endverbatim
 
-This command writes the @a barebox image file './barebox' onto the device
+This command writes the @a barebox image file './barebox.bin' onto the device
 @p /dev/sda.
 
 The @p -s option will keep the persistant storage sectors free and untouched