| Message ID | 20170207230258.23776-1-afd@ti.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
Ping? On 02/07/2017 05:02 PM, 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> > --- > configs/am43xx_hs_evm_defconfig | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig > index 8bb1b3535a..05365ee61a 100644 > --- a/configs/am43xx_hs_evm_defconfig > +++ b/configs/am43xx_hs_evm_defconfig > @@ -10,12 +10,15 @@ 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_HUSH_PARSER=y > CONFIG_CMD_BOOTZ=y > # CONFIG_CMD_IMLS is not set > @@ -41,6 +44,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 +57,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 Fri, Apr 07, 2017 at 08:21:38AM -0500, Andrew F. Davis wrote: > Ping? Been waiting for a v2 of this, I'd assume it doesn't apply cleanly and/or needs further additions. > > On 02/07/2017 05:02 PM, 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> > > --- > > configs/am43xx_hs_evm_defconfig | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig > > index 8bb1b3535a..05365ee61a 100644 > > --- a/configs/am43xx_hs_evm_defconfig > > +++ b/configs/am43xx_hs_evm_defconfig > > @@ -10,12 +10,15 @@ 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_HUSH_PARSER=y > > CONFIG_CMD_BOOTZ=y > > # CONFIG_CMD_IMLS is not set > > @@ -41,6 +44,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 +57,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 04/07/2017 08:23 AM, Tom Rini wrote: > On Fri, Apr 07, 2017 at 08:21:38AM -0500, Andrew F. Davis wrote: > >> Ping? > > Been waiting for a v2 of this, I'd assume it doesn't apply cleanly > and/or needs further additions. > It applied just fine 2 months ago when posted, why would you wait for a v2? I have about 5 other patches-sets pending like this, would you like me to v2 them all? >> >> On 02/07/2017 05:02 PM, 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> >>> --- >>> configs/am43xx_hs_evm_defconfig | 8 ++++++-- >>> 1 file changed, 6 insertions(+), 2 deletions(-) >>> >>> diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig >>> index 8bb1b3535a..05365ee61a 100644 >>> --- a/configs/am43xx_hs_evm_defconfig >>> +++ b/configs/am43xx_hs_evm_defconfig >>> @@ -10,12 +10,15 @@ 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_HUSH_PARSER=y >>> CONFIG_CMD_BOOTZ=y >>> # CONFIG_CMD_IMLS is not set >>> @@ -41,6 +44,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 +57,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 Fri, Apr 07, 2017 at 08:31:20AM -0500, Andrew F. Davis wrote: > On 04/07/2017 08:23 AM, Tom Rini wrote: > > On Fri, Apr 07, 2017 at 08:21:38AM -0500, Andrew F. Davis wrote: > > > >> Ping? > > > > Been waiting for a v2 of this, I'd assume it doesn't apply cleanly > > and/or needs further additions. > > It applied just fine 2 months ago when posted, why would you wait for a v2? It did? Sorry, this didn't get applied because either I got confused with some other series or something else happened. > I have about 5 other patches-sets pending like this, would you like me > to v2 them all? Yes, please. > > >> > >> On 02/07/2017 05:02 PM, 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> > >>> --- > >>> configs/am43xx_hs_evm_defconfig | 8 ++++++-- > >>> 1 file changed, 6 insertions(+), 2 deletions(-) > >>> > >>> diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig > >>> index 8bb1b3535a..05365ee61a 100644 > >>> --- a/configs/am43xx_hs_evm_defconfig > >>> +++ b/configs/am43xx_hs_evm_defconfig > >>> @@ -10,12 +10,15 @@ 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_HUSH_PARSER=y > >>> CONFIG_CMD_BOOTZ=y > >>> # CONFIG_CMD_IMLS is not set > >>> @@ -41,6 +44,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 +57,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 > >>> > >
diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index 8bb1b3535a..05365ee61a 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -10,12 +10,15 @@ 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_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set @@ -41,6 +44,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 +57,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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)