From patchwork Sun Mar 22 09:55:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Seiler X-Patchwork-Id: 244081 List-Id: U-Boot discussion From: hws at denx.de (Harald Seiler) Date: Sun, 22 Mar 2020 10:55:57 +0100 Subject: [U-Boot] Sharing a hardware lab In-Reply-To: References: <20191204223038.GC9549@bill-the-cat> <9868edb1-b906-8b1f-1482-355a0728fa82@denx.de> <0a2ac972f89459e38963bebb1ed43ea4b5d9d756.camel@denx.de> Message-ID: Hi Simon, On Sat, 2020-03-21 at 13:07 -0600, Simon Glass wrote: > Hi Harald, > > On Mon, 24 Feb 2020 at 06:27, Harald Seiler wrote: > > Hello Simon, > > > > On Sun, 2020-02-23 at 19:34 -0700, Simon Glass wrote: > > > Hi Heiko, > > > > > > Thanks for the hints! I pushed your things here: > > > > > > https://github.com/sglass68/tbot/tree/simon > > > > > > Then I try: > > > tbot -l kea.py -b pcduino3.py uboot_build > > > > > > and get an error: > > > > > > tbot starting ... > > > type > > > ??Calling uboot_build ... > > > ? ??Fail. (0.000s) > > > ??Exception: > > > ? Traceback (most recent call last): > > > ? File "/home/sglass/.local/lib/python3.6/site-packages/tbot-0.8.0-py3.6.egg/tbot/main.py", > > > line 318, in main > > > ? func(**params) > > > ? File "/home/sglass/.local/lib/python3.6/site-packages/tbot-0.8.0-py3.6.egg/tbot/decorators.py", > > > line 103, in wrapped > > > ? result = tc(*args, **kwargs) > > > ? File "/home/sglass/.local/lib/python3.6/site-packages/tbot-0.8.0-py3.6.egg/tbot/tc/uboot/build.py", > > > line 271, in _build > > > ? builder = UBootBuilder._get_selected_builder() > > > ? File "/home/sglass/.local/lib/python3.6/site-packages/tbot-0.8.0-py3.6.egg/tbot/tc/uboot/build.py", > > > line 160, in _get_selected_builder > > > ? builder = getattr(tbot.selectable.UBootMachine, "build") > > > ? AttributeError: type object 'UBootMachine' has no attribute 'build' > > > > > > I'm a bit lost in all the classes and functions. A working example or > > > a patch would be great! > > > > > > I've pushed all my scripts here: > > > > > > https://github.com/sglass68/ubtest > > > > > > The top commit is your patches. > > > > I think you mixed a few things up while adding Heiko's stuff. Instead > > of your last commit, attempt the attached patch. It is untested of > > course but should point you in the right direction; here is a short > > summary of what it adds: > > > > 1. Your `kea` lab needs to be marked as a build-host. This means it > > needs the `toolchains` property which returns what toolchains are > > available. I added a dummy armv7-a toolchain which might need > > a bit more adjustment to work for you. > > > > 2. I created a UBootBuilder for pcduino3. This builder just > > specifies what defconfig to build and what toolchain to use (need > > to be defined in the selected lab). > > > > Heiko's builder config is a bit more elaborate and also does some > > patching after applying the defconfig. This is of course also > > possible if you want to. > > > > 3. I added a U-Boot config for your board which is needed because > > its `build` property specifies which U-Boot builder to use. This > > will make the `uboot_build` testcase work properly. Later you > > might want to adjust this U-Boot config to actually work so you > > can make use of it for flashing the new U-Boot binary. > > > > Some more links to documentation: > > > > - Build-host config: https://tbot.tools/modules/machine_linux.html#builder > > - UBootBuilder class: https://tbot.tools/modules/tc.html#tbot.tc.uboot.UBootBuilder > > > > Hope this helps! > > Yes it helps a lot, thank you. I now have it building U-Boot: > > tbot -l kea.py -b pcduino3.py -p clean=False uboot_build interactive_uboot > > I sent a tiny patch to tbot to fix an error I had, and I made a few > minor changes to what you sent. > > https://github.com/sglass68/ubtest/commit/7da7a3794d505e970e0e21a9b6ed3a7e5f2f2190 Huh, actually I messed up in the patch I sent you. Please apply the following diff: This will make everything work as intended and the patch you needed in tbot is also no longer necessary (Passing a class instead of an instance will not bind the method's `self` argument so you got an error from a weird place. Maybe I should add a check against this kind of mistake ...). > So my next question is how to load U-Boot onto the board. I can see > methods for poweron/poweroff but not for actually writing to the > board. Is there a built-in structure for this? I cannot find it. > > I am hoping that the Pcduino3 class can define a method like > 'load_uboot()' to write U-Boot to the board? I added something similar to this in our DENX internal tbot configurations but did not yet publish it anywhere (maybe I should add it to tbot_contrib?). Just for you, here is what I did: 1. In the board configs, each U-Boot class defines a `flash()` method: from tbot.tc import shell, git class P2020RdbUBoot(board.Connector, board.UBootShell): name = "p2020rdb-uboot" prompt = "=> " build = P2020RdbUBootBuilder() def flash(self, repo: git.GitRepository) -> None: self.env("autoload", "no") self.exec0("dhcp") self.env("serverip", "192.168.1.1") tftpdir = self.host.fsroot / "tftpboot" / "p2020rdb" / "tbot2" if not tftpdir.is_dir(): self.host.exec0("mkdir", "-p", tftpdir) name = "u-boot-with-spl.bin" tbot.log.message(f"Fetching {name} ...") shell.copy(repo / name, tftpdir / name) addr = 0x10000000 self.exec0("tftp", hex(addr), "p2020rdb/tbot2/" + name) size = int(self.env("filesize"), 16) tbot.log.message(f"Downoad succeeded:\n U-Boot: {size} bytes") tbot.log.message("Flashing ...") self.exec0("nand", "device", "0") self.exec0("nand", "erase.spread", "0", hex(size)) self.exec0("nand", "write", hex(addr), "0", hex(size)) As you can see, it get the repository (as a GitRepository [1]) where U-Boot was built, passed as an argument, and copies the relevant binaries to a tftp directory on the lab-host (using shell.copy() [2]). Then it downloads and flashes U-Boot like you would manually. Alternatively, I could imagine the implementation connecting to a hardware debugger and uploading the binary to flash that way. 2. I defined a few testcases for flashing. Namely, `uboot_build_and_flash` (build U-Boot and then flash the new version) and `uboot_bare_flash` (don't rebuild, just flash the artifacts from the last build). These then use the board-specific U-Boot builder and flash method. I also added a feature where you can specify `-fsafe` on the tbot command-line. This will, in case something goes wrong while flashing, drop you onto the interactive U-Boot command-line instead of powering off the board and reporting a failure. I uploaded the testcases here: https://gitlab.denx.de/snippets/10 [1]: http://tbot.tools/modules/tc.html#tbot.tc.git.GitRepository [2]: http://tbot.tools/modules/tc.html#tbot.tc.shell.copy diff --git a/kea.py b/kea.py index a3ca968dc41e..f65d91b67f1d 100644 --- a/kea.py +++ b/kea.py @@ -39,7 +39,7 @@ class KeaLab( # toolchain is identified by a (unique) string. For pcduino3 in this # example, a toolchain named `armv7-a` is defined. return { - "armv7-a": ArmV7Toolchain, + "armv7-a": ArmV7Toolchain(), } def build(self):