diff options
| author | Simon Glass <sjg@chromium.org> | 2023-07-28 00:54:28 +0300 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2023-09-04 01:20:59 +0300 |
| commit | c771e5b8c2a186fb072b6c6f571d4a3cc86efba9 (patch) | |
| tree | 7fbb2431e0cb92c731e21fe8f8fd239c56b76500 /include | |
| parent | 8999257f219d1e371c2fd66f255b8782897944d9 (diff) | |
| download | u-boot-c771e5b8c2a186fb072b6c6f571d4a3cc86efba9.tar.xz | |
arm: rpi: Switch to standard boot
Drop use of the distro scripts and use standard boot instead.
We don't need to specify the mmc devices individually, since they are
used in order from 0 to 2, and standard boot uses that order anyway.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/rpi.h | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 4da982f735..4160db2d8e 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -122,47 +122,13 @@ "fdt_addr_r=0x02600000\0" \ "ramdisk_addr_r=0x02700000\0" -#if IS_ENABLED(CONFIG_CMD_MMC) - #define BOOT_TARGET_MMC(func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 2) -#else - #define BOOT_TARGET_MMC(func) -#endif - -#if IS_ENABLED(CONFIG_CMD_USB) - #define BOOT_TARGET_USB(func) func(USB, usb, 0) -#else - #define BOOT_TARGET_USB(func) -#endif - -#if CONFIG_IS_ENABLED(CMD_PXE) - #define BOOT_TARGET_PXE(func) func(PXE, pxe, na) -#else - #define BOOT_TARGET_PXE(func) -#endif - -#if CONFIG_IS_ENABLED(CMD_DHCP) - #define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) -#else - #define BOOT_TARGET_DHCP(func) -#endif - -#define BOOT_TARGET_DEVICES(func) \ - BOOT_TARGET_MMC(func) \ - BOOT_TARGET_USB(func) \ - BOOT_TARGET_PXE(func) \ - BOOT_TARGET_DHCP(func) - -#include <config_distro_bootcmd.h> +#define BOOT_TARGETS "mmc usb pxe dhcp" #define CFG_EXTRA_ENV_SETTINGS \ "dhcpuboot=usb start; dhcp u-boot.uimg; bootm\0" \ ENV_DEVICE_SETTINGS \ ENV_DFU_SETTINGS \ ENV_MEM_LAYOUT_SETTINGS \ - BOOTENV - + "boot_targets=" BOOT_TARGETS "\0" #endif |