* [GIT PULL] mpc85xx changes for v2022.10-rc5
@ 2022-09-18 13:38 Marek Behún
2022-09-18 19:12 ` Tom Rini
2022-09-19 7:53 ` Pali Rohár
0 siblings, 2 replies; 6+ messages in thread
From: Marek Behún @ 2022-09-18 13:38 UTC (permalink / raw)
To: Tom Rini; +Cc: U-Boot Mailing List
-----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(-)
-----BEGIN PGP SIGNATURE-----
iQIvBAEBCAAdFiEElcYtIkjuDYpEw9O0Jrz6Bfz2DkwFAmMnH2wACgkQJrz6Bfz2
DkwV0Q/fecVxL8R3agViB3gayu6sYKCkKVKQ2pLrjoqISBmKi5sLkvOREtbTGybn
bugpvdVD+ngN77h59ySoG0zoVVgMC4nDveqdCy96PNl4a7VUOMOBdae5pJLnjm8t
eAa3VV+7EFQvuih35jZDn0j85+aqU0bz4GBZUdlBPghrh88X+ph3z778aWgHZ9LT
YK4RXovkAuJN7nrhdXU0MLO377aYJCzTMawCSE638YET1Frk87bEe22d7TWV1QoS
pSvMVJdlWvMwKlmJumNf5LXliffSYtOFfaPlutLpdX/eB5RmZ1wyKbYC+TLbTL98
XDpc6LvZaGF3+x5t1OE5a3McSXLYnl5USyMaWaGYcNMKcG4AUXOKPTTK4nKx+COu
Htjvqj7U6uPFfzzPCQzBv50GyfUUyVW1orZHSCigiFs5Ub53tcy8v17i5vsMMjpT
nXCAlGE90ERLjXli4fmncc34WmZBGE1/7auypzC6Ke1Q0gFdZztVYbhVQfukzXex
yPZ0SsUfDr+3JjM/FiJQriT5NOJT3qui3EAxBBgUaWLjKEmLAwWKqc7t1bO/izRh
JlH+f6pqPQFbMvJNf+bDSYZeReThPab4ILlxROcXcamogzlGcAdmeYyhRQUyTvoF
aiiZHATS3JTrZKwuXFEtVWdiAT/8Xv1UptFtUPszsh+i5g==
=VECb
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] mpc85xx changes for v2022.10-rc5
2022-09-18 13:38 [GIT PULL] mpc85xx changes for v2022.10-rc5 Marek Behún
@ 2022-09-18 19:12 ` Tom Rini
2022-09-19 7:53 ` Pali Rohár
1 sibling, 0 replies; 6+ messages in thread
From: Tom Rini @ 2022-09-18 19:12 UTC (permalink / raw)
To: Marek Behún; +Cc: U-Boot Mailing List
[-- Attachment #1: Type: text/plain, Size: 1009 bytes --]
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!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] mpc85xx changes for v2022.10-rc5
2022-09-18 13:38 [GIT PULL] mpc85xx changes for v2022.10-rc5 Marek Behún
2022-09-18 19:12 ` Tom Rini
@ 2022-09-19 7:53 ` Pali Rohár
2022-09-19 9:32 ` [PATCH] powerpc: mpc85xx: Fix incorrect application of patch Marek Behún
1 sibling, 1 reply; 6+ messages in thread
From: Pali Rohár @ 2022-09-19 7:53 UTC (permalink / raw)
To: Marek Behún, Tom Rini; +Cc: U-Boot Mailing List
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(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] powerpc: mpc85xx: Fix incorrect application of patch
2022-09-19 7:53 ` Pali Rohár
@ 2022-09-19 9:32 ` Marek Behún
2022-09-19 9:33 ` Pali Rohár
2022-09-19 12:31 ` Tom Rini
0 siblings, 2 replies; 6+ messages in thread
From: Marek Behún @ 2022-09-19 9:32 UTC (permalink / raw)
To: Tom Rini, Pali Rohár; +Cc: U-Boot Mailing List, Marek Behún
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
--
2.35.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] powerpc: mpc85xx: Fix incorrect application of patch
2022-09-19 9:32 ` [PATCH] powerpc: mpc85xx: Fix incorrect application of patch Marek Behún
@ 2022-09-19 9:33 ` Pali Rohár
2022-09-19 12:31 ` Tom Rini
1 sibling, 0 replies; 6+ messages in thread
From: Pali Rohár @ 2022-09-19 9:33 UTC (permalink / raw)
To: Marek Behún; +Cc: Tom Rini, U-Boot Mailing List
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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] powerpc: mpc85xx: Fix incorrect application of patch
2022-09-19 9:32 ` [PATCH] powerpc: mpc85xx: Fix incorrect application of patch Marek Behún
2022-09-19 9:33 ` Pali Rohár
@ 2022-09-19 12:31 ` Tom Rini
1 sibling, 0 replies; 6+ messages in thread
From: Tom Rini @ 2022-09-19 12:31 UTC (permalink / raw)
To: Marek Behún; +Cc: Pali Rohár, U-Boot Mailing List
[-- Attachment #1: Type: text/plain, Size: 700 bytes --]
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!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-09-19 12:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-18 13:38 [GIT PULL] mpc85xx changes for v2022.10-rc5 Marek Behún
2022-09-18 19:12 ` Tom Rini
2022-09-19 7:53 ` Pali Rohár
2022-09-19 9:32 ` [PATCH] powerpc: mpc85xx: Fix incorrect application of patch Marek Behún
2022-09-19 9:33 ` Pali Rohár
2022-09-19 12:31 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox