PERFORCE change 136031 for review
Marcel Moolenaar
marcel at FreeBSD.org
Sat Feb 23 19:48:18 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=136031
Change 136031 by marcel at marcel_cluster on 2008/02/23 19:48:01
IFC @136029
Affected files ...
.. //depot/projects/e500/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate
.. //depot/projects/e500/sys/boot/powerpc/uboot/metadata.c#9 integrate
Differences ...
==== //depot/projects/e500/gnu/usr.bin/groff/tmac/mdoc.local#4 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.62 2007/11/27 10:00:33 jkoshy Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.63 2008/02/23 19:27:54 ru Exp $
.\"
.\" %beginstrip%
.
@@ -64,7 +64,7 @@
.ds doc-volume-as-arm arm
.
.\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~7.0
+.ds doc-default-operating-system FreeBSD\~8.0
.
.\" FreeBSD releases not found in doc-common
.ds doc-operating-system-FreeBSD-6.3 6.3
==== //depot/projects/e500/sys/boot/powerpc/uboot/metadata.c#9 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/powerpc/uboot/metadata.c,v 1.2 2008/02/23 19:08:25 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/powerpc/uboot/metadata.c,v 1.3 2008/02/23 19:43:29 marcel Exp $");
#include <stand.h>
#include <sys/param.h>
@@ -124,9 +124,10 @@
}
/* get equivalents from the environment */
- for (i = 0; howto_names[i].ev != NULL; i++)
+ for (i = 0; howto_names[i].ev != NULL; i++) {
if (getenv(howto_names[i].ev) != NULL)
howto |= howto_names[i].mask;
+ }
if (!strcmp(getenv("console"), "comconsole"))
howto |= RB_SERIAL;
if (!strcmp(getenv("console"), "nullconsole"))
@@ -180,45 +181,45 @@
* MOD_SIZE sizeof(size_t) module size
* MOD_METADATA (variable) type-specific metadata
*/
-#define COPY32(v, a, c) { \
+#define COPY32(v, a, c) { \
u_int32_t x = (v); \
if (c) \
- archsw.arch_copyin(&x, a, sizeof(x)); \
+ archsw.arch_copyin(&x, a, sizeof(x)); \
a += sizeof(x); \
}
-#define MOD_STR(t, a, s, c) { \
+#define MOD_STR(t, a, s, c) { \
COPY32(t, a, c); \
COPY32(strlen(s) + 1, a, c) \
if (c) \
- archsw.arch_copyin(s, a, strlen(s) + 1);\
+ archsw.arch_copyin(s, a, strlen(s) + 1);\
a += roundup(strlen(s) + 1, sizeof(u_long));\
}
-#define MOD_NAME(a, s, c) MOD_STR(MODINFO_NAME, a, s, c)
-#define MOD_TYPE(a, s, c) MOD_STR(MODINFO_TYPE, a, s, c)
-#define MOD_ARGS(a, s, c) MOD_STR(MODINFO_ARGS, a, s, c)
+#define MOD_NAME(a, s, c) MOD_STR(MODINFO_NAME, a, s, c)
+#define MOD_TYPE(a, s, c) MOD_STR(MODINFO_TYPE, a, s, c)
+#define MOD_ARGS(a, s, c) MOD_STR(MODINFO_ARGS, a, s, c)
-#define MOD_VAR(t, a, s, c) { \
+#define MOD_VAR(t, a, s, c) { \
COPY32(t, a, c); \
COPY32(sizeof(s), a, c); \
if (c) \
- archsw.arch_copyin(&s, a, sizeof(s)); \
+ archsw.arch_copyin(&s, a, sizeof(s)); \
a += roundup(sizeof(s), sizeof(u_long)); \
}
-#define MOD_ADDR(a, s, c) MOD_VAR(MODINFO_ADDR, a, s, c)
-#define MOD_SIZE(a, s, c) MOD_VAR(MODINFO_SIZE, a, s, c)
+#define MOD_ADDR(a, s, c) MOD_VAR(MODINFO_ADDR, a, s, c)
+#define MOD_SIZE(a, s, c) MOD_VAR(MODINFO_SIZE, a, s, c)
-#define MOD_METADATA(a, mm, c) { \
+#define MOD_METADATA(a, mm, c) { \
COPY32(MODINFO_METADATA | mm->md_type, a, c);\
COPY32(mm->md_size, a, c); \
if (c) \
- archsw.arch_copyin(mm->md_data, a, mm->md_size);\
+ archsw.arch_copyin(mm->md_data, a, mm->md_size);\
a += roundup(mm->md_size, sizeof(u_long)); \
}
-#define MOD_END(a, c) { \
+#define MOD_END(a, c) { \
COPY32(MODINFO_END, a, c); \
COPY32(0, a, c); \
}
@@ -234,15 +235,16 @@
/* start with the first module on the list, should be the kernel */
for (fp = file_findfile(NULL, NULL); fp != NULL; fp = fp->f_next) {
- MOD_NAME(addr, fp->f_name, c); /* this field must come first */
+ MOD_NAME(addr, fp->f_name, c); /* this field must be first */
MOD_TYPE(addr, fp->f_type, c);
if (fp->f_args)
MOD_ARGS(addr, fp->f_args, c);
MOD_ADDR(addr, fp->f_addr, c);
MOD_SIZE(addr, fp->f_size, c);
- for (md = fp->f_metadata; md != NULL; md = md->md_next)
+ for (md = fp->f_metadata; md != NULL; md = md->md_next) {
if (!(md->md_type & MODINFOMD_NOCOPY))
MOD_METADATA(addr, md, c);
+ }
}
MOD_END(addr, c);
return(addr);
@@ -255,8 +257,8 @@
static int
md_bootinfo(struct bootinfo **addr)
{
-#define TMP_MAX_ETH 8
-#define TMP_MAX_MR 8
+#define TMP_MAX_ETH 8
+#define TMP_MAX_MR 8
struct bootinfo *bi;
struct bi_mem_region tmp_mr[TMP_MAX_MR];
struct bi_eth_addr tmp_eth[TMP_MAX_ETH];
@@ -273,11 +275,10 @@
/*
* Handle mem regions (we only care about DRAM)
*/
- for (i = 0, mr_no = 0; i < si->mr_no; i++)
+ for (i = 0, mr_no = 0; i < si->mr_no; i++) {
if (si->mr[i].flags == MR_ATTR_DRAM) {
if (mr_no >= TMP_MAX_MR) {
- printf("too many memory regions: %d\n",
- mr_no);
+ printf("too many memory regions: %d\n", mr_no);
break;
}
tmp_mr[mr_no].mem_base = si->mr[i].start;
@@ -285,17 +286,18 @@
mr_no++;
continue;
}
+ }
if (mr_no == 0)
panic("can't retrieve RAM info");
size = (mr_no * sizeof(struct bi_mem_region) - sizeof(bi->bi_data));
-
+
/*
* Handle Ethernet addresses: parse u-boot env for eth%daddr
*/
env = NULL;
eth_no = 0;
- while ((env = ub_env_enum(env)) != NULL)
+ while ((env = ub_env_enum(env)) != NULL) {
if (strncmp(env, "eth", 3) == 0 &&
strncmp(env + (strlen(env) - 4), "addr", 4) == 0) {
@@ -309,9 +311,10 @@
}
eth_no++;
}
+ }
size += (eth_no * sizeof(struct bi_eth_addr)) + sizeof(struct bootinfo);
-
+
/*
* Once its whole size is calculated, allocate space for the bootinfo
* and copy over the contents from temp containers.
@@ -323,7 +326,7 @@
bcopy(tmp_mr, ptr, mr_no * sizeof(struct bi_mem_region));
ptr += mr_no * sizeof(struct bi_mem_region);
bcopy(tmp_eth, ptr, eth_no * sizeof(struct bi_eth_addr));
-
+
bi->bi_mem_reg_no = mr_no;
bi->bi_eth_addr_no = eth_no;
bi->bi_version = BI_VERSION;
@@ -332,7 +335,7 @@
bi->bi_bus_clk = si->clk_bus;
*addr = bi;
-
+
return (size);
}
@@ -361,7 +364,10 @@
int bisize;
int i;
- /* This metadata addreses must be converted for kernel after relocation */
+ /*
+ * These metadata addreses must be converted for kernel after
+ * relocation.
+ */
uint32_t mdt[] = {
MODINFOMD_SSYM, MODINFOMD_ESYM, MODINFOMD_KERNEND, MODINFOMD_ENVP
};
@@ -369,9 +375,9 @@
howto = md_getboothowto(args);
/*
- * Allow the environment variable 'rootdev' to override the supplied device
- * This should perhaps go to MI code and/or have $rootdev tested/set by
- * MI code before launching the kernel.
+ * Allow the environment variable 'rootdev' to override the supplied
+ * device. This should perhaps go to MI code and/or have $rootdev
+ * tested/set by MI code before launching the kernel.
*/
rootdevname = getenv("rootdev");
if (rootdevname == NULL)
@@ -381,9 +387,10 @@
/* find the last module in the chain */
addr = 0;
- for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next)
+ for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next) {
if (addr < (xp->f_addr + xp->f_size))
addr = xp->f_addr + xp->f_size;
+ }
/* pad to a page boundary */
addr = roundup(addr, PAGE_SIZE);
More information about the p4-projects
mailing list