diff options
| author | Tom Rini <trini@konsulko.com> | 2015-05-26 10:38:01 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-26 10:38:01 -0400 |
| commit | 9bea236b3402a262772b66d055ec6431cbd3ba87 (patch) | |
| tree | 8347dda9cb6ec9ad0d1bb15040257e01f8f31fc0 /configs | |
| parent | d43e15421014c17b90c3e288e3eff18ad8aaf346 (diff) | |
| parent | 1022b85cb0e143b4f3a8e6c7d9258d516920d464 (diff) | |
| download | talos-obmc-uboot-9bea236b3402a262772b66d055ec6431cbd3ba87.tar.gz talos-obmc-uboot-9bea236b3402a262772b66d055ec6431cbd3ba87.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/aristainetos2_defconfig | 3 | ||||
| -rw-r--r-- | configs/marsboard_defconfig | 2 | ||||
| -rw-r--r-- | configs/riotboard_defconfig | 2 | ||||
| -rw-r--r-- | configs/wandboard_defconfig | 6 | ||||
| -rw-r--r-- | configs/wandboard_dl_defconfig | 3 | ||||
| -rw-r--r-- | configs/wandboard_quad_defconfig | 3 | ||||
| -rw-r--r-- | configs/wandboard_solo_defconfig | 3 |
7 files changed, 13 insertions, 9 deletions
diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig new file mode 100644 index 0000000000..e536646c96 --- /dev/null +++ b/configs/aristainetos2_defconfig @@ -0,0 +1,3 @@ +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL" +CONFIG_ARM=y +CONFIG_TARGET_ARISTAINETOS2=y diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig index f54fdd05a1..460e2d022c 100644 --- a/configs/marsboard_defconfig +++ b/configs/marsboard_defconfig @@ -1,3 +1,5 @@ CONFIG_ARM=y CONFIG_TARGET_EMBESTMX6BOARDS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,ENV_IS_IN_SPI_FLASH" +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig index c0b689b461..ae0036a28a 100644 --- a/configs/riotboard_defconfig +++ b/configs/riotboard_defconfig @@ -1,3 +1,5 @@ CONFIG_ARM=y CONFIG_TARGET_EMBESTMX6BOARDS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024,ENV_IS_IN_MMC" +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig new file mode 100644 index 0000000000..1ccac5a63e --- /dev/null +++ b/configs/wandboard_defconfig @@ -0,0 +1,6 @@ +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" +CONFIG_ARM=y +CONFIG_TARGET_WANDBOARD=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/configs/wandboard_dl_defconfig b/configs/wandboard_dl_defconfig deleted file mode 100644 index 0136cdfdf9..0000000000 --- a/configs/wandboard_dl_defconfig +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_WANDBOARD=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024" diff --git a/configs/wandboard_quad_defconfig b/configs/wandboard_quad_defconfig deleted file mode 100644 index 0f9bdf936c..0000000000 --- a/configs/wandboard_quad_defconfig +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_WANDBOARD=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048" diff --git a/configs/wandboard_solo_defconfig b/configs/wandboard_solo_defconfig deleted file mode 100644 index 57a227c944..0000000000 --- a/configs/wandboard_solo_defconfig +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_WANDBOARD=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512" |
