From 43cc8c3ebec4658963d44a6108f8f74e8ccdbb54 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sat, 21 Jun 2014 19:23:38 +0000 Subject: brcm63xx: allow bcm963xx and livebox support at the same time Use the CFE_EPTSEAL to tell them apart at runtime. Added for now only for the 3.14 until properly tested. Signed-off-by: Jonas Gorski SVN-Revision: 41296 --- .../350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/brcm63xx/patches-3.14/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch') diff --git a/target/linux/brcm63xx/patches-3.14/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch b/target/linux/brcm63xx/patches-3.14/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch index 43709af..41747da 100644 --- a/target/linux/brcm63xx/patches-3.14/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch +++ b/target/linux/brcm63xx/patches-3.14/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch @@ -28,9 +28,9 @@ +int bcm63xx_ohci_register(unsigned int num_ports); #endif /* BCM63XX_DEV_USB_OHCI_H_ */ ---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c -+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -965,6 +965,7 @@ int __init board_register_devices(void) +--- a/arch/mips/bcm63xx/boards/board_common.c ++++ b/arch/mips/bcm63xx/boards/board_common.c +@@ -181,6 +181,7 @@ int __init board_register_devices(void) { int button_count = 0; int led_count = 0; @@ -38,8 +38,8 @@ if (board.has_uart0) bcm63xx_uart_register(0); -@@ -987,14 +988,21 @@ int __init board_register_devices(void) - !bcm63xx_nvram_get_mac_address(board.enetsw.mac_addr)) +@@ -203,14 +204,21 @@ int __init board_register_devices(void) + !board_get_mac_address(board.enetsw.mac_addr)) bcm63xx_enetsw_register(&board.enetsw); + if ((board.has_ohci0 || board.has_ehci0)) { -- cgit v1.1