summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2025-09-24 07:49:33 -0600
committerTom Rini <trini@konsulko.com>2025-09-24 07:50:13 -0600
commitf53fe908ac3dd44f7ad63dff319636541710b98c (patch)
treea74769d6773ba8f24ea024f0494d39a0e507c5c5
parentd3074f3d699d188bbeb68feacc473d8bc53ce762 (diff)
parent96971e5090cd6975023d0556b3d47b195442902e (diff)
Merge patch series "Fix boot w/ scriptaddr & minor newline issue"HEADmaster
Wadim Egorov <w.egorov@phytec.de> says: First patch fixes boot issues with script boot method and the second patch is a minor formatting fix in our board detection code. @TI: I think the scriptaddr should be also updated for most TI/K3 and beagle board boards. Link: https://lore.kernel.org/r/20250919063948.3093358-1-w.egorov@phytec.de
-rw-r--r--board/phytec/common/phytec_som_detection.c2
-rw-r--r--board/phytec/phycore_am62ax/phycore_am62ax.env2
-rw-r--r--board/phytec/phycore_am62x/phycore_am62x.env2
-rw-r--r--board/phytec/phycore_am64x/phycore_am64x.env2
4 files changed, 4 insertions, 4 deletions
diff --git a/board/phytec/common/phytec_som_detection.c b/board/phytec/common/phytec_som_detection.c
index 4d7c9b9f80f..136f4486eb0 100644
--- a/board/phytec/common/phytec_som_detection.c
+++ b/board/phytec/common/phytec_som_detection.c
@@ -309,7 +309,7 @@ static int phytec_get_product_name(struct phytec_eeprom_data *data,
som_type = 1;
break;
default:
- pr_err("%s: Invalid SOM type: %i", __func__, api2->som_type);
+ pr_err("%s: Invalid SOM type: %i\n", __func__, api2->som_type);
return -EINVAL;
};
diff --git a/board/phytec/phycore_am62ax/phycore_am62ax.env b/board/phytec/phycore_am62ax/phycore_am62ax.env
index ff4ab8c87b8..47e90f1b7c6 100644
--- a/board/phytec/phycore_am62ax/phycore_am62ax.env
+++ b/board/phytec/phycore_am62ax/phycore_am62ax.env
@@ -5,7 +5,7 @@
fdtaddr=0x88000000
loadaddr=0x82000000
-scriptaddr=0x80000000
+scriptaddr=0x89100000
fdt_addr_r=0x88000000
kernel_addr_r=0x82000000
ramdisk_addr_r=0x88080000
diff --git a/board/phytec/phycore_am62x/phycore_am62x.env b/board/phytec/phycore_am62x/phycore_am62x.env
index ff4ab8c87b8..47e90f1b7c6 100644
--- a/board/phytec/phycore_am62x/phycore_am62x.env
+++ b/board/phytec/phycore_am62x/phycore_am62x.env
@@ -5,7 +5,7 @@
fdtaddr=0x88000000
loadaddr=0x82000000
-scriptaddr=0x80000000
+scriptaddr=0x89100000
fdt_addr_r=0x88000000
kernel_addr_r=0x82000000
ramdisk_addr_r=0x88080000
diff --git a/board/phytec/phycore_am64x/phycore_am64x.env b/board/phytec/phycore_am64x/phycore_am64x.env
index cbaf45b3ace..f4136ed237d 100644
--- a/board/phytec/phycore_am64x/phycore_am64x.env
+++ b/board/phytec/phycore_am64x/phycore_am64x.env
@@ -4,7 +4,7 @@
fdtaddr=0x88000000
loadaddr=0x82000000
-scriptaddr=0x80000000
+scriptaddr=0x89100000
fdt_addr_r=0x88000000
kernel_addr_r=0x82000000
ramdisk_addr_r=0x88080000