summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-03-30 19:53:19 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2013-04-09 18:41:12 -0300
commit5d071c8d01b7ac2033951177e1c2a83159b063fe (patch)
tree4e5926acf235c6692973ecaea97e6de3ade1f534 /conf
parentd407fe5a6c19183aeb997e3da0b59fb3f398c9ca (diff)
downloadmeta-fsl-arm-5d071c8d01b7ac2033951177e1c2a83159b063fe.tar.gz
imx6slevk: Use U-Boot mainline
Change-Id: I8e5b3d6b31267f6cfcfe11be9a7aa4d6a5fdfec0 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/imx6slevk.conf2
-rw-r--r--conf/machine/include/imx-base.inc1
2 files changed, 0 insertions, 3 deletions
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index 786822a..454c34f 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -8,8 +8,6 @@ include conf/machine/include/tune-cortexa9.inc
8SOC_FAMILY = "mx6sl:mx6" 8SOC_FAMILY = "mx6sl:mx6"
9 9
10UBOOT_MACHINE = "mx6slevk_config" 10UBOOT_MACHINE = "mx6slevk_config"
11UBOOT_SUFFIX = "bin"
12UBOOT_PADDING = "2"
13 11
14SERIAL_CONSOLE = "115200 ttymxc0" 12SERIAL_CONSOLE = "115200 ttymxc0"
15 13
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index ad3df13..ffdb871 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -72,7 +72,6 @@ PREFERRED_PROVIDER_virtual/libgles1_mx6 ?= "gpu-viv-bin-mx6q"
72PREFERRED_PROVIDER_virtual/libgles2_mx6 ?= "gpu-viv-bin-mx6q" 72PREFERRED_PROVIDER_virtual/libgles2_mx6 ?= "gpu-viv-bin-mx6q"
73 73
74PREFERRED_PROVIDER_virtual/kernel_mx3 = "linux-fslc" 74PREFERRED_PROVIDER_virtual/kernel_mx3 = "linux-fslc"
75PREFERRED_PROVIDER_u-boot_mx6sl = "u-boot-imx"
76PREFERRED_PROVIDER_u-boot_mx6dl = "u-boot-imx" 75PREFERRED_PROVIDER_u-boot_mx6dl = "u-boot-imx"
77 76
78EXTRA_IMAGEDEPENDS = "u-boot" 77EXTRA_IMAGEDEPENDS = "u-boot"