From patchwork Mon Jul 24 03:19:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 792623 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="jYSRou6/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xG6Cr4jTHz9s1h for ; Mon, 24 Jul 2017 13:23:52 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 5C3B0C21DA5; Mon, 24 Jul 2017 03:23:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 77BA1C21DA9; Mon, 24 Jul 2017 03:20:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D1516C21D84; Mon, 24 Jul 2017 03:20:36 +0000 (UTC) Received: from mail-oi0-f47.google.com (mail-oi0-f47.google.com [209.85.218.47]) by lists.denx.de (Postfix) with ESMTPS id CAE71C21D7A for ; Mon, 24 Jul 2017 03:20:27 +0000 (UTC) Received: by mail-oi0-f47.google.com with SMTP id e124so54374198oig.2 for ; Sun, 23 Jul 2017 20:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=iXHhaqV9taRl6WjA98pRmUWk0xociGropsxAoTqztto=; b=jYSRou6/GCc6wd97akaqKyQLKSWzQrH+LRQFrum65Tg+pk0yH17OLF1MPzAgUu2kKE ZSiHzG7niEiZC1RXZg0XvGtQ7SaVEVtj9Xba7Ps/N8+3lhFHFCF8l2BclJIWwbAZ1kXI 4P4i/5gL1yfCrnDfVkSeuK+FmO9Jef0T2wWa1M+8ASjTV4bntlglECDLC0qcv56PSTCO oGKO4VjiORRANd59ZQuy+R3MYNMqeBwFf7eyrbRqyonqOtgLIgtZU9ML8SmeRcC3Fs9O mnnDo/2YTHNUmfgnUyNBE+G4/SMy7p+6JJL44TDJE5IucojQs9LiFzMlox4L+MeFJTDv 3+dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=iXHhaqV9taRl6WjA98pRmUWk0xociGropsxAoTqztto=; b=BBjFezIqt1ElgrXNfWnS7ouhbzCXuTdyi0DObw1nyZJICt+r7zGEsO29WoitR75+Lp 8h3Kzuy6U+d1kvReYEI9+F/A/DQ/mk/AaGuX2NY6lB+TSpUWooVdtRb/CMQv9GkhtTH0 sWAlGi3/A4/J0c04dLZxNwbvUOWqPlekV0JZuD8ig4rjLzBzE/3MCm+HAkRO26qe2ak+ TymIxeGLVKy5Eeft2vcN0PVJ262pw3rHHxl9d4KFqAO+kRr8gPyea5X5GSYa9jCk7KNS 7t1UXa1c4F3Klq3LT3zqQFXdvLYfj/81xiNvOhRPOz0i984XARmrptmdjlPIsStSU3kW VHAA== X-Gm-Message-State: AIVw112jItnKN7wJEBnmv6MXvCEkLvUK5xARAaMv8DBAW3Q1oq6t+EF7 LURsQD6WnFF19lzb X-Received: by 10.202.216.3 with SMTP id p3mr7201308oig.55.1500866426286; Sun, 23 Jul 2017 20:20:26 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([100.101.164.89]) by smtp.gmail.com with ESMTPSA id 71sm8732323oic.49.2017.07.23.20.20.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Jul 2017 20:20:25 -0700 (PDT) Received: by kiwi.bld.corp.google.com (Postfix, from userid 121222) id B16AD142283; Sun, 23 Jul 2017 21:20:24 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 23 Jul 2017 21:19:43 -0600 Message-Id: <20170724032009.43994-9-sjg@chromium.org> X-Mailer: git-send-email 2.14.0.rc0.284.gd933b75aa4-goog In-Reply-To: <20170724032009.43994-1-sjg@chromium.org> References: <20170724032009.43994-1-sjg@chromium.org> Cc: Tom Rini , Andreas Fenkart Subject: [U-Boot] [PATCH v2 08/34] Convert CONFIG_ENV_IS_IN_EEPROM to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This converts the following to Kconfig: CONFIG_ENV_IS_IN_EEPROM Signed-off-by: Simon Glass --- Changes in v2: None README | 60 ------------------------------------ configs/imx31_phycore_defconfig | 1 + configs/imx31_phycore_eet_defconfig | 1 + configs/km_kirkwood_128m16_defconfig | 1 + configs/km_kirkwood_defconfig | 1 + configs/km_kirkwood_pci_defconfig | 1 + configs/mgcoge3un_defconfig | 1 + configs/portl2_defconfig | 1 + env/Kconfig | 60 ++++++++++++++++++++++++++++++++++++ include/config_fsl_chain_trust.h | 1 - include/configs/imx31_phycore.h | 1 - include/configs/km/km_arm.h | 1 - scripts/config_whitelist.txt | 1 - 13 files changed, 67 insertions(+), 64 deletions(-) diff --git a/README b/README index 05a4fcf4b5..d94a4ac120 100644 --- a/README +++ b/README @@ -3442,66 +3442,6 @@ environment in RAM: we could work on NVRAM directly, but we want to keep settings there always unmodified except somebody uses "saveenv" to save the current settings. - -- CONFIG_ENV_IS_IN_EEPROM: - - Use this if you have an EEPROM or similar serial access - device and a driver for it. - - - CONFIG_ENV_OFFSET: - - CONFIG_ENV_SIZE: - - These two #defines specify the offset and size of the - environment area within the total memory of your EEPROM. - - - CONFIG_SYS_I2C_EEPROM_ADDR: - If defined, specified the chip address of the EEPROM device. - The default address is zero. - - - CONFIG_SYS_I2C_EEPROM_BUS: - If defined, specified the i2c bus of the EEPROM device. - - - CONFIG_SYS_EEPROM_PAGE_WRITE_BITS: - If defined, the number of bits used to address bytes in a - single page in the EEPROM device. A 64 byte page, for example - would require six bits. - - - CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS: - If defined, the number of milliseconds to delay between - page writes. The default is zero milliseconds. - - - CONFIG_SYS_I2C_EEPROM_ADDR_LEN: - The length in bytes of the EEPROM memory array address. Note - that this is NOT the chip address length! - - - CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW: - EEPROM chips that implement "address overflow" are ones - like Catalyst 24WC04/08/16 which has 9/10/11 bits of - address and the extra bits end up in the "chip address" bit - slots. This makes a 24WC08 (1Kbyte) chip look like four 256 - byte chips. - - Note that we consider the length of the address field to - still be one byte because the extra address bits are hidden - in the chip address. - - - CONFIG_SYS_EEPROM_SIZE: - The size in bytes of the EEPROM device. - - - CONFIG_ENV_EEPROM_IS_ON_I2C - define this, if you have I2C and SPI activated, and your - EEPROM, which holds the environment, is on the I2C bus. - - - CONFIG_I2C_ENV_EEPROM_BUS - if you have an Environment on an EEPROM reached over - I2C muxes, you can define here, how to reach this - EEPROM. For example: - - #define CONFIG_I2C_ENV_EEPROM_BUS 1 - - EEPROM which holds the environment, is reached over - a pca9547 i2c mux with address 0x70, channel 3. - - CONFIG_ENV_IS_IN_DATAFLASH: Define this if you have a DataFlash memory device which you diff --git a/configs/imx31_phycore_defconfig b/configs/imx31_phycore_defconfig index 224bedb1d6..652fe8662c 100644 --- a/configs/imx31_phycore_defconfig +++ b/configs/imx31_phycore_defconfig @@ -6,5 +6,6 @@ CONFIG_CMD_EEPROM=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PING=y +CONFIG_ENV_IS_IN_EEPROM=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/imx31_phycore_eet_defconfig b/configs/imx31_phycore_eet_defconfig index c881b8fdcc..2a0033d615 100644 --- a/configs/imx31_phycore_eet_defconfig +++ b/configs/imx31_phycore_eet_defconfig @@ -10,5 +10,6 @@ CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PING=y CONFIG_CMD_BMP=y +CONFIG_ENV_IS_IN_EEPROM=y # CONFIG_MMC is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig index df7dac8c37..eed0ebe341 100644 --- a/configs/km_kirkwood_128m16_defconfig +++ b/configs/km_kirkwood_128m16_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y +CONFIG_ENV_IS_IN_EEPROM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig index 4b9cdb7f47..766753165c 100644 --- a/configs/km_kirkwood_defconfig +++ b/configs/km_kirkwood_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y +CONFIG_ENV_IS_IN_EEPROM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig index 79952774ae..6a74864dc6 100644 --- a/configs/km_kirkwood_pci_defconfig +++ b/configs/km_kirkwood_pci_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y +CONFIG_ENV_IS_IN_EEPROM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig index 2add8828b8..00a85e3c44 100644 --- a/configs/mgcoge3un_defconfig +++ b/configs/mgcoge3un_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y +CONFIG_ENV_IS_IN_EEPROM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig index a0faba50ff..eb741804aa 100644 --- a/configs/portl2_defconfig +++ b/configs/portl2_defconfig @@ -21,6 +21,7 @@ CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_JFFS2=y CONFIG_CMD_UBI=y +CONFIG_ENV_IS_IN_EEPROM=y # CONFIG_MMC is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/env/Kconfig b/env/Kconfig index 75dd57843f..30a493fcdd 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -1,5 +1,65 @@ menu "Environment" +config ENV_IS_IN_EEPROM + bool "Environment in EEPROM" + help + Use this if you have an EEPROM or similar serial access + device and a driver for it. + + - CONFIG_ENV_OFFSET: + - CONFIG_ENV_SIZE: + + These two #defines specify the offset and size of the + environment area within the total memory of your EEPROM. + + - CONFIG_SYS_I2C_EEPROM_ADDR: + If defined, specified the chip address of the EEPROM device. + The default address is zero. + + - CONFIG_SYS_I2C_EEPROM_BUS: + If defined, specified the i2c bus of the EEPROM device. + + - CONFIG_SYS_EEPROM_PAGE_WRITE_BITS: + If defined, the number of bits used to address bytes in a + single page in the EEPROM device. A 64 byte page, for example + would require six bits. + + - CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS: + If defined, the number of milliseconds to delay between + page writes. The default is zero milliseconds. + + - CONFIG_SYS_I2C_EEPROM_ADDR_LEN: + The length in bytes of the EEPROM memory array address. Note + that this is NOT the chip address length! + + - CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW: + EEPROM chips that implement "address overflow" are ones + like Catalyst 24WC04/08/16 which has 9/10/11 bits of + address and the extra bits end up in the "chip address" bit + slots. This makes a 24WC08 (1Kbyte) chip look like four 256 + byte chips. + + Note that we consider the length of the address field to + still be one byte because the extra address bits are hidden + in the chip address. + + - CONFIG_SYS_EEPROM_SIZE: + The size in bytes of the EEPROM device. + + - CONFIG_ENV_EEPROM_IS_ON_I2C + define this, if you have I2C and SPI activated, and your + EEPROM, which holds the environment, is on the I2C bus. + + - CONFIG_I2C_ENV_EEPROM_BUS + if you have an Environment on an EEPROM reached over + I2C muxes, you can define here, how to reach this + EEPROM. For example: + + #define CONFIG_I2C_ENV_EEPROM_BUS 1 + + EEPROM which holds the environment, is reached over + a pca9547 i2c mux with address 0x70, channel 3. + config ENV_IS_IN_FLASH bool "Environment in flash memory" help diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index 6b6ae7cc78..195419b888 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -13,7 +13,6 @@ */ #ifdef CONFIG_SECURE_BOOT -#undef CONFIG_ENV_IS_IN_EEPROM #undef CONFIG_ENV_IS_IN_SPI_FLASH #endif diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 739af03e88..ba7c3e186d 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -135,7 +135,6 @@ /* Monitor at beginning of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_ENV_IS_IN_EEPROM #define CONFIG_ENV_OFFSET 0x00 /* env. starts here */ #define CONFIG_ENV_SIZE 4096 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x52 diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 0c5f6e7515..9a90e08d65 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -222,7 +222,6 @@ int get_scl(void); CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_TOTAL_SIZE 0x20000 /* no bracets! */ #else -#define CONFIG_ENV_IS_IN_EEPROM /* use EEPROM for environment vars */ #define CONFIG_SYS_DEF_EEPROM_ADDR 0x50 #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_EEPROM_WREN diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e4d434b73b..91e5f89d04 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -634,7 +634,6 @@ CONFIG_ENV_FLASHBOOT CONFIG_ENV_IS_EMBEDDED CONFIG_ENV_IS_IN_ CONFIG_ENV_IS_IN_DATAFLASH -CONFIG_ENV_IS_IN_EEPROM CONFIG_ENV_IS_IN_FAT CONFIG_ENV_IS_IN_ONENAND CONFIG_ENV_IS_IN_REMOTE