diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-23 13:53:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-23 14:56:10 -0400 |
| commit | 5f757cdcc6efbefec09b8f964a234f84ff9fa7f6 (patch) | |
| tree | e8058651bd0319757d33fb7a949b9491211de7c7 /arch/sandbox/include/asm | |
| parent | bba97cd2c96ae0c21ad916a9c4eb363fe569a2f9 (diff) | |
| parent | f3d46bd658ef4df575ec26c29e472ac858723159 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/sandbox/include/asm')
| -rw-r--r-- | arch/sandbox/include/asm/bitops.h | 2 | ||||
| -rw-r--r-- | arch/sandbox/include/asm/u-boot-sandbox.h | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/sandbox/include/asm/bitops.h b/arch/sandbox/include/asm/bitops.h index e807c4ef34..f1a7aeee93 100644 --- a/arch/sandbox/include/asm/bitops.h +++ b/arch/sandbox/include/asm/bitops.h @@ -1,6 +1,8 @@ /* * Copyright (c) 2011 The Chromium OS Authors. * + * Modified from Linux arch/arm/include/asm/bitops.h + * * Copyright 1995, Russell King. * Various bits and pieces copyrights include: * Linus Torvalds (test_bit). diff --git a/arch/sandbox/include/asm/u-boot-sandbox.h b/arch/sandbox/include/asm/u-boot-sandbox.h index d5b9361683..da87cc3040 100644 --- a/arch/sandbox/include/asm/u-boot-sandbox.h +++ b/arch/sandbox/include/asm/u-boot-sandbox.h @@ -75,4 +75,12 @@ int pci_unmap_physmem(const void *addr, unsigned long len, */ void sandbox_set_enable_pci_map(int enable); +/** + * sandbox_read_fdt_from_file() - Read a device tree from a file + * + * Read a device tree file from a host file and set it up for use as the + * control FDT. + */ +int sandbox_read_fdt_from_file(void); + #endif /* _U_BOOT_SANDBOX_H_ */ |