add support for 2.6.28 and use it as the default kernel version, tested on Airlink AR525W and RDC8610 eval board
SVN-Revision: 15382master
Florian Fainelli
15 years ago
parent
317bf46798
commit
426c91001f
@ -0,0 +1,18 @@ |
||||
# Copyright (C) 2009 OpenWrt.org |
||||
|
||||
config interface loopback |
||||
option ifname lo |
||||
option proto static |
||||
option ipaddr 127.0.0.1 |
||||
option netmask 255.0.0.0 |
||||
|
||||
config interface lan |
||||
option ifname eth1 |
||||
option type bridge |
||||
option proto static |
||||
option ipaddr 192.168.1.1 |
||||
option netmask 255.255.255.0 |
||||
|
||||
config interface wan |
||||
option ifname eth0 |
||||
option proto dhcp |
||||
@ -0,0 +1,341 @@ |
||||
# CONFIG_4KSTACKS is not set |
||||
# CONFIG_60XX_WDT is not set |
||||
# CONFIG_64BIT is not set |
||||
# CONFIG_8139TOO is not set |
||||
# CONFIG_ACQUIRE_WDT is not set |
||||
# CONFIG_ADVANTECH_WDT is not set |
||||
# CONFIG_AGP is not set |
||||
# CONFIG_ALIM1535_WDT is not set |
||||
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" |
||||
CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y |
||||
CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y |
||||
CONFIG_ARCH_HAS_CPU_RELAX=y |
||||
CONFIG_ARCH_HAS_DEFAULT_IDLE=y |
||||
CONFIG_ARCH_HIBERNATION_POSSIBLE=y |
||||
CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
||||
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set |
||||
CONFIG_ARCH_POPULATES_NODE_MAP=y |
||||
CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
||||
CONFIG_ARCH_SPARSEMEM_ENABLE=y |
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set |
||||
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y |
||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y |
||||
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
||||
# CONFIG_AUDIT_ARCH is not set |
||||
CONFIG_BASE_SMALL=0 |
||||
# CONFIG_BINFMT_AOUT is not set |
||||
CONFIG_BITREVERSE=y |
||||
CONFIG_BOUNCE=y |
||||
CONFIG_CLASSIC_RCU=y |
||||
CONFIG_CLOCKSOURCE_WATCHDOG=y |
||||
CONFIG_CMDLINE="console=ttyS0,38400 init=/etc/preinit" |
||||
CONFIG_CMDLINE_BOOL=y |
||||
# CONFIG_CMDLINE_OVERRIDE is not set |
||||
# CONFIG_COMPAT_VDSO is not set |
||||
# CONFIG_CPU5_WDT is not set |
||||
# CONFIG_CPU_FREQ is not set |
||||
CONFIG_CPU_SUP_AMD=y |
||||
CONFIG_CPU_SUP_CENTAUR_32=y |
||||
CONFIG_CPU_SUP_CYRIX_32=y |
||||
CONFIG_CPU_SUP_INTEL=y |
||||
CONFIG_CPU_SUP_TRANSMETA_32=y |
||||
CONFIG_CPU_SUP_UMC_32=y |
||||
# CONFIG_CRYPTO_AES_586 is not set |
||||
# CONFIG_CRYPTO_CRC32C_INTEL is not set |
||||
# CONFIG_CRYPTO_SALSA20_586 is not set |
||||
# CONFIG_CRYPTO_TWOFISH_586 is not set |
||||
# CONFIG_CS5535_GPIO is not set |
||||
# CONFIG_DCDBAS is not set |
||||
# CONFIG_DEBUG_BUGVERBOSE is not set |
||||
CONFIG_DEFAULT_CFQ=y |
||||
# CONFIG_DEFAULT_DEADLINE is not set |
||||
CONFIG_DEFAULT_IOSCHED="cfq" |
||||
CONFIG_DEFAULT_IO_DELAY_TYPE=0 |
||||
# CONFIG_DELL_RBU is not set |
||||
CONFIG_DEVPORT=y |
||||
CONFIG_DMI=y |
||||
CONFIG_DMIID=y |
||||
CONFIG_DOUBLEFAULT=y |
||||
CONFIG_EARLY_PRINTK=y |
||||
# CONFIG_EARLY_PRINTK_DBGP is not set |
||||
# CONFIG_EDAC is not set |
||||
# CONFIG_EDD is not set |
||||
# CONFIG_EUROTECH_WDT is not set |
||||
CONFIG_FAST_CMPXCHG_LOCAL=y |
||||
CONFIG_FIRMWARE_MEMMAP=y |
||||
# CONFIG_FIXED_PHY is not set |
||||
CONFIG_FIX_EARLYCON_MEM=y |
||||
# CONFIG_FREEZER is not set |
||||
CONFIG_GENERIC_BUG=y |
||||
CONFIG_GENERIC_CLOCKEVENTS=y |
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
||||
CONFIG_GENERIC_CMOS_UPDATE=y |
||||
# CONFIG_GENERIC_CPU is not set |
||||
CONFIG_GENERIC_FIND_FIRST_BIT=y |
||||
CONFIG_GENERIC_FIND_NEXT_BIT=y |
||||
CONFIG_GENERIC_IOMAP=y |
||||
CONFIG_GENERIC_ISA_DMA=y |
||||
# CONFIG_GENERIC_TIME_VSYSCALL is not set |
||||
# CONFIG_GEN_RTC is not set |
||||
# CONFIG_HANGCHECK_TIMER is not set |
||||
CONFIG_HAS_DMA=y |
||||
CONFIG_HAS_IOMEM=y |
||||
CONFIG_HAS_IOPORT=y |
||||
CONFIG_HAVE_AOUT=y |
||||
CONFIG_HAVE_ARCH_KGDB=y |
||||
CONFIG_HAVE_ARCH_TRACEHOOK=y |
||||
CONFIG_HAVE_ATOMIC_IOMAP=y |
||||
# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set |
||||
CONFIG_HAVE_DYNAMIC_FTRACE=y |
||||
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y |
||||
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
||||
CONFIG_HAVE_FUNCTION_TRACER=y |
||||
CONFIG_HAVE_GENERIC_DMA_COHERENT=y |
||||
CONFIG_HAVE_IDE=y |
||||
CONFIG_HAVE_IOREMAP_PROT=y |
||||
CONFIG_HAVE_KPROBES=y |
||||
CONFIG_HAVE_KRETPROBES=y |
||||
CONFIG_HAVE_KVM=y |
||||
CONFIG_HAVE_LATENCYTOP_SUPPORT=y |
||||
CONFIG_HAVE_OPROFILE=y |
||||
# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set |
||||
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y |
||||
# CONFIG_HIGHMEM4G is not set |
||||
# CONFIG_HIGHMEM64G is not set |
||||
# CONFIG_HIGH_RES_TIMERS is not set |
||||
# CONFIG_HPET_TIMER is not set |
||||
# CONFIG_HP_WATCHDOG is not set |
||||
CONFIG_HUGETLBFS=y |
||||
CONFIG_HUGETLB_PAGE=y |
||||
CONFIG_HW_RANDOM=y |
||||
# CONFIG_HW_RANDOM_AMD is not set |
||||
# CONFIG_HW_RANDOM_GEODE is not set |
||||
# CONFIG_HW_RANDOM_INTEL is not set |
||||
# CONFIG_HW_RANDOM_VIA is not set |
||||
CONFIG_HZ=250 |
||||
# CONFIG_HZ_100 is not set |
||||
CONFIG_HZ_250=y |
||||
# CONFIG_I2C is not set |
||||
# CONFIG_I6300ESB_WDT is not set |
||||
# CONFIG_I8K is not set |
||||
# CONFIG_IB700_WDT is not set |
||||
# CONFIG_IBMASR is not set |
||||
# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set |
||||
# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set |
||||
# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set |
||||
CONFIG_ICPLUS_PHY=y |
||||
# CONFIG_IDE is not set |
||||
CONFIG_INITRAMFS_SOURCE="" |
||||
# CONFIG_IOMMU_HELPER is not set |
||||
CONFIG_IOSCHED_CFQ=y |
||||
# CONFIG_IOSCHED_DEADLINE is not set |
||||
CONFIG_IO_DELAY_0X80=y |
||||
# CONFIG_IO_DELAY_0XED is not set |
||||
# CONFIG_IO_DELAY_NONE is not set |
||||
CONFIG_IO_DELAY_TYPE_0X80=0 |
||||
CONFIG_IO_DELAY_TYPE_0XED=1 |
||||
CONFIG_IO_DELAY_TYPE_NONE=3 |
||||
CONFIG_IO_DELAY_TYPE_UDELAY=2 |
||||
# CONFIG_IO_DELAY_UDELAY is not set |
||||
# CONFIG_ISA is not set |
||||
CONFIG_ISA_DMA_API=y |
||||
# CONFIG_ISCSI_IBFT_FIND is not set |
||||
# CONFIG_IT8712F_WDT is not set |
||||
# CONFIG_IT87_WDT is not set |
||||
# CONFIG_ITCO_WDT is not set |
||||
# CONFIG_KERNEL_BZIP2 is not set |
||||
# CONFIG_KERNEL_GZIP is not set |
||||
CONFIG_KERNEL_LZMA=y |
||||
CONFIG_KEXEC=y |
||||
CONFIG_KMOD=y |
||||
CONFIG_KTIME_SCALAR=y |
||||
# CONFIG_KVM is not set |
||||
CONFIG_LBD=y |
||||
# CONFIG_LEDS_ALIX is not set |
||||
# CONFIG_LGUEST is not set |
||||
CONFIG_LSF=y |
||||
# CONFIG_M386 is not set |
||||
CONFIG_M486=y |
||||
# CONFIG_M586 is not set |
||||
# CONFIG_M586MMX is not set |
||||
# CONFIG_M586TSC is not set |
||||
# CONFIG_M686 is not set |
||||
# CONFIG_MACHZ_WDT is not set |
||||
# CONFIG_MACINTOSH_DRIVERS is not set |
||||
CONFIG_MATH_EMULATION=y |
||||
# CONFIG_MCA is not set |
||||
# CONFIG_MCORE2 is not set |
||||
# CONFIG_MCRUSOE is not set |
||||
# CONFIG_MCYRIXIII is not set |
||||
# CONFIG_MEFFICEON is not set |
||||
# CONFIG_MEMTEST is not set |
||||
# CONFIG_MFD_CORE is not set |
||||
# CONFIG_MFD_TMIO is not set |
||||
# CONFIG_MGEODEGX1 is not set |
||||
# CONFIG_MGEODE_LX is not set |
||||
# CONFIG_MICROCODE is not set |
||||
# CONFIG_MK6 is not set |
||||
# CONFIG_MK7 is not set |
||||
# CONFIG_MK8 is not set |
||||
CONFIG_MODULE_FORCE_UNLOAD=y |
||||
# CONFIG_MPENTIUM4 is not set |
||||
# CONFIG_MPENTIUMII is not set |
||||
# CONFIG_MPENTIUMIII is not set |
||||
# CONFIG_MPENTIUMM is not set |
||||
# CONFIG_MPSC 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 is not set |
||||
CONFIG_MTD_CFI_AMDSTD=y |
||||
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_STAA is not set |
||||
CONFIG_MTD_CFI_UTIL=y |
||||
CONFIG_MTD_CHAR=y |
||||
CONFIG_MTD_CMDLINE_PARTS=y |
||||
# CONFIG_MTD_COMPLEX_MAPPINGS is not set |
||||
CONFIG_MTD_CONCAT=y |
||||
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_NETSC520 is not set |
||||
# CONFIG_MTD_ONENAND is not set |
||||
CONFIG_MTD_PARTITIONS=y |
||||
# CONFIG_MTD_PHRAM is not set |
||||
# CONFIG_MTD_PHYSMAP is not set |
||||
# CONFIG_MTD_PLATRAM is not set |
||||
# CONFIG_MTD_PMC551 is not set |
||||
# CONFIG_MTD_RAM is not set |
||||
CONFIG_MTD_RDC3210=y |
||||
CONFIG_MTD_RDC3210_ALLOW_JFFS2=y |
||||
CONFIG_MTD_RDC3210_BUSWIDTH=2 |
||||
# CONFIG_MTD_RDC3210_FACTORY_PRESENT is not set |
||||
CONFIG_MTD_RDC3210_SIZE=0x400000 |
||||
# CONFIG_MTD_RDC3210_STATIC_MAP is not set |
||||
# CONFIG_MTD_REDBOOT_PARTS is not set |
||||
# CONFIG_MTD_ROM is not set |
||||
# CONFIG_MTD_SC520CDP is not set |
||||
# CONFIG_MTD_SLRAM is not set |
||||
# CONFIG_MTD_TS5500 is not set |
||||
# CONFIG_MTRR is not set |
||||
# CONFIG_MVIAC3_2 is not set |
||||
# CONFIG_MVIAC7 is not set |
||||
# CONFIG_MWINCHIP3D is not set |
||||
# CONFIG_MWINCHIPC6 is not set |
||||
# CONFIG_NATSEMI is not set |
||||
# CONFIG_NF_DEFRAG_IPV4 is not set |
||||
CONFIG_NOHIGHMEM=y |
||||
# CONFIG_NSC_GPIO is not set |
||||
CONFIG_NVRAM=y |
||||
# CONFIG_OLPC is not set |
||||
# CONFIG_OPTIMIZE_INLINING is not set |
||||
CONFIG_PAGEFLAGS_EXTENDED=y |
||||
CONFIG_PAGE_OFFSET=0xC0000000 |
||||
# CONFIG_PARAVIRT_GUEST is not set |
||||
# CONFIG_PC8736x_GPIO is not set |
||||
# CONFIG_PC87413_WDT is not set |
||||
CONFIG_PCI=y |
||||
# CONFIG_PCIEPORTBUS is not set |
||||
CONFIG_PCI_BIOS=y |
||||
CONFIG_PCI_DIRECT=y |
||||
CONFIG_PCI_DOMAINS=y |
||||
CONFIG_PCI_GOANY=y |
||||
# CONFIG_PCI_GOBIOS is not set |
||||
# CONFIG_PCI_GODIRECT is not set |
||||
# CONFIG_PCI_GOMMCONFIG is not set |
||||
# CONFIG_PCI_GOOLPC is not set |
||||
# CONFIG_PCSPKR_PLATFORM is not set |
||||
CONFIG_PHYLIB=y |
||||
CONFIG_PHYSICAL_ALIGN=0x100000 |
||||
CONFIG_PHYSICAL_START=0x100000 |
||||
# CONFIG_PHYS_ADDR_T_64BIT is not set |
||||
# CONFIG_PROCESSOR_SELECT is not set |
||||
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set |
||||
# CONFIG_R6040 is not set |
||||
CONFIG_RDC321X_WDT=y |
||||
# CONFIG_RD_BZIP2 is not set |
||||
CONFIG_RD_GZIP=y |
||||
# CONFIG_RD_LZMA is not set |
||||
# CONFIG_RELOCATABLE is not set |
||||
# CONFIG_RTC is not set |
||||
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set |
||||
CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
||||
# CONFIG_SBC7240_WDT is not set |
||||
# CONFIG_SBC8360_WDT is not set |
||||
# CONFIG_SBC_EPX_C3_WATCHDOG is not set |
||||
# CONFIG_SC1200_WDT is not set |
||||
# CONFIG_SC520_WDT is not set |
||||
# CONFIG_SCHED_HRTICK is not set |
||||
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
||||
# CONFIG_SCSI_DMA is not set |
||||
# CONFIG_SCx200 is not set |
||||
# CONFIG_SERIAL_8250_EXTENDED is not set |
||||
# CONFIG_SMP is not set |
||||
# CONFIG_SMSC37B787_WDT is not set |
||||
# CONFIG_SOFT_WATCHDOG is not set |
||||
CONFIG_SPARSEMEM_STATIC=y |
||||
CONFIG_SSB_POSSIBLE=y |
||||
# CONFIG_STRICT_DEVMEM is not set |
||||
# CONFIG_SYSPROF_TRACER is not set |
||||
CONFIG_SYSVIPC_SYSCTL=y |
||||
# CONFIG_TELCLOCK is not set |
||||
# CONFIG_TOSHIBA is not set |
||||
CONFIG_UID16=y |
||||
CONFIG_USB_SUPPORT=y |
||||
# CONFIG_VGASTATE is not set |
||||
# CONFIG_VIA_RHINE is not set |
||||
# CONFIG_VIRTIO_BALLOON is not set |
||||
# CONFIG_VIRTIO_PCI is not set |
||||
CONFIG_VIRTUALIZATION=y |
||||
# CONFIG_VM86 is not set |
||||
# CONFIG_VMSPLIT_2G_OPT is not set |
||||
# CONFIG_VMSPLIT_3G_OPT is not set |
||||
CONFIG_VM_EVENT_COUNTERS=y |
||||
# CONFIG_W83697UG_WDT is not set |
||||
# CONFIG_WAFER_WDT is not set |
||||
CONFIG_X86=y |
||||
CONFIG_X86_32=y |
||||
# CONFIG_X86_64 is not set |
||||
CONFIG_X86_ALIGNMENT_16=y |
||||
CONFIG_X86_BIOS_REBOOT=y |
||||
CONFIG_X86_BSWAP=y |
||||
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set |
||||
CONFIG_X86_CMPXCHG=y |
||||
CONFIG_X86_CPU=y |
||||
CONFIG_X86_CPUID=y |
||||
# CONFIG_X86_ELAN is not set |
||||
CONFIG_X86_F00F_BUG=y |
||||
# CONFIG_X86_GENERIC is not set |
||||
# CONFIG_X86_GENERICARCH is not set |
||||
CONFIG_X86_INVLPG=y |
||||
CONFIG_X86_L1_CACHE_SHIFT=4 |
||||
# CONFIG_X86_MCE is not set |
||||
CONFIG_X86_MINIMUM_CPU_FAMILY=4 |
||||
CONFIG_X86_MSR=y |
||||
# CONFIG_X86_PAE is not set |
||||
CONFIG_X86_PC=y |
||||
CONFIG_X86_POPAD_OK=y |
||||
CONFIG_X86_PPRO_FENCE=y |
||||
CONFIG_X86_RDC321X=y |
||||
CONFIG_X86_REBOOTFIXUPS=y |
||||
CONFIG_X86_RESERVE_LOW_64K=y |
||||
# CONFIG_X86_UP_APIC is not set |
||||
CONFIG_X86_VERBOSE_BOOTUP=y |
||||
# CONFIG_X86_VOYAGER is not set |
||||
# CONFIG_X86_VSMP is not set |
||||
CONFIG_X86_WP_WORKS_OK=y |
||||
CONFIG_X86_XADD=y |
||||
# CONFIG_ZONE_DMA32 is not set |
||||
@ -0,0 +1,25 @@ |
||||
#ifndef GT_IMGHDR_H |
||||
#define GT_IMGHDR_H |
||||
|
||||
#define GTIMG_MAGIC "GMTK" |
||||
|
||||
/* Product ID */ |
||||
#define PID_RTL_AIRGO 1 |
||||
#define PID_RTL_RALINK 2 |
||||
#define PID_RDC_AIRGO 3 |
||||
#define PID_RDC_RALINK 5 /* White Lable */ |
||||
|
||||
/* Gemtek */ |
||||
typedef struct |
||||
{ |
||||
u8 magic[4]; /* ASICII: GMTK */ |
||||
u32 checksum; /* CRC32 */ |
||||
u32 version; /* x.x.x.x */ |
||||
u32 kernelsz; /* The size of the kernel image */ |
||||
u32 imagesz; /* The length of this image file ( kernel + romfs + this header) */ |
||||
u32 pid; /* Product ID */ |
||||
u32 fastcksum; /* Partial CRC32 on (First(256), medium(256), last(512)) */ |
||||
u32 reserved; |
||||
}gt_imghdr_t; |
||||
|
||||
#endif |
||||
@ -0,0 +1,392 @@ |
||||
/*******************************************************************
|
||||
* Simple Flash mapping for RDC3210 * |
||||
* * |
||||
* 2005.03.23 * |
||||
* Dante Su (dante_su@gemtek.com.tw) * |
||||
* Copyright (C) 2005 Gemtek Corporation * |
||||
*******************************************************************/ |
||||
|
||||
#include <linux/module.h> |
||||
#include <linux/types.h> |
||||
#include <linux/kernel.h> |
||||
#include <asm/io.h> |
||||
#include <linux/mtd/mtd.h> |
||||
#include <linux/mtd/map.h> |
||||
#include <linux/mtd/partitions.h> |
||||
#include <linux/autoconf.h> |
||||
#include <linux/sched.h> |
||||
#include <linux/squashfs_fs.h> |
||||
|
||||
static struct mtd_info *rdc3210_mtd; |
||||
|
||||
struct map_info rdc3210_map =
|
||||
{ |
||||
.name = "RDC3210 Flash", |
||||
.size = CONFIG_MTD_RDC3210_SIZE, |
||||
.bankwidth = CONFIG_MTD_RDC3210_BUSWIDTH, |
||||
}; |
||||
|
||||
/* Dante: This is the default static mapping, however this is nothing but a hint. (Say dynamic mapping) */ |
||||
static struct mtd_partition rdc3210_parts[] =
|
||||
{ |
||||
#if CONFIG_MTD_RDC3210_SIZE == 0x400000 |
||||
{ name: "linux", offset: 0, size: 0x003C0000 }, /* 3840 KB = (Kernel + ROMFS) = (768 KB + 3072 KB) */ |
||||
{ name: "romfs", offset: 0x000C0000, size: 0x00300000 }, /* 3072 KB */ |
||||
{ name: "nvram", offset: 0x003C0000, size: 0x00010000 }, /* 64 KB */ |
||||
#ifdef CONFIG_MTD_RDC3210_FACTORY_PRESENT |
||||
{ name: "factory", offset: 0x003D0000, size: 0x00010000 }, /* 64 KB */ |
||||
#endif |
||||
{ name: "bootldr", offset: 0x003E0000, size: 0x00020000 }, /* 128 KB */ |
||||
#elif CONFIG_MTD_RDC3210_SIZE == 0x200000 |
||||
{ name: "linux", offset: 0x00008000, size: 0x001E8000 }, |
||||
{ name: "romfs", offset: 0x000C8000, size: 0x00128000 }, |
||||
{ name: "nvram", offset: 0x00000000, size: 0x00008000 }, /* 64 KB */ |
||||
#ifdef CONFIG_MTD_RDC3210_FACTORY_PRESENT |
||||
#error Unsupported configuration! |
||||
#endif |
||||
{ name: "bootldr", offset: 0x001F0000, size: 0x00010000 }, |
||||
|
||||
#elif CONFIG_MTD_RDC3210_SIZE == 0x800000 |
||||
{ name: "linux", offset: 0, size: 0x001F0000 }, /* 1984 KB */ |
||||
{ name: "config", offset: 0x001F0000, size: 0x00010000 }, /* 64 KB */ |
||||
{ name: "romfs", offset: 0x00200000, size: 0x005D0000 }, /* 5952 KB */ |
||||
#ifdef CONFIG_MTD_RDC3210_FACTORY_PRESENT |
||||
{ name: "factory", offset: 0x007D0000, size: 0x00010000 }, /* 64 KB */ |
||||
#endif |
||||
{ name: "bootldr", offset: 0x007E0000, size: 0x00010000 }, /* 64 KB */ |
||||
#else |
||||
#error Unsupported configuration! |
||||
#endif |
||||
}; |
||||
|
||||
static __u32 crctab[257] = { |
||||
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, |
||||
0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, |
||||
0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, |
||||
0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, |
||||
0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, |
||||
0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, |
||||
0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, |
||||
0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, |
||||
0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, |
||||
0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, |
||||
0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, |
||||
0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, |
||||
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, |
||||
0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f, |
||||
0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, |
||||
0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, |
||||
0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, |
||||
0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, |
||||
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, |
||||
0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, |
||||
0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, |
||||
0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, |
||||
0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, |
||||
0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, |
||||
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, |
||||
0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, |
||||
0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, |
||||
0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, |
||||
0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, |
||||
0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, |
||||
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, |
||||
0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, |
||||
0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, |
||||
0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, |
||||
0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, |
||||
0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, |
||||
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, |
||||
0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, |
||||
0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, |
||||
0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, |
||||
0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, |
||||
0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, |
||||
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, |
||||
0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79, |
||||
0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, |
||||
0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, |
||||
0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, |
||||
0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, |
||||
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, |
||||
0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, |
||||
0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, |
||||
0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, |
||||
0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, |
||||
0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, |
||||
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, |
||||
0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, |
||||
0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, |
||||
0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, |
||||
0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, |
||||
0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, |
||||
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, |
||||
0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, |
||||
0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, |
||||
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d, |
||||
0 |
||||
}; |
||||
|
||||
static __u32 crc32(__u8 * buf, __u32 len) |
||||
{ |
||||
register int i; |
||||
__u32 sum; |
||||
register __u32 s0; |
||||
s0 = ~0; |
||||
for (i = 0; i < len; i++) { |
||||
s0 = (s0 >> 8) ^ crctab[(__u8) (s0 & 0xFF) ^ buf[i]]; |
||||
} |
||||
sum = ~s0; |
||||
return sum; |
||||
} |
||||
|
||||
static void erase_callback(struct erase_info *done) |
||||
{ |
||||
wait_queue_head_t *wait_q = (wait_queue_head_t *)done->priv; |
||||
wake_up(wait_q); |
||||
} |
||||
|
||||
static int erase_write (struct mtd_info *mtd, unsigned long pos,
|
||||
int len, const char *buf) |
||||
{ |
||||
struct erase_info erase; |
||||
DECLARE_WAITQUEUE(wait, current); |
||||
wait_queue_head_t wait_q; |
||||
size_t retlen; |
||||
int ret; |
||||
|
||||
/*
|
||||
* First, let's erase the flash block. |
||||
*/ |
||||
|
||||
init_waitqueue_head(&wait_q); |
||||
erase.mtd = mtd; |
||||
erase.callback = erase_callback; |
||||
erase.addr = pos; |
||||
erase.len = len; |
||||
erase.priv = (u_long)&wait_q; |
||||
|
||||
set_current_state(TASK_INTERRUPTIBLE); |
||||
add_wait_queue(&wait_q, &wait); |
||||
|
||||
ret = mtd->erase(mtd, &erase); |
||||
if (ret) { |
||||
set_current_state(TASK_RUNNING); |
||||
remove_wait_queue(&wait_q, &wait); |
||||
printk (KERN_WARNING "erase of region [0x%lx, 0x%x] " |
||||
"on \"%s\" failed\n", |
||||
pos, len, mtd->name); |
||||
return ret; |
||||
} |
||||
|
||||
schedule(); /* Wait for erase to finish. */ |
||||
remove_wait_queue(&wait_q, &wait); |
||||
|
||||
/*
|
||||
* Next, writhe data to flash. |
||||
*/ |
||||
|
||||
ret = mtd->write (mtd, pos, len, &retlen, buf); |
||||
if (ret) |
||||
return ret; |
||||
if (retlen != len) |
||||
return -EIO; |
||||
return 0; |
||||
} |
||||
|
||||
static int __init init_rdc3210_map(void) |
||||
{ |
||||
rdc3210_map.phys = -rdc3210_map.size; |
||||
printk(KERN_NOTICE "flash device: %lx at %x\n", rdc3210_map.size, rdc3210_map.phys); |
||||
|
||||
#if CONFIG_MTD_RDC3210_SIZE == 0x800000 |
||||
simple_map_init(&rdc3210_map); |
||||
#endif |
||||
|
||||
rdc3210_map.map_priv_1 = (unsigned long)(rdc3210_map.virt = ioremap_nocache(rdc3210_map.phys, rdc3210_map.size)); |
||||
|
||||
if (!rdc3210_map.map_priv_1)
|
||||
{ |
||||
printk("Failed to ioremap\n"); |
||||
return -EIO; |
||||
} |
||||
rdc3210_mtd = do_map_probe("cfi_probe", &rdc3210_map); |
||||
#ifdef CONFIG_MTD_RDC3210_STATIC_MAP /* Dante: This is for fixed map */ |
||||
if (rdc3210_mtd)
|
||||
{ |
||||
rdc3210_mtd->owner = THIS_MODULE; |
||||
add_mtd_partitions(rdc3210_mtd, rdc3210_parts, sizeof(rdc3210_parts)/sizeof(rdc3210_parts[0])); |
||||
return 0; |
||||
} |
||||
#else /* Dante: This is for dynamic mapping */ |
||||
|
||||
#include "imghdr.h" |
||||
|
||||
typedef struct { |
||||
u8 magic[4]; |
||||
u32 kernelsz, ramdisksz; |
||||
u8 magic2[4]; |
||||
u32 sz2; |
||||
}sc_imghdr_t; |
||||
|
||||
if (rdc3210_mtd)
|
||||
{ // Dante
|
||||
sc_imghdr_t *hdr2= (sc_imghdr_t *)(rdc3210_map.map_priv_1); |
||||
gt_imghdr_t *hdr = (gt_imghdr_t *)hdr2 |
||||
#ifdef CONFIG_MTD_RDC3210_ALLOW_JFFS2 |
||||
, *ptmp |
||||
#endif |
||||
; |
||||
int len, tmp, tmp2, tmp3, tmp4, hdr_type = 0; |
||||
|
||||
if(!memcmp(hdr->magic, GTIMG_MAGIC, 4)) |
||||
{ |
||||
hdr_type = 1; |
||||
tmp = hdr->kernelsz + sizeof(gt_imghdr_t); |
||||
tmp2 = rdc3210_mtd->erasesize; |
||||
tmp3 = ((tmp / 32) + ((tmp % 32) ? 1 : 0)) * 32; |
||||
tmp4 = ((tmp / tmp2) + ((tmp % tmp2) ? 1 : 0)) * tmp2; |
||||
} |
||||
#ifndef CONFIG_MTD_RDC3210_ALLOW_JFFS2 |
||||
else if (!memcmp(hdr2->magic, "CSYS", 4)) |
||||
{ |
||||
hdr_type = 2; |
||||
tmp = hdr2->ramdisksz + hdr2->kernelsz + sizeof(sc_imghdr_t); |
||||
tmp2 = rdc3210_mtd->erasesize; |
||||
tmp3 = ((tmp / 32) + ((tmp % 32) ? 1 : 0)) * 32; |
||||
tmp4 = ((tmp / tmp2) + ((tmp % tmp2) ? 1 : 0)) * tmp2; |
||||
} |
||||
#endif |
||||
else |
||||
{ |
||||
iounmap((void *)rdc3210_map.map_priv_1); |
||||
rdc3210_map.map_priv_1 = 0L; |
||||
rdc3210_map.virt = NULL; |
||||
printk("Invalid MAGIC for Firmware Image!!!\n"); |
||||
return -EIO; |
||||
} |
||||
#ifdef CONFIG_MTD_RDC3210_ALLOW_JFFS2 |
||||
tmp = (tmp3 == tmp4) ? tmp4 + tmp2 : tmp4; |
||||
if ((ptmp = (gt_imghdr_t *)vmalloc(tmp)) == NULL) |
||||
{ |
||||
iounmap((void *)rdc3210_map.map_priv_1); |
||||
rdc3210_map.map_priv_1 = 0L; |
||||
rdc3210_map.virt = NULL; |
||||
printk("Can't allocate 0x%08x for flash-reading buffer!\n", tmp); |
||||
return -ENOMEM; |
||||
} |
||||
if (rdc3210_mtd->read(rdc3210_mtd, 0, tmp, &len, (__u8 *)ptmp) || len != tmp) |
||||
{ |
||||
vfree(ptmp); |
||||
iounmap((void *)rdc3210_map.map_priv_1); |
||||
rdc3210_map.map_priv_1 = 0L; |
||||
rdc3210_map.virt = NULL; |
||||
printk("Can't read that much flash! Read 0x%08x of it.\n", len); |
||||
return -EIO; |
||||
} |
||||
#endif |
||||
#ifdef CONFIG_MTD_RDC3210_FACTORY_PRESENT |
||||
/* 1. Adjust Redboot */ |
||||
tmp = rdc3210_mtd->size - rdc3210_parts[4].size; |
||||
rdc3210_parts[4].offset = tmp - (tmp % tmp2); |
||||
rdc3210_parts[4].size = rdc3210_mtd->size - rdc3210_parts[4].offset; |
||||
|
||||
/* 2. Adjust Factory Default */ |
||||
tmp -= rdc3210_parts[3].size; |
||||
rdc3210_parts[3].offset = tmp - (tmp % tmp2); |
||||
rdc3210_parts[3].size = rdc3210_parts[4].offset - rdc3210_parts[3].offset; |
||||
#else |
||||
/* 1. Adjust Redboot */ |
||||
tmp = rdc3210_mtd->size - rdc3210_parts[3].size; |
||||
rdc3210_parts[3].offset = tmp - (tmp % tmp2); |
||||
rdc3210_parts[3].size = rdc3210_mtd->size - rdc3210_parts[3].offset; |
||||
#endif |
||||
if (hdr_type == 1) { |
||||
/* 3. Adjust NVRAM */ |
||||
#ifdef CONFIG_MTD_RDC3210_ALLOW_JFFS2 |
||||
if (*(__u32 *)(((unsigned char *)ptmp)+tmp3) == SQUASHFS_MAGIC) |
||||
{ |
||||
len = 1; |
||||
tmp4 = tmp3; |
||||
tmp = hdr->imagesz; |
||||
rdc3210_parts[2].name = "rootfs_data"; |
||||
rdc3210_parts[2].offset = rdc3210_parts[0].offset + (((tmp / tmp2) + ((tmp % tmp2) ? 1 : 0)) * tmp2); |
||||
} |
||||
else |
||||
#else |
||||
tmp4 = tmp3; |
||||
#endif |
||||
{ |
||||
len = 0; |
||||
tmp -= rdc3210_parts[2].size; |
||||
rdc3210_parts[2].offset = tmp - (tmp % tmp2); |
||||
} |
||||
rdc3210_parts[2].size = rdc3210_parts[3].offset - rdc3210_parts[2].offset; |
||||
} |
||||
else if (hdr_type == 2) |
||||
{ |
||||
len = 0; |
||||
tmp4 = tmp3; |
||||
} |
||||
|
||||
/* 4. Adjust Linux (Kernel + ROMFS) */ |
||||
rdc3210_parts[0].size = rdc3210_parts[len + hdr_type + 1].offset - rdc3210_parts[0].offset; |
||||
|
||||
/* 5. Adjust ROMFS */ |
||||
rdc3210_parts[1].offset = rdc3210_parts[0].offset + tmp4; |
||||
rdc3210_parts[1].size = rdc3210_parts[hdr_type + 1].offset - rdc3210_parts[1].offset; |
||||
#ifdef CONFIG_MTD_RDC3210_ALLOW_JFFS2 |
||||
if (!(hdr->reserved || len)) |
||||
{ |
||||
__u8 buf[1024]; |
||||
ptmp->reserved = hdr->imagesz; |
||||
ptmp->imagesz = tmp4; |
||||
ptmp->checksum = ptmp->fastcksum = 0; |
||||
memcpy(buf, ptmp, 0x100); |
||||
memcpy(buf + 0x100, ((__u8 *)ptmp) + ((tmp4 >> 1) - ((tmp4 & 0x6) >> 1)), 0x100); |
||||
memcpy(buf + 0x200, ((__u8 *)ptmp) + (tmp4 - 0x200), 0x200); |
||||
ptmp->fastcksum = crc32(buf, sizeof(buf)); |
||||
ptmp->checksum = crc32((__u8 *)ptmp, tmp4); |
||||
if (rdc3210_mtd->unlock) rdc3210_mtd->unlock(rdc3210_mtd, 0, tmp2); |
||||
if ((len = erase_write(rdc3210_mtd, 0, tmp2, (char *)ptmp))) |
||||
{ |
||||
vfree(ptmp); |
||||
iounmap((void *)rdc3210_map.map_priv_1); |
||||
rdc3210_map.map_priv_1 = 0L; |
||||
rdc3210_map.virt = NULL; |
||||
printk("Couldn't erase! Got %d.\n", len); |
||||
return len; |
||||
} |
||||
if (rdc3210_mtd->sync) rdc3210_mtd->sync(rdc3210_mtd); |
||||
} |
||||
vfree(ptmp); |
||||
#endif |
||||
rdc3210_mtd->owner = THIS_MODULE; |
||||
add_mtd_partitions(rdc3210_mtd, rdc3210_parts, sizeof(rdc3210_parts)/sizeof(rdc3210_parts[0])); |
||||
return 0; |
||||
} |
||||
#endif |
||||
iounmap((void *)rdc3210_map.map_priv_1); |
||||
rdc3210_map.map_priv_1 = 0L; |
||||
rdc3210_map.virt = NULL; |
||||
return -ENXIO; |
||||
} |
||||
|
||||
static void __exit cleanup_rdc3210_map(void) |
||||
{ |
||||
if (rdc3210_mtd)
|
||||
{ |
||||
del_mtd_partitions(rdc3210_mtd); |
||||
map_destroy(rdc3210_mtd); |
||||
} |
||||
|
||||
if (rdc3210_map.map_priv_1)
|
||||
{ |
||||
iounmap((void *)rdc3210_map.map_priv_1); |
||||
rdc3210_map.map_priv_1 = 0L; |
||||
rdc3210_map.virt = NULL; |
||||
} |
||||
} |
||||
|
||||
module_init(init_rdc3210_map); |
||||
module_exit(cleanup_rdc3210_map); |
||||
@ -0,0 +1,63 @@ |
||||
--- a/drivers/mtd/maps/Kconfig
|
||||
+++ b/drivers/mtd/maps/Kconfig
|
||||
@@ -110,6 +110,50 @@
|
||||
Sun Microsystems boardsets. This driver will require CFI support
|
||||
in the kernel, so if you did not enable CFI previously, do that now.
|
||||
|
||||
+config MTD_RDC3210
|
||||
+ tristate "CFI Flash device mapped on RDC3210"
|
||||
+ depends on X86 && MTD_CFI && MTD_PARTITIONS
|
||||
+ help
|
||||
+ RDC-3210 is the flash device we find on Ralink reference board.
|
||||
+
|
||||
+config MTD_RDC3210_STATIC_MAP
|
||||
+ bool "Partitions on RDC3210 mapped statically" if MTD_RDC3210
|
||||
+ select MTD_RDC3210_FACTORY_PRESENT
|
||||
+ help
|
||||
+ The mapping driver will use the static partition map for the
|
||||
+ RDC-3210 flash device.
|
||||
+
|
||||
+config MTD_RDC3210_FACTORY_PRESENT
|
||||
+ bool "Reserve a partition on RDC3210 for factory presets"
|
||||
+ depends on MTD_RDC3210
|
||||
+ default y
|
||||
+ help
|
||||
+ The mapping driver will reserve a partition on the RDC-3210 flash
|
||||
+ device for resetting flash contents to factory defaults.
|
||||
+
|
||||
+config MTD_RDC3210_ALLOW_JFFS2
|
||||
+ bool "JFFS2 filesystem usable in a partition on RDC3210"
|
||||
+ depends on MTD_RDC3210 && !MTD_RDC3210_STATIC_MAP
|
||||
+ help
|
||||
+ The mapping driver will align a partition on the RDC-3210 flash
|
||||
+ device to an erase-block boundary so that a JFFS2 filesystem may
|
||||
+ reside on it.
|
||||
+
|
||||
+config MTD_RDC3210_SIZE
|
||||
+ hex "Amount of flash memory on RDC3210"
|
||||
+ depends on MTD_RDC3210
|
||||
+ default "0x400000"
|
||||
+ help
|
||||
+ Total size in bytes of the RDC-3210 flash device
|
||||
+
|
||||
+config MTD_RDC3210_BUSWIDTH
|
||||
+ int "Width of CFI Flash device mapped on RDC3210"
|
||||
+ depends on MTD_RDC3210
|
||||
+ default "2"
|
||||
+ help
|
||||
+ Number of bytes addressed on the RDC-3210 flash device before
|
||||
+ addressing the same chip again
|
||||
+
|
||||
config MTD_SC520CDP
|
||||
tristate "CFI Flash device mapped on AMD SC520 CDP"
|
||||
depends on X86 && MTD_CFI && MTD_CONCAT
|
||||
--- a/drivers/mtd/maps/Makefile
|
||||
+++ b/drivers/mtd/maps/Makefile
|
||||
@@ -29,6 +29,7 @@
|
||||
obj-$(CONFIG_MTD_PMC_MSP_EVM) += pmcmsp-flash.o
|
||||
obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcmsp-ramroot.o
|
||||
obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o
|
||||
+obj-$(CONFIG_MTD_RDC3210) += rdc3210.o
|
||||
obj-$(CONFIG_MTD_RPXLITE) += rpxlite.o
|
||||
obj-$(CONFIG_MTD_TQM8XXL) += tqm8xxl.o
|
||||
obj-$(CONFIG_MTD_SA1100) += sa1100-flash.o
|
||||
@ -0,0 +1,11 @@ |
||||
--- a/init/do_mounts.c
|
||||
+++ b/init/do_mounts.c
|
||||
@@ -163,6 +163,8 @@
|
||||
{
|
||||
char *s = page;
|
||||
|
||||
+ if (!root_fs_names)
|
||||
+ root_fs_names = "squashfs,jffs2";
|
||||
if (root_fs_names) {
|
||||
strcpy(page, root_fs_names);
|
||||
while (*s++) {
|
||||
@ -0,0 +1,20 @@ |
||||
--- linux-2.6.24.7.orig/drivers/pcmcia/yenta_socket.c 2008-10-26 08:30:07.000000000 -0700
|
||||
+++ linux-2.6.24.7/drivers/pcmcia/yenta_socket.c 2008-10-26 08:54:27.000000000 -0700
|
||||
@@ -1171,6 +1171,17 @@
|
||||
|
||||
/* We must finish initialization here */
|
||||
|
||||
+#ifdef CONFIG_X86_RDC
|
||||
+/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044f044 */
|
||||
+#define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0844b060
|
||||
+/* #define YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK 0x0044d044 */
|
||||
+
|
||||
+ config_writel(socket, 32*4, YO_TI1510_DATASHEET_GUY_EXPLAIN_THIS_JUNK);
|
||||
+ config_writel(socket, 35*4, 0x00000022);
|
||||
+ config_writel(socket, 36*4, 0x60200000);
|
||||
+ config_writel(socket, 40*4, 0x7e020000);
|
||||
+#endif
|
||||
+
|
||||
if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, IRQF_SHARED, "yenta", socket)) {
|
||||
/* No IRQ or request_irq failed. Poll */
|
||||
socket->cb_irq = 0; /* But zero is a valid IRQ number. */
|
||||
@ -0,0 +1,42 @@ |
||||
diff -ru linux-2.6.24.7.orig/arch/x86/boot/boot.h linux-2.6.24.7/arch/x86/boot/boot.h
|
||||
--- linux-2.6.24.7.orig/arch/x86/boot/boot.h 2008-10-26 20:18:14.000000000 -0700
|
||||
+++ linux-2.6.24.7/arch/x86/boot/boot.h 2008-10-26 20:18:36.000000000 -0700
|
||||
@@ -60,7 +60,7 @@
|
||||
{
|
||||
asm volatile("outl %0,%1" : : "a" (v), "dN" (port));
|
||||
}
|
||||
-static inline u32 inl(u32 port)
|
||||
+static inline u32 inl(u16 port)
|
||||
{
|
||||
u32 v;
|
||||
asm volatile("inl %1,%0" : "=a" (v) : "dN" (port));
|
||||
diff -ru linux-2.6.24.7.orig/arch/x86/boot/pm.c linux-2.6.24.7/arch/x86/boot/pm.c
|
||||
--- linux-2.6.24.7.orig/arch/x86/boot/pm.c 2008-10-26 19:55:50.000000000 -0700
|
||||
+++ linux-2.6.24.7/arch/x86/boot/pm.c 2008-10-26 21:38:12.000000000 -0700
|
||||
@@ -16,6 +16,9 @@
|
||||
|
||||
#include "boot.h"
|
||||
#include <asm/segment.h>
|
||||
+#ifdef CONFIG_X86_RDC
|
||||
+#include <asm/mach-rdc/rdc321x_defs.h>
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* Invoke the realmode switch hook if present; otherwise
|
||||
@@ -160,6 +163,16 @@
|
||||
die();
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_X86_RDC
|
||||
+ {
|
||||
+ u32 bootctl;
|
||||
+
|
||||
+ outl(0x80003840, RDC3210_CFGREG_ADDR);
|
||||
+ bootctl = inl(RDC3210_CFGREG_DATA) | 0x07ff0000;
|
||||
+ outl(bootctl, RDC3210_CFGREG_DATA);
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
/* Reset coprocessor (IGNNE#) */
|
||||
reset_coprocessor();
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,195 @@ |
||||
--- linux-2.6.28.9/drivers/net/r6040.c 2009-03-23 22:55:52.000000000 +0100
|
||||
+++ linux-2.6.28.9.new/drivers/net/r6040.c 2009-04-24 14:24:51.000000000 +0200
|
||||
@@ -49,12 +49,12 @@
|
||||
#include <asm/processor.h>
|
||||
|
||||
#define DRV_NAME "r6040"
|
||||
-#define DRV_VERSION "0.19"
|
||||
-#define DRV_RELDATE "18Dec2008"
|
||||
+#define DRV_VERSION "0.22"
|
||||
+#define DRV_RELDATE "25Mar2009"
|
||||
|
||||
/* PHY CHIP Address */
|
||||
#define PHY1_ADDR 1 /* For MAC1 */
|
||||
-#define PHY2_ADDR 2 /* For MAC2 */
|
||||
+#define PHY2_ADDR 3 /* For MAC2 */
|
||||
#define PHY_MODE 0x3100 /* PHY CHIP Register 0 */
|
||||
#define PHY_CAP 0x01E1 /* PHY CHIP Register 4 */
|
||||
|
||||
@@ -160,6 +160,7 @@
|
||||
"Florian Fainelli <florian@openwrt.org>");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("RDC R6040 NAPI PCI FastEthernet driver");
|
||||
+MODULE_VERSION(DRV_VERSION " " DRV_RELDATE);
|
||||
|
||||
/* RX and TX interrupts that we handle */
|
||||
#define RX_INTS (RX_FIFO_FULL | RX_NO_DESC | RX_FINISH)
|
||||
@@ -200,7 +201,7 @@
|
||||
|
||||
static char version[] __devinitdata = KERN_INFO DRV_NAME
|
||||
": RDC R6040 NAPI net driver,"
|
||||
- "version "DRV_VERSION " (" DRV_RELDATE ")\n";
|
||||
+ "version "DRV_VERSION " (" DRV_RELDATE ")";
|
||||
|
||||
static int phy_table[] = { PHY1_ADDR, PHY2_ADDR };
|
||||
|
||||
@@ -330,7 +331,7 @@
|
||||
do {
|
||||
skb = netdev_alloc_skb(dev, MAX_BUF_SIZE);
|
||||
if (!skb) {
|
||||
- printk(KERN_ERR "%s: failed to alloc skb for rx\n", dev->name);
|
||||
+ printk(KERN_ERR DRV_NAME "%s: failed to alloc skb for rx\n", dev->name);
|
||||
rc = -ENOMEM;
|
||||
goto err_exit;
|
||||
}
|
||||
@@ -438,7 +439,6 @@
|
||||
{
|
||||
struct r6040_private *lp = netdev_priv(dev);
|
||||
void __iomem *ioaddr = lp->base;
|
||||
- struct pci_dev *pdev = lp->pdev;
|
||||
int limit = 2048;
|
||||
u16 *adrp;
|
||||
u16 cmd;
|
||||
@@ -457,22 +457,12 @@
|
||||
iowrite16(adrp[0], ioaddr + MID_0L);
|
||||
iowrite16(adrp[1], ioaddr + MID_0M);
|
||||
iowrite16(adrp[2], ioaddr + MID_0H);
|
||||
- free_irq(dev->irq, dev);
|
||||
-
|
||||
- /* Free RX buffer */
|
||||
- r6040_free_rxbufs(dev);
|
||||
-
|
||||
- /* Free TX buffer */
|
||||
- r6040_free_txbufs(dev);
|
||||
-
|
||||
- /* Free Descriptor memory */
|
||||
- pci_free_consistent(pdev, RX_DESC_SIZE, lp->rx_ring, lp->rx_ring_dma);
|
||||
- pci_free_consistent(pdev, TX_DESC_SIZE, lp->tx_ring, lp->tx_ring_dma);
|
||||
}
|
||||
|
||||
static int r6040_close(struct net_device *dev)
|
||||
{
|
||||
struct r6040_private *lp = netdev_priv(dev);
|
||||
+ struct pci_dev *pdev = lp->pdev;
|
||||
|
||||
/* deleted timer */
|
||||
del_timer_sync(&lp->timer);
|
||||
@@ -481,8 +471,28 @@
|
||||
napi_disable(&lp->napi);
|
||||
netif_stop_queue(dev);
|
||||
r6040_down(dev);
|
||||
+
|
||||
+ free_irq(dev->irq, dev);
|
||||
+
|
||||
+ /* Free RX buffer */
|
||||
+ r6040_free_rxbufs(dev);
|
||||
+
|
||||
+ /* Free TX buffer */
|
||||
+ r6040_free_txbufs(dev);
|
||||
+
|
||||
spin_unlock_irq(&lp->lock);
|
||||
|
||||
+ /* Free Descriptor memory */
|
||||
+ if (lp->rx_ring) {
|
||||
+ pci_free_consistent(pdev, RX_DESC_SIZE, lp->rx_ring, lp->rx_ring_dma);
|
||||
+ lp->rx_ring = NULL;
|
||||
+ }
|
||||
+
|
||||
+ if (lp->tx_ring) {
|
||||
+ pci_free_consistent(pdev, TX_DESC_SIZE, lp->tx_ring, lp->tx_ring_dma);
|
||||
+ lp->tx_ring = NULL;
|
||||
+ }
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -598,7 +608,6 @@
|
||||
|
||||
/* Send to upper layer */
|
||||
netif_receive_skb(skb_ptr);
|
||||
- dev->last_rx = jiffies;
|
||||
dev->stats.rx_packets++;
|
||||
dev->stats.rx_bytes += descptr->len - 4;
|
||||
|
||||
@@ -668,7 +677,7 @@
|
||||
work_done = r6040_rx(dev, budget);
|
||||
|
||||
if (work_done < budget) {
|
||||
- netif_rx_complete(dev, napi);
|
||||
+ napi_complete(napi);
|
||||
/* Enable RX interrupt */
|
||||
iowrite16(ioread16(ioaddr + MIER) | RX_INTS, ioaddr + MIER);
|
||||
}
|
||||
@@ -705,7 +714,7 @@
|
||||
|
||||
/* Mask off RX interrupt */
|
||||
misr &= ~RX_INTS;
|
||||
- netif_rx_schedule(dev, &lp->napi);
|
||||
+ napi_schedule(&lp->napi);
|
||||
}
|
||||
|
||||
/* TX interrupt request */
|
||||
@@ -1063,20 +1088,20 @@
|
||||
/* this should always be supported */
|
||||
err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
|
||||
if (err) {
|
||||
- printk(KERN_ERR DRV_NAME "32-bit PCI DMA addresses"
|
||||
+ printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses"
|
||||
"not supported by the card\n");
|
||||
goto err_out;
|
||||
}
|
||||
err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
|
||||
if (err) {
|
||||
- printk(KERN_ERR DRV_NAME "32-bit PCI DMA addresses"
|
||||
+ printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses"
|
||||
"not supported by the card\n");
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
/* IO Size check */
|
||||
if (pci_resource_len(pdev, 0) < io_size) {
|
||||
- printk(KERN_ERR DRV_NAME "Insufficient PCI resources, aborting\n");
|
||||
+ printk(KERN_ERR DRV_NAME ": Insufficient PCI resources, aborting\n");
|
||||
err = -EIO;
|
||||
goto err_out;
|
||||
}
|
||||
@@ -1086,7 +1111,7 @@
|
||||
|
||||
dev = alloc_etherdev(sizeof(struct r6040_private));
|
||||
if (!dev) {
|
||||
- printk(KERN_ERR DRV_NAME "Failed to allocate etherdev\n");
|
||||
+ printk(KERN_ERR DRV_NAME ": Failed to allocate etherdev\n");
|
||||
err = -ENOMEM;
|
||||
goto err_out;
|
||||
}
|
||||
@@ -1102,11 +1127,15 @@
|
||||
|
||||
ioaddr = pci_iomap(pdev, bar, io_size);
|
||||
if (!ioaddr) {
|
||||
- printk(KERN_ERR "ioremap failed for device %s\n",
|
||||
+ printk(KERN_ERR DRV_NAME ": ioremap failed for device %s\n",
|
||||
pci_name(pdev));
|
||||
err = -EIO;
|
||||
goto err_out_free_res;
|
||||
}
|
||||
+ /* If PHY status change register is still set to zero it means the
|
||||
+ * bootloader didn't initialize it */
|
||||
+ if (ioread16(ioaddr + PHY_CC) == 0)
|
||||
+ iowrite16(0x9f07, ioaddr + PHY_CC);
|
||||
|
||||
/* Init system & device */
|
||||
lp->base = ioaddr;
|
||||
@@ -1123,6 +1152,13 @@
|
||||
adrp[1] = ioread16(ioaddr + MID_0M);
|
||||
adrp[2] = ioread16(ioaddr + MID_0H);
|
||||
|
||||
+ /* Some bootloader/BIOSes do not initialize
|
||||
+ * MAC address, warn about that */
|
||||
+ if (!(adrp[0] || adrp[1] || adrp[2])) {
|
||||
+ printk(KERN_WARNING DRV_NAME ": MAC address not initialized, generating random\n");
|
||||
+ random_ether_addr(dev->dev_addr);
|
||||
+ }
|
||||
+
|
||||
/* Link new device into r6040_root_dev */
|
||||
lp->pdev = pdev;
|
||||
lp->dev = dev;
|
||||
Loading…
Reference in new issue