Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit e91c3c332beeb271ab8ee39614a2f96df749cdc2

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 390f7035d3
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: add CONFIG_LOCALVERSION and CONFIG_LOCALVERSION_AUTO 

Copy Kconfig options from "init/Kconfig" of Linux v3.16 tag
and adjust some parts of the help document.

Move CONFIG_SPL, CONFIG_TPL, ... etc. to "Boot images" menu.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Showing 1 changed file with 37 additions and 1 deletions Inline Diff

1 # 1 #
2 # For a description of the syntax of this configuration file, 2 # For a description of the syntax of this configuration file,
3 # see Documentation/kbuild/kconfig-language.txt. 3 # see Documentation/kbuild/kconfig-language.txt.
4 # 4 #
5 mainmenu "U-Boot $UBOOTVERSION Configuration" 5 mainmenu "U-Boot $UBOOTVERSION Configuration"
6 6
7 config UBOOTVERSION 7 config UBOOTVERSION
8 string 8 string
9 option env="UBOOTVERSION" 9 option env="UBOOTVERSION"
10 10
11 config KCONFIG_OBJDIR 11 config KCONFIG_OBJDIR
12 string 12 string
13 option env="KCONFIG_OBJDIR" 13 option env="KCONFIG_OBJDIR"
14 14
15 menu "General setup" 15 menu "General setup"
16 16
17 config LOCALVERSION
18 string "Local version - append to U-Boot release"
19 depends on !SPL_BUILD
20 help
21 Append an extra string to the end of your U-Boot version.
22 This will show up on your boot log, for example.
23 The string you set here will be appended after the contents of
24 any files with a filename matching localversion* in your
25 object and source tree, in that order. Your total string can
26 be a maximum of 64 characters.
27
28 config LOCALVERSION_AUTO
29 bool "Automatically append version information to the version string"
30 depends on !SPL_BUILD
31 default y
32 help
33 This will try to automatically determine if the current tree is a
34 release tree by looking for git tags that belong to the current
35 top of tree revision.
36
37 A string of the format -gxxxxxxxx will be added to the localversion
38 if a git-based tree is found. The string generated by this will be
39 appended after any matching localversion* files, and after the value
40 set in CONFIG_LOCALVERSION.
41
42 (The actual string used here is the first eight characters produced
43 by running the command:
44
45 $ git rev-parse --verify HEAD
46
47 which is done within the script "scripts/setlocalversion".)
48
49 endmenu # General setup
50
51 menu "Boot images"
52
17 config SPL_BUILD 53 config SPL_BUILD
18 bool 54 bool
19 depends on $KCONFIG_OBJDIR="spl" || $KCONFIG_OBJDIR="tpl" 55 depends on $KCONFIG_OBJDIR="spl" || $KCONFIG_OBJDIR="tpl"
20 default y 56 default y
21 57
22 config TPL_BUILD 58 config TPL_BUILD
23 bool 59 bool
24 depends on $KCONFIG_OBJDIR="tpl" 60 depends on $KCONFIG_OBJDIR="tpl"
25 default y 61 default y
26 62
27 config SPL 63 config SPL
28 bool 64 bool
29 prompt "Enable SPL" if !SPL_BUILD 65 prompt "Enable SPL" if !SPL_BUILD
30 default y if SPL_BUILD 66 default y if SPL_BUILD
31 help 67 help
32 If you want to build SPL as well as the normal image, say Y. 68 If you want to build SPL as well as the normal image, say Y.
33 69
34 config TPL 70 config TPL
35 bool 71 bool
36 depends on SPL 72 depends on SPL
37 prompt "Enable TPL" if !SPL_BUILD 73 prompt "Enable TPL" if !SPL_BUILD
38 default y if TPL_BUILD 74 default y if TPL_BUILD
39 default n 75 default n
40 help 76 help
41 If you want to build TPL as well as the normal image and SPL, say Y. 77 If you want to build TPL as well as the normal image and SPL, say Y.
42 78
43 config SYS_EXTRA_OPTIONS 79 config SYS_EXTRA_OPTIONS
44 string "Extra Options (DEPRECATED)" 80 string "Extra Options (DEPRECATED)"
45 depends on !SPL_BUILD 81 depends on !SPL_BUILD
46 help 82 help
47 The old configuration infrastructure (= mkconfig + boards.cfg) 83 The old configuration infrastructure (= mkconfig + boards.cfg)
48 provided the extra options field. It you have something like 84 provided the extra options field. It you have something like
49 "HAS_BAR,BAZ=64", the optional options 85 "HAS_BAR,BAZ=64", the optional options
50 #define CONFIG_HAS 86 #define CONFIG_HAS
51 #define CONFIG_BAZ 64 87 #define CONFIG_BAZ 64
52 will be defined in include/config.h. 88 will be defined in include/config.h.
53 This option was prepared for the smooth migration from the old 89 This option was prepared for the smooth migration from the old
54 configuration to Kconfig. Since this option will be removed sometime, 90 configuration to Kconfig. Since this option will be removed sometime,
55 new boards should not use this option. 91 new boards should not use this option.
56 92
57 endmenu # General setup 93 endmenu # Boot images
58 94
59 source "arch/Kconfig" 95 source "arch/Kconfig"
60 96