fri2 and sys940x meta updates

Please apply to linux-yocto-3.2 meta branch.

The following changes since commit b14a08f5c7b469a5077c10942f4e1aec171faa9d:

meta: Clean up BSPs kernel config (2012-04-17 16:04:15 -0400)

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

Darren Hart (7):
fri2: Use emgd-1.10 feature and branch
fri2: Cleanup fri2-$KTYPE.scc files re efi-ext.scc
sys940x: Move emgd-1.10 data to the standard scc file
sys940x: Add efi-ext to standard and preempt-rt configs
sys940x: Add common standard and preempt-rt features
sys940x: Use PHYSICAL_START of 0x200000 to boot
sys940x: Cleanup sys940x.scc

 meta/cfg/kernel-cache/bsp/fri2/fri2-preempt-rt.scc |    2 +-
 meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc   |    6 +++---
 .../bsp/sys940x/sys940x-preempt-rt.scc             |    8 ++++++++
 .../kernel-cache/bsp/sys940x/sys940x-standard.scc  |   12 ++++++++++++
 meta/cfg/kernel-cache/bsp/sys940x/sys940x.cfg      |    4 ++++
 meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc      |   10 ++--------
 6 files changed, 30 insertions(+), 12 deletions(-)

1.7.7.6

Update the fri2-standard.scc description to use the new emgd feature and branch name. Without this change the emgd driver is not merged and not built.

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

index 66b87ce..e992db5 100644
@@ -5,8 +5,8 @@ define KARCH i386
 include ktypes/standard
 branch fri2
 
-include features/emgd/emgd.scc
-git merge emgd
+include features/emgd/emgd-1.10.scc
+git merge emgd-1.10
 
 include fri2.scc
 

1.7.7.6

The efi-ext.scc fragment is not part of the standard or preempt-rt standard features. It is instead a BSP specific feature added to these ktypes. Rearrange the meta-data accordingly.

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

index 1a9e638..2404a78 100644
@@ -5,10 +5,10 @@ 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
 
 # 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

index e992db5..ed92fa7 100644
@@ -9,10 +9,10 @@ include features/emgd/emgd-1.10.scc
 git merge emgd-1.10
 
 include fri2.scc
+include cfg/efi-ext.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

1.7.7.6

Make sys940x consistent with crownbay and fri2 by moving the emgd-1.10 includes and merges to the $bsp-standard.scc files.

---
 .../kernel-cache/bsp/sys940x/sys940x-standard.scc  |    3 +++
 meta/cfg/kernel-cache/bsp/sys940x/sys940x.scc      |    2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

index 1f0edec..132e44a 100644
@@ -2,5 +2,8 @@ define KMACHINE sys940x
 define KTYPE standard
 define KARCH i386
 
+include features/emgd/emgd-1.10.scc
+git merge emgd-1.10
+
 include ktypes/standard
 include sys940x.scc

index 557a83d..962b837 100644
@@ -1,7 +1,5 @@
 kconf hardware sys940x.cfg
 
-git merge emgd-1.10
-
 include features/eg20t/eg20t.scc
 include features/drm-emgd/drm-emgd.scc
 include cfg/dmaengine.scc

1.7.7.6

Enable efi-ext in the standard and preempt-rt configs so the recipes do not have to do this explicitly.

---
 .../bsp/sys940x/sys940x-preempt-rt.scc             |    3 +++
 .../kernel-cache/bsp/sys940x/sys940x-standard.scc  |    4 +++-
 2 files changed, 6 insertions(+), 1 deletions(-)

index 3b8f0aa..39fa1d4 100644
@@ -4,4 +4,7 @@ define KARCH i386
 
 # no new branch required, re-use the ktypes/preempt-rt branch
 include ktypes/preempt-rt
+
 include sys940x.scc
+include cfg/efi-ext.scc
+

index 132e44a..23f99fb 100644
@@ -5,5 +5,7 @@ define KARCH i386
 include features/emgd/emgd-1.10.scc
 git merge emgd-1.10
 
-include ktypes/standard
 include sys940x.scc
+include cfg/efi-ext.scc
+
+include ktypes/standard

1.7.7.6

Add the features commonly added to standard and preempt-rt scc files for sys940x as well. This enables live boot capability as well various analysis bits.

---
 .../bsp/sys940x/sys940x-preempt-rt.scc             |    5 +++++
 .../kernel-cache/bsp/sys940x/sys940x-standard.scc  |    9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletions(-)

index 39fa1d4..daf5963 100644
@@ -8,3 +8,8 @@ include ktypes/preempt-rt
 include sys940x.scc
 include cfg/efi-ext.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

index 23f99fb..cf6d767 100644
@@ -2,10 +2,17 @@ define KMACHINE sys940x
 define KTYPE standard
 define KARCH i386
 
+include ktypes/standard
+
 include features/emgd/emgd-1.10.scc
 git merge emgd-1.10
 
 include sys940x.scc
 include cfg/efi-ext.scc
 
-include ktypes/standard
+# 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
+

1.7.7.6

Boot fails with a kernel panic in setup_trampoline or shortly after Freeing kernel memory, when using 0x1000000 for PHYSICAL_START and PHYSICAL_ALIGN. Use 0x200000 instead.

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

index b101419..d4b44b2 100644
@@ -42,3 +42,7 @@ CONFIG_MODULES=y
 CONFIG_SHMEM=y
 CONFIG_TMPFS=y
 CONFIG_PACKET=y
+
+# Boot fails with the default of 0x1000000 (16MB)
+CONFIG_PHYSICAL_START=0x200000
+CONFIG_PHYSICAL_ALIGN=0x200000

1.7.7.6

Move the smp and minimal efi fragments into the base BSP description rather than the recipe KERNEL_FEATURES.

Drop the -standard features from the base BSP description. These are already defined in sys940x-standard.scc, and they may not be wanted in other variants (such as tiny).

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

index 962b837..144d919 100644
@@ -6,10 +6,6 @@ include cfg/dmaengine.scc
 include features/serial/8250.scc
 include cfg/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
+include cfg/smp.scc
+include cfg/efi.scc

1.7.7.6

queued. I'll push these when I get a better 'net connection.

Bruce

Along with everything else, this is now pushed out and available.

Bruce