From patchwork Sun Jan 29 00:58:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1733423 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=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=L49h2lpa; 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)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P4Ctn68DQz1yhq for ; Sun, 29 Jan 2023 12:11:13 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 642728574C; Sun, 29 Jan 2023 02:10:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="L49h2lpa"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E48EA857DB; Sun, 29 Jan 2023 02:08:40 +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,DKIMWL_WL_HIGH, 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-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) (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 D74228578D for ; Sun, 29 Jan 2023 02:08:33 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x135.google.com with SMTP id z2so3282247ilq.2 for ; Sat, 28 Jan 2023 17:08:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=C9KYfE5y7YcLXlAnermHY8cAfSJhh98OxHVIuy+Yh+o=; b=L49h2lpaDyT1MFMZDZnmtKzbXgOpserMzqKQZoomJ4BOX8LKlTO/bRlosr3k0mEyFH D8EE25PfYbN21UkQ0kB2ovE3gTUDpbW7ykWUyAMIVMpUWQXjoVu0ORRUG4MNNXBGyrYr RntbPXpUozh/epwmltSMxJsF0/1P6fpvW8OCM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=C9KYfE5y7YcLXlAnermHY8cAfSJhh98OxHVIuy+Yh+o=; b=xZadZv5akneQSSoa4f0dNJPltblYISBA6LB/tUaPOvx61KF4yjXBpecXuCdPmdweuV UgWu4BfiWoBFLdPOt+MB8r11oKxuBZZmsS/3H8lE22P04JI8Mu3IGOOoIZSCtPpQkLcO Pws2YkqGU8uId1/mIR8zFLvcMODYt5APSIEjPsb3CLUbM5rvN/MqkyWpFMxasqF49HAQ NJgWRnPofLIJidAMDHTU+wKLdCqGqaJEm4Rm80meQ6X9dwzm+qUBY+QYcfOsr/oCMZZz uZvvm9kiHdV2aoruglahB8IdyLTw0YAn90dEMqVp7CotDl6IcAeV6bfy2KEKoktEV5fy 29NA== X-Gm-Message-State: AO0yUKWgrq7HkT1eAEVTdYe1WPIr28ErUKPnZkrR+QyG0szef8Vp84F4 O7JSzUH7BIHaG6p8dR9H2MjY2lrnhGsVnZ7J X-Google-Smtp-Source: AK7set80oks5PDJZY3WwY0JBeTtK840qzmFf7sClVzk4MyuHzk2bOA0a86ltDImZzPnekFNZkr9YBQ== X-Received: by 2002:a05:6e02:2199:b0:30d:b3c3:f94c with SMTP id j25-20020a056e02219900b0030db3c3f94cmr3574481ila.2.1674954512545; Sat, 28 Jan 2023 17:08:32 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id b5-20020a92c145000000b003024dd5c682sm568613ilh.71.2023.01.28.17.08.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jan 2023 17:08:32 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Albert Aribaud Subject: [PATCH v2 37/87] arm: Drop CONFIG_MMU Date: Sat, 28 Jan 2023 17:58:13 -0700 Message-Id: <20230129005903.74918-38-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230129005903.74918-1-sjg@chromium.org> References: <20230129005903.74918-1-sjg@chromium.org> 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 This option does not exist, so the #ifdefs do nothing. Drop this code. Signed-off-by: Simon Glass --- (no changes since v1) arch/arm/lib/debug.S | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/arch/arm/lib/debug.S b/arch/arm/lib/debug.S index 5983f2c04ce..af4beb4d9d2 100644 --- a/arch/arm/lib/debug.S +++ b/arch/arm/lib/debug.S @@ -21,22 +21,10 @@ #include CONFIG_DEBUG_LL_INCLUDE #endif -#ifdef CONFIG_MMU - .macro addruart_current, rx, tmp1, tmp2 - addruart \tmp1, \tmp2, \rx - mrc p15, 0, \rx, c1, c0 - tst \rx, #1 - moveq \rx, \tmp1 - movne \rx, \tmp2 - .endm - -#else /* !CONFIG_MMU */ .macro addruart_current, rx, tmp1, tmp2 addruart \rx, \tmp1, \tmp2 .endm -#endif /* CONFIG_MMU */ - /* * Useful debugging routines */ @@ -97,15 +85,6 @@ ENTRY(printch) b 1b ENDPROC(printch) -#ifdef CONFIG_MMU -ENTRY(debug_ll_addr) - addruart r2, r3, ip - str r2, [r0] - str r3, [r1] - mov pc, lr -ENDPROC(debug_ll_addr) -#endif - #else ENTRY(printascii)