Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 484cce0d2d86e0a3992ce577cd7045ba6ea72060

Authored by Ben Stoltz
Committed by Simon Glass
1 parent 275854baee
Exists in v2017.01-smarct4x and in 30 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, 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_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-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, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

efi: Drop CONFIG_SYS_TEXT_BASE for EFI 

When U-Boot runs as an EFI application is does not have a definition of
CONFIG_SYS_TEXT_BASE. U-Boot is a relocatable application and the relocation
is done by EFI. U-Boot can be loaded at any address.

Ensure that this CONFIG option is not set in this case.

Signed-off-by: Ben Stoltz <stoltz@google.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Showing 1 changed file with 1 additions and 0 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 # Allow defaults in arch-specific code to override any given here 11 # Allow defaults in arch-specific code to override any given here
12 source "arch/Kconfig" 12 source "arch/Kconfig"
13 13
14 menu "General setup" 14 menu "General setup"
15 15
16 config LOCALVERSION 16 config LOCALVERSION
17 string "Local version - append to U-Boot release" 17 string "Local version - append to U-Boot release"
18 help 18 help
19 Append an extra string to the end of your U-Boot version. 19 Append an extra string to the end of your U-Boot version.
20 This will show up on your boot log, for example. 20 This will show up on your boot log, for example.
21 The string you set here will be appended after the contents of 21 The string you set here will be appended after the contents of
22 any files with a filename matching localversion* in your 22 any files with a filename matching localversion* in your
23 object and source tree, in that order. Your total string can 23 object and source tree, in that order. Your total string can
24 be a maximum of 64 characters. 24 be a maximum of 64 characters.
25 25
26 config LOCALVERSION_AUTO 26 config LOCALVERSION_AUTO
27 bool "Automatically append version information to the version string" 27 bool "Automatically append version information to the version string"
28 default y 28 default y
29 help 29 help
30 This will try to automatically determine if the current tree is a 30 This will try to automatically determine if the current tree is a
31 release tree by looking for git tags that belong to the current 31 release tree by looking for git tags that belong to the current
32 top of tree revision. 32 top of tree revision.
33 33
34 A string of the format -gxxxxxxxx will be added to the localversion 34 A string of the format -gxxxxxxxx will be added to the localversion
35 if a git-based tree is found. The string generated by this will be 35 if a git-based tree is found. The string generated by this will be
36 appended after any matching localversion* files, and after the value 36 appended after any matching localversion* files, and after the value
37 set in CONFIG_LOCALVERSION. 37 set in CONFIG_LOCALVERSION.
38 38
39 (The actual string used here is the first eight characters produced 39 (The actual string used here is the first eight characters produced
40 by running the command: 40 by running the command:
41 41
42 $ git rev-parse --verify HEAD 42 $ git rev-parse --verify HEAD
43 43
44 which is done within the script "scripts/setlocalversion".) 44 which is done within the script "scripts/setlocalversion".)
45 45
46 config CC_OPTIMIZE_FOR_SIZE 46 config CC_OPTIMIZE_FOR_SIZE
47 bool "Optimize for size" 47 bool "Optimize for size"
48 default y 48 default y
49 help 49 help
50 Enabling this option will pass "-Os" instead of "-O2" to gcc 50 Enabling this option will pass "-Os" instead of "-O2" to gcc
51 resulting in a smaller U-Boot image. 51 resulting in a smaller U-Boot image.
52 52
53 This option is enabled by default for U-Boot. 53 This option is enabled by default for U-Boot.
54 54
55 config SYS_MALLOC_F 55 config SYS_MALLOC_F
56 bool "Enable malloc() pool before relocation" 56 bool "Enable malloc() pool before relocation"
57 default y if DM 57 default y if DM
58 help 58 help
59 Before relocation memory is very limited on many platforms. Still, 59 Before relocation memory is very limited on many platforms. Still,
60 we can provide a small malloc() pool if needed. Driver model in 60 we can provide a small malloc() pool if needed. Driver model in
61 particular needs this to operate, so that it can allocate the 61 particular needs this to operate, so that it can allocate the
62 initial serial device and any others that are needed. 62 initial serial device and any others that are needed.
63 63
64 config SYS_MALLOC_F_LEN 64 config SYS_MALLOC_F_LEN
65 hex "Size of malloc() pool before relocation" 65 hex "Size of malloc() pool before relocation"
66 depends on SYS_MALLOC_F 66 depends on SYS_MALLOC_F
67 default 0x400 67 default 0x400
68 help 68 help
69 Before relocation memory is very limited on many platforms. Still, 69 Before relocation memory is very limited on many platforms. Still,
70 we can provide a small malloc() pool if needed. Driver model in 70 we can provide a small malloc() pool if needed. Driver model in
71 particular needs this to operate, so that it can allocate the 71 particular needs this to operate, so that it can allocate the
72 initial serial device and any others that are needed. 72 initial serial device and any others that are needed.
73 73
74 menuconfig EXPERT 74 menuconfig EXPERT
75 bool "Configure standard U-Boot features (expert users)" 75 bool "Configure standard U-Boot features (expert users)"
76 default y 76 default y
77 help 77 help
78 This option allows certain base U-Boot options and settings 78 This option allows certain base U-Boot options and settings
79 to be disabled or tweaked. This is for specialized 79 to be disabled or tweaked. This is for specialized
80 environments which can tolerate a "non-standard" U-Boot. 80 environments which can tolerate a "non-standard" U-Boot.
81 Only use this if you really know what you are doing. 81 Only use this if you really know what you are doing.
82 82
83 if EXPERT 83 if EXPERT
84 config SYS_MALLOC_CLEAR_ON_INIT 84 config SYS_MALLOC_CLEAR_ON_INIT
85 bool "Init with zeros the memory reserved for malloc (slow)" 85 bool "Init with zeros the memory reserved for malloc (slow)"
86 default y 86 default y
87 help 87 help
88 This setting is enabled by default. The reserved malloc 88 This setting is enabled by default. The reserved malloc
89 memory is initialized with zeros, so first malloc calls 89 memory is initialized with zeros, so first malloc calls
90 will return the pointer to the zeroed memory. But this 90 will return the pointer to the zeroed memory. But this
91 slows the boot time. 91 slows the boot time.
92 92
93 It is recommended to disable it, when CONFIG_SYS_MALLOC_LEN 93 It is recommended to disable it, when CONFIG_SYS_MALLOC_LEN
94 value, has more than few MiB, e.g. when uses bzip2 or bmp logo. 94 value, has more than few MiB, e.g. when uses bzip2 or bmp logo.
95 Then the boot time can be significantly reduced. 95 Then the boot time can be significantly reduced.
96 Warning: 96 Warning:
97 When disabling this, please check if malloc calls, maybe 97 When disabling this, please check if malloc calls, maybe
98 should be replaced by calloc - if expects zeroed memory. 98 should be replaced by calloc - if expects zeroed memory.
99 endif 99 endif
100 endmenu # General setup 100 endmenu # General setup
101 101
102 menu "Boot images" 102 menu "Boot images"
103 103
104 config SUPPORT_SPL 104 config SUPPORT_SPL
105 bool 105 bool
106 106
107 config SUPPORT_TPL 107 config SUPPORT_TPL
108 bool 108 bool
109 109
110 config SPL 110 config SPL
111 bool 111 bool
112 depends on SUPPORT_SPL 112 depends on SUPPORT_SPL
113 prompt "Enable SPL" 113 prompt "Enable SPL"
114 help 114 help
115 If you want to build SPL as well as the normal image, say Y. 115 If you want to build SPL as well as the normal image, say Y.
116 116
117 config SPL_STACK_R 117 config SPL_STACK_R
118 depends on SPL 118 depends on SPL
119 bool "Enable SDRAM location for SPL stack" 119 bool "Enable SDRAM location for SPL stack"
120 help 120 help
121 SPL starts off execution in SRAM and thus typically has only a small 121 SPL starts off execution in SRAM and thus typically has only a small
122 stack available. Since SPL sets up DRAM while in its board_init_f() 122 stack available. Since SPL sets up DRAM while in its board_init_f()
123 function, it is possible for the stack to move there before 123 function, it is possible for the stack to move there before
124 board_init_r() is reached. This option enables a special SDRAM 124 board_init_r() is reached. This option enables a special SDRAM
125 location for the SPL stack. U-Boot SPL switches to this after 125 location for the SPL stack. U-Boot SPL switches to this after
126 board_init_f() completes, and before board_init_r() starts. 126 board_init_f() completes, and before board_init_r() starts.
127 127
128 config SPL_STACK_R_ADDR 128 config SPL_STACK_R_ADDR
129 depends on SPL_STACK_R 129 depends on SPL_STACK_R
130 hex "SDRAM location for SPL stack" 130 hex "SDRAM location for SPL stack"
131 help 131 help
132 Specify the address in SDRAM for the SPL stack. This will be set up 132 Specify the address in SDRAM for the SPL stack. This will be set up
133 before board_init_r() is called. 133 before board_init_r() is called.
134 134
135 config TPL 135 config TPL
136 bool 136 bool
137 depends on SPL && SUPPORT_TPL 137 depends on SPL && SUPPORT_TPL
138 prompt "Enable TPL" 138 prompt "Enable TPL"
139 help 139 help
140 If you want to build TPL as well as the normal image and SPL, say Y. 140 If you want to build TPL as well as the normal image and SPL, say Y.
141 141
142 config FIT 142 config FIT
143 bool "Support Flattened Image Tree" 143 bool "Support Flattened Image Tree"
144 help 144 help
145 This option allows to boot the new uImage structrure, 145 This option allows to boot the new uImage structrure,
146 Flattened Image Tree. FIT is formally a FDT, which can include 146 Flattened Image Tree. FIT is formally a FDT, which can include
147 images of various types (kernel, FDT blob, ramdisk, etc.) 147 images of various types (kernel, FDT blob, ramdisk, etc.)
148 in a single blob. To boot this new uImage structure, 148 in a single blob. To boot this new uImage structure,
149 pass the the address of the blob to the "bootm" command. 149 pass the the address of the blob to the "bootm" command.
150 150
151 config FIT_VERBOSE 151 config FIT_VERBOSE
152 bool "Display verbose messages on FIT boot" 152 bool "Display verbose messages on FIT boot"
153 depends on FIT 153 depends on FIT
154 154
155 config FIT_SIGNATURE 155 config FIT_SIGNATURE
156 bool "Enable signature verification of FIT uImages" 156 bool "Enable signature verification of FIT uImages"
157 depends on FIT 157 depends on FIT
158 depends on DM 158 depends on DM
159 select RSA 159 select RSA
160 help 160 help
161 This option enables signature verification of FIT uImages, 161 This option enables signature verification of FIT uImages,
162 using a hash signed and verified using RSA. If 162 using a hash signed and verified using RSA. If
163 CONFIG_SHA_PROG_HW_ACCEL is defined, i.e support for progressive 163 CONFIG_SHA_PROG_HW_ACCEL is defined, i.e support for progressive
164 hashing is available using hardware, RSA library will use it. 164 hashing is available using hardware, RSA library will use it.
165 See doc/uImage.FIT/signature.txt for more details. 165 See doc/uImage.FIT/signature.txt for more details.
166 166
167 config SYS_EXTRA_OPTIONS 167 config SYS_EXTRA_OPTIONS
168 string "Extra Options (DEPRECATED)" 168 string "Extra Options (DEPRECATED)"
169 help 169 help
170 The old configuration infrastructure (= mkconfig + boards.cfg) 170 The old configuration infrastructure (= mkconfig + boards.cfg)
171 provided the extra options field. If you have something like 171 provided the extra options field. If you have something like
172 "HAS_BAR,BAZ=64", the optional options 172 "HAS_BAR,BAZ=64", the optional options
173 #define CONFIG_HAS 173 #define CONFIG_HAS
174 #define CONFIG_BAZ 64 174 #define CONFIG_BAZ 64
175 will be defined in include/config.h. 175 will be defined in include/config.h.
176 This option was prepared for the smooth migration from the old 176 This option was prepared for the smooth migration from the old
177 configuration to Kconfig. Since this option will be removed sometime, 177 configuration to Kconfig. Since this option will be removed sometime,
178 new boards should not use this option. 178 new boards should not use this option.
179 179
180 config SYS_TEXT_BASE 180 config SYS_TEXT_BASE
181 depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP 181 depends on SPARC || ARC || X86 || ARCH_UNIPHIER || ARCH_ZYNQMP
182 depends on !EFI_APP
182 hex "Text Base" 183 hex "Text Base"
183 help 184 help
184 TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture 185 TODO: Move CONFIG_SYS_TEXT_BASE for all the architecture
185 186
186 config SYS_CLK_FREQ 187 config SYS_CLK_FREQ
187 depends on ARC || ARCH_SUNXI 188 depends on ARC || ARCH_SUNXI
188 int "CPU clock frequency" 189 int "CPU clock frequency"
189 help 190 help
190 TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture 191 TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture
191 192
192 endmenu # Boot images 193 endmenu # Boot images
193 194
194 source "common/Kconfig" 195 source "common/Kconfig"
195 196
196 source "dts/Kconfig" 197 source "dts/Kconfig"
197 198
198 source "net/Kconfig" 199 source "net/Kconfig"
199 200
200 source "drivers/Kconfig" 201 source "drivers/Kconfig"
201 202
202 source "fs/Kconfig" 203 source "fs/Kconfig"
203 204
204 source "lib/Kconfig" 205 source "lib/Kconfig"
205 206
206 source "test/Kconfig" 207 source "test/Kconfig"
207 208