projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mmc: fsl_esdhc_imx: disable the CMD CRC check for standard tuning
[oweals/u-boot.git]
/
common
/
board_r.c
diff --git
a/common/board_r.c
b/common/board_r.c
index bd074ebaa110d6c87680b66d4ecc1277396d6251..fa57fa9b699399d91d20a16199d68c51993328b6 100644
(file)
--- a/
common/board_r.c
+++ b/
common/board_r.c
@@
-11,13
+11,16
@@
#include <common.h>
#include <api.h>
#include <common.h>
#include <api.h>
+#include <bootstage.h>
#include <cpu_func.h>
#include <exports.h>
#include <flash.h>
#include <hang.h>
#include <image.h>
#include <irq_func.h>
#include <cpu_func.h>
#include <exports.h>
#include <flash.h>
#include <hang.h>
#include <image.h>
#include <irq_func.h>
+#include <log.h>
#include <net.h>
#include <net.h>
+#include <asm/cache.h>
#include <u-boot/crc.h>
/* TODO: can we just include all these headers whether needed or not? */
#if defined(CONFIG_CMD_BEDBUG)
#include <u-boot/crc.h>
/* TODO: can we just include all these headers whether needed or not? */
#if defined(CONFIG_CMD_BEDBUG)
@@
-311,9
+314,9
@@
static int initr_dm(void)
#ifdef CONFIG_TIMER
gd->timer = NULL;
#endif
#ifdef CONFIG_TIMER
gd->timer = NULL;
#endif
- bootstage_start(BOOTSTA
T
E_ID_ACCUM_DM_R, "dm_r");
+ bootstage_start(BOOTSTA
G
E_ID_ACCUM_DM_R, "dm_r");
ret = dm_init_and_scan(false);
ret = dm_init_and_scan(false);
- bootstage_accum(BOOTSTA
T
E_ID_ACCUM_DM_R);
+ bootstage_accum(BOOTSTA
G
E_ID_ACCUM_DM_R);
if (ret)
return ret;
if (ret)
return ret;
@@
-355,8
+358,8
@@
static int initr_announce(void)
#ifdef CONFIG_NEEDS_MANUAL_RELOC
static int initr_manual_reloc_cmdtable(void)
{
#ifdef CONFIG_NEEDS_MANUAL_RELOC
static int initr_manual_reloc_cmdtable(void)
{
- fixup_cmdtable(ll_entry_start(
cmd_tbl_t
, cmd),
- ll_entry_count(
cmd_tbl_t
, cmd));
+ fixup_cmdtable(ll_entry_start(
struct cmd_tbl
, cmd),
+ ll_entry_count(
struct cmd_tbl
, cmd));
return 0;
}
#endif
return 0;
}
#endif
@@
-370,11
+373,19
@@
static int initr_binman(void)
}
#if defined(CONFIG_MTD_NOR_FLASH)
}
#if defined(CONFIG_MTD_NOR_FLASH)
+__weak int is_flash_available(void)
+{
+ return 1;
+}
+
static int initr_flash(void)
{
ulong flash_size = 0;
bd_t *bd = gd->bd;
static int initr_flash(void)
{
ulong flash_size = 0;
bd_t *bd = gd->bd;
+ if (!is_flash_available())
+ return 0;
+
puts("Flash: ");
if (board_flash_wp_on())
puts("Flash: ");
if (board_flash_wp_on())