| Message ID | 20120326224043.GJ21518@bill-the-cat |
|---|---|
| State | Accepted |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi Tom, Le 27/03/2012 00:40, Tom Rini a écrit : > Hello, > > I've resolved the conflict with the SPL Linux series. > > The following changes since commit cd207cde948ecf9ff50a0fa1ae2650f65579c9c9: > Marek Vasut (1): > IXP: Fix GPIO_INT_ACT_LOW_SET() > > are available in the git repository at: > > git://git.denx.de/u-boot-ti master > > Christian Riesch (1): > calimain, enbw_cmc: Fix typo in comments > > Grazvydas Ignotas (1): > twl4030: fix potential power supply handling issues > > Heiko Schocher (1): > ARM: davinci: fixes for cam_enc_4xx board > > Simon Schwarz (8): > Add cmd_spl command > devkit8000: add config for spl command > omap-common: Add NAND SPL linux booting > devkit8000/spl: init GPMC for dm9000 in SPL > omap-common/spl: Add linux boot to SPL > omap/spl: change output of spl_parse_image_header > devkit8000: Implement and activate direct OS boot > arm: Add Prep subcommand support to bootm > > Stefano Babic (8): > Add cache functions to SPL for armv7 > OMAP3: SPL: do not call I2C init if no I2C is set. > SPL: call cleanup_before_linux() before booting Linux > OMAP3: twister: add support to boot Linux from SPL > NAND: TI: fix warnings in omap_gpmc.c > OMAP3: mt_ventoux: updated timing for FPGA > OMAP3: mt_ventoux: sets its own mtdparts > Davinci: ea20: use gpio framework to access gpios > > Tom Rini (1): > cam_enc_4xx: Rename 'images' to 'imgs' > > jacopo mondi (1): > omap3_spi: receive transmit mode > > arch/arm/cpu/armv7/Makefile | 2 - > arch/arm/cpu/armv7/cpu.c | 2 + > arch/arm/cpu/armv7/omap-common/spl.c | 46 ++++- > arch/arm/cpu/armv7/omap-common/spl_nand.c | 47 ++++- > arch/arm/cpu/armv7/omap3/board.c | 2 + > arch/arm/include/asm/bootm.h | 26 +++ > arch/arm/include/asm/omap_common.h | 2 + > arch/arm/lib/Makefile | 5 +- > arch/arm/lib/bootm.c | 349 +++++++++++++++-------------- > board/ait/cam_enc_4xx/cam_enc_4xx.c | 103 +++++---- > board/ait/cam_enc_4xx/config.mk | 7 + > board/ait/cam_enc_4xx/u-boot-spl.lds | 2 +- > board/davinci/ea20/ea20.c | 38 +--- > board/enbw/enbw_cmc/enbw_cmc.c | 2 +- > board/omicron/calimain/calimain.c | 2 +- > board/technexion/twister/twister.c | 23 ++ > board/teejet/mt_ventoux/mt_ventoux.h | 11 +- > board/timll/devkit8000/devkit8000.c | 37 +++ > common/Makefile | 1 + > common/cmd_spl.c | 188 ++++++++++++++++ > doc/README.commands.spl | 31 +++ > drivers/mtd/nand/omap_gpmc.c | 14 +- > drivers/power/twl4030.c | 18 ++- > drivers/spi/omap3_spi.c | 66 +++++- > drivers/spi/omap3_spi.h | 2 + > include/cmd_spl.h | 31 +++ > include/configs/cam_enc_4xx.h | 13 +- > include/configs/devkit8000.h | 15 +- > include/configs/ea20.h | 2 + > include/configs/mt_ventoux.h | 10 + > include/configs/twister.h | 12 + > include/image.h | 2 + > 32 files changed, 835 insertions(+), 276 deletions(-) > create mode 100644 arch/arm/include/asm/bootm.h > create mode 100644 common/cmd_spl.c > create mode 100644 doc/README.commands.spl > create mode 100644 include/cmd_spl.h Applied to u-boot-arm/master, thanks. Amicalement,
Hello, I've resolved the conflict with the SPL Linux series. The following changes since commit cd207cde948ecf9ff50a0fa1ae2650f65579c9c9: Marek Vasut (1): IXP: Fix GPIO_INT_ACT_LOW_SET() are available in the git repository at: git://git.denx.de/u-boot-ti master Christian Riesch (1): calimain, enbw_cmc: Fix typo in comments Grazvydas Ignotas (1): twl4030: fix potential power supply handling issues Heiko Schocher (1): ARM: davinci: fixes for cam_enc_4xx board Simon Schwarz (8): Add cmd_spl command devkit8000: add config for spl command omap-common: Add NAND SPL linux booting devkit8000/spl: init GPMC for dm9000 in SPL omap-common/spl: Add linux boot to SPL omap/spl: change output of spl_parse_image_header devkit8000: Implement and activate direct OS boot arm: Add Prep subcommand support to bootm Stefano Babic (8): Add cache functions to SPL for armv7 OMAP3: SPL: do not call I2C init if no I2C is set. SPL: call cleanup_before_linux() before booting Linux OMAP3: twister: add support to boot Linux from SPL NAND: TI: fix warnings in omap_gpmc.c OMAP3: mt_ventoux: updated timing for FPGA OMAP3: mt_ventoux: sets its own mtdparts Davinci: ea20: use gpio framework to access gpios Tom Rini (1): cam_enc_4xx: Rename 'images' to 'imgs' jacopo mondi (1): omap3_spi: receive transmit mode arch/arm/cpu/armv7/Makefile | 2 - arch/arm/cpu/armv7/cpu.c | 2 + arch/arm/cpu/armv7/omap-common/spl.c | 46 ++++- arch/arm/cpu/armv7/omap-common/spl_nand.c | 47 ++++- arch/arm/cpu/armv7/omap3/board.c | 2 + arch/arm/include/asm/bootm.h | 26 +++ arch/arm/include/asm/omap_common.h | 2 + arch/arm/lib/Makefile | 5 +- arch/arm/lib/bootm.c | 349 +++++++++++++++-------------- board/ait/cam_enc_4xx/cam_enc_4xx.c | 103 +++++---- board/ait/cam_enc_4xx/config.mk | 7 + board/ait/cam_enc_4xx/u-boot-spl.lds | 2 +- board/davinci/ea20/ea20.c | 38 +--- board/enbw/enbw_cmc/enbw_cmc.c | 2 +- board/omicron/calimain/calimain.c | 2 +- board/technexion/twister/twister.c | 23 ++ board/teejet/mt_ventoux/mt_ventoux.h | 11 +- board/timll/devkit8000/devkit8000.c | 37 +++ common/Makefile | 1 + common/cmd_spl.c | 188 ++++++++++++++++ doc/README.commands.spl | 31 +++ drivers/mtd/nand/omap_gpmc.c | 14 +- drivers/power/twl4030.c | 18 ++- drivers/spi/omap3_spi.c | 66 +++++- drivers/spi/omap3_spi.h | 2 + include/cmd_spl.h | 31 +++ include/configs/cam_enc_4xx.h | 13 +- include/configs/devkit8000.h | 15 +- include/configs/ea20.h | 2 + include/configs/mt_ventoux.h | 10 + include/configs/twister.h | 12 + include/image.h | 2 + 32 files changed, 835 insertions(+), 276 deletions(-) create mode 100644 arch/arm/include/asm/bootm.h create mode 100644 common/cmd_spl.c create mode 100644 doc/README.commands.spl create mode 100644 include/cmd_spl.h