diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-05 16:41:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-05 20:50:31 -0500 |
| commit | 65f3151f85cb3fe91b91153dce6e03798ef3bc85 (patch) | |
| tree | a40daeaf1110c7dd6cb17294b940561f444eb395 | |
| parent | 1c6f6a6ef9f3edf38360a204bc62de83a8039df3 (diff) | |
| parent | dbfc4c93f4d8cb495a4fd83b7edbbc3db1e04816 (diff) | |
| download | talos-obmc-uboot-65f3151f85cb3fe91b91153dce6e03798ef3bc85.tar.gz talos-obmc-uboot-65f3151f85cb3fe91b91153dce6e03798ef3bc85.zip | |
Merge git://git.denx.de/u-boot-marvell
| -rw-r--r-- | include/configs/aspenite.h | 5 | ||||
| -rw-r--r-- | include/configs/dreamplug.h | 4 | ||||
| -rw-r--r-- | include/configs/gplugd.h | 5 | ||||
| -rw-r--r-- | tools/kwbimage.c | 1 |
4 files changed, 15 insertions, 0 deletions
diff --git a/include/configs/aspenite.h b/include/configs/aspenite.h index 727b14a6c2..47760ef7ba 100644 --- a/include/configs/aspenite.h +++ b/include/configs/aspenite.h @@ -11,6 +11,11 @@ #define __CONFIG_ASPENITE_H /* + * Generic board support + */ +#define CONFIG_SYS_GENERIC_BOARD + +/* * Version number information */ #define CONFIG_IDENT_STRING "\nMarvell-Aspenite DB" diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 981233a070..ea6e5c0329 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -37,6 +37,10 @@ #define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_MACH_TYPE MACH_TYPE_DREAMPLUG #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ +#define CONFIG_SYS_GENERIC_BOARD + +/* Add target to build it automatically upon "make" */ +#define CONFIG_BUILD_TARGET "u-boot.kwb" /* * Commands configuration diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 404c56af10..0ac198df8d 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -26,6 +26,11 @@ #endif /* + * Generic board support + */ +#define CONFIG_SYS_GENERIC_BOARD + +/* * Version number information */ #define CONFIG_IDENT_STRING "\nMarvell-gplugD" diff --git a/tools/kwbimage.c b/tools/kwbimage.c index de5c80847e..9540e7eb84 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -498,6 +498,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params, binhdrsz = sizeof(struct opt_hdr_v1) + (binarye->binary.nargs + 1) * sizeof(unsigned int) + s.st_size; + binhdrsz = ALIGN_SUP(binhdrsz, 32); hdr->headersz_lsb = binhdrsz & 0xFFFF; hdr->headersz_msb = (binhdrsz & 0xFFFF0000) >> 16; |
