diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-15 10:58:08 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-08-15 10:58:08 +0200 |
| commit | bd1fbce74f79d647af4ee338f9193351811e80f4 (patch) | |
| tree | dc119b20a406c2f7f9df0d1b7990deb876a402a4 /include | |
| parent | 53e145d550c1ee9db907fccd7ad4d98d6aee806b (diff) | |
| parent | dd5dfb6ff467f6d640e48046acedfe435c649c94 (diff) | |
| download | barebox-bd1fbce74f79d647af4ee338f9193351811e80f4.tar.gz barebox-bd1fbce74f79d647af4ee338f9193351811e80f4.tar.xz | |
Merge branch 'for-next/imx8-hab'
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/sections.h | 4 | ||||
| -rw-r--r-- | include/crypto/pbl-sha.h | 13 | ||||
| -rw-r--r-- | include/pbl.h | 2 | ||||
| -rw-r--r-- | include/stdio.h | 17 |
4 files changed, 30 insertions, 6 deletions
diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h index 0eb18f614b..f584cad48d 100644 --- a/include/asm-generic/sections.h +++ b/include/asm-generic/sections.h @@ -8,12 +8,12 @@ extern char __bare_init_start[], __bare_init_end[]; extern char _end[]; extern char __image_start[]; extern char __image_end[]; +extern char __piggydata_start[]; extern void *_barebox_image_size; extern void *_barebox_bare_init_size; extern void *_barebox_pbl_size; #define barebox_image_size (__image_end - __image_start) #define barebox_bare_init_size (unsigned int)&_barebox_bare_init_size -#define barebox_pbl_size (unsigned int)&_barebox_pbl_size - +#define barebox_pbl_size (__piggydata_start - __image_start) #endif /* _ASM_GENERIC_SECTIONS_H_ */ diff --git a/include/crypto/pbl-sha.h b/include/crypto/pbl-sha.h new file mode 100644 index 0000000000..7d323ab479 --- /dev/null +++ b/include/crypto/pbl-sha.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __PBL_SHA_H_ + +#define __PBL_SHA_H_ + +#include <digest.h> +#include <types.h> + +int sha256_init(struct digest *desc); +int sha256_update(struct digest *desc, const void *data, unsigned long len); +int sha256_final(struct digest *desc, u8 *out); + +#endif /* __PBL-SHA_H_ */ diff --git a/include/pbl.h b/include/pbl.h index 787bd8293f..1917a7633f 100644 --- a/include/pbl.h +++ b/include/pbl.h @@ -11,6 +11,8 @@ extern unsigned long free_mem_ptr; extern unsigned long free_mem_end_ptr; void pbl_barebox_uncompress(void *dest, void *compressed_start, unsigned int len); +int pbl_barebox_verify(void *compressed_start, unsigned int len, void *hash, + unsigned int hash_len); #ifdef __PBL__ #define IN_PBL 1 diff --git a/include/stdio.h b/include/stdio.h index 7b2a42b817..46e277889d 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -71,23 +71,32 @@ static inline int ctrlc (void) #if (!defined(__PBL__) && !defined(CONFIG_CONSOLE_NONE)) || \ (defined(__PBL__) && defined(CONFIG_PBL_CONSOLE)) int printf(const char *fmt, ...) __attribute__ ((format(__printf__, 1, 2))); + +static inline int puts(const char *s) +{ + return console_puts(CONSOLE_STDOUT, s); +} + +static inline void putchar(char c) +{ + console_putc(CONSOLE_STDOUT, c); +} #else static int printf(const char *fmt, ...) __attribute__ ((format(__printf__, 1, 2))); static inline int printf(const char *fmt, ...) { return 0; } -#endif - static inline int puts(const char *s) { - return console_puts(CONSOLE_STDOUT, s); + return 0; } static inline void putchar(char c) { - console_putc(CONSOLE_STDOUT, c); + return; } +#endif /* * FILE based functions |