fri2: update BSP configuration

PATCH In review Darren Hart 2 participants 9 messages May 25, 2012 – May 29, 2012

lore

Share & tools

lore

Darren Hart

author

2012-05-25 22:21 UTC #0 lore raw

cover fri2: update BSP configuration

The following changes since commit 49f931bc294d5b6be60502bbd448cff5aa766235:

meta/fishriver: remove redundant features and options (2012-05-14 17:10:36 -0500)

are available in the git repository at:
git://git.yoctoproject.org/linux-yocto-2.6.37-contrib dvhart/meta/fri2
http://git.yoctoproject.org/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h=dvhart/meta/fri2

Darren Hart (6):
fri2: Configuration update (usb, wifi, i2c)
iwlwifi: Add a feature for iwlwifi
iwlagn: Correct a comment typo
fri2 update: drop NETDEVICE, e1xxx, usb-mass-storage, add iwlwifi
feature
fri2: add usb-mass-storage to standard and preempt-rt
fri2: update base config

 meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc |    1 +
 meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc   |    1 +
 meta/cfg/kernel-cache/bsp/fri2/fri2.cfg            |   21 +++++++++----------
 meta/cfg/kernel-cache/bsp/fri2/fri2.scc            |    7 ++---
 meta/cfg/kernel-cache/features/iwlagn/iwlagn.scc   |    2 +-
 meta/cfg/kernel-cache/features/iwlwifi/iwlwifi.cfg |    6 +++++
 meta/cfg/kernel-cache/features/iwlwifi/iwlwifi.scc |    6 +++++
 7 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 meta/cfg/kernel-cache/features/iwlwifi/iwlwifi.cfg
 create mode 100644 meta/cfg/kernel-cache/features/iwlwifi/iwlwifi.scc

Signature · 1 line

1.7.5.4

Darren Hart

author

2012-05-25 22:21 UTC #1 lore raw

PATCH 1/6 fri2: Configuration update (usb, wifi, i2c)

o Make use of the new USB HCD fragments
o Drop the unused iwlagn driver
o Add the i2c gpio and accelerometer devices

Signed-off-by Darren Hart <[email protected]>

---
 meta/cfg/kernel-cache/bsp/fri2/fri2.cfg |   14 ++++++++------
 meta/cfg/kernel-cache/bsp/fri2/fri2.scc |    7 +++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

meta/cfg/kernel-cache/bsp/fri2/fri2.cfg +8 -6

index 97ceecd..785877b 100644
@@ -8,15 +8,9 @@ CONFIG_ATA=y
 CONFIG_PCI=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB=y
-CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_MMC_SDHCI_PCI=y
-CONFIG_USB_EHCI_HCD=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_NET=y
-CONFIG_USB_UHCI_HCD=y
-CONFIG_USB_OHCI_HCD=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_SOUND=y

@@ -50,3 +44,11 @@ CONFIG_BT=y
 # Intel 6205 ABGN
 # Build as a module to avoid having to install the firmware into the initrd
 CONFIG_IWLWIFI=m
+
+# I2C GPIO
+CONFIG_GPIO_PCA953X=y
+# I2C Accelerometer
+CONFIG_MISC_DEVICES=y
+CONFIG_I2C=y
+CONFIG_INPUT=y
+CONFIG_SENSORS_LIS3_I2C=y

meta/cfg/kernel-cache/bsp/fri2/fri2.scc +5 -2

index 93814bc..36bb805 100644
@@ -6,9 +6,12 @@ include features/intel-e1xxxx/intel-e1xxxx.scc
 include features/drm-emgd/drm-emgd.scc
 include cfg/dmaengine.scc
 include features/ericsson-3g/f5521gw.scc
-include features/iwlagn/iwlagn.scc
 include cfg/vesafb.scc
-include cfg/usb-mass-storage.scc
 include features/power/intel.scc
 include cfg/smp.scc
 include cfg/efi.scc
+include features/usb/ehci-hcd.scc
+include features/usb/ohci-hcd.scc
+
+# FIXME: this isn't a BSP specific feature
+include cfg/usb-mass-storage.scc

Signature · 1 line

1.7.5.4

Darren Hart

author

2012-05-25 22:21 UTC #2 lore raw

PATCH 2/6 iwlwifi: Add a feature for iwlwifi

In reply to Darren Hart

Basically a copy of iwlagn for the iwlwifi driver.

Signed-off-by Darren Hart <[email protected]>

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

meta/cfg/kernel-cache/features/iwlwifi/iwlwifi.cfg new file +6 -0

new file mode 100644
index 0000000..a275a1d
@@ -0,0 +1,6 @@
+# iwlwifi depends on NETDEVICES (base.cfg), PCI, and MAC80211 (includes WLAN)
+CONFIG_PCI=y
+
+# Intel 6205 ABGN
+# Build as a module to avoid having to install the firmware into the initrd
+CONFIG_IWLWIFI=m

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

new file mode 100644
index 0000000..23b4cc7
@@ -0,0 +1,6 @@
+define KFEATURE_DESCRIPTION "Enable iwlwifi support"
+define KFEATURE_COMPATIBILITY board
+
+kconf hardware iwlwifi.cfg
+
+include features/mac80211/mac80211.scc

Signature · 1 line

1.7.5.4

Darren Hart

author

2012-05-25 22:21 UTC #3 lore raw

PATCH 3/6 iwlagn: Correct a comment typo

In reply to Darren Hart

Comment said iwlan instead of iwlagn, which could cause some confusion when verifying what is required.

Signed-off-by Darren Hart <[email protected]>

---
 meta/cfg/kernel-cache/features/iwlagn/iwlagn.scc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/cfg/kernel-cache/features/iwlagn/iwlagn.scc +1 -1

index 2552f2d..16b2425 100644
@@ -1,4 +1,4 @@
-define KFEATURE_DESCRIPTION "Enable iwlan support"
+define KFEATURE_DESCRIPTION "Enable iwlagn support"
 define KFEATURE_COMPATIBILITY board
 
 kconf hardware iwlagn.cfg

Signature · 1 line

1.7.5.4

Darren Hart

author

2012-05-25 22:21 UTC #4 lore raw

PATCH 4/6 fri2 update: drop NETDEVICE, e1xxx, usb-mass-storage, add iwlwifi feature

In reply to Darren Hart

Drop support for hardware that isn't present on the FRI2 or that is included by other features (such as usb-mass-storage).

Signed-off-by Darren Hart <[email protected]>

---
 meta/cfg/kernel-cache/bsp/fri2/fri2.cfg |    5 -----
 meta/cfg/kernel-cache/bsp/fri2/fri2.scc |    6 +-----
 2 files changed, 1 insertions(+), 10 deletions(-)

meta/cfg/kernel-cache/bsp/fri2/fri2.cfg +0 -5

index 785877b..751956d 100644
@@ -3,7 +3,6 @@ CONFIG_MATOM=y
 CONFIG_PRINTK=y
 
 # Basic hardware support for the box - network, USB, PCI, sound
-CONFIG_NETDEVICES=y
 CONFIG_ATA=y
 CONFIG_PCI=y
 CONFIG_MMC=y

@@ -41,10 +40,6 @@ CONFIG_IEEE802154=y
 # Bluetooth Support
 CONFIG_BT=y
 
-# Intel 6205 ABGN
-# Build as a module to avoid having to install the firmware into the initrd
-CONFIG_IWLWIFI=m
-
 # I2C GPIO
 CONFIG_GPIO_PCA953X=y
 # I2C Accelerometer

meta/cfg/kernel-cache/bsp/fri2/fri2.scc +1 -5

index 36bb805..3af8092 100644
@@ -1,8 +1,6 @@
 kconf hardware fri2.cfg
 
 include features/eg20t/eg20t.scc
-include features/intel-e1xxxx/intel-e100.scc
-include features/intel-e1xxxx/intel-e1xxxx.scc
 include features/drm-emgd/drm-emgd.scc
 include cfg/dmaengine.scc
 include features/ericsson-3g/f5521gw.scc

@@ -12,6 +10,4 @@ include cfg/smp.scc
 include cfg/efi.scc
 include features/usb/ehci-hcd.scc
 include features/usb/ohci-hcd.scc
-
-# FIXME: this isn't a BSP specific feature
-include cfg/usb-mass-storage.scc
+include features/iwlwifi/iwlwifi.scc

Signature · 1 line

1.7.5.4

Darren Hart

author

2012-05-25 22:21 UTC #5 lore raw

PATCH 5/6 fri2: add usb-mass-storage to standard and preempt-rt

In reply to Darren Hart

The standard and preempt-rt kernels both support live boot and are expected to support general use cases. Include support for usb-mass-storage.

Signed-off-by Darren Hart <[email protected]>

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

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

index 2404a78..03f4bf0 100644
@@ -8,6 +8,7 @@ include fri2.scc
 include cfg/efi-ext.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

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

index ed92fa7..cbe5878 100644
@@ -12,6 +12,7 @@ include fri2.scc
 include cfg/efi-ext.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

Signature · 1 line

1.7.5.4

Darren Hart

author

2012-05-25 22:21 UTC #6 lore raw

PATCH 6/6 fri2: update base config

In reply to Darren Hart

Include the USB CDC_NCM driver as built-in. Comment out i2c features that are not yet ready for use.

Signed-off-by Darren Hart <[email protected]>

---
 meta/cfg/kernel-cache/bsp/fri2/fri2.cfg |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

meta/cfg/kernel-cache/bsp/fri2/fri2.cfg +10 -8

index 751956d..586308e 100644
@@ -34,16 +34,18 @@ CONFIG_PACKET=y
 
 # Enable FRI2 Specific Hardware
 # Zigbee 802.15.4 Support
+CONFIG_USB_CDC_NCM=y
 CONFIG_IEEE802154=y
-# CONFIG_IEEE802154_6LOWPAN is not set
+CONFIG_IEEE802154_6LOWPAN=y
 
 # Bluetooth Support
 CONFIG_BT=y
 
-# I2C GPIO
-CONFIG_GPIO_PCA953X=y
-# I2C Accelerometer
-CONFIG_MISC_DEVICES=y
-CONFIG_I2C=y
-CONFIG_INPUT=y
-CONFIG_SENSORS_LIS3_I2C=y
+# FRI2 CPLD I2C bus and devices
+#CONFIG_I2C=y
+#CONFIG_I2C_BOARDINFO=y
+#CONFIG_I2C_CHARDEV=y
+#CONFIG_I2C_KEMPLD=y
+#CONFIG_GPIO_PCA953X=y
+#CONFIG_GPIO_PCA9555_FRI2=y
+#CONFIG_LIS331DLH=y

Signature · 1 line

1.7.5.4

Bruce Ashfield

2012-05-28 20:25 UTC #7 lore raw

In reply to Darren Hart

Quoted 3 lines · Darren Hart

The following changes since commit 49f931bc294d5b6be60502bbd448cff5aa766235:
   meta/fishriver: remove redundant features and options (2012-05-14 17:10:36 -0500)

The series looks good to me. As I mentioned in Tom's pull request, there's a slight question in the order of the changes, since I had some other changes staged for master in the 3.0/3.2 kernel trees.

We'll sort that out and I can do this merge quickly.

Bruce

Quoted 25 lines

are available in the git repository at:
   git://git.yoctoproject.org/linux-yocto-2.6.37-contrib dvhart/meta/fri2
   http://git.yoctoproject.org/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h=dvhart/meta/fri2
Darren Hart (6):
fri2: Configuration update (usb, wifi, i2c)
iwlwifi: Add a feature for iwlwifi
iwlagn: Correct a comment typo
fri2 update: drop NETDEVICE, e1xxx, usb-mass-storage, add iwlwifi
feature
fri2: add usb-mass-storage to standard and preempt-rt
fri2: update base config
  meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc |    1 +
  meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc   |    1 +
  meta/cfg/kernel-cache/bsp/fri2/fri2.cfg            |   21 +++++++++----------
  meta/cfg/kernel-cache/bsp/fri2/fri2.scc            |    7 ++---
  meta/cfg/kernel-cache/features/iwlagn/iwlagn.scc   |    2 +-
  meta/cfg/kernel-cache/features/iwlwifi/iwlwifi.cfg |    6 +++++
  meta/cfg/kernel-cache/features/iwlwifi/iwlwifi.scc |    6 +++++
  7 files changed, 28 insertions(+), 16 deletions(-)
create mode 100644 meta/cfg/kernel-cache/features/iwlwifi/iwlwifi.cfg create mode 100644 meta/cfg/kernel-cache/features/iwlwifi/iwlwifi.scc

Bruce Ashfield

2012-05-29 20:19 UTC #8 lore raw

In reply to Darren Hart

Quoted 8 lines · Darren Hart

The following changes since commit 49f931bc294d5b6be60502bbd448cff5aa766235:

   meta/fishriver: remove redundant features and options (2012-05-14 17:10:36 -0500)

are available in the git repository at:

   git://git.yoctoproject.org/linux-yocto-2.6.37-contrib dvhart/meta/fri2
   http://git.yoctoproject.org/cgit.cgi/linux-yocto-2.6.37-contrib/log/?h=dvhart/meta/fri2

Quoted 8 lines

Darren Hart (6):
fri2: Configuration update (usb, wifi, i2c)
iwlwifi: Add a feature for iwlwifi
iwlagn: Correct a comment typo
fri2 update: drop NETDEVICE, e1xxx, usb-mass-storage, add iwlwifi
feature
fri2: add usb-mass-storage to standard and preempt-rt
fri2: update base config

I've pushed these to the 3.2 kernel tree now. They are on top of the 3.2.18 stable update.

I've also staged them in the upcoming 3.4 kernel.

I'll update SRCREVs in master myself later, but you can use them immediately.

Bruce

Quoted 12 lines

  meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc |    1 +
  meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc   |    1 +
  meta/cfg/kernel-cache/bsp/fri2/fri2.cfg            |   21 +++++++++----------
  meta/cfg/kernel-cache/bsp/fri2/fri2.scc            |    7 ++---
  meta/cfg/kernel-cache/features/iwlagn/iwlagn.scc   |    2 +-
  meta/cfg/kernel-cache/features/iwlwifi/iwlwifi.cfg |    6 +++++
  meta/cfg/kernel-cache/features/iwlwifi/iwlwifi.scc |    6 +++++
  7 files changed, 28 insertions(+), 16 deletions(-)

create mode 100644 meta/cfg/kernel-cache/features/iwlwifi/iwlwifi.cfg create mode 100644 meta/cfg/kernel-cache/features/iwlwifi/iwlwifi.scc