[U-Boot-Users] [PATCH] ARTOS boot support for u-boot

17 Apr 2003

Wolfgang hi
The following patch against u-boot-0.3.0 adds support for booting ARTOS 
images
using u-boot. ARTOS is a custom in-house operating system in use by my 
company.
We're in the process of moving some features of our in house boot-loader
over to u-boot. I present the features to the mailing list in case 
someone else
is working in anything similar, and would like to coordinate our efforts.
o VLAN support and TOS configuration and support.
o Two level access password support.
o Different boot-modes.
o Cisco router like command interface with history and command completion.
o UDP-based same-LAN terminal access.
o Factory testing framework.
o More DHCP parameters support.
o CDP support.
o DHCP lease time information passed to the loaded kernel.
Looking forward to hear your suggestions.
Regards
Pantelis
diff -ruNb u-boot-0.3.0-orig/CREDITS u-boot-0.3.0/CREDITS

--- u-boot-0.3.0-orig/CREDITS	Wed Apr 16 10:56:20 2003
+++ u-boot-0.3.0/CREDITS	Thu Apr 17 14:32:28 2003
@@ -286,3 +286,7 @@
 E: azu@sysgo.de
 D: Overall improvements on StrongARM, ARM720TDMI; Support for Tuxscreen; initial PCMCIA support for ARM
 W: www.elinos.com
+
+N: Pantelis Antoniou
+E: panto@intracom.gr
+D: NETVIA board support, ARTOS support.
diff -ruNb u-boot-0.3.0-orig/README u-boot-0.3.0/README
--- u-boot-0.3.0-orig/README	Wed Apr 16 10:56:20 2003
+++ u-boot-0.3.0/README	Thu Apr 17 14:31:16 2003
@@ -343,7 +343,8 @@
    	CONFIG_GTH,        CONFIG_RPXClassic, CONFIG_rsdproto,
    	CONFIG_IAD210,     CONFIG_RPXlite,    CONFIG_sbc8260,
    	CONFIG_EBONY,      CONFIG_sacsng,     CONFIG_FPS860L,
-		CONFIG_V37,        CONFIG_ELPT860,    CONFIG_CMI
+		CONFIG_V37,        CONFIG_ELPT860,    CONFIG_CMI,
+		CONFIG_NETVIA
ARM based boards:
    	-----------------
@@ -1726,7 +1727,7 @@
     FPS850L_config	  Sandpoint8240_config	sbc8260_config
     GENIETV_config	  TQM823L_config	PIP405_config
     GEN860T_config	  EBONY_config		FPS860L_config
-    ELPT860_config	  cmi_mpc5xx_config
+    ELPT860_config	  cmi_mpc5xx_config	NETVIA_config
Note: for some board special configuration names may exist; check  if
       additional  information is available from the board vendor; for
@@ -2036,8 +2037,8 @@
* Target Operating System (Provisions for OpenBSD, NetBSD, FreeBSD,
   4.4BSD, Linux, SVR4, Esix, Solaris, Irix, SCO, Dell, NCR, VxWorks,
-  LynxOS, pSOS, QNX;
-  Currently supported: Linux, NetBSD, VxWorks, QNX).
+  LynxOS, pSOS, QNX, ARTOS;
+  Currently supported: Linux, NetBSD, VxWorks, QNX, ARTOS).
 * Target CPU Architecture (Provisions for Alpha, ARM, Intel x86,
   IA64, MIPS, MIPS, PowerPC, IBM S390, SuperH, Sparc, Sparc 64 Bit;
   Currently supported: PowerPC).
diff -ruNb u-boot-0.3.0-orig/common/cmd_bootm.c u-boot-0.3.0/common/cmd_bootm.c
--- u-boot-0.3.0-orig/common/cmd_bootm.c	Wed Apr 16 10:56:20 2003
+++ u-boot-0.3.0/common/cmd_bootm.c	Wed Apr 16 13:24:15 2003
@@ -31,6 +31,7 @@
 #include <image.h>
 #include <malloc.h>
 #include <zlib.h>
+#include <environment.h>
 #include <asm/byteorder.h>
 #if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
 #include <rtc.h>
@@ -104,6 +105,9 @@
 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 /* CFG_CMD_ELF */
+#ifdef CONFIG_PPC
+static boot_os_Fcn do_bootm_artos;
+#endif
image_header_t header;
@@ -326,6 +330,12 @@
    		      addr, len_ptr, verify);
        break;
 #endif /* CFG_CMD_ELF */
+#ifdef CONFIG_PPC
+	case IH_OS_ARTOS:
+	    do_bootm_artos  (cmdtp, flag, argc, argv,
+			     addr, len_ptr, verify);
+	    break;
+#endif
    }
SHOW_BOOT_PROGRESS (-9);
@@ -705,6 +715,88 @@
    (*loader) (gd->bd, img_addr, consdev, cmdline);
 }
+#ifdef CONFIG_PPC
+
+/* Function that returns a character from the environment */
+extern uchar (*env_get_char)(int);
+
+static void
+do_bootm_artos (cmd_tbl_t *cmdtp, int flag,
+		int	argc, char *argv[],
+		ulong	addr,
+		ulong	*len_ptr,
+		int	verify)
+{
+	DECLARE_GLOBAL_DATA_PTR;
+	ulong top;
+	char *s, *cmdline;
+	char **fwenv, **ss;
+	int i, j, nxt, len, envno, envsz;
+	bd_t *kbd;
+	void (*entry)(bd_t *bd, char *cmdline, char **fwenv, ulong top);
+	image_header_t *hdr = &header;
+
+	/*
+	 * Booting an ARTOS kernel image + application
+	 */
+
+	/* place data at the top of memory */
+	top = gd->bd->bi_memstart + gd->bd->bi_memsize;
+
+	/* first check the artos specific boot args, then the linux args*/
+	if ((s = getenv("abootargs")) == NULL && (s = getenv("bootargs")) == NULL)
+		s = "";
+
+	/* get length of cmdline, and place it */
+	len = strlen(s);
+	top = (top - (len + 1)) & ~0xF;
+	cmdline = (char *)top;
+	debug ("## cmdline at 0x%08lX ", top);
+	strcpy(cmdline, s);
+
+	/* copy bdinfo */
+	top = (top - sizeof(bd_t)) & ~0xF;
+	debug ("## bd at 0x%08lX ", top);
+	kbd = (bd_t *)top;
+	memcpy(kbd, gd->bd, sizeof(bd_t));
+
+	/* first find number of env entries, and their size */
+	envno = 0;
+	envsz = 0;
+	for (i = 0; env_get_char(i) != '\0'; i = nxt + 1) {
+		for (nxt = i; env_get_char(nxt) != '\0'; ++nxt)
+			;
+		envno++;
+		envsz += (nxt - i) + 1;	/* plus trailing zero */
+	}
+	envno++;	/* plus the terminating zero */
+	debug ("## %u envvars total size %u ", envno, envsz);
+
+	top = (top - sizeof(char **)*envno) & ~0xF;
+	fwenv = (char **)top;
+	debug ("## fwenv at 0x%08lX ", top);
+
+	top = (top - envsz) & ~0xF;
+	s = (char *)top;
+	ss = fwenv;
+
+	/* now copy them */
+	for (i = 0; env_get_char(i) != '\0'; i = nxt + 1) {
+		for (nxt = i; env_get_char(nxt) != '\0'; ++nxt)
+			;
+		*ss++ = s;
+		for (j = i; j < nxt; ++j)
+			*s++ = env_get_char(j);
+		*s++ = '\0';
+	}
+	*ss++ = NULL;	/* terminate */
+
+	entry = (void (*)(bd_t *, char *, char **, ulong))ntohl(hdr->ih_ep);
+	(*entry)(kbd, cmdline, fwenv, top);
+}
+#endif
+
+
 #if (CONFIG_COMMANDS & CFG_CMD_BOOTD)
 int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -826,6 +918,7 @@
    case IH_OS_VXWORKS:	os = "VxWorks";			break;
    case IH_OS_QNX:		os = "QNX";			break;
    case IH_OS_U_BOOT:	os = "U-Boot";			break;
+	case IH_OS_ARTOS:	os = "ARTOS";			break;
    default:		os = "Unknown OS";		break;
    }
diff -ruNb u-boot-0.3.0-orig/include/image.h u-boot-0.3.0/include/image.h
--- u-boot-0.3.0-orig/include/image.h	Wed Apr 16 10:56:20 2003
+++ u-boot-0.3.0/include/image.h	Wed Apr 16 10:56:51 2003
@@ -45,6 +45,7 @@
 #define IH_OS_PSOS		15	/* pSOS		*/
 #define IH_OS_QNX		16	/* QNX		*/
 #define IH_OS_U_BOOT		17	/* Firmware	*/
+#define IH_OS_ARTOS		18	/* ARTOS	*/
/*
  * CPU Architecture Codes (supported by Linux)
diff -ruNb u-boot-0.3.0-orig/tools/mkimage.c u-boot-0.3.0/tools/mkimage.c
--- u-boot-0.3.0-orig/tools/mkimage.c	Wed Apr 16 10:56:20 2003
+++ u-boot-0.3.0/tools/mkimage.c	Wed Apr 16 10:56:51 2003
@@ -92,6 +92,7 @@
     {	IH_OS_PSOS,	"psos",		"pSOS",			},
     {	IH_OS_QNX,	"qnx",		"QNX",			},
     {	IH_OS_U_BOOT,	"u-boot",	"U-Boot",		},
+    {	IH_OS_ARTOS,	"artos",	"ARTOS",		},
     {	-1,		"",		"",			},
 };

    