Skip to contentSkip to conversation

socrates_cyclone5_defconfig: adjust to current kernel and u-boot

PATCH New Florian La Roche 2 participants 3 messages May 7, 2018 – May 8, 2018

lore
Share & tools
lore

Florian La Roche

author
#0 lore raw

PATCH 1/1 socrates_cyclone5_defconfig: adjust to current kernel and u-boot

Adjust socrates_cyclone5_defconfig to current Altera/upstream sources.

Signed-off-by Florian La Roche <[email protected]>
---
 configs/socrates_cyclone5_defconfig | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
configs/socrates_cyclone5_defconfig +9 -5
index 7995f9acfb..e79a8e9129 100644
@@ -3,12 +3,14 @@ BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_NEON=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/altera/socrates_cyclone5/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,altera-opensource,linux-socfpga,rel_socfpga-4.1.33-ltsi_17.07.02_pr)/linux-rel_socfpga-4.1.33-ltsi_17.07.02_pr.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,altera-opensource,linux-socfpga,socfpga-4.16)/linux-socfpga_socfpga-4.16.tar.gz"
+# BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+# BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7"
 BR2_LINUX_KERNEL_DEFCONFIG="socfpga"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_socrates"

@@ -16,9 +18,11 @@ BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 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/altera-opensource/u-boot-socfpga.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2017.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03"
+# BR2_TARGET_UBOOT_CUSTOM_GIT=y
+# BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/altera-opensource/u-boot-socfpga.git"
+# BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="socfpga_v2017.09"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="socfpga_socrates"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_IMG=y
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 socrates_cyclone5_defconfig: adjust to current kernel and u-boot

Hello,

Thanks for this patch, see below for some comments.

Quoted 1 line · Florian La Roche

Adjust socrates_cyclone5_defconfig to current Altera/upstream sources.

It would be nice to be a bit more explicit: the Linux kernel version is still from a vendor-specific Git repository, while the U-Boot version used is now the upstream version.

configs/socrates_cyclone5_defconfig BR2_cortex_a9=y · line 11

Quoted 2 lines
configs/socrates_cyclone5_defconfig +1 -1
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,altera-opensource,linux-socfpga,rel_socfpga-4.1.33-ltsi_17.07.02_pr)/linux-rel_socfpga-4.1.33-ltsi_17.07.02_pr.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,altera-opensource,linux-socfpga,socfpga-4.16)/linux-socfpga_socfpga-4.16.tar.gz"

'socfpga-4.16' is the name of a branch, so using that makes the build non-reproducible, since the actual contents will depend on when it is being fetched.

Since they don't provide tags apparently, we don't have any other choice but to use a full commit SHA1. Could you adjust that ?

configs/socrates_cyclone5_defconfig BR2_cortex_a9=y · line 13

Quoted 2 lines
configs/socrates_cyclone5_defconfig +2 -0
+# BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+# BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7"

Please don't keep this in comments.

Quoted 5 lines

BR2_LINUX_KERNEL_DEFCONFIG="socfpga" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_socrates"

configs/socrates_cyclone5_defconfig +0 -0
@@ -16,9 +18,11 @@ BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y

configs/socrates_cyclone5_defconfig BR2_TARGET_ROOTFS_EXT2=y · line 25

Quoted 10 lines
configs/socrates_cyclone5_defconfig +5 -3
 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/altera-opensource/u-boot-socfpga.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2017.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03"
+# BR2_TARGET_UBOOT_CUSTOM_GIT=y
+# BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/altera-opensource/u-boot-socfpga.git"
+# BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="socfpga_v2017.09"

Please don't keep these as comments, just delete those lines.

Could you adjust your patch, and send an updated version ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
author
#2 lore raw

PATCH 1/1 socrates_cyclone5_defconfig: adjust to current kernel and u-boot

Hello Thomas and Buildroot'ler,

Am Di., 8. Mai 2018 um 15:08 Uhr schrieb Thomas Petazzoni < [email protected]>:

Quoted 10 lines

Hello,

Thanks for this patch, see below for some comments.

Quoted 1 line · Florian La Roche

Adjust socrates_cyclone5_defconfig to current Altera/upstream sources.

It would be nice to be a bit more explicit: the Linux kernel version is still from a vendor-specific Git repository, while the U-Boot version used is now the upstream version.

Given that all Cyclone5-Support is in the mainline kernel, I think the correct
thing is to switch over to the mainline kernel. I will send in a new patch for this.

Quoted 1 line
Quoted 1 line

-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call

github,altera-opensource,linux-socfpga,rel_socfpga-4.1.33-ltsi_17.07.02_pr)/linux-rel_socfpga-4.1.33-ltsi_17.07.02_pr.tar.gz"

Quoted 1 line
Quoted 1 line

+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call

github,altera-opensource,linux-socfpga,socfpga-4.16)/linux-socfpga_socfpga-4.16.tar.gz"

Quoted 6 lines

'socfpga-4.16' is the name of a branch, so using that makes the build non-reproducible, since the actual contents will depend on when it is being fetched.

Since they don't provide tags apparently, we don't have any other choice but to use a full commit SHA1. Could you adjust that ?

This is not needed given a mainline kernel then.

Quoted 4 lines

configs/socrates_cyclone5_defconfig BR2_cortex_a9=y · line 13

Quoted 2 lines
configs/socrates_cyclone5_defconfig +2 -0
+# BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+# BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7"

Please don't keep this in comments.

Ok, will remove them.

Quoted 1 line

Could you adjust your patch, and send an updated version ?

New patch is coming along soon.

best regards,

Florian La Roche