From patchwork Tue Jan 24 17:06:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Schocher X-Patchwork-Id: 1731290 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 (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=lkGQL6Lj; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=g4QlptyQ; 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 4P1YMC2fXhz23gM for ; Wed, 25 Jan 2023 04:08:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3FFE6856A0; Tue, 24 Jan 2023 18:07:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1674580064; bh=lHZ6UEF2zsKiMVhyL4aZKDiNYSB8E7GSTRrP8MtIuZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=lkGQL6LjJXjKO7PXXUIyD/TOocmWIvAgCpEGcfD55s66Ur7Wh0ktJFn+T6dnR0ifh 3uQgn9VSUl71Fejcas1pXqgvrb/K0u+C5HUGSuHmuYSXouXM6CgxemEWiVm+CZBHOR diP/jaW+WDKsIvCZeXhvbSoXP6oANBZV7/3Fx/u5tzIPxP0/2T/U0cXL7zxVI9L9rX dE8Wl/cHr6YdDNz8SNgzruSlLPMeHuk7gasEsKqVpzzrqVSCrl/HAnpRdBMIZeHWNG YhgqnQvdA899tb7tWYBspONv2sNIhp+uNJxk+fcJ208XsFqEh2ZNLa/1aV10kVSa1Y PWcfDyTcxLVZw== Received: from mail-internal.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: noc@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 981B8856AF; Tue, 24 Jan 2023 18:07:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1674580049; bh=lHZ6UEF2zsKiMVhyL4aZKDiNYSB8E7GSTRrP8MtIuZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g4QlptyQ7jLmCymiR+UiIvZwcPcXMuATiQBTVWDsZCPgFK3Cg+pAlhdOjA0+Ytdhi Y+GGPY9efHGE5Bv9L4cwOpwU5ipMgZpDGoOCKk9lvQaR9oQP5U5QNp+q74nyYIwkoY Ex1tsIwD5mBzvok2pfBFgK7ENa6yxgIkuVmi6ZYNxWlZUZe/fW+FvMRTAwvLLChWZn df3dFZhTvS5XxUbQRa6BDsB3HZqutHKzoRbekMnqBwlmPuyG52SMFq1uhQboIkVyW1 9Exxu5SvHoeqZBDKGik5V1Irv8HDai2RkvjWIpb8n9JeeDJ9NIpppU6oEXrmm2i+m8 WgqwSAybu3wAg== Received: from pollux.denx.de (pollux [192.168.1.1]) by mail-internal.denx.de (Postfix) with ESMTPS id C0C1C180363; Tue, 24 Jan 2023 18:07:05 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 515) id B982A1A009F; Tue, 24 Jan 2023 18:07:05 +0100 (CET) From: Heiko Schocher To: U-Boot Mailing List Cc: pali@kernel.org, Heiko Schocher Subject: [PATCH v1 03/12] powerpc/mpc85xx: drop socrates specific image creation Date: Tue, 24 Jan 2023 18:06:51 +0100 Message-Id: <20230124170700.3889830-4-hs@denx.de> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20230124170700.3889830-1-hs@denx.de> References: <20230124170700.3889830-1-hs@denx.de> 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 convert socrates board to use MPC85XX_HAVE_RESET_VECTOR and disable CONFIG_OF_BOARD and use common u-boot.dtsi for creating u-boot-dtb.bin. Signed-off-by: Heiko Schocher --- arch/powerpc/dts/socrates-u-boot.dtsi | 17 ++++------------- board/socrates/socrates.c | 17 ----------------- configs/socrates_defconfig | 6 +++--- 3 files changed, 7 insertions(+), 33 deletions(-) diff --git a/arch/powerpc/dts/socrates-u-boot.dtsi b/arch/powerpc/dts/socrates-u-boot.dtsi index f6af611b51..67c12f672c 100644 --- a/arch/powerpc/dts/socrates-u-boot.dtsi +++ b/arch/powerpc/dts/socrates-u-boot.dtsi @@ -3,20 +3,9 @@ * Copyright (C) 2019 * Heiko Schocher, DENX Software Engineering, hs@denx.de */ -/ { - binman { - filename = "u-boot-dtb.bin"; - pad-byte = <0xff>; - // Place dtb one sector before u-boot-nodtb.bin - blob { - filename = "u-boot.dtb"; - }; - u-boot-nodtb { - filename = "u-boot-nodtb.bin"; - offset = <0x20000>; - }; - }; +#include +/ { chosen { stdout-path = &serial0; }; @@ -38,3 +27,5 @@ u-boot,dm-pre-reloc; clock-frequency = <333333330>; }; + +#include "u-boot.dtsi" diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c index 9c4dd186fc..1d63c81a9c 100644 --- a/board/socrates/socrates.c +++ b/board/socrates/socrates.c @@ -217,23 +217,6 @@ int ft_board_setup(void *blob, struct bd_info *bd) } #endif /* CONFIG_OF_BOARD_SETUP */ -#if defined(CONFIG_OF_SEPARATE) -void *board_fdt_blob_setup(int *err) -{ - void *fw_dtb; - - *err = 0; - fw_dtb = (void *)(CONFIG_TEXT_BASE - CONFIG_ENV_SECT_SIZE); - if (fdt_magic(fw_dtb) != FDT_MAGIC) { - printf("DTB is not passed via %x\n", (u32)fw_dtb); - *err = -ENXIO; - return NULL; - } - - return fw_dtb; -} -#endif - int get_serial_clock(void) { return 333333330; diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig index ade1c79c03..03e84c3e7e 100644 --- a/configs/socrates_defconfig +++ b/configs/socrates_defconfig @@ -1,6 +1,6 @@ CONFIG_PPC=y CONFIG_SYS_IMMR=0xE0000000 -CONFIG_TEXT_BASE=0xfff60000 +CONFIG_TEXT_BASE=0xFFF40000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SECT_SIZE=0x20000 CONFIG_DEFAULT_DEVICE_TREE="socrates" @@ -11,13 +11,14 @@ CONFIG_MPC85xx=y CONFIG_SYS_INIT_RAM_LOCK=y # CONFIG_CMD_ERRATA is not set CONFIG_TARGET_SOCRATES=y +CONFIG_MPC85XX_HAVE_RESET_VECTOR=y CONFIG_L2_CACHE=y CONFIG_ENABLE_36BIT_PHYS=y CONFIG_SYS_MONITOR_LEN=786432 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_MONITOR_BASE=0xFFF60000 +CONFIG_SYS_MONITOR_BASE=0xFFF40000 CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run boot_nor" @@ -54,7 +55,6 @@ CONFIG_CMD_SNTP=y CONFIG_CMD_EXT2=y # CONFIG_CMD_IRQ is not set CONFIG_OF_CONTROL=y -CONFIG_OF_BOARD=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_ADDR_REDUND=0xFFF00000