Skip to contentSkip to conversation

Meta update for sys940x, bootlive, and FRI2

PATCH In review Darren Hart 3 participants 13 messages Mar 2, 2012 – Mar 4, 2012

lore
Share & tools
lore
#0 lore raw

cover Meta update for sys940x, bootlive, and FRI2

Pull in the sys940x from the 3.0 tree.
Pull in the boot-live cfg cleanup from the 3.0 tree.
Add FRI2 serial port support.
Move the SMP and EFI features into the scc files rather than specifying them in the recipes.
Finally, breakout the non-hardware features from the fri2 scc file and move them into the fri2-KTYPE scc files.

The following changes since commit 4c648bbbc7d2204d1b24f444aebb10f91c4ecae3:

meta: create pvr feature description (2012-02-27 15:54:53 -0500)

are available in the git repository at:
git://git.infradead.org/users/dvhart/linux-yocto-3.2.git dvhart/meta/fri2
http://git.infradead.org/users/dvhart/linux-yocto-3.2.git/shortlog/refs/heads/dvhart/meta/fri2

Darren Hart (6):
meta: sys940x BSP meta data
Remove boot-live cfg duplication from BSPs
fri2: Drop 8250 from the fri2 scc
eg20t: Enable serial console for the pch_uart
fri2: Add SMP and EFI support
fri2: Move non-hardware optional features out of fri2.scc

 .../cfg/kernel-cache/bsp/cedartrail/cedartrail.cfg |   10 ----
 meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg    |   10 ----
 meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg      |   10 ----
 meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg  |   10 ----
 meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc |    7 +++
 meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc   |    7 +++
 meta/cfg/kernel-cache/bsp/fri2/fri2.cfg            |   10 ----
 meta/cfg/kernel-cache/bsp/fri2/fri2.scc            |   11 +----
 .../bsp/sys940x/sys940x-preempt-rt.scc             |    7 +++
 .../kernel-cache/bsp/sys940x/sys940x-standard.scc  |    6 +++
 meta/cfg/kernel-cache/bsp/sys940x/sys940x.cfg      |   44 ++++++++++++++++++++
 meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc      |   17 ++++++++
 meta/cfg/kernel-cache/cfg/boot-live.cfg            |    3 +
 meta/cfg/kernel-cache/features/eg20t/eg20t.cfg     |    1 +
 14 files changed, 95 insertions(+), 58 deletions(-)
 create mode 100644 meta/cfg/kernel-cache/bsp/sys940x/sys940x-preempt-rt.scc
 create mode 100644 meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc
 create mode 100644 meta/cfg/kernel-cache/bsp/sys940x/sys940x.cfg
 create mode 100644 meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc
Signature · 1 line
1.7.6.5
#1 lore raw

PATCH 1/6 meta: sys940x BSP meta data

From: Darren Hart <[email protected]>

The Inforce SYS940x-ECX Developer-Ready Reference Platform features:
o Intel Atom E6xx (0.6-1.6 GHz)
o Up to 1GB on-board DDR2
o Intel Platform Controller Hub EG20T
o VGA,LVDS
o HD Audio
o SD Card
o Dual SATA
o Mini-PCIe

http://www.inforcecomputing.com/SYS940X_ECX.html

---
 .../bsp/sys940x/sys940x-preempt-rt.scc             |    7 +++
 .../kernel-cache/bsp/sys940x/sys940x-standard.scc  |    6 ++
 meta/cfg/kernel-cache/bsp/sys940x/sys940x.cfg      |   49 ++++++++++++++++++++
 meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc      |   17 +++++++
 4 files changed, 79 insertions(+), 0 deletions(-)
 create mode 100644 meta/cfg/kernel-cache/bsp/sys940x/sys940x-preempt-rt.scc
 create mode 100644 meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc
 create mode 100644 meta/cfg/kernel-cache/bsp/sys940x/sys940x.cfg
 create mode 100644 meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc
meta/cfg/kernel-cache/bsp/sys940x/sys940x-preempt-rt.scc new file +7 -0
new file mode 100644
index 0000000..3b8f0aa
@@ -0,0 +1,7 @@
+define KMACHINE sys940x
+define KTYPE preempt-rt
+define KARCH i386
+
+# no new branch required, re-use the ktypes/preempt-rt branch
+include ktypes/preempt-rt
+include sys940x.scc
meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc new file +6 -0
new file mode 100644
index 0000000..1f0edec
@@ -0,0 +1,6 @@
+define KMACHINE sys940x
+define KTYPE standard
+define KARCH i386
+
+include ktypes/standard
+include sys940x.scc
meta/cfg/kernel-cache/bsp/sys940x/sys940x.cfg new file +49 -0

49 lines not on this page · raw message

meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc new file +17 -0
new file mode 100644
index 0000000..8863c7c
@@ -0,0 +1,17 @@
+kconf hardware sys940x.cfg
+
+git merge yocto/emgd-1.10
+
+include features/eg20t/eg20t.scc
+include features/drm-emgd/drm-emgd.scc
+include features/dmaengine/dmaengine.scc
+include features/serial/8250.scc
+include features/framebuffer/vesafb.scc
+include cfg/usb-mass-storage.scc
+include cfg/boot-live.scc
+include features/power/intel.scc
+
+include features/logbuf/size-normal.scc
+
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
Signature · 1 line
1.7.6.5
#2 lore raw

PATCH 2/6 Remove boot-live cfg duplication from BSPs

In reply to Darren Hart

From: Darren Hart <[email protected]>

Several BSPs duplicated the boot-live fragment in their BSP specific config. Remove the duplication and add CONFIG_RD_GZIP and CONFIG_BLK_DEV_SR to the boot-live fragment.

---
 .../cfg/kernel-cache/bsp/cedartrail/cedartrail.cfg |   10 ----------
 meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg    |   10 ----------
 meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg      |   10 ----------
 meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg  |   10 ----------
 meta/cfg/kernel-cache/bsp/fri2/fri2.cfg            |   10 ----------
 meta/cfg/kernel-cache/bsp/sys940x/sys940x.cfg      |    5 -----
 meta/cfg/kernel-cache/cfg/boot-live.cfg            |    3 +++
 7 files changed, 3 insertions(+), 55 deletions(-)
meta/cfg/kernel-cache/bsp/cedartrail/cedartrail.cfg +0 -10
index 1cc14b1..32cd9e5 100755
@@ -46,13 +46,3 @@ CONFIG_MODULES=y
 CONFIG_SHMEM=y
 CONFIG_TMPFS=y
 CONFIG_PACKET=y
-
-# Needed for booting (and using) USB memory sticks
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-
-CONFIG_RD_GZIP=y
-
-# Needed for booting (and using) CD images
-CONFIG_BLK_DEV_SR=y
meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg +0 -10
index e93c0b8..b101419 100644
@@ -42,13 +42,3 @@ CONFIG_MODULES=y
 CONFIG_SHMEM=y
 CONFIG_TMPFS=y
 CONFIG_PACKET=y
-
-# Needed for booting (and using) USB memory sticks
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-
-CONFIG_RD_GZIP=y
-
-# Needed for booting (and using) CD images
-CONFIG_BLK_DEV_SR=y
meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg +0 -10
index b9704c5..b1e72bd 100644
@@ -40,13 +40,3 @@ CONFIG_MODULES=y
 CONFIG_SHMEM=y
 CONFIG_TMPFS=y
 CONFIG_PACKET=y
-
-# Needed for booting (and using) USB memory sticks
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-
-CONFIG_RD_GZIP=y
-
-# Needed for booting (and using) CD images
-CONFIG_BLK_DEV_SR=y
meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg +0 -10
index e93c0b8..b101419 100644
@@ -42,13 +42,3 @@ CONFIG_MODULES=y
 CONFIG_SHMEM=y
 CONFIG_TMPFS=y
 CONFIG_PACKET=y
-
-# Needed for booting (and using) USB memory sticks
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-
-CONFIG_RD_GZIP=y
-
-# Needed for booting (and using) CD images
-CONFIG_BLK_DEV_SR=y
meta/cfg/kernel-cache/bsp/fri2/fri2.cfg +0 -10
index e93c0b8..b101419 100644
@@ -42,13 +42,3 @@ CONFIG_MODULES=y
 CONFIG_SHMEM=y
 CONFIG_TMPFS=y
 CONFIG_PACKET=y
-
-# Needed for booting (and using) USB memory sticks
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-
-CONFIG_RD_GZIP=y
-
-# Needed for booting (and using) CD images
-CONFIG_BLK_DEV_SR=y
meta/cfg/kernel-cache/bsp/sys940x/sys940x.cfg +0 -5
index 3d45fe8..b101419 100644
@@ -42,8 +42,3 @@ CONFIG_MODULES=y
 CONFIG_SHMEM=y
 CONFIG_TMPFS=y
 CONFIG_PACKET=y
-
-CONFIG_RD_GZIP=y
-
-# Needed for booting (and using) CD images
-CONFIG_BLK_DEV_SR=y
meta/cfg/kernel-cache/cfg/boot-live.cfg +3 -0
index 8ff7674..a102052 100644
@@ -2,5 +2,8 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_VFAT_FS=y
+CONFIG_RD_GZIP=y
+# Needed for booting (and using) CD images
 CONFIG_BLK_DEV_IDECD=y
 CONFIG_ISO9660_FS=y
+CONFIG_BLK_DEV_SR=y
Signature · 1 line
1.7.6.5
#4 lore raw

PATCH 3/6 fri2: Drop 8250 from the fri2 scc

In reply to Darren Hart

From: Darren Hart <[email protected]>

The FRI2 has a pch_uart. Depending on the firmware, the kernel may decide to use the 8250 or the pch_uart driver. As the firmware configures the pch_uart with a non-standard UART clock, it is necessary to ensure the pch_uart is used. To do this, drop the 8250 support from the kernel.

---
 meta/cfg/kernel-cache/bsp/fri2/fri2.scc |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
meta/cfg/kernel-cache/bsp/fri2/fri2.scc +1 -2
index 419bb8d..2dd3170 100644
@@ -4,8 +4,7 @@ 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/serial/8250.scc
+include cfg/dmaengine/dmaengine.scc
 include features/ericsson-3g/f5521gw.scc
 include features/iwlagn/iwlagn.scc
 include cfg/vesafb.scc
Signature · 1 line
1.7.6.5
#5 lore raw

PATCH 4/6 eg20t: Enable serial console for the pch_uart

In reply to Darren Hart

From: Darren Hart <[email protected]>

The FRI2 uses the pch_uart driver for the serial console. Enable the console driver.

---
 meta/cfg/kernel-cache/features/eg20t/eg20t.cfg |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta/cfg/kernel-cache/features/eg20t/eg20t.cfg +1 -0
index ff2f6fd..3d4969c 100644
@@ -3,6 +3,7 @@
 CONFIG_PCH_DMA=y
 
 CONFIG_SERIAL_PCH_UART=y
+CONFIG_SERIAL_PCH_UART_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 
 CONFIG_SPI=y
Signature · 1 line
1.7.6.5
#9 lore raw

PATCH 5/6 fri2: Add SMP and EFI support

In reply to Darren Hart

From: Darren Hart <[email protected]>

Rather than add these as features in the linux-yocto recipe, include them in the BSP meta-data directly. Include only the core EFI bits in the fri2.scc, and add the extended EFI support to the fri2-standard.scc so that other ktypes don't pull in more than what's absolutely required from fri2.scc.

---
 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.scc            |    2 ++
 3 files changed, 4 insertions(+), 0 deletions(-)
meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc +1 -0
index 142d71a..9e9a84c 100644
@@ -5,3 +5,4 @@ define KARCH i386
 # no new branch required, re-use the ktypes/preempt-rt branch
 include ktypes/preempt-rt
 include fri2.scc
+include cfg/efi-ext.scc
meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc +1 -0
index bbb0ebc..b17eca5 100644
@@ -9,3 +9,4 @@ include features/emgd/emgd.scc
 git merge emgd
 
 include fri2.scc
+include cfg/efi-ext.scc
meta/cfg/kernel-cache/bsp/fri2/fri2.scc +2 -0
index 2dd3170..a89a6e2 100644
@@ -11,6 +11,8 @@ include cfg/vesafb.scc
 include cfg/usb-mass-storage.scc
 include cfg/boot-live.scc
 include features/power/intel.scc
+include cfg/smp.scc
+include cfg/efi.scc
 
 include features/logbuf/size-normal.scc
 
Signature · 1 line
1.7.6.5
#11 lore raw

PATCH 6/6 fri2: Move non-hardware optional features out of fri2.scc

In reply to Darren Hart

From: Darren Hart <[email protected]>

Move policy features out of fri2.scc and into the fri2-KTYPE.scc files. This allows KTYPEs like tiny to build smaller kernels while still reusing the fri2.scc file.

---
 meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc |    6 ++++++
 meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc   |    6 ++++++
 meta/cfg/kernel-cache/bsp/fri2/fri2.scc            |    6 ------
 3 files changed, 12 insertions(+), 6 deletions(-)
meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc +6 -0
index 9e9a84c..1a9e638 100644
@@ -5,4 +5,10 @@ define KARCH i386
 # no new branch required, re-use the ktypes/preempt-rt branch
 include ktypes/preempt-rt
 include fri2.scc
+
+# default policy for preempt-rt kernels
+include cfg/boot-live.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
 include cfg/efi-ext.scc
meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc +6 -0
index b17eca5..66b87ce 100644
@@ -9,4 +9,10 @@ include features/emgd/emgd.scc
 git merge emgd
 
 include fri2.scc
+
+# default policy for standard kernels
+include cfg/boot-live.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
 include cfg/efi-ext.scc
meta/cfg/kernel-cache/bsp/fri2/fri2.scc +0 -6
index a89a6e2..62ad14b 100644
@@ -9,12 +9,6 @@ include features/ericsson-3g/f5521gw.scc
 include features/iwlagn/iwlagn.scc
 include cfg/vesafb.scc
 include cfg/usb-mass-storage.scc
-include cfg/boot-live.scc
 include features/power/intel.scc
 include cfg/smp.scc
 include cfg/efi.scc
-
-include features/logbuf/size-normal.scc
-
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
Signature · 1 line
1.7.6.5
#3 lore raw

Re: [PATCH 2/6] Remove boot-live cfg duplication from BSPs

In reply to Darren Hart
Quoted 5 lines · Darren Hart

From: Darren Hart<[email protected]>

Several BSPs duplicated the boot-live fragment in their BSP specific config. Remove the duplication and add CONFIG_RD_GZIP and CONFIG_BLK_DEV_SR to the boot-live fragment.

Looks fine to me as well. That's a better place for the common options.

Bruce

Quoted 129 lines
---
  .../cfg/kernel-cache/bsp/cedartrail/cedartrail.cfg |   10 ----------
  meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg    |   10 ----------
  meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg      |   10 ----------
  meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg  |   10 ----------
  meta/cfg/kernel-cache/bsp/fri2/fri2.cfg            |   10 ----------
  meta/cfg/kernel-cache/bsp/sys940x/sys940x.cfg      |    5 -----
  meta/cfg/kernel-cache/cfg/boot-live.cfg            |    3 +++
  7 files changed, 3 insertions(+), 55 deletions(-)
meta/cfg/kernel-cache/bsp/cedartrail/cedartrail.cfg +0 -10
index 1cc14b1..32cd9e5 100755
@@ -46,13 +46,3 @@ CONFIG_MODULES=y
  CONFIG_SHMEM=y
  CONFIG_TMPFS=y
  CONFIG_PACKET=y
-
-# Needed for booting (and using) USB memory sticks
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-
-CONFIG_RD_GZIP=y
-
-# Needed for booting (and using) CD images
-CONFIG_BLK_DEV_SR=y
meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg +0 -10
index e93c0b8..b101419 100644
@@ -42,13 +42,3 @@ CONFIG_MODULES=y
  CONFIG_SHMEM=y
  CONFIG_TMPFS=y
  CONFIG_PACKET=y
-
-# Needed for booting (and using) USB memory sticks
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-
-CONFIG_RD_GZIP=y
-
-# Needed for booting (and using) CD images
-CONFIG_BLK_DEV_SR=y
meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg +0 -10
index b9704c5..b1e72bd 100644
@@ -40,13 +40,3 @@ CONFIG_MODULES=y
  CONFIG_SHMEM=y
  CONFIG_TMPFS=y
  CONFIG_PACKET=y
-
-# Needed for booting (and using) USB memory sticks
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-
-CONFIG_RD_GZIP=y
-
-# Needed for booting (and using) CD images
-CONFIG_BLK_DEV_SR=y
meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg +0 -10
index e93c0b8..b101419 100644
@@ -42,13 +42,3 @@ CONFIG_MODULES=y
  CONFIG_SHMEM=y
  CONFIG_TMPFS=y
  CONFIG_PACKET=y
-
-# Needed for booting (and using) USB memory sticks
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-
-CONFIG_RD_GZIP=y
-
-# Needed for booting (and using) CD images
-CONFIG_BLK_DEV_SR=y
meta/cfg/kernel-cache/bsp/fri2/fri2.cfg +0 -10
index e93c0b8..b101419 100644
@@ -42,13 +42,3 @@ CONFIG_MODULES=y
  CONFIG_SHMEM=y
  CONFIG_TMPFS=y
  CONFIG_PACKET=y
-
-# Needed for booting (and using) USB memory sticks
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-
-CONFIG_RD_GZIP=y
-
-# Needed for booting (and using) CD images
-CONFIG_BLK_DEV_SR=y
meta/cfg/kernel-cache/bsp/sys940x/sys940x.cfg +0 -5
index 3d45fe8..b101419 100644
@@ -42,8 +42,3 @@ CONFIG_MODULES=y
  CONFIG_SHMEM=y
  CONFIG_TMPFS=y
  CONFIG_PACKET=y
-
-CONFIG_RD_GZIP=y
-
-# Needed for booting (and using) CD images
-CONFIG_BLK_DEV_SR=y
meta/cfg/kernel-cache/cfg/boot-live.cfg +3 -0
index 8ff7674..a102052 100644
@@ -2,5 +2,8 @@ CONFIG_BLK_DEV_LOOP=y
  CONFIG_NLS_CODEPAGE_437=y
  CONFIG_NLS_ISO8859_1=y
  CONFIG_VFAT_FS=y
+CONFIG_RD_GZIP=y
+# Needed for booting (and using) CD images
  CONFIG_BLK_DEV_IDECD=y
  CONFIG_ISO9660_FS=y
+CONFIG_BLK_DEV_SR=y
#6 lore raw

Re: [PATCH 4/6] eg20t: Enable serial console for the pch_uart

In reply to Darren Hart
Quoted 4 lines · Darren Hart

From: Darren Hart<[email protected]>

The FRI2 uses the pch_uart driver for the serial console. Enable the console driver.

It this safe for all eg20t users ? I see the crownbay also uses this.

Bruce

Quoted 18 lines
---
  meta/cfg/kernel-cache/features/eg20t/eg20t.cfg |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
meta/cfg/kernel-cache/features/eg20t/eg20t.cfg +1 -0
index ff2f6fd..3d4969c 100644
@@ -3,6 +3,7 @@
  CONFIG_PCH_DMA=y
 
  CONFIG_SERIAL_PCH_UART=y
+CONFIG_SERIAL_PCH_UART_CONSOLE=y
  CONFIG_SERIAL_CORE=y
 
  CONFIG_SPI=y
#10 lore raw

Re: [PATCH 5/6] fri2: Add SMP and EFI support

In reply to Darren Hart
Quoted 7 lines · Darren Hart

From: Darren Hart<[email protected]>

Rather than add these as features in the linux-yocto recipe, include them in the BSP meta-data directly. Include only the core EFI bits in the fri2.scc, and add the extended EFI support to the fri2-standard.scc so that other ktypes don't pull in more than what's absolutely required from fri2.scc.

Ack'd. Looks good.

Bruce

Quoted 39 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.scc            |    2 ++
  3 files changed, 4 insertions(+), 0 deletions(-)
meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc +1 -0
index 142d71a..9e9a84c 100644
@@ -5,3 +5,4 @@ define KARCH i386
  # no new branch required, re-use the ktypes/preempt-rt branch
  include ktypes/preempt-rt
  include fri2.scc
+include cfg/efi-ext.scc
meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc +1 -0
index bbb0ebc..b17eca5 100644
@@ -9,3 +9,4 @@ include features/emgd/emgd.scc
  git merge emgd
 
  include fri2.scc
+include cfg/efi-ext.scc
meta/cfg/kernel-cache/bsp/fri2/fri2.scc +2 -0
index 2dd3170..a89a6e2 100644
@@ -11,6 +11,8 @@ include cfg/vesafb.scc
  include cfg/usb-mass-storage.scc
  include cfg/boot-live.scc
  include features/power/intel.scc
+include cfg/smp.scc
+include cfg/efi.scc
 
  include features/logbuf/size-normal.scc
 
#12 lore raw

Re: [PATCH 6/6] fri2: Move non-hardware optional features out of fri2.scc

In reply to Darren Hart
Quoted 5 lines · Darren Hart

From: Darren Hart<[email protected]>

Move policy features out of fri2.scc and into the fri2-KTYPE.scc files. This allows KTYPEs like tiny to build smaller kernels while still reusing the fri2.scc file.

Exactly. Good factoring of the options.

I had one question on the series, but I've merged it all anyway. If we need to change the PCH console one, I'll revisit it later.

Cheers,

Bruce

Quoted 55 lines
---
  meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc |    6 ++++++
  meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc   |    6 ++++++
  meta/cfg/kernel-cache/bsp/fri2/fri2.scc            |    6 ------
  3 files changed, 12 insertions(+), 6 deletions(-)
meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc +6 -0
index 9e9a84c..1a9e638 100644
@@ -5,4 +5,10 @@ define KARCH i386
  # no new branch required, re-use the ktypes/preempt-rt branch
  include ktypes/preempt-rt
  include fri2.scc
+
+# default policy for preempt-rt kernels
+include cfg/boot-live.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
  include cfg/efi-ext.scc
meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc +6 -0
index b17eca5..66b87ce 100644
@@ -9,4 +9,10 @@ include features/emgd/emgd.scc
  git merge emgd
 
  include fri2.scc
+
+# default policy for standard kernels
+include cfg/boot-live.scc
+include features/logbuf/size-normal.scc
+include features/latencytop/latencytop.scc
+include features/profiling/profiling.scc
  include cfg/efi-ext.scc
meta/cfg/kernel-cache/bsp/fri2/fri2.scc +0 -6
index a89a6e2..62ad14b 100644
@@ -9,12 +9,6 @@ include features/ericsson-3g/f5521gw.scc
  include features/iwlagn/iwlagn.scc
  include cfg/vesafb.scc
  include cfg/usb-mass-storage.scc
-include cfg/boot-live.scc
  include features/power/intel.scc
  include cfg/smp.scc
  include cfg/efi.scc
-
-include features/logbuf/size-normal.scc
-
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
#7 lore raw

Re: [PATCH 4/6] eg20t: Enable serial console for the pch_uart

In reply to Bruce Ashfield
Quoted 8 lines · Bruce Ashfield
Quoted 4 lines · Darren Hart

From: Darren Hart<[email protected]>

The FRI2 uses the pch_uart driver for the serial console. Enable the console driver.

It this safe for all eg20t users ? I see the crownbay also uses this.

It is safe. The new code that this enables is machine specific. The console code would only kick in if the console is set to ttyPCH1, which it obviously isn't as that didn't work before. Shouldn't be a problem.

--
Darren

Quoted 25 lines

Bruce

Quoted 11 lines
---
  meta/cfg/kernel-cache/features/eg20t/eg20t.cfg |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
meta/cfg/kernel-cache/features/eg20t/eg20t.cfg +0 -0
index ff2f6fd..3d4969c 100644

meta/cfg/kernel-cache/features/eg20t/eg20t.cfg line 9

Quoted 7 lines
meta/cfg/kernel-cache/features/eg20t/eg20t.cfg +1 -0
@@ -3,6 +3,7 @@
  CONFIG_PCH_DMA=y
 
  CONFIG_SERIAL_PCH_UART=y
+CONFIG_SERIAL_PCH_UART_CONSOLE=y
  CONFIG_SERIAL_CORE=y
 
  CONFIG_SPI=y

_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

Signature · 3 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
#8 lore raw

Re: [PATCH 4/6] eg20t: Enable serial console for the pch_uart

Quoted 9 lines · Darren Hart
Quoted 6 lines · Bruce Ashfield
Quoted 4 lines · Darren Hart

From: Darren Hart<[email protected]>

The FRI2 uses the pch_uart driver for the serial console. Enable the console driver.

Quoted 6 lines
Quoted 2 lines

It this safe for all eg20t users ? I see the crownbay also uses this.

It is safe. The new code that this enables is machine specific. The console code would only kick in if the console is set to ttyPCH1, which it obviously isn't as that didn't work before. Shouldn't be a problem.

Perfect. Thanks for the confirmation.

Bruce

Quoted 31 lines

--
Darren

Quoted 25 lines

Bruce

Quoted 11 lines
---
   meta/cfg/kernel-cache/features/eg20t/eg20t.cfg |    1 +
   1 files changed, 1 insertions(+), 0 deletions(-)
meta/cfg/kernel-cache/features/eg20t/eg20t.cfg +0 -0
index ff2f6fd..3d4969c 100644

meta/cfg/kernel-cache/features/eg20t/eg20t.cfg line 9

Quoted 7 lines
meta/cfg/kernel-cache/features/eg20t/eg20t.cfg +1 -0
@@ -3,6 +3,7 @@
   CONFIG_PCH_DMA=y
 
   CONFIG_SERIAL_PCH_UART=y
+CONFIG_SERIAL_PCH_UART_CONSOLE=y
   CONFIG_SERIAL_CORE=y
 
   CONFIG_SPI=y

_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto