Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ad618992f7199fe93c3ecc3dd397ec0bef575933

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent ffe29ebc07
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

kconfig: sync kconfig files with Linux 3.18-rc1 

This commit imports Kconfig updates from Linux 3.18-rc1.

'kvmconfig' and 'tinyconfig' help message have been commented out
since they are unavailable at least now;  in the future perhaps
we can implement 'tinyconfig' to disable most of CONFIG_CMD_* to
create a very small U-Boot image.

[1] commit 3aaefce10351 by Josh Triplett
x86, platform, kconfig: move kvmconfig functionality to a helper

[2] commit 0da1d4a0b951 by Josh Triplett
x86: Add "make tinyconfig" to configure the tiniest possible kernel

[3] commit c40724d3f381 by Brian Norris
  kconfig: lxdialog: fix spelling

[4] commit 7285996aa000 by Brian Norris
  kconfig: nconfig: fix multi-byte UTF handling

Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Showing 2 changed files with 22 additions and 2 deletions Side-by-side Diff

scripts/kconfig/Makefile
Diff comments   View file @ ad61899
... ... @@ -104,6 +104,23 @@
104 104 %_defconfig: $(obj)/conf
105 105 $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
106 106  
  107 +configfiles=$(wildcard $(srctree)/kernel/configs/$(1).config $(srctree)/arch/$(SRCARCH)/configs/$(1).config)
  108 +
  109 +define mergeconfig
  110 +$(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target))
  111 +$(if $(call configfiles,$(1)),, $(error No configuration exists for this target on this architecture))
  112 +$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(call configfiles,$(1))
  113 +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
  114 +endef
  115 +
  116 +PHONY += kvmconfig
  117 +kvmconfig:
  118 + $(call mergeconfig,kvm_guest)
  119 +
  120 +PHONY += tinyconfig
  121 +tinyconfig: allnoconfig
  122 + $(call mergeconfig,tiny)
  123 +
107 124 # Help text used by make help
108 125 help:
109 126 @echo ' config - Update current config utilising a line-oriented program'
... ... @@ -124,6 +141,8 @@
124 141 @echo ' randconfig - New config with random answer to all options'
125 142 @echo ' listnewconfig - List new options'
126 143 @echo ' olddefconfig - Same as silentoldconfig but sets new symbols to their default value'
  144 +# @echo ' kvmconfig - Enable additional options for guest kernel support'
  145 +# @echo ' tinyconfig - Configure the tiniest possible kernel'
127 146  
128 147 # lxdialog stuff
129 148 check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
... ... @@ -191,7 +210,8 @@
191 210 HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
192 211  
193 212 HOSTLOADLIBES_nconf = $(shell \
194   - pkg-config --libs menu panel ncurses 2>/dev/null \
  213 + pkg-config --libs menuw panelw ncursesw 2>/dev/null \
  214 + || pkg-config --libs menu panel ncurses 2>/dev/null \
195 215 || echo "-lmenu -lpanel -lncurses" )
196 216 $(obj)/qconf.o: $(obj)/.tmp_qtcheck
197 217  
scripts/kconfig/lxdialog/dialog.h
Diff comments   View file @ ad61899
... ... @@ -170,7 +170,7 @@
170 170 /* item list manipulation for lxdialog use */
171 171 #define MAXITEMSTR 200
172 172 struct dialog_item {
173   - char str[MAXITEMSTR]; /* promtp displayed */
  173 + char str[MAXITEMSTR]; /* prompt displayed */
174 174 char tag;
175 175 void *data; /* pointer to menu item - used by menubox+checklist */
176 176 int selected; /* Set to 1 by dialog_*() function if selected. */