Message ID | 20170209040012.20324-5-lokeshvutla@ti.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show |
On Thu, Feb 09, 2017 at 09:30:11AM +0530, Lokesh Vutla wrote: > Enable SPL_DM on all AM57xx based platforms. > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> > --- > configs/am57xx_evm_defconfig | 7 +++++-- > configs/am57xx_hs_evm_defconfig | 5 ++++- > include/configs/am57xx_evm.h | 5 ----- > 3 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig > index e804b02c1e..50717ba65c 100644 > --- a/configs/am57xx_evm_defconfig > +++ b/configs/am57xx_evm_defconfig > @@ -6,7 +6,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y > CONFIG_SPL_SPI_SUPPORT=y > CONFIG_ARMV7_LPAE=y > CONFIG_SPL_STACK_R_ADDR=0x82000000 > -CONFIG_DEFAULT_DEVICE_TREE="am57xx-beagle-x15" > +CONFIG_DEFAULT_DEVICE_TREE="am572x-idk" Did you really want to change the default tree?
On Friday 10 February 2017 09:00 AM, Tom Rini wrote: > On Thu, Feb 09, 2017 at 09:30:11AM +0530, Lokesh Vutla wrote: > >> Enable SPL_DM on all AM57xx based platforms. >> >> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> >> --- >> configs/am57xx_evm_defconfig | 7 +++++-- >> configs/am57xx_hs_evm_defconfig | 5 ++++- >> include/configs/am57xx_evm.h | 5 ----- >> 3 files changed, 9 insertions(+), 8 deletions(-) >> >> diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig >> index e804b02c1e..50717ba65c 100644 >> --- a/configs/am57xx_evm_defconfig >> +++ b/configs/am57xx_evm_defconfig >> @@ -6,7 +6,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y >> CONFIG_SPL_SPI_SUPPORT=y >> CONFIG_ARMV7_LPAE=y >> CONFIG_SPL_STACK_R_ADDR=0x82000000 >> -CONFIG_DEFAULT_DEVICE_TREE="am57xx-beagle-x15" >> +CONFIG_DEFAULT_DEVICE_TREE="am572x-idk" > > Did you really want to change the default tree? Yeah, I make this as default as it contains peripherals for all boot modes. Thanks and regards, Lokesh
On Fri, Feb 10, 2017 at 05:21:18PM +0530, Lokesh Vutla wrote: > > > On Friday 10 February 2017 09:00 AM, Tom Rini wrote: > > On Thu, Feb 09, 2017 at 09:30:11AM +0530, Lokesh Vutla wrote: > > > >> Enable SPL_DM on all AM57xx based platforms. > >> > >> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> > >> --- > >> configs/am57xx_evm_defconfig | 7 +++++-- > >> configs/am57xx_hs_evm_defconfig | 5 ++++- > >> include/configs/am57xx_evm.h | 5 ----- > >> 3 files changed, 9 insertions(+), 8 deletions(-) > >> > >> diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig > >> index e804b02c1e..50717ba65c 100644 > >> --- a/configs/am57xx_evm_defconfig > >> +++ b/configs/am57xx_evm_defconfig > >> @@ -6,7 +6,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y > >> CONFIG_SPL_SPI_SUPPORT=y > >> CONFIG_ARMV7_LPAE=y > >> CONFIG_SPL_STACK_R_ADDR=0x82000000 > >> -CONFIG_DEFAULT_DEVICE_TREE="am57xx-beagle-x15" > >> +CONFIG_DEFAULT_DEVICE_TREE="am572x-idk" > > > > Did you really want to change the default tree? > > Yeah, I make this as default as it contains peripherals for all boot modes. OK, thanks. Reviewed-by: Tom Rini <trini@konsulko.com>
diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index e804b02c1e..50717ba65c 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -6,7 +6,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_ARMV7_LPAE=y CONFIG_SPL_STACK_R_ADDR=0x82000000 -CONFIG_DEFAULT_DEVICE_TREE="am57xx-beagle-x15" +CONFIG_DEFAULT_DEVICE_TREE="am572x-idk" CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y CONFIG_OF_BOARD_SETUP=y @@ -14,7 +14,9 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y @@ -52,8 +54,10 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIST="am57xx-beagle-x15 am57xx-beagle-x15-revb1 am572x-idk am571x-idk" CONFIG_DM=y +CONFIG_SPL_DM=y # CONFIG_BLK is not set CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y @@ -87,4 +91,3 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 -CONFIG_SPL_OF_LIBFDT=y diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index 7e84ccddf3..be84f06cee 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -19,7 +19,9 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_STACK_R=y +CONFIG_SPL_SEPARATE_BSS=y CONFIG_SPL_DMA_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_FASTBOOT=y @@ -55,7 +57,9 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ISO_PARTITION=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_DM=y +CONFIG_SPL_DM=y # CONFIG_BLK is not set CONFIG_DFU_MMC=y CONFIG_DFU_RAM=y @@ -85,4 +89,3 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 -CONFIG_SPL_OF_LIBFDT=y diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 3d8b996054..9883c9545a 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -121,11 +121,6 @@ #define CONFIG_SYS_SPI_ARGS_OFFS 0x140000 #define CONFIG_SYS_SPI_ARGS_SIZE 0x80000 -#ifdef CONFIG_SPL_BUILD -#undef CONFIG_DM_SPI -#undef CONFIG_DM_SPI_FLASH -#endif - /* SPI SPL */ #define CONFIG_TI_EDMA3 #define CONFIG_SPL_SPI_LOAD
Enable SPL_DM on all AM57xx based platforms. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- configs/am57xx_evm_defconfig | 7 +++++-- configs/am57xx_hs_evm_defconfig | 5 ++++- include/configs/am57xx_evm.h | 5 ----- 3 files changed, 9 insertions(+), 8 deletions(-)