projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm: Add support for scsi/sata based devices
[oweals/u-boot.git]
/
include
/
bootstage.h
diff --git
a/include/bootstage.h
b/include/bootstage.h
index df13ab2f63eddbb075d5d2cc2bdffacccd88e68b..a589be6316ee45ff73e7102143523599f5a5c6eb 100644
(file)
--- a/
include/bootstage.h
+++ b/
include/bootstage.h
@@
-11,7
+11,7
@@
#ifndef _BOOTSTAGE_H
#define _BOOTSTAGE_H
#ifndef _BOOTSTAGE_H
#define _BOOTSTAGE_H
-/*
The number of boot stage records available for the user
*/
+/*
Define this for host tools
*/
#ifndef CONFIG_BOOTSTAGE_USER_COUNT
#define CONFIG_BOOTSTAGE_USER_COUNT 20
#endif
#ifndef CONFIG_BOOTSTAGE_USER_COUNT
#define CONFIG_BOOTSTAGE_USER_COUNT 20
#endif
@@
-86,9
+86,9
@@
enum bootstage_id {
BOOTSTAGE_ID_POST_FAIL_R, /* Post failure reported after reloc */
/*
BOOTSTAGE_ID_POST_FAIL_R, /* Post failure reported after reloc */
/*
- * This set is reported ony by x86, and the meaning is different. In
+ * This set is reported on
l
y by x86, and the meaning is different. In
* this case we are reporting completion of a particular stage.
* this case we are reporting completion of a particular stage.
- * This should probably change in he x86 code (which doesn't report
+ * This should probably change in
t
he x86 code (which doesn't report
* errors in any case), but discussion this can perhaps wait until we
* have a generic board implementation.
*/
* errors in any case), but discussion this can perhaps wait until we
* have a generic board implementation.
*/
@@
-168,6
+168,7
@@
enum bootstage_id {
BOOTSTAGE_ID_NAND_FIT_READ = 150,
BOOTSTAGE_ID_NAND_FIT_READ_OK,
BOOTSTAGE_ID_NAND_FIT_READ = 150,
BOOTSTAGE_ID_NAND_FIT_READ_OK,
+ BOOTSTAGE_ID_FIT_LOADABLE_START = 160, /* for Loadable Images */
/*
* These boot stages are new, higher level, and not directly related
* to the old boot progress numbers. They are useful for recording
/*
* These boot stages are new, higher level, and not directly related
* to the old boot progress numbers. They are useful for recording
@@
-194,6
+195,10
@@
enum bootstage_id {
BOOTSTAGE_ID_MAIN_CPU_READY,
BOOTSTAGE_ID_ACCUM_LCD,
BOOTSTAGE_ID_MAIN_CPU_READY,
BOOTSTAGE_ID_ACCUM_LCD,
+ BOOTSTAGE_ID_ACCUM_SCSI,
+ BOOTSTAGE_ID_ACCUM_SPI,
+ BOOTSTAGE_ID_ACCUM_DECOMP,
+ BOOTSTAGE_ID_FPGA_INIT,
/* a few spare for the user, from here */
BOOTSTAGE_ID_USER,
/* a few spare for the user, from here */
BOOTSTAGE_ID_USER,
@@
-208,7
+213,9
@@
enum bootstage_id {
*/
ulong timer_get_boot_us(void);
*/
ulong timer_get_boot_us(void);
-#if !defined(CONFIG_SPL_BUILD) && !defined(USE_HOSTCC)
+#if defined(USE_HOSTCC)
+#define show_boot_progress(val) do {} while (0)
+#else
/*
* Board code can implement show_boot_progress() if needed.
*
/*
* Board code can implement show_boot_progress() if needed.
*
@@
-216,8
+223,6
@@
ulong timer_get_boot_us(void);
* has occurred.
*/
void show_boot_progress(int val);
* has occurred.
*/
void show_boot_progress(int val);
-#else
-#define show_boot_progress(val) do {} while (0)
#endif
#if defined(CONFIG_BOOTSTAGE) && !defined(CONFIG_SPL_BUILD) && \
#endif
#if defined(CONFIG_BOOTSTAGE) && !defined(CONFIG_SPL_BUILD) && \