aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-10-21 10:22:58 +0200
committerKoen Kooi <koen@openembedded.org>2010-10-21 10:22:58 +0200
commitffd7fe5dfaaa0afd664f0c846d15df14d7e0fd46 (patch)
tree7288849a414982d74a43de2d106858cec6c51472 /conf
parentec39356527e906ac3875cb244d21c80c1563f4bd (diff)
downloadopenembedded-ffd7fe5dfaaa0afd664f0c846d15df14d7e0fd46.tar.gz
openembedded-ffd7fe5dfaaa0afd664f0c846d15df14d7e0fd46.tar.bz2
openembedded-ffd7fe5dfaaa0afd664f0c846d15df14d7e0fd46.zip
omap machines: remove preferred versions from machine files, the recipes already pin those correctly
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/am3517-evm.conf1
-rw-r--r--conf/machine/am37x-evm.conf1
-rw-r--r--conf/machine/dm37x-evm.conf1
-rw-r--r--conf/machine/omap2420h4.conf1
-rw-r--r--conf/machine/omap2430sdp.conf1
-rw-r--r--conf/machine/omap3-pandora.conf2
-rw-r--r--conf/machine/omap3-touchbook.conf1
-rw-r--r--conf/machine/omap3evm.conf1
-rw-r--r--conf/machine/omap4430-sdp.conf1
-rw-r--r--conf/machine/omap5912osk.conf1
-rw-r--r--conf/machine/omapzoom.conf1
-rw-r--r--conf/machine/omapzoom2.conf1
-rw-r--r--conf/machine/omapzoom36x.conf2
13 files changed, 0 insertions, 15 deletions
diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf
index 05eb2c540c..cf63df9bf5 100644
--- a/conf/machine/am3517-evm.conf
+++ b/conf/machine/am3517-evm.conf
@@ -26,7 +26,6 @@ USE_VT = "2"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-PREFERRED_VERSION_u-boot = "git"
UBOOT_ARCH = "arm"
UBOOT_MACHINE = "am3517_evm_config"
diff --git a/conf/machine/am37x-evm.conf b/conf/machine/am37x-evm.conf
index 096d9e07ef..0b9e2ddce1 100644
--- a/conf/machine/am37x-evm.conf
+++ b/conf/machine/am37x-evm.conf
@@ -25,7 +25,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-PREFERRED_VERSION_u-boot = "git"
UBOOT_ARCH = "arm"
UBOOT_MACHINE = "omap3_evm_config"
diff --git a/conf/machine/dm37x-evm.conf b/conf/machine/dm37x-evm.conf
index 35fef88cc5..4c4e9c561f 100644
--- a/conf/machine/dm37x-evm.conf
+++ b/conf/machine/dm37x-evm.conf
@@ -25,7 +25,6 @@ SERIAL_CONSOLE = "115200 ttyS0"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-PREFERRED_VERSION_u-boot = "git"
UBOOT_ARCH = "arm"
UBOOT_MACHINE = "omap3_evm_config"
diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf
index 948325942a..15847b0d23 100644
--- a/conf/machine/omap2420h4.conf
+++ b/conf/machine/omap2420h4.conf
@@ -5,7 +5,6 @@
TARGET_ARCH = "arm"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
-PREFERRED_VERSION_u-boot = "1.1.4"
SERIAL_CONSOLE ?= "115200 ttyS0"
IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/omap2430sdp.conf b/conf/machine/omap2430sdp.conf
index 7b1f8abfda..3995a3da99 100644
--- a/conf/machine/omap2430sdp.conf
+++ b/conf/machine/omap2430sdp.conf
@@ -5,7 +5,6 @@
TARGET_ARCH = "arm"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
-PREFERRED_VERSION_u-boot = "1.1.4"
SERIAL_CONSOLE ?= "115200 ttyS0"
IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf
index 7c72ba972a..e715a453ab 100644
--- a/conf/machine/omap3-pandora.conf
+++ b/conf/machine/omap3-pandora.conf
@@ -64,8 +64,6 @@ UBOOT_ARCH = "arm"
UBOOT_MACHINE = "omap3_pandora_config"
PREFERRED_PROVIDER_x-load = "x-load-omap3pandora"
-PREFERRED_VERSION_u-boot-omap3pandora = "git"
-PREFERRED_VERSION_x-load-omap3pandora = "git"
EXTRA_IMAGEDEPENDS += "u-boot x-load"
MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"
diff --git a/conf/machine/omap3-touchbook.conf b/conf/machine/omap3-touchbook.conf
index 52d190884a..97bd1b6ee1 100644
--- a/conf/machine/omap3-touchbook.conf
+++ b/conf/machine/omap3-touchbook.conf
@@ -44,7 +44,6 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
-PREFERRED_VERSION_u-boot = "git"
# and sdio
MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen"
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index 7bbc8217d6..9cd04ed7bc 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -26,7 +26,6 @@ USE_VT = "0"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-PREFERRED_VERSION_u-boot = "git"
UBOOT_ARCH = "arm"
UBOOT_MACHINE = "omap3_evm_config"
diff --git a/conf/machine/omap4430-sdp.conf b/conf/machine/omap4430-sdp.conf
index efa9c814bb..074b18feef 100644
--- a/conf/machine/omap4430-sdp.conf
+++ b/conf/machine/omap4430-sdp.conf
@@ -43,7 +43,6 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
-PREFERRED_VERSION_u-boot = "git"
# and sdio
MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa"
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index 4989a33e9d..f3cc5ce9d8 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -10,7 +10,6 @@ KERNEL_IMAGETYPE = "uImage"
UBOOT_ENTRYPOINT="0x10c08000"
-# PREFERRED_VERSION_u-boot = "1.1.6"
SERIAL_CONSOLE ?= "115200 ttyS0"
IMAGE_FSTYPES ?= "jffs2"
diff --git a/conf/machine/omapzoom.conf b/conf/machine/omapzoom.conf
index ab0612f292..8ce5af4ec8 100644
--- a/conf/machine/omapzoom.conf
+++ b/conf/machine/omapzoom.conf
@@ -46,7 +46,6 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
-PREFERRED_VERSION_u-boot = "git"
#EXTRA_IMAGEDEPENDS += "u-boot x-load"
# and sdio
diff --git a/conf/machine/omapzoom2.conf b/conf/machine/omapzoom2.conf
index 698b24178f..02a01ceee9 100644
--- a/conf/machine/omapzoom2.conf
+++ b/conf/machine/omapzoom2.conf
@@ -48,7 +48,6 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996"
UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
-PREFERRED_VERSION_u-boot = "git"
#EXTRA_IMAGEDEPENDS += "u-boot x-load"
MACHINE_EXTRA_RRECOMMENDS = ""
diff --git a/conf/machine/omapzoom36x.conf b/conf/machine/omapzoom36x.conf
index 88b39f4632..4273e3b931 100644
--- a/conf/machine/omapzoom36x.conf
+++ b/conf/machine/omapzoom36x.conf
@@ -30,8 +30,6 @@ UBOOT_LOADADDRESS = "0x80008000"
UBOOT_MACHINE = "omap3630zoom3_config"
XLOAD_MACHINE = "omap3630zoom3_config"
-PREFERRED_VERSION_u-boot = "git"
-PREFERRED_VERSION_x-load = "git"
EXTRA_IMAGEDEPENDS += "u-boot x-load"
MACHINE_EXTRA_RRECOMMENDS = ""