From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319440801196408832 X-Received: by 2002:a17:90a:890a:b0:28e:7935:d5c1 with SMTP id u10-20020a17090a890a00b0028e7935d5c1mr307176pjn.81.1705403337207; Tue, 16 Jan 2024 03:08:57 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:7c0e:b0:28b:f79c:f25 with SMTP id v14-20020a17090a7c0e00b0028bf79c0f25ls1516647pjf.2.-pod-prod-04-us; Tue, 16 Jan 2024 03:08:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IE5p5NUstY4qUaqlsDYb/HTwyEm0UeQlBD5iecdM+WcV1Xvxd1Lbeobu8CO/5CCIAJD0r+S X-Received: by 2002:a05:6a20:e616:b0:19a:999c:665d with SMTP id my22-20020a056a20e61600b0019a999c665dmr4186882pzb.5.1705403335658; Tue, 16 Jan 2024 03:08:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705403335; cv=pass; d=google.com; s=arc-20160816; b=YIRcLsMTPaafEYoYq89AQxhjnsYUF8lpdY1BYHWzlPSHIyxaUAYOzfRcUOkw6Ah0LA 3vVx2KMsLiW8kopi/AlDKYcpzbmmtMKUX9tQgyi+JgFUhxBnQ8DmeABLZrCNuOTwY429 sa+AZWCvOoSnEwVOC+bh/1y7tJYjhipqWtztoUww/fr2d0uHjUTKsS4yQQugVrrTIqeD /kyXvkLntFbhzsU4GovV9Ubv10TjaCzbmkZPQNaRjtSG5zeUt4NDWFPL4QOZiD3JZwho pB4y/owl7Rasl7xkf0JtvjIo3xFcIYOFtHehsb8dyAuyn83P4Wti1bVeph43Ai+oCfJL FplA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:in-reply-to:from:references :cc:to:content-language:subject:user-agent:date:message-id :dkim-signature; bh=QxCFLtbu759ycB8ZhvYPwMtA6MX2hJI1AZdy5bNmmm8=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=OhW9EjzDx9030EE7cVJ+kJ4HlS0MMx+kTNrWwdvdoRcE3wVzy5WTXsLNrMx8VxBfeY l0se0d89KSTUxsXY+7Jan3LqSESq0c7TGEAY+qcxzeH4Y0qFVWmgfANZXnOD05SwcUYq u8KrNc8cY9A+mwkIeSQQAP4ravqRwePzf7RJwz3Ih1gxqxSWH0ixMb100ZA6mbDfVewg tOD04EWUiqCqSUzwRbiyOxGrxRD1o4p74pXI+s0nftWQHXDOFFFAzheHJLga+xvzhbb0 Jrly79vaIJEuz/W8+07gFDhSYlTfJwDK4saqAFDkpwC3sOUG7P532O2+xBEGyazCVtgM xmUw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=t7punGaY; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe02::626 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0626.outbound.protection.outlook.com. [2a01:111:f400:fe02::626]) by gmr-mx.google.com with ESMTPS id p5-20020a17090ab90500b0028d93e084absi712323pjr.1.2024.01.16.03.08.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2024 03:08:55 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe02::626 as permitted sender) client-ip=2a01:111:f400:fe02::626; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=t7punGaY; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe02::626 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BcS2VV9/4gPQHy11vxrgx2A+I0wS/O6gmMhPKPicUWhDMkLZ3b9tbLzmOE9WJkPoI8GVciD5b4ELM+xo0cN+3FIl97rlq8rSrX5dqwMAMd7WL24WqQR+bJdvRqgs3iGy4j0g2fDURjfaJmh51v867OlORrlw0EDO+N2srNxmI1dLWBrxRXG+jiivuOE0Aznb2bKOKzKnqf9XevVEzj0quD+PMHNcuaNXfQscL1T6GxUYnazQS0y+5OOvZP/JbOElbRSWjvez7917Z6gsujRuwhu0Q7KrLOcyPtrjiMZFTrzpOgPKfNadL3MRXb2w9XVTifiT1Vlc4sUZ/BxS28hdDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QxCFLtbu759ycB8ZhvYPwMtA6MX2hJI1AZdy5bNmmm8=; b=fDMojWK40QyTBJpjgbyDkBISThYUd7Or2aF89nfPY08M1fPYfX4btFj3OKUsspzSqI3gcpsnhokLio1k3MuApyJhJ7WkPkMOJj/gKiF02w6V4DgK6iA9Gdqfctq3tFsrIVHwBXzSpcznxDTSOTmihUDi7TNj4M14ObPv5ciFcJgvSvsFCBKGW1wVjQW8F2+PPLNpsKbKTThZnqTulM/fd/SD9QfrfSOSJoUWA8Ed5ZkIUQdpDD5/6+Oy9YPTziPszMluWnY7zWnnpBPOG0jG4VYctyS3zSwtl8pDUMixmMsWktud6o9F/RxLamXN1GkREjI1msqAmUdvNr34Oa8qtw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QxCFLtbu759ycB8ZhvYPwMtA6MX2hJI1AZdy5bNmmm8=; b=t7punGaYkQ1fYeiL5FXs5ihjR2d27bRghzWFcYMsavEBVzTDg/vYXBq3tCIYT7t6rMbUg8oQn53xSTUvnHZfsAj9+KL/Avot+Bvcv1YZ6dzCSCAWmU1jYgqNOCNZDZ/5iw52wg2hiV4zvZzvnqRZditCFuQTcicYjAJ8IcmGb9P3I4gmj2ovUTsvxVYAtommHS6O2qQI2Izqbdpo4I58awG1taU2z59BIfTH1yA9Kiozv92IxlrBTQzSp4lBifGZPVPW0VnACb9X4DZOAgNh/wwg5O540iTZz46TGPC0XXNglksC/xfucrjR19M83NW4i8q341Gz5aLnJ5DT+exhOg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by PAVPR10MB7162.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:314::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.19; Tue, 16 Jan 2024 11:08:52 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8d16:7fbb:4964:94fe]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8d16:7fbb:4964:94fe%3]) with mapi id 15.20.7181.026; Tue, 16 Jan 2024 11:08:52 +0000 Message-ID: Date: Tue, 16 Jan 2024 12:08:51 +0100 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 8/8] meta-isar: Switch VisionFive 2 to mainline kernel Content-Language: en-US To: isar-users Cc: Felix Moessbauer References: <894e1bfc61dcda239d38cf9ca64442cd55fe916b.1704785604.git.jan.kiszka@siemens.com> From: Jan Kiszka In-Reply-To: <894e1bfc61dcda239d38cf9ca64442cd55fe916b.1704785604.git.jan.kiszka@siemens.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR4P281CA0304.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f6::9) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) Return-Path: jan.kiszka@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|PAVPR10MB7162:EE_ X-MS-Office365-Filtering-Correlation-Id: b3c0823d-9754-4fd8-1939-08dc168385f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IVgMQkq616/Bp4kbcagFl1Oymnl1WQCSSfmDiC+0//BVwiek/61oqojUjQCjftQ/uxH/oVIjR+O1UXsztmVLn33Xo0mCpSwmG1YaeM1vkTpX1yv032tGLbAYOBefFSvFPjlkPsF//gqQ8letqejgnhWpN7NtVgcvRbU71z4Byhd4U1K5K7J6xJNbR306ym9C1MmD7A+zKoszm2uvS1y7ClnTDbZ6HJrTouJrCgHHqZbN7RyGJBGp/NxNRpRhkCoANa6trzoJpP+mvSp9Dp/rm4wG3QQeoB5/R4PYc5OcnroHdjSYB2fjdCjTgMuCs2ViHu9eBFrrvZgbiFPNlp6FoKmmwMf8Mp0B1YnrYU6BvfV9PUMdphxDQXAp15k3o4aRva8cfmbfq4GSSkTd7TRHHIlDGwJU+0m8T5Gg8u7h8byiAd2+F6t1ieKa/yZof4slqVqoKC6FGWuIyb8CvGc+oMrAMWU6gWwBi4xAxCdcDK6QiI/7GVoHJL7Lz//aK68f/24SJ8fY04ukkvHPNadnwpmr/CJfgxcBB0nMcMOX6Y8aB6uctTgyMyY/g6qF2RBTCwkG+zTOF4xNgfiCt1SBp0a4eAG0cfpP5k524H5JpgBFpwi1TlPz34/lRFUBMh5SM4MiMvugR6DMdKH5cBYxXw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(136003)(346002)(376002)(366004)(39860400002)(396003)(230922051799003)(186009)(1800799012)(64100799003)(451199024)(83380400001)(66946007)(66556008)(316002)(66476007)(6916009)(53546011)(107886003)(31696002)(5660300002)(2616005)(8936002)(8676002)(44832011)(6512007)(82960400001)(36756003)(4326008)(38100700002)(6506007)(86362001)(26005)(31686004)(6486002)(478600001)(41300700001)(2906002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VkNST01ORnUxSmtMdkF2bWQxMkN5UzVmZUlEcmNNV3k2aDlQVjlMLzhOYzU5?= =?utf-8?B?QUpEUE42ZkhTRTc1VnlLZ3hlZStxTkxjK2RuVUxjZWdTLzFaWTF4WCtJYTV3?= =?utf-8?B?M1p5aUZObzJ1cVhFdDdlZDhTSkhEamhwZVdYTTJpdllENnlsQnlJT0lHQlJM?= =?utf-8?B?MkNUWUFJTlRGTnBqcTlROU15MnNad1hoTGNDVjRIRVVpNEdyODZiRXJMM24x?= =?utf-8?B?OEJSTTVESzVPclZJR1BpSWsyL0p5NDhTbHVkODNhN0R5TVkwQnRnZ1MyZTIx?= =?utf-8?B?UlFEditCR2N1TEMwbDlUT091NkpBN205WmQ3Ylp3VHdYTm1mWVJEOXhhdGx3?= =?utf-8?B?YjlXUWhsVXppY2RrdmVhemJiOWVTak5nN0VFdUZBTUlFUDUzYUp0YXYxYWJL?= =?utf-8?B?ODJHYWF2d2xCL1BKYmhwNkMybkEvSS9vKzV3bHlrcUpkL2Rha3B5TGVRektm?= =?utf-8?B?eFBGVVVUeEpXa2JTY1R5M0I2a2xOdXF2cU1ZM2N2L1Q5YjRSck9rK1FXRGRa?= =?utf-8?B?dVZHRkVjaTRXcS9VMTkwWXZhamF0NHU5N1Q4eXpJRjVob3pQOXpOWlk1bi9M?= =?utf-8?B?Y1YvV0dzaFF5SnVIWTZmYTlIRE01Rm8wczhuc0J0S2JzRmc2cmxObm8rWkxB?= =?utf-8?B?Q3k2VlZOMG9Xc292NmF3UEFNeGxyd2pvQnVqUndVOUJFTmdnSm14anFrbnVy?= =?utf-8?B?WGExUldwSzBqK3pUUkErcEdnT0kxZ3dvN2R1SFhNZ1kwalJPRFlyTmY4N3pI?= =?utf-8?B?ZWZiVTY2dTZwQlYvb2JFSWhLNkZUS0tYU0FjWEJXZnZseDRUOTdkOElYWjdm?= =?utf-8?B?OHFnN2wwelJtcFNmY04yQlkvZUhoRnpoaHpxZkE2TmJueWpWS3diZ0MreHMz?= =?utf-8?B?ZloyRUVqLzk5UGY0cEZ4MXRLRUdRcGcrbDZNbjRDcnpNaDFESzhIY0hMaEtV?= =?utf-8?B?QktQRmF2T05MaldOUm5GNUplMnlCb0NDYmEzMTRJelhKQXJ3blZmOW4wTnRz?= =?utf-8?B?cHI2R0tHSWt0VFpueThCUG5aOEJ3N3ZGUE9zYkwraE1ZYXlObHIxdVFDSGpP?= =?utf-8?B?dGpuU2xUbWF2SkRrcHhQRTZVV2w4WC91TTFIcERnZlJmSGl1TGl5UjJCVnVh?= =?utf-8?B?Z04yejNaSml6N3hvZVdCb3NVS3BiQnlrK0JCVnlJRmkza1ZZd1pnOFY0K1pB?= =?utf-8?B?cW41OVpTamRRME5STEdaSzRTLzFHNnJSZ055Rk5ISXM0cjNpUjhFWVV4QUY4?= =?utf-8?B?WVljN3RJYUxMVGpXV1NhUWpmbUY3enRJY2xxb1M0ZzdHK0IxZEpNcWQrZFJF?= =?utf-8?B?SUp2L3BMY2dkQlN5VDhlWGpjVitKQkpTbVJ3b1JybC9XK2VzZllocE5PaWlQ?= =?utf-8?B?UGxtTXdyMXVFK3ROQjJCUjZiUlV0eEZPYkUxTjkrNHVFYkc4bmpCVCtOR2E0?= =?utf-8?B?M0RoaEVKLy9iWXkxZ1dQYVZsdFJIV2g4SDNsTFNkOG1lczIyZWpjMnRFNUxo?= =?utf-8?B?dCt2U2tVU3E2Z3BsWXl2NERoUE4yVnR1c3JxQmJBZFY4NDFPNDlodXh0Rldm?= =?utf-8?B?dzFlck14Rk1MdnRIMVBpeDgwM24vWmVoMG0wdjRJMlR0eTNYTzBCSjV2dHNJ?= =?utf-8?B?d2FBMldDMStaUWJ3dkEvMkRhRzBDd2xmYlIxeGNNWjhvMWx3YktnUGNCajJQ?= =?utf-8?B?MDBRZXVSaDBOaTVJZm12QTB4dms4VzN1blFNeHI0bmRmUDJuK0hFUnl1aU9l?= =?utf-8?B?RURJMU9jZzM3L3NEM3RYL3pMUnJpMmtETGpqUmovLy8xZWNPYVg2OEVXVllt?= =?utf-8?B?cVJzajZERXoya1pRaU1iV3dmMFhSNFBQcTF6SE5uQmtkMDc0WitFbittVXI0?= =?utf-8?B?d2Mwak5XZ2JDdFVLTXZrZDkvQXF4QVphdm5WZnNrUGZ0Zldkd0tpcC9MYUlo?= =?utf-8?B?Z0xBMitFOVJiQ3lvVkw4dW9uU2VzMjNoT3I2Y0VuZjRSNEtkMmN2MURzWHlj?= =?utf-8?B?cFZIZXF0ck9IQnE1VGRRV0JaWXlhS0MwMVJGRXNaWHBjNzV6N1JPMDllQWor?= =?utf-8?B?R1F2K1VIZ3NkMDZOeGVoeE1Tc3I4cjNOaUVmZTJmdWVMaEs3OWhBUUJ0YTQ2?= =?utf-8?B?dTJPTnFZQjJwTzF6Q05McStEUGRuM2orakJGKytaRXBpRmlKNE4vRUFLNDdU?= =?utf-8?B?ZUE9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3c0823d-9754-4fd8-1939-08dc168385f4 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2024 11:08:52.4864 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: C9zYclQC2wGySqpf1WV3oJGsMAJLINOa73nnqh10s47BR3HCZs/2l6VY3aMyFBF1VRdG1xxbXo66a+6sjkjblA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR10MB7162 X-TUID: 5tnLoJjMXmaK On 09.01.24 08:33, 'Jan Kiszka' via isar-users wrote: > From: Jan Kiszka > > Using 6.6 as baseline means dropping support for PCIe (M.2), timer > (alternative clocksource), PWM, CAN, PWMDAC, Display, ISP (camera). We > still get a connected and generally working board this way, and we no > longer need to maintain a separate recipe. Also the example-module now > builds fine. > > As mainline is fine with the DT provided by mainline U-Boot, stop using > the kernel's DT. > > Signed-off-by: Jan Kiszka > --- > .../conf/machine/starfive-visionfive2.conf | 6 +----- > .../linux/files/starfive2_extra.cfg | 6 +++--- > .../linux/linux-mainline_6.6.10.bb | 2 ++ > .../linux/linux-starfive_5.15-visionfive2.bb | 19 ------------------- > .../canned-wks/starfive-visionfive2.wks.in | 2 +- > 5 files changed, 7 insertions(+), 28 deletions(-) > delete mode 100644 meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb > > diff --git a/meta-isar/conf/machine/starfive-visionfive2.conf b/meta-isar/conf/machine/starfive-visionfive2.conf > index c7f72bb3..baae7ed8 100644 > --- a/meta-isar/conf/machine/starfive-visionfive2.conf > +++ b/meta-isar/conf/machine/starfive-visionfive2.conf > @@ -5,7 +5,7 @@ > > DISTRO_ARCH = "riscv64" > > -KERNEL_NAME ?= "starfive" > +KERNEL_NAME ?= "mainline" > > IMAGE_FSTYPES ?= "wic" > WKS_FILE ?= "starfive-visionfive2.wks.in" > @@ -13,7 +13,3 @@ IMAGER_INSTALL:wic += " \ > u-boot-starfive-visionfive2 \ > ${SYSTEMD_BOOTLOADER_INSTALL}" > IMAGER_BUILD_DEPS += "u-boot-starfive-visionfive2" > - > -# DTB file for booting > -DTB_VISIONFIVE2 = "jh7110-visionfive-v2.dtb" > -DTB_FILES = "starfive/${DTB_VISIONFIVE2}" > diff --git a/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg b/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg > index d11c28de..d7c42d73 100644 > --- a/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg > +++ b/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg > @@ -1,3 +1,3 @@ > -# additional configuration to support stock debian userlands > -CONFIG_BINFMT_MISC=y > -CONFIG_SQUASHFS=m > +# still needed in 6.6, see commit 07863871dfb162965b21bb8c2e4861bdb0019da3 > +CONFIG_MMC_DW=y > +CONFIG_MMC_DW_STARFIVE=y > diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_6.6.10.bb b/meta-isar/recipes-kernel/linux/linux-mainline_6.6.10.bb > index 059b8534..649e1e86 100644 > --- a/meta-isar/recipes-kernel/linux/linux-mainline_6.6.10.bb > +++ b/meta-isar/recipes-kernel/linux/linux-mainline_6.6.10.bb > @@ -16,6 +16,8 @@ SRC_URI += " \ > file://subdir/no-ubifs-fs.cfg \ > file://no-root-nfs.cfg;apply=no" > > +SRC_URI:append:riscv64 = " file://starfive2_extra.cfg" > + > SRC_URI[sha256sum] = "9ee627e4c109aec7fca3eda5898e81d201af2c7eb2f7d9d7d94c1f0e1205546c" > > S = "${WORKDIR}/linux-${ARCHIVE_VERSION}" > diff --git a/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb b/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb > deleted file mode 100644 > index e9e0bf4a..00000000 > --- a/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb > +++ /dev/null > @@ -1,19 +0,0 @@ > -# > -# Copyright (c) Siemens AG, 2023 > -# > -# SPDX-License-Identifier: MIT > - > -require recipes-kernel/linux/linux-custom.inc > - > -SRC_URI += " \ > - git://github.com/starfive-tech/linux.git;protocol=https;branch=JH7110_VisionFive2_devel;destsuffix=linux-visionfive-${PV} \ > - file://starfive2_extra.cfg" > -SRCREV = "a87c6861c6d96621026ee53b94f081a1a00a4cc7" > - > -S = "${WORKDIR}/linux-visionfive-${PV}" > - > -KERNEL_DEFCONFIG = "starfive_visionfive2_defconfig" > - > -LINUX_VERSION_EXTENSION = "-isar" > - > -COMPATIBLE_MACHINE = "starfive-visionfive2" > diff --git a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in > index ed8a3b71..2600580a 100644 > --- a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in > +++ b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in > @@ -16,7 +16,7 @@ part --source rawcopy --sourceparams "file=/usr/lib/u-boot/starfive-visionfive2/ > # U-Boot FIT > part --source rawcopy --sourceparams "file=/usr/lib/u-boot/starfive-visionfive2/u-boot.itb" --fixed-size 4M --part-type BC13C2FF-59E6-4262-A352-B275FD6F7172 > # EFI > -part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot,dtb=${DTB_VISIONFIVE2}" --use-uuid --label efi --part-type EF00 --align 1024 > +part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --use-uuid --label efi --part-type EF00 --align 1024 > # rootfs > part / --source rootfs --use-uuid --fstype ext4 --mkfs-extraopts "-T default" --label image --active --align 1024 --exclude-path=boot/ > Too bad: USB ports aren't working yet, most likely because they are PCI-connected, and that support didn't hit upstream so far. I'll see the other day if we can at least renovate the BSP kernel support. Jan -- Siemens AG, Technology Linux Expert Center