From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.groups.io with SMTP id smtpd.web12.6738.1588326221425749674 for ; Fri, 01 May 2020 02:43:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=p82OQX5u; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.221.66, mailfrom: pete@akeo.ie) Received: by mail-wr1-f66.google.com with SMTP id g13so10893732wrb.8 for ; Fri, 01 May 2020 02:43:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=OC/PafB1wi9zoyqJNTmISMV5Gk8Kw0vt9ku02TtIkao=; b=p82OQX5ujnpkH6WAC+jNSvQ4FqMRaTGSjB3PvfSTgvUEIV5cAdMvIQQKyznLy6zxwb 7DPlWt61FssUgtv1Y67YrsGGy0JnFRdhzzgE87EKKVeZfjPx4J+4dB20hqvHLOIGnA/0 U3oIe0fgIyuReigq1c5VMJPEILyWMvPC2J8jvXe7Wz5yGw/TB//3W4gdEPFZgDwEfzsy 42omAptTFbBGcseW8jV7eIUFBJR6Oz3rGDi5FAS8yE5YLY368gabwjusbclVBP9G1CIE H/eV0RpqIsksFs6AuqAGhFES6AyljGZPgTsKUku9ioLlQamtTKsXBZ2KdQEmaGzU1rza PPrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=OC/PafB1wi9zoyqJNTmISMV5Gk8Kw0vt9ku02TtIkao=; b=ExNH7YcybHT5/7+dYzt6GDd1Si1WzVfrjjvqfr87NPsabHHUuL+bHMYxYLrZE1oRFk DHydZDM/hPWO9oChWtAGszPPkqga2ZjjNVAQAr7iGCkhlZNvuJlPJ7L6hCnPAB4fjvK7 5M4H3ITQuL4Wefm+uBRx7hTcwBaMH1MRHddGfdjY2IkzKbUFFLK8XN4Lfbq2xn43/n2k NOuZwnqqy3PgV8e7c1qkosSSL/vfJm9sOjtSxBSNfaH5+wjDzPd2xkFsBUlc8sbhqLEL DwqsK48wwtvnOBOpmtcPhrDVIDOVfGx0TyJP8DnIFu1PAC7cIGL40s6niSDWXpYzXP8y Ojzg== X-Gm-Message-State: AGi0PuY59MccxczwkFx97pIdFE8zG45zb7jbJPGbBZ0410Nbk8ImkqK5 K3kVlc/NzQ8FXy6/AF/9WqZWKQ== X-Google-Smtp-Source: APiQypLeNwFB9PsqLxJZhWpwJ7VgAv0EB5jCslsLUcQ01bfc8/u+uYwNr3WeiJ9Xn98rUac4Irr0Ww== X-Received: by 2002:a5d:6841:: with SMTP id o1mr3293835wrw.412.1588326219933; Fri, 01 May 2020 02:43:39 -0700 (PDT) Return-Path: Received: from [10.0.0.122] ([84.203.75.87]) by smtp.googlemail.com with ESMTPSA id c25sm3184780wmb.44.2020.05.01.02.43.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 01 May 2020 02:43:39 -0700 (PDT) Subject: Re: [edk2-platforms][PATCH 2/2] RPi: update Pi3 and Pi4 readmes with correct info on FDT handling To: Andrei Warkentin , devel@edk2.groups.io Cc: ard.biesheuvel@arm.com, leif@nuviainc.com, philmd@redhat.com References: <20200430191901.89372-1-andrey.warkentin@gmail.com> <20200430191901.89372-3-andrey.warkentin@gmail.com> From: "Pete Batard" Message-ID: <4d17905e-9373-72b0-0892-be7d70a93ee0@akeo.ie> Date: Fri, 1 May 2020 10:43:38 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <20200430191901.89372-3-andrey.warkentin@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit On 2020.04.30 20:19, Andrei Warkentin wrote: > Now that Pi 3 FDT handling is fixed, let's update the docs. Furthermore, > let's simplify - be proscriptive about the minimal supported > config.txt configuration. Also, fix some factual mistakes: > - device_tree= override is not mandatory when device_tree_address= is used. > Not using it means start.elf can chose the right one for the variant. > - device_tree= override is not mandatory for dtoverlay use. > > Signed-off-by: Andrei Warkentin > --- > Platform/RaspberryPi/RPi3/Readme.md | 38 +++++++++++++------- > Platform/RaspberryPi/RPi4/Readme.md | 24 +++++++------ > 2 files changed, 39 insertions(+), 23 deletions(-) > > diff --git a/Platform/RaspberryPi/RPi3/Readme.md b/Platform/RaspberryPi/RPi3/Readme.md > index f5d25b50..f19d59d8 100644 > --- a/Platform/RaspberryPi/RPi3/Readme.md > +++ b/Platform/RaspberryPi/RPi3/Readme.md > @@ -56,23 +56,30 @@ Build instructions from the top level edk2-platforms Readme.md apply. > 1. Format a uSD card as FAT32 > 2. Copy the generated `RPI_EFI.fd` firmware onto the partition > 3. Download and copy the following files from https://github.com/raspberrypi/firmware/tree/master/boot > + - `bcm2710-rpi-3-b.dtb` (for Pi 3B) > + - `bcm2710-rpi-3-b-plus.dtb (for Pi 3B+) Missing closing ` after .dtb. Rather than re-send a new patch, could the maintainer please add it when committing? > + - `bcm2710-rpi-2-b.dtb` (for Pi 2B v1.2) > + - `bcm2710-rpi-cm3.dtb` (for Pi CM3) > - `bootcode.bin` > - `fixup.dat` > - `start.elf` > + - `overlays/miniuart-bt.dtbo` or `overlays/disable-bt.dtbo` (Optional) > 4. Create a `config.txt` with the following content: > ``` > arm_control=0x200 > enable_uart=1 > armstub=RPI_EFI.fd > - disable_commandline_tags=1 > + disable_commandline_tags=2 > + device_tree_address=0x1f0000 > + device_tree_end=0x200000 > ``` > - Additionally, if you want to use PL011 instead of the miniUART, you can add the lines: > + If you want to use PL011 instead of the miniUART on your Pi 3B/3B+, you can add the lines: > ``` > - device_tree_address=0x10000 > - device_tree_end=0x20000 > - device_tree=bcm2710-rpi-3-b[-plus].dtb > dtoverlay=miniuart-bt > ``` > + Note: doing so requires `miniuart-bt.dbto` to have been copied into an `overlays/` > + directory on the uSD card. Alternatively, you may use `disable-bt` instead of > + `miniuart-bt` if you don't require Bluetooth. > 5. Insert the uSD card and power up the Pi. > > Note that if you have a model 3+ or a model 3 where you enabled USB boot through OTP > @@ -92,21 +99,26 @@ in the `TrustedFirmware/` directory from `edk2-non-osi`. > > ## Custom Device Tree > > -The default Device Tree included in the firmware is the one for a Raspberry Pi 3 Model B (not B+). > -If you want to use a different Device Tree, to boot a Pi 3 Model B+ for instance (for which a > -DTB is also provided under `DeviceTree/`), you should copy the relevant `.dtb` into the root of > +By default, UEFI will use the device tree loaded by the VideoCore firmware. This > +depends on the model/variant, and relies on the presence on specific files on your boot media. > +E.g.: > + - `bcm2710-rpi-3-b.dtb` (for Pi 3B) > + - `bcm2710-rpi-3-b-plus.dtb (for Pi 3B+) Same as above (Missing closing ` after .dtb). > + - `bcm2710-rpi-2-b.dtb` (for Pi 2B v1.2) > + - `bcm2710-rpi-cm3.dtb` (for Pi CM3) > + > +You can override the DTB and provide a custom one. Copy the relevant `.dtb` into the root of > the SD or USB, and then edit your `config.txt` so that it looks like: > > ``` > (...) > disable_commandline_tags=2 > -device_tree_address=0x10000 > -device_tree_end=0x20000 > -device_tree=bcm2710-rpi-3-b-plus.dtb > +device_tree_address=0x1f0000 > +device_tree_end=0x200000 > +device_tree=your_fdt_file.dtb > ``` > > -Note: the address range **must** be `[0x10000:0x20000]`. > -`dtoverlay` and `dtparam` parameters are also supported **when** providing a Device Tree`. > +Note: the address range **must** be `[0x1f0000:0x200000]`. `dtoverlay` and `dtparam` parameters are also supported. > > ## Custom `bootargs` > > diff --git a/Platform/RaspberryPi/RPi4/Readme.md b/Platform/RaspberryPi/RPi4/Readme.md > index 17d02e9e..62a63c4c 100644 > --- a/Platform/RaspberryPi/RPi4/Readme.md > +++ b/Platform/RaspberryPi/RPi4/Readme.md > @@ -54,18 +54,17 @@ Build instructions from the top level edk2-platforms Readme.md apply. > enable_uart=1 > enable_gic=1 > armstub=RPI_EFI.fd > - disable_commandline_tags=1 > + disable_commandline_tags=2 > + device_tree_address=0x1f0000 > + device_tree_end=0x200000 > ``` > Additionally, if you want to use PL011 instead of the miniUART, you can add the lines: > ``` > - device_tree_address=0x1f0000 > - device_tree_end=0x200000 > - device_tree=bcm2711-rpi-4-b.dtb > dtoverlay=miniuart-bt > ``` > - Note that doing so requires `miniuart-bt.dbto` to have been copied into an `overlays/` > + Note: doing so requires `miniuart-bt.dbto` to have been copied into an `overlays/` > directory on the uSD card. Alternatively, you may use `disable-bt` instead of > - `miniuart-bt` if you don't require BlueTooth. > + `miniuart-bt` if you don't require Bluetooth. > 5. Insert the uSD card and power up the Pi. > > # Notes > @@ -81,18 +80,23 @@ in the `TrustedFirmware/` directory from `edk2-non-osi`. > > ## Device Tree > > -You can pass a custom Device Tree and overlays using the following: > +By default, UEFI will use the device tree loaded by the VideoCore firmware. This > +depends on the model/variant, and relies on the presence on specific files on your boot media. > +E.g.: > + - `bcm2711-rpi-4-b.dtb` (for Pi 4B) > + > +You can override the DTB and provide a custom one. Copy the relevant `.dtb` into the root of > +the SD or USB, and then edit your `config.txt` so that it looks like: > > ``` > (...) > disable_commandline_tags=2 > device_tree_address=0x1f0000 > device_tree_end=0x200000 > -device_tree=bcm2711-rpi-4-b.dtb > +device_tree=your_fdt_file.dtb > ``` > > -Note: the address range **must** be `[0x1f0000:0x200000]`. > -`dtoverlay` and `dtparam` parameters are also supported **when** providing a Device Tree`. > +Note: the address range **must** be `[0x1f0000:0x200000]`. `dtoverlay` and `dtparam` parameters are also supported. > > ## Custom `bootargs` > > With the above 2 typos fixed, Reviewed-by: Pete Batard