diff options
| author | Tom Rini <[email protected]> | 2019-02-12 07:16:46 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-02-12 07:16:46 -0500 |
| commit | 49a97162ea573b8646ba29162b71fc2c29e9c5d4 (patch) | |
| tree | fe3d66153227486bb1cc925f00a5c428687f8ebf /doc | |
| parent | f94fa0e94f36c740d3c7aa314c89a750c742185b (diff) | |
| parent | 24b56e2bf369ac003ccaac37d8bb80e08b743e16 (diff) | |
Merge git://git.denx.de/u-boot-x86
- Edison switch to CONFIG_OF_SEPARATE.
- Tangier initial ACPI support for PMIC device.
- TSC timer driver update to support native calibration.
- Fixes to 64-bit U-Boot proper.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/README.fdt-control | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/README.fdt-control b/doc/README.fdt-control index 446401c9e99..e53cf51875a 100644 --- a/doc/README.fdt-control +++ b/doc/README.fdt-control @@ -122,13 +122,14 @@ the U-Boot image (including u-boot.bin). This is suitable for debugging and development only and is not recommended for production devices. If CONFIG_OF_SEPARATE is defined, then it will be built and placed in -a u-boot.dtb file alongside u-boot.bin. A common approach is then to +a u-boot.dtb file alongside u-boot-nodtb.bin. A common approach is then to join the two: - cat u-boot.bin u-boot.dtb >image.bin + cat u-boot-nodtb.bin u-boot.dtb >image.bin and then flash image.bin onto your board. Note that U-Boot creates -u-boot-dtb.bin which does the above step for you also. If you are using +u-boot-dtb.bin which does the above step for you also. Resulting +u-boot.bin is a copy of u-boot-dtb.bin in this case. If you are using CONFIG_SPL_FRAMEWORK, then u-boot.img will be built to include the device tree binary. |