| Message ID | 1435162187-30592-5-git-send-email-pbrobinson@gmail.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Stefano Babic |
| Headers | show |
On 24/06/2015 18:09, Peter Robinson wrote: > Update boards that already include it, add DM options for those > that don't yet. > > Signed-off-by: Peter Robinson <pbrobinson@gmail.com> > --- > configs/aristainetos2_defconfig | 2 ++ > configs/aristainetos_defconfig | 2 ++ > configs/cgtqmx6qeval_defconfig | 2 ++ > configs/cm_fx6_defconfig | 2 ++ > configs/gwventana_defconfig | 2 ++ > configs/mx6dlarm2_defconfig | 2 ++ > configs/mx6dlarm2_lpddr2_defconfig | 2 ++ > configs/mx6dlsabreauto_defconfig | 2 ++ > configs/mx6dlsabresd_defconfig | 2 ++ > configs/mx6qarm2_defconfig | 2 ++ > configs/mx6qarm2_lpddr2_defconfig | 2 ++ > configs/mx6qsabreauto_defconfig | 2 ++ > configs/mx6qsabresd_defconfig | 2 ++ > configs/mx6sabresd_spl_defconfig | 2 ++ > configs/mx6sxsabresd_defconfig | 2 ++ > configs/mx6sxsabresd_spl_defconfig | 2 ++ > configs/nitrogen6dl2g_defconfig | 2 ++ > configs/nitrogen6dl_defconfig | 2 ++ > configs/nitrogen6q2g_defconfig | 2 ++ > configs/nitrogen6q_defconfig | 2 ++ > configs/nitrogen6s1g_defconfig | 2 ++ > configs/nitrogen6s_defconfig | 2 ++ > configs/novena_defconfig | 2 ++ > configs/ot1200_defconfig | 2 ++ > configs/ot1200_spl_defconfig | 2 ++ > configs/platinum_picon_defconfig | 2 ++ > configs/platinum_titanium_defconfig | 2 ++ > configs/secomx6quq7_defconfig | 2 ++ > configs/tbs2910_defconfig | 2 ++ > configs/tqma6q_mba6_mmc_defconfig | 2 ++ > configs/tqma6q_mba6_spi_defconfig | 2 ++ > configs/tqma6s_mba6_mmc_defconfig | 2 ++ > configs/tqma6s_mba6_spi_defconfig | 2 ++ > configs/udoo_quad_defconfig | 2 ++ > configs/warp_defconfig | 2 ++ > include/configs/embestmx6boards.h | 2 -- > include/configs/gw_ventana.h | 3 --- > include/configs/mx6_common.h | 2 ++ > include/configs/mx6cuboxi.h | 2 -- > include/configs/mx6sabre_common.h | 2 -- > 40 files changed, 72 insertions(+), 9 deletions(-) > > diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig > index af92f69..1e59619 100644 > --- a/configs/aristainetos2_defconfig > +++ b/configs/aristainetos2_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_ARISTAINETOS2=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig > index 306d4a8..f023aac 100644 > --- a/configs/aristainetos_defconfig > +++ b/configs/aristainetos_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_ARISTAINETOS=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/cgtqmx6qeval_defconfig b/configs/cgtqmx6qeval_defconfig > index 58b98b7..7a3f75c 100644 > --- a/configs/cgtqmx6qeval_defconfig > +++ b/configs/cgtqmx6qeval_defconfig > @@ -2,3 +2,5 @@ CONFIG_ARM=y > CONFIG_TARGET_CGTQMX6EVAL=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx6eval/imximage.cfg,MX6Q" > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig > index 4db785d..f141167 100644 > --- a/configs/cm_fx6_defconfig > +++ b/configs/cm_fx6_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_CM_FX6=y > CONFIG_SPL=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig > index 5cfe983..3779a1c 100644 > --- a/configs/gwventana_defconfig > +++ b/configs/gwventana_defconfig > @@ -7,3 +7,5 @@ CONFIG_SPL_STACK_R_ADDR=0x18000000 > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/mx6dlarm2_defconfig b/configs/mx6dlarm2_defconfig > index 4324ccf..b81c9ab 100644 > --- a/configs/mx6dlarm2_defconfig > +++ b/configs/mx6dlarm2_defconfig > @@ -2,3 +2,5 @@ CONFIG_ARM=y > CONFIG_TARGET_MX6QARM2=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,DDR_MB=2048" > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/mx6dlarm2_lpddr2_defconfig b/configs/mx6dlarm2_lpddr2_defconfig > index 7681814..efbca94 100644 > --- a/configs/mx6dlarm2_lpddr2_defconfig > +++ b/configs/mx6dlarm2_lpddr2_defconfig > @@ -2,3 +2,5 @@ CONFIG_ARM=y > CONFIG_TARGET_MX6QARM2=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,MX6DL_LPDDR2,DDR_MB=512" > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig > index 7578fc8..1052088 100644 > --- a/configs/mx6dlsabreauto_defconfig > +++ b/configs/mx6dlsabreauto_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6QSABREAUTO=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig > index 92d77f9..becca3f 100644 > --- a/configs/mx6dlsabresd_defconfig > +++ b/configs/mx6dlsabresd_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6SABRESD=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/mx6qarm2_defconfig b/configs/mx6qarm2_defconfig > index 51ab7e3..2a3cab9 100644 > --- a/configs/mx6qarm2_defconfig > +++ b/configs/mx6qarm2_defconfig > @@ -2,3 +2,5 @@ CONFIG_ARM=y > CONFIG_TARGET_MX6QARM2=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,DDR_MB=2048" > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/mx6qarm2_lpddr2_defconfig b/configs/mx6qarm2_lpddr2_defconfig > index c590c39..b6db3ab 100644 > --- a/configs/mx6qarm2_lpddr2_defconfig > +++ b/configs/mx6qarm2_lpddr2_defconfig > @@ -2,3 +2,5 @@ CONFIG_ARM=y > CONFIG_TARGET_MX6QARM2=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,MX6DQ_LPDDR2,DDR_MB=512" > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig > index 3d584bd..5deb638 100644 > --- a/configs/mx6qsabreauto_defconfig > +++ b/configs/mx6qsabreauto_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6QSABREAUTO=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig > index 887a509..8d40917 100644 > --- a/configs/mx6qsabresd_defconfig > +++ b/configs/mx6qsabresd_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6SABRESD=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig > index a9adcdb..70a06fb 100644 > --- a/configs/mx6sabresd_spl_defconfig > +++ b/configs/mx6sabresd_spl_defconfig > @@ -4,3 +4,5 @@ CONFIG_SPL=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig > index 058e3f8..b758e2b 100644 > --- a/configs/mx6sxsabresd_defconfig > +++ b/configs/mx6sxsabresd_defconfig > @@ -2,3 +2,5 @@ CONFIG_ARM=y > CONFIG_TARGET_MX6SXSABRESD=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,MX6SX" > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig > index 0e3159e..cfd22e2 100644 > --- a/configs/mx6sxsabresd_spl_defconfig > +++ b/configs/mx6sxsabresd_spl_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6SXSABRESD=y > CONFIG_SPL=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX" > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig > index ec0e346..c777261 100644 > --- a/configs/nitrogen6dl2g_defconfig > +++ b/configs/nitrogen6dl2g_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig > index 838a43e..94058aa 100644 > --- a/configs/nitrogen6dl_defconfig > +++ b/configs/nitrogen6dl_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig > index a739e22..b6243d2 100644 > --- a/configs/nitrogen6q2g_defconfig > +++ b/configs/nitrogen6q2g_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig > index b4b0524..827ae1c 100644 > --- a/configs/nitrogen6q_defconfig > +++ b/configs/nitrogen6q_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig > index 118f605..221d2cf 100644 > --- a/configs/nitrogen6s1g_defconfig > +++ b/configs/nitrogen6s1g_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig > index 3e70de9..26339df 100644 > --- a/configs/nitrogen6s_defconfig > +++ b/configs/nitrogen6s_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/novena_defconfig b/configs/novena_defconfig > index ccc0055..2d8eaab 100644 > --- a/configs/novena_defconfig > +++ b/configs/novena_defconfig > @@ -4,3 +4,5 @@ CONFIG_SPL=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig > index 20f64bb..693a7c2 100644 > --- a/configs/ot1200_defconfig > +++ b/configs/ot1200_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_OT1200=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,MX6Q" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig > index 810dff8..be12cba 100644 > --- a/configs/ot1200_spl_defconfig > +++ b/configs/ot1200_spl_defconfig > @@ -4,3 +4,5 @@ CONFIG_SPL=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig > index 672ea28..06ed0bb 100644 > --- a/configs/platinum_picon_defconfig > +++ b/configs/platinum_picon_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_PLATINUM_PICON=y > CONFIG_SPL=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL" > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig > index 39236f1..9fa33a2 100644 > --- a/configs/platinum_titanium_defconfig > +++ b/configs/platinum_titanium_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_PLATINUM_TITANIUM=y > CONFIG_SPL=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/secomx6quq7_defconfig b/configs/secomx6quq7_defconfig > index f9d7ee9..c9bc064 100644 > --- a/configs/secomx6quq7_defconfig > +++ b/configs/secomx6quq7_defconfig > @@ -7,3 +7,5 @@ CONFIG_SECOMX6_2GB=y > CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig > index 3e720a7..ed9c70f 100644 > --- a/configs/tbs2910_defconfig > +++ b/configs/tbs2910_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_TBS2910=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig > index 01355b6..7d6348b 100644 > --- a/configs/tqma6q_mba6_mmc_defconfig > +++ b/configs/tqma6q_mba6_mmc_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_MMC_BOOT" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig > index ba24663..c08adb4 100644 > --- a/configs/tqma6q_mba6_spi_defconfig > +++ b/configs/tqma6q_mba6_spi_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_SPI_BOOT" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig > index cbb4500..b09c8c1 100644 > --- a/configs/tqma6s_mba6_mmc_defconfig > +++ b/configs/tqma6s_mba6_mmc_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_MMC_BOOT" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig > index 805d8ab..50d9246 100644 > --- a/configs/tqma6s_mba6_spi_defconfig > +++ b/configs/tqma6s_mba6_spi_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_SPI_BOOT" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/udoo_quad_defconfig b/configs/udoo_quad_defconfig > index 17f48c8..ebf2d9e 100644 > --- a/configs/udoo_quad_defconfig > +++ b/configs/udoo_quad_defconfig > @@ -3,3 +3,5 @@ CONFIG_TARGET_UDOO=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/udoo/udoo.cfg,MX6Q,DDR_MB=1024" > CONFIG_CMD_SETEXPR=y > CONFIG_CMD_NET=y > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/configs/warp_defconfig b/configs/warp_defconfig > index 24e1b9f..f43c66b 100644 > --- a/configs/warp_defconfig > +++ b/configs/warp_defconfig > @@ -1,3 +1,5 @@ > CONFIG_ARM=y > CONFIG_TARGET_WARP=y > CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL" > +CONFIG_DM=y > +CONFIG_DM_THERMAL=y > diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h > index 85155f1..7b53df4 100644 > --- a/include/configs/embestmx6boards.h > +++ b/include/configs/embestmx6boards.h > @@ -19,8 +19,6 @@ > > #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) > > -#define CONFIG_IMX6_THERMAL > - > /* Size of malloc() pool */ > #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) > > diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h > index 3d72832..b49c153 100644 > --- a/include/configs/gw_ventana.h > +++ b/include/configs/gw_ventana.h > @@ -59,9 +59,6 @@ > #define CONFIG_MXC_GPIO > #define CONFIG_CMD_GPIO > > -/* Thermal */ > -#define CONFIG_IMX6_THERMAL > - > /* Serial */ > #define CONFIG_MXC_UART > #define CONFIG_MXC_UART_BASE UART2_BASE > diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h > index 2a0eb2a..dec4299 100644 > --- a/include/configs/mx6_common.h > +++ b/include/configs/mx6_common.h > @@ -116,4 +116,6 @@ > #define CONFIG_CMD_FUSE > #define CONFIG_MXC_OCOTP > > +#define CONFIG_IMX6_THERMAL > + > #endif > diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h > index 634a09f..4eadfd8 100644 > --- a/include/configs/mx6cuboxi.h > +++ b/include/configs/mx6cuboxi.h > @@ -14,8 +14,6 @@ > #define CONFIG_SPL_MMC_SUPPORT > #include "imx6_spl.h" > > -#define CONFIG_IMX6_THERMAL > - > #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) > #define CONFIG_BOARD_EARLY_INIT_F > #define CONFIG_BOARD_LATE_INIT > diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h > index 3ed4d23..ba95b08 100644 > --- a/include/configs/mx6sabre_common.h > +++ b/include/configs/mx6sabre_common.h > @@ -11,8 +11,6 @@ > > #include "mx6_common.h" > > -#define CONFIG_IMX6_THERMAL > - > /* Size of malloc() pool */ > #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) > > Acked-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
> Update boards that already include it, add DM options for those > that don't yet. > > Signed-off-by: Peter Robinson <pbrobinson@gmail.com> > --- > configs/aristainetos2_defconfig | 2 ++ > configs/aristainetos_defconfig | 2 ++ > configs/cgtqmx6qeval_defconfig | 2 ++ > configs/cm_fx6_defconfig | 2 ++ > configs/gwventana_defconfig | 2 ++ > configs/mx6dlarm2_defconfig | 2 ++ > configs/mx6dlarm2_lpddr2_defconfig | 2 ++ > configs/mx6dlsabreauto_defconfig | 2 ++ > configs/mx6dlsabresd_defconfig | 2 ++ > configs/mx6qarm2_defconfig | 2 ++ > configs/mx6qarm2_lpddr2_defconfig | 2 ++ > configs/mx6qsabreauto_defconfig | 2 ++ > configs/mx6qsabresd_defconfig | 2 ++ > configs/mx6sabresd_spl_defconfig | 2 ++ > configs/mx6sxsabresd_defconfig | 2 ++ > configs/mx6sxsabresd_spl_defconfig | 2 ++ > configs/nitrogen6dl2g_defconfig | 2 ++ > configs/nitrogen6dl_defconfig | 2 ++ > configs/nitrogen6q2g_defconfig | 2 ++ > configs/nitrogen6q_defconfig | 2 ++ > configs/nitrogen6s1g_defconfig | 2 ++ > configs/nitrogen6s_defconfig | 2 ++ > configs/novena_defconfig | 2 ++ > configs/ot1200_defconfig | 2 ++ > configs/ot1200_spl_defconfig | 2 ++ > configs/platinum_picon_defconfig | 2 ++ > configs/platinum_titanium_defconfig | 2 ++ > configs/secomx6quq7_defconfig | 2 ++ > configs/tbs2910_defconfig | 2 ++ > configs/tqma6q_mba6_mmc_defconfig | 2 ++ > configs/tqma6q_mba6_spi_defconfig | 2 ++ > configs/tqma6s_mba6_mmc_defconfig | 2 ++ > configs/tqma6s_mba6_spi_defconfig | 2 ++ > configs/udoo_quad_defconfig | 2 ++ > configs/warp_defconfig | 2 ++ > include/configs/embestmx6boards.h | 2 -- > include/configs/gw_ventana.h | 3 --- > include/configs/mx6_common.h | 2 ++ > include/configs/mx6cuboxi.h | 2 -- > include/configs/mx6sabre_common.h | 2 -- > 40 files changed, 72 insertions(+), 9 deletions(-) > > > Acked-by: Stefano Babic <sbabic@denx.de> > > Best regards, > Stefano Babic Stefano, in the u-boot-imx repository there is already thermal support for tbs2910. We would need to revert commit fbd18aa610df896ccebbebb3fb88b19dddd7c413 before applying this patch. Can you squash the revert into this patch, please? Peter, can you please cc: all board maintainers when sending patches? Thanks, Soeren
Hi Soeren, On 28/06/2015 17:27, Soeren Moch wrote: >> Update boards that already include it, add DM options for those >> that don't yet. >> >> Signed-off-by: Peter Robinson <pbrobinson@gmail.com> >> --- >> configs/aristainetos2_defconfig | 2 ++ >> configs/aristainetos_defconfig | 2 ++ >> configs/cgtqmx6qeval_defconfig | 2 ++ >> configs/cm_fx6_defconfig | 2 ++ >> configs/gwventana_defconfig | 2 ++ >> configs/mx6dlarm2_defconfig | 2 ++ >> configs/mx6dlarm2_lpddr2_defconfig | 2 ++ >> configs/mx6dlsabreauto_defconfig | 2 ++ >> configs/mx6dlsabresd_defconfig | 2 ++ >> configs/mx6qarm2_defconfig | 2 ++ >> configs/mx6qarm2_lpddr2_defconfig | 2 ++ >> configs/mx6qsabreauto_defconfig | 2 ++ >> configs/mx6qsabresd_defconfig | 2 ++ >> configs/mx6sabresd_spl_defconfig | 2 ++ >> configs/mx6sxsabresd_defconfig | 2 ++ >> configs/mx6sxsabresd_spl_defconfig | 2 ++ >> configs/nitrogen6dl2g_defconfig | 2 ++ >> configs/nitrogen6dl_defconfig | 2 ++ >> configs/nitrogen6q2g_defconfig | 2 ++ >> configs/nitrogen6q_defconfig | 2 ++ >> configs/nitrogen6s1g_defconfig | 2 ++ >> configs/nitrogen6s_defconfig | 2 ++ >> configs/novena_defconfig | 2 ++ >> configs/ot1200_defconfig | 2 ++ >> configs/ot1200_spl_defconfig | 2 ++ >> configs/platinum_picon_defconfig | 2 ++ >> configs/platinum_titanium_defconfig | 2 ++ >> configs/secomx6quq7_defconfig | 2 ++ >> configs/tbs2910_defconfig | 2 ++ >> configs/tqma6q_mba6_mmc_defconfig | 2 ++ >> configs/tqma6q_mba6_spi_defconfig | 2 ++ >> configs/tqma6s_mba6_mmc_defconfig | 2 ++ >> configs/tqma6s_mba6_spi_defconfig | 2 ++ >> configs/udoo_quad_defconfig | 2 ++ >> configs/warp_defconfig | 2 ++ >> include/configs/embestmx6boards.h | 2 -- >> include/configs/gw_ventana.h | 3 --- >> include/configs/mx6_common.h | 2 ++ >> include/configs/mx6cuboxi.h | 2 -- >> include/configs/mx6sabre_common.h | 2 -- >> 40 files changed, 72 insertions(+), 9 deletions(-) >>> >> Acked-by: Stefano Babic <sbabic@denx.de> >> >> Best regards, >> Stefano Babic > > Stefano, > > in the u-boot-imx repository there is already thermal support for > tbs2910. We would need to revert commit > fbd18aa610df896ccebbebb3fb88b19dddd7c413 before applying this patch. > Can you squash the revert into this patch, please? > Thanks to note it - I'll do it. > > Peter, > > can you please cc: all board maintainers when sending patches? > This is the reason I applied 1-2 and not 3-4. Maybe there is some other issues and some other maintainers can raise the hand. I will let some time before applying the last two patches. Thanks for advise, Stefano babic
On Sun, Jun 28, 2015 at 4:27 PM, Soeren Moch <smoch@web.de> wrote: >> Update boards that already include it, add DM options for those >> that don't yet. >> >> Signed-off-by: Peter Robinson <pbrobinson@gmail.com> >> --- >> configs/aristainetos2_defconfig | 2 ++ >> configs/aristainetos_defconfig | 2 ++ >> configs/cgtqmx6qeval_defconfig | 2 ++ >> configs/cm_fx6_defconfig | 2 ++ >> configs/gwventana_defconfig | 2 ++ >> configs/mx6dlarm2_defconfig | 2 ++ >> configs/mx6dlarm2_lpddr2_defconfig | 2 ++ >> configs/mx6dlsabreauto_defconfig | 2 ++ >> configs/mx6dlsabresd_defconfig | 2 ++ >> configs/mx6qarm2_defconfig | 2 ++ >> configs/mx6qarm2_lpddr2_defconfig | 2 ++ >> configs/mx6qsabreauto_defconfig | 2 ++ >> configs/mx6qsabresd_defconfig | 2 ++ >> configs/mx6sabresd_spl_defconfig | 2 ++ >> configs/mx6sxsabresd_defconfig | 2 ++ >> configs/mx6sxsabresd_spl_defconfig | 2 ++ >> configs/nitrogen6dl2g_defconfig | 2 ++ >> configs/nitrogen6dl_defconfig | 2 ++ >> configs/nitrogen6q2g_defconfig | 2 ++ >> configs/nitrogen6q_defconfig | 2 ++ >> configs/nitrogen6s1g_defconfig | 2 ++ >> configs/nitrogen6s_defconfig | 2 ++ >> configs/novena_defconfig | 2 ++ >> configs/ot1200_defconfig | 2 ++ >> configs/ot1200_spl_defconfig | 2 ++ >> configs/platinum_picon_defconfig | 2 ++ >> configs/platinum_titanium_defconfig | 2 ++ >> configs/secomx6quq7_defconfig | 2 ++ >> configs/tbs2910_defconfig | 2 ++ >> configs/tqma6q_mba6_mmc_defconfig | 2 ++ >> configs/tqma6q_mba6_spi_defconfig | 2 ++ >> configs/tqma6s_mba6_mmc_defconfig | 2 ++ >> configs/tqma6s_mba6_spi_defconfig | 2 ++ >> configs/udoo_quad_defconfig | 2 ++ >> configs/warp_defconfig | 2 ++ >> include/configs/embestmx6boards.h | 2 -- >> include/configs/gw_ventana.h | 3 --- >> include/configs/mx6_common.h | 2 ++ >> include/configs/mx6cuboxi.h | 2 -- >> include/configs/mx6sabre_common.h | 2 -- >> 40 files changed, 72 insertions(+), 9 deletions(-) >> > >> Acked-by: Stefano Babic <sbabic@denx.de> >> >> Best regards, >> Stefano Babic > > Stefano, > > in the u-boot-imx repository there is already thermal support for > tbs2910. We would need to revert commit > fbd18aa610df896ccebbebb3fb88b19dddd7c413 before applying this patch. > Can you squash the revert into this patch, please? > > > Peter, > > can you please cc: all board maintainers when sending patches? I was emailing the list that getmainters.pl returns.
On 28.06.2015 18:09, Peter Robinson wrote: > On Sun, Jun 28, 2015 at 4:27 PM, Soeren Moch <smoch@web.de> wrote: >>> Update boards that already include it, add DM options for those >>> that don't yet. >>> >>> Signed-off-by: Peter Robinson <pbrobinson@gmail.com> >>> --- >>> configs/aristainetos2_defconfig | 2 ++ >>> configs/aristainetos_defconfig | 2 ++ >>> configs/cgtqmx6qeval_defconfig | 2 ++ >>> configs/cm_fx6_defconfig | 2 ++ >>> configs/gwventana_defconfig | 2 ++ >>> configs/mx6dlarm2_defconfig | 2 ++ >>> configs/mx6dlarm2_lpddr2_defconfig | 2 ++ >>> configs/mx6dlsabreauto_defconfig | 2 ++ >>> configs/mx6dlsabresd_defconfig | 2 ++ >>> configs/mx6qarm2_defconfig | 2 ++ >>> configs/mx6qarm2_lpddr2_defconfig | 2 ++ >>> configs/mx6qsabreauto_defconfig | 2 ++ >>> configs/mx6qsabresd_defconfig | 2 ++ >>> configs/mx6sabresd_spl_defconfig | 2 ++ >>> configs/mx6sxsabresd_defconfig | 2 ++ >>> configs/mx6sxsabresd_spl_defconfig | 2 ++ >>> configs/nitrogen6dl2g_defconfig | 2 ++ >>> configs/nitrogen6dl_defconfig | 2 ++ >>> configs/nitrogen6q2g_defconfig | 2 ++ >>> configs/nitrogen6q_defconfig | 2 ++ >>> configs/nitrogen6s1g_defconfig | 2 ++ >>> configs/nitrogen6s_defconfig | 2 ++ >>> configs/novena_defconfig | 2 ++ >>> configs/ot1200_defconfig | 2 ++ >>> configs/ot1200_spl_defconfig | 2 ++ >>> configs/platinum_picon_defconfig | 2 ++ >>> configs/platinum_titanium_defconfig | 2 ++ >>> configs/secomx6quq7_defconfig | 2 ++ >>> configs/tbs2910_defconfig | 2 ++ >>> configs/tqma6q_mba6_mmc_defconfig | 2 ++ >>> configs/tqma6q_mba6_spi_defconfig | 2 ++ >>> configs/tqma6s_mba6_mmc_defconfig | 2 ++ >>> configs/tqma6s_mba6_spi_defconfig | 2 ++ >>> configs/udoo_quad_defconfig | 2 ++ >>> configs/warp_defconfig | 2 ++ >>> include/configs/embestmx6boards.h | 2 -- >>> include/configs/gw_ventana.h | 3 --- >>> include/configs/mx6_common.h | 2 ++ >>> include/configs/mx6cuboxi.h | 2 -- >>> include/configs/mx6sabre_common.h | 2 -- >>> 40 files changed, 72 insertions(+), 9 deletions(-) >>>> >>> Acked-by: Stefano Babic <sbabic@denx.de> >>> >>> Best regards, >>> Stefano Babic >> >> Stefano, >> >> in the u-boot-imx repository there is already thermal support for >> tbs2910. We would need to revert commit >> fbd18aa610df896ccebbebb3fb88b19dddd7c413 before applying this patch. >> Can you squash the revert into this patch, please? >> >> >> Peter, >> >> can you please cc: all board maintainers when sending patches? > > I was emailing the list that getmainters.pl returns. > ./scripts/get_maintainer.pl <this patch> in u-boot-imx prints following board maintainers: Heiko Schocher <hs@denx.de> (maintainer:ARISTAINETOS BOARD) Nikita Kiryanov <nikita@compulab.co.il> (maintainer:CM_FX6 BOARD) Tim Harvey <tharvey@gateworks.com> (maintainer:GW_VENTANA BOARD) Jason Liu <r64343@freescale.com> (maintainer:MX6QARM2 BOARD) Ye Li <b37916@freescale.com> (maintainer:MX6QARM2 BOARD) Fabio Estevam <fabio.estevam@freescale.com> (maintainer:MX6QSABREAUTO BOARD) Eric Nelson <eric.nelson@boundarydevices.com> (maintainer:NITROGEN6X BOARD) Marek Vasut <marex@denx.de> (maintainer:NOVENA BOARD) Christian Gmeiner <christian.gmeiner@gmail.com> (maintainer:BACHMANN ELECTRON...) Stefan Roese <sr@denx.de> (maintainer:PLATINUM BOARD) Boris Brezillon <boris.brezillon@free-electrons.com> (maintainer:MX6QUQ7 BOARD) Soeren Moch <smoch@web.de> (maintainer:TBS2910 BOARD) Markus Niebel <Markus.Niebel@tq-group.com> (maintainer:TQ SYSTEMS TQMA6...) Otavio Salvador <otavio@ossystems.com.br> (maintainer:WaRP BOARD) "Eric Bénard" <eric@eukrea.com> (maintainer:MX6BOARDS BOARD) Regards, Soeren
Hi Peter, On 28/06/2015 18:23, Soeren Moch wrote: >>> Stefano, >>> >>> in the u-boot-imx repository there is already thermal support for >>> tbs2910. We would need to revert commit >>> fbd18aa610df896ccebbebb3fb88b19dddd7c413 before applying this patch. >>> Can you squash the revert into this patch, please? >>> >>> >>> Peter, >>> >>> can you please cc: all board maintainers when sending patches? >> >> I was emailing the list that getmainters.pl returns. >> > > > ./scripts/get_maintainer.pl <this patch> in u-boot-imx prints > following board maintainers: > > Heiko Schocher <hs@denx.de> (maintainer:ARISTAINETOS BOARD) > Nikita Kiryanov <nikita@compulab.co.il> (maintainer:CM_FX6 BOARD) > Tim Harvey <tharvey@gateworks.com> (maintainer:GW_VENTANA BOARD) > Jason Liu <r64343@freescale.com> (maintainer:MX6QARM2 BOARD) > Ye Li <b37916@freescale.com> (maintainer:MX6QARM2 BOARD) > Fabio Estevam <fabio.estevam@freescale.com> (maintainer:MX6QSABREAUTO BOARD) > Eric Nelson <eric.nelson@boundarydevices.com> (maintainer:NITROGEN6X BOARD) > Marek Vasut <marex@denx.de> (maintainer:NOVENA BOARD) > Christian Gmeiner <christian.gmeiner@gmail.com> (maintainer:BACHMANN > ELECTRON...) > Stefan Roese <sr@denx.de> (maintainer:PLATINUM BOARD) > Boris Brezillon <boris.brezillon@free-electrons.com> (maintainer:MX6QUQ7 > BOARD) > Soeren Moch <smoch@web.de> (maintainer:TBS2910 BOARD) > Markus Niebel <Markus.Niebel@tq-group.com> (maintainer:TQ SYSTEMS TQMA6...) > Otavio Salvador <otavio@ossystems.com.br> (maintainer:WaRP BOARD) > "Eric Bénard" <eric@eukrea.com> (maintainer:MX6BOARDS BOARD) > In fact they are a lot. Peter, what do you mind to repost only 3 and 4 (first two patches were IMHO without drawbacks and I have already applied them), reverting and squashing fbd18aa610df896ccebbebb3fb88b19dddd7c413 as suggested by Soeren and putting all board maintainers in CC ? Best regards, Stefano Babic
On Sun, Jun 28, 2015 at 5:32 PM, Stefano Babic <sbabic@denx.de> wrote: > Hi Peter, > > On 28/06/2015 18:23, Soeren Moch wrote: >>>> Stefano, >>>> >>>> in the u-boot-imx repository there is already thermal support for >>>> tbs2910. We would need to revert commit >>>> fbd18aa610df896ccebbebb3fb88b19dddd7c413 before applying this patch. >>>> Can you squash the revert into this patch, please? >>>> >>>> >>>> Peter, >>>> >>>> can you please cc: all board maintainers when sending patches? >>> >>> I was emailing the list that getmainters.pl returns. >>> >> >> >> ./scripts/get_maintainer.pl <this patch> in u-boot-imx prints >> following board maintainers: >> >> Heiko Schocher <hs@denx.de> (maintainer:ARISTAINETOS BOARD) >> Nikita Kiryanov <nikita@compulab.co.il> (maintainer:CM_FX6 BOARD) >> Tim Harvey <tharvey@gateworks.com> (maintainer:GW_VENTANA BOARD) >> Jason Liu <r64343@freescale.com> (maintainer:MX6QARM2 BOARD) >> Ye Li <b37916@freescale.com> (maintainer:MX6QARM2 BOARD) >> Fabio Estevam <fabio.estevam@freescale.com> (maintainer:MX6QSABREAUTO BOARD) >> Eric Nelson <eric.nelson@boundarydevices.com> (maintainer:NITROGEN6X BOARD) >> Marek Vasut <marex@denx.de> (maintainer:NOVENA BOARD) >> Christian Gmeiner <christian.gmeiner@gmail.com> (maintainer:BACHMANN >> ELECTRON...) >> Stefan Roese <sr@denx.de> (maintainer:PLATINUM BOARD) >> Boris Brezillon <boris.brezillon@free-electrons.com> (maintainer:MX6QUQ7 >> BOARD) >> Soeren Moch <smoch@web.de> (maintainer:TBS2910 BOARD) >> Markus Niebel <Markus.Niebel@tq-group.com> (maintainer:TQ SYSTEMS TQMA6...) >> Otavio Salvador <otavio@ossystems.com.br> (maintainer:WaRP BOARD) >> "Eric Bénard" <eric@eukrea.com> (maintainer:MX6BOARDS BOARD) >> > > In fact they are a lot. Peter, what do you mind to repost only 3 and 4 > (first two patches were IMHO without drawbacks and I have already > applied them), reverting and squashing > fbd18aa610df896ccebbebb3fb88b19dddd7c413 as suggested by Soeren and > putting all board maintainers in CC ? Sorry I haven't got back to this, with the commit above already in 2015.07 I've not reverted it on my rebase but rather just rebased the patch on master. Will be reposting in a moment. Peter
diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig index af92f69..1e59619 100644 --- a/configs/aristainetos2_defconfig +++ b/configs/aristainetos2_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_ARISTAINETOS2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig index 306d4a8..f023aac 100644 --- a/configs/aristainetos_defconfig +++ b/configs/aristainetos_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_ARISTAINETOS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/cgtqmx6qeval_defconfig b/configs/cgtqmx6qeval_defconfig index 58b98b7..7a3f75c 100644 --- a/configs/cgtqmx6qeval_defconfig +++ b/configs/cgtqmx6qeval_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_CGTQMX6EVAL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx6eval/imximage.cfg,MX6Q" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 4db785d..f141167 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_CM_FX6=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index 5cfe983..3779a1c 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -7,3 +7,5 @@ CONFIG_SPL_STACK_R_ADDR=0x18000000 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6dlarm2_defconfig b/configs/mx6dlarm2_defconfig index 4324ccf..b81c9ab 100644 --- a/configs/mx6dlarm2_defconfig +++ b/configs/mx6dlarm2_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,DDR_MB=2048" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6dlarm2_lpddr2_defconfig b/configs/mx6dlarm2_lpddr2_defconfig index 7681814..efbca94 100644 --- a/configs/mx6dlarm2_lpddr2_defconfig +++ b/configs/mx6dlarm2_lpddr2_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,MX6DL_LPDDR2,DDR_MB=512" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index 7578fc8..1052088 100644 --- a/configs/mx6dlsabreauto_defconfig +++ b/configs/mx6dlsabreauto_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig index 92d77f9..becca3f 100644 --- a/configs/mx6dlsabresd_defconfig +++ b/configs/mx6dlsabresd_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6SABRESD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6dlsabresd.cfg,MX6DL" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qarm2_defconfig b/configs/mx6qarm2_defconfig index 51ab7e3..2a3cab9 100644 --- a/configs/mx6qarm2_defconfig +++ b/configs/mx6qarm2_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,DDR_MB=2048" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qarm2_lpddr2_defconfig b/configs/mx6qarm2_lpddr2_defconfig index c590c39..b6db3ab 100644 --- a/configs/mx6qarm2_lpddr2_defconfig +++ b/configs/mx6qarm2_lpddr2_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6QARM2=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,MX6DQ_LPDDR2,DDR_MB=512" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig index 3d584bd..5deb638 100644 --- a/configs/mx6qsabreauto_defconfig +++ b/configs/mx6qsabreauto_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig index 887a509..8d40917 100644 --- a/configs/mx6qsabresd_defconfig +++ b/configs/mx6qsabresd_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6SABRESD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index a9adcdb..70a06fb 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -4,3 +4,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig index 058e3f8..b758e2b 100644 --- a/configs/mx6sxsabresd_defconfig +++ b/configs/mx6sxsabresd_defconfig @@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_MX6SXSABRESD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,MX6SX" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/mx6sxsabresd_spl_defconfig b/configs/mx6sxsabresd_spl_defconfig index 0e3159e..cfd22e2 100644 --- a/configs/mx6sxsabresd_spl_defconfig +++ b/configs/mx6sxsabresd_spl_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_MX6SXSABRESD=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6SX" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig index ec0e346..c777261 100644 --- a/configs/nitrogen6dl2g_defconfig +++ b/configs/nitrogen6dl2g_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig index 838a43e..94058aa 100644 --- a/configs/nitrogen6dl_defconfig +++ b/configs/nitrogen6dl_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig index a739e22..b6243d2 100644 --- a/configs/nitrogen6q2g_defconfig +++ b/configs/nitrogen6q2g_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig index b4b0524..827ae1c 100644 --- a/configs/nitrogen6q_defconfig +++ b/configs/nitrogen6q_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig index 118f605..221d2cf 100644 --- a/configs/nitrogen6s1g_defconfig +++ b/configs/nitrogen6s1g_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig index 3e70de9..26339df 100644 --- a/configs/nitrogen6s_defconfig +++ b/configs/nitrogen6s_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_NITROGEN6X=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index ccc0055..2d8eaab 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -4,3 +4,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig index 20f64bb..693a7c2 100644 --- a/configs/ot1200_defconfig +++ b/configs/ot1200_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_OT1200=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig index 810dff8..be12cba 100644 --- a/configs/ot1200_spl_defconfig +++ b/configs/ot1200_spl_defconfig @@ -4,3 +4,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/platinum_picon_defconfig b/configs/platinum_picon_defconfig index 672ea28..06ed0bb 100644 --- a/configs/platinum_picon_defconfig +++ b/configs/platinum_picon_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_PLATINUM_PICON=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6DL" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/platinum_titanium_defconfig b/configs/platinum_titanium_defconfig index 39236f1..9fa33a2 100644 --- a/configs/platinum_titanium_defconfig +++ b/configs/platinum_titanium_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_PLATINUM_TITANIUM=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/secomx6quq7_defconfig b/configs/secomx6quq7_defconfig index f9d7ee9..c9bc064 100644 --- a/configs/secomx6quq7_defconfig +++ b/configs/secomx6quq7_defconfig @@ -7,3 +7,5 @@ CONFIG_SECOMX6_2GB=y CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tbs2910_defconfig b/configs/tbs2910_defconfig index 3e720a7..ed9c70f 100644 --- a/configs/tbs2910_defconfig +++ b/configs/tbs2910_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TBS2910=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig index 01355b6..7d6348b 100644 --- a/configs/tqma6q_mba6_mmc_defconfig +++ b/configs/tqma6q_mba6_mmc_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_MMC_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig index ba24663..c08adb4 100644 --- a/configs/tqma6q_mba6_spi_defconfig +++ b/configs/tqma6q_mba6_spi_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_SPI_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig index cbb4500..b09c8c1 100644 --- a/configs/tqma6s_mba6_mmc_defconfig +++ b/configs/tqma6s_mba6_mmc_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_MMC_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig index 805d8ab..50d9246 100644 --- a/configs/tqma6s_mba6_spi_defconfig +++ b/configs/tqma6s_mba6_spi_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_TQMA6=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_SPI_BOOT" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/udoo_quad_defconfig b/configs/udoo_quad_defconfig index 17f48c8..ebf2d9e 100644 --- a/configs/udoo_quad_defconfig +++ b/configs/udoo_quad_defconfig @@ -3,3 +3,5 @@ CONFIG_TARGET_UDOO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/udoo/udoo.cfg,MX6Q,DDR_MB=1024" CONFIG_CMD_SETEXPR=y CONFIG_CMD_NET=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/warp_defconfig b/configs/warp_defconfig index 24e1b9f..f43c66b 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -1,3 +1,5 @@ CONFIG_ARM=y CONFIG_TARGET_WARP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL" +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 85155f1..7b53df4 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -19,8 +19,6 @@ #define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) -#define CONFIG_IMX6_THERMAL - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 3d72832..b49c153 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -59,9 +59,6 @@ #define CONFIG_MXC_GPIO #define CONFIG_CMD_GPIO -/* Thermal */ -#define CONFIG_IMX6_THERMAL - /* Serial */ #define CONFIG_MXC_UART #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 2a0eb2a..dec4299 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -116,4 +116,6 @@ #define CONFIG_CMD_FUSE #define CONFIG_MXC_OCOTP +#define CONFIG_IMX6_THERMAL + #endif diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 634a09f..4eadfd8 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -14,8 +14,6 @@ #define CONFIG_SPL_MMC_SUPPORT #include "imx6_spl.h" -#define CONFIG_IMX6_THERMAL - #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_LATE_INIT diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 3ed4d23..ba95b08 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -11,8 +11,6 @@ #include "mx6_common.h" -#define CONFIG_IMX6_THERMAL - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
Update boards that already include it, add DM options for those that don't yet. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> --- configs/aristainetos2_defconfig | 2 ++ configs/aristainetos_defconfig | 2 ++ configs/cgtqmx6qeval_defconfig | 2 ++ configs/cm_fx6_defconfig | 2 ++ configs/gwventana_defconfig | 2 ++ configs/mx6dlarm2_defconfig | 2 ++ configs/mx6dlarm2_lpddr2_defconfig | 2 ++ configs/mx6dlsabreauto_defconfig | 2 ++ configs/mx6dlsabresd_defconfig | 2 ++ configs/mx6qarm2_defconfig | 2 ++ configs/mx6qarm2_lpddr2_defconfig | 2 ++ configs/mx6qsabreauto_defconfig | 2 ++ configs/mx6qsabresd_defconfig | 2 ++ configs/mx6sabresd_spl_defconfig | 2 ++ configs/mx6sxsabresd_defconfig | 2 ++ configs/mx6sxsabresd_spl_defconfig | 2 ++ configs/nitrogen6dl2g_defconfig | 2 ++ configs/nitrogen6dl_defconfig | 2 ++ configs/nitrogen6q2g_defconfig | 2 ++ configs/nitrogen6q_defconfig | 2 ++ configs/nitrogen6s1g_defconfig | 2 ++ configs/nitrogen6s_defconfig | 2 ++ configs/novena_defconfig | 2 ++ configs/ot1200_defconfig | 2 ++ configs/ot1200_spl_defconfig | 2 ++ configs/platinum_picon_defconfig | 2 ++ configs/platinum_titanium_defconfig | 2 ++ configs/secomx6quq7_defconfig | 2 ++ configs/tbs2910_defconfig | 2 ++ configs/tqma6q_mba6_mmc_defconfig | 2 ++ configs/tqma6q_mba6_spi_defconfig | 2 ++ configs/tqma6s_mba6_mmc_defconfig | 2 ++ configs/tqma6s_mba6_spi_defconfig | 2 ++ configs/udoo_quad_defconfig | 2 ++ configs/warp_defconfig | 2 ++ include/configs/embestmx6boards.h | 2 -- include/configs/gw_ventana.h | 3 --- include/configs/mx6_common.h | 2 ++ include/configs/mx6cuboxi.h | 2 -- include/configs/mx6sabre_common.h | 2 -- 40 files changed, 72 insertions(+), 9 deletions(-)