This series aims to sync kernel.org v6.7-rc1 DTS with that of U-Boot. It
also includes inclusion of an updated devicetree documentation for
ti,j721e-esm.
Boot logs:
https://gist.github.com/nehamalcom/0eef30308f1910eea5eafefe2c4b7bcf
Neha Malcom Francis (2):
dt-bindings: misc: Move esm-k3.txt
Move esm-k3.txt to ti,j721e-esm.yaml in line with the devicetree
documentation in kernel.
Signed-off-by: Neha Malcom Francis
---
doc/device-tree-bindings/misc/esm-k3.txt | 25 -
.../misc/ti,j721e-esm.yaml| 53 +++
2 files changed, 53 insertions
Sync the U-Boot DTS files with those of Kernel v6.7-rc1.
Signed-off-by: Neha Malcom Francis
---
arch/arm/dts/k3-j721e-main.dtsi | 2 +-
arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 9 -
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/k3-j721e-main.dtsi b
, &soc_lpsc_list[5]),
PSC_DEV(162, &soc_lpsc_list[6]),
PSC_DEV(75, &soc_lpsc_list[7]),
+ PSC_DEV(36, &soc_lpsc_list[8]),
PSC_DEV(102, &soc_lpsc_list[8]),
PSC_DEV(146, &soc_lpsc_list[8]),
PSC_DEV(166, &soc_lpsc_list[9]),
Reviewed-by: Neha
/*
I think a cover-letter with the motivation behind the series could have helped
me understand quicker (plus if in case there were any discussion links earlier
about doing this)
--
Thanking You
Neha Malcom Francis
understandability of how the image is packaged because of the various
different boot flows.
Boot logs:
https://gist.github.com/nehamalcom/9abe7955ebb4a251923e76412834c886
Neha Malcom Francis (2):
arm: dts: k3-binman: Add support for FIT templates
arm: dts: k3-*-binman: Move to using templated
Add templates for FIT images used extensively across K3 boards with most
of the code common. This includes the FIT portions of:
- tispl.bin
- u-boot.img
- sysfw.itb (in case of legacy boot flow)
Signed-off-by: Neha Malcom Francis
---
arch/arm/dts/k3-binman.dtsi | 327
Reduce redundancy in code by using templates to generate the A72 boot
binaries (tispl.bin and u-boot.img) as well as R5 boot binary sysfw.itb
(for legacy boot following devices J721E and AM65x).
Signed-off-by: Neha Malcom Francis
---
arch/arm/dts/k3-am625-sk-binman.dtsi | 157
Hi Andrew,
On 15/11/23 21:22, Andrew Davis wrote:
On 11/15/23 4:10 AM, Neha Malcom Francis wrote:
Reduce redundancy in code by using templates to generate the A72 boot
binaries (tispl.bin and u-boot.img) as well as R5 boot binary sysfw.itb
(for legacy boot following devices J721E and AM65x
Hi Marcel,
On 15/11/23 23:03, Marcel Ziswiler wrote:
Hi Neha
On Wed, 2023-11-15 at 15:40 +0530, Neha Malcom Francis wrote:
Instead of duplicating the same FIT formats over and over again for
different K3 devices, make use of the templating support to have FIT
templates for the same.
Note: I
n a different patch series? We can move along with this current series for now
(after making the required change in CONFIG/board-id for v2) since ESM support
is important for these platforms.
--
Thanking You
Neha Malcom Francis
11-j-keer...@ti.com/
https://lore.kernel.org/all/838b07a0-8490-c05b-b08f-3ab6d3e17...@ti.com/
--
Thanking You
Neha Malcom Francis
Hi Marcel,
On 16/11/23 22:13, Marcel Ziswiler wrote:
Hi Simon
On Thu, 2023-11-16 at 09:03 -0700, Simon Glass wrote:
Hi Neha,
On Wed, 15 Nov 2023 at 03:10, Neha Malcom Francis wrote:
Add templates for FIT images used extensively across K3 boards with most
of the code common. This includes
Hi Tom
On 17/11/23 00:10, Tom Rini wrote:
On Thu, Nov 16, 2023 at 11:43:50AM +0530, Neha Malcom Francis wrote:
Hi Tom,
Trying to bring back this series here.
On 03/10/23 20:40, Tom Rini wrote:
On Tue, Oct 03, 2023 at 07:57:04PM +0530, Kumar, Udit wrote:
On 10/3/2023 1:40 PM, Keerthy wrote
Hi Tom,
On 17/11/23 19:37, Tom Rini wrote:
On Fri, Nov 17, 2023 at 02:00:43PM +0530, Neha Malcom Francis wrote:
Hi Tom
On 17/11/23 00:10, Tom Rini wrote:
On Thu, Nov 16, 2023 at 11:43:50AM +0530, Neha Malcom Francis wrote:
Hi Tom,
Trying to bring back this series here.
On 03/10/23 20:40
Hi Manorit
On 22/11/23 10:50, Manorit Chawdhry wrote:
Hi Neha,
On 15:40-20231115, Neha Malcom Francis wrote:
Reduce redundancy in code by using templates to generate the A72 boot
binaries (tispl.bin and u-boot.img) as well as R5 boot binary sysfw.itb
(for legacy boot following devices J721E
ver
+ * ufs.c - Universal Flash Storage (UFS) driver
*
* Taken from Linux Kernel v5.2 (drivers/scsi/ufs/ufshcd.c) and ported
* to u-boot.
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
eader",
+ dev_err(hba->dev, "%s: invalid desc_id %d in descriptor
header\n",
__func__, desc_buf[QUERY_DESC_DESC_TYPE_OFFSET]);
ret = -EINVAL;
goto out;
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
ool "ufs - Universal Flash Storage commands"
depends on UFS
help
"This provides commands to initialise and configure universal flash
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
"UFS sub-system",
"init [dev] - init UFS subsystem\n"
);
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
PCI_DEVICE_ID_REDHAT_NVME 0x0010
+#define PCI_DEVICE_ID_REDHAT_UFS0x0013
+
#define PCI_VENDOR_ID_INIT0x1101
#define PCI_VENDOR_ID_CREATIVE 0x1102 /* duplicate: ECTIVA */
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
mmio_base = dev_read_addr_ptr(ufs_dev);
+ }
+ hba->mmio_base = mmio_base;
/* Set descriptor lengths to specification defaults */
ufshcd_def_desc_sizes(hba);
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
/Makefile | 1 +
drivers/ufs/ufs-pci.c | 45 +++
3 files changed, 57 insertions(+)
create mode 100644 drivers/ufs/ufs-pci.c
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
0200, /* 2.0 */
UFSHCI_VERSION_21 = 0x0210, /* 2.1 */
UFSHCI_VERSION_30 = 0x0300, /* 3.0 */
+ UFSHCI_VERSION_31 = 0x0310, /* 3.1 */
};
/* Interrupt disable masks */
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
UFS::
+
+-device ufs,id=ufs0 \
+-drive if=none,file=test.img,format=raw,id=lun0 \
+-device ufs-lu,drive=lun0,bus=ufs0
+
+You will have to run 'scsi scan' to use them.
A video console can be emulated in RISC-V virt machine by removing "-nographic"
and add
This series switches J721S2 to standard boot flow.
Boot logs:
https://gist.github.com/nehamalcom/127019254d49057b5d342f66841bfd3c
Neha Malcom Francis (2):
board: ti: j721s2: j721s2.env: Add explicit boot_targets
configs: j721e_evm_a72_defconfig: Switch to bootstd
board/ti/j721s2/j721s2.env
Add explicit boot_targets to indicate the specific boot sequence to
follow.
Signed-off-by: Neha Malcom Francis
---
board/ti/j721s2/j721s2.env | 1 +
1 file changed, 1 insertion(+)
diff --git a/board/ti/j721s2/j721s2.env b/board/ti/j721s2/j721s2.env
index 64e3d9da85..e76cafe9ae 100644
--- a
Switch to using bootstd. Note that with this change, we will stop using
distro_bootcmd and instead depend entirely on bootflow method of
starting the system up.
Also config_distro_bootcmd.h header file that is no longer needed in
j721s2_evm.h.
Signed-off-by: Neha Malcom Francis
---
configs
t sure on the exact implication, but yes, you should expect customers
(like myself/my company) integrating the SoC into some board to not
necessarily use all the functionalities, memory controller included.
Francesco
I think you can make use of uclass_next_device_err() and a while loop to
handle this according to the device tree.
--
Thanking You
Neha Malcom Francis
custom DM binaries.
Boot logs:
https://gist.github.com/nehamalcom/37ce8a32e37ddf3e1afcc4c8bd941159
Neha Malcom Francis (3):
binman: etype: dm: Add entry type for TI DM
arm: dts: k3-*-binman: Move to using ti-dm entry type
doc: board: ti: k3: Mention TI_DM argument
Makefile
ng of
tispl.bin by binman along with ATF and TEE.
Signed-off-by: Neha Malcom Francis
---
Makefile| 1 +
tools/binman/entries.rst| 14 ++
tools/binman/etype/ti_dm.py | 22 ++
tools/binman/ftest.py | 7 +++
tools/binman
Move the DM entry in tispl.bin FIT image from default fetching an
external blob entry to fetching using ti-dm entry type. This way, the
DM entry will be populated by the TI_DM pathname if provided. Else it
will resort to the ti-dm.bin file.
Signed-off-by: Neha Malcom Francis
---
arch/arm/dts/k3
Mention TI_DM argument can be used to fetch a custom DM binary in the
A72 build instructions for K3 devices.
Signed-off-by: Neha Malcom Francis
---
doc/board/ti/k3.rst | 7 +++
1 file changed, 7 insertions(+)
diff --git a/doc/board/ti/k3.rst b/doc/board/ti/k3.rst
index a127215ce5
config | 10 +++
configs/j721s2_evm_a72_defconfig | 2 +-
configs/j721s2_evm_r5_defconfig| 2 +-
7 files changed, 49 insertions(+), 89 deletions(-)
This looks good to me.
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
s = <&k3_clks 61 1>, <&k3_clks 202 0>;
@@ -54,10 +55,12 @@
&secure_proxy_mcu {
bootph-pre-ram;
+ status = "okay";
};
&secure_proxy_sa3 {
bootph-pre-ram;
+ status = "okay";
};
&cbass_mcu_wakeup {
--
Thanking You
Neha Malcom Francis
Hi Manorit
On 09/05/24 11:04, Manorit Chawdhry wrote:
Hi Neha,
On 10:37-20240509, Manorit Chawdhry wrote:
Hi Neha,
On 16:09-20240508, Neha Malcom Francis wrote:
Hi Manorit,
On 08/05/24 12:56, Manorit Chawdhry wrote:
Update the file with the required nodes from J721s2 R5 file to start
lt;&k3_clks 61 1>, <&k3_clks 202 0>;
@@ -54,10 +55,12 @@
&secure_proxy_mcu {
bootph-pre-ram;
+ status = "okay";
};
&secure_proxy_sa3 {
bootph-pre-ram;
+ status = "okay";
};
&cbass_mcu_wakeup {
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
le = "ti,am654-system-controller";
+ mboxes= <&secure_proxy_mcu 4>, <&secure_proxy_mcu 5>,
<&secure_proxy_sa3 5>;
+ mbox-names = "tx", "rx", "boot_notify";
+ bootph-pre-ram;
+ };
+};
+
+&sms {
+ mboxes= <&secure_proxy_mcu 8>, <&secure_proxy_mcu 6>, <&secure_proxy_mcu
5>;
+ mbox-names = "tx", "rx", "notify";
+ ti,host-id = <4>;
+ ti,secure-host;
+};
+
+&mcu_ringacc {
+ ti,sci = <&dm_tifs>;
+};
+
+&mcu_udmap {
+ ti,sci = <&dm_tifs>;
+};
diff --git a/board/ti/j721s2/MAINTAINERS b/board/ti/j721s2/MAINTAINERS
index 08c8d110ac0a..561c3dfff9bd 100644
--- a/board/ti/j721s2/MAINTAINERS
+++ b/board/ti/j721s2/MAINTAINERS
@@ -14,6 +14,7 @@ F:arch/arm/dts/k3-j721s2-thermal.dtsi
F:arch/arm/dts/k3-j721s2-som-p0.dtsi
F:arch/arm/dts/k3-j721s2-common-proc-board.dts
F:arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi
+F: arch/arm/dts/k3-j721s2-r5.dtsi
F:arch/arm/dts/k3-j721s2-r5-common-proc-board.dts
F:arch/arm/dts/k3-j721s2-ddr.dtsi
F:arch/arm/dts/k3-j721s2-ddr-evm-lp4-4266.dtsi
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
@ -84,7 +84,7 @@ CONFIG_CMD_UBI=y
# CONFIG_SPL_EFI_PARTITION is not set
CONFIG_OF_CONTROL=y
CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_LIST="k3-j721s2-common-proc-board k3-am68-sk-base-board"
+CONFIG_OF_LIST="k3-j721s2-common-proc-board"
CONFIG_SPL_MULTI_DTB_FIT=y
CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
diff --git a/configs/j721s2_evm_r5_defconfig b/configs/j721s2_evm_r5_defconfig
index 5ef5247a3e00..3c958cafbe8f 100644
--- a/configs/j721s2_evm_r5_defconfig
+++ b/configs/j721s2_evm_r5_defconfig
@@ -82,7 +82,7 @@ CONFIG_CMD_FAT=y
CONFIG_OF_CONTROL=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_SPL_MULTI_DTB_FIT=y
-CONFIG_SPL_OF_LIST="k3-j721s2-r5-common-proc-board k3-am68-sk-r5-base-board"
+CONFIG_SPL_OF_LIST="k3-j721s2-r5-common-proc-board"
CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
CONFIG_ENV_OVERWRITE=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
Hi Andrew
On 15/05/24 21:37, Andrew Davis wrote:
On 5/10/24 3:47 AM, Santhosh Kumar K wrote:
From: Neha Malcom Francis
Add CONFIG_K3_INLINE_ECC so that ECC functions can be compiled into R5 SPL
only when the config has been enabled.
Signed-off-by: Neha Malcom Francis
---
drivers/ram
J721E SK to using separate builds, as well
as enable OF_UPSTREAM for both the platforms.
Boot logs:
https://gist.github.com/nehamalcom/8f326376b6c6b1196084721405159bb9
[1] https://lore.kernel.org/all/20240322131011.1029620-1-n-fran...@ti.com/
Neha Malcom Francis (3):
arm: dts: k3-j721e-r5
Introduce k3-j721e-r5.dtsi to be used by board R5 DTS files. This
helps sync SoC changes across boards.
Signed-off-by: Neha Malcom Francis
---
arch/arm/dts/k3-j721e-r5-beagleboneai64.dts | 78 +-
.../arm/dts/k3-j721e-r5-common-proc-board.dts | 75 +
arch/arm
Add defconfig for J721E SK R5 and A72 configuration.
This includes and modifies the J721E EVM defconfigs:
j721e_evm_r5_defconfig -> j721e_sk_r5_defconfig
j721e_evm_a72_defconfig -> j721e_sk_a72_defconfig
Signed-off-by: Neha Malcom Francis
---
arch/arm/dts/k3-j721e-binman.dtsi
From: Apurva Nandan
This virtual clock mux configuration enables the use of dynamic frequency
scaling on A72 clock ID 202 by setting up the required register.
Signed-off-by: Apurva Nandan
Signed-off-by: Neha Malcom Francis
---
Boot logs:
https://gist.github.com/nehamalcom
Hi Manorit
On 28/05/24 13:14, Manorit Chawdhry wrote:
Hi Neha,
On 13:07-20240528, Neha Malcom Francis wrote:
From: Apurva Nandan
This virtual clock mux configuration enables the use of dynamic frequency
scaling on A72 clock ID 202 by setting up the required register.
Signed-off-by: Apurva
.
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
/
Signed-off-by: Neha Malcom Francis
---
Boot logs: https://gist.github.com/nehamalcom/70676857dc3816a415af9861c38c76eb
arch/arm/dts/k3-j721s2-r5.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/dts/k3-j721s2-r5.dtsi b/arch/arm/dts/k3-j721s2-r5.dtsi
index
According to [0], raw access to mmc should not have mmcpart in the
entry. This was fixed in k3_dfu_combined.env but k3_dfu.env had been
overlooked.
[0] doc/usage/dfu.rst
Fixes: 53b406369e9d ("DFU: Check the number of arguments and argument string
strictly")
Signed-off-by: Neha Malc
The default DM firmware path is non-optional as of now. Make it
optional so that users that choose to provide DM via TI_DM argument
instead of BINMAN_INDIRS can do so without build errors.
Signed-off-by: Neha Malcom Francis
---
arch/arm/dts/k3-am625-sk-binman.dtsi | 1 +
arch/arm/dts/k3-am62a
Hi Michael
On 27-Mar-24 8:03 PM, Michael Walle wrote:
Hi,
On Wed Mar 27, 2024 at 8:01 AM CET, Neha Malcom Francis wrote:
On 26/03/24 19:18, Michael Walle wrote:
On Fri Mar 22, 2024 at 2:10 PM CET, Neha Malcom Francis wrote:
Clean up templatized boot binaries for all K3 boards. This includes
Hi Michael
Sorry for the late response.
On 28/03/24 17:26, Michael Walle wrote:
Hi,
On Thu Mar 28, 2024 at 12:18 PM CET, Neha Malcom Francis wrote:
On 27-Mar-24 8:03 PM, Michael Walle wrote:
On Wed Mar 27, 2024 at 8:01 AM CET, Neha Malcom Francis wrote:
On 26/03/24 19:18, Michael Walle
sysreset_of_match,
.probe = ti_sci_sysreset_probe,
.priv_auto = sizeof(struct ti_sci_sysreset_data),
.ops = &ti_sci_sysreset_ops,
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
Malcom Francis
Why not have Kconfig set this as default y if TI_SCI_PROTOCOL set using same
argument?
--
Thanking You
Neha Malcom Francis
insertions(+), 1757 deletions(-)
delete mode 100644 arch/arm/dts/k3-am62-verdin-dev.dtsi
delete mode 100644 arch/arm/dts/k3-am62-verdin-wifi.dtsi
delete mode 100644 arch/arm/dts/k3-am62-verdin.dtsi
delete mode 100644 arch/arm/dts/k3-am625-verdin-wifi-dev.dts
[...]
Reviewed-by: Neha Malc
cmp(os, "tifsstub-gp"))) {
+ *p_size = 0;
+ } else {
+ debug("tifsstub-type: %s\n", os);
+ }
+
+ return;
+ }
+
/*
* Only DM and the DTBs are being authenticated here,
* rest will be authenticated when A72 cluster is up
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
filename = "ti-dm.bin";
@@ -270,7 +406,8 @@
conf-0 {
description = "k3-am625-sk";
firmware = "atf";
- loadables = "tee", "dm", "spl";
+ loadables = "tee", "tifsstub-hs",
"tifsstub-fs",
+ "tifsstub-gp", "dm", "spl";
fdt = "fdt-0";
};
};
If there are multiple boards that will support TIFSSTUB in future, I would
prefer templating these out and putting them in k3-binman.dtsi. However
considering there's a lot of movement currently (cleanup and OF_STREAM) in that
file, you can maybe take this up when adding support for the next board.
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
st blocker was signing not
working with the generator as you mentioned.
But again in the interest of time... this would mean this cleaning up effort be
kept on hold. If we can agree to move to using the generator later as the final
solution, can we pick up this series for now?
--
Thanking You
Neha Malcom Francis
Hi Michael
On 05/04/24 13:12, Michael Walle wrote:
Hi,
On Thu Apr 4, 2024 at 11:10 AM CEST, Neha Malcom Francis wrote:
But again in the interest of time... this would mean this cleaning up effort be
kept on hold. If we can agree to move to using the generator later as the final
solution, can
Hi Tom,
On 12-Apr-24 8:20 PM, Tom Rini wrote:
On Fri, Mar 22, 2024 at 06:40:07PM +0530, Neha Malcom Francis wrote:
This series does primarily three things:
1. Split out the common J721E defconfig for both EVM and SK
2. Cleanup k3-j721e-binman.dtsi to be SoC specific binman
J721E has SR1.1 and SR2.0 having three variants of each GP, HS-FS and
HS-SE. Current build does not generate HS-SE SR2.0 and HS-FS SR1.1 so
add support for them.
Reported-by: Suman Anna
Signed-off-by: Neha Malcom Francis
---
arch/arm/dts/k3-j721e-binman.dtsi | 201
Add support for missing HS SRs in the build for J721E and J7200.
Boot logs:
https://gist.github.com/nehamalcom/e652752623537aced8cf31308015d7c9
Neha Malcom Francis (2):
arm: dts: k3-j721e-binman: Add support for HSSE2.0 and HSFS1.1
arm: dts: k3-j7200-binman: Add support for HSSE1.0 and
J7200 has SR1.0 and SR2.0 having three variants of each GP, HS-FS and
HS-SE. Current build does not generate HS-SE SR1.0 and HS-FS SR1.0 so
add support for them.
Reported-by: Suman Anna
Reported-by: Aniket Limaye
Signed-off-by: Neha Malcom Francis
---
arch/arm/dts/k3-j7200-binman.dtsi | 95
Hi Andrew,
On 22-Apr-24 3:37 AM, Andrew Davis wrote:
On 4/22/24 4:40 PM, Neha Malcom Francis wrote:
J721E has SR1.1 and SR2.0 having three variants of each GP, HS-FS and
HS-SE. Current build does not generate HS-SE SR2.0 and HS-FS SR1.1 so
add support for them.
Reported-by: Suman Anna
Signed
Add support for missing HS SRs in the build for J721E and J7200.
Boot logs (updated for v2):
https://gist.github.com/nehamalcom/e652752623537aced8cf31308015d7c9
Changes since v2:
- removed redundant HS-SE SR2.0 generation for J721E (Andrew)
Neha Malcom Francis (2):
arm: dts: k3-j721e-binman
J721E has SR1.1 and SR2.0 having three variants of each GP, HS-FS and
HS-SE. Current build does not generate HS-FS SR1.1 so add support for
them.
Reported-by: Suman Anna
Signed-off-by: Neha Malcom Francis
---
Changes since v1:
- removed redundant HS-SE SR2.0 generation
arch/arm/dts/k3-j721e
J7200 has SR1.0 and SR2.0 having three variants of each GP, HS-FS and
HS-SE. Current build does not generate HS-SE SR1.0 and HS-FS SR1.0 so
add support for them.
Reported-by: Suman Anna
Reported-by: Aniket Limaye
Signed-off-by: Neha Malcom Francis
---
arch/arm/dts/k3-j7200-binman.dtsi | 95
now, templating is not widely
used, so I'm guessing some more minor fixes would be needed to get it
building as we intend.
If you are okay, I think we can take this series as is for now, I will
take action to start off a series cleaning up and using templating for
all the devices.
--
T
fconfig
@@ -8,7 +8,6 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2
CONFIG_SOC_K3_AM625=y
-CONFIG_K3_ATF_LOAD_ADDR=0x9e78
CONFIG_TARGET_VERDIN_AM62_A53=y
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b8
Reviewed-by: Neha Malcom Franc
hex "Load address of OPTEE image"
+ default 0x9e80
+ help
+ The load address for the OPTEE image. This value defaults to
0x9e800000
+ if not provided in the board defconfig file.
+
config K3_DM_FW
bool "Separate DM firmware image"
depends on CPU_V7R && (SOC_K3_J721E || SOC_K3_J721S2 || SOC_K3_AM625 || SOC_K3_AM62A7)
&& !CLK_TI_SCI && !TI_SCI_POWER_DOMAIN
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
nt fdt_fixup_msmc_ram_k3(void *blob);
int fdt_del_node_path(void *blob, const char *path);
+int fdt_fixup_reserved(void *blob, const char *name,
+ unsigned int new_address, unsigned int new_size);
#endif /* _COMMON_FDT_H */
This looks pretty neat! Thanks!
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
Hi Nishanth
On 16/02/24 21:28, Nishanth Menon wrote:
On 14:33-20240215, Neha Malcom Francis wrote:
[...]
if the templates are abstract enough, the additional code will be so
minimal that we wont need a board-binman.dtsi - just u-boot.dtsi and
r5.dtsi can include the relevant templates.
Hope
reescale/imxrt1050-evk/imximage.cfg
+++ b/board/freescale/imxrt1050-evk/imximage.cfg
@@ -29,7 +29,13 @@ BOOT_FROMsd
*value value to be stored in the register
*/
As a future plan do you think of moving .cfg files to within binman; you can see
'ti-board-config' entry as an example (tools/binman/etype/ti_board_config.py)
[...]
--
Thanking You
Neha Malcom Francis
: rebased on next, retested on all devices inc. commit]
Signed-off-by: Neha Malcom Francis
Cc: Andrew Davis
---
Boot logs:
https://gist.github.com/nehamalcom/7b101ea8b97f5a9433a553ef881166a1
arch/arm/mach-k3/arm64-mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch
Hi all,
Looks like this patch was already merged to u-boot/master
https://lore.kernel.org/all/20240109084551.21155-1-nsek...@ti.com/T/#md1fd66ff9f1cb93dfaa0dfb5f67d7452416e2cc2
Sorry for the spam!
On 22/02/24 12:15, Neha Malcom Francis wrote:
From: Sekhar Nori
An entry in memory map table
filename = "tee-raw.bin";
+ optional;
};
};
The patch excluding the commit message LGTM.
--
Thanking You
Neha Malcom Francis
t;;
+ break;
default:
family = "Unknown Silicon";
};
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
+ PSC_DEV(162, &soc_lpsc_list[6]),
+ PSC_DEV(75, &soc_lpsc_list[7]),
+ PSC_DEV(36, &soc_lpsc_list[8]),
+ PSC_DEV(102, &soc_lpsc_list[8]),
+ PSC_DEV(146, &soc_lpsc_list[8]),
+ PSC_DEV(166, &soc_lpsc_list[9]),
+ PSC_DEV(135, &soc_lpsc_list[10]),
+ PSC_DEV(170, &soc_lpsc_list[11]),
+ PSC_DEV(177, &soc_lpsc_list[12]),
+ PSC_DEV(55, &soc_lpsc_list[13]),
+};
+
+const struct ti_k3_pd_platdata am62px_pd_platdata = {
+ .psc = soc_psc_list,
+ .pd = soc_pd_list,
+ .lpsc = soc_lpsc_list,
+ .devs = soc_dev_list,
+ .num_psc = ARRAY_SIZE(soc_psc_list),
+ .num_pd = ARRAY_SIZE(soc_pd_list),
+ .num_lpsc = ARRAY_SIZE(soc_lpsc_list),
+ .num_devs = ARRAY_SIZE(soc_dev_list),
+};
diff --git a/drivers/clk/ti/clk-k3.c b/drivers/clk/ti/clk-k3.c
index eb76195bd75da..ef7cac937f25f 100644
--- a/drivers/clk/ti/clk-k3.c
+++ b/drivers/clk/ti/clk-k3.c
@@ -86,6 +86,12 @@ static const struct soc_attr ti_k3_soc_clk_data[] = {
.family = "AM62AX",
.data = &am62ax_clk_platdata,
},
+#endif
+#ifdef CONFIG_SOC_K3_AM62P5
+ {
+ .family = "AM62PX",
+ .data = &am62px_clk_platdata,
+ },
#endif
{ /* sentinel */ }
};
diff --git a/drivers/power/domain/ti-power-domain.c
b/drivers/power/domain/ti-power-domain.c
index dc5d74539edcf..c2f58c7af2131 100644
--- a/drivers/power/domain/ti-power-domain.c
+++ b/drivers/power/domain/ti-power-domain.c
@@ -99,6 +99,12 @@ static const struct soc_attr ti_k3_soc_pd_data[] = {
.family = "AM62AX",
.data = &am62ax_pd_platdata,
},
+#endif
+#if IS_ENABLED(CONFIG_SOC_K3_AM62P5)
+ {
+ .family = "AM62PX",
+ .data = &am62px_pd_platdata,
+ },
#endif
{ /* sentinel */ }
};
diff --git a/include/k3-clk.h b/include/k3-clk.h
index 1b6ab8fe65405..74d1741c9f24c 100644
--- a/include/k3-clk.h
+++ b/include/k3-clk.h
@@ -176,6 +176,7 @@ extern const struct ti_k3_clk_platdata j7200_clk_platdata;
extern const struct ti_k3_clk_platdata j721s2_clk_platdata;
extern const struct ti_k3_clk_platdata am62x_clk_platdata;
extern const struct ti_k3_clk_platdata am62ax_clk_platdata;
+extern const struct ti_k3_clk_platdata am62px_clk_platdata;
struct clk *clk_register_ti_pll(const char *name, const char *parent_name,
void __iomem *reg);
diff --git a/include/k3-dev.h b/include/k3-dev.h
index 072e10ba6321f..80797a9c3dac2 100644
--- a/include/k3-dev.h
+++ b/include/k3-dev.h
@@ -80,6 +80,7 @@ extern const struct ti_k3_pd_platdata j7200_pd_platdata;
extern const struct ti_k3_pd_platdata j721s2_pd_platdata;
extern const struct ti_k3_pd_platdata am62x_pd_platdata;
extern const struct ti_k3_pd_platdata am62ax_pd_platdata;
+extern const struct ti_k3_pd_platdata am62px_pd_platdata;
u8 ti_pd_state(struct ti_pd *pd);
u8 lpsc_get_state(struct ti_lpsc *lpsc);
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
K3_AM64_DDRSS if SOC_K3_AM625
- default K3_AM62A_DDRSS if SOC_K3_AM62A7
+ default K3_AM62A_DDRSS if SOC_K3_AM62A7 || SOC_K3_AM62P5
config K3_J721E_DDRSS
bool "Enable J721E DDRSS support"
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
C_K3_AM642 && !SOC_K3_AM654 && !CLK_TI_SCI &&
!TI_SCI_POWER_DOMAIN
default y
help
Enabling this will indicate that the system has separate DM
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
.SECONDEXPANSION:
-$(SHRUNK_ARCH_DTB): $$(patsubst $(obj)/dts/%, arch/$(ARCH)/dts/%, $$@) dts_dir
+$(SHRUNK_ARCH_DTB): $$(patsubst $(obj)/dts/%, $(dt_dir)/%, $$@) $(dir
$(SHRUNK_ARCH_DTB))
$(call if_changed,fdtgrep)
targets += $(SPL_OF_LIST_TARGETS)
--
Thanking You
Neha Malcom Francis
Hi Sumit
On 27/02/24 14:29, Sumit Garg wrote:
Hi Neha,
On Tue, 27 Feb 2024 at 13:53, Neha Malcom Francis wrote:
Hi Bryan
On 27/02/24 02:49, Bryan Brattlof wrote:
Some boards that choose to utilize the OF_UPSTREAM directory for their
device tree files will need to specify that directory
/3b578dfa1ef83b59f3c309557606ed63
Neha Malcom Francis (4):
configs: j721e_sk: Move to separate defconfig for J721E SK board
tools: binman: control.py: Delete template nodes after parsing
arm: dts: k3-j721e: Separate boot binary build
arm: dts: k3-j721e: Move to OF_UPSTREAM
arch/arm/dts/Makefile
Add defconfig for J721E SK R5 and A72 configuration.
This includes and modifies the J721E EVM defconfigs:
j721e_evm_r5_defconfig -> j721e_sk_r5_defconfig
j721e_evm_a72_defconfig -> j721e_sk_a72_defconfig
Signed-off-by: Neha Malcom Francis
---
board/ti/j721e/MAINTAINERS | 2 ++
c
Dynamically going through the subnode array and deleting leads to
templates being skipped from deletion when templates are consecutive in
the subnode list. Prevent this from happening by first parsing the DT
and then deleting the nodes.
Signed-off-by: Neha Malcom Francis
---
tools/binman
he -u-boot.dtsi file to allow clear distinction between the
SoC common stuff vs. what is needed to boot up a board.
Signed-off-by: Neha Malcom Francis
---
Note: I have added "dummy" sections so that node for a phandle is found
correctly. The node for a phandle is searched for among sub-nod
Hi Andrew
On 28/02/24 20:41, Andrew Davis wrote:
On 2/28/24 5:20 AM, Neha Malcom Francis wrote:
Add defconfig for J721E SK R5 and A72 configuration.
This includes and modifies the J721E EVM defconfigs:
j721e_evm_r5_defconfig -> j721e_sk_r5_defconfig
j721e_evm_a72_defcon
Hi Manorit
On 01/03/24 10:56, Manorit Chawdhry wrote:
Hi Neha,
On 16:50-20240228, Neha Malcom Francis wrote:
Separate out the boot binaries built for J721E boards; J721E EVM and
J721E SK by using the common templates in k3-j721e-binman.dtsi.
Only the required boot binaries can be built from
4evm.cfg
diff --git a/doc/board/ti/k3.rst b/doc/board/ti/k3.rst
index 3c33efd2e38..15e1ed232bf 100644
--- a/doc/board/ti/k3.rst
+++ b/doc/board/ti/k3.rst
@@ -41,6 +41,7 @@ K3 Based SoCs
../beagle/j721e_beagleboneai64
j721e_evm
j721s2_evm
+ j784s4_evm
Boot Flow Overview
--
spl_j784s4_evm_dtb {
+ filename = SPL_AM69_SK_DTB;
+};
+
+&j784s4_evm_dtb {
+ filename = AM69_SK_DTB;
+};
+
+&spl_j784s4_evm_dtb_unsigned {
+ filename = SPL_AM69_SK_DTB;
+};
+
+&j784s4_evm_dtb_unsigned {
+ filename = AM69_SK_DTB;
+};
+
+#endif
diff --git a/board/ti/j784s4/MAINTAINERS b/board/ti/j784s4/MAINTAINERS
index ff00cc60868..8b03a7adb1e 100644
--- a/board/ti/j784s4/MAINTAINERS
+++ b/board/ti/j784s4/MAINTAINERS
@@ -8,3 +8,9 @@ F: arch/arm/dts/k3-j784s4-evm-u-boot.dtsi
F:arch/arm/dts/k3-j784s4-r5-evm.dts
F:arch/arm/dts/k3-j784s4-ddr.dtsi
F:arch/arm/dts/k3-j784s4-ddr-evm-lp4-4266.dtsi
+
+AM69 SK BOARD
+M: Apurva Nandan
+S: Maintained
+F: arch/arm/dts/k3-am69-sk-u-boot.dtsi
+F: arch/arm/dts/k3-am69-r5-sk.dts
Reviewed-by: Neha Malcom Francis
--
Thanking You
Neha Malcom Francis
itb using new etype x509
- sysfw --> ti-sysfw
- Reformatted and re-arranged patches
- Removed k3_fit_atf.sh and k3_gen_x509_cert.sh as their functionality
is provided by binman now
Neha Malcom Francis (11):
j721e_evm: schema: yaml: Add general schema and J721E board config
files
ti:
[n-fran...@ti.com: prepared patch for upstreaming]
Signed-off-by: Neha Malcom Francis
---
test/py/requirements.txt | 1 +
tools/tibcfg_gen.py | 114 +++
2 files changed, 115 insertions(+)
create mode 100644 tools/tibcfg_gen.py
diff --git a/test/py
For K3 devices that require a sysfw image, add entry for SYSFW. It can
contain system firmware image that can be packaged into sysfw.itb by
binman.
Signed-off-by: Tarun Sahu
[n-fran...@ti.com: added tests for addition of etype]
Signed-off-by: Neha Malcom Francis
---
Makefile
ng of
tispl.bin by binman along with ATF and TEE.
Signed-off-by: Neha Malcom Francis
---
Makefile| 1 +
tools/binman/entries.rst| 10 ++
tools/binman/etype/ti_dm.py | 23 +++
tools/binman/ftest.py | 7 +++
tools/binman
be prepended to the R5 SPL.
Signed-off-by: Neha Malcom Francis
---
test/py/requirements.txt| 1 +
tools/binman/entries.rst| 15 ++
tools/binman/etype/ti_x509_cert.py | 241
tools/binman/ftest.py | 6 +
tools/binman/test
-off-by: Neha Malcom Francis
---
arch/arm/mach-k3/config.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/mach-k3/config.mk b/arch/arm/mach-k3/config.mk
index ed605adf39..d706d17788 100644
--- a/arch/arm/mach-k3/config.mk
+++ b/arch/arm/mach-k3/config.mk
@@ -46,6 +46,7 @@ INPUTS-y
For devices that require sysfw.itb, board config binary artifacts must
be populated in the R5 output directory. These can be used by binman to
package sysfw.itb.
config.mk for mach-k3 updated to generate the required binaries using
tibcfg_gen.py.
Signed-off-by: Neha Malcom Francis
---
arch/arm
tispl.bin is to be packaged (with ATF, OPTEE, DM and A72 SPL) using
binman. The tispl.bin target from the makefile is no longer needed for
J721E.
Signed-off-by: Neha Malcom Francis
---
arch/arm/mach-k3/config.mk | 5 +
scripts/Makefile.spl | 2 ++
2 files changed, 7 insertions
Signed-off-by: Neha Malcom Francis
---
arch/arm/dts/k3-j721e-a72-binman.dtsi | 86 +++
.../k3-j721e-common-proc-board-u-boot.dtsi| 1 +
board/ti/j721e/Kconfig| 1 +
3 files changed, 88 insertions(+)
create mode 100644 arch/arm/dts/k3-j721e-a72
then be include by files that require it like
k3-j721e-r5-common-proc-board-u-boot.dtsi.
Signed-off-by: Tarun Sahu
[n-fran...@ti.com: prepared patch for upstreaming]
Signed-off-by: Neha Malcom Francis
---
arch/arm/dts/k3-j721e-r5-binman.dtsi | 88 +++
.../k3-j721e-r5
To avoid ModuleNotFoundErrors during World Build in CI tests, add
installation of test/py/requirements.txt to .azure-pipelines.yml
Signed-off-by: Neha Malcom Francis
---
.azure-pipelines.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index
401 - 500 of 751 matches
Mail list logo
