| Message ID | 20180828080059.21788-1-luca@lucaceresoli.net |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] configs/zynq_zed: uboot: bump to xilinx-v2018.2 (fixes build) | expand |
Luca, Peter, On Tue, 28 Aug 2018 10:00:57 +0200, Luca Ceresoli wrote: > Bump to the most recent Xilinx release. > > Fixes: > .../output/host/include/libfdt_env.h:71:30: error: conflicting types for ‘fdt64_t’ > .../output/host/include/libfdt_env.h:91:24: error: expected ‘)’ before ‘x’ > .../output/host/include/libfdt.h:150:21: error: redefinition of ‘fdt_offset_ptr_w’ > ...and many, many other similar errors. > > [Run-time tested] > Tested-by: Luca Ceresoli <luca@lucaceresoli.net> > Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> > --- > configs/zynq_zed_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) I am not sure we want to apply these updates to master, because we need a more general solution, and this more general solution will also fix the Zynq configurations. So I would suggest that we take those patches into next, and implemented the more general solution in master (which could very well be reverting dtc). Thanks! Thomas
Hi, On 28/08/2018 23:15, Thomas Petazzoni wrote: > Luca, Peter, > > On Tue, 28 Aug 2018 10:00:57 +0200, Luca Ceresoli wrote: >> Bump to the most recent Xilinx release. >> >> Fixes: >> .../output/host/include/libfdt_env.h:71:30: error: conflicting types for ‘fdt64_t’ >> .../output/host/include/libfdt_env.h:91:24: error: expected ‘)’ before ‘x’ >> .../output/host/include/libfdt.h:150:21: error: redefinition of ‘fdt_offset_ptr_w’ >> ...and many, many other similar errors. >> >> [Run-time tested] >> Tested-by: Luca Ceresoli <luca@lucaceresoli.net> >> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> >> --- >> configs/zynq_zed_defconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > I am not sure we want to apply these updates to master, because we need > a more general solution, and this more general solution will also fix > the Zynq configurations. > > So I would suggest that we take those patches into next, and > implemented the more general solution in master (which could very well > be reverting dtc). No problem. I had started preparing these patches when the outcome of the dtc issue was totally unclear. Since they were working I thought I'd send them anyway. I'm OK with committing them to master or next or even after 2018.08. Bye,
Hello, On Tue, 28 Aug 2018 10:00:57 +0200, Luca Ceresoli wrote: > Bump to the most recent Xilinx release. > > Fixes: > .../output/host/include/libfdt_env.h:71:30: error: conflicting types for ‘fdt64_t’ > .../output/host/include/libfdt_env.h:91:24: error: expected ‘)’ before ‘x’ > .../output/host/include/libfdt.h:150:21: error: redefinition of ‘fdt_offset_ptr_w’ > ...and many, many other similar errors. > > [Run-time tested] > Tested-by: Luca Ceresoli <luca@lucaceresoli.net> > Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> > --- > configs/zynq_zed_defconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) All applied to next. Peter is about to release 2018.08, so I didn't want to merge into master. The problem anyway affects lots of defconfigs, and Peter will document it in the CHANGES file. Best regards, Thomas
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index 676366bc5c9a..a215695b541b 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -20,7 +20,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2017.3" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2018.2" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_zed" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y