Skip to content

Commit

Permalink
ARM: sirf: drop Marco machine
Browse files Browse the repository at this point in the history
Marco will not be supported any more. it has been replaced by CSR
Atlas7.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Barry Song authored and Barry Song committed Jan 20, 2015
1 parent e664c3f commit 3c7d21b
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 27 deletions.
9 changes: 0 additions & 9 deletions arch/arm/mach-prima2/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,6 @@ config ARCH_PRIMA2
help
Support for CSR SiRFSoC ARM Cortex A9 Platform

config ARCH_MARCO
bool "CSR SiRFSoC MARCO ARM Cortex A9 Platform"
default y
select ARM_GIC
select HAVE_ARM_SCU if SMP
select SMP_ON_UP if SMP
help
Support for CSR SiRFSoC ARM Cortex A9 Platform

config SIRF_IRQ
bool

Expand Down
17 changes: 0 additions & 17 deletions arch/arm/mach-prima2/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,3 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
.dt_compat = prima2_dt_match,
MACHINE_END
#endif

#ifdef CONFIG_ARCH_MARCO
static const char *marco_dt_match[] __initconst = {
"sirf,marco",
NULL
};

DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)")
/* Maintainer: Barry Song <baohua.song@csr.com> */
.l2c_aux_val = 0,
.l2c_aux_mask = ~0,
.smp = smp_ops(sirfsoc_smp_ops),
.map_io = sirfsoc_map_io,
.init_late = sirfsoc_init_late,
.dt_compat = marco_dt_match,
MACHINE_END
#endif
1 change: 0 additions & 1 deletion arch/arm/mach-prima2/rtciobrg.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ EXPORT_SYMBOL_GPL(sirfsoc_rtc_iobrg_writel);

static const struct of_device_id rtciobrg_ids[] = {
{ .compatible = "sirf,prima2-rtciobg" },
{ .compatible = "sirf,marco-rtciobg" },
{}
};

Expand Down

0 comments on commit 3c7d21b

Please sign in to comment.