fix ar7 compile

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7331 3c298f89-4303-0410-b956-a3cf2f4a3e73

10 files changed, 49 insertions, 23 deletions

diff --git a/package/ar7-atm/patches/100-compile_fix.patch b/package/ar7-atm/patches/100-compile_fix.patch
index b985eb1d1f..bd081c48e7 100644
--- a/package/ar7-atm/patches/100-compile_fix.patch
+++ b/package/ar7-atm/patches/100-compile_fix.patch
@@ -691,3 +691,17 @@ diff -urN sangam_atm-07.01.00.10/tn7sar.c sangam-atm-0.3/tn7sar.c
  #include <linux/proc_fs.h>
  #include <linux/string.h>
  #include <linux/ctype.h>
+
+diff -ur atm.old/tn7dsl.c atm.dev/tn7dsl.c
+--- atm.old/tn7dsl.c	2007-05-24 17:36:33.865636000 +0200
++++ atm.dev/tn7dsl.c	2007-05-24 17:41:32.094298496 +0200
+@@ -3430,8 +3430,7 @@
+   if (initialized == 1)
+     return;
+ 
+-  dslmod_sysctl_header = register_sysctl_table(dslmod_root_table, 1);
+-  dslmod_root_table->child->de->owner = THIS_MODULE;
++  dslmod_sysctl_header = register_sysctl_table(dslmod_root_table);
+ 
+   /*
+    * set the defaults
diff --git a/target/linux/ar7-2.6/config/default b/target/linux/ar7-2.6/config/default
index a01981c19b..18d62f2112 100644
--- a/target/linux/ar7-2.6/config/default
+++ b/target/linux/ar7-2.6/config/default
@@ -4,11 +4,15 @@ CONFIG_32BIT=y
 CONFIG_AR7=y
 CONFIG_AR7_GPIO=y
 CONFIG_AR7_WDT=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
 # CONFIG_ATMEL is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_BCM43XX is not set
+CONFIG_BITREVERSE=y
 # CONFIG_BLK_DEV_INITRD is not set
 CONFIG_BOOT_ELF32=y
+# CONFIG_BROADCOM_PHY is not set
 # CONFIG_BT is not set
 CONFIG_CMDLINE="init=/etc/preinit rootfstype=squashfs,jffs2,"
 CONFIG_CPMAC=y
@@ -44,13 +48,15 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
-CONFIG_FIRMWARE_EDID=y
 CONFIG_FIXED_MII_100_FDX=y
 # CONFIG_FIXED_MII_10_FDX is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FS_POSIX_ACL=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
 # CONFIG_GEN_RTC is not set
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
 # CONFIG_HERMES is not set
 # CONFIG_HOSTAP_PCI is not set
 # CONFIG_HOSTAP_PLX is not set
@@ -65,7 +71,6 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_48 is not set
 # CONFIG_I2C is not set
 # CONFIG_IDE is not set
-CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IRQ_CPU=y
@@ -77,7 +82,6 @@ CONFIG_LEDS_AR7=y
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
 # CONFIG_MACH_VR41XX is not set
-CONFIG_MINI_FO=y
 CONFIG_MIPS=y
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_BOSPORUS is not set
@@ -112,6 +116,7 @@ CONFIG_MIPS_MT_DISABLED=y
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 CONFIG_MTD_AR7_PARTS=y
+CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_MTD_BLOCK2MTD is not set
 CONFIG_MTD_CFI=y
@@ -158,7 +163,19 @@ CONFIG_MTD_PHYSMAP_START=0x10000000
 # CONFIG_MTD_SLRAM is not set
 CONFIG_NEED_MULTIPLE_NODES=y
 # CONFIG_NET_PCI is not set
+CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_VENDOR_3COM is not set
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CT_ACCT=y
+# CONFIG_NF_NAT_AMANDA is not set
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_NEEDED=y
+# CONFIG_NF_NAT_PPTP is not set
+CONFIG_NF_NAT_SIP=m
+# CONFIG_NF_NAT_TFTP is not set
 CONFIG_NODES_SHIFT=6
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
@@ -167,8 +184,9 @@ CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PHYLIB=y
 # CONFIG_PMC_YOSEMITE is not set
+# CONFIG_PNPACPI is not set
 # CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_V2PCI is not set
+# CONFIG_PNX8550_STB810 is not set
 # CONFIG_PRISM54 is not set
 # CONFIG_QSEMI_PHY is not set
 # CONFIG_RTC is not set
@@ -192,7 +210,7 @@ CONFIG_SERIAL_8250_PCI=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_SWAP_IO_SPACE=y
-CONFIG_GENERIC_GPIO=y
+CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
 CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
 CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
@@ -203,4 +221,5 @@ CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USB is not set
-# CONFIG_YENTA is not set
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA_FLAG=1
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/irq.c b/target/linux/ar7-2.6/files/arch/mips/ar7/irq.c
index 3019952273..542a57a24a 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/irq.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/irq.c
@@ -117,7 +117,7 @@ static void ar7_mask_secondary_irq(unsigned int irq)
 }
 
 void __init arch_init_irq(void) {
-	mips_cpu_irq_init(0);
+	mips_cpu_irq_init();
 	ar7_irq_init(8);
 }
 
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c b/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c
index 10dc09da42..8ff571ce27 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c
@@ -188,7 +188,7 @@ void __init prom_meminit(void)
 #endif
 }
 
-unsigned long __init prom_free_prom_memory(void)
+void __init prom_free_prom_memory(void)
 {
-	return 0;
+	return;
 }
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c b/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
index 00cb4a6de3..20926c67eb 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
@@ -279,7 +279,6 @@ static void __init console_config(void)
 
 void __init prom_init(void)
 {
-	prom_printf("\nLINUX running...\n");
 	ar7_init_cmdline(fw_arg0, (char **)fw_arg1);
 	ar7_init_env((struct env_var *)fw_arg2);
 	console_config();
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c b/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c
index fb3d20c183..7930e90b24 100644
--- a/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c
+++ b/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c
@@ -49,15 +49,13 @@ static void ar7_machine_power_off(void);
 
 static void ar7_machine_restart(char *command)
 {
-        volatile u32 *softres_reg = (u32 *)ioremap(AR7_REGS_RESET +
+	volatile u32 *softres_reg = (u32 *)ioremap(AR7_REGS_RESET +
 						   AR7_RESET_SOFTWARE, 1);
-	prom_printf("Reboot\n");
-        *softres_reg = 1;
+	*softres_reg = 1;
 }
 
 static void ar7_machine_halt(void)
 {
-	prom_printf("Halt\n");
 	while (1);
 }
 
@@ -65,8 +63,7 @@ static void ar7_machine_power_off(void)
 {
         volatile u32 *power_reg = (u32 *)ioremap(AR7_REGS_POWER, 1);
 	u32 power_state = *power_reg | (3 << 30);
-	prom_printf("Power off\n");
-        *power_reg = power_state;
+	*power_reg = power_state;
 	ar7_machine_halt();
 }
 
diff --git a/target/linux/ar7-2.6/files/drivers/char/ar7_gpio.c b/target/linux/ar7-2.6/files/drivers/char/ar7_gpio.c
index d8dc2e1ff5..df8e7634eb 100644
--- a/target/linux/ar7-2.6/files/drivers/char/ar7_gpio.c
+++ b/target/linux/ar7-2.6/files/drivers/char/ar7_gpio.c
@@ -30,8 +30,7 @@
 
 #include <linux/types.h>
 #include <linux/cdev.h>
-
-#include <asm/gpio.h>
+#include <gpio.h>
 
 #define DRVNAME "ar7_gpio"
 #define LONGNAME "TI AR7 GPIOs Driver"
diff --git a/target/linux/ar7-2.6/files/drivers/leds/leds-ar7.c b/target/linux/ar7-2.6/files/drivers/leds/leds-ar7.c
index fbef7d3bbf..2de72ab612 100644
--- a/target/linux/ar7-2.6/files/drivers/leds/leds-ar7.c
+++ b/target/linux/ar7-2.6/files/drivers/leds/leds-ar7.c
@@ -25,8 +25,7 @@
 #include <linux/leds.h>
 #include <linux/err.h>
 #include <asm/io.h>
-
-#include <asm/gpio.h>
+#include <gpio.h>
 
 #define DRVNAME "ar7-leds"
 #define LONGNAME "TI AR7 LEDs driver"
diff --git a/target/linux/ar7-2.6/files/drivers/net/cpmac.c b/target/linux/ar7-2.6/files/drivers/net/cpmac.c
index 4d957f0113..e0c49b7083 100644
--- a/target/linux/ar7-2.6/files/drivers/net/cpmac.c
+++ b/target/linux/ar7-2.6/files/drivers/net/cpmac.c
@@ -38,7 +38,7 @@
 #include <linux/phy.h>
 #include <linux/platform_device.h>
 #include <asm/ar7/ar7.h>
-#include <asm/gpio.h>
+#include <gpio.h>
 
 MODULE_AUTHOR("Eugene Konev");
 MODULE_DESCRIPTION("TI AR7 ethernet driver (CPMAC)");
diff --git a/target/linux/ar7-2.6/files/include/asm-mips/ar7/spaces.h b/target/linux/ar7-2.6/files/include/asm-mips/ar7/spaces.h
index 367fe2d344..4e082f824f 100644
--- a/target/linux/ar7-2.6/files/include/asm-mips/ar7/spaces.h
+++ b/target/linux/ar7-2.6/files/include/asm-mips/ar7/spaces.h
@@ -10,7 +10,6 @@
 #ifndef _ASM_AR7_SPACES_H
 #define _ASM_AR7_SPACES_H
 
-
 #define CAC_BASE		0x80000000
 #define IO_BASE			0xa0000000
 #define UNCAC_BASE		0xa0000000
@@ -21,7 +20,7 @@
  * We handle pages at KSEG0 for kernels with 32 bit address space.
  */
 #define PAGE_OFFSET		0x80000000UL
-#define ARCH_PFN_OFFSET	(0x14000000 >> PAGE_SHIFT)
+#define PHYS_OFFSET 	0x14000000UL
 
 /*
  * Memory above this physical address will be considered highmem.