Commit 5561cd26 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller

sparc32,leon: always include leon_kernel in build

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Daniel Hellstrom <daniel@gaisler.com>
Cc: Konrad Eisele <konrad@gaisler.com>
parent 93bb32f6
...@@ -257,9 +257,7 @@ extern int leon_ipi_irq; ...@@ -257,9 +257,7 @@ extern int leon_ipi_irq;
#ifndef CONFIG_SPARC_LEON #ifndef CONFIG_SPARC_LEON
/* nop definitions for !LEON case */ /* nop definitions for !LEON case */
#define leon_init() do {} while (0)
#define leon_switch_mm() do {} while (0) #define leon_switch_mm() do {} while (0)
#define leon_init_IRQ() do {} while (0)
#define init_leon() do {} while (0) #define init_leon() do {} while (0)
#define leon_smp_done() do {} while (0) #define leon_smp_done() do {} while (0)
#define leon_boot_cpus() do {} while (0) #define leon_boot_cpus() do {} while (0)
......
...@@ -87,8 +87,6 @@ struct amba_prom_registers { ...@@ -87,8 +87,6 @@ struct amba_prom_registers {
#define LEON3_GPTIMER_CONFIG_NRTIMERS(c) ((c)->config & 0x7) #define LEON3_GPTIMER_CONFIG_NRTIMERS(c) ((c)->config & 0x7)
#define LEON3_GPTIMER_CTRL_ISPENDING(r) (((r)&LEON3_GPTIMER_CTRL_PENDING) ? 1 : 0) #define LEON3_GPTIMER_CTRL_ISPENDING(r) (((r)&LEON3_GPTIMER_CTRL_PENDING) ? 1 : 0)
#ifdef CONFIG_SPARC_LEON
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
struct leon3_irqctrl_regs_map { struct leon3_irqctrl_regs_map {
...@@ -264,6 +262,4 @@ extern unsigned int sparc_leon_eirq; ...@@ -264,6 +262,4 @@ extern unsigned int sparc_leon_eirq;
#define amba_device(x) (((x) >> 12) & 0xfff) #define amba_device(x) (((x) >> 12) & 0xfff)
#endif /* !defined(CONFIG_SPARC_LEON) */
#endif #endif
...@@ -51,7 +51,7 @@ obj-y += of_device_common.o ...@@ -51,7 +51,7 @@ obj-y += of_device_common.o
obj-y += of_device_$(BITS).o obj-y += of_device_$(BITS).o
obj-$(CONFIG_SPARC64) += prom_irqtrans.o obj-$(CONFIG_SPARC64) += prom_irqtrans.o
obj-$(CONFIG_SPARC_LEON)+= leon_kernel.o obj-$(CONFIG_SPARC32) += leon_kernel.o
obj-$(CONFIG_SPARC_LEON)+= leon_pmc.o obj-$(CONFIG_SPARC_LEON)+= leon_pmc.o
obj-$(CONFIG_SPARC64) += reboot.o obj-$(CONFIG_SPARC64) += reboot.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment