| Message ID | 20190103014444.11134-3-bryan.odonoghue@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Convert i.MX7 WaRP7 ports to DM | expand |
> -----Original Message----- > From: Bryan O'Donoghue [mailto:bryan.odonoghue@linaro.org] > Sent: 2019年1月3日 9:45 > To: u-boot@lists.denx.de > Cc: Fabio Estevam <fabio.estevam@nxp.com>; Peng Fan > <peng.fan@nxp.com>; Bryan O'Donoghue <bryan.odonoghue@linaro.org>; > Albert Aribaud <albert.u.boot@aribaud.net>; Stefano Babic > <sbabic@denx.de> > Subject: [PATCH 2/8] arm: imx7s-warp: Add DT file hooks > > This patch adds DT file hooks for imx7s-warp.dtb to the warp7 and > warp7_bl33 builds. > > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > Cc: Albert Aribaud <albert.u.boot@aribaud.net> > Cc: Peng Fan <peng.fan@nxp.com> > Cc: Fabio Estevam <fabio.estevam@nxp.com> > Cc: Stefano Babic <sbabic@denx.de> > --- > arch/arm/dts/Makefile | 3 ++- > configs/warp7_bl33_defconfig | 3 ++- > configs/warp7_defconfig | 3 ++- > 3 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index > dda4e59491..4fe7e90902 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -460,7 +460,8 @@ dtb-$(CONFIG_MX6ULL) += imx6ull-14x14-evk.dtb > > dtb-$(CONFIG_MX7) += imx7-colibri.dtb \ > imx7d-sdb.dtb \ > - imx7d-sdb-qspi.dtb > + imx7d-sdb-qspi.dtb \ > + imx7s-warp.dtb > > dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb > > diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig > index a568c6d10e..12141fedd3 100644 > --- a/configs/warp7_bl33_defconfig > +++ b/configs/warp7_bl33_defconfig > @@ -20,6 +20,7 @@ CONFIG_CMD_EXT2=y > CONFIG_CMD_EXT4=y > CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_FAT=y > +CONFIG_OF_CONTROL=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_NET_RANDOM_ETHADDR=y > CONFIG_DFU_MMC=y > @@ -37,5 +38,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y > CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" > -CONFIG_OF_LIBFDT=y > CONFIG_OPTEE_TZDRAM_SIZE=0x2000000 > +CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp" > diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index > 4d443295ba..fee98dfbbe 100644 > --- a/configs/warp7_defconfig > +++ b/configs/warp7_defconfig > @@ -29,6 +29,7 @@ CONFIG_CMD_EXT2=y > CONFIG_CMD_EXT4=y > CONFIG_CMD_EXT4_WRITE=y > CONFIG_CMD_FAT=y > +CONFIG_OF_CONTROL=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_NET_RANDOM_ETHADDR=y > CONFIG_DFU_MMC=y > @@ -47,8 +48,8 @@ CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y > CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" > -CONFIG_OF_LIBFDT=y > CONFIG_OPTEE_LOAD_ADDR=0x84000000 > CONFIG_OPTEE_TZDRAM_SIZE=0x3000000 > CONFIG_OPTEE_TZDRAM_BASE=0x9d000000 > CONFIG_BOOTM_OPTEE=y > +CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp" Reviewed-by: Peng Fan <peng.fan@nxp.com> > -- > 2.20.0
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index dda4e59491..4fe7e90902 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -460,7 +460,8 @@ dtb-$(CONFIG_MX6ULL) += imx6ull-14x14-evk.dtb dtb-$(CONFIG_MX7) += imx7-colibri.dtb \ imx7d-sdb.dtb \ - imx7d-sdb-qspi.dtb + imx7d-sdb-qspi.dtb \ + imx7s-warp.dtb dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index a568c6d10e..12141fedd3 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -20,6 +20,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_CMD_FS_GENERIC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DFU_MMC=y @@ -37,5 +38,5 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" -CONFIG_OF_LIBFDT=y CONFIG_OPTEE_TZDRAM_SIZE=0x2000000 +CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp" diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 4d443295ba..fee98dfbbe 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y +CONFIG_OF_CONTROL=y CONFIG_CMD_FS_GENERIC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DFU_MMC=y @@ -47,8 +48,8 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" -CONFIG_OF_LIBFDT=y CONFIG_OPTEE_LOAD_ADDR=0x84000000 CONFIG_OPTEE_TZDRAM_SIZE=0x3000000 CONFIG_OPTEE_TZDRAM_BASE=0x9d000000 CONFIG_BOOTM_OPTEE=y +CONFIG_DEFAULT_DEVICE_TREE="imx7s-warp"
This patch adds DT file hooks for imx7s-warp.dtb to the warp7 and warp7_bl33 builds. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Cc: Albert Aribaud <albert.u.boot@aribaud.net> Cc: Peng Fan <peng.fan@nxp.com> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Stefano Babic <sbabic@denx.de> --- arch/arm/dts/Makefile | 3 ++- configs/warp7_bl33_defconfig | 3 ++- configs/warp7_defconfig | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-)