rework board detection
authorFlorian Fainelli <florian@openwrt.org>
Thu, 18 Mar 2010 23:35:21 +0000 (23:35 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Thu, 18 Mar 2010 23:35:21 +0000 (23:35 +0000)
Rework board detection, separate board specific code into its own file. As a
result we also change the way rdc images are generated.
Support for board which required binary tools, like AMIT are dropped. Patch by
Bernhard Loos.

SVN-Revision: 20294

15 files changed:
scripts/pad_image [new file with mode: 0755]
target/linux/rdc/Makefile
target/linux/rdc/ar525w/config-2.6.30
target/linux/rdc/bifferboard/config-2.6.30
target/linux/rdc/files-2.6.30/arch/x86/include/asm/rdc_boards.h [new file with mode: 0644]
target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/Makefile
target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/boards/ar525w.c [new file with mode: 0644]
target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/boards/bifferboard.c [new file with mode: 0644]
target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/boards/r8610.c [new file with mode: 0644]
target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/boards/sitecom.c [new file with mode: 0644]
target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/platform.c
target/linux/rdc/image/Makefile
target/linux/rdc/image/mkimg_sitecom.pl
target/linux/rdc/patches-2.6.30/012-export_erase_write.patch [new file with mode: 0644]
target/linux/rdc/r8610/config-2.6.30

diff --git a/scripts/pad_image b/scripts/pad_image
new file mode 100755 (executable)
index 0000000..14f1499
--- /dev/null
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+function usage {
+  echo "Usage: prepare_image image_type kernel_image rootfs_image header_size"
+  echo "Padd root and kernel image to the correct size and append the jffs2 start marker as needed"
+  exit 1
+}
+
+function pad_file {
+       echo "Padding $1 to size $2"
+       dd if=$1 of=$1.paddingtempfile bs=$2 count=1 conv=sync &> /dev/null
+       mv $1.paddingtempfile $1
+}
+
+#filesize filestart padding
+function calc_pad {
+       [  $((($1 + $2) & ($3 - 1))) == 0 ] && {
+               echo $1
+               return 0
+        }
+       echo $(((($1 + $2) | ($3 - 1)) + 1 - $2))
+}
+
+function prep_squash {
+       echo "kernel_size: $kernel_size"
+       echo "header_size: $header_size"
+       kernel_pad_size=$(calc_pad $kernel_size $header_size 32)
+       kernel_end=$(($header_size + $kernel_pad_size))
+       pad_file $kernel_image $kernel_pad_size
+
+       #4k
+       rootfs_pad_size=$(calc_pad $rootfs_size $kernel_end 4096)
+       pad_file $rootfs_image $rootfs_pad_size
+       echo -ne '\xde\xad\xc0\xde' >> $rootfs_image
+       
+       #8k
+       rootfs_pad_size=$(calc_pad $rootfs_size $kernel_end 8192)
+       [ $rootfs_pad_size == rootfs_old_padsize ] || {
+               pad_file $rootfs_image $rootfs_pad_size
+               rootfs_old_padsize=$rootfs_pad_size
+               echo -ne '\xde\xad\xc0\xde' >> $rootfs_image
+       }
+
+       #64k
+       rootfs_pad_size=$(calc_pad $rootfs_size $kernel_end 65536)
+       [ $rootfs_pad_size == rootfs_old_padsize ] || {
+               pad_file $rootfs_image $rootfs_pad_size
+               rootfs_old_padsize=$rootfs_pad_size
+               echo -ne '\xde\xad\xc0\xde' >> $rootfs_image
+       }
+
+       #128k
+       rootfs_pad_size=$(calc_pad $rootfs_size $kernel_end 131072)
+       [ $rootfs_pad_size == rootfs_old_padsize ] || {
+               pad_file $rootfs_image $rootfs_pad_size
+               rootfs_old_padsize=$rootfs_pad_size
+               echo -ne '\xde\xad\xc0\xde' >> $rootfs_image
+       }
+       
+}
+
+function prep_jffs2 {
+       kernel_pad_size=$(calc_pad $kernel_size $header_size $1)
+       pad_file $kernel_image $kernel_pad_size
+}
+
+image_type=$1
+kernel_image=$2
+rootfs_image=$3
+header_size=$4
+
+if [ -z "$image_type" ] || [ -z "$rootfs_image" ] || [ -z "$kernel_image" ] || [ -z "$header_size" ]; then
+       usage
+fi
+
+if [ ! -e "$rootfs_image" ] || [ -z "$kernel_image" ]; then
+       echo "input file not found"
+       exit 1
+fi
+
+kernel_size=$(stat -c "%s" "$kernel_image")
+rootfs_size=$(stat -c "%s" "$rootfs_image")
+
+if [ $kernel_size == 0 ] || [ $rootfs_size == 0 ]; then
+       echo "kernel or rootfs empty"
+       exit 1
+fi
+
+case $image_type in
+       squashfs )
+               prep_squash ;;
+       jffs2-64k )
+               prep_jffs2 65536 ;;
+       jffs2-128k )
+               prep_jffs2 131072 ;;
+       * )
+               echo "Unknown image type"
+               exit 1 ;;
+esac
+
index b651011..2144ec7 100644 (file)
@@ -11,7 +11,7 @@ BOARD:=rdc
 BOARDNAME:=RDC 321x
 FEATURES:=squashfs jffs2 pci usb pcmcia
 CFLAGS:=-Os -pipe -march=i486 -funit-at-a-time
-SUBTARGETS:=amit ar525w r8610 dir-450 sitecom bifferboard
+SUBTARGETS:=ar525w r8610 sitecom bifferboard
 
 LINUX_VERSION:=2.6.30.10
 
index 109f9e0..e69de29 100644 (file)
@@ -1,8 +0,0 @@
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_R8610 is not set
-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_RDC3210=y
index c97dcda..e69de29 100644 (file)
@@ -1,8 +0,0 @@
-CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2"
-# CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_RDC3210_ALLOW_JFFS2=y
-CONFIG_MTD_RDC3210_BUSWIDTH=2
-# CONFIG_MTD_RDC3210_FACTORY_PRESENT is not set
-CONFIG_MTD_RDC3210_SIZE=0x800000
-# CONFIG_MTD_RDC3210_STATIC_MAP is not set
-CONFIG_MTD_RDC3210=y
diff --git a/target/linux/rdc/files-2.6.30/arch/x86/include/asm/rdc_boards.h b/target/linux/rdc/files-2.6.30/arch/x86/include/asm/rdc_boards.h
new file mode 100644 (file)
index 0000000..4f8ef37
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+ *  RDC321x boards
+ *
+ *  Copyright (C) 2007-2009 OpenWrt.org
+ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
+ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the
+ *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA  02110-1301, USA.
+ *
+ */
+
+#ifndef _RDC_BOARDS_H__
+#define _RDC_BOARDS_H__
+
+#include <linux/leds.h>
+#include <linux/gpio_buttons.h>
+
+struct rdc_platform_data {
+       struct gpio_led_platform_data led_data;
+       struct gpio_buttons_platform_data button_data;
+};
+
+#endif
index 21d8879..13d0b31 100644 (file)
@@ -1,5 +1,5 @@
 #
 # Makefile for the RDC321x specific parts of the kernel
 #
-obj-$(CONFIG_X86_RDC321X)        := gpio.o platform.o pci.o reboot.o
+obj-$(CONFIG_X86_RDC321X)        := gpio.o platform.o pci.o reboot.o boards/sitecom.o boards/ar525w.o boards/bifferboard.o boards/r8610.o
 
diff --git a/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/boards/ar525w.c b/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/boards/ar525w.c
new file mode 100644 (file)
index 0000000..5d54a30
--- /dev/null
@@ -0,0 +1,243 @@
+/*
+ * ar525w RDC321x platform devices
+ *
+ *  Copyright (C) 2007-2009 OpenWrt.org
+ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
+ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the
+ *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA  02110-1301, USA.
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/mtd/physmap.h>
+#include <linux/input.h>
+#include <linux/vmalloc.h>
+#include <linux/mtd/mtd.h>
+
+#include <asm/rdc_boards.h>
+
+struct image_header {
+       char 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;
+};
+
+static struct gpio_led ar525w_leds[] = {
+       { .name = "rdc321x:dmz", .gpio = 1, .active_low = 1},
+};
+static struct gpio_button ar525w_btns[] = {
+       {
+               .gpio = 6,
+               .code = BTN_0,
+               .desc = "Reset",
+               .active_low = 1,
+       }
+};
+
+static u32 __initdata 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 __init 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 int __init fixup_ar525w_header(struct mtd_info *master, struct image_header *header)
+{
+       char *buffer;
+       int res;
+       u32 bufferlength = header->kernelsz + sizeof(struct image_header);
+       u32 len;
+       char crcbuf[0x400];
+
+       printk(KERN_INFO "Fixing up AR525W header, old image size: %u, new image size: %u\n",
+                  header->imagesz, bufferlength);
+
+       buffer = vmalloc(bufferlength);
+       if (!buffer) {
+               printk(KERN_ERR "Can't allocate %u bytes\n", bufferlength);
+               return -ENOMEM;
+       }
+
+       res =  master->read(master, 0x0, bufferlength, &len, buffer);
+       if (res || len != bufferlength)
+               goto out;
+
+       header = (struct image_header *) buffer;
+       header->imagesz = bufferlength;
+       header->checksum = 0;
+       header->fastcksum = 0;
+
+       memcpy(crcbuf, buffer, 0x100);
+       memcpy(crcbuf + 0x100, buffer + (bufferlength >> 1) - ((bufferlength & 0x6) >> 1), 0x100);
+       memcpy(crcbuf + 0x200, buffer + bufferlength - 0x200, 0x200);
+
+       header->fastcksum = crc32(crcbuf, sizeof(crcbuf));
+       header->checksum = crc32(buffer, bufferlength);
+
+       if (master->unlock)
+               master->unlock(master, 0, master->erasesize);
+       res = erase_write (master, 0, master->erasesize, buffer);
+       if (res)
+               printk(KERN_ERR "Can't rewrite image header\n");
+
+out:
+       vfree(buffer);
+       return res;
+}
+
+static int __init parse_ar525w_partitions(struct mtd_info *master, struct mtd_partition **pparts, unsigned long plat_data)
+{
+       struct image_header header;
+       int res;
+       size_t len;
+       struct mtd_partition *rdc_flash_parts;
+       struct rdc_platform_data *pdata = (struct rdc_platform_data *) plat_data;
+
+       if (master->size != 0x400000) //4MB
+               return -ENOSYS;
+
+       res =  master->read(master, 0x0, sizeof(header), &len, (char *)&header);
+       if (res)
+               return res;
+
+       if (strncmp(header.magic, "GMTK", 4))
+               return -ENOSYS;
+
+       if (header.kernelsz > 0x400000 || header.kernelsz < master->erasesize) {
+               printk(KERN_ERR "AR525W image header found, but seems corrupt, kernel size %u\n", header.kernelsz);
+               return -EINVAL;
+       }
+
+       if (header.kernelsz + sizeof(header) != header.imagesz) {
+               res = fixup_ar525w_header(master, &header);
+               if (res)
+                       return res;
+       }
+
+       rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 3, GFP_KERNEL);
+
+       rdc_flash_parts[0].name = "firmware";
+       rdc_flash_parts[0].offset = 0x0;
+       rdc_flash_parts[0].size = 0x3E0000;
+       rdc_flash_parts[1].name = "rootfs";
+       rdc_flash_parts[1].offset = header.kernelsz + sizeof(header);
+       rdc_flash_parts[1].size = rdc_flash_parts[0].size - rdc_flash_parts[1].offset;
+       rdc_flash_parts[2].name = "bootloader";
+       rdc_flash_parts[2].offset = 0x3E0000;
+       rdc_flash_parts[2].size = 0x20000;
+
+       *pparts = rdc_flash_parts;
+
+       pdata->led_data.num_leds = ARRAY_SIZE(ar525w_leds);
+       pdata->led_data.leds = ar525w_leds;
+       pdata->button_data.nbuttons = ARRAY_SIZE(ar525w_btns);
+       pdata->button_data.buttons = ar525w_btns;
+
+       return 3;
+}
+
+static struct mtd_part_parser __initdata ar525w_parser = {
+       .owner = THIS_MODULE,
+       .parse_fn = parse_ar525w_partitions,
+       .name = "AR525W",
+};
+
+static int __init ar525w_setup(void)
+{
+       return register_mtd_parser(&ar525w_parser);
+}
+
+arch_initcall(ar525w_setup);
diff --git a/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/boards/bifferboard.c b/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/boards/bifferboard.c
new file mode 100644 (file)
index 0000000..076459e
--- /dev/null
@@ -0,0 +1,82 @@
+/*
+ *  Bifferboard RDC321x platform devices
+ *
+ *  Copyright (C) 2010 bifferos@yahoo.co.uk 
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the
+ *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA  02110-1301, USA.
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/mtd/physmap.h>
+#include <linux/input.h>
+
+#include <asm/rdc_boards.h>
+
+static int __init parse_bifferboard_partitions(struct mtd_info *master, struct mtd_partition **pparts, unsigned long plat_data)
+{
+       int res;
+       size_t len;
+       struct mtd_partition *rdc_flash_parts;
+       u32 kernel_len;
+       u16 tmp;
+
+       if (master->size == 0x100000)
+               kernel_len = master->size - 0x10000;
+       else {
+               res =  master->read(master, 0x4000 + 1036, 2, &len, (char *) &tmp);
+               if (res)
+                       return res;
+               kernel_len = tmp * master->erasesize;
+       }
+       
+       rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 4, GFP_KERNEL);
+       
+       *pparts = rdc_flash_parts;
+
+       rdc_flash_parts[0].name = "biffboot";
+       rdc_flash_parts[0].offset = master->size - 0x10000;
+       rdc_flash_parts[0].size = 0x10000;
+       rdc_flash_parts[0].mask_flags = MTD_WRITEABLE;
+       rdc_flash_parts[1].name = "firmware";
+       rdc_flash_parts[1].offset = 0;
+       rdc_flash_parts[1].size = rdc_flash_parts[0].offset;
+       rdc_flash_parts[2].name = "kernel";
+       rdc_flash_parts[2].offset = 0x00000000;
+       rdc_flash_parts[2].size = kernel_len;
+       
+       if (master->size == 0x100000)
+               return 2;
+
+       rdc_flash_parts[3].name = "rootfs";
+       rdc_flash_parts[3].offset = MTDPART_OFS_APPEND;
+       rdc_flash_parts[3].size = rdc_flash_parts[1].size - rdc_flash_parts[2].size;
+
+       return 4;
+}
+
+struct mtd_part_parser __initdata bifferboard_parser = {
+       .owner = THIS_MODULE,
+       .parse_fn = parse_bifferboard_partitions,
+       .name = "Bifferboard",
+};
+
+static int __init bifferboard_setup(void)
+{
+       return register_mtd_parser(&bifferboard_parser);
+}
+
+arch_initcall(bifferboard_setup);
diff --git a/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/boards/r8610.c b/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/boards/r8610.c
new file mode 100644 (file)
index 0000000..d10afa3
--- /dev/null
@@ -0,0 +1,65 @@
+/*
+ *  R8610 RDC321x platform devices
+ *
+ *  Copyright (C) 2009, Florian Fainelli 
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the
+ *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA  02110-1301, USA.
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/mtd/physmap.h>
+#include <linux/input.h>
+
+#include <asm/rdc_boards.h>
+
+static int __init parse_r8610_partitions(struct mtd_info *master, struct mtd_partition **pparts, unsigned long plat_data)
+{
+       struct mtd_partition *rdc_flash_parts;
+       
+       rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 4, GFP_KERNEL);
+       
+       *pparts = rdc_flash_parts;
+       
+       rdc_flash_parts[0].name = "kernel";
+       rdc_flash_parts[0].size = 0x001f0000;
+       rdc_flash_parts[0].offset = 0;
+       rdc_flash_parts[1].name = "config";
+       rdc_flash_parts[1].size = 0x10000;
+       rdc_flash_parts[1].offset = MTDPART_OFS_APPEND;
+       rdc_flash_parts[2].name = "rootfs";
+       rdc_flash_parts[2].size = 0x1E0000; 
+       rdc_flash_parts[2].offset = MTDPART_OFS_APPEND;
+       rdc_flash_parts[3].name = "redboot";
+       rdc_flash_parts[3].size = 0x20000;
+       rdc_flash_parts[3].offset = MTDPART_OFS_APPEND;
+       rdc_flash_parts[3].mask_flags = MTD_WRITEABLE;
+
+       return 4;
+}
+
+struct mtd_part_parser __initdata r8610_parser = {
+       .owner = THIS_MODULE,
+       .parse_fn = parse_r8610_partitions,
+       .name = "R8610",
+};
+
+static int __init r8610_setup(void)
+{
+       return register_mtd_parser(&r8610_parser);
+}
+
+arch_initcall(r8610_setup);
diff --git a/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/boards/sitecom.c b/target/linux/rdc/files-2.6.30/arch/x86/mach-rdc321x/boards/sitecom.c
new file mode 100644 (file)
index 0000000..11f34f8
--- /dev/null
@@ -0,0 +1,111 @@
+/*
+ *  Sitecom RDC321x platform devices
+ *
+ *  Copyright (C) 2007-2009 OpenWrt.org
+ *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
+ *  Copyright (C) 2008-2009 Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version 2
+ *  of the License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the
+ *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA  02110-1301, USA.
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/mtd/physmap.h>
+#include <linux/input.h>
+
+#include <asm/rdc_boards.h>
+
+struct image_header {
+       char    magic[4];
+       u32     kernel_length;
+       u32     ramdisk_length;
+       char    magic2[4];
+       u32     kernel_length2;
+};
+
+static struct gpio_led sitecom_leds[] = {
+       { .name = "rdc321x:power", .gpio = 15, .active_low = 1},
+       { .name = "rdc321x:usb0", .gpio = 0, .active_low = 1},
+       { .name = "rdc321x:usb1", .gpio = 1, .active_low = 1},
+};
+
+static struct gpio_button sitecom_btns[] = {
+       {
+               .gpio = 6,
+               .code = BTN_0,
+               .desc = "Reset",
+               .active_low = 1,
+       }
+};
+
+static int __init parse_sitecom_partitions(struct mtd_info *master, struct mtd_partition **pparts, unsigned long plat_data)
+{
+       struct image_header header;
+       int res;
+       size_t len;
+       struct mtd_partition *rdc_flash_parts;
+       struct rdc_platform_data *pdata = (struct rdc_platform_data *) plat_data;
+       
+       if (master->size != 0x400000) //4MB
+               return -ENOSYS;
+
+       res =  master->read(master, 0x8000, sizeof(header), &len, (char *)&header);
+       if (res)
+               return res;
+
+       if (strncmp(header.magic, "CSYS", 4) || strncmp(header.magic2, "WRRM", 4))
+               return -ENOSYS;
+       
+       rdc_flash_parts = kzalloc(sizeof(struct mtd_partition) * 5, GFP_KERNEL);
+       
+       rdc_flash_parts[0].name = "firmware";
+       rdc_flash_parts[0].offset = 0x8000;
+       rdc_flash_parts[0].size = 0x3F0000;
+       rdc_flash_parts[1].name = "config";
+       rdc_flash_parts[1].offset = 0;
+       rdc_flash_parts[1].size = 0x8000;
+       rdc_flash_parts[2].name = "kernel";
+       rdc_flash_parts[2].offset = 0x8014;
+       rdc_flash_parts[2].size = header.kernel_length;
+       rdc_flash_parts[3].name = "rootfs";
+       rdc_flash_parts[3].offset = 0x8014 + header.kernel_length;
+       rdc_flash_parts[3].size = 0x3F0000 - rdc_flash_parts[3].offset;
+       rdc_flash_parts[4].name = "bootloader";
+       rdc_flash_parts[4].offset = 0x3F0000;
+       rdc_flash_parts[4].size = 0x10000;
+
+       *pparts = rdc_flash_parts;
+       
+       pdata->led_data.num_leds = ARRAY_SIZE(sitecom_leds);
+       pdata->led_data.leds = sitecom_leds;
+       pdata->button_data.nbuttons = ARRAY_SIZE(sitecom_btns);
+       pdata->button_data.buttons = sitecom_btns;
+       
+       return 5;
+}
+
+struct mtd_part_parser __initdata sitecom_parser = {
+       .owner = THIS_MODULE,
+       .parse_fn = parse_sitecom_partitions,
+       .name = "Sitecom",
+};
+
+static int __init sitecom_setup(void)
+{
+       return register_mtd_parser(&sitecom_parser);
+}
+
+arch_initcall(sitecom_setup);
index 3b3de77..f655458 100644 (file)
  */
 
 #include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/device.h>
+//#include <linux/kernel.h>
+//#include <linux/list.h>
+//#include <linux/device.h>
 #include <linux/platform_device.h>
-#include <linux/version.h>
-#include <linux/leds.h>
-#include <linux/gpio_buttons.h>
-#include <linux/input.h>
+//#include <linux/version.h>
+//#include <linux/input.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/physmap.h>
 #include <linux/root_dev.h>
 
-/* Flash */
-#ifdef CONFIG_MTD_R8610
-#define CONFIG_MTD_RDC3210 1
-#elif defined CONFIG_MTD_RDC3210
-static struct resource rdc_flash_resource[] = {
-       [0] = {
-               .start = (u32)-CONFIG_MTD_RDC3210_SIZE,
-               .end = (u32)-1,
-               .flags = IORESOURCE_MEM,
-       },
-};
+#include <asm/rdc_boards.h>
 
-static struct platform_device rdc_flash_device = {
-       .name = "rdc321x-flash",
-       .id = -1,
-       .num_resources = ARRAY_SIZE(rdc_flash_resource),
-       .resource = rdc_flash_resource,
-};
-#else
-static struct mtd_partition rdc_flash_parts[15];
-
-static struct resource rdc_flash_resource = {
-       .end = (u32)-1,
-       .flags = IORESOURCE_MEM,
-};
-
-static struct physmap_flash_data rdc_flash_data = {
-       .parts = rdc_flash_parts,
-};
-
-static struct platform_device rdc_flash_device = {
-       .name = "physmap-flash",
-       .id = -1,
-       .resource = &rdc_flash_resource,
-       .num_resources = 1,
-       .dev.platform_data = &rdc_flash_data,
-};
-#endif
+static struct rdc_platform_data rdcplat_data;
 
 /* LEDS */
-static struct gpio_led default_leds[] = {
-       { .name = "rdc321x:dmz", .gpio = 1, .active_low = 1},
-};
-
-static struct gpio_led sitecom_leds[] = {
-       { .name = "rdc321x:power", .gpio = 15, .active_low = 1},
-       { .name = "rdc321x:usb0", .gpio = 0, .active_low = 1},
-       { .name = "rdc321x:usb1", .gpio = 1, .active_low = 1},
-};
-
-static struct gpio_led_platform_data rdc321x_led_data = {
-       .num_leds = ARRAY_SIZE(default_leds),
-       .leds = default_leds,
-};
-
 static struct platform_device rdc321x_leds = {
        .name = "leds-gpio",
        .id = -1,
        .dev = {
-               .platform_data = &rdc321x_led_data,
+               .platform_data = &rdcplat_data.led_data,
        }
 };
 
 /* Button */
-static struct gpio_button rdc321x_gpio_btn[] = {
-       {
-               .gpio = 6,
-               .code = BTN_0,
-               .desc = "Reset",
-               .active_low = 1,
-       }
-};
-
-static struct gpio_buttons_platform_data rdc321x_gpio_btn_data = {
-       .buttons = rdc321x_gpio_btn,
-       .nbuttons = ARRAY_SIZE(rdc321x_gpio_btn),
-};
-
-static struct platform_device rdc321x_button = {
+static struct platform_device rdc321x_buttons = {
        .name = "gpio-buttons",
        .id = -1,
        .dev = {
-               .platform_data = &rdc321x_gpio_btn_data,
+               .platform_data = &rdcplat_data.button_data,
        }
 };
-
-static struct platform_device *rdc321x_devs[] = {
-       &rdc_flash_device,
+       
+static __initdata struct platform_device *rdc321x_devs[] = {
        &rdc321x_leds,
-       &rdc321x_button,
+       &rdc321x_buttons,
 };
 
-static int probe_flash_start(struct map_info *the_map)
-{
-       struct mtd_info *res;
+const char *__initdata boards[] = {
+       "Sitecom",
+       "AR525W",
+       "Bifferboard",
+       "R8610",
+       0
+};
 
-       the_map->virt = ioremap(the_map->phys, the_map->size);
-       if (the_map->virt == NULL)
-               return 1;
-       for (the_map->bankwidth = 32; the_map->bankwidth; the_map->bankwidth
-                       >>= 1) {
-               res = do_map_probe("cfi_probe", the_map);
-               if (res == NULL)
-                       res = do_map_probe("jedec_probe", the_map);
-               if (res != NULL)
-                       break;
-       }
-       iounmap(the_map->virt);
-       if (res != NULL)
-               the_map->phys = (u32)-(s32)(the_map->size = res->size);
-       return res == NULL;
-}
+static struct map_info rdc_map_info = {
+       .name = "rdc_flash",
+       .size = 0x800000,       //8MB
+       .phys = 0xFF800000,     //(u32) -rdc_map_info.size;
+       .bankwidth = 2
+};
 
 static int __init rdc_board_setup(void)
 {
-#ifndef CONFIG_MTD_RDC3210
-       struct map_info rdc_map_info;
-       u32 the_header[8];
-
-       ROOT_DEV = 0;
-       rdc_map_info.name = rdc_flash_device.name;
-       rdc_map_info.size = 0x800000;   //8MB
-       rdc_map_info.phys = (u32) -rdc_map_info.size;
-       rdc_map_info.bankwidth = 2;
-       rdc_map_info.set_vpp = NULL;
+       struct mtd_partition *partitions;
+       int count, res;
+       struct mtd_info *mtdinfo;
+       
        simple_map_init(&rdc_map_info);
-       while (probe_flash_start(&rdc_map_info)) {
-               if (rdc_map_info.size /= 2 < 0x100000)  //1MB
-                       panic("Could not find start of flash!");
+       
+       while (true) {
+               rdc_map_info.virt = ioremap(rdc_map_info.phys, rdc_map_info.size);
+               if (rdc_map_info.virt == NULL)
+                       continue;
+               
+               mtdinfo = do_map_probe("cfi_probe", &rdc_map_info);
+               if (mtdinfo == NULL)
+                       mtdinfo = do_map_probe("jedec_probe", &rdc_map_info);
+               if (mtdinfo != NULL)
+                       break;
+
+               iounmap(rdc_map_info.virt);
+               if ((rdc_map_info.size >>= 1) < 0x100000)       //1MB
+                       panic("RDC321x: Could not find start of flash!");
                rdc_map_info.phys = (u32) -rdc_map_info.size;
        }
-       rdc_flash_resource.start = rdc_map_info.phys;
-       rdc_flash_data.width = rdc_map_info.bankwidth;
-       rdc_map_info.virt = ioremap_nocache(rdc_map_info.phys, 0x10);
-       if (rdc_map_info.virt == NULL)
-               panic("Could not ioremap to read device magic!");
-       the_header[0] = ((u32 *)rdc_map_info.virt)[0];
-       the_header[1] = ((u32 *)rdc_map_info.virt)[1];
-       the_header[2] = ((u32 *)rdc_map_info.virt)[2];
-       the_header[3] = ((u32 *)rdc_map_info.virt)[3];
-       iounmap(rdc_map_info.virt);
-       rdc_map_info.virt = ioremap_nocache(rdc_map_info.phys + 0x8000, 0x10);
-       if (rdc_map_info.virt == NULL)
-               panic("Could not ioremap to read device magic!");
-       the_header[4] = ((u32 *)rdc_map_info.virt)[0];
-       the_header[5] = ((u32 *)rdc_map_info.virt)[1];
-       the_header[6] = ((u32 *)rdc_map_info.virt)[2];
-       the_header[7] = ((u32 *)rdc_map_info.virt)[3];
-       iounmap(rdc_map_info.virt);
-       if (!memcmp(the_header, "GMTK", 4)) {   /* Gemtek */
-               /* TODO */
-       } else if (!memcmp(the_header + 4, "CSYS", 4)) {        /* Sitecom */
-               rdc_flash_parts[0].name = "system";
-               rdc_flash_parts[0].offset = 0;
-               rdc_flash_parts[0].size = rdc_map_info.size - 0x10000;
-               rdc_flash_parts[1].name = "config";
-               rdc_flash_parts[1].offset = 0;
-               rdc_flash_parts[1].size = 0x8000;
-               rdc_flash_parts[2].name = "magic";
-               rdc_flash_parts[2].offset = 0x8000;
-               rdc_flash_parts[2].size = 0x14;
-               rdc_flash_parts[3].name = "kernel";
-               rdc_flash_parts[3].offset = 0x8014;
-               rdc_flash_parts[3].size = the_header[5];
-               rdc_flash_parts[4].name = "rootfs";
-               rdc_flash_parts[4].offset = 0x8014 + the_header[5];
-               rdc_flash_parts[4].size = rdc_flash_parts[0].size - rdc_flash_parts[4].offset;
-               rdc_flash_parts[5].name = "bootloader";
-               rdc_flash_parts[5].offset = rdc_flash_parts[0].size;
-               rdc_flash_parts[5].size = 0x10000;
-               rdc_flash_data.nr_parts = 6;
-
-               rdc321x_led_data.num_leds = ARRAY_SIZE(sitecom_leds);
-               rdc321x_led_data.leds = sitecom_leds;
-       } else if (!memcmp(((u8 *)the_header) + 14, "Li", 2)) { /* AMIT */
-               rdc_flash_parts[0].name = "kernel_parthdr";
-               rdc_flash_parts[0].offset = 0;
-               rdc_flash_parts[0].size = 0x10;
-               rdc_flash_parts[1].name = "kernel";
-               rdc_flash_parts[1].offset = 0x10;
-               rdc_flash_parts[1].size = 0xffff0;
-               rdc_flash_parts[2].name = "rootfs_parthdr";
-               rdc_flash_parts[2].offset = 0x100000;
-               rdc_flash_parts[2].size = 0x10;
-               rdc_flash_parts[3].name = "rootfs";
-               rdc_flash_parts[3].offset = 0x100010;
-               rdc_flash_parts[3].size = rdc_map_info.size - 0x160010;
-               rdc_flash_parts[4].name = "config_parthdr";
-               rdc_flash_parts[4].offset = rdc_map_info.size - 0x60000;
-               rdc_flash_parts[4].size = 0x10;
-               rdc_flash_parts[5].name = "config";
-               rdc_flash_parts[5].offset = rdc_map_info.size - 0x5fff0;
-               rdc_flash_parts[5].size = 0xfff0;
-               rdc_flash_parts[6].name = "recoveryfs_parthdr";
-               rdc_flash_parts[6].offset = rdc_map_info.size - 0x50000;
-               rdc_flash_parts[6].size = 0x10;
-               rdc_flash_parts[7].name = "recoveryfs";
-               rdc_flash_parts[7].offset = rdc_map_info.size - 0x4fff0;
-               rdc_flash_parts[7].size = 0x3fff0;
-               rdc_flash_parts[8].name = "recovery_parthdr";
-               rdc_flash_parts[8].offset = rdc_map_info.size - 0x10000;
-               rdc_flash_parts[8].size = 0x10;
-               rdc_flash_parts[9].name = "recovery";
-               rdc_flash_parts[9].offset = rdc_map_info.size - 0xfff0;
-               rdc_flash_parts[9].size = 0x7ff0;
-               rdc_flash_parts[10].name = "productinfo_parthdr";
-               rdc_flash_parts[10].offset = rdc_map_info.size - 0x8000;
-               rdc_flash_parts[10].size = 0x10;
-               rdc_flash_parts[11].name = "productinfo";
-               rdc_flash_parts[11].offset = rdc_map_info.size - 0x7ff0;
-               rdc_flash_parts[11].size = 0x1ff0;
-               rdc_flash_parts[12].name = "bootloader_parthdr";
-               rdc_flash_parts[12].offset = rdc_map_info.size - 0x6000;
-               rdc_flash_parts[12].size = 0x10;
-               rdc_flash_parts[13].name = "bootloader";
-               rdc_flash_parts[13].offset = rdc_map_info.size - 0x5ff0;
-               rdc_flash_parts[13].size = 0x5ff0;
-               rdc_flash_parts[14].name = "everything";
-               rdc_flash_parts[14].offset = 0;
-               rdc_flash_parts[14].size = rdc_map_info.size;
-               rdc_flash_data.nr_parts = 15;
-       } else {        /* ZyXEL */
-               rdc_flash_parts[0].name = "kernel";
-               rdc_flash_parts[0].offset = 0;
-               rdc_flash_parts[0].size = 0x100000;
-               rdc_flash_parts[1].name = "rootfs";
-               rdc_flash_parts[1].offset = 0x100000;
-               rdc_flash_parts[1].size = rdc_map_info.size - 0x140000;
-               rdc_flash_parts[2].name = "linux";
-               rdc_flash_parts[2].offset = 0;
-               rdc_flash_parts[2].size = rdc_map_info.size - 0x40000;
-               rdc_flash_parts[3].name = "config";
-               rdc_flash_parts[3].offset = rdc_map_info.size - 0x40000;
-               rdc_flash_parts[3].size = 0x10000;
-               rdc_flash_parts[4].name = "productinfo";
-               rdc_flash_parts[4].offset = rdc_map_info.size - 0x30000;
-               rdc_flash_parts[4].size = 0x10000;
-               rdc_flash_parts[5].name = "bootloader";
-               rdc_flash_parts[5].offset = rdc_map_info.size - 0x20000;
-               rdc_flash_parts[5].size = 0x20000;
-               rdc_flash_data.nr_parts = 6;
+       
+       count = parse_mtd_partitions(mtdinfo, boards, &partitions, (unsigned long) &rdcplat_data);
+       
+       if (count <= 0) {
+               panic("RDC321x: can't identify board type");
+               return -ENOSYS;
        }
-#endif
+       
+       ROOT_DEV = 0;
+       res = add_mtd_partitions(mtdinfo, partitions, count);
+       if (res)
+               return res;
+       
        return platform_add_devices(rdc321x_devs, ARRAY_SIZE(rdc321x_devs));
+
 }
 
-#ifdef CONFIG_MTD_RDC3210
-arch_initcall(rdc_board_setup);
-#else
 late_initcall(rdc_board_setup);
-#endif
index 9b4c135..59d59b4 100644 (file)
@@ -26,62 +26,20 @@ define Image/Prepare/squashfs
 endef
 
 define Image/Build/ar525w
-       touch $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img
-       touch $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2)-web.img
-       dd if=$(KDIR)/root.$(1) of=$(KDIR)/root.tmp $(call trxalign/$(1)) conv=sync
-       mv $(KDIR)/root.tmp $(KDIR)/root.$(1)
-       $(STAGING_DIR_HOST)/bin/airlink -b 1 -j $(shell bash -c 'echo $$[$(3)]') $(KDIR)/bzImage $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img
-       $(STAGING_DIR_HOST)/bin/airlink -e -b 1 -j $(shell bash -c 'echo $$[$(3)]') $(KDIR)/bzImage $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2)-web.img
-endef
-
-define Image/Postprocess/sitecom/squashfs
-       dd if=/dev/zero of=$(KDIR)/tmp2.img count=1 bs=32k #32k config data a start of flash
-       cat $(KDIR)/tmp.img >> $(KDIR)/tmp2.img
-       $(call prepare_generic_squashfs,$(KDIR)/tmp2.img)
-       dd if=$(KDIR)/tmp2.img of=$(KDIR)/tmp.img bs=32k skip=1
+       cp $(KDIR)/bzImage $(KDIR)/bzImage.tmp
+       $(SCRIPT_DIR)/pad_image $(1) $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) 32
+       $(STAGING_DIR_HOST)/bin/airlink -b 1 $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img
+       $(STAGING_DIR_HOST)/bin/airlink -e -b 1 $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2)-web.img
 endef
 
 define Image/Build/sitecom
-       $(TOPDIR)/target/linux/rdc/image/mkimg_sitecom.pl $(KDIR)/bzImage > $(KDIR)/tmp.img
+       cp $(KDIR)/bzImage $(KDIR)/bzImage.tmp
+       #32k config data + 20 bytes header + 2 bytes checksum after kernel image
+       $(SCRIPT_DIR)/pad_image $(1) $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) 32790
+       $(TOPDIR)/target/linux/rdc/image/mkimg_sitecom.pl $(KDIR)/bzImage.tmp > $(KDIR)/tmp.img
        cat $(KDIR)/root.$(1) >> $(KDIR)/tmp.img
-       $(call Image/Postprocess/sitecom/$(1))
        cp $(KDIR)/tmp.img $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img
-endef
-
-define Image/Build/dir450
-       touch $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).img
-       dd if=$(KDIR)/root.$(1) of=$(KDIR)/root.tmp $(call trxalign/$(1)) conv=sync
-       mv $(KDIR)/root.tmp $(KDIR)/root.$(1)
-       $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/onlyrootfs-$(BOARD)-$(1)-$(2).img
-endef
-
-define Image/Build/g570s
-       $(call Image/Prepare/$(1))
-       mv $(KDIR)/root.$(1) $(KDIR)/root.tmp
-       dd of=$(KDIR)/root.$(1) if=$(KDIR)/root.tmp $(call trxalign/$(1)) conv=sync
-       $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-tftp-$(BOARD)-$(1)-$(2).img
-       dd of=$(BIN_DIR)/openwrt-tftp-$(BOARD)-$(1)-$(2).img if=/dev/null bs=1024 seek=1024
-       cat $(KDIR)/root.$(1) >> $(BIN_DIR)/openwrt-tftp-$(BOARD)-$(1)-$(2).img
-       if [ ! -x $(STAGING_DIR_HOST)/bin/zyxel_combine ]; then echo "#ERR Please copy the ZyXEL \"combine\" tool as $(STAGING_DIR_HOST)/bin/zyxel_combine to build."; fi
-       sh -c "mkdir $(KDIR)/zyxel.tmp && cd $(KDIR)/zyxel.tmp && mv ../root.tmp initrd.bin && cp ../bzImage kernel.bin && $(STAGING_DIR_HOST)/bin/zyxel_combine -mcf kernel.bin initrd.bin && mv image $(BIN_DIR)/openwrt-$(BOARD)-$(1)-$(2).rmt" || :
-       $(RM) -r $(KDIR)/zyxel.tmp
-endef
-
-define Image/Prepare/amit/squashfs
-       echo -n "0123456789abcdef" > $(KDIR)/root.tmp
-       cat $(KDIR)/root.squashfs >> $(KDIR)/root.tmp
-       dd if=$(KDIR)/root.tmp of=$(KDIR)/root2.tmp bs=64k conv=sync
-       dd if=$(KDIR)/root2.tmp of=$(KDIR)/root.squashfs bs=1 skip=16
-       $(RM) $(KDIR)/root.tmp $(KDIR)/root2.tmp
-       $(call add_jffs2_mark,$(KDIR)/root.squashfs)
-endef
-
-define Image/Build/amit
-       $(call Image/Prepare/amit/$(1))
-       if [ ! -x $(STAGING_DIR_HOST)/bin/amit_makebin ]; then echo "#ERR Please copy the AMIT \"makebin\" tool from http://mgb111.pradnik.net/ as $(STAGING_DIR_HOST)/bin/amit_makebin to build."; fi
-       sh -c "mkdir -p $(KDIR)/amit.tmp/linux_src/arch/i386/boot $(KDIR)/amit.tmp/rom_disk && cd $(KDIR)/amit.tmp && ln -s ../../root.$(1) rom_disk/fs.img && ln -s ../../../../../bzImage linux_src/arch/i386/boot && $(STAGING_DIR_HOST)/bin/amit_makebin && mv upgrade.img $(BIN_DIR)/openwrt-$(BOARD)-$(1)-anas350.bin" || :
-       $(RM) -r $(KDIR)/amit.tmp
-       $(STAGING_DIR_HOST)/bin/makeamitbin -o $(BIN_DIR)/openwrt-$(BOARD)-$(1)-ar360w3g.bin -1 ALK_ATG001 -2 Atropos linux3g $(KDIR)/bzImage ramdisk3g $(KDIR)/root.$(1)
+       rm $(KDIR)/tmp.img $(KDIR)/bzImage.tmp
 endef
 
 define Image/Build/bifferboard
index 4dd4a39..cfd5e65 100755 (executable)
@@ -1,17 +1,11 @@
 #!/usr/bin/perl
 
-$bzimgsize = -s @ARGV[0];
-$padding = 4 - ($bzimgsize + 2) % 4;
-if ($padding == 4) {
-       $padding = 0; }
 open (bzimg, @ARGV[0]);
 while (<bzimg>) { $i .= $_; }
-$i .= "\0"x$padding;
 $i .= pack "v", -(unpack "%v*", $i); 
 print "CSYS";
 print pack("V", length($i));
 print pack("V", 0);
-#-s @ARGV[1]
 print "WRRM";
 print pack("V", length($i));
 print $i;
diff --git a/target/linux/rdc/patches-2.6.30/012-export_erase_write.patch b/target/linux/rdc/patches-2.6.30/012-export_erase_write.patch
new file mode 100644 (file)
index 0000000..2d6feba
--- /dev/null
@@ -0,0 +1,28 @@
+Index: linux-2.6.30.10/drivers/mtd/mtdblock.c
+===================================================================
+--- linux-2.6.30.10.orig/drivers/mtd/mtdblock.c        2010-03-19 00:17:37.000000000 +0100
++++ linux-2.6.30.10/drivers/mtd/mtdblock.c     2010-03-19 00:17:54.000000000 +0100
+@@ -45,7 +45,7 @@
+       wake_up(wait_q);
+ }
+-static int erase_write (struct mtd_info *mtd, unsigned long pos,
++int erase_write (struct mtd_info *mtd, unsigned long pos,
+                       int len, const char *buf)
+ {
+       struct erase_info erase;
+Index: linux-2.6.30.10/include/linux/mtd/mtd.h
+===================================================================
+--- linux-2.6.30.10.orig/include/linux/mtd/mtd.h       2010-03-19 00:17:42.000000000 +0100
++++ linux-2.6.30.10/include/linux/mtd/mtd.h    2010-03-19 00:21:22.000000000 +0100
+@@ -319,6 +319,10 @@
+ int default_mtd_readv(struct mtd_info *mtd, struct kvec *vecs,
+                     unsigned long count, loff_t from, size_t *retlen);
++int erase_write (struct mtd_info *mtd, unsigned long pos,
++                    int len, const char *buf);
++
++
+ #ifdef CONFIG_MTD_PARTITIONS
+ void mtd_erase_callback(struct erase_info *instr);
+ #else
index edda242..e69de29 100644 (file)
@@ -1,3 +0,0 @@
-CONFIG_MTD_PHYSMAP=y
-# CONFIG_MTD_R8610 is not set
-# CONFIG_MTD_RDC3210 is not set