board: sifive: drop stuff related to unmatched revision 1

This patch reverts the following commits:
 - 4b4159d0 ("riscv: dts: add dts for unmatched rev1")
 - ffe9a394 ("board: sifive: support spl multi-dtb on unmatched board")

We won't plan to support unmatched that the revision below 3 in u-boot,
so they can be dropped because they might be useless.

Changed in v2:
 - rebase codebase to the latest master branch

Signed-off-by: Zong Li <zong.li@sifive.com>
Suggested-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>

arch/riscv/dts/Makefile

@@ -5,7 +5,7 @@ dtb-$(CONFIG_TARGET_MICROCHIP_ICICLE) += microchip-mpfs-icicle-kit.dtb
 dtb-$(CONFIG_TARGET_QEMU_VIRT) += qemu-virt.dtb
 dtb-$(CONFIG_TARGET_OPENPITON_RISCV64) += openpiton-riscv64.dtb
 dtb-$(CONFIG_TARGET_SIFIVE_UNLEASHED) += hifive-unleashed-a00.dtb
-dtb-$(CONFIG_TARGET_SIFIVE_UNMATCHED) += hifive-unmatched-a00.dtb hifive-unmatched-a00-rev1.dtb
+dtb-$(CONFIG_TARGET_SIFIVE_UNMATCHED) += hifive-unmatched-a00.dtb
 dtb-$(CONFIG_TARGET_SIPEED_MAIX) += k210-maix-bit.dtb
 
 targets += $(dtb-y)

arch/riscv/dts/hifive-unmatched-a00-rev1-u-boot.dtsi

-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright (C) 2021 SiFive, Inc
- */
-
-#include "hifive-unmatched-a00-u-boot.dtsi"
-#include "fu740-hifive-unmatched-a00-ddr-rev1.dtsi"

arch/riscv/dts/hifive-unmatched-a00-rev1.dts

-// SPDX-License-Identifier: GPL-2.0+
-/* Copyright (c) 2021 SiFive, Inc */
-
-#include "hifive-unmatched-a00.dts"

board/sifive/unmatched/spl.c

@@ -10,14 +10,11 @@
 #include <spl.h>
 #include <misc.h>
 #include <log.h>
-#include <fdtdec.h>
-#include <dm/root.h>
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <asm/gpio.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/spl.h>
-#include <asm/arch/eeprom.h>
 
 #define GEM_PHY_RESET	SIFIVE_GENERIC_GPIO_NR(0, 12)
 
@@ -29,16 +26,6 @@ int spl_board_init_f(void)
 {
 	int ret;
 
-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_MULTI_DTB_FIT)
-	int rescan;
-
-	ret = fdtdec_resetup(&rescan);
-	if (!ret && rescan) {
-		dm_uninit();
-		dm_init_and_scan(true);
-	}
-#endif
-
 	ret = spl_soc_init();
 	if (ret) {
 		debug("HiFive Unmatched FU740 SPL init failed: %d\n", ret);
@@ -92,18 +79,7 @@ u32 spl_boot_device(void)
 #ifdef CONFIG_SPL_LOAD_FIT
 int board_fit_config_name_match(const char *name)
 {
-	/*
-	 * Apply different DDR params on different board revision.
-	 * Use PCB revision which is byte 0x7 in I2C platform EEPROM
-	 * to distinguish that.
-	 */
-	if (get_pcb_revision_from_eeprom() == PCB_REVISION_REV3 &&
-	    !strcmp(name, "hifive-unmatched-a00"))
-		return 0;
-	else if (get_pcb_revision_from_eeprom() != PCB_REVISION_REV3 &&
-		 !strcmp(name, "hifive-unmatched-a00-rev1"))
-		return 0;
-
-	return -1;
+	/* boot using first FIT config */
+	return 0;
 }
 #endif

configs/sifive_unmatched_defconfig

@@ -5,7 +5,6 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_SPL_DM_SPI=y
 CONFIG_DEFAULT_DEVICE_TREE="hifive-unmatched-a00"
 CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_SPL_SYS_MALLOC_F_LEN=0x100000
 CONFIG_SPL=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_TARGET_SIFIVE_UNMATCHED=y
@@ -28,9 +27,6 @@ CONFIG_CMD_PWM=y
 CONFIG_CMD_GPT_RENAME=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
-CONFIG_SPL_MULTI_DTB_FIT=y
-CONFIG_SPL_OF_LIST="hifive-unmatched-a00 hifive-unmatched-a00-rev1"
-CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_CLK=y
 CONFIG_E1000=y