diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-08-21 21:17:19 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2014-02-07 01:38:16 +0400 |
| commit | 9ee126a9e5525fe6407b80f1b6f95e40698aaab1 (patch) | |
| tree | 88a7b0ae09b471cccd618d60252b4e576d5cdc28 /linaro/configs | |
| parent | 4f413b0ff0b79f81235db3a66c96eb9e90a56350 (diff) | |
configs: omap2plus.conf: use distribution.conf choices for conflicting options
This lets us merging distribution.conf and omap2plus.conf in any order
with the same result. Before that distribution.conf must be merged last to
have linux-linaro build to complete ok.
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Diffstat (limited to 'linaro/configs')
| -rw-r--r-- | linaro/configs/omap2plus.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linaro/configs/omap2plus.conf b/linaro/configs/omap2plus.conf index 7e427ea9edf..a578f0dd598 100644 --- a/linaro/configs/omap2plus.conf +++ b/linaro/configs/omap2plus.conf @@ -25,7 +25,7 @@ CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyO2,115200" CONFIG_KEXEC=y CONFIG_FPE_NWFPE=y CONFIG_PM_DEBUG=y -# CONFIG_IPV6 is not set +CONFIG_IPV6=y CONFIG_CAN=m CONFIG_CAN_C_CAN=m CONFIG_CAN_C_CAN_PLATFORM=m @@ -50,7 +50,7 @@ CONFIG_MTD_ONENAND_OMAP2=y CONFIG_MTD_UBI=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_SIZE=16384 +CONFIG_BLK_DEV_RAM_SIZE=65536 CONFIG_SENSORS_TSL2550=m CONFIG_BMP085_I2C=m CONFIG_SENSORS_LIS3_I2C=m |