Author: ian
Date: Sun Jan 3 14:42:28 2016
New Revision: 293104
URL: https://svnweb.freebsd.org/changeset/base/293104
Log:
Store the pointer to the bootloader-provided env data in a static var
for use in debug printing.
Modified:
head/sys/arm/arm/machdep.c
Modified: head/sys/arm/arm/machdep.c
==============================================================================
--- head/sys/arm/arm/machdep.c Sun Jan 3 12:25:57 2016 (r293103)
+++ head/sys/arm/arm/machdep.c Sun Jan 3 14:42:28 2016 (r293104)
@@ -194,6 +194,8 @@ int _min_bzero_size = 0;
extern int *end;
#ifdef FDT
+static char *loader_envp;
+
vm_paddr_t pmap_pa;
#ifdef ARM_NEW_PMAP
@@ -1110,7 +1112,8 @@ freebsd_parse_boot_param(struct arm_boot
return 0;
boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int);
- init_static_kenv(MD_FETCH(kmdp, MODINFOMD_ENVP, char *), 0);
+ loader_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *);
+ init_static_kenv(loader_envp, 0);
lastaddr = MD_FETCH(kmdp, MODINFOMD_KERNEND, vm_offset_t);
#ifdef DDB
ksym_start = MD_FETCH(kmdp, MODINFOMD_SSYM, uintptr_t);
@@ -1433,13 +1436,13 @@ print_kenv(void)
char *cp;
debugf("loader passed (static) kenv:\n");
- if (kern_envp == NULL) {
+ if (loader_envp == NULL) {
debugf(" no env, null ptr\n");
return;
}
- debugf(" kern_envp = 0x%08x\n", (uint32_t)kern_envp);
+ debugf(" loader_envp = 0x%08x\n", (uint32_t)loader_envp);
- for (cp = kern_envp; cp != NULL; cp = kenv_next(cp))
+ for (cp = loader_envp; cp != NULL; cp = kenv_next(cp))
debugf(" %x %s\n", (uint32_t)cp, cp);
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
