diff options
| author | Tom Rini <[email protected]> | 2021-08-31 17:52:28 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-08-31 17:55:32 -0400 |
| commit | df6cf3d809fe543651e6bdf133baaa8b9841fe0f (patch) | |
| tree | a884597e97578cb074adc33d3dd961d6675c9879 /cmd | |
| parent | a85a8e63c5cf8ccb3905eb5982bf8bdcb2978557 (diff) | |
| parent | b4c2c151b14b59a2403675526adf666710cade67 (diff) | |
Merge branch '2021-08-31-kconfig-migrations-part2' into next
- Further CONFIG to Kconfig migrations
- Some DDR related symbols
- CONFIG_SYS_LOAD_ADDR moved, loadaddr always set in environment now.
- Finish MX7D, convert IMX_CONFIG
- Some RAMBOOT related options
- L1 cache size converted and named consistently for all arches. A
further follow-up to rename things for even better clarity is welcome.
- CONFIG_SKIP_LOWLEVEL_INIT, CONFIG_SYS_MALLOC_LEN
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 9 | ||||
| -rw-r--r-- | cmd/mvebu/Kconfig | 1 | ||||
| -rw-r--r-- | cmd/qfw.c | 6 |
3 files changed, 1 insertions, 15 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 41aba385ca9..d8fc5a171bb 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -471,7 +471,6 @@ config CMD_SAVEENV config CMD_ERASEENV bool "eraseenv" - default n depends on CMD_SAVEENV help Erase environment variables from the compiled-in persistent @@ -652,14 +651,12 @@ config LOOPW config CMD_MD5SUM bool "md5sum" - default n select MD5 help Compute MD5 checksum. config MD5SUM_VERIFY bool "md5sum -v" - default n depends on CMD_MD5SUM help Add -v option to verify data against an MD5 checksum. @@ -1119,7 +1116,6 @@ if CMD_MMC config CMD_BKOPS_ENABLE bool "mmc bkops enable" depends on CMD_MMC - default n help Enable command for setting manual background operations handshake on a eMMC device. The feature is optionally available on eMMC devices @@ -1447,7 +1443,6 @@ config CMD_SETEXPR config CMD_SETEXPR_FMT bool "setexpr_fmt" - default n depends on CMD_SETEXPR help Evaluate format string expression and store result in an environment @@ -1459,7 +1454,6 @@ menu "Android support commands" config CMD_AB_SELECT bool "ab_select" - default n depends on ANDROID_AB help On Android devices with more than one boot slot (multiple copies of @@ -1764,7 +1758,6 @@ config CMD_EFIDEBUG bool "efidebug - display/configure UEFI environment" depends on EFI_LOADER select EFI_DEVICE_PATH_TO_TEXT - default n help Enable the 'efidebug' command which provides a subset of UEFI shell utility with simplified functionality. It will be useful @@ -2367,7 +2360,6 @@ config CMD_TRACE config CMD_AVB bool "avb - Android Verified Boot 2.0 operations" depends on AVB_VERIFY - default n help Enables a "avb" command to perform verification of partitions using Android Verified Boot 2.0 functionality. It includes such subcommands: @@ -2407,7 +2399,6 @@ config CMD_UBI config CMD_UBI_RENAME bool "Enable rename" depends on CMD_UBI - default n help Enable a "ubi" command to rename ubi volume: ubi rename <oldname> <newname> diff --git a/cmd/mvebu/Kconfig b/cmd/mvebu/Kconfig index 7c42c75afbe..4afe0bf32dd 100644 --- a/cmd/mvebu/Kconfig +++ b/cmd/mvebu/Kconfig @@ -3,7 +3,6 @@ depends on ARCH_MVEBU config CMD_MVEBU_BUBT bool "bubt" - default n help bubt - Burn a u-boot image to flash For details about bubt command please see the documentation diff --git a/cmd/qfw.c b/cmd/qfw.c index eb6a552f6fa..d58615040c6 100644 --- a/cmd/qfw.c +++ b/cmd/qfw.c @@ -121,11 +121,7 @@ static int qemu_fwcfg_do_load(struct cmd_tbl *cmdtp, int flag, env = env_get("loadaddr"); load_addr = env ? (void *)hextoul(env, NULL) : -#ifdef CONFIG_LOADADDR - (void *)CONFIG_LOADADDR; -#else - NULL; -#endif + (void *)CONFIG_SYS_LOAD_ADDR; env = env_get("ramdiskaddr"); initrd_addr = env ? |
