diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-30 23:00:34 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-30 23:00:34 +0200 |
commit | d6694aff569a0838a9d0ef352128f5aa309d73ff (patch) | |
tree | a94eeab5431dfd0ed91a510c2e7de5eebb7a78fc /board/gateworks/gw_ventana/gw_ventana.cfg | |
parent | b5b8d85e9a50c2294b6043830cd045de1002dc5d (diff) | |
parent | 3f4c01d9f9d38e383f004dcd06c0d5661f2a57e0 (diff) | |
download | blackbird-obmc-uboot-d6694aff569a0838a9d0ef352128f5aa309d73ff.tar.gz blackbird-obmc-uboot-d6694aff569a0838a9d0ef352128f5aa309d73ff.zip |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/gateworks/gw_ventana/gw_ventana.cfg')
-rw-r--r-- | board/gateworks/gw_ventana/gw_ventana.cfg | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/board/gateworks/gw_ventana/gw_ventana.cfg b/board/gateworks/gw_ventana/gw_ventana.cfg index 27f09745c1..9ab95f5c93 100644 --- a/board/gateworks/gw_ventana/gw_ventana.cfg +++ b/board/gateworks/gw_ventana/gw_ventana.cfg @@ -24,21 +24,6 @@ BOOT_FROM nand #define __ASSEMBLY__ #include <config.h> -#include "asm/arch/mx6-ddr.h" #include "asm/arch/iomux.h" #include "asm/arch/crm_regs.h" - -/* Memory configuration (size is overridden via eeprom config) */ -#include "../../boundary/nitrogen6x/ddr-setup.cfg" -#if defined(CONFIG_MX6Q) && CONFIG_DDR_MB == 1024 - #include "../../boundary/nitrogen6x/1066mhz_4x128mx16.cfg" -#elif defined(CONFIG_MX6DL) && CONFIG_DDR_MB == 1024 - #include "../../boundary/nitrogen6x/800mhz_4x128mx16.cfg" -#elif defined(CONFIG_MX6DL) && CONFIG_DDR_MB == 512 - #include "../../boundary/nitrogen6x/800mhz_2x128mx16.cfg" -#elif defined(CONFIG_MX6Q) && CONFIG_DDR_MB == 512 - #include "../../boundary/nitrogen6x/800mhz_2x128mx16.cfg" -#else - #error "Unsupported CPU/Memory configuration" -#endif #include "clocks.cfg" |