Skip to contentSkip to conversation

ARM: omap4: Fix standalone OMAP4 build break

PATCH New Rajendra Nayak 2 participants 3 messages Jun 22, 2012 – Jun 26, 2012

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Rajendra Nayak

author
#0 lore raw

PATCH 1/1 ARM: omap4: Fix standalone OMAP4 build break

Fix the below build error while building OMAP4 standalone

CC arch/arm/mach-omap2/board-flash.o
arch/arm/mach-omap2/board-flash.c:102: error: redefinition of 'board_onenand_init' arch/arm/mach-omap2/board-flash.h:56: note: previous definition of 'board_onenand_init' was here make[1]: *** [arch/arm/mach-omap2/board-flash.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2

Signed-off-by Rajendra Nayak <[email protected]>
---
 arch/arm/mach-omap2/board-flash.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
arch/arm/mach-omap2/board-flash.c +0 -5
index 70a81f9..53c39d2 100644
@@ -97,11 +97,6 @@ __init board_onenand_init(struct mtd_partition *onenand_parts,
 
 	gpmc_onenand_init(&board_onenand_data);
 }
-#else
-void
-__init board_onenand_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs)
-{
-}
 #endif /* CONFIG_MTD_ONENAND_OMAP2 || CONFIG_MTD_ONENAND_OMAP2_MODULE */
 
 #if defined(CONFIG_MTD_NAND_OMAP2) || \
Signature · 1 line
1.7.1
maintainer
#1 lore raw

PATCH 1/1 ARM: omap4: Fix standalone OMAP4 build break

Quoted 9 lines · Rajendra Nayak

Fix the below build error while building OMAP4 standalone

CC arch/arm/mach-omap2/board-flash.o
arch/arm/mach-omap2/board-flash.c:102: error: redefinition of 'board_onenand_init' arch/arm/mach-omap2/board-flash.h:56: note: previous definition of 'board_onenand_init' was here make[1]: *** [arch/arm/mach-omap2/board-flash.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2

Signed-off-by Rajendra Nayak <[email protected]>

Thanks, applying into fixes with the updated description to describe the regression causing commit.

Tony

Quoted 23 lines
---
 arch/arm/mach-omap2/board-flash.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
arch/arm/mach-omap2/board-flash.c +0 -5
index 70a81f9..53c39d2 100644
@@ -97,11 +97,6 @@ __init board_onenand_init(struct mtd_partition *onenand_parts,
 
 	gpmc_onenand_init(&board_onenand_data);
 }
-#else
-void
-__init board_onenand_init(struct mtd_partition *nor_parts, u8 nr_parts, u8 cs)
-{
-}
 #endif /* CONFIG_MTD_ONENAND_OMAP2 || CONFIG_MTD_ONENAND_OMAP2_MODULE */
 
 #if defined(CONFIG_MTD_NAND_OMAP2) || \
Signature · 1 line
1.7.1
maintainer
#2 lore raw

PATCH 1/1 ARM: omap4: Fix standalone OMAP4 build break

Quoted 9 lines · Tony Lindgren
Quoted 8 lines · Rajendra Nayak

Fix the below build error while building OMAP4 standalone

CC arch/arm/mach-omap2/board-flash.o
arch/arm/mach-omap2/board-flash.c:102: error: redefinition of 'board_onenand_init' arch/arm/mach-omap2/board-flash.h:56: note: previous definition of 'board_onenand_init' was here make[1]: *** [arch/arm/mach-omap2/board-flash.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2

Quoted 4 lines
Quoted 1 line
Signed-off-by Rajendra Nayak <[email protected]>

Thanks, applying into fixes with the updated description to describe the regression causing commit.

Oops, looks like I have an earlier fix already in fixes-board branch from Kevin that I'll use instead.

Regards,

Tony