* [U-Boot] [PATCH] ARM: socfpga: boot0 hook: remove macro from boot0 header file
@ 2017-03-29 3:49 tien.fong.chee at intel.com
2017-03-29 9:03 ` Marek Vasut
2017-03-31 11:14 ` Marek Vasut
0 siblings, 2 replies; 8+ messages in thread
From: tien.fong.chee at intel.com @ 2017-03-29 3:49 UTC (permalink / raw)
To: u-boot
From: "Chee, Tien Fong" <tien.fong.chee@intel.com>
Commit ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
header file") miss out cleaning macro in this header file, and this
has broken implementation of a boot header capability in socfpga
SPL. Remove the macro in this file, and recovering it back
to proper functioning.
Fixes: ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
header file")
Signed-off-by: Chee, Tien Fong <tien.fong.chee@intel.com>
---
arch/arm/mach-socfpga/include/mach/boot0.h | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h b/arch/arm/mach-socfpga/include/mach/boot0.h
index aaada31..22d9e7f 100644
--- a/arch/arm/mach-socfpga/include/mach/boot0.h
+++ b/arch/arm/mach-socfpga/include/mach/boot0.h
@@ -8,21 +8,17 @@
#define __BOOT0_H
#ifdef CONFIG_SPL_BUILD
-#define ARM_SOC_BOOT0_HOOK \
- .balignl 64,0xf33db33f; \
- \
- .word 0x1337c0d3; /* SoCFPGA preloader validation word */ \
- .word 0xc01df00d; /* Version, flags, length */ \
- .word 0xcafec0d3; /* Checksum, zero-pad */ \
- nop; \
- \
- b reset; /* SoCFPGA jumps here */ \
- nop; \
- nop; \
+ .balignl 64,0xf33db33f;
+
+ .word 0x1337c0d3; /* SoCFPGA preloader validation word */
+ .word 0xc01df00d; /* Version, flags, length */
+ .word 0xcafec0d3; /* Checksum, zero-pad */
nop;
-#else
-#define ARM_SOC_BOOT0_HOOK
-#endif
+ b reset; /* SoCFPGA jumps here */
+ nop;
+ nop;
+ nop;
+#endif
#endif /* __BOOT0_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [U-Boot] [PATCH] ARM: socfpga: boot0 hook: remove macro from boot0 header file
2017-03-29 3:49 [U-Boot] [PATCH] ARM: socfpga: boot0 hook: remove macro from boot0 header file tien.fong.chee at intel.com
@ 2017-03-29 9:03 ` Marek Vasut
2017-03-30 1:22 ` chee skywind
2017-03-31 11:14 ` Marek Vasut
1 sibling, 1 reply; 8+ messages in thread
From: Marek Vasut @ 2017-03-29 9:03 UTC (permalink / raw)
To: u-boot
On 03/29/2017 05:49 AM, tien.fong.chee at intel.com wrote:
> From: "Chee, Tien Fong" <tien.fong.chee@intel.com>
>
> Commit ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
> header file") miss out cleaning macro in this header file, and this
> has broken implementation of a boot header capability in socfpga
> SPL. Remove the macro in this file, and recovering it back
> to proper functioning.
>
> Fixes: ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
> header file")
>
> Signed-off-by: Chee, Tien Fong <tien.fong.chee@intel.com>
Patch looks good, minor nit below.
> ---
> arch/arm/mach-socfpga/include/mach/boot0.h | 24 ++++++++++--------------
> 1 file changed, 10 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h b/arch/arm/mach-socfpga/include/mach/boot0.h
> index aaada31..22d9e7f 100644
> --- a/arch/arm/mach-socfpga/include/mach/boot0.h
> +++ b/arch/arm/mach-socfpga/include/mach/boot0.h
> @@ -8,21 +8,17 @@
> #define __BOOT0_H
>
> #ifdef CONFIG_SPL_BUILD
> -#define ARM_SOC_BOOT0_HOOK \
> - .balignl 64,0xf33db33f; \
> - \
> - .word 0x1337c0d3; /* SoCFPGA preloader validation word */ \
> - .word 0xc01df00d; /* Version, flags, length */ \
> - .word 0xcafec0d3; /* Checksum, zero-pad */ \
> - nop; \
> - \
> - b reset; /* SoCFPGA jumps here */ \
> - nop; \
> - nop; \
> + .balignl 64,0xf33db33f;
> +
> + .word 0x1337c0d3; /* SoCFPGA preloader validation word */
> + .word 0xc01df00d; /* Version, flags, length */
> + .word 0xcafec0d3; /* Checksum, zero-pad */
> nop;
> -#else
> -#define ARM_SOC_BOOT0_HOOK
> -#endif
>
> + b reset; /* SoCFPGA jumps here */
> + nop;
> + nop;
> + nop;
Correct me if I'm wrong, but did you add one more "nop" here ?
> +#endif
>
> #endif /* __BOOT0_H */
>
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 8+ messages in thread* [U-Boot] [PATCH] ARM: socfpga: boot0 hook: remove macro from boot0 header file
2017-03-29 9:03 ` Marek Vasut
@ 2017-03-30 1:22 ` chee skywind
2017-03-31 11:12 ` Marek Vasut
0 siblings, 1 reply; 8+ messages in thread
From: chee skywind @ 2017-03-30 1:22 UTC (permalink / raw)
To: u-boot
On Wed, Mar 29, 2017 at 5:03 PM, Marek Vasut <marex@denx.de> wrote:
> On 03/29/2017 05:49 AM, tien.fong.chee at intel.com wrote:
> > From: "Chee, Tien Fong" <tien.fong.chee@intel.com>
> >
> > Commit ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
> > header file") miss out cleaning macro in this header file, and this
> > has broken implementation of a boot header capability in socfpga
> > SPL. Remove the macro in this file, and recovering it back
> > to proper functioning.
> >
> > Fixes: ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
> > header file")
> >
> > Signed-off-by: Chee, Tien Fong <tien.fong.chee@intel.com>
>
> Patch looks good, minor nit below.
>
> > ---
> > arch/arm/mach-socfpga/include/mach/boot0.h | 24
> ++++++++++--------------
> > 1 file changed, 10 insertions(+), 14 deletions(-)
> >
> > diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h
> b/arch/arm/mach-socfpga/include/mach/boot0.h
> > index aaada31..22d9e7f 100644
> > --- a/arch/arm/mach-socfpga/include/mach/boot0.h
> > +++ b/arch/arm/mach-socfpga/include/mach/boot0.h
> > @@ -8,21 +8,17 @@
> > #define __BOOT0_H
> >
> > #ifdef CONFIG_SPL_BUILD
> > -#define ARM_SOC_BOOT0_HOOK \
> > - .balignl 64,0xf33db33f; \
> > - \
> > - .word 0x1337c0d3; /* SoCFPGA preloader validation word */ \
> > - .word 0xc01df00d; /* Version, flags, length */ \
> > - .word 0xcafec0d3; /* Checksum, zero-pad */ \
> > - nop; \
> > - \
> > - b reset; /* SoCFPGA jumps here */ \
> > - nop; \
> > - nop; \
> > + .balignl 64,0xf33db33f;
> > +
> > + .word 0x1337c0d3; /* SoCFPGA preloader validation word */
> > + .word 0xc01df00d; /* Version, flags, length */
> > + .word 0xcafec0d3; /* Checksum, zero-pad */
> > nop;
> > -#else
> > -#define ARM_SOC_BOOT0_HOOK
> > -#endif
> >
> > + b reset; /* SoCFPGA jumps here */
> > + nop;
> > + nop;
> > + nop;
>
> Correct me if I'm wrong, but did you add one more "nop" here ?
>
> no, i din't add extra "nop" here. There are 3 "nop" from original code
after "b reset".
> > +#endif
> >
> > #endif /* __BOOT0_H */
> >
>
>
> --
> Best regards,
> Marek Vasut
>
^ permalink raw reply [flat|nested] 8+ messages in thread* [U-Boot] [PATCH] ARM: socfpga: boot0 hook: remove macro from boot0 header file
2017-03-30 1:22 ` chee skywind
@ 2017-03-31 11:12 ` Marek Vasut
[not found] ` <CAJ2hV_qUGm+kg9peTdPE2ew=fnFwpERrd_N3CsLcrU1cZTSx9A@mail.gmail.com>
0 siblings, 1 reply; 8+ messages in thread
From: Marek Vasut @ 2017-03-31 11:12 UTC (permalink / raw)
To: u-boot
On 03/30/2017 03:22 AM, chee skywind wrote:
> On Wed, Mar 29, 2017 at 5:03 PM, Marek Vasut <marex@denx.de> wrote:
>
>> On 03/29/2017 05:49 AM, tien.fong.chee at intel.com wrote:
>>> From: "Chee, Tien Fong" <tien.fong.chee@intel.com>
>>>
>>> Commit ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
>>> header file") miss out cleaning macro in this header file, and this
>>> has broken implementation of a boot header capability in socfpga
>>> SPL. Remove the macro in this file, and recovering it back
>>> to proper functioning.
>>>
>>> Fixes: ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
>>> header file")
>>>
>>> Signed-off-by: Chee, Tien Fong <tien.fong.chee@intel.com>
>>
>> Patch looks good, minor nit below.
>>
>>> ---
>>> arch/arm/mach-socfpga/include/mach/boot0.h | 24
>> ++++++++++--------------
>>> 1 file changed, 10 insertions(+), 14 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h
>> b/arch/arm/mach-socfpga/include/mach/boot0.h
>>> index aaada31..22d9e7f 100644
>>> --- a/arch/arm/mach-socfpga/include/mach/boot0.h
>>> +++ b/arch/arm/mach-socfpga/include/mach/boot0.h
>>> @@ -8,21 +8,17 @@
>>> #define __BOOT0_H
>>>
>>> #ifdef CONFIG_SPL_BUILD
>>> -#define ARM_SOC_BOOT0_HOOK \
>>> - .balignl 64,0xf33db33f; \
>>> - \
>>> - .word 0x1337c0d3; /* SoCFPGA preloader validation word */ \
>>> - .word 0xc01df00d; /* Version, flags, length */ \
>>> - .word 0xcafec0d3; /* Checksum, zero-pad */ \
>>> - nop; \
>>> - \
>>> - b reset; /* SoCFPGA jumps here */ \
>>> - nop; \
>>> - nop; \
>>> + .balignl 64,0xf33db33f;
>>> +
>>> + .word 0x1337c0d3; /* SoCFPGA preloader validation word */
>>> + .word 0xc01df00d; /* Version, flags, length */
>>> + .word 0xcafec0d3; /* Checksum, zero-pad */
>>> nop;
>>> -#else
>>> -#define ARM_SOC_BOOT0_HOOK
>>> -#endif
>>>
>>> + b reset; /* SoCFPGA jumps here */
>>> + nop;
>>> + nop;
>>> + nop;
>>
>> Correct me if I'm wrong, but did you add one more "nop" here ?
>>
>> no, i din't add extra "nop" here. There are 3 "nop" from original code
> after "b reset".
Ah sorry, I see, it's just the patch being generated in a funny way.
Thanks for double-checking.
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH] ARM: socfpga: boot0 hook: remove macro from boot0 header file
2017-03-29 3:49 [U-Boot] [PATCH] ARM: socfpga: boot0 hook: remove macro from boot0 header file tien.fong.chee at intel.com
2017-03-29 9:03 ` Marek Vasut
@ 2017-03-31 11:14 ` Marek Vasut
1 sibling, 0 replies; 8+ messages in thread
From: Marek Vasut @ 2017-03-31 11:14 UTC (permalink / raw)
To: u-boot
On 03/29/2017 05:49 AM, tien.fong.chee at intel.com wrote:
> From: "Chee, Tien Fong" <tien.fong.chee@intel.com>
>
> Commit ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
> header file") miss out cleaning macro in this header file, and this
> has broken implementation of a boot header capability in socfpga
> SPL. Remove the macro in this file, and recovering it back
> to proper functioning.
>
> Fixes: ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
> header file")
>
> Signed-off-by: Chee, Tien Fong <tien.fong.chee@intel.com>
> ---
Applied, thanks!
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH] ARM: socfpga: boot0 hook: remove macro from boot0 header file
@ 2017-03-29 3:28 tien.fong.chee at intel.com
2017-03-29 3:36 ` Chee, Tien Fong
0 siblings, 1 reply; 8+ messages in thread
From: tien.fong.chee at intel.com @ 2017-03-29 3:28 UTC (permalink / raw)
To: u-boot
From: "Chee, Tien Fong" <tien.fong.chee@intel.com>
Commit ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
header file") miss out cleaning macro in this header file, and this
has broken implementation of a boot header capability in socfpga
SPL. Remove the macro in this file, and recovering it back
to proper functioning.
Fixes: ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
header file")
Signed-off-by: Chee, Tien Fong <tien.fong.chee@intel.com>
---
arch/arm/mach-socfpga/include/mach/boot0.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h b/arch/arm/mach-socfpga/include/mach/boot0.h
index aaada31..40f9d32 100644
--- a/arch/arm/mach-socfpga/include/mach/boot0.h
+++ b/arch/arm/mach-socfpga/include/mach/boot0.h
@@ -8,7 +8,6 @@
#define __BOOT0_H
#ifdef CONFIG_SPL_BUILD
-#define ARM_SOC_BOOT0_HOOK \
.balignl 64,0xf33db33f; \
\
.word 0x1337c0d3; /* SoCFPGA preloader validation word */ \
@@ -20,9 +19,6 @@
nop; \
nop; \
nop;
-#else
-#define ARM_SOC_BOOT0_HOOK
#endif
-
#endif /* __BOOT0_H */
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread* [U-Boot] [PATCH] ARM: socfpga: boot0 hook: remove macro from boot0 header file
2017-03-29 3:28 tien.fong.chee at intel.com
@ 2017-03-29 3:36 ` Chee, Tien Fong
0 siblings, 0 replies; 8+ messages in thread
From: Chee, Tien Fong @ 2017-03-29 3:36 UTC (permalink / raw)
To: u-boot
On Rab, 2017-03-29 at 11:28 +0800, tien.fong.chee at intel.com wrote:
> From: "Chee, Tien Fong" <tien.fong.chee@intel.com>
>
> Commit ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
> header file") miss out cleaning macro in this header file, and this
> has broken implementation of a boot header capability in socfpga
> SPL. Remove the macro in this file, and recovering it back
> to proper functioning.
>
Please ignore this patch, i will send out another patch. Thanks.
> Fixes: ce62e57fc571 ("ARM: boot0 hook: remove macro, include whole
> header file")
>
> Signed-off-by: Chee, Tien Fong <tien.fong.chee@intel.com>
> ---
> arch/arm/mach-socfpga/include/mach/boot0.h | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/arch/arm/mach-socfpga/include/mach/boot0.h
> b/arch/arm/mach-socfpga/include/mach/boot0.h
> index aaada31..40f9d32 100644
> --- a/arch/arm/mach-socfpga/include/mach/boot0.h
> +++ b/arch/arm/mach-socfpga/include/mach/boot0.h
> @@ -8,7 +8,6 @@
> #define __BOOT0_H
>
> #ifdef CONFIG_SPL_BUILD
> -#define ARM_SOC_BOOT0_HOOK
> \
> .balignl 64,0xf33db33f;
> \
>
> \
> .word 0x1337c0d3; /* SoCFPGA preloader
> validation word */ \
> @@ -20,9 +19,6 @@
> nop;
> \
> nop;
> \
> nop;
> -#else
> -#define ARM_SOC_BOOT0_HOOK
> #endif
>
> -
> #endif /* __BOOT0_H */
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-04-04 1:02 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-29 3:49 [U-Boot] [PATCH] ARM: socfpga: boot0 hook: remove macro from boot0 header file tien.fong.chee at intel.com
2017-03-29 9:03 ` Marek Vasut
2017-03-30 1:22 ` chee skywind
2017-03-31 11:12 ` Marek Vasut
[not found] ` <CAJ2hV_qUGm+kg9peTdPE2ew=fnFwpERrd_N3CsLcrU1cZTSx9A@mail.gmail.com>
[not found] ` <CAJ2hV_pkX=DeD3z6ymnYw5DNp-qPSzwHBvNa66ff3D=Qmh+y9Q@mail.gmail.com>
2017-04-04 1:02 ` chee skywind
2017-03-31 11:14 ` Marek Vasut
-- strict thread matches above, loose matches on Subject: below --
2017-03-29 3:28 tien.fong.chee at intel.com
2017-03-29 3:36 ` Chee, Tien Fong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.