From: Simon Glass Date: Thu, 16 May 2013 13:53:19 +0000 (+0000) Subject: bootstage: Introduce sub-IDs for use with image loading X-Git-Tag: v2013.07-rc1~39 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a2cc9bf4c121c3ab7be73a9e12f3d3abab6fa81d;p=u-boot bootstage: Introduce sub-IDs for use with image loading Loading a ramdisk, kernel or FDT goes through similar stages. Create a block of IDs for each task, and define a consistent numbering within the block. This will allow use of common code for image loading. Signed-off-by: Simon Glass --- diff --git a/include/bootstage.h b/include/bootstage.h index 6dc0422bac..e29e9ee43a 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -37,6 +37,24 @@ enum bootstage_flags { BOOTSTAGEF_ALLOC = 1 << 1, /* Allocate an id */ }; +/* bootstate sub-IDs used for kernel and ramdisk ranges */ +enum { + BOOTSTAGE_SUB_FORMAT, + BOOTSTAGE_SUB_FORMAT_OK, + BOOTSTAGE_SUB_NO_UNIT_NAME, + BOOTSTAGE_SUB_UNIT_NAME, + BOOTSTAGE_SUB_SUBNODE, + + BOOTSTAGE_SUB_CHECK, + BOOTSTAGE_SUB_HASH = 5, + BOOTSTAGE_SUB_CHECK_ARCH = 5, + BOOTSTAGE_SUB_CHECK_ALL, + BOOTSTAGE_SUB_GET_DATA, + BOOTSTAGE_SUB_CHECK_ALL_OK = 7, + BOOTSTAGE_SUB_GET_DATA_OK, + BOOTSTAGE_SUB_LOAD, +}; + /* * A list of boot stages that we know about. Each of these indicates the * state that we are at, and the action that we are about to perform. For @@ -137,10 +155,12 @@ enum bootstage_id { BOOTSTAGE_ID_NET_DONE_ERR, BOOTSTAGE_ID_NET_DONE, + BOOTSTAGE_ID_FIT_FDT_START = 90, /* * Boot stages related to loading a FIT image. Some of these are a * bit wonky. */ + BOOTSTAGE_ID_FIT_KERNEL_START = 100, BOOTSTAGE_ID_FIT_FORMAT = 100, BOOTSTAGE_ID_FIT_NO_UNIT_NAME, BOOTSTAGE_ID_FIT_UNIT_NAME, @@ -161,6 +181,8 @@ enum bootstage_id { BOOTSTAGE_ID_FIT_LOADADDR, BOOTSTAGE_ID_OVERWRITTEN, + /* Next 10 IDs used by BOOTSTAGE_SUB_... */ + BOOTSTAGE_ID_FIT_RD_START = 120, /* Ramdisk stages */ BOOTSTAGE_ID_FIT_RD_FORMAT = 120, BOOTSTAGE_ID_FIT_RD_FORMAT_OK, BOOTSTAGE_ID_FIT_RD_NO_UNIT_NAME,