{"id":809037,"url":"http://patchwork.ozlabs.org/api/1.2/patches/809037/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/1504310264-3260-1-git-send-email-aford173@gmail.com/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.2/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504310264-3260-1-git-send-email-aford173@gmail.com>","list_archive_url":null,"date":"2017-09-01T23:57:40","name":"[U-Boot,V4] Convert CONFIG_NAND_OMAP_GPMC et al to Kconfig","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d72a7f4772290554010d22f10a03a5ccae6f87bf","submitter":{"id":67132,"url":"http://patchwork.ozlabs.org/api/1.2/people/67132/?format=json","name":"Adam Ford","email":"aford173@gmail.com"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/1.2/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/1504310264-3260-1-git-send-email-aford173@gmail.com/mbox/","series":[{"id":1134,"url":"http://patchwork.ozlabs.org/api/1.2/series/1134/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=1134","date":"2017-09-01T23:57:40","name":"[U-Boot,V4] Convert CONFIG_NAND_OMAP_GPMC et al to Kconfig","version":4,"mbox":"http://patchwork.ozlabs.org/series/1134/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/809037/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809037/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"l9ZInSin\"; dkim-atps=neutral"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 3xkcr81ZZtz9ryr\n\tfor ;\n\tSat, 2 Sep 2017 10:46:46 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid AECB4C21ED4; Sat, 2 Sep 2017 00:46:44 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 788FBC21D5B;\n\tSat, 2 Sep 2017 00:46:35 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 41958C21F05; Fri, 1 Sep 2017 23:57:55 +0000 (UTC)","from mail-it0-f66.google.com (mail-it0-f66.google.com\n\t[209.85.214.66])\n\tby lists.denx.de (Postfix) with ESMTPS id 34A41C21D19\n\tfor ; Fri, 1 Sep 2017 23:57:54 +0000 (UTC)","by mail-it0-f66.google.com with SMTP id n5so490936itb.5\n\tfor ; Fri, 01 Sep 2017 16:57:54 -0700 (PDT)","from ubuntu16.lan (c-73-65-120-235.hsd1.mn.comcast.net.\n\t[73.65.120.235]) by smtp.gmail.com with ESMTPSA id\n\ty202sm713920itc.2.2017.09.01.16.57.50\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tFri, 01 Sep 2017 16:57:51 -0700 (PDT)"],"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=FREEMAIL_FROM,\n\tKHOP_BIG_TO_CC, \n\tRCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,\n\tT_DKIM_INVALID\n\tautolearn=unavailable autolearn_force=no version=3.4.0","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id;\n\tbh=JqdjTdyaZ8Xv8CjNNkFXqxfFnI+G2Yhw9R4MYcwhTA8=;\n\tb=l9ZInSinjHyro8h3kep+Y8rjJbT/d1dOnTfrOqmKaiCWWCcol+jL45/f8EzUN2xA5b\n\tWbBl/iAm9kX6SRm5E70Uu9JQ+RICmfT5aCHNDI1u71wVla9HCVqrvFRmF0ySep2BboOj\n\t/74q2eLZkv0iaV5yeuScja/H7QRcDlOBtht676BMJh4zkIf7lTM6GWnDT5O+AtIpfJDY\n\tDYdWD6TD/z1uim0r+ymOJhM+GMBiKTWP7f5WxjrNlwRjdOrAABZ59j/UTy6JO2fx7RUB\n\tiuO+q4PkirLAtBR4Ntkj8SnX2o8T+Xo8jzfQno1/iJY7ol5nzPWn0Nffc7SKrebhkOKn\n\tmVbw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=JqdjTdyaZ8Xv8CjNNkFXqxfFnI+G2Yhw9R4MYcwhTA8=;\n\tb=uVT5SJWiwDSeH9tw5pJcqavHvV3TxoE1VSzKutADBuj7dXJ99oxuyXoU+wMeoIi60K\n\tD8AYUkSBVnnEMg711RMOKCESV/A8zNQZFYRW6t/C1l+wqeB49TBTGF+3z9mHYzX/AxYN\n\tzMmQmy+46TiZqtV9YpEQjkxy72LPTVZEjrv8exTw9ztjp/+wLcbra2iJvYnxO5pLiz1M\n\twZ9BVy+z9gWtbFhzlD8gOnfdl6TzE4Uk3D2PWSiS+nSIP9kkJeoJcjbmkVLMi+ZT6lWY\n\tntcYeUW8V6ozjmV0KUjT2hJyNFgUtmOjRaZQF0Lf9hh4ihiR3odJRb8KZ2YdvBtjAj27\n\tXjiA==","X-Gm-Message-State":"AHPjjUgK+FRdwTxI8DOwn0NcrN5IkA5Cr7zGv0acdzYByyV5k9rLi/9P\n\tb7H8CPScBUUTsQ==","X-Google-Smtp-Source":"ADKCNb4Qx0ZJV24+aqj1Tctok6ILSTQQfODZ9mTYThEXJgFaxOVC+xtZGuITl2dohAWUxKpFtJhqKg==","X-Received":"by 10.36.110.73 with SMTP id w70mr1298727itc.18.1504310272275;\n\tFri, 01 Sep 2017 16:57:52 -0700 (PDT)","From":"Adam Ford ","To":"adam.ford@logicpd.com","Date":"Fri, 1 Sep 2017 18:57:40 -0500","Message-Id":"<1504310264-3260-1-git-send-email-aford173@gmail.com>","X-Mailer":"git-send-email 2.7.4","X-Mailman-Approved-At":"Sat, 02 Sep 2017 00:46:33 +0000","Cc":"\"Albert ARIBAUD \\(3ADEV\\)\" ,\n\tStefan Roese , Marek Vasut ,\n\tNagendra T S ,\n\tVaibhav Hiremath ,\n\tTapani Utriainen , \n\tThomas Weber ,\n\tGilles Gameiro , \n\tVitaly Andrianov , Scott Wood ,\n\tRaphael Assenat ,\n\tAlbert Aribaud , \n\tu-boot@lists.denx.de, Lothar Felten ,\n\tSteve Kipisz , Daniel Allred ","Subject":"[U-Boot] [PATCH V4] Convert CONFIG_NAND_OMAP_GPMC et al to Kconfig","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"This converts the following to Kconfig:\n CONFIG_NAND_OMAP_GPMC\n CONFIG_NAND_OMAP_GPMC_PREFETCH\n CONFIG_NAND_OMAP_ELM\n CONFIG_SPL_NAND_AM33XX_BCH\n CONFIG_SPL_NAND_SIMPLE (ARCH_OMAP2PLUS only)\n\nSigned-off-by: Adam Ford \n---\nV4: Fix missing data from V2-V3\nV3: Remove selection from CMD_NAND\nV2: Rebased on latest Master\n Fixed a few missing entries where some features lacked dependancies\n\n arch/arm/mach-omap2/Kconfig | 18 +++++++++++++\n configs/am335x_baltos_defconfig | 2 +-\n configs/am335x_evm_defconfig | 1 +\n configs/am335x_evm_nor_defconfig | 1 +\n configs/am335x_evm_usbspl_defconfig | 1 +\n configs/am335x_hs_evm_defconfig | 1 +\n configs/am3517_crane_defconfig | 2 ++\n configs/am3517_evm_defconfig | 1 +\n configs/chiliboard_defconfig | 2 +-\n configs/cm_t3517_defconfig | 1 +\n configs/cm_t35_defconfig | 1 +\n configs/eco5pk_defconfig | 1 +\n configs/mcx_defconfig | 1 +\n configs/mt_ventoux_defconfig | 1 +\n configs/omap3_evm_defconfig | 1 +\n configs/omap3_ha_defconfig | 2 ++\n configs/tao3530_defconfig | 2 ++\n configs/ti816x_evm_defconfig | 1 +\n configs/tricorder_defconfig | 1 +\n configs/tricorder_flash_defconfig | 1 +\n configs/twister_defconfig | 1 +\n drivers/mtd/nand/Kconfig | 47 +++++++++++++++++++++++++++++++++-\n include/configs/am335x_evm.h | 6 -----\n include/configs/am335x_igep003x.h | 1 -\n include/configs/am3517_crane.h | 2 --\n include/configs/am3517_evm.h | 3 ---\n include/configs/am43xx_evm.h | 5 ----\n include/configs/baltos.h | 3 ---\n include/configs/bav335x.h | 5 ----\n include/configs/brppt1.h | 3 ---\n include/configs/chiliboard.h | 6 -----\n include/configs/cm_t35.h | 2 --\n include/configs/cm_t3517.h | 1 -\n include/configs/cm_t43.h | 1 -\n include/configs/dra7xx_evm.h | 5 ----\n include/configs/mcx.h | 2 --\n include/configs/omap3_beagle.h | 1 -\n include/configs/omap3_cairo.h | 1 -\n include/configs/omap3_evm.h | 1 -\n include/configs/omap3_igep00x0.h | 1 -\n include/configs/omap3_logic.h | 2 --\n include/configs/pengwyn.h | 2 --\n include/configs/siemens-am33x-common.h | 3 ---\n include/configs/tam3517-common.h | 3 ---\n include/configs/tao3530.h | 2 --\n include/configs/ti816x_evm.h | 4 ---\n include/configs/ti_am335x_common.h | 4 ---\n include/configs/ti_armv7_omap.h | 1 -\n include/configs/ti_omap3_common.h | 1 -\n include/configs/ti_omap4_common.h | 4 ---\n include/configs/ti_omap5_common.h | 4 ---\n include/configs/tricorder.h | 2 --\n scripts/config_whitelist.txt | 4 ---\n 53 files changed, 87 insertions(+), 88 deletions(-)","diff":"diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig\nindex 72832ad..15e8d54 100644\n--- a/arch/arm/mach-omap2/Kconfig\n+++ b/arch/arm/mach-omap2/Kconfig\n@@ -11,6 +11,7 @@ config OMAP34XX\n \tselect ARM_ERRATA_621766\n \tselect ARM_ERRATA_725233\n \tselect USE_TINY_PRINTF\n+\timply NAND_OMAP_GPMC\n \timply SPL_EXT_SUPPORT\n \timply SPL_FAT_SUPPORT\n \timply SPL_GPIO_SUPPORT\n@@ -19,6 +20,7 @@ config OMAP34XX\n \timply SPL_LIBDISK_SUPPORT\n \timply SPL_LIBGENERIC_SUPPORT\n \timply SPL_MMC_SUPPORT\n+\timply SPL_NAND_SIMPLE\n \timply SPL_NAND_SUPPORT\n \timply SPL_POWER_SUPPORT\n \timply SPL_SERIAL_SUPPORT\n@@ -29,6 +31,8 @@ config OMAP34XX\n config OMAP44XX\n \tbool \"OMAP44XX SoC\"\n \tselect USE_TINY_PRINTF\n+\timply NAND_OMAP_ELM\n+\timply NAND_OMAP_GPMC\n \timply SPL_DISPLAY_PRINT\n \timply SPL_EXT_SUPPORT\n \timply SPL_FAT_SUPPORT\n@@ -38,6 +42,7 @@ config OMAP44XX\n \timply SPL_LIBDISK_SUPPORT\n \timply SPL_LIBGENERIC_SUPPORT\n \timply SPL_MMC_SUPPORT\n+\timply SPL_NAND_AM33XX_BCH\n \timply SPL_NAND_SUPPORT\n \timply SPL_POWER_SUPPORT\n \timply SPL_SERIAL_SUPPORT\n@@ -48,6 +53,8 @@ config OMAP54XX\n \tbool \"OMAP54XX SoC\"\n \tselect ARM_ERRATA_798870\n \tselect SYS_THUMB_BUILD\n+\timply NAND_OMAP_ELM\n+\timply NAND_OMAP_GPMC\n \timply SPL_DISPLAY_PRINT\n \timply SPL_ENV_SUPPORT\n \timply SPL_EXT_SUPPORT\n@@ -58,6 +65,7 @@ config OMAP54XX\n \timply SPL_LIBDISK_SUPPORT\n \timply SPL_LIBGENERIC_SUPPORT\n \timply SPL_MMC_SUPPORT\n+\timply SPL_NAND_AM33XX_BCH\n \timply SPL_NAND_SUPPORT\n \timply SPL_POWER_SUPPORT\n \timply SPL_SERIAL_SUPPORT\n@@ -72,6 +80,8 @@ config TI814X\n \n config TI816X\n \tbool \"TI816X SoC\"\n+\timply NAND_OMAP_ELM\n+\timply NAND_OMAP_GPMC\n \thelp\n \t Support for AM335x SOC from Texas Instruments.\n \t The AM335x high performance SOC features a Cortex-A8\n@@ -79,8 +89,12 @@ config TI816X\n \n config AM43XX\n \tbool \"AM43XX SoC\"\n+\timply NAND_OMAP_ELM\n+\timply NAND_OMAP_GPMC\n \timply SPL_DM\n \timply SPL_DM_SEQ_ALIAS\n+\timply SPL_NAND_AM33XX_BCH\n+\timply SPL_NAND_SUPPORT\n \timply SPL_OF_CONTROL\n \timply SPL_OF_TRANSLATE\n \timply SPL_SEPARATE_BSS\n@@ -96,6 +110,10 @@ config AM43XX\n \n config AM33XX\n \tbool \"AM33XX SoC\"\n+\timply NAND_OMAP_ELM\n+\timply NAND_OMAP_GPMC\n+\timply SPL_NAND_AM33XX_BCH\n+\timply SPL_NAND_SUPPORT\n \timply SYS_I2C_OMAP24XX\n \timply SYS_THUMB_BUILD\n \timply USE_TINY_PRINTF\ndiff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig\nindex eb8338f..1f328aa 100644\n--- a/configs/am335x_baltos_defconfig\n+++ b/configs/am335x_baltos_defconfig\n@@ -8,7 +8,6 @@ CONFIG_TARGET_AM335X_BALTOS=y\n CONFIG_SPL_MMC_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_SPL_LIBDISK_SUPPORT=y\n-CONFIG_SPL_NAND_SUPPORT=y\n CONFIG_SPL_WATCHDOG_SUPPORT=y\n CONFIG_SPL_STACK_R_ADDR=0x82000000\n CONFIG_SPL_FAT_SUPPORT=y\n@@ -51,6 +50,7 @@ CONFIG_CMD_UBI=y\n CONFIG_ISO_PARTITION=y\n CONFIG_MMC_OMAP_HS=y\n CONFIG_NAND=y\n+CONFIG_NAND_OMAP_GPMC_PREFETCH=y\n CONFIG_PHYLIB=y\n CONFIG_SYS_NS16550=y\n CONFIG_OMAP3_SPI=y\ndiff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig\nindex 00c1af4..4c3aacb 100644\n--- a/configs/am335x_evm_defconfig\n+++ b/configs/am335x_evm_defconfig\n@@ -34,6 +34,7 @@ CONFIG_MISC=y\n CONFIG_DM_MMC=y\n CONFIG_MMC_OMAP_HS=y\n CONFIG_NAND=y\n+CONFIG_NAND_OMAP_GPMC_PREFETCH=y\n CONFIG_SPI_FLASH=y\n CONFIG_SPI_FLASH_WINBOND=y\n CONFIG_PHYLIB=y\ndiff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig\nindex 9f08edf..f68fbd9 100644\n--- a/configs/am335x_evm_nor_defconfig\n+++ b/configs/am335x_evm_nor_defconfig\n@@ -27,6 +27,7 @@ CONFIG_DFU_RAM=y\n CONFIG_MMC_OMAP_HS=y\n CONFIG_MTD_NOR_FLASH=y\n CONFIG_NAND=y\n+CONFIG_NAND_OMAP_GPMC_PREFETCH=y\n CONFIG_SPI_FLASH=y\n CONFIG_SPI_FLASH_WINBOND=y\n CONFIG_PHYLIB=y\ndiff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig\nindex 7c35138..e6d83ac 100644\n--- a/configs/am335x_evm_usbspl_defconfig\n+++ b/configs/am335x_evm_usbspl_defconfig\n@@ -31,6 +31,7 @@ CONFIG_DFU_NAND=y\n CONFIG_DFU_RAM=y\n CONFIG_MMC_OMAP_HS=y\n CONFIG_NAND=y\n+CONFIG_NAND_OMAP_GPMC_PREFETCH=y\n CONFIG_SPI_FLASH=y\n CONFIG_SPI_FLASH_WINBOND=y\n CONFIG_PHYLIB=y\ndiff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig\nindex acdd56b..dab5ba5 100644\n--- a/configs/am335x_hs_evm_defconfig\n+++ b/configs/am335x_hs_evm_defconfig\n@@ -38,6 +38,7 @@ CONFIG_MISC=y\n CONFIG_DM_MMC=y\n CONFIG_MMC_OMAP_HS=y\n CONFIG_NAND=y\n+CONFIG_NAND_OMAP_GPMC_PREFETCH=y\n CONFIG_SPI_FLASH=y\n CONFIG_SPI_FLASH_WINBOND=y\n CONFIG_PHYLIB=y\ndiff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig\nindex 42260b1..a5e539d 100644\n--- a/configs/am3517_crane_defconfig\n+++ b/configs/am3517_crane_defconfig\n@@ -15,6 +15,8 @@ CONFIG_SYS_PROMPT=\"AM3517_CRANE # \"\n # CONFIG_CMD_FPGA is not set\n CONFIG_CMD_I2C=y\n CONFIG_CMD_MMC=y\n+CONFIG_NAND=y\n+CONFIG_SYS_NAND_BUSWIDTH_16BIT=y\n CONFIG_CMD_NAND=y\n CONFIG_CMD_USB=y\n # CONFIG_CMD_SETEXPR is not set\ndiff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig\nindex d03850b..b4fe992 100644\n--- a/configs/am3517_evm_defconfig\n+++ b/configs/am3517_evm_defconfig\n@@ -37,6 +37,7 @@ CONFIG_SPL_PARTITION_UUIDS=y\n CONFIG_ENV_IS_IN_NAND=y\n CONFIG_MMC_OMAP_HS=y\n CONFIG_NAND=y\n+CONFIG_NAND_OMAP_GPMC_PREFETCH=y\n CONFIG_SYS_NS16550=y\n CONFIG_USB=y\n CONFIG_USB_MUSB_HOST=y\ndiff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig\nindex ea729b0..f74095d 100644\n--- a/configs/chiliboard_defconfig\n+++ b/configs/chiliboard_defconfig\n@@ -7,7 +7,6 @@ CONFIG_TARGET_CHILIBOARD=y\n CONFIG_SPL_MMC_SUPPORT=y\n CONFIG_SPL_SERIAL_SUPPORT=y\n CONFIG_SPL_LIBDISK_SUPPORT=y\n-CONFIG_SPL_NAND_SUPPORT=y\n CONFIG_SPL_WATCHDOG_SUPPORT=y\n CONFIG_SPL_STACK_R_ADDR=0x82000000\n CONFIG_SPL_FAT_SUPPORT=y\n@@ -41,6 +40,7 @@ CONFIG_ENV_IS_IN_MMC=y\n CONFIG_DM_GPIO=y\n CONFIG_MMC_OMAP_HS=y\n CONFIG_NAND=y\n+CONFIG_NAND_OMAP_GPMC_PREFETCH=y\n CONFIG_PHYLIB=y\n CONFIG_SYS_NS16550=y\n CONFIG_OMAP3_SPI=y\ndiff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig\nindex ba7d813..46b5c1c 100644\n--- a/configs/cm_t3517_defconfig\n+++ b/configs/cm_t3517_defconfig\n@@ -37,6 +37,7 @@ CONFIG_LED_STATUS_STATE=2\n CONFIG_LED_STATUS_BOOT_ENABLE=y\n CONFIG_LED_STATUS_BOOT=0\n CONFIG_MMC_OMAP_HS=y\n+CONFIG_NAND=y\n CONFIG_SYS_NS16550=y\n CONFIG_OMAP3_SPI=y\n CONFIG_USB=y\ndiff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig\nindex 382fc1a..b203752 100644\n--- a/configs/cm_t35_defconfig\n+++ b/configs/cm_t35_defconfig\n@@ -39,6 +39,7 @@ CONFIG_LED_STATUS_STATE=2\n CONFIG_LED_STATUS_BOOT_ENABLE=y\n CONFIG_LED_STATUS_BOOT=0\n CONFIG_MMC_OMAP_HS=y\n+CONFIG_NAND=y\n CONFIG_SYS_NS16550=y\n CONFIG_OMAP3_SPI=y\n CONFIG_USB=y\ndiff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig\nindex ed32930..57fde87 100644\n--- a/configs/eco5pk_defconfig\n+++ b/configs/eco5pk_defconfig\n@@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y\n CONFIG_ENV_IS_IN_NAND=y\n CONFIG_MMC_OMAP_HS=y\n CONFIG_NAND=y\n+CONFIG_NAND_OMAP_GPMC_PREFETCH=y\n CONFIG_SYS_NS16550=y\n CONFIG_USB=y\n CONFIG_USB_EHCI_HCD=y\ndiff --git a/configs/mcx_defconfig b/configs/mcx_defconfig\nindex daea7c4..4f234ba 100644\n--- a/configs/mcx_defconfig\n+++ b/configs/mcx_defconfig\n@@ -35,6 +35,7 @@ CONFIG_CMD_UBI=y\n CONFIG_ENV_IS_IN_NAND=y\n CONFIG_MMC_OMAP_HS=y\n CONFIG_NAND=y\n+CONFIG_NAND_OMAP_GPMC_PREFETCH=y\n CONFIG_SYS_NS16550=y\n CONFIG_USB=y\n CONFIG_USB_EHCI_HCD=y\ndiff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig\nindex 09580e7..0c52b8d 100644\n--- a/configs/mt_ventoux_defconfig\n+++ b/configs/mt_ventoux_defconfig\n@@ -32,6 +32,7 @@ CONFIG_CMD_UBI=y\n CONFIG_ENV_IS_IN_NAND=y\n CONFIG_MMC_OMAP_HS=y\n CONFIG_NAND=y\n+CONFIG_NAND_OMAP_GPMC_PREFETCH=y\n CONFIG_SYS_NS16550=y\n CONFIG_USB=y\n CONFIG_USB_EHCI_HCD=y\ndiff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig\nindex d9e636a..638d846 100644\n--- a/configs/omap3_evm_defconfig\n+++ b/configs/omap3_evm_defconfig\n@@ -45,6 +45,7 @@ CONFIG_SPL_DM=y\n CONFIG_DM_GPIO=y\n CONFIG_MMC_OMAP_HS=y\n CONFIG_MTD=y\n+CONFIG_NAND=y\n CONFIG_DM_SERIAL=y\n CONFIG_SYS_NS16550=y\n CONFIG_OMAP3_SPI=y\ndiff --git a/configs/omap3_ha_defconfig b/configs/omap3_ha_defconfig\nindex c31a86d..cc7de5b 100644\n--- a/configs/omap3_ha_defconfig\n+++ b/configs/omap3_ha_defconfig\n@@ -25,6 +25,8 @@ CONFIG_CMD_FAT=y\n CONFIG_CMD_MTDPARTS=y\n CONFIG_ENV_IS_IN_NAND=y\n CONFIG_MMC_OMAP_HS=y\n+CONFIG_NAND=y\n+CONFIG_SYS_NAND_BUSWIDTH_16BIT=y\n CONFIG_SYS_NS16550=y\n CONFIG_OMAP3_SPI=y\n CONFIG_USB=y\ndiff --git a/configs/tao3530_defconfig b/configs/tao3530_defconfig\nindex 0593e9a..d98d2f3 100644\n--- a/configs/tao3530_defconfig\n+++ b/configs/tao3530_defconfig\n@@ -25,6 +25,8 @@ CONFIG_CMD_FAT=y\n CONFIG_CMD_MTDPARTS=y\n CONFIG_ENV_IS_IN_NAND=y\n CONFIG_MMC_OMAP_HS=y\n+CONFIG_NAND=y\n+CONFIG_SYS_NAND_BUSWIDTH_16BIT=y\n CONFIG_SYS_NS16550=y\n CONFIG_OMAP3_SPI=y\n CONFIG_USB=y\ndiff --git a/configs/ti816x_evm_defconfig b/configs/ti816x_evm_defconfig\nindex 4341d8d..fe527d4 100644\n--- a/configs/ti816x_evm_defconfig\n+++ b/configs/ti816x_evm_defconfig\n@@ -43,6 +43,7 @@ CONFIG_DM_I2C=y\n CONFIG_SYS_I2C_OMAP24XX=y\n CONFIG_MMC_OMAP_HS=y\n CONFIG_NAND=y\n+CONFIG_NAND_OMAP_GPMC_PREFETCH=y\n CONFIG_SYS_NS16550=y\n CONFIG_OMAP3_SPI=y\n # CONFIG_USE_PRIVATE_LIBGCC is not set\ndiff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig\nindex 16e3011..84b7cf4 100644\n--- a/configs/tricorder_defconfig\n+++ b/configs/tricorder_defconfig\n@@ -35,5 +35,6 @@ CONFIG_LED_STATUS_BIT2=4\n CONFIG_LED_STATUS_STATE2=2\n CONFIG_LED_STATUS_CMD=y\n CONFIG_MMC_OMAP_HS=y\n+CONFIG_NAND=y\n CONFIG_SYS_NS16550=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig\nindex 43f1860..ca4b67a 100644\n--- a/configs/tricorder_flash_defconfig\n+++ b/configs/tricorder_flash_defconfig\n@@ -34,5 +34,6 @@ CONFIG_LED_STATUS_BIT2=4\n CONFIG_LED_STATUS_STATE2=2\n CONFIG_LED_STATUS_CMD=y\n CONFIG_MMC_OMAP_HS=y\n+CONFIG_NAND=y\n CONFIG_SYS_NS16550=y\n CONFIG_OF_LIBFDT=y\ndiff --git a/configs/twister_defconfig b/configs/twister_defconfig\nindex 7bbf781..c13cea2 100644\n--- a/configs/twister_defconfig\n+++ b/configs/twister_defconfig\n@@ -31,6 +31,7 @@ CONFIG_CMD_UBI=y\n CONFIG_ENV_IS_IN_NAND=y\n CONFIG_MMC_OMAP_HS=y\n CONFIG_NAND=y\n+CONFIG_NAND_OMAP_GPMC_PREFETCH=y\n CONFIG_SYS_NS16550=y\n CONFIG_USB=y\n CONFIG_USB_EHCI_HCD=y\ndiff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig\nindex 85b26d6..52077e2 100644\n--- a/drivers/mtd/nand/Kconfig\n+++ b/drivers/mtd/nand/Kconfig\n@@ -43,6 +43,34 @@ config NAND_DENALI_SPARE_AREA_SKIP_BYTES\n \t of OOB area before last ECC sector data starts. This is potentially\n \t used to preserve the bad block marker in the OOB area.\n \n+config NAND_OMAP_GPMC\n+\tbool \"Support OMAP GPMC NAND controller\"\n+\tdepends on ARCH_OMAP2PLUS\n+\thelp\n+\t Enables omap_gpmc.c driver for OMAPx and AMxxxx platforms.\n+\t GPMC controller is used for parallel NAND flash devices, and can\n+\t do ECC calculation (not ECC error detection) for HAM1, BCH4, BCH8\n+\t and BCH16 ECC algorithms.\n+\n+config NAND_OMAP_GPMC_PREFETCH\n+\tbool \"Enable GPMC Prefetch\"\n+\tdepends on NAND_OMAP_GPMC\n+\thelp\n+\t On OMAP platforms that use the GPMC controller\n+\t (CONFIG_NAND_OMAP_GPMC_PREFETCH), this options enables the code that\n+\t uses the prefetch mode to speed up read operations.\n+\n+config NAND_OMAP_ELM\n+\tbool \"Enable ELM driver for OMAPxx and AMxx platforms.\"\n+\tdepends on NAND_OMAP_GPMC && !OMAP34XX\n+\thelp\n+\t ELM controller is used for ECC error detection (not ECC calculation)\n+\t of BCH4, BCH8 and BCH16 ECC algorithms.\n+\t Some legacy platforms like OMAP3xx do not have in-built ELM h/w engine,\n+\t thus such SoC platforms need to depend on software library for ECC error\n+\t detection. However ECC calculation on such plaforms would still be\n+\t done by GPMC controller.\n+\n config NAND_VF610_NFC\n \tbool \"Support for Freescale NFC for VF610\"\n \tselect SYS_NAND_SELF_INIT\n@@ -134,7 +162,7 @@ comment \"Generic NAND options\"\n # option (mxc_nand, ndfc, omap_gpmc).\n config SYS_NAND_BUSWIDTH_16BIT\n \tbool \"Use 16-bit NAND interface\"\n-\tdepends on NAND_VF610_NFC\n+\tdepends on NAND_VF610_NFC || NAND_OMAP_GPMC\n \thelp\n \t Indicates that NAND device has 16-bit wide data-bus. In absence of this\n \t config, bus-width of NAND device is assumed to be either 8-bit and later\n@@ -175,12 +203,29 @@ config SYS_NAND_U_BOOT_OFFS_REDUND\n \tSet the offset from the start of the nand where the redundant u-boot\n \tshould be loaded from.\n \n+config SPL_NAND_AM33XX_BCH\n+\tbool \"Enables SPL-NAND driver which supports ELM based\"\n+\tdepends on NAND_OMAP_GPMC && !OMAP34XX\n+\tdefault y\n+ help\n+\t Hardware ECC correction. This is useful for platforms which have ELM\n+\t hardware engine and use NAND boot mode.\n+\t Some legacy platforms like OMAP3xx do not have in-built ELM h/w engine,\n+\t so those platforms should use CONFIG_SPL_NAND_SIMPLE for enabling\n+ SPL-NAND driver with software ECC correction support.\n+\n config SPL_NAND_DENALI\n \tbool \"Support Denali NAND controller for SPL\"\n \thelp\n \t This is a small implementation of the Denali NAND controller\n \t for use on SPL.\n \n+config\tSPL_NAND_SIMPLE\n+\tbool \"Use simple SPL NAND driver\"\n+\tdepends on !SPL_NAND_AM33XX_BCH\n+\thelp\n+\t Support for NAND boot using simple NAND drivers that\n+\t expose the cmd_ctrl() interface.\n endif\n \n endif # if NAND\ndiff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h\nindex 415ce46..66f7a3f 100644\n--- a/include/configs/am335x_evm.h\n+++ b/include/configs/am335x_evm.h\n@@ -202,9 +202,6 @@\n #define CONFIG_SYS_NAND_OOBSIZE\t\t64\n #define CONFIG_SYS_NAND_BLOCK_SIZE\t(128*1024)\n /* NAND: driver related configs */\n-#define CONFIG_NAND_OMAP_GPMC\n-#define CONFIG_NAND_OMAP_GPMC_PREFETCH\n-#define CONFIG_NAND_OMAP_ELM\n #define CONFIG_SYS_NAND_BAD_BLOCK_POS\tNAND_LARGE_BADBLOCK_POS\n #define CONFIG_SYS_NAND_ECCPOS\t\t{ 2, 3, 4, 5, 6, 7, 8, 9, \\\n \t\t\t\t\t 10, 11, 12, 13, 14, 15, 16, 17, \\\n@@ -232,9 +229,6 @@\n \t\t\t\t\t\"-(NAND.file-system)\"\n #define CONFIG_SYS_NAND_U_BOOT_OFFS\t0x000c0000\n /* NAND: SPL related configs */\n-#ifdef CONFIG_SPL_NAND_SUPPORT\n-#define CONFIG_SPL_NAND_AM33XX_BCH\n-#endif\n #ifdef CONFIG_SPL_OS_BOOT\n #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS\t0x00200000 /* kernel offset */\n #endif\ndiff --git a/include/configs/am335x_igep003x.h b/include/configs/am335x_igep003x.h\nindex 9b14603..2400eee 100644\n--- a/include/configs/am335x_igep003x.h\n+++ b/include/configs/am335x_igep003x.h\n@@ -113,7 +113,6 @@\n #define CONFIG_PHY_SMSC\n \n /* NAND support */\n-#define CONFIG_NAND_OMAP_ELM\n #define CONFIG_SYS_NAND_ONFI_DETECTION\t1\n \n #define CONFIG_MTD_PARTITIONS\ndiff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h\nindex 9bd1606..59a3fbc 100644\n--- a/include/configs/am3517_crane.h\n+++ b/include/configs/am3517_crane.h\n@@ -211,7 +211,6 @@\n /* Monitor at start of flash */\n #define CONFIG_SYS_MONITOR_BASE\t\tCONFIG_SYS_FLASH_BASE\n \n-#define CONFIG_NAND_OMAP_GPMC\n #define SMNAND_ENV_OFFSET\t\t0x260000 /* environment starts here */\n \n #define CONFIG_SYS_ENV_SECT_SIZE\t(128 << 10)\t/* 128 KiB sector */\n@@ -242,7 +241,6 @@\n \n /* Defines for SPL */\n #define CONFIG_SPL_FRAMEWORK\n-#define CONFIG_SPL_NAND_SIMPLE\n #define CONFIG_SPL_TEXT_BASE\t\t0x40200800\n #define CONFIG_SPL_MAX_SIZE\t\t(SRAM_SCRATCH_SPACE_ADDR - \\\n \t\t\t\t\t CONFIG_SPL_TEXT_BASE)\ndiff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h\nindex 0dd6cea..c8ca9d4 100644\n--- a/include/configs/am3517_evm.h\n+++ b/include/configs/am3517_evm.h\n@@ -103,8 +103,6 @@\n \n /* Board NAND Info. */\n #ifdef CONFIG_NAND\n-#define CONFIG_NAND_OMAP_GPMC\n-#define CONFIG_NAND_OMAP_GPMC_PREFETCH\n #define CONFIG_BCH\n #define CONFIG_SYS_NAND_ADDR\t\tNAND_BASE\t/* physical address */\n \t\t\t\t\t\t\t/* to access nand */\n@@ -290,7 +288,6 @@\n \n /* Defines for SPL */\n #define CONFIG_SPL_FRAMEWORK\n-#define CONFIG_SPL_NAND_SIMPLE\n #define CONFIG_SPL_TEXT_BASE\t\t0x40200000\n #define CONFIG_SPL_MAX_SIZE\t\t(SRAM_SCRATCH_SPACE_ADDR - \\\n \t\t\t\t\t CONFIG_SPL_TEXT_BASE)\ndiff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h\nindex b84f6e3..4ae10bd 100644\n--- a/include/configs/am43xx_evm.h\n+++ b/include/configs/am43xx_evm.h\n@@ -256,8 +256,6 @@\n \t\t\t\t\t CONFIG_SYS_NAND_PAGE_SIZE)\n #define CONFIG_SYS_NAND_5_ADDR_CYCLE\n /* NAND: driver related configs */\n-#define CONFIG_NAND_OMAP_GPMC\n-#define CONFIG_NAND_OMAP_ELM\n #define CONFIG_SYS_NAND_ONFI_DETECTION\n #define CONFIG_NAND_OMAP_ECCSCHEME\tOMAP_ECC_BCH16_CODE_HW\n #define CONFIG_SYS_NAND_BAD_BLOCK_POS\tNAND_LARGE_BADBLOCK_POS\n@@ -299,9 +297,6 @@\n \t\t\t\t\t\"-(NAND.file-system)\"\n #define CONFIG_SYS_NAND_U_BOOT_OFFS\t0x00180000\n /* NAND: SPL related configs */\n-#ifdef CONFIG_SPL_NAND_SUPPORT\n-#define CONFIG_SPL_NAND_AM33XX_BCH\n-#endif\n /* NAND: SPL falcon mode configs */\n #ifdef CONFIG_SPL_OS_BOOT\n #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS\t0x00300000 /* kernel offset */\ndiff --git a/include/configs/baltos.h b/include/configs/baltos.h\nindex 185c749..059cf4a 100644\n--- a/include/configs/baltos.h\n+++ b/include/configs/baltos.h\n@@ -242,9 +242,6 @@\n #define CONFIG_SPL_NET_VCI_STRING\t\"AM335x U-Boot SPL\"*/\n \n #ifdef CONFIG_NAND\n-#define CONFIG_NAND_OMAP_GPMC\n-#define CONFIG_NAND_OMAP_GPMC_PREFETCH\n-#define CONFIG_NAND_OMAP_ELM\n #define CONFIG_SYS_NAND_5_ADDR_CYCLE\n #define CONFIG_SYS_NAND_PAGE_COUNT\t(CONFIG_SYS_NAND_BLOCK_SIZE / \\\n \t\t\t\t\t CONFIG_SYS_NAND_PAGE_SIZE)\ndiff --git a/include/configs/bav335x.h b/include/configs/bav335x.h\nindex 062c99c..e7770b6 100644\n--- a/include/configs/bav335x.h\n+++ b/include/configs/bav335x.h\n@@ -355,8 +355,6 @@ DEFAULT_LINUX_BOOT_ENV \\\n #define CONFIG_SYS_NAND_OOBSIZE\t\t64\n #define CONFIG_SYS_NAND_BLOCK_SIZE\t(128*1024)\n /* NAND: driver related configs */\n-#define CONFIG_NAND_OMAP_GPMC\n-#define CONFIG_NAND_OMAP_ELM\n #define CONFIG_SYS_NAND_BAD_BLOCK_POS\tNAND_LARGE_BADBLOCK_POS\n #define CONFIG_SYS_NAND_ECCPOS\t{ \\\n \t2, 3, 4, 5, 6, 7, 8, 9, \\\n@@ -389,9 +387,6 @@ DEFAULT_LINUX_BOOT_ENV \\\n #define CONFIG_ENV_OFFSET_REDUND\t0x001e0000\n #define CONFIG_SYS_ENV_SECT_SIZE\tCONFIG_SYS_NAND_BLOCK_SIZE\n /* NAND: SPL related configs */\n-#ifdef CONFIG_SPL_NAND_SUPPORT\n-#define CONFIG_SPL_NAND_AM33XX_BCH\n-#endif\n #ifdef CONFIG_SPL_OS_BOOT\n #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS\t0x00200000 /* kernel offset */\n #endif\ndiff --git a/include/configs/brppt1.h b/include/configs/brppt1.h\nindex 07a173f..2af575a 100644\n--- a/include/configs/brppt1.h\n+++ b/include/configs/brppt1.h\n@@ -71,7 +71,6 @@\n #endif /* CONFIG_SPL_OS_BOOT */\n \n #ifdef CONFIG_NAND\n-#define CONFIG_SPL_NAND_AM33XX_BCH\t/* OMAP4 and later ELM support */\n #define CONFIG_SPL_NAND_BASE\n #define CONFIG_SPL_NAND_DRIVERS\n #define CONFIG_SPL_NAND_ECC\n@@ -184,9 +183,7 @@ MMCARGS\n */\n #define CONFIG_SYS_MAX_NAND_DEVICE\t1\n #define CONFIG_SYS_NAND_BASE\t\t0x8000000\n-#define CONFIG_NAND_OMAP_GPMC\n /* don't change OMAP_ELM, ECCSCHEME. ROM code only supports this */\n-#define CONFIG_NAND_OMAP_ELM\n #define CONFIG_NAND_OMAP_ECCSCHEME\tOMAP_ECC_BCH8_CODE_HW\n #define CONFIG_SYS_NAND_5_ADDR_CYCLE\n #define CONFIG_SYS_NAND_BLOCK_SIZE\t(128*1024)\ndiff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h\nindex b7887d9..80d4e49 100644\n--- a/include/configs/chiliboard.h\n+++ b/include/configs/chiliboard.h\n@@ -135,9 +135,6 @@\n #define CONFIG_SYS_NAND_OOBSIZE\t\t64\n #define CONFIG_SYS_NAND_BLOCK_SIZE\t(128*1024)\n /* NAND: driver related configs */\n-#define CONFIG_NAND_OMAP_GPMC\n-#define CONFIG_NAND_OMAP_GPMC_PREFETCH\n-#define CONFIG_NAND_OMAP_ELM\n #define CONFIG_SYS_NAND_BAD_BLOCK_POS\tNAND_LARGE_BADBLOCK_POS\n #define CONFIG_SYS_NAND_ECCPOS\t\t{ 2, 3, 4, 5, 6, 7, 8, 9, \\\n \t\t\t\t\t 10, 11, 12, 13, 14, 15, 16, 17, \\\n@@ -165,9 +162,6 @@\n \t\t\t\t\t\"-(NAND.file-system)\"\n #define CONFIG_SYS_NAND_U_BOOT_OFFS\t0x000c0000\n /* NAND: SPL related configs */\n-#ifdef CONFIG_SPL_NAND_SUPPORT\n-#define CONFIG_SPL_NAND_AM33XX_BCH\n-#endif\n \n /* USB configuration */\n #define CONFIG_USB_MUSB_DSPS\ndiff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h\nindex a94d55f..9853fc0 100644\n--- a/include/configs/cm_t35.h\n+++ b/include/configs/cm_t35.h\n@@ -106,7 +106,6 @@\n /*\n * Board NAND Info.\n */\n-#define CONFIG_NAND_OMAP_GPMC\n #define CONFIG_SYS_NAND_ADDR\t\tNAND_BASE\t/* physical address */\n \t\t\t\t\t\t\t/* to access nand */\n #define CONFIG_SYS_NAND_BASE\t\tNAND_BASE\t/* physical address */\n@@ -250,7 +249,6 @@\n \n /* Defines for SPL */\n #define CONFIG_SPL_FRAMEWORK\n-#define CONFIG_SPL_NAND_SIMPLE\n \n #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION\t1\n #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME\t\"u-boot.img\"\ndiff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h\nindex 3a9fd2a..bef3028 100644\n--- a/include/configs/cm_t3517.h\n+++ b/include/configs/cm_t3517.h\n@@ -109,7 +109,6 @@\n /*\n * Board NAND Info.\n */\n-#define CONFIG_NAND_OMAP_GPMC\n #define CONFIG_SYS_NAND_ADDR\t\tNAND_BASE\t/* physical address */\n \t\t\t\t\t\t\t/* to access nand */\n #define CONFIG_SYS_NAND_BASE\t\tNAND_BASE\t/* physical address */\ndiff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h\nindex bbc455a..7012a95 100644\n--- a/include/configs/cm_t43.h\n+++ b/include/configs/cm_t43.h\n@@ -25,7 +25,6 @@\n #endif\n \n /* NAND support */\n-#define CONFIG_NAND_OMAP_ELM\n #define CONFIG_SYS_NAND_ONFI_DETECTION\n #define CONFIG_SYS_NAND_5_ADDR_CYCLE\n #define CONFIG_SYS_NAND_PAGE_SIZE\t2048\ndiff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h\nindex 6c0fc35..21da8ab 100644\n--- a/include/configs/dra7xx_evm.h\n+++ b/include/configs/dra7xx_evm.h\n@@ -166,8 +166,6 @@\n \t\t\t\t\t CONFIG_SYS_NAND_PAGE_SIZE)\n #define CONFIG_SYS_NAND_5_ADDR_CYCLE\n /* NAND: driver related configs */\n-#define CONFIG_NAND_OMAP_GPMC\n-#define CONFIG_NAND_OMAP_ELM\n #define CONFIG_SYS_NAND_ONFI_DETECTION\n #define CONFIG_NAND_OMAP_ECCSCHEME\tOMAP_ECC_BCH8_CODE_HW\n #define CONFIG_SYS_NAND_BAD_BLOCK_POS\tNAND_LARGE_BADBLOCK_POS\n@@ -194,9 +192,6 @@\n \t\t\t\t\t\"-(NAND.file-system)\"\n #define CONFIG_SYS_NAND_U_BOOT_OFFS\t0x000c0000\n /* NAND: SPL related configs */\n-#ifdef CONFIG_SPL_NAND_SUPPORT\n-#define CONFIG_SPL_NAND_AM33XX_BCH\n-#endif\n /* NAND: SPL falcon mode configs */\n #ifdef CONFIG_SPL_OS_BOOT\n #define CONFIG_SYS_NAND_SPL_KERNEL_OFFS\t0x00200000 /* kernel offset */\ndiff --git a/include/configs/mcx.h b/include/configs/mcx.h\nindex 7047e3f..76b75ba 100644\n--- a/include/configs/mcx.h\n+++ b/include/configs/mcx.h\n@@ -250,8 +250,6 @@\n \n /* **** PISMO SUPPORT *** */\n #define CONFIG_SYS_NAND_BUSWIDTH_16BIT\n-#define CONFIG_NAND_OMAP_GPMC\n-#define CONFIG_NAND_OMAP_GPMC_PREFETCH\n #define SMNAND_ENV_OFFSET\t\t0x180000 /* environment starts here */\n \n /* Redundant Environment */\ndiff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h\nindex 8988091..6a2455b 100644\n--- a/include/configs/omap3_beagle.h\n+++ b/include/configs/omap3_beagle.h\n@@ -75,7 +75,6 @@\n /*\n * Board NAND Info.\n */\n-#define CONFIG_NAND_OMAP_GPMC\n #define CONFIG_SYS_MAX_NAND_DEVICE\t1\t\t/* Max number of NAND */\n \t\t\t\t\t\t\t/* devices */\n \ndiff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h\nindex 560e500..5bc79b3 100644\n--- a/include/configs/omap3_cairo.h\n+++ b/include/configs/omap3_cairo.h\n@@ -57,7 +57,6 @@\n /*\n * Board NAND Info.\n */\n-#define CONFIG_NAND_OMAP_GPMC\n #define CONFIG_SYS_MAX_NAND_DEVICE\t1\t\t/* Max number of NAND */\n \t\t\t\t\t\t\t/* devices */\n #define CONFIG_EXTRA_ENV_SETTINGS \\\ndiff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h\nindex 9930483..922ff67 100644\n--- a/include/configs/omap3_evm.h\n+++ b/include/configs/omap3_evm.h\n@@ -49,7 +49,6 @@\n \n /* NAND */\n #if defined(CONFIG_NAND)\n-#define CONFIG_NAND_OMAP_GPMC\n #define CONFIG_SYS_FLASH_BASE\t\tNAND_BASE\n #define CONFIG_SYS_MAX_NAND_DEVICE 1\n #define CONFIG_BCH\ndiff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h\nindex dc137db..d2b9fc1 100644\n--- a/include/configs/omap3_igep00x0.h\n+++ b/include/configs/omap3_igep00x0.h\n@@ -137,7 +137,6 @@\n #define CONFIG_SYS_NAND_ECCSIZE\t\t512\n #define CONFIG_SYS_NAND_ECCBYTES\t14\n #define CONFIG_NAND_OMAP_ECCSCHEME\tOMAP_ECC_BCH8_CODE_HW_DETECTION_SW\n-#define CONFIG_NAND_OMAP_GPMC\n #define CONFIG_BCH\n \n /* UBI configuration */\ndiff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h\nindex 67b5562..654f0a5 100644\n--- a/include/configs/omap3_logic.h\n+++ b/include/configs/omap3_logic.h\n@@ -65,8 +65,6 @@\n \n /* Board NAND Info. */\n #ifdef CONFIG_NAND\n-#define CONFIG_NAND_OMAP_GPMC\n-\n #define CONFIG_SYS_NAND_ADDR\t\tNAND_BASE /* physical address */\n \t\t\t\t\t\t /* to access nand */\n #define CONFIG_SYS_MAX_NAND_DEVICE\t1\t /* Max number of */\ndiff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h\nindex 242a139..570c375 100644\n--- a/include/configs/pengwyn.h\n+++ b/include/configs/pengwyn.h\n@@ -113,8 +113,6 @@\n /* SPL */\n \n /* NAND support */\n-#define CONFIG_NAND_OMAP_GPMC\n-#define CONFIG_NAND_OMAP_ELM\n \n /* NAND Configuration. */\n #define CONFIG_SYS_NAND_5_ADDR_CYCLE\ndiff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h\nindex 4ea3a0b..bb7e691 100644\n--- a/include/configs/siemens-am33x-common.h\n+++ b/include/configs/siemens-am33x-common.h\n@@ -119,7 +119,6 @@\n #define CONFIG_SPL_SPI_LOAD\n #define CONFIG_SYS_SPI_U_BOOT_OFFS\t0x20000\n \n-#define CONFIG_SPL_NAND_AM33XX_BCH\n #define CONFIG_SPL_NAND_BASE\n #define CONFIG_SPL_NAND_DRIVERS\n #define CONFIG_SPL_NAND_ECC\n@@ -511,8 +510,6 @@\n \t\t\t\t\t\"512k(mtdoops),\"\t\\\n \t\t\t\t\t\"-(configuration)\"\n \n-#define CONFIG_NAND_OMAP_GPMC\n-#define CONFIG_NAND_OMAP_ELM\n #define CONFIG_SYS_NAND_BASE\t\t(0x08000000)\t/* physical address */\n \t\t\t\t\t\t\t/* to access nand at */\n \t\t\t\t\t\t\t/* CS0 */\ndiff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h\nindex 4336251..d3449df 100644\n--- a/include/configs/tam3517-common.h\n+++ b/include/configs/tam3517-common.h\n@@ -130,7 +130,6 @@\n */\n \n /* **** PISMO SUPPORT *** */\n-#define CONFIG_NAND_OMAP_GPMC\n #define SMNAND_ENV_OFFSET\t\t0x180000 /* environment starts here */\n \n /* Redundant Environment */\n@@ -163,7 +162,6 @@\n /* Defines for SPL */\n #define CONFIG_SPL_FRAMEWORK\n #define CONFIG_SPL_CONSOLE\n-#define CONFIG_SPL_NAND_SIMPLE\n #define CONFIG_SPL_NAND_SOFTECC\n #define CONFIG_SPL_NAND_WORKSPACE\t0x8f07f000 /* below BSS */\n \n@@ -207,7 +205,6 @@\n #define CONFIG_SYS_NAND_ECCSIZE\t\t256\n #define CONFIG_SYS_NAND_ECCBYTES\t3\n #define CONFIG_NAND_OMAP_ECCSCHEME\tOMAP_ECC_HAM1_CODE_SW\n-#define CONFIG_NAND_OMAP_GPMC_PREFETCH\n \n #define CONFIG_SYS_NAND_U_BOOT_START\tCONFIG_SYS_TEXT_BASE\n \ndiff --git a/include/configs/tao3530.h b/include/configs/tao3530.h\nindex d47dc8b..1370f7d 100644\n--- a/include/configs/tao3530.h\n+++ b/include/configs/tao3530.h\n@@ -81,7 +81,6 @@\n /*\n * Board NAND Info.\n */\n-#define CONFIG_NAND_OMAP_GPMC\n #define CONFIG_SYS_NAND_ADDR\t\tNAND_BASE\t/* physical address */\n \t\t\t\t\t\t\t/* to access nand */\n #define CONFIG_SYS_NAND_BASE\t\tNAND_BASE\t/* physical address */\n@@ -231,7 +230,6 @@\n \n /* Defines for SPL */\n #define CONFIG_SPL_FRAMEWORK\n-#define CONFIG_SPL_NAND_SIMPLE\n \n #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION\t1\n #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME\t\"u-boot.img\"\ndiff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h\nindex 1898a82..1da1eb0 100644\n--- a/include/configs/ti816x_evm.h\n+++ b/include/configs/ti816x_evm.h\n@@ -66,7 +66,6 @@\n #define CONFIG_SYS_MAX_NAND_DEVICE\t1\n \n /* NAND: SPL related configs */\n-#define CONFIG_SPL_NAND_AM33XX_BCH\n \n /* NAND: device related configs */\n #define CONFIG_SYS_NAND_5_ADDR_CYCLE\n@@ -77,8 +76,6 @@\n #define CONFIG_SYS_NAND_OOBSIZE\t\t64\n #define CONFIG_SYS_NAND_BLOCK_SIZE\t(128*1024)\n /* NAND: driver related configs */\n-#define CONFIG_NAND_OMAP_GPMC_PREFETCH\n-#define CONFIG_NAND_OMAP_ELM\n #define CONFIG_SYS_NAND_BAD_BLOCK_POS\tNAND_LARGE_BADBLOCK_POS\n #define CONFIG_SYS_NAND_ECCPOS\t\t{ 2, 3, 4, 5, 6, 7, 8, 9, \\\n \t\t\t\t\t 10, 11, 12, 13, 14, 15, 16, 17, \\\n@@ -111,7 +108,6 @@\n \n /* SPL */\n /* Defines for SPL */\n-#define CONFIG_SPL_NAND_AM33XX_BCH\t/* ELM support */\n #define CONFIG_SPL_TEXT_BASE 0x40400000\n #define CONFIG_SPL_MAX_SIZE\t\t(SRAM_SCRATCH_SPACE_ADDR - \\\n \t\t\t\t\t CONFIG_SPL_TEXT_BASE)\ndiff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h\nindex bf44121..66cacdf 100644\n--- a/include/configs/ti_am335x_common.h\n+++ b/include/configs/ti_am335x_common.h\n@@ -74,10 +74,6 @@\n * s_init when we have SPL used.\n */\n \n-#ifdef CONFIG_NAND\n-#define CONFIG_SPL_NAND_AM33XX_BCH\t/* ELM support */\n-#endif\n-\n /* Now bring in the rest of the common code. */\n #include \n \ndiff --git a/include/configs/ti_armv7_omap.h b/include/configs/ti_armv7_omap.h\nindex 306f503..da5fc81 100644\n--- a/include/configs/ti_armv7_omap.h\n+++ b/include/configs/ti_armv7_omap.h\n@@ -21,7 +21,6 @@\n * access CS0 at is 0x8000000.\n */\n #ifdef CONFIG_NAND\n-#define CONFIG_NAND_OMAP_GPMC\n #ifndef CONFIG_SYS_NAND_BASE\n #define CONFIG_SYS_NAND_BASE\t\t0x8000000\n #endif\ndiff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h\nindex 938136c..f9a051c 100644\n--- a/include/configs/ti_omap3_common.h\n+++ b/include/configs/ti_omap3_common.h\n@@ -64,7 +64,6 @@\n \t\t\t\t\t (64 << 20))\n \n #ifdef CONFIG_NAND\n-#define CONFIG_SPL_NAND_SIMPLE\n #define CONFIG_SYS_NAND_BASE\t\t0x30000000\n #endif\n \ndiff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h\nindex 018e4c2..8994400 100644\n--- a/include/configs/ti_omap4_common.h\n+++ b/include/configs/ti_omap4_common.h\n@@ -142,10 +142,6 @@\n #define CONFIG_SYS_SPL_ARGS_ADDR\t(CONFIG_SYS_SDRAM_BASE + \\\n \t\t\t\t\t (128 << 20))\n \n-#ifdef CONFIG_NAND\n-#define CONFIG_SPL_NAND_AM33XX_BCH\t/* ELM support */\n-#endif\n-\n #ifdef CONFIG_SPL_BUILD\n /* No need for i2c in SPL mode as we will use SRI2C for PMIC access on OMAP4 */\n #undef CONFIG_SYS_I2C\ndiff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h\nindex 73c1d8f..5391641 100644\n--- a/include/configs/ti_omap5_common.h\n+++ b/include/configs/ti_omap5_common.h\n@@ -103,10 +103,6 @@\n #define CONFIG_SYS_SPL_ARGS_ADDR\t(CONFIG_SYS_SDRAM_BASE + \\\n \t\t\t\t\t (128 << 20))\n \n-#ifdef CONFIG_NAND\n-#define CONFIG_SPL_NAND_AM33XX_BCH\t/* ELM support */\n-#endif\n-\n #ifdef CONFIG_SPL_BUILD\n #undef CONFIG_TIMER\n #endif\ndiff --git a/include/configs/tricorder.h b/include/configs/tricorder.h\nindex 77f8cbd..62bd73a 100644\n--- a/include/configs/tricorder.h\n+++ b/include/configs/tricorder.h\n@@ -84,7 +84,6 @@\n \t\t\t\t\t\t\"2m(fdt),\" \\\n \t\t\t\t\t\t\"-(ubi)\"\n \n-#define CONFIG_NAND_OMAP_GPMC\n #define CONFIG_SYS_NAND_ADDR\t\tNAND_BASE\t/* physical address */\n \t\t\t\t\t\t\t/* to access nand */\n #define CONFIG_SYS_NAND_BASE\t\tNAND_BASE\t/* physical address */\n@@ -254,7 +253,6 @@\n \n /* Defines for SPL */\n #define CONFIG_SPL_FRAMEWORK\n-#define CONFIG_SPL_NAND_SIMPLE\n \n #define CONFIG_SPL_NAND_BASE\n #define CONFIG_SPL_NAND_DRIVERS\ndiff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt\nindex 4651bb5..67cbbaf 100644\n--- a/scripts/config_whitelist.txt\n+++ b/scripts/config_whitelist.txt\n@@ -1578,9 +1578,6 @@ CONFIG_NAND_MXC\n CONFIG_NAND_MXC_V1_1\n CONFIG_NAND_NDFC\n CONFIG_NAND_OMAP_ECCSCHEME\n-CONFIG_NAND_OMAP_ELM\n-CONFIG_NAND_OMAP_GPMC\n-CONFIG_NAND_OMAP_GPMC_PREFETCH\n CONFIG_NAND_OMAP_GPMC_WSCFG\n CONFIG_NAND_SECBOOT\n CONFIG_NAND_SPL\n@@ -2210,7 +2207,6 @@ CONFIG_SPL_MMC_LOAD\n CONFIG_SPL_MMC_MINIMAL\n CONFIG_SPL_MPC83XX_WAIT_FOR_NAND\n CONFIG_SPL_MXS_PSWITCH_WAIT\n-CONFIG_SPL_NAND_AM33XX_BCH\n CONFIG_SPL_NAND_BASE\n CONFIG_SPL_NAND_BOOT\n CONFIG_SPL_NAND_DRIVERS\n","prefixes":["U-Boot","V4"]}