diff options
-rw-r--r-- | recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb | 36 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot-ti.inc | 6 |
2 files changed, 21 insertions, 21 deletions
diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb index 38f58f7d..2b85800b 100644 --- a/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb +++ b/recipes-bsp/u-boot/u-boot-ti-staging_2016.05.bb | |||
@@ -7,7 +7,7 @@ DESCRIPTION = "u-boot bootloader for TI devices" | |||
7 | 7 | ||
8 | LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" | 8 | LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" |
9 | 9 | ||
10 | PR = "r21" | 10 | PR = "r22" |
11 | PV_append = "+git${SRCPV}" | 11 | PV_append = "+git${SRCPV}" |
12 | 12 | ||
13 | SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}" | 13 | SRC_URI = "git://git.ti.com/ti-u-boot/ti-u-boot.git;protocol=git;branch=${BRANCH}" |
@@ -52,32 +52,32 @@ UBOOT_HS_MLO_IMAGE = "u-boot_HS_MLO-${MACHINE}-${PV}-${PR}" | |||
52 | UBOOT_HS_MLO_SYMLINK = "u-boot_HS_MLO-${MACHINE}" | 52 | UBOOT_HS_MLO_SYMLINK = "u-boot_HS_MLO-${MACHINE}" |
53 | 53 | ||
54 | do_compile_append_am437x-hs-evm () { | 54 | do_compile_append_am437x-hs-evm () { |
55 | if [ -f ${S}/u-boot-spl_HS_ISSW ]; then | 55 | if [ -f ${B}/u-boot-spl_HS_ISSW ]; then |
56 | rm -rf ${S}/MLO | 56 | rm -rf ${B}/MLO |
57 | cp ${S}/u-boot-spl_HS_ISSW ${S}/MLO | 57 | cp ${B}/u-boot-spl_HS_ISSW ${B}/MLO |
58 | fi | 58 | fi |
59 | } | 59 | } |
60 | 60 | ||
61 | do_install_append () { | 61 | do_install_append () { |
62 | if [ -f ${S}/${UBOOT_HS_XLD_BINARY} ]; then | 62 | if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then |
63 | install ${S}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE} | 63 | install ${B}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE} |
64 | ln -sf ${UBOOT_HS_XLD_IMAGE} ${D}/boot/${UBOOT_HS_XLD_BINARY} | 64 | ln -sf ${UBOOT_HS_XLD_IMAGE} ${D}/boot/${UBOOT_HS_XLD_BINARY} |
65 | fi | 65 | fi |
66 | if [ -f ${S}/${UBOOT_HS_MLO_BINARY} ]; then | 66 | if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then |
67 | install ${S}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE} | 67 | install ${B}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE} |
68 | ln -sf ${UBOOT_HS_MLO_IMAGE} ${D}/boot/${UBOOT_HS_MLO_BINARY} | 68 | ln -sf ${UBOOT_HS_MLO_IMAGE} ${D}/boot/${UBOOT_HS_MLO_BINARY} |
69 | fi | 69 | fi |
70 | } | 70 | } |
71 | 71 | ||
72 | do_deploy_append () { | 72 | do_deploy_append () { |
73 | if [ -f ${S}/${UBOOT_HS_XLD_BINARY} ]; then | 73 | if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then |
74 | install ${S}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE} | 74 | install ${B}/${UBOOT_HS_XLD_BINARY} ${DEPLOYDIR}/${UBOOT_HS_XLD_IMAGE} |
75 | rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} | 75 | rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK} |
76 | ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK} | 76 | ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK} |
77 | ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY} | 77 | ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY} |
78 | fi | 78 | fi |
79 | if [ -f ${S}/${UBOOT_HS_MLO_BINARY} ]; then | 79 | if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then |
80 | install ${S}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE} | 80 | install ${B}/${UBOOT_HS_MLO_BINARY} ${DEPLOYDIR}/${UBOOT_HS_MLO_IMAGE} |
81 | rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} | 81 | rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK} |
82 | ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK} | 82 | ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK} |
83 | ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY} | 83 | ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY} |
@@ -85,28 +85,28 @@ do_deploy_append () { | |||
85 | } | 85 | } |
86 | 86 | ||
87 | do_install_append_keystone () { | 87 | do_install_append_keystone () { |
88 | install ${S}/spl/${UBOOT_SPI_SPL_BINARY} ${D}/boot/${UBOOT_SPI_SPL_IMAGE} | 88 | install ${B}/spl/${UBOOT_SPI_SPL_BINARY} ${D}/boot/${UBOOT_SPI_SPL_IMAGE} |
89 | ln -sf ${UBOOT_SPI_SPL_IMAGE} ${D}/boot/${UBOOT_SPI_SPL_BINARY} | 89 | ln -sf ${UBOOT_SPI_SPL_IMAGE} ${D}/boot/${UBOOT_SPI_SPL_BINARY} |
90 | 90 | ||
91 | install ${S}/${UBOOT_SPI_BINARY} ${D}/boot/${UBOOT_SPI_IMAGE} | 91 | install ${B}/${UBOOT_SPI_BINARY} ${D}/boot/${UBOOT_SPI_IMAGE} |
92 | ln -sf ${UBOOT_SPI_IMAGE} ${D}/boot/${UBOOT_SPI_BINARY} | 92 | ln -sf ${UBOOT_SPI_IMAGE} ${D}/boot/${UBOOT_SPI_BINARY} |
93 | 93 | ||
94 | install ${S}/${UBOOT_SPI_GPH_BINARY} ${D}/boot/${UBOOT_SPI_GPH_IMAGE} | 94 | install ${B}/${UBOOT_SPI_GPH_BINARY} ${D}/boot/${UBOOT_SPI_GPH_IMAGE} |
95 | ln -sf ${UBOOT_SPI_GPH_IMAGE} ${D}/boot/${UBOOT_SPI_GPH_BINARY} | 95 | ln -sf ${UBOOT_SPI_GPH_IMAGE} ${D}/boot/${UBOOT_SPI_GPH_BINARY} |
96 | } | 96 | } |
97 | 97 | ||
98 | do_deploy_append_keystone () { | 98 | do_deploy_append_keystone () { |
99 | install ${S}/spl/${UBOOT_SPI_SPL_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_SPL_IMAGE} | 99 | install ${B}/spl/${UBOOT_SPI_SPL_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_SPL_IMAGE} |
100 | rm -f ${UBOOT_SPI_SPL_BINARY} ${UBOOT_SPI_SPL_SYMLINK} | 100 | rm -f ${UBOOT_SPI_SPL_BINARY} ${UBOOT_SPI_SPL_SYMLINK} |
101 | ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_SYMLINK} | 101 | ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_SYMLINK} |
102 | ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_BINARY} | 102 | ln -sf ${UBOOT_SPI_SPL_IMAGE} ${UBOOT_SPI_SPL_BINARY} |
103 | 103 | ||
104 | install ${S}/${UBOOT_SPI_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_IMAGE} | 104 | install ${B}/${UBOOT_SPI_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_IMAGE} |
105 | rm -f ${UBOOT_SPI_BINARY} ${UBOOT_SPI_SYMLINK} | 105 | rm -f ${UBOOT_SPI_BINARY} ${UBOOT_SPI_SYMLINK} |
106 | ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_SYMLINK} | 106 | ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_SYMLINK} |
107 | ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_BINARY} | 107 | ln -sf ${UBOOT_SPI_IMAGE} ${UBOOT_SPI_BINARY} |
108 | 108 | ||
109 | install ${S}/${UBOOT_SPI_GPH_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_GPH_IMAGE} | 109 | install ${B}/${UBOOT_SPI_GPH_BINARY} ${DEPLOYDIR}/${UBOOT_SPI_GPH_IMAGE} |
110 | rm -f ${UBOOT_SPI_GPH_BINARY} ${UBOOT_SPI_GPH_SYMLINK} | 110 | rm -f ${UBOOT_SPI_GPH_BINARY} ${UBOOT_SPI_GPH_SYMLINK} |
111 | ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_SYMLINK} | 111 | ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_SYMLINK} |
112 | ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_BINARY} | 112 | ln -sf ${UBOOT_SPI_GPH_IMAGE} ${UBOOT_SPI_GPH_BINARY} |
diff --git a/recipes-bsp/u-boot/u-boot-ti.inc b/recipes-bsp/u-boot/u-boot-ti.inc index b0054c96..661f9318 100644 --- a/recipes-bsp/u-boot/u-boot-ti.inc +++ b/recipes-bsp/u-boot/u-boot-ti.inc | |||
@@ -4,7 +4,7 @@ def get_git_revision(p): | |||
4 | import subprocess | 4 | import subprocess |
5 | 5 | ||
6 | try: | 6 | try: |
7 | return subprocess.Popen("git rev-parse HEAD 2>/dev/null ", cwd=p, shell=True, stdout=subprocess.PIPE).communicate()[0].rstrip() | 7 | return subprocess.Popen("git rev-parse HEAD 2>/dev/null ", cwd=p, shell=True, stdout=subprocess.PIPE, universal_newlines=True).communicate()[0].rstrip() |
8 | except OSError: | 8 | except OSError: |
9 | return None | 9 | return None |
10 | 10 | ||
@@ -36,7 +36,7 @@ SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" | |||
36 | do_install_append () { | 36 | do_install_append () { |
37 | if [ "x${SPL_UART_BINARY}" != "x" ] | 37 | if [ "x${SPL_UART_BINARY}" != "x" ] |
38 | then | 38 | then |
39 | install ${S}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE} | 39 | install ${B}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE} |
40 | ln -sf ${SPL_UART_IMAGE} ${D}/boot/${SPL_UART_BINARY} | 40 | ln -sf ${SPL_UART_IMAGE} ${D}/boot/${SPL_UART_BINARY} |
41 | fi | 41 | fi |
42 | } | 42 | } |
@@ -45,7 +45,7 @@ do_deploy_append () { | |||
45 | cd ${DEPLOYDIR} | 45 | cd ${DEPLOYDIR} |
46 | if [ "x${SPL_UART_BINARY}" != "x" ] | 46 | if [ "x${SPL_UART_BINARY}" != "x" ] |
47 | then | 47 | then |
48 | install ${S}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE} | 48 | install ${B}/spl/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_IMAGE} |
49 | rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK} | 49 | rm -f ${DEPLOYDIR}/${SPL_UART_BINARY} ${DEPLOYDIR}/${SPL_UART_SYMLINK} |
50 | ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY} | 50 | ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_BINARY} |
51 | ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK} | 51 | ln -sf ${SPL_UART_IMAGE} ${DEPLOYDIR}/${SPL_UART_SYMLINK} |