On 02/19/2017 12:31 AM, Dalon Westergreen wrote:
On Sat, 2017-02-18 at 21:56 +0100, Marek Vasut wrote:
On 02/18/2017 09:51 PM, Dalon Westergreen wrote:
This removes the default environment from the sr1500 header and instead uses the common environment provided in socfpga_common.h which now uses distro boot.
This board has no upstream devicetree in the kernel source, so leave the default devicetree name socfpga.dtb.
Signed-off-by: Dalon Westergreen dwesterg@gmail.com
configs/socfpga_sr1500_defconfig | 1 + include/configs/socfpga_sr1500.h | 27 --------------------------- 2 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/configs/socfpga_sr1500_defconfig b/configs/socfpga_sr1500_defconfig index 981600b..b0925ab 100644 --- a/configs/socfpga_sr1500_defconfig +++ b/configs/socfpga_sr1500_defconfig @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TARGET_SOCFPGA_SR1500=y CONFIG_SPL_STACK_R_ADDR=0x00800000 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500" +CONFIG_DEFAULT_FDT_FILE="socfpga.dtb"
Shouldn't this be socfpga_cyclone5_sr1500.dtb too ?
We discussed this before, my thought was to leave the dtb name as it was before where there was no mainlined device tree in the linux kernel source. CONFIG_DEFAULT_FDT_FILE is specifically the kernel devicetree used for linux boot and is unrelated to the dtb for uboot.
Well yeah, then again, all the DTs for socfpga are in the form socfpga_{fpga model}_{board model}.dts , so for this board, it would be socfpga_cyclone5_sr1500.dtb . Also, the U-Boot DT is in that form already ... I guess Stefan has some DT for this board stashed somewhere, so he should be able to tell what the name in reality is.
[...]