Add support for booting of INTEGRITY operating system uImages
PATCH v2 1/1 Add support for booting of INTEGRITY operating system uImages
Signed-off-by Peter Tyser <[email protected]>
---
This should be applied after "[PATCH v2] Remove support for booting ARTOS images".
README | 5 ++- common/cmd_bootm.c | 38 +++++++++++++++++++++++++++++++++ common/image.c | 3 ++ doc/uImage.FIT/source_file_format.txt | 2 +- include/image.h | 1 + 5 files changed, 46 insertions(+), 3 deletions(-)
README +3 -2
@@ -3030,8 +3030,9 @@ details; basically, the header defines the following image properties: * Target Operating System (Provisions for OpenBSD, NetBSD, FreeBSD, 4.4BSD, Linux, SVR4, Esix, Solaris, Irix, SCO, Dell, NCR, VxWorks, - LynxOS, pSOS, QNX, RTEMS; - Currently supported: Linux, NetBSD, VxWorks, QNX, RTEMS, LynxOS). + LynxOS, pSOS, QNX, RTEMS, INTEGRITY; + Currently supported: Linux, NetBSD, VxWorks, QNX, RTEMS, LynxOS, + INTEGRITY). * Target CPU Architecture (Provisions for Alpha, ARM, AVR32, Intel x86, IA64, MIPS, NIOS, PowerPC, IBM S390, SuperH, Sparc, Sparc 64 Bit; Currently supported: ARM, AVR32, Intel x86, MIPS, NIOS, PowerPC).
common/cmd_bootm.c +38 -0
@@ -108,6 +108,9 @@ static boot_os_fn do_bootm_qnxelf;int do_bootvx (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]);int do_bootelf (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]);#endif +#if defined(CONFIG_INTEGRITY ) +static boot_os_fn do_bootm_integrity; +#endif ulong load_addr =CFG_LOAD_ADDR ;/* Default Load Address */ static bootm_headers_t images;/* pointers to os/initrd/fdt images */
@@ -452,6 +455,11 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])break ;#endif +#ifdef CONFIG_INTEGRITY +case IH_OS_INTEGRITY : +do_bootm_integrity (0 , argc, argv, &images); +break ; +#endif }show_boot_progress (-9 );
@@ -1144,3 +1152,33 @@ static int do_bootm_qnxelf(int flag, int argc, char *argv[], return 1; }#endif + +#ifdef CONFIG_INTEGRITY +static int do_bootm_integrity (int flag,int argc,char *argv[], +bootm_headers_t *images) +{ +void (*entry_point)(void ); + +#if defined(CONFIG_FIT ) +if (!images->legacy_hdr_valid) { +fit_unsupported_reset ("INTEGRITY" ); +return 1 ; + } +#endif + + entry_point = (void (*)(void ))images->ep; + +printf ("## Transferring control to INTEGRITY (at address %08lx) ...\n" , + (ulong )entry_point); + +show_boot_progress (15 ); + +/* +* INTEGRITY Parameters: +* None +*/ + (*entry_point)(); + +return 1 ; +} +#endif
common/image.c +3 -0
@@ -116,6 +116,9 @@ static table_entry_t uimage_os[] = { { IH_OS_QNX, "qnx", "QNX", }, { IH_OS_VXWORKS, "vxworks", "VxWorks", }, #endif +#if defined(CONFIG_INTEGRITY) || defined(USE_HOSTCC) + { IH_OS_INTEGRITY,"integrity", "INTEGRITY", }, +#endif #ifdef USE_HOSTCC { IH_OS_4_4BSD, "4_4bsd", "4_4BSD", }, { IH_OS_DELL, "dell", "Dell", },
doc/uImage.FIT/source_file_format.txt +1 -1
@@ -169,7 +169,7 @@ the '/images' node should have the following layout: - os : OS name, mandatory for type="kernel", valid OS names are: "openbsd", "netbsd", "freebsd", "4_4bsd", "linux", "svr4", "esix", "solaris", "irix", "sco", "dell", "ncr", "lynxos", "vxworks", "psos", "qnx", "u_boot", - "rtems", "unity". + "rtems", "unity", "integrity". - arch : Architecture name, mandatory for types: "standalone", "kernel", "firmware", "ramdisk" and "fdt". Valid architecture names are: "alpha", "arm", "i386", "ia64", "mips", "mips64", "ppc", "s390", "sh", "sparc",
include/image.h +1 -0
@@ -85,6 +85,7 @@#define IH_OS_RTEMS 18/* RTEMS */ #define IH_OS_ARTOS 19/* ARTOS */ #define IH_OS_UNITY 20/* Unity OS */ +#define IH_OS_INTEGRITY 21/* INTEGRITY */ /* * CPU Architecture Codes (supported by Linux)
Signature · 1 line
1.5.4.3
Wolfgang Denk
AppliedPATCH v2 1/1 Add support for booting of INTEGRITY operating system uImages
Dear Peter Tyser,
Quoted 11 lines · In message <[email protected]> you wrote:
Signed-off-by Peter Tyser <[email protected]>---
This should be applied after "[PATCH v2] Remove support for booting ARTOS images".
README | 5 ++- common/cmd_bootm.c | 38 +++++++++++++++++++++++++++++++++ common/image.c | 3 ++ doc/uImage.FIT/source_file_format.txt | 2 +- include/image.h | 1 + 5 files changed, 46 insertions(+), 3 deletions(-)
Applied, thanks.
Best regards,
Wolfgang Denk
Signature · 8 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A UNIX saleslady, Lenore,
Enjoys work, but she likes the beach more.
She found a good way
To combine work and play:
She sells C shells by the seashore.