Skip to content

Commit

Permalink
ARM: mach-pxa: convert boot_params to atag_offset
Browse files Browse the repository at this point in the history
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Nicolas Pitre authored and Nicolas Pitre committed Aug 21, 2011
1 parent d7a8a58 commit 7375aba
Show file tree
Hide file tree
Showing 43 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/balloon3.c
Original file line number Diff line number Diff line change
Expand Up @@ -828,5 +828,5 @@ MACHINE_START(BALLOON3, "Balloon3")
.handle_irq = pxa27x_handle_irq,
.timer = &pxa_timer,
.init_machine = balloon3_init,
.boot_params = PLAT_PHYS_OFFSET + 0x100,
.atag_offset = 0x100,
MACHINE_END
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/capc7117.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ static void __init capc7117_init(void)

MACHINE_START(CAPC7117,
"Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa3xx_map_io,
.init_irq = pxa3xx_init_irq,
.handle_irq = pxa3xx_handle_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/cm-x2xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ static void __init cmx2xx_map_io(void)
#endif

MACHINE_START(ARMCORE, "Compulab CM-X2XX")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = cmx2xx_map_io,
.nr_irqs = CMX2XX_NR_IRQS,
.init_irq = cmx2xx_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/cm-x300.c
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ static void __init cm_x300_fixup(struct machine_desc *mdesc, struct tag *tags,
}

MACHINE_START(CM_X300, "CM-X300 module")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa3xx_map_io,
.init_irq = pxa3xx_init_irq,
.handle_irq = pxa3xx_handle_irq,
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-pxa/colibri-pxa270.c
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ static void __init colibri_pxa270_income_init(void)
}

MACHINE_START(COLIBRI, "Toradex Colibri PXA270")
.boot_params = COLIBRI_SDRAM_BASE + 0x100,
.atag_offset = 0x100,
.init_machine = colibri_pxa270_init,
.map_io = pxa27x_map_io,
.init_irq = pxa27x_init_irq,
Expand All @@ -315,7 +315,7 @@ MACHINE_START(COLIBRI, "Toradex Colibri PXA270")
MACHINE_END

MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.init_machine = colibri_pxa270_income_init,
.map_io = pxa27x_map_io,
.init_irq = pxa27x_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/colibri-pxa300.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ void __init colibri_pxa300_init(void)
}

MACHINE_START(COLIBRI300, "Toradex Colibri PXA300")
.boot_params = COLIBRI_SDRAM_BASE + 0x100,
.atag_offset = 0x100,
.init_machine = colibri_pxa300_init,
.map_io = pxa3xx_map_io,
.init_irq = pxa3xx_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/colibri-pxa320.c
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ void __init colibri_pxa320_init(void)
}

MACHINE_START(COLIBRI320, "Toradex Colibri PXA320")
.boot_params = COLIBRI_SDRAM_BASE + 0x100,
.atag_offset = 0x100,
.init_machine = colibri_pxa320_init,
.map_io = pxa3xx_map_io,
.init_irq = pxa3xx_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/csb726.c
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ static void __init csb726_init(void)
}

MACHINE_START(CSB726, "Cogent CSB726")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-pxa/em-x270.c
Original file line number Diff line number Diff line change
Expand Up @@ -1299,7 +1299,7 @@ static void __init em_x270_init(void)
}

MACHINE_START(EM_X270, "Compulab EM-X270")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
Expand All @@ -1308,7 +1308,7 @@ MACHINE_START(EM_X270, "Compulab EM-X270")
MACHINE_END

MACHINE_START(EXEDA, "Compulab eXeda")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
Expand Down
12 changes: 6 additions & 6 deletions arch/arm/mach-pxa/eseries.c
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ static void __init e330_init(void)

MACHINE_START(E330, "Toshiba e330")
/* Maintainer: Ian Molton (spyro@f2s.com) */
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa25x_map_io,
.nr_irqs = ESERIES_NR_IRQS,
.init_irq = pxa25x_init_irq,
Expand Down Expand Up @@ -239,7 +239,7 @@ static void __init e350_init(void)

MACHINE_START(E350, "Toshiba e350")
/* Maintainer: Ian Molton (spyro@f2s.com) */
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa25x_map_io,
.nr_irqs = ESERIES_NR_IRQS,
.init_irq = pxa25x_init_irq,
Expand Down Expand Up @@ -362,7 +362,7 @@ static void __init e400_init(void)

MACHINE_START(E400, "Toshiba e400")
/* Maintainer: Ian Molton (spyro@f2s.com) */
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa25x_map_io,
.nr_irqs = ESERIES_NR_IRQS,
.init_irq = pxa25x_init_irq,
Expand Down Expand Up @@ -551,7 +551,7 @@ static void __init e740_init(void)

MACHINE_START(E740, "Toshiba e740")
/* Maintainer: Ian Molton (spyro@f2s.com) */
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa25x_map_io,
.nr_irqs = ESERIES_NR_IRQS,
.init_irq = pxa25x_init_irq,
Expand Down Expand Up @@ -743,7 +743,7 @@ static void __init e750_init(void)

MACHINE_START(E750, "Toshiba e750")
/* Maintainer: Ian Molton (spyro@f2s.com) */
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa25x_map_io,
.nr_irqs = ESERIES_NR_IRQS,
.init_irq = pxa25x_init_irq,
Expand Down Expand Up @@ -948,7 +948,7 @@ static void __init e800_init(void)

MACHINE_START(E800, "Toshiba e800")
/* Maintainer: Ian Molton (spyro@f2s.com) */
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa25x_map_io,
.nr_irqs = ESERIES_NR_IRQS,
.init_irq = pxa25x_init_irq,
Expand Down
12 changes: 6 additions & 6 deletions arch/arm/mach-pxa/ezx.c
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ static void __init a780_init(void)
}

MACHINE_START(EZX_A780, "Motorola EZX A780")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.nr_irqs = EZX_NR_IRQS,
.init_irq = pxa27x_init_irq,
Expand Down Expand Up @@ -863,7 +863,7 @@ static void __init e680_init(void)
}

MACHINE_START(EZX_E680, "Motorola EZX E680")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.nr_irqs = EZX_NR_IRQS,
.init_irq = pxa27x_init_irq,
Expand Down Expand Up @@ -929,7 +929,7 @@ static void __init a1200_init(void)
}

MACHINE_START(EZX_A1200, "Motorola EZX A1200")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.nr_irqs = EZX_NR_IRQS,
.init_irq = pxa27x_init_irq,
Expand Down Expand Up @@ -1120,7 +1120,7 @@ static void __init a910_init(void)
}

MACHINE_START(EZX_A910, "Motorola EZX A910")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.nr_irqs = EZX_NR_IRQS,
.init_irq = pxa27x_init_irq,
Expand Down Expand Up @@ -1186,7 +1186,7 @@ static void __init e6_init(void)
}

MACHINE_START(EZX_E6, "Motorola EZX E6")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.nr_irqs = EZX_NR_IRQS,
.init_irq = pxa27x_init_irq,
Expand Down Expand Up @@ -1226,7 +1226,7 @@ static void __init e2_init(void)
}

MACHINE_START(EZX_E2, "Motorola EZX E2")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.nr_irqs = EZX_NR_IRQS,
.init_irq = pxa27x_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/gumstix.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ static void __init gumstix_init(void)
}

MACHINE_START(GUMSTIX, "Gumstix")
.boot_params = 0xa0000100, /* match u-boot bi_boot_params */
.atag_offset = 0x100, /* match u-boot bi_boot_params */
.map_io = pxa25x_map_io,
.init_irq = pxa25x_init_irq,
.handle_irq = pxa25x_handle_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/h5000.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ static void __init h5000_init(void)
}

MACHINE_START(H5400, "HP iPAQ H5000")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa25x_map_io,
.init_irq = pxa25x_init_irq,
.handle_irq = pxa25x_handle_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/himalaya.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ static void __init himalaya_init(void)


MACHINE_START(HIMALAYA, "HTC Himalaya")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa25x_map_io,
.init_irq = pxa25x_init_irq,
.handle_irq = pxa25x_handle_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/hx4700.c
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ static void __init hx4700_init(void)
}

MACHINE_START(H4700, "HP iPAQ HX4700")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.nr_irqs = HX4700_NR_IRQS,
.init_irq = pxa27x_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/icontrol.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ static void __init icontrol_init(void)
}

MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa3xx_map_io,
.init_irq = pxa3xx_init_irq,
.handle_irq = pxa3xx_handle_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/littleton.c
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ static void __init littleton_init(void)
}

MACHINE_START(LITTLETON, "Marvell Form Factor Development Platform (aka Littleton)")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa3xx_map_io,
.nr_irqs = LITTLETON_NR_IRQS,
.init_irq = pxa3xx_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/lpd270.c
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ static void __init lpd270_map_io(void)

MACHINE_START(LOGICPD_PXA270, "LogicPD PXA270 Card Engine")
/* Maintainer: Peter Barada */
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = lpd270_map_io,
.nr_irqs = LPD270_NR_IRQS,
.init_irq = lpd270_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/magician.c
Original file line number Diff line number Diff line change
Expand Up @@ -753,7 +753,7 @@ static void __init magician_init(void)


MACHINE_START(MAGICIAN, "HTC Magician")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.nr_irqs = MAGICIAN_NR_IRQS,
.init_irq = pxa27x_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/mainstone.c
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ static void __init mainstone_map_io(void)

MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")
/* Maintainer: MontaVista Software Inc. */
.boot_params = 0xa0000100, /* BLOB boot parameter setting */
.atag_offset = 0x100, /* BLOB boot parameter setting */
.map_io = mainstone_map_io,
.nr_irqs = MAINSTONE_NR_IRQS,
.init_irq = mainstone_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/mioa701.c
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ static void mioa701_machine_exit(void)
}

MACHINE_START(MIOA701, "MIO A701")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = &pxa27x_map_io,
.init_irq = &pxa27x_init_irq,
.handle_irq = &pxa27x_handle_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/mp900.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ static void __init mp900c_init(void)

/* Maintainer - Michael Petchkovsky <mkpetch@internode.on.net> */
MACHINE_START(NEC_MP900, "MobilePro900/C")
.boot_params = 0xa0220100,
.atag_offset = 0x220100,
.timer = &pxa_timer,
.map_io = pxa25x_map_io,
.init_irq = pxa25x_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/palmld.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ static void __init palmld_init(void)
}

MACHINE_START(PALMLD, "Palm LifeDrive")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = palmld_map_io,
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/palmt5.c
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ static void __init palmt5_init(void)
}

MACHINE_START(PALMT5, "Palm Tungsten|T5")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.reserve = palmt5_reserve,
.init_irq = pxa27x_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/palmtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ static void __init palmtc_init(void)
};

MACHINE_START(PALMTC, "Palm Tungsten|C")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa25x_map_io,
.init_irq = pxa25x_init_irq,
.handle_irq = pxa25x_handle_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/palmte2.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ static void __init palmte2_init(void)
}

MACHINE_START(PALMTE2, "Palm Tungsten|E2")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa25x_map_io,
.init_irq = pxa25x_init_irq,
.handle_irq = pxa25x_handle_irq,
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-pxa/palmtreo.c
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ static void __init centro_init(void)
}

MACHINE_START(TREO680, "Palm Treo 680")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.reserve = treo_reserve,
.init_irq = pxa27x_init_irq,
Expand All @@ -450,7 +450,7 @@ MACHINE_START(TREO680, "Palm Treo 680")
MACHINE_END

MACHINE_START(CENTRO, "Palm Centro 685")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.reserve = treo_reserve,
.init_irq = pxa27x_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/palmtx.c
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ static void __init palmtx_init(void)
}

MACHINE_START(PALMTX, "Palm T|X")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = palmtx_map_io,
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/palmz72.c
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ static void __init palmz72_init(void)
}

MACHINE_START(PALMZ72, "Palm Zire72")
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pxa27x_map_io,
.init_irq = pxa27x_init_irq,
.handle_irq = pxa27x_handle_irq,
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-pxa/pcm027.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ static void __init pcm027_map_io(void)

MACHINE_START(PCM027, "Phytec Messtechnik GmbH phyCORE-PXA270")
/* Maintainer: Pengutronix */
.boot_params = 0xa0000100,
.atag_offset = 0x100,
.map_io = pcm027_map_io,
.nr_irqs = PCM027_NR_IRQS,
.init_irq = pxa27x_init_irq,
Expand Down
Loading

0 comments on commit 7375aba

Please sign in to comment.