projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
splash_source: add support for filesystem formatted mmc
[oweals/u-boot.git]
/
board
/
compulab
/
cm_t35
/
cm_t35.c
diff --git
a/board/compulab/cm_t35/cm_t35.c
b/board/compulab/cm_t35/cm_t35.c
index 43463d5b4701cf0220049e3f82e34f47d40e608e..189d903b6e39c804edc444041f235e1bbafb6a66 100644
(file)
--- a/
board/compulab/cm_t35/cm_t35.c
+++ b/
board/compulab/cm_t35/cm_t35.c
@@
-19,6
+19,7
@@
#include <i2c.h>
#include <usb.h>
#include <mmc.h>
#include <i2c.h>
#include <usb.h>
#include <mmc.h>
+#include <splash.h>
#include <twl4030.h>
#include <linux/compiler.h>
#include <twl4030.h>
#include <linux/compiler.h>
@@
-59,11
+60,19
@@
void get_board_mem_timings(struct board_sdrc_timings *timings)
}
#endif
}
#endif
-#define CM_T35_SPLASH_NAND_OFFSET 0x100000
+struct splash_location splash_locations[] = {
+ {
+ .name = "nand",
+ .storage = SPLASH_STORAGE_NAND,
+ .flags = SPLASH_STORAGE_RAW,
+ .offset = 0x100000,
+ },
+};
int splash_screen_prepare(void)
{
int splash_screen_prepare(void)
{
- return cl_splash_screen_prepare(CM_T35_SPLASH_NAND_OFFSET);
+ return splash_source_load(splash_locations,
+ ARRAY_SIZE(splash_locations));
}
/*
}
/*
@@
-96,13
+105,13
@@
int board_init(void)
*/
u32 get_board_rev(void)
{
*/
u32 get_board_rev(void)
{
- return cl_eeprom_get_board_rev();
+ return cl_eeprom_get_board_rev(
CONFIG_SYS_I2C_EEPROM_BUS
);
};
int misc_init_r(void)
{
cl_print_pcb_info();
};
int misc_init_r(void)
{
cl_print_pcb_info();
-
dieid_num_r
();
+
omap_die_id_display
();
return 0;
}
return 0;
}
@@
-429,11
+438,11
@@
static int handle_mac_address(void)
if (rc)
return 0;
if (rc)
return 0;
- rc = cl_eeprom_read_mac_addr(enetaddr);
+ rc = cl_eeprom_read_mac_addr(enetaddr
, CONFIG_SYS_I2C_EEPROM_BUS
);
if (rc)
return rc;
if (rc)
return rc;
- if (!is_valid_eth
er_
addr(enetaddr))
+ if (!is_valid_ethaddr(enetaddr))
return -1;
return eth_setenv_enetaddr("ethaddr", enetaddr);
return -1;
return eth_setenv_enetaddr("ethaddr", enetaddr);