Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return back small padding for imx8m only #1111

Merged
merged 2 commits into from
Apr 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion meta-lmp-base/recipes-bsp/u-boot/u-boot-fio_imx-2022.04.bb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require u-boot-fio-common.inc

SRCREV = "5a79149fc088491d650bcaccc9c70504c8d8dee8"
SRCREV = "9af5f2d5c60e170fe25cc1301c272169dafc8290"
SRCBRANCH = "2022.04+lf-5.15.71-2.2.0-fio"
LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From 31cb17bb67d2af4d944f259c7b9928e9349e31e3 Mon Sep 17 00:00:00 2001
From: Nate Drude <[email protected]>
Date: Mon, 14 Sep 2020 15:10:16 -0500
Subject: [PATCH] iMX8M: change DDR DMEM padding

Following U-boot's change 4332fdd (Change padding of DDR4 and LPDDR4 DMEM)
align the padding of DDR DMEM fw in imx-mkimage as well.

From meta-variscite-fslc ad930227.

Signed-off-by: Nate Drude <[email protected]>
Signed-off-by: Vanessa Maegima <[email protected]>
---
iMX8M/soc.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak
index edcc397..b03455e 100644
--- a/iMX8M/soc.mak
+++ b/iMX8M/soc.mak
@@ -97,7 +97,7 @@ u-boot-spl-combine:

u-boot-spl-ddr.bin: u-boot-spl.bin $(lpddr4_imem_1d) $(lpddr4_dmem_1d) $(lpddr4_imem_2d) $(lpddr4_dmem_2d)
@objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 $(lpddr4_imem_1d) lpddr4_pmu_train_1d_imem_pad.bin
- @objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 $(lpddr4_dmem_1d) lpddr4_pmu_train_1d_dmem_pad.bin
+ @objcopy -I binary -O binary --pad-to 0x1000 --gap-fill=0x0 $(lpddr4_dmem_1d) lpddr4_pmu_train_1d_dmem_pad.bin
@objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 $(lpddr4_imem_2d) lpddr4_pmu_train_2d_imem_pad.bin
@cat lpddr4_pmu_train_1d_imem_pad.bin lpddr4_pmu_train_1d_dmem_pad.bin > lpddr4_pmu_train_1d_fw.bin
@cat lpddr4_pmu_train_2d_imem_pad.bin $(lpddr4_dmem_2d) > lpddr4_pmu_train_2d_fw.bin
--
2.25.1

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ SRC_URI:append:mx8m-nxp-bsp = " \
file://0002-iMX8M-add-SPL-only-build.patch \
file://0003-iMX8M-add-support-for-packing-HDMI-fw-in-SPL-only-bo.patch \
file://0004-iMX8M-also-create-nohdmi-boot-image.patch \
file://0001-iMX8M-change-DDR-DMEM-padding.patch \
file://0001-iMX8M-add-SPL-only-build-for-DDR4.patch \
"

Expand Down