diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:27 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-06 08:23:27 +0100 |
| commit | fd096d92166e8c01feedba4688d3dbd816e4f2b0 (patch) | |
| tree | f68ae7de9a594915ccfa1bf89ac8b6840eb9bb94 /scripts | |
| parent | 6d8a85d6c35a6e7fb08163e7235211c8e7370d3a (diff) | |
| parent | ddc2269a5d763bb0799b787bdcdd06bca4482abe (diff) | |
| download | barebox-fd096d92166e8c01feedba4688d3dbd816e4f2b0.tar.gz barebox-fd096d92166e8c01feedba4688d3dbd816e4f2b0.tar.xz | |
Merge branch 'for-next/x86'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/.gitignore | 2 | ||||
| -rw-r--r-- | scripts/Makefile.lib | 2 | ||||
| -rw-r--r-- | scripts/setupmbr/setupmbr.c | 4 |
3 files changed, 5 insertions, 3 deletions
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 |