Skip to content

Commit

Permalink
ARM: PRIMA2: use DT_MACHINE_START and convert to generic board
Browse files Browse the repository at this point in the history
we will have SiRFMarco and SiRFPolo, all of them will be in the
generic board.

Signed-off-by: Barry Song <Baohua.Song@csr.com>
  • Loading branch information
Barry Song authored and Barry Song committed Aug 28, 2012
1 parent bc0e489 commit d0ec63f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-prima2/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
obj-y := timer.o
obj-y += irq.o
obj-y += rstc.o
obj-y += prima2.o
obj-y += common.o
obj-y += rtciobrg.o
obj-$(CONFIG_DEBUG_LL) += lluart.o
obj-$(CONFIG_CACHE_L2X0) += l2x0.o
Expand Down
11 changes: 6 additions & 5 deletions arch/arm/mach-prima2/prima2.c → arch/arm/mach-prima2/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,21 @@ void __init sirfsoc_init_late(void)
sirfsoc_pm_init();
}

static const char *prima2cb_dt_match[] __initdata = {
"sirf,prima2-cb",
#ifdef CONFIG_ARCH_PRIMA2
static const char *prima2_dt_match[] __initdata = {
"sirf,prima2",
NULL
};

MACHINE_START(PRIMA2_EVB, "prima2cb")
DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
/* Maintainer: Barry Song <baohua.song@csr.com> */
.atag_offset = 0x100,
.map_io = sirfsoc_map_lluart,
.init_irq = sirfsoc_of_irq_init,
.timer = &sirfsoc_timer,
.dma_zone_size = SZ_256M,
.init_machine = sirfsoc_mach_init,
.init_late = sirfsoc_init_late,
.dt_compat = prima2cb_dt_match,
.dt_compat = prima2_dt_match,
.restart = sirfsoc_restart,
MACHINE_END
#endif

0 comments on commit d0ec63f

Please sign in to comment.