diff options
| author | Tom Rini <trini@konsulko.com> | 2021-06-10 13:27:14 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-06-10 13:27:14 -0400 |
| commit | cf066a20c3ec063d019a991cc32ba8ad95a39780 (patch) | |
| tree | e57916eaecbcd8c707407349ee3c18318a096ac5 /include | |
| parent | 0008d8086649d3bb3afd0c4697f5b73ccf6f293d (diff) | |
| parent | c64e2bd55883ede3dc29421f1f297d741ae5b137 (diff) | |
| download | u-boot-cf066a20c3ec063d019a991cc32ba8ad95a39780.tar.gz u-boot-cf066a20c3ec063d019a991cc32ba8ad95a39780.tar.xz u-boot-cf066a20c3ec063d019a991cc32ba8ad95a39780.zip | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- mvebu: Turris MOX misc updates (cmds, rescue mode, LED's etc)
(Marek)
- mvebu: correct Armada 8K addresses (Heinrich)
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mvebu_armada-8k.h | 10 | ||||
| -rw-r--r-- | include/configs/turris_mox.h | 10 |
2 files changed, 15 insertions, 5 deletions
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 38f50468c5..493e3de9b9 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -91,11 +91,11 @@ #include <config_distro_bootcmd.h> #define CONFIG_EXTRA_ENV_SETTINGS \ - "scriptaddr=0x4d00000\0" \ - "pxefile_addr_r=0x4e00000\0" \ - "fdt_addr_r=0x4f00000\0" \ - "kernel_addr_r=0x5000000\0" \ - "ramdisk_addr_r=0x8000000\0" \ + "scriptaddr=0x6d00000\0" \ + "pxefile_addr_r=0x6e00000\0" \ + "fdt_addr_r=0x6f00000\0" \ + "kernel_addr_r=0x7000000\0" \ + "ramdisk_addr_r=0xa000000\0" \ "fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ BOOTENV diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 51445ec60a..9c021a1ef9 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -75,12 +75,22 @@ #include <config_distro_bootcmd.h> +#define TURRIS_MOX_BOOTCMD_RESCUE \ + "setenv bootargs \"console=ttyMV0,115200 " \ + "earlycon=ar3700_uart,0xd0012000\" && " \ + "sf probe && " \ + "sf read 0x5000000 0x190000 && " \ + "lzmadec 0x5000000 0x5800000 && " \ + "bootm 0x5800000" + #define CONFIG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x4d00000\0" \ "pxefile_addr_r=0x4e00000\0" \ "fdt_addr_r=0x4f00000\0" \ "kernel_addr_r=0x5000000\0" \ "ramdisk_addr_r=0x8000000\0" \ + "fdtfile=marvell/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ + "bootcmd_rescue=" TURRIS_MOX_BOOTCMD_RESCUE "\0" \ BOOTENV #endif /* _CONFIG_TURRIS_MOX_H */ |