diff options
| author | Tom Rini | 2020-03-17 11:59:58 -0400 |
|---|---|---|
| committer | Tom Rini | 2020-03-17 11:59:58 -0400 |
| commit | 2738f0edea7d19960d692284d1f378b1a2b4c4a5 (patch) | |
| tree | 47bc76ea90ab5395d30785b4aa83e43b15bc7a70 /include/configs/brxre1.h | |
| parent | b180e32ea39d03021655a31a19d527529a2eb980 (diff) | |
| parent | 445b45042c63c79546124489362ba4e64b61bfdc (diff) | |
Merge tag 'ti-v2020.07-next' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti into next
K3 J721E:
* OSPI boot support
* Support for loading remote cores in R5 SPL
* PMIC ESM Support
* Minor fixes for R5F and C7x remoteproc drivers
K3 AM654:
* Update AVS class 0 voltages.
* Add I2C nodes
DRA7xx/AM57xx:
* Fixed Android boot on AM57xx
AM33/AM43/Davinci:
* switch to driver model for the net and mdio driver for baltos
* Add DM/DTS support for omap video driver
* Enable fastboot on am335x-evm
Diffstat (limited to 'include/configs/brxre1.h')
| -rw-r--r-- | include/configs/brxre1.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index ea15912c900..006663373ba 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -14,7 +14,9 @@ #include <configs/bur_cfg_common.h> #include <configs/bur_am335x_common.h> /* ------------------------------------------------------------------------- */ +#if !defined(CONFIG_AM335X_LCD) #define CONFIG_AM335X_LCD +#endif #define LCD_BPP LCD_COLOR32 /* memory */ |