summaryrefslogtreecommitdiffstats
path: root/configs/colibri_imx7_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-03-19 14:49:26 -0400
committerTom Rini <trini@konsulko.com>2017-03-19 15:13:38 -0400
commit02ccab1908c405fe1449457d4a0d343784a30acb (patch)
tree3a5d41abff96a3af22587ace67713d5c0165b097 /configs/colibri_imx7_defconfig
parentf40574e2d78c96a3818c4fa2379382d924866a6e (diff)
parentd883fcc6bbb2fcc3df90857fee99c2f543a0289c (diff)
downloadu-boot-02ccab1908c405fe1449457d4a0d343784a30acb.tar.gz
u-boot-02ccab1908c405fe1449457d4a0d343784a30acb.tar.xz
u-boot-02ccab1908c405fe1449457d4a0d343784a30acb.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: configs/bk4r1_defconfig configs/colibri_vf_defconfig configs/pcm052_defconfig include/configs/colibri_vf.h include/configs/pcm052.h
Diffstat (limited to 'configs/colibri_imx7_defconfig')
-rw-r--r--configs/colibri_imx7_defconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 5c051d5d27..46f7bb242f 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -54,4 +54,6 @@ CONFIG_CI_UDC=y
CONFIG_USB_GADGET_DOWNLOAD=y
CONFIG_G_DNL_MANUFACTURER="Toradex"
CONFIG_G_DNL_VENDOR_NUM=0x1b67
-CONFIG_G_DNL_PRODUCT_NUM=0x4020
+CONFIG_G_DNL_PRODUCT_NUM=0x4000
+CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_FDT_FIXUP_PARTITIONS=y