summaryrefslogtreecommitdiff
path: root/board/phytec
diff options
context:
space:
mode:
Diffstat (limited to 'board/phytec')
-rw-r--r--board/phytec/common/k3/board.c8
-rw-r--r--board/phytec/common/phytec_som_detection.c7
-rw-r--r--board/phytec/phycore_am62ax/MAINTAINERS1
-rw-r--r--board/phytec/phycore_am62ax/rm-cfg.yaml10
-rw-r--r--board/phytec/phycore_am62ax/tifs-rm-cfg.yaml48
-rw-r--r--board/phytec/phycore_am62x/MAINTAINERS1
-rw-r--r--board/phytec/phycore_imx93/phycore_imx93.env36
7 files changed, 64 insertions, 47 deletions
diff --git a/board/phytec/common/k3/board.c b/board/phytec/common/k3/board.c
index 7d2146d5727..828973a8e28 100644
--- a/board/phytec/common/k3/board.c
+++ b/board/phytec/common/k3/board.c
@@ -82,14 +82,6 @@ static void configure_capsule_updates(void)
}
#endif
-#if IS_ENABLED(CONFIG_SET_DFU_ALT_INFO)
-void set_dfu_alt_info(char *interface, char *devstr)
-{
- if (IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT))
- env_set("dfu_alt_info", update_info.dfu_string);
-}
-#endif
-
#if IS_ENABLED(CONFIG_ENV_IS_IN_FAT) || IS_ENABLED(CONFIG_ENV_IS_IN_MMC)
int mmc_get_env_dev(void)
{
diff --git a/board/phytec/common/phytec_som_detection.c b/board/phytec/common/phytec_som_detection.c
index 1f2213902ed..4d7c9b9f80f 100644
--- a/board/phytec/common/phytec_som_detection.c
+++ b/board/phytec/common/phytec_som_detection.c
@@ -295,17 +295,16 @@ static int phytec_get_product_name(struct phytec_eeprom_data *data,
switch (api2->som_type) {
case 0:
+ case 1:
+ case 2:
+ case 3:
som_type = api2->som_type;
break;
case 4:
- som_type = 0;
- break;
case 5:
som_type = 0;
break;
case 6:
- som_type = 1;
- break;
case 7:
som_type = 1;
break;
diff --git a/board/phytec/phycore_am62ax/MAINTAINERS b/board/phytec/phycore_am62ax/MAINTAINERS
index 7c8a29b20d9..feb1e0b39dc 100644
--- a/board/phytec/phycore_am62ax/MAINTAINERS
+++ b/board/phytec/phycore_am62ax/MAINTAINERS
@@ -10,6 +10,7 @@ F: arch/arm/dts/k3-am62a7-r5-phycore-som-2gb.dts
F: board/phytec/phycore_am62ax/
F: configs/phycore_am62ax_a53_defconfig
F: configs/phycore_am62ax_r5_defconfig
+F: configs/phycore_am62ax_r5_ethboot_defconfig
F: configs/phycore_am62ax_r5_usbdfu_defconfig
F: include/configs/phycore_am62ax.h
F: doc/board/phytec/phycore-am62ax.rst
diff --git a/board/phytec/phycore_am62ax/rm-cfg.yaml b/board/phytec/phycore_am62ax/rm-cfg.yaml
index cbd087de797..0f34b8c1bc0 100644
--- a/board/phytec/phycore_am62ax/rm-cfg.yaml
+++ b/board/phytec/phycore_am62ax/rm-cfg.yaml
@@ -713,7 +713,7 @@ rm-cfg:
start_resource: 19
num_resource: 64
type: 1937
- host_id: 30
+ host_id: 36
reserved: 0
-
start_resource: 83
@@ -767,7 +767,7 @@ rm-cfg:
start_resource: 118
num_resource: 16
type: 1943
- host_id: 30
+ host_id: 36
reserved: 0
-
start_resource: 134
@@ -833,7 +833,7 @@ rm-cfg:
start_resource: 19
num_resource: 8
type: 1956
- host_id: 30
+ host_id: 36
reserved: 0
-
start_resource: 27
@@ -917,7 +917,7 @@ rm-cfg:
start_resource: 19
num_resource: 1
type: 1963
- host_id: 30
+ host_id: 36
reserved: 0
-
start_resource: 19
@@ -929,7 +929,7 @@ rm-cfg:
start_resource: 19
num_resource: 16
type: 1964
- host_id: 30
+ host_id: 36
reserved: 0
-
start_resource: 20
diff --git a/board/phytec/phycore_am62ax/tifs-rm-cfg.yaml b/board/phytec/phycore_am62ax/tifs-rm-cfg.yaml
index 151cd599b1b..23dcd784615 100644
--- a/board/phytec/phycore_am62ax/tifs-rm-cfg.yaml
+++ b/board/phytec/phycore_am62ax/tifs-rm-cfg.yaml
@@ -24,26 +24,26 @@ tifs-rm-cfg:
allowed_priority: 0xAAAA
allowed_sched_priority: 0xAA
- # 2
- host_id: 30
+ host_id: 20
allowed_atype: 0x2A
allowed_qos: 0xAAAA
allowed_orderid: 0xAAAAAAAA
allowed_priority: 0xAAAA
allowed_sched_priority: 0xAA
- # 3
- host_id: 36
+ host_id: 30
allowed_atype: 0x2A
allowed_qos: 0xAAAA
allowed_orderid: 0xAAAAAAAA
allowed_priority: 0xAAAA
allowed_sched_priority: 0xAA
- # 4
- host_id: 0
- allowed_atype: 0
- allowed_qos: 0
- allowed_orderid: 0
- allowed_priority: 0
- allowed_sched_priority: 0
+ host_id: 36
+ allowed_atype: 0x2A
+ allowed_qos: 0xAAAA
+ allowed_orderid: 0xAAAAAAAA
+ allowed_priority: 0xAAAA
+ allowed_sched_priority: 0xAA
- # 5
host_id: 0
allowed_atype: 0
@@ -244,7 +244,7 @@ tifs-rm-cfg:
subhdr:
magic: 0x7B25
size: 8
- resasg_entries_size: 872
+ resasg_entries_size: 880
reserved: 0
resasg_entries:
-
@@ -257,7 +257,7 @@ tifs-rm-cfg:
start_resource: 18
num_resource: 6
type: 1677
- host_id: 35
+ host_id: 20
reserved: 0
-
start_resource: 18
@@ -287,7 +287,7 @@ tifs-rm-cfg:
start_resource: 72
num_resource: 6
type: 1678
- host_id: 35
+ host_id: 20
reserved: 0
-
start_resource: 72
@@ -317,7 +317,7 @@ tifs-rm-cfg:
start_resource: 44
num_resource: 6
type: 1679
- host_id: 35
+ host_id: 20
reserved: 0
-
start_resource: 44
@@ -347,7 +347,7 @@ tifs-rm-cfg:
start_resource: 18
num_resource: 6
type: 1696
- host_id: 35
+ host_id: 20
reserved: 0
-
start_resource: 18
@@ -377,7 +377,7 @@ tifs-rm-cfg:
start_resource: 18
num_resource: 6
type: 1697
- host_id: 35
+ host_id: 20
reserved: 0
-
start_resource: 18
@@ -407,7 +407,7 @@ tifs-rm-cfg:
start_resource: 12
num_resource: 6
type: 1698
- host_id: 35
+ host_id: 20
reserved: 0
-
start_resource: 12
@@ -429,11 +429,17 @@ tifs-rm-cfg:
reserved: 0
-
start_resource: 6
- num_resource: 34
+ num_resource: 26
type: 1802
host_id: 12
reserved: 0
-
+ start_resource: 32
+ num_resource: 8
+ type: 1802
+ host_id: 20
+ reserved: 0
+ -
start_resource: 44
num_resource: 36
type: 1802
@@ -587,7 +593,7 @@ tifs-rm-cfg:
start_resource: 19
num_resource: 64
type: 1937
- host_id: 30
+ host_id: 36
reserved: 0
-
start_resource: 83
@@ -641,7 +647,7 @@ tifs-rm-cfg:
start_resource: 118
num_resource: 16
type: 1943
- host_id: 30
+ host_id: 36
reserved: 0
-
start_resource: 134
@@ -707,7 +713,7 @@ tifs-rm-cfg:
start_resource: 19
num_resource: 8
type: 1956
- host_id: 30
+ host_id: 36
reserved: 0
-
start_resource: 27
@@ -791,7 +797,7 @@ tifs-rm-cfg:
start_resource: 19
num_resource: 1
type: 1963
- host_id: 30
+ host_id: 36
reserved: 0
-
start_resource: 19
@@ -803,7 +809,7 @@ tifs-rm-cfg:
start_resource: 19
num_resource: 16
type: 1964
- host_id: 30
+ host_id: 36
reserved: 0
-
start_resource: 20
diff --git a/board/phytec/phycore_am62x/MAINTAINERS b/board/phytec/phycore_am62x/MAINTAINERS
index 8f2b8069ad4..274dc0cbb81 100644
--- a/board/phytec/phycore_am62x/MAINTAINERS
+++ b/board/phytec/phycore_am62x/MAINTAINERS
@@ -9,6 +9,7 @@ F: arch/arm/dts/k3-am625-r5-phycore-som-2gb.dts
F: board/phytec/phycore_am62x/
F: configs/phycore_am62x_a53_defconfig
F: configs/phycore_am62x_r5_defconfig
+F: configs/phycore_am62x_r5_ethboot_defconfig
F: configs/phycore_am62x_r5_usbdfu_defconfig
F: include/configs/phycore_am62x.h
F: doc/board/phytec/phycore-am62x.rst
diff --git a/board/phytec/phycore_imx93/phycore_imx93.env b/board/phytec/phycore_imx93/phycore_imx93.env
index ab65cfce5fd..3b2f30118e7 100644
--- a/board/phytec/phycore_imx93/phycore_imx93.env
+++ b/board/phytec/phycore_imx93/phycore_imx93.env
@@ -1,26 +1,42 @@
/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */
+#include <env/phytec/rauc.env>
#include <env/phytec/overlays.env>
+bootcmd=
+ mmc dev ${mmcdev};
+ if mmc rescan; then
+ if test ${doraucboot} = 1; then
+ run raucinit;
+ fi;
+ if run loadimage; then
+ run mmcboot;
+ else
+ run netboot;
+ fi;
+ fi;
image=Image
console=ttyLP0
-fdt_addr_r=0x83000000
-fdtoverlay_addr_r=0x830c0000
-bootenv_addr_r=0x83500000
+fdt_addr_r=0x90000000
+fdtoverlay_addr_r=0x900c0000
+bootenv_addr_r=0x90500000
fdtfile=CONFIG_DEFAULT_FDT_FILE
ip_dyn=yes
+prepare_mcore=setenv optargs "${optargs} clk-imx93.mcore_booted"
mmcdev=CONFIG_SYS_MMC_ENV_DEV
mmcpart=1
mmcroot=2
mmcautodetect=yes
mmcargs=setenv bootargs console=${console},${baudrate} earlycon
- root=/dev/mmcblk${mmcdev}p${mmcroot} ${raucargs} rootwait rw
+ root=/dev/mmcblk${mmcdev}p${mmcroot} ${raucargs} rootwait rw ${optargs}
loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}
loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile}
mmcboot=
echo Booting from mmc ...;
- if run mmc_load_bootenv; then
- env import -t ${bootenv_addr_r} ${filesize};
+ if test ${no_bootenv} = 0; then
+ if run mmc_load_bootenv; then
+ env import -t ${bootenv_addr_r} ${filesize};
+ fi;
fi;
run mmcargs;
if run loadfdt; then
@@ -31,7 +47,7 @@ mmcboot=
fi;
nfsroot=/nfs
netargs=setenv bootargs console=${console},${baudrate} earlycon
- root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp
+ root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp ${optargs}
netboot=
echo Booting from net ...;
run netargs;
@@ -40,8 +56,10 @@ netboot=
else
setenv get_cmd tftp;
fi;
- if run net_load_bootenv; then
- env import -t ${bootenv_addr_r} ${filesize};
+ if test ${no_bootenv} = 0; then
+ if run net_load_bootenv; then
+ env import -t ${bootenv_addr_r} ${filesize};
+ fi;
fi;
${get_cmd} ${loadaddr} ${image};
if ${get_cmd} ${fdt_addr_r} ${fdtfile}; then
generated by cgit v1.2.3 (git 2.0.4) at 2025-08-04 21:26:58 +0000