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

[Darren Hart]

From: Darren Hart <dvhart at linux.intel.com>

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.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
Acked-by: Tom Zanussi <tzanussi at intel.com>
---
 .../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(-)

diff --git a/meta/cfg/kernel-cache/bsp/cedartrail/cedartrail.cfg b/meta/cfg/kernel-cache/bsp/cedartrail/cedartrail.cfg
index 1cc14b1..32cd9e5 100755
--- a/meta/cfg/kernel-cache/bsp/cedartrail/cedartrail.cfg
+++ b/meta/cfg/kernel-cache/bsp/cedartrail/cedartrail.cfg
@@ -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
diff --git a/meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg b/meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg
index e93c0b8..b101419 100644
--- a/meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg
+++ b/meta/cfg/kernel-cache/bsp/crownbay/crownbay.cfg
@@ -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
diff --git a/meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg b/meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg
index b9704c5..b1e72bd 100644
--- a/meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg
+++ b/meta/cfg/kernel-cache/bsp/emenlow/emenlow.cfg
@@ -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
diff --git a/meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg b/meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg
index e93c0b8..b101419 100644
--- a/meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg
+++ b/meta/cfg/kernel-cache/bsp/fishriver/fishriver.cfg
@@ -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
diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg b/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg
index e93c0b8..b101419 100644
--- a/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg
+++ b/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg
@@ -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
diff --git a/meta/cfg/kernel-cache/bsp/sys940x/sys940x.cfg b/meta/cfg/kernel-cache/bsp/sys940x/sys940x.cfg
index 3d45fe8..b101419 100644
--- a/meta/cfg/kernel-cache/bsp/sys940x/sys940x.cfg
+++ b/meta/cfg/kernel-cache/bsp/sys940x/sys940x.cfg
@@ -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
diff --git a/meta/cfg/kernel-cache/cfg/boot-live.cfg b/meta/cfg/kernel-cache/cfg/boot-live.cfg
index 8ff7674..a102052 100644
--- a/meta/cfg/kernel-cache/cfg/boot-live.cfg
+++ b/meta/cfg/kernel-cache/cfg/boot-live.cfg
@@ -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
-- 
1.7.6.5