Recent versions of sphinx will emit messages like:

  doc/sphinx/kerneldoc.py:103:
     RemovedInSphinx20Warning: app.warning() is now deprecated.
     Use sphinx.util.logging instead.

Switch to sphinx.util.logging to make this unsightly message go away.
Alas, that interface was only added in version 1.6, so we have to add a
version check to keep things working with older sphinxes.
Signed-off-by: NJonathan Corbet <corbet@lwn.net>
Rebased for U-Boot
Signed-off-by: NHeinrich Schuchardt <xypron.glpk@gmx.de>

Add support for A/B boot process on AM57xx based boards:

  1. Define 'slot_suffix' variable (using 'ab_select' command)
  2. Extend 'emmc_android_boot' boot command (add commands for A/B boot
     process)

'ab_select' command is used to decide which slot should be used for
booting up. A/B metadata resides in 'misc' partition.

To activate the A/B boot process, the following config options must be
set:

    CONFIG_ANDROID_AB=y
    CONFIG_CMD_AB_SELECT=y

For successful A/B boot, the corresponding A/B infrastructure must be
involved on Android side [1] (including mounting system as root), and
disk must be partitioned accordingly.

When A/B boot is enabled, there are some known limitations currently
exist (not related to A/B patches, need to be implemented later):

  1. The 'Verified Boot' sequence is not supported
  2. dev path to system partition (system_a or system_b) is passed via
     'bootargs' as 'root=' argument like 'root=/dev/mmcblk1p12', but
     further we'll need to rework it with respect to dm-verity
     requirements [2]

In case when A/B partitions are not present in system (and A/B boot is
enabled), boot up process will be terminated and next message will be
shown:

    "boot_a(b) partition not found"

[1] https://source.android.com/devices/tech/ota/ab
[2] https://source.android.com/devices/tech/ota/ab/ab_implement#kernelSigned-off-by: NRuslan Trofymenko <ruslan.trofymenko@linaro.org>
Signed-off-by: NIgor Opaniuk <igor.opaniuk@gmail.com>
Signed-off-by: NSam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: NAlistair Strachan <astrachan@google.com>
Reviewed-by: NSam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: NSimon Glass <sjg@chromium.org>

Add a short documentation for A/B enablement and 'ab_select' command
usage.
Signed-off-by: NRuslan Trofymenko <ruslan.trofymenko@linaro.org>
Signed-off-by: NIgor Opaniuk <igor.opaniuk@gmail.com>
Signed-off-by: NSam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: NAlistair Strachan <astrachan@google.com>
Reviewed-by: NSam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: NSimon Glass <sjg@chromium.org>

Add sandbox test for 'ab_select' command.

Test: ./test/py/test.py --bd sandbox --build -k test_ab
Signed-off-by: NRuslan Trofymenko <ruslan.trofymenko@linaro.org>
Signed-off-by: NIgor Opaniuk <igor.opaniuk@gmail.com>
Signed-off-by: NSam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: NAlistair Strachan <astrachan@google.com>
Reviewed-by: NSam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: NSimon Glass <sjg@chromium.org>

For A/B system update support the Android boot process requires to send
'androidboot.slot_suffix' parameter as a command line argument. This
patch implementes 'ab_select' command which allows us to obtain current
slot by processing the A/B metadata.

The patch was extracted from commit [1] with one modification: the
separator for specifying the name of metadata partition was changed
from ';' to '#', because ';' is used for commands separation.

[1] https://android-review.googlesource.com/c/platform/external/u-boot/+/729880/2Signed-off-by: NRuslan Trofymenko <ruslan.trofymenko@linaro.org>
Signed-off-by: NIgor Opaniuk <igor.opaniuk@gmail.com>
Reviewed-by: NAlistair Strachan <astrachan@google.com>
Reviewed-by: NSam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: NSimon Glass <sjg@chromium.org>

This patch determines the A/B-specific bootloader message structure
that is the basis for implementation of recovery and A/B update
functions. A/B metadata is stored in this structure and used to decide
which slot should we use to boot the device. Also some basic functions
for A/B metadata manipulation are implemented (like slot selection).

The patch was extracted from commits [1], [2] with some coding style
fixes.

[1] https://android-review.googlesource.com/c/platform/external/u-boot/+/729878/2
[2] https://android-review.googlesource.com/c/platform/external/u-boot/+/729880/2Signed-off-by: NRuslan Trofymenko <ruslan.trofymenko@linaro.org>
Signed-off-by: NIgor Opaniuk <igor.opaniuk@gmail.com>
Reviewed-by: NSam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: NSimon Glass <sjg@chromium.org>

This patch adds part_get_info_by_dev_and_name_or_num() function which
allows us to get partition info from its number or name. Partition of
interest is specified by string like "device_num:partition_number" or
"device_num#partition_name".

The patch was extracted from [1].

[1] https://android-review.googlesource.com/c/platform/external/u-boot/+/729880/2Signed-off-by: NRuslan Trofymenko <ruslan.trofymenko@linaro.org>
Signed-off-by: NIgor Opaniuk <igor.opaniuk@gmail.com>
Reviewed-by: NAlistair Strachan <astrachan@google.com>
Reviewed-by: NSam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: NSimon Glass <sjg@chromium.org>

These have been reported by Simon in [1] and fixed in [2].
However, since [1] has already been pushed to u-boot/master, the
improvements incorporated in [2] are now extracted and resubmitted.

The changes are in the area of coding style and best practices:
* s/field/fieldp/, s/size/sizep/, to convey that the variables return
  an output to the caller
* s/err_1/err_read_fail/, s/err_2/err_too_small/, to be more descriptive
* Made sure 'static int do_bcb_load' appears on the same line
* Placed a `/*` on top of multi-line comment

[1] https://patchwork.ozlabs.org/patch/1104244/#2200259
[2] https://patchwork.ozlabs.org/cover/1128661/
   ("[v4,0/4] Add 'bcb' command to read/modify/write Android BCB")

Fixes: db7b7a05 ("cmd: Add 'bcb' command to read/modify/write BCB fields")
Reported-by: NSimon Glass <sjg@chromium.org>
Signed-off-by: NEugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: NSam Protsenko <semen.protsenko@linaro.org>

Quote from https://patchwork.ozlabs.org/patch/1104244/#2210814:

 ----------8<-----------
strncmp() is chosen for the sake of paranoid/defensive programming.
Indeed, strncmp() is not really needed when comparing a variable
with a string literal. We expect strcmp() to behave safely even if the
string variable is not NUL-terminated.

In the same scenario, Linux v5.2-rc7 uses both strcmp() and strncmp(),
but the frequency of strcmp() is higher:

$ git --version
git version 2.22.0
$ (Linux 5.2-rc7) git grep -En 'strncmp\([^"]*"[[:alnum:]]+"' | wc -l
1066
$ (Linux 5.2-rc7) git grep -En 'strcmp\([^"]*"[[:alnum:]]+"' | wc -l
1968

A quick "strcmp vs strncmp" object size test shows that strcmp()
generates smaller memory footprint (gcc-8, x86_64):

$ (U-Boot) size cmd/bcb-strncmp.o cmd/bcb-strcmp.o
   text	   data	    bss	    dec	    hex	filename
   3373	    400	   2048	   5821	   16bd	cmd/bcb-strncmp.o
   3314	    400	   2048	   5762	   1682	cmd/bcb-strcmp.o

So, overall, I agree to use strcmp() whenever variables are compared
with string literals.
 ----------8<-----------

Fixes: db7b7a05 ("cmd: Add 'bcb' command to read/modify/write BCB fields")
Reported-by: NSimon Glass <sjg@chromium.org>
Signed-off-by: NEugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: NSam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: NIgor Opaniuk <igor.opaniuk@gmail.com>

Fix warning V1037 reported by PVS-Studio Static Analyzer:
Two or more case-branches perform the same actions. Check lines: 49, 53

Fixes: db7b7a05 ("cmd: Add 'bcb' command to read/modify/write BCB fields")
Signed-off-by: NEugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: NIgor Opaniuk <igor.opaniuk@gmail.com>
Reviewed-by: NSam Protsenko <semen.protsenko@linaro.org>

Commit 9bdf0e8f ("doc: relocate/rename Android README and add BCB
overview") left some obsolete references of Android documents/paths.

This has been pointed out by Sam (thanks!) in:
https://patchwork.ozlabs.org/patch/1104245/#2208134

Fixes: 9bdf0e8f ("doc: relocate/rename Android README and add BCB overview")
Reported-by: NSam Protsenko <semen.protsenko@linaro.org>
Suggested-by: NSam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: NEugeniu Rosca <erosca@de.adit-jv.com>
Reviewed-by: NIgor Opaniuk <igor.opaniuk@gmail.com>
Reviewed-by: NSam Protsenko <semen.protsenko@linaro.org>

This allows to use any available compression format with Android boot image

Since not all available compression formats have a magic number we should
explicitly specify type of compression.

For this purpose using uImage format becomes very useful, as this format is
well-known by the community and mkimage tool is already available.

Usage example:
mkimage -A ARM64 -T kernel -C lzma -d Image.lzma out/kernel

At this moment only -C option is handled, but specifying -A and -T options
are recommended for compatibility reasons in the future.

Kernel that compressed with LZ4 can be already used without wrapping into
the uImage, but I recommend wrapping it into the uImage in order to avoid
situations when by some mistake legacy LZ4 is used, that is interpreted as
raw Image and causes CPU to enter Exception Handler without providing any
meaningful explanation to the user.
Signed-off-by: NRoman Stratiienko <roman.stratiienko@globallogic.com>

If there is only one menu item available, prompting user to enter
choice makes little sense and just causes unnecessary boot delay. This
change makes menu_get_choice return the only one item when there is no
other choices.
Signed-off-by: NLeon Yu <leoyu@nvidia.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Thierry Reding <treding@nvidia.com>

This sub-command serves for getting the partition index from
partition name. Also it can be used to test the existence of specified
partition.

Use case:
For example, in most CI environments this U-Boot command for automatic
testing of Linux rootfs is used:

    => setenv bootpart 1:f

where 0xf is "userdata" partition. But the number of "userdata"
partition can be changed any time, when partition table is changed.

So it would be nice to get rid of that 0xf magic number and use
partition name instead, like this:

    => part number mmc 1 userdata part_num
    => setenv bootpart 1:${part_num}
Signed-off-by: NRuslan Trofymenko <ruslan.trofymenko@linaro.org>
Signed-off-by: NIgor Opaniuk <igor.opaniuk@gmail.com>
Reviewed-by: NAlistair Strachan <astrachan@google.com>
Reviewed-by: NSam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: NSimon Glass <sjg@chromium.org>
Reviewed-by: NSam Protsenko <semen.protsenko@linaro.org>

Pull request for UEFI sub-system for v2019.10-rc1 (2)

* Implement the EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE event.
* Address errors of type -Werror=address-of-packed-member when building
  with GCC9.1
* Fix an error when adding memory add addres 0x00000000.
* Rework some code comments for Sphinx compliance.

- add rtc driver for stm32mp1
- add remoteproc driver for stm32mp1
- use kernel qspi compatible string for stm32

- rk3399 sdhci driver fixup
- TPL BANNER fixup

The generic code in common/spl/spl.c allows TPL/SPL banners to be
silenced by unsetting CONFIG_TPL_BANNER_PRINT or CONFIG_SPL_BANNER_PRINT
respectively. However, arch/arm/mach-rockchip/tpl.c prints this banner
unconditionally.

Fix the rockchip-specific tpl.c so that the TPL banner depends on
CONFIG_TPL_BANNER_PRINT in the same way as the generic code.

Signed-off-by: <chris@arachsys.com>
Reviewed-by: NKever Yang <Kever.yang@rock-chips.com>

If CONFIG_DEBUG_UART is set but CONFIG_TPL_SERIAL_SUPPORT is not, the
serial output should be available in SPL and full U-Boot, but not built
in TPL. However, the rockchip tpl.c instead fails to compile with
undefined references to the debug UART.

Instead, initialise the debug UART and print the TPL banner only if both
CONFIG_DEBUG_UART and CONFIG_TPL_SERIAL_SUPPORT are set.

Signed-off-by: <chris@arachsys.com>
Reviewed-by: NKever Yang <Kever.yang@rock-chips.com>

Add support of STM32MP1 rtc driver.
Enable it for basic and trusted configurations.
Signed-off-by: NBenjamin Gaignard <benjamin.gaignard@st.com>

Add RTCAPB and RTC clock support.
Signed-off-by: NBenjamin Gaignard <benjamin.gaignard@st.com>
Signed-off-by: NPatrick Delaunay <patrick.delaunay@st.com>

Align doc/device-tree-bindings/spi/spi-stm32-qspi.txt with kernel v5.2-rc6
Signed-off-by: NPatrice Chotard <patrice.chotard@st.com>

"st,stm32-qspi" is no more used, remove it.
Signed-off-by: NPatrice Chotard <patrice.chotard@st.com>

For STM32 QSPI driver, "st,stm32-qspi" compatible string was first
introduced in U-boot. But later in kernel side, "st,stm32f469-qspi"
was used.
To simplify, align U-boot QSPI compatible string with kernel one.
Signed-off-by: NPatrice Chotard <patrice.chotard@st.com>

For STM32 QSPI driver, "st,stm32-qspi" compatible string was first
introduced in U-boot. But later in kernel side, "st,stm32f469-qspi"
was used.
To simplify, align U-boot QSPI compatible string with kernel one.
Signed-off-by: NPatrice Chotard <patrice.chotard@st.com>

Activate the remote processor support for stm32mp15 configs.
Signed-off-by: NFabien Dessenne <fabien.dessenne@st.com>

Signed-off-by: NFabien Dessenne <fabien.dessenne@st.com>

This patch introduces support of Cortex-M4 remote processor for STM32
MCU and MPU families.
Signed-off-by: NLoic Pallardy <loic.pallardy@st.com>
Signed-off-by: NFabien Dessenne <fabien.dessenne@st.com>

The current implementation supports only binary file load.
Add helpers to support ELF32 format (sanity check, and load).
Note that since an ELF32 image is built for the remote processor, the
load function uses the device_to_virt ops to translate the addresses.
Implement a basic translation for sandbox_testproc.

Add related tests. Test result:
=> ut dm remoteproc_elf
Test: dm_test_remoteproc_elf: remoteproc.c
Test: dm_test_remoteproc_elf: remoteproc.c (flat tree)
Failures: 0
Signed-off-by: NLoic Pallardy <loic.pallardy@st.com>
Signed-off-by: NFabien Dessenne <fabien.dessenne@st.com>
Reviewed-by: NLokesh Vutla <lokeshvutla@ti.com>

Introduce the device_to_virt function to allow translation between
device address (remote processor view) and virtual address (main
processor view).
Signed-off-by: NLoic Pallardy <loic.pallardy@st.com>
Signed-off-by: NFabien Dessenne <fabien.dessenne@st.com>
Reviewed-by: NLokesh Vutla <lokeshvutla@ti.com>

Add full function comment headers.
Fix rproc_is_initialized() return value description.
Signed-off-by: NFabien Dessenne <fabien.dessenne@st.com>
Reviewed-by: NLokesh Vutla <lokeshvutla@ti.com>

Add the following functions to translate DMA address to CPU address:
- dev_translate_dma_address()
- ofnode_translate_dma_address()
- of_translate_dma_address()
- fdt_translate_dma_address()
These functions work the same way as xxx_translate_address(), with the
difference that the translation relies on the "dma-ranges" property
instead of the "ranges" property.

Add related test. Test report:
=> ut dm fdt_translation
Test: dm_test_fdt_translation: test-fdt.c
Test: dm_test_fdt_translation: test-fdt.c (flat tree)
Failures: 0
Signed-off-by: NFabien Dessenne <fabien.dessenne@st.com>

- rk3399 lpddr4 support
- rk3399-rock960 board support improvement
- Eliminate pyelftools dependency by make_fit_atf.py
- clean up rockchip dts to use -u-boot.dtsi
- use ARM arch/generic timer instead of rk_timer
- clean up Kconfig options for board support

This patch fix mmc driver abort caused by below patch:
3d296365 mmc: sdhci: Add support for sdhci-caps-mask

After the patch sdhci_setup_cfg() access to host->mmc->dev,
so we have to do init before make the call to the function()
Signed-off-by: NKever Yang <kever.yang@rock-chips.com>

make_fit_atf.py no longer requires pyelftools, and nothing else in the
rockchip build requires it either, so remove references to installing it
from the documentation.
Signed-off-by: NChris Webb <chris@arachsys.com>
Reviewed-by: NKever Yang <Kever.yang@rock-chips.com>

make_fit_aft.py depends on the non-standard library pyelftools to pull
out PT_LOAD segments from ELF files. However, this is as easy to do
manually, without imposing the extra dependency on users.

Structures in the ELF file are unpacked into variables named to exactly
match the ELF spec to ensure the destructuring code is reasonably
self-documenting.
Signed-off-by: NChris Webb <chris@arachsys.com>
Reviewed-by: NAndy Yan <andy.yan@rock-chips.com>
Reviewed-by: NKever Yang <Kever.yang@rock-chips.com>

The TPL_BOOTROM_SUPPORT is needed for boot from bootrom like
other storages.
Signed-off-by: NKever Yang <kever.yang@rock-chips.com>

The RK3288 HDMI driver's rk3288_hdmi_enable() currently lacks a call to
dw_hdmi_enable(). Thus, the HDMI output never gets enabled.
Signed-off-by: NNiklas Schulze <me@jns.io>
Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: NKever Yang <Kever.yang@rock-chips.com>
Reviewed-by: NPhilipp Tomsich <philipp.tomsich@theobroma-systems.com>

Use common tpl.c instead of rk3399-board-tpl.c
Signed-off-by: NKever Yang <kever.yang@rock-chips.com>

RK3399 TPL do not need a dedicate board init, print the firmware
info when debug init instead.
Signed-off-by: NKever Yang <kever.yang@rock-chips.com>