diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-11-09 17:37:10 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-11-09 17:37:10 -0800 |
| commit | 622f9821d78b1895de72ea983b908af9f4e15126 (patch) | |
| tree | 0cac2b0d08ef6e0095c3d30992a61f798f8d643e /khilman-trigger-flex.yaml | |
| parent | 4bbd47ffd9785eb60831a416b3a434fb7157d456 (diff) | |
khilman-trigger-flex: update Ard's EFI; fix LKDTM builds
Change-Id: I55ee4e614ace89a9bab3ab07143bc5b478a452a2
Diffstat (limited to 'khilman-trigger-flex.yaml')
| -rw-r--r-- | khilman-trigger-flex.yaml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/khilman-trigger-flex.yaml b/khilman-trigger-flex.yaml index f14cbce8cb..724fb7b690 100644 --- a/khilman-trigger-flex.yaml +++ b/khilman-trigger-flex.yaml @@ -228,7 +228,11 @@ DEFCONFIG_LIST="allnoconfig " DEFCONFIG_LIST+=`(cd arch/${ARCH}/configs; echo *defconfig)` DEFCONFIG_LIST+=" " - DEFCONFIG_LIST+="CONFIG_LKDTM=y " + + base_defconfig="defconfig" + if [ ${ARCH} = "arm" ]; then + base_defconfig="multi_v7_defconfig" + fi # tinyconfig if [ -e kernel/configs/tiny.config ]; then @@ -278,20 +282,20 @@ fi # Tree specific fragments: Ard's EFI - if [ ${tree_name} = "ardb" ]; then + if [ ${tree_name} = "ardb" ] && [ ${arch} = "arm" ];; then DEFCONFIG_LIST+="multi_v7_defconfig+CONFIG_EFI=y " + DEFCONFIG_LIST+="multi_v7_defconfig+CONFIG_EFI=y+CONFIG_ARM_LPAE=y " fi + # Security testing features + DEFCONFIG_LIST+="$base_defconfig+CONFIG_LKDTM=y " + # Tree specific fragments: LSK + KVM fragments if [ ${tree_name} = "lsk" ] || [ ${tree_name} = "anders" ]; then # Don't do allmodconfig builds DEFCONFIG_LIST=${DEFCONFIG_LIST/allmodconfig/} FRAGS="linaro/configs/kvm-guest.conf" - base_defconfig="defconfig" - if [ ${ARCH} = "arm" ]; then - base_defconfig="multi_v7_defconfig" - fi # For -rt kernels, build with RT fragment RT_FRAG=kernel/configs/preempt-rt.config |