diff options
| author | Tom Rini <[email protected]> | 2021-12-20 17:12:04 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-12-20 17:12:04 -0500 |
| commit | 4afab30caea3211032710c4298a8839d3254e7f7 (patch) | |
| tree | 8318afb8810966aca9fe356dde316c155b7a33ce /include/configs | |
| parent | e9d7888da845638f135046d53c25492a8c54e664 (diff) | |
| parent | 734ad933766f0dbbeafe1b27211686940a5e6d16 (diff) | |
Merge tag 'v2022.01-rc4' into next
Prepare v2022.01-rc4
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/ax25-ae350.h | 13 | ||||
| -rw-r--r-- | include/configs/beacon-rzg2m.h | 2 | ||||
| -rw-r--r-- | include/configs/rpi.h | 3 |
3 files changed, 15 insertions, 3 deletions
diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index bf3f34e428f..1c3f957d324 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -119,12 +119,23 @@ /* Increase max gunzip size */ #define CONFIG_SYS_BOOTM_LEN (64 << 20) +/* Support autoboot from RAM (kernel image is loaded via debug port) */ +#define KERNEL_IMAGE_ADDR "0x2000000 " +#define BOOTENV_DEV_NAME_RAM(devtypeu, devtypel, instance) \ + "ram " +#define BOOTENV_DEV_RAM(devtypeu, devtypel, instance) \ + "bootcmd_ram=" \ + "booti " \ + KERNEL_IMAGE_ADDR \ + "- $fdtcontroladdr\0" + /* When we use RAM as ENV */ /* Enable distro boot */ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ - func(DHCP, dhcp, na) + func(DHCP, dhcp, na) \ + func(RAM, ram, na) #include <config_distro_bootcmd.h> #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/beacon-rzg2m.h b/include/configs/beacon-rzg2m.h index 320f78be9c8..7eaafb0d451 100644 --- a/include/configs/beacon-rzg2m.h +++ b/include/configs/beacon-rzg2m.h @@ -23,7 +23,7 @@ "boot_fdt=try\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "initrd_addr=0x43800000\0" \ - "mmcdev=0\0" \ + "mmcdev=1\0" \ "mmcpart=1\0" \ "mmcrootpart=2\0" \ "finduuid=part uuid mmc ${mmcdev}:${mmcrootpart} uuid\0" \ diff --git a/include/configs/rpi.h b/include/configs/rpi.h index bc907acd5fa..d5e064fb379 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -136,7 +136,8 @@ #if CONFIG_IS_ENABLED(CMD_MMC) #define BOOT_TARGET_MMC(func) \ func(MMC, mmc, 0) \ - func(MMC, mmc, 1) + func(MMC, mmc, 1) \ + func(MMC, mmc, 2) #else #define BOOT_TARGET_MMC(func) #endif |