diff options
| author | Tom Rini <[email protected]> | 2022-01-07 09:30:59 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-01-07 09:30:59 -0500 |
| commit | a14af7216a220fe8f1b2a5308ed632abe6f9f97f (patch) | |
| tree | 4306307c8f9955c56861127d1f5adad54ebec80b /include | |
| parent | c00c147dae51f06e012841371f9baffb4b9dc1b3 (diff) | |
| parent | 75f080df46f28f24a617652c8af028cc349f908b (diff) | |
Merge branch '2022-01-06-assorted-important-fixes'
- Revert a clk change, to enable some platforms to work again
- Updates to the udoo NEO family of boards to work correctly
- Fix SiFive Unleashes/Unmatched boards booting
- Update rockchip maintainer entry
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/udoo_neo.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index b06abc9286b..3a7cb050b10 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -29,7 +29,7 @@ "fdt_addr=0x83000000\0" \ "fdt_addr_r=0x83000000\0" \ "ip_dyn=yes\0" \ - "mmcdev=0\0" \ + "mmcdev=1\0" \ "mmcrootfstype=ext4\0" \ "findfdt="\ "if test $board_name = BASIC; then " \ @@ -49,7 +49,8 @@ BOOTENV #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ + func(USB, usb, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> |