summaryrefslogtreecommitdiffstats
path: root/configs/Merrii_A80_Optimus_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-06-13 09:45:14 -0400
committerTom Rini <trini@konsulko.com>2016-06-17 09:34:49 -0400
commit7802ce910ba17a962d90b60b5e998e40d5a08067 (patch)
tree5cca3c51f6420d202d36d363b28603b3a57af1d3 /configs/Merrii_A80_Optimus_defconfig
parent5e4e87418e0f0e62854fe6c38736e2ee771ec3a7 (diff)
downloadtalos-obmc-uboot-7802ce910ba17a962d90b60b5e998e40d5a08067.tar.gz
talos-obmc-uboot-7802ce910ba17a962d90b60b5e998e40d5a08067.zip
configs: Re-sync BOOTDELAY changes
With updated moveconfig.py and an better default, re-generate the migration of BOOTDELAY to the defconfig. Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/Merrii_A80_Optimus_defconfig')
-rw-r--r--configs/Merrii_A80_Optimus_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/Merrii_A80_Optimus_defconfig b/configs/Merrii_A80_Optimus_defconfig
index 198fda95fe..53e023a75f 100644
--- a/configs/Merrii_A80_Optimus_defconfig
+++ b/configs/Merrii_A80_Optimus_defconfig
@@ -5,6 +5,7 @@ CONFIG_DRAM_CLK=360
CONFIG_DRAM_ZQ=123
CONFIG_SYS_CLK_FREQ=1008000000
CONFIG_MMC0_CD_PIN="PH18"
+# CONFIG_VIDEO is not set
CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
# CONFIG_CMD_IMLS is not set
OpenPOWER on IntegriCloud