From patchwork Fri Dec 2 17:22:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Holger Brunck X-Patchwork-Id: 1711526 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=hitachienergy.com header.i=@hitachienergy.com header.a=rsa-sha256 header.s=duo-1630306886989-947ac67a header.b=HCUWHulZ; dkim=pass (2048-bit key; unprotected) header.d=outbound.mailhop.org header.i=@outbound.mailhop.org header.a=rsa-sha256 header.s=dkim-high header.b=EjkGxfjt; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NP0DR4GkHz23nB for ; Sat, 3 Dec 2022 04:24:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 637A88536E; Fri, 2 Dec 2022 18:23:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=hitachienergy.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=hitachienergy.com header.i=@hitachienergy.com header.b="HCUWHulZ"; dkim=pass (2048-bit key; unprotected) header.d=outbound.mailhop.org header.i=@outbound.mailhop.org header.b="EjkGxfjt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 287008522C; Fri, 2 Dec 2022 18:23:15 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from out-ip0051.fra.mailhop.org (out-ip0051.fra.mailhop.org [18.193.30.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9F8D585263 for ; Fri, 2 Dec 2022 18:23:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=hitachienergy.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=holger.brunck@hitachienergy.com ARC-Seal: i=1; a=rsa-sha256; t=1670001780; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=Bt3hkK1nBvcRoTNbuMK3UYdwGzqp5vXVt809OxiyFOYT1phlIB3KwMjSsmGXXOBvI6KMka8LyFPze bJxgIux0MXlwmZSnRrdQcHFM03sTEfkQVUMKYcSjrl3zMIizg2sDgj6lKljl5vU2lvQDQAWc65zkKq hmJuaAn7Pz7H/9F8Y9ALcvp8/V1JDJ9N5MMBBQPjMMQTr49/QgQQmMenQPqnX1uv7mU5QFxN82rX60 +qBrNSKLeUVPb6Tv1e7NazVRdX6nTPLDBxCgljIP//fFgpbsa36mrT75wEGcEmTd7DdgcL//FPu62F TSnnhp9XGiyBOIcqFlhd1Izno1IfwCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:dkim-signature:dkim-signature:from; bh=clQiCIuSyVczBnIPbEe0X0cJMNT30riDqPb3iQDpzHw=; b=OI2qf4Ilxms95HdGq3t1oYgUwIDiEyF/yQoNhmEPs8hv7TOgx+56c9Eq93g7zkzW8mSB/BINLw77I k5XnXsq7iom4hiByEz8lVtHEwDvqv9pGpLsRyrvBqt9tpL5+k+ZL5DgoKy7aZYVCXE000GlhFhvjek gP+rSS7Kz0g9sJR6pIueMCKCeZbcUFw3+hWk1ThasDrhu+xVknhjL75q7d/BkVmesef+QIAW8zLOqP OtQRRv6/0cudniWjCWqcW5J+Bt5FGyJtPRMFtt4YeyT5Nu6M15/XbmxberCjmNASuhPHktUFfLblZm o1p09Es9j5SEefUvnxfqIXJGJHta6tg== ARC-Authentication-Results: i=1; outbound2.eu.mailhop.org; spf=fail smtp.mailfrom=hitachienergy.com smtp.remote-ip=20.31.73.99; dmarc=fail header.from=hitachienergy.com; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hitachienergy.com; s=duo-1630306886989-947ac67a; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=clQiCIuSyVczBnIPbEe0X0cJMNT30riDqPb3iQDpzHw=; b=HCUWHulZWIGQ9pOF4imghdlrGge85b6e7j4NhvuOVSB9zf7Ri97OXyX0dIzyqW3arzycQMQ0k3NZc 8KtYRoTgC9jKHIRzk51Av6usEYJLSEhK4HizPEtj8vlQy7w5LFT9pk4p3a7oOZ/dzwxxhWh0CSSP6T +bNJPaoPJMiUzkag= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=clQiCIuSyVczBnIPbEe0X0cJMNT30riDqPb3iQDpzHw=; b=EjkGxfjt0Vl/ILsbAVs0Zm5Fdnn919RRla2kpbiU/9x6ROkZnYv6+Dc6mGUsHsGITbOnA6UuYG+A4 k8a9ZxuVQFvMCIIZw9FZ5fGK+1PfFRZhiogVHXPsTSaG77kz11z1lqTWEQJyyfvNZDkGalbkjUYCjD oNWrBi33NL9EOKgyE+hlcyuT9J9cp45TXbmxfG2UtVMJW6Q75ZszpP5YSFyRmPHvgmuTJ6lMlmNGux LvXDciOOnunUy7U5+xtu5ZV5U83m0wq0VPiUiLSI55pZcx2llliSmFhf/VoKG15HypltLBKXpZU1n3 HGSr7inKCVBxx3llmTpCh/ijvv7om+w== X-Originating-IP: 20.31.73.99 X-MHO-RoutePath: aGVkY3NtdHAwMDAx X-MHO-User: f494c02e-7265-11ed-bc05-4b4748ac966b X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Mail-Handler: DuoCircle Outbound SMTP Received: from HPG0000000331.corp.hitachi-powergrids.com (unknown [20.31.73.99]) by outbound2.eu.mailhop.org (Halon) with ESMTPSA id f494c02e-7265-11ed-bc05-4b4748ac966b; Fri, 02 Dec 2022 17:22:54 +0000 (UTC) Received: from gitsiv.hitachienergy.com (unknown [10.54.139.14]) by HPG0000000331.corp.hitachi-powergrids.com (Postfix) with SMTP id 42634279; Fri, 2 Dec 2022 17:22:53 +0000 (UTC) Received: from ch10641.keymile.net.net (ch10641.keymile.net [172.31.40.7]) by gitsiv.hitachienergy.com (Postfix) with ESMTP id 15FC3661C3E1; Fri, 2 Dec 2022 18:22:53 +0100 (CET) From: Holger Brunck To: u-boot@lists.denx.de Cc: Niel Fourie , Heiko Schocher , Aleksandar Gerasimovski , Tom Rini , Holger Brunck Subject: [PATCH 1/7] board/km: move ls102xa boards to environment text files Date: Fri, 2 Dec 2022 18:22:37 +0100 Message-Id: <20221202172243.21046-2-holger.brunck@hitachienergy.com> X-Mailer: git-send-email 2.37.0.rc2.2.g39c15e4 In-Reply-To: <20221202172243.21046-1-holger.brunck@hitachienergy.com> References: <20221202172243.21046-1-holger.brunck@hitachienergy.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Create a common.env which we can use later on also for other boards. Signed-off-by: Holger Brunck --- .../keymile/pg-wcom-ls102xa/pg-wcom-expu1.env | 3 + .../keymile/pg-wcom-ls102xa/pg-wcom-seli8.env | 3 + configs/pg_wcom_expu1_defconfig | 2 +- configs/pg_wcom_expu1_update_defconfig | 2 +- configs/pg_wcom_seli8_defconfig | 2 +- configs/pg_wcom_seli8_update_defconfig | 2 +- include/configs/km/pg-wcom-ls102xa.h | 65 ------------------ include/configs/pg-wcom-expu1.h | 4 -- include/configs/pg-wcom-seli8.h | 5 -- include/environment/pg-wcom/common.env | 68 +++++++++++++++++++ include/environment/pg-wcom/ls102xa.env | 29 ++++++++ 11 files changed, 107 insertions(+), 78 deletions(-) create mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env create mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env create mode 100644 include/environment/pg-wcom/common.env create mode 100644 include/environment/pg-wcom/ls102xa.env diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env b/board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env new file mode 100644 index 0000000000..d960de6bfe --- /dev/null +++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-expu1.env @@ -0,0 +1,3 @@ +#include + +hostname=EXPU1 diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env b/board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env new file mode 100644 index 0000000000..4031f8bee9 --- /dev/null +++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-seli8.env @@ -0,0 +1,3 @@ +#include + +hostname=SELI8 diff --git a/configs/pg_wcom_expu1_defconfig b/configs/pg_wcom_expu1_defconfig index ed55f7bfd0..94f66f7299 100644 --- a/configs/pg_wcom_expu1_defconfig +++ b/configs/pg_wcom_expu1_defconfig @@ -20,7 +20,6 @@ CONFIG_ENV_ADDR=0x60060000 CONFIG_AHCI=y # CONFIG_DEEP_SLEEP is not set CONFIG_LAYERSCAPE_NS_ACCESS=y -CONFIG_KM_DEF_NETDEV="eth2" CONFIG_KM_COMMON_ETH_INIT=y CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 CONFIG_PG_WCOM_UBOOT_UPDATE_SUPPORTED=y @@ -64,6 +63,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=60000000.nor,nand0=68000000.flash" CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:128k(rcw),128k(qe),128k(envred),128k(env),512k(res),1m(u-boot),128k(redenvred),128k(redenv),1m(redu-boot),-(ubi0);68000000.flash:-(ubi1)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y +CONFIG_ENV_SOURCE_FILE="pg-wcom-expu1" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/configs/pg_wcom_expu1_update_defconfig b/configs/pg_wcom_expu1_update_defconfig index 64ddaf8aa6..2eb06bd0d0 100644 --- a/configs/pg_wcom_expu1_update_defconfig +++ b/configs/pg_wcom_expu1_update_defconfig @@ -19,7 +19,6 @@ CONFIG_ENV_ADDR=0x60220000 CONFIG_AHCI=y # CONFIG_DEEP_SLEEP is not set CONFIG_LAYERSCAPE_NS_ACCESS=y -CONFIG_KM_DEF_NETDEV="eth2" CONFIG_KM_COMMON_ETH_INIT=y CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 CONFIG_PG_WCOM_UBOOT_UPDATE_SUPPORTED=y @@ -62,6 +61,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=60000000.nor,nand0=68000000.flash" CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:128k(rcw),128k(qe),128k(envred),128k(env),512k(res),1m(u-boot),128k(redenvred),128k(redenv),1m(redu-boot),-(ubi0);68000000.flash:-(ubi1)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y +CONFIG_ENV_SOURCE_FILE="pg-wcom-expu1" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/configs/pg_wcom_seli8_defconfig b/configs/pg_wcom_seli8_defconfig index ad08e3582e..2d92828d99 100644 --- a/configs/pg_wcom_seli8_defconfig +++ b/configs/pg_wcom_seli8_defconfig @@ -20,7 +20,6 @@ CONFIG_ENV_ADDR=0x60060000 CONFIG_AHCI=y # CONFIG_DEEP_SLEEP is not set CONFIG_LAYERSCAPE_NS_ACCESS=y -CONFIG_KM_DEF_NETDEV="eth2" CONFIG_KM_COMMON_ETH_INIT=y CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 CONFIG_PG_WCOM_UBOOT_UPDATE_SUPPORTED=y @@ -64,6 +63,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=60000000.nor,nand0=68000000.flash" CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:128k(rcw),128k(qe),128k(envred),128k(env),512k(res),1m(u-boot),128k(redenvred),128k(redenv),1m(redu-boot),-(ubi0);68000000.flash:-(ubi1)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y +CONFIG_ENV_SOURCE_FILE="pg-wcom-seli8" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/configs/pg_wcom_seli8_update_defconfig b/configs/pg_wcom_seli8_update_defconfig index 01a6198d72..4b84cbb956 100644 --- a/configs/pg_wcom_seli8_update_defconfig +++ b/configs/pg_wcom_seli8_update_defconfig @@ -19,7 +19,6 @@ CONFIG_ENV_ADDR=0x60220000 CONFIG_AHCI=y # CONFIG_DEEP_SLEEP is not set CONFIG_LAYERSCAPE_NS_ACCESS=y -CONFIG_KM_DEF_NETDEV="eth2" CONFIG_KM_COMMON_ETH_INIT=y CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 CONFIG_PG_WCOM_UBOOT_UPDATE_SUPPORTED=y @@ -62,6 +61,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=60000000.nor,nand0=68000000.flash" CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:128k(rcw),128k(qe),128k(envred),128k(env),512k(res),1m(u-boot),128k(redenvred),128k(redenv),1m(redu-boot),-(ubi0);68000000.flash:-(ubi1)" CONFIG_CMD_UBI=y CONFIG_OF_CONTROL=y +CONFIG_ENV_SOURCE_FILE="pg-wcom-seli8" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index 0613b77e96..b7da2b67b2 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -6,9 +6,6 @@ #ifndef __CONFIG_PG_WCOM_LS102XA_H #define __CONFIG_PG_WCOM_LS102XA_H -/* include common defines/options for all Keymile boards */ -#include "keymile-common.h" - #define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR #define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE @@ -177,68 +174,6 @@ #define CONFIG_LS102XA_STREAM_ID -/* - * Environment - */ - -#define CONFIG_ENV_TOTAL_SIZE 0x40000 -#define ENV_DEL_ADDR CONFIG_ENV_ADDR_REDUND /* direct for newenv */ - -#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ -#define CONFIG_KM_DEF_ENV -#endif - -#ifndef CONFIG_KM_DEF_BOOT_ARGS_CPU -#define CONFIG_KM_DEF_BOOT_ARGS_CPU "" -#endif - -#define CONFIG_KM_DEF_ENV_CPU \ - "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ - "cramfsloadfdt=" \ - "cramfsload ${fdt_addr_r} " \ - "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \ - "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ - "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) \ - " +${filesize} && " \ - "erase " __stringify(CONFIG_SYS_MONITOR_BASE) \ - " +${filesize} && " \ - "cp.b ${load_addr_r} " \ - __stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize} && " \ - "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \ - " +${filesize}\0" \ - "update-nor=protect off " __stringify(CONFIG_SYS_FLASH_BASE) \ - " +${filesize} && " \ - "erase " __stringify(CONFIG_SYS_FLASH_BASE) \ - " +${filesize} && " \ - "cp.b ${load_addr_r} " \ - __stringify(CONFIG_SYS_FLASH_BASE) " ${filesize} && " \ - "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \ - " +" __stringify(CONFIG_SYS_MONITOR_LEN)"\0" \ - "set_fdthigh=true\0" \ - "checkfdt=true\0" \ - "" - -#define CONFIG_KM_NEW_ENV \ - "newenv=protect off " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ - "erase " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ - "protect on " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0" - -#define CONFIG_HW_ENV_SETTINGS \ - "hwconfig=devdis:esdhc,usb3,usb2,sata,sec,dcu,duart2,qspi," \ - "can1,can2_4,ftm2_8,i2c2_3,sai1_4,lpuart2_6," \ - "asrc,spdif,lpuart1,ftm1\0" - -#define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_KM_NEW_ENV \ - CONFIG_KM_DEF_ENV \ - CONFIG_HW_ENV_SETTINGS \ - "EEprom_ivm=pca9547:70:9\0" \ - "ethrotate=no\0" \ - "" - #define CONFIG_SYS_BOOTMAPSZ (256 << 20) /* Increase map for Linux */ #endif diff --git a/include/configs/pg-wcom-expu1.h b/include/configs/pg-wcom-expu1.h index e08d941412..e7c6cd926e 100644 --- a/include/configs/pg-wcom-expu1.h +++ b/include/configs/pg-wcom-expu1.h @@ -7,10 +7,6 @@ #define __CONFIG_PG_WCOM_EXPU1_H #define WCOM_EXPU1 -#define CONFIG_HOSTNAME "EXPU1" - -#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" /* CLIPS FPGA Definitions */ #define CONFIG_SYS_CSPR3_EXT (0x00) diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h index 9a7669c940..0113309f23 100644 --- a/include/configs/pg-wcom-seli8.h +++ b/include/configs/pg-wcom-seli8.h @@ -6,11 +6,6 @@ #ifndef __CONFIG_PG_WCOM_SELI8_H #define __CONFIG_PG_WCOM_SELI8_H -#define CONFIG_HOSTNAME "SELI8" - -#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" - /* PAXK FPGA Definitions */ #define CONFIG_SYS_CSPR3_EXT (0x00) #define CONFIG_SYS_CSPR3 (CSPR_PHYS_ADDR(CONFIG_SYS_PAX_BASE) | \ diff --git a/include/environment/pg-wcom/common.env b/include/environment/pg-wcom/common.env new file mode 100644 index 0000000000..4b660cebd6 --- /dev/null +++ b/include/environment/pg-wcom/common.env @@ -0,0 +1,68 @@ + +#ifndef WCOM_UBI_PARTITION_APP +/* one flash chip only called boot */ +# define WCOM_UBI_LINUX_MTD ubi.mtd=ubi0 +ubiattach=ubi part ubi0 +#else /* WCOM_UBI_PARTITION_APP */ +/* two flash chips called boot and app */ +# define WCOM_UBI_LINUX_MTD ubi.mtd=ubi0 ubi.mtd=ubi1 +ubiattach=if test ${boot_bank} -eq 0; + then; + ubi part ubi0; + else; + ubi part ubi1; + fi +#endif /* WCOMC_UBI_PARTITION_APP */ + +actual_bank=0 + +add_default=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:off: + console=ttyS0,${baudrate} mem=${kernelmem} init=${init} + phram.phram=phvar,${varaddr},CONFIG_KM_PHRAM + WCOM_UBI_LINUX_MTD + +addpanic=setenv bootargs ${bootargs} panic=1 panic_on_oops=1 +altbootcmd=run bootcmd +backup_bank=0 +boot=bootm ${load_addr_r} - ${fdt_addr_r} + +bootcmd=km_checkbidhwk && + setenv bootcmd 'if km_checktestboot; + then; + setenv boot_bank ${test_bank}; + else; + setenv boot_bank ${actual_bank}; + fi; + run ${subbootcmds}; reset' && + setenv altbootcmd 'setenv boot_bank ${backup_bank}; + run ${subbootcmds}; + reset' && + saveenv && + saveenv && + boot + +cramfsaddr=CONFIG_KM_CRAMFS_ADDR +cramfsloadfdt=cramfsload ${fdt_addr_r} fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb +cramfsloadkernel=cramfsload ${load_addr_r} ${uimage} + +develop=tftp ${load_addr_r} scripts/develop-${arch}.txt && + env import -t ${load_addr_r} ${filesize} && + run setup_debug_env + +env_version=1 +fdt_addr_r=CONFIG_KM_FDT_ADDR +flashargs=setenv bootargs root=mtdblock:rootfs${boot_bank} rootfstype=squashfs ro +init=/sbin/init-overlay.sh +load=tftpboot ${load_addr_r} ${hostname}/u-boot.bin +load_addr_r=CONFIG_KM_KERNEL_ADDR +pnvramsize=CONFIG_KM_PNVRAM + +ramfs=tftp ${load_addr_r} scripts/ramfs-${arch}.txt && + env import -t ${load_addr_r} ${filesize} && + run setup_debug_env + +release=run newenv; reset +subbootcmds=ubiattach ubicopy checkfdt cramfsloadfdt set_fdthigh + cramfsloadkernel flashargs add_default addpanic boot +testbootcmd=setenv boot_bank ${test_bank}; run ${subbootcmds}; reset +ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank} diff --git a/include/environment/pg-wcom/ls102xa.env b/include/environment/pg-wcom/ls102xa.env new file mode 100644 index 0000000000..5b5bda95e2 --- /dev/null +++ b/include/environment/pg-wcom/ls102xa.env @@ -0,0 +1,29 @@ +#define WCOM_UBI_PARTITION_APP + +#include + +EEprom_ivm=pca9547:70:9 +boot=bootm $load_addr_r - $fdt_addr_r +checkfdt=true +cramfsloadfdt=cramfsload $fdt_addr_r fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb +ethrotate=no +hwconfig=devdis:esdhc,usb3,usb2,sata,sec,dcu,duart2,qspi,can1,can2_4,ftm2_8,i2c2_3,sai1_4,lpuart2_6,asrc,spdif,lpuart1,ftm1 +netdev=eth2 + +newenv=protect off CONFIG_ENV_ADDR_REDUND +0x40000 && + erase CONFIG_ENV_ADDR_REDUND +0x40000 && + protect on CONFIG_ENV_ADDR_REDUND +0x40000 + +set_fdthigh=true + +update=protect off CONFIG_SYS_MONITOR_BASE +${filesize} && + erase CONFIG_SYS_MONITOR_BASE +${filesize} && + cp.b ${load_addr_r} CONFIG_SYS_MONITOR_BASE ${filesize} && + protect on CONFIG_SYS_MONITOR_BASE +${filesize} + +update-nor=protect off CONFIG_SYS_FLASH_BASE +${filesize} && + erase CONFIG_SYS_FLASH_BASE +${filesize} && + cp.b ${load_addr_r} CONFIG_SYS_FLASH_BASE ${filesize} && + protect on CONFIG_SYS_MONITOR_BASE +0x100000 + +uimage=uImage From patchwork Fri Dec 2 17:22:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Holger Brunck X-Patchwork-Id: 1711525 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=hitachienergy.com header.i=@hitachienergy.com header.a=rsa-sha256 header.s=duo-1630306886989-947ac67a header.b=vNCEon/x; dkim=pass (2048-bit key; unprotected) header.d=outbound.mailhop.org header.i=@outbound.mailhop.org header.a=rsa-sha256 header.s=dkim-high header.b=uonvXjTj; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NP0DC6Kfyz23nB for ; Sat, 3 Dec 2022 04:24:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 29F9B852CB; Fri, 2 Dec 2022 18:23:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=hitachienergy.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=hitachienergy.com header.i=@hitachienergy.com header.b="vNCEon/x"; dkim=pass (2048-bit key; unprotected) header.d=outbound.mailhop.org header.i=@outbound.mailhop.org header.b="uonvXjTj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AEA7985263; Fri, 2 Dec 2022 18:23:15 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from out-ip0051.fra.mailhop.org (out-ip0051.fra.mailhop.org [18.193.30.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D4D0A853BF for ; Fri, 2 Dec 2022 18:23:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=hitachienergy.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=holger.brunck@hitachienergy.com ARC-Seal: i=1; a=rsa-sha256; t=1670001780; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=ph5/j3HTINWPNaRuza0F/yENsMkb6fTOULxINROlhSao+WbJZcuQMR3Itxtz1PgVa3BTGEDX4vJmN 1gBdpCmYESNiYHYJwX627JBNevwynM/SjF2I38BwA5j0tR0gZaKiamPkadXBM7yD43qO0YXeFJGqIX vrR2d3GQvGzDYjSsUfCe/GHGV+dLZZQe79XAnDXcerY7M2ar9QnsGbKtj1n5MCTo43L0wT6P69p2R7 ivFgWtz3LoEyE/uziC0lOIhhmw0ure/+xerhzKXkdI6ha1C1N5YsZlWqJVGrrhHceHDfslF4y2Ayt3 hRrLG8V3xFc9bQ0Pzd0FsxDuUhmuw7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:dkim-signature:dkim-signature:from; bh=PaZ5ZTBdpKg1SeKqONUSGisV9gr7LwzFJ7roDWhtY8s=; b=DY7YkSsiDUMO7n8aSFmvBxukL+1TMSNVwYyjeHPYnWd2nKG55jC0F8V6Lmtep0YUv2LbhRLOR/7i/ k3n2vMx+Z1cQio+XmABqA+Nhg+K6/W+eiN7wmH2Qg2mQrDsOawiQyHRJdWPr3vrzORlsXQ8fuL8ewL Jvo0urNkU0X33rHgS3fNS8hAkOHbqn9syodPWR1Bxy2hyvZ7skIWoijimiU2+Nx55HdBpK6XTkB/KN /RKZ1qpI4MbgJ4sEMzHMG6CfdFXhSBTFFF041QEFwTgfH+QZNrEuH9Dw9LO5NA4zKER/U5K33sjGNg wn5CCe0rYv7Qi5rvh4RbtRfJSw4I9/w== ARC-Authentication-Results: i=1; outbound2.eu.mailhop.org; spf=fail smtp.mailfrom=hitachienergy.com smtp.remote-ip=20.31.73.99; dmarc=fail header.from=hitachienergy.com; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hitachienergy.com; s=duo-1630306886989-947ac67a; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=PaZ5ZTBdpKg1SeKqONUSGisV9gr7LwzFJ7roDWhtY8s=; b=vNCEon/xrFoOByvrv7+VnusvyfdviE5Cl1X7xPbwGoRuIlYdKng6wg3iU2EJNdCFQ5zm6XbCTru7l dnSiMpkjqrFSgXO39By9qu29b1RHRYLIWQBgXbhQllniynix929cqiB+g6BxcMP+fqotASj7PWQ3g6 EpzSpM0QGIJsG5F4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=PaZ5ZTBdpKg1SeKqONUSGisV9gr7LwzFJ7roDWhtY8s=; b=uonvXjTje00ee31dFMpBO1d4rT4Y6L+/mxlMpWgx6+HGOp8JkQ1LDvKrMt8+ZUmjbXMtX56EDz8/d CvEJdjsF8JutpcU7EBURod9ReV2H9yOd+z0w7Wo4o7DPeLOU6kpeezmNL3yyjnxa39EKdkekSPAiYs /iDfSc/R24egQmLZ6NFcDYJtDFBMHkw04BWpcAoJp3RHSqsdC9yHdk2AnFUq1akEqlZx9aNxsB+2s2 qlpEpJ1xicfnXgovjkIBshSM5SxQcxeeu42r5/dHhAB/plze+X/3/kZA8RsY9p9TpJyPDatz7PJDVQ 1YH7kPl8gXDA+g5RJam4eduwHLCKZaA== X-Originating-IP: 20.31.73.99 X-MHO-RoutePath: aGVkY3NtdHAwMDAx X-MHO-User: f494bfe1-7265-11ed-bc05-4b4748ac966b X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Mail-Handler: DuoCircle Outbound SMTP Received: from HPG0000000426.corp.hitachi-powergrids.com (unknown [20.31.73.99]) by outbound2.eu.mailhop.org (Halon) with ESMTPSA id f494bfe1-7265-11ed-bc05-4b4748ac966b; Fri, 02 Dec 2022 17:22:54 +0000 (UTC) Received: from gitsiv.hitachienergy.com (unknown [10.54.139.14]) by HPG0000000426.corp.hitachi-powergrids.com (Postfix) with SMTP id 51AB3224; Fri, 2 Dec 2022 17:22:53 +0000 (UTC) Received: from ch10641.keymile.net.net (ch10641.keymile.net [172.31.40.7]) by gitsiv.hitachienergy.com (Postfix) with ESMTP id 1A10B661C3F0; Fri, 2 Dec 2022 18:22:53 +0100 (CET) From: Holger Brunck To: u-boot@lists.denx.de Cc: Niel Fourie , Heiko Schocher , Aleksandar Gerasimovski , Tom Rini , Holger Brunck Subject: [PATCH 2/7] km/powerpc: migrate to env.txt file Date: Fri, 2 Dec 2022 18:22:38 +0100 Message-Id: <20221202172243.21046-3-holger.brunck@hitachienergy.com> X-Mailer: git-send-email 2.37.0.rc2.2.g39c15e4 In-Reply-To: <20221202172243.21046-1-holger.brunck@hitachienergy.com> References: <20221202172243.21046-1-holger.brunck@hitachienergy.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Use already present common.env file and add a powerpc specific env so that we can move all the environment defines to text files. Signed-off-by: Holger Brunck --- board/keymile/km83xx/km83xx.env | 21 +++++++++++ configs/kmcoge5ne_defconfig | 2 +- configs/kmeter1_defconfig | 2 +- configs/kmopti2_defconfig | 1 + configs/kmsupx5_defconfig | 1 + configs/kmtepr2_defconfig | 1 + configs/tuge1_defconfig | 1 + configs/tuxx1_defconfig | 1 + include/configs/km/km-mpc83xx.h | 24 ------------- include/configs/km/km-powerpc.h | 46 ------------------------- include/configs/kmcoge5ne.h | 6 ---- include/configs/kmeter1.h | 4 --- include/configs/kmopti2.h | 7 ---- include/configs/kmsupx5.h | 7 ---- include/configs/kmtepr2.h | 7 ---- include/configs/tuge1.h | 7 ---- include/configs/tuxx1.h | 7 ---- include/environment/pg-wcom/powerpc.env | 14 ++++++++ 18 files changed, 42 insertions(+), 117 deletions(-) create mode 100644 board/keymile/km83xx/km83xx.env delete mode 100644 include/configs/km/km-powerpc.h create mode 100644 include/environment/pg-wcom/powerpc.env diff --git a/board/keymile/km83xx/km83xx.env b/board/keymile/km83xx/km83xx.env new file mode 100644 index 0000000000..ed2487c028 --- /dev/null +++ b/board/keymile/km83xx/km83xx.env @@ -0,0 +1,21 @@ +#if CONFIG_TARGET_KMCOGE5NE +#define WCOM_UBI_PARTITION_APP +hostname=kmcoge5ne +netdev=eth1 +uimage=ecc_bch_uImage +#elif CONFIG_TARGET_KMETER1 +hostname=kmeter1 +netdev=eth2 +uimage=uImage +#else +hostname=kmeter1 +netdev=eth0 +uimage=uImage +#endif + +#include +#include + +#if CONFIG_TARGET_KMCOGE5NE +add_default+= eccmode=bch +#endif diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index 298ff16b7e..389800795d 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -159,7 +159,6 @@ CONFIG_LCRR_DBYP_PLL_BYPASSED=y CONFIG_LCRR_EADC_2=y CONFIG_LCRR_CLKDIV_4=y CONFIG_83XX_PCICLK=0x3ef1480 -CONFIG_KM_DEF_NETDEV="eth1" CONFIG_SYS_MONITOR_LEN=786432 CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y @@ -196,6 +195,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot,nand0=app" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);app:-(ubi1);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_ENV_SOURCE_FILE="km83xx" CONFIG_ENV_OVERWRITE=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_ADDR_REDUND=0xF00E0000 diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index 9386f2c512..257b6a4546 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -129,7 +129,6 @@ CONFIG_ACR_PARKM_USB_I2C1_BOOT=y CONFIG_LCRR_DBYP_PLL_BYPASSED=y CONFIG_LCRR_EADC_2=y CONFIG_LCRR_CLKDIV_4=y -CONFIG_KM_DEF_NETDEV="eth2" CONFIG_SYS_MONITOR_LEN=786432 CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y @@ -165,6 +164,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_ENV_SOURCE_FILE="km83xx" CONFIG_ENV_OVERWRITE=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_ADDR_REDUND=0xF00E0000 diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index 173306668f..53d37fa020 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -177,6 +177,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_ENV_SOURCE_FILE="km83xx" CONFIG_ENV_OVERWRITE=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_ADDR_REDUND=0xF00E0000 diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index c281611dd4..95b8518bdb 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -156,6 +156,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_ENV_SOURCE_FILE="km83xx" CONFIG_ENV_OVERWRITE=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_ADDR_REDUND=0xF00E0000 diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index e099f74de1..0ebb049cfe 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -176,6 +176,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_ENV_SOURCE_FILE="km83xx" CONFIG_ENV_OVERWRITE=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_ADDR_REDUND=0xF00E0000 diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index 3b8560f3e0..6758b59d95 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -156,6 +156,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_ENV_SOURCE_FILE="km83xx" CONFIG_ENV_OVERWRITE=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_ADDR_REDUND=0xF00E0000 diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index 04ce0b3afe..0db4cee27b 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -178,6 +178,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=boot" CONFIG_MTDPARTS_DEFAULT="mtdparts=boot:768k(u-boot),128k(env),128k(envred),-(ubi0);" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set +CONFIG_ENV_SOURCE_FILE="km83xx" CONFIG_ENV_OVERWRITE=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_ENV_ADDR_REDUND=0xF00E0000 diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 181ed1b8fa..17e596a687 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -69,30 +69,6 @@ */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) -/* - * Environment - */ - -/* - * Environment Configuration - */ -#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ -#define CONFIG_KM_DEF_ENV "km-common=empty\0" -#endif - -#ifndef CONFIG_KM_DEF_ARCH -#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" -#endif - -#define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ARCH \ - "newenv=" \ - "prot off " __stringify(CONFIG_ENV_ADDR) " +0x40000 && " \ - "era " __stringify(CONFIG_ENV_ADDR) " +0x40000\0" \ - "unlock=yes\0" \ - "" - /* * QE UEC ethernet configuration */ diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h deleted file mode 100644 index 424caa0df9..0000000000 --- a/include/configs/km/km-powerpc.h +++ /dev/null @@ -1,46 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2011 - * Heiko Schocher, DENX Software Engineering, hs@denx.de. - */ - -#ifndef __CONFIG_KEYMILE_POWERPC_H -#define __CONFIG_KEYMILE_POWERPC_H - -/* Do boardspecific init for all boards */ - -/* Increase max size of compressed kernel */ - -/****************************************************************************** - * (PRAM usage) - * ... ------------------------------------------------------- - * ... |ROOTFSSIZE | PNVRAM |PHRAM |RESERVED_PRAM | END_OF_RAM - * ... |<------------------- pram -------------------------->| - * ... ------------------------------------------------------- - * @END_OF_RAM: - * @CONFIG_KM_RESERVED_PRAM: reserved pram for special purpose - * @CONFIG_KM_PHRAM: address for /var - * @CONFIG_KM_PNVRAM: address for PNVRAM (for the application) - */ - -/* set the default PRAM value to at least PNVRAM + PHRAM when pram env variable - * is not valid yet, which is the case for when u-boot copies itself to RAM */ -#define CONFIG_PRAM ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10) - -/* architecture specific default bootargs */ -#define CONFIG_KM_DEF_BOOT_ARGS_CPU "" - -#define CONFIG_KM_DEF_ENV_CPU \ - "u-boot="CONFIG_HOSTNAME "/u-boot.bin\0" \ - "update=" \ - "protect off " __stringify(BOOTFLASH_START) " +${filesize} && "\ - "erase " __stringify(BOOTFLASH_START) " +${filesize} && "\ - "cp.b ${load_addr_r} " __stringify(BOOTFLASH_START) \ - " ${filesize} && " \ - "protect on " __stringify(BOOTFLASH_START) " +${filesize}\0"\ - "set_fdthigh=true\0" \ - "checkfdt=true\0" \ - "bootm_mapsize=" __stringify(CONFIG_SYS_BOOTM_LEN) "\0" \ - "" - -#endif /* __CONFIG_KEYMILE_POWERPC_H */ diff --git a/include/configs/kmcoge5ne.h b/include/configs/kmcoge5ne.h index d6b60d8139..bcf4c7345b 100644 --- a/include/configs/kmcoge5ne.h +++ b/include/configs/kmcoge5ne.h @@ -8,18 +8,12 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_HOSTNAME "kmcoge5ne" #define CONFIG_NAND_ECC_BCH #define CONFIG_NAND_KMETER1 #define NAND_MAX_CHIPS 1 #define CONFIG_SYS_NAND_BASE CONFIG_SYS_KMBEC_FPGA_BASE /* PRIO_BASE_ADDRESS */ -#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" - /* include common defines/options for all Keymile boards */ -#include "km/keymile-common.h" -#include "km/km-powerpc.h" #include "km/km-mpc83xx.h" #include "km/km-mpc8360.h" diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index 4245875e39..321a187c7d 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -8,11 +8,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_HOSTNAME "kmeter1" - /* include common defines/options for all Keymile boards */ -#include "km/keymile-common.h" -#include "km/km-powerpc.h" #include "km/km-mpc83xx.h" #include "km/km-mpc8360.h" diff --git a/include/configs/kmopti2.h b/include/configs/kmopti2.h index 5050c70303..d6a3844bcc 100644 --- a/include/configs/kmopti2.h +++ b/include/configs/kmopti2.h @@ -20,14 +20,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* - * High Level Configuration Options - */ -#define CONFIG_HOSTNAME "kmopti2" - /* include common defines/options for all Keymile boards */ -#include "km/keymile-common.h" -#include "km/km-powerpc.h" #include "km/km-mpc83xx.h" #include "km/km-mpc832x.h" diff --git a/include/configs/kmsupx5.h b/include/configs/kmsupx5.h index e3de6c61e7..d6a3844bcc 100644 --- a/include/configs/kmsupx5.h +++ b/include/configs/kmsupx5.h @@ -20,14 +20,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* - * High Level Configuration Options - */ -#define CONFIG_HOSTNAME "kmsupx5" - /* include common defines/options for all Keymile boards */ -#include "km/keymile-common.h" -#include "km/km-powerpc.h" #include "km/km-mpc83xx.h" #include "km/km-mpc832x.h" diff --git a/include/configs/kmtepr2.h b/include/configs/kmtepr2.h index a4ceb1c50d..d6a3844bcc 100644 --- a/include/configs/kmtepr2.h +++ b/include/configs/kmtepr2.h @@ -20,14 +20,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* - * High Level Configuration Options - */ -#define CONFIG_HOSTNAME "kmtepr2" - /* include common defines/options for all Keymile boards */ -#include "km/keymile-common.h" -#include "km/km-powerpc.h" #include "km/km-mpc83xx.h" #include "km/km-mpc832x.h" diff --git a/include/configs/tuge1.h b/include/configs/tuge1.h index d43ccbe8dd..d6a3844bcc 100644 --- a/include/configs/tuge1.h +++ b/include/configs/tuge1.h @@ -20,14 +20,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* - * High Level Configuration Options - */ -#define CONFIG_HOSTNAME "tuge1" - /* include common defines/options for all Keymile boards */ -#include "km/keymile-common.h" -#include "km/km-powerpc.h" #include "km/km-mpc83xx.h" #include "km/km-mpc832x.h" diff --git a/include/configs/tuxx1.h b/include/configs/tuxx1.h index 7eed31c35f..d6a3844bcc 100644 --- a/include/configs/tuxx1.h +++ b/include/configs/tuxx1.h @@ -20,14 +20,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -/* - * High Level Configuration Options - */ -#define CONFIG_HOSTNAME "tuxx1" - /* include common defines/options for all Keymile boards */ -#include "km/keymile-common.h" -#include "km/km-powerpc.h" #include "km/km-mpc83xx.h" #include "km/km-mpc832x.h" diff --git a/include/environment/pg-wcom/powerpc.env b/include/environment/pg-wcom/powerpc.env new file mode 100644 index 0000000000..a57fd93092 --- /dev/null +++ b/include/environment/pg-wcom/powerpc.env @@ -0,0 +1,14 @@ +arch=ppc_82xx +bootm_mapsize=CONFIG_SYS_BOOTM_LEN +checkfdt=true +set_fdthigh=true + +update=protect off BOOTFLASH_START +${filesize} && + erase BOOTFLASH_START +${filesize} && + cp.b ${load_addr_r} BOOTFLASH_START ${filesize} && + protect on BOOTFLASH_START +${filesize} + +newenv=prot off CONFIG_ENV_ADDR +0x40000 && + era CONFIG_ENV_ADDR +0x40000 + +unlock=yes From patchwork Fri Dec 2 17:22:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Holger Brunck X-Patchwork-Id: 1711528 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=hitachienergy.com header.i=@hitachienergy.com header.a=rsa-sha256 header.s=duo-1630306886989-947ac67a header.b=EYvSRQgh; dkim=pass (2048-bit key; unprotected) header.d=outbound.mailhop.org header.i=@outbound.mailhop.org header.a=rsa-sha256 header.s=dkim-high header.b=uwCQoPvi; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NP0Dv4db0z23nB for ; Sat, 3 Dec 2022 04:24:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EB2178528C; Fri, 2 Dec 2022 18:23:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=hitachienergy.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=hitachienergy.com header.i=@hitachienergy.com header.b="EYvSRQgh"; dkim=pass (2048-bit key; unprotected) header.d=outbound.mailhop.org header.i=@outbound.mailhop.org header.b="uwCQoPvi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8C0928529A; Fri, 2 Dec 2022 18:23:25 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from out-ip0052.fra.mailhop.org (out-ip0052.fra.mailhop.org [18.158.144.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BA923853E9 for ; Fri, 2 Dec 2022 18:23:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=hitachienergy.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=holger.brunck@hitachienergy.com ARC-Seal: i=1; a=rsa-sha256; t=1670001782; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=KOw9dh8cSacdpz+Z/G0AcyzVEhDGeEUaxlJPNgCJsfKBQSs95gqHfx3mdXiY4EiXFiBI+PRKjMQTk DEPLsWjskb0Z3HDBRwRmijM77aBn5JJul3gTW7KWr/jKkUQ3UcUcSQm8RGh8S39Uzy5IJwiTT8xkFQ ZfTKm5nClDrqXVYlW3xvURXdZR7WwD7p8NguLjGdmQ4HbyXUIJm7Zc2hA0N0cKV29Xl0qEZkgNRF8t sJRer09m13eBJw09O5/VGWV6qfQFbTSwX4Ptv58ZDXXMsWriXBRPGU+CcZn62/nCblxrOFW81F7F5i jaXW6j9fRi3MD1xdq8HvOm1rAiHf40g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:dkim-signature:dkim-signature:from; bh=Ng1D3AnLdApyZLg7hYVEUn74jr3kLwak2+SQv+r24I0=; b=U3RMgRopj9cQ8SIfmjJ1rgQpb8UMK//AOibr51wuU8Rq3/FGGoEPJFX1CwGwjmdYxIdAzvWX3EBN9 HT6YCBD37jIMj586+YEGPaRtjGbnluUQvqkWihQyHzhNmZpqEjMwgSg3m8FbyJI5uZFhsTcOJxd5XD 6mz2Esnzibfc+iAt7807A2X1OXV+JttVz8010wJ+/uk4qmotUN1VNHDMF9m50FW3jFegrK610l5eJd c8UmzeyUeCpL7KXneXAWIoYEqngNy0A2iApZ+fwR0N2zVBH16rII56SXm1U5MVzIRAE9thNfFpT8+Y L8zocIzidPZbWX/vhKSHzHiPC5RMuEA== ARC-Authentication-Results: i=1; outbound2.eu.mailhop.org; spf=fail smtp.mailfrom=hitachienergy.com smtp.remote-ip=20.241.147.199; dmarc=fail header.from=hitachienergy.com; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hitachienergy.com; s=duo-1630306886989-947ac67a; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=Ng1D3AnLdApyZLg7hYVEUn74jr3kLwak2+SQv+r24I0=; b=EYvSRQghmUMvGCfpMWTKpweKJ8a6b66bWy+SsjpaPMHzf+0Dq91vvc2T5LVpqhVjb94biyVErYLrY xPs1uCqOgJFSGgVmJmSMvK6aufwOzeZW+gd/gI7C9qnt5mBpdYkKMg3U9Az3vQoRsOid0W6EuJcCye j3Hvz33gCuRbj7SQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=Ng1D3AnLdApyZLg7hYVEUn74jr3kLwak2+SQv+r24I0=; b=uwCQoPvi2yafmzSWRe4grdARfh5TNLIqfuVm5Acjmfw9RAK3HYvty3Bqu73MqaeNcfJs0/mQc71pH ka5MITbeFYlwTh4mZu+krLiwbqGSCrQfeUsxvdb/FNcV1VHQZtm5EjMsl0stvoP8Fpf6HQPXOxSnve J5OQlf4ZjViWtgF8bQ5922ak5FknBiawugJIoAHL/RY9hMZt3Z1OxXY8D2qrzP9ud1cp86WOInPZQ5 GlPCHrOvLsuCnHa0PFzkvXJ+5FXL0f75CTQO138zGyPdevzPKlAY6wxW4Kej3tems/ol9BzcfzDSKs k5bkWeAGG+wGMpqF0gIvoRARK4I+/gg== X-Originating-IP: 20.241.147.199 X-MHO-RoutePath: aGVkY3NtdHAwMDAx X-MHO-User: f553f15f-7265-11ed-bc05-4b4748ac966b X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Mail-Handler: DuoCircle Outbound SMTP Received: from HPG0000000548.corp.hitachi-powergrids.com (unknown [20.241.147.199]) by outbound2.eu.mailhop.org (Halon) with ESMTPSA id f553f15f-7265-11ed-bc05-4b4748ac966b; Fri, 02 Dec 2022 17:22:56 +0000 (UTC) Received: from gitsiv.hitachienergy.com (unknown [10.54.139.14]) by HPG0000000548.corp.hitachi-powergrids.com (Postfix) with SMTP id C0DBB23DE9; Fri, 2 Dec 2022 17:22:53 +0000 (UTC) Received: from ch10641.keymile.net.net (ch10641.keymile.net [172.31.40.7]) by gitsiv.hitachienergy.com (Postfix) with ESMTP id 288ED661C3F1; Fri, 2 Dec 2022 18:22:53 +0100 (CET) From: Holger Brunck To: u-boot@lists.denx.de Cc: Niel Fourie , Heiko Schocher , Aleksandar Gerasimovski , Tom Rini , Holger Brunck Subject: [PATCH 3/7] board/km/cent2: migrate to environment text file Date: Fri, 2 Dec 2022 18:22:39 +0100 Message-Id: <20221202172243.21046-4-holger.brunck@hitachienergy.com> X-Mailer: git-send-email 2.37.0.rc2.2.g39c15e4 In-Reply-To: <20221202172243.21046-1-holger.brunck@hitachienergy.com> References: <20221202172243.21046-1-holger.brunck@hitachienergy.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Use like the other boards a text file for the environment. As this is the last user of keymile-common.h we can now remove this file completely. Signed-off-by: Holger Brunck --- board/keymile/Kconfig | 12 -- board/keymile/kmcent2/kmcent2.c | 2 +- board/keymile/kmcent2/kmcent2.env | 37 ++++++ configs/kmcent2_defconfig | 2 +- include/configs/km/keymile-common.h | 174 ---------------------------- include/configs/kmcent2.h | 74 ------------ scripts/config_whitelist.txt | 15 --- 7 files changed, 39 insertions(+), 277 deletions(-) create mode 100644 board/keymile/kmcent2/kmcent2.env delete mode 100644 include/configs/km/keymile-common.h diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index b8f0578a28..46d0897108 100644 --- a/board/keymile/Kconfig +++ b/board/keymile/Kconfig @@ -77,18 +77,6 @@ config SYS_CLIPS_BASE help IFC Base Address for CLIPS FPGA. -config KM_CONSOLE_TTY - string "KM Console" - default "ttyS0" - help - TTY console to use on board. - -config KM_DEF_NETDEV - string "Default Netdevice" - default "eth0" - help - Default netdevice for debug interface - config KM_COMMON_ETH_INIT bool "Common Ethernet Initialization" default y if ARCH_KIRKWOOD || MPC83xx diff --git a/board/keymile/kmcent2/kmcent2.c b/board/keymile/kmcent2/kmcent2.c index 6a1711092b..32fb509dbc 100644 --- a/board/keymile/kmcent2/kmcent2.c +++ b/board/keymile/kmcent2/kmcent2.c @@ -34,7 +34,7 @@ static uchar ivm_content[CONFIG_SYS_IVM_EEPROM_MAX_LEN]; int checkboard(void) { - printf("Board: Hitachi Power Grids %s\n", KM_BOARD_NAME); + printf("Board: Hitachi Power Grids kmcent2\n"); return 0; } diff --git a/board/keymile/kmcent2/kmcent2.env b/board/keymile/kmcent2/kmcent2.env new file mode 100644 index 0000000000..7c8f8306c5 --- /dev/null +++ b/board/keymile/kmcent2/kmcent2.env @@ -0,0 +1,37 @@ +#include + +EEprom_ivm=pca9547:70:9 +arch=ppc_82xx +boot=bootm ${load_addr_r} - ${fdt_addr_r} +checkfdt=true +cramfsloadfdt=cramfsload ${fdt_addr_r} fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb +fpgacfg=true +hostname=kmcent2 +hwconfig=fsl_ddr:ctlr_intlv=cacheline +netdev=eth2 + +newenv=protect off ENV_DEL_ADDR +CONFIG_ENV_TOTAL_SIZE && + erase ENV_DEL_ADDR +CONFIG_ENV_TOTAL_SIZE && + protect on ENV_DEL_ADDR +CONFIG_ENV_TOTAL_SIZE + +set_fdthigh=true +uimage=uImage + +update=protect off CONFIG_SYS_MONITOR_BASE +${filesize} && + erase CONFIG_SYS_MONITOR_BASE +${filesize} && + cp.b ${load_addr_r} CONFIG_SYS_MONITOR_BASE ${filesize} && + protect on CONFIG_SYS_MONITOR_BASE +${filesize} + update-nor=protect off CONFIG_SYS_FLASH_BASE +${filesize} && + erase CONFIG_SYS_FLASH_BASE +${filesize} && + cp.b ${load_addr_r} CONFIG_SYS_FLASH_BASE ${filesize} && + protect on CONFIG_SYS_MONITOR_BASE +CONFIG_SYS_MONITOR_LEN + +usb_phy_type=utmi +usb_dr_mode=host + +/* + * The Linux fsl_fman driver needs to be able to process frames with more + * than just the VLAN tag (i.e. eDSA tag). It is passed as a kernel boot + * parameters + */ +add_default+= fsl_dpaa_fman.fsl_fm_max_frm=1558 diff --git a/configs/kmcent2_defconfig b/configs/kmcent2_defconfig index 48ac85b699..249568df6a 100644 --- a/configs/kmcent2_defconfig +++ b/configs/kmcent2_defconfig @@ -17,7 +17,6 @@ CONFIG_SYS_CACHE_STASHING=y # CONFIG_DEEP_SLEEP is not set CONFIG_PCIE1=y CONFIG_SYS_FSL_NUM_CC_PLLS=2 -CONFIG_KM_DEF_NETDEV="eth2" CONFIG_KM_IVM_BUS=2 CONFIG_SYS_MONITOR_LEN=786432 CONFIG_MP=y @@ -54,6 +53,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:128k(RCW),128k(fman),128k(QE),12 CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_OF_CONTROL=y +CONFIG_ENV_SOURCE_FILE="kmcent2" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h deleted file mode 100644 index 35cf27a2eb..0000000000 --- a/include/configs/km/keymile-common.h +++ /dev/null @@ -1,174 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2008-2011 - * Heiko Schocher, DENX Software Engineering, hs@denx.de. - */ - -#ifndef __CONFIG_KEYMILE_H -#define __CONFIG_KEYMILE_H - -#include - -/* - * Miscellaneous configurable options - */ - -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } - -#ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS -#define CONFIG_KM_DEF_ENV_BOOTPARAMS \ - "actual_bank=0\0" -#endif - -#ifndef CONFIG_KM_UBI_PARTITION_NAME_BOOT -#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#endif /* CONFIG_KM_UBI_PARTITION_NAME_BOOT */ - -#ifndef CONFIG_KM_UBI_PART_BOOT_OPTS -#define CONFIG_KM_UBI_PART_BOOT_OPTS "" -#endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */ - -#ifndef CONFIG_KM_UBI_PARTITION_NAME_APP -/* one flash chip only called boot */ -/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ -# define CONFIG_KM_UBI_LINUX_MTD \ - "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ - CONFIG_KM_UBI_PART_BOOT_OPTS -# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI \ - "ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0" -#else /* CONFIG_KM_UBI_PARTITION_NAME_APP */ -/* two flash chips called boot and app */ -/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ -/* app: CONFIG_KM_UBI_PARTITION_NAME_APP */ -# define CONFIG_KM_UBI_LINUX_MTD \ - "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ - CONFIG_KM_UBI_PART_BOOT_OPTS " " \ - "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP -# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI \ - "ubiattach=if test ${boot_bank} -eq 0; then; " \ - "ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; " \ - "ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0" -#endif /* CONFIG_KM_UBI_PARTITION_NAME_APP */ - -#ifdef CONFIG_NAND_ECC_BCH -#define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0" -#define CONFIG_KM_ECC_MODE " eccmode=bch" -#else -#define CONFIG_KM_UIMAGE_NAME "uImage\0" -#define CONFIG_KM_ECC_MODE -#endif - -/* - * boottargets - * - set 'subbootcmds' - * - set 'bootcmd' and 'altbootcmd' - * available targets: - * - 'release': for a standalone system kernel/rootfs from flash - */ -#define CONFIG_KM_DEF_ENV_BOOTTARGETS \ - "subbootcmds=ubiattach ubicopy checkfdt cramfsloadfdt " \ - "set_fdthigh cramfsloadkernel flashargs add_default " \ - "addpanic boot\0" \ - "develop=" \ - "tftp ${load_addr_r} scripts/develop-${arch}.txt && " \ - "env import -t ${load_addr_r} ${filesize} && " \ - "run setup_debug_env\0" \ - "ramfs=" \ - "tftp ${load_addr_r} scripts/ramfs-${arch}.txt && " \ - "env import -t ${load_addr_r} ${filesize} && " \ - "run setup_debug_env\0" \ - "" - -/* - * bootargs - * - modify 'bootargs' - * - * - 'add_default': default bootargs common for all arm/ppc boards - * - 'addpanic': add kernel panic options - * - 'flashargs': defaults arguments for flash base boot - * - */ -#define CONFIG_KM_DEF_ENV_BOOTARGS \ - "add_default=" \ - "setenv bootargs ${bootargs} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ - ":${hostname}:${netdev}:off:" \ - " console=" CONFIG_KM_CONSOLE_TTY ",${baudrate}" \ - " mem=${kernelmem} init=${init}" \ - CONFIG_KM_ECC_MODE \ - " phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\ - " " CONFIG_KM_UBI_LINUX_MTD " " \ - CONFIG_KM_DEF_BOOT_ARGS_CPU \ - "\0" \ - "addpanic=" \ - "setenv bootargs ${bootargs} panic=1 panic_on_oops=1\0" \ - "flashargs=" \ - "setenv bootargs " \ - "root=mtdblock:rootfs${boot_bank} " \ - "rootfstype=squashfs ro\0" \ - "" - -/* - * flash_boot - * - commands for booting from flash - * - * - 'cramfsloadkernel': copy kernel from a cramfs to ram - * - 'ubiattach': attach ubi partition - * - 'ubicopy': copy ubi volume to ram - * - volume names: bootfs0, bootfs1, bootfs2, ... - * - * processor specific settings - * - 'cramfsloadfdt': copy fdt from a cramfs to ram - */ -#define CONFIG_KM_DEF_ENV_FLASH_BOOT \ - "cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0" \ - "cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0" \ - "ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0" \ - "uimage=" CONFIG_KM_UIMAGE_NAME \ - CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI - -/* - * constants - * - KM specific constants and commands - * - * - 'default': setup default environment - */ -#define CONFIG_KM_DEF_ENV_CONSTANTS \ - "backup_bank=0\0" \ - "release=run newenv; reset\0" \ - "pnvramsize=" __stringify(CONFIG_KM_PNVRAM) "\0" \ - "testbootcmd=setenv boot_bank ${test_bank}; " \ - "run ${subbootcmds}; reset\0" \ - "env_version=1\0" \ - "" - -#ifndef CONFIG_KM_DEF_ENV -#define CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ENV_BOOTPARAMS \ - "netdev=" __stringify(CONFIG_KM_DEF_NETDEV) "\0" \ - CONFIG_KM_DEF_ENV_CPU \ - CONFIG_KM_DEF_ENV_BOOTTARGETS \ - CONFIG_KM_DEF_ENV_BOOTARGS \ - CONFIG_KM_DEF_ENV_FLASH_BOOT \ - CONFIG_KM_DEF_ENV_CONSTANTS \ - "altbootcmd=run bootcmd\0" \ - "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ - "bootcmd=km_checkbidhwk && " \ - "setenv bootcmd \'if km_checktestboot; then; " \ - "setenv boot_bank ${test_bank}; else; " \ - "setenv boot_bank ${actual_bank}; fi;" \ - "run ${subbootcmds}; reset\' && " \ - "setenv altbootcmd \'setenv boot_bank ${backup_bank}; " \ - "run ${subbootcmds}; reset\' && " \ - "saveenv && saveenv && boot\0" \ - "cramfsloadfdt=" \ - "cramfsload ${fdt_addr_r} " \ - "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \ - "fdt_addr_r=" __stringify(CONFIG_KM_FDT_ADDR) "\0" \ - "init=/sbin/init-overlay.sh\0" \ - "load_addr_r=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0" \ - "load=tftpboot ${load_addr_r} ${u-boot}\0" \ - "" -#endif /* CONFIG_KM_DEF_ENV */ - -#endif /* __CONFIG_KEYMILE_H */ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 2e1459e3e4..54102331a6 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -8,18 +8,6 @@ #ifndef __KMCENT2_H #define __KMCENT2_H -#define CONFIG_HOSTNAME "kmcent2" -#define KM_BOARD_NAME CONFIG_HOSTNAME - -/* - * The Linux fsl_fman driver needs to be able to process frames with more - * than just the VLAN tag (i.e. eDSA tag). It is passed as a kernel boot - * parameters - */ -#define CONFIG_KM_DEF_BOOT_ARGS_CPU "fsl_dpaa_fman.fsl_fm_max_frm=1558" - -#include "km/keymile-common.h" - /* Application IFC chip selects */ #define SYS_LAWAPP_BASE 0xc0000000 #define SYS_LAWAPP_BASE_PHYS (0xf00000000ull | SYS_LAWAPP_BASE) @@ -394,66 +382,4 @@ int get_scl(void); */ #define CONFIG_SYS_BOOTMAPSZ (64 << 20) /* Initial map for Linux*/ -/* - * Environment Configuration - */ -#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ -#define CONFIG_KM_DEF_ENV -#endif - -#define __USB_PHY_TYPE utmi - -#define CONFIG_KM_DEF_ENV_CPU \ - "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ - "cramfsloadfdt=" \ - "cramfsload ${fdt_addr_r} " \ - "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \ - "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ - "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) \ - " +${filesize} && " \ - "erase " __stringify(CONFIG_SYS_MONITOR_BASE) \ - " +${filesize} && " \ - "cp.b ${load_addr_r} " \ - __stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize} && " \ - "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \ - " +${filesize}\0" \ - "update-nor=protect off " __stringify(CONFIG_SYS_FLASH_BASE) \ - " +${filesize} && " \ - "erase " __stringify(CONFIG_SYS_FLASH_BASE) \ - " +${filesize} && " \ - "cp.b ${load_addr_r} " \ - __stringify(CONFIG_SYS_FLASH_BASE) " ${filesize} && " \ - "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \ - " +" __stringify(CONFIG_SYS_MONITOR_LEN) "\0" \ - "set_fdthigh=true\0" \ - "checkfdt=true\0" \ - "fpgacfg=true\0" \ - "" - -#define CONFIG_HW_ENV_SETTINGS \ - "hwconfig=fsl_ddr:ctlr_intlv=cacheline\0" \ - "usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ - "usb_dr_mode=host\0" - -#define CONFIG_KM_NEW_ENV \ - "newenv=protect off " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ - "erase " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ - "protect on " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0" - -/* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */ -#ifndef CONFIG_KM_DEF_ARCH -#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" -#endif - -#define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ARCH \ - CONFIG_KM_NEW_ENV \ - CONFIG_HW_ENV_SETTINGS \ - "EEprom_ivm=pca9547:70:9\0" \ - "" - #endif /* __KMCENT2_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c0f55e41a5..02295c74dd 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -91,23 +91,8 @@ CONFIG_IRAM_BASE CONFIG_IRAM_END CONFIG_IRAM_SIZE CONFIG_IRAM_TOP -CONFIG_KM_DEF_ARCH -CONFIG_KM_DEF_BOOT_ARGS_CPU -CONFIG_KM_DEF_ENV -CONFIG_KM_DEF_ENV_BOOTARGS -CONFIG_KM_DEF_ENV_BOOTPARAMS CONFIG_KM_DEF_ENV_BOOTTARGETS -CONFIG_KM_DEF_ENV_CONSTANTS -CONFIG_KM_DEF_ENV_CPU -CONFIG_KM_DEF_ENV_FLASH_BOOT -CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI -CONFIG_KM_ECC_MODE CONFIG_KM_NEW_ENV -CONFIG_KM_UBI_LINUX_MTD -CONFIG_KM_UBI_PARTITION_NAME_APP -CONFIG_KM_UBI_PARTITION_NAME_BOOT -CONFIG_KM_UBI_PART_BOOT_OPTS -CONFIG_KM_UIMAGE_NAME CONFIG_KSNET_CPSW_NUM_PORTS CONFIG_KSNET_MAC_ID_BASE CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE From patchwork Fri Dec 2 17:22:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Holger Brunck X-Patchwork-Id: 1711522 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=hitachienergy.com header.i=@hitachienergy.com header.a=rsa-sha256 header.s=duo-1630306886989-947ac67a header.b=Dyd9qJKa; dkim=pass (2048-bit key; unprotected) header.d=outbound.mailhop.org header.i=@outbound.mailhop.org header.a=rsa-sha256 header.s=dkim-high header.b=Y3i/bsuf; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NP0CN1Lpkz23nB for ; Sat, 3 Dec 2022 04:23:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8669A851ED; Fri, 2 Dec 2022 18:23:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=hitachienergy.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=hitachienergy.com header.i=@hitachienergy.com header.b="Dyd9qJKa"; dkim=pass (2048-bit key; unprotected) header.d=outbound.mailhop.org header.i=@outbound.mailhop.org header.b="Y3i/bsuf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6F6E484EC0; Fri, 2 Dec 2022 18:23:08 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from out-ip0052.fra.mailhop.org (out-ip0052.fra.mailhop.org [18.158.144.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id EFC3C8520E for ; Fri, 2 Dec 2022 18:22:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=hitachienergy.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=holger.brunck@hitachienergy.com ARC-Seal: i=1; a=rsa-sha256; t=1670001780; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=d8bnuKcwQltC6RbGjpqL+FsWWTmngZssSk2ZFYBBx49whjIKiPgiUbBtoGF8yTo3DeHR6VeLOa/Um R1xgT+cdU8+MsMMJmBAWH8oyANRcBKvErwLCTykSyVi2x7heLQGjUY/2SgmPV1aItGGtFnFHydlnw9 6KmXmBgfEGD8ZhssafoZ9E6en/5FfNiidzPyeJx6sMqjqU8z+G9gJmZZ1PhIx77uGELIrFI+9IDwc6 uSq8oTioUq6hXFDD3OvWpnjlGql1E7pld6qGNZDngoj1BmqpwW3FkJClrv0E8KkvN2J9QlI3b/lIzD gOQhdjXW88TXZQFMsDCs0KxHfzsTEcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:dkim-signature:dkim-signature:from; bh=VH8qW7oqFaZZlzg9Ms7ozPZmkvxRPafSe5tzPchQg64=; b=Zj7UpLfUgSJG2njQFtY7pNcTXXjyZY7zf44IA7yqLDetIXCDqIpel2BJLlHUuMkOIGvIuFPbxulE9 S5v9iU19IRaV7L3ziIanJMujSP9zVX9R0GIwAkiH3CFK2RxCsaylNtqcpW4PfjjUOHgHAku3ZXny1u /DyrX26iCVpqpEEAuPmcgQuHqhM4TmPZGjlRSyj4S0irwX0B8r/lXXH4cyJOOY7WnX7uoTqMKVV8PZ q6jktAcjt6TbnBSj6KRgv9cIxIT35M8C+t23URNtVDI1HN5HRENN8pqh07+0R3FPGaaOHMmHaRYQe7 hRlH9woK5gMWuIbDVRxxyHu0zuzk3RA== ARC-Authentication-Results: i=1; outbound2.eu.mailhop.org; spf=fail smtp.mailfrom=hitachienergy.com smtp.remote-ip=20.23.176.255; dmarc=fail header.from=hitachienergy.com; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hitachienergy.com; s=duo-1630306886989-947ac67a; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=VH8qW7oqFaZZlzg9Ms7ozPZmkvxRPafSe5tzPchQg64=; b=Dyd9qJKau1gBRslqrYWtjjKLTTDPIW3V8z2p53/4ncxrvjnTMnTCWEvEffjzahMmnvUz6N7xdSH/l yNZsuOp3v/O6Bpz57RnP9Ugw92ghB8JmB52B7GIE5pj+mJby+Pa5x0CzkpQiQSYDv/ZtlBdMEd0Uf0 IrFfIsaDhNdcTQpA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=VH8qW7oqFaZZlzg9Ms7ozPZmkvxRPafSe5tzPchQg64=; b=Y3i/bsuf9gnI/L1vbPCxDTSrtQs+SninYIVUNQW2O4it4Y8nqCAjRjrxz/NxwuYkLFWGo80JdR276 nAS3WGKeKe3t2eg/TWgw1coNkZxGcHm4CN3LYg23C0D/uIQI0J+b1tN3FhSUYZooAosZV7CV8uJLkZ DMU7AM1gdPC1hcrdX9CVxqd+CCpVSqmtEsrqnkDVbwrB55bKL4J8VZkjtwXlmQ1TdPneEwxdsD0TPm Infr1NhsBoE7pyeRtwt0ph7AIjWHdHC/+y6AYjNFa9yX9UzOmmV0xC05BQHpG2ULbxAqO42b+dCI6X /8RkZI5HCsBnQlJ3tlLhfAN+ZGcpb+Q== X-Originating-IP: 20.23.176.255 X-MHO-RoutePath: aGVkY3NtdHAwMDAx X-MHO-User: f494a398-7265-11ed-bc05-4b4748ac966b X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Mail-Handler: DuoCircle Outbound SMTP Received: from HPG0000000331.corp.hitachi-powergrids.com (unknown [20.23.176.255]) by outbound2.eu.mailhop.org (Halon) with ESMTPSA id f494a398-7265-11ed-bc05-4b4748ac966b; Fri, 02 Dec 2022 17:22:54 +0000 (UTC) Received: from gitsiv.hitachienergy.com (unknown [10.54.139.14]) by HPG0000000331.corp.hitachi-powergrids.com (Postfix) with SMTP id 6D7D731C; Fri, 2 Dec 2022 17:22:53 +0000 (UTC) Received: from ch10641.keymile.net.net (ch10641.keymile.net [172.31.40.7]) by gitsiv.hitachienergy.com (Postfix) with ESMTP id 367F1661C3EF; Fri, 2 Dec 2022 18:22:53 +0100 (CET) From: Holger Brunck To: u-boot@lists.denx.de Cc: Niel Fourie , Heiko Schocher , Aleksandar Gerasimovski , Tom Rini , Holger Brunck Subject: [PATCH 4/7] board/km/secu: migrate to use environment text files Date: Fri, 2 Dec 2022 18:22:40 +0100 Message-Id: <20221202172243.21046-5-holger.brunck@hitachienergy.com> X-Mailer: git-send-email 2.37.0.rc2.2.g39c15e4 In-Reply-To: <20221202172243.21046-1-holger.brunck@hitachienergy.com> References: <20221202172243.21046-1-holger.brunck@hitachienergy.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Instead of having these defines in a header file, move them to a simple text file. Signed-off-by: Holger Brunck --- board/keymile/secu1/socfpga_secu.env | 50 ++++++++++++++++++++++++ configs/socfpga_secu1_defconfig | 4 +- include/configs/socfpga_arria5_secu1.h | 53 -------------------------- scripts/config_whitelist.txt | 2 - 4 files changed, 52 insertions(+), 57 deletions(-) create mode 100644 board/keymile/secu1/socfpga_secu.env diff --git a/board/keymile/secu1/socfpga_secu.env b/board/keymile/secu1/socfpga_secu.env new file mode 100644 index 0000000000..147c4170ef --- /dev/null +++ b/board/keymile/secu1/socfpga_secu.env @@ -0,0 +1,50 @@ +altbootcmd=run bootcmd; +bootlimit=6 +bootnum=1 +bootretry=CONFIG_BOOT_RETRY_TIME + +develop=tftp 0x200000 scripts/develop-secu.txt && + env import -t 0x200000 ${filesize} && + saveenv && + reset + +fdt_addr=CONFIG_KM_FDT_ADDR +load=tftpboot ${loadaddr} u-boot-with-nand-spl.sfp +loadaddr=CONFIG_KM_KERNEL_ADDR +newenv=nand erase 0x100000 0x40000 +release=run newenv; reset +socfpga_legacy_reset_compat=1 +update=nand erase 0x0 0x00100000 && nand write ${loadaddr} 0x0 ${filesize} + +userload=ubi part nand.ubi && + ubi check rootfs$bootnum && + ubi read $fdt_addr dtb$bootnum && + ubi read $loadaddr kernel$bootnum + +userboot=setenv bootargs console=ttyS0,115200 ubi.fm_autoconvert=1 uio_pdrv_genirq.of_id="idq,regbank" + ubi.mtd=1 ubi.block=0,rootfs$bootnum root=/dev/ubiblock0_$ubivolid ro + rootfstype=squashfs init=sbin/preinit; + bootz ${loadaddr} - ${fdt_addr} + +verify=y + +/* + * FPGA Remote Update related environment + * + * Note that since those commands access the FPGA, the HPS-to-FPGA bridges + * MUST have been previously enabled (for example with 'bridge enable'). + */ +rmtu_page=0xFF29000C +rmtu_reconfig=0xFF290018 +fpga_safebase=0x0 +fpga_userbase=0x2000000 + +_fpga_loaduser=echo "Loading FPGA USER image..." && + mw ${rmtu_page} ${fpga_userbase} && + mw ${rmtu_reconfig} 1 + +_fpga_loadsafe=echo "Loading FPGA SAFE image..." && + mw ${rmtu_page} ${fpga_safebase} && + mw ${rmtu_reconfig} 1 + + diff --git a/configs/socfpga_secu1_defconfig b/configs/socfpga_secu1_defconfig index debe22f30a..c5c86a4515 100644 --- a/configs/socfpga_secu1_defconfig +++ b/configs/socfpga_secu1_defconfig @@ -3,7 +3,7 @@ CONFIG_SYS_L2_PL310=y CONFIG_ARCH_SOCFPGA=y CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SYS_MALLOC_F_LEN=0x800 -CONFIG_ENV_SIZE=0x1000 +CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x100000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_secu1" @@ -24,7 +24,6 @@ CONFIG_BOOT_RETRY=y CONFIG_BOOT_RETRY_TIME=45 CONFIG_RESET_TO_RETRY=y CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyS0,115200 ubi.fm_autoconvert=1 uio_pdrv_genirq.of_id=\"idq,regbank\"" CONFIG_BOOTCOMMAND="setenv bootcmd 'bridge enable; if test ${bootnum} = 'b'; then run _fpga_loadsafe; else if test ${bootcount} -eq 4; then echo 'Switching copy...'; setexpr x $bootnum % 2 && setexpr bootnum $x + 1; saveenv; fi; run _fpga_loaduser; fi;echo 'Booting bank $bootnum' && run userload && run userboot;' && setenv altbootcmd 'setenv bootnum b && saveenv && boot;' && saveenv && saveenv && boot;" CONFIG_DEFAULT_FDT_FILE="socfpga_arria5_secu1.dtb" CONFIG_SYS_CONSOLE_IS_IN_ENV=y @@ -65,6 +64,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set +CONFIG_ENV_SOURCE_FILE="socfpga_secu" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index 261ae56c1d..e5d742115c 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -7,7 +7,6 @@ #define __CONFIG_SOCFPGA_SECU1_H__ #include -#include /* Eternal oscillator */ #define CONFIG_SYS_TIMER_RATE 40000000 @@ -23,58 +22,6 @@ */ #define CONFIG_SYS_I2C_RTC_ADDR 0x68 -/* Environment settings */ - -/* - * FPGA Remote Update related environment - * - * Note that since those commands access the FPGA, the HPS-to-FPGA - * bridges MUST have been previously enabled (for example - * with 'bridge enable'). - */ -#define FPGA_RMTU_ENV \ - "rmtu_page=0xFF29000C\0" \ - "rmtu_reconfig=0xFF290018\0" \ - "fpga_safebase=0x0\0" \ - "fpga_userbase=0x2000000\0" \ - "_fpga_loaduser=echo Loading FPGA USER image..." \ - " && mw ${rmtu_page} ${fpga_userbase} && mw ${rmtu_reconfig} 1\0" \ - "_fpga_loadsafe=echo Loading FPGA SAFE image..." \ - " && mw ${rmtu_page} ${fpga_safebase} && mw ${rmtu_reconfig} 1\0" \ - -#define CONFIG_KM_NEW_ENV \ - "newenv=" \ - "nand erase 0x100000 0x40000\0" - -#define CONFIG_KM_DEF_ENV_BOOTTARGETS \ - "release=" \ - "run newenv; reset\0" \ - "develop=" \ - "tftp 0x200000 scripts/develop-secu.txt && env import -t 0x200000 ${filesize} && saveenv && reset\0" - -#define CONFIG_EXTRA_ENV_SETTINGS \ - FPGA_RMTU_ENV \ - CONFIG_KM_DEF_ENV_BOOTTARGETS \ - CONFIG_KM_NEW_ENV \ - "socfpga_legacy_reset_compat=1\0" \ - "altbootcmd=run bootcmd;\0" \ - "bootlimit=6\0" \ - "bootnum=1\0" \ - "bootretry=" __stringify(CONFIG_BOOT_RETRY_TIME) "\0" \ - "fdt_addr=" __stringify(CONFIG_KM_FDT_ADDR) "\0" \ - "load=tftpboot ${loadaddr} u-boot-with-nand-spl.sfp\0" \ - "loadaddr=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0" \ - "update=nand erase 0x0 0x00100000 && nand write ${loadaddr} 0x0 ${filesize}\0" \ - "userload=ubi part nand.ubi &&" \ - "ubi check rootfs$bootnum &&" \ - "ubi read $fdt_addr dtb$bootnum &&" \ - "ubi read $loadaddr kernel$bootnum\0" \ - "userboot=setenv bootargs " CONFIG_BOOTARGS \ - " ubi.mtd=1 ubi.block=0,rootfs$bootnum root=/dev/ubiblock0_$ubivolid" \ - " ro rootfstype=squashfs init=sbin/preinit;" \ - "bootz ${loadaddr} - ${fdt_addr}\0" \ - "verify=y\0" - /* The rest of the configuration is shared */ #include diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 02295c74dd..8cef41dace 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -91,8 +91,6 @@ CONFIG_IRAM_BASE CONFIG_IRAM_END CONFIG_IRAM_SIZE CONFIG_IRAM_TOP -CONFIG_KM_DEF_ENV_BOOTTARGETS -CONFIG_KM_NEW_ENV CONFIG_KSNET_CPSW_NUM_PORTS CONFIG_KSNET_MAC_ID_BASE CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE From patchwork Fri Dec 2 17:22:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Holger Brunck X-Patchwork-Id: 1711523 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=hitachienergy.com header.i=@hitachienergy.com header.a=rsa-sha256 header.s=duo-1630306886989-947ac67a header.b=g+N2Nser; dkim=pass (2048-bit key; unprotected) header.d=outbound.mailhop.org header.i=@outbound.mailhop.org header.a=rsa-sha256 header.s=dkim-high header.b=Ebs+cYLz; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NP0Cg0GsHz23nB for ; Sat, 3 Dec 2022 04:23:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B7A7385225; Fri, 2 Dec 2022 18:23:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=hitachienergy.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=hitachienergy.com header.i=@hitachienergy.com header.b="g+N2Nser"; dkim=pass (2048-bit key; unprotected) header.d=outbound.mailhop.org header.i=@outbound.mailhop.org header.b="Ebs+cYLz"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DD1968510C; Fri, 2 Dec 2022 18:23:07 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from out-ip0051.fra.mailhop.org (out-ip0051.fra.mailhop.org [18.193.30.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 759C28523A for ; Fri, 2 Dec 2022 18:23:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=hitachienergy.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=holger.brunck@hitachienergy.com ARC-Seal: i=1; a=rsa-sha256; t=1670001780; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=U+JIDoH9JyXvZ8i7jDhnvvVZZ3bXbx3jIJa/AOWjRQJPD2B5zJcBirSZEThsC3PIntp/Gac8mdfZ5 EZIG6Y1U0VquOOdocKbeSvp0IfUqyrZxjLP6c19jrGCwl7CLaKk7uP/A/N8qdY5fItY2H3Q18u9bZP BcXC+EHitiTRQnjpouF4bAZUkHpmV3m+gXiQlSpMV40U6XZ+jdf3Pv2tYT1m6wl/wbmjCNszif1DTl wBfGVCVBgnvx6Kqb2VxCLrl7LpvUBMPrcOTkOAQ1s6iR89nl8+C+cxgpS8HQAQENr5gpPRgpwQb4LI f21iAjCNoNvUjmXMudNIrYW37u0PD4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:dkim-signature:dkim-signature:from; bh=sTdvliHIP6ASEvfsoyHodI6Qq+xllbHFDFFXb7kBvs4=; b=UoKwuA+2SLWwor9i1/CXVom8E9r/TrDIxryMOfHo1c6xOtMsFZPNgDhPzeC86IqiPxhHaQRGdKFEm t7AI5oefSfsF9cF4W1h/Rxt7wvWGzWrPB5Z4yPfusOSpG8mg5g5FQy/wRcgor58XaLfnO0lgqs27kq Zc5E24oJT8+HnxH7PYq3VAXE+aXbQKqP/zN927SHv3epoPJWUHiGsuz+IZiyskqV9mDoOo+jSt8K1Z FSlYSM9PBEWt1mCilSDzfu34G5ftoAJiA4Cp0HPKJb1NPmZTwJvHgPm2CAxNsrmOYzzSwfLZfEZ9eQ ig8EHRyxdJWOSpoiWPOyh6ubQbyN6Jg== ARC-Authentication-Results: i=1; outbound2.eu.mailhop.org; spf=fail smtp.mailfrom=hitachienergy.com smtp.remote-ip=20.50.19.116; dmarc=fail header.from=hitachienergy.com; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hitachienergy.com; s=duo-1630306886989-947ac67a; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=sTdvliHIP6ASEvfsoyHodI6Qq+xllbHFDFFXb7kBvs4=; b=g+N2Nser4CqtIxRAb6PwyXQ8xq2T6PpP6zd0g5n4u3swMaGG8tXoJICnSxsa+BhnZ24MG7oPXrF5J ppqE8svT7IbMwRDMrFotT5YozJZrX5ihVHm0sime6KBk9Q1k6rHS+4fI4z788sxwg1tBuDOLvmN0No FxLukU6q3Qz9ld0o= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=sTdvliHIP6ASEvfsoyHodI6Qq+xllbHFDFFXb7kBvs4=; b=Ebs+cYLzz1DBCVZeIvLe6jaxPvEoO5LCf4fwvUWGKlrY5I1TorAtT+fBOXB0LEUSYb1TXBtBOxMid kdW/ZChnf+VLQapDLLlTSbgwLELEq34eKVql4Wqux91TSW0QQpxART8TXrykIAlvlWWVXJf+D8FmZk msrTA6E7dwpYKPYFBp8gnlHgTX9ViRpX3ccsDil8au/AKQgthVsc2zt52SBQ4f0I/Hu+ynfNjvHR6/ +B4+++vXSzmg+QvAVf5JPUbSczpUH7ndmmNCMdo4tfwdVoLHJI495A5Ew5qMA3VCaPrT7011VNN9Tg AmFG383weK6YbnVaLn2J2NkmIxQVkhw== X-Originating-IP: 20.50.19.116 X-MHO-RoutePath: aGVkY3NtdHAwMDAx X-MHO-User: f4a60bd0-7265-11ed-bc05-4b4748ac966b X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Mail-Handler: DuoCircle Outbound SMTP Received: from HPG0000000331.corp.hitachi-powergrids.com (unknown [20.50.19.116]) by outbound2.eu.mailhop.org (Halon) with ESMTPSA id f4a60bd0-7265-11ed-bc05-4b4748ac966b; Fri, 02 Dec 2022 17:22:54 +0000 (UTC) Received: from gitsiv.hitachienergy.com (unknown [10.54.139.14]) by HPG0000000331.corp.hitachi-powergrids.com (Postfix) with SMTP id AB88331E; Fri, 2 Dec 2022 17:22:53 +0000 (UTC) Received: from ch10641.keymile.net.net (ch10641.keymile.net [172.31.40.7]) by gitsiv.hitachienergy.com (Postfix) with ESMTP id 43A6E661C3F3; Fri, 2 Dec 2022 18:22:53 +0100 (CET) From: Holger Brunck To: u-boot@lists.denx.de Cc: Niel Fourie , Heiko Schocher , Aleksandar Gerasimovski , Tom Rini , Holger Brunck Subject: [PATCH 5/7] board/km: remove obsolete ARCH_KIRKWOOD Date: Fri, 2 Dec 2022 18:22:41 +0100 Message-Id: <20221202172243.21046-6-holger.brunck@hitachienergy.com> X-Mailer: git-send-email 2.37.0.rc2.2.g39c15e4 In-Reply-To: <20221202172243.21046-1-holger.brunck@hitachienergy.com> References: <20221202172243.21046-1-holger.brunck@hitachienergy.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean We already removed the support for these boards. Signed-off-by: Holger Brunck --- board/keymile/Kconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index 46d0897108..cd8a06e278 100644 --- a/board/keymile/Kconfig +++ b/board/keymile/Kconfig @@ -34,7 +34,6 @@ config KM_PHRAM config KM_RESERVED_PRAM hex "Reserved RAM" - default 0x801000 if ARCH_KIRKWOOD default 0x0 if MPC83xx default 0x1000 if MPC85xx || ARCH_LS1021A depends on !ARCH_SOCFPGA @@ -79,7 +78,7 @@ config SYS_CLIPS_BASE config KM_COMMON_ETH_INIT bool "Common Ethernet Initialization" - default y if ARCH_KIRKWOOD || MPC83xx + default y if MPC83xx default n if MPC85xx || ARCH_SOCFPGA || ARCH_LS1021A help Use the Ethernet initialization implemented in common code that @@ -101,7 +100,7 @@ config KM_MVEXTSW_ADDR config KM_IVM_BUS int "IVM I2C Bus" default 0 if ARCH_SOCFPGA - default 1 if ARCH_KIRKWOOD || MPC85xx || ARCH_LS1021A + default 1 if MPC85xx || ARCH_LS1021A default 2 if MPC83xx help Identifier number of I2C bus, where the inventory EEPROM is connected to. From patchwork Fri Dec 2 17:22:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Holger Brunck X-Patchwork-Id: 1711524 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=hitachienergy.com header.i=@hitachienergy.com header.a=rsa-sha256 header.s=duo-1630306886989-947ac67a header.b=S0YCb1C2; dkim=pass (2048-bit key; unprotected) header.d=outbound.mailhop.org header.i=@outbound.mailhop.org header.a=rsa-sha256 header.s=dkim-high header.b=V6Fel8jS; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NP0Cw6WwJz23nB for ; Sat, 3 Dec 2022 04:23:56 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DBC8885334; Fri, 2 Dec 2022 18:23:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=hitachienergy.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=hitachienergy.com header.i=@hitachienergy.com header.b="S0YCb1C2"; dkim=pass (2048-bit key; unprotected) header.d=outbound.mailhop.org header.i=@outbound.mailhop.org header.b="V6Fel8jS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 377908520E; Fri, 2 Dec 2022 18:23:13 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from out-ip0052.fra.mailhop.org (out-ip0052.fra.mailhop.org [18.158.144.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id DA2E8852EF for ; Fri, 2 Dec 2022 18:23:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=hitachienergy.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=holger.brunck@hitachienergy.com ARC-Seal: i=1; a=rsa-sha256; t=1670001780; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=o951JvyO0IKYG8jk0/W7PWfUqXmwSwqYnbd+fyFXN663g69Obgl+nYWZv5/QEQ6QH/cb9ZND6+IJ7 VEyvQwkUxG58iHCsHN/qD6u6Fta6cz0EnRVvQ6QVyL5bi4ozKEhBYsx70cOhsfTx18ORyHqdrGu0hv yYsO/0vk5OerIGoIBm9T1qCc9M4tipko6XhL1hrbV5MJjTB6zjHPOe/hN0lFrBsCJiFr5pV/5C4FGe t4MvIVQFtw6Sm8VF6re+6P7BgvSFo+x96oLjO2nUDNONIqkKLLyLNyvnY7akoPvFYi0W2jqTX2d+Zo tDe+615xTp6Izk9tlh7SIrPr6VHi6TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:dkim-signature:dkim-signature:from; bh=6QnHYSQgUjDEjHeXAQM/IFOqt5jjEOLYGVKJS/TdEd8=; b=hZU/B8A4nKBUrma96mWuRyli4pxeFpreW3kdAbc9IfROFtDZP4voRj8lQ2j5TX2KUW9P/U1EY+5rt qMrJoJcZpibnEHRzH82n9AaIbtrs9lHT0MSj04ibukh995+HFRkDIDva4xmY0qGk+tTXj6moquyGOd +cyHl6ecC/NTyBG3F0qvegWvjsRJicRwblfYFMzmtTNV2+kCYub2cjhJHxVAUYZVZnQcZ+4j8xw2hl a+0RxmaKMT0meUgIYr0DShUQRmPd2A4qkZidMSwPQA2Jllef2x3Ug3EhHSZir5JtUuLx3lDMsRDKNZ aYqji6CI5VINODHqBobIFiIyICJsHWA== ARC-Authentication-Results: i=1; outbound2.eu.mailhop.org; spf=fail smtp.mailfrom=hitachienergy.com smtp.remote-ip=20.23.176.253; dmarc=fail header.from=hitachienergy.com; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hitachienergy.com; s=duo-1630306886989-947ac67a; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=6QnHYSQgUjDEjHeXAQM/IFOqt5jjEOLYGVKJS/TdEd8=; b=S0YCb1C2h3SJ3LoUUSeG/37Q2FNSMF4jDk2xahcavm8nC79y9+56MyJowldFCuFbSk385vdOluQ6d h6TrQVTHgHZqEuyrdvl+93NI3L4GuBrmnr73CwD0yD97HjL3R+LOPeC3bMu8DI9U//aAsjaB9J2I41 3T4KDTOPSF2zTjz8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=6QnHYSQgUjDEjHeXAQM/IFOqt5jjEOLYGVKJS/TdEd8=; b=V6Fel8jSfppW+cdDzoKw/uTwHXCIrijrtZCMpXVT1+aS0fpU3xZGgqVyq06h7FoB8cWfpcDW2h6jB mwuSDORqvKz0XjkKlVHwGbjaI75MOveAp+Cj3P0wUfVBd3wSeyWVkEtYi9GWzALX7cdHUFmQ7fF/Qg wN/bWehqPVphltbehdIvL3fkvKjVMvw8ZrjeSamIXfnmBYp9QuvCG0PFkeYGzhloHuyxQas2GcIJYv 7pgAcgdtZm1rJtNtFJ8sBk/jvwok5W70PP2q4u9wy4Jh5enLWVup0CLAyX1raR4wHXfLXIN8oF6RuV 6p9cvsl+ZSVYfAgE/QtwBh8eVXkqlXg== X-Originating-IP: 20.23.176.253 X-MHO-RoutePath: aGVkY3NtdHAwMDAx X-MHO-User: f49bc523-7265-11ed-bc05-4b4748ac966b X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Mail-Handler: DuoCircle Outbound SMTP Received: from HPG0000000331.corp.hitachi-powergrids.com (unknown [20.23.176.253]) by outbound2.eu.mailhop.org (Halon) with ESMTPSA id f49bc523-7265-11ed-bc05-4b4748ac966b; Fri, 02 Dec 2022 17:22:54 +0000 (UTC) Received: from gitsiv.hitachienergy.com (unknown [10.54.139.14]) by HPG0000000331.corp.hitachi-powergrids.com (Postfix) with SMTP id A4FCB31D; Fri, 2 Dec 2022 17:22:53 +0000 (UTC) Received: from ch10641.keymile.net.net (ch10641.keymile.net [172.31.40.7]) by gitsiv.hitachienergy.com (Postfix) with ESMTP id 500E2661C3F4; Fri, 2 Dec 2022 18:22:53 +0100 (CET) From: Holger Brunck To: u-boot@lists.denx.de Cc: Niel Fourie , Heiko Schocher , Aleksandar Gerasimovski , Tom Rini , Holger Brunck Subject: [PATCH 6/7] km/ppc: migrate all mpc83xx to DM_I2C Date: Fri, 2 Dec 2022 18:22:42 +0100 Message-Id: <20221202172243.21046-7-holger.brunck@hitachienergy.com> X-Mailer: git-send-email 2.37.0.rc2.2.g39c15e4 In-Reply-To: <20221202172243.21046-1-holger.brunck@hitachienergy.com> References: <20221202172243.21046-1-holger.brunck@hitachienergy.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Enable DM_I2C and I2C mux to get rid of the usage of the legacy i2c driver. Signed-off-by: Holger Brunck --- board/keymile/Kconfig | 3 +- board/keymile/km83xx/Makefile | 2 +- board/keymile/km83xx/km83xx_i2c.c | 73 ------------------------------- configs/kmcoge5ne_defconfig | 9 ++-- configs/kmeter1_defconfig | 9 ++-- configs/kmopti2_defconfig | 9 ++-- configs/kmsupx5_defconfig | 9 ++-- configs/kmtepr2_defconfig | 9 ++-- configs/tuge1_defconfig | 9 ++-- configs/tuxx1_defconfig | 9 ++-- include/configs/km/km-mpc83xx.h | 8 ---- 11 files changed, 23 insertions(+), 126 deletions(-) delete mode 100644 board/keymile/km83xx/km83xx_i2c.c diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index cd8a06e278..e5d7c80a86 100644 --- a/board/keymile/Kconfig +++ b/board/keymile/Kconfig @@ -100,8 +100,7 @@ config KM_MVEXTSW_ADDR config KM_IVM_BUS int "IVM I2C Bus" default 0 if ARCH_SOCFPGA - default 1 if MPC85xx || ARCH_LS1021A - default 2 if MPC83xx + default 1 if PPC || ARCH_LS1021A help Identifier number of I2C bus, where the inventory EEPROM is connected to. diff --git a/board/keymile/km83xx/Makefile b/board/keymile/km83xx/Makefile index 0aef654987..bdb358e2d2 100644 --- a/board/keymile/km83xx/Makefile +++ b/board/keymile/km83xx/Makefile @@ -3,4 +3,4 @@ # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -obj-y += km83xx.o ../common/common.o ../common/ivm.o km83xx_i2c.o +obj-y += km83xx.o ../common/common.o ../common/ivm.o diff --git a/board/keymile/km83xx/km83xx_i2c.c b/board/keymile/km83xx/km83xx_i2c.c deleted file mode 100644 index b80672d1b4..0000000000 --- a/board/keymile/km83xx/km83xx_i2c.c +++ /dev/null @@ -1,73 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * (C) Copyright 2011 - * Holger Brunck, Keymile GmbH Hannover, holger.brunck@keymile.com - */ - -#include -#include -#include -#include -#include -#include "../common/common.h" - -static void i2c_write_start_seq(void) -{ - struct fsl_i2c_base *base; - base = (struct fsl_i2c_base *)(CONFIG_SYS_IMMR + - CONFIG_SYS_FSL_I2C_OFFSET); - udelay(DELAY_ABORT_SEQ); - out_8(&base->cr, (I2C_CR_MEN | I2C_CR_MSTA)); - udelay(DELAY_ABORT_SEQ); - out_8(&base->cr, (I2C_CR_MEN)); -} - -int i2c_make_abort(void) -{ - struct fsl_i2c_base *base; - base = (struct fsl_i2c_base *)(CONFIG_SYS_IMMR + - CONFIG_SYS_FSL_I2C_OFFSET); - uchar last; - int nbr_read = 0; - int i = 0; - int ret = 0; - - /* wait after each operation to finsh with a delay */ - out_8(&base->cr, (I2C_CR_MSTA)); - udelay(DELAY_ABORT_SEQ); - out_8(&base->cr, (I2C_CR_MEN | I2C_CR_MSTA)); - udelay(DELAY_ABORT_SEQ); - in_8(&base->dr); - udelay(DELAY_ABORT_SEQ); - last = in_8(&base->dr); - nbr_read++; - - /* - * do read until the last bit is 1, but stop if the full eeprom is - * read. - */ - while (((last & 0x01) != 0x01) && - (nbr_read < CONFIG_SYS_IVM_EEPROM_MAX_LEN)) { - udelay(DELAY_ABORT_SEQ); - last = in_8(&base->dr); - nbr_read++; - } - if ((last & 0x01) != 0x01) - ret = -2; - if ((last != 0xff) || (nbr_read > 1)) - printf("[INFO] i2c abort after %d bytes (0x%02x)\n", - nbr_read, last); - udelay(DELAY_ABORT_SEQ); - out_8(&base->cr, (I2C_CR_MEN)); - udelay(DELAY_ABORT_SEQ); - /* clear status reg */ - out_8(&base->sr, 0); - - for (i = 0; i < 5; i++) - i2c_write_start_seq(); - if (ret != 0) - printf("[ERROR] i2c abort failed after %d bytes (0x%02x)\n", - nbr_read, last); - - return ret; -} diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig index 389800795d..26db5a9d3b 100644 --- a/configs/kmcoge5ne_defconfig +++ b/configs/kmcoge5ne_defconfig @@ -218,13 +218,10 @@ CONFIG_SYS_OR3_PRELIM=0xF0000E25 CONFIG_SYS_BR4_PRELIM_BOOL=y CONFIG_SYS_BR4_PRELIM=0xB0000801 CONFIG_SYS_OR4_PRELIM=0xF0000E25 -CONFIG_SYS_I2C_LEGACY=y +CONFIG_DM_I2C=y CONFIG_SYS_I2C_FSL=y -CONFIG_SYS_FSL_I2C_OFFSET=0x3000 -CONFIG_SYS_FSL_HAS_I2C2_OFFSET=y -CONFIG_SYS_FSL_I2C2_OFFSET=0x3100 -CONFIG_SYS_I2C_SLAVE=0x7F -CONFIG_SYS_I2C_SPEED=200000 +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig index 257b6a4546..36a242b491 100644 --- a/configs/kmeter1_defconfig +++ b/configs/kmeter1_defconfig @@ -184,13 +184,10 @@ CONFIG_SYS_OR1_PRELIM=0xFC000E25 CONFIG_SYS_BR3_PRELIM_BOOL=y CONFIG_SYS_BR3_PRELIM=0xA0000801 CONFIG_SYS_OR3_PRELIM=0xF0000E25 -CONFIG_SYS_I2C_LEGACY=y +CONFIG_DM_I2C=y CONFIG_SYS_I2C_FSL=y -CONFIG_SYS_FSL_I2C_OFFSET=0x3000 -CONFIG_SYS_FSL_HAS_I2C2_OFFSET=y -CONFIG_SYS_FSL_I2C2_OFFSET=0x3100 -CONFIG_SYS_I2C_SLAVE=0x7F -CONFIG_SYS_I2C_SPEED=200000 +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig index 53d37fa020..0148d340d7 100644 --- a/configs/kmopti2_defconfig +++ b/configs/kmopti2_defconfig @@ -199,13 +199,10 @@ CONFIG_SYS_OR2_PRELIM=0xF0000C25 CONFIG_SYS_BR3_PRELIM_BOOL=y CONFIG_SYS_BR3_PRELIM=0xB0001001 CONFIG_SYS_OR3_PRELIM=0xF0000040 -CONFIG_SYS_I2C_LEGACY=y +CONFIG_DM_I2C=y CONFIG_SYS_I2C_FSL=y -CONFIG_SYS_FSL_I2C_OFFSET=0x3000 -CONFIG_SYS_FSL_HAS_I2C2_OFFSET=y -CONFIG_SYS_FSL_I2C2_OFFSET=0x3100 -CONFIG_SYS_I2C_SLAVE=0x7F -CONFIG_SYS_I2C_SPEED=200000 +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig index 95b8518bdb..3822666618 100644 --- a/configs/kmsupx5_defconfig +++ b/configs/kmsupx5_defconfig @@ -176,13 +176,10 @@ CONFIG_SYS_OR1_PRELIM=0xF8000E25 CONFIG_SYS_BR2_PRELIM_BOOL=y CONFIG_SYS_BR2_PRELIM=0xA0000801 CONFIG_SYS_OR2_PRELIM=0xF0000C25 -CONFIG_SYS_I2C_LEGACY=y +CONFIG_DM_I2C=y CONFIG_SYS_I2C_FSL=y -CONFIG_SYS_FSL_I2C_OFFSET=0x3000 -CONFIG_SYS_FSL_HAS_I2C2_OFFSET=y -CONFIG_SYS_FSL_I2C2_OFFSET=0x3100 -CONFIG_SYS_I2C_SLAVE=0x7F -CONFIG_SYS_I2C_SPEED=200000 +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig index 0ebb049cfe..452902c77d 100644 --- a/configs/kmtepr2_defconfig +++ b/configs/kmtepr2_defconfig @@ -198,13 +198,10 @@ CONFIG_SYS_OR2_PRELIM=0xF0000C25 CONFIG_SYS_BR3_PRELIM_BOOL=y CONFIG_SYS_BR3_PRELIM=0xB0001001 CONFIG_SYS_OR3_PRELIM=0xF0000040 -CONFIG_SYS_I2C_LEGACY=y +CONFIG_DM_I2C=y CONFIG_SYS_I2C_FSL=y -CONFIG_SYS_FSL_I2C_OFFSET=0x3000 -CONFIG_SYS_FSL_HAS_I2C2_OFFSET=y -CONFIG_SYS_FSL_I2C2_OFFSET=0x3100 -CONFIG_SYS_I2C_SLAVE=0x7F -CONFIG_SYS_I2C_SPEED=200000 +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig index 6758b59d95..8c9204f173 100644 --- a/configs/tuge1_defconfig +++ b/configs/tuge1_defconfig @@ -176,13 +176,10 @@ CONFIG_SYS_OR1_PRELIM=0xF8000E25 CONFIG_SYS_BR2_PRELIM_BOOL=y CONFIG_SYS_BR2_PRELIM=0xA0000801 CONFIG_SYS_OR2_PRELIM=0xF0000C25 -CONFIG_SYS_I2C_LEGACY=y +CONFIG_DM_I2C=y CONFIG_SYS_I2C_FSL=y -CONFIG_SYS_FSL_I2C_OFFSET=0x3000 -CONFIG_SYS_FSL_HAS_I2C2_OFFSET=y -CONFIG_SYS_FSL_I2C2_OFFSET=0x3100 -CONFIG_SYS_I2C_SLAVE=0x7F -CONFIG_SYS_I2C_SPEED=200000 +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig index 0db4cee27b..ae26736deb 100644 --- a/configs/tuxx1_defconfig +++ b/configs/tuxx1_defconfig @@ -200,13 +200,10 @@ CONFIG_SYS_OR2_PRELIM=0xF0000C25 CONFIG_SYS_BR3_PRELIM_BOOL=y CONFIG_SYS_BR3_PRELIM=0xB0000801 CONFIG_SYS_OR3_PRELIM=0xF0000E24 -CONFIG_SYS_I2C_LEGACY=y +CONFIG_DM_I2C=y CONFIG_SYS_I2C_FSL=y -CONFIG_SYS_FSL_I2C_OFFSET=0x3000 -CONFIG_SYS_FSL_HAS_I2C2_OFFSET=y -CONFIG_SYS_FSL_I2C2_OFFSET=0x3100 -CONFIG_SYS_I2C_SLAVE=0x7F -CONFIG_SYS_I2C_SPEED=200000 +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA954x=y # CONFIG_MMC is not set CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 17e596a687..1c5611c493 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -49,14 +49,6 @@ #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } -/* I2C */ -#define CONFIG_SYS_NUM_I2C_BUSES 4 -#define CONFIG_SYS_I2C_MAX_HOPS 1 -#define CONFIG_SYS_I2C_BUSES {{0, {I2C_NULL_HOP} }, \ - {0, {{I2C_MUX_PCA9547, 0x70, 2} } }, \ - {0, {{I2C_MUX_PCA9547, 0x70, 1} } }, \ - {1, {I2C_NULL_HOP} } } - #if defined(CONFIG_CMD_NAND) #define CONFIG_NAND_KMETER1 #define CONFIG_SYS_NAND_BASE CONFIG_SYS_KMBEC_FPGA_BASE From patchwork Fri Dec 2 17:22:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Holger Brunck X-Patchwork-Id: 1711527 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=hitachienergy.com header.i=@hitachienergy.com header.a=rsa-sha256 header.s=duo-1630306886989-947ac67a header.b=ivAX5ncU; dkim=pass (2048-bit key; unprotected) header.d=outbound.mailhop.org header.i=@outbound.mailhop.org header.a=rsa-sha256 header.s=dkim-high header.b=dzvOwLw4; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NP0Dh1nRJz23nB for ; Sat, 3 Dec 2022 04:24:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AE3E1853E9; Fri, 2 Dec 2022 18:23:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=hitachienergy.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=hitachienergy.com header.i=@hitachienergy.com header.b="ivAX5ncU"; dkim=pass (2048-bit key; unprotected) header.d=outbound.mailhop.org header.i=@outbound.mailhop.org header.b="dzvOwLw4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D409D851D9; Fri, 2 Dec 2022 18:23:16 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from out-ip0052.fra.mailhop.org (out-ip0052.fra.mailhop.org [18.158.144.38]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 24A7D852AB for ; Fri, 2 Dec 2022 18:23:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=hitachienergy.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=holger.brunck@hitachienergy.com ARC-Seal: i=1; a=rsa-sha256; t=1670001781; cv=none; d=outbound.mailhop.org; s=arc-outbound20181012; b=K0bm8U/DWGaG+7kDTbVeXtbr/Ka8PZQBU7prtyXTM7ocwu3ufZLu3Wi7zApDVA67Jfiu+vrgmJlFg C/7AN/WallJYGo+X9GU6eP7K9KzJtxJ2PMEr8kK+lvQxEWk9iYbsiIdEFqUiLRryQMvtdHUzhO5Mtb 11AUAq30DtkF2nVObZd2YEo+QlBX8ucyv1cp5NyC9PYuNE4xYxP8UzWR3fj66XfJj4sR5NU9C3toU3 exOFc5soxIEarmyrHRNQPk8Rfg2YwzmsCiooTlFDoYw7yg7XGq5L15dvLG/7hz1EOX2L4/ACIzqUod VSBbYupSao/BvSbox85kq6Kk+gJgN5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=arc-outbound20181012; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:dkim-signature:dkim-signature:from; bh=Ul/xdFdeKuSowIBTf0n+34RCXSmJ7bu85mkKLgnBzdQ=; b=FsXKessilMwynhO7dl+x6GgNDsMATGFJLXZ9OcsgKa8MN1jWNO6VYjgDZBt1h5y3w5qx83ms0hV1m bZZlfOYqK9PVJtKjI6KaGCm3MkJT/CCnZ+Cdf83zgcMZo4N2j2MkJqLOnoIrC3oDbO/cKf7jcoKPTM +SzqDzXA3LxsU7/FC3OjB18ETlq1C6OMz4Nk4ELI6ABAIXlq3+e4VSV2hbN0YMPTSMWS9W7oGFQddy /q/f+zkEibiwVP5DJP9GwmUTMGCEx3TT3Mq0R+XqjtwF/ql5Ax0uLGKOBlUQqOGA1EBl7T3kpY9mTF rgtHemtA9D4mU/LX1gn6Cq2xfJTBRlA== ARC-Authentication-Results: i=1; outbound3.eu.mailhop.org; spf=fail smtp.mailfrom=hitachienergy.com smtp.remote-ip=20.241.147.199; dmarc=fail header.from=hitachienergy.com; arc=none header.oldest-pass=0; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hitachienergy.com; s=duo-1630306886989-947ac67a; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=Ul/xdFdeKuSowIBTf0n+34RCXSmJ7bu85mkKLgnBzdQ=; b=ivAX5ncUVqZc51d1ZuQBgI6u4yJSld6S8C9y0Au52FhmRYx7deleWiobTv2fjx3qnFmLwxGubFeO9 k19KF9ekmhsRu5/xtStJ/E+O7igImh8rUm2YC697BTzg/h0MginTfjlXClznzszipcXj655GgIWR/f klZRvjMA6ld9TZUg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outbound.mailhop.org; s=dkim-high; h=content-transfer-encoding:mime-version:references:in-reply-to:message-id:date: subject:cc:to:from:from; bh=Ul/xdFdeKuSowIBTf0n+34RCXSmJ7bu85mkKLgnBzdQ=; b=dzvOwLw4CF5rGs430eDkfvDW6Gn1dpsyoSIxnOZhlwK2P6rNbGphUd0ajRKtm0VDarZ7zCC+xsFq3 y/VcV2K2UwXiCLbpgMkWk4EMfOVeyW+MXUwC5eYs0v5GuOclUJ3OBHYc8dQSC/DRqXCNRfgdfCKXD8 5onOPghTtF4sSyEDhfiLZGYSA4+FxoFKicRWwx5JOUm14T9gtJmL4GhzNHW3L7XpAR5iojVtdKuUh/ pJF+s6igm5srbP/n07OlVdRHToZj1c2ZHNZ8NmgeqPxLxZM358gwql9TyRJRez1O4vBGFHiM/oJn8P fQJr1AsLo1Uc48pRpJhdsqGB3CVJ7kQ== X-Originating-IP: 20.241.147.199 X-MHO-RoutePath: aGVkY3NtdHAwMDAx X-MHO-User: f5652ac5-7265-11ed-be1c-8777f00826c1 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Mail-Handler: DuoCircle Outbound SMTP Received: from HPG0000000548.corp.hitachi-powergrids.com (unknown [20.241.147.199]) by outbound3.eu.mailhop.org (Halon) with ESMTPSA id f5652ac5-7265-11ed-be1c-8777f00826c1; Fri, 02 Dec 2022 17:22:56 +0000 (UTC) Received: from gitsiv.hitachienergy.com (unknown [10.54.139.14]) by HPG0000000548.corp.hitachi-powergrids.com (Postfix) with SMTP id 2EE7523DEA; Fri, 2 Dec 2022 17:22:54 +0000 (UTC) Received: from ch10641.keymile.net.net (ch10641.keymile.net [172.31.40.7]) by gitsiv.hitachienergy.com (Postfix) with ESMTP id 53C9C661C3F2; Fri, 2 Dec 2022 18:22:53 +0100 (CET) From: Holger Brunck To: u-boot@lists.denx.de Cc: Niel Fourie , Heiko Schocher , Aleksandar Gerasimovski , Tom Rini , Holger Brunck Subject: [PATCH 7/7] km/mpc8360: remove unused CONFIG_SYS_PAXE defines Date: Fri, 2 Dec 2022 18:22:43 +0100 Message-Id: <20221202172243.21046-8-holger.brunck@hitachienergy.com> X-Mailer: git-send-email 2.37.0.rc2.2.g39c15e4 In-Reply-To: <20221202172243.21046-1-holger.brunck@hitachienergy.com> References: <20221202172243.21046-1-holger.brunck@hitachienergy.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean These are unused defines and can be dropped. Signed-off-by: Holger Brunck --- include/configs/km/km-mpc8360.h | 7 ------- scripts/config_whitelist.txt | 1 - 2 files changed, 8 deletions(-) diff --git a/include/configs/km/km-mpc8360.h b/include/configs/km/km-mpc8360.h index 92e046d02d..185bf9f7ce 100644 --- a/include/configs/km/km-mpc8360.h +++ b/include/configs/km/km-mpc8360.h @@ -66,10 +66,3 @@ #define CONFIG_SYS_DDR_TIMING_3 0x00000000 -/* EEprom support */ - -/* - * PAXE on the local bus CS3 - */ -#define CONFIG_SYS_PAXE_BASE 0xA0000000 -#define CONFIG_SYS_PAXE_SIZE 256 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8cef41dace..44d1b29e44 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -688,7 +688,6 @@ CONFIG_SYS_PAGE_SIZE CONFIG_SYS_PAMU_ADDR CONFIG_SYS_PASPAR CONFIG_SYS_PAXE_BASE -CONFIG_SYS_PAXE_SIZE CONFIG_SYS_PBCNT CONFIG_SYS_PBDAT CONFIG_SYS_PBDDR