Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 187498
b: refs/heads/master
c: 321ed16
h: refs/heads/master
v: v3
  • Loading branch information
Uwe Kleine-König committed Jan 8, 2010
1 parent a4ff80c commit 152ad67
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 386c5cf7a9a1d6856f17bde43174f751fac1bc0b
refs/heads/master: 321ed164369bb5e4888eb24d70ebc64c232ffc31
24 changes: 12 additions & 12 deletions trunk/arch/arm/mach-mx3/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
obj-y := mm.o devices.o cpu.o
obj-$(CONFIG_ARCH_MX31) += clock-imx31.o iomux-imx31.o
obj-$(CONFIG_ARCH_MX35) += clock-imx35.o
obj-$(CONFIG_MACH_MX31ADS) += mx31ads.o
obj-$(CONFIG_MACH_MX31LILLY) += mx31lilly.o mx31lilly-db.o
obj-$(CONFIG_MACH_MX31LITE) += mx31lite.o mx31lite-db.o
obj-$(CONFIG_MACH_PCM037) += pcm037.o
obj-$(CONFIG_MACH_PCM037_EET) += pcm037_eet.o
obj-$(CONFIG_MACH_MX31_3DS) += mx31pdk.o
obj-$(CONFIG_MACH_MX31MOBOARD) += mx31moboard.o mx31moboard-devboard.o \
obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
obj-$(CONFIG_MACH_MX31LILLY) += mach-mx31lilly.o mx31lilly-db.o
obj-$(CONFIG_MACH_MX31LITE) += mach-mx31lite.o mx31lite-db.o
obj-$(CONFIG_MACH_PCM037) += mach-pcm037.o
obj-$(CONFIG_MACH_PCM037_EET) += mach-pcm037_eet.o
obj-$(CONFIG_MACH_MX31_3DS) += mach-mx31_3ds.o
obj-$(CONFIG_MACH_MX31MOBOARD) += mach-mx31moboard.o mx31moboard-devboard.o \
mx31moboard-marxbot.o
obj-$(CONFIG_MACH_QONG) += qong.o
obj-$(CONFIG_MACH_PCM043) += pcm043.o
obj-$(CONFIG_MACH_ARMADILLO5X0) += armadillo5x0.o
obj-$(CONFIG_MACH_MX35_3DS) += mx35pdk.o
obj-$(CONFIG_MACH_KZM_ARM11_01) += kzmarm11.o
obj-$(CONFIG_MACH_QONG) += mach-qong.o
obj-$(CONFIG_MACH_PCM043) += mach-pcm043.o
obj-$(CONFIG_MACH_ARMADILLO5X0) += mach-armadillo5x0.o
obj-$(CONFIG_MACH_MX35_3DS) += mach-mx35pdk.o
obj-$(CONFIG_MACH_KZM_ARM11_01) += mach-kzm_arm11_01.o
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mx3/armadillo5x0.c → trunk/arch/arm/mach-mx3/mach-armadillo5x0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ static struct sys_timer armadillo5x0_timer = {
MACHINE_START(ARMADILLO5X0, "Armadillo-500")
/* Maintainer: Alberto Panizzo */
.phys_io = MX31_AIPS1_BASE_ADDR,
.io_pg_offst = ((MX31_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
.io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc,
.boot_params = PHYS_OFFSET + 0x00000100,
.map_io = mx31_map_io,
.init_irq = mx31_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mx3/kzmarm11.c → trunk/arch/arm/mach-mx3/mach-kzm_arm11_01.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ static struct sys_timer kzm_timer = {
*/
MACHINE_START(KZM_ARM11_01, "Kyoto Microcomputer Co., Ltd. KZM-ARM11-01")
.phys_io = MX31_AIPS1_BASE_ADDR,
.io_pg_offst = ((MX31_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
.io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc,
.boot_params = PHYS_OFFSET + 0x100,
.map_io = kzm_map_io,
.init_irq = mx31_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mx3/mx31pdk.c → trunk/arch/arm/mach-mx3/mach-mx31_3ds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ static struct sys_timer mx31pdk_timer = {
MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)")
/* Maintainer: Freescale Semiconductor, Inc. */
.phys_io = MX31_AIPS1_BASE_ADDR,
.io_pg_offst = ((MX31_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
.io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc,
.boot_params = PHYS_OFFSET + 0x100,
.map_io = mx31pdk_map_io,
.init_irq = mx31_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mx3/mx31ads.c → trunk/arch/arm/mach-mx3/mach-mx31ads.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ static struct sys_timer mx31ads_timer = {
MACHINE_START(MX31ADS, "Freescale MX31ADS")
/* Maintainer: Freescale Semiconductor, Inc. */
.phys_io = MX31_AIPS1_BASE_ADDR,
.io_pg_offst = ((MX31_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
.io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc,
.boot_params = PHYS_OFFSET + 0x100,
.map_io = mx31ads_map_io,
.init_irq = mx31ads_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mx3/mx31lilly.c → trunk/arch/arm/mach-mx3/mach-mx31lilly.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ static struct sys_timer mx31lilly_timer = {

MACHINE_START(LILLY1131, "INCO startec LILLY-1131")
.phys_io = MX31_AIPS1_BASE_ADDR,
.io_pg_offst = ((MX31_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
.io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc,
.boot_params = PHYS_OFFSET + 0x100,
.map_io = mx31_map_io,
.init_irq = mx31_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mx3/mx31lite.c → trunk/arch/arm/mach-mx3/mach-mx31lite.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ struct sys_timer mx31lite_timer = {
MACHINE_START(MX31LITE, "LogicPD i.MX31 SOM")
/* Maintainer: Freescale Semiconductor, Inc. */
.phys_io = MX31_AIPS1_BASE_ADDR,
.io_pg_offst = ((MX31_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
.io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc,
.boot_params = PHYS_OFFSET + 0x100,
.map_io = mx31lite_map_io,
.init_irq = mx31_init_irq,
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mx3/mx31moboard.c → trunk/arch/arm/mach-mx3/mach-mx31moboard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ struct sys_timer mx31moboard_timer = {
MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard")
/* Maintainer: Valentin Longchamp, EPFL Mobots group */
.phys_io = MX31_AIPS1_BASE_ADDR,
.io_pg_offst = ((MX31_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
.io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc,
.boot_params = PHYS_OFFSET + 0x100,
.map_io = mx31_map_io,
.init_irq = mx31_init_irq,
Expand Down
0 trunk/arch/arm/mach-mx3/mx35pdk.c → trunk/arch/arm/mach-mx3/mach-mx35pdk.c
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mx3/pcm037.c → trunk/arch/arm/mach-mx3/mach-pcm037.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ struct sys_timer pcm037_timer = {
MACHINE_START(PCM037, "Phytec Phycore pcm037")
/* Maintainer: Pengutronix */
.phys_io = MX31_AIPS1_BASE_ADDR,
.io_pg_offst = ((MX31_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
.io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc,
.boot_params = PHYS_OFFSET + 0x100,
.map_io = mx31_map_io,
.init_irq = mx31_init_irq,
Expand Down
0 trunk/arch/arm/mach-mx3/pcm037_eet.c → trunk/arch/arm/mach-mx3/mach-pcm037_eet.c
View file
File renamed without changes.
0 trunk/arch/arm/mach-mx3/pcm043.c → trunk/arch/arm/mach-mx3/mach-pcm043.c
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mx3/qong.c → trunk/arch/arm/mach-mx3/mach-qong.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ static struct sys_timer qong_timer = {
MACHINE_START(QONG, "Dave/DENX QongEVB-LITE")
/* Maintainer: DENX Software Engineering GmbH */
.phys_io = MX31_AIPS1_BASE_ADDR,
.io_pg_offst = ((MX31_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
.io_pg_offst = (MX31_AIPS1_BASE_ADDR_VIRT >> 18) & 0xfffc,
.boot_params = PHYS_OFFSET + 0x100,
.map_io = mx31_map_io,
.init_irq = mx31_init_irq,
Expand Down

0 comments on commit 152ad67

Please sign in to comment.