Skip to contentSkip to conversation

orangepi_pc_defconfig: bump linux to 4.17, u-boot to 2018.05

PATCH New Peter Korsgaard 2 participants 4 messages Jun 9, 2018 – Jun 11, 2018

lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH 1/1 orangepi_pc_defconfig: bump linux to 4.17, u-boot to 2018.05

4.17 brings support for HDMI out, but sunxi_defconfig hasn't been updated to enable the drivers - So add a kernel fragment to enable them.

Likewise, analog audio has been supported since 4.10, but the driver isn't enabled in sunxi_defconfig, so enable it in the fragment.

Signed-off-by Peter Korsgaard <[email protected]>
---
 board/orangepi/orangepi-pc/linux.fragment |  3 +++
 configs/orangepi_pc_defconfig             | 11 ++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 board/orangepi/orangepi-pc/linux.fragment
board/orangepi/orangepi-pc/linux.fragment new file +3 -0
new file mode 100644
index 0000000000..cdd522452a
@@ -0,0 +1,3 @@
+CONFIG_DRM_SUN8I_DW_HDMI=y
+CONFIG_SUN8I_DE2_CCU=y
+CONFIG_SND_SUN8I_CODEC_ANALOG=y
configs/orangepi_pc_defconfig +6 -5
index aa559e743e..05199af53b 100644
@@ -1,14 +1,17 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_VFPV4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=y
 BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC"
 BR2_SYSTEM_DHCP="eth0"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.17"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc/linux.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc"
 BR2_TARGET_ROOTFS_EXT2=y

@@ -17,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y

@@ -29,5 +32,3 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg"
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 orangepi_pc_defconfig: bump linux to 4.17, u-boot to 2018.05

Hello,

configs/orangepi_pc_defconfig BR2_PACKAGE_HOST_DOSFSTOOLS=y · line 33

Quoted 6 lines · Peter Korsgaard
configs/orangepi_pc_defconfig +0 -2
@@ -29,5 +32,3 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg"

It's not clear why you're dropping genimage support. Is this a mistake ?

Best regards,

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 orangepi_pc_defconfig: bump linux to 4.17, u-boot to 2018.05

Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,
On Sat, 9 Jun 2018 16:31:32 +0200, Peter Korsgaard wrote:

Quoted 8 lines

configs/orangepi_pc_defconfig BR2_PACKAGE_HOST_DOSFSTOOLS=y · line 33

Quoted 6 lines
(quoted diff) +0 -0
@@ -29,5 +32,3 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y

BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
BR2_PACKAGE_HOST_UBOOT_TOOLS=y

configs/orangepi_pc_defconfig +0 -2
-BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg"

It's not clear why you're dropping genimage support. Is this a mistake ?

Ehh, it is not removed, just moved further above, as the defconfig wasn't in the order used by safedefconfig.

Signature · 1 line
Bye, Peter Korsgaard
author
#3 lore raw

PATCH 1/1 orangepi_pc_defconfig: bump linux to 4.17, u-boot to 2018.05

In reply to Peter Korsgaard
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

4.17 brings support for HDMI out, but sunxi_defconfig hasn't been updated to enable the drivers - So add a kernel fragment to enable them.

Likewise, analog audio has been supported since 4.10, but the driver isn't enabled in sunxi_defconfig, so enable it in the fragment.

Signed-off-by Peter Korsgaard <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard