Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sandbox' of git://git.denx.de/u-boot-x86

Browse Source
master
Tom Rini 10 years ago
parent f0c6e1c31b 1d8104fe88
commit 97cdf64026
10 changed files with 42 additions and 40 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      arch/sandbox/cpu/os.c
  2. 3
      arch/sandbox/cpu/start.c
  3. 6
      common/cmd_mem.c
  4. 15
      common/fdt_support.c
  5. 21
      disk/part_efi.c
  6. 25
      tools/buildman/README
  7. 3
      tools/buildman/builder.py
  8. 2
      tools/buildman/builderthread.py
  9. 3
      tools/buildman/control.py
  10. 3
      tools/patman/patchstream.py

1
arch/sandbox/cpu/os.c
Unescape View File

@ -367,6 +367,7 @@ int os_dirent_ls(const char *dirname, struct os_dirent_node **headp)
done:
closedir(dir);
free(fname);
return ret;
}

3
arch/sandbox/cpu/start.c
Unescape View File

@ -130,7 +130,8 @@ static int sandbox_cmdline_cb_memory(struct sandbox_state *state,
state->write_ram_buf = true;
state->ram_buf_fname = arg;
if (os_read_ram_buf(arg)) {
err = os_read_ram_buf(arg);
if (err) {
printf("Failed to read RAM buffer\n");
return err;
}

6
common/cmd_mem.c
Unescape View File

@ -19,6 +19,7 @@
#include <dataflash.h>
#endif
#include <hash.h>
#include <inttypes.h>
#include <watchdog.h>
#include <asm/io.h>
#include <linux/compiler.h>
@ -338,7 +339,8 @@ static int do_mem_cmp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (word1 != word2) {
ulong offset = buf1 - base;
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA
printf("%s at 0x%p (%#0*llx) != %s at 0x%p (%#0*llx)\n",
printf("%s at 0x%p (%#0*"PRIx64") != %s at 0x%p (%#0*"
PRIx64 ")\n",
type, (void *)(addr1 + offset), size, word1,
type, (void *)(addr2 + offset), size, word2);
#else
@ -1146,7 +1148,7 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[])
printf(" %08x", *((u32 *)ptr));
#ifdef CONFIG_SYS_SUPPORT_64BIT_DATA
else if (size == 8)
printf(" %016llx", *((u64 *)ptr));
printf(" %016" PRIx64, *((u64 *)ptr));
#endif
else if (size == 2)
printf(" %04x", *((u16 *)ptr));

15
common/fdt_support.c
Unescape View File

@ -8,6 +8,7 @@
*/
#include <common.h>
#include <inttypes.h>
#include <stdio_dev.h>
#include <linux/ctype.h>
#include <linux/types.h>
@ -914,8 +915,6 @@ void fdt_del_node_and_alias(void *blob, const char *alias)
fdt_delprop(blob, off, alias);
}
#define PRu64 "%llx"
/* Max address size we deal with */
#define OF_MAX_ADDR_CELLS 4
#define OF_BAD_ADDR ((u64)-1)
@ -973,8 +972,8 @@ static u64 of_bus_default_map(fdt32_t *addr, const fdt32_t *range,
s = of_read_number(range + na + pna, ns);
da = of_read_number(addr, na);
debug("OF: default map, cp="PRu64", s="PRu64", da="PRu64"\n",
cp, s, da);
debug("OF: default map, cp=%" PRIu64 ", s=%" PRIu64
", da=%" PRIu64 "\n", cp, s, da);
if (da < cp || da >= (cp + s))
return OF_BAD_ADDR;
@ -1052,7 +1051,7 @@ static int of_translate_one(void * blob, int parent, struct of_bus *bus,
finish:
of_dump_addr("OF: parent translation for:", addr, pna);
debug("OF: with offset: "PRu64"\n", offset);
debug("OF: with offset: %" PRIu64 "\n", offset);
/* Translate it into parent bus space */
return pbus->translate(addr, offset, pna);
@ -1381,9 +1380,9 @@ int fdt_verify_alias_address(void *fdt, int anode, const char *alias, u64 addr)
dt_addr = fdt_translate_address(fdt, node, reg);
if (addr != dt_addr) {
printf("Warning: U-Boot configured device %s at address %llx,\n"
" but the device tree has it address %llx.\n",
alias, addr, dt_addr);
printf("Warning: U-Boot configured device %s at address %"
PRIx64 ",\n but the device tree has it address %"
PRIx64 ".\n", alias, addr, dt_addr);
return 0;
}

21
disk/part_efi.c
Unescape View File

@ -14,6 +14,7 @@
#include <common.h>
#include <command.h>
#include <ide.h>
#include <inttypes.h>
#include <malloc.h>
#include <part_efi.h>
#include <linux/ctype.h>
@ -553,28 +554,28 @@ static int is_gpt_valid(block_dev_desc_t *dev_desc, u64 lba,
/* Check that the my_lba entry points to the LBA that contains the GPT */
if (le64_to_cpu(pgpt_head->my_lba) != lba) {
printf("GPT: my_lba incorrect: %llX != %llX\n",
le64_to_cpu(pgpt_head->my_lba),
lba);
printf("GPT: my_lba incorrect: %llX != %" PRIX64 "\n",
le64_to_cpu(pgpt_head->my_lba),
lba);
return 0;
}
/* Check the first_usable_lba and last_usable_lba are within the disk. */
lastlba = (u64)dev_desc->lba;
if (le64_to_cpu(pgpt_head->first_usable_lba) > lastlba) {
printf("GPT: first_usable_lba incorrect: %llX > %llX\n",
le64_to_cpu(pgpt_head->first_usable_lba), lastlba);
printf("GPT: first_usable_lba incorrect: %llX > %" PRIX64 "\n",
le64_to_cpu(pgpt_head->first_usable_lba), lastlba);
return 0;
}
if (le64_to_cpu(pgpt_head->last_usable_lba) > lastlba) {
printf("GPT: last_usable_lba incorrect: %llX > %llX\n",
le64_to_cpu(pgpt_head->last_usable_lba), lastlba);
printf("GPT: last_usable_lba incorrect: %llX > %" PRIX64 "\n",
le64_to_cpu(pgpt_head->last_usable_lba), lastlba);
return 0;
}
debug("GPT: first_usable_lba: %llX last_usable_lba %llX last lba %llX\n",
le64_to_cpu(pgpt_head->first_usable_lba),
le64_to_cpu(pgpt_head->last_usable_lba), lastlba);
debug("GPT: first_usable_lba: %llX last_usable_lba %llX last lba %"
PRIX64 "\n", le64_to_cpu(pgpt_head->first_usable_lba),
le64_to_cpu(pgpt_head->last_usable_lba), lastlba);
/* Read and allocate Partition Table Entries */
*pgpt_pte = alloc_read_gpt_entries(dev_desc, pgpt_head);

25
tools/buildman/README
Unescape View File

@ -85,10 +85,10 @@ branch. Put all your commits in a branch, set the branch's upstream to a
valid value, and all will be well. Otherwise buildman will perform random
actions. Use -n to check what the random actions might be.
If you just want to build the current source tree, leave off the -b flag.
This will display results and errors as they happen. You can still look
at them later using -s. Note that buildman will assume that the source
has changed, and will build all specified boards in this case.
If you just want to build the current source tree, leave off the -b flag
and add -e. This will display results and errors as they happen. You can
still look at them later using -se. Note that buildman will assume that the
source has changed, and will build all specified boards in this case.
Buildman is optimised for building many commits at once, for many boards.
On multi-core machines, Buildman is fast because it uses most of the
@ -693,9 +693,9 @@ Quick Sanity Check
==================
If you have made changes and want to do a quick sanity check of the
currently-checked-out source, run buildman without the -b flag. This will
build the selected boards and display build status and errors as it runs
(i.e. -v amd -e are enabled automatically).
currently checked-out source, run buildman without the -b flag. This will
build the selected boards and display build status as it runs (i.e. -v is
enabled automatically). Use -e to see errors/warnings as well.
Other options
@ -752,7 +752,7 @@ an error and green indicating that a commit fixed an error. Use the -e
flag to see the full errors and -l to see which boards caused which errors.
If you really want to see build results as they happen, use -v when doing a
build (-e will be enabled automatically).
build (and -e to see the errors/warnings too).
You don't need to stick around on that branch while buildman is running. It
checks out its own copy of the source code, so you can change branches,
@ -816,11 +816,10 @@ TODO
This has mostly be written in my spare time as a response to my difficulties
in testing large series of patches. Apart from tidying up there is quite a
bit of scope for improvement. Things like better error diffs, easier access
to log files, error display while building. Also it would be nice it buildman
could 'hunt' for problems, perhaps by building a few boards for each arch,
or checking commits for changed files and building only boards which use
those files.
bit of scope for improvement. Things like better error diffs and easier
access to log files. Also it would be nice it buildman could 'hunt' for
problems, perhaps by building a few boards for each arch, or checking
commits for changed files and building only boards which use those files.
Credits

3
tools/buildman/builder.py
Unescape View File

@ -918,7 +918,8 @@ class Builder:
if self._list_error_boards:
names = []
for board in line_boards[line]:
names.append(board.target)
if not board.target in names:
names.append(board.target)
names_str = '(%s) ' % ','.join(names)
else:
names_str = ''

2
tools/buildman/builderthread.py
Unescape View File

@ -332,7 +332,7 @@ class BuilderThread(threading.Thread):
# Now write the actual build output
if keep_outputs:
patterns = ['u-boot', '*.bin', 'u-boot.dtb', '*.map',
patterns = ['u-boot', '*.bin', 'u-boot.dtb', '*.map', '*.img',
'include/autoconf.mk', 'spl/u-boot-spl',
'spl/u-boot-spl.bin']
for pattern in patterns:

3
tools/buildman/control.py
Unescape View File

@ -70,7 +70,7 @@ def ShowActions(series, why_selected, boards_selected, builder, options):
if commits:
for upto in range(0, len(series.commits), options.step):
commit = series.commits[upto]
print ' ', col.Color(col.YELLOW, commit.hash, bright=False),
print ' ', col.Color(col.YELLOW, commit.hash[:8], bright=False),
print commit.subject
print
for arg in why_selected:
@ -188,7 +188,6 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None,
else:
series = None
options.verbose = True
options.show_errors = True
# By default we have one thread per CPU. But if there are not enough jobs
# we can have fewer threads and use a high '-j' value for make.

3
tools/patman/patchstream.py
Unescape View File

@ -248,8 +248,7 @@ class PatchStream:
# Detect the start of a new commit
elif commit_match:
self.CloseCommit()
# TODO: We should store the whole hash, and just display a subset
self.commit = commit.Commit(commit_match.group(1)[:8])
self.commit = commit.Commit(commit_match.group(1))
# Detect tags in the commit message
elif tag_match:

Write Preview
Loading…
Cancel
Save