diff options
| author | Tom Rini <[email protected]> | 2021-11-12 10:14:24 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-11-12 10:14:24 -0500 |
| commit | 515bf78ff975d474f895bf86b4e16eade51c8dbd (patch) | |
| tree | 49114762efa8154f2a2f75d8718cf650e7f0fc09 /arch | |
| parent | 1e72ad6b387c599f477f83cda67ab525c089a9b0 (diff) | |
| parent | 6f84e809d9a373961d34f5b408bf44702b8c978c (diff) | |
Merge branch '2021-11-12-assorted-updates'
- A number of pxe related cleanups and related re-organization.
- A few related pxe/sysboot/extlinux improvements
- Remove some dead code.
- Update Azure to use a newer Windows build environment
- Add a .get_maintainer.conf file
- A few minor TI SoC platform updates
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/am335x-chiliboard-u-boot.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/dts/am335x-chiliboard-u-boot.dtsi b/arch/arm/dts/am335x-chiliboard-u-boot.dtsi index 06a13872eef..17333d69bf6 100644 --- a/arch/arm/dts/am335x-chiliboard-u-boot.dtsi +++ b/arch/arm/dts/am335x-chiliboard-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ or X11 /* - * Copyright (C) 2018 Grinn Sp. z o.o. -- http://www.grinn-global.com/ + * Copyright (C) 2018-2021 Grinn Sp. z o.o. -- http://www.grinn-global.com/ * Author: Marcin Niestroj <[email protected]> */ @@ -9,5 +9,6 @@ / { chosen { stdout-path = &uart0; + tick-timer = &timer2; }; }; |