summaryrefslogtreecommitdiffstats
path: root/package/Config.in.host
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2012-05-31 09:23:23 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2012-05-31 09:23:23 +0200
commitbdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2 (patch)
treed6012109e704c5e9abc709c23a7133a3d4b4f779 /package/Config.in.host
parent5b11223fb6cd0469becf49b0986868832c076bfc (diff)
parent2105ecbd86d04e446effa11108f6bd755ed5f19a (diff)
downloadbuildroot-novena-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.tar.gz
buildroot-novena-bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2.zip
Merge branch 'next'
Conflicts: toolchain/kernel-headers/Config.in
Diffstat (limited to 'package/Config.in.host')
-rw-r--r--package/Config.in.host1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/Config.in.host b/package/Config.in.host
index 861b7367d..9fcfede00 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -1,6 +1,7 @@
menu "Host utilities"
source "package/lpc3250loader/Config.in.host"
+source "package/omap-u-boot-utils/Config.in.host"
source "package/openocd/Config.in.host"
source "package/sam-ba/Config.in.host"
source "package/uboot-tools/Config.in.host"