From patchwork Thu Oct 15 09:54:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Wang X-Patchwork-Id: 530602 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 4DA771402B9 for ; Thu, 15 Oct 2015 21:17:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BF83C4B635; Thu, 15 Oct 2015 12:17:17 +0200 (CEST) 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 ozqiJ-zzdL1r; Thu, 15 Oct 2015 12:17:17 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 58EC24A039; Thu, 15 Oct 2015 12:17:17 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BD1E14A039 for ; Thu, 15 Oct 2015 12:17:13 +0200 (CEST) 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 2TDP5efvdkon for ; Thu, 15 Oct 2015 12:17:13 +0200 (CEST) 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-bn1-obe.outbound.protection.outlook.com (mail-bn1on0112.outbound.protection.outlook.com [157.56.110.112]) by theia.denx.de (Postfix) with ESMTPS id 0DC084A033 for ; Thu, 15 Oct 2015 12:17:10 +0200 (CEST) Received: from CH1PR03CA009.namprd03.prod.outlook.com (10.255.156.154) by CY1PR0301MB0666.namprd03.prod.outlook.com (10.160.158.148) with Microsoft SMTP Server (TLS) id 15.1.300.14; Thu, 15 Oct 2015 10:01:08 +0000 Received: from BL2FFO11FD027.protection.gbl (10.255.156.132) by CH1PR03CA009.outlook.office365.com (10.255.156.154) with Microsoft SMTP Server (TLS) id 15.1.300.14 via Frontend Transport; Thu, 15 Oct 2015 10:01:07 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: Fail (protection.outlook.com: domain of freescale.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 BL2FFO11FD027.mail.protection.outlook.com (10.173.161.106) with Microsoft SMTP Server (TLS) id 15.1.293.9 via Frontend Transport; Thu, 15 Oct 2015 10:01:07 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t9FA13Lc017787; Thu, 15 Oct 2015 03:01:04 -0700 From: Alison Wang To: , , Date: Thu, 15 Oct 2015 17:54:40 +0800 Message-ID: <1444902880-38998-1-git-send-email-b18965@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD027; 1:jxwjYwmvLbdWUKA1hWTnmgReA4SoOT1xG57n89dY141FV7pZ9XC4zd1ToWweoh1l4wjsOeO50EoVcGVcmIPnk8jKVvu1zp0Q8Q9NBkl7poG917Nj3WEN4zWvBxIJIjxrOBAVUpVtHRS4m7ziZZjXh0qaL7mknxCBnmuEzTOm+6IZKjwNq3KciJRb5cJ339tG+iTdU1fFmyz8UfI4tuuEDHgsqJ4iHeS3ekoymVMzswShIZ3HTAcisScV6RTet1PKFYvh46mlvRUrKCnPKLJtaMcNB5Wdr5cKMku3wANXsvCui0pFliudCGKSPOlU1dRE8JnABW82e9VwNRQzrX64H2TwSY//sDKM8K6hhJJYnz8FKdVo55HACQwHxzzo9K8rJ/b29GjvbEf2XFfhCD9rWw== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(105606002)(229853001)(575784001)(189998001)(33646002)(5001960100002)(19580395003)(69596002)(450100001)(64706001)(47776003)(19580405001)(81156007)(97736004)(5001770100001)(85426001)(87936001)(50226001)(46102003)(104016004)(48376002)(5008740100001)(2201001)(5003940100001)(50986999)(107886002)(77096005)(5007970100001)(6806005)(50466002)(106466001)(92566002)(36756003)(4001450100002)(5001920100001)(11100500001)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB0666; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0666; 2:/rda2RAVvq1H6nQpKAawBjKG7OzSv3uq1aK24UBtObQJzIKTaNXwvUwDMoiK4WTSquDTW/5RQm35xmDFp78+CUT+FOGTdsbDJ3SoHb04AO9xgPxnQo3S+8uDJkkSAm1uTGguj195UbAA5n8dH8ClC9gI4gqdat3XZ2jZrfiAXGw=; 3:td/5L95dTiOhP5dvvOUsAC9MyQ6zigepfvzNVTwKp4D6hJat+509hJqBiju0/a+fbL+QXrhcU+FFmSnwA+0YHdRAwMpKo1RMkGVjG1Xdo+Qegp6c0IYb+3BBvEhH+QYxtI4N6ZcD8aM67wo3AZx75HEl5i6W84CKtoSK6kCdWEMD8Cgk1ylkB4UXz2IkvEwUQ+PpJ2hFjjpz+DTVQg52LqCHo+sU55L4dcOYpwzgqOs=; 25:n3TnAGlUvjRKR+FJb5lpxZoMxFXB6idheOqQG5dBVSPlj/4bwrReJx7bvV6OxHhkbypin8OiNO+WubmFOGsToFc9gmmguD8xvvcpLUtqAO79b0qmXC24k+I0DcOJAkmyLwv8dqDjJ85cCV6XH84pF0oDUPcJVZo2ltHle2BwutdF8cvW9G/VZtJbQEA6LdBXEowxz7fyYosRqi7gYkqNvZ3Y6F1Ds/aWgQdt+UTPjZEwBgM0+Zc/r+rkY6I3FYPC1ZWTvzNdVpkCT3c8EOaW3A== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB0666; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0666; 20:oJTex/KpyIxWGElqZA9eT4RlHtcohXJpGxpoAENM3nrKRSkJkgQR7DWmIUan0aZI2VY6DgUq+SkJgZeMS2AdQEOU7ZGWagPqeE6ijrsokf+CStUoShDOlv6kPGsu4xZ5JyEI/Y0KMTESPzR+kAt+R9LBQx9goFQ1BWE8lQ5lVluaEcquPiyX213R2PNn6CXN1DOArL5AemZjhw6/y1XoNO+X/iegD03ZHuh6HMSHZETGGQNLU23WRCbhR5lJsuMQmuQWU9lCvu10Ki00qm3IhAPfcZvCphDaIZqeLOxpEvI16UFu6uOx2tJrd8ETJUQALuqlddecPAJ70T6mzUecC1ckM3iESNF0Z5vJYBOu5cU=; 4:VVG7PVgGpaXC6iD0wCJDzRt4PgeHDb39VjAo2ZC6C3TkqJanI4r59udrVYWdI2H4A8a3vqR1J0mv59pDZb/gFwoMjV0bH5pwFw+MbM5wbun0Mb3pH02WkshUEgcqxJz3Xlm/NTdnZPIALZ3dfSQxkmXcFw2FcrdfPtxOniCe0DIQd2UbmL79AuVDmLEXANMLrrkyUHYam7lMtdVhGBHwK9hZZEXlYd+PrU1skmAgbXxrqwR50DjBAGM4pH3I/6Mx9cQWErm/I772WC8mdR5trPB62CuE2onjeuSTFHjHykf32BHSB2197Az+Af/QNmNVt2tRV4a7YVCEwDM5vUqn6lcAqdyHAYTVAWO1JG0Q2Hs= 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)(3002001); SRVR:CY1PR0301MB0666; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB0666; X-Forefront-PRVS: 0730093765 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0666; 23:512+HQPr2ozwT/H6gjglGz2rWDGSkWeVe1ExsbK?= =?us-ascii?Q?63GyuDGlyaRyow/gk/aiixYEpXoViafL1SOEY1oes2v5qyUoFpPC9QJUbWkb?= =?us-ascii?Q?z2lMEr2lCmxXRwBqwoTzYZxtc5HNT/kxTPzgFAjHztE+FnUwah35dh0c1qqP?= =?us-ascii?Q?GTzD7/APzBoIk0Vj8SkYA4WDAPN8Yf7tOWGNr6G5/Pyhc0BXxcwCl9k6ZWNy?= =?us-ascii?Q?SgiPAVA04GAMymaAtXKRG7jm1bwi8lOcm2C8QX6kL+UtDd7Vs7CGWJCNiRFl?= =?us-ascii?Q?sG5VQe+jgcY/mOc1Qa56SRrhjoaEQ2ReQoo9y3S8FP8HGgN2JPAFrglvozdw?= =?us-ascii?Q?SeFhc2giGA6ZaNUp0SEor+OTQ0NnvtiMlAkUNxyLouxqR9izLrLwihjpdPqC?= =?us-ascii?Q?+fe44dHteu9wWsJXvg7SauBI43eXfCBFiQBED7wYMsnP+zjVAaEAvhDr8XLT?= =?us-ascii?Q?GeNRlrKmnRdJsPDYoamz2zYuiSQ2cOoDS9uC3r6NaPlT9tOFsEyWEg6fu3B5?= =?us-ascii?Q?VzgV2a+OG92TjT0fNm6xs+nj6jdHhjxqVxyRcjd9qZmlz1AhfJ/U2y+Ix9Hy?= =?us-ascii?Q?Ru5PAWmkM781YIVfHKv+EvHmyIbSQq59jdKZIwuggMxUkkP4f9jihgfwzJ+k?= =?us-ascii?Q?+9RYvYxmpZZiR6mpCMd9mmPrp5p1VvmhoRGVjpRTCVvdwd+dir6eQ0sQSDz6?= =?us-ascii?Q?XQoCjVUPethBJmympcqvC+Z7HiIcaYpqLdzSmud+1tigfKwCK4LPg7CbPZEV?= =?us-ascii?Q?tO7nl9zokUs5t2Dwr1gjmOFHqEEuk3JZs3ViymAGIZI4Uj6VehoPSHyno+cK?= =?us-ascii?Q?ROAV/KcTeVLz1MucHbRnmua8qfSYi9g1cPnCPfR0yyk+9zsdN1hvxWEwDRg5?= =?us-ascii?Q?ppR22k4nwLvBFIWLQxVGZ3DYkbOcOaHuz1BanGKnCwN138j8l8nF7J7Qpbuh?= =?us-ascii?Q?q4oz/i1gFtWZNlgjuf7M0hl10k6r/FzefTAJTCmfKJb+h3wceA73DNGNNSMf?= =?us-ascii?Q?AnHtTF4+InMKf6KuyPPqzFVC6z0App6rZO44nxPWZ7MPiclnsHKFRFwofbTr?= =?us-ascii?Q?HttFgr0UBH53+2ZL/S0xVSzZM6bw+nmjg4QFy3QBF9mKp6N+lnvQKWPoXyiL?= =?us-ascii?Q?TgBp8MH4S221ZfhLkURCm4NkW5FswDovV7AiKmtE7olAtjnVBh2fiXKpHQ+c?= =?us-ascii?Q?HQnfw+6e+DtAOFuGN8mjOK0aB+EFrMQnw08Cw?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0666; 5:wjLquzq2wat0M2J7Cb/DQAbROSo4S2oB2rLQuHFLiRxgUBHoArAQSQ2pYTaFm/UMAzOJjyTERmndveKOy3EOwYjKCp2BgPEObScOTmsvPEqu+LPdktRT4s2zcI45vZAphKCngZVc7lbwyc86fhJvEg==; 24:BCmFpA7PvLTZzocK7gvm9c4Xxxq+LxjFzfsYsZoTvZqjfDinFQb5J0lnVSa9ZQN0F0mCyWaBiHBkH2tZ3kT1+j9e8fFTW9HjxlmHH3xqeIE=; 20:HjszNJ9PrkL+ca4xzNBR88q3tiU3FHEcY7QlhIgGw+Em7Vdwqc9VM4mW574An9Z3oEtPWujoMO1vH8iO+/0DQA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2015 10:01:07.3422 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB0666 Subject: [U-Boot] [PATCH v2] arm: ls1021a: Add QSPI or IFC support in SD boot 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" As QSPI and IFC are pin-multiplexed on LS1021A, only IFC is supported in SD boot now. For the customer's demand, QSPI needs to be supported in SD boot too. This patch adds QSPI or IFC support in SD boot according to the corresponding defconfig. For detail, ls1021atwr_sdcard_ifc_defconfig is used to support IFC in SD boot and ls1021atwr_sdcard_qspi_defconfig is used to support QSPI in SD boot. Signed-off-by: Alison Wang --- Changes in v2: - Fix checkpatch warnings about line over 80 characters. Makefile | 4 ++++ board/freescale/ls1021atwr/MAINTAINERS | 3 ++- board/freescale/ls1021atwr/ls1021atwr.c | 14 +++++++------- board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg | 14 -------------- board/freescale/ls1021atwr/ls102xa_rcw_sd_ifc.cfg | 8 ++++++++ board/freescale/ls1021atwr/ls102xa_rcw_sd_qspi.cfg | 8 ++++++++ configs/ls1021atwr_sdcard_defconfig | 7 ------- configs/ls1021atwr_sdcard_ifc_defconfig | 6 ++++++ configs/ls1021atwr_sdcard_qspi_defconfig | 11 +++++++++++ include/configs/ls1021atwr.h | 19 ++++++++++++++++--- 10 files changed, 62 insertions(+), 32 deletions(-) delete mode 100644 board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg create mode 100644 board/freescale/ls1021atwr/ls102xa_rcw_sd_ifc.cfg create mode 100644 board/freescale/ls1021atwr/ls102xa_rcw_sd_qspi.cfg delete mode 100644 configs/ls1021atwr_sdcard_defconfig create mode 100644 configs/ls1021atwr_sdcard_ifc_defconfig create mode 100644 configs/ls1021atwr_sdcard_qspi_defconfig diff --git a/Makefile b/Makefile index 8c0ca1b..b12a7e8 100644 --- a/Makefile +++ b/Makefile @@ -1120,7 +1120,11 @@ spl/u-boot-spl.pbl: spl/u-boot-spl.bin FORCE $(call if_changed,mkimage) ifeq ($(ARCH),arm) +ifdef CONFIG_DM +UBOOT_BINLOAD := u-boot-dtb.img +else UBOOT_BINLOAD := u-boot.img +endif else UBOOT_BINLOAD := u-boot.bin endif diff --git a/board/freescale/ls1021atwr/MAINTAINERS b/board/freescale/ls1021atwr/MAINTAINERS index e9f6f0a..b997bb0 100644 --- a/board/freescale/ls1021atwr/MAINTAINERS +++ b/board/freescale/ls1021atwr/MAINTAINERS @@ -6,5 +6,6 @@ F: include/configs/ls1021atwr.h F: configs/ls1021atwr_nor_defconfig F: configs/ls1021atwr_nor_SECURE_BOOT_defconfig F: configs/ls1021atwr_nor_lpuart_defconfig -F: configs/ls1021atwr_sdcard_defconfig +F: configs/ls1021atwr_sdcard_ifc_defconfig +F: configs/ls1021atwr_sdcard_qspi_defconfig F: configs/ls1021atwr_qspi_defconfig diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index 228dbf8..9d3457b 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -175,7 +175,7 @@ struct cpld_data { u8 rev2; /* Reserved */ }; -#ifndef CONFIG_QSPI_BOOT +#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) static void convert_serdes_mux(int type, int need_reset); void cpld_show(void) @@ -216,7 +216,7 @@ void cpld_show(void) int checkboard(void) { puts("Board: LS1021ATWR\n"); -#ifndef CONFIG_QSPI_BOOT +#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) cpld_show(); #endif @@ -380,7 +380,7 @@ int board_eth_init(bd_t *bis) } #endif -#ifndef CONFIG_QSPI_BOOT +#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) int config_serdes_mux(void) { struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); @@ -414,7 +414,7 @@ int config_serdes_mux(void) } #endif -#ifndef CONFIG_QSPI_BOOT +#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) int config_board_mux(void) { struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE); @@ -627,7 +627,7 @@ int board_init(void) { #ifndef CONFIG_SYS_FSL_NO_SERDES fsl_serdes_init(); -#ifndef CONFIG_QSPI_BOOT +#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) config_serdes_mux(); #endif #endif @@ -657,7 +657,7 @@ int misc_init_r(void) #ifdef CONFIG_FSL_DEVICE_DISABLE device_disable(devdis_tbl, ARRAY_SIZE(devdis_tbl)); #endif -#ifndef CONFIG_QSPI_BOOT +#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) config_board_mux(); #endif @@ -706,7 +706,7 @@ u16 flash_read16(void *addr) return (((val) >> 8) & 0x00ff) | (((val) << 8) & 0xff00); } -#ifndef CONFIG_QSPI_BOOT +#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) static void convert_flash_bank(char bank) { struct cpld_data *cpld_data = (void *)(CONFIG_SYS_CPLD_BASE); diff --git a/board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg b/board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg deleted file mode 100644 index 9c3e3b0..0000000 --- a/board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg +++ /dev/null @@ -1,14 +0,0 @@ -#PBL preamble and RCW header -aa55aa55 01ee0100 - -#enable IFC, disable QSPI and DSPI -0608000a 00000000 00000000 00000000 -20000000 00407900 60040a00 21046000 -00000000 00000000 00000000 00038000 -00080000 881b7340 00000000 00000000 - -#disable IFC, enable QSPI and DSPI -#0608000a 00000000 00000000 00000000 -#20000000 00407900 60040a00 21046000 -#00000000 00000000 00000000 00038000 -#20084800 881b7340 00000000 00000000 diff --git a/board/freescale/ls1021atwr/ls102xa_rcw_sd_ifc.cfg b/board/freescale/ls1021atwr/ls102xa_rcw_sd_ifc.cfg new file mode 100644 index 0000000..205606f --- /dev/null +++ b/board/freescale/ls1021atwr/ls102xa_rcw_sd_ifc.cfg @@ -0,0 +1,8 @@ +#PBL preamble and RCW header +aa55aa55 01ee0100 + +#enable IFC, disable QSPI and DSPI +0608000a 00000000 00000000 00000000 +30000000 00007900 60040a00 21046000 +00000000 00000000 00000000 20000000 +00080000 881b7340 00000000 00000000 diff --git a/board/freescale/ls1021atwr/ls102xa_rcw_sd_qspi.cfg b/board/freescale/ls1021atwr/ls102xa_rcw_sd_qspi.cfg new file mode 100644 index 0000000..6767e09 --- /dev/null +++ b/board/freescale/ls1021atwr/ls102xa_rcw_sd_qspi.cfg @@ -0,0 +1,8 @@ +#PBL preamble and RCW header +aa55aa55 01ee0100 + +#disable IFC, enable QSPI and DSPI +0608000a 00000000 00000000 00000000 +30000000 00007900 60040a00 21046000 +00000000 00000000 00000000 20000000 +20024800 881b7340 00000000 00000000 diff --git a/configs/ls1021atwr_sdcard_defconfig b/configs/ls1021atwr_sdcard_defconfig deleted file mode 100644 index f1709ed..0000000 --- a/configs/ls1021atwr_sdcard_defconfig +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_LS1021ATWR=y -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT" -# CONFIG_CMD_SETEXPR is not set -CONFIG_NETDEVICES=y -CONFIG_E1000=y diff --git a/configs/ls1021atwr_sdcard_ifc_defconfig b/configs/ls1021atwr_sdcard_ifc_defconfig new file mode 100644 index 0000000..2136ab2 --- /dev/null +++ b/configs/ls1021atwr_sdcard_ifc_defconfig @@ -0,0 +1,6 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1021ATWR=y +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT" +CONFIG_NETDEVICES=y +CONFIG_E1000=y diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig new file mode 100644 index 0000000..458578b --- /dev/null +++ b/configs/ls1021atwr_sdcard_qspi_defconfig @@ -0,0 +1,11 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1021ATWR=y +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT,SD_BOOT_QSPI" +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr" +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_SPI_FLASH=y +CONFIG_NETDEVICES=y +CONFIG_E1000=y +CONFIG_DM_SPI=y diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index f6bd5fc..d28e5d9 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -109,7 +109,13 @@ #endif #ifdef CONFIG_SD_BOOT -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/ls1021atwr/ls102xa_rcw_sd.cfg +#ifdef CONFIG_SD_BOOT_QSPI +#define CONFIG_SYS_FSL_PBL_RCW \ + board/freescale/ls1021atwr/ls102xa_rcw_sd_qspi.cfg +#else +#define CONFIG_SYS_FSL_PBL_RCW \ + board/freescale/ls1021atwr/ls102xa_rcw_sd_ifc.cfg +#endif #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_LDSCRIPT "arch/$(ARCH)/cpu/u-boot-spl.lds" #define CONFIG_SPL_LIBCOMMON_SUPPORT @@ -139,6 +145,9 @@ #ifdef CONFIG_QSPI_BOOT #define CONFIG_SYS_TEXT_BASE 0x40010000 +#endif + +#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_SYS_NO_FLASH #endif @@ -165,7 +174,7 @@ /* * IFC Definitions */ -#ifndef CONFIG_QSPI_BOOT +#if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_FSL_IFC #define CONFIG_SYS_FLASH_BASE 0x60000000 #define CONFIG_SYS_FLASH_BASE_PHYS CONFIG_SYS_FLASH_BASE @@ -302,7 +311,7 @@ #define CONFIG_DOS_PARTITION /* SPI */ -#ifdef CONFIG_QSPI_BOOT +#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) /* QSPI */ #define CONFIG_FSL_QSPI #define QSPI0_AMBA_BASE 0x40000000 @@ -408,6 +417,10 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_EDITING +#if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) +#undef CONFIG_CMD_IMLS +#endif + #define CONFIG_ARMV7_NONSEC #define CONFIG_ARMV7_VIRT #define CONFIG_PEN_ADDR_BIG_ENDIAN