April 2014 - U-Boot

[U-Boot] [PATCH 0/11] Dump Orphan boards
by Masahiro Yamada 18 Apr '14

18 Apr '14

Keeping unmaintained boards requires us extra efforts for our future work. More than a half year has passed these boards were moved to Orphan. Masahiro Yamada (11): powerpc: remove NX823 board support powerpc: remove MBX and MBX860T boards support powerpc: remove genietv board support powerpc: remove ADS860, FADS823, FADS850SAR, FADS860T support powerpc: remove RPXClassic, RPXlite boards support powerpc: remove RPXsuper board support powerpc: remove rsdproto board support powerpc: remove MOUSSE board support powerpc: remove EVB64260 board support arm: remove lubbock board support arm: remove mx31ads board support CREDITS | 4 - arch/powerpc/cpu/mpc824x/cpu_init.c | 88 --- arch/powerpc/cpu/mpc8xx/cpu_init.c | 21 - arch/powerpc/cpu/mpc8xx/scc.c | 23 - arch/powerpc/cpu/mpc8xx/serial.c | 8 +- arch/powerpc/include/asm/immap_512x.h | 1 - arch/powerpc/include/asm/u-boot.h | 3 - board/RPXClassic/Makefile | 8 - board/RPXClassic/README | 19 - board/RPXClassic/RPXClassic.c | 260 --------- board/RPXClassic/eccx.c | 335 ------------ board/RPXClassic/flash.c | 431 --------------- board/RPXClassic/u-boot.lds | 82 --- board/RPXClassic/u-boot.lds.debug | 121 ----- board/RPXlite/Makefile | 8 - board/RPXlite/README | 877 ------------------------------ board/RPXlite/README.PlanetCore | 163 ------ board/RPXlite/RPXlite.c | 149 ------ board/RPXlite/flash.c | 508 ------------------ board/RPXlite/u-boot.lds | 82 --- board/RPXlite/u-boot.lds.debug | 121 ----- board/fads/fads.c | 65 --- board/fads/fads.h | 5 - board/fads/lamp.c | 4 - board/fads/pcmcia.c | 13 - board/freescale/mx31ads/Makefile | 8 - board/freescale/mx31ads/lowlevel_init.S | 268 ---------- board/freescale/mx31ads/mx31ads.c | 114 ---- board/freescale/mx31ads/u-boot.lds | 107 ---- board/genietv/Makefile | 8 - board/genietv/flash.c | 449 ---------------- board/genietv/genietv.c | 360 ------------- board/genietv/u-boot.lds | 101 ---- board/genietv/u-boot.lds.debug | 127 ----- board/lubbock/Makefile | 8 - board/lubbock/flash.c | 412 -------------- board/lubbock/lubbock.c | 81 --- board/mbx8xx/Makefile | 8 - board/mbx8xx/README | 68 --- board/mbx8xx/csr.h | 44 -- board/mbx8xx/dimm.h | 98 ---- board/mbx8xx/flash.c | 392 -------------- board/mbx8xx/mbx8xx.c | 383 ------------- board/mbx8xx/pcmcia.c | 156 ------ board/mbx8xx/u-boot.lds | 82 --- board/mbx8xx/u-boot.lds.debug | 122 ----- board/mbx8xx/vpd.c | 180 ------- board/mbx8xx/vpd.h | 119 ----- board/mousse/Makefile | 8 - board/mousse/README | 346 ------------ board/mousse/flash.c | 917 -------------------------------- board/mousse/flash.h | 78 --- board/mousse/m48t59y.c | 308 ----------- board/mousse/m48t59y.h | 41 -- board/mousse/mousse.c | 77 --- board/mousse/mousse.h | 243 --------- board/mousse/pci.c | 267 ---------- board/mousse/u-boot.lds | 77 --- board/mousse/u-boot.lds.ram | 85 --- board/mousse/u-boot.lds.rom | 112 ---- board/nx823/Makefile | 8 - board/nx823/flash.c | 449 ---------------- board/nx823/nx823.c | 374 ------------- board/nx823/u-boot.lds | 82 --- board/nx823/u-boot.lds.debug | 121 ----- board/rpxsuper/Makefile | 8 - board/rpxsuper/flash.c | 416 --------------- board/rpxsuper/mii_phy.c | 107 ---- board/rpxsuper/readme | 30 -- board/rpxsuper/rpxsuper.c | 289 ---------- board/rpxsuper/rpxsuper.h | 25 - board/rsdproto/Makefile | 9 - board/rsdproto/flash.c | 386 -------------- board/rsdproto/flash_asm.S | 39 -- board/rsdproto/rsdproto.c | 361 ------------- board/rsdproto/u-boot.lds | 114 ---- boards.cfg | 16 - doc/README.console | 1 - doc/README.scrapyard | 14 +- doc/README.video | 2 - drivers/net/lan91c96.h | 6 - drivers/pcmcia/mpc8xx_pcmcia.c | 2 +- drivers/pcmcia/rpx_pcmcia.c | 4 +- include/asm-generic/u-boot.h | 3 - include/common.h | 11 - include/commproc.h | 208 -------- include/configs/ADS860.h | 60 --- include/configs/EVB64260.h | 406 -------------- include/configs/FADS823.h | 472 ---------------- include/configs/FADS850SAR.h | 415 --------------- include/configs/FADS860T.h | 58 -- include/configs/GENIETV.h | 354 ------------ include/configs/MBX.h | 290 ---------- include/configs/MBX860T.h | 395 -------------- include/configs/MOUSSE.h | 320 ----------- include/configs/NX823.h | 344 ------------ include/configs/RPXClassic.h | 483 ----------------- include/configs/RPXlite.h | 395 -------------- include/configs/RPXsuper.h | 501 ----------------- include/configs/lubbock.h | 236 -------- include/configs/mx31ads.h | 189 ------- include/configs/rsdproto.h | 400 -------------- include/pcmcia.h | 4 +- post/cpu/mpc8xx/ether.c | 11 - post/cpu/mpc8xx/uart.c | 6 +- 105 files changed, 19 insertions(+), 18058 deletions(-) delete mode 100644 board/RPXClassic/Makefile delete mode 100644 board/RPXClassic/README delete mode 100644 board/RPXClassic/RPXClassic.c delete mode 100644 board/RPXClassic/eccx.c delete mode 100644 board/RPXClassic/flash.c delete mode 100644 board/RPXClassic/u-boot.lds delete mode 100644 board/RPXClassic/u-boot.lds.debug delete mode 100644 board/RPXlite/Makefile delete mode 100644 board/RPXlite/README delete mode 100644 board/RPXlite/README.PlanetCore delete mode 100644 board/RPXlite/RPXlite.c delete mode 100644 board/RPXlite/flash.c delete mode 100644 board/RPXlite/u-boot.lds delete mode 100644 board/RPXlite/u-boot.lds.debug delete mode 100644 board/freescale/mx31ads/Makefile delete mode 100644 board/freescale/mx31ads/lowlevel_init.S delete mode 100644 board/freescale/mx31ads/mx31ads.c delete mode 100644 board/freescale/mx31ads/u-boot.lds delete mode 100644 board/genietv/Makefile delete mode 100644 board/genietv/flash.c delete mode 100644 board/genietv/genietv.c delete mode 100644 board/genietv/u-boot.lds delete mode 100644 board/genietv/u-boot.lds.debug delete mode 100644 board/lubbock/Makefile delete mode 100644 board/lubbock/flash.c delete mode 100644 board/lubbock/lubbock.c delete mode 100644 board/mbx8xx/Makefile delete mode 100644 board/mbx8xx/README delete mode 100644 board/mbx8xx/csr.h delete mode 100644 board/mbx8xx/dimm.h delete mode 100644 board/mbx8xx/flash.c delete mode 100644 board/mbx8xx/mbx8xx.c delete mode 100644 board/mbx8xx/pcmcia.c delete mode 100644 board/mbx8xx/u-boot.lds delete mode 100644 board/mbx8xx/u-boot.lds.debug delete mode 100644 board/mbx8xx/vpd.c delete mode 100644 board/mbx8xx/vpd.h delete mode 100644 board/mousse/Makefile delete mode 100644 board/mousse/README delete mode 100644 board/mousse/flash.c delete mode 100644 board/mousse/flash.h delete mode 100644 board/mousse/m48t59y.c delete mode 100644 board/mousse/m48t59y.h delete mode 100644 board/mousse/mousse.c delete mode 100644 board/mousse/mousse.h delete mode 100644 board/mousse/pci.c delete mode 100644 board/mousse/u-boot.lds delete mode 100644 board/mousse/u-boot.lds.ram delete mode 100644 board/mousse/u-boot.lds.rom delete mode 100644 board/nx823/Makefile delete mode 100644 board/nx823/flash.c delete mode 100644 board/nx823/nx823.c delete mode 100644 board/nx823/u-boot.lds delete mode 100644 board/nx823/u-boot.lds.debug delete mode 100644 board/rpxsuper/Makefile delete mode 100644 board/rpxsuper/flash.c delete mode 100644 board/rpxsuper/mii_phy.c delete mode 100644 board/rpxsuper/readme delete mode 100644 board/rpxsuper/rpxsuper.c delete mode 100644 board/rpxsuper/rpxsuper.h delete mode 100644 board/rsdproto/Makefile delete mode 100644 board/rsdproto/flash.c delete mode 100644 board/rsdproto/flash_asm.S delete mode 100644 board/rsdproto/rsdproto.c delete mode 100644 board/rsdproto/u-boot.lds delete mode 100644 include/configs/ADS860.h delete mode 100644 include/configs/EVB64260.h delete mode 100644 include/configs/FADS823.h delete mode 100644 include/configs/FADS850SAR.h delete mode 100644 include/configs/FADS860T.h delete mode 100644 include/configs/GENIETV.h delete mode 100644 include/configs/MBX.h delete mode 100644 include/configs/MBX860T.h delete mode 100644 include/configs/MOUSSE.h delete mode 100644 include/configs/NX823.h delete mode 100644 include/configs/RPXClassic.h delete mode 100644 include/configs/RPXlite.h delete mode 100644 include/configs/RPXsuper.h delete mode 100644 include/configs/lubbock.h delete mode 100644 include/configs/mx31ads.h delete mode 100644 include/configs/rsdproto.h -- 1.8.3.2

3 24

[U-Boot] [PATCH v2] tools: fix Makefile to clean-up fit_info and fit_check_sign
by Masahiro Yamada 18 Apr '14

18 Apr '14

We should avoid the description in Makefile like this ifdef CONFIG_FIT_SIGNATURE hostprogs-y += fit_info$(SFX) fit_check_sign$(SFX) endif Otherwise, fit_info and fit_check_sign would never be cleaned by "make clean". Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Heiko Schocher <hs(a)denx.de> --- This patch is against u-boot/next Changes in v2: - Add Signed-off-by tools/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index c5c378c..c34df4f 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -60,9 +60,7 @@ hostprogs-y += mkenvimage$(SFX) mkenvimage$(SFX)-objs := crc32.o mkenvimage.o os_support.o hostprogs-y += dumpimage$(SFX) mkimage$(SFX) -ifdef CONFIG_FIT_SIGNATURE -hostprogs-y += fit_info$(SFX) fit_check_sign$(SFX) -endif +hostprogs-$(CONFIG_FIT_SIGNATURE) += fit_info$(SFX) fit_check_sign$(SFX) FIT_SIG_OBJS-$(CONFIG_FIT_SIGNATURE) := image-sig.o # Flattened device tree objects -- 1.8.3.2

2 1

[U-Boot] [PATCH] blackfin: make name_to_gpio be a weak symbol
by Ian Campbell 18 Apr '14

18 Apr '14

This required moving it into a C file from the header. The only user of a non-default name_to_gpio is blackfin, therefore build tested with the blackfin bct-brettl2 build, which is one I picked at random. Also tested with a build for the ARM tec board which uses the default/fallback implementation. Inspection with objdump shows that both have done the right thing. This change was requested by Marek during review of the sunxi patch series. Signed-off-by: Ian Campbell <ijc(a)hellion.org.uk> Cc: Marek Vasut <marex(a)denx.de> Cc: Wolfgang Denk <wd(a)denx.de> Cc: Sonic Zhang <sonic.adi(a)gmail.com> --- arch/blackfin/cpu/gpio.c | 48 +++++++++++++++++++++++++++++++++++++++ arch/blackfin/include/asm/gpio.h | 49 ---------------------------------------- common/cmd_gpio.c | 7 +++--- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/arch/blackfin/cpu/gpio.c b/arch/blackfin/cpu/gpio.c index 86da706..4b4cf93 100644 --- a/arch/blackfin/cpu/gpio.c +++ b/arch/blackfin/cpu/gpio.c @@ -759,6 +759,54 @@ void bfin_reset_boot_spi_cs(unsigned short pin) udelay(1); } +int name_to_gpio(const char *name) +{ + int port_base; + + if (tolower(*name) == 'p') { + ++name; + + switch (tolower(*name)) { +#ifdef GPIO_PA0 + case 'a': port_base = GPIO_PA0; break; +#endif +#ifdef GPIO_PB0 + case 'b': port_base = GPIO_PB0; break; +#endif +#ifdef GPIO_PC0 + case 'c': port_base = GPIO_PC0; break; +#endif +#ifdef GPIO_PD0 + case 'd': port_base = GPIO_PD0; break; +#endif +#ifdef GPIO_PE0 + case 'e': port_base = GPIO_PE0; break; +#endif +#ifdef GPIO_PF0 + case 'f': port_base = GPIO_PF0; break; +#endif +#ifdef GPIO_PG0 + case 'g': port_base = GPIO_PG0; break; +#endif +#ifdef GPIO_PH0 + case 'h': port_base = GPIO_PH0; break; +#endif +#ifdef GPIO_PI0 + case 'i': port_base = GPIO_PI0; break; +#endif +#ifdef GPIO_PJ + case 'j': port_base = GPIO_PJ0; break; +#endif + default: return -1; + } + + ++name; + } else + port_base = 0; + + return port_base + simple_strtoul(name, NULL, 10); +} + void gpio_labels(void) { int c, gpio; diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h index 6ebcf01..1fa1a8e 100644 --- a/arch/blackfin/include/asm/gpio.h +++ b/arch/blackfin/include/asm/gpio.h @@ -160,55 +160,6 @@ static inline int gpio_is_valid(int number) #include <linux/ctype.h> -static inline int name_to_gpio(const char *name) -{ - int port_base; - - if (tolower(*name) == 'p') { - ++name; - - switch (tolower(*name)) { -#ifdef GPIO_PA0 - case 'a': port_base = GPIO_PA0; break; -#endif -#ifdef GPIO_PB0 - case 'b': port_base = GPIO_PB0; break; -#endif -#ifdef GPIO_PC0 - case 'c': port_base = GPIO_PC0; break; -#endif -#ifdef GPIO_PD0 - case 'd': port_base = GPIO_PD0; break; -#endif -#ifdef GPIO_PE0 - case 'e': port_base = GPIO_PE0; break; -#endif -#ifdef GPIO_PF0 - case 'f': port_base = GPIO_PF0; break; -#endif -#ifdef GPIO_PG0 - case 'g': port_base = GPIO_PG0; break; -#endif -#ifdef GPIO_PH0 - case 'h': port_base = GPIO_PH0; break; -#endif -#ifdef GPIO_PI0 - case 'i': port_base = GPIO_PI0; break; -#endif -#ifdef GPIO_PJ - case 'j': port_base = GPIO_PJ0; break; -#endif - default: return -1; - } - - ++name; - } else - port_base = 0; - - return port_base + simple_strtoul(name, NULL, 10); -} -#define name_to_gpio(n) name_to_gpio(n) - #define gpio_status() gpio_labels() #endif /* __ASSEMBLY__ */ diff --git a/common/cmd_gpio.c b/common/cmd_gpio.c index 778aa5f..aff0445 100644 --- a/common/cmd_gpio.c +++ b/common/cmd_gpio.c @@ -11,9 +11,10 @@ #include <dm.h> #include <asm/gpio.h> -#ifndef name_to_gpio -#define name_to_gpio(name) simple_strtoul(name, NULL, 10) -#endif +int __weak name_to_gpio(const char *name) +{ + return simple_strtoul(name, NULL, 10); +} enum gpio_cmd { GPIO_INPUT, -- 1.9.0

2 1

[U-Boot] [PATCH] ARM:tegra20: Remove aes debug prints
by Tom Rini 18 Apr '14

18 Apr '14

In 6e7b9f4 some of the debug prints for AES code moved into the generic code, so we remove these additional calls. Signed-off-by: Tom Rini <trini(a)ti.com> --- arch/arm/cpu/tegra20-common/crypto.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/arch/arm/cpu/tegra20-common/crypto.c b/arch/arm/cpu/tegra20-common/crypto.c index b18e67c..1382425 100644 --- a/arch/arm/cpu/tegra20-common/crypto.c +++ b/arch/arm/cpu/tegra20-common/crypto.c @@ -62,14 +62,11 @@ static void sign_object(u8 *key, u8 *key_schedule, u8 *src, u8 *dst, tmp_data[i] = 0; aes_cbc_encrypt_blocks(key_schedule, tmp_data, left, 1); - debug_print_vector("AES(key, nonce)", AES_KEY_LENGTH, left); left_shift_vector(left, k1, sizeof(left)); - debug_print_vector("L", AES_KEY_LENGTH, left); if ((left[0] >> 7) != 0) /* get MSB of L */ k1[AES_KEY_LENGTH-1] ^= AES_CMAC_CONST_RB; - debug_print_vector("K1", AES_KEY_LENGTH, k1); /* compute the AES-CMAC value */ for (i = 0; i < num_aes_blocks; i++) { @@ -84,16 +81,11 @@ static void sign_object(u8 *key, u8 *key_schedule, u8 *src, u8 *dst, aes_encrypt(tmp_data, key_schedule, dst); debug("sign_obj: block %d of %d\n", i, num_aes_blocks); - debug_print_vector("AES-CMAC Src", AES_KEY_LENGTH, src); - debug_print_vector("AES-CMAC Xor", AES_KEY_LENGTH, tmp_data); - debug_print_vector("AES-CMAC Dst", AES_KEY_LENGTH, dst); /* Update pointers for next loop. */ cbc_chain_data = dst; src += AES_KEY_LENGTH; } - - debug_print_vector("AES-CMAC Hash", AES_KEY_LENGTH, dst); } /** @@ -112,7 +104,6 @@ static int encrypt_and_sign(u8 *key, enum security_op oper, u8 *src, u8 key_schedule[AES_EXPAND_KEY_LENGTH]; debug("encrypt_and_sign: length = %d\n", length); - debug_print_vector("AES key", AES_KEY_LENGTH, key); /* * The only need for a key is for signing/checksum purposes, so -- 1.7.9.5

1 1

[U-Boot] [PATCH] aes: make apply_cbc_chain_data non-static
by Stephen Warren 18 Apr '14

18 Apr '14

From: Stephen Warren <swarren(a)nvidia.com> Tegra's crypto.c uses apply_cbc_chain_data() to sign the warm restart code. This function was recently moved into the core aes.c and made static, which prevents the Tegra code from compiling. Make it public again to avoid the compile errors: arch/arm/cpu/tegra20-common/crypto.c: In function ‘sign_object’: arch/arm/cpu/tegra20-common/crypto.c:74:3: warning: implicit declaration of function ‘apply_cbc_chain_data’ [-Wimplicit-function-declaration] arch/arm/cpu/built-in.o: In function `sign_object': .../arch/arm/cpu/tegra20-common/crypto.c:74: undefined reference to `apply_cbc_chain_data' .../arch/arm/cpu/tegra20-common/crypto.c:78: undefined reference to `apply_cbc_chain_data' Fixes: 6e7b9f4fa0ae ("aes: Move the AES-128-CBC encryption function to common code") Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- arch/arm/cpu/tegra20-common/crypto.c | 4 ++-- include/aes.h | 11 +++++++++++ lib/aes.c | 15 +++------------ 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/arch/arm/cpu/tegra20-common/crypto.c b/arch/arm/cpu/tegra20-common/crypto.c index 13824256874f..ec95d7ceb15d 100644 --- a/arch/arm/cpu/tegra20-common/crypto.c +++ b/arch/arm/cpu/tegra20-common/crypto.c @@ -71,11 +71,11 @@ static void sign_object(u8 *key, u8 *key_schedule, u8 *src, u8 *dst, /* compute the AES-CMAC value */ for (i = 0; i < num_aes_blocks; i++) { /* Apply the chain data */ - apply_cbc_chain_data(cbc_chain_data, src, tmp_data); + aes_apply_cbc_chain_data(cbc_chain_data, src, tmp_data); /* for the final block, XOR K1 into the IV */ if (i == num_aes_blocks - 1) - apply_cbc_chain_data(tmp_data, k1, tmp_data); + aes_apply_cbc_chain_data(tmp_data, k1, tmp_data); /* encrypt the AES block */ aes_encrypt(tmp_data, key_schedule, dst); diff --git a/include/aes.h b/include/aes.h index ee0e6c275f13..6315c02aa93d 100644 --- a/include/aes.h +++ b/include/aes.h @@ -61,6 +61,17 @@ void aes_encrypt(u8 *in, u8 *expkey, u8 *out); void aes_decrypt(u8 *in, u8 *expkey, u8 *out); /** + * Apply chain data to the destination using EOR + * + * Each array is of length AES_KEY_LENGTH. + * + * @cbc_chain_data Chain data + * @src Source data + * @dst Destination data, which is modified here + */ +void aes_apply_cbc_chain_data(u8 *cbc_chain_data, u8 *src, u8 *dst); + +/** * aes_cbc_encrypt_blocks() - Encrypt multiple blocks of data with AES CBC. * * @key_exp Expanded key to use diff --git a/lib/aes.c b/lib/aes.c index 05c97cd74098..9d7a0a1c1185 100644 --- a/lib/aes.c +++ b/lib/aes.c @@ -593,16 +593,7 @@ static void debug_print_vector(char *name, u32 num_bytes, u8 *data) #endif } -/** - * Apply chain data to the destination using EOR - * - * Each array is of length AES_KEY_LENGTH. - * - * @cbc_chain_data Chain data - * @src Source data - * @dst Destination data, which is modified here - */ -static void apply_cbc_chain_data(u8 *cbc_chain_data, u8 *src, u8 *dst) +void aes_apply_cbc_chain_data(u8 *cbc_chain_data, u8 *src, u8 *dst) { int i; @@ -623,7 +614,7 @@ void aes_cbc_encrypt_blocks(u8 *key_exp, u8 *src, u8 *dst, u32 num_aes_blocks) debug_print_vector("AES Src", AES_KEY_LENGTH, src); /* Apply the chain data */ - apply_cbc_chain_data(cbc_chain_data, src, tmp_data); + aes_apply_cbc_chain_data(cbc_chain_data, src, tmp_data); debug_print_vector("AES Xor", AES_KEY_LENGTH, tmp_data); /* Encrypt the AES block */ @@ -655,7 +646,7 @@ void aes_cbc_decrypt_blocks(u8 *key_exp, u8 *src, u8 *dst, u32 num_aes_blocks) debug_print_vector("AES Xor", AES_KEY_LENGTH, tmp_data); /* Apply the chain data */ - apply_cbc_chain_data(cbc_chain_data, tmp_data, dst); + aes_apply_cbc_chain_data(cbc_chain_data, tmp_data, dst); debug_print_vector("AES Dst", AES_KEY_LENGTH, dst); /* Update pointers for next loop. */ -- 1.8.1.5

4 3

[U-Boot] [PATCH] ARM: tegra: set CONFIG_SYS_MMC_MAX_DEVICE
by Stephen Warren 18 Apr '14

18 Apr '14

From: Stephen Warren <swarren(a)nvidia.com> If CONFIG_API is ever to be enabled on Tegra, this define must be set, since api/api_storage.c uses it. A couple of annoyting things about CONFIG_SYS_MMC_MAX_DEVICE 1) It isn't documented in README. The same is true for a lot of similar defines used by api_storage.c. 2) It doesn't represent MAX_DEVICE but rather NUM_DEVICES, since the valid values are 0..n-1 not 0..n. However, I this patch does not address those shortcomings. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- arch/arm/include/asm/arch-tegra/tegra_mmc.h | 2 -- drivers/mmc/tegra_mmc.c | 13 ++++++++----- include/configs/tegra-common.h | 7 +++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/arch/arm/include/asm/arch-tegra/tegra_mmc.h b/arch/arm/include/asm/arch-tegra/tegra_mmc.h index 310bbd7df9fe..84e7b5553de1 100644 --- a/arch/arm/include/asm/arch-tegra/tegra_mmc.h +++ b/arch/arm/include/asm/arch-tegra/tegra_mmc.h @@ -14,8 +14,6 @@ /* for mmc_config definition */ #include <mmc.h> -#define MAX_HOSTS 4 /* Max number of 'hosts'/controllers */ - #ifndef __ASSEMBLY__ struct tegra_mmc { unsigned int sysad; /* _SYSTEM_ADDRESS_0 */ diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index ed67eec25273..ca9c4aa15fee 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -18,7 +18,7 @@ DECLARE_GLOBAL_DATA_PTR; -struct mmc_host mmc_host[MAX_HOSTS]; +struct mmc_host mmc_host[CONFIG_SYS_MMC_MAX_DEVICE]; #ifndef CONFIG_OF_CONTROL #error "Please enable device tree support to use this driver" @@ -669,13 +669,14 @@ static int process_nodes(const void *blob, int node_list[], int count) void tegra_mmc_init(void) { - int node_list[MAX_HOSTS], count; + int node_list[CONFIG_SYS_MMC_MAX_DEVICE], count; const void *blob = gd->fdt_blob; debug("%s entry\n", __func__); /* See if any Tegra124 MMC controllers are present */ count = fdtdec_find_aliases_for_id(blob, "sdhci", - COMPAT_NVIDIA_TEGRA124_SDMMC, node_list, MAX_HOSTS); + COMPAT_NVIDIA_TEGRA124_SDMMC, node_list, + CONFIG_SYS_MMC_MAX_DEVICE); debug("%s: count of Tegra124 sdhci nodes is %d\n", __func__, count); if (process_nodes(blob, node_list, count)) { printf("%s: Error processing T30 mmc node(s)!\n", __func__); @@ -684,7 +685,8 @@ void tegra_mmc_init(void) /* See if any Tegra30 MMC controllers are present */ count = fdtdec_find_aliases_for_id(blob, "sdhci", - COMPAT_NVIDIA_TEGRA30_SDMMC, node_list, MAX_HOSTS); + COMPAT_NVIDIA_TEGRA30_SDMMC, node_list, + CONFIG_SYS_MMC_MAX_DEVICE); debug("%s: count of T30 sdhci nodes is %d\n", __func__, count); if (process_nodes(blob, node_list, count)) { printf("%s: Error processing T30 mmc node(s)!\n", __func__); @@ -693,7 +695,8 @@ void tegra_mmc_init(void) /* Now look for any Tegra20 MMC controllers */ count = fdtdec_find_aliases_for_id(blob, "sdhci", - COMPAT_NVIDIA_TEGRA20_SDMMC, node_list, MAX_HOSTS); + COMPAT_NVIDIA_TEGRA20_SDMMC, node_list, + CONFIG_SYS_MMC_MAX_DEVICE); debug("%s: count of T20 sdhci nodes is %d\n", __func__, count); if (process_nodes(blob, node_list, count)) { printf("%s: Error processing T20 mmc node(s)!\n", __func__); diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index ae786cfd7a0f..129acf2cbf81 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -48,6 +48,13 @@ #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK /* + * Common HW configuration. + * If this varies between SoCs later, move to tegraNN-common.h + * Note: This is number of devices, not max device ID. + */ +#define CONFIG_SYS_MMC_MAX_DEVICE 4 + +/* * select serial console configuration */ #define CONFIG_CONS_INDEX 1 -- 1.8.1.5

1 0

[U-Boot] [PATCH 1/4] aes: Fix kerneldoc for aes.h
by Marek Vasut 18 Apr '14

18 Apr '14

Fix the function annotations in aes.h so they're compatible with kerneldoc. Signed-off-by: Marek Vasut <marex(a)denx.de> --- include/aes.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/include/aes.h b/include/aes.h index ea06308..c70eda6 100644 --- a/include/aes.h +++ b/include/aes.h @@ -25,29 +25,31 @@ enum { }; /** + * aes_expand_key() - Expand the AES key + * * Expand a key into a key schedule, which is then used for the other * operations. * - * \param key Key, of length AES_KEY_LENGTH bytes - * \param expkey Buffer to place expanded key, AES_EXPAND_KEY_LENGTH + * @key Key, of length AES_KEY_LENGTH bytes + * @expkey Buffer to place expanded key, AES_EXPAND_KEY_LENGTH */ void aes_expand_key(u8 *key, u8 *expkey); /** - * Encrypt a single block of data + * aes_encrypt() - Encrypt single block of data with AES 128 * - * in Input data - * expkey Expanded key to use for encryption (from aes_expand_key()) - * out Output data + * @in Input data + * @expkey Expanded key to use for encryption (from aes_expand_key()) + * @out Output data */ void aes_encrypt(u8 *in, u8 *expkey, u8 *out); /** - * Decrypt a single block of data + * aes_decrypt() - Decrypt single block of data with AES 128 * - * in Input data - * expkey Expanded key to use for decryption (from aes_expand_key()) - * out Output data + * @in Input data + * @expkey Expanded key to use for decryption (from aes_expand_key()) + * @out Output data */ void aes_decrypt(u8 *in, u8 *expkey, u8 *out); -- 1.8.5.2

3 8

Re: [U-Boot] [trini@ti.com: [PATCH] ARM:tegra20: Remove aes debug prints]
by Tom Warren 18 Apr '14

18 Apr '14

LGTM Acked-by: Tom Warren <twarren(a)nvidia.com> -- nvpublic > -----Original Message----- > From: Tom Rini [mailto:tom.rini@gmail.com] On Behalf Of Tom Rini > Sent: Friday, April 18, 2014 6:19 AM > To: Simon Glass; Tom Warren; Stephen Warren > Subject: [trini(a)ti.com: [PATCH] ARM:tegra20: Remove aes debug prints] > > * PGP Signed by an unknown key > > Oops, should have CC'd you guys, sorry > > ----- Forwarded message from Tom Rini <trini(a)ti.com> ----- > > Date: Fri, 18 Apr 2014 08:18:23 -0400 > From: Tom Rini <trini(a)ti.com> > To: u-boot(a)lists.denx.de > Subject: [PATCH] ARM:tegra20: Remove aes debug prints > > In 6e7b9f4 some of the debug prints for AES code moved into the generic > code, so we remove these additional calls. > > Signed-off-by: Tom Rini <trini(a)ti.com> > --- > arch/arm/cpu/tegra20-common/crypto.c | 9 --------- > 1 file changed, 9 deletions(-) > > diff --git a/arch/arm/cpu/tegra20-common/crypto.c > b/arch/arm/cpu/tegra20-common/crypto.c > index b18e67c..1382425 100644 > --- a/arch/arm/cpu/tegra20-common/crypto.c > +++ b/arch/arm/cpu/tegra20-common/crypto.c > @@ -62,14 +62,11 @@ static void sign_object(u8 *key, u8 *key_schedule, u8 > *src, u8 *dst, > tmp_data[i] = 0; > > aes_cbc_encrypt_blocks(key_schedule, tmp_data, left, 1); > - debug_print_vector("AES(key, nonce)", AES_KEY_LENGTH, left); > > left_shift_vector(left, k1, sizeof(left)); > - debug_print_vector("L", AES_KEY_LENGTH, left); > > if ((left[0] >> 7) != 0) /* get MSB of L */ > k1[AES_KEY_LENGTH-1] ^= AES_CMAC_CONST_RB; > - debug_print_vector("K1", AES_KEY_LENGTH, k1); > > /* compute the AES-CMAC value */ > for (i = 0; i < num_aes_blocks; i++) { @@ -84,16 +81,11 @@ static void > sign_object(u8 *key, u8 *key_schedule, u8 *src, u8 *dst, > aes_encrypt(tmp_data, key_schedule, dst); > > debug("sign_obj: block %d of %d\n", i, num_aes_blocks); > - debug_print_vector("AES-CMAC Src", AES_KEY_LENGTH, > src); > - debug_print_vector("AES-CMAC Xor", AES_KEY_LENGTH, > tmp_data); > - debug_print_vector("AES-CMAC Dst", AES_KEY_LENGTH, > dst); > > /* Update pointers for next loop. */ > cbc_chain_data = dst; > src += AES_KEY_LENGTH; > } > - > - debug_print_vector("AES-CMAC Hash", AES_KEY_LENGTH, dst); > } > > /** > @@ -112,7 +104,6 @@ static int encrypt_and_sign(u8 *key, enum > security_op oper, u8 *src, > u8 key_schedule[AES_EXPAND_KEY_LENGTH]; > > debug("encrypt_and_sign: length = %d\n", length); > - debug_print_vector("AES key", AES_KEY_LENGTH, key); > > /* > * The only need for a key is for signing/checksum purposes, so > -- > 1.7.9.5 > > > ----- End forwarded message ----- > > -- > Tom > > * Unknown Key > * 0x94391D56

1 0

[U-Boot] [PATCH] am33xx: add SSC enable macro
by yegorslists＠googlemail.com 18 Apr '14

18 Apr '14

From: Yegor Yefremov <yegorslists(a)googlemail.com> Signed-off-by: Yegor Yefremov <yegorslists(a)googlemail.com> --- arch/arm/include/asm/arch-am33xx/clock.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/include/asm/arch-am33xx/clock.h b/arch/arm/include/asm/arch-am33xx/clock.h index 7637457..f00fad3 100644 --- a/arch/arm/include/asm/arch-am33xx/clock.h +++ b/arch/arm/include/asm/arch-am33xx/clock.h @@ -42,6 +42,8 @@ #define MODULE_CLKCTRL_IDLEST_DISABLED 3 /* CM_CLKMODE_DPLL */ +#define CM_CLKMODE_DPLL_SSC_EN_SHIFT 12 +#define CM_CLKMODE_DPLL_SSC_EN_MASK (1 << 12) #define CM_CLKMODE_DPLL_REGM4XEN_SHIFT 11 #define CM_CLKMODE_DPLL_REGM4XEN_MASK (1 << 11) #define CM_CLKMODE_DPLL_LPMODE_EN_SHIFT 10 -- 1.7.7

3 3

[U-Boot] [PATCH 1/2] usb: r8a66597: Fix initialization hub that using, R8A66597_MAX_ROOT_HUB
by yasuhisa umano 18 Apr '14

18 Apr '14

This driver is processed as two USB hub despite one. The number of root hub is defined in R8A66597_MAX_ROOT_HUB. This fixes that register is accessed by using the definition of R8A66597_MAX_ROOT_HUB. Signed-off-by: Yasuhisa Umano <yasuhisa.umano.zc(a)renesas.com> --- drivers/usb/host/r8a66597-hcd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index dfe5423..c58d2a9 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c @@ -164,8 +164,8 @@ static int enable_controller(struct r8a66597 *r8a66597) r8a66597_bset(r8a66597, INTL, SOFCFG); r8a66597_write(r8a66597, 0, INTENB0); - r8a66597_write(r8a66597, 0, INTENB1); - r8a66597_write(r8a66597, 0, INTENB2); + for (port = 0; port < R8A66597_MAX_ROOT_HUB; port++) + r8a66597_write(r8a66597, 0, get_intenb_reg(port)); r8a66597_bset(r8a66597, CONFIG_R8A66597_ENDIAN & BIGEND, CFIFOSEL); r8a66597_bset(r8a66597, CONFIG_R8A66597_ENDIAN & BIGEND, D0FIFOSEL); -- 1.7.9.5

3 5