October 2014 - U-Boot

[U-Boot] [U-boot] [Patch v4 0/6] keystone2: add k2l SoC and k2l_evm board support
by Ivan Khoronzhuk 22 Oct '14

22 Oct '14

This patch series adds Keystone II Lamar (K2L) SoC and k2l_evm board support. Based on "[U-boot] [Patch v2] keystone: usb: add support of usb xhci" https://patchwork.ozlabs.org/patch/386506/ v4..v3 - keystone2: k2l-evm: add board support remove dimm name reading v3..v2 - keystone2: k2l-evm: add board support Add maintainers information Enable SPL by default v2..v1 Rebased according to changes of c338f09e965a300ddd78af73e86c4af4c9464ce4 "keystone: kconfig: move board select menu and common settings" Hao Zhang (6): ARM: keystone2: add K2L device hardware definitions keystone2: clock: add K2L clock definitions and commands keystone2: msmc: add MSMC cache coherency support for K2L SOC ARM: keystone2: spl: add K2L SoC support keystone2: enable OSR clock domain for K2L SoC keystone2: k2l-evm: add board support arch/arm/cpu/armv7/keystone/Kconfig | 3 + arch/arm/cpu/armv7/keystone/Makefile | 1 + arch/arm/cpu/armv7/keystone/clock-k2l.c | 138 +++++++++++++++++++++ arch/arm/cpu/armv7/keystone/cmd_clock.c | 10 ++ arch/arm/cpu/armv7/keystone/init.c | 52 ++++++++ arch/arm/cpu/armv7/keystone/spl.c | 7 ++ arch/arm/include/asm/arch-keystone/clock-k2l.h | 94 ++++++++++++++ arch/arm/include/asm/arch-keystone/clock.h | 4 + arch/arm/include/asm/arch-keystone/hardware-k2hk.h | 2 - arch/arm/include/asm/arch-keystone/hardware-k2l.h | 99 +++++++++++++++ arch/arm/include/asm/arch-keystone/hardware.h | 14 +++ board/ti/ks2_evm/Kconfig | 16 +++ board/ti/ks2_evm/MAINTAINERS | 2 + board/ti/ks2_evm/Makefile | 2 + board/ti/ks2_evm/board_k2l.c | 60 +++++++++ board/ti/ks2_evm/ddr3_cfg.c | 36 ++++++ board/ti/ks2_evm/ddr3_cfg.h | 3 + board/ti/ks2_evm/ddr3_k2l.c | 43 +++++++ configs/k2l_evm_defconfig | 4 + include/configs/k2l_evm.h | 37 ++++++ 20 files changed, 625 insertions(+), 2 deletions(-) create mode 100644 arch/arm/cpu/armv7/keystone/clock-k2l.c create mode 100644 arch/arm/include/asm/arch-keystone/clock-k2l.h create mode 100644 arch/arm/include/asm/arch-keystone/hardware-k2l.h create mode 100644 board/ti/ks2_evm/board_k2l.c create mode 100644 board/ti/ks2_evm/ddr3_k2l.c create mode 100644 configs/k2l_evm_defconfig create mode 100644 include/configs/k2l_evm.h -- 1.8.3.2

2 12

[U-Boot] [PATCH v3 0/6] sunxi: Enable second sdcard slot found on some boards
by Hans de Goede 22 Oct '14

22 Oct '14

Hi Ian, Here is v3 of my second sdcard slot patch-set. Changes since v2: - Rebased on top of latest u-boot-sunxi-next - Fixed Kconfig help text for : "sunxi: Turn MMC_SUNXI_SLOT_EXTRA into a proper Kconfig option" to also mention mmc1 - Added checks for sunxi_mmc_init failing to: "sunxi: When we've both mmc0 and mmc2, detect from which one we're booting" - Added a 6th patch with my version of the Kconfig unification, to avoid you needing to rebase yours. I believe this patch is ready to go upstream now, so if I can have your Acked-by for patches 3 and 6, then I'll push this to next, or you can push this to next yourself. Regards, Hans

3 14

[U-Boot] [PATCH] Revert "sunxi: dram: Use divisor P=1 for PLL5"
by Hans de Goede 22 Oct '14

22 Oct '14

This change breaks various hardcoded assumptions in the linux-sunxi-3.4 kernels, causing a divide by 0 error in the linux-sunxi-3.4 nand driver, rendering 3.4 kernels unbootable. Besides this problem, it also breaks LCD output (on devices without nand). Fixes for these issues are being added to the linux-sunxi-3.4 kernel, but for now it seems better to revert this. This reverts commit 013f2d746955147439215a4939655c9ed6bdd866. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- arch/arm/cpu/armv7/sunxi/dram.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/arch/arm/cpu/armv7/sunxi/dram.c b/arch/arm/cpu/armv7/sunxi/dram.c index 584f742..8c4dd51 100644 --- a/arch/arm/cpu/armv7/sunxi/dram.c +++ b/arch/arm/cpu/armv7/sunxi/dram.c @@ -256,7 +256,7 @@ static void mctl_setup_dram_clock(u32 clk, u32 mbus_clk) /* PLL5P and PLL6 are the potential clock sources for MBUS */ u32 pll6x_div, pll5p_div; u32 pll6x_clk = clock_get_pll6() / 1000000; - u32 pll5p_clk = clk / 24 * 48; + u32 pll5p_clk = clk / 24 * 24; u32 pll5p_rate, pll6x_rate; #ifdef CONFIG_SUN7I pll6x_clk *= 2; /* sun7i uses PLL6*2, sun5i uses just PLL6 */ @@ -269,40 +269,46 @@ static void mctl_setup_dram_clock(u32 clk, u32 mbus_clk) reg_val &= ~CCM_PLL5_CTRL_N_MASK; /* set N to 0 (x0) */ reg_val &= ~CCM_PLL5_CTRL_P_MASK; /* set P to 0 (x1) */ if (clk >= 540 && clk < 552) { - /* dram = 540MHz, pll5p = 1080MHz */ - pll5p_clk = 1080; + /* dram = 540MHz, pll5p = 540MHz */ + pll5p_clk = 540; reg_val |= CCM_PLL5_CTRL_M(CCM_PLL5_CTRL_M_X(2)); reg_val |= CCM_PLL5_CTRL_K(CCM_PLL5_CTRL_K_X(3)); reg_val |= CCM_PLL5_CTRL_N(CCM_PLL5_CTRL_N_X(15)); + reg_val |= CCM_PLL5_CTRL_P(1); } else if (clk >= 512 && clk < 528) { - /* dram = 512MHz, pll5p = 1536MHz */ - pll5p_clk = 1536; + /* dram = 512MHz, pll5p = 384MHz */ + pll5p_clk = 384; reg_val |= CCM_PLL5_CTRL_M(CCM_PLL5_CTRL_M_X(3)); reg_val |= CCM_PLL5_CTRL_K(CCM_PLL5_CTRL_K_X(4)); reg_val |= CCM_PLL5_CTRL_N(CCM_PLL5_CTRL_N_X(16)); + reg_val |= CCM_PLL5_CTRL_P(2); } else if (clk >= 496 && clk < 504) { - /* dram = 496MHz, pll5p = 1488MHz */ - pll5p_clk = 1488; + /* dram = 496MHz, pll5p = 372MHz */ + pll5p_clk = 372; reg_val |= CCM_PLL5_CTRL_M(CCM_PLL5_CTRL_M_X(3)); reg_val |= CCM_PLL5_CTRL_K(CCM_PLL5_CTRL_K_X(2)); reg_val |= CCM_PLL5_CTRL_N(CCM_PLL5_CTRL_N_X(31)); + reg_val |= CCM_PLL5_CTRL_P(2); } else if (clk >= 468 && clk < 480) { - /* dram = 468MHz, pll5p = 936MHz */ - pll5p_clk = 936; + /* dram = 468MHz, pll5p = 468MHz */ + pll5p_clk = 468; reg_val |= CCM_PLL5_CTRL_M(CCM_PLL5_CTRL_M_X(2)); reg_val |= CCM_PLL5_CTRL_K(CCM_PLL5_CTRL_K_X(3)); reg_val |= CCM_PLL5_CTRL_N(CCM_PLL5_CTRL_N_X(13)); + reg_val |= CCM_PLL5_CTRL_P(1); } else if (clk >= 396 && clk < 408) { - /* dram = 396MHz, pll5p = 792MHz */ - pll5p_clk = 792; + /* dram = 396MHz, pll5p = 396MHz */ + pll5p_clk = 396; reg_val |= CCM_PLL5_CTRL_M(CCM_PLL5_CTRL_M_X(2)); reg_val |= CCM_PLL5_CTRL_K(CCM_PLL5_CTRL_K_X(3)); reg_val |= CCM_PLL5_CTRL_N(CCM_PLL5_CTRL_N_X(11)); + reg_val |= CCM_PLL5_CTRL_P(1); } else { /* any other frequency that is a multiple of 24 */ reg_val |= CCM_PLL5_CTRL_M(CCM_PLL5_CTRL_M_X(2)); reg_val |= CCM_PLL5_CTRL_K(CCM_PLL5_CTRL_K_X(2)); reg_val |= CCM_PLL5_CTRL_N(CCM_PLL5_CTRL_N_X(clk / 24)); + reg_val |= CCM_PLL5_CTRL_P(CCM_PLL5_CTRL_P_X(2)); } reg_val &= ~CCM_PLL5_CTRL_VCO_GAIN; /* PLL VCO Gain off */ reg_val |= CCM_PLL5_CTRL_EN; /* PLL On */ -- 2.1.0

5 11

[U-Boot] git bisect failed
by Christian Gmeiner 22 Oct '14

22 Oct '14

Hi all. Finally I got basic board support for OT1200 into upstream, but the last released version fails to detect SPI flash (read only ff's). The good one is commit 39d0973300b83c08f3f5047245ebf1de883b31f2 and the bad one is c43fd23cf619856b0763a64a6a3bcf3663058c49 [christian@chgm-pc u-boot]$ git bisect good There are only 'skip'ped commits left to test. The first bad commit could be any of: 540d434aa420bc056326f0f02135bb17e46be5b1 783e6a72b8278d59854ced41a4696c9a14abbb0b 92c2dc0f64f3115c77577f110eac6753dada9b15 0a5051ce6ebd5f6fad58fd50d6922493d8447f14 f1ef2b62339526df3b921bcfefd174ce76d4c624 e3a4facdfc07179ebe017a07b8de6224a935a9f3 f494e0a1847d74e68c460c90253836ea21c431ac 2f665945b39a9972260cbcf60d5e7f2a60587f5e d660b409dc3658087ce15e7d50ed007f1cfa09e8 be16aba5ce8d04b8ca0ebd5ac95d878064e44bd8 c79cba37b3b42cf8fbd71babcd8998867f76fead 3eb3e72a3f66db140dabd66b553380c19b2035d4 87f13aa00d0279fcc96530404c3a104eb4cb1672 93d3232d9607669f33a34d3a552b24e1d727413b f9860cf081efdf32c8a01b9fc271fe55e2a79f8d 110bdee00f70ba2cae90a8db39e8d3e854141a56 97d5e9d149ca910e1bd20d06a13b9e9cceb0e502 5e74934d407d2aabe5c4283b4394969025c643e3 64147e564cf43bb33b68766053960002bc0784dd 1d5c20154f0797e9a79fd0b39a9ae8a8801f6a51 df3b23ae3a7bb0627d595e6139ea43655d5acaa4 248a0488bfbb2eb16dee408a976d5f4b5546bb51 726ac8e4c505f086c1decd5263068373254ee60a cccee18918a9bcc1b34ddcd33f219a4ed26fc690 ca05ee9d43297cef9bb9ec74973d58586a6e4321 dba1697057abed60bcb46ff724dad9f3e090c566 b0928da648d440778512ddd81e690717239b8f1f ed36323f6d217050f82a2200475959b8557a47e4 2c3dc792b6df16970077c0d64085e29f1f85d4c8 a03bdaa1408be4e8b6adfc8577a0ceac3ebc51e5 535aad29f2a0881f66a0efdb3d467d0910d5e41e e5a504eb3d8cbc33199dac61a07d16ddd3c1c7f9 5dff844d7ff1704534905db9beb888f5552adb84 129acd4c75f85bdb7f1267fe5f1187e0fc37d221 07b342783a11bc56c38207006b5ad9d70ca3c863 8969ea3e9f2db04a6b36758972b708837786a5a5 b84505210367d152a456a2adeba90e13626ad104 214b3f311f0c1ac4c8f68e45133fc3547c76d8d1 ab7cb4eefa33b79834f0a000bcb365e98c14c693 a4277200a2253fda49342aa65800d27e61276170 bdc7dc4595646da8774f53a2c4f5a7599b0a5f16 c7eae7fcb11bc7dab519fca8d8902f1fbc5c3c76 e5bf9878ea743564bcc7a15a79654fe06731a1e2 593cbd93f33c38ca3ee9db34b5657a15d2437902 f80d6472b47e73e35e4eaed6fc56ce5df2c82cdb 2c2277f15cbaa9533ef8aead7328c3f605251147 8aeb893a8ed97bac679149386cec53b275be3715 d1b5ed075311f143926dd916edb59436267eb396 8bfa301b0a30f57888d2117767b23f168760bc40 c0aebb3382133c99bc458d96b562703dae4ae928 039b77396abb0ed78af34dadbd0786dfaf0e6aa9 40f8dec54d7803975aed1c88327002c95ea99908 7172de33b0cc0a44713fd4fbbb61fd1fada17341 5273aa3834ec68616e173ceac91cdcf60dba2868 bf9b86dc47988a404964c97c74e541a129719f9c f43b4356a794be647011132f4f2dc970a29a9dd5 0299046e5b4eec6c79927324deab857db1689e92 08df4a21c7d580770cabd7ba62591da035d9a545 92f7fed4f738149121c779fe1dda857585bdeccf 07c4eea4846cde938c4b0d8c1ddee95d373693ed bb5783224b9b12eecf406761f82e3de2a2ca9dae be9f643ae6aa9044c60fe80e3a2c10be8371c692 c032174f8218496a7768e4a27d1eb25b7e6f7a4d 1de271b487d60c613568ad61fc005ff850f2ed71 4b0abf9f3c024225987ec92ea9ae9e8a1ac5950d 75f698e51c7e40048e4d96fdaaaebeaefc945538 d9c68b1444acb383684636eb856fd7e4cec04129 1d71efbb0345ff3a8ac45e62bef36813abe1703e 31969b8993ee00015b7ac0f979d601299158fc6e 38e0e15372f9f463ab8dd30d21a46cb477e80dd4 845034e6b217d5ff73de03213ede9b17646a91b1 7f368553fcada0b38e8a096fcba4fcd64e0d2020 88e34e5ff76bffa7d56b1d04e0bd2627ee5b584d e211c12e773881f6bef60143df4764402a56de34 e628c8f75de952031f7b9fb9ae465a2a99d4c7f8 155fa9af95ac5be857a7327e7a968a296e60d4c8 363fb32aca268701a0918d67099fb344194f1746 5894ca007d217a2fa845facfbb62c6512396a145 5b8388a827c002c6c5e8da76bd99b66f1f26e92c 01d2aaf61ba7d532dee7002a2049d2b972992122 1b35721f61207c5f3cdf924be3bb64e0ad12887c 66cba041fe8fe4cdc3d8252974021257e736572a d087e0e26293a34752a6279da85f94a97084686c 0fb63aa63c35888dface83b44c1401be097277eb 47d3debe1ab8315dc9ade22279e02f60eceda25b 6dd0e7c00bfa5ce861a72b8e4a3ef9e787306125 45e60c25b54f0443265ee49909c70af90d5cbad9 8ca21cbea2671bad315cc93ab636a95d95bac058 cae025aab3e8ea8ad455cce8b0e4647401cdd091 1e3d64031608d668509b6fe0825f7708bb6b6a0d 59990bf0eaa12b123759cb0485f38e156103e93c 692c223518023b47579fbf1142a8f639cbedb5b0 65ae9523d9a5868075be40ef2582c75190cee6af 91cbd792c46c916ef196c5b7cd16ff592d2f3632 983a2749e2fdc459b2f44e82241a5c314ddbcdf6 0f88a5a98eb9d8d5158b074a127a4bf8d4ce8610 1454ba8e56d88a8b95ac8050cde2c07c651cd0ae 7798e2285fda17aa2268cbe18498678cf857905f bf1a86fca0111067021f3d263242767d3709d7be 4dfb0e4d3e75763d6fbe8788316bea9ba23e8e01 6b1978f8a14fc2f53715f65827e98d607cc21e63 c19a8bc5711ec63e905ef91f045a1489f0aa3cb0 e7b14e9ab0ceef3068722007e7396f89f4ede9c2 4b19b7448e63bab8af17abbb30acff00d8f0dc99 We cannot bisect more! I had to skip steps in the bisect run as the board support was not existing. Any hints? greets -- Christian Gmeiner, MSc https://soundcloud.com/christian-gmeiner

5 6

[U-Boot] Mini Summit 2014 Followup / Transcript of Open Discussion
by Detlev Zundel 22 Oct '14

22 Oct '14

Hi, it was a pleasure for me to meet so many of you this Monday in Düsseldorf at the ELCE. As many as 17 current custodians and 2 prospective new custodians were present at the event: Hans de Goede - Sunxi Alexey Brodkin - ARC Marek Vasut - USB Scott Wood - NAND Joe Hershberger - Networking Anatolij Gustschin - Video Heiko Schocher - I2C Stefano Babic - ARM i.MX Stefan Roese - PowerPC 4xx, CFI flash Wolfgang Denk - PowerPC 8xx, 82xx, 85xx, 5xxx, 7xx, 74xx Lukasz Majewski - DFU, OneNAND Tom Rini - Master of the git tree Pantelis Antoniou - MMC Daniel Schwierzek - MIPS Masahiro Yamada - Uniphier, Kconfig / Kbuild Simon Glass - x86, Driver model, patman, buildman Nobuhiro Iwamatsu - SH architecture Vince Bridgers - SoCFPGA (soon) Przemyslaw Marczak - PMIC (soon) The six talks gave rise to a lot of good discussions and the presentation slides are now up on the wiki page[1]. The page is topped with a picture of the participants of the discussion round in the evening. I started adding the names of the people that gave me explicit approval to do so but I would like to extend this list somewhat further. Whenever there is an NA without a question mark, then I know the name and will fill it in when I get the approval. If there is a question mark behind it then I'm unsure and would be glad to get some help _in addition_ to the approval ;) As promised, here are my notes that I took during the evening discussion - feel free to follow-up on individual items by cutting out the rest of the mail: --------8<-----------------8<--------- * Open Discussion ** ARM core vs ARM SoC custodianship Collection of patches should go to mainline in one bunch, rather than splitting them for every custodian repository. Individual custodians can ack parts of such a series. This should be the default - custodians should only pick up individual bits when those bits are pretty isolated. ** Getting new Custodians Przemislav wants to apply as custodian for a PMIC tree. This should be handled by sending a patch to the ML in which he adds himself as a custodian. Once this is acked by Tom, the git repo can be set up. ** Testing Problem is twofold: - Hardware Lots of hardware is available in a distributed fashion at individual places. A central lab will not happen, so one should maybe start collecting information on people volunteering to run testcases, say for every release candidate. (TESTERS?) Boards should only be removed when they break during builds. There is no policy for automatic board removals. The idea of a "board watchdog" that times out after a certain amount of releases and has to be reset by a successful test was not greeted by enthusiasm. Most people believe this will not work. Side-note: An interesting hardware project from the Novena guys can actually simulate an sd-card. With that setup one can feed test images easily to systems under test. - Software provisioning There are lots of test frameworks available but none of them seems to have no problem. Tests in U-Boot can be successfully done in sandbox. Sandbox is a powerful test harness. Simon has a setup in which sandbox boots the U-Boot part of Chrome-OS including secure booting and a display. Booting an U-Boot for tests from within U-Boot is still not supported and will not be. ** printf vs puts Maybe the puts usages will be phased out when moving to debug macros of whatever kind. Such macros are wanted by everybody but a concensus on what they should look like was not reached. No further feedback that "printf" without a format string needs to be converted into puts shall be given on the mailing list. ** switch malloc to malloc_or_die, as glib does Motivation: The error paths of failing malloc calls are usually completely untested, full of bugs and they bloat the binary. We have an "xmalloc" (sometimes known as malloc_dnf (do not fail)) in cli_hush that has the semantics of printing an error message and going into an infite loop on unsuccessful allocations. The suggestion was to move all malloc calls to this semantics. It became pretty clear after a short discussion that there are situations in U-Boot where failing mallocs _need_ to be handled. So generally switching to this behaviour is not an option. Adding an "opt-in" malloc outside of cli_hush with this behaviour was not greeted with much enthusiasm. A patch to the ML introducing such a malloc_dnf and switching users to it can then be discussed better. ** SoCFPGA patches The fact that a large set of patches for the SoCFPGAs was merged after -rc1 was questioned as it does not 100% comply with the rules. The patches constrained to SoCFPGA were no (big) problem, but one of those patches broke mkimage and as such had an impact on the whole project. The lesson should be - custodians should send out pull requests soon after the merge window opens up. Big chunks should not be pulled in after -rc1. The -next branch should be declared rebaseable and be used more. Once -rc1 is released, things can then be pulled into the next branch. Only bug fixes should go into the later -rc's. ** Custodian expectations It seems Albert doesn't like to pull from topic branches, so maybe simply do not offer topic branches for him to pull. --------8<-----------------8<--------- PS: There were a few people taking pictures at the event and I'm certainly interested to see them. So if possible, send them over to me personally. Thanks to everyone! Detlev [1] http://www.denx.de/wiki/U-Boot/MiniSummitELCE2014 -- Emacs seems a more likely candidate to contain a mail system than the mail system to contain an Emacs, so this is the way it was done. -- Bernard S. Greenberg -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu(a)denx.de

2 2

[U-Boot] [PATCH 1/7] spi: altera: Use struct-based register access
by Marek Vasut 22 Oct '14

22 Oct '14

Zap the offset-based register access and use the struct-based one as this is the preferred method. No functional change, but there are some line-over-80 problems in the driver, which will be addressed later. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Chin Liang See <clsee(a)altera.com> Cc: Dinh Nguyen <dinguyen(a)altera.com> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> Cc: Tom Rini <trini(a)ti.com> Cc: Wolfgang Denk <wd(a)denx.de> Cc: Pavel Machek <pavel(a)denx.de> Cc: Jagannadha Sutradharudu Teki <jagannadh.teki(a)gmail.com> --- drivers/spi/altera_spi.c | 49 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c index 5accbb5..13191f3 100644 --- a/drivers/spi/altera_spi.c +++ b/drivers/spi/altera_spi.c @@ -12,11 +12,14 @@ #include <malloc.h> #include <spi.h> -#define ALTERA_SPI_RXDATA 0 -#define ALTERA_SPI_TXDATA 4 -#define ALTERA_SPI_STATUS 8 -#define ALTERA_SPI_CONTROL 12 -#define ALTERA_SPI_SLAVE_SEL 20 +struct altera_spi_regs { + u32 rxdata; + u32 txdata; + u32 status; + u32 control; + u32 _reserved; + u32 slave_sel; +}; #define ALTERA_SPI_STATUS_ROE_MSK (0x8) #define ALTERA_SPI_STATUS_TOE_MSK (0x10) @@ -39,8 +42,8 @@ static ulong altera_spi_base_list[] = CONFIG_SYS_ALTERA_SPI_LIST; struct altera_spi_slave { - struct spi_slave slave; - ulong base; + struct spi_slave slave; + struct altera_spi_regs *regs; }; #define to_altera_spi_slave(s) container_of(s, struct altera_spi_slave, slave) @@ -54,16 +57,16 @@ __attribute__((weak)) void spi_cs_activate(struct spi_slave *slave) { struct altera_spi_slave *altspi = to_altera_spi_slave(slave); - writel(1 << slave->cs, altspi->base + ALTERA_SPI_SLAVE_SEL); - writel(ALTERA_SPI_CONTROL_SSO_MSK, altspi->base + ALTERA_SPI_CONTROL); + writel(1 << slave->cs, &altspi->regs->slave_sel); + writel(ALTERA_SPI_CONTROL_SSO_MSK, &altspi->regs->control); } __attribute__((weak)) void spi_cs_deactivate(struct spi_slave *slave) { struct altera_spi_slave *altspi = to_altera_spi_slave(slave); - writel(0, altspi->base + ALTERA_SPI_CONTROL); - writel(0, altspi->base + ALTERA_SPI_SLAVE_SEL); + writel(0, &altspi->regs->control); + writel(0, &altspi->regs->slave_sel); } void spi_init(void) @@ -87,9 +90,9 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!altspi) return NULL; - altspi->base = altera_spi_base_list[bus]; - debug("%s: bus:%i cs:%i base:%lx\n", __func__, - bus, cs, altspi->base); + altspi->regs = (struct altera_spi_regs *)altera_spi_base_list[bus]; + debug("%s: bus:%i cs:%i base:%p\n", __func__, + bus, cs, altspi->regs); return &altspi->slave; } @@ -105,8 +108,8 @@ int spi_claim_bus(struct spi_slave *slave) struct altera_spi_slave *altspi = to_altera_spi_slave(slave); debug("%s: bus:%i cs:%i\n", __func__, slave->bus, slave->cs); - writel(0, altspi->base + ALTERA_SPI_CONTROL); - writel(0, altspi->base + ALTERA_SPI_SLAVE_SEL); + writel(0, &altspi->regs->control); + writel(0, &altspi->regs->slave_sel); return 0; } @@ -115,7 +118,7 @@ void spi_release_bus(struct spi_slave *slave) struct altera_spi_slave *altspi = to_altera_spi_slave(slave); debug("%s: bus:%i cs:%i\n", __func__, slave->bus, slave->cs); - writel(0, altspi->base + ALTERA_SPI_SLAVE_SEL); + writel(0, &altspi->regs->slave_sel); } #ifndef CONFIG_ALTERA_SPI_IDLE_VAL @@ -142,20 +145,18 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, } /* empty read buffer */ - if (readl(altspi->base + ALTERA_SPI_STATUS) & - ALTERA_SPI_STATUS_RRDY_MSK) - readl(altspi->base + ALTERA_SPI_RXDATA); + if (readl(&altspi->regs->status) & ALTERA_SPI_STATUS_RRDY_MSK) + readl(&altspi->regs->rxdata); if (flags & SPI_XFER_BEGIN) spi_cs_activate(slave); while (bytes--) { uchar d = txp ? *txp++ : CONFIG_ALTERA_SPI_IDLE_VAL; debug("%s: tx:%x ", __func__, d); - writel(d, altspi->base + ALTERA_SPI_TXDATA); - while (!(readl(altspi->base + ALTERA_SPI_STATUS) & - ALTERA_SPI_STATUS_RRDY_MSK)) + writel(d, &altspi->regs->txdata); + while (!(readl(&altspi->regs->status) & ALTERA_SPI_STATUS_RRDY_MSK)) ; - d = readl(altspi->base + ALTERA_SPI_RXDATA); + d = readl(&altspi->regs->rxdata); if (rxp) *rxp++ = d; debug("rx:%x\n", d); -- 2.1.1

3 15

[U-Boot] [PATCH] powerpc: TQM5200: convert to generic board
by Wolfgang Denk 21 Oct '14

21 Oct '14

Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- include/configs/TQM5200.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 69c0336..2c1c91f 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2003-2005 + * (C) Copyright 2003-2014 * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. * * (C) Copyright 2004-2006 @@ -20,6 +20,9 @@ #define CONFIG_TQM5200 1 /* ... on TQM5200 module */ #undef CONFIG_TQM5200_REV100 /* define for revision 100 modules */ +#define CONFIG_DISPLAY_BOARDINFO +#define CONFIG_SYS_GENERIC_BOARD + /* * Valid values for CONFIG_SYS_TEXT_BASE are: * 0xFC000000 boot low (standard configuration with room for -- 1.8.3.1

1 0

[U-Boot] Please pull u-boot-fsl-qoriq master
by York Sun 21 Oct '14

21 Oct '14

Tom, The following changes since commit c43fd23cf619856b0763a64a6a3bcf3663058c49: Prepare v2014.10 (2014-10-14 04:47:15 -0400) are available in the git repository at: git://git.denx.de/u-boot-fsl-qoriq.git master for you to fetch changes up to ba4740205d22d31da289f5b6b2f8db7d27896f40: ls102x: Add support for secure boot and enable blob command (2014-10-16 14:21:26 -0700) ---------------------------------------------------------------- Ruchika Gupta (10): powerpc/P1010RDB:Update RESET_VECTOR_ADDRESS for 768KB u-boot size fsl_sec : Move SEC CCSR definition to common include fsl_sec : Change accessor function to take care of endianness fsl_sec: Add hardware accelerated SHA256 and SHA1 mpc85xx: configs - Add hash command in freescale platforms ls102x: configs - Add hash command in freescale LS1 platforms powerpc/mpc85xx: SECURE BOOT - Bypass PAMU in case of secure boot crypto/fsl: Add command for encapsulating/decapsulating blobs mpc85xx: configs - Enable blob command in freescale platforms ls102x: Add support for secure boot and enable blob command README | 6 + arch/arm/include/asm/arch-ls102xa/config.h | 4 + arch/powerpc/cpu/mpc85xx/cpu_init.c | 18 +- arch/powerpc/cpu/mpc85xx/fdt.c | 2 +- arch/powerpc/cpu/mpc85xx/liodn.c | 4 +- arch/powerpc/cpu/mpc8xxx/fdt.c | 4 +- arch/powerpc/include/asm/config_mpc85xx.h | 1 + arch/powerpc/include/asm/immap_85xx.h | 73 +-- arch/powerpc/include/asm/types.h | 4 + board/freescale/ls1021aqds/MAINTAINERS | 1 + board/freescale/ls1021aqds/ls1021aqds.c | 10 + board/freescale/ls1021atwr/MAINTAINERS | 1 + board/freescale/ls1021atwr/ls1021atwr.c | 10 + common/Makefile | 2 + common/cmd_blob.c | 109 +++++ configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 3 + configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 3 + drivers/crypto/Makefile | 1 + drivers/crypto/fsl/Makefile | 10 + drivers/crypto/fsl/desc.h | 651 ++++++++++++++++++++++++++ drivers/crypto/fsl/desc_constr.h | 280 +++++++++++ drivers/crypto/fsl/error.c | 258 ++++++++++ drivers/crypto/fsl/fsl_blob.c | 61 +++ drivers/crypto/fsl/fsl_hash.c | 77 +++ drivers/crypto/fsl/jobdesc.c | 125 +++++ drivers/crypto/fsl/jobdesc.h | 29 ++ drivers/crypto/fsl/jr.c | 462 ++++++++++++++++++ drivers/crypto/fsl/jr.h | 97 ++++ include/configs/B4860QDS.h | 11 + include/configs/BSC9131RDB.h | 7 + include/configs/BSC9132QDS.h | 11 + include/configs/C29XPCIE.h | 7 + include/configs/P1010RDB.h | 13 +- include/configs/P2041RDB.h | 11 + include/configs/T1040QDS.h | 8 + include/configs/T104xRDB.h | 8 + include/configs/T208xQDS.h | 8 + include/configs/T208xRDB.h | 8 + include/configs/T4240QDS.h | 11 + include/configs/T4240RDB.h | 8 + include/configs/corenet_ds.h | 11 + include/configs/ls1021aqds.h | 11 + include/configs/ls1021atwr.h | 12 + include/fsl_sec.h | 181 +++++++ 44 files changed, 2558 insertions(+), 74 deletions(-) create mode 100644 common/cmd_blob.c create mode 100644 configs/ls1021aqds_nor_SECURE_BOOT_defconfig create mode 100644 configs/ls1021atwr_nor_SECURE_BOOT_defconfig create mode 100644 drivers/crypto/fsl/Makefile create mode 100644 drivers/crypto/fsl/desc.h create mode 100644 drivers/crypto/fsl/desc_constr.h create mode 100644 drivers/crypto/fsl/error.c create mode 100644 drivers/crypto/fsl/fsl_blob.c create mode 100644 drivers/crypto/fsl/fsl_hash.c create mode 100644 drivers/crypto/fsl/jobdesc.c create mode 100644 drivers/crypto/fsl/jobdesc.h create mode 100644 drivers/crypto/fsl/jr.c create mode 100644 drivers/crypto/fsl/jr.h create mode 100644 include/fsl_sec.h Thanks, York

2 1

[U-Boot] Pull request: u-boot-video/master
by Anatolij Gustschin 21 Oct '14

21 Oct '14

Hey Tom, The following changes since commit c43fd23cf619856b0763a64a6a3bcf3663058c49: Prepare v2014.10 (2014-10-14 04:47:15 -0400) are available in the git repository at: git://git.denx.de/u-boot-video.git master for you to fetch changes up to 3e780af127282e5e24fa737a5b56d7c4523a72c9: video: ipu_disp: remove pixclk fixup (2014-10-16 11:00:26 +0200) ---------------------------------------------------------------- Jeroen Hofstee (2): video: ipu: fix debug and comment video: ipu_disp: remove pixclk fixup Simon Glass (1): lcd: Fix build error with CONFIG_LCD_BMP_RLE8 common/lcd.c | 4 ++-- drivers/video/ipu_disp.c | 33 +++++++-------------------------- drivers/video/mxc_ipuv3_fb.c | 7 +++---- include/configs/sandbox.h | 1 + 4 files changed, 13 insertions(+), 32 deletions(-) Please pull. Thanks! Anatolij

2 1

[U-Boot] [PATCH 0/9] ARM: sunxi: Add Allwinner A23 (sun8i) support
by Chen-Yu Tsai 21 Oct '14

21 Oct '14

Hi everyone, This series adds support for Allwinner's A23 SoC. All the patches are either direct cherry-picks or changes manually merged from u-boot-sunxi. Patch 1 fixes build breaks when CONFIG_MMC is not set. This happens when we use port F for uart0. Patch 2 adds uart0 pinmux values for A23. Patch 3 adds support for using uart0 on port F, either using a breakout board or soldering wires to exposed pads. At least one version of A23 tablets requires this, as no other uarts are exposed. Patch 4 adds support for sun8i in the mmc driver. This is the same as sun6i. Patch 5 adds machine support for sun8i. Patch 6 adds support for gpio banks L and beyond, which is used by r_uart, p2wi (on sun6i) and rsb (on sun8i). Patch 7 makes the prcm apb0 clock enabling function to take an argument for which modules should be enabled. Patch 8 adds support for using r_uart as a console (with CONS_INDEX=5). Patch 9 adds a defconfig for the Ippo Q8H A23 tablet board. Cheers ChenYu Chen-Yu Tsai (8): ARM: sunxi: Fix build break when CONFIG_MMC is not defined ARM: sunxi: Add sun8i (A23) UART0 pin mux support ARM: sunxi: Add support for uart0 on port F (mmc0) mmc: sunxi: Add support for sun8i (A23) ARM: sunxi: Add basic A23 support ARM: sunxi: Allow specifying module in prcm apb0 init function ARM: sunxi: Add support for using R_UART as console ARM: sunxi: Add Ippo-q8h-v5 A23 tablet board defconfig Hans de Goede (1): ARM: sunxi: Add support for R_PIO gpio banks arch/arm/Kconfig | 3 +++ arch/arm/cpu/armv7/sunxi/Makefile | 2 ++ arch/arm/cpu/armv7/sunxi/board.c | 18 +++++++++++++++-- arch/arm/cpu/armv7/sunxi/clock_sun6i.c | 6 ++++++ arch/arm/cpu/armv7/sunxi/cpu_info.c | 2 ++ arch/arm/cpu/armv7/sunxi/prcm.c | 12 +++++++----- arch/arm/include/asm/arch-sunxi/clock.h | 2 +- arch/arm/include/asm/arch-sunxi/cpu.h | 1 + arch/arm/include/asm/arch-sunxi/gpio.h | 34 +++++++++++++++++++++++++++++++-- arch/arm/include/asm/arch-sunxi/mmc.h | 2 +- arch/arm/include/asm/arch-sunxi/prcm.h | 2 +- board/sunxi/Kconfig | 9 ++++++++- board/sunxi/MAINTAINERS | 5 +++++ configs/Ippo_q8h_defconfig | 4 ++++ drivers/mmc/sunxi_mmc.c | 2 +- include/configs/sun8i.h | 23 ++++++++++++++++++++++ include/configs/sunxi-common.h | 11 ++++++++++- 17 files changed, 123 insertions(+), 15 deletions(-) create mode 100644 configs/Ippo_q8h_defconfig create mode 100644 include/configs/sun8i.h -- 2.1.1

4 29