Skip to content

Fix boot / mmc dev id for apalis-imx6#1134

Merged
ricardosalveti merged 2 commits intofoundriesio:mainfrom
ricardosalveti:apalis
May 4, 2023
Merged

Fix boot / mmc dev id for apalis-imx6#1134
ricardosalveti merged 2 commits intofoundriesio:mainfrom
ricardosalveti:apalis

Conversation

@ricardosalveti
Copy link
Copy Markdown
Member

@ricardosalveti ricardosalveti commented May 4, 2023

No description provided.

@ricardosalveti
base: u-boot-fio: imx-2022.04: bump to 30e6a51d9e2
b237abd 
Relevant changes:
- 30e6a51d9e2 [FIO backport] ARM: dts: imx6-apalis: sync mmc aliases with kernel

Signed-off-by: Ricardo Salveti <[email protected]>
@ricardosalveti ricardosalveti requested a review from a team May 4, 2023 14:12
@ricardosalveti
Copy link
Copy Markdown
Member Author

ricardosalveti commented May 4, 2023

Still requires minor changes when flashing as it is still looking for mmc 0.

igoropaniuk
igoropaniuk approved these changes May 4, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@igoropaniuk igoropaniuk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ricardosalveti
Copy link
Copy Markdown
Member Author

ricardosalveti commented May 4, 2023 

diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool/apalis-imx6/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool/apalis-imx6/lmp.cfg
index 94fc1390..126c73c9 100644
--- a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool/apalis-imx6/lmp.cfg
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio-mfgtool/apalis-imx6/lmp.cfg
@@ -26,6 +26,7 @@ CONFIG_SHA256=y
 # CONFIG_SPL_FIOVB is not set
 CONFIG_FSL_FASTBOOT_BOOTLOADER2_OFFSET=0x100
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x100
+CONFIG_SYS_MMC_ENV_DEV=2
 CONFIG_IMX_HAB=y
 # CONFIG_CMD_DEKBLOB is not set
 CONFIG_TEE=y
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6-sec/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6-sec/lmp.cfg
index a8715890..f86201d6 100644
--- a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6-sec/lmp.cfg
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6-sec/lmp.cfg
@@ -20,6 +20,7 @@ CONFIG_CMD_SECONDARY_BOOT=y
 CONFIG_SECONDARY_BOOT_RUNTIME_DETECTION=y
 CONFIG_SECONDARY_BOOT_SECTOR_OFFSET=0x800
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x100
+CONFIG_SYS_MMC_ENV_DEV=2
 CONFIG_FSL_USDHC=y
 CONFIG_WDT=y
 CONFIG_WATCHDOG=y
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6/lmp.cfg
index 748b95f5..4148bab8 100644
--- a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6/lmp.cfg
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx6/lmp.cfg
@@ -20,6 +20,7 @@ CONFIG_CMD_SECONDARY_BOOT=y
 CONFIG_SECONDARY_BOOT_RUNTIME_DETECTION=y
 CONFIG_SECONDARY_BOOT_SECTOR_OFFSET=0x800
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x100
+CONFIG_SYS_MMC_ENV_DEV=2
 CONFIG_FSL_USDHC=y
 CONFIG_WDT=y
 CONFIG_WATCHDOG=y

@ricardosalveti
bsp: u-boot-fio/mfgtool: apalis-imx6: sync mmc dev alias with kernel
361c340 
Sync the mmc device used by u-boot with the same alias/number as defined
by the kernel, otherwise the mismatch can cause the root argument to be
invalid.

Signed-off-by: Ricardo Salveti <[email protected]>
@ricardosalveti ricardosalveti merged commit 3ffb58e into foundriesio:main May 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@angolini angolini angolini approved these changes

@igoropaniuk igoropaniuk igoropaniuk approved these changes

+1 more reviewer

@MrCry0 MrCry0 MrCry0 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ricardosalveti @MrCry0 @angolini @igoropaniuk