On Thu, Jun 11, 2020 at 9:09 PM Adam Ford aford173@gmail.com wrote:
On Thu, Jun 11, 2020 at 7:17 AM Tom Rini trini@konsulko.com wrote:
On Thu, Jun 11, 2020 at 05:38:15AM -0500, Adam Ford wrote:
On Wed, Jun 10, 2020 at 3:17 PM Tom Rini trini@konsulko.com wrote:
Due to how the Makefile logic is we currently get DM_SPI support in SPL enabled by having DM_SPI enabled for full U-Boot but not having CONFIG_SPL_DM_SPI set. Add this missing option to boards that were inadvertently making use of it.
Not knowing exactly which patches to apply to see the Makefile changes in question, I'm just doing a code review instead of the test.
Cc: Adam Ford aford173@gmail.com
[snip]
Acked-by: Adam Ford aford173@gmail.com #da850evm
Tested-by: Adam Ford aford173@gmail.com #da850evm
Signed-off-by: Tom Rini trini@konsulko.com
configs/da850evm_defconfig | 1 + configs/da850evm_nand_defconfig | 1 +
The da850evm_defconfig is setup to boot from SPI Flash, so that board will need it. Thank you.
The da850evm_nand_defconfig is set to boot from NAND via the NAND controller and not SPI, so it's probably not necessary, but I don't think it hurts anything. I may go through later and remove the CONFIG_SPL_DM_SPI from the nand version later.
[snip]
diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 1a6a97ed161a..12768065f3ab 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -12,6 +12,7 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y
Thank you, we'll need this.
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_NR_DRAM_BANKS=1 CONFIG_SPL=y diff --git a/configs/da850evm_nand_defconfig b/configs/da850evm_nand_defconfig index e805f2c10eda..13026fd1ea2c 100644 --- a/configs/da850evm_nand_defconfig +++ b/configs/da850evm_nand_defconfig @@ -11,6 +11,7 @@ CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x0 CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000 CONFIG_DM_GPIO=y +CONFIG_SPL_DM_SPI=y
I just sent a separate patch removing SPI from SPL from the nand defconfig since the system is booting from NAND to free up some space. I don't know how that plays into this patch for the nand version. If you need to apply your patch first, I can always rebase mine and re-submit later.
adam
If you do a V2 for some reason and don't want to add this here in the future, I wouldn't object. If not, I'll do some testing later with this removed.
This is similar to the socfpga case Marek pointed out. Today, the platforms are building with SPI support enabled and are implicitly getting SPL_DM_SPI enabled too http://patchwork.ozlabs.org/project/uboot/patch/20200610201634.8457-30-trini... is the Makefile patch but it's just dropping in to the DM or not-DM side based on SPL/TPL_DM and not just DM in main U-Boot.
-- Tom