summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/Makefile3
-rw-r--r--scripts/.gitignore2
-rw-r--r--scripts/Makefile.lib2
-rw-r--r--scripts/setupmbr/setupmbr.c4
4 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 518b37fe2f..a78fa22ac6 100644
--- a/arch/x86/Makefile
+++ b/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
diff --git a/scripts/.gitignore b/scripts/.gitignore
index fac394d128..3cb3a0b7dd 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,7 +1,9 @@
bareboxenv
bin2c
+fix_size
gen_netx_image
kallsyms
+kernel-install
kwbimage
kwboot
mk-am35xx-spi-image
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 6ccf5726c7..73a433dfcf 100644
--- a/scripts/Makefile.lib
+++ b/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>'; \
diff --git a/scripts/setupmbr/setupmbr.c b/scripts/setupmbr/setupmbr.c
index 918fbe38b7..0060c2e932 100644
--- a/scripts/setupmbr/setupmbr.c
+++ b/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