From patchwork Thu Feb 22 09:36:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 774842 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp715172wrw; Thu, 22 Feb 2024 03:28:30 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVsLQBzaiiYXoyjZKZCeIH6Rw2jK8F5+OJclyWLDQ9z+TodiP+/f5nzzp5/klgEhgyHGzm2dIgS5nhYdap6HjzO X-Google-Smtp-Source: AGHT+IFl/8fnIqOf1kkkGACvBTy38M508NamrJKiUbsobPtR+YhnSNZPE9xbsrkORsWW6S4zsQL4 X-Received: by 2002:a17:906:251b:b0:a3f:8968:78dd with SMTP id i27-20020a170906251b00b00a3f896878ddmr1028449ejb.55.1708601309826; Thu, 22 Feb 2024 03:28:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601309; cv=none; d=google.com; s=arc-20160816; b=0FlHM8RC7wPxLbbs3+CjzlMyPyc5mHGGasWYyu8IBKy9Z7BFNOh9ROXb/GfgSuSwwq LxocBcICaNaxqtDAuxu0mD4i566vqZa1XcFCSMFcSzAp2NiJdwdpD4sVx7+SeXHxHJXf nMACfJssH3gKv0wL++Q9ZQVeWvgXQLR5iqYFbbsgMfIhJul3/Lr3WwtWTHxH8EoqSE1l ool2GIq3LAJoxlkKsovFSunpfyCmDR6SOgkDj381aWpzhcRX3ZEgmIU8qY9AV7FJgeyo uCzG85HEXiBO+axgc2Czm5mhsjMCGomTV70ZUgovhNHsn/PKmG7jxiJMX9UxaIyIug7i A32w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GpI+QWYX3hWaVGsYN5+nU+Q+Aptv0+e/nDtrRo/nhwY=; fh=Yy8GFNbqEhl9MerJz1LfYQ39XksX1Ui9qbEvUBg6hMU=; b=V/d/6oPX39XhzwvMkzdD+4yFWH+zSthANnUSQ6fQH/5JGJWVZ6uLs8VvDaZ7O8vTs2 ItLuF+ufOvStKuLkLzgsTpPIN1ClJ15xdVF7F6nA6yilAkVvsaLsd+fCC4z+ebAaa8ER woHCJQ0xhSj3paGhl1slE5a3Rd5A/ShyQVSFaC0dDqZDJ4e3FYM0VprIAimYihArGbhc pOSHSfn+nomTHCPN3WCATzeUmi/nLMnyrsa7Jw+zz4UTheTxy9x3/CG47HS37ijlbNPE /QLOM0OzPT59OaP3C8GLgJqLyByryU/Hu1GyvNtQoFJQMi9OH7bOaChDsonP8AX3qvql bHEg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uu4vvDnA; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id ec16-20020a170906b6d000b00a3da4bf91b3si5272718ejb.494.2024.02.22.03.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 03:28:29 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uu4vvDnA; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D8691880BE; Thu, 22 Feb 2024 12:25:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="uu4vvDnA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EFF3687663; Thu, 22 Feb 2024 10:38:08 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: * X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.2 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1448C87D29 for ; Thu, 22 Feb 2024 10:38:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sumit.garg@linaro.org Received: by mail-oi1-x231.google.com with SMTP id 5614622812f47-3c031c24fbeso1093214b6e.3 for ; Thu, 22 Feb 2024 01:38:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708594678; x=1709199478; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GpI+QWYX3hWaVGsYN5+nU+Q+Aptv0+e/nDtrRo/nhwY=; b=uu4vvDnAA1iNP3qirfXqS+5MbOVf7SqKFNXvfq3fbeCxoLm3EcVYIfoMwlyF32QqAy 3RHvR6TyryDyfuifOmVX2/qfgJJaloeIvazfcRYTcmIDWADZC7L8z2RrRcnZKlbLrnOR 3URQRF6dKFdN/DyMTrRnrKPGS315QGrSwTgRDLkJeK8fH0//yYnK0JYXZcIio9pcnIP1 vLWCz/M1h4iLMACzc/Eu9CLdPyFImT8/KUNGnswYOaEnP81gcCDxaIrsTzf6oMvGlDLv zr7qIck8zSL7l83rgNxy3kTEZI+3Qd2FVHG+9Lqw2+MI/1OymUdAcmts8NuJJVfImmPa aZ0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708594678; x=1709199478; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GpI+QWYX3hWaVGsYN5+nU+Q+Aptv0+e/nDtrRo/nhwY=; b=pr4H97ODJE1bj/zz65KLHyrxXlnlr3SCG69IWsj6nB/friuIBmJisosqfQQOIPm7fl qF0Wtmp5qx83NM2vNG/gCZ+mhE4w0m/8R3+CBnN+7c06Sqf18WHbcay3Bvpo4PigmwrB WlrXr+ZCOQd01oUuNSZO+REgUju13towLQ+QFu1jGhtRZRg/PnIDE/59f+UKbjDJodo1 7zXwV61aCXsOpgOIzUnRDAv6nRZDzsxRz/H+ajR3FsnvfmTUrHYXgmVG2Wx7iV12/fcg xpfMFseKfYMkni4gUbmOO1LxAbwiltwpYC0f1SOgBQ+dyXByI2HpP04uCbWJPuUiJfWC +bSA== X-Gm-Message-State: AOJu0Yy9qHnCHdY/bLdZXzoiqXStautMia7r3ka1hu5vHIPtWDhY8RI9 ZH7/0JBKcFuRsoePWMIelR6VtWgWetQFKOFLih7oi/54GApftuofe9FZ0qcpNJRjn98AVLXOQck B X-Received: by 2002:aca:1e0c:0:b0:3c0:38d7:e06f with SMTP id m12-20020aca1e0c000000b003c038d7e06fmr16517695oic.59.1708594678392; Thu, 22 Feb 2024 01:37:58 -0800 (PST) Received: from sumit-X1.. ([223.178.212.115]) by smtp.gmail.com with ESMTPSA id u20-20020a056a00099400b006e47300e4edsm6208404pfg.183.2024.02.22.01.37.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 01:37:58 -0800 (PST) From: Sumit Garg To: u-boot@lists.denx.de, u-boot-amlogic@groups.io, u-boot-custodians@lists.denx.de Cc: trini@konsulko.com, sjg@chromium.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor@kernel.org, neil.armstrong@linaro.org, caleb.connolly@linaro.org, ff@shokubai.tech, daniel.thompson@linaro.org, dgilmore@fedoraproject.org, pbrobinson@gmail.com, ilias.apalodimas@linaro.org, b.galvani@gmail.com, xypron.glpk@gmx.de, michal.simek@amd.com, seanga2@gmail.com, rasmus.villemoes@prevas.dk, peng.fan@nxp.com, jh80.chung@samsung.com, rfried.dev@gmail.com, marex@denx.de, mibodhi@gmail.com, bb@ti.com, mark.kettenis@xs4all.nl, festevam@gmail.com, nm@ti.com, andre.przywara@arm.com, ijc@hellion.org.uk, paul.barker.ct@bp.renesas.com, Sumit Garg Subject: [PATCH v6 10/11] dts: meson-gxbb: Switch to using upstream DT Date: Thu, 22 Feb 2024 15:06:06 +0530 Message-Id: <20240222093607.3085545-11-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240222093607.3085545-1-sumit.garg@linaro.org> References: <20240222093607.3085545-1-sumit.garg@linaro.org> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 22 Feb 2024 12:24:08 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Although there were still some variations in board DTS files based on meson-gxbb SoC but I think those were minor differences from upstream and shouldn't impact boot on these devices. So enable OF_UPSTREAM to use upstream DT and add amlogic/ prefix to the DEFAULT_DEVICE_TREE. And thereby directly build DTB from dts/upstream/src/ including *-u-boot.dtsi files from arch/$(ARCH)/dts/ directory. Reviewed-by: Neil Armstrong Reviewed-by: Simon Glass Signed-off-by: Sumit Garg --- Changes in v6: - None Changes in v5: - None Changes in v4: - Picked up review tag Changes in v3: - Dropped Makefile portion and enabled OF_UPSTREAM for SoC instead. Changes in v2: - Picked up review tag arch/arm/mach-meson/Kconfig | 1 + configs/nanopi-k2_defconfig | 2 +- configs/odroid-c2_defconfig | 2 +- configs/p200_defconfig | 2 +- configs/p201_defconfig | 2 +- configs/videostrong-kii-pro_defconfig | 2 +- configs/wetek-hub_defconfig | 2 +- configs/wetek-play2_defconfig | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index d6c890580617..8ddb59161a0d 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -25,6 +25,7 @@ choice config MESON_GXBB bool "GXBB" select MESON_GX + imply OF_UPSTREAM help Select this if your SoC is an S905 diff --git a/configs/nanopi-k2_defconfig b/configs/nanopi-k2_defconfig index 41dbf7981f8b..2e1c756bf7a8 100644 --- a/configs/nanopi-k2_defconfig +++ b/configs/nanopi-k2_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-nanopi-k2" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-nanopi-k2" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xc81004c0 diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 5f9f323e06ea..ce5eaec3cd2a 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-odroidc2" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-odroidc2" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xc81004c0 diff --git a/configs/p200_defconfig b/configs/p200_defconfig index cd579ef5f142..b69460347954 100644 --- a/configs/p200_defconfig +++ b/configs/p200_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-p200" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-p200" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xc81004c0 diff --git a/configs/p201_defconfig b/configs/p201_defconfig index b2f0a0ccdb4a..dcc1454be16c 100644 --- a/configs/p201_defconfig +++ b/configs/p201_defconfig @@ -7,7 +7,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-p201" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-p201" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xc81004c0 diff --git a/configs/videostrong-kii-pro_defconfig b/configs/videostrong-kii-pro_defconfig index 3eda8f14a21b..7a5af234471f 100644 --- a/configs/videostrong-kii-pro_defconfig +++ b/configs/videostrong-kii-pro_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-kii-pro" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-kii-pro" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xc81004c0 diff --git a/configs/wetek-hub_defconfig b/configs/wetek-hub_defconfig index fd92b041e739..85cff73f50f7 100644 --- a/configs/wetek-hub_defconfig +++ b/configs/wetek-hub_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-wetek-hub" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-wetek-hub" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xc81004c0 diff --git a/configs/wetek-play2_defconfig b/configs/wetek-play2_defconfig index b887419a6bab..efdf820165b5 100644 --- a/configs/wetek-play2_defconfig +++ b/configs/wetek-play2_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxbb-wetek-play2" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxbb-wetek-play2" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_DEBUG_UART_BASE=0xc81004c0