diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-17 11:24:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-17 11:24:43 -0500 |
| commit | 4e81f3be340072ad2c0aac093677333702f14f22 (patch) | |
| tree | 447e16a695d5e55d52cf4687495a35fda48dacd6 /include | |
| parent | 6d2ebcd7be3e7f9cc81011ddb97540c81a301701 (diff) | |
| parent | 609983e981a0a7f053ee6f9f6cd2772226a33000 (diff) | |
| download | u-boot-4e81f3be340072ad2c0aac093677333702f14f22.zip u-boot-4e81f3be340072ad2c0aac093677333702f14f22.tar.gz u-boot-4e81f3be340072ad2c0aac093677333702f14f22.tar.bz2 | |
Merge branch '2022-01-15-TI-platform-updates'WIP/17Jan2022
- Let am335x_evm use the CPSW or PRUSS ethernet.
- Implement timer_get_boot_us in the omap timer driver
- gpmc bitflip, QSPI clock calculation on am437x, da8xx_gpio bugfixes
- Assorted K3 updates
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/am335x_evm.h | 5 | ||||
| -rw-r--r-- | include/configs/ti_armv7_common.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 7fb1b3a..0f34080 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -143,7 +143,10 @@ "if test $board_name = A335X_SK; then " \ "setenv fdtfile am335x-evmsk.dtb; fi; " \ "if test $board_name = A335_ICE; then " \ - "setenv fdtfile am335x-icev2.dtb; fi; " \ + "setenv fdtfile am335x-icev2.dtb; " \ + "if test $ice_mii = mii; then " \ + "setenv pxe_label_override Pruss; fi;" \ + "fi; " \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ "init_console=" \ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index fa48cd2..797e121 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -37,6 +37,7 @@ "fdtaddr=0x88000000\0" \ "dtboaddr=0x89000000\0" \ "fdt_addr_r=0x88000000\0" \ + "fdtoverlay_addr_r=0x89000000\0" \ "rdaddr=0x88080000\0" \ "ramdisk_addr_r=0x88080000\0" \ "scriptaddr=0x80000000\0" \ |