From nobody Sun Jul 11 13:38:21 2021 X-Original-To: freebsd-arm@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 31FF7127D108 for ; Sun, 11 Jul 2021 13:39:51 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from mail.bsd4all.net (mail.bsd4all.net [94.130.200.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail.bsd4all.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GN7LG1yt2z3KgD for ; Sun, 11 Jul 2021 13:39:49 +0000 (UTC) (envelope-from herbert@gojira.at) Date: Sun, 11 Jul 2021 15:38:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=gojira.at; s=mail202005; t=1626010788; bh=oteUzqoex8RFtr9m/Mgl/X+zOA+ro1DKl6y/z+sSC1Y=; h=Date:Message-ID:From:To:Subject:MIME-Version:Content-Type; b=s/D9jFb7JmYy4cMJqocbHfZuv//TeHYV9lXPZk1HVh6z+m5bsnXc8XnyaVy00Ccxp ZlUWIM2MYvL9VERNttPQHdMJ5tRpsZ++1mua6hmhPGy4bYaIwsPDC4g5Vm4ycv+pCK KAWbxHq9MZwUq8SV/Fi1JLRHTz+vAolYK0RZmbK7BYri/eb6BFdVcdW3GofK+lKLbk PHwmEanSj45MNanYKQdPLzAR+ZsoMMvjHwL7nWVyk82PqOc7aXOVigR/R0XImX1WrZ LtJGIK7M7vP0bZiQa5Fv+684QkiDerqxOirtynOCfGPCwQiQfx7wLd96IPmeRhxj2E HnGOabg6V+Prg== Message-ID: <87pmvpm0mq.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: freebsd-arm@freebsd.org Subject: Re: git: 1dec3639fd0c - main - sysutils/u-boot: Update to 2021.07 In-Reply-To: <87r1g5m5tw.wl-herbert@gojira.at> References: <202107071618.167GIvXd048504@gitrepo.freebsd.org> <874kd3390q.wl-herbert@gojira.at> <87k0lye13y.wl-herbert@gojira.at> <87im1idnh2.wl-herbert@gojira.at> <0D08E03C-87CD-4567-A10A-F548BFD6469F@yahoo.com> <9EFC598D-703A-4E49-8459-C4284B772B38@yahoo.com> <87sg0lmepu.wl-herbert@gojira.at> <81C76E14-1323-41D9-A90E-49DAB83F338F@yahoo.com> <87r1g5m5tw.wl-herbert@gojira.at> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/28.0 Mule/6.0 List-Id: Porting FreeBSD to ARM processors List-Archive: https://lists.freebsd.org/archives/freebsd-arm List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-arm@freebsd.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4GN7LG1yt2z3KgD X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=mail202005 header.b=s/D9jFb7; dmarc=none; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 94.130.200.20 as permitted sender) smtp.mailfrom=herbert@gojira.at X-Spamd-Result: default: False [-2.50 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gojira.at:s=mail202005]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:94.130.200.20:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[gojira.at]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[94.130.200.20:from:127.0.2.255]; DKIM_TRACE(0.00)[gojira.at:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[94.130.200.20:from]; ASN(0.00)[asn:24940, ipnet:94.130.0.0/16, country:DE]; MAILMAN_DEST(0.00)[freebsd-arm] X-ThisMailContainsUnwantedMimeParts: N On Sun, 11 Jul 2021 13:46:03 +0200, "Herbert J. Skuhra" wrote: > > On Sun, 11 Jul 2021 11:16:50 +0200, Mark Millard wrote: > > > > On 2021-Jul-11, at 01:34, Herbert J. Skuhra wrote: > > > > > On Sun, 11 Jul 2021 02:29:57 +0200, Mark Millard wrote: > > >> > > >> Some more context from looking around (I'm still trying > > >> to get use to git ways of finding things): > > > > > > Thanks. > > > > > > I used a simple 'git log' and checked the GH page: > > > > > > https://github.com/u-boot/u-boot/commits/master?after=490101a5e5df65238b900b21b81361bc4b13da2e+2449&branch=master > > > > > > Both show the commits in this order: > > > > > > 78af81c345430a9088235f48d302922955d2499f > > > 63af92e837f3d7c21ab5fc4a96ffcbf202efaf90 > > > [..] > > > > So I should not have said to bisect master but instead > > the sequence of contributions to v2021.04-rc4 , as that > > is apparently what tracks the contributions to the first > > broken v2021.04-rc* and master is different. > > > > > At the moment I have no idea how to bisect further. git diff and > > > reverting some parts manually? > > > > For . . . > > > > v2021.04-rc3 (c5219c4) in master was followed by (in sequence): > > > > 60a376b: configs: RPi2: Disable EFI Grub workaround > > 76cffd5: drivers: mmc: iproc_sdhci: enable HS200 mode > > 0267539: MAINTAINERS: Update info for Raspberry Pi > > 3ac0523: rng: iproc_rng200: Enable support for RPi4 armv7 > > fae165b: configs: rpi4_32: Enable iProc RNG200 > > 20ecfbe: configs: Resync with savedefconfig > > 78af81c: Merge tag 'rpi-next-2021.04.2' of https://source.denx.de/u-boot/custodians/u-boot-raspberrypi > > OK, I get this commit list by running > > % git log 63af92e837f3d7c21ab5fc4a96ffcbf202efaf90..78af81c345430a9088235f48d302922955d2499f > > > So "just": > > > > A) check out 3ac0523, build, test > > B) Based on the result: check out whichever of 76cffd5 and 20ecfbe, build, test > > C) Based on the result: . . . > > > > And the 3 tries should do it for being sure where > > the good-followed-by-bad pair is. (If 60a376b is > > bad, then c5219c4 should be the good side of the > > good-then-bad pair.) > > > > (I've not dealt with the "build" part of that > > "just".) > > Sorry, I don't get it. :-( > > Commit 60a376b09332a0cf061b3c1102913287ea055dc1 is a one line change. > > But if I checkout 63af92e837f3d7c21ab5fc4a96ffcbf202efaf90 and > 60a376b09332a0cf061b3c1102913287ea055dc1 and do a "diff -ruN" or run "git diff > 63af92e837f3d7c21ab5fc4a96ffcbf202efaf90..60a376b09332a0cf061b3c1102913287ea055dc1" > I see 175 modified files. Hmm, I obviously need "git diff c5219c4..60a376b". > > For commit 76cffd579553e86b55d783df7e490d3c05e46d89 the output matches. > > I think I have to study some books about git. > > Anyway, I'll checkout the above commits and post the results afterwards If I checkout and build 60a376b the boot hangs. If revert this one-line change it boots. But it hangs again if I do this with the final 2021.04. And this line no longer exists in 2021.07. If I checkout ports (a361eabce3cf), build u-boot-rpi2 (2021.04) without modifications and transfer u-boot.bin and boot.scr to my RPi2 it boots. Without boot.scr it hangs again. If I then modify Makefile and distinfo in sysutils/u-boot-master for 2021.07, rebuild u-boot-rpi2 and transfer the files my RPi2 still boots. -- Herbert