| Message ID | 20180814020917.22882-1-aford173@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] ARM: da850evm_direct_nor_defconfig: Enable DM_SERIAL | expand |
On Mon, Aug 13, 2018 at 09:09:17PM -0500, Adam Ford wrote: > With DM enabled, this patch enables DM_SERIAL and removes > the NS16550 initialization from da850_lowlevel since the driver > will take care of that itself. > > Signed-off-by: Adam Ford <aford173@gmail.com> > > diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c > index 95dc93a24f..8ceb1779f9 100644 Applied to u-boot/master, but then reverted as it turns out to not build currently. Did I miss some other required patches? Thanks!
On Tue, Sep 18, 2018 at 4:23 PM Tom Rini <trini@konsulko.com> wrote: > > On Mon, Aug 13, 2018 at 09:09:17PM -0500, Adam Ford wrote: > > > With DM enabled, this patch enables DM_SERIAL and removes > > the NS16550 initialization from da850_lowlevel since the driver > > will take care of that itself. > > > > Signed-off-by: Adam Ford <aford173@gmail.com> > > > > diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c > > index 95dc93a24f..8ceb1779f9 100644 > > Applied to u-boot/master, but then reverted as it turns out to not build > currently. Did I miss some other required patches? Thanks! I must have missed a patch somewhere or something in Master changed between now and when I submitted the patch. Either way, I just submitted a V2 which had to enable CONFIG_SYS_MALLOC_F. That seemed to fix the build issue, but I also tweaked the patch a bit to be a bit more flexible in SPL. adam > > -- > Tom
diff --git a/arch/arm/mach-davinci/da850_lowlevel.c b/arch/arm/mach-davinci/da850_lowlevel.c index 95dc93a24f..8ceb1779f9 100644 --- a/arch/arm/mach-davinci/da850_lowlevel.c +++ b/arch/arm/mach-davinci/da850_lowlevel.c @@ -288,10 +288,10 @@ int arch_cpu_init(void) /* GPIO setup */ board_gpio_init(); - +#if !defined(CONFIG_DM_SERIAL) NS16550_init((NS16550_t)(CONFIG_SYS_NS16550_COM1), CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE); - +#endif /* * Fix Power and Emulation Management Register * see sprufw3a.pdf page 37 Table 24 diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index bb8fa3bd6e..baadd01c2c 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -5,7 +5,6 @@ CONFIG_TARGET_DA850EVM=y CONFIG_DA850_LOWLEVEL=y CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_DEFAULT_DEVICE_TREE="da850-evm" -# CONFIG_SYS_MALLOC_F is not set CONFIG_SYS_EXTRA_OPTIONS="USE_NOR,DIRECT_NOR_BOOT" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y @@ -45,6 +44,8 @@ CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPECIFY_CONSOLE_INDEX=y +CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_DM_SPI=y
With DM enabled, this patch enables DM_SERIAL and removes the NS16550 initialization from da850_lowlevel since the driver will take care of that itself. Signed-off-by: Adam Ford <aford173@gmail.com>