diff mbox series

[3/4] configs/nezha_defconfig: use mainline Linux 6.6.22

Message ID 20240324180130.1590984-3-peter@korsgaard.com
State Accepted
Headers show
Series [1/4] configs/nezha_defconfig: use OpenSBI 1.4 | expand

Commit Message

Peter Korsgaard March 24, 2024, 6:01 p.m. UTC 
The D1 support is now in mainline, so use that instead.  There is no
dedicated nezha defconfig, so use the riscv defconfig.  This defconfig has
most drivers as modules, so add mdev to ensure they get correctly loaded.

The defconfig does not have USB gadget/OTG support, so enable that using a
config fragment to make the USB-C connector work and get rid of the
following warning:

[    7.233418] musb-sunxi 4100000.usb: Invalid or missing 'dr_mode' property
[    7.240330] musb-sunxi: probe of 4100000.usb failed with error -22

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 board/nezha/linux.fragment |  2 ++
 configs/nezha_defconfig    | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 board/nezha/linux.fragment
diff mbox series

Patch

diff --git a/board/nezha/linux.fragment b/board/nezha/linux.fragment
new file mode 100644
index 0000000000..4b101eaacb
--- /dev/null
+++ b/board/nezha/linux.fragment
@@ -0,0 +1,2 @@ 
+CONFIG_USB_GADGET=y
+CONFIG_USB_MUSB_DUAL_ROLE=y
diff --git a/configs/nezha_defconfig b/configs/nezha_defconfig
index 7f3070f419..e717c8a08d 100644
--- a/configs/nezha_defconfig
+++ b/configs/nezha_defconfig
@@ -1,13 +1,15 @@ 
 BR2_riscv=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_SYSTEM_DHCP="eth0"
 BR2_ROOTFS_OVERLAY="board/nezha/overlay"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/nezha/genimage.cfg"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,smaeul,linux,ca67838d84af4c9f85d06311c9e98e1adf46308f)/linux-ca67838d84af4c9f85d06311c9e98e1adf46308f.tar.gz"
-BR2_LINUX_KERNEL_DEFCONFIG="nezha"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.22"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/nezha/linux.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun20i-d1-nezha"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y