OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 31... Line 31...
31 obj-y += board_common.o 31 obj-y += board_common.o
32 obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o 32 obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o
33 +obj-$(CONFIG_BOARD_LIVEBOX) += board_livebox.o 33 +obj-$(CONFIG_BOARD_LIVEBOX) += board_livebox.o
34 --- a/arch/mips/bcm63xx/boards/board_common.c 34 --- a/arch/mips/bcm63xx/boards/board_common.c
35 +++ b/arch/mips/bcm63xx/boards/board_common.c 35 +++ b/arch/mips/bcm63xx/boards/board_common.c
36 @@ -54,7 +54,7 @@ void __init board_prom_init(void) 36 @@ -55,7 +55,7 @@ void __init board_prom_init(void)
37 if (fw_arg3 == CFE_EPTSEAL) 37 if (fw_arg3 == CFE_EPTSEAL)
38 board_bcm963xx_init(); 38 board_bcm963xx_init();
39 else 39 else
40 - panic("unsupported bootloader detected"); 40 - panic("unsupported bootloader detected");
41 + board_livebox_init(); 41 + board_livebox_init();
Line 55... Line 55...
55 +#endif 55 +#endif
56 + 56 +
57 #endif /* __BOARD_COMMON_H */ 57 #endif /* __BOARD_COMMON_H */
58 --- /dev/null 58 --- /dev/null
59 +++ b/arch/mips/bcm63xx/boards/board_livebox.c 59 +++ b/arch/mips/bcm63xx/boards/board_livebox.c
60 @@ -0,0 +1,155 @@ 60 @@ -0,0 +1,163 @@
61 +/* 61 +/*
62 + * This file is subject to the terms and conditions of the GNU General Public 62 + * This file is subject to the terms and conditions of the GNU General Public
63 + * License. See the file "COPYING" in the main directory of this archive 63 + * License. See the file "COPYING" in the main directory of this archive
64 + * for more details. 64 + * for more details.
65 + * 65 + *
Line 109... Line 109...
109 + .ephy_reset_gpio = 6, 109 + .ephy_reset_gpio = 6,
110 + .ephy_reset_gpio_flags = GPIO_ACTIVE_LOW, 110 + .ephy_reset_gpio_flags = GPIO_ACTIVE_LOW,
111 + 111 +
112 + .has_ohci0 = 1, 112 + .has_ohci0 = 1,
113 + .has_pccard = 1, 113 + .has_pccard = 1,
-   114 +
-   115 + .has_dsp = 0, /*TODO some Liveboxes have dsp*/
-   116 + .dsp = {
-   117 + .gpio_rst = 6,
-   118 + .gpio_int = 35,
-   119 + .cs = 2,
-   120 + .ext_irq = 2,
-   121 + },
114 +}; 122 +};
115 +#endif 123 +#endif
116 + 124 +
117 +/* 125 +/*
118 + * all boards 126 + * all boards