diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-17 08:19:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-17 08:19:40 -0500 |
| commit | 0c4b382f9041f9f2f00246c8a0ece90dae5451be (patch) | |
| tree | a2307a0658de178c47d7a063c169347e60e1810c /scripts | |
| parent | 1d6edcbfed2af33c748f2beb399810a0441888da (diff) | |
| parent | ad890cace37d0e2d3e0f9649bdb9c320947e4bb0 (diff) | |
| download | u-boot-0c4b382f9041f9f2f00246c8a0ece90dae5451be.tar.gz u-boot-0c4b382f9041f9f2f00246c8a0ece90dae5451be.tar.xz u-boot-0c4b382f9041f9f2f00246c8a0ece90dae5451be.zip | |
Merge branch '2018-11-16-master-imports'
- Initial bcm968580xref, am65x_evm_r5 support
- lpc32xx, omap3_logic/am3517_evm updates
- pinctrl command
- fs_loader available for SPL
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0627024e71..abfb0ff89f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -82,7 +82,6 @@ CONFIG_AT91SAM9G20EK_2MMC CONFIG_AT91SAM9G45EKES CONFIG_AT91SAM9G45_LCD_BASE CONFIG_AT91SAM9M10G45EK -CONFIG_AT91SAM9_WATCHDOG CONFIG_AT91_CAN CONFIG_AT91_EFLASH CONFIG_AT91_GPIO_PULLUP |