From patchwork Thu Jun 2 13:57:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1638367 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=6kiPgBsP; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LDSML3vqGz9sFr for ; Fri, 3 Jun 2022 00:00:14 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2EE6184346; Thu, 2 Jun 2022 15:59:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=monstr.eu 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=monstr-eu.20210112.gappssmtp.com header.i=@monstr-eu.20210112.gappssmtp.com header.b="6kiPgBsP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8C7588432C; Thu, 2 Jun 2022 15:58:09 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) (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 4055B84327 for ; Thu, 2 Jun 2022 15:58:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=monstr.eu Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=monstr@monstr.eu Received: by mail-ed1-x52c.google.com with SMTP id o10so6383935edi.1 for ; Thu, 02 Jun 2022 06:58:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monstr-eu.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NRfPiJUUCvVrseVrkfi+Y3PxK9vTtDcg6KiZKStTpkg=; b=6kiPgBsPRLyTXjfxuUw2B3gMy2D8TJdnhQD+Gw4ept/fywOoJjxGn5U4TNTLTtzwck LBr/+7mJ01ck2XcCgwxjsEArGZXRcts8ujlHBjH3cYhQoA+GCmEslqnUjn+ZBya6Wil5 QPKu3eXP39krQhBOvJNt+S+9FCOgH7lKwQIJF3GeoqaVjj/s7NOXU2EbOpc6M/KasRsY cdLg/yZP9hmi5gcXBgvwxGenmf9MpnO9NDBkpwsngS304A9EHmecRLUZri8P9k3s4l+G et8Hapc++sqrCEPkLb8A962ZdK8+7eUaRTtjnEgCJZv2jqpsQdc4TzhxYrkUlT6h/SNy PD3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NRfPiJUUCvVrseVrkfi+Y3PxK9vTtDcg6KiZKStTpkg=; b=4mOep/cAbzeQPgVIFopk2VwBelyJKzFwC/nPN20fYDISrePN3DpuDMxvurstPTzMje C0nPKuyoR76DQsx85IphhzWJZdX06+yplRWiJa1U8m0tBMFzZxkrqfkTAt0LhmkIfJuv xD313l6y5e8GF8QDjXBdFB+iltBXxlNiwTHzLIqpUeU2/klZjiS83psHbbD95ZpTsky3 YpCEFklOmIiUo0s8J9IVcWllR5/9EX1OcnWIr1yk7LY8IHDN6oFm9L20KswnrYcRbd+w PiyNOQGGnXx7HtUJgbS9vsR1c6Z9/2hZOTIj+T93LwJDoMZqndCfTRmKqkRNzynV1uwB ky/w== X-Gm-Message-State: AOAM530oc4Bh5LkxjKatP6/xYwhwm72dt39hllr1DwUmy+qyqv2YQ7DC Lm605QxnV8IoOgyuIlkFCW6E+kZlHmRw5g== X-Google-Smtp-Source: ABdhPJztuy9/yeCo7sMifP+twFV/q5/LZmV//pcLIEGNrKpEaSrFJ5IINOYj8RgXP7dxkDcNn6arzQ== X-Received: by 2002:aa7:c55a:0:b0:42a:adfa:9150 with SMTP id s26-20020aa7c55a000000b0042aadfa9150mr5592914edr.57.1654178283282; Thu, 02 Jun 2022 06:58:03 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::f9e]) by smtp.gmail.com with ESMTPSA id w3-20020a1709064a0300b006ff0b457cdasm1791920eju.53.2022.06.02.06.58.02 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Jun 2022 06:58:02 -0700 (PDT) From: Michal Simek X-Google-Original-From: Michal Simek To: u-boot@lists.denx.de, git@xilinx.com Cc: Michal Simek , Ovidiu Panait Subject: [PATCH 08/22] microblaze: Remove CONFIG_TEXT_BASE from code Date: Thu, 2 Jun 2022 15:57:32 +0200 Message-Id: X-Mailer: git-send-email 2.36.0 In-Reply-To: References: 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.5 at phobos.denx.de X-Virus-Status: Clean Use symbol instead macro to find where U-Boot starts. Signed-off-by: Michal Simek --- arch/microblaze/cpu/start.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S index 1acac5faf428..205d5f384c38 100644 --- a/arch/microblaze/cpu/start.S +++ b/arch/microblaze/cpu/start.S @@ -142,7 +142,7 @@ __setup_exceptions: swi r2, r4, 0x0 /* reset address - imm opcode */ swi r3, r4, 0x4 /* reset address - brai opcode */ - addik r6, r0, CONFIG_SYS_TEXT_BASE + addik r6, r0, _start sw r6, r1, r0 lhu r7, r1, r10 rsubi r8, r10, 0x2 @@ -285,7 +285,7 @@ relocate_code: /* R23 points to the base address. */ add r23, r0, r7 /* Move reloc addr to r23 */ - addi r24, r0, CONFIG_SYS_TEXT_BASE /* Get reloc offset */ + addi r24, r0, _start /* Get reloc offset */ rsub r23, r24, r23 /* keep - this is already here gd->reloc_off */ /* Setup vectors with post-relocation symbols */ @@ -323,7 +323,7 @@ relocate_code: nop 2: addi r5, r31, 0 /* gd is initialized in board_r.c */ - addi r6, r0, CONFIG_SYS_TEXT_BASE + addi r6, r0, _start addi r12, r23, board_init_r bra r12 /* Jump to relocated code */