Skip to content

Commit

Permalink
configs: fix kernel version for vivado 2019.1
Browse files Browse the repository at this point in the history
The toolchain reports 4.14 kernel version for headers. Though it's weird
because the kernel tag for 2019.1 has version 4.19.

Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
  • Loading branch information
commodo committed Jun 24, 2020
1 parent 75ccfd2 commit 73ee0ec
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ci/run-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ _check_defconfig_vivado() {

if [ "$vivado_ver" = "2019_1" ] ; then
gcc_ver=8
ker_ver=4_19
ker_ver=4_14
elif [ "$vivado_ver" = "2018_3" ] ; then
gcc_ver=7
ker_ver=4_14
Expand Down
2 changes: 1 addition & 1 deletion configs/microblaze_adi_rootfs_vivado_2019_1_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BR2_OPTIMIZE_FAST=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(BR2_ARCH)-xilinx-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
# BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set
BR2_TARGET_GENERIC_ROOT_PASSWD="analog"
Expand Down
2 changes: 1 addition & 1 deletion configs/microblaze_adi_vivado_2019_1_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BR2_OPTIMIZE_FAST=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(BR2_ARCH)-xilinx-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
# BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set
BR2_TARGET_GENERIC_ROOT_PASSWD="analog"
Expand Down
2 changes: 1 addition & 1 deletion configs/zynq_m2k_vivado_2019_1_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-linux-gnueabihf"
BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_TARGET_GENERIC_HOSTNAME="m2k"
Expand Down
2 changes: 1 addition & 1 deletion configs/zynq_pluto_vivado_2019_1_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-linux-gnueabihf"
BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_TARGET_GENERIC_HOSTNAME="pluto"
Expand Down
2 changes: 1 addition & 1 deletion configs/zynq_sidekiqz2_vivado_2019_1_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-linux-gnueabihf"
BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_TARGET_GENERIC_HOSTNAME="sidekiqz2"
Expand Down

0 comments on commit 73ee0ec

Please sign in to comment.