From patchwork Tue May 26 08:04:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1248 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id D0A543F08B for ; Tue, 26 May 2020 10:04:53 +0200 (CEST) Received: by mail-pj1-f70.google.com with SMTP id n19sf2027371pjo.0 for ; Tue, 26 May 2020 01:04:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1590480292; cv=pass; d=google.com; s=arc-20160816; b=YIIY/bIHhtvfVvydeGg3Yhvrx30QnYK6Kv7GhGnIaOj8I8ua6PRA3zUhYCJM+58Jc2 14BYbY4fQwp9pq79DlOzaF41sqQG41lTsxvdhEFNOaAnSNRJ5YZGD9rqCx0FrxAQPEQ5 GqvPQWBBYV0OBhdMLbsyeUuvF02aYiaZp1uVG+t111I9TLefPbHsUP0BnahD3/PJ0gGp NWDMCWupgelbQ1uCR/JWaO5Tmh0/dF0ITwO0MWcP7jASrwT5uhxh6vSSZzaGvZBwGCs9 fPDoCAYVjHU+eUdcQUp3p5FEbBJY6rHObwgYlHSrA8yr9DYP/bw/p3JXbDHNyuw1bjL1 0Jkg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=fZFagbnsDmS3SUpuo5N/BHUg/uJv2OxhbZ/rxi0ALkM=; b=mnva6zgw8s5Mw/zyZE21xQ+WV15H3D6ppit+UYq3J9xxznThqZitIZjNPsEFk5vM2a pKviMvYCpvETfUO/5vhA6XZ0UiKiUtpSAPFD7GkfXB0lSdcQHqH9i02lByWunkNyMbeh ricfYlgwlmzOlSWqOQkFczwzjl2sFlRO2gEvhaWSG/tin5oAZ74cmZNzGU3a5tWULRi1 pwvG6YB1CzAXXTtUT7yQTinUSIOM1/Fwadpfba+Zp3hMTUE9AVoHpY5UlE2G8sBgqvPI mXumGjk4i7O9F50BvBQGZcnFyUEpTJlSbfRcSoc3ETytNOA86jwKBMUOJykJ/VYHeNFZ SYwQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="bSbXKV/Y"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=fZFagbnsDmS3SUpuo5N/BHUg/uJv2OxhbZ/rxi0ALkM=; b=OOE8CGHWInLhHwk7P0mzkRDOCe0A3NnQTxs0jkrvPOYFW2BTHyR+IrJnMTB58XWLtH nL9VE6RdpbkrDmYUU+w0sEgp+GECXDdOUfR1sH0UrgpRm28cvSBBtIjLhEpT/k4kO2RQ y8CPeWg1ykkTn41gXE/0DJCFCQ5YoH7NwWf0g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=fZFagbnsDmS3SUpuo5N/BHUg/uJv2OxhbZ/rxi0ALkM=; b=ci2Qwq0dJDgxVUB9oupoGQLcqhgy7Q3LwLs86Rqzq+z9TE+yXc264Ogpxx/OpGzKbH 0BkpvJRPHVijpu88gaoItPwsVGEzpYgTgiXd5u6CR3PR8L1qa1aNqt2NM6aJrgk4nDUx p8GS85KlWGaPtkhRR8rJ//wuO497xLsXRN9axykBvagaP0BoKPm8gAelTVQio6eBmRyf nMpxaKDYJq8jMZEinpnoZGoOhH6LEwF21N13CMENo0aKMRl98E9m1+HODBT1yhZQuZwQ Zfa7qObBe28ljMA/CR5aBWosJ8/QcPGvJDTOHeEDvOWYwdHEg8UEXtochfSpZ28Gv0Nh WhGg== X-Gm-Message-State: AOAM531dGd0Nv6RyzRyVlqZq3P3Plq2oiP2oCtOXTT2FIQ1WQD3fgjTX NugKmIJCiK/FAePP+6R+VMYDF6OQ X-Google-Smtp-Source: ABdhPJyMUA/G5lUmL7ZESu/78ivTX1Nyf1xsurMHUMPsCjMlRt0r1aLIC9zszLhyp5WqOLqmmB9XrA== X-Received: by 2002:a63:712:: with SMTP id 18mr29484731pgh.96.1590480292620; Tue, 26 May 2020 01:04:52 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:90a:a610:: with SMTP id c16ls5673520pjq.0.gmail; Tue, 26 May 2020 01:04:52 -0700 (PDT) X-Received: by 2002:a17:90a:36c9:: with SMTP id t67mr21739618pjb.17.1590480292177; Tue, 26 May 2020 01:04:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590480292; cv=none; d=google.com; s=arc-20160816; b=BD/DLjN1vWw7OXp1sJqzctyfJsCE9vImkrZ33AB1XppHxhPWFiFRvQDrHnc80km9nv or6G3AI/S+TISKPJU+6m57JNBceSQQUAdUN2uKq3CnDjzW7SyG91WLTapD0typAcYQj+ YJLJrwOM0jzaU8PvJU0lROwcCpFSUinY6GYGJHvNT5U5kY8yOjKIrvBt4NLd2O7HS5IL uZ1Kqwvm3oaB+TFe/dK5BE4Jw4F6V1ppD5wOLrheRkR3ZkpM9BJJKgZ9VjUvCfmMI6xo TkZeRr96Z5pdaznSXkKgB3PjFxVBx9bjG7qszfWfgEhwySO0YJkQ6k5ekw0HreflJJx8 TEFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ncd0LU5mFhf4d1PQilHlSyrgyRhLr22U/SyZEK1JGZY=; b=r280gEiYm4ZFVLF8Smeys/B/Uozsr4URAGrqSmeghbIMCT7Kc94178h+wEURlphhw5 L/gCuN0Rg2axwgwLpbCupuvngDwRxYP0FOqR7BUKtIFlBvT6ZdsAZ+dqz7BNqOl5r1h/ VEOD72y/rGFCPpKfom3BYevXVpa1MWmrpOFiXIHVgGb+K+JOQUcCl6Tl7f1+3FV0K47v rlrjj6vXyXBBS36PUIW5JJNS94fBHYNjvICschkJn1duU5ZnupDdUllIphfgwOBTlzHp uCXtGrjs0jV+L1+gqfcC0LB5b6yS9WOVyRSfU7Yj7v4UpY0G3Z44cH2dh3jmNp/PrANW CNDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="bSbXKV/Y"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id lt19sor27245015pjb.31.2020.05.26.01.04.52 for (Google Transport Security); Tue, 26 May 2020 01:04:52 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:90a:332e:: with SMTP id m43mr24696900pjb.236.1590480291834; Tue, 26 May 2020 01:04:51 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:3:4404:74c7:87fd]) by smtp.gmail.com with ESMTPSA id d8sm14560782pfq.123.2020.05.26.01.04.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2020 01:04:51 -0700 (PDT) From: Jagan Teki To: Simon Glass , Tom Rini Cc: u-boot@lists.denx.de, linux-amarula@amarulasolutions.com, Jagan Teki , Vitaly Andrianov Subject: [PATCH 4/9] ks2_evm: Switch to DM_SPL, SPL_OF_CONTROL Date: Tue, 26 May 2020 13:34:25 +0530 Message-Id: <20200526080430.118262-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200526080430.118262-1-jagan@amarulasolutions.com> References: <20200526080430.118262-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="bSbXKV/Y"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This would make SPL build to DM_SPL, SPL_OF_CONTROL. Build fine with but not tested. Cc: Vitaly Andrianov Signed-off-by: Jagan Teki --- configs/k2e_evm_defconfig | 2 ++ configs/k2g_evm_defconfig | 2 ++ configs/k2hk_evm_defconfig | 2 ++ configs/k2l_evm_defconfig | 2 ++ include/configs/ti_armv7_keystone2.h | 8 -------- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/k2e_evm_defconfig b/configs/k2e_evm_defconfig index 644b6e5464..9f91fb9598 100644 --- a/configs/k2e_evm_defconfig +++ b/configs/k2e_evm_defconfig @@ -36,11 +36,13 @@ CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2e-evm" CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SPL_DM=y CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y CONFIG_MISC=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index 5bc7f7f865..fb8fb250da 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -34,6 +34,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2g-evm" CONFIG_OF_LIST="keystone-k2g-generic keystone-k2g-evm keystone-k2g-ice" CONFIG_DTB_RESELECT=y @@ -41,6 +42,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y +CONFIG_SPL_DM=y CONFIG_DFU_MMC=y CONFIG_SYS_I2C_DAVINCI=y CONFIG_MISC=y diff --git a/configs/k2hk_evm_defconfig b/configs/k2hk_evm_defconfig index eb5916c2c6..1cd7331653 100644 --- a/configs/k2hk_evm_defconfig +++ b/configs/k2hk_evm_defconfig @@ -36,11 +36,13 @@ CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2hk-evm" CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SPL_DM=y CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y CONFIG_MISC=y diff --git a/configs/k2l_evm_defconfig b/configs/k2l_evm_defconfig index 71a35e3496..ae4b26b7a9 100644 --- a/configs/k2l_evm_defconfig +++ b/configs/k2l_evm_defconfig @@ -36,11 +36,13 @@ CONFIG_MTDIDS_DEFAULT="nand0=davinci_nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:1024k(bootloader)ro,512k(params)ro,-(ubifs)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="keystone-k2l-evm" CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y +CONFIG_SPL_DM=y CONFIG_SYS_I2C_DAVINCI=y CONFIG_TI_AEMIF=y CONFIG_MISC=y diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 1b014c1022..37210b2605 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -53,10 +53,6 @@ /* UART Configuration */ #define CONFIG_SYS_NS16550_MEM32 -#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL) -#define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE -4 -#endif #define CONFIG_SYS_NS16550_COM1 KS2_UART0_BASE #define CONFIG_SYS_NS16550_COM2 KS2_UART1_BASE @@ -77,10 +73,6 @@ #define CONFIG_SYS_SPI2 #define CONFIG_SYS_SPI2_BASE KS2_SPI2_BASE #define CONFIG_SYS_SPI2_NUM_CS 4 -#ifdef CONFIG_SPL_BUILD -#undef CONFIG_DM_SPI -#undef CONFIG_DM_SPI_FLASH -#endif /* Network Configuration */ #define CONFIG_BOOTP_DEFAULT