warp7: Convert to OF_UPSTREAM
Subsystems (3)
Fabio Estevam
reviewerPATCH v2 1/1 warp7: Convert to OF_UPSTREAM
Instead of using the local imx7s-warp devicetree copies from U-Boot, convert the imx7s-warp board to OF_UPSTREAM so that the upstream kernel devicetree can be used instead.
Signed-off-by Fabio Estevam <[email protected]>
---
Changes since v1:
- Also change warp7_bl33_defconfig.
arch/arm/dts/Makefile | 1 - arch/arm/dts/imx7s-warp.dts | 500 ---------------------------------- arch/arm/mach-imx/mx7/Kconfig | 1 + configs/warp7_bl33_defconfig | 2 +- configs/warp7_defconfig | 2 +- 5 files changed, 3 insertions(+), 503 deletions(-) delete mode 100644 arch/arm/dts/imx7s-warp.dts
arch/arm/dts/Makefile +0 -1
@@ -883,7 +883,6 @@ dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \ imx7-cm.dtb \ imx7d-colibri-emmc-eval-v3.dtb \ imx7d-colibri-eval-v3.dtb \ - imx7s-warp.dtb \ imx7d-meerkat96.dtb \ imx7d-pico-pi.dtb \ imx7d-pico-hobbit.dtb \
arch/arm/dts/imx7s-warp.dts deleted +0 -500
500 lines not on this page · raw message
arch/arm/mach-imx/mx7/Kconfig +1 -0
@@ -87,6 +87,7 @@ config TARGET_WARP7 select DM_THERMAL select MX7D imply CMD_DM + imply OF_UPSTREAM config TARGET_COLIBRI_IMX7 bool "Support Colibri iMX7S/iMX7D modules"
configs/warp7_bl33_defconfig +1 -1
@@ -4,7 +4,7 @@ CONFIG_SYS_MALLOC_LEN=0x2300000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x80000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp" +CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx7s-warp" CONFIG_TARGET_WARP7=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
configs/warp7_defconfig +1 -1
@@ -5,7 +5,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp" +CONFIG_DEFAULT_DEVICE_TREE="nxp/imx/imx7s-warp" CONFIG_TARGET_WARP7=y CONFIG_ARMV7_BOOT_SEC_DEFAULT=y # CONFIG_ARMV7_VIRT is not set
Signature · 1 line
2.34.1
Quoted 7 lines
Subject: [PATCH v2] warp7: Convert to
OF_UPSTREAMInstead of using the local imx7s-warp devicetree copies from U-Boot, convert the imx7s-warp board to
OF_UPSTREAMso that the upstream kernel devicetree can be used instead.Signed-off-by Fabio Estevam <[email protected]>
Reviewed-by Peng Fan <[email protected]>
Quoted 6 lines · Fabio Estevam
Instead of using the local imx7s-warp devicetree copies from U-Boot, convert the imx7s-warp board to
OF_UPSTREAMso that the upstream kernel devicetree can be used instead.Signed-off-by Fabio Estevam <[email protected]>
Applied, thanks.