Date: Fri, 20 Dec 2013 16:15:25 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r259656 - projects/specific_leg/sys/arm/arm Message-ID: <201312201615.rBKGFPO8028811@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Fri Dec 20 16:15:25 2013 New Revision: 259656 URL: http://svnweb.freebsd.org/changeset/base/259656 Log: - Fix a style bug, preload_end is not a boolean. - Fix a logic inversion when checking if we are using the Linux ATAG ABI. - Or in MODINFO_METADATA to the fake loader data so we can find the dtb. Modified: projects/specific_leg/sys/arm/arm/machdep.c Modified: projects/specific_leg/sys/arm/arm/machdep.c ============================================================================== --- projects/specific_leg/sys/arm/arm/machdep.c Fri Dec 20 16:01:02 2013 (r259655) +++ projects/specific_leg/sys/arm/arm/machdep.c Fri Dec 20 16:15:25 2013 (r259656) @@ -868,7 +868,7 @@ build_fake_preload_metadata(struct arm_b } else #endif lastaddr = (vm_offset_t)&end; - if (preload_end) + if (preload_end != NULL) *preload_end = &fake_preload[i]; fake_preload[i++] = 0; fake_preload[i] = 0; @@ -934,7 +934,7 @@ linux_parse_boot_param(struct arm_boot_p #undef BOOT_PARAM_ADDR walker = data; - if (ATAG_TAG(walker) != ATAG_CORE) { + if (ATAG_TAG(walker) == ATAG_CORE) { /* TODO: Test this */ #if 0 atag_list = walker; @@ -988,7 +988,7 @@ linux_parse_boot_param(struct arm_boot_p /* Move the fdt data to lastaddr */ fdt_move(data, (void *)lastaddr, fdt_len); - preload_end[0] = MODINFOMD_DTBP; + preload_end[0] = MODINFO_METADATA | MODINFOMD_DTBP; preload_end[1] = sizeof(vm_offset_t); preload_end[2] = lastaddr; preload_end[3] = 0;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312201615.rBKGFPO8028811>