From patchwork Mon Aug 10 14:26:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Wunderlich X-Patchwork-Id: 1342857 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=fw-web.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=mailerdienst.de header.i=@mailerdienst.de header.a=rsa-sha256 header.s=20200217 header.b=DpD4biyp; 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 RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BQJQl3X3Sz9sTb for ; Tue, 11 Aug 2020 00:35:11 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DDC66821EE; Mon, 10 Aug 2020 16:34:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=fw-web.de 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=mailerdienst.de header.i=@mailerdienst.de header.b="DpD4biyp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 03AC8819EA; Mon, 10 Aug 2020 16:27:19 +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,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mxwww.masterlogin.de (mxwww.masterlogin.de [IPv6:2a03:2900:1:1::b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 18CF281817 for ; Mon, 10 Aug 2020 16:27:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=fw-web.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=linux@fw-web.de Received: from mxout4.routing.net (unknown [192.168.10.112]) by forward.mxwww.masterlogin.de (Postfix) with ESMTPS id D3D70962F9; Mon, 10 Aug 2020 14:27:14 +0000 (UTC) Received: from mxbox1.masterlogin.de (unknown [192.168.10.88]) by mxout4.routing.net (Postfix) with ESMTP id A29361014C8; Mon, 10 Aug 2020 14:27:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1597069634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xR/ZUp6Xkw7MizTjezYi0W7qmcCqXEBo95Rcq/Rb/fU=; b=DpD4biyp7qhc0AqLRwqnpRZhjjUbHg30gGUqfpygV05ru0T05zSZew3qNV5cR86HkQuBsz su3Fd8JzBRsn416icpflOZYQdAOo2Z/RfU/nU6zlo8raIbroGD0Q6KMcoLEC3mj2WtFflt Qy8JbjT3FfAEIOHbc/0MaaFV6wXGt8A= Received: from localhost.localdomain (fttx-pool-217.61.151.249.bambit.de [217.61.151.249]) by mxbox1.masterlogin.de (Postfix) with ESMTPSA id 0E0CA40501; Mon, 10 Aug 2020 14:27:14 +0000 (UTC) From: Frank Wunderlich To: u-boot@lists.denx.de Cc: Frank Wunderlich , GSS_MTK_Uboot_upstream , Ryder Lee , Weijie Gao Subject: [RFC PATCH 3/4] jumparch64: insert into bootm Date: Mon, 10 Aug 2020 16:26:51 +0200 Message-Id: <20200810142652.40669-4-linux@fw-web.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200810142652.40669-1-linux@fw-web.de> References: <20200810142652.40669-1-linux@fw-web.de> MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 10 Aug 2020 16:34:27 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean From: Frank Wunderlich if uboot is 32bit and linux-kernel is 64bit packed into armhf mkimage (like official kernels for bpi-r64) call jumparch64 to switch to 64bit mode after unpacking the kernel-image Signed-off-by: Frank Wunderlich --- arch/arm/lib/bootm.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 1206e306db..015a5f7f86 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -374,6 +374,16 @@ static void boot_jump_linux(bootm_headers_t *images, int flag) ES_TO_AARCH64); #endif } +#elif defined(CONFIG_ARCH_MEDIATEK_32) && defined(CONFIG_TARGET_MT7622) + extern void jumparch64_smc(ulong addr, ulong arg1, ulong arg2); + + /* + * Iverson 20150528 - show message for boot. + */ + debug("images->ep = %lx, images->ft_addr = %lx\n", images->ep, (unsigned long)images->ft_addr); + + announce_and_cleanup(0); + jumparch64_smc(images->ep, (unsigned long)images->ft_addr, 0); #else unsigned long machid = gd->bd->bi_arch_number; char *s;