summaryrefslogtreecommitdiffstats
path: root/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-07-23 16:02:25 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2015-07-28 23:26:59 -0300
commit6a868a671472d454b407a165fc31c5f7dfe783c6 (patch)
tree7bd2ab13a04d14215264cc992501970cacfb20ef /recipes-bsp/u-boot
parent62e212fe4812a6c726df4ac8e77d4a77e0e54247 (diff)
downloadmeta-freescale-6a868a671472d454b407a165fc31c5f7dfe783c6.tar.gz
Move meta-fsl-ppc content to layer root
This commit is just a rename of all contents of meta-fsl-ppc subdirectory to this layer's root, merging the contents of common files, subsequent changes are based on top of that. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-bsp/u-boot')
-rw-r--r--recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch77
-rw-r--r--recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch38
-rw-r--r--recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb189
3 files changed, 304 insertions, 0 deletions
diff --git a/recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch b/recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch
new file mode 100644
index 00000000..e6b8d2e5
--- /dev/null
+++ b/recipes-bsp/u-boot/files/0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch
@@ -0,0 +1,77 @@
1From 9ba002f1b1afc7af84a352f4ecab32a30d7ba353 Mon Sep 17 00:00:00 2001
2From: Zhenhua Luo <zhenhua.luo@freescale.com>
3Date: Mon, 9 Feb 2015 18:33:56 +0800
4Subject: [PATCH] u-boot/mpc85xx/u-boot*.lds: remove _GLOBAL_OFFSET_TABLE_
5 definition
6
7In binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbols defined by PROVIDE in
8u-boot.lds overrides the linker built-in symbols
9(https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=b893397a4b1316610f49819344817715e4305de9),
10so the linker is treating _GLOBAL_OFFSET_TABLE_ as a definition into the .reloc section.
11
12To align with the change of binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbol
13should not be defined in sections, and the symbols in linker generated .got
14section should be used(https://sourceware.org/ml/binutils/2008-09/msg00122.html).
15
16Fixed the following build errors with binutils-2.25:
17| powerpc-poky-linux-gnuspe-ld.bfd: _GLOBAL_OFFSET_TABLE_ not defined in linker created .got
18
19Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
20---
21 arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 1 -
22 arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 1 -
23 arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 1 -
24 arch/powerpc/cpu/mpc85xx/u-boot.lds | 1 -
25 4 files changed, 4 deletions(-)
26
27diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
28index f933b21..0399f93 100644
29--- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
30+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds
31@@ -44,7 +44,6 @@ SECTIONS
32 _GOT2_TABLE_ = .;
33 KEEP(*(.got2))
34 KEEP(*(.got))
35- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
36 _FIXUP_TABLE_ = .;
37 KEEP(*(.fixup))
38 }
39diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
40index b83c553..f044564 100644
41--- a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
42+++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds
43@@ -22,7 +22,6 @@ SECTIONS
44 _GOT2_TABLE_ = .;
45 KEEP(*(.got2))
46 KEEP(*(.got))
47- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
48 _FIXUP_TABLE_ = .;
49 KEEP(*(.fixup))
50 }
51diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
52index 5ae7b3e..889a4c2 100644
53--- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
54+++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds
55@@ -29,7 +29,6 @@ SECTIONS
56 _GOT2_TABLE_ = .;
57 KEEP(*(.got2))
58 KEEP(*(.got))
59- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
60 _FIXUP_TABLE_ = .;
61 KEEP(*(.fixup))
62 }
63diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds
64index 2cf0b25..f15eaf3 100644
65--- a/arch/powerpc/cpu/mpc85xx/u-boot.lds
66+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds
67@@ -50,7 +50,6 @@ SECTIONS
68 _GOT2_TABLE_ = .;
69 KEEP(*(.got2))
70 KEEP(*(.got))
71- PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
72 _FIXUP_TABLE_ = .;
73 KEEP(*(.fixup))
74 }
75--
762.1.0
77
diff --git a/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch b/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch
new file mode 100644
index 00000000..1ddc6675
--- /dev/null
+++ b/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch
@@ -0,0 +1,38 @@
1Upstream-Status: Pending
2
3From 301832414369b749918e0d5db850eed19b81c0fc Mon Sep 17 00:00:00 2001
4From: Zhenhua Luo <zhenhua.luo@freescale.com>
5Date: Tue, 24 Sep 2013 00:54:40 -0500
6Subject: [PATCH] Fix the depend race issue
7
8| make[3]: Entering directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx'
9| /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/.depend:125: *** missing separator. Stop.
10| make[3]: Leaving directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx'
11| make[2]: *** [/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/start.o] Error 2
12| make[2]: *** Waiting for unfinished jobs....
13
14Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com>
15---
16 spl/Makefile | 6 +++++-
17 1 file changed, 5 insertions(+), 1 deletion(-)
18
19diff --git a/spl/Makefile b/spl/Makefile
20index 6dbb105..3156d87 100644
21--- a/spl/Makefile
22+++ b/spl/Makefile
23@@ -185,7 +185,11 @@ $(eval $(call make_u_boot_list, $(obj)u-boot.lst, $(LIBS)))
24 $(obj)u-boot-spl.lds: $(LDSCRIPT) $(obj)u-boot.lst depend
25 $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@
26
27-depend: $(obj).depend
28+# Explicitly make _depend in subdirs containing multiple targets to prevent
29+# parallel sub-makes creating .depend files simultaneously.
30+depend dep: $(obj).depend
31+ for dir in $(SUBDIRS) $(CPUDIR) $(LDSCRIPT_MAKEFILE_DIR) ; do \
32+ $(MAKE) -C $(SRCTREE)/$$dir _depend ; done
33 .PHONY: depend
34
35 # defines $(obj).depend target
36--
371.8.2.1
38
diff --git a/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
new file mode 100644
index 00000000..17c470dc
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-qoriq_2015.01.bb
@@ -0,0 +1,189 @@
1DESCRIPTION = "U-boot bootloader"
2HOMEPAGE = "http://u-boot.sf.net"
3SECTION = "bootloaders"
4PROVIDES = "virtual/bootloader u-boot"
5LICENSE = "GPLv2 & BSD-3-Clause & BSD-2-Clause & LGPL-2.0 & LGPL-2.1"
6LIC_FILES_CHKSUM = " \
7 file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
8 file://Licenses/bsd-2-clause.txt;md5=6a31f076f5773aabd8ff86191ad6fdd5 \
9 file://Licenses/bsd-3-clause.txt;md5=4a1190eac56a9db675d58ebe86eaf50c \
10 file://Licenses/lgpl-2.0.txt;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
11 file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c \
12"
13
14PV = "2014.07+fslgit"
15INHIBIT_DEFAULT_DEPS = "1"
16DEPENDS = "boot-format-native libgcc ${@base_contains('TCMODE', 'external-fsl', '', 'virtual/${TARGET_PREFIX}gcc', d)}"
17
18inherit deploy
19
20SRC_URI = "git://git.freescale.com/ppc/sdk/u-boot.git;nobranch=1 \
21 file://0001-u-boot-mpc85xx-u-boot-.lds-remove-_GLOBAL_OFFSET_TAB.patch"
22SRCREV = "6ba8eedbcdc4b063f59a63e6288b938af739e8ad"
23
24python () {
25 if d.getVar("TCMODE", True) == "external-fsl":
26 return
27
28 ml = d.getVar("MULTILIB_VARIANTS", True)
29 arch = d.getVar("OVERRIDES", True)
30
31 if "e5500-64b:" in arch or "e6500-64b:" in arch:
32 if not "lib32" in ml:
33 raise bb.parse.SkipPackage("Building the u-boot for this arch requires multilib to be enabled")
34 sys_multilib = 'powerpc' + d.getVar('TARGET_VENDOR') + 'mllib32-' + d.getVar('HOST_OS')
35 d.setVar('DEPENDS_append', ' lib32-gcc-cross-powerpc lib32-libgcc')
36 d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE') + '/' + sys_multilib)
37 d.setVar('TOOLCHAIN_OPTIONS_append', '/../lib32-' + d.getVar("MACHINE"))
38 d.setVar("WRAP_TARGET_PREFIX", sys_multilib + '-')
39}
40
41WRAP_TARGET_PREFIX ?= "${TARGET_PREFIX}"
42
43PACKAGE_ARCH = "${MACHINE_ARCH}"
44
45UBOOT_LOCALVERSION = "${@d.getVar('SDK_VERSION', True).partition(' ')[0]}"
46
47USRC ?= ""
48S = '${@base_conditional("USRC", "", "${WORKDIR}/git", "${USRC}", d)}'
49
50EXTRA_OEMAKE = 'CROSS_COMPILE=${WRAP_TARGET_PREFIX} CC="${WRAP_TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
51
52do_compile () {
53 unset LDFLAGS
54 unset CFLAGS
55 unset CPPFLAGS
56
57 if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
58 then
59 head=`git rev-parse --verify --short HEAD 2> /dev/null`
60 printf "%s%s%s" ${UBOOT_LOCALVERSION} +g $head > ${B}/.scmversion
61 printf "%s%s%s" ${UBOOT_LOCALVERSION} +g $head > ${S}/.scmversion
62 fi
63
64 if [ "x${UBOOT_MACHINES}" = "x" ]; then
65 UBOOT_MACHINES=${UBOOT_MACHINE}
66 fi
67
68 python ./tools/genboardscfg.py
69 for board in ${UBOOT_MACHINES}; do
70 if ! grep -wq $board ${S}/boards.cfg;then
71 echo "WARNING: $board not supported in boards.cfg"
72 continue
73 fi
74
75 oe_runmake O=${board} distclean
76 oe_runmake O=${board} ${board}_config
77 oe_runmake O=${board} all
78
79 case "${board}" in
80 *SDCARD*) UBOOT_TARGET="u-boot-sd";;
81 *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
82 *NAND*) UBOOT_TARGET="u-boot-nand";;
83 *SRIO*) UBOOT_TARGET="u-boot-srio";;
84 *) UBOOT_TARGET="";;
85 esac
86
87 # deal with sd/spi/nand/srio image
88 UBOOT_SOURCE=u-boot.bin
89 if [ "x${UBOOT_TARGET}" != "x" ] && echo $board |egrep -qi "SECBOOT|SECURE"; then
90 cp ${S}/${board}/${UBOOT_SOURCE} ${S}/${board}/${UBOOT_TARGET}.bin
91 elif [ "x${UBOOT_TARGET}" != "x" ]; then
92 # some boards' final binary was not named as u-boot.bin
93 if [ "${UBOOT_TARGET}" = "u-boot-nand" ];then
94 if echo $board |egrep -q "^(BSC|C29|P10|P2020RDB)";then
95 UBOOT_SOURCE=u-boot-with-spl.bin
96 elif echo $board |egrep -q "^(B4|T1|T2|T4)";then
97 UBOOT_SOURCE=u-boot-with-spl-pbl.bin
98 elif echo $board |egrep -q "^(P2041|P3|P4|P5)";then
99 UBOOT_SOURCE=u-boot.pbl
100 fi
101 elif [ "${UBOOT_TARGET}" = "u-boot-spi" ];then
102 if echo $board |egrep -q "^(P10|P2020RDB)";then
103 UBOOT_SOURCE=u-boot-with-spl.bin
104 elif echo $board |egrep -q "^(T1|T2)";then
105 UBOOT_SOURCE=u-boot-with-spl-pbl.bin
106 elif echo $board |egrep -q "^(B4|P2041|P3|P4|P5|T4)";then
107 UBOOT_SOURCE=u-boot.pbl
108 fi
109 elif [ "${UBOOT_TARGET}" = "u-boot-sd" ];then
110 if echo $board |egrep -q "^(P10|P2020RDB)";then
111 UBOOT_SOURCE=u-boot-with-spl.bin
112 elif echo $board |egrep -q "^(B4|T1|T2|T4)";then
113 UBOOT_SOURCE=u-boot-with-spl-pbl.bin
114 elif echo $board |egrep -q "^(P2041|P3|P4|P5)";then
115 UBOOT_SOURCE=u-boot.pbl
116 fi
117 fi
118 cp ${S}/${board}/${UBOOT_SOURCE} ${S}/${board}/${UBOOT_TARGET}.bin
119
120 # use boot-format to regenerate spi image if BOOTFORMAT_CONFIG is not empty
121 if [ "${UBOOT_TARGET}" = "u-boot-spi" ] && [ -n "${BOOTFORMAT_CONFIG}" ];then
122 ${STAGING_BINDIR_NATIVE}/boot_format \
123 ${STAGING_DATADIR_NATIVE}/boot_format/${BOOTFORMAT_CONFIG} \
124 ${S}/${board}/${UBOOT_SOURCE} -spi ${S}/${board}/${UBOOT_TARGET}.bin
125 fi
126 fi
127 done
128}
129
130do_install(){
131 if [ "x${UBOOT_MACHINES}" = "x" ]; then
132 UBOOT_MACHINES=${UBOOT_MACHINE}
133 fi
134
135 for board in ${UBOOT_MACHINES}; do
136 if ! grep -wq $board ${S}/boards.cfg;then
137 continue
138 fi
139
140 case "${board}" in
141 *SDCARD*) UBOOT_TARGET="u-boot-sd";;
142 *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
143 *NAND*) UBOOT_TARGET="u-boot-nand";;
144 *SRIO*) UBOOT_TARGET="u-boot-srio";;
145 *) UBOOT_TARGET="u-boot";;
146 esac
147
148 if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
149 mkdir -p ${D}/boot/
150 install ${S}/${board}/${UBOOT_TARGET}.bin ${D}/boot/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
151 ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${D}/boot/${UBOOT_TARGET}.bin
152 fi
153 done
154}
155
156do_deploy(){
157 if [ "x${UBOOT_MACHINES}" = "x" ]; then
158 UBOOT_MACHINES=${UBOOT_MACHINE}
159 fi
160
161 for board in ${UBOOT_MACHINES}; do
162 if ! grep -wq $board ${S}/boards.cfg;then
163 continue
164 fi
165
166 case "${board}" in
167 *SDCARD*) UBOOT_TARGET="u-boot-sd";;
168 *SPIFLASH*) UBOOT_TARGET="u-boot-spi";;
169 *NAND*) UBOOT_TARGET="u-boot-nand";;
170 *SRIO*) UBOOT_TARGET="u-boot-srio";;
171 *) UBOOT_TARGET="u-boot";;
172 esac
173
174 if [ -f ${S}/${board}/${UBOOT_TARGET}.bin ]; then
175 mkdir -p ${DEPLOYDIR}
176 install ${S}/${board}/${UBOOT_TARGET}.bin ${DEPLOYDIR}/${UBOOT_TARGET}-${board}-${PV}-${PR}.bin
177
178 cd ${DEPLOYDIR}
179 rm -f ${UBOOT_TARGET}-${board}.bin
180 ln -sf ${UBOOT_TARGET}-${board}-${PV}-${PR}.bin ${UBOOT_TARGET}-${board}.bin
181 fi
182 done
183}
184addtask deploy after do_install
185
186PACKAGES += "${PN}-images"
187FILES_${PN}-images += "/boot"
188
189ALLOW_EMPTY_${PN} = "1"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-02-26 01:38:53 +0000