diff options
| author | Tom Rini <trini@konsulko.com> | 2023-08-07 15:11:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-07 15:11:17 -0400 |
| commit | 543f7d0a3e86c50b5b0f088dd3ac92ea301de2ad (patch) | |
| tree | 8c208d99fe64bd5c6fb7617a26da748e4fb03f1b | |
| parent | b1a8ef746f6c1a152ec41a747a06cbfbeb051a3e (diff) | |
| parent | 7ee1325a537b2b7938676e9ca3c99c16c8d8487d (diff) | |
| download | u-boot-543f7d0a3e86c50b5b0f088dd3ac92ea301de2ad.zip u-boot-543f7d0a3e86c50b5b0f088dd3ac92ea301de2ad.tar.gz u-boot-543f7d0a3e86c50b5b0f088dd3ac92ea301de2ad.tar.bz2 | |
Merge branch '2023-08-07-assorted-fixes'
- Update Azure jobs again, a few MAINTAINERS updates, a few Kconfig
fixes, an erofs fix and a fix for the recent ten64 updates.
32 files changed, 181 insertions, 112 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 2678e5a..31850ae 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,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: - 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_rv_non_rockchip: - BUILDMAN: "rk|rv -x rockchip" - rk_rv_and_rockchip: - BUILDMAN: "(rk|rv)&rockchip" - renesas: - BUILDMAN: "renesas" - zynq: - BUILDMAN: "zynq&armv7" - zynqmp_versal: - BUILDMAN: "versal|zynqmp&aarch64" + rk_non_rockchip_64bit: + BUILDMAN: "rk&aarch64 -x rockchip" + rk_rockchip_64bit: + BUILDMAN: "rk&aarch64&rockchip" + zynq_zynqmp_versal: + BUILDMAN: "zynq&armv7 versal zynqmp&aarch64" riscv: BUILDMAN: "riscv" steps: diff --git a/.get_maintainer.ignore b/.get_maintainer.ignore new file mode 100644 index 0000000..899a146 --- /dev/null +++ b/.get_maintainer.ignore @@ -0,0 +1 @@ +"Pali Rohár" <pali@kernel.org> @@ -53,6 +53,7 @@ fit-dtb.blob* # !.gitignore !.mailmap +!.get_maintainer.* # # Generated files @@ -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/MAINTAINERS b/MAINTAINERS index 47581cf..2db0529 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -412,13 +412,21 @@ ARM MICROCHIP/ATMEL AT91 M: Eugen Hristev <eugen.hristev@microchip.com> 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 @@ -462,10 +470,30 @@ F: configs/cubieboard7_defconfig ARM RENESAS RMOBILE/R-CAR M: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> -M: Marek Vasut <marek.vasut+renesas@gmail.com> +M: Marek Vasut <marek.vasut+renesas@mailbox.org> 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 <sjg@chromium.org> @@ -473,12 +501,24 @@ M: Philipp Tomsich <philipp.tomsich@vrull.eu> M: Kever Yang <kever.yang@rock-chips.com> 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 diff --git a/board/renesas/alt/MAINTAINERS b/board/renesas/alt/MAINTAINERS index 6ec140b..ee84678 100644 --- a/board/renesas/alt/MAINTAINERS +++ b/board/renesas/alt/MAINTAINERS @@ -1,6 +1,8 @@ ALT BOARD +M: Marek Vasut <marek.vasut+renesas@mailbox.org> M: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> 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 4b3114a..39fb93e 100644 --- a/board/renesas/blanche/MAINTAINERS +++ b/board/renesas/blanche/MAINTAINERS @@ -1,7 +1,8 @@ BLANCHE BOARD +M: Marek Vasut <marek.vasut+renesas@mailbox.org> M: Masakazu Mochizuki <masakazu.mochizuki.wd@hitachi.com> 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 73b010b..6bc9876 100644 --- a/board/renesas/condor/MAINTAINERS +++ b/board/renesas/condor/MAINTAINERS @@ -1,6 +1,7 @@ CONDOR BOARD -M: Marek Vasut <marek.vasut+renesas@gmail.com> +M: Marek Vasut <marek.vasut+renesas@mailbox.org> 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 1dbcc28..6464784 100644 --- a/board/renesas/draak/MAINTAINERS +++ b/board/renesas/draak/MAINTAINERS @@ -1,6 +1,7 @@ DRAAK BOARD -M: Marek Vasut <marek.vasut+renesas@gmail.com> +M: Marek Vasut <marek.vasut+renesas@mailbox.org> 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 f387c13..c28b650 100644 --- a/board/renesas/eagle/MAINTAINERS +++ b/board/renesas/eagle/MAINTAINERS @@ -1,6 +1,7 @@ EAGLE BOARD -M: Marek Vasut <marek.vasut+renesas@gmail.com> +M: Marek Vasut <marek.vasut+renesas@mailbox.org> 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 facad52..c41aa1e 100644 --- a/board/renesas/ebisu/MAINTAINERS +++ b/board/renesas/ebisu/MAINTAINERS @@ -1,6 +1,7 @@ EBISU BOARD -M: Marek Vasut <marek.vasut+renesas@gmail.com> +M: Marek Vasut <marek.vasut+renesas@mailbox.org> 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 2cacc91..861f068 100644 --- a/board/renesas/falcon/MAINTAINERS +++ b/board/renesas/falcon/MAINTAINERS @@ -1,6 +1,7 @@ FALCON BOARD -M: Marek Vasut <marek.vasut+renesas@gmail.com> +M: Marek Vasut <marek.vasut+renesas@mailbox.org> 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 cad5be9..c6b9902 100644 --- a/board/renesas/gose/MAINTAINERS +++ b/board/renesas/gose/MAINTAINERS @@ -1,6 +1,8 @@ -ALT BOARD +GOSE BOARD +M: Marek Vasut <marek.vasut+renesas@mailbox.org> M: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> 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 4ab7773..c0f4fbc 100644 --- a/board/renesas/grpeach/MAINTAINERS +++ b/board/renesas/grpeach/MAINTAINERS @@ -1,6 +1,16 @@ GRPEACH BOARD -M: Marek Vasut <marek.vasut@gmail.com> +M: Marek Vasut <marek.vasut+renesas@mailbox.org> 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 5267b9f..788f01a 100644 --- a/board/renesas/koelsch/MAINTAINERS +++ b/board/renesas/koelsch/MAINTAINERS @@ -1,6 +1,8 @@ KOELSCH BOARD +M: Marek Vasut <marek.vasut+renesas@mailbox.org> M: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> 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 a098686..48b690d 100644 --- a/board/renesas/lager/MAINTAINERS +++ b/board/renesas/lager/MAINTAINERS @@ -1,6 +1,8 @@ LAGER BOARD +M: Marek Vasut <marek.vasut+renesas@mailbox.org> M: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> 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 1dc6a1c..4671b5b 100644 --- a/board/renesas/porter/MAINTAINERS +++ b/board/renesas/porter/MAINTAINERS @@ -1,6 +1,8 @@ PORTER BOARD M: Cogent Embedded, Inc. <source@cogentembedded.com> +M: Marek Vasut <marek.vasut+renesas@mailbox.org> 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 58877c5..a5cc2f0 100644 --- a/board/renesas/r2dplus/MAINTAINERS +++ b/board/renesas/r2dplus/MAINTAINERS @@ -1,7 +1,11 @@ R2DPLUS BOARD +M: Marek Vasut <marek.vasut+renesas@mailbox.org> M: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> M: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> 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 7335bc3..a85e9d9 100644 --- a/board/renesas/salvator-x/MAINTAINERS +++ b/board/renesas/salvator-x/MAINTAINERS @@ -1,6 +1,8 @@ SALVATOR_X BOARD +M: Marek Vasut <marek.vasut+renesas@mailbox.org> M: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> 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 b566ccf..40fa271 100644 --- a/board/renesas/silk/MAINTAINERS +++ b/board/renesas/silk/MAINTAINERS @@ -1,6 +1,8 @@ SILK BOARD M: Cogent Embedded, Inc. <source@cogentembedded.com> +M: Marek Vasut <marek.vasut+renesas@mailbox.org> 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 0000000..731ca35 --- /dev/null +++ b/board/renesas/spider/MAINTAINERS @@ -0,0 +1,7 @@ +SPIDER BOARD +M: Marek Vasut <marek.vasut+renesas@mailbox.org> +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 b7098e7..a6042d8 100644 --- a/board/renesas/stout/MAINTAINERS +++ b/board/renesas/stout/MAINTAINERS @@ -1,6 +1,8 @@ STOUT BOARD M: Cogent Embedded, Inc. <source@cogentembedded.com> +M: Marek Vasut <marek.vasut+renesas@mailbox.org> 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 564eb56..18b9b42 100644 --- a/board/renesas/ulcb/MAINTAINERS +++ b/board/renesas/ulcb/MAINTAINERS @@ -1,6 +1,7 @@ ULCB BOARD -M: Marek Vasut <marek.vasut+renesas@gmail.com> +M: Marek Vasut <marek.vasut+renesas@mailbox.org> 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 0000000..8a5af85 --- /dev/null +++ b/board/renesas/v3hsk/MAINTAINERS @@ -0,0 +1,7 @@ +V3HSK BOARD +M: Marek Vasut <marek.vasut+renesas@mailbox.org> +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 12822a4..c198cf8 100644 --- a/board/renesas/v3msk/MAINTAINERS +++ b/board/renesas/v3msk/MAINTAINERS @@ -1,6 +1,8 @@ V3MSK BOARD M: Cogent Embedded, Inc. <source@cogentembedded.com> +M: Marek Vasut <marek.vasut+renesas@mailbox.org> 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 0000000..f893abff --- /dev/null +++ b/board/renesas/whitehawk/MAINTAINERS @@ -0,0 +1,7 @@ +WHITEHAWK BOARD +M: Marek Vasut <marek.vasut+renesas@mailbox.org> +S: Maintained +F: arch/arm/dts/r8a779g0* +F: board/renesas/whitehawk/ +F: configs/r8a779g0_whitehawk_defconfig +F: include/configs/whitehawk.h diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index 52daae6..df9f0af 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 diff --git a/common/Kconfig b/common/Kconfig index d103bc6..cdb77a6 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 @@ -1171,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. diff --git a/common/Makefile b/common/Makefile index c87bb2e..f5c3d90 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 diff --git a/common/spl/Kconfig b/common/spl/Kconfig index bee231b..c5dd476 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -550,29 +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_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 diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 433a3c6..1875f37 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); diff --git a/lib/Kconfig b/lib/Kconfig index 3926652..07e61de 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 |