summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-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
-rw-r--r--recipes-kernel/linux/linux-toradex-vf_git.bb13
-rw-r--r--recipes-support/fbset/files/colibri-vf/fb.modes (renamed from recipes-support/fbset/files/colibri-vf50/fb.modes)0
-rw-r--r--recipes-support/icu/icu_50.1.2.bbappend6
-rw-r--r--recipes/base-files/base-files/colibri-vf/fstab (renamed from recipes/base-files/base-files/colibri-vf50/fstab)0
-rw-r--r--recipes/base-files/base-files/colibri-vf/profile (renamed from recipes/base-files/base-files/colibri-vf50/profile)0
-rw-r--r--recipes/images/angstrom-lxde-image.bb7
-rw-r--r--recipes/images/console-trdx-image.bb3
-rw-r--r--recipes/images/files/colibri-vf/burnflash.tar.bz2 (renamed from recipes/images/files/colibri-vf50/burnflash.tar.bz2)bin5338 -> 5338 bytes
-rw-r--r--recipes/images/qt4e-demo-image.bb3
-rw-r--r--recipes/images/trdx-extra.inc4
-rw-r--r--recipes/images/trdx-image-fstype.inc6
-rw-r--r--recipes/xorg-xserver/xserver-xf86-config/colibri-vf/xorg.conf (renamed from recipes/xorg-xserver/xserver-xf86-config/colibri-vf50/xorg.conf)0
14 files changed, 26 insertions, 49 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
}
diff --git a/recipes-kernel/linux/linux-toradex-vf_git.bb b/recipes-kernel/linux/linux-toradex-vf_git.bb
index 540c924..d5eff6d 100644
--- a/recipes-kernel/linux/linux-toradex-vf_git.bb
+++ b/recipes-kernel/linux/linux-toradex-vf_git.bb
@@ -3,8 +3,8 @@ require recipes-kernel/linux/linux.inc
LINUX_VERSION ?= "3.0.15"
-SRCREV_colibri-vf50 = "87af4ef6e63b55de3c34cd20e9ebb54b0e0ded05"
-PR_colibri-vf50 = "V2.1b1"
+SRCREV_colibri-vf = "fff8692e9818f930c0e40c3e1a631799fb78c13f"
+PR_colibri-vf = "V2.1b2"
PV = "${LINUX_VERSION}+gitr${SRCREV}"
S = "${WORKDIR}/git"
@@ -13,7 +13,7 @@ SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=colibri_v
# SRC_URI += "file://a.patch "
-COMPATIBLE_MACHINE_colibri-vf50 = "colibri-vf50"
+COMPATIBLE_MACHINE_colibri-vf = "colibri-vf"
# Place changes to the defconfig here
config_script () {
@@ -21,10 +21,6 @@ config_script () {
# #sets CONFIG_TEGRA_CAMERA unconditionally to 'y'
# sed -i -e /CONFIG_TEGRA_CAMERA/d ${S}/.config
# echo "CONFIG_TEGRA_CAMERA=y" >> ${S}/.config
- sed -i -e /CONFIG_VFPv3/d ${S}/.config
- echo "CONFIG_VFPv3=y" >> ${S}/.config
- sed -i -e /CONFIG_NEON/d ${S}/.config
- echo "CONFIG_NEON=y" >> ${S}/.config
echo "dummy" > /dev/null
}
@@ -33,6 +29,9 @@ do_configure_prepend () {
#assume its called ${MACHINE}_defconfig, but with '_' instead of '-'
DEFCONFIG="`echo ${MACHINE} | sed -e 's/\-/\_/g' -e 's/$/_defconfig/'`"
+ #until we have the unified kernel
+ DEFCONFIG=colibri_vf50_defconfig
+
oe_runmake $DEFCONFIG
#maybe change some configuration
diff --git a/recipes-support/fbset/files/colibri-vf50/fb.modes b/recipes-support/fbset/files/colibri-vf/fb.modes
index ba902ce..ba902ce 100644
--- a/recipes-support/fbset/files/colibri-vf50/fb.modes
+++ b/recipes-support/fbset/files/colibri-vf/fb.modes
diff --git a/recipes-support/icu/icu_50.1.2.bbappend b/recipes-support/icu/icu_50.1.2.bbappend
index 61b789d..3a079ad 100644
--- a/recipes-support/icu/icu_50.1.2.bbappend
+++ b/recipes-support/icu/icu_50.1.2.bbappend
@@ -1,12 +1,12 @@
# use a customized icu data library created from
# http://apps.icu-project.org/datacustom/ICUData50.html
-PRINC_colibri-vf50 = "1"
+PRINC_colibri-vf = "1"
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_colibri-vf50 = "${BASE_SRC_URI} file://icudt50l.zip "
+SRC_URI_colibri-vf = "${BASE_SRC_URI} file://icudt50l.zip "
-do_configure_append_colibri-vf50 () {
+do_configure_append_colibri-vf () {
rm ${S}/data/in/icudt50l.dat
cp ${WORKDIR}/icudt50l.dat ${S}/data/in/
}
diff --git a/recipes/base-files/base-files/colibri-vf50/fstab b/recipes/base-files/base-files/colibri-vf/fstab
index fea4501..fea4501 100644
--- a/recipes/base-files/base-files/colibri-vf50/fstab
+++ b/recipes/base-files/base-files/colibri-vf/fstab
diff --git a/recipes/base-files/base-files/colibri-vf50/profile b/recipes/base-files/base-files/colibri-vf/profile
index c1ee240..c1ee240 100644
--- a/recipes/base-files/base-files/colibri-vf50/profile
+++ b/recipes/base-files/base-files/colibri-vf/profile
diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb
index 0744fda..4753f4f 100644
--- a/recipes/images/angstrom-lxde-image.bb
+++ b/recipes/images/angstrom-lxde-image.bb
@@ -12,8 +12,7 @@ IMAGE_NAME_colibri-t20 = "Colibri_T20_LinuxImage"
IMAGE_NAME_colibri-t30 = "Colibri_T30_LinuxImage"
IMAGE_NAME_apalis-t30 = "Apalis_T30_LinuxImage"
IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxImage"
-IMAGE_NAME_colibri-vf50 = "Colibri_VF50_LinuxImage"
-IMAGE_NAME_colibri-vf61 = "Colibri_VF61_LinuxImage"
+IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxImage"
IMAGE_NAME = "${MACHINE}_LinuxImage"
#create the deployment directory-tree
@@ -39,7 +38,7 @@ DEPENDS_tegra += "nvsamples"
IMAGE_BROWSER = "firefox"
#keep the rootfs size small
-IMAGE_BROWSER_colibri-vf50 = "midori"
+IMAGE_BROWSER_colibri-vf = "midori"
# this recommends from midori pulls in 8Meg of icons
BAD_RECOMMENDATIONS += " gnome-icon-theme "
@@ -82,7 +81,7 @@ GSTREAMER = " \
gst-plugins-good-wavparse \
gst-plugins-ugly-asf \
"
-GSTREAMER_colibri-vf50 = ""
+GSTREAMER_colibri-vf = ""
IMAGE_INSTALL += " \
gconf \
diff --git a/recipes/images/console-trdx-image.bb b/recipes/images/console-trdx-image.bb
index 995db1a..3fe52b3 100644
--- a/recipes/images/console-trdx-image.bb
+++ b/recipes/images/console-trdx-image.bb
@@ -12,8 +12,7 @@ IMAGE_NAME_colibri-t20 = "Colibri_T20_LinuxConsoleImage"
IMAGE_NAME_colibri-t30 = "Colibri_T30_LinuxConsoleImage"
IMAGE_NAME_apalis-t30 = "Apalis_T30_LinuxConsoleImage"
IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxConsoleImage"
-IMAGE_NAME_colibri-vf50 = "Colibri_VF50_LinuxConsoleImage"
-IMAGE_NAME_colibri-vf61 = "Colibri_VF61_LinuxConsoleImage"
+IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxConsoleImage"
IMAGE_NAME = "${MACHINE}_LinuxConsoleImage"
#create the deployment directory-tree
diff --git a/recipes/images/files/colibri-vf50/burnflash.tar.bz2 b/recipes/images/files/colibri-vf/burnflash.tar.bz2
index c213166..c213166 100644
--- a/recipes/images/files/colibri-vf50/burnflash.tar.bz2
+++ b/recipes/images/files/colibri-vf/burnflash.tar.bz2
Binary files differ
diff --git a/recipes/images/qt4e-demo-image.bb b/recipes/images/qt4e-demo-image.bb
index 82b92f8..8d7b974 100644
--- a/recipes/images/qt4e-demo-image.bb
+++ b/recipes/images/qt4e-demo-image.bb
@@ -9,8 +9,7 @@ PR = "r0"
#start of the resulting deployable tarball name
IMAGE_NAME_colibri-pxa = "Colibri_PXA_LinuxImage-qte"
-IMAGE_NAME_colibri-vf50 = "Colibri_VF50_LinuxImage-qte"
-IMAGE_NAME_colibri-vf61 = "Colibri_VF61_LinuxImage-qte"
+IMAGE_NAME_colibri-vf = "Colibri_VF_LinuxImage-qte"
IMAGE_NAME = "${MACHINE}_LinuxImage-qte"
#create the deployment directory-tree
diff --git a/recipes/images/trdx-extra.inc b/recipes/images/trdx-extra.inc
index c6fe6bb..9526395 100644
--- a/recipes/images/trdx-extra.inc
+++ b/recipes/images/trdx-extra.inc
@@ -58,9 +58,7 @@ IMAGE_INSTALL_MACHINE_apalis-t30 = "${IMAGE_INSTALL_T20_T30} \
kernel-module-videobuf2-memops \
"
-IMAGE_INSTALL_MACHINE_colibri-vf50 = "${IMAGE_INSTALL_VF}"
-
-IMAGE_INSTALL_MACHINE_colibri-vf61 = "${IMAGE_INSTALL_VF}"
+IMAGE_INSTALL_MACHINE_colibri-vf = "${IMAGE_INSTALL_VF}"
IMAGE_INSTALL_MACHINE = ""
diff --git a/recipes/images/trdx-image-fstype.inc b/recipes/images/trdx-image-fstype.inc
index e91ee65..eeb39b1 100644
--- a/recipes/images/trdx-image-fstype.inc
+++ b/recipes/images/trdx-image-fstype.inc
@@ -6,7 +6,7 @@ S = "${WORKDIR}/burnflash"
IMAGE_ROOTFS = "${WORKDIR}/${IMAGE_NAME}${PV}/rootfs"
U_BOOT_EXT = "bin"
-U_BOOT_EXT_colibri-vf50 = "imx"
+U_BOOT_EXT_colibri-vf = "imx"
do_rootfs_prepend() {
tar -C ${WORKDIR} -xf ${BURNFLASH}
@@ -15,9 +15,9 @@ do_rootfs_prepend() {
}
#we need the native ubi tools for machines using ubifs
-DEPENDS_colibri-vf50 = "mtd-utils-native"
+DEPENDS_colibri-vf = "mtd-utils-native"
CP_MKUBIFS=""
-CP_MKUBIFS_colibri-vf50="MKUBIFS=`which mkfs.ubifs` ; mkdir ${IMAGE_ROOTFS}/../vf_flash/ ; cp ${MKUBIFS} ${IMAGE_ROOTFS}/../vf_flash/ ; ${BUILD_STRIP} ${IMAGE_ROOTFS}/../vf_flash/mkfs.ubifs"
+CP_MKUBIFS_colibri-vf="MKUBIFS=`which mkfs.ubifs` ; mkdir ${IMAGE_ROOTFS}/../vf_flash/ ; cp ${MKUBIFS} ${IMAGE_ROOTFS}/../vf_flash/ ; ${BUILD_STRIP} ${IMAGE_ROOTFS}/../vf_flash/mkfs.ubifs"
do_rootfs_append() {
# put u-boot, kernel into the bin directories, remove the kernel from the rootfs/boot
diff --git a/recipes/xorg-xserver/xserver-xf86-config/colibri-vf50/xorg.conf b/recipes/xorg-xserver/xserver-xf86-config/colibri-vf/xorg.conf
index 79b6c0f..79b6c0f 100644
--- a/recipes/xorg-xserver/xserver-xf86-config/colibri-vf50/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xf86-config/colibri-vf/xorg.conf
generated by cgit v1.2.3 (git 2.0.4) at 2024-05-18 01:49:58 +0000