[U-Boot] [PATCH] imx: sys_proto: Fixing function imx6_is_bmode_from_gpr9()
A return type of u08 cuts the return value always to 0, because IMX6_SRC_GPR10_BMODE = bit 28 is above u08. Changing the return type to u32 gives the function the expected operation.
Fixes: cba586b400 ("imx6: Add imx6_src_get_boot_mode") Signed-off-by: Christoph Niedermaier cniedermaier@dh-electronics.com --- arch/arm/include/asm/mach-imx/sys_proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index aa66fdc88f..5222f6957d 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -99,7 +99,7 @@ enum imx6_bmode { IMX6_BMODE_NAND_MAX = 0xf, };
-static inline u8 imx6_is_bmode_from_gpr9(void) +static inline u32 imx6_is_bmode_from_gpr9(void) { return readl(&src_base->gpr10) & IMX6_SRC_GPR10_BMODE; }
Hi Christoph,
On 14/10/19 14:27, Christoph Niedermaier wrote:
A return type of u08 cuts the return value always to 0, because IMX6_SRC_GPR10_BMODE = bit 28 is above u08. Changing the return type to u32 gives the function the expected operation.
Fixes: cba586b400 ("imx6: Add imx6_src_get_boot_mode") Signed-off-by: Christoph Niedermaier cniedermaier@dh-electronics.com
arch/arm/include/asm/mach-imx/sys_proto.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index aa66fdc88f..5222f6957d 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -99,7 +99,7 @@ enum imx6_bmode { IMX6_BMODE_NAND_MAX = 0xf, };
-static inline u8 imx6_is_bmode_from_gpr9(void) +static inline u32 imx6_is_bmode_from_gpr9(void) { return readl(&src_base->gpr10) & IMX6_SRC_GPR10_BMODE; }
This is correct but it rather conflicts with another patch I already applied. Could you rebase and repost ? Thanks !
Best regards, Stefano Babic
Hi Stefano, Christoph,
On Tue, 5 Nov 2019 16:57:18 +0100 Stefano Babic sbabic@denx.de wrote: ...
-static inline u8 imx6_is_bmode_from_gpr9(void) +static inline u32 imx6_is_bmode_from_gpr9(void) { return readl(&src_base->gpr10) & IMX6_SRC_GPR10_BMODE; }
This is correct but it rather conflicts with another patch I already applied. Could you rebase and repost ? Thanks !
This function was removed by Claudius (see commit ID e01c8cfe5769) since there are no users any more. No need to rebase/repost.
-- Anatolij
On 05/11/19 17:05, Anatolij Gustschin wrote:
Hi Stefano, Christoph,
On Tue, 5 Nov 2019 16:57:18 +0100 Stefano Babic sbabic@denx.de wrote: ...
-static inline u8 imx6_is_bmode_from_gpr9(void) +static inline u32 imx6_is_bmode_from_gpr9(void) { return readl(&src_base->gpr10) & IMX6_SRC_GPR10_BMODE; }
This is correct but it rather conflicts with another patch I already applied. Could you rebase and repost ? Thanks !
This function was removed by Claudius (see commit ID e01c8cfe5769)
Yes, but this check just one bit.
since there are no users any more.
Oh yes, you're right !
No need to rebase/repost.
Regards, Stefano
participants (3)
-
Anatolij Gustschin -
Christoph Niedermaier -
Stefano Babic