Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6451d778 authored Oct 14, 2010 by Nicolas Pitre Committed by Nicolas Pitre Oct 20, 2010

arm: remove machine_desc.io_pg_offst and .phys_io



Since we're now using addruart to establish the debug mapping, we can
remove the io_pg_offst and phys_io members of struct machine_desc.

The various declarations were removed using the following script:

  grep -rl MACHINE_START arch/arm | xargs \
  sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }'

[ Initial patch was from Jeremy Kerr, example script from Russell King ]

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Eric Miao <eric.miao at canonical.com>

parent c293393f

arch/arm/include/asm/mach/arch.h

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -16,14 +16,10 @@ struct sys_timer;

	struct machine_desc {		struct machine_desc {
	/*		/*
	* Note! The first four elements are used		* Note! The first two elements are used
	* by assembler code in head.S, head-common.S		* by assembler code in head.S, head-common.S
	*/		*/
	unsigned int nr; /* architecture number */		unsigned int nr; /* architecture number */
	unsigned int phys_io; /* start of physical io */
	unsigned int io_pg_offst; /* byte offset for io
	* page tabe entry */

	const char name; / architecture name */		const char name; / architecture name */
	unsigned long boot_params; /* tagged list */		unsigned long boot_params; /* tagged list */

arch/arm/kernel/asm-offsets.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -102,8 +102,6 @@ int main(void)
	DEFINE(SIZEOF_MACHINE_DESC, sizeof(struct machine_desc));		DEFINE(SIZEOF_MACHINE_DESC, sizeof(struct machine_desc));
	DEFINE(MACHINFO_TYPE, offsetof(struct machine_desc, nr));		DEFINE(MACHINFO_TYPE, offsetof(struct machine_desc, nr));
	DEFINE(MACHINFO_NAME, offsetof(struct machine_desc, name));		DEFINE(MACHINFO_NAME, offsetof(struct machine_desc, name));
	DEFINE(MACHINFO_PHYSIO, offsetof(struct machine_desc, phys_io));
	DEFINE(MACHINFO_PGOFFIO, offsetof(struct machine_desc, io_pg_offst));
	BLANK();		BLANK();
	DEFINE(PROC_INFO_SZ, sizeof(struct proc_info_list));		DEFINE(PROC_INFO_SZ, sizeof(struct proc_info_list));
	DEFINE(PROCINFO_INITFUNC, offsetof(struct proc_info_list, __cpu_flush));		DEFINE(PROCINFO_INITFUNC, offsetof(struct proc_info_list, __cpu_flush));

arch/arm/mach-aaec2000/aaed2000.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -95,8 +95,6 @@ static void __init aaed2000_map_io(void)

	MACHINE_START(AAED2000, "Agilent AAED-2000 Development Platform")		MACHINE_START(AAED2000, "Agilent AAED-2000 Development Platform")
	/* Maintainer: Nicolas Bellido Y Ortega */		/* Maintainer: Nicolas Bellido Y Ortega */
	.phys_io = PIO_BASE,
	.io_pg_offst = ((VIO_BASE) >> 18) & 0xfffc,
	.map_io = aaed2000_map_io,		.map_io = aaed2000_map_io,
	.init_irq = aaed2000_init_irq,		.init_irq = aaed2000_init_irq,
	.timer = &aaec2000_timer,		.timer = &aaec2000_timer,

arch/arm/mach-at91/board-1arm.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -92,8 +92,6 @@ static void __init onearm_board_init(void)

	MACHINE_START(ONEARM, "Ajeco 1ARM single board computer")		MACHINE_START(ONEARM, "Ajeco 1ARM single board computer")
	/* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */		/* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
	.phys_io = AT91_BASE_SYS,
	.io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
	.boot_params = AT91_SDRAM_BASE + 0x100,		.boot_params = AT91_SDRAM_BASE + 0x100,
	.timer = &at91rm9200_timer,		.timer = &at91rm9200_timer,
	.map_io = onearm_map_io,		.map_io = onearm_map_io,

arch/arm/mach-at91/board-afeb-9260v1.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -218,8 +218,6 @@ static void __init afeb9260_board_init(void)

	MACHINE_START(AFEB9260, "Custom afeb9260 board")		MACHINE_START(AFEB9260, "Custom afeb9260 board")
	/* Maintainer: Sergey Lapin <slapin@ossfans.org> */		/* Maintainer: Sergey Lapin <slapin@ossfans.org> */
	.phys_io = AT91_BASE_SYS,
	.io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
	.boot_params = AT91_SDRAM_BASE + 0x100,		.boot_params = AT91_SDRAM_BASE + 0x100,
	.timer = &at91sam926x_timer,		.timer = &at91sam926x_timer,
	.map_io = afeb9260_map_io,		.map_io = afeb9260_map_io,