fixup avila networking, add support for the loft

SVN-Revision: 7168
zorun · May 10, 2007 · 1ada6a8 · 1ada6a8
1 parent 73c3a90
commit 1ada6a8
Show file tree

Hide file tree

Showing 8 changed files with 773 additions and 3 deletions.
diff --git a/scripts/arm-magic.sh b/scripts/arm-magic.sh
@@ -22,7 +22,7 @@
 # NOTE: for now it's for only IXP4xx in big endian mode
 
 # list of supported boards, in "boardname machtypeid" format
-for board in "avila 526" "gateway7001 731" "nslu2 597" "nas100d 865" "wg302v2 890" "pronghornmetro 1040" "compex 1273" "wrt300nv2 1077"
+for board in "avila 526" "gateway7001 731" "nslu2 597" "nas100d 865" "wg302v2 890" "pronghornmetro 1040" "compex 1273" "wrt300nv2 1077" "loft 849"
 do
   set -- $board
   hexid=$(printf %x\\n $2)

diff --git a/target/linux/ixp4xx-2.6/config/default b/target/linux/ixp4xx-2.6/config/default
@@ -5,7 +5,6 @@ CONFIG_ALIGNMENT_TRAP=y
 # CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_ADI_COYOTE is not set
 # CONFIG_ARCH_AT91 is not set
-CONFIG_ARCH_AVILA=y
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CO285 is not set
@@ -211,11 +210,13 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_LIBCRC32C is not set
 # CONFIG_LLC2 is not set
+CONFIG_MACH_AVILA=y
 CONFIG_MACH_COMPEX=y
 CONFIG_MACH_GATEWAY7001=y
 # CONFIG_MACH_GTWX5715 is not set
 # CONFIG_MACH_IXDP465 is not set
 # CONFIG_MACH_IXDPG425 is not set
+CONFIG_MACH_LOFT=y
 CONFIG_MACH_NAS100D=y
 CONFIG_MACH_NSLU2=y
 CONFIG_MACH_PRONGHORNMETRO=y
@@ -395,7 +396,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_DS1374 is not set
 # CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_EEPROM is not set
+CONFIG_SENSORS_EEPROM=y
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_FSCHER is not set
 # CONFIG_SENSORS_FSCPOS is not set

diff --git a/target/linux/ixp4xx-2.6/patches/700-remove_avila_ixdp425_setup.patch b/target/linux/ixp4xx-2.6/patches/700-remove_avila_ixdp425_setup.patch
@@ -0,0 +1,39 @@
+diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c
+--- linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c	2007-04-15 14:26:04.000000000 +0200
++++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c	2007-05-10 11:10:40.000000000 +0200
+@@ -66,7 +66,7 @@
+ int __init ixdp425_pci_init(void)
+ {
+ 	if (machine_is_ixdp425() || machine_is_ixcdp1100() ||
+-			machine_is_avila() || machine_is_ixdp465() || machine_is_compex())
++			machine_is_ixdp465() || machine_is_compex())
+ 		pci_common_init(&ixdp425_pci);
+ 	return 0;
+ }
+diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-setup.c
+--- linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-setup.c	2007-04-15 14:26:49.000000000 +0200
++++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-setup.c	2007-05-10 11:10:01.000000000 +0200
+@@ -205,23 +205,3 @@
+ 	.init_machine	= ixdp425_init,
+ MACHINE_END
+ #endif
+-
+-/*
+- * Avila is functionally equivalent to IXDP425 except that it adds
+- * a CF IDE slot hanging off the expansion bus. When we have a 
+- * driver for IXP4xx CF IDE with driver model support we'll move
+- * Avila to it's own setup file.
+- */
+-#ifdef CONFIG_ARCH_AVILA
+-MACHINE_START(AVILA, "Gateworks Avila Network Platform")
+-	/* Maintainer: Deepak Saxena <[email protected]> */
+-	.phys_io	= IXP4XX_PERIPHERAL_BASE_PHYS,
+-	.io_pg_offst	= ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
+-	.map_io		= ixp4xx_map_io,
+-	.init_irq	= ixp4xx_init_irq,
+-	.timer		= &ixp4xx_timer,
+-	.boot_params	= 0x0100,
+-	.init_machine	= ixdp425_init,
+-MACHINE_END
+-#endif
+-