diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-26 17:45:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-26 17:45:20 -0400 |
| commit | 12277acda0802e4517ca82842c71aae723f0da16 (patch) | |
| tree | 34a610694fdcee8f19f81337f6658a84210262ee /include/configs | |
| parent | 7a4b0bc5fe70225ae3595ba81d1473c06fd6b83b (diff) | |
| parent | 44de15d6867c246e7a09ef061d3de56e1799a606 (diff) | |
Merge branch '2019-08-26-master-imports'
- Assorted minor bugfixes
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/am3517_evm.h | 5 | ||||
| -rw-r--r-- | include/configs/omap3_logic.h | 3 | ||||
| -rw-r--r-- | include/configs/vexpress_aemv8a.h | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 63489133a8..3e5f0b1992 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -26,8 +26,11 @@ * Enable CONFIG_USB_MUSB_HOST for Host functionalities MSC, keyboard * Enable CONFIG_USB_MUSB_GADGET for Device functionalities. */ - +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_USB_EHCI_OMAP +#else #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 57 +#endif /* I2C */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index b7c3ddf564..90292ae312 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -30,6 +30,9 @@ /* I2C */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM AT24C64 */ +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_USB_EHCI_OMAP +#endif #ifdef CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 4 #endif diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 89cd8b550a..9746470552 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -11,7 +11,6 @@ #ifndef CONFIG_SEMIHOSTING #error CONFIG_TARGET_VEXPRESS64_BASE_FVP requires CONFIG_SEMIHOSTING #endif -#define CONFIG_ARMV8_SWITCH_TO_EL1 #endif #define CONFIG_REMAKE_ELF |