@@ -605,44 +605,74 @@ pass2dep: context tools/mkdeps$(HOSTEXEEXT) tools/cnvwindeps$(HOSTEXEEXT)
605
605
KCONFIG_ENV = APPSDIR=${CONFIG_APPS_DIR} EXTERNALDIR=$(EXTERNALDIR )
606
606
KCONFIG_ENV += APPSBINDIR=${CONFIG_APPS_DIR} BINDIR=${TOPDIR}
607
607
608
+ KCONFIG_LIB = $(shell command -v menuconfig 2> /dev/null)
609
+
610
+ # Prefer "kconfiglib" if host OS supports it
611
+
612
+ ifeq ($(KCONFIG_LIB ) ,)
613
+ KCONFIG_OLDCONFIG = kconfig-conf --oldconfig Kconfig
614
+ KCONFIG_OLDDEFCONFIG = kconfig-conf --olddefconfig Kconfig
615
+ KCONFIG_MENUCONFIG = kconfig-mconf Kconfig
616
+ KCONFIG_NCONFIG = kconfig-nconf Kconfig
617
+ KCONFIG_QCONFIG = kconfig-qconf Kconfig
618
+ KCONFIG_GCONFIG = kconfig-gconf Kconfig
619
+ KCONFIG_SAVEDEFCONFIG = kconfig-conf Kconfig --savedefconfig
620
+ define kconfig_tweak_disable
621
+ kconfig-tweak --file $1 -u $2
622
+ endef
623
+ else
624
+ KCONFIG_OLDCONFIG = oldconfig
625
+ KCONFIG_OLDDEFCONFIG = olddefconfig
626
+ KCONFIG_MENUCONFIG = menuconfig
627
+ KCONFIG_NCONFIG = guiconfig
628
+ KCONFIG_QCONFIG = ${KCONFIG_NCONFIG}
629
+ KCONFIG_GCONFIG = ${KCONFIG_NCONFIG}
630
+ KCONFIG_SAVEDEFCONFIG = savedefconfig --out
631
+ define kconfig_tweak_disable
632
+ sed -i '/$2/d' $1
633
+ endef
634
+ endif
635
+
636
+ KCONFIG_CONF = kconfig-conf
637
+
608
638
config :
609
639
$(Q ) $(MAKE ) clean_context
610
640
$(Q ) $(MAKE ) apps_preconfig
611
- $(Q ) ${KCONFIG_ENV} kconfig-conf Kconfig
641
+ $(Q ) ${KCONFIG_ENV} ${KCONFIG_CONF}
612
642
613
643
oldconfig :
614
644
$(Q ) $(MAKE ) clean_context
615
645
$(Q ) $(MAKE ) apps_preconfig
616
- $(Q ) ${KCONFIG_ENV} kconfig-conf --oldconfig Kconfig
646
+ $(Q ) ${KCONFIG_ENV} ${KCONFIG_OLDCONFIG}
617
647
618
648
olddefconfig :
619
649
$(Q ) $(MAKE ) clean_context
620
650
$(Q ) $(MAKE ) apps_preconfig
621
- $(Q ) ${KCONFIG_ENV} kconfig-conf --olddefconfig Kconfig
651
+ $(Q ) ${KCONFIG_ENV} ${KCONFIG_OLDDEFCONFIG}
622
652
623
653
menuconfig :
624
654
$(Q ) $(MAKE ) clean_context
625
655
$(Q ) $(MAKE ) apps_preconfig
626
- $(Q ) ${KCONFIG_ENV} kconfig-mconf Kconfig
656
+ $(Q ) ${KCONFIG_ENV} ${KCONFIG_MENUCONFIG}
627
657
628
658
nconfig : apps_preconfig
629
659
$(Q ) $(MAKE ) clean_context
630
660
$(Q ) $(MAKE ) apps_preconfig
631
- $(Q ) ${KCONFIG_ENV} kconfig-nconf Kconfig
661
+ $(Q ) ${KCONFIG_ENV} ${KCONFIG_NCONFIG}
632
662
633
663
qconfig : apps_preconfig
634
664
$(Q ) $(MAKE ) clean_context
635
665
$(Q ) $(MAKE ) apps_preconfig
636
- $(Q ) ${KCONFIG_ENV} kconfig-qconf Kconfig
666
+ $(Q ) ${KCONFIG_ENV} ${KCONFIG_QCONFIG}
637
667
638
668
gconfig : apps_preconfig
639
669
$(Q ) $(MAKE ) clean_context
640
670
$(Q ) $(MAKE ) apps_preconfig
641
- $(Q ) ${KCONFIG_ENV} kconfig-gconf Kconfig
671
+ $(Q ) ${KCONFIG_ENV} ${KCONFIG_GCONFIG}
642
672
643
673
savedefconfig : apps_preconfig
644
- $(Q ) ${KCONFIG_ENV} kconfig-conf --savedefconfig defconfig.tmp Kconfig
645
- $(Q ) kconfig-tweak --file defconfig.tmp -u CONFIG_APPS_DIR
674
+ $(Q ) ${KCONFIG_ENV} ${KCONFIG_SAVEDEFCONFIG} defconfig.tmp
675
+ $(Q ) $( call kconfig_tweak_disable, defconfig.tmp, CONFIG_APPS_DIR)
646
676
$(Q ) grep " CONFIG_ARCH=" .config >> defconfig.tmp
647
677
$(Q ) grep " ^CONFIG_ARCH_CHIP_" .config >> defconfig.tmp; true
648
678
$(Q ) grep " CONFIG_ARCH_CHIP=" .config >> defconfig.tmp; true
0 commit comments