From b823b5e0832958fea095a499ee23daee11bd288e0a6ba97f07b77b73514b4bed Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 7 Jun 2018 06:57:52 +0000 Subject: [PATCH] Accepting request 614464 from hardware:boot:staging OBS-URL: https://build.opensuse.org/request/show/614464 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/u-boot?expand=0&rev=20 --- 0005-zynqmp-Add-generic-target.patch | 4 +- ...-tools-zynqmpimage-Add-partition-rea.patch | 2 +- ...-tools-zynqmpimage-Move-defines-to-h.patch | 4 +- 0009-tools-zynqmpimage-Add-bif-support.patch | 2 +- ...-rockchip-make_fit_atf-use-elf-entry.patch | 72 + ...-rockchip-make_fit_atf-make-python3-.patch | 196 ++ ...-rockchip-make_fit_atf.py-depends-on.patch | 35 + pre_checkin.sh | 8 +- u-boot-a10-olinuxino-lime.changes | 25 + u-boot-a10-olinuxino-lime.spec | 54 +- u-boot-a13-olinuxino.changes | 25 + u-boot-a13-olinuxino.spec | 54 +- u-boot-a13-olinuxinom.changes | 25 + u-boot-a13-olinuxinom.spec | 54 +- u-boot-a20-olinuxino-lime.changes | 25 + u-boot-a20-olinuxino-lime.spec | 54 +- u-boot-a20-olinuxino-lime2.changes | 25 + u-boot-a20-olinuxino-lime2.spec | 54 +- u-boot-a20-olinuxinomicro.changes | 25 + u-boot-a20-olinuxinomicro.spec | 54 +- u-boot-am335xboneblack.changes | 25 + u-boot-am335xboneblack.spec | 54 +- u-boot-am335xevm.changes | 25 + u-boot-am335xevm.spec | 54 +- u-boot-am57xxevm.changes | 25 + u-boot-am57xxevm.spec | 54 +- u-boot-arndale.changes | 25 + u-boot-arndale.spec | 54 +- u-boot-bananapi.changes | 25 + u-boot-bananapi.spec | 54 +- u-boot-board.spec.in | 48 +- u-boot-clearfog.changes | 25 + u-boot-clearfog.spec | 54 +- u-boot-colibrit20.changes | 25 + u-boot-colibrit20.spec | 54 +- u-boot-cubieboard.changes | 25 + u-boot-cubieboard.spec | 54 +- u-boot-cubieboard2.changes | 25 + u-boot-cubieboard2.spec | 54 +- u-boot-cubietruck.changes | 25 + u-boot-cubietruck.spec | 54 +- u-boot-dragonboard410c.changes | 25 + u-boot-dragonboard410c.spec | 54 +- u-boot-dragonboard820c.changes | 25 + u-boot-dragonboard820c.spec | 54 +- u-boot-evb-rk3399.changes | 25 + u-boot-evb-rk3399.spec | 62 +- u-boot-firefly-rk3288.changes | 25 + u-boot-firefly-rk3288.spec | 54 +- u-boot-firefly-rk3399.changes | 25 + u-boot-firefly-rk3399.spec | 62 +- u-boot-geekbox.changes | 25 + u-boot-geekbox.spec | 54 +- u-boot-highbank.changes | 25 + u-boot-highbank.spec | 54 +- u-boot-hikey.changes | 25 + u-boot-hikey.spec | 54 +- u-boot-hyundaia7hd.changes | 25 + u-boot-hyundaia7hd.spec | 54 +- u-boot-jetson-tk1.changes | 25 + u-boot-jetson-tk1.spec | 54 +- u-boot-lamobor1.changes | 25 + u-boot-lamobor1.spec | 54 +- u-boot-ls1012afrdmqspi.changes | 25 + u-boot-ls1012afrdmqspi.spec | 54 +- u-boot-melea1000.changes | 25 + u-boot-melea1000.spec | 54 +- u-boot-merriia80optimus.changes | 25 + u-boot-merriia80optimus.spec | 54 +- u-boot-mvebudb-88f3720.changes | 25 + u-boot-mvebudb-88f3720.spec | 54 +- u-boot-mvebudbarmada8k.changes | 25 + u-boot-mvebudbarmada8k.spec | 54 +- u-boot-mvebuespressobin-88f3720.changes | 25 + u-boot-mvebuespressobin-88f3720.spec | 54 +- u-boot-mvebumcbin-88f8040.changes | 25 + u-boot-mvebumcbin-88f8040.spec | 54 +- u-boot-mx53loco.changes | 25 + u-boot-mx53loco.spec | 54 +- u-boot-mx6cuboxi.changes | 25 + u-boot-mx6cuboxi.spec | 54 +- u-boot-mx6qsabrelite.changes | 25 + u-boot-mx6qsabrelite.spec | 54 +- u-boot-nanopia64.changes | 25 + u-boot-nanopia64.spec | 54 +- u-boot-nanopineo.changes | 25 + u-boot-nanopineo.spec | 54 +- u-boot-nanopineoair.changes | 25 + u-boot-nanopineoair.spec | 54 +- u-boot-odroid-c2.changes | 25 + u-boot-odroid-c2.spec | 54 +- u-boot-odroid-xu3.changes | 25 + u-boot-odroid-xu3.spec | 54 +- u-boot-odroid.changes | 25 + u-boot-odroid.spec | 54 +- u-boot-omap3beagle.changes | 25 + u-boot-omap3beagle.spec | 54 +- u-boot-omap4panda.changes | 25 + u-boot-omap4panda.spec | 54 +- u-boot-orangepipc.changes | 25 + u-boot-orangepipc.spec | 54 +- u-boot-orangepipc2.changes | 25 + u-boot-orangepipc2.spec | 54 +- u-boot-p2371-2180.changes | 25 + u-boot-p2371-2180.spec | 54 +- u-boot-p2771-0000-500.changes | 25 + u-boot-p2771-0000-500.spec | 54 +- u-boot-paz00.changes | 25 + u-boot-paz00.spec | 54 +- u-boot-pcm051rev3.changes | 25 + u-boot-pcm051rev3.spec | 54 +- u-boot-pine64plus.changes | 25 + u-boot-pine64plus.spec | 54 +- u-boot-poplar.changes | 25 + u-boot-poplar.spec | 54 +- u-boot-qemu-ppce500.changes | 25 + u-boot-qemu-ppce500.spec | 54 +- u-boot-rpi.changes | 25 + u-boot-rpi.spec | 54 +- u-boot-rpi2.changes | 25 + u-boot-rpi2.spec | 54 +- u-boot-rpi3.changes | 25 + u-boot-rpi3.spec | 54 +- u-boot-rpi332b.changes | 1917 ----------------- u-boot-rpi332b.spec | 238 -- u-boot-sinovoipbpim2plus.changes | 25 + u-boot-sinovoipbpim2plus.spec | 54 +- u-boot-snow.changes | 25 + u-boot-snow.spec | 54 +- u-boot-socfpgade0nanosoc.changes | 25 + u-boot-socfpgade0nanosoc.spec | 54 +- u-boot-spring.changes | 25 + u-boot-spring.spec | 54 +- u-boot-tinker-rk3288.changes | 25 + u-boot-tinker-rk3288.spec | 54 +- u-boot-turrisomnia.changes | 25 + u-boot-turrisomnia.spec | 54 +- u-boot-udoo.changes | 25 + u-boot-udoo.spec | 54 +- u-boot-udooneo.changes | 25 + u-boot-udooneo.spec | 54 +- u-boot-xilinxzynqmpgeneric.changes | 25 + u-boot-xilinxzynqmpgeneric.spec | 54 +- u-boot-xilinxzynqmpzcu102rev10.changes | 25 + u-boot-xilinxzynqmpzcu102rev10.spec | 54 +- u-boot.changes | 25 + u-boot.spec | 9 +- u-boot.spec.in | 3 +- 148 files changed, 5292 insertions(+), 2580 deletions(-) create mode 100644 0011-rockchip-make_fit_atf-use-elf-entry.patch create mode 100644 0012-rockchip-make_fit_atf-make-python3-.patch create mode 100644 0013-rockchip-make_fit_atf.py-depends-on.patch delete mode 100644 u-boot-rpi332b.changes delete mode 100644 u-boot-rpi332b.spec diff --git a/0005-zynqmp-Add-generic-target.patch b/0005-zynqmp-Add-generic-target.patch index 7aaa524..5ca63fa 100644 --- a/0005-zynqmp-Add-generic-target.patch +++ b/0005-zynqmp-Add-generic-target.patch @@ -38,8 +38,8 @@ v3 -> v4: - remove CONFIG_ZYNQ_SDHCI{0,1} - needs to be solved generically - add xhci usb1 to xhci controller list --- - configs/xilinx_zynqmp_generic_defconfig | 86 +++++++++++++++++++++++++++++++++ - include/configs/xilinx_zynqmp_generic.h | 21 ++++++++ + configs/xilinx_zynqmp_generic_defconfig | 86 +++++++++++++++++++++++++ + include/configs/xilinx_zynqmp_generic.h | 21 ++++++ 2 files changed, 107 insertions(+) create mode 100644 configs/xilinx_zynqmp_generic_defconfig create mode 100644 include/configs/xilinx_zynqmp_generic.h diff --git a/0006-tools-zynqmpimage-Add-partition-rea.patch b/0006-tools-zynqmpimage-Add-partition-rea.patch index bd480db..21f7c21 100644 --- a/0006-tools-zynqmpimage-Add-partition-rea.patch +++ b/0006-tools-zynqmpimage-Add-partition-rea.patch @@ -29,7 +29,7 @@ v3 -> v4: - fix checkpatch --- - tools/zynqmpimage.c | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++- + tools/zynqmpimage.c | 175 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 173 insertions(+), 2 deletions(-) diff --git a/tools/zynqmpimage.c b/tools/zynqmpimage.c diff --git a/0007-tools-zynqmpimage-Move-defines-to-h.patch b/0007-tools-zynqmpimage-Move-defines-to-h.patch index a8cbdde..7570735 100644 --- a/0007-tools-zynqmpimage-Move-defines-to-h.patch +++ b/0007-tools-zynqmpimage-Move-defines-to-h.patch @@ -9,8 +9,8 @@ one as well. Signed-off-by: Alexander Graf --- - tools/zynqmpimage.c | 115 +-------------------------------------------- - tools/zynqmpimage.h | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + tools/zynqmpimage.c | 115 +------------------------------------- + tools/zynqmpimage.h | 132 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 133 insertions(+), 114 deletions(-) create mode 100644 tools/zynqmpimage.h diff --git a/0009-tools-zynqmpimage-Add-bif-support.patch b/0009-tools-zynqmpimage-Add-bif-support.patch index c92c541..5fc0b91 100644 --- a/0009-tools-zynqmpimage-Add-bif-support.patch +++ b/0009-tools-zynqmpimage-Add-bif-support.patch @@ -41,7 +41,7 @@ v3 -> v4: tools/Makefile | 1 + tools/imagetool.h | 1 + tools/mkimage.c | 7 + - tools/zynqmpbif.c | 1008 +++++++++++++++++++++++++++++++++++++++++++++++++++ + tools/zynqmpbif.c | 1008 +++++++++++++++++++++++++++++++++++++++++++ tools/zynqmpimage.c | 4 +- tools/zynqmpimage.h | 7 + 8 files changed, 1028 insertions(+), 2 deletions(-) diff --git a/0011-rockchip-make_fit_atf-use-elf-entry.patch b/0011-rockchip-make_fit_atf-use-elf-entry.patch new file mode 100644 index 0000000..6840b7f --- /dev/null +++ b/0011-rockchip-make_fit_atf-use-elf-entry.patch @@ -0,0 +1,72 @@ +From 938fc526f3d8ca5bd94ca3899edc0f1c5f190fec Mon Sep 17 00:00:00 2001 +From: Mian Yousaf Kaukab +Date: Wed, 16 May 2018 18:44:33 +0200 +Subject: [PATCH] rockchip: make_fit_atf: use elf entry point + +make_fit_atf.py uses physical address of first segment as the +entry point to bl31. It is incorrect and causes following abort +when bl31_entry() is called: + +U-Boot SPL board initTrying to boot from MMC1 +"Synchronous Abort" handler, esr 0x02000000 +elr: 0000000000000000 lr : 00000000ff8c7e8c +x 0: 00000000ff8e0000 x 1: 0000000000000000 +x 2: 0000000000000000 x 3: 00000000ff8e0180 +x 4: 0000000000000000 x 5: 0000000000000000 +x 6: 0000000000000030 x 7: 00000000ff8e0188 +x 8: 00000000000001e0 x 9: 0000000000000000 +x10: 000000000007fcdc x11: 00000000002881b8 +x12: 00000000000001a2 x13: 0000000000000198 +x14: 000000000007fdcc x15: 00000000002881b8 +x16: 00000000003c0724 x17: 00000000003c0718 +x18: 000000000007fe80 x19: 00000000ff8e0000 +x20: 0000000000200000 x21: 00000000ff8e0000 +x22: 0000000000000000 x23: 000000000007fe30 +x24: 00000000ff8d1c3c x25: 00000000ff8d5000 +x26: 00000000deadbeef x27: 00000000000004a0 +x28: 000000000000009c x29: 000000000007fd90 + +Fix it by using the entry point from the elf header. + +Signed-off-by: Mian Yousaf Kaukab +--- + arch/arm/mach-rockchip/make_fit_atf.py | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py +index 6b3d9201c9..b88a5e1f16 100755 +--- a/arch/arm/mach-rockchip/make_fit_atf.py ++++ b/arch/arm/mach-rockchip/make_fit_atf.py +@@ -53,7 +53,7 @@ DT_END=""" + }; + """ + +-def append_atf_node(file, atf_index, phy_addr): ++def append_atf_node(file, atf_index, phy_addr, elf_entry): + """ + Append ATF DT node to input FIT dts file. + """ +@@ -67,7 +67,7 @@ def append_atf_node(file, atf_index, phy_addr): + print >> file, '\t\t\tcompression = "none";' + print >> file, '\t\t\tload = <0x%08x>;' % phy_addr + if atf_index == 1: +- print >> file, '\t\t\tentry = <0x%08x>;' % phy_addr ++ print >> file, '\t\t\tentry = <0x%08x>;' % elf_entry + print >> file, '\t\t};' + print >> file, '' + +@@ -141,12 +141,13 @@ def generate_atf_fit_dts(fit_file_name, bl31_file_name, uboot_file_name, dtbs_fi + + with open(bl31_file_name) as bl31_file: + bl31 = ELFFile(bl31_file) ++ elf_entry = bl31.header['e_entry'] + for i in range(bl31.num_segments()): + seg = bl31.get_segment(i) + if ('PT_LOAD' == seg.__getitem__(ELF_SEG_P_TYPE)): + paddr = seg.__getitem__(ELF_SEG_P_PADDR) + p= seg.__getitem__(ELF_SEG_P_PADDR) +- append_atf_node(fit_file, i+1, paddr) ++ append_atf_node(fit_file, i+1, paddr, elf_entry) + atf_cnt = i+1 + append_fdt_node(fit_file, dtbs_file_name) + print >> fit_file, '%s' % DT_IMAGES_NODE_END diff --git a/0012-rockchip-make_fit_atf-make-python3-.patch b/0012-rockchip-make_fit_atf-make-python3-.patch new file mode 100644 index 0000000..a1d40af --- /dev/null +++ b/0012-rockchip-make_fit_atf-make-python3-.patch @@ -0,0 +1,196 @@ +From c37bc4d88af6802cffd9c726f8521caf15842213 Mon Sep 17 00:00:00 2001 +From: Mian Yousaf Kaukab +Date: Mon, 21 May 2018 16:38:57 +0200 +Subject: [PATCH] rockchip: make_fit_atf: make python3 compatible + +Make script python3 compatible. No functional changes intended. + +Signed-off-by: Mian Yousaf Kaukab +--- + arch/arm/mach-rockchip/make_fit_atf.py | 89 +++++++++++++------------- + 1 file changed, 45 insertions(+), 44 deletions(-) + +diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py +index b88a5e1f16..d72a364ff1 100755 +--- a/arch/arm/mach-rockchip/make_fit_atf.py ++++ b/arch/arm/mach-rockchip/make_fit_atf.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2 ++#!/usr/bin/env python + """ + A script to generate FIT image source for rockchip boards + with ARM Trusted Firmware +@@ -43,6 +43,7 @@ DT_HEADER="""// SPDX-License-Identifier: GPL-2.0+ OR X11 + compression = "none"; + load = <0x%08x>; + }; ++ + """ + + DT_IMAGES_NODE_END=""" +@@ -58,18 +59,18 @@ def append_atf_node(file, atf_index, phy_addr, elf_entry): + Append ATF DT node to input FIT dts file. + """ + data = 'bl31_0x%08x.bin' % phy_addr +- print >> file, '\t\tatf@%d {' % atf_index +- print >> file, '\t\t\tdescription = \"ARM Trusted Firmware\";' +- print >> file, '\t\t\tdata = /incbin/("%s");' % data +- print >> file, '\t\t\ttype = "firmware";' +- print >> file, '\t\t\tarch = "arm64";' +- print >> file, '\t\t\tos = "arm-trusted-firmware";' +- print >> file, '\t\t\tcompression = "none";' +- print >> file, '\t\t\tload = <0x%08x>;' % phy_addr ++ file.write('\t\tatf@%d {\n' % atf_index) ++ file.write('\t\t\tdescription = \"ARM Trusted Firmware\";\n') ++ file.write('\t\t\tdata = /incbin/("%s");\n' % data) ++ file.write('\t\t\ttype = "firmware";\n') ++ file.write('\t\t\tarch = "arm64";\n') ++ file.write('\t\t\tos = "arm-trusted-firmware";\n') ++ file.write('\t\t\tcompression = "none";\n') ++ file.write('\t\t\tload = <0x%08x>;\n' % phy_addr) + if atf_index == 1: +- print >> file, '\t\t\tentry = <0x%08x>;' % elf_entry +- print >> file, '\t\t};' +- print >> file, '' ++ file.write('\t\t\tentry = <0x%08x>;\n' % elf_entry) ++ file.write('\t\t};\n') ++ file.write('\n') + + def append_fdt_node(file, dtbs): + """ +@@ -78,43 +79,43 @@ def append_fdt_node(file, dtbs): + cnt = 1 + for dtb in dtbs: + dtname = os.path.basename(dtb) +- print >> file, '\t\tfdt@%d {' % cnt +- print >> file, '\t\t\tdescription = "%s";' % dtname +- print >> file, '\t\t\tdata = /incbin/("%s");' % dtb +- print >> file, '\t\t\ttype = "flat_dt";' +- print >> file, '\t\t\tcompression = "none";' +- print >> file, '\t\t};' +- print >> file, '' ++ file.write('\t\tfdt@%d {\n' % cnt) ++ file.write('\t\t\tdescription = "%s";\n' % dtname) ++ file.write('\t\t\tdata = /incbin/("%s");\n' % dtb) ++ file.write('\t\t\ttype = "flat_dt";\n') ++ file.write('\t\t\tcompression = "none";\n') ++ file.write('\t\t};\n') ++ file.write('\n') + cnt = cnt + 1 + + def append_conf_section(file, cnt, dtname, atf_cnt): +- print >> file, '\t\tconfig@%d {' % cnt +- print >> file, '\t\t\tdescription = "%s";' % dtname +- print >> file, '\t\t\tfirmware = "atf@1";' +- print >> file, '\t\t\tloadables = "uboot@1",', ++ file.write('\t\tconfig@%d {\n' % cnt) ++ file.write('\t\t\tdescription = "%s";\n' % dtname) ++ file.write('\t\t\tfirmware = "atf@1";\n') ++ file.write('\t\t\tloadables = "uboot@1",') + for i in range(1, atf_cnt): +- print >> file, '"atf@%d"' % (i+1), ++ file.write('"atf@%d"' % (i+1)) + if i != (atf_cnt - 1): +- print >> file, ',', ++ file.write(',') + else: +- print >> file, ';' +- print >> file, '\t\t\tfdt = "fdt@1";' +- print >> file, '\t\t};' +- print >> file, '' ++ file.write(';\n') ++ file.write('\t\t\tfdt = "fdt@1";\n') ++ file.write('\t\t};\n') ++ file.write('\n') + + def append_conf_node(file, dtbs, atf_cnt): + """ + Append configeration nodes. + """ + cnt = 1 +- print >> file, '\tconfigurations {' +- print >> file, '\t\tdefault = "config@1";' ++ file.write('\tconfigurations {\n') ++ file.write('\t\tdefault = "config@1";\n') + for dtb in dtbs: + dtname = os.path.basename(dtb) + append_conf_section(file, cnt, dtname, atf_cnt) + cnt = cnt + 1 +- print >> file, '\t};' +- print >> file, '' ++ file.write('\t};\n') ++ file.write('\n') + + def generate_atf_fit_dts(fit_file_name, bl31_file_name, uboot_file_name, dtbs_file_name): + """ +@@ -127,7 +128,7 @@ def generate_atf_fit_dts(fit_file_name, bl31_file_name, uboot_file_name, dtbs_fi + + num_load_seg = 0 + p_paddr = 0xFFFFFFFF +- with open(uboot_file_name) as uboot_file: ++ with open(uboot_file_name, 'rb') as uboot_file: + uboot = ELFFile(uboot_file) + for i in range(uboot.num_segments()): + seg = uboot.get_segment(i) +@@ -137,9 +138,9 @@ def generate_atf_fit_dts(fit_file_name, bl31_file_name, uboot_file_name, dtbs_fi + + assert (p_paddr != 0xFFFFFFFF and num_load_seg == 1) + +- print >> fit_file, DT_HEADER % p_paddr ++ fit_file.write(DT_HEADER % p_paddr) + +- with open(bl31_file_name) as bl31_file: ++ with open(bl31_file_name, 'rb') as bl31_file: + bl31 = ELFFile(bl31_file) + elf_entry = bl31.header['e_entry'] + for i in range(bl31.num_segments()): +@@ -150,15 +151,15 @@ def generate_atf_fit_dts(fit_file_name, bl31_file_name, uboot_file_name, dtbs_fi + append_atf_node(fit_file, i+1, paddr, elf_entry) + atf_cnt = i+1 + append_fdt_node(fit_file, dtbs_file_name) +- print >> fit_file, '%s' % DT_IMAGES_NODE_END ++ fit_file.write('%s\n' % DT_IMAGES_NODE_END) + append_conf_node(fit_file, dtbs_file_name, atf_cnt) +- print >> fit_file, '%s' % DT_END ++ fit_file.write('%s\n' % DT_END) + + if fit_file_name != sys.stdout: + fit_file.close() + + def generate_atf_binary(bl31_file_name): +- with open(bl31_file_name) as bl31_file: ++ with open(bl31_file_name, 'rb') as bl31_file: + bl31 = ELFFile(bl31_file) + + num = bl31.num_segments() +@@ -179,17 +180,17 @@ def get_bl31_segments_info(bl31_file_name): + bl31 = ELFFile(bl31_file) + + num = bl31.num_segments() +- print 'Number of Segments : %d' % bl31.num_segments() ++ print('Number of Segments : %d' % bl31.num_segments()) + for i in range(num): +- print 'Segment %d' % i ++ print('Segment %d' % i) + seg = bl31.get_segment(i) + ptype = seg[ELF_SEG_P_TYPE] + poffset = seg[ELF_SEG_P_OFFSET] + pmemsz = seg[ELF_SEG_P_MEMSZ] + pfilesz = seg[ELF_SEG_P_FILESZ] +- print 'type: %s\nfilesz: %08x\nmemsz: %08x\noffset: %08x' % (ptype, pfilesz, pmemsz, poffset) ++ print('type: %s\nfilesz: %08x\nmemsz: %08x\noffset: %08x' % (ptype, pfilesz, pmemsz, poffset)) + paddr = seg[ELF_SEG_P_PADDR] +- print 'paddr: %08x' % paddr ++ print('paddr: %08x' % paddr) + + def main(): + uboot_elf="./u-boot" +@@ -205,7 +206,7 @@ def main(): + elif opt == "-b": + bl31_elf=val + elif opt == "-h": +- print __doc__ ++ print(__doc__) + sys.exit(2) + + dtbs = args diff --git a/0013-rockchip-make_fit_atf.py-depends-on.patch b/0013-rockchip-make_fit_atf.py-depends-on.patch new file mode 100644 index 0000000..4f0b7bf --- /dev/null +++ b/0013-rockchip-make_fit_atf.py-depends-on.patch @@ -0,0 +1,35 @@ +From 5702e7e5cbc322a56f0b82daa86a57fc7477c53a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20F=C3=A4rber?= +Date: Sun, 3 Jun 2018 05:47:38 +0200 +Subject: [PATCH] rockchip: make_fit_atf.py depends on u-boot +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +u-boot.itb depends on u-boot-nodtb.bin, which in turn depends on u-boot. +u-boot.its from Rockchip make_fit_atf.py (used by {evb,firefly}-rk3399) +wants to read u-boot but is lacking this dependency, so that u-boot.itb +cannot be built in one go. Detect its use and add the missing dependency. + +Reported-by: Yousaf Kaukab +Signed-off-by: Andreas Färber +--- + Makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index f31ee60e4c..3723346c4f 100644 +--- a/Makefile ++++ b/Makefile +@@ -1051,7 +1051,10 @@ U_BOOT_ITS = $(subst ",,$(CONFIG_SPL_FIT_SOURCE)) + else + ifneq ($(CONFIG_SPL_FIT_GENERATOR),"") + U_BOOT_ITS := u-boot.its +-$(U_BOOT_ITS): FORCE ++ifeq ($(CONFIG_SPL_FIT_GENERATOR),"arch/arm/mach-rockchip/make_fit_atf.py") ++U_BOOT_ITS_DEPS += u-boot ++endif ++$(U_BOOT_ITS): $(U_BOOT_ITS_DEPS) FORCE + $(srctree)/$(CONFIG_SPL_FIT_GENERATOR) \ + $(patsubst %,arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) > $@ + endif diff --git a/pre_checkin.sh b/pre_checkin.sh index 171de02..d122e77 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -25,7 +25,7 @@ armv7_boards="$armv7_boards A10-OLinuXino-Lime A13-OLinuXino A13-OLinuXinoM" armv7_boards="$armv7_boards A20-OLinuXino-Lime A20-OLinuXino-Lime2 A20-OLinuXino_MICRO" armv7_boards="$armv7_boards nanopi_neo nanopi_neo_air orangepi_pc Hyundai_A7HD Lamobo_R1 Sinovoip_BPI_M2_Plus" # Broadcom -armv7_boards="$armv7_boards rpi_2 rpi_3_32b" +armv7_boards="$armv7_boards rpi_2" # Nvidia armv7_boards="$armv7_boards colibri_t20 paz00 jetson-tk1" # Rockchip @@ -161,6 +161,12 @@ tinker-rk3288) ROCKCHIP_SPL_IMAGE_TYPES="rksd" ROCKCHIP_SPL_SOC=rk3288 ;; +evb-rk3399|firefly-rk3399) + BINEND=bin + ROCKCHIP_SPL=1 + ROCKCHIP_SPL_IMAGE_TYPES="rksd" + ROCKCHIP_SPL_SOC=rk3399 + ;; clearfog|turris_omnia) BINEND=img MVEBU_SPL=1 diff --git a/u-boot-a10-olinuxino-lime.changes b/u-boot-a10-olinuxino-lime.changes index ddde400..b1e7f59 100644 --- a/u-boot-a10-olinuxino-lime.changes +++ b/u-boot-a10-olinuxino-lime.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-a10-olinuxino-lime.spec b/u-boot-a10-olinuxino-lime.spec index ed2f697..14bfc50 100644 --- a/u-boot-a10-olinuxino-lime.spec +++ b/u-boot-a10-olinuxino-lime.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "a10-olinuxino-lime" == "rpi" || "a10-olinuxino-lime" == "rpi2" || "a10-olinuxino-lime" == "rpi332b" || "a10-olinuxino-lime" == "rpi3" +%if "a10-olinuxino-lime" == "rpi" || "a10-olinuxino-lime" == "rpi2" || "a10-olinuxino-lime" == "rpi3" %define is_rpi 1 %endif +%if "a10-olinuxino-lime" == "evb-rk3399" || "a10-olinuxino-lime" == "firefly-rk3399" || "a10-olinuxino-lime" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" A10-OLinuXino-Lime_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-a13-olinuxino.changes b/u-boot-a13-olinuxino.changes index ddde400..b1e7f59 100644 --- a/u-boot-a13-olinuxino.changes +++ b/u-boot-a13-olinuxino.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-a13-olinuxino.spec b/u-boot-a13-olinuxino.spec index cdfc031..770e41c 100644 --- a/u-boot-a13-olinuxino.spec +++ b/u-boot-a13-olinuxino.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "a13-olinuxino" == "rpi" || "a13-olinuxino" == "rpi2" || "a13-olinuxino" == "rpi332b" || "a13-olinuxino" == "rpi3" +%if "a13-olinuxino" == "rpi" || "a13-olinuxino" == "rpi2" || "a13-olinuxino" == "rpi3" %define is_rpi 1 %endif +%if "a13-olinuxino" == "evb-rk3399" || "a13-olinuxino" == "firefly-rk3399" || "a13-olinuxino" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" A13-OLinuXino_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-a13-olinuxinom.changes b/u-boot-a13-olinuxinom.changes index ddde400..b1e7f59 100644 --- a/u-boot-a13-olinuxinom.changes +++ b/u-boot-a13-olinuxinom.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-a13-olinuxinom.spec b/u-boot-a13-olinuxinom.spec index 7ef0954..12dc523 100644 --- a/u-boot-a13-olinuxinom.spec +++ b/u-boot-a13-olinuxinom.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "a13-olinuxinom" == "rpi" || "a13-olinuxinom" == "rpi2" || "a13-olinuxinom" == "rpi332b" || "a13-olinuxinom" == "rpi3" +%if "a13-olinuxinom" == "rpi" || "a13-olinuxinom" == "rpi2" || "a13-olinuxinom" == "rpi3" %define is_rpi 1 %endif +%if "a13-olinuxinom" == "evb-rk3399" || "a13-olinuxinom" == "firefly-rk3399" || "a13-olinuxinom" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" A13-OLinuXinoM_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-a20-olinuxino-lime.changes b/u-boot-a20-olinuxino-lime.changes index ddde400..b1e7f59 100644 --- a/u-boot-a20-olinuxino-lime.changes +++ b/u-boot-a20-olinuxino-lime.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-a20-olinuxino-lime.spec b/u-boot-a20-olinuxino-lime.spec index 465c09e..93b1445 100644 --- a/u-boot-a20-olinuxino-lime.spec +++ b/u-boot-a20-olinuxino-lime.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "a20-olinuxino-lime" == "rpi" || "a20-olinuxino-lime" == "rpi2" || "a20-olinuxino-lime" == "rpi332b" || "a20-olinuxino-lime" == "rpi3" +%if "a20-olinuxino-lime" == "rpi" || "a20-olinuxino-lime" == "rpi2" || "a20-olinuxino-lime" == "rpi3" %define is_rpi 1 %endif +%if "a20-olinuxino-lime" == "evb-rk3399" || "a20-olinuxino-lime" == "firefly-rk3399" || "a20-olinuxino-lime" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" A20-OLinuXino-Lime_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-a20-olinuxino-lime2.changes b/u-boot-a20-olinuxino-lime2.changes index ddde400..b1e7f59 100644 --- a/u-boot-a20-olinuxino-lime2.changes +++ b/u-boot-a20-olinuxino-lime2.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-a20-olinuxino-lime2.spec b/u-boot-a20-olinuxino-lime2.spec index f2e5d25..6ae2cbd 100644 --- a/u-boot-a20-olinuxino-lime2.spec +++ b/u-boot-a20-olinuxino-lime2.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "a20-olinuxino-lime2" == "rpi" || "a20-olinuxino-lime2" == "rpi2" || "a20-olinuxino-lime2" == "rpi332b" || "a20-olinuxino-lime2" == "rpi3" +%if "a20-olinuxino-lime2" == "rpi" || "a20-olinuxino-lime2" == "rpi2" || "a20-olinuxino-lime2" == "rpi3" %define is_rpi 1 %endif +%if "a20-olinuxino-lime2" == "evb-rk3399" || "a20-olinuxino-lime2" == "firefly-rk3399" || "a20-olinuxino-lime2" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" A20-OLinuXino-Lime2_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-a20-olinuxinomicro.changes b/u-boot-a20-olinuxinomicro.changes index ddde400..b1e7f59 100644 --- a/u-boot-a20-olinuxinomicro.changes +++ b/u-boot-a20-olinuxinomicro.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-a20-olinuxinomicro.spec b/u-boot-a20-olinuxinomicro.spec index 9ab480f..586a927 100644 --- a/u-boot-a20-olinuxinomicro.spec +++ b/u-boot-a20-olinuxinomicro.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "a20-olinuxinomicro" == "rpi" || "a20-olinuxinomicro" == "rpi2" || "a20-olinuxinomicro" == "rpi332b" || "a20-olinuxinomicro" == "rpi3" +%if "a20-olinuxinomicro" == "rpi" || "a20-olinuxinomicro" == "rpi2" || "a20-olinuxinomicro" == "rpi3" %define is_rpi 1 %endif +%if "a20-olinuxinomicro" == "evb-rk3399" || "a20-olinuxinomicro" == "firefly-rk3399" || "a20-olinuxinomicro" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" A20-OLinuXino_MICRO_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-am335xboneblack.changes b/u-boot-am335xboneblack.changes index ddde400..b1e7f59 100644 --- a/u-boot-am335xboneblack.changes +++ b/u-boot-am335xboneblack.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-am335xboneblack.spec b/u-boot-am335xboneblack.spec index a56f705..21e95d4 100644 --- a/u-boot-am335xboneblack.spec +++ b/u-boot-am335xboneblack.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "am335xboneblack" == "rpi" || "am335xboneblack" == "rpi2" || "am335xboneblack" == "rpi332b" || "am335xboneblack" == "rpi3" +%if "am335xboneblack" == "rpi" || "am335xboneblack" == "rpi2" || "am335xboneblack" == "rpi3" %define is_rpi 1 %endif +%if "am335xboneblack" == "evb-rk3399" || "am335xboneblack" == "firefly-rk3399" || "am335xboneblack" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" am335x_boneblack_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-am335xevm.changes b/u-boot-am335xevm.changes index ddde400..b1e7f59 100644 --- a/u-boot-am335xevm.changes +++ b/u-boot-am335xevm.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-am335xevm.spec b/u-boot-am335xevm.spec index b90e9ff..128b526 100644 --- a/u-boot-am335xevm.spec +++ b/u-boot-am335xevm.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "am335xevm" == "rpi" || "am335xevm" == "rpi2" || "am335xevm" == "rpi332b" || "am335xevm" == "rpi3" +%if "am335xevm" == "rpi" || "am335xevm" == "rpi2" || "am335xevm" == "rpi3" %define is_rpi 1 %endif +%if "am335xevm" == "evb-rk3399" || "am335xevm" == "firefly-rk3399" || "am335xevm" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" am335x_evm_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-am57xxevm.changes b/u-boot-am57xxevm.changes index ddde400..b1e7f59 100644 --- a/u-boot-am57xxevm.changes +++ b/u-boot-am57xxevm.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-am57xxevm.spec b/u-boot-am57xxevm.spec index f86b2e3..3edfadc 100644 --- a/u-boot-am57xxevm.spec +++ b/u-boot-am57xxevm.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "am57xxevm" == "rpi" || "am57xxevm" == "rpi2" || "am57xxevm" == "rpi332b" || "am57xxevm" == "rpi3" +%if "am57xxevm" == "rpi" || "am57xxevm" == "rpi2" || "am57xxevm" == "rpi3" %define is_rpi 1 %endif +%if "am57xxevm" == "evb-rk3399" || "am57xxevm" == "firefly-rk3399" || "am57xxevm" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" am57xx_evm_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-arndale.changes b/u-boot-arndale.changes index ddde400..b1e7f59 100644 --- a/u-boot-arndale.changes +++ b/u-boot-arndale.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-arndale.spec b/u-boot-arndale.spec index 17e2513..11ea327 100644 --- a/u-boot-arndale.spec +++ b/u-boot-arndale.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "arndale" == "rpi" || "arndale" == "rpi2" || "arndale" == "rpi332b" || "arndale" == "rpi3" +%if "arndale" == "rpi" || "arndale" == "rpi2" || "arndale" == "rpi3" %define is_rpi 1 %endif +%if "arndale" == "evb-rk3399" || "arndale" == "firefly-rk3399" || "arndale" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" arndale_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-bananapi.changes b/u-boot-bananapi.changes index ddde400..b1e7f59 100644 --- a/u-boot-bananapi.changes +++ b/u-boot-bananapi.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-bananapi.spec b/u-boot-bananapi.spec index a9d822d..c1f992c 100644 --- a/u-boot-bananapi.spec +++ b/u-boot-bananapi.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "bananapi" == "rpi" || "bananapi" == "rpi2" || "bananapi" == "rpi332b" || "bananapi" == "rpi3" +%if "bananapi" == "rpi" || "bananapi" == "rpi2" || "bananapi" == "rpi3" %define is_rpi 1 %endif +%if "bananapi" == "evb-rk3399" || "bananapi" == "firefly-rk3399" || "bananapi" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Bananapi_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-board.spec.in b/u-boot-board.spec.in index 17480c5..626a918 100644 --- a/u-boot-board.spec.in +++ b/u-boot-board.spec.in @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl MVEBU_SPL @@ -29,9 +30,12 @@ %define imx6_spl IMX6_SPL %define socfpga_spl SOCFPGA_SPL -%if "BOARDNAME" == "rpi" || "BOARDNAME" == "rpi2" || "BOARDNAME" == "rpi332b" || "BOARDNAME" == "rpi3" +%if "BOARDNAME" == "rpi" || "BOARDNAME" == "rpi2" || "BOARDNAME" == "rpi3" %define is_rpi 1 %endif +%if "BOARDNAME" == "evb-rk3399" || "BOARDNAME" == "firefly-rk3399" || "BOARDNAME" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only ARCHIVE_VERSION @@ -53,24 +57,35 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -104,10 +119,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" BOARDCONFIG echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -151,6 +177,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.BINEND %{buildroot}%{uboot_dir}/u-boot.BINEND +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.BINEND %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -185,6 +214,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -195,14 +227,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.BINEND /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.BINEND /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-clearfog.changes b/u-boot-clearfog.changes index ddde400..b1e7f59 100644 --- a/u-boot-clearfog.changes +++ b/u-boot-clearfog.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-clearfog.spec b/u-boot-clearfog.spec index 2f3cfdc..ffb34ae 100644 --- a/u-boot-clearfog.spec +++ b/u-boot-clearfog.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 1 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "clearfog" == "rpi" || "clearfog" == "rpi2" || "clearfog" == "rpi332b" || "clearfog" == "rpi3" +%if "clearfog" == "rpi" || "clearfog" == "rpi2" || "clearfog" == "rpi3" %define is_rpi 1 %endif +%if "clearfog" == "evb-rk3399" || "clearfog" == "firefly-rk3399" || "clearfog" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" clearfog_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-colibrit20.changes b/u-boot-colibrit20.changes index ddde400..b1e7f59 100644 --- a/u-boot-colibrit20.changes +++ b/u-boot-colibrit20.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-colibrit20.spec b/u-boot-colibrit20.spec index 09407fb..6f52ddc 100644 --- a/u-boot-colibrit20.spec +++ b/u-boot-colibrit20.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "colibrit20" == "rpi" || "colibrit20" == "rpi2" || "colibrit20" == "rpi332b" || "colibrit20" == "rpi3" +%if "colibrit20" == "rpi" || "colibrit20" == "rpi2" || "colibrit20" == "rpi3" %define is_rpi 1 %endif +%if "colibrit20" == "evb-rk3399" || "colibrit20" == "firefly-rk3399" || "colibrit20" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" colibri_t20_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-cubieboard.changes b/u-boot-cubieboard.changes index ddde400..b1e7f59 100644 --- a/u-boot-cubieboard.changes +++ b/u-boot-cubieboard.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-cubieboard.spec b/u-boot-cubieboard.spec index 5b8984a..7aa2beb 100644 --- a/u-boot-cubieboard.spec +++ b/u-boot-cubieboard.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "cubieboard" == "rpi" || "cubieboard" == "rpi2" || "cubieboard" == "rpi332b" || "cubieboard" == "rpi3" +%if "cubieboard" == "rpi" || "cubieboard" == "rpi2" || "cubieboard" == "rpi3" %define is_rpi 1 %endif +%if "cubieboard" == "evb-rk3399" || "cubieboard" == "firefly-rk3399" || "cubieboard" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Cubieboard_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-cubieboard2.changes b/u-boot-cubieboard2.changes index ddde400..b1e7f59 100644 --- a/u-boot-cubieboard2.changes +++ b/u-boot-cubieboard2.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-cubieboard2.spec b/u-boot-cubieboard2.spec index 6985c19..7a029bb 100644 --- a/u-boot-cubieboard2.spec +++ b/u-boot-cubieboard2.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "cubieboard2" == "rpi" || "cubieboard2" == "rpi2" || "cubieboard2" == "rpi332b" || "cubieboard2" == "rpi3" +%if "cubieboard2" == "rpi" || "cubieboard2" == "rpi2" || "cubieboard2" == "rpi3" %define is_rpi 1 %endif +%if "cubieboard2" == "evb-rk3399" || "cubieboard2" == "firefly-rk3399" || "cubieboard2" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Cubieboard2_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-cubietruck.changes b/u-boot-cubietruck.changes index ddde400..b1e7f59 100644 --- a/u-boot-cubietruck.changes +++ b/u-boot-cubietruck.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-cubietruck.spec b/u-boot-cubietruck.spec index f508369..127a01a 100644 --- a/u-boot-cubietruck.spec +++ b/u-boot-cubietruck.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "cubietruck" == "rpi" || "cubietruck" == "rpi2" || "cubietruck" == "rpi332b" || "cubietruck" == "rpi3" +%if "cubietruck" == "rpi" || "cubietruck" == "rpi2" || "cubietruck" == "rpi3" %define is_rpi 1 %endif +%if "cubietruck" == "evb-rk3399" || "cubietruck" == "firefly-rk3399" || "cubietruck" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Cubietruck_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-dragonboard410c.changes b/u-boot-dragonboard410c.changes index ddde400..b1e7f59 100644 --- a/u-boot-dragonboard410c.changes +++ b/u-boot-dragonboard410c.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-dragonboard410c.spec b/u-boot-dragonboard410c.spec index b87daf6..3e558f7 100644 --- a/u-boot-dragonboard410c.spec +++ b/u-boot-dragonboard410c.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "dragonboard410c" == "rpi" || "dragonboard410c" == "rpi2" || "dragonboard410c" == "rpi332b" || "dragonboard410c" == "rpi3" +%if "dragonboard410c" == "rpi" || "dragonboard410c" == "rpi2" || "dragonboard410c" == "rpi3" %define is_rpi 1 %endif +%if "dragonboard410c" == "evb-rk3399" || "dragonboard410c" == "firefly-rk3399" || "dragonboard410c" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" dragonboard410c_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-dragonboard820c.changes b/u-boot-dragonboard820c.changes index ddde400..b1e7f59 100644 --- a/u-boot-dragonboard820c.changes +++ b/u-boot-dragonboard820c.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-dragonboard820c.spec b/u-boot-dragonboard820c.spec index 549125e..93148c1 100644 --- a/u-boot-dragonboard820c.spec +++ b/u-boot-dragonboard820c.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "dragonboard820c" == "rpi" || "dragonboard820c" == "rpi2" || "dragonboard820c" == "rpi332b" || "dragonboard820c" == "rpi3" +%if "dragonboard820c" == "rpi" || "dragonboard820c" == "rpi2" || "dragonboard820c" == "rpi3" %define is_rpi 1 %endif +%if "dragonboard820c" == "evb-rk3399" || "dragonboard820c" == "firefly-rk3399" || "dragonboard820c" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" dragonboard820c_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-evb-rk3399.changes b/u-boot-evb-rk3399.changes index ddde400..b1e7f59 100644 --- a/u-boot-evb-rk3399.changes +++ b/u-boot-evb-rk3399.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-evb-rk3399.spec b/u-boot-evb-rk3399.spec index daee90b..8db2830 100644 --- a/u-boot-evb-rk3399.spec +++ b/u-boot-evb-rk3399.spec @@ -18,20 +18,24 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 %define x_loader 0 -%define rockchip_spl 0 +%define rockchip_spl 1 %define sunxi_spl 0 %define arndale_spl 0 %define origen_spl 0 %define imx6_spl 0 %define socfpga_spl 0 -%if "evb-rk3399" == "rpi" || "evb-rk3399" == "rpi2" || "evb-rk3399" == "rpi332b" || "evb-rk3399" == "rpi3" +%if "evb-rk3399" == "rpi" || "evb-rk3399" == "rpi2" || "evb-rk3399" == "rpi3" %define is_rpi 1 %endif +%if "evb-rk3399" == "evb-rk3399" || "evb-rk3399" == "firefly-rk3399" || "evb-rk3399" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" evb-rk3399_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -140,8 +172,8 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %if %rockchip_spl == 1 -for t in ; do - ./tools/mkimage -n -d spl/u-boot-spl.bin -T $t u-boot-spl.$t +for t in rksd; do + ./tools/mkimage -n rk3399 -d spl/u-boot-spl.bin -T $t u-boot-spl.$t done %endif @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -189,7 +224,7 @@ install -D -m 0644 u-boot-spl.kwb %{buildroot}%{uboot_dir}/u-boot-spl.kwb %endif %if %rockchip_spl == 1 install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin -for t in ; do +for t in rksd; do install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t done %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-firefly-rk3288.changes b/u-boot-firefly-rk3288.changes index ddde400..b1e7f59 100644 --- a/u-boot-firefly-rk3288.changes +++ b/u-boot-firefly-rk3288.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-firefly-rk3288.spec b/u-boot-firefly-rk3288.spec index 79f057b..b0679ba 100644 --- a/u-boot-firefly-rk3288.spec +++ b/u-boot-firefly-rk3288.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "firefly-rk3288" == "rpi" || "firefly-rk3288" == "rpi2" || "firefly-rk3288" == "rpi332b" || "firefly-rk3288" == "rpi3" +%if "firefly-rk3288" == "rpi" || "firefly-rk3288" == "rpi2" || "firefly-rk3288" == "rpi3" %define is_rpi 1 %endif +%if "firefly-rk3288" == "evb-rk3399" || "firefly-rk3288" == "firefly-rk3399" || "firefly-rk3288" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" firefly-rk3288_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-firefly-rk3399.changes b/u-boot-firefly-rk3399.changes index ddde400..b1e7f59 100644 --- a/u-boot-firefly-rk3399.changes +++ b/u-boot-firefly-rk3399.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-firefly-rk3399.spec b/u-boot-firefly-rk3399.spec index 57a54ad..a6816ac 100644 --- a/u-boot-firefly-rk3399.spec +++ b/u-boot-firefly-rk3399.spec @@ -18,20 +18,24 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 %define x_loader 0 -%define rockchip_spl 0 +%define rockchip_spl 1 %define sunxi_spl 0 %define arndale_spl 0 %define origen_spl 0 %define imx6_spl 0 %define socfpga_spl 0 -%if "firefly-rk3399" == "rpi" || "firefly-rk3399" == "rpi2" || "firefly-rk3399" == "rpi332b" || "firefly-rk3399" == "rpi3" +%if "firefly-rk3399" == "rpi" || "firefly-rk3399" == "rpi2" || "firefly-rk3399" == "rpi3" %define is_rpi 1 %endif +%if "firefly-rk3399" == "evb-rk3399" || "firefly-rk3399" == "firefly-rk3399" || "firefly-rk3399" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" firefly-rk3399_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -140,8 +172,8 @@ export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) %endif %if %rockchip_spl == 1 -for t in ; do - ./tools/mkimage -n -d spl/u-boot-spl.bin -T $t u-boot-spl.$t +for t in rksd; do + ./tools/mkimage -n rk3399 -d spl/u-boot-spl.bin -T $t u-boot-spl.$t done %endif @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -189,7 +224,7 @@ install -D -m 0644 u-boot-spl.kwb %{buildroot}%{uboot_dir}/u-boot-spl.kwb %endif %if %rockchip_spl == 1 install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin -for t in ; do +for t in rksd; do install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t done %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-geekbox.changes b/u-boot-geekbox.changes index ddde400..b1e7f59 100644 --- a/u-boot-geekbox.changes +++ b/u-boot-geekbox.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-geekbox.spec b/u-boot-geekbox.spec index b703866..7f3b6a4 100644 --- a/u-boot-geekbox.spec +++ b/u-boot-geekbox.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "geekbox" == "rpi" || "geekbox" == "rpi2" || "geekbox" == "rpi332b" || "geekbox" == "rpi3" +%if "geekbox" == "rpi" || "geekbox" == "rpi2" || "geekbox" == "rpi3" %define is_rpi 1 %endif +%if "geekbox" == "evb-rk3399" || "geekbox" == "firefly-rk3399" || "geekbox" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" geekbox_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-highbank.changes b/u-boot-highbank.changes index ddde400..b1e7f59 100644 --- a/u-boot-highbank.changes +++ b/u-boot-highbank.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-highbank.spec b/u-boot-highbank.spec index 8e51d96..a09de59 100644 --- a/u-boot-highbank.spec +++ b/u-boot-highbank.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "highbank" == "rpi" || "highbank" == "rpi2" || "highbank" == "rpi332b" || "highbank" == "rpi3" +%if "highbank" == "rpi" || "highbank" == "rpi2" || "highbank" == "rpi3" %define is_rpi 1 %endif +%if "highbank" == "evb-rk3399" || "highbank" == "firefly-rk3399" || "highbank" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" highbank_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-hikey.changes b/u-boot-hikey.changes index ddde400..b1e7f59 100644 --- a/u-boot-hikey.changes +++ b/u-boot-hikey.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-hikey.spec b/u-boot-hikey.spec index 82a4598..c3f5751 100644 --- a/u-boot-hikey.spec +++ b/u-boot-hikey.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "hikey" == "rpi" || "hikey" == "rpi2" || "hikey" == "rpi332b" || "hikey" == "rpi3" +%if "hikey" == "rpi" || "hikey" == "rpi2" || "hikey" == "rpi3" %define is_rpi 1 %endif +%if "hikey" == "evb-rk3399" || "hikey" == "firefly-rk3399" || "hikey" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" hikey_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-hyundaia7hd.changes b/u-boot-hyundaia7hd.changes index ddde400..b1e7f59 100644 --- a/u-boot-hyundaia7hd.changes +++ b/u-boot-hyundaia7hd.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-hyundaia7hd.spec b/u-boot-hyundaia7hd.spec index a9ef84f..a001d0b 100644 --- a/u-boot-hyundaia7hd.spec +++ b/u-boot-hyundaia7hd.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "hyundaia7hd" == "rpi" || "hyundaia7hd" == "rpi2" || "hyundaia7hd" == "rpi332b" || "hyundaia7hd" == "rpi3" +%if "hyundaia7hd" == "rpi" || "hyundaia7hd" == "rpi2" || "hyundaia7hd" == "rpi3" %define is_rpi 1 %endif +%if "hyundaia7hd" == "evb-rk3399" || "hyundaia7hd" == "firefly-rk3399" || "hyundaia7hd" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Hyundai_A7HD_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-jetson-tk1.changes b/u-boot-jetson-tk1.changes index ddde400..b1e7f59 100644 --- a/u-boot-jetson-tk1.changes +++ b/u-boot-jetson-tk1.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-jetson-tk1.spec b/u-boot-jetson-tk1.spec index 42ab79d..64905c4 100644 --- a/u-boot-jetson-tk1.spec +++ b/u-boot-jetson-tk1.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "jetson-tk1" == "rpi" || "jetson-tk1" == "rpi2" || "jetson-tk1" == "rpi332b" || "jetson-tk1" == "rpi3" +%if "jetson-tk1" == "rpi" || "jetson-tk1" == "rpi2" || "jetson-tk1" == "rpi3" %define is_rpi 1 %endif +%if "jetson-tk1" == "evb-rk3399" || "jetson-tk1" == "firefly-rk3399" || "jetson-tk1" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" jetson-tk1_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-lamobor1.changes b/u-boot-lamobor1.changes index ddde400..b1e7f59 100644 --- a/u-boot-lamobor1.changes +++ b/u-boot-lamobor1.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-lamobor1.spec b/u-boot-lamobor1.spec index d62ed1b..a2de619 100644 --- a/u-boot-lamobor1.spec +++ b/u-boot-lamobor1.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "lamobor1" == "rpi" || "lamobor1" == "rpi2" || "lamobor1" == "rpi332b" || "lamobor1" == "rpi3" +%if "lamobor1" == "rpi" || "lamobor1" == "rpi2" || "lamobor1" == "rpi3" %define is_rpi 1 %endif +%if "lamobor1" == "evb-rk3399" || "lamobor1" == "firefly-rk3399" || "lamobor1" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Lamobo_R1_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-ls1012afrdmqspi.changes b/u-boot-ls1012afrdmqspi.changes index ddde400..b1e7f59 100644 --- a/u-boot-ls1012afrdmqspi.changes +++ b/u-boot-ls1012afrdmqspi.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-ls1012afrdmqspi.spec b/u-boot-ls1012afrdmqspi.spec index 9336c7b..dbcc949 100644 --- a/u-boot-ls1012afrdmqspi.spec +++ b/u-boot-ls1012afrdmqspi.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "ls1012afrdmqspi" == "rpi" || "ls1012afrdmqspi" == "rpi2" || "ls1012afrdmqspi" == "rpi332b" || "ls1012afrdmqspi" == "rpi3" +%if "ls1012afrdmqspi" == "rpi" || "ls1012afrdmqspi" == "rpi2" || "ls1012afrdmqspi" == "rpi3" %define is_rpi 1 %endif +%if "ls1012afrdmqspi" == "evb-rk3399" || "ls1012afrdmqspi" == "firefly-rk3399" || "ls1012afrdmqspi" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" ls1012afrdm_qspi_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-melea1000.changes b/u-boot-melea1000.changes index ddde400..b1e7f59 100644 --- a/u-boot-melea1000.changes +++ b/u-boot-melea1000.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-melea1000.spec b/u-boot-melea1000.spec index e3f86eb..f14d134 100644 --- a/u-boot-melea1000.spec +++ b/u-boot-melea1000.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "melea1000" == "rpi" || "melea1000" == "rpi2" || "melea1000" == "rpi332b" || "melea1000" == "rpi3" +%if "melea1000" == "rpi" || "melea1000" == "rpi2" || "melea1000" == "rpi3" %define is_rpi 1 %endif +%if "melea1000" == "evb-rk3399" || "melea1000" == "firefly-rk3399" || "melea1000" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Mele_A1000_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-merriia80optimus.changes b/u-boot-merriia80optimus.changes index ddde400..b1e7f59 100644 --- a/u-boot-merriia80optimus.changes +++ b/u-boot-merriia80optimus.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-merriia80optimus.spec b/u-boot-merriia80optimus.spec index 6741ae8..8518568 100644 --- a/u-boot-merriia80optimus.spec +++ b/u-boot-merriia80optimus.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "merriia80optimus" == "rpi" || "merriia80optimus" == "rpi2" || "merriia80optimus" == "rpi332b" || "merriia80optimus" == "rpi3" +%if "merriia80optimus" == "rpi" || "merriia80optimus" == "rpi2" || "merriia80optimus" == "rpi3" %define is_rpi 1 %endif +%if "merriia80optimus" == "evb-rk3399" || "merriia80optimus" == "firefly-rk3399" || "merriia80optimus" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Merrii_A80_Optimus_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-mvebudb-88f3720.changes b/u-boot-mvebudb-88f3720.changes index ddde400..b1e7f59 100644 --- a/u-boot-mvebudb-88f3720.changes +++ b/u-boot-mvebudb-88f3720.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-mvebudb-88f3720.spec b/u-boot-mvebudb-88f3720.spec index d301c53..4a105f4 100644 --- a/u-boot-mvebudb-88f3720.spec +++ b/u-boot-mvebudb-88f3720.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "mvebudb-88f3720" == "rpi" || "mvebudb-88f3720" == "rpi2" || "mvebudb-88f3720" == "rpi332b" || "mvebudb-88f3720" == "rpi3" +%if "mvebudb-88f3720" == "rpi" || "mvebudb-88f3720" == "rpi2" || "mvebudb-88f3720" == "rpi3" %define is_rpi 1 %endif +%if "mvebudb-88f3720" == "evb-rk3399" || "mvebudb-88f3720" == "firefly-rk3399" || "mvebudb-88f3720" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" mvebu_db-88f3720_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-mvebudbarmada8k.changes b/u-boot-mvebudbarmada8k.changes index ddde400..b1e7f59 100644 --- a/u-boot-mvebudbarmada8k.changes +++ b/u-boot-mvebudbarmada8k.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-mvebudbarmada8k.spec b/u-boot-mvebudbarmada8k.spec index 4af2154..bb89d06 100644 --- a/u-boot-mvebudbarmada8k.spec +++ b/u-boot-mvebudbarmada8k.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "mvebudbarmada8k" == "rpi" || "mvebudbarmada8k" == "rpi2" || "mvebudbarmada8k" == "rpi332b" || "mvebudbarmada8k" == "rpi3" +%if "mvebudbarmada8k" == "rpi" || "mvebudbarmada8k" == "rpi2" || "mvebudbarmada8k" == "rpi3" %define is_rpi 1 %endif +%if "mvebudbarmada8k" == "evb-rk3399" || "mvebudbarmada8k" == "firefly-rk3399" || "mvebudbarmada8k" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" mvebu_db_armada8k_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-mvebuespressobin-88f3720.changes b/u-boot-mvebuespressobin-88f3720.changes index ddde400..b1e7f59 100644 --- a/u-boot-mvebuespressobin-88f3720.changes +++ b/u-boot-mvebuespressobin-88f3720.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-mvebuespressobin-88f3720.spec b/u-boot-mvebuespressobin-88f3720.spec index d785b68..aa57700 100644 --- a/u-boot-mvebuespressobin-88f3720.spec +++ b/u-boot-mvebuespressobin-88f3720.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "mvebuespressobin-88f3720" == "rpi" || "mvebuespressobin-88f3720" == "rpi2" || "mvebuespressobin-88f3720" == "rpi332b" || "mvebuespressobin-88f3720" == "rpi3" +%if "mvebuespressobin-88f3720" == "rpi" || "mvebuespressobin-88f3720" == "rpi2" || "mvebuespressobin-88f3720" == "rpi3" %define is_rpi 1 %endif +%if "mvebuespressobin-88f3720" == "evb-rk3399" || "mvebuespressobin-88f3720" == "firefly-rk3399" || "mvebuespressobin-88f3720" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" mvebu_espressobin-88f3720_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-mvebumcbin-88f8040.changes b/u-boot-mvebumcbin-88f8040.changes index ddde400..b1e7f59 100644 --- a/u-boot-mvebumcbin-88f8040.changes +++ b/u-boot-mvebumcbin-88f8040.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-mvebumcbin-88f8040.spec b/u-boot-mvebumcbin-88f8040.spec index ed32d35..d20029d 100644 --- a/u-boot-mvebumcbin-88f8040.spec +++ b/u-boot-mvebumcbin-88f8040.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "mvebumcbin-88f8040" == "rpi" || "mvebumcbin-88f8040" == "rpi2" || "mvebumcbin-88f8040" == "rpi332b" || "mvebumcbin-88f8040" == "rpi3" +%if "mvebumcbin-88f8040" == "rpi" || "mvebumcbin-88f8040" == "rpi2" || "mvebumcbin-88f8040" == "rpi3" %define is_rpi 1 %endif +%if "mvebumcbin-88f8040" == "evb-rk3399" || "mvebumcbin-88f8040" == "firefly-rk3399" || "mvebumcbin-88f8040" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" mvebu_mcbin-88f8040_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-mx53loco.changes b/u-boot-mx53loco.changes index ddde400..b1e7f59 100644 --- a/u-boot-mx53loco.changes +++ b/u-boot-mx53loco.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-mx53loco.spec b/u-boot-mx53loco.spec index 504c945..ad3f133 100644 --- a/u-boot-mx53loco.spec +++ b/u-boot-mx53loco.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "mx53loco" == "rpi" || "mx53loco" == "rpi2" || "mx53loco" == "rpi332b" || "mx53loco" == "rpi3" +%if "mx53loco" == "rpi" || "mx53loco" == "rpi2" || "mx53loco" == "rpi3" %define is_rpi 1 %endif +%if "mx53loco" == "evb-rk3399" || "mx53loco" == "firefly-rk3399" || "mx53loco" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" mx53loco_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.imx %{buildroot}%{uboot_dir}/u-boot.imx +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.imx %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.imx /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.imx /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-mx6cuboxi.changes b/u-boot-mx6cuboxi.changes index ddde400..b1e7f59 100644 --- a/u-boot-mx6cuboxi.changes +++ b/u-boot-mx6cuboxi.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-mx6cuboxi.spec b/u-boot-mx6cuboxi.spec index 11f2f57..a912907 100644 --- a/u-boot-mx6cuboxi.spec +++ b/u-boot-mx6cuboxi.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 1 %define socfpga_spl 0 -%if "mx6cuboxi" == "rpi" || "mx6cuboxi" == "rpi2" || "mx6cuboxi" == "rpi332b" || "mx6cuboxi" == "rpi3" +%if "mx6cuboxi" == "rpi" || "mx6cuboxi" == "rpi2" || "mx6cuboxi" == "rpi3" %define is_rpi 1 %endif +%if "mx6cuboxi" == "evb-rk3399" || "mx6cuboxi" == "firefly-rk3399" || "mx6cuboxi" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" mx6cuboxi_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-mx6qsabrelite.changes b/u-boot-mx6qsabrelite.changes index ddde400..b1e7f59 100644 --- a/u-boot-mx6qsabrelite.changes +++ b/u-boot-mx6qsabrelite.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-mx6qsabrelite.spec b/u-boot-mx6qsabrelite.spec index 1ecc548..9980a37 100644 --- a/u-boot-mx6qsabrelite.spec +++ b/u-boot-mx6qsabrelite.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "mx6qsabrelite" == "rpi" || "mx6qsabrelite" == "rpi2" || "mx6qsabrelite" == "rpi332b" || "mx6qsabrelite" == "rpi3" +%if "mx6qsabrelite" == "rpi" || "mx6qsabrelite" == "rpi2" || "mx6qsabrelite" == "rpi3" %define is_rpi 1 %endif +%if "mx6qsabrelite" == "evb-rk3399" || "mx6qsabrelite" == "firefly-rk3399" || "mx6qsabrelite" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" mx6qsabrelite_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.imx %{buildroot}%{uboot_dir}/u-boot.imx +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.imx %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.imx /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.imx /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-nanopia64.changes b/u-boot-nanopia64.changes index ddde400..b1e7f59 100644 --- a/u-boot-nanopia64.changes +++ b/u-boot-nanopia64.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-nanopia64.spec b/u-boot-nanopia64.spec index b222a10..88630a4 100644 --- a/u-boot-nanopia64.spec +++ b/u-boot-nanopia64.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "nanopia64" == "rpi" || "nanopia64" == "rpi2" || "nanopia64" == "rpi332b" || "nanopia64" == "rpi3" +%if "nanopia64" == "rpi" || "nanopia64" == "rpi2" || "nanopia64" == "rpi3" %define is_rpi 1 %endif +%if "nanopia64" == "evb-rk3399" || "nanopia64" == "firefly-rk3399" || "nanopia64" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" nanopi_a64_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.itb %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.itb /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.itb /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-nanopineo.changes b/u-boot-nanopineo.changes index ddde400..b1e7f59 100644 --- a/u-boot-nanopineo.changes +++ b/u-boot-nanopineo.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-nanopineo.spec b/u-boot-nanopineo.spec index b0f2191..731a817 100644 --- a/u-boot-nanopineo.spec +++ b/u-boot-nanopineo.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "nanopineo" == "rpi" || "nanopineo" == "rpi2" || "nanopineo" == "rpi332b" || "nanopineo" == "rpi3" +%if "nanopineo" == "rpi" || "nanopineo" == "rpi2" || "nanopineo" == "rpi3" %define is_rpi 1 %endif +%if "nanopineo" == "evb-rk3399" || "nanopineo" == "firefly-rk3399" || "nanopineo" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" nanopi_neo_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-nanopineoair.changes b/u-boot-nanopineoair.changes index ddde400..b1e7f59 100644 --- a/u-boot-nanopineoair.changes +++ b/u-boot-nanopineoair.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-nanopineoair.spec b/u-boot-nanopineoair.spec index ca9d74f..a58ea54 100644 --- a/u-boot-nanopineoair.spec +++ b/u-boot-nanopineoair.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "nanopineoair" == "rpi" || "nanopineoair" == "rpi2" || "nanopineoair" == "rpi332b" || "nanopineoair" == "rpi3" +%if "nanopineoair" == "rpi" || "nanopineoair" == "rpi2" || "nanopineoair" == "rpi3" %define is_rpi 1 %endif +%if "nanopineoair" == "evb-rk3399" || "nanopineoair" == "firefly-rk3399" || "nanopineoair" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" nanopi_neo_air_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-odroid-c2.changes b/u-boot-odroid-c2.changes index ddde400..b1e7f59 100644 --- a/u-boot-odroid-c2.changes +++ b/u-boot-odroid-c2.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-odroid-c2.spec b/u-boot-odroid-c2.spec index 33be067..33668a5 100644 --- a/u-boot-odroid-c2.spec +++ b/u-boot-odroid-c2.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "odroid-c2" == "rpi" || "odroid-c2" == "rpi2" || "odroid-c2" == "rpi332b" || "odroid-c2" == "rpi3" +%if "odroid-c2" == "rpi" || "odroid-c2" == "rpi2" || "odroid-c2" == "rpi3" %define is_rpi 1 %endif +%if "odroid-c2" == "evb-rk3399" || "odroid-c2" == "firefly-rk3399" || "odroid-c2" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" odroid-c2_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-odroid-xu3.changes b/u-boot-odroid-xu3.changes index ddde400..b1e7f59 100644 --- a/u-boot-odroid-xu3.changes +++ b/u-boot-odroid-xu3.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-odroid-xu3.spec b/u-boot-odroid-xu3.spec index 49bffcc..17da5f9 100644 --- a/u-boot-odroid-xu3.spec +++ b/u-boot-odroid-xu3.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "odroid-xu3" == "rpi" || "odroid-xu3" == "rpi2" || "odroid-xu3" == "rpi332b" || "odroid-xu3" == "rpi3" +%if "odroid-xu3" == "rpi" || "odroid-xu3" == "rpi2" || "odroid-xu3" == "rpi3" %define is_rpi 1 %endif +%if "odroid-xu3" == "evb-rk3399" || "odroid-xu3" == "firefly-rk3399" || "odroid-xu3" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" odroid-xu3_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-odroid.changes b/u-boot-odroid.changes index ddde400..b1e7f59 100644 --- a/u-boot-odroid.changes +++ b/u-boot-odroid.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-odroid.spec b/u-boot-odroid.spec index 9446d84..05b1bc3 100644 --- a/u-boot-odroid.spec +++ b/u-boot-odroid.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "odroid" == "rpi" || "odroid" == "rpi2" || "odroid" == "rpi332b" || "odroid" == "rpi3" +%if "odroid" == "rpi" || "odroid" == "rpi2" || "odroid" == "rpi3" %define is_rpi 1 %endif +%if "odroid" == "evb-rk3399" || "odroid" == "firefly-rk3399" || "odroid" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" odroid_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-omap3beagle.changes b/u-boot-omap3beagle.changes index ddde400..b1e7f59 100644 --- a/u-boot-omap3beagle.changes +++ b/u-boot-omap3beagle.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-omap3beagle.spec b/u-boot-omap3beagle.spec index 3aa5ae1..6e6bc4d 100644 --- a/u-boot-omap3beagle.spec +++ b/u-boot-omap3beagle.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "omap3beagle" == "rpi" || "omap3beagle" == "rpi2" || "omap3beagle" == "rpi332b" || "omap3beagle" == "rpi3" +%if "omap3beagle" == "rpi" || "omap3beagle" == "rpi2" || "omap3beagle" == "rpi3" %define is_rpi 1 %endif +%if "omap3beagle" == "evb-rk3399" || "omap3beagle" == "firefly-rk3399" || "omap3beagle" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" omap3_beagle_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-omap4panda.changes b/u-boot-omap4panda.changes index ddde400..b1e7f59 100644 --- a/u-boot-omap4panda.changes +++ b/u-boot-omap4panda.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-omap4panda.spec b/u-boot-omap4panda.spec index 3fb141b..1030aef 100644 --- a/u-boot-omap4panda.spec +++ b/u-boot-omap4panda.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "omap4panda" == "rpi" || "omap4panda" == "rpi2" || "omap4panda" == "rpi332b" || "omap4panda" == "rpi3" +%if "omap4panda" == "rpi" || "omap4panda" == "rpi2" || "omap4panda" == "rpi3" %define is_rpi 1 %endif +%if "omap4panda" == "evb-rk3399" || "omap4panda" == "firefly-rk3399" || "omap4panda" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" omap4_panda_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-orangepipc.changes b/u-boot-orangepipc.changes index ddde400..b1e7f59 100644 --- a/u-boot-orangepipc.changes +++ b/u-boot-orangepipc.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-orangepipc.spec b/u-boot-orangepipc.spec index 1d717ed..17881dd 100644 --- a/u-boot-orangepipc.spec +++ b/u-boot-orangepipc.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "orangepipc" == "rpi" || "orangepipc" == "rpi2" || "orangepipc" == "rpi332b" || "orangepipc" == "rpi3" +%if "orangepipc" == "rpi" || "orangepipc" == "rpi2" || "orangepipc" == "rpi3" %define is_rpi 1 %endif +%if "orangepipc" == "evb-rk3399" || "orangepipc" == "firefly-rk3399" || "orangepipc" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" orangepi_pc_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-orangepipc2.changes b/u-boot-orangepipc2.changes index ddde400..b1e7f59 100644 --- a/u-boot-orangepipc2.changes +++ b/u-boot-orangepipc2.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-orangepipc2.spec b/u-boot-orangepipc2.spec index a476ce4..a28fca3 100644 --- a/u-boot-orangepipc2.spec +++ b/u-boot-orangepipc2.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "orangepipc2" == "rpi" || "orangepipc2" == "rpi2" || "orangepipc2" == "rpi332b" || "orangepipc2" == "rpi3" +%if "orangepipc2" == "rpi" || "orangepipc2" == "rpi2" || "orangepipc2" == "rpi3" %define is_rpi 1 %endif +%if "orangepipc2" == "evb-rk3399" || "orangepipc2" == "firefly-rk3399" || "orangepipc2" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" orangepi_pc2_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.itb %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.itb /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.itb /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-p2371-2180.changes b/u-boot-p2371-2180.changes index ddde400..b1e7f59 100644 --- a/u-boot-p2371-2180.changes +++ b/u-boot-p2371-2180.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-p2371-2180.spec b/u-boot-p2371-2180.spec index 72730ad..50400db 100644 --- a/u-boot-p2371-2180.spec +++ b/u-boot-p2371-2180.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "p2371-2180" == "rpi" || "p2371-2180" == "rpi2" || "p2371-2180" == "rpi332b" || "p2371-2180" == "rpi3" +%if "p2371-2180" == "rpi" || "p2371-2180" == "rpi2" || "p2371-2180" == "rpi3" %define is_rpi 1 %endif +%if "p2371-2180" == "evb-rk3399" || "p2371-2180" == "firefly-rk3399" || "p2371-2180" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" p2371-2180_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-p2771-0000-500.changes b/u-boot-p2771-0000-500.changes index ddde400..b1e7f59 100644 --- a/u-boot-p2771-0000-500.changes +++ b/u-boot-p2771-0000-500.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-p2771-0000-500.spec b/u-boot-p2771-0000-500.spec index 4cb4c9f..f368c99 100644 --- a/u-boot-p2771-0000-500.spec +++ b/u-boot-p2771-0000-500.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "p2771-0000-500" == "rpi" || "p2771-0000-500" == "rpi2" || "p2771-0000-500" == "rpi332b" || "p2771-0000-500" == "rpi3" +%if "p2771-0000-500" == "rpi" || "p2771-0000-500" == "rpi2" || "p2771-0000-500" == "rpi3" %define is_rpi 1 %endif +%if "p2771-0000-500" == "evb-rk3399" || "p2771-0000-500" == "firefly-rk3399" || "p2771-0000-500" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" p2771-0000-500_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-paz00.changes b/u-boot-paz00.changes index ddde400..b1e7f59 100644 --- a/u-boot-paz00.changes +++ b/u-boot-paz00.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-paz00.spec b/u-boot-paz00.spec index 84193e6..797773f 100644 --- a/u-boot-paz00.spec +++ b/u-boot-paz00.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "paz00" == "rpi" || "paz00" == "rpi2" || "paz00" == "rpi332b" || "paz00" == "rpi3" +%if "paz00" == "rpi" || "paz00" == "rpi2" || "paz00" == "rpi3" %define is_rpi 1 %endif +%if "paz00" == "evb-rk3399" || "paz00" == "firefly-rk3399" || "paz00" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" paz00_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-pcm051rev3.changes b/u-boot-pcm051rev3.changes index ddde400..b1e7f59 100644 --- a/u-boot-pcm051rev3.changes +++ b/u-boot-pcm051rev3.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-pcm051rev3.spec b/u-boot-pcm051rev3.spec index c0f10ed..91932be 100644 --- a/u-boot-pcm051rev3.spec +++ b/u-boot-pcm051rev3.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "pcm051rev3" == "rpi" || "pcm051rev3" == "rpi2" || "pcm051rev3" == "rpi332b" || "pcm051rev3" == "rpi3" +%if "pcm051rev3" == "rpi" || "pcm051rev3" == "rpi2" || "pcm051rev3" == "rpi3" %define is_rpi 1 %endif +%if "pcm051rev3" == "evb-rk3399" || "pcm051rev3" == "firefly-rk3399" || "pcm051rev3" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" pcm051_rev3_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-pine64plus.changes b/u-boot-pine64plus.changes index ddde400..b1e7f59 100644 --- a/u-boot-pine64plus.changes +++ b/u-boot-pine64plus.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-pine64plus.spec b/u-boot-pine64plus.spec index 08d4235..6d72a7e 100644 --- a/u-boot-pine64plus.spec +++ b/u-boot-pine64plus.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "pine64plus" == "rpi" || "pine64plus" == "rpi2" || "pine64plus" == "rpi332b" || "pine64plus" == "rpi3" +%if "pine64plus" == "rpi" || "pine64plus" == "rpi2" || "pine64plus" == "rpi3" %define is_rpi 1 %endif +%if "pine64plus" == "evb-rk3399" || "pine64plus" == "firefly-rk3399" || "pine64plus" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" pine64_plus_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.itb %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.itb /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.itb /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-poplar.changes b/u-boot-poplar.changes index ddde400..b1e7f59 100644 --- a/u-boot-poplar.changes +++ b/u-boot-poplar.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-poplar.spec b/u-boot-poplar.spec index 2f79e5d..a650dc7 100644 --- a/u-boot-poplar.spec +++ b/u-boot-poplar.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "poplar" == "rpi" || "poplar" == "rpi2" || "poplar" == "rpi332b" || "poplar" == "rpi3" +%if "poplar" == "rpi" || "poplar" == "rpi2" || "poplar" == "rpi3" %define is_rpi 1 %endif +%if "poplar" == "evb-rk3399" || "poplar" == "firefly-rk3399" || "poplar" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" poplar_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-qemu-ppce500.changes b/u-boot-qemu-ppce500.changes index ddde400..b1e7f59 100644 --- a/u-boot-qemu-ppce500.changes +++ b/u-boot-qemu-ppce500.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-qemu-ppce500.spec b/u-boot-qemu-ppce500.spec index 41a8998..f3f866a 100644 --- a/u-boot-qemu-ppce500.spec +++ b/u-boot-qemu-ppce500.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "qemu-ppce500" == "rpi" || "qemu-ppce500" == "rpi2" || "qemu-ppce500" == "rpi332b" || "qemu-ppce500" == "rpi3" +%if "qemu-ppce500" == "rpi" || "qemu-ppce500" == "rpi2" || "qemu-ppce500" == "rpi3" %define is_rpi 1 %endif +%if "qemu-ppce500" == "evb-rk3399" || "qemu-ppce500" == "firefly-rk3399" || "qemu-ppce500" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" qemu-ppce500_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-rpi.changes b/u-boot-rpi.changes index ddde400..b1e7f59 100644 --- a/u-boot-rpi.changes +++ b/u-boot-rpi.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-rpi.spec b/u-boot-rpi.spec index 73ed82f..0d30c69 100644 --- a/u-boot-rpi.spec +++ b/u-boot-rpi.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "rpi" == "rpi" || "rpi" == "rpi2" || "rpi" == "rpi332b" || "rpi" == "rpi3" +%if "rpi" == "rpi" || "rpi" == "rpi2" || "rpi" == "rpi3" %define is_rpi 1 %endif +%if "rpi" == "evb-rk3399" || "rpi" == "firefly-rk3399" || "rpi" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" rpi_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-rpi2.changes b/u-boot-rpi2.changes index ddde400..b1e7f59 100644 --- a/u-boot-rpi2.changes +++ b/u-boot-rpi2.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-rpi2.spec b/u-boot-rpi2.spec index 456ff54..f330bc5 100644 --- a/u-boot-rpi2.spec +++ b/u-boot-rpi2.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "rpi2" == "rpi" || "rpi2" == "rpi2" || "rpi2" == "rpi332b" || "rpi2" == "rpi3" +%if "rpi2" == "rpi" || "rpi2" == "rpi2" || "rpi2" == "rpi3" %define is_rpi 1 %endif +%if "rpi2" == "evb-rk3399" || "rpi2" == "firefly-rk3399" || "rpi2" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" rpi_2_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-rpi3.changes b/u-boot-rpi3.changes index ddde400..b1e7f59 100644 --- a/u-boot-rpi3.changes +++ b/u-boot-rpi3.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-rpi3.spec b/u-boot-rpi3.spec index 482401d..b2d5289 100644 --- a/u-boot-rpi3.spec +++ b/u-boot-rpi3.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "rpi3" == "rpi" || "rpi3" == "rpi2" || "rpi3" == "rpi332b" || "rpi3" == "rpi3" +%if "rpi3" == "rpi" || "rpi3" == "rpi2" || "rpi3" == "rpi3" %define is_rpi 1 %endif +%if "rpi3" == "evb-rk3399" || "rpi3" == "firefly-rk3399" || "rpi3" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" rpi_3_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-rpi332b.changes b/u-boot-rpi332b.changes deleted file mode 100644 index ddde400..0000000 --- a/u-boot-rpi332b.changes +++ /dev/null @@ -1,1917 +0,0 @@ -------------------------------------------------------------------- -Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - -- Add dragonboard820c - -------------------------------------------------------------------- -Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de - -- Add p2771-0000-500 (Jetson TX2) - -------------------------------------------------------------------- -Thu May 10 17:32:58 UTC 2018 - afaerber@suse.de - -- Conditionalize pine64plus ATF support on uboot_atf_pine64 -- u-boot-board.spec.in: Update license - -------------------------------------------------------------------- -Thu May 10 16:17:39 UTC 2018 - afaerber@suse.de - -- Add poplar - -------------------------------------------------------------------- -Wed May 9 07:24:31 UTC 2018 - guillaume.gardet@opensuse.org - -- Update to 2018.05 - -------------------------------------------------------------------- -Wed May 2 09:43:24 UTC 2018 - agraf@suse.com - -- Update to 2018.05-rc3 - -------------------------------------------------------------------- -Thu Apr 26 12:38:31 UTC 2018 - agraf@suse.com - -- Include u-boot.spec in autogeneration logic - -------------------------------------------------------------------- -Thu Apr 26 11:40:19 UTC 2018 - agraf@suse.com - -- Add support for .bif generation in mkimage -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 -* Patches added: - 0006-tools-zynqmpimage-Add-partition-rea.patch - 0007-tools-zynqmpimage-Move-defines-to-h.patch - 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch - 0009-tools-zynqmpimage-Add-bif-support.patch - 0010-tools-zynqmpbif-Add-support-for-loa.patch - -------------------------------------------------------------------- -Tue Apr 24 19:32:04 UTC 2018 - agraf@suse.com - -- Add generic ZynqMP support -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 -* Patches added: - 0005-zynqmp-Add-generic-target.patch - -------------------------------------------------------------------- -Tue Apr 17 08:57:21 UTC 2018 - guillaume.gardet@opensuse.org - -- Update to 2018.05-rc2 -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 -* Patches dropped: - 0004-rpi3-Enable-lan78xx-driver.patch - 0005-rpi-Add-identifier-for-the-new-RPi3.patch - 0006-efi_loader-Fix-network-DP-with-DM_E.patch - 0007-mkimage-do-not-fail-if-there-is-no-.patch - 0008-rpi-Allow-to-boot-without-serial.patch - 0009-mmc-use-core-clock-frequency-in-bcm.patch - 0010-Temp-workaround-for-Chromebook-snow.patch -* Patches added: - 0004-Temp-workaround-for-Chromebook-snow.patch - -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 -* Patches added: - 0010-Temp-workaround-for-Chromebook-snow.patch - -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 -* Patches dropped: - 0009-rpi-Allow-to-boot-without-serial.patch - 0010-mmc-use-core-clock-frequency-in-bcm.patch -* Patches added: - 0008-rpi-Allow-to-boot-without-serial.patch - 0009-mmc-use-core-clock-frequency-in-bcm.patch - -- Update to 2018.05-rc1 -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 -* Patches dropped: - 0003-Revert-rockchip-mkimage-remove-plac.patch - 0004-rpi-Use-firmware-provided-device-tr.patch - 0005-rpi3-Enable-lan78xx-driver.patch - 0006-net-Only-access-network-devices-aft.patch - 0007-rpi-Add-identifier-for-the-new-RPi3.patch - 0008-efi_loader-Fix-network-DP-with-DM_E.patch -* Patches added: - 0003-rpi-Use-firmware-provided-device-tr.patch - 0004-rpi3-Enable-lan78xx-driver.patch - 0005-rpi-Add-identifier-for-the-new-RPi3.patch - 0006-efi_loader-Fix-network-DP-with-DM_E.patch - 0007-mkimage-do-not-fail-if-there-is-no-.patch - -------------------------------------------------------------------- -Thu Apr 12 15:19:29 UTC 2018 - agraf@suse.com - -- Package u-boot.elf on Xilinx systems - -------------------------------------------------------------------- -Mon Apr 9 09:09:00 UTC 2018 - guillaume.gardet@opensuse.org - -- Workaround to boot on Chromebook (snow) -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.03 -* Patches added: - 0011-Temp-workaround-for-Chromebook-snow.patch - -------------------------------------------------------------------- -Thu Apr 5 11:25:47 UTC 2018 - agraf@suse.com - -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.03 -* Patches added: - 0010-mmc-use-core-clock-frequency-in-bcm.patch - -------------------------------------------------------------------- -Thu Apr 5 09:54:56 UTC 2018 - agraf@suse.com - -- Fix rainbow screen on 32bit RPis (boo#1086757) -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.03 -* Patches added: - 0009-rpi-Allow-to-boot-without-serial.patch - -------------------------------------------------------------------- -Thu Mar 15 23:44:18 UTC 2018 - agraf@suse.com - -- Add Xilinx ZynqMP ZCU 102 target - -------------------------------------------------------------------- -Thu Mar 15 16:34:22 UTC 2018 - agraf@suse.com - -- Enable new RPi3 B+ (bsc#1085262) -- Fix network boot (bsc#1070775) -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.03 -* Patches added: - 0005-rpi3-Enable-lan78xx-driver.patch - 0006-net-Only-access-network-devices-aft.patch - 0007-rpi-Add-identifier-for-the-new-RPi3.patch - 0008-efi_loader-Fix-network-DP-with-DM_E.patch - -------------------------------------------------------------------- -Wed Mar 14 15:13:44 UTC 2018 - guillaume.gardet@opensuse.org - -- Updated to 2018.03 - -------------------------------------------------------------------- -Tue Mar 6 13:26:21 UTC 2018 - guillaume@opensuse.org - -- Updated to 2018.03-rc4 - -------------------------------------------------------------------- -Thu Feb 22 08:43:30 UTC 2018 - guillaume@opensuse.org - -- Updated to 2018.03-rc3 - -------------------------------------------------------------------- -Wed Feb 21 16:48:20 UTC 2018 - agraf@suse.com - -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.03 -* Patches added: - 0004-rpi-Use-firmware-provided-device-tr.patch - -------------------------------------------------------------------- -Tue Feb 13 12:26:59 UTC 2018 - guillaume@opensuse.org - -- Updated to 2018.03-rc2 - -------------------------------------------------------------------- -Tue Jan 30 07:48:10 UTC 2018 - guillaume@opensuse.org - -- Updated to 2018.03-rc1 -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.03 -* Patches dropped: - 0004-Fix-MMC1-external-SD-slot-on-Samsun.patch (Fixed upstream) - -------------------------------------------------------------------- -Wed Jan 17 17:11:04 UTC 2018 - afaerber@suse.de - -- Add turrisomnia - -------------------------------------------------------------------- -Wed Jan 17 09:51:41 UTC 2018 - guillaume@opensuse.org - -- Updated to 2018.01 - -------------------------------------------------------------------- -Mon Jan 8 09:02:47 UTC 2018 - guillaume@opensuse.org - -- Updated to 2018.01-rc3 - -------------------------------------------------------------------- -Tue Dec 19 13:59:57 UTC 2017 - guillaume@opensuse.org - -- Updated to 2018.01-rc2 - -------------------------------------------------------------------- -Fri Dec 8 07:50:19 UTC 2017 - guillaume@opensuse.org - -- Updated to 2018.01-rc1 -- Remove am57xx_evm_nodt since it has been removed upstream - -------------------------------------------------------------------- -Sat Nov 25 23:00:31 UTC 2017 - afaerber@suse.de - -- Add nanopi_a64 -- Update orangepi_pc2 packaging - -------------------------------------------------------------------- -Thu Nov 16 12:27:27 UTC 2017 - guillaume@opensuse.org - -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2017.11 -* Patches added: - 0004-Fix-MMC1-external-SD-slot-on-Samsun.patch - -------------------------------------------------------------------- -Tue Nov 14 10:10:21 UTC 2017 - guillaume@opensuse.org - -- Updated to v2017.11 - -------------------------------------------------------------------- -Tue Nov 7 09:59:19 UTC 2017 - guillaume@opensuse.org - -- Updated to v2017.11-rc4 - -------------------------------------------------------------------- -Tue Oct 31 10:28:07 UTC 2017 - guillaume@opensuse.org - -- Updated to v2017.11-rc3 - -------------------------------------------------------------------- -Tue Oct 17 07:58:25 UTC 2017 - guillaume@opensuse.org - -- Updated to v2017.11-rc2 -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2017.11 -* Patches dropped: - 0004-Fix-boot-on-Beagleboard-xM-by-disab.patch - -------------------------------------------------------------------- -Mon Oct 16 18:53:36 UTC 2017 - xxxxxmichl@googlemail.com - -- Added Banana Pi M2+ support (u-boot-sinovoipbpim2plus) - -------------------------------------------------------------------- -Sun Oct 8 13:17:01 UTC 2017 - afaerber@suse.de - -- Add firefly-rk3399 and geekbox - -------------------------------------------------------------------- -Sat Oct 7 00:52:52 UTC 2017 - afaerber@suse.de - -- Drop obsolete CuBox-i i.MX6 SPL packaging, too - -------------------------------------------------------------------- -Fri Oct 6 23:26:14 UTC 2017 - afaerber@suse.de - -- Update packaging for Jetson TX1 -- Cleanups -* Drop executable bit from SPL -* Consistently use %uboot_dir -* u-boot[-tegra]-dtb.bin is obsolete -* Drop obsolete UDOO-specific i.MX6 SPL packaging -- Package sunxi64 SPL for Pine64 - -------------------------------------------------------------------- -Mon Oct 2 13:33:40 UTC 2017 - guillaume@opensuse.org - -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2017.09 -* Patches added: - 0004-Fix-boot-on-Beagleboard-xM-by-disab.patch - -------------------------------------------------------------------- -Wed Sep 13 15:14:30 UTC 2017 - guillaume@opensuse.org - -- Merge and rename packages to follow upstream: - old configs: - mvebu_db-88f7040-nand_defconfig - mvebu_db-88f7040_defconfig - mvebu_db-88f8040_defconfig - merged to new config: - mvebu_db_armada8k_defconfig - -------------------------------------------------------------------- -Tue Sep 12 08:26:24 UTC 2017 - guillaume@opensuse.org - -- Updated to v2017.09 - -------------------------------------------------------------------- -Tue Sep 5 09:22:47 UTC 2017 - guillaume@opensuse.org - -- Updated to v2017.09-rc4 - -------------------------------------------------------------------- -Mon Aug 21 14:46:36 UTC 2017 - guillaume@opensuse.org - -- Updated to v2017.07 - -------------------------------------------------------------------- -Mon Jul 10 12:54:03 UTC 2017 - guillaume@opensuse.org - -- Updated to v2017.07-rc3 - -------------------------------------------------------------------- -Thu Jun 22 08:19:18 UTC 2017 - guillaume@opensuse.org - -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2017.07 -* Patches added: - 0003-Revert-rockchip-mkimage-remove-plac.patch - -------------------------------------------------------------------- -Wed Jun 21 14:18:06 UTC 2017 - guillaume.gardet@opensuse.org - -- Updated to v2017.07-rc2 - -------------------------------------------------------------------- -Fri Jun 9 14:21:41 UTC 2017 - afaerber@suse.de - -- Updated to v2017.07-rc1 - -------------------------------------------------------------------- -Mon May 8 15:27:50 UTC 2017 - afaerber@suse.de - -- Updated to v2017.05 - -------------------------------------------------------------------- -Tue May 2 16:22:39 UTC 2017 - afaerber@suse.de - -- Updated to v2017.05-rc3 -* Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2017.05 -* Patches dropped (upstreamed): - 0003-meson-gxbb-enable-MMC-as-boot-targe.patch - -------------------------------------------------------------------- -Fri Apr 21 03:45:10 UTC 2017 - afaerber@suse.de - -- Switch firefly-rk3288 and tinker-rk3288 to u-boot.bin - -------------------------------------------------------------------- -Thu Apr 20 14:33:20 UTC 2017 - afaerber@suse.de - -- Use %_smp_mflags, suggested by jengelh - -------------------------------------------------------------------- -Thu Apr 20 01:00:43 UTC 2017 - afaerber@suse.de - -- Drop rkimage for tinker-rk3288, it only has Micro SD storage - -------------------------------------------------------------------- -Wed Apr 19 20:04:46 UTC 2017 - afaerber@suse.de - -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2017.05 -* Enable distro boot from MMC for odroid-c2: - 0003-meson-gxbb-enable-MMC-as-boot-targe.patch - -------------------------------------------------------------------- -Tue Apr 18 16:12:49 UTC 2017 - afaerber@suse.de - -- Updated to v2017.05-rc2 -* Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2017.05 -* Patches dropped (accepted upstream): - 0003-Makefile-Fix-linking-with-modern-bi.patch -- Add orangepipc2, nanopineoair - -------------------------------------------------------------------- -Thu Apr 13 02:38:36 UTC 2017 - afaerber@suse.de - -- Enable overlay support unconditionally - -------------------------------------------------------------------- -Tue Apr 11 03:28:45 UTC 2017 - afaerber@suse.de - -- Add ls1012afrdmqspi - -------------------------------------------------------------------- -Tue Apr 11 01:47:01 UTC 2017 - afaerber@suse.de - -- Updated to v2017.05-rc1 -* Add .sig file as source -- Add mvebuespressobin-88f3720, mvebumcbin-88f8040 and evb-rk3399 -- Prepare orangepipc2 and nanopineoair for -rc2 - -------------------------------------------------------------------- -Sun Apr 9 18:24:30 UTC 2017 - afaerber@suse.de - -- Add tinker-rk3288 -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2017.03 -* Fix firefly-rk3288 and tinker-rk3288 build with binutils 2.28. - 0003-Makefile-Fix-linking-with-modern-bi.patch -- U-Boot has no CFLAGS, so apply $RPM_OPT_FLAGS to HOSTCFLAGS instead - -------------------------------------------------------------------- -Mon Mar 20 11:10:57 UTC 2017 - afaerber@suse.de - -- Tidy Raspberry Pi conditionals -- Enable CONFIG_OF_LIBFDT_OVERLAY for Raspberry Pi only for now - -------------------------------------------------------------------- -Mon Mar 20 09:43:14 UTC 2017 - afaerber@suse.de - -- Add mvebudb-88f{3720,7040,8040} - -------------------------------------------------------------------- -Tue Mar 14 08:47:33 UTC 2017 - guillaume@opensuse.org - -- Updated to v2017.03 - -------------------------------------------------------------------- -Wed Mar 1 09:36:39 UTC 2017 - guillaume@opensuse.org - -- Add libopenssl-devel as BuildRequires (needed by some configs) - -------------------------------------------------------------------- -Tue Feb 28 08:37:55 UTC 2017 - guillaume@opensuse.org - -- Updated to v2017.03-rc3 - -------------------------------------------------------------------- -Wed Feb 22 13:38:25 UTC 2017 - hsehic@suse.com - -- Add Lamobo_R1 - -------------------------------------------------------------------- -Wed Jan 11 09:16:16 UTC 2017 - guillaume@opensuse.org - -- Updated to v2017.01 - -------------------------------------------------------------------- -Mon Jan 9 12:06:53 UTC 2017 - afaerber@suse.de - -- Add udooneo -- Introduce IMX6_SPL, superseding per-board CUBOXI_SPL and UDOO_SPL - -------------------------------------------------------------------- -Fri Jan 6 14:29:12 UTC 2017 - afaerber@suse.de - -- Add nanopineo -- Inline CHANGE_DATE into u-boot.spec.in to keep future diffs small - -------------------------------------------------------------------- -Thu Jan 5 10:16:20 UTC 2017 - guillaume@opensuse.org - -- Updated to v2017.01-rc3 -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2017.01 -* Patches dropped: - 0002-XXX-openSUSE-XXX-omap3-Move-to-dist.patch - 0003-Revert-Revert-omap3-Use-raw-SPL-by-.patch - 0004-ARM-bcm283x-Implement-EFI-RTS-reset.patch - 0005-bcm2835-video-Map-frame-buffer-as-3.patch - 0006-bcm2835-Reserve-the-spin-table-in-e.patch - 0007-efi_loader-fix-depends-on-line-of-E.patch - 0008-efi-Use-device-device-path-type-Mes.patch -* Patches added: - 0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch - -------------------------------------------------------------------- -Mon Dec 19 20:50:30 UTC 2016 - xxxxxmichl@googlemail.com - -- Added support for DE0-Nanos-SoC board - -------------------------------------------------------------------- -Tue Nov 15 10:30:59 UTC 2016 - guillaume@opensuse.org - -- Updated to v2016.11 - -------------------------------------------------------------------- -Wed Nov 2 13:36:32 UTC 2016 - guillaume@opensuse.org - -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2016.11 - to fix build of Raspberry Pi 1, 2 and 3 - -------------------------------------------------------------------- -Tue Nov 1 13:10:28 UTC 2016 - guillaume@opensuse.org - -- Updated to v2016.11-rc3 -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2016.11 -* Patches dropped: - 0004-efi_loader-Allow-boards-to-implemen.patch - 0005-ARM-bcm283x-Implement-EFI-RTS-reset.patch - 0006-efi_loader-gop-Expose-fb-when-32bpp.patch - 0007-bcm2835-video-Map-frame-buffer-as-3.patch - 0008-bcm2835-Reserve-the-spin-table-in-e.patch - 0009-x86-Move-table-csum-into-separate-h.patch - 0010-x86-Move-smbios-generation-into-arc.patch - 0011-efi_loader-Expose-efi_install_confi.patch - 0012-smbios-Allow-compilation-on-64bit-s.patch - 0013-smbios-Expose-in-efi_loader-as-tabl.patch - 0014-efi_loader-Fix-efi_install_configur.patch - 0015-smbios-Provide-serial-number.patch - 0016-efi_loader-Update-description-of-in.patch - 0017-efi_loader-Fix-memory-map-size-chec.patch - 0018-efi_loader-Fix-crash-on-32-bit-syst.patch - 0019-efi_loader-Move-efi_allocate_pool-i.patch - 0020-efi_loader-Track-size-of-pool-alloc.patch - 0021-efi_loader-Readd-freed-pages-to-mem.patch - 0022-efi_loader-Keep-memory-mapping-sort.patch - 0023-efi_loader-Do-not-leak-memory-when-.patch -* Patches added: - 0004-ARM-bcm283x-Implement-EFI-RTS-reset.patch - 0005-bcm2835-video-Map-frame-buffer-as-3.patch - 0006-bcm2835-Reserve-the-spin-table-in-e.patch - 0007-efi_loader-fix-depends-on-line-of-E.patch - 0008-efi-Use-device-device-path-type-Mes.patch - -------------------------------------------------------------------- -Sun Oct 16 16:20:25 UTC 2016 - afaerber@suse.de - -- Updated to v2016.11-rc1 - -------------------------------------------------------------------- -Sat Oct 15 11:25:48 UTC 2016 - agraf@suse.com - -- Backport patches to allow 4.8 kernels to boot -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2016.09 -* Patches added: - 0016-efi_loader-Update-description-of-in.patch - 0017-efi_loader-Fix-memory-map-size-chec.patch - 0018-efi_loader-Fix-crash-on-32-bit-syst.patch - 0019-efi_loader-Move-efi_allocate_pool-i.patch - 0020-efi_loader-Track-size-of-pool-alloc.patch - 0021-efi_loader-Readd-freed-pages-to-mem.patch - 0022-efi_loader-Keep-memory-mapping-sort.patch - 0023-efi_loader-Do-not-leak-memory-when-.patch - -------------------------------------------------------------------- -Thu Oct 13 13:21:36 UTC 2016 - afaerber@suse.de - -- update_git.sh: Handle SUBLEVEL for %archive_version (x.y.Z) -- Switch to branch tumbleweed-2016.09 - -------------------------------------------------------------------- -Fri Sep 30 20:01:33 UTC 2016 - guillaume@opensuse.org - -- Updated to v2016.09 -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-staging -* Patches dropped: - 0009-Revert-armv8-Enable-CPUECTLR.SMPEN-.patch - 0010-bcm2835_gpio-Implement-GPIOF_FUNC.patch - 0011-serial-bcm283x_mu-Detect-disabled-s.patch - 0012-x86-Move-table-csum-into-separate-h.patch - 0013-x86-Move-smbios-generation-into-arc.patch - 0014-efi_loader-Expose-efi_install_confi.patch - 0015-smbios-Allow-compilation-on-64bit-s.patch - 0016-smbios-Expose-in-efi_loader-as-tabl.patch - 0017-efi_loader-Fix-efi_install_configur.patch - 0018-smbios-Provide-serial-number.patch - 0019-common-env_nand-Ensure-that-we-have.patch -* Patches added: - 0009-x86-Move-table-csum-into-separate-h.patch - 0010-x86-Move-smbios-generation-into-arc.patch - 0011-efi_loader-Expose-efi_install_confi.patch - 0012-smbios-Allow-compilation-on-64bit-s.patch - 0013-smbios-Expose-in-efi_loader-as-tabl.patch - 0014-efi_loader-Fix-efi_install_configur.patch - 0015-smbios-Provide-serial-number.patch -- Add python as BuildRequires (needed by some boards using DTOC - such as firefly-rk3288) -- Fix firefly-rk3288 by replacing u-boot-spl-dtb.bin - by u-boot-spl.bin -- Updated to v2016.09.01 - -------------------------------------------------------------------- -Wed Sep 28 15:18:17 UTC 2016 - afaerber@suse.de - -- Fix rpi332b installation path and enable %post scriplet - -------------------------------------------------------------------- -Sun Sep 11 03:44:15 UTC 2016 - afaerber@suse.de - -- Add hikey and rpi332b - -------------------------------------------------------------------- -Wed Sep 7 09:02:59 UTC 2016 - guillaume@opensuse.org - -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed -* Patches added: - 0019-common-env_nand-Ensure-that-we-have.patch - -------------------------------------------------------------------- -Fri Sep 2 23:25:44 UTC 2016 - afaerber@suse.de - -- Add post-install script for Raspberry Pi to install to /boot/efi - where needed. (bsc#996064) - -------------------------------------------------------------------- -Fri Aug 12 14:07:49 UTC 2016 - agraf@suse.com - -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed -- Update to v3 of the serial detect code (bsc#989511) -* Patches added: - 0010-bcm2835_gpio-Implement-GPIOF_FUNC.patch -* Patches rebased: - 0010-serial-bcm283x_mu-Detect-disabled-s.patch -> 0011-serial-bcm283x_mu-Detect-disabled-s.patch -- Add SMBIOS table on ARM (bsc#989509) -* Patches added: - 0012-x86-Move-table-csum-into-separate-h.patch - 0013-x86-Move-smbios-generation-into-arc.patch - 0014-efi_loader-Expose-efi_install_confi.patch - 0015-smbios-Allow-compilation-on-64bit-s.patch - 0016-smbios-Expose-in-efi_loader-as-tabl.patch - 0017-efi_loader-Fix-efi_install_configur.patch - 0018-smbios-Provide-serial-number.patch - -------------------------------------------------------------------- -Mon Aug 1 18:42:36 UTC 2016 - stefan.bruens@rwth-aachen.de - -- Use deterministic build date by setting DATE_SOURCE_EPOCH - -------------------------------------------------------------------- -Fri Jul 29 21:52:37 UTC 2016 - agraf@suse.com - -- Add dynamic detection of rpi3 uart (bsc#989511) -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed -* Patches added: - 0010-serial-bcm283x_mu-Detect-disabled-s.patch - -------------------------------------------------------------------- -Sat Jul 16 18:49:35 UTC 2016 - afaerber@suse.de - -- Updated to v2016.07 -* Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed -* Patches dropped (upstreamed): - 0004-video-ipu-Fix-build-with-hard-float.patch - 0005-efi_loader-Clean-up-system-table-on.patch - 0006-efi_loader-gop-Don-t-expose-fb-addr.patch - 0009-arm-Introduce-setjmp-longjmp.patch - 0010-efi_loader-Add-exit-support.patch - 0011-efi_loader-Add-DM_VIDEO-support.patch - 0015-arm-Fix-setjmp.patch -* Patches rebased: - 0007-efi_loader-Allow-boards-to-implemen.patch -> 0004-efi_loader-Allow-boards-to-implemen.patch - 0008-ARM-bcm283x-Implement-EFI-RTS-reset.patch -> 0005-ARM-bcm283x-Implement-EFI-RTS-reset.patch - 0012-efi_loader-gop-Expose-fb-when-32bpp.patch -> 0006-efi_loader-gop-Expose-fb-when-32bpp.patch - 0013-bcm2835-video-Map-frame-buffer-as-3.patch -> 0007-bcm2835-video-Map-frame-buffer-as-3.patch - 0014-bcm2835-Reserve-the-spin-table-in-e.patch -> 0008-bcm2835-Reserve-the-spin-table-in-e.patch -- Revert an ARMv8 breakage from v2016.07 (backport from master) - 0009-Revert-armv8-Enable-CPUECTLR.SMPEN-.patch -- Add dragonboard410c, odroid-c2, pine64_plus - -------------------------------------------------------------------- -Mon Jun 27 11:00:33 UTC 2016 - nadvornik@suse.com - -- Enable SUNXI_SPL for orangepi_pc - -------------------------------------------------------------------- -Mon Jun 27 06:14:09 UTC 2016 - agraf@suse.com - -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed -* Patches added: - 0015-arm-Fix-setjmp.patch -- Add update_git.sh to source file list - -------------------------------------------------------------------- -Mon Jun 6 22:07:59 UTC 2016 - agraf@suse.com - -- Add efifb support for RPi -- Fix spin table spill on Rpi -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed -* Patches added: - 0011-efi_loader-Add-DM_VIDEO-support.patch - 0012-efi_loader-gop-Expose-fb-when-32bpp.patch - 0013-bcm2835-video-Map-frame-buffer-as-3.patch - 0014-bcm2835-Reserve-the-spin-table-in-e.patch - -------------------------------------------------------------------- -Mon Jun 6 06:56:34 UTC 2016 - agraf@suse.com - -- Add RTS reboot for RPi -- Add EFI exit support -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed -* Patches added: - 0007-efi_loader-Allow-boards-to-implemen.patch - 0008-ARM-bcm283x-Implement-EFI-RTS-reset.patch - 0009-arm-Introduce-setjmp-longjmp.patch - 0010-efi_loader-Add-exit-support.patch - -------------------------------------------------------------------- -Fri Jun 3 11:18:13 UTC 2016 - agraf@suse.com - -- Disable EFI GOP fb_addr, so Linux doesn't use it -- Move to git based patch queue workflow -- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed -* Patches dropped: - 0001-video-ipu-Fix-build-with-hard-float-ARM-toolchain.-I.patch - 0001-XXX-openSUSE-XXX-Load-dtb-from-partition-2.patch - 0002-XXX-openSUSE-XXX-omap3-Move-to-distro-bootcmd.patch -* Patches added: - 0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch - 0002-XXX-openSUSE-XXX-omap3-Move-to-dist.patch - 0003-Revert-Revert-omap3-Use-raw-SPL-by-.patch - 0004-video-ipu-Fix-build-with-hard-float.patch - 0005-efi_loader-Clean-up-system-table-on.patch - 0006-efi_loader-gop-Don-t-expose-fb-addr.patch - -------------------------------------------------------------------- -Wed May 18 13:07:24 UTC 2016 - afaerber@suse.de - -- Fix rpi3 installation location - -------------------------------------------------------------------- -Wed May 18 12:22:31 UTC 2016 - guillaume@opensuse.org - -- Add 0001-video-ipu-Fix-build-with-hard-float-ARM-toolchain.-I.patch - to fix build on iMX boards (with hard-float toolchains) - -------------------------------------------------------------------- -Tue May 17 12:53:24 UTC 2016 - guillaume@opensuse.org - -- Update to 2016.05 -- Remove upstreamed patch: - * 0003-exynos-Set-CNTFRQ.patch - -------------------------------------------------------------------- -Wed May 4 20:22:57 UTC 2016 - afaerber@suse.de - -- Package Marvell SPL for ClearFog -- Tidy package summaries and descriptions -* Fix spelling of U-Boot -* Don't assume ARM - -------------------------------------------------------------------- -Thu Apr 28 15:46:09 UTC 2016 - agraf@suse.com - -- Update to 2016.05-rc3 - - Removed patches: - * 0004-iso-Make-little-endian-and-64bit-safe.patch - * 0005-iso-Start-with-partition-1.patch - * 0006-iso-Allow-512-byte-sector-size.patch - * 0007-efi_loader-Split-drive-add-into-function.patch - * 0008-efi_loader-Add-el-torito-support.patch - * 0009-efi_loader-Pass-file-path-to-payload.patch - * 0010-efi_loader-Increase-path-string-to-32-characters.patch - * 0011-distro-Enable-iso-partition-code.patch - * 0012-efi_loader-Use-system-fdt-as-fallback.patch - * 0013-efi_loader-Put-fdt-into-convenient-location.patch - * 0014-efi_loader-Expose-ascending-efi-memory-map.patch - * 0015-efi_loader-Always-flush-in-cache-line-size-granulari.patch - * 0016-efi_loader-Handle-memory-overflows.patch - * 0017-ARM-rpi-fix-64-bit-CONFIG_SYS_TEXT_BASE.patch - -------------------------------------------------------------------- -Fri Apr 15 21:50:37 UTC 2016 - agraf@suse.com - -- Add patch to fix RPi3 aarch64 mode with recent firmware - * 0017-ARM-rpi-fix-64-bit-CONFIG_SYS_TEXT_BASE.patch - -------------------------------------------------------------------- -Wed Apr 13 13:55:13 UTC 2016 - agraf@suse.com - -- Move patch queue to https://github.com/openSUSE/u-boot.git tumbleweed - - Removed old patches: - * 0001-iso-Make-little-endian-and-64bit-safe.patch - * 0002-iso-Start-with-partition-1.patch - * 0003-iso-Allow-512-byte-sector-size.patch - * 0004-efi_loader-Split-drive-add-into-function.patch - * 0005-efi_loader-Add-el-torito-support.patch - * 0006-efi_loader-Pass-file-path-to-payload.patch - * 0007-efi_loader-Increase-path-string-to-32-characters.patch - * 0008-distro-Enable-iso-partition-code.patch - * 0009-efi_loader-Use-system-fdt-as-fallback.patch - * 0010-efi_loader-Put-fdt-into-convenient-location.patch - * 0011-efi_loader-Expose-ascending-efi-memory-map.patch - * 0012-efi_loader-Always-flush-in-cache-line-size-granulari.patch - * u-boot-exynos.patch - * efi-default-env.patch - * omap3-Move-to-distro-bootcmd.patch - - Added new patches: - * 0001-XXX-openSUSE-XXX-Load-dtb-from-partition-2.patch - * 0002-XXX-openSUSE-XXX-omap3-Move-to-distro-bootcmd.patch - * 0003-exynos-Set-CNTFRQ.patch - * 0004-iso-Make-little-endian-and-64bit-safe.patch - * 0005-iso-Start-with-partition-1.patch - * 0006-iso-Allow-512-byte-sector-size.patch - * 0007-efi_loader-Split-drive-add-into-function.patch - * 0008-efi_loader-Add-el-torito-support.patch - * 0009-efi_loader-Pass-file-path-to-payload.patch - * 0010-efi_loader-Increase-path-string-to-32-characters.patch - * 0011-distro-Enable-iso-partition-code.patch - * 0012-efi_loader-Use-system-fdt-as-fallback.patch - * 0013-efi_loader-Put-fdt-into-convenient-location.patch - * 0014-efi_loader-Expose-ascending-efi-memory-map.patch - * 0015-efi_loader-Always-flush-in-cache-line-size-granulari.patch -- Add patch to fix Jetson TK1 - * 0016-efi_loader-Handle-memory-overflows.patch - -------------------------------------------------------------------- -Wed Apr 13 13:16:42 UTC 2016 - guillaume@opensuse.org - -- Use released source archive instead of manually built archive - -------------------------------------------------------------------- -Tue Apr 12 08:38:49 UTC 2016 - agraf@suse.com - -- Update to 2016.05-rc1 -- Remove upstreamed patches: - * efi.patch - * efi2.patch - * efi_loader-Call-fdt-preparation-functions.patch - * efi_loader-Pass-proper-device-path-in-on-boot.patch - * efi_loader-Provide-icache-flush-stub.patch - * efi-map-fdt-as-reserved.patch - * rpi3.patch -- Add EFI fixes and iso boot backports: - * 0001-iso-Make-little-endian-and-64bit-safe.patch - * 0002-iso-Start-with-partition-1.patch - * 0003-iso-Allow-512-byte-sector-size.patch - * 0004-efi_loader-Split-drive-add-into-function.patch - * 0005-efi_loader-Add-el-torito-support.patch - * 0006-efi_loader-Pass-file-path-to-payload.patch - * 0007-efi_loader-Increase-path-string-to-32-characters.patch - * 0008-distro-Enable-iso-partition-code.patch - * 0009-efi_loader-Use-system-fdt-as-fallback.patch - * 0010-efi_loader-Put-fdt-into-convenient-location.patch - * 0011-efi_loader-Expose-ascending-efi-memory-map.patch - * 0012-efi_loader-Always-flush-in-cache-line-size-granulari.patch - -------------------------------------------------------------------- -Sun Apr 3 04:40:53 UTC 2016 - afaerber@suse.de - -- Package .img for firefly-rk3288 -- Package firefly-rk3288 SPL images. Generate them here so that we - notice early if the size constraints are ever again not met. - -------------------------------------------------------------------- -Sat Apr 2 23:08:53 UTC 2016 - afaerber@suse.de - -- Package spl/u-boot-spl for new tegra-uboot-flasher-scripts - -------------------------------------------------------------------- -Fri Apr 1 17:07:55 UTC 2016 - afaerber@suse.de - -- Add clearfog - -------------------------------------------------------------------- -Tue Mar 15 08:47:35 UTC 2016 - guillaume@opensuse.org - -- Update to 2016.03 -- Remove upstreamed patch: - * omap3-Use-raw-SPL-by-default-for-mmc1.patch - -------------------------------------------------------------------- -Sun Mar 13 21:48:46 UTC 2016 - dmueller@suse.com - -- add support for Raspberry Pi 3 (rpi3.patch) - -------------------------------------------------------------------- -Wed Mar 9 22:50:22 UTC 2016 - agraf@suse.com - -- Fix missing 0-terminator in efi patch, breaking boot.scr boot - -------------------------------------------------------------------- -Sat Mar 5 22:02:18 UTC 2016 - afaerber@suse.de - -- Non-free licensed Marvell code has long been removed. - Drop obsolete drop-marvell.patch (bsc#773824) -- Fix indentation of Patch6 in u-boot.spec.in - -------------------------------------------------------------------- -Thu Mar 3 15:02:37 UTC 2016 - agraf@suse.com - -- EFI: Map fdt as reserved - * efi-map-fdt-as-reserved.patch - -------------------------------------------------------------------- -Thu Mar 3 12:52:17 UTC 2016 - agraf@suse.com - -- Fix OMAP3 boards to load u-boot from raw sector offset - * omap3-Use-raw-SPL-by-default-for-mmc1.patch - -------------------------------------------------------------------- -Wed Mar 2 23:46:44 UTC 2016 - agraf@suse.com - -- Allow grub2 to find its config - * efi_loader-Pass-proper-device-path-in-on-boot.patch -- Fix Raspberry Pi 1 build - * efi_loader-Provide-icache-flush-stub.patch - -------------------------------------------------------------------- -Wed Mar 2 10:03:56 UTC 2016 - guillaume@opensuse.org - -- Update to 2016.03-rc3 -- Remove upstreamed patches: - * 0001-spl-if-MMCSD_MODE_RAW-fails-try-MMCSD_MODE_FS-if-ava.patch - -------------------------------------------------------------------- -Tue Mar 1 23:06:57 UTC 2016 - agraf@suse.com - -- Move omap3 to distro bootcmd (to enable efi boot on beagle-xm) - * omap3-Move-to-distro-bootcmd.patch -- Add EFI patch to support FDT fixups (patches in RAM size) - * efi_loader-Call-fdt-preparation-functions.patch - -------------------------------------------------------------------- -Mon Feb 29 23:28:15 UTC 2016 - agraf@suse.com - -- Patch the default u-boot env to search for dtb in /boot at part 2 - * efi-default-env.patch - -------------------------------------------------------------------- -Sun Feb 28 11:02:04 UTC 2016 - agraf@suse.com - -- Use $fdtfile rather than $fdt_name everywhere: - * efi2.patch - -------------------------------------------------------------------- -Sat Feb 27 13:20:29 UTC 2016 - agraf@suse.com - -- Add EFI support about to move upstream: - * efi.patch - -------------------------------------------------------------------- -Mon Feb 22 13:32:31 UTC 2016 - guillaume@opensuse.org - -- Update to 2016.03-rc2 -- Remove upstreamed patches: - * U-Boot-am335x_evm-Don-t-undef-CONFIG_BOOTDELAY.patch - * 0001-udoo-use-load-instead-of-fatload.patch -- Refresh drop-marvell.patch -- Remove dropped doc from file list: doc/README.Modem - -------------------------------------------------------------------- -Wed Feb 17 08:16:15 UTC 2016 - guillaume@opensuse.org - -- Add a patch to fix boot on partition when raw boot mode is also - available: - * 0001-spl-if-MMCSD_MODE_RAW-fails-try-MMCSD_MODE_FS-if-ava.patch - -------------------------------------------------------------------- -Wed Feb 17 08:15:52 UTC 2016 - guillaume@opensuse.org - -- Add am335x_boneblack - -------------------------------------------------------------------- -Sat Feb 13 14:56:43 UTC 2016 - afaerber@suse.de - -- Enable Hyundai_A7HD, superseding :Contrib:sunxi package - -------------------------------------------------------------------- -Thu Feb 9 13:02:26 UTC 2016 - afaerber@suse.de - -- Adjust installation path for qemu-ppce500 to replace qemu-ppc's -* Pull in qemu (not qemu-ppc) for directory ownership - -------------------------------------------------------------------- -Tue Feb 9 00:03:18 UTC 2016 - afaerber@suse.de - -- Add Jetson TX1 board (p2371-2180) -- Fix indentation of last Patch line in .spec.in to match .spec - -------------------------------------------------------------------- -Mon Feb 1 19:35:45 UTC 2016 - agraf@suse.com - -- Add patch to fix exynos armv7 kvm support - * adds u-boot-exynos.patch - -------------------------------------------------------------------- -Tue Jan 19 14:15:58 UTC 2016 - afaerber@suse.de - -- Prepare for non-/boot installation directories -* For /boot/vc pull in raspberrypi-firmware package - -------------------------------------------------------------------- -Fri Jan 15 21:19:43 UTC 2016 - oscar@naiandei.net - -- Add udoo (dual and quad) boards - * adds 0001-udoo-use-load-instead-of-fatload.patch - -------------------------------------------------------------------- -Thu Jan 14 15:43:36 UTC 2016 - afaerber@suse.de - -- Add qemu-ppce500, to replace u-boot.e500 blob in qemu package -* Override CROSS_COMPILE variable to use native gcc - -------------------------------------------------------------------- -Wed Jan 13 14:07:32 UTC 2016 - guillaume@opensuse.org - -- Update to 2016.01 - -------------------------------------------------------------------- -Mon Jan 11 11:08:50 UTC 2016 - guillaume@opensuse.org - -- Update to 2016.01-rc4 - -------------------------------------------------------------------- -Mon Dec 28 13:50:10 UTC 2015 - guillaume@opensuse.org - -- Update to 2016.01-rc3 - -------------------------------------------------------------------- -Sun Dec 20 20:56:54 UTC 2015 - afaerber@suse.de - -- Suppress stripping debug info - it affects u-boot-jetson-tk1 -- Install rpi and rpi2 binaries to /boot/vc - -------------------------------------------------------------------- -Tue Dec 15 09:27:03 UTC 2015 - guillaume@opensuse.org - -- Backport U-Boot-am335x_evm-Don-t-undef-CONFIG_BOOTDELAY.patch - to fix bootdelay on Beaglebone board - -------------------------------------------------------------------- -Tue Dec 15 09:15:30 UTC 2015 - guillaume@opensuse.org - -- Add orangepi_pc board - -------------------------------------------------------------------- -Fri Dec 11 09:23:17 UTC 2015 - guillaume@opensuse.org - -- Add support to am57xx_evm (beagle_x15 with u-boot DT) - -------------------------------------------------------------------- -Fri Dec 11 09:08:25 UTC 2015 - guillaume@opensuse.org - -- Update to 2016.01-rc2: -- Rename 'beagle_x15' to 'am57xx_evm_nodt' to follow upstream -- Remove upstreamed patch: - * U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch - -------------------------------------------------------------------- -Wed Nov 25 09:38:56 UTC 2015 - guillaume@opensuse.org - -- Update to 2016.01-rc1 -- Remove upstreamed patches: - * 0001-configs-Use-config_distro_defaults.h-in-ti_armv7_com.patch - * 0001-mx6cuboxi-use-load-instead-of-fatload.patch (no more needed) - * U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch -- Update drop-marvell.patch - -------------------------------------------------------------------- -Sun Nov 15 13:11:56 UTC 2015 - matwey.kornilov@gmail.com - -- Backport 0001-configs-Use-config_distro_defaults.h-in-ti_armv7_com.patch - -------------------------------------------------------------------- -Sat Nov 14 15:03:05 UTC 2015 - tbechtold@suse.com - -- 0001-mx6cuboxi-use-load-instead-of-fatload.patch - for cubox-i use load instead of fatload - -------------------------------------------------------------------- -Tue Nov 3 08:14:57 UTC 2015 - matwey.kornilov@gmail.com - -- Fix am335x booting - * U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch - -------------------------------------------------------------------- -Wed Oct 21 08:16:32 UTC 2015 - guillaume@opensuse.org - -- Add Beagle x15 support -- Fix build for Beagle x15: - * U-Boot-1-2-usb-host-xhci-omap-fix-build-break.patch - -------------------------------------------------------------------- -Tue Oct 20 11:32:30 UTC 2015 - guillaume@opensuse.org - -- Update to 2015.10 -- Remove upstreamed patches: - * 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch - * 0002-odroid-Add-boot-script-boot.scr-support.patch - -------------------------------------------------------------------- -Tue Oct 13 06:58:38 UTC 2015 - guillaume@opensuse.org - -- Update to 2015.10-rc5 -- Remove upstreamed patch: - * arndale-apply-cortex-a15-erratas.patch - -------------------------------------------------------------------- -Thu Oct 8 09:27:15 UTC 2015 - guillaume@opensuse.org - -- Add boot script support to odroid board: - * 0001-odroid-replace-fatload-with-load-to-be-able-to-use-E.patch - * 0002-odroid-Add-boot-script-boot.scr-support.patch - -------------------------------------------------------------------- -Mon Oct 5 18:04:28 UTC 2015 - afaerber@suse.de - -- Add spring and firefly-rk3288 for armv7hl - * Break overly long armv7_boards line in pre_checkin.sh - * Clean up case'ing of defconfigs to avoid excessive wildcards -- Prepare for adding qemu-ppce500 for ppc - * Allow for more than two exclusive architectures (cleanup) - -------------------------------------------------------------------- -Mon Oct 5 11:42:08 UTC 2015 - dmueller@suse.com - -- add arndale-apply-cortex-a15-erratas.patch - -------------------------------------------------------------------- -Thu Oct 1 16:41:38 UTC 2015 - guillaume.gardet@opensuse.org - -- Update to 2015.10-rc4 -- Update drop-marvell.patch - -------------------------------------------------------------------- -Sat Sep 12 12:22:53 UTC 2015 - guillaume@opensuse.org - -- Use u-boot-2015.10-rc3.tar.bz2 package provided on FTP instead of - packaging it manually. - -------------------------------------------------------------------- -Tue Sep 8 08:52:56 UTC 2015 - guillaume@opensuse.org - -- Update to 2015.10-rc3 - -------------------------------------------------------------------- -Wed Sep 2 16:28:02 UTC 2015 - guillaume@opensuse.org - -- Add odroid and odroid-xu3 - -------------------------------------------------------------------- -Tue Aug 18 08:31:48 UTC 2015 - guillaume@opensuse.org - -- Update to 2015.10-rc2 -- Remove upstreamed patch: - * jetson-tk1-gpu-1.patch - * jetson-tk1-gpu-2.patch - -------------------------------------------------------------------- -Thu Aug 6 12:40:58 UTC 2015 - guillaume@opensuse.org - -- Update to 2015.10-rc1 -- Remove upstreamed patch: - * mx53loco-bootscr.patch -- Update patches: - * jetson-tk1-gpu-1.patch - * jetson-tk1-gpu-2.patch - -------------------------------------------------------------------- -Wed Aug 5 13:36:45 UTC 2015 - dmueller@suse.com - -- add mx6cuboxi - -------------------------------------------------------------------- -Wed Jul 22 22:38:23 UTC 2015 - afaerber@suse.de - -- jetson-tk1-gpu-1.patch, - jetson-tk1-gpu-2.patch: Enable the Tegra124 GPU device tree node - -------------------------------------------------------------------- -Mon Jul 20 10:45:39 UTC 2015 - afaerber@suse.de - -- Add u-boot-jetson-tk1 - -------------------------------------------------------------------- -Fri Jul 17 06:42:37 UTC 2015 - afaerber@suse.de - -- Add u-boot-merriia80optimus - -------------------------------------------------------------------- -Wed Jul 15 13:05:24 UTC 2015 - guillaume@opensuse.org - -- Update to 2015.07 - -------------------------------------------------------------------- -Tue Jun 30 07:34:49 UTC 2015 - guillaume@opensuse.org - -- Update to 2015.07-rc3 -- Remove upstreamed patches: - * enable_spl_ext_support_for_ti_armv7.patch - * fix_slow_mmc_on_rpi.patch - -------------------------------------------------------------------- -Thu Jun 18 12:07:10 UTC 2015 - guillaume@opensuse.org - -- Add fix_slow_mmc_on_rpi.patch to speed up MMC load on RPi -- Rework patches (to be upstreamable): - * enable_spl_ext_support_for_ti_armv7.patch - * mx53loco-bootscr.patch -- Remove fix_beagle_spl_build.patch - -------------------------------------------------------------------- -Wed Jun 10 10:07:23 UTC 2015 - guillaume@opensuse.org - -- Update to 2015.07-rc2 -- Update drop-marvell.patch - -------------------------------------------------------------------- -Wed May 27 10:07:49 UTC 2015 - guillaume@opensuse.org - -- Update to 2015.07-rc1: -- Update drop-marvell.patch -- Remove no more needed add_snow_usb_boot.patch - -------------------------------------------------------------------- -Wed Apr 29 07:51:25 UTC 2015 - dmueller@suse.com - -- adjust copyright headers - -------------------------------------------------------------------- -Thu Apr 16 08:34:11 UTC 2015 - guillaume@opensuse.org - -- update to 2015.04 -- Remove upstreamed patch: - 0001-Exynos-Clock-Fix-exynos5_get_periph_rate-for-I2C.patch -- Follow upstream board rename colibri_t20_iris => colibri_t20 - -------------------------------------------------------------------- -Sun Apr 12 19:49:41 UTC 2015 - xxxxxmichl@googlemail.com - -- Added support for A13-OLinuXino, A13-OLinuXino-MICRO, - A20-OLinuXino-MICRO and A20-OLinuXino-LIME from - www.olimex.com - -------------------------------------------------------------------- -Thu Apr 9 07:56:40 UTC 2015 - guillaume@opensuse.org - -- Remove u-boot-vexpressaemv8a (dropped upstream and we now use EFI) - -------------------------------------------------------------------- -Thu Apr 2 09:13:49 UTC 2015 - guillaume@opensuse.org - -- update to 2015.04-rc5 - -------------------------------------------------------------------- -Mon Mar 23 08:39:40 UTC 2015 - guillaume@opensuse.org - -- update to 2015.04-rc4 - -------------------------------------------------------------------- -Wed Mar 4 15:51:55 UTC 2015 - guillaume@opensuse.org - -- Add 0001-Exynos-Clock-Fix-exynos5_get_periph_rate-for-I2C.patch - to fix keyboard on Chromebook - -------------------------------------------------------------------- -Wed Mar 4 15:46:52 UTC 2015 - guillaume@opensuse.org - -- update to 2015.04-rc3 -- update patch: drop-marvell.patch - -------------------------------------------------------------------- -Thu Feb 26 16:48:35 UTC 2015 - guillaume@opensuse.org - -- Update add_snow_usb_boot.patch to boot on USB2 instead of USB3 - -------------------------------------------------------------------- -Wed Feb 25 15:47:07 UTC 2015 - guillaume@opensuse.org - -- Remove unneeded fix_snow_config.patch - -------------------------------------------------------------------- -Tue Feb 24 09:48:50 UTC 2015 - guillaume@opensuse.org - -- Add rpi2 armv7 board - -------------------------------------------------------------------- -Fri Feb 20 12:31:38 UTC 2015 - guillaume@opensuse.org - -- Update to 2015.04-rc2 - -------------------------------------------------------------------- -Fri Feb 20 10:04:14 UTC 2015 - guillaume@opensuse.org - -- Update to 2015.04-rc1 - * Remove upstreamed patch pcm051-bootscr.patch - * Remove no more used patch fix_bootpart_snow_only.patch (now u-boot - scan all known partitions, so no need to set a different boot partition) - -------------------------------------------------------------------- -Sun Jan 25 20:20:46 UTC 2015 - matwey.kornilov@gmail.com - -- Enable pcm051rev3 for Phytec Wega board - * Add pcm051-bootscr.patch: add bootscript support (upstreamed in 2015.04-rc1) - -------------------------------------------------------------------- -Tue Jan 13 14:32:17 UTC 2015 - guillaume@opensuse.org - -- Update to 2015.01: - * Drop upstreamed patches: - - 0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch - - fix_sata.patch - * Update partially upstreamed mx53loco-bootscr.patch - -------------------------------------------------------------------- -Tue Dec 16 11:10:23 UTC 2014 - guillaume@opensuse.org - -- Backport SPL MMC raw boot mode fix: - * 0001-spl-mmc-Fix-raw-boot-mode-related-to-commit.patch - -------------------------------------------------------------------- -Sat Dec 13 12:12:41 UTC 2014 - xxxxxmichl@googlemail.com - -- Added support for A20-OLinuXIno-LIME2 and A10-OLinuXino-LIME from - www.olimex.com - -------------------------------------------------------------------- -Tue Dec 9 11:23:41 UTC 2014 - guillaume@opensuse.org - -- Rename XLOADER to OMAP_SPL in pre_checkin.sh and u-boot.spec.in - -------------------------------------------------------------------- -Tue Dec 9 09:15:27 UTC 2014 - guillaume@opensuse.org - -- Update to 2015.01-rc3 - * Drop upstreamed/unneeded patches: - - 0001-exynos-Enable-config_distro_defaults.h.patch - - 0002-exynos5-Use-config_distro_bootcmd.h.patch - - boot_mode_fallback.patch - - fix_snow_usb_support - - fix_spl_ext.patch - - fix_arm_hf_toolchain.patch - - origen-ext2.patch - * Update patch: - - fix_snow_config.patch - * Follow upstream: rpi_b config renamed to rpi - -------------------------------------------------------------------- -Tue Dec 2 12:41:55 UTC 2014 - guillaume@opensuse.org - -- Update snow (chromebook) - * Update patch: - - fix_snow_config.patch patch - * Add patches: - - add_snow_usb_boot.patch to be able to boot from USB0 - - fix_bootpart_snow_only.patch to boot on partition #2 (snow only!) - * Backport patches: - - fix_snow_usb_support.patch to fix USB on snow - - 0001-exynos-Enable-config_distro_defaults.h.patch - - 0002-exynos5-Use-config_distro_bootcmd.h.patch - * Drop unneeded/obsolete patches: - - fix_exynos5_text_base.patch - - fix_snow_extra_env_settings.patch - -------------------------------------------------------------------- -Sun Nov 30 13:17:33 UTC 2014 - guillaume@opensuse.org - -- Add Bananapi initial support - -------------------------------------------------------------------- -Tue Nov 25 08:29:14 UTC 2014 - guillaume@opensuse.org - -- Update to 2015.01-rc2 -- Update patch fix_omap_boot_mode.patch to be upstreamable and -rename it to boot_mode_fallback.patch -- Drop obsolete patch: arndale.patch -- Add patches: - * fix_arm_hf_toolchain.patch: fix build with hard float toolchain - * fix_spl_ext.patch: fix SPL EXT error checks - * fix_sata.patch: fix sata support and fix also mx53loco build - -------------------------------------------------------------------- -Wed Nov 19 21:44:17 CET 2014 - guillaume.gardet@opensuse.org - -- Fix mx53loco-bootscr.patch - -------------------------------------------------------------------- -Mon Nov 17 21:15:50 UTC 2014 - oscar@naiandei.net - -- Add u-boot-with-sunxi-spl.bin for sunxi boards - -------------------------------------------------------------------- -Mon Nov 17 15:17:56 UTC 2014 - guillaume@opensuse.org - -- Make use of RPM_OPT_FLAGS during make - -------------------------------------------------------------------- -Sat Nov 15 14:55:06 UTC 2014 - guillaume@opensuse.org - -- Fix sunxi boards (use u-boot.img instead of u-boot.bin) -- Remove duplicated default install line - -------------------------------------------------------------------- -Tue Nov 11 13:32:36 UTC 2014 - guillaume@opensuse.org - -- Update to 2015.01-rc1 -- Drop upstreamed patches: - * add_spl_extfs_support.patch - * ti_common_initrd_support.patch -- Refresh patch: - * drop-marvell.patch -- Drop CREDITS file from DOC (dropped upstream) - -------------------------------------------------------------------- -Mon Nov 3 10:19:42 UTC 2014 - guillaume@opensuse.org - -- Apply fix_omap_boot_mode.patch only for omap3/omap4 boards - -------------------------------------------------------------------- -Tue Oct 14 13:22:44 UTC 2014 - guillaume@opensuse.org - -- Update to version 2014.10 -- Drop upstreamed patch: - * fix_sabrelite_boot.scr.patch -- Refresh patches: - * arndale.patch - * fix_snow_config.patch - * fix_exynos5_text_base.patch - * exynos5-dt.h.patch (renamed fix_snow_extra_env_settings.patch) - -------------------------------------------------------------------- -Wed Oct 8 07:52:48 UTC 2014 - guillaume@opensuse.org - -- Update to version 2014.10-rc3 -- Drop upstreamed patches: - * beagle-bootscr.patch - * panda-bootscr.patch - * am335x_evm-bootscr.patch -- Refresh patches: - * fix_sabrelite_boot.scr.patch - * drop-marvell.patch - * add_spl_extfs_support.patch -- Add a new patch to fix omap3beagle spl build: - * fix_beagle_spl_build.patch - -------------------------------------------------------------------- -Mon Sep 8 13:06:52 UTC 2014 - guillaume@opensuse.org - -- Drop Hyundai_a7hd and cubox-i boards (now handle in Contrib repos -since it is not upstreamed), so drop related patches: - * v2014.04-sunxi.patch - * cubox-i-v2014.04-port.patch - * cubox-i-enable_raw_rd.patch - -------------------------------------------------------------------- -Wed Sep 3 12:02:22 UTC 2014 - guillaume@opensuse.org - -- Update to version 2014.10-rc2 -- drop upstreamed patch rpi_b-bootscr.patch -- drop fix_spl_build_for_am335x.patch (does build without it) -- Refresh patches: - * drop-marvell.patch - * fix_snow_config.patch - -------------------------------------------------------------------- -Thu Aug 21 08:50:10 UTC 2014 - guillaume@opensuse.org - -- Update SPL EXT fs support: - * For omap boards (beagle and panda), SPL now looks for u-boot.img - as upstream instead of u-boot.bin - * Remove mlo-ext2.patch to make proper patches in -order to ease upstreaming our EXT fs SPL functions - * Add panda-bootscr.patch to fix panda boot (was included in - mlo-ext2.patch) - * Add fix_omap_boot_mode.patch to fix beagle and panda boot mode - (was included in mlo-ext2.patch) - * Add add_spl_extfs_support.patch to get proper SPL EXT fs functions - * Add enable_spl_ext_support_for_ti_armv7.patch to enable SPL EXT fs - support for TI ARMv7 boards - - -------------------------------------------------------------------- -Tue Aug 19 17:35:22 UTC 2014 - matwey.kornilov@gmail.com - -- Update to version 2014.10-rc1 and update patches - -------------------------------------------------------------------- -Thu Jul 31 13:59:00 UTC 2014 - dimstar@opensuse.org - -- Rename rpmlintrc to %{name}-rpmlintrc. - Follow the packaging guidelines. - -------------------------------------------------------------------- -Sat Jun 14 11:58:43 UTC 2014 - afaerber@suse.de - -- add u-boot-cubietruck for Cubietruck (Cubieboard 3) - -------------------------------------------------------------------- -Thu Jun 12 18:52:26 UTC 2014 - josua.m@t-online.de - -- add u-boot-mx6cubox-i for Cubox-i and Hummingboard - * currently conflicts with mlo-ext2 patch for omap4 - so only for cubox-i target mlo-ext2.patch is skipped - and cubox-i patches are applied - * patch source: https://github.com/vorlonofportland/u-boot/ - cubox-i-v2014.04-port.patch - cubox-i-enable_raw_rd.patch - -------------------------------------------------------------------- -Tue Apr 29 13:41:18 UTC 2014 - guillaume@opensuse.org - -- Enhance pre_checkin.sh script to handle arch restrictions - -------------------------------------------------------------------- -Tue Apr 29 13:18:48 UTC 2014 - guillaume@opensuse.org - -- Fix builds : - * 'tools' target is now 'tools-only' - * kermit scripts moved from 'tools/scripts' to 'tools/kermit/' - * Enhanced pre_checkin.sh script to handle uppercases in config name - * Renamed config from cubieboard to Cubieboard - * Renamed config from cubieboard2 to Cubieboard2 - * Renamed config from hyundai_a7hd to Hyundai_A7HD - * Renamed config from mele_a1000 to Mele_A1000 - -------------------------------------------------------------------- -Tue Apr 29 13:06:57 UTC 2014 - guillaume@opensuse.org - -- Add vexpress_aemv8a board - -------------------------------------------------------------------- -Tue Apr 29 08:33:48 UTC 2014 - guillaume@opensuse.org - -- Update to v2014.04 - * Update mlo-ext2.patch - * Update mx53loco-bootscr.patch - * Update origen-ext2.patch - * Dropped v2014.01-sunxi.patch and created - v2014.04-sunxi.patch by diffing u-boot-2014.04 with - u-boot-sunxi.git d9fe0a1e061e2bde6c24a0f7cef4f5023f3bd579 - * Update rpi_b-bootscr.patch - * Drop gnuhash.patch (upstreamed) - -------------------------------------------------------------------- -Thu Mar 27 14:22:23 UTC 2014 - guillaume@opensuse.org - -- add u-boot-mx6qsabrelite (for iMX6 Sabre Lite board) - -------------------------------------------------------------------- -Wed Feb 5 15:07:30 UTC 2014 - guillaume@opensuse.org - -- add u-boot-snow (for Chromebook ARM) - -------------------------------------------------------------------- -Wed Feb 5 14:59:29 UTC 2014 - guillaume@opensuse.org - -- Fix boot.scr location for beagle and origen - -------------------------------------------------------------------- -Thu Jan 30 14:28:34 UTC 2014 - dmueller@suse.com - -- add u-boot-cubieboard2 - -------------------------------------------------------------------- -Thu Jan 30 06:46:45 UTC 2014 - afaerber@suse.de - -- Drop 0006-ARMV7-hardfp-build-fix.patch: - v2014.01 checks if -msoft-float compiles okay, and - U-Boot is soft-float according to Tom Rini - -------------------------------------------------------------------- -Tue Jan 28 15:29:14 UTC 2014 - guillaume@opensuse.org - -- Disable CONFIG_SPL_OS_BOOT for ti armv7 configs with -fix_spl_build_for_am335x.patch to reduce size of am335x SPL - -------------------------------------------------------------------- -Sat Jan 26 22:46:44 UTC 2014 - afaerber@suse.de - -- Update to v2014.01 -* Manually updated 0006-ARMV7-hardfp-build-fix.patch -* Dropped v2013.10-sunxi.patch and created - v2014.01-sunxi.patch by merging u-boot.git v2014.01 onto - u-boot-sunxi.git e4a0232e173577893604b94fc3af7c047570970b -* Added gnuhash.patch to fix .gnu.hash section handling in ldscripts -* Rebased mlo-ext2.patch: - omap4_common.h CONFIG_SUPPORT_RAW_INITRD hunk is now covered by - ti_common_initrd_support.patch. - am335xevm build is known breaking due to size constraints not - trivially solvable without dropping our patch. - -------------------------------------------------------------------- -Sun Jan 26 12:14:10 UTC 2014 - afaerber@suse.de - -- Fix regression in packaging u-boot-dtb-tegra.bin: - There is in fact a u-boot-spl.bin SPL being built, - but it is 0xff-padded as u-boot-spl-pad.bin and then - prepended to u-boot.bin and the .dtb. - u-boot-dtb.bin exists independently as just u-boot.bin and .dtb, - so give preference to u-boot-dtb-tegra.bin over u-boot-dtb.bin. - -------------------------------------------------------------------- -Mon Jan 20 14:05:13 UTC 2014 - agraf@suse.com - -- The "Tegra SPL" is not an SPL but a differently named u-boot.bin - file. Fix up the generation scripts. - -------------------------------------------------------------------- -Sun Jan 19 00:09:41 UTC 2014 - afaerber@suse.de - -- Include Tegra SPL for Colibri T20 - -------------------------------------------------------------------- -Wed Jan 8 17:26:10 UTC 2014 - agraf@suse.com - -- switch raspberry to ext2 - -------------------------------------------------------------------- -Wed Jan 8 13:41:32 UTC 2014 - matwey.kornilov@gmail.com - -- am335x_evm-bootscr.patch: Search for files in /boot, not in /boot/boot - -------------------------------------------------------------------- -Wed Jan 8 02:07:44 UTC 2014 - afaerber@suse.de - -- rpi_b-bootscr.patch: Change rpi_b to use boot.scr - -------------------------------------------------------------------- -Tue Jan 7 16:01:13 UTC 2014 - dmueller@suse.com - -- remove origin flavor - -------------------------------------------------------------------- -Mon Jan 6 22:57:05 UTC 2014 - afaerber@suse.de - -- Enable paz00 config (Toshiba AC100) - -------------------------------------------------------------------- -Mon Jan 6 21:34:03 UTC 2014 - afaerber@suse.de - -- Enable colibri_t20_iris config (Toradex Colibri-T20 on Iris) -- Update u-boot.spec.in copyright and fix typo in comment - -------------------------------------------------------------------- -Sat Jan 4 01:47:50 UTC 2014 - agraf@suse.com - -- prefer u-boot-dtb.bin over u-boot.bin -- simplify files section - -------------------------------------------------------------------- -Fri Jan 3 16:54:30 UTC 2014 - dmueller@suse.com - -- mlo-ext2.patch: Search for files in /boot, not in /boot/boot - -------------------------------------------------------------------- -Mon Dec 30 18:37:50 UTC 2013 - matwey.kornilov@gmail.com - -- Add am335x_evm-bootscr.patch: Add bootscr to AM335x - platform based devices - -------------------------------------------------------------------- -Tue Dec 17 14:33:52 UTC 2013 - guillaume@opensuse.org - -- Remove old unused patches: - * v2013.04-sunxi.patch - * loadaddr-defaults.patch - -------------------------------------------------------------------- -Tue Dec 17 14:10:51 UTC 2013 - guillaume@opensuse.org - -- Add ti_common_initrd_support.patch to enable initrd support for - AM335x boards - -------------------------------------------------------------------- -Tue Dec 17 14:03:50 UTC 2013 - guillaume@opensuse.org - -- Add am335x_evm support which includes: Beagle Bone, - Beagle Bone Black, TI AM335x EVM, TI AM335x EVM-SK - -------------------------------------------------------------------- -Tue Nov 26 13:46:22 UTC 2013 - guillaume@opensuse.org - -- Add Arndale support - -------------------------------------------------------------------- -Tue Nov 26 13:05:10 UTC 2013 - guillaume@opensuse.org - -- Update v2013.04-sunxi.patch to v2013.10-sunxi.patch - -------------------------------------------------------------------- -Mon Nov 25 10:05:48 UTC 2013 - guillaume@opensuse.org - -- Remove kerneladdr and ramdiskaddr definition in u-boot patches - (now done in JeOS image with u-boot hooks) -- Update patches to current version: - * 0006-ARMV7-hardfp-build-fix.patch - * beagle-bootscr.patch - * mx53loco-bootscr.patch - * mlo-ext2.patch -- Merge fix_omap4_ext2_boot.patch in mlo-ext2.patch -- Rename exynos-ext2.patch in origen-ext2.patch - -------------------------------------------------------------------- -Mon Nov 25 09:57:12 UTC 2013 - guillaume@opensuse.org - -- Update to 2013.10 - -------------------------------------------------------------------- -Fri Nov 22 16:25:36 UTC 2013 - guillaume@opensuse.org - -- Fix OMAP4 pandaboard EXT2 boot - -------------------------------------------------------------------- -Fri Sep 13 11:31:14 UTC 2013 - guillaume@opensuse.org - -- Fix u-boot.bin and boot.scr place since they are now in boot/ folder. - -------------------------------------------------------------------- -Wed May 1 20:48:30 UTC 2013 - dmueller@suse.com - -- add support for cubieboard, hyundaia7hd, melea1000 - -------------------------------------------------------------------- -Wed May 1 08:18:26 UTC 2013 - dmueller@suse.com - -- update to 2013.04 - * no upstream changelog available -- remove dead u-boot-raspberrypi* (actually called rpib now) -- add rpib variant - -------------------------------------------------------------------- -Thu Apr 11 17:05:58 UTC 2013 - guillaume.gardet@opensuse.org - -- add omap3_beagle to targets - -------------------------------------------------------------------- -Thu Apr 11 16:05:41 UTC 2013 - dmueller@suse.com - -- remove u8500href subpackage, kernel got dropped - -------------------------------------------------------------------- -Sun Apr 7 14:32:20 UTC 2013 - agraf@suse.com - -- update to 2013.04rc2 -- enable bootz support on all boards - -------------------------------------------------------------------- -Wed Mar 20 07:21:06 UTC 2013 - agraf@suse.com - -- fix mlo-ext2.patch to actually use the ext4 infrastructure - -------------------------------------------------------------------- -Sat Jan 26 10:38:07 UTC 2013 - dmueller@suse.com - -- update mlo-ext2.patch: - * use the ext4 driver now since ext2 got removed - -------------------------------------------------------------------- -Wed Oct 24 22:33:13 UTC 2012 - agraf@suse.com - -- add sdhc-1.patch, sdhc-2.patch, sdhc-3.patch: - * backport upstream sdhc fixes - -------------------------------------------------------------------- -Wed Oct 24 01:37:36 CEST 2012 - agraf@suse.de - -- update to 2012.10: - - refresh patches 0006-ARMV7-hardfp-build-fix.patch, mlo-ext2.patch, - loadaddr-defaults.patch, mx53loco-bootscr.patch - -------------------------------------------------------------------- -Mon Oct 22 12:00:22 UTC 2012 - agraf@suse.com - -- fix origen by putting the ramdisk higher - -------------------------------------------------------------------- -Mon Aug 6 09:39:54 UTC 2012 - dmueller@suse.com - -- remove Marvell sources as they are non-free licensed (bnc#773824) - -------------------------------------------------------------------- -Thu Jul 26 18:21:44 UTC 2012 - agraf@suse.com - -- fix ext2 support for origen -- add origen-spl.bin for origen - -------------------------------------------------------------------- -Thu Jul 26 09:47:31 UTC 2012 - dmueller@suse.com - -- merge u-boot-tools - -------------------------------------------------------------------- -Wed Jul 25 21:05:08 UTC 2012 - agraf@suse.com - -- add ext2 support by default in mx53loco - -------------------------------------------------------------------- -Tue Jul 24 21:28:59 UTC 2012 - agraf@suse.com - -- add support for mx53loco - -------------------------------------------------------------------- -Tue Jul 24 11:25:42 UTC 2012 - dmueller@suse.com - -- remove u-boot-omap3beagle - -------------------------------------------------------------------- -Mon Jul 23 22:34:04 UTC 2012 - agraf@suse.com - -- bump to 2012.04.01 - - fixes bug in cmdline parsing - -------------------------------------------------------------------- -Mon Jul 23 22:26:47 UTC 2012 - agraf@suse.com - -- add calxeda highbank support - -------------------------------------------------------------------- -Thu Jul 12 12:51:56 UTC 2012 - agraf@suse.com - -- autoload boot.scr on beagle, so we can boot again - -------------------------------------------------------------------- -Thu Jul 12 08:12:15 UTC 2012 - agraf@suse.com - -- update to upstream u-boot 2012.04 - -> gets rid of linaro fork, only mainline now - -> gets us omap3 MLO support, no more need for x-loader - -> potentially fixes voltage issues on omap4 - -------------------------------------------------------------------- -Thu Jun 14 09:04:53 UTC 2012 - adrian@suse.de - -- add SUSE style conflicts to avoid installation of multiple - boot loaders - -------------------------------------------------------------------- -Tue Apr 17 11:59:55 UTC 2012 - joop.boonen@opensuse.org - -- Included u-boot.spec.in and gen_spec.sh in the spec file - -------------------------------------------------------------------- -Mon Feb 6 13:25:09 UTC 2012 - agraf@suse.com - -- use ext2 on panda - -------------------------------------------------------------------- -Tue Dec 20 02:36:05 UTC 2011 - agraf@suse.com - -- use ttyO2 as default console= on OMAP boards - -------------------------------------------------------------------- -Mon Dec 19 20:21:21 UTC 2011 - agraf@suse.com - -- add u8500_href and origen configs - -------------------------------------------------------------------- -Fri Dec 16 16:03:01 UTC 2011 - agraf@suse.com - -- fix lint failures - -------------------------------------------------------------------- -Fri Dec 16 14:46:53 CET 2011 - agraf@suse.com - -- don't install map - -------------------------------------------------------------------- -Fri Dec 16 02:16:19 UTC 2011 - agraf@suse.com - -- generalize spec file to be able to build for more boards -- add beagle board spec file -- remove boot.scr - -------------------------------------------------------------------- -Fri Dec 16 01:15:47 UTC 2011 - agraf@suse.com - -- rename to u-boot-omap4panda - -------------------------------------------------------------------- -Tue Dec 13 17:24:45 UTC 2011 - dkukawka@suse.de - -- new package based on u-boot-omap4panda but use linaro u-boot git - repo (http://git.linaro.org/git/boot/u-boot-linaro-stable.git) - instead of mainline u-boot. This package also contains the MLO - (this package obsoletes the x-loader package) - -------------------------------------------------------------------- -Tue Nov 29 22:53:44 UTC 2011 - joop.boonen@opensuse.org - -- COPYING CREDITS README are now in the standard package - -------------------------------------------------------------------- -Thu Nov 24 21:08:58 UTC 2011 - joop.boonen@opensuse.org - -- Corrected the links - -------------------------------------------------------------------- -Tue Nov 22 17:47:17 UTC 2011 - joop.boonen@opensuse.org - -- Build without u-boot tools as we have a u-boot-tools packages - -------------------------------------------------------------------- -Sun Nov 20 17:00:43 UTC 2011 - joop.boonen@opensuse.org - -- Cleaned the spec file up the spec file -- The name is the same as the package name - -------------------------------------------------------------------- -Sun Nov 13 13:13:39 UTC 2011 - joop.boonen@opensuse.org - -- Build u-boot according to http://elinux.org/Panda_How_to_MLO_&_u-boot -- Using .txt config file instead of .scr it's gerated via mkimage - -------------------------------------------------------------------- -Wed Nov 09 22:55:09 UTC 2011 - joop.boonen@opensuse.org - -- Used scr file based on http://elinux.org definition -- Build u-boot 20111109 -- Used the Meego panda u-boot as a base - -------------------------------------------------------------------- -Fri Feb 18 00:00:00 UTC 2011 - raghuveer.murthy@ti.com> -- 2010.09-MeeGo -- Fix for u-boot fails to compile on armv7hl, BMC#13140 - -------------------------------------------------------------------- -Thu Nov 18 00:00:00 UTC 2010 - peter.j.zhu@intel.com> -- 2010.09-MeeGo -- Don't build against i586, BMC#10159 - -------------------------------------------------------------------- -Tue Oct 10 00:00:00 UTC 2010 - nm@ti.com> -- 2010.09.rc1-MeeGo -- Added option to enable boot.scr generation and copy - -------------------------------------------------------------------- -Mon Oct 04 00:00:00 UTC 2010 - nm@ti.com> -- 2010.09.rc1-MeeGo -- Update to 2010.09 - -------------------------------------------------------------------- -Wed Sep 14 00:00:00 UTC 2010 - nm@ti.com> -- 2010.09.rc1-MeeGo -- Update to 2010.09.rc1 -- MeeGo customization -- Enabled PandaBoard, Beagleboard build - -------------------------------------------------------------------- -Wed Mar 31 00:00:00 UTC 2010 - silvan.calarco@mambasoft.it> -- 2009.11.1-1mamba -- update to 2009.11.1 - -------------------------------------------------------------------- -Wed Mar 31 00:00:00 UTC 2010 - diff --git a/u-boot-rpi332b.spec b/u-boot-rpi332b.spec deleted file mode 100644 index 54253ec..0000000 --- a/u-boot-rpi332b.spec +++ /dev/null @@ -1,238 +0,0 @@ -# -# spec file for package u-boot-rpi332b -# -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2010 Texas Instruments Inc by Nishanth Menon -# Copyright (c) 2007-2010 by Silvan Calarco -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -%bcond_with uboot_atf_pine64 - -%define mvebu_spl 0 -%define x_loader 0 -%define rockchip_spl 0 -%define sunxi_spl 0 -%define arndale_spl 0 -%define origen_spl 0 -%define imx6_spl 0 -%define socfpga_spl 0 - -%if "rpi332b" == "rpi" || "rpi332b" == "rpi2" || "rpi332b" == "rpi332b" || "rpi332b" == "rpi3" -%define is_rpi 1 -%endif - -# archive_version differs from version for RC version only -%define archive_version 2018.05 - -Name: u-boot-rpi332b -Version: 2018.05 -Release: 0 -Summary: The U-Boot firmware for the rpi332b platform -License: GPL-2.0-only -Group: System/Boot -Url: http://www.denx.de/wiki/U-Boot -Source: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2 -Source1: ftp://ftp.denx.de/pub/u-boot/u-boot-%{archive_version}.tar.bz2.sig -Source2: arndale-bl1.img -Source3: update_git.sh -Source300: u-boot-rpmlintrc -Patch0001: 0001-XXX-openSUSE-XXX-Load-dtb-from-part.patch -Patch0002: 0002-Revert-Revert-omap3-Use-raw-SPL-by-.patch -Patch0003: 0003-rpi-Use-firmware-provided-device-tr.patch -Patch0004: 0004-Temp-workaround-for-Chromebook-snow.patch -Patch0005: 0005-zynqmp-Add-generic-target.patch -Patch0006: 0006-tools-zynqmpimage-Add-partition-rea.patch -Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch -Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch -Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch -Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} -BuildRequires: arm-trusted-firmware-pine64 -%endif -BuildRequires: bc -# Arndale board needs DTC >= 1.4 -BuildRequires: dtc >= 1.4.0 -# u-boot-clearfog (tools/kwbimage.c) needs openssl to build -BuildRequires: libopenssl-devel -BuildRequires: python-devel -BuildRequires: swig -%if "%{name}" == "u-boot-qemu-ppce500" -# Owns /usr/share/qemu directory -BuildRequires: qemu -Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 -%endif -%if "%{name}" == "u-boot-zynqmp" -BuildRequires: zynqmp-dts -%endif -%if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware -# For mountpoint -Requires(post): util-linux -%endif -Provides: u-boot-loader -Conflicts: otherproviders(u-boot-loader) -%if %x_loader == 1 -Obsoletes: x-loader-rpi332b -Provides: x-loader-rpi332b -%endif -ExclusiveArch: armv7l armv7hl - -%description -Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. -This package contains the firmware for the rpi332b platform. - -%package doc -Summary: Documentation for the U-Boot Firmware -Group: Documentation/Other - -%description doc -Das U-Boot (or just "U-Boot" for short) is Open Source Firmware for Embedded PowerPC, ARM, MIPS and x86 processors. -This package contains documentation for U-Boot firmware. - -%prep -%setup -q -n u-boot-%{archive_version} -%patch0001 -p1 -%patch0002 -p1 -%patch0003 -p1 -%patch0004 -p1 -%patch0005 -p1 -%patch0006 -p1 -%patch0007 -p1 -%patch0008 -p1 -%patch0009 -p1 -%patch0010 -p1 - -%build -export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) -%if "%{name}" == "u-boot-pine64plus" -export BL31=/boot/bl31.bin -%endif - -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" rpi_3_32b_defconfig -echo "Attempting to enable fdt apply command (.dtbo) support." -echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes - -%ifarch aarch64 -%if %sunxi_spl == 1 -cat spl/sunxi-spl.bin u-boot.itb > u-boot-sunxi-with-spl.bin -%endif -%endif - -%if "%{name}" == "u-boot-snow" || "%{name}" == "u-boot-spring" -# Chromebook ARM (snow) and HP Chromebook 11 (spring) need a uImage format -export TEXT_START=$(awk '$NF == "_start" { printf "0x"$1 }' System.map) -./tools/mkimage -A arm -O linux -T kernel -C none -a $TEXT_START -e $TEXT_START -n uboot -d u-boot-dtb.bin u-boot.img -%endif - -%if %rockchip_spl == 1 -for t in ; do - ./tools/mkimage -n -d spl/u-boot-spl.bin -T $t u-boot-spl.$t -done -%endif - -%install -export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) -export NO_BRP_STRIP_DEBUG=true -export NO_DEBUGINFO_STRIP_DEBUG=true -%define uboot_dir /boot -%if 0%{?is_rpi} -%define uboot_dir /boot/vc -%endif -%if "%{name}" == "u-boot-qemu-ppce500" -%define uboot_dir %{_datadir}/qemu -%endif -%if "%{name}" == "u-boot-jetson-tk1" -# tegra-uboot-flasher needs several intermediate files, under their original name. -for f in u-boot u-boot.dtb u-boot-dtb-tegra.bin u-boot-nodtb-tegra.bin spl/u-boot-spl; do - install -D -m 0644 $f %{buildroot}%{uboot_dir}/$f -done -%else -%if "%{name}" == "u-boot-p2371-2180" -# Jetson TX1 Driver Pack flash.sh needs several intermediate files, under their original name. -for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do - install -D -m 0644 $f %{buildroot}%{uboot_dir}/$f -done -%else -install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin -%if "%{name}" == "u-boot-qemu-ppce500" -mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 -%endif -%endif -%endif -%if %x_loader == 1 -install -D -m 0644 MLO %{buildroot}%{uboot_dir}/MLO -%endif -%if %origen_spl == 1 -install -D -m 0644 spl/origen-spl.bin %{buildroot}%{uboot_dir}/origen-spl.bin -%endif -%if %arndale_spl == 1 -install -D -m 0644 spl/arndale-spl.bin %{buildroot}%{uboot_dir}/arndale-spl.bin -install -D -m 0644 %{SOURCE2} %{buildroot}%{uboot_dir}/arndale-bl1.img -%endif -%if %mvebu_spl == 1 -install -D -m 0644 u-boot-spl.kwb %{buildroot}%{uboot_dir}/u-boot-spl.kwb -%endif -%if %rockchip_spl == 1 -install -D -m 0644 spl/u-boot-spl.bin %{buildroot}%{uboot_dir}/u-boot-spl.bin -for t in ; do - install -D -m 0644 u-boot-spl.$t %{buildroot}%{uboot_dir}/u-boot-spl.$t -done -%endif -%if %sunxi_spl == 1 -install -D -m 0644 spl/sunxi-spl.bin %{buildroot}%{uboot_dir}/sunxi-spl.bin -install -D -m 0644 u-boot-sunxi-with-spl.bin %{buildroot}%{uboot_dir}/u-boot-sunxi-with-spl.bin -%endif -%if %imx6_spl == 1 -install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin -%endif -%if %socfpga_spl == 1 -install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp -%endif - -%if 0%{?is_rpi} -%post -# On the Raspberry Pi we chain-load u-boot.bin from bootcode.bin via config.txt. -# It needs to be on the first FAT partition, wherever we mounted it. -# a) Unmounted, then do nothing. -# b) Mounted as /boot/vc, then they're in the right place already. -# c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. -# d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. -if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ -fi -%endif - -%files -%defattr(-,root,root) -%{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README - -%files doc -%defattr(-,root,root) -# Generic documents -%doc doc/README.JFFS2 doc/README.JFFS2_NAND doc/README.commands -%doc doc/README.autoboot doc/README.commands doc/README.console doc/README.dns -%doc doc/README.hwconfig doc/README.nand doc/README.NetConsole doc/README.serial_multi -%doc doc/README.SNTP doc/README.standalone doc/README.update doc/README.usb -%doc doc/README.video doc/README.VLAN doc/README.silent doc/README.POST -# Copy some useful kermit scripts as well -%doc tools/kermit/dot.kermrc tools/kermit/flash_param tools/kermit/send_cmd tools/kermit/send_image -# Now any h/w dependent Documentation -%doc doc/README.ARM-memory-map - -%changelog diff --git a/u-boot-sinovoipbpim2plus.changes b/u-boot-sinovoipbpim2plus.changes index ddde400..b1e7f59 100644 --- a/u-boot-sinovoipbpim2plus.changes +++ b/u-boot-sinovoipbpim2plus.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-sinovoipbpim2plus.spec b/u-boot-sinovoipbpim2plus.spec index 5460550..65e9f86 100644 --- a/u-boot-sinovoipbpim2plus.spec +++ b/u-boot-sinovoipbpim2plus.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "sinovoipbpim2plus" == "rpi" || "sinovoipbpim2plus" == "rpi2" || "sinovoipbpim2plus" == "rpi332b" || "sinovoipbpim2plus" == "rpi3" +%if "sinovoipbpim2plus" == "rpi" || "sinovoipbpim2plus" == "rpi2" || "sinovoipbpim2plus" == "rpi3" %define is_rpi 1 %endif +%if "sinovoipbpim2plus" == "evb-rk3399" || "sinovoipbpim2plus" == "firefly-rk3399" || "sinovoipbpim2plus" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" Sinovoip_BPI_M2_Plus_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-snow.changes b/u-boot-snow.changes index ddde400..b1e7f59 100644 --- a/u-boot-snow.changes +++ b/u-boot-snow.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-snow.spec b/u-boot-snow.spec index d9de2dd..d40648a 100644 --- a/u-boot-snow.spec +++ b/u-boot-snow.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "snow" == "rpi" || "snow" == "rpi2" || "snow" == "rpi332b" || "snow" == "rpi3" +%if "snow" == "rpi" || "snow" == "rpi2" || "snow" == "rpi3" %define is_rpi 1 %endif +%if "snow" == "evb-rk3399" || "snow" == "firefly-rk3399" || "snow" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" snow_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-socfpgade0nanosoc.changes b/u-boot-socfpgade0nanosoc.changes index ddde400..b1e7f59 100644 --- a/u-boot-socfpgade0nanosoc.changes +++ b/u-boot-socfpgade0nanosoc.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-socfpgade0nanosoc.spec b/u-boot-socfpgade0nanosoc.spec index 87175fc..7ffcc84 100644 --- a/u-boot-socfpgade0nanosoc.spec +++ b/u-boot-socfpgade0nanosoc.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 1 -%if "socfpgade0nanosoc" == "rpi" || "socfpgade0nanosoc" == "rpi2" || "socfpgade0nanosoc" == "rpi332b" || "socfpgade0nanosoc" == "rpi3" +%if "socfpgade0nanosoc" == "rpi" || "socfpgade0nanosoc" == "rpi2" || "socfpgade0nanosoc" == "rpi3" %define is_rpi 1 %endif +%if "socfpgade0nanosoc" == "evb-rk3399" || "socfpgade0nanosoc" == "firefly-rk3399" || "socfpgade0nanosoc" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" socfpga_de0_nano_soc_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-spring.changes b/u-boot-spring.changes index ddde400..b1e7f59 100644 --- a/u-boot-spring.changes +++ b/u-boot-spring.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-spring.spec b/u-boot-spring.spec index d0b8a2d..01d16ba 100644 --- a/u-boot-spring.spec +++ b/u-boot-spring.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "spring" == "rpi" || "spring" == "rpi2" || "spring" == "rpi332b" || "spring" == "rpi3" +%if "spring" == "rpi" || "spring" == "rpi2" || "spring" == "rpi3" %define is_rpi 1 %endif +%if "spring" == "evb-rk3399" || "spring" == "firefly-rk3399" || "spring" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" spring_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-tinker-rk3288.changes b/u-boot-tinker-rk3288.changes index ddde400..b1e7f59 100644 --- a/u-boot-tinker-rk3288.changes +++ b/u-boot-tinker-rk3288.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-tinker-rk3288.spec b/u-boot-tinker-rk3288.spec index d3d59f6..876ecdf 100644 --- a/u-boot-tinker-rk3288.spec +++ b/u-boot-tinker-rk3288.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "tinker-rk3288" == "rpi" || "tinker-rk3288" == "rpi2" || "tinker-rk3288" == "rpi332b" || "tinker-rk3288" == "rpi3" +%if "tinker-rk3288" == "rpi" || "tinker-rk3288" == "rpi2" || "tinker-rk3288" == "rpi3" %define is_rpi 1 %endif +%if "tinker-rk3288" == "evb-rk3399" || "tinker-rk3288" == "firefly-rk3399" || "tinker-rk3288" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" tinker-rk3288_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.bin %{buildroot}%{uboot_dir}/u-boot.bin +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.bin %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.bin /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.bin /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-turrisomnia.changes b/u-boot-turrisomnia.changes index ddde400..b1e7f59 100644 --- a/u-boot-turrisomnia.changes +++ b/u-boot-turrisomnia.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-turrisomnia.spec b/u-boot-turrisomnia.spec index 6b019d0..8fba8f7 100644 --- a/u-boot-turrisomnia.spec +++ b/u-boot-turrisomnia.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 1 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "turrisomnia" == "rpi" || "turrisomnia" == "rpi2" || "turrisomnia" == "rpi332b" || "turrisomnia" == "rpi3" +%if "turrisomnia" == "rpi" || "turrisomnia" == "rpi2" || "turrisomnia" == "rpi3" %define is_rpi 1 %endif +%if "turrisomnia" == "evb-rk3399" || "turrisomnia" == "firefly-rk3399" || "turrisomnia" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" turris_omnia_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-udoo.changes b/u-boot-udoo.changes index ddde400..b1e7f59 100644 --- a/u-boot-udoo.changes +++ b/u-boot-udoo.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-udoo.spec b/u-boot-udoo.spec index a24d111..8d5d88e 100644 --- a/u-boot-udoo.spec +++ b/u-boot-udoo.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 1 %define socfpga_spl 0 -%if "udoo" == "rpi" || "udoo" == "rpi2" || "udoo" == "rpi332b" || "udoo" == "rpi3" +%if "udoo" == "rpi" || "udoo" == "rpi2" || "udoo" == "rpi3" %define is_rpi 1 %endif +%if "udoo" == "evb-rk3399" || "udoo" == "firefly-rk3399" || "udoo" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" udoo_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-udooneo.changes b/u-boot-udooneo.changes index ddde400..b1e7f59 100644 --- a/u-boot-udooneo.changes +++ b/u-boot-udooneo.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-udooneo.spec b/u-boot-udooneo.spec index 3253d16..f69d592 100644 --- a/u-boot-udooneo.spec +++ b/u-boot-udooneo.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 1 %define socfpga_spl 0 -%if "udooneo" == "rpi" || "udooneo" == "rpi2" || "udooneo" == "rpi332b" || "udooneo" == "rpi3" +%if "udooneo" == "rpi" || "udooneo" == "rpi2" || "udooneo" == "rpi3" %define is_rpi 1 %endif +%if "udooneo" == "evb-rk3399" || "udooneo" == "firefly-rk3399" || "udooneo" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" udoo_neo_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.img %{buildroot}%{uboot_dir}/u-boot.img +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.img %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.img /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.img /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-xilinxzynqmpgeneric.changes b/u-boot-xilinxzynqmpgeneric.changes index ddde400..b1e7f59 100644 --- a/u-boot-xilinxzynqmpgeneric.changes +++ b/u-boot-xilinxzynqmpgeneric.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-xilinxzynqmpgeneric.spec b/u-boot-xilinxzynqmpgeneric.spec index 1acc508..d2698e7 100644 --- a/u-boot-xilinxzynqmpgeneric.spec +++ b/u-boot-xilinxzynqmpgeneric.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "xilinxzynqmpgeneric" == "rpi" || "xilinxzynqmpgeneric" == "rpi2" || "xilinxzynqmpgeneric" == "rpi332b" || "xilinxzynqmpgeneric" == "rpi3" +%if "xilinxzynqmpgeneric" == "rpi" || "xilinxzynqmpgeneric" == "rpi2" || "xilinxzynqmpgeneric" == "rpi3" %define is_rpi 1 %endif +%if "xilinxzynqmpgeneric" == "evb-rk3399" || "xilinxzynqmpgeneric" == "firefly-rk3399" || "xilinxzynqmpgeneric" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" xilinx_zynqmp_generic_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.elf %{buildroot}%{uboot_dir}/u-boot.elf +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.elf %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.elf /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.elf /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot-xilinxzynqmpzcu102rev10.changes b/u-boot-xilinxzynqmpzcu102rev10.changes index ddde400..b1e7f59 100644 --- a/u-boot-xilinxzynqmpzcu102rev10.changes +++ b/u-boot-xilinxzynqmpzcu102rev10.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot-xilinxzynqmpzcu102rev10.spec b/u-boot-xilinxzynqmpzcu102rev10.spec index 243956d..ce9e5ce 100644 --- a/u-boot-xilinxzynqmpzcu102rev10.spec +++ b/u-boot-xilinxzynqmpzcu102rev10.spec @@ -18,6 +18,7 @@ # +%bcond_with uboot_atf %bcond_with uboot_atf_pine64 %define mvebu_spl 0 @@ -29,9 +30,12 @@ %define imx6_spl 0 %define socfpga_spl 0 -%if "xilinxzynqmpzcu102rev10" == "rpi" || "xilinxzynqmpzcu102rev10" == "rpi2" || "xilinxzynqmpzcu102rev10" == "rpi332b" || "xilinxzynqmpzcu102rev10" == "rpi3" +%if "xilinxzynqmpzcu102rev10" == "rpi" || "xilinxzynqmpzcu102rev10" == "rpi2" || "xilinxzynqmpzcu102rev10" == "rpi3" %define is_rpi 1 %endif +%if "xilinxzynqmpzcu102rev10" == "evb-rk3399" || "xilinxzynqmpzcu102rev10" == "firefly-rk3399" || "xilinxzynqmpzcu102rev10" == "puma-rk3399" +%define is_rk3399 1 +%endif # archive_version differs from version for RC version only %define archive_version 2018.05 @@ -58,28 +62,42 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if "%{name}" == "u-boot-pine64plus" && %{with uboot_atf_pine64} BuildRequires: arm-trusted-firmware-pine64 %endif +%if 0%{?is_rk3399} && %{with uboot_atf} +BuildRequires: arm-trusted-firmware-rk3399 +%endif BuildRequires: bc # Arndale board needs DTC >= 1.4 BuildRequires: dtc >= 1.4.0 # u-boot-clearfog (tools/kwbimage.c) needs openssl to build BuildRequires: libopenssl-devel BuildRequires: python-devel +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +# make_fit_atf.py +BuildRequires: python-pyelftools +%endif +%endif BuildRequires: swig %if "%{name}" == "u-boot-qemu-ppce500" # Owns /usr/share/qemu directory BuildRequires: qemu Provides: qemu-ppc:%{_datadir}/qemu/u-boot.e500 %endif +%if 0%{?is_rpi} +# Owns /boot/vc directory +BuildRequires: raspberrypi-firmware +%endif %if "%{name}" == "u-boot-zynqmp" BuildRequires: zynqmp-dts %endif %if 0%{?is_rpi} -# Owns /boot/vc directory -BuildRequires: raspberrypi-firmware # For mountpoint Requires(post): util-linux %endif @@ -115,6 +133,9 @@ This package contains documentation for U-Boot firmware. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%s) @@ -122,10 +143,21 @@ export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | export BL31=/boot/bl31.bin %endif +%if %{with uboot_atf} +%if "%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399" +cp /usr/share/arm-trusted-firmware-rk3399/bl31.elf . +%endif +%endif + make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" xilinx_zynqmp_zcu102_rev1_0_defconfig echo "Attempting to enable fdt apply command (.dtbo) support." echo "CONFIG_OF_LIBFDT_OVERLAY=y" >> .config -make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes +make %{?_smp_mflags} CROSS_COMPILE= HOSTCFLAGS="$RPM_OPT_FLAGS" \ +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} + all u-boot.itb +%else + all +%endif %ifarch aarch64 %if %sunxi_spl == 1 @@ -169,6 +201,9 @@ for f in u-boot u-boot.bin u-boot.dtb u-boot-dtb.bin; do done %else install -D -m 0644 u-boot.elf %{buildroot}%{uboot_dir}/u-boot.elf +%if ("%{name}" == "u-boot-evb-rk3399" || "%{name}" == "u-boot-firefly-rk3399") && %{with uboot_atf} +install -D -m 0644 u-boot.itb %{buildroot}%{uboot_dir}/u-boot.itb +%endif %if "%{name}" == "u-boot-qemu-ppce500" mv %{buildroot}%{uboot_dir}/u-boot.elf %{buildroot}%{uboot_dir}/u-boot.e500 %endif @@ -203,6 +238,9 @@ install -D -m 0644 SPL %{buildroot}%{uboot_dir}/imx6-spl.bin %if %socfpga_spl == 1 install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl.sfp %endif +%if "%{name}" == "u-boot-rpi3" +echo -e "# Boot in AArch64 mode\narm_control=0x200" > %{buildroot}%{uboot_dir}/ubootconfig.txt +%endif %if 0%{?is_rpi} %post @@ -213,14 +251,18 @@ install -D -m 0644 u-boot-with-spl.sfp %{buildroot}%{uboot_dir}/u-boot-with-spl. # c) Mounted as /boot/efi, with /boot/vc as symlink, then nothing to be done. # d) Mounted as /boot/efi, with /boot/vc a directory, then copy files over. if mountpoint -q /boot/efi; then - [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]] || cp %{uboot_dir}/u-boot.elf /boot/efi/ + if ! [[ "$(readlink -f /boot/efi)" -ef "$(readlink -f %{uboot_dir})" ]]; then + [ -f %{uboot_dir}/ubootconfig.txt ] && cp %{uboot_dir}/ubootconfig.txt /boot/efi + cp %{uboot_dir}/u-boot.elf /boot/efi/ + fi fi %endif %files %defattr(-,root,root) +%license Licenses/gpl-2.0.txt +%doc README %{uboot_dir}/* -%doc Licenses/gpl-2.0.txt README %files doc %defattr(-,root,root) diff --git a/u-boot.changes b/u-boot.changes index ddde400..b1e7f59 100644 --- a/u-boot.changes +++ b/u-boot.changes @@ -1,8 +1,33 @@ +------------------------------------------------------------------- +Sat Jun 2 16:45:39 UTC 2018 - afaerber@suse.de + +- Adopt %license +- Drop unused USE_PRIVATE_LIBGG=yes consistently +- Tidy RK3399 u-boot.itb handling +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0013-rockchip-make_fit_atf.py-depends-on.patch + +------------------------------------------------------------------- +Mon May 28 12:24:51 UTC 2018 - yousaf.kaukab@suse.com + +- Build u-boot.itb for {evb,firefly}-rk3399 +- Patch queue updated from git://github.com/openSUSE/u-boot.git tumbleweed-2018.05 +* Patches added: + 0011-rockchip-make_fit_atf-use-elf-entry.patch + 0012-rockchip-make_fit_atf-make-python3-.patch + ------------------------------------------------------------------- Sat May 26 15:01:30 UTC 2018 - afaerber@suse.de - Add dragonboard820c +------------------------------------------------------------------- +Thu May 24 11:21:48 UTC 2018 - fvogt@suse.com + +- For RPi3 (AArch64) add a ubootconfig.txt file to set arm_control +- Remove rpi332b flavor, rpi2 works on rpi3 meanwhile + ------------------------------------------------------------------- Mon May 21 13:39:06 UTC 2018 - afaerber@suse.de diff --git a/u-boot.spec b/u-boot.spec index de390c3..1f39f90 100644 --- a/u-boot.spec +++ b/u-boot.spec @@ -40,6 +40,9 @@ Patch0007: 0007-tools-zynqmpimage-Move-defines-to-h.patch Patch0008: 0008-MAINTAINERS-Declare-tools-zynq-.-c-.patch Patch0009: 0009-tools-zynqmpimage-Add-bif-support.patch Patch0010: 0010-tools-zynqmpbif-Add-support-for-loa.patch +Patch0011: 0011-rockchip-make_fit_atf-use-elf-entry.patch +Patch0012: 0012-rockchip-make_fit_atf-make-python3-.patch +Patch0013: 0013-rockchip-make_fit_atf.py-depends-on.patch BuildRequires: libopenssl-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,12 +73,15 @@ mkimage- a tool that creates kernel bootable images for U-Boot. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0011 -p1 +%patch0012 -p1 +%patch0013 -p1 %build # needed for include/config/auto.conf make defconfig make silentoldconfig -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes tools-only +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" tools-only %install install -D -m 0755 tools/mkimage %{buildroot}%{_bindir}/mkimage @@ -83,6 +89,7 @@ install -D -m 0644 doc/mkimage.1 %{buildroot}%{_mandir}/man1/mkimage.1 %files tools %defattr(-,root,root) +%license Licenses/gpl-2.0.txt %{_bindir}/mkimage %{_mandir}/man1/mkimage.1.gz diff --git a/u-boot.spec.in b/u-boot.spec.in index 83d04d5..aa1d19c 100644 --- a/u-boot.spec.in +++ b/u-boot.spec.in @@ -57,7 +57,7 @@ PATCH_EXEC # needed for include/config/auto.conf make defconfig make silentoldconfig -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" USE_PRIVATE_LIBGG=yes tools-only +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" tools-only %install install -D -m 0755 tools/mkimage %{buildroot}%{_bindir}/mkimage @@ -65,6 +65,7 @@ install -D -m 0644 doc/mkimage.1 %{buildroot}%{_mandir}/man1/mkimage.1 %files tools %defattr(-,root,root) +%license Licenses/gpl-2.0.txt %{_bindir}/mkimage %{_mandir}/man1/mkimage.1.gz