1 diff --git a/Makefile b/Makefile
2 index 002da9a..03831b6 100644
5 @@ -193,7 +193,7 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
6 # Default value for CROSS_COMPILE is not to prefix executables
7 # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
8 export KBUILD_BUILDHOST := $(SUBARCH)
11 CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)
13 # Architecture as present in compile.h
14 diff --git a/drivers/brcmstb/bchip.c b/drivers/brcmstb/bchip.c
15 index b4c5b0b..4f871cd 100644
16 --- a/drivers/brcmstb/bchip.c
17 +++ b/drivers/brcmstb/bchip.c
18 @@ -450,9 +450,14 @@ void __init bchip_early_setup(void)
19 genet_pdata[0].phy_id = BRCM_PHY_ID_AUTO;
22 +#if defined(CONFIG_BCMGENET_0_GPHY)
23 + genet_pdata[0].phy_type = BRCM_PHY_TYPE_EXT_RGMII;
24 + genet_pdata[0].phy_id = BRCM_PHY_ID_AUTO;
26 genet_pdata[0].phy_type = BRCM_PHY_TYPE_INT;
27 genet_pdata[0].phy_id = 1;
33 diff --git a/drivers/net/ethernet/broadcom/genet/Kconfig b/drivers/net/ethernet/broadcom/genet/Kconfig
34 index c1ed960..8e87443 100644
35 --- a/drivers/net/ethernet/broadcom/genet/Kconfig
36 +++ b/drivers/net/ethernet/broadcom/genet/Kconfig
38 menu "BCMGENET options"
40 +config BCMGENET_0_GPHY
41 + bool "GENET0 is connected to GPHY via RGMII"
42 + depends on BCMGENET && BRCM_HAS_GENET_0
45 + Say Y to use an external GPHY for GENET_0. By default this will
46 + use RGMII mode and disable the internal 10/100 PHY (if present);
47 + the pinmux must be set up properly in arch/mips/brcmstb/board.c .
51 +config BCMGENET_1_GPHY
52 + bool "GENET1 is connected to GPHY via RGMII"
53 + depends on BCMGENET && BRCM_HAS_GENET_1
56 + Say Y to use an external GPHY for GENET_1. By default this will
57 + use RGMII mode and disable the internal 10/100 PHY (if present);
58 + the pinmux must be set up properly in arch/mips/brcmstb/board.c .
62 config BCMGENET_RX_DESC_THROTTLE
63 bool "use hardware rx descriptor throttling"