aboutsummaryrefslogtreecommitdiff
path: root/linaro/configs
diff options
context:
space:
mode:
Diffstat (limited to 'linaro/configs')
-rw-r--r--linaro/configs/debug.conf1
-rw-r--r--linaro/configs/highbank.conf40
-rw-r--r--linaro/configs/linaro-base.conf6
l---------linaro/configs/ubuntu-minimal.conf1
-rw-r--r--linaro/configs/xen.conf7
5 files changed, 6 insertions, 49 deletions
diff --git a/linaro/configs/debug.conf b/linaro/configs/debug.conf
deleted file mode 100644
index 36980566b2d8..000000000000
--- a/linaro/configs/debug.conf
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PROVE_LOCKING=y
diff --git a/linaro/configs/highbank.conf b/linaro/configs/highbank.conf
deleted file mode 100644
index bf0f3c14b0d0..000000000000
--- a/linaro/configs/highbank.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_ARCH_HIGHBANK=y
-CONFIG_ARM_ERRATA_754322=y
-CONFIG_SMP=y
-CONFIG_SCHED_MC=y
-CONFIG_AEABI=y
-CONFIG_CMDLINE="console=ttyAMA0"
-CONFIG_CPU_IDLE=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_NET=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_SATA_HIGHBANK=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_CALXEDA_XGMAC=y
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_IPMI_HANDLER=y
-CONFIG_IPMI_SI=y
-CONFIG_I2C=y
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
-CONFIG_SPI=y
-CONFIG_SPI_PL022=y
-CONFIG_GPIO_PL061=y
-CONFIG_MMC=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_EDAC=y
-CONFIG_EDAC_MM_EDAC=y
-CONFIG_EDAC_HIGHBANK_MC=y
-CONFIG_EDAC_HIGHBANK_L2=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_PL031=y
-CONFIG_DMADEVICES=y
-CONFIG_PL330_DMA=y
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf
index c8a353f0fbcc..0a1d7bcd63ad 100644
--- a/linaro/configs/linaro-base.conf
+++ b/linaro/configs/linaro-base.conf
@@ -121,3 +121,9 @@ CONFIG_RCU_TORTURE_TEST_RUNNABLE=n
CONFIG_CORESIGHT=y
CONFIG_CORESIGHT_LINKS_AND_SINKS=y
CONFIG_CORESIGHT_SOURCE_ETM=y
+
+# enable ZRAM features
+CONFIG_ZPOOL=y
+CONFIG_ZSMALLOC=y
+CONFIG_ZRAM=y
+CONFIG_ZRAM_LZ4_COMPRESS=y
diff --git a/linaro/configs/ubuntu-minimal.conf b/linaro/configs/ubuntu-minimal.conf
deleted file mode 120000
index 794e82f3bc17..000000000000
--- a/linaro/configs/ubuntu-minimal.conf
+++ /dev/null
@@ -1 +0,0 @@
-distribution.conf \ No newline at end of file
diff --git a/linaro/configs/xen.conf b/linaro/configs/xen.conf
deleted file mode 100644
index d24fabbea076..000000000000
--- a/linaro/configs/xen.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_XEN=y
-CONFIG_XEN_NETDEV_FRONTEND=y
-CONFIG_XEN_NETDEV_BACKEND=y
-CONFIG_XEN_BLKDEV_FRONTEND=y
-CONFIG_XEN_BLKDEV_BACKEND=y
-CONFIG_XENFS=y
-CONFIG_XEN_COMPAT_XENFS=y