diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-22 14:36:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-22 14:36:47 -0400 |
| commit | ae4fdd7b0432bcb0bc2fe7d90b6d3e92001ab478 (patch) | |
| tree | e933e67609989d0e4960f1464384e9ff40732b30 /drivers/ddr/fsl/main.c | |
| parent | b90daf2743b38022bea8727ede867ad63e971db2 (diff) | |
| parent | dddfde5401ed5ad82c996b35b61dc4a45bb4e2b3 (diff) | |
Merge branch '2020-10-22-misc-changes'
- Assorted updates for Xen, IPQ40xx, ASpeed, Keymile
- Assorted typo / documentation fixes
- Fix default preboot cmd to act like before with USB_STORAGE set
- A number of other bugfixes throughout the code
Diffstat (limited to 'drivers/ddr/fsl/main.c')
| -rw-r--r-- | drivers/ddr/fsl/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c index 84139b85c33..c02badd4a88 100644 --- a/drivers/ddr/fsl/main.c +++ b/drivers/ddr/fsl/main.c @@ -705,7 +705,7 @@ phys_size_t __fsl_ddr_sdram(fsl_ddr_info_t *pinfo) /* Compute it once normally. */ #ifdef CONFIG_FSL_DDR_INTERACTIVE - if (tstc() && (getc() == 'd')) { /* we got a key press of 'd' */ + if (tstc() && (getchar() == 'd')) { /* we got a key press of 'd' */ total_memory = fsl_ddr_interactive(pinfo, 0); } else if (fsl_ddr_interactive_env_var_exists()) { total_memory = fsl_ddr_interactive(pinfo, 1); |