Skip to contentSkip to conversation

configs/licheepi_zero: move to mainline

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

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 configs/licheepi_zero: move to mainline

Mainline kernel and u-boot both supports this board in mainline from quite some time.

---
 configs/licheepi_zero_defconfig | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
configs/licheepi_zero_defconfig +6 -9
index 826e98c..8bb2129 100644
@@ -4,7 +4,7 @@ BR2_cortex_a7=y
 BR2_ARM_FPU_VFPV4=y
 
 # Toolchain
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y
 
 # System configuration
 BR2_TARGET_GENERIC_HOSTNAME="licheepi-zero"
@@ -15,12 +15,10 @@ 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_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.5"
+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"
 
@@ -37,9 +35,8 @@ 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_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10"
 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 v2 1/1 configs/licheepi_zero: move to mainline

Quoted 4 lines · Angelo Compagnucci

Mainline kernel and u-boot both supports this board in mainline from quite some time.

Applied to master, thanks.

Regards,
Arnout

Quoted 46 lines
---
 configs/licheepi_zero_defconfig | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)
configs/licheepi_zero_defconfig +6 -9
index 826e98c..8bb2129 100644
@@ -4,7 +4,7 @@ BR2_cortex_a7=y
 BR2_ARM_FPU_VFPV4=y
 
 # Toolchain
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y
 
 # System configuration
 BR2_TARGET_GENERIC_HOSTNAME="licheepi-zero"
@@ -15,12 +15,10 @@ 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_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.5"
+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"
 
@@ -37,9 +35,8 @@ 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_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="LicheePi_Zero"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y