From patchwork Thu Dec 24 10:11:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gong Qianyu X-Patchwork-Id: 560976 X-Patchwork-Delegate: yorksun@freescale.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 923A1140C2E for ; Fri, 25 Dec 2015 08:45:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 623F44BAFE; Thu, 24 Dec 2015 22:44:52 +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 74gRZFDkRK9u; Thu, 24 Dec 2015 22:44:52 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B68224BB1C; Thu, 24 Dec 2015 22:44:33 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 348004BA6D for ; Thu, 24 Dec 2015 11:20:14 +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 tb_ZCVjRnYVV for ; Thu, 24 Dec 2015 11:20:14 +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 na01-by2-obe.outbound.protection.outlook.com (mail-by2on0065.outbound.protection.outlook.com [207.46.100.65]) by theia.denx.de (Postfix) with ESMTPS id 1DE9C4BA41 for ; Thu, 24 Dec 2015 11:20:09 +0100 (CET) Received: from CH1PR03CA010.namprd03.prod.outlook.com (10.255.156.155) by SN1PR0301MB2125.namprd03.prod.outlook.com (10.163.228.144) with Microsoft SMTP Server (TLS) id 15.1.361.13; Thu, 24 Dec 2015 10:20:06 +0000 Received: from BN1AFFO11FD024.protection.gbl (10.255.156.132) by CH1PR03CA010.outlook.office365.com (10.255.156.155) with Microsoft SMTP Server (TLS) id 15.1.361.13 via Frontend Transport; Thu, 24 Dec 2015 10:20:05 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD024.mail.protection.outlook.com (10.58.52.84) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Thu, 24 Dec 2015 10:20:05 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id tBOAJn15000744; Thu, 24 Dec 2015 03:20:01 -0700 From: Gong Qianyu To: Date: Thu, 24 Dec 2015 18:11:59 +0800 Message-ID: <1450951919-27135-4-git-send-email-Qianyu.Gong@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1450951919-27135-1-git-send-email-Qianyu.Gong@nxp.com> References: <1450951919-27135-1-git-send-email-Qianyu.Gong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 130954260056973807; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD024; 1:aUEOT7Bh+6rfu/rwkNCnd7VvdmtA2skEmFLIUyFAVi6uGpZe6SRXHtR9L9guDjHmSyPkFOoCyFDbWp4nY2CxL+EInASxBAJHkkZM6915V3JMdJLi0W/EoB17CbbjbXQk2uR+xqYr2rxTtO5P3DAWp+05xGMHWKddMy8rLUB0+FAwstvWJDdn9i8/YWkHC0Z8nQ73YSbxnR/mhAa9n3hXZMDl2HV20ntOW0FVmTykHg/gln+T/9Nf4JYIvejM5AA5mgVeuKLhFhITX72b9gsBzzPnNbPhfvLP3mIK67Glj07INjDdw4yaSaJLTP2dTGdjZErnH0Bsermobm+y4KEDmEiVhu2Bmpo1ween24QcwzvM8CMK0CyqmLQkhVDB/QUhLTrNKEv/chsrJsAtW89yPxLNSqc4OFeYwtkcuf+bqbAYWdeaYQTe2RT1NHiDaoElLaopbOHKvJW8p4ICJNRzAOgqm8P3TYmnNj7vjXapSH0= X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(3190300001)(199003)(189002)(1220700001)(6806005)(19580395003)(1096002)(36756003)(586003)(85426001)(104016004)(575784001)(69596002)(4001430100002)(105606002)(2351001)(87936001)(229853001)(86362001)(19580405001)(110136002)(50986999)(77096005)(189998001)(5003940100001)(2950100001)(92566002)(5001960100002)(81156007)(107886002)(106466001)(11100500001)(97736004)(50466002)(76176999)(50226001)(48376002)(5008740100001)(47776003)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0301MB2125; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2125; 2:scCPFRcrIHHN16MLCC469jwlXh8L2VXp4ieMFK6oCpFq6Vhz9xO6vsg/cliWKai0v+OXBtMdaJCqCHtKeKM7mw6lh/kXB4+yIwJAMJNJrcxEO5746q5dXTLHgl24PL8tXau2s+fzo0mRxF9L5d15sg==; 3:GA05e3pNm9T4xEbBSVM06ClTc1bITJLsUd0UQF2D1y8O8HAasaAvqJChkppR5RgOLVawla5gIah6slnNmmPKEQRyj/SBzzulbfZUMiAzq6aW3py9MMe913eDuEAWg+KzmNmyPOSq/5B8qfvSrEa9Lm9dldtVr72j4iI91q+QYEd8H1ooc3XlaWU1dKqQIaILWVQGcAmmF7nGunfCtWd2ESBhKjGZimvr7SkZf9sAg+0=; 25:/8fJAbZ0GLQt6yO0umZLvmwhUmez1fDmWkCIeLDAisEvuuBaHEiIy68VG4xIBFinYjKV98TpcrppbIouJ+iaX3qVIzkQ/igZ+HuObi8j6INkxh8wS/pBR5iWy6EJ1kjGg2oZWo47v1QXiYxpOAngu9sKwoLmqU3rvgunG/bDw/Irgw/lJ3ejcpj/G2euzuLJCWP2/2NJStp0cXosMw8jEZEVF3aOFqDmBkgxZjRWY6k6IPVy2UbQnRbAZSzZDQRa X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB2125; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(10201501046)(3002001); SRVR:SN1PR0301MB2125; BCL:0; PCL:0; RULEID:(400006); SRVR:SN1PR0301MB2125; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2125; 4:h8vhrEUTaxUcMlck9H8yvfvLq50lYd/ky60UdmdWJR4yuYQX10fRy7lxU6ktv9bW4CQdp9/FKqhmRmUu0wg/UfjZ0Yh5QxRSbPb/M0YSIOYmvxP0JqZPFBkp9IGMlgwVi3Sc916mKqVN6zskA877OwxeDzcUXfte5f3iMbvA2atLdi+5773GOixUU4rViX5Nnhv1akH8Aw3X/O1pxD+EhgeR6jEwjCGheIjn8pVPs6hSOPJAPzkOMGYMZaM43KyH8GEGPy6/Zl3Id3YSinRZGfmF2tZYzxJ0vdgVG+Axj4UgmYsJi291Xp0OG+sFes5jQ+gICCw70HUOqA4oXKwu7f950KVU2AmK5h3LVfQ0O6YP65UpN806qvVJ4ppRsCm5O+JVaWqK1W5lQJZtNGyoK8/9bk8iX/aYybJ3UpoSd9I= X-Forefront-PRVS: 0800C0C167 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0301MB2125; 23:re2y9H/p7HYeQBCSkF6G8mwC1uERjrg6r3HUtBa?= =?us-ascii?Q?t9wMVMWa5ZOf9+0ZNHfT2A8Os9lWgMXfEPadE9rs/bux0mz1UhlhYn0Bkwsd?= =?us-ascii?Q?MvKXOI4N0cqk8DNGFKHxebYypD17EhY0tg+IrftrezqPovy3hKCA6Pip6B1J?= =?us-ascii?Q?nvo+zjV3jlBHNH0oYprVu2LPLmoB2pixnwzPZNq0BzLk4N8tH/OiYFWRmlSk?= =?us-ascii?Q?+eAFwSkls14e/Y/hQQxeghh0G0hl2v68yk4ZTbWGE5s2eZFya6gH1p3vwDP7?= =?us-ascii?Q?ULvR76BsCQGdXjwI1eSiJbZBZniSAzwO1e9EKUcf94J3iJwHaJbFJWNRsnMv?= =?us-ascii?Q?KTLtC1yH4kxlklB3yVKGwD4yCCYTjptdy5Rw851vwFUQkWa6FXRAwjK1SDbE?= =?us-ascii?Q?SWUGKnSdWVDGdF1uVnkz38sp2g0Q37NBXLKzs3L2JxHXHq4D8BuYoHZ0f+PQ?= =?us-ascii?Q?/UQefj3EdW9/Cwmz88iCgt55U7h7cjuPTmdhRoSdJGbolMXMzMiTZGWRIH4j?= =?us-ascii?Q?3K6LywkCSJxzbUH4wz8q9f8TFHMzyxykweX9m8kHVT0oQEbRROm9panat564?= =?us-ascii?Q?/ZYef3XIESMZEScPcfiym0TsSShrxaXoPOvr63kYv7Dqj9Def6xN/HgqVDYZ?= =?us-ascii?Q?3h2qJOtIhNGAq2XCLyrEZlEme1UpehZ73m00V4mAMFpUTIp9kzE2UK9+1gbM?= =?us-ascii?Q?l12itpUlyk+mxqmDXJZx+j9WD034JtvUlIEcEUoo+qf92TR5YnpwBw7Y6v6s?= =?us-ascii?Q?M0v4/fZtmiryI1cL2OqZ27jpE5DsbBuLkt8iCTGSltrlK5f9pakBdJ8NQuJ8?= =?us-ascii?Q?FSot+SsXAwxfHntgz8xzzY70Wg13xX9E+vcdRwPbcRQyp71VSiV1ifsTQsfL?= =?us-ascii?Q?IL2D2w+V3XYBF/B8iD0avAxUCHL3OxpL960DY0T+rV4ZWat9eh7mB0JDpHDQ?= =?us-ascii?Q?yomzpAl7sYFkHVbOKFfZd+RtkzwNKuaSqYO76TtnFLDJshSkz+wjHXl7hQGQ?= =?us-ascii?Q?7X7mHYjaoE/nHbXQE6O8P0cUaSxMo0h4WcEdutnI4GT+OzqYSwlJqGuQYFBM?= =?us-ascii?Q?9zZh4pFwz6aCX2w+Dmf7SF2VZbBa6ATXtLVO+d+aymTptNP6/zlrpcuVzt/n?= =?us-ascii?Q?IeWNOo+45LozGaw5VVGHw1S/gTiB2Z5Pg3hKdV6rwdO68kmGcEMGLBrKF6uG?= =?us-ascii?Q?agoUwet57PKBUF4U=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2125; 5:aXfA+eyipQhNUPCg5gVzjnFeBq8yHH/T5slgLVqh2ZOxbf8ucO0v+l1vTM8djiEDD7WgyjzPDF6rVubpmLj5mh1YuqEQ92CvzgXlm2sGBccgqXy8Qa2+JolhH0qb3bgjTexU6/2zTmhBRC7SH/4vaP30Wlx6m2kqz96TAAFeZDw=; 24:JmPKDqXsNu0Ww3iY8+nUtzYvNPGolFXlXOxuzKjt3JxFyT5Eyg7nE0+DIkRgdz7UVbS7/tLDx1NNIsWUT5Bl93X7DlNfAGPwF6Ic9TF+NXw= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Dec 2015 10:20:05.4633 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0301MB2125 X-Mailman-Approved-At: Thu, 24 Dec 2015 22:44:22 +0100 Cc: B07421@freescale.com, Gong Qianyu , B48286@freescale.com, Wenbin.Song@freescale.com, Mingkai.Hu@nxp.com Subject: [U-Boot] [Patch V2 3/3] armv8/ls1043aqds: add QSPI boot 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Gong Qianyu Enable the U-Boot Driver Model(DM) to use the Freescale QSPI driver. Signed-off-by: Gong Qianyu --- V2: - No change. arch/arm/include/asm/arch-fsl-layerscape/cpu.h | 2 ++ board/freescale/ls1043aqds/MAINTAINERS | 1 + board/freescale/ls1043aqds/README | 1 + board/freescale/ls1043aqds/ls1043aqds.c | 7 +++++++ configs/ls1043aqds_qspi_defconfig | 9 +++++++++ include/configs/ls1043a_common.h | 6 +++--- include/configs/ls1043aqds.h | 15 ++++++++++++--- 7 files changed, 35 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/cpu.h b/arch/arm/include/asm/arch-fsl-layerscape/cpu.h index e030430..f2f1206 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/cpu.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/cpu.h @@ -150,6 +150,8 @@ static const struct sys_mmu_table early_mmu_table[] = { { CONFIG_SYS_FSL_DCSR_BASE, CONFIG_SYS_FSL_DCSR_BASE, CONFIG_SYS_FSL_DCSR_SIZE, MT_DEVICE_NGNRNE, PMD_SECT_NON_SHARE | PMD_SECT_PXN | PMD_SECT_UXN }, + { CONFIG_SYS_FSL_QSPI_BASE, CONFIG_SYS_FSL_QSPI_BASE, + CONFIG_SYS_FSL_QSPI_SIZE, MT_DEVICE_NGNRNE, PMD_SECT_NON_SHARE }, { CONFIG_SYS_FSL_IFC_BASE, CONFIG_SYS_FSL_IFC_BASE, CONFIG_SYS_FSL_IFC_SIZE, MT_DEVICE_NGNRNE, PMD_SECT_NON_SHARE }, { CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_BASE1, diff --git a/board/freescale/ls1043aqds/MAINTAINERS b/board/freescale/ls1043aqds/MAINTAINERS index 868bb72..65a0af1 100644 --- a/board/freescale/ls1043aqds/MAINTAINERS +++ b/board/freescale/ls1043aqds/MAINTAINERS @@ -8,3 +8,4 @@ F: configs/ls1043aqds_nor_ddr3_defconfig F: configs/ls1043aqds_nand_defconfig F: configs/ls1043aqds_sdcard_ifc_defconfig F: configs/ls1043aqds_sdcard_qspi_defconfig +F: configs/ls1043aqds_qspi_defconfig diff --git a/board/freescale/ls1043aqds/README b/board/freescale/ls1043aqds/README index 6261a77..a6fd7a3 100644 --- a/board/freescale/ls1043aqds/README +++ b/board/freescale/ls1043aqds/README @@ -94,3 +94,4 @@ a) Promjet Boot b) NOR boot c) NAND boot d) SD boot +e) QSPI boot diff --git a/board/freescale/ls1043aqds/ls1043aqds.c b/board/freescale/ls1043aqds/ls1043aqds.c index d6696ca..770b79f 100644 --- a/board/freescale/ls1043aqds/ls1043aqds.c +++ b/board/freescale/ls1043aqds/ls1043aqds.c @@ -43,15 +43,19 @@ enum { int checkboard(void) { +#ifndef CONFIG_QSPI_BOOT char buf[64]; #ifndef CONFIG_SD_BOOT u8 sw; #endif +#endif puts("Board: LS1043AQDS, boot from "); #ifdef CONFIG_SD_BOOT puts("SD\n"); +#elif defined(CONFIG_QSPI_BOOT) + puts("QSPI\n"); #else sw = QIXIS_READ(brdcfg[0]); sw = (sw & QIXIS_LBMAP_MASK) >> QIXIS_LBMAP_SHIFT; @@ -68,12 +72,15 @@ int checkboard(void) printf("invalid setting of SW%u\n", QIXIS_LBMAP_SWITCH); #endif +#ifndef CONFIG_QSPI_BOOT + /* For QSPI boot, here I2C is not ready yet. */ printf("Sys ID: 0x%02x, Sys Ver: 0x%02x\n", QIXIS_READ(id), QIXIS_READ(arch)); printf("FPGA: v%d (%s), build %d\n", (int)QIXIS_READ(scver), qixis_read_tag(buf), (int)qixis_read_minor()); +#endif return 0; } diff --git a/configs/ls1043aqds_qspi_defconfig b/configs/ls1043aqds_qspi_defconfig new file mode 100644 index 0000000..fcbaf31 --- /dev/null +++ b/configs/ls1043aqds_qspi_defconfig @@ -0,0 +1,9 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1043AQDS=y +CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4,QSPI_BOOT" +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-qds" +CONFIG_SYS_NS16550=y +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_SPI_FLASH=y +CONFIG_DM_SPI=y diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 707405c..afddedc 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -121,7 +121,7 @@ #endif /* IFC */ -#ifndef CONFIG_SD_BOOT_QSPI +#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_FSL_IFC /* * CONFIG_SYS_FLASH_BASE has the final address (core view) @@ -207,7 +207,7 @@ #define CONFIG_SPI_FLASH_STMICRO /* cs0 */ #define CONFIG_SPI_FLASH_SST /* cs1 */ #define CONFIG_SPI_FLASH_EON /* cs2 */ -#ifndef CONFIG_SD_BOOT_QSPI +#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_SF_DEFAULT_BUS 1 #define CONFIG_SF_DEFAULT_CS 0 #endif @@ -218,7 +218,7 @@ #ifdef CONFIG_SYS_DPAA_FMAN #define CONFIG_SYS_FM_MURAM_SIZE 0x60000 -#ifdef CONFIG_SD_BOOT_QSPI +#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_SYS_QE_FW_IN_SPIFLASH #define CONFIG_SYS_FMAN_FW_ADDR 0x400d0000 #define CONFIG_ENV_SPI_BUS 0 diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index cb519e1..e01f06d 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -14,6 +14,8 @@ #if defined(CONFIG_NAND_BOOT) || defined(CONFIG_SD_BOOT) #define CONFIG_SYS_TEXT_BASE 0x82000000 +#elif defined(CONFIG_QSPI_BOOT) +#define CONFIG_SYS_TEXT_BASE 0x40010000 #else #define CONFIG_SYS_TEXT_BASE 0x60100000 #endif @@ -112,7 +114,7 @@ unsigned long get_board_ddr_clk(void); /* * IFC Definitions */ -#ifndef CONFIG_SD_BOOT_QSPI +#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_SYS_NOR0_CSPR_EXT (0x0) #define CONFIG_SYS_NOR0_CSPR (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \ CSPR_PORT_SIZE_16 | \ @@ -204,7 +206,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_U_BOOT_SIZE (640 << 10) #endif -#ifdef CONFIG_SD_BOOT_QSPI +#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_QIXIS_I2C_ACCESS #define CONFIG_SYS_NO_FLASH #undef CONFIG_CMD_IMLS @@ -227,8 +229,10 @@ unsigned long get_board_ddr_clk(void); #define QIXIS_LBMAP_NAND 0x09 #define QIXIS_LBMAP_SD 0x00 #define QIXIS_LBMAP_SD_QSPI 0xff +#define QIXIS_LBMAP_QSPI 0xff #define QIXIS_RCW_SRC_NAND 0x106 #define QIXIS_RCW_SRC_SD 0x040 +#define QIXIS_RCW_SRC_QSPI 0x045 #define QIXIS_RST_CTL_RESET 0x41 #define QIXIS_RCFG_CTL_RECONFIG_IDLE 0x20 #define QIXIS_RCFG_CTL_RECONFIG_START 0x21 @@ -356,7 +360,7 @@ unsigned long get_board_ddr_clk(void); #define VDD_MV_MAX 1212 /* QSPI device */ -#ifdef CONFIG_SD_BOOT_QSPI +#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_FSL_QSPI #ifdef CONFIG_FSL_QSPI #define CONFIG_SPI_FLASH_SPANSION @@ -415,6 +419,11 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_ENV_SIZE 0x2000 +#elif defined(CONFIG_QSPI_BOOT) +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_ENV_SIZE 0x2000 /* 8KB */ +#define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ +#define CONFIG_ENV_SECT_SIZE 0x10000 #else #define CONFIG_ENV_IS_IN_FLASH #define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x200000)