svn commit: r195331 - in projects/mips/sys: conf dev/cfe
Warner Losh
imp at FreeBSD.org
Sat Jul 4 02:49:19 UTC 2009
Author: imp
Date: Sat Jul 4 02:49:17 2009
New Revision: 195331
URL: http://svn.freebsd.org/changeset/base/195331
Log:
Merge in new cfe environment passing of kenv for swarm/sibyte boards.
Submitted by: Neelkanth Natu
Added:
projects/mips/sys/dev/cfe/cfe_env.c (contents, props changed)
Modified:
projects/mips/sys/conf/files.mips
projects/mips/sys/conf/options.mips
Modified: projects/mips/sys/conf/files.mips
==============================================================================
--- projects/mips/sys/conf/files.mips Sat Jul 4 01:44:24 2009 (r195330)
+++ projects/mips/sys/conf/files.mips Sat Jul 4 02:49:17 2009 (r195331)
@@ -96,6 +96,7 @@ libkern/umoddi3.c standard
dev/cfe/cfe_api.c optional cfe
dev/cfe/cfe_console.c optional cfe_console
+dev/cfe/cfe_env.c optional cfe_env
#dev/cfe/cfe_resource.c optional cfe # not yet needed
dev/siba/siba.c optional siba
Modified: projects/mips/sys/conf/options.mips
==============================================================================
--- projects/mips/sys/conf/options.mips Sat Jul 4 01:44:24 2009 (r195330)
+++ projects/mips/sys/conf/options.mips Sat Jul 4 02:49:17 2009 (r195331)
@@ -44,6 +44,8 @@ ISA_MIPS64v2 opt_cputype.h
YAMON opt_global.h
CFE opt_global.h
CFE_CONSOLE opt_global.h
+CFE_ENV opt_global.h
+CFE_ENV_SIZE opt_global.h
KERNPHYSADDR opt_global.h
KERNVIRTADDR opt_global.h
Added: projects/mips/sys/dev/cfe/cfe_env.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/mips/sys/dev/cfe/cfe_env.c Sat Jul 4 02:49:17 2009 (r195331)
@@ -0,0 +1,74 @@
+/*-
+ * Copyright (c) 2009 Neelkanth Natu
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/systm.h>
+
+#include <dev/cfe/cfe_api.h>
+
+__FBSDID("$FreeBSD$");
+
+#ifndef CFE_ENV_SIZE
+#define CFE_ENV_SIZE PAGE_SIZE /* default is one page */
+#endif
+
+extern void cfe_env_init(void);
+
+static char cfe_env_buf[CFE_ENV_SIZE];
+
+void
+cfe_env_init(void)
+{
+ int idx, len;
+ char name[64], val[128], *cp, *cplim;
+
+ cp = cfe_env_buf;
+ cplim = cp + CFE_ENV_SIZE;
+
+ idx = 0;
+ while (1) {
+ if (cfe_enumenv(idx, name, sizeof(name), val, sizeof(val)) != 0)
+ break;
+
+ if (bootverbose)
+ printf("Importing CFE env: \"%s=%s\"\n", name, val);
+
+ /*
+ * name=val\0\0
+ */
+ len = strlen(name) + 1 + strlen(val) + 1 + 1;
+ if (cplim - cp < len)
+ printf("No space to store CFE env: \"%s=%s\"\n",
+ name, val);
+ else
+ cp += sprintf(cp, "%s=%s", name, val) + 1;
+ ++idx;
+ }
+ *cp++ = '\0';
+
+ kern_envp = cfe_env_buf;
+}
More information about the svn-src-projects
mailing list