From ccbc785e2427d2be7ce7d4825955b977a4280406 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 4 Aug 2023 16:46:15 -0400 Subject: [PATCH 01/13] Azure: Rework Rockchip jobs again The job for rockchip vendor platforms has again gotten close to or exceeded one hour. Rework things such that we move the 32bit platforms back to the general 32bit ARM job (as there's time there) and make these build only the 64bit platforms. Signed-off-by: Tom Rini --- .azure-pipelines.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 2678e5ae053..81913bc0686 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -540,7 +540,7 @@ stages: sun50i: BUILDMAN: "sun50i" arm_catch_all: - BUILDMAN: "arm -x arm11,arm7,arm9,aarch64,at91,bcm,freescale,kirkwood,mvebu,renesas,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,rk,toradex,socfpga,k2,k3,zynq" + BUILDMAN: "arm -x arm11,arm7,arm9,aarch64,at91,bcm,freescale,kirkwood,mvebu,renesas,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,toradex,socfpga,k2,k3,zynq" sandbox_x86: BUILDMAN: "sandbox x86" technexion: @@ -567,10 +567,10 @@ stages: BUILDMAN: "uniphier" aarch64_catch_all: BUILDMAN: "aarch64 -x amlogic,bcm,imx8,imx9,k3,tegra,ls1,ls2,lx216,mvebu,uniphier,renesas,sunxi,samsung,socfpga,rk,versal,zynq" - rk_rv_non_rockchip: - BUILDMAN: "rk|rv -x rockchip" - rk_rv_and_rockchip: - BUILDMAN: "(rk|rv)&rockchip" + rk_non_rockchip_64bit: + BUILDMAN: "rk&aarch64 -x rockchip" + rk_rockchip_64bit: + BUILDMAN: "rk&aarch64&rockchip" renesas: BUILDMAN: "renesas" zynq: From 60c95b1a26fecc4eb8efba7775533254a80fe354 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 4 Aug 2023 17:07:44 -0400 Subject: [PATCH 02/13] Azure: Squash a number of jobs and re-order slightly To reduce overall job time, move a number of smaller jobs together. These should still be safely under 1 hour total time, but reducing the overall number of jobs should help with the queue slightly. Signed-off-by: Tom Rini --- .azure-pipelines.yml | 72 ++++++++++++++------------------------------ 1 file changed, 23 insertions(+), 49 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 81913bc0686..31850ae5718 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -475,8 +475,8 @@ stages: # Use almost the same target division in .travis.yml, only merged # 3 small build jobs (arc/microblaze/xtensa) into one. matrix: - arc_microblaze_xtensa: - BUILDMAN: "arc microblaze xtensa" + arc_nios2_m68k_microblaze_xtensa: + BUILDMAN: "arc nios2 microblaze m68k xtensa" amlogic: BUILDMAN: "amlogic" arm11_arm7_arm920t_arm946es: @@ -493,90 +493,64 @@ stages: BUILDMAN: "bcm -x mips" nxp_arm32: BUILDMAN: "freescale -x powerpc,m68k,aarch64,ls101,ls102,ls104,ls108,ls20,lx216" - nxp_ls101x: - BUILDMAN: "freescale&ls101" + nxp_ls101x_ls108x: + BUILDMAN: "freescale&ls101 freescale&ls108" nxp_ls102x: BUILDMAN: "freescale&ls102 -x keymile" nxp_ls104x: BUILDMAN: "freescale&ls104" - nxp_ls108x: - BUILDMAN: "freescale&ls108" - nxp_ls20xx: - BUILDMAN: "freescale&ls20" - nxp_lx216x: - BUILDMAN: "freescale&lx216" + nxp_ls20xx_lx216x: + BUILDMAN: "freescale&ls20 freescale&lx216" imx6: BUILDMAN: "mx6 -x boundary,engicam,freescale,technexion,toradex" imx: BUILDMAN: "mx -x mx6,imx8,freescale,technexion,toradex" imx8_imx9: BUILDMAN: "imx8 imx9 -x engicam,technexion,toradex" - keymile: - BUILDMAN: "keymile" + keymiles_siemens_technexion: + BUILDMAN: "keymile siemens technexion" keystone2_keystone3: - BUILDMAN: "k2 k3" + BUILDMAN: "k2 k3 -x siemens,toradex" sandbox_asan: BUILDMAN: "sandbox" OVERRIDE: "-a ASAN" sandbox_clang_asan: BUILDMAN: "sandbox" OVERRIDE: "-O clang-16 -a ASAN" - samsung_socfpga: - BUILDMAN: "samsung socfpga" - sun4i: - BUILDMAN: "sun4i" - sun5i: - BUILDMAN: "sun5i" - sun6i: - BUILDMAN: "sun6i" + samsung_socfpga_renesas: + BUILDMAN: "samsung socfpga renesas" + sun4i_sun9i: + BUILDMAN: "sun4i sun9i" + sun5i_sun6i: + BUILDMAN: "sun5i sun6i" sun7i: BUILDMAN: "sun7i" - sun8i_32bit: - BUILDMAN: "sun8i&armv7" - sun8i_64bit: - BUILDMAN: "sun8i&aarch64" - sun9i: - BUILDMAN: "sun9i" + sun8i: + BUILDMAN: "sun8i" sun50i: BUILDMAN: "sun50i" arm_catch_all: BUILDMAN: "arm -x arm11,arm7,arm9,aarch64,at91,bcm,freescale,kirkwood,mvebu,renesas,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,toradex,socfpga,k2,k3,zynq" sandbox_x86: BUILDMAN: "sandbox x86" - technexion: - BUILDMAN: "technexion" - kirkwood: - BUILDMAN: "kirkwood" - mvebu: - BUILDMAN: "mvebu" - m68k: - BUILDMAN: "m68k" + kirkwood_mvebu_uniphier: + BUILDMAN: "kirkwood mvebu uniphier" mips: BUILDMAN: "mips" powerpc: BUILDMAN: "powerpc -x keymile" - siemens: - BUILDMAN: "siemens" tegra: BUILDMAN: "tegra -x toradex" - am33xx_no_siemens: - BUILDMAN: "am33xx -x siemens" - omap: - BUILDMAN: "omap" - uniphier: - BUILDMAN: "uniphier" + am33xx_omap: + BUILDMAN: "am33xx omap -x siemens" aarch64_catch_all: BUILDMAN: "aarch64 -x amlogic,bcm,imx8,imx9,k3,tegra,ls1,ls2,lx216,mvebu,uniphier,renesas,sunxi,samsung,socfpga,rk,versal,zynq" rk_non_rockchip_64bit: BUILDMAN: "rk&aarch64 -x rockchip" rk_rockchip_64bit: BUILDMAN: "rk&aarch64&rockchip" - renesas: - BUILDMAN: "renesas" - zynq: - BUILDMAN: "zynq&armv7" - zynqmp_versal: - BUILDMAN: "versal|zynqmp&aarch64" + zynq_zynqmp_versal: + BUILDMAN: "zynq&armv7 versal zynqmp&aarch64" riscv: BUILDMAN: "riscv" steps: From 2940b522279821859e2f20c13392cb9233825816 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 7 Aug 2023 09:20:53 -0400 Subject: [PATCH 03/13] get_maintainer.pl: Add an ignore list for git history MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As Pali Rohár has asked to not be copied on changes to files he is not a specific maintainer of, add his address to .get_maintainer.ignore. Signed-off-by: Tom Rini Reviewed-by: Michael Trimarchi --- .get_maintainer.ignore | 1 + .gitignore | 1 + 2 files changed, 2 insertions(+) create mode 100644 .get_maintainer.ignore diff --git a/.get_maintainer.ignore b/.get_maintainer.ignore new file mode 100644 index 00000000000..899a1469b2a --- /dev/null +++ b/.get_maintainer.ignore @@ -0,0 +1 @@ +"Pali Rohár" diff --git a/.gitignore b/.gitignore index 3a4d056edfc..002f95de4fe 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,7 @@ fit-dtb.blob* # !.gitignore !.mailmap +!.get_maintainer.* # # Generated files From 3cc7708dfdc8fec28a7bcd1b06717b7d510e235a Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 6 Aug 2023 20:57:34 +0200 Subject: [PATCH 04/13] ARM: renesas: Update MAINTAINERS file Update MAINTAINERS file. Add missing MAINTAINERS file for Spider, Whitehawk and V3HSK boards. Update mail addresses. Add file globs to match on DT and driver files related to these boards. The GRPEACH and R2DPLUS are special in that they are not R-Car and have their own set of specialized drivers. Signed-off-by: Marek Vasut --- MAINTAINERS | 22 +++++++++++++++++++++- board/renesas/alt/MAINTAINERS | 4 +++- board/renesas/blanche/MAINTAINERS | 5 +++-- board/renesas/condor/MAINTAINERS | 5 +++-- board/renesas/draak/MAINTAINERS | 5 +++-- board/renesas/eagle/MAINTAINERS | 5 +++-- board/renesas/ebisu/MAINTAINERS | 5 +++-- board/renesas/falcon/MAINTAINERS | 5 +++-- board/renesas/gose/MAINTAINERS | 6 ++++-- board/renesas/grpeach/MAINTAINERS | 14 ++++++++++++-- board/renesas/koelsch/MAINTAINERS | 4 +++- board/renesas/lager/MAINTAINERS | 4 +++- board/renesas/porter/MAINTAINERS | 4 +++- board/renesas/r2dplus/MAINTAINERS | 6 +++++- board/renesas/salvator-x/MAINTAINERS | 4 +++- board/renesas/silk/MAINTAINERS | 4 +++- board/renesas/spider/MAINTAINERS | 7 +++++++ board/renesas/stout/MAINTAINERS | 4 +++- board/renesas/ulcb/MAINTAINERS | 5 +++-- board/renesas/v3hsk/MAINTAINERS | 7 +++++++ board/renesas/v3msk/MAINTAINERS | 4 +++- board/renesas/whitehawk/MAINTAINERS | 7 +++++++ 22 files changed, 108 insertions(+), 28 deletions(-) create mode 100644 board/renesas/spider/MAINTAINERS create mode 100644 board/renesas/v3hsk/MAINTAINERS create mode 100644 board/renesas/whitehawk/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS index 47581cf6fbb..6f234220d5f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -462,10 +462,30 @@ F: configs/cubieboard7_defconfig ARM RENESAS RMOBILE/R-CAR M: Nobuhiro Iwamatsu -M: Marek Vasut +M: Marek Vasut S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-sh.git F: arch/arm/mach-rmobile/ +F: drivers/clk/renesas/ +F: drivers/gpio/gpio-rcar.c +F: drivers/i2c/rcar_* +F: drivers/i2c/sh_i2c.c +F: drivers/mmc/renesas-sdhi.c +F: drivers/mmc/sh_mmcif* +F: drivers/mmc/tmio-common* +F: drivers/mtd/renesas_rpc_hf.c +F: drivers/net/ravb.c +F: drivers/net/rswitch.c +F: drivers/net/sh_eth* +F: drivers/pci/pci-rcar-* +F: drivers/phy/phy-rcar-* +F: drivers/phy/renesas/ +F: drivers/pinctrl/renesas/ +F: drivers/serial/serial_sh* +F: drivers/spi/renesas_rpc_spi.c +F: drivers/spi/sh_qspi.c +F: drivers/sysinfo/rcar3.c +F: drivers/usb/host/xhci-rcar* ARM ROCKCHIP M: Simon Glass diff --git a/board/renesas/alt/MAINTAINERS b/board/renesas/alt/MAINTAINERS index 6ec140b225f..ee84678d2f7 100644 --- a/board/renesas/alt/MAINTAINERS +++ b/board/renesas/alt/MAINTAINERS @@ -1,6 +1,8 @@ ALT BOARD +M: Marek Vasut M: Nobuhiro Iwamatsu S: Maintained +F: arch/arm/dts/r8a7794-alt* F: board/renesas/alt/ -F: include/configs/alt.h F: configs/alt_defconfig +F: include/configs/alt.h diff --git a/board/renesas/blanche/MAINTAINERS b/board/renesas/blanche/MAINTAINERS index 4b3114aceb9..39fb93ed083 100644 --- a/board/renesas/blanche/MAINTAINERS +++ b/board/renesas/blanche/MAINTAINERS @@ -1,7 +1,8 @@ BLANCHE BOARD +M: Marek Vasut M: Masakazu Mochizuki S: Maintained +F: arch/arm/dts/r8a7792* F: board/renesas/blanche/ -F: include/configs/blanche.h F: configs/blanche_defconfig - +F: include/configs/blanche.h diff --git a/board/renesas/condor/MAINTAINERS b/board/renesas/condor/MAINTAINERS index 73b010b9e71..6bc987693b5 100644 --- a/board/renesas/condor/MAINTAINERS +++ b/board/renesas/condor/MAINTAINERS @@ -1,6 +1,7 @@ CONDOR BOARD -M: Marek Vasut +M: Marek Vasut S: Maintained +F: arch/arm/dts/r8a77980-condor* F: board/renesas/condor/ -F: include/configs/condor.h F: configs/r8a77980_condor_defconfig +F: include/configs/condor.h diff --git a/board/renesas/draak/MAINTAINERS b/board/renesas/draak/MAINTAINERS index 1dbcc2811c5..646478428a6 100644 --- a/board/renesas/draak/MAINTAINERS +++ b/board/renesas/draak/MAINTAINERS @@ -1,6 +1,7 @@ DRAAK BOARD -M: Marek Vasut +M: Marek Vasut S: Maintained +F: arch/arm/dts/r8a77995* F: board/renesas/draak/ -F: include/configs/draak.h F: configs/r8a77995_draak_defconfig +F: include/configs/draak.h diff --git a/board/renesas/eagle/MAINTAINERS b/board/renesas/eagle/MAINTAINERS index f387c136162..c28b6502478 100644 --- a/board/renesas/eagle/MAINTAINERS +++ b/board/renesas/eagle/MAINTAINERS @@ -1,6 +1,7 @@ EAGLE BOARD -M: Marek Vasut +M: Marek Vasut S: Maintained +F: arch/arm/dts/r8a77970-eagle* F: board/renesas/eagle/ -F: include/configs/eagle.h F: configs/r8a77970_eagle_defconfig +F: include/configs/eagle.h diff --git a/board/renesas/ebisu/MAINTAINERS b/board/renesas/ebisu/MAINTAINERS index facad520cad..c41aa1ef64e 100644 --- a/board/renesas/ebisu/MAINTAINERS +++ b/board/renesas/ebisu/MAINTAINERS @@ -1,6 +1,7 @@ EBISU BOARD -M: Marek Vasut +M: Marek Vasut S: Maintained +F: arch/arm/dts/r8a77990* F: board/renesas/ebisu/ -F: include/configs/ebisu.h F: configs/r8a77990_ebisu_defconfig +F: include/configs/ebisu.h diff --git a/board/renesas/falcon/MAINTAINERS b/board/renesas/falcon/MAINTAINERS index 2cacc91494f..861f0686867 100644 --- a/board/renesas/falcon/MAINTAINERS +++ b/board/renesas/falcon/MAINTAINERS @@ -1,6 +1,7 @@ FALCON BOARD -M: Marek Vasut +M: Marek Vasut S: Maintained +F: arch/arm/dts/r8a779a0* F: board/renesas/falcon/ -F: include/configs/falcon.h F: configs/r8a779a0_falcon_defconfig +F: include/configs/falcon.h diff --git a/board/renesas/gose/MAINTAINERS b/board/renesas/gose/MAINTAINERS index cad5be99b15..c6b9902fd87 100644 --- a/board/renesas/gose/MAINTAINERS +++ b/board/renesas/gose/MAINTAINERS @@ -1,6 +1,8 @@ -ALT BOARD +GOSE BOARD +M: Marek Vasut M: Nobuhiro Iwamatsu S: Maintained +F: arch/arm/dts/r8a7793* F: board/renesas/gose/ -F: include/configs/gose.h F: configs/gose_defconfig +F: include/configs/gose.h diff --git a/board/renesas/grpeach/MAINTAINERS b/board/renesas/grpeach/MAINTAINERS index 4ab7773b0a4..c0f4fbcbae1 100644 --- a/board/renesas/grpeach/MAINTAINERS +++ b/board/renesas/grpeach/MAINTAINERS @@ -1,6 +1,16 @@ GRPEACH BOARD -M: Marek Vasut +M: Marek Vasut S: Maintained +F: arch/arm/dts/r7s72100* F: board/renesas/grpeach/ -F: include/configs/grpeach.h F: configs/grpeach_defconfig +F: drivers/gpio/gpio-rza1.c +F: drivers/mtd/renesas_rpc_hf.c +F: drivers/net/sh_eth* +F: drivers/pinctrl/renesas/pfc-r7s72100.c +F: drivers/serial/serial_sh* +F: drivers/spi/renesas_rpc_spi.c +F: drivers/timer/ostm_timer.c +F: drivers/usb/host/r8a66597-hcd.c +F: drivers/usb/host/r8a66597.h +F: include/configs/grpeach.h diff --git a/board/renesas/koelsch/MAINTAINERS b/board/renesas/koelsch/MAINTAINERS index 5267b9fadf6..788f01ae9f4 100644 --- a/board/renesas/koelsch/MAINTAINERS +++ b/board/renesas/koelsch/MAINTAINERS @@ -1,6 +1,8 @@ KOELSCH BOARD +M: Marek Vasut M: Nobuhiro Iwamatsu S: Maintained +F: arch/arm/dts/r8a7791-koelsch* F: board/renesas/koelsch/ -F: include/configs/koelsch.h F: configs/koelsch_defconfig +F: include/configs/koelsch.h diff --git a/board/renesas/lager/MAINTAINERS b/board/renesas/lager/MAINTAINERS index a09868614a9..48b690dfa07 100644 --- a/board/renesas/lager/MAINTAINERS +++ b/board/renesas/lager/MAINTAINERS @@ -1,6 +1,8 @@ LAGER BOARD +M: Marek Vasut M: Nobuhiro Iwamatsu S: Maintained +F: arch/arm/dts/r8a7790-lager* F: board/renesas/lager/ -F: include/configs/lager.h F: configs/lager_defconfig +F: include/configs/lager.h diff --git a/board/renesas/porter/MAINTAINERS b/board/renesas/porter/MAINTAINERS index 1dc6a1caf22..4671b5b03c0 100644 --- a/board/renesas/porter/MAINTAINERS +++ b/board/renesas/porter/MAINTAINERS @@ -1,6 +1,8 @@ PORTER BOARD M: Cogent Embedded, Inc. +M: Marek Vasut S: Maintained +F: arch/arm/dts/r8a7791-porter* F: board/renesas/porter/ -F: include/configs/porter.h F: configs/porter_defconfig +F: include/configs/porter.h diff --git a/board/renesas/r2dplus/MAINTAINERS b/board/renesas/r2dplus/MAINTAINERS index 58877c509e4..a5cc2f0895e 100644 --- a/board/renesas/r2dplus/MAINTAINERS +++ b/board/renesas/r2dplus/MAINTAINERS @@ -1,7 +1,11 @@ R2DPLUS BOARD +M: Marek Vasut M: Nobuhiro Iwamatsu M: Nobuhiro Iwamatsu S: Maintained +F: arch/sh/dts/sh7751-r2dplus* F: board/renesas/r2dplus/ -F: include/configs/r2dplus.h F: configs/r2dplus_defconfig +F: drivers/pci/pci_sh7751.c +F: drivers/serial/serial_sh* +F: include/configs/r2dplus.h diff --git a/board/renesas/salvator-x/MAINTAINERS b/board/renesas/salvator-x/MAINTAINERS index 7335bc3cd8b..a85e9d98d31 100644 --- a/board/renesas/salvator-x/MAINTAINERS +++ b/board/renesas/salvator-x/MAINTAINERS @@ -1,6 +1,8 @@ SALVATOR_X BOARD +M: Marek Vasut M: Nobuhiro Iwamatsu S: Maintained +F: arch/arm/dts/*salvator-x* F: board/renesas/salvator-x/ -F: include/configs/salvator-x.h F: configs/rcar3_salvator-x_defconfig +F: include/configs/salvator-x.h diff --git a/board/renesas/silk/MAINTAINERS b/board/renesas/silk/MAINTAINERS index b566ccfbd9e..40fa271027d 100644 --- a/board/renesas/silk/MAINTAINERS +++ b/board/renesas/silk/MAINTAINERS @@ -1,6 +1,8 @@ SILK BOARD M: Cogent Embedded, Inc. +M: Marek Vasut S: Maintained +F: arch/arm/dts/r8a7794-silk* F: board/renesas/silk/ -F: include/configs/silk.h F: configs/silk_defconfig +F: include/configs/silk.h diff --git a/board/renesas/spider/MAINTAINERS b/board/renesas/spider/MAINTAINERS new file mode 100644 index 00000000000..731ca35ba98 --- /dev/null +++ b/board/renesas/spider/MAINTAINERS @@ -0,0 +1,7 @@ +SPIDER BOARD +M: Marek Vasut +S: Maintained +F: arch/arm/dts/r8a779f0* +F: board/renesas/spider/ +F: configs/r8a779f0_spider_defconfig +F: include/configs/spider.h diff --git a/board/renesas/stout/MAINTAINERS b/board/renesas/stout/MAINTAINERS index b7098e79556..a6042d8b716 100644 --- a/board/renesas/stout/MAINTAINERS +++ b/board/renesas/stout/MAINTAINERS @@ -1,6 +1,8 @@ STOUT BOARD M: Cogent Embedded, Inc. +M: Marek Vasut S: Maintained +F: arch/arm/dts/r8a7790-stout* F: board/renesas/stout/ -F: include/configs/stout.h F: configs/stout_defconfig +F: include/configs/stout.h diff --git a/board/renesas/ulcb/MAINTAINERS b/board/renesas/ulcb/MAINTAINERS index 564eb561b13..18b9b426ef2 100644 --- a/board/renesas/ulcb/MAINTAINERS +++ b/board/renesas/ulcb/MAINTAINERS @@ -1,6 +1,7 @@ ULCB BOARD -M: Marek Vasut +M: Marek Vasut S: Maintained +F: arch/arm/dts/*ulcb* F: board/renesas/ulcb/ -F: include/configs/ulcb.h F: configs/rcar3_ulcb_defconfig +F: include/configs/ulcb.h diff --git a/board/renesas/v3hsk/MAINTAINERS b/board/renesas/v3hsk/MAINTAINERS new file mode 100644 index 00000000000..8a5af854025 --- /dev/null +++ b/board/renesas/v3hsk/MAINTAINERS @@ -0,0 +1,7 @@ +V3HSK BOARD +M: Marek Vasut +S: Maintained +F: arch/arm/dts/r8a77980-v3hsk* +F: board/renesas/v3hsk/ +F: configs/r8a77980_v3hsk_defconfig +F: include/configs/v3hsk.h diff --git a/board/renesas/v3msk/MAINTAINERS b/board/renesas/v3msk/MAINTAINERS index 12822a4571a..c198cf8c9b8 100644 --- a/board/renesas/v3msk/MAINTAINERS +++ b/board/renesas/v3msk/MAINTAINERS @@ -1,6 +1,8 @@ V3MSK BOARD M: Cogent Embedded, Inc. +M: Marek Vasut S: Maintained +F: arch/arm/dts/r8a77970-v3msk* F: board/renesas/v3msk/ -F: include/configs/v3msk.h F: configs/r8a77970_v3msk_defconfig +F: include/configs/v3msk.h diff --git a/board/renesas/whitehawk/MAINTAINERS b/board/renesas/whitehawk/MAINTAINERS new file mode 100644 index 00000000000..f893abff1ad --- /dev/null +++ b/board/renesas/whitehawk/MAINTAINERS @@ -0,0 +1,7 @@ +WHITEHAWK BOARD +M: Marek Vasut +S: Maintained +F: arch/arm/dts/r8a779g0* +F: board/renesas/whitehawk/ +F: configs/r8a779g0_whitehawk_defconfig +F: include/configs/whitehawk.h From 29760c8e6d3a3d02a23439f62b7e663e0c38eb3b Mon Sep 17 00:00:00 2001 From: Mathew McBride Date: Mon, 7 Aug 2023 01:41:08 +0000 Subject: [PATCH 05/13] board: ten64: add missing error checks for retimer power on The retimer reset/power on logic was changed in a recent commit, however, it neglected to check if the commands sent to the board microcontroller (to control power to the retimer chip) actually completed. Add return checks for these operations so any failures will be reported to the user. Signed-off-by: Mathew McBride Fixes: 7a041fea2 ("board: traverse: ten64: ensure retimer reset is done on new board revisions") --- board/traverse/ten64/ten64.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index 52daae6e24d..df9f0afe1a4 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -383,10 +383,15 @@ static int board_cycle_retimer(struct udevice **retim_dev) puts("(retimer on, resetting...) "); ret = misc_call(uc_dev, TEN64_CNTRL_10G_OFF, NULL, 0, NULL, 0); + if (ret) + return ret; mdelay(1000); } + /* Turn on the retimer */ ret = misc_call(uc_dev, TEN64_CNTRL_10G_ON, NULL, 0, NULL, 0); + if (ret) + return ret; } // Wait for retimer to come back From 50429959fb880d15be3be5d54e5d870e1de5d80c Mon Sep 17 00:00:00 2001 From: Eugen Hristev Date: Mon, 7 Aug 2023 10:22:03 +0300 Subject: [PATCH 06/13] MAINTAINERS: add DT/bindings files to at91 entry With this change the DT and binding files are under the at91 tree maintainer, and get_maintainer.pl correctly reports the entry. Signed-off-by: Eugen Hristev --- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6f234220d5f..ce38811679d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -412,13 +412,21 @@ ARM MICROCHIP/ATMEL AT91 M: Eugen Hristev S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-at91.git +F: arch/arm/dts/at91* +F: arch/arm/dts/sam* F: arch/arm/mach-at91/ F: board/atmel/ F: drivers/cpu/at91_cpu.c F: drivers/memory/atmel-ebi.c F: drivers/misc/microchip_flexcom.c F: drivers/timer/atmel_tcb_timer.c +F: include/dt-bindings/clk/at91.h +F: include/dt-bindings/clock/at91.h +F: include/dt-bindings/dma/at91.h +F: include/dt-bindings/mfd/at91-usart.h F: include/dt-bindings/mfd/atmel-flexcom.h +F: include/dt-bindings/pinctrl/at91.h +F: include/dt-bindings/sound/microchip,pdmc.h F: drivers/timer/mchp-pit64b-timer.c ARM MSC SM2S IMX8MP SOM From a2b13273987ff0fb1290d33f7624e2ac406c5830 Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Mon, 7 Aug 2023 15:52:47 +0800 Subject: [PATCH 07/13] MAINTAINERS: Update rockchip platform maintain files Add px30, rv1126 soc, and rockchip soc based boards. Signed-off-by: Kever Yang --- MAINTAINERS | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index ce38811679d..2db052961b2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -501,12 +501,24 @@ M: Philipp Tomsich M: Kever Yang S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-rockchip.git +F: arch/arm/dts/px30* F: arch/arm/dts/rk3* F: arch/arm/dts/rockchip* -F: arch/arm/dts/rv1108* +F: arch/arm/dts/rv11* F: arch/arm/include/asm/arch-rockchip/ F: arch/arm/mach-rockchip/ +F: board/amarula/vyasa-rk3288/ +F: board/anbernic/rgxx3_rk3566/ +F: board/chipspark/popmetal_rk3288 +F: board/engicam/px30_core/ +F: board/firefly/ +F: board/mqmaker/miqi_rk3288/ +F: board/phytec/phycore_rk3288 +F: board/pine64 +F: board/radxa/ F: board/rockchip/ +F: board/theobroma-systems +F: board/vamrs/rock960_rk3399/ F: drivers/clk/rockchip/ F: drivers/gpio/rk_gpio.c F: drivers/misc/rockchip-efuse.c From a536b2fdb10c6eb678fda6f239eb16414caf0496 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 7 Aug 2023 12:32:19 -0400 Subject: [PATCH 08/13] bloblist: Enforce CRC32 In the common bloblist code we call crc32 to get a checksum for the data. Ensure we will have the CRC32 code via select. Signed-off-by: Tom Rini --- common/Kconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/Kconfig b/common/Kconfig index d103bc6ddb8..f2dfda4c74e 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -951,6 +951,7 @@ menu "Blob list" config BLOBLIST bool "Support for a bloblist" + select CRC32 help This enables support for a bloblist in U-Boot, which can be passed from TPL to SPL to U-Boot proper (and potentially to Linux). The @@ -961,6 +962,7 @@ config BLOBLIST config SPL_BLOBLIST bool "Support for a bloblist in SPL" depends on BLOBLIST && SPL_LIBGENERIC_SUPPORT && SPL_LIBCOMMON_SUPPORT + select SPL_CRC32 default y if SPL help This enables a bloblist in SPL. If this is the first part of U-Boot @@ -970,6 +972,7 @@ config SPL_BLOBLIST config TPL_BLOBLIST bool "Support for a bloblist in TPL" depends on BLOBLIST && TPL_LIBGENERIC_SUPPORT && TPL_LIBCOMMON_SUPPORT + select TPL_CRC32 default y if TPL help This enables a bloblist in TPL. The bloblist is set up in TPL and From 0d2761abbde00e1ff756426fdb77b4b30192311d Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Thu, 3 Aug 2023 19:05:39 +0300 Subject: [PATCH 09/13] spl: remove duplicate SPL_MD5 option There is another SPL_MD5 option defined in lib/Kconfig. Renaming SPL_MD5_SUPPORT introduced duplicate option with different description. As for now FIT and hash algorithm options are not related to each others, removing a duplicate option seems OK. Fixes: 4b00fd1a84c ("Kconfig: Rename SPL_MD5_SUPPORT to SPL_MD5") Signed-off-by: Oleksandr Suvorov --- common/spl/Kconfig | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index bee231b583a..c66d70e2a99 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -561,18 +561,6 @@ config SPL_CRC32 for detected accidental image corruption. For secure applications you should consider SHA1 or SHA256. -config SPL_MD5 - bool "Support MD5" - depends on SPL_FIT - help - Enable this to support MD5 in FIT images within SPL. An MD5 - checksum is a 128-bit hash value used to check that the image - contents have not been corrupted. Note that MD5 is not considered - secure as it is possible (with a brute-force attack) to adjust the - image while still retaining the same MD5 hash value. For secure - applications where images may be changed maliciously, you should - consider SHA256 or SHA384. - config SPL_FIT_IMAGE_TINY bool "Remove functionality from SPL FIT loading to reduce size" depends on SPL_FIT From af62d83cc0ee27ca5051718a0df44341f71abff1 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Thu, 3 Aug 2023 19:05:40 +0300 Subject: [PATCH 10/13] spl: move SPL_CRC32 option to lib/Kconfig All SPL hash algorithm options are collected in lib/Kconfig. Move SPL_CRC32 there as well. Signed-off-by: Oleksandr Suvorov Reviewed-by: Simon Glass --- common/spl/Kconfig | 11 ----------- lib/Kconfig | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index c66d70e2a99..c5dd476db58 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -550,17 +550,6 @@ config SYS_MMCSD_RAW_MODE_EMMC_BOOT_PARTITION the eMMC EXT_CSC_PART_CONFIG selection should be overridden in SPL by user defined partition number. -config SPL_CRC32 - bool "Support CRC32" - default y if SPL_LEGACY_IMAGE_FORMAT || SPL_EFI_PARTITION - default y if SPL_ENV_SUPPORT || TPL_BLOBLIST - help - Enable this to support CRC32 in uImages or FIT images within SPL. - This is a 32-bit checksum value that can be used to verify images. - For FIT images, this is the least secure type of checksum, suitable - for detected accidental image corruption. For secure applications you - should consider SHA1 or SHA256. - config SPL_FIT_IMAGE_TINY bool "Remove functionality from SPL FIT loading to reduce size" depends on SPL_FIT diff --git a/lib/Kconfig b/lib/Kconfig index 3926652db63..07e61de5b64 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -534,6 +534,17 @@ config SHA_HW_ACCEL if SPL +config SPL_CRC32 + bool "Enable CRC32 support in SPL" + default y if SPL_LEGACY_IMAGE_SUPPORT || SPL_EFI_PARTITION + default y if SPL_ENV_SUPPORT || TPL_BLOBLIST + help + This option enables support of hashing using CRC32 algorithm. + The CRC32 algorithm produces 32-bit checksum value. For FIT + images, this is the least secure type of checksum, suitable for + detected accidental image corruption. For secure applications you + should consider SHA256 or SHA384. + config SPL_SHA1 bool "Enable SHA1 support in SPL" default y if SHA1 From 3b7b73879f27d8a7b21792b3e9bb25dce1a5d082 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Tue, 1 Aug 2023 15:33:41 +0200 Subject: [PATCH 11/13] common: fix detection of SYS_MALLOC_F_LEN=0x0 CONFIG_$(SPL_TPL_)SYS_MALLOC_F_LEN is defined as hex. If set to zero manually, .config contains '0x0' and not '0' as value. The default value for CONFIG_SPL_SYS_MALLOC_F_LEN should not be set to 0 but to 0x0 if CONFIG_SPL_FRAMEWORK=n to match a manually set value. Fixes: c0126bd862a0 ("spl: Support bootstage, log, hash and early malloc in TPL") Fixes: b61694705217 ("SPL: Do not enable SPL_SYS_MALLOC_SIMPLE without SPL_FRAMEWORK by default") Signed-off-by: Heinrich Schuchardt Reviewed-by: Tom Rini --- Kconfig | 2 +- common/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Kconfig b/Kconfig index 70efb41cc66..91170bf8d22 100644 --- a/Kconfig +++ b/Kconfig @@ -298,7 +298,7 @@ config SYS_MALLOC_LEN config SPL_SYS_MALLOC_F_LEN hex "Size of malloc() pool in SPL" depends on SYS_MALLOC_F && SPL - default 0 if !SPL_FRAMEWORK + default 0x0 if !SPL_FRAMEWORK default 0x2800 if RCAR_GEN3 default 0x2000 if IMX8MQ default SYS_MALLOC_F_LEN diff --git a/common/Makefile b/common/Makefile index c87bb2e78b3..f5c3d90f067 100644 --- a/common/Makefile +++ b/common/Makefile @@ -79,7 +79,7 @@ endif # CONFIG_SPL_BUILD obj-$(CONFIG_CROS_EC) += cros_ec.o obj-y += dlmalloc.o ifdef CONFIG_SYS_MALLOC_F -ifneq ($(CONFIG_$(SPL_TPL_)SYS_MALLOC_F_LEN),0) +ifneq ($(CONFIG_$(SPL_TPL_)SYS_MALLOC_F_LEN),0x0) obj-y += malloc_simple.o endif endif From fa96774d2925443363aa2a5da8a12ced28e158a1 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 29 Jul 2023 15:34:51 +0200 Subject: [PATCH 12/13] common: Drop duplicate space in SPL_BMP description Drop duplicate space in Kconfig symbol description. Signed-off-by: Marek Vasut --- common/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/Kconfig b/common/Kconfig index f2dfda4c74e..cdb77a6a7da 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1174,7 +1174,7 @@ config BMP Enable bmp functions to display bmp image and get bmp info. config SPL_BMP - bool "Enable bmp image display at SPL" + bool "Enable bmp image display at SPL" depends on SPL_VIDEO help Enable bmp functions to display bmp image and get bmp info at SPL. From 7ee1325a537b2b7938676e9ca3c99c16c8d8487d Mon Sep 17 00:00:00 2001 From: Yifan Zhao Date: Wed, 26 Jul 2023 12:56:04 +0800 Subject: [PATCH 13/13] fs/erofs: Remove an unnecessary assertion In [1] Sam points out an assertion does not hold true for 32-bit platforms, which only impacts Large File Support (LFS) API usage in erofs-utils according to Xiang [2]. We don't think these APIs are used in u-boot and this restriction could be safely removed. [1] https://lists.denx.de/pipermail/u-boot/2023-July/524679.html [2] https://lists.denx.de/pipermail/u-boot/2023-July/524727.html Fixes: 3a21e92fc255 ("fs/erofs: Introduce new features including ztailpacking, fragments and dedupe") Signed-off-by: Yifan Zhao Tested-by: Sam Edwards --- fs/erofs/internal.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 433a3c6c1eb..1875f37fcd2 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -105,9 +105,6 @@ struct erofs_sb_info { u8 xattr_prefix_count; }; -/* make sure that any user of the erofs headers has at least 64bit off_t type */ -extern int erofs_assert_largefile[sizeof(off_t) - 8]; - static inline erofs_off_t iloc(erofs_nid_t nid) { return erofs_pos(sbi.meta_blkaddr) + (nid << sbi.islotbits);