From patchwork Fri Jan 6 03:47:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1722274 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.a=rsa-sha256 header.s=google header.b=YmV/cDkm; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Np8SF1Y07z23fF for ; Fri, 6 Jan 2023 14:47:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C406E855A2; Fri, 6 Jan 2023 04:47:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="YmV/cDkm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0C846855E4; Fri, 6 Jan 2023 04:47:50 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) (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 63D688550A for ; Fri, 6 Jan 2023 04:47:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x82d.google.com with SMTP id a16so1154328qtw.10 for ; Thu, 05 Jan 2023 19:47:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=cAyml3b2W6oti75S+jcF97uk8ct6OgrRVfJi+ln2Lkw=; b=YmV/cDkmdIAJyf7UGv9bVyI3X5A4kn4PwpnFDOLRlEj42wci3dFpeOnCCED+wYcTEB OWXyUhPG0VTpTz2N1pqwShGee5WHfdlL4v5n9RQZTqyITZ3gVNV/X4kl3p9Sew/0vQne mIm4Rw+f836LwCWMXkq/aUibjfz7hTBi3QrZc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cAyml3b2W6oti75S+jcF97uk8ct6OgrRVfJi+ln2Lkw=; b=eKYiKWTTGSlQ9DEVW4ozea84MKTjeOZOh6QJFBhX4bGsgk2/f0HQwDIAsClisBZVo9 R5k1avasLe9hcG/BXI8sq704CGw0abNK2Dh8oa+eJv/BcuHMDEM/IwC/psWG17kYRg+m hC5lWV1m40FNjnP5SDdk9IYeiogAGlFxlTclxf9N+I725WpSP5GfDDx0K/6oVXuYs2ln 0ibColjGAHo/gHjWKash64bXv0BJAwbTFTXaqd48AVO6j/g6lE36uIl1500GcqDI2gNU /2dchCqTJnjIUII5/2Lor3pNMjq3sTfXj9qBUMaEnGTTsk1nZ6zt82kPdtP6S6uSJAg0 9XXw== X-Gm-Message-State: AFqh2koce+Y8RM2WI4Piyp6QGJdgvA9wqwlZKPamXvUCgzuuhMrJ4jqf JSvn+/BFT66lTjoVI+NgFVEL45jnpqLulQVrgZg= X-Google-Smtp-Source: AMrXdXt8NG3x89HKNkIfUkilfNHwvGCRnqJFLhM/tv/zsDaY8ZgvJ9SKq3QVdOA2AtQX2KNykexpOA== X-Received: by 2002:a05:622a:2291:b0:3a5:2704:d4c0 with SMTP id ay17-20020a05622a229100b003a52704d4c0mr80015143qtb.31.1672976865970; Thu, 05 Jan 2023 19:47:45 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b00-6400-0ddf-03f2-520a-df10.res6.spectrum.com. [2603:6081:7b00:6400:ddf:3f2:520a:df10]) by smtp.gmail.com with ESMTPSA id b6-20020ac86786000000b003a50b9f099esm22338061qtp.12.2023.01.05.19.47.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Jan 2023 19:47:45 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Cc: Quentin Schulz Subject: [PATCH] ns16650: Correct CONFIG_SYS_NS16550_MEM32 platforms Date: Thu, 5 Jan 2023 22:47:44 -0500 Message-Id: <20230106034744.3636190-1-trini@konsulko.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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.6 at phobos.denx.de X-Virus-Status: Clean There are currently no platform that are both CONFIG_SYS_NS16550_MEM32 and not (per how the logic was prior to being broken in 0478dac62a9a ("kbuild: Remove uncmd_spl logic")) enabled in CONFIG_DM_SERIAL. We drop this line out now so that platforms which do use CONFIG_SYS_NS16550_MEM32 and depending on stage may or may not have DM_SERIAL set. Fixes: 0478dac62a9a ("kbuild: Remove uncmd_spl logic") Reported-by: Quentin Schulz Signed-off-by: Tom Rini Tested-by: Quentin Schulz #on Ringneck PX30, Puma RK3399 --- include/ns16550.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/ns16550.h b/include/ns16550.h index f45fc8cecc56..243226fc3d94 100644 --- a/include/ns16550.h +++ b/include/ns16550.h @@ -34,12 +34,10 @@ #define CONFIG_SYS_NS16550_REG_SIZE (-1) #endif -#ifdef CONFIG_NS16550_DYNAMIC +#if defined(CONFIG_NS16550_DYNAMIC) || defined(CONFIG_DEBUG_UART) #define UART_REG(x) unsigned char x #else -#if defined(CONFIG_SYS_NS16550_MEM32) && !CONFIG_IS_ENABLED(DM_SERIAL) -#define UART_REG(x) u32 x -#elif !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0) +#if !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0) #error "Please define NS16550 registers size." #elif (CONFIG_SYS_NS16550_REG_SIZE > 0) #define UART_REG(x) \