[GIT PULL] mpc85xx changes for v2022.10-rc5
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
Hello Tom,
I am sending some fixes for mpc85xx v2022.10-rc5. The other patches from Pali require some more work, I am working on them.
The following changes since commit 4f2c559b9a2ad86e03dffeef720257ea680707d0:
Merge tag 'u-boot-stm32-20220915' of https://source.denx.de/u-boot/custodians/u-boot-stm (2022-09-15 12:17:49 -0400)
are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-mpc85xx.git mpc85xx-for-v2022.10-rc5
for you to fetch changes up to 5a428e751044525f95d15f180188cc7433648b82:
mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS (2022-09-16 18:46:14 +0200)
- ---------------------------------------------------------------- Marek Behún (1): powerpc: mpc85xx: Fix check for CONFIG_SDCARD
Pali Rohár (7): Makefile: Fix dependency for u-boot-with-dtb.bin Makefile: Build final mpc85xx non-SPL image in standard file u-boot.bin Makefile: Reduce usage of custom mpc85xx u-boot.bin target Makefile: Unify condition for mpc85xx reset vector mmc: fsl_esdhc_spl: Add support for loading proper U-Boot from unaligned location powerpc: mpc85xx: Fix loading U-Boot proper from SD card in SPL mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS
Makefile | 26 +++++++------------------- arch/powerpc/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 12 +++++++++++- arch/powerpc/dts/kmcent2-u-boot.dtsi | 2 +- arch/powerpc/dts/u-boot.dtsi | 10 +++++----- board/freescale/p1_p2_rdb_pc/README | 2 +- board/freescale/p2041rdb/README | 3 --- board/freescale/t102xrdb/README | 2 +- board/freescale/t104xrdb/README | 2 +- board/freescale/t208xqds/README | 2 +- board/freescale/t208xrdb/README | 2 +- drivers/mmc/fsl_esdhc_spl.c | 43 ++++++++++++++++++++++++++++++++++--------- 13 files changed, 65 insertions(+), 45 deletions(-)
On Sun, Sep 18, 2022 at 03:38:52PM +0200, Marek Behún wrote:
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
Hello Tom,
I am sending some fixes for mpc85xx v2022.10-rc5. The other patches from Pali require some more work, I am working on them.
The following changes since commit 4f2c559b9a2ad86e03dffeef720257ea680707d0:
Merge tag 'u-boot-stm32-20220915' of https://source.denx.de/u-boot/custodians/u-boot-stm (2022-09-15 12:17:49 -0400)
are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-mpc85xx.git mpc85xx-for-v2022.10-rc5
for you to fetch changes up to 5a428e751044525f95d15f180188cc7433648b82:
mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS (2022-09-16 18:46:14 +0200)
For future reference, if you supply a short summary of the changes either in the tag or the email, I put that in the merge commit. With that, applied to u-boot/master, thanks!
On Sunday 18 September 2022 15:38:52 Marek Behún wrote:
Hello Tom,
I am sending some fixes for mpc85xx v2022.10-rc5. The other patches from Pali require some more work, I am working on them.
The following changes since commit 4f2c559b9a2ad86e03dffeef720257ea680707d0:
Merge tag 'u-boot-stm32-20220915' of https://source.denx.de/u-boot/custodians/u-boot-stm (2022-09-15 12:17:49 -0400)
are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-mpc85xx.git mpc85xx-for-v2022.10-rc5
for you to fetch changes up to 5a428e751044525f95d15f180188cc7433648b82:
mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS (2022-09-16 18:46:14 +0200)
Marek Behún (1): powerpc: mpc85xx: Fix check for CONFIG_SDCARD
Pali Rohár (7): Makefile: Fix dependency for u-boot-with-dtb.bin Makefile: Build final mpc85xx non-SPL image in standard file u-boot.bin Makefile: Reduce usage of custom mpc85xx u-boot.bin target Makefile: Unify condition for mpc85xx reset vector mmc: fsl_esdhc_spl: Add support for loading proper U-Boot from unaligned location powerpc: mpc85xx: Fix loading U-Boot proper from SD card in SPL mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS
Hello! This last commit in above git repository is broken and does not match the version which I sent to the list. It uses non-existent U-Boot macros. Please fix it, e.g. by applying my original version which I sent to the list, which is still correct.
Makefile | 26 +++++++------------------- arch/powerpc/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 12 +++++++++++- arch/powerpc/dts/kmcent2-u-boot.dtsi | 2 +- arch/powerpc/dts/u-boot.dtsi | 10 +++++----- board/freescale/p1_p2_rdb_pc/README | 2 +- board/freescale/p2041rdb/README | 3 --- board/freescale/t102xrdb/README | 2 +- board/freescale/t104xrdb/README | 2 +- board/freescale/t208xqds/README | 2 +- board/freescale/t208xrdb/README | 2 +- drivers/mmc/fsl_esdhc_spl.c | 43 ++++++++++++++++++++++++++++++++++--------- 13 files changed, 65 insertions(+), 45 deletions(-)
I messed up application of patch 5a428e751044 ("mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS"). I took it from a work-in-progress branch where I changed usage of CONFIG_SDCARD to CONFIG_SD_BOOT and refactored SYS_MPC85XX_NO_RESETVEC mess.
But these changes aren't in master yet. Fix the wrong usage of these macros.
Fixes: 5a428e751044 ("mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS") Signed-off-by: Marek Behún kabel@kernel.org --- Tom, should I send another PR with this fix or do you want to apply it yourself?
BTW sorry about this. It wasn't caught by CI and I wanted to send at least the fixes to master ASAP. I now looked again together with Pali at the rest of the patches and they are fine. --- arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds index a36aa1793d..f28826c5d1 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds @@ -63,8 +63,8 @@ SECTIONS __init_end = .; _end = .;
-#ifndef KEEP_RESET_VECTOR -#if defined(CONFIG_SD_BOOT) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS) +#if CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC) +#if defined(CONFIG_SDCARD) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS) mmc_u_boot_offs = .; #endif #endif @@ -101,7 +101,7 @@ SECTIONS .resetvec IMAGE_TEXT_BASE + RESET_VECTOR_OFFSET : { KEEP(*(.resetvec)) } = 0xffff -#if defined(CONFIG_SD_BOOT) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS) +#if defined(CONFIG_SDCARD) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS) mmc_u_boot_offs = .; #endif #endif
On Monday 19 September 2022 11:32:08 Marek Behún wrote:
I messed up application of patch 5a428e751044 ("mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS"). I took it from a work-in-progress branch where I changed usage of CONFIG_SDCARD to CONFIG_SD_BOOT and refactored SYS_MPC85XX_NO_RESETVEC mess.
But these changes aren't in master yet. Fix the wrong usage of these macros.
Fixes: 5a428e751044 ("mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS") Signed-off-by: Marek Behún kabel@kernel.org
Reviewed-by: Pali Rohár pali@kernel.org
Tom, should I send another PR with this fix or do you want to apply it yourself?
BTW sorry about this. It wasn't caught by CI and I wanted to send at least the fixes to master ASAP. I now looked again together with Pali at the rest of the patches and they are fine.
arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds index a36aa1793d..f28826c5d1 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds @@ -63,8 +63,8 @@ SECTIONS __init_end = .; _end = .;
-#ifndef KEEP_RESET_VECTOR -#if defined(CONFIG_SD_BOOT) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS) +#if CONFIG_IS_ENABLED(SYS_MPC85XX_NO_RESETVEC) +#if defined(CONFIG_SDCARD) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS) mmc_u_boot_offs = .; #endif #endif @@ -101,7 +101,7 @@ SECTIONS .resetvec IMAGE_TEXT_BASE + RESET_VECTOR_OFFSET : { KEEP(*(.resetvec)) } = 0xffff -#if defined(CONFIG_SD_BOOT) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS) +#if defined(CONFIG_SDCARD) && !defined(CONFIG_SYS_MMC_U_BOOT_OFFS) mmc_u_boot_offs = .; #endif
#endif
2.35.1
On Mon, Sep 19, 2022 at 11:32:08AM +0200, Marek Behún wrote:
I messed up application of patch 5a428e751044 ("mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS"). I took it from a work-in-progress branch where I changed usage of CONFIG_SDCARD to CONFIG_SD_BOOT and refactored SYS_MPC85XX_NO_RESETVEC mess.
But these changes aren't in master yet. Fix the wrong usage of these macros.
Fixes: 5a428e751044 ("mmc: fsl_esdhc_spl: Add support for builds without CONFIG_SYS_MMC_U_BOOT_OFFS") Signed-off-by: Marek Behún kabel@kernel.org Reviewed-by: Pali Rohár pali@kernel.org
Applied to u-boot/master, thanks!
participants (3)
-
Marek Behún -
Pali Rohár -
Tom Rini