From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4B7C4C32793 for ; Wed, 24 Aug 2022 12:44:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DA4F18482F; Wed, 24 Aug 2022 14:44:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=softathome.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=softathome1.onmicrosoft.com header.i=@softathome1.onmicrosoft.com header.b="pRfBSmvm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E769F8482F; Wed, 24 Aug 2022 14:44:08 +0200 (CEST) Received: from FRA01-MR2-obe.outbound.protection.outlook.com (mail-eopbgr90082.outbound.protection.outlook.com [40.107.9.82]) (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 2396B8483F for ; Wed, 24 Aug 2022 14:44:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=softathome.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=philippe.reynes@softathome.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OE6aC1MKYOqbaeu1RFlSiIK0rTZHhsefhLyztclf1QlzPvOj75cQN/5dww9kh5BQzGxGVMLHUYg08YA+z1QAo7Kkva4X0pHGCY2pvFUk0pznwSRZ95VkreOQ5lKiZk1YvWVESu/KXeLL7khifiCSbWojzWjgjgr/K0xitFuZMgSUrJNboeFwHmIBLmhK6VIPALiwONNl5st5516XydnWhbnuX/soxKcyP7P5gxLKT+oUJwyDmaBQvOiFDT6syO8E2T6QwTf54+3Fv1SzsgDiKjkNtmPiCVnGBo2USEynxcJ06axcd0zkSPujCqPi5nlsLJRe+FBHj+6z19z775UYnw== 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=zI2yChzGtMVNU4vFutNPBzeyt0uH7PWJRZzqBCqgU/U=; b=Flv7n58866xwpV5mYgufWZdDy1+SkUyyY9vYlgEF/Jr7HF9Kxk4ZYQt7AJLeQ5WZc8qpZaLuJjVV1kO5TfYy63egNhGTxU/7tqtb0tqbdTZAbCjSvgYDUDd0x8bLmbmW6dpyXMRnJA3XifRIJ9V0+G1HbUTCwSEf8JqUoY9X4TtPAziudXQetuCtx69GzSVMia7mgkNgEJYfSI+EMTbR6QtX/96aK1XT8VQOzxYQhwHcebYAGIN+OSSr96KWnJJA63iIMN1xzkwxhhHscMkpquvXLKx4/8rEgxT/LSUPPNZs82Y+jQW1m6w08kEC/QoTsbbZweCHt8vu3OJn2EJ3hw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=softathome.com; dmarc=pass action=none header.from=softathome.com; dkim=pass header.d=softathome.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=softathome1.onmicrosoft.com; s=selector1-softathome1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zI2yChzGtMVNU4vFutNPBzeyt0uH7PWJRZzqBCqgU/U=; b=pRfBSmvm2mp5+lVlFPPdQsS3Ke7Yeekst3Vn/BPTwn83hbpNT31OBK42BDXeUPtR33zqkBM54m5v00Phx8NHvdB3woSIx+Qur2xOG2C43IB0le0Gni7LqLf16qYkKry9RYnRn9kUzujvcz3gCZ/T5BaeSQxRDKl5WoZx1iapDN8SzH7M88tQHA03LRKfa4+nTKPhX9wPLfnq1Mh04v0NvzoXzL1CeCmlpB4eVuaLLwbXwfi75UM7Zwfj6wWxncdgDbDAQPWK7qqQA0BiOgOzRc03I0PPH5gk+wrxfPr6kuTWJ0ajZtKSv9bdGXW3KjLWAWSbNMHGf7C1e68SKTDFew== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=softathome.com; Received: from PR0P264MB2741.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1d0::9) by PAYP264MB3352.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:124::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Wed, 24 Aug 2022 12:44:03 +0000 Received: from PR0P264MB2741.FRAP264.PROD.OUTLOOK.COM ([fe80::fc9c:2a8f:2e0:e88d]) by PR0P264MB2741.FRAP264.PROD.OUTLOOK.COM ([fe80::fc9c:2a8f:2e0:e88d%9]) with mapi id 15.20.5566.015; Wed, 24 Aug 2022 12:44:02 +0000 Message-ID: <6b01d2f6-7cf0-4a50-c749-b1e82bac8299@softathome.com> Date: Wed, 24 Aug 2022 14:44:01 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH v3 2/5] arm: bcmbca: remove bcm63158 support under CONFIG_ARCH_BCM63158 Content-Language: en-US To: William Zhang , U-Boot Mailing List Cc: rafal@milecki.pl, anand.gore@broadcom.com, joel.peshkin@broadcom.com, dan.beygelman@broadcom.com, f.fainelli@gmail.com, kursad.oney@broadcom.com, Andre Przywara , Bharat Gooty , Christian Hewitt , Fabio Estevam , Rayagonda Kokatanur , Rick Chen , Samuel Holland , Sean Anderson , Simon Glass , Tom Rini , Tomer Yacoby , Wolfgang Denk , "Ying-Chun Liu (PaulLiu)" References: <20220822181948.21333-1-william.zhang@broadcom.com> <20220822110438.v3.2.I48b23c96528a6cbf4b37849d4cee0d6443767bf3@changeid> From: Philippe REYNES In-Reply-To: <20220822110438.v3.2.I48b23c96528a6cbf4b37849d4cee0d6443767bf3@changeid> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ClientProxiedBy: PR0P264CA0217.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::13) To PR0P264MB2741.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1d0::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3fe909a0-b1f0-461e-fd05-08da85ce52d3 X-MS-TrafficTypeDiagnostic: PAYP264MB3352:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oO4O9TtFAFRm8mFJdgh8uVmnbrzL2SOizHSdQTHoiiA6o6yF1v+YEhk66VIwZDgDYprsolbyD+CXSGoUDlCYQ2n5A8uUEfZ1bAxWhdf6NQxoBPGy4F8nzMSXFfKnIok56P2BX1W6X2OeXI9O0jJFag7zuVnMy+hOfuAWZmFJet1EPCBMtV6sy/qtZoMpKSuh0Y2rfrH+srkKDZ4O0tBuIsebCRflCN4b+esyJhf4s5S4k/JVedQffUVsA+mvoAlMbhETs45iTq4SswPBv7JlYQGAMW3fY5MjlTs42E0PzeS7oY02k2/9cDme6bBEia6tdsFRo10w3Th/Zl/KxF44lTxbMuOx6NWTB0pNNbu7hcZ1PyrO1rgIzxpw0r0p+7sHUHynzcx6Dg9yqr+F0tsf6nl6Fgxe2lIGZLldNjpXy4QoxLV/UBxJNYjZdw0mI4zg6UwKj0Cov4I46OA5Oj2/5ra2i4sEk0Kl/Nmsyaf7RHK47IAqvwXo8PZB14fkgE1tilDQImh2NmWDr8O8T/wgl7SscCdc/xZj+V1b2vra/frkeXQzK871rOqtQAgq+5Ok0IYgJdBgzrZpVHFdryYXQASXhloovLWH5diyZl49tcW5XPmxJ+w/bfdV4X1NXn+b8ou2VTQfbJJqHfFsCigTDuqmfKDTt2w6AHBveP3frtzzQWH9jbW7IytXD3s32DdFHmK0bMSmRHrKNvjaApdq7xcCr0gGILgp1Se8YeSq8hNgQjrgBXQoQZIu+yBUUoLUICV64Y0zc4QQJ02wfdHNpe9w0xPJetRWf/qu1k02uqQ= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PR0P264MB2741.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230016)(4636009)(396003)(366004)(136003)(376002)(39850400004)(346002)(66946007)(66476007)(66556008)(38100700002)(2616005)(8676002)(186003)(31686004)(66574015)(83380400001)(2906002)(7416002)(5660300002)(4326008)(41300700001)(6512007)(6506007)(26005)(82960400001)(8936002)(316002)(478600001)(36756003)(110136005)(54906003)(31696002)(86362001)(6486002)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aDdySThQanNINFczbldrVkpIcytaMnY0Y1h4WGFhUHkyOXlHVVBQV1BXT3dx?= =?utf-8?B?bE94emRWT0ZUSitKaytraFo0eWlITUtDTWEyVk5pMmQzMy8vaG5xb1d6RzhG?= =?utf-8?B?Qy9jM2lMTDZNZGFKZWJUOEJrR1BNSjQyOURqTFJPZXBrU3dyTHZxcXhEU01F?= =?utf-8?B?R0tXVUcxV3JWbXFVWi94ZWM1RzIybUY2dW9iOHJMRmtJYTFydDEwVVpUNkJP?= =?utf-8?B?UUhqczNPYUd5QWxyTHR0aUluUDA1RG9nWmREYi9NQlVxQmF0ZDVINDh6THVw?= =?utf-8?B?MGsxL0R4cG5VcytNeFVrNWE0UERlMlJBdUxVMlZJdm9INThRS3V1dFZZSTdo?= =?utf-8?B?Zzg3dCtkTHR3RzhOVUtFbENtNnNrUHJrV3JrRjZPUktJNW9SSlUxbmg5Zisx?= =?utf-8?B?VVp3STZhakJNQ0o1SWhVWXpEeXdtQ2Q5NldJeUhtQkNxcU4vdXpSZ0QyQUFp?= =?utf-8?B?YTBDS0NCUEUzQThDVlpyOStRQ0l2akNreEtGd0Y4cm5QUEVQbGE3K0lXWFF3?= =?utf-8?B?UU5rZThOM0p5enpIQ04zRkF3bUw3Yytnd0J4Z3g5aVNWVHpzYjdOZTFscmR1?= =?utf-8?B?K1NFNlJrcVZkWHBiOEZLNkVkdG5Gcko4VndsQWFHWkRIMEtmUG1pSnozNWNI?= =?utf-8?B?WnRnNktUczQyQUZ2NmZ0eFAxUVA4ZmJNZEV0MHhyRTVKWVcyUmZNUG5tempP?= =?utf-8?B?cFprZkRZRU5VbUFZUkYrdzRvTmxKc1VEdU40a2pUcUJMc1p4ZHFBcFVFdUp1?= =?utf-8?B?ZEVGODBtZGFMUy9neU5ob2tNSUJ3VUhLamVaTDJqSlNUT3dMUWwxWTM5NmpC?= =?utf-8?B?SmZxQjJwUGVhRlVzOVpYckZuOVlmcWtXK1dlUEdtdmdGUGtCWmtaY1N5SElx?= =?utf-8?B?aG85UEJOUHpKWlRWWWN6ckNoK3JrZWFrSkd4R1ZveFdCTmNNcmQrTzNjcGNp?= =?utf-8?B?a1JxT01QM2ZEemJTczZmZitETWpYVU85NU1xVW04dVMveFhBemM1SUJqZFph?= =?utf-8?B?U0dpekRDcHBFZEdNR1hpU1dybEpUYjd0cUlsSkRZVWRabEpOSTNmTjQrUm1x?= =?utf-8?B?T1ZUZENZV2EwVTNlRDBIY2RRQmRvSTFQM2NNdkZEMFlQNDQ5UVBtZ3JEMks4?= =?utf-8?B?T0lNRDVQS3F5OE5QQ2dwQ2c2MVkwRTY3Z2NRTnc3d00yaXB0RzhmRkhIM2Zt?= =?utf-8?B?MUtsSXpyMXhkYmZsWDM2TVQ4bzRnbitsUXh1N3ZzM2Mrbm55eHU5RHlKZys1?= =?utf-8?B?SnpIUk9pK3drdENrUit1bXNqRVFVZ3F3cEYrOFZ6QUU0VWRDeHRtVW9jWlJS?= =?utf-8?B?aEFSaFlYbU5SZGM1cHBmS2puamN1VW5GOHZINHJycEVZUlFKZFFwdEtodERB?= =?utf-8?B?WFZFSXdzMi9FNG4vQUU2TS9oWC9KS28vR2RhU0p2T2RHTHNRdUx0VmoyalhU?= =?utf-8?B?WHZSVmNZaGxRU2VnNlZya2VoRENJanhKZmdYN2xwS2t6TC9aREFPcHlyREFF?= =?utf-8?B?SjAxa0Q5MTg1Skh5aGVVdVhtNWlSQTlIQkEvTFlYVnJyai9TZzN1Yk1MSzN2?= =?utf-8?B?amYweGFtUG5jQlRTR2I3eU8vc0VpUEVURXNGR2J2TTZhVXE0Y1ZsS21FSW14?= =?utf-8?B?R0VTQmVyMm5CT1ltd1o3dHZKRnVic2NEaUZRZnRlSng3RnJMcWgzUENSUnNJ?= =?utf-8?B?Wi9RUGlKUHFpM3pmaUJHczJYaVI4RFJHRzViYm41dUgwNGh4Q2NQYmxrSjRt?= =?utf-8?B?M05YRCs0NXVZOHhJSjloV1J5UkNwYnViQ2JTM0xhUGVSeVdUL2lxK2RkYXdJ?= =?utf-8?B?OFJZaVQ3Tng4VUlBNVhpSXNZQzZQTFRCcTd2WVZCOC9tREhhN2hKMmVQdDVB?= =?utf-8?B?NGlKWFNMMEdYMkNEMXVCTE8vbmpnNXFVSWZXUFRZRklzcXZXTVNvY0lxNDU4?= =?utf-8?B?SUpvUlVhaDE3T3BNSzJWeVBLTUpnbGFoQnRSaExFMkp4enlTazZYakFTdU1v?= =?utf-8?B?SGY0ODBCQ2tvN05DZEQyM2tYQ3l3ZjREbkVLa1RPQ3J1WFJkdGNwamRTLzZo?= =?utf-8?B?djRZaW0weGJ6d1NYZWg2NEovb1ZCUmJ4azZzOTc5SXk5K3pCN2hScnhyOXJV?= =?utf-8?B?cWZZSGRnczZxc2JNaWRtUXFWRFlEdDlTa3ZwK2FKdGZXUmg2NzF0OUZiQUhO?= =?utf-8?Q?wzODmmWOtRwlseOWn3aN4C0=3D?= X-OriginatorOrg: softathome.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3fe909a0-b1f0-461e-fd05-08da85ce52d3 X-MS-Exchange-CrossTenant-AuthSource: PR0P264MB2741.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2022 12:44:02.8228 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: aa10e044-e405-4c10-8353-36b4d0cce511 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: H3LYbnYsB4TH/VwDCtW0U7b5dJxFcJw86RMXbi/OWAfVau+XqB3Ghibo/q4dh2zTFBaDvqVPAvtaP513mMgZl7ZD+FKaWBM3NF995DQ9eQI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAYP264MB3352 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Hi William, Le 22/08/2022 à 20:19, William Zhang a écrit : > Now that BCM63158 is supported under CONFIG_ARCH_BCMBCA and > CONFIG_BCM63158, remove the original ARCH_BCM63158 support and migrate > configuration settings. > > Signed-off-by: William Zhang Reviewed-by: Philippe Reynes > > --- > > (no changes since v2) > > Changes in v2: > - Remove bcm963158_ram_defconfig per discussion with Philippe as a > basic config version of bcm963158_defconfig is now added. > > arch/arm/Kconfig | 8 +--- > arch/arm/dts/Makefile | 3 -- > board/broadcom/bcm963158/Kconfig | 17 ------- > board/broadcom/bcm963158/MAINTAINERS | 6 --- > board/broadcom/bcm963158/Makefile | 3 -- > board/broadcom/bcm963158/bcm963158.c | 62 ------------------------- > configs/bcm963158_ram_defconfig | 67 ---------------------------- > include/configs/bcm963158.h | 4 ++ > include/configs/broadcom_bcm963158.h | 32 ------------- > 9 files changed, 5 insertions(+), 197 deletions(-) > delete mode 100644 board/broadcom/bcm963158/Kconfig > delete mode 100644 board/broadcom/bcm963158/MAINTAINERS > delete mode 100644 board/broadcom/bcm963158/Makefile > delete mode 100644 board/broadcom/bcm963158/bcm963158.c > delete mode 100644 configs/bcm963158_ram_defconfig > delete mode 100644 include/configs/broadcom_bcm963158.h > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 0d4903a2eb5b..da4defa08466 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -665,12 +665,6 @@ config ARCH_BCM283X > imply CMD_DM > imply FAT_WRITE > > -config ARCH_BCM63158 > - bool "Broadcom BCM63158 family" > - select DM > - select OF_CONTROL > - imply CMD_DM > - > config ARCH_BCM6753 > bool "Broadcom BCM6753 family" > select CPU_V7A > @@ -706,6 +700,7 @@ config ARCH_BCMBCA > bool "Broadcom broadband chip family" > select DM > select OF_CONTROL > + imply CMD_DM > > config TARGET_VEXPRESS_CA9X4 > bool "Support vexpress_ca9x4" > @@ -2284,7 +2279,6 @@ source "board/Marvell/octeontx2/Kconfig" > source "board/armltd/vexpress/Kconfig" > source "board/armltd/vexpress64/Kconfig" > source "board/cortina/presidio-asic/Kconfig" > -source "board/broadcom/bcm963158/Kconfig" > source "board/broadcom/bcm96753ref/Kconfig" > source "board/broadcom/bcm968360bg/Kconfig" > source "board/broadcom/bcm968580xref/Kconfig" > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index a7fc3d7d7021..c55bc3569662 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -1147,9 +1147,6 @@ dtb-$(CONFIG_ARCH_BCM283X) += \ > bcm2837-rpi-cm3-io3.dtb \ > bcm2711-rpi-4-b.dtb > > -dtb-$(CONFIG_ARCH_BCM63158) += \ > - bcm963158.dtb > - > dtb-$(CONFIG_ARCH_BCM68360) += \ > bcm968360bg.dtb > > diff --git a/board/broadcom/bcm963158/Kconfig b/board/broadcom/bcm963158/Kconfig > deleted file mode 100644 > index 08a8bc1c14d3..000000000000 > --- a/board/broadcom/bcm963158/Kconfig > +++ /dev/null > @@ -1,17 +0,0 @@ > -if TARGET_BCM963158 > - > -config SYS_VENDOR > - default "broadcom" > - > -config SYS_BOARD > - default "bcm963158" > - > -config SYS_CONFIG_NAME > - default "broadcom_bcm963158" > - > -endif > - > -config TARGET_BCM963158 > - bool "Support Broadcom bcm963158" > - depends on ARCH_BCM63158 > - select ARM64 > diff --git a/board/broadcom/bcm963158/MAINTAINERS b/board/broadcom/bcm963158/MAINTAINERS > deleted file mode 100644 > index d28d971f9d36..000000000000 > --- a/board/broadcom/bcm963158/MAINTAINERS > +++ /dev/null > @@ -1,6 +0,0 @@ > -BROADCOM BCM963158 > -M: Philippe Reynes > -S: Maintained > -F: board/broadcom/bcm963158/ > -F: include/configs/broadcom_bcm963158.h > -F: configs/bcm963158_ram_defconfig > diff --git a/board/broadcom/bcm963158/Makefile b/board/broadcom/bcm963158/Makefile > deleted file mode 100644 > index 0a902c9cf618..000000000000 > --- a/board/broadcom/bcm963158/Makefile > +++ /dev/null > @@ -1,3 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0+ > - > -obj-y += bcm963158.o > diff --git a/board/broadcom/bcm963158/bcm963158.c b/board/broadcom/bcm963158/bcm963158.c > deleted file mode 100644 > index 9feaee3c0fc4..000000000000 > --- a/board/broadcom/bcm963158/bcm963158.c > +++ /dev/null > @@ -1,62 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * Copyright (C) 2019 Philippe Reynes > - */ > - > -#include > -#include > -#include > -#include > - > -#ifdef CONFIG_ARM64 > -#include > - > -static struct mm_region broadcom_bcm963158_mem_map[] = { > - { > - /* RAM */ > - .virt = 0x00000000UL, > - .phys = 0x00000000UL, > - .size = 8UL * SZ_1G, > - .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | > - PTE_BLOCK_INNER_SHARE > - }, { > - /* SoC */ > - .virt = 0x80000000UL, > - .phys = 0x80000000UL, > - .size = 0xff80000000UL, > - .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | > - PTE_BLOCK_NON_SHARE | > - PTE_BLOCK_PXN | PTE_BLOCK_UXN > - }, { > - /* List terminator */ > - 0, > - } > -}; > - > -struct mm_region *mem_map = broadcom_bcm963158_mem_map; > -#endif > - > -int board_init(void) > -{ > - return 0; > -} > - > -int dram_init(void) > -{ > - if (fdtdec_setup_mem_size_base() != 0) > - printf("fdtdec_setup_mem_size_base() has failed\n"); > - > - return 0; > -} > - > -int dram_init_banksize(void) > -{ > - fdtdec_setup_memory_banksize(); > - > - return 0; > -} > - > -int print_cpuinfo(void) > -{ > - return 0; > -} > diff --git a/configs/bcm963158_ram_defconfig b/configs/bcm963158_ram_defconfig > deleted file mode 100644 > index 424eca7946b8..000000000000 > --- a/configs/bcm963158_ram_defconfig > +++ /dev/null > @@ -1,67 +0,0 @@ > -CONFIG_ARM=y > -CONFIG_SKIP_LOWLEVEL_INIT=y > -# CONFIG_ARM64_SUPPORT_AARCH32 is not set > -CONFIG_ARCH_BCM63158=y > -CONFIG_SYS_TEXT_BASE=0x10000000 > -CONFIG_SYS_MALLOC_LEN=0x100000 > -CONFIG_SYS_MALLOC_F_LEN=0x8000 > -CONFIG_NR_DRAM_BANKS=1 > -CONFIG_ENV_SIZE=0x2000 > -CONFIG_DM_GPIO=y > -CONFIG_DEFAULT_DEVICE_TREE="bcm963158" > -CONFIG_SYS_LOAD_ADDR=0x10000000 > -CONFIG_TARGET_BCM963158=y > -CONFIG_ENV_VARS_UBOOT_CONFIG=y > -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y > -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x11000000 > -CONFIG_FIT=y > -CONFIG_FIT_SIGNATURE=y > -CONFIG_FIT_RSASSA_PSS=y > -CONFIG_FIT_VERBOSE=y > -CONFIG_LEGACY_IMAGE_FORMAT=y > -CONFIG_SUPPORT_RAW_INITRD=y > -CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_HUSH_PARSER=y > -CONFIG_SYS_MAXARGS=24 > -CONFIG_SYS_CBSIZE=256 > -CONFIG_SYS_PBSIZE=276 > -CONFIG_SYS_BOOTM_LEN=0x1000000 > -# CONFIG_CMD_LZMADEC is not set > -# CONFIG_CMD_UNZIP is not set > -# CONFIG_CMD_FLASH is not set > -CONFIG_CMD_GPIO=y > -CONFIG_CMD_MTD=y > -CONFIG_CMD_NAND=y > -CONFIG_CMD_CACHE=y > -CONFIG_DOS_PARTITION=y > -CONFIG_ISO_PARTITION=y > -CONFIG_EFI_PARTITION=y > -CONFIG_SYS_RELOC_GD_ENV_ADDR=y > -# CONFIG_NET is not set > -CONFIG_BLK=y > -CONFIG_CLK=y > -CONFIG_BCM6345_GPIO=y > -CONFIG_LED=y > -CONFIG_LED_BCM6858=y > -CONFIG_LED_BLINK=y > -# CONFIG_MMC is not set > -CONFIG_MTD=y > -CONFIG_DM_MTD=y > -CONFIG_MTD_RAW_NAND=y > -CONFIG_NAND_BRCMNAND=y > -CONFIG_NAND_BRCMNAND_63158=y > -CONFIG_SYS_NAND_ONFI_DETECTION=y > -CONFIG_DM_SPI_FLASH=y > -CONFIG_SPI_FLASH_MACRONIX=y > -CONFIG_SPECIFY_CONSOLE_INDEX=y > -CONFIG_CONS_INDEX=0 > -CONFIG_DM_SERIAL=y > -CONFIG_SERIAL_SEARCH_ALL=y > -CONFIG_PL01X_SERIAL=y > -CONFIG_SPI=y > -CONFIG_DM_SPI=y > -CONFIG_BCM63XX_HSSPI=y > -CONFIG_SYSRESET=y > -CONFIG_SYSRESET_WATCHDOG=y > -CONFIG_WDT_BCM6345=y > -# CONFIG_GENERATE_SMBIOS_TABLE is not set > diff --git a/include/configs/bcm963158.h b/include/configs/bcm963158.h > index b15c4111c967..f47396335868 100644 > --- a/include/configs/bcm963158.h > +++ b/include/configs/bcm963158.h > @@ -8,4 +8,8 @@ > > #define CONFIG_SYS_SDRAM_BASE 0x00000000 > > +#ifdef CONFIG_MTD_RAW_NAND > +#define CONFIG_SYS_MAX_NAND_DEVICE 1 > +#endif /* CONFIG_MTD_RAW_NAND */ > + > #endif > diff --git a/include/configs/broadcom_bcm963158.h b/include/configs/broadcom_bcm963158.h > deleted file mode 100644 > index 0c8d352be97c..000000000000 > --- a/include/configs/broadcom_bcm963158.h > +++ /dev/null > @@ -1,32 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * Copyright (C) 2019 Philippe Reynes > - */ > - > -#include > - > -/* > - * common > - */ > - > -/* UART */ > -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \ > - 230400, 500000, 1500000 } > -/* Memory usage */ > - > -/* > - * 63158 > - */ > - > -/* RAM */ > -#define CONFIG_SYS_SDRAM_BASE 0x00000000 > - > -/* U-Boot */ > - > -#ifdef CONFIG_MTD_RAW_NAND > -#define CONFIG_SYS_MAX_NAND_DEVICE 1 > -#endif /* CONFIG_MTD_RAW_NAND */ > - > -/* > - * bcm963158 > - */