[U-Boot] [PATCH v4 2/7] arm: socfpga: update de0 nano default environment

[Dinh Nguyen]

On 01/24/2017 09:16 PM, Dinh Nguyen wrote:
> 
> 
> On 01/24/2017 09:11 PM, Westergreen, Dalon wrote:
>> On Tue, 2017-01-24 at 21:08 -0600, Dinh Nguyen wrote:
>>>
>>> On 01/24/2017 11:05 AM, Dalon Westergreen wrote:
>>>>
>>>> From: Dalon Westergreen <dalon.westergreen at intel.com>
>>>>
>>>> Remove the default environment as it is now in a common
>>>> header.
>>>>
>>>> Add the CONFIG_DEFAULT_DEVICE_TREE to the board's defconfig
>>>> to set the linux devicetree name.
>>>>
>>>> Signed-off-by: Dalon Westergreen <dalon.westergreen at intel.com>
>>>> ---
>>>>  configs/socfpga_de0_nano_soc_defconfig |  3 +--
>>>>  include/configs/socfpga_de0_nano_soc.h | 19 +------------------
>>>>  2 files changed, 2 insertions(+), 20 deletions(-)
>>>>
>>>> diff --git a/configs/socfpga_de0_nano_soc_defconfig
>>>> b/configs/socfpga_de0_nano_soc_defconfig
>>>> index af41e1e..4837809 100644
>>>> --- a/configs/socfpga_de0_nano_soc_defconfig
>>>> +++ b/configs/socfpga_de0_nano_soc_defconfig
>>>> @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
>>>>  CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
>>>>  CONFIG_SPL_STACK_R_ADDR=0x00800000
>>>>  CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
>>>> +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_sockit.dtb"
>>>
>>> This should be socfpga_cyclone5_de0_nano_soc.dtb
>>>
>> No, just checked the dts in the kernel source.  it is
>> socfpga_cyclone5_de0_sockit.dts. I can change this to
>> what you like, but my intent had been to match names
>> in the kernel source where possible.
>>
> 
> This is U-Boot: check under U-Boot's arch/arm/dts/
> 
> socfpga_cyclone5_sockit.dtb is for the sockit
> socfpga_cyclone5_de0_nano_soc.dtb is for the DE0 Nano board.
> 
> 
> commit 55c7a765f63ab10b9a3b8cbd38bf1483901a7b36
> Author: Dinh Nguyen <dinguyen at opensource.altera.com>
> Date:   Tue Sep 1 17:41:52 2015 -0500
> 
> arm: socfpga: Add support for the Terasic DE-0 Atlas board
> 
> Add support for the Terasic DE0-Nano/Atlas-SoC Kit, which is
> CycloneV based board. The board can boot from SD/MMC. Ethernet is also
> supported.
> 

Oh you're right...I got confused. You're matching the DTS in the kernel.
Sorry about that...

Dinh