Re: git: 1dec3639fd0c - main - sysutils/u-boot: Update to 2021.07
- In reply to: Herbert J. Skuhra: "Re: git: 1dec3639fd0c - main - sysutils/u-boot: Update to 2021.07"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 11 Jul 2021 13:38:21 UTC
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