diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-20 12:36:58 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-20 12:36:58 +0100 |
| commit | 3972dc3a720794f2ded9fe5e6305d3fae4a6a7d7 (patch) | |
| tree | 4875e396af3ef083ee6883775e34c48e52605e2d /strata/bsp-armv7-highbank/linux-armv7-highbank.morph | |
| parent | c368f61b0b460f120634219a5b70186c803d5bed (diff) | |
| parent | 4b9268eb9cb1f8d140f543d9c4a3aa1aa8298994 (diff) | |
| download | infrastructure-3972dc3a720794f2ded9fe5e6305d3fae4a6a7d7.tar.gz | |
Merge remote-tracking branch 'baserock/baserock/adamcoldrick/mason-2015' into sam/mason-zuul-2
Conflicts:
baserock_irclogs/systems/irclogs-x86_64.morph
hosts
scripts/licensecheck.pl
Change-Id: Ib298ce7928a8f5a23918b1226746c39e48fe705f
Diffstat (limited to 'strata/bsp-armv7-highbank/linux-armv7-highbank.morph')
| -rw-r--r-- | strata/bsp-armv7-highbank/linux-armv7-highbank.morph | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph index dfebf69c..b03e17ad 100644 --- a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph +++ b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph @@ -8,6 +8,8 @@ configure-commands: - scripts/config -e CONFIG_POSIX_MQUEUE - scripts/config -e CPU_IDLE - scripts/config -e EXT4_FS +- scripts/config -e FUSE_FS +#- scripts/config -e OVERLAY_FS # Activate when we build Linux >= 3.18 - scripts/config -e EXT4_USE_FOR_EXT23 - scripts/config -e PACKET - scripts/config -e UNIX @@ -32,6 +34,7 @@ configure-commands: - scripts/config -e DEVTMPFS_MOUNT - scripts/config -e CONFIG_FHANDLE - scripts/config --set-str UEVENT_HELPER_PATH '' +- scripts/config -e DM_SNAPSHOT - scripts/config -e IKCONFIG - scripts/config -e IKCONFIG_PROC - scripts/config -e TMPFS @@ -39,6 +42,7 @@ configure-commands: - scripts/config -e VFAT_FS - scripts/config -e VLAN_8021Q - scripts/config -e BRIDGE_VLAN_FILTERING +- scripts/config -e VETH - yes '' | make oldconfig build-commands: - make zImage $MAKEFLAGS |