Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions property
On Mon, 2013-09-30 at 03:31 -0500, Hu Mingkai-B21284 wrote: > > > -Original Message- > > From: Wood Scott-B07421 > > Sent: Wednesday, September 25, 2013 3:37 AM > > To: Hu Mingkai-B21284 > > Cc: Wood Scott-B07421; linuxppc-...@ozlabs.org > > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions > > property > > > > Fixing U-Boot would make the problem go away without any issues with > > partition compatibility. Are you sure nobody's using these SPI > > partitions without booting from SPI? Even if nobody's using this, it > > seems a wasteful solution. These are pretty small flashes. > > > Scott, > > I will submit a patch in U-Boot to fix this issue. Some quick questions: > 1. Should we set the SPI flash as MTDPARTS_DEFAULT? > 2. Should we consider the partition for NAND/NOR in mtdparts? > 3. We need to remove the partition table in device tree, right? Fixing the U-Boot size problem is separate from changing how we do partitioning, but yes, we should transition all flashes to using mtdparts instead of device tree partitions. As to when to remove them from the device tree, that's a bit tricky. There's no guarantee when a user updates their U-Boot environment relative to when they update their device tree. It's better to have the partitions appear twice than to not appear at all. But we do want to discourage the use of the device tree partitions, and it would be bad if the descriptions don't match and a user ends up mixing the two. -Scott ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
RE: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions property
> -Original Message- > From: Wood Scott-B07421 > Sent: Wednesday, September 25, 2013 3:37 AM > To: Hu Mingkai-B21284 > Cc: Wood Scott-B07421; linuxppc-...@ozlabs.org > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions > property > > On Tue, 2013-09-24 at 05:27 -0500, Hu Mingkai-B21284 wrote: > > > > > -Original Message- > > > From: Wood Scott-B07421 > > > Sent: Tuesday, September 24, 2013 7:03 AM > > > To: Hu Mingkai-B21284 > > > Cc: Wood Scott-B07421; linuxppc-...@ozlabs.org > > > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI > > > partitions property > > > > > > On Tue, 2013-09-17 at 06:06 -0500, Hu Mingkai-B21284 wrote: > > > > Scott, > > > > Sorry for the delayed response. > > > > Please fine my comments. > > > > Thanks, > > > > Mingkai > > > > > > > > > -Original Message- > > > > > From: Wood Scott-B07421 > > > > > Sent: Thursday, September 12, 2013 9:16 AM > > > > > To: Hu Mingkai-B21284 > > > > > Cc: Wood Scott-B07421; linuxppc-...@ozlabs.org > > > > > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI > > > > > partitions property > > > > > > > > > > On Tue, 2013-09-10 at 21:07 -0500, Hu Mingkai-B21284 wrote: > > > > > > > > > > > > > -Original Message- > > > > > > > From: Wood Scott-B07421 > > > > > > > Sent: Wednesday, September 11, 2013 7:33 AM > > > > > > > To: Hu Mingkai-B21284 > > > > > > > Cc: linuxppc-...@ozlabs.org > > > > > > > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI > > > > > > > partitions property > > > > > > > > > > > > > > What happens to exsting users whose flash is laid out the > > > > > > > existing way, when they upgrade to these device trees? > > > > > > > > > > > > > > > > > > > The SPI flash layout should be mapping the new device tree. > > > > > > > > > > > > If the existing device tree is used to deploy the SPI flash, > > > > > > the following issues must be run into as the commit message > described: > > > > > > > > > > > > 1. Kernel images would be overlapped with U-Boot image. > > > > > > 2. Kernel images would be overlapped with FMAN ucode. > > > > > > 3. Saving environment variables will crash the kernel image. > > > > > > > > > > Has the SPI U-Boot image always been larger than 512K for all > > > > > these platforms? Why, given that we're under 512K for other boot > modes? > > > > > > > > > > > > > For DPAA platform, the ld script used to link the u-boot image is > > > > "./arch/powerpc/cpu/mpc85xx/u-boot.lds" which will generate the > > > > 512K u-boot Image. This image will be split into 64bytes and > > > > appended PBL command for Each 64bytes pieces, so the size of final > > > > image must be > > > greater than 512K. > > > > > > What is the entry point in SRAM when you load from PBL? If it is > > > (or can be made to be) the beginning of the image rather than the > > > end, then turn off the resetvec and the fixed image size that results. > > > > > > > 1. Thus a special ld script need to be provided. > > This is already supported. See CONFIG_SYS_MPC85XX_NO_RESETVEC. > > > 2. Now the spi image size is about 540KB, that's to say the PBL needs > about ~30K > >for PBL commands. It's hard to save such a big space even we turn > off the > >resetvec. > > Turning off the resetvec doesn't just eliminate the resetvec code; it > eliminates the padding to 512K (or if it doesn't, that's a bug to be > fixed). > > > > > > > > We really should not be putting partition layout info in the > > > > > > > device tree to begin with... > > > > > > > > > > > > > OK, I will remove the layout diagram in the commit message. > > > > > > > > > > That's not what I meant. I meant that the dts should be > > > > > describing hardware, and this is the sort of trouble we run into > > > > > when we deviate from that. A better wa
Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions property
On Tue, 2013-09-24 at 05:27 -0500, Hu Mingkai-B21284 wrote: > > > -Original Message- > > From: Wood Scott-B07421 > > Sent: Tuesday, September 24, 2013 7:03 AM > > To: Hu Mingkai-B21284 > > Cc: Wood Scott-B07421; linuxppc-...@ozlabs.org > > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions > > property > > > > On Tue, 2013-09-17 at 06:06 -0500, Hu Mingkai-B21284 wrote: > > > Scott, > > > Sorry for the delayed response. > > > Please fine my comments. > > > Thanks, > > > Mingkai > > > > > > > -Original Message- > > > > From: Wood Scott-B07421 > > > > Sent: Thursday, September 12, 2013 9:16 AM > > > > To: Hu Mingkai-B21284 > > > > Cc: Wood Scott-B07421; linuxppc-...@ozlabs.org > > > > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI > > > > partitions property > > > > > > > > On Tue, 2013-09-10 at 21:07 -0500, Hu Mingkai-B21284 wrote: > > > > > > > > > > > -Original Message- > > > > > > From: Wood Scott-B07421 > > > > > > Sent: Wednesday, September 11, 2013 7:33 AM > > > > > > To: Hu Mingkai-B21284 > > > > > > Cc: linuxppc-...@ozlabs.org > > > > > > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI > > > > > > partitions property > > > > > > > > > > > > What happens to exsting users whose flash is laid out the > > > > > > existing way, when they upgrade to these device trees? > > > > > > > > > > > > > > > > The SPI flash layout should be mapping the new device tree. > > > > > > > > > > If the existing device tree is used to deploy the SPI flash, the > > > > > following issues must be run into as the commit message described: > > > > > > > > > > 1. Kernel images would be overlapped with U-Boot image. > > > > > 2. Kernel images would be overlapped with FMAN ucode. > > > > > 3. Saving environment variables will crash the kernel image. > > > > > > > > Has the SPI U-Boot image always been larger than 512K for all these > > > > platforms? Why, given that we're under 512K for other boot modes? > > > > > > > > > > For DPAA platform, the ld script used to link the u-boot image is > > > "./arch/powerpc/cpu/mpc85xx/u-boot.lds" which will generate the 512K > > > u-boot Image. This image will be split into 64bytes and appended PBL > > > command for Each 64bytes pieces, so the size of final image must be > > greater than 512K. > > > > What is the entry point in SRAM when you load from PBL? If it is (or can > > be made to be) the beginning of the image rather than the end, then turn > > off the resetvec and the fixed image size that results. > > > > 1. Thus a special ld script need to be provided. This is already supported. See CONFIG_SYS_MPC85XX_NO_RESETVEC. > 2. Now the spi image size is about 540KB, that's to say the PBL needs about > ~30K >for PBL commands. It's hard to save such a big space even we turn off the >resetvec. Turning off the resetvec doesn't just eliminate the resetvec code; it eliminates the padding to 512K (or if it doesn't, that's a bug to be fixed). > > > > > > We really should not be putting partition layout info in the > > > > > > device tree to begin with... > > > > > > > > > > > OK, I will remove the layout diagram in the commit message. > > > > > > > > That's not what I meant. I meant that the dts should be describing > > > > hardware, and this is the sort of trouble we run into when we > > > > deviate from that. A better way would be to use the mtdparts command > > line option. > > > > Even better would be some sort of on-flash partition table. > > > > > > > > > > You're right, but maybe some customer has already used the device tree > > partition table... > > > > My main point was to encourage us to shift away from this rather than to > > rip it out right this instant. > > > > Yes, that's the correct way we should go. > Would you please pick up this patch first to resolve current issue we faced? > And we can consider to use the mtdparts or on-flash partition table for long > term. Fixing U-Boot would make the problem go away without any issues with partition compatibility. Are you sure nobody's using these SPI partitions without booting from SPI? Even if nobody's using this, it seems a wasteful solution. These are pretty small flashes. -Scott ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
RE: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions property
> -Original Message- > From: Wood Scott-B07421 > Sent: Tuesday, September 24, 2013 7:03 AM > To: Hu Mingkai-B21284 > Cc: Wood Scott-B07421; linuxppc-...@ozlabs.org > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions > property > > On Tue, 2013-09-17 at 06:06 -0500, Hu Mingkai-B21284 wrote: > > Scott, > > Sorry for the delayed response. > > Please fine my comments. > > Thanks, > > Mingkai > > > > > -Original Message- > > > From: Wood Scott-B07421 > > > Sent: Thursday, September 12, 2013 9:16 AM > > > To: Hu Mingkai-B21284 > > > Cc: Wood Scott-B07421; linuxppc-...@ozlabs.org > > > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI > > > partitions property > > > > > > On Tue, 2013-09-10 at 21:07 -0500, Hu Mingkai-B21284 wrote: > > > > > > > > > -Original Message- > > > > > From: Wood Scott-B07421 > > > > > Sent: Wednesday, September 11, 2013 7:33 AM > > > > > To: Hu Mingkai-B21284 > > > > > Cc: linuxppc-...@ozlabs.org > > > > > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI > > > > > partitions property > > > > > > > > > > What happens to exsting users whose flash is laid out the > > > > > existing way, when they upgrade to these device trees? > > > > > > > > > > > > > The SPI flash layout should be mapping the new device tree. > > > > > > > > If the existing device tree is used to deploy the SPI flash, the > > > > following issues must be run into as the commit message described: > > > > > > > > 1. Kernel images would be overlapped with U-Boot image. > > > > 2. Kernel images would be overlapped with FMAN ucode. > > > > 3. Saving environment variables will crash the kernel image. > > > > > > Has the SPI U-Boot image always been larger than 512K for all these > > > platforms? Why, given that we're under 512K for other boot modes? > > > > > > > For DPAA platform, the ld script used to link the u-boot image is > > "./arch/powerpc/cpu/mpc85xx/u-boot.lds" which will generate the 512K > > u-boot Image. This image will be split into 64bytes and appended PBL > > command for Each 64bytes pieces, so the size of final image must be > greater than 512K. > > What is the entry point in SRAM when you load from PBL? If it is (or can > be made to be) the beginning of the image rather than the end, then turn > off the resetvec and the fixed image size that results. > 1. Thus a special ld script need to be provided. 2. Now the spi image size is about 540KB, that's to say the PBL needs about ~30K for PBL commands. It's hard to save such a big space even we turn off the resetvec. > > > > > We really should not be putting partition layout info in the > > > > > device tree to begin with... > > > > > > > > > OK, I will remove the layout diagram in the commit message. > > > > > > That's not what I meant. I meant that the dts should be describing > > > hardware, and this is the sort of trouble we run into when we > > > deviate from that. A better way would be to use the mtdparts command > line option. > > > Even better would be some sort of on-flash partition table. > > > > > > > You're right, but maybe some customer has already used the device tree > partition table... > > My main point was to encourage us to shift away from this rather than to > rip it out right this instant. > Yes, that's the correct way we should go. Would you please pick up this patch first to resolve current issue we faced? And we can consider to use the mtdparts or on-flash partition table for long term. Thanks, Mingkai ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions property
On Tue, 2013-09-17 at 06:06 -0500, Hu Mingkai-B21284 wrote: > Scott, > Sorry for the delayed response. > Please fine my comments. > Thanks, > Mingkai > > > -Original Message- > > From: Wood Scott-B07421 > > Sent: Thursday, September 12, 2013 9:16 AM > > To: Hu Mingkai-B21284 > > Cc: Wood Scott-B07421; linuxppc-...@ozlabs.org > > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions > > property > > > > On Tue, 2013-09-10 at 21:07 -0500, Hu Mingkai-B21284 wrote: > > > > > > > -Original Message- > > > > From: Wood Scott-B07421 > > > > Sent: Wednesday, September 11, 2013 7:33 AM > > > > To: Hu Mingkai-B21284 > > > > Cc: linuxppc-...@ozlabs.org > > > > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI > > > > partitions property > > > > > > > > What happens to exsting users whose flash is laid out the existing > > > > way, when they upgrade to these device trees? > > > > > > > > > > The SPI flash layout should be mapping the new device tree. > > > > > > If the existing device tree is used to deploy the SPI flash, the > > > following issues must be run into as the commit message described: > > > > > > 1. Kernel images would be overlapped with U-Boot image. > > > 2. Kernel images would be overlapped with FMAN ucode. > > > 3. Saving environment variables will crash the kernel image. > > > > Has the SPI U-Boot image always been larger than 512K for all these > > platforms? Why, given that we're under 512K for other boot modes? > > > > For DPAA platform, the ld script used to link the u-boot image is > "./arch/powerpc/cpu/mpc85xx/u-boot.lds" which will generate the 512K u-boot > Image. This image will be split into 64bytes and appended PBL command for > Each 64bytes pieces, so the size of final image must be greater than 512K. What is the entry point in SRAM when you load from PBL? If it is (or can be made to be) the beginning of the image rather than the end, then turn off the resetvec and the fixed image size that results. > > > > We really should not be putting partition layout info in the device > > > > tree to begin with... > > > > > > > OK, I will remove the layout diagram in the commit message. > > > > That's not what I meant. I meant that the dts should be describing > > hardware, and this is the sort of trouble we run into when we deviate > > from that. A better way would be to use the mtdparts command line option. > > Even better would be some sort of on-flash partition table. > > > > You're right, but maybe some customer has already used the device tree > partition table... My main point was to encourage us to shift away from this rather than to rip it out right this instant. -Scott ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
RE: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions property
Scott, Sorry for the delayed response. Please fine my comments. Thanks, Mingkai > -Original Message- > From: Wood Scott-B07421 > Sent: Thursday, September 12, 2013 9:16 AM > To: Hu Mingkai-B21284 > Cc: Wood Scott-B07421; linuxppc-...@ozlabs.org > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions > property > > On Tue, 2013-09-10 at 21:07 -0500, Hu Mingkai-B21284 wrote: > > > > > -Original Message- > > > From: Wood Scott-B07421 > > > Sent: Wednesday, September 11, 2013 7:33 AM > > > To: Hu Mingkai-B21284 > > > Cc: linuxppc-...@ozlabs.org > > > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI > > > partitions property > > > > > > What happens to exsting users whose flash is laid out the existing > > > way, when they upgrade to these device trees? > > > > > > > The SPI flash layout should be mapping the new device tree. > > > > If the existing device tree is used to deploy the SPI flash, the > > following issues must be run into as the commit message described: > > > > 1. Kernel images would be overlapped with U-Boot image. > > 2. Kernel images would be overlapped with FMAN ucode. > > 3. Saving environment variables will crash the kernel image. > > Has the SPI U-Boot image always been larger than 512K for all these > platforms? Why, given that we're under 512K for other boot modes? > For DPAA platform, the ld script used to link the u-boot image is "./arch/powerpc/cpu/mpc85xx/u-boot.lds" which will generate the 512K u-boot Image. This image will be split into 64bytes and appended PBL command for Each 64bytes pieces, so the size of final image must be greater than 512K. The same applies to the non-DPAA platform which doesn't support TPL. For non-DPAA platform which support TPL, the image size is also greater than 512K. > > > We really should not be putting partition layout info in the device > > > tree to begin with... > > > > > OK, I will remove the layout diagram in the commit message. > > That's not what I meant. I meant that the dts should be describing > hardware, and this is the sort of trouble we run into when we deviate > from that. A better way would be to use the mtdparts command line option. > Even better would be some sort of on-flash partition table. > You're right, but maybe some customer has already used the device tree partition table... Thanks, Mingkai ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions property
On Tue, 2013-09-10 at 21:07 -0500, Hu Mingkai-B21284 wrote: > > > -Original Message- > > From: Wood Scott-B07421 > > Sent: Wednesday, September 11, 2013 7:33 AM > > To: Hu Mingkai-B21284 > > Cc: linuxppc-...@ozlabs.org > > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions > > property > > > > What happens to exsting users whose flash is laid out the existing way, > > when they upgrade to these device trees? > > > > The SPI flash layout should be mapping the new device tree. > > If the existing device tree is used to deploy the SPI flash, the following > issues > must be run into as the commit message described: > > 1. Kernel images would be overlapped with U-Boot image. > 2. Kernel images would be overlapped with FMAN ucode. > 3. Saving environment variables will crash the kernel image. Has the SPI U-Boot image always been larger than 512K for all these platforms? Why, given that we're under 512K for other boot modes? > > We really should not be putting partition layout info in the device tree > > to begin with... > > > OK, I will remove the layout diagram in the commit message. That's not what I meant. I meant that the dts should be describing hardware, and this is the sort of trouble we run into when we deviate from that. A better way would be to use the mtdparts command line option. Even better would be some sort of on-flash partition table. -Scott ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
RE: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions property
> -Original Message- > From: Wood Scott-B07421 > Sent: Wednesday, September 11, 2013 7:33 AM > To: Hu Mingkai-B21284 > Cc: linuxppc-...@ozlabs.org > Subject: Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions > property > > On Fri, 2013-09-06 at 16:05 +0800, Mingkai Hu wrote: > > Re-organize the SPI partitions and use the same SPI flash memory map > > for most of the platforms which have 16MB SPI flash mounted. > [snip] > > Based on 'next' branch on git tree: > > git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git > > > > arch/powerpc/boot/dts/bsc9131rdb.dtsi | 35 -- > --- > > arch/powerpc/boot/dts/c293pcie.dts | 35 -- > --- > > arch/powerpc/boot/dts/mpc8536ds.dtsi | 12 +- > > arch/powerpc/boot/dts/p1010rdb.dtsi| 40 -- > > > arch/powerpc/boot/dts/p1020rdb-pc.dtsi | 24 +--- > > arch/powerpc/boot/dts/p1020rdb-pd.dts | 34 --- > -- > > arch/powerpc/boot/dts/p1020rdb.dtsi| 23 --- > > arch/powerpc/boot/dts/p1021mds.dts | 17 +++ > > arch/powerpc/boot/dts/p1021rdb-pc.dtsi | 32 +- > - > > arch/powerpc/boot/dts/p1022ds.dtsi | 21 +- > > arch/powerpc/boot/dts/p1023rds.dts | 10 ++--- > > arch/powerpc/boot/dts/p1024rdb.dtsi| 40 -- > > > arch/powerpc/boot/dts/p1025rdb.dtsi| 23 +-- > > arch/powerpc/boot/dts/p2020rdb-pc.dtsi | 40 -- > > > arch/powerpc/boot/dts/p2020rdb.dts | 38 ++ > -- > > arch/powerpc/boot/dts/p2041rdb.dts | 12 +- > > arch/powerpc/boot/dts/p3041ds.dts | 12 +- > > arch/powerpc/boot/dts/p4080ds.dts | 12 +- > > arch/powerpc/boot/dts/p5020ds.dts | 12 +- > > arch/powerpc/boot/dts/p5040ds.dts | 13 ++- > > What happens to exsting users whose flash is laid out the existing way, > when they upgrade to these device trees? > The SPI flash layout should be mapping the new device tree. If the existing device tree is used to deploy the SPI flash, the following issues must be run into as the commit message described: 1. Kernel images would be overlapped with U-Boot image. 2. Kernel images would be overlapped with FMAN ucode. 3. Saving environment variables will crash the kernel image. > We really should not be putting partition layout info in the device tree > to begin with... > OK, I will remove the layout diagram in the commit message. Thanks, Mingkai ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH] powerpc/85xx: DTS - re-organize the SPI partitions property
On Fri, 2013-09-06 at 16:05 +0800, Mingkai Hu wrote: > Re-organize the SPI partitions and use the same SPI flash memory > map for most of the platforms which have 16MB SPI flash mounted. [snip] > Based on 'next' branch on git tree: > git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git > > arch/powerpc/boot/dts/bsc9131rdb.dtsi | 35 - > arch/powerpc/boot/dts/c293pcie.dts | 35 - > arch/powerpc/boot/dts/mpc8536ds.dtsi | 12 +- > arch/powerpc/boot/dts/p1010rdb.dtsi| 40 > -- > arch/powerpc/boot/dts/p1020rdb-pc.dtsi | 24 +--- > arch/powerpc/boot/dts/p1020rdb-pd.dts | 34 - > arch/powerpc/boot/dts/p1020rdb.dtsi| 23 --- > arch/powerpc/boot/dts/p1021mds.dts | 17 +++ > arch/powerpc/boot/dts/p1021rdb-pc.dtsi | 32 +-- > arch/powerpc/boot/dts/p1022ds.dtsi | 21 +- > arch/powerpc/boot/dts/p1023rds.dts | 10 ++--- > arch/powerpc/boot/dts/p1024rdb.dtsi| 40 > -- > arch/powerpc/boot/dts/p1025rdb.dtsi| 23 +-- > arch/powerpc/boot/dts/p2020rdb-pc.dtsi | 40 > -- > arch/powerpc/boot/dts/p2020rdb.dts | 38 ++-- > arch/powerpc/boot/dts/p2041rdb.dts | 12 +- > arch/powerpc/boot/dts/p3041ds.dts | 12 +- > arch/powerpc/boot/dts/p4080ds.dts | 12 +- > arch/powerpc/boot/dts/p5020ds.dts | 12 +- > arch/powerpc/boot/dts/p5040ds.dts | 13 ++- What happens to exsting users whose flash is laid out the existing way, when they upgrade to these device trees? We really should not be putting partition layout info in the device tree to begin with... -Scott ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH] powerpc/85xx: DTS - re-organize the SPI partitions property
Re-organize the SPI partitions and use the same SPI flash memory
map for most of the platforms which have 16MB SPI flash mounted.
1. Extend the U-Boot partition to 1MB
The image for booting from SPI is larger than 512KB, while
the size of U-Boot partition is 512KB on some boards, so
enlarge it to 1MB in order to contain the whole U-Boot image.
2. Reserve space for U-Boot environment variables
The environment variables are stored at offset 0x10, so
if other image was put at this address, it'll be overlapped
when saving the environment variables.
3. Reserve space for FMAN ucode
The FMAN ucode is required on DPAA platform and is stored at
offset 0x11, this address should not be used to store any
other images.
4. Extend the kernel partition to 5MB
Here is diagram for the SPI flash memory map:
0x00 |-|
| U-Boot |
| (1MB) |
0x10 |-|
| Env(64KB) |
0x11 |-|
| ucode |
0x18 |-|
| DTB |
| (512KB) |
0x20 |-|
| kernel |
| (5MB) |
0x70 |-|
| file system |
| (9MB) |
0x100 |-|
Signed-off-by: Mingkai Hu
---
Based on 'next' branch on git tree:
git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
arch/powerpc/boot/dts/bsc9131rdb.dtsi | 35 -
arch/powerpc/boot/dts/c293pcie.dts | 35 -
arch/powerpc/boot/dts/mpc8536ds.dtsi | 12 +-
arch/powerpc/boot/dts/p1010rdb.dtsi| 40 --
arch/powerpc/boot/dts/p1020rdb-pc.dtsi | 24 +---
arch/powerpc/boot/dts/p1020rdb-pd.dts | 34 -
arch/powerpc/boot/dts/p1020rdb.dtsi| 23 ---
arch/powerpc/boot/dts/p1021mds.dts | 17 +++
arch/powerpc/boot/dts/p1021rdb-pc.dtsi | 32 +--
arch/powerpc/boot/dts/p1022ds.dtsi | 21 +-
arch/powerpc/boot/dts/p1023rds.dts | 10 ++---
arch/powerpc/boot/dts/p1024rdb.dtsi| 40 --
arch/powerpc/boot/dts/p1025rdb.dtsi| 23 +--
arch/powerpc/boot/dts/p2020rdb-pc.dtsi | 40 --
arch/powerpc/boot/dts/p2020rdb.dts | 38 ++--
arch/powerpc/boot/dts/p2041rdb.dts | 12 +-
arch/powerpc/boot/dts/p3041ds.dts | 12 +-
arch/powerpc/boot/dts/p4080ds.dts | 12 +-
arch/powerpc/boot/dts/p5020ds.dts | 12 +-
arch/powerpc/boot/dts/p5040ds.dts | 13 ++-
20 files changed, 180 insertions(+), 305 deletions(-)
diff --git a/arch/powerpc/boot/dts/bsc9131rdb.dtsi
b/arch/powerpc/boot/dts/bsc9131rdb.dtsi
index 9e6c013..8250593 100644
--- a/arch/powerpc/boot/dts/bsc9131rdb.dtsi
+++ b/arch/powerpc/boot/dts/bsc9131rdb.dtsi
@@ -81,32 +81,25 @@
compatible = "spansion,s25sl12801";
reg = <0>;
spi-max-frequency = <5000>;
-
- /* 512KB for u-boot Bootloader Image */
- partition@0 {
- reg = <0x0 0x0008>;
- label = "SPI Flash U-Boot Image";
+ partition@u-boot {
+ label = "u-boot";
+ reg = <0x 0x0010>;
read-only;
};
-
- /* 512KB for DTB Image */
- partition@8 {
- reg = <0x0008 0x0008>;
- label = "SPI Flash DTB Image";
+ partition@dtb {
+ label = "dtb";
+ reg = <0x0018 0x0008>;
+ read-only;
};
-
- /* 4MB for Linux Kernel Image */
- partition@10 {
- reg = <0x0010 0x0040>;
- label = "SPI Flash Kernel Image";
+ partition@kernel {
+ label = "kernel";
+ reg = <0x0020 0x0050>;
+ read-only;
};
-
- /*11MB for RFS Image */
- partition@50 {
- reg = <0x0050 0x00B0>;
- label = "SPI Flash RFS Image";
+ partition@fs {
+ label = "file system";
+ r
