On 11.06.22 14:20, Peng Fan (OSS) wrote:
From: Peng Fan peng.fan@nxp.com
Stefano, Is there a chance to get this into your next branch, then into Tom's next branch?
Yes, I will do in this way.
Stefano
There are often conflicts when applying after pending some time.
V2: Rebased on Tom's next branch. Drop the imx8m.h patches, since Tom already migrated most Kconfig Merge the verdi SPL_DM_SERIAL convertion patch to patch 1
Peng Fan (17): imx: drop CONFIG_MXC_UART_BASE imx: imx8m[m/n]_beacon: Enable SPL_DM_SERIAL imx: imx8mm-cl-iot-gate: Enable DM_SERIAL imx: imx8mm_icore: Enable SPL_DM_SERIAL imx: imx8m[m/p]_phycore: Enable DM_SERIAL imx: imx8mn_var_som: enable DM_SERIAL imx: kontron-sl-mx8mm: enable DM_SERIAL configs: drop CONFIG_SPL_ABORT_ON_RAW_IMAGE imx: imx8mm_beacon: enable pinctrl_wdog in SPL imx: imx8mm-cl-iot-gate: enable pinctrl_wdog in SPL imx: engicam-imx8mm: drop unused macro imx: imx8mm/n/p-venice: enable pinctrl_wdog in SPL imx: imx8mn-beacon: enable pinctrl_wdog in SPL imx: imx8mn_var_som: clean up board watchdog code imx: imx8mp_rsb7320a1: enable wdog driver model in SPL imx: imx8mn-kontron-n801x: enable pinctrl_wdog in SPL imx: phycore_imx8mm/p: clean up board watchdog code
arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi | 4 +++ arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi | 4 +++ arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 4 +++ arch/arm/dts/imx8mm-venice-u-boot.dtsi | 4 +++ arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi | 4 +++ arch/arm/dts/imx8mn-venice-u-boot.dtsi | 4 +++ arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi | 8 +++++ arch/arm/dts/imx8mp-venice-u-boot.dtsi | 4 +++ .../imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 12 ------- board/beacon/imx8mm/spl.c | 31 ++----------------- board/beacon/imx8mn/spl.c | 21 ++----------- board/compulab/imx8mm-cl-iot-gate/spl.c | 31 ++----------------- board/engicam/imx8mm/spl.c | 16 ++-------- board/gateworks/venice/spl.c | 29 ----------------- board/kontron/sl-mx8mm/spl.c | 30 ++---------------- board/phytec/phycore_imx8mm/spl.c | 31 ++----------------- board/phytec/phycore_imx8mp/spl.c | 27 ---------------- board/variscite/imx8mn_var_som/spl.c | 22 ++----------- configs/imx8mm-cl-iot-gate-optee_defconfig | 1 + configs/imx8mm-cl-iot-gate_defconfig | 1 + configs/imx8mm-icore-mx8mm-ctouch2_defconfig | 1 - configs/imx8mm-icore-mx8mm-edimm2.2_defconfig | 1 - configs/imx8mm_beacon_defconfig | 1 - configs/imx8mn_beacon_2g_defconfig | 1 - configs/imx8mn_beacon_defconfig | 1 - configs/imx8mn_var_som_defconfig | 1 + configs/kontron-sl-mx8mm_defconfig | 1 + configs/phycore-imx8mm_defconfig | 1 + configs/phycore-imx8mp_defconfig | 1 + include/configs/aristainetos2.h | 2 -- include/configs/capricorn-common.h | 1 - include/configs/cgtqmx8.h | 1 - include/configs/imx8mm-cl-iot-gate.h | 3 -- include/configs/imx8mm_beacon.h | 3 -- include/configs/imx8mm_data_modul_edm_sbc.h | 1 - include/configs/imx8mm_evk.h | 3 -- include/configs/imx8mm_icore_mx8mm.h | 4 --- include/configs/imx8mm_venice.h | 4 --- include/configs/imx8mn_beacon.h | 3 -- include/configs/imx8mn_bsh_smm_s2_common.h | 4 --- include/configs/imx8mn_evk.h | 3 -- include/configs/imx8mn_var_som.h | 2 -- include/configs/imx8mn_venice.h | 4 --- include/configs/imx8mp_evk.h | 3 -- include/configs/imx8mp_rsb3720.h | 1 - include/configs/imx8mp_venice.h | 4 --- include/configs/imx8mq_cm.h | 1 - include/configs/imx8mq_evk.h | 1 - include/configs/imx8mq_phanbell.h | 1 - include/configs/imx8qm_mek.h | 1 - include/configs/imx8qxp_mek.h | 1 - include/configs/imx8ulp_evk.h | 1 - include/configs/kontron-sl-mx8mm.h | 1 - include/configs/kontron_pitx_imx8m.h | 1 - include/configs/mx7dsabresd.h | 1 - include/configs/phycore_imx8mm.h | 4 --- include/configs/phycore_imx8mp.h | 4 --- include/configs/pico-imx8mq.h | 1 - include/configs/somlabs_visionsom_6ull.h | 1 - include/configs/tbs2910.h | 3 -- include/configs/verdin-imx8mm.h | 4 --- include/configs/verdin-imx8mp.h | 4 --- 62 files changed, 57 insertions(+), 316 deletions(-)