From patchwork Fri Jun 28 01:55:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Haijun-B42677 X-Patchwork-Id: 255257 X-Patchwork-Delegate: afleming@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 A8CAE2C034E for ; Fri, 28 Jun 2013 11:55:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 909A04A0C0; Fri, 28 Jun 2013 03:55:57 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 qIHMkDiT8BiP; Fri, 28 Jun 2013 03:55:57 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 02C144A0B5; Fri, 28 Jun 2013 03:55:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C498D4A0B5 for ; Fri, 28 Jun 2013 03:55:45 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de 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 46cwSQrKUsGA for ; Fri, 28 Jun 2013 03:55:39 +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 db9outboundpool.messaging.microsoft.com (mail-db9lp0249.outbound.messaging.microsoft.com [213.199.154.249]) by theia.denx.de (Postfix) with ESMTPS id 6FD664A0B3 for ; Fri, 28 Jun 2013 03:55:32 +0200 (CEST) Received: from mail202-db9-R.bigfish.com (10.174.16.252) by DB9EHSOBE023.bigfish.com (10.174.14.86) with Microsoft SMTP Server id 14.1.225.23; Fri, 28 Jun 2013 01:55:30 +0000 Received: from mail202-db9 (localhost [127.0.0.1]) by mail202-db9-R.bigfish.com (Postfix) with ESMTP id 7842F480051 for ; Fri, 28 Jun 2013 01:55:30 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: -6 X-BigFish: VS-6(zzbb2dI98dI9371Ic85fh154dI1443I542Ic85dh1432Ide40hzz1f42h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ah1fc6hzz8275ch8275bhz2dh2a8h668h839h8e2h8e3hd25hf0ah1288h12a5h12bdh137ah1441h1504h1537h153bh15d0h162dh1631h1758h18e1h1946h19b5h1ad9h1b0ah1bceh1d0ch1d2eh1d3fh1dfeh1dffh1e1dhbe9i34h1155h) Received: from mail202-db9 (localhost.localdomain [127.0.0.1]) by mail202-db9 (MessageSwitch) id 1372384528244057_2678; Fri, 28 Jun 2013 01:55:28 +0000 (UTC) Received: from DB9EHSMHS019.bigfish.com (unknown [10.174.16.237]) by mail202-db9.bigfish.com (Postfix) with ESMTP id 38BF3400042 for ; Fri, 28 Jun 2013 01:55:28 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB9EHSMHS019.bigfish.com (10.174.14.29) with Microsoft SMTP Server (TLS) id 14.16.227.3; Fri, 28 Jun 2013 01:55:28 +0000 Received: from 039-SN2MPN1-023.039d.mgd.msft.net ([169.254.3.117]) by 039-SN1MMR1-003.039d.mgd.msft.net ([10.84.1.16]) with mapi id 14.02.0328.011; Fri, 28 Jun 2013 01:55:26 +0000 From: Zhang Haijun-B42677 To: Wood Scott-B07421 Thread-Topic: [U-Boot] [PATCH] p1020rdb-pd: platform support Thread-Index: AQHOc3Jcons+HSJFFEeqeWaRcIJRA5lKWXZg Date: Fri, 28 Jun 2013 01:55:26 +0000 Message-ID: <99E897753B6F7048BD8CCDB4661D02E135C68F@039-SN2MPN1-023.039d.mgd.msft.net> References: <1367129854-31258-1-git-send-email-Haijun.Zhang@freescale.com> <1369175032.1374.20@scott-Lenovo-G560> <99E897753B6F7048BD8CCDB4661D02E135B045@039-SN2MPN1-023.039d.mgd.msft.net> <1372363825.8183.55@snotra> In-Reply-To: <1372363825.8183.55@snotra> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [10.193.20.49] MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% Cc: york-R58495 , "u-boot@lists.denx.de" , Fleming Andy-AFLEMING , sun@theia.denx.de Subject: Re: [U-Boot] [PATCH] p1020rdb-pd: platform support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Regards Haijun. > -----Original Message----- > From: Wood Scott-B07421 > Sent: Friday, June 28, 2013 4:10 AM > To: Zhang Haijun-B42677 > Cc: Wood Scott-B07421; Fleming Andy-AFLEMING; u-boot@lists.denx.de; Huang > Changming-R66093; sun york-R58495 > Subject: Re: [U-Boot] [PATCH] p1020rdb-pd: platform support > > On 06/27/2013 03:58:57 AM, Zhang Haijun-B42677 wrote: > > Hi, Scott > > > > Sorry to reply to so late. > > Pls see my reply below. > > > > > > Regards & Thanks > > Haijun. > > > > > -----Original Message----- > > > From: Wood Scott-B07421 > > > Sent: Wednesday, May 22, 2013 6:24 AM > > > To: Zhang Haijun-B42677 > > > Cc: Fleming Andy-AFLEMING; u-boot@lists.denx.de; Huang > > Changming-R66093; > > > Zhang Haijun-B42677; Zhang Haijun-B42677; sun york-R58495 > > > Subject: Re: [U-Boot] [PATCH] p1020rdb-pd: platform support > > > > > > On 04/28/2013 01:17:34 AM, Haijun.Zhang wrote: > > > > From: "Haijun.Zhang" > > > > > > > > Add platform support for p1020rdb-pd > > > > > > Explain what is different about "-pd" and why this new revision > > requires > > > a separate compile-time target. > > > > > [Haijun Wrote:] We use P1020RDB-PD to instead of P1020RDB-PC board > > later on. > > They are all supported. Nand, DDR, Nor and Spi Flash are different > > between them. > > So I thinks they should be two separate board as P1020UTM and P1020MBG > > do. > > Put this information in the changelog. [Haijun Wrote:] change log you mean? > > > > If it's due to raw DDR config, say so in the changelog. Is there > > any way > > > we could read a revision register to select the proper DDR config at > > > runtime? > > [Haijun Wrote:] Now we read DDR config from SPD fist, if not found > > read from config file. > > Is there any reason why SPD would not be found? [Haijun Wrote:] If someone erase the I2C area(SPD EEPROM) by mistake or change by other possible reason. They will need to read from local config file to make sure uboot can working. > > > > > +#if (defined(CONFIG_P1020RDB) || defined(CONFIG_P1020RDB_PD)) > > > > #if defined(CONFIG_P1020RDB) > > > > #define CONFIG_BOARDNAME "P1020RDB-PC" > > > > +#elif defined(CONFIG_P1020RDB_PD) #define CONFIG_BOARDNAME > > > > +"P1020RDB-PD" > > > > +#endif > > > > > > CONFIG_P1020RDB is not a good name to mean specifically the -PC > > revision. > > > Change it so that CONFIG_P1020RDB is set for all revisions of > > P1020RDB, > > > and introduce CONFIG_P1020RDB-PC for PC-specific things. > > Could you reply to this one? > > ...and of course I meant CONFIG_P1020RDB_PC rather than CONFIG_P1020RDB- > PC. :-) [Haijun Wrote:] Oh, yes I agree. It a little strange to have "-PD", but this patch was aim at add new board p1020rdb-pd board. If need i'll send another patch to change the config name for PC,RDB and PD. I had send another patch(Mean v2 of this patch), pls give some advice. Thanks in advance. > > -Scott From: "Haijun.Zhang" Signed-off-by: Jerry Huang Signed-off-by: Haijun Zhang CC: Scott Wood CC: Sun Yusong-R58495 --- board/freescale/p1_p2_rdb_pc/ddr.c | 2 +- board/freescale/p1_p2_rdb_pc/tlb.c | 2 +- boards.cfg | 4 ++++ include/configs/p1_p2_rdb_pc.h | 48 ++++++++++++++++++++++++++++++++++++-- 4 files changed, 52 insertions(+), 4 deletions(-) -- 1.8.0 diff --git a/board/freescale/p1_p2_rdb_pc/ddr.c b/board/freescale/p1_p2_rdb_pc/ddr.c index 9355536..262fd36 100644 --- a/board/freescale/p1_p2_rdb_pc/ddr.c +++ b/board/freescale/p1_p2_rdb_pc/ddr.c @@ -80,7 +80,7 @@ dimm_params_t ddr_raw_timing = { .refresh_rate_ps = 7800000, .tFAW_ps = 30000, }; -#elif defined(CONFIG_P1020MBG) +#elif (defined(CONFIG_P1020MBG) || defined(CONFIG_P1020RDB_PD)) /* Micron MT41J512M8_187E */ dimm_params_t ddr_raw_timing = { .n_ranks = 2, diff --git a/board/freescale/p1_p2_rdb_pc/tlb.c b/board/freescale/p1_p2_rdb_pc/tlb.c index 3e4dffd..e19002f 100644 --- a/board/freescale/p1_p2_rdb_pc/tlb.c +++ b/board/freescale/p1_p2_rdb_pc/tlb.c @@ -110,7 +110,7 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SW|MAS3_SR, 0, 0, 8, BOOKE_PAGESZ_1G, 1), -#ifdef CONFIG_P1020MBG +#if defined(CONFIG_P1020MBG) || defined(CONFIG_P1020RDB_PD) /* 2G DDR on P1020MBG, map the second 1G */ SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000, CONFIG_SYS_DDR_SDRAM_BASE + 0x40000000, diff --git a/boards.cfg b/boards.cfg index 35f38f3..aefff92 100644 --- a/boards.cfg +++ b/boards.cfg @@ -768,6 +768,10 @@ P1020RDB-PC_SDCARD powerpc mpc85xx p1_p2_rdb_pc freesca P1020RDB-PC_SPIFLASH powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB,SPIFLASH P1020RDB_SDCARD powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P1020RDB,SDCARD P1020RDB_SPIFLASH powerpc mpc85xx p1_p2_rdb freescale - P1_P2_RDB:P1020RDB,SPIFLASH +P1020RDB-PD powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PD +P1020RDB-PD_NAND powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PD,NAND +P1020RDB-PD_SDCARD powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PD,SDCARD +P1020RDB-PD_SPIFLASH powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020RDB_PD,SPIFLASH P1020UTM-PC powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020UTM P1020UTM-PC_36BIT powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020UTM,36BIT P1020UTM-PC_36BIT_SDCARD powerpc mpc85xx p1_p2_rdb_pc freescale - p1_p2_rdb_pc:P1020UTM,36BIT,SDCARD diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 964bfcd..36aad8c 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -66,6 +66,35 @@ #define CONFIG_SYS_L2_SIZE (256 << 10) #endif +/* + * P1020RDB-PD board has user selectable switches for evaluating different + * frequency and boot options for the P1020 device. The table that + * follow describe the available options. The front six binary number was in + * accordance with SW3[1:6]. + * 111101 533 533 267 667 NOR Core0 boot; Core1 hold-off + * 101101 667 667 333 667 NOR Core0 boot; Core1 hold-off + * 011001 800 800 400 667 NOR Core0 boot; Core1 hold-off + * 001001 800 800 400 667 SD/MMC Core0 boot; Core1 hold-off + * 001101 800 800 400 667 SPI Core0 boot; Core1 hold-off + * 010001 800 800 400 667 NAND Core0 boot; Core1 hold-off + * 011101 800 800 400 667 PCIe-2 Core0 boot; Core1 hold-off + */ +#if defined(CONFIG_P1020RDB_PD) +#define CONFIG_BOARDNAME "P1020RDB-PD" +#define CONFIG_NAND_FSL_ELBC +#define CONFIG_P1020 +#define CONFIG_SPI_FLASH +#define CONFIG_VSC7385_ENET +#define CONFIG_SLIC +#define __SW_BOOT_MASK 0x03 +#define __SW_BOOT_NOR 0x64 +#define __SW_BOOT_SPI 0x34 +#define __SW_BOOT_SD 0x24 +#define __SW_BOOT_NAND 0x44 +#define __SW_BOOT_PCIE 0x74 +#define CONFIG_SYS_L2_SIZE (256 << 10) +#endif + #if defined(CONFIG_P1021RDB) #define CONFIG_BOARDNAME "P1021RDB-PC" #define CONFIG_NAND_FSL_ELBC @@ -274,7 +303,7 @@ #define SPD_EEPROM_ADDRESS 0x52 #undef CONFIG_FSL_DDR_INTERACTIVE -#ifdef CONFIG_P1020MBG +#if (defined(CONFIG_P1020MBG) || defined(CONFIG_P1020RDB_PD)) #define CONFIG_SYS_SDRAM_SIZE_LAW LAW_SIZE_2G #define CONFIG_CHIP_SELECTS_PER_CTRL 2 #else @@ -345,7 +374,7 @@ /* * Local Bus Definitions */ -#if defined(CONFIG_P1020MBG) +#if (defined(CONFIG_P1020MBG) || defined(CONFIG_P1020RDB_PD)) #define CONFIG_SYS_MAX_FLASH_SECT 512 /* 64M */ #define CONFIG_SYS_FLASH_BASE 0xec000000 #elif defined(CONFIG_P1020UTM) @@ -396,13 +425,27 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_MTD_NAND_VERIFY_WRITE #define CONFIG_CMD_NAND +#if defined(CONFIG_P1020RDB_PD) +#define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) +#else #define CONFIG_SYS_NAND_BLOCK_SIZE (16 * 1024) +#endif #define CONFIG_SYS_NAND_BR_PRELIM (BR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \ | (2<