diff mbox

[1/4] configs/altera_sockit: bump kernel to 4.7 and u-boot to v2016.11-rc3

Message ID 1484839933-17637-2-git-send-email-lucas.bajolet@savoirfairelinux.com
State Superseded
Headers show

Commit Message

Lucas Bajolet Jan. 19, 2017, 3:32 p.m. UTC
Altera SoCkit could not build anymore on recent versions of
Buildroot due to a GCC 5+ update.

This patch solves the issue by bumping the Kernel version to 4.7,
making it compatible with GCC 5+.

The bootloader is also updated to a newer version since the board
is now officially supported by Altera in their U-Boot repository.

Signed-off-by: Lucas Bajolet <lucas.bajolet@savoirfairelinux.com>
---
 configs/altera_sockit_defconfig | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

Comments

Sebastien Bourdelin Jan. 19, 2017, 4:11 p.m. UTC | #1
On 01/19/2017 10:32 AM, Lucas Bajolet wrote:
> Altera SoCkit could not build anymore on recent versions of
> Buildroot due to a GCC 5+ update.
> 
> This patch solves the issue by bumping the Kernel version to 4.7,
> making it compatible with GCC 5+.
> 
> The bootloader is also updated to a newer version since the board
> is now officially supported by Altera in their U-Boot repository.
> 
> Signed-off-by: Lucas Bajolet <lucas.bajolet@savoirfairelinux.com>
> ---
>  configs/altera_sockit_defconfig | 19 ++++++++-----------
>  1 file changed, 8 insertions(+), 11 deletions(-)
> 
> diff --git a/configs/altera_sockit_defconfig b/configs/altera_sockit_defconfig
> index 0addbde..1c9a499 100644
> --- a/configs/altera_sockit_defconfig
> +++ b/configs/altera_sockit_defconfig
> @@ -6,32 +6,29 @@ BR2_ARM_ENABLE_NEON=y
>  BR2_ARM_FPU_NEON=y
>  BR2_ARM_INSTRUCTIONS_THUMB2=y
>  
> -# Linux headers same as kernel, a 3.13 series
> -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
> +# Linux headers same as kernel, a 4.7 series
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y
>  
> -BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600=y
>  BR2_ROOTFS_POST_IMAGE_SCRIPT="board/altera/post-image.sh"
>  BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)"
>  
>  BR2_LINUX_KERNEL=y
>  BR2_LINUX_KERNEL_CUSTOM_GIT=y
> -BR2_LINUX_KERNEL_CUSTOM_REPO_URL="http://git.rocketboards.org/linux-socfpga.git"
> -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-3.13_14.02.02"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/altera-opensource/linux-socfpga.git"
> +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-4.7_16.10.02_pr"
>  BR2_LINUX_KERNEL_DEFCONFIG="socfpga"
> -BR2_LINUX_KERNEL_UIMAGE=y
> -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
>  BR2_LINUX_KERNEL_DTS_SUPPORT=y
>  BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_sockit"
>  
>  BR2_TARGET_ROOTFS_EXT2=y
> -BR2_TARGET_ROOTFS_EXT2_3=y
>  
>  BR2_TARGET_UBOOT=y
> -BR2_TARGET_UBOOT_BOARDNAME="socfpga_cyclone5"
> +BR2_TARGET_UBOOT_BOARDNAME="socfpga_sockit"
>  BR2_TARGET_UBOOT_CUSTOM_GIT=y
> -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="http://git.rocketboards.org/u-boot-socfpga.git"
> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_acds13.0sp1"
>  BR2_TARGET_UBOOT_PATCH="board/altera/sockit"
> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/altera-opensource/u-boot-socfpga"
> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2016.11-rc3"
>  BR2_TARGET_UBOOT_FORMAT_IMG=y
>  BR2_TARGET_UBOOT_SPL=y
>  BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin"
> +BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC=y
> 

Reviewed-by: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
Thomas Petazzoni Jan. 20, 2017, 3:15 a.m. UTC | #2
Hello,

On Thu, 19 Jan 2017 10:32:10 -0500, Lucas Bajolet wrote:

>  BR2_TARGET_UBOOT=y
> -BR2_TARGET_UBOOT_BOARDNAME="socfpga_cyclone5"
> +BR2_TARGET_UBOOT_BOARDNAME="socfpga_sockit"
>  BR2_TARGET_UBOOT_CUSTOM_GIT=y
> -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="http://git.rocketboards.org/u-boot-socfpga.git"
> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_acds13.0sp1"
>  BR2_TARGET_UBOOT_PATCH="board/altera/sockit"
> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/altera-opensource/u-boot-socfpga"
> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2016.11-rc3"

Why do you bump to a -rc version rather than a final stable version?

Also, you only remove the existing U-Boot patch in PATCH 2/4. Which
means if I apply only PATCH 1/4, the build is broken.

Patch series should be bisectable: applying PATCH 1/4 only should work,
applying PATCH 1/4 and 2/4 only should work, applying PATCH 1/4, 2/4
and 3/4 only should work.

Could you rework your series with this in mind?

Thanks a lot!

Thomas
Peter Korsgaard Jan. 20, 2017, 3:45 p.m. UTC | #3
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > Hello,
 > On Thu, 19 Jan 2017 10:32:10 -0500, Lucas Bajolet wrote:

 >> BR2_TARGET_UBOOT=y
 >> -BR2_TARGET_UBOOT_BOARDNAME="socfpga_cyclone5"
 >> +BR2_TARGET_UBOOT_BOARDNAME="socfpga_sockit"
 >> BR2_TARGET_UBOOT_CUSTOM_GIT=y
 >> -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="http://git.rocketboards.org/u-boot-socfpga.git"
 >> -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_acds13.0sp1"
 >> BR2_TARGET_UBOOT_PATCH="board/altera/sockit"
 >> +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/altera-opensource/u-boot-socfpga"
 >> +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2016.11-rc3"

 > Why do you bump to a -rc version rather than a final stable version?

And as this v2016.11-rc3 tag is identical to the upstream v2016.11-rc3
tag, why use this u-boot-socfpga repo instead of upstream u-boot?
diff mbox

Patch

diff --git a/configs/altera_sockit_defconfig b/configs/altera_sockit_defconfig
index 0addbde..1c9a499 100644
--- a/configs/altera_sockit_defconfig
+++ b/configs/altera_sockit_defconfig
@@ -6,32 +6,29 @@  BR2_ARM_ENABLE_NEON=y
 BR2_ARM_FPU_NEON=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 
-# Linux headers same as kernel, a 3.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
+# Linux headers same as kernel, a 4.7 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y
 
-BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600=y
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/altera/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)"
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="http://git.rocketboards.org/linux-socfpga.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-3.13_14.02.02"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/altera-opensource/linux-socfpga.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-4.7_16.10.02_pr"
 BR2_LINUX_KERNEL_DEFCONFIG="socfpga"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_sockit"
 
 BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_3=y
 
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="socfpga_cyclone5"
+BR2_TARGET_UBOOT_BOARDNAME="socfpga_sockit"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="http://git.rocketboards.org/u-boot-socfpga.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_acds13.0sp1"
 BR2_TARGET_UBOOT_PATCH="board/altera/sockit"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/altera-opensource/u-boot-socfpga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2016.11-rc3"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin"
+BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC=y