Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 36595
b: refs/heads/master
c: c680b77
h: refs/heads/master
i:
  36593: 3b87df1
  36591: b995c58
v: v3
  • Loading branch information
Lennert Buytenhek authored and Russell King committed Sep 25, 2006
1 parent c2e62aa commit 4d8b43d
Show file tree
Hide file tree
Showing 33 changed files with 912 additions and 945 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7412b10f7967ef4210ed6f793004d23642dc5140
refs/heads/master: c680b77efe4542830bb170e1cc40db1c47c569bc
7 changes: 3 additions & 4 deletions trunk/arch/arm/configs/ep80219_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ CONFIG_ARCH_IOP32X=y
CONFIG_ARCH_IQ31244=y
# CONFIG_ARCH_IQ80331 is not set
# CONFIG_MACH_IQ80332 is not set
CONFIG_ARCH_EP80219=y

#
# IOP3xx Chipset Features
Expand Down Expand Up @@ -231,9 +230,9 @@ CONFIG_MTD_CFI_UTIL=y
#
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_START=0xf0000000
CONFIG_MTD_PHYSMAP_LEN=0x00800000
CONFIG_MTD_PHYSMAP_BANKWIDTH=2
CONFIG_MTD_PHYSMAP_START=0x0
CONFIG_MTD_PHYSMAP_LEN=0x0
CONFIG_MTD_PHYSMAP_BANKWIDTH=1
# CONFIG_MTD_ARM_INTEGRATOR is not set
# CONFIG_MTD_EDB7312 is not set

Expand Down
7 changes: 3 additions & 4 deletions trunk/arch/arm/configs/iq31244_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ CONFIG_ARCH_IOP32X=y
CONFIG_ARCH_IQ31244=y
# CONFIG_ARCH_IQ80331 is not set
# CONFIG_MACH_IQ80332 is not set
# CONFIG_ARCH_EP80219 is not set

#
# IOP3xx Chipset Features
Expand Down Expand Up @@ -232,9 +231,9 @@ CONFIG_MTD_CFI_UTIL=y
#
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_START=0xf0000000
CONFIG_MTD_PHYSMAP_LEN=0x00800000
CONFIG_MTD_PHYSMAP_BANKWIDTH=2
CONFIG_MTD_PHYSMAP_START=0x0
CONFIG_MTD_PHYSMAP_LEN=0x0
CONFIG_MTD_PHYSMAP_BANKWIDTH=1
# CONFIG_MTD_ARM_INTEGRATOR is not set
# CONFIG_MTD_EDB7312 is not set

Expand Down
5 changes: 2 additions & 3 deletions trunk/arch/arm/configs/iq80321_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ CONFIG_ARCH_IQ80321=y
# CONFIG_ARCH_IQ31244 is not set
# CONFIG_ARCH_IQ80331 is not set
# CONFIG_MACH_IQ80332 is not set
# CONFIG_ARCH_EP80219 is not set

#
# IOP3xx Chipset Features
Expand Down Expand Up @@ -231,8 +230,8 @@ CONFIG_MTD_CFI_UTIL=y
#
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_START=0xf0000000
CONFIG_MTD_PHYSMAP_LEN=0x00800000
CONFIG_MTD_PHYSMAP_START=0x0
CONFIG_MTD_PHYSMAP_LEN=0x0
CONFIG_MTD_PHYSMAP_BANKWIDTH=1
# CONFIG_MTD_ARM_INTEGRATOR is not set
# CONFIG_MTD_EDB7312 is not set
Expand Down
10 changes: 2 additions & 8 deletions trunk/arch/arm/configs/iq80331_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,6 @@ CONFIG_ARCH_IOP33X=y
# CONFIG_ARCH_IQ31244 is not set
CONFIG_ARCH_IQ80331=y
# CONFIG_MACH_IQ80332 is not set
# CONFIG_ARCH_EP80219 is not set

#
# IOP3xx Chipset Features
#
CONFIG_IOP331_STEPD=y

#
# Processor Type
Expand Down Expand Up @@ -236,8 +230,8 @@ CONFIG_MTD_CFI_UTIL=y
#
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_START=0xc0000000
CONFIG_MTD_PHYSMAP_LEN=0x00800000
CONFIG_MTD_PHYSMAP_START=0x0
CONFIG_MTD_PHYSMAP_LEN=0x0
CONFIG_MTD_PHYSMAP_BANKWIDTH=1
# CONFIG_MTD_ARM_INTEGRATOR is not set
# CONFIG_MTD_EDB7312 is not set
Expand Down
10 changes: 2 additions & 8 deletions trunk/arch/arm/configs/iq80332_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,6 @@ CONFIG_ARCH_IOP33X=y
# CONFIG_ARCH_IQ31244 is not set
# CONFIG_ARCH_IQ80331 is not set
CONFIG_MACH_IQ80332=y
# CONFIG_ARCH_EP80219 is not set

#
# IOP3xx Chipset Features
#
# CONFIG_IOP331_STEPD is not set

#
# Processor Type
Expand Down Expand Up @@ -236,8 +230,8 @@ CONFIG_MTD_CFI_UTIL=y
#
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
CONFIG_MTD_PHYSMAP=y
CONFIG_MTD_PHYSMAP_START=0xc0000000
CONFIG_MTD_PHYSMAP_LEN=0x00800000
CONFIG_MTD_PHYSMAP_START=0x0
CONFIG_MTD_PHYSMAP_LEN=0x0
CONFIG_MTD_PHYSMAP_BANKWIDTH=1
# CONFIG_MTD_ARM_INTEGRATOR is not set
# CONFIG_MTD_EDB7312 is not set
Expand Down
7 changes: 0 additions & 7 deletions trunk/arch/arm/mach-iop32x/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ config ARCH_IQ31244
Say Y here if you want to run your kernel on the Intel IQ31244
evaluation kit for the IOP321 chipset.

config ARCH_EP80219
bool "Enable support for EP80219"
select ARCH_IQ31244
help
Say Y here if you want to run your kernel on the Intel EP80219
evaluation kit for the Intel 80219 chipset (a IOP321 variant).

endmenu

endif
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-iop32x/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# Makefile for the linux kernel.
#

obj-y := common.o setup.o irq.o
obj-y := irq.o
obj-m :=
obj-n :=
obj- :=

obj-$(CONFIG_ARCH_IQ80321) += iq80321-mm.o iq80321-pci.o
obj-$(CONFIG_ARCH_IQ31244) += iq31244-mm.o iq31244-pci.o
obj-$(CONFIG_ARCH_IQ80321) += iq80321.o
obj-$(CONFIG_ARCH_IQ31244) += iq31244.o
67 changes: 0 additions & 67 deletions trunk/arch/arm/mach-iop32x/common.c

This file was deleted.

46 changes: 0 additions & 46 deletions trunk/arch/arm/mach-iop32x/iq31244-mm.c

This file was deleted.

90 changes: 0 additions & 90 deletions trunk/arch/arm/mach-iop32x/iq31244-pci.c

This file was deleted.

Loading

0 comments on commit 4d8b43d

Please sign in to comment.