Merge branch 'for-next/x86'
This commit is contained in:
commit
fd096d9216
|
@ -5,7 +5,8 @@ machine-y := i386
|
||||||
|
|
||||||
TEXT_BASE = $(CONFIG_TEXT_BASE)
|
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
|
LDFLAGS += -m elf_i386
|
||||||
|
|
||||||
ifndef CONFIG_MODULES
|
ifndef CONFIG_MODULES
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
bareboxenv
|
bareboxenv
|
||||||
bin2c
|
bin2c
|
||||||
|
fix_size
|
||||||
gen_netx_image
|
gen_netx_image
|
||||||
kallsyms
|
kallsyms
|
||||||
|
kernel-install
|
||||||
kwbimage
|
kwbimage
|
||||||
kwboot
|
kwboot
|
||||||
mk-am35xx-spi-image
|
mk-am35xx-spi-image
|
||||||
|
|
|
@ -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:
|
In the next step, @a barebox gets installed to this boot media:
|
||||||
|
|
||||||
@verbatim
|
@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
|
@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.
|
@p /dev/sda.
|
||||||
|
|
||||||
The @p -s option will keep the persistant storage sectors free and untouched
|
The @p -s option will keep the persistant storage sectors free and untouched
|
||||||
|
|
Loading…
Reference in New Issue