From patchwork Sun Feb 14 20:49:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 582621 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id CFF8C14031F for ; Mon, 15 Feb 2016 08:04:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 27519A75CF; Sun, 14 Feb 2016 21:57:31 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t3xyEKcZq64J; Sun, 14 Feb 2016 21:57:31 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 13372A7665; Sun, 14 Feb 2016 21:56:28 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3154CA769D for ; Sun, 14 Feb 2016 21:56:17 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4oFuSFPHFNhQ for ; Sun, 14 Feb 2016 21:56:17 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pf0-f170.google.com (mail-pf0-f170.google.com [209.85.192.170]) by theia.denx.de (Postfix) with ESMTPS id 329DAA76B2 for ; Sun, 14 Feb 2016 21:54:58 +0100 (CET) Received: by mail-pf0-f170.google.com with SMTP id e127so76000969pfe.3 for ; Sun, 14 Feb 2016 12:54:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GvD+9eG9Y07SGHokQF+Xf9irDUo06QO57M7zLuc//xk=; b=P5Bpes9tkflBsyCMWpaM9WJpHyVJK7FzXposnQKbgHcHIb4pgcEt3ZvA0okcQk9I2A kqM1nYH/5ONt3mNAA9YAWP1XWr/Pop2qSMHtuwLFybAptrUDWyLQLe5pKIhiiGNsA4ej nCqvE5PL3OemJxd1hzB2Ng8YZ2we0TLGH47rLF+Tb9u+tRxNDnO8+6TpNYJXDHfzefkW dbwibGcSToXMk5zmX5Fk3d8iemp26pJXoBOGkYMuCd1oHWP4k0Ee8dz8uM+H8gnkH7ST evUXsd9H3dUkD8BoNCRXb82y4t+2GUvt2U5xnCePefiSOnDDmDt454shrDhNl+lYPUhf 6/cQ== X-Gm-Message-State: AG10YOT22k3NXEf+xfNneGXCTdpcIOb6XJdzzbh5hrd62pHGByFJvR+akK0Uya70QOePAQ== X-Received: by 10.98.33.131 with SMTP id o3mr18777158pfj.97.1455483296862; Sun, 14 Feb 2016 12:54:56 -0800 (PST) Received: from localhost.localdomain ([123.236.183.254]) by smtp.gmail.com with ESMTPSA id cq9sm11423890pac.26.2016.02.14.12.54.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Feb 2016 12:54:55 -0800 (PST) From: Jagan Teki To: u-boot@lists.denx.de Date: Mon, 15 Feb 2016 02:19:11 +0530 Message-Id: <1455482955-19053-72-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455482955-19053-1-git-send-email-jteki@openedev.com> References: <1455482955-19053-1-git-send-email-jteki@openedev.com> Cc: Michal Simek , Siva Durga Prasad Paladugu , Jagan Teki Subject: [U-Boot] [PATCH v6 72/76] configs: Use CONFIG_SPL_SPI_NOR_SUPPORT X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" CONFIG_SPL_SPI_FLASH_SUPPORT => CONFIG_SPL_SPI_NOR_SUPPORT Cc: Simon Glass Cc: Bin Meng Cc: Mugunthan V N Cc: Michal Simek Cc: Siva Durga Prasad Paladugu Signed-off-by: Jagan Teki --- include/configs/P1010RDB.h | 2 +- include/configs/P1022DS.h | 2 +- include/configs/T102xQDS.h | 2 +- include/configs/T102xRDB.h | 2 +- include/configs/T104xRDB.h | 2 +- include/configs/T208xQDS.h | 2 +- include/configs/T208xRDB.h | 2 +- include/configs/am335x_evm.h | 2 +- include/configs/at91sam9n12ek.h | 2 +- include/configs/at91sam9x5ek.h | 2 +- include/configs/bav335x.h | 2 +- include/configs/cgtqmx6eval.h | 2 +- include/configs/chromebook_jerry.h | 2 +- include/configs/clearfog.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/cm_t43.h | 2 +- include/configs/da850evm.h | 4 ++-- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-mv784mp-gp.h | 2 +- include/configs/dra7xx_evm.h | 2 +- include/configs/ds414.h | 2 +- include/configs/maxbcm.h | 2 +- include/configs/omapl138_lcdk.h | 2 +- include/configs/ot1200.h | 2 +- include/configs/p1_p2_rdb_pc.h | 2 +- include/configs/pcm051.h | 2 +- include/configs/sama5d2_xplained.h | 2 +- include/configs/sama5d3xek.h | 2 +- include/configs/sama5d4_xplained.h | 2 +- include/configs/sama5d4ek.h | 2 +- include/configs/siemens-am33x-common.h | 2 +- include/configs/socfpga_common.h | 2 +- include/configs/taurus.h | 2 +- include/configs/theadorable.h | 2 +- include/configs/ti_armv7_keystone2.h | 2 +- include/configs/tseries.h | 2 +- 36 files changed, 37 insertions(+), 37 deletions(-) diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 3c0faca..a76630a 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -61,7 +61,7 @@ #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_FLASH_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 6235bbb..c8e7524 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -50,7 +50,7 @@ #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_FLASH_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index d446309..999fce2 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -80,7 +80,7 @@ #ifdef CONFIG_SPIFLASH #define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_FLASH_MINIMAL #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x00200000) diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 01424ce..0ad1ce7 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -87,7 +87,7 @@ #ifdef CONFIG_SPIFLASH #define CONFIG_RESET_VECTOR_ADDRESS 0x30000FFC #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_FLASH_MINIMAL #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x30000000) diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 34ba4a4..b81c194 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -73,7 +73,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg #ifdef CONFIG_SPIFLASH #define CONFIG_RESET_VECTOR_ADDRESS 0x30000FFC #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_FLASH_MINIMAL #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x30000000) diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 26bbb74..76a9f93 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -90,7 +90,7 @@ #ifdef CONFIG_SPIFLASH #define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_FLASH_MINIMAL #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x00200000) diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 2857c6a..a71f430 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -79,7 +79,7 @@ #ifdef CONFIG_SPIFLASH #define CONFIG_RESET_VECTOR_ADDRESS 0x200FFC #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_FLASH_MINIMAL #define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x00200000) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 6ebe0b3..e4d53e4 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -437,7 +437,7 @@ /* SPL related */ #undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */ #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index ba91d1f..f7f3733 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -280,7 +280,7 @@ #elif CONFIG_SYS_USE_SPIFLASH #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 45bb861..1eb7a86 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -282,7 +282,7 @@ #elif CONFIG_SYS_USE_SPIFLASH #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8400 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index e61a098..0431f78 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -551,7 +551,7 @@ DEFAULT_LINUX_BOOT_ENV \ /* SPL related */ #undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */ #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index b07c751..0f50f34 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -21,7 +21,7 @@ #define CONFIG_SPL_LIBCOMMON_SUPPORT #define CONFIG_SPL_MMC_SUPPORT #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024) #define CONFIG_SPL_SPI_LOAD #include "imx6_spl.h" diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h index ff17e1c..b3c1bc8 100644 --- a/include/configs/chromebook_jerry.h +++ b/include/configs/chromebook_jerry.h @@ -16,7 +16,7 @@ #define CONFIG_ENV_IS_NOWHERE #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPI_NOR_MISC diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index 69c1d94..1880dc7 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -145,7 +145,7 @@ #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH /* SPL related SPI defines */ #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_BUS 0 #define CONFIG_SPL_SPI_CS 0 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 180ea28..d70041c 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -234,7 +234,7 @@ #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x80 /* offset 64 kb */ #define CONFIG_SYS_MONITOR_LEN (CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS / 2 * 1024) #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024) #define CONFIG_SPL_SPI_LOAD diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index a4cd470..1b7a396 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -168,7 +168,7 @@ #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SYS_SPI_U_BOOT_OFFS (256 * 1024) #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #endif /* __CONFIG_CM_T43_H */ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 63abb80..ea319a3 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -150,7 +150,7 @@ #ifdef CONFIG_USE_SPIFLASH #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 @@ -358,7 +358,7 @@ CONFIG_SYS_MALLOC_LEN) #define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index ef14132..32fba11 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -145,7 +145,7 @@ #if CONFIG_SPL_BOOT_DEVICE == SPL_BOOT_SPI_NOR_FLASH /* SPL related SPI defines */ #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_BUS 0 #define CONFIG_SPL_SPI_CS 0 diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index c8b0344..3749280 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -135,7 +135,7 @@ /* SPL related SPI defines */ #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_BUS 0 #define CONFIG_SPL_SPI_CS 0 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 32137ba..bb1a426 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -185,7 +185,7 @@ #define CONFIG_SPL_DMA_SUPPORT #define CONFIG_TI_EDMA3 #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/include/configs/ds414.h b/include/configs/ds414.h index e3c7087..02c2cd0 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -139,7 +139,7 @@ /* SPL related SPI defines */ #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_BUS 0 #define CONFIG_SPL_SPI_CS 0 diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 43d7fd0..0b6031e 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -98,7 +98,7 @@ /* SPL related SPI defines */ #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_BUS 0 #define CONFIG_SPL_SPI_CS 0 diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index bce4fad..790fe5b 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -98,7 +98,7 @@ #ifdef CONFIG_USE_SPIFLASH #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x30000 diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 879ad58..ae20e54 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -87,7 +87,7 @@ #include "imx6_spl.h" #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_LIBCOMMON_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SYS_SPI_U_BOOT_OFFS (64 * 1024) #define CONFIG_SPL_SPI_LOAD #endif diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 4c6eedd..d5b6e50 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -217,7 +217,7 @@ #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_FLASH_MINIMAL #define CONFIG_SPL_FLUSH_IMAGE #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index 45c140d..ad3a478 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -130,7 +130,7 @@ #ifdef CONFIG_SPI_BOOT #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000 diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index b08829f..7d1dbdf 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -152,7 +152,7 @@ #elif CONFIG_SYS_USE_SERIALFLASH #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index bd5f4ee..efd02fe 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -206,7 +206,7 @@ #elif CONFIG_SYS_USE_SERIALFLASH #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 52b4584..8252046 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -167,7 +167,7 @@ #elif CONFIG_SYS_USE_SERIALFLASH #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index ce96a7c..e6e7e61 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -165,7 +165,7 @@ #elif CONFIG_SYS_USE_SERIALFLASH #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x8000 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index eac7270..eb3d85f 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -158,7 +158,7 @@ #define CONFIG_SPL_WATCHDOG_SUPPORT #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index d3b9d4a..765bec2 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -369,7 +369,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void); /* SPL QSPI boot support */ #ifdef CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000 #endif diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 1d6f9c3..06ee51c 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -166,7 +166,7 @@ /* SPL related */ #undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */ #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index cd9d6b6..5809975 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -157,7 +157,7 @@ /* SPL related SPI defines */ #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_BUS 0 #define CONFIG_SPL_SPI_CS 0 diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index a7206f4..ba2aa58 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -52,7 +52,7 @@ CONFIG_SYS_SPL_MALLOC_SIZE + \ SPL_MALLOC_F_SIZE + \ CONFIG_SPL_STACK_SIZE - 4) -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS CONFIG_SPL_PAD_TO diff --git a/include/configs/tseries.h b/include/configs/tseries.h index 93e3454..9a18039 100644 --- a/include/configs/tseries.h +++ b/include/configs/tseries.h @@ -269,7 +269,7 @@ MMCARGS #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_NOR_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #undef CONFIG_ENV_IS_NOWHERE