Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-01 08:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '2023-08-17-assorted-minor-fixes'

Browse source 
- More MAINTAINERS updates, update CI to use a newer coreboot and make
  arm-ffa a bit less verbose by default.
This commit is contained in:
Tom Rini 2023-08-17 15:01:11 -04:00
commit 3a438c1dbc
17 changed files with 94 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.azure-pipelines.yml
View file

@ -426,7 +426,7 @@ stages:
cp images/spi-nor.img ${UBOOT_TRAVIS_BUILD_DIR}/;
fi
if [[ "${TEST_PY_BD}" == "coreboot" ]]; then
wget -O - "https://drive.google.com/uc?id=1x6nrtWIyIRPLS2cQBwYTnT2TbOI8UjmM&export=download" |xz -dc >${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom;
wget -O - "https://drive.google.com/uc?id=1uJ2VkUQ8czWFZmhJQ90Tp8V_zrJ6BrBH&export=download" |xz -dc >${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom;
wget -O - "https://drive.google.com/uc?id=149Cz-5SZXHNKpi9xg6R_5XITWohu348y&export=download" >cbfstool;
chmod a+x cbfstool;
./cbfstool ${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom add-flat-binary -f ${UBOOT_TRAVIS_BUILD_DIR}/u-boot.bin -n fallback/payload -c LZMA -l 0x1110000 -e 0x1110000;

2
.gitlab-ci.yml
View file

@ -69,7 +69,7 @@ stages:
fi
- if [[ "${TEST_PY_BD}" == "coreboot" ]]; then
wget -O -
"https://drive.google.com/uc?id=1x6nrtWIyIRPLS2cQBwYTnT2TbOI8UjmM&export=download" |
"https://drive.google.com/uc?id=1uJ2VkUQ8czWFZmhJQ90Tp8V_zrJ6BrBH&export=download" |
xz -dc >${UBOOT_TRAVIS_BUILD_DIR}/coreboot.rom;
wget -O -
"https://drive.google.com/uc?id=149Cz-5SZXHNKpi9xg6R_5XITWohu348y&export=download" >

4
MAINTAINERS
View file

@ -132,6 +132,7 @@ M: Tom Rini <trini@konsulko.com>
S: Maintained
T: git https://source.denx.de/u-boot/custodians/u-boot-arm.git
F: arch/arm/
F: arch/arm/dts/Makefile
F: cmd/arm/
ARM ALTERA SOCFPGA
@ -1598,7 +1599,8 @@ T: git https://source.denx.de/u-boot/custodians/u-boot-ubi.git
F: drivers/mtd/ubi/
UFS
M: Faiz Abbas <faiz_abbas@ti.com>
M: Bhupesh Sharma <bhupesh.sharma@linaro.org>
M: Neha Malcom Francis <n-francis@ti.com>
S: Maintained
F: drivers/ufs/

3
board/anbernic/rgxx3_rk3566/MAINTAINERS
View file

@ -4,3 +4,6 @@ S: Maintained
F: board/anbernic/rgxx3_rk3566
F: include/configs/anbernic-rgxx3-rk3566.h
F: configs/anbernic-rgxx3_defconfig
F: arch/arm/dts/rk3566-anbernic-rgxx3.dts
F: arch/arm/dts/rk3566-anbernic-rgxx3.dtsi
F: arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi

4
board/armltd/corstone1000/MAINTAINERS
View file

@ -1,6 +1,6 @@
CORSTONE1000 BOARD
M: Rui Miguel Silva <rui.silva@linaro.org>
M: Vishnu Banavath <vishnu.banavath@arm.com>
M: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
M: Xueliang Zhong <xueliang.zhong@arm.com>
S: Maintained
F: board/armltd/corstone1000/
F: include/configs/corstone1000.h

6
board/edgeble/neural-compute-module-6/MAINTAINERS
View file

@ -5,3 +5,9 @@ F: board/edgeble/neural-compute-module-6
F: include/configs/neural-compute-module-6.h
F: configs/neu6a-io-rk3588_defconfig
F: configs/neu6b-io-rk3588_defconfig
F: arch/arm/dts/rk3588-edgeble-neu6a.dtsi
F: arch/arm/dts/rk3588-edgeble-neu6a-io.dts
F: arch/arm/dts/rk3588-edgeble-neu6a-io-u-boot.dtsi
F: arch/arm/dts/rk3588-edgeble-neu6b.dtsi
F: arch/arm/dts/rk3588-edgeble-neu6b-io.dts
F: arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi

3
board/radxa/rock5a-rk3588s/MAINTAINERS
View file

@ -1,6 +1,9 @@
ROCK5A-RK3588
M: Eugen Hristev <eugen.hristev@collabora.com>
R: Jonas Karlman <jonas@kwiboo.se>
S: Maintained
F: board/radxa/rock5a-rk3588s
F: include/configs/rock5a-rk3588s.h
F: configs/rock5a-rk3588s_defconfig
F: arch/arm/dts/rk3588s-rock-5a.dts
F: arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi

5
board/radxa/rock5b-rk3588/MAINTAINERS
View file

@ -1,6 +1,9 @@
ROCK5B-RK3588
M: Eugen Hristev <eugen.hristev@collabora.com>
R: Jonas Karlman <jonas@kwiboo.se>
S: Maintained
F: board/radxa/rock5b-rk3588
F: include/configs/rock5b-rk3588
F: include/configs/rock5b-rk3588.h
F: configs/rock5b-rk3588_defconfig
F: arch/arm/dts/rk3588-rock-5b.dts
F: arch/arm/dts/rk3588-rock-5b-u-boot.dtsi

55
board/rockchip/evb_rk3568/MAINTAINERS
View file

@ -1,13 +1,13 @@
EVB-RK3568
M: Joseph Chen <chenjh@rock-chips.com>
S: Maintained
F: board/rockchip/evb_rk3568
F: include/configs/evb_rk3568.h
F: configs/evb-rk3568_defconfig
F: arch/arm/dts/rk3568-evb-boot.dtsi
M: Joseph Chen <chenjh@rock-chips.com>
S: Maintained
F: board/rockchip/evb_rk3568
F: include/configs/evb_rk3568.h
F: configs/evb-rk3568_defconfig
F: arch/arm/dts/rk3568-evb-u-boot.dtsi
F: arch/arm/dts/rk3568-evb.dts
Lubancat-2
LUBANCAT-2
M: Andy Yan <andyshrk@163.com>
S: Maintained
F: configs/lubancat-2-rk3568_defconfig
@ -15,24 +15,30 @@ F: arch/arm/dts/rk3568-lubancat-2.dts
F: arch/arm/dts/rk3568-lubancat-2-u-boot.dtsi
NANOPI-R5C
M: Tianling Shen <cnsztl@gmail.com>
S: Maintained
F: configs/nanopi-r5c-rk3568_defconfig
F: arch/arm/dts/rk3568-nanopi-r5c.dts
F: arch/arm/dts/rk3568-nanopi-r5c-u-boot.dtsi
M: Tianling Shen <cnsztl@gmail.com>
R: Jonas Karlman <jonas@kwiboo.se>
S: Maintained
F: configs/nanopi-r5c-rk3568_defconfig
F: arch/arm/dts/rk3568-nanopi-r5c.dts
F: arch/arm/dts/rk3568-nanopi-r5c-u-boot.dtsi
NANOPI-R5S
M: Tianling Shen <cnsztl@gmail.com>
S: Maintained
F: configs/nanopi-r5s-rk3568_defconfig
F: arch/arm/dts/rk3568-nanopi-r5s.dts
F: arch/arm/dts/rk3568-nanopi-r5s.dtsi
F: arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
M: Tianling Shen <cnsztl@gmail.com>
R: Jonas Karlman <jonas@kwiboo.se>
S: Maintained
F: configs/nanopi-r5s-rk3568_defconfig
F: arch/arm/dts/rk3568-nanopi-r5s.dts
F: arch/arm/dts/rk3568-nanopi-r5s.dtsi
F: arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
RADXA-CM3
RADXA-CM3-IO
M: Jagan Teki <jagan@amarulasolutions.com>
R: Jonas Karlman <jonas@kwiboo.se>
S: Maintained
F: configs/radxa-cm3-io-rk3566_defconfig
F: arch/arm/dts/rk3566-radxa-cm3.dtsi
F: arch/arm/dts/rk3566-radxa-cm3-io.dts
F: arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi
RADXA-E25
M: Jonas Karlman <jonas@kwiboo.se>
@ -43,8 +49,9 @@ F: arch/arm/dts/rk3568-radxa-e25.dts
F: arch/arm/dts/rk3568-radxa-e25-u-boot.dtsi
ROCK-3A
M: Akash Gajjar <gajjar04akash@gmail.com>
S: Maintained
F: configs/rock-3a-rk3568_defconfig
F: arch/arm/dts/rk3568-rock-3a.dts
F: arch/arm/dts/rk3568-rock-3a-u-boot.dtsi
M: Akash Gajjar <gajjar04akash@gmail.com>
R: Jonas Karlman <jonas@kwiboo.se>
S: Maintained
F: configs/rock-3a-rk3568_defconfig
F: arch/arm/dts/rk3568-rock-3a.dts
F: arch/arm/dts/rk3568-rock-3a-u-boot.dtsi

3
board/rockchip/evb_rk3588/MAINTAINERS
View file

@ -4,4 +4,5 @@ S: Maintained
F: board/rockchip/evb_rk3588
F: include/configs/evb_rk3588.h
F: configs/evb-rk3588_defconfig
F: arch/arm/dts/rk3588-evb-u-boot.dtsi
F: arch/arm/dts/rk3588-evb1-v10.dts
F: arch/arm/dts/rk3588-evb1-v10-u-boot.dtsi

2
doc/arch/arm64.ffa.rst
View file

@ -231,7 +231,7 @@ Please refer the command documentation at :doc:`../usage/cmd/armffa`
Example of boot logs with FF-A enabled
--------------------------------------
For example, when using FF-A with Corstone-1000 the logs are as follows:
For example, when using FF-A with Corstone-1000, debug logs enabled, the output is as follows:
::

20
doc/board/coreboot/coreboot.rst
View file

@ -134,3 +134,23 @@ input clock is 1843200. So you can add the following CONFIG options::
CONFIG_DEBUG_UART_CLOCK=1843200
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_DEBUG_UART_ANNOUNCE=y
coreboot in CI
--------------
CI runs tests using a pre-built coreboot image. This ensures that U-Boot can
boot as a coreboot payload, based on a known-good build of coreboot.
To update the `coreboot.rom` file which is used:
#. Build coreboot with `CONFIG_LINEAR_FRAMEBUFFER=y`. If using `make menuconfig`
this is under
`Devices ->Display->Framebuffer mode->Linear "high resolution" framebuffer`.
#. Compress the resulting `coreboot.rom`::
xz -c /path/to/coreboot/build/coreboot.rom >coreboot.rom.xz
#. Upload the file to Google drive
#. Send a patch to change the file ID used by wget in the CI yaml files.

20
doc/board/rockchip/rockchip.rst
View file

@ -91,18 +91,22 @@ List of mainline supported Rockchip boards:
- Theobroma Systems RK3399-Q7 SoM - Puma (puma_rk3399)
* rk3566
- Anbernic RGxx3 (rgxx3-rk3566)
- Anbernic RGxx3 (anbernic-rgxx3)
- Pine64 Quartz64-A Board (quartz64-a-rk3566)
- Pine64 Quartz64-B Board (quartz64-b-rk3566)
- Pine64 SOQuartz on Blade (soquartz-blade-rk3566)
- Pine64 SOQuartz on CM4-IO (soquartz-cm4-rk3566)
- Pine64 SOQuartz on Model A (soquartz-model-a-rk3566)
- Radxa CM3 IO Board (radxa-cm3-io-rk3566)
* rk3568
- Rockchip Evb-RK3568 (evb-rk3568)
- EmbedFire Lubancat 2 (lubancat-2-rk3568_defconfig)
- EmbedFire LubanCat 2 (lubancat-2-rk3568)
- FriendlyElec NanoPi R5C (nanopi-r5c-rk3568)
- FriendlyElec NanoPi R5S (nanopi-r5s-rk3568)
- Hardkernel ODROID-M1 (odroid-m1-rk3568)
- Pine64 Quartz64-A Board (quartz64-a-rk3566_defconfig)
- Pine64 Quartz64-B Board (quartz64-b-rk3566_defconfig)
- Pine64 SOQuartz on Blade (soquartz-blade-rk3566_defconfig)
- Pine64 SOQuartz on CM4-IO (soquartz-cm4-rk3566_defconfig)
- Pine64 SOQuartz on Model A (soquartz-model-a-rk3566_defconfig)
- Radxa E25 Carrier Board (radxa-e25-rk3568_defconfig)
- Radxa E25 Carrier Board (radxa-e25-rk3568)
- Radxa ROCK 3 Model A (rock-3a-rk3568)
* rk3588
- Rockchip EVB (evb-rk3588)

4
drivers/firmware/arm-ffa/arm-ffa-uclass.c
View file

@ -201,11 +201,11 @@ int ffa_get_version_hdlr(struct udevice *dev)
major = GET_FFA_MAJOR_VERSION(res.a0);
minor = GET_FFA_MINOR_VERSION(res.a0);
log_info("FF-A driver %d.%d\nFF-A framework %d.%d\n",
log_debug("FF-A driver %d.%d\nFF-A framework %d.%d\n",
FFA_MAJOR_VERSION, FFA_MINOR_VERSION, major, minor);
if (major == FFA_MAJOR_VERSION && minor >= FFA_MINOR_VERSION) {
log_info("FF-A versions are compatible\n");
log_debug("FF-A versions are compatible\n");
if (dev) {
uc_priv = dev_get_uclass_priv(dev);

2
drivers/firmware/arm-ffa/arm-ffa.c
View file

@ -42,7 +42,7 @@ static bool arm_ffa_discover(struct udevice *dev)
{
int ret;
log_info("Arm FF-A framework discovery\n");
log_debug("Arm FF-A framework discovery\n");
ret = ffa_get_version_hdlr(dev);
if (ret)

2
drivers/firmware/arm-ffa/ffa-emul-uclass.c
View file

@ -695,7 +695,7 @@ int ffa_emul_find(struct udevice *dev, struct udevice **emulp)
return ret;
}
log_info("FF-A emulator ready to use\n");
log_debug("FF-A emulator ready to use\n");
return 0;
}

2
drivers/firmware/arm-ffa/sandbox_ffa.c
View file

@ -30,7 +30,7 @@ static int sandbox_ffa_discover(struct udevice *dev)
int ret;
struct udevice *emul;
log_info("Emulated FF-A framework discovery\n");
log_debug("Emulated FF-A framework discovery\n");
ret = ffa_emul_find(dev, &emul);
if (ret) {