Changeset 3665


Ignore:
Timestamp:
2006-04-17T20:03:53+02:00 (10 years ago)
Author:
kaloz
Message:

XScale support (Gateway 7001), take two

Location:
trunk/openwrt
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/target/linux/package/madwifi/Config.in

    r2945 r3665  
    22        prompt "kmod-madwifi...................... Atheros Wifi driver" 
    33        tristate 
    4         default y if BR2_LINUX_2_6_BRCM || BR2_LINUX_2_6_ARUBA || BR2_LINUX_2_4_AR531X 
     4        default y if BR2_LINUX_2_6_BRCM || BR2_LINUX_2_6_ARUBA || BR2_LINUX_2_4_AR531X || BR2_LINUX_2_6_XSCALE 
    55        default m if CONFIG_DEVEL 
    66        default n 
  • trunk/openwrt/target/linux/package/madwifi/Makefile

    r3558 r3665  
    2323ifeq ($(ARCH),i386) 
    2424HAL_TARGET:=i386-elf 
     25endif 
     26ifeq ($(ARCH),armeb) 
     27HAL_TARGET:=xscale-be-elf 
    2528endif 
    2629 
  • trunk/openwrt/target/linux/package/madwifi/patches/100-kernel_cflags.patch

    r3558 r3665  
    3131+COPTS+=        -G 0 -EL -mno-abicalls -fno-pic -Wa,--trap -mips32 \ 
    3232        -fno-strict-aliasing -fno-common -fomit-frame-pointer -mlong-calls 
     33diff -ur madwifi-ng-r1486-20060329/hal/public/xscale-be-elf.inc madwifi-ng-r1486-20060329-patch/hal/public/xscale-be-elf.inc 
     34--- madwifi-ng-r1486-20060329/hal/public/xscale-be-elf.inc      2006-02-11 13:04:39.000000000 +0100 
     35+++ madwifi-ng-r1486-20060329-patch/hal/public/xscale-be-elf.inc        2006-04-16 15:07:59.000000000 +0200 
     36@@ -72,5 +72,5 @@ 
     37  
     38 LDOPTS=        -EB 
     39 COPTS+=        -DAH_BYTE_ORDER=AH_BIG_ENDIAN -DAH_REGOPS_FUNC 
     40-COPTS+= -march=armv4 -mbig-endian -fno-strict-aliasing -fno-common -mapcs-32 \ 
     41-       -mtune=xscale  -mshort-load-bytes -msoft-float -mfp=2 
     42+COPTS+= -mcpu=xscale -mbig-endian -fno-strict-aliasing -fno-common \ 
     43+       -msoft-float -mfp=2 
  • trunk/openwrt/target/linux/xscale-2.6/config

    r3648 r3665  
    22# Automatically generated make config: don't edit 
    33# Linux kernel version: 2.6.16.4 
    4 # Fri Apr 14 11:36:42 2006 
     4# Mon Apr 17 16:00:49 2006 
    55# 
    66CONFIG_ARM=y 
     
    5656# 
    5757CONFIG_MODULES=y 
    58 # CONFIG_MODULE_UNLOAD is not set 
     58CONFIG_MODULE_UNLOAD=y 
     59# CONFIG_MODULE_FORCE_UNLOAD is not set 
    5960CONFIG_OBSOLETE_MODPARM=y 
    6061# CONFIG_MODVERSIONS is not set 
     
    181182CONFIG_ZBOOT_ROM_TEXT=0x0 
    182183CONFIG_ZBOOT_ROM_BSS=0x0 
    183 CONFIG_CMDLINE="console=ttyS0,115200" 
     184CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=jffs2 init=/etc/preinit noinitrd console=ttyS0,115200" 
    184185# CONFIG_XIP_KERNEL is not set 
    185186 
     
    226227CONFIG_INET=y 
    227228CONFIG_IP_MULTICAST=y 
    228 CONFIG_IP_ADVANCED_ROUTER=y 
    229 CONFIG_ASK_IP_FIB_HASH=y 
     229# CONFIG_IP_ADVANCED_ROUTER is not set 
     230# CONFIG_ASK_IP_FIB_HASH is not set 
    230231# CONFIG_IP_FIB_TRIE is not set 
    231232CONFIG_IP_FIB_HASH=y 
    232 CONFIG_IP_MULTIPLE_TABLES=y 
    233 CONFIG_IP_ROUTE_FWMARK=y 
    234 CONFIG_IP_ROUTE_MULTIPATH=y 
    235 # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set 
    236 # CONFIG_IP_ROUTE_VERBOSE is not set 
    237233# CONFIG_IP_PNP is not set 
    238234# CONFIG_NET_IPIP is not set 
     
    256252# TCP congestion control 
    257253# 
    258 CONFIG_TCP_CONG_BIC=y 
     254CONFIG_TCP_CONG_BIC=m 
    259255CONFIG_TCP_CONG_CUBIC=m 
    260 CONFIG_TCP_CONG_WESTWOOD=m 
     256CONFIG_TCP_CONG_WESTWOOD=y 
    261257CONFIG_TCP_CONG_HTCP=m 
    262258# CONFIG_TCP_CONG_HSTCP is not set 
    263259# CONFIG_TCP_CONG_HYBLA is not set 
    264 CONFIG_TCP_CONG_VEGAS=y 
     260CONFIG_TCP_CONG_VEGAS=m 
    265261# CONFIG_TCP_CONG_SCALABLE is not set 
    266262 
     
    293289# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set 
    294290# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set 
    295 # CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set 
     291CONFIG_NETFILTER_XT_MATCH_CONNMARK=y 
    296292CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m 
    297293# CONFIG_NETFILTER_XT_MATCH_DCCP is not set 
     
    347343# CONFIG_IP_NF_TARGET_LOG is not set 
    348344# CONFIG_IP_NF_TARGET_ULOG is not set 
    349 # CONFIG_IP_NF_TARGET_TCPMSS is not set 
     345CONFIG_IP_NF_TARGET_TCPMSS=y 
    350346CONFIG_IP_NF_NAT=y 
    351347CONFIG_IP_NF_NAT_NEEDED=y 
  • trunk/openwrt/target/linux/xscale-2.6/patches/001-gateway_7001.patch

    r3648 r3665  
     1diff -Nur linux-2.6.16.4/arch/arm/boot/compressed/head-xscale.S linux-2.6.16.4-owrt/arch/arm/boot/compressed/head-xscale.S 
     2--- linux-2.6.16.4/arch/arm/boot/compressed/head-xscale.S       2006-04-11 19:19:28.000000000 +0200 
     3+++ linux-2.6.16.4-owrt/arch/arm/boot/compressed/head-xscale.S  2006-04-16 16:51:05.000000000 +0200 
     4@@ -47,6 +47,11 @@ 
     5                orr     r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00) 
     6 #endif 
     7  
     8+#ifdef  CONFIG_MACH_GATEWAY7001 
     9+               mov     r7, #(MACH_TYPE_GATEWAY7001 & 0xff) 
     10+               orr     r7, r7, #(MACH_TYPE_GATEWAY7001 & 0xff00) 
     11+#endif 
     12+ 
     13 #ifdef CONFIG_ARCH_IXP2000 
     14                mov     r1, #-1 
     15                mov     r0, #0xd6000000 
     16diff -Nur linux-2.6.16.4/arch/arm/mach-ixp4xx/gateway7001-pci.c linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/gateway7001-pci.c 
     17--- linux-2.6.16.4/arch/arm/mach-ixp4xx/gateway7001-pci.c       1970-01-01 01:00:00.000000000 +0100 
     18+++ linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/gateway7001-pci.c  2006-04-17 19:21:55.000000000 +0200 
     19@@ -0,0 +1,67 @@ 
     20+/* 
     21+ * arch/arch/mach-ixp4xx/gateway7001-pci.c 
     22+ * 
     23+ * PCI setup routines for Gateway 7001 
     24+ * 
     25+ * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org> 
     26+ * 
     27+ * based on coyote-pci.c: 
     28+ *     Copyright (C) 2002 Jungo Software Technologies. 
     29+ *     Copyright (C) 2003 MontaVista Softwrae, Inc. 
     30+ * 
     31+ * Maintainer: Imre Kaloz <kaloz@openwrt.org> 
     32+ * 
     33+ * This program is free software; you can redistribute it and/or modify 
     34+ * it under the terms of the GNU General Public License version 2 as 
     35+ * published by the Free Software Foundation. 
     36+ * 
     37+ */ 
     38+ 
     39+#include <linux/kernel.h> 
     40+#include <linux/pci.h> 
     41+#include <linux/init.h> 
     42+ 
     43+#include <asm/mach-types.h> 
     44+#include <asm/hardware.h> 
     45+#include <asm/irq.h> 
     46+ 
     47+#include <asm/mach/pci.h> 
     48+ 
     49+extern void ixp4xx_pci_preinit(void); 
     50+extern int ixp4xx_setup(int nr, struct pci_sys_data *sys); 
     51+extern struct pci_bus *ixp4xx_scan_bus(int nr, struct pci_sys_data *sys); 
     52+ 
     53+void __init gateway7001_pci_preinit(void) 
     54+{ 
     55+       set_irq_type(IRQ_IXP4XX_GPIO10, IRQT_LOW); 
     56+       set_irq_type(IRQ_IXP4XX_GPIO11, IRQT_LOW); 
     57+ 
     58+       ixp4xx_pci_preinit(); 
     59+} 
     60+ 
     61+static int __init gateway7001_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 
     62+{ 
     63+       if (slot == 0) 
     64+               return IRQ_IXP4XX_GPIO10; 
     65+       else if (slot == 1) 
     66+               return IRQ_IXP4XX_GPIO11; 
     67+       else return -1; 
     68+} 
     69+ 
     70+struct hw_pci gateway7001_pci __initdata = { 
     71+       .nr_controllers = 1, 
     72+       .preinit =        gateway7001_pci_preinit, 
     73+       .swizzle =        pci_std_swizzle, 
     74+       .setup =          ixp4xx_setup, 
     75+       .scan =           ixp4xx_scan_bus, 
     76+       .map_irq =        gateway7001_map_irq, 
     77+}; 
     78+ 
     79+int __init gateway7001_pci_init(void) 
     80+{ 
     81+       if (machine_is_gateway7001()) 
     82+               pci_common_init(&gateway7001_pci); 
     83+       return 0; 
     84+} 
     85+ 
     86+subsys_initcall(gateway7001_pci_init); 
    187diff -Nur linux-2.6.16.4/arch/arm/mach-ixp4xx/Kconfig linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/Kconfig 
    288--- linux-2.6.16.4/arch/arm/mach-ixp4xx/Kconfig 2006-04-11 19:19:28.000000000 +0200 
    3 +++ linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/Kconfig    2006-04-12 16:47:34.000000000 +0200 
     89+++ linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/Kconfig    2006-04-16 15:58:37.000000000 +0200 
    490@@ -30,6 +30,13 @@ 
    591          Engineering Coyote Gateway Reference Platform. For more 
     
    18104diff -Nur linux-2.6.16.4/arch/arm/mach-ixp4xx/Makefile linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/Makefile 
    19105--- linux-2.6.16.4/arch/arm/mach-ixp4xx/Makefile        2006-04-11 19:19:28.000000000 +0200 
    20 +++ linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/Makefile   2006-04-12 22:34:09.000000000 +0200 
     106+++ linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/Makefile   2006-04-16 16:03:42.000000000 +0200 
    21107@@ -10,4 +10,5 @@ 
    22108 obj-$(CONFIG_MACH_GTWX5715)    += gtwx5715-pci.o gtwx5715-setup.o 
    23109 obj-$(CONFIG_MACH_NSLU2)       += nslu2-pci.o nslu2-setup.o nslu2-power.o 
    24110 obj-$(CONFIG_MACH_NAS100D)     += nas100d-pci.o nas100d-setup.o nas100d-power.o 
    25 +obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o gateway7001-setup.o 
     111+obj-$(CONFIG_MACH_GATEWAY7001) += gateway7001-pci.o coyote-setup.o 
    26112  
    27 diff -Nur linux-2.6.16.4/arch/arm/mach-ixp4xx/gateway7001-pci.c linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/gateway7001-pci.c 
    28 --- linux-2.6.16.4/arch/arm/mach-ixp4xx/gateway7001-pci.c       1970-01-01 01:00:00.000000000 +0100 
    29 +++ linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/gateway7001-pci.c  2006-04-12 22:35:29.000000000 +0200 
    30 @@ -0,0 +1,77 @@ 
    31 +/* 
    32 + * arch/arm/mach-ixp4xx/gateway7001-pci.c  
    33 + * 
    34 + * Gateway 7001 board-level PCI initialization 
    35 + * 
    36 + * Copyright (c) 2006 Imre Kaloz <kaloz@openwrt.org> 
    37 + * 
    38 + * based on ixdp425-pci.c: 
    39 + *     Copyright (C) 2002 Intel Corporation. 
    40 + *     Copyright (C) 2003-2004 MontaVista Software, Inc. 
    41 + * 
    42 + * Maintainer: Imre Kaloz <kaloz@openwrt.org> 
    43 + * 
    44 + * This program is free software; you can redistribute it and/or modify 
    45 + * it under the terms of the GNU General Public License version 2 as 
    46 + * published by the Free Software Foundation. 
    47 + * 
    48 + */ 
    49 + 
    50 +#include <linux/kernel.h> 
    51 +#include <linux/config.h> 
    52 +#include <linux/pci.h> 
    53 +#include <linux/init.h> 
    54 +#include <linux/delay.h> 
    55 + 
    56 +#include <asm/mach/pci.h> 
    57 +#include <asm/irq.h> 
    58 +#include <asm/hardware.h> 
    59 +#include <asm/mach-types.h> 
    60 + 
    61 +void __init gateway7001_pci_preinit(void) 
    62 +{ 
    63 +       set_irq_type(IRQ_GATEWAY7001_PCI_INTA, IRQT_LOW); 
    64 +       set_irq_type(IRQ_GATEWAY7001_PCI_INTB, IRQT_LOW); 
    65 +       set_irq_type(IRQ_GATEWAY7001_PCI_INTC, IRQT_LOW); 
    66 +       set_irq_type(IRQ_GATEWAY7001_PCI_INTD, IRQT_LOW); 
    67 + 
    68 +       ixp4xx_pci_preinit(); 
    69 +} 
    70 + 
    71 +static int __init gateway7001_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 
    72 +{ 
    73 +       static int pci_irq_table[GATEWAY7001_PCI_IRQ_LINES] = { 
    74 +               IRQ_GATEWAY7001_PCI_INTA, 
    75 +               IRQ_GATEWAY7001_PCI_INTB, 
    76 +               IRQ_GATEWAY7001_PCI_INTC, 
    77 +               IRQ_GATEWAY7001_PCI_INTD 
    78 +       }; 
    79 + 
    80 +       int irq = -1; 
    81 + 
    82 +       if (slot >= 1 && slot <= GATEWAY7001_PCI_MAX_DEV &&  
    83 +               pin >= 1 && pin <= GATEWAY7001_PCI_IRQ_LINES) { 
    84 +               irq = pci_irq_table[(slot + pin - 2) % 4]; 
    85 +       } 
    86 + 
    87 +       return irq; 
    88 +} 
    89 + 
    90 +struct hw_pci gateway7001_pci __initdata = { 
    91 +       .nr_controllers = 1, 
    92 +       .preinit        = gateway7001_pci_preinit, 
    93 +       .swizzle        = pci_std_swizzle, 
    94 +       .setup          = ixp4xx_setup, 
    95 +       .scan           = ixp4xx_scan_bus, 
    96 +       .map_irq        = gateway7001_map_irq, 
    97 +}; 
    98 + 
    99 +int __init gateway7001_pci_init(void) 
    100 +{ 
    101 +       if (machine_is_gateway7001()) 
    102 +               pci_common_init(&gateway7001_pci); 
    103 +       return 0; 
    104 +} 
    105 + 
    106 +subsys_initcall(gateway7001_pci_init); 
    107 + 
    108 diff -Nur linux-2.6.16.4/arch/arm/mach-ixp4xx/gateway7001-setup.c linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c 
    109 --- linux-2.6.16.4/arch/arm/mach-ixp4xx/gateway7001-setup.c     1970-01-01 01:00:00.000000000 +0100 
    110 +++ linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/gateway7001-setup.c        2006-04-12 22:45:53.000000000 +0200 
    111 @@ -0,0 +1,136 @@ 
    112 +/* 
    113 + * arch/arm/mach-ixp4xx/gateway7001-setup.c 
    114 + * 
    115 + * Gateway 7001 board-setup  
    116 + * 
    117 + * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org> 
    118 + * 
    119 + * based-on ixdp425-setup.c: 
    120 + *     Copyright (C) 2003-2005 MontaVista Software, Inc. 
    121 + * 
    122 + * Author: Imre Kaloz <kaloz@openwrt.org> 
    123 + */ 
    124 + 
    125 +#include <linux/kernel.h> 
    126 +#include <linux/init.h> 
    127 +#include <linux/device.h> 
    128 +#include <linux/serial.h> 
    129 +#include <linux/tty.h> 
    130 +#include <linux/serial_8250.h> 
    131 +#include <linux/slab.h> 
    132 + 
    133 +#include <asm/types.h> 
    134 +#include <asm/setup.h> 
    135 +#include <asm/memory.h> 
    136 +#include <asm/hardware.h> 
    137 +#include <asm/mach-types.h> 
    138 +#include <asm/irq.h> 
    139 +#include <asm/mach/arch.h> 
    140 +#include <asm/mach/flash.h> 
    141 + 
    142 +static struct flash_platform_data gateway7001_flash_data = { 
    143 +       .map_name       = "cfi_probe", 
    144 +       .width          = 2, 
    145 +}; 
    146 + 
    147 +static struct resource gateway7001_flash_resource = { 
    148 +       .flags          = IORESOURCE_MEM, 
    149 +}; 
    150 + 
    151 +static struct platform_device gateway7001_flash = { 
    152 +       .name           = "IXP4XX-Flash", 
    153 +       .id             = 0, 
    154 +       .dev            = { 
    155 +               .platform_data = &gateway7001_flash_data, 
    156 +       }, 
    157 +       .num_resources  = 1, 
    158 +       .resource       = &gateway7001_flash_resource, 
    159 +}; 
    160 + 
    161 +static struct ixp4xx_i2c_pins gateway7001_i2c_gpio_pins = { 
    162 +       .sda_pin        = GATEWAY7001_SDA_PIN, 
    163 +       .scl_pin        = GATEWAY7001_SCL_PIN, 
    164 +}; 
    165 + 
    166 +static struct platform_device gateway7001_i2c_controller = { 
    167 +       .name           = "IXP4XX-I2C", 
    168 +       .id             = 0, 
    169 +       .dev            = { 
    170 +               .platform_data = &gateway7001_i2c_gpio_pins, 
    171 +       }, 
    172 +       .num_resources  = 0 
    173 +}; 
    174 + 
    175 +static struct resource gateway7001_uart_resources[] = { 
    176 +       { 
    177 +               .start          = IXP4XX_UART1_BASE_PHYS, 
    178 +               .end            = IXP4XX_UART1_BASE_PHYS + 0x0fff, 
    179 +               .flags          = IORESOURCE_MEM 
    180 +       }, 
    181 +       { 
    182 +               .start          = IXP4XX_UART2_BASE_PHYS, 
    183 +               .end            = IXP4XX_UART2_BASE_PHYS + 0x0fff, 
    184 +               .flags          = IORESOURCE_MEM 
    185 +       } 
    186 +}; 
    187 + 
    188 +static struct plat_serial8250_port gateway7001_uart_data[] = { 
    189 +       { 
    190 +               .mapbase        = IXP4XX_UART1_BASE_PHYS, 
    191 +               .membase        = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, 
    192 +               .irq            = IRQ_IXP4XX_UART1, 
    193 +               .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, 
    194 +               .iotype         = UPIO_MEM, 
    195 +               .regshift       = 2, 
    196 +               .uartclk        = IXP4XX_UART_XTAL, 
    197 +       }, 
    198 +       { 
    199 +               .mapbase        = IXP4XX_UART2_BASE_PHYS, 
    200 +               .membase        = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, 
    201 +               .irq            = IRQ_IXP4XX_UART2, 
    202 +               .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST, 
    203 +               .iotype         = UPIO_MEM, 
    204 +               .regshift       = 2, 
    205 +               .uartclk        = IXP4XX_UART_XTAL, 
    206 +       }, 
    207 +       { }, 
    208 +}; 
    209 + 
    210 +static struct platform_device gateway7001_uart = { 
    211 +       .name                   = "serial8250", 
    212 +       .id                     = PLAT8250_DEV_PLATFORM, 
    213 +       .dev.platform_data      = gateway7001_uart_data, 
    214 +       .num_resources          = 2, 
    215 +       .resource               = gateway7001_uart_resources 
    216 +}; 
    217 + 
    218 +static struct platform_device *gateway7001_devices[] __initdata = { 
    219 +       &gateway7001_i2c_controller, 
    220 +       &gateway7001_flash, 
    221 +       &gateway7001_uart 
    222 +}; 
    223 + 
    224 +static void __init gateway7001_init(void) 
    225 +{ 
    226 +       ixp4xx_sys_init(); 
    227 + 
    228 +       gateway7001_flash_resource.start = IXP4XX_EXP_BUS_BASE(0); 
    229 +       gateway7001_flash_resource.end = 
    230 +               IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1; 
    231 + 
    232 +       platform_add_devices(gateway7001_devices, ARRAY_SIZE(gateway7001_devices)); 
    233 +} 
    234 + 
     113diff -Nur linux-2.6.16.4/include/asm-arm/arch-ixp4xx/uncompress.h linux-2.6.16.4-owrt/include/asm-arm/arch-ixp4xx/uncompress.h 
     114--- linux-2.6.16.4/include/asm-arm/arch-ixp4xx/uncompress.h     2006-04-11 19:19:28.000000000 +0200 
     115+++ linux-2.6.16.4-owrt/include/asm-arm/arch-ixp4xx/uncompress.h        2006-04-16 16:25:34.000000000 +0200 
     116@@ -48,7 +48,7 @@ 
     117        /* 
     118         * Coyote and gtwx5715 only have UART2 connected 
     119         */ 
     120-       if (machine_is_adi_coyote() || machine_is_gtwx5715()) 
     121+       if (machine_is_adi_coyote() || machine_is_gtwx5715() || machine_is_gateway7001()) 
     122                uart_base = (volatile u32*) IXP4XX_UART2_BASE_PHYS; 
     123        else 
     124                uart_base = (volatile u32*) IXP4XX_UART1_BASE_PHYS; 
     125diff -Nur linux-2.6.16.4/arch/arm/mach-ixp4xx/coyote-setup.c linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/coyote-setup.c 
     126--- linux-2.6.16.4/arch/arm/mach-ixp4xx/coyote-setup.c  2006-04-11 19:19:28.000000000 +0200 
     127+++ linux-2.6.16.4-owrt/arch/arm/mach-ixp4xx/coyote-setup.c     2006-04-16 16:03:23.000000000 +0200 
     128@@ -1,9 +1,10 @@ 
     129 /* 
     130  * arch/arm/mach-ixp4xx/coyote-setup.c 
     131  * 
     132- * Board setup for ADI Engineering and IXDGP425 boards 
     133+ * Board setup for ADI Engineering, IXDGP425 and Gateway 7001 boards 
     134  * 
     135  * Copyright (C) 2003-2005 MontaVista Software, Inc. 
     136+ * Copyright (C) 2006 Imre Kaloz <Kaloz@openwrt.org> 
     137  * 
     138  * Author: Deepak Saxena <dsaxena@plexity.net> 
     139  */ 
     140@@ -111,6 +112,19 @@ 
     141 MACHINE_END 
     142 #endif 
     143  
    235144+#ifdef CONFIG_MACH_GATEWAY7001 
    236145+MACHINE_START(GATEWAY7001, "Gateway 7001") 
     
    242151+       .timer          = &ixp4xx_timer, 
    243152+       .boot_params    = 0x0100, 
    244 +       .init_machine   = gateway7001_init, 
     153+       .init_machine   = coyote_init, 
    245154+MACHINE_END 
    246155+#endif 
    247156+ 
    248 diff -Nur linux-2.6.16.4/include/asm-arm/arch-ixp4xx/gateway7001.h linux-2.6.16.4-owrt/include/asm-arm/arch-ixp4xx/gateway7001.h 
    249 --- linux-2.6.16.4/include/asm-arm/arch-ixp4xx/gateway7001.h    1970-01-01 01:00:00.000000000 +0100 
    250 +++ linux-2.6.16.4-owrt/include/asm-arm/arch-ixp4xx/gateway7001.h       2006-04-12 22:34:43.000000000 +0200 
    251 @@ -0,0 +1,36 @@ 
    252 +/* 
    253 + * include/asm-arm/arch-ixp4xx/gateway7001.h 
    254 + * 
    255 + * Gateway 7001 platform specific definitions 
    256 + * 
    257 + * Author: Imre Kaloz <kaloz@openwrt.org> 
    258 + * 
    259 + * Copyright 2006 (c) Imre Kaloz <kaloz@openwrt.org> 
    260 + * 
    261 + * based on ixdp425.h: 
    262 + *     Copyright 2004 (c) MontaVista, Software, Inc.  
    263 + *  
    264 + * This file is licensed under  the terms of the GNU General Public  
    265 + * License version 2. This program is licensed "as is" without any  
    266 + * warranty of any kind, whether express or implied. 
    267 + */ 
    268 + 
    269 +#ifndef __ASM_ARCH_HARDWARE_H__ 
    270 +#error "Do not include this directly, instead #include <asm/hardware.h>" 
    271 +#endif 
    272 + 
    273 +#define        GATEWAY7001_SDA_PIN             7 
    274 +#define        GATEWAY7001_SCL_PIN             6 
    275 + 
    276 +/* 
    277 + * GATEWAY7001 PCI IRQs 
    278 + */ 
    279 +#define GATEWAY7001_PCI_MAX_DEV        4 
    280 +#define GATEWAY7001_PCI_IRQ_LINES      4 
    281 + 
    282 + 
    283 +/* PCI controller GPIO to IRQ pin mappings */ 
    284 +#define GATEWAY7001_PCI_INTA_PIN       11 
    285 +#define GATEWAY7001_PCI_INTB_PIN       10 
    286 +#define        GATEWAY7001_PCI_INTC_PIN        9 
    287 +#define        GATEWAY7001_PCI_INTD_PIN        8 
    288 diff -Nur linux-2.6.16.4/include/asm-arm/arch-ixp4xx/hardware.h linux-2.6.16.4-owrt/include/asm-arm/arch-ixp4xx/hardware.h 
    289 --- linux-2.6.16.4/include/asm-arm/arch-ixp4xx/hardware.h       2006-04-11 19:19:28.000000000 +0200 
    290 +++ linux-2.6.16.4-owrt/include/asm-arm/arch-ixp4xx/hardware.h  2006-04-12 22:34:52.000000000 +0200 
    291 @@ -46,5 +46,6 @@ 
    292  #include "prpmc1100.h" 
    293  #include "nslu2.h" 
    294  #include "nas100d.h" 
    295 +#include "gateway7001.h" 
    296   
    297  #endif  /* _ASM_ARCH_HARDWARE_H */ 
    298 diff -Nur linux-2.6.16.4/include/asm-arm/arch-ixp4xx/irqs.h linux-2.6.16.4-owrt/include/asm-arm/arch-ixp4xx/irqs.h 
    299 --- linux-2.6.16.4/include/asm-arm/arch-ixp4xx/irqs.h   2006-04-11 19:19:28.000000000 +0200 
    300 +++ linux-2.6.16.4-owrt/include/asm-arm/arch-ixp4xx/irqs.h      2006-04-12 22:35:05.000000000 +0200 
    301 @@ -109,4 +109,12 @@ 
    302  #define        IRQ_NAS100D_PCI_INTD    IRQ_IXP4XX_GPIO8 
    303  #define        IRQ_NAS100D_PCI_INTE    IRQ_IXP4XX_GPIO7 
    304   
    305 +/* 
    306 + * GATEWAY7001 board IRQs 
    307 + */ 
    308 +#define        IRQ_GATEWAY7001_PCI_INTA      IRQ_IXP4XX_GPIO11 
    309 +#define        IRQ_GATEWAY7001_PCI_INTB      IRQ_IXP4XX_GPIO10 
    310 +#define        IRQ_GATEWAY7001_PCI_INTC      IRQ_IXP4XX_GPIO9 
    311 +#define        IRQ_GATEWAY7001_PCI_INTD      IRQ_IXP4XX_GPIO8 
    312 + 
    313  #endif 
     157 /* 
     158  * IXDPG425 is identical to Coyote except for which serial port 
     159  * is connected. 
  • trunk/openwrt/toolchain/Config.in

    r3656 r3665  
    1111endif 
    1212if !CONFIG_DEVEL 
    13 comment "Using defaults 
     13comment "Using defaults" 
    1414endif 
    1515 
     
    4343        default "-Os -pipe -march=i486 -funit-at-a-time" if BR2_i386 
    4444        default "-Os -pipe -mips32 -mtune=mips32 -funit-at-a-time" if BR2_mipsel || BR2_mips 
    45         default "-Os -pipe -mcpu=xscale -funit-at-a-time" if BR2_armeb 
     45        default "-Os -pipe -mcpu=xscale -mno-thumb-interwork -mno-thumb -funit-at-a-time" if BR2_armeb 
    4646        default "-Os -pipe -funit-at-a-time" 
    4747        help 
  • trunk/openwrt/toolchain/uClibc/files/config.armeb

    r3648 r3665  
    4646ARCH_HAS_MMU=y 
    4747UCLIBC_HAS_FLOATS=y 
    48 HAS_FPU=y 
     48# HAS_FPU is not set 
     49UCLIBC_HAS_SOFT_FLOAT=y 
    4950# DO_C99_MATH is not set 
    5051KERNEL_SOURCE="./toolchain_build_armeb/linux" 
Note: See TracChangeset for help on using the changeset viewer.