April 2014 - U-Boot

[U-Boot] [PULL] : Please pull u-boot-imx
by Stefano Babic 05 Apr '14

05 Apr '14

Hi Albert, please pull from u-boot-imx, thanks ! The following changes since commit 00b132bf34c5be86a108ac7fe8231ad9e97f6de4: config:trats2: Change u-boot's TEXT_BASE from 0x78100000 to 0x43e00000 (2014-04-02 21:00:04 +0900) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to 1a9df13d5bc0b68c9dcae88d244c995c9351db67: arm: mxs: Add support for generating signed BootStream (2014-04-04 11:44:59 +0200) ---------------------------------------------------------------- Eric Nelson (1): ARM: mx6: Disable PCIe on SABRE Lite/Nitrogen6x Fabio Estevam (1): woodburn_sd: Remove CONFIG_BOOT_INTERNAL Marek Vasut (12): arm: mxs: Adjust the load address of U-Boot and SPL for HAB arm: mxs: Add support for generating signed BootStream ARM: mxs: Add OCOTP driver pci: mx6: Implement power callback ARM: mx6: Add PCIe on SabreSDP arm: mx5: Fix memory slowness on MX53QSB arm: mx5: Avoid hardcoding memory sizes on MX53QSB arm: mx5: Fix memory slowness on M53EVK arm: mx5: Avoid hardcoding memory sizes on M53EVK arm: mxs: Properly set GD pointer in SPL arm: mxs: Add serial console support into SPL arm: mxs: Add support for generating signed BootStream Stefano Babic (5): mxs: fix warning in SPL with console support imx: add rules for U-Boot DTB support mx6: add example DTB for mx6qsabreauto Revert "arm: mxs: Add support for generating signed BootStream" Merge branch 'master' of git://git.denx.de/u-boot-arm into master Makefile | 8 +- arch/arm/config.mk | 4 + arch/arm/cpu/arm926ejs/mxs/Makefile | 60 +++++ arch/arm/cpu/arm926ejs/mxs/mxsimage-signed.cfg | 10 + arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg | 8 +- arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg | 8 +- arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 35 +++ arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 2 +- arch/arm/dts/Makefile | 1 + arch/arm/dts/imx6q-sabreauto.dts | 13 + arch/arm/imx-common/Makefile | 8 + board/denx/m53evk/m53evk.c | 31 ++- board/freescale/mx53loco/mx53loco.c | 31 ++- board/freescale/mx6sabresd/mx6sabresd.c | 11 + drivers/misc/Makefile | 1 + drivers/misc/mxs_ocotp.c | 311 ++++++++++++++++++++++++ drivers/pci/pcie_imx.c | 13 +- include/configs/m53evk.h | 8 +- include/configs/mx53loco.h | 10 +- include/configs/mx6qsabreauto.h | 3 + include/configs/mx6sabresd.h | 10 + include/configs/mxs.h | 15 +- include/configs/nitrogen6x.h | 1 - include/configs/woodburn_sd.h | 2 - 24 files changed, 564 insertions(+), 40 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/mxs/mxsimage-signed.cfg create mode 100644 arch/arm/dts/imx6q-sabreauto.dts create mode 100644 drivers/misc/mxs_ocotp.c -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel 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] [PULL] : Please pull u-boot-imx
by Stefano Babic 05 Apr '14

05 Apr '14

Hi Albert, please pull from u-boot-imx, thanks ! The following changes since commit 81a1d6173cd255c5c04c332ed69498c6e173515f: mx25pdk: Align the environment with other FSL boards (2014-03-12 11:19:23 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to fa9c02163247369aeb7c5dd02927547c8a5be8ef: mx6: add example DTB for mx6qsabreauto (2014-04-02 10:46:21 +0200) ---------------------------------------------------------------- Eric Nelson (1): ARM: mx6: Disable PCIe on SABRE Lite/Nitrogen6x Fabio Estevam (1): woodburn_sd: Remove CONFIG_BOOT_INTERNAL Marek Vasut (11): arm: mxs: Adjust the load address of U-Boot and SPL for HAB arm: mxs: Add support for generating signed BootStream ARM: mxs: Add OCOTP driver pci: mx6: Implement power callback ARM: mx6: Add PCIe on SabreSDP arm: mx5: Fix memory slowness on MX53QSB arm: mx5: Avoid hardcoding memory sizes on MX53QSB arm: mx5: Fix memory slowness on M53EVK arm: mx5: Avoid hardcoding memory sizes on M53EVK arm: mxs: Properly set GD pointer in SPL arm: mxs: Add serial console support into SPL Stefano Babic (3): mxs: fix warning in SPL with console support imx: add rules for U-Boot DTB support mx6: add example DTB for mx6qsabreauto Makefile | 8 +- arch/arm/config.mk | 4 + arch/arm/cpu/arm926ejs/mxs/Makefile | 77 ++++++ arch/arm/cpu/arm926ejs/mxs/mxsimage-signed.cfg | 10 + arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg | 8 +- arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg | 8 +- arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 35 +++ arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 2 +- arch/arm/dts/Makefile | 1 + arch/arm/dts/imx6q-sabreauto.dts | 13 + arch/arm/imx-common/Makefile | 8 + board/denx/m53evk/m53evk.c | 31 ++- board/freescale/mx53loco/mx53loco.c | 31 ++- board/freescale/mx6sabresd/mx6sabresd.c | 11 + drivers/misc/Makefile | 1 + drivers/misc/mxs_ocotp.c | 311 ++++++++++++++++++++++++ drivers/pci/pcie_imx.c | 13 +- include/configs/m53evk.h | 8 +- include/configs/mx53loco.h | 10 +- include/configs/mx6qsabreauto.h | 3 + include/configs/mx6sabresd.h | 10 + include/configs/mxs.h | 15 +- include/configs/nitrogen6x.h | 1 - include/configs/woodburn_sd.h | 2 - 24 files changed, 581 insertions(+), 40 deletions(-) create mode 100644 arch/arm/cpu/arm926ejs/mxs/mxsimage-signed.cfg create mode 100644 arch/arm/dts/imx6q-sabreauto.dts create mode 100644 drivers/misc/mxs_ocotp.c -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel 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 7

[U-Boot] [PATCH 8/10] Makefile: Add support of RAMBOOT_SPLPBL
by Prabhakar Kushwaha 04 Apr '14

04 Apr '14

Objective of this target to have concatenate binary having - SPL binary in PBL command format - U-boot binary Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com> --- Makefile | 19 +++++++++++++++++++ README | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/Makefile b/Makefile index e5f5a8c..e7a0838 100644 --- a/Makefile +++ b/Makefile @@ -699,7 +699,11 @@ ALL-y += u-boot.srec u-boot.bin System.map ALL-$(CONFIG_NAND_U_BOOT) += u-boot-nand.bin ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin +ifeq ($(CONFIG_RAMBOOT_SPLPBL),y) +ALL-$(CONFIG_RAMBOOT_PBL) += u-boot-with-spl-pbl.bin +else ALL-$(CONFIG_RAMBOOT_PBL) += u-boot.pbl +endif ALL-$(CONFIG_SPL) += spl/u-boot-spl.bin ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.img ALL-$(CONFIG_TPL) += tpl/u-boot-tpl.bin @@ -882,6 +886,21 @@ endif u-boot-img.bin: spl/u-boot-spl.bin u-boot.img FORCE $(call if_changed,cat) +#Add a target to create boot binary having SPL binary in PBI format +#concatenated with u-boot binary. It is need by PowerPC SoC having +#internal SRAM <= 512KB. +MKIMAGEFLAGS_u-boot-spl.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \ + -R $(srctree)/$(CONFIG_SYS_FSL_PBL_PBI:"%"=%) -T pblimage + +spl/u-boot-spl.pbl: spl/u-boot-spl.bin FORCE + $(call if_changed,mkimage) + +OBJCOPYFLAGS_u-boot-with-spl-pbl.bin = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO) \ + --gap-fill=0xff + +u-boot-with-spl-pbl.bin: spl/u-boot-spl.pbl u-boot.bin FORCE + $(call if_changed,pad_cat) + # PPC4xx needs the SPL at the end of the image, since the reset vector # is located at 0xfffffffc. So we can't use the "u-boot-img.bin" target # and need to introduce a new build target with the full blown U-Boot diff --git a/README b/README index d8d5f60..7690fdb 100644 --- a/README +++ b/README @@ -486,6 +486,10 @@ The following options need to be configured: PBI commands can be used to configure SoC before it starts the execution. Please refer doc/README.pblimage for more details + CONFIG_RAMBOOT_SPLPBL + It adds a target to create boot binary having SPL binary in PBI format + concatenated with u-boot binary. + CONFIG_SYS_FSL_DDR_BE Defines the DDR controller register space as Big Endian -- 1.7.9.5

2 3

[U-Boot] [PATCH 9/10] board/b4qds:Add support of 2 stage NAND boot-loader
by Prabhakar Kushwaha 04 Apr '14

04 Apr '14

Add support of 2 stage NAND boot loader using SPL framework. here, PBL initialise the internal SRAM and copy SPL(160KB). This further initialise DDR using SPD and environment and copy u-boot(768 KB) from NAND to DDR. Finally SPL transer control to u-boot. Initialise/create followings required for SPL framework - Add spl.c which defines board_init_f, board_init_r - update tlb and ddr accordingly Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com> --- board/freescale/b4860qds/Makefile | 9 ++- board/freescale/b4860qds/ddr.c | 5 +- board/freescale/b4860qds/spl.c | 115 +++++++++++++++++++++++++++++++++++++ board/freescale/b4860qds/tlb.c | 10 ++++ boards.cfg | 4 +- doc/README.b4860qds | 35 +++++++++++ include/configs/B4860QDS.h | 64 ++++++++++++++++++--- 7 files changed, 230 insertions(+), 12 deletions(-) create mode 100644 board/freescale/b4860qds/spl.c diff --git a/board/freescale/b4860qds/Makefile b/board/freescale/b4860qds/Makefile index e5cc054..0acd2a9 100644 --- a/board/freescale/b4860qds/Makefile +++ b/board/freescale/b4860qds/Makefile @@ -4,9 +4,14 @@ # SPDX-License-Identifier: GPL-2.0+ # +ifdef CONFIG_SPL_BUILD +obj-y += spl.o +else obj-y += b4860qds.o -obj-y += ddr.o obj-$(CONFIG_B4860QDS)+= eth_b4860qds.o -obj-$(CONFIG_PCI) += pci.o +obj-$(CONFIG_PCI) += pci.o +endif + +obj-y += ddr.o obj-y += law.o obj-y += tlb.o diff --git a/board/freescale/b4860qds/ddr.c b/board/freescale/b4860qds/ddr.c index 187c3b3..2c17156 100644 --- a/board/freescale/b4860qds/ddr.c +++ b/board/freescale/b4860qds/ddr.c @@ -179,6 +179,7 @@ phys_size_t initdram(int board_type) { phys_size_t dram_size; +#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_RAMBOOT_PBL) puts("Initializing....using SPD\n"); dram_size = fsl_ddr_sdram(); @@ -186,7 +187,9 @@ phys_size_t initdram(int board_type) dram_size = setup_ddr_tlbs(dram_size / 0x100000); dram_size *= 0x100000; - puts(" DDR: "); +#else + dram_size = fsl_ddr_sdram_size(); +#endif return dram_size; } diff --git a/board/freescale/b4860qds/spl.c b/board/freescale/b4860qds/spl.c new file mode 100644 index 0000000..d56cd30 --- /dev/null +++ b/board/freescale/b4860qds/spl.c @@ -0,0 +1,115 @@ +/* Copyright 2013 Freescale Semiconductor, Inc. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/spl.h> +#include <malloc.h> +#include <ns16550.h> +#include <nand.h> +#include <i2c.h> +#include "../common/qixis.h" +#include "b4860qds_qixis.h" + +DECLARE_GLOBAL_DATA_PTR; + +phys_size_t get_effective_memsize(void) +{ + return CONFIG_SYS_L3_SIZE; +} + +unsigned long get_board_sys_clk(void) +{ + u8 sysclk_conf = QIXIS_READ(brdcfg[1]); + + switch ((sysclk_conf & 0x0C) >> 2) { + case QIXIS_CLK_100: + return 100000000; + case QIXIS_CLK_125: + return 125000000; + case QIXIS_CLK_133: + return 133333333; + } + return 66666666; +} + +unsigned long get_board_ddr_clk(void) +{ + u8 ddrclk_conf = QIXIS_READ(brdcfg[1]); + + switch (ddrclk_conf & 0x03) { + case QIXIS_CLK_100: + return 100000000; + case QIXIS_CLK_125: + return 125000000; + case QIXIS_CLK_133: + return 133333333; + } + return 66666666; +} + +void board_init_f(ulong bootflag) +{ + u32 plat_ratio, sys_clk, uart_clk; + ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC85xx_GUTS_ADDR; + + /* Memcpy existing GD at CONFIG_SPL_GD_ADDR */ + memcpy((void *)CONFIG_SPL_GD_ADDR, (void *)gd, sizeof(gd_t)); + + /* Update GD pointer */ + gd = (gd_t *)(CONFIG_SPL_GD_ADDR); + __asm__ __volatile__("" : : : "memory"); + + console_init_f(); + + /* initialize selected port with appropriate baud rate */ + sys_clk = get_board_sys_clk(); + plat_ratio = (in_be32(&gur->rcwsr[0]) >> 25) & 0x1f; + uart_clk = sys_clk * plat_ratio / 2; + + NS16550_init((NS16550_t)CONFIG_SYS_NS16550_COM1, + uart_clk / 16 / CONFIG_BAUDRATE); + + relocate_code(CONFIG_SPL_RELOC_STACK, (gd_t *)CONFIG_SPL_GD_ADDR, 0x0); +} + +void board_init_r(gd_t *gd, ulong dest_addr) +{ + bd_t *bd; + + bd = (bd_t *)(gd + sizeof(gd_t)); + memset(bd, 0, sizeof(bd_t)); + gd->bd = bd; + bd->bi_memstart = CONFIG_SYS_INIT_L3_ADDR; + bd->bi_memsize = CONFIG_SYS_L3_SIZE; + + probecpu(); + get_clocks(); + mem_malloc_init(CONFIG_SPL_RELOC_MALLOC_ADDR, + CONFIG_SPL_RELOC_MALLOC_SIZE); + +#ifndef CONFIG_SPL_NAND_BOOT + env_init(); +#endif + + /* relocate environment function pointers etc. */ +#ifdef CONFIG_SPL_NAND_BOOT + nand_spl_load_image(CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, + (uchar *)CONFIG_ENV_ADDR); + gd->env_addr = (ulong)(CONFIG_ENV_ADDR); + gd->env_valid = 1; +#else + env_relocate(); +#endif + + i2c_init_all(); + + puts("\n\n"); + + gd->ram_size = initdram(0); + +#ifdef CONFIG_SPL_NAND_BOOT + nand_boot(); +#endif +} diff --git a/board/freescale/b4860qds/tlb.c b/board/freescale/b4860qds/tlb.c index 00798a1..7b55b86 100644 --- a/board/freescale/b4860qds/tlb.c +++ b/board/freescale/b4860qds/tlb.c @@ -62,6 +62,7 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SR, MAS2_W|MAS2_G, 0, 2, BOOKE_PAGESZ_256M, 1), +#ifndef CONFIG_SPL_BUILD /* *I*G* - PCI */ SET_TLB_ENTRY(1, CONFIG_SYS_PCIE1_MEM_VIRT, CONFIG_SYS_PCIE1_MEM_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, @@ -96,6 +97,7 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 9, BOOKE_PAGESZ_16M, 1), #endif +#endif #ifdef CONFIG_SYS_DCSRBAR_PHYS SET_TLB_ENTRY(1, CONFIG_SYS_DCSRBAR, CONFIG_SYS_DCSRBAR_PHYS, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, @@ -118,6 +120,7 @@ struct fsl_e_tlb_entry tlb_table[] = { * entry 14 and 15 has been used hard coded, they will be disabled * in cpu_init_f, so we use entry 16 for SRIO2. */ +#ifndef CONFIG_SPL_BUILD #ifdef CONFIG_SYS_SRIO1_MEM_PHYS /* *I*G* - SRIO1 */ SET_TLB_ENTRY(1, CONFIG_SYS_SRIO1_MEM_VIRT, CONFIG_SYS_SRIO1_MEM_PHYS, @@ -140,6 +143,13 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SW|MAS3_SR, MAS2_G, 0, 17, BOOKE_PAGESZ_1M, 1), #endif +#endif + +#if defined(CONFIG_RAMBOOT_PBL) && !defined(CONFIG_SPL_BUILD) + SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE, + MAS3_SX|MAS3_SW|MAS3_SR, 0, + 0, 17, BOOKE_PAGESZ_2G, 1) +#endif }; int num_tlb_entries = ARRAY_SIZE(tlb_table); diff --git a/boards.cfg b/boards.cfg index 5afca26..76f3aae 100644 --- a/boards.cfg +++ b/boards.cfg @@ -740,10 +740,10 @@ Active powerpc mpc85xx - - sbc8548 Active powerpc mpc85xx - - socrates socrates - - Active powerpc mpc85xx - exmeritus hww1u1a HWW1U1A - Kyle Moffett <Kyle.D.Moffett(a)boeing.com> Active powerpc mpc85xx - freescale b4860qds B4420QDS B4860QDS:PPC_B4420 - -Active powerpc mpc85xx - freescale b4860qds B4420QDS_NAND B4860QDS:PPC_B4420,RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000 - +Active powerpc mpc85xx - freescale b4860qds B4420QDS_NAND B4860QDS:PPC_B4420,RAMBOOT_PBL,RAMBOOT_SPLPBL,NAND - Active powerpc mpc85xx - freescale b4860qds B4420QDS_SPIFLASH B4860QDS:PPC_B4420,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000 - Active powerpc mpc85xx - freescale b4860qds B4860QDS B4860QDS:PPC_B4860 - -Active powerpc mpc85xx - freescale b4860qds B4860QDS_NAND B4860QDS:PPC_B4860,RAMBOOT_PBL,NAND,SYS_TEXT_BASE=0xFFF40000 - +Active powerpc mpc85xx - freescale b4860qds B4860QDS_NAND B4860QDS:PPC_B4860,RAMBOOT_PBL,RAMBOOT_SPLPBL,NAND Active powerpc mpc85xx - freescale b4860qds B4860QDS_SPIFLASH B4860QDS:PPC_B4860,RAMBOOT_PBL,SPIFLASH,SYS_TEXT_BASE=0xFFF40000 - Active powerpc mpc85xx - freescale b4860qds B4860QDS_SRIO_PCIE_BOOT B4860QDS:PPC_B4860,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF40000 - Active powerpc mpc85xx - freescale bsc9131rdb BSC9131RDB_NAND BSC9131RDB:BSC9131RDB,NAND Poonam Aggrwal <poonam.aggrwal(a)freescale.com> diff --git a/doc/README.b4860qds b/doc/README.b4860qds index 3da77d9..44b46da 100644 --- a/doc/README.b4860qds +++ b/doc/README.b4860qds @@ -328,3 +328,38 @@ The below commands apply to both B4860QDS and B4420QDS. On Linux the interfaces are renamed as: . eth2 -> fm1-gb2 . eth3 -> fm1-gb3 + +NAND boot with 2 Stage boot loader +---------------------------------- +PBL initialise the internal SRAM and copy SPL(160KB) in SRAM. +SPL further initialise DDR using SPD and environment variables and copy +u-boot(768 KB) from flash to DDR. +Finally SPL transer control to u-boot for futher booting. + +SPL has following features: + - Executes within 256K + - No relocation required + + Run time view of SPL framework :- + ----------------------------------------------- + Area | Address | +----------------------------------------------- + Reserve | 0xFFFC0000 (32KB) | + ----------------------------------------------- + GD, BD | 0xFFFC8000 (4KB) | + ----------------------------------------------- + ENV | 0xFFFC9000 (6KB) | + ----------------------------------------------- + HEAP | 0xFFFCA800 (30KB) | + ----------------------------------------------- + STACK | 0xFFFD8000 (20KB) | + ----------------------------------------------- + U-boot SPL | 0xFFFD8000 (160KB) | + ----------------------------------------------- + +NAND Flash memory Map on B4860 and B4420QDS +------------------------------------------ + Start End Definition Size +0x000000 0x0FFFFF u-boot 1MB +0x140000 0x15FFFF u-boot env 128KB +0x160000 0x17FFFF FMAN Ucode 128KB diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 8fcd1de..4df28a2 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -14,10 +14,43 @@ #define CONFIG_PHYS_64BIT #ifdef CONFIG_RAMBOOT_PBL +#define CONFIG_SYS_FSL_PBL_PBI $(SRCTREE)/board/freescale/b4860qds/b4_pbi.cfg +#define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/b4860qds/b4_rcw.cfg +#ifndef CONFIG_NAND #define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_RESET_VECTOR_ADDRESS 0xfffffffc -#define CONFIG_SYS_FSL_PBL_PBI board/freescale/b4860qds/b4_pbi.cfg -#define CONFIG_SYS_FSL_PBL_RCW board/freescale/b4860qds/b4_rcw.cfg +#else +#define CONFIG_SPL +#define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT +#define CONFIG_SPL_ENV_SUPPORT +#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_FLUSH_IMAGE +#define CONFIG_SPL_TARGET "u-boot-with-spl.bin" +#define CONFIG_SPL_LIBGENERIC_SUPPORT +#define CONFIG_SPL_LIBCOMMON_SUPPORT +#define CONFIG_SPL_I2C_SUPPORT +#define CONFIG_SPL_DRIVERS_MISC_SUPPORT +#define CONFIG_FSL_LAW /* Use common FSL init code */ +#define CONFIG_SYS_TEXT_BASE 0x00201000 +#define CONFIG_SPL_TEXT_BASE 0xFFFD8000 +#define CONFIG_SPL_PAD_TO 0x40000 +#define CONFIG_SPL_MAX_SIZE 0x28000 +#define RESET_VECTOR_OFFSET 0x27FFC +#define BOOT_PAGE_OFFSET 0x27000 +#define CONFIG_SPL_NAND_SUPPORT +#define CONFIG_SYS_NAND_U_BOOT_SIZE (768 << 10) +#define CONFIG_SYS_NAND_U_BOOT_DST 0x00200000 +#define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 +#define CONFIG_SYS_NAND_U_BOOT_OFFS (256 << 10) +#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" +#define CONFIG_SPL_NAND_BOOT +#ifdef CONFIG_SPL_BUILD +#define CONFIG_SPL_SKIP_RELOCATE +#define CONFIG_SPL_COMMON_INIT_DDR +#define CONFIG_SYS_CCSR_DO_NOT_RELOCATE +#define CONFIG_SYS_NO_FLASH +#endif +#endif #endif #ifdef CONFIG_SRIO_PCIE_BOOT_SLAVE @@ -113,8 +146,8 @@ #elif defined(CONFIG_NAND) #define CONFIG_SYS_EXTRA_ENV_RELOC #define CONFIG_ENV_IS_IN_NAND -#define CONFIG_ENV_SIZE CONFIG_SYS_NAND_BLOCK_SIZE -#define CONFIG_ENV_OFFSET (7 * CONFIG_SYS_NAND_BLOCK_SIZE) +#define CONFIG_ENV_SIZE 0x2000 +#define CONFIG_ENV_OFFSET (10 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) #define CONFIG_ENV_IS_IN_REMOTE #define CONFIG_ENV_ADDR 0xffe20000 @@ -164,7 +197,16 @@ unsigned long get_board_ddr_clk(void); /* * Config the L3 Cache as L3 SRAM */ -#define CONFIG_SYS_INIT_L3_ADDR CONFIG_RAMBOOT_TEXT_BASE +#define CONFIG_SYS_INIT_L3_ADDR 0xFFFC0000 +#define CONFIG_SYS_L3_SIZE 256 << 10 +#define CONFIG_SPL_GD_ADDR (CONFIG_SYS_INIT_L3_ADDR + 32 * 1024) +#ifdef CONFIG_NAND +#define CONFIG_ENV_ADDR (CONFIG_SPL_GD_ADDR + 4 * 1024) +#endif +#define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SPL_GD_ADDR + 10 * 1024) +#define CONFIG_SPL_RELOC_MALLOC_SIZE (34 << 10) +#define CONFIG_SPL_RELOC_STACK (CONFIG_SPL_GD_ADDR + 64 * 1024) +#define CONFIG_SPL_RELOC_STACK_SIZE (20 << 10) #ifdef CONFIG_PHYS_64BIT #define CONFIG_SYS_DCSRBAR 0xf0000000 @@ -193,7 +235,9 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_DDR_SPD #define CONFIG_SYS_DDR_RAW_TIMING #define CONFIG_SYS_FSL_DDR3 +#ifndef CONFIG_SPL_BUILD #define CONFIG_FSL_DDR_INTERACTIVE +#endif #define CONFIG_SYS_SPD_BUS_NUM 0 #define SPD_EEPROM_ADDRESS1 0x51 @@ -381,7 +425,11 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_CS1_FTIM2 CONFIG_SYS_NOR_FTIM2 #define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NOR_FTIM3 -#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE +#ifdef CONFIG_SPL_BUILD +#define CONFIG_SYS_MONITOR_BASE CONFIG_SPL_TEXT_BASE +#else +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ +#endif #if defined(CONFIG_RAMBOOT_PBL) #define CONFIG_SYS_RAMBOOT @@ -435,7 +483,9 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NS16550_COM3 (CONFIG_SYS_CCSRBAR+0x11D500) #define CONFIG_SYS_NS16550_COM4 (CONFIG_SYS_CCSRBAR+0x11D600) #define CONFIG_SERIAL_MULTI /* Enable both serial ports */ +#ifndef CONFIG_SPL_BUILD #define CONFIG_SYS_CONSOLE_IS_IN_ENV /* determine from environment */ +#endif /* Use the HUSH parser */ @@ -607,7 +657,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_QE_FMAN_FW_ADDR (512 * 1130) #elif defined(CONFIG_NAND) #define CONFIG_SYS_QE_FMAN_FW_IN_NAND -#define CONFIG_SYS_QE_FMAN_FW_ADDR (8 * CONFIG_SYS_NAND_BLOCK_SIZE) +#define CONFIG_SYS_QE_FMAN_FW_ADDR (11 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) /* * Slave has no ucode locally, it can fetch this from remote. When implementing -- 1.7.9.5

2 3

[U-Boot] [PATCH] Revert "Start the deprecation process for generic board"
by Tom Rini 04 Apr '14

04 Apr '14

We've run into a non-trivial conversion to CONFIG_SYS_GENERIC_BOARD so we'll postpone this notice until right after v2014.04 is out. This reverts commit 36c4b1d98059244c34ec3327d9cc9f3c552fd01b. Signed-off-by: Tom Rini <trini(a)ti.com> --- common/main.c | 6 -- doc/README.generic-board | 189 ---------------------------------------------- 2 files changed, 195 deletions(-) delete mode 100644 doc/README.generic-board diff --git a/common/main.c b/common/main.c index e54f63b..8b6f274 100644 --- a/common/main.c +++ b/common/main.c @@ -427,12 +427,6 @@ void main_loop(void) bootstage_mark_name(BOOTSTAGE_ID_MAIN_LOOP, "main_loop"); -#ifndef CONFIG_SYS_GENERIC_BOARD - puts("Warning: Your board does not use generic board. Please read\n"); - puts("doc/README.generic-board and take action. Boards not\n"); - puts("upgraded by the late 2014 may break or be removed.\n"); -#endif - #ifdef CONFIG_MODEM_SUPPORT debug("DEBUG: main_loop: do_mdm_init=%d\n", do_mdm_init); if (do_mdm_init) { diff --git a/doc/README.generic-board b/doc/README.generic-board deleted file mode 100644 index 50d3a26..0000000 --- a/doc/README.generic-board +++ /dev/null @@ -1,189 +0,0 @@ -# -# (C) Copyright 2014 Google, Inc -# Simon Glass <sjg(a)chromium.org> -# -# SPDX-License-Identifier: GPL-2.0+ -# - -DEPRECATION NOTICE FOR arch/<arch>/lib/board.c - -For board maintainers: Please submit patches for boards you maintain before -July 2014, to make them use generic board. - -For architecture maintainers: Please submit patches to remove your -architecture-specific board.c file before October 2014. - - -Background ----------- - -U-Boot has tranditionally had a board.c file for each architecture. This has -introduced quite a lot of duplication, with each architecture tending to do -initialisation slightly differently. To address this, a new 'generic board -init' feature was introduced a year ago in March 2013 (further motivation is -provided in the cover letter below). - - -What has changed? ------------------ - -The main change is that the arch/<arch>/lib/board.c file is being removed in -favour of common/board_f.c (for pre-relocation init) and common/board_r.c -(for post-relocation init). - -Related to this, the global_data and bd_t structures now have a core set of -fields which are common to all architectures. Architecture-specific fields -have been moved to separate structures. - - -Supported Arcthitectures ------------------------- - -If you are unlucky then your architecture may not support generic board. -The following architectures are supported at the time of writing: - - arc - arm - powerpc - sandbox - x86 - -If your architecture is not supported, you need to adjust your -arch/<arch>/config.mk file to include: - - __HAVE_ARCH_GENERIC_BOARD := y - -and test it with a suitable board, as follows. - - -Adding Support for your Board ------------------------------ - -To enable generic board for your board, define CONFIG_SYS_GENERIC_BOARD in -your board config header file. - -Test that U-Boot still functions correctly on your board, and fix any -problems you find. Don't be surprised if there are no problems - generic -board has had a reasonable amount of testing with common boards. - - -DeadLine --------- - -Please don't take this the wrong way - there is no intent to make your life -miserable, and we have the greatest respect and admiration for U-Boot users. -However, with any migration there has to be a period where the old way is -deprecated and removed. Every patch to the deprecated code introduces a -potential breakage in the new unused code. Therefore: - -Boards or architectures not converted over to general board by the -end of 2014 may be forcibly changed over (potentially causing run-time -breakage) or removed. - - - -Further Background ------------------- - -The full text of the original generic board series is reproduced below. - ---8<------------- - -This series creates a generic board.c implementation which contains -the essential functions of the major arch/xxx/lib/board.c files. - -What is the motivation for this change? - -1. There is a lot of repeated code in the board.c files. Any change to -things like setting up the baud rate requires a change in 10 separate -places. - -2. Since there are 10 separate files, adding a new feature which requires -initialisation is painful since it must be independently added in 10 -places. - -3. As time goes by the architectures naturely diverge since there is limited -pressure to compare features or even CONFIG options against simiilar things -in other board.c files. - -4. New architectures must implement all the features all over again, and -sometimes in subtley different ways. This places an unfair burden on getting -a new architecture fully functional and running with U-Boot. - -5. While it is a bit of a tricky change, I believe it is worthwhile and -achievable. There is no requirement that all code be common, only that -the code that is common should be located in common/board.c rather than -arch/xxx/lib/board.c. - -All the functions of board_init_f() and board_init_r() are broken into -separate function calls so that they can easily be included or excluded -for a particular architecture. It also makes it easier to adopt Graeme's -initcall proposal when it is ready. - -http://lists.denx.de/pipermail/u-boot/2012-January/114499.html - -This series removes the dependency on generic relocation. So relocation -happens as one big chunk and is still completely arch-specific. See the -relocation series for a proposed solution to this for ARM: - -http://lists.denx.de/pipermail/u-boot/2011-December/112928.html - -or Graeme's recent x86 series v2: - -http://lists.denx.de/pipermail/u-boot/2012-January/114467.html - -Instead of moving over a whole architecture, this series takes the approach -of simply enabling generic board support for an architecture. It is then up -to each board to opt in by defining CONFIG_SYS_GENERIC_BOARD in the board -config file. If this is not done, then the code will be generated as -before. This allows both sets of code to co-exist until we are comfortable -with the generic approach, and enough boards run. - -ARM is a relatively large board.c file and one which I can test, therefore -I think it is a good target for this series. On the other hand, x86 is -relatively small and simple, but different enough that it introduces a -few issues to be solved. So I have chosen both ARM and x86 for this series. -After a suggestion from Wolfgang I have added PPC also. This is the -largest and most feature-full board, so hopefully we have all bases -covered in this RFC. - -A generic global_data structure is also required. This might upset a few -people. Here is my basic reasoning: most fields are the same, all -architectures include and need it, most global_data.h files already have -#ifdefs to select fields for a particular SOC, so it is hard to -see why architecures are different in this area. We can perhaps add a -way to put architecture-specific fields into a separate header file, but -for now I have judged that to be counter-productive. - -Similarly we need a generic bd_info structure, since generic code will -be accessing it. I have done this in the same way as global_data and the -same comments apply. - -There was dicussion on the list about passing gd_t around as a parameter -to pre-relocation init functions. I think this makes sense, but it can -be done as a separate change, and this series does not require it. - -While this series needs to stand on its own (as with the link script -cleanup series and the generic relocation series) the goal is the -unification of the board init code. So I hope we can address issues with -this in mind, rather than focusing too narrowly on particular ARM, x86 or -PPC issues. - -I have run-tested ARM on Tegra Seaboard only. To try it out, define -CONFIG_SYS_GENERIC_BOARD in your board file and rebuild. Most likely on -x86 and PPC at least it will hang, but if you are lucky it will print -something first :-) - -I have run this though MAKEALL with CONFIG_SYS_GENERIC_BOARD on for all -ARM, PPC and x86 boards. There are a few failures due to errors in -the board config, which I have sent patches for. The main issue is -just the difference between __bss_end and __bss_end__. - -Note: the first group of commits are required for this series to build, -but could be separated out if required. I have included them here for -convenience. - -------------->8-- - -Simon Glass, sjg(a)chromium.org -March 2014 -- 1.7.9.5

1 1

[U-Boot] [PATCH v5 0/9] Add support for keystone2 SoC and K2HK EVM
by Murali Karicheri 04 Apr '14

04 Apr '14

This patch set add support for Keystone2 SoC and K2HK EVM. Change history: v5 - Rebased to v2014.04-rc3 - Replaced reg_rmw() with clrsetbits_le32() - i2c Makefile update to add davinci_i2c sorted - simplified spi_cs_is_valid() in davinci_spi driver v4 - Added multibus support in i2c driver. Tested only on Keystone - Added comments to fdt patch v3 - Seperated network driver patches from the original series and and is now a different set as there are outstanding issues to be discussed and sorted out. Also the original series is ready for merge to upstream IMO. - Review comments incorporated. Following are the major comments addressed - Added KBUILD target for u-boot-spi.gph - Added bootup and flashing instructions in README - Cleaned up manually replacing #define <tab> with #define <space> - Cleaned up k2hk_evm.h include file to remove unnecessary options v2 - Review comments incorporated. Following are major comments addressed - split network driver to navigator driver + ethernet driver - replaced register base + offset implemenation with struct based register access implementation - Added Readme for NAND no subpage write option - re-use code for davinci i2c driver on keystone2 with updates - clock-k2hk.c merged to clock.c - currently keeping board specific getclk() command. See the thread for the rational. - Added update to davinci spi driver to re-use on keystone v1 - added separate patch for sorting tools/Makefile entries - reworked gpimage patch to allow more re-use across omapimage/gpimage - dropped patch related to ubifs file size - added keystone SoC and K2HK EVM support v0 - preparatory patch for keystone Murali Karicheri (5): tools: mkimage: add support for gpimage format NAND: DaVinci: allow forced disable of subpage writes i2c, davinci: move i2c_defs.h to the drivers/i2c directory spi: davinci: add support for multiple bus and chip select k2hk-evm: add configuration for spi1 and spi2 support Vitaly Andrianov (4): fdt: call ft_board_setup_ex() at the end of image_setup_libfdt() arm: add support for arch timer i2c, davinci: convert driver to new mutlibus/mutliadapter framework k2hk: add support for k2hk SOC and EVM Makefile | 10 + README | 5 + arch/arm/cpu/arm926ejs/davinci/dm355.c | 2 +- arch/arm/cpu/arm926ejs/davinci/dm365.c | 2 +- arch/arm/cpu/arm926ejs/davinci/dm644x.c | 2 +- arch/arm/cpu/arm926ejs/davinci/dm646x.c | 2 +- arch/arm/cpu/armv7/keystone/Makefile | 17 + arch/arm/cpu/armv7/keystone/aemif.c | 71 ++++ arch/arm/cpu/armv7/keystone/clock.c | 318 ++++++++++++++++ arch/arm/cpu/armv7/keystone/cmd_clock.c | 124 ++++++ arch/arm/cpu/armv7/keystone/cmd_mon.c | 131 +++++++ arch/arm/cpu/armv7/keystone/ddr3.c | 69 ++++ arch/arm/cpu/armv7/keystone/init.c | 56 +++ arch/arm/cpu/armv7/keystone/msmc.c | 68 ++++ arch/arm/cpu/armv7/keystone/psc.c | 238 ++++++++++++ arch/arm/cpu/armv7/keystone/spl.c | 45 +++ arch/arm/include/asm/arch-davinci/i2c_defs.h | 71 +--- arch/arm/include/asm/arch-keystone/clock-k2hk.h | 109 ++++++ arch/arm/include/asm/arch-keystone/clock.h | 17 + arch/arm/include/asm/arch-keystone/clock_defs.h | 111 ++++++ arch/arm/include/asm/arch-keystone/emif_defs.h | 73 ++++ arch/arm/include/asm/arch-keystone/hardware-k2hk.h | 150 ++++++++ arch/arm/include/asm/arch-keystone/hardware.h | 175 +++++++++ arch/arm/include/asm/arch-keystone/i2c_defs.h | 17 + arch/arm/include/asm/arch-keystone/nand_defs.h | 23 ++ arch/arm/include/asm/arch-keystone/psc_defs.h | 90 +++++ arch/arm/include/asm/arch-keystone/spl.h | 12 + arch/arm/lib/Makefile | 1 + arch/arm/lib/arch_timer.c | 58 +++ board/ti/k2hk_evm/Makefile | 9 + board/ti/k2hk_evm/README | 122 ++++++ board/ti/k2hk_evm/board.c | 236 ++++++++++++ board/ti/k2hk_evm/ddr3.c | 269 +++++++++++++ boards.cfg | 1 + common/image-fdt.c | 5 + common/image.c | 1 + drivers/i2c/Makefile | 2 +- drivers/i2c/davinci_i2c.c | 402 ++++++++++++-------- drivers/i2c/davinci_i2c.h | 78 ++++ drivers/mtd/nand/davinci_nand.c | 3 + drivers/serial/ns16550.c | 8 + drivers/spi/davinci_spi.c | 49 ++- drivers/spi/davinci_spi.h | 33 ++ include/configs/cam_enc_4xx.h | 8 +- include/configs/da830evm.h | 8 +- include/configs/da850evm.h | 8 +- include/configs/davinci_dm355evm.h | 8 +- include/configs/davinci_dm355leopard.h | 8 +- include/configs/davinci_dm365evm.h | 8 +- include/configs/davinci_dm6467evm.h | 8 +- include/configs/davinci_dvevm.h | 8 +- include/configs/davinci_schmoogie.h | 8 +- include/configs/davinci_sffsdr.h | 8 +- include/configs/davinci_sonata.h | 8 +- include/configs/ea20.h | 7 +- include/configs/enbw_cmc.h | 8 +- include/configs/k2hk_evm.h | 221 +++++++++++ include/fdt_support.h | 7 + include/image.h | 1 + tools/Makefile | 2 + tools/gpheader.h | 40 ++ tools/gpimage-common.c | 80 ++++ tools/gpimage.c | 77 ++++ tools/imagetool.c | 2 + tools/imagetool.h | 1 + tools/omapimage.c | 104 +---- tools/omapimage.h | 5 - 67 files changed, 3541 insertions(+), 387 deletions(-) create mode 100644 arch/arm/cpu/armv7/keystone/Makefile create mode 100644 arch/arm/cpu/armv7/keystone/aemif.c create mode 100644 arch/arm/cpu/armv7/keystone/clock.c create mode 100644 arch/arm/cpu/armv7/keystone/cmd_clock.c create mode 100644 arch/arm/cpu/armv7/keystone/cmd_mon.c create mode 100644 arch/arm/cpu/armv7/keystone/ddr3.c create mode 100644 arch/arm/cpu/armv7/keystone/init.c create mode 100644 arch/arm/cpu/armv7/keystone/msmc.c create mode 100644 arch/arm/cpu/armv7/keystone/psc.c create mode 100644 arch/arm/cpu/armv7/keystone/spl.c create mode 100644 arch/arm/include/asm/arch-keystone/clock-k2hk.h create mode 100644 arch/arm/include/asm/arch-keystone/clock.h create mode 100644 arch/arm/include/asm/arch-keystone/clock_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/emif_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/hardware-k2hk.h create mode 100644 arch/arm/include/asm/arch-keystone/hardware.h create mode 100644 arch/arm/include/asm/arch-keystone/i2c_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/nand_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/psc_defs.h create mode 100644 arch/arm/include/asm/arch-keystone/spl.h create mode 100644 arch/arm/lib/arch_timer.c create mode 100644 board/ti/k2hk_evm/Makefile create mode 100644 board/ti/k2hk_evm/README create mode 100644 board/ti/k2hk_evm/board.c create mode 100644 board/ti/k2hk_evm/ddr3.c create mode 100644 drivers/i2c/davinci_i2c.h create mode 100644 include/configs/k2hk_evm.h create mode 100644 tools/gpheader.h create mode 100644 tools/gpimage-common.c create mode 100644 tools/gpimage.c -- 1.7.9.5

6 15

[U-Boot] [PATCH 1/8] imx-common: add board_video_skip
by Eric Bénard 04 Apr '14

04 Apr '14

this function is shared by several board and thus can be factorized Signed-off-by: Eric Bénard <eric(a)eukrea.com> --- arch/arm/imx-common/Makefile | 1 + arch/arm/imx-common/video.c | 55 +++++++++++++++++++++++++++++++++ arch/arm/include/asm/imx-common/video.h | 20 ++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 arch/arm/imx-common/video.c create mode 100644 arch/arm/include/asm/imx-common/video.h diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index 16809fe..2a7fc42 100644 --- a/arch/arm/imx-common/Makefile +++ b/arch/arm/imx-common/Makefile @@ -19,6 +19,7 @@ obj-y += misc.o endif ifeq ($(SOC),$(filter $(SOC),mx6)) obj-$(CONFIG_CMD_SATA) += sata.o +obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o endif obj-$(CONFIG_CMD_BMODE) += cmd_bmode.o obj-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c new file mode 100644 index 0000000..8db5a84 --- /dev/null +++ b/arch/arm/imx-common/video.c @@ -0,0 +1,55 @@ +/* + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/errno.h> +#include <asm/imx-common/video.h> + +extern struct display_info_t const displays[]; +extern size_t display_number; + +int board_video_skip(void) +{ + int i; + int ret; + char const *panel = getenv("panel"); + if (!panel) { + for (i = 0; i < display_number; i++) { + struct display_info_t const *dev = displays+i; + if (dev->detect && dev->detect(dev)) { + panel = dev->mode.name; + printf("auto-detected panel %s\n", panel); + break; + } + } + if (!panel) { + panel = displays[0].mode.name; + printf("No panel detected: default to %s\n", panel); + i = 0; + } + } else { + for (i = 0; i < display_number; i++) { + if (!strcmp(panel, displays[i].mode.name)) + break; + } + } + if (i < display_number) { + ret = ipuv3_fb_init(&displays[i].mode, 0, + displays[i].pixfmt); + if (!ret) { + displays[i].enable(displays+i); + printf("Display: %s (%ux%u)\n", + displays[i].mode.name, + displays[i].mode.xres, + displays[i].mode.yres); + } else + printf("LCD %s cannot be configured: %d\n", + displays[i].mode.name, ret); + } else { + printf("unsupported panel %s\n", panel); + return -EINVAL; + } + + return 0; +} diff --git a/arch/arm/include/asm/imx-common/video.h b/arch/arm/include/asm/imx-common/video.h new file mode 100644 index 0000000..e0c4ef4 --- /dev/null +++ b/arch/arm/include/asm/imx-common/video.h @@ -0,0 +1,20 @@ +/* + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __IMX_VIDEO_H_ +#define __IMX_VIDEO_H_ + +#include <linux/fb.h> +#include <ipu_pixfmt.h> + +struct display_info_t { + int bus; + int addr; + int pixfmt; + int (*detect)(struct display_info_t const *dev); + void (*enable)(struct display_info_t const *dev); + struct fb_videomode mode; +}; + +#endif -- 1.9.0

4 13

[U-Boot] [PATCH] 2c: modify i2c_read API to handle multi-bytes writes
by Shaveta Leekha 04 Apr '14

04 Apr '14

Most of the I2C slaves support accesses in the typical style viz.read/write series of bytes at particular address offset. These transactions are currently supportd in the i2c driver using i2c_read and i2c_write APIs. I2C EEPROMs, RTC, etc fall in this category. The transactions look like:" START:Address:Tx:Offset:RESTART:Address[0..4]:Tx/Rx:data[0..n]:STOP" However there are certain devices which support accesses in terms of the transactions as follows: "START:Address:Tx:Txdata[0..n1]:Clock_stretching: RESTART:Address:Rx:data[0..n2]" The Txdata is typically a command and some associated data, similarly Rxdata could be command status plus some data received as a response to the command sent. i2c_read() function has been modified to handle both types of transactions: the one that writes only offset/address before read and other that writes some bytes(more than 4 bytes) before read To handle the case: Negative equivalent of length has been passed and interpreted accordinglt and txdata is being passed in rxdata buffer Signed-off-by: Shaveta Leekha <shaveta(a)freescale.com> Signed-off-by: Poonam Aggrwal <poonam.aggrwal(a)freescale.com> --- drivers/i2c/fsl_i2c.c | 40 +++++++++++++++++++++++++++++++--------- 1 files changed, 31 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index 291ad94..14c66d0 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -424,17 +424,39 @@ fsl_i2c_read(struct i2c_adapter *adap, u8 dev, uint addr, int alen, u8 *data, int i = -1; /* signal error */ u8 *a = (u8*)&addr; - if (i2c_wait4bus(adap) < 0) - return -1; + if (alen < 0) { + int len = alen * -1; + if (i2c_wait4bus(adap) < 0) + return -1; + + /* Generate a START and send the Address and + * the Tx Bytes to the slave. + * "START: Address: Write bytes wdata[wlength]" + * It supports writing any number of bytes in contrast + * to the else part, which supports writing address offset + * of upto 4 bytes only. + */ + if (i2c_write_addr(adap, dev, I2C_WRITE_BIT, 0) != 0) + i = __i2c_write(adap, data, len); + + if (i != len) + return -1; + + if (length && i2c_write_addr(adap, dev, I2C_READ_BIT, 1) != 0) + i = __i2c_read(adap, data, length); + } else { + if (i2c_wait4bus(adap) < 0) + return -1; - if ((!length || alen > 0) - && i2c_write_addr(adap, dev, I2C_WRITE_BIT, 0) != 0 - && __i2c_write(adap, &a[4 - alen], alen) == alen) - i = 0; /* No error so far */ + if ((!length || alen > 0) && + i2c_write_addr(adap, dev, I2C_WRITE_BIT, 0) != 0 && + __i2c_write(adap, &a[4 - alen], alen) == alen) + i = 0; /* No error so far */ - if (length && - i2c_write_addr(adap, dev, I2C_READ_BIT, alen ? 1 : 0) != 0) - i = __i2c_read(adap, data, length); + if (length && + i2c_write_addr(adap, dev, I2C_READ_BIT, alen ? 1 : 0) != 0) + i = __i2c_read(adap, data, length); + } writeb(I2C_CR_MEN, &device->cr); -- 1.7.6.GIT

2 1

[U-Boot] altera socfpga: mmc boot fails as soon as I enable DEBUG
by Pavel Machek 04 Apr '14

04 Apr '14

Hi! With #define DEBUG disabled, u-boot can load kernel/dtb from the MMC card just fine. As soon as I enable DEBUG, boot fails, and not even hardware reset helps. (It looks like MMC card itself locks up). If I unplug/replug card _and_ reset, machine recovers. This is on EBV socrates, but IIRC people seen it on sockit, too. Any ideas what might be wrong? Thanks, Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

1 0

[U-Boot] [PATCH 1/2] arm: mxs: Adjust the load address of U-Boot and SPL for HAB
by Marek Vasut 04 Apr '14

04 Apr '14

When using HAB, there are additional special requirements on the placement of U-Boot and the U-Boot SPL in memory. To fullfill these, this patch moves the U-Boot binary a little further from the begining of the DRAM, so the HAB CST and IVT can be placed in front of the U-Boot binary. This is necessary, since both the U-Boot and the IVT must be contained in single CST signature. To make things worse, the IVT must be concatenated with one more entry at it's end, that is the length of the entire CST signature, IVT and U-Boot binary in memory. By placing the blocks in this order -- CST, IVT, U-Boot, we can easily align them all and then produce the length field as needed. As for the SPL, on i.MX23/i.MX28, the SPL size is limited to 32 KiB, thus we place the IVT at 0x8000 offset, CST right past IVT and claim the size is correct. The HAB library accepts this setup. Finally, to make sure the vectoring in SPL still works even after moving the SPL from 0x0 to 0x1000, we add a small function which copies the vectoring code and tables to 0x0. This is fine, since the vectoring code is position independent. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Stefano Babic <sbabic(a)denx.de> --- arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg | 8 ++++---- arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg | 8 ++++---- arch/arm/cpu/arm926ejs/mxs/spl_boot.c | 14 ++++++++++++++ arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds | 2 +- include/configs/mxs.h | 10 +++++++++- 5 files changed, 32 insertions(+), 10 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg index 8118767..55510e9 100644 --- a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg +++ b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg @@ -1,6 +1,6 @@ SECTION 0x0 BOOTABLE TAG LAST - LOAD 0x0 spl/u-boot-spl.bin - CALL 0x14 0x0 - LOAD 0x40000100 u-boot.bin - CALL 0x40000100 0x0 + LOAD 0x1000 spl/u-boot-spl.bin + CALL 0x1000 0x0 + LOAD 0x40002000 u-boot.bin + CALL 0x40002000 0x0 diff --git a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg index ea772f0..bb78cb0 100644 --- a/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg +++ b/arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg @@ -1,8 +1,8 @@ SECTION 0x0 BOOTABLE TAG LAST - LOAD 0x0 spl/u-boot-spl.bin - LOAD IVT 0x8000 0x14 + LOAD 0x1000 spl/u-boot-spl.bin + LOAD IVT 0x8000 0x1000 CALL HAB 0x8000 0x0 - LOAD 0x40000100 u-boot.bin - LOAD IVT 0x8000 0x40000100 + LOAD 0x40002000 u-boot.bin + LOAD IVT 0x8000 0x40002000 CALL HAB 0x8000 0x0 diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c index 58ff8db..db37908 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c @@ -117,6 +117,18 @@ static void mxs_spl_console_init(void) #endif } +static void mxs_spl_fixup_vectors(void) +{ + /* + * Copy our vector table to 0x0, since due to HAB, we cannot + * be loaded to 0x0. We want to have working vectoring though, + * thus this fixup. Our vectoring table is PIC, so copying is + * fine. + */ + extern uint32_t _start; + memcpy(0x0, &_start, 0x60); +} + void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr, const iomux_cfg_t *iomux_setup, const unsigned int iomux_size) @@ -126,6 +138,8 @@ void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr, uint8_t bootmode = mxs_get_bootmode_index(); gd = &gdata; + mxs_spl_fixup_vectors(); + mxs_iomux_setup_multiple_pads(iomux_setup, iomux_size); mxs_spl_console_init(); diff --git a/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds index d0b482d..f4bf8ac 100644 --- a/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds +++ b/arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds @@ -16,7 +16,7 @@ OUTPUT_ARCH(arm) ENTRY(_start) SECTIONS { - . = 0x00000000; + . = CONFIG_SPL_TEXT_BASE; . = ALIGN(4); .text : diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 55ecef9..a9f4d89 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -80,8 +80,16 @@ * We need to sacrifice first 4 bytes of RAM here to avoid triggering some * strange BUG in ROM corrupting first 4 bytes of RAM when loading U-Boot * binary. In case there was more of this mess, 0x100 bytes are skipped. + * + * In case of a HAB boot, we cannot for some weird reason use the first 4KiB + * of DRAM when loading. Moreover, we use the first 4 KiB for IVT and CST + * blocks, thus U-Boot starts at offset +8 KiB of DRAM start. + * + * As for the SPL, we must avoid the first 4 KiB as well, but we load the + * IVT and CST to 0x8000, so we don't need to waste the subsequent 4 KiB. */ -#define CONFIG_SYS_TEXT_BASE 0x40000100 +#define CONFIG_SYS_TEXT_BASE 0x40002000 +#define CONFIG_SPL_TEXT_BASE 0x00001000 /* U-Boot general configuration */ #define CONFIG_SYS_LONGHELP -- 1.9.0

2 4