diff options
| -rw-r--r-- | target/linux/rdc/Makefile | 5 | ||||
| -rw-r--r-- | target/linux/rdc/amit/config-2.6.30 | 3 | ||||
| -rw-r--r-- | target/linux/rdc/amit/target.mk | 2 | ||||
| -rw-r--r-- | target/linux/rdc/ar525w/config-2.6.30 | 0 | ||||
| -rw-r--r-- | target/linux/rdc/ar525w/target.mk | 2 | ||||
| -rw-r--r-- | target/linux/rdc/bifferboard/target.mk | 1 | ||||
| -rw-r--r-- | target/linux/rdc/dir-450/config-2.6.30 | 3 | ||||
| -rw-r--r-- | target/linux/rdc/dir-450/target.mk | 2 | ||||
| -rw-r--r-- | target/linux/rdc/files/drivers/mtd/maps/bifferboard-flash.c | 243 | ||||
| -rw-r--r-- | target/linux/rdc/files/drivers/mtd/maps/imghdr.h | 25 | ||||
| -rw-r--r-- | target/linux/rdc/files/drivers/mtd/maps/r8610.c | 97 | ||||
| -rw-r--r-- | target/linux/rdc/files/drivers/mtd/maps/rdc3210.c | 392 | ||||
| -rw-r--r-- | target/linux/rdc/image/Makefile | 16 | ||||
| -rw-r--r-- | target/linux/rdc/profiles/ar525w.mk | 12 | ||||
| -rw-r--r-- | target/linux/rdc/profiles/bifferboard.mk | 11 | ||||
| -rw-r--r-- | target/linux/rdc/profiles/r8610.mk | 15 | ||||
| -rw-r--r-- | target/linux/rdc/profiles/sitecom.mk | 12 | ||||
| -rw-r--r-- | target/linux/rdc/r8610/target.mk | 5 | ||||
| -rw-r--r-- | target/linux/rdc/sitecom/target.mk | 2 |
19 files changed, 53 insertions, 795 deletions
diff --git a/target/linux/rdc/Makefile b/target/linux/rdc/Makefile index 2144ec7..273b65b 100644 --- a/target/linux/rdc/Makefile +++ b/target/linux/rdc/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,8 +10,7 @@ ARCH:=i386 BOARD:=rdc BOARDNAME:=RDC 321x FEATURES:=squashfs jffs2 pci usb pcmcia -CFLAGS:=-Os -pipe -march=i486 -funit-at-a-time -SUBTARGETS:=ar525w r8610 sitecom bifferboard +CFLAGS:=-Os -pipe -march=i486 -mtune=i486 -funit-at-a-time LINUX_VERSION:=2.6.30.10 diff --git a/target/linux/rdc/amit/config-2.6.30 b/target/linux/rdc/amit/config-2.6.30 deleted file mode 100644 index edda242..0000000 --- a/target/linux/rdc/amit/config-2.6.30 +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_MTD_PHYSMAP=y -# CONFIG_MTD_R8610 is not set -# CONFIG_MTD_RDC3210 is not set diff --git a/target/linux/rdc/amit/target.mk b/target/linux/rdc/amit/target.mk deleted file mode 100644 index 36fb97e..0000000 --- a/target/linux/rdc/amit/target.mk +++ /dev/null @@ -1,2 +0,0 @@ -BOARDNAME:=Devices from AMIT -DEFAULT_PACKAGE+= kmod-usb-core kmod-usb-ohci kmod-usb2 diff --git a/target/linux/rdc/ar525w/config-2.6.30 b/target/linux/rdc/ar525w/config-2.6.30 deleted file mode 100644 index e69de29..0000000 --- a/target/linux/rdc/ar525w/config-2.6.30 +++ /dev/null diff --git a/target/linux/rdc/ar525w/target.mk b/target/linux/rdc/ar525w/target.mk deleted file mode 100644 index b3a61ef..0000000 --- a/target/linux/rdc/ar525w/target.mk +++ /dev/null @@ -1,2 +0,0 @@ -BOARDNAME:=Airlink AR525W -DEFAULT_PACKAGES += kmod-rt61-pci diff --git a/target/linux/rdc/bifferboard/target.mk b/target/linux/rdc/bifferboard/target.mk deleted file mode 100644 index 24dd13f..0000000 --- a/target/linux/rdc/bifferboard/target.mk +++ /dev/null @@ -1 +0,0 @@ -BOARDNAME:=Bifferboard diff --git a/target/linux/rdc/dir-450/config-2.6.30 b/target/linux/rdc/dir-450/config-2.6.30 deleted file mode 100644 index edda242..0000000 --- a/target/linux/rdc/dir-450/config-2.6.30 +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_MTD_PHYSMAP=y -# CONFIG_MTD_R8610 is not set -# CONFIG_MTD_RDC3210 is not set diff --git a/target/linux/rdc/dir-450/target.mk b/target/linux/rdc/dir-450/target.mk deleted file mode 100644 index 2b1bffb0..0000000 --- a/target/linux/rdc/dir-450/target.mk +++ /dev/null @@ -1,2 +0,0 @@ -BOARDNAME:=D-Link DIR-450 -DEFAULT_PACKAGES+= kmod-madwifi kmod-pcmcia-core kmod-nozomi diff --git a/target/linux/rdc/files/drivers/mtd/maps/bifferboard-flash.c b/target/linux/rdc/files/drivers/mtd/maps/bifferboard-flash.c deleted file mode 100644 index e732334..0000000 --- a/target/linux/rdc/files/drivers/mtd/maps/bifferboard-flash.c +++ /dev/null @@ -1,243 +0,0 @@ -/* Flash mapping for Bifferboard, (c) bifferos@yahoo.co.uk - * Works with 1, 4 and 8MB flash versions - */ - -#include <linux/delay.h> -#include <linux/mtd/mtd.h> -#include <linux/mtd/map.h> -#include <linux/mtd/partitions.h> - -#define DRV "bifferboard-flash: " - -static struct mtd_info *bb_mtd = NULL; - -#define SIZE_BIFFBOOT 0x10000 -#define SIZE_SECTOR 0x10000 -#define SIZE_CONFIG 0x02000 -#define SIZE_1MB 0x00100000 -#define SIZE_4MB 0x00400000 -#define SIZE_8MB 0x00800000 - -#define BASE_1MB 0xfff00000 -#define BASE_4MB 0xffc00000 -#define BASE_8MB 0xff800000 - -#define OFFS_KERNEL 0x6000 -#define OFFS_CONFIG 0x4000 - -/* - * Flash detection code. This is needed because the cfi_probe doesn't probe - * for the size correctly. You actually have to know the flash size before you - * call it, or so it seems. It does work correctly if you map the entire flash - * chip, but unsure of the implications for mapping more mem than exists. - */ - -static unsigned char ReadFlash(void* base, u32 addr) -{ - unsigned char val = *(volatile unsigned char *)(base+addr); - udelay(1); - return val; -} - -static void WriteFlash(void* base, u32 addr, unsigned short data) -{ - *(volatile unsigned short *)(base+addr) = data; -} - -static DEFINE_SPINLOCK(flash_lock); - -static u32 bb_detect(void) -{ - u32 ret = 0; - ulong flags; - - /* for detection, map in just the 1MB device, 1st 64k is enough */ - void* base = ioremap_nocache(BASE_1MB, 0x10000); - - if (!base) - { - pr_err(DRV "Failed to map flash for probing\n"); - return 0; - } - - spin_lock_irqsave(&flash_lock, flags); - - /* put flash in auto-detect mode */ - WriteFlash(base, 0xaaaa, 0xaaaa); - WriteFlash(base, 0x5554, 0x5555); - WriteFlash(base, 0xaaaa, 0x9090); - - /* Read the auto-config data - 4 values in total */ - ret = ReadFlash(base, 0x0000); ret <<= 8; - ret |= ReadFlash(base, 0x0200); ret <<= 8; - ret |= ReadFlash(base, 0x0003); ret <<= 8; - ret |= ReadFlash(base, 0x0002); - - /* exit the autodetect state */ - WriteFlash(base, 0x0000, 0xf0f0); - - spin_unlock_irqrestore(&flash_lock, flags); - - /* unmap it, it'll be re-mapped based on the detection */ - iounmap(base); - - return ret; -} - - -static struct map_info bb_map; - -/* Update the map, using the detected flash signature. */ -static int bb_adjust_map(unsigned long sig, struct map_info* m) -{ - m->bankwidth = 2; - switch (sig) - { - case 0x7f1c225b : - m->name = "ENLV800B"; - m->phys = BASE_1MB; - m->size = SIZE_1MB; - break; - case 0x7f1c22f9 : - m->name = "ENLV320B"; - m->phys = BASE_4MB; - m->size = SIZE_4MB; - break; - case 0x7f1c22cb : - m->name = "ENLV640B"; - m->phys = BASE_8MB; - m->size = SIZE_8MB; - break; - default: - return -ENXIO; - } - return 0; -} - - -/* adjust partition sizes, prior to adding the partition - * Values not specified by defines here are subject to replacement based on - * the real flash size. (0x00000000 being the exception, of course) */ - -static struct mtd_partition bb_parts[] = -{ -/* 0 */ { name: "kernel", offset: 0x00000000, size: 0x000fa000 }, -/* 1 */ { name: "rootfs", offset: MTDPART_OFS_APPEND, size: 0x002F0000 }, -/* 2 */ { name: "biffboot", offset: MTDPART_OFS_APPEND, size: MTDPART_SIZ_FULL, mask_flags: MTD_WRITEABLE }, -}; - - -/* returns the count of partitions to be used */ -static ulong bb_adjust_partitions(struct map_info* m) -{ - /* Read the kernel offset value, 1036 bytes into the config block. */ - u16 km_units = *((u16*)(m->virt + OFFS_CONFIG + 1036)); - u32 kernelmax = 0x200000; /* Biffboot 2.7 or earlier default */ - - /* special-case 1MB devices, because there are fewer partitions */ - if (m->size == SIZE_1MB) - { - bb_parts[0].size = SIZE_1MB - SIZE_BIFFBOOT; /* kernel */ - bb_parts[1].name = "biffboot"; /* biffboot */ - bb_parts[1].offset = MTDPART_OFS_APPEND; /* biffboot */ - bb_parts[1].size = MTDPART_SIZ_FULL; /* biffboot */ - bb_parts[1].mask_flags = MTD_WRITEABLE; - return 2; /* because there's no rootfs now */ - } - - /* sanity check */ - if (km_units > ((m->size-SIZE_BIFFBOOT)/SIZE_SECTOR)) - { - pr_err(DRV "config block has invalid kernelmax\n"); - return 0; - } - - kernelmax = km_units * SIZE_SECTOR; - - /* Kernel */ - bb_parts[0].size = kernelmax; - - /* rootfs */ - bb_parts[1].size = m->size - kernelmax - SIZE_BIFFBOOT; - - return 3; /* 3 partitions */ -} - - -static int __init init_bb_map(void) -{ - int ret; - ulong signature = bb_detect(); - ulong part_len; - - if (!signature) - { - pr_err(DRV "Undetected flash chip"); - return -ENXIO; - } - - ret = bb_adjust_map(signature, &bb_map); - - if (ret) - { - pr_err(DRV "Unrecognised flash chip (signature: 0x%lx)\n", signature); - return ret; - } - - bb_map.virt = ioremap_nocache(bb_map.phys, bb_map.size); - if (!bb_map.virt) - { - pr_err(DRV "ioremap\n"); - return -EIO; - } - - bb_mtd = do_map_probe("cfi_probe", &bb_map); - if (!bb_mtd) - { - /* cfi_probe fails here for 1MB devices */ - pr_err(DRV "cfi_probe\n"); - ret = -ENXIO; - goto err; - } - - part_len = bb_adjust_partitions(&bb_map); - if (!part_len) - { - pr_err(DRV "no partitions established"); - ret = -ENXIO; - goto err2; - } - - bb_mtd->owner = THIS_MODULE; - ret = add_mtd_partitions(bb_mtd, bb_parts, part_len); - if (ret) - { - pr_err(DRV "add_mtd_partitions\n"); - ret = -ENXIO; - goto err2; - } - - return 0; - -err2: - map_destroy(bb_mtd); -err: - iounmap(bb_map.virt); - - return ret; -} - -static void __exit exit_bb_map(void) -{ - del_mtd_partitions(bb_mtd); - map_destroy(bb_mtd); - iounmap(bb_map.virt); -} - -module_init(init_bb_map); -module_exit(exit_bb_map); - -MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Bifferos <bifferos@yahoo.co.uk>"); -MODULE_DESCRIPTION("MTD map driver for Bifferboard"); - diff --git a/target/linux/rdc/files/drivers/mtd/maps/imghdr.h b/target/linux/rdc/files/drivers/mtd/maps/imghdr.h deleted file mode 100644 index 7232b70..0000000 --- a/target/linux/rdc/files/drivers/mtd/maps/imghdr.h +++ /dev/null @@ -1,25 +0,0 @@ -#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 diff --git a/target/linux/rdc/files/drivers/mtd/maps/r8610.c b/target/linux/rdc/files/drivers/mtd/maps/r8610.c deleted file mode 100644 index 4401bff..0000000 --- a/target/linux/rdc/files/drivers/mtd/maps/r8610.c +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Flash memory access on RDC R8610 Evaluation board - * - * (C) 2009, Florian Fainelli - */ - -#include <linux/init.h> -#include <linux/module.h> -#include <linux/types.h> -#include <linux/kernel.h> - -#include <linux/mtd/mtd.h> -#include <linux/mtd/map.h> -#include <linux/mtd/partitions.h> - -#include <asm/io.h> - -static struct map_info r8610_map = { - .name = "r8610", - .size = CONFIG_MTD_RDC3210_SIZE, - .bankwidth = CONFIG_MTD_RDC3210_BUSWIDTH, -}; - -static struct mtd_partition r8610_partitions[] = { - { - .name = "Kernel", - .size = 0x001f0000, - .offset = 0 - },{ - .name = "Config", - .size = 0x10000, - .offset = MTDPART_OFS_APPEND, - },{ - .name = "Initrd", - .size = 0x1E0000, - .offset = MTDPART_OFS_APPEND, - },{ - .name = "Redboot", - .size = 0x20000, - .offset = MTDPART_OFS_APPEND, - .mask_flags = MTD_WRITEABLE - } -}; - -static struct mtd_info *mymtd; - -int __init r8610_mtd_init(void) -{ - struct mtd_partition *parts; - int nb_parts = 0; - - /* - * Static partition definition selection - */ - parts = r8610_partitions; - nb_parts = ARRAY_SIZE(r8610_partitions); - - /* - * Now let's probe for the actual flash. Do it here since - * specific machine settings might have been set above. - */ - r8610_map.phys = -r8610_map.size; - printk(KERN_NOTICE "r8610: flash device: %lx at %x\n", r8610_map.size, r8610_map.phys); - - r8610_map.map_priv_1 = (unsigned long)(r8610_map.virt = ioremap_nocache(r8610_map.phys, r8610_map.size)); - if (!r8610_map.map_priv_1) { - printk(KERN_ERR "Failed to ioremap\n"); - return -EIO; - } - - mymtd = do_map_probe("cfi_probe", &r8610_map); - if (!mymtd) { - iounmap(r8610_map.virt); - return -ENXIO; - } - mymtd->owner = THIS_MODULE; - - add_mtd_partitions(mymtd, parts, nb_parts); - - return 0; -} - -static void __exit r8610_mtd_cleanup(void) -{ - if (mymtd) { - del_mtd_partitions(mymtd); - map_destroy(mymtd); - iounmap(r8610_map.virt); - } -} - -module_init(r8610_mtd_init); -module_exit(r8610_mtd_cleanup); - -MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>"); -MODULE_DESCRIPTION("RDC R8610 MTD driver"); -MODULE_LICENSE("GPL"); diff --git a/target/linux/rdc/files/drivers/mtd/maps/rdc3210.c b/target/linux/rdc/files/drivers/mtd/maps/rdc3210.c deleted file mode 100644 index 2c536ce..0000000 --- a/target/linux/rdc/files/drivers/mtd/maps/rdc3210.c +++ /dev/null @@ -1,392 +0,0 @@ -/******************************************************************* - * 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/magic.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); diff --git a/target/linux/rdc/image/Makefile b/target/linux/rdc/image/Makefile index 59d59b4..13e9da1 100644 --- a/target/linux/rdc/image/Makefile +++ b/target/linux/rdc/image/Makefile @@ -11,20 +11,6 @@ define Image/Prepare $(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage endef -define trxalign/jffs2-128k -bs=128k -endef -define trxalign/jffs2-64k -bs=64k -endef -define trxalign/squashfs -bs=1024 -endef - -define Image/Prepare/squashfs - $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) -endef - define Image/Build/ar525w cp $(KDIR)/bzImage $(KDIR)/bzImage.tmp $(SCRIPT_DIR)/pad_image $(1) $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) 32 @@ -53,7 +39,7 @@ endef define Image/Build $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD).bzImage - $(call Image/Build/$(SUBTARGET),$(1),$(SUBTARGET),$(patsubst jffs2-%k,%,$(1))) + $(call Image/Build/$(PROFILE),$(1),$(PROFILE),$(patsubst jffs2-%k,%,$(1))) ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) $(call Image/Build/Initramfs) endif diff --git a/target/linux/rdc/profiles/ar525w.mk b/target/linux/rdc/profiles/ar525w.mk new file mode 100644 index 0000000..c2faee9 --- /dev/null +++ b/target/linux/rdc/profiles/ar525w.mk @@ -0,0 +1,12 @@ +# +# Copyright (C) 2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/ar525w + NAME:=Airlink AR525W + PACKAGES:=kmod-rt61-pci +endef +$(eval $(call Profile,ar525w)) diff --git a/target/linux/rdc/profiles/bifferboard.mk b/target/linux/rdc/profiles/bifferboard.mk new file mode 100644 index 0000000..0c12ac7 --- /dev/null +++ b/target/linux/rdc/profiles/bifferboard.mk @@ -0,0 +1,11 @@ +# +# Copyright (C) 2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/bifferboard + NAME:=Bifferboard +endef +$(eval $(call Profile,bifferboard)) diff --git a/target/linux/rdc/profiles/r8610.mk b/target/linux/rdc/profiles/r8610.mk new file mode 100644 index 0000000..67fef8a --- /dev/null +++ b/target/linux/rdc/profiles/r8610.mk @@ -0,0 +1,15 @@ +# +# Copyright (C) 2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/r8610 + NAME:=RDC R8610 Evaluation Board + PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 \ + kmod-hwmon-core kmod-hwmon-w83627hf kmod-ide-core kmod-ide-it821x \ + kmod-rtc-core kmod-rtc-m48t86 \ + kmod-fs-ext2 kmod-fs-ext3 +endef +$(eval $(call Profile,r8610)) diff --git a/target/linux/rdc/profiles/sitecom.mk b/target/linux/rdc/profiles/sitecom.mk new file mode 100644 index 0000000..e3b2981 --- /dev/null +++ b/target/linux/rdc/profiles/sitecom.mk @@ -0,0 +1,12 @@ +# +# Copyright (C) 2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +define Profile/sitecom + NAME:=Devices from Sitecom (WL-153, DC-230) + PACKAGES:=kmod-rt61-pci kmod-usb-core kmod-usb-ohci kmod-usb2 +endef +$(eval $(call Profile,sitecom)) diff --git a/target/linux/rdc/r8610/target.mk b/target/linux/rdc/r8610/target.mk deleted file mode 100644 index f2c7f0d..0000000 --- a/target/linux/rdc/r8610/target.mk +++ /dev/null @@ -1,5 +0,0 @@ -BOARDNAME:=RDC R8160 Evaluation Board -DEFAULT_PACKAGES += kmod-r6040 kmod-usb-core kmod-usb-ohci kmod-usb2 \ - kmod-hwmon-core kmod-hwmon-w83627hf kmod-ide-core kmod-ide-it821x \ - kmod-rtc-core kmod-rtc-m48t86 \ - kmod-fs-ext2 kmod-fs-ext3 diff --git a/target/linux/rdc/sitecom/target.mk b/target/linux/rdc/sitecom/target.mk deleted file mode 100644 index 83a8c95..0000000 --- a/target/linux/rdc/sitecom/target.mk +++ /dev/null @@ -1,2 +0,0 @@ -BOARDNAME:=Devices from Sitecom (WL-153, DC-230) -DEFAULT_PACKAGE+= kmod-usb-core kmod-usb-ohci kmod-usb2 |