diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-05 18:19:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-05 18:19:47 -0400 |
| commit | 54869e0811b341f95458c509fd565e3c4bab6a01 (patch) | |
| tree | 7d7f069b874bcf90ec1fd53e2a30756ad92c1159 /include/configs | |
| parent | 1f83431f0053f6fb20c511c391ffc687433848cf (diff) | |
| parent | 38e58ff2b785b45e8c8ade8e23f916a1984016c6 (diff) | |
Merge tag 'rpi-next-2019.07' of https://github.com/mbgg/u-boot
- fix complation error for CONFIG_USB
- update RPi3 DTBs to v5.1-rc6 state
- add defconfig for RPi3 B+
- Fix BCM2835_MBOX_TAG_TEST_PIXEL_ORDER define
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/rpi.h | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 9ce41767a97..f76c7d18ef0 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -146,12 +146,38 @@ "fdt_addr_r=0x02600000\0" \ "ramdisk_addr_r=0x02700000\0" +#if CONFIG_IS_ENABLED(CMD_MMC) + #define BOOT_TARGET_MMC(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) +#else + #define BOOT_TARGET_MMC(func) +#endif + +#if CONFIG_IS_ENABLED(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) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) \ - func(USB, usb, 0) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) + BOOT_TARGET_MMC(func) \ + BOOT_TARGET_USB(func) \ + BOOT_TARGET_PXE(func) \ + BOOT_TARGET_DHCP(func) + #include <config_distro_bootcmd.h> #define CONFIG_EXTRA_ENV_SETTINGS \ |