February 2015 - U-Boot

[U-Boot] [PATCH] ARM: imx6 Add WDOG3 for i.MX6SX
by Peng Fan 11 Feb '15

11 Feb '15

There are three wdogs for i.MX 6SoloX. Add wdog3 support in function imx_set_wdog_powerdown. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> --- arch/arm/cpu/armv7/mx6/soc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index e599a12..e0bc9a9 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -230,6 +230,11 @@ static void imx_set_wdog_powerdown(bool enable) struct wdog_regs *wdog1 = (struct wdog_regs *)WDOG1_BASE_ADDR; struct wdog_regs *wdog2 = (struct wdog_regs *)WDOG2_BASE_ADDR; +#ifdef CONFIG_MX6SX + struct wdog_regs *wdog3 = (struct wdog_regs *)WDOG3_BASE_ADDR; + writew(enable, &wdog3->wmcr); +#endif + /* Write to the PDE (Power Down Enable) bit */ writew(enable, &wdog1->wmcr); writew(enable, &wdog2->wmcr); -- 1.8.4

1 0

[U-Boot] Samsung patches
by Simon Glass 11 Feb '15

11 Feb '15

Hi, I see quite a few series sitting around to be applied, including the Peach Pi display which is still waiting. Any news please? Thanks, Simon

3 2

[U-Boot] [PATCH 1/3] ARmv7: Add a soc_init hook to start.S
by Hans de Goede 11 Feb '15

11 Feb '15

On some SoCs / ARMv7 CPU cores we need to do some setup before enabling the icache, etc. Add a soc_init hook with a weak default which just calls cpu_init_cp15. This way different implementations can be provided to do some extra work before or after cpu_init_cp15, or completely replacing cpu_init_cp15. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- arch/arm/cpu/armv7/start.S | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index fdc05b9..9882b20 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -64,7 +64,7 @@ reset: /* the mask ROM code should have PLL and others stable */ #ifndef CONFIG_SKIP_LOWLEVEL_INIT - bl cpu_init_cp15 + bl soc_init bl cpu_init_crit #endif @@ -102,6 +102,22 @@ ENDPROC(save_boot_params) /************************************************************************* * + * void soc_init(void) + * __attribute__((weak)); + * + * Stack pointer is not yet initialized at this moment + * Don't save anything to stack even if compiled with -O0 + * + *************************************************************************/ +ENTRY(soc_init) + mov r9, lr + bl cpu_init_cp15 + mov pc, r9 @ back to my caller +ENDPROC(soc_init) + .weak soc_init + +/************************************************************************* + * * cpu_init_cp15 * * Setup CP15 registers (cache, MMU, TLBs). The I-cache is turned on unless -- 2.1.0

6 29

[U-Boot] [PATCH 0/4] sunxi: SPL size reduction patches
by Hans de Goede 10 Feb '15

10 Feb '15

Hi All, Inspired by Simon's work to make the FEL SPL and regular SPL builds more similar I've been looking into reducing the size of the SPL, resulting in the following patch series. This all seems quite safe, but we are past rc1, so may be best to keep this on a branch for now, or not ... Simon, I think the malloc_simple changes should go through your tree, once those are merged I'll add the sunxi patch enabling malloc_simple usage in the SPL. With this series we're already quite close to getting a full-blown SPL to fit in 16K, I've looked at removing CONFIG_SPL_LIBCOMMON_SUPPORT but that won't fly well I think. We could however add a CONFIG_SPL_NO_PRINTF, which automatically gets set when CONFIG_SPL_LIBCOMMON_SUPPORT is not set, and use that on sunxi, assuming that you (Simon) are ok with not being able to use printf in the device-model code which gets used in the SPL. Things already almost built when not setting CONFIG_SPL_LIBCOMMON_SUPPORT since there are already a lot of places checking for that before calling printf. We could change all the CONFIG_SPL_LIBCOMMON_SUPPORT to CONFIG_SPL_NO_PRINTF checks and define CONFIG_SPL_NO_PRINTF on sunxi to win another "large" chunk of RAM. Something else to look at is at the memory map of the first 32k of SRAM when in FEL mode. The only documentation we've is: https://github.com/hno/Allwinner-Info/blob/master/FEL-usb/USB-protocol.txt Which is reverse engineered and not 100% clear on the memory map. We could add a memset to 0xaa for 0x6000 - 0x8000 to the fel spl as a test, as I've the feeling that what hno has found there are just scratch buffers and that using that in the SPL will be save, if that is the case we could use 0x2000 - 0x0000 (growing downwards) as stack, and always use a text-base of 0x2000 for the SPL, with the SPL code / data segments living at 0x2000 - 0x8000 and then everything should fit as is, and we can have one unified SPL binary for both FEL and sdcard booting. I don't have the time to look into this further atm, so I hope that one of you (Simon or Siarhei) has time to look into this further. I see that we also never merged this related fix: http://lists.denx.de/pipermail/u-boot/2014-July/183986.html We should probably merge a version of that when Simon's patches for fixing FEL have landed. I think it may be best to just always set the L2EN bit on sun4i/sun5i, without detecting whether we're in fel mode or not, setting it when it is already said should be a nop, and thus harmless. Regards, Hans

4 14

[U-Boot] Please pull u-boot-x86
by Simon Glass 10 Feb '15

10 Feb '15

Hi Tom, This is the MinnowMax board support patches and also the Quark support. The following changes since commit 7f641d53bbb3a426a3bfb132d8346153e86a9d08: Merge branch 'master' of git://git.denx.de/u-boot-ubi (2015-02-04 13:30:00 -0500) are available in the git repository at: http://git.denx.de/u-boot-x86.git for you to fetch changes up to ba877efb802edb7080703e4dd99e51a437e44f26: x86: Use tab instead of space to indent in PCIE_ECAM_BASE (2015-02-06 12:07:46 -0700) ---------------------------------------------------------------- Bin Meng (25): x86: Remove CONFIG_SATA_INTEL from x86-common.h x86: Add header files for Intel Quark SoC defines x86: quark: Add routines to access message bus registers x86: Define macros for pci configuration space access x86: quark: Add Cache-As-RAM initialization x86: Add basic Intel Quark processor support x86: Add basic Intel Galileo board support x86: Enable the Intel quark/galileo build x86: Allow overriding TSC_FREQ_IN_MHZ x86: quark: Bypass TSC calibration x86: quark: Add Memory Reference Code (MRC) main routines x86: quark: Add utility codes needed for MRC x86: quark: Add System Memory Controller support x86: quark: Enable the Memory Reference Code build fdtdec: Add compatible id and string for Intel Quark MRC dt-bindings: Add Intel Quark MRC bindings x86: quark: Call MRC in dram_init() x86: quark: Initialize non-standard BARs x86: galileo: Add GPIO support x86: pci: Add pci ids for Quark SoC x86: Add SPI support to quark/galileo x86: Add SD/MMC support to quark/galileo x86: Add Intel Galileo instructions in README.x86 bootstage: Fix typos in the comment x86: Use tab instead of space to indent in PCIE_ECAM_BASE Simon Glass (22): x86: Enhance the microcode tool to support header files as input pci: Add a function to find a device by class x86: pci: Add PCI IDs for Minnowboard Max x86: video: Enable video for Minnowboard Max usb: pci: Use pci_find_class() to find the device usb: pci: Add XHCI driver for PCI x86: Add an option to enabling building a ROM file x86: Rename MMCONF_BASE_ADDRESS and make it common across x86 x86: video: Allow video ROM execution to fall back to the other method x86: bootstage: Add time measurement for vesa start-up x86: Move common FSP code into a common location x86: Adjust the FSP types slightly x86: Make CAR and DRAM FSP code common x86: mmc: Move common FSP functions into a common file x86: Remove unnecessary casts and fix comment typos x86: Allow FSP Kconfig settings for all x86 x86: Allow a UART to be set up before the FSP is ready x86: spi: Support ValleyView in ICH SPI driver scsi: bootstage: Measure time taken to scan the bus x86: Enable bootstage features x86: Add some documentation on how to port U-Boot on x86 x86: Add support for Intel Minnowboard Max Makefile | 5 +- arch/x86/Kconfig | 96 ++- arch/x86/cpu/Makefile | 2 + arch/x86/cpu/baytrail/Kconfig | 9 + arch/x86/cpu/baytrail/Makefile | 10 + arch/x86/cpu/baytrail/early_uart.c | 77 ++ arch/x86/cpu/baytrail/fsp_configs.c | 156 ++++ arch/x86/cpu/baytrail/pci.c | 46 + arch/x86/cpu/baytrail/valleyview.c | 38 + arch/x86/cpu/ivybridge/gma.c | 3 +- arch/x86/cpu/ivybridge/sdram.c | 2 +- arch/x86/cpu/quark/Kconfig | 126 +++ arch/x86/cpu/quark/Makefile | 9 + arch/x86/cpu/quark/car.S | 105 +++ arch/x86/cpu/quark/dram.c | 134 +++ arch/x86/cpu/quark/hte.c | 396 +++++++++ arch/x86/cpu/quark/hte.h | 44 + arch/x86/cpu/quark/mrc.c | 204 +++++ arch/x86/cpu/quark/mrc_util.c | 1475 ++++++++++++++++++++++++++++++++ arch/x86/cpu/quark/mrc_util.h | 153 ++++ arch/x86/cpu/quark/msg_port.c | 77 ++ arch/x86/cpu/quark/pci.c | 70 ++ arch/x86/cpu/quark/quark.c | 118 +++ arch/x86/cpu/quark/smc.c | 2764 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/x86/cpu/quark/smc.h | 446 ++++++++++ arch/x86/cpu/queensbay/Kconfig | 38 - arch/x86/cpu/queensbay/Makefile | 4 +- arch/x86/cpu/queensbay/fsp_configs.c | 2 +- arch/x86/cpu/queensbay/tnc.c | 29 +- arch/x86/cpu/queensbay/tnc_pci.c | 17 +- arch/x86/cpu/queensbay/topcliff.c | 33 +- arch/x86/dts/Makefile | 4 +- arch/x86/dts/galileo.dts | 95 +++ arch/x86/dts/microcode/m0130673322.dtsi | 3284 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/x86/dts/minnowmax.dts | 45 + arch/x86/dts/serial.dtsi | 2 +- arch/x86/include/asm/arch-baytrail/fsp/azalia.h | 39 + arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h | 95 +++ arch/x86/include/asm/arch-baytrail/gpio.h | 13 + arch/x86/include/asm/arch-ivybridge/sandybridge.h | 2 +- arch/x86/include/asm/arch-quark/device.h | 28 + arch/x86/include/asm/arch-quark/gpio.h | 13 + arch/x86/include/asm/arch-quark/mrc.h | 187 ++++ arch/x86/include/asm/arch-quark/msg_port.h | 106 +++ arch/x86/include/asm/arch-quark/quark.h | 72 ++ arch/x86/include/asm/arch-queensbay/fsp/fsp_vpd.h | 2 - arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_api.h | 6 +- arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_bootmode.h | 0 arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_ffs.h | 0 arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_fv.h | 0 arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_hob.h | 0 arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_infoheader.h | 0 arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_platform.h | 0 arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_support.h | 6 +- arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_types.h | 0 arch/x86/include/asm/pci.h | 13 +- arch/x86/include/asm/u-boot-x86.h | 3 + arch/x86/lib/Makefile | 1 + arch/x86/lib/cmd_hob.c | 2 +- arch/x86/lib/fsp/Makefile | 10 + arch/x86/{cpu/queensbay/tnc_car.S => lib/fsp/fsp_car.S} | 0 arch/x86/lib/fsp/fsp_common.c | 55 ++ arch/x86/{cpu/queensbay/tnc_dram.c => lib/fsp/fsp_dram.c} | 2 +- arch/x86/{cpu/queensbay => lib/fsp}/fsp_support.c | 20 +- arch/x86/lib/pci_type1.c | 7 +- board/google/chromebook_link/Kconfig | 3 +- board/intel/galileo/Kconfig | 21 + board/intel/galileo/MAINTAINERS | 6 + board/intel/galileo/Makefile | 7 + board/intel/galileo/galileo.c | 19 + board/intel/galileo/start.S | 9 + board/intel/minnowmax/Kconfig | 24 + board/intel/minnowmax/MAINTAINERS | 6 + board/intel/minnowmax/Makefile | 7 + board/intel/minnowmax/minnowmax.c | 32 + board/intel/minnowmax/start.S | 9 + common/cmd_scsi.c | 2 + configs/galileo_defconfig | 6 + configs/minnowmax_defconfig | 13 + doc/README.x86 | 137 ++- drivers/mmc/Makefile | 1 + drivers/mmc/pci_mmc.c | 42 + drivers/pci/pci.c | 43 + drivers/pci/pci_rom.c | 32 +- drivers/spi/ich.c | 59 +- drivers/spi/ich.h | 11 +- drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-pci.c | 53 +- drivers/usb/host/xhci-pci.c | 60 ++ drivers/video/vesa_fb.c | 9 +- include/bootstage.h | 5 +- include/configs/galileo.h | 60 ++ include/configs/minnowmax.h | 72 ++ include/configs/x86-common.h | 4 +- include/dt-bindings/mrc/quark.h | 83 ++ include/fdtdec.h | 1 + include/mmc.h | 14 + include/pci.h | 3 +- include/pci_ids.h | 9 + include/pci_rom.h | 15 +- lib/fdtdec.c | 1 + tools/microcode-tool.py | 90 +- 102 files changed, 11497 insertions(+), 272 deletions(-) create mode 100644 arch/x86/cpu/baytrail/Kconfig create mode 100644 arch/x86/cpu/baytrail/Makefile create mode 100644 arch/x86/cpu/baytrail/early_uart.c create mode 100644 arch/x86/cpu/baytrail/fsp_configs.c create mode 100644 arch/x86/cpu/baytrail/pci.c create mode 100644 arch/x86/cpu/baytrail/valleyview.c create mode 100644 arch/x86/cpu/quark/Kconfig create mode 100644 arch/x86/cpu/quark/Makefile create mode 100644 arch/x86/cpu/quark/car.S create mode 100644 arch/x86/cpu/quark/dram.c create mode 100644 arch/x86/cpu/quark/hte.c create mode 100644 arch/x86/cpu/quark/hte.h create mode 100644 arch/x86/cpu/quark/mrc.c create mode 100644 arch/x86/cpu/quark/mrc_util.c create mode 100644 arch/x86/cpu/quark/mrc_util.h create mode 100644 arch/x86/cpu/quark/msg_port.c create mode 100644 arch/x86/cpu/quark/pci.c create mode 100644 arch/x86/cpu/quark/quark.c create mode 100644 arch/x86/cpu/quark/smc.c create mode 100644 arch/x86/cpu/quark/smc.h create mode 100644 arch/x86/dts/galileo.dts create mode 100644 arch/x86/dts/microcode/m0130673322.dtsi create mode 100644 arch/x86/dts/minnowmax.dts create mode 100644 arch/x86/include/asm/arch-baytrail/fsp/azalia.h create mode 100644 arch/x86/include/asm/arch-baytrail/fsp/fsp_vpd.h create mode 100644 arch/x86/include/asm/arch-baytrail/gpio.h create mode 100644 arch/x86/include/asm/arch-quark/device.h create mode 100644 arch/x86/include/asm/arch-quark/gpio.h create mode 100644 arch/x86/include/asm/arch-quark/mrc.h create mode 100644 arch/x86/include/asm/arch-quark/msg_port.h create mode 100644 arch/x86/include/asm/arch-quark/quark.h rename arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_api.h (88%) rename arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_bootmode.h (100%) rename arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_ffs.h (100%) rename arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_fv.h (100%) rename arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_hob.h (100%) rename arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_infoheader.h (100%) rename arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_platform.h (100%) rename arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_support.h (98%) rename arch/x86/include/asm/{arch-queensbay => }/fsp/fsp_types.h (100%) create mode 100644 arch/x86/lib/fsp/Makefile rename arch/x86/{cpu/queensbay/tnc_car.S => lib/fsp/fsp_car.S} (100%) create mode 100644 arch/x86/lib/fsp/fsp_common.c rename arch/x86/{cpu/queensbay/tnc_dram.c => lib/fsp/fsp_dram.c} (98%) rename arch/x86/{cpu/queensbay => lib/fsp}/fsp_support.c (96%) create mode 100644 board/intel/galileo/Kconfig create mode 100644 board/intel/galileo/MAINTAINERS create mode 100644 board/intel/galileo/Makefile create mode 100644 board/intel/galileo/galileo.c create mode 100644 board/intel/galileo/start.S create mode 100644 board/intel/minnowmax/Kconfig create mode 100644 board/intel/minnowmax/MAINTAINERS create mode 100644 board/intel/minnowmax/Makefile create mode 100644 board/intel/minnowmax/minnowmax.c create mode 100644 board/intel/minnowmax/start.S create mode 100644 configs/galileo_defconfig create mode 100644 configs/minnowmax_defconfig create mode 100644 drivers/mmc/pci_mmc.c create mode 100644 drivers/usb/host/xhci-pci.c create mode 100644 include/configs/galileo.h create mode 100644 include/configs/minnowmax.h create mode 100644 include/dt-bindings/mrc/quark.h Regards, Simon

2 1

[U-Boot] [PULL] u-boot-atmel/master -> u-boot/master
by Andreas Bießmann 10 Feb '15

10 Feb '15

Hi Tom, I have some atmel changes posted way before the MW has closed. Sorry for the delay, there will be some more patches to process next few days. The following changes since commit 7f641d53bbb3a426a3bfb132d8346153e86a9d08: Merge branch 'master' of git://git.denx.de/u-boot-ubi (2015-02-04 13:30:00 -0500) are available in the git repository at: git://git.denx.de/u-boot-atmel.git master for you to fetch changes up to 657006a1c46f11784757f9437ffaaa5e0c4dea72: arm, at91: taurus remove MACH_TYPE definitions in config file (2015-02-07 23:43:24 +0100) ---------------------------------------------------------------- Bo Shen (14): ARM: atmel: clock: make it possible to configure HMX32 ARM: atmel: sama5: add bus matrix header file ARM: atmel: sama5: add sfr register header file ARM: atmel: spl: add weak bus matrix init function ARM: atmel: spl: add saic to aic redirect function ARM: atmel: spl: can not disable osc for sama5d4 ARM: atmel: sama5d4: add matrix1 base addr definition ARM: atmel: sama5d4: add bus matrix init function ARM: atmel: sama5d4: add interrupt redirect function ARM: atmel: sama5d4: can access DDR in interleave mode ARM: atmel: sama5d4: build related file when enable SPL ARM: atmel: sama5d4ek: enable SPL support ARM: atmel: sama5d4_xplained: enable spl support ARM: atmel: cleanup: remove at91cap9 related code Heiko Schocher (6): arm, at91, wdt: do not disable WDT in SPL common/board_f: add at91 wdt arm, at91, wdt: make timeout configurable arm, at91, taurus: enable WDT arm, at91: add reset controller status register arm, at91: taurus remove MACH_TYPE definitions in config file Wu, Josh (5): mtd: atmel_nand: according to pmecc version to perform 0xff page correction ARM: at91: mmc portA support is only for at91sam9g20ek_2mmc board ARM: at91: sama5d3_xplained: save environment in a FAT file in MMC card ARM: at91: sama5d3xek: save enviroment as a FAT file in MMC card ARM: at91: at91sam9x5: save environment to a FAT file in MMC card README | 3 + arch/arm/Kconfig | 2 + arch/arm/cpu/arm926ejs/at91/Makefile | 1 - arch/arm/cpu/arm926ejs/at91/at91cap9_devices.c | 189 ---------------------- arch/arm/cpu/armv7/at91/clock.c | 8 + arch/arm/cpu/armv7/at91/sama5d4_devices.c | 47 ++++++ arch/arm/cpu/at91-common/Makefile | 1 + arch/arm/cpu/at91-common/mpddrc.c | 2 +- arch/arm/cpu/at91-common/spl.c | 4 + arch/arm/cpu/at91-common/spl_atmel.c | 16 ++ arch/arm/include/asm/arch-at91/at91_common.h | 1 + arch/arm/include/asm/arch-at91/at91_pmc.h | 9 +- arch/arm/include/asm/arch-at91/at91_rstc.h | 2 + arch/arm/include/asm/arch-at91/at91cap9.h | 78 --------- arch/arm/include/asm/arch-at91/at91cap9_matrix.h | 129 --------------- arch/arm/include/asm/arch-at91/at91sam9_matrix.h | 2 - arch/arm/include/asm/arch-at91/hardware.h | 2 - arch/arm/include/asm/arch-at91/sama5_matrix.h | 37 +++++ arch/arm/include/asm/arch-at91/sama5_sfr.h | 38 +++++ arch/arm/include/asm/arch-at91/sama5d4.h | 2 + board/atmel/sama5d4_xplained/sama5d4_xplained.c | 85 ++++++++++ board/atmel/sama5d4ek/sama5d4ek.c | 85 ++++++++++ common/board_f.c | 2 +- configs/at91sam9g20ek_2mmc_defconfig | 3 + configs/at91sam9g20ek_mmc_defconfig | 3 - configs/sama5d4_xplained_mmc_defconfig | 1 + configs/sama5d4_xplained_nandflash_defconfig | 1 + configs/sama5d4_xplained_spiflash_defconfig | 1 + configs/sama5d4ek_mmc_defconfig | 1 + configs/sama5d4ek_nandflash_defconfig | 1 + configs/sama5d4ek_spiflash_defconfig | 1 + drivers/mtd/nand/atmel_nand.c | 9 ++ drivers/mtd/nand/atmel_nand_ecc.h | 20 +++ drivers/video/atmel_lcdfb.c | 2 +- drivers/watchdog/at91sam9_wdt.c | 4 + include/configs/at91sam9260ek.h | 6 +- include/configs/at91sam9x5ek.h | 11 +- include/configs/sama5d3_xplained.h | 9 +- include/configs/sama5d3xek.h | 10 +- include/configs/sama5d4_xplained.h | 56 +++++++ include/configs/sama5d4ek.h | 56 +++++++ include/configs/taurus.h | 9 +- 42 files changed, 518 insertions(+), 431 deletions(-) delete mode 100644 arch/arm/cpu/arm926ejs/at91/at91cap9_devices.c delete mode 100644 arch/arm/include/asm/arch-at91/at91cap9.h delete mode 100644 arch/arm/include/asm/arch-at91/at91cap9_matrix.h create mode 100644 arch/arm/include/asm/arch-at91/sama5_matrix.h create mode 100644 arch/arm/include/asm/arch-at91/sama5_sfr.h create mode 100644 configs/at91sam9g20ek_2mmc_defconfig delete mode 100644 configs/at91sam9g20ek_mmc_defconfig

2 1

[U-Boot] Pull request: u-boot-video/master
by Anatolij Gustschin 10 Feb '15

10 Feb '15

Hey Tom, The following changes since commit 7f641d53bbb3a426a3bfb132d8346153e86a9d08: Merge branch 'master' of git://git.denx.de/u-boot-ubi (2015-02-04 13:30:00 -0500) are available in the git repository at: git://git.denx.de/u-boot-video.git master for you to fetch changes up to 7bf71d1f55d31a81ade8dd0fc72f06e4672689d0: lcd: split splash code into its own function (2015-02-10 13:31:58 +0100) ---------------------------------------------------------------- Nikita Kiryanov (13): lcd: move platform-specific structs to their own headers lcd: split configuration_get_cmap lcd: atmel: move atmel-specific fb_put_word to atmel_lcdfb lcd: mpc8xx: move mpc823-specific fb_put_byte to mpc8xx_lcd.c lcd: atmel: introduce lcd_logo_set_cmap lcd: mpc823: move mpc823-specific lcd_logo_set_cmap code to mpc8xx_lcd.c lcd: logo: move generic cmap setting to lcd_logo_set_cmap() lcd: introduce lcd_set_cmap lcd: remove unused includes lcd: various cleanups lcd: rename bitmap_plot to better represent its functionality lcd: dt: extract simplefb support lcd: split splash code into its own function board/raspberrypi/rpi/rpi.c | 1 + common/Makefile | 1 + common/lcd.c | 358 +++++++++--------------------------------- common/lcd_simplefb.c | 59 +++++++ common/splash.c | 16 ++ drivers/video/atmel_hlcdfb.c | 13 ++ drivers/video/atmel_lcdfb.c | 51 ++++++ drivers/video/exynos_fb.c | 9 ++ drivers/video/mpc8xx_lcd.c | 29 ++++ drivers/video/pxa_lcd.c | 6 + include/atmel_lcd.h | 38 +++++ include/exynos_lcd.h | 81 ++++++++++ include/fdt_simplefb.h | 14 ++ include/lcd.h | 311 ++++++------------------------------ include/mpc823_lcd.h | 43 +++++ include/pxa_lcd.h | 80 ++++++++++ include/splash.h | 11 +- 17 files changed, 574 insertions(+), 547 deletions(-) create mode 100644 common/lcd_simplefb.c create mode 100644 include/atmel_lcd.h create mode 100644 include/exynos_lcd.h create mode 100644 include/fdt_simplefb.h create mode 100644 include/mpc823_lcd.h create mode 100644 include/pxa_lcd.h Please pull. Thanks! Anatolij

2 1

[U-Boot] [PULL] Please pull u-boot-imx
by Stefano Babic 10 Feb '15

10 Feb '15

Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit ab77f24119e80257de4ab017b877f92f96980562: Merge branch 'master' of git://git.denx.de/u-boot-ti (2015-01-16 10:25:01 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to aee0013e53b339a573e2a8d66062fe87765aa3bd: mx53loco: Fix boot hang during reboot stress test (2015-02-10 12:48:50 +0100) ---------------------------------------------------------------- Alexandre Coffignal (1): mxsboot : Support of 224-bytes OOB area length Christian Gmeiner (7): ot1200: select SUPPORT_SPL ot1200: make use of imx_ddr_size(..) ot1200: move ccgr and gpr init to c functions ot1200: enable spi clock directly in ccgr_init(..) ot1200: add SPL configuration ot1200: add basic SPL support ot1200: add ot1200_spl_defconfig file Fabio Estevam (2): mx6sxsabresd: Remove unneeded board_late_init() mx53loco: Fix boot hang during reboot stress test Graeme Russ (3): arm: mxs: Add debug outputs and comments to mxs SPL source files arm: mxs: Enable booting of mx28 without battery arm: mxs: Add 'Wait for JTAG user' if booted in JTAG mode Heiko Schocher (1): arm, imx6, aristainetos: board updates Nikita Kiryanov (14): arm: mx6: cm-fx6: expand boot sequence arm: mx6: cm-fx6: change dtb node for ethaddr compulab: eeprom: allow reading mac address from multiple eeproms arm: mx6: cm-fx6: pass 2nd nic mac addr to Linux arm: mx6: cm-fx6: increase size of malloc area arm: mx6: cm-fx6: add hdmi console support arm: mx6: cm-fx6: display compulab logo arm: mx6: cm-fx6: add support for usb keyboard compulab: splash: use errno values compulab: splash: refactor splash.c compulab: splash: support multiple splash sources compulab: splash: support loading splash from sf arm: mx6: cm-fx6: add splash screen support common: convert compulab splash load code to common code Otavio Salvador (1): wandboard: Use 32bit color depth for Fusion LCD Peng Fan (9): imx:mx6sxsabresd add spl config file imx:mx6sxsabresd select SUPPORT_SPL imx:mx6sxsabresd spl support in header file imx:mx6sx add dram io configure for mx6sx imx:mx6 add mx6sx in imx spl header file imx:mx6sxsabresd board spl support imx:mx6 update fuse_bank0_regs pmic:pfuze add macro for setting voltage pmic:pfuz100 add switch mode and more registers Stefan Roese (1): arm: mx6: Add Barco platinum-picon and platinum-titanium Stefano Babic (1): mx6: fix warning in platinum board Ye.Li (4): imx: mx6: Change ENV offset to 512K bytes for larger u-boot image imx: mx6qsabreauto: Change to use common GPMI IO clock function imx: imximage: Add QuadSPI boot support imx: mx6: Fixed AIPS3 base address issue arch/arm/Kconfig | 13 ++++ arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 6 ++ arch/arm/cpu/arm926ejs/mxs/spl_lradc_init.c | 13 +++- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 18 ++++++ arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 110 ++++++++++++++++++++++++++++++++-- arch/arm/cpu/armv7/mx6/ddr.c | 96 +++++++++++++++++++++++++----- arch/arm/cpu/armv7/mx6/soc.c | 2 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 16 +++-- arch/arm/include/asm/arch-mx6/mx6-ddr.h | 46 ++++++++++++++ arch/arm/include/asm/arch-mxs/sys_proto.h | 17 ++++++ board/aristainetos/aristainetos.c | 8 +-- board/bachmann/ot1200/Makefile | 4 ++ board/bachmann/ot1200/mx6q_4x_mt41j128.cfg | 14 ----- board/bachmann/ot1200/ot1200.c | 34 +++++++++-- board/bachmann/ot1200/ot1200_spl.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++ board/barco/platinum/Kconfig | 37 ++++++++++++ board/barco/platinum/MAINTAINERS | 7 +++ board/barco/platinum/Makefile | 14 +++++ board/barco/platinum/platinum.c | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/barco/platinum/platinum.h | 89 ++++++++++++++++++++++++++++ board/barco/platinum/platinum_picon.c | 244 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/barco/platinum/platinum_titanium.c | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/barco/platinum/spl_picon.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/barco/platinum/spl_titanium.c | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/compulab/cm_fx6/cm_fx6.c | 95 ++++++++++++++++++++++++++--- board/compulab/cm_t335/cm_t335.c | 2 +- board/compulab/cm_t35/cm_t35.c | 14 ++++- board/compulab/cm_t3517/cm_t3517.c | 2 +- board/compulab/cm_t54/cm_t54.c | 2 +- board/compulab/common/Makefile | 1 - board/compulab/common/common.h | 9 --- board/compulab/common/eeprom.c | 20 ++++--- board/compulab/common/eeprom.h | 4 +- board/compulab/common/splash.c | 72 ---------------------- board/freescale/mx53loco/imximage.cfg | 3 +- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 25 +------- board/freescale/mx6sxsabresd/MAINTAINERS | 1 + board/freescale/mx6sxsabresd/mx6sxsabresd.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++-- common/Makefile | 1 + common/splash_source.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ configs/mx6sxsabresd_spl_defconfig | 4 ++ configs/ot1200_spl_defconfig | 4 ++ configs/platinum_picon_defconfig | 4 ++ configs/platinum_titanium_defconfig | 4 ++ doc/README.splashprepare | 13 ++++ include/configs/aristainetos.h | 167 ++++++++++++++++++++++++++++----------------------- include/configs/cm_fx6.h | 158 ++++++++++++++++++++++++++++--------------------- include/configs/cm_t35.h | 1 + include/configs/imx6_spl.h | 8 +++ include/configs/mx6slevk.h | 2 +- include/configs/mx6sxsabresd.h | 9 ++- include/configs/ot1200.h | 11 +++- include/configs/platinum.h | 319 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/configs/platinum_picon.h | 31 ++++++++++ include/configs/platinum_titanium.h | 38 ++++++++++++ include/configs/wandboard.h | 2 +- include/power/pfuze100_pmic.h | 55 +++++++++++++++++ include/splash.h | 11 ++++ tools/imximage.c | 2 + tools/imximage.h | 2 + tools/logos/compulab.bmp | Bin 0 -> 31810 bytes tools/mxsboot.c | 6 ++ 62 files changed, 2863 insertions(+), 329 deletions(-) create mode 100644 board/bachmann/ot1200/ot1200_spl.c create mode 100644 board/barco/platinum/Kconfig create mode 100644 board/barco/platinum/MAINTAINERS create mode 100644 board/barco/platinum/Makefile create mode 100644 board/barco/platinum/platinum.c create mode 100644 board/barco/platinum/platinum.h create mode 100644 board/barco/platinum/platinum_picon.c create mode 100644 board/barco/platinum/platinum_titanium.c create mode 100644 board/barco/platinum/spl_picon.c create mode 100644 board/barco/platinum/spl_titanium.c delete mode 100644 board/compulab/common/splash.c create mode 100644 common/splash_source.c create mode 100644 configs/mx6sxsabresd_spl_defconfig create mode 100644 configs/ot1200_spl_defconfig create mode 100644 configs/platinum_picon_defconfig create mode 100644 configs/platinum_titanium_defconfig create mode 100644 include/configs/platinum.h create mode 100644 include/configs/platinum_picon.h create mode 100644 include/configs/platinum_titanium.h create mode 100644 tools/logos/compulab.bmp -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[U-Boot] [PATCH] mtd: nand: mxs: fix PIO_WORD number
by Luca Ellero 10 Feb '15

10 Feb '15

There is only one pio_word in this DMA transaction so data field must be 1. Signed-off-by: Luca Ellero <luca.ellero(a)brickedbrain.com> --- drivers/mtd/nand/mxs_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c index 7a064ab..616c9ca 100644 --- a/drivers/mtd/nand/mxs_nand.c +++ b/drivers/mtd/nand/mxs_nand.c @@ -305,7 +305,7 @@ static void mxs_nand_cmd_ctrl(struct mtd_info *mtd, int data, unsigned int ctrl) d->cmd.data = MXS_DMA_DESC_COMMAND_DMA_READ | MXS_DMA_DESC_IRQ | MXS_DMA_DESC_CHAIN | MXS_DMA_DESC_DEC_SEM | - MXS_DMA_DESC_WAIT4END | (3 << MXS_DMA_DESC_PIO_WORDS_OFFSET) | + MXS_DMA_DESC_WAIT4END | (1 << MXS_DMA_DESC_PIO_WORDS_OFFSET) | (nand_info->cmd_queue_len << MXS_DMA_DESC_BYTES_OFFSET); d->cmd.address = (dma_addr_t)nand_info->cmd_buf; -- 1.7.10.4

4 13

[U-Boot] recent tools on FreeBSD
by Jeroen Hofstee 10 Feb '15

10 Feb '15

Hello Guilherme / Simon, It seems that commit f86ed6a8d52c99bb2d17d3cac1647edca0c4399c, "tools: moved code common to all image tools to a separated module." cause some trouble when building on FreeBSD. /usr/bin/ld:./tools/imagetool.lds:24: syntax error cc: error: linker command failed with exit code 1 (use -v to see invocation) which is about the last line, /* INSERT BEFORE .data; */ And thereafter about: /usr/lib/crt1.o: In function `_start': /usr/src/lib/csu/amd64/crt1.c:(.text+0x90): undefined reference to `__preinit_array_start' /usr/src/lib/csu/amd64/crt1.c:(.text+0x95): undefined reference to `__preinit_array_end' /usr/src/lib/csu/amd64/crt1.c:(.text+0xb1): undefined reference to `__preinit_array_start' /usr/src/lib/csu/amd64/crt1.c:(.text+0xb6): undefined reference to `__preinit_array_end' /usr/src/lib/csu/amd64/crt1.c:(.text+0xd4): undefined reference to `__preinit_array_start' /usr/src/lib/csu/amd64/crt1.c:(.text+0xf9): undefined reference to `__init_array_start' /usr/src/lib/csu/amd64/crt1.c:(.text+0xfe): undefined reference to `__init_array_end' /usr/src/lib/csu/amd64/crt1.c:(.text+0x11a): undefined reference to `__init_array_start' /usr/src/lib/csu/amd64/crt1.c:(.text+0x11f): undefined reference to `__init_array_end' /usr/src/lib/csu/amd64/crt1.c:(.text+0x144): undefined reference to `__init_array_start' /usr/lib/crt1.o: In function `finalizer': /usr/src/lib/csu/amd64/crt1.c:(.text+0x187): undefined reference to `__fini_array_start' /usr/src/lib/csu/amd64/crt1.c:(.text+0x18c): undefined reference to `__fini_array_end' /usr/src/lib/csu/amd64/crt1.c:(.text+0x1b4): undefined reference to `__fini_array_start' /usr/bin/ld: tools/mkenvimage: hidden symbol `__preinit_array_start' isn't defined Which seems to be about missing sections. The (default) ld on FreeBSD branched of from an old version [1], With below patch [2] things build at least. Some question about this: - why do we need linker magic for tools at all? Given that there is no custom linker script for tools (or I failed to find it), this adds a dependency between the host default linker script and the tweaks in imagetool.lds - what it the INSERT BEFORE .data supposed to do? - and last but not least, how can we make this work in general - and really last, how do I test if it works.. With kind regards, Jeroen [1] ld --version GNU ld 2.17.50 [FreeBSD] 2007-07-03 [2] diff --git a/tools/imagetool.lds b/tools/imagetool.ldsdiff --git a/tools/imagetool.lds b/tools/imagetool.lds index 7e92b4a..b18eadb 100644 --- a/tools/imagetool.lds +++ b/tools/imagetool.lds @@ -19,6 +19,17 @@ SECTIONS __u_boot_sandbox_option_end = .; __bss_start = .; + + . = ALIGN(32 / 8); + PROVIDE (__preinit_array_start = .); + .preinit_array : { *(.preinit_array) } + PROVIDE (__preinit_array_end = .); + PROVIDE (__init_array_start = .); + .init_array : { *(.init_array) } + PROVIDE (__init_array_end = .); + PROVIDE (__fini_array_start = .); + .fini_array : { *(.fini_array) } + PROVIDE (__fini_array_end = .); } -INSERT BEFORE .data; +/* INSERT BEFORE .data; */

4 25