From owner-svn-src-projects@FreeBSD.ORG Fri Dec 20 16:15:25 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BC3C4B67; Fri, 20 Dec 2013 16:15:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A772C11B1; Fri, 20 Dec 2013 16:15:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKGFPhi028812; Fri, 20 Dec 2013 16:15:25 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKGFPO8028811; Fri, 20 Dec 2013 16:15:25 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201312201615.rBKGFPO8028811@svn.freebsd.org> From: Andrew Turner Date: Fri, 20 Dec 2013 16:15:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r259656 - projects/specific_leg/sys/arm/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 16:15:25 -0000 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;