projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[platform/kernel/u-boot.git]
/
common
/
board_f.c
diff --git
a/common/board_f.c
b/common/board_f.c
index
e670155
..
d3444c7
100644
(file)
--- a/
common/board_f.c
+++ b/
common/board_f.c
@@
-254,11
+254,7
@@
__weak int dram_init_banksize(void)
static int init_func_i2c(void)
{
puts("I2C: ");
static int init_func_i2c(void)
{
puts("I2C: ");
-#ifdef CONFIG_SYS_I2C
i2c_init_all();
i2c_init_all();
-#else
- i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
-#endif
puts("ready\n");
return 0;
}
puts("ready\n");
return 0;
}
@@
-618,13
+614,6
@@
int setup_bdinfo(void)
return arch_setup_bdinfo();
}
return arch_setup_bdinfo();
}
-#if defined(CONFIG_MIPS) || defined(CONFIG_SH)
-static int setup_board_part1(void)
-{
- return 0;
-}
-#endif
-
#ifdef CONFIG_POST
static int init_post(void)
{
#ifdef CONFIG_POST
static int init_post(void)
{
@@
-926,6
+915,9
@@
static const init_fnc_t init_sequence_f[] = {
* - board info struct
*/
setup_dest_addr,
* - board info struct
*/
setup_dest_addr,
+#ifdef CONFIG_OF_BOARD_FIXUP
+ fix_fdt,
+#endif
#ifdef CONFIG_PRAM
reserve_pram,
#endif
#ifdef CONFIG_PRAM
reserve_pram,
#endif
@@
-945,15
+937,9
@@
static const init_fnc_t init_sequence_f[] = {
reserve_stacks,
dram_init_banksize,
show_dram_config,
reserve_stacks,
dram_init_banksize,
show_dram_config,
- setup_bdinfo,
-#if defined(CONFIG_MIPS) || defined(CONFIG_SH)
- setup_board_part1,
-#endif
INIT_FUNC_WATCHDOG_RESET
INIT_FUNC_WATCHDOG_RESET
+ setup_bdinfo,
display_new_sp,
display_new_sp,
-#ifdef CONFIG_OF_BOARD_FIXUP
- fix_fdt,
-#endif
INIT_FUNC_WATCHDOG_RESET
reloc_fdt,
reloc_bootstage,
INIT_FUNC_WATCHDOG_RESET
reloc_fdt,
reloc_bootstage,