Migrate to the new environment format and drop most of the config.h.

Signed-off-by: Yong-Xuan Wang yongxuan.wang@sifive.com --- board/sifive/unmatched/unmatched.env | 19 ++++++++++++++ configs/sifive_unmatched_defconfig | 2 +- include/configs/sifive-unmatched.h | 37 ---------------------------- 3 files changed, 20 insertions(+), 38 deletions(-) create mode 100644 board/sifive/unmatched/unmatched.env

diff --git a/board/sifive/unmatched/unmatched.env b/board/sifive/unmatched/unmatched.env new file mode 100644 index 0000000000..0f1e5a7174 --- /dev/null +++ b/board/sifive/unmatched/unmatched.env @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +/* environment for HiFive Unmatched boards */ + +kernel_addr_r=0x80200000 +kernel_comp_addr_r=0x88000000 +kernel_comp_size=0x4000000 +fdt_addr_r=0x8c000000 +scriptaddr=0x8c100000 +pxefile_addr_r=0x8c200000 +ramdisk_addr_r=0x8c300000 +type_guid_gpt_loader1=5B193300-FC78-40CD-8002-E86C45580B47 +type_guid_gpt_loader2=2E54B353-1271-4842-806F-E436D6AF6985 +type_guid_gpt_system=0FC63DAF-8483-4772-8E79-3D69D8477DE4 +partitions= + name=loader1,start=17K,size=1M,type=${type_guid_gpt_loader1}; + name=loader2,size=4MB,type=${type_guid_gpt_loader2}; + name=system,size=-,bootable,type=${type_guid_gpt_system}; +fdtfile= CONFIG_DEFAULT_FDT_FILE diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig index 6a95ab3977..43fc87d3ce 100644 --- a/configs/sifive_unmatched_defconfig +++ b/configs/sifive_unmatched_defconfig @@ -23,7 +23,7 @@ CONFIG_ARCH_RV64I=y CONFIG_RISCV_SMODE=y CONFIG_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000 -CONFIG_DISTRO_DEFAULTS=y +CONFIG_BOOTSTD_DEFAULTS=y CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr};fdt addr ${fdtcontroladdr};" CONFIG_DEFAULT_FDT_FILE="sifive/hifive-unmatched-a00.dtb" diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h index de8bfc1123..27e0912665 100644 --- a/include/configs/sifive-unmatched.h +++ b/include/configs/sifive-unmatched.h @@ -13,41 +13,4 @@

#define CFG_SYS_SDRAM_BASE 0x80000000

-/* Environment options */ - -#define BOOT_TARGET_DEVICES(func) \ - func(NVME, nvme, 0) \ - func(NVME, nvme, 1) \ - func(USB, usb, 0) \ - func(MMC, mmc, 0) \ - func(SCSI, scsi, 0) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) - -#include <config_distro_bootcmd.h> - -#define TYPE_GUID_LOADER1 "5B193300-FC78-40CD-8002-E86C45580B47" -#define TYPE_GUID_LOADER2 "2E54B353-1271-4842-806F-E436D6AF6985" -#define TYPE_GUID_SYSTEM "0FC63DAF-8483-4772-8E79-3D69D8477DE4" - -#define PARTS_DEFAULT \ - "name=loader1,start=17K,size=1M,type=${type_guid_gpt_loader1};" \ - "name=loader2,size=4MB,type=${type_guid_gpt_loader2};" \ - "name=system,size=-,bootable,type=${type_guid_gpt_system};" - -#define CFG_EXTRA_ENV_SETTINGS \ - "kernel_addr_r=0x80200000\0" \ - "kernel_comp_addr_r=0x88000000\0" \ - "kernel_comp_size=0x4000000\0" \ - "fdt_addr_r=0x8c000000\0" \ - "scriptaddr=0x8c100000\0" \ - "pxefile_addr_r=0x8c200000\0" \ - "ramdisk_addr_r=0x8c300000\0" \ - "type_guid_gpt_loader1=" TYPE_GUID_LOADER1 "\0" \ - "type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \ - "type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \ - "partitions=" PARTS_DEFAULT "\0" \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - BOOTENV - #endif /* __SIFIVE_UNMATCHED_H */