diff options
| author | Loïc Minier <loic.minier@linaro.org> | 2011-10-03 11:57:12 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-06 20:21:16 +0200 |
| commit | 9f8765805400db65b44c3edb68a638f17dd8399d (patch) | |
| tree | 154d3a7c0510087bcc7c6fb5f8f30c7be970a73e /tools/ublimage.h | |
| parent | a76406fb05f68bcf0156f456f8ba17ef076cebab (diff) | |
| download | olio-uboot-2014.01-9f8765805400db65b44c3edb68a638f17dd8399d.tar.xz olio-uboot-2014.01-9f8765805400db65b44c3edb68a638f17dd8399d.zip | |
ublimage: NAND block size isn't set at build-time
mkimage's ublimage support can't depend of build-time board configs;
instead, this should be set in ublimage.cfg. Since currently no configs
in u-boot override the NAND block size, hardcode it as such in
ublimage.h to fix a build failure with "make tools":
gcc [...] -o ublimage.o ublimage.c -c
In file included from ublimage.c:37:0:
ublimage.h:31:20: fatal error: config.h: No such file or directory
Cc: Heiko Schocher <hs@denx.de>
Cc: patches@linaro.org
Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Acked-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'tools/ublimage.h')
| -rw-r--r-- | tools/ublimage.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/ublimage.h b/tools/ublimage.h index c9266890c..93ec8eebc 100644 --- a/tools/ublimage.h +++ b/tools/ublimage.h @@ -28,12 +28,6 @@ #ifndef _UBLIMAGE_H_ #define _UBLIMAGE_H_ -#include <config.h> - -#if !defined(CONFIG_SYS_UBL_BLOCK) -#define CONFIG_SYS_UBL_BLOCK 512 -#endif - enum ublimage_cmd { CMD_INVALID, CMD_BOOT_MODE, @@ -71,6 +65,9 @@ enum ublimage_fld_types { /* Define max UBL image size */ #define UBL_IMAGE_SIZE (0x00003800u) +/* one NAND block */ +#define UBL_BLOCK_SIZE 512 + /* from sprufg5a.pdf Table 109 */ struct ubl_header { uint32_t magic; /* Magic Number, see UBL_* defines */ @@ -97,7 +94,7 @@ struct ubl_header { * Magic Number indicates fast EMIF boot). */ /* to fit in one nand block */ - unsigned char res[CONFIG_SYS_UBL_BLOCK - 8 * 4]; + unsigned char res[UBL_BLOCK_SIZE - 8 * 4]; }; #endif /* _UBLIMAGE_H_ */ |