]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge tag v2023.07-rc4 into next
authorTom Rini <trini@konsulko.com>
Mon, 12 Jun 2023 18:55:33 +0000 (14:55 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 12 Jun 2023 18:55:33 +0000 (14:55 -0400)
Signed-off-by: Tom Rini <trini@konsulko.com>
44 files changed:
1  2 
Makefile
arch/arm/dts/Makefile
arch/arm/mach-k3/common.c
arch/arm/mach-k3/common.h
arch/arm/mach-rockchip/board.c
board/renesas/rcar-common/common.c
configs/apalis_imx6_defconfig
configs/colibri_imx6_defconfig
configs/dh_imx6_defconfig
configs/display5_factory_defconfig
configs/grpeach_defconfig
configs/imx6q_bosch_acc_defconfig
configs/imx6q_logic_defconfig
configs/imx7_cm_defconfig
configs/imx8mm-mx8menlo_defconfig
configs/imx8mm_beacon_defconfig
configs/imx8mm_evk_defconfig
configs/imx8mm_phg_defconfig
configs/j721e_evm_a72_defconfig
configs/j721e_evm_r5_defconfig
configs/librem5_defconfig
configs/mx6sabreauto_defconfig
configs/mx6sabresd_defconfig
configs/mx6ul_14x14_evk_defconfig
configs/myir_mys_6ulx_defconfig
configs/phycore_pcl063_defconfig
configs/phycore_pcl063_ull_defconfig
configs/pico-dwarf-imx6ul_defconfig
configs/pico-dwarf-imx7d_defconfig
configs/pico-hobbit-imx6ul_defconfig
configs/pico-hobbit-imx7d_defconfig
configs/pico-imx6_defconfig
configs/pico-imx6ul_defconfig
configs/pico-imx7d_bl33_defconfig
configs/pico-imx7d_defconfig
configs/pico-nymph-imx7d_defconfig
configs/pico-pi-imx6ul_defconfig
configs/pico-pi-imx7d_defconfig
configs/seeed_npi_imx6ull_defconfig
configs/socrates_defconfig
configs/variscite_dart6ul_defconfig
configs/vining_2000_defconfig
include/efi_loader.h
tools/Makefile

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tools/Makefile
Simple merge