"Das U-Boot" Source Tree
common/splash_source.c: Change bmp_load_addr to ulong from u32
The variable bmp_load_addr is used to hold the address in memory of
where to put the splash image (as a bmp). For 32/64bit correctness, this
needs to be a ulong and not u32 today.
Signed-off-by: Tom Rini <trini@konsulko.com>
+10
-10
+10
-10
common/splash_source.c
+10
-10
common/splash_source.c
···
26
26
27
27
#ifdef CONFIG_SPI_FLASH
28
28
static struct spi_flash *sf;
29
-
static int splash_sf_read_raw(u32 bmp_load_addr, int offset, size_t read_size)
29
+
static int splash_sf_read_raw(ulong bmp_load_addr, int offset, size_t read_size)
30
30
{
31
31
if (!sf) {
32
32
sf = spi_flash_probe(CONFIG_SF_DEFAULT_BUS,
···
40
40
return spi_flash_read(sf, offset, read_size, (void *)(uintptr_t)bmp_load_addr);
41
41
}
42
42
#else
43
-
static int splash_sf_read_raw(u32 bmp_load_addr, int offset, size_t read_size)
43
+
static int splash_sf_read_raw(ulong bmp_load_addr, int offset, size_t read_size)
44
44
{
45
45
debug("%s: sf support not available\n", __func__);
46
46
return -ENOSYS;
···
48
48
#endif
49
49
50
50
#ifdef CONFIG_CMD_NAND
51
-
static int splash_nand_read_raw(u32 bmp_load_addr, int offset, size_t read_size)
51
+
static int splash_nand_read_raw(ulong bmp_load_addr, int offset, size_t read_size)
52
52
{
53
53
struct mtd_info *mtd = get_nand_dev_by_index(nand_curr_device);
54
54
return nand_read_skip_bad(mtd, offset,
···
57
57
(u_char *)bmp_load_addr);
58
58
}
59
59
#else
60
-
static int splash_nand_read_raw(u32 bmp_load_addr, int offset, size_t read_size)
60
+
static int splash_nand_read_raw(ulong bmp_load_addr, int offset, size_t read_size)
61
61
{
62
62
debug("%s: nand support not available\n", __func__);
63
63
return -ENOSYS;
64
64
}
65
65
#endif
66
66
67
-
static int splash_mmc_read_raw(u32 bmp_load_addr, struct splash_location *location,
67
+
static int splash_mmc_read_raw(ulong bmp_load_addr, struct splash_location *location,
68
68
size_t read_size)
69
69
{
70
70
struct disk_partition partition;
···
89
89
}
90
90
91
91
static int splash_storage_read_raw(struct splash_location *location,
92
-
u32 bmp_load_addr, size_t read_size)
92
+
ulong bmp_load_addr, size_t read_size)
93
93
{
94
94
u32 offset;
95
95
···
111
111
return -EINVAL;
112
112
}
113
113
114
-
static int splash_load_raw(struct splash_location *location, u32 bmp_load_addr)
114
+
static int splash_load_raw(struct splash_location *location, ulong bmp_load_addr)
115
115
{
116
116
struct bmp_header *bmp_hdr;
117
117
int res;
···
252
252
253
253
#define SPLASH_SOURCE_DEFAULT_FILE_NAME "splash.bmp"
254
254
255
-
static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr)
255
+
static int splash_load_fs(struct splash_location *location, ulong bmp_load_addr)
256
256
{
257
257
int res = 0;
258
258
loff_t bmp_size;
···
342
342
}
343
343
344
344
#ifdef CONFIG_FIT
345
-
static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr)
345
+
static int splash_load_fit(struct splash_location *location, ulong bmp_load_addr)
346
346
{
347
347
int res;
348
348
int node_offset;
···
439
439
struct splash_location *splash_location;
440
440
char *env_splashimage_value;
441
441
char *devpart;
442
-
u32 bmp_load_addr;
442
+
ulong bmp_load_addr;
443
443
444
444
env_splashimage_value = env_get("splashimage");
445
445
if (env_splashimage_value == NULL)