summaryrefslogtreecommitdiff
path: root/recipes-bsp
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2013-11-20 17:17:14 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2013-11-21 18:58:00 +0100
commitc44782e9708067acfc7620cf1b2585f5374e32c0 (patch)
tree95fcd0075381f1718cece354823ec5a93312a249 /recipes-bsp
parent1574be2de6d82a49b88470ab1881b96f332bbeb7 (diff)
Machine: use the changed machinename colibri-vf
Diffstat (limited to 'recipes-bsp')
-rw-r--r--recipes-bsp/alsa-state/alsa-state/colibri-vf/asound.state (renamed from recipes-bsp/alsa-state/alsa-state/colibri-vf50/asound.state)0
-rw-r--r--recipes-bsp/u-boot/u-boot-colibri-vf.bb33
2 files changed, 8 insertions, 25 deletions
diff --git a/recipes-bsp/alsa-state/alsa-state/colibri-vf50/asound.state b/recipes-bsp/alsa-state/alsa-state/colibri-vf/asound.state
index 7d61d15..7d61d15 100644
--- a/recipes-bsp/alsa-state/alsa-state/colibri-vf50/asound.state
+++ b/recipes-bsp/alsa-state/alsa-state/colibri-vf/asound.state
diff --git a/recipes-bsp/u-boot/u-boot-colibri-vf.bb b/recipes-bsp/u-boot/u-boot-colibri-vf.bb
index ae2ddc8..cd84206 100644
--- a/recipes-bsp/u-boot/u-boot-colibri-vf.bb
+++ b/recipes-bsp/u-boot/u-boot-colibri-vf.bb
@@ -11,36 +11,19 @@ PR = "r0"
S = "${WORKDIR}/git"
SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=colibri"
-SRCREV_colibri-vf50 = "ac13ca97df9f8c17d1c89d425041690484ee0fdf"
+SRCREV_colibri-vf = "ac13ca97df9f8c17d1c89d425041690484ee0fdf"
#FILESPATHPKG =. "git:"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "colibri-vf50"
-DEFAULT_PREFERENCE_colibri-vf50 = "1"
+COMPATIBLE_MACHINE = "colibri-vf"
+DEFAULT_PREFERENCE_colibri-vf = "1"
-# colibri_vf50: build additionally a u-boot binary used for nand boot
-#SPL_BINARY_colibri-vf50 = "u-boot.nand"
-#SPL_IMAGE_colibri-vf50 = "u-boot-${MACHINE}-${PV}-${PR}.nand"
-#SPL_SYMLINK_colibri-vf50 = "u-boot-${MACHINE}.nand"
-#do_compile_append_colibri-vf50() {
-# # keep boot-hsmmc
-# mv u-boot.${UBOOT_SUFFIX} u-boot-mmc.${UBOOT_SUFFIX}
-# oe_runmake colibri_vf50_nand_config
-# oe_runmake ${UBOOT_MAKE_TARGET}
-# mv u-boot.${UBOOT_SUFFIX} u-boot-nand.${UBOOT_SUFFIX}
-# mv u-boot-mmc.${UBOOT_SUFFIX} u-boot.${UBOOT_SUFFIX}
-#
-# # prepare the u-boot for nand
-# dd if=/dev/zero of=u-boot-pad bs=1024 count=1
-# cat u-boot-pad u-boot-nand.${UBOOT_SUFFIX} > ${SPL_BINARY}
-#}
-
-# colibri_vf50: build additionally a u-boot binary used for sd-card boot
-SPL_BINARY_colibri-vf50 = "u-boot.imx"
-SPL_IMAGE_colibri-vf50 = "u-boot-${MACHINE}-${PV}-${PR}.imx"
-SPL_SYMLINK_colibri-vf50 = "u-boot-${MACHINE}.imx"
-do_compile_append_colibri-vf50() {
+# colibri_vf: build additionally a u-boot binary used for sd-card boot
+SPL_BINARY_colibri-vf = "u-boot.imx"
+SPL_IMAGE_colibri-vf = "u-boot-${MACHINE}-${PV}-${PR}.imx"
+SPL_SYMLINK_colibri-vf = "u-boot-${MACHINE}.imx"
+do_compile_append_colibri-vf() {
oe_runmake colibri_vf50_sdboot_config
oe_runmake
}