summaryrefslogtreecommitdiff
path: root/configs/at91sam9n12ek_nandflash_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-07-06 22:46:38 +0300
committerTom Rini <trini@konsulko.com>2020-07-06 22:46:38 +0300
commit6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30 (patch)
tree3c560d567a76e9850e0195fb892d7e1fbaeed198 /configs/at91sam9n12ek_nandflash_defconfig
parent2f5fbb5b39f7b67044dda5c35e4a4b31685a3109 (diff)
parent621e09cb3bf7e6d4fce9dd5e6de97e057adebc3a (diff)
downloadu-boot-6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30.tar.xz
Merge branch 'next'
Merge all outstanding changes from the current next branch in now that we have released.
Diffstat (limited to 'configs/at91sam9n12ek_nandflash_defconfig')
-rw-r--r--configs/at91sam9n12ek_nandflash_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig
index 490addbedf..8263ffb131 100644
--- a/configs/at91sam9n12ek_nandflash_defconfig
+++ b/configs/at91sam9n12ek_nandflash_defconfig
@@ -62,4 +62,5 @@ CONFIG_ATMEL_PIT_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_STORAGE=y
+CONFIG_ATMEL_HLCD=y
CONFIG_LCD=y