policy cleanup patches, v2

RFC PATCH In review [email protected] 3 participants 31 messages May 12, 2012 – May 14, 2012

lore

Share & tools

lore

[email protected]

author

2012-05-12 19:42 UTC #0 lore raw

cover policy cleanup patches, v2

From: Tom Zanussi <[email protected]>

This set of patches factors out the policy vs hardware-related config of the common-pc and common-pc-64 along with some meta-intel BSPs.

There are also a couple usb cleanups as well.

This is still an RFC patchset because it's completely untested at this point so shouldn't be pulled in yet.

v2: updated to reflect Darren's comments. This new patchset also adds the usb-mass-storage feature to common-pc and common-pc-64, and at the same time factors out the common SCSI pieces into a new set of scsi features. It also removes options and feature use made redundant by the above changes.

Tom

The following changes since commit 1dfd60fa1250259eed38ae5b2840eb37e3758a1b:
Tom Zanussi (1):
meta/fishriver: move smp options from recipe-space

are available in the git repository at:

git://git.yoctoproject.org/linux-yocto-2.6.37-contrib.git tzanussi/policy-cleanup
http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h=tzanussi/policy-cleanup

Tom Zanussi (22):
meta: add ROOT_HUB_TT config option to the usb/ehci-hcd feature meta/common-pc: use usb features
meta/common-pc-64: use usb features
meta/common-pc: factor out policy-related options meta/common-pc-64: factor out policy-related options meta/crownbay: factor out policy-related options meta/emenlow: factor out policy-related options meta/fishriver: factor out policy-related options meta/jasperforest: factor out policy-related options meta/sugarbay: factor out policy-related options
meta: add scsi feature
meta: add scsi disk feature
meta: factor out SCSI options from the usb-mass-storage feature meta/common-pc: use usb-mass-storage feature
meta: add scsi cdrom feature
meta/common-pc-64: use usb-mass-storage feature meta/common-pc-64: factor out SCSI CDROM option meta/jasperforest: remove redundant features and options meta/sugarbay: remove redundant features and options meta/crownbay: remove redundant features and options meta/emenlow: remove redundant features and options meta/fishriver: remove redundant features and options

 .../bsp/common-pc-64/common-pc-64-preempt-rt.scc   |    7 +++++++
 .../bsp/common-pc-64/common-pc-64-standard.scc     |    7 +++++++
 .../kernel-cache/bsp/common-pc-64/common-pc-64.cfg |    8 --------
 .../kernel-cache/bsp/common-pc-64/common-pc-64.scc |   10 ++++------
 .../bsp/common-pc/common-pc-preempt-rt.scc         |    8 ++++++++
 .../bsp/common-pc/common-pc-standard.scc           |    7 +++++++
 .../kernel-cache/bsp/common-pc/common-pc-tiny.scc  |    5 +----
 meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg  |    8 --------
 meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc  |    7 +++----
 .../bsp/crownbay/crownbay-preempt-rt.scc           |    8 ++++++++
 .../bsp/crownbay/crownbay-standard.scc             |    7 +++++++
 meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg    |    1 -
 meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc    |    8 --------
 .../bsp/emenlow/emenlow-preempt-rt.scc             |    8 ++++++++
 .../kernel-cache/bsp/emenlow/emenlow-standard.scc  |    8 ++++++++
 meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg      |    1 -
 meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc      |    8 --------
 .../bsp/fishriver/fishriver-preempt-rt.scc         |    8 ++++++++
 .../bsp/fishriver/fishriver-standard.scc           |    8 ++++++++
 meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg  |    1 -
 meta/cfg/kernel-cache/bsp/fishriver/fishriver.scc  |    8 --------
 .../bsp/jasperforest/jasperforest-preempt-rt.scc   |    4 ++++
 .../bsp/jasperforest/jasperforest-standard.scc     |    3 +++
 .../kernel-cache/bsp/jasperforest/jasperforest.cfg |    1 -
 .../kernel-cache/bsp/jasperforest/jasperforest.scc |    8 --------
 .../bsp/sugarbay/sugarbay-preempt-rt.scc           |    4 ++++
 .../bsp/sugarbay/sugarbay-standard.scc             |    3 +++
 meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.cfg    |    1 -
 meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.scc    |    8 --------
 meta/cfg/kernel-cache/cfg/usb-mass-storage.cfg     |    2 --
 meta/cfg/kernel-cache/cfg/usb-mass-storage.scc     |    2 ++
 meta/cfg/kernel-cache/features/scsi/cdrom.cfg      |    1 +
 meta/cfg/kernel-cache/features/scsi/cdrom.scc      |    6 ++++++
 meta/cfg/kernel-cache/features/scsi/disk.cfg       |    1 +
 meta/cfg/kernel-cache/features/scsi/disk.scc       |    6 ++++++
 meta/cfg/kernel-cache/features/scsi/scsi.cfg       |    1 +
 meta/cfg/kernel-cache/features/scsi/scsi.scc       |    4 ++++
 meta/cfg/kernel-cache/features/usb/ehci-hcd.cfg    |    1 +
 38 files changed, 120 insertions(+), 77 deletions(-)
 create mode 100644 meta/cfg/kernel-cache/features/scsi/cdrom.cfg
 create mode 100644 meta/cfg/kernel-cache/features/scsi/cdrom.scc
 create mode 100644 meta/cfg/kernel-cache/features/scsi/disk.cfg
 create mode 100644 meta/cfg/kernel-cache/features/scsi/disk.scc
 create mode 100644 meta/cfg/kernel-cache/features/scsi/scsi.cfg
 create mode 100644 meta/cfg/kernel-cache/features/scsi/scsi.scc

[email protected]

author

2012-05-12 19:42 UTC #1 lore raw

PATCH 1/22 meta: add ROOT_HUB_TT config option to the usb/ehci-hcd feature

From: Tom Zanussi <[email protected]>

Add root hub transaction translator support for supporting companion ohci/uhci controllers , which is safe even if the ehci controller doesn't have companion controllers.

Signed-off-by Tom Zanussi <[email protected]>

---
 meta/cfg/kernel-cache/features/usb/ehci-hcd.cfg |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

meta/cfg/kernel-cache/features/usb/ehci-hcd.cfg +1 -0

index 7322dc2..b977248 100644
@@ -1 +1,2 @@
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #2 lore raw

PATCH 2/22 meta/common-pc: use usb features

From: Tom Zanussi <[email protected]>

Use the available ehci and uhci usb features and remove the associated config settings from the top-level common-pc feature.

Signed-off-by Tom Zanussi <[email protected]>

---
 meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg |    5 -----
 meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc |    2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg +0 -5

index d3dac93..db6ffb1 100644
@@ -73,12 +73,7 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_VT=y
 CONFIG_VGA_CONSOLE=y
 
-CONFIG_USB_SUPPORT=y
-CONFIG_USB=y
 CONFIG_USB_DEVICEFS=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HID=y
 CONFIG_USB_HIDDEV=y

meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc +2 -0

index bab45e6..2338ea6 100644
@@ -2,6 +2,8 @@ kconf hardware common-pc.cfg
 kconf hardware common-pc-gfx.cfg
 
 include cfg/boot-live.scc
+include features/usb/ehci-hcd.scc
+include features/usb/uhci-hcd.scc
 include features/intel-e1xxxx/intel-e100.scc
 include features/intel-e1xxxx/intel-e1xxxx.scc
 include features/latencytop/latencytop.scc

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #3 lore raw

PATCH 3/22 meta/common-pc-64: use usb features

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Use the available ehci and uhci usb features and remove the associated config settings from the top-level common-pc feature.

Signed-off-by Tom Zanussi <[email protected]>

---
 .../kernel-cache/bsp/common-pc-64/common-pc-64.cfg |    3 ---
 .../kernel-cache/bsp/common-pc-64/common-pc-64.scc |    2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.cfg +0 -3

index 3b2621e..8d35931 100644
@@ -59,9 +59,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
 
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_UHCI_HCD=y
 CONFIG_USB_STORAGE=y
 # For /proc/bus/usb and lsusb.
 CONFIG_USB_DEVICEFS=y

meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc +2 -0

index b27e793..d0327c5 100644
@@ -4,6 +4,8 @@ kconf hardware common-pc-64-graphics.cfg
 include cfg/boot-live.scc
 
 include features/hpet/hpet.scc
+include features/usb/ehci-hcd.scc
+include features/usb/uhci-hcd.scc
 include features/intel-e1xxxx/intel-e100.scc
 include features/intel-e1xxxx/intel-e1xxxx.scc

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #4 lore raw

PATCH 4/22 meta/common-pc: factor out policy-related options

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Refactor bsp/common-pc/common-pc* to keep hardware-related options in the base common-pc.scc while moving the more 'policy'-related options into the files that include the base common-pc.scc fragment.

This allows the different kernel types to make use of the basic machine support without dragging along possibly unwanted options that fall under the heading of 'policy' for a specific kernel type.

Signed-off-by Tom Zanussi <[email protected]>

---
 .../bsp/common-pc/common-pc-preempt-rt.scc         |    7 +++++++
 .../bsp/common-pc/common-pc-standard.scc           |    6 ++++++
 .../kernel-cache/bsp/common-pc/common-pc-tiny.scc  |    5 +----
 meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc  |    5 +----
 4 files changed, 15 insertions(+), 8 deletions(-)

meta/cfg/kernel-cache/bsp/common-pc/common-pc-preempt-rt.scc +7 -0

index f8716ee..706f669 100644
@@ -4,4 +4,11 @@ define KARCH i386
 
 # no new branch required, re-use the ktypes/preempt-rt branch
 include ktypes/preempt-rt
+
 include bsp/common-pc/common-pc.scc
+
+# default policy for preempt-rt kernels
+include cfg/boot-live.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
+include cfg/virtio.scc

meta/cfg/kernel-cache/bsp/common-pc/common-pc-standard.scc +6 -0

index f5baf52..83d49fd 100644
@@ -6,3 +6,9 @@ include ktypes/standard
 branch common-pc
 
 include common-pc.scc
+
+# default policy for standard kernels
+include cfg/boot-live.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
+include cfg/virtio.scc

meta/cfg/kernel-cache/bsp/common-pc/common-pc-tiny.scc +1 -4

index 8d7a498..900eb27 100644
@@ -5,8 +5,5 @@ define KARCH i386
 include ktypes/tiny
 branch common-pc
 
-# Don't include common-pc.scc directly,
-# it pulls in too many non-hardware options
-kconf hardware common-pc.cfg
-kconf hardware common-pc-gfx.cfg
+include common-pc.scc

meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc +1 -4

index 2338ea6..02ddfd4 100644
@@ -1,11 +1,8 @@
 kconf hardware common-pc.cfg
 kconf hardware common-pc-gfx.cfg
 
-include cfg/boot-live.scc
 include features/usb/ehci-hcd.scc
 include features/usb/uhci-hcd.scc
+include features/usb/ohci-hcd.scc
 include features/intel-e1xxxx/intel-e100.scc
 include features/intel-e1xxxx/intel-e1xxxx.scc
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
-include cfg/virtio.scc

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #5 lore raw

PATCH 5/22 meta/common-pc-64: factor out policy-related options

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Refactor bsp/common-pc-64/common-pc-64* to keep hardware-related options in the base common-pc-64.scc while moving the more 'policy'-related options into the files that include the base common-pc-64.scc fragment.

This allows the different kernel types to make use of the basic machine support without dragging along possibly unwanted options that fall under the heading of 'policy' for a specific kernel type.

Signed-off-by Tom Zanussi <[email protected]>

---
 .../bsp/common-pc-64/common-pc-64-preempt-rt.scc   |    6 ++++++
 .../bsp/common-pc-64/common-pc-64-standard.scc     |    6 ++++++
 .../kernel-cache/bsp/common-pc-64/common-pc-64.scc |    7 +------
 3 files changed, 13 insertions(+), 6 deletions(-)

meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-preempt-rt.scc +6 -0

index ea13b44..8a79dd1 100644
@@ -4,5 +4,11 @@ define KARCH x86_64
 
 # no new branch required, re-use the ktypes/preempt-rt branch
 include ktypes/preempt-rt
+
 include bsp/common-pc-64/common-pc-64.scc
 
+# default policy for preempt-rt kernels
+include cfg/boot-live.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
+include cfg/virtio.scc

meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-standard.scc +6 -0

index aa690cd..dcb1949 100644
@@ -6,3 +6,9 @@ include ktypes/standard
 branch common-pc-64
 
 include common-pc-64.scc
+
+# default policy for standard kernels
+include cfg/boot-live.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
+include cfg/virtio.scc

meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc +1 -6

index d0327c5..82d1af3 100644
@@ -1,14 +1,9 @@
 kconf hardware common-pc-64.cfg
 kconf hardware common-pc-64-graphics.cfg
 
-include cfg/boot-live.scc
-
 include features/hpet/hpet.scc
 include features/usb/ehci-hcd.scc
 include features/usb/uhci-hcd.scc
+include features/usb/ohci-hcd.scc
 include features/intel-e1xxxx/intel-e100.scc
 include features/intel-e1xxxx/intel-e1xxxx.scc
-
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
-include cfg/virtio.scc

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #6 lore raw

PATCH 6/22 meta/crownbay: factor out policy-related options

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Refactor bsp/common-pc/crownbay* to keep hardware-related options in the base crownbay.scc while moving the more 'policy'-related options into the files that include the base crownbay.scc fragment.

This allows the different kernel types to make use of the basic machine support without dragging along possibly unwanted options that fall under the heading of 'policy' for a specific kernel type.

Signed-off-by Tom Zanussi <[email protected]>

---
 .../bsp/crownbay/crownbay-preempt-rt.scc           |    8 ++++++++
 .../bsp/crownbay/crownbay-standard.scc             |    7 +++++++
 meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc    |    8 --------
 3 files changed, 15 insertions(+), 8 deletions(-)

meta/cfg/kernel-cache/bsp/crownbay/crownbay-preempt-rt.scc +8 -0

index d58b4be..11067ef 100644
@@ -4,4 +4,12 @@ define KARCH i386
 
 # no new branch required, re-use the ktypes/preempt-rt branch
 include ktypes/preempt-rt
+
 include crownbay.scc
+
+# default policy for preempt-rt kernels
+include cfg/usb-mass-storage.scc
+include cfg/boot-live.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc

meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc +7 -0

index d6036f7..dd9dbc7 100644
@@ -9,3 +9,10 @@ include features/emgd/emgd-1.10.scc
 git merge emgd-1.10
 
 include crownbay.scc
+
+# default policy for standard kernels
+include cfg/usb-mass-storage.scc
+include cfg/boot-live.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc

meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc +0 -8

index c4bc1a5..08e3083 100644
@@ -8,16 +8,8 @@ include cfg/dmaengine.scc
 include features/serial/8250.scc
 include features/hpet/hpet.scc
 include cfg/vesafb.scc
-include cfg/usb-mass-storage.scc
-include cfg/boot-live.scc
 include cfg/smp.scc
 include features/power/intel.scc
 
-include features/logbuf/size-normal.scc
-
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
-
 include features/usb/ehci-hcd.scc
 include features/usb/ohci-hcd.scc
-include features/usb/uhci-hcd.scc

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #7 lore raw

PATCH 7/22 meta/emenlow: factor out policy-related options

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Refactor bsp/emenlow/emenlow* to keep hardware-related options in the base emenlow.scc while moving the more 'policy'-related options into the files that include the base emenlow.scc fragment.

This allows the different kernel types to make use of the basic machine support without dragging along possibly unwanted options that fall under the heading of 'policy' for a specific kernel type.

Signed-off-by Tom Zanussi <[email protected]>

---
 .../bsp/emenlow/emenlow-preempt-rt.scc             |    8 ++++++++
 .../kernel-cache/bsp/emenlow/emenlow-standard.scc  |    8 ++++++++
 meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc      |    8 --------
 3 files changed, 16 insertions(+), 8 deletions(-)

meta/cfg/kernel-cache/bsp/emenlow/emenlow-preempt-rt.scc +8 -0

index 156e4c6..85d8367 100644
@@ -4,4 +4,12 @@ define KARCH i386
 
 # no new branch required, re-use the ktypes/preempt-rt branch
 include ktypes/preempt-rt
+
 include emenlow.scc
+
+# default policy for preempt-rt kernels
+include cfg/usb-mass-storage.scc
+include cfg/boot-live.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc

meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc +8 -0

index 804b36e..aac1b09 100644
@@ -6,3 +6,11 @@ include ktypes/standard
 branch emenlow
 
 include emenlow.scc
+
+# default policy for standard kernels
+include cfg/usb-mass-storage.scc
+include cfg/boot-live.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
+

meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc +0 -8

index 2967d93..e69c0c5 100644
@@ -6,15 +6,7 @@ include features/intel-e1xxxx/intel-e1xxxx.scc
 include features/drm-psb/drm-psb.scc
 include features/serial/8250.scc
 include cfg/vesafb.scc
-include cfg/usb-mass-storage.scc
-include cfg/boot-live.scc
 include cfg/smp.scc
 
-include features/logbuf/size-normal.scc
-
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
-
 include features/usb/ehci-hcd.scc
-include features/usb/ohci-hcd.scc
 include features/usb/uhci-hcd.scc

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #8 lore raw

PATCH 8/22 meta/fishriver: factor out policy-related options

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Refactor bsp/common-pc/fishriver* to keep hardware-related options in the base fishriver.scc while moving the more 'policy'-related options into the files that include the base fishriver.scc fragment.

This allows the different kernel types to make use of the basic machine support without dragging along possibly unwanted options that fall under the heading of 'policy' for a specific kernel type.

Signed-off-by Tom Zanussi <[email protected]>

---
 .../bsp/fishriver/fishriver-preempt-rt.scc         |    8 ++++++++
 .../bsp/fishriver/fishriver-standard.scc           |    8 ++++++++
 meta/cfg/kernel-cache/bsp/fishriver/fishriver.scc  |    8 --------
 3 files changed, 16 insertions(+), 8 deletions(-)

meta/cfg/kernel-cache/bsp/fishriver/fishriver-preempt-rt.scc +8 -0

index 1a5e46a..f37e1c6 100644
@@ -4,4 +4,12 @@ define KARCH i386
 
 # no new branch required, re-use the ktypes/preempt-rt branch
 include ktypes/preempt-rt
+
 include fishriver.scc
+
+# default policy for preempt-rt kernels
+include cfg/usb-mass-storage.scc
+include cfg/boot-live.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc

meta/cfg/kernel-cache/bsp/fishriver/fishriver-standard.scc +8 -0

index e697d7e..fb2dc25 100644
@@ -9,3 +9,11 @@ include features/emgd/emgd.scc
 git merge emgd
 
 include fishriver.scc
+
+# default policy for standard kernels
+include cfg/usb-mass-storage.scc
+include cfg/boot-live.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
+

meta/cfg/kernel-cache/bsp/fishriver/fishriver.scc +0 -8

index e401274..f06618b 100644
@@ -8,16 +8,8 @@ include features/serial/8250.scc
 include features/hpet/hpet.scc
 include features/ericsson-3g/f5521gw.scc
 include cfg/vesafb.scc
-include cfg/usb-mass-storage.scc
-include cfg/boot-live.scc
 include cfg/smp.scc
 include features/power/intel.scc
 
-include features/logbuf/size-normal.scc
-
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
-
 include features/usb/ehci-hcd.scc
-include features/usb/ohci-hcd.scc
 include features/usb/uhci-hcd.scc

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #9 lore raw

PATCH 9/22 meta/jasperforest: factor out policy-related options

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Refactor bsp/common-pc/jasperforest* to keep hardware-related options in the base jasperforest.scc while moving the more 'policy'-related options into the files that include the base jasperforest.scc fragment.

This allows the different kernel types to make use of the basic machine support without dragging along possibly unwanted options that fall under the heading of 'policy' for a specific kernel type.

Signed-off-by Tom Zanussi <[email protected]>

---
 .../bsp/jasperforest/jasperforest-preempt-rt.scc   |    7 +++++++
 .../bsp/jasperforest/jasperforest-standard.scc     |    6 ++++++
 .../kernel-cache/bsp/jasperforest/jasperforest.scc |    8 --------
 3 files changed, 13 insertions(+), 8 deletions(-)

meta/cfg/kernel-cache/bsp/jasperforest/jasperforest-preempt-rt.scc +7 -0

index 4b5c2ca..b3a6370 100644
@@ -5,4 +5,11 @@ define KARCH x86_64
 # no new branch required, re-use the ktypes/preempt-rt branch
 include ktypes/preempt-rt
 include bsp/common-pc-64/common-pc-64.scc
+
 include jasperforest.scc
+
+# default policy for preempt-rt kernels
+include cfg/usb-mass-storage.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc

meta/cfg/kernel-cache/bsp/jasperforest/jasperforest-standard.scc +6 -0

index baf66d8..ec7a10a 100644
@@ -6,3 +6,9 @@ include bsp/common-pc-64/common-pc-64-standard
 branch jasperforest
 
 include jasperforest.scc
+
+# default policy for standard kernels
+include cfg/usb-mass-storage.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc

meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.scc +0 -8

index 82f0f52..64e4088 100644
@@ -2,14 +2,6 @@ kconf hardware jasperforest.cfg
 
 include features/serial/8250.scc
 include cfg/vesafb.scc
-include cfg/usb-mass-storage.scc
 include features/power/intel.scc
 
-include features/logbuf/size-normal.scc
-
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
-
 include features/usb/ehci-hcd.scc
-include features/usb/ohci-hcd.scc
-include features/usb/uhci-hcd.scc

Signature · 1 line

1.7.0.4

Darren Hart

2012-05-14 16:31 UTC #10 lore raw

Re: [PATCH 09/22] meta/jasperforest: factor out policy-related options

meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.scc kconf hardware jasperforest.cfg · line 15

Quoted 3 lines · On 05/12/2012 12:41 PM, [email protected] wrote:

include features/usb/ehci-hcd.scc
meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.scc +0 -2
-include features/usb/ohci-hcd.scc
-include features/usb/uhci-hcd.scc

Jasper forest is EHCI only?

Signature · 3 lines

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

Tom Zanussi

author

2012-05-14 19:58 UTC #11 lore raw

Re: [PATCH 09/22] meta/jasperforest: factor out policy-related options

Quoted 10 lines · Darren Hart

meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.scc kconf hardware jasperforest.cfg · line 15
Quoted 3 lines · On 05/12/2012 12:41 PM, [email protected] wrote:
include features/usb/ehci-hcd.scc
meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.scc +0 -2
-include features/usb/ohci-hcd.scc
-include features/usb/uhci-hcd.scc
Jasper forest is EHCI only?

Yes, it only has two EHCI controllers. Anyway, all of these features are inherited from common-pc-64, so if anything, the thing to do would be to remove ehci here.

Tom

Darren Hart

2012-05-14 20:16 UTC #12 lore raw

Re: [PATCH 09/22] meta/jasperforest: factor out policy-related options

Quoted 12 lines · Tom Zanussi

Quoted 10 lines · Darren Hart
meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.scc kconf hardware jasperforest.cfg · line 15
Quoted 3 lines · On 05/12/2012 12:41 PM, [email protected] wrote:
include features/usb/ehci-hcd.scc
meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.scc +0 -2
-include features/usb/ohci-hcd.scc
-include features/usb/uhci-hcd.scc
Jasper forest is EHCI only?

Quoted 3 lines

Yes, it only has two EHCI controllers. Anyway, all of these features are inherited from common-pc-64, so if anything, the thing to do would be to remove ehci here.

Ah right.

Signature · 3 lines

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

[email protected]

author

2012-05-12 19:42 UTC #13 lore raw

PATCH 10/22 meta/sugarbay: factor out policy-related options

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Refactor bsp/common-pc/sugarbay* to keep hardware-related options in the base sugarbay.scc while moving the more 'policy'-related options into the files that include the base sugarbay.scc fragment.

This allows the different kernel types to make use of the basic machine support without dragging along possibly unwanted options that fall under the heading of 'policy' for a specific kernel type.

Signed-off-by Tom Zanussi <[email protected]>

---
 .../bsp/sugarbay/sugarbay-preempt-rt.scc           |    7 +++++++
 .../bsp/sugarbay/sugarbay-standard.scc             |    6 ++++++
 meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.scc    |    8 --------
 3 files changed, 13 insertions(+), 8 deletions(-)

meta/cfg/kernel-cache/bsp/sugarbay/sugarbay-preempt-rt.scc +7 -0

index e824f6f..d9df73b 100644
@@ -5,4 +5,11 @@ define KARCH x86_64
 # no new branch required, re-use the ktypes/preempt-rt branch
 include ktypes/preempt-rt
 include bsp/common-pc-64/common-pc-64.scc
+
 include sugarbay.scc
+
+# default policy for preempt-rt kernels
+include cfg/usb-mass-storage.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc

meta/cfg/kernel-cache/bsp/sugarbay/sugarbay-standard.scc +6 -0

index 8c2a19b..421364e 100644
@@ -6,3 +6,9 @@ include bsp/common-pc-64/common-pc-64-standard
 branch sugarbay
 
 include sugarbay.scc
+
+# default policy for standard kernels
+include cfg/usb-mass-storage.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc

meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.scc +0 -8

index 128efd3..dbc2d53 100644
@@ -2,14 +2,6 @@ kconf hardware sugarbay.cfg
 
 include features/i915/i915.scc
 include features/serial/8250.scc
-include cfg/usb-mass-storage.scc
 include features/power/intel.scc
 
-include features/logbuf/size-normal.scc
-
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
-
 include features/usb/ehci-hcd.scc
-include features/usb/ohci-hcd.scc
-include features/usb/uhci-hcd.scc

Signature · 1 line

1.7.0.4

Darren Hart

2012-05-14 16:32 UTC #14 lore raw

Re: [PATCH 10/22] meta/sugarbay: factor out policy-related options

meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.scc kconf hardware sugarbay.cfg · line 15

Quoted 3 lines · On 05/12/2012 12:41 PM, [email protected] wrote:

include features/usb/ehci-hcd.scc
meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.scc +0 -2
-include features/usb/ohci-hcd.scc
-include features/usb/uhci-hcd.scc

EHCI only?

Signature · 3 lines

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

[email protected]

author

2012-05-12 19:42 UTC #15 lore raw

PATCH 11/22 meta: add scsi feature

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Add a feature to enable SCSI support. This also creates a scsi/ directory to contain further SCSI options.

Signed-off-by Tom Zanussi <[email protected]>

---
 meta/cfg/kernel-cache/features/scsi/scsi.cfg |    1 +
 meta/cfg/kernel-cache/features/scsi/scsi.scc |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)
 create mode 100644 meta/cfg/kernel-cache/features/scsi/scsi.cfg
 create mode 100644 meta/cfg/kernel-cache/features/scsi/scsi.scc

meta/cfg/kernel-cache/features/scsi/scsi.cfg new file +1 -0

new file mode 100644
index 0000000..2e9142f
@@ -0,0 +1 @@
+CONFIG_SCSI=y

meta/cfg/kernel-cache/features/scsi/scsi.scc new file +4 -0

new file mode 100644
index 0000000..bd739e8
@@ -0,0 +1,4 @@
+define KFEATURE_DESCRIPTION "Enable options for SCSI support"
+define KFEATURE_COMPATIBILITY board
+
+kconf hardware scsi.cfg

Signature · 1 line

1.7.0.4

Darren Hart

2012-05-14 16:36 UTC #16 lore raw

Re: [PATCH 11/22] meta: add scsi feature

Quoted 19 lines · On 05/12/2012 12:41 PM, [email protected] wrote:

From: Tom Zanussi <[email protected]>
Add a feature to enable SCSI support. This also creates a scsi/ directory to contain further SCSI options.
Signed-off-by Tom Zanussi <[email protected]>
---
 meta/cfg/kernel-cache/features/scsi/scsi.cfg |    1 +
 meta/cfg/kernel-cache/features/scsi/scsi.scc |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)
 create mode 100644 meta/cfg/kernel-cache/features/scsi/scsi.cfg
 create mode 100644 meta/cfg/kernel-cache/features/scsi/scsi.scc
meta/cfg/kernel-cache/features/scsi/scsi.cfg new file +0 -0
new file mode 100644
index 0000000..2e9142f

meta/cfg/kernel-cache/features/scsi/scsi.cfg line 1

Quoted 1 line

meta/cfg/kernel-cache/features/scsi/scsi.cfg new file +1 -0
@@ -0,0 +1 @@
+CONFIG_SCSI=y

There are additional dependencies for this which certain policy configurations may not enable for us. CONFIG_BLOCK for example.

Signature · 3 lines

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

Tom Zanussi

author

2012-05-14 19:55 UTC #17 lore raw

Re: [PATCH 11/22] meta: add scsi feature

Quoted 15 lines · Darren Hart

Quoted 13 lines · On 05/12/2012 12:41 PM, [email protected] wrote:
From: Tom Zanussi <[email protected]>
Add a feature to enable SCSI support. This also creates a scsi/ directory to contain further SCSI options.
Signed-off-by Tom Zanussi <[email protected]>
---
 meta/cfg/kernel-cache/features/scsi/scsi.cfg |    1 +
 meta/cfg/kernel-cache/features/scsi/scsi.scc |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)
 create mode 100644 meta/cfg/kernel-cache/features/scsi/scsi.cfg
 create mode 100644 meta/cfg/kernel-cache/features/scsi/scsi.scc

Quoted 11 lines

meta/cfg/kernel-cache/features/scsi/scsi.cfg line 1
Quoted 7 lines
meta/cfg/kernel-cache/features/scsi/scsi.cfg new file +1 -0
new file mode 100644
index 0000000..2e9142f
@@ -0,0 +1 @@
+CONFIG_SCSI=y
There are additional dependencies for this which certain policy configurations may not enable for us. CONFIG_BLOCK for example.

I only see a CONFIG_BLOCK dependency for CONFIG_SCSI - what are the other 'additional dependencies' you mention?

Tom

Darren Hart

2012-05-14 20:15 UTC #18 lore raw

Re: [PATCH 11/22] meta: add scsi feature

Quoted 28 lines · Tom Zanussi

Quoted 15 lines · Darren Hart
Quoted 13 lines · On 05/12/2012 12:41 PM, [email protected] wrote:
From: Tom Zanussi <[email protected]>
Add a feature to enable SCSI support. This also creates a scsi/ directory to contain further SCSI options.
Signed-off-by Tom Zanussi <[email protected]>
---
 meta/cfg/kernel-cache/features/scsi/scsi.cfg |    1 +
 meta/cfg/kernel-cache/features/scsi/scsi.scc |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)
 create mode 100644 meta/cfg/kernel-cache/features/scsi/scsi.cfg
 create mode 100644 meta/cfg/kernel-cache/features/scsi/scsi.scc
Quoted 11 lines
meta/cfg/kernel-cache/features/scsi/scsi.cfg line 1
Quoted 7 lines
meta/cfg/kernel-cache/features/scsi/scsi.cfg new file +1 -0
new file mode 100644
index 0000000..2e9142f
@@ -0,0 +1 @@
+CONFIG_SCSI=y
There are additional dependencies for this which certain policy configurations may not enable for us. CONFIG_BLOCK for example.

Quoted 4 lines

I only see a CONFIG_BLOCK dependency for CONFIG_SCSI - what are the other 'additional dependencies' you mention?
Tom

What I do is look up each CONFIG_ in menuconfig (the / search) and trace the depends all the way up. For this I only looked at CONFIG_BLK_DEV_SD and CONFIG_SCSI. If CONFIG_BLOCK doesn't have any additional dependencies, then it's just CONFIG_BLOCK.

Signature · 3 lines

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

[email protected]

author

2012-05-12 19:42 UTC #19 lore raw

PATCH 12/22 meta: add scsi disk feature

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Add a feature to enable SCSI disk support.

Signed-off-by Tom Zanussi <[email protected]>

---
 meta/cfg/kernel-cache/features/scsi/disk.cfg |    1 +
 meta/cfg/kernel-cache/features/scsi/disk.scc |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)
 create mode 100644 meta/cfg/kernel-cache/features/scsi/disk.cfg
 create mode 100644 meta/cfg/kernel-cache/features/scsi/disk.scc

meta/cfg/kernel-cache/features/scsi/disk.cfg new file +1 -0

new file mode 100644
index 0000000..e71b9a4
@@ -0,0 +1 @@
+CONFIG_BLK_DEV_SD=y

meta/cfg/kernel-cache/features/scsi/disk.scc new file +6 -0

new file mode 100644
index 0000000..fdda548
@@ -0,0 +1,6 @@
+define KFEATURE_DESCRIPTION "Enable options for SCSI disk support"
+define KFEATURE_COMPATIBILITY board
+
+include scsi.scc
+
+kconf hardware disk.cfg

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #20 lore raw

PATCH 13/22 meta: factor out SCSI options from the usb-mass-storage feature

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Remove the SCSI and BLK_DEV_SD options from usb-mass-storage.cfg and replace them with the corresponding scsi/ features.

Signed-off-by Tom Zanussi <[email protected]>

---
 meta/cfg/kernel-cache/cfg/usb-mass-storage.cfg |    2 --
 meta/cfg/kernel-cache/cfg/usb-mass-storage.scc |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

meta/cfg/kernel-cache/cfg/usb-mass-storage.cfg +0 -2

index f3282e1..abd9712 100644
@@ -2,8 +2,6 @@
 # USB is not explicitly enabled here, since that should be a 
 # per-BSP enablement.
 
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
 CONFIG_USB_STORAGE=y
 CONFIG_VFAT_FS=y
 CONFIG_FAT_FS=y

meta/cfg/kernel-cache/cfg/usb-mass-storage.scc +2 -0

index 882e393..aed330c 100644
@@ -1,4 +1,6 @@
 define KFEATURE_DESCRIPTION "Enable options required for USB mass storage devices"
 define KFEATURE_COMPATIBILITY all
 
+include features/scsi/disk.scc
+
 kconf non-hardware usb-mass-storage.cfg

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #21 lore raw

PATCH 14/22 meta/common-pc: use usb-mass-storage feature

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Add the usb-mass-storage feature and remove the options available in that feature from common-pc.cfg.

Signed-off-by Tom Zanussi <[email protected]>

---
 .../bsp/common-pc/common-pc-preempt-rt.scc         |    1 +
 .../bsp/common-pc/common-pc-standard.scc           |    1 +
 meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg  |    3 ---
 3 files changed, 2 insertions(+), 3 deletions(-)

meta/cfg/kernel-cache/bsp/common-pc/common-pc-preempt-rt.scc +1 -0

index 706f669..53e4d69 100644
@@ -9,6 +9,7 @@ include bsp/common-pc/common-pc.scc
 
 # default policy for preempt-rt kernels
 include cfg/boot-live.scc
+include cfg/usb-mass-storage.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc
 include cfg/virtio.scc

meta/cfg/kernel-cache/bsp/common-pc/common-pc-standard.scc +1 -0

index 83d49fd..a2f2520 100644
@@ -9,6 +9,7 @@ include common-pc.scc
 
 # default policy for standard kernels
 include cfg/boot-live.scc
+include cfg/usb-mass-storage.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc
 include cfg/virtio.scc

meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg +0 -3

index db6ffb1..2293cfe 100644
@@ -27,8 +27,6 @@ CONFIG_PCI=y
 CONFIG_PCI_GOANY=y
 CONFIG_PCIEPORTBUS=y
 
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
 CONFIG_ATA=y
 CONFIG_ATA_ACPI=y
 CONFIG_ATA_SFF=y

@@ -74,7 +72,6 @@ CONFIG_VT=y
 CONFIG_VGA_CONSOLE=y
 
 CONFIG_USB_DEVICEFS=y
-CONFIG_USB_STORAGE=y
 CONFIG_USB_HID=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_SERIAL=y

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #22 lore raw

PATCH 15/22 meta: add scsi cdrom feature

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Add a feature to enable SCSI CDROM support.

Signed-off-by Tom Zanussi <[email protected]>

---
 meta/cfg/kernel-cache/features/scsi/cdrom.cfg |    1 +
 meta/cfg/kernel-cache/features/scsi/cdrom.scc |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)
 create mode 100644 meta/cfg/kernel-cache/features/scsi/cdrom.cfg
 create mode 100644 meta/cfg/kernel-cache/features/scsi/cdrom.scc

meta/cfg/kernel-cache/features/scsi/cdrom.cfg new file +1 -0

new file mode 100644
index 0000000..9c97cec
@@ -0,0 +1 @@
+CONFIG_BLK_DEV_SR=y

meta/cfg/kernel-cache/features/scsi/cdrom.scc new file +6 -0

new file mode 100644
index 0000000..b638ea1
@@ -0,0 +1,6 @@
+define KFEATURE_DESCRIPTION "Enable options for SCSI CDROM support"
+define KFEATURE_COMPATIBILITY board
+
+include scsi.scc
+
+kconf hardware cdrom.cfg

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #23 lore raw

PATCH 16/22 meta/common-pc-64: use usb-mass-storage feature

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Add the usb-mass-storage feature and remove the options available in that feature from common-pc-64.cfg.

Signed-off-by Tom Zanussi <[email protected]>

---
 .../bsp/common-pc-64/common-pc-64-preempt-rt.scc   |    1 +
 .../bsp/common-pc-64/common-pc-64-standard.scc     |    1 +
 .../kernel-cache/bsp/common-pc-64/common-pc-64.cfg |    3 ---
 3 files changed, 2 insertions(+), 3 deletions(-)

meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-preempt-rt.scc +1 -0

index 8a79dd1..970808d 100644
@@ -9,6 +9,7 @@ include bsp/common-pc-64/common-pc-64.scc
 
 # default policy for preempt-rt kernels
 include cfg/boot-live.scc
+include cfg/usb-mass-storage.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc
 include cfg/virtio.scc

meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-standard.scc +1 -0

index dcb1949..d2e73f5 100644
@@ -9,6 +9,7 @@ include common-pc-64.scc
 
 # default policy for standard kernels
 include cfg/boot-live.scc
+include cfg/usb-mass-storage.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc
 include cfg/virtio.scc

meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.cfg +0 -3

index 8d35931..ffb2cbc 100644
@@ -35,8 +35,6 @@ CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
 CONFIG_ATA_PIIX=y
 
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 
 CONFIG_BLK_DEV_FD=m

@@ -59,7 +57,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
 
-CONFIG_USB_STORAGE=y
 # For /proc/bus/usb and lsusb.
 CONFIG_USB_DEVICEFS=y

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #24 lore raw

PATCH 17/22 meta/common-pc-64: factor out SCSI CDROM option

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Remove the BLK_DEV_SR option from common-pc-64.cfg and replace it with the scsi/cdrom feature.

Signed-off-by Tom Zanussi <[email protected]>

---
 .../kernel-cache/bsp/common-pc-64/common-pc-64.cfg |    2 --
 .../kernel-cache/bsp/common-pc-64/common-pc-64.scc |    1 +
 2 files changed, 1 insertions(+), 2 deletions(-)

meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.cfg +0 -2

index ffb2cbc..fb5c349 100644
@@ -35,8 +35,6 @@ CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
 CONFIG_ATA_PIIX=y
 
-CONFIG_BLK_DEV_SR=y
-
 CONFIG_BLK_DEV_FD=m
 
 CONFIG_MII=y

meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc +1 -0

index 82d1af3..0100a82 100644
@@ -7,3 +7,4 @@ include features/usb/uhci-hcd.scc
 include features/usb/ohci-hcd.scc
 include features/intel-e1xxxx/intel-e100.scc
 include features/intel-e1xxxx/intel-e1xxxx.scc
+include features/scsi/cdrom.scc

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #25 lore raw

PATCH 18/22 meta/jasperforest: remove redundant features and options

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Remove features and options already inherited from common-pc-64.

Signed-off-by Tom Zanussi <[email protected]>

---
 .../bsp/jasperforest/jasperforest-preempt-rt.scc   |    3 ---
 .../bsp/jasperforest/jasperforest-standard.scc     |    3 ---
 .../kernel-cache/bsp/jasperforest/jasperforest.cfg |    1 -
 3 files changed, 0 insertions(+), 7 deletions(-)

meta/cfg/kernel-cache/bsp/jasperforest/jasperforest-preempt-rt.scc +0 -3

index b3a6370..7e4568e 100644
@@ -9,7 +9,4 @@ include bsp/common-pc-64/common-pc-64.scc
 include jasperforest.scc
 
 # default policy for preempt-rt kernels
-include cfg/usb-mass-storage.scc
 include features/logbuf/size-normal.scc
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc

meta/cfg/kernel-cache/bsp/jasperforest/jasperforest-standard.scc +0 -3

index ec7a10a..8dfc40d 100644
@@ -8,7 +8,4 @@ branch jasperforest
 include jasperforest.scc
 
 # default policy for standard kernels
-include cfg/usb-mass-storage.scc
 include features/logbuf/size-normal.scc
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc

meta/cfg/kernel-cache/bsp/jasperforest/jasperforest.cfg +0 -1

index e2310a5..fc2b7cc 100644
@@ -13,7 +13,6 @@ CONFIG_PATA_SCH=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_NET=y
-CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_SOUND=y
 CONFIG_SND=y

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #26 lore raw

PATCH 19/22 meta/sugarbay: remove redundant features and options

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Remove features and options already inherited from common-pc-64.

Signed-off-by Tom Zanussi <[email protected]>

---
 .../bsp/sugarbay/sugarbay-preempt-rt.scc           |    3 ---
 .../bsp/sugarbay/sugarbay-standard.scc             |    3 ---
 meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.cfg    |    1 -
 3 files changed, 0 insertions(+), 7 deletions(-)

meta/cfg/kernel-cache/bsp/sugarbay/sugarbay-preempt-rt.scc +0 -3

index d9df73b..0403a60 100644
@@ -9,7 +9,4 @@ include bsp/common-pc-64/common-pc-64.scc
 include sugarbay.scc
 
 # default policy for preempt-rt kernels
-include cfg/usb-mass-storage.scc
 include features/logbuf/size-normal.scc
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc

meta/cfg/kernel-cache/bsp/sugarbay/sugarbay-standard.scc +0 -3

index 421364e..5d6eebe 100644
@@ -8,7 +8,4 @@ branch sugarbay
 include sugarbay.scc
 
 # default policy for standard kernels
-include cfg/usb-mass-storage.scc
 include features/logbuf/size-normal.scc
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc

meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.cfg +0 -1

index 1b370ba..787ee5b 100644
@@ -13,7 +13,6 @@ CONFIG_PATA_SCH=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_NET=y
-CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_SOUND=y
 CONFIG_SND=y

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #27 lore raw

PATCH 20/22 meta/crownbay: remove redundant features and options

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Remove the BLK_DEV_SD option already covered by the usb-mass-storage feature.

Signed-off-by Tom Zanussi <[email protected]>

---
 meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg +0 -1

index 7d1362b..a4ab52b 100644
@@ -15,7 +15,6 @@ CONFIG_PATA_SCH=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_NET=y
-CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_SOUND=y
 CONFIG_SND=y

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #28 lore raw

PATCH 21/22 meta/emenlow: remove redundant features and options

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Remove the BLK_DEV_SD option already covered by the usb-mass-storage feature.

Signed-off-by Tom Zanussi <[email protected]>

---
 meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg +0 -1

index 5090862..51e6174 100644
@@ -14,7 +14,6 @@ CONFIG_PATA_SCH=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_NET=y
-CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_SOUND=y
 CONFIG_SND=y

Signature · 1 line

1.7.0.4

[email protected]

author

2012-05-12 19:42 UTC #29 lore raw

PATCH 22/22 meta/fishriver: remove redundant features and options

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Remove the BLK_DEV_SD option already covered by the usb-mass-storage feature.

Signed-off-by Tom Zanussi <[email protected]>

---
 meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg +0 -1

index d0f6fdd..3ba2fae 100644
@@ -15,7 +15,6 @@ CONFIG_PATA_SCH=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_NET=y
-CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_SOUND=y
 CONFIG_SND=y

Signature · 1 line

1.7.0.4

Bruce Ashfield

2012-05-14 15:22 UTC #30 lore raw

In reply to [email protected]

Quoted 7 lines · On 12-05-12 03:42 PM, [email protected] wrote:

From: Tom Zanussi<[email protected]>
This set of patches factors out the policy vs hardware-related config of the common-pc and common-pc-64 along with some meta-intel BSPs.
There are also a couple usb cleanups as well.

Quoted 8 lines

This is still an RFC patchset because it's completely untested at this point so shouldn't be pulled in yet.
v2: updated to reflect Darren's comments. This new patchset also adds the usb-mass-storage feature to common-pc and common-pc-64, and at the same time factors out the common SCSI pieces into a new set of scsi features. It also removes options and feature use made redundant by the above changes.

I gave this a scan and it looks good to me. I've wanted to break out scsi changes in the past, so the split looks like a good starting point to me. Not knowing every option in the subsystem off by heart, I like to explicitly include something that says "I need a scsi disk or cdrom" .. so I like the clarify.

The USB cleanups look good with me.

Once we get this tested and in tree, I'll experiment with changing some of the hardware/non-hardware designations to required/optional naming and see what the audit subsystem has to say about it. But that's orthogonal to this factoring and cleanup.

Cheers,

Bruce

Quoted 82 lines

Tom
The following changes since commit 1dfd60fa1250259eed38ae5b2840eb37e3758a1b:
Tom Zanussi (1):
meta/fishriver: move smp options from recipe-space
are available in the git repository at:
git://git.yoctoproject.org/linux-yocto-2.6.37-contrib.git tzanussi/policy-cleanup
http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h=tzanussi/policy-cleanup
Tom Zanussi (22):
meta: add ROOT_HUB_TT config option to the usb/ehci-hcd feature meta/common-pc: use usb features
meta/common-pc-64: use usb features
meta/common-pc: factor out policy-related options meta/common-pc-64: factor out policy-related options meta/crownbay: factor out policy-related options meta/emenlow: factor out policy-related options meta/fishriver: factor out policy-related options meta/jasperforest: factor out policy-related options meta/sugarbay: factor out policy-related options
meta: add scsi feature
meta: add scsi disk feature
meta: factor out SCSI options from the usb-mass-storage feature meta/common-pc: use usb-mass-storage feature
meta: add scsi cdrom feature
meta/common-pc-64: use usb-mass-storage feature meta/common-pc-64: factor out SCSI CDROM option meta/jasperforest: remove redundant features and options meta/sugarbay: remove redundant features and options meta/crownbay: remove redundant features and options meta/emenlow: remove redundant features and options meta/fishriver: remove redundant features and options
  .../bsp/common-pc-64/common-pc-64-preempt-rt.scc   |    7 +++++++
  .../bsp/common-pc-64/common-pc-64-standard.scc     |    7 +++++++
  .../kernel-cache/bsp/common-pc-64/common-pc-64.cfg |    8 --------
  .../kernel-cache/bsp/common-pc-64/common-pc-64.scc |   10 ++++------
  .../bsp/common-pc/common-pc-preempt-rt.scc         |    8 ++++++++
  .../bsp/common-pc/common-pc-standard.scc           |    7 +++++++
  .../kernel-cache/bsp/common-pc/common-pc-tiny.scc  |    5 +----
  meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg  |    8 --------
  meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc  |    7 +++----
  .../bsp/crownbay/crownbay-preempt-rt.scc           |    8 ++++++++
  .../bsp/crownbay/crownbay-standard.scc             |    7 +++++++
  meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg    |    1 -
  meta/cfg/kernel-cache/bsp/crownbay/crownbay.scc    |    8 --------
  .../bsp/emenlow/emenlow-preempt-rt.scc             |    8 ++++++++
  .../kernel-cache/bsp/emenlow/emenlow-standard.scc  |    8 ++++++++
  meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg      |    1 -
  meta/cfg/kernel-cache/bsp/emenlow/emenlow.scc      |    8 --------
  .../bsp/fishriver/fishriver-preempt-rt.scc         |    8 ++++++++
  .../bsp/fishriver/fishriver-standard.scc           |    8 ++++++++
  meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg  |    1 -
  meta/cfg/kernel-cache/bsp/fishriver/fishriver.scc  |    8 --------
  .../bsp/jasperforest/jasperforest-preempt-rt.scc   |    4 ++++
  .../bsp/jasperforest/jasperforest-standard.scc     |    3 +++
  .../kernel-cache/bsp/jasperforest/jasperforest.cfg |    1 -
  .../kernel-cache/bsp/jasperforest/jasperforest.scc |    8 --------
  .../bsp/sugarbay/sugarbay-preempt-rt.scc           |    4 ++++
  .../bsp/sugarbay/sugarbay-standard.scc             |    3 +++
  meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.cfg    |    1 -
  meta/cfg/kernel-cache/bsp/sugarbay/sugarbay.scc    |    8 --------
  meta/cfg/kernel-cache/cfg/usb-mass-storage.cfg     |    2 --
  meta/cfg/kernel-cache/cfg/usb-mass-storage.scc     |    2 ++
  meta/cfg/kernel-cache/features/scsi/cdrom.cfg      |    1 +
  meta/cfg/kernel-cache/features/scsi/cdrom.scc      |    6 ++++++
  meta/cfg/kernel-cache/features/scsi/disk.cfg       |    1 +
  meta/cfg/kernel-cache/features/scsi/disk.scc       |    6 ++++++
  meta/cfg/kernel-cache/features/scsi/scsi.cfg       |    1 +
  meta/cfg/kernel-cache/features/scsi/scsi.scc       |    4 ++++
  meta/cfg/kernel-cache/features/usb/ehci-hcd.cfg    |    1 +
  38 files changed, 120 insertions(+), 77 deletions(-)
create mode 100644 meta/cfg/kernel-cache/features/scsi/cdrom.cfg create mode 100644 meta/cfg/kernel-cache/features/scsi/cdrom.scc create mode 100644 meta/cfg/kernel-cache/features/scsi/disk.cfg create mode 100644 meta/cfg/kernel-cache/features/scsi/disk.scc create mode 100644 meta/cfg/kernel-cache/features/scsi/scsi.cfg create mode 100644 meta/cfg/kernel-cache/features/scsi/scsi.scc