[U-Boot] Pull request: u-boot-spi/next
Hi Tom,
Please pull this series.
thanks! Jagan.
The following changes since commit 96d59e9d6aa74e35c63dc74da10e41f8ba0f6de4:
mpc85xx/t2081: enable parsing DDR ratio for T2081 rev1.1 (2015-11-02 08:51:50 -0800)
are available in the git repository at:
git://git.denx.de/u-boot-spi.git next
for you to fetch changes up to e39e68f155b4fcd47f62ab2cf0e199d04f38446d:
sf: Add SPI NOR protection mechanism (2015-11-03 21:51:37 +0530)
---------------------------------------------------------------- Fabio Estevam (16): include: Add log2 header from the kernel include: Add generic bitops headers ARM: bitops: Use the generic bitops headers x86: bitops: Use the generic bitops headers m68k: bitops: Use the generic bitops headers blackfin: bitops: Use the generic bitops headers sh: bitops: Use the generic bitops headers sandbox: Use the generic bitops headers sparc: Use the generic bitops headers openrisc: Use the generic bitops headers nds32: Use the generic bitops headers nios2: Use the generic bitops headers compat: Remove is_power_of_2() definition powerpc: Remove __ilog2_u64 and ffs4 from bitops sf: Add SPI protection mechanism from the kernel sf: Add SPI NOR protection mechanism
arch/arm/include/asm/bitops.h | 5 + arch/arm/mach-mvebu/mbus.c | 2 +- arch/blackfin/include/asm/bitops.h | 4 + arch/m68k/include/asm/bitops.h | 4 + arch/microblaze/include/asm/bitops.h | 4 + arch/nds32/include/asm/bitops.h | 4 + arch/nios2/include/asm/bitops.h | 5 + arch/openrisc/include/asm/bitops.h | 4 + arch/powerpc/cpu/mpc83xx/law.c | 5 +- arch/powerpc/cpu/mpc85xx/tlb.c | 2 + arch/powerpc/cpu/mpc8xxx/law.c | 5 +- arch/powerpc/include/asm/bitops.h | 11 +- arch/powerpc/include/asm/fsl_law.h | 1 + arch/powerpc/include/asm/fsl_srio.h | 2 + arch/sandbox/include/asm/bitops.h | 4 + arch/sh/include/asm/bitops.h | 5 + arch/sparc/include/asm/bitops.h | 5 + arch/x86/include/asm/bitops.h | 21 +++- common/cmd_sf.c | 35 ++++++ drivers/mtd/mtdcore.c | 2 +- drivers/mtd/spi/sf_internal.h | 12 ++ drivers/mtd/spi/sf_ops.c | 180 ++++++++++++++++++++++++++++++ drivers/mtd/spi/sf_probe.c | 13 +++ drivers/mtd/ubi/build.c | 2 +- fs/ubifs/super.c | 2 +- include/asm-generic/bitops/__ffs.h | 43 ++++++++ include/asm-generic/bitops/__fls.h | 43 ++++++++ include/asm-generic/bitops/fls.h | 41 +++++++ include/asm-generic/bitops/fls64.h | 36 ++++++ include/linux/bitops.h | 27 +++++ include/linux/compat.h | 6 - include/linux/log2.h | 205 +++++++++++++++++++++++++++++++++++ include/spi_flash.h | 19 ++++ 33 files changed, 734 insertions(+), 25 deletions(-) create mode 100644 include/asm-generic/bitops/__ffs.h create mode 100644 include/asm-generic/bitops/__fls.h create mode 100644 include/asm-generic/bitops/fls.h create mode 100644 include/asm-generic/bitops/fls64.h create mode 100644 include/linux/log2.h
On Tue, Nov 03, 2015 at 11:39:56PM +0530, Jagan Teki wrote:
Hi Tom,
Please pull this series.
thanks! Jagan.
The following changes since commit 96d59e9d6aa74e35c63dc74da10e41f8ba0f6de4:
mpc85xx/t2081: enable parsing DDR ratio for T2081 rev1.1 (2015-11-02 08:51:50 -0800)
are available in the git repository at:
git://git.denx.de/u-boot-spi.git next
for you to fetch changes up to e39e68f155b4fcd47f62ab2cf0e199d04f38446d:
sf: Add SPI NOR protection mechanism (2015-11-03 21:51:37 +0530)
NAK.
So, this blows up badly for a lot of things when I do: ./tools/buildman/buildman -b master --force-build --step 0 -Cdvel 'blackfin|microblaze|m68k|nds32|x86|aarch64|sandbox|mips|avr32|arm|powerpc|sh4|sparc'
And most of these have a toolchain that buildman can fetch, if you don't have one handy.
Hi Jagan,
On Wed, Nov 4, 2015 at 9:47 AM, Tom Rini trini@konsulko.com wrote:
On Tue, Nov 03, 2015 at 11:39:56PM +0530, Jagan Teki wrote:
Hi Tom,
Please pull this series.
thanks! Jagan.
The following changes since commit 96d59e9d6aa74e35c63dc74da10e41f8ba0f6de4:
mpc85xx/t2081: enable parsing DDR ratio for T2081 rev1.1 (2015-11-02 08:51:50 -0800)
are available in the git repository at:
git://git.denx.de/u-boot-spi.git next
for you to fetch changes up to e39e68f155b4fcd47f62ab2cf0e199d04f38446d:
sf: Add SPI NOR protection mechanism (2015-11-03 21:51:37 +0530)
NAK.
So, this blows up badly for a lot of things when I do: ./tools/buildman/buildman -b master --force-build --step 0 -Cdvel 'blackfin|microblaze|m68k|nds32|x86|aarch64|sandbox|mips|avr32|arm|powerpc|sh4|sparc'
And most of these have a toolchain that buildman can fetch, if you don't have one handy.
I believe you need really use buildman to build the commits. One of the previous review comments to your patch series was regard to the 'bisectability', and buildman can help you with that.
+Simon for buildman if you want some help.
Regards, Bin
On Tue, Nov 3, 2015 at 11:47 PM, Tom Rini trini@konsulko.com wrote:
NAK.
So, this blows up badly for a lot of things when I do: ./tools/buildman/buildman -b master --force-build --step 0 -Cdvel 'blackfin|microblaze|m68k|nds32|x86|aarch64|sandbox|mips|avr32|arm|powerpc|sh4|sparc'
It seems I missed to add bitops for avr32 and mips. Will work on it tomorrow.
In the meantime, if you have the build warnings/errors to share it would be helpful.
Regards,
Fabio Estevam
Hi Tom,
On Wed, Nov 4, 2015 at 1:45 AM, Fabio Estevam festevam@gmail.com wrote:
On Tue, Nov 3, 2015 at 11:47 PM, Tom Rini trini@konsulko.com wrote:
NAK.
So, this blows up badly for a lot of things when I do: ./tools/buildman/buildman -b master --force-build --step 0 -Cdvel 'blackfin|microblaze|m68k|nds32|x86|aarch64|sandbox|mips|avr32|arm|powerpc|sh4|sparc'
It seems I missed to add bitops for avr32 and mips. Will work on it tomorrow.
I don't see issues after applying the three attached patches.
Thanks
On Wed, Nov 4, 2015 at 8:46 AM, Fabio Estevam festevam@gmail.com wrote:
Hi Tom,
On Wed, Nov 4, 2015 at 1:45 AM, Fabio Estevam festevam@gmail.com wrote:
On Tue, Nov 3, 2015 at 11:47 PM, Tom Rini trini@konsulko.com wrote:
NAK.
So, this blows up badly for a lot of things when I do: ./tools/buildman/buildman -b master --force-build --step 0 -Cdvel 'blackfin|microblaze|m68k|nds32|x86|aarch64|sandbox|mips|avr32|arm|powerpc|sh4|sparc'
It seems I missed to add bitops for avr32 and mips. Will work on it tomorrow.
I don't see issues after applying the three attached patches.
Ops, I do see a build issue in blackfin that didn't happen in previous versions. Will work on fixing it.
Hi Jagan,
On Wed, Nov 4, 2015 at 8:47 AM, Fabio Estevam festevam@gmail.com wrote:
On Wed, Nov 4, 2015 at 8:46 AM, Fabio Estevam festevam@gmail.com wrote:
Hi Tom,
On Wed, Nov 4, 2015 at 1:45 AM, Fabio Estevam festevam@gmail.com wrote:
On Tue, Nov 3, 2015 at 11:47 PM, Tom Rini trini@konsulko.com wrote:
NAK.
So, this blows up badly for a lot of things when I do: ./tools/buildman/buildman -b master --force-build --step 0 -Cdvel 'blackfin|microblaze|m68k|nds32|x86|aarch64|sandbox|mips|avr32|arm|powerpc|sh4|sparc'
It seems I missed to add bitops for avr32 and mips. Will work on it tomorrow.
I don't see issues after applying the three attached patches.
Ops, I do see a build issue in blackfin that didn't happen in previous versions. Will work on fixing it.
When you reworked my series you missed to updated these functions:
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 31c79c6..d832464 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -652,7 +652,7 @@ int stm_is_locked(struct spi_flash *flash, u32 ofs, size_t len) * * Returns negative on errors, 0 on success. */ -int stm_lock(struct spi_flash *flash, u32 ofs, u32 len) +int stm_lock(struct spi_flash *flash, u32 ofs, size_t len) { u8 status_old, status_new; u8 mask = SR_BP2 | SR_BP1 | SR_BP0; @@ -703,7 +703,7 @@ int stm_lock(struct spi_flash *flash, u32 ofs, u32 len) * * Returns negative on errors, 0 on success. */ -int stm_unlock(struct spi_flash *flash, u32 ofs, u32 len) +int stm_unlock(struct spi_flash *flash, u32 ofs, size_t len) { uint8_t status_old, status_new; u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
Fabio,
On 4 November 2015 at 16:38, Fabio Estevam festevam@gmail.com wrote:
Hi Jagan,
On Wed, Nov 4, 2015 at 8:47 AM, Fabio Estevam festevam@gmail.com wrote:
On Wed, Nov 4, 2015 at 8:46 AM, Fabio Estevam festevam@gmail.com wrote:
Hi Tom,
On Wed, Nov 4, 2015 at 1:45 AM, Fabio Estevam festevam@gmail.com wrote:
On Tue, Nov 3, 2015 at 11:47 PM, Tom Rini trini@konsulko.com wrote:
NAK.
So, this blows up badly for a lot of things when I do: ./tools/buildman/buildman -b master --force-build --step 0 -Cdvel 'blackfin|microblaze|m68k|nds32|x86|aarch64|sandbox|mips|avr32|arm|powerpc|sh4|sparc'
It seems I missed to add bitops for avr32 and mips. Will work on it tomorrow.
I don't see issues after applying the three attached patches.
Ops, I do see a build issue in blackfin that didn't happen in previous versions. Will work on fixing it.
When you reworked my series you missed to updated these functions:
diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 31c79c6..d832464 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -652,7 +652,7 @@ int stm_is_locked(struct spi_flash *flash, u32 ofs, size_t len)
- Returns negative on errors, 0 on success.
*/ -int stm_lock(struct spi_flash *flash, u32 ofs, u32 len) +int stm_lock(struct spi_flash *flash, u32 ofs, size_t len) { u8 status_old, status_new; u8 mask = SR_BP2 | SR_BP1 | SR_BP0; @@ -703,7 +703,7 @@ int stm_lock(struct spi_flash *flash, u32 ofs, u32 len)
- Returns negative on errors, 0 on success.
*/ -int stm_unlock(struct spi_flash *flash, u32 ofs, u32 len) +int stm_unlock(struct spi_flash *flash, u32 ofs, size_t len)
Updated u32 to size_t as prototype uses the same. Does this break? it look OK?
thanks!
Hi Jagan,
On Wed, Nov 4, 2015 at 9:17 AM, Jagan Teki jteki@openedev.com wrote:
Updated u32 to size_t as prototype uses the same. Does this break? it look OK?
Here is the error I see on Blackfin:
Building bf518f-ezbrd board... /home/fabio/.buildman-toolchains/gcc-4.6.3-nolibc/bfin-uclinux/bin/bfin-uclinux-size: './u-boot': No such file drivers/mtd/spi/sf_ops.c:655:5: error: conflicting types for 'stm_lock' drivers/mtd/spi/sf_ops.c:706:5: error: conflicting types for 'stm_unlock' make[1]: *** [drivers/mtd/spi/sf_ops.o] Error 1 make: *** [drivers/mtd/spi] Error 2 drivers/mtd/spi/sf_ops.c:655:5: error: conflicting types for 'stm_lock' drivers/mtd/spi/sf_internal.h:180:5: note: previous declaration of 'stm_lock' was here drivers/mtd/spi/sf_ops.c:706:5: error: conflicting types for 'stm_unlock' drivers/mtd/spi/sf_internal.h:183:5: note: previous declaration of 'stm_unlock' was here make[1]: *** [drivers/mtd/spi/sf_ops.o] Error 1
By using size_t we fix this conflicting type error.
Regards,
Fabio Estevam
On 4 November 2015 at 16:51, Fabio Estevam festevam@gmail.com wrote:
Hi Jagan,
On Wed, Nov 4, 2015 at 9:17 AM, Jagan Teki jteki@openedev.com wrote:
Updated u32 to size_t as prototype uses the same. Does this break? it look OK?
Here is the error I see on Blackfin:
Building bf518f-ezbrd board... /home/fabio/.buildman-toolchains/gcc-4.6.3-nolibc/bfin-uclinux/bin/bfin-uclinux-size: './u-boot': No such file drivers/mtd/spi/sf_ops.c:655:5: error: conflicting types for 'stm_lock' drivers/mtd/spi/sf_ops.c:706:5: error: conflicting types for 'stm_unlock' make[1]: *** [drivers/mtd/spi/sf_ops.o] Error 1 make: *** [drivers/mtd/spi] Error 2 drivers/mtd/spi/sf_ops.c:655:5: error: conflicting types for 'stm_lock' drivers/mtd/spi/sf_internal.h:180:5: note: previous declaration of 'stm_lock' was here drivers/mtd/spi/sf_ops.c:706:5: error: conflicting types for 'stm_unlock' drivers/mtd/spi/sf_internal.h:183:5: note: previous declaration of 'stm_unlock' was here make[1]: *** [drivers/mtd/spi/sf_ops.o] Error 1
By using size_t we fix this conflicting type error.
Yes true, stm_lock and stm_unlock should use size_t for len - Will update the same.
With these all built fine?
thanks!
On Wed, Nov 4, 2015 at 9:30 AM, Jagan Teki jteki@openedev.com wrote:
Yes true, stm_lock and stm_unlock should use size_t for len - Will update the same.
With these all built fine?
After applying this size_t change plus the three attached bitops patches I sent you for mips, arc. avr32 I do not see any more build issues here.
Also, when you apply the three patches to your tree, please make sure they are applied prior to the "compat: Remove is_power_of_2() definition" so that we keep bisectability.
Thanks,
Fabio Estevam
On Wed, Nov 4, 2015 at 9:35 AM, Fabio Estevam festevam@gmail.com wrote:
After applying this size_t change plus the three attached bitops patches I sent you for mips, arc. avr32 I do not see any more build issues here.
Also, when you apply the three patches to your tree, please make sure they are applied prior to the "compat: Remove is_power_of_2() definition" so that we keep bisectability.
Also, in the v5 I sent I split microblaze and sh changes as you pointed out.
However, you seem to have picked the previous version: http://git.denx.de/?p=u-boot/u-boot-spi.git;a=commit;h=9918a2c36b10675f9f12e...
participants (4)
-
Bin Meng -
Fabio Estevam -
Jagan Teki -
Tom Rini