From 6a596d98964392f6953ca9045727caf45e8addc0 Mon Sep 17 00:00:00 2001 From: Guillermo Roche Date: Thu, 3 Apr 2025 20:08:23 +0000 Subject: [PATCH 1/2] fix env for orange pi rv2 --- board/spacemit/k1-x/k1-x.env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/board/spacemit/k1-x/k1-x.env b/board/spacemit/k1-x/k1-x.env index f4dadc9a..46d739d1 100644 --- a/board/spacemit/k1-x/k1-x.env +++ b/board/spacemit/k1-x/k1-x.env @@ -112,6 +112,8 @@ dtb_env=if test -n "${product_name}"; then \ setenv dtb_name ${dtb_dir}/k1-x_mingo.dtb; \ elif test "${product_name}" = k1_MINI-PC; then \ setenv dtb_name ${dtb_dir}/k1-x_MINI-PC.dtb; \ + elif test "${product_name}" = x1_orangepi-rv2; then \ + setenv dtb_name ${dtb_dir}/k1-x_orangepi-rv2.dtb; \ else \ echo "match dtb by product_name: ${dtb_dir}/${product_name}.dtb"; \ setenv dtb_name ${dtb_dir}/${product_name}.dtb; \ -- Gitee From f8fe93e852039a71d5305e5303dced017e3b4ec9 Mon Sep 17 00:00:00 2001 From: Guillermo Roche Date: Thu, 17 Apr 2025 16:19:12 +0000 Subject: [PATCH 2/2] Select the right DT for the SPL in orange pi rv2 --- board/spacemit/k1-x/spl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/board/spacemit/k1-x/spl.c b/board/spacemit/k1-x/spl.c index 4782de74..5197ed5d 100644 --- a/board/spacemit/k1-x/spl.c +++ b/board/spacemit/k1-x/spl.c @@ -645,6 +645,16 @@ bool get_mac_address(uint64_t *mac_addr) return false; } +void name_to_standar(char *name) +{ + if (0 == strcmp(name, "x1_orangepi-rv2")) { + strcpy(name, "k1-x_orangepi-rv2"); + pr_info("Change non standar name to %s\n", name); + } else + pr_debug("Undefined non standar name\n"); +} + + char *get_product_name(void) { char *name = NULL; @@ -653,6 +663,8 @@ char *get_product_name(void) if ((k1x_eeprom_init() >= 0) && (NULL != name) && (0 == spacemit_eeprom_read(name, TLV_CODE_PRODUCT_NAME))) { pr_info("Get product name from eeprom %s\n", name); + if (0 != strncmp(name, "k1", 2)) + name_to_standar(name); return name; } -- Gitee