aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-02-08 23:38:21 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-03-16 16:05:34 -0600
commit04853390614d83583e9fbc2933db8c38944e1230 (patch)
treeb69c21b1ba61c1447b3c1add01adb05c8b052d73
parentab50a0265635e90241b3ee985a258b2c509a1e93 (diff)
LINARO: Add s5pv310 flavour
Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian.linaro/changelog15
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-mx5112
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-omap16
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-s5pv310585
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-u850012
-rw-r--r--debian.linaro/config/armel/config.flavour.linaro-vexpress8
-rw-r--r--debian.linaro/config/config.common.ubuntu79
-rw-r--r--debian.linaro/control.d/vars.linaro-s5pv3108
-rw-r--r--debian.linaro/d-i/kernel-versions8
-rw-r--r--debian.linaro/d-i/kernel-versions.in1
-rw-r--r--debian.linaro/rules.d/armel.mk2
11 files changed, 722 insertions, 24 deletions
diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index 3f6f42a7251c..8fd09bcae6b3 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -6,7 +6,7 @@ linux-linaro (2.6.37-1003.6) UNRELEASED; urgency=low
[ John Rigby ]
- * rebase to new upstreams:
+ * Rebase to new upstreams:
linaro-linux-2.6.37-upstream-24Jan2011
Ubuntu-2.6.37-12.26
Skipping because of conflicting upstream patches:
@@ -14,16 +14,17 @@ linux-linaro (2.6.37-1003.6) UNRELEASED; urgency=low
Revert "ARM: stack protector: change the canary value per task"
UBUNTU: SAUCE: ARM: OMAP: Beagle: support twl gpio differences on xM
* Add U8500 flavour
- * rebase to linaro-linux-2.6.37-upstream-27Jan2011
+ * Rebase to linaro-linux-2.6.37-upstream-27Jan2011
* Fix Ubuntu upstream version number typo
- * rebase to linaro-linux-2.6.37-upstream-31Jan2011
- * rebase to linaro-linux-2.6.37-upstream-08Feb2011
- * enforce CONFIG_PRINTK_TIME for all flavours
+ * Rebase to linaro-linux-2.6.37-upstream-31Jan2011
+ * Rebase to linaro-linux-2.6.37-upstream-08Feb2011
+ * Enforce CONFIG_PRINTK_TIME for all flavours
- LP: #715576
- * fix package control file to indicate that OMAP4 is supported
+ * Fix package control file to indicate that OMAP4 is supported
- LP: #714590
- * enforce CONFIG_PM_DEBUG for all flavours
+ * Enforce CONFIG_PM_DEBUG for all flavours
- LP: #713075
+ * Add s5pv310 flavour
-- John Rigby <john.rigby@linaro.org> Tue, 08 Feb 2011 19:56:22 -0700
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 30464bad7894..e495ece395f6 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -1,12 +1,16 @@
#
# Config options for config.flavour.linaro-mx51 automatically generated by splitconfig.pl
#
+CONFIG_ABX500_CORE=y
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_AFS_FS is not set
# CONFIG_AF_RXRPC is not set
CONFIG_ARCH_MXC=y
# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S5PV310 is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
# CONFIG_ARCH_U8500 is not set
# CONFIG_ARCH_VEXPRESS is not set
# CONFIG_ARM_ERRATA_430973 is not set
@@ -438,6 +442,8 @@ CONFIG_SND_TIMER=m
# CONFIG_SND_USB_CAIAQ is not set
# CONFIG_SOUND_OSS_CORE is not set
# CONFIG_SPI is not set
+CONFIG_SQUASHFS=m
+CONFIG_SSB=m
# CONFIG_SSFDC is not set
# CONFIG_STAGING is not set
# CONFIG_STANDALONE is not set
@@ -451,7 +457,10 @@ CONFIG_STE10XP=y
# CONFIG_THERMAL is not set
# CONFIG_TIMER_STATS is not set
# CONFIG_TIPC is not set
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
# CONFIG_TUN is not set
+CONFIG_TWL4030_CORE=y
# CONFIG_TWL6030_USB is not set
CONFIG_UDF_FS=m
CONFIG_UEVENT_HELPER_PATH=""
@@ -471,7 +480,9 @@ CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_DEVICE_CLASS=y
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_EMI62 is not set
+CONFIG_USB_FTDI_ELAN=m
# CONFIG_USB_GADGET is not set
+CONFIG_USB_GPIO_VBUS=m
# CONFIG_USB_HIDDEV is not set
# CONFIG_USB_HWA_HCD is not set
# CONFIG_USB_IDMOUSE is not set
@@ -512,6 +523,7 @@ CONFIG_USB_UAS=m
# CONFIG_VETH is not set
CONFIG_VFAT_FS=y
CONFIG_VITESSE_PHY=y
+CONFIG_VLAN_8021Q=m
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_VXFS_FS is not set
# CONFIG_W1 is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index c1301b80e0d6..eaa1ff5ffced 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -1,6 +1,7 @@
#
# Config options for config.flavour.linaro-omap automatically generated by splitconfig.pl
#
+CONFIG_ABX500_CORE=y
CONFIG_AC97_BUS=m
CONFIG_ADFS_FS=m
CONFIG_ADIS16255=m
@@ -9,6 +10,9 @@ CONFIG_AFS_FS=m
CONFIG_AF_RXRPC=m
# CONFIG_ARCH_MXC is not set
CONFIG_ARCH_OMAP=y
+# CONFIG_ARCH_S5PV310 is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
# CONFIG_ARCH_U8500 is not set
# CONFIG_ARCH_VEXPRESS is not set
CONFIG_ARM_ERRATA_430973=y
@@ -35,6 +39,7 @@ CONFIG_BINARY_PRINTF=y
CONFIG_BINFMT_AOUT=m
CONFIG_BINFMT_MISC=m
CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_DEV_SR=y
CONFIG_BONDING=m
@@ -47,6 +52,7 @@ CONFIG_CAIF=m
CONFIG_CAN=m
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_CDROM_PKTCDVD=m
+CONFIG_CFG80211=m
CONFIG_CGROUPS=y
CONFIG_CHR_DEV_OSST=m
CONFIG_CHR_DEV_SCH=m
@@ -454,6 +460,7 @@ CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_SATA_PMP=y
CONFIG_SCHEDSTATS=y
CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_TRACER=y
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_DH=y
CONFIG_SCSI_LOGGING=y
@@ -490,12 +497,15 @@ CONFIG_SND_MIXER_OSS=m
CONFIG_SND_PCM=y
CONFIG_SND_PCM_OSS=m
CONFIG_SND_SOC=y
+CONFIG_SND_SOC_ALL_CODECS=m
CONFIG_SND_TIMER=y
CONFIG_SND_USB_AUDIO=m
CONFIG_SND_USB_CAIAQ=m
CONFIG_SOUND_OSS_CORE=y
CONFIG_SPI=y
# CONFIG_SPI_PL022 is not set
+CONFIG_SQUASHFS=m
+CONFIG_SSB=m
CONFIG_SSFDC=m
CONFIG_STAGING=y
CONFIG_STANDALONE=y
@@ -534,8 +544,11 @@ CONFIG_TOUCHSCREEN_TSC2007=m
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
CONFIG_TOUCHSCREEN_W90X900=m
CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
CONFIG_TRANZPORT=m
CONFIG_TUN=m
+CONFIG_TWL4030_CORE=y
CONFIG_TWL6030_USB=m
CONFIG_UDF_FS=m
CONFIG_UEVENT_HELPER_PATH=""
@@ -555,7 +568,9 @@ CONFIG_USB_CYTHERM=m
# CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_EMI26=m
CONFIG_USB_EMI62=m
+CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_GADGET=y
+CONFIG_USB_GPIO_VBUS=m
CONFIG_USB_HIDDEV=y
CONFIG_USB_HWA_HCD=m
CONFIG_USB_IDMOUSE=m
@@ -608,6 +623,7 @@ CONFIG_UTS_NS=y
CONFIG_VETH=m
CONFIG_VFAT_FS=m
CONFIG_VITESSE_PHY=y
+CONFIG_VLAN_8021Q=m
# CONFIG_VT_HW_CONSOLE_BINDING is not set
CONFIG_VXFS_FS=m
CONFIG_W1=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
new file mode 100644
index 000000000000..5358a4241358
--- /dev/null
+++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
@@ -0,0 +1,585 @@
+#
+# Config options for config.flavour.linaro-s5pv310 automatically generated by splitconfig.pl
+#
+# CONFIG_ABX500_CORE is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_OMAP is not set
+CONFIG_ARCH_S5PV310=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+# CONFIG_ARCH_U8500 is not set
+# CONFIG_ARCH_VEXPRESS is not set
+# CONFIG_ARM_ERRATA_430973 is not set
+# CONFIG_ARM_ERRATA_720789 is not set
+CONFIG_ARM_L1_CACHE_SHIFT=5
+# CONFIG_ARM_THUMBEE is not set
+CONFIG_ARM_UNWIND=y
+CONFIG_ATA=m
+# CONFIG_ATALK is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+# CONFIG_ATM is not set
+CONFIG_AUTOFS4_FS=y
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_AX88796 is not set
+# CONFIG_B44 is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_BINARY_PRINTF is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_MISC=m
+# CONFIG_BLK_DEV_INTEGRITY is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_BONDING is not set
+# CONFIG_BRIDGE is not set
+CONFIG_BROADCOM_PHY=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_BT is not set
+# CONFIG_CAIF is not set
+# CONFIG_CAN is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_CFG80211 is not set
+# CONFIG_CGROUPS is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_ST is not set
+CONFIG_CICADA_PHY=y
+# CONFIG_CIFS is not set
+CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=512M"
+# CONFIG_CODA_FS is not set
+CONFIG_CONFIGFS_FS=m
+CONFIG_CONNECTOR=y
+# CONFIG_CPU_IDLE is not set
+# CONFIG_CRAMFS is not set
+CONFIG_CRC_T10DIF=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_ECB=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_GHASH is not set
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_PCBC is not set
+CONFIG_CRYPTO_PCOMP2=y
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_RNG2=y
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SEQIV is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_VMAC is not set
+CONFIG_CRYPTO_WORKQUEUE=y
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_ZLIB is not set
+CONFIG_DAVICOM_PHY=y
+# CONFIG_DCB is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_DECNET is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_DLM is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_DNET is not set
+CONFIG_EARLY_PRINTK=y
+# CONFIG_ECONET is not set
+# CONFIG_EFS_FS is not set
+CONFIG_EMBEDDED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_EQUALIZER is not set
+# CONFIG_ETHOC is not set
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_FAT_FS=y
+# CONFIG_FB_BROADSHEET is not set
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_IMAGEBLIT=m
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_S1D13XXX is not set
+CONFIG_FIXED_PHY=y
+# CONFIG_FONTS is not set
+# CONFIG_FSCACHE is not set
+# CONFIG_FTL is not set
+CONFIG_FTRACE=y
+CONFIG_FUSE_FS=y
+# CONFIG_GAMEPORT is not set
+CONFIG_GPIOLIB=y
+# CONFIG_GPIO_BASIC_MMIO is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_HID_3M_PCT is not set
+# CONFIG_HID_CANDO is not set
+# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EGALAX is not set
+# CONFIG_HID_GREENASIA is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_MOSART is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_ORTEK is not set
+# CONFIG_HID_PICOLCD is not set
+# CONFIG_HID_PID is not set
+# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_QUANTA is not set
+# CONFIG_HID_ROCCAT is not set
+# CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_SMARTJOYPLUS is not set
+# CONFIG_HID_STANTUM is not set
+# CONFIG_HID_THRUSTMASTER is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_HID_TWINHAN is not set
+# CONFIG_HID_ZEROPLUS is not set
+# CONFIG_HID_ZYDACRON is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_HIGH_RES_TIMERS=y
+# CONFIG_HPFS_FS is not set
+# CONFIG_HWMON is not set
+CONFIG_HW_RANDOM=y
+CONFIG_HZ=200
+CONFIG_I2C=y
+# CONFIG_I2C_COMPAT is not set
+CONFIG_ICPLUS_PHY=y
+# CONFIG_IEEE802154 is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INFTL is not set
+CONFIG_INPUT_EVBUG=m
+CONFIG_INPUT_FF_MEMLESS=m
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_POLLDEV=m
+# CONFIG_INPUT_SPARSEKMAP is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_IPC_NS is not set
+# CONFIG_IPX is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_MULTICAST is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_SCTP is not set
+# CONFIG_ISDN is not set
+# CONFIG_JFFS2_FS is not set
+CONFIG_KALLSYMS_ALL=y
+# CONFIG_KEXEC is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_KEYS=y
+# CONFIG_KGDB is not set
+# CONFIG_KPROBES is not set
+# CONFIG_KS8851_MLL is not set
+# CONFIG_L2TP is not set
+# CONFIG_LAPB is not set
+# CONFIG_LBDAF is not set
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+# CONFIG_LEDS_REGULATOR is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_LOGIG940_FF is not set
+# CONFIG_LOGIRUMBLEPAD2_FF is not set
+# CONFIG_LOGITECH_FF is not set
+# CONFIG_LOGO is not set
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LSI_ET1011C_PHY=y
+CONFIG_LXT_PHY=y
+CONFIG_LZO_COMPRESS=y
+# CONFIG_MACVLAN is not set
+CONFIG_MARVELL_PHY=y
+CONFIG_MDIO_BITBANG=y
+# CONFIG_MEDIA_SUPPORT is not set
+# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_SUPPORT=y
+# CONFIG_MICREL_PHY is not set
+CONFIG_MII=m
+# CONFIG_MINIX_FS is not set
+# CONFIG_MISC_DEVICES is not set
+# CONFIG_MMC_CLKGATE is not set
+# CONFIG_MMC_DW is not set
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_BCM5974 is not set
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ELANTECH=y
+# CONFIG_MOUSE_PS2_SENTELIC is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_JEDECPROBE is not set
+# CONFIG_MTD_LPDDR is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_PLATRAM is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_UBI is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_NATIONAL_PHY=y
+# CONFIG_NCP_FS is not set
+CONFIG_NEON=y
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_9P is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_KEY is not set
+# CONFIG_NET_NS is not set
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_NFSD is not set
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+# CONFIG_NFTL is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_NLS_ASCII=y
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+CONFIG_NLS_DEFAULT="cp437"
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+CONFIG_NLS_ISO8859_15=m
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+# CONFIG_NOP_USB_XCEIV is not set
+CONFIG_NO_HZ=y
+CONFIG_NR_CPUS=2
+# CONFIG_NTFS_FS is not set
+# CONFIG_OABI_COMPAT is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_OC_ETM is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_PANTHERLORD_FF is not set
+# CONFIG_PARTITION_ADVANCED is not set
+# CONFIG_PERF_COUNTERS is not set
+# CONFIG_PHONE is not set
+# CONFIG_PHONET is not set
+# CONFIG_PID_NS is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_PPS is not set
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_PROFILING is not set
+# CONFIG_QNX4FS_FS is not set
+CONFIG_QSEMI_PHY=y
+CONFIG_QUOTA=y
+CONFIG_QUOTACTL=y
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_RAMOOPS is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_RDS is not set
+# CONFIG_REALTEK_PHY is not set
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_88PM8607 is not set
+# CONFIG_REGULATOR_BQ24022 is not set
+# CONFIG_REGULATOR_DA903X is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+# CONFIG_REGULATOR_LP3971 is not set
+# CONFIG_REGULATOR_MAX1586 is not set
+CONFIG_REGULATOR_MAX8649=y
+# CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8925 is not set
+# CONFIG_REGULATOR_PCF50633 is not set
+# CONFIG_REGULATOR_TPS65023 is not set
+# CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
+# CONFIG_REGULATOR_WM8350 is not set
+# CONFIG_REGULATOR_WM8400 is not set
+CONFIG_REGULATOR_WM8994=y
+# CONFIG_REISERFS_FS is not set
+CONFIG_RELAY=y
+# CONFIG_RFD_FTL is not set
+# CONFIG_RFKILL is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_TEST is not set
+# CONFIG_RTC_DRV_V3020 is not set
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+# CONFIG_SATA_AHCI_PLATFORM is not set
+CONFIG_SATA_PMP=y
+CONFIG_SCHEDSTATS=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHED_TRACER is not set
+CONFIG_SCSI_CONSTANTS=y
+# CONFIG_SCSI_DH is not set
+CONFIG_SCSI_LOGGING=y
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_PROC_FS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+CONFIG_SCSI_SCAN_ASYNC=y
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SDIO_UART is not set
+# CONFIG_SERIAL_8250 is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_RAW is not set
+CONFIG_SERIO_SERPORT=m
+# CONFIG_SLIP is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMC91X is not set
+# CONFIG_SMSC911X is not set
+CONFIG_SMSC_PHY=y
+# CONFIG_SM_FTL is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_MIXER_OSS is not set
+CONFIG_SND_PCM=y
+# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_SOC=y
+# CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_TIMER=y
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SOUND_OSS_CORE is not set
+# CONFIG_SPI is not set
+# CONFIG_SQUASHFS is not set
+# CONFIG_SSB is not set
+# CONFIG_SSFDC is not set
+# CONFIG_STAGING is not set
+CONFIG_STANDALONE=y
+# CONFIG_STE10XP is not set
+CONFIG_SWP_EMULATE=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_THERMAL is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_TIPC is not set
+# CONFIG_TOUCHSCREEN_88PM860X is not set
+# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_BU21013 is not set
+CONFIG_TOUCHSCREEN_DA9034=y
+# CONFIG_TOUCHSCREEN_DYNAPRO is not set
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_TPS6507X is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_TUN is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_UDF_FS is not set
+CONFIG_UEVENT_HELPER_PATH=""
+# CONFIG_UFS_FS is not set
+# CONFIG_UIO is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_HIDDEV is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_IPHETH is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_SERIAL is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_STORAGE is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_TMC is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_UAS is not set
+# CONFIG_USB_ULPI is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+CONFIG_USER_NS=y
+CONFIG_UTS_NS=y
+# CONFIG_VETH is not set
+CONFIG_VFAT_FS=y
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_VLAN_8021Q is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
+# CONFIG_VXFS_FS is not set
+# CONFIG_W1 is not set
+# CONFIG_WAN is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_WIMAX is not set
+CONFIG_WIRELESS=y
+CONFIG_WLAN=y
+# CONFIG_X25 is not set
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFS_FS is not set
+CONFIG_ZLIB_DEFLATE=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index b0c2a2685a91..585be3f7ce4d 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -1,6 +1,7 @@
#
# Config options for config.flavour.linaro-u8500 automatically generated by splitconfig.pl
#
+CONFIG_ABX500_CORE=y
# CONFIG_ADFS_FS is not set
# CONFIG_ADIS16255 is not set
# CONFIG_AFFS_FS is not set
@@ -8,6 +9,9 @@
# CONFIG_AF_RXRPC is not set
# CONFIG_ARCH_MXC is not set
# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S5PV310 is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
CONFIG_ARCH_U8500=y
# CONFIG_ARCH_VEXPRESS is not set
# CONFIG_ARM_ERRATA_430973 is not set
@@ -480,6 +484,8 @@ CONFIG_SND_TIMER=m
# CONFIG_SOUND_OSS_CORE is not set
CONFIG_SPI=y
CONFIG_SPI_PL022=y
+CONFIG_SQUASHFS=m
+CONFIG_SSB=m
# CONFIG_SSFDC is not set
CONFIG_STAGING=y
# CONFIG_STANDALONE is not set
@@ -518,8 +524,11 @@ CONFIG_TOUCHSCREEN_DA9034=y
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
# CONFIG_TOUCHSCREEN_W90X900 is not set
# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
# CONFIG_TRANZPORT is not set
# CONFIG_TUN is not set
+CONFIG_TWL4030_CORE=y
# CONFIG_TWL6030_USB is not set
CONFIG_UDF_FS=m
CONFIG_UEVENT_HELPER_PATH=""
@@ -539,7 +548,9 @@ CONFIG_USB_ARCH_HAS_OHCI=y
CONFIG_USB_DEVICE_CLASS=y
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_EMI62 is not set
+CONFIG_USB_FTDI_ELAN=m
# CONFIG_USB_GADGET is not set
+CONFIG_USB_GPIO_VBUS=m
# CONFIG_USB_HIDDEV is not set
# CONFIG_USB_HWA_HCD is not set
# CONFIG_USB_IDMOUSE is not set
@@ -581,6 +592,7 @@ CONFIG_USB_UAS=m
# CONFIG_VETH is not set
CONFIG_VFAT_FS=y
CONFIG_VITESSE_PHY=y
+CONFIG_VLAN_8021Q=m
CONFIG_VT_HW_CONSOLE_BINDING=y
# CONFIG_VXFS_FS is not set
# CONFIG_W1 is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 7c9d312e1879..53f61a71a97c 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -8,6 +8,9 @@ CONFIG_AC97_BUS=y
# CONFIG_AF_RXRPC is not set
# CONFIG_ARCH_MXC is not set
# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_S5PV310 is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
# CONFIG_ARCH_U8500 is not set
CONFIG_ARCH_VEXPRESS=y
# CONFIG_ARM_ERRATA_430973 is not set
@@ -43,6 +46,7 @@ CONFIG_ATA=m
# CONFIG_CAN is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_CFG80211=m
# CONFIG_CGROUPS is not set
# CONFIG_CHR_DEV_OSST is not set
# CONFIG_CHR_DEV_SCH is not set
@@ -456,6 +460,8 @@ CONFIG_SND_TIMER=y
# CONFIG_SND_USB_CAIAQ is not set
CONFIG_SOUND_OSS_CORE=y
# CONFIG_SPI is not set
+CONFIG_SQUASHFS=m
+CONFIG_SSB=m
# CONFIG_SSFDC is not set
# CONFIG_STAGING is not set
CONFIG_STANDALONE=y
@@ -488,6 +494,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_DEVICE_CLASS=y
# CONFIG_USB_EMI26 is not set
# CONFIG_USB_EMI62 is not set
+CONFIG_USB_FTDI_ELAN=m
# CONFIG_USB_GADGET is not set
# CONFIG_USB_HIDDEV is not set
# CONFIG_USB_HWA_HCD is not set
@@ -540,6 +547,7 @@ CONFIG_USB_STORAGE=m
# CONFIG_VETH is not set
CONFIG_VFAT_FS=y
# CONFIG_VITESSE_PHY is not set
+CONFIG_VLAN_8021Q=m
# CONFIG_VT_HW_CONSOLE_BINDING is not set
# CONFIG_VXFS_FS is not set
# CONFIG_W1 is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 9b35afc80625..3751ab64a84a 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -12,7 +12,6 @@ CONFIG_AB8500_CORE=y
CONFIG_AB8500_DEBUG=y
CONFIG_AB8500_I2C_CORE=y
# CONFIG_AB8500_USB is not set
-CONFIG_ABX500_CORE=y
# CONFIG_ACCESSIBILITY is not set
CONFIG_ACORN_PARTITION=y
# CONFIG_ACORN_PARTITION_ADFS is not set
@@ -114,12 +113,10 @@ CONFIG_ARCH_REQUIRE_GPIOLIB=y
# CONFIG_ARCH_S5P64X0 is not set
# CONFIG_ARCH_S5PC100 is not set
# CONFIG_ARCH_S5PV210 is not set
-# CONFIG_ARCH_S5PV310 is not set
# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
# CONFIG_ARCH_SHARK is not set
# CONFIG_ARCH_SHMOBILE is not set
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
# CONFIG_ARCH_STMP3XXX is not set
# CONFIG_ARCH_SUPPORTS_MSI is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
@@ -255,7 +252,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_INITRD=y
-CONFIG_BLK_DEV_IO_TRACE=y
CONFIG_BLK_DEV_MD=y
CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y
@@ -359,7 +355,6 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
# CONFIG_CEPH_FS is not set
# CONFIG_CEPH_LIB is not set
-CONFIG_CFG80211=m
CONFIG_CFG80211_DEBUGFS=y
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -431,6 +426,7 @@ CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_S5PV310=y
CONFIG_CPU_TLB_V7=y
CONFIG_CPU_V7=y
CONFIG_CRASH_DUMP=y
@@ -482,6 +478,7 @@ CONFIG_DEBUG_MEMORY_INIT=y
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
# CONFIG_DEBUG_RT_MUTEXES is not set
+CONFIG_DEBUG_S3C_UART=1
# CONFIG_DEBUG_SG is not set
# CONFIG_DEBUG_SHIRQ is not set
# CONFIG_DEBUG_SPINLOCK is not set
@@ -671,6 +668,7 @@ CONFIG_EEPROM_LEGACY=m
CONFIG_EEPROM_MAX6875=m
CONFIG_EFI_PARTITION=y
CONFIG_ELF_CORE=y
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
# CONFIG_ENC28J60 is not set
CONFIG_EPOLL=y
CONFIG_ESI_DONGLE=m
@@ -842,10 +840,13 @@ CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MEMBLOCK=y
+CONFIG_HAVE_MEMORY_PRESENT=y
CONFIG_HAVE_OPROFILE=y
CONFIG_HAVE_PERF_EVENTS=y
CONFIG_HAVE_PROC_CPU=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_S3C2410_I2C=y
+CONFIG_HAVE_S3C_RTC=y
CONFIG_HAVE_SCHED_CLOCK=y
CONFIG_HDLC=m
CONFIG_HDLC_CISCO=m
@@ -943,6 +944,7 @@ CONFIG_I2C_OMAP=y
CONFIG_I2C_PARPORT=m
CONFIG_I2C_PARPORT_LIGHT=m
CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_S3C2410=y
CONFIG_I2C_SI470X=m
CONFIG_I2C_SI4713=m
CONFIG_I2C_SIMTEC=m
@@ -1417,8 +1419,11 @@ CONFIG_MACH_OMAP_ZOOM2=y
CONFIG_MACH_OMAP_ZOOM3=y
CONFIG_MACH_OVERO=y
CONFIG_MACH_SBC3530=y
+CONFIG_MACH_SMDKC210=y
+CONFIG_MACH_SMDKV310=y
CONFIG_MACH_U5500=y
CONFIG_MACH_U8500=y
+# CONFIG_MACH_UNIVERSAL_C210 is not set
# CONFIG_MACVTAP is not set
CONFIG_MAC_PARTITION=y
CONFIG_MAGIC_SYSRQ=y
@@ -1502,6 +1507,8 @@ CONFIG_MMC_OMAP=m
CONFIG_MMC_OMAP_HS=y
CONFIG_MMC_SDHCI_ESDHC_IMX=y
CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_S3C=y
+CONFIG_MMC_SDHCI_S3C_DMA=y
CONFIG_MMC_SPI=m
# CONFIG_MMC_TEST is not set
# CONFIG_MMC_TMIO is not set
@@ -1801,6 +1808,7 @@ CONFIG_NLS=y
CONFIG_NLS_ISO8859_1=m
CONFIG_NOMADIK_GPIO=y
CONFIG_NOP_TRACER=y
+CONFIG_NO_IOPORT=y
# CONFIG_NTFS_DEBUG is not set
# CONFIG_NTFS_RW is not set
CONFIG_NVRAM=m
@@ -1886,7 +1894,10 @@ CONFIG_PERF_USE_VMALLOC=y
CONFIG_PHYLIB=y
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_PL310_ERRATA_588369=y
+CONFIG_PL330=y
CONFIG_PLAT_NOMADIK=y
+CONFIG_PLAT_S5P=y
+CONFIG_PLAT_SAMSUNG=y
# CONFIG_PLAT_SPEAR is not set
CONFIG_PLAT_VERSATILE=y
CONFIG_PLIP=m
@@ -2043,6 +2054,7 @@ CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_RX8025=m
CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_S35390A=m
+# CONFIG_RTC_DRV_S3C is not set
CONFIG_RTC_DRV_TWL4030=y
CONFIG_RTC_DRV_WM8350=m
CONFIG_RTC_DRV_X1205=m
@@ -2060,11 +2072,46 @@ CONFIG_RT_MUTEXES=y
# CONFIG_RT_MUTEX_TESTER is not set
CONFIG_RWSEM_GENERIC_SPINLOCK=y
CONFIG_RXKAD=m
+# CONFIG_S3C_ADC is not set
+# CONFIG_S3C_BOOT_ERROR_RESET is not set
+CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
+CONFIG_S3C_DEV_HSMMC=y
+CONFIG_S3C_DEV_HSMMC1=y
+CONFIG_S3C_DEV_HSMMC2=y
+CONFIG_S3C_DEV_HSMMC3=y
+CONFIG_S3C_DEV_I2C1=y
+CONFIG_S3C_DEV_RTC=y
+CONFIG_S3C_DEV_WDT=y
+CONFIG_S3C_GPIO_CFG_S3C24XX=y
+CONFIG_S3C_GPIO_CFG_S3C64XX=y
+CONFIG_S3C_GPIO_PULL_UPDOWN=y
+CONFIG_S3C_GPIO_SPACE=0
+CONFIG_S3C_GPIO_TRACK=y
+CONFIG_S3C_LOWLEVEL_UART_PORT=1
+CONFIG_S3C_PL330_DMA=y
+CONFIG_S5PV310_DEV_PD=y
+CONFIG_S5PV310_DEV_SYSMMU=y
+# CONFIG_S5PV310_SDHCI_CH0_8BIT is not set
+# CONFIG_S5PV310_SDHCI_CH2_8BIT is not set
+CONFIG_S5PV310_SETUP_I2C1=y
+CONFIG_S5PV310_SETUP_SDHCI=y
+CONFIG_S5PV310_SETUP_SDHCI_GPIO=y
+CONFIG_S5P_GPIO_DRVSTR=y
+CONFIG_S5P_SYSMMU=y
+# CONFIG_S5P_SYSMMU_DEBUG is not set
# CONFIG_SAMPLES is not set
+CONFIG_SAMSUNG_CLKSRC=y
+CONFIG_SAMSUNG_GPIOLIB_4BIT=y
+CONFIG_SAMSUNG_GPIO_EXTRA=0
+CONFIG_SAMSUNG_IRQ_UART=y
+CONFIG_SAMSUNG_IRQ_VIC_TIMER=y
+CONFIG_SAMSUNG_PD=y
+CONFIG_SAMSUNG_PM_CHECK=y
+CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE=64
+CONFIG_SAMSUNG_PM_DEBUG=y
CONFIG_SATA_MV=m
CONFIG_SCA3000=m
# CONFIG_SCHED_AUTOGROUP is not set
-CONFIG_SCHED_TRACER=y
CONFIG_SCSI=y
CONFIG_SCSI_DEBUG=m
CONFIG_SCSI_DH_ALUA=m
@@ -2219,6 +2266,12 @@ CONFIG_SERIAL_MAX3100=m
# CONFIG_SERIAL_MAX3107 is not set
CONFIG_SERIAL_OMAP=y
CONFIG_SERIAL_OMAP_CONSOLE=y
+CONFIG_SERIAL_S5PV210=y
+CONFIG_SERIAL_SAMSUNG=y
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
+# CONFIG_SERIAL_SAMSUNG_DEBUG is not set
+CONFIG_SERIAL_SAMSUNG_UARTS=4
+CONFIG_SERIAL_SAMSUNG_UARTS_4=y
CONFIG_SERIO=y
CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_PARKBD=m
@@ -2292,7 +2345,6 @@ CONFIG_SND_SOC_AK4104=m
CONFIG_SND_SOC_AK4535=m
CONFIG_SND_SOC_AK4642=m
CONFIG_SND_SOC_AK4671=m
-CONFIG_SND_SOC_ALL_CODECS=m
CONFIG_SND_SOC_CS4270=m
CONFIG_SND_SOC_CS42L51=m
CONFIG_SND_SOC_CX20442=m
@@ -2374,6 +2426,9 @@ CONFIG_SOLARIS_X86_PARTITION=y
CONFIG_SOUND=y
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
# CONFIG_SOUND_PRIME is not set
+CONFIG_SPARSEMEM=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_MANUAL=y
# CONFIG_SPARSE_IRQ is not set
# CONFIG_SPARSE_RCU_POINTER is not set
# CONFIG_SPEAKUP is not set
@@ -2392,13 +2447,11 @@ CONFIG_SPI_OMAP24XX=m
CONFIG_SPI_TLE62X0=m
# CONFIG_SPI_XILINX is not set
CONFIG_SPLIT_PTLOCK_CPUS=4
-CONFIG_SQUASHFS=m
# CONFIG_SQUASHFS_EMBEDDED is not set
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
# CONFIG_SQUASHFS_LZO is not set
# CONFIG_SQUASHFS_XATTR is not set
CONFIG_SR_REPORT_TIME_LIMIT=100
-CONFIG_SSB=m
CONFIG_SSB_BLOCKIO=y
# CONFIG_SSB_DEBUG is not set
CONFIG_SSB_POSSIBLE=y
@@ -2507,8 +2560,6 @@ CONFIG_TOUCHSCREEN_WM9705=y
CONFIG_TOUCHSCREEN_WM9712=y
CONFIG_TOUCHSCREEN_WM9713=y
CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TPS65010=m
-CONFIG_TPS6507X=m
CONFIG_TRACEPOINTS=y
CONFIG_TRACER_MAX_TRACE=y
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -2519,7 +2570,6 @@ CONFIG_TREE_RCU=y
# CONFIG_TTPCI_EEPROM is not set
# CONFIG_TTY_PRINTK is not set
CONFIG_TWL4030_CODEC=y
-CONFIG_TWL4030_CORE=y
CONFIG_TWL4030_POWER=y
CONFIG_TWL4030_USB=m
CONFIG_TWL4030_WATCHDOG=m
@@ -2575,7 +2625,6 @@ CONFIG_USB_ETH_RNDIS=y
CONFIG_USB_EZUSB=y
CONFIG_USB_FILE_STORAGE=m
# CONFIG_USB_FILE_STORAGE_TEST is not set
-CONFIG_USB_FTDI_ELAN=m
CONFIG_USB_FUNCTIONFS=m
CONFIG_USB_FUNCTIONFS_ETH=y
CONFIG_USB_FUNCTIONFS_GENERIC=y
@@ -2593,7 +2642,6 @@ CONFIG_USB_GADGET_OMAP=y
CONFIG_USB_GADGET_SELECTED=y
CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GL860=m
-CONFIG_USB_GPIO_VBUS=m
CONFIG_USB_GSPCA=m
CONFIG_USB_GSPCA_BENQ=m
CONFIG_USB_GSPCA_CONEX=m
@@ -2892,7 +2940,6 @@ CONFIG_VIDEO_W9966=m
CONFIG_VIDEO_WM8739=m
CONFIG_VIDEO_WM8775=m
CONFIG_VIRT_TO_BUS=y
-CONFIG_VLAN_8021Q=m
CONFIG_VLAN_8021Q_GVRP=y
# CONFIG_VMSPLIT_1G is not set
# CONFIG_VMSPLIT_2G is not set
diff --git a/debian.linaro/control.d/vars.linaro-s5pv310 b/debian.linaro/control.d/vars.linaro-s5pv310
new file mode 100644
index 000000000000..1839dcf57445
--- /dev/null
+++ b/debian.linaro/control.d/vars.linaro-s5pv310
@@ -0,0 +1,8 @@
+arch="armel"
+supported="Samsung s5pv310"
+desc="Samsung s5pv310 based platforms"
+target="Samsung TBD platform"
+bootloader="uboot-mkimage, flash-kernel"
+provides=""
+section_image="universe/base"
+do_debug="Yes"
diff --git a/debian.linaro/d-i/kernel-versions b/debian.linaro/d-i/kernel-versions
new file mode 100644
index 000000000000..1d51ae39a922
--- /dev/null
+++ b/debian.linaro/d-i/kernel-versions
@@ -0,0 +1,8 @@
+# arch version flavour installedname suffix bdep
+armel 2.6.37-1003 linaro-mx51 2.6.37-1003-linaro-mx51 -
+armel 2.6.37-1003 linaro-omap 2.6.37-1003-linaro-omap -
+armel 2.6.37-1003 linaro-s5pv310 2.6.37-1003-linaro-s5pv310 -
+armel 2.6.37-1003 linaro-vexpress 2.6.37-1003-linaro-vexpress -
+armel 2.6.37-1003 linaro-u8500 2.6.37-1003-linaro-u8500 -
+# Ports
+# arch version flavour installedname suffix bdep
diff --git a/debian.linaro/d-i/kernel-versions.in b/debian.linaro/d-i/kernel-versions.in
index cedf86cca626..45894a20de75 100644
--- a/debian.linaro/d-i/kernel-versions.in
+++ b/debian.linaro/d-i/kernel-versions.in
@@ -1,6 +1,7 @@
# arch version flavour installedname suffix bdep
armel PKGVER-ABINUM linaro-mx51 PKGVER-ABINUM-linaro-mx51 -
armel PKGVER-ABINUM linaro-omap PKGVER-ABINUM-linaro-omap -
+armel PKGVER-ABINUM linaro-s5pv310 PKGVER-ABINUM-linaro-s5pv310 -
armel PKGVER-ABINUM linaro-vexpress PKGVER-ABINUM-linaro-vexpress -
armel PKGVER-ABINUM linaro-u8500 PKGVER-ABINUM-linaro-u8500 -
# Ports
diff --git a/debian.linaro/rules.d/armel.mk b/debian.linaro/rules.d/armel.mk
index 438f0e71c8b9..6aaab5087a96 100644
--- a/debian.linaro/rules.d/armel.mk
+++ b/debian.linaro/rules.d/armel.mk
@@ -2,7 +2,7 @@ build_arch = arm
header_arch = arm
asm_link = arm
defconfig = defconfig
-flavours = linaro-mx51 linaro-omap linaro-u8500 linaro-vexpress
+flavours = linaro-mx51 linaro-omap linaro-s5pv310 linaro-u8500 linaro-vexpress
build_image = zImage
kernel_file = arch/$(build_arch)/boot/zImage
install_file = vmlinuz