Skip to content

Commit

Permalink
ARC: [Review] Multi-platform image #4: Isolate platform headers
Browse files Browse the repository at this point in the history
-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: Vineet Gupta <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Acked-by: Arnd Bergmann <[email protected]>
  • Loading branch information
vineetgarc committed Feb 15, 2013
1 parent 877768c commit e97ff12
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 20 deletions.
16 changes: 1 addition & 15 deletions arch/arc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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/

Expand Down
1 change: 0 additions & 1 deletion arch/arc/include/asm/irq.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion arch/arc/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions arch/arc/plat-arcfpga/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion arch/arc/plat-arcfpga/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

#include <linux/interrupt.h>
#include <asm/irq.h>
#include <plat/irq.h>

void __init plat_fpga_init_IRQ(void)
{
Expand Down
2 changes: 1 addition & 1 deletion arch/arc/plat-arcfpga/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
#include <linux/console.h>
#include <linux/of_platform.h>
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/clk.h>
#include <asm/mach_desc.h>
#include <plat/memmap.h>
#include <plat/smp.h>
#include <plat/irq.h>

/*-----------------------BVCI Latency Unit -----------------------------*/

Expand Down
3 changes: 2 additions & 1 deletion arch/arc/plat-arcfpga/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
*/

#include <linux/smp.h>
#include <asm/irq.h>
#include <linux/irq.h>
#include <plat/irq.h>
#include <plat/smp.h>

static char smp_cpuinfo_buf[128];
Expand Down

0 comments on commit e97ff12

Please sign in to comment.