From patchwork Mon May 23 12:40:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634530 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=FpftGRKx; 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 4L6G7X6ZYTz9sG0 for ; Mon, 23 May 2022 21:58:32 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A079383FEC; Mon, 23 May 2022 13:58:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="FpftGRKx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 675688405A; Mon, 23 May 2022 13:58:18 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0616.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::616]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 01CBE83D7D for ; Mon, 23 May 2022 13:58:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FXK+rnrVHL5O3T/pNJ6E3nLV8+ebTMpReDUp8OxBNRTPhqyQg0rP9CLTJiQelQO30VFBsMosLknalCd+Ydz7oehgPkYiTOaBjcxPh24AYn3t8KOECrCMbMr42qyQDoy/rrkvmAXiTZwR4acH17vjWY3bCQzUQA975uKDTxJbiOFUG9mbe3WaePBh0suvkvex4fdcW4seYfZUiJzKE4184K7NsKJ5X1dxLJSWooIfgRWhc4t18d/MWekWD0RSWeppZPyHeuCNYUeLvGCWCNPH33M3tSwnqjPbkYJLJcsXDr6XfcTxHO/swma1orRr9MJtd0SlrIQ2V3ur4FI1f2v7Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gRLLKTOa+pZJgNR01zYgP4vfiOOiio0GPwxseUty/IE=; b=CHlZBVnrzRuHEFAENx/Jr7WfT8lozN5MjTeC+0YfmfK14hPgoXnUdFWVMZ8xOQEnz12DCDj3YIaViZZgLLfK6MHgrsgwSf9IoKktx0LPW+D52aQDRqNglK7KzMlcxJ6Lz2iieHTa1rR8pjA4uoi10tLQBgoDKuMqGVQKEMIIItASKOu1KxstGLDvj5ewUCekNK0MdKGqyfo/shorkCWiyRpL4Ikq6Hp5EtrLUgTlM6bbQG0F+9eW3ey0duQ9VBEsjFYKf9nwGICOiLQItw8JJHIRBrEKxUToR4zoS66p9tEnDgQ+wBcvMSRBXj+arPJ/v6TwOMDBsa0J2HXqjG7I2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gRLLKTOa+pZJgNR01zYgP4vfiOOiio0GPwxseUty/IE=; b=FpftGRKx5BfDoXMNGpTibx4VYkalPHMbpib2c6A6fKxD49yncQOuANBdfr2KZgfULljHKbafU2xf/w5Am60bS7FoopuQm8nJYiyI4EzktLRxqFqJMKYkrFYQMqRPl5WtMgNjmE3jgG74NVZRm/FG3acdRKjdsALeE+AdT5aYAnU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM8PR04MB7972.eurprd04.prod.outlook.com (2603:10a6:20b:236::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:58:12 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:12 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Heiko Schocher , Peng Fan , "Ariel D'Alessandro" , Michael Trimarchi , Adrian Alonso , Arkadiusz Karas , Soeren Moch , Marcel Ziswiler Cc: u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH 01/22] imx: drop CONFIG_MXC_UART_BASE Date: Mon, 23 May 2022 20:40:13 +0800 Message-Id: <20220523124034.12813-2-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fbebefd1-419e-4b08-90b2-08da3cb382db X-MS-TrafficTypeDiagnostic: AM8PR04MB7972:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o2ggcJZZj8Bnqt997jCegH+r3W4z57S0xnWQil7d9b7n3qAMUH7WkqoZ2uBxZaa4WL0h5BKiQWJ5DfHP59vls72IfzJJpNX6vL1MncHL+ruk8D88dvhEVRVbUSxsafllYbH4CnnuiUqvUhRP+c+ZYGHMRoEw7FEq+s2Q8h+ZtS9eccLyEG+6kUJSHQKqoYLPSpLnxCzw/HfhhitbDYgH04+O7eYAWqdqHCR7GXTzQiizfT8wAAaGNG9U8Jka4YkspFgAr1h2Uou6xP1XLDnth0wfrbz3iiWM6FeOUveIFqTYJ+q7QmRvLvS4YfSwFDrYgRtEyjfUVfCvQ8IUneW3ZqB6k0fsoM7ak1p6X4ttPN1eliiAh0FsB+SFSpmNwiso7c9IgAwjrg2SeuCnBvKIbJcXNIZIuM2v3R8p5acPL7wxYCa0o3WBpZbR1D8op4uzWEHo9y6vgOn4QcWnL4ZVuklfLj4wUciI/no/er+hRHmaRqql3OZHEJmwMgvmx29Kn3dj1y2GP50i1pSfwPypN92Cg7nwLwctmtcttaZZBsg+t4WDVRr09NN38yJdUw+biHgC0Gm0FqMpViF9Q9z30t9guJ6++yjZ/IIxW627S7sIpUs27da/7j5IP3Tla9g9BGgV40n0kq0s2ODLr4pA/IaEw9ozAinohP3k6COy05TSD6RsnzaKQbFf0j+GqjebILbhHHy5dBQ4iS8i9XSGNbMaCEf3XuJz7bIIrjoCyfo= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(1076003)(508600001)(2906002)(186003)(2616005)(38350700002)(86362001)(6486002)(83380400001)(921005)(8676002)(7416002)(4326008)(66946007)(66476007)(66556008)(26005)(6512007)(5660300002)(52116002)(8936002)(316002)(6506007)(110136005)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CeisYg44BKJp1oi+KYWUXS1LL3DbtzhuRWPcjg6Z/gEvH6Cj9xmKibhf4ZL39piWywEEq2s515yr5x3sdVubnM+Z8qkhctvNe3qtTBwcf6eIPwXyT9U23CXaqmGbAcIHk+dhsGAd2AQqLNCKJWNiAiQN649PxDfx9WJEdoNNlHsdgCQDulQE3f5TrcnvjTK175mYUoyFygEPElKUwAG1LjaOMKylox69ILehf5Ne5zmCyNsaG5wCcKos/+YDoc6eWFKU0K9YQCZ4JAkkqd7QN3oOI5o4IYrmRMWTN6eWcvMbAGShg89qZVbNDrZTI7pkfbk/6RslaGRJ2cFR545wINyAlDYTcBj8mfTlHPMPkcZ9vkcnIV8/WdGwecgUgjjVnQYfJfW6KKg3dAZrVkRbfG87HFCkXKJPIFsZQ3kcIYGd0kytpgGZLoMO6KaaXidX9PTY4dGhldpoYmb/+WjQ+VndQjzHz3EykKnBAUyFsgWC9XMVk1k5/PTCciRzKrzVF7Q/ntMMWi5BIltJNzRO5erHiesP6mZl9BTlmWRvhUqwdxnH9Ng9F9V4CkWi60C1Z1m4I5KpMATQ3CUzmNf/YQdRsPxH0ZdfGgS8GXTlT8GNUMHlJk48EVKgU0szCLPDTeM6T3QIyhSFaVAL0gqdz4N4+UFBJbnqfNQoNtBI96eEmRq5VB1gPebDz6Hx8nj5OHGJRzXmDECgg4j/VEfkg6C5YZ5aKhg6mb6hBoNKSIzxtoRYEvD2mo4jMTtot4fzXxec8Oyv3bUafAuaNPKupyy/6hHWlQa1SfyCwXAqrs4CQTlfEbhbyPHJVH2AXpYb1aQtBf1nw77UXwJOVWyRv3wFCQm5HUjQbQxE5FqWhJKRn64/E7KGzwZc352ChLR57NMq4nPzaBfyEWkj6DGq67Xneq8d4OzTvcmgj1NovH6po7NetWkSxwT5Y8w7vLuhTmjf2HWgX/V36KkHcK4Aem3dZnxMMG6F7987Vc+zy57YH3Au33P5XyP98jwKc7Lx7fGCnEsjroZrytDz/nEqkwNnus8jw+akAj+HoI6IsTzbHUpIk0YTKWC3ZyITFSPQEK3rnbVdKJKjvhPw3HiSva0zzcbdSzC2NQjOVt7MWjRPvhG0Q+n+T9P3YD2FApekaqBMdRL35H8t4ub173z4E77HDCIp6izVQPShg8hepdpXwSvHnwqAIS8TwXiJdhQ9IRUQJRSZiGov38gNoA71x/uMYlBFaUQ8a7UFNtb+z5ZTsc8ZXEb0md+YbgYgRx4X75gdAZYfHuwmxU5NBdWXEDzoOWpwOgAo8LX2njGAJv1eRkh2Brd8i+g/gCpZwVJKzrSvFKgOsmUd/m1PTBS0DBMSqHZX83y4vVCwr3CIBdkp3EbSj9mri0bZqTdUAI7AWdT+Z4mb5wD1iOyJ5/au2Zgkwrmlf1BvadUBFgyqVEYjmhZ6spyoUcXp7FFUHPgmCnut/C8vuzxRnedMrv3lI2lOUfTLAnfMyHsD0REmp51i0kQrono3wcFx2whary0253PFZ6ssIXQBAbb6Xby9fgo+aDAy1svh2cnfbj6jFEZeLV4yN02PGBMrION6FeJKQA0HSjw2Qkf6Y/qogtg6WQo5rm/pnPnf9DE9GrZNon7PDe+2lbFusc6PT3qEBEqzxG9kI7TP0Zu3a5YodY9le0dvl8uOfVbSdqTKBR4LjO4OBfyioOFw8NskspIljK+zH4c84OUEh3OBNJ5uilqqJg== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: fbebefd1-419e-4b08-90b2-08da3cb382db X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:12.0617 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +RvX5gwPQ/j+aQp9k8/tt1RguBSLOCdscW2nFukoVCSxcMcbKcJiIMld8tMMkSQrP+zIjdYbFSW4Qz39uLqL2Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7972 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 From: Peng Fan Since these boards has CONFIG_DM_SERIAL and/or CONFIG_SPL_DM_SERIAL, the legacy macro no need to be defined. Reviewed-by: Heiko Schocher Reviewed-by: Fabio Estevam Signed-off-by: Peng Fan Acked-by: Soeren Moch --- include/configs/aristainetos2.h | 2 -- include/configs/imx8mm_evk.h | 2 -- include/configs/imx8mn_bsh_smm_s2_common.h | 2 -- include/configs/imx8mn_evk.h | 2 -- include/configs/imx8mp_evk.h | 2 -- include/configs/mx7dsabresd.h | 1 - include/configs/somlabs_visionsom_6ull.h | 1 - include/configs/tbs2910.h | 3 --- include/configs/verdin-imx8mm.h | 3 --- include/configs/verdin-imx8mp.h | 3 --- 10 files changed, 21 deletions(-) diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 8ee97f1d4e3..27adae5d6bf 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -14,10 +14,8 @@ #define CONFIG_HOSTNAME "aristainetos2" #if (CONFIG_SYS_BOARD_VERSION == 5) -#define CONFIG_MXC_UART_BASE UART2_BASE #define CONSOLE_DEV "ttymxc1" #elif (CONFIG_SYS_BOARD_VERSION == 6) -#define CONFIG_MXC_UART_BASE UART1_BASE #define CONSOLE_DEV "ttymxc0" #endif diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 5e8f19c43fb..002b2e68bba 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -68,8 +68,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/imx8mn_bsh_smm_s2_common.h b/include/configs/imx8mn_bsh_smm_s2_common.h index 6387576c2da..57be38d9433 100644 --- a/include/configs/imx8mn_bsh_smm_s2_common.h +++ b/include/configs/imx8mn_bsh_smm_s2_common.h @@ -45,8 +45,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 -#define CONFIG_MXC_UART_BASE UART4_BASE_ADDR - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 805ae2a7518..86be1b8b3be 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -75,8 +75,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 1e7c44c42a4..373098f10c4 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -79,8 +79,6 @@ #define PHYS_SDRAM_2 0x100000000 #define PHYS_SDRAM_2_SIZE 0xC0000000 /* 3 GB */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index aaad232f0e4..62e62c6701f 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -12,7 +12,6 @@ #define PHYS_SDRAM_SIZE SZ_1G -#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR #ifdef CONFIG_IMX_BOOTAUX /* Set to QSPI1 A flash at default */ diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h index d4761296c75..e6aad386efe 100644 --- a/include/configs/somlabs_visionsom_6ull.h +++ b/include/configs/somlabs_visionsom_6ull.h @@ -16,7 +16,6 @@ /* SPL options */ #include "imx6_spl.h" -#define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ #ifdef CONFIG_FSL_USDHC diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index b7a94812f35..5d8cb34ad9a 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -24,9 +24,6 @@ #define CONFIG_SYS_BOOTMAPSZ 0x10000000 -/* Serial console */ -#define CONFIG_MXC_UART_BASE UART1_BASE /* select UART1/UART2 */ - /* Framebuffer */ #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index cd950ad055e..9ed9da043f6 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -83,9 +83,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE SZ_2G /* 2GB DDR */ -/* UART */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h index 470f64d5a74..20e8473f793 100644 --- a/include/configs/verdin-imx8mp.h +++ b/include/configs/verdin-imx8mp.h @@ -99,9 +99,6 @@ #define PHYS_SDRAM_2 0x100000000 #define PHYS_SDRAM_2_SIZE (SZ_4G + SZ_1G) -/* UART */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(3) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64 From patchwork Mon May 23 12:40:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634532 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=KSWTuBLK; 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 4L6G7z6wXGz9sG0 for ; Mon, 23 May 2022 21:58:55 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C5C4C8421F; Mon, 23 May 2022 13:58:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="KSWTuBLK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 47E958408D; Mon, 23 May 2022 13:58:23 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on060f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::60f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BBA6883FEC for ; Mon, 23 May 2022 13:58:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XPPqWT61DOob2BYwQGosapNPD0j+nnuadczGdlfKRRfGOS4/U/gCmZqE/RyEH+XaRfHOKFoHAmcgfDEHkwKo/zgcL3ZHyj0U4phhKhbVgyn90FawEc93CExTTzy0gOlNHh7v8c0wd5OeyrQZAC/9AP3sNSqZIG8CCCdhs+f0jcl1EkuBhYozjl6YwPlkCljVyORHcSbXZjITOFlsB6LiZS37VdgNwtk+YshhkE7JkoXv4lTIWxXblM4tt9ivR0SQQ8nIX5V1SbLBg/HWg3WKE3xxqgykExIRyiQGdUoBXCFWcXqaG9/rszBVk2NKsQ4iB4XR9oGen7QRNQYihby58w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Q9tvUJiFNPNDwqni1Tbhn/jccHVEPmfjD4J7UxzjWBU=; b=XHD6PeKTSwhpCDuTVuQOeSv/HarWppptCtESqZWo9qPdoFITYxZH8Jnv1RNAxlqbBSlQFfCXNQL5OQO1YKLfg/FhtaipVOylRgPvhfKj6RvCxMBYbiQB3G0EqqMTnqluS6+ADCy7EuXy+1OhH0GDa7BOAtMqhz2CXa1FndNPrRkPMY+aKdDpkuz1I0+KzTOD+0rU4XSODQuI50nsjaEafvOFeGdUJNR2T4CESUWF66ezC3AUs9NruMAqcxZHPVts0dgJ8g1zR2w+3xd8qV/YGerM3KgPBpv/sddmNto1rGdLQnFVd3cf8KpiKs8XMwhZWfkZ7MnVQeUpuEhSuMrlYg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q9tvUJiFNPNDwqni1Tbhn/jccHVEPmfjD4J7UxzjWBU=; b=KSWTuBLKhLVCu+3TFO/3ekULhqFkqE9lcHWuSXNlIqn1/BMHWtpWWqPDFmOkjt+PkgbzXN0XFNO+asLM4FZQl5Tg4eVFg+PWwozD0PRcGCPKD9BSCQXgWUS8iITJcnoKVpXeVKl+V1loaN9wn4T1KLT6rYoCujjJZQrruwaHiOg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM8PR04MB7972.eurprd04.prod.outlook.com (2603:10a6:20b:236::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:58:15 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:15 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Tim Harvey Cc: u-boot@lists.denx.de, Peng Fan , Fabio Estevam Subject: [PATCH 02/22] imx: imx8m[m/n/p]_venice: Enable SPL_DM_SERIAL Date: Mon, 23 May 2022 20:40:14 +0800 Message-Id: <20220523124034.12813-3-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bdac46c6-31c7-470d-ef50-08da3cb38494 X-MS-TrafficTypeDiagnostic: AM8PR04MB7972:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0Shges97l64Vp26fliLGEojBv+5TaFvW87DvxQnvnCHB5ldVb5G875P1LTr+DRro040PEhFEplaR9swNjpBouNBVqTlTUwfeoUiaLpga/mkPmB6IJ31ddHlmmQDCDXm+oeJBMkfvNgAXrX8VNVWE1mLJGCTHm8s5OYKAGXfAg7yBu8ec15xPHX3PvL+gU7BpfX/yNtS7Vm4FA0Ai07kE/YfkgrSeGHqg9aFt+7Op49j67corNU3949hZmSnKXXBGBVqe8heTaav6KvJ6fw3BKJoqM+O1Oufl5kTabKr/xqgk0v6N5kI2HuYYxe7De3WBv3ynlWDPayowgBgB30bLOSecv9hZlqvJsGublLQUeWnqa36K7IdBr6PSYVuU2sGlSr4NacxFUY/oRoU5Kv/tMr+Dl/GQWXAK6Jrx+0kmfP+FOOLQiE5Tu/i/TETuP5RU9iPp2goza85tmhLqavQT7KnpaJf6YQVg3syynNrsCEV0DkWojH334qwgWwztr1ZHcaK5jB9ZwPJWl3dZttGLMV0oUUL97uNALdkbM6HSSGwpA7SYrfkR416lmXxNZy89rk370kSa4CK2+nU1mwgJDrqHjdgMbvxChRk0pVKSLwesGq7JVQXHeBJT5gWbUfpskhGPDOpKEIOiHPbAEaCnq3ZiMaZMfXWCfRZ5yBLUK52QFG8hwmM/XVkAGVgW9xO4TvXLr7iCt6ZJzY4olYdPmUDGPUBFRtW0e3qhB9KV2I0= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(1076003)(508600001)(2906002)(186003)(2616005)(38350700002)(86362001)(6486002)(83380400001)(54906003)(8676002)(4326008)(66946007)(66476007)(66556008)(26005)(6512007)(5660300002)(52116002)(8936002)(316002)(6506007)(6916009)(38100700002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: axQGaUqvXhnLLZXT6tbr+602MRW3Zoobe1v7h0BiIGcWu/4zuuw42hp0kP9/LX4KjrUuiESf/wboFOmhzSPRCw8yLo81Nv66CSMs7vvSLnZN9VfoA4R7V8BTNjPFK5yjS58Vp8G+kIyp6LiEHJ7q8tbK44F1/P7yOxRnAq1Sq2dscD3To6w8LwyJUvDgUzs54Ict7ouJWx8uSq95jpgmY/HE4ZL72QZ12A4GGCmG7RcBAj73eJTD9Nb6v92VIYUgx0XXSe78Z/hY1l5EX07olV9S4aMk9w3Q64qFcDKJjv+ThLjLg/osi/WFtCHSouVDlFxNzv50QtQANIaw2khn/lUxEqLIPuSowgX1eKKzRMwBlUlPRW+nUQM0zgYHczAvrthsOKoMBucsmjis5GoZQHjB2BwFFbo+gGslr2X1dwpzHOswUy6fn3ni63+0mPxhnaclVj6y0bSn4rgG6Ij/n8CZyVl4cBYs6K0aH+POlNhDlz1s4IHf4CUcHsKUdoL2UTDoYUhSDRfJ+Qf36ibwb/8uRuz60hgo6mnw+0nSbIupP4g+ygkKH/ZG4XBgKlsG9I+Olcy6qiQKE2KeZfeACkY9TUR06MddhQO4ryo7O58boLQVsZc5XBpewxFdE5nGMAI5eJTWWHpch4EaeEAXTFAF0fBEGQx4RlCJZZk8trijH8/B/sAvB/Vtm7MKHP4MC01uHa93TFTHJPRox631n+idSWzfvZySmgZL6UohzqEICsXjy7RgwgVahX1u4lbIj0e/M80ftFMFcysureFNPdFTGXIXJRpo0rOjIVbJztlFdprbXdadHT0tWcL52YOf0zurrSmoq4VXiM3skb0iOl57qzjtUyzUVYjuz+/wjIsSQsm1d22cV5ZeymI40HYWa8hNKKPRB2FZ9MJqBooDYTWo4MowFUUbdPk6MopUxhZ3MHsSE5bjO/55yDBYgXLe/u2uPch0Tn1SlQgNfnAs+fdaCz8wtfCprhtnZeBP2EXWb/iQ4XXl+420mYHMnWQXF4hz9jr0PoA7wJA8H5C63kD8kvR3izRKjraxnDJeuObjmcfDqKRg08Z8gD7v9MKIUbxJj/vqAhqOB43walppaOfGATaNCnRh8lEhktFOJTKNG1hni1PoS3HTVR4UxD4QeK1ShdTkVySRhmGHhik8mC5gThGlBH8U96V47DiQPLCPs6i5GElj+nzpB0MJkJ6Rstkas+qWmRJB17kx4/UHbsRfHuWtKIy3xMlaXoJj4+zCiJl+77Gp7E/IEhD6hV6jn2KWTQ9RiqMWgmTN8qP9T7DDj9ly9tuXwg+RbPP4HPxXlmlNkBx8MuVhQTZpOaAlXnxtdxNdHMe61xwbsJIZlS6PE/LatKFXb68SpFnRBuzjiXpqIow11Z+Dcv4JD4XLhXuOihOwG/Ywk65RnhaE25rLa/P8PK+pdUFP0rmjksfDza+Yxu7/bi3ePFKdEOfvE012YQwODIC9jBZ5yhVI7d+2yUW6XUtx3+j7sEtrEqsZCX0ue+I3umuLHwX54a+nqtn/VRsSo+8GmjS98zjChb2mq/VJR9PeUJ7ROMTHZ94g3jTYIsYF4TGo1ePWAsykkcBScM/+XBqEuCQQ+RNI7GqVTvlcBsRvk9GoyvLU2sR4mgPCaisb+KwZ+EazOpFeexeTaxBW0Hf5scOPHNu0igay/lpzUPseZJckvhR66OIhjeebGrfv7E/FwkR0js8QRj98hcQmh+jXlARtIVWWZg== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bdac46c6-31c7-470d-ef50-08da3cb38494 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:14.9699 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: phD2M1eMCehObMpsx9A8Xe4e5iDFSx8YjM0MOlc3jWNn/k08T82fJLJmyBaoRwwxT/IH0RFjPxkZ1bj1v3XYXQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7972 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 From: Peng Fan Enable CONFIG_SPL_DM_SERIAL. uart2 and its pinmux was already marked with u-boot,dm-spl. Move preloader_console_init after spl_early_init to make sure driver model work. Signed-off-by: Peng Fan Acked-by: Tim Harvey Reviewed-by: Fabio Estevam Tested-By: Tim Harvey --- include/configs/imx8mm_venice.h | 3 --- include/configs/imx8mn_venice.h | 3 --- include/configs/imx8mp_venice.h | 3 --- 3 files changed, 9 deletions(-) diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index 9836d5b73ca..90e8941a254 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -101,9 +101,6 @@ #define PHYS_SDRAM_SIZE SZ_4G #define CONFIG_SYS_BOOTM_LEN SZ_256M -/* UART */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h index 3cbe11a9035..6555dd4349c 100644 --- a/include/configs/imx8mn_venice.h +++ b/include/configs/imx8mn_venice.h @@ -97,9 +97,6 @@ #define PHYS_SDRAM_SIZE SZ_4G #define CONFIG_SYS_BOOTM_LEN SZ_256M -/* UART */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h index 4120e4cc6ba..c09a1b4572a 100644 --- a/include/configs/imx8mp_venice.h +++ b/include/configs/imx8mp_venice.h @@ -97,9 +97,6 @@ #define PHYS_SDRAM_SIZE SZ_4G #define CONFIG_SYS_BOOTM_LEN SZ_256M -/* UART */ -#define CONFIG_MXC_UART_BASE UART2_BASE_ADDR - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64 From patchwork Mon May 23 12:40:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634531 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=UTT8HTzw; 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 4L6G7m0Rplz9sG0 for ; Mon, 23 May 2022 21:58:43 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CCC8B84211; Mon, 23 May 2022 13:58:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="UTT8HTzw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5F9468405B; Mon, 23 May 2022 13:58:24 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0618.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::618]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AA87D8015D for ; Mon, 23 May 2022 13:58:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KporYwWEjjMHboePdJKVgYSiSvroUwtl+VaXeSJAnNJE9nm2W1DWdpuGhIRLHwV9RnuAsQbi+fL0j9BRlifkJMqeqVvaOCSWZb3p/Oyb9pNR8GlcOavrDpU0jKGTVyi0ssKz19pRNsD4EEqJwDjdyoUwMxw2vG2evlJQYM6we0VH1Q2IQ+B/OTzK+Ipl2f6F2H3HBYb5ZS9iscfME2xkY7dxSDYd7mMUKWNbsBnkNwIoB8OYs4undfv6Yl+ni5KkgrKNzwUEa8kw6ja48VCx/W8l0zPayr/8Wtdyp7jMoRSJoswc9eHfLlLO7jVfEHEbQCI+ep19hWLCMEY29NQgcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6F/uOaO0zmCBEaOVy4AGoy9LQoPsVxCFnxl4UprZorc=; b=TxAWkRVffp29I9adZg2s2tEA6pn/P29pUTo15oPIKDnoq1+z+cwUZy7zePgv/jRMsnEpEc5QEQT/DwLvVqBvDyoB6eORexYanfTS1WY9JEg8wWTdFw4iPW2b8qt0Khf6cxa6Iyam6AT1MNltvCTGgFE3eo5oIBf5XQhuD8NSDc+yTj+Wmit+FkGknI+Y4l2jLtfHF48erLyy0AgXVT9OdIfn9hhhbC6Jfy+ScSVBvhLf5Hc24A7NCN3cPGCeOey1a2ZUsBirjHOKXDT+WIcguRk29XPHvoZoHObukditnZHC5tdhxzFlqKykONajwTZAnX/AiknYxUVBsRq3nhpbOg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6F/uOaO0zmCBEaOVy4AGoy9LQoPsVxCFnxl4UprZorc=; b=UTT8HTzwLgSj5vtcRliKBCdfM+Kk2hWojqFgUmPRhGYoYetxYD7avMvZxJcTmRLnR7PCfECQM8eAYX9ghU6eCUIi2mcoyYRHhCG8dPo4Rb19G5caXMKECX8y8B5yFVmyXRDSAr1N3XSN+M4bHD0o8imygtDUFWnGK0iGSBIxTpI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM8PR04MB7972.eurprd04.prod.outlook.com (2603:10a6:20b:236::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:58:18 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:18 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Adam Ford Cc: u-boot@lists.denx.de, Peng Fan , Fabio Estevam Subject: [PATCH 03/22] imx: imx8m[m/n]_beacon: Enable SPL_DM_SERIAL Date: Mon, 23 May 2022 20:40:15 +0800 Message-Id: <20220523124034.12813-4-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd7fec4e-3b85-49cd-7f54-08da3cb38668 X-MS-TrafficTypeDiagnostic: AM8PR04MB7972:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eFvNC3YAFK+DcrwoX0PhCuy7A6SZufpQ+lI/nIkexuafYhnXyADM9cIY1kcT3Q7DNukSGOanhdZMCKF/Azo33Ahd90U+DakRs0quV3tIm6gXV1IgZ6OHzPolGyEorto68snmusxjCsDZXVrbykjS49Bf7w3hVdd8IgqInUlUNKh8V7RY/1neHwlOnNOIfyqadKQmBkhZ+OXjEd3aO7UkfeUjX56IUekmITIaT+RMjGeLQ74Sh8TnSa7na7GXRJjkZWnElTpucAIV7f125MnZ3yr11b7z8fnqPdJSEz4FSN8Ngy1tfiIf1HC+5iv6QcxIyQXuHA12WRF1P2Dg9zMXu60g1TDxxiZaoU+zKzVnz6X8JPb3WIDF5g7p3AHVg1o2AM3BTTQKrO9icbfVg4fUQL8xCurTEY2F2YtDwy/6AlH6xjtnODoEjKRbSc+tunQtndSnbCRD49jKSoHG1HZ5rPaRkl79MCYZvXncK4YOMo2YsG8gWhxQWJu7ukToUF+r3Kdh7+KfGMThOUlrO/MjI29eU+3dnCbfTjFASCMjGYQ5TxFZ62wgP/A0mXHjagdCgrkaxK8kDW0l4FKMugYPxfz1RNQ4g+fEBkuuhgRC6ier+9DeNsa+9NxMTopsKiOddNIEg9jioNq5l/k8n0H3fTLWRpDz80cTdwer+I42ky2pSjSfxKHBVhTAWN1GogC2B7kY2/GuiPN96NfkfT19e562X4TnlHEMQh1VypLDKvc= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(1076003)(508600001)(2906002)(186003)(2616005)(38350700002)(6666004)(86362001)(6486002)(83380400001)(54906003)(8676002)(4326008)(66946007)(66476007)(66556008)(26005)(6512007)(5660300002)(52116002)(8936002)(316002)(6506007)(6916009)(38100700002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +Q70KqVpbZnqp6/HPkzGCD7wY67EiREmU+itxnrWTytcEUS83LsyYHeWwNa3TU2DQDaDgmeYxWcLSc2fFa8ED16zan7aT3DKROF3//tcGHFMwaRDVaxmWOmoEImRt4yvqmHtrI53Z5NEYEYGHC8o08y5JIv7vxWhECZzHe3ioSDY46AxqqX1OyNSiQWngDmFgsi8tNe5t3fnV4rTuIdCfyUGkQFM64JVp3YWO5KzRA7JWDr285mdduC97uK3kEOkLKQJpN9Bno7i/PMVQq1ZKeqqLbjwH0j1xzsmyNSH4Pd/ue2GEekC21OfXQcXH6H7P8gw5fvD9odQevRoEDng1zI10ZeYGwHTpwSfifIn8yqh+Yy9u8aTk1AEPfVmQR7LbcOuX/dQyjK18uhONUiB3YNPNaGJbWjuADQtZG+zGhiaaY14gcmxMum38LRv8NAIcqMcFRahGaxdFr19fWL/xKhqbl28EjGb7csTZxkHoUatbxpOosuG0OqruRFt22MUrWYevnOzjOK6cUrfDSXhpRH0CjMNtRN1VC8kKSW19cpvm7kERawNAridTGO860zL8AJONcuIc6xY9yCOhukXKyNcywtLOCjBk5maHl+wcYCAjhtjbvO8nlSgWh8YPVuhUiIU83lTSVepTHYFXdfzW3ozG8BW6UhDvJewddZrSCmUOw/1KiUjszByfrBY3hsDMLKIKPy3IcojSpgIRBAhOne6LVeGcNrH3OKNfINQP55+PBHzI/UeY2rfHVjRhs2JA2WKWAnMGqJ2mVYFD9bdkqNAPxGzMyi1CBjfNOGxvumhepJp3rIT01RaV+HkPe0+WgJoeSZ9Wuw7ucjL53VKVW1u0yJwXH9nkq4m8C+2iZv07TwJwG1R79rOiCOhb/zpOmPsyfLnUSjXQ6R3OCEbtM/J7lkWP4aw1ZDBHdspPfH3MrxAK9xDz36gCWX6hSeuziSJN5KMk5Ypzf3rErmohqgm8dqzoKf6HaOafjS9C6vs7bZB99DA2ZLAKKNUTAU8ECyVgT6iLMHIP4JQC5vAMJBpX5s7S0PQVUzXZL3HxMpZHKV3S3SzU3kqlF6hHm0+C857JXPL+ZA9IOuGI0+/atqn8QurVmUCqIjI1VO4j1ChEH7oyq/awZWIu5CcBAcLqujT8sS53v/0uIK5M3CYePTPXahf3Hv4HfGE6RmN94UAS5jZwTnETGH9aSke8v3zOZU0RJUHpqzXRZcSxpuiFV/CsLyxBLVPgxY6iS9ZMxLOyMMl0VkHMQEm5Pd2/f/pMyHdy9+Q1E+8C0xpOmTAGEYAHKIWlSnJldfx4owU/avexwfHsVJ3eyF0xrvCteLoGgzfvi0LhabOhuLiKssg8WZwmPS3Twe8K92lZlJYujKyL5N03zwiVGpW1mgyyQDP3QyB/+MEzfcHcKECIQk0FPaTT8pTlV5sATjX4rFzSbkQIscnKu0gNwczhnC46DWX2Q/ufwWe9Lws3kdK3eF/6rKBTLVvXqHGP70ynKPVPrvzlnRkVBe4a2xPHiXxEqWz6ay9dYJevsaxFVFNnrhG7ho+fvjo79zln0Ew5LLfb6g/XxKu1WUD/L7BS4c6cmPdzbvGyXqKFDQI/aetaEnbVUPnAT7ThrZv4OAURiElxypU7ZzeDLk5XO7Tg3YOvhMlTbAdL+/pauotAIm1PJmal4mKUsChh6guRWUg5fejqEtHmYMIqqUjhWm/2QCX3Z7wbjO0h4Sa997K5GcALNQQEg== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd7fec4e-3b85-49cd-7f54-08da3cb38668 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:18.0497 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Uh0BeKqyE9MHeIbLWp6zPUiYtFBaLxFNisWdppBioaRN4EImdn5CM6U5etqIytgs7nsU9vRn1gfPcAFXeWGSUg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7972 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 From: Peng Fan Enable CONFIG_SPL_DM_SERIAL. uart2 and its pinmux was already marked with u-boot,dm-spl. Move preloader_console_init after spl_init to make sure driver model work. Signed-off-by: Peng Fan Tested-by: Adam Ford #imx8mm_beacon Reviewed-by: Fabio Estevam --- board/beacon/imx8mm/spl.c | 12 ++---------- board/beacon/imx8mn/spl.c | 11 ++--------- configs/imx8mm_beacon_defconfig | 1 - configs/imx8mn_beacon_2g_defconfig | 1 - configs/imx8mn_beacon_defconfig | 1 - include/configs/imx8mm_beacon.h | 2 -- include/configs/imx8mn_beacon.h | 2 -- 7 files changed, 4 insertions(+), 26 deletions(-) diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c index 12266b22a42..f92b4c3ed0a 100644 --- a/board/beacon/imx8mm/spl.c +++ b/board/beacon/imx8mm/spl.c @@ -59,14 +59,8 @@ int board_fit_config_name_match(const char *name) } #endif -#define UART_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_FSEL1) #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) -static iomux_v3_cfg_t const uart_pads[] = { - IMX8MM_PAD_UART2_RXD_UART2_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MM_PAD_UART2_TXD_UART2_TX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - static iomux_v3_cfg_t const wdog_pads[] = { IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -79,8 +73,6 @@ int board_early_init_f(void) set_wdog_reset(wdog); - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); - return 0; } @@ -128,8 +120,6 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -139,6 +129,8 @@ void board_init_f(ulong dummy) hang(); } + preloader_console_init(); + ret = uclass_get_device_by_name(UCLASS_CLK, "clock-controller@30380000", &dev); diff --git a/board/beacon/imx8mn/spl.c b/board/beacon/imx8mn/spl.c index bb51be01c52..4563446db19 100644 --- a/board/beacon/imx8mn/spl.c +++ b/board/beacon/imx8mn/spl.c @@ -68,7 +68,6 @@ int board_fit_config_name_match(const char *name) } #endif -#define UART_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_FSEL1) #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) #define PWM1_PAD_CTRL (PAD_CTL_FSEL2 | PAD_CTL_DSE6) @@ -76,11 +75,6 @@ static iomux_v3_cfg_t const pwm_pads[] = { IMX8MN_PAD_GPIO1_IO01__PWM1_OUT | MUX_PAD_CTRL(PWM1_PAD_CTRL), }; -static iomux_v3_cfg_t const uart_pads[] = { - IMX8MN_PAD_UART2_RXD__UART2_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MN_PAD_UART2_TXD__UART2_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - static iomux_v3_cfg_t const wdog_pads[] = { IMX8MN_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -95,7 +89,6 @@ int board_early_init_f(void) imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); set_wdog_reset(wdog); - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); init_uart_clk(1); return 0; @@ -114,14 +107,14 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - ret = spl_init(); if (ret) { debug("spl_init() failed: %d\n", ret); hang(); } + preloader_console_init(); + enable_tzc380(); /* DDR initialization */ diff --git a/configs/imx8mm_beacon_defconfig b/configs/imx8mm_beacon_defconfig index 9cd8ac97285..a8981975f66 100644 --- a/configs/imx8mm_beacon_defconfig +++ b/configs/imx8mm_beacon_defconfig @@ -112,7 +112,6 @@ CONFIG_SPL_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_CONS_INDEX=2 CONFIG_DM_SERIAL=y -# CONFIG_SPL_DM_SERIAL is not set CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/configs/imx8mn_beacon_2g_defconfig b/configs/imx8mn_beacon_2g_defconfig index 145f96d491d..cf1720725d0 100644 --- a/configs/imx8mn_beacon_2g_defconfig +++ b/configs/imx8mn_beacon_2g_defconfig @@ -114,7 +114,6 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_RESET=y CONFIG_DM_SERIAL=y -# CONFIG_SPL_DM_SERIAL is not set CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/configs/imx8mn_beacon_defconfig b/configs/imx8mn_beacon_defconfig index 9052e68e967..882a6044989 100644 --- a/configs/imx8mn_beacon_defconfig +++ b/configs/imx8mn_beacon_defconfig @@ -118,7 +118,6 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_RESET=y CONFIG_DM_SERIAL=y -# CONFIG_SPL_DM_SERIAL is not set CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index 573ddaf2952..4c9b5491f78 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -91,8 +91,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index 79c6b1076ff..c16dda5e22c 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -107,8 +107,6 @@ #define PHYS_SDRAM_SIZE 0x40000000 /* 1GB DDR */ #endif -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 64 From patchwork Mon May 23 12:40:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634533 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=IhJ/pO9Y; 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 4L6G8F4d9zz9sG0 for ; Mon, 23 May 2022 21:59:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1B16E84057; Mon, 23 May 2022 13:58:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="IhJ/pO9Y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8BC978405B; Mon, 23 May 2022 13:58:27 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0612.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::612]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AE5A683922 for ; Mon, 23 May 2022 13:58:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eYrCNrAwhcsIHaM0JYn9RrVkMUPKZ3UTPVsJx6CTDVz109PV8drn20+2hQelDr3KItWxcJqMKtCRSDJvuA2W3D8lP/YkUhH7KLmusKxA19VL179sJ/BnK4o4d4JjFAHwdJTX/4tRqXSRDyoZSBekP7emDYAGIWXNhmpnEP4JaTYHGEJHB5pg8ZS3O/kra3Wf3sUKYA5ReuiWDEzBVS+SVhK6GmLaFwL0KN/EeoU322ofALx0SfeIdE6M+6ebrHoFdGMzmsw7oiHDzLgHjuwcaRxcgo1AHUfsFMiWaRau5D3IuCprtzkGwSYuB5TxcdCj1Y2US1WVJiMIIYbrEVV1Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+KtH5HKUa+cD/edQbNx6fXTy4BcZvZA78BGA6rFqmwo=; b=G7eG9RqX9adaXLcp9Z789xclcX7sTXzqZ7jSeYIlZ5k74cQD5DN7drfLoxGhjyn9wfVoJTaZwRvcs6gwabh8Tp6QS+rtsAqlxl3RJZp/+AJ0ZUYWiHrAhr1giCwUN2/p2/N6CVXHVyAAsd0EyGFURGzywOOsFAZGA2y9T7RNzQfKNGueOoDsz4evdH5brrEc1gz6CPhThnoQyywO2Qdc/MA73IoLuHw8zVbidmR8UEM198dgVoRnpEApD2r3JMZv0hSf1JYvQujqO97A24/HIjGhLyZC7AVVUHX2UXVJBXTZFLj631JoTzY9uSe+zqaQBBkx+L0KHGciNTH8ycJwcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+KtH5HKUa+cD/edQbNx6fXTy4BcZvZA78BGA6rFqmwo=; b=IhJ/pO9YDJuuROBM7e5UrILAasPCS0eyQNhdXwaS9bXhJ/BZX2deArL7mb9oGC6Jw6MiKKG3i3dBgR+MvmjAoIrWUENMmTfts7Gx/jURdwc4SkW9PXs6/0TcuqoBa/NEGQiDx4HUseNoocfQifIJWYAjazSRxliHWQZsPAn/5EA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM8PR04MB7972.eurprd04.prod.outlook.com (2603:10a6:20b:236::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:58:21 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:21 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "Ying-Chun Liu (PaulLiu)" Cc: u-boot@lists.denx.de, Peng Fan , Fabio Estevam Subject: [PATCH 04/22] imx: imx8mm-cl-iot-gate: Enable DM_SERIAL Date: Mon, 23 May 2022 20:40:16 +0800 Message-Id: <20220523124034.12813-5-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d60643a5-2aef-4d51-cda0-08da3cb3882d X-MS-TrafficTypeDiagnostic: AM8PR04MB7972:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qTNt/zQQzMPupRuWMNZzkmdpjtK98EHo2b9cGZ94Ie2oos2/zO+c4IlVLKceGSONY86k/g1bB+xxoWihyp4FziSi3ynJ8jfwb28jJmYGcQ76HWdaOickDeaJwcoKKHfrLIujDUQJShEXQq9KH4O9NqFZL2huGdzPBMt5rOQNCLd4xOprnz8A4plmaay4ajOKpxMBQezi5P/Ggg5PjRLOdlbRBBStjBcdDzatt8HG6bg2z/hP18Ya6vsQAolkDj1XCwQnCmqwUs47MTU3wzFrkJS7uAocrKA0OP/aKhlfVEipqyYfWSVl8i+oHjnGB3+Egx6A//vgSD5TfiqRFlTDE5keSTlR0DQ9zJnZOtDlN2NtuE8z3UO9mb9OIm6xZmm9l7pXUscEl2K0e3pTzhbI7ljLSZTkM8KRFJZvvSdjiMbMlrOkL88cMv851blsGDzwcsDfAZdb/w+F5g3FgMAkCADQZQRc5WuMvsKUDgNKyRxiMpo3SOaQXhN8XnyRxNwdhiFkplUosbNplDI/QLu7jeBt7HUuya8KOV2EF4J+8theqRsrlbhYp0nXU2+pJVAYhwD868BnEDC8UVrApRKjSpfDCfAW6GV8Z+PUu2+eYoeNvirGmQvDVbb0HKQXAV70lwZd36j/SyoIixgqkL8flgXlORrW4B06gGyCG9OhHnZQbrRc16mjJsRU7LTOJdJmEy8BxHgffPEOG7PAGnnItq4UXpNpNi0Z78clzzFLvHo= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(1076003)(508600001)(2906002)(186003)(2616005)(38350700002)(6666004)(86362001)(6486002)(83380400001)(54906003)(8676002)(4326008)(66946007)(66476007)(66556008)(26005)(6512007)(5660300002)(52116002)(8936002)(316002)(6506007)(6916009)(38100700002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pITGuk134naQliTLCvUANmMHvx4ds+Qaa+g7sHLbl0AThDrdaQQdG5TYuXqFcDs3fSxWj0k04a1G1pdPexp/gAOWj2CVupzOnp2mMkxcKGDQEbCmmQHWgLysY8TcQ+eOxpMxccO/HglrnCBNVQNGUgyIPQFboDjYIipR8lMtpri29PAqqziXWpoM+sGfSIjv7W55gZcFGHn3cR37LaukhnW2co/VhSZGCPOdU7iqHTIRsvaMy+UetbjaTUWYUlZdUT1i8m2PPBr7mWur8BcTfK3LmMSa9GzXO7fqFXgARlJ9wxVMFoP7dqeybHUdSwmaAU21BZFeRxdOLb6yu5OYe4UazzFq2yGQ+yjLATI0KcEcgsn6KAmHjbmZ0H8e2duvLpOb6qxtfdV4XwGdAz2LC4ZdIS19qpIFsdhBGV3Aks0WEVyxNtLBPtwbbm4XocQrQeJnO5uYVBIFPLwIOIhkHhGISxF6Y74xncQUqonPNjASu80OdW0Rv+IKfH89hh3E4YjGg2wt0V8reDqr7haq+e44tZbSTU6DhaWB9uuwUJlc9B5FTQ/efjfeHZVAmYcv8LiWs3IGO6fIHOIq6jfTfIT50pBOmqx/3Nhz3ienZ1OibSiwMSW/9jgaTeu4UEOas+Nn1DddJjp0MZQXms138sAqldRPeVCnjnuasIXSos29qMXAwQMwt4GV6dXJE2GQNl2qTw8px57ku8TM3a/oeP9mT+HfA0/4aGxO3bNsFUzEJG9IM+oAHkqUnulJM69P8F6/8SQKUjHpfeCgicKTxPV1Cjjq2vIbiHnLIKg0hRfyUXEuOjrnXjP0ktvcbDLLraXAzfEyiCfIChA8QFIcqdgDEeVc3xKtA6lGKsN2LDMgZqOvAvIuPcZIYO4JeEPzcFkuNYNICOu4Yvt069lrViCebIfkFU3QkmCrG9fBYI0rRx/JXJKNwCqCxG7c7Z2bh+1XthnaplVpwhbq3n58p9kF1NrAl20Xn1AI+F/KsP22uBW8Ac1gQPV9BdDx87yYbZ50b090+Hc2fIaoi1xU5dgpG4oRN5YZAja6f68QIGaJ56K9qzKdBJngiTpCH2mZGZdbs6yalOWSJ1Jjh6WgiPGLikAqXcU3k62Ijo0tEUHcSfBhEJ/vUtHhQKK8luDcfQ/hWESM4RzUiCGzbazUR7+F6jzwqzBeZD9TAo1DgR5/VhT1ecF+b0sQ+CD/Ymp4o4jV6rgZykuXwdUouMb39YPiSsGH2z+BRTqTT5/DKe7zL5Xh5Yj6Mafhktm2bBLul3Yj9juf6cNNIxSfR2QTg0vPbVQMGkTZ4ExVjZ+km8j/ERVkUe+S+/hJBF1sghsAE+gc7lSbKrF8Wl2Kq87Bwsir4SjcJRjBh70sBmrOMh3Hhwcu2woxziS5Y0WkLNCf+CW5g4x8Df9MjCOuLVb+B6E9lb1Bf0aIu55+k13o4ZzumitzK57S3Pp26ssIJHQBBP25GiH/9GvId+gt8tyJ8gLhNUF7fTiYMcxU/TN7HF4LE+6Oos5sq6pzDQGr6NuG0bbKQgHjfdAJHE/ORJvtTCuigQI2xvXxTiLk92g5ftk1cVYJvyVTMnN7ybtmRXdcz8ejRJ3iuGc0I8PhC/0Dz7YiHLTYVqdrPXHlPentCcOcokwGeoA8bXMnQNIDXqZPvghZ7R28yCecXO7zkuhC8QZCmvGHLY2uopS+NXeU38/u2RzNQNEKkv9azEbcZ2jNUGce8CUDAXpD3by7isQPQA== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d60643a5-2aef-4d51-cda0-08da3cb3882d X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:21.0070 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KA3vKqZo4OIKMKJPNvU9uwPBiG0WUWp7U84G/qlGRjYC7HTz9EfEHuSQ9T9zlEmIpoc/dZcNjzaZU3YWHt5jhA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7972 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 From: Peng Fan Enable CONFIG_DM_SERIAL. uart3 and its pinmux was already marked with u-boot,dm-spl. Move preloader_console_init after spl_early_init to make sure driver model work. Signed-off-by: Peng Fan Reviewed-by: Fabio Estevam --- board/compulab/imx8mm-cl-iot-gate/spl.c | 12 ++---------- configs/imx8mm-cl-iot-gate-optee_defconfig | 1 + configs/imx8mm-cl-iot-gate_defconfig | 1 + include/configs/imx8mm-cl-iot-gate.h | 2 -- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/board/compulab/imx8mm-cl-iot-gate/spl.c b/board/compulab/imx8mm-cl-iot-gate/spl.c index 2dc62d6682e..f183704c9d2 100644 --- a/board/compulab/imx8mm-cl-iot-gate/spl.c +++ b/board/compulab/imx8mm-cl-iot-gate/spl.c @@ -83,14 +83,8 @@ int board_fit_config_name_match(const char *name) } #endif -#define UART_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_FSEL1) #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) -static iomux_v3_cfg_t const uart_pads[] = { - IMX8MM_PAD_UART3_RXD_UART3_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MM_PAD_UART3_TXD_UART3_TX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - static iomux_v3_cfg_t const wdog_pads[] = { IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -103,8 +97,6 @@ int board_early_init_f(void) set_wdog_reset(wdog); - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); - return 0; } @@ -155,8 +147,6 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -166,6 +156,8 @@ void board_init_f(ulong dummy) hang(); } + preloader_console_init(); + ret = uclass_get_device_by_name(UCLASS_CLK, "clock-controller@30380000", &dev); diff --git a/configs/imx8mm-cl-iot-gate-optee_defconfig b/configs/imx8mm-cl-iot-gate-optee_defconfig index 8b3d1b3ef1a..0f0b34fecf9 100644 --- a/configs/imx8mm-cl-iot-gate-optee_defconfig +++ b/configs/imx8mm-cl-iot-gate-optee_defconfig @@ -108,6 +108,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_RTC=y CONFIG_RTC_ABX80X=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/configs/imx8mm-cl-iot-gate_defconfig b/configs/imx8mm-cl-iot-gate_defconfig index b418e86248f..7bd5f6540e9 100644 --- a/configs/imx8mm-cl-iot-gate_defconfig +++ b/configs/imx8mm-cl-iot-gate_defconfig @@ -111,6 +111,7 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_RTC=y CONFIG_RTC_ABX80X=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 8d9212ec64c..f262ab08f04 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -145,8 +145,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(3) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 64 From patchwork Mon May 23 12:40:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634536 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=NV+Hcw/N; 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 4L6G911FS2z9sG0 for ; Mon, 23 May 2022 21:59:49 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 65A65840B6; Mon, 23 May 2022 13:59:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="NV+Hcw/N"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 958AC84207; Mon, 23 May 2022 13:58:34 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::60d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A8D2484184 for ; Mon, 23 May 2022 13:58:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ICjIU151NbewHwaYI0gR1b87SdQfqqtcTWx4gg4lFGz4+OOwEeeJuo55mgD0HR1Xlbr+QcpF5V9AcKqhnwLd4OhvH/y38O1VO/gYtP9TbDmUTirsmjJf4o1O2HW4QqRjU1zNdT9u2IDlhnHdCiUh2Pgw2006SNlIOcg1FP9xPRxjafFHbSd74CJEWXAGahZHOIG33XQ76/QY6PeICqCUd3q0GBhkNa4yij9w0UH31/PqB2xyN6clcuvCCmSMNPmu7VJmzyYAEIanMvajF2nvJ/betSTyBgFvqZbYHu7hM5sK0xms/1J/FUVEhJouPqWS/Hse0C7g5a13I38iLnDGuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=p3HBF4OTec1pai9Axs8z12yWvxTiKfUWGy5ca1wCCXg=; b=n2wLIgnk4o76WVDlWoUy1rHe/IZxcszWWFvgc4YSN2NUnZRpCmM+8Q4+msaBc0cOBV6bCODOX/aVwbo+8TZIEY65f4hzuyB8p2DO1Jv5u2M6mlnsB9hHKZzlrZeZUk16eQsN9uQHWkDs8+KEWatt79K7hE3zurdNFQ/JHLQ3Wts8/zDPPchvMPT1XnS9GQYwUttaakcI5ZiX2mmCGpQyvv1V/FnmwL63lN8q/fw39mnUCCqsk6deQDo+8Tu81yQN3ucwBKkkbi6YRZ041W476KjvZoXxqnAPkqj3J6aEbvycLMPQZEQcS6GAlQbigH0ZOvT4/Sp/VsmxUog/B7Xx0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p3HBF4OTec1pai9Axs8z12yWvxTiKfUWGy5ca1wCCXg=; b=NV+Hcw/Ny3kpCoQPLcNB+7yHKZ/sN8+jo9JCzLaeaklaC5MyjsNAYGKlWuvQ9e5Ejf0YNaHHRFK93q78Oa3P2UWMEkJFZtJrqc+uJGjSmW2yhixa/VpHg4oHcYxClHW7yI05keFKynADj3qQQsPy5elpHTP5ceZ4333P3tqwwMI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM8PR04MB7972.eurprd04.prod.outlook.com (2603:10a6:20b:236::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:58:24 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:24 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Jagan Teki , Matteo Lisi Cc: u-boot@lists.denx.de, Peng Fan , Fabio Estevam Subject: [PATCH 05/22] imx: imx8mm_icore: Enable SPL_DM_SERIAL Date: Mon, 23 May 2022 20:40:17 +0800 Message-Id: <20220523124034.12813-6-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f8c0ba07-38c7-4c93-0b01-08da3cb38a18 X-MS-TrafficTypeDiagnostic: AM8PR04MB7972:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CCD6YdsmRkfY2o8nFEy/Bles1WGdGp3ulGnymdV65aVh0YihjrJh+Bp4s/MgYBCm9vosHMMVH8gJkA0WtnR0SINL7cbfkmQNoqlfRumwo6k5kh1sGtIYMqj0HU81XESUSIvbk/D8qVKz+L/wnlYGQ4hMa/FlgVjBKOUHjMMejv57yv1L2DuVUuwm5bthXYqj0w0MgSH4FKwzEsC7uhmJgqePnOewcNGQmRqE6u2oJMHqtb5arKeoJtZ2RPFa3ubETfcA8Mu1g2iZnkdWsCiHAAGfjnH00fQ1h+TT3BlxFiWoYx5ca5/uWxKXfhJyE6A4TgLOuuK+/8hXMKCpieSW4CGxtjnHh9uchuXJTJ+TAYunWwA80yd6NSOlGUdh7VL/paymvkeS2M+Ol7kZjs04qAga5hY46H1gjcooBDYxCvFc62KzPaxdw1aNGCk+2/Q3Ym5Ardr9rmN4kpqU8QHmmZXVX95vhTPmYB5qNwTzsYxhbl69dSa8tVcdMfeKjqIWCmA9CLOUCV+9GuasX9zNvyI1NEkPAoGm7NKvrm2v+yt39l46ipU7hCNAzz1VTgp2O0jD+MGWGYYRHxUQ0dIpV5148Pdg/eyhAMphmC8mPUr+P6S7YyRDkjfi9um2zUkukzBWjjwPEOxBQsw7cRBtERvaNYlVZSxpvSt6F068+HeYuNYuBLHq4laO87JV4z07uXMSEy99P2Uo3b8EalDTlg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(1076003)(508600001)(2906002)(186003)(2616005)(38350700002)(6666004)(86362001)(6486002)(83380400001)(54906003)(8676002)(4326008)(66946007)(66476007)(66556008)(26005)(6512007)(5660300002)(52116002)(8936002)(316002)(6506007)(110136005)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: af7k3fqYP/g8xT8AyZPGYKcQc6keSlse0gaTG+GC7kBJ0YGuy179jnBPCCTSddo1ATGt+dxLSnmtzrPAjUuQii+PLOBBgn4AjWFLwkqZuYUUg5bW0uY25r3cu2N4T92lq07YINNpuXW/SBT6v23KQ01i7S2tueRkESkPv6sfGt9I69t+WZbDkWty62nrsZjdB3nMpcn3DQhT0GVv6Qo4C8BydcX9O4Hnb0Rx1hgV/wR54jfb8h2cDgSISzYkMYTYAWxHaD5l6oaAz6+qGF4VTGu320GGYXOFiVYewI0MVO8cs4nEXQwWrEVMOO4PoVFoOzBRHOGTtpPpwMw7mxtnl/moOzT6mnN8pK4hwUwrgKQYDoe1yz7tdzsG41VapzftT9Z7MXDE6kuKigO6m07DLAXIARvq6AXVCO4qA+H1YiVn4Boiq/YQtaHuVKmTZqv3mMoXZcB5o5TgJZEPUjEuKYP2GjYRDzUOJdBKdLmVpMpfyHcajb62i5k2D0MSo+WFI0WL5yiXXcKJqf6t/tDDPpI+FLZGkRQFDd8M+uxWuz9v22GvsAEmgNgYbDHHGWtR+yk9adyFMjb0c7NKkrb4+DGwdNk6Bm60ZLjO68gpnVedSu/dzKTi0eU3CPpjsnxjnuMNc/B1J8qDUOFI0j7k1a4AnEloc5FRTAgTTe/TKMoA3KnUHvxLVfafNiqruvpTIhdGFSezbkGcf+qfx2vvwNyG87axqUsO/FTrZbrlH11GPFbDuWkzVBd1oWlIoVhpPYgnRU77JDwIRHVIL4PYB5sfPovQ1cs2JXhyN6pw4ctF5cuUadMUoRmxb7IkSKv9CFv17QVMySSvWxK0Etax8b3/wMwbGRj9Ql7CjOG7A1KDy5ZfzJDk9ENSP5shRY6xcGEtHOvBvkSH+MoN3Fc5ygRc1ePQA+0skxMtDfHbUlFSaeByX87gqGSEzctRqkQpkN7hoEX1skTV6/ElcUeKBBS0P18mEbJ7GSOI7w6od/StwTmZrPSGnPQn5pL0lb6Eur1WsUPlagIlxO+TX6fwpdxdnRsNNXXDeyMNzxvFmoJLEAjnf7jbPzejK2tlCDNnJ7YPcBM4xpsqOb77zgFp0GVf2+V/+b/n+TDNoZwlYzBJkkxow67zLdJaI7EgWij73+bgjH4ZSA8o38xbYoXl1suYeiaj2DZ/gcJgYiTqh/hxqNb4e2dCs2RBbxFnGujuiw1BFV5Ed7/IbefsaMcku5IOXx/sTnWWniUh07J2eE3kD1x9h9KHYiwM5AEiFiB6/lY3xOMo+iq71m3pjVRgsmwTHiPTTg0s0sHIq3wL9/FLdfU7CaC7Cub+CrPYZ6oh4jeSfWqALF387J9mnaSaO8w9kWooSbFDFB6s+QAXE61TonM5leusHqhCgCJnDtAkUBy2cEszqzXSNbTMcheqSljHeIiYwzz1a9UX3Z7ZA0OzJVkm19ubc9hZGtUKVrw4YppAX8MnlyyYdElOT3TcGGNizU4h0BRXtUyGl1IlIArk52wJLPB0uTZhbHMTo9VEeQgYPNLPiYlzJj81UVxjX0o5NYzqmPZA40BxybY608dfPAp9KQ9BgGsrcyuGh2FD0gHqGHOWhqaKLXinO9VHmdY4e7fGMovP8Sdgm1gUTyl1txKOnOXfV2xHkpW/tKspCMGcq/3JnhrBOLwUC1oa7AhqYMLLigNOf12giLPRiZyCUSjVR+dKN6GQUEVX54Bjg5TKSRQoJG61/J8VGS7mKA== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8c0ba07-38c7-4c93-0b01-08da3cb38a18 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:24.1708 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2SkWag6ZUOuw4UKEe7t/EGj+jhLvuIwRtUZP8DYm+uDpPkm/8+60NOJgjJB44lcW7FKJOG7cO+oxPt9HEtEpdw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7972 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 From: Peng Fan Enable CONFIG_SPL_DM_SERIAL. uart2 and its pinmux was already marked with u-boot,dm-spl. Move preloader_console_init after spl_early_init to make sure driver model work. Signed-off-by: Peng Fan Reviewed-by: Fabio Estevam --- board/engicam/imx8mm/spl.c | 14 +++----------- configs/imx8mm-icore-mx8mm-ctouch2_defconfig | 1 - configs/imx8mm-icore-mx8mm-edimm2.2_defconfig | 1 - include/configs/imx8mm_icore_mx8mm.h | 3 --- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/board/engicam/imx8mm/spl.c b/board/engicam/imx8mm/spl.c index f9be769ec59..f75f2dc634c 100644 --- a/board/engicam/imx8mm/spl.c +++ b/board/engicam/imx8mm/spl.c @@ -54,19 +54,11 @@ int board_fit_config_name_match(const char *name) } #endif -#define UART_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_FSEL1) #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) -static iomux_v3_cfg_t const uart_pads[] = { - IMX8MM_PAD_UART2_RXD_UART2_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MM_PAD_UART2_TXD_UART2_TX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - int board_early_init_f(void) { - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); - - return 0; + return 0; } void board_init_f(ulong dummy) @@ -81,8 +73,6 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -92,6 +82,8 @@ void board_init_f(ulong dummy) hang(); } + preloader_console_init(); + enable_tzc380(); /* DDR initialization */ diff --git a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig index 535ff6dcba5..d95a74a7237 100644 --- a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig +++ b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig @@ -74,7 +74,6 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_CONS_INDEX=2 CONFIG_DM_SERIAL=y -# CONFIG_SPL_DM_SERIAL is not set CONFIG_MXC_UART=y CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y diff --git a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig index 101d5a00bc7..43c697a39d8 100644 --- a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig +++ b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig @@ -74,7 +74,6 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_CONS_INDEX=2 CONFIG_DM_SERIAL=y -# CONFIG_SPL_DM_SERIAL is not set CONFIG_MXC_UART=y CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h index b9b24a8c51d..1a439370c09 100644 --- a/include/configs/imx8mm_icore_mx8mm.h +++ b/include/configs/imx8mm_icore_mx8mm.h @@ -65,9 +65,6 @@ #define PHYS_SDRAM_SIZE SZ_2G /* 2GB DDR */ #define CONFIG_SYS_BOOTM_LEN SZ_256M -/* UART */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(2) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 2048 #define CONFIG_SYS_MAXARGS 64 From patchwork Mon May 23 12:40:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634534 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=UdMlnOTU; 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 4L6G8W2DQ6z9sG0 for ; Mon, 23 May 2022 21:59:23 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5DE3484207; Mon, 23 May 2022 13:58:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="UdMlnOTU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E39368421F; Mon, 23 May 2022 13:58:35 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0621.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::621]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 74FE184057 for ; Mon, 23 May 2022 13:58:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jGuA6WvcvI64ECd0YbknyZvK599nr3Z0P3p3tuaZ4CodChtBN+eI72mlICKdYayzd8iFPbVHnDpTVfLfJgap8mE0D3qWeC+LAY18p0XHEhbtWZgni8Et4yvXxZkLtz/PjfmzK3hn4rES+N8zr/TqxtJ8FPWQ9brCMkIj1QnpIwqJjuhk8x+RYDptttxz2B9GDpFpCOzT+Hi6c62dENsg/lQNiziYtbrpiQ+hdugd8Faq+TQUc9BpMO62I7hW9X+qxq6J6UnysixX4tlBf4ImKawCH5WDtN1KFrk8FEcV4JKlIVGCIaEGRblLKFwyBvJ6af/7FwFuK7dBv7TQsCngLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2LynZv+yLhgiDWUa6AX9e97vTFsG/1mSRWHN/Sv5kiQ=; b=FKq7CG4JNrs69ksA2hbN/unf3/0F5t8CjFcLCdz+YqHTa7+42ZZj6JpIBbz2IWc88PBGkVsCynhq+U0Q/Mm/o2NyfM5q/pELv4J3xSfqILy5zlD1/JmLEBDs8lz45y7gJg61NzEcGmMpU3l2N5VZTUYIrHXija2jS8EehAZt5qoosrkq68hrt9Yi9sN/AZe+s5+Mope8LbbE5a7sCnZZ3nqMZ39/A9nChsGDuktVQl/4rfHZY0i3oxmRvtBdqrZapjSE02PsmKszSQJIb7PFshDqQ2jGkqdLHtbDzYJxDrj6sSqyD0a67+V96OXJ4yR2VyDbI8v2PgVfP3TgaBIYOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2LynZv+yLhgiDWUa6AX9e97vTFsG/1mSRWHN/Sv5kiQ=; b=UdMlnOTUXaA/H3lqTtvDcgaKuY5mXhr8ji4c53hrziMQbWaYdojfUb1uuxkT6XxJc95I70vYKxtkm50G4DfSOe/ff7T028R8WfPG/VhDSSE9LqU41uJV87srE4YRlswG6mdf3Htr/Hcdct5B78ro9u50CFBS+YoPieeDTw592ew= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM8PR04MB7972.eurprd04.prod.outlook.com (2603:10a6:20b:236::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:58:27 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:27 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Teresa Remmet Cc: u-boot@lists.denx.de, Peng Fan , Fabio Estevam Subject: [PATCH 06/22] imx: imx8m[m/p]_phycore: Enable DM_SERIAL Date: Mon, 23 May 2022 20:40:18 +0800 Message-Id: <20220523124034.12813-7-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e07fd6eb-f885-454a-8737-08da3cb38bdf X-MS-TrafficTypeDiagnostic: AM8PR04MB7972:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eyl24WDxOsutBIk4v6OEbBhimsnH7DjnrHoaj+xdzkSi9+KBrBS+UL7FqafcS7FGAmmMWnayCIIgOcgJU3KVqPGbmxSkX6RIvbcvHY944vYL2ll7a66uP8qj3ILjrQkNfOWrSjaXHefI6fi2jnjBfrPNJI1CZyEIl9w30ixVn2xfCbegXnpxh/zmiUoPlgq85DWzpI5UhF26sXgIv+Tgw5VhgkfsTb9SfFGvH2ikG5UZEQlNuqgfnbQyrSE9bow4svmvO8eDd9lHa5GzEhFhWpa2tpxytvzw2hqfzlhGQQC/H/N+G4oSZHSJCk7wYGIjyJypzfwjksrYaQdEsDdLHNXvT8J+gHzdERslEfCCAbnZAysAwqu0AsNrtvKn+/gAF1AERjqJh9G3w6h/KqlpfwI/eO6pjje6JpsnYFiG0Yo5f3P/GhMfC0gz9gN5V61H62jDnS7TdlT9Zyo3XBj8APLOURAYwqXhz8GlZtGZUJ04lE8t1/nQTw9jHc1ggFQTP9PDMx2TzkdiCDkLKv8FhgOcK10j/mV6hT0Pq288J5H4KBnnsttPZ5lCOwiGejg84Qb+Po/clcmGJsbx8H6c7i41GAY81BladIbeEmo3F5qFa4t3Gv2/Xd15WuJZSEhqynGMdGLelaxM1HQaTcE45D9KzkMntK/ERYy5yV0vKHdeSl8sDaIyo0DFHTsFWzphERcSTqAr9Dow/IW0mnQ/9idBZ68qoDvzxEaHHxV2quQ= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(1076003)(508600001)(2906002)(186003)(2616005)(38350700002)(6666004)(86362001)(6486002)(83380400001)(54906003)(8676002)(4326008)(66946007)(66476007)(66556008)(26005)(6512007)(5660300002)(52116002)(8936002)(316002)(6506007)(6916009)(38100700002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WQVZJaJygB/4VjtThyeyNZdj5rp4I1fx+QvCg83FmLu03X9tTlArmOARfP/6Q8jcvb6hS6R5gCgekjiusUYSsBqmNInRdoWIxdYKZRog3o3TriQDhIYrrzQsRGQ1VmYswh8pjZxlmUFg/XqgL0GFRVO/gDIlYLD7kHdUNKLE6tnAokbJx2GVhnb/vLeHKsOw0AyM89O8CFMuO9F9hgNvdA5WrISTwI3N/h4zfKQSx9bHuV5TU9SBGPlawDaX1boRTtxqsHYMqfILiauaiTEa5Y2W3iE6BFNXOioePB4e5wKLUR/+83tl4vXxG12hcJHG7Iem6Oedq8VH7NoyoiVZ4GVbnDFEQ6ywSFx5m9BLNmG4MrJhUvWYOXioo2qV7K1SB9eOQpoYhn3x0FzSxDI01T9OoXDaFrK6EMLL+vrtvfkhXGaEZi8vygnCShT7w+xOwhJWLZ0s+zFd2kh+XfvBMwUrr5CdfkJG+zwDZaIKviyXnrfSxSYepxSuGbu8IjLgOHW6NKHP9BCbxxuqAQahb95lxCF6H06CbLxaFH7QSTgB7j6UQiw6nqMhNM98iGWfWd+oCa4/UB2PN5ufdA7hKSTIYcVf7oXMeWPgtQYjIh5KwzaXtXY+4/YU61uPUTh5yiELPMzZ50SSMBVP6y1EacQ0fv38bzxTk1rGQQmVAnHu+qkjyp8I987i6NKiVcnfpNlUz5u017Qt2IWgie/SyJPy0POXZH3/84/CEGD7uGe2KN5n0w/rW5j282KKTVW9cs9NCgBCZtdi5bOEEMVLJEqKgq0zFPKA5hkxQxhESfBDYPnEXpPxJbyHMMoZeTLdc94P6++o/hW0Kai8kGLnvfRbqRnodf0wrfnELK1z++RpbKDZkLTcDbmsbO1DGHSqyBsxv/8cUzXipBPlEB0GWwt97rDS5xTQQ3YtAdkahwbIZid41tJdI6K3rur/T20zAljk/c6kytBWWTBTJVydranN8aUzlA/ezXLpF5Jy0vejQUckn8Bv8FaYZSFUfb2DdEwycRZ0fhZ7wuFamznDU2QaWDK7MN7dt7Pd2TWcfKwoLG4qiDd87TspCxSDwwP1YszT5mVhoG7jSKHadlTIkurA9EcwdDH8EOK5aBunFU+drNXPSWlT/RGwz3QxNsAY1uMZt7sKwLF4mMuqXmfXTUbncxJC3RBUgBhNMyM2M7f9/CdW+US2FuQkN+shjzQi0GgTySa2blT2Krdp66S6JpUGzCVnhGstPjeuIF2MI6AXkvtnKb9sAo0bQbxy74AR/w7Veh8+3H5JYa9gtl/kPZerobRaWnIF4qGrimBG4DtikucMwjXnZ+ZV5Idms3t/JBH41wyeC6hSWOHDHInM4vcm8/pqV2r+GhPRx6yccMegM/rz6QPZR5BJ1I/ANmmicieDFT/5b3peY7vGNPambQ711znbgBgM/eiKPD9GvcNpr2UGa7pVOxPc5PvZuk8w5ITh3pWXdG5gTuJJfFCGEJB+NS9D0MmfT/D8REcLIJ9IZVT3YxOZgP5he67bfIX8u6o1bMsLdZAzETxLxCp/P1WngyEZpCsVeDFon37a4Ai8+1t8n5lZMPLuxRF8Kt/0VQH1G9brvDNxYkSkFfUwwqC0AZoXA/seA6j+sv6ghpnIch/aotE3rvI1g2O/aDIg2wHDNXP6LS5o5+ggrLdrvktFqwjfhx2NtHvtaJcSKeU8ei0IK/Pa40FRUlGtfx9PnfXmplIuJhn0gpfNQChqng== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e07fd6eb-f885-454a-8737-08da3cb38bdf X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:27.1715 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: o5D2gwrKwZcipJcf8iSQPTbSgp6O4jwBcxFdHQ/uaOXesm5hyIL7/ESTSeRTIlsXynLM8FmwGOdMWKUK4vGpUA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7972 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 From: Peng Fan Enable CONFIG_DM_SERIAL. uart and its pinmux was already marked with u-boot,dm-spl. Move preloader_console_init after spl_early_init to make sure driver model work. Signed-off-by: Peng Fan Tested-by: Teresa Remmet Reviewed-by: Fabio Estevam --- board/phytec/phycore_imx8mm/spl.c | 12 ++---------- board/phytec/phycore_imx8mp/spl.c | 8 -------- configs/phycore-imx8mm_defconfig | 1 + configs/phycore-imx8mp_defconfig | 1 + include/configs/phycore_imx8mm.h | 3 --- include/configs/phycore_imx8mp.h | 3 --- 6 files changed, 4 insertions(+), 24 deletions(-) diff --git a/board/phytec/phycore_imx8mm/spl.c b/board/phytec/phycore_imx8mm/spl.c index d54145ef995..7f24a3affc8 100644 --- a/board/phytec/phycore_imx8mm/spl.c +++ b/board/phytec/phycore_imx8mm/spl.c @@ -57,14 +57,8 @@ int board_fit_config_name_match(const char *name) return 0; } -#define UART_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_FSEL1) #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE) -static iomux_v3_cfg_t const uart_pads[] = { - IMX8MM_PAD_UART3_RXD_UART3_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MM_PAD_UART3_TXD_UART3_TX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - static iomux_v3_cfg_t const wdog_pads[] = { IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -77,8 +71,6 @@ int board_early_init_f(void) set_wdog_reset(wdog); - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); - return 0; } @@ -92,8 +84,6 @@ void board_init_f(ulong dummy) board_early_init_f(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -103,6 +93,8 @@ void board_init_f(ulong dummy) hang(); } + preloader_console_init(); + enable_tzc380(); /* DDR initialization */ diff --git a/board/phytec/phycore_imx8mp/spl.c b/board/phytec/phycore_imx8mp/spl.c index 19c486e5517..38a581bef57 100644 --- a/board/phytec/phycore_imx8mp/spl.c +++ b/board/phytec/phycore_imx8mp/spl.c @@ -89,14 +89,8 @@ int board_fit_config_name_match(const char *name) return 0; } -#define UART_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_FSEL1) #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) -static iomux_v3_cfg_t const uart_pads[] = { - MX8MP_PAD_UART1_RXD__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - MX8MP_PAD_UART1_TXD__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - static iomux_v3_cfg_t const wdog_pads[] = { MX8MP_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -109,8 +103,6 @@ int board_early_init_f(void) set_wdog_reset(wdog); - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); - return 0; } diff --git a/configs/phycore-imx8mm_defconfig b/configs/phycore-imx8mm_defconfig index ba5833f7060..9da222afc54 100644 --- a/configs/phycore-imx8mm_defconfig +++ b/configs/phycore-imx8mm_defconfig @@ -107,6 +107,7 @@ CONFIG_PINCTRL_IMX8M=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/configs/phycore-imx8mp_defconfig b/configs/phycore-imx8mp_defconfig index 86d0f4df7f6..a851b1bdccb 100644 --- a/configs/phycore-imx8mp_defconfig +++ b/configs/phycore-imx8mp_defconfig @@ -98,6 +98,7 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_SPL_POWER_I2C=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_SYSRESET=y CONFIG_SPL_SYSRESET=y diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h index 46fadd56106..564b8125ba3 100644 --- a/include/configs/phycore_imx8mm.h +++ b/include/configs/phycore_imx8mm.h @@ -83,9 +83,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE SZ_2G /* 2GB DDR */ -/* UART */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(3) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index eb92c423392..3e4315f2b81 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -83,9 +83,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE 0x80000000 -/* UART */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(1) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64 From patchwork Mon May 23 12:40:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634535 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=kJAa0hC8; 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 4L6G8m5K9Bz9sG0 for ; Mon, 23 May 2022 21:59:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 060978428C; Mon, 23 May 2022 13:59:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="kJAa0hC8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A5E3D8424F; Mon, 23 May 2022 13:58:39 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0626.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::626]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B5FF2840F3 for ; Mon, 23 May 2022 13:58:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LFJOSOVTtyarzd8PduFFrrMWyVCR7MyAqz9Q1gTwztYjwL/IWuTrQk5KxWqZY8P9QersnR7CKn5AtXKE6m+kObll1yr3cybRmVq/dvncL7qKxozv+hBpQ/hc+hVER4vnM825t3ornluyUJAxvO/3D8CxDQT5MFJV9c73nYlfpEUUbk9gtC+jccSxoNbg3sCnK0GqsSnoQR9A7Oq6eUcg5AnVeVHhpUUER1f9tTI3CS+p4m8jr31yKQaWKyy44zyT3hBaM7fVa/hI7I4YyU7qacNYZaxNsxZekhE/gDKAfCsVzIblgNuUMrxpRLOxAO100GYxu5WzPRyYcxGxuIfVXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=B6tixvz74jRZR0yMl50ElctiFU4u4m5CRxDgx3O8YKQ=; b=DEkBGKjGkalTrnKdaSCkpqxZ5dznTP0wY4F4qB9Hk27X5TVrZ8CyzIh3EHmQnvN06WJaKzfDlVwQJJGmqFnFoVNb4SYX3l2OAGEyPPetT8XdGkIyupz0zjAd5iPctfhG60F4EOpU7Mz7pmmJXk+QwoiJJEZLE6whsdFpRzcGEmI0qgvRlFvpnFicMq5oQej7colxaAramZo2JCzWxcDnDuAFX5+RzuEx6PRUG17M7qXf6y2bJnUkrO8VW0C4plsV2QLywrUYfe49CQ2sR1+g5ULsgi6LbFY+BuTJxM5TcbhWdH9pLJ55EKUJKpvwP3q4X+vPBibWY9UpzbxGEH6XHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B6tixvz74jRZR0yMl50ElctiFU4u4m5CRxDgx3O8YKQ=; b=kJAa0hC8kOlZCLdw/04nTNe6qrkeEVylkKkPFCX8+2vFsP2p34NH6EAoEdBy+fzb1zMziYhG4juwkwg6/fBkNLMT4V7Fp+dr/G1RqhJ9hKy2MJ+VOmOUSNZcXmjH4iWnKouD7oE+wiuNunb3S+uLlVXxn3fyAqAeyesvu5A4/pk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM8PR04MB7972.eurprd04.prod.outlook.com (2603:10a6:20b:236::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:58:30 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:30 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "Ariel D'Alessandro" Cc: u-boot@lists.denx.de, Peng Fan , Fabio Estevam Subject: [PATCH 07/22] imx: imx8mn_var_som: enable DM_SERIAL Date: Mon, 23 May 2022 20:40:19 +0800 Message-Id: <20220523124034.12813-8-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 253e0b06-558c-42ea-0544-08da3cb38d96 X-MS-TrafficTypeDiagnostic: AM8PR04MB7972:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T7481agZHSxAtSi2Rblj7U3uVW4XIuIVg17dGQMb20a2BD5VYn7530XjK6egwMy6NYwBzcIvdLakoCQRCGJqRLthSt6XG0OgkKPxN5ui6YJewRjbx11D/mUTLPxW3XHXZkmj+qn6rGHxNBHJDTs1WRNEGEOumOM9CRUVbRpJIi+YaenuPYhJhMDfIybL7CxcJ7T0gU5QMzXf6i4qbuGzrOQXmlkBw5pQIMEEvSgrw4a+ZNXWC+NnHBob8Fm7bZ4nGAhDYoXubNvDN2ZMKx6Fl+O0ZHwVVP5bumpEmVqJSumxzkCYt8WbT6xfUfaNIUNdTlYmO6oDoQE0sKIE2JX6DVqWmjVwtZnmwrXmGYk44QMxcbyUL3FoLGtO2EaL2j2VtRQ40tFcF+eWUgy9pb5dr5cq44DLlAFYQ+iVPKK12oFHaJWwWLyXeYHTbT+KkG1q6zIpD1o+TomR//+0FbPQNBor9277GGi/cUQH3ax/THlbd7eFsObn/egaj6k/kP8cpMKifgwKpbi9ONr+Tfgh/PVd9lb2PfVtXtpGbShjXDnh0TwfJAPXruDszqQs53MrWEsrPgm4lgPY/cI/qJMh9WDzg5HKMNTeTQOQrUcFw5kcoYqO9gJQ+awk3S9HsSotkiFMESM2U87pOzOpPKUUFa/ZXIeIonCloSumOCiHN0yU8unQmIyT6qdyL4Y/ibh9ZV+owzaf7mI8c3C3RzAIOg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(1076003)(508600001)(2906002)(186003)(2616005)(38350700002)(6666004)(86362001)(6486002)(83380400001)(54906003)(8676002)(4326008)(66946007)(66476007)(66556008)(26005)(6512007)(5660300002)(52116002)(8936002)(316002)(6506007)(6916009)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uc8MOkt53/s6wTl05ai7MSdWCueTII8kwXWdsMgYMG8zC1dtOGo50lLdDYT6YGta4ZuzfRDvNGLQgMn7nEmtQgkRlI4Glek97yCmTNRyTBI0nbagb1yuEk/c4nuC2nXX9JLLcLlj0/9OKcCb77va4rP7pwXKgESs1hO9w/tNutZjv58ZY97sjnKnBdhoBvrqK2TqWug//Ta1hOG9pWNdKrJGd25ulM+j538C80IY2qEyH7U1T7/xjkwJ4XrolGOQhYLs0rUQVjrKiQHVceBcQ5KoDo6/6Rl+8v/nf5iLUDtvzS+B/vWkOOM2uNq1mND3KBDVxMNdE8WDS/YODWtO5a+hDTvDikxwyEBcoztLCc3PJ0ULZp9dfe+aTvY4i6lQisflD72zxt/ws1Dsl+fMmXk1bfj7tGoX13YT0gpNIQT0qu10X61KvCP56Fq7nlCga1/bpvJ9ZGzV7u//TMsPbS5CG1MdqTkRKTBoCh0+Ki/eSx9KxR6ZejE1ZLfv/LhVBKR85IAI6A8IC8Nc43VHob7YV2b6dYKEd9uId8YyLo4XfkEH2ySBg+4T0+xX5uAYciiUrAbeH5wm/rjAUd52h/uy8e/NE3hNmziipe95Bfm/VoHNwtuHf+1NcElAhGzldthM9Sez+RykwWwcVc9ZXV6RCn4U0Av4tLXyWqlNBDjRRZjujEFtf5Rnsw49gYmHQwkzDLUG36H4nwQb0nb75XGNMOq6r7933JZAL5ytlvzMe6mD0I+ugvYf5MFMFlOTQxvlw8MLQ7zlztvgiRjSW+yIi3buOCnFlJJtvn7LJTANAx9jVO3U5X8QvwTp8bLH1T7yr2/Dw+lvGZgIcR712qAoN8TpnIWA8OGoqEkuuctlstjRlOoYpQDxCFhQEfiulcoFmd+1AJw0SMeAdk+P8LwhKFc37HyrViopYG8NRhnTQuhyiB+aZpLxdXm1NjkG9ViY1TRfeKeh8v7HjsyO1jH8TK0YJdpaJI8AyZXC9+xdshPdxiQW1CggX+qR0BGswUOKgkJe9PoMSZtlepV1RIUrjnM97Nsr7D821sB0xhX6hXSf5ITNtY+agKXknXwwJYeqshCfZDAwFlYAnVz0F/bK1gu9h0XJnWHQ5mVH4Z5L846zIwx40+0tjlElRFQ0iwLusY5KNmb2of1Ul4fVYqq/ojV5bybhHahHBT96xVB0CVKhmJmUoiK0RBA+gI7YioibDnBsNPgf4Kb3wVIL30ZN+RxPZlRIMOelSjE37xCdasgUXL10tbCRVnA/eo0gag9nY81BD6e7f7GnYF4K0d7+FtizNS88jYM/Wb0SkslWn6IQoua+mWt2GV2Hy7dQoIPtR1sxfXpNnM15YaQ/dJR8kMdCvZQlGfpAf8GXBZ5m97wrLMp9Nlm+E9SiTSWUW/rAO94F2zOq0x3+c0wc18FbkVfWY+DRquovEPWMiDUCXi+4HvmvV+f7YI8yXtQs7T0+31WlOst7UOlHlt13fC+HsrrSeMh+aKxJqGxP/efGCoYdblb2yZGNzRs9PnpXrX9poAdw7ij6fjEGhtgzraIEJ97EaBAPbhBlPnnL5/FEqQcJgdemVQ+AvlPxfza6f0I/jeFJ3TaORYoghJE1giTYVWv0d9NOZ2lzYEYMk1JJxqWc8sgVAr71PAImk/s6hWEMa8CSpTyFhpljfgjJgs+svaQiMw/86fQnvYUma69Wnusbg4fwlKIK/yje0as9w1fgETIpKwO0rbfQd5bJCw== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 253e0b06-558c-42ea-0544-08da3cb38d96 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:30.0262 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kupJrr5bhIoz4SQQgyrhw+JlGjH467vP66BiSPillRH0U0/6zVeBeXFEL7wBhwe+7We/EluHkPLFb9jvBUOO2g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7972 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 From: Peng Fan Enable CONFIG_DM_SERIAL. uart and its pinmux was already marked with u-boot,dm-spl. Move preloader_console_init after spl_init to make sure driver model work. Signed-off-by: Peng Fan Reviewed-by: Ariel D'Alessandro Reviewed-by: Fabio Estevam --- board/variscite/imx8mn_var_som/spl.c | 11 ++--------- configs/imx8mn_var_som_defconfig | 1 + include/configs/imx8mn_var_som.h | 2 -- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/board/variscite/imx8mn_var_som/spl.c b/board/variscite/imx8mn_var_som/spl.c index 32703c5f0b3..1a8b64fc0a9 100644 --- a/board/variscite/imx8mn_var_som/spl.c +++ b/board/variscite/imx8mn_var_som/spl.c @@ -40,14 +40,8 @@ void spl_board_init(void) puts("Failed to find clock node. Check device tree\n"); } -#define UART_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_FSEL1) #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) -static const iomux_v3_cfg_t uart_pads[] = { - IMX8MN_PAD_UART4_RXD__UART4_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MN_PAD_UART4_TXD__UART4_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - static const iomux_v3_cfg_t wdog_pads[] = { IMX8MN_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -59,7 +53,6 @@ int board_early_init_f(void) imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); set_wdog_reset(wdog); - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); init_uart_clk(3); return 0; @@ -78,14 +71,14 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - ret = spl_init(); if (ret) { debug("spl_init() failed: %d\n", ret); hang(); } + preloader_console_init(); + /* DDR initialization */ spl_dram_init(); diff --git a/configs/imx8mn_var_som_defconfig b/configs/imx8mn_var_som_defconfig index 5ec82f2a926..39209f62c46 100644 --- a/configs/imx8mn_var_som_defconfig +++ b/configs/imx8mn_var_som_defconfig @@ -83,6 +83,7 @@ CONFIG_SPL_DM_PMIC_BD71837=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_SYSRESET=y CONFIG_SYSRESET_PSCI=y diff --git a/include/configs/imx8mn_var_som.h b/include/configs/imx8mn_var_som.h index 00358892b28..6ce60b0d704 100644 --- a/include/configs/imx8mn_var_som.h +++ b/include/configs/imx8mn_var_som.h @@ -64,8 +64,6 @@ #define PHYS_SDRAM 0x40000000 #define PHYS_SDRAM_SIZE SZ_1G /* 1GB DDR */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(4) - /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE SZ_2K #define CONFIG_SYS_MAXARGS 64 From patchwork Mon May 23 12:40:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634537 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=lqVXzNVm; 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 4L6G9H2S6rz9sG0 for ; Mon, 23 May 2022 22:00:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6D90784278; Mon, 23 May 2022 13:59:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="lqVXzNVm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8045B840FD; Mon, 23 May 2022 13:58:42 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on061c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::61c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9517584203 for ; Mon, 23 May 2022 13:58:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gOBErJqJczZlMK2Gf7bnRi2o1nQpdYgR/RrwVR1tICi0YNH1/6ZdpVIqRNL1JkIImLIaykiYpC5BgkrBYm+7MIzv5cTuXjq4U7Bnv5KOMpqhuiwuT+yZHxOuuMavIuPUmi18fG+9f09mC/7Qxxq+5DxtQ0DEu5x7Bdd8tlN8aDg5179ifj/0Mtwx1azNoTqKJMc2UH3x4p8SP7mqi5MCcoxQ9pLBEzK0FaVT0pUzi637PJoUobEclaRKia+ZSpWCAuS0ZHCuzZ1KgXCoHpL6iNVkiVdw3UjM7Y/84KKPhiLnz+e/iyHLTAAoHNUa+jKGXgdBsugzbmy08ymOydDVKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=dviaW2eyhTF7PoDiqtrlpGr9+aA0zcxflpYaJf18qrA=; b=G24lHoSj0UZXSeFZ9rQeoNA7mC4jpEUy00eFoy16ofk56LWKs7+RM3za4E7LlWju+xO8dhhzClzacKmpENscDnUD/HCGryr9QutBFWnwrRc2JWNJ2Gg3Ua5Px+v8ffjDF4aRsYSUsKZuIsElaw/mdDg46/yKHAcPESfhqVhD7pjZ5/gkfmTLnSNNoEpfu0X28+WNJD8MwrauP5lFRaR0CNxDeFRKBgaL/31v+Iqykj6FH2PIccvtVSEB2Vzt2TUE3fUAq9IqdLc9ZTyD5MgMl9lJEHrwoRjauvXHSMjnlTa/45nM3xPttCF15eWc46ZsCwPsxPFnLHcAZBG+4VMQmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dviaW2eyhTF7PoDiqtrlpGr9+aA0zcxflpYaJf18qrA=; b=lqVXzNVm5u83tzY0DhKHwelzIU3hftwSzukqzPCvqtxHqRQJitVALhKMAShgS/ZyfQ4l6bhzIBa94LEetXWScW4DlX+xv1cUfp8tUJlyQbV+NYEFYJU8IfiVQCTGzPoNGwMsn64sweXqlUO67TiauTJuGAUFfTnQFMoDYMkWti0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM8PR04MB7972.eurprd04.prod.outlook.com (2603:10a6:20b:236::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:58:33 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:33 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Frieder Schrempf Cc: u-boot@lists.denx.de, Peng Fan , Fabio Estevam Subject: [PATCH 08/22] imx: kontron-sl-mx8mm: enable DM_SERIAL Date: Mon, 23 May 2022 20:40:20 +0800 Message-Id: <20220523124034.12813-9-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa8e115e-9616-4297-3d40-08da3cb38f50 X-MS-TrafficTypeDiagnostic: AM8PR04MB7972:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sk4IL28FsuomIXICTdelNKWT10YApPxxtdql7mC7tp6UDy/V5HIT0moukOh+1RW9WjJH9QmkKtPcbh4rUsNHjJzypaksS+9PGC0UlocZvtosGcwkehJayN+2mIIdUgvwrYVihNpE/3sMk+ieCQDB7Ml160EKBJzT4zlutR5xSMRUJnntD4MfoQ3KnPN661lWcl/ax3TAmOfxIn7DkOCmWB36+ybLdgu0mhQm+/CLF+c7wU7vMsAqQmdFkWG6+6qE712ayUNDZbsOkAnqEeHrt1v3Zo20n7cvjiVY68t3NfuP4Sl2wHGWlKwl+Eaih28/7KNF55CW425jvGgFz6XRBBNQqKBvCAusmWttr75WybwiJ8vskJQYttYDCmrFTukNcJp03Jm952MEZuVMypQ0HWAeIX7YTS8ZTJNCDmBUMPnrb3aES1xiUUH4ATZo6oJEve4DGNvEH06rmiXMD1PqaWn+eA1vfADHO85V1ixoG2XO/k9nFQllOFN9jBSVFGb3+k8doZsZ2854sOXgJU3ATl396HVTJw86Yf8H2XzAYRphlDSX+r/SWbNVKJ5IXeEsOMibQwgTXMXLj/u5i7m5c1A1ar2iLO/ZNEZiM/Xu0mM9GBekR2uZuBqhcqYBuMTuOQln33XhLJmtRGZMp6fNZsAnh32Wv77IdJ+RoZO1J9CjZ13PzRO/7sPWrG8QucvkKweMlMcS7dNJpHagjPLrJw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(1076003)(508600001)(2906002)(186003)(2616005)(38350700002)(6666004)(86362001)(6486002)(83380400001)(54906003)(8676002)(4326008)(66946007)(66476007)(66556008)(26005)(6512007)(5660300002)(52116002)(8936002)(316002)(6506007)(6916009)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: triolyyW2Lvh0yq1UcIW1izP3WxRGqlJq037Z4j/hBsK1WMD/qGC0TQ9Chl1fgZ6+kyeecYA1ODD+/mAmADgeM/yozhxx/cfX4Uwk0luaumRgwkTo4rZF5dkd2ShT/Xs3GR3rnjquNj654tyZqbYa6+p6paiCao8xyfsmSIfpdEyLkHP+QrC9dum5dfVap5xFxppqCIRQTnHYMPpzQxe14PYQQt0oXbO8haMhWqezoWgM7v35TDUSWTmTabekrYRXdk/FoLA7kYtL9vO0z02TREWx5ocFqoMAPvtiRpd36n68ekA9TWivnC0Tx7ZLdkjnlpYScn4sf2PieSZQvF2fUw0EJVdA1LyApIluYow1Z+BS2iccJegqYNHYAkRAnTZNFhomnLJahBkjmW4A+NAuIxgvXkurCNS9w/Leg9YHlzIu4+8+facB3CZZI36XBW/UvxDFR+XXoEl0CVLhnwtrbJkS9KEfL++xK8EuND8Kxro3Uv8Z2uAYn9yEa0f5E3y4Ff8N8uOIx42hWO1xh7HbhV6nO7NhnuRJjnf1daGasi/Ac5Abq6eiUIUJzuTp5A166PPuiqGTJseEEV9ENZ0ofpgxwGFkVxbTnB1UFQsV5t3KMsfAfTHnzi8awNs8skVHtpx+n3ZehNWHGH2H2Ri/ODtULpT7IX2DEmIFLpifj+e4mPJYlyEw7vVR1p1rOPcMVFW/PtsnQKZckVxnuXFsbKdYt32kQEBh3qwnH4Owe4rSUnXubStlCWTtPVXk4qK9pUMjucL/sL8WiXiyNZrnESvqMDlTylU9aSS8Q+JWVywGGEL85SBzubrL+OO1oj6hgEuqewD3VjAYEOP0EaCHEYm8E8EvJegXRQqExf3h0dZDoTUPqyFJmvUFMBHhc5hVd8BPI2WM9c1190qZxURcmGB9Vl+SNvm2OjTf/qyZhkrhP4B1AqbbA6JWUF5xcWk/aA2IjwXghGmn9VteVZxW0oUqKU9+wpDAmLbHUV6qB+VBhyR/GEwfppYuUB+rRyWuZXnMGst+uvtN3x/JyimBL3g/oiAYA2e9gf0Vah6aK/qG9P5bU6jVKZWMaoRsOdkVU+wYkN2PCAl+uWE32w+e0XNK6u6pDDZQ4dZp2CVt0ZpbXQT+hrpMxURKZbr525cCUn+Z9sEoOVpZ+UuUJDVbos9XvcLLwLEcwJqqh58HU4MAkuS7Cly/mNL0vJbvOLGuR7jAyWgiwTkqTtTjOWeT9JNBxzoCwDPGjE1F8tblS3Tl2YZztlzkJ44DPLY9S5jnDqblh8W89yHGUQcCzYuYHXFn3OxtV2t2XQymCRrgmslC/hIJRhVPPVcewpLvfGCNbG1awxZ6QQ9JYQVHT4pvGf9tZbzL99C8UOWik7MHWjlt308DBjlHbZUR5ok2yg0Fh2Zh+GBPmAgVJEjrtL66QzWCpXPRAlF1H3TBl/aG3IYitsZMcObBGpbyUNrg7jhRhNXos7UCDvv3jNsarzurBWVk6GLEkxIpy8dO/JfR6vDBosOJTM0bOwAKRnfUXmfgqbH0X0Slal2UMpUixAhc7qozIfSxpMGREcvSg89yRbGJk5nm/EpKpCX4RXpuUmQoywFPQhCwfFFDjdWgLhNtt806FYvOqGxbeQa7wf657QzIyxlZ0rjYkbMA4UBvUvfuUAJ699kFPJYbOAJ4pbDlKxANI8OPZZQy2oBi+fEr2e0XC2ZBfk2pn0KAwxLKy1WgScCz0lMHDH05j303Gi1Fg== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa8e115e-9616-4297-3d40-08da3cb38f50 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:32.9434 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GtfnWeARmBBX10pzs2Q3rnAdpOpjRlz1ebQRsi+P+CelcfA+atrfz8mfh5AWIcI3hehp+qolUor/iMLoHiusuQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7972 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 From: Peng Fan Enable CONFIG_DM_SERIAL. uart and its pinmux was already marked with u-boot,dm-spl. Move preloader_console_init after spl_init to make sure driver model work. Signed-off-by: Peng Fan Acked-by: Frieder Schrempf Reviewed-by: Fabio Estevam --- board/kontron/sl-mx8mm/spl.c | 12 ++---------- configs/kontron-sl-mx8mm_defconfig | 1 + include/configs/kontron-sl-mx8mm.h | 1 - 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/board/kontron/sl-mx8mm/spl.c b/board/kontron/sl-mx8mm/spl.c index 4ef03c8c172..a58a75dc958 100644 --- a/board/kontron/sl-mx8mm/spl.c +++ b/board/kontron/sl-mx8mm/spl.c @@ -32,7 +32,6 @@ enum { #define GPIO_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) #define I2C_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE) -#define UART_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_FSEL1) #define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) #define TOUCH_RESET_GPIO IMX_GPIO_NR(3, 23) @@ -51,11 +50,6 @@ static iomux_v3_cfg_t const touch_gpio[] = { IMX8MM_PAD_SAI5_RXD2_GPIO3_IO23 | MUX_PAD_CTRL(GPIO_PAD_CTRL) }; -static iomux_v3_cfg_t const uart_pads[] = { - IMX8MM_PAD_UART3_RXD_UART3_RX | MUX_PAD_CTRL(UART_PAD_CTRL), - IMX8MM_PAD_UART3_TXD_UART3_TX | MUX_PAD_CTRL(UART_PAD_CTRL), -}; - static iomux_v3_cfg_t const wdog_pads[] = { IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), }; @@ -230,8 +224,6 @@ int board_early_init_f(void) set_wdog_reset(wdog); - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); - return 0; } @@ -273,8 +265,6 @@ void board_init_f(ulong dummy) timer_init(); - preloader_console_init(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); @@ -284,6 +274,8 @@ void board_init_f(ulong dummy) hang(); } + preloader_console_init(); + enable_tzc380(); /* PMIC initialization */ diff --git a/configs/kontron-sl-mx8mm_defconfig b/configs/kontron-sl-mx8mm_defconfig index f07b7890a0c..1abbbf41f5f 100644 --- a/configs/kontron-sl-mx8mm_defconfig +++ b/configs/kontron-sl-mx8mm_defconfig @@ -103,6 +103,7 @@ CONFIG_DM_REGULATOR=y CONFIG_DM_RTC=y CONFIG_RTC_RV8803=y CONFIG_CONS_INDEX=2 +CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_DM_SPI=y diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index 231571b05eb..10f06e66836 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -28,7 +28,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* Board and environment settings */ -#define CONFIG_MXC_UART_BASE UART_BASE_ADDR(3) #define CONFIG_HOSTNAME "kontron-mx8mm" #ifdef CONFIG_USB_EHCI_HCD From patchwork Mon May 23 12:40:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634538 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=GFA84Wcn; 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 4L6G9d2vQ5z9sG0 for ; Mon, 23 May 2022 22:00:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4C43F8428F; Mon, 23 May 2022 13:59:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="GFA84Wcn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 27EC884267; Mon, 23 May 2022 13:58:51 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on062f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::62f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D384B8418D for ; Mon, 23 May 2022 13:58:42 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LkiNbhmV3AfsuH5ywnZtH1PgxkIQD4XPEqkLIKVl2Ltl5Rmr0rZVBqBfvelvgd40EkjSHBBzVxpTyz17BIDZCGdif45el4uf4SpZIdeCLOlHIJAaAOnqQy0h3dM0f5APck0H2wH5phmi0C40tukhTNDv8rn1E9kvs8z2IVdleG5/f3t4yLZurKj6CAUyLZTM9fkcniMz2ORX0ipE3CCKJV9x1RnJSYRXpd1PlfJB3yEq8GJjxq8O7NljbXVc6EhsRaytiAKmzUpd8v9/BplfMM4ABBIqZv19gRURYjsp2dhefhpa5rDc0Vp0sirSmNbu4ejndnznO4SvIGEMt+qcyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=l28LmXoY2wIaNcgdemMWEwK2qc680c4k7ub6cqW2f90=; b=ZVQ1iKNPY5jZNEANovmaEEAo6kqt9iwfnagafyx1nlsSqyfHupncN++NPt8L95eB9O09P2mFnQHfw4wzokITEDjpXRQSHrHfT1YTOXoFyKbPB37G5eZCnwG/LfPhPOA9930z8SYgfKAm/3w7BzS4/7iIV3JXkbFPLI3gNii+D0zkGGSdbmZ871FzVNvU/+10kP/uiBKaJvqezZUz1mHODQ2NMN+CGVno545QW4p4pSwgGsWlw3EML+i3rj1qGaw58ORFSPPJbPplhexpor8zxfai8ejqH0REa+ZyY9MDL/o9XP41Y209r0GcRiaDjDkjRXgOXxrxgstFrv29WfptoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l28LmXoY2wIaNcgdemMWEwK2qc680c4k7ub6cqW2f90=; b=GFA84WcnBN0FzfIO4+ZCZrVugc84JtEAeM9uiBGoFmWS4gr6xNw3v3BDpfgz6rBqou8USsTgMBmNl2UPMrC87nJg7d3tV0YCg6eNbvADX4nvRL2J+zmCsaV/e3iup7LawHuU8b0o0eshLaBI3Q+in7wYazouFAOVCM/pYVWsR+w= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM6PR04MB6599.eurprd04.prod.outlook.com (2603:10a6:20b:fd::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.21; Mon, 23 May 2022 11:58:39 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:39 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Anatolij Gustschin , Oliver Graute , "Ying-Chun Liu (PaulLiu)" , Adam Ford , Marek Vasut , Peng Fan , Jagan Teki , Matteo Lisi , Tim Harvey , Ilko Iliev , Marco Franchi , Alifer Moraes , Heiko Thiery , Teresa Remmet , Marcel Ziswiler Cc: u-boot@lists.denx.de Subject: [PATCH 09/22] configs: drop CONFIG_SPL_ABORT_ON_RAW_IMAGE Date: Mon, 23 May 2022 20:40:21 +0800 Message-Id: <20220523124034.12813-10-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e06705ab-0c24-4f4a-8e11-08da3cb3934a X-MS-TrafficTypeDiagnostic: AM6PR04MB6599:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6k908nUHHKcNTVYl4piCI9VdF4JrWPXWIVjLmgE3E2T82Xa+ErfHV9FroUS9fckwP1T7JwDnVfL3EexCB0pUzBhM/EuWJtV06EP2GQd04HyrtPFfGBSH6fNUXSZjwVNK2KyTwMjHPa1U+0GWtr+375KRThUBt/P00JXlgyT/cVQGV5WfHHLe6Qg3bUl7H33Nz/iqnBt/StUvS8ODzXkbHkAKet0yQKDfqy9Xj61xMGgCv19KPEU1f5YLiClMkim1nPQlihcH0NwAFnmQps7tnc7lNNpaPtKSTNfXmy3X3Ar+k6grB99c4now1mLL7BYd1BqKIuh/TQuvudfjSQpAF1Y8uaRbYJSKNpbRfUBIGd2slpwEZd0HNgEPsyJSMQ70fx9TyIDjdxG0LQvIzU7GKD8vRtYdnRpeUpUMfbYCSij8lO19FYYPlT4JNDdIOIhQrmTBtyG6LFaalDW0Q8fDCtzxsjMPfy+mHuoaFI993u+RwzUQVjbfWB+E1RQpEr5MmNM41FaNSBnsWlOsN/1Ogw29yZ3rLaq0u2hr0d4JcJf8OegRIiZjMALf/9QeL9bAONZX7USkF65PDFLYnQ8EeK2xmiHgg+6xeshVr72SuCUmyFvZytX6ffhcChJA3jYWGwh9Rs/BZZyaOUCnJvTEGqmFH9A8EWcbb/6CyeJ7S1RXJo4HcAEy9I0flbNicsiXbmft8bwxGyr8dTa0DTrhpDHI5iZsSqFxUh1zlc9aaTg= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(8676002)(86362001)(921005)(6486002)(6666004)(6512007)(316002)(26005)(52116002)(66476007)(66556008)(66946007)(6506007)(7416002)(2906002)(508600001)(30864003)(5660300002)(4326008)(38100700002)(38350700002)(110136005)(1076003)(2616005)(83380400001)(186003)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zoJPwi3MBNGpWUQ5nirlNOVS0Pb9a+DhaqpkFQjduNTzJt72V3h6laP/wAvjqXEPmKYfk+soRjzO3vuQh2saUdzEtRRi25oHtfAEADSHDUhCdAK+sKLDSnUdAlO/F5THaAavohBqKE4TY9RifaT2SITvIo/lX+NwipOLt5Snrcs8lYu0eILZTqb2QG5RRP6SyFf5U2Edqwh3jnBqYY+YfnnmaSV0GcvXLMeXyzSbznInlhjnHbTkXs/KVusChq9UpQwMkbifC+0HQU2d0HL4ijUbu7F8zW7fDJWFHPFQTrLmvefII40O+S8m892k7glXLO0xFfAe++XwGnJpH/xSdwVchTBnmBxTTxdOrVsXQnZZadOofypDAo1OXKmOERCg5yrWnmOysFBo5iyyhZFhDlfaKt+hqZQDWT/Rn7wakLx1Y2u1pk3dk+JlFMHOSpMng6V/I9J0YhdpfaPwKiwzoSPaPk9ZhGZU02N8ftGdX7FiPsDOiCX2XxKsckqhqzI83qJ0verAAMq/WxIGhFHfJCQvJcHPLavhcL5x+qKWN+BjuRNPjdvmq6f6JjeiiCAleuC8qe3jQlm7KupP7EM3YJJpA79KqDX/YGqMLZPMdjU2N3cubFNMGj11uoNOVO36Z4LCCjcU0z4ui2jxgU9kkBqTvk52fdKkpinP1jAYa869+t8Re+RMrtUl59M7ViSE8+rFGHAojNpKA9NHIC5sr8Ds7vHSai1ZRTLQIUR9+GjNj991267lhaZqo6U5NZVXmKrkNyyVCCZ9vjPDPgsm+Gft9WOJZ+D7eY/QSM6f1JTFXp9B5TcCBt1wD7SK3SVRPjgHCzZ8s33aawXE0EwN6txB48GYLhqOphUbAyKVi2+TJwrJ4T6X2ykM788O4AGQKEPjdhmwalPuAdEvd1zSIPKMwYgACiW14oA9ed5JO68b/6liz6FVF0MZAVm88TqR4FQJ8B+zdzKBbULJ/3DGD/e3TcaJEH3Ul641Wq3/eFnEjV+6T64iriHBbWdVy/rMZPCie3vR5O3vJx0ybw/m1cmgM5YRKML4uHHZSRePO7UsNwDlxhH/UH3TTPEJTyoRU14J8by2pZspGvAOhYiLYf4uKDN7ve+VHZJDXjWFNHiZpqpaq4NWJx/iReJSaK0QUCK9YH1y6PUixur5VPIJFRqrr6C7VJT81uDd+7G1EGh707V4DKkJ5AyrQCMLlK3VAagEyZUDftyjdVt87BmbSQkhbLWV3I0ezja97loO60a2wjFVcJ4xRxber0lo+mSX8KwQk5D3Nv9ZNI3rtKCs4Fybl62lFiRggMMRUp5rH2SnulaI3rn1GiOQvECYEMqvX9FCDONlasEhBJe0JZqmbWj7IkjzL407SZFQvMRbIAAMEcjixuzYBpZp4o4+S8iisu6C1ZDhVc0TnhB5BKtr9hVIkw1poopg0sRoavm/TeVHcoESW+BtWeu9r5DIlnluhS2vn2rpZ2NlimYOrcYgZvAjAS+NvYtyr5ocOKOnWtoGVk96J+Q+LKOIDM5fT8mBsBXXYS/S1oH0KXJociayxozyGt54v4tqta4IvDhOTAGGkQ816N3u+goetvFizTHomaNAAWvpTHRpI79hzmf2BwHSHppGkAsnI7XMLnZhSFRxXxz0QBbbJLDC0Ag2USQENVC1RvAUcRXKIBGMcy8QPKt+5jppOXwvkrR9+dKwvyTM/lG/oNel3ABdb6Xw3FcEesxFloMHFt70xcstklOs4Q== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e06705ab-0c24-4f4a-8e11-08da3cb3934a X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:39.6951 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: IPJyV5gU0QRGRJLe1N32uW3131O0qurJwXsSlAt/r8rrRazuUkNGME4B/pgHtjaDSnaLdTiC/+REFKuQsPPIcg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB6599 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 From: Peng Fan CONFIG_SPL_RAW_IMAGE_SUPPORT default y has been used to replace CONFIG_SPL_ABORT_ON_RAW_IMAGE for quite some time, so drop CONFIG_SPL_ABORT_ON_RAW_IMAGE. Signed-off-by: Peng Fan --- include/configs/capricorn-common.h | 1 - include/configs/cgtqmx8.h | 1 - include/configs/imx8mm-cl-iot-gate.h | 1 - include/configs/imx8mm_beacon.h | 1 - include/configs/imx8mm_data_modul_edm_sbc.h | 1 - include/configs/imx8mm_evk.h | 1 - include/configs/imx8mm_icore_mx8mm.h | 1 - include/configs/imx8mm_venice.h | 1 - include/configs/imx8mn_beacon.h | 1 - include/configs/imx8mn_evk.h | 1 - include/configs/imx8mn_venice.h | 1 - include/configs/imx8mp_evk.h | 1 - include/configs/imx8mp_rsb3720.h | 1 - include/configs/imx8mp_venice.h | 1 - include/configs/imx8mq_cm.h | 1 - include/configs/imx8mq_evk.h | 1 - include/configs/imx8mq_phanbell.h | 1 - include/configs/imx8qm_mek.h | 1 - include/configs/imx8qxp_mek.h | 1 - include/configs/imx8ulp_evk.h | 1 - include/configs/kontron_pitx_imx8m.h | 1 - include/configs/phycore_imx8mm.h | 1 - include/configs/phycore_imx8mp.h | 1 - include/configs/pico-imx8mq.h | 1 - include/configs/verdin-imx8mm.h | 1 - include/configs/verdin-imx8mp.h | 1 - 26 files changed, 26 deletions(-) diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 364bd50b591..aa4c9818638 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -26,7 +26,6 @@ #define CONFIG_MALLOC_F_ADDR 0x00120000 #define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif /* CONFIG_SPL_BUILD */ diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index 4c04bbf6447..eee6e735b1f 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -25,7 +25,6 @@ #define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif /* Flat Device Tree Definitions */ diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index f262ab08f04..cbb27db6be0 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -27,7 +27,6 @@ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x912000 /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index 4c9b5491f78..a9ca13a9da4 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -24,7 +24,6 @@ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h index 67667dd523d..2f3608835a2 100644 --- a/include/configs/imx8mm_data_modul_edm_sbc.h +++ b/include/configs/imx8mm_data_modul_edm_sbc.h @@ -25,7 +25,6 @@ #define CONFIG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 002b2e68bba..d216455ebd9 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -26,7 +26,6 @@ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h index 1a439370c09..34993cafdaf 100644 --- a/include/configs/imx8mm_icore_mx8mm.h +++ b/include/configs/imx8mm_icore_mx8mm.h @@ -25,7 +25,6 @@ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ # define CONFIG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ -# define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif /* CONFIG_SPL_BUILD */ #ifndef CONFIG_SPL_BUILD diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index 90e8941a254..75f7dae8349 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -24,7 +24,6 @@ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index c16dda5e22c..57b99d5a110 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -25,7 +25,6 @@ #define CONFIG_MALLOC_F_ADDR 0x184000 /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif /* CONFIG_SPL_BUILD */ diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 86be1b8b3be..0b2eefa6368 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -25,7 +25,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h index 6555dd4349c..160ba9648db 100644 --- a/include/configs/imx8mn_venice.h +++ b/include/configs/imx8mn_venice.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif #define MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 373098f10c4..4aac7c81d2e 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x42200000 #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #define CONFIG_POWER_PCA9450 diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index 52e8ea8f86a..7dcc2e16c71 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -39,7 +39,6 @@ * set \ */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #if defined(CONFIG_NAND_BOOT) #define CONFIG_SPL_NAND_MXS diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h index c09a1b4572a..17400cffc63 100644 --- a/include/configs/imx8mp_venice.h +++ b/include/configs/imx8mp_venice.h @@ -22,7 +22,6 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif #define MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index 6eecfc813a4..7a9dd962ac2 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -26,7 +26,6 @@ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index e31f4135ae5..b7294ebef1e 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -27,7 +27,6 @@ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #define CONFIG_POWER_PFUZE100 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 57e45b0447c..93e531b66fd 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -24,7 +24,6 @@ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif /* ENET Config */ diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 61d56e269ac..ddcd6cf2319 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -26,7 +26,6 @@ #define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif #ifdef CONFIG_AHAB_BOOT diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 26dc4ded030..dee6852df4c 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -24,7 +24,6 @@ #define CONFIG_SPL_RAW_IMAGE_ARM_TRUSTED_FIRMWARE -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif #ifdef CONFIG_AHAB_BOOT diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index 05df43b39b4..190bbb8c13c 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -23,7 +23,6 @@ #define CONFIG_MALLOC_F_ADDR 0x22040000 -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE /* For RAW image gives a error info not panic */ #endif diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h index 1834991ac3b..9089b76d26e 100644 --- a/include/configs/kontron_pitx_imx8m.h +++ b/include/configs/kontron_pitx_imx8m.h @@ -28,7 +28,6 @@ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #define CONFIG_POWER_PFUZE100 diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h index 564b8125ba3..b70c31ca633 100644 --- a/include/configs/phycore_imx8mm.h +++ b/include/configs/phycore_imx8mm.h @@ -27,7 +27,6 @@ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index 3e4315f2b81..95d70bb92d1 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -24,7 +24,6 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x42200000 #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #define CONFIG_POWER_PCA9450 diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index 1dc7d352590..de035160255 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -24,7 +24,6 @@ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif /* ENET Config */ diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 9ed9da043f6..3f9ddc4eb81 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -26,7 +26,6 @@ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x930000 /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #endif #define MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h index 20e8473f793..09eac5288ce 100644 --- a/include/configs/verdin-imx8mp.h +++ b/include/configs/verdin-imx8mp.h @@ -25,7 +25,6 @@ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x184000 /* For RAW image gives a error info not panic */ -#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #define CONFIG_POWER_PCA9450 From patchwork Mon May 23 12:40:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634539 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=ToiDckSo; 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 4L6G9v04F2z9sG0 for ; Mon, 23 May 2022 22:00:34 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0D410842B7; Mon, 23 May 2022 13:59:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="ToiDckSo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D6219840E7; Mon, 23 May 2022 13:58:57 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0622.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::622]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 67EB584207 for ; Mon, 23 May 2022 13:58:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZzUnRseLm9HxEfNw+j7kucpXN9nHyIyq53Un4bhZuolSzKqygcu8fRQ2oFBa9CTZ4261RBebCAeKtj/vXnBpvfW28afqfFUBaWs+xxSf1pd+bD4zHLzIZg75d27t5WfdQnHjj7gIwg45JoYJWhEliZDG/yRL2O/34FwQgbBroqMWJXs1TjKMyNDSOkWMcSc+dV+Ao9n1U+Fgo2Iui+cTepARXTEmee9s+5eVVyxzb46gC9OY/btkGmhTGyk55Fzoo674IEGBHjQDzLTnqn2vRy35/HgIdT4eud9GWQejjNPYlXkuHK29+iIQvXNH8vHpKC2zN9ANWLJnDe3irUr+Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mBNPazcQCDIyD45OQyPuhhsA2rjp/8dF/uMQ/QMFLoA=; b=hYzaLBCiywedkVF65y0g5LUjs3hjldE//TAAjx+p+7GS9TA2tBqqKkrr7NkxmBasZqNlQaeYsxbNEtUjS319tdw0Vb42mJ5jjHJi6mpFFwiSDuh49qaYw46XLh/qGo+KNt7/B77rpVpvO6XaydHQJ2jAtheZAOvdhxYfLQ6lJGRfw+77K7ax3USaK3YDe122xtp0444bUx+jS+ca8KoVyzCijREMWz0diV24f7lxQ/BfrPynqHV+96o6myd6PVLrp+qz19jHR6Bqa0BZlNm1bCDE00UQ3rAHJMxuj1AW3V9TJwT4QzFFPwxQpdCcOxNp7LprA4W3zqled86UYz70RQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mBNPazcQCDIyD45OQyPuhhsA2rjp/8dF/uMQ/QMFLoA=; b=ToiDckSoUJ1/L2JvVpbB0W8oFuOFIfbpaiRAMfN2QgK8mZ+AsDWjSiZBm3Ib/zHDUbvlTwKL6f5NHdUhd/9tlw3hKRf90wpdqpKPE6PiQ/PVp6E2me9UvAuUokeihg5k/fKd9yZH1hwUAxOaYTH3yNhCCy/ZVitjTlNirDT+EOQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM6PR04MB6599.eurprd04.prod.outlook.com (2603:10a6:20b:fd::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.21; Mon, 23 May 2022 11:58:45 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:45 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "Ying-Chun Liu (PaulLiu)" , Adam Ford , Marek Vasut , Peng Fan , Jagan Teki , Matteo Lisi , Tim Harvey , Frieder Schrempf , Teresa Remmet , Marcel Ziswiler Cc: u-boot@lists.denx.de Subject: [PATCH 10/22] configs: imx8m: use common imx8m.h for i.MX8MM Date: Mon, 23 May 2022 20:40:22 +0800 Message-Id: <20220523124034.12813-11-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0c97ba69-0e33-4924-7728-08da3cb39660 X-MS-TrafficTypeDiagnostic: AM6PR04MB6599:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uUrwArHtiOurXp4tAHtrD2Efm1iFIcvcx3r4NheIzzCng3lAD1krugY0ckb84eaPxe5UC1cSJ4RhsA4BKxspxAtXip4TRkVfnJGsXnN5vQ704DOFLL1FqioC54t8mptBSlMVpSBjwp4ruc5Fe+AKbCIehzvrZ4l/bnRZt7fTx1ipUIo3/dfgTgCceoinSwcHCFjLUihKGHqM/amjONgfzZKQ8VJCJnpmPja6qAJbdlr2YSVpHo0WWY4/l68u5C7xjWkpBxeDHAKhfgni9nW+ZKqmopwvRSyz+OmG57zZyW936tuT1+MRo/UU3CW7xIthmth81d68+uK59KRYevH+Y+TDt5Cs5hnbSMGRn66NF/81cK+fsy6SaXPgbRRW3FnkpoQBstE5DnGThYfjT/IJYP0dm9G/Y11OMgSnyrh1KrmkXhFZbj3Hfs1wpAUFBOp0sUpxgM56j52vYsiDisafAbsfVSupQFf+RsLLBTuTA5sMBocCsrX9Bj+7u2DTVTf9+TzeOwKBu55G3tApD4/NggDOqexLhzbroZscNeJOSuF+7Hu7/cMTq2PH3yVrVATRSbbHBXnffJ3ULuX9VSpyxB7QcSkholbZzDHYbiAGtkkwY+JJUa6NEkS8IpNoa4I4SF7EhMhLsr9SPY59mhaDMiPMoUN5H98lbux5oy7SosFQHqy/K+CcFRQbY2FlnJHE0uMIqe43YkOO8yGu9r+pCzbg34DE6GnrlcZ74wnlu5fIyRoM5eoxm5l2y3cze8cd X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(8676002)(86362001)(921005)(6486002)(6666004)(6512007)(316002)(26005)(52116002)(66476007)(66556008)(66946007)(6506007)(7416002)(2906002)(508600001)(30864003)(5660300002)(4326008)(38100700002)(38350700002)(110136005)(1076003)(2616005)(83380400001)(186003)(8936002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iUbYKhMIfivGpSXojID+THxMTu8gtK3AmuG1Fkl0HLf3CG9BcXgmBq04zGw/x54Of0x+3qCYmx8VVifZAD9rL2AdQ11Ol/mJzviITlHCM5WDDAuS7iJzNHH3XxHw/Sj0C7I2TFDiyAzQEBH13vwxbLRlO4M/wRDreTidnZIolfKLyLvR1RxEK1xIaISZhSQDXunoNkxKUKzBes429LnsEGu1lW2v9uBdbkaRHYTumAtloKAik/nGwjsri7eCMHC8830VPTBPuBPqRgeYz7mud3gg1o1I8tX52ZuLGasD9yRfvF471QEOSNczTr9y7++flA6iUId/fXCGQf58Klh1xiY7p/jVLmEAcPmf8PdHJ93pI/0dV44/CtDtq2QQb1bXuaYYMKoF+zcBahsfyk4cFhITiIZFDxLEZc003ayP4bboCRn8VuzvO4oam7hVQOfiyrBdHESXkWxuTf0/Se4hFkWAfFlg7JG17NpJAcpRQoSYjkkixyk6EI5RUqmeWh3Uz1VkucQu1+2YDnBIs46/aY7i1guiUfipJrYjWiPuvrlYSAhG1SzzgKwHIm2MgZx6z6U4wXIDpiaIFl6Vw7uMY48OvUGEosXdAmyJp2fRlDiiYf81rnp8gtxU2OxhCGX6vWMi6wguMpS1qVP8ckLdDsb1EK2As1IxtAY87kvHILTKPaXZNv5+g3ix5k1W+xhTz7j4hDjee1MYMvTa/wvzzdIsjWnr9pJAG/izzlzE4fXeHMYBK5uUHuMtoO6ReeZxgsuwWvvqSiejK29CWiOTBcZriS6HL2HrBKWLFXPQcSIU9qENMeu7mRudYD6kU9/BeTF/fr52BGQBXUd083x2hzuGangAqZnoAFZMtVR9ZTxwWuK8EOGBlGi44BEYmAdDVn42guwUnJ3UH5GRW7C3LJUR9dLYbttHc1dJ7tQo4yYvbQbrSn4BIBgy8+sk/ySESf0VawAm9nN2FOMJzs4CheNGws2F6we9VFLVZZ6PQJGr0wVqxAa7NLLLgdtqTHxvg6UAJWz0ymrw0TKH0PWECxBb5C2ZSnqUBDDh8Dpv67B8KRPyJ/KabnyOCAFyjndw1ezlaZrW2gugXglpFQ6cjX7IjS73AhoKb6qj1uPORDCGNZ1m2L4qZMFt2pR8pJW9lYeEKqKHZQWgY9smm1n0X/XjdoOyBSw+dxSI10I/H+vBG1Q4v9oDPi3P/EQ+4IRrPZAAYi+FstxdsPdZuIQznJrWeTaVSyQTTOjgTOE2B7O199tKCs91F6ZqOFeqMLi1l4Tina7uzn1aVaclNlkOie9YTW3/yTuwVzCiiau/8dUvqVVLQ/QE7wX/LWih37A39F8x8ydZK18xsazusEW2aSX+peWiKUe/WhVvW/QK18s11Um5IpMy5WlMlYJfzmI5VL12kSQGfM30eWO+zcGCSYls7/I9GDbcVRF/V1+XNWK7BksTW5ok9MGIeFnEV+ap/QsVBLSzEp9BVW/2F+28isNQOqC2QeGKIT6FJ0Z8CfJW5PuzmQx/n24kRaqxplseleAwj1IU3EuMGu6o691fKBRVBpLtFaUIXihtE+bCNpZQGmwWVKc8KX99Xsk+fkHvVNTdWhazldkJT4+EFJVogm+mLpyYn7z3gmKvl4kTggtJt3KVO0BKn6WJGjkYWd+hYOnjmVPM6v/q02A037EiOhKheZ/GSzXZrsqchpy6yZ2QgBy8phJprVGBFqt7EJzTVlSF56g9rOYiYb0E0gosAQ== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0c97ba69-0e33-4924-7728-08da3cb39660 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:44.9656 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: rD+wudn1KyTHXLuQzMZg78bW/3UJJR5sob/HX7qIk3P2gF4Sp/ga9CE8h2gHpaZslY0OpeynNK/qYkGmTaD2BA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB6599 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 From: Peng Fan Some SPL definitions could be generalized, so use imx8m.h for that. i.MX8MN/Q/P will follow up. Signed-off-by: Peng Fan Tested-by: Tim Harvey #imx8mm-venice-* --- include/configs/imx8m.h | 29 +++++++++++++++++++++ include/configs/imx8mm-cl-iot-gate.h | 17 ++---------- include/configs/imx8mm_beacon.h | 21 +-------------- include/configs/imx8mm_data_modul_edm_sbc.h | 16 +++--------- include/configs/imx8mm_evk.h | 21 +-------------- include/configs/imx8mm_icore_mx8mm.h | 20 +------------- include/configs/imx8mm_venice.h | 18 ++----------- include/configs/kontron-sl-mx8mm.h | 14 +--------- include/configs/phycore_imx8mm.h | 20 +------------- include/configs/verdin-imx8mm.h | 20 +------------- 10 files changed, 42 insertions(+), 154 deletions(-) create mode 100644 include/configs/imx8m.h diff --git a/include/configs/imx8m.h b/include/configs/imx8m.h new file mode 100644 index 00000000000..cb8ce5689ac --- /dev/null +++ b/include/configs/imx8m.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2022 NXP + */ + +#ifndef __IMX8MM_H +#define __IMX8MM_H + +#include +#include +#include + +#define CONFIG_SPL_MAX_SIZE (172 * 1024) +#define CONFIG_SYS_MONITOR_LEN SZ_512K +#define CONFIG_SYS_UBOOT_BASE \ + (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) + +#ifdef CONFIG_SPL_BUILD +#define CONFIG_SPL_STACK 0x920000 +#define CONFIG_SPL_BSS_START_ADDR 0x910000 +#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K +#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 +#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K + +/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ +#define CONFIG_MALLOC_F_ADDR 0x930000 + +#endif +#endif diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index cbb27db6be0..cbf33a76a09 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -6,28 +6,15 @@ #ifndef __IMX8MM_CL_IOT_GATE_H #define __IMX8MM_CL_IOT_GATE_H -#include -#include -#include +#include #include #define CONFIG_SYS_BOOTM_LEN (32 * SZ_1M) -#define CONFIG_SPL_MAX_SIZE (148 * 1024) -#define CONFIG_SYS_MONITOR_LEN SZ_512K -#define CONFIG_SYS_UBOOT_BASE \ - (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) #ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_STACK 0x920000 -#define CONFIG_SPL_BSS_START_ADDR 0x910000 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K /* 8 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ - +#undef CONFIG_MALLOC_F_ADDR /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x912000 -/* For RAW image gives a error info not panic */ - #endif /* GUIDs for capsule updatable firmware images */ diff --git a/include/configs/imx8mm_beacon.h b/include/configs/imx8mm_beacon.h index a9ca13a9da4..c73188a16f2 100644 --- a/include/configs/imx8mm_beacon.h +++ b/include/configs/imx8mm_beacon.h @@ -6,26 +6,7 @@ #ifndef __IMX8MM_BEACON_H #define __IMX8MM_BEACON_H -#include -#include - -#define CONFIG_SPL_MAX_SIZE (148 * 1024) -#define CONFIG_SYS_MONITOR_LEN SZ_512K -#define CONFIG_SYS_UBOOT_BASE \ - (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) - -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_STACK 0x920000 -#define CONFIG_SPL_BSS_START_ADDR 0x910000 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K /* 8 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ - -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 -/* For RAW image gives a error info not panic */ - -#endif +#include /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/imx8mm_data_modul_edm_sbc.h b/include/configs/imx8mm_data_modul_edm_sbc.h index 2f3608835a2..e098cddf967 100644 --- a/include/configs/imx8mm_data_modul_edm_sbc.h +++ b/include/configs/imx8mm_data_modul_edm_sbc.h @@ -6,26 +6,16 @@ #ifndef __IMX8MM_DATA_MODUL_EDM_SBC_H #define __IMX8MM_DATA_MODUL_EDM_SBC_H -#include -#include -#include +#include #define CONFIG_SYS_BOOTM_LEN SZ_128M -#define CONFIG_SPL_MAX_SIZE (148 * 1024) +#undef CONFIG_SYS_MONITOR_LEN #define CONFIG_SYS_MONITOR_LEN SZ_1M -#define CONFIG_SPL_STACK 0x920000 #ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_BSS_START_ADDR 0x910000 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K /* 8 kiB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 +#undef CONFIG_SYS_SPL_MALLOC_SIZE #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_16M /* 16 MiB */ - -#define CONFIG_MALLOC_F_ADDR 0x930000 - -/* For RAW image gives a error info not panic */ - #endif /* Link Definitions */ diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index d216455ebd9..3d617f11d5e 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -6,28 +6,9 @@ #ifndef __IMX8MM_EVK_H #define __IMX8MM_EVK_H -#include -#include -#include +#include #define CONFIG_SYS_BOOTM_LEN (64 * SZ_1M) -#define CONFIG_SPL_MAX_SIZE (148 * 1024) -#define CONFIG_SYS_MONITOR_LEN SZ_512K -#define CONFIG_SYS_UBOOT_BASE \ - (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) - -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_STACK 0x920000 -#define CONFIG_SPL_BSS_START_ADDR 0x910000 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K /* 8 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ - -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 -/* For RAW image gives a error info not panic */ - -#endif #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/imx8mm_icore_mx8mm.h b/include/configs/imx8mm_icore_mx8mm.h index 34993cafdaf..7d52d43ef13 100644 --- a/include/configs/imx8mm_icore_mx8mm.h +++ b/include/configs/imx8mm_icore_mx8mm.h @@ -7,25 +7,7 @@ #ifndef __IMX8MM_ICORE_MX8MM_H #define __IMX8MM_ICORE_MX8MM_H -#include -#include - -#define CONFIG_SPL_MAX_SIZE (148 * 1024) -#define CONFIG_SYS_MONITOR_LEN SZ_512K -#define CONFIG_SYS_UBOOT_BASE \ - (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) - -#ifdef CONFIG_SPL_BUILD -# define CONFIG_SPL_STACK 0x920000 -# define CONFIG_SPL_BSS_START_ADDR 0x910000 -# define CONFIG_SPL_BSS_MAX_SIZE SZ_8K -# define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -# define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K - -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -# define CONFIG_MALLOC_F_ADDR 0x930000 -/* For RAW image gives a error info not panic */ -#endif /* CONFIG_SPL_BUILD */ +#include #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index 75f7dae8349..cc6fa9479ae 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -6,25 +6,11 @@ #ifndef __IMX8MM_VENICE_H #define __IMX8MM_VENICE_H -#include -#include - -#define CONFIG_SPL_MAX_SIZE (148 * 1024) -#define CONFIG_SYS_MONITOR_LEN SZ_512K -#define CONFIG_SYS_UBOOT_BASE \ - (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) +#include #ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_STACK 0x920000 -#define CONFIG_SPL_BSS_START_ADDR 0x910000 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 +#undef CONFIG_SYS_SPL_MALLOC_SIZE #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_1M - -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 -/* For RAW image gives a error info not panic */ - #endif #define MEM_LAYOUT_ENV_SETTINGS \ diff --git a/include/configs/kontron-sl-mx8mm.h b/include/configs/kontron-sl-mx8mm.h index 10f06e66836..b1579097570 100644 --- a/include/configs/kontron-sl-mx8mm.h +++ b/include/configs/kontron-sl-mx8mm.h @@ -7,8 +7,7 @@ #ifndef __KONTRON_MX8MM_CONFIG_H #define __KONTRON_MX8MM_CONFIG_H -#include -#include +#include #ifdef CONFIG_SPL_BUILD #include @@ -57,17 +56,6 @@ #endif #define CONFIG_SYS_BOOTM_LEN SZ_64M -#define CONFIG_SPL_MAX_SIZE (148 * SZ_1K) - -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_STACK 0x91fff0 -#define CONFIG_SPL_BSS_START_ADDR 0x910000 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 -#endif #define ENV_MEM_LAYOUT_SETTINGS \ "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/phycore_imx8mm.h b/include/configs/phycore_imx8mm.h index b70c31ca633..7fdb429c79a 100644 --- a/include/configs/phycore_imx8mm.h +++ b/include/configs/phycore_imx8mm.h @@ -7,27 +7,9 @@ #ifndef __PHYCORE_IMX8MM_H #define __PHYCORE_IMX8MM_H -#include -#include -#include +#include #define CONFIG_SYS_BOOTM_LEN SZ_64M -#define CONFIG_SPL_MAX_SIZE (148 * SZ_1K) -#define CONFIG_SYS_MONITOR_LEN SZ_512K -#define CONFIG_SYS_UBOOT_BASE \ - (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) - -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_STACK 0x920000 -#define CONFIG_SPL_BSS_START_ADDR 0x910000 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K - -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 -/* For RAW image gives a error info not panic */ -#endif #define CONFIG_EXTRA_ENV_SETTINGS \ "image=Image\0" \ diff --git a/include/configs/verdin-imx8mm.h b/include/configs/verdin-imx8mm.h index 3f9ddc4eb81..31fff9dbf9d 100644 --- a/include/configs/verdin-imx8mm.h +++ b/include/configs/verdin-imx8mm.h @@ -6,28 +6,10 @@ #ifndef __VERDIN_IMX8MM_H #define __VERDIN_IMX8MM_H -#include -#include - -#define CONFIG_SPL_MAX_SIZE (148 * 1024) -#define CONFIG_SYS_MONITOR_LEN SZ_512K -#define CONFIG_SYS_UBOOT_BASE \ - (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) +#include #define CONFIG_SYS_BOOTM_LEN SZ_64M -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_STACK 0x920000 -#define CONFIG_SPL_BSS_START_ADDR 0x910000 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K /* 8 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ - -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x930000 -/* For RAW image gives a error info not panic */ -#endif - #define MEM_LAYOUT_ENV_SETTINGS \ "fdt_addr_r=0x44000000\0" \ "kernel_addr_r=0x42000000\0" \ From patchwork Mon May 23 12:40:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634540 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=QD42vZwX; 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 4L6GB93SzDz9sG0 for ; Mon, 23 May 2022 22:00:49 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EA5CF8424E; Mon, 23 May 2022 13:59:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="QD42vZwX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8501B8418D; Mon, 23 May 2022 13:59:02 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0631.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::631]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D5F5B8425D for ; Mon, 23 May 2022 13:58:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JqtIZ918lvdjAZiCGUI/Apux4UasIDRjtQSF0WQHU4NNuv4O9J29yN/eN2HpoqfAZUL02KaOHBH4RnhF3ZOWfeJqSrxsp/Kfgv1GtFkmW/rJdOvXATTeMy8V1FBzJnDErpyM5b4igiclCDu/puM793adhl30ll7A4xaNqEJu/EZy7aZh6VdGtrH17QqOFg1qOUsHz0j/quJpwUmYKS5O1Ze8i3hVkzy1urDWMJkIeGkXLcbVgRr9Z+u6CbJhzhSa6ivFZRpg1D5pMH1T82QOky7gpQ4Nx1UtW8BiUuyp7TFG9+iCOmAVoVRqLhj0awZFuVqaoPPcV/EICJjvdnBR2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VnCfDYz3TTC/qdiYxzICjbLvFCEl1wvFthlF3xiLP0w=; b=YSH+j6GXUWSfdIjmH1w42beVjSRfN70fZfFz2it7kfCEU2AXNujHHQOdNjwCsD1kPxQHPOfc5CT7UnrrxeN3NqE7wrv2tLR4pw9/5VnGCKBk3d3AP9yD5jpDJsm3pwEqzMblQ3kKHv7r2p/K2kS1EElV35RkNFKRcOjJ6GANQBSPA6TxOoIM0p1/wRpkbgt3tO5eXV3uBkm95vq8BisbgBsdHl0G4nuqtzUA3wmZvYm5Jsz7l0sZpMlmuWWJKiT7j3ofYmg/wo8ywcWMKKrjcjUFIbiZGoDJGRcwFPLHoIzXQGYMA4iacTW3UzvY2vCHNIKsNaGExKtWU0pY/s0AhA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VnCfDYz3TTC/qdiYxzICjbLvFCEl1wvFthlF3xiLP0w=; b=QD42vZwXSb1ZY2ltTMgVgpkxm5Fav98Cm6eBwv6QTVNKO6DA2Zru01zfXED453WZ+BaPlda+JxDQ+bv4u/R3XIxgemkeHPO+NMl803FCaIyxIrS+FHbhYl2Xfin9oqa3dzxgUaeAzaAflT+D3zD8/5BsKiLU2wskumSUhCai/nk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM6PR04MB6599.eurprd04.prod.outlook.com (2603:10a6:20b:fd::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.21; Mon, 23 May 2022 11:58:48 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:48 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "Ariel D'Alessandro" , Michael Trimarchi , Peng Fan , Tim Harvey Cc: u-boot@lists.denx.de Subject: [PATCH 11/22] configs: imx8m: use common imx8m.h for i.MX8MN Date: Mon, 23 May 2022 20:40:23 +0800 Message-Id: <20220523124034.12813-12-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4244d988-f019-4553-dfc5-08da3cb3985e X-MS-TrafficTypeDiagnostic: AM6PR04MB6599:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dSesKm+9lSMWrGTZ6nH2+4gTHW3l8uLqtDYErEmlr0+as92H710lDUakZXJZkuZXrUxEHB0q6SFswuHGqEaq3eGiPqfqa2wCD4kkYy9JNOgwlOS9O5a07hyKHwrMCBVeJJ0fkX7g8Vn5gKUMeOhsbhkoRQ9Hryt36PiIUL0fSwFk1oTRWBStzS1yMn8j1JqU0VoWefmR6aegKOsQk3Zo6CH5UgbpYRRSFKp/Z0/Fb2NVACgePH3lN1ffqLkXCDdlY/dhp3V+WH+rytmobrGnb8V2VOV8O8UkIRnsSC39Uu9OmYQw72bxh7GwI+kGmphsCLCfWWKkET57QwMRynaM/DjgJFGMHzvqx9xgkWZpXB9Wvwe1ozpjAXRPBiNSoTWUHtX9u4QPJGkKDwWQINmbLRALsSJ5R9LZPz3FL7qh3CoyevD1VrDu4KzIbMwOxoQpq3dlLQQ5n8nszliRuASLkBZeAwzuV65+vCrJjvfIcAdOY1s4wRu0J+ZVr1XMnuS6Kl+n1c34j0zFdnUOTA9XywmYxZfPeL7H8Iw8BRRM5al+MAflIjfrd33pSiS7fnT7eFq5dJUQI824aHrMwfWhrFQeZY+TgZ4YWRi50Hgb9MFFnkQAGC56doX2IrVUOx96AzdtmsbVfw7Cs1bxn4EatjsanqkdtbQwcYV9MplVOhV64QW4Ynk2nDiMH9yhZ6azhnWBBh7w/SiUaVgmuxSpvQwvSg7k6lYdUYvMK2H3Ohk= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(8676002)(86362001)(6486002)(6666004)(6512007)(316002)(26005)(52116002)(66476007)(66556008)(66946007)(6506007)(2906002)(508600001)(5660300002)(4326008)(38100700002)(38350700002)(110136005)(1076003)(2616005)(83380400001)(186003)(8936002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ICZFGRBnVZnyeIoPtk1IqeFd0yUA6b1eePJOgH3lGDxlHLZI1KYxXEfent1n6nzyCcB5o0oBcUH/MeCkLfUktJDcKA/1Bj3Z85lxzltkr2KkicbaAsEFFfiKEAf7HyEhxU9DETqeWDlN7DmlqA3zgQC+CCOOSIXHWugB47tTnGUN1B1UaxLIEt7/mCMfjE4ljYhcAVuU89A+Rg7VwUOIwpGPXSznGBMmwxEJ+uIejgPD0Hc6YgBtWgk/ATmQpTToCRunJ88SLZ6XfUUr9SK9Sdi8SIzGvdIJthYvGY1YyZY8xpWbL62Q2pHFRDuNT23/xAdZo75u5K/vGjj4zzLMukhyJQ4lMLQk37PHU6XgSER36DGp91grr0OvoDkZk6kgUsJ4MSVJk3Qs9niweSq3hmK14kDsfc5USWoev5pH9PBJxlTx4mXNjpRNFA3iDdVZtkkXAEDJz32rJYkJQRv2C82PTCPzeG7zujbxx37KDimdO+8qDhEf38cQHAjUuubJgCPFAbXmqGAFaewa+CneiM0JPvV9EQvq8CzPl5U3N8k5uesTxZZzw2+WYE3+HbZV7l0qaq2hPgz0CkzysiuVlVeOvNJGEqnwqf1rhvwrmpktW2nphvlP+0AgK9JEwtIcW2/XtI+DN4aUYAIRkAqw+TFTc2Ba2udfJLsJ3boBqPVh5uPGYSPaULscx9vu3DSZmxYBpExGj/w+FzD6IGgeA2DeEaO5i/CG8Umj/W/2KwTjbTk2fXO4kRxGk4fUjfBNEe5+JwHl3MhZCf2Kxap9MNO5qa0dYFG+bhNbmD2dFNhR6JxKT4AKLK0m9rK5PbWgLCY5tdRPi88YljRAXGOS6a2HNlFJIbS5cQBENlTcBAKGnjssDKUSdd8GPZhmn7AXGoj6P3i8/55Jc2+q2BYmb4Sxnx6kUG98Tp4C6PDl8t5dSJ5SsC6OZpzLj/59owLPhYCcgXrYDmq1PN/9gxHk2AWBqoaA2nAKY0CC20oVTRnMIvhYgWxxdxjzD6D4Y4J8Ssml2SasKHzH9qGLkKbD+D1vKXZIaHwvCRUPe45+GKrQnReHfmmHXyC5GJIwRLoMnehF2Un3p2Z2uK0j36kI0rtMLcJ4b1T+1AfjOaeJoO2cWnEloMW5Qagt2EdjDsndZGc6sZCmBaO26WBOnA6XGASnKQNuJr8VWT/tpdZSXHzPMe2DX3ZoKTc+oIAD4XJ4Qq/7otnI/z2RO1/LY5vveajdOKAS47qkCSFY8Cf/eEd14jFG3nOF0s5E9Uc+qwl+GB7IxYWHt7XbtH9ib6hqJntKm8h1Dag+T/ivG4ByGQGAMFqhMX0Fr5t+k5ZrSnYO/owIai9NL2p8UFYuX63luBM7R9gjiRLNY2TsWVz8XsXcNhXA9O/1HNN9WMYET7lPlAJXaZ2NQzCdG2v69KZmIzi/xNtuoOMcxypI8CFIwITbwwvR34cJycADnQD0y3spYKjxpx9EWJvaZH1adid2QZTzbyrLNBQ59hYWojJVoNED202c6Vr0UfDNqKv6pOqy1F1u/OAfHrospNeVRUJhoIwIoGWVF2/fda21wasjtwhLAOQ+udyB/b1X+k/K4l2Km0rPvRSX01cCGxXGgO3/SG78GMDHEdqh153D1XHextqHm/U6rfwA+0V+zjXqh8T6+ynwtx4DI0SEpNqvbTx1R2X+L2aJAYC7yDjv8VkWqOVCCcbeMmzpoITbEmCSTc63K3qd+DBRYHhSaa8XOEVzLA== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4244d988-f019-4553-dfc5-08da3cb3985e X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:48.1388 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PKUjpeyq9QDn5OaLDAxkgXlfbe6ELdRX+BwpF3ukYUYmw9KeWc5WLRzKqof407XoM1TnBW8HQruwcfZ2GDCtSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB6599 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 From: Peng Fan Some SPL definitions could be generalized, so use imx8m.h for iMX8MN. Tested-by: Tim Harvey #imx8mn-venice-* Tested-by: Ariel D'Alessandro #i.MX8MN BSH SMM S2 PRO board Signed-off-by: Peng Fan --- include/configs/imx8m.h | 10 ++++++++++ include/configs/imx8mn_bsh_smm_s2_common.h | 17 +---------------- include/configs/imx8mn_evk.h | 20 +------------------- include/configs/imx8mn_var_som.h | 15 +-------------- include/configs/imx8mn_venice.h | 18 +----------------- 5 files changed, 14 insertions(+), 66 deletions(-) diff --git a/include/configs/imx8m.h b/include/configs/imx8m.h index cb8ce5689ac..354a9b9fd0d 100644 --- a/include/configs/imx8m.h +++ b/include/configs/imx8m.h @@ -16,6 +16,8 @@ (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) #ifdef CONFIG_SPL_BUILD + +#ifdef CONFIG_IMX8MM #define CONFIG_SPL_STACK 0x920000 #define CONFIG_SPL_BSS_START_ADDR 0x910000 #define CONFIG_SPL_BSS_MAX_SIZE SZ_8K @@ -25,5 +27,13 @@ /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x930000 +#elif defined(CONFIG_IMX8MN) +#define CONFIG_SPL_STACK 0x980000 +#define CONFIG_SPL_BSS_START_ADDR 0x950000 +#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K +#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 +#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K + +#endif #endif #endif diff --git a/include/configs/imx8mn_bsh_smm_s2_common.h b/include/configs/imx8mn_bsh_smm_s2_common.h index 57be38d9433..eb210dc597b 100644 --- a/include/configs/imx8mn_bsh_smm_s2_common.h +++ b/include/configs/imx8mn_bsh_smm_s2_common.h @@ -6,25 +6,10 @@ #ifndef __IMX8MN_BSH_SMM_S2_COMMON_H #define __IMX8MN_BSH_SMM_S2_COMMON_H -#include -#include -#include +#include #define CONFIG_SYS_BOOTM_LEN (32 * SZ_1M) -#define CONFIG_SPL_MAX_SIZE (148 * SZ_1K) -#define CONFIG_SYS_MONITOR_LEN SZ_512K -#define CONFIG_SYS_UBOOT_BASE \ - (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) - -#define CONFIG_SPL_STACK 0x980000 -#define CONFIG_SPL_BSS_START_ADDR 0x950000 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K - - - #define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index 0b2eefa6368..902e0f8434f 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -6,28 +6,10 @@ #ifndef __IMX8MN_EVK_H #define __IMX8MN_EVK_H -#include -#include -#include +#include #define CONFIG_SYS_BOOTM_LEN (32 * SZ_1M) -#define CONFIG_SPL_MAX_SIZE (148 * 1024) -#define CONFIG_SYS_MONITOR_LEN SZ_512K -#define CONFIG_SYS_UBOOT_BASE \ - (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) - -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_STACK 0x980000 -#define CONFIG_SPL_BSS_START_ADDR 0x950000 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K /* 8 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ - -/* For RAW image gives a error info not panic */ - -#endif - #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ diff --git a/include/configs/imx8mn_var_som.h b/include/configs/imx8mn_var_som.h index 6ce60b0d704..fc9c4ca4530 100644 --- a/include/configs/imx8mn_var_som.h +++ b/include/configs/imx8mn_var_som.h @@ -6,23 +6,10 @@ #ifndef __IMX8MN_VAR_SOM_H #define __IMX8MN_VAR_SOM_H -#include -#include -#include +#include #define CONFIG_SYS_BOOTM_LEN (32 * SZ_1M) -#define CONFIG_SPL_MAX_SIZE (148 * SZ_1K) -#define CONFIG_SYS_MONITOR_LEN SZ_512K -#define CONFIG_SYS_UBOOT_BASE \ - (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) - -#define CONFIG_SPL_STACK 0x980000 -#define CONFIG_SPL_BSS_START_ADDR 0x950000 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K - #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h index 160ba9648db..d122a5a5a79 100644 --- a/include/configs/imx8mn_venice.h +++ b/include/configs/imx8mn_venice.h @@ -6,23 +6,7 @@ #ifndef __IMX8MM_VENICE_H #define __IMX8MM_VENICE_H -#include -#include - -#define CONFIG_SPL_MAX_SIZE (148 * 1024) -#define CONFIG_SYS_MONITOR_LEN SZ_512K -#define CONFIG_SYS_UBOOT_BASE \ - (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) - -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_STACK 0x980000 -#define CONFIG_SPL_BSS_START_ADDR 0x950000 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K /* 8 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ - -/* For RAW image gives a error info not panic */ -#endif +#include #define MEM_LAYOUT_ENV_SETTINGS \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ From patchwork Mon May 23 12:40:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634544 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=AHeyX8sP; 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 4L6GC05ycsz9sG0 for ; Mon, 23 May 2022 22:01:32 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8516C842B8; Mon, 23 May 2022 14:00:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="AHeyX8sP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2F2B583FEC; Mon, 23 May 2022 13:59:12 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0604.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::604]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 44EEF83FC8 for ; Mon, 23 May 2022 13:58:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UcNb5Vyy0KAk4BPi7L+H1LjUdOff3AWhHfxwtk6WkAfjhSpqRt48Iz2oTxY/UPeGhHd0GaG70LMH9uCGGgmlrCsFmoZNiZB4XI5rjj/2fHB5+naC/Ea8W7vsqf3u7Wdl95Lpy37WCWJyQD2E1QsQ23wrcNyEyTQMGF/pZzDrsAJr7qAoZTsb0C7GDSL2oNUt7rkWwWzjO/GYIa/wV/R2n9V2wtcnQL3uWJbyUd26NRNRRsN4qYTIXcZ2BtinzobkJzHLkdSeiASzQ6OD5uxRI8QEiQ9YSl8kzyl8O09+p6lMH7AdO58XMlrpIjW/J2CqG3ONi6npE+W93C2uJCkIPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LLTS81UeRYQLeePUovl3WnnggmPQPrX9uzD4fHFYrEA=; b=BtyMq0Cx8HDnSbnR6yJ/NtF8OL3bGiVLBnLowq5EiGGQa9c5/vcMyh+wzEGi89R4HfgW0gYgHzv13rVIujQdwoC+se82fR1bmTJSJPejNyaq+Pm7vwITcJQ969XbPXWzanrG38nSU3qqF79gvtyOl2ZAV0T9tLrT4cqmnCVBVCVJhTSOnBSUQOHV5HmAfmLvBVvcYIpqRRj+Fq+rOaP087OUsqSoCDxAdMpMS3YrNVWnfbwRvgRyozj6EFHJJsJiYPUOwlcuFrZFBlC5/+TSEKM/Ltt1dBNb+hamoxef8vitR4E8Q5209b2wKWJT9vfMVybsassN72hhEv5X7NDOsg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LLTS81UeRYQLeePUovl3WnnggmPQPrX9uzD4fHFYrEA=; b=AHeyX8sPS+WNv7NYOdr9HT7oj+dJKgFvxUTsZtFB228bXQT63r+AwfhgAhztbYU+z+EoI2BAkA6QqzRDUnaBwcBURJ9LqpzOhFOqZKCmPonI+b+QNo/STM+M/FlFx3qGl+78Cqk/cUs47TblS2HA4AmYAUsP3u/angRla1efpwc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM6PR04MB6599.eurprd04.prod.outlook.com (2603:10a6:20b:fd::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.21; Mon, 23 May 2022 11:58:51 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:51 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Peng Fan , Tim Harvey , Teresa Remmet , Marcel Ziswiler Cc: u-boot@lists.denx.de Subject: [PATCH 12/22] configs: imx8m: use common imx8m.h for i.MX8MP Date: Mon, 23 May 2022 20:40:24 +0800 Message-Id: <20220523124034.12813-13-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7717422e-140a-4749-1f27-08da3cb39a4f X-MS-TrafficTypeDiagnostic: AM6PR04MB6599:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AmBWdXwyuWJxQv/jDpyI1UVs8F+ZUK57Lz2P4gaYZaMZW3zZFF5XN5PphjkX6x2hR3bvCWhBbXfoMqrzcfr7gl4HNPf/rPZxkOrlIJSBpMSMvT9+aSyUp62UsCP7OzBbo64sGsfBCkvdKFwaERtMEPLi8ne/xysBtvNf7osu/V4HyfMQhc2dLc4AkU2L4LXD4feNOKXEr5mbUUo6Z85hMAoD38eWGH8gQBJVQdv4OPseUiLvJUOJfWvIEdQYpOWL7ORHc3fEfG+7vho0+4amepgR2Ei8IQTBod4zm8zC65TpJWF7BnWSy8KW5mVdNSy+xxBvBbhNl3Q2c9e0JOmlghVBCciUGxMgiiYY8ZlsYaLi51SZ1OBu8rI5vUoIAlgcMpgjq6w8RiCq9fJayGiECJfetaJCZmt61ARNuC9ruR1rMq5c31UrthsLH0sL8HoVul2tPsU1PJJ6onoVTek0l3d5TZBuhevBgde3k9vDbpMJ2XByO0HSx0HmWDXh9P2fopVSmBBE85o4kuG0kHAxIQfl58pFbPuwHu2GlKm9SC+0ALBCC7VXCq1VCLoXQpGrAhSQ4eoLwHubdN+turRpFdmE/uj4nlP7TzJan87cpm6ri+h2xquBXcSO7JyIHEJJKXTQx7WmA22cuBs3E+xG6+pgbXcsC6Evr6nlK/OXuezvKftA6VgmdSLi8hN2ZfN2qJIUVXGdm5Jp4oZJqWOS259zkKERz4oKJx3HGMJ2d5E= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(8676002)(86362001)(6486002)(6666004)(6512007)(316002)(26005)(52116002)(66476007)(66556008)(66946007)(6506007)(2906002)(508600001)(5660300002)(4326008)(38100700002)(38350700002)(110136005)(1076003)(2616005)(83380400001)(186003)(8936002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FrKfgzEKJ/5K8d/KGIwkmOhmBB1SJEAFFBiipH2ilIRfZ0tET6K/9sLqUSPh3p+7TaJiiZCNEaZtG+TFy5DNmGBP2wKHEN4ZT3v6bkr5f+EOp0dapkV/rk0m6cqCTPUJZHsTaxi0qL5C+wh2uG32w4qx2J86rALi5km8kFVO9SahBkKTSdAz/ZRly/+A+Ve939qW8q1z4P3Ktpai+Q/qFRKTIWI8Mia+HWc6xK0KTFPeU+EbqcJYeEh9kGpjDRt7mZP0mGNlbeenXQBE7zSnczdQjh6xQJNnruv0oc0mUD2TwQa4aLshncFBu6IkPABM/MKaU9bkK2yBAFhOSna99YF+2OS8+U2ynKIWqUUBw69Js3TIizEJb3PTNzwu6f2wexYf0wav6gs0kDdMipJaLL5ak7+3HEuvAIJoLMOLoKDJ7EVGEdZk8Eq5tVcvnImRSvYcrq6Dk2IaCywcg0hx2kZNbF3ks2noaHehBR3k+OQYiXFOpGU9NoL0yF/qpmkAA0vCi2mcpzxTGui9MpshEhE6hxBhv/Kv7C7Uet/ErUzT0jk9jYAVhx1D5mV9GE5xgNFhb2JzCdvtbS9aHkM4yb8GeoLLHbPo/dpc6dbAEh4GWgE1mv6nF2V4jc+cZgE3VeyjqiyjZUAYMyeMs7XDRv9fm5EjgIezrpiDyhhl7udfdqjE72W7INukHDXMVdkJoiReTvXpKmuOKYVAjwPMFoNRnSMFG4GmRTMvTIc85YTwzETOZinUgLjc03H1NJZ5FxPm8SpMAF/PYHgKzV2VKGE8OwGymB1SNFB2J1ogWP76AB5O8A8OPTj+wBHJQIpKqTJHbkEbA/3gRnLOPKTu4w7OwWP2S0oE3qcPe1A+W1A95+YEGntURwMHd4HR1L2AJ7kT5hrfqymjuMO/HnUOg7OlgsRqHLy2JidAXYXL4nb76tHOzjUV8OtFoOnbz1j/kCYSCD57TYoMfyp3qFJqeUXz3MaG8Yi/Sg0usllu27O9cSgFPpvzJhkpD6cglu6k+iIbvc/T/PhL/C2UWi2sVByEAe5gQQOUi+Abs+qeOq1cMxcWFqBmjDIiqsVrXJZfj7ox+F+Ul/utvdryFTK2wBL6Ce+kwlZGB9JSMMYxW3SoTwsg6qIuNx5jepnMFz2KLpAsR6VS+d/DeYFOqnaunsj5SrZ1xv9fDF2xKe447YfrOgcI3Kj8KK5hOyrjxmXwNGnrRYolWngyoQD+N5FV13OaZI0bHx7F7AoTqsoJTpQGtJiGhUthunIdqTzGGGWaolodJseaVFA1tEmUkTexOj14AyZhFHr7ZuE9jTtQvzczt/L+Itc/MbkjOKR5fxeG2o5VcndjYLEugYKM17s59zgPHFtgy8AHqJCi6NJes2VTm2qNbHV3KeDVvbw4CdHK9hUTigaQFvH75p3AMFzu57NvzCrYKdJ9A/UKZqN+D6IhgLxTnvQIWLH49QGI18eJ8x21nU+uiTSicvutSnlqTOKUWvbLmlwYLAGvFlAHLj89tmV4r4nVecWnhNwnuKT0RBjG5qnt5PL7h5kZVYkpBygFyzRk53MCae1jrQzUxZSq2Z3icv+pmRgy3LmRgKCt1t1cKUfU+xxQPYIj8dsIzY2I6SyAWNAABDj172+DC2aETy6qGS/jZKtiaWPl7StMd9THh3qc56MfzJiGLpcMJ32UXHOnPmixOVMMugzjwEsOTf9Vq/RxzMq9++S0Nv9iBY7cDizXBeOPslrfrpbjxg== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7717422e-140a-4749-1f27-08da3cb39a4f X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:51.4066 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Z1Wi2g2wS5wtawRVaunNgNadwZIc0JbbjSey77CDwpQWN1GV38U1duNujgSovg62+FR3G2M2DR21fOPILSu5qQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB6599 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 From: Peng Fan Some SPL definitions could be generalized, so use imx8m.h for iMX8MP. Tested-by: Tim Harvey #imx8mp-venice-* Signed-off-by: Peng Fan --- include/configs/imx8m.h | 8 ++++++++ include/configs/imx8mp_evk.h | 17 +---------------- include/configs/imx8mp_rsb3720.h | 16 +--------------- include/configs/imx8mp_venice.h | 18 +----------------- include/configs/phycore_imx8mp.h | 16 +--------------- include/configs/verdin-imx8mp.h | 16 +--------------- 6 files changed, 13 insertions(+), 78 deletions(-) diff --git a/include/configs/imx8m.h b/include/configs/imx8m.h index 354a9b9fd0d..7894a1c1068 100644 --- a/include/configs/imx8m.h +++ b/include/configs/imx8m.h @@ -34,6 +34,14 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x42200000 #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K +#elif defined(CONFIG_IMX8MP) +/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ +#define CONFIG_SPL_STACK 0x960000 +#define CONFIG_SPL_BSS_START_ADDR 0x0098FC00 +#define CONFIG_SPL_BSS_MAX_SIZE 0x400 +#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 +#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K + #endif #endif #endif diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h index 4aac7c81d2e..b54b88a8f67 100644 --- a/include/configs/imx8mp_evk.h +++ b/include/configs/imx8mp_evk.h @@ -6,27 +6,12 @@ #ifndef __IMX8MP_EVK_H #define __IMX8MP_EVK_H -#include -#include -#include +#include #define CONFIG_SYS_BOOTM_LEN (32 * SZ_1M) -#define CONFIG_SPL_MAX_SIZE (152 * 1024) -#define CONFIG_SYS_MONITOR_LEN (512 * 1024) -#define CONFIG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) - #ifdef CONFIG_SPL_BUILD -/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SPL_STACK 0x960000 -#define CONFIG_SPL_BSS_START_ADDR 0x0098FC00 -#define CONFIG_SPL_BSS_MAX_SIZE 0x400 /* 1 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ - - #define CONFIG_POWER_PCA9450 - #endif #if defined(CONFIG_CMD_NET) diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index 7dcc2e16c71..b498aa5be2b 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -7,17 +7,11 @@ #ifndef __IMX8MP_RSB3720_H #define __IMX8MP_RSB3720_H -#include -#include -#include +#include #include #define CONFIG_SYS_BOOTM_LEN (32 * SZ_1M) -#define CONFIG_SPL_MAX_SIZE (152 * 1024) -#define CONFIG_SYS_MONITOR_LEN (512 * 1024) -#define CONFIG_SYS_UBOOT_BASE (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) - /* GUIDs for capsule updatable firmware images */ #define IMX8MP_RSB3720A1_4G_FIT_IMAGE_GUID \ EFI_GUID(0xb1251e89, 0x384a, 0x4635, 0xa8, 0x06, \ @@ -28,18 +22,10 @@ 0x5f, 0xd3, 0x6b, 0x9b, 0xe5, 0xb9) #ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_STACK 0x960000 -#define CONFIG_SPL_BSS_START_ADDR 0x0098FC00 -#define CONFIG_SPL_BSS_MAX_SIZE 0x400 /* 1 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ - #define CONFIG_MALLOC_F_ADDR 0x184000 /* malloc f used before \ * GD_FLG_FULL_MALLOC_INIT \ * set \ */ - - #if defined(CONFIG_NAND_BOOT) #define CONFIG_SPL_NAND_MXS #endif diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h index 17400cffc63..fb37f5d399c 100644 --- a/include/configs/imx8mp_venice.h +++ b/include/configs/imx8mp_venice.h @@ -6,23 +6,7 @@ #ifndef __IMX8MP_VENICE_H #define __IMX8MP_VENICE_H -#include -#include - -#define CONFIG_SPL_MAX_SIZE (152 * 1024) -#define CONFIG_SYS_MONITOR_LEN SZ_512K -#define CONFIG_SYS_UBOOT_BASE \ - (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) - -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_STACK 0x960000 -#define CONFIG_SPL_BSS_START_ADDR 0x0098FC00 -#define CONFIG_SPL_BSS_MAX_SIZE 0x400 /* 1 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K /* 512 KB */ - -/* For RAW image gives a error info not panic */ -#endif +#include #define MEM_LAYOUT_ENV_SETTINGS \ "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h index 95d70bb92d1..eaa91f66bfd 100644 --- a/include/configs/phycore_imx8mp.h +++ b/include/configs/phycore_imx8mp.h @@ -7,26 +7,12 @@ #ifndef __PHYCORE_IMX8MP_H #define __PHYCORE_IMX8MP_H -#include -#include +#include #define CONFIG_SYS_BOOTM_LEN SZ_64M -#define CONFIG_SPL_MAX_SIZE (152 * SZ_1K) -#define CONFIG_SYS_MONITOR_LEN SZ_512K -#define CONFIG_SYS_UBOOT_BASE \ - (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) - #ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_STACK 0x960000 -#define CONFIG_SPL_BSS_START_ADDR 0x98FC00 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_1K -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K - - #define CONFIG_POWER_PCA9450 - #endif #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/verdin-imx8mp.h b/include/configs/verdin-imx8mp.h index 09eac5288ce..23bed27e176 100644 --- a/include/configs/verdin-imx8mp.h +++ b/include/configs/verdin-imx8mp.h @@ -6,25 +6,11 @@ #ifndef __VERDIN_IMX8MP_H #define __VERDIN_IMX8MP_H -#include -#include - -#define CONFIG_SPL_MAX_SIZE (152 * 1024) -#define CONFIG_SYS_MONITOR_LEN SZ_512K -#define CONFIG_SYS_UBOOT_BASE \ - (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) +#include #ifdef CONFIG_SPL_BUILD -/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SPL_STACK 0x960000 -#define CONFIG_SPL_BSS_START_ADDR 0x0098fc00 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_1K -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K - /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_MALLOC_F_ADDR 0x184000 -/* For RAW image gives a error info not panic */ #define CONFIG_POWER_PCA9450 From patchwork Mon May 23 12:40:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634542 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=SqT869TG; 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 4L6GBR48HBz9sG0 for ; Mon, 23 May 2022 22:01:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 64DED84197; Mon, 23 May 2022 13:59:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="SqT869TG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 125BA84271; Mon, 23 May 2022 13:59:11 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0602.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::602]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BC06A840B6 for ; Mon, 23 May 2022 13:58:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QW6FptaVKD8RGXx0/PjFYk2cGi7EophYl/xGT+MvyNzLYHOXuWiFfagpbUNJE1Cc7BaFk/Kv4NQggh2b7IAh/5pxg8tUG5+EgP8igR1BOZwbga2KSHbHuhf0c6fSeN0WTS33a4wT9Lzm937PhTiqlKKhRzQw5sAiIZYI2qHkzTJNiBsetFDvDCKIRwMW2WDhY7w4rQqnaRiJnVaioZFWRRpkyO20rTODIyfv8i6GB2PuWsh6njswp3DdGm9Gy0vCPV12x3RGDOOcdDxT7X7xxS8E88AJSOkbrLMKfIivVb00enFAUjbj1jayhvqrvQxPEs9fhdcR3iubUgwHdflxEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=B7CK7r+LU20pc3tKaAeN5xvGATnh5FRJb28OnwlhIQo=; b=eQWbF7YjmcbedqQaSn0M+XQACum0Rbn5AAPzU7V+n4i/o3hBTQB+UWinZd1QHecKauYCv7dq4lRd2K9+nJR6m2eEKILsqOaJTTINrUkVs9/d2MIxZBltDEfkJDcRbNQ0bewvWmRnFIgKpdRVk9TZ/mzbWIP1CJjboyn7WpyYlTtC5pC1R85C1I6C5q9C7MlXyGvB+LqysFqg3zTi+T1NlQhYZoaoz5ZfGV5hLtuBa7Y7eykhHBPp9b0cfIbtMq8b6jCd5MYBFX6ItOPyjaz/Abf2zT0Rm2Hr+ZTHZhBeAfjnqNh+CxE9EJZTAkNxUN+9rLWFZ+KU07muwiqUSA2fmA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B7CK7r+LU20pc3tKaAeN5xvGATnh5FRJb28OnwlhIQo=; b=SqT869TGrtraNnZW6tz45OPA4XIYKH3jvLE0nVtQU3f4rmS8kaVnb6wqCFZmNwaD5BLQEGMWl9kqeZRRD6iNmhbe3d7Je8rrZd4IIkp+DKMiXMcFJG0BPmQCs+mpW+Vfw99svGNEHNKk7gpz7rvCzDjJpxzR06PaC7D7c2I+0Ow= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM0PR04MB6417.eurprd04.prod.outlook.com (2603:10a6:208:174::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:58:55 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:55 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Ilko Iliev , Peng Fan , Marco Franchi , Alifer Moraes , Heiko Thiery , Marek Vasut Cc: u-boot@lists.denx.de Subject: [PATCH 13/22] configs: imx8m: use common imx8m.h for i.MX8MQ Date: Mon, 23 May 2022 20:40:25 +0800 Message-Id: <20220523124034.12813-14-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 28bcc6e7-003b-42fb-eb41-08da3cb39c8d X-MS-TrafficTypeDiagnostic: AM0PR04MB6417:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Xeaj/PosifCvzYiS80hpjtR0dkGPhX3JFnFyjs0jaBgy2FGP1BSlBcmHIVkXKDLFdFgK39UqM706iyOha22KEG1M1hEBE1v9vxapI6FgVIiOr0rrHhqhGWoWHzaO6tyoWsgBu75XhftuG9oVK9IPiq6nHkD+Zooj00yeqRgetTyfvza8U9R6cH021ToFG1qU8JXEzBW/j45cx+tzdTZbVf+usLfzE5cKAhOtWBSeE/kv/8rLibwVycpQ14SeMkxj0NI+Hwry3qkak/e8I2vX9q6AreYBDQYRlXolStHLsXsQ2M4fqzfTFR0qiPqb8LHJDeNCjugMRMkBjPfgBltnBJYRCgLoROHxx05BjORL1BNx+VzcFAcx2S1yAPUA7mtKnc9BlJO+46gZctkPLYyNwtfTh1omccGSHqkSSYC/PpQKktFfMBQ6QzXhxnNMO/aMmZRBHktYv5wDOXnmot2w6dTci3MV+rf8FmSLEen8dBicMgTHGTFd6VJTy4VbN7Au/f/kCsUBMwKNWRE8oZQzdlJRnTbcRMKUlQ0ZAw1jVMSHyHZz6tpPg67Lb+KvhKeyNt/aZEW7DEGoqskBZUyFY2vC2jF0OL3U1vqbbhk2rulfj9j4qlGHfSk5CoSbTG/oDDdYo8/Zhg27GI9wO62xqLKqJa978ZUKikI22t1QZ+vVBucNyxduDluvtyJZWtHuAbJQrPLgJDX03Luv45ftc2gHeyQARZzpgvveZ20Jh4E= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(6512007)(66476007)(66946007)(26005)(6506007)(1076003)(186003)(4326008)(8676002)(66556008)(110136005)(38350700002)(38100700002)(8936002)(2616005)(83380400001)(52116002)(5660300002)(86362001)(2906002)(508600001)(6486002)(6666004)(316002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +5lW7+6QI/iFrg2fwjQqTiremLvmBGmQ2ncxuI88jXU4MTBMsBaigoIZ9VUrZabrLYkP22v+bVCnZ15lunP5pCNzp72nuGJMAlgkOJh2piX5KqbusxsoCA15DbDCxURzuOQcvFoENYMdURQu1FsxbtI2zVL5vPXVlMGC9ndw02Fb18I0ATIkasI39llYIQwXKK2oBOvfBu2SclltWBrcOXiykms8c2GCslaR+j9YwCPYXJ2allJLR6woOecLHm3AnJBRGJUWoq+CrBPv+7nXmLvzQsKn8Tk1rxarkhFva3zPd0vi8QY5fLE+NCvJERlGcBuPeVYhomN/cplkQUG6g2PiSUfX05tBKYYM83/HEqAQ89aubAiNICHwVkXJ3UZ9hETpLm9Sqy7H2cyxQ8n/jt+QgTU0ypD2jfeE8iw3QJ16zCxQ4APwrwtygONZx+pQHsNNBSNRT/ZuLepg9VD/DATAo553LxDcCTtPFTLSoSHKr2OvO/BUrPXwmHqedhHPVXX9muxraMMRsRzRSCyD/7fRTo6sNCy6q8rPuwMFlMX+uzWz+PFOGjNIwiPagDpw0HEg12YANz5MQzQaPbXpR0mMU2z6gG6LhnIniNKM5/w+pySursdYh5FCJp12v3LCAmneHshf44iofGNVdr3/PwLYJP2jfPYvG1R2hMtvHO+8HZoUVZzInHsJA/MEo0cpH6yHysIsqVJFOpmSELYJIC1rUb5Gqv8HpL04d4wHpB6pMcPFLWVPC1SE/ObwHJr+MvvVcCmER95owohHkhD3tyovJAanf6MKL3eqcsi89PFw7c0Hs/wz2QKGrLRIqv/FnWNkS9eeXey9pevB1PVrT4BWTmn+/VQQc5yijptHs3pTyZ6xkl8x35WAF2IS8mcfpkor9Q5RuQ70tzsSc3L57gL60K8v3sTAU7+yoC0i2/fvYyAEZkkwHeyIipxXN5mxys/B7KAH7ls8y1TmZz3q297BAQiQ3a6KcwaffOjX+OdhvFr4X43nSRDqfTyFDGr4fMYr6E0xLlX/BYIzU4+U+/irFTybbmL9wEA0c0Y5U+h8dYhauIJDwODxzl63H20ZYVaqajKe6dESsqh/Jq5mNx34LymOGNXHdwEqnC6bes2z98xui+nX6aCmjOvqv9RJsMOuPlB334GL3YNjjR/oavQ10BwyZEFhWkJD/ydTgY46MjAxWkq9kKaYQIuwBTLcCfuB0zzdsdnOd+Z4yUh1CRA2AcI434/Jr9C4gWs4e4mg2PAytgZt3tMI4cmE1sKTBQi6gxVzGe767xUjzHsk9tAB28GUx7C6hwi6EFeB4EtdD523KN0EryiafWo015U/pmobcVqmey0iMMoG+jPUVTWsdTll13RYGt/EnGi3e4y3QkJ7GJwtELACU5DrelZkY8J97HPAlgDAN0C4H0Y+W9E1UAPJ57RMH9UJPu7jRrnTkxr4Yqo1X7XoCZX+gr+thY43HtyxGAg0nKzgEhVG1Bd6gXPNUi6rFp4Vghe6lLkTouAzH94klgdtxSL6/B6O92cyoeYlu4mhwlwZTncGlfImTnN8GO7k0vQDMuCo9+DtYoHQQX3O4eri07/Zk0Pxz0H4MxSeUxU8SZRST3TlqvNDM9So9aX9JXspOn7Lv5QDLqLxf4mxKyWqHYV/q0qofMPyKu2ku8HjgDkOWA98od3ez+grW/1nKEhCvZe8qn3dXzgOjl5cut82VgEoiH60o5WAGEMeR9TvaU+uKTheMw== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28bcc6e7-003b-42fb-eb41-08da3cb39c8d X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:55.1267 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pWdOsJVbdamZscsQCcdWAsFyNDDB1Cm9wKRieV9ORtfItx1KkbrqK3F3H9mEmL6pJWsoWe1+k1hNZTBk+jzDJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6417 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 From: Peng Fan Some SPL definitions could be gerneralized, so use imx8m.h for iMX8MQ. Signed-off-by: Peng Fan --- include/configs/imx8m.h | 10 ++++++++++ include/configs/imx8mq_cm.h | 24 +----------------------- include/configs/imx8mq_evk.h | 19 +------------------ include/configs/imx8mq_phanbell.h | 19 ++----------------- include/configs/kontron_pitx_imx8m.h | 19 +------------------ include/configs/pico-imx8mq.h | 20 +------------------- 6 files changed, 16 insertions(+), 95 deletions(-) diff --git a/include/configs/imx8m.h b/include/configs/imx8m.h index 7894a1c1068..e0a030cb67e 100644 --- a/include/configs/imx8m.h +++ b/include/configs/imx8m.h @@ -42,6 +42,16 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x42200000 #define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K +#elif defined(CONFIG_IMX8MQ) +/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ +#define CONFIG_SPL_STACK 0x187FF0 +#define CONFIG_SPL_BSS_START_ADDR 0x00180000 +#define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */ +#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 +#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 /* 512 KB */ +#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 +/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ +#define CONFIG_MALLOC_F_ADDR 0x182000 #endif #endif #endif diff --git a/include/configs/imx8mq_cm.h b/include/configs/imx8mq_cm.h index 7a9dd962ac2..f8518af83bd 100644 --- a/include/configs/imx8mq_cm.h +++ b/include/configs/imx8mq_cm.h @@ -6,32 +6,10 @@ #ifndef __IMX8M_CM_H #define __IMX8M_CM_H -#include -#include -#include +#include #define CONFIG_SYS_BOOTM_LEN (32 * SZ_1M) -#define CONFIG_SPL_MAX_SIZE (124 * 1024) -#define CONFIG_SYS_MONITOR_LEN (512 * 1024) - -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_STACK 0x187FF0 -#define CONFIG_SPL_BSS_START_ADDR 0x00180000 -#define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 /* 512 KB */ -#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 - -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 -/* For RAW image gives a error info not panic */ - -#endif - -/* ENET Config */ -/* ENET1 */ - #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index b7294ebef1e..b0c77630f0f 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -6,28 +6,11 @@ #ifndef __IMX8M_EVK_H #define __IMX8M_EVK_H -#include -#include -#include +#include #define CONFIG_SYS_BOOTM_LEN (64 * SZ_1M) -#define CONFIG_SPL_MAX_SIZE (124 * 1024) -#define CONFIG_SYS_MONITOR_LEN (512 * 1024) - #ifdef CONFIG_SPL_BUILD -/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SPL_STACK 0x187FF0 -#define CONFIG_SPL_BSS_START_ADDR 0x00180000 -#define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 /* 512 KB */ -#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 - -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 -/* For RAW image gives a error info not panic */ - #define CONFIG_POWER_PFUZE100 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 #endif diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index 93e531b66fd..f9c39aa82c7 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -6,25 +6,10 @@ #ifndef __IMX8M_PHANBELL_H #define __IMX8M_PHANBELL_H -#include -#include +#include +#undef CONFIG_SPL_MAX_SIZE #define CONFIG_SPL_MAX_SIZE (172 * 1024) -#define CONFIG_SYS_MONITOR_LEN (512 * 1024) - -#ifdef CONFIG_SPL_BUILD -/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SPL_STACK 0x187FF0 -#define CONFIG_SPL_BSS_START_ADDR 0x00180000 -#define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 /* 512 KB */ -#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 - -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 -/* For RAW image gives a error info not panic */ -#endif /* ENET Config */ /* ENET1 */ diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h index 9089b76d26e..2abaf07f1a6 100644 --- a/include/configs/kontron_pitx_imx8m.h +++ b/include/configs/kontron_pitx_imx8m.h @@ -3,33 +3,16 @@ #ifndef __KONTRON_PITX_IMX8M_H #define __KONTRON_PITX_IMX8M_H -#include -#include -#include +#include #define CONFIG_SYS_BOOTM_LEN (32 * SZ_1M) -#define CONFIG_SPL_MAX_SIZE (124 * SZ_1K) -#define CONFIG_SYS_MONITOR_LEN (512 * SZ_1K) - /* GUID for capsule updatable firmware image */ #define KONTRON_PITX_IMX8M_FIT_IMAGE_GUID \ EFI_GUID(0xc898e959, 0x5b1f, 0x4e6d, 0x88, 0xe0, \ 0x40, 0xd4, 0x5c, 0xca, 0x13, 0x99) #ifdef CONFIG_SPL_BUILD -#define CONFIG_SPL_STACK 0x187FF0 -#define CONFIG_SPL_BSS_START_ADDR 0x00180000 -#define CONFIG_SPL_BSS_MAX_SIZE SZ_8K -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE SZ_512K -#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 - -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 -/* For RAW image gives a error info not panic */ - - #define CONFIG_POWER_PFUZE100 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 #endif diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index de035160255..6460183f5ef 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -6,25 +6,7 @@ #ifndef __IMX8M_PICOPI_H #define __IMX8M_PICOPI_H -#include -#include - -#define CONFIG_SPL_MAX_SIZE (124 * 1024) -#define CONFIG_SYS_MONITOR_LEN (512 * 1024) - -#ifdef CONFIG_SPL_BUILD -/*#define CONFIG_ENABLE_DDR_TRAINING_DEBUG*/ -#define CONFIG_SPL_STACK 0x187FF0 -#define CONFIG_SPL_BSS_START_ADDR 0x00180000 -#define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */ -#define CONFIG_SYS_SPL_MALLOC_START 0x42200000 -#define CONFIG_SYS_SPL_MALLOC_SIZE 0x80000 /* 512 KB */ -#define CONFIG_SYS_SPL_PTE_RAM_BASE 0x41580000 - -/* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ -#define CONFIG_MALLOC_F_ADDR 0x182000 -/* For RAW image gives a error info not panic */ -#endif +#include /* ENET Config */ /* ENET1 */ From patchwork Mon May 23 12:40:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634545 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=TjQq8BKi; 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 4L6GCF5Rqgz9sG0 for ; Mon, 23 May 2022 22:01:45 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 74CA2842B3; Mon, 23 May 2022 14:00:45 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="TjQq8BKi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 60191842A5; Mon, 23 May 2022 13:59:18 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on062e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::62e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EE74E8425F for ; Mon, 23 May 2022 13:58:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CJm6dYQKdmHeaIoq8WBFWoM5d98znbWI+iEzh5L3NFfr9JtfQCXEL3aGTU67JRvXvhIXySE1evMFTdCFt8zIuB69AUlUi+VVHCJTkjPI4u1yFLGN/Ld2ZZMMcMWR2oQelBcHIoPCc+qFzrCXiy/ZSF5R3On5eXlppx7e6IoHkHJkVR5vMYgJbqApCxACnuvwcnFO8UISSMbniTtfXY3k4lQFvSaUZWhaT69VyXRBd99X2aBgIaAEw+Q5LmelzZa9otrvrh4nvyiLZMz1Jb9vPsfVAwedCIYEEOaURbDjAp8qhO0U7eC17F7LyqhhPQtrclIzMj6A8NbsTjKR1ajlfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fsammShJzFwivwoqzhvHlls6NTRfopq74IqwTcmvjz8=; b=dMLkw9jk2DcQZvY+eQTSaBVqTId22t5WALUOcPnlABbVJ5e3Wot7ttu3w85RpczY7gI91lWNKZM/rZJz0a7F4c/BD6hso1utn75RJchHpbSKFGWRVKM174tmYKnp+y6h92LTs1u8vcJhiaRUqOiB0ZqUC3Q0U0YvGlexXzEV6Dg/fcSgTIWti1W7Nmucyw2GrL0Q8a2COJ2X5me6x4RckQcRgwefTsUzaDcOOPmbJiiUVb6A3NZXPwaM39Hwr+v/HYBBcIfCbspLjf5Pm13C6HeUDgC+GUKBH2C5DyPTugDqlWS5hUYZKp597hKq1oMzhNipL7uJBGf0JM0v+s4+HQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fsammShJzFwivwoqzhvHlls6NTRfopq74IqwTcmvjz8=; b=TjQq8BKiaHUhGnR6U/it8z0zgMgXTd4LpQDgEAyOjOXyPtd7ogzJr6+lbcDy5ILpnzlcuDTDrDr23L2gqiViXINPUb3Pbfyt3IFK6q+JUMBmCG027unBLtUG1Y4ICKzYmBhUSz8cBdz61I9wY2m3uOgDdy1d79fuBLcvKshFyos= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM0PR04MB6417.eurprd04.prod.outlook.com (2603:10a6:208:174::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:58:58 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:58:58 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" , Adam Ford Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH 14/22] imx: imx8mm_beacon: enable pinctrl_wdog in SPL Date: Mon, 23 May 2022 20:40:26 +0800 Message-Id: <20220523124034.12813-15-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 53de8667-625a-4111-d13b-08da3cb39e3d X-MS-TrafficTypeDiagnostic: AM0PR04MB6417:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OvREayQD8tuq040Wq2Mj2QbK6tc6pZ0iujOfIfpy/0j9ZIokF4IS6JR06tuNGBVmsIMXq9Q3sHPkMC1cfSi7TJBf9hBYf5r/CXmnJHbaNREsfT1LoILouZioWM+dS3siKyCIlDvX/tYamRNaOLsEyYZti9bZ9bcwUJVi4t9PoJgw/SKrlxo5ZLKyAKRYB7SVQHKw4iDSnSaWStJWzOCtT2BJuI/nTAyHdUhaCzN5LRMv69tZjCyFNLOFvgyKXHsB1ptqWYi/8fmp5tWXRHA3/m9Vnz2JXN6O2+9VoTbYlY6Yuw8dwJTgWr8udw6ptBCnploVNAbJvOdRwEnxRvUWaDLyVtlzSU8tOORfjhe9B60BQVSexl0HV09GDH8bm3Tc7DjHObYaMkgJU0fwoRbl1QfthpqScg8V7LwgHliZLVw7QjqjkoAwE7iuIBSoj72a2NOKEa2c3T+u4rTnGwCATm4tNEq2M/vLBmQ0GUmwOo6zpPDNc7I59FjG1i/Aoo/6fvSR4OGZi8Nk0Od2DSBffD/xkV9SCn+C35GJNKrMM8z6O3V+TCYLG37g+QKzMzQqsPT561K1yS8hAT4DXL7+MZh94EjrxzcLbbQ7EIU0HXBy/86khD7Fgp5iq+CQoiBE9gY8s2MIUW9P0UYMQxCFnpPSI9FS5RCbJeG9/pjPXXd/GY9ARR+z823WXwB6Aels564NdjoQP1N1J/CnnQHIhQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(83380400001)(52116002)(5660300002)(86362001)(6486002)(316002)(6666004)(2906002)(508600001)(1076003)(26005)(6506007)(66946007)(6512007)(66476007)(2616005)(38350700002)(38100700002)(8936002)(66556008)(110136005)(186003)(4326008)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: u8ux0UyPMA/3bHwZ8b+I4v/SW7irBoVAsHr0Ju1XbeTsKpqwNWLWLdvQZEpYNRLhZC5R6jcrZm1RbEcTu6Bpfnub1IUZJzMl9OfNKSUmNs1uXaW41oySxOUPybm3crrQGvp6M3NhgyztCh7LzTEPsCv9k12sM7r/ijTP/AXtTwn3Muq8OmenRKoqQQjRaTnhwS73P6bbkUTJsjmdRx+B4Gi3hje48SAb3WuaMBgsNKhxN+LjTAT4CaPd6I80C6xN8cG0XYGzwuz7LDmtsCl8ThgvKS6br91akhAeahLZmfzYN+a6pvLh25vF6LS+Pt3VplDd8zbyRHBC17PrUmqK1Zze/ZM0VCqoOd0VYIRYa3TN+e8FJpIIx9t3F1xbPlHgmPdAJ5/WxIyPgvFehwoe+MmbDJJY52s7O1YDpVpr5cQCPmvaCLY9dgbLSaUOfo788P5dXxj2QOaUmLYeTwBLYKnkVJ6/0XNABkCc0OB80Mt5uxpyiaO/1HlgRgwkjQNDguMcb6Ynbxg1nIpLjF54NgBAa2dA61H2GJSWvb1iXC7HpwUbHA0kJYv4/B+2xZ5/06AjKS9ScJF5fvM4/foYVyVb7MFJaVxwigUrwJlVjYAopiQji0ssC/hnvSZvL1RyiEUSRmrnwO0HhVFiIV6glwCR5PMCbZ8n11/Pv+Bwd2lrbqxX3FSKNCI32uUHvGW+sBlGPRuQgeWKhPoL30f89BmSSn4AEyB53ALVKnpkakwjDHwZD3p6hDlW2KxYDN+u2Lafea15bfSJOygthxZn7P1N7g+Do1eJOpn7FNCUOFdSuPjWjQUBGJemMe9ATnNUDbFP4gBLAJ28/xnHBq11rn8nMU8dNO3xYXpiaEY5pxi2kFQNwHwl+cwYIx5kTzqJ2ZnzjVDwuvYsSa+ld6odIf7X8qrlTQg3sf7463eANdhgC/bAPPrA7OAfS7fwtJilCju6ex7zJdwzvRK6Knd1TYP8aLo+tCvagINSVjng6b61j9G5EVzPlsKvWnJMNbXSTQ3f8Sj/AmgdYHWpaw0Dm3G1LBLpemfAmjr1de7auTZI/HsYelUucmuFCs3iyJGIN8TnPLOYtQpkBghycikdFWJ/135ARoOgw2AIh2XJeH6RPd2b8+ju+pW/uJZa9Og6TYYZ4d0xyrSuvjQH8vzUbNZeVZlkUBV3ZbaK6uieg1QqX1Pprp9jQ47ehuxxhq1EcSFB2Q++EyqUZpKfsJf25Bvb4Ag+XuHhQqo6izYSWnkM4XyPM8322tCGQo3OHzpHsgfs/wbjCQoP3eaRiFOh/9rVlsen23KMvPLUH2Ux0UM+G8I2Ii+g4wKQ+/LlljVTAaF89pY1W+a7+ZgTlvBHEXNpqGPf6cN0cMovIzfjit1KVgzB9/je0uc4nJQsbxNOTXZUVQooj1ryFsxblvESVB8GSlwht22dSpSjIOc1RfxvLmmqySlUVMZ6FT6hfhFRwYwSH7+Lb1FDQFE07CnLYKNgZUl6oTHawIHCtCDFJnj/QDkyJBS2Hwy7JKbNjX8DyBpIZs1tWvx12RPF3WHdJYNFdTP7Fn5zsjB4HOKSSW86i8pPeiLDJKWzNfukbsD9WmPgX8/7ZDiXNcAzORwHZoDarg9IeHBPSYvoa69I3A9JH32q929joTomfmS1d/NeHrAiFf0oseb6W+Nkf59G1P09Hz1hWeJM7kmZ0S6HAwC8xRbQKTxfgQJi3gw2Vz3NB9vVA1oi3kyTTvYiaV+hSA== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53de8667-625a-4111-d13b-08da3cb39e3d X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:58:57.9885 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: G94I2SQrlJrZsAOGuCTyHPNx3/7wkerxgxsz3lkOWkJkjk8wXqUTMFlFdEKSSxrRn8cj2CIUBsW39NmH5PsAoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6417 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 From: Peng Fan Mark pinctrl_wdog as u-boot,dm-spl to clean up board code, The set_wdog_reset() function is not necessary as this is handled by the imx_watchdog.c driver due to the 'fsl,ext-reset-output' property being set. Signed-off-by: Peng Fan --- arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi | 4 ++++ board/beacon/imx8mm/spl.c | 19 ------------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi index e33e10ac129..c94b4ffa4c3 100644 --- a/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-beacon-kit-u-boot.dtsi @@ -73,6 +73,10 @@ u-boot,dm-spl; }; +&pinctrl_wdog { + u-boot,dm-spl; +}; + &uart2 { u-boot,dm-spl; }; diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c index f92b4c3ed0a..a93cc938784 100644 --- a/board/beacon/imx8mm/spl.c +++ b/board/beacon/imx8mm/spl.c @@ -59,23 +59,6 @@ int board_fit_config_name_match(const char *name) } #endif -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) - -static iomux_v3_cfg_t const wdog_pads[] = { - IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; - -int board_early_init_f(void) -{ - struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; - - imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); - - set_wdog_reset(wdog); - - return 0; -} - static int power_init_board(void) { struct udevice *dev; @@ -116,8 +99,6 @@ void board_init_f(ulong dummy) init_uart_clk(1); - board_early_init_f(); - timer_init(); /* Clear the BSS. */ From patchwork Mon May 23 12:40:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634546 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=Vkg2i9+C; 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 4L6GCW2GWZz9sG0 for ; Mon, 23 May 2022 22:01:59 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 41D4C84292; Mon, 23 May 2022 14:00:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="Vkg2i9+C"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A5CF684203; Mon, 23 May 2022 13:59:24 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0626.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::626]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 326D684269 for ; Mon, 23 May 2022 13:59:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hGxpKD/cuGyr1D+d8/RA5GWBSnux+aTkYWgM/EN80iqCZabVPCeusFlRvgqzcAsl/5967rBI2zeKqmIPl8x9fKg04Q6oeID0+uy7vsd8QcCMeIqSPssAXm+G2XxXo4R2pORs/boB/zRfH2dqfn1wrK/H0iwhtzR8w0g3nHgMCiiGOWPXw44ajmXJRwaQMyFc+EfzIzqzj0d1vrj+qIL4BRk2MXTJHAtcIefgUKDnrHph02wVxG1XYsyeO2UXSdICfkkrNTSFgsrtrMjNnYtLI8/ehyRWmkn2dMEQkEwt/Td0refDiRTDIyJiYvvrofbg8tzSWSLlDqTSI+g9VAYIWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tYLwH3jGxokL3MAnhMxLobkewScN98AafUNcPk1n/hg=; b=S55WoaLflgObFz6Km8vRaMKuDpBoIi1iaiEL6HS1ZOH9c+yhm5qIgGgC5Lj3RAmYvmPS9o9OhivsiEzwqDSaE9d+1vYJXyEo/vIG7MJmK9b90AzEeY8LxjY9IAWGF3hPBd2bzmlSMtCeeTasMvZh4NvTJpGoLOm08R3jZjO58VeIrMaibcP6p5lvzUguRd0rtlsZFoA+N9F7v75kWsCXUVVh+2SOj9MQPg+pfqQABocgJVHPs22EJorUvzp+kpCJ/hcDsbDSyqpPZBTgfbVVcLP1XHE3YaHVmZCLeDK0h9MHemE4SGthIuBdK3LvdzxG44bhayDW8ZrR1jv2cXPL3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tYLwH3jGxokL3MAnhMxLobkewScN98AafUNcPk1n/hg=; b=Vkg2i9+C90n5YMpqBLsqFYq0GNb2JKm1ucooeFNP5/jZn6631g+aQ+4VyULbT9Yl0ZJv2ERUvJHNkRoH0g9RYDtRiYEBoGCeWYa2qnwYmp/ZOgNKpXMdasA2AigDQ23iaNpyAZDrpK54lZJQcHVAkmMIeaM677hRlj2eYMbbQ+k= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM0PR04MB6417.eurprd04.prod.outlook.com (2603:10a6:208:174::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:59:00 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:59:00 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" , "Ying-Chun Liu (PaulLiu)" Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH 15/22] imx: imx8mm-cl-iot-gate: enable pinctrl_wdog in SPL Date: Mon, 23 May 2022 20:40:27 +0800 Message-Id: <20220523124034.12813-16-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38947c3a-b6e1-41eb-9759-08da3cb39ff1 X-MS-TrafficTypeDiagnostic: AM0PR04MB6417:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NCIjvdMgunjwqyFn9x1cT8VZSeyzsZ6uOASS6bv+ZolQcduxHjOcnlNWVg2XtHbAQoTKQ5melzhTMWJ+mt5q2YWVJVfG69BuDupwsOISIplwYd2ILnavmv12GMzcNaPs/jA2AxSY6NqzrsAMpmeLp53E0n3eRm1V+Npj4v2BpMu6/qd5KYfY637qyAymybkxzWzokocQOZrqDg0CbxF9DOyuHeo9FJMCi+bGjl/JfFRNH8cdWxJloW5NXI30X/YsNg8eXfKmp6W4pI1VctOZi1jqyd4FQf+H1i7b6D6ACmn0xsw0FIIIqqQQEKKeKClrZA5vNg6eylTVIDEB+aKePRIFRccqezDv7SRUhQjaZMmW+EdYBjbILYzKxmsr50GalvydkeFLH0boq0R2lRnQEbKQXGrKqUzfZqH2DUtrYpxhH0EshX8e+GdLa5dUjdzmEc75J278xwH9drinr1Qe2mUw46Nq69vRC23Fa8zyVPLAyXdjbt+Tsu4xOVi9eMFdQMwlLw4TFOukALTRxgMcHir107BxEPFWApTDAvogxU+/GGaohmHa/Amy+WDp79qp0/HH1uIyK5tGWv38efkMYXj6mRHHKO2k+A5qQg/0QE3XBs71AwxH3+NpF5faedPwEOA9bcRoznhm+4RzYFz85uu13JMyLl2Dm3kGPmNRnakY09uVmH8dxUaTgsOBS2QaqMq3c5eL/3bSY77HTOEaokzQVAPo67931KHQ99q232A= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(83380400001)(52116002)(5660300002)(86362001)(6486002)(316002)(6666004)(2906002)(508600001)(1076003)(26005)(6506007)(66946007)(6512007)(66476007)(2616005)(38350700002)(38100700002)(8936002)(66556008)(110136005)(186003)(4326008)(8676002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3z2SsO6vSvElg4wIgLm21Q+y3yNMKM7+/PHhI+l0e3V6tpHPFo9EsVCrg5MguV3XEFOkvW6VTTPbbGakekJnB/wPKhhIJnK/CwP2gmxryv6ZgSAXKJm0DA3e/2GmYS2pgG/9ta3iAa/ZErsLHXCtc1/E3Beb/hVjOgCkeytJeighHjg82VWzFUKCIQ170X0PlzuCYxotPR8qa5nxEeN0J3BxMUuK9r66M7WmE3i0zTm33Rz9/wpSe/9aoVYOhlN56I5MAk1rMt538zxBTcF1T+TDRb06bQmf+QVL/Fbp8YnH1VztrJAHLtihSHqFRX3Z0VC/3wQwZRS9NeZCrtKoQAV6F6rIsAA8xSB8OrSxfdG8tupYl4QmeQFp8yoPpQG04reLthmtyHlS8YaRyGw0Obm3rlL8c3RI5lWGyvTF9ebD51qjsXDO7oZ3JCMP+c6coo9iSPX/xOwzxO132FLGmV5MKUVqvi0haqLPbgA9UQjBNq1PY/92KIpL3yqU5h5sdd2IOjv/hUuqHTJMbZa/rFgj2+MJpk6S2aEpYBQes7KFl3xLDIZw8TEwzWpPHS+Z/2IajvipMeh8cmQcqUUYoq3AjCcVpyBNu3ryNYT6KSkaXznyBiRFWSsgFWKSHq3tLvX9Mvd/apPSIyc7fuFCItH55GpQ+AYsAlSsd2kluI24WkgM+CvdgH+ikYQ1lk8UD3BS8OjnN4jV16n9hvkd0OVeMzXTDGBMF5Q4hdpS8+s84FjdBFCJ9BZQGs2ozPKbvV23ZzbSoAKDfhPzXODoUbMgj71e3Ueb+dgAmRCQaD8ket+RJlfMDXDgx2wEjsaHQHyCYsxYhYlOwD8iMw/UtW5CCF4sh4EmlvcQsKCoCFcrz8DbBKDcEz+zNcduKEgmTXSGWOEvTumbeVrxaFEzJy8uyD7lisfjSNb+XKQuvYQCX85l0bo0QubSMAnDX3Czt+rXFj64NzNZd5/FTMYkrkz6qB+9k0AvVyYvwAZCYj6O/Ohyic5ad+vH0aeQ55byjnMk7jsi7KapDniVjwKgm6LJhJ1EVj+vcYc6orj8o5B0z1QVipK3DT7xqjgYrcwWO/Ughp66l97kOHzhytDlizf4WiRC9c5XDtEklWAB9QuZfEMiE7lDlaT6802UQNNbxgjquAC4WE+RFJH81BZzzQkG8bk8d28NTJ/7D1f7fSoRupTyQcUXCeWuLq9waJ9k6wHPO+Up7Gkla74NgBtdTgWQHuQpqx5tW8GlglPiDvzypUB6SobBFZLiOgky4PcsSCTKxwBSeXVpHDzkBW0SZkXb0f4CIzuKPXnytyAQAfq7j7CpV+wACrujm5Iv2oNAziMUyNLitaFCZMYMOMx5UL1H1PZMogL7bU92cXk5w0RKxhOYaN83uNYZUi+/d9cMv+tC545qM+kLbFFgSAuPjLuMSIXxGbF888Uvjtp1hyAtVpJtzkyNkDtceakZOldUNfj6N5+B4gn6XNHqhbdJBQHA/sOjqES43Oop+YLEEx50pk6z9jh5KvIo5SslR07vn2m3iuySv8Zih5zUTG0uotCMB7r6yhqvX9qgeliVOtLLlha6CW4GC8npt/MXywgxwjuVHrL8+kp2F5CUqkpSL/xC8n5yTcT7/9aOT7lc7M70PgBp6+PxA3tnbtB8iwIKXEIxa1Bih/3v8ceUEe70ZFtEaxYHq6wcXkixv42Q4x1zOgBb+DfhX/qwN/2/LT+vzhedj83zLqgYh4xLWB+u1g== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38947c3a-b6e1-41eb-9759-08da3cb39ff1 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:59:00.8300 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3c9LGjUEXD/v638s98+Ft0cwNh98SX05qn4qVKde11FAJjtsygApJqK6akZUuJDaa0uzaxS3vouzjpEfC9rYkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6417 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 From: Peng Fan Mark pinctrl_wdog as u-boot,dm-spl to clean up board code, The set_wdog_reset() function is not necessary as this is handled by the imx_watchdog.c driver due to the 'fsl,ext-reset-output' property being set. Signed-off-by: Peng Fan --- arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi | 4 ++++ board/compulab/imx8mm-cl-iot-gate/spl.c | 19 ------------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi b/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi index 433b02cceee..a7044b63699 100644 --- a/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi @@ -84,6 +84,10 @@ u-boot,dm-spl; }; +&pinctrl_wdog { + u-boot,dm-spl; +}; + &uart3 { u-boot,dm-spl; }; diff --git a/board/compulab/imx8mm-cl-iot-gate/spl.c b/board/compulab/imx8mm-cl-iot-gate/spl.c index f183704c9d2..d2d20269ba0 100644 --- a/board/compulab/imx8mm-cl-iot-gate/spl.c +++ b/board/compulab/imx8mm-cl-iot-gate/spl.c @@ -83,23 +83,6 @@ int board_fit_config_name_match(const char *name) } #endif -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) - -static iomux_v3_cfg_t const wdog_pads[] = { - IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; - -int board_early_init_f(void) -{ - struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; - - imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); - - set_wdog_reset(wdog); - - return 0; -} - static int power_init_board(void) { struct udevice *dev; @@ -141,8 +124,6 @@ void board_init_f(ulong dummy) arch_cpu_init(); - board_early_init_f(); - init_uart_clk(2); timer_init(); From patchwork Mon May 23 12:40:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634552 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=YTRYFU/y; 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 4L6GLX2w0mz9sG0 for ; Mon, 23 May 2022 22:08:02 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A4C7E840E7; Mon, 23 May 2022 14:07:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="YTRYFU/y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 10CC884269; Mon, 23 May 2022 13:59:25 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0617.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::617]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2EB8B8428F for ; Mon, 23 May 2022 13:59:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VqbAGSMdsaroqbgRHuLP2JQg937N4h+gokvGJLcZCcfBHyKDfDo203t1n2SntVZRinvuFWofhYbdI2mnoMV1w/R0TsjvMQDk0ovacvBs/tLOzQ5ZQb4r3o/P07Yj5E0KMC/Pfr1pCtdIT9aE0M47hrf/+9Z3X1FQRAuNnCoz4etsEdWvHiUCyK2ny4MOf9nhPrP265J0mfXbCL6qYZGgfDdBvxnRmHXdrpWeNeeoBE6xZUc4Dp1a5PWvHAYaHD5l5V+oDPBsXh0skrDMxBCpO6zuddUQcQ/NeOdxfOPlSpvqW3+XwmxXOnq1+oLHfbP7HJ7LBnUEgZzmjxDtBriljg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=R+S3OaySQgwoZ4QsL52mxKEsNAnbe0VjH15HLO7A4ow=; b=NV4LfrtCvs16ISJ+ZSDLq2MgzKWBNVTCm2meAJjkQfUGG2oxAwEde6Z0U0y7FSOgmeL8wcEdoZ8+wBxbFaY7t5l/nZBz03c/lZG1AMLQQ1whya/DuaenTLqmdIcrdwbV05Q9Z07QJ+qEN7HNftX53aLSg8WiUA5YNZZw5hcBZmMl8oIU2sXA81IzTxgroSikVQ5xrsN/HZLKguj+C34FzR97oa2B1kN07jOlQ0aIjNhhq4Miz47dUVx8aUTbeP9Ys+BI79c50jVckIStOKv1UAGS5DuqPMXeM3QVpcaCXYMd3GS6MT8JwTi1K/IHdX6FjwSippVCSa3E+zp+Iyez9w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R+S3OaySQgwoZ4QsL52mxKEsNAnbe0VjH15HLO7A4ow=; b=YTRYFU/yyOLnL+VywlRcfHGX5iH5L+gfVa33+NerqKSw4KK04drKIfIFz7wH1MP0D9WWoV9yHZAKmxsdWEbnV90PAAYgzTNQUZYXyVtnmYp5S16M5WfsQ3xv+l+6tSbd0q9fk+G+CPP4/EA+hswvFi4PXw3/ZoV6BrH+YmO1fuM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM0PR04MB6417.eurprd04.prod.outlook.com (2603:10a6:208:174::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:59:04 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:59:04 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Jagan Teki , Matteo Lisi Cc: u-boot@lists.denx.de, Peng Fan , Michael Trimarchi Subject: [PATCH 16/22] imx: engicam-imx8mm: drop unused macro Date: Mon, 23 May 2022 20:40:28 +0800 Message-Id: <20220523124034.12813-17-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 558c32e6-2eb2-4cd2-6fb3-08da3cb3a1c0 X-MS-TrafficTypeDiagnostic: AM0PR04MB6417:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nqVcunoSRlifBgldQITLZN2ra7STz+BinWGDIqtWBLfhh0/mv0XfvKRdhTS3Uz1o7lUmF6ru+VKFI0j7NKn/CZwvEIM675jtubqBONSJOWvWkv4AsQcp89jyDj+27AECdIWGCDSrPqgFeILi1trgf1GFLkv/ss7UFL2860qijss5tHXw2Dr92sgYU44WuyrnnirfE9ZOOWMnh8oDnxzV9nr+LrY69WVA5bwsh2Q5+GG+LpWywYhmEk6RGskmeJDRVjVXtshbRknNMwHq75Z0PO5dhrneoJ47p1cMzjZAjNEz9pwLRGZP6C27J2m7Nra6N0BIzygHLn02we6uJhbjhMFrzNXfChFouIAFsqsv2YDpl4W7DaCWUdOCraghD9cEAKfSAzommL4DsmHRnRV3gIuiqTRpKvvdjFLi+pnynyOwLLKjqtaecGxdBgP2a4nYOcdDYr9kmQ7uCIsSzW9sLtjmMY5+cSQUEx5aH98ffwKzREgHuQuf7LMYC6oePSq09OuJ1QEbNR5X+onKhy/Q1Fdf9HzLF2/B1m9fyCMO3EYyNJZn4sNX4PvHxrxd5WsRayoDZgOlUhYEw0dsIoNBIotN2D3sKgCtTp/cKvPIbBBud9DvRl2qtelWxmQRoXXF6JhVIK4Whb79FrQrEOneMtAPwAFQZbn9usY1yJIcwOpS8TiDlmHvvu6wCDcSpdBDFCn2E10GI8hA4N35mVPysw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(83380400001)(52116002)(5660300002)(86362001)(6486002)(316002)(6666004)(2906002)(508600001)(1076003)(26005)(6506007)(66946007)(6512007)(66476007)(2616005)(38350700002)(38100700002)(8936002)(66556008)(110136005)(186003)(54906003)(4326008)(8676002)(4744005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BdGJazDpg5eOHR7hyfkEFlkpFdQ4dIowsJBG8y+TfUuSvFXUTvMySuagen1KTOFrNqyZHsbPAYaJ4FtOs3Uf5PYF/9UfJNW16xCx+31C0BIk7Oqx8hMIXfzt6e//VXNo7VXn2OXCNpvF89McH/HORAQAw0qgzIyrafXsdo8h+SCXBEyduEx2w8gEhDNZ+Hp8y6DyFJbXo+OWxLUKxYssYPMi+jjB/6K/9ULhRPWEkEx8y/OfGLwQZ5aAvmlrDMTmcL6r7EnaCaWJRDpgMvZxN+QXkFahG1ps00F8mNmThlvQziTxDPvlcK5hlzrwx7+zxIBz0D/VuOilSnhymcTfDYa2By7fBhq4OGxyAp6C2xRcoy+9hkUYmckKf6ZNp9LsnFsMvTgxMd58VVMs5TGwWyx4VJ8ij5bKt48oM0CLdmddhFmo1GmpwSPSQZlj1aW5ByJ54RbE95wDWNuRA4sghO1rNoU6Gwtxq+gfiNxXacY7S7fJxiyDjclHhUU3Ns+wEGwKaDGQ3aUyzA02eYRAtRQwFBboKY+WtJzErXDFloHF+zLb7C4MqD74+eOMrXkC8kb5ho0Bsa1STsWAzfUocas7PLydVGjR1uxocGkYv+QEsqsjAu2TZlziTa7Gf9ozwEWIwmR8p33Wk2IXSkiMi9YqkyDzTipQqtWtxMQ/N3w6Uhf7RaXcy1rCncWAw/bEM+L9HaoixWc04xitJ9brq0PshzC0/7Hd+XHedXr8zXkrli6oIX01Bmi4dSLfUlYrz5/yH1zMjJ1fDlWKGcf+ANynd2Soj1/OOVPmfk3oh/GkuWJ5Ff4uYJsBW6gvUrYfDWI6toCLWPVMXzewH0Pdy4I8zoQYs9KwCDKNUkm61uqHRxfZ7C3S2WJaekN9xjqqaYDJcA/2cAU7y3Z5sXbAAhfozfbElOW6i6fBtxR4MXDor2lmS0W72Xdy5TPVeQ9SvKbaR2kCc1LVswMgDeVZIXjmDnwGsbhXG/YFumha5USwcfV6HTmq8ezn+iHWBpFmHKYFFkImCYv+KVuSAfMj+0/E7KWDCKVLHF8XlamvPJUB143ezFYwJNP4aQgCOK3E4+H/6Hq7p8+L3EVGa3Dx19Vq1qHbywyag6HIHv/mwFgYTNb9PBY8mV8VKv0jXb4/bcCEpycZv0FiEZhJaxfrgOzTPykXTN5pwORT6KEBdoHbMFEd3wBFQSI1YpLfzGDBgmy1qoZ7f9wmh3AZwEtegX7/ft+GrVrLUsDPea06jlnFjaca3pdVzR2DhTsKL4S3iGjW6cfjUuZfC1kD0Vn0ShQf9x+49EEEI9DLgcKXkxQocsi/K4htM6bGgDqQwl8nuyanJjnsLqHl62bd5tjeYPDeFOEJZDMQhcijkDAwxTjtnU9xL+EeNsz1mMfhjhaRQNc4sTLH1VkcRg6WTHbjHAGWJVGEMBmg+DQIvzcyrNqSNFX7Jbu4bLloIttHNqKFZ+SK7zgCw5iqVI4XYiPEqOAflxN/ZW0Hp6kFs8nvUiDLtrnu70sO6c+OLeJd3jQmfBm6v0DBE7f4Lh5cNFfB+hDhyjoXyXd5/XHAjcDzpIuvL7FoZCkLEzZ9JOF/jmVyl7hQ/wgUGXR6SI03SItCRntIPRTzVSM+Fl1r/t/3h4Iqe4YgevE4R2l9UEIJAyakuYtn7hkaLaHKfj3agELdD8EaGOirLucHUsiqTVQ73AlPExLZ5kFKoRj6TYaEEqR3A0QPYOJ8Vp+QEf/O0kck1A== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 558c32e6-2eb2-4cd2-6fb3-08da3cb3a1c0 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:59:04.0196 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ieXpAZAkNCiiBgQGSLWq5qmd8Yi1euMERKcduO8Mh4pCjLn6DjxAE4571n0+fkxnI2P5SDWlJQ1G1o5RrZhdrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6417 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 From: Peng Fan Drop unused WDOG macro Signed-off-by: Peng Fan Reviewed-by: Michael Trimarchi --- board/engicam/imx8mm/spl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/board/engicam/imx8mm/spl.c b/board/engicam/imx8mm/spl.c index f75f2dc634c..1846134a492 100644 --- a/board/engicam/imx8mm/spl.c +++ b/board/engicam/imx8mm/spl.c @@ -54,8 +54,6 @@ int board_fit_config_name_match(const char *name) } #endif -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) - int board_early_init_f(void) { return 0; From patchwork Mon May 23 12:40:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634543 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=THNX+n+d; 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 4L6GBk5HmGz9sG0 for ; Mon, 23 May 2022 22:01:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8C4348421D; Mon, 23 May 2022 14:00:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="THNX+n+d"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 39809842BE; Mon, 23 May 2022 13:59:30 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0606.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::606]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3FA9F842A1 for ; Mon, 23 May 2022 13:59:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lq3mE/Cn9A5gY6/pZQ5MmM8DgOzjrccki0U7ihZi8V4SKlXmD2oGXftp9GshptFnBnJ4WyV9oIAUM+FOlmJQxla0gkAH0/dmBw046JNjXuoVBzCKZLFBECDCoI+NNGfyQNFAgdma1smC/RsIaK3gQSqYj9B+pIH1qpMnFVEjP1rzek/6kpbjYhycNryok6ptok/zCIK60HB01jy9egszs1EAxtoRUOxvkj9CdYavGAyx1ZH88J40VkuBk0XWzQq1jLjLnZR5srDiVmrLpMwNB04214Tgf3Zz0IjStLyCe785yC9TgxV55PmBQ3pk4j2Gji9yRKsnj8y9fnG0RFnxbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vdsdbm8Q9qFEswWvDVucE+wGMadC1Eu6+Cy6zjx/3N4=; b=XgGYulEP5XpFx48MGxuIH/nWEMpXftKkRIRwvHEtrUranqtidpDLiZDtfoQc4pvu7Wousl1AmMQ2klIz9ZcIkZvZDiHCON200W+k+RkvkfuCJIvIDd9HVMxGqmOqGIQ9vsxHCpvBUUTZL+79TcEqcg87xhcjSDWi0iCHy7qWVX3yx792rTz+i0tkVGrJe2bQn9aqHTCcMk1SCh6uUrS8QgjIOv46xemkmxjyPEJS1Mpq3I8o1Tw6qEyx5VDeVLRBKG8GPzFcxPhVUyIKAQO+qYFYvpqdKBXq1+x4GTDwMzEM1kfmgZ+fooXnTGGCoL7EY1c0Gu8znCSIYCNku1AGiQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vdsdbm8Q9qFEswWvDVucE+wGMadC1Eu6+Cy6zjx/3N4=; b=THNX+n+d1d+obh0icyP0u119UjNQ8cYkrTXiv564uQWMnQbAQq/I7eeaAau107rSwKs1ZGeRGeDoR0nPv1I2t/ADeuQVgHB3nr/Jo3qxW2VVZzUA1YC++9aOGHFgtCu7nolgOko9czXxE7UMSP1gsvULZPLpRkIdpmNuH7eZGPQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM0PR04MB6417.eurprd04.prod.outlook.com (2603:10a6:208:174::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:59:07 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:59:07 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Tim Harvey , "NXP i.MX U-Boot Team" Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH 17/22] imx: imx8mm/n/p-venice: enable pinctrl_wdog in SPL Date: Mon, 23 May 2022 20:40:29 +0800 Message-Id: <20220523124034.12813-18-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9ef78f68-f325-4aa8-d65c-08da3cb3a396 X-MS-TrafficTypeDiagnostic: AM0PR04MB6417:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W5EPnRNa8jICRba6EXb1TLoc30WntHl+QuEjL3w3pTdn3XZ40AV82Jc45lsVq7wSWdnxQurEVFbyo8pWW1fLoohWRh+ECscEULZIgRgdp+iH7OG/1Ro6Z5JSo+8wCjpt+2DkiQKAIphw1gcD2N15IKhsttGCrzS06pzmeL6LtAIp2hrgtZpJI4Bk+fujaJDbgs9VD2wuxkqD59T2NxNcqcGLe88p9xDpICRkrbOrKM0KTHhp7lUgUmdDVW5SX9HkY7TfX/DpCuetsiiPyJeRdJrmmctWYequG+cswe5WIADJSfpv+lpfAH8J4lsRsCjJ1wX5JvQO59zxFZqxf9v3SUE5oW0/jq3hfnRsj7yYzxgmCzPmpG19t3d4IWhdGr6vBUXOfY2FVkNlaVkwhq9bIzybBEsOvZQ0r3rIr1iIvwYfFjdCK39v3cemNKp2IURyP/slJARy4G0WdKBGsjGsPb/cl03xPKZkP0CnAR4reLbes8avtVvCBtuI9uWqGsMxwN31SzWqIFKbMXrim8iKv8FLeV5hSQd4qavGT+Qvq+druHbfGqFiG1T/mY1zuWJ9RSaC2gplAK66GJ9wrJ4wbttGvpMus3+W3HsPR3ni0+qcDHqKTbc0dGe2a6ZSbY0NQPVwH/D0pAQlxlcObn2dsjKOCnNQBJSDLBbp9AjkjzzR2pG9SJS8+eKId4/9UdrrOJENzxbmUNW1488rTGZc4z1RKig3cLPgNM8zoi9GCTk= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(83380400001)(52116002)(5660300002)(86362001)(6486002)(316002)(6666004)(2906002)(508600001)(1076003)(26005)(6506007)(66946007)(6512007)(66476007)(2616005)(38350700002)(38100700002)(8936002)(66556008)(110136005)(186003)(4326008)(8676002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZFPZDpyRbIl+qwyA++7nDrtyeeDMTeqV7QK2fuQlsHBpFIH0g6dv6w+E5NCUuxL4OIwAIewSLTCTDbiblC4sgI4ElLxm4AK75seDJaG2shnVyEf5owUNuVn9zCnDXoUX83ho5PqVDHGy5McU9ZBanc9AfUkA7sYT9AdM/AKN1QxNJjA+uOFe1R8ycspOSDMO2eBXKdmTyCZZNiqMM1dSILgx4Fpww8UqqTN5M00ENu6IlE5Gzkbiigw5ZUuSAYUSo1eYprvX9nmMnp6iSYnmmfyMA2pLn8RzP6vW0Sgr3L3PgBam1jcOQayVE4h5AhWQdK5S02S07MR75/bEr1+8EwZOG9v5cLC6ed5sz3y7BcsnWDgAw3IU6dfJ4iLh9bwNspsJJ3U1QMPkCa/AkFe7l3zm2j82SNPOqJZvYb9+nt/N0a66+nNlZk4O9ZwANReidalzc7qklyUk9IAM8HDRpADMCis7siOMuGNNUQepZnFIKfZ+i2zlw6wLW5alxlwyaHKvI9I1hEqBrMcPQwSIsirGn8IpEWl4nPVz0RgAC9iJ6R+3LhJHbjYw08I6heZb898Wf4Q9Y5nL5lBHZbKp27DVgQVHAxq8MlQ2V6WDsox89bMct1ChdRzjm6H1uttZqYtbYa1v18KxRZVwLEyBxnZ+iu7jOm1DCmEyw7TNrf21FpUrgJAy5JXRW3rteDrkfVFr/ua0Bo0w/2TMqYsIQ8b13aNPkDKQ0bInEPZDCbaAInbyzEGZDOfu45U9IVz+FpNivL/3fjlkFCHqr/BqLvJ3nm5fR86/GeRh+Q6HvrlOcYEPfyZ5cUgEWoFPIEwFz0JiAXMug+XYruE9hTVhUB4pa2C2IoJZKeV3sET0hU1f2O3hSFOcykq2GnCejGJtOW5pLgRr10mN7t413B/QXU3IouAbyrHIpXftYAnzz4UJdkTfls2iTfxWgAdL1knPpo8F1WEiJu/LY6KLX1vvWzWYNKya2EdrS4FyxpUEe8Zabid0l9GBWXzv1hC3uHeNw0le4foKe6L9VQKc17MeVKaizib3kIgyTY94mDZUCIUjLMmymomVF31XMDcFUza1DDpoF5biKZwp3F4uZ5zZqhiWH0z28pog0V1jGWjvwan5p0P5AdS8msvH0pUNBkOe1pPHqQGC2sLrDCZ5KZ10g4ndkQ9uRjnI3DagX6F9Zoq1fFBEdQc1bawNJSzTP5V9Eq2dH/wcPZ6NFQj4v5JA0/Iq62AakAuq+7T/gg1TsaFmRuabqO1Z2Sym9DXqajfZT00gz4evT55lSZwin9w5sfAV3R82ro+pGaffT9LeZznF9wnaQwK/SyI8QBHN3KeFEyXXhBQ2sSyxYsOtKhmEVLOzYrAslort71tEwos4FvubpnJIQiv8k1QIMj3LL9U0l0mVu0MPGAO13UVJoTp0Qw8XpzHeT7jnjWL/MvcAbnnZkzvodVilyYPLz7DEHaDQkeCDtUy3AJAfXv8dfKqI8n1ZfZJJ1NC3lm2JI6kJFvZfD28eYf0u47D6ygv3a7ziRA6nQIKAEdiaRCTGh++fUALHNpG8jo44hFwpnNoRON6qazSlgtn1Ia2gCF8uVZssS5wyPI/QWBq6FEP4gAu2w5KFxD/vpzB6SW3DdQlfH7S3Kc6o4bzBDldC6UNgSYLgZrTI/qXP7q3Sc6bPoWpFXUst2XDmsMJHfpFQQHexAqxBomRxLqYvboSQ87VkwvZPgJgcXRqKF4uhuo8uTJs69A== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ef78f68-f325-4aa8-d65c-08da3cb3a396 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:59:06.9917 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XuHvV+RONaGsns7Whg0rfc7SuAfOEYha5Ax+9lZG+Ph9Afpa/AlGXDs8YK8I2PD7Rh0Gte80mCiSHMc7eiVxAg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6417 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 From: Peng Fan Mark pinctrl_wdog as u-boot,dm-spl to clean up board code, The set_wdog_reset() function is not necessary as this is handled by the imx_watchdog.c driver due to the 'fsl,ext-reset-output' property being set. Signed-off-by: Peng Fan --- arch/arm/dts/imx8mm-venice-u-boot.dtsi | 4 ++++ arch/arm/dts/imx8mn-venice-u-boot.dtsi | 4 ++++ arch/arm/dts/imx8mp-venice-u-boot.dtsi | 4 ++++ board/gateworks/venice/spl.c | 29 -------------------------- 4 files changed, 12 insertions(+), 29 deletions(-) diff --git a/arch/arm/dts/imx8mm-venice-u-boot.dtsi b/arch/arm/dts/imx8mm-venice-u-boot.dtsi index c61c6de935f..68978a0413e 100644 --- a/arch/arm/dts/imx8mm-venice-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-venice-u-boot.dtsi @@ -72,3 +72,7 @@ &wdog1 { u-boot,dm-spl; }; + +&pinctrl_wdog { + u-boot,dm-spl; +}; diff --git a/arch/arm/dts/imx8mn-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi index 4f23da35676..35819553879 100644 --- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi @@ -110,6 +110,10 @@ u-boot,dm-spl; }; +&pinctrl_wdog { + u-boot,dm-spl; +}; + &binman { u-boot-spl-ddr { align = <4>; diff --git a/arch/arm/dts/imx8mp-venice-u-boot.dtsi b/arch/arm/dts/imx8mp-venice-u-boot.dtsi index 37f3edc9817..96b9fa89cf4 100644 --- a/arch/arm/dts/imx8mp-venice-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-venice-u-boot.dtsi @@ -72,3 +72,7 @@ &wdog1 { u-boot,dm-spl; }; + +&pinctrl_wdog { + u-boot,dm-spl; +}; diff --git a/board/gateworks/venice/spl.c b/board/gateworks/venice/spl.c index 6e6ce015f28..4c0feb4381c 100644 --- a/board/gateworks/venice/spl.c +++ b/board/gateworks/venice/spl.c @@ -87,33 +87,6 @@ static void spl_dram_init(int size) ddr_init(dram_timing); } -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) - -#ifdef CONFIG_IMX8MM -static iomux_v3_cfg_t const wdog_pads[] = { - IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; -#elif CONFIG_IMX8MN -static const iomux_v3_cfg_t wdog_pads[] = { - IMX8MN_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; -#elif CONFIG_IMX8MP -static const iomux_v3_cfg_t wdog_pads[] = { - MX8MP_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; -#endif - -int board_early_init_f(void) -{ - struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; - - imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); - - set_wdog_reset(wdog); - - return 0; -} - /* * Model specific PMIC adjustments necessary prior to DRAM init * @@ -253,8 +226,6 @@ void board_init_f(ulong dummy) init_uart_clk(1); - board_early_init_f(); - timer_init(); /* Clear the BSS. */ From patchwork Mon May 23 12:40:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634548 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=CH4dcWo7; 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 4L6GD32YGyz9sG0 for ; Mon, 23 May 2022 22:02:27 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0E3A8842C3; Mon, 23 May 2022 14:00:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="CH4dcWo7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E8288424E; Mon, 23 May 2022 13:59:39 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0608.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::608]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8658F8429D for ; Mon, 23 May 2022 13:59:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kj+tS5G3K4CyiWpUpO/EtUn8s1zWrHdADZWaZQjtsGrDkmaKqpapd2YGfQ+hQrsbPfxX3dJ+yL1FGEeZSWybL+goUKWZpFfSfBHTzJb2meaTr3CdKGYdeuH57Tl+c0BBtPhzfbkEod320wQexfMP77IBdFf9q/CXK/eLqDTjFtpzv0H2a3/gW/N3YtIoL6wrwAScCZJ+3QozL77RDBxtOLhaoOOknAE7+9FempG2glKzn8Mx3B4d2dKelR+Kp+1hPsGOhTQtiDvzQvIHDi4hHydIK1gY61QsfN+oe2LKD6RMq6UTDzmDUdO7/Zjp0jxSvnfctQCcuTj9Earb2C6lFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kSs/stDNqWd6Qqx3a/3zqRWQcp5sicbWXHwEImu5aZQ=; b=GtzRzv2SehNtyFkcbfNF0MZr/fX0erfxaQ+IyGx8HPoO3dBB/EYBK/6qYwHhQyyDioFcR3bbJXQun2wUDCKVRjtS8xvKmhxyovF0RNW4d3WiTY4IkjMwwI7BWIzzUJoVTIPUZUenCUb+EmN0Ppft1XsGUX3E7xeYi/5IeldaGy2xfrWR69mVgh9Ns1BEZoD3CiAY6VglApqqBXtyv0FDVmmVl15C4xUp+LoWMCe5X1Q0JxkyZ0+CiuMX9rIJXgAkQfyotRUsU6iyglXyCLeV6Ht/zhL5GuzaoHngDC89K4fsagry4ZrVJJQmMcAM+yTVGV+0S/qXY5I2W09EhEOMIw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kSs/stDNqWd6Qqx3a/3zqRWQcp5sicbWXHwEImu5aZQ=; b=CH4dcWo7nCYRwAgO1lbgbqCuDlAeB9Js5b0E0+pbChbFgV6ffE7OHbzQ3reycsan+TClg/QZOHDcPvBhsFIidoM1jDv6FUzq4pLqsCrmXk+X1dVRUquJk1O6M4vSlHuddP8R44u5eVSFIcrKMT3ZpqZZk6zerAeBbbrqOZbxeUc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM0PR04MB6417.eurprd04.prod.outlook.com (2603:10a6:208:174::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:59:09 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:59:09 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" , Adam Ford Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH 18/22] imx: imx8mn-beacon: enable pinctrl_wdog in SPL Date: Mon, 23 May 2022 20:40:30 +0800 Message-Id: <20220523124034.12813-19-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 329763dd-eb38-40d0-aae4-08da3cb3a551 X-MS-TrafficTypeDiagnostic: AM0PR04MB6417:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PRMtoRtzENWHSAtXX5CJ/hadAgwXzOKC7T8far57BwAad9IvSZnAhjvB6n3Q3sbadBHaEd+zUKmmXGlgGG9oT+eDbpkFAafocNwoyubn2aZ2IM62kxh38IMU6/DLpyuhQ70Dn/MgWlbO1nsfRStvAH6AZU/t1uohIv8w6Mo9cVlzu91vVqJPslICubX16jdcm1RFbVSlrqax4RZ6tRktfep4lKi32GEoOWRPXaoHmPa5YEXHsrLhwrLvuUoHJPUxoq5r0I9lvrRMwxOQG/wVpsKstmHmNrJTsD3ugSEmhG5aK2pTwXabdeOxZsYKdye3mQebDeGMT/l7w/TlJVUy4jezbJd94IHjmdspTsompC4G8FO7bvG5wwNhp3ilrJa1ijzU7JUf+T8+87l3mGVMt2m4jk7SMpIlrSAQBkiMK3vqRFxVbaCIZelVadmX3X4FaaWJy8k9Uq0dvGF2M5Y5AQv7Y9S3Oio5ionWtcvrRLIxKm4dVl1UT21yt3jemZCzrekARydsSfutT56KCJbzRF5sIjw9GlYLomr67usA6qozoIV2n1kYg/1+VfmMWgHNUpOaIDHvn6iJFR/ALX1YWSLvbopntTW2dzAQhDTJK4X6+sCCsNxUP85Al9ean2T1WcaHen+qh/ztvaUUGFcdiNfNkqhZvo3uhwuOEZCzWEw8hCwOUZiVqk8n7jSG/1k0G0SM/kgS3LcDKBzNAHMQB7PWPsz+3Clhjwj/3+DKQi8= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(83380400001)(52116002)(5660300002)(86362001)(6486002)(316002)(6666004)(2906002)(508600001)(1076003)(26005)(6506007)(66946007)(6512007)(66476007)(2616005)(38350700002)(38100700002)(8936002)(66556008)(110136005)(186003)(4326008)(8676002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xquv3TiI/k2QBpxBOkpJOdRhie77z6I0kXD4tlnJACME4XbES6GyNTtxV6hXaGspRtC1T9Fyh0OjbzjvRSY3i00Mzw/tY0u9vSHfHpc2SBtVNXiE0LxLa67glioUGUdaO4UBMko+d5um+Sx1Sj8lZGvVO/Zr68gIXaB0ZrlsK0L9OoOodKYWWsFR8bI5jHJp3VfJG9+Syz30zkWUWmILlAUwMKgTLLIE8mb4L5kXJvor+QmkOuJwQyFbdTB8DuxRtQEhKW4BK0Grw6qhT/Y5xvlV2/4TDjGlSi7wZua0a6TX6Y8t9RNtQ6k5LXCnJdIDoOOUZAyFTEHNUfsu0kU2q3Ycppd8QMc5uaTsAoi4l59V44raY0VyLU6S9Jc5ooWj0HfbsFMwEb7xdIv6kP6BOHD6lUO9mGIadj7ikb8ETVmSmiHsANVDrxJQo8ULBrZDPgNv+jHazK5cVMbPkkkS/5ZnSTOPzur7w02byKKb4rkkrhd2IzFhXEm67oSux0fT5P/OIQzl+tkdwHEjVWthajHGM2fdSK1fmXdjnXH20lbVYa6vaHYtDF3TCZAmYXzW95/rWS/onq8bIi917nlLGRZb4L6m2oS13U8/F0UBIP+4YGmcKn8ty4mU42e2U/0XGlSMUsFZ45Yld8qGro5fFKzc4ExT6o+3+wNPr/2WU7spFbeZdMS5CAxlu6dSuyMN3JAIkunjJTS02hkLxxbLoKYGJj8aPSy0J6l9b1CnDFC/ZHkc7YpG4O97xRoabnYMbkGZtI4mv8DjtUszx/SXQ0ypwMgCh2liCLOMgAQ+XwJBu0y/GaepoU6/cob1AWooaNyJhlEIystJG4K1qgd9YdFWiHboW6moK1+QREo/bIpMlGT++lh9dSpH1WPyUG6cjd6GV19bs/Mks8cJpEgwzKuLmA85a5NjCSbx78KTAE3rLxy0W5N9CTw4oAzffjddcDebFBklk66L3k5Jy8PkMaGBTmyd3hPRg0XIXBI/g75QizngKdFa5PylLJiKLTnAqmj2NXHqoaAfFvLn4TOJ1OHswJKugl4cgzywHf/MND1BBdg7Mok6YuvsiHoUxErXTLrj/TlLxzZs+G3Rp1WZMIAFR+BHuPD5MwRMuWerGUHIWY1JImbgRY2YSgC6S27KVJI+X0ZFoAoDiQ0Dqk5BFhv7Msqp+/S1+bXrlVm3inC+Bf4/S3Ocxbc6b+uieWTtQvqFwupHh+GTbBY5cw6yeq/LGACS2f39im4GjrC27aLs0jY8J435vGvTEZRfIDsYq5Bqvpf2d31vgLTfRsW+LT9l0V4/a2UHwhaifR9XXDcExH8xdHcRP1utf8oO4+X1Yeoshbm+afA5Y8puW5fjp4jcO8cQeNzbhiYzeW2seVAIqiRCO2glNf1YgmkGYSVyoHXqg5k7CcWuasgHNt/ffyAqgxHnAii9UVg2AMo5V1StI59OoQsQwMSlgtFsLLYSuYVyup2hqTFEmawUyPJzldMy8a7uYVdSN+eO9XC+K80/14RZ9o0Jsq8WNCGPFHEOb7QpO+UuqajmoC9PU0f+CcZN6ZHC7nTw7qLKiOxbFmKOVFej6YS01w2HTfQQewLoJi8qLIo6HcDlFPZIzzNFX+UMAnv8gWZEusN8BZ95It6ZEYBT3G9lVceq3DW3+QwcgWTglAI+4Ba1QpF8aBiZKygHIF+0o4it+p3/9gA4hLTEgbfWnlBwFcGDiqkMGjbTyYXAo/qy4LodpJ2nHgdhUw== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 329763dd-eb38-40d0-aae4-08da3cb3a551 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:59:09.8326 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: br/UJlZXSvsuL6oiEs7N5RTzxrJCM24paP9TGl3a8+gOQGILuM2yfQlcbrhFRtM203EGokbMtUrjufqnL0CfZA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6417 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 From: Peng Fan Mark pinctrl_wdog as u-boot,dm-spl to clean up board code, The set_wdog_reset() function is not necessary as this is handled by the imx_watchdog.c driver due to the 'fsl,ext-reset-output' property being set. Signed-off-by: Peng Fan --- arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi | 4 ++++ board/beacon/imx8mn/spl.c | 10 ---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi index 69fd69c8d02..eb1dd8debba 100644 --- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi @@ -132,6 +132,10 @@ u-boot,dm-spl; }; +&pinctrl_wdog { + u-boot,dm-spl; +}; + &binman { u-boot-spl-ddr { filename = "u-boot-spl-ddr.bin"; diff --git a/board/beacon/imx8mn/spl.c b/board/beacon/imx8mn/spl.c index 4563446db19..029f71bc995 100644 --- a/board/beacon/imx8mn/spl.c +++ b/board/beacon/imx8mn/spl.c @@ -68,27 +68,17 @@ int board_fit_config_name_match(const char *name) } #endif -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) #define PWM1_PAD_CTRL (PAD_CTL_FSEL2 | PAD_CTL_DSE6) static iomux_v3_cfg_t const pwm_pads[] = { IMX8MN_PAD_GPIO1_IO01__PWM1_OUT | MUX_PAD_CTRL(PWM1_PAD_CTRL), }; -static iomux_v3_cfg_t const wdog_pads[] = { - IMX8MN_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; - int board_early_init_f(void) { - struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; - /* Claiming pwm pins prevents LCD flicker during startup*/ imx_iomux_v3_setup_multiple_pads(pwm_pads, ARRAY_SIZE(pwm_pads)); - imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); - set_wdog_reset(wdog); - init_uart_clk(1); return 0; From patchwork Mon May 23 12:40:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634547 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=eU73OB2Z; 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 4L6GCn56zyz9sG0 for ; Mon, 23 May 2022 22:02:13 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 515378425F; Mon, 23 May 2022 14:00:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="eU73OB2Z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BDB9A84287; Mon, 23 May 2022 13:59:41 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0617.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::617]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 06BD983FEC for ; Mon, 23 May 2022 13:59:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Op7pm2eSDywudPUEmRuKb2cL8aBP40ZBBuTUMUszv/jpmVTKtH9mc+6yMDMK0R3TnU5uFsKWbxFCbkgJ5CqAtlZiiWuhDk2IY7cCtr4DU82zfyNaqgobT3+5vEYMtCH6J++L2TXJrczvJSwdOs5mGMgC5q8ngFXvl1bqXXbmbgjbvXBkNW8MxigGsSgQ0CwUtDWjfr6W32L5FDkFaDVgzBZWBTsP9vlAIHr/ctnEO4s7fDIicQLJoUDVAgGPaueuRdWUWhKFKaboEw30DtdMHn6KHzahQzYigoE6vtaqLnt1sFJSbmGm1KpcROMtian6zjYwa8SRC8cY5xqe73zsqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1BlhNee+ko11F2BCf/fk+QbdB66KOoT4UMxYkru7p3o=; b=T2FKvf+BhWvxY4TlENr66Af9ezdtkSVqioAINz0Pdm8a/xnmjisPOGBnbyBVMi3C9/O9SuEJF3+kD9t51U9gWAY/SOZ34oj+iaXI5GhnTvpGVF3o2e85lytBlKNnCehw/uDzEzNEBh8U3Xac9hcx+zsxn68xWAr3R2Dfj0CpkJeZjIVRjgD1kt6r/ssL9J1RnpwWZkzJbIC9vOUHTQehoKpN1xSXA5oNx4YtDcM4HscSvr6oOEs795FeqleqjwWxJxBufCoSYPs9K52kErQIrK2zcqoFItCafLIPjT9gMkE1n4cW6JQlqfwQnk0uLESXXodbiiA1mswKD+jlDK6e2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1BlhNee+ko11F2BCf/fk+QbdB66KOoT4UMxYkru7p3o=; b=eU73OB2ZAAFL8LeWBR6uem8CtRP/i1Sj9uRdA+YgqArQMrEezp/JbO8LHXavTT9IM1aAJDAaJ+Vi/jXCq7DI1Vh04JdbDuhUcfWKJD++Ygh1aYOF7OiIvsal53/b6ouRRTBsiPZt+VUB4sqBP7zhVVYawTZLi6c5emCGet6GTJI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM0PR04MB6417.eurprd04.prod.outlook.com (2603:10a6:208:174::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:59:12 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:59:12 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "Ariel D'Alessandro" Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH 19/22] imx: imx8mn_var_som: clean up board watchdog code Date: Mon, 23 May 2022 20:40:31 +0800 Message-Id: <20220523124034.12813-20-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c37f1ef7-e48d-40fa-0c43-08da3cb3a6d2 X-MS-TrafficTypeDiagnostic: AM0PR04MB6417:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XLDYrMqMtzsu3v9OOST/avcaClrmaBcI3a5Go7HWpJGdZonr/zCJAFH2HHefdrPYDt4HJPYdp+ScdsaaVggdk0hr3WIiZJKcG2PisfRh7c5i0zaDo5UjZL24r2tM5vFrvz5XtpaR+z8MyfM+/Ghe1ajArxzXQoMA8DHaHsM08p+Yiln5TTJxWbs6sYvwt2gQ82TklO8qbbq3+Wiyr8TVSP6l9GiKKzdQ46+3rH1DMjdmL8aCk/lNf9H8vXrv+Y4tsG8DrrflLh2A7f7WxX09kszV06wX1g/8TYL+Nf2zguc4UyDQV7HVUKINyzRFs6D6NtSfyvO0rPCk7of6EFxJ6Z/JvFxuFnAiwKndFDWgPQ3V0XhvkX2CnUVCSczp4bwAQVgBUNJmvMBCNA2O1M6TnUCF0GPnhntKRFpj8HV/J4NJManG97Z0i1f9/Q4xW4XXQd4JfWWNKOz9vw039gbDKt1tXT6VYVMvzIb00uYlJDVNN1p5G6cMQWsZqhV+2sYw5fC/CTX1D0Ys/oz3d7kUCeGXkT4etVxF9JM7MYE8BvDbUGO2i/wCCSGf5sS3Ag0wVqTIv6DDujXjYp/GlBT8CoxMWjoADdBGgau5tVklg9Dui373GnMGqFcqEfqsoKzlJsrwP20PQVxL84bpC4zD99Julu2+KSYbTNzmPnhaQ4U1deMdiYmLYaIHRRdEhVztoYJQ5q6tUjC6Bn3tYGPlIQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(83380400001)(52116002)(5660300002)(86362001)(6486002)(316002)(6666004)(2906002)(508600001)(1076003)(6916009)(26005)(6506007)(66946007)(6512007)(66476007)(2616005)(38350700002)(38100700002)(8936002)(66556008)(186003)(4326008)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YWvn4kL0QK1HFfeO7Q7lZtLYc1NXy8fNsS7AKzrmg4uey7B7ZDPtqzll0mCFnDjl/phmnYmbrJmt0Gga2ejbx+6lenji9WWehgv1Ezhorw3R1UBeTQcjbzcHuyWNWUAeXwrJHcheNE8zGr2eVNyfRlhXVl14bRf8EAMqiAUGDdS+cd2goL6poKkItaLt/SAOnq5XRiGQsaAKMBEUA4H19VCKkqpV99asWNksPRxa66RjBM8ICfOclTTbz9UsDVBj5mAhBiM7WuJJt0zK7JRHFfLxatvJ4+g4QymIhF0bfCOT0Nikm74Rz7vE0o+siYWjqW0hw4FniK48ukWvKjYlct8aafs3F2mkpzcxf99BRWgHrldr/d4lebcgOiuYj0DA2uqKvFkuEK0hOSXtaqirs5vgTOnKrSENmVMeP6LQp1H8oCFvKcJ9kDY927OBw3xUWohXIOHr/P9YOsI+T6iJe2afUrRbjUK91zeTgM3IfU3FBL+N+GtRnWDJxzc0tWDEMW1p/5qUPMjnAs6NR/HNgCiiNSRFDOMAExABfSQrc21B0mVCkhjXSJfPd5UtHISLqLqhalq2RylvTuy37NlrZuaM8webYMyNkN6FDJSMKaZuWEMYuTaQB60yZAUrJ96b8y/2kNWTYzK7Xv3sX6bczTjqHb20YylyCKctqphsFD5UpT0d5V5BqLdcFwbgsW7JjRl5H2rVeeKKEAA8UnytvBW9JbM3K88ace0/YSqMQGWk0UIZv7BptpiBT54YfvNcwPnjBrUYUU45Kly/oTqmkvtv+2QufDw+5puCr1mxRTNdXXt2TaCGxRSszccgm5sFs7CyuEHyGhAjy/KjdIjROFW+zivi6gV0bvHh3XuFEKmXOg0fdVgsHH+I7iMGHRJXrc2JD/TnL29HEcoGBBnsbqwPCXmJZLIj4ySJKx2M9R3QmMMRD9sJ/ItcEgRCCHIYcuHu5kI/juX7veuuYmaoKJwOWKHPzvCrAuiOpF7YHzegcIwY0/aaTJVQLLhimbkiq15DoUx7ZFkvcuLcIlF7PCBF23SxRKmXvOKFRMunhbm2CbByL/8mM3NkuKlellJKI1czLA9fiQ7iWaXlVupUKg65FwM3qlfaWBzoYGRi9gFfk5F1HZ8NPTiWfMsavbLMezEyk6QZ95TV0hQSe5pa8A70Pm0AvygxBS6H9MBdAOoxyAjUMTVaEbhkbR2KyY9afdZbPAfplwOcAKxIWl95B08XIjcFW1T6HIBeu57xsD32KXy1RNyAEVU0ET9MOD/SMRuGC+14FRlPKH0OZ2M+Y05HMZDrycBTV9nmnEZCY2/Qe8/HMWwXydDzYJ42NDItxVMTJ3VzV+1o4+YLaH9d9haV9cVEc8LacLJWAXrLeq1XyGnk1zkGU7I+8BadkfzJ3GzU6P3HLPaMMNoj3Lpy2YQNxatb7ML7topMFLac0bnP581QNfe+G3o2uitbL5t1peDgk3DzT5+8iGxE5GA19wN83aePFUVGT960Im/FFx3khtjhLRmQvxlC9L5Iflt7kKOOEBSiDxy1hEjJsGYW8r+89BkZ+2PvdnPVkhxApLLdIGffeoB2XI03CCOFRE++9BlBxShHy8dVVtgwEWUvt2IBfSd93fE5Jv0Oshf0nlJW7ZBgCXGRfhVj3bFx6r/txDxYve+gvKAHukBGb3ZFR5gwtiPv6M+sw8WugKTZJapfCQXq4FnhmaiP3DChUA+BKjyTjVdTZ0haeBTV7hF3bA== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c37f1ef7-e48d-40fa-0c43-08da3cb3a6d2 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:59:12.4818 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: TnUwe1ybGDuGRz7iYYMfUrAXvETQk8gjuaGrIK4ktY/jUZUXPs7mGDOP+kAcP24+t6J2Dw2VPI+bIWfZQo3AXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6417 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 From: Peng Fan pinctrl_wdog already marked u-boot,dm-spl, so clean up board code. The set_wdog_reset() function is not necessary as this is handled by the imx_watchdog.c driver due to the 'fsl,ext-reset-output' property being set. Signed-off-by: Peng Fan Tested-by: Ariel D'Alessandro --- board/variscite/imx8mn_var_som/spl.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/board/variscite/imx8mn_var_som/spl.c b/board/variscite/imx8mn_var_som/spl.c index 1a8b64fc0a9..41e70505774 100644 --- a/board/variscite/imx8mn_var_som/spl.c +++ b/board/variscite/imx8mn_var_som/spl.c @@ -40,19 +40,8 @@ void spl_board_init(void) puts("Failed to find clock node. Check device tree\n"); } -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) - -static const iomux_v3_cfg_t wdog_pads[] = { - IMX8MN_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; - int board_early_init_f(void) { - struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; - - imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); - set_wdog_reset(wdog); - init_uart_clk(3); return 0; From patchwork Mon May 23 12:40:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634549 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=WSrLB/24; 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 4L6GDH60zQz9sG0 for ; Mon, 23 May 2022 22:02:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 500FA842AD; Mon, 23 May 2022 14:01:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="WSrLB/24"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 22B608425C; Mon, 23 May 2022 13:59:47 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::623]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1F1BD84272 for ; Mon, 23 May 2022 13:59:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gTADv1nMy5reuCU+sBTwo8vqqeWK9uTQc8gMFC7yJbkW8Jo8tZwohaQ4pW8H4tq5aOjxIQuHTuzmeSAtDtB3DLxGnJQyKxVLGCS83/DeiKNVrAqwKEz9XqiKNTkagyKVF1R6IX8SSjZpjWK5cc5TQSKKxuNQhuljQF910HjsPUly06okoOc+00t1YuWvUqMzlwt81rYZMkcSbce7HQtR6BKSp2Ih5uP2qQmwDMN73GZ0B6xAgheU5af9E/I76l6TmsDasQ9i6h1xjP9lbwWGf/HkYQshcomK1ehtasfuSYdcD24CbPB9+VMP8AoQHtWVWcScr+DU3YvvLl5ulBtXJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LbO9qgJECGw3k3ExGCHHbd5gzFoNnNyORVMuVGzJS6o=; b=YzwAE4d6CKfsslTvkkP8VwiglOnW8ctd5lXveL/9FhEr44IGfOAk4pdOWCV+w+No3Txvo9tXWjSrRXxEhNfEzHVHCi4HzntsaklYm9yUgC9MKRBSjaz+kWfURUqRB7EHuVH0Y046dPKGVQYoR3IoEHLX+lptCJ+GqCus5cYeWDNf+/yt7NI5AIBd4d+3DUKU1+C4oTuwa2Ou7qVYGD+MAcTF5tcROozpHl9IazUHlMePIiPSP64ZxktcTCjHBsHoz+QaVZ1ecv8ZImq86Xg+bjuRVs4rkpCl9M0VdDOcjEvsD9xqqVy6+JeEmfkvfu2kfKR71h2jx8PGkk2d9QIBkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LbO9qgJECGw3k3ExGCHHbd5gzFoNnNyORVMuVGzJS6o=; b=WSrLB/24YEh+WyPQyGXzk8lJS5vOUUq/IoD8lQEpCxCWffllfOPiOjaSubyblaLEyV5L+G4EBYII99sten8XyBBgEBchZGtuw4PakNUQ9+ne6U1vgTIMtZ8Tx65KYo8/XqTlzRrbLmBUJBGzRhLpueH8WA0WFYqfaVWwkOdf4os= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM0PR04MB6417.eurprd04.prod.outlook.com (2603:10a6:208:174::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:59:15 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:59:15 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" , "Ying-Chun Liu (PaulLiu)" Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH 20/22] imx: imx8mp_rsb7320a1: enable wdog driver model in SPL Date: Mon, 23 May 2022 20:40:32 +0800 Message-Id: <20220523124034.12813-21-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee95b0a1-1ed2-4172-6993-08da3cb3a892 X-MS-TrafficTypeDiagnostic: AM0PR04MB6417:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mrORwZlOcI3N0wmGZQN8x51kZ1ZvpVNmXN+OZhtfYuen6wZ0V8QAGR5+GmE8J+xtwIZek5z+/O+xmbjjarDkMuf1z6sChc67yIy6VTaEK4nJjz6s7idyhdxdgj/AwDjWc+ClBS26midGIvQkDOVrHMi2s814Qmi2LGi7+AAu2cIh9aICqh0sEN4HTqzYPZD6XRqTudnYwT+CS7vNxj67ubkFfY11k+wwbPHLbtxZi2IVGLfDe8cZWoMBrk8pDNOg2yESFGRQ8F+pWqOGZiSDpLS2ahq1p6dbi4mxB/qSGJEWaEteY2bQT7VvSwFzwH8cukrVkomJo8X30LhzrdYqtNQk2/VRlqBr4izRWITB6KUBdzVz8Cf5Jecc+mSXwFhJdtydTSrSBWZgGlSBnuSB5bv97s1Fl7yEgaWIz8uWl4AVrGP9+WSjRflC2W0KdOUphVU+1Fs16aJY9xslLUZzfDlIRQ58qEsa8/AlqGQczWnB+a1VJnDlc2h0NWYGr1iXZ4w6hCWHDKgfmmBbubP69hp/HlJ2VCCBkEAlGYXCjCOWUYv/axaGZjoSBiJ2eYzA7ccNLVzK4MQQiOfPl9dRjvMHhztlaRwyHOme2BhuEhlBiIS3awQotY3Etlw1hY6RBKQRgxIx3QHiNy+BJrPODBZIkjwKR8OpWo0+D0kdx99HZ8EfeCVRdcQpQxzoggOr5mCEHsluKmD2b412EC2A+w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(83380400001)(52116002)(5660300002)(86362001)(6486002)(316002)(6666004)(2906002)(508600001)(1076003)(26005)(6506007)(66946007)(6512007)(66476007)(2616005)(38350700002)(38100700002)(8936002)(66556008)(110136005)(186003)(4326008)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Q7FstmGWi1BsHYOaAmABJ15a+G2Q1XJT2ovhNSM8MitqZf68L/14Wy+HCkZoL3/5GvqpptD95d+Eiby+KV+0aCnHKiEHHinw9h+E/cy/M/Ab6jjs3WV9maWdGXPlkgYzqIZn3N5w7jK178svqCDB6KGOSs7u98V97MM1B163JFfnQCTCStYjw5GzES1YLIjnkU2594Tor/e0JwHNbQ6doEYwJsvgtftvEOeouw+9yMeSEDroeJzPrstTFPlj1JfejUvr8FedyOkAKLla4IeRVxBQeo8pmnCbUpeLeV7rztRf/BWhiATMxN4r1DqLCmZwzIdb++1Ztl5lrhm/AxCUXUS+XA6Yp2+DJrE1/eVAuB2MH22dwNzl+lwNnjCsLvJ7+DJeR+CA8uGOyQnvExU+yfPz39Outedzdu+Hw8KSR+2WP/kVaPrn+T5B0BMLuLxRc4mjXEV3sOjpMa68J+NQProPLHuYYo310IfppL45+thfKF330hJfHSyIdQa7sqWgIkkhlKsXpLPjgB6AtRfIk7J6ZSMGhZhVSS8H0Zv7aigVk7C53kFPQhQRnGX4Y7lCTNUlGljON+bsbLpxMagJPfR6Y/yF9Tvk100pLr0mqAUoPqsNwGjKCVcbvyKuWoeuPqhZp3Yh5DWIOqcWG12gAM3WMdOsxwVXtipRLLbiC3STehSj0A5vJPreSCaEXdxuY1oOzX7MUoxBCEa1kW//8QMW/4bXoot9Oh+W/QXtdvMPUgytVp87qM0N5rBXNoVyaDrD/ocGCcq1TqTtIItCJd+8oroZAjsm1AHAqb8RA1/EFP8PNf8YHmDwtzvrYrt9wzqOvdrabk/bLAwYAt/mS7fUEA/+IFLywlFisSvrYttbBoWS28s0E+FuzCEqtdu0ap5vF7MbvIhEdFdRSsx+3DaDY32X5zH6wzOTISChEf7RFOGMiN+k3iPkLGUIISeDE/T59ZNDNmSNYl3RCA1wpmgpPFoPqmyzC3TIeh9pE+p6k/DpOoTp3Dmb7npvQx6GzWg/JVf9W9s/Dn9fpoPxGn7FrYN7wgsNrzloi2hm8hRf5DrswpdSVCrjARv5Z0DWC6PBH6Ao2b3YcRAorMpDFz0nJ0KvyAOyxYXnrOd6v7lV4g0URE6sI53Xh0q0ZKOCBX0bP8BPdGk1XlEuJDdqQo62990rDPlKHk41uDxZkSPot8c2nT1BIpxQsushGD/0Hj+pw1zqG6gBK1/+CDHamXJl278X1tqBUhC/sczdIn7KsK5S5fprowYtLtpx+MyUmxP41yR8KhzdKNQL+FZC6RNn5Vqojh5dfwbSHoMO2Mx0SjyQzegHwjL5l2zMf83csUrLGz92aiAp7jO/HlwIc4vNt4aHaGVI64KEsPIsv15ghK4234wb+58zlYtcQGbfnXPLOlzAdA8bBVQLzgHcOVb1Ita/N0JGbiscaYEAWHSU+kacSIkf3O2B29DhKd0+oPzT9/kTPPGzF/fWPUC+6l4csbrpWtsFDyIT/1qyyuGaD7prwKz4LXDusCtM2ab8LKn9GcJKx5fJibXAlGmSEvDTSgLUCEB0rrrpBLskDsHGpUS9OEMB2l5jYAvTxJ7MQZqDJDA+wcJSuLxEXPYZKFdyqTohJ6y07roECL3y82Qcx96EX93MyPoPZGBRvyCygnDNH0eM1wkzAno36tTySBHXK9hbJjfYCia9I3GaZfsuGCyiWk4PcYCB1OKMjAStC+iV4BTF2ch83F2zRb09oQ== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee95b0a1-1ed2-4172-6993-08da3cb3a892 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:59:15.3045 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nMqsaDTwDCU22yf2+Xm9FIBrqs1kHEOuF727+CRw1FE55Cd7EWeuhStiVs4oIhes6YBxrmIqYEF3lhYosHiFqQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6417 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 From: Peng Fan Mark wdog1/pinctrl_wdog as u-boot,dm-spl to clean up board code, The set_wdog_reset() function is not necessary as this is handled by the imx_watchdog.c driver due to the 'fsl,ext-reset-output' property being set. Signed-off-by: Peng Fan --- arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi | 8 ++++++++ board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 12 ------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi index 2848b24f655..4419967ee42 100644 --- a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi @@ -89,6 +89,14 @@ u-boot,dm-spl; }; +&wdog1 { + u-boot,dm-spl; +}; + +&pinctrl_wdog { + u-boot,dm-spl; +}; + &pinctrl_i2c1 { u-boot,dm-spl; }; diff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c index f129ebd429b..0a1b2c94161 100644 --- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c +++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c @@ -28,12 +28,6 @@ DECLARE_GLOBAL_DATA_PTR; -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) - -static const iomux_v3_cfg_t wdog_pads[] = { - MX8MP_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; - #ifdef CONFIG_NAND_MXS static void setup_gpmi_nand(void) { @@ -69,12 +63,6 @@ u8 num_image_type_guids = ARRAY_SIZE(fw_images); int board_early_init_f(void) { - struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; - - imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); - - set_wdog_reset(wdog); - init_uart_clk(2); return 0; From patchwork Mon May 23 12:40:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634550 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=dTi3lYEK; 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 4L6GDW4B33z9sG0 for ; Mon, 23 May 2022 22:02:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6D7AC842CC; Mon, 23 May 2022 14:01:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="dTi3lYEK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 79F1584011; Mon, 23 May 2022 13:59:47 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0610.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::610]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C3B79842AF for ; Mon, 23 May 2022 13:59:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PVFyScq0Di+v+SsItavqC74fqQVOKhTOh50M9gx6NB5DM/fWiW689udA39fLG6qrr2mCw7m4Bfwt9HdbZIvmFBbxAqTZbytenNJVLcSehtD/DiGYgOKhXVm5kaeZAc6/GvBVvq3k6HmWRmuPVXk+O668fSHCF/iJepTWCG8kRZhw990G2M45Nyc5OlIo+M7bS7m6JA7lu8gZeR2UiXzCzshjOhYzvoQIPJRM5Xpj9ML8LTWbXphc9oX+xBi5HvR0nDj16sPt4+pU5+N9ar1Btlr3PLs/TYdXTSVdQR7mXYyMMQ4fSjH72jsXPIOH5nPOGczofn4r0fcmQz31ZLz3Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LRABw5Lk9jB0guiXnDvfhKI+LuQ0FFmv/d/iK71TmVg=; b=XIU2qT3AEJ8anBXAhGVBJ+NfBe0sBlh2YL5WCaIi41CxBAQMoImCdXvcTDvrTFKF2nB81ji9ILpwyizFHsJsXoEXNHvfQopXdm9PmS7DlTTpb+6o4Alyesd2EnD6J+5wE9xwBwVvHD7KUIsE5vGDCN/gkmCHT9UTcJpmYbvVGtPQpYxI+yKBgzbRyyUGnRfzW6230+RVHzl5rH0SWsdTpTKzCUhaB+i8bsOkHeV7zGuMxhCcuZxZrSTsnLr/YTVIOtJhNyu4lW8cNvW+GZsxDMtlqH4THM37VjPIM/My2vetWHHjJJKUZtdFflVowTrNkLYl3hPp+P9sypjOe2pZEQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LRABw5Lk9jB0guiXnDvfhKI+LuQ0FFmv/d/iK71TmVg=; b=dTi3lYEK9m1CjqoFJ9WrPQ7oWxlU9bX+HxM7LiK73PNj2zwlVkMvXr1FmvlE8uRBAIA6DI+BkMc8zVLddh4LgrybWV+qTAs8Dsi329sZNP28csBLwrESlIEmRJwUWgGJ1n3sv9dqRh8SCcssuxNMsCq5lhBY0NmWuK5PGv8NCPA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM0PR04MB6417.eurprd04.prod.outlook.com (2603:10a6:208:174::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:59:18 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:59:18 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Frieder Schrempf , "NXP i.MX U-Boot Team" Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH 21/22] imx: imx8mn-kontron-n801x: enable pinctrl_wdog in SPL Date: Mon, 23 May 2022 20:40:33 +0800 Message-Id: <20220523124034.12813-22-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d2eb0efd-b16d-4280-37a3-08da3cb3aa47 X-MS-TrafficTypeDiagnostic: AM0PR04MB6417:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZS+lB8k6LYp+nAXPfep8NTlPwixOibKJfwi8m9T0ty+XevJ6q5bIsoiyp7y5MIwM70kKjsi43KpjHOVISCs9q2kydx6t9SL0D5er/3pC7gM9CDXibraaGS/aWa3noYOCO3E0cvwXO89i5XEuLxOu6dIxjQcOGmpGAo4MpZQ79OP27YUcIQ+8tHW49DVxZusHpYLMONUsuJOvi94Az7HO0Z36TLmbfqVUrUV4/6Lrh234z2fCdp8lcS0ESfUhoE+mVZsLwTLGgrvNCYhJVzohnRA2Kc8kmpyplLUe33nHuhdYNSjJ8e+Mtd62Hj9IaTmJ5ymVtO8ktaI4U847alqKA8Tw3QlJwLUanxiSmXqbgCSOJHpiMxdjbcYZqIUaXCfdDgtmmFY8uqmNxK/0IIZdMdE1bWfTfQASjLY1Qy4Fqnr0HvY4Vus4NZhN6PToPWvdcEG8Z4nRd22zdk3GREtSFhnafy1kq+6UEWXY1JnypCBjQZqDR6XfmgwxLvRoZt9+HIPzN7t3+L6oO/J7wwOCRYrv/AiQRdvKBzNGKrw8AAtNUJCBe76Kv5pqAx3O5z+KOoK02dkt3lbTlDTnJUr7mg0UFIpmPmlqtokdQE5VM+Gn0m4uzRHtdd5hN2lXxzqMmq3BWauT4NuRAvqx7sCGtTegSVqqM4m30eM0hxIVpKE8b0YcBUHHkmu60m3IlxX5seGh4Pxa+CXSKJL+gXe9x4kQY+X5PaxzjIaxpg4J2EU= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(83380400001)(52116002)(5660300002)(86362001)(6486002)(316002)(6666004)(2906002)(508600001)(1076003)(26005)(6506007)(66946007)(6512007)(66476007)(2616005)(38350700002)(38100700002)(8936002)(66556008)(110136005)(186003)(4326008)(8676002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iOp7utfvL11EHU4DdyDTlhU8EEQZ83NvrRM423MA0KPIqIy2F35iBF7Obpleivr27GGMktSxK9EG7b0twBdYrRGi31iaCL8rOZ2L4KHPGimkb91pVJ7u8F89E61/Qxm/RIGMYJLaPO13FYygMrgP3pJQ5MST21wo0D5m5JEgw4qjubTgb68za8N86lLDV+U4uTwDbO7OOTDjzfzvmmIz8FF50OFdhydmfdlVqtw494FvJlz/048eHk22y4w6bHEK/khXQNEoV1NuTqwkDlUDxLxmxJj+F8xQyr93VhR6B0+Hwrs0Bh2FcJr3hEEzyChkYEZAHSamdobKnREKq5Ulfv3uAMPGHZ+fzD0PTjPhwCkatoCqlK1K0kq1r8+L/f/UpZpSeLPjbeEK/4SM4bZReevxdEWkD9oLBycfW2t9g61ElZseeBrLgyRv1Mlta8VMchc8w/loogfKah8XulN2wDvcvjdejhG96v7y5aDgada6OK62rzaeuPY9L+pR6ytQwCTnu7CgBgNuQUQktjSUafrp8VM7VyA5Hzcifa9xnGsS6CuvMLhnsYwA52A2oDAeoQgQwv8pMh9HRTMMSPV2WmRZGLoy2v6XYxEon8QfBJAktJ2688hZlKTdZ23tCTfVTR95sNaLlec9a8qLsiX22csQml15Dku0IYvsHzJ1P8aQdBG4ZIhgnxoUDNmTWkFd1yzp5Sxpvxn0TYsbo+1BCTA4TMeRRZaXqPluLZb0VKyiqHdFvuSsva1DVwlqRkReBiVY31nuLEG66edSGxyGXjH/Hmn6t6NC2bLgs90IkVgXIBFUAYicCZzSn5LeIysw6EJVbx9NIukKu1kd2mjqz/xXBpMIIjqGSA+iyk+zqmW+T9OhajJP+dTWvQaRiq0ftZ51oj/Gvrr7VDLd1X0OR7AEwSmkxQzcjyIgdH7eySewhCE8T6KlcLPLWSjdJrfwTM5IaNCUf9nBfsHlswPlM2dBTDDq8xcye3s4UK2OlU+XcNZcGE0dg4JQJ3vrTb/Kj8o4PK0T19Iuq5zr9Riidw5igFuOEKHwW9W2hZr1YPAx8izMqcwMBk3ZWFJdsT8WR3KcQM5eV5p/Vj8fNiJIinAUJjbpWECN8uC7IH6Z/LncJt4BlT6OdRbP4XYxmDI1s+cTL+TqVuiVVJT3dxAQucdVusJrgHB5RUJz5Y9fqpaHRhlaiAz6hbLFBDqv2DQEr7zKY4PZQqo3Vh5HkjRaSInSLrx/e7oQKWenlqln5jXzLDdM/WQtryRJf5x/GD2J3UGJgXdICVOI7uW2PFQXCK/Cmm6A0+d7hwnFElftLQCW0rdZpDQ0eWLuI5HLBQ2MLZeo1TybRHRgAh6QpcQ5OeqiDggXqOQLPMqmM/sJWQT3r4EeP6cTyAK3SES+RDN6UhG4ywSHMBbyFjR1fOw0j0mj154ms7qeoLygr8T7FvWPqjb3PTw9hJaNt63Z5d8zTvvKI7r1UlYpRG2PBLN8LU07DTSPVMy6/GE9VJXAKpSS1/Utazv84PCXLrjFpejKpzG03Sqhx2jfpnz+DN4Ol1XO9uKnoLrDezDK6LG98u/DnQD3SSBIHCujBNX5TRau9UIXK9cwd66ejgUJdc0uvIUlcIM+a/gqCBlIt/55eK3H85Xp+wgVQLV9DzckKQDXJwTS6k7OYV+kJHFL9/a+ZYpQTj6oAo1AgtOFjzopEkmShfXMU4KKYPTl6sSiK2kvOGVjv9VxPZlPjSe9gv0AEw== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d2eb0efd-b16d-4280-37a3-08da3cb3aa47 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:59:18.1359 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: g2aeO3MR4u1+c1CC+zkSVFpwEOppckEM7wqkHy1xAp1jOI3hUXxQWuM6S1TpIIjOxWKMOhsHBEBRdjOAUaGJzw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6417 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 From: Peng Fan Mark pinctrl_wdog as u-boot,dm-spl to clean up board code, The set_wdog_reset() function is not necessary as this is handled by the imx_watchdog.c driver due to the 'fsl,ext-reset-output' property being set. Signed-off-by: Peng Fan --- arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi | 4 ++++ board/kontron/sl-mx8mm/spl.c | 18 ------------------ 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi index 22d18e6f1cf..6882513f161 100644 --- a/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-kontron-n801x-u-boot.dtsi @@ -126,3 +126,7 @@ &wdog1 { u-boot,dm-spl; }; + +&pinctrl_wdog { + u-boot,dm-spl; +}; diff --git a/board/kontron/sl-mx8mm/spl.c b/board/kontron/sl-mx8mm/spl.c index a58a75dc958..63361f1d2ab 100644 --- a/board/kontron/sl-mx8mm/spl.c +++ b/board/kontron/sl-mx8mm/spl.c @@ -32,7 +32,6 @@ enum { #define GPIO_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) #define I2C_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE) -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) #define TOUCH_RESET_GPIO IMX_GPIO_NR(3, 23) @@ -50,10 +49,6 @@ static iomux_v3_cfg_t const touch_gpio[] = { IMX8MM_PAD_SAI5_RXD2_GPIO3_IO23 | MUX_PAD_CTRL(GPIO_PAD_CTRL) }; -static iomux_v3_cfg_t const wdog_pads[] = { - IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; - int spl_board_boot_device(enum boot_device boot_dev_spl) { switch (boot_dev_spl) { @@ -216,17 +211,6 @@ void spl_board_init(void) printf("Failed to find clock node. Check device tree\n"); } -int board_early_init_f(void) -{ - struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; - - imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); - - set_wdog_reset(wdog); - - return 0; -} - static int power_init_board(void) { struct udevice *dev; @@ -261,8 +245,6 @@ void board_init_f(ulong dummy) init_uart_clk(2); - board_early_init_f(); - timer_init(); /* Clear the BSS. */ From patchwork Mon May 23 12:40:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1634551 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=FaZd76Yv; 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 4L6GDn0Wzsz9sG0 for ; Mon, 23 May 2022 22:03:05 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E0218842C9; Mon, 23 May 2022 14:01:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="FaZd76Yv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8C66C841D6; Mon, 23 May 2022 13:59:51 +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.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on061c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::61c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 5146A842B0 for ; Mon, 23 May 2022 13:59:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NDdkZUBqEltScr6+IINDsiH/uVuViQPeCzVOVntuoderxI+sOjk8bQGjBzyBuHYxv4qemeoTJzBvo+JSTbungt6DldIK6bYG7+/NYOMPvjksrGqCcBAPRLOZvvSrBxnem3IfiBHyW4hrncUgeqzHPx95StFGBdw4RNPzhaOTNAUk5SIgEsOQVL8MU9iKjHD+lQOLO3XdvyTQZbLPH0FNrPGNlI4qjd6LjpEOxzb+FYVeFaMJUP3/+FGfeaqoaxTjzZZJSOffcMlv//iOQIT/+HX++LRciZCamNF/8C9WYrpJbBowmnzlraA9NlPoZpLtm2IMN6DPdCCE7L9XG9qg0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ivvNl8XO0DkmiKLHcJJAHIW8wXaCqVfP3KFmmcvKPUI=; b=R5tXnaiHUzvK6yIMMaGjy96LwAajh0FojEcyEW5X+Nn0VXNgMmGT3VPf+1UdqD+JFH916yRSwn7hkbERjZCpNnVIk4a4uvIbouyVyL+4MmMEgYcqjnAQRvr9NEU5Y49YzwAbUXIz81S+iKyPkEumCW0rZizMQDM+ANBn6UJ10Jrd4Lw9ScFzdTkUaqKC03uzxCF32wgJIZpXgXq20wZ29c8c362DmR+plinYYt1JUIJf6/JMAsRNkCo3cy4rMHXb9c0Y5IzVn0St8EcLR3wfDNGWj8uymT0dNaBgNTVjEu03NXt1cJw2t6S7T+gzcYofQFqybx5VnCtI3PtritmnZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ivvNl8XO0DkmiKLHcJJAHIW8wXaCqVfP3KFmmcvKPUI=; b=FaZd76YvcbYq9db5XBZuns94Virylz9957Y9/RH3Z/rFdwunzCv2oGYJaaPO1MQ5Y3IzEyUtrkrI6EL6JJU3X8ailwSDsyd3DUDykvJE8PISHiiVx3a/fXtkm1YhMi+skHl9lRy8CSWwU9364bpJk40ZXL92CN5wQ5YH/e/plLQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM0PR04MB6417.eurprd04.prod.outlook.com (2603:10a6:208:174::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22; Mon, 23 May 2022 11:59:20 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%7]) with mapi id 15.20.5273.020; Mon, 23 May 2022 11:59:20 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, Teresa Remmet Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH 22/22] imx: phycore_imx8mm/p: clean up board watchdog code Date: Mon, 23 May 2022 20:40:34 +0800 Message-Id: <20220523124034.12813-23-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220523124034.12813-1-peng.fan@oss.nxp.com> References: <20220523124034.12813-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0010.apcprd01.prod.exchangelabs.com (2603:1096:4:191::12) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a1830e8-996a-49c0-2c83-08da3cb3abcc X-MS-TrafficTypeDiagnostic: AM0PR04MB6417:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jNgCgSU4LWC7ROJSExDZf6WrRTe1G4VUlA3ankM1HQdjqaZih3xT8mAQAx2IP6ZRA0lZLxx8bQKTiF1irQiv8aJOBYr/ZzaPKpM5DHIJuPcoE1vqjjsrRY4vrxEooCQ9LOaPkc4lXef3lR/1OXA1Dsr1ujdDJkB30fVqsVSs7XQy4XST5hhy2U0E09hzi1UXXRSaAu/1ZI0AcU6Hyw5YpMsMltIk0Wx0PXumNpO4gAWwNvp8fkNP8eMALD08MnlOy+iLuwugu5aOM4pAhx0w9nITLeIflCBHaf3gtVHiSgbVhCg1LKm8lwTRuJnJmf9wwPHaPyWPaxdt4DIYllEmIKt+I3O5L2jEfi+E8UZH5JxerKR3Ja5vWAkmwO/Nz+qAkN7bEbE9YSBPBi0PTuQkxVu8oz0aIU7LPwqi9Ea+oLmte/dje1SsNNEpLTQIWQt0QjxncSJfru6jjO08gmqUNE7dNmj0AkIjjDk54yhYKcRVF5a4Ke+UxLe7Y9gx4apz6Qvx5O0wOvLwropF6WWM+rPUl+XFAH2LuuqddLUogWruB/WV6qMufgnMPtrtyiGrhXM/cu7raOBoxIKTblz4R5kFJKd4Rr3h6ReyGn7QFTsuNYCS7WxWSZ1iByU2+Vmz5jYyljjUXQevBpWdml0ZWdht49aiEnIJWOFIEJQW2FlVTFdeQ24zNu0+2qumC2ui8sRxkRH3d8WPS7xn24EzZA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(83380400001)(52116002)(5660300002)(86362001)(6486002)(316002)(6666004)(2906002)(508600001)(1076003)(6916009)(26005)(6506007)(66946007)(6512007)(66476007)(2616005)(38350700002)(38100700002)(8936002)(66556008)(186003)(4326008)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Be693XvQZRNFjdCjhxo61oFfOFmMi3FPRdQv2O7LXkSU+N0e4ILL67bo9CLXtywfGiPrbjQZkxVraOj/tODJGBsrZhBLaBcn7Q7j7XPJfj7bq8B0umLosY8WW+DRTE6gBwEQsu0jKMhY8AIadZzFaTP8GBsTayl2WC0pNeCw8YwWBM8B3xGci7Y+ffmSk42oQeBlJeSHNY5mRrHna6KAkjqfl97feSLaqekBFF0sl7kximZKs++PNlRQhaP24WCXLb/p73D88tGut821lUNFV69A/iC4K96EB6H2PFP34Us17H1q4Pvo0CpLypGNdV9FAu3lLhbPohYUb5bVAnNFmLoiPOtHEoejsA2VBV4ATFu5ip/mFU3e2RNcHGVInxDSKwfDw/uvtN4tbNNfWYxxSDw+gzkcD/tAgSYLvetM/yxkY/0Kn59+cST6dcCGCU6RQzc4N1HpMyEgQmhNed7arhFrgAZGpPgaFbBz4mqZFB+CwM2xiMelBak0x6EdgBTf3FI87nKRzXOmS8VSXwCb9GfQl3/B8mDUYpSG6juwk5csT2uJiBwAIlWJHXWNl8l6s06n1Y9sNVlTl4OHO9ABuFt2gBOBt7AGBd4crCwYZU8gO/7Ir8P2jvUVYhoWbBpc5HlXn4fMTDF5PGYLSx6hV4ehCtP2uw4EVWrD+XjMCNgrvJjR4h1WvRoC+XBIMNLbfz/oWEdmhPkGPt37TziRoUkEeOjUfuAvmOkfvmC2+PuCaRxstiOSQ2hh0prUhKP9fAeMwAee3xxoJ6C8c3ruMAwGucH2L7HoMPnDrtuUbly1DCRdrn7145Xqzl1sZQGwSJ80C3DzWSjI6TrMr1sActnUnTlrRFqMfBQt1gyfDlTejhly+b4vHXY9zv3USaXdVZdYZfkWivRKiNscNdH0yHOyL53WsdmhPNCN97hiDsZjArtnr4+ybh9VGRA/JoUbzvKtPu/LzqPQEcXpvq2L0DbS94mbEFI9oWel+APpMIZoatABuwDkE0hJr6/YKpwilexSrArId5GalP+sPHc6qsdkgDyiR1n2/raJKrOd/wXGe6syh080p3qDJm9JJO2rKm91veq42h1NLgkVBZd2A/WOEDC+fKD96UxUjIX/nadsXOQ9DWtR2P0ijmVx3YJcmG3qbLrbQJUI4APc2VuqHvp85Gm0rNZ9LsuUYiwIsdUtvrHyo9iXaW4n/w36u9l42Th+3sX7CyU0pvqabYqW0wm6Ai7/XnIwwJY1kwL6H4qAtEs4wpLM9aqwGlU3MSBZPlwbkBnbYthUL+zmBxFQvzAbS+D9RAArd/hmgvcyw0eRB98djRJ+1rzM5Aj+3sJlx8yUttLbvICKMP3KEu1zGgKFkQrtjSm4Nmumn5STtFhZUCaX9wA08kk2jbN4bK5q7cu9a6jpef7DLEbfTqIPpsWCV5O3NGmyFf0WytXMkbj9glbnFVm2Feq/kq4ogtQslqja7yuk/T+u25e5sS6EegzgWRa40Is44KWps/jNnLSAfW+6F80gA876gYEiMTJG8EpTC2VW2StxDHxOlAWG7XV7UiHgHerfua3An85lHlV3cIgcHAfXopV1ZW0FKjPx0XVXDjgQnSbgbijizSDNY5sI2eRasjdltkwJzlDE0Xub8sRipUR9hynk/jhIknyfzNIedrAeC6FzrlpaCt5n2xA7vaT51xsFnMse1KFPPw8jrQmFrYdJVr8UUQrL3ri9OqBw9KuOHcV4sbKG6kUUHQ== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a1830e8-996a-49c0-2c83-08da3cb3abcc X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 11:59:20.7005 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 37ZDOr+XCcuiFF0ZHfWglqP/1+RuD9KL+g8VbkzarG6ZkfY6IK9CjlDkRD08oNw/a025kNsK9Wc6Cn9Adqepbg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6417 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 From: Peng Fan pinctrl_wdog already marked u-boot,dm-spl, so clean up board code. The set_wdog_reset() function is not necessary as this is handled by the imx_watchdog.c driver due to the 'fsl,ext-reset-output' property being set. Signed-off-by: Peng Fan Tested-by: Teresa Remmet --- board/phytec/phycore_imx8mm/spl.c | 19 ------------------- board/phytec/phycore_imx8mp/spl.c | 19 ------------------- 2 files changed, 38 deletions(-) diff --git a/board/phytec/phycore_imx8mm/spl.c b/board/phytec/phycore_imx8mm/spl.c index 7f24a3affc8..d87ab6d4497 100644 --- a/board/phytec/phycore_imx8mm/spl.c +++ b/board/phytec/phycore_imx8mm/spl.c @@ -57,23 +57,6 @@ int board_fit_config_name_match(const char *name) return 0; } -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE) - -static iomux_v3_cfg_t const wdog_pads[] = { - IMX8MM_PAD_GPIO1_IO02_WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; - -int board_early_init_f(void) -{ - struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; - - imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); - - set_wdog_reset(wdog); - - return 0; -} - void board_init_f(ulong dummy) { int ret; @@ -82,8 +65,6 @@ void board_init_f(ulong dummy) init_uart_clk(2); - board_early_init_f(); - /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); diff --git a/board/phytec/phycore_imx8mp/spl.c b/board/phytec/phycore_imx8mp/spl.c index 38a581bef57..faed6fc3b76 100644 --- a/board/phytec/phycore_imx8mp/spl.c +++ b/board/phytec/phycore_imx8mp/spl.c @@ -89,23 +89,6 @@ int board_fit_config_name_match(const char *name) return 0; } -#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_ODE | PAD_CTL_PUE | PAD_CTL_PE) - -static iomux_v3_cfg_t const wdog_pads[] = { - MX8MP_PAD_GPIO1_IO02__WDOG1_WDOG_B | MUX_PAD_CTRL(WDOG_PAD_CTRL), -}; - -int board_early_init_f(void) -{ - struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; - - imx_iomux_v3_setup_multiple_pads(wdog_pads, ARRAY_SIZE(wdog_pads)); - - set_wdog_reset(wdog); - - return 0; -} - void board_init_f(ulong dummy) { int ret; @@ -114,8 +97,6 @@ void board_init_f(ulong dummy) init_uart_clk(0); - board_early_init_f(); - ret = spl_early_init(); if (ret) { debug("spl_early_init() failed: %d\n", ret);