architecture/riscv64/package/u-boot/0014-riscv-sifive-Set-default-fdtfile-names.patch

   1 From 78cd21523e6c83d42a3e3c8bf01a84b9850b2a5f Mon Sep 17 00:00:00 2001
   2 From: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
   3 Date: Wed, 14 Jul 2021 09:19:48 -0700
   4 Subject: [PATCH 14/16] riscv: sifive: Set default fdtfile names
   5
   6 Set default fdtfile names for unleashed and unmatched boards, as used
   7 in the upstream Linux kernel. This allows sysboot command to find and
   8 load appropriate dtb for the matching kernel from universal stock
   9 Ubuntu RISC-V rootfs images based on fdtdir setting in extlinux.conf.
  10
  11 Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
  12 Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
  13 Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
  14 cc: Paul Walmsley <paul.walmsley@sifive.com>
  15 cc: Palmer Dabbelt <palmer@dabbelt.com>
  16 cc: Anup Patel <anup.patel@wdc.com>
  17 cc: Atish Patra <atish.patra@wdc.com>
  18 cc: Pragnesh Patel <pragnesh.patel@sifive.com>
  19 cc: Green Wan <green.wan@sifive.com>
  20 ---
  21  configs/sifive_unleashed_defconfig | 1 +
  22  configs/sifive_unmatched_defconfig | 1 +
  23  include/configs/sifive-unleashed.h | 1 +
  24  include/configs/sifive-unmatched.h | 1 +
  25  4 files changed, 4 insertions(+)
  26
  27 diff --git a/configs/sifive_unleashed_defconfig b/configs/sifive_unleashed_defconfig
  28 index 5bf40ce..d665c8f 100644
  29 --- a/configs/sifive_unleashed_defconfig
  30 +++ b/configs/sifive_unleashed_defconfig
  31 @@ -14,6 +14,7 @@ CONFIG_RISCV_SMODE=y
  32  CONFIG_DISTRO_DEFAULTS=y
  33  CONFIG_FIT=y
  34  CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000
  35 +CONFIG_DEFAULT_FDT_FILE="sifive/hifive-unleashed-a00.dtb"
  36  CONFIG_DISPLAY_CPUINFO=y
  37  CONFIG_DISPLAY_BOARDINFO=y
  38  CONFIG_MISC_INIT_R=y
  39 diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig
  40 index cf08955..bdf90ec 100644
  41 --- a/configs/sifive_unmatched_defconfig
  42 +++ b/configs/sifive_unmatched_defconfig
  43 @@ -14,6 +14,7 @@ CONFIG_RISCV_SMODE=y
  44  CONFIG_DISTRO_DEFAULTS=y
  45  CONFIG_FIT=y
  46  CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000
  47 +CONFIG_DEFAULT_FDT_FILE="sifive/hifive-unmatched-a00.dtb"
  48  CONFIG_DISPLAY_CPUINFO=y
  49  CONFIG_DISPLAY_BOARDINFO=y
  50  CONFIG_DISPLAY_BOARDINFO_LATE=y
  51 diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h
  52 index 5acce36..db0ebaf 100644
  53 --- a/include/configs/sifive-unleashed.h
  54 +++ b/include/configs/sifive-unleashed.h
  55 @@ -77,6 +77,7 @@
  56         "type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
  57         "type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \
  58         "partitions=" PARTS_DEFAULT "\0" \
  59 +       "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
  60         BOOTENV \
  61         BOOTENV_SF
  62
  63 diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h
  64 index f75cf9b..7157295 100644
  65 --- a/include/configs/sifive-unmatched.h
  66 +++ b/include/configs/sifive-unmatched.h
  67 @@ -73,6 +73,7 @@
  68         "type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
  69         "type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \
  70         "partitions=" PARTS_DEFAULT "\0" \
  71 +       "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
  72         "setled_blue=mw.l 0x10020024 0x0000ffff; mw.l 0x10020028 0x0000ffff; mw.l 0x1002002c 0x0\0" \
  73         BOOTENV \
  74         "boot_extlinux="                                                                        \
  75 --
  76 2.7.4
  77