| Message ID | 20170208203249.15204-1-afd@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
On Thursday 09 February 2017 02:02 AM, Andrew F. Davis wrote: > The non-HS defconfig has been modified without equivalent changes being > applied to the HS defconfig. Sync these here. > > Signed-off-by: Andrew F. Davis <afd@ti.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com> I am sure we might encounter this problem again after some time :( Thanks and regards, Lokesh > --- > configs/am43xx_hs_evm_defconfig | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig > index 8bb1b3535a..6bcbfd77ed 100644 > --- a/configs/am43xx_hs_evm_defconfig > +++ b/configs/am43xx_hs_evm_defconfig > @@ -10,12 +10,19 @@ CONFIG_FIT=y > CONFIG_FIT_IMAGE_POST_PROCESS=y > CONFIG_SPL_LOAD_FIT=y > CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y > -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1, NAND" > +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND" > CONFIG_SYS_CONSOLE_INFO_QUIET=y > CONFIG_VERSION_VARIABLE=y > CONFIG_SPL=y > CONFIG_SPL_STACK_R=y > +CONFIG_SPL_ETH_SUPPORT=y > CONFIG_SPL_MTD_SUPPORT=y > +CONFIG_SPL_NET_SUPPORT=y > +CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" > +CONFIG_SPL_USB_HOST_SUPPORT=y > +CONFIG_SPL_USB_SUPPORT=y > +CONFIG_SPL_USB_GADGET_SUPPORT=y > +CONFIG_SPL_USBETH_SUPPORT=y > CONFIG_HUSH_PARSER=y > CONFIG_CMD_BOOTZ=y > # CONFIG_CMD_IMLS is not set > @@ -41,6 +48,7 @@ CONFIG_CMD_FAT=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_ISO_PARTITION=y > CONFIG_OF_CONTROL=y > +CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm" > CONFIG_DM=y > # CONFIG_BLK is not set > CONFIG_DFU_MMC=y > @@ -53,8 +61,8 @@ CONFIG_DM_MMC=y > CONFIG_MMC_OMAP_HS=y > CONFIG_DM_SPI_FLASH=y > CONFIG_SPI_FLASH=y > +CONFIG_SPI_FLASH_BAR=y > CONFIG_SPI_FLASH_MACRONIX=y > -CONFIG_DM_ETH=y > CONFIG_DM_SERIAL=y > CONFIG_SYS_NS16550=y > CONFIG_DM_SPI=y >
On Thu, Feb 09, 2017 at 09:45:26AM +0530, Lokesh Vutla wrote: > > > On Thursday 09 February 2017 02:02 AM, Andrew F. Davis wrote: > > The non-HS defconfig has been modified without equivalent changes being > > applied to the HS defconfig. Sync these here. > > > > Signed-off-by: Andrew F. Davis <afd@ti.com> > > Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com> > > I am sure we might encounter this problem again after some time :( Well, the good news is I think we can do something about this soon now. In the kernel we now have: commit 237e3ad0f195d8fd34f1299e45f04793832a16fc Author: Nicolas Pitre <nicolas.pitre@linaro.org> Date: Fri Nov 11 00:10:05 2016 -0500 Kconfig: Introduce the "imply" keyword And cherry-picking this, and maybe the preceding commit will let us move lots of these logic into arch/arm/Kconfig where we can imply lots of features that an SoC has but still allow them to be turned off.
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 8bb1b3535a..6bcbfd77ed 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -10,12 +10,19 @@ CONFIG_FIT=y CONFIG_FIT_IMAGE_POST_PROCESS=y CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1, NAND" +CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1,NAND" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_ETH_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_NET_SUPPORT=y +CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" +CONFIG_SPL_USB_HOST_SUPPORT=y +CONFIG_SPL_USB_SUPPORT=y +CONFIG_SPL_USB_GADGET_SUPPORT=y +CONFIG_SPL_USBETH_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set @@ -41,6 +48,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y +CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm" CONFIG_DM=y # CONFIG_BLK is not set CONFIG_DFU_MMC=y @@ -53,8 +61,8 @@ CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_DM_ETH=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y
The non-HS defconfig has been modified without equivalent changes being applied to the HS defconfig. Sync these here. Signed-off-by: Andrew F. Davis <afd@ti.com> --- configs/am43xx_hs_evm_defconfig | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)