Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e97ff121 authored by Vineet Gupta's avatar Vineet Gupta
Browse files

ARC: [Review] Multi-platform image #4: Isolate platform headers 



-Top level ARC makefile removes -I for platform headers
-asm/irq.h no longer includes plat/irq.h

-platform makefile adds -I for it's specfic platform headers
-platform code to directly include it's plat/irq.h

-Linker script needed plat/memmap.h for CCM info, already in .config

Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 877768c8

arch/arc/Makefile

+1 −15
Original line number Diff line number Diff line
@@ -10,14 +10,6 @@ UTS_MACHINE := arc 


KBUILD_DEFCONFIG := fpga_defconfig



# For ARC FPGA Platforms

platform-$(CONFIG_ARC_PLAT_FPGA_LEGACY)	:= arcfpga

#New platform adds here



PLATFORM := $(platform-y)

export PLATFORM



cflags-y	+= -Iarch/arc/plat-$(PLATFORM)/include

cflags-y	+= -mA7 -fno-common -pipe -fno-builtin -D__linux__



LINUXINCLUDE	+=  -include ${src}/arch/arc/include/asm/defines.h
@@ -86,9 +78,6 @@ KBUILD_CFLAGS += $(cflags-y) 
KBUILD_AFLAGS	+= $(KBUILD_CFLAGS)

LDFLAGS		+= $(ldflags-y)



# Needed for Linker script preprocessing

KBUILD_CPPFLAGS	+= -Iarch/arc/plat-$(PLATFORM)/include



head-y		:= arch/arc/kernel/head.o



# See arch/arc/Kbuild for content of core part of the kernel
@@ -97,10 +86,7 @@ core-y += arch/arc/ 
# w/o this dtb won't embed into kernel binary

core-y		+= arch/arc/boot/dts/



# w/o this ifneq, make ARCH=arc clean was crapping out

ifneq ($(platform-y),)

core-y		+= arch/arc/plat-$(PLATFORM)/

endif

core-$(CONFIG_ARC_PLAT_FPGA_LEGACY)	+= arch/arc/plat-arcfpga/



drivers-$(CONFIG_OPROFILE)	+= arch/arc/oprofile/

arch/arc/include/asm/irq.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#define TIMER0_IRQ      3

#define TIMER1_IRQ      4



#include <plat/irq.h>		/* Board Specific IRQ assignments */

#include <asm-generic/irq.h>



extern void __init arc_init_IRQ(void);

arch/arc/kernel/vmlinux.lds.S

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <asm/cache.h>

#include <asm/page.h>

#include <asm/thread_info.h>

#include <plat/memmap.h>



OUTPUT_ARCH(arc)

ENTRY(_stext)

arch/arc/plat-arcfpga/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -6,5 +6,7 @@ 
# published by the Free Software Foundation.

#



KBUILD_CFLAGS	+= -Iarch/arc/plat-arcfpga/include



obj-y := platform.o irq.o

obj-$(CONFIG_SMP)		+= smp.o

arch/arc/plat-arcfpga/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */



#include <linux/interrupt.h>

#include <asm/irq.h>

#include <plat/irq.h>



void __init plat_fpga_init_IRQ(void)

{