aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorPaolo Pisati <paolo.pisati@canonical.com>2011-09-19 16:02:05 +0200
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:49:31 -0700
commite11095707c34d6e75daa148958a0a7c7a829d83a (patch)
tree9f88a74a0eaff3c37729538f3735381d8181a9ab /debian.master
parentc0cf72a9c44169209044e8def293d6324e1dd799 (diff)
downloadlinux-linaro-precise-e11095707c34d6e75daa148958a0a7c7a829d83a.tar.gz
UBUNTU: [Config] Compile-in vfat support for armel
BugLink: http://bugs.launchpad.net/bugs/853783 Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'debian.master')
-rw-r--r--debian.master/abi/3.1.0-1.0/armel/omap.modules2
-rw-r--r--debian.master/config/amd64/config.common.amd646
-rw-r--r--debian.master/config/armel/config.common.armel6
-rw-r--r--debian.master/config/config.common.ubuntu6
-rw-r--r--debian.master/config/i386/config.common.i3866
-rw-r--r--debian.master/config/powerpc/config.common.powerpc6
-rw-r--r--debian.master/config/ppc64/config.common.ppc646
7 files changed, 26 insertions, 12 deletions
diff --git a/debian.master/abi/3.1.0-1.0/armel/omap.modules b/debian.master/abi/3.1.0-1.0/armel/omap.modules
index 4b5bdf11463..33bbcdd254d 100644
--- a/debian.master/abi/3.1.0-1.0/armel/omap.modules
+++ b/debian.master/abi/3.1.0-1.0/armel/omap.modules
@@ -480,7 +480,6 @@ evbug
f71805f
f71882fg
f75375s
-fat
faulty
fb_sys_fops
fcrypt
@@ -1913,7 +1912,6 @@ vcan
ves1820
ves1x93
veth
-vfat
vgg2432a4
videobuf2-core
videobuf2-dma-contig
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 4b7cacd347d..ae6c2a89428 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -58,6 +58,7 @@ CONFIG_DT3155=m
# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
# CONFIG_DVB_USB_EC168 is not set
# CONFIG_EZX_PCAP is not set
+CONFIG_FAT_FS=m
CONFIG_FB_3DFX=m
CONFIG_FB_ATY=m
CONFIG_FB_ATY128=m
@@ -153,6 +154,8 @@ CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NET_POCKET=y
CONFIG_NL80211_TESTMODE=y
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_ISO8859_1=m
CONFIG_NODES_SHIFT=6
CONFIG_NOP_USB_XCEIV=m
CONFIG_NVRAM=m
@@ -186,8 +189,8 @@ CONFIG_RTC_DRV_TEST=m
CONFIG_RTC_DRV_TWL4030=m
CONFIG_RTL8192CE=m
CONFIG_RTL8192E=m
-CONFIG_RTS_PSTOR=m
CONFIG_RTS5139=m
+CONFIG_RTS_PSTOR=m
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_SATA_SVW=m
CONFIG_SCHEDSTATS=y
@@ -283,6 +286,7 @@ CONFIG_USB_SN9C102=m
CONFIG_USB_STV680=m
CONFIG_USB_UHCI_HCD=y
CONFIG_USB_ZC0301=m
+CONFIG_VFAT_FS=m
CONFIG_VGASTATE=m
CONFIG_VGA_ARB_MAX_GPUS=16
CONFIG_VGA_CONSOLE=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 39ee7bd73e5..f4337a5700e 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -55,6 +55,7 @@ CONFIG_DVB_FE_CUSTOMISE=y
# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
CONFIG_DVB_USB_EC168=m
CONFIG_EZX_PCAP=y
+CONFIG_FAT_FS=y
CONFIG_FB_3DFX=m
CONFIG_FB_ATY=m
CONFIG_FB_ATY128=m
@@ -140,6 +141,8 @@ CONFIG_NATIONAL_PHY=y
CONFIG_NEED_DMA_MAP_STATE=y
# CONFIG_NET_POCKET is not set
# CONFIG_NL80211_TESTMODE is not set
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
CONFIG_NOP_USB_XCEIV=y
CONFIG_NVRAM=m
CONFIG_PAGE_OFFSET=0xC0000000
@@ -173,8 +176,8 @@ CONFIG_RTC_DRV_TEST=m
CONFIG_RTC_DRV_TWL4030=y
# CONFIG_RTL8192CE is not set
CONFIG_RTL8192E=m
-# CONFIG_RTS_PSTOR is not set
# CONFIG_RTS5139 is not set
+# CONFIG_RTS_PSTOR is not set
CONFIG_RWSEM_GENERIC_SPINLOCK=y
CONFIG_SATA_SVW=m
CONFIG_SCHEDSTATS=y
@@ -268,6 +271,7 @@ CONFIG_USB_SI470X=m
# CONFIG_USB_STV680 is not set
CONFIG_USB_UHCI_HCD=m
# CONFIG_USB_ZC0301 is not set
+CONFIG_VFAT_FS=y
# CONFIG_VGASTATE is not set
CONFIG_VGA_ARB_MAX_GPUS=16
# CONFIG_VGA_CONSOLE is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 35b48b21989..0b2b45ade23 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1534,7 +1534,6 @@ CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
CONFIG_FARSYNC=m
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_FAT_FS=m
# CONFIG_FAULT_INJECTION is not set
CONFIG_FB=y
# CONFIG_FB_3DFX_ACCEL is not set
@@ -3500,7 +3499,6 @@ CONFIG_NLS=y
CONFIG_NLS_ASCII=m
CONFIG_NLS_CODEPAGE_1250=m
CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_CODEPAGE_437=m
CONFIG_NLS_CODEPAGE_737=m
CONFIG_NLS_CODEPAGE_775=m
CONFIG_NLS_CODEPAGE_850=m
@@ -3521,7 +3519,6 @@ CONFIG_NLS_CODEPAGE_936=m
CONFIG_NLS_CODEPAGE_949=m
CONFIG_NLS_CODEPAGE_950=m
CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_ISO8859_1=m
CONFIG_NLS_ISO8859_13=m
CONFIG_NLS_ISO8859_14=m
CONFIG_NLS_ISO8859_15=m
@@ -4212,8 +4209,8 @@ CONFIG_RTL8192DE=m
CONFIG_RTL8192SE=m
CONFIG_RTL8192U=m
CONFIG_RTLWIFI=m
-# CONFIG_RTS_PSTOR_DEBUG is not set
# CONFIG_RTS5139_DEBUG is not set
+# CONFIG_RTS_PSTOR_DEBUG is not set
CONFIG_RT_GROUP_SCHED=y
CONFIG_RT_MUTEXES=y
# CONFIG_RT_MUTEX_TESTER is not set
@@ -5597,7 +5594,6 @@ CONFIG_V4L_USB_DRIVERS=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_VERSION_SIGNATURE=""
CONFIG_VETH=m
-CONFIG_VFAT_FS=m
CONFIG_VFP=y
CONFIG_VFPv3=y
# CONFIG_VGACON_SOFT_SCROLLBACK is not set
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 941e1fd50ef..4cf38f19edf 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -58,6 +58,7 @@ CONFIG_DT3155=m
# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
# CONFIG_DVB_USB_EC168 is not set
# CONFIG_EZX_PCAP is not set
+CONFIG_FAT_FS=m
CONFIG_FB_3DFX=m
CONFIG_FB_ATY=m
CONFIG_FB_ATY128=m
@@ -151,6 +152,8 @@ CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NET_POCKET=y
CONFIG_NL80211_TESTMODE=y
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_ISO8859_1=m
CONFIG_NOP_USB_XCEIV=m
CONFIG_NR_CPUS=8
CONFIG_NVRAM=m
@@ -184,8 +187,8 @@ CONFIG_RTC_DRV_TEST=m
CONFIG_RTC_DRV_TWL4030=m
CONFIG_RTL8192CE=m
CONFIG_RTL8192E=m
-CONFIG_RTS_PSTOR=m
CONFIG_RTS5139=m
+CONFIG_RTS_PSTOR=m
# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
CONFIG_SATA_SVW=m
CONFIG_SCHEDSTATS=y
@@ -282,6 +285,7 @@ CONFIG_USB_SN9C102=m
CONFIG_USB_STV680=m
CONFIG_USB_UHCI_HCD=y
CONFIG_USB_ZC0301=m
+CONFIG_VFAT_FS=m
CONFIG_VGASTATE=m
CONFIG_VGA_ARB_MAX_GPUS=16
CONFIG_VGA_CONSOLE=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index ec07a4b4e5d..31e823cf66a 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -53,6 +53,7 @@ CONFIG_DRM_RADEON=m
CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
# CONFIG_DVB_USB_EC168 is not set
# CONFIG_EZX_PCAP is not set
+CONFIG_FAT_FS=m
CONFIG_FB_3DFX=y
CONFIG_FB_ATY128=m
CONFIG_FB_BACKLIGHT=y
@@ -135,6 +136,8 @@ CONFIG_MTD_SM_COMMON=m
CONFIG_NATIONAL_PHY=m
CONFIG_NET_POCKET=y
CONFIG_NL80211_TESTMODE=y
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_ISO8859_1=m
CONFIG_NODES_SHIFT=8
CONFIG_NOP_USB_XCEIV=m
CONFIG_NVRAM=y
@@ -172,8 +175,8 @@ CONFIG_RTC_DRV_CMOS=m
CONFIG_RTC_DRV_TWL4030=m
CONFIG_RTL8192CE=m
# CONFIG_RTL8192E is not set
-# CONFIG_RTS_PSTOR is not set
# CONFIG_RTS5139 is not set
+# CONFIG_RTS_PSTOR is not set
CONFIG_SATA_SVW=y
# CONFIG_SCANLOG is not set
CONFIG_SCSI_ACARD=m
@@ -265,6 +268,7 @@ CONFIG_USB_R8A66597=m
# CONFIG_USB_SI470X is not set
CONFIG_USB_SN9C102=m
CONFIG_USB_UHCI_HCD=y
+CONFIG_VFAT_FS=m
CONFIG_VGASTATE=m
CONFIG_VGA_ARB_MAX_GPUS=16
CONFIG_VGA_CONSOLE=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index f9046254f1d..c9f640186d6 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -58,6 +58,7 @@ CONFIG_DRM_RADEON_KMS=y
CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
# CONFIG_DVB_USB_EC168 is not set
# CONFIG_EZX_PCAP is not set
+CONFIG_FAT_FS=m
CONFIG_FB_3DFX=y
CONFIG_FB_ATY=y
CONFIG_FB_ATY128=y
@@ -155,6 +156,8 @@ CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NET_POCKET=y
CONFIG_NL80211_TESTMODE=y
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_ISO8859_1=m
CONFIG_NODES_SHIFT=8
CONFIG_NOP_USB_XCEIV=m
CONFIG_NR_CPUS=1024
@@ -204,8 +207,8 @@ CONFIG_RTC_DRV_CMOS=m
CONFIG_RTC_DRV_TWL4030=m
CONFIG_RTL8192CE=m
# CONFIG_RTL8192E is not set
-# CONFIG_RTS_PSTOR is not set
# CONFIG_RTS5139 is not set
+# CONFIG_RTS_PSTOR is not set
CONFIG_SATA_SVW=y
CONFIG_SCANLOG=y
CONFIG_SCHEDSTATS=y
@@ -301,6 +304,7 @@ CONFIG_USB_R8A66597=m
# CONFIG_USB_SI470X is not set
CONFIG_USB_SN9C102=m
CONFIG_USB_UHCI_HCD=y
+CONFIG_VFAT_FS=m
CONFIG_VGASTATE=m
CONFIG_VGA_ARB_MAX_GPUS=64
CONFIG_VGA_CONSOLE=y