summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harkin <ryan.harkin@linaro.org>2014-12-17 08:19:22 +0000
committerRyan Harkin <ryan.harkin@linaro.org>2014-12-17 08:19:22 +0000
commitcbe157c94f9c05e74c9057821319b99ec8f8fd9a (patch)
tree674bc163be13e8dbc637d5855e04314055f35902
parent1053c12893ab9bdc7d8ae66cf28efe59a5448a55 (diff)
14.12: update merge_config command
Change-Id: Icb48692874b9cb92dc542046fca3db4758130649 Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
-rw-r--r--members/arm/openembedded/aarch64/HACKING.textile1
-rw-r--r--members/arm/openembedded/juno-lsk/HACKING.textile2
2 files changed, 1 insertions, 2 deletions
diff --git a/members/arm/openembedded/aarch64/HACKING.textile b/members/arm/openembedded/aarch64/HACKING.textile
index dd5021d..575333a 100644
--- a/members/arm/openembedded/aarch64/HACKING.textile
+++ b/members/arm/openembedded/aarch64/HACKING.textile
@@ -56,7 +56,6 @@ Do not use the arm64 defconfig, instead, build a config from the config fragment
bc. ARCH=arm64 scripts/kconfig/merge_config.sh \
linaro/configs/linaro-base.conf \
-linaro/configs/linaro-base64.conf \
linaro/configs/distribution.conf \
linaro/configs/vexpress64.conf \
linaro/configs/kvm-host.conf \
diff --git a/members/arm/openembedded/juno-lsk/HACKING.textile b/members/arm/openembedded/juno-lsk/HACKING.textile
index 1038bcc..31a8cfa 100644
--- a/members/arm/openembedded/juno-lsk/HACKING.textile
+++ b/members/arm/openembedded/juno-lsk/HACKING.textile
@@ -32,7 +32,7 @@ Do not use the arm64 defconfig, instead, build a config from the config fragment
bc. ARCH=arm64 scripts/kconfig/merge_config.sh \
linaro/configs/linaro-base.conf \
linaro/configs/distribution.conf \
-linaro/configs/vexpress64.conf \
+linaro/configs/vexpress64.conf
Note: the config fragments are part of the git repository and the source tarball.