From 2361535088eea77bbdf58c118afd83112d837331 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 31 Jan 2008 04:44:35 +0000 Subject: port atheros to 2.6.24 (untested), but do not use the new kernel by default yet SVN-Revision: 10335 --- target/linux/atheros/config-2.6.24 | 196 +++++++++++++++++++++ .../linux/atheros/files/arch/mips/atheros/ar531x.h | 4 + .../linux/atheros/files/arch/mips/atheros/board.c | 9 + .../linux/atheros/files/arch/mips/atheros/prom.c | 1 - .../atheros/files/drivers/net/ar2313/ar2313.c | 1 - .../files/include/asm-mips/mach-atheros/war.h | 25 +++ .../linux/atheros/patches-2.6.23/100-board.patch | 67 +++++++ .../atheros/patches-2.6.23/110-spiflash.patch | 22 +++ .../patches-2.6.23/130-ar2313_ethernet.patch | 29 +++ .../140-redboot_partition_scan.patch | 24 +++ .../atheros/patches-2.6.23/150-bridge-printk.patch | 26 +++ .../linux/atheros/patches-2.6.24/100-board.patch | 67 +++++++ .../atheros/patches-2.6.24/110-spiflash.patch | 22 +++ .../patches-2.6.24/130-ar2313_ethernet.patch | 29 +++ .../140-redboot_partition_scan.patch | 24 +++ .../atheros/patches-2.6.24/150-bridge-printk.patch | 26 +++ target/linux/atheros/patches/100-board.patch | 67 ------- target/linux/atheros/patches/110-spiflash.patch | 22 --- .../atheros/patches/130-ar2313_ethernet.patch | 29 --- .../patches/140-redboot_partition_scan.patch | 24 --- .../linux/atheros/patches/150-bridge-printk.patch | 26 --- target/linux/generic-2.6/config-2.6.24 | 1 + 22 files changed, 571 insertions(+), 170 deletions(-) create mode 100644 target/linux/atheros/config-2.6.24 create mode 100644 target/linux/atheros/files/include/asm-mips/mach-atheros/war.h create mode 100644 target/linux/atheros/patches-2.6.23/100-board.patch create mode 100644 target/linux/atheros/patches-2.6.23/110-spiflash.patch create mode 100644 target/linux/atheros/patches-2.6.23/130-ar2313_ethernet.patch create mode 100644 target/linux/atheros/patches-2.6.23/140-redboot_partition_scan.patch create mode 100644 target/linux/atheros/patches-2.6.23/150-bridge-printk.patch create mode 100644 target/linux/atheros/patches-2.6.24/100-board.patch create mode 100644 target/linux/atheros/patches-2.6.24/110-spiflash.patch create mode 100644 target/linux/atheros/patches-2.6.24/130-ar2313_ethernet.patch create mode 100644 target/linux/atheros/patches-2.6.24/140-redboot_partition_scan.patch create mode 100644 target/linux/atheros/patches-2.6.24/150-bridge-printk.patch delete mode 100644 target/linux/atheros/patches/100-board.patch delete mode 100644 target/linux/atheros/patches/110-spiflash.patch delete mode 100644 target/linux/atheros/patches/130-ar2313_ethernet.patch delete mode 100644 target/linux/atheros/patches/140-redboot_partition_scan.patch delete mode 100644 target/linux/atheros/patches/150-bridge-printk.patch diff --git a/target/linux/atheros/config-2.6.24 b/target/linux/atheros/config-2.6.24 new file mode 100644 index 0000000000..652e712952 --- /dev/null +++ b/target/linux/atheros/config-2.6.24 @@ -0,0 +1,196 @@ +CONFIG_32BIT=y +# CONFIG_64BIT is not set +CONFIG_AR2313=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set +CONFIG_ARCH_POPULATES_NODE_MAP=y +# CONFIG_ARCH_SUPPORTS_MSI is not set +CONFIG_ARCH_SUPPORTS_OPROFILE=y +CONFIG_ATHEROS=y +CONFIG_ATHEROS_AR5312=y +CONFIG_ATHEROS_AR5315=y +# CONFIG_ATM is not set +CONFIG_BASE_SMALL=0 +# CONFIG_BCM47XX is not set +CONFIG_BITREVERSE=y +# CONFIG_BROADCOM_PHY is not set +# CONFIG_BT is not set +CONFIG_CMDLINE="console=ttyS0,9600 rootfstype=squashfs,jffs2 init=/etc/preinit" +CONFIG_CPU_BIG_ENDIAN=y +CONFIG_CPU_HAS_LLSC=y +CONFIG_CPU_HAS_PREFETCH=y +CONFIG_CPU_HAS_SYNC=y +# CONFIG_CPU_LITTLE_ENDIAN is not set +# CONFIG_CPU_LOONGSON2 is not set +CONFIG_CPU_MIPS32=y +CONFIG_CPU_MIPS32_R1=y +# CONFIG_CPU_MIPS32_R2 is not set +# CONFIG_CPU_MIPS64_R1 is not set +# CONFIG_CPU_MIPS64_R2 is not set +CONFIG_CPU_MIPSR1=y +# CONFIG_CPU_NEVADA is not set +# CONFIG_CPU_R10000 is not set +# CONFIG_CPU_R3000 is not set +# CONFIG_CPU_R4300 is not set +# CONFIG_CPU_R4X00 is not set +# CONFIG_CPU_R5000 is not set +# CONFIG_CPU_R5432 is not set +# CONFIG_CPU_R6000 is not set +# CONFIG_CPU_R8000 is not set +# CONFIG_CPU_RM7000 is not set +# CONFIG_CPU_RM9000 is not set +# CONFIG_CPU_SB1 is not set +CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y +CONFIG_CPU_SUPPORTS_HIGHMEM=y +# CONFIG_CPU_TX39XX is not set +# CONFIG_CPU_TX49XX is not set +# CONFIG_CPU_VR41XX is not set +# CONFIG_CRYPTO_HW is not set +# CONFIG_DM9000 is not set +CONFIG_DMA_NEED_PCI_MAP_STATE=y +CONFIG_DMA_NONCOHERENT=y +# CONFIG_FIXED_PHY is not set +CONFIG_FS_POSIX_ACL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_FIND_NEXT_BIT=y +# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +# CONFIG_HOSTAP is not set +CONFIG_HW_RANDOM=y +# CONFIG_I2C is not set +# CONFIG_IBM_NEW_EMAC_EMAC4 is not set +# CONFIG_IBM_NEW_EMAC_RGMII is not set +# CONFIG_IBM_NEW_EMAC_TAH is not set +# CONFIG_IBM_NEW_EMAC_ZMII is not set +CONFIG_ICPLUS_PHY=y +# CONFIG_IDE is not set +# CONFIG_IEEE80211 is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_IRQ_CPU=y +# CONFIG_LEDS_ALIX is not set +# CONFIG_LEMOTE_FULONG is not set +# CONFIG_MACH_ALCHEMY is not set +# CONFIG_MACH_DECSTATION is not set +# CONFIG_MACH_JAZZ is not set +# CONFIG_MACH_VR41XX is not set +# CONFIG_MDIO_BITBANG is not set +CONFIG_MIPS=y +# CONFIG_MIPS_ATLAS is not set +# CONFIG_MIPS_COBALT is not set +CONFIG_MIPS_L1_CACHE_SHIFT=5 +# CONFIG_MIPS_MALTA is not set +CONFIG_MIPS_MT_DISABLED=y +# CONFIG_MIPS_MT_SMP is not set +# CONFIG_MIPS_MT_SMTC is not set +# CONFIG_MIPS_SEAD is not set +# CONFIG_MIPS_SIM is not set +CONFIG_MTD=y +# CONFIG_MTD_ABSENT is not set +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y +# CONFIG_MTD_BLOCK2MTD is not set +CONFIG_MTD_CFI=y +CONFIG_MTD_CFI_ADV_OPTIONS=y +CONFIG_MTD_CFI_AMDSTD=y +# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set +# CONFIG_MTD_CFI_GEOMETRY is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_CFI_INTELEXT is not set +# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set +CONFIG_MTD_CFI_NOSWAP=y +# CONFIG_MTD_CFI_STAA is not set +CONFIG_MTD_CFI_UTIL=y +CONFIG_MTD_CHAR=y +# CONFIG_MTD_CMDLINE_PARTS is not set +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_CONCAT is not set +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_GEN_PROBE=y +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +CONFIG_MTD_MAP_BANK_WIDTH_2=y +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_ONENAND is not set +# CONFIG_MTD_OTP is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_PHRAM is not set +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_BANKWIDTH=0 +CONFIG_MTD_PHYSMAP_LEN=0x0 +CONFIG_MTD_PHYSMAP_START=0x0 +# CONFIG_MTD_PLATRAM is not set +# CONFIG_MTD_RAM is not set +CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-3 +CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_REDBOOT_PARTS_READONLY=y +# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_SLRAM is not set +CONFIG_MTD_SPIFLASH=y +# CONFIG_NO_IOPORT is not set +# CONFIG_PAGE_SIZE_16KB is not set +CONFIG_PAGE_SIZE_4KB=y +# CONFIG_PAGE_SIZE_64KB is not set +# CONFIG_PAGE_SIZE_8KB is not set +CONFIG_PHYLIB=y +# CONFIG_PMC_MSP is not set +# CONFIG_PMC_YOSEMITE is not set +# CONFIG_PNX8550_JBS is not set +# CONFIG_PNX8550_STB810 is not set +# CONFIG_QSEMI_PHY is not set +# CONFIG_RTC is not set +CONFIG_RTC_LIB=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y +CONFIG_SCSI_WAIT_SCAN=m +# CONFIG_SERIAL_8250_EXTENDED is not set +CONFIG_SERIAL_8250_NR_UARTS=1 +CONFIG_SERIAL_8250_RUNTIME_UARTS=1 +# CONFIG_SGI_IP22 is not set +# CONFIG_SGI_IP27 is not set +# CONFIG_SGI_IP32 is not set +# CONFIG_SIBYTE_BIGSUR is not set +# CONFIG_SIBYTE_CARMEL is not set +# CONFIG_SIBYTE_CRHINE is not set +# CONFIG_SIBYTE_CRHONE is not set +# CONFIG_SIBYTE_LITTLESUR is not set +# CONFIG_SIBYTE_PTSWARM is not set +# CONFIG_SIBYTE_RHONE is not set +# CONFIG_SIBYTE_SENTOSA is not set +# CONFIG_SIBYTE_SWARM is not set +CONFIG_SLABINFO=y +# CONFIG_SMSC_PHY is not set +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_SPARSEMEM_STATIC is not set +# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set +CONFIG_SSB_POSSIBLE=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_SYS_HAS_CPU_MIPS32_R1=y +CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y +CONFIG_SYS_SUPPORTS_ARBIT_HZ=y +CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y +CONFIG_TICK_ONESHOT=y +# CONFIG_TOSHIBA_JMR3927 is not set +# CONFIG_TOSHIBA_RBTX4927 is not set +# CONFIG_TOSHIBA_RBTX4938 is not set +CONFIG_TRAD_SIGNALS=y +# CONFIG_USB_ARCH_HAS_EHCI is not set +# CONFIG_USB_ARCH_HAS_HCD is not set +# CONFIG_USB_ARCH_HAS_OHCI is not set +# CONFIG_USER_NS is not set +# CONFIG_VGASTATE is not set +CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/atheros/files/arch/mips/atheros/ar531x.h b/target/linux/atheros/files/arch/mips/atheros/ar531x.h index 5256a548ce..d790a88073 100644 --- a/target/linux/atheros/files/arch/mips/atheros/ar531x.h +++ b/target/linux/atheros/files/arch/mips/atheros/ar531x.h @@ -1,11 +1,15 @@ #ifndef __AR531X_H #define __AR531X_H +#include #include #include #include "ar5312/ar5312.h" #include "ar5315/ar5315.h" +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) +extern void (*board_time_init)(void); +#endif /* * C access to CLZ instruction diff --git a/target/linux/atheros/files/arch/mips/atheros/board.c b/target/linux/atheros/files/arch/mips/atheros/board.c index ebb4a5afef..ccbda48546 100644 --- a/target/linux/atheros/files/arch/mips/atheros/board.c +++ b/target/linux/atheros/files/arch/mips/atheros/board.c @@ -180,6 +180,7 @@ const char *get_system_type(void) return "Atheros (unknown)"; } +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)) void __init plat_timer_setup(struct irqaction *irq) { unsigned int count; @@ -191,6 +192,7 @@ void __init plat_timer_setup(struct irqaction *irq) count = read_c0_count(); write_c0_compare(count + 1000); } +#endif asmlinkage void plat_irq_dispatch(void) { @@ -198,6 +200,13 @@ asmlinkage void plat_irq_dispatch(void) DO_AR5315(ar5315_irq_dispatch();) } +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)) +void (*board_time_init)(void); +void __init plat_time_init(void) { + board_time_init(); +} +#endif + void __init arch_init_irq(void) { clear_c0_status(ST0_IM); diff --git a/target/linux/atheros/files/arch/mips/atheros/prom.c b/target/linux/atheros/files/arch/mips/atheros/prom.c index 403c931acf..250507046c 100644 --- a/target/linux/atheros/files/arch/mips/atheros/prom.c +++ b/target/linux/atheros/files/arch/mips/atheros/prom.c @@ -29,7 +29,6 @@ void __init prom_init(void) { char **argv; - mips_machgroup = MACH_GROUP_ATHEROS; mips_machtype = -1; DO_AR5312(ar5312_prom_init();) diff --git a/target/linux/atheros/files/drivers/net/ar2313/ar2313.c b/target/linux/atheros/files/drivers/net/ar2313/ar2313.c index b6e2dcab35..a2bd7e5b6e 100644 --- a/target/linux/atheros/files/drivers/net/ar2313/ar2313.c +++ b/target/linux/atheros/files/drivers/net/ar2313/ar2313.c @@ -186,7 +186,6 @@ int __init ar2313_probe(struct platform_device *pdev) return -ENOMEM; } - SET_MODULE_OWNER(dev); platform_set_drvdata(pdev, dev); sp = dev->priv; diff --git a/target/linux/atheros/files/include/asm-mips/mach-atheros/war.h b/target/linux/atheros/files/include/asm-mips/mach-atheros/war.h new file mode 100644 index 0000000000..354c6e6fd1 --- /dev/null +++ b/target/linux/atheros/files/include/asm-mips/mach-atheros/war.h @@ -0,0 +1,25 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * Copyright (C) 2008 Felix Fietkau + */ +#ifndef __ASM_MIPS_MACH_ATHEROS_WAR_H +#define __ASM_MIPS_MACH_ATHEROS_WAR_H + +#define R4600_V1_INDEX_ICACHEOP_WAR 0 +#define R4600_V1_HIT_CACHEOP_WAR 0 +#define R4600_V2_HIT_CACHEOP_WAR 0 +#define R5432_CP0_INTERRUPT_WAR 0 +#define BCM1250_M3_WAR 0 +#define SIBYTE_1956_WAR 0 +#define MIPS4K_ICACHE_REFILL_WAR 0 +#define MIPS_CACHE_SYNC_WAR 0 +#define TX49XX_ICACHE_INDEX_INV_WAR 0 +#define RM9000_CDEX_SMP_WAR 0 +#define ICACHE_REFILLS_WORKAROUND_WAR 0 +#define R10000_LLSC_WAR 0 +#define MIPS34K_MISSED_ITLB_WAR 0 + +#endif /* __ASM_MIPS_MACH_ATHEROS_WAR_H */ diff --git a/target/linux/atheros/patches-2.6.23/100-board.patch b/target/linux/atheros/patches-2.6.23/100-board.patch new file mode 100644 index 0000000000..f1aa655f69 --- /dev/null +++ b/target/linux/atheros/patches-2.6.23/100-board.patch @@ -0,0 +1,67 @@ +diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig +--- linux.old/arch/mips/Kconfig 2007-02-02 23:55:52.912446784 +0100 ++++ linux.dev/arch/mips/Kconfig 2007-02-03 21:50:25.262027104 +0100 +@@ -45,6 +45,15 @@ + note that a kernel built with this option selected will not be + able to run on normal units. + ++config ATHEROS ++ bool "Atheros SoC support (EXPERIMENTAL)" ++ depends on EXPERIMENTAL ++ select DMA_NONCOHERENT ++ select IRQ_CPU ++ select SYS_HAS_CPU_MIPS32_R1 ++ select SYS_SUPPORTS_BIG_ENDIAN ++ select SYS_SUPPORTS_32BIT_KERNEL ++ + config MIPS_COBALT + bool "Cobalt Server" + select DMA_NONCOHERENT +@@ -658,6 +668,7 @@ + + endchoice + ++source "arch/mips/atheros/Kconfig" + source "arch/mips/au1000/Kconfig" + source "arch/mips/ddb5xxx/Kconfig" + source "arch/mips/gt64120/ev64120/Kconfig" +diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile +--- linux.old/arch/mips/Makefile 2007-02-02 23:55:52.913446632 +0100 ++++ linux.dev/arch/mips/Makefile 2007-02-03 17:40:29.193776000 +0100 +@@ -267,6 +267,13 @@ + load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000 + + # ++# Atheros AR5312/AR2312 WiSoC ++# ++core-$(CONFIG_ATHEROS) += arch/mips/atheros/ ++cflags-$(CONFIG_ATHEROS) += -Iinclude/asm-mips/mach-atheros ++load-$(CONFIG_ATHEROS) += 0xffffffff80041000 ++ ++# + # Cobalt Server + # + core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/ +diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h +--- linux.old/include/asm-mips/bootinfo.h 2007-02-02 23:55:52.913446632 +0100 ++++ linux.dev/include/asm-mips/bootinfo.h 2007-02-03 17:51:02.531494032 +0100 +@@ -213,6 +213,18 @@ + #define MACH_GROUP_NEC_EMMA2RH 25 /* NEC EMMA2RH (was 23) */ + #define MACH_NEC_MARKEINS 0 /* NEC EMMA2RH Mark-eins */ + ++/* ++ * Valid machtype for group ATHEROS ++ */ ++#define MACH_GROUP_ATHEROS 26 ++#define MACH_ATHEROS_AR5312 0 ++#define MACH_ATHEROS_AR2312 1 ++#define MACH_ATHEROS_AR2313 2 ++#define MACH_ATHEROS_AR2315 3 ++#define MACH_ATHEROS_AR2316 4 ++#define MACH_ATHEROS_AR2317 5 ++#define MACH_ATHEROS_AR2318 6 ++ + #define CL_SIZE COMMAND_LINE_SIZE + + const char *get_system_type(void); + diff --git a/target/linux/atheros/patches-2.6.23/110-spiflash.patch b/target/linux/atheros/patches-2.6.23/110-spiflash.patch new file mode 100644 index 0000000000..fc4ef4c0f2 --- /dev/null +++ b/target/linux/atheros/patches-2.6.23/110-spiflash.patch @@ -0,0 +1,22 @@ +diff -urN linux.old/drivers/mtd/devices/Kconfig linux.dev/drivers/mtd/devices/Kconfig +--- linux.old/drivers/mtd/devices/Kconfig 2007-02-04 04:30:26.145338240 +0100 ++++ linux.dev/drivers/mtd/devices/Kconfig 2007-02-02 23:48:28.748969000 +0100 +@@ -76,6 +76,10 @@ + used for program and data storage. Set up your spi devices + with the right board-specific platform data. + ++config MTD_SPIFLASH ++ tristate "Atheros AR2315/6/7 SPI Flash support" ++ depends on ATHEROS_AR5315 ++ + config MTD_SLRAM + tristate "Uncached system RAM" + help +diff -urN linux.old/drivers/mtd/devices/Makefile linux.dev/drivers/mtd/devices/Makefile +--- linux.old/drivers/mtd/devices/Makefile 2007-02-04 04:30:26.146338088 +0100 ++++ linux.dev/drivers/mtd/devices/Makefile 2007-02-02 23:48:28.749969000 +0100 +@@ -18,3 +18,4 @@ + obj-$(CONFIG_MTD_DATAFLASH) += mtd_dataflash.o + obj-$(CONFIG_MTD_DATAFLASH26) += at91_dataflash26.o + obj-$(CONFIG_MTD_M25P80) += m25p80.o ++obj-$(CONFIG_MTD_SPIFLASH) += spiflash.o diff --git a/target/linux/atheros/patches-2.6.23/130-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.23/130-ar2313_ethernet.patch new file mode 100644 index 0000000000..721eba663f --- /dev/null +++ b/target/linux/atheros/patches-2.6.23/130-ar2313_ethernet.patch @@ -0,0 +1,29 @@ +Index: linux-2.6.23/drivers/net/Kconfig +=================================================================== +--- linux-2.6.23.orig/drivers/net/Kconfig 2007-10-14 00:55:22.000000000 +0200 ++++ linux-2.6.23/drivers/net/Kconfig 2007-10-14 00:56:32.000000000 +0200 +@@ -348,6 +348,12 @@ + AX88796 driver, using platform bus to provide + chip detection and resources + ++config AR2313 ++ tristate "AR2313 Ethernet support" ++ depends on NET_ETHERNET && ATHEROS ++ help ++ Support for the AR231x/531x ethernet controller ++ + config MACE + tristate "MACE (Power Mac ethernet) support" + depends on PPC_PMAC && PPC32 +Index: linux-2.6.23/drivers/net/Makefile +=================================================================== +--- linux-2.6.23.orig/drivers/net/Makefile 2007-10-14 00:55:22.000000000 +0200 ++++ linux-2.6.23/drivers/net/Makefile 2007-10-14 00:56:55.000000000 +0200 +@@ -182,6 +182,7 @@ + obj-$(CONFIG_LGUEST_NET) += lguest_net.o + obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o + obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o ++obj-$(CONFIG_AR2313) += ar2313/ + obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o + obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o + obj-$(CONFIG_DECLANCE) += declance.o diff --git a/target/linux/atheros/patches-2.6.23/140-redboot_partition_scan.patch b/target/linux/atheros/patches-2.6.23/140-redboot_partition_scan.patch new file mode 100644 index 0000000000..de4ebeb553 --- /dev/null +++ b/target/linux/atheros/patches-2.6.23/140-redboot_partition_scan.patch @@ -0,0 +1,24 @@ +diff -urN linux.old/drivers/mtd/redboot.c linux.dev/drivers/mtd/redboot.c +--- linux.old/drivers/mtd/redboot.c 2006-12-14 23:53:29.000000000 +0100 ++++ linux.dev/drivers/mtd/redboot.c 2006-12-16 04:23:42.000000000 +0100 +@@ -64,6 +64,7 @@ + if (!buf) + return -ENOMEM; + ++restart: + if ( directory < 0 ) + offset = master->size + directory*master->erasesize; + else +@@ -140,6 +141,11 @@ + } + if (i == numslots) { + /* Didn't find it */ ++ if (offset + master->erasesize < master->size) { ++ /* not at the end of the flash yet, maybe next block :) */ ++ directory++; ++ goto restart; ++ } + printk(KERN_NOTICE "No RedBoot partition table detected in %s\n", + master->name); + ret = 0; + diff --git a/target/linux/atheros/patches-2.6.23/150-bridge-printk.patch b/target/linux/atheros/patches-2.6.23/150-bridge-printk.patch new file mode 100644 index 0000000000..0a35d89beb --- /dev/null +++ b/target/linux/atheros/patches-2.6.23/150-bridge-printk.patch @@ -0,0 +1,26 @@ +--- linux-2.6.23.orig/net/core/dev.c 2007-10-12 23:42:06.000000000 +0200 ++++ linux-2.6.23/net/core/dev.c 2007-10-12 23:44:22.000000000 +0200 +@@ -3425,8 +3425,8 @@ + /* Fix illegal SG+CSUM combinations. */ + if ((dev->features & NETIF_F_SG) && + !(dev->features & NETIF_F_ALL_CSUM)) { +- printk(KERN_NOTICE "%s: Dropping NETIF_F_SG since no checksum feature.\n", +- dev->name); ++ //printk(KERN_NOTICE "%s: Dropping NETIF_F_SG since no checksum feature.\n", ++ // dev->name); + dev->features &= ~NETIF_F_SG; + } + +@@ -3439,9 +3439,9 @@ + } + if (dev->features & NETIF_F_UFO) { + if (!(dev->features & NETIF_F_HW_CSUM)) { +- printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no " +- "NETIF_F_HW_CSUM feature.\n", +- dev->name); ++ //printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no " ++ // "NETIF_F_HW_CSUM feature.\n", ++ // dev->name); + dev->features &= ~NETIF_F_UFO; + } + if (!(dev->features & NETIF_F_SG)) { diff --git a/target/linux/atheros/patches-2.6.24/100-board.patch b/target/linux/atheros/patches-2.6.24/100-board.patch new file mode 100644 index 0000000000..f1aa655f69 --- /dev/null +++ b/target/linux/atheros/patches-2.6.24/100-board.patch @@ -0,0 +1,67 @@ +diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig +--- linux.old/arch/mips/Kconfig 2007-02-02 23:55:52.912446784 +0100 ++++ linux.dev/arch/mips/Kconfig 2007-02-03 21:50:25.262027104 +0100 +@@ -45,6 +45,15 @@ + note that a kernel built with this option selected will not be + able to run on normal units. + ++config ATHEROS ++ bool "Atheros SoC support (EXPERIMENTAL)" ++ depends on EXPERIMENTAL ++ select DMA_NONCOHERENT ++ select IRQ_CPU ++ select SYS_HAS_CPU_MIPS32_R1 ++ select SYS_SUPPORTS_BIG_ENDIAN ++ select SYS_SUPPORTS_32BIT_KERNEL ++ + config MIPS_COBALT + bool "Cobalt Server" + select DMA_NONCOHERENT +@@ -658,6 +668,7 @@ + + endchoice + ++source "arch/mips/atheros/Kconfig" + source "arch/mips/au1000/Kconfig" + source "arch/mips/ddb5xxx/Kconfig" + source "arch/mips/gt64120/ev64120/Kconfig" +diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile +--- linux.old/arch/mips/Makefile 2007-02-02 23:55:52.913446632 +0100 ++++ linux.dev/arch/mips/Makefile 2007-02-03 17:40:29.193776000 +0100 +@@ -267,6 +267,13 @@ + load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000 + + # ++# Atheros AR5312/AR2312 WiSoC ++# ++core-$(CONFIG_ATHEROS) += arch/mips/atheros/ ++cflags-$(CONFIG_ATHEROS) += -Iinclude/asm-mips/mach-atheros ++load-$(CONFIG_ATHEROS) += 0xffffffff80041000 ++ ++# + # Cobalt Server + # + core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/ +diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h +--- linux.old/include/asm-mips/bootinfo.h 2007-02-02 23:55:52.913446632 +0100 ++++ linux.dev/include/asm-mips/bootinfo.h 2007-02-03 17:51:02.531494032 +0100 +@@ -213,6 +213,18 @@ + #define MACH_GROUP_NEC_EMMA2RH 25 /* NEC EMMA2RH (was 23) */ + #define MACH_NEC_MARKEINS 0 /* NEC EMMA2RH Mark-eins */ + ++/* ++ * Valid machtype for group ATHEROS ++ */ ++#define MACH_GROUP_ATHEROS 26 ++#define MACH_ATHEROS_AR5312 0 ++#define MACH_ATHEROS_AR2312 1 ++#define MACH_ATHEROS_AR2313 2 ++#define MACH_ATHEROS_AR2315 3 ++#define MACH_ATHEROS_AR2316 4 ++#define MACH_ATHEROS_AR2317 5 ++#define MACH_ATHEROS_AR2318 6 ++ + #define CL_SIZE COMMAND_LINE_SIZE + + const char *get_system_type(void); + diff --git a/target/linux/atheros/patches-2.6.24/110-spiflash.patch b/target/linux/atheros/patches-2.6.24/110-spiflash.patch new file mode 100644 index 0000000000..fc4ef4c0f2 --- /dev/null +++ b/target/linux/atheros/patches-2.6.24/110-spiflash.patch @@ -0,0 +1,22 @@ +diff -urN linux.old/drivers/mtd/devices/Kconfig linux.dev/drivers/mtd/devices/Kconfig +--- linux.old/drivers/mtd/devices/Kconfig 2007-02-04 04:30:26.145338240 +0100 ++++ linux.dev/drivers/mtd/devices/Kconfig 2007-02-02 23:48:28.748969000 +0100 +@@ -76,6 +76,10 @@ + used for program and data storage. Set up your spi devices + with the right board-specific platform data. + ++config MTD_SPIFLASH ++ tristate "Atheros AR2315/6/7 SPI Flash support" ++ depends on ATHEROS_AR5315 ++ + config MTD_SLRAM + tristate "Uncached system RAM" + help +diff -urN linux.old/drivers/mtd/devices/Makefile linux.dev/drivers/mtd/devices/Makefile +--- linux.old/drivers/mtd/devices/Makefile 2007-02-04 04:30:26.146338088 +0100 ++++ linux.dev/drivers/mtd/devices/Makefile 2007-02-02 23:48:28.749969000 +0100 +@@ -18,3 +18,4 @@ + obj-$(CONFIG_MTD_DATAFLASH) += mtd_dataflash.o + obj-$(CONFIG_MTD_DATAFLASH26) += at91_dataflash26.o + obj-$(CONFIG_MTD_M25P80) += m25p80.o ++obj-$(CONFIG_MTD_SPIFLASH) += spiflash.o diff --git a/target/linux/atheros/patches-2.6.24/130-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.24/130-ar2313_ethernet.patch new file mode 100644 index 0000000000..721eba663f --- /dev/null +++ b/target/linux/atheros/patches-2.6.24/130-ar2313_ethernet.patch @@ -0,0 +1,29 @@ +Index: linux-2.6.23/drivers/net/Kconfig +=================================================================== +--- linux-2.6.23.orig/drivers/net/Kconfig 2007-10-14 00:55:22.000000000 +0200 ++++ linux-2.6.23/drivers/net/Kconfig 2007-10-14 00:56:32.000000000 +0200 +@@ -348,6 +348,12 @@ + AX88796 driver, using platform bus to provide + chip detection and resources + ++config AR2313 ++ tristate "AR2313 Ethernet support" ++ depends on NET_ETHERNET && ATHEROS ++ help ++ Support for the AR231x/531x ethernet controller ++ + config MACE + tristate "MACE (Power Mac ethernet) support" + depends on PPC_PMAC && PPC32 +Index: linux-2.6.23/drivers/net/Makefile +=================================================================== +--- linux-2.6.23.orig/drivers/net/Makefile 2007-10-14 00:55:22.000000000 +0200 ++++ linux-2.6.23/drivers/net/Makefile 2007-10-14 00:56:55.000000000 +0200 +@@ -182,6 +182,7 @@ + obj-$(CONFIG_LGUEST_NET) += lguest_net.o + obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o + obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o ++obj-$(CONFIG_AR2313) += ar2313/ + obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o + obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o + obj-$(CONFIG_DECLANCE) += declance.o diff --git a/target/linux/atheros/patches-2.6.24/140-redboot_partition_scan.patch b/target/linux/atheros/patches-2.6.24/140-redboot_partition_scan.patch new file mode 100644 index 0000000000..de4ebeb553 --- /dev/null +++ b/target/linux/atheros/patches-2.6.24/140-redboot_partition_scan.patch @@ -0,0 +1,24 @@ +diff -urN linux.old/drivers/mtd/redboot.c linux.dev/drivers/mtd/redboot.c +--- linux.old/drivers/mtd/redboot.c 2006-12-14 23:53:29.000000000 +0100 ++++ linux.dev/drivers/mtd/redboot.c 2006-12-16 04:23:42.000000000 +0100 +@@ -64,6 +64,7 @@ + if (!buf) + return -ENOMEM; + ++restart: + if ( directory < 0 ) + offset = master->size + directory*master->erasesize; + else +@@ -140,6 +141,11 @@ + } + if (i == numslots) { + /* Didn't find it */ ++ if (offset + master->erasesize < master->size) { ++ /* not at the end of the flash yet, maybe next block :) */ ++ directory++; ++ goto restart; ++ } + printk(KERN_NOTICE "No RedBoot partition table detected in %s\n", + master->name); + ret = 0; + diff --git a/target/linux/atheros/patches-2.6.24/150-bridge-printk.patch b/target/linux/atheros/patches-2.6.24/150-bridge-printk.patch new file mode 100644 index 0000000000..0a35d89beb --- /dev/null +++ b/target/linux/atheros/patches-2.6.24/150-bridge-printk.patch @@ -0,0 +1,26 @@ +--- linux-2.6.23.orig/net/core/dev.c 2007-10-12 23:42:06.000000000 +0200 ++++ linux-2.6.23/net/core/dev.c 2007-10-12 23:44:22.000000000 +0200 +@@ -3425,8 +3425,8 @@ + /* Fix illegal SG+CSUM combinations. */ + if ((dev->features & NETIF_F_SG) && + !(dev->features & NETIF_F_ALL_CSUM)) { +- printk(KERN_NOTICE "%s: Dropping NETIF_F_SG since no checksum feature.\n", +- dev->name); ++ //printk(KERN_NOTICE "%s: Dropping NETIF_F_SG since no checksum feature.\n", ++ // dev->name); + dev->features &= ~NETIF_F_SG; + } + +@@ -3439,9 +3439,9 @@ + } + if (dev->features & NETIF_F_UFO) { + if (!(dev->features & NETIF_F_HW_CSUM)) { +- printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no " +- "NETIF_F_HW_CSUM feature.\n", +- dev->name); ++ //printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no " ++ // "NETIF_F_HW_CSUM feature.\n", ++ // dev->name); + dev->features &= ~NETIF_F_UFO; + } + if (!(dev->features & NETIF_F_SG)) { diff --git a/target/linux/atheros/patches/100-board.patch b/target/linux/atheros/patches/100-board.patch deleted file mode 100644 index f1aa655f69..0000000000 --- a/target/linux/atheros/patches/100-board.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig ---- linux.old/arch/mips/Kconfig 2007-02-02 23:55:52.912446784 +0100 -+++ linux.dev/arch/mips/Kconfig 2007-02-03 21:50:25.262027104 +0100 -@@ -45,6 +45,15 @@ - note that a kernel built with this option selected will not be - able to run on normal units. - -+config ATHEROS -+ bool "Atheros SoC support (EXPERIMENTAL)" -+ depends on EXPERIMENTAL -+ select DMA_NONCOHERENT -+ select IRQ_CPU -+ select SYS_HAS_CPU_MIPS32_R1 -+ select SYS_SUPPORTS_BIG_ENDIAN -+ select SYS_SUPPORTS_32BIT_KERNEL -+ - config MIPS_COBALT - bool "Cobalt Server" - select DMA_NONCOHERENT -@@ -658,6 +668,7 @@ - - endchoice - -+source "arch/mips/atheros/Kconfig" - source "arch/mips/au1000/Kconfig" - source "arch/mips/ddb5xxx/Kconfig" - source "arch/mips/gt64120/ev64120/Kconfig" -diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile ---- linux.old/arch/mips/Makefile 2007-02-02 23:55:52.913446632 +0100 -+++ linux.dev/arch/mips/Makefile 2007-02-03 17:40:29.193776000 +0100 -@@ -267,6 +267,13 @@ - load-$(CONFIG_MIPS_XXS1500) += 0xffffffff80100000 - - # -+# Atheros AR5312/AR2312 WiSoC -+# -+core-$(CONFIG_ATHEROS) += arch/mips/atheros/ -+cflags-$(CONFIG_ATHEROS) += -Iinclude/asm-mips/mach-atheros -+load-$(CONFIG_ATHEROS) += 0xffffffff80041000 -+ -+# - # Cobalt Server - # - core-$(CONFIG_MIPS_COBALT) += arch/mips/cobalt/ -diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h ---- linux.old/include/asm-mips/bootinfo.h 2007-02-02 23:55:52.913446632 +0100 -+++ linux.dev/include/asm-mips/bootinfo.h 2007-02-03 17:51:02.531494032 +0100 -@@ -213,6 +213,18 @@ - #define MACH_GROUP_NEC_EMMA2RH 25 /* NEC EMMA2RH (was 23) */ - #define MACH_NEC_MARKEINS 0 /* NEC EMMA2RH Mark-eins */ - -+/* -+ * Valid machtype for group ATHEROS -+ */ -+#define MACH_GROUP_ATHEROS 26 -+#define MACH_ATHEROS_AR5312 0 -+#define MACH_ATHEROS_AR2312 1 -+#define MACH_ATHEROS_AR2313 2 -+#define MACH_ATHEROS_AR2315 3 -+#define MACH_ATHEROS_AR2316 4 -+#define MACH_ATHEROS_AR2317 5 -+#define MACH_ATHEROS_AR2318 6 -+ - #define CL_SIZE COMMAND_LINE_SIZE - - const char *get_system_type(void); - diff --git a/target/linux/atheros/patches/110-spiflash.patch b/target/linux/atheros/patches/110-spiflash.patch deleted file mode 100644 index fc4ef4c0f2..0000000000 --- a/target/linux/atheros/patches/110-spiflash.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN linux.old/drivers/mtd/devices/Kconfig linux.dev/drivers/mtd/devices/Kconfig ---- linux.old/drivers/mtd/devices/Kconfig 2007-02-04 04:30:26.145338240 +0100 -+++ linux.dev/drivers/mtd/devices/Kconfig 2007-02-02 23:48:28.748969000 +0100 -@@ -76,6 +76,10 @@ - used for program and data storage. Set up your spi devices - with the right board-specific platform data. - -+config MTD_SPIFLASH -+ tristate "Atheros AR2315/6/7 SPI Flash support" -+ depends on ATHEROS_AR5315 -+ - config MTD_SLRAM - tristate "Uncached system RAM" - help -diff -urN linux.old/drivers/mtd/devices/Makefile linux.dev/drivers/mtd/devices/Makefile ---- linux.old/drivers/mtd/devices/Makefile 2007-02-04 04:30:26.146338088 +0100 -+++ linux.dev/drivers/mtd/devices/Makefile 2007-02-02 23:48:28.749969000 +0100 -@@ -18,3 +18,4 @@ - obj-$(CONFIG_MTD_DATAFLASH) += mtd_dataflash.o - obj-$(CONFIG_MTD_DATAFLASH26) += at91_dataflash26.o - obj-$(CONFIG_MTD_M25P80) += m25p80.o -+obj-$(CONFIG_MTD_SPIFLASH) += spiflash.o diff --git a/target/linux/atheros/patches/130-ar2313_ethernet.patch b/target/linux/atheros/patches/130-ar2313_ethernet.patch deleted file mode 100644 index 721eba663f..0000000000 --- a/target/linux/atheros/patches/130-ar2313_ethernet.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: linux-2.6.23/drivers/net/Kconfig -=================================================================== ---- linux-2.6.23.orig/drivers/net/Kconfig 2007-10-14 00:55:22.000000000 +0200 -+++ linux-2.6.23/drivers/net/Kconfig 2007-10-14 00:56:32.000000000 +0200 -@@ -348,6 +348,12 @@ - AX88796 driver, using platform bus to provide - chip detection and resources - -+config AR2313 -+ tristate "AR2313 Ethernet support" -+ depends on NET_ETHERNET && ATHEROS -+ help -+ Support for the AR231x/531x ethernet controller -+ - config MACE - tristate "MACE (Power Mac ethernet) support" - depends on PPC_PMAC && PPC32 -Index: linux-2.6.23/drivers/net/Makefile -=================================================================== ---- linux-2.6.23.orig/drivers/net/Makefile 2007-10-14 00:55:22.000000000 +0200 -+++ linux-2.6.23/drivers/net/Makefile 2007-10-14 00:56:55.000000000 +0200 -@@ -182,6 +182,7 @@ - obj-$(CONFIG_LGUEST_NET) += lguest_net.o - obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o - obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o -+obj-$(CONFIG_AR2313) += ar2313/ - obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o - obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o - obj-$(CONFIG_DECLANCE) += declance.o diff --git a/target/linux/atheros/patches/140-redboot_partition_scan.patch b/target/linux/atheros/patches/140-redboot_partition_scan.patch deleted file mode 100644 index de4ebeb553..0000000000 --- a/target/linux/atheros/patches/140-redboot_partition_scan.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN linux.old/drivers/mtd/redboot.c linux.dev/drivers/mtd/redboot.c ---- linux.old/drivers/mtd/redboot.c 2006-12-14 23:53:29.000000000 +0100 -+++ linux.dev/drivers/mtd/redboot.c 2006-12-16 04:23:42.000000000 +0100 -@@ -64,6 +64,7 @@ - if (!buf) - return -ENOMEM; - -+restart: - if ( directory < 0 ) - offset = master->size + directory*master->erasesize; - else -@@ -140,6 +141,11 @@ - } - if (i == numslots) { - /* Didn't find it */ -+ if (offset + master->erasesize < master->size) { -+ /* not at the end of the flash yet, maybe next block :) */ -+ directory++; -+ goto restart; -+ } - printk(KERN_NOTICE "No RedBoot partition table detected in %s\n", - master->name); - ret = 0; - diff --git a/target/linux/atheros/patches/150-bridge-printk.patch b/target/linux/atheros/patches/150-bridge-printk.patch deleted file mode 100644 index 0a35d89beb..0000000000 --- a/target/linux/atheros/patches/150-bridge-printk.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- linux-2.6.23.orig/net/core/dev.c 2007-10-12 23:42:06.000000000 +0200 -+++ linux-2.6.23/net/core/dev.c 2007-10-12 23:44:22.000000000 +0200 -@@ -3425,8 +3425,8 @@ - /* Fix illegal SG+CSUM combinations. */ - if ((dev->features & NETIF_F_SG) && - !(dev->features & NETIF_F_ALL_CSUM)) { -- printk(KERN_NOTICE "%s: Dropping NETIF_F_SG since no checksum feature.\n", -- dev->name); -+ //printk(KERN_NOTICE "%s: Dropping NETIF_F_SG since no checksum feature.\n", -+ // dev->name); - dev->features &= ~NETIF_F_SG; - } - -@@ -3439,9 +3439,9 @@ - } - if (dev->features & NETIF_F_UFO) { - if (!(dev->features & NETIF_F_HW_CSUM)) { -- printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no " -- "NETIF_F_HW_CSUM feature.\n", -- dev->name); -+ //printk(KERN_ERR "%s: Dropping NETIF_F_UFO since no " -+ // "NETIF_F_HW_CSUM feature.\n", -+ // dev->name); - dev->features &= ~NETIF_F_UFO; - } - if (!(dev->features & NETIF_F_SG)) { diff --git a/target/linux/generic-2.6/config-2.6.24 b/target/linux/generic-2.6/config-2.6.24 index 98643377b2..5848485fa0 100644 --- a/target/linux/generic-2.6/config-2.6.24 +++ b/target/linux/generic-2.6/config-2.6.24 @@ -1182,6 +1182,7 @@ CONFIG_SCSI_PROC_FS=y # CONFIG_SCSI_SEAGATE is not set # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_SRP is not set +# CONFIG_SCSI_SRP_ATTRS is not set # CONFIG_SCSI_STEX is not set # CONFIG_SCSI_SYM53C416 is not set # CONFIG_SCSI_SYM53C8XX_2 is not set -- cgit v1.2.3