diff options
| author | Tom Rini <[email protected]> | 2020-08-28 08:51:37 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-08-28 08:51:37 -0400 |
| commit | 9f04a634ef331b4fc6b3e677f276156192a413c7 (patch) | |
| tree | a6b8663e5d156f85846d187248597888043e0d3e /cmd | |
| parent | f87c80ade3911f3d518036a28370fe44c85a95c7 (diff) | |
| parent | 2ed1b242ab2f9ee7541ae0a655de67832a3eebc1 (diff) | |
Merge branch '2020-08-27-misc-fixes'
- Fix for gd->ram_top and bootm_size calculations
- Assorted Kconfig entry cleanups / fixes.
- Make checkpatch.pl error on fdt_high/initrd_high=0xffffffff
- Resync scripts/setlocalversion
- Other minor bugfixes
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/Kconfig | 2 | ||||
| -rw-r--r-- | cmd/mem.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 30c26b5d2bc..0761dbb7460 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -860,7 +860,7 @@ config CMD_ARMFLASH config CMD_ADC bool "adc - Access Analog to Digital Converters info and data" select ADC - select DM_REGULATOR + depends on DM_REGULATOR help Shows ADC device info and permit printing one-shot analog converted data from a named Analog to Digital Converter. diff --git a/cmd/mem.c b/cmd/mem.c index 190e2b94a7d..9df5eb068a7 100644 --- a/cmd/mem.c +++ b/cmd/mem.c @@ -30,10 +30,6 @@ DECLARE_GLOBAL_DATA_PTR; -#ifndef CONFIG_SYS_MEMTEST_SCRATCH -#define CONFIG_SYS_MEMTEST_SCRATCH 0 -#endif - /* Create a compile-time value */ #ifdef MEM_SUPPORT_64BIT_DATA #define SUPPORT_64BIT_DATA 1 |