diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-09-17 23:35:34 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-09-17 23:35:34 +0200 |
| commit | c292adae170fa8c27dca75963bdb0a9afc640e57 (patch) | |
| tree | 3c1e6bddf7b2b6c6bb92a6329714db0850d05702 /include/configs/mx6qsabreauto.h | |
| parent | a7f99bf139b3aaa0d5494693fd0395084355e41a (diff) | |
| parent | 4c97f16911e229f6d5bbea5bee52449916e5fa92 (diff) | |
| download | blackbird-obmc-uboot-c292adae170fa8c27dca75963bdb0a9afc640e57.tar.gz blackbird-obmc-uboot-c292adae170fa8c27dca75963bdb0a9afc640e57.zip | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/mx6qsabreauto.h')
| -rw-r--r-- | include/configs/mx6qsabreauto.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index d1639c4c76..0ab31279cc 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -45,7 +45,4 @@ #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_SPEED 100000 -#define CONFIG_OF_SEPARATE -#define CONFIG_DEFAULT_DEVICE_TREE imx6q-sabreauto - #endif /* __MX6QSABREAUTO_CONFIG_H */ |
