[dvbmediasink] Remove WMV patch.
[vuplus_openvuplus_3.0] / meta-bsp / common / recipes / linux / linux-vuplus-2.6.37 / brcm_mtd_mac.patch
1 diff --git a/arch/mips/brcmstb/board.c b/arch/mips/brcmstb/board.c
2 index f64b8bd..ab1b2d2 100644
3 --- a/arch/mips/brcmstb/board.c
4 +++ b/arch/mips/brcmstb/board.c
5 @@ -40,6 +40,8 @@ unsigned long brcm_mtd_rootfs_start;
6  unsigned long brcm_mtd_rootfs_len;
7  unsigned long brcm_mtd_kernel_start;
8  unsigned long brcm_mtd_kernel_len;
9 +unsigned long brcm_mtd_macaddr_start;
10 +unsigned long brcm_mtd_macaddr_len;
11  unsigned long brcm_mtd_ocap_start;
12  unsigned long brcm_mtd_ocap_len;
13  unsigned long brcm_mtd_flash_size_mb;
14 @@ -795,7 +797,7 @@ int __init board_get_partition_map(struct mtd_partition **p)
15         if (brcm_mtd_rootfs_len == 0)
16                 return -ENODEV;
17  
18 -       nr_parts = 2;
19 +       nr_parts = 3;
20         if (brcm_mtd_kernel_len != 0)
21                 nr_parts++;
22  
23 @@ -816,6 +818,11 @@ int __init board_get_partition_map(struct mtd_partition **p)
24                 ret[2].size = brcm_mtd_kernel_len;
25                 ret[2].name = "kernel";
26         }
27 +       if (brcm_mtd_macaddr_len != 0) {
28 +               ret[3].offset = brcm_mtd_macaddr_start;
29 +               ret[3].size = brcm_mtd_macaddr_len;
30 +               ret[3].name = "mac";
31 +       }
32  
33         *p = ret;
34         return nr_parts;
35 diff --git a/arch/mips/brcmstb/prom.c b/arch/mips/brcmstb/prom.c
36 index 4f4f5ca..a8282b7 100644
37 --- a/arch/mips/brcmstb/prom.c
38 +++ b/arch/mips/brcmstb/prom.c
39 @@ -275,6 +275,8 @@ static void __init __maybe_unused cfe_read_configuration(void)
40         FETCH("LINUX_FFS_SIZE", parse_hex, &brcm_mtd_rootfs_len);
41         FETCH("LINUX_PART_STARTAD", parse_hex, &brcm_mtd_kernel_start);
42         FETCH("LINUX_PART_SIZE", parse_hex, &brcm_mtd_kernel_len);
43 +       FETCH("LINUX_MACADDR_STARTAD", parse_hex, &brcm_mtd_macaddr_start);
44 +       FETCH("LINUX_MACADDR_SIZE", parse_hex, &brcm_mtd_macaddr_len);
45         FETCH("OCAP_PART_STARTAD", parse_hex, &brcm_mtd_ocap_start);
46         FETCH("OCAP_PART_SIZE", parse_hex, &brcm_mtd_ocap_len);
47         FETCH("FLASH_SIZE", parse_ulong, &brcm_mtd_flash_size_mb);
48 diff --git a/arch/mips/include/asm/brcmstb/brcmstb.h b/arch/mips/include/asm/brcmstb/brcmstb.h
49 index 244c59e..02de9f7 100644
50 --- a/arch/mips/include/asm/brcmstb/brcmstb.h
51 +++ b/arch/mips/include/asm/brcmstb/brcmstb.h
52 @@ -789,6 +789,8 @@ extern unsigned long brcm_mtd_rootfs_start;
53  extern unsigned long brcm_mtd_rootfs_len;
54  extern unsigned long brcm_mtd_kernel_start;
55  extern unsigned long brcm_mtd_kernel_len;
56 +extern unsigned long brcm_mtd_macaddr_start;
57 +extern unsigned long brcm_mtd_macaddr_len;
58  extern unsigned long brcm_mtd_ocap_start;
59  extern unsigned long brcm_mtd_ocap_len;
60  extern unsigned long brcm_mtd_flash_size_mb;