board: starfive: Remove compatible boards Milk-V Mars CM and Mars CM Lite
Remove leftover code from Milk-V Mars CM and Mars CM Lite boards that do
not exist in upstream Linux Kernel devicetree-rebasing. These will be re-
introduced when submitted upstream for a future U-Boot release. Users of
these boards should use the previous stable release of U-Boot until then.
Signed-off-by: E Shattow <e@freeshell.de>
diff --git a/board/starfive/visionfive2/Kconfig b/board/starfive/visionfive2/Kconfig
index d7e8a7a..2186a93 100644
--- a/board/starfive/visionfive2/Kconfig
+++ b/board/starfive/visionfive2/Kconfig
@@ -50,13 +50,4 @@
imply PHY_LIB
imply PHY_MSCC
-config STARFIVE_NO_EMMC
- bool "Report eMMC size as zero"
- help
- The serial number string in the EEPROM is meant to report the
- size of onboard eMMC. Unfortunately some Milk-V Mars CM Lite
- modules without eMMC show a non-zero size here.
-
- Set to 'Y' if you have a Mars CM Lite module.
-
endif
diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c
index 22afd76..f41bd6d 100644
--- a/board/starfive/visionfive2/spl.c
+++ b/board/starfive/visionfive2/spl.c
@@ -130,14 +130,6 @@
} else if (!strncmp(product_id, "MARS", 4) &&
!strcmp(name, "jh7110-milkv-mars")) {
return 0;
- } else if (!strncmp(product_id, "MARC", 4)) {
- if (!get_mmc_size_from_eeprom()) {
- if (!strcmp(name, "jh7110-milkv-mars-cm-lite"))
- return 0;
- } else {
- if (!strcmp(name, "jh7110-milkv-mars-cm"))
- return 0;
- }
} else if (!strncmp(product_id, "STAR64", 6) &&
!strcmp(name, "jh7110-pine64-star64")) {
return 0;
diff --git a/board/starfive/visionfive2/starfive_visionfive2.c b/board/starfive/visionfive2/starfive_visionfive2.c
index 3940d45..b8cd509 100644
--- a/board/starfive/visionfive2/starfive_visionfive2.c
+++ b/board/starfive/visionfive2/starfive_visionfive2.c
@@ -19,10 +19,6 @@
#define JH7110_L2_PREFETCHER_HART_OFFSET 0x2000
#define FDTFILE_MILK_V_MARS \
"starfive/jh7110-milkv-mars.dtb"
-#define FDTFILE_MILK_V_MARS_CM \
- "starfive/jh7110-milkv-mars-cm.dtb"
-#define FDTFILE_MILK_V_MARS_CM_LITE \
- "starfive/jh7110-milkv-mars-cm-lite.dtb"
#define FDTFILE_VISIONFIVE2_1_2A \
"starfive/jh7110-starfive-visionfive-2-v1.2a.dtb"
#define FDTFILE_VISIONFIVE2_1_3B \
@@ -67,12 +63,7 @@
log_err("Can't read EEPROM\n");
return;
}
- if (!strncmp(product_id, "MARC", 4)) {
- if (get_mmc_size_from_eeprom())
- fdtfile = FDTFILE_MILK_V_MARS_CM;
- else
- fdtfile = FDTFILE_MILK_V_MARS_CM_LITE;
- } else if (!strncmp(product_id, "MARS", 4)) {
+ if (!strncmp(product_id, "MARS", 4)) {
fdtfile = FDTFILE_MILK_V_MARS;
} else if (!strncmp(product_id, "VF7110", 6)) {
version = get_pcb_revision_from_eeprom();
diff --git a/board/starfive/visionfive2/visionfive2-i2c-eeprom.c b/board/starfive/visionfive2/visionfive2-i2c-eeprom.c
index 838f41e..010e386 100644
--- a/board/starfive/visionfive2/visionfive2-i2c-eeprom.c
+++ b/board/starfive/visionfive2/visionfive2-i2c-eeprom.c
@@ -573,9 +573,6 @@
{
u32 size;
- if (IS_ENABLED(CONFIG_STARFIVE_NO_EMMC))
- return 0;
-
if (read_eeprom())
return 0;