Revert "UBUNTU: [Config] Enable CONFIG_NVRAM=m"

BugLink: http://bugs.launchpad.net/bugs/942193

This reverts commit 2fc20ccc8d8b2fc43fda81905eecb0c0c744cd94.

CONFIG_NVRAM was originally built in on powerpc but then changed to be
enabled as a module during the Precise config review as there was no
supporting evidence for it to be built in.  However, there is a bug
report stating that this change prevents 'ybin' (the program which
configures the PowerPC bootloader) from working.  So revert this change
and follow up with another commit to add this to the enforcer.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 771b28f..4b98fc3 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -121,6 +121,7 @@ CONFIG_NL80211_TESTMODE=y
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NODES_SHIFT=6
 CONFIG_NOP_USB_XCEIV=m
+CONFIG_NVRAM=m
 CONFIG_OUTPUT_FORMAT="elf64-x86-64"
 CONFIG_PANEL_DVI=m
 CONFIG_PANEL_GENERIC_DPI=m

diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 7be0ab7..b9c9d4d 100644 (file)
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -86,6 +86,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NOP_USB_XCEIV=y
+CONFIG_NVRAM=m
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PANEL_DVI=y
 CONFIG_PANEL_GENERIC_DPI=y

diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 8c9a53b..8deae66 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -86,6 +86,7 @@ CONFIG_NEED_DMA_MAP_STATE=y
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NOP_USB_XCEIV=y
+CONFIG_NVRAM=m
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PANEL_DVI=y
 CONFIG_PANEL_GENERIC_DPI=y

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 8d748eb..42f46b6 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3702,7 +3702,6 @@ CONFIG_NTFS_FS=m
 # CONFIG_NTFS_RW is not set
 CONFIG_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_NVRAM=m
 CONFIG_NV_TCO=m
 # CONFIG_N_GSM is not set
 CONFIG_N_HDLC=m

diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index b7c2a4b..dd394de 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -120,6 +120,7 @@ CONFIG_NL80211_TESTMODE=y
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NR_CPUS=8
+CONFIG_NVRAM=m
 CONFIG_OUTPUT_FORMAT="elf32-i386"
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PANEL_DVI=m

diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 2d44ae3..f37de10 100644 (file)
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -104,6 +104,7 @@ CONFIG_NL80211_TESTMODE=y
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NODES_SHIFT=8
 CONFIG_NOP_USB_XCEIV=m
+CONFIG_NVRAM=y
 CONFIG_PANEL_DVI=m
 CONFIG_PANEL_GENERIC_DPI=m
 CONFIG_PARAVIRT_TIME_ACCOUNTING=n