[1/2] omap: Fix AM335x build with enabled fastboot flash

Message ID 20180227214504.32572-2-semen.protsenko@linaro.org
State Accepted
Commit 7a390c0e256f722aec3e54455633f9307b2ba294
Headers show
Series
  • am335x_boneblack: Enable fastboot flash support
Related show

Commit Message

Sam Protsenko Feb. 27, 2018, 9:45 p.m.
When enabling CONFIG_FASTBOOT_FLASH in am335x_boneblack_defconfig, next
build errors and warnings occur:

    arch/arm/mach-omap2/utils.c: In function ‘omap_set_fastboot_cpu’:
    arch/arm/mach-omap2/utils.c:26:16: warning: implicit declaration of
              function ‘omap_revision’ [-Wimplicit-function-declaration]
              u32 cpu_rev = omap_revision();
                            ^~~~~~~~~~~~~
    arch/arm/mach-omap2/utils.c:29:7: error: ‘DRA762_ES1_0’ undeclared
              (first use in this function)

Include asm/omap_common.h explicitly to avoid those.

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
---
 arch/arm/mach-omap2/utils.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Lukasz Majewski Feb. 27, 2018, 9:56 p.m. | #1
On Tue, 27 Feb 2018 23:45:03 +0200
Sam Protsenko <semen.protsenko@linaro.org> wrote:

> When enabling CONFIG_FASTBOOT_FLASH in am335x_boneblack_defconfig,

> next build errors and warnings occur:

> 

>     arch/arm/mach-omap2/utils.c: In function ‘omap_set_fastboot_cpu’:

>     arch/arm/mach-omap2/utils.c:26:16: warning: implicit declaration

> of function ‘omap_revision’ [-Wimplicit-function-declaration]

>               u32 cpu_rev = omap_revision();

>                             ^~~~~~~~~~~~~

>     arch/arm/mach-omap2/utils.c:29:7: error: ‘DRA762_ES1_0’ undeclared

>               (first use in this function)

> 

> Include asm/omap_common.h explicitly to avoid those.

> 

> Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>

> ---

>  arch/arm/mach-omap2/utils.c | 2 ++

>  1 file changed, 2 insertions(+)

> 

> diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c

> index d11670c0ee..7d1ca274bf 100644

> --- a/arch/arm/mach-omap2/utils.c

> +++ b/arch/arm/mach-omap2/utils.c

> @@ -7,6 +7,8 @@

>  #include <common.h>

>  #include <asm/setup.h>

>  #include <asm/arch/sys_proto.h>

> +#include <asm/omap_common.h>

> +

>  static void do_cancel_out(u32 *num, u32 *den, u32 factor)

>  {

>  	while (1) {


Acked-by: Lukasz Majewski <lukma@denx.de>



Best regards,

Lukasz Majewski

--

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
Tom Rini Feb. 27, 2018, 9:58 p.m. | #2
On Tue, Feb 27, 2018 at 11:45:03PM +0200, Sam Protsenko wrote:

> When enabling CONFIG_FASTBOOT_FLASH in am335x_boneblack_defconfig, next

> build errors and warnings occur:

> 

>     arch/arm/mach-omap2/utils.c: In function ‘omap_set_fastboot_cpu’:

>     arch/arm/mach-omap2/utils.c:26:16: warning: implicit declaration of

>               function ‘omap_revision’ [-Wimplicit-function-declaration]

>               u32 cpu_rev = omap_revision();

>                             ^~~~~~~~~~~~~

>     arch/arm/mach-omap2/utils.c:29:7: error: ‘DRA762_ES1_0’ undeclared

>               (first use in this function)

> 

> Include asm/omap_common.h explicitly to avoid those.

> 

> Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>


Reviewed-by: Tom Rini <trini@konsulko.com>


-- 
Tom
Tom Rini March 14, 2018, 2:10 p.m. | #3
On Tue, Feb 27, 2018 at 11:45:03PM +0200, Sam Protsenko wrote:

> When enabling CONFIG_FASTBOOT_FLASH in am335x_boneblack_defconfig, next

> build errors and warnings occur:

> 

>     arch/arm/mach-omap2/utils.c: In function ‘omap_set_fastboot_cpu’:

>     arch/arm/mach-omap2/utils.c:26:16: warning: implicit declaration of

>               function ‘omap_revision’ [-Wimplicit-function-declaration]

>               u32 cpu_rev = omap_revision();

>                             ^~~~~~~~~~~~~

>     arch/arm/mach-omap2/utils.c:29:7: error: ‘DRA762_ES1_0’ undeclared

>               (first use in this function)

> 

> Include asm/omap_common.h explicitly to avoid those.

> 

> Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>

> Acked-by: Lukasz Majewski <lukma@denx.de>

> Reviewed-by: Tom Rini <trini@konsulko.com>


Applied to u-boot/master, thanks!

-- 
Tom

Patch

diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c
index d11670c0ee..7d1ca274bf 100644
--- a/arch/arm/mach-omap2/utils.c
+++ b/arch/arm/mach-omap2/utils.c
@@ -7,6 +7,8 @@ 
 #include <common.h>
 #include <asm/setup.h>
 #include <asm/arch/sys_proto.h>
+#include <asm/omap_common.h>
+
 static void do_cancel_out(u32 *num, u32 *den, u32 factor)
 {
 	while (1) {