| Message ID | 20130311182544.GG27930@bill-the-cat |
|---|---|
| State | Accepted |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi Tom, On 03/11/2013 08:25 PM, Tom Rini wrote: > Hello, > > The following changes since commit fc959081d41aab2d6f4614c5fb3dd1b77ffcdcf4: > > x86: Enable CONFIG_OF_CONTROL on coreboot (2013-03-04 15:57:52 -0800) > > are available in the git repository at: > > git://git.denx.de/u-boot-ti.git master > > for you to fetch changes up to 76b40ab41eff1f402ee52ba768b09daad293b9bb: > > Merge u-boot/master into u-boot-ti/master (2013-03-11 12:16:13 -0400) > > ---------------------------------------------------------------- > [...] > > Nikita Kiryanov (14): > omap: consolidate common mmc definitions > omap_hsmmc: fix out of bounds array access > omap_hsmmc: introduce omap_hsmmc_data struct > omap_hsmmc: implement driver check for card detection > cm-t35: implement board specific card detect check > mmc: add support for write protection > omap_hsmmc: add driver check for write protection > omap3: add useful dss defines > omap3: allow dynamic selection of gfx_format > lcd: add option for board specific splash screen preparation > cm-t35: add support for dvi displays > cm-t35: add support for user defined lcd parameters > lcd: implement a callback for splashimage > cm_t35: prevent splashimage from being set to a bad value > I noticed that the patch "cm-t35: add support for loading splash image from NAND" is missing from the above. As I mentioned here http://lists.denx.de/pipermail/u-boot/2013-February/146361.html V1 is still part of the CM-T35 splash screen and should be included with the rest of the patchset.
Hi Nikita, On Tue, 12 Mar 2013 09:03:24 +0200, Nikita Kiryanov <nikita@compulab.co.il> wrote: > Hi Tom, > > On 03/11/2013 08:25 PM, Tom Rini wrote: > > Hello, > > > > The following changes since commit fc959081d41aab2d6f4614c5fb3dd1b77ffcdcf4: > > > > x86: Enable CONFIG_OF_CONTROL on coreboot (2013-03-04 15:57:52 -0800) > > > > are available in the git repository at: > > > > git://git.denx.de/u-boot-ti.git master > > > > for you to fetch changes up to 76b40ab41eff1f402ee52ba768b09daad293b9bb: > > > > Merge u-boot/master into u-boot-ti/master (2013-03-11 12:16:13 -0400) > > > > ---------------------------------------------------------------- > > > [...] > > > > Nikita Kiryanov (14): > > omap: consolidate common mmc definitions > > omap_hsmmc: fix out of bounds array access > > omap_hsmmc: introduce omap_hsmmc_data struct > > omap_hsmmc: implement driver check for card detection > > cm-t35: implement board specific card detect check > > mmc: add support for write protection > > omap_hsmmc: add driver check for write protection > > omap3: add useful dss defines > > omap3: allow dynamic selection of gfx_format > > lcd: add option for board specific splash screen preparation > > cm-t35: add support for dvi displays > > cm-t35: add support for user defined lcd parameters > > lcd: implement a callback for splashimage > > cm_t35: prevent splashimage from being set to a bad value > > > > I noticed that the patch "cm-t35: add support for loading splash image > from NAND" is missing from the above. As I mentioned here > http://lists.denx.de/pipermail/u-boot/2013-February/146361.html > V1 is still part of the CM-T35 splash screen and should be included > with the rest of the patchset. Tom: also, the automatic "Conflicts:" lines were left (voluntarily or involuntarily) in the ToT commit's message. I suggest they be removed or, if left as a warning sign that the merge contains resolutions, be replaced with a non-default description. Do you want to re-do this PR or can I take it in as-is? Amicalement,
On Tue, Mar 12, 2013 at 09:03:24AM +0200, Nikita Kiryanov wrote: > Hi Tom, > > On 03/11/2013 08:25 PM, Tom Rini wrote: > >Hello, > > > >The following changes since commit fc959081d41aab2d6f4614c5fb3dd1b77ffcdcf4: > > > > x86: Enable CONFIG_OF_CONTROL on coreboot (2013-03-04 15:57:52 -0800) > > > >are available in the git repository at: > > > > git://git.denx.de/u-boot-ti.git master > > > >for you to fetch changes up to 76b40ab41eff1f402ee52ba768b09daad293b9bb: > > > > Merge u-boot/master into u-boot-ti/master (2013-03-11 12:16:13 -0400) > > > >---------------------------------------------------------------- > > > [...] > > > >Nikita Kiryanov (14): > > omap: consolidate common mmc definitions > > omap_hsmmc: fix out of bounds array access > > omap_hsmmc: introduce omap_hsmmc_data struct > > omap_hsmmc: implement driver check for card detection > > cm-t35: implement board specific card detect check > > mmc: add support for write protection > > omap_hsmmc: add driver check for write protection > > omap3: add useful dss defines > > omap3: allow dynamic selection of gfx_format > > lcd: add option for board specific splash screen preparation > > cm-t35: add support for dvi displays > > cm-t35: add support for user defined lcd parameters > > lcd: implement a callback for splashimage > > cm_t35: prevent splashimage from being set to a bad value > > I noticed that the patch "cm-t35: add support for loading splash image > from NAND" is missing from the above. As I mentioned here > http://lists.denx.de/pipermail/u-boot/2013-February/146361.html > V1 is still part of the CM-T35 splash screen and should be included > with the rest of the patchset. OK, I missed that, sorry.
On Tue, Mar 12, 2013 at 08:14:24AM +0100, Albert ARIBAUD wrote: > Hi Nikita, > > On Tue, 12 Mar 2013 09:03:24 +0200, Nikita Kiryanov > <nikita@compulab.co.il> wrote: > > > Hi Tom, > > > > On 03/11/2013 08:25 PM, Tom Rini wrote: > > > Hello, > > > > > > The following changes since commit fc959081d41aab2d6f4614c5fb3dd1b77ffcdcf4: > > > > > > x86: Enable CONFIG_OF_CONTROL on coreboot (2013-03-04 15:57:52 -0800) > > > > > > are available in the git repository at: > > > > > > git://git.denx.de/u-boot-ti.git master > > > > > > for you to fetch changes up to 76b40ab41eff1f402ee52ba768b09daad293b9bb: > > > > > > Merge u-boot/master into u-boot-ti/master (2013-03-11 12:16:13 -0400) > > > > > > ---------------------------------------------------------------- > > > > > [...] > > > > > > Nikita Kiryanov (14): > > > omap: consolidate common mmc definitions > > > omap_hsmmc: fix out of bounds array access > > > omap_hsmmc: introduce omap_hsmmc_data struct > > > omap_hsmmc: implement driver check for card detection > > > cm-t35: implement board specific card detect check > > > mmc: add support for write protection > > > omap_hsmmc: add driver check for write protection > > > omap3: add useful dss defines > > > omap3: allow dynamic selection of gfx_format > > > lcd: add option for board specific splash screen preparation > > > cm-t35: add support for dvi displays > > > cm-t35: add support for user defined lcd parameters > > > lcd: implement a callback for splashimage > > > cm_t35: prevent splashimage from being set to a bad value > > > > > > > I noticed that the patch "cm-t35: add support for loading splash image > > from NAND" is missing from the above. As I mentioned here > > http://lists.denx.de/pipermail/u-boot/2013-February/146361.html > > V1 is still part of the CM-T35 splash screen and should be included > > with the rest of the patchset. > > Tom: also, the automatic "Conflicts:" lines were left (voluntarily or > involuntarily) in the ToT commit's message. I suggest they be removed > or, if left as a warning sign that the merge contains resolutions, be > replaced with a non-default description. Conflicts: is how it's left in the kernel logs as well, so I'd really lean towards keeping it as-is. > Do you want to re-do this PR or can I take it in as-is? As-is please, I've got a few other things I want to pull in still and I don't want to pile more things on top of the merge to master.
Hi Tom, On Mon, 11 Mar 2013 14:25:44 -0400, Tom Rini <trini@ti.com> wrote: > Hello, > > The following changes since commit fc959081d41aab2d6f4614c5fb3dd1b77ffcdcf4: > > x86: Enable CONFIG_OF_CONTROL on coreboot (2013-03-04 15:57:52 -0800) > > are available in the git repository at: > > git://git.denx.de/u-boot-ti.git master > > for you to fetch changes up to 76b40ab41eff1f402ee52ba768b09daad293b9bb: > > Merge u-boot/master into u-boot-ti/master (2013-03-11 12:16:13 -0400) > > ---------------------------------------------------------------- > > Enric Balletbo i Serra (4): > SPL: ONENAND: Fix some ONENAND related defines. > SPL: ONENAND: Fix onenand_spl_load_image implementation. > SPL: ONENAND: Support SPL to boot u-boot from OneNAND. > OMAP3: Initialize gpmc if SPL_ONENAND_SUPPORT is enabled. > > Lokesh Vutla (13): > ARM: OMAP4+: emif: Detect SDRAM from SDRAM config register > ARM: OMAP4+: Cleanup emif specific files > ARM: OMAP4+: Make control module register structure generic > ARM: OMAP5: Clean up iosettings code > ARM: OMAP5: Add DDR changes required for OMAP543X ES2.0 SOCs > ARM: OMAP5: srcomp: enable slew rate compensation cells after powerup > arm: dra7xx: clock: Add the prcm changes > arm: dra7xx: clock: Add the dplls data > arm: dra7xx: Add control module changes > arm: dra7xx: Add DDR related data for DRA752 ES1.0 > arm: dra7xx: Add board files for DRA7XX socs > arm: dra7xx: Add dra7xx_evm build support > arm: dra7xx: Add silicon id support for DRA752 soc > > Mark Jackson (1): > Allow AM33xx boards to setup GPMC chipselects. > > Mugunthan V N (1): > am335x: cpsw: optimize cpsw_send to increase network performance > > Nikita Kiryanov (14): > omap: consolidate common mmc definitions > omap_hsmmc: fix out of bounds array access > omap_hsmmc: introduce omap_hsmmc_data struct > omap_hsmmc: implement driver check for card detection > cm-t35: implement board specific card detect check > mmc: add support for write protection > omap_hsmmc: add driver check for write protection > omap3: add useful dss defines > omap3: allow dynamic selection of gfx_format > lcd: add option for board specific splash screen preparation > cm-t35: add support for dvi displays > cm-t35: add support for user defined lcd parameters > lcd: implement a callback for splashimage > cm_t35: prevent splashimage from being set to a bad value > > SRICHARAN R (6): > ARM: OMAP4+: Change the PRCM structure prototype common for all Socs > ARM: OMAP4+: Cleanup the clocks layer > ARM: OMAP4+: Clean up the pmic code > ARM: OMAP5: Add silicon id support for ES2.0 revision. > ARM: OMAP5: clock: Add the prcm register changes required for ES2.0 > ARM: OMAP4/5: clocks: Add the required OPP settings as per the latest addendum > > Tom Rini (8): > am335x_evm: Never set CONFIG_EXTRA_ENV_SETTINGS in SPL > am335x_evm: Add am335x_evm_usbspl build target > am33xx: Update DDR3 EMIF configuration sequence > am335x_evm: Enable CONFIG_CMD_BOOTZ > omap5_evm: Enable CONFIG_CMD_BOOTZ > omap3_beagle: Enable CONFIG_CMD_BOOTZ > omap4_common: Enable CONFIG_CMD_BOOTZ > Merge u-boot/master into u-boot-ti/master > > The following diffstat is a little "funny" since to generate something > close to correct I had to make a manual merge branch of > u-boot-arm/master + u-boot/master and compare vs that. > > MAINTAINERS | 1 + > README | 19 + > arch/arm/cpu/arm1136/mx35/generic.c | 2 +- > arch/arm/cpu/armv7/am33xx/board.c | 4 +- > arch/arm/cpu/armv7/am33xx/ddr.c | 12 +- > arch/arm/cpu/armv7/omap-common/boot-common.c | 7 +- > arch/arm/cpu/armv7/omap-common/clocks-common.c | 312 +++++--- > arch/arm/cpu/armv7/omap-common/emif-common.c | 73 +- > arch/arm/cpu/armv7/omap-common/hwinit-common.c | 23 +- > arch/arm/cpu/armv7/omap-common/vc.c | 11 +- > arch/arm/cpu/armv7/omap3/board.c | 6 +- > arch/arm/cpu/armv7/omap4/Makefile | 3 +- > arch/arm/cpu/armv7/omap4/clocks.c | 517 ------------ > arch/arm/cpu/armv7/omap4/hw_data.c | 491 ++++++++++++ > arch/arm/cpu/armv7/omap4/hwinit.c | 36 +- > arch/arm/cpu/armv7/omap4/prcm-regs.c | 315 ++++++++ > arch/arm/cpu/armv7/omap4/sdram_elpida.c | 34 +- > arch/arm/cpu/armv7/omap5/Makefile | 3 +- > arch/arm/cpu/armv7/omap5/clocks.c | 494 ------------ > arch/arm/cpu/armv7/omap5/hw_data.c | 596 ++++++++++++++ > arch/arm/cpu/armv7/omap5/hwinit.c | 292 ++++--- > arch/arm/cpu/armv7/omap5/prcm-regs.c | 958 +++++++++++++++++++++++ > arch/arm/cpu/armv7/omap5/sdram.c | 214 ++++- > arch/arm/cpu/armv7/zynq/Makefile | 1 + > arch/arm/cpu/armv7/zynq/cpu.c | 28 +- > arch/arm/cpu/armv7/zynq/slcr.c | 63 ++ > arch/arm/include/asm/arch-am33xx/mmc_host_def.h | 140 +--- > arch/arm/include/asm/arch-am33xx/spl.h | 1 + > arch/arm/include/asm/arch-am33xx/sys_proto.h | 2 + > arch/arm/include/asm/arch-davinci/gpio.h | 7 +- > arch/arm/include/asm/arch-mx35/spl.h | 2 +- > arch/arm/include/asm/arch-omap3/dss.h | 31 + > arch/arm/include/asm/arch-omap3/mmc_host_def.h | 139 +--- > arch/arm/include/asm/arch-omap3/spl.h | 2 +- > arch/arm/include/asm/arch-omap4/clocks.h | 562 +------------ > arch/arm/include/asm/arch-omap4/mmc_host_def.h | 140 +--- > arch/arm/include/asm/arch-omap4/omap.h | 34 +- > arch/arm/include/asm/arch-omap4/spl.h | 2 +- > arch/arm/include/asm/arch-omap4/sys_proto.h | 2 +- > arch/arm/include/asm/arch-omap5/clocks.h | 539 +------------ > arch/arm/include/asm/arch-omap5/mmc_host_def.h | 140 +--- > arch/arm/include/asm/arch-omap5/mux_dra7xx.h | 344 ++++++++ > arch/arm/include/asm/arch-omap5/mux_omap5.h | 8 - > arch/arm/include/asm/arch-omap5/omap.h | 125 +-- > arch/arm/include/asm/arch-omap5/spl.h | 2 +- > arch/arm/include/asm/arch-omap5/sys_proto.h | 10 +- > arch/arm/include/asm/arch-zynq/hardware.h | 85 ++ > arch/arm/include/asm/arch-zynq/sys_proto.h | 30 + > arch/arm/include/asm/armv7.h | 1 + > arch/arm/include/asm/emif.h | 20 +- > arch/arm/include/asm/omap_common.h | 523 +++++++++++++ > arch/arm/include/asm/omap_mmc.h | 168 ++++ > board/cm_t35/Makefile | 1 + > board/cm_t35/cm_t35.c | 16 +- > board/cm_t35/display.c | 428 ++++++++++ > board/comelit/dig297/dig297.c | 3 +- > board/corscience/tricorder/tricorder.c | 2 +- > board/htkw/mcx/mcx.c | 3 +- > board/isee/igep00x0/igep00x0.c | 3 +- > board/isee/igep00x0/igep00x0.h | 7 +- > board/logicpd/am3517evm/am3517evm.c | 3 +- > board/logicpd/omap3som/omap3logic.c | 2 +- > board/logicpd/zoom1/zoom1.c | 3 +- > board/logicpd/zoom2/zoom2.c | 3 +- > board/matrix_vision/mvblx/fpga.c | 14 +- > board/matrix_vision/mvblx/mvblx.c | 4 +- > board/matrix_vision/mvblx/sys_eeprom.c | 24 + > board/nokia/rx51/rx51.c | 4 +- > board/ns9750dev/config.mk | 16 - > board/ns9750dev/flash.c | 474 ----------- > board/ns9750dev/led.c | 46 -- > board/ns9750dev/lowlevel_init.S | 298 ------- > board/ns9750dev/ns9750dev.c | 125 --- > board/overo/overo.c | 3 +- > board/pandora/pandora.c | 3 +- > board/phytec/pcm051/mux.c | 1 - > board/technexion/twister/twister.c | 2 +- > board/teejet/mt_ventoux/mt_ventoux.c | 4 +- > board/ti/am335x/board.c | 40 +- > board/ti/am3517crane/am3517crane.c | 3 +- > board/ti/beagle/beagle.c | 17 +- > board/ti/beagle/beagle.h | 6 +- > board/{ns9750dev => ti/dra7xx}/Makefile | 22 +- > board/ti/dra7xx/evm.c | 103 +++ > board/ti/dra7xx/mux_data.h | 47 ++ > board/ti/evm/evm.c | 3 +- > board/ti/omap5_evm/evm.c | 4 +- > board/ti/panda/panda.c | 3 +- > board/ti/sdp3430/sdp.c | 3 +- > board/ti/sdp4430/sdp.c | 4 +- > board/timll/devkit8000/devkit8000.c | 3 +- > boards.cfg | 5 + > common/cmd_mmc.c | 7 + > common/lcd.c | 41 + > common/spl/Makefile | 1 + > common/spl/spl.c | 10 + > common/spl/spl_onenand.c | 47 ++ > doc/README.displaying-bmps | 27 + > doc/README.ns9750dev | 36 - > doc/README.scrapyard | 161 ++-- > doc/SPL/README.am335x-network | 92 +++ > doc/driver-model/UDM-serial.txt | 2 +- > drivers/gpio/da8xx_gpio.c | 137 +++- > drivers/mmc/arm_pl180_mmci.c | 1 + > drivers/mmc/bfin_sdh.c | 1 + > drivers/mmc/davinci_mmc.c | 1 + > drivers/mmc/fsl_esdhc.c | 1 + > drivers/mmc/ftsdc010_esdhc.c | 1 + > drivers/mmc/gen_atmel_mci.c | 1 + > drivers/mmc/mmc.c | 17 + > drivers/mmc/mmc_spi.c | 1 + > drivers/mmc/mxcmmc.c | 1 + > drivers/mmc/mxsmmc.c | 1 + > drivers/mmc/omap_hsmmc.c | 103 ++- > drivers/mmc/sdhci.c | 1 + > drivers/mmc/sh_mmcif.c | 1 + > drivers/mmc/tegra_mmc.c | 1 + > drivers/mtd/onenand/onenand_spl.c | 14 +- > drivers/net/cpsw.c | 20 +- > drivers/serial/Makefile | 1 - > drivers/serial/ns9750_serial.c | 218 ------ > drivers/serial/serial.c | 2 - > drivers/video/omap3_dss.c | 2 +- > include/configs/am335x_evm.h | 83 +- > include/configs/cm_t35.h | 9 + > include/configs/dra7xx_evm.h | 36 + > include/configs/ea20.h | 1 + > include/configs/igep00x0.h | 7 +- > include/configs/ns9750dev.h | 187 ----- > include/configs/omap3_beagle.h | 3 +- > include/configs/omap3_mvblx.h | 25 +- > include/configs/omap4_common.h | 2 +- > include/configs/omap5_common.h | 262 +++++++ > include/configs/omap5_evm.h | 240 +----- > include/configs/zynq.h | 5 + > include/env_callback.h | 7 + > include/lcd.h | 1 + > include/mmc.h | 2 + > include/ns9750_bbus.h | 125 --- > include/ns9750_mem.h | 172 ---- > include/ns9750_ser.h | 202 ----- > include/ns9750_sys.h | 215 ----- > include/spl.h | 3 + > spl/Makefile | 2 + > 144 files changed, 6257 insertions(+), 5611 deletions(-) > delete mode 100644 arch/arm/cpu/armv7/omap4/clocks.c > create mode 100644 arch/arm/cpu/armv7/omap4/hw_data.c > create mode 100644 arch/arm/cpu/armv7/omap4/prcm-regs.c > delete mode 100644 arch/arm/cpu/armv7/omap5/clocks.c > create mode 100644 arch/arm/cpu/armv7/omap5/hw_data.c > create mode 100644 arch/arm/cpu/armv7/omap5/prcm-regs.c > create mode 100644 arch/arm/cpu/armv7/zynq/slcr.c > create mode 100644 arch/arm/include/asm/arch-omap5/mux_dra7xx.h > create mode 100644 arch/arm/include/asm/arch-zynq/hardware.h > create mode 100644 arch/arm/include/asm/arch-zynq/sys_proto.h > create mode 100644 arch/arm/include/asm/omap_mmc.h > create mode 100644 board/cm_t35/display.c > delete mode 100644 board/ns9750dev/config.mk > delete mode 100644 board/ns9750dev/flash.c > delete mode 100644 board/ns9750dev/led.c > delete mode 100644 board/ns9750dev/lowlevel_init.S > delete mode 100644 board/ns9750dev/ns9750dev.c > rename board/{ns9750dev => ti/dra7xx}/Makefile (74%) > create mode 100644 board/ti/dra7xx/evm.c > create mode 100644 board/ti/dra7xx/mux_data.h > create mode 100644 common/spl/spl_onenand.c > create mode 100644 doc/README.displaying-bmps > delete mode 100644 doc/README.ns9750dev > create mode 100644 doc/SPL/README.am335x-network > delete mode 100644 drivers/serial/ns9750_serial.c > create mode 100644 include/configs/dra7xx_evm.h > delete mode 100644 include/configs/ns9750dev.h > create mode 100644 include/configs/omap5_common.h > delete mode 100644 include/ns9750_bbus.h > delete mode 100644 include/ns9750_mem.h > delete mode 100644 include/ns9750_ser.h > delete mode 100644 include/ns9750_sys.h > > This includes the following change as the merge commit for merging > u-boot/master into u-boot-ti/master: > arch/arm/include/asm/arch-davinci/gpio.h | 5 ++++- > drivers/gpio/da8xx_gpio.c | 8 ++++++-- > 2 files changed, 10 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/include/asm/arch-davinci/gpio.h b/arch/arm/include/asm/arch-davinci/gpio.h > index fbbb1f3..06390c8 100644 > --- a/arch/arm/include/asm/arch-davinci/gpio.h > +++ b/arch/arm/include/asm/arch-davinci/gpio.h > @@ -67,7 +67,10 @@ struct davinci_gpio_bank { > > #define gpio_status() gpio_info() > #define GPIO_NAME_SIZE 20 > -#if defined(CONFIG_SOC_DA8XX) && !defined(CONFIG_SOC_DA850) > +#if defined(CONFIG_SOC_DM644X) > +/* GPIO0 to GPIO53, omit the V3.3 volts one */ > +#define MAX_NUM_GPIOS 70 > +#elif defined(CONFIG_SOC_DA8XX) && !defined(CONFIG_SOC_DA850) > #define MAX_NUM_GPIOS 128 > #else > #define MAX_NUM_GPIOS 144 > diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c > index 271b8d9..76648d2 100644 > --- a/drivers/gpio/da8xx_gpio.c > +++ b/drivers/gpio/da8xx_gpio.c > @@ -31,6 +31,7 @@ static struct gpio_registry { > char name[GPIO_NAME_SIZE]; > } gpio_registry[MAX_NUM_GPIOS]; > > +#if defined(CONFIG_SOC_DA8XX) > #define pinmux(x) (&davinci_syscfg_regs->pinmux[x]) > > #if defined(CONFIG_SOC_DA8XX) && !defined(CONFIG_SOC_DA850) > @@ -164,7 +165,7 @@ static const struct pinmux_config gpio_pinmux[] = { > { pinmux(0), 1, 0 }, > { pinmux(0), 1, 1 }, > }; > -#else > +#else /* CONFIG_SOC_DA8XX && CONFIG_SOC_DA850 */ > static const struct pinmux_config gpio_pinmux[] = { > { pinmux(1), 8, 7 }, /* GP0[0] */ > { pinmux(1), 8, 6 }, > @@ -311,7 +312,10 @@ static const struct pinmux_config gpio_pinmux[] = { > { pinmux(18), 8, 3 }, > { pinmux(18), 8, 2 }, > }; > -#endif > +#endif /* CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850 */ > +#else /* !CONFIG_SOC_DA8XX */ > +#define davinci_configure_pin_mux(a, b) > +#endif /* CONFIG_SOC_DA8XX */ > > int gpio_request(unsigned gpio, const char *label) > { Applied to u-boot-arm/master, thanks! Amicalement,
diff --git a/arch/arm/include/asm/arch-davinci/gpio.h b/arch/arm/include/asm/arch-davinci/gpio.h index fbbb1f3..06390c8 100644 --- a/arch/arm/include/asm/arch-davinci/gpio.h +++ b/arch/arm/include/asm/arch-davinci/gpio.h @@ -67,7 +67,10 @@ struct davinci_gpio_bank { #define gpio_status() gpio_info() #define GPIO_NAME_SIZE 20 -#if defined(CONFIG_SOC_DA8XX) && !defined(CONFIG_SOC_DA850) +#if defined(CONFIG_SOC_DM644X) +/* GPIO0 to GPIO53, omit the V3.3 volts one */ +#define MAX_NUM_GPIOS 70 +#elif defined(CONFIG_SOC_DA8XX) && !defined(CONFIG_SOC_DA850) #define MAX_NUM_GPIOS 128 #else #define MAX_NUM_GPIOS 144 diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c index 271b8d9..76648d2 100644 --- a/drivers/gpio/da8xx_gpio.c +++ b/drivers/gpio/da8xx_gpio.c @@ -31,6 +31,7 @@ static struct gpio_registry { char name[GPIO_NAME_SIZE]; } gpio_registry[MAX_NUM_GPIOS]; +#if defined(CONFIG_SOC_DA8XX) #define pinmux(x) (&davinci_syscfg_regs->pinmux[x]) #if defined(CONFIG_SOC_DA8XX) && !defined(CONFIG_SOC_DA850) @@ -164,7 +165,7 @@ static const struct pinmux_config gpio_pinmux[] = { { pinmux(0), 1, 0 }, { pinmux(0), 1, 1 }, }; -#else +#else /* CONFIG_SOC_DA8XX && CONFIG_SOC_DA850 */ static const struct pinmux_config gpio_pinmux[] = { { pinmux(1), 8, 7 }, /* GP0[0] */ { pinmux(1), 8, 6 }, @@ -311,7 +312,10 @@ static const struct pinmux_config gpio_pinmux[] = { { pinmux(18), 8, 3 }, { pinmux(18), 8, 2 }, }; -#endif +#endif /* CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850 */ +#else /* !CONFIG_SOC_DA8XX */ +#define davinci_configure_pin_mux(a, b) +#endif /* CONFIG_SOC_DA8XX */ int gpio_request(unsigned gpio, const char *label) {
Hello, The following changes since commit fc959081d41aab2d6f4614c5fb3dd1b77ffcdcf4: x86: Enable CONFIG_OF_CONTROL on coreboot (2013-03-04 15:57:52 -0800) are available in the git repository at: git://git.denx.de/u-boot-ti.git master for you to fetch changes up to 76b40ab41eff1f402ee52ba768b09daad293b9bb: Merge u-boot/master into u-boot-ti/master (2013-03-11 12:16:13 -0400) ---------------------------------------------------------------- Enric Balletbo i Serra (4): SPL: ONENAND: Fix some ONENAND related defines. SPL: ONENAND: Fix onenand_spl_load_image implementation. SPL: ONENAND: Support SPL to boot u-boot from OneNAND. OMAP3: Initialize gpmc if SPL_ONENAND_SUPPORT is enabled. Lokesh Vutla (13): ARM: OMAP4+: emif: Detect SDRAM from SDRAM config register ARM: OMAP4+: Cleanup emif specific files ARM: OMAP4+: Make control module register structure generic ARM: OMAP5: Clean up iosettings code ARM: OMAP5: Add DDR changes required for OMAP543X ES2.0 SOCs ARM: OMAP5: srcomp: enable slew rate compensation cells after powerup arm: dra7xx: clock: Add the prcm changes arm: dra7xx: clock: Add the dplls data arm: dra7xx: Add control module changes arm: dra7xx: Add DDR related data for DRA752 ES1.0 arm: dra7xx: Add board files for DRA7XX socs arm: dra7xx: Add dra7xx_evm build support arm: dra7xx: Add silicon id support for DRA752 soc Mark Jackson (1): Allow AM33xx boards to setup GPMC chipselects. Mugunthan V N (1): am335x: cpsw: optimize cpsw_send to increase network performance Nikita Kiryanov (14): omap: consolidate common mmc definitions omap_hsmmc: fix out of bounds array access omap_hsmmc: introduce omap_hsmmc_data struct omap_hsmmc: implement driver check for card detection cm-t35: implement board specific card detect check mmc: add support for write protection omap_hsmmc: add driver check for write protection omap3: add useful dss defines omap3: allow dynamic selection of gfx_format lcd: add option for board specific splash screen preparation cm-t35: add support for dvi displays cm-t35: add support for user defined lcd parameters lcd: implement a callback for splashimage cm_t35: prevent splashimage from being set to a bad value SRICHARAN R (6): ARM: OMAP4+: Change the PRCM structure prototype common for all Socs ARM: OMAP4+: Cleanup the clocks layer ARM: OMAP4+: Clean up the pmic code ARM: OMAP5: Add silicon id support for ES2.0 revision. ARM: OMAP5: clock: Add the prcm register changes required for ES2.0 ARM: OMAP4/5: clocks: Add the required OPP settings as per the latest addendum Tom Rini (8): am335x_evm: Never set CONFIG_EXTRA_ENV_SETTINGS in SPL am335x_evm: Add am335x_evm_usbspl build target am33xx: Update DDR3 EMIF configuration sequence am335x_evm: Enable CONFIG_CMD_BOOTZ omap5_evm: Enable CONFIG_CMD_BOOTZ omap3_beagle: Enable CONFIG_CMD_BOOTZ omap4_common: Enable CONFIG_CMD_BOOTZ Merge u-boot/master into u-boot-ti/master The following diffstat is a little "funny" since to generate something close to correct I had to make a manual merge branch of u-boot-arm/master + u-boot/master and compare vs that. MAINTAINERS | 1 + README | 19 + arch/arm/cpu/arm1136/mx35/generic.c | 2 +- arch/arm/cpu/armv7/am33xx/board.c | 4 +- arch/arm/cpu/armv7/am33xx/ddr.c | 12 +- arch/arm/cpu/armv7/omap-common/boot-common.c | 7 +- arch/arm/cpu/armv7/omap-common/clocks-common.c | 312 +++++--- arch/arm/cpu/armv7/omap-common/emif-common.c | 73 +- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 23 +- arch/arm/cpu/armv7/omap-common/vc.c | 11 +- arch/arm/cpu/armv7/omap3/board.c | 6 +- arch/arm/cpu/armv7/omap4/Makefile | 3 +- arch/arm/cpu/armv7/omap4/clocks.c | 517 ------------ arch/arm/cpu/armv7/omap4/hw_data.c | 491 ++++++++++++ arch/arm/cpu/armv7/omap4/hwinit.c | 36 +- arch/arm/cpu/armv7/omap4/prcm-regs.c | 315 ++++++++ arch/arm/cpu/armv7/omap4/sdram_elpida.c | 34 +- arch/arm/cpu/armv7/omap5/Makefile | 3 +- arch/arm/cpu/armv7/omap5/clocks.c | 494 ------------ arch/arm/cpu/armv7/omap5/hw_data.c | 596 ++++++++++++++ arch/arm/cpu/armv7/omap5/hwinit.c | 292 ++++--- arch/arm/cpu/armv7/omap5/prcm-regs.c | 958 +++++++++++++++++++++++ arch/arm/cpu/armv7/omap5/sdram.c | 214 ++++- arch/arm/cpu/armv7/zynq/Makefile | 1 + arch/arm/cpu/armv7/zynq/cpu.c | 28 +- arch/arm/cpu/armv7/zynq/slcr.c | 63 ++ arch/arm/include/asm/arch-am33xx/mmc_host_def.h | 140 +--- arch/arm/include/asm/arch-am33xx/spl.h | 1 + arch/arm/include/asm/arch-am33xx/sys_proto.h | 2 + arch/arm/include/asm/arch-davinci/gpio.h | 7 +- arch/arm/include/asm/arch-mx35/spl.h | 2 +- arch/arm/include/asm/arch-omap3/dss.h | 31 + arch/arm/include/asm/arch-omap3/mmc_host_def.h | 139 +--- arch/arm/include/asm/arch-omap3/spl.h | 2 +- arch/arm/include/asm/arch-omap4/clocks.h | 562 +------------ arch/arm/include/asm/arch-omap4/mmc_host_def.h | 140 +--- arch/arm/include/asm/arch-omap4/omap.h | 34 +- arch/arm/include/asm/arch-omap4/spl.h | 2 +- arch/arm/include/asm/arch-omap4/sys_proto.h | 2 +- arch/arm/include/asm/arch-omap5/clocks.h | 539 +------------ arch/arm/include/asm/arch-omap5/mmc_host_def.h | 140 +--- arch/arm/include/asm/arch-omap5/mux_dra7xx.h | 344 ++++++++ arch/arm/include/asm/arch-omap5/mux_omap5.h | 8 - arch/arm/include/asm/arch-omap5/omap.h | 125 +-- arch/arm/include/asm/arch-omap5/spl.h | 2 +- arch/arm/include/asm/arch-omap5/sys_proto.h | 10 +- arch/arm/include/asm/arch-zynq/hardware.h | 85 ++ arch/arm/include/asm/arch-zynq/sys_proto.h | 30 + arch/arm/include/asm/armv7.h | 1 + arch/arm/include/asm/emif.h | 20 +- arch/arm/include/asm/omap_common.h | 523 +++++++++++++ arch/arm/include/asm/omap_mmc.h | 168 ++++ board/cm_t35/Makefile | 1 + board/cm_t35/cm_t35.c | 16 +- board/cm_t35/display.c | 428 ++++++++++ board/comelit/dig297/dig297.c | 3 +- board/corscience/tricorder/tricorder.c | 2 +- board/htkw/mcx/mcx.c | 3 +- board/isee/igep00x0/igep00x0.c | 3 +- board/isee/igep00x0/igep00x0.h | 7 +- board/logicpd/am3517evm/am3517evm.c | 3 +- board/logicpd/omap3som/omap3logic.c | 2 +- board/logicpd/zoom1/zoom1.c | 3 +- board/logicpd/zoom2/zoom2.c | 3 +- board/matrix_vision/mvblx/fpga.c | 14 +- board/matrix_vision/mvblx/mvblx.c | 4 +- board/matrix_vision/mvblx/sys_eeprom.c | 24 + board/nokia/rx51/rx51.c | 4 +- board/ns9750dev/config.mk | 16 - board/ns9750dev/flash.c | 474 ----------- board/ns9750dev/led.c | 46 -- board/ns9750dev/lowlevel_init.S | 298 ------- board/ns9750dev/ns9750dev.c | 125 --- board/overo/overo.c | 3 +- board/pandora/pandora.c | 3 +- board/phytec/pcm051/mux.c | 1 - board/technexion/twister/twister.c | 2 +- board/teejet/mt_ventoux/mt_ventoux.c | 4 +- board/ti/am335x/board.c | 40 +- board/ti/am3517crane/am3517crane.c | 3 +- board/ti/beagle/beagle.c | 17 +- board/ti/beagle/beagle.h | 6 +- board/{ns9750dev => ti/dra7xx}/Makefile | 22 +- board/ti/dra7xx/evm.c | 103 +++ board/ti/dra7xx/mux_data.h | 47 ++ board/ti/evm/evm.c | 3 +- board/ti/omap5_evm/evm.c | 4 +- board/ti/panda/panda.c | 3 +- board/ti/sdp3430/sdp.c | 3 +- board/ti/sdp4430/sdp.c | 4 +- board/timll/devkit8000/devkit8000.c | 3 +- boards.cfg | 5 + common/cmd_mmc.c | 7 + common/lcd.c | 41 + common/spl/Makefile | 1 + common/spl/spl.c | 10 + common/spl/spl_onenand.c | 47 ++ doc/README.displaying-bmps | 27 + doc/README.ns9750dev | 36 - doc/README.scrapyard | 161 ++-- doc/SPL/README.am335x-network | 92 +++ doc/driver-model/UDM-serial.txt | 2 +- drivers/gpio/da8xx_gpio.c | 137 +++- drivers/mmc/arm_pl180_mmci.c | 1 + drivers/mmc/bfin_sdh.c | 1 + drivers/mmc/davinci_mmc.c | 1 + drivers/mmc/fsl_esdhc.c | 1 + drivers/mmc/ftsdc010_esdhc.c | 1 + drivers/mmc/gen_atmel_mci.c | 1 + drivers/mmc/mmc.c | 17 + drivers/mmc/mmc_spi.c | 1 + drivers/mmc/mxcmmc.c | 1 + drivers/mmc/mxsmmc.c | 1 + drivers/mmc/omap_hsmmc.c | 103 ++- drivers/mmc/sdhci.c | 1 + drivers/mmc/sh_mmcif.c | 1 + drivers/mmc/tegra_mmc.c | 1 + drivers/mtd/onenand/onenand_spl.c | 14 +- drivers/net/cpsw.c | 20 +- drivers/serial/Makefile | 1 - drivers/serial/ns9750_serial.c | 218 ------ drivers/serial/serial.c | 2 - drivers/video/omap3_dss.c | 2 +- include/configs/am335x_evm.h | 83 +- include/configs/cm_t35.h | 9 + include/configs/dra7xx_evm.h | 36 + include/configs/ea20.h | 1 + include/configs/igep00x0.h | 7 +- include/configs/ns9750dev.h | 187 ----- include/configs/omap3_beagle.h | 3 +- include/configs/omap3_mvblx.h | 25 +- include/configs/omap4_common.h | 2 +- include/configs/omap5_common.h | 262 +++++++ include/configs/omap5_evm.h | 240 +----- include/configs/zynq.h | 5 + include/env_callback.h | 7 + include/lcd.h | 1 + include/mmc.h | 2 + include/ns9750_bbus.h | 125 --- include/ns9750_mem.h | 172 ---- include/ns9750_ser.h | 202 ----- include/ns9750_sys.h | 215 ----- include/spl.h | 3 + spl/Makefile | 2 + 144 files changed, 6257 insertions(+), 5611 deletions(-) delete mode 100644 arch/arm/cpu/armv7/omap4/clocks.c create mode 100644 arch/arm/cpu/armv7/omap4/hw_data.c create mode 100644 arch/arm/cpu/armv7/omap4/prcm-regs.c delete mode 100644 arch/arm/cpu/armv7/omap5/clocks.c create mode 100644 arch/arm/cpu/armv7/omap5/hw_data.c create mode 100644 arch/arm/cpu/armv7/omap5/prcm-regs.c create mode 100644 arch/arm/cpu/armv7/zynq/slcr.c create mode 100644 arch/arm/include/asm/arch-omap5/mux_dra7xx.h create mode 100644 arch/arm/include/asm/arch-zynq/hardware.h create mode 100644 arch/arm/include/asm/arch-zynq/sys_proto.h create mode 100644 arch/arm/include/asm/omap_mmc.h create mode 100644 board/cm_t35/display.c delete mode 100644 board/ns9750dev/config.mk delete mode 100644 board/ns9750dev/flash.c delete mode 100644 board/ns9750dev/led.c delete mode 100644 board/ns9750dev/lowlevel_init.S delete mode 100644 board/ns9750dev/ns9750dev.c rename board/{ns9750dev => ti/dra7xx}/Makefile (74%) create mode 100644 board/ti/dra7xx/evm.c create mode 100644 board/ti/dra7xx/mux_data.h create mode 100644 common/spl/spl_onenand.c create mode 100644 doc/README.displaying-bmps delete mode 100644 doc/README.ns9750dev create mode 100644 doc/SPL/README.am335x-network delete mode 100644 drivers/serial/ns9750_serial.c create mode 100644 include/configs/dra7xx_evm.h delete mode 100644 include/configs/ns9750dev.h create mode 100644 include/configs/omap5_common.h delete mode 100644 include/ns9750_bbus.h delete mode 100644 include/ns9750_mem.h delete mode 100644 include/ns9750_ser.h delete mode 100644 include/ns9750_sys.h This includes the following change as the merge commit for merging u-boot/master into u-boot-ti/master: arch/arm/include/asm/arch-davinci/gpio.h | 5 ++++- drivers/gpio/da8xx_gpio.c | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-)