diff mbox series

[U-Boot,V2,2/5] pico-imx7d: defconfig: Add DT file hooks

Message ID 1554379256-24701-3-git-send-email-offougajoris@gmail.com
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show
Series Convert Pico i.MX7 to DM | expand

Commit Message

Joris OFFOUGA April 4, 2019, noon UTC
This patch adds DT file hooks for Pico i.MX7D SOM and variant boards

Signed-off-by: Joris Offouga <offougajoris@gmail.com>
---
 configs/pico-hobbit-imx7d_defconfig | 3 ++-
 configs/pico-imx7d_defconfig        | 3 ++-
 configs/pico-pi-imx7d_defconfig     | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

Comments

Stefano Babic April 25, 2019, 9 a.m. UTC | #1
On 04/04/19 14:00, Joris Offouga wrote:
> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
> 
> Signed-off-by: Joris Offouga <offougajoris@gmail.com>
> ---
>  configs/pico-hobbit-imx7d_defconfig | 3 ++-
>  configs/pico-imx7d_defconfig        | 3 ++-
>  configs/pico-pi-imx7d_defconfig     | 3 ++-
>  3 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig
> index f58d517..75eab28 100644
> --- a/configs/pico-hobbit-imx7d_defconfig
> +++ b/configs/pico-hobbit-imx7d_defconfig
> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
>  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
> +CONFIG_OF_CONTROL=y
> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
                                          ^---  two much "o"

I fix this myself by merging.


Best regards,
Stefano Babic
Joris OFFOUGA April 25, 2019, 9:09 a.m. UTC | #2
Le jeu. 25 avr. 2019 à 11:00, Stefano Babic <sbabic@denx.de> a écrit :

> On 04/04/19 14:00, Joris Offouga wrote:
> > This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
> >
> > Signed-off-by: Joris Offouga <offougajoris@gmail.com>
> > ---
> >  configs/pico-hobbit-imx7d_defconfig | 3 ++-
> >  configs/pico-imx7d_defconfig        | 3 ++-
> >  configs/pico-pi-imx7d_defconfig     | 3 ++-
> >  3 files changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/configs/pico-hobbit-imx7d_defconfig
> b/configs/pico-hobbit-imx7d_defconfig
> > index f58d517..75eab28 100644
> > --- a/configs/pico-hobbit-imx7d_defconfig
> > +++ b/configs/pico-hobbit-imx7d_defconfig
> > @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
> >  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
> >  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
> >  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
> > +CONFIG_OF_CONTROL=y
> > +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
>                                           ^---  two much "o"
>
> I fix this myself by merging.
>
Thanks

>
>
> Best regards,
> Stefano Babic


> --
> =====================================================================
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
> =====================================================================
>
Stefano Babic April 25, 2019, 9:12 a.m. UTC | #3
On 25/04/19 11:00, Stefano Babic wrote:
> On 04/04/19 14:00, Joris Offouga wrote:
>> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
>>
>> Signed-off-by: Joris Offouga <offougajoris@gmail.com>
>> ---
>>  configs/pico-hobbit-imx7d_defconfig | 3 ++-
>>  configs/pico-imx7d_defconfig        | 3 ++-
>>  configs/pico-pi-imx7d_defconfig     | 3 ++-
>>  3 files changed, 6 insertions(+), 3 deletions(-)
>>
>> diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig
>> index f58d517..75eab28 100644
>> --- a/configs/pico-hobbit-imx7d_defconfig
>> +++ b/configs/pico-hobbit-imx7d_defconfig
>> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
>>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>>  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
>>  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
>> +CONFIG_OF_CONTROL=y
>> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
>                                           ^---  two much "o"
> 
> I fix this myself by merging.
> 
> 

However, this fix pico-hobbit-imx7d, but not pico-imx7d. In fact, there
is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I
missing something ?

Best regards,
Stefano Babic
Joris OFFOUGA April 25, 2019, 9:18 a.m. UTC | #4
Le jeu. 25 avr. 2019 à 11:12, Stefano Babic <sbabic@denx.de> a écrit :

> On 25/04/19 11:00, Stefano Babic wrote:
> > On 04/04/19 14:00, Joris Offouga wrote:
> >> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
> >>
> >> Signed-off-by: Joris Offouga <offougajoris@gmail.com>
> >> ---
> >>  configs/pico-hobbit-imx7d_defconfig | 3 ++-
> >>  configs/pico-imx7d_defconfig        | 3 ++-
> >>  configs/pico-pi-imx7d_defconfig     | 3 ++-
> >>  3 files changed, 6 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/configs/pico-hobbit-imx7d_defconfig
> b/configs/pico-hobbit-imx7d_defconfig
> >> index f58d517..75eab28 100644
> >> --- a/configs/pico-hobbit-imx7d_defconfig
> >> +++ b/configs/pico-hobbit-imx7d_defconfig
> >> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
> >>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
> >>  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
> >>  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
> >> +CONFIG_OF_CONTROL=y
> >> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
> >                                           ^---  two much "o"
> >
> > I fix this myself by merging.
> >
> >
>
> However, this fix pico-hobbit-imx7d, but not pico-imx7d. In fact, there
> is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I
> missing something ?
>
No it's just som he does not need to CONFIG_DEFAULT_DEVICE_TREE
Best regards,
Joris Offouga

>
> Best regards,
> Stefano Babic
>
>
> --
> =====================================================================
> DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
> =====================================================================
>
Stefano Babic April 25, 2019, 9:26 a.m. UTC | #5
On 25/04/19 11:18, Joris OFFOUGA wrote:
> 
> 
> Le jeu. 25 avr. 2019 à 11:12, Stefano Babic <sbabic@denx.de
> <mailto:sbabic@denx.de>> a écrit :
> 
>     On 25/04/19 11:00, Stefano Babic wrote:
>     > On 04/04/19 14:00, Joris Offouga wrote:
>     >> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
>     >>
>     >> Signed-off-by: Joris Offouga <offougajoris@gmail.com
>     <mailto:offougajoris@gmail.com>>
>     >> ---
>     >>  configs/pico-hobbit-imx7d_defconfig | 3 ++-
>     >>  configs/pico-imx7d_defconfig        | 3 ++-
>     >>  configs/pico-pi-imx7d_defconfig     | 3 ++-
>     >>  3 files changed, 6 insertions(+), 3 deletions(-)
>     >>
>     >> diff --git a/configs/pico-hobbit-imx7d_defconfig
>     b/configs/pico-hobbit-imx7d_defconfig
>     >> index f58d517..75eab28 100644
>     >> --- a/configs/pico-hobbit-imx7d_defconfig
>     >> +++ b/configs/pico-hobbit-imx7d_defconfig
>     >> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
>     >>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>     >>  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
>     >>  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
>     >> +CONFIG_OF_CONTROL=y
>     >> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
>     >                                           ^---  two much "o"
>     >
>     > I fix this myself by merging.
>     >
>     >
> 
>     However, this fix pico-hobbit-imx7d, but not pico-imx7d. In fact, there
>     is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I
>     missing something ?
> 
> No it's just som he does not need to CONFIG_DEFAULT_DEVICE_TREE
> Best regards,

I suppose this, but then something in the build is broken, If I run
buildman, a pico-imx7d board is searched. In fact, there is a
configs/pico-imx7d_defconfig. If this is just SOM, this file has no
reason to exist.

Best regards,
Stefano Babic
Joris OFFOUGA April 25, 2019, 9:57 a.m. UTC | #6
Le 25/04/2019 à 11:26, Stefano Babic a écrit :
> On 25/04/19 11:18, Joris OFFOUGA wrote:
>>
>> Le jeu. 25 avr. 2019 à 11:12, Stefano Babic <sbabic@denx.de
>> <mailto:sbabic@denx.de>> a écrit :
>>
>>      On 25/04/19 11:00, Stefano Babic wrote:
>>      > On 04/04/19 14:00, Joris Offouga wrote:
>>      >> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
>>      >>
>>      >> Signed-off-by: Joris Offouga <offougajoris@gmail.com
>>      <mailto:offougajoris@gmail.com>>
>>      >> ---
>>      >>  configs/pico-hobbit-imx7d_defconfig | 3 ++-
>>      >>  configs/pico-imx7d_defconfig        | 3 ++-
>>      >>  configs/pico-pi-imx7d_defconfig     | 3 ++-
>>      >>  3 files changed, 6 insertions(+), 3 deletions(-)
>>      >>
>>      >> diff --git a/configs/pico-hobbit-imx7d_defconfig
>>      b/configs/pico-hobbit-imx7d_defconfig
>>      >> index f58d517..75eab28 100644
>>      >> --- a/configs/pico-hobbit-imx7d_defconfig
>>      >> +++ b/configs/pico-hobbit-imx7d_defconfig
>>      >> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
>>      >>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>>      >>  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
>>      >>  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
>>      >> +CONFIG_OF_CONTROL=y
>>      >> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
>>      >                                           ^---  two much "o"
>>      >
>>      > I fix this myself by merging.
>>      >
>>      >
>>
>>      However, this fix pico-hobbit-imx7d, but not pico-imx7d. In fact, there
>>      is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I
>>      missing something ?
>>
>> No it's just som he does not need to CONFIG_DEFAULT_DEVICE_TREE
>> Best regards,
> I suppose this, but then something in the build is broken, If I run
> buildman, a pico-imx7d board is searched. In fact, there is a
> configs/pico-imx7d_defconfig. If this is just SOM, this file has no
> reason to exist.

For pico_imx7d_defconfig, i set 
CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi.dtb"

You have to ask Fabio and Otavio I did not grow on it when I did the dm 
conversion, they asked me to convert everything even som

Best Regards,

Joris Offouga

> Best regards,
> Stefano Babic
>
>
Stefano Babic April 25, 2019, 10:28 a.m. UTC | #7
On 25/04/19 11:57, Joris Offouga wrote:
> 
> Le 25/04/2019 à 11:26, Stefano Babic a écrit :
>> On 25/04/19 11:18, Joris OFFOUGA wrote:
>>>
>>> Le jeu. 25 avr. 2019 à 11:12, Stefano Babic <sbabic@denx.de
>>> <mailto:sbabic@denx.de>> a écrit :
>>>
>>>      On 25/04/19 11:00, Stefano Babic wrote:
>>>      > On 04/04/19 14:00, Joris Offouga wrote:
>>>      >> This patch adds DT file hooks for Pico i.MX7D SOM and variant
>>> boards
>>>      >>
>>>      >> Signed-off-by: Joris Offouga <offougajoris@gmail.com
>>>      <mailto:offougajoris@gmail.com>>
>>>      >> ---
>>>      >>  configs/pico-hobbit-imx7d_defconfig | 3 ++-
>>>      >>  configs/pico-imx7d_defconfig        | 3 ++-
>>>      >>  configs/pico-pi-imx7d_defconfig     | 3 ++-
>>>      >>  3 files changed, 6 insertions(+), 3 deletions(-)
>>>      >>
>>>      >> diff --git a/configs/pico-hobbit-imx7d_defconfig
>>>      b/configs/pico-hobbit-imx7d_defconfig
>>>      >> index f58d517..75eab28 100644
>>>      >> --- a/configs/pico-hobbit-imx7d_defconfig
>>>      >> +++ b/configs/pico-hobbit-imx7d_defconfig
>>>      >> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
>>>      >> 
>>> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>>>      >>  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run
>>> distro_bootcmd"
>>>      >>  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
>>>      >> +CONFIG_OF_CONTROL=y
>>>      >> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
>>>      >                                           ^---  two much "o"
>>>      >
>>>      > I fix this myself by merging.
>>>      >
>>>      >
>>>
>>>      However, this fix pico-hobbit-imx7d, but not pico-imx7d. In
>>> fact, there
>>>      is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I
>>>      missing something ?
>>>
>>> No it's just som he does not need to CONFIG_DEFAULT_DEVICE_TREE
>>> Best regards,
>> I suppose this, but then something in the build is broken, If I run
>> buildman, a pico-imx7d board is searched. In fact, there is a
>> configs/pico-imx7d_defconfig. If this is just SOM, this file has no
>> reason to exist.
> 
> For pico_imx7d_defconfig, i set
> CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi.dtb"
> 

This is not what I see in your patch
http://patchwork.ozlabs.org/patch/1077223/:

+CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico"

I fix myself in the defconfig.

> You have to ask Fabio and Otavio I did not grow on it when I did the dm
> conversion, they asked me to convert everything even som

Just SOM it is quite weird if there is not an evaluation board to
support it. Anyway, I fix the name, thanks.

Best regards,
Stefano Babic
Joris OFFOUGA April 25, 2019, 10:35 a.m. UTC | #8
Le 25/04/2019 à 12:28, Stefano Babic a écrit :
> On 25/04/19 11:57, Joris Offouga wrote:
>> Le 25/04/2019 à 11:26, Stefano Babic a écrit :
>>> On 25/04/19 11:18, Joris OFFOUGA wrote:
>>>> Le jeu. 25 avr. 2019 à 11:12, Stefano Babic <sbabic@denx.de
>>>> <mailto:sbabic@denx.de>> a écrit :
>>>>
>>>>       On 25/04/19 11:00, Stefano Babic wrote:
>>>>       > On 04/04/19 14:00, Joris Offouga wrote:
>>>>       >> This patch adds DT file hooks for Pico i.MX7D SOM and variant
>>>> boards
>>>>       >>
>>>>       >> Signed-off-by: Joris Offouga <offougajoris@gmail.com
>>>>       <mailto:offougajoris@gmail.com>>
>>>>       >> ---
>>>>       >>  configs/pico-hobbit-imx7d_defconfig | 3 ++-
>>>>       >>  configs/pico-imx7d_defconfig        | 3 ++-
>>>>       >>  configs/pico-pi-imx7d_defconfig     | 3 ++-
>>>>       >>  3 files changed, 6 insertions(+), 3 deletions(-)
>>>>       >>
>>>>       >> diff --git a/configs/pico-hobbit-imx7d_defconfig
>>>>       b/configs/pico-hobbit-imx7d_defconfig
>>>>       >> index f58d517..75eab28 100644
>>>>       >> --- a/configs/pico-hobbit-imx7d_defconfig
>>>>       >> +++ b/configs/pico-hobbit-imx7d_defconfig
>>>>       >> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
>>>>       >>
>>>> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>>>>       >>  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run
>>>> distro_bootcmd"
>>>>       >>  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
>>>>       >> +CONFIG_OF_CONTROL=y
>>>>       >> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
>>>>       >                                           ^---  two much "o"
>>>>       >
>>>>       > I fix this myself by merging.
>>>>       >
>>>>       >
>>>>
>>>>       However, this fix pico-hobbit-imx7d, but not pico-imx7d. In
>>>> fact, there
>>>>       is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I
>>>>       missing something ?
>>>>
>>>> No it's just som he does not need to CONFIG_DEFAULT_DEVICE_TREE
>>>> Best regards,
>>> I suppose this, but then something in the build is broken, If I run
>>> buildman, a pico-imx7d board is searched. In fact, there is a
>>> configs/pico-imx7d_defconfig. If this is just SOM, this file has no
>>> reason to exist.
>> For pico_imx7d_defconfig, i set
>> CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi.dtb"
>>
> This is not what I see in your patch
> http://patchwork.ozlabs.org/patch/1077223/:
>
> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico"
>
> I fix myself in the defconfig.
Sorry for the mistake and thanks.
>> You have to ask Fabio and Otavio I did not grow on it when I did the dm
>> conversion, they asked me to convert everything even som
> Just SOM it is quite weird if there is not an evaluation board to
> support it. Anyway, I fix the name, thanks.
Thanks Stefano
>
> Best regards,
> Stefano Babic

Best regards,

Joris Offouga

>
Fabio Estevam April 25, 2019, 10:38 a.m. UTC | #9
Hi Stefano,

On Thu, Apr 25, 2019 at 7:28 AM Stefano Babic <sbabic@denx.de> wrote:

> Just SOM it is quite weird if there is not an evaluation board to
> support it. Anyway, I fix the name, thanks.

Yes, for U-Boot purpose we can either use:
imx7d-pico-pi or imx7d-pico-hobbit for the CONFIG_DEFAULT_DEVICE_TREE option.

Both will work fine.

Thanks for fixing it.
Stefano Babic April 26, 2019, 9:38 a.m. UTC | #10
> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
> Signed-off-by: Joris Offouga <offougajoris@gmail.com>

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig
index f58d517..75eab28 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -16,6 +16,8 @@  CONFIG_NR_DRAM_BANKS=1
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
@@ -58,4 +60,3 @@  CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_VIDEO=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
index 7e13923..beee839 100644
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -16,6 +16,8 @@  CONFIG_NR_DRAM_BANKS=1
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="ask"
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico"
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
@@ -58,4 +60,3 @@  CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_VIDEO=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
index c8ac2ff..05d5fe5 100644
--- a/configs/pico-pi-imx7d_defconfig
+++ b/configs/pico-pi-imx7d_defconfig
@@ -16,6 +16,8 @@  CONFIG_NR_DRAM_BANKS=1
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="imx7d-pico-pi.dtb"
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi"
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
@@ -58,4 +60,3 @@  CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_VIDEO=y
-CONFIG_OF_LIBFDT=y