Re: [U-Boot] [PATCH 3/4] lib, fdt: move fdtdec_get_int() out of lib/fdtdec.c
Hello Simon,
Am 09.05.2014 21:59, schrieb Simon Glass:
Hi Heiko,
On 8 May 2014 05:05, Heiko Schocherh...@denx.de wrote:
move fdtdec_get_int() out of lib/fdtdec.c into lib/fdtdec_common.c
as this function is also used, if CONFIG_OF_CONTROL is not
used. Poped up on the ids8313 board using signed FIT images,
and activating CONFIG_SYS_GENERIC_BOARD. Without this patch
it shows on boot:
No valid FDT found - please append one to U-Boot binary, use u-boot-dtb.bin or define
CONFIG_OF_EMBED. For sandbox, use -dfile.dtb
With this patch, it boots again with CONFIG_SYS_GENERIC_BOARD
enabled.
Signed-off-by: Heiko Schocherh...@denx.de
Cc: Simon Glasss...@chromium.org
Cc: Tom Rinitr...@ti.com
What is the reason why we can't have a common function? Is it because
of the s32 type?
I removed the two implementations and used now only:
int fdtdec_get_int(const void *blob, int node, const char *prop_name,
int default_val)
{
const int *cell;
int len;
cell = fdt_getprop_w((void *)blob, node, prop_name, len);
if (cell len = sizeof(int)) {
int val = fdt32_to_cpu(cell[0]);
return val;
}
return default_val;
}
in lib/fdtdec_common.c. I see no compiler error/warnings for the
ids8313 board and the tools for host and target side ... so if this
is OK for you, I can send a v2.
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [U-boot] himport_r() function question
Hi, experts: Set_default_env() function will call himport_r() function. Himport_r() will create hash tables for env variables. But on some very slow software emulator platform, himport_r() run very slowly! So , my question is: Would Himport_r() be omitted in set_default_env() ? Best wishes, ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/4] bootm: allow to disable legacy image format
Hello Tom, Simon, Wolfgang, Lars, Am 09.05.2014 21:12, schrieb Tom Rini: On Fri, May 09, 2014 at 12:47:44PM -0600, Simon Glass wrote: Hi Wolfgang, On 9 May 2014 07:35, Wolfgang Denkw...@denx.de wrote: Dear Simon, In messageCAPnjgZ1_Cf-eu592YqF0=th7mt1da6gh7pv1lxaf79kv8lw...@mail.gmail.com you wrote: I agree that it might be dangerous to allow legacy boot when signature verification is used. It would be nice to fix that. I think there is general agreement on this point. This means that legacy is on by default, unless signature verification is enabled, in which case the default flips. But I worry that it might only confuse people. This seems like a Wolfgang / Tom question :-) OK, here is my 0.02€ to it: I think, no matter how we implement it, this should exactly the behaviour. Average users tend to avoid reading documentation, so if they enable signature verification the most likely want a secure system, so we should give them just that. Only if someone really knows what he is doing he should be able to enable support for (insecure) legacy images. As for the implementation - yes, the #ifdef CONFIG_FIT_SIGNATURE_VERIFICATION approach indeed does not look very nice, but then, it appears to be the straightforward implementation of what we want to do? OK, well in that case, let's do it that way. Agreed, then we can look for clever ways to refactor the code after. Ok, summary for one first step (I can do): - introduce CONFIG_IMAGE_FORMAT_LEGACY based on patch [1] (rename +#if !defined(CONFIG_DISABLE_IMAGE_FORMAT_LEGACY) to +#if defined(CONFIG_IMAGE_FORMAT_LEGACY)) - set CONFIG_IMAGE_FORMAT_LEGACY as default: (little bit adapted towards simons CONFIG_FIT_SIGNATURE_VERIFICATION proposal ... I dont want to introduce a new define ...) in config_defaults: +#ifndef CONFIG_FIT_SIGNATURE +#define CONFIG_IMAGE_LEGACY +#endif so, if boards not define CONFIG_FIT_SIGNATURE, they have default CONFIG_IMAGE_FORMAT_LEGACY enabled (as currently). If CONFIG_FIT_SIGNATURE is enabled, legacy image format is default disabled (change current behaviour of boards, which use this feature! This is only the case for: $ grep -lr CONFIG_FIT_SIGNATURE include/ include/configs/zynq-common.h - Michal, add Michal therefore to Cc include/configs/sandbox.h - Simon include/configs/ids8313.h - me include/image.h $ ), but boards can enable it if needed (as ids8313 board needs it ... yes not nice ...) If boards which have not enabled CONFIG_FIT_SIGNATURE and want to disable legacy image format ... we can add this case if we want like: in config_defaults: +#ifndef CONFIG_FIT_SIGNATURE +#define CONFIG_IMAGE_LEGACY +#endif + +#ifdef CONFIG_DISABLE_IMAGE_LEGACY +#undef CONFIG_IMAGE_LEGACY +#endif Is this a way to go? bye, Heiko [1]: [U-Boot] [PATCH 1/4] bootm: allow to disable legacy image format http://lists.denx.de/pipermail/u-boot/2014-May/179190.html -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ARM: OMAP: Fix omap_sdram_size calculation
Last section of DMM is used for trapping tiler unmapped sections.
Corresponding trap_size should be deducted from total SDRAM size
only if trap section is overlapping with available SDRAM
based on DMM sections. Fixing the same.
Signed-off-by: Lokesh Vutla lokeshvu...@ti.com
---
arch/arm/cpu/armv7/omap-common/hwinit-common.c | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c
b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
index 8ebc0ce..1a8acc8 100644
--- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c
+++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
@@ -185,7 +185,7 @@ u32 omap_sdram_size(void)
{
u32 section, i, valid;
u64 sdram_start = 0, sdram_end = 0, addr,
- size, total_size = 0, trap_size = 0;
+ size, total_size = 0, trap_size = 0, trap_start = 0;
for (i = 0; i 4; i++) {
section = __raw_readl(DMM_BASE + i*4);
@@ -208,12 +208,15 @@ u32 omap_sdram_size(void)
sdram_end = addr + size;
} else {
trap_size = size;
+ trap_start = addr;
}
-
}
-
}
- total_size = (sdram_end - sdram_start) - (trap_size);
+
+ if ((trap_start = sdram_start) (trap_start sdram_end))
+ total_size = (sdram_end - sdram_start) - (trap_size);
+ else
+ total_size = sdram_end - sdram_start;
return total_size;
}
--
1.7.9.5
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4] dfu: Introduction of the dfu_hash_algo env variable for checksum method setting
Up till now the CRC32 of received data was calculated unconditionally.
The standard crc32 implementation causes long delay when large images
were uploaded.
The dfu_hash_algo environment variable gives the opportunity to
disable on demand the hash (crc32) calculation.
It can be done without the need to recompile the u-boot binary.
By default the crc32 is calculated, which means that legacy behavior
has been preserved.
Tests results:
400 MiB ums.img file
Withcrc32 calculation: 65 sec [avg 6.29 MB/s]
Without crc32 calculation: 25 sec [avg 16.17 MB/s]
Signed-off-by: Lukasz Majewski l.majew...@samsung.com
Cc: Marek Vasut ma...@denx.de
---
Changes for v2:
- Utilization of hash_block generic function to calculate CRC32 checksum
Changes for v3:
- Remove dependency on altering the lib/hash.c generic implementation
- Use of hash_update() function to calculate crc32 in the same way as
it was done with crc32
Changes for v4:
- When dfu_hash_algo env is not defined, the crc32 is calculated
---
drivers/dfu/dfu.c | 52 +++-
1 file changed, 47 insertions(+), 5 deletions(-)
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index a938109..5878f99 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -13,6 +13,7 @@
#include mmc.h
#include fat.h
#include dfu.h
+#include hash.h
#include linux/list.h
#include linux/compiler.h
@@ -20,6 +21,7 @@ static bool dfu_reset_request;
static LIST_HEAD(dfu_list);
static int dfu_alt_num;
static int alt_num_cnt;
+static struct hash_algo *dfu_hash_algo;
bool dfu_reset(void)
{
@@ -99,6 +101,29 @@ unsigned char *dfu_get_buf(void)
return dfu_buf;
}
+static char *dfu_get_hash_algo(void)
+{
+ char *s;
+
+ s = getenv(dfu_hash_algo);
+ /*
+* By default the legacy behaviour to calculate the crc32 hash
+* value is preserved.
+*
+* To disable calculation of the hash algorithm for received data
+* specify the dfu_hash_algo = disabled at your board envs.
+*/
+ debug(%s: DFU hash method: %s\n, __func__, s ? s : not specified);
+
+ if (!s || !strcmp(s, crc32))
+ return crc32;
+
+ if (!strcmp(s, disabled))
+ return NULL;
+
+ return NULL;
+}
+
static int dfu_write_buffer_drain(struct dfu_entity *dfu)
{
long w_size;
@@ -109,8 +134,9 @@ static int dfu_write_buffer_drain(struct dfu_entity *dfu)
if (w_size == 0)
return 0;
- /* update CRC32 */
- dfu-crc = crc32(dfu-crc, dfu-i_buf_start, w_size);
+ if (dfu_hash_algo)
+ dfu_hash_algo-hash_update(dfu_hash_algo, dfu-crc,
+ dfu-i_buf_start, w_size, 0);
ret = dfu-write_medium(dfu, dfu-offset, dfu-i_buf_start, w_size);
if (ret)
@@ -138,7 +164,9 @@ int dfu_flush(struct dfu_entity *dfu, void *buf, int size,
int blk_seq_num)
if (dfu-flush_medium)
ret = dfu-flush_medium(dfu);
- printf(\nDFU complete CRC32: 0x%08x\n, dfu-crc);
+ if (dfu_hash_algo)
+ printf(\nDFU complete %s: 0x%08x\n, dfu_hash_algo-name,
+ dfu-crc);
/* clear everything */
dfu_free_buf();
@@ -238,7 +266,11 @@ static int dfu_read_buffer_fill(struct dfu_entity *dfu,
void *buf, int size)
/* consume */
if (chunk 0) {
memcpy(buf, dfu-i_buf, chunk);
- dfu-crc = crc32(dfu-crc, buf, chunk);
+ if (dfu_hash_algo)
+ dfu_hash_algo-hash_update(dfu_hash_algo,
+ dfu-crc, buf,
+ chunk, 0);
+
dfu-i_buf += chunk;
dfu-b_left -= chunk;
dfu-r_left -= chunk;
@@ -322,7 +354,9 @@ int dfu_read(struct dfu_entity *dfu, void *buf, int size,
int blk_seq_num)
}
if (ret size) {
- debug(%s: %s CRC32: 0x%x\n, __func__, dfu-name, dfu-crc);
+ if (dfu_hash_algo)
+ debug(%s: %s %s: 0x%x\n, __func__, dfu-name,
+ dfu_hash_algo-name, dfu-crc);
puts(\nUPLOAD ... done\nCtrl+C to exit ...\n);
dfu_free_buf();
@@ -397,6 +431,14 @@ int dfu_config_entities(char *env, char *interface, int
num)
dfu_alt_num = dfu_find_alt_num(env);
debug(%s: dfu_alt_num=%d\n, __func__, dfu_alt_num);
+ dfu_hash_algo = NULL;
+ s = dfu_get_hash_algo();
+ if (s) {
+ ret = hash_lookup_algo(s, dfu_hash_algo);
+ if (ret)
+ error(Hash algorithm %s not supported\n, s);
+ }
+
dfu = calloc(sizeof(*dfu), dfu_alt_num);
if (!dfu)
return -1;
--
1.7.10.4
[U-Boot] [PATCH 2/2] usb:gadget:f_thor: download_tail(): remove dfu_write with 0 size
Since dfu_flush() can write raw data, dfu_write() with zero size
can be removed from download_tail() in thor gadget.
Signed-off-by: Przemyslaw Marczak p.marc...@samsung.com
Cc: Lukasz Majewski l.majew...@samsung.com
Cc: Heiko Schocher h...@denx.de
Cc: Marek Vasut ma...@denx.de
---
drivers/usb/gadget/f_thor.c | 12 +++-
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c
index feef9e4..28f215e 100644
--- a/drivers/usb/gadget/f_thor.c
+++ b/drivers/usb/gadget/f_thor.c
@@ -219,21 +219,15 @@ static int download_tail(long long int left, int cnt)
}
/*
-* To store last packet DFU storage backend requires dfu_write with
-* size parameter equal to 0
+* To store last packet or write file from buffer to filesystem
+* DFU storage backend requires dfu_flush
*
* This also frees memory malloc'ed by dfu_get_buf(), so no explicit
* need fo call dfu_free_buf() is needed.
*/
- ret = dfu_write(dfu_entity, transfer_buffer, 0, cnt);
- if (ret)
- error(DFU write failed [%d] cnt: %d, ret, cnt);
-
ret = dfu_flush(dfu_entity, transfer_buffer, 0, cnt);
- if (ret) {
+ if (ret)
error(DFU flush failed!);
- return ret;
- }
return ret;
}
--
1.9.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] drivers:dfu: dfu_flush(): add raw data flush to complete dfu write
Before dfu write and flush operations separation,
dfu write data was flushed by host download request
with len of zero size.
Since above change manually calling dfu write with zero
size has non sense (e.g. in THOR). This should be done by
flush operation.
So now dfu_write_buffer_drain() is called in dfu_flush().
If there is any raw data to flush (like it can be in thor)
then it will be physically written to medium.
Signed-off-by: Przemyslaw Marczak p.marc...@samsung.com
Cc: Lukasz Majewski l.majew...@samsung.com
Cc: Heiko Schocher h...@denx.de
Cc: Marek Vasut ma...@denx.de
---
drivers/dfu/dfu.c | 4
1 file changed, 4 insertions(+)
diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c
index 51b1026..a938109 100644
--- a/drivers/dfu/dfu.c
+++ b/drivers/dfu/dfu.c
@@ -131,6 +131,10 @@ int dfu_flush(struct dfu_entity *dfu, void *buf, int size,
int blk_seq_num)
{
int ret = 0;
+ ret = dfu_write_buffer_drain(dfu);
+ if (ret)
+ return ret;
+
if (dfu-flush_medium)
ret = dfu-flush_medium(dfu);
--
1.9.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Mainline u-boot on socfpga (SocKit) board
Hi! I know that mainline U-Boot SPL is quite far from working on socfpga... but would like to ask, what is the status of U-Boot proper. That should work on socfpga, right? Or are there some pieces missing? I tried commit 173d294b94cfec10063a5be40934d6d8fb7981ce Merge: 33b0f7b 870e0bd Author: Tom Rini tr...@ti.com Date: Tue May 6 14:55:45 2014 -0400 Merge branch 'serial' of git://www.denx.de/git/u-boot-microblaze and it just dies with no output. I'd really like to get something close to mainline working, so that I can generate patches etc. The missing piece here is the SDRAM driver. This is a big piece as U-boot require the SDRAM to run. As of now, I am enhancing the existing SDRAM drivers to ensure its compliance with the coding standard. I know about missing SDRAM driver, but that is in u-boot-spl, not u-boot (right?). I know u-boot-spl is not feasible right now, but I'd like to get at least u-boot proper to work. Is that something else that is known to be missing? But nevertheless, it poses another challenge when come to license. The driver is currently licensed under BSD-3 clause. Wonder can we upstream BSD-3 clause code? Any advise would be appreciated. So: You are copyright holders, you can change the license. (Right?) Second, it seems that BSD-3 clause is actually GPL-compatible: Best regards, Pavel https://www.gnu.org/licenses/license-list.html#GPLCompatibleLicenses Modified BSD license (#ModifiedBSD) This is the original BSD license, modified by removal of the advertising clause. It is a lax, permissive non-copyleft free software license, compatible with the GNU GPL. This license is sometimes referred to as the 3-clause BSD license. The modified BSD license is not bad, as lax permissive licenses go, though the Apache 2.0 license is preferable. However, it is risky to recommend use of “the BSD license”, even for special cases such as small programs, because confusion could easily occur and lead to use of the flawed original BSD license. To avoid this risk, you can suggest the X11 license instead. The X11 license and the modified revised BSD license are more or less equivalent. However, the Apache 2.0 license is better for substantial programs, since it prevents patent treachery. -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] tools, env, aes: fix compiling env tools for target
On Monday, May 12, 2014 at 07:54:49 AM, Heiko Schocher wrote: compiling env tools for the target leads with current u-boot in following compile error: $ make CROSS_COMPILE=powerpc-linux- env make[1]: *** Keine Regel vorhanden, um das Target »tools/env/aes.c«, benötigt von »tools/env/aes.o«, zu erstellen. Schluss. make: *** [env] Fehler 2 $ Fix it! Look at '[PATCH] tools: env: Add aes.c placeholder' , Message-Id: 1398678990-7725-1-git-send-email-ma...@denx.de , that one fixes it too :) Best regards, Marek Vasut ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [zynq]: How to boot using u-boot-spl and image.ub?
Hi, I found the following log messages running from sd card: [Mon May 12 15:55:57.308 2014] [Mon May 12 15:55:57.308 2014] U-Boot SPL 2014.01 (May 12 2014 - 15:21:20) [Mon May 12 15:55:57.308 2014] mmc boot [Mon May 12 15:55:57.355 2014] reading fpga.bin [Mon May 12 15:55:57.371 2014] spl: error reading image fpga.bin, err - -1 [Mon May 12 15:55:57.371 2014] reading system.dtb [Mon May 12 15:55:57.386 2014] spl: error reading image system.dtb, err - -1 [Mon May 12 15:55:57.386 2014] reading u-boot.img [Mon May 12 15:55:57.386 2014] reading u-boot.img [Mon May 12 15:55:57.433 2014] [Mon May 12 15:55:57.433 2014] [Mon May 12 15:55:57.433 2014] U-Boot 2014.01 (May 12 2014 - 15:21:20) [Mon May 12 15:55:57.433 2014] [Mon May 12 15:55:57.433 2014] I2C: ready [Mon May 12 15:55:57.433 2014] Memory: ECC disabled [Mon May 12 15:55:57.433 2014] DRAM: 1 GiB [Mon May 12 15:55:57.464 2014] MMC: zynq_sdhci: 0 [Mon May 12 15:55:57.464 2014] Using default environment [Mon May 12 15:55:57.464 2014] [Mon May 12 15:55:57.464 2014] In:serial [Mon May 12 15:55:57.464 2014] Out: serial [Mon May 12 15:55:57.464 2014] Err: serial [Mon May 12 15:55:57.464 2014] Net: Gem.e000b000 [Mon May 12 15:55:57.464 2014] Hit any key to stop autoboot: 3 2 1 0 [Mon May 12 15:56:00.522 2014] Device: zynq_sdhci [Mon May 12 15:56:00.522 2014] Manufacturer ID: 2 [Mon May 12 15:56:00.522 2014] OEM: 544d [Mon May 12 15:56:00.522 2014] Name: SA02G [Mon May 12 15:56:00.522 2014] Tran Speed: 5000 [Mon May 12 15:56:00.522 2014] Rd Block Len: 512 [Mon May 12 15:56:00.522 2014] SD version 3.0 [Mon May 12 15:56:00.522 2014] High Capacity: No [Mon May 12 15:56:00.522 2014] Capacity: 1.8 GiB [Mon May 12 15:56:00.522 2014] Bus Width: 4-bit [Mon May 12 15:56:00.538 2014] reading uEnv.txt [Mon May 12 15:56:00.553 2014] ** Unable to read file uEnv.txt ** [Mon May 12 15:56:00.553 2014] Copying Linux from SD to RAM... [Mon May 12 15:56:00.553 2014] reading uImage [Mon May 12 15:56:00.553 2014] ** Unable to read file uImage ** [Mon May 12 15:56:00.553 2014] zynq-uboot it apears that it is expecting uImage. However, I would like to boot the image using image.ub (kernel+device tree+ file system) Can someone help me in this regard? Thanks and regards, Heshsham ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] tools, env, aes: fix compiling env tools for target
Hello Marek, Am 12.05.2014 13:01, schrieb Marek Vasut: On Monday, May 12, 2014 at 07:54:49 AM, Heiko Schocher wrote: compiling env tools for the target leads with current u-boot in following compile error: $ make CROSS_COMPILE=powerpc-linux- env make[1]: *** Keine Regel vorhanden, um das Target »tools/env/aes.c«, benötigt von »tools/env/aes.o«, zu erstellen. Schluss. make: *** [env] Fehler 2 $ Fix it! Look at '[PATCH] tools: env: Add aes.c placeholder' , Message-Id:1398678990-7725-1-git-send-email-ma...@denx.de , that one fixes it too :) Oh, overlooked this fix, thanks! bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] tools: env: Add aes.c placeholder
Hello Marek, Am 28.04.2014 11:56, schrieb Marek Vasut: Add missing aes.c placeholder which includes lib/aes.c . Without this one, tools/env/ will fail to build. Signed-off-by: Marek Vasutma...@denx.de Cc: Alexey Brodkinalexey.brod...@synopsys.com Cc: Masahiro Yamadayamad...@jp.panasonic.com Tested-by: Alexey Brodkinabrod...@synopsys.com --- tools/env/aes.c | 1 + 1 file changed, 1 insertion(+) create mode 100644 tools/env/aes.c diff --git a/tools/env/aes.c b/tools/env/aes.c new file mode 100644 index 000..9e42679 --- /dev/null +++ b/tools/env/aes.c @@ -0,0 +1 @@ +#include ../../lib/aes.c tested on the ids8313 board, so: Tested-by: Heiko Schocher h...@denx.de Thanks! bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/3] usb: tegra: fix PHY selection code
Am 2014-04-30 23:09, schrieb Stephen Warren:
From: Stephen Warren swar...@nvidia.com
The TRM for Tegra30 and later all state that USBMODE_CM_HC must be set
before writing to hostpc1_devlc to select which PHY to use for a USB
controller. However, neither init_{utmi,ulpi}_usb_controller() do this
today, so the register writes they perform for PHY selection do not
work.
For the UTMI case, this was hacked around in commit 7e44d9320ed4 ARM:
Tegra: USB: EHCI: Add support for Tegra30/Tegra114 by adding code to
ehci_hcd_init() which sets USBMODE_CM_HC and duplicates the PHY
selection register write. This code doesn't cover the ULPI case, so I
wouldn't be surprised if ULPI doesn't work with the current code, unless
the ordering requirement only ends up being an issue in HW for UTMI not
ULPI.
On Toradex Colibri T30, all USB, including USB2, are using the UTMI phy.
I successfully tested this patchset on the Colibri T30 module (not yet
in mainline U-Boot).
Tested-by ste...@agner.ch
--
Stefan
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Please pull u-boot-x86.git branch 'tom'
On Fri, May 09, 2014 at 04:36:01PM -0600, Simon Glass wrote:
Hi Tom,
This collects together the patches in my queue. I have taken the
liberty of also adding 'Make 'run' use run_command_list() instead of
run_command()' which is here:
http://patchwork.ozlabs.org/patch/286250/
- Simon
The following changes since commit 146b468eb0203c9b1aa1de93723ffc82c85d1dc1:
Merge branch 'master' of git://git.denx.de/u-boot-sparc (2014-05-09
11:09:59 -0400)
are available in the git repository at:
git://git.denx.de/u-boot-x86.git
for you to fetch changes up to 097c5de5f4a64d3b121dc1dbe020f7f2545dabdb:
sandbox: ignore sandbox.dtb (2014-05-09 14:51:20 -0600)
Masahiro Yamada (2):
sandbox: move source files from board/ to arch/sandbox/
sandbox: ignore sandbox.dtb
Simon Glass (6):
sandbox: Support 'env import' and 'env export'
Make 'run' use run_command_list() instead of run_command()
sandbox: Provide a build option to avoid using SDL
sandbox: Update and expand the README
patman: Deal with 'git apply' failures correctly
patman: Avoid duplicate sign-offs
README| 11 +++
arch/sandbox/config.mk| 6 ++
arch/sandbox/dts/.gitignore | 1 +
arch/sandbox/lib/Makefile | 2 +-
{board/sandbox/sandbox = arch/sandbox/lib}/sandbox.c | 0
board/sandbox/sandbox/Makefile| 7 --
board/sandbox/sandbox/README.sandbox | 91
--
boards.cfg| 2 +-
common/cmd_nvedit.c | 31
common/main.c | 2 +-
doc/README.sandbox| 299
++
include/configs/sandbox.h | 16 +++-
tools/patman/README | 1 +
tools/patman/commit.py| 14
tools/patman/gitutil.py | 6 +-
tools/patman/patchstream.py | 10 ++-
16 files changed, 379 insertions(+), 120 deletions(-)
create mode 100644 arch/sandbox/dts/.gitignore
rename {board/sandbox/sandbox = arch/sandbox/lib}/sandbox.c (100%)
delete mode 100644 board/sandbox/sandbox/Makefile
delete mode 100644 board/sandbox/sandbox/README.sandbox
create mode 100644 doc/README.sandbox
Applied to u-boot/master, thanks!
--
Tom
signature.asc
Description: Digital signature
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [ANN] U-Boot v2014.07-rc1 released
Hey all, I've pushed v2017.04-rc1 out to the repository and tarballs should exist soon. The merge window is now, really, closed. Looking over the diffstat, we've got some new platforms / SoCs and we've got lots of fixups all over the place. Looking over my patchwork TODO list, I see I've let it get a bit large, so I'm going to focus on clearing it out, both master and TI related stuff. As always, if anything is broken please speak up. Thanks all! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mmc: omap_hsmmc: add adma support
On Friday 02 May 2014 07:25 PM, Balaji T K wrote:
MMC instance 1 and 2 is capable of ADMA in omap4, omap5.
Add support for ADMA and enable ADMA for read/write to
improve mmc throughput.
Hi,
Realized I need to git format-patch this patch,
Any other comments ?
Signed-off-by: Balaji T K balaj...@ti.com
---
arch/arm/include/asm/omap_mmc.h | 14 +++
drivers/mmc/omap_hsmmc.c| 163
+---
include/configs/omap5_uevm.h|2
3 files changed, 169 insertions(+), 10 deletions(-)
Index: u-boot_denx/arch/arm/include/asm/omap_mmc.h
===
--- u-boot_denx.orig/arch/arm/include/asm/omap_mmc.h2014-05-02
19:02:39.042727752 +0530
+++ u-boot_denx/arch/arm/include/asm/omap_mmc.h 2014-05-02 19:18:00.783780277
+0530
@@ -47,6 +47,9 @@ struct hsmmc {
unsigned int ie;/* 0x134 */
unsigned char res4[0x8];
unsigned int capa; /* 0x140 */
+ unsigned char res5[0x10];
+ unsigned int adma_es; /* 0x154 */
+ unsigned int adma_sal; /* 0x158 */
};
/*
@@ -68,9 +71,11 @@ struct hsmmc {
#define WPP_ACTIVEHIGH(0x0 8)
#define RESERVED_MASK (0x3 9)
#define CTPL_MMC_SD (0x0 11)
+#define DMA_MNS_ADMA_MODE (0x1 20)
#define BLEN_512BYTESLEN (0x200 0)
#define NBLK_STPCNT (0x0 16)
#define DE_DISABLE(0x0 0)
+#define DE_ENABLE (0x1 0)
#define BCE_DISABLE (0x0 1)
#define BCE_ENABLE(0x1 1)
#define ACEN_DISABLE (0x0 2)
@@ -103,6 +108,7 @@ struct hsmmc {
#define DTW_1_BITMODE (0x0 1)
#define DTW_4_BITMODE (0x1 1)
#define DTW_8_BITMODE (0x1 5) /* CON[DW8]*/
+#define DMAS (0x2 3)
#define SDBP_PWROFF (0x0 8)
#define SDBP_PWRON(0x1 8)
#define SDVS_1V8 (0x5 9)
@@ -136,12 +142,18 @@ struct hsmmc {
#define IE_DTO(0x01 20)
#define IE_DCRC (0x01 21)
#define IE_DEB(0x01 22)
+#define IE_ADMAE (0x01 25)
#define IE_CERR (0x01 28)
#define IE_BADA (0x01 29)
+#define CAPA_ADMA_SUPPORT (1 19)
#define VS30_3V0SUP (1 25)
#define VS18_1V8SUP (1 26)
+#define ADMA_XFER_VALID(1 0)
+#define ADMA_XFER_END (1 1)
+#define ADMA_XFER_DESC (1 5)
+
/* Driver definitions */
#define MMCSD_SECTOR_SIZE 512
#define MMC_CARD 0
@@ -151,6 +163,8 @@ struct hsmmc {
#define CLK_INITSEQ 0
#define CLK_400KHZ1
#define CLK_MISC 2
+#define DMA_TYPE_SDMA 1
+#define DMA_TYPE_ADMA 2
#define RSP_TYPE_NONE (RSP_TYPE_NORSP | CCCE_NOCHECK | CICE_NOCHECK)
#define MMC_CMD0 (INDEX(0) | RSP_TYPE_NONE | DP_NO_DATA | DDIR_WRITE)
Index: u-boot_denx/drivers/mmc/omap_hsmmc.c
===
--- u-boot_denx.orig/drivers/mmc/omap_hsmmc.c 2014-05-02 19:02:39.066727884
+0530
+++ u-boot_denx/drivers/mmc/omap_hsmmc.c2014-05-02 19:17:25.247585485
+0530
@@ -22,6 +22,7 @@
* MA 02111-1307 USA
*/
+#include bouncebuf.h
#include config.h
#include common.h
#include malloc.h
@@ -44,12 +45,30 @@
#undef OMAP_HSMMC_USE_GPIO
#endif
+#ifdef CONFIG_SPL_BUILD
+#undef CONFIG_OMAP_MMC_ADMA
+#endif
+
+#ifdef CONFIG_OMAP_MMC_ADMA
+struct adma_desc_table {
+ u16 attr;
+ u16 length;
+ u32 addr;
+};
+#define ADMA_MAX_BYTES_PER_ROW (127 * 512)
+#define ADMA_TABLE_NUM_ENTRIES 517
+#endif
+
/* common definitions for all OMAPs */
#define SYSCTL_SRC(1 25)
#define SYSCTL_SRD(1 26)
+#define IE_MASK(IE_BADA | IE_CERR | IE_DEB | IE_DCRC | IE_DTO
|\
+IE_CIE | IE_CEB | IE_CCRC | IE_CTO | IE_BRR |\
+IE_BWR | IE_TC | IE_CC)
struct omap_hsmmc_data {
struct hsmmc *base_addr;
+ int cap_dma;
struct mmc_config cfg;
#ifdef OMAP_HSMMC_USE_GPIO
int cd_gpio;
@@ -205,11 +224,13 @@ void mmc_init_stream(struct hsmmc *mmc_b
static int omap_hsmmc_init_setup(struct mmc *mmc)
{
struct hsmmc *mmc_base;
+ struct omap_hsmmc_data *hsmmc_data;
unsigned int reg_val;
unsigned int dsor;
ulong start;
mmc_base = ((struct omap_hsmmc_data *)mmc-priv)-base_addr;
+ hsmmc_data = (struct omap_hsmmc_data *)mmc-priv;
mmc_board_init(mmc);
Re: [U-Boot] [ANN] U-Boot v2014.07-rc1 released
On Mon, May 12, 2014 at 10:12 AM, Tom Rini tr...@ti.com wrote: Hey all, I've pushed v2017.04-rc1 out to the repository and tarballs should exist soon. Back from the Future ;-) -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mmc: omap_hsmmc: add adma support
On Fri, May 02, 2014 at 07:25:20PM +0530, Balaji T K wrote: MMC instance 1 and 2 is capable of ADMA in omap4, omap5. Add support for ADMA and enable ADMA for read/write to improve mmc throughput. [snip] @@ -44,12 +45,30 @@ #undef OMAP_HSMMC_USE_GPIO #endif +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_OMAP_MMC_ADMA +#endif Why? Especially since a number of the folks interested in this for performance want it for SPL OS mode. Thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [ANN] U-Boot v2014.07-rc1 released
On Mon, May 12, 2014 at 10:26:24AM -0300, Otavio Salvador wrote: On Mon, May 12, 2014 at 10:12 AM, Tom Rini tr...@ti.com wrote: Hey all, I've pushed v2017.04-rc1 out to the repository and tarballs should exist soon. Back from the Future ;-) Ba-dum-bump. Coffee then release emails next time. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mmc: omap_hsmmc: add adma support
On Monday 12 May 2014 06:58 PM, Tom Rini wrote: On Fri, May 02, 2014 at 07:25:20PM +0530, Balaji T K wrote: MMC instance 1 and 2 is capable of ADMA in omap4, omap5. Add support for ADMA and enable ADMA for read/write to improve mmc throughput. [snip] @@ -44,12 +45,30 @@ #undef OMAP_HSMMC_USE_GPIO #endif +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_OMAP_MMC_ADMA +#endif Why? Especially since a number of the folks interested in this for performance want it for SPL OS mode. Thanks! Because in SoCs like OMAP4/5 mmc1/2 adma doesn't have access to sram. So can't have descriptor or src / destination buffers (allocated on stack) given by mmc core on sram. Thanks and Regards, Balaji T K. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3] dfu: Introduction of the dfu_hash_algo env variable for checksum method setting
On Fri, May 09, 2014 at 10:31:54AM +0200, Wolfgang Denk wrote: Dear Lukasz, In message 20140509085203.31133238@amdc2363 you wrote: For automated tests I use MD5 and compare this value before sending data to target via DFU and after I read it. This testing is done purely on HOST machine. This is unsufficient. You should always verify the image on the target after the download has completed. True. But this patch doesn't really change what you would have to do, and arguably make it easier. Participants have agreed, that we shall optionally enable crc32 (or other algorithm) calculation. If this is the default now, it should remain the default. Keep in mind what this current default is. We say here was the CRC32. We do not compare it with an expected value nor do we have the ability to since we're not passed from the host what the value was. 2. The current crc32 implementation is painfully slow (although I have only L1 enabled on my target). This is an unrelated problem then, which should excluded from this discussion here. Agreed. 3. With large files (like rootfs images) we store data (to medium) with 32 MiB chunks, which means that when we calculate complete crc32 the image is already written to its final destination. You can still detect if the download was corrupted, report a proper error and initiate a re-download. This would at least give you a chance to react to corrupted data. Just closing the eyes and hoping no errors will ever happen has always been a bad strategy. Before and after this change, only if the console is being monitored by some script. We do not nor are we given an expected hash so we cannot say data was corrupted. 4. This patch also allows some flexibility: by setting the env variable we can decide which algorithm to use (crc32, sha1, etc). It is appealing since we use the hash_* code anyway. Agreed. This was not my point. What I complained about is the change in behaviour. I asked to make the existing behaviour the default, so unaware users will not be affected. Only if you intentionally want some other behaviour you can then enable this by setting the env variable. Well, looking at mainline usage of DFU, Lukasz is speaking for about half of the users / implementors. Since Denx is working with the other half, can you shed some light on actual use vs theoretical possibilities? -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] mmc: omap_hsmmc: add adma support
On Mon, May 12, 2014 at 07:12:44PM +0530, Balaji T K wrote: On Monday 12 May 2014 06:58 PM, Tom Rini wrote: On Fri, May 02, 2014 at 07:25:20PM +0530, Balaji T K wrote: MMC instance 1 and 2 is capable of ADMA in omap4, omap5. Add support for ADMA and enable ADMA for read/write to improve mmc throughput. [snip] @@ -44,12 +45,30 @@ #undef OMAP_HSMMC_USE_GPIO #endif +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_OMAP_MMC_ADMA +#endif Why? Especially since a number of the folks interested in this for performance want it for SPL OS mode. Thanks! Because in SoCs like OMAP4/5 mmc1/2 adma doesn't have access to sram. So can't have descriptor or src / destination buffers (allocated on stack) given by mmc core on sram. And we can't malloc them? -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/4] bootm: allow to disable legacy image format
On Mon, May 12, 2014 at 09:36:54AM +0200, Heiko Schocher wrote: Hello Tom, Simon, Wolfgang, Lars, [snip] Ok, summary for one first step (I can do): - introduce CONFIG_IMAGE_FORMAT_LEGACY based on patch [1] (rename +#if !defined(CONFIG_DISABLE_IMAGE_FORMAT_LEGACY) to +#if defined(CONFIG_IMAGE_FORMAT_LEGACY)) - set CONFIG_IMAGE_FORMAT_LEGACY as default: (little bit adapted towards simons CONFIG_FIT_SIGNATURE_VERIFICATION proposal ... I dont want to introduce a new define ...) in config_defaults: +#ifndef CONFIG_FIT_SIGNATURE +#define CONFIG_IMAGE_LEGACY +#endif so, if boards not define CONFIG_FIT_SIGNATURE, they have default CONFIG_IMAGE_FORMAT_LEGACY enabled (as currently). If CONFIG_FIT_SIGNATURE is enabled, legacy image format is default disabled (change current behaviour of boards, which use this feature! This is only the case for: $ grep -lr CONFIG_FIT_SIGNATURE include/ include/configs/zynq-common.h - Michal, add Michal therefore to Cc include/configs/sandbox.h - Simon include/configs/ids8313.h - me include/image.h $ ), but boards can enable it if needed (as ids8313 board needs it ... yes not nice ...) If boards which have not enabled CONFIG_FIT_SIGNATURE and want to disable legacy image format ... we can add this case if we want like: in config_defaults: +#ifndef CONFIG_FIT_SIGNATURE +#define CONFIG_IMAGE_LEGACY +#endif + +#ifdef CONFIG_DISABLE_IMAGE_LEGACY +#undef CONFIG_IMAGE_LEGACY +#endif Is this a way to go? Sounds right to me, thanks. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] ARM: zynq: sdhci clock frequency init question
From: Michal Simek [mailto:monstr AT monstr.eu] Sent: Wednesday, May 07, 2014 04:46 To: Krunal Desai; u-boot AT lists.denx.de Subject: Re: [U-Boot] ARM: zynq: sdhci clock frequency init question we didn't test this configuration that's why 52MHz is there as default case. I think that should be easily possible to detect MIO setting as we are doing for qspi/nand/usb. (Trying again due to base64-oddness with Outlook) Thanks for the reply Michal; that sounds very sane to me. To be clear, you'd basically read the MIO configuration registers to see whether SD is active on MIO, and if not, assume EMIO? (Or not used?) We have this code in our xilinx repository and I have sent patches for mainline review 2 weeks ago or something like that. I haven't got any NACK and I am going to send pull request to ARM custodian when I fix fpga patches. Looking forward to seeing it, thanks for following up! Krunal Desai Avionics Engineer Planetary Resources ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] fat: Define MAX_CLUSTSIZE only if not defined in config
On Fri, Apr 25, 2014 at 03:48:04PM +0200, Michal Simek wrote: From: Siva Durga Prasad Paladugu siva.durga.palad...@xilinx.com Define MAX_CLUSTSIZE only if not defined in board specific config file as this size can be decreased to save memory in some memory constrained cases. Signed-off-by: Siva Durga Prasad Paladugu siva...@xilinx.com Signed-off-by: Michal Simek michal.si...@xilinx.com --- include/fat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/fat.h b/include/fat.h index c8eb7cc..1213060 100644 --- a/include/fat.h +++ b/include/fat.h @@ -18,7 +18,9 @@ #define VFAT_MAXSEQ 9 /* Up to 9 of 13 2-byte UTF-16 entries */ #define PREFETCH_BLOCKS 2 +#ifndef MAX_CLUSTSIZE #define MAX_CLUSTSIZE65536 +#endif #define DIRENTSPERBLOCK (mydata-sect_size / sizeof(dir_entry)) #define DIRENTSPERCLUST ((mydata-clust_size * mydata-sect_size) / \ sizeof(dir_entry)) Sorry for the delay. This should be CONFIG_FS_FAT_MAX_CLUSTSIZE and documented in the README. -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Pull request: u-boot-video/master
Hey Tom, The following changes since commit a405764c1ec835a41ccda943b9156aee25e15d5e: drivers/i2c/fsl_i2c: modify i2c_read to handle multi-byte write (2014-04-29 07:10:58 +0200) are available in the git repository at: git://git.denx.de/u-boot-video.git master for you to fetch changes up to 1161f98db687a1cb263cbacdc7eb548a0354218d: at91: video: atmel_hlcdfb.c: fix bad timing configuration (2014-05-05 11:50:16 +0200) Eric Nelson (1): video: mxc_ipuv3_fb: stash frame buffer pointer in global data. Stephen Warren (1): config: enable CMD_BMP when API+LCD is enabled Thomas Diener (1): logos: Update of the syteco company logo Wu, Josh (1): at91: video: atmel_hlcdfb.c: fix bad timing configuration drivers/video/atmel_hlcdfb.c |8 drivers/video/mxc_ipuv3_fb.c |5 + include/config_fallbacks.h |4 tools/logos/syteco.bmp | Bin 11414 - 11414 bytes 4 files changed, 13 insertions(+), 4 deletions(-) Please pull. Thanks! Anatolij ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 2/2] mkimage: Refactor mxsimage to use common crc32 code
On Tue, May 06, 2014 at 10:46:46AM +1200, Charles Manning wrote: mxsimage uses the same crc32 function as pblimage. Signed-off-by: Charles Manning cdhmann...@gmail.com Acked-by: Stefano Babic sba...@denx.de This introduces warnings: tools/mxsimage.c: In function ‘sb_build_command_load’: tools/mxsimage.c:979:2: warning: pointer targets in passing argument 2 of ‘pbl_crc32’ differ in signedness [-Wpointer-sign] tools/pbl_crc32.h:11:10: note: expected ‘const char *’ but argument is of type ‘uint8_t *’ u-boot/tools/mxsimage.c: In function ‘sb_verify_command’: tools/mxsimage.c:1815:3: warning: pointer targets in passing argument 2 of ‘pbl_crc32’ differ in signedness [-Wpointer-sign] tools/pbl_crc32.h:11:10: note: expected ‘const char *’ but argument is of type ‘uint8_t *’ -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 0/12] Enable LCD display on snow
Hi, On 2 April 2014 17:24, Simon Glass s...@chromium.org wrote: This series adds a driver for TPS65090 and plumbs it in to get the LCD working correctly on snow. The display driver is already present, but needs information about the display to be provided in the device tree. The backlight also needs to be enabled - it is controlled by a FET on the TPS65090. Note that the TPS65090 is controlled by the device tree so will only be present if the board's device tree file specifies it. At present this is only the case for snow, but other exynos5 boards will use it (e.g. pit). Note: the TPS65090 driver was sent to the list around the middle of last year but was never applied. Is there any news on this series please? ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v12 1/2] S5P: Exynos: Add GPIO pin numbering and rename definitions
Dear Akshay Saraswat,
On 06/05/14 23:36, Akshay Saraswat wrote:
This patch includes following changes :
* Adds gpio pin numbering support for EXYNOS SOCs.
To have consistent 0..n-1 GPIO numbering the banks are divided
into different parts where ever they have holes in them.
* Rename GPIO definitions from GPIO_... to S5P_GPIO_...
These changes were done to enable cmd_gpio for EXYNOS and
cmd_gpio has GPIO_INPUT same as s5p_gpio driver and hence
getting a error during compilation.
* Adds support for name to gpio conversion in s5p_gpio to enable
gpio command EXYNOS SoCs. Function has been added to asm/gpio.h
to decode the input gpio name to gpio number.
Example: SMDK5420 # gpio set gpa00
Signed-off-by: Leela Krishna Amudala l.kris...@samsung.com
Signed-off-by: Rajeshwari Shinde rajeshwar...@samsung.com
Signed-off-by: Akshay Saraswat aksha...@samsung.com
Acked-by: Przemyslaw Marczak p.marc...@samsung.com
---
Changes in V12:
- Added change log in this patch.
- Fixed few bugs and typos.
- Added Acked-by: Przemyslaw Marczak.
Changes in v11:
- Created and fixed pinmux_config for Exynos 4412.
- Removed dead code.
Changes in v10:
- Made arch-exynos/gpio.h - arch/gpio.h.
- Removed dead code.
- Edited pin numbmers in dts files.
Changes in V9:
- Fixed checkpatch errors.
- Fixed naming error in exynos_gpio_data arrays which could
be the possible reason behind data abort witnessed over
Exynos4 boards.
Changes in V8:
- Fixed arndale board compile time errors introduced due to
patch-set v7.
Changes in V7:
- Added changes for other SoCs like Exynos 4412, 4210 etc.
Changes in V6:
- Updated patch with corresponding changes for Exynos 5420.
Changes in V5:
- Rebased on latest u-boot-samsung tree.
- Removed Exynos5 specific code in gpio driver api to
get bank.
Changes in V4:
- To have consistent 0..n-1 GPIO numbering the banks
are divided into different parts where ever they
have holes in them.
- Function and table to support gpio command moved
to s5p-gpio driver.
- Rebased on latest u-boot-samsung tree.
Changes in V3:
- GPIO Table added to calculate the base address
of input gpio bank.
arch/arm/cpu/armv7/exynos/pinmux.c | 561 +
arch/arm/dts/exynos4210-origen.dts |4 +-
arch/arm/dts/exynos4210-trats.dts |6 +-
arch/arm/dts/exynos4210-universal_c210.dts |4 +-
arch/arm/dts/exynos4412-trats2.dts |4 +-
arch/arm/include/asm/arch-exynos/cpu.h | 17 +-
arch/arm/include/asm/arch-exynos/gpio.h| 1761
+++-
arch/arm/include/asm/arch-s5pc1xx/gpio.h | 948 ---
board/samsung/arndale/arndale.c| 11 +-
board/samsung/goni/goni.c | 32 +-
board/samsung/smdk5250/exynos5-dt.c| 20 +-
board/samsung/smdk5250/smdk5250.c | 19 +-
board/samsung/smdk5420/smdk5420.c | 15 +-
board/samsung/smdkc100/smdkc100.c |5 +-
board/samsung/smdkv310/smdkv310.c | 19 +-
board/samsung/trats/trats.c| 39 +-
board/samsung/trats2/trats2.c | 74 +-
board/samsung/universal_c210/universal.c | 51 +-
drivers/gpio/s5p_gpio.c| 204 +++-
19 files changed, 2899 insertions(+), 895 deletions(-)
diff --git a/board/samsung/arndale/arndale.c b/board/samsung/arndale/arndale.c
index 9efc355..ef88314 100644
--- a/board/samsung/arndale/arndale.c
+++ b/board/samsung/arndale/arndale.c
@@ -16,17 +16,14 @@ DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_USB_EHCI_EXYNOS
int board_usb_init(int index, enum usb_init_type init)
{
- struct exynos5_gpio_part1 *gpio = (struct exynos5_gpio_part1 *)
- samsung_get_base_gpio_part1();
-
/* Configure gpios for usb 3503 hub:
* disconnect, toggle reset and connect
*/
- s5p_gpio_direction_output(gpio-d1, 7, 0);
- s5p_gpio_direction_output(gpio-x3, 5, 0);
+ gpio_direction_output(EXYNOS5_GPIO_D17, 0);
+ gpio_direction_output(EXYNOS5_GPIO_X35, 0);
- s5p_gpio_direction_output(gpio-x3, 5, 1);
- s5p_gpio_direction_output(gpio-d1, 7, 1);
+ gpio_direction_output(EXYNOS5_GPIO_X35, 1);
+ gpio_direction_output(EXYNOS5_GPIO_D17, 1);
return 0;
}
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index 61b9ece..4cea63b 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -17,8 +17,6 @@
DECLARE_GLOBAL_DATA_PTR;
-static struct s5pc110_gpio *s5pc110_gpio;
-
u32 get_board_rev(void)
{
return 0;
@@ -27,8 +25,6 @@ u32 get_board_rev(void)
int board_init(void)
{
/* Set Initial global variables */
- s5pc110_gpio = (struct s5pc110_gpio
Re: [U-Boot] kbuild: Fix trailing whitespaces
On Thu, Apr 24, 2014 at 03:24:28PM +0200, Michal Simek wrote: Trivial fix. Signed-off-by: Michal Simek michal.si...@xilinx.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2] fs: fat: Fix cache align error message in fatwrite
On Tue, Apr 08, 2014 at 11:12:46AM +0900, Nobuhiro Iwamatsu wrote: Use of malloc of do_fat_write() causes cache error on ARM v7 platforms. Perhaps, the same problem will occur at any other CPUs. This replaces malloc with memalign to fix cache buffer alignment. Signed-off-by: Nobuhiro Iwamatsu nobuhiro.iwamatsu...@renesas.com Signed-off-by: Yoshiyuki Ito yoshiyuki.ito...@renesas.com Tested-by: Hector Palacios hector.palac...@digi.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, RFC] bd_info: remove bi_barudrate member from struct bd_info
On Fri, Apr 04, 2014 at 08:09:58PM +0900, Masahiro Yamada wrote: gd-bd-bi_baudrate is a copy of gd-baudrate. Since baudrate is a common feature for all architectures, keep gd-baudrate only. It is true that bi_baudrate was passed to the kernel in that structure but it was a long time ago. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Tom Rini tr...@ti.com Cc: Simon Glass s...@chromium.org Cc: Wolfgang Denk w...@denx.de Cc: Heiko Schocher h...@denx.de Acked-by: Michal Simek mon...@monstr.eu (For microblaze) Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] AR8035/phy: Enable autonegotiation function for ar8035
On Fri, Apr 11, 2014 at 04:03:11PM +0800, Xiaobo Xie wrote: Function genphy_parse_link() used if (mii_reg BMSR_ANEGCAPABLE) before, but used if (phydev-supported SUPPORTED_Autoneg) now. So assign phydev-supported to phydev-drv-features for ar8035 to enable autonegotiation. Then removed the genphy_config_aneg() function. Signed-off-by: Xie Xiaobo x@freescale.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 3/5] blackfin: replace bfin_gen_rand_mac() with eth_random_addr()
On Fri, Apr 18, 2014 at 07:09:49PM +0900, Masahiro Yamada wrote: bfin_gen_rand_mac() uses __DATE__ as the seed for random ethernet address. This makes the build non-deterministic. In the first place, it should not be implemented as a Bfin-specific function. Use eth_random_addr() instead. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Sonic Zhang sonic.zh...@analog.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] cmd_time: do not show ticks
On Fri, Apr 18, 2014 at 05:46:13PM +0900, Masahiro Yamada wrote: The command time shows the execution time of the command given to the argument, like this: time: 45.293 seconds, 45293 ticks Since we adopted CONFIG_SYS_HZ = 1000 for all boards, we always have a simple formula: 1 tick = 0.0001 second. Showing ticks looks almost redundant. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 1/5] rand: do not surround function declarations by #ifdef
On Fri, Apr 18, 2014 at 07:09:47PM +0900, Masahiro Yamada wrote: Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 1/2, v4] net/phy: enable get_phy_id redefinable
On Fri, Apr 11, 2014 at 04:14:17PM +0800, Shengzhou Liu wrote: As some PHYs have non-standard PHY ID registers, PHY Id can't be read correctly by current get_phy_id function, so we enable get_phy_id redefinable to permit specific PHY driver having own specific get_phy_id function. Signed-off-by: Shengzhou Liu shengzhou@freescale.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] serial: nsl16550: add hw flow control support
On Wed, Apr 09, 2014 at 03:38:46PM -0400, Karicheri, Muralidharan wrote: keystone serial hw support hw flow control. This patch enables hw flow control for keystone EVMs as an optional feature based on CONFIG_SERIAL_HW_FLOW_CONTROL. Signed-off-by: Murali Karicheri m-kariche...@ti.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,v2,4/5] fs: ubifs: drop __DATE__ and __TIME__
On Fri, Apr 18, 2014 at 07:09:50PM +0900, Masahiro Yamada wrote: __DATE__ and __TIME__ makes the build non-deterministic. Drop the debug message using them. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] doc: README.generic-board: Fix typo
On Tue, Apr 22, 2014 at 03:45:42PM -0300, Fabio Estevam wrote: Signed-off-by: Fabio Estevam fabio.este...@freescale.com Acked-by: Simon Glass s...@chromium.org Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] lib/sha256: fix compile on some hosts
On Sun, Apr 20, 2014 at 10:34:15AM +0200, Andreas Bießmann wrote: Commit 2842c1c24269a05142802d25520e7cb9035e456c introduced lib/sha256 into mkimage. Since then it will be compiled with HOSTCC which may produce errors on some systems. Most BSD systems (like OS X for me) do not ship a linux/string.h which will lead to take the U-Boot provided include/linux/string.h in the end. This header howver is completely wrong here. Just take the string.h if compiling with HOSTCC and linux/string.h when not. Signed-off-by: Andreas Bießmann andreas.de...@googlemail.com Cc: Heiko Schocher h...@denx.de Acked-by: Heiko Schocherh...@denx.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 2/5] net: rename and refactor eth_rand_ethaddr() function
On Fri, Apr 18, 2014 at 07:09:48PM +0900, Masahiro Yamada wrote: Some functions in include/net.h are ported from include/linux/etherdevice.h of Linux Kernel. For ex. is_zero_ether_addr() is_multicast_ether_addr() is_broadcast_ether_addr() is_valid_ether_addr(); So, we should use the same function name as that of Linux Kernel, eth_rand_addr(), for consistency. Besides, eth_rand_addr() has been implemented as an inline function. So it should not be surrounded by #ifdef CONFIG_RANDOM_MACADDR. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Acked-by: Joe Hershberger joe.hershber...@ni.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 5/5] kbuild: build with -Werror=date-time if the compiler supports it
On Fri, Apr 18, 2014 at 07:09:51PM +0900, Masahiro Yamada wrote: Using __DATE__, __TIME__ would make the build non-deterministic. If the code needs to refer to build date/time, use U_BOOT_DATE and U_BOOT_TIME in include/generated/timestamp_autogenerated.h instead. This commit has been imported from Linux Kernel, which should be applied to U-Boot too: commit fe7c36c7bde12190341722af69358e42171162f3 Author: Josh Triplett j...@joshtriplett.org Date: Mon Dec 23 13:56:06 2013 -0800 Makefile: Build with -Werror=date-time if the compiler supports it GCC 4.9 and newer have a new warning -Wdate-time, which warns on any use of __DATE__, __TIME__, or __TIMESTAMP__, which would make the build non-deterministic. Now that the kernel does not use any of those macros, turn on -Werror=date-time if available, to keep it that way. The kernel already (optionally) records this information at build time in a single place; other kernel code should not duplicate that. Signed-off-by: Josh Triplett j...@joshtriplett.org Signed-off-by: Michal Marek mma...@suse.cz Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] hush shell: Avoid string write overflow when entering max cmd length
On Fri, Apr 25, 2014 at 03:35:43PM +0200, Kristian Otnes wrote: console_buffer array is defined to be CONFIG_SYS_CBSIZE + 1 long, whereas the_command array only CONFIG_SYS_CBSIZE long. Subsequent use of strcpy(the_command, console_buffer) will write final \0 terminating byte outside the_command array when entering a command of max length. Signed-off-by: Kristian Otnes kotnes at cisco dot com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] tps6586x: staticize funtions
On Thu, Apr 24, 2014 at 08:55:07AM +0530, Manish Badarkhe wrote: Make funtions static which are locally used in file. Signed-off-by: Manish Badarkhe badarkhe.man...@gmail.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2] config: remove platform CONFIG_SYS_HZ definition part 4
On Mon, Apr 28, 2014 at 10:18:34AM +0900, Masahiro Yamada wrote: Some new boards define CONFIG_SYS_HZ again! Remove. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Acked-by: Bo Shen voice.s...@atmel.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2] nand_spl: remove unused linker scripts u-boot-nand.lds
On Mon, Apr 28, 2014 at 05:45:05PM +0900, Masahiro Yamada wrote: Commit 345b77ba removed some nand_spl boards but it missed to delete linker scripts. These linker scripts are not used now. And one more fix: amcc/acadia does not support nand_spl anymore, so remove #if !defined(CONFIG_NAND_U_BOOT) ... #endif Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Cc: Stefan Roese s...@denx.de Acked-by: Stefan Roese s...@denx.de Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] kbuild: allow null board for spl build
On Fri, Apr 25, 2014 at 09:54:31PM +0900, Masahiro Yamada wrote: Commit 33a02da0 supported none for the board field of boards.cfg. But it missed to modify spl/Makefile. This commit provides the flexibility so we can use none board in SPL too. Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] tools: env: Add aes.c placeholder
On Mon, Apr 28, 2014 at 11:56:30AM +0200, Marek Vasut wrote: Add missing aes.c placeholder which includes lib/aes.c . Without this one, tools/env/ will fail to build. Signed-off-by: Marek Vasut ma...@denx.de Cc: Alexey Brodkin alexey.brod...@synopsys.com Cc: Masahiro Yamada yamad...@jp.panasonic.com Tested-by: Alexey Brodkin abrod...@synopsys.com Tested-by: Heiko Schocher h...@denx.de Applied to u-boot/master, thanks! Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2] cosmetic: delete misleading comment /* CONFIG_BOARDDIR */
On Mon, Apr 28, 2014 at 10:17:10AM +0900, Masahiro Yamada wrote: CONFIG_BOARDDIR is not referenced in these linker scripts. The comment /* CONFIG_BOARDDIR */ is misleading. Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v5, 1/2] common/board_f: Initialized global data for generic board
On Fri, May 02, 2014 at 05:28:04PM -0700, York Sun wrote: Some platforms (tested on mpc85xx, mpc86xx) use global data before calling function baord_inti_f(). The data should not be cleared later. Any arch which uses global data in generic board board_init_f() should define CONFIG_SYS_GENERIC_GLOBAL_DATA. Signed-off-by: York Sun york...@freescale.com CC: Scott Wood scottw...@freescale.com CC: Simon Glass s...@chromium.org CC: Albert ARIBAUD albert.u.b...@aribaud.net Acked-by: Simon Glass s...@chromium.org Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] cmd_bootm.c: Only say XIP image when load is image_start
On Thu, May 01, 2014 at 10:01:08AM -0400, Tom Rini wrote: We say we have an XIP (in this case, image loaded at desired execution address) when the image header has been offset in the load. It's possible that in some cases executing the header is non-fatal but that's not true in many other cases. Signed-off-by: Tom Rini tr...@ti.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] net/designware: call phy_connect_dev() to properly setup phylib device
On Mon, Apr 28, 2014 at 08:14:05PM +0100, Ian Campbell wrote: This sets up the linkage from the phydev back to the ethernet device. This symptom of not doing this which I noticed was: NULL Waiting for PHY auto negotiation to complete rather than: dwmac.1c5 Waiting for PHY auto negotiation to complete Signed-off-by: Ian Campbell i...@hellion.org.uk Cc: Alexey Brodkin alexey.brod...@synopsys.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,v5,2/2] common/board_f: Fix size variable
On Fri, May 02, 2014 at 05:28:05PM -0700, York Sun wrote: DRAM size should use 64-bit variable when the size could be more than 4GB. Caught and verified on P4080DS with 4GB DDR. Signed-off-by: York Sun york...@freescale.com Acked-by: Simon Glass s...@chromium.org Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v3] disk: part_efi: add support for the Backup GPT
On Mon, May 05, 2014 at 01:00:08PM -0700, Steve Rae wrote: Check the Backup GPT table if the Primary GPT table is invalid. Renamed Secondary GPT to Backup GPT as per: UEFI Specification (Version 2.3.1, Errata A) Signed-off-by: Steve Rae s...@broadcom.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Trivial fix to .gitignore for spl/Makefile
On Thu, May 01, 2014 at 02:18:41PM -0400, Ralph Siemsen wrote: Trivial fix to .gitignore for spl/Makefile According to the gitignore man page: An optional prefix ! which negates the pattern; any matching file excluded by a previous pattern will become included again. ^^ So the directory exclude /spl/* must come before the exception for spl/Makefile otherwise it has no effect. Signed-off-by: Ralph Siemsen ral...@netwinder.org Tested-by: Masahiro Yamada yamad...@jp.panasonic.com [on git v1.7.9.5 / v1.8.3.2] Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] boards.cfg: Keep entries sorted
On Mon, May 12, 2014 at 01:01:51PM -0300, Fabio Estevam wrote: Run tools/reformat.py -i -d '-' -s 8 boards.cfg boards0.cfg mv boards0 in order to keep the entries sorted. Signed-off-by: Fabio Estevam fabio.este...@freescale.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 1/2] fs:ext4:cleanup: Remove superfluous code
On Tue, May 06, 2014 at 09:36:04AM +0200, Łukasz Majewski wrote: Code responsible for handling situation when ext4 has block size of 1024B can be ordered to take less space. This patch does that for ext4 common and write files. Signed-off-by: Lukasz Majewski l.majew...@samsung.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, v2, 2/2] fs:ext4:write:fix: Reinitialize global variables after updating a file
On Tue, May 06, 2014 at 09:36:05AM +0200, Łukasz Majewski wrote: This bug shows up when file stored on the ext4 file system is updated. The ext4fs_delete_file() is responsible for deleting file's (e.g. uImage) data. However some global data (especially ext4fs_indir2_block), which is used during file deletion are left unchanged. The ext4fs_indir2_block pointer stores reference to old ext4 double indirect allocated blocks. When it is unchanged, after file deletion, ext4fs_write_file() uses the same pointer (since it is already initialized - i.e. not NULL) to return number of blocks to write. This trunks larger file when previous one was smaller. Lets consider following scenario: 1. Flash target with ext4 formatted boot.img (which has uImage [*] on itself) 2. Developer wants to upload their custom uImage [**] - When new uImage [**] is smaller than the [*] - everything works correctly - we are able to store the whole smaller file with corrupted ext4fs_indir2_block pointer - When new uImage [**] is larger than the [*] - theCRC is corrupted, since truncation on data stored at eMMC was done. 3. When uImage CRC error appears, then reboot and LTHOR/DFU reflashing causes proper setting of ext4fs_indir2_block() and after that uImage[**] is successfully stored (correct uImage [*] metadata is stored at an eMMC on the first flashing). Due to above the bug was very difficult to reproduce. This patch sets default values for all ext4fs_indir* pointers/variables. Signed-off-by: Lukasz Majewski l.majew...@samsung.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot,1/3] fs/fat: add fat12 cluster check
On Thu, May 08, 2014 at 04:14:05PM +0800, Wu, Josh wrote: Signed-off-by: Josh Wu josh...@atmel.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 2/3] fs: fat_write: fix the incorrect last cluster checking
On Thu, May 08, 2014 at 04:14:06PM +0800, Wu, Josh wrote:
In fat_write.c, the last clust condition check is incorrect:
if ((curclust = 0xff8) || (curclust = 0xfff8)) {
... ...
}
For example, in FAT32 if curclust is 0x11000. It is a valid clust.
But on above condition check, it will be think as a last clust.
So the correct last clust check should be:
in fat32, curclust = 0xff8
in fat16, curclust = 0xfff8
in fat12, curclust = 0xff8
This patch correct the last clust check.
Signed-off-by: Josh Wu josh...@atmel.com
Applied to u-boot/master, thanks!
--
Tom
signature.asc
Description: Digital signature
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [U-Boot, 3/3] fs/fat: correct FAT16/12 file finding in root dir
On Thu, May 08, 2014 at 04:14:07PM +0800, Wu, Josh wrote: When write a file into FAT file system, it will search a match file in root dir. So the find_directory_entry() will get the first cluster of root dir content and search the directory item one by one. If the file is not found, we will call get_fatent_value() to get next cluster of root dir via lookup the FAT table and continue the search. The issue is in FAT16/12 system, we cannot get root dir's next clust from FAT table. The FAT table only be use to find the clust of data aera in FAT16/12. In FAT16/12 if the clust is in root dir, the clust number is a negative number or 0, 1. Since root dir is located in front of the data area. Data area start clust #2. So the root dir clust number should 2. This patch will check above situation before call get_fatenv_value(). If curclust is 2, include minus number, we just increase one on the curclust since root dir is in continous cluster. The patch also add a sanity check for entry in get_fatenv_value(). Signed-off-by: Josh Wu josh...@atmel.com Applied to u-boot/master, thanks! -- Tom signature.asc Description: Digital signature ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3] Exynos5: config: Enable FIT
Dear Akshay Saraswat, On 06/05/14 23:37, Akshay Saraswat wrote: Adding two configs: * CONFIG_FIT - Enable FIT image support. * CONFIG_FIT_BEST_MATCH - Enable fetching correct DTB from FIT image by comparing compatibles. Signed-off-by: Akshay Saraswat aksha...@samsung.com Acked-by: Simon Glass s...@chromium.org --- Changes in V3: - Repositioned change-log. - Made config addition board specific instead of SoC specific. Changes in V2: - Added Acked-by. include/configs/smdk5250.h | 4 include/configs/smdk5420.h | 4 include/configs/snow.h | 4 3 files changed, 12 insertions(+) applied to u-boot-samsung. Thanks, Minkyu Kang. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC PATCH v2 03/13] sandbox: Support iotrace feature
Dear Simon Glass, Simon Glass sjg at chromium.org writes: Support the iotrace feature for sandbox, and enable it, using some dummy I/O access methods. Signed-off-by: Simon Glass sjg at chromium.org --- snipped diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index fa62cb6..8ca2a55 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h at at -16,6 +16,9 at at #endif +#define CONFIG_IO_TRACE +#define CONFIG_CMD_IO_TRACE + s/CONFIG_CMD_IO_TRACE/CONFIG_CMD_IOTRACE/g The common/Makefile shows CONFIG_CMD_IOTRACE triggers creation of cmd_iotrace.o. All the best, Rommel ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] 85xx/p1020:Define no. of usb controllers used on P1020RDB-PD platform
Define number of USB controllers used on P1020RDB-PD platform. This platform has P1020 SoC which has two USB controllers, but only first one is used on the platform Signed-off-by: Ramneek Mehresh ramneek.mehr...@freescale.com --- arch/powerpc/include/asm/config_mpc85xx.h | 2 ++ include/configs/p1_p2_rdb_pc.h| 4 2 files changed, 6 insertions(+) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 864e74c..27c8039 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -247,7 +247,9 @@ #define CONFIG_SYS_FSL_ERRATUM_ELBC_A001 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111 #define CONFIG_SYS_FSL_ERRATUM_A005125 +#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT2 +#endif #elif defined(CONFIG_P1021) #define CONFIG_MAX_CPUS2 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index e745945..bf00fba 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -883,6 +883,10 @@ #endif #endif +#if defined(CONFIG_P1020RDB_PD) +#define CONFIG_USB_MAX_CONTROLLER_COUNT1 +#endif + #define CONFIG_MMC #ifdef CONFIG_MMC -- 1.8.4.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v13 0/2] S5P: Exynos: Add GPIO numbering feature
Used a script to recheck/verify pin mapping and existing mapping appears to be fine, returning correct bank and pin values. Did ./MAKEALL -a arm and found all Exynos/S5P related boards compiled successfully. Couldn't test booting over all of them. Tested U-Boot bootup over SMDK5420, SMDK5250, Snow. Requesting maintaners to please test over affected SoCs/boards. Changes in V2: - Enabled CMD_GPIO as suggested by Simon Glass and supported same for EXYNOS5. Changes in V3: - New patch added to rename S5P GPIO definitions to S5P_GPIO. - GPIO Table added to calculate the base address of input gpio bank. Changes in V4: - To have consistent 0..n-1 GPIO numbering the banks are divided into different parts where ever they have holes in them. - Function and table to support gpio command moved to s5p-gpio driver. - Rebased on latest u-boot-samsung tree. Changes in V5: - Rebased on latest u-boot-samsung tree. - Removed Exynos5 specific code in gpio driver api to get bank. - Added #define HAVE_GENERIC_GPIO in config file to remove conditinal CPU check in gpio driver. Changes in V6: - Isolated config changes in a new patch. - Updated patches with corresponding changes for Exynos 5420. Changes in V7: - Added changes for other SoCs like Exynos 4412, 4210 etc. Changes in V8: - Changed Subject of patch 2/2 to reflect affected SoCs/boards. - Fixed arndale board compile time errors introduced due to patch-set v7. Changes in V9: - Fixed checkpatch errors. - Fixed naming error in exynos_gpio_data arrays which could be the possible reason behind data abort witnessed over Exynos4 boards. Changes in v10: - Made arch-exynos/gpio.h - arch/gpio.h. - Removed dead code. - Replaced exynos_gpio_get calls with corresponding pin number. - Edited pin numbmers in dts files. Changes in v11: - Created and fixed pinmux_config for Exynos 4412. - Removed dead code. Changes in v12: - Added change logs in individual patches. - Fixed few bugs and typos. - Added Acked-by: Przemyslaw Marczak. Changes in v13: - Fixed typo by replacing EXYNOS5420_GPIO_B10 with EXYNOS5420_GPIO_B20 at line # 4149 of patch 1/2. Akshay Saraswat (2): S5P: Exynos: Add GPIO pin numbering and rename definitions S5P: Exynos: Config: Enable GPIO CMD config arch/arm/cpu/armv7/exynos/pinmux.c | 561 + arch/arm/dts/exynos4210-origen.dts |4 +- arch/arm/dts/exynos4210-trats.dts |6 +- arch/arm/dts/exynos4210-universal_c210.dts |4 +- arch/arm/dts/exynos4412-trats2.dts |4 +- arch/arm/include/asm/arch-exynos/cpu.h | 17 +- arch/arm/include/asm/arch-exynos/gpio.h| 1761 +++- arch/arm/include/asm/arch-s5pc1xx/gpio.h | 948 --- board/samsung/arndale/arndale.c| 11 +- board/samsung/goni/goni.c | 32 +- board/samsung/smdk5250/exynos5-dt.c| 20 +- board/samsung/smdk5250/smdk5250.c | 19 +- board/samsung/smdk5420/smdk5420.c | 15 +- board/samsung/smdkc100/smdkc100.c |5 +- board/samsung/smdkv310/smdkv310.c | 19 +- board/samsung/trats/trats.c| 39 +- board/samsung/trats2/trats2.c | 74 +- board/samsung/universal_c210/universal.c | 51 +- drivers/gpio/s5p_gpio.c| 204 +++- include/configs/exynos5-dt.h |2 + include/configs/s5p_goni.h |4 +- include/configs/s5pc210_universal.h| 16 +- include/configs/smdkv310.h |1 + include/configs/trats.h|8 +- include/configs/trats2.h |4 +- 25 files changed, 2918 insertions(+), 911 deletions(-) -- 1.8.3.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v13 2/2] S5P: Exynos: Config: Enable GPIO CMD config
Enabling configs for GPIO CMD, EXYNOS4 family and replacing exynos_gpio_get with new linear GPIO pin number required because of the new function asking only 2 arguments (pin and value) instead of 3 (bank, pin and value). Signed-off-by: Akshay Saraswat aksha...@samsung.com Acked-by: Przemyslaw Marczak p.marc...@samsung.com --- Changes in v12: - Added change log in this patch. - Added Acked-by: Przemyslaw Marczak. Changes in v10: - Replaced exynos_gpio_get calls with corresponding pin number. Changes in V8: - Changed Subject to reflect affected SoCs/boards. Changes in V6: - Isolated config changes in a new patch. include/configs/exynos5-dt.h| 2 ++ include/configs/s5p_goni.h | 4 ++-- include/configs/s5pc210_universal.h | 16 include/configs/smdkv310.h | 1 + include/configs/trats.h | 8 include/configs/trats2.h| 4 ++-- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/include/configs/exynos5-dt.h b/include/configs/exynos5-dt.h index 414db42..5a9b1b4 100644 --- a/include/configs/exynos5-dt.h +++ b/include/configs/exynos5-dt.h @@ -288,4 +288,6 @@ #define CONFIG_CMD_BOOTZ +#define CONFIG_CMD_GPIO + #endif /* __CONFIG_H */ diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 991c43e..799d4fe 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -214,8 +214,8 @@ /* * I2C Settings */ -#define CONFIG_SOFT_I2C_GPIO_SCL s5pc110_gpio_get(j4, 3) -#define CONFIG_SOFT_I2C_GPIO_SDA s5pc110_gpio_get(j4, 0) +#define CONFIG_SOFT_I2C_GPIO_SCL S5PC110_GPIO_J43 +#define CONFIG_SOFT_I2C_GPIO_SDA S5PC110_GPIO_J40 #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_SOFT/* I2C bit-banged */ diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 2da8871..b368266 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -170,8 +170,8 @@ /* * I2C Settings */ -#define CONFIG_SOFT_I2C_GPIO_SCL exynos4_gpio_get(1, b, 7) -#define CONFIG_SOFT_I2C_GPIO_SDA exynos4_gpio_get(1, b, 6) +#define CONFIG_SOFT_I2C_GPIO_SCL EXYNOS4_GPIO_B7 +#define CONFIG_SOFT_I2C_GPIO_SDA EXYNOS4_GPIO_B6 #define CONFIG_CMD_I2C @@ -196,10 +196,10 @@ */ #define CONFIG_SOFT_SPI #define CONFIG_SOFT_SPI_MODE SPI_MODE_3 -#define CONFIG_SOFT_SPI_GPIO_SCLK exynos4_gpio_get(2, y3, 1) -#define CONFIG_SOFT_SPI_GPIO_MOSI exynos4_gpio_get(2, y3, 3) -#define CONFIG_SOFT_SPI_GPIO_MISO exynos4_gpio_get(2, y3, 0) -#define CONFIG_SOFT_SPI_GPIO_CS exynos4_gpio_get(2, y4, 3) +#define CONFIG_SOFT_SPI_GPIO_SCLK EXYNOS4_GPIO_Y31 +#define CONFIG_SOFT_SPI_GPIO_MOSI EXYNOS4_GPIO_Y33 +#define CONFIG_SOFT_SPI_GPIO_MISO EXYNOS4_GPIO_Y30 +#define CONFIG_SOFT_SPI_GPIO_CS EXYNOS4_GPIO_Y43 #define SPI_DELAY udelay(1) #undef SPI_INIT @@ -231,8 +231,8 @@ int universal_spi_read(void); #define KEY_PWR_INTERRUPT_REG MAX8998_REG_IRQ1 #define KEY_PWR_INTERRUPT_MASK (1 7) -#define KEY_VOL_UP_GPIOexynos4_gpio_get(2, x2, 0) -#define KEY_VOL_DOWN_GPIO exynos4_gpio_get(2, x2, 1) +#define KEY_VOL_UP_GPIOEXYNOS4_GPIO_X20 +#define KEY_VOL_DOWN_GPIO EXYNOS4_GPIO_X21 #endif /* __ASSEMBLY__ */ /* LCD console */ diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index 1388f49..34adfaf 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -12,6 +12,7 @@ /* High Level Configuration Options */ #define CONFIG_SAMSUNG 1 /* in a SAMSUNG core */ #define CONFIG_S5P 1 /* S5P Family */ +#define CONFIG_EXYNOS4 /* EXYNOS4 Family */ #define CONFIG_EXYNOS4210 1 /* which is a EXYNOS4210 SoC */ #define CONFIG_SMDKV3101 /* working with SMDKV310*/ diff --git a/include/configs/trats.h b/include/configs/trats.h index 5d8bd60..6cade07 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -207,8 +207,8 @@ #define CONFIG_SYS_I2C_INIT_BOARD /* I2C FG */ -#define CONFIG_SOFT_I2C_GPIO_SCL exynos4_gpio_get(2, y4, 1) -#define CONFIG_SOFT_I2C_GPIO_SDA exynos4_gpio_get(2, y4, 0) +#define CONFIG_SOFT_I2C_GPIO_SCL EXYNOS4_GPIO_Y41 +#define CONFIG_SOFT_I2C_GPIO_SDA EXYNOS4_GPIO_Y40 /* POWER */ #define CONFIG_POWER @@ -245,8 +245,8 @@ #define KEY_PWR_INTERRUPT_REG MAX8997_REG_INT1 #define KEY_PWR_INTERRUPT_MASK (1 0) -#define KEY_VOL_UP_GPIOexynos4_gpio_get(2, x2, 0) -#define KEY_VOL_DOWN_GPIO exynos4_gpio_get(2, x2, 1) +#define KEY_VOL_UP_GPIOEXYNOS4_GPIO_X20 +#define KEY_VOL_DOWN_GPIO EXYNOS4_GPIO_X21 #endif /* __ASSEMBLY__ */ /* LCD console */ diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 53d449c..856c03b 100644 --- a/include/configs/trats2.h
Re: [U-Boot] [PATCH] ARM: Samsung: s5p_goni: maintainer update
On 30/04/14 03:16, Mateusz Zalega wrote: Because I'm leaving Samsung Electronics, I won't have access to their developer hardware anymore. Przemyslaw Marczak will take over my responsibilities. Signed-off-by: Mateusz Zalega m.zal...@samsung.com Acked-by: Przemyslaw Marczak p.marc...@samsung.com Cc: Minkyu Kang mk7.k...@samsung.com --- boards.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards.cfg b/boards.cfg index 983c657..7bdd0d8 100644 --- a/boards.cfg +++ b/boards.cfg @@ -368,7 +368,7 @@ Active arm armv7 rmobile renesas koelsch Active arm armv7 rmobile renesas koelsch koelsch_nor koelsch:NORFLASH Nobuhiro Iwamatsu nobuhiro.iwamatsu...@renesas.com Active arm armv7 rmobile renesas lager lager- Nobuhiro Iwamatsu nobuhiro.iwamatsu...@renesas.com Active arm armv7 rmobile renesas lager lager_norlager:NORFLASH Nobuhiro Iwamatsu nobuhiro.iwamatsu...@renesas.com -Active arm armv7 s5pc1xx samsung goni s5p_goni - Mateusz Zalega m.zal...@samsung.com +Active arm armv7 s5pc1xx samsung goni s5p_goni - Przemyslaw Marczak p.marc...@samsung.com Active arm armv7 s5pc1xx samsung smdkc100 smdkc100 - Minkyu Kang mk7.k...@samsung.com Active arm armv7 socfpga altera socfpga socfpga_cyclone5 - - Active arm armv7 u8500 st-ericsson snowball snowball - Mathieu Poirier mathieu.poir...@linaro.org applied to u-boot-samsung. Thanks, Minkyu Kang ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] powerpc/mpc85xx: 32bit DDR changes for P1020/P1011
The P1020/P1011 SOCs support max 32bit DDR width as opposed to P2020/P2010 where max DDR data width supported is 64bit. Add dynamic DDR size adjustment in second stage boot loader execution. Signed-off-by: Prabhakar Kushwaha prabha...@freescale.com --- arch/powerpc/cpu/mpc85xx/cpu.c |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index 12e8e10..9c082b4 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -347,7 +347,12 @@ phys_size_t initdram(int board_type) defined(CONFIG_QEMU_E500) return fsl_ddr_sdram_size(); #else - return (phys_size_t)CONFIG_SYS_SDRAM_SIZE * 1024 * 1024; + struct cpu_type *cpu = gd-arch.cpu; + /* P1020 and it's derivatives support max 32bit DDR width */ + if (cpu-soc_ver == SVR_P1020 || cpu-soc_ver == SVR_P1011) + return CONFIG_SYS_SDRAM_SIZE * 1024 * 1024 / 2; + else + return CONFIG_SYS_SDRAM_SIZE * 1024 * 1024; #endif } #else /* CONFIG_SYS_RAMBOOT */ -- 1.7.9.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] board/p1_p2_rdb:Enable p1_p2_rdb boot from NAND/SD/SPI in SPL
In the earlier patches, the SPL/TPL fraamework was introduced.
For SD/SPI flash booting way, we introduce the SPL to enable a loader stub. The
SPL was loaded by the code from the internal on-chip ROM. The SPL initializes
the DDR according to the SPD and loads the final uboot image into DDR, then
jump to the DDR to begin execution.
For NAND booting way, the nand SPL has size limitation on some board(e.g.
P1010RDB), it can not be more than 4KB, we can call it minimal SPL, So the
dynamic DDR driver doesn't fit into this minimum SPL. We added the TPL that is
loaded by the the minimal SPL. The TPL initializes the DDR according to the SPD
and loads the final uboot image into DDR,then jump to the DDR to begin
execution.
This patch enabled SPL/TPL for P1_P2_RDB to support starting from NAND/SD/SPI
flash with SPL framework and initializing the DDR according to SPD in the
SPL/TPL.
Because the minimal SPL load the TPL to L2 SRAM and the jump to the L2 SRAM to
execute, so the section .resetvec is no longer needed.
Signed-off-by: Prabhakar Kushwaha prabha...@freescale.com
---
board/freescale/p1_p2_rdb/Makefile | 21 +-
board/freescale/p1_p2_rdb/ddr.c|7 +-
board/freescale/p1_p2_rdb/spl.c| 139 +
board/freescale/p1_p2_rdb/spl_minimal.c| 84
board/freescale/p1_p2_rdb/tlb.c| 18 +-
include/configs/P1_P2_RDB.h| 252
nand_spl/board/freescale/p1_p2_rdb/Makefile| 91 -
nand_spl/board/freescale/p1_p2_rdb/nand_boot.c | 82
8 files changed, 433 insertions(+), 261 deletions(-)
create mode 100644 board/freescale/p1_p2_rdb/spl.c
create mode 100644 board/freescale/p1_p2_rdb/spl_minimal.c
delete mode 100644 nand_spl/board/freescale/p1_p2_rdb/Makefile
delete mode 100644 nand_spl/board/freescale/p1_p2_rdb/nand_boot.c
diff --git a/board/freescale/p1_p2_rdb/Makefile
b/board/freescale/p1_p2_rdb/Makefile
index f7b568a..a97bf45 100644
--- a/board/freescale/p1_p2_rdb/Makefile
+++ b/board/freescale/p1_p2_rdb/Makefile
@@ -4,8 +4,27 @@
# SPDX-License-Identifier: GPL-2.0+
#
+MINIMAL=
+
+ifdef CONFIG_SPL_BUILD
+ifdef CONFIG_SPL_INIT_MINIMAL
+MINIMAL=y
+endif
+endif
+
+ifdef MINIMAL
+
+obj-y += spl_minimal.o tlb.o law.o
+
+else
+ifdef CONFIG_SPL_BUILD
+obj-y += spl.o
+else
obj-y += p1_p2_rdb.o
+obj-$(CONFIG_PCI) += pci.o
+endif
obj-y += ddr.o
obj-y += law.o
-obj-$(CONFIG_PCI) += pci.o
obj-y += tlb.o
+
+endif
diff --git a/board/freescale/p1_p2_rdb/ddr.c b/board/freescale/p1_p2_rdb/ddr.c
index 17d3bea..48f7ebd 100644
--- a/board/freescale/p1_p2_rdb/ddr.c
+++ b/board/freescale/p1_p2_rdb/ddr.c
@@ -180,7 +180,6 @@ fsl_ddr_cfg_regs_t ddr_cfg_regs_800 = {
phys_size_t fixed_sdram (void)
{
- char buf[32];
fsl_ddr_cfg_regs_t ddr_cfg_regs;
size_t ddr_size;
struct cpu_type *cpu;
@@ -199,8 +198,7 @@ phys_size_t fixed_sdram (void)
ddr_freq = get_ddr_freq(0);
ddr_freq_mhz = ddr_freq / 100;
- printf(Configuring DDR for %s MT/s data rate\n,
- strmhz(buf, ddr_freq));
+ printf(Configuring DDR for %ld T/s data rate\n, ddr_freq);
if(ddr_freq_mhz = 400)
memcpy(ddr_cfg_regs, ddr_cfg_regs_400, sizeof(ddr_cfg_regs));
@@ -211,8 +209,7 @@ phys_size_t fixed_sdram (void)
else if(ddr_freq_mhz = 800)
memcpy(ddr_cfg_regs, ddr_cfg_regs_800, sizeof(ddr_cfg_regs));
else
- panic(Unsupported DDR data rate %s MT/s data rate\n,
- strmhz(buf, ddr_freq));
+ panic(Unsupported DDR data rate %ld T/s\n, ddr_freq);
/* P1020 and it's derivatives support max 32bit DDR width */
if (cpu-soc_ver == SVR_P1020 || cpu-soc_ver == SVR_P1011) {
diff --git a/board/freescale/p1_p2_rdb/spl.c b/board/freescale/p1_p2_rdb/spl.c
new file mode 100644
index 000..d684d1d
--- /dev/null
+++ b/board/freescale/p1_p2_rdb/spl.c
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2013 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:GPL-2.0+
+ */
+
+#include common.h
+#include ns16550.h
+#include malloc.h
+#include mmc.h
+#include nand.h
+#include i2c.h
+#include fsl_esdhc.h
+#include spi_flash.h
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define SYSCLK_MASK0x0020
+#define BOARDREV_MASK 0x1010
+
+#define SYSCLK_66
+#define SYSCLK_100 1
+
+unsigned long get_board_sys_clk(ulong dummy)
+{
+ ccsr_gpio_t *pgpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR);
+ u32 val_gpdat, sysclk_gpio;
+
+ val_gpdat = in_be32(pgpio-gpdat);
+ sysclk_gpio = val_gpdat SYSCLK_MASK;
+
+ if (sysclk_gpio == 0)
+ return SYSCLK_66;
+ else
+ return SYSCLK_100;
+
+ return 0;
+}
+
+phys_size_t get_effective_memsize(void)
+{
+ return CONFIG_SYS_L2_SIZE;
+}
+
+void board_init_f(ulong bootflag)
+{
+ u32
