From patchwork Tue Mar 31 22:35:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 237060 List-Id: U-Boot discussion From: pali at kernel.org (=?UTF-8?q?Pali=20Roh=C3=A1r?=) Date: Wed, 1 Apr 2020 00:35:12 +0200 Subject: [PATCH 05/11] Nokia RX-51: Revert back onenand defitions In-Reply-To: <20200331223518.10936-1-pali@kernel.org> References: <20200331223518.10936-1-pali@kernel.org> Message-ID: <20200331223518.10936-6-pali@kernel.org> In commit commit 43ede0bca7fc ("Kconfig: Migrate MTDIDS_DEFAULT / MTDPARTS_DEFAULT") were removed definitions for onenand partitions. Revert them back and enable needed options for onenand support. Signed-off-by: Pali Roh?r --- configs/nokia_rx51_defconfig | 7 +++++++ include/configs/nokia_rx51.h | 10 ---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 5ba9768d02..13bb6d07b7 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -39,3 +39,10 @@ CONFIG_TWL4030_USB=y CONFIG_VIDEO=y CONFIG_CFB_CONSOLE_ANSI=y # CONFIG_VGA_AS_SINGLE_DEVICE is not set +CONFIG_MTD=y +CONFIG_MTDIDS_DEFAULT="onenand0=onenand" +CONFIG_MTDPARTS_DEFAULT="mtdparts=onenand:128k(bootloader)ro,384k(config),256k(log),2m(kernel),2m(initfs),-(rootfs)" +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_RAW_NAND is not set +CONFIG_CMD_MTD=y +CONFIG_CMD_ONENAND=y diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 57bcbbaae1..cfc4d0c1e5 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -133,12 +133,8 @@ #define PART6_OFFS 0x004c0000 #define PART6_MASK 0x00000000 -#ifdef ONENAND_SUPPORT - #define CONFIG_SYS_ONENAND_BASE ONENAND_MAP -#endif - /* Watchdog support */ #define CONFIG_HW_WATCHDOG @@ -163,13 +159,7 @@ int rx51_kp_getc(struct stdio_dev *sdev); #endif /* Environment information */ -#ifdef CONFIG_MTDPARTS_DEFAULT -#define MTDPARTS "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" -#else -#define MTDPARTS -#endif #define CONFIG_EXTRA_ENV_SETTINGS \ - MTDPARTS \ "usbtty=cdc_acm\0" \ "stdin=vga\0" \ "stdout=vga\0" \