Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 15dc63d646bd73f473141653db9a20a71aaaeced

Authored by Simon Glass
Committed by Tom Rini
1 parent 5d47099fea
Exists in smarc_8mq_lf_v2020.04 and in 17 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_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.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

Convert CONFIG_CMD_SAVES to Kconfig 

This converts the following to Kconfig:
   CONFIG_CMD_SAVES

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

Showing 21 changed files with 16 additions and 73 deletions Side-by-side Diff

... ... @@ -815,7 +815,6 @@
815 815 CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network
816 816 host
817 817 CONFIG_CMD_RUN run command in env variable
818   - CONFIG_CMD_SAVES * save S record dump
819 818 CONFIG_CMD_SDRAM * print SDRAM configuration information
820 819 (requires CONFIG_CMD_I2C)
821 820 CONFIG_CMD_SF * Read/write/erase SPI NOR flash
... ... @@ -308,6 +308,7 @@
308 308 config ARCH_DAVINCI
309 309 bool "TI DaVinci"
310 310 select CPU_ARM926EJS
  311 + imply CMD_SAVES
311 312 help
312 313 Support for TI's DaVinci platform.
313 314  
314 315  
315 316  
316 317  
... ... @@ -409,21 +410,25 @@
409 410 bool "Support spear300"
410 411 select CPU_ARM926EJS
411 412 select BOARD_EARLY_INIT_F
  413 + imply CMD_SAVES
412 414  
413 415 config TARGET_SPEAR310
414 416 bool "Support spear310"
415 417 select CPU_ARM926EJS
416 418 select BOARD_EARLY_INIT_F
  419 + imply CMD_SAVES
417 420  
418 421 config TARGET_SPEAR320
419 422 bool "Support spear320"
420 423 select CPU_ARM926EJS
421 424 select BOARD_EARLY_INIT_F
  425 + imply CMD_SAVES
422 426  
423 427 config TARGET_SPEAR600
424 428 bool "Support spear600"
425 429 select CPU_ARM926EJS
426 430 select BOARD_EARLY_INIT_F
  431 + imply CMD_SAVES
427 432  
428 433 config TARGET_STV0991
429 434 bool "Support stv0991"
... ... @@ -575,6 +580,7 @@
575 580 select CMD_POWEROFF
576 581 imply CMD_MTDPARTS
577 582 imply FIT
  583 + imply CMD_SAVES
578 584  
579 585 config ARCH_OMAP2PLUS
580 586 bool "TI OMAP2+"
... ... @@ -779,6 +779,12 @@
779 779 Attachment, where AT refers to an IBM AT (Advanced Technology)
780 780 computer released in 1984.
781 781  
  782 +config CMD_SAVES
  783 + bool "saves - Save a file over serial in S-Record format"
  784 + help
  785 + Provides a way to save a binary file using the Motorola S-Record
  786 + format over the serial line.
  787 +
782 788 config CMD_SF
783 789 bool "sf"
784 790 help
configs/ethernut5_defconfig
Diff comments   View file @ 15dc63d
... ... @@ -20,6 +20,7 @@
20 20 CONFIG_CMD_I2C=y
21 21 CONFIG_CMD_USB=y
22 22 # CONFIG_CMD_FPGA is not set
  23 +CONFIG_CMD_SAVES=y
23 24 CONFIG_CMD_RARP=y
24 25 CONFIG_CMD_DHCP=y
25 26 CONFIG_CMD_MII=y
configs/microblaze-generic_defconfig
Diff comments   View file @ 15dc63d
... ... @@ -24,6 +24,7 @@
24 24 CONFIG_CMD_ASKENV=y
25 25 CONFIG_CMD_GPIO=y
26 26 CONFIG_CMD_MFSL=y
  27 +CONFIG_CMD_SAVES=y
27 28 # CONFIG_CMD_SETEXPR is not set
28 29 CONFIG_CMD_TFTPPUT=y
29 30 CONFIG_CMD_DHCP=y
configs/x600_defconfig
Diff comments   View file @ 15dc63d
... ... @@ -24,6 +24,7 @@
24 24 CONFIG_CMD_USB=y
25 25 CONFIG_CMD_FPGA_LOADMK=y
26 26 CONFIG_CMD_GPIO=y
  27 +CONFIG_CMD_SAVES=y
27 28 # CONFIG_CMD_SETEXPR is not set
28 29 CONFIG_CMD_DHCP=y
29 30 CONFIG_CMD_MII=y
configs/xtfpga_defconfig
Diff comments   View file @ 15dc63d
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_AUTOBOOT_STOP_STR=" "
11 11 CONFIG_CMD_ASKENV=y
12 12 CONFIG_CRC32_VERIFY=y
  13 +CONFIG_CMD_SAVES=y
13 14 CONFIG_CMD_DHCP=y
14 15 CONFIG_CMD_PING=y
15 16 CONFIG_CMD_DIAG=y
include/config_cmd_all.h
Diff comments   View file @ 15dc63d
... ... @@ -13,7 +13,6 @@
13 13 * Alphabetical list of all possible commands.
14 14 */
15 15  
16   -#define CONFIG_CMD_SAVES /* save S record dump */
17 16 #define CONFIG_CMD_SDRAM /* SDRAM DIMM SPD info printout */
18 17 #define CONFIG_CMD_TERMINAL /* built-in Serial Terminal */
19 18 #define CONFIG_CMD_UNIVERSE /* Tundra Universe Support */
include/configs/calimain.h
Diff comments   View file @ 15dc63d
... ... @@ -294,14 +294,6 @@
294 294 "echo Product: $product; " \
295 295 "gpio c 1; gpio c 2;"
296 296  
297   -/*
298   - * U-Boot commands
299   - */
300   -#define CONFIG_CMD_SAVES
301   -
302   -#ifndef CONFIG_DRIVER_TI_EMAC
303   -#endif
304   -
305 297 /* additions for new relocation code, must added to all boards */
306 298 #define CONFIG_SYS_SDRAM_BASE 0xc0000000
307 299 /* initial stack pointer in internal SRAM */
include/configs/da850evm.h
Diff comments   View file @ 15dc63d
... ... @@ -263,11 +263,6 @@
263 263 "mem=32M console=ttyS2,115200n8 root=/dev/mtdblock2 rw noinitrd ip=dhcp"
264 264 #define CONFIG_EXTRA_ENV_SETTINGS "hwconfig=dsp:wake=yes"
265 265  
266   -/*
267   - * U-Boot commands
268   - */
269   -#define CONFIG_CMD_SAVES
270   -
271 266 #ifdef CONFIG_CMD_BDI
272 267 #define CONFIG_CLOCKS
273 268 #endif
include/configs/ea20.h
Diff comments   View file @ 15dc63d
... ... @@ -121,11 +121,6 @@
121 121 #define CONFIG_CMDLINE_TAG
122 122 #define CONFIG_SETUP_MEMORY_TAGS
123 123  
124   -/*
125   - * U-Boot commands
126   - */
127   -#define CONFIG_CMD_SAVES
128   -
129 124 #ifdef CONFIG_CMD_BDI
130 125 #define CONFIG_CLOCKS
131 126 #endif
include/configs/ethernut5.h
Diff comments   View file @ 15dc63d
... ... @@ -61,7 +61,6 @@
61 61 #define CONFIG_ENV_SPI_MAX_HZ 15000000
62 62  
63 63 #ifndef MINIMAL_LOADER
64   -#define CONFIG_CMD_SAVES
65 64 #endif
66 65  
67 66 /* NAND flash */
include/configs/ipam390.h
Diff comments   View file @ 15dc63d
... ... @@ -236,11 +236,6 @@
236 236 "nand write c0000100 180000 20000\0" \
237 237 "\0"
238 238  
239   -/*
240   - * U-Boot commands
241   - */
242   -#define CONFIG_CMD_SAVES
243   -
244 239 #ifdef CONFIG_CMD_BDI
245 240 #define CONFIG_CLOCKS
246 241 #endif
include/configs/legoev3.h
Diff comments   View file @ 15dc63d
... ... @@ -197,11 +197,6 @@
197 197 "loadbootscr=fatload mmc 0 ${bootscraddr} boot.scr\0" \
198 198 "bootscript=source ${bootscraddr}\0" \
199 199  
200   -/*
201   - * U-Boot commands
202   - */
203   -#define CONFIG_CMD_SAVES
204   -
205 200 #ifdef CONFIG_CMD_BDI
206 201 #define CONFIG_CLOCKS
207 202 #endif
include/configs/microblaze-generic.h
Diff comments   View file @ 15dc63d
... ... @@ -160,24 +160,6 @@
160 160 #define CONFIG_BOOTP_GATEWAY
161 161 #define CONFIG_BOOTP_HOSTNAME
162 162  
163   -/*
164   - * Command line configuration.
165   - */
166   -
167   -#if defined(FLASH)
168   -# if !defined(RAMENV)
169   -# define CONFIG_CMD_SAVES
170   -# endif
171   -
172   -#else
173   -#if defined(SPIFLASH)
174   -
175   -# if !defined(RAMENV)
176   -# define CONFIG_CMD_SAVES
177   -# endif
178   -#endif
179   -#endif
180   -
181 163 #if defined(CONFIG_CMD_JFFS2)
182 164 # define CONFIG_MTD_PARTITIONS
183 165 #endif
include/configs/omapl138_lcdk.h
Diff comments   View file @ 15dc63d
... ... @@ -274,10 +274,6 @@
274 274 "boot_fit=0\0" \
275 275 "console=ttyS2,115200n8\0"
276 276  
277   -/*
278   - * U-Boot commands
279   - */
280   -#define CONFIG_CMD_SAVES
281 277 #ifdef CONFIG_CMD_BDI
282 278 #define CONFIG_CLOCKS
283 279 #endif
include/configs/spear-common.h
Diff comments   View file @ 15dc63d
... ... @@ -93,11 +93,6 @@
93 93 #define CONFIG_SYS_NAND_ONFI_DETECTION
94 94  
95 95 /*
96   - * Command support defines
97   - */
98   -#define CONFIG_CMD_SAVES
99   -
100   -/*
101 96 * Default Environment Varible definitions
102 97 */
103 98 #define CONFIG_ENV_OVERWRITE
include/configs/ti_armv7_keystone2.h
Diff comments   View file @ 15dc63d
... ... @@ -197,9 +197,6 @@
197 197 #define CONFIG_DEV_USB_PHY_BASE KS2_DEV_USB_PHY_BASE
198 198 #define CONFIG_USB_PHY_CFG_BASE KS2_USB_PHY_CFG_BASE
199 199  
200   -/* U-Boot command configuration */
201   -#define CONFIG_CMD_SAVES
202   -
203 200 /* U-Boot general configuration */
204 201 #define CONFIG_MISC_INIT_R
205 202 #define CONFIG_MX_CYCLIC
include/configs/x600.h
Diff comments   View file @ 15dc63d
... ... @@ -97,11 +97,6 @@
97 97 #define CONFIG_USB_EHCI_SPEAR
98 98 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
99 99  
100   -/*
101   - * Command support defines
102   - */
103   -#define CONFIG_CMD_SAVES
104   -
105 100 /* Filesystem support (for USB key) */
106 101 #define CONFIG_SUPPORT_VFAT
107 102  
include/configs/xtfpga.h
Diff comments   View file @ 15dc63d
... ... @@ -123,12 +123,6 @@
123 123 /* Boot Argument Buffer Size */
124 124 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
125 125  
126   -/*=================*/
127   -/* U-Boot commands */
128   -/*=================*/
129   -
130   -#define CONFIG_CMD_SAVES
131   -
132 126 /*==============================*/
133 127 /* U-Boot autoboot configuration */
134 128 /*==============================*/
scripts/config_whitelist.txt
Diff comments   View file @ 15dc63d
... ... @@ -293,7 +293,6 @@
293 293 CONFIG_CMDLINE_EDITING
294 294 CONFIG_CMDLINE_PS_SUPPORT
295 295 CONFIG_CMDLINE_TAG
296   -CONFIG_CMD_SAVES
297 296 CONFIG_CMD_SCSI
298 297 CONFIG_CMD_SDRAM
299 298 CONFIG_CMD_SF_TEST