[linux-yocto] [PATCH 7/8] meta/common-pc*: Refactor common-pc-64 to reuse common-pc drivers

Sat Sep 7 01:04:15 PDT 2013

On Fri, 2013-09-06 at 19:18 -0400, Paul Gortmaker wrote:
> [[linux-yocto] [PATCH 7/8] meta/common-pc*: Refactor common-pc-64 to reuse common-pc drivers] On 06/09/2013 (Fri 15:44) Darren Hart wrote:
> 
> > Factor out the x86_64 CPU-specific options into common-pc-64-cpu.cfg and
> > move any missing driver CONFIGs into common-pc-drivers.cfg. Reuse the
> > eth, wifi, gfx, and drivers config fragments from common-pc. Remove
> > common-pc-64-graphics.cfg.
> > 
> > Signed-off-by: Darren Hart <dvhart at linux.intel.com>
> > ---
> >  .../{common-pc-64.cfg => common-pc-64-cpu.cfg}     |   45 --------------------
> >  .../bsp/common-pc-64/common-pc-64-graphics.cfg     |   10 -----
> >  .../kernel-cache/bsp/common-pc-64/common-pc-64.scc |    7 ++-
> >  .../bsp/common-pc/common-pc-drivers.cfg            |   18 ++++++++
> >  4 files changed, 23 insertions(+), 57 deletions(-)
> >  rename meta/cfg/kernel-cache/bsp/common-pc-64/{common-pc-64.cfg => common-pc-64-cpu.cfg} (56%)
> >  delete mode 100644 meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-graphics.cfg
> > 
> > diff --git a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.cfg b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-cpu.cfg
> > similarity index 56%
> > rename from meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.cfg
> > rename to meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-cpu.cfg
> > index a19ccce..e44b958 100644
> > --- a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.cfg
> > +++ b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-cpu.cfg
> > @@ -16,54 +16,9 @@ CONFIG_64BIT=y
> >  CONFIG_SMP=y
> >  CONFIG_MCORE2=y
> >  CONFIG_IA32_EMULATION=y
> > -CONFIG_PCI=y
> > -CONFIG_PCI_MSI=y
> > -CONFIG_PCIEPORTBUS=y
> 
> I'd disagree with saying that PCI and MSI are "drivers".  So they
> perhaps should not be removed from the parent file.
> 
> If you want to create a cpu.cfg, then perhaps also create a bus.cfg
> file too for options like these?

Generally speaking I was trying to only create new files if there were a
reasonable number options. I think 3 is too few and is better left in
the more common file. Maybe "drivers" wasn't the best name.... but I
think it's adequate? I was also trying to keep the change more or less
limited to what I was working on, but I just couldn't take all the
duplication between common-pc and common-pc-64.

--
Darren

> 
> P.
> --
> 
> > -
> >  CONFIG_MICROCODE=y
> >  CONFIG_X86_MSR=y
> >  CONFIG_X86_CPUID=y
> >  CONFIG_SCHED_SMT=y
> >  CONFIG_NR_CPUS=24
> > -
> >  CONFIG_PM=y
> > -# CONFIG_ACPI_AC is not set
> > -# CONFIG_ACPI_BATTERY is not set
> > -
> > -CONFIG_ATA=y
> > -CONFIG_SATA_AHCI=y
> > -CONFIG_ATA_PIIX=y
> > -
> > -CONFIG_BLK_DEV_FD=m
> > -
> > -CONFIG_MII=y
> > -CONFIG_TIGON3=y
> > -
> > -CONFIG_RTC_CLASS=y
> > -CONFIG_RTC_DRV_CMOS=y
> > -
> > -CONFIG_PARPORT=m
> > -CONFIG_PARPORT_PC=m
> > -CONFIG_PRINTER=m
> > -
> > -CONFIG_INPUT_MOUSE=y
> > -CONFIG_MOUSE_PS2=y
> > -
> > -CONFIG_SERIAL_8250=y
> > -CONFIG_SERIAL_8250_CONSOLE=y
> > -CONFIG_SERIAL_8250_PCI=y
> > -CONFIG_SERIAL_8250_PNP=y
> > -
> > -
> > -CONFIG_I2O=m
> > -CONFIG_I2O_CONFIG=m
> > -CONFIG_I2O_CONFIG_OLD_IOCTL=y
> > -CONFIG_I2O_BLOCK=m
> > -CONFIG_I2O_SCSI=m
> > -CONFIG_I2O_PROC=m
> > -
> > -
> > -CONFIG_IDE=y
> > -CONFIG_IDE_GD=y
> > -CONFIG_IDE_GD_ATA=y
> > -CONFIG_BLK_DEV_PIIX=y
> > diff --git a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-graphics.cfg b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-graphics.cfg
> > deleted file mode 100644
> > index aa96161..0000000
> > --- a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-graphics.cfg
> > +++ /dev/null
> > @@ -1,10 +0,0 @@
> > -CONFIG_FB=y
> > -CONFIG_FB_MODE_HELPERS=y
> > -CONFIG_CONNECTOR=y
> > -CONFIG_FB_UVESA=m
> > -
> > -CONFIG_INPUT_EVDEV=y
> > -CONFIG_INPUT_TABLET=y
> > -CONFIG_TABLET_USB_WACOM=y
> > -
> > -CONFIG_FRAMEBUFFER_CONSOLE=y
> > diff --git a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc
> > index 6151da1..29c47dd 100644
> > --- a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc
> > +++ b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc
> > @@ -1,5 +1,8 @@
> > -kconf hardware common-pc-64.cfg
> > -kconf hardware common-pc-64-graphics.cfg
> > +kconf hardware common-pc-64-cpu.cfg
> > +kconf hardware ../common-pc/common-pc-drivers.cfg
> > +kconf hardware ../common-pc/common-pc-eth.cfg
> > +kconf hardware ../common-pc/common-pc-gfx.cfg
> > +kconf hardware ../common-pc/common-pc-wifi.cfg
> >  
> >  include cfg/x86_64.scc
> >  include features/usb/ehci-hcd.scc
> > diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-drivers.cfg b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-drivers.cfg
> > index 26b4a19..e7c99d9 100644
> > --- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-drivers.cfg
> > +++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-drivers.cfg
> > @@ -1,6 +1,7 @@
> >  CONFIG_PCI=y
> >  CONFIG_PCI_GOANY=y
> >  CONFIG_PCIEPORTBUS=y
> > +CONFIG_PCI_MSI=y
> >  
> >  CONFIG_ATA=y
> >  CONFIG_ATA_ACPI=y
> > @@ -19,6 +20,8 @@ CONFIG_SERIO=y
> >  CONFIG_SERIO_I8042=y
> >  CONFIG_SERIO_SERPORT=y
> >  
> > +CONFIG_MOUSE_PS2=y
> > +
> >  CONFIG_RTC_CLASS=y
> >  CONFIG_RTC_DRV_CMOS=y
> >  CONFIG_SERIAL_8250=y
> > @@ -27,6 +30,13 @@ CONFIG_SERIAL_8250_CONSOLE=y
> >  CONFIG_VT=y
> >  CONFIG_VGA_CONSOLE=y
> >  
> > +CONFIG_SERIAL_8250_PCI=y
> > +CONFIG_SERIAL_8250_PNP=y
> > +
> > +CONFIG_PARPORT=m
> > +CONFIG_PARPORT_PC=m
> > +CONFIG_PRINTER=m
> > +
> >  CONFIG_USB_HID=y
> >  CONFIG_USB_HIDDEV=y
> >  CONFIG_USB_SERIAL=y
> > @@ -52,3 +62,11 @@ CONFIG_BLK_DEV_PIIX=y
> >  CONFIG_SATA_AHCI=y
> >  
> >  CONFIG_BLK_DEV_IDECD=y
> > +CONFIG_BLK_DEV_FD=m
> > +
> > +CONFIG_I2O=m
> > +CONFIG_I2O_BLOCK=m
> > +CONFIG_I2O_CONFIG=m
> > +CONFIG_I2O_CONFIG_OLD_IOCTL=y
> > +CONFIG_I2O_PROC=m
> > +CONFIG_I2O_SCSI=m
> > -- 
> > 1.7.9.5
> > 
> > _______________________________________________
> > linux-yocto mailing list
> > linux-yocto at yoctoproject.org
> > https://lists.yoctoproject.org/listinfo/linux-yocto
> _______________________________________________
> linux-yocto mailing list
> linux-yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/linux-yocto

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel