Ugrade u-boot-xlnx to 2022.1_update3

[ethan.hsieh]

[Impact]
1. Ugrade u-boot-xlnx from 2020.2 to 2022.1_update3 as per Xilinx's request.
https://github.com/Xilinx/u-boot-xlnx/tree/xlnx_rebase_v2022.01_2022.1_update3
2. Add Versal VCK190 board support

[Test Plan]
1. u-boot-xlnx (2022.1_update3) has been verified by AMD-Xilinx.
2. Install u-boot-xlnx on Versal and ZCU boards and check if system can boot to kernel without any problems.

[Where problems could occur]
u-boot-xlnx (2022.1_update3) are released and verified by AMD-Xilinx. It should be low risk.

[ethan.hsieh (ethan.hsieh)]

Verified the test package[1] on zcu102 and vck190. System can boot to kernel without any problem.

---
[1] u-boot-xlnx (2022.1-3-0ubuntu1), https://launchpad.net/~ethan.hsieh/+archive/ubuntu/sru-test/+packages

[Ubuntu Foundations Team Bug Bot (crichton)]

The attachment "lunar.debdiff" seems to be a debdiff. The ubuntu-sponsors team has been subscribed to the bug report so that they can review and hopefully sponsor the debdiff. If the attachment isn't a patch, please remove the "patch" flag from the attachment, remove the "patch" tag, and if you are member of the ~ubuntu-sponsors, unsubscribe the team.

[This is an automated message performed by a Launchpad user owned by ~brian-murray, for any issue please contact him.]

[Dave Jones (waveform)]

What is this patch against? I attempted to apply it to the current development release (which from the diff in d/changelog it *appears* to be a patch for), but it doesn't apply cleanly.

[ethan.hsieh (ethan.hsieh)]

@Dave

The patch generated by debdiff is against u-boot-xlnx (2020.2-0ubuntu11). The debdiff command seems to generate a bad patch because of symlinks.

The new patch was generate by the git command "git format-patch -1 --full-index --binary".

Source codes from pull-lp-source is different from [1]. pull-lp-source has some files like .pc which [1] doesn't have. So, I uploaded two patches (comment#4 & #5). One is based on pull-lp-source while another one is based on [2].

When I apply the patch by "patch" command, some *.dat and *.hex are missing. But, the patch can be applied correctly by git command. So, I created a git repo[2] for reference.

u-boot-xlnx[2]
├──branch:lunar
├──branch:lunar-2022.1_update3
├──branch:pull-lp-source-2020.2-0ubuntu11
└──branch:pull-lp-source-2022.1_update3

lunar means the source code comes from [1]

---
[1] https://code.launchpad.net/~git-ubuntu-import/ubuntu/+source/u-boot-xlnx/+git/u-boot-xlnx/+ref/ubuntu/lunar
[2] https://code.launchpad.net/~ethan.hsieh/+git/u-boot-xlnx
[3] test package: u-boot-xlnx (2022.1-3-0ubuntu1), https://launchpad.net/~ethan.hsieh/+archive/ubuntu/sru-test/+packages

[Dave Jones (waveform)]

> Source codes from pull-lp-source is different from [1].
> pull-lp-source has some files like .pc which [1] doesn't have. So, I
> uploaded two patches (comment#4 & #5). One is based on
> pull-lp-source while another one is based on [2].

This bit I can explain: pull-lp-source tries to set up the directory
for development so it unpacks the orig tar-ball, and *applies the
Debian patches*. This is why the .pc directory exists: it's generated
by quilt when applying the patches. If you want to compare it to the
git-ubuntu imported tree (which doesn't have the patches applied) you
have to "dquilt pop -a && rm -fr .pc/" first to get back to a "just
unpacked" state. The trees should, in theory, be comparable at that
point.

Anyway, the test package looks okay -- I've added the bug number to
the changelog, and will upload that.

However, I'd be interested to know if anyone's tried the upstream
u-boot with the machines in question? It appears quite a few of the
patches in this variant are upstream (or even superseded upstream
already).

[Dave Jones (waveform)]

Argh, just spotted one lintian error which I will have to correct: it's shipping a file excluded in d/copyright (MCD_tasks.c). I'll see if I can adjust the d/watch file to include a +repack suffix and have that repack the orig tar-ball.

[Dave Jones (waveform)]

Well, this turned out to be rather more convoluted than I expected; in order to get uscan to repack it, I also needed to deal with the upstream version number that contains underscores (disallowed in upstream Debian version numbers) so in the end I re-worked the d/watch file and removed the get-orig-source target in d/rules.

The result's currently building in ppa:waveform/u-boot (https://launchpad.net/~waveform/+archive/ubuntu/u-boot) -- it's got a rather ugly version number (2022.01-2022.1-update3+repack-0ubuntu1) but it works happily enough with uscan, and doesn't throw any critical lintian errors.

Otherwise it's the same version as in your PPA; can you let me know if it looks okay and I'll upload it?

[ethan.hsieh (ethan.hsieh)]

@Dave

It looks great. Thanks for your support.

The u-boot-xlnx (2022.1_update3) is released by Xilinx and should have been verified by Xilinx. The u-boot-xlnx (2020.2-0ubuntu11) deb package is only support ZCU boards. And, the new one[2] will start to support the Versal board. I have one Versal and two ZCU boards(zcu102/104) on hand. I tried [2] on these boards. It works well. System can boot to kernel without any problem.

Here is the log on Versal VCK190:

U-Boot 2022.012022.01-2022.1-update3+repack-0ubuntu1 (Nov 11 2022 - 08:49:35 +0000)
CPU: Versal
Silicon: v2
Model: Xilinx Versal vck190 Eval board revA
DRAM: 8 GiB
EL Level: EL2
...
Starting kernel ...
[ 0.000000] Booting Linux on physical CPU 0x0000000000 [0x410fd083]
[ 0.000000] Linux version 5.15.0-1015-xilinx-zynqmp (buildd@bos02-arm64-076) (gcc (Ubuntu 11.2.0-19ubuntu1) 11.2.0, GNU ld (GNU Binutils for Ubuntu) 2.38) #16-Ubu)
[ 0.000000] Machine model: Xilinx Versal vck190 Eval board revA
...

---
[1] https://github.com/Xilinx/u-boot-xlnx
[2] 2022.01-2022.1-update3+repack-0ubuntu1, https://launchpad.net/~waveform/+archive/ubuntu/u-boot

[Launchpad Janitor (janitor)]

This bug was fixed in the package u-boot-xlnx - 2022.01-2022.1-update3+repack-0ubuntu1

---------------
u-boot-xlnx (2022.01-2022.1-update3+repack-0ubuntu1) lunar; urgency=medium

  * Update to tag:xlnx_rebase_v2022.01_2022.1_update3 (LP: #2002473)
  * Add Versal VCK190 board support
  * Add debian revision to u-boot version
  * Fix Versal random mac issue
  * debian/copyright: remove unnecessary files
  * debian/watch: check tags instead of releases and repack to remove
    excluded files
  * Remove boot.cmd from u-boot-xlnx because flash-kernel has it and is the
    right place for u-boot boot script

 -- Ethan Hsieh <email address hidden> Fri, 11 Nov 2022 16:49:35 +0800