From patchwork Mon Mar 27 18:41:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 746784 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vy8yR1DSFz9s8N for ; Tue, 4 Apr 2017 23:31:43 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id DB2E6C21C78; Tue, 4 Apr 2017 13:29:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAD_ENC_HEADER, KHOP_BIG_TO_CC, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 309D3C21C2C; Tue, 4 Apr 2017 13:27:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 81844C21C1F; Mon, 27 Mar 2017 18:41:20 +0000 (UTC) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0073.outbound.protection.outlook.com [104.47.42.73]) by lists.denx.de (Postfix) with ESMTPS id 80873C21BE5 for ; Mon, 27 Mar 2017 18:41:19 +0000 (UTC) Received: from BN3PR0301CA0010.namprd03.prod.outlook.com (10.160.180.148) by SN1PR0301MB1967.namprd03.prod.outlook.com (10.163.224.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14; Mon, 27 Mar 2017 18:41:15 +0000 Received: from BN1AFFO11FD011.protection.gbl (2a01:111:f400:7c10::153) by BN3PR0301CA0010.outlook.office365.com (2a01:111:e400:4000::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14 via Frontend Transport; Mon, 27 Mar 2017 18:41:15 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; mindspeed.com; dkim=none (message not signed) header.d=none; mindspeed.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD011.mail.protection.outlook.com (10.58.52.71) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.977.7 via Frontend Transport; Mon, 27 Mar 2017 18:41:14 +0000 Received: from oslab-l16.am.freescale.net ([10.213.172.226]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v2RIf6hF003976; Mon, 27 Mar 2017 11:41:11 -0700 From: York Sun To: Date: Mon, 27 Mar 2017 11:41:03 -0700 Message-ID: <1490640063-30786-3-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490640063-30786-1-git-send-email-york.sun@nxp.com> References: <1490640063-30786-1-git-send-email-york.sun@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131351136751768056; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39400400002)(39850400002)(39410400002)(39860400002)(39840400002)(39380400002)(39450400003)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(4326008)(50466002)(104016004)(2351001)(77096006)(7406005)(7416002)(189998001)(50986999)(76176999)(47776003)(85426001)(48376002)(110136004)(5003940100001)(575784001)(38730400002)(6666003)(36756003)(39060400002)(105606002)(2906002)(86362001)(50226002)(6916009)(33646002)(8676002)(8936002)(54906002)(81166006)(5660300001)(2950100002)(8656002)(53936002)(356003)(305945005)(106466001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0301MB1967; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD011; 1:l0huZVXhIslzfDo8YMJPL/xtjamLv9+94mItaKeAdMUwIpOEAKNl7NX5Tdj7WZxzLlA2Fpm2kRp36fDCZ7BW1EI/hUZFClfrKZKOOz3dM4jVOB9GjqjSlzLRlbN8NbapCgvxK+wBgu/KK4ogydm9LKnF4GTdLOjLpzmQi9mIxWlRk8E3IpasiM64kTHuTBanQCbdMWI7PoMXJG7vXFzu5l9C163qXNA39okzeA2xHT8dBUPNtLwvh3TMEknHvW1r9z+CpsvA3yqsWPKW1RQoIVZPQOwxSGF01oVNB/ga2Le13CPaW7tNFG7RSCjzEe0v73rKGe8c14PGUcs0RaJzyG4JS9m+KAh1SsPHzbBU90Z/q/HeO7drmRKwoCUsqXR7zk9q/xCvlJqtw6i0TLgV0pKE8IStrQ887pqogsxmXijcs8KSZ4gz8FIz/RnXaprikfKZ2Ew5ungUNvAn1LMxbVDXGED3I22dJFxQ91S+xmHqSwOyWvmNv/LMyPbEhULjfDc3UjvXQ8uxIxqIjIH7N95elkVUXmkQ+iMMGCLd3/qYisHMQQ9DF15KSXvwbD3FFNTwqpVQrTHzaebYCnEiMUOGYTuM0c6BUf7MV7/LRMkISbAWHfDzs+CTSaZDAUrbjsJliraOeZYGOWHUR7YQhw== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: c56b65b6-81a5-4969-7099-08d47540d963 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:SN1PR0301MB1967; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1967; 3:fE4MHHgEEdTFTag73PdvOP/JWQSJw4bfRjMbNn7Pyo1IQZNOncN3JnkD1G/s4HzZM/+kZv3lbZEsxWCEdMIRHHyoBDHnr7rAqF5/lIdIbmmvuTR2Eoke6891gvEir7oVIRTHqj1KjfcpyDGHysf1QCVfUhG74LlNomkfa29nbe0bkZ6cqIOwCMGnNZ0jW0AWXnOVEGodrh9N+xtlk8l05ZqIZ+35c9vOTkNdfcsKNvTwE+6VlroNNgQIREOPbxwRIb9TveBMuvbrqgkQSATY/TNaMS4ajkl9PR7w8apasz05g1TwmthYsH4JAp7y7zLV/opQe/68gV+0Gxlfyw4yYladWUIpzHXerUSbmSSpXC9m52po4atzgdERRB9WjE9W; 25:mJ06mYvWijx04XD8/xPML4+C92G7rUcaVgeATvGsq/Q6NlqDxYXdfnDxI03F7cVDqckuBq7UKbmhUsXl1oGU2Y/Y4omT/1iWhctuYzWWqftYjP40Y7ypwD3Hdc5QiYZcWGW8JUQRym3heeK4/uTBJBDITOD2SvwE+3NO3ndLrTR7RphFGZ94hXSj2vPU0Z2sxRY2771q2OjBcgF3AwSs5gn+CB4rcK2nmutcQOjyIKpL6s1KIzby2lL9uvUuzvq1zTofZxj288Rx9V+TkpfpukNqPv8rfAFkKeaS/8msCHZ1vEwco/heCxOKcEdAqPi9dM/2HIk+aEYyIWjxQBnokQ3tLfa0dgIbS8l3I4RXFUo4u3sPG1KgKZkMR+0/8B4rI5MLgONqEpjcrKrcxOeC+3SUz97evK3TUd8g9x1tUpjFm9B7etT44SGghrn3j4bwgNEUp1xbGkhmNz92JG5RoQ== X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1967; 31:MPjwpQawRyP7PAUDYgH6ok18W2zEHf81NysUfCBw9nrasznG0lU0kHU72xPY4C6bVRaabuQ3v2HjJeq3192d9TO3+tWNR7lGkeXkJEyFuCFabHPeoAD58JkcnBJxDBpr+Hq6nTQ/jYQY8CK1XHdBZ+/e9qRBHcd+U5cEdwbyfsqPNk3+E/+SUSP2uAgrlfizKEIaerjO7tDIP+p7/4D+O8+g6XesQNzW0TihFtiw5TTDekS4AQkCJlX53DIQnil1yDklq7xAqRTKH57oagXlXg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13017025)(13023025)(5005006)(13015025)(8121501046)(13024025)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123561025)(20161123556025)(20161123563025)(20161123565025)(20161123559025); SRVR:SN1PR0301MB1967; BCL:0; PCL:0; RULEID:(400006); SRVR:SN1PR0301MB1967; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1967; 4:ooovXHW8XazfeHYrTMwc33Mh5UpvKAaw/UGhuk4xvCZkG4yfB1+fELSAkL39FV0PL2Xvdd/ya/C6CTXHz33sP264yQCGQjhuQZnqIYKWCZ0UmxdT9EbT9muck9ES0dPu3QBCeDL5tQ531pSSkR2buRxFBic1xAxjvUc9HwhCpPai62hiBs9ugZMhwEmt/RDohh9j1tsD8Ri6Qu48icqWVOFe8fGrIMxAtrCDO+9Zs32KyLtV/Pzq8uZ2UtStMrwt0QNF7VuYw86mM5MuyUCYiaWkN0eM1M3n7C7M5IrI8P87gs+IfhXKlc4NvT7g0tnkyFrrAulhZFpCNfl4R9Nr2eokHCIWMSVf+HdF0na9OUM8KSJJjtKnHiHke0TNk1Us89FJDUmTXyM6bbfrU/Q7cMyXgGJX0RxF0kwhIwCyY69VbVdeBCrWiyN0G60YEKiuN0OXfKuoZNuSOSokdxGFJMiYFpzAE9ZYkkOG+Qbcy/9G0J3qr7AyBAHL3yV/1zITO2SjRXbm6TvdULYJAfB9DRJN4AaAuyBFLydIcjjwQcAbS4ZYeaZEuEqKM/DA8sIvsc/PDkR46BCk5JARDQ+yCPRsg+pTLLPyB80PiAqpcUeN2w7nOquDH2x0OGBbWb2ka4GQ7cRh3shz3WOn2xFJUdtCPuRcxMYZv79Rfu9asMiUN+h6mpZvyxmTULfIP27Fck3YH3C8eNLVJYjlxB/pV29LNQe32rt2nN0M4umaNRlzzm9lswrai2JF81Em7hto X-Forefront-PRVS: 02596AB7DA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0301MB1967; 23:nQcvSMqo+N1fWgRX5ohvNegOfNrcVNKl4wg6eJa?= =?us-ascii?Q?wEShy2sFT0uTF1ZfM4CZvsk6eGZ1ZAkGdw8jw2TpSN9hmV07nGPamwsQHmR0?= =?us-ascii?Q?8TlZBCyBN4T2B/bPtWTGeYUEnJS/eaZs2spZhTTDH8K+zVWKgYnkm9Ycn1UT?= =?us-ascii?Q?WP6jRhmVyTKQJAVvHhpU5LbhRhfw4LtFl/tDPhnwP7GrPmP3v2rA4+3h+lv5?= =?us-ascii?Q?jCm3Q+2qh2mLDK24DOERjFgRQv0iBKS6KSANbUm5HkwiPssUwpooMAuuIPTx?= =?us-ascii?Q?XL78rujQgjIret8uHnWJTwkxlgfqSe6G/Y1ovsQzoxaNKxNq7MyYa/oQLZFh?= =?us-ascii?Q?LWXB0zavLCMZ9J8uxq+hI/nq3nty3n6rTTnpz1y2/mp9aFnGNw6GXdqBIJYE?= =?us-ascii?Q?FtttzuGH+hp/YxE4TgChHb4NJGyc42SW4LeUXGFlK8WWat1NZ9qADxEvcPPS?= =?us-ascii?Q?IJT7jROeAxt9usVj08ry2usMQ0i/CjsdY1qLK2BnpiknD0dtqGbQCN9QFeIu?= =?us-ascii?Q?bwoUx/qmKlya6GfemgFYqTIGEV6CDZbN/Om0m/I3r0A7YD0MedO8cuhPujwF?= =?us-ascii?Q?PnPcMp+9OpVKkf+IUPUOe4gUh3vodtjcUL8evflVe6l5ccBM1EZ+ku9tj2gF?= =?us-ascii?Q?LrWl2JvpQ71pXm94tOby1XjSsD20GnU5NkrMDaUUDp5rfOUJeORdefGmgiF7?= =?us-ascii?Q?JvpfaL7OBWnRF+tQhgxv6odCrkMohG3G0W+SjF+QNo2MgjvQ4tU60oIER4Nq?= =?us-ascii?Q?CR5RaDGkFmhnQsViHrr/KyaPiazQEz3zs6aKwScLyYxa8AqTZjJ80jIENA7s?= =?us-ascii?Q?PpvgC2P9tKknuZE9FU2+gk+2SluHHby3WKZu7nQJQkZ2CH/c3f2WUvbW8xmk?= =?us-ascii?Q?69oH0hb6cGyC5CqcDcI+ANs5ghsxgOq4/rlhiPd+JGrI4l0jWJkSl5RXupn+?= =?us-ascii?Q?VHJ/oS9YxCH0TIVL9BSIT0rC46zIfUKBDRrTfJ5bP340aaXYAtX7jfNM1y56?= =?us-ascii?Q?zpnYuFfwzx2wR26rqN52a0mh/6vdSqOZiMRAXXH7QnRNBHXPuVHKVtFKZS5o?= =?us-ascii?Q?DpYbOxplqV5/Dq6fOCbDR+ep8s1k2/8MdHD+BqrA+TpYLvY4IXNSU/LrLSj9?= =?us-ascii?Q?Nccr7WelXAWOId7wRsISdu0kbpX7dM1LbsF50zFAXXIm8iJHvK5nlVu8hDhT?= =?us-ascii?Q?rWGB+KiAa4iLSaOsBNxq6g6kqfsfJkaKrRphcdAjvW+AgjVtUJw99YvR6V0p?= =?us-ascii?Q?scQwjqy94r3DBbUSw4SulTFkLM4kDNpAPUVGb58qx8GCj6sXY+xxiEOJmeE/?= =?us-ascii?Q?2HkN8K2N32UOcXXxUiKyCERE=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1967; 6:DPkLP7iw3PXARJB9v0IQkzvts5xx8TXl0ZqNETOrRr1n662W4GIV7XnnoQXPmWmzgc/5phL5TFqxOZKdmxD6hFLOGHdaXYmxS3Ply6p6KlgsGu3kWQCMrgn9B2zahW5FTd1UINXTD/JaJQlbXIHp8i3MzR9pI8+HVDggzhScYFzGiFwuG7UQDTkOiU+xG05cRPwXbXcB1D5W8amPIjjg8b8bE24snww+xxb/dDTIQvcsgP/Hrk8O+2//aL3RjK4PinT0yYrqC+nQ9o0vTgkRJMmQX8o2ImfBi628TvgNucP0lLQDrEpmL81PvB13lof7rUjpTv3D/JT1uPIIt8/aCmBfYjpL2zgYvoWsdFesvpG8n2YuNi4H0rX3ywt6vaLaE8dX1fy+SLtDrxG1sQrF02k3odbKZeV1+5aNdLKXnX0=; 5:RMlKdSvo7RsVageGw2LjRyep5f68lPCyVyqU1o/DR880Smi6Y3vMXSIImFvASgmRNesSVpFlbeAjOjtLobiK0Dv3SakSzT98NhhbrtSevQUNBtFEj+yAFi75DTLbRHo7QDQl1YK5sRQg/1qyREPFxp0OZHx3a/0ui2hcJfVWNwmJ67EhPUlv6vLEi6CrsTcD; 24:JPyznmtFongpUyZGE9Eu9W5vtg9xex4I4b84lwUqB+8qNX2zOu3na6KaPyrw3pWUiJ/LOmNrdZcI3dEpe9R04bXs3MN2YLW80pdxabTfiiQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB1967; 7:gorSSednXiF04ILyN2TOgoKyrdIvrFgkKce62+dE/IhihqwKx6RS0nOTCDtCsrnNd0aUBF3MHWOAEK8gj5pjklSCI77VrQOzRGn9PZRGOnmkCU2nKb2qAQI+Oh1PMbPVD00zO1WQrMLcDZyf2Bhwh2d4OgXeDzLd2aT6tiBIX+z77dlxaDEd7dY62vueVdyGdz2I9odZJAhHWXVceOZ7TYfjFMgZYeWbx3MkEb4tKEhgAB5z2+zHAdxOHVPZeLojCoqyTJtwD8dyTQCPbRRoPajGrBoe8/eABBFMslzAPeRyR7gOlYtDB/gApNxHxbx9QXtXAhvnQAlBNWvZ7KIr0w== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2017 18:41:14.7400 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0301MB1967 X-Mailman-Approved-At: Tue, 04 Apr 2017 13:27:33 +0000 Cc: Steve Rae , Saksham Jain , Jagan Teki , Stefan Roese , Ruchika Gupta , Makarand Pawagi , Marek Vasut , Udit Agarwal , Hongbo Zhang , Xiaoliang Yang , Feng Li , Hans de Goede , Alison Wang , Pratiyush Mohan Srivastava , Aneesh Bansal Subject: [U-Boot] [PATCH 3/3] armv7: ls1021a: Drop macro CONFIG_LS102XA X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Use CONFIG_ARCH_LS1021A instead. Signed-off-by: York Sun --- arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/dts/Makefile | 2 +- arch/arm/include/asm/arch-ls102xa/config.h | 2 +- arch/arm/include/asm/config.h | 2 +- board/freescale/common/arm_sleep.c | 6 +++--- board/freescale/common/fsl_chain_of_trust.c | 2 +- board/freescale/common/fsl_validate.c | 2 +- drivers/i2c/mxc_i2c.c | 2 +- drivers/qe/qe.c | 6 +++--- drivers/usb/common/fsl-errata.c | 2 +- include/configs/ls1021aiot.h | 2 -- include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atwr.h | 2 -- include/fsl_errata.h | 4 ++-- include/linux/immap_qe.h | 2 +- include/linux/usb/xhci-fsl.h | 2 +- include/tsec.h | 2 +- include/usb/ehci-ci.h | 2 +- scripts/config_whitelist.txt | 1 - 19 files changed, 20 insertions(+), 27 deletions(-) diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 02e8778..da491d4 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -12,7 +12,7 @@ obj-y += cache_v7.o cache_v7_asm.o obj-y += cpu.o cp15.o obj-y += syslib.o -ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_MX7)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_ARCH_SUNXI)$(CONFIG_ARCH_SOCFPGA)$(CONFIG_ARCH_MX7ULP)$(CONFIG_LS102XA),) +ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_MX7)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_ARCH_SUNXI)$(CONFIG_ARCH_SOCFPGA)$(CONFIG_ARCH_MX7ULP)$(CONFIG_ARCH_LS102XA),) ifneq ($(CONFIG_SKIP_LOWLEVEL_INIT),y) obj-y += lowlevel_init.o endif diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 0fbbb9b..6f18fd2 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -162,7 +162,7 @@ dtb-$(CONFIG_TARGET_AM57XX_EVM) += am57xx-beagle-x15.dtb \ am571x-idk.dtb dtb-$(CONFIG_TARGET_STV0991) += stv0991.dtb -dtb-$(CONFIG_LS102XA) += ls1021a-qds-duart.dtb \ +dtb-$(CONFIG_ARCH_LS1021A) += ls1021a-qds-duart.dtb \ ls1021a-qds-lpuart.dtb \ ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb \ ls1021a-iot-duart.dtb diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h index 2f7233f..5c4da0f 100644 --- a/arch/arm/include/asm/arch-ls102xa/config.h +++ b/arch/arm/include/asm/arch-ls102xa/config.h @@ -108,7 +108,7 @@ #define DCU_LAYER_MAX_NUM 16 -#ifdef CONFIG_LS102XA +#ifdef CONFIG_ARCH_LS1021A #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 #else diff --git a/arch/arm/include/asm/config.h b/arch/arm/include/asm/config.h index 1ad221a..5674d37 100644 --- a/arch/arm/include/asm/config.h +++ b/arch/arm/include/asm/config.h @@ -14,7 +14,7 @@ #define CONFIG_STATIC_RELA #endif -#if defined(CONFIG_LS102XA) || \ +#if defined(CONFIG_ARCH_LS1021A) || \ defined(CONFIG_CPU_PXA27X) || \ defined(CONFIG_CPU_MONAHANS) || \ defined(CONFIG_CPU_PXA25X) || \ diff --git a/board/freescale/common/arm_sleep.c b/board/freescale/common/arm_sleep.c index 16fd445..6ed5d9e 100644 --- a/board/freescale/common/arm_sleep.c +++ b/board/freescale/common/arm_sleep.c @@ -13,7 +13,7 @@ #endif #include -#if defined(CONFIG_LS102XA) +#if defined(CONFIG_ARCH_LS1021A) #include #endif @@ -66,7 +66,7 @@ static void dp_ddr_restore(void) *dst++ = *src++; } -#if defined(CONFIG_ARMV7_PSCI) && defined(CONFIG_LS102XA) +#if defined(CONFIG_ARMV7_PSCI) && defined(CONFIG_ARCH_LS1021A) void ls1_psci_resume_fixup(void) { u32 tmp; @@ -104,7 +104,7 @@ static void dp_resume_prepare(void) #ifdef CONFIG_U_QE u_qe_resume(); #endif -#if defined(CONFIG_ARMV7_PSCI) && defined(CONFIG_LS102XA) +#if defined(CONFIG_ARMV7_PSCI) && defined(CONFIG_ARCH_LS1021A) ls1_psci_resume_fixup(); #endif } diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c index 438e781..aad1b93 100644 --- a/board/freescale/common/fsl_chain_of_trust.c +++ b/board/freescale/common/fsl_chain_of_trust.c @@ -22,7 +22,7 @@ #include #endif -#ifdef CONFIG_LS102XA +#ifdef CONFIG_ARCH_LS1021A #include #endif diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c index 7396aa2..d814b66 100644 --- a/board/freescale/common/fsl_validate.c +++ b/board/freescale/common/fsl_validate.c @@ -15,7 +15,7 @@ #include #include #include -#ifdef CONFIG_LS102XA +#ifdef CONFIG_ARCH_LS1021A #include #endif diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index eb789f5..13ec0e6 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -589,7 +589,7 @@ static int bus_i2c_write(struct mxc_i2c_bus *i2c_bus, u8 chip, u32 addr, #endif static struct mxc_i2c_bus mxc_i2c_buses[] = { -#if defined(CONFIG_LS102XA) || defined(CONFIG_VF610) || \ +#if defined(CONFIG_ARCH_LS1021A) || defined(CONFIG_VF610) || \ defined(CONFIG_FSL_LAYERSCAPE) { 0, I2C1_BASE_ADDR, I2C_QUIRK_FLAG }, { 1, I2C2_BASE_ADDR, I2C_QUIRK_FLAG }, diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 4231594..4f0a278 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -13,7 +13,7 @@ #include #include #include -#ifdef CONFIG_LS102XA +#ifdef CONFIG_ARCH_LS1021A #include #endif @@ -355,7 +355,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware) size_t length; const struct qe_header *hdr; #ifdef CONFIG_DEEP_SLEEP -#ifdef CONFIG_LS102XA +#ifdef CONFIG_ARCH_LS1021A struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR; #else ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); @@ -494,7 +494,7 @@ int u_qe_upload_firmware(const struct qe_firmware *firmware) size_t length; const struct qe_header *hdr; #ifdef CONFIG_DEEP_SLEEP -#ifdef CONFIG_LS102XA +#ifdef CONFIG_ARCH_LS1021A struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR; #else ccsr_gur_t __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); diff --git a/drivers/usb/common/fsl-errata.c b/drivers/usb/common/fsl-errata.c index 6069c93..338ac08 100644 --- a/drivers/usb/common/fsl-errata.c +++ b/drivers/usb/common/fsl-errata.c @@ -204,7 +204,7 @@ bool has_erratum_a010151(void) case SVR_LS1043A: return IS_SVR_REV(svr, 1, 0) || IS_SVR_REV(svr, 1, 1); #endif -#ifdef CONFIG_LS102XA +#ifdef CONFIG_ARCH_LS1021A case SOC_VER_LS1020: case SOC_VER_LS1021: case SOC_VER_LS1022: diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index db29fa2b..92fa09a 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -7,8 +7,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_LS102XA - #define CONFIG_ARMV7_SECURE_BASE OCRAM_BASE_S_ADDR #define CONFIG_SYS_FSL_CLK diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 4fb8b0c..3801586 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -7,8 +7,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_LS102XA - #define CONFIG_ARMV7_PSCI_1_0 #define CONFIG_ARMV7_SECURE_BASE OCRAM_BASE_S_ADDR diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index c6438d5..dc06db3 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -7,8 +7,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_LS102XA - #define CONFIG_ARMV7_PSCI_1_0 #define CONFIG_ARMV7_SECURE_BASE OCRAM_BASE_S_ADDR diff --git a/include/fsl_errata.h b/include/fsl_errata.h index 8441f91..89051aa 100644 --- a/include/fsl_errata.h +++ b/include/fsl_errata.h @@ -10,7 +10,7 @@ #include #if defined(CONFIG_PPC) #include -#elif defined(CONFIG_LS102XA) +#elif defined(CONFIG_ARCH_LS1021A) #include #elif defined(CONFIG_FSL_LAYERSCAPE) #include @@ -66,7 +66,7 @@ static inline bool has_erratum_a008378(void) switch (soc) { -#ifdef CONFIG_LS102XA +#ifdef CONFIG_ARCH_LS1021A case SOC_VER_LS1020: case SOC_VER_LS1021: case SOC_VER_LS1022: diff --git a/include/linux/immap_qe.h b/include/linux/immap_qe.h index 6d1f88e..d952efa 100644 --- a/include/linux/immap_qe.h +++ b/include/linux/immap_qe.h @@ -24,7 +24,7 @@ #endif #endif -#ifdef CONFIG_LS102XA +#ifdef CONFIG_ARCH_LS1021A #define QE_MURAM_SIZE 0x6000UL #define MAX_QE_RISC 1 #define QE_NUM_OF_SNUM 28 diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h index e0dff30..bd54089 100644 --- a/include/linux/usb/xhci-fsl.h +++ b/include/linux/usb/xhci-fsl.h @@ -54,7 +54,7 @@ struct fsl_xhci { struct dwc3 *dwc3_reg; }; -#if defined(CONFIG_LS102XA) || defined(CONFIG_ARCH_LS1012A) +#if defined(CONFIG_ARCH_LS1021A) || defined(CONFIG_ARCH_LS1012A) #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_XHCI_USB1_ADDR #define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 diff --git a/include/tsec.h b/include/tsec.h index fb27edf..e99a7fa 100644 --- a/include/tsec.h +++ b/include/tsec.h @@ -20,7 +20,7 @@ #ifndef CONFIG_DM_ETH -#ifdef CONFIG_LS102XA +#ifdef CONFIG_ARCH_LS1021A #define TSEC_SIZE 0x40000 #define TSEC_MDIO_OFFSET 0x40000 #else diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h index 882aed4..8f3437a 100644 --- a/include/usb/ehci-ci.h +++ b/include/usb/ehci-ci.h @@ -159,7 +159,7 @@ #elif defined(CONFIG_MPC512X) #define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_MPC512x_USB1_ADDR #define CONFIG_SYS_FSL_USB2_ADDR 0 -#elif defined(CONFIG_LS102XA) +#elif defined(CONFIG_ARCH_LS1021A) #define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_EHCI_USB1_ADDR #define CONFIG_SYS_FSL_USB2_ADDR 0 #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 55bdaa0..d9c1d8f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1806,7 +1806,6 @@ CONFIG_LQ035Q1_SPI_CS CONFIG_LQ035Q1_USE_RGB565_8_BIT_PPI CONFIG_LQ035Q1_USE_RGB888_8_BIT_PPI CONFIG_LQ038J7DH53 -CONFIG_LS102XA CONFIG_LS102XA_STREAM_ID CONFIG_LSCHLV2 CONFIG_LSXHL