diff options
| -rw-r--r-- | common/cmd_bootm.c | 39 | ||||
| -rw-r--r-- | common/image.c | 1 | ||||
| -rw-r--r-- | include/config_defaults.h | 1 | ||||
| -rw-r--r-- | include/image.h | 1 | 
4 files changed, 42 insertions, 0 deletions
| diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 46efd7741..db59e6f29 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -119,6 +119,9 @@ extern void lynxkdi_boot (image_header_t *);  #ifdef CONFIG_BOOTM_RTEMS  static boot_os_fn do_bootm_rtems;  #endif +#if defined(CONFIG_BOOTM_OSE) +static boot_os_fn do_bootm_ose; +#endif  #if defined(CONFIG_CMD_ELF)  static boot_os_fn do_bootm_vxworks;  static boot_os_fn do_bootm_qnxelf; @@ -142,6 +145,9 @@ static boot_os_fn *boot_os[] = {  #ifdef CONFIG_BOOTM_RTEMS  	[IH_OS_RTEMS] = do_bootm_rtems,  #endif +#if defined(CONFIG_BOOTM_OSE) +	[IH_OS_OSE] = do_bootm_ose, +#endif  #if defined(CONFIG_CMD_ELF)  	[IH_OS_VXWORKS] = do_bootm_vxworks,  	[IH_OS_QNX] = do_bootm_qnxelf, @@ -1383,6 +1389,39 @@ static int do_bootm_rtems (int flag, int argc, char * const argv[],  }  #endif /* CONFIG_BOOTM_RTEMS */ +#if defined(CONFIG_BOOTM_OSE) +static int do_bootm_ose (int flag, int argc, char * const argv[], +			   bootm_headers_t *images) +{ +	void (*entry_point)(void); + +	if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) +		return 1; + +#if defined(CONFIG_FIT) +	if (!images->legacy_hdr_valid) { +		fit_unsupported_reset ("OSE"); +		return 1; +	} +#endif + +	entry_point = (void (*)(void))images->ep; + +	printf ("## Transferring control to OSE (at address %08lx) ...\n", +		(ulong)entry_point); + +	show_boot_progress (15); + +	/* +	 * OSE Parameters: +	 *   None +	 */ +	(*entry_point)(); + +	return 1; +} +#endif /* CONFIG_BOOTM_OSE */ +  #if defined(CONFIG_CMD_ELF)  static int do_bootm_vxworks (int flag, int argc, char * const argv[],  			     bootm_headers_t *images) diff --git a/common/image.c b/common/image.c index fcb938b08..3a2f25e5a 100644 --- a/common/image.c +++ b/common/image.c @@ -103,6 +103,7 @@ static table_entry_t uimage_os[] = {  	{	IH_OS_LYNXOS,	"lynxos",	"LynxOS",		},  #endif  	{	IH_OS_NETBSD,	"netbsd",	"NetBSD",		}, +	{	IH_OS_OSE,	"ose",		"Enea OSE",		},  	{	IH_OS_RTEMS,	"rtems",	"RTEMS",		},  	{	IH_OS_U_BOOT,	"u-boot",	"U-Boot",		},  #if defined(CONFIG_CMD_ELF) || defined(USE_HOSTCC) diff --git a/include/config_defaults.h b/include/config_defaults.h index 0337163c2..abdf3beb0 100644 --- a/include/config_defaults.h +++ b/include/config_defaults.h @@ -12,6 +12,7 @@  /* Support bootm-ing different OSes */  #define CONFIG_BOOTM_LINUX 1  #define CONFIG_BOOTM_NETBSD 1 +#define CONFIG_BOOTM_OSE 1  #define CONFIG_BOOTM_RTEMS 1  #define CONFIG_GZIP 1 diff --git a/include/image.h b/include/image.h index bcc08d1a7..18a9f0e96 100644 --- a/include/image.h +++ b/include/image.h @@ -83,6 +83,7 @@  #define IH_OS_ARTOS		19	/* ARTOS	*/  #define IH_OS_UNITY		20	/* Unity OS	*/  #define IH_OS_INTEGRITY		21	/* INTEGRITY	*/ +#define IH_OS_OSE		22	/* OSE		*/  /*   * CPU Architecture Codes (supported by Linux) |