GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge git://git.denx.de/u-boot-marvell

Browse source
This commit is contained in:
Tom Rini 2015-03-05 16:41:21 -05:00
commit 65f3151f85
4 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/configs/aspenite.h
View file

@ -10,6 +10,11 @@
#ifndef __CONFIG_ASPENITE_H #ifndef __CONFIG_ASPENITE_H
#define __CONFIG_ASPENITE_H #define __CONFIG_ASPENITE_H
/*
* Generic board support
*/
#define CONFIG_SYS_GENERIC_BOARD
/* /*
* Version number information * Version number information
*/ */

4
include/configs/dreamplug.h
View file

@ -37,6 +37,10 @@
#define CONFIG_KW88F6281 1 /* SOC Name */ #define CONFIG_KW88F6281 1 /* SOC Name */
#define CONFIG_MACH_TYPE MACH_TYPE_DREAMPLUG #define CONFIG_MACH_TYPE MACH_TYPE_DREAMPLUG
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #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 * Commands configuration

5
include/configs/gplugd.h
View file

@ -25,6 +25,11 @@
#define MACH_TYPE_SHEEVAD 2625 #define MACH_TYPE_SHEEVAD 2625
#endif #endif
/*
* Generic board support
*/
#define CONFIG_SYS_GENERIC_BOARD
/* /*
* Version number information * Version number information
*/ */

1
tools/kwbimage.c
View file

@ -498,6 +498,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params,
binhdrsz = sizeof(struct opt_hdr_v1) + binhdrsz = sizeof(struct opt_hdr_v1) +
(binarye->binary.nargs + 1) * sizeof(unsigned int) + (binarye->binary.nargs + 1) * sizeof(unsigned int) +
s.st_size; s.st_size;
binhdrsz = ALIGN_SUP(binhdrsz, 32);
hdr->headersz_lsb = binhdrsz & 0xFFFF; hdr->headersz_lsb = binhdrsz & 0xFFFF;
hdr->headersz_msb = (binhdrsz & 0xFFFF0000) >> 16; hdr->headersz_msb = (binhdrsz & 0xFFFF0000) >> 16;