diff options
| author | Tom Rini <trini@ti.com> | 2014-11-24 12:02:12 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-24 12:02:12 -0500 |
| commit | dee332ffb735f65ab922118791a583c17bb0b795 (patch) | |
| tree | d07bc0821792831aa4baeb27868252c2d32c7738 /configs | |
| parent | 1739564e753bc3a8097f8937a3cbe738bdaaed5d (diff) | |
| parent | e7eb277dced570f177d75d56f40219d9dc599ed1 (diff) | |
| download | blackbird-obmc-uboot-dee332ffb735f65ab922118791a583c17bb0b795.tar.gz blackbird-obmc-uboot-dee332ffb735f65ab922118791a583c17bb0b795.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/cm_fx6_defconfig | 2 | ||||
| -rw-r--r-- | configs/gwventana_defconfig | 2 | ||||
| -rw-r--r-- | configs/mx6sabresd_spl_defconfig | 2 | ||||
| -rw-r--r-- | configs/novena_defconfig | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 50c06f7feb..3c0d64fecb 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/compulab/cm_fx6/imximage.cfg,MX6QDL,SPL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" +S:CONFIG_ARM=y +S:CONFIG_TARGET_CM_FX6=y diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig index f18532938f..4cddbdd655 100644 --- a/configs/gwventana_defconfig +++ b/configs/gwventana_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/gateworks/gw_ventana/gw_ventana.cfg,MX6QDL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" +S:CONFIG_ARM=y +S:CONFIG_TARGET_GW_VENTANA=y diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig index b7b26df8ac..12e784435c 100644 --- a/configs/mx6sabresd_spl_defconfig +++ b/configs/mx6sabresd_spl_defconfig @@ -1,5 +1,5 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6sabresd_spl.cfg,SPL,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6Q" +S:CONFIG_ARM=y +S:CONFIG_TARGET_MX6SABRESD=y diff --git a/configs/novena_defconfig b/configs/novena_defconfig index cadf461cdb..b8fd97fd3f 100644 --- a/configs/novena_defconfig +++ b/configs/novena_defconfig @@ -1,4 +1,4 @@ CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/kosagi/novena/setup.cfg,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6Q" +S:CONFIG_ARM=y +S:CONFIG_TARGET_KOSAGI_NOVENA=y |
