[U-Boot] Pull request: u-boot-blackfin
Hi Tom,
Please pull the following patches from u-boot-blackfin into your tree.
Thanks
Sonic
The following changes since commit fe8e4dbad1d31c452af3fbabba21e72b210381b3:
nds32: Use sections header to obtain link symbols (2013-05-08 12:38:10 +0800)
are available in the git repository at:
git://git.denx.de/u-boot-blackfin.git master
for you to fetch changes up to 2ac75146988bdcf8c30aee9c286af7f2f93b474e:
bfin: Move gpio support for bf54x and bf60x into the generic driver folder. (2013-05-09 10:53:47 +0800)
---------------------------------------------------------------- Bob Liu (3): blackfin: reduce size of u-boot.ldr in bf548-ezkit default config. blackfin: add baudrate to bdinfo blackfin: bf609: add softswitch config command
Marek Vasut (1): blackfin: The buf variable in bfin_mac.c is not used and produces warning,
Mike Frysinger (1): Blackfin: adjust asm constraints with NMI workaround
Scott Jiang (3): bfin: Remove spi dma function in bf5xx. bfin: discard invalid data and clear RXS in bf5xx spi driver bf609: add SPI register base address
Sonic Zhang (14): blackfin: Change the member's type in dma structures. blackfin: limit the max memory dma peripheral transfer size to 4 bytes. blackfin: run core1 from L1 code sram start address in uboot init code on core 0 blackfin: Set correct early debug serial baudrate. blackfin: Correct early serial mess output in BYPASS boot mode. blackfin: bf609: implement soft switch blackfin: Fit u-boot image size into limited nor flash on blackfin. blackfin: Enable early print via the generic serial API. blackfin: Add memory virtual console to blackfin serial driver. blackfin: Uart divisor should be set after their values are generated. blackfin: Move blackfin watchdog driver out of the blackfin arch folder. blackfin: Move blackfin serial driver out of blackfin arch folder. blackfin: Add comments for watchdog event initialization. bfin: Move gpio support for bf54x and bf60x into the generic driver folder.
arch/blackfin/cpu/Makefile | 4 +- arch/blackfin/cpu/cpu.c | 32 +- arch/blackfin/cpu/gpio.c | 145 +------ arch/blackfin/cpu/initcode.c | 71 ++-- arch/blackfin/cpu/start.S | 29 +- arch/blackfin/include/asm/clock.h | 78 ++++ arch/blackfin/include/asm/dma.h | 24 +- arch/blackfin/include/asm/gpio.h | 62 +-- arch/blackfin/include/asm/mach-bf561/BF561_def.h | 2 + arch/blackfin/include/asm/mach-bf609/BF609_def.h | 5 + arch/blackfin/include/asm/portmux.h | 5 - arch/blackfin/{cpu => include/asm}/serial.h | 23 +- arch/blackfin/{cpu => include/asm}/serial1.h | 48 +-- arch/blackfin/{cpu => include/asm}/serial4.h | 27 +- arch/blackfin/include/asm/soft_switch.h | 18 + arch/blackfin/lib/board.c | 6 +- arch/blackfin/lib/clocks.c | 12 +- arch/blackfin/lib/string.c | 9 +- board/bf609-ezkit/soft_switch.c | 171 ++++++++ board/bf609-ezkit/soft_switch.h | 80 ++++ common/Makefile | 1 + common/cmd_softswitch.c | 41 ++ doc/README.watchdog | 3 + drivers/gpio/Makefile | 1 + drivers/gpio/adi_gpio2.c | 440 ++++++++++++++++++++ drivers/net/bfin_mac.c | 2 - drivers/serial/Makefile | 1 + .../cpu/serial.c => drivers/serial/serial_bfin.c | 110 +++-- drivers/spi/bfin_spi.c | 105 +---- drivers/watchdog/Makefile | 1 + .../cpu/watchdog.c => drivers/watchdog/bfin_wdt.c | 7 +- include/configs/bf527-ezkit.h | 12 +- include/configs/bf537-stamp.h | 10 +- include/configs/bf548-ezkit.h | 25 +- include/configs/bf561-ezkit.h | 5 + include/configs/bf609-ezkit.h | 10 + include/configs/bfin_adi_common.h | 14 +- include/watchdog.h | 3 +- 38 files changed, 1163 insertions(+), 479 deletions(-) create mode 100644 arch/blackfin/include/asm/clock.h rename arch/blackfin/{cpu => include/asm}/serial.h (82%) rename arch/blackfin/{cpu => include/asm}/serial1.h (94%) rename arch/blackfin/{cpu => include/asm}/serial4.h (86%) create mode 100644 arch/blackfin/include/asm/soft_switch.h create mode 100644 board/bf609-ezkit/soft_switch.c create mode 100644 board/bf609-ezkit/soft_switch.h create mode 100644 common/cmd_softswitch.c create mode 100644 drivers/gpio/adi_gpio2.c rename arch/blackfin/cpu/serial.c => drivers/serial/serial_bfin.c (79%) rename arch/blackfin/cpu/watchdog.c => drivers/watchdog/bfin_wdt.c (64%)
On Thu, May 09, 2013 at 11:13:52AM +0800, Sonic Zhang wrote:
Hi Tom,
Please pull the following patches from u-boot-blackfin into your tree.
Thanks
Sonic
The following changes since commit fe8e4dbad1d31c452af3fbabba21e72b210381b3:
nds32: Use sections header to obtain link symbols (2013-05-08 12:38:10 +0800)
are available in the git repository at:
git://git.denx.de/u-boot-blackfin.git master
for you to fetch changes up to 2ac75146988bdcf8c30aee9c286af7f2f93b474e:
bfin: Move gpio support for bf54x and bf60x into the generic driver folder. (2013-05-09 10:53:47 +0800)
Bob Liu (3): blackfin: reduce size of u-boot.ldr in bf548-ezkit default config. blackfin: add baudrate to bdinfo blackfin: bf609: add softswitch config command
Marek Vasut (1): blackfin: The buf variable in bfin_mac.c is not used and produces warning,
Mike Frysinger (1): Blackfin: adjust asm constraints with NMI workaround
Scott Jiang (3): bfin: Remove spi dma function in bf5xx. bfin: discard invalid data and clear RXS in bf5xx spi driver bf609: add SPI register base address
Sonic Zhang (14): blackfin: Change the member's type in dma structures. blackfin: limit the max memory dma peripheral transfer size to 4 bytes. blackfin: run core1 from L1 code sram start address in uboot init code on core 0 blackfin: Set correct early debug serial baudrate. blackfin: Correct early serial mess output in BYPASS boot mode. blackfin: bf609: implement soft switch blackfin: Fit u-boot image size into limited nor flash on blackfin. blackfin: Enable early print via the generic serial API. blackfin: Add memory virtual console to blackfin serial driver. blackfin: Uart divisor should be set after their values are generated. blackfin: Move blackfin watchdog driver out of the blackfin arch folder. blackfin: Move blackfin serial driver out of blackfin arch folder. blackfin: Add comments for watchdog event initialization. bfin: Move gpio support for bf54x and bf60x into the generic driver folder.
Some number of these changes haven't been posted to the list for review yet. I'm pretty sure. I don't recall seeing the CONFIG_CMD_SOFTSWITCH stuff go past, and you didn't document that new flag in the top-level README. Also, you did a merge of your patman branch which means there's extra stuff in your commit messages.
Please submit the new patches to the mailing list, and re-submit the pull request with everything else you do have ready. Thanks!
Hi Tom,
On Thu, May 9, 2013 at 8:09 PM, Tom Rini trini@ti.com wrote:
Some number of these changes haven't been posted to the list for review yet. I'm pretty sure. I don't recall seeing the CONFIG_CMD_SOFTSWITCH stuff go past, and you didn't document that new flag in the top-level
I just forward the former softswtich command patch to you which include the definition of CONFIG_CMD_SOFTSWITCH. What else do you think are missing?
README. Also, you did a merge of your patman branch which means there's extra stuff in your commit messages.
Because this command is only implemented for blackfin by now. Should I explan this limitation in the README as well?
Please submit the new patches to the mailing list, and re-submit the pull request with everything else you do have ready. Thanks!
Yes, I just figured out my patman subfolder isn't equal to the upstream master, but I didn't add any stuff except for doing rebase. It looks some upstream patches may be lost during rebase. I will try to redo rebase and re-submit the pull request.
The difference are as following:
diff -urN u-boot-blackfin/tools/patman/patman u-boot.up/tools/patman/patman --- u-boot-blackfin/tools/patman/patman 2013-05-11 23:11:43.158054437 +0800 +++ u-boot.up/tools/patman/patman 2013-05-11 23:00:34.050736519 +0800 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (c) 2011 The Chromium OS Authors. # diff -urN u-boot-blackfin/tools/patman/patman.py u-boot.up/tools/patman/patman.py --- u-boot-blackfin/tools/patman/patman.py 2013-05-11 23:11:43.158054437 +0800 +++ u-boot.up/tools/patman/patman.py 2013-05-11 23:00:34.050736519 +0800 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # # Copyright (c) 2011 The Chromium OS Authors. # diff -urN u-boot-blackfin/tools/patman/series.py u-boot.up/tools/patman/series.py --- u-boot-blackfin/tools/patman/series.py 2013-05-11 23:11:43.158054437 +0800 +++ u-boot.up/tools/patman/series.py 2013-05-11 23:00:34.050736519 +0800 @@ -40,6 +40,7 @@ notes: List of lines in the notes changes: (dict) List of changes for each version, The key is the integer version number + allow_overwrite: Allow tags to overwrite an existing tag """ def __init__(self): self.cc = [] @@ -49,6 +50,7 @@ self.cover = None self.notes = [] self.changes = {} + self.allow_overwrite = False
# Written in MakeCcFile() # key: name of patch file @@ -72,7 +74,7 @@ """ # If we already have it, then add to our list name = name.replace('-', '_') - if name in self: + if name in self and not self.allow_overwrite: values = value.split(',') values = [str.strip() for str in values] if type(self[name]) != type([]):
Regards,
Sonic
On Sat, May 11, 2013 at 11:27:41PM +0800, Sonic Zhang wrote:
Hi Tom,
On Thu, May 9, 2013 at 8:09 PM, Tom Rini trini@ti.com wrote:
Some number of these changes haven't been posted to the list for review yet. I'm pretty sure. I don't recall seeing the CONFIG_CMD_SOFTSWITCH stuff go past, and you didn't document that new flag in the top-level
I just forward the former softswtich command patch to you which include the definition of CONFIG_CMD_SOFTSWITCH. What else do you think are missing?
Well, please go over everything else and make sure it's showing up in patchwork. I spotted one trivially so I don't know how many others might have been missed.
README. Also, you did a merge of your patman branch which means there's extra stuff in your commit messages.
Because this command is only implemented for blackfin by now. Should I explan this limitation in the README as well?
Yes.
Please submit the new patches to the mailing list, and re-submit the pull request with everything else you do have ready. Thanks!
Yes, I just figured out my patman subfolder isn't equal to the upstream master, but I didn't add any stuff except for doing rebase. It looks some upstream patches may be lost during rebase. I will try to redo rebase and re-submit the pull request.
Thanks!
Hi Tom,
On Sun, May 12, 2013 at 12:20 AM, Tom Rini trini@ti.com wrote:
On Sat, May 11, 2013 at 11:27:41PM +0800, Sonic Zhang wrote:
Hi Tom,
On Thu, May 9, 2013 at 8:09 PM, Tom Rini trini@ti.com wrote:
Some number of these changes haven't been posted to the list for review yet. I'm pretty sure. I don't recall seeing the CONFIG_CMD_SOFTSWITCH stuff go past, and you didn't document that new flag in the top-level
I just forward the former softswtich command patch to you which include the definition of CONFIG_CMD_SOFTSWITCH. What else do you think are missing?
Well, please go over everything else and make sure it's showing up in patchwork. I spotted one trivially so I don't know how many others might have been missed.
Yes, you are right. I forgot to send out 3 patches in the middle.
blackfin: Enable early print via the generic serial API. blackfin: Add memory virtual console to blackfin serial driver. blackfin: Uart divisor should be set after their values are generated.
I will send out soon.
Thanks,
Sonic
participants (2)
-
Sonic Zhang -
Tom Rini