January 2014 - U-Boot

[U-Boot] [PATCH v7 00/26] pmic: Redesign PMIC framework to support multiple instances of devices
by Lukasz Majewski 18 Apr '14

18 Apr '14

PMIC framework has been redesigned to support multiple instances of power related devices (e.g. fuel gauge, PMICs, chargers, micro USB IC, battery). Due to that, code at other architectures and boards have been adjusted properly. New power_init_board() method at ./lib/board.c file has been introduced. It is meant to be an architecture dependent function to support advanced power management. Since PMIC framework uses lists internally to link different devices, its initialization must be done just after malloc initialization. Please consider commits from this patch set as the example of advanced power management for a particular HW (Trats board in this case). In the new approach PMICs are selected with their names (e.g. 'pmic dump MAX8997_PMIC') Presented patch set is a first step to change 'pmic' command to more generic (i.e. power) to provide control for multiple devices. Moreover device's battery is treated as an oridinary "power" device (like PMIC). Due to that, framework unification is possible. For even more versalite design, each power device instance can specify its parent. For trats one can build a following scheme (it can de different for other boards): ----------------- --------| BAT |------------ | | | | | ----------------- | | | | \|/ \|/ \|/ ----------- ----------------- --------- |FG | |MUIC | |CHRG | | | | | | | ----------- ----------------- --------- Finally, this patch series also comprises of a "namespace" cleanup - an attempt to rename "pmic" to "power" to better reflect generality of this framework. Test HW: - Exynos4210 Trats development board - Exynos3 (C110) Goni development board Lukasz Majewski (26): pmic:i2c: Handle PMIC I2C transmission comprising of two bytes pmic:i2c: Add I2C sensor byte order (big/little) to PMIC framework pmic:max8997: Switch the MAX8997 PMIC to be used with multibus I2C pmic: Extend PMIC framework to support multiple instances of PMIC devices pmic: Introduce power_init_board() method at ./lib/board.c file pmic: Enable power_board_init() support at TRATS pmic:chrg: Common information about charger and battery (power_chrg.h) pmic: Move pmic related code to ./drivers/power directory pmic: Extend struct pmic to support battery and charger related operations pmic:battery: Support for Trats Battery at PMIC framework pmic:muic: Support for MUIC built into MAX8997 device pmic:fuel-gauge: Support for MAX17042 fuel-gauge pmic:max8997: Function for calculating LDO internal register value arm:trats:pmic: Default PMIC(MAX8997) initialization for Samsung's TRATS board arm:trats:pmic: Enable MUIC (MAX8997) at Samsung's TRATS board arm:trats:pmic: Enable fuel-gauge (MAX17042) at Samsung's TRATS board arm:trats:pmic: Enable battery support at Samsung's TRATS board pmic:max8997: Support for MAX8997 internal charger control arm:trats:pmic: Power consumption reduction state for Samsung's TRATS board arm:trats:pmic: Support for charging battery at Samsung's TRATS board pmic: Extend PMIC framework to support battery related commands power:pmic: Rename ./drivers/power/pmic_* to ./drivers/power/power_* files power:pmic: Rename CONFIG_PMIC* defines to CONFIG_POWER power:pmic: Rename CONFIG_DIALOG_PMIC defines to CONFIG_DIALOG_POWER arm:goni:pmic: Adjust GONI target platform board to new PMIC framework arm:universal_c210:pmic: Adjust C210 Universal target platform board to new PMIC framework Makefile | 5 +- arch/arm/lib/board.c | 8 + board/davedenx/qong/qong.c | 12 +- board/freescale/mx31pdk/mx31pdk.c | 12 +- board/freescale/mx35pdk/mx35pdk.c | 14 +- board/freescale/mx51evk/mx51evk.c | 12 +- board/freescale/mx53evk/mx53evk.c | 12 +- board/freescale/mx53loco/mx53loco.c | 21 +- board/genesi/mx51_efikamx/efikamx.c | 12 +- board/hale/tt01/tt01.c | 14 +- board/samsung/goni/goni.c | 22 +- board/samsung/trats/trats.c | 292 +++++++++++++++++++- board/samsung/universal_c210/universal.c | 27 ++- board/ttcontrol/vision2/vision2.c | 12 +- drivers/misc/Makefile | 7 - drivers/misc/pmic_core.c | 147 ---------- drivers/misc/pmic_i2c.c | 98 ------- drivers/misc/pmic_max8997.c | 43 --- drivers/power/Makefile | 12 +- drivers/power/battery/Makefile | 47 ++++ drivers/power/battery/bat_trats.c | 100 +++++++ drivers/power/fuel_gauge/Makefile | 47 ++++ drivers/power/fuel_gauge/fg_max17042.c | 250 +++++++++++++++++ drivers/power/pmic/Makefile | 49 ++++ drivers/power/pmic/muic_max8997.c | 90 ++++++ drivers/power/pmic/pmic_max8997.c | 123 ++++++++ drivers/{misc => power/pmic}/pmic_max8998.c | 16 +- drivers/power/power_core.c | 232 ++++++++++++++++ .../{misc/pmic_dialog.c => power/power_dialog.c} | 14 +- drivers/{misc/pmic_fsl.c => power/power_fsl.c} | 22 +- drivers/power/power_i2c.c | 125 +++++++++ drivers/{misc/pmic_spi.c => power/power_spi.c} | 4 +- drivers/rtc/mc13xxx-rtc.c | 10 +- include/configs/imx31_litekit.h | 6 +- include/configs/mx31ads.h | 6 +- include/configs/mx31pdk.h | 6 +- include/configs/mx35pdk.h | 6 +- include/configs/mx51_efikamx.h | 6 +- include/configs/mx51evk.h | 6 +- include/configs/mx53evk.h | 6 +- include/configs/mx53loco.h | 8 +- include/configs/qong.h | 6 +- include/configs/s5p_goni.h | 6 +- include/configs/s5pc210_universal.h | 6 +- include/configs/trats.h | 14 +- include/configs/tt01.h | 6 +- include/configs/vision2.h | 6 +- include/pmic.h | 72 ----- include/power/battery.h | 38 +++ include/power/fg_battery_cell_params.h | 90 ++++++ include/power/max17042_fg.h | 74 +++++ include/power/max8997_muic.h | 61 ++++ include/{ => power}/max8997_pmic.h | 26 ++- include/{ => power}/max8998_pmic.h | 0 include/power/pmic.h | 109 ++++++++ include/power/power_chrg.h | 43 +++ 56 files changed, 2027 insertions(+), 491 deletions(-) delete mode 100644 drivers/misc/pmic_core.c delete mode 100644 drivers/misc/pmic_i2c.c delete mode 100644 drivers/misc/pmic_max8997.c create mode 100644 drivers/power/battery/Makefile create mode 100644 drivers/power/battery/bat_trats.c create mode 100644 drivers/power/fuel_gauge/Makefile create mode 100644 drivers/power/fuel_gauge/fg_max17042.c create mode 100644 drivers/power/pmic/Makefile create mode 100644 drivers/power/pmic/muic_max8997.c create mode 100644 drivers/power/pmic/pmic_max8997.c rename drivers/{misc => power/pmic}/pmic_max8998.c (82%) create mode 100644 drivers/power/power_core.c rename drivers/{misc/pmic_dialog.c => power/power_dialog.c} (81%) rename drivers/{misc/pmic_fsl.c => power/power_fsl.c} (81%) create mode 100644 drivers/power/power_i2c.c rename drivers/{misc/pmic_spi.c => power/power_spi.c} (97%) delete mode 100644 include/pmic.h create mode 100644 include/power/battery.h create mode 100644 include/power/fg_battery_cell_params.h create mode 100644 include/power/max17042_fg.h create mode 100644 include/power/max8997_muic.h rename include/{ => power}/max8997_pmic.h (88%) rename include/{ => power}/max8998_pmic.h (100%) create mode 100644 include/power/pmic.h create mode 100644 include/power/power_chrg.h -- 1.7.2.3

4 30

[U-Boot] [PATCH] arm: Handle .gnu.hash section in ldscripts
by Andreas Färber 07 Apr '14

07 Apr '14

Avoids "could not find output section .gnu.hash" ld.bfd errors on openSUSE. Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> Cc: Tom Rini <trini(a)ti.com> Signed-off-by: Andreas Färber <afaerber(a)suse.de> --- More changes like this may be needed, but these I compile-tested with v2014.01 (regression from v2013.10). colibri_t20_iris was runtime-tested. GCC 4.8.2 r206511, binutils 2.24 arch/arm/cpu/u-boot.lds | 1 + board/ti/am335x/u-boot.lds | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/cpu/u-boot.lds b/arch/arm/cpu/u-boot.lds index 4da5d24..fb8bfaf 100644 --- a/arch/arm/cpu/u-boot.lds +++ b/arch/arm/cpu/u-boot.lds @@ -97,6 +97,7 @@ SECTIONS .dynamic : { *(.dynamic*) } .plt : { *(.plt*) } .interp : { *(.interp*) } + .gnu.hash : { *(.gnu.hash) } .gnu : { *(.gnu*) } .ARM.exidx : { *(.ARM.exidx*) } .gnu.linkonce.armexidx : { *(.gnu.linkonce.armexidx.*) } diff --git a/board/ti/am335x/u-boot.lds b/board/ti/am335x/u-boot.lds index 6a734b3..fec4ccf 100644 --- a/board/ti/am335x/u-boot.lds +++ b/board/ti/am335x/u-boot.lds @@ -113,6 +113,7 @@ SECTIONS .dynstr : { *(.dynstr*) } .dynamic : { *(.dynamic*) } .hash : { *(.hash*) } + .gnu.hash : { *(.gnu.hash) } .plt : { *(.plt*) } .interp : { *(.interp*) } .gnu : { *(.gnu*) } -- 1.8.4

7 27

[U-Boot] [PATCH 00/11] arm: add Faraday A36x SoC platform support
by Kuo-Jung Su 07 Apr '14

07 Apr '14

From: Kuo-Jung Su <dantesu(a)faraday-tech.com> These patches introduce Faraday A36x SoC platform support. Here are some public documents for your reference. http://www.faraday-tech.com/html/documentation/index.html There is also a A369 QEMU emulator available at my github account: https://github.com/dantesu1218/qemu.git Here is quick start for QEMU: 1. Download the QEMU source tree $ git clone -b qemu-1.3.0 https://github.com/dantesu1218/qemu.git 2. Build & Install the QEMU: $ ./configure --target-list=arm-softmmu $ make $ make install 3. Launch u-boot with QEMU: $ qemu-system-arm -M a369 -m 512M -nographic -kernel ~/u-boot-2012.10/u-boot Kuo-Jung Su (11): arm: add MMU/d-cache support for Faraday cores net/ftgmac100: add MMU/D-cache support net: add FTMAC110 10/100Mbps ethernet support usb-ehci: add Faraday USB 2.0 EHCI controller support usb-gadget: add FOTG210 USB gadget support i2c: add FTI2C010 I2C controller support spi: add FTSPI010 SPI controller support mtd/nand: add FTNANDC021 NAND flash controller support mtd/spi: add FTSPI020 SPI Flash controller support mmc: add an alternative FTSDC010 driver support arm: add Faraday A36x SoC platform support arch/arm/cpu/faraday/Makefile | 57 ++ arch/arm/cpu/faraday/a360/Makefile | 49 ++ arch/arm/cpu/faraday/a360/reset.c | 22 + arch/arm/cpu/faraday/a369/Makefile | 50 ++ arch/arm/cpu/faraday/a369/cmd_fa606.c | 74 +++ arch/arm/cpu/faraday/a369/reset.c | 22 + arch/arm/cpu/faraday/cmd_bootfa.c | 121 ++++ arch/arm/cpu/faraday/config.mk | 33 + arch/arm/cpu/faraday/cpu.c | 230 +++++++ arch/arm/cpu/faraday/ftpwmtmr010.c | 165 +++++ arch/arm/cpu/faraday/fttmr010.c | 155 +++++ arch/arm/cpu/faraday/fwimage.h | 38 ++ arch/arm/cpu/faraday/fwimage2.h | 70 +++ arch/arm/cpu/faraday/interrupts.c | 169 ++++++ arch/arm/cpu/faraday/start.S | 535 +++++++++++++++++ arch/arm/cpu/u-boot.lds | 11 + arch/arm/include/asm/arch-a360/hardware.h | 80 +++ arch/arm/include/asm/arch-a369/hardware.h | 106 ++++ arch/arm/include/asm/dma-mapping.h | 55 +- arch/arm/include/asm/global_data.h | 4 + arch/arm/include/asm/io.h | 75 +++ arch/arm/include/asm/mach-types.h | 1 + arch/arm/lib/cache-cp15.c | 44 ++ board/faraday/a360evb/Makefile | 49 ++ board/faraday/a360evb/board.c | 65 ++ board/faraday/a360evb/clk.c | 48 ++ board/faraday/a360evb/config.mk | 33 + board/faraday/a360evb/lowlevel_init.S | 33 + board/faraday/a369evb/Makefile | 49 ++ board/faraday/a369evb/board.c | 182 ++++++ board/faraday/a369evb/clk.c | 80 +++ board/faraday/a369evb/config.mk | 33 + board/faraday/a369evb/lowlevel_init.S | 133 +++++ boards.cfg | 3 + common/cmd_boot.c | 4 + common/usb_hub.c | 5 + drivers/i2c/Makefile | 1 + drivers/i2c/fti2c010.c | 360 +++++++++++ drivers/i2c/fti2c010.h | 68 +++ drivers/mmc/Makefile | 1 + drivers/mmc/ftsdc010_mci.c | 362 +++++++++++ drivers/mmc/ftsdc010_mci.h | 91 +++ drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/ftnandc021.c | 550 +++++++++++++++++ drivers/mtd/nand/ftnandc021.h | 165 +++++ drivers/mtd/spi/Makefile | 4 + drivers/mtd/spi/ftspi020.c | 589 ++++++++++++++++++ drivers/mtd/spi/ftspi020.h | 118 ++++ drivers/mtd/spi/winbond.c | 17 +- drivers/net/Makefile | 1 + drivers/net/ftgmac100.c | 83 ++- drivers/net/ftmac110.c | 484 +++++++++++++++ drivers/net/ftmac110.h | 131 ++++ drivers/spi/Makefile | 1 + drivers/spi/ftssp010_spi.c | 333 +++++++++++ drivers/spi/ftssp010_spi.h | 85 +++ drivers/usb/gadget/Makefile | 1 + drivers/usb/gadget/fotg210.c | 926 +++++++++++++++++++++++++++++ drivers/usb/gadget/fotg210.h | 99 +++ drivers/usb/gadget/gadget_chips.h | 8 + drivers/usb/host/Makefile | 1 + drivers/usb/host/ehci-faraday.c | 157 +++++ drivers/usb/host/ehci-hcd.c | 11 + drivers/usb/host/ehci.h | 5 + include/common.h | 13 + include/configs/a360.h | 180 ++++++ include/configs/a369.h | 40 ++ include/configs/a369_defaults.h | 285 +++++++++ include/configs/a369_fa606te.h | 32 + include/faraday/fttmr010.h | 51 +- include/faraday/ftwdt010_wdt.h | 8 + 71 files changed, 8110 insertions(+), 35 deletions(-) create mode 100644 arch/arm/cpu/faraday/Makefile create mode 100644 arch/arm/cpu/faraday/a360/Makefile create mode 100644 arch/arm/cpu/faraday/a360/reset.c create mode 100644 arch/arm/cpu/faraday/a369/Makefile create mode 100644 arch/arm/cpu/faraday/a369/cmd_fa606.c create mode 100644 arch/arm/cpu/faraday/a369/reset.c create mode 100644 arch/arm/cpu/faraday/cmd_bootfa.c create mode 100644 arch/arm/cpu/faraday/config.mk create mode 100644 arch/arm/cpu/faraday/cpu.c create mode 100644 arch/arm/cpu/faraday/ftpwmtmr010.c create mode 100644 arch/arm/cpu/faraday/fttmr010.c create mode 100644 arch/arm/cpu/faraday/fwimage.h create mode 100644 arch/arm/cpu/faraday/fwimage2.h create mode 100644 arch/arm/cpu/faraday/interrupts.c create mode 100644 arch/arm/cpu/faraday/start.S create mode 100644 arch/arm/include/asm/arch-a360/hardware.h create mode 100644 arch/arm/include/asm/arch-a369/hardware.h create mode 100644 board/faraday/a360evb/Makefile create mode 100644 board/faraday/a360evb/board.c create mode 100644 board/faraday/a360evb/clk.c create mode 100644 board/faraday/a360evb/config.mk create mode 100644 board/faraday/a360evb/lowlevel_init.S create mode 100644 board/faraday/a369evb/Makefile create mode 100644 board/faraday/a369evb/board.c create mode 100644 board/faraday/a369evb/clk.c create mode 100644 board/faraday/a369evb/config.mk create mode 100644 board/faraday/a369evb/lowlevel_init.S create mode 100644 drivers/i2c/fti2c010.c create mode 100644 drivers/i2c/fti2c010.h create mode 100644 drivers/mmc/ftsdc010_mci.c create mode 100644 drivers/mmc/ftsdc010_mci.h create mode 100644 drivers/mtd/nand/ftnandc021.c create mode 100644 drivers/mtd/nand/ftnandc021.h create mode 100644 drivers/mtd/spi/ftspi020.c create mode 100644 drivers/mtd/spi/ftspi020.h create mode 100644 drivers/net/ftmac110.c create mode 100644 drivers/net/ftmac110.h create mode 100644 drivers/spi/ftssp010_spi.c create mode 100644 drivers/spi/ftssp010_spi.h create mode 100644 drivers/usb/gadget/fotg210.c create mode 100644 drivers/usb/gadget/fotg210.h create mode 100644 drivers/usb/host/ehci-faraday.c create mode 100644 include/configs/a360.h create mode 100644 include/configs/a369.h create mode 100644 include/configs/a369_defaults.h create mode 100644 include/configs/a369_fa606te.h -- 1.7.9.5

12 310

[U-Boot] [PATCH 2/2] T1040QDS: Add support of 2 stage SPI bootloader
by Priyanka Jain 26 Mar '14

26 Mar '14

Add support of 2-stage T1040QDS SPI bootloader using SPL framework. In this, PBL (hardware) initializes SRAM (256K) and copy SPL (192K) from SPI flash to SRAM and transfer control to SPL. This SPL bootloader furthur initializes DDR using SPD and environment and copy final u-boot image (512K) from SPI flash to DDR and transfer control to final u-boot. Signed-off-by: Priyanka Jain <Priyanka.Jain(a)freescale.com> --- Based on u-boot-mpc85xx/next branch. This patch depends upon following patches: 1)[U-Boot] powerpc/t1040: enable PBL tool for T1040 http://patchwork.ozlabs.org/patch/279366/ 2)[U-Boot,1/6,v2] powerpc:Add support of SPL non-relocation http://patchwork.ozlabs.org/patch/286074/ 3)[U-Boot,2/6,v2] powerpc/SPL:Allow Parsing of LAW table in both SPL & non SPL http://patchwork.ozlabs.org/patch/286075/ 4)[U-Boot,3/6,v2] common/env: Point default envirenoment for GD http://patchwork.ozlabs.org/patch/286076/ 5)[U-Boot,4/6,v2] Makefile:Add u-boot-with-spl-pbl.bin target for SPL http://patchwork.ozlabs.org/patch/286077/ 6)[U-Boot,5/6,v2] SPL:Defines function required to env read for IFC & env_nand http://patchwork.ozlabs.org/patch/286078/ 7)[U-Boot,6/6,v2] T1040QDS: Add support of 2 stage NAND boot loader http://patchwork.ozlabs.org/patch/286079/ board/freescale/t1040qds/README | 9 +++++++++ board/freescale/t1040qds/spl.c | 2 ++ boards.cfg | 1 + include/configs/T1040QDS.h | 23 +++++++++++++++++++---- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/board/freescale/t1040qds/README b/board/freescale/t1040qds/README index 0e4d32e..6235246 100644 --- a/board/freescale/t1040qds/README +++ b/board/freescale/t1040qds/README @@ -195,8 +195,17 @@ SPL has following features: ----------------------------------------------- Command to build 2 stage NAND boot loader +-------------------------------------------- - modify RCW at board/freescale/t1040qds/t1040_rcw.cfg for nand boot -66000002 00000000 fc027000 01000000 +66000002 00000000 ec106000 01000000 - make T1040QDS_NAND_config - make u-boot-with-spl-pbl.bin + +Command to build 2 stage SPI boot loader +------------------------------------------- + - modify RCW at board/freescale/t1040qds/t1040_rcw.cfg for spi boot + -66000002 00000000 fc027000 01000000 + +66000002 00000000 58027000 01000000 + - make T1040QDS_SPIFLASH_config + - make u-boot-with-spl-pbl.bin diff --git a/board/freescale/t1040qds/spl.c b/board/freescale/t1040qds/spl.c index 5f39466..60770f0 100644 --- a/board/freescale/t1040qds/spl.c +++ b/board/freescale/t1040qds/spl.c @@ -118,5 +118,7 @@ void board_init_r(gd_t *gd, ulong dest_addr) #ifdef CONFIG_SPL_NAND_BOOT nand_boot(); +#elif defined(CONFIG_SPL_SPI_BOOT) + spi_boot(); #endif } diff --git a/boards.cfg b/boards.cfg index 295d952..56f522e 100644 --- a/boards.cfg +++ b/boards.cfg @@ -964,6 +964,7 @@ Active powerpc mpc85xx - freescale t4qds Active powerpc mpc85xx - freescale t4qds T4240QDS_SRIO_PCIE_BOOT T4240QDS:PPC_T4240,SRIO_PCIE_BOOT_SLAVE,SYS_TEXT_BASE=0xFFF80000 - Active powerpc mpc85xx - freescale t1040qds T1040QDS T1040QDS:PPC_T1040 Naveen Burmi <NaveenBurmi(a)freescale.com> Active powerpc mpc85xx - freescale t1040qds T1040QDS_NAND T1040QDS:PPC_T1040,RAMBOOT_PBL,NAND Poonam Aggrwal <poonam.aggrwal(a)freescale.com> +Active powerpc mpc85xx - freescale t1040qds T1040QDS_SPIFLASH T1040QDS:PPC_T1040,RAMBOOT_PBL,SPIFLASH Poonam Aggrwal <poonam.aggrwal(a)freescale.com> Active powerpc mpc85xx - gdsys p1022 controlcenterd_36BIT_SDCARD controlcenterd:36BIT,SDCARD Dirk Eibach <eibach(a)gdsys.de> Active powerpc mpc85xx - gdsys p1022 controlcenterd_36BIT_SDCARD_DEVELOP controlcenterd:36BIT,SDCARD,DEVELOP Dirk Eibach <eibach(a)gdsys.de> Active powerpc mpc85xx - gdsys p1022 controlcenterd_TRAILBLAZER controlcenterd:TRAILBLAZER,SPIFLASH Dirk Eibach <eibach(a)gdsys.de> diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 6269ce5..27b812d 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -43,7 +43,6 @@ #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SKIP_RELOCATE_SPL -#define CONFIG_SYS_TEXT_BASE 0x00201000 #define CONFIG_SPL_TEXT_BASE 0xFFFD0000 #define CONFIG_SPL_PAD_TO 0x80000 #define CONFIG_SPL_MAX_SIZE 0x30000 @@ -55,9 +54,22 @@ #define CONFIG_SYS_NAND_U_BOOT_DST 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (512 << 10) +#define CONFIG_SYS_TEXT_BASE 0x00201000 #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds" #define CONFIG_SPL_NAND_BOOT #endif +#ifdef CONFIG_SPIFLASH +#define CONFIG_SPL_SPI_SUPPORT +#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (512 << 10) +#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x280000) +#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x2ff000) +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (512 << 10) +#define CONFIG_SYS_TEXT_BASE 0x280000 +#define CONFIG_RESET_VECTOR_ADDRESS 0x2ffffc +#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds" +#define CONFIG_SPL_SPI_BOOT +#endif #ifdef CONFIG_SPL_BUILD #define CONFIG_SPL_COMMON_INIT_DDR #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE @@ -107,14 +119,17 @@ #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE #endif -#ifndef CONFIG_SYS_NO_FLASH #if defined(CONFIG_SPIFLASH) -#define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 10000000 #define CONFIG_ENV_SPI_MODE 0 +#endif + +#ifndef CONFIG_SYS_NO_FLASH +#if defined(CONFIG_SPIFLASH) +#define CONFIG_SYS_EXTRA_ENV_RELOC +#define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SIZE 0x2000 /* 8KB */ #define CONFIG_ENV_OFFSET 0x100000 /* 1MB */ #define CONFIG_ENV_SECT_SIZE 0x10000 -- 1.7.4.1

2 2

[U-Boot] [RFC] ARM: U-boot and 2 GiB of ram with get_ram_size only being long
by Oliver Schinagl 24 Mar '14

24 Mar '14

Hey all, I just yesterday received my CubieTruck (cubieboard3) with 2 GiB of Ram and added support for it to the sunxi-u-boot branch. While I know this isn't merged into the main u-boot tree (yet), I ran into the following problem. At the end of the dram init code, it is customary to call get_ram_size() and return its value. This is then used to print the DRAM size and also is passed to the Linux kernel. However the return size of get_ram_size() is a long. While I don't understand why not unsigned long or even u64 was chosen, this causes get_dram_size to overflow when having a ramsize of 2 GiB. While only printing of the value isn't hugely important, this does indicate u-boot seems to be somewhat artificially limited to 2 GiB of Ram? This only seems to affect the SPL as, if I understood correctly, there it stores the ram_size into the gd struct which I think is unsigned long. I've started working on a patch to convert common/memsize.c's get_ram_size(), to be completely unsigned long, however there seems to be quite a lot of code that calls this. So my question is now before going over all drivers and change that and submit a big patch-set, did I overlook anything and are my conclusions correct, get_ram_size should return unsigned long. Finally, a long is 32 bits on x86 and armv7, but how will that relate to 64bits armv8? As I understood, Windows treats long's as 4 bytes no matter if it's 32 bit or 64 bit. Linux is better and a long is 4 bytes on 32 bits, and 8 bytes on 64 bits versions. So how will u-boot work on armv8? Will the long datatype work well, or should I consider changing things more future proof? (u32 and u64 come to mind). Thank you for any input regarding that issue. Oliver

6 19

[U-Boot] [PATCH 0/9] Exynos4: add support for device tree
by Piotr Wilczek 12 Mar '14

12 Mar '14

This patch set enables support for device tree on all Exynos4 based boards. DT support is enabled on Exynos mipi dsim and sdhci drives. Common board_exynos4.c file is created for all functions common for Exynos4 boards. Origen, Universal, Trats and Trats2 boards are modifed to support device tree. This patch set is based on patchset: [PATCH V2 0/8] arm: add runtime envs describing build http://patchwork.ozlabs.org/patch/313277/ ... http://patchwork.ozlabs.org/patch/313271/ Piotr Wilczek (9): exynos4:pinmux:fdt: decode peripheral id video:mipidsim:fdt: Add DT support for mipi dsim driver video:exynos_fb:fdt: add additional fdt data drivers:mmc:sdhci: enable support for DT arm:exynos: add common board file for exynos 4 board:origen:fdt: Enable device tree on Origen board:universal:fdt: Enable device tree on Universal trats:fdt: Enable device tree on Trats board:trats2:fdt: Enable device tree on Trats2 arch/arm/cpu/armv7/exynos/pinmux.c | 21 ++ arch/arm/dts/exynos4.dtsi | 139 ++++++++ arch/arm/include/asm/arch-exynos/mipi_dsim.h | 3 + arch/arm/include/asm/arch-exynos/mmc.h | 7 + board/samsung/common/Makefile | 1 + board/samsung/common/board_exynos4.c | 83 +++++ board/samsung/dts/exynos4210-origen.dts | 45 +++ board/samsung/dts/exynos4210-trats.dts | 120 +++++++ board/samsung/dts/exynos4210-universal_c210.dts | 83 +++++ board/samsung/dts/exynos4412-trats2.dts | 434 +++++++++++++++++++++++ board/samsung/origen/origen.c | 86 +---- board/samsung/trats/trats.c | 176 +-------- board/samsung/trats2/trats2.c | 216 +---------- board/samsung/universal_c210/universal.c | 178 +++------- drivers/mmc/s5p_sdhci.c | 130 ++++++- drivers/video/exynos_fb.c | 19 + drivers/video/exynos_mipi_dsi.c | 98 +++++ include/configs/exynos4-dt.h | 170 +++++++++ include/configs/origen.h | 103 ++---- include/configs/s5pc210_universal.h | 128 +------ include/configs/trats.h | 177 ++------- include/configs/trats2.h | 199 +---------- include/fdtdec.h | 2 + include/sdhci.h | 5 + lib/fdtdec.c | 2 + 25 files changed, 1511 insertions(+), 1114 deletions(-) create mode 100644 arch/arm/dts/exynos4.dtsi create mode 100644 board/samsung/common/board_exynos4.c create mode 100644 board/samsung/dts/exynos4210-origen.dts create mode 100644 board/samsung/dts/exynos4210-trats.dts create mode 100644 board/samsung/dts/exynos4210-universal_c210.dts create mode 100644 board/samsung/dts/exynos4412-trats2.dts create mode 100644 include/configs/exynos4-dt.h -- 1.7.9.5

6 96

[U-Boot] [PATCH 1/3] powerpc/p1010rdb: SECURE BOOT- define CONFIG_SYS_RAMBOOT for NAND boot
by Aneesh Bansal 11 Mar '14

11 Mar '14

In case of secure boot, boot from NAND is ramboot. It was removed by some other commit. So defining it again. Signed-off-by: Aneesh Bansal <aneesh.bansal(a)freescale.com> --- include/configs/P1010RDB.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index ea5cb65..c21cf07 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -446,7 +446,8 @@ extern unsigned long get_sdram_size(void); FTIM2_GPCM_TWP(0x1f)) #define CONFIG_SYS_CS3_FTIM3 0x0 -#if defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH) +#if defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH) || \ + defined(CONFIG_RAMBOOT_NAND) #define CONFIG_SYS_RAMBOOT #define CONFIG_SYS_EXTRA_ENV_RELOC #else -- 1.8.1.4

5 16

[U-Boot] [PATCH] at91 gpio: fix typo in compatibility macro
by Andreas Henriksson 09 Mar '14

09 Mar '14

It's called _pio_ in the version that was added to git. Apparently it got renamed without updating the macros before it was applied, c.f. http://u-boot.10912.n7.nabble.com/U-Boot-PATCH-3-9-V3-add-a-new-AT91-GPIO-d… Signed-off-by: Andreas Henriksson <andreas.henriksson(a)endian.se> --- arch/arm/include/asm/arch-at91/gpio.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/include/asm/arch-at91/gpio.h b/arch/arm/include/asm/arch-at91/gpio.h index ff6142b..7121388 100644 --- a/arch/arm/include/asm/arch-at91/gpio.h +++ b/arch/arm/include/asm/arch-at91/gpio.h @@ -214,7 +214,7 @@ static inline unsigned pin_to_mask(unsigned pin) /* The following macros are need for backward compatibility */ #define at91_set_GPIO_periph(x, y) \ - at91_set_gpio_periph((x - PIN_BASE) / 32,(x % 32), y) + at91_set_pio_periph((x - PIN_BASE) / 32,(x % 32), y) #define at91_set_A_periph(x, y) \ at91_set_a_periph((x - PIN_BASE) / 32,(x % 32), y) #define at91_set_B_periph(x, y) \ -- 1.5.4.3

2 1

[U-Boot] [PATCH] at91sam9263ek: add mmc support
by Andreas Henriksson 09 Mar '14

09 Mar '14

Add support for using the Atmel MCI driver on at91sam9263ek. This change is modeled after the existing at91sam9260ek support. Please note that this hooks up slot1 (MCI1) for SD. Not both. Tested with at91bootstrap and u-boot on dataflash in slot 0 and fat-formatted 8GB SDHC in slot 1 on first revision at91sam9263ek (which must use dataflash in slot0 to boot). CONFIG_ATMEL_MCI_PORTB not tested. Signed-off-by: Andreas Henriksson <andreas.henriksson(a)endian.se> --- arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c | 26 +++++++++++++++++++++ board/atmel/at91sam9263ek/at91sam9263ek.c | 10 ++++++++ include/configs/at91sam9263ek.h | 13 ++++++++++ 3 files changed, 49 insertions(+), 0 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c index 99a3913..5496e55 100644 --- a/arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c +++ b/arch/arm/cpu/arm926ejs/at91/at91sam9263_devices.c @@ -143,6 +143,32 @@ void at91_spi1_hw_init(unsigned long cs_mask) } #endif +#if defined(CONFIG_GENERIC_ATMEL_MCI) +void at91_mci_hw_init(void) +{ + /* Enable mci clock */ + struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; + writel(1 << ATMEL_ID_MCI1, &pmc->pcer); + + at91_set_a_periph(AT91_PIO_PORTA, 6, PUP); /* MCI1_CK */ + +#if defined(CONFIG_ATMEL_MCI_PORTB) + at91_set_a_periph(AT91_PIO_PORTA, 21, PUP); /* MCI1_CDB */ + at91_set_a_periph(AT91_PIO_PORTA, 22, PUP); /* MCI1_DB0 */ + at91_set_a_periph(AT91_PIO_PORTA, 23, PUP); /* MCI1_DB1 */ + at91_set_a_periph(AT91_PIO_PORTA, 24, PUP); /* MCI1_DB2 */ + at91_set_a_periph(AT91_PIO_PORTA, 25, PUP); /* MCI1_DB3 */ +#else + at91_set_a_periph(AT91_PIO_PORTA, 7, PUP); /* MCI1_CDA */ + at91_set_a_periph(AT91_PIO_PORTA, 8, PUP); /* MCI1_DA0 */ + at91_set_a_periph(AT91_PIO_PORTA, 9, PUP); /* MCI1_DA1 */ + at91_set_a_periph(AT91_PIO_PORTA, 10, PUP); /* MCI1_DA2 */ + at91_set_a_periph(AT91_PIO_PORTA, 11, PUP); /* MCI1_DA3 */ +#endif +} +#endif + + #ifdef CONFIG_MACB void at91_macb_hw_init(void) { diff --git a/board/atmel/at91sam9263ek/at91sam9263ek.c b/board/atmel/at91sam9263ek/at91sam9263ek.c index d42a173..4b14554 100644 --- a/board/atmel/at91sam9263ek/at91sam9263ek.c +++ b/board/atmel/at91sam9263ek/at91sam9263ek.c @@ -24,6 +24,7 @@ #include <net.h> #endif #include <netdev.h> +#include <atmel_mci.h> DECLARE_GLOBAL_DATA_PTR; @@ -214,6 +215,15 @@ void lcd_show_board_info(void) #endif /* CONFIG_LCD_INFO */ #endif +#ifdef CONFIG_GENERIC_ATMEL_MCI +int board_mmc_init(bd_t *bd) +{ + at91_mci_hw_init(); + + return atmel_mci_init((void *)ATMEL_BASE_MCI1); +} +#endif + int board_early_init_f(void) { struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC; diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index b9aa036..48c12ea 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -103,6 +103,7 @@ #define CONFIG_CMD_PING 1 #define CONFIG_CMD_DHCP 1 #define CONFIG_CMD_NAND 1 +#define CONFIG_CMD_MMC #define CONFIG_CMD_USB 1 /* SDRAM */ @@ -123,6 +124,18 @@ #define DATAFLASH_TCSS (0x1a << 16) #define DATAFLASH_TCHS (0x1 << 24) +/* MMC */ +#ifdef CONFIG_CMD_MMC +#define CONFIG_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_GENERIC_ATMEL_MCI +#endif + +/* FAT */ +#ifdef CONFIG_CMD_FAT +#define CONFIG_DOS_PARTITION +#endif + /* NOR flash, if populated */ #ifdef CONFIG_SYS_USE_NORFLASH #define CONFIG_SYS_FLASH_CFI 1 -- 1.5.4.3

2 1

[U-Boot] [PATCH 1/2] powerpc/mpc85xx: Add SCFG_PIXCLKCR register support for T1040
by Priyanka Jain 08 Mar '14

08 Mar '14

T1040 SoC has SCFG (Supplement Configuration) Block which provides chip specific configuration and status support. The base address of SCFG block in T1040 is 0xfc000. SCFG contains SCFG_PIXCLKCR (DIU pixel clock control register) at offset 0x28. Add definition of -SCFG block -SCFG_PIXCLKCR register -Bits definition of SCFG_PIXCLK register Signed-off-by: Priyanka Jain <Priyanka.Jain(a)freescale.com> --- arch/powerpc/include/asm/immap_85xx.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 9d08321..0251265 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -1770,6 +1770,10 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022) #define FSL_CORENET_RCWSR13_MAC2_GMII_SEL 0x00000080 #define FSL_CORENET_RCWSR13_MAC2_GMII_SEL_L2_SWITCH 0x00000000 #define FSL_CORENET_RCWSR13_MAC2_GMII_SEL_ENET_PORT 0x80000000 +#define CONFIG_SYS_FSL_SCFG_PIXCLKCR_OFFSET 0x28 +#define PXCKEN_MASK 0x80000000 +#define PXCK_MASK 0x00FF0000 +#define PXCK_BITS_START 16 #elif defined(CONFIG_PPC_T2080) || defined(CONFIG_PPC_T2081) #define FSL_CORENET2_RCWSR4_SRDS1_PRTCL 0xff000000 #define FSL_CORENET2_RCWSR4_SRDS1_PRTCL_SHIFT 24 @@ -2845,6 +2849,7 @@ struct ccsr_pman { #define CONFIG_SYS_FSL_CORENET_SERDES_OFFSET 0xEA000 #define CONFIG_SYS_FSL_CORENET_SERDES2_OFFSET 0xEB000 #define CONFIG_SYS_FSL_CPC_OFFSET 0x10000 +#define CONFIG_SYS_FSL_SCFG_OFFSET 0xFC000 #define CONFIG_SYS_MPC85xx_DMA1_OFFSET 0x100000 #define CONFIG_SYS_MPC85xx_DMA2_OFFSET 0x101000 #define CONFIG_SYS_MPC85xx_DMA3_OFFSET 0x102000 @@ -2962,6 +2967,10 @@ struct ccsr_pman { #define CONFIG_SYS_FSL_CPC_ADDR \ (CONFIG_SYS_CCSRBAR + CONFIG_SYS_FSL_CPC_OFFSET) +#define CONFIG_SYS_FSL_SCFG_ADDR \ + (CONFIG_SYS_CCSRBAR + CONFIG_SYS_FSL_SCFG_OFFSET) +#define CONFIG_SYS_FSL_SCFG_PIXCLK_ADDR \ + (CONFIG_SYS_FSL_SCFG_ADDR + CONFIG_SYS_FSL_SCFG_PIXCLKCR_OFFSET) #define CONFIG_SYS_FSL_QMAN_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_FSL_QMAN_OFFSET) #define CONFIG_SYS_FSL_BMAN_ADDR \ -- 1.7.4.1

2 1