From patchwork Wed Jun 15 10:03:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 1643572 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=6xlZjWD/; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4LNLXg1vpQz9t6h for ; Wed, 15 Jun 2022 20:05:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 991908448F; Wed, 15 Jun 2022 12:04:29 +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="6xlZjWD/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 10DEC84489; Wed, 15 Jun 2022 12:04:21 +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-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (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 C723084481 for ; Wed, 15 Jun 2022 12:04:17 +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-ej1-x62f.google.com with SMTP id o7so22187177eja.1 for ; Wed, 15 Jun 2022 03:04:17 -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=RHRnHBraUTYxVgQO6N6wdoEAUEjdiTUD5h35kL+Taf0=; b=6xlZjWD/7licyzPtt2Jc2l+4GCl1TgreltMcG7MaSiklytGQyaoSUtXYWc9ZIqMOtU xEJvOLn6CWPGfKjeJ44e1BqJfJSL2786zQgdw8QBVsuP6vXMY9RuR46RPJySeqEY56uZ bvji5u5k0ISwY3pT3sxS8ucJ7ceXC8ei0nAmLCI1mYLXAVBzEMmn5v1DiuRELINfnrk6 +SX/nMfByJmNrEXYI17OmQJVHS0B5MYPn7Nw3b9Vx7PqA0L1UMVOlQ8x16lNDYeslWun AAMeZPFehQHpGa3O4uZga/vhDMh+1Ue6rNBCUTc7cjU7OHHkPWsbBkwognMaUFC1Pmo3 uOZw== 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=RHRnHBraUTYxVgQO6N6wdoEAUEjdiTUD5h35kL+Taf0=; b=TgNUgXYJupe9bkCzEjt0u+5aSeEllTK9vh2K1Xv4q7Bvhi+nuGltikfFp9bYESOArl Tg8XbuvlaKCsuo2JMAQT+ZL8N3i6SidKMRZAVPaojfxELM8LD+n11e6q8BCSU1R7Pss8 4IMgZIdVWw2YfjDm1ZqeD5WJuB4Sb9eGKx4zuA4Fp9JOpqw+gcJbK+a7oLd8SVRl5Op2 0GF/ibY/7Z3KiIASAwZNnRpijYzmNFh7GfB0ooK9+WXdMKoIAwUjbEMZkprlPQegqzi+ DmPj3PAZuSH72+ehI5ZgpXzV4dl36bw3Ce+LZChRaKIYLHC9zn88ldy0R1mdPIHtFl/l sLOg== X-Gm-Message-State: AOAM532QlVd/lNermzGb3AgzlI0t3HHNnYorjOjwAb8bQ+YrLs0WuzMe P+41j+RSm53DA0HXmYToq6fq2zlqGNn4Dw== X-Google-Smtp-Source: ABdhPJw5EnVVLsdAl7bcLQ5q+ZBFKLbj8Bqn38KFP4UimQGdheLMycHurFoK7UlRrC3MVSc4sO38RA== X-Received: by 2002:a17:906:7254:b0:6fe:5637:cbe6 with SMTP id n20-20020a170906725400b006fe5637cbe6mr8040926ejk.612.1655287457114; Wed, 15 Jun 2022 03:04:17 -0700 (PDT) Received: from localhost ([2a02:768:2307:40d6::f9e]) by smtp.gmail.com with ESMTPSA id pv17-20020a170907209100b00704757b1debsm6092981ejb.9.2022.06.15.03.04.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jun 2022 03:04:16 -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 v3 08/23] microblaze: Remove CONFIG_TEXT_BASE from code Date: Wed, 15 Jun 2022 12:03:45 +0200 Message-Id: X-Mailer: git-send-email 2.36.1 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 --- (no changes since v1) 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 */