diff mbox series

[1/2] include: env: ti: mmc.h: Find DTB files in dtb directory for AM57xx

Message ID 20250425053431.1622267-2-a-dutta@ti.com
State Changes Requested
Delegated to: Tom Rini
Headers show
Series AM57 Boot fixes | expand

Commit Message

Anurag Dutta April 25, 2025, 5:34 a.m. UTC
Add dtb/ to the DTB search path.

Signed-off-by: Anurag Dutta <a-dutta@ti.com>
---
 include/env/ti/mmc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Neha Malcom Francis April 25, 2025, 6:49 a.m. UTC | #1
Hi Anurag

On 25/04/25 11:04, Anurag Dutta wrote:
> Add dtb/ to the DTB search path.
> 
> Signed-off-by: Anurag Dutta <a-dutta@ti.com>
> ---
>  include/env/ti/mmc.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/env/ti/mmc.h b/include/env/ti/mmc.h
> index dbb0e3559ea..968d6ec03dc 100644
> --- a/include/env/ti/mmc.h
> +++ b/include/env/ti/mmc.h
> @@ -24,7 +24,7 @@
>  		"env import -t ${loadaddr} ${filesize}\0" \
>  	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}\0" \
>  	"loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
> -	"loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
> +	"loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/dtb/${fdtfile}\0" \
>  	"envboot=mmc dev ${mmcdev}; " \
>  		"if mmc rescan; then " \
>  			"echo SD/MMC found on device ${mmcdev};" \

Are there any other boards that use .h instead of .env other than AM57x?
Would they break with this change?
Kumar, Udit April 26, 2025, 2:30 a.m. UTC | #2
On 4/25/2025 12:19 PM, Neha Malcom Francis wrote:
> Hi Anurag
>
> On 25/04/25 11:04, Anurag Dutta wrote:
>> Add dtb/ to the DTB search path.
>>
>> Signed-off-by: Anurag Dutta <a-dutta@ti.com>
>> ---
>>   include/env/ti/mmc.h | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/include/env/ti/mmc.h b/include/env/ti/mmc.h
>> index dbb0e3559ea..968d6ec03dc 100644
>> --- a/include/env/ti/mmc.h
>> +++ b/include/env/ti/mmc.h
>> @@ -24,7 +24,7 @@
>>   		"env import -t ${loadaddr} ${filesize}\0" \
>>   	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}\0" \
>>   	"loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
>> -	"loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
>> +	"loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/dtb/${fdtfile}\0" \
>>   	"envboot=mmc dev ${mmcdev}; " \
>>   		"if mmc rescan; then " \
>>   			"echo SD/MMC found on device ${mmcdev};" \
> Are there any other boards that use .h instead of .env other than AM57x?
> Would they break with this change?

Yes there are few

include/configs/am62ax_evm.h:#include <env/ti/mmc.h>
include/configs/am65x_evm.h:#include <env/ti/mmc.h>
include/configs/da850evm.h:#include <env/ti/mmc.h>
include/configs/omap3_evm.h:#include <env/ti/mmc.h>
include/configs/omapl138_lcdk.h:#include <env/ti/mmc.h>
include/configs/phycore_am335x_r2.h:#include <env/ti/mmc.h>
include/configs/ti_omap4_common.h:#include <env/ti/mmc.h>
include/configs/ti_omap5_common.h:#include <env/ti/mmc.h>

One way, I see append dtb in search path in patch 2/2 
ti_omap_am57_evm_fdt_map

>
Tom Rini April 28, 2025, 10:50 p.m. UTC | #3
On Sat, Apr 26, 2025 at 08:00:44AM +0530, Kumar, Udit wrote:
> 
> On 4/25/2025 12:19 PM, Neha Malcom Francis wrote:
> > Hi Anurag
> > 
> > On 25/04/25 11:04, Anurag Dutta wrote:
> > > Add dtb/ to the DTB search path.
> > > 
> > > Signed-off-by: Anurag Dutta <a-dutta@ti.com>
> > > ---
> > >   include/env/ti/mmc.h | 2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/include/env/ti/mmc.h b/include/env/ti/mmc.h
> > > index dbb0e3559ea..968d6ec03dc 100644
> > > --- a/include/env/ti/mmc.h
> > > +++ b/include/env/ti/mmc.h
> > > @@ -24,7 +24,7 @@
> > >   		"env import -t ${loadaddr} ${filesize}\0" \
> > >   	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}\0" \
> > >   	"loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
> > > -	"loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
> > > +	"loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/dtb/${fdtfile}\0" \
> > >   	"envboot=mmc dev ${mmcdev}; " \
> > >   		"if mmc rescan; then " \
> > >   			"echo SD/MMC found on device ${mmcdev};" \
> > Are there any other boards that use .h instead of .env other than AM57x?
> > Would they break with this change?
> 
> Yes there are few
> 
> include/configs/am62ax_evm.h:#include <env/ti/mmc.h>
> include/configs/am65x_evm.h:#include <env/ti/mmc.h>
> include/configs/da850evm.h:#include <env/ti/mmc.h>
> include/configs/omap3_evm.h:#include <env/ti/mmc.h>
> include/configs/omapl138_lcdk.h:#include <env/ti/mmc.h>
> include/configs/phycore_am335x_r2.h:#include <env/ti/mmc.h>
> include/configs/ti_omap4_common.h:#include <env/ti/mmc.h>
> include/configs/ti_omap5_common.h:#include <env/ti/mmc.h>
> 
> One way, I see append dtb in search path in patch 2/2
> ti_omap_am57_evm_fdt_map

We need to get these converted to plain text environment please, thanks.
diff mbox series

Patch

diff --git a/include/env/ti/mmc.h b/include/env/ti/mmc.h
index dbb0e3559ea..968d6ec03dc 100644
--- a/include/env/ti/mmc.h
+++ b/include/env/ti/mmc.h
@@ -24,7 +24,7 @@ 
 		"env import -t ${loadaddr} ${filesize}\0" \
 	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenvfile}\0" \
 	"loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-	"loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
+	"loadfdt=load ${devtype} ${bootpart} ${fdtaddr} ${bootdir}/dtb/${fdtfile}\0" \
 	"envboot=mmc dev ${mmcdev}; " \
 		"if mmc rescan; then " \
 			"echo SD/MMC found on device ${mmcdev};" \