* [U-Boot] [PATCH] Add support for operating system OSE
@ 2010-09-27 11:49 Torkel Lundgren
2010-09-27 19:23 ` Wolfgang Denk
0 siblings, 1 reply; 4+ messages in thread
From: Torkel Lundgren @ 2010-09-27 11:49 UTC (permalink / raw)
To: u-boot
Add OSE as operating system for mkimage and bootm.
---
common/cmd_bootm.c | 39 +++++++++++++++++++++++++++++++++++++++
common/image.c | 1 +
include/config_defaults.h | 1 +
include/image.h | 1 +
4 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 4c6ed48..b2c2e07 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -118,6 +118,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;
@@ -141,6 +144,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,
@@ -1382,6 +1388,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 fcb938b..85038ad 100644
--- a/common/image.c
+++ b/common/image.c
@@ -105,6 +105,7 @@ static table_entry_t uimage_os[] = {
{ IH_OS_NETBSD, "netbsd", "NetBSD", },
{ IH_OS_RTEMS, "rtems", "RTEMS", },
{ IH_OS_U_BOOT, "u-boot", "U-Boot", },
+ { IH_OS_OSE, "ose", "Enea OSE", },
#if defined(CONFIG_CMD_ELF) || defined(USE_HOSTCC)
{ IH_OS_QNX, "qnx", "QNX", },
{ IH_OS_VXWORKS, "vxworks", "VxWorks", },
diff --git a/include/config_defaults.h b/include/config_defaults.h
index 0337163..abdf3be 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 bcc08d1..18a9f0e 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)
--
1.6.3.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] Add support for operating system OSE
2010-09-27 11:49 Torkel Lundgren
@ 2010-09-27 19:23 ` Wolfgang Denk
0 siblings, 0 replies; 4+ messages in thread
From: Wolfgang Denk @ 2010-09-27 19:23 UTC (permalink / raw)
To: u-boot
Dear "Torkel Lundgren",
In message <DC6F86A94046A64094043D44A3A708F70367A990@sestoex02.enea.se> you wrote:
> This is a multi-part message in MIME format.
Please submit patches as plain text (using git send-email).
We don't want the "This is a multi-part message in MIME format." in
the commit message.
> Add OSE as operating system for mkimage and bootm.
> ---
Signed-off-by: line missing.
> index fcb938b..85038ad 100644
> --- a/common/image.c
> +++ b/common/image.c
> @@ -105,6 +105,7 @@ static table_entry_t uimage_os[] =3D {
> { IH_OS_NETBSD, "netbsd", "NetBSD", },
> { IH_OS_RTEMS, "rtems", "RTEMS", },
> { IH_OS_U_BOOT, "u-boot", "U-Boot", },
> + { IH_OS_OSE, "ose", "Enea OSE", },
Please keep this list was sorted (move IH_OS_OSE after IH_OS_NETBSD).
Thanks.
Best regards,
Wolfgang Denk
--
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
In the pitiful, multipage, connection-boxed form to which the flow-
chart has today been elaborated, it has proved to be useless as a
design tool -- programmers draw flowcharts after, not before, writing
the programs they describe. - Fred Brooks, Jr.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] Add support for operating system OSE
[not found] <077848>
@ 2010-09-28 9:05 ` Torkel Lundgren
2010-09-28 12:42 ` Wolfgang Denk
0 siblings, 1 reply; 4+ messages in thread
From: Torkel Lundgren @ 2010-09-28 9:05 UTC (permalink / raw)
To: u-boot
Add OSE as operating system for mkimage and bootm.
Signed-off-by: Torkel Lundgren <torkel.lundgren@enea.com>
---
common/cmd_bootm.c | 39 +++++++++++++++++++++++++++++++++++++++
common/image.c | 1 +
include/config_defaults.h | 1 +
include/image.h | 1 +
4 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 4c6ed48..b2c2e07 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -118,6 +118,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;
@@ -141,6 +144,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,
@@ -1382,6 +1388,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 fcb938b..3a2f25e 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 0337163..abdf3be 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 bcc08d1..18a9f0e 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)
--
1.6.3.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] Add support for operating system OSE
2010-09-28 9:05 ` [U-Boot] [PATCH] Add support for operating system OSE Torkel Lundgren
@ 2010-09-28 12:42 ` Wolfgang Denk
0 siblings, 0 replies; 4+ messages in thread
From: Wolfgang Denk @ 2010-09-28 12:42 UTC (permalink / raw)
To: u-boot
Dear Torkel Lundgren,
In message <1285664736-21181-1-git-send-email-torkel.lundgren@enea.com> you wrote:
> Add OSE as operating system for mkimage and bootm.
>
> Signed-off-by: Torkel Lundgren <torkel.lundgren@enea.com>
> ---
> common/cmd_bootm.c | 39 +++++++++++++++++++++++++++++++++++++++
> common/image.c | 1 +
> include/config_defaults.h | 1 +
> include/image.h | 1 +
> 4 files changed, 42 insertions(+), 0 deletions(-)
Applied to "next" branch.
Best regards,
Wolfgang Denk
--
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
In general, if you think something isn't in Perl, try it out, because
it usually is :-) - Larry Wall in <1991Jul31.174523.9447@netlabs.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-09-28 12:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <077848>
2010-09-28 9:05 ` [U-Boot] [PATCH] Add support for operating system OSE Torkel Lundgren
2010-09-28 12:42 ` Wolfgang Denk
2010-09-27 11:49 Torkel Lundgren
2010-09-27 19:23 ` Wolfgang Denk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox