| Message ID | 1440487347-10517-6-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Simon Glass |
| Headers | show |
Hi Bin, On Tue, Aug 25, 2015 at 2:22 AM, Bin Meng <bmeng.cn@gmail.com> wrote: > Since E1000 driver has been converted to driver model, enable it > on Intel Crown Bay. But the Intel Topcliff GbE driver has not been > converted to driver model yet, disable it for now. If you reorder your series a bit you can squash this into the last patch, right? That would be more clear. You can simply move patch 7 & 8 to before this one and you can squash 9 into 6. > Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Hi Joe, On Wed, Aug 26, 2015 at 2:59 AM, Joe Hershberger <joe.hershberger@gmail.com> wrote: > Hi Bin, > > On Tue, Aug 25, 2015 at 2:22 AM, Bin Meng <bmeng.cn@gmail.com> wrote: >> Since E1000 driver has been converted to driver model, enable it >> on Intel Crown Bay. But the Intel Topcliff GbE driver has not been >> converted to driver model yet, disable it for now. > > If you reorder your series a bit you can squash this into the last > patch, right? That would be more clear. You can simply move patch 7 & > 8 to before this one and you can squash 9 into 6. I cannot squash this into the last patch because when patch 7 comes, it breaks Intel Crown Bay board build as non-dm version is gone. That's why you see in this patch when I turned on CONFIG_DM_ETH, I also disabled CONFIG_PCH_GBE (non-dm driver). Then after patch 7 converts the pch_gbe driver to dm, I added that driver back in patch 9. This way it passes buildman testing without breaking bisectability. But if you think we can break such kind of bisectability, I can reorder these patches. > >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Regards, Bin
Hi, On 25 August 2015 at 19:20, Bin Meng <bmeng.cn@gmail.com> wrote: > Hi Joe, > > On Wed, Aug 26, 2015 at 2:59 AM, Joe Hershberger > <joe.hershberger@gmail.com> wrote: >> Hi Bin, >> >> On Tue, Aug 25, 2015 at 2:22 AM, Bin Meng <bmeng.cn@gmail.com> wrote: >>> Since E1000 driver has been converted to driver model, enable it >>> on Intel Crown Bay. But the Intel Topcliff GbE driver has not been >>> converted to driver model yet, disable it for now. >> >> If you reorder your series a bit you can squash this into the last >> patch, right? That would be more clear. You can simply move patch 7 & >> 8 to before this one and you can squash 9 into 6. > > I cannot squash this into the last patch because when patch 7 comes, > it breaks Intel Crown Bay board build as non-dm version is gone. > That's why you see in this patch when I turned on CONFIG_DM_ETH, I > also disabled CONFIG_PCH_GBE (non-dm driver). Then after patch 7 > converts the pch_gbe driver to dm, I added that driver back in patch > 9. This way it passes buildman testing without breaking bisectability. > > But if you think we can break such kind of bisectability, I can > reorder these patches. No, we should keep bisectability. It's just such a pain chasing down regressions otherwise. > >> >>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > Regards, > Bin Regards, Simon
On Tue, Aug 25, 2015 at 9:28 PM, Simon Glass <sjg@chromium.org> wrote: > Hi, > > On 25 August 2015 at 19:20, Bin Meng <bmeng.cn@gmail.com> wrote: >> Hi Joe, >> >> On Wed, Aug 26, 2015 at 2:59 AM, Joe Hershberger >> <joe.hershberger@gmail.com> wrote: >>> Hi Bin, >>> >>> On Tue, Aug 25, 2015 at 2:22 AM, Bin Meng <bmeng.cn@gmail.com> wrote: >>>> Since E1000 driver has been converted to driver model, enable it >>>> on Intel Crown Bay. But the Intel Topcliff GbE driver has not been >>>> converted to driver model yet, disable it for now. >>> >>> If you reorder your series a bit you can squash this into the last >>> patch, right? That would be more clear. You can simply move patch 7 & >>> 8 to before this one and you can squash 9 into 6. >> >> I cannot squash this into the last patch because when patch 7 comes, >> it breaks Intel Crown Bay board build as non-dm version is gone. >> That's why you see in this patch when I turned on CONFIG_DM_ETH, I >> also disabled CONFIG_PCH_GBE (non-dm driver). Then after patch 7 >> converts the pch_gbe driver to dm, I added that driver back in patch >> 9. This way it passes buildman testing without breaking bisectability. >> >> But if you think we can break such kind of bisectability, I can >> reorder these patches. > > No, we should keep bisectability. It's just such a pain chasing down > regressions otherwise. Yep
diff --git a/board/intel/crownbay/crownbay.c b/board/intel/crownbay/crownbay.c index d6de9fa..3a79e69 100644 --- a/board/intel/crownbay/crownbay.c +++ b/board/intel/crownbay/crownbay.c @@ -7,7 +7,6 @@ #include <common.h> #include <asm/ibmpc.h> #include <asm/pnp_def.h> -#include <netdev.h> #include <smsc_lpc47m.h> int board_early_init_f(void) @@ -24,8 +23,3 @@ void setup_pch_gpios(u16 gpiobase, const struct pch_gpio_map *gpio) { return; } - -int board_eth_init(bd_t *bis) -{ - return pci_eth_init(bis); -} diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 6edd710..f027faf 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -19,7 +19,7 @@ CONFIG_OF_CONTROL=y CONFIG_CPU=y CONFIG_DM_PCI=y CONFIG_SPI_FLASH=y -CONFIG_NETDEVICES=y +CONFIG_DM_ETH=y CONFIG_E1000=y CONFIG_VIDEO_VESA=y CONFIG_FRAMEBUFFER_SET_VESA_MODE=y diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index 998da78..a344c85 100644 --- a/include/configs/crownbay.h +++ b/include/configs/crownbay.h @@ -50,7 +50,6 @@ #define CONFIG_CMD_MMC /* Topcliff Gigabit Ethernet */ -#define CONFIG_PCH_GBE #define CONFIG_PHYLIB /* Environment configuration */
Since E1000 driver has been converted to driver model, enable it on Intel Crown Bay. But the Intel Topcliff GbE driver has not been converted to driver model yet, disable it for now. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- board/intel/crownbay/crownbay.c | 6 ------ configs/crownbay_defconfig | 2 +- include/configs/crownbay.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-)