mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-27 18:35:55 +02:00
[lantiq] add mtd split and atm patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34129 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
blogic
parent
9f30d0c6bb
commit
b6713eceb3
@ -72,7 +72,6 @@ CONFIG_HW_RANDOM=y
|
|||||||
CONFIG_HZ=250
|
CONFIG_HZ=250
|
||||||
# CONFIG_HZ_100 is not set
|
# CONFIG_HZ_100 is not set
|
||||||
CONFIG_HZ_250=y
|
CONFIG_HZ_250=y
|
||||||
CONFIG_IMAGE_CMDLINE_HACK=y
|
|
||||||
CONFIG_INITRAMFS_SOURCE=""
|
CONFIG_INITRAMFS_SOURCE=""
|
||||||
CONFIG_IRQ_CPU=y
|
CONFIG_IRQ_CPU=y
|
||||||
CONFIG_IRQ_DOMAIN=y
|
CONFIG_IRQ_DOMAIN=y
|
||||||
|
|||||||
230
target/linux/lantiq/patches-3.6/0300-owrt-mtd-split.patch
Normal file
230
target/linux/lantiq/patches-3.6/0300-owrt-mtd-split.patch
Normal file
@ -0,0 +1,230 @@
|
|||||||
|
From 2a295753a10823a47542c779a25bbb1f52c71281 Mon Sep 17 00:00:00 2001
|
||||||
|
From: John Crispin <blogic@openwrt.org>
|
||||||
|
Date: Fri, 3 Aug 2012 10:27:13 +0200
|
||||||
|
Subject: [PATCH 19/25] owrt mtd split
|
||||||
|
|
||||||
|
---
|
||||||
|
.../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 1 +
|
||||||
|
arch/mips/lantiq/setup.c | 7 +
|
||||||
|
drivers/mtd/Kconfig | 4 +
|
||||||
|
drivers/mtd/mtdpart.c | 173 +++++++++++++++++++-
|
||||||
|
4 files changed, 184 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
|
||||||
|
index 1ec8f2a..1ff93cc 100644
|
||||||
|
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
|
||||||
|
index 982a98b..e2f3f3e 100644
|
||||||
|
--- a/drivers/mtd/Kconfig
|
||||||
|
+++ b/drivers/mtd/Kconfig
|
||||||
|
@@ -31,6 +31,10 @@ config MTD_ROOTFS_SPLIT
|
||||||
|
bool "Automatically split 'rootfs' partition for squashfs"
|
||||||
|
default y
|
||||||
|
|
||||||
|
+config MTD_UIMAGE_SPLIT
|
||||||
|
+ bool "Automatically split 'linux' partition into 'kernel' and 'rootfs'"
|
||||||
|
+ default y
|
||||||
|
+
|
||||||
|
config MTD_REDBOOT_PARTS
|
||||||
|
tristate "RedBoot partition table parsing"
|
||||||
|
---help---
|
||||||
|
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
|
||||||
|
index 855b70b..93711e2 100644
|
||||||
|
--- a/drivers/mtd/mtdpart.c
|
||||||
|
+++ b/drivers/mtd/mtdpart.c
|
||||||
|
@@ -867,6 +867,168 @@ static int refresh_rootfs_split(struct mtd_info *mtd)
|
||||||
|
}
|
||||||
|
#endif /* CONFIG_MTD_ROOTFS_SPLIT */
|
||||||
|
|
||||||
|
+#ifdef CONFIG_MTD_UIMAGE_SPLIT
|
||||||
|
+static unsigned long find_uimage_size(struct mtd_info *mtd,
|
||||||
|
+ unsigned long offset)
|
||||||
|
+{
|
||||||
|
+#define UBOOT_MAGIC 0x56190527
|
||||||
|
+ unsigned long magic = 0;
|
||||||
|
+ unsigned long temp;
|
||||||
|
+ size_t len;
|
||||||
|
+ int ret;
|
||||||
|
+
|
||||||
|
+ ret = mtd_read(mtd, offset, 4, &len, (void *)&magic);
|
||||||
|
+ if (ret || len != sizeof(magic))
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ if (le32_to_cpu(magic) != UBOOT_MAGIC)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ ret = mtd_read(mtd, offset + 12, 4, &len, (void *)&temp);
|
||||||
|
+ if (ret || len != sizeof(temp))
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ return temp + 0x40;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static unsigned long find_eva_size(struct mtd_info *mtd,
|
||||||
|
+ unsigned long offset)
|
||||||
|
+{
|
||||||
|
+#define EVA_MAGIC 0xfeed1281
|
||||||
|
+ unsigned long magic = 0;
|
||||||
|
+ unsigned long temp;
|
||||||
|
+ size_t len;
|
||||||
|
+ int ret;
|
||||||
|
+
|
||||||
|
+ ret = mtd_read(mtd, offset, 4, &len, (void *)&magic);
|
||||||
|
+ if (ret || len != sizeof(magic))
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ if (le32_to_cpu(magic) != EVA_MAGIC)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ ret = mtd_read(mtd, offset + 4, 4, &len, (void *)&temp);
|
||||||
|
+ if (ret || len != sizeof(temp))
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ /* add eva header size */
|
||||||
|
+ temp = le32_to_cpu(temp) + 0x18;
|
||||||
|
+
|
||||||
|
+ temp &= ~0xffff;
|
||||||
|
+ temp += 0x10000;
|
||||||
|
+ return temp;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int detect_squashfs_partition(struct mtd_info *mtd, unsigned long offset)
|
||||||
|
+{
|
||||||
|
+ unsigned long temp;
|
||||||
|
+ size_t len;
|
||||||
|
+ int ret;
|
||||||
|
+
|
||||||
|
+ ret = mtd_read(mtd, offset, 4, &len, (void *)&temp);
|
||||||
|
+ if (ret || len != sizeof(temp))
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ return le32_to_cpu(temp) == SQUASHFS_MAGIC;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int detect_eva_squashfs_partition(struct mtd_info *mtd, unsigned long offset)
|
||||||
|
+{
|
||||||
|
+ unsigned long temp;
|
||||||
|
+ size_t len;
|
||||||
|
+ int ret;
|
||||||
|
+
|
||||||
|
+ ret = mtd_read(mtd, offset, 4, &len, (void *)&temp);
|
||||||
|
+ if (ret || len != sizeof(temp))
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ return be32_to_cpu(temp) == SQUASHFS_MAGIC;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static unsigned long find_brnimage_size(struct mtd_info *mtd,
|
||||||
|
+ unsigned long offset)
|
||||||
|
+{
|
||||||
|
+ unsigned long buf[4];
|
||||||
|
+ // Assume at most 2MB of kernel image
|
||||||
|
+ unsigned long end = offset + (2 << 20);
|
||||||
|
+ unsigned long ptr = offset + 0x400 - 12;
|
||||||
|
+ size_t len;
|
||||||
|
+ int ret;
|
||||||
|
+
|
||||||
|
+ while (ptr < end) {
|
||||||
|
+ long size_min = ptr - 0x400 - 12 - offset;
|
||||||
|
+ long size_max = ptr + 12 - offset;
|
||||||
|
+ ret = mtd_read(mtd, ptr, 16, &len, (void *)buf);
|
||||||
|
+ if (ret || len != 16)
|
||||||
|
+ return 0;
|
||||||
|
+
|
||||||
|
+ if (le32_to_cpu(buf[0]) < size_min ||
|
||||||
|
+ le32_to_cpu(buf[0]) > size_max) {
|
||||||
|
+ ptr += 0x400;
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (le32_to_cpu(buf[3]) == SQUASHFS_MAGIC)
|
||||||
|
+ return ptr + 12 - offset;
|
||||||
|
+
|
||||||
|
+ ptr += 0x400;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static int split_uimage(struct mtd_info *mtd,
|
||||||
|
+ const struct mtd_partition *part)
|
||||||
|
+{
|
||||||
|
+ static struct mtd_partition split_partitions[] = {
|
||||||
|
+ {
|
||||||
|
+ .name = "kernel",
|
||||||
|
+ .offset = 0x0,
|
||||||
|
+ .size = 0x0,
|
||||||
|
+ }, {
|
||||||
|
+ .name = "rootfs",
|
||||||
|
+ .offset = 0x0,
|
||||||
|
+ .size = 0x0,
|
||||||
|
+ },
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ split_partitions[0].size = find_uimage_size(mtd, part->offset);
|
||||||
|
+ if (!split_partitions[0].size) {
|
||||||
|
+ split_partitions[0].size = find_eva_size(mtd, part->offset);
|
||||||
|
+ if (!split_partitions[0].size) {
|
||||||
|
+ split_partitions[0].size = find_brnimage_size(mtd, part->offset);
|
||||||
|
+ if (!split_partitions[0].size) {
|
||||||
|
+ printk(KERN_NOTICE "no uImage or brnImage or eva found in linux partition\n");
|
||||||
|
+ return -1;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (detect_eva_squashfs_partition(mtd,
|
||||||
|
+ part->offset
|
||||||
|
+ + split_partitions[0].size)) {
|
||||||
|
+ split_partitions[0].size += 0x100;
|
||||||
|
+ pr_info("found eva dummy squashfs behind kernel\n");
|
||||||
|
+ } else if (!detect_squashfs_partition(mtd,
|
||||||
|
+ part->offset
|
||||||
|
+ + split_partitions[0].size)) {
|
||||||
|
+ split_partitions[0].size &= ~(mtd->erasesize - 1);
|
||||||
|
+ split_partitions[0].size += mtd->erasesize;
|
||||||
|
+ } else {
|
||||||
|
+ pr_info("found squashfs behind kernel\n");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ split_partitions[0].offset = part->offset;
|
||||||
|
+ split_partitions[1].offset = part->offset + split_partitions[0].size;
|
||||||
|
+ split_partitions[1].size = part->size - split_partitions[0].size;
|
||||||
|
+
|
||||||
|
+ add_mtd_partitions(mtd, split_partitions, 2);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* This function, given a master MTD object and a partition table, creates
|
||||||
|
* and registers slave MTD objects which are bound to the master according to
|
||||||
|
@@ -883,7 +1045,7 @@ int add_mtd_partitions(struct mtd_info *master,
|
||||||
|
struct mtd_part *slave;
|
||||||
|
uint64_t cur_offset = 0;
|
||||||
|
int i;
|
||||||
|
-#ifdef CONFIG_MTD_ROOTFS_SPLIT
|
||||||
|
+#if defined(CONFIG_MTD_ROOTFS_SPLIT) || defined(CONFIG_MTD_UIMAGE_SPLIT)
|
||||||
|
int ret;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -900,6 +1062,15 @@ int add_mtd_partitions(struct mtd_info *master,
|
||||||
|
|
||||||
|
add_mtd_device(&slave->mtd);
|
||||||
|
|
||||||
|
+#ifdef CONFIG_MTD_UIMAGE_SPLIT
|
||||||
|
+ if (!strcmp(parts[i].name, "linux")) {
|
||||||
|
+ ret = split_uimage(master, &parts[i]);
|
||||||
|
+
|
||||||
|
+ if (ret)
|
||||||
|
+ printk(KERN_WARNING "Can't split linux partition\n");
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
if (!strcmp(parts[i].name, "rootfs")) {
|
||||||
|
#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
|
||||||
|
if (ROOT_DEV == 0) {
|
||||||
|
--
|
||||||
|
1.7.9.1
|
||||||
|
|
||||||
80
target/linux/lantiq/patches-3.6/0301-owrt-atm.patch
Normal file
80
target/linux/lantiq/patches-3.6/0301-owrt-atm.patch
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
From 8d2a7d1fb561c9cb098c2b13ded34fe0f49dcca5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: John Crispin <blogic@openwrt.org>
|
||||||
|
Date: Fri, 3 Aug 2012 10:27:25 +0200
|
||||||
|
Subject: [PATCH 20/25] owrt atm
|
||||||
|
|
||||||
|
---
|
||||||
|
arch/mips/lantiq/irq.c | 2 ++
|
||||||
|
arch/mips/mm/cache.c | 2 ++
|
||||||
|
net/atm/common.c | 6 ++++++
|
||||||
|
net/atm/proc.c | 2 +-
|
||||||
|
4 files changed, 11 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
|
Index: linux-3.6.6/arch/mips/lantiq/irq.c
|
||||||
|
===================================================================
|
||||||
|
--- linux-3.6.6.orig/arch/mips/lantiq/irq.c 2012-11-08 23:08:47.000000000 +0100
|
||||||
|
+++ linux-3.6.6/arch/mips/lantiq/irq.c 2012-11-08 23:10:32.023843184 +0100
|
||||||
|
@@ -14,6 +14,7 @@
|
||||||
|
#include <linux/of_platform.h>
|
||||||
|
#include <linux/of_address.h>
|
||||||
|
#include <linux/of_irq.h>
|
||||||
|
+#include <linux/module.h>
|
||||||
|
|
||||||
|
#include <asm/bootinfo.h>
|
||||||
|
#include <asm/irq_cpu.h>
|
||||||
|
@@ -107,6 +108,7 @@
|
||||||
|
ltq_icu_w32(im, ltq_icu_r32(im, ier) & ~BIT(offset), ier);
|
||||||
|
ltq_icu_w32(im, BIT(offset), isr);
|
||||||
|
}
|
||||||
|
+EXPORT_SYMBOL(ltq_mask_and_ack_irq);
|
||||||
|
|
||||||
|
static void ltq_ack_irq(struct irq_data *d)
|
||||||
|
{
|
||||||
|
Index: linux-3.6.6/arch/mips/mm/cache.c
|
||||||
|
===================================================================
|
||||||
|
--- linux-3.6.6.orig/arch/mips/mm/cache.c 2012-11-08 23:08:45.000000000 +0100
|
||||||
|
+++ linux-3.6.6/arch/mips/mm/cache.c 2012-11-08 23:09:41.155841939 +0100
|
||||||
|
@@ -58,6 +58,8 @@
|
||||||
|
void (*_dma_cache_inv)(unsigned long start, unsigned long size);
|
||||||
|
|
||||||
|
EXPORT_SYMBOL(_dma_cache_wback_inv);
|
||||||
|
+EXPORT_SYMBOL(_dma_cache_wback);
|
||||||
|
+EXPORT_SYMBOL(_dma_cache_inv);
|
||||||
|
|
||||||
|
#endif /* CONFIG_DMA_NONCOHERENT */
|
||||||
|
|
||||||
|
Index: linux-3.6.6/net/atm/common.c
|
||||||
|
===================================================================
|
||||||
|
--- linux-3.6.6.orig/net/atm/common.c 2012-11-05 09:57:06.000000000 +0100
|
||||||
|
+++ linux-3.6.6/net/atm/common.c 2012-11-08 23:09:41.155841939 +0100
|
||||||
|
@@ -62,11 +62,17 @@
|
||||||
|
write_unlock_irq(&vcc_sklist_lock);
|
||||||
|
}
|
||||||
|
|
||||||
|
+struct sk_buff* (*ifx_atm_alloc_tx)(struct atm_vcc *, unsigned int) = NULL;
|
||||||
|
+EXPORT_SYMBOL(ifx_atm_alloc_tx);
|
||||||
|
+
|
||||||
|
static struct sk_buff *alloc_tx(struct atm_vcc *vcc, unsigned int size)
|
||||||
|
{
|
||||||
|
struct sk_buff *skb;
|
||||||
|
struct sock *sk = sk_atm(vcc);
|
||||||
|
|
||||||
|
+ if (ifx_atm_alloc_tx != NULL)
|
||||||
|
+ return ifx_atm_alloc_tx(vcc, size);
|
||||||
|
+
|
||||||
|
if (sk_wmem_alloc_get(sk) && !atm_may_send(vcc, size)) {
|
||||||
|
pr_debug("Sorry: wmem_alloc = %d, size = %d, sndbuf = %d\n",
|
||||||
|
sk_wmem_alloc_get(sk), size, sk->sk_sndbuf);
|
||||||
|
Index: linux-3.6.6/net/atm/proc.c
|
||||||
|
===================================================================
|
||||||
|
--- linux-3.6.6.orig/net/atm/proc.c 2012-11-05 09:57:06.000000000 +0100
|
||||||
|
+++ linux-3.6.6/net/atm/proc.c 2012-11-08 23:09:41.159841940 +0100
|
||||||
|
@@ -154,7 +154,7 @@
|
||||||
|
static void pvc_info(struct seq_file *seq, struct atm_vcc *vcc)
|
||||||
|
{
|
||||||
|
static const char *const class_name[] = {
|
||||||
|
- "off", "UBR", "CBR", "VBR", "ABR"};
|
||||||
|
+ "off","UBR","CBR","NTR-VBR","ABR","ANY","RT-VBR","UBR+","GFR"};
|
||||||
|
static const char *const aal_name[] = {
|
||||||
|
"---", "1", "2", "3/4", /* 0- 3 */
|
||||||
|
"???", "5", "???", "???", /* 4- 7 */
|
||||||
@ -11,6 +11,7 @@ CONFIG_MTD_NAND_PLATFORM=y
|
|||||||
CONFIG_MTD_NAND_XWAY=y
|
CONFIG_MTD_NAND_XWAY=y
|
||||||
# CONFIG_MTD_PHYSMAP_OF is not set
|
# CONFIG_MTD_PHYSMAP_OF is not set
|
||||||
# CONFIG_MTD_SM_COMMON is not set
|
# CONFIG_MTD_SM_COMMON is not set
|
||||||
|
CONFIG_MTD_UIMAGE_SPLIT=y
|
||||||
# CONFIG_PROC_DEVICETREE is not set
|
# CONFIG_PROC_DEVICETREE is not set
|
||||||
CONFIG_RTL8306_PHY=y
|
CONFIG_RTL8306_PHY=y
|
||||||
CONFIG_SPI=y
|
CONFIG_SPI=y
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user