diff options
| author | Tom Rini <[email protected]> | 2022-11-21 11:54:58 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-11-21 11:54:58 -0500 |
| commit | 347ed8482217c86a011d6269bcd3e75fbecc2834 (patch) | |
| tree | 1fe2bbd3b83d93636a95973f7948e5a6ab9bef55 /include | |
| parent | bebb393b340295edb9ba50a996fc0510cd1b6ac0 (diff) | |
| parent | 4b0a1f59873abca079a4462a9a90d76abbcbc419 (diff) | |
Merge branch '2022-11-21-important-fixes'
- Several important fixes for the Nokia RX51 platform, and a few other
fixes while we're at it.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/nokia_rx51.h | 9 | ||||
| -rw-r--r-- | include/env_default.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index a88cfe77d50..99a020c3c71 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -78,15 +78,16 @@ "kernaddr=0x82008000\0" \ "initrdaddr=0x84008000\0" \ "scriptaddr=0x86008000\0" \ + "fileloadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "fileload=${mmctype}load mmc ${mmcnum}:${mmcpart} " \ - "${loadaddr} ${mmcfile}\0" \ - "kernload=setenv loadaddr ${kernaddr};" \ + "${fileloadaddr} ${mmcfile}\0" \ + "kernload=setenv fileloadaddr ${kernaddr};" \ "setenv mmcfile ${mmckernfile};" \ "run fileload\0" \ - "initrdload=setenv loadaddr ${initrdaddr};" \ + "initrdload=setenv fileloadaddr ${initrdaddr};" \ "setenv mmcfile ${mmcinitrdfile};" \ "run fileload\0" \ - "scriptload=setenv loadaddr ${scriptaddr};" \ + "scriptload=setenv fileloadaddr ${scriptaddr};" \ "setenv mmcfile ${mmcscriptfile};" \ "run fileload\0" \ "scriptboot=echo Running ${mmcscriptfile} from mmc " \ diff --git a/include/env_default.h b/include/env_default.h index 4e461c815a7..7c9c00a9692 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -62,7 +62,7 @@ const char default_environment[] = { #ifdef CONFIG_SYS_DISABLE_AUTOLOAD "autoload=0\0" #endif -#ifdef CONFIG_PREBOOT +#ifdef CONFIG_PREBOOT_DEFINED "preboot=" CONFIG_PREBOOT "\0" #endif #ifdef CONFIG_ROOTPATH |