diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-05-01 15:42:46 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2015-05-12 10:04:36 +0200 |
| commit | c1e90a1418e11a7763bf7a52f876db6c72c76fb0 (patch) | |
| tree | dc8dc09dca8e163bd2d94d28aa7ab24ca612db86 /recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb | |
| parent | 2d0ffd84a82cd3d75a37af5a98fe2584448ea4cc (diff) | |
apalis/colibri_t20/t30: integrate latest stuff
Diffstat (limited to 'recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb')
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb index dce8fa1..c32e239 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb @@ -1,47 +1,32 @@ SUMMARY = "U-boot bootloader fw_printenv/setenv utils" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM_colibri-t20 = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ - file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90" -LIC_FILES_CHKSUM_tegra3 = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" +LIC_FILES_CHKSUM_tegra = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" SECTION = "bootloader" PROVIDES = "u-boot-fw-utils" DEPENDS = "mtd-utils" -COMPATIBLE_MACHINE = "(colibri-t20|colibri-t30|apalis-t30)" +COMPATIBLE_MACHINE = "(apalis-t30|colibri-t20|colibri-t30)" +DEFAULT_PREFERENCE_apalis-t30 = "1" DEFAULT_PREFERENCE_colibri-t20 = "1" DEFAULT_PREFERENCE_colibri-t30 = "1" -DEFAULT_PREFERENCE_apalis-t30 = "1" FILESPATHPKG =. "git:" S="${WORKDIR}/git" -SRC_URI_T20 = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=colibri" -SRC_URI_T20 += "file://fw_env.config" -SRC_URI_T30 = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=2014.10-toradex" -SRC_URI_T30 += "file://fw_env.config" -# This revision is based on upstream "v2011.06" -SRCREV_T20 = "278ca22a59e3df4dd1e1494e8920a01c172118af" -# This revision is based on upstream "v2014.10" -SRCREV_T30 = "f7e57f71da1eecbf1ac28339868d15492c929925" +SRC_URI = "git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=2015.04-toradex-next" +SRC_URI += "file://fw_env.config" +# This revision is based on upstream "v2015.04" +SRCREV = "d536cdbdf8e8765a2d223b2c38c0fa2e8ff36f12" +PV_apalis-t30 = "${PR}+gitr${SRCREV}" PV_colibri-t20 = "${PR}+gitr${SRCREV}" PV_colibri-t30 = "${PR}+gitr${SRCREV}" -PV_apalis-t30 = "${PR}+gitr${SRCREV}" - -SRC_URI_colibri-t20 = "${SRC_URI_T20}" -SRC_URI_colibri-t30 = "${SRC_URI_T30}" -SRC_URI_apalis-t30 = "${SRC_URI_T30}" - -SRCREV_colibri-t20 = "${SRCREV_T20}" -SRCREV_colibri-t30 = "${SRCREV_T30}" -SRCREV_apalis-t30 = "${SRCREV_T30}" S = "${WORKDIR}/git" #actually this depend on the upstream U-Boot version and not on the machine -CC_remove_tegra3 = "-mfpu=neon" -EXTRA_OEMAKE_tegra3 = 'CC="${CC}"' -EXTRA_OEMAKE_tegra2 = 'HOSTCC="${CC}" HOSTSTRIP="true"' +CC_remove = "-mfpu=neon" +EXTRA_OEMAKE = 'CC="${CC}"' INSANE_SKIP_${PN} = "already-stripped" @@ -64,7 +49,7 @@ pkg_postinst_${PN}_colibri-t20 () { if [ "x$D" != "x" ]; then exit 1 fi - grep ENV /proc/mtd | awk '{print "/dev/" substr($1,0,4) " 0x00000000 0x00001000 0x" $3 " 1" >> "/etc/fw_env.config" }' + grep u-boot-env /proc/mtd | awk '{print "/dev/" substr($1,0,4) " 0x00000000 0x00001000 0x" $3 " 1" >> "/etc/fw_env.config" }' } pkg_postinst_${PN}_tegra3 () { |