diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-11-17 12:33:22 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2010-11-17 12:33:22 +0100 |
| commit | ee9b4450f07c9d139f03a17e84f555072d380dde (patch) | |
| tree | ea4b09cfde7c824f6be18726b2a743edad586d96 /scripts/libptxdist.sh | |
| parent | 5dad57e859e8ef67989fa5d1e28f07708f99920e (diff) | |
| parent | 45b12d55ffdfa2a1f55fe03cbe1a9d52e0a04a57 (diff) | |
| download | ptxdist-ee9b4450f07c9d139f03a17e84f555072d380dde.tar.gz ptxdist-ee9b4450f07c9d139f03a17e84f555072d380dde.tar.xz | |
Merge branch 'next/kconfig'
Diffstat (limited to 'scripts/libptxdist.sh')
| -rw-r--r-- | scripts/libptxdist.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh index efde657d9..121307f58 100644 --- a/scripts/libptxdist.sh +++ b/scripts/libptxdist.sh @@ -261,6 +261,7 @@ ptxd_kconfig() { local conf="${PTXDIST_TOPDIR}/scripts/kconfig/conf" local mconf="${PTXDIST_TOPDIR}/scripts/kconfig/mconf" + local nconf="${PTXDIST_TOPDIR}/scripts/kconfig/nconf" export \ KCONFIG_NOTIMESTAMP="1" \ @@ -271,6 +272,9 @@ ptxd_kconfig() { menuconfig) "${mconf}" "${file_kconfig}" ;; + nconfig) + "${nconf}" "${file_kconfig}" + ;; oldconfig) # # In silent mode, we cannot redirect input. So use @@ -279,23 +283,23 @@ ptxd_kconfig() { # ptxd_kconfig_migrate "${part}" && if tty -s; then - "${conf}" -s "${file_kconfig}" + "${conf}" --silentoldconfig "${file_kconfig}" else - "${conf}" -o "${file_kconfig}" + "${conf}" --oldconfig "${file_kconfig}" fi ;; allmodconfig) - "${conf}" -m "${file_kconfig}" + "${conf}" --allmodconfig "${file_kconfig}" ;; allyesconfig) - "${conf}" -y "${file_kconfig}" + "${conf}" --allyesconfig "${file_kconfig}" ;; allnoconfig) - "${conf}" -n "${file_kconfig}" + "${conf}" --allnoconfig "${file_kconfig}" ;; dep) copy_back="false" - yes "" | "${conf}" -O "${file_kconfig}" && + yes "" | "${conf}" --writedepend "${file_kconfig}" && cp -- ".config" "${PTXDIST_DGEN_DIR}/${part}config" ;; *) |