Skip to contentSkip to conversation

configs/licheepi_zero: move to mainline

PATCH Superseded Angelo Compagnucci 2 participants 2 messages Oct 11, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configs/licheepi_zero: move to mainline

Mainline kernel and u-boot both supports this board from quite some time therefore there is no need to use custom repositories for these components.

---
 configs/licheepi_zero_defconfig | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
configs/licheepi_zero_defconfig +1 -12
index 826e98c..525fe7d 100644
@@ -3,9 +3,6 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_VFPV4=y
 
-# Toolchain
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
-
 # System configuration
 BR2_TARGET_GENERIC_HOSTNAME="licheepi-zero"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the LicheePi Zero"
@@ -15,12 +12,8 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/licheepi/genimage.cfg"
 
 # Kernel
-# Custom 4.14.14 kernel based on stable linux.4.14.y from Lichee-Pi Github repository
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Lichee-Pi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="cda44c146b9b87290bc7c636ffa7d88cbfb03ace"
-BR2_LINUX_KERNEL_DEFCONFIG="licheepi_zero"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-v3s-licheepi-zero sun8i-v3s-licheepi-zero-dock"
 
@@ -36,10 +29,6 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 
 # Bootloaders
 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/Lichee-Pi/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="32ab1804cd7c5858be8009e35ca07502dc8765c7"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="LicheePi_Zero"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 configs/licheepi_zero: move to mainline

Hello Angelo,

configs/licheepi_zero_defconfig BR2_arm=y · line 7

Quoted 2 lines · On Fri, 11 Oct 2019 10:11:15 +0200 Angelo Compagnucci…
configs/licheepi_zero_defconfig +0 -2
-# Toolchain
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y

You still need to select an explicit version for the kernel headers.

Quoted 5 lines
configs/licheepi_zero_defconfig +0 -1
-
 # System configuration
 BR2_TARGET_GENERIC_HOSTNAME="licheepi-zero"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the LicheePi Zero"

configs/licheepi_zero_defconfig BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" · line 16

Quoted 10 lines
configs/licheepi_zero_defconfig +1 -5
@@ -15,12 +12,8 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/licheepi/genimage.cfg"
 
 # Kernel
-# Custom 4.14.14 kernel based on stable linux.4.14.y from Lichee-Pi Github repository
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Lichee-Pi/linux"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="cda44c146b9b87290bc7c636ffa7d88cbfb03ace"
-BR2_LINUX_KERNEL_DEFCONFIG="licheepi_zero"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"

You still need to select an explicit version for the Linux kernel.

configs/licheepi_zero_defconfig BR2_TARGET_ROOTFS_EXT2_4=y · line 42

Quoted 11 lines
configs/licheepi_zero_defconfig +0 -4
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-v3s-licheepi-zero sun8i-v3s-licheepi-zero-dock"
 
@@ -36,10 +29,6 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 
 # Bootloaders
 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/Lichee-Pi/u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="32ab1804cd7c5858be8009e35ca07502dc8765c7"

And same for U-Boot.

See all our other defconfigs, even those that use mainline/upstream versions of Linux and U-Boot.

Thanks

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com