From owner-freebsd-arm@freebsd.org Wed Jan 18 05:09:28 2017 Return-Path: Delivered-To: freebsd-arm@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 36F79CB5A69 for ; Wed, 18 Jan 2017 05:09:28 +0000 (UTC) (envelope-from thomasskibo@yahoo.com) Received: from nm22-vm8.bullet.mail.gq1.yahoo.com (nm22-vm8.bullet.mail.gq1.yahoo.com [98.136.217.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0E80B1B07 for ; Wed, 18 Jan 2017 05:09:27 +0000 (UTC) (envelope-from thomasskibo@yahoo.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1484715968; bh=3uMaDPEHQ3oErC5os01oZ8t/49OcDYVkoLE0nMBeK10=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject; b=Io8nxFrqo/VcyPHhLWA1PEihd+Umr54BFaObMK6pKDKAzQmSIvnWHuBd+wilqMdqb0y9rENQyAC0XP+Umd4HSjRGswTNSmHE8bzX2mSV/wy2RkzdUgMWVfzSS3g4U0FstWkmRua0HByRQ1AhnBzqnNdgfB+zcSLzDzWn2hGQYydMP2E5rNrMIjaP3nFNih71lg3AJZcw0rNsw/riYv6a6uvJ5XU99vlUwNSlhWMTS8P2UDQx+XJNN3p87jorJI1blo+YaF5kC/Atjtl2fpaUh0ZMJjaH4XZRnsfEq4293Xjv71IzqctYttWVr89dHpW6LjyRvhM0dKrVwa3E3EY4Sw== Received: from [98.137.12.62] by nm22.bullet.mail.gq1.yahoo.com with NNFMP; 18 Jan 2017 05:06:08 -0000 Received: from [98.136.164.68] by tm7.bullet.mail.gq1.yahoo.com with NNFMP; 18 Jan 2017 05:06:08 -0000 Received: from [127.0.0.1] by smtp230.mail.gq1.yahoo.com with NNFMP; 18 Jan 2017 05:06:08 -0000 X-Yahoo-Newman-Id: 68341.15413.bm@smtp230.mail.gq1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: MshvBNYVM1kmuNCsaBuIrJJJTrzCsytYvt.BMVCowm3Bjvw Zl9JIuO5meeI3QPUUoFnt7URYVt2W4LYmFY7I_uyKVXaOMPUdTGl9Z_LTtWY vIcziyElS8_a6T41OF3ELHRD9fa7CrCTgMoagNb5wJtXSwKl5qA1NNPl8bX4 wMObpNFEGeMH9zazvWGfzK8.up5rdyPawde.QxTPjiEshIKN5iPpfvbijLT9 vgWknIae.9jsbGNJsG6NM8.Jcu01lYxQoXxzppdutEFLXeCbohqcmxN6hRQ_ NPaB0NDu3PE_iDUhArKE3dPC9.1WJ49Wmy9KksFCbjCeXa22Ddjt.G1fXGog uzwZK5HVDnITk2uIorTZPEbStTWkTYgivSMlaQVPP3o_QruVht8rxdHuM2ao SRScySscX5nNaI9YalEQ_lv31MGvDANa2vgvgF687.VETssKUDgXGQiGEgSn Bv7yK6al2E.VXYlfWhLp9dQFEvZlcAEGDG9jgx1HthnOzMDip3538rJEcHAV fO8gl0M7PSAqSrt0FPdHXe2tleXQ4sgORgiU3a.rdg8h4cgnzyrFR X-Yahoo-SMTP: .8Dytk6swBAeTUTcf.ezO8BKaYfn.mUV Content-Type: multipart/mixed; boundary="Apple-Mail=_692E24D6-2F57-47B3-8EAF-92E39DBAEA13" Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Subject: Re: u-boot ports for Zedboard and Zybo From: Thomas Skibo In-Reply-To: Date: Tue, 17 Jan 2017 21:06:13 -0800 Cc: Kurt Jaeger , "freebsd-arm@freebsd.org" Message-Id: <25A1C780-3BC1-4745-9DBD-D2716E6ED7D2@yahoo.com> References: <640059E8-B9DD-4289-BA59-2E02A4D91F87@yahoo.com> <20170116173329.GH13006@home.opsec.eu> <58C09F42-D34B-4B84-A894-7147613214B9@yahoo.com> To: Warner Losh X-Mailer: Apple Mail (2.3124) X-BeenThere: freebsd-arm@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Porting FreeBSD to ARM processors." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jan 2017 05:09:28 -0000 --Apple-Mail=_692E24D6-2F57-47B3-8EAF-92E39DBAEA13 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Jan 17, 2017, at 5:04 PM, Warner Losh wrote: >=20 > Does that mean you have a fix? :) I'm happy to add stuff to the u-boot > ports branch (or do pull requests, which atm are a little > complicated). >=20 > Warner I managed to get it working but I am seeing some funny u-boot warnings = (CACHE: Misaligned operation=E2=80=A6). I=E2=80=99ll keep tinkering with it over the next few days. I=E2=80=99ve = attached my changes but I can=E2=80=99t test it on any of the other = boards. =E2=80=94Thomas --Apple-Mail=_692E24D6-2F57-47B3-8EAF-92E39DBAEA13 Content-Disposition: attachment; filename=patch.u-boot-bsdimp.txt Content-Type: text/plain; name="patch.u-boot-bsdimp.txt" Content-Transfer-Encoding: quoted-printable diff --git a/api/api_storage.c b/api/api_storage.c index d6e475b9c4..d3bbe71756 100644 --- a/api/api_storage.c +++ b/api/api_storage.c @@ -334,10 +334,5 @@ lbasize_t dev_read_stor(void *cookie, void *buf, = lbasize_t len, lbastart_t start if (!dev_stor_is_valid(type, dd)) return 0; =20 - if ((dd->block_read) =3D=3D NULL) { - debugf("no block_read() for device 0x%08x\n", cookie); - return 0; - } - - return dd->block_read(dd, start, len, buf); + return blk_dread(dd, start, len, buf); } diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 8dd8061c46..b76a4ee02e 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -286,8 +286,8 @@ static int efi_disk_create_eltorito(struct blk_desc = *desc, } =20 static int efi_disk_create_mbr(struct blk_desc *desc, - const struct blk_driver *cur_drvr, - int diskid) + const char *if_typename, + int diskid) { int disks =3D 0; char devname[32] =3D { 0 }; /* dp->str is u16[32] long */ @@ -298,10 +298,10 @@ static int efi_disk_create_mbr(struct blk_desc = *desc, return 0; =20 while (!part_get_info(desc, part, &info)) { - snprintf(devname, sizeof(devname), "%s%d:%d", = cur_drvr->if_typename, + snprintf(devname, sizeof(devname), "%s%d:%d", = if_typename, diskid, part); =20 - efi_disk_add_dev(devname, cur_drvr->if_typename, desc, = diskid, &info, 1); + efi_disk_add_dev(devname, if_typename, desc, diskid, = &info, 1); part++; disks++; } @@ -340,7 +340,7 @@ int efi_disk_register(void) * El Torito images show up as block devices in an EFI = world, * so let's create them here */ - disks +=3D efi_disk_create_mbr(desc, dev, desc->devnum); + disks +=3D efi_disk_create_mbr(desc, if_typename, = desc->devnum); disks +=3D efi_disk_create_eltorito(desc, if_typename, desc->devnum, = dev->name); } @@ -377,7 +377,7 @@ int efi_disk_register(void) * El Torito images show up as block devices * in an EFI world, so let's create them here */ - disks +=3D efi_disk_create_mbr(desc, cur_drvr, = i); + disks +=3D efi_disk_create_mbr(desc, = if_typename, i); disks +=3D efi_disk_create_eltorito(desc, = if_typename, i, devname); =20 --Apple-Mail=_692E24D6-2F57-47B3-8EAF-92E39DBAEA13--