[PATCH] ARM: Remove machine description macros
Remove the pointless machine description macros, favouring C99 initialisers instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:

committed by
Russell King

parent
1d6bebf2ec
commit
e9dea0c65d
@@ -84,12 +84,14 @@ fixup_cats(struct machine_desc *desc, struct tag *tags,
|
||||
}
|
||||
|
||||
MACHINE_START(CATS, "Chalice-CATS")
|
||||
MAINTAINER("Philip Blundell")
|
||||
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
|
||||
BOOT_PARAMS(0x00000100)
|
||||
SOFT_REBOOT
|
||||
FIXUP(fixup_cats)
|
||||
MAPIO(footbridge_map_io)
|
||||
INITIRQ(footbridge_init_irq)
|
||||
/* Maintainer: Philip Blundell */
|
||||
.phys_ram = 0x00000000,
|
||||
.phys_io = DC21285_ARMCSR_BASE,
|
||||
.io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
|
||||
.boot_params = 0x00000100,
|
||||
.soft_reboot = 1,
|
||||
.fixup = fixup_cats,
|
||||
.map_io = footbridge_map_io,
|
||||
.init_irq = footbridge_init_irq,
|
||||
.timer = &isa_timer,
|
||||
MACHINE_END
|
||||
|
@@ -28,11 +28,13 @@ fixup_coebsa285(struct machine_desc *desc, struct tag *tags,
|
||||
}
|
||||
|
||||
MACHINE_START(CO285, "co-EBSA285")
|
||||
MAINTAINER("Mark van Doesburg")
|
||||
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0x7cf00000)
|
||||
FIXUP(fixup_coebsa285)
|
||||
MAPIO(footbridge_map_io)
|
||||
INITIRQ(footbridge_init_irq)
|
||||
/* Maintainer: Mark van Doesburg */
|
||||
.phys_ram = 0x00000000,
|
||||
.phys_io = DC21285_ARMCSR_BASE,
|
||||
.io_pg_offst = ((0x7cf00000) >> 18) & 0xfffc,
|
||||
.fixup = fixup_coebsa285,
|
||||
.map_io = footbridge_map_io,
|
||||
.init_irq = footbridge_init_irq,
|
||||
.timer = &footbridge_timer,
|
||||
MACHINE_END
|
||||
|
||||
|
@@ -13,12 +13,15 @@
|
||||
#include "common.h"
|
||||
|
||||
MACHINE_START(EBSA285, "EBSA285")
|
||||
MAINTAINER("Russell King")
|
||||
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
|
||||
BOOT_PARAMS(0x00000100)
|
||||
VIDEO(0x000a0000, 0x000bffff)
|
||||
MAPIO(footbridge_map_io)
|
||||
INITIRQ(footbridge_init_irq)
|
||||
/* Maintainer: Russell King */
|
||||
.phys_ram = 0x00000000,
|
||||
.phys_io = DC21285_ARMCSR_BASE,
|
||||
.io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
|
||||
.boot_params = 0x00000100,
|
||||
.video_start = 0x000a0000,
|
||||
.video_end = 0x000bffff,
|
||||
.map_io = footbridge_map_io,
|
||||
.init_irq = footbridge_init_irq,
|
||||
.timer = &footbridge_timer,
|
||||
MACHINE_END
|
||||
|
||||
|
@@ -647,14 +647,17 @@ fixup_netwinder(struct machine_desc *desc, struct tag *tags,
|
||||
}
|
||||
|
||||
MACHINE_START(NETWINDER, "Rebel-NetWinder")
|
||||
MAINTAINER("Russell King/Rebel.com")
|
||||
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
|
||||
BOOT_PARAMS(0x00000100)
|
||||
VIDEO(0x000a0000, 0x000bffff)
|
||||
DISABLE_PARPORT(0)
|
||||
DISABLE_PARPORT(2)
|
||||
FIXUP(fixup_netwinder)
|
||||
MAPIO(footbridge_map_io)
|
||||
INITIRQ(footbridge_init_irq)
|
||||
/* Maintainer: Russell King/Rebel.com */
|
||||
.phys_ram = 0x00000000,
|
||||
.phys_io = DC21285_ARMCSR_BASE,
|
||||
.io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
|
||||
.boot_params = 0x00000100,
|
||||
.video_start = 0x000a0000,
|
||||
.video_end = 0x000bffff,
|
||||
.reserve_lp0 = 1,
|
||||
.reserve_lp2 = 1,
|
||||
.fixup = fixup_netwinder,
|
||||
.map_io = footbridge_map_io,
|
||||
.init_irq = footbridge_init_irq,
|
||||
.timer = &isa_timer,
|
||||
MACHINE_END
|
||||
|
@@ -13,11 +13,13 @@
|
||||
#include "common.h"
|
||||
|
||||
MACHINE_START(PERSONAL_SERVER, "Compaq-PersonalServer")
|
||||
MAINTAINER("Jamey Hicks / George France")
|
||||
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
|
||||
BOOT_PARAMS(0x00000100)
|
||||
MAPIO(footbridge_map_io)
|
||||
INITIRQ(footbridge_init_irq)
|
||||
/* Maintainer: Jamey Hicks / George France */
|
||||
.phys_ram = 0x00000000,
|
||||
.phys_io = DC21285_ARMCSR_BASE,
|
||||
.io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
|
||||
.boot_params = 0x00000100,
|
||||
.map_io = footbridge_map_io,
|
||||
.init_irq = footbridge_init_irq,
|
||||
.timer = &footbridge_timer,
|
||||
MACHINE_END
|
||||
|
||||
|
Reference in New Issue
Block a user